diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2481fa5c2f547840aa7e6a4252b1838e5e47cdde
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+open_collective: haxe
+custom: ['https://haxe.org/foundation/support-plans.html', 'https://haxe.org/foundation/donate.html']
diff --git a/.merlin b/.merlin
index b303a900ed8bbfa4d03e8e614dcf099e7bea1ad4..7c9eaf64b74868e06a2a8f43afce2b9d88c1cba6 100644
--- a/.merlin
+++ b/.merlin
@@ -1,4 +1,14 @@
 S src/**
-B src/**
+B _build/src/**
 S libs/**
 B libs/**
+B +threads
+PKG ptmap
+PKG sedlex
+PKG extlib
+PKG camlzip
+PKG xml-light
+PKG sha
+FLG -safe-string
+FLG -w -3
+FLG -w -40
\ No newline at end of file
diff --git a/.vscode/schemas/define.schema.json b/.vscode/schemas/define.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..1d902d1ab3d90da6ad9f5bd15d5716e95fe66f53
--- /dev/null
+++ b/.vscode/schemas/define.schema.json
@@ -0,0 +1,68 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"type": "array",
+	"items": {
+		"type": "object",
+		"additionalProperties": false,
+		"properties": {
+			"name": {
+				"type": "string",
+				"markdownDescription": "OCaml name of the define."
+			},
+			"define": {
+				"type": "string",
+				"markdownDescription": "Actual name of the define as it's used in `-D` on the CLI and in Haxe code."
+			},
+			"doc": {
+				"type": "string",
+				"markdownDescription": "Documentation for the define that is shown in `--help-defines`."
+			},
+			"platforms": {
+				"type": "array",
+				"markdownDescription": "Platforms on which this define has an effect.",
+				"minItems": 1,
+				"items": {
+					"enum": [
+						"js",
+						"lua",
+						"neko",
+						"flash",
+						"php",
+						"cpp",
+						"cs",
+						"java",
+						"python",
+						"hl",
+						"eval"
+					]
+				}
+			},
+			"params": {
+				"type": "array",
+				"markdownDescription": "Parameters this define takes.",
+				"minItems": 1,
+				"items": {
+					"type": "string"
+				}
+			},
+			"devcomment": {
+				"type": "string",
+				"markdownDescription": "Internal comment that is not exposed."
+			},
+			"links": {
+				"type": "array",
+				"markdownDescription": "Relevant URLs.",
+				"minItems": 1,
+				"items": {
+					"type": "string",
+					"format": "uri"
+				}
+			}
+		},
+		"required": [
+			"name",
+			"define",
+			"doc"
+		]
+	}
+}
\ No newline at end of file
diff --git a/.vscode/schemas/meta.schema.json b/.vscode/schemas/meta.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..b2dee2053c85c7941e91d2f410eb9322011137e3
--- /dev/null
+++ b/.vscode/schemas/meta.schema.json
@@ -0,0 +1,90 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"type": "array",
+	"items": {
+		"type": "object",
+		"additionalProperties": false,
+		"properties": {
+			"name": {
+				"type": "string",
+				"markdownDescription": "OCaml name of the meta."
+			},
+			"metadata": {
+				"type": "string",
+				"markdownDescription": "Actual name of the meta as it's used in Haxe code."
+			},
+			"doc": {
+				"type": "string",
+				"markdownDescription": "Documentation for the meta that is shown in `--help-metas` and IDE hints."
+			},
+			"platforms": {
+				"type": "array",
+				"markdownDescription": "Platforms on which this meta has an effect.",
+				"minItems": 1,
+				"items": {
+					"enum": [
+						"js",
+						"lua",
+						"neko",
+						"flash",
+						"php",
+						"cpp",
+						"cs",
+						"java",
+						"python",
+						"hl",
+						"eval"
+					]
+				}
+			},
+			"params": {
+				"type": "array",
+				"markdownDescription": "Parameters this meta takes.",
+				"minItems": 1,
+				"items": {
+					"type": "string"
+				}
+			},
+			"devcomment": {
+				"type": "string",
+				"markdownDescription": "Internal comment that is not exposed."
+			},
+			"internal": {
+				"type": "boolean",
+				"markdownDescription": "Whether this define is for internal use only, in which case it is not exposed to the CLI and the `--display` protocol."
+			},
+			"targets": {
+				"type": "array",
+				"markdownDescription": "On what the meta can be used.",
+				"minItems": 1,
+				"items": {
+					"enum": [
+						"TClass",
+						"TClassField",
+						"TAbstract",
+						"TAbstractField",
+						"TEnum",
+						"TTypedef",
+						"TExpr",
+						"TTypeParameter",
+						"TAnyField"
+					]
+				}
+			},
+			"links": {
+				"type": "array",
+				"markdownDescription": "Relevant URLs.",
+				"minItems": 1,
+				"items": {
+					"type": "string",
+					"format": "uri"
+				}
+			}
+		},
+		"required": [
+			"name",
+			"metadata",
+			"doc"
+		]
+	}
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..3b6ceacf28be5e3be1b9a33b977172f2ad4a8e57
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,32 @@
+{
+	"files.associations": {
+		"*.mly": "ocaml",
+		"*.ml": "ocaml",
+		"Makefile.*": "makefile"
+	},
+	"[ocaml]": {
+		"editor.tabSize": 4
+	},
+	"files.exclude": {
+		"**/_build": true
+	},
+	"reason.server.languages": [
+		"ocaml"
+	],
+	"haxe.diagnosticsPathFilter": "${workspaceRoot}/std",
+	"npm.autoDetect": "off",
+	"json.schemas": [
+		{
+			"fileMatch": [
+				"src-json/define.json"
+			],
+			"url": "./.vscode/schemas/define.schema.json"
+		},
+		{
+			"fileMatch": [
+				"src-json/meta.json"
+			],
+			"url": "./.vscode/schemas/meta.schema.json"
+		}
+	]
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000000000000000000000000000000000000..5e0f5a757b8b460919c3b18e12388f192c387a8a
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,51 @@
+{
+    "version": "2.0.0",
+	"tasks": [
+		{
+			"label": "make: haxe",
+			"type": "shell",
+			"command": "make ADD_REVISION=1 -s -j haxe",
+			"windows": {
+				"command": "make ADD_REVISION=1 -f Makefile.win -s -j haxe"
+			},
+			"problemMatcher": [],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		},
+		{
+			"label": "make: libs",
+			"type": "shell",
+			"command": "make -s -j libs",
+			"windows": {
+				"command": "make -f Makefile.win -s -j libs"
+			},
+			"problemMatcher": []
+		},
+		{
+			"label": "make: haxelib",
+			"type": "shell",
+			"command": "make -s haxelib",
+			"windows": {
+				"command": "make -f Makefile.win -s haxelib"
+			},
+			"problemMatcher": ["$haxe", "$haxe-absolute"]
+		},
+		{
+			"label": "make: all",
+			"type": "shell",
+			"command": "make s -j libs && make ADD_REVISION=1 -s -j haxe && make -s haxelib",
+			"windows": {
+				"command": "make -f Makefile.win -s -j libs && make ADD_REVISION=1 -f Makefile.win -s -j haxe && make -f Makefile.win -s haxelib"
+			},
+			"problemMatcher": ["$haxe", "$haxe-absolute"]
+		},
+		{
+			"label": "make: clean",
+			"type": "shell",
+			"command": "make clean",
+			"problemMatcher": []
+		}
+	]
+}
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c63e8b0d3d2bbcff81021c17d31a7e98cb40b99..48183c808661f72a690c068b02b99b204ebf9c47 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,6 +15,56 @@ This repository is about the Haxe compiler itself and the Haxe standard library.
 * Something on api.haxe.org: For content this is probably the right repository. If it's about the representation, try <https://github.com/HaxeFoundation/dox/issues> instead.
 * Something else on haxe.org: <https://github.com/HaxeFoundation/haxe.org/issues>
 
+## Submitting a Pull-Request
+
+Thank you for your interest in contributing to Haxe! Haxe is a
+community-driven project and your help is vital and appreciated!
+
+When preparing to submit a pull-request, please make your PR as easy
+as possible for core devs to evaluate and merge. To that end:
+
+  * In your PR comments, include:
+
+      * the reason for your proposed changes (What problem are you fixing?)
+      * some possible solutions, and rationale for the one you chose
+      * a summary of the code changes in your PR
+      * any pros and cons to note about the solution you implemented
+      * links to any relevant GitHub issues, PR's, and/or forum
+        discussions
+
+  * If you've found and fixed a bug, have you also included a
+    corresponding test for it?
+  * Does your code formatting match that of the rest of the project?
+  * If your changes require updates to the documentation, does your PR
+    include those as well?
+
+Please also bear the following in mind:
+
+  * Evaluating PR's takes time and effort. Even taking a look at a PR
+    in order to request more info or clarification is not zero-cost.
+  * Most members of the core team are volunteers too, and at any given time
+    are typically already busy working on other areas of Haxe.
+  * It's no fun providing negative feedback to a PR. The better you
+    can craft and champion your PR, the more likely it is to be
+    speedily evaluated.
+
+
+## Debugging Hints
+
+### Using a debugger
+
+To debug the Haxe compiler, you can use either a system debugger (`gdb`/`lldb`), or [ocamldebug](http://caml.inria.fr/pub/docs/manual-ocaml/debugger.html). `ocamldebug` provides a better debugging experience. To use it, compile with `make BYTECODE=1`.
+
+### Using printf
+
+To print information about a type, you can add the following before most lines:
+
+```ocaml
+Printf.printf "%s\n" (s_type_kind t);
+```
+
+There are lots of other stringifying functions, search for "Printing" in `src/core/type.ml` and scroll down to find them.
+
 ## Other remarks:
 
 - Sometimes people try to be particularly helpful by not only including broken parts in their code, but also "similar" code which is working. More often than not this is more distracting than helpful. If you want to highlight something like this, consider adding the working code commented out.
diff --git a/Makefile b/Makefile
index b846a06976082dd64bc95045aacebfdde5096d3b..15693ee6e2629905eea0f516249edadebc704aac 100644
--- a/Makefile
+++ b/Makefile
@@ -8,73 +8,69 @@
 #  - use 'make -f Makefile.win' to build for Windows
 #  - use 'make MSVC=1 -f Makefile.win' to build for Windows with OCaml/MSVC
 #
-.SUFFIXES : .ml .mli .cmo .cmi .cmx .mll .mly
+.SUFFIXES : .ml .mli .cmo .cmi .cmx .mly
 
-INSTALL_DIR=$(DESTDIR)/usr
+INSTALL_DIR=/usr/local
 INSTALL_BIN_DIR=$(INSTALL_DIR)/bin
 INSTALL_LIB_DIR=$(INSTALL_DIR)/lib/haxe
-INSTALL_STD_DIR=$(INSTALL_LIB_DIR)/std
+INSTALL_STD_DIR=$(INSTALL_DIR)/share/haxe/std
 PACKAGE_OUT_DIR=out
 INSTALLER_TMP_DIR=installer
 PACKAGE_SRC_EXTENSION=.tar.gz
 
+MAKEFILENAME?=Makefile
 PLATFORM?=unix
 
-OUTPUT=haxe
+HAXE_OUTPUT=haxe
+HAXELIB_OUTPUT=haxelib
+PREBUILD_OUTPUT=prebuild
 EXTENSION=
-OCAMLOPT?=ocamlopt
-OCAMLC?=ocamlc
 LFLAGS=
 STATICLINK?=0
 
-CFLAGS= -bin-annot
-ALL_CFLAGS= $(CFLAGS) -g -w -3 -I libs/extlib -I libs/extc -I libs/neko -I libs/javalib -I libs/ziplib -I libs/swflib -I libs/xml-light -I libs/ttflib -I libs/ilib -I libs/objsize -I libs/pcre \
-	-I src -I src/context -I src/generators -I src/macro -I src/optimization -I src/syntax -I src/typing -I src/display
+# Configuration
 
-LIBS=unix str libs/extlib/extLib libs/xml-light/xml-light libs/swflib/swflib \
-	libs/extc/extc libs/neko/neko libs/javalib/java libs/ziplib/zip \
-	libs/ttflib/ttf libs/ilib/il libs/objsize/objsize libs/pcre/pcre
+# Modules in these directories should only depend on modules that are in directories to the left
+HAXE_DIRECTORIES=core core/json core/display syntax context context/display codegen codegen/gencommon generators generators/jvm optimization filters macro macro/eval macro/eval/bytes typing compiler
+EXTLIB_LIBS=extlib-leftovers extc neko javalib swflib ttflib ilib objsize pcre ziplib
+OCAML_LIBS=unix str threads dynlink
+OPAM_LIBS=sedlex.ppx xml-light extlib ptmap sha
 
+FINDLIB_LIBS=$(OCAML_LIBS)
+FINDLIB_LIBS+=$(OPAM_LIBS)
 
-ifneq ($(STATICLINK),0)
-LIB_PARAMS= -cclib '-Wl,-Bstatic -lpcre -lz -Wl,-Bdynamic '
+# Includes, packages and compiler
 
-else
-LIB_PARAMS?= -cclib -lpcre -cclib -lz
+HAXE_INCLUDES=$(HAXE_DIRECTORIES:%=-I _build/src/%)
+EXTLIB_INCLUDES=$(EXTLIB_LIBS:%=-I libs/%)
+ALL_INCLUDES=$(EXTLIB_INCLUDES) $(HAXE_INCLUDES)
+FINDLIB_PACKAGES=$(FINDLIB_LIBS:%=-package %)
+CFLAGS=
+ALL_CFLAGS=-bin-annot -safe-string -thread -g -w -3 -w -40 $(CFLAGS) $(ALL_INCLUDES) $(FINDLIB_PACKAGES)
 
-endif
-
-NATIVE_LIBS=-cclib libs/extc/extc_stubs.o -cclib libs/extc/process_stubs.o -cclib libs/objsize/c_objsize.o -cclib libs/pcre/pcre_stubs.o -ccopt -L/usr/local/lib $(LIB_PARAMS)
+MESSAGE_FILTER=sed -e 's/_build\/src\//src\//' tmp.tmp
 
 ifeq ($(BYTECODE),1)
 	TARGET_FLAG = bytecode
-	COMPILER = $(OCAMLC)
+	COMPILER = ocamlfind ocamlc
 	LIB_EXT = cma
 	MODULE_EXT = cmo
 	NATIVE_LIB_FLAG = -custom
 else
 	TARGET_FLAG = native
-	COMPILER = $(OCAMLOPT)
+	COMPILER = ocamlfind ocamlopt
 	LIB_EXT = cmxa
 	MODULE_EXT = cmx
+	OCAMLDEP_FLAGS = -native
 endif
 
-CC_CMD = $(COMPILER) $(ALL_CFLAGS) -c $<
-
-CC_PARSER_CMD = $(COMPILER) -pp camlp4o $(ALL_CFLAGS) -c src/syntax/parser.ml
+CC_CMD = ($(COMPILER) $(ALL_CFLAGS) -c $< 2>tmp.tmp && $(MESSAGE_FILTER)) || ($(MESSAGE_FILTER) && exit 1)
 
-RELDIR=../../..
+# Meta information
 
-MODULES=json version globals path context/meta syntax/ast display/displayTypes typing/type typing/error \
-	syntax/lexer context/common generators/genxml \
-	syntax/parser typing/abstract typing/typecore display/display optimization/optimizerTexpr \
-	optimization/optimizer typing/overloads typing/typeload sourcemaps generators/codegen generators/gencommon generators/genas3 \
-	generators/gencpp generators/genjs generators/genneko generators/genphp generators/genphp7 generators/genswf9 \
-	generators/genswf generators/genjava generators/gencs generators/genpy macro/macroApi macro/interp generators/hlcode generators/hlopt generators/hlinterp generators/hl2c \
-	generators/genlua \
-	optimization/dce optimization/analyzerConfig optimization/analyzerTypes optimization/analyzerTexpr \
-	optimization/analyzerTexprTransformer optimization/analyzer generators/genhl \
-	optimization/filters macro/hlmacro macro/macroContext typing/typer typing/matcher display/displayOutput server main
+BUILD_DIRECTORIES := $(HAXE_DIRECTORIES:%=_build/src/%)
+HAXE_SRC := $(wildcard $(HAXE_DIRECTORIES:%=src/%/*.ml))
+BUILD_SRC := $(HAXE_SRC:%=_build/%)
 
 ADD_REVISION?=0
 
@@ -88,7 +84,8 @@ COMMIT_DATE=$(shell \
 	fi \
 )
 PACKAGE_FILE_NAME=haxe_$(COMMIT_DATE)_$(COMMIT_SHA)
-HAXE_VERSION=$(shell $(OUTPUT) -version 2>&1 | awk '{print $$1;}')
+HAXE_VERSION=$(shell $(CURDIR)/$(HAXE_OUTPUT) -version 2>&1 | awk '{print $$1;}')
+HAXE_VERSION_SHORT=$(shell echo "$(HAXE_VERSION)" | grep -oE "^[0-9]+\.[0-9]+\.[0-9]+")
 
 # using $(CURDIR) on Windows will not work since it might be a Cygwin path
 ifdef SYSTEMROOT
@@ -97,188 +94,128 @@ else
 	export HAXE_STD_PATH=$(CURDIR)/std
 endif
 
-all: libs haxe tools
-
-libs:
-	make -C libs/extlib OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-	make -C libs/extc OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-	make -C libs/neko OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-	make -C libs/javalib OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-	make -C libs/ilib OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-	make -C libs/ziplib OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-	make -C libs/swflib OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-	make -C libs/xml-light OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-	make -C libs/ttflib OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-	make -C libs/objsize OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-	make -C libs/pcre OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
-
-haxe: $(MODULES:%=src/%.$(MODULE_EXT))
-	$(COMPILER) -o $(OUTPUT) $(NATIVE_LIBS) $(NATIVE_LIB_FLAG) $(LFLAGS) $(LIBS:=.$(LIB_EXT)) $(MODULES:%=src/%.$(MODULE_EXT))
-
-haxelib:
-	(cd $(CURDIR)/extra/haxelib_src && $(CURDIR)/$(OUTPUT) client.hxml && nekotools boot run.n)
-	mv extra/haxelib_src/run$(EXTENSION) haxelib$(EXTENSION)
+# Native libraries
 
-tools: haxelib
-
-install: uninstall
-	mkdir -p $(INSTALL_BIN_DIR)
-	mkdir -p $(INSTALL_LIB_DIR)/lib
-	cp -rf std $(INSTALL_STD_DIR)
-	cp -rf extra $(INSTALL_LIB_DIR)
-	cp haxe $(INSTALL_LIB_DIR)
-	ln -s $(INSTALL_LIB_DIR)/haxe $(INSTALL_BIN_DIR)/haxe
-	cp haxelib $(INSTALL_LIB_DIR)
-	ln -s $(INSTALL_LIB_DIR)/haxelib $(INSTALL_BIN_DIR)/haxelib
-	chmod -R a+rx $(INSTALL_LIB_DIR)
-	chmod 777 $(INSTALL_LIB_DIR)/lib
-	chmod a+rx $(INSTALL_BIN_DIR)/haxe $(INSTALL_BIN_DIR)/haxelib
-
-# will install native version of the tools instead of script ones
-install_tools: tools
-	cp haxelib ${INSTALL_BIN_DIR}/haxelib
-	chmod a+rx $(INSTALL_BIN_DIR)/haxelib
-
-uninstall:
-	rm -rf $(INSTALL_BIN_DIR)/haxe $(INSTALL_BIN_DIR)/haxelib
-	if [ -d "$(INSTALL_LIB_DIR)/lib" ] && find "$(INSTALL_LIB_DIR)/lib" -mindepth 1 -print -quit | grep -q .; then \
-		echo "The local haxelib repo at $(INSTALL_LIB_DIR)/lib will not be removed. Remove it manually if you want."; \
-		find $(INSTALL_LIB_DIR)/ ! -name 'lib' -mindepth 1 -maxdepth 1 -exec rm -rf {} +; \
-	else \
-		rm -rf $(INSTALL_LIB_DIR); \
-	fi
+ifneq ($(STATICLINK),0)
+	LIB_PARAMS= -cclib '-Wl,-Bstatic -lpcre -lz -Wl,-Bdynamic '
+else
+	LIB_PARAMS?= -cclib -lpcre -cclib -lz
+endif
 
+NATIVE_LIBS=-thread -cclib libs/extc/extc_stubs.o -cclib libs/extc/process_stubs.o -cclib libs/objsize/c_objsize.o -cclib libs/pcre/pcre_stubs.o -ccopt -L/usr/local/lib $(LIB_PARAMS)
 
 # Modules
 
-# context
-
-src/context/common.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/display/displayTypes.$(MODULE_EXT) libs/ilib/il.$(LIB_EXT)
-
-src/context/meta.$(MODULE_EXT): src/globals.$(MODULE_EXT)
-
-# display
-
-src/display/display.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/path.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT) src/syntax/parser.$(MODULE_EXT) src/display/displayTypes.$(MODULE_EXT)
-
-src/display/displayTypes.$(MODULE_EXT) : src/globals.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-src/display/displayOutput.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/typing/typer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/display/display.$(MODULE_EXT)
-
-# sourcemaps
-
-src/sourcemaps.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-# generators
-
-src/generators/codegen.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/generators/genxml.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-src/generators/genas3.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-src/generators/gencommon.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/typing/error.$(MODULE_EXT) src/typing/overloads.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) libs/ilib/il.$(LIB_EXT)
-
-src/generators/gencpp.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-src/generators/gencs.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/generators/gencommon.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) libs/ilib/il.$(LIB_EXT)
-
-src/generators/genjava.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/generators/gencommon.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-src/generators/genjs.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-src/generators/genneko.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
+-include Makefile.modules
 
-src/generators/genlua.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
+# Rules
 
-src/generators/genphp.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-src/generators/genpy.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-src/generators/genswf.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/generators/genswf9.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-src/generators/hlinterp.$(MODULE_EXT): src/context/common.$(MODULE_EXT) src/generators/hlcode.$(MODULE_EXT) src/macro/interp.$(MODULE_EXT) src/generators/hlopt.$(MODULE_EXT) src/macro/macroApi.$(MODULE_EXT)
-
-src/generators/genphp7.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/sourcemaps.$(MODULE_EXT)
-
-src/generators/hl2c.$(MODULE_EXT): src/generators/hlcode.$(MODULE_EXT) src/context/common.$(MODULE_EXT)
-
-src/generators/hlopt.$(MODULE_EXT): src/generators/hlcode.$(MODULE_EXT)
-
-src/generators/genhl.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/generators/hlcode.$(MODULE_EXT) src/generators/hlinterp.$(MODULE_EXT) src/generators/hl2c.$(MODULE_EXT) src/generators/hlopt.$(MODULE_EXT)
-
-src/generators/genswf9.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-src/generators/genxml.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-
-# macro
-
-src/macro/interp.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/typing/error.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/generators/genneko.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/generators/genswf.$(MODULE_EXT) src/generators/genjava.$(MODULE_EXT) src/generators/gencs.$(MODULE_EXT) src/syntax/parser.$(MODULE_EXT) libs/ilib/il.$(LIB_EXT) src/macro/macroApi.$(MODULE_EXT) libs/pcre/pcre.$(LIB_EXT)
-
-src/macro/macroContext.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/typing/error.$(MODULE_EXT) src/optimization/optimizerTexpr.$(MODULE_EXT) src/typing/overloads.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/typeload.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/parser.$(MODULE_EXT) src/optimization/optimizer.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/macro/interp.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/optimization/filters.$(MODULE_EXT) src/generators/genjs.$(MODULE_EXT) src/display/display.$(MODULE_EXT) src/macro/hlmacro.$(MODULE_EXT) src/macro/macroApi.$(MODULE_EXT)
-
-src/macro/hlmacro.$(MODULE_EXT): src/generators/hlinterp.$(MODULE_EXT) src/generators/genhl.$(MODULE_EXT) src/macro/macroApi.$(MODULE_EXT)
-
-src/macro/macroApi.$(MODULE_EXT): src/generators/genjs.$(MODULE_EXT) src/generators/gencs.$(MODULE_EXT) src/generators/genjava.$(MODULE_EXT) src/syntax/parser.$(MODULE_EXT)
-
-# optimization
-
-src/optimization/analyzer.$(MODULE_EXT): src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/optimization/optimizer.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/optimization/analyzerConfig.$(MODULE_EXT) src/optimization/analyzerTypes.$(MODULE_EXT) src/optimization/analyzerTexpr.$(MODULE_EXT) src/optimization/analyzerTexprTransformer.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT)
-
-src/optimization/analyzerConfig.$(MODULE_EXT): src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/context/common.$(MODULE_EXT)
-
-src/optimization/analyzerTexpr.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/typing/error.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/optimization/analyzerConfig.$(MODULE_EXT) src/optimization/optimizerTexpr.$(MODULE_EXT) src/generators/genphp7.$(MODULE_EXT)
+all: libs haxe tools
 
-src/optimization/analyzerTexprTransformer.$(MODULE_EXT): src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/typing/error.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/optimization/analyzerConfig.$(MODULE_EXT) src/optimization/analyzerTypes.$(MODULE_EXT) src/optimization/analyzerTexpr.$(MODULE_EXT)
+libs:
+	$(foreach lib,$(EXTLIB_LIBS),$(MAKE) -C libs/$(lib) $(TARGET_FLAG) &&) true
 
-src/optimization/analyzerTypes.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/optimization/analyzerConfig.$(MODULE_EXT)
+_build/%:%
+	mkdir -p $(dir $@)
+	cp $< $@
 
-src/optimization/dce.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT) src/typing/error.$(MODULE_EXT) src/path.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/typing/type.$(MODULE_EXT)
+build_dirs:
+	@mkdir -p $(BUILD_DIRECTORIES)
 
-src/optimization/filters.$(MODULE_EXT): src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/typing/error.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/optimization/analyzer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/optimization/dce.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT)
+_build/src/syntax/grammar.ml:src/syntax/grammar.mly
+	camlp5o -impl $< -o $@
 
-src/optimization/optimizer.$(MODULE_EXT): src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/optimization/optimizerTexpr.$(MODULE_EXT) src/display/display.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/parser.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
+_build/src/compiler/version.ml: FORCE
+ifneq ($(ADD_REVISION),0)
+	$(MAKE) -f Makefile.version_extra -s --no-print-directory ADD_REVISION=$(ADD_REVISION) BRANCH=$(BRANCH) COMMIT_SHA=$(COMMIT_SHA) COMMIT_DATE=$(COMMIT_DATE) > _build/src/compiler/version.ml
+else
+	echo let version_extra = None > _build/src/compiler/version.ml
+endif
 
-src/optimization/optimizerTexpr.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
+_build/src/core/defineList.ml: src-json/define.json prebuild
+	./$(PREBUILD_OUTPUT) define $< > $@
 
-# syntax
+_build/src/core/metaList.ml: src-json/meta.json prebuild
+	./$(PREBUILD_OUTPUT) meta $< > $@
 
-src/syntax/ast.$(MODULE_EXT): src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT)
+build_src: | $(BUILD_SRC) _build/src/syntax/grammar.ml _build/src/compiler/version.ml _build/src/core/defineList.ml _build/src/core/metaList.ml
 
-src/syntax/lexer.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/syntax/lexer.ml src/syntax/ast.$(MODULE_EXT)
+prebuild: _build/src/core/json/json.ml _build/src/prebuild/main.ml
+	$(COMPILER) -safe-string -linkpkg -g -o $(PREBUILD_OUTPUT) -package sedlex.ppx -package extlib -I _build/src/core/json _build/src/core/json/json.ml _build/src/prebuild/main.ml
 
-src/syntax/parser.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/path.$(MODULE_EXT) src/syntax/parser.ml src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
-	$(CC_PARSER_CMD)
+haxe: build_src
+	$(MAKE) -f $(MAKEFILENAME) build_pass_1
+	$(MAKE) -f $(MAKEFILENAME) build_pass_2
+	$(MAKE) -f $(MAKEFILENAME) build_pass_3
+	$(MAKE) -f $(MAKEFILENAME) build_pass_4
 
-# typing
+build_pass_1:
+	printf MODULES= > Makefile.modules
+	ls -1 $(HAXE_DIRECTORIES:%=_build/src/%/*.ml) | tr '\n' ' ' >> Makefile.modules
 
-src/typing/abstract.$(MODULE_EXT): src/context/meta.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/typing/error.$(MODULE_EXT)
+build_pass_2:
+	printf MODULES= > Makefile.modules
+	ocamlfind ocamldep -sort -slash $(HAXE_INCLUDES) $(MODULES) | sed -e "s/\.ml//g" >> Makefile.modules
 
-src/typing/error.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/typing/type.$(MODULE_EXT)
+build_pass_3:
+	ocamlfind ocamldep -slash $(OCAMLDEP_FLAGS) $(HAXE_INCLUDES) $(MODULES:%=%.ml) > Makefile.dependencies
 
-src/typing/matcher.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/typing/error.$(MODULE_EXT) src/optimization/optimizer.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/typing/typer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
+build_pass_4: $(MODULES:%=%.$(MODULE_EXT))
+	$(COMPILER) -safe-string -linkpkg -g -o $(HAXE_OUTPUT) $(NATIVE_LIBS) $(NATIVE_LIB_FLAG) $(LFLAGS) $(FINDLIB_PACKAGES) $(EXTLIB_INCLUDES) $(EXTLIB_LIBS:=.$(LIB_EXT)) $(MODULES:%=%.$(MODULE_EXT))
 
-src/typing/overloads.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/typing/type.$(MODULE_EXT)
+kill_exe_win:
+ifdef SYSTEMROOT
+	-@taskkill /F /IM haxe.exe 2>/dev/null
+endif
 
-src/typing/type.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/json.$(MODULE_EXT)
+plugin:
+ifeq ($(BYTECODE),1)
+	$(CC_CMD) $(PLUGIN).ml
+else
+	$(COMPILER) $(ALL_CFLAGS) -shared -o $(PLUGIN).cmxs $(PLUGIN).ml
+endif
 
-src/typing/typecore.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT)
+# Only use if you have only changed gencpp.ml
+quickcpp: build_src build_pass_4 copy_haxetoolkit
 
-src/typing/typeload.$(MODULE_EXT): src/globals.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/optimization/optimizerTexpr.$(MODULE_EXT) src/typing/overloads.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/parser.$(MODULE_EXT) src/optimization/optimizer.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/json.$(MODULE_EXT) src/display/display.$(MODULE_EXT)
+CPP_OS := $(shell uname)
+ifeq ($(CPP_OS),Linux)
+copy_haxetoolkit:
+	sudo cp haxe /usr/bin/haxe
+else
+copy_haxetoolkit: /cygdrive/c/HaxeToolkit/haxe/haxe.exe
+/cygdrive/c/HaxeToolkit/haxe/haxe.exe:haxe.exe
+	cp $< $@
+endif
 
-src/typing/typer.$(MODULE_EXT): src/typing/abstract.$(MODULE_EXT) src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/typing/error.$(MODULE_EXT) src/optimization/optimizerTexpr.$(MODULE_EXT) src/typing/overloads.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/typeload.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/parser.$(MODULE_EXT) src/optimization/optimizer.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/macro/interp.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/optimization/filters.$(MODULE_EXT) src/generators/genjs.$(MODULE_EXT) src/display/display.$(MODULE_EXT) src/macro/macroContext.$(MODULE_EXT)
+haxelib:
+	(cd $(CURDIR)/extra/haxelib_src && $(CURDIR)/$(HAXE_OUTPUT) client.hxml && nekotools boot run.n)
+	mv extra/haxelib_src/run$(EXTENSION) $(HAXELIB_OUTPUT)
 
-# main
+tools: haxelib
 
-src/main.$(MODULE_EXT): src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/typing/error.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/path.$(MODULE_EXT) src/optimization/filters.$(MODULE_EXT) src/typing/matcher.$(MODULE_EXT) src/typing/typer.$(MODULE_EXT) src/typing/typeload.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/parser.$(MODULE_EXT) src/optimization/optimizer.$(MODULE_EXT) src/syntax/lexer.$(MODULE_EXT) src/macro/interp.$(MODULE_EXT) src/generators/genxml.$(MODULE_EXT) src/generators/genswf.$(MODULE_EXT) src/generators/genphp.$(MODULE_EXT) src/generators/genphp7.$(MODULE_EXT) src/generators/genneko.$(MODULE_EXT) src/generators/genjs.$(MODULE_EXT) src/generators/genlua.$(MODULE_EXT) src/generators/gencpp.$(MODULE_EXT) src/generators/genas3.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/generators/codegen.$(MODULE_EXT) src/generators/genjava.$(MODULE_EXT) src/generators/gencs.$(MODULE_EXT) src/generators/genpy.$(MODULE_EXT) src/generators/genhl.$(MODULE_EXT) src/display/display.$(MODULE_EXT) src/server.$(MODULE_EXT) src/display/displayOutput.$(MODULE_EXT) libs/ilib/il.$(LIB_EXT)
+install: uninstall
+	mkdir -p "$(DESTDIR)$(INSTALL_BIN_DIR)"
+	cp $(HAXE_OUTPUT) $(HAXELIB_OUTPUT) "$(DESTDIR)$(INSTALL_BIN_DIR)"
+	mkdir -p "$(DESTDIR)$(INSTALL_STD_DIR)"
+	cp -r std/* "$(DESTDIR)$(INSTALL_STD_DIR)"
 
-src/globals.$(MODULE_EXT): src/version.$(MODULE_EXT)
+uninstall:
+	rm -rf $(DESTDIR)$(INSTALL_BIN_DIR)/$(HAXE_OUTPUT) $(DESTDIR)$(INSTALL_BIN_DIR)/$(HAXELIB_OUTPUT)
+	if [ -d "$(DESTDIR)$(INSTALL_LIB_DIR)/lib" ] && find "$(DESTDIR)$(INSTALL_LIB_DIR)/lib" -mindepth 1 -print -quit | grep -q .; then \
+		echo "The local haxelib repo at $(DESTDIR)$(INSTALL_LIB_DIR)/lib will not be removed. Remove it manually if you want."; \
+		find $(DESTDIR)$(INSTALL_LIB_DIR)/ ! -name 'lib' -mindepth 1 -maxdepth 1 -exec rm -rf {} +; \
+	else \
+		rm -rf $(DESTDIR)$(INSTALL_LIB_DIR); \
+	fi
+	rm -rf $(DESTDIR)$(INSTALL_STD_DIR)
 
-src/path.$(MODULE_EXT): src/globals.$(MODULE_EXT)
+opam_install:
+	opam install $(OPAM_LIBS) camlp5 ocamlfind --yes
 
-src/server.$(MODULE_EXT): src/context/meta.$(MODULE_EXT) src/globals.$(MODULE_EXT) src/path.$(MODULE_EXT) src/typing/typer.$(MODULE_EXT) src/typing/typeload.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/syntax/parser.$(MODULE_EXT) src/typing/typecore.$(MODULE_EXT) src/typing/type.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/context/common.$(MODULE_EXT) src/syntax/parser.$(MODULE_EXT) src/syntax/ast.$(MODULE_EXT) src/display/displayOutput.$(MODULE_EXT)
+# Dependencies
 
-src/version.$(MODULE_EXT):
-	$(MAKE) -f Makefile.version_extra -s --no-print-directory ADD_REVISION=$(ADD_REVISION) BRANCH=$(BRANCH) COMMIT_SHA=$(COMMIT_SHA) COMMIT_DATE=$(COMMIT_DATE) > src/version.ml
-	$(COMPILER) $(ALL_CFLAGS) -c src/version.ml
+-include Makefile.dependencies
 
 # Package
 
@@ -294,7 +231,7 @@ package_unix:
 	rm -rf $(PACKAGE_FILE_NAME) $(PACKAGE_FILE_NAME).tar.gz
 	# Copy the package contents to $(PACKAGE_FILE_NAME)
 	mkdir -p $(PACKAGE_FILE_NAME)
-	cp -r $(OUTPUT) haxelib$(EXTENSION) std extra/LICENSE.txt extra/CONTRIB.txt extra/CHANGES.txt $(PACKAGE_FILE_NAME)
+	cp -r $(HAXE_OUTPUT) $(HAXELIB_OUTPUT) std extra/LICENSE.txt extra/CONTRIB.txt extra/CHANGES.txt $(PACKAGE_FILE_NAME)
 	# archive
 	tar -zcf $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_bin.tar.gz $(PACKAGE_FILE_NAME)
 	rm -r $(PACKAGE_FILE_NAME)
@@ -302,23 +239,25 @@ package_unix:
 package_bin: package_$(PLATFORM)
 
 xmldoc:
-	haxelib path hxcpp  || haxelib git hxcpp  https://github.com/HaxeFoundation/hxcpp
-	haxelib path hxjava || haxelib git hxjava https://github.com/HaxeFoundation/hxjava
-	haxelib path hxcs   || haxelib git hxcs   https://github.com/HaxeFoundation/hxcs
-	cd extra && haxe doc.hxml
+	cd extra && \
+	$(CURDIR)/$(HAXELIB_OUTPUT) newrepo && \
+	$(CURDIR)/$(HAXELIB_OUTPUT) git hxcpp  https://github.com/HaxeFoundation/hxcpp   && \
+	$(CURDIR)/$(HAXELIB_OUTPUT) git hxjava https://github.com/HaxeFoundation/hxjava  && \
+	$(CURDIR)/$(HAXELIB_OUTPUT) git hxcs   https://github.com/HaxeFoundation/hxcs    && \
+	PATH="$(CURDIR):$(PATH)" $(CURDIR)/$(HAXE_OUTPUT) doc.hxml
 
 $(INSTALLER_TMP_DIR):
 	mkdir -p $(INSTALLER_TMP_DIR)
 
 $(INSTALLER_TMP_DIR)/neko-osx64.tar.gz: $(INSTALLER_TMP_DIR)
-	wget http://nekovm.org/media/neko-2.1.0-osx64.tar.gz -O installer/neko-osx64.tar.gz
+	wget -nv http://nekovm.org/media/neko-2.1.0-osx64.tar.gz -O installer/neko-osx64.tar.gz
 
 # Installer
 
 package_installer_mac: $(INSTALLER_TMP_DIR)/neko-osx64.tar.gz package_unix
 	$(eval OUTFILE := $(shell pwd)/$(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_installer.tar.gz)
 	$(eval PACKFILE := $(shell pwd)/$(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_bin.tar.gz)
-	$(eval VERSION := $(shell haxe -version 2>&1))
+	$(eval VERSION := $(shell $(CURDIR)/$(HAXE_OUTPUT) -version 2>&1))
 	$(eval NEKOVER := $(shell neko -version 2>&1))
 	bash -c "rm -rf $(INSTALLER_TMP_DIR)/{resources,pkg,tgz,haxe.tar.gz}"
 	mkdir $(INSTALLER_TMP_DIR)/resources
@@ -364,27 +303,19 @@ package_installer_mac: $(INSTALLER_TMP_DIR)/neko-osx64.tar.gz package_unix
 clean: clean_libs clean_haxe clean_tools clean_package
 
 clean_libs:
-	make -C libs/extlib clean
-	make -C libs/extc clean
-	make -C libs/neko clean
-	make -C libs/ziplib clean
-	make -C libs/javalib clean
-	make -C libs/ilib clean
-	make -C libs/swflib clean
-	make -C libs/xml-light clean
-	make -C libs/ttflib clean
-	make -C libs/objsize clean
-	make -C libs/pcre clean
+	$(foreach lib,$(EXTLIB_LIBS),$(MAKE) -C libs/$(lib) clean &&) true
 
 clean_haxe:
-	rm -f -r  $(MODULES:%=src/%.obj) $(MODULES:%=src/%.o) $(MODULES:%=src/%.cmx) $(MODULES:%=src/%.cmi) $(MODULES:%=src/%.cmo) $(MODULES:%=src/%.cmt) src/syntax/lexer.ml src/version.ml $(OUTPUT)
+	rm -f -r _build $(HAXE_OUTPUT) $(PREBUILD_OUTPUT)
 
 clean_tools:
-	rm -f $(OUTPUT) haxelib
+	rm -f $(HAXE_OUTPUT) $(PREBUILD_OUTPUT) $(HAXELIB_OUTPUT)
 
 clean_package:
 	rm -rf $(PACKAGE_OUT_DIR)
 
+FORCE:
+
 # SUFFIXES
 
 .ml.cmx:
@@ -393,7 +324,4 @@ clean_package:
 .ml.cmo:
 	$(CC_CMD)
 
-.mll.ml:
-	ocamllex $<
-
-.PHONY: haxe libs version.cmx version.cmo haxelib
+.PHONY: haxe libs haxelib
diff --git a/Makefile.version_extra b/Makefile.version_extra
index 991233b6d5698d399daa2c78e991c74f805281f5..f423bf9975158768914fbe4f2b799f1cc915fe3b 100644
--- a/Makefile.version_extra
+++ b/Makefile.version_extra
@@ -5,7 +5,7 @@
 all: ;
 
 ifneq ($(ADD_REVISION),0)
-	$(info let version_extra = Some "(git build $(BRANCH) @ $(COMMIT_SHA))")
+	$(info let version_extra = Some ("git build $(BRANCH)","$(COMMIT_SHA)"))
 else
 	$(info let version_extra = None)
 endif
\ No newline at end of file
diff --git a/Makefile.win b/Makefile.win
index 343e2d550f8be7211d57bb6610071281f41fc411..098d6f462f5ae0e213ddd7e98c8ef90ae05948bd 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,10 +1,16 @@
 PLATFORM=win
+MAKEFILENAME=Makefile.win
 include Makefile
-OUTPUT=haxe.exe
+HAXE_OUTPUT=haxe.exe
+HAXELIB_OUTPUT=haxelib.exe
+PREBUILD_OUTPUT=prebuild.exe
 EXTENSION=.exe
 PACKAGE_SRC_EXTENSION=.zip
+ARCH?=32
 
-OCAMLOPT=ocamlopt.opt
+ifeq ($(ARCH),64)
+NEKO_ARCH_STR=64
+endif
 
 kill:
 	-@taskkill /F /IM haxe.exe
@@ -28,15 +34,17 @@ FILTER=sed 's/File "\([^"]\+\)", line \([0-9]\+\), \(.*\)/\1(\2): \3/' tmp.cmi
 endif
 
 ifeq (${FD_OUTPUT}, 1)
-FILTER=sed '/File/{ N; s/File "\([^"]\+\)", line \([0-9]\+\), characters \([0-9-]\+\):[\r\n]*\(.*\)/\1:\2: characters \3 : \4/ }' tmp.cmi
+FILTER=sed -e '/File/{ N; s/File "\([^"]\+\)", line \([0-9]\+\), characters \([0-9-]\+\):[\r\n]*\(.*\)/\1:\2: characters \3 : \4/ }' -e 's/_build\/src\//src\//' tmp.cmi
 endif
 
 ifdef FILTER
-CC_CMD=($(OCAMLOPT) $(ALL_CFLAGS) -c $< 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
-CC_PARSER_CMD=($(OCAMLOPT) -pp camlp4o $(ALL_CFLAGS) -c src/syntax/parser.ml 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
+CC_CMD=($(COMPILER) $(ALL_CFLAGS) -c $< 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
 endif
 
-PACKAGE_FILES=$(OUTPUT) haxelib$(EXTENSION) std "$$(cygpath -w "$$(which zlib1.dll)")" "$$(cygpath -w "$$(which libpcre-1.dll)")"
+PACKAGE_FILES=$(HAXE_OUTPUT) $(HAXELIB_OUTPUT) std "$$(cygcheck $(CURDIR)/$(HAXE_OUTPUT) | grep zlib1.dll | sed -e 's/^\s*//')" "$$(cygcheck $(CURDIR)/$(HAXE_OUTPUT) | grep libpcre-1.dll | sed -e 's/^\s*//')"
+
+echo_package_files:
+	echo $(PACKAGE_FILES)
 
 package_win:
 	mkdir -p out
@@ -57,17 +65,16 @@ package_choco:
 	mkdir -p OUTPUT
 	7z x -y out/$(PACKAGE_FILE_NAME)_bin.zip -oout > log.txt || type log.txt
 	mv out/$(PACKAGE_FILE_NAME) out/choco
-	sed -e 's/@SNAPSHOT_VERSION@/$(HAXE_VERSION)-SNAP$(COMMIT_DATE)/g' extra/choco/haxe.nuspec > out/choco/haxe.nuspec
+	sed -e 's/@SNAPSHOT_VERSION@/$(HAXE_VERSION_SHORT)-SNAP$(COMMIT_DATE)/g' extra/choco/haxe.nuspec > out/choco/haxe.nuspec
 	cd out/choco && choco pack
 	mv out/choco/haxe.*.nupkg out
 	rm -rf out/choco
 
 $(INSTALLER_TMP_DIR)/neko-win.zip: $(INSTALLER_TMP_DIR)
-	wget http://nekovm.org/media/neko-2.1.0-win.zip -O installer/neko-win.zip
+	wget -nv https://nekovm.org/media/neko-2.2.0-win$(NEKO_ARCH_STR).zip -O installer/neko-win.zip
 
 package_installer_win: $(INSTALLER_TMP_DIR)/neko-win.zip package_win
 	$(eval OUTFILE := $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_installer.zip)
-	$(eval VERSION := $(shell haxe -version 2>&1 | cut -d ' ' -f1))
 	rm -rf $(INSTALLER_TMP_DIR)/resources
 	# neko
 	mkdir $(INSTALLER_TMP_DIR)/resources
@@ -78,17 +85,19 @@ package_installer_win: $(INSTALLER_TMP_DIR)/neko-win.zip package_win
 	7z x -y $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_bin.zip -o$(INSTALLER_TMP_DIR)/resources
 	mv $(INSTALLER_TMP_DIR)/resources/haxe* $(INSTALLER_TMP_DIR)/resources/haxe
 	# haxesetup.exe
-	haxelib path hxcpp || haxelib install hxcpp
-	cd extra; haxelib run hxcpp build-haxesetup.xml
+	cd extra && \
+	$(CURDIR)/$(HAXELIB_OUTPUT) newrepo && \
+	$(CURDIR)/$(HAXELIB_OUTPUT) install hxcpp --quiet && \
+	$(CURDIR)/$(HAXELIB_OUTPUT) run hxcpp build-haxesetup.xml
 	cp extra/haxesetup.exe $(INSTALLER_TMP_DIR)/resources/haxe
 	# extra
 	cp extra/*.nsi $(INSTALLER_TMP_DIR)
 	cp extra/*.nsh $(INSTALLER_TMP_DIR)
 	cp -rf extra/images $(INSTALLER_TMP_DIR)
 	# nsis
-	sed -i "s/%%VERSION%%/$(VERSION)/g" $(INSTALLER_TMP_DIR)/installer.nsi
-	sed -i "s/%%VERSTRING%%/$(VERSION)/g" $(INSTALLER_TMP_DIR)/installer.nsi
-	sed -i "s/%%VERLONG%%/$(VERSION)/g" $(INSTALLER_TMP_DIR)/installer.nsi
+	sed -i "s/%%VERSION%%/$(HAXE_VERSION_SHORT)/g" $(INSTALLER_TMP_DIR)/installer.nsi
+	sed -i "s/%%VERSTRING%%/$(HAXE_VERSION)/g" $(INSTALLER_TMP_DIR)/installer.nsi
+	sed -i "s/%%VERLONG%%/$(HAXE_VERSION)/g" $(INSTALLER_TMP_DIR)/installer.nsi
 	cd $(INSTALLER_TMP_DIR) && makensis installer.nsi
 	7z a -r -tzip $(OUTFILE) $(INSTALLER_TMP_DIR)/*.exe
 	dir $(PACKAGE_OUT_DIR)
diff --git a/README.md b/README.md
index a85db2d94a2a496328c8b08124a797fa7c7875c4..21c57647dabebd1de96695854119c60031c57622 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,15 @@
+<p align="center">
+  <a href="https://haxe.org/" title="haxe.org"><img src="extra/images/Readme.png" /></a>
+</p>
 
-# [<img src="http://haxe.org/img/haxe-logo-horizontal.svg" alt="Haxe logo" width="140">](https://haxe.org) - [The Cross-Platform Toolkit](https://haxe.org)
-[![TravisCI Build Status](https://travis-ci.org/HaxeFoundation/haxe.svg?branch=development)](https://travis-ci.org/HaxeFoundation/haxe)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/HaxeFoundation/haxe?branch=development&svg=true)](https://ci.appveyor.com/project/HaxeFoundation/haxe)
-[![SauceLabs Test Status](https://saucelabs.com/buildstatus/haxe)](https://saucelabs.com/u/haxe)
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/HaxeFoundation/haxe?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+<p align="center">
+	<a href="https://dev.azure.com/HaxeFoundation/GitHubPublic/_build/latest?definitionId=1&branchName=development"><img src="https://dev.azure.com/HaxeFoundation/GitHubPublic/_apis/build/status/HaxeFoundation.haxe?branchName=development" alt="Azure Pipelines Build Status"></a>
+	<a href="https://saucelabs.com/u/haxe"><img src="https://saucelabs.com/buildstatus/haxe" alt="SauceLabs Test Status"></a>
+	<a href="https://gitter.im/HaxeFoundation/haxe?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge"><img src="https://badges.gitter.im/Join%20Chat.svg" alt="Gitter"></a>
+	<a href="https://discordapp.com/invite/0uEuWH3spjck73Lo"><img src="https://img.shields.io/discord/162395145352904705.svg?logo=discord" alt="Discord"></a>
+</p>
+
+#
 
 Haxe is an open source toolkit that allows you to easily build cross-platform tools and applications that target many mainstream platforms. The Haxe toolkit includes:
 
@@ -13,21 +19,22 @@ Haxe is an open source toolkit that allows you to easily build cross-platform to
 
 Haxe allows you to compile for the following targets:
 
- * ActionScript 3
+ * JavaScript
  * C++
  * C#
- * Flash
  * Java
- * JavaScript
- * NekoVM
- * PHP
- * Python
  * Lua
- * [HashLink](http://hashlink.haxe.org/)
+ * PHP
+ * Python 3
+ * [HashLink](https://hashlink.haxe.org/)
+ * [NekoVM](https://nekovm.org/)
+ * Flash (SWF Bytecode)
+ * ActionScript 3
+ * And its own [interpreter](https://haxe.org/blog/eval/)
 
-You can try Haxe directly from your browser at [try.haxe.org](http://try.haxe.org)!
+You can try Haxe directly from your browser at [try.haxe.org](https://try.haxe.org)!
 
-For more information about Haxe, head to the [offical Haxe website](https://haxe.org).
+For more information about Haxe, head to the [official Haxe website](https://haxe.org).
 
 ## License
 
@@ -55,45 +62,45 @@ Automated development builds are available from [build.haxe.org](http://build.ha
 
 ## Building from source
 
- 1. Clone the repository using git. Be sure to initialize and fetch the submodules.
-
-        git clone --recursive git://github.com/HaxeFoundation/haxe.git
-        cd haxe
-
- 2. Follow the [documentation on building Haxe for your platform](https://haxe.org/documentation/introduction/building-haxe.html).
+See [extra/BUILDING.md](extra/BUILDING.md).
 
 ## Using Haxe
 
-For information on on using Haxe, consult the [Haxe documentation](https://haxe.org/documentation/):
+For information on using Haxe, consult the [Haxe documentation](https://haxe.org/documentation/):
 
  * [Haxe Introduction](https://haxe.org/documentation/introduction/), an introduction to the Haxe toolkit
  * [The Haxe Manual](https://haxe.org/manual/), the reference manual for the Haxe language
- * [Haxe Code Cookbook](http://code.haxe.org), code snippets / learning resource
- * [Haxe API](http://api.haxe.org), documentation for the Haxe standard and native APIs
- * [Haxelib](https://lib.haxe.org), a repository of Haxe libraries for a variety of needs
+ * [Haxe Code Cookbook](https://code.haxe.org), code snippets / learning resource
+ * [Haxe API](https://api.haxe.org), documentation for the Haxe standard and native APIs
+ * [Haxelib](https://lib.haxe.org), Haxelib is the package manager for the Haxe Toolkit.
 
 ## Community
 
 You can get help and talk with fellow Haxers from around the world via:
 
- * [Haxe on Stack Overflow](http://stackoverflow.com/questions/tagged/haxe)
- * the [official Haxe Google Group](https://groups.google.com/forum/#!forum/haxelang)
- * [#Haxe on Twitter](https://twitter.com/hashtag/haxe?src=hash)
- * the [Haxe IRC chatroom](http://unic0rn.github.io/tiramisu/haxe), #haxe on chat.freenode.net
+ * [Haxe Community Forum](http://community.haxe.org)
+ * [Haxe on Stack Overflow](https://stackoverflow.com/questions/tagged/haxe)
+ * [Haxe Gitter chatroom](https://gitter.im/HaxeFoundation/haxe/)
+ * [Haxe Discord server](https://discordapp.com/invite/0uEuWH3spjck73Lo)
+ * [#haxe on Twitter](https://twitter.com/hashtag/haxe?src=hash)
 
-:+1: Get notified of the latest Haxe news, follow us on [Twitter](https://twitter.com/haxelang), [Facebook](https://www.facebook.com/haxe.org) or [Google+](https://plus.google.com/+HaxeOrg)
+:+1: Get notified of the latest Haxe news, follow us on [Twitter](https://twitter.com/haxelang), [Facebook](https://www.facebook.com/haxe.org) and don't forget to read the [Haxe roundups](https://haxe.io/).
 
 ## Version compatibility
 
-Haxe   | neko
-----   | -----
-2.*    | 1.*
-3.0.0  | 2.0.0
-3.1.3  | 2.0.0
-3.2.0  | 2.0.0
-3.3.0  | 2.1.0
-3.4.0  | 2.1.0
-
+Haxe            | Neko  | SWF |  Python   | HL    | PHP   | Lua  |
+----            | ----  | ----   | ----   |  ---- | ----  | ---- |
+2.*             | 1.*   | 8-10   | -      | -     | -     | -    |
+3.0.0           | 2.0.0 |        | -      | -     | 5.1+  | -    |
+3.2.0           |       | 12-14  | 3.2+   | -     |       | -    |
+3.3.0           | 2.1.0 | 21     |        | -     |       | 5.1, 5.2, 5.3, LuaJIT 2.0, 2.1 |
+3.4.0           |       |        |        | 1.1   | 5.4+ and 7.0+ (with `-D php7`)   |      |
+4.0.0-preview.1 |       |        |        | 1.2   | 7.0+  |      |
+4.0.0-preview.3 |       |        |        | 1.3   |       |      |
+4.0.0-preview.4 |       |        |        | 1.6   |       |      |
+4.0.0-preview.5 |       |        |        | 1.8   |       |      |
+4.0.0-rc.1      |       |        |        | 1.9   |       |      |
+4.0.0-rc.3      |       |        |        | 1.10  |       |      |
 
 ## Contributing
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9a4326b1de7876ba8c74307737465c3b9f590a82
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,303 @@
+variables:
+  - group: variables-haxe
+  - name: AZURE_PIPELINES_REPO_URL
+    value: $(Build.Repository.Uri)
+  - name: AZURE_PIPELINES_BRANCH
+    value: $(Build.SourceBranchName)
+
+stages:
+  - stage: StageTest
+    jobs:
+      - template: extra/azure-pipelines/build-linux.yml
+        parameters:
+          name: BuildLinux
+
+      - template: extra/azure-pipelines/build-mac.yml
+        parameters:
+          name: BuildMac
+
+      - template: extra/azure-pipelines/build-windows.yml
+        parameters:
+          name: BuildWin64
+          arch: '64'
+
+      - template: extra/azure-pipelines/build-windows.yml
+        parameters:
+          name: BuildWin32
+          arch: '32'
+
+      - job: TestLinux
+        dependsOn: BuildLinux
+        pool:
+          vmImage: 'ubuntu-16.04'
+        strategy:
+          matrix:
+            macro:
+              TEST: macro
+            neko:
+              TEST: neko
+            hl:
+              TEST: hl
+              APT_PACKAGES: cmake ninja-build
+            cpp:
+              TEST: cpp
+              HXCPP_COMPILE_CACHE: ~/hxcache
+              APT_PACKAGES: gcc-multilib g++-multilib
+            java:
+              TEST: java,jvm
+            cs:
+              TEST: cs
+            js:
+              TEST: js
+              SAUCE: 1
+              SAUCE_TUNNEL_ID: $(Agent.JobName)
+              SAUCE_BUILD: $(Build.BuildNumber)
+            php:
+              TEST: php
+            flash:
+              TEST: flash9,as3
+              APT_PACKAGES: libglib2.0 libfreetype6 xvfb
+              DISPLAY: ':99.0'
+              AUDIODEV: 'null'
+            python:
+              TEST: python
+            lua:
+              TEST: lua
+              APT_PACKAGES: ncurses-dev
+        steps:
+          - checkout: self
+            fetchDepth: 20
+          - template: extra/azure-pipelines/install-neko-snapshot.yaml
+            parameters:
+              platform: linux64
+          - task: DownloadPipelineArtifact@0
+            inputs:
+              artifactName: 'linuxBinaries'
+              targetPath: linuxBinaries
+          - script: |
+              set -ex
+              tar -xf linuxBinaries/*_bin.tar.gz -C linuxBinaries --strip-components=1
+              sudo mkdir -p /usr/local/bin/
+              sudo mkdir -p /usr/local/share/haxe/
+              sudo ln -s `pwd`/linuxBinaries/haxe /usr/local/bin/haxe
+              sudo ln -s `pwd`/linuxBinaries/haxelib /usr/local/bin/haxelib
+              sudo ln -s `pwd`/linuxBinaries/std /usr/local/share/haxe/std
+            displayName: Setup Haxe
+          - script: haxe -version
+            displayName: Print Haxe version
+          - script: |
+              set -ex
+              mkdir ~/haxelib
+              haxelib setup ~/haxelib
+            displayName: Setup haxelib
+          - script: |
+              set -ex
+              sudo apt update -qqy
+              sudo apt install -qqy $APT_PACKAGES
+            condition: and(succeeded(), variables['APT_PACKAGES'])
+            displayName: Install apt packages
+          - script: haxe RunCi.hxml
+            workingDirectory: $(Build.SourcesDirectory)/tests
+            env:
+              ${{ if variables['SAUCE_ACCESS_KEY'] }}:
+                SAUCE_ACCESS_KEY: $(SAUCE_ACCESS_KEY)
+            displayName: Test
+
+      - job: TestMac
+        dependsOn: BuildMac
+        pool:
+          vmImage: 'macOS-10.13'
+        strategy:
+          matrix:
+            macro:
+              TEST: macro
+            neko:
+              TEST: neko
+            hl:
+              TEST: hl
+              BREW_PACKAGES: ninja
+            cpp:
+              TEST: cpp
+              HXCPP_COMPILE_CACHE: ~/hxcache
+            java:
+              TEST: java,jvm
+            cs:
+              TEST: cs
+            js:
+              TEST: js
+            php:
+              TEST: php
+            flash:
+              TEST: flash9,as3
+            python:
+              TEST: python
+            lua:
+              TEST: lua
+        steps:
+          - checkout: self
+            fetchDepth: 20
+          - template: extra/azure-pipelines/install-neko-snapshot.yaml
+            parameters:
+              platform: mac
+          - task: DownloadPipelineArtifact@0
+            inputs:
+              artifactName: 'macBinaries'
+              targetPath: macBinaries
+          - script: |
+              set -ex
+              tar -xf macBinaries/*_bin.tar.gz -C macBinaries --strip-components=1
+              sudo mkdir -p /usr/local/bin/
+              sudo mkdir -p /usr/local/share/haxe/
+              sudo ln -s `pwd`/macBinaries/haxe /usr/local/bin/haxe
+              sudo ln -s `pwd`/macBinaries/haxelib /usr/local/bin/haxelib
+              sudo ln -s `pwd`/macBinaries/std /usr/local/share/haxe/std
+            displayName: Setup Haxe
+          - script: haxe -version
+            displayName: Print Haxe version
+          - script: |
+              set -ex
+              mkdir ~/haxelib
+              haxelib setup ~/haxelib
+            displayName: Setup haxelib
+          - script: brew install $BREW_PACKAGES
+            condition: and(succeeded(), variables['BREW_PACKAGES'])
+            displayName: Install homebrew packages
+          - script: haxe RunCi.hxml
+            workingDirectory: $(Build.SourcesDirectory)/tests
+            displayName: Test
+
+      - template: extra/azure-pipelines/test-windows.yml
+        parameters:
+          name: TestWin64
+          arch: '64'
+
+      - template: extra/azure-pipelines/test-windows.yml
+        parameters:
+          name: TestWin32
+          arch: '32'
+
+  - stage: StageDeploy
+    condition: and(succeeded(), not(variables['System.PullRequest.PullRequestId']))
+    jobs:
+      - job: S3
+        condition: and(succeeded(), variables['HXBUILDS_AWS_ACCESS_KEY_ID'], variables['HXBUILDS_S3ADDR'])
+        pool:
+          vmImage: 'ubuntu-16.04'
+        steps:
+          - checkout: self
+            fetchDepth: 20
+          - task: DownloadPipelineArtifact@0
+            inputs:
+              artifactName: 'linuxBinaries'
+              targetPath: linuxBinaries
+            displayName: Download linuxBinaries
+          - task: DownloadPipelineArtifact@0
+            inputs:
+              artifactName: 'macBinaries'
+              targetPath: macBinaries
+            displayName: Download macBinaries
+          - task: DownloadPipelineArtifact@0
+            inputs:
+              artifactName: 'win64Binaries'
+              targetPath: win64Binaries
+            displayName: Download win64Binaries
+          - task: DownloadPipelineArtifact@0
+            inputs:
+              artifactName: 'win32Binaries'
+              targetPath: win32Binaries
+            displayName: Download win32Binaries
+          - template: extra/azure-pipelines/install-neko-snapshot.yaml
+            parameters:
+              platform: linux64
+          - script: |
+              set -ex
+              tar -xf linuxBinaries/*_bin.tar.gz -C linuxBinaries --strip-components=1
+              sudo mkdir -p /usr/local/bin/
+              sudo mkdir -p /usr/local/share/haxe/
+              sudo ln -s `pwd`/linuxBinaries/haxe /usr/local/bin/haxe
+              sudo ln -s `pwd`/linuxBinaries/haxelib /usr/local/bin/haxelib
+              sudo ln -s `pwd`/linuxBinaries/std /usr/local/share/haxe/std
+            displayName: Setup Haxe
+          - script: |
+              set -ex
+              sudo apt-get update -qqy
+              sudo apt-get install -qqy awscli
+            displayName: "Install awscli"
+          - script: |
+              set -ex
+              COMMIT_HASH=`git rev-parse HEAD`
+              COMMIT_HASH_SHORT=${COMMIT_HASH:0:7}
+              COMMIT_DATE=`TZ=UTC git show --quiet --date='format-local:%Y-%m-%d' --format="%cd"`
+              FILE_NAME=haxe_${COMMIT_DATE}_$(Build.SourceBranchName)_${COMMIT_HASH_SHORT}
+              aws s3 cp linuxBinaries/*_bin.tar.gz      $(HXBUILDS_S3ADDR)/haxe/linux64/${FILE_NAME}.tar.gz
+              aws s3 cp macBinaries/*_bin.tar.gz        $(HXBUILDS_S3ADDR)/haxe/mac/${FILE_NAME}.tar.gz
+              aws s3 cp macBinaries/*_installer.tar.gz  $(HXBUILDS_S3ADDR)/haxe/mac-installer/${FILE_NAME}.tar.gz
+              aws s3 cp win64Binaries/*_bin.zip         $(HXBUILDS_S3ADDR)/haxe/windows64/${FILE_NAME}.zip
+              aws s3 cp win64Binaries/*_installer.zip   $(HXBUILDS_S3ADDR)/haxe/windows64-installer/${FILE_NAME}.zip
+              aws s3 cp win64Binaries/*.nupkg           $(HXBUILDS_S3ADDR)/haxe/windows64-choco/
+              aws s3 cp win32Binaries/*_bin.zip         $(HXBUILDS_S3ADDR)/haxe/windows/${FILE_NAME}.zip
+              aws s3 cp win32Binaries/*_installer.zip   $(HXBUILDS_S3ADDR)/haxe/windows-installer/${FILE_NAME}.zip
+              aws s3 cp win32Binaries/*.nupkg           $(HXBUILDS_S3ADDR)/haxe/windows-choco/
+            env:
+              AWS_ACCESS_KEY_ID: $(HXBUILDS_AWS_ACCESS_KEY_ID)
+              AWS_SECRET_ACCESS_KEY: $(HXBUILDS_AWS_SECRET_ACCESS_KEY)
+            displayName: Upload binaries
+          - script: |
+              set -ex
+              aws s3 cp linuxBinaries/*_bin.tar.gz      $(HXBUILDS_S3ADDR)/haxe/linux64/haxe_latest.tar.gz
+              aws s3 cp macBinaries/*_bin.tar.gz        $(HXBUILDS_S3ADDR)/haxe/mac/haxe_latest.tar.gz
+              aws s3 cp macBinaries/*_installer.tar.gz        $(HXBUILDS_S3ADDR)/haxe/mac-installer/haxe_latest.tar.gz
+              aws s3 cp win64Binaries/*_bin.zip         $(HXBUILDS_S3ADDR)/haxe/windows64/haxe_latest.zip
+              aws s3 cp win64Binaries/*_installer.zip   $(HXBUILDS_S3ADDR)/haxe/windows64-installer/haxe_latest.zip
+              aws s3 cp win32Binaries/*_bin.zip         $(HXBUILDS_S3ADDR)/haxe/windows/haxe_latest.zip
+              aws s3 cp win32Binaries/*_installer.zip   $(HXBUILDS_S3ADDR)/haxe/windows-installer/haxe_latest.zip
+
+              # Chocolatey packages have to be named with version number,
+              # so let's use web redirection to keep the original file name.
+              [[ "$HXBUILDS_S3ADDR" =~ s3://([^/]+)(.*) ]] && HXBUILDS_S3BUCKET="${BASH_REMATCH[1]}" && HXBUILDS_S3PATH="${BASH_REMATCH[2]}"
+              [[ `echo win64Binaries/*.nupkg` =~ win64Binaries/(.+) ]] && FILE_NAME="${BASH_REMATCH[1]}"
+              aws s3 cp $(HXBUILDS_S3ADDR)/haxe/windows64-choco/${FILE_NAME} $(HXBUILDS_S3ADDR)/haxe/windows64-choco/haxe_latest.nupkg --acl public-read --website-redirect "${HXBUILDS_S3PATH}/haxe/windows64-choco/${FILE_NAME}"
+              [[ `echo win32Binaries/*.nupkg` =~ win32Binaries/(.+) ]] && FILE_NAME="${BASH_REMATCH[1]}"
+              aws s3 cp $(HXBUILDS_S3ADDR)/haxe/windows-choco/${FILE_NAME}   $(HXBUILDS_S3ADDR)/haxe/windows-choco/haxe_latest.nupkg   --acl public-read --website-redirect "${HXBUILDS_S3PATH}/haxe/windows-choco/${FILE_NAME}"
+            env:
+              AWS_ACCESS_KEY_ID: $(HXBUILDS_AWS_ACCESS_KEY_ID)
+              AWS_SECRET_ACCESS_KEY: $(HXBUILDS_AWS_SECRET_ACCESS_KEY)
+            condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'development'))
+            displayName: Update "latest"
+
+      - job: ApiHaxeOrg
+        condition: and(succeeded(), variables['GHP_USERNAME'], variables['GHP_EMAIL'])
+        pool:
+          vmImage: 'ubuntu-16.04'
+        steps:
+          - checkout: none
+          - template: extra/azure-pipelines/install-neko-snapshot.yaml
+            parameters:
+              platform: linux64
+          - task: DownloadPipelineArtifact@0
+            inputs:
+              artifactName: 'linuxBinaries'
+              targetPath: linuxBinaries
+            displayName: Download linuxBinaries
+          - script: |
+              set -ex
+              tar -xf linuxBinaries/*_bin.tar.gz -C linuxBinaries --strip-components=1
+              sudo mkdir -p /usr/local/bin/
+              sudo mkdir -p /usr/local/share/haxe/
+              sudo ln -s `pwd`/linuxBinaries/haxe /usr/local/bin/haxe
+              sudo ln -s `pwd`/linuxBinaries/haxelib /usr/local/bin/haxelib
+              sudo ln -s `pwd`/linuxBinaries/std /usr/local/share/haxe/std
+            displayName: Setup Haxe
+          - task: DownloadPipelineArtifact@0
+            inputs:
+              artifactName: 'xmldoc'
+              targetPath: xmldoc
+            displayName: Download xmldoc
+          - script: |
+              set -ex
+              LOCAL="`pwd`/extra/api.haxe.org"
+              git clone "${GHP_REMOTE}" "${LOCAL}"
+              haxe --cwd "${LOCAL}" --run ImportXml "`pwd`/xmldoc"
+            env:
+              GHP_REMOTE: $(GHP_REMOTE)
+            displayName: Deploy to api.haxe.org
\ No newline at end of file
diff --git a/extra/BUILDING.md b/extra/BUILDING.md
new file mode 100644
index 0000000000000000000000000000000000000000..18c80933b48b3c57fbf92858bf720476a1e9cc5e
--- /dev/null
+++ b/extra/BUILDING.md
@@ -0,0 +1,79 @@
+# Building Haxe from source
+
+## Obtaining the source
+
+The Haxe compiler source files are hosted on GitHub under the [HaxeFoundation account](https://github.com/HaxeFoundation). The [Haxe repository](https://github.com/HaxeFoundation/haxe) has several submodules, so cloning it should be done with the `--recursive` flag like so:
+
+```
+git clone --recursive https://github.com/HaxeFoundation/haxe.git
+```
+
+Alternatively, source .zip archives or tarballs can be obtained from the [GitHub Haxe release overview](https://github.com/HaxeFoundation/haxe/releases). However, the git submodules are not included, so you will have to manually place the source code of [submodules](https://github.com/HaxeFoundation/haxe/blob/development/.gitmodules) into appropriate sub-folders.
+
+## Setting up OCaml
+
+The Haxe compiler is written in OCaml, so you have to set up an OCaml development environment. In addition, we make use of a number of OCaml libraries. We recommend using OPAM, which is an OCaml package manager that can also manage OCaml installations.
+
+The Haxe compiler requires OCaml version 4.02 or higher. Since some of the OCaml libraries Haxe depends on were uploaded in the OPAM 2 format, you should use OPAM 2.x instead of OPAM 1.x.
+
+To install OPAM on Unix (e.g. Mac, Linux) systems, follow the [instruction given by OPAM](https://opam.ocaml.org/doc/Install.html). On Windows, we recommend using the [Cygwin/MinGW-based OPAM environment provided by fdopen](https://fdopen.github.io/opam-repository-mingw/installation/), choose the 64-bit versions of everything, also make sure to [use the OPAM 2 version](https://github.com/fdopen/opam-repository-mingw/issues/48).
+
+In case you messed up the OPAM installation, you can uninstall OPAM and remove `~/.opam`, which contains the OCaml switches (OCaml compilers and libraries), and start over.
+
+Also note that since OPAM 2 on Linux will try to use bubblewrap, which uses Linux user namespaces, which might not be available on environments like Docker or Windows Subsystem for Linux (WSL). In case of encountering related errors, use `--disable-sandboxing` during `opam init`.
+
+## Installing dependencies
+
+You need to install some native libraries as well as some OCaml libraries.
+
+ * Native libraries
+    * PCRE
+    * zlib
+    * Neko (for building haxelib)
+ * OCaml libraries
+    * listed in the `opam` file at the repository root
+
+To install the native libraries, use the appropriate system package manager.
+
+ * Mac OS X
+    * Use [Homebrew](https://brew.sh/), `brew install zlib pcre`.
+ * Debian / Ubuntu
+    * `sudo apt install libpcre3-dev zlib1g-dev`.
+ * Windows (Cygwin)
+    * Run the Cygwin [setup-x86_64.exe](https://cygwin.com/install.html) against the Cygwin installation directory. Install `make`, `git`, `zlib-devel`, `libpcre-devel`, `mingw64-x86_64-gcc-core`, `mingw64-x86_64-zlib`, and `mingw64-x86_64-pcre`. You may need to select "Not Installed" in the dropdown list to see the packages. Copy `zlib1.dll` and `libpcre-1.dll` from `path/to/cygwin/usr/x86_64-w64-mingw32/sys-root/mingw/bin` to the checked out Haxe source directory.
+    * Install Neko by either
+      * Download the [Neko binaries](https://nekovm.org/download/), and add the extracted directory to the beginning of PATH.
+      * Install the [Chocolatey Neko package](https://chocolatey.org/packages/neko).
+
+To install the OCaml libraries, use OPAM as follows:
+
+```sh
+# pin the haxe package to the checked out Haxe source directory
+opam pin add haxe path/to/haxe --kind=path --no-action
+
+# install the haxe package dependencies (as listed in the `opam` file)
+opam install haxe --deps-only
+```
+
+## Compile
+
+In the checked out Haxe source directory,
+```sh
+# On Unix
+make
+
+# On Windows (Cygwin)
+make -f Makefile.win
+```
+
+## Install
+
+Generally, you should remove any existing Haxe installation to avoid conflict. You should at least make sure that the `HAXE_STD_PATH` environment variable is not set.
+
+To install the freshly built Haxe,
+
+ * On Unix (e.g. Mac and Linux),
+    ```sh
+    sudo make install
+    ```
+ * On Windows, add the checked out Haxe source directory to the beginning of PATH.
diff --git a/extra/CHANGES.txt b/extra/CHANGES.txt
index 9467aad824b034513eb448e143f3b3a0df9ce50c..3ef50ef642bae9b5bc403733d198964f2f8cdf29 100644
--- a/extra/CHANGES.txt
+++ b/extra/CHANGES.txt
@@ -1,20 +1,519 @@
-2018-02-21: 3.4.7
+2019-10-26: 4.0.0
+
+	General improvements:
+
+	js : updated externs for `Float32Array` and `Float64Array` (#8864)
+	php : added array access to `php.NativeStructArray` (#8893)
+
+	Bugfixes:
+
+	cs : fixed "This expression may be invalid" false warning (#8589)
+	php : fixed iterator fields on maps being removed (#8851)
+	php : fixed `-2147483648` as init value for static vars (#5289)
+	python : fixed modulo by a negative number (#8845)
+	java : fixed backslash escaping on `EReg.replace` (#3430)
+	lua : fixed `EReg.map` for unicode (#8861)
+	hl : fixed sqlite connection on OSX/Linux (#8878)
+
+2019-09-12: 4.0.0-rc.5
+
+	General improvements and optimizations:
+
+	eval: improved performance of regular expressions (#8693)
+
+	Bugfixes:
+
+	all: fixed regression, which caused compiler to crash on enum abstracts with explicit casting (#8765)
+	all: fixed regression of macro `@:from` methods on abstracts (#8779)
+	all: fixed switching on `this` (#8781)
+
+2019-09-04: 4.0.0-rc.4
+
+	Standard Library:
+
+	all : added Map.clear (#8681)
+	all : improved Date API (#8508)
+	all : added JSON-RPC protocol types to haxe.display package (#8610)
+	all : added default timeout to HTTP sockets (#8646)
+	macro : added Context.info (#8478)
+	macro : added Context.getMessages and Context.filterMessages (#8471)
+	macro : added function kind to EFunction (#8653)
+	macro : added string literal kind to CString (#8668)
+	flash : added flash.AnyType (#8549)
+
+	General improvements and optimizations:
+
+	all : allowed enum constructors without arguments as static inline var (#8187)
+	all : improved handling of default values when inlining (#8397)
+	all : made various improvements to the display API as usual
+	all : detect invalid #tokens in inactive code (#7108)
+	all : allowed function types in @:generic (#3697)
+	all : improved --help-defines and --help-metas
+	all : improved overall file finding (#8202)
+	all : improved server reaction to added and removed files (#8451)
+	all : improved memory handling of the compilation server (8727)
+	all : improved handling of native libraries on the compilation server (#8629)
+	all : support partial completion results (#8642)
+	all : improved support of hovering over inactive conditional compilation blocks
+	all : improved completion support in .platform.hx files
+	all : support hovering conditional compilation identifiers
+	all : improved and unified identifier checks for names, fields and types (#8708)
+	all : improved --times performance (#8733)
+	all : remove some redundant cast expressions (#8725)
+	all : added --server-connect (#8730)
+	lua : improved -D lua-vanilla
+	js : improved HTML externs
+
+	Bugfixes :
+
+	all : fixed various position and replace ranges in the display API
+	all : fixed compiler hang related to @:arrayAccess (#5525)
+	all : fixed bug regarding abstract `this` modification in inline methods (#8454)
+	all : fixed `from Dynamic` on abstracts (#8425)
+	all : fixed overeager recursive inline check (#8489)
+	all : fixed the pattern matcher allowing inexhaustive switches in value-places (#8277)
+	all : fixed pattern matcher allowing invalid abstract unification (#8579)
+	all : fixed local variable type information being lost on the compilation server (#8511)
+	all : don't generate return expressions in Void lambda functions (#6503)
+	all : fixed unification of recursive typedefs again (#8523)
+	all : fixed various hangs related to abstracts (#8588)
+	all : fixed various GADT-related problems (#7672)
+	all : fixed macro `@:from` methods allowing any return type (#8463)
+	macro : fixed Sys.programPath assertion failure (#8466)
+	js : fixed typed array APIs (#8422)
+	java : fixed Std.is on non-reference and unrelated types (#5168)
+	java/macro : fixed null-pointer exception in Reflect.getProperty (#4934)
+	java/jvm : fix switch on null string (#4481)
+	jvm : fixed boxed vs. unboxed comparison (#8577)
+	jvm : generate toplevel types to haxe.root like genjava does (#8590)
+	jvm : improved 32bit support (#8601)
+	cs/python : fixed various issues with code generation
+	cs : fixed NativeArray casting (#3949)
+
+2019-06-13: 4.0.0-rc.3
+
+	New features:
+
+	all : added JVM target
+
+	General improvements and optimizations:
+
+	all : create temp vars in pattern matcher to avoid duplicate access (#8064)
+	all : support parsing dots in conditional compilation, e.g. `#if target.sys`
+	all : added `@:bypassAccessor`
+	all : improved various aspects of the display API
+	all : properly error on `@:op(a = b)` (#6903)
+	all : made `@:using` actually work
+	all : properly disallowed some modifier combinations related to `final` (#8335)
+	all : support `@:pure(false)` on variable fields (#8338)
+	flash : updated Flash externs to version 32.0 (now using `final`, `enum abstract` and `haxe.extern.Rest`)
+	flash : rework support for native Flash properties (#8241)
+	php : improved performance of various parser implementations (#8083)
+	cs : support .NET core target (#8391)
+	cs : generate native type parameter constraints (#8311, #7863)
+
+	Standard Library:
+
+	all : added StringTools.contains (#7608)
+	all : turned sys.thread.Thread into abstracts (#8130)
+	all : introduced `Std.downcast` as replacement for `Std.instance` (#8301)
+	all : introduced `UnicodeString`, deprecated `haxe.Utf8` (#8298)
+	java : added java.NativeString (#8163)
+	cs : added sys.thread implementations (#8166)
+	js : moved various classes to js.lib (#7390)
+
+	Bugfixes
+
+	all : fixed issue with `@:generic` type parameters not being bound to Dynamic (#8102)
+	all : fixed various issues related to `@:structInit`
+	all : fixed top-down inference on abstract setters (#7674)
+	all : fixed DCE issue related to closures (#8200)
+	all : fixed and restricted various Unicode-related issues in String literals
+	all : fixed various priority issues regarding loops and iterators
+	all : fixed cast handling in try-catch expressions (#8257)
+	all : fixed `inline new` handling (#8240)
+	all : fixed pattern matcher issue with wildcards in or-patterns (#8296)
+	all : fixed `@:allow(package)` allowing too much (#8306)
+	all : fixed various issues with startIndex handling on String.indexOf and String.lastIndexOf
+	all : fixed infinite recursion related to printing of objects with circular references (#8113)
+	sys : fixed various Unicode issues (#8135)
+	macro : fixed Array.pop handling (#8075)
+	macro : fixed assertion failure when throwing exception (#8039)
+	macro : fixed various uncatchable exceptions being thrown
+	php : error on case-insensitive name clashes (#8219)
+	lua : fixed issue where Process output occasionally is missing some data
+	hl : fixed various String Unicode issues
+	java : fixed null exception in CallStack.exceptionStack (#8322)
+	js : fixed code generation issue related to negative abstract values (#8318)
+	flash : fix various issues, including native `protected` handling and method overloading
+
+	Removals:
+
+	all : remove support for `@:fakeEnum` enums
+	all : disallowed `\x` with values > 0x7F (#8141)
+	all : consistently disallowed metadata in lambda function arguments (#7800)
+	all : removed `--gen-hx-classes` (#8237)
+
+2019-03-22: 4.0.0-rc.2
+
+	New features:
+
+	all : added strictness settings for the null-safety checker, using loose checking by default (#7811)
+	js : added ES6 class generation with `-D js-es=6` (#7806)
+
+	General improvements and optimizations:
+
+	all : inherit `@:native` for overriden methods (#7844)
+	all : standardized identifiers allowed in markup literals (#7558)
+	all : show typo suggestions when declaring `override` field (#7847)
+	all : improved parser error messages (#7912)
+	all : improved diagnostics of syntax errors (#7940)
+	all : improved positions of `switch` and `case` expressions (#7947)
+	all : allow parsing `#if (a.b)` (#8005)
+	eval : improved performance of various string operations (#7982)
+	eval : fixed many error positions
+	eval : greatly improved debugger interaction (#7839)
+	eval : properly support threads when debugging (#7991)
+	eval : improved handling of capture variables (#8017)
+	js : generate dot-access for "keyword" field names (#7645)
+	js : optimized run-time type checking against interfaces (#7834)
+	js : skip generation of interfaces when no run-time type checking needed (#7843)
+
+	Standard Library:
+
+	all : unified various Thread APIs in sys.thread (#7999)
+	all : moved typed arrays from `js.html` to `js.lib` (#7894)
+	all : added `iterator()` to `haxe.DynamicAccess` (#7892)
+	all : added `keyValueIterator()` to `haxe.DynamicAccess` (#7769)
+	eval : completed Thread API
+
+	Bugfixes:
+
+	all : fixed argument default value checking for externs (#7752)
+	all : fixed optional status of overloaded arguments with default values (#7794)
+	all : fixed DCE compilation server state issue (#7805)
+	all : fixed compilation server module dependency issue related to macros (#7448)
+	all : fixed call-site inlining on abstracts (#7886)
+	all : fixed Constructible not checking constraints properly (#6714)
+	all : fixed @:structInit not being compatible with `final` fields (#7182)
+	all : fixed capture variables being allowed in `.match` (#7921)
+	all : fixed infinite recursion on `@:generic` field access (#6430)
+	all : fixed `-D no-deprecation-warnings` for typedefs and enums
+	js : fixed bad stack handling on `Map` constraint checks (#7781)
+	js : fixed DCE issues related to haxe.CallStack (#7908)
+	cpp : fixed Socket flags not being preserved (#7989)
+	lua : fixed broken output when compiling through the compilation server (#7851)
+	lua : fixed `StringTools.fastCodeAt` with `-D lua-vanilla` (#7589)
+	lua : fixed `@:expose` for classes inside packages (#7849)
+
+2019-02-01: 4.0.0-rc.1
+
+	New features:
+
+	all : added experimental null-safety feature through `--macro nullSafety("package")` (#7717)
+
+	General improvements and optimizations:
+
+	all : improved unification error messages (#7547)
+	all : added `haxe4` define
+	all : do not require semicolon for markup literals (#7438)
+	all : made `@:expose` imply `@:keep` (#7695)
+	all : unified cast, catch and Std.is behavior of null-values (#7532)
+	macro : static variables are now always re-initialized when using the compilation server (#5746)
+	macro : support `@:persistent` to keep macro static values across compilations
+	js : improve js.Promise extern: now `then` callback argument types can be properly inferred (#7644)
+
+	Bugfixes:
+
+	all : fixed various pattern matching problems
+	all : fixed various wrong positions when encoding data to macros
+	all : specified String.indexOf with out-of-bounds indices (#7601)
+	all : fixed various problems related to DCE and feature-handling (#7694)
+	all : fixed bad unary operator optimization (#7704)
+	js : fixed syntax problem related to `instanceof` (#7653)
+	flash : fixed var field access on interfaces being uncast (#7727)
+	cpp : fixed various issues related to casts
+	cpp : fixed some leftover unicode issues
+	php : fixed class naming conflicts (#7716)
+	eval : fixed Socket.setTimeout (#7682)
+	eval : fixed int switch bug related to overflows
+
+	Removals:
+
+	macro : deprecated Context.registerModuleReuseCall and onMacroContextReused (#5746)
+
+2018-10-13: 4.0.0-preview.5
+	New features:
+
+	all : support Unicode strings properly on all targets
+	all : support `for (key => value in e)` syntax for key-value iterators
+	all : added keyValueIterator to Map and its implementations
+	all : support loop-unrolling on `for (i in 0...5)` (#7365)
+	all : added support for write-mode `@:op(a.b)`
+	all : support `inline call()` and `inline new` expressions (#7425)
+	all : support `@:using` on type declarations (#7462)
+	all : support markup literal strings but require them to be macro-processed (#7438)
+	all : allow enum values without arguments as default function argument values (#7439)
+	lua : add -D lua-vanilla, which emits code with reduced functionality but no additional lib dependencies
+
+	General improvements and optimizations:
+
+	all : [breaking] reserved `operator` and `overload` as keywords (#7413)
+	all : made `final` on structure fields invariant (#7039)
+	all : [breaking] disallowed static variables that have no type-hint and expression (#6440)
+	all : added display/typeDefinition to display protocol (#7266)
+	all : fixed various display-related problems
+	all : made parser in display mode much more tolerant
+	all : allowed assigning `[]` where `Map` is expected (#7426)
+	all : unified various parts of the String API across all targets
+	php : Optimized haxe.ds.Vector (VectorData is not Array anymore)
+	php : Optimized `Map.copy()` and `Array.copy()`
+	php : Optimized iterators of `Map` and native arrays.
+	php : Support native PHP generators. See `php.Syntax.yield()` and `php.Generator`
+	js : updated HTML externs
+	eval : improved object prototype field handling (#7393)
+	eval : optimized int switches (#7481)
+	eval : improved IntMap and StringMap performance
+	eval : improved performance of instance calls
+
+	Removals :
+
+	all : disallowed get_x/set_x property syntax, use get/set instead (#4699)
+	all : disallowed default values on interface variables (#4087)
+	all : disallowed `implements Dynamic` on non-extern classes (#6191)
+	all : warn about expressions in extern non-inline fields (#5898)
+	all : removed `-D use-rtti-doc`, always store documentation instead (#7493)
+	all : disallowed macro-in-macro calls (#7496)
+	js : removed jQuery and swfobject externs (#7494)
 
 	Bugfixes:
 
-	all : fixed a compilation failure if output directory starts with a slash (#6844)
+	all : fix GC compacting too often in server mode
+	all : [breaking] `function () { }(e)` is no longer parsed as a call (#5854)
+	all : fixed various minor inlining issues
+	all : disallowed `return null` from Void-functions (#7198)
+	all : fixed various pattern matching problems
+	all : fixed compiler hang in display mode (#7236)
+	all : fixed the XML printer trimming CDATA content (#7454)
+	all : fixed invalid visibility unification with statics (#7527)
+	php : Escape `$` in field names of anonymous objects (#7230)
+	php : Generate `switch` as `if...else if...else...` to avoid loose comparison (#7257)
+	cs : fixed bad evaluation order in structures (#7531)
+	eval : fixed various problems with the debugger
+	eval : fixed Vector.fromArrayCopy (#7492)
+	eval : fixed bad string conversions on invalid + operations
+
+	Standard Library:
+
+	all : [breaking] made Lambda functions return Array instead of List (#7097)
+	all : added haxe.iterators package
+	all : improved StringTools.lpad/rpad/htmlEscape implementation
+
+2018-06-12: 4.0.0-preview.4
+
+	New features:
+
+	all : added JSON-RPC-based display protocol
+	all : allow `enum abstract` syntax instead of `@:enum abstract` (#4282)
+	all : allow `extern` on fields instead of `@:extern`
+	all : support signature completion on incomplete structures (#5767)
+	all : support auto-numbering and auto-stringification in enum abstracts (#7139)
+	all : support `Type1 & Type2` intersection syntax for type parameter constraints and structures (#7127)
+
+	General improvements and optimizations:
+
+	all : reworked CLI usage/help output (#6862)
+	all : implemented `for` loop unrolling (#3784)
+	all : metadata can now use `.`, e.g. `@:a.b`. This is represented as a string (#3959)
+	all : [breaking] disallow static extensions through abstract field casts (#5924)
+	all : [breaking] disallow static extensions on implicit `this` (#6036)
+	all : allow true and false expressions as type parameters (#6958)
+	all : improved display support in many areas
+	all : support `override |` completion
+	all : make display/references and display/toplevel actually work sometimes
+	all : allow `var ?x` and `final ?x` parsing in structures (#6947)
+	all : improved overall robustness of the parser in display mode
+	all : allow `@:commutative` on non-static abstract functions (#5599)
+	js : added externs for js.Date (#6855)
+	js : respect `-D source-map` flag to generate source maps in release builds
+	js : enums are now generated as objects instead of arrays (#6350)
+	eval : improved debugger, support conditional breakpoints
+
+	Removals:
+
+	all : moved haxe.remoting to hx3compat
+	js : moved js.XMLSocket to hx3compat
+	neko : moved neko.net to hx3compat
+	all : removed support for `T:(A, B)` constraint syntax
+
+	Bugfixes:
+
+	all : fixed various issues with diagnostics
+	all : fixed fields with default values for `@:structInit` classes (#5449)
+	all : fixed `Null<T>` inconsistency in if/ternary expressions (#6955)
+	all : fixed visibility check related to private constructors of sibling classes (#6957)
+	all : fixed @:generic naming (#6968)
+	all : fixed handling of type parameters in local functions (#6560)
+	all : fixed resolution order between `untyped` and type parameters (#7113)
+	all : fixed unification behavior in try/catch expressions (#7120)
+	all : fixed field type being lost for Int expressions on Float fields (#7132)
+	all : cleaned up `inline` handling (#7155)
+	display : fixed completion in packages starting with underscore (#5417)
+	php : fixed Reflect.callMethod with classes as first argument (#7106)
+	eval : fixed internal exception surfacing in some context calls (#7007)
+	eval : fixed Type.enumEq (#6710)
+	flash : fixed silently swallowing exceptions in getters/setters when invoked with Reflect methods (#5460, #6871)
+
+	Standard Library:
+
+	all : added `resize` to Array (#6869)
+	all : [breaking] removed `return this` from some haxe.Http methods (#6980)
+
+2018-02-23: 4.0.0-preview.3
+
+	See full commit history at https://github.com/HaxeFoundation/haxe/compare/4.0.0-preview.2...4.0.0-preview.3, notable changes below:
+
+	New features:
+
+	all : added new function type syntax (`(a:Int, b:String)->Void`) (#6645)
+	all : added column to StackItem.FilePos (#6665)
+	all : added `-D warn-var-shadowing`
+	all : added haxe.Log.formatOutput (#6738)
+	js : added js.Syntax class for generating unsupported JavaScript syntax in a type-safe analyzer-friendly way
+	js : added js.Map and js.Set and js.JsIterator extern definitions (ES6)
+	hl : added hl.Format.digest, use it for native Sha1/Md5
+
+	General improvements and optimizations:
+
+	all : made all non-warning/non-error compiler messages output to stdout (#4480)
+	all : make DCE keep constructor if any instance field is kept (#6690)
+	all : make `final` in structures use class notation
+	display : added `this` and `super` to toplevel completion (#6051)
+	php : implemented direct method comparison. No need to use `Reflect.compareMethods()`
+	php : added `php.Syntax.code()` instead of deprecated `untyped __php__()` (#6708)
+	php : added methods to `php.Syntax` for each php operator: `??`, `?:`, `**` etc. (#6708)
+	python : add ssl support for http requests
+	python : improve Sys.print(ln) code generation (#6184)
+	js : generate faster code for `x.iterator()` calls (#6669)
+	js : rework exception handling, added js.Lib.getOriginalException (#6713)
+	js : generate `value instanceof MyClass` instead of `Std.is(value, MyClass)` (#6687)
+	js : use lazy getter for HaxeError.message instead of calling String(val) in the ctor (#6754)
+
+	Removals:
+
+	php : removed `php.Syntax.binop()` (#6708)
+
+	Deprecations:
+
+	php : deprecated support for `untyped __php__`, `untyped __call__` etc. Use `php.Syntax` instead.
+
+	Bugfixes:
+
+	all : delay interface accessor generation properly (#6225, #6672)
+	all : fixed unbound variable error in anonymous functions (#6674)
+	all : fixed abstract `@:to` used when `from` is available in a specific case (#6751)
+	all : sys.Http: fix chunked encoding handling (#6763)
+	all : fix some invalid Json being accepted by haxe.format.JsonParser (#6734)
+	all : fixed haxe.format.JsonPrinter for instances of classes to make it produce consistent result across targets (#6801)
 	all : fixed autogenerated constructor for extending @:structInit classes (#6822, #6078)
-	display : fixed completion in import.hx files (#6022)
-	php : fixed List.pop() for sequential pops (#6859)
+	js : fixed saving setter to `tmp` var before invocation (#6672)
+	lua : fix toString behavior in the case of -0 (#6652)
+	lua : properly bind field functions when passed as arguments (#6722)
+	php : don't fail on generating import aliases for classes with the similar names (#6680)
+	php : fixed `Sys.environment()` to also return variables set by `Sys.putEnv()`
+	php : fixed `sys.net.Socket.bind()` (#6693)
+	php : fixed appending "sqlite:" prefix to the names of files created by `sys.db.Sqlite.open()` (#6692)
+	php : made php.Lib.objectOfAssociativeArray() recursive (#6698)
+	php : fixed php error on parsing expressions like `a == b == c` (#6720)
+	php : fixed multiple file uploads in php.Web.parseMultiPart() (#4173)
+	php : fixed an issue with "Object" used as a class name for PHP 7.2 (it's a new keyword in php) (#6838)
+	eval : don't lose dynamic function inits from parent classes (#6660)
+	cs : fix order-dependent enum type parameter issue (#6016)
+
+2017-10-08: 4.0.0-preview.2
+
+	New features:
+
+	all : added final keyword (#6596)
+
+	General improvements and optimizations:
+
+	all : replaced some occurrences of List with Array
+	all : changed haxe.xml.Fast to an abstract
+	all : improved optimization when comparing against `null`
+	all : added support for `case var x` syntax and detect possible typos (#6608)
+	php : changed `--php-prefix`, `--php-front` and `--php-lib` to `-D php-prefix=`, `-D php-front=` and `-D php-lib=` respectively
+
+	Removals:
+
+	all : moved haxe.unit to hx3compat
+	all : moved haxe.web.Request to hx3compat
+	php : dropped php5 support; minimum supported php version is 7.0 now
+
+	Bugfixes:
+
+	all : fixed issue with various functions not being displayed in macro context (#6000)
+	all : fixed invalid static extension lookup on `super` (#3607)
+	all : fixed typing error when constructing enums with abstracts over functions (#6609)
+	all : fixed bug that skipped checking @:from typing in some cases (#6564)
+	all : fixed Int64 parsing of negative numbers that end in a zero (#5493)
+	all : fixed top-down inference when constructing enums (#6606)
+	eval : fixed bug with equality handling
+	eval : fixed issue with file creation not defaulting to binary
+	eval : fixed invalid override detection (#6583)
+	eval : fixed infinite recursion when printing arrays/vectors
+	cs/java : fixed DCE bug that would lose toString method of thrown objects
+	php/python : fixed some bit operators for Int32 (#5938)
+	php : fixed accessing `static inline var` via reflection (#6630)
+	php : fixed Math.min() and Math.max() for NAN on PHP 7.1.9 and 7.1.10
+	js : fixed js syntax error for `value.iterator--` (#6637)
 
-2018-02-12: 3.4.6
+	Standard Library:
+
+	macro : added have.display.Position and PositionTools.toRange (#6599)
+	all : moved List to haxe.ds (#6610)
+
+2017-09-12: 4.0.0-preview.1
+
+	New features:
+
+	all : reworked macro interpreter
+	all : added support for arrow functions
+
+	General improvements and optimizations:
+
+	js : improved generation of `break` inside `switch` inside loops (#4964)
+	cs : improved generation of enum classes (#6119)
+	sys : the `database` parameter of `Mysql.connect` is now optional
+	js : updated jQuery extern (js.jquery.*) for jQuery 1.12.4 / 3.2.1 support.
+	Makefile : default Unix installation location $(INSTALL_DIR) changed from /usr to /usr/local.
+	Makefile : default Unix std location $(INSTALL_STD_DIR) changed from $(INSTALL_LIB_DIR)/std to $(INSTALL_DIR)/share/haxe/std.
+
+	Removals:
+
+	all : removed --eval command line argument
+	sys : SPOD (sys.db.Object, sys.db.Manager and friends) was moved into a separate library `record-macros` (https://github.com/HaxeFoundation/record-macros)
+	js : js.JQuery and js.SWFObject were moved into hx3compat library (https://github.com/HaxeFoundation/hx3compat),
+	     it's recommended to use more modern js.jquery.JQuery and js.swfobject.SWFObject classes.
+	all : moved haxe.web.Dispatch into hx3compat library (https://github.com/HaxeFoundation/hx3compat).
 
 	Bugfixes:
 
-	all : fixed a bug when Haxe compiler couldn't find std lib on Linux if executed by another program
-	all : fixed "Unix.Unix_error" compiler failure if output directory contains a trailing slash (#6212, #6768)
-	php7 : fixed an issue with "Object" used as a class name for PHP 7.2 (it's a new keyword in php) (#6838)
-	as3 : fixed "inifinite recursion" compiler error for classes named "Object"
+	php7: fix Reflect.field() for strings (#6276)
+	php7: fix `@:enum abstract` generation  without `-dce full` (#6175)
+	php7: fix using enum constructor with arguments as a call argument (#6177)
+	php7: fix `null` property access (#6281)
+	php7: fix setting values in a map stored in another map (#6257)
+	php7: fix haxe.io.Input.readAll() with disabled analyzer optimizations (#6387)
+	php/php7: fixed accessing enum constructors on enum type stored to a variable (#6159)
+	php/php7: fix "cannot implement previously implemented interface" (#6208)
+	php: fix invoking functions stored in dynamic static vars (#6158)
+	php: fix field access on `new MyClass()` expressions wrapped in a `cast` (#6294)
+
+	Standard Library:
+
+	all : added `EReg.escape` (#5098)
+	all : `BalancedTree implements `haxe.Constraints.IMap` (#6231)
 
 2018-01-31: 3.4.5
 
@@ -935,7 +1434,7 @@
 	cpp : Fix socket sellect passing _s
 	cpp : Throw error when match count does not match regex
 	cpp : Improve register capture in GC
-	cpp : Fix Dynamic interger compare
+	cpp : Fix Dynamic integer compare
 	cpp : Implement makeVarArgs
 	cpp : Fix toString for nulls in Enums and Arrays
 	cpp : Added initial Android support
@@ -1169,7 +1668,7 @@
 	set all private+protected names from SWF lib to public (allow override+reflect)
 	flash9 : use findprop instead of findpropstrict for 'this' access (allow dynamic)
 	don't allow nullness changes in overrided/implemented
-	prevent typing hole with overriden polymorphic methods
+	prevent typing hole with overridden polymorphic methods
 	added neko.vm.Mutex and neko.vm.Deque (included in neko 1.7.1)
 	added package remapping using --remap
 
@@ -1426,7 +1925,7 @@
 2007-01-28: 1.11
 	changed StringBuf.add implementation
 	added haxe.Firebug
-	allowed variable return type for overriden/implemented methods
+	allowed variable return type for overridden/implemented methods
 	display error position in front of each error line
 	improved error messages when optional arguments not matched
 	added neko.io.Path
diff --git a/extra/ImportAll.hx b/extra/ImportAll.hx
index 5e2ad85348d6655bc45f35194666a724b7f7bf0c..22e3f49a5062333e56bcc460511ee3afd3505ae8 100644
--- a/extra/ImportAll.hx
+++ b/extra/ImportAll.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -38,10 +38,8 @@ class ImportAll {
 			haxe.macro.Compiler.define("macro");
 		}
 		switch( pack ) {
-		case "php7":
-			if( !Context.defined("php7") ) return;
 		case "php":
-			if( !Context.defined("php") || Context.defined("php7") ) return;
+			if( !Context.defined("php") ) return;
 		case "neko":
 			if( !Context.defined("neko") ) return;
 		case "js":
@@ -54,8 +52,12 @@ class ImportAll {
 			return;
 		case "sys":
 			if(!isSysTarget()) return;
+		case "sys.thread":
+			if ( !Context.defined("target.threaded") ) return;
 		case "java":
 			if( !Context.defined("java") ) return;
+		case "jvm":
+			if( !Context.defined("jvm") ) return;
 		case "cs":
 			if( !Context.defined("cs") ) return;
 		case "python":
@@ -68,7 +70,7 @@ class ImportAll {
 			if( !Context.defined("eval") ) return;
 		case "ssl":
 			if (!Context.defined("neko") && !Context.defined("cpp")) return;
-		case "tools", "build-tool": return;
+		case "tools", "build-tool", "jar-tool": return;
 		}
 		for( p in Context.getClassPath() ) {
 			if( p == "/" )
@@ -98,9 +100,6 @@ class ImportAll {
 					case "neko.vm.Ui" | "sys.db.Sqlite" | "sys.db.Mysql" if ( Context.defined("interp") ): continue;
 					case "sys.db.Sqlite" | "sys.db.Mysql" | "cs.db.AdoNet" if ( Context.defined("cs") ): continue;
 					}
-					if( Context.defined("php7") && cl.indexOf("php7.") == 0 ) {
-						cl = "php." + cl.substr("php7.".length);
-					}
 					Context.getModule(cl);
 				} else if( sys.FileSystem.isDirectory(p + "/" + file) )
 					run(full);
diff --git a/extra/all.hxml b/extra/all.hxml
index 73f38e226aaf84fbc4c7e2fda69154c103753442..1fbb6e39fea4a7e3ad8572100c97ef0c4d13a61d 100644
--- a/extra/all.hxml
+++ b/extra/all.hxml
@@ -15,13 +15,7 @@
 
 -swf all9.swf
 -xml flash9.xml
--swf-version 11.4
-
---next
-
--D php7
--php all_php7
--xml php7.xml
+--swf-version 11.4
 
 --next
 
@@ -32,19 +26,21 @@
 
 -cpp all_cpp
 -xml cpp.xml
--D xmldoc
 -D HXCPP_MULTI_THREADED
 
 --next
 -java all_java
 -xml java.xml
--D xmldoc
+
+--next
+-java all_jvm
+-D jvm
+-xml jvm.xml
 
 --next
 -cs all_cs
 -D unsafe
 -xml cs.xml
--D xmldoc
 
 --next
 -python all_python
@@ -54,6 +50,10 @@
 -hl all_hl
 -xml hl.xml
 
+--next
+--interp
+-xml interp.xml
+
 --next
 
 -xml cross.xml
diff --git a/extra/azure-pipelines/build-linux.yml b/extra/azure-pipelines/build-linux.yml
new file mode 100644
index 0000000000000000000000000000000000000000..74993edf4cd7838fc6ccafe8af86ca2d1d945dd7
--- /dev/null
+++ b/extra/azure-pipelines/build-linux.yml
@@ -0,0 +1,61 @@
+parameters:
+  name: 'BuildLinux'
+  vmImage: 'ubuntu-16.04'
+
+jobs:
+  - job: ${{ parameters.name }}
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+    variables:
+      OPAMYES: 1
+      ADD_REVISION: 1
+    steps:
+      - checkout: self
+        submodules: recursive
+      - script: |
+          set -ex
+          sudo add-apt-repository ppa:avsm/ppa -y # provides newer version of OCaml and OPAM
+          sudo apt-get update -qqy
+          sudo apt-get install -qqy ocaml-nox camlp5 opam libpcre3-dev zlib1g-dev libgtk2.0-dev ninja-build
+        displayName: Install dependencies
+      - template: install-neko-snapshot.yaml
+        parameters:
+          platform: linux64
+      - script: |
+          set -ex
+          opam init
+          opam update
+          opam pin add haxe . --no-action
+          opam install haxe --deps-only
+          opam list
+          ocamlopt -v
+        displayName: Install OCaml libraries
+      - script: |
+          set -ex
+          opam config exec -- make -s STATICLINK=1 libs
+          opam config exec -- make -s STATICLINK=1 prebuild
+          opam config exec -- make -s -j`nproc` STATICLINK=1 haxe
+          opam config exec -- make -s haxelib
+          make -s package_bin
+          ls -l out
+          ldd -v ./haxe
+          ldd -v ./haxelib
+        displayName: Build Haxe
+      - task: PublishPipelineArtifact@0
+        inputs:
+          artifactName: 'linuxBinaries'
+          targetPath: out
+      - script: |
+          set -ex
+          make -s xmldoc
+          cat >extra/doc/info.json <<EOL
+            {
+              "commit": "$(Build.SourceVersion)",
+              "branch": "$(Build.SourceBranchName)"
+            }
+          EOL
+        displayName: Build xmldoc
+      - task: PublishPipelineArtifact@0
+        inputs:
+          artifactName: 'xmldoc'
+          targetPath: extra/doc
\ No newline at end of file
diff --git a/extra/azure-pipelines/build-mac.yml b/extra/azure-pipelines/build-mac.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ee2315cbfc6d25a2cf4c50892b2c8dd99ae4fd88
--- /dev/null
+++ b/extra/azure-pipelines/build-mac.yml
@@ -0,0 +1,46 @@
+parameters:
+  name: 'BuildMac'
+  vmImage: 'macOS-10.13'
+
+jobs:
+  - job: ${{ parameters.name }}
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+    variables:
+      OPAMYES: 1
+      ADD_REVISION: 1
+    steps:
+      - checkout: self
+        submodules: recursive
+      - script: |
+          set -ex
+          brew update || brew update || brew update
+          brew bundle --file=tests/Brewfile --no-upgrade
+        displayName: Install dependencies
+      - template: install-neko-snapshot.yaml
+        parameters:
+          platform: mac
+      - script: |
+          set -ex
+          opam init
+          opam update
+          opam pin add haxe . --no-action
+          opam install haxe --deps-only
+          opam list
+          ocamlopt -v
+        displayName: Install OCaml libraries
+      - script: |
+          set -ex
+          opam config exec -- make -s STATICLINK=1 "LIB_PARAMS=/usr/local/opt/zlib/lib/libz.a /usr/local/lib/libpcre.a" libs
+          opam config exec -- make -s STATICLINK=1 "LIB_PARAMS=/usr/local/opt/zlib/lib/libz.a /usr/local/lib/libpcre.a" prebuild
+          opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/opt/zlib/lib/libz.a /usr/local/lib/libpcre.a" haxe
+          opam config exec -- make -s haxelib
+          make -s package_bin package_installer_mac
+          ls -l out
+          otool -L ./haxe
+          otool -L ./haxelib
+        displayName: Build Haxe
+      - task: PublishPipelineArtifact@0
+        inputs:
+          artifactName: 'macBinaries'
+          targetPath: out
\ No newline at end of file
diff --git a/extra/azure-pipelines/build-windows.yml b/extra/azure-pipelines/build-windows.yml
new file mode 100644
index 0000000000000000000000000000000000000000..811c133d2a609a75b9af669589f388052c103ff5
--- /dev/null
+++ b/extra/azure-pipelines/build-windows.yml
@@ -0,0 +1,68 @@
+parameters:
+  name: 'BuildWindows'
+  vmImage: 'windows-2019'
+  arch: '64' # or '32'
+
+jobs:
+  - job: ${{ parameters.name }}
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+    variables:
+      OPAMYES: 1
+      ADD_REVISION: 1
+      CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
+      ${{ if eq(parameters.arch, '64') }}:
+        ARCH: 64
+        MINGW_ARCH: x86_64
+        CYGWIN_SETUP: https://cygwin.com/setup-x86_64.exe
+        CYG_ROOT: C:/cygwin64
+      ${{ if eq(parameters.arch, '32') }}:
+        ARCH: 32
+        MINGW_ARCH: i686
+        CYGWIN_SETUP: https://cygwin.com/setup-x86.exe
+        CYG_ROOT: C:/cygwin
+    steps:
+      - checkout: self
+        submodules: recursive
+      - powershell: |
+          Set-PSDebug -Trace 1
+          choco install --no-progress nsis.portable --version 3.02 -y
+          choco install --no-progress curl wget 7zip.portable -y
+        displayName: Install dependencies
+      - template: install-neko-snapshot.yaml
+        parameters:
+          ${{ if eq(parameters.arch, '64') }}:
+            platform: windows64
+          ${{ if eq(parameters.arch, '32') }}:
+            platform: windows
+      - powershell: |
+          Set-PSDebug -Trace 1
+          curl.exe -fsSL -o cygwin-setup.exe --retry 3 $(CYGWIN_SETUP)
+          Start-Process -FilePath "cygwin-setup.exe" -ArgumentList "-B -q -R $(CYG_ROOT) -l C:/tmp -s $(CYG_MIRROR) -P default -P make -P git -P zlib-devel -P rsync -P patch -P diffutils -P curl -P unzip -P tar -P m4 -P perl -P libpcre-devel -P mingw64-$(MINGW_ARCH)-zlib -P mingw64-$(MINGW_ARCH)-gcc-core -P mingw64-$(MINGW_ARCH)-pcre" -Wait
+          curl.exe -fsSL -o "opam.tar.xz" --retry 3 https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.2/opam$(ARCH).tar.xz
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'echo "$OLDPWD"')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && tar -xf opam.tar.xz')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && bash opam$(ARCH)/install.sh')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'opam init mingw "https://github.com/fdopen/opam-repository-mingw.git#opam2" --comp 4.07.0+mingw$(ARCH)c --switch 4.07.0+mingw$(ARCH)c --auto-setup --yes 2>&1')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'opam update --yes 2>&1')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && opam pin add haxe . --kind=path --no-action --yes 2>&1')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'opam install haxe --deps-only --yes 2>&1')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'opam list')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'ocamlopt -v')
+        displayName: Install OCaml and OCaml libraries
+      - powershell: Write-Host "##vso[task.prependpath]${env:CYG_ROOT}/usr/$(MINGW_ARCH)-w64-mingw32/sys-root/mingw/bin"
+        displayName: Expose mingw dll files
+      - powershell: |
+          Set-PSDebug -Trace 1
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && opam config exec -- make -s -f Makefile.win libs prebuild 2>&1')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && opam config exec -- make -s -f Makefile.win -j`nproc` haxe 2>&1')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && opam config exec -- make -s -f Makefile.win haxelib 2>&1')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && opam config exec -- make -f Makefile.win echo_package_files package_bin package_installer_win package_choco 2>&1')
+          dir out
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && cygcheck ./haxe.exe')
+          & "$(CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && cygcheck ./haxelib.exe')
+        displayName: Build Haxe
+      - task: PublishPipelineArtifact@0
+        inputs:
+          artifactName: 'win$(ARCH)Binaries'
+          targetPath: out
\ No newline at end of file
diff --git a/extra/azure-pipelines/install-neko-snapshot.yaml b/extra/azure-pipelines/install-neko-snapshot.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7086a28f6b53d13bce9e3fe7ab2dd6abde886dbf
--- /dev/null
+++ b/extra/azure-pipelines/install-neko-snapshot.yaml
@@ -0,0 +1,33 @@
+parameters:
+  platform: '' # can be linux64, mac, windows, or windows64
+
+steps:
+  - ${{ if startsWith(parameters.platform, 'windows') }}:
+    - powershell: |
+        Invoke-WebRequest https://build.haxe.org/builds/neko/${{parameters.platform}}/neko_latest.zip -OutFile $(Agent.TempDirectory)/neko_latest.zip
+        Expand-Archive $(Agent.TempDirectory)/neko_latest.zip -DestinationPath $(Agent.TempDirectory)
+        $NEKOPATH = Get-ChildItem $(Agent.TempDirectory)/neko-*-*
+        Write-Host "##vso[task.prependpath]$NEKOPATH"
+        Write-Host "##vso[task.setvariable variable=NEKOPATH]$NEKOPATH"
+      displayName: Install Neko using snapshot from S3
+  - ${{ if not(startsWith(parameters.platform, 'windows')) }}:
+    - bash: |
+        set -ex
+        DOWNLOADDIR=$(Agent.TempDirectory)
+        curl -sSL https://build.haxe.org/builds/neko/${{parameters.platform}}/neko_latest.tar.gz -o $(Agent.TempDirectory)/neko_latest.tar.gz
+        tar -xf $(Agent.TempDirectory)/neko_latest.tar.gz -C $(Agent.TempDirectory)
+        NEKOPATH=`echo $(Agent.TempDirectory)/neko-*-*`
+        sudo mkdir -p /usr/local/bin
+        sudo mkdir -p /usr/local/lib/neko
+        sudo ln -s $NEKOPATH/{neko,nekoc,nekoml,nekotools}  /usr/local/bin/
+        sudo ln -s $NEKOPATH/libneko.*                      /usr/local/lib/
+        sudo ln -s $NEKOPATH/*.ndll                         /usr/local/lib/neko/
+        set +x
+        echo "##vso[task.prependpath]$NEKOPATH"
+        echo "##vso[task.setvariable variable=NEKOPATH]$NEKOPATH"
+      displayName: Install Neko using snapshot from S3
+  - ${{ if eq(parameters.platform, 'linux64') }}:
+    - bash: sudo ldconfig
+      displayName: ldconfig
+  - script: neko -version 2>&1
+    displayName: Print Neko version
\ No newline at end of file
diff --git a/extra/azure-pipelines/test-windows.yml b/extra/azure-pipelines/test-windows.yml
new file mode 100644
index 0000000000000000000000000000000000000000..bbb84d66b1edba7929b6e3f852cbd14e88efbd4a
--- /dev/null
+++ b/extra/azure-pipelines/test-windows.yml
@@ -0,0 +1,87 @@
+parameters:
+  name: 'TestWindows'
+  vmImage: 'windows-2019'
+  arch: '64' # or '32'
+
+jobs:
+  - job: ${{ parameters.name }}
+    dependsOn: BuildWin${{ parameters.arch }}
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+    variables:
+      HAXELIB_ROOT: C:/haxelib
+    strategy:
+      matrix:
+        # https://github.com/HaxeFoundation/haxe/issues/8600
+        ${{ if eq(parameters.arch, '64') }}:
+          macro:
+            TEST: macro
+        neko:
+          TEST: neko
+        hl:
+          TEST: hl
+        cpp:
+          TEST: cpp
+          HXCPP_COMPILE_CACHE: C:/hxcache
+        java:
+          # https://github.com/HaxeFoundation/haxe/issues/8601
+          ${{ if eq(parameters.arch, '64') }}:
+            TEST: java,jvm
+          ${{ if eq(parameters.arch, '32') }}:
+            TEST: java
+        cs:
+          TEST: cs
+        js:
+          TEST: js
+        php:
+          TEST: php
+        # TODO. flash has never been enabled on our AppVeyor builds.
+        # flash:
+        #   TEST: flash9,as3
+        python:
+          TEST: python
+        # TODO. Lua has never been enabled on our AppVeyor builds.
+        # lua:
+        #   TEST: lua
+    steps:
+      - checkout: self
+        fetchDepth: 20
+      - template: install-neko-snapshot.yaml
+        parameters:
+          ${{ if eq(parameters.arch, '64') }}:
+            platform: windows64
+          ${{ if eq(parameters.arch, '32') }}:
+            platform: windows
+      - task: DownloadPipelineArtifact@0
+        inputs:
+          artifactName: 'win${{ parameters.arch }}Binaries'
+          targetPath: win${{ parameters.arch }}Binaries
+      - powershell: |
+          Set-PSDebug -Trace 1
+          7z x win${{ parameters.arch }}Binaries/*_bin.zip -owin${{ parameters.arch }}Binaries
+          $dir = Get-ChildItem win${{ parameters.arch }}Binaries/* -Name -Directory
+          Rename-Item win${{ parameters.arch }}Binaries/$dir haxe
+          $dir = '' + ( get-location ) + '\win${{ parameters.arch }}Binaries\haxe'
+          dir $dir
+          Set-PSDebug -Trace 0
+          Write-Host "##vso[task.prependpath]$dir"
+        displayName: Setup Haxe
+      - script: haxe -version
+        displayName: Print Haxe version
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: '3.7'
+      - powershell: |
+          Set-PSDebug -Trace 1
+          $pypath = python -c "import sys; print(sys.executable)"
+          $py3path = $pypath.replace("python.exe","python3.exe")
+          cmd /c mklink $py3path $pypath
+          python3 -V
+        displayName: "Make Python 3 be available as python3 in the cmdline"
+      - script: |
+          mkdir "$(HAXELIB_ROOT)"
+          haxelib setup "$(HAXELIB_ROOT)"
+        displayName: Setup haxelib
+      - script: haxe RunCi.hxml
+        workingDirectory: $(Build.SourcesDirectory)/tests
+        displayName: Test
diff --git a/extra/choco/haxe.nuspec b/extra/choco/haxe.nuspec
index e4cf4c794c6d0af3ab368b77be403816138bacf0..b7d3c87e71e2c10e6a682360159b11875e3f61d8 100644
--- a/extra/choco/haxe.nuspec
+++ b/extra/choco/haxe.nuspec
@@ -18,7 +18,7 @@
         <summary>Haxe is an open source toolkit based on a modern, high level, strictly typed programming language, a cross-compiler, a complete cross-platform standard library and ways to access each platform's native capabilities.</summary>
         <description>Haxe is an open source toolkit based on a modern, high level, strictly typed programming language, a cross-compiler, a complete cross-platform standard library and ways to access each platform's native capabilities.
  
-This package will install haxe and haxelib. After installation, you should run `haxelib setup &lt;path&gt;`, where `&lt;path&gt;` is the haxelib repository folder for placing third-party libraries. The folder should be created manually before running the command.</description>
+This package will install haxe and haxelib. After installation, you should run `haxelib setup %path%;`, where `%path%` is the haxelib repository folder for placing third-party libraries. The folder should be created manually before running the command.</description>
         <releaseNotes>https://github.com/HaxeFoundation/haxe/blob/master/extra/CHANGES.txt</releaseNotes>
         <tags>haxe programming development foss cross-platform</tags>
         <dependencies>
diff --git a/extra/doc.hxml b/extra/doc.hxml
index 96569b6c0f47a974fa8b733d5d7d228375b32820..fa8b532121ee608c725f530b0da8a53a5837f441 100644
--- a/extra/doc.hxml
+++ b/extra/doc.hxml
@@ -1,6 +1,6 @@
 --no-output
 --macro ImportAll.run()
--dce no
+--dce no
 -D doc-gen
 
 --each
@@ -17,7 +17,7 @@
 
 -swf all9.swf
 -xml doc/flash.xml
--swf-version 11.4
+--swf-version 11.4
 
 --next
 
@@ -28,24 +28,20 @@
 
 -cpp all_cpp
 -xml doc/cpp.xml
--D xmldoc
 -D HXCPP_MULTI_THREADED
 
 --next
 -java all_java
 -xml doc/java.xml
--D xmldoc
 
 --next
 -cs all_cs
 -D unsafe
 -xml doc/cs.xml
--D xmldoc
 
 --next
 -python all_py
 -xml doc/python.xml
--D xmldoc
 
 --next
 --interp
diff --git a/extra/extract.hxml b/extra/extract.hxml
index e0b3f0770b5ee96ec31f4488fd9fe15970c4e039..427a2d9026a33b3c84edc84d78f857d1ebec34d3 100644
--- a/extra/extract.hxml
+++ b/extra/extract.hxml
@@ -4,9 +4,9 @@
 # - Run haxe extract.hxml
 # - Restore removed haxe/std/flash/DIR directories
 # - Copy directories from hxclasses/flash to haxe/std/flash, overwriting restored ones
--debug
--swf-lib library.swf
+--debug
+--swf-lib library.swf
 -swf test.swf
--swf-version 15
+--swf-version 15
 --macro patchTypes("../extra/extract.patch")
---gen-hx-classes
+-D gen-hx-classes
diff --git a/extra/haxelib_src/.dockerignore b/extra/haxelib_src/.dockerignore
index fb14f4b5ab3a0efaac982fc5ed1cfc65f1d3c26d..21b8b67150c6fc92c5a4a30b39317068b6a326e8 100644
--- a/extra/haxelib_src/.dockerignore
+++ b/extra/haxelib_src/.dockerignore
@@ -3,4 +3,4 @@ deploy
 bin
 test
 deploy_key
-www/bower_components
\ No newline at end of file
+www/node_modules/
diff --git a/extra/haxelib_src/.ebextensions/autoscaling.config b/extra/haxelib_src/.ebextensions/autoscaling.config
new file mode 100644
index 0000000000000000000000000000000000000000..fe2c312f292192d269e2455cdc9eabe1861be42a
--- /dev/null
+++ b/extra/haxelib_src/.ebextensions/autoscaling.config
@@ -0,0 +1,6 @@
+Resources:
+  AWSEBAutoScalingGroup:
+    Type: "AWS::AutoScaling::AutoScalingGroup"
+    Properties:
+        HealthCheckType: ELB
+        HealthCheckGracePeriod: 60
diff --git a/extra/haxelib_src/.ebextensions/ignore4xx.config b/extra/haxelib_src/.ebextensions/ignore4xx.config
new file mode 100644
index 0000000000000000000000000000000000000000..e974a0fa2db6550d0e622b56c397a3f3edf038e2
--- /dev/null
+++ b/extra/haxelib_src/.ebextensions/ignore4xx.config
@@ -0,0 +1,58 @@
+# Ignore 4xx errors which we get a bunch of those in
+# the file browser version switcher - e.g. when viewing the
+# README.md file of version 1.0.0, there are links to the
+# same file in other versions, but it may be absent, thus
+# a 404 error.
+# We don't want elastic beanstalk replace instances because
+# of those 404 errors.
+# See https://stackoverflow.com/a/49606726/267998
+files:
+  "/tmp/custom-site-nginx.conf":
+    mode: "000664"
+    owner: root
+    group: root
+    content: |
+        map $http_upgrade $connection_upgrade {
+            default        "upgrade";
+            ""            "";
+        }
+
+        # Elastic Beanstalk Modification(EB_INCLUDE)
+        # Custom config
+        # HTTP 4xx ignored.
+        map $status $loggable {
+                ~^[4]  0;
+                default 1;
+        }
+
+        server {
+            listen 80;
+
+            gzip on;
+                gzip_comp_level 4;
+                gzip_types text/html text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+            if ($time_iso8601 ~ "^(\d{4})-(\d{2})-(\d{2})T(\d{2})") {
+                set $year $1;
+                set $month $2;
+                set $day $3;
+                set $hour $4;
+            }
+            access_log /var/log/nginx/healthd/application.log.$year-$month-$day-$hour healthd if=$loggable;
+
+            access_log    /var/log/nginx/access.log;
+
+            location / {
+                proxy_pass            http://docker;
+                proxy_http_version    1.1;
+
+                proxy_set_header    Connection            $connection_upgrade;
+                proxy_set_header    Upgrade                $http_upgrade;
+                proxy_set_header    Host                $host;
+                proxy_set_header    X-Real-IP            $remote_addr;
+                proxy_set_header    X-Forwarded-For        $proxy_add_x_forwarded_for;
+            }
+        }
+container_commands:
+    override_beanstalk_nginx:
+        command: "mv -f /tmp/custom-site-nginx.conf /etc/nginx/sites-available/elasticbeanstalk-nginx-docker-proxy.conf"
\ No newline at end of file
diff --git a/extra/haxelib_src/.ebextensions/nginx.config b/extra/haxelib_src/.ebextensions/nginx.config
index 45a6a0d9fe69e18f4d078161bf07901a1a6149f2..72e246fdb2dcbc01fe7557898b00c43ceacc7a52 100644
--- a/extra/haxelib_src/.ebextensions/nginx.config
+++ b/extra/haxelib_src/.ebextensions/nginx.config
@@ -1,7 +1,7 @@
 files:
   "/etc/nginx/conf.d/proxy.conf" :
-    mode: "000755"
+    mode: "000664"
     owner: root
     group: root
     content: |
-      client_max_body_size 800M;
\ No newline at end of file
+      client_max_body_size 800M;
diff --git a/extra/haxelib_src/.github/FUNDING.yml b/extra/haxelib_src/.github/FUNDING.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2481fa5c2f547840aa7e6a4252b1838e5e47cdde
--- /dev/null
+++ b/extra/haxelib_src/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+open_collective: haxe
+custom: ['https://haxe.org/foundation/support-plans.html', 'https://haxe.org/foundation/donate.html']
diff --git a/extra/haxelib_src/.travis.yml b/extra/haxelib_src/.travis.yml
index 1a840eca0bf45cd43f8c706e1ac16b6276ce98a9..58ec6ed9fa91c784a992015b25b2bcd8252537cc 100644
--- a/extra/haxelib_src/.travis.yml
+++ b/extra/haxelib_src/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: haxe
 
 env:
@@ -7,14 +7,7 @@ env:
     # deploy_key_decrypt
     - secure: "cWYcbB7z97sW4yZtz9qcYrEhFZktNjQMOraPm7Vy0FsCMqb4r314Fk8rJze+yDbOKGdsIz6VNHE8nlsQN3EgGiVFJnF8xv6GAlfHPuaVomP2vO7W0A+l7xVy2/326MQJP8JoMgdebDi71yxKeEhYA+mVliI9qql9yfD2YOBmilQ="
 
-install_docker: &install_docker
-  - sudo apt-get update -qq
-  - docker --version
-  # https://docs.travis-ci.com/user/docker/#Using-Docker-Compose
-  - sudo rm -f /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/1.12.0/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
+.before_install: &before_install
   # https://github.com/travis-ci/travis-ci/issues/7008
   - sudo /etc/init.d/mysql stop || true
 
@@ -26,7 +19,7 @@ matrix:
       env:
         - USE_DOCKER=1
       services: [docker]
-      before_install: *install_docker
+      before_install: *before_install
     # haxe 3.4.4
     - os: linux
       haxe: 3.4.4
@@ -34,21 +27,21 @@ matrix:
         - USE_DOCKER=1
         - DEPLOY=1
       services: [docker]
-      before_install: *install_docker
+      before_install: *before_install
     # haxe 3.2.1
     - os: linux
       haxe: 3.2.1
       env:
         - USE_DOCKER=1
       services: [docker]
-      before_install: *install_docker
+      before_install: *before_install
     # haxe 3.1.3
     - os: linux
       haxe: 3.1.3
       env:
         - USE_DOCKER=1
       services: [docker]
-      before_install: *install_docker
+      before_install: *before_install
     # Mac
     - os: osx
       haxe: development
@@ -58,31 +51,27 @@ matrix:
       haxe: 3.2.1
     - os: osx
       haxe: 3.1.3
-  # Allow Haxe development to fail.
-  allow_failures:
-    - haxe: development
 
 install:
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
       brew update;
     fi
-  - npm -g install bower
-  - haxelib newrepo || mkdir -p .haxelib && haxelib setup .haxelib
-  - yes | travis_retry haxelib -notimeout install all
-  - yes | travis_retry haxelib -notimeout install tora
+  - neko run.n setup haxelib_global
+  - haxe libs.hxml
   # copy aws.ndll to the right place
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
-      sudo cp $(haxelib config)/aws-sdk-neko/*/ndll/Mac64/aws.ndll ${NEKOPATH}/aws.ndll;
+      sudo cp $(neko run.n config)/aws-sdk-neko/*/ndll/Mac64/aws.ndll ${NEKOPATH}/aws.ndll;
     fi;
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-      sudo cp $(haxelib config)/aws-sdk-neko/*/ndll/Linux64/aws.ndll ${NEKOPATH}/aws.ndll;
+      sudo cp $(neko run.n config)/aws-sdk-neko/*/ndll/Linux64/aws.ndll ${NEKOPATH}/aws.ndll;
     fi;
-  - haxelib list
-  - haxelib run tora > /dev/null 2>&1 &
+  - neko run.n list
+  - neko run.n version
+  - neko run.n run tora > ~/tora.log 2>&1 &
 
 script:
   # run our CI script
-  - haxe ci.hxml
+  - haxe ci.hxml || (echo "[BUILD FAILED]" && echo "Tora log:" && cat ~/tora.log && false)
 
 deploy:
   skip_cleanup: true
diff --git a/extra/haxelib_src/.vscode/settings.json b/extra/haxelib_src/.vscode/settings.json
index fffce17ae9e616ab00ac2850b407e2540238b139..a1f14056b10425ce51e53cff050457dc9ac46427 100644
--- a/extra/haxelib_src/.vscode/settings.json
+++ b/extra/haxelib_src/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
-    "haxe.displayConfigurations": [
+    "haxe.configurations": [
+        ["client_tests.hxml"],
         ["client.hxml"],
         ["server_each.hxml", "-neko", "repo.n"]
     ]
diff --git a/extra/haxelib_src/.vscode/tasks.json b/extra/haxelib_src/.vscode/tasks.json
index 6a789b94dc2df3ba7bac5f9f523a3ac99f7e9a90..9b6b3ba6135cdae2b7d1a6605f5fef867b1071f1 100644
--- a/extra/haxelib_src/.vscode/tasks.json
+++ b/extra/haxelib_src/.vscode/tasks.json
@@ -1,18 +1,13 @@
 {
-    "version": "0.1.0",
-    "command": "haxe",
-    "args": ["client.hxml"],
-    "problemMatcher": {
-        "owner": "haxe",
-        "pattern": {
-            "regexp": "^(.+):(\\d+): (?:lines \\d+-(\\d+)|character(?:s (\\d+)-| )(\\d+)) : (?:(Warning) : )?(.*)$",
-            "file": 1,
-            "line": 2,
-            "endLine": 3,
-            "column": 4,
-            "endColumn": 5,
-            "severity": 6,
-            "message": 7
-        }
-    }
-}
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "hxml",
+			"file": "client.hxml",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/Dockerfile b/extra/haxelib_src/Dockerfile
index 944b4f1234347a1e6048a16b9e9b824fb316d4ab..5951e0656ca2d510f2ded6a4ab77178029ebfc0e 100644
--- a/extra/haxelib_src/Dockerfile
+++ b/extra/haxelib_src/Dockerfile
@@ -1,53 +1,56 @@
 # Build haxelib server as a Docker container.
-# Note that it doesn't contain a MySQL database, 
+# Note that it doesn't contain a MySQL database,
 # which need to be launched seperately. See test/docker-compose.yml on how to launch one.
 
-FROM ubuntu:trusty
+FROM ubuntu:bionic
 
-# apt-get dependencies of bower
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y python-software-properties software-properties-common \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \
 	&& add-apt-repository ppa:haxe/releases -y \
-	&& apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+	&& apt-get update && apt-get upgrade -y \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
 		apache2 \
 		neko-dev \
 		haxe \
-		npm \
-		nodejs-legacy \
+		curl \
 		git \
 		libcurl4-gnutls-dev \
+	&& curl -sL https://deb.nodesource.com/setup_8.x | bash - \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
+		nodejs \
 	&& rm -r /var/lib/apt/lists/*
 
 
 # apache httpd
 RUN rm -rf /var/www/html \
 	&& mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html \
-	&& chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html 
+	&& chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
 RUN a2enmod rewrite
 RUN a2enmod proxy
 RUN a2enmod proxy_http
+RUN a2dismod mpm_event
+RUN a2enmod mpm_prefork
 RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist && rm /etc/apache2/conf-enabled/* /etc/apache2/sites-enabled/*
 COPY apache2.conf /etc/apache2/apache2.conf
 RUN { \
-		echo 'LoadModule neko_module /usr/lib/neko/mod_neko2.ndll'; \
-		echo 'LoadModule tora_module /usr/lib/neko/mod_tora2.ndll'; \
+		echo 'LoadModule neko_module /usr/lib/x86_64-linux-gnu/neko/mod_neko2.ndll'; \
+		echo 'LoadModule tora_module /usr/lib/x86_64-linux-gnu/neko/mod_tora2.ndll'; \
 		echo 'AddHandler tora-handler .n'; \
 	} > /etc/apache2/mods-enabled/tora.conf \
 	&& apachectl stop
 
-RUN npm -g install bower
-
 
 # haxelib
-ENV HAXELIB_PATH /src/.haxelib
-RUN mkdir /haxelib && haxelib setup /haxelib
+ENV HAXELIB_PATH /src/haxelib_global
+RUN mkdir -p ${HAXELIB_PATH} && haxelib setup ${HAXELIB_PATH}
 WORKDIR /src
-COPY .haxelib /src/.haxelib
-RUN cp ${HAXELIB_PATH}/aws-sdk-neko/*/ndll/Linux64/aws.ndll /usr/lib/neko/aws.ndll;
+COPY libs.hxml run.n /src/
+RUN haxe libs.hxml
+RUN cp ${HAXELIB_PATH}/aws-sdk-neko/*/ndll/Linux64/aws.ndll /usr/lib/x86_64-linux-gnu/neko/aws.ndll;
 COPY server*.hxml /src/
 
-COPY www/bower.json /src/www/
-WORKDIR /src/www
-RUN bower install --allow-root
+COPY www/package*.json /src/www/
+WORKDIR /src/www/
+RUN npm install --unsafe-perm
 
 COPY www /src/www/
 COPY src/legacyhaxelib/.htaccess /src/www/legacy/
diff --git a/extra/haxelib_src/appveyor.yml b/extra/haxelib_src/appveyor.yml
index e6871ef502cfb22016244643bda960833a3a8d58..46753b9be001fdab6e1dd0a29d3cc6481e8dd356 100644
--- a/extra/haxelib_src/appveyor.yml
+++ b/extra/haxelib_src/appveyor.yml
@@ -4,15 +4,14 @@ services:
   - mysql
 
 install:
-  - npm -g install bower
+  - ps: Set-Service wuauserv -StartupType Manual
   - cinst haxe -y
   - cinst nssm -y
   - cinst curl -y
   - RefreshEnv
-  - haxelib setup %HOME%/haxelib_repo
-  - haxelib install all --always
-  - haxelib install tora
-  - haxelib list
+  - neko run.n setup haxelib_global
+  - haxe libs.hxml
+  - neko run.n list
 
 build: off
 
diff --git a/extra/haxelib_src/client.hxml b/extra/haxelib_src/client.hxml
index 97b705ed37586770e79369160fa4170d14bcf1a8..832c75d7734f6f3c0cf8bc2f0488e5b349546acd 100644
--- a/extra/haxelib_src/client.hxml
+++ b/extra/haxelib_src/client.hxml
@@ -1,3 +1,4 @@
 -cp src
+-cp hx3compat/std
 -neko run.n
 -main haxelib.client.Main
diff --git a/extra/haxelib_src/client_legacy.hxml b/extra/haxelib_src/client_legacy.hxml
index bfd5fd592d397158d9c88de73160e33edde8d638..89e1d10663dfe439224043d32ec14c6204cf2bf0 100644
--- a/extra/haxelib_src/client_legacy.hxml
+++ b/extra/haxelib_src/client_legacy.hxml
@@ -1,3 +1,4 @@
--cp src 
--neko bin/legacyhaxelib.n 
+-cp src
+-cp hx3compat/std
+-neko bin/legacyhaxelib.n
 -main legacyhaxelib.Main
\ No newline at end of file
diff --git a/extra/haxelib_src/client_tests.hxml b/extra/haxelib_src/client_tests.hxml
index 756c0943056ecb23e3db2f9c9210a3baff6121b2..3d6871317b7d99bf79763706fdcad9e03fb5b78f 100644
--- a/extra/haxelib_src/client_tests.hxml
+++ b/extra/haxelib_src/client_tests.hxml
@@ -3,5 +3,4 @@
 -lib hx3compat
 -main HaxelibTests
 -debug
--neko bin/test.n
--cmd neko bin/test.n
\ No newline at end of file
+-neko bin/test.n
\ No newline at end of file
diff --git a/extra/haxelib_src/deploy.json b/extra/haxelib_src/deploy.json
index d064590b71a9509fc291a21b46bc5a7049a85ebb..520ea50b6ba5837cbe3f013bb100b062a550fca1 100644
--- a/extra/haxelib_src/deploy.json
+++ b/extra/haxelib_src/deploy.json
@@ -1,7 +1,6 @@
 {
 	"files": [
 		"api/",
-		"bower_components/",
 		"css/",
 		"documentation-files/",
 		"img/",
diff --git a/extra/haxelib_src/haxelib.json b/extra/haxelib_src/haxelib.json
index e23f974b1a9b846b8d1b2c8cde66a2ebc36e44f7..4f3ba68dc7818db2cc5f25124ccb1954b6a3a1dc 100644
--- a/extra/haxelib_src/haxelib.json
+++ b/extra/haxelib_src/haxelib.json
@@ -1,11 +1,11 @@
 {
 	"name": "haxelib",
-	"url" : "http://haxe.org/haxelib",
+	"url" : "https://lib.haxe.org/documentation/",
 	"license": "GPL",
 	"tags": ["haxelib", "core"],
 	"description": "The haxelib client",
 	"classPath": "src",
-	"version": "3.3.0",
-	"releasenote": "Initial release for Haxe 3.3",
-	"contributors": ["back2dos", "ncannasse", "jason", "Simn", "nadako"]
+	"version": "4.0.0",
+	"releasenote": " * Added `haxelib libpath` command (#407)\n * Allow forcing proxy configuration if proxy test failed (#411)\n * Use version specified by `-lib library:1.2.3` even if currently active one is `dev`\n * Strip comments from extraParams.hxml for `haxelib path` (#439)\n * Automatically retry failing downloads 3 times\n * Allow environment variables in dev paths using `%VAR_NAME%` syntax. E.g.: `/path/to/%MY_ENV_VAR%/lib`\n * Handle HAXELIB_NO_SSL environment variable to disable https on requests to haxelib server (#448)\n * Added `--skip-dependencies` option (#343)\n * Look for `.haxelib` local repo recursively up along the directories tree (#292)",
+	"contributors": ["HaxeFoundation", "back2dos", "ncannasse", "jason", "Simn", "nadako", "andyli"]
 }
diff --git a/extra/haxelib_src/hx3compat/README.md b/extra/haxelib_src/hx3compat/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..1f3bb03e21668dc40b94f51cc1762bd03b10760e
--- /dev/null
+++ b/extra/haxelib_src/hx3compat/README.md
@@ -0,0 +1,4 @@
+hx3compat
+=========
+
+Haxe 4 compatibility lib for haxe 3
diff --git a/extra/haxelib_src/hx3compat/haxelib.json b/extra/haxelib_src/hx3compat/haxelib.json
new file mode 100644
index 0000000000000000000000000000000000000000..18a9ae349aed071609486a4914b1a38dd2716960
--- /dev/null
+++ b/extra/haxelib_src/hx3compat/haxelib.json
@@ -0,0 +1,14 @@
+{
+  "name": "hx3compat",
+  "url": "https://github.com/HaxeFoundation/hx3compat",
+  "license": "BSD",
+  "tags": ["cross"],
+  "description": "Some haxe 3 types for easier migration to haxe 4.",
+  "version": "1.0.0",
+  "releasenote": "Initial",
+  "contributors": ["Simn"],
+  "dependencies": {
+
+  },
+  "classPath": "std"
+}
\ No newline at end of file
diff --git a/std/haxe/remoting/AMFConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/AMFConnection.hx
similarity index 95%
rename from std/haxe/remoting/AMFConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/AMFConnection.hx
index 984704c10b00ade8498be9c78a323e5dc32baf12..e9acae3e888785dde72cd295f77ac4899274921c 100644
--- a/std/haxe/remoting/AMFConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/AMFConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@ package haxe.remoting;
 /**
 	Allows a connection to an AMF Remoting server such as Flash Media Server or AMFPHP.
 */
-class AMFConnection implements AsyncConnection implements Dynamic<AsyncConnection> {
+class AMFConnection implements AsyncConnection {
 
 	var __data : {
 		error : Dynamic -> Void,
diff --git a/std/haxe/remoting/AsyncAdapter.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncAdapter.hx
similarity index 97%
rename from std/haxe/remoting/AsyncAdapter.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncAdapter.hx
index abbd2eada5a1cd356572b5cb00d77202a57028a7..530d623dda44c1ad240b75dbec18749b8f127295 100644
--- a/std/haxe/remoting/AsyncAdapter.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncAdapter.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/haxe/remoting/AsyncConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncConnection.hx
similarity index 93%
rename from std/haxe/remoting/AsyncConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncConnection.hx
index 90e515e03f0698241613f27b6c3476d90f0d9078..47acaae75c73efbd67df656c6317b6d103367404 100644
--- a/std/haxe/remoting/AsyncConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@ package haxe.remoting;
 /**
 	For asynchronous connections, where the results are events that will be resolved later in the execution process.
 */
-interface AsyncConnection implements Dynamic<AsyncConnection> {
+interface AsyncConnection {
 
 	function resolve( name : String ) : AsyncConnection;
 	function call( params : Array<Dynamic>, ?result : Dynamic -> Void ) : Void;
diff --git a/std/haxe/remoting/AsyncDebugConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncDebugConnection.hx
similarity index 95%
rename from std/haxe/remoting/AsyncDebugConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncDebugConnection.hx
index f6ae1d50ca1a15215e5c10d7bbcd3d3ba1be73af..ecd6586ed8928374c652dc17f00d2b98c97ce38f 100644
--- a/std/haxe/remoting/AsyncDebugConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncDebugConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,7 @@
  */
 package haxe.remoting;
 
-class AsyncDebugConnection implements AsyncConnection implements Dynamic<AsyncDebugConnection> {
+class AsyncDebugConnection implements AsyncConnection {
 
 	var __path : Array<String>;
 	var __cnx : AsyncConnection;
diff --git a/std/haxe/remoting/AsyncProxy.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncProxy.hx
similarity index 96%
rename from std/haxe/remoting/AsyncProxy.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncProxy.hx
index dafa0a26e3fe2d9e5d9d7d55aaa9664e5d498bf5..32e30cd298255eebd88927b681abf4ce8400d1f9 100644
--- a/std/haxe/remoting/AsyncProxy.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/AsyncProxy.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/haxe/remoting/Connection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/Connection.hx
similarity index 92%
rename from std/haxe/remoting/Connection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/Connection.hx
index 91177bb33b0279292b5d62f7822a5b5d5ed3f4fa..70a7ca727889ce05275d0d208f035af838e0fe34 100644
--- a/std/haxe/remoting/Connection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/Connection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,7 @@
  */
 package haxe.remoting;
 
-interface Connection implements Dynamic<Connection> {
+interface Connection {
 
 	function resolve( name : String ) : Connection;
 	function call( params : Array<Dynamic> ) : Dynamic;
diff --git a/std/haxe/remoting/Context.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/Context.hx
similarity index 98%
rename from std/haxe/remoting/Context.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/Context.hx
index d42f8e9933d4c551b3d5a897b5bcb6ea6be8fe97..40ba56fa50cb57e2586c6266a8e548b6d5f1d94e 100644
--- a/std/haxe/remoting/Context.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/Context.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/haxe/remoting/ContextAll.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/ContextAll.hx
similarity index 97%
rename from std/haxe/remoting/ContextAll.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/ContextAll.hx
index f8b7c2aa1e51e3d07fec2003af0563a33f327774..a6f182cf1e42d6f0b08e95b2f179f632f103a4fb 100644
--- a/std/haxe/remoting/ContextAll.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/ContextAll.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/haxe/remoting/DelayedConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/DelayedConnection.hx
similarity index 94%
rename from std/haxe/remoting/DelayedConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/DelayedConnection.hx
index ccc84e28d136275c40dfe193c237a73c53b8962f..d5477ce4f690db5bebb8edd6332e79e8b627ba9e 100644
--- a/std/haxe/remoting/DelayedConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/DelayedConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,7 @@
  */
 package haxe.remoting;
 
-class DelayedConnection implements AsyncConnection implements Dynamic<AsyncConnection> {
+class DelayedConnection implements AsyncConnection {
 
 	public var connection(get,set) : AsyncConnection;
 
diff --git a/std/haxe/remoting/ExternalConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/ExternalConnection.hx
similarity index 96%
rename from std/haxe/remoting/ExternalConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/ExternalConnection.hx
index d88015315aaaa6d4824f99d3e5954c811e9613d4..fa1bd34b18b491ed2222b04839c807e1019de08b 100644
--- a/std/haxe/remoting/ExternalConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/ExternalConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,7 @@ package haxe.remoting;
 	Synchronous communications between Flash and Javascript.
 **/
 @:expose
-class ExternalConnection implements Connection implements Dynamic<Connection> {
+class ExternalConnection implements Connection {
 
 	var __data : { name : String, ctx : Context, #if js flash : String #end };
 	var __path : Array<String>;
@@ -50,7 +50,7 @@ class ExternalConnection implements Connection implements Dynamic<Connection> {
 		return s.split("\\").join("\\\\");
 	}
 	#else
-	static inline function escapeString(s) {
+	static inline function escapeString(s:String) {
 		return s;
 	}
 	#end
diff --git a/std/haxe/remoting/FlashJsConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/FlashJsConnection.hx
similarity index 96%
rename from std/haxe/remoting/FlashJsConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/FlashJsConnection.hx
index 316732cd610c1600ac2acaa6159813e8f729991f..162a465bfbd3bcf27b3d3eb29aca31a795b2f646 100644
--- a/std/haxe/remoting/FlashJsConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/FlashJsConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,7 @@
  */
 package haxe.remoting;
 
-class FlashJsConnection #if flash implements AsyncConnection implements Dynamic<AsyncConnection> #end {
+class FlashJsConnection #if flash implements AsyncConnection #end {
 
 #if flash
 
diff --git a/std/haxe/remoting/HttpAsyncConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/HttpAsyncConnection.hx
similarity index 94%
rename from std/haxe/remoting/HttpAsyncConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/HttpAsyncConnection.hx
index 99091f51fc766950ccdefa5cae030dbbe845f9ca..1a0baa3932752f68c7dda25d6d9fc5d10dba414f 100644
--- a/std/haxe/remoting/HttpAsyncConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/HttpAsyncConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@ package haxe.remoting;
 /**
     Allows an asynchronous connection to the given URL which should link to a Haxe server application.
 */
-class HttpAsyncConnection implements AsyncConnection implements Dynamic<AsyncConnection> {
+class HttpAsyncConnection implements AsyncConnection {
 
 	var __data : { url : String, error : Dynamic -> Void };
 	var __path : Array<String>;
diff --git a/std/haxe/remoting/HttpConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/HttpConnection.hx
similarity index 96%
rename from std/haxe/remoting/HttpConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/HttpConnection.hx
index efcbecdc58687542ee8031eaf39b580b45cd724f..22aee3de55f25bb5cc78d696d5c2c5267111afd6 100644
--- a/std/haxe/remoting/HttpConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/HttpConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@ package haxe.remoting;
 /**
     Allows a synchronous connection to the given URL which should link to a Haxe server application.
 */
-class HttpConnection implements Connection implements Dynamic<Connection> {
+class HttpConnection implements Connection {
 
 	public static var TIMEOUT = 10.;
 
diff --git a/std/haxe/remoting/LocalConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/LocalConnection.hx
similarity index 96%
rename from std/haxe/remoting/LocalConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/LocalConnection.hx
index 7b534976d4add948876e10b2526d0468d097d88b..939ce57b4b59c5b09b1860ba602381f2574c9b51 100644
--- a/std/haxe/remoting/LocalConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/LocalConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@ package haxe.remoting;
 /**
     Allows communications to a different application that runs on the same client device
 */
-class LocalConnection implements AsyncConnection implements Dynamic<AsyncConnection> {
+class LocalConnection implements AsyncConnection {
 
 	static var ID = 0;
 
diff --git a/std/haxe/remoting/Proxy.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/Proxy.hx
similarity index 96%
rename from std/haxe/remoting/Proxy.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/Proxy.hx
index 7a8e54911a4b76943301741f55c35bb75eb3cab2..3b6ffc7c2f3c2b29b81d8f788fe472d3a43d15fe 100644
--- a/std/haxe/remoting/Proxy.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/Proxy.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/haxe/remoting/SocketConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/SocketConnection.hx
similarity index 96%
rename from std/haxe/remoting/SocketConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/SocketConnection.hx
index 2e64f879a87ef3a3a596940654474f4b3ac60b2b..00b8b17e9335f213db2456daaf71c03b28eb3092 100644
--- a/std/haxe/remoting/SocketConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/SocketConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,7 @@ import haxe.remoting.SocketProtocol.Socket;
 /**
 	Allows remoting communications over a socket connection
 */
-class SocketConnection implements AsyncConnection implements Dynamic<AsyncConnection> {
+class SocketConnection implements AsyncConnection {
 
 	var __path : Array<String>;
 	var __data : {
@@ -111,7 +111,7 @@ class SocketConnection implements AsyncConnection implements Dynamic<AsyncConnec
 		if( f.onResult != null ) f.onResult(ret);
 	}
 
-	function defaultLog(path,args,e) {
+	function defaultLog(path,args,e:Dynamic) {
 		// exception inside the called method
 		var astr, estr;
 		try astr = args.join(",") catch( e : Dynamic ) astr = "???";
diff --git a/std/haxe/remoting/SocketProtocol.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/SocketProtocol.hx
similarity index 99%
rename from std/haxe/remoting/SocketProtocol.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/SocketProtocol.hx
index 34d9bd19efda59fada1036ae3323697ccdf75cae..8cbc33015c8895ec1574b848ac32d539ad8786fd 100644
--- a/std/haxe/remoting/SocketProtocol.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/SocketProtocol.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/haxe/remoting/SocketWrapper.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/SocketWrapper.hx
similarity index 98%
rename from std/haxe/remoting/SocketWrapper.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/SocketWrapper.hx
index c2bc67e9cfb46fcd0808fdf81c31f5aa4401ca8a..150dfb12e2156b1a36eeaa185027af3e0b317613 100644
--- a/std/haxe/remoting/SocketWrapper.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/SocketWrapper.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/haxe/remoting/SyncSocketConnection.hx b/extra/haxelib_src/hx3compat/std/haxe/remoting/SyncSocketConnection.hx
similarity index 95%
rename from std/haxe/remoting/SyncSocketConnection.hx
rename to extra/haxelib_src/hx3compat/std/haxe/remoting/SyncSocketConnection.hx
index 41cf2104997169f795913362812747680caa320e..01939a4f4c7b8a4926539c18504c2c67d9ecfa17 100644
--- a/std/haxe/remoting/SyncSocketConnection.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/remoting/SyncSocketConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 package haxe.remoting;
 import haxe.remoting.SocketProtocol.Socket;
 
-class SyncSocketConnection implements Connection implements Dynamic<Connection> {
+class SyncSocketConnection implements Connection {
 
 	var __path : Array<String>;
 	var __proto : SocketProtocol;
diff --git a/std/haxe/unit/TestCase.hx b/extra/haxelib_src/hx3compat/std/haxe/unit/TestCase.hx
similarity index 100%
rename from std/haxe/unit/TestCase.hx
rename to extra/haxelib_src/hx3compat/std/haxe/unit/TestCase.hx
diff --git a/std/haxe/unit/TestResult.hx b/extra/haxelib_src/hx3compat/std/haxe/unit/TestResult.hx
similarity index 100%
rename from std/haxe/unit/TestResult.hx
rename to extra/haxelib_src/hx3compat/std/haxe/unit/TestResult.hx
diff --git a/std/haxe/unit/TestRunner.hx b/extra/haxelib_src/hx3compat/std/haxe/unit/TestRunner.hx
similarity index 99%
rename from std/haxe/unit/TestRunner.hx
rename to extra/haxelib_src/hx3compat/std/haxe/unit/TestRunner.hx
index 7473d780f05ea5dd9110b07e96a726edaae0c396..5bf58728d256db5b0b9190a5e77f75039d4c80aa 100644
--- a/std/haxe/unit/TestRunner.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/unit/TestRunner.hx
@@ -24,16 +24,16 @@ import Reflect;
 
 /**
 	This class runs unit test cases and prints the result.
-	
+
 	```haxe
 	var r = new haxe.unit.TestRunner();
 	r.add(new MyTestCase());
 	// add other TestCases here
-	
+
 	// finally, run the tests
 	r.run();
 	```
-	
+
 	@see <https://haxe.org/manual/std-unit-testing.html>
 **/
 class TestRunner {
@@ -50,7 +50,7 @@ class TestRunner {
 
 	/**
 		Prints the given object/value.
-		
+
 		 * Flash outputs the result in a new `TextField` on stage.
 		 * JavaScript outputs the result using `console.log`.
 		 * Other targets use native `print` to output the result.
@@ -96,7 +96,7 @@ class TestRunner {
 			untyped __java__("java.lang.System.out.print(str)");
 		#elseif python
 			python.Lib.print(v);
-		#elseif (hl || lua)
+		#elseif (hl || lua || eval)
 			Sys.print(Std.string(v));
 		#end
 	}
@@ -119,7 +119,7 @@ class TestRunner {
 
 	/**
 		Runs the unit tests and prints the results.
-		
+
 		@return `true` if the unit test succesfully executed the test cases.
 	**/
 	public function run() : Bool {
diff --git a/std/haxe/unit/TestStatus.hx b/extra/haxelib_src/hx3compat/std/haxe/unit/TestStatus.hx
similarity index 100%
rename from std/haxe/unit/TestStatus.hx
rename to extra/haxelib_src/hx3compat/std/haxe/unit/TestStatus.hx
diff --git a/std/haxe/web/Dispatch.hx b/extra/haxelib_src/hx3compat/std/haxe/web/Dispatch.hx
similarity index 98%
rename from std/haxe/web/Dispatch.hx
rename to extra/haxelib_src/hx3compat/std/haxe/web/Dispatch.hx
index 47526fb482821b9a8772d5cf81dd98aa0a7e04e2..3cb92e37df7ebb30711d24ba9f6be4b25e87614e 100644
--- a/std/haxe/web/Dispatch.hx
+++ b/extra/haxelib_src/hx3compat/std/haxe/web/Dispatch.hx
@@ -416,7 +416,7 @@ class Dispatch {
 				var str = serialize(fields);
 				i.meta.add("dispatchConfig", [ { expr : EConst(CString(str)), pos : p } ], p);
 			}
-			return { expr : EUntyped ({ expr : ECall({ expr : EField(Context.makeExpr(Dispatch,p),"extractConfig"), pos : p },[obj]), pos : p }), pos : p };
+			return { expr : EUntyped ({ expr : ECall({ expr : EField(macro haxe.web.Dispatch,"extractConfig"), pos : p },[obj]), pos : p }), pos : p };
 		default:
 			Context.error("Configuration should be an anonymous object",p);
 		}
diff --git a/std/haxe/web/Request.hx b/extra/haxelib_src/hx3compat/std/haxe/web/Request.hx
similarity index 100%
rename from std/haxe/web/Request.hx
rename to extra/haxelib_src/hx3compat/std/haxe/web/Request.hx
diff --git a/std/js/JQuery.hx b/extra/haxelib_src/hx3compat/std/js/JQuery.hx
similarity index 100%
rename from std/js/JQuery.hx
rename to extra/haxelib_src/hx3compat/std/js/JQuery.hx
diff --git a/std/js/SWFObject.hx b/extra/haxelib_src/hx3compat/std/js/SWFObject.hx
similarity index 100%
rename from std/js/SWFObject.hx
rename to extra/haxelib_src/hx3compat/std/js/SWFObject.hx
diff --git a/std/js/XMLSocket.hx b/extra/haxelib_src/hx3compat/std/js/XMLSocket.hx
similarity index 98%
rename from std/js/XMLSocket.hx
rename to extra/haxelib_src/hx3compat/std/js/XMLSocket.hx
index db8675307d644694fb5877c2ef86f512e2e962dd..7e6af67c02264004bce254f63380add274c015fb 100644
--- a/std/js/XMLSocket.hx
+++ b/extra/haxelib_src/hx3compat/std/js/XMLSocket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/neko/net/Poll.hx b/extra/haxelib_src/hx3compat/std/neko/net/Poll.hx
similarity index 98%
rename from std/neko/net/Poll.hx
rename to extra/haxelib_src/hx3compat/std/neko/net/Poll.hx
index dff7373e1d15611dd367b92407bd9cd54c58bfcb..e388ccc586a6e22cfbc2de921833e9036e66840b 100644
--- a/std/neko/net/Poll.hx
+++ b/extra/haxelib_src/hx3compat/std/neko/net/Poll.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/neko/net/ProxyDetect.hx b/extra/haxelib_src/hx3compat/std/neko/net/ProxyDetect.hx
similarity index 99%
rename from std/neko/net/ProxyDetect.hx
rename to extra/haxelib_src/hx3compat/std/neko/net/ProxyDetect.hx
index 02cd55f95b0a254564af53d55fe83126cf760d87..8b1b157c6fb08fcc14c55f7581bbe4cee7e6c536 100644
--- a/std/neko/net/ProxyDetect.hx
+++ b/extra/haxelib_src/hx3compat/std/neko/net/ProxyDetect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/neko/net/ServerLoop.hx b/extra/haxelib_src/hx3compat/std/neko/net/ServerLoop.hx
similarity index 99%
rename from std/neko/net/ServerLoop.hx
rename to extra/haxelib_src/hx3compat/std/neko/net/ServerLoop.hx
index 60abf8b4c836d58df6bef8969c579544377b7622..07c9853fc524000b5b7b71d42d15b3d893ad089b 100644
--- a/std/neko/net/ServerLoop.hx
+++ b/extra/haxelib_src/hx3compat/std/neko/net/ServerLoop.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/neko/net/ThreadRemotingServer.hx b/extra/haxelib_src/hx3compat/std/neko/net/ThreadRemotingServer.hx
similarity index 98%
rename from std/neko/net/ThreadRemotingServer.hx
rename to extra/haxelib_src/hx3compat/std/neko/net/ThreadRemotingServer.hx
index 3eb55db28bf91d34e6d081931b60144deb374a54..471315aaafd34c65e7bfe900e97f0143275ef2fd 100644
--- a/std/neko/net/ThreadRemotingServer.hx
+++ b/extra/haxelib_src/hx3compat/std/neko/net/ThreadRemotingServer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/neko/net/ThreadServer.hx b/extra/haxelib_src/hx3compat/std/neko/net/ThreadServer.hx
similarity index 98%
rename from std/neko/net/ThreadServer.hx
rename to extra/haxelib_src/hx3compat/std/neko/net/ThreadServer.hx
index a5f1ddc11cbec42ea3c3aa612360a3dd6db89ed5..996237d6c27ac3caa1d6b7eb1bc9c41813922678 100644
--- a/std/neko/net/ThreadServer.hx
+++ b/extra/haxelib_src/hx3compat/std/neko/net/ThreadServer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,7 +37,7 @@ private typedef ClientInfos<Client> = {
 }
 
 /**
-	The ThreadServer can be used to easily create a multithreaded server where each thread polls multiple connections. 
+	The ThreadServer can be used to easily create a multithreaded server where each thread polls multiple connections.
 	To use it, at a minimum you must override or rebind clientConnected, readClientMessage, and clientMessage and you must define your Client and Message.
 **/
 class ThreadServer<Client,Message> {
@@ -174,7 +174,7 @@ class ThreadServer<Client,Message> {
 		}
 	}
 
-	function doClientDisconnected(s,c) {
+	function doClientDisconnected(s:sys.net.Socket,c) {
 		try s.close() catch( e : Dynamic ) {};
 		clientDisconnected(c);
 	}
@@ -329,7 +329,7 @@ class ThreadServer<Client,Message> {
 
 	/**
 		Called when data has been read from a socket. This method should try to extract a message from the buffer.
-		The available data resides in buf, starts at pos, and is len bytes wide. Return the new message and the number of bytes read from the buffer. 
+		The available data resides in buf, starts at pos, and is len bytes wide. Return the new message and the number of bytes read from the buffer.
 		If no message could be read, return null.
 	**/
 	public dynamic function readClientMessage( c : Client, buf : haxe.io.Bytes, pos : Int, len : Int ) : { msg : Message, bytes : Int } {
diff --git a/extra/haxelib_src/integration_tests.hxml b/extra/haxelib_src/integration_tests.hxml
index fb1748bbace024de20dcff4f35b7ca2e9d7f9d8c..514501311f1b82147d91f97906fa3c9331aedde9 100644
--- a/extra/haxelib_src/integration_tests.hxml
+++ b/extra/haxelib_src/integration_tests.hxml
@@ -2,5 +2,4 @@
 -cp test
 -lib hx3compat
 -main IntegrationTests
--neko bin/integration_tests.n
--cmd neko bin/integration_tests.n
\ No newline at end of file
+-neko bin/integration_tests.n
\ No newline at end of file
diff --git a/extra/haxelib_src/libs.hxml b/extra/haxelib_src/libs.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..f4295a01d16a0a2385f22792e0369754ef1cacb6
--- /dev/null
+++ b/extra/haxelib_src/libs.hxml
@@ -0,0 +1,32 @@
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/tink_core-1,23,0.zip -o haxelib_global/tink_core.zip && neko run.n install --always --skip-dependencies haxelib_global/tink_core.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/tink_core-1,0,0-rc,11.zip -o haxelib_global/tink_core.zip && neko run.n install --always --skip-dependencies haxelib_global/tink_core.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/tink_macro-0,6,4.zip -o haxelib_global/tink_macro.zip && neko run.n install --always --skip-dependencies haxelib_global/tink_macro.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/promhx-1,1,0.zip -o haxelib_global/promhx.zip && neko run.n install --always --skip-dependencies haxelib_global/promhx.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/asynctools-0,1,0.zip -o haxelib_global/asynctools.zip && neko run.n install --always --skip-dependencies haxelib_global/asynctools.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/aws-sdk-neko-0,2,0.zip -o haxelib_global/aws-sdk-neko.zip && neko run.n install --always --skip-dependencies haxelib_global/aws-sdk-neko.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/buddy-2,8,1.zip -o haxelib_global/buddy.zip && neko run.n install --always --skip-dependencies haxelib_global/buddy.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/cleversort-1,0,3.zip -o haxelib_global/cleversort.zip && neko run.n install --always --skip-dependencies haxelib_global/cleversort.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/compiletime-2,6,0.zip -o haxelib_global/compiletime.zip && neko run.n install --always --skip-dependencies haxelib_global/compiletime.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/compiletime-2,8,0.zip -o haxelib_global/compiletime.zip && neko run.n install --always --skip-dependencies haxelib_global/compiletime.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/hscript-2,3,0.zip -o haxelib_global/hscript.zip && neko run.n install --always --skip-dependencies haxelib_global/hscript.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/erazor-1,0,1.zip -o haxelib_global/erazor.zip && neko run.n install --always --skip-dependencies haxelib_global/erazor.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/html-haxe-code-highlighter-0,1,2.zip -o haxelib_global/html-haxe-code-highlighter.zip && neko run.n install --always --skip-dependencies haxelib_global/html-haxe-code-highlighter.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/hx2compat-1,0,2.zip -o haxelib_global/hx2compat.zip && neko run.n install --always --skip-dependencies haxelib_global/hx2compat.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/hx3compat-1,0,3.zip -o haxelib_global/hx3compat.zip && neko run.n install --always --skip-dependencies haxelib_global/hx3compat.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/markdown-1,0,0.zip -o haxelib_global/markdown.zip && neko run.n install --always --skip-dependencies haxelib_global/markdown.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/mcli-0,1,7.zip -o haxelib_global/mcli.zip && neko run.n install --always --skip-dependencies haxelib_global/mcli.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/mconsole-1,6,0.zip -o haxelib_global/mconsole.zip && neko run.n install --always --skip-dependencies haxelib_global/mconsole.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/minject-2,0,0-rc,1.zip -o haxelib_global/minject.zip && neko run.n install --always --skip-dependencies haxelib_global/minject.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/mockatoo-3,2,1.zip -o haxelib_global/mockatoo.zip && neko run.n install --always --skip-dependencies haxelib_global/mockatoo.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/mtwin-1,6,0.zip -o haxelib_global/mtwin.zip && neko run.n install --always --skip-dependencies haxelib_global/mtwin.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/PBKDF2-1,0,0.zip -o haxelib_global/PBKDF2.zip && neko run.n install --always --skip-dependencies haxelib_global/PBKDF2.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/record-macros-1,0,0-alpha.zip -o haxelib_global/record-macros.zip && neko run.n install --always --skip-dependencies haxelib_global/record-macros.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/tora-1,8,1.zip -o haxelib_global/tora.zip && neko run.n install --always --skip-dependencies haxelib_global/tora.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-mvc-1,1,0.zip -o haxelib_global/ufront-mvc.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-mvc.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-orm-1,1,0.zip -o haxelib_global/ufront-orm.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-orm.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-easyauth-1,0,0.zip -o haxelib_global/ufront-easyauth.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-easyauth.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-mail-1,0,0-rc,4.zip -o haxelib_global/ufront-mail.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-mail.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-ufadmin-1,0,0-beta,14.zip -o haxelib_global/ufront-ufadmin.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-ufadmin.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-uftasks-1,0,0-beta,15.zip -o haxelib_global/ufront-uftasks.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-uftasks.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-2,0,0.zip -o haxelib_global/ufront.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/utest-1,9,6.zip -o haxelib_global/utest.zip && neko run.n install --always --skip-dependencies haxelib_global/utest.zip
diff --git a/extra/haxelib_src/package.hxml b/extra/haxelib_src/package.hxml
index c5e4ebba5f71544b985691233ff12d55a2b85fce..9d6a5186855d93ef87e9a8ff1c9c18a8b2e7d9d2 100755
--- a/extra/haxelib_src/package.hxml
+++ b/extra/haxelib_src/package.hxml
@@ -1,2 +1,3 @@
 -cp src
+-cp hx3compat/std
 --run Package
\ No newline at end of file
diff --git a/extra/haxelib_src/run.n b/extra/haxelib_src/run.n
index 73828aff6d46869062378dcdfd710d53a1aebe7c..9d5147339386a993653abe8022e07e9701ebb08b 100644
Binary files a/extra/haxelib_src/run.n and b/extra/haxelib_src/run.n differ
diff --git a/extra/haxelib_src/schema.json b/extra/haxelib_src/schema.json
index 6e20db78f3d9abf2e3968cf0c9071efa663d8345..4faf9e657cafa0ad9d92d862a85d3f525e9f099d 100644
--- a/extra/haxelib_src/schema.json
+++ b/extra/haxelib_src/schema.json
@@ -22,6 +22,10 @@
 			"description": "Folder in the package which contains the source files for this project",
 			"type": "string"
 		},
+		"main": {
+			"description": "A class to run on `haxelib run libraryname` command.\nRelative to library root. E.g. to run `tools/Main.hx` the value should be `tools.Main`.\nDefault value since Haxe 4: Run",
+			"type": "string"
+		},
 		"contributors": {
 			"description": "List of project contributors that are allowed to upload to haxelib",
 			"type": "array",
diff --git a/extra/haxelib_src/server-start.hxml b/extra/haxelib_src/server-start.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..08b95fb68d6752ccc9cc65073162a9147c57e602
--- /dev/null
+++ b/extra/haxelib_src/server-start.hxml
@@ -0,0 +1 @@
+-cmd nekotools server -rewrite -d www
\ No newline at end of file
diff --git a/extra/haxelib_src/server.hxml b/extra/haxelib_src/server.hxml
index 55a1e32b2eccbe4b5a5349ce1bce92d374f62da0..8edfae5f279c985c43a1184d085c1af8d4103ee7 100644
--- a/extra/haxelib_src/server.hxml
+++ b/extra/haxelib_src/server.hxml
@@ -1,7 +1,9 @@
 # The new haxelib website (on the same 3.0 repo)
 
+server_website_highlighter.hxml
+--next
 server_website.hxml
 --next
 server_tasks.hxml
 --next
-server_api.hxml
\ No newline at end of file
+server_api.hxml
diff --git a/extra/haxelib_src/server_each.hxml b/extra/haxelib_src/server_each.hxml
index 6ad2995a4f858b901baca2b7a83fc131852820c6..94ca08e8e18a6b06fc290d50e5c698ba2477f86a 100644
--- a/extra/haxelib_src/server_each.hxml
+++ b/extra/haxelib_src/server_each.hxml
@@ -1,4 +1,5 @@
 -cp src
+-cp hx3compat/std
 -lib ufront
 -lib ufront-mail:1.0.0-rc.4
 -lib ufront-ufadmin
@@ -7,6 +8,7 @@
 -lib cleversort
 -lib aws-sdk-neko:0.2.0
 -lib record-macros
+-lib html-haxe-code-highlighter:0.1.2
 -D server
 -D getter_support
 # https://github.com/HaxeFoundation/haxe/issues/4903
diff --git a/extra/haxelib_src/server_website_highlighter.hxml b/extra/haxelib_src/server_website_highlighter.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..35db03c673014b60d316e8a033a599fd69400837
--- /dev/null
+++ b/extra/haxelib_src/server_website_highlighter.hxml
@@ -0,0 +1,7 @@
+# generate code highlighter
+-lib html-haxe-code-highlighter:0.1.2
+-js www/js/highlighter.js
+-main highlighter.Highlighter
+-D highlighter_standalone
+-D analyzer-optimize
+-dce full
\ No newline at end of file
diff --git a/extra/haxelib_src/src/Package.hx b/extra/haxelib_src/src/Package.hx
index 3703e6e150c0b733c893bfa9517b4cf91b7ca77a..3fdd2d190d68a2c13fb3b6bbda91cb3cf66e331e 100644
--- a/extra/haxelib_src/src/Package.hx
+++ b/extra/haxelib_src/src/Package.hx
@@ -68,10 +68,15 @@ class Package {
             v;
         }
         var json:Infos = haxe.Json.parse(sys.io.File.getContent("haxelib.json"));
-        if (!runVersion.startsWith(json.version + " ")) {
+
+        // Version output examples:
+        //  - 3.4.0
+        //  - 3.4.0 (6b9c8851036fb012c0e188bc27da07999b663b4f - dirty)
+        if (!runVersion.startsWith(json.version)) {
             Sys.println('Error: Version in haxelib.json (${json.version}) does not match `neko run.n version` ($runVersion)');
             Sys.exit(1);
         }
+
         if (runVersion.indexOf("dirty") >= 0) {
             Sys.println('Error: run.n was compiled with dirty source');
             Sys.exit(1);
diff --git a/extra/haxelib_src/src/haxelib/Data.hx b/extra/haxelib_src/src/haxelib/Data.hx
index 98799ae5236659564c6e114c576f9dbacef3ae8f..2f4e2273db185fbf9c0e8226cc2c3099715d759e 100644
--- a/extra/haxelib_src/src/haxelib/Data.hx
+++ b/extra/haxelib_src/src/haxelib/Data.hx
@@ -49,6 +49,7 @@ typedef ProjectInfos = {
 	var desc : String;
 	var website : String;
 	var owner : String;
+	var contributors : Array<{ name:String, fullname:String }>;
 	var license : String;
 	var curversion : String;
 	var downloads : Int;
diff --git a/extra/haxelib_src/src/haxelib/client/Main.hx b/extra/haxelib_src/src/haxelib/client/Main.hx
index 3f0396687796a23eb2d9fcb0d382eceb2796c0bb..997e33c25327aa760c33223bd2cd6276c72bf038 100644
--- a/extra/haxelib_src/src/haxelib/client/Main.hx
+++ b/extra/haxelib_src/src/haxelib/client/Main.hx
@@ -21,6 +21,7 @@
  */
 package haxelib.client;
 
+import haxelib.client.Util.*;
 import haxe.crypto.Md5;
 import haxe.*;
 import haxe.ds.*;
@@ -54,8 +55,10 @@ class ProgressOut extends haxe.io.Output {
 
 	var o : haxe.io.Output;
 	var cur : Int;
+	var curReadable : Float;
 	var startSize : Int;
 	var max : Null<Int>;
+	var maxReadable : Null<Float>;
 	var start : Float;
 
 	public function new(o, currentSize) {
@@ -67,10 +70,20 @@ class ProgressOut extends haxe.io.Output {
 
 	function report(n) {
 		cur += n;
+
+		var tag : String = ((max != null ? max : cur) / 1000000) > 1 ? "MB" : "KB";
+
+		curReadable = tag == "MB" ? cur / 1000000 : cur / 1000;
+		curReadable = Math.round( curReadable * 100 ) / 100; // 12.34 precision.
+
 		if( max == null )
-			Sys.print(cur+" bytes\r");
-		else
-			Sys.print(cur+"/"+max+" ("+Std.int((cur*100.0)/max)+"%)\r");
+			Sys.print('${curReadable} ${tag}\r');
+		else {
+			maxReadable = tag == "MB" ? max / 1000000 : max / 1000;
+			maxReadable = Math.round( maxReadable * 100 ) / 100; // 12.34 precision.
+
+			Sys.print('${curReadable}${tag} / ${maxReadable}${tag} (${Std.int((cur*100.0)/max)}%)\r');
+		}
 	}
 
 	public override function writeByte(c) {
@@ -87,12 +100,18 @@ class ProgressOut extends haxe.io.Output {
 	public override function close() {
 		super.close();
 		o.close();
+
 		var time = Timer.stamp() - start;
 		var downloadedBytes = cur - startSize;
-		var speed = (downloadedBytes / time) / 1024;
+		var speed = (downloadedBytes / time) / 1000;
 		time = Std.int(time * 10) / 10;
 		speed = Std.int(speed * 10) / 10;
-		Sys.print("Download complete : "+downloadedBytes+" bytes in "+time+"s ("+speed+"KB/s)\n");
+
+		var tag : String = (downloadedBytes / 1000000) > 1 ? "MB" : "KB";
+		var readableBytes : Float = (tag == "MB") ? downloadedBytes / 1000000 : downloadedBytes / 1000;
+		readableBytes = Math.round( readableBytes * 100 ) / 100; // 12.34 precision.
+
+		Sys.println('Download complete: ${readableBytes}${tag} in ${time}s (${speed}KB/s)');
 	}
 
 	public override function prepare(m) {
@@ -140,11 +159,13 @@ class Main {
 	static var REPNAME = "lib";
 	static var REPODIR = ".haxelib";
 	static var SERVER = {
+		protocol : "https",
 		host : "lib.haxe.org",
-		port : 80,
+		port : 443,
 		dir : "",
 		url : "index.n",
 		apiVersion : "3.0",
+		noSsl : false
 	};
 	static var IS_WINDOWS = (Sys.systemName() == "Windows");
 
@@ -156,45 +177,6 @@ class Main {
 	var isHaxelibRun : Bool;
 	var alreadyUpdatedVcsDependencies:Map<String,String> = new Map<String,String>();
 
-	macro static function rethrow(e) {
-		return if (haxe.macro.Context.defined("neko"))
-			macro neko.Lib.rethrow(e);
-		else
-			macro throw e;
-	}
-
-	macro static function getHaxelibVersion() {
-		var haxelibJson:Infos = Json.parse(File.getContent("haxelib.json"));
-		return macro $v{haxelibJson.version};
-	}
-
-	macro static function getHaxelibVersionLong() {
-		var version:String = VERSION;
-		var p;
-		try {
-			//get commit sha
-			p = new sys.io.Process("git", ["rev-parse", "HEAD"]);
-			var sha = p.stdout.readAll().toString().trim();
-			p.close();
-
-			//check to see if there is changes, staged or not
-			p = new sys.io.Process("git", ["status", "--porcelain"]);
-			var changes = p.stdout.readAll().toString().trim();
-			p.close();
-
-			version += switch(changes) {
-				case "":
-					' ($sha)';
-				case _:
-					' ($sha - dirty)';
-			}
-			return macro $v{version};
-		} catch(e:Dynamic) {
-			if (p != null) p.close();
-			return macro $v{version};
-		}
-	}
-
 	function new() {
 		args = Sys.args();
 		isHaxelibRun = (Sys.getEnv("HAXELIB_RUN_NAME") == HAXELIB_LIBNAME);
@@ -213,7 +195,8 @@ class Main {
 		addCommand("info", info, "list information on a given library", Information);
 		addCommand("user", user, "list information on a given user", Information);
 		addCommand("config", config, "print the repository path", Information, false);
-		addCommand("path", path, "give paths to libraries", Information, false);
+		addCommand("path", path, "give paths to libraries' sources and necessary build definitions", Information, false);
+		addCommand("libpath", libpath, "returns the root path of a library", Information, false);
 		addCommand("version", version, "print the currently used haxelib version", Information, false);
 		addCommand("help", usage, "display this list of options", Information, false);
 
@@ -238,16 +221,39 @@ class Main {
 		initSite();
 	}
 
+	function retry<R>(func:Void -> R, numTries:Int = 3) {
+		var hasRetried = false;
+
+		while (numTries-- > 0) {
+			try {
+				var result = func();
+
+				if (hasRetried) print("retry sucessful");
+
+				return result;
+			} catch (e:Dynamic) {
+				if ( e == "Blocked") {
+					print("Failed. Triggering retry due to HTTP timeout");
+					hasRetried = true;
+				}
+				else {
+					throw 'Failed with error: $e';
+				}
+			}
+		}
+		throw 'Failed due to HTTP timeout after multiple retries';
+	}
+
 	function checkUpdate() {
-		var latest = try site.getLatestVersion(HAXELIB_LIBNAME) catch (_:Dynamic) null;
+		var latest = try retry(site.getLatestVersion.bind(HAXELIB_LIBNAME)) catch (_:Dynamic) null;
 		if (latest != null && latest > VERSION)
 			print('\nA new version ($latest) of haxelib is available.\nDo `haxelib --global update $HAXELIB_LIBNAME` to get the latest version.\n');
 	}
 
 	function initSite() {
-		siteUrl = "http://" + SERVER.host + ":" + SERVER.port + "/" + SERVER.dir;
+		siteUrl = SERVER.protocol + "://" + SERVER.host + ":" + SERVER.port + "/" + SERVER.dir;
 		var remotingUrl =  siteUrl + "api/" + SERVER.apiVersion + "/" + SERVER.url;
-		site = new SiteProxy(haxe.remoting.HttpConnection.urlConnect(remotingUrl).api);
+		site = new SiteProxy(haxe.remoting.HttpConnection.urlConnect(remotingUrl).resolve("api"));
 	}
 
 	function param( name, ?passwd ) {
@@ -258,6 +264,7 @@ class Main {
 			var s = new StringBuf();
 			do switch Sys.getChar(false) {
 				case 10, 13: break;
+				case 0: // ignore (windows bug)
 				case c: s.addChar(c);
 			}
 			while (true);
@@ -278,12 +285,23 @@ class Main {
 	}
 
 	function version() {
-		print(VERSION_LONG);
+		var params = paramOpt();
+		if ( params == null )
+			print(VERSION_LONG);
+		else {
+			Sys.stderr().writeString('no parameters expected, got: ${params}\n');
+			Sys.exit(1);
+		}
 	}
 
 	function usage() {
 		var cats = [];
-		var maxLength = 0;
+		var maxLength = Lambda.fold(Reflect.fields(ABOUT_SETTINGS), function(opt, max) {
+			var fullOption = '--' + ~/([A-Z])/g.replace(opt, "-$1").toLowerCase();
+			var len = fullOption.length;
+			return len > max ? len : max;
+		}, 0);
+
 		for( c in commands ) {
 			if (c.name.length > maxLength) maxLength = c.name.length;
 			if (c.cat.match(Deprecated(_))) continue;
@@ -292,7 +310,7 @@ class Main {
 			else cats[i].push(c);
 		}
 
-		print('Haxe Library Manager $VERSION - (c)2006-2017 Haxe Foundation');
+		print('Haxe Library Manager $VERSION - (c)2006-2019 Haxe Foundation');
 		print("  Usage: haxelib [command] [options]");
 
 		for (cat in cats) {
@@ -303,8 +321,10 @@ class Main {
 		}
 
 		print("  Available switches");
-		for (f in Reflect.fields(ABOUT_SETTINGS))
-			print('    --' + f.rpad(' ', maxLength-2) + ": " + Reflect.field(ABOUT_SETTINGS, f));
+		for (f in Reflect.fields(ABOUT_SETTINGS)) {
+			var option = ~/([A-Z])/g.replace(f, "-$1").toLowerCase().rpad(' ', maxLength-2);
+			print('    --' + option + ": " + Reflect.field(ABOUT_SETTINGS, f));
+		}
 	}
 	static var ABOUT_SETTINGS = {
 		global : "force global repo if a local one exists",
@@ -314,6 +334,7 @@ class Main {
 		always : "answer all questions with yes",
 		never  : "answer all questions with no",
 		system : "run bundled haxelib version instead of latest update",
+		skipDependencies : "do not install dependencies",
 	}
 
 	var settings: {
@@ -324,6 +345,7 @@ class Main {
 		never  : Bool,
 		global : Bool,
 		system : Bool,
+		skipDependencies : Bool,
 	};
 	function process() {
 		argcur = 0;
@@ -336,6 +358,7 @@ class Main {
 			flat: false,
 			global: false,
 			system: false,
+			skipDependencies: false,
 		};
 
 		function parseSwitch(s:String) {
@@ -348,6 +371,34 @@ class Main {
 					None;
 		}
 
+		var remoteIsSet = false;
+		function setupRemote(path:String) {
+			var r = ~/^(?:(https?):\/\/)?([^:\/]+)(?::([0-9]+))?\/?(.*)$/;
+			if( !r.match(path) )
+				throw "Invalid repository format '"+path+"'";
+			SERVER.protocol = switch (r.matched(1)) {
+				case null:
+					SERVER.noSsl ? "http" : "https";
+				case protocol:
+					protocol;
+			}
+			SERVER.host = r.matched(2);
+			SERVER.port = switch (r.matched(3)) {
+				case null:
+					switch (SERVER.protocol) {
+						case "https": 443;
+						case "http": 80;
+						case protocol: throw 'unknown default port for $protocol';
+					}
+				case portStr:
+					Std.parseInt(portStr);
+			}
+			SERVER.dir = r.matched(4);
+			if (SERVER.dir.length > 0 && !SERVER.dir.endsWith("/")) SERVER.dir += "/";
+			initSite();
+			remoteIsSet = true;
+		}
+
 		while ( argcur < args.length) {
 			var a = args[argcur++];
 			switch( a ) {
@@ -369,22 +420,15 @@ class Main {
 				case "-notimeout":
 					haxe.remoting.HttpConnection.TIMEOUT = 0;
 				case "-R":
-					var path = args[argcur++];
-					var r = ~/^(http:\/\/)?([^:\/]+)(:[0-9]+)?\/?(.*)$/;
-					if( !r.match(path) )
-						throw "Invalid repository format '"+path+"'";
-					SERVER.host = r.matched(2);
-					if( r.matched(3) != null )
-						SERVER.port = Std.parseInt(r.matched(3).substr(1));
-					SERVER.dir = r.matched(4);
-					if (SERVER.dir.length > 0 && !SERVER.dir.endsWith("/")) SERVER.dir += "/";
-					initSite();
+					setupRemote(args[argcur++]);
 				case "--debug":
 					settings.debug = true;
 					settings.quiet = false;
 				case "--quiet":
 					settings.debug = false;
 					settings.quiet = true;
+				case "--skip-dependencies":
+					settings.skipDependencies = true;
 				case parseSwitch(_) => Some(s) if (Reflect.hasField(settings, s)):
 					//if (!Reflect.hasField(settings, s)) {
 						//print('unknown switch $a');
@@ -398,13 +442,24 @@ class Main {
 					rest.push(a);
 			}
 		}
+		if(!remoteIsSet) {
+			switch(Sys.getEnv("HAXELIB_REMOTE")) {
+				case null:
+				case path: setupRemote(path);
+			}
+		}
 
 		if (!isHaxelibRun && !settings.system) {
 			var rep = try getGlobalRepository() catch (_:Dynamic) null;
 			if (rep != null && FileSystem.exists(rep + HAXELIB_LIBNAME)) {
 				argcur = 0; // send all arguments
-				doRun(rep, HAXELIB_LIBNAME, null);
-				return;
+				try {
+					doRun(rep, HAXELIB_LIBNAME, null);
+					return;
+				} catch(e:Dynamic) {
+					Sys.println('Warning: failed to run updated haxelib: $e');
+					Sys.println('Warning: resorting to system haxelib...');
+				}
 			}
 		}
 
@@ -446,9 +501,10 @@ class Main {
 						print("Host "+SERVER.host+" was not found");
 						print("Please ensure that your internet connection is on");
 						print("If you don't have an internet connection or if you are behing a proxy");
-						print("please download manually the file from http://lib.haxe.org/files/3.0/");
+						print("please download manually the file from https://lib.haxe.org/files/3.0/");
 						print("and run 'haxelib local <file>' to install the Library.");
 						print("You can also setup the proxy with 'haxelib proxy'.");
+						print(haxe.CallStack.toString(haxe.CallStack.exceptionStack()));
 						Sys.exit(1);
 					}
 					if( e == "Blocked" ) {
@@ -483,7 +539,7 @@ class Main {
 
  	function search() {
 		var word = param("Search word");
-		var l = site.search(word);
+		var l = retry(site.search.bind(word));
 		for( s in l )
 			print(s.name);
 		print(l.length+" libraries found");
@@ -491,7 +547,7 @@ class Main {
 
 	function info() {
 		var prj = param("Library name");
-		var inf = site.infos(prj);
+		var inf = retry(site.infos.bind(prj));
 		print("Name: "+inf.name);
 		print("Tags: "+inf.tags.join(", "));
 		print("Desc: "+inf.desc);
@@ -508,7 +564,7 @@ class Main {
 
 	function user() {
 		var uname = param("User name");
-		var inf = site.user(uname);
+		var inf = retry(site.user.bind(uname));
 		print("Id: "+inf.name);
 		print("Name: "+inf.fullname);
 		print("Mail: "+inf.email);
@@ -532,7 +588,7 @@ class Main {
 		if( pass != pass2 )
 			throw "Password does not match";
 		pass = Md5.encode(pass);
-		site.register(name,pass,email,fullname);
+		retry(site.register.bind(name,pass,email,fullname));
 		return pass;
 	}
 
@@ -588,18 +644,18 @@ class Main {
 			} while ( infos.contributors.indexOf(user) == -1 );
 
 		var password;
-		if( site.isNewUser(user) ) {
+		if( retry(site.isNewUser.bind(user)) ) {
 			print("This is your first submission as '"+user+"'");
 			print("Please enter the following information for registration");
 			password = doRegister(user);
 		} else {
 			password = readPassword(user);
 		}
-		site.checkDeveloper(infos.name,user);
+		retry(site.checkDeveloper.bind(infos.name,user));
 
 		// check dependencies validity
 		for( d in infos.dependencies ) {
-			var infos = site.infos(d.name);
+			var infos = retry(site.infos.bind(d.name));
 			if( d.version == "" )
 				continue;
 			var found = false;
@@ -614,17 +670,17 @@ class Main {
 
 		// check if this version already exists
 
-		var sinfos = try site.infos(infos.name) catch( _ : Dynamic ) null;
+		var sinfos = try retry(site.infos.bind(infos.name)) catch( _ : Dynamic ) null;
 		if( sinfos != null )
 			for( v in sinfos.versions )
 				if( v.name == infos.version && !ask("You're about to overwrite existing version '"+v.name+"', please confirm") )
 					throw "Aborted";
 
 		// query a submit id that will identify the file
-		var id = site.getSubmitId();
+		var id = retry(site.getSubmitId.bind());
 
 		// directly send the file data over Http
-		var h = createHttpRequest("http://"+SERVER.host+":"+SERVER.port+"/"+SERVER.url);
+		var h = createHttpRequest(SERVER.protocol+"://"+SERVER.host+":"+SERVER.port+"/"+SERVER.url);
 		h.onError = function(e) throw e;
 		h.onData = print;
 
@@ -642,14 +698,14 @@ class Main {
 		if (haxe.remoting.HttpConnection.TIMEOUT != 0) // don't ignore -notimeout
 			haxe.remoting.HttpConnection.TIMEOUT = 1000;
 		// ask the server to register the sent file
-		var msg = site.processSubmit(id,user,password);
+		var msg = retry(site.processSubmit.bind(id,user,password));
 		print(msg);
 	}
 
 	function readPassword(user:String, prompt = "Password"):String {
 		var password = Md5.encode(param(prompt,true));
 		var attempts = 5;
-		while (!site.checkPassword(user, password)) {
+		while (!retry(site.checkPassword.bind(user, password))) {
 			print('Invalid password for $user');
 			if (--attempts == 0)
 				throw 'Failed to input correct password';
@@ -680,7 +736,7 @@ class Main {
 				doInstallFile(rep, prj, true, true);
 				return;
 			}
-			
+
 			if ( prj.endsWith("haxelib.json") )
 			{
 				installFromHaxelibJson( rep, prj);
@@ -689,7 +745,7 @@ class Main {
 		}
 
 		// Name provided that wasn't a local hxml or zip, so try to install it from server
-		var inf = site.infos(prj);
+		var inf = retry(site.infos.bind(prj));
 		var reqversion = paramOpt();
 		var version = getVersion(inf, reqversion);
 		doInstall(rep,inf.name,version,version == inf.getLatest());
@@ -720,10 +776,11 @@ class Main {
 		var libsToInstall = new Map<String, {name:String,version:String,type:String,url:String,branch:String,subDir:String}>();
 
 		function processHxml(path) {
-			var hxml = sys.io.File.getContent(path);
+			var hxml = normalizeHxml(sys.io.File.getContent(path));
 			var lines = hxml.split("\n");
 			for (l in lines) {
 				l = l.trim();
+
 				for (target in targets.keys())
 					if (l.startsWith(target)) {
 						var lib = targets[target];
@@ -731,9 +788,10 @@ class Main {
 							libsToInstall[lib] = { name: lib, version: null, type:"haxelib", url: null, branch: null, subDir: null }
 					}
 
-				if (l.startsWith("-lib"))
+				var libraryFlagEReg = ~/^(-lib|-L|--library)\b/;
+				if (libraryFlagEReg.match(l))
 				{
-					var key = l.substr(5).trim();
+					var key = libraryFlagEReg.matchedRight().trim();
 					var parts = ~/:/.split(key);
 					var libName = parts[0];
 					var libVersion:String = null;
@@ -741,12 +799,12 @@ class Main {
 					var url:String = null;
 					var subDir:String = null;
 					var type:String;
-					
+
 					if ( parts.length > 1 )
 					{
 						if ( parts[1].startsWith("git:") )
 						{
-							
+
 							type = "git";
 							var urlParts = parts[1].substr(4).split("#");
 							url = urlParts[0];
@@ -776,7 +834,7 @@ class Main {
 		}
 		processHxml(path);
 
-		if (libsToInstall.empty())
+		if (Lambda.empty(libsToInstall))
 			return;
 
 		// Check the version numbers are all good
@@ -789,7 +847,7 @@ class Main {
 				// Do not check git repository infos
 				continue;
 			}
-			var inf = site.infos(l.name);
+			var inf = retry(site.infos.bind(l.name));
 			l.version = getVersion(inf, l.version);
 		}
 
@@ -812,7 +870,7 @@ class Main {
 			}
 		}
 	}
-	
+
 	function installFromHaxelibJson( rep:String, path:String )
 	{
 		doInstallDependencies(rep, Data.readData(File.getContent(path), false).dependencies);
@@ -831,51 +889,99 @@ class Main {
 		}
 	}
 
-	function doInstall( rep, project, version, setcurrent ) {
-		// check if exists already
-		if( FileSystem.exists(rep+Data.safe(project)+"/"+Data.safe(version)) ) {
-			print("You already have "+project+" version "+version+" installed");
-			setCurrent(rep,project,version,true);
-			return;
-		}
+	// strip comments, trim whitespace from each line and remove empty lines
+	function normalizeHxml(hxmlContents: String) {
+		return ~/\r?\n/g.split(hxmlContents).map(StringTools.trim).filter(function(line) {
+			return line != "" && !line.startsWith("#");
+		}).join('\n');
+	}
 
-		// download to temporary file
-		var filename = Data.fileName(project,version);
-		var filepath = rep+filename;
-		var out = try File.append(filepath,true) catch (e:Dynamic) throw 'Failed to write to $filepath: $e';
+	// maxRedirect set to 20, which is most browsers' default value according to https://stackoverflow.com/a/36041063/267998
+	function download(fileUrl:String, outPath:String, maxRedirect = 20):Void {
+		var out = try File.append(outPath,true) catch (e:Dynamic) throw 'Failed to write to $outPath: $e';
 		out.seek(0, SeekEnd);
 
-		var h = createHttpRequest(siteUrl+Data.REPOSITORY+"/"+filename);
+		var h = createHttpRequest(fileUrl);
 
 		var currentSize = out.tell();
 		if (currentSize > 0)
 			h.addHeader("range", "bytes="+currentSize + "-");
 
-		var progress = if (settings.quiet == false )
+		var progress = if (settings != null && settings.quiet == false )
 			new ProgressOut(out, currentSize);
 		else
 			out;
 
-		var has416Status = false;
+		var httpStatus = -1;
+		var redirectedLocation = null;
 		h.onStatus = function(status) {
-			// 416 Requested Range Not Satisfiable, which means that we probably have a fully downloaded file already
-			if (status == 416) has416Status = true;
+			httpStatus = status;
+			switch (httpStatus) {
+				case 301, 302, 307, 308:
+					switch (h.responseHeaders.get("Location")) {
+						case null:
+							throw 'Request to $fileUrl responded with $httpStatus, ${h.responseHeaders}';
+						case location:
+							redirectedLocation = location;
+					}
+				default:
+					// TODO?
+			}
 		};
 		h.onError = function(e) {
 			progress.close();
 
-			// if we reached onError, because of 416 status code, it's probably okay and we should try unzipping the file
-			if (!has416Status) {
-				FileSystem.deleteFile(filepath);
-				throw e;
+			switch(httpStatus) {
+				case 416:
+					// 416 Requested Range Not Satisfiable, which means that we probably have a fully downloaded file already
+					// if we reached onError, because of 416 status code, it's probably okay and we should try unzipping the file
+				default:
+					FileSystem.deleteFile(outPath);
+					throw e;
 			}
 		};
+		h.customRequest(false, progress);
+
+		if (redirectedLocation != null) {
+			FileSystem.deleteFile(outPath);
+
+			if (maxRedirect > 0) {
+				download(redirectedLocation, outPath, maxRedirect - 1);
+			} else {
+				throw "Too many redirects.";
+			}
+		}
+	}
+
+	function doInstall( rep, project, version, setcurrent ) {
+		// check if exists already
+		if( FileSystem.exists(Path.join([rep, Data.safe(project), Data.safe(version)])) ) {
+			print("You already have "+project+" version "+version+" installed");
+			setCurrent(rep,project,version,true);
+			return;
+		}
+
+		// download to temporary file
+		var filename = Data.fileName(project,version);
+		var filepath = Path.join([rep, filename]);
+
 		print("Downloading "+filename+"...");
-		h.customRequest(false,progress);
 
-		doInstallFile(rep,filepath, setcurrent);
+		var maxRetry = 3;
+		var fileUrl = Path.join([siteUrl, Data.REPOSITORY, filename]);
+		for (i in 0...maxRetry) {
+			try {
+				download(fileUrl, filepath);
+				break;
+			} catch (e:Dynamic) {
+				print('Failed to download ${fileUrl}. (${i+1}/${maxRetry})\n${e}');
+				Sys.sleep(1);
+			}
+		}
+
+		doInstallFile(rep, filepath, setcurrent);
 		try {
-			site.postInstall(project, version);
+			retry(site.postInstall.bind(project, version));
 		} catch (e:Dynamic) {}
 	}
 
@@ -958,6 +1064,8 @@ class Main {
 	}
 
 	function doInstallDependencies( rep:String, dependencies:Array<Dependency> ) {
+		if( settings.skipDependencies ) return;
+
 		for( d in dependencies ) {
 			if( d.version == "" ) {
 				var pdir = rep + Data.safe(d.name);
@@ -969,12 +1077,13 @@ class Main {
 			}
 
 			if( d.version == "" && d.type == DependencyType.Haxelib )
-				d.version = site.getLatestVersion(d.name);
+				d.version = retry(site.getLatestVersion.bind(d.name));
 			print("Installing dependency "+d.name+" "+d.version);
 
 			switch d.type {
 				case Haxelib:
-					doInstall(rep, d.name, d.version, false);
+					var info = retry(site.infos.bind(d.name));
+					doInstall(rep, info.name, d.version, false);
 				case Git:
 					useVcs(VcsID.Git, function(vcs) doVcsInstall(rep, vcs, d.name, d.url, d.branch, d.subDir, d.version));
 				case Mercurial:
@@ -983,8 +1092,8 @@ class Main {
 		}
 	}
 
-	static public function getConfigFile():String {
-		var home = null;
+	static public function getHomePath():String{
+		var home:String = null;
 		if (IS_WINDOWS) {
 			home = Sys.getEnv("USERPROFILE");
 			if (home == null) {
@@ -1000,7 +1109,11 @@ class Main {
 			if (home == null)
 				throw "Could not determine home path. Please ensure that HOME environment variable is set.";
 		}
-		return Path.addTrailingSlash(home) + ".haxelib";
+		return home;
+	}
+
+	static public function getConfigFile():String {
+		return Path.addTrailingSlash( getHomePath() ) + ".haxelib";
 	}
 
 	function getGlobalRepositoryPath(create = false):String {
@@ -1052,12 +1165,28 @@ class Main {
 	}
 
 	function getRepository():String {
-		if (!settings.global && FileSystem.exists(REPODIR) && FileSystem.isDirectory(REPODIR))
-			return Path.addTrailingSlash(FileSystem.fullPath(REPODIR));
+		if (!settings.global)
+			return switch getLocalRepository() {
+				case null: getGlobalRepository();
+				case repo: Path.addTrailingSlash(FileSystem.fullPath(repo));
+			}
 		else
 			return getGlobalRepository();
 	}
 
+	function getLocalRepository():Null<String> {
+		var dir = Path.removeTrailingSlashes(Sys.getCwd());
+		while (dir != null) {
+			var repo = Path.addTrailingSlash(dir) + REPODIR;
+			if(FileSystem.exists(repo) && FileSystem.isDirectory(repo)) {
+				return repo;
+			} else {
+				dir = new Path(dir).dir;
+			}
+		}
+		return null;
+	}
+
 	function getGlobalRepository():String {
 		var rep = getGlobalRepositoryPath(true);
 		if (!FileSystem.exists(rep))
@@ -1080,10 +1209,22 @@ class Main {
 		}
 
 		var line = param("Path");
-		if (line != "")
+		if (line != "") {
+			var splitLine = line.split("/");
+			if(splitLine[0] == "~") {
+				var home = getHomePath();
+
+				for(i in 1...splitLine.length) {
+					home += "/" + splitLine[i];
+				}
+				line = home;
+			}
+
 			rep = line;
+		}
+
 
-		rep = try FileSystem.fullPath(rep) catch (_:Dynamic) rep;
+		rep = try absolutePath(rep) catch (e:Dynamic) rep;
 
 		if (isSamePath(rep, configFile))
 			throw "Can't use "+rep+" because it is reserved for config file";
@@ -1098,12 +1239,20 @@ class Main {
 		print(getRepository());
 	}
 
-	function getCurrent( dir ) {
-		return (FileSystem.exists(dir+"/.dev")) ? "dev" : File.getContent(dir + "/.current").trim();
+	function getCurrent( proj, dir ) {
+		return try { getDev(dir); return "dev"; } catch( e : Dynamic ) try File.getContent(dir + "/.current").trim() catch( e : Dynamic ) throw "Library "+proj+" is not installed : run 'haxelib install "+proj+"'";
 	}
 
 	function getDev( dir ) {
-		return File.getContent(dir + "/.dev").trim();
+		var path = File.getContent(dir + "/.dev").trim();
+		path = ~/%([A-Za-z0-9_]+)%/g.map(path,function(r) {
+			var env = Sys.getEnv(r.matched(1));
+			return env == null ? "" : env;
+		});
+		var filters = try Sys.getEnv("HAXELIB_DEV_FILTER").split(";") catch( e : Dynamic ) null;
+		if( filters != null && !filters.exists(function(flt) return StringTools.startsWith(path.toLowerCase().split("\\").join("/"),flt.toLowerCase().split("\\").join("/"))) )
+			throw "This .dev is filtered";
+		return path;
 	}
 
 	function list() {
@@ -1117,7 +1266,7 @@ class Main {
 			if( p.charAt(0) == "." )
 				continue;
 
-			var current = try getCurrent(rep + p) catch(e:Dynamic) continue;
+			var current = try getCurrent("", rep + p) catch(e:Dynamic) continue;
 			var dev = try getDev(rep + p) catch( e : Dynamic ) null;
 
 			var semvers = [];
@@ -1220,16 +1369,19 @@ class Main {
 			var success = vcs.update(p);
 
 			state.updated = success;
+			if(success)
+				print(p + " was updated");
 			Sys.setCwd(oldCwd);
 		} else {
-			var latest = try site.getLatestVersion(p) catch( e : Dynamic ) { Sys.println(e); return; };
+			var latest = try retry(site.getLatestVersion.bind(p)) catch( e : Dynamic ) { Sys.println(e); return; };
 
 			if( !FileSystem.exists(pdir+"/"+Data.safe(latest)) ) {
 				if( state.prompt ) {
 					if (!ask("Update "+p+" to "+latest))
 						return;
 				}
-				doInstall(state.rep, p, latest,true);
+				var info = retry(site.infos.bind(p));
+				doInstall(state.rep, info.name, latest,true);
 				state.updated = true;
 			} else
 				setCurrent(state.rep, p, latest, true);
@@ -1278,8 +1430,10 @@ class Main {
 		var vdir = pdir + "/" + Data.safe(version);
 		if( !FileSystem.exists(vdir) ){
 			print("Library "+prj+" version "+version+" is not installed");
-			if(ask("Would you like to install it?"))
-				doInstall(rep, prj, version, true);
+			if(ask("Would you like to install it?")) {
+				var info = retry(site.infos.bind(prj));
+				doInstall(rep, info.name, version, true);
+			}
 			return;
 		}
 		if( File.getContent(pdir + "/.current").trim() == version )
@@ -1290,14 +1444,16 @@ class Main {
 		print("Library "+prj+" current version is now "+version);
 	}
 
-	function checkRec( rep : String, prj : String, version : String, l : List<{ project : String, version : String, dir : String, info : Infos }> ) {
+	function checkRec( rep : String, prj : String, version : String, l : List<{ project : String, version : String, dir : String, info : Infos }>, ?returnDependencies : Bool = true ) {
 		var pdir = rep + Data.safe(prj);
-		if( !FileSystem.exists(pdir) )
-			throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'";
-		var version = if( version != null ) version else getCurrent(pdir);
+		var explicitVersion = version != null;
+		var version = if( version != null ) version else getCurrent(prj, pdir);
 
 		var dev = try getDev(pdir) catch (_:Dynamic) null;
-		var vdir = if (dev != null) dev else pdir + "/" + Data.safe(version);
+		var vdir = pdir + "/" + Data.safe(version);
+
+		if( dev != null && (!explicitVersion || !FileSystem.exists(vdir)) )
+			vdir = dev;
 
 		if( !FileSystem.exists(vdir) )
 			throw "Library "+prj+" version "+version+" is not installed";
@@ -1306,14 +1462,16 @@ class Main {
 			if( p.project == prj ) {
 				if( p.version == version )
 					return;
-				throw "Library "+prj+" has two version included "+version+" and "+p.version;
+				throw "Library "+prj+" has two versions included : "+version+" and "+p.version;
 			}
 		var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null;
-		var inf = Data.readData(json,false);
+		var inf = Data.readData(json, json != null);
 		l.add({ project : prj, version : version, dir : Path.addTrailingSlash(vdir), info: inf });
-		for( d in inf.dependencies )
-			if( !Lambda.exists(l, function(e) return e.project == d.name) )
-				checkRec(rep,d.name,if( d.version == "" ) null else d.version,l);
+		if( returnDependencies ) {
+			for( d in inf.dependencies )
+				if( !Lambda.exists(l, function(e) return e.project == d.name) )
+					checkRec(rep,d.name,if( d.version == "" ) null else d.version,l);
+		}
 	}
 
 	function path() {
@@ -1321,7 +1479,11 @@ class Main {
 		var list = new List();
 		while( argcur < args.length ) {
 			var a = args[argcur++].split(":");
-			checkRec(rep, a[0],a[1],list);
+			try {
+				checkRec(rep, a[0], a[1], list);
+			} catch(e:Dynamic) {
+				throw 'Cannot process $a: $e';
+			}
 		}
 		for( d in list ) {
 			var ndir = d.dir + "ndll";
@@ -1329,8 +1491,7 @@ class Main {
 				Sys.println('-L $ndir/');
 
 			try {
-				var f = File.getContent(d.dir + "extraParams.hxml");
-				Sys.println(f.trim());
+				Sys.println(normalizeHxml(File.getContent(d.dir + "extraParams.hxml")));
 			} catch(_:Dynamic) {}
 
 			var dir = d.dir;
@@ -1344,6 +1505,16 @@ class Main {
 		}
 	}
 
+	function libpath( ) {
+		var rep = getRepository();
+		while( argcur < args.length ) {
+			var a = args[argcur++].split(":");
+			var results = new List();
+			checkRec(rep, a[0], a[1], results, false);
+			if( !results.isEmpty() ) Sys.println(results.first().dir);
+		}
+	}
+
 	function dev() {
 		var rep = getRepository();
 		var project = param("Library");
@@ -1405,58 +1576,50 @@ class Main {
 	}
 
 	function doVcsInstall(rep:String, vcs:Vcs, libName:String, url:String, branch:String, subDir:String, version:String) {
-		
+
 		var proj = rep + Data.safe(libName);
 
 		var libPath = proj + "/" + vcs.directory;
-		
-		var jsonPath = libPath + "/haxelib.json";
-		
+
+		function doVcsClone() {
+			print("Installing " +libName + " from " +url + ( branch != null ? " branch: " + branch : "" ));
+			try {
+				vcs.clone(libPath, url, branch, version);
+			} catch(error:VcsError) {
+				deleteRec(libPath);
+				var message = switch(error) {
+					case VcsUnavailable(vcs):
+						'Could not use ${vcs.executable}, please make sure it is installed and available in your PATH.';
+					case CantCloneRepo(vcs, repo, stderr):
+						'Could not clone ${vcs.name} repository' + (stderr != null ? ":\n" + stderr : ".");
+					case CantCheckoutBranch(vcs, branch, stderr):
+						'Could not checkout branch, tag or path "$branch": ' + stderr;
+					case CantCheckoutVersion(vcs, version, stderr):
+						'Could not checkout tag "$version": ' + stderr;
+				};
+				throw message;
+			}
+		}
+
 		if ( FileSystem.exists(proj + "/" + Data.safe(vcs.directory)) ) {
 			print("You already have "+libName+" version "+vcs.directory+" installed.");
-			
+
 			var wasUpdated = this.alreadyUpdatedVcsDependencies.exists(libName);
 			var currentBranch = if (wasUpdated) this.alreadyUpdatedVcsDependencies.get(libName) else null;
-			
+
 			if (branch != null && (!wasUpdated || (wasUpdated && currentBranch != branch))
 				&& ask("Overwrite branch: " + (currentBranch == null?"<unspecified>":"\"" + currentBranch + "\"") + " with \"" + branch + "\""))
 			{
 				deleteRec(libPath);
-				this.alreadyUpdatedVcsDependencies.set(libName, branch);
+				doVcsClone();
 			}
-			else
+			else if (!wasUpdated)
 			{
-				if (!wasUpdated)
-				{
-					print("Updating " + libName+" version " + vcs.directory + " ...");
-					this.alreadyUpdatedVcsDependencies.set(libName, branch);
-					updateByName(rep, libName);
-					setCurrent(rep, libName, vcs.directory, true);
-					
-					if(FileSystem.exists(jsonPath))
-						doInstallDependencies(rep, Data.readData(File.getContent(jsonPath), false).dependencies);
-				}
-				return;
+				print("Updating " + libName+" version " + vcs.directory + " ...");
+				updateByName(rep, libName);
 			}
-		}
-
-		print("Installing " +libName + " from " +url + ( branch != null ? " branch: " + branch : "" ));
-		
-		try {
-			vcs.clone(libPath, url, branch, version);
-		} catch(error:VcsError) {
-			deleteRec(libPath);
-			var message = switch(error) {
-				case VcsUnavailable(vcs):
-					'Could not use ${vcs.executable}, please make sure it is installed and available in your PATH.';
-				case CantCloneRepo(vcs, repo, stderr):
-					'Could not clone ${vcs.name} repository' + (stderr != null ? ":\n" + stderr : ".");
-				case CantCheckoutBranch(vcs, branch, stderr):
-					'Could not checkout branch, tag or path "$branch": ' + stderr;
-				case CantCheckoutVersion(vcs, version, stderr):
-					'Could not checkout tag "$version": ' + stderr;
-			};
-			throw message;
+		} else {
+			doVcsClone();
 		}
 
 		// finish it!
@@ -1471,6 +1634,7 @@ class Main {
 
 		this.alreadyUpdatedVcsDependencies.set(libName, branch);
 
+		var jsonPath = libPath + "/haxelib.json";
 		if(FileSystem.exists(jsonPath))
 			doInstallDependencies(rep, Data.readData(File.getContent(jsonPath), false).dependencies);
 	}
@@ -1483,13 +1647,26 @@ class Main {
 		doRun(rep, temp[0], temp[1]);
 	}
 
+	function haxeVersion():SemVer {
+		if(__haxeVersion == null) {
+			var p = new Process('haxe', ['--version']);
+			if(p.exitCode() != 0) {
+				throw 'Cannot get haxe version: ${p.stderr.readAll().toString()}';
+			}
+			var str = p.stdout.readAll().toString();
+			__haxeVersion = SemVer.ofString(str.split('+')[0]);
+		}
+		return __haxeVersion;
+	}
+	static var __haxeVersion:SemVer;
+
 	function doRun( rep:String, project:String, version:String ) {
 		var pdir = rep + Data.safe(project);
 		if( !FileSystem.exists(pdir) )
 			throw "Library "+project+" is not installed";
 		pdir += "/";
 		if (version == null)
-			version = getCurrent(pdir);
+			version = getCurrent(project, pdir);
 		var dev = try getDev(pdir) catch ( e : Dynamic ) null;
 		var vdir = dev != null ? dev : pdir + Data.safe(version);
 
@@ -1503,24 +1680,15 @@ class Main {
 		Sys.setCwd(vdir);
 
 		var callArgs =
-			if (infos.main == null) {
-				if( !FileSystem.exists('$vdir/run.n') )
-					throw 'Library $project version $version does not have a run script';
+			if (infos.main != null) {
+				runScriptArgs(project, infos.main, infos.dependencies);
+			} else if(FileSystem.exists('$vdir/run.n')) {
 				["neko", vdir + "/run.n"];
+			} else if(FileSystem.exists('$vdir/Run.hx')) {
+				runScriptArgs(project, 'Run', infos.dependencies);
 			} else {
-				var deps = infos.dependencies.toArray();
-				deps.push( { name: project, version: DependencyVersion.DEFAULT } );
-				var args = [];
-				for (d in deps) {
-					args.push('-lib');
-					args.push(d.name + if (d.version == '') '' else ':${d.version}');
-				}
-				args.unshift('haxe');
-				args.push('--run');
-				args.push(infos.main);
-				args;
+				throw 'Library $project version $version does not have a run script';
 			}
-
 		for (i in argcur...args.length)
 			callArgs.push(args[i]);
 
@@ -1530,6 +1698,24 @@ class Main {
  		Sys.exit(Sys.command(cmd, callArgs));
 	}
 
+	function runScriptArgs(project:String, main:String, dependencies:Dependencies):Array<String> {
+		var deps = dependencies.toArray();
+		deps.push( { name: project, version: DependencyVersion.DEFAULT } );
+		var args = [];
+		// TODO: change comparison to '4.0.0' upon Haxe 4.0 release
+		if(settings.global && SemVer.compare(haxeVersion(), SemVer.ofString('4.0.0-rc.5')) >= 0) {
+			args.push('--haxelib-global');
+		}
+		for (d in deps) {
+			args.push('-lib');
+			args.push(d.name + if (d.version == '') '' else ':${d.version}');
+		}
+		args.unshift('haxe');
+		args.push('--run');
+		args.push(main);
+		return args;
+	}
+
 	function proxy() {
 		var rep = getRepository();
 		var host = param("Proxy host");
@@ -1551,9 +1737,10 @@ class Main {
 		};
 		Http.PROXY = proxy;
 		print("Testing proxy...");
-		try Http.requestUrl("http://www.google.com") catch( e : Dynamic ) {
-			print("Proxy connection failed");
-			return;
+		try Http.requestUrl(SERVER.protocol + "://lib.haxe.org") catch( e : Dynamic ) {
+			if(!ask("Proxy connection failed. Use it anyway")) {
+				return;
+			}
 		}
 		File.saveContent(rep + "/.proxy", haxe.Serializer.run(proxy));
 		print("Proxy setup done");
@@ -1583,7 +1770,7 @@ class Main {
 	}
 
 	function newRepo() {
-		var path = #if (haxe_ver >= 3.2) FileSystem.absolutePath(REPODIR) #else REPODIR #end;
+		var path = absolutePath(REPODIR);
 		var created = FsUtils.safeDir(path, true);
 		if (created)
 			print('Local repository created ($path)');
@@ -1592,7 +1779,7 @@ class Main {
 	}
 
 	function deleteRepo() {
-		var path = #if (haxe_ver >= 3.2) FileSystem.absolutePath(REPODIR) #else REPODIR #end;
+		var path = absolutePath(REPODIR);
 		var deleted = FsUtils.deleteRec(path);
 		if (deleted)
 			print('Local repository deleted ($path)');
@@ -1606,9 +1793,31 @@ class Main {
 		Sys.println(str);
 
 	static function main() {
-		new Main().process();
+		switch(Sys.getEnv("HAXELIB_NO_SSL")) {
+			case "1", "true":
+				SERVER.noSsl = true;
+				SERVER.protocol = "http";
+			case _:
+		}
+		try {
+			new Main().process();
+		} catch(e:Dynamic) {
+			for(arg in Sys.args()) {
+				if(arg == '--debug') {
+					Util.rethrow(e);
+				}
+			}
+			Sys.stderr().writeString(Std.string(e) + '\n');
+		}
 	}
 
+	// haxe 3.1.3 doesn't have FileSystem.absolutePath()
+	static function absolutePath(path:String) {
+		if (StringTools.startsWith(path, '/') || path.charAt(1) == ':' || StringTools.startsWith(path, '\\\\')) {
+			return path;
+		}
+		return haxe.io.Path.join([Sys.getCwd(), path]);
+	}
 
 	// deprecated commands
 	function local() {
diff --git a/extra/haxelib_src/src/haxelib/client/Util.hx b/extra/haxelib_src/src/haxelib/client/Util.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9eb5165bcf7c681ca4fe19e3fff5cd931b850ebd
--- /dev/null
+++ b/extra/haxelib_src/src/haxelib/client/Util.hx
@@ -0,0 +1,55 @@
+package haxelib.client;
+
+using StringTools;
+
+class Util {
+
+	macro static public function rethrow(e) {
+		return if (haxe.macro.Context.defined("neko"))
+			macro neko.Lib.rethrow(e);
+		else
+			macro throw e;
+	}
+
+	#if macro
+	static function readVersionFromHaxelibJson() {
+		return haxe.Json.parse(sys.io.File.getContent("haxelib.json")).version;
+	}
+	#end
+	
+	macro static public function getHaxelibVersion() {
+		return macro $v{readVersionFromHaxelibJson()};
+	}
+
+	macro static public function getHaxelibVersionLong() {
+		var version:String = readVersionFromHaxelibJson();
+		var p;
+		try {
+			//check if the .git folder exist
+			//prevent getting the git info of a parent directory
+			if (!sys.FileSystem.isDirectory(".git"))
+				throw "Not a git repo.";
+
+			//get commit sha
+			p = new sys.io.Process("git", ["rev-parse", "HEAD"]);
+			var sha = p.stdout.readAll().toString().trim();
+			p.close();
+
+			//check to see if there is changes, staged or not
+			p = new sys.io.Process("git", ["status", "--porcelain"]);
+			var changes = p.stdout.readAll().toString().trim();
+			p.close();
+
+			version += switch(changes) {
+				case "":
+					' ($sha)';
+				case _:
+					' ($sha - dirty)';
+			}
+			return macro $v{version};
+		} catch(e:Dynamic) {
+			if (p != null) p.close();
+			return macro $v{version};
+		}
+	}
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/src/haxelib/client/Vcs.hx b/extra/haxelib_src/src/haxelib/client/Vcs.hx
index 31c393e3fdb9c8045bae6f983b7e30e0244958e8..9abd59410170f3b1775b37af37da85f6cc931ef2 100644
--- a/extra/haxelib_src/src/haxelib/client/Vcs.hx
+++ b/extra/haxelib_src/src/haxelib/client/Vcs.hx
@@ -134,7 +134,7 @@ class Vcs implements IVcs {
 		switch (commandResult) {
 			case {code: 0}: //pass
 			case {code: code, out:out}:
-				if (!settings.debug) 
+				if (!settings.debug)
 					Sys.stderr().writeString(out);
 				Sys.exit(code);
 		}
@@ -243,11 +243,11 @@ class Git extends Vcs {
 
 	override public function update(libName:String):Bool {
 		if (
-			command(executable, ["diff", "--exit-code"]).code != 0
+			command(executable, ["diff", "--exit-code", "--no-ext-diff"]).code != 0
 			||
-			command(executable, ["diff", "--cached", "--exit-code"]).code != 0
+			command(executable, ["diff", "--cached", "--exit-code", "--no-ext-diff"]).code != 0
 		) {
-			if (Cli.ask("Reset changes to " + libName + " " + name + " repo so we can pull latest version?")) {
+			if (Cli.ask("Reset changes to " + libName + " " + name + " repo so we can pull latest version")) {
 				sure(command(executable, ["reset", "--hard"]));
 			} else {
 				if (!settings.quiet)
@@ -286,7 +286,7 @@ class Git extends Vcs {
 
 
 		Sys.setCwd(libPath);
-		
+
 		if (version != null && version != "") {
 			var ret = command(executable, ["checkout", "tags/" + version]);
 			if (ret.code != 0)
@@ -328,7 +328,7 @@ class Mercurial extends Vcs {
 	override public function update(libName:String):Bool {
 		command(executable, ["pull"]);
 		var summary = command(executable, ["summary"]).out;
-		var diff = command(executable, ["diff", "-U", "2", "--git", "--subrepos"]);
+		var diff = command(executable, ["diff", "-U", "2", "--git", "--subrepos", "--no-ext-diff"]);
 		var status = command(executable, ["status"]);
 
 		// get new pulled changesets:
@@ -345,7 +345,7 @@ class Mercurial extends Vcs {
 		if (diff.code + status.code + diff.out.length + status.out.length != 0) {
 			if (!settings.quiet)
 				Sys.println(diff.out);
-			if (Cli.ask("Reset changes to " + libName + " " + name + " repo so we can update to latest version?")) {
+			if (Cli.ask("Reset changes to " + libName + " " + name + " repo so we can update to latest version")) {
 				sure(command(executable, ["update", "--clean"]));
 			} else {
 				changed = false;
diff --git a/extra/haxelib_src/src/haxelib/server/FileStorage.hx b/extra/haxelib_src/src/haxelib/server/FileStorage.hx
index 97922d68eb54eac9645a0882e20484bf3a22541d..371b686072384309e10661df0ef9dba114b55e61 100644
--- a/extra/haxelib_src/src/haxelib/server/FileStorage.hx
+++ b/extra/haxelib_src/src/haxelib/server/FileStorage.hx
@@ -210,16 +210,17 @@ class S3FileStorage extends FileStorage {
 		assertRelative(file);
 		var s3Path = Path.join(['s3://${bucketName}', file]);
 		var localFile:AbsPath = Path.join([localPath, file]);
+		FileSystem.createDirectory(Path.directory(localFile));
 		if (!FileSystem.exists(localFile)) {
 			var request = transferClient.downloadFile(localFile, bucketName, file);
 			while (!request.isDone()) {
 				Sys.sleep(0.01);
 			}
-			switch (request.getFailure()) {
-				case null:
-					//pass
-				case failure:
-					throw 'failed to download ${s3Path} to ${localPath}\n${failure}';
+			if (!request.completedSuccessfully()) {
+				throw 'failed to download ${s3Path} to ${localFile}\n${request.getFailure()}';
+			}
+			if (!FileSystem.exists(localFile)) {
+				throw 'failed to download ${s3Path} to ${localFile}';
 			}
 		}
 		return f(localFile);
diff --git a/extra/haxelib_src/src/haxelib/server/Repo.hx b/extra/haxelib_src/src/haxelib/server/Repo.hx
index 2bbf2faca2e91284d7316b4e2e1edaa3a24789c2..b9d3abcc3a3173b514e298aba114989965d3fd0f 100644
--- a/extra/haxelib_src/src/haxelib/server/Repo.hx
+++ b/extra/haxelib_src/src/haxelib/server/Repo.hx
@@ -73,6 +73,7 @@ class Repo implements SiteApi {
 					date : v.date
 				}],
 			owner : p.ownerObj.name,
+			contributors : [for (d in Developer.manager.search( $project==p.id)) {name: d.userObj.name, fullname: d.userObj.fullname}],
 			website : p.website,
 			license : p.license,
 			downloads : totalDownloads,
@@ -171,6 +172,10 @@ class Repo implements SiteApi {
 
 				// create project if needed
 				if( p == null ) {
+					if( devs[0].name != user ) {
+						throw 'A new project should be submitted by its owner, which is the first user in the contributors field (${devs[0].name})';
+					}
+
 					p = new Project();
 					p.name = infos.name;
 					p.description = infos.description;
@@ -206,6 +211,7 @@ class Repo implements SiteApi {
 				var otags = Tag.manager.search({ project : p.id });
 				var curtags = otags.map(function(t) return t.tag).join(":");
 
+				var ownerChanged = devs[0].id != p.ownerObj.id;
 				var devsChanged = (pdevs.length != devs.length);
 				if (!devsChanged) { // same length, check whether elements are the same
 					for (d in pdevs) {
@@ -218,12 +224,15 @@ class Repo implements SiteApi {
 				}
 
 				// update public infos
-				if( devsChanged || infos.description != p.description || p.website != infos.url || p.license != infos.license || tags.join(":") != curtags ) {
+				if( ownerChanged || devsChanged || infos.description != p.description || p.website != infos.url || p.license != infos.license || tags.join(":") != curtags ) {
 					if( u.id != p.ownerObj.id )
 						throw "Only project owner can modify project infos";
 					p.description = infos.description;
 					p.website = infos.url;
 					p.license = infos.license;
+					if( ownerChanged ) {
+						p.ownerObj = devs[0];
+					}
 					p.update();
 					if( devsChanged ) {
 						for( d in pdevs )
diff --git a/extra/haxelib_src/src/legacyhaxelib/Main.hx b/extra/haxelib_src/src/legacyhaxelib/Main.hx
index 45c04f386fd278e6eb61c4b3a7899c42c6f6dde5..5286c605c76a9b40aac512eff2e84ffe91991e15 100644
--- a/extra/haxelib_src/src/legacyhaxelib/Main.hx
+++ b/extra/haxelib_src/src/legacyhaxelib/Main.hx
@@ -154,7 +154,7 @@ class Main {
 
 	function initSite() {
 		siteUrl = "http://"+SERVER.host+":"+SERVER.port+"/"+SERVER.dir+'/';
-		site = new SiteProxy(haxe.remoting.HttpConnection.urlConnect(siteUrl+SERVER.url).api);
+		site = new SiteProxy(haxe.remoting.HttpConnection.urlConnect(siteUrl+SERVER.url).resolve("api"));
 	}
 
 	function param( name, ?passwd ) {
@@ -952,7 +952,7 @@ class Main {
 		var code = p.exitCode();
 		return { code:code, out: code == 0 ? p.stdout.readAll().toString() : p.stderr.readAll().toString() };
 	}
-	
+
 	function proxy() {
 		var rep = getRepository();
 		var host = param("Proxy host");
diff --git a/extra/haxelib_src/src/website/Util.hx b/extra/haxelib_src/src/website/Util.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f77737db7ae8465b99ecb071b2e51a0e85cdef7b
--- /dev/null
+++ b/extra/haxelib_src/src/website/Util.hx
@@ -0,0 +1,65 @@
+package website;
+
+/**
+ * @author Mark Knol
+ */
+class Util {
+	private static var _MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+	
+	public static function escape(str:String) return StringTools.htmlEscape(str, true);
+	
+	/**
+	   Outputs to "xx-Jan 2019" (accurate=true) or "xx days/weeks ago" (accurate=false)
+	   @param	date should be format "yyyy-mm-dd"
+	**/
+	public static function formatDate(date:String, accurate:Bool = false) {
+		var split = date.split("-");
+		var target:Date = new Date(Std.parseInt(split[0]), Std.parseInt(split[1]) - 1, Std.parseInt(split[2]), 0, 0, 0);
+		
+		if (!accurate) { // loose date format 
+			var minuteInMs = 1000 * 60;
+			var hourInMs = minuteInMs * 60;
+			var dayInMs = hourInMs * 24;
+		
+			var targetTime = target.getTime();
+
+			var now = Date.now().getTime();
+			var remainingMs = now - targetTime;
+	 
+			var days = Math.floor(remainingMs / dayInMs);
+			var years = Std.int(days / 356);
+			var months = Std.int(days / 30.4167); // should be accurate enough
+			var weeks = Std.int(days / 7); 
+			 
+			if (years == 0) { 
+				if (months < 2) {
+					if (weeks < 1) { 
+						if (days == 0) return 'today'; 
+						if (days == 1) return '$days day ago';
+						return '$days days ago'; 
+					} else {
+						if (weeks == 1) return '$weeks week ago'; 
+						else return '$weeks weeks ago';
+					}
+				} else { 
+					return '$months months ago'; 
+				}
+			} else {
+				return years > 1 ? '$years years ago' : '$years year ago';
+			}
+		} else {
+			var month = _MONTHS[target.getMonth()];
+			var date = target.getDate();
+			var day = if (date < 10) '0$date' else '$date';
+			return '$day-$month ${target.getFullYear()}';
+		}
+	}
+	
+	public static function syntaxHighlightHTML(code:String):String {
+		var html = code;
+		html = ~/(("|')(.+?)?\2)/g.replace(html, "<span class=str>$1</span>");
+		html = ~/(&lt;\\?)(.+?)(\/|\s|&gt;)/g.replace(html, "$1<span class=kwd>$2</span>$3");
+		
+		return html;
+	}
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/src/website/api/ProjectApi.hx b/extra/haxelib_src/src/website/api/ProjectApi.hx
index 095e78bc0d540f5b6b60fe9496cc41dafe0e089c..c47d1b97ea368fed13744586bb960e6188d74946 100644
--- a/extra/haxelib_src/src/website/api/ProjectApi.hx
+++ b/extra/haxelib_src/src/website/api/ProjectApi.hx
@@ -31,8 +31,8 @@ class ProjectApi extends UFApi {
 	@inject public var cacheCnx:UFCacheConnectionSync;
 
 	/** Extensions that should be loaded as a text file. **/
-	public static var textExtensions:Array<String> = ["md","txt","hx","hxml","json","xml","htaccess"];
-	public static var imgExtensions:Array<String> = ["jpg","jpeg","gif","png"];
+	public static var textExtensions:Array<String> = ["md","txt","hx","hxml","json","xml","htaccess","yml","gitignore","conf","html","mtt","htm","js","css","less","scss"];
+	public static var imgExtensions:Array<String> = ["jpg","jpeg","gif","png","svg","ico"];
 
 	/**
 		Load the ProjectInfos for the given project.
@@ -69,9 +69,9 @@ class ProjectApi extends UFApi {
 						// Exact match! It's a file, not a directory. Now, check the type and load it.
 						fileInfo =
 							if ( textExtensions.indexOf(extension)>-1 )
-								Text( Reader.unzip(entry).toString(), extension );
+								Text( Reader.unzip(entry).toString(), extension, entry.fileSize );
 							else if ( imgExtensions.indexOf(extension)>-1 )
-								Image( Reader.unzip(entry), extension );
+								Image( Reader.unzip(entry), extension, entry.fileSize );
 							else
 								Binary( entry.fileSize );
 						break;
@@ -97,7 +97,11 @@ class ProjectApi extends UFApi {
 				if ( fileInfo!=null ) Success( fileInfo );
 				else Failure( HttpError.pageNotFound() );
 		}
-		catch ( e:Dynamic ) return Failure( Error.withData('Failed to get file information for $path in $projectName ($version)',e) );
+		catch ( e:Dynamic ) return Failure( Error.withData(
+			'Failed to get file information for $path in $projectName ($version)',
+			Std.string(e) + "\n" +
+			haxe.CallStack.toString(haxe.CallStack.exceptionStack())
+		) );
 	}
 
 	/**
@@ -227,9 +231,9 @@ class ProjectApi extends UFApi {
 **/
 enum FileInformation {
 	/** A text file, with it's String content and extension. **/
-	Text( content:String, extension:String );
+	Text( content:String, extension:String, size:Int );
 	/** A text file, with it's Bytes content and extension. **/
-	Image( content:Bytes, extension:String );
+	Image( content:Bytes, extension:String, size:Int );
 	/** A binary file that we can't display, together with it's size. **/
 	Binary( size:Int );
 	/** A directory listing, with separate arrays for subdirs and files. **/
diff --git a/extra/haxelib_src/src/website/api/UserApi.hx b/extra/haxelib_src/src/website/api/UserApi.hx
index f156d5103ea0ffa20acfe3cb915ef021d136639e..7a23051d2a54c4f89699dc26f6abc3258bcd68b6 100644
--- a/extra/haxelib_src/src/website/api/UserApi.hx
+++ b/extra/haxelib_src/src/website/api/UserApi.hx
@@ -25,7 +25,7 @@ class UserApi extends UFApi {
 			var projects = [for (j in projectJoins) j.projectObj];
 			projects.cleverSort( -_.downloads );
 
-			return Success( new Pair(user,projects) );
+			return Success( new Pair(user, projects) );
 		}
 		catch ( e:Dynamic ) return Failure( Error.withData('Failed to fetch user profile for $username', e) );
 	}
diff --git a/extra/haxelib_src/src/website/controller/DocumentationController.hx b/extra/haxelib_src/src/website/controller/DocumentationController.hx
index 3017caf2f8a85c03ded18d9351d1a68c5bfb6d1f..528fa0a3cf91b9a7dfc4bca07ab0090528d5f286 100644
--- a/extra/haxelib_src/src/website/controller/DocumentationController.hx
+++ b/extra/haxelib_src/src/website/controller/DocumentationController.hx
@@ -29,7 +29,9 @@ class DocumentationController extends Controller {
 		pages.set( "/documentation/", "Getting Started" );
 		pages.set( "/documentation/using-haxelib/", "Using Haxelib" );
 		pages.set( "/documentation/creating-a-haxelib-package/", "Creating a Haxelib" );
-		// pages.set( "/documentation/faq/", "FAQ" );
+		pages.set( "/documentation/per-project-setup/", "Per project setup" );
+		pages.set( "/documentation/haxelibs-in-projects/", "Adding libraries to projects" );
+		pages.set( "/documentation/faq/", "FAQ" );
 		// pages.set( "/documentation/api/", "API" );
 		return pages;
 	}
diff --git a/extra/haxelib_src/src/website/controller/HomeController.hx b/extra/haxelib_src/src/website/controller/HomeController.hx
index f35faafa7ef97350e237f66f2c835630e09159a0..c60ee4ca09b77fb5a9e64914fe2fc794d3cddd36 100644
--- a/extra/haxelib_src/src/website/controller/HomeController.hx
+++ b/extra/haxelib_src/src/website/controller/HomeController.hx
@@ -20,7 +20,7 @@ class HomeController extends Controller {
 	@inject public function init( ctx:HttpContext ) {
 		// All MVC actions come through HomeController (our index controller) first, so this is a good place to set global template variables.
 		var r = ctx.request;
-		var url = 'http://'+r.hostName+r.uri;
+		var url = 'https://'+r.hostName+r.uri;
 		if ( r.queryString!="" ) {
 			url += '?'+r.queryString;
 		}
@@ -31,20 +31,38 @@ class HomeController extends Controller {
 		ViewResult.globalValues.set( "documentationPages", DocumentationController.getDocumentationPages() );
 		ViewResult.globalValues.set( "description", "Haxe is an open source toolkit based on a modern, high level, strictly typed programming language." );
 		ViewResult.globalValues.set( "searchTerm", ctx.session.get('searchTerm') );
+		ViewResult.globalValues.set( "escape", Util.escape);
+		ViewResult.globalValues.set( "formatDate", Util.formatDate);
+		ViewResult.globalValues.set( "extension", Path.extension);
+		ViewResult.globalValues.set( "min", Math.min);
+		ViewResult.globalValues.set( "max", Math.max);
 	}
 
 	@:route("/")
 	public function homepage() {
-		var latestProjects = projectListApi.latest( 7 ).sure();
-		var users = userApi.getUserList().sure().splice(0, 10);
-		var tags = projectListApi.getTagList( 20 ).sure();
+		var allProjects =  projectListApi.all().sure();
+		
+		var latestProjects =  projectListApi.latest( 12 * 3 ).sure() ;
+		var popularProjects = prepareProjectList( projectListApi.all().sure() );
+		var users = userApi.getUserList().sure();
+		var tags = projectListApi.getTagList( 25 ).sure();
+		
+		var hasRecentProject = new Map<String, Bool>();
+		latestProjects = [for (p in latestProjects) {
+			if (p.p !=null && !hasRecentProject.exists(p.p.name)) {
+				hasRecentProject.set(p.p.name, true);
+				p;
+			}
+		}];
+		
 		return new ViewResult({
 			title: "Haxelib - the Haxe package manager",
 			description: "Haxelib is a tool that enables sharing libraries and code in the Haxe ecosystem.",
 			pageUrl: context.request.uri,
-			latestProjects: latestProjects,
-			users: users,
-			escape: function(str:String) return StringTools.htmlEscape(str, true),
+			latestProjects: function(offset:Int, total:Int) return [for (i in offset...offset+total) latestProjects[i]],
+			popularProjects: function(offset:Int, total:Int) return [for (i in offset...offset+total) popularProjects[i]],
+			users: function(offset:Int, total:Int) return [for (i in offset...offset+total) users[i]],
+			
 			tags: tags,
 			exampleCode: CompileTime.readFile( "website/homepage-example.txt" ),
 			useWrapper: false,
@@ -54,6 +72,19 @@ class HomeController extends Controller {
 	@:route("/p/*")
 	public var projectController:ProjectController;
 
+	@:route("/recent/")
+	public function recent() {
+		var latestProjects =  projectListApi.latest( 100 ).sure();
+		
+		latestProjects = [for (p in latestProjects) if (p.p != null ) p];
+		
+		return new ViewResult({
+			title: "Recent updates - the Haxe package manager",
+			description: "List of the most recent changes of Haxe libraries.",
+			projects: latestProjects,
+		});
+	}
+
 	@:route("/u/*")
 	public var userController:UserController;
 
@@ -107,10 +138,13 @@ class HomeController extends Controller {
 
 		return new ViewResult({
 			title: 'Haxelib Tags',
-			description: 'The 50 most popular tags for projects on Haxelib, sorted by the number of projects',
+			description: 'Projects of popular tags on Haxelib',
 			tags: tagList,
-			escape: function(str:String) return StringTools.htmlEscape(str, true),
 			tagCloud: tagCloud,
+			taggedProjects: function(tagName:String, offset:Int, total:Int) {
+				var projects = prepareProjectList( projectListApi.byTag( tagName ).sure() );
+				return [for (i in offset...offset + total) projects[i]];
+			}
 		});
 	}
 
@@ -171,13 +205,14 @@ class HomeController extends Controller {
 		return result;
 	}
 
-	static function prepareProjectList( list:Array<Project> ):Array<{ name:String, author:String, description:String, version:String, downloads:Int }> {
+	static function prepareProjectList( list:Array<Project> ):Array<{ name:String, user:User, author:String, description:String, version:Version, downloads:Int }> {
 		return [for (p in list) if (p != null && p.ownerObj != null && p.versionObj != null) {
 			name: p.name,
+			user: p.ownerObj,
 			author: p.ownerObj.name,
 			description: p.description,
-			version: p.versionObj.toSemver(),
-			downloads: p.downloads
+			version: p.versionObj,
+			downloads: p.downloads,
 		}];
 	}
 
diff --git a/extra/haxelib_src/src/website/controller/ProjectController.hx b/extra/haxelib_src/src/website/controller/ProjectController.hx
index d199fe382f68d5ddf0a1a3f971cd6eee018fa06f..22eff9941b3efcac39607ea3a0fd5c71fe1126c1 100644
--- a/extra/haxelib_src/src/website/controller/ProjectController.hx
+++ b/extra/haxelib_src/src/website/controller/ProjectController.hx
@@ -1,8 +1,11 @@
 package website.controller;
 
+import haxe.DynamicAccess;
+import haxe.Json;
 import haxelib.SemVer;
 import ufront.MVC;
 import website.api.ProjectApi;
+import highlighter.Highlighter;
 import haxe.ds.Option;
 import markdown.AST;
 import Markdown;
@@ -11,6 +14,7 @@ using haxe.io.Path;
 using CleverSort;
 using Lambda;
 using DateTools;
+using StringTools;
 
 class ProjectController extends Controller {
 
@@ -26,6 +30,7 @@ class ProjectController extends Controller {
 	public function versionList( projectName:String ) {
 		var info = projectApi.projectInfo( projectName ).sure();
 		info.versions.sort(function(v1, v2) return SemVer.compare(v2.name, v1.name));
+		
 		return new ViewResult({
 			title: 'All versions of $projectName',
 			description: info.desc,
@@ -35,41 +40,9 @@ class ProjectController extends Controller {
 			info: info,
 		});
 	}
-
-	@:route("/$projectName/$semver")
-	public function version( projectName:String, ?semver:String ) {
-		var info = projectApi.projectInfo( projectName ).sure();
-		if ( semver==null )
-			semver = info.curversion;
-		var currentVersion = info.versions.find( function(v) return v.name==semver );
-		if ( currentVersion==null )
-			throw HttpError.pageNotFound();
-
-		var downloadUrl = '/p/$projectName/$semver/download/';
-
-		var readmeHTML = switch projectApi.readContentFromZip( projectName, semver, "README.md" ) {
-			case Success(Some(readme)): markdownToHtml(readme, '/p/$projectName/$semver/raw-files/');
-			case Success(None): ""; // No README.
-			case Failure(err):
-				ufError( err.message );
-				ufError( err.toString() );
-				"";
-		}
-
-		return new ViewResult({
-			title: '$projectName ($semver)',
-			project: projectName,
-			description: '${currentVersion.comments} - ${info.desc}',
-			allVersions: info.versions,
-			version: semver,
-			versionDate: Date.fromString(currentVersion.date).format('%F'),
-			info: info,
-			downloadUrl: downloadUrl,
-			readme: readmeHTML,
-		}, "version.html");
-	}
-
+	
 	function markdownToHtml(markdown:String, prefix:String) {
+		
 		// this function is basically a copy of Markdown.markdownToHtml
 		// default md->html rendering function, but it adds a filter that
 		// fixes relative URLs in IMG tags
@@ -80,7 +53,17 @@ class ProjectController extends Controller {
 			document.parseRefLinks(lines);
 			var blocks = document.parseLines(lines);
 			for (block in blocks) block.accept(imgSrcfixer); // fix relative image links
-			return Markdown.renderHtml(blocks);
+			
+			var html = Markdown.renderHtml(blocks);
+			
+			// prefix relative image urls in generated html (for plain <img>-tags)
+			var regexp  = ~/<img src=(["'])(?!(https?:\/)?\/)(.+?)\1/ig;
+			while(regexp.match(html)) {
+				var url = prefix + regexp.matched(3);
+				html = '<img src="${url}"${regexp.matchedRight()}';
+			}
+			
+			return html;
 		} catch (e:Dynamic) {
 			return '<pre>$e</pre>';
 		}
@@ -106,48 +89,102 @@ class ProjectController extends Controller {
 		var filePath = rest.join("/");
 		var downloadLink = baseUri+'$projectName/$semver/raw-files/$filePath';
 		var info = projectApi.projectInfo( projectName ).sure();
+		
+		if ( semver==null )
+			semver = info.curversion;
+		var currentVersion = info.versions.find( function(v) return v.name==semver );
+		if ( currentVersion==null )
+			throw HttpError.pageNotFound();
+			
 		var data:TemplateData = {
 			title: 'Viewing $filePath on $projectName:$semver',
 			project: projectName,
 			description: info.desc,
 			info: info,
+			allVersions: info.versions,
+			versionDate: Date.fromString(currentVersion.date).format('%F'),
 			version: semver,
+			size: null,
 			fileParts: rest,
 			filePath: filePath,
+			fileExt: Path.extension(filePath),
 			downloadLink: downloadLink,
+			icon: function(file:String) {
+				return switch Path.extension(file) {
+					case "zip"|"rar"|"tar.gx": "file-archive-o";
+					case "pdf": "file-pdf-o";
+					case "hx"|"hxml": "file-code-o";
+					case "jpg"|"jpeg"|"gif"|"png"|"svg"|"ico": "file-image-o";
+					case "txt"|"md"|"mdown"|"markdown": "file-text-o";
+					case other: "file-o";
+				}
+			},
 			type: "download",
 		};
-
+		
 		switch projectApi.getInfoForPath( projectName, semver, filePath ).sure() {
 			case Directory(dirs,files):
 				data["type"] = "directory";
 				data["dirListing"] = dirs;
 				data["fileListing"] = files;
 				data["currentDir"] = baseUri+'$projectName/$semver/files/$filePath'.removeTrailingSlashes();
-			case Text(str,ext):
+			case Text(str,ext,size):
 				if ( ["md","mdown","markdown"].indexOf(ext)>-1 ) {
-					str = Markdown.markdownToHtml( str );
+					str = markdownToHtml( str, '/p/$projectName/$semver/raw-files/' );
+					str = str.replace("<script", "&lt;script"); // disallow scripts
 					data["type"] = "markdown";
 				}
 				else {
 					data["type"] = "text";
+					
+					// make sure tags are rendered correctly
+					str = str.replace("<", "&lt;").replace(">", "&gt;");
+					
+					try {
+						str = switch (ext) {
+							case "xml","html","htm","mtt":
+								Util.syntaxHighlightHTML(str);
+							case "hx":
+								Highlighter.syntaxHighlightHaxe(str);
+							case "hxml":
+								Highlighter.syntaxHighlightHXML(str);
+							default:
+								str;
+						};
+					} catch(e:Dynamic) {
+						// don't throw error when there is highlighting issue
+						// just don't highlight it
+					}
 				}
+				
 				data["fileContent"] = str;
-				data["extension"] = ext;
+				data["size"] = getSize(size);
 				data["highlightLanguage"] = ext;
-			case Image(bytes,ext):
+				
+			case Image(bytes,ext,size):
 				data["filename"] = rest[rest.length-1];
 				data["type"] = "img";
+				data["size"] = getSize(size);
+				
 			case Binary(size):
 				data["filename"] = rest[rest.length-1];
-				var sizeInKb = Math.round(size/1024*10) / 10;
-				data["size"] = sizeInKb + "kb";
+				data["size"] = getSize(size);
 		}
 
 		var vr = new ViewResult( data );
 		vr.helpers["extensionAllowed"] = function(file:String) return ProjectApi.textExtensions.has(file.extension().toLowerCase());
 		return vr;
 	}
+	
+	static function getSize(size:Int) {
+		if (size == null) return null;
+		var kb = Math.round(size / 1024 * 10) / 10;
+		if (kb > 1000) {
+			return (Math.round(kb / 100) / 10) + "mb";
+		} else {
+			return kb + "kb";
+		}
+	}
 
 	// TODO: write some tests...
 	@:route("/$projectName/$semver/raw-files/*")
@@ -161,6 +198,116 @@ class ProjectController extends Controller {
 				throw HttpError.pageNotFound();
 		}
 	}
+	
+	@:route("/$projectName/$semver/readme/")
+	public function readme( projectName:String, semver:String ) {
+		return getVersion(projectName, semver, "readme");
+	}
+	
+	@:route("/$projectName/$semver/license/")
+	public function license( projectName:String, semver:String ) {
+		return getVersion(projectName, semver, "license");
+	}
+	
+	@:route("/$projectName/$semver/releasenotes/")
+	public function releasenotes( projectName:String, semver:String ) {
+		return getVersion(projectName, semver, "releasenotes");
+	}
+	
+	@:route("/$projectName/$semver/changelog/")
+	public function changelog( projectName:String, semver:String ) {
+		return getVersion(projectName, semver, "changelog");
+	}
+	
+	@:route("/$projectName/$semver/")
+	public function version( projectName:String, ?semver:String ) {
+		return getVersion(projectName, semver);
+	}
+	
+	private function getVersion( projectName:String, ?semver:String, ?type:String ) {
+		var info = projectApi.projectInfo( projectName ).sure();
+		if ( semver==null )
+			semver = info.curversion;
+		var currentVersion = info.versions.find( function(v) return v.name==semver );
+		if ( currentVersion==null )
+			throw HttpError.pageNotFound();
+
+		var downloadUrl = '/p/$projectName/$semver/download/';
+		
+		function getHTML(files:Array<String>) {
+			for(file in files) { 
+				switch projectApi.readContentFromZip( projectName, semver, file, false ) {
+					case Success(Some(readme)): return markdownToHtml(readme, '/p/$projectName/$semver/raw-files/');
+					case Success(None): // No file found.
+					case Failure(err):
+						// ufError( err.message );
+						// ufError( err.toString() );
+				};
+			}
+			return null;
+		}
+		
+		// TODO: would be nice to have this data in database instead of from the zip
+		var haxeLibJson:Any = switch (projectApi.readContentFromZip(projectName, semver, "haxelib.json", false)) {
+			case Success(Some(haxelibJson)): Json.parse(haxelibJson); // it 
+			case _: null;
+		}
+		var dependencies:DynamicAccess<String> = haxeLibJson != null && Reflect.hasField(haxeLibJson, "dependencies") ? Reflect.field(haxeLibJson, "dependencies") : { };
+		var dependencies = [for (dep in dependencies.keys()) {
+			name: dep, 
+			version: if (dependencies.get(dep).length > 0) dependencies.get(dep) else null,
+		}];
+		
+		var semverCommas = semver.replace(".", ",");
+		
+		var changelog = getHTML([
+			for (changelog in ["releases", "changelog"]) 
+				for (extension in [".md", ".txt", ""]) 
+					for (p in ['$changelog$extension', '$projectName/$changelog$extension', '$semverCommas/$changelog$extension'])
+						p
+			]);
+			
+		var readme = getHTML([for (extension in [".md", ".txt", ""])
+				for (p in ['README$extension', '$projectName/README$extension', '$semverCommas/README$extension'])
+					p
+			]);
+			
+		var license = getHTML([
+			for (extension in [".md", ".txt", ""]) 
+				for (p in ['LICENSE$extension', '$projectName/LICENSE$extension', '$semverCommas/LICENSE$extension'])
+					p
+			]);
+			
+		var releaseNotes = currentVersion.comments;
+		
+		// whitelist type, fall back to readme. unless there is no readme, then go to releasenotes tab
+		if (!(type == 'license' || type == 'changelog' || type == 'releasenotes' || type == 'changelog' || type == 'readme')) {
+			type = "readme";
+			if (readme == null) type = "releasenotes";
+		} 
+		
+		return new ViewResult({
+			title: '$projectName ($semver)',
+			project: projectName,
+			description: '${currentVersion.comments} - ${info.desc}',
+			allVersions: info.versions,
+			version: semver,
+			versionDate: Date.fromString(currentVersion.date).format('%F'),
+			info: info,
+			downloadUrl: downloadUrl,
+			type: type,
+			changelog:changelog,
+			readme:readme,
+			license:license,
+			releaseNotes:releaseNotes,
+			hasReleaseNotes: currentVersion.comments != null && currentVersion.comments.length > 0,
+			hasReadme: readme != null,
+			hasChangelog: changelog != null,
+			hasLicense: license != null,
+			dependencies: dependencies,
+		}, "version.html");
+	}
+
 }
 
 private class MarkdownImgRelativeSrcFixer implements NodeVisitor {
@@ -184,3 +331,4 @@ private class MarkdownImgRelativeSrcFixer implements NodeVisitor {
     public function visitText(text:TextNode):Void {}
     public function visitElementAfter(element:ElementNode):Void {}
 }
+
diff --git a/extra/haxelib_src/src/website/controller/RSSController.hx b/extra/haxelib_src/src/website/controller/RSSController.hx
index 1f6cd8e14acff51882f35a3e00964c341a7c3882..222cf145f5fe0993350477ccbb254c1b0d9e787c 100644
--- a/extra/haxelib_src/src/website/controller/RSSController.hx
+++ b/extra/haxelib_src/src/website/controller/RSSController.hx
@@ -46,7 +46,7 @@ class RSSController extends Controller {
 		// Set some variables we'll use.
 		Sys.setTimeLocale( "en_US.UTF8" );
 		var hostName = context.request.hostName;
-		var url = "http://"+hostName;
+		var url = "https://"+hostName;
 		var num = releases.length;
 
 		// Create the RSS document and headers.
@@ -56,7 +56,7 @@ class RSSController extends Controller {
 		rss.set( "xmlns:dc", "http://purl.org/dc/elements/1.1/" );
 		var channel = createChild( rss, "channel" );
 		var link = createChild( channel, "atom:link" );
-		link.set( "href", 'http://$hostName/rss/' );
+		link.set( "href", 'https://$hostName/rss/' );
 		link.set( "rel", "self" );
 		link.set( "type", "application/rss+xml" );
 		createChildWithContent( channel, "title", 'Latest Haxelib Releases ($hostName)' );
diff --git a/extra/haxelib_src/test/HaxelibTests.hx b/extra/haxelib_src/test/HaxelibTests.hx
index 51306f9535f4557a090521ab05e297ffbb0c0d26..a5ec9acbffdbb4ecf9180986d8c7dec193ab2b7a 100644
--- a/extra/haxelib_src/test/HaxelibTests.hx
+++ b/extra/haxelib_src/test/HaxelibTests.hx
@@ -1,3 +1,4 @@
+import haxe.io.Path;
 import haxelib.client.Vcs.VcsID;
 import haxe.unit.TestRunner;
 import sys.*;
@@ -29,6 +30,19 @@ class HaxelibTests {
 		return exitCode == 0;
 	}
 
+	static public function deleteDirectory(dir:String) {
+		if (!FileSystem.exists(dir)) return;
+		var exitCode = switch (Sys.systemName()) {
+			case "Windows":
+				Sys.command("rmdir", ["/S", "/Q", StringTools.replace(FileSystem.fullPath(dir), "/", "\\")]);
+			case _:
+				Sys.command("rm", ["-rf", dir]);
+		}
+		if (exitCode != 0) {
+			throw 'unable to delete $dir';
+		}
+	}
+
 	static function main():Void {
 		var r = new TestRunner();
 
@@ -41,12 +55,14 @@ class HaxelibTests {
 
 		if (isCI || cmdSucceed("hg", ["version"])) {
 			// Hg impl. suports tags & revs. Here "78edb4b" is a first revision "initial import" at that repo:
+			TestHg.init();
 			r.add(new TestHg());
 		} else {
 			Sys.println("hg not found.");
 		}
 		if (isCI || cmdSucceed("git", ["version"])) {
 			// Git impl. suports only tags. Here "0.9.2" is a first revision too ("initial import"):
+			TestGit.init();
 			r.add(new TestGit());
 		} else {
 			Sys.println("git not found.");
diff --git a/extra/haxelib_src/test/IntegrationTests.hx b/extra/haxelib_src/test/IntegrationTests.hx
index a12645d2bbb26ef227ec1ad8c44a20a04a0dfc13..c3b1e3194ece1fa7172b3d365a2d1d126adc6b11 100644
--- a/extra/haxelib_src/test/IntegrationTests.hx
+++ b/extra/haxelib_src/test/IntegrationTests.hx
@@ -7,6 +7,13 @@ import haxelib.*;
 using StringTools;
 using IntegrationTests;
 
+typedef UserRegistration = {
+	user:String,
+	email:String,
+	fullname:String,
+	pw:String
+}
+
 class IntegrationTests extends TestBase {
 	static var projectRoot:String = Sys.getCwd();
 	var haxelibBin:String = Path.join([projectRoot, "run.n"]);
@@ -35,18 +42,30 @@ class IntegrationTests extends TestBase {
 		originalRepo;
 	};
 	static public var repo(default, never) = "repo_integration_tests";
-	static public var bar(default, never) = {
+	static public var bar(default, never):UserRegistration = {
 		user: "Bar",
 		email: "bar@haxe.org",
 		fullname: "Bar",
 		pw: "barpassword",
 	};
-	static public var foo(default, never) = {
+	static public var foo(default, never):UserRegistration = {
 		user: "Foo",
 		email: "foo@haxe.org",
 		fullname: "Foo",
 		pw: "foopassword",
 	};
+	static public var deepAuthor(default, never):UserRegistration = {
+		user: "DeepAuthor",
+		email: "deep@haxe.org",
+		fullname: "Jonny Deep",
+		pw: "deep thought"
+	}
+	static public var anotherGuy(default, never):UserRegistration = {
+		user: "AnotherGuy",
+		email: "another@email.com",
+		fullname: "Another Guy",
+		pw: "some other pw"
+	}
 	public var clientVer(get, null):SemVer;
 	var clientVer_inited = false;
 	function get_clientVer() {
@@ -57,7 +76,7 @@ class IntegrationTests extends TestBase {
 				var r = haxelib(["version"]).result();
 				if (r.code == 0)
 					SemVer.ofString(switch(r.out.trim()) {
-						case _.split(" ") => [v] | [v, _]: v;
+						case _.split(" ") => parts: parts[0];
 						case v: v;
 					});
 				else if (r.out.indexOf("3.1.0-rc.4") >= 0)
@@ -92,6 +111,10 @@ class IntegrationTests extends TestBase {
 		assertEquals(0, r.code, pos);
 	}
 
+	function assertFail(r:{out:String, err:String, code:Int}, ?pos:haxe.PosInfos):Void {
+		assertTrue(r.code != 0, pos);
+	}
+
 	function assertNoError(f:Void->Void):Void {
 		f();
 		assertTrue(true);
@@ -158,10 +181,7 @@ class IntegrationTests extends TestBase {
 	}
 
 	static public function haxelibSetup(path:String):Void {
-		var p = new Process("haxelib", ["setup", path]);
-		if (p.exitCode() != 0)
-			throw "unable to set haxelib repo to " + path;
-		p.close();
+		HaxelibTests.runCommand("haxelib", ["setup", path]);
 	}
 
 	static function main():Void {
@@ -177,7 +197,10 @@ class IntegrationTests extends TestBase {
 		runner.add(new tests.integration.TestSet());
 		runner.add(new tests.integration.TestInfo());
 		runner.add(new tests.integration.TestUser());
+		runner.add(new tests.integration.TestOwner());
 		runner.add(new tests.integration.TestDev());
+		runner.add(new tests.integration.TestRun());
+		runner.add(new tests.integration.TestPath());
 		var success = runner.run();
 
 		if (!success) {
diff --git a/extra/haxelib_src/test/Prepare.hx b/extra/haxelib_src/test/Prepare.hx
index d17a4aadcdfb33e579beb736e7534470df781f97..cc12b5baeb39d4db1eba6431f6cb784c96a886e1 100644
--- a/extra/haxelib_src/test/Prepare.hx
+++ b/extra/haxelib_src/test/Prepare.hx
@@ -45,6 +45,7 @@ class Prepare {
 		for (item in FileSystem.readDirectory(libsPath)) {
 			var path = Path.join([libsPath, item]);
 			if (FileSystem.isDirectory(path)) {
+				trace('Preparing $item');
 				zipDir(path, 'test/libraries/${item}.zip');
 			}
 		}
diff --git a/extra/haxelib_src/test/RunCi.hx b/extra/haxelib_src/test/RunCi.hx
index 13504c7dca4f62ad1babbd8ebb625838fc6ee76a..078381638b8785f5e11a28fe036db556f31b92d6 100644
--- a/extra/haxelib_src/test/RunCi.hx
+++ b/extra/haxelib_src/test/RunCi.hx
@@ -84,6 +84,7 @@ class RunCi {
 
 	static function testClient():Void {
 		runCommand("haxe", ["client_tests.hxml"]);
+		runCommand("neko", ["bin/test.n"]);
 	}
 
 	static function testServer():Void {
@@ -157,8 +158,12 @@ Listen 2000
 <Directory "$DocumentRoot">
     Options Indexes FollowSymLinks
     AllowOverride All
+' + (switch (systemName()) {
+	case "Windows": '';
+	case _: '
     Order allow,deny
-    Allow from all
+    Allow from all';
+}) + '
     Require all granted
 </Directory>
 ';
@@ -184,7 +189,7 @@ Listen 2000
 					pass: user.pass,
 					host: "localhost",
 					port: 3306,
-					#if (haxe_ver < 4.0) database: "", #end
+					#if (haxe_ver < 4.0) database: "mysql", #end
 				});
 				cnx.request('create user if not exists \'${dbConfig.user}\'@\'localhost\' identified by \'${dbConfig.pass}\';');
 				cnx.request('create database if not exists ${dbConfig.database};');
@@ -202,7 +207,7 @@ Listen 2000
 			case "Windows":
 				configDb();
 
-				download("https://www.apachelounge.com/download/VC15/binaries/httpd-2.4.29-Win32-VC15.zip", "bin/httpd.zip");
+				download("https://home.apache.org/~steffenal/VC15/binaries/httpd-2.4.41-win32-VC15.zip", "bin/httpd.zip");
 				runCommand("7z", ["x", "bin\\httpd.zip", "-obin\\httpd"]);
 				writeApacheConf("bin\\httpd\\Apache24\\conf\\httpd.conf");
 
@@ -238,9 +243,9 @@ Listen 2000
 					println("====================");
 				}
 			case "Mac":
-				runCommand("brew", ["install", "httpd", "mysql"]);
+				runCommand("brew", ["install", "httpd", "mysql@5.7"]);
 
-				runCommand("mysql.server", ["start"]);
+				runCommand("brew", ["services", "start", "mysql@5.7"]);
 
 				configDb();
 
@@ -273,7 +278,7 @@ Listen 2000
 
 				writeApacheConf("haxelib.conf");
 				runCommand("sudo", ["ln", "-s", Path.join([Sys.getCwd(), "haxelib.conf"]), "/etc/apache2/conf-enabled/haxelib.conf"]);
-				
+
 				runCommand("sudo", ["service", "apache2", "restart"]);
 				Sys.sleep(2.5);
 
@@ -297,7 +302,7 @@ Listen 2000
 		}
 
 		Sys.setCwd("www");
-		runCommand("bower", ["install"]);
+		runCommand("npm", ["install"]);
 		Sys.setCwd("..");
 
 		Sys.putEnv("HAXELIB_SERVER", HAXELIB_SERVER);
@@ -308,7 +313,7 @@ Listen 2000
 		switch (systemName()) {
 			case "Mac":
 				runCommand("apachectl", ["stop"]);
-				runCommand("mysql.server", ["stop"]);
+				runCommand("brew", ["services", "stop", "mysql@5.7"]);
 			case _:
 				//pass
 		}
@@ -347,7 +352,7 @@ Listen 2000
 				break;
 			}
 
-			if (Timer.stamp() - t > 120) {
+			if (Timer.stamp() - t > 9 * 60) {
 				throw "server is not reachable...";
 			}
 
@@ -370,8 +375,10 @@ Listen 2000
 					runCommand("haxe", ["integration_tests.hxml", "-D", "system_haxelib"]);
 				case _:
 					runCommand("haxe", ["integration_tests.hxml"]);
+					runCommand("neko", ["bin/integration_tests.n"]);
 					runCommand("haxe", ["integration_tests.hxml", "-D", "system_haxelib"]);
 			}
+			runCommand("neko", ["bin/integration_tests.n"]);
 		}
 		if (Sys.getEnv("CI") != null && Sys.getEnv("USE_DOCKER") == null) {
 			runWithLocalServer(test);
@@ -464,16 +471,15 @@ Listen 2000
 		compileLegacyClient();
 		compileLegacyServer();
 
-		// the server can only be compiled with haxe 3.2+
+		// the server can only be compiled with haxe 3.4+
 		// haxe 3.1.3 bundles haxelib client 3.1.0-rc.4, which is not upgradable to later haxelib
 		// so there is no need to test the client either
 		#if (haxe_ver >= 3.2)
 			compileClient();
 			testClient();
-			compileServer();
 		#end
-		// buddy is only compatiable with haxe 3.4+
-		#if (haxe_ver >= 3.4)
+		#if ((haxe_ver >= 3.4) && (haxe_ver < 4))
+			compileServer();
 			testServer();
 		#end
 
@@ -482,7 +488,7 @@ Listen 2000
 			case "Windows", "Linux":
 				integrationTests();
 			case "Mac":
-				#if (haxe_ver >= 3.2)
+				#if ((haxe_ver >= 3.4) && (haxe_ver < 4))
 					integrationTests();
 				#end
 			case _:
diff --git a/extra/haxelib_src/test/TestBase.hx b/extra/haxelib_src/test/TestBase.hx
index 56674e45bdb7fa4308ef398540edf240bf9d4f36..e22ff837894a84dacc78b967b19c69d0e5a8603c 100644
--- a/extra/haxelib_src/test/TestBase.hx
+++ b/extra/haxelib_src/test/TestBase.hx
@@ -5,10 +5,33 @@ import haxe.unit.*;
 
 class TestBase extends TestCase {
 	static var haxelibPath = FileSystem.fullPath("run.n");
-	public function runHaxelib(args:Array<String>) {
+	public function runHaxelib(args:Array<String>, printProgress = false) {
 		var p = new Process("neko", [haxelibPath].concat(args));
-		var stdout = p.stdout.readAll().toString();
-		var stderr = p.stderr.readAll().toString();
+		var stdout = '';
+		var stderr = '';
+		var eofCount = 0;
+		var c;
+		while (eofCount < 2) {
+			eofCount = 0;
+			try {
+				c = p.stdout.readByte();
+				if (printProgress) Sys.stdout().writeByte(c);
+				stdout += String.fromCharCode(c);
+			} catch(e:Eof) {
+				eofCount++;
+			}
+			try {
+				c = p.stderr.readByte();
+				if (printProgress) Sys.stderr().writeByte(c);
+				stderr += String.fromCharCode(c);
+			} catch(e:Eof) {
+				eofCount++;
+			}
+		}
+		if (printProgress) {
+			Sys.stdout().flush();
+			Sys.stderr().flush();
+		}
 		var exitCode = p.exitCode();
 		p.close();
 		return {
@@ -19,15 +42,6 @@ class TestBase extends TestCase {
 	}
 
 	public function deleteDirectory(dir:String):Void {
-		if (!FileSystem.exists(dir)) return;
-		var exitCode = switch (Sys.systemName()) {
-			case "Windows":
-				Sys.command("rmdir", ["/S", "/Q", StringTools.replace(FileSystem.fullPath(dir), "/", "\\")]);
-			case _:
-				Sys.command("rm", ["-rf", dir]);
-		}
-		if (exitCode != 0) {
-			throw 'unable to delete $dir';
-		}
+		HaxelibTests.deleteDirectory(dir);
 	}
 }
diff --git a/extra/haxelib_src/test/libraries/UseGitDep/git-deps.hxml b/extra/haxelib_src/test/libraries/UseGitDep/git-deps.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b1906d6869e20c98020c2eff66430af999d16aeb
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/UseGitDep/git-deps.hxml
@@ -0,0 +1 @@
+-lib hx.signal:git:https://github.com/fzzr-/hx.signal.git#0.9.3
\ No newline at end of file
diff --git a/extra/haxelib_src/test/libraries/libBadHaxelibJson/haxelib.json b/extra/haxelib_src/test/libraries/libBadHaxelibJson/haxelib.json
new file mode 100644
index 0000000000000000000000000000000000000000..d70772fcd5f88727c132dd9a107b343994de47ff
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libBadHaxelibJson/haxelib.json
@@ -0,0 +1,11 @@
+{
+	"name": "BadHaxelibJson",
+	"url" : "http://example.org",
+	"license": "GPL",
+	"tags": ["bar", "test"],
+	"description": "This project is an example of an haxelib project",
+	"version": "1.0.0",
+	"releasenote": "Initial release, everything is working correctly",
+	"contributors": ["BadHaxelibJson"],
+	"dependencies": {,}
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/test/libraries/libBar/Run.hx b/extra/haxelib_src/test/libraries/libBar/Run.hx
new file mode 100644
index 0000000000000000000000000000000000000000..278db81752fec3a023e88339adb7944117a63bdc
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libBar/Run.hx
@@ -0,0 +1,6 @@
+class Run {
+	static public function main() {
+		Sys.print('Bar Run.hx script');
+	}
+}
+
diff --git a/extra/haxelib_src/test/libraries/libBar2/Run.hx b/extra/haxelib_src/test/libraries/libBar2/Run.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8e73f6c5166449d456ff8bc4dafd4da6ea8a1cbd
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libBar2/Run.hx
@@ -0,0 +1,6 @@
+class Run {
+	static public function main() {
+		Sys.print('Bar2 Run.hx script');
+	}
+}
+
diff --git a/extra/haxelib_src/test/libraries/libBar2/RunN.hx b/extra/haxelib_src/test/libraries/libBar2/RunN.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6fcce336a9d5aa8ea1884a7329988ab536e4f8fb
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libBar2/RunN.hx
@@ -0,0 +1,6 @@
+class Run {
+	static public function main() {
+		Sys.print('Bar2 run.n script');
+	}
+}
+
diff --git a/extra/haxelib_src/test/libraries/libBar2/run.n b/extra/haxelib_src/test/libraries/libBar2/run.n
new file mode 100644
index 0000000000000000000000000000000000000000..fc02bdfb55df39beb0db5d88247eaff9e4657da5
Binary files /dev/null and b/extra/haxelib_src/test/libraries/libBar2/run.n differ
diff --git a/extra/haxelib_src/test/libraries/libBaz/haxelib.json b/extra/haxelib_src/test/libraries/libBaz/haxelib.json
new file mode 100644
index 0000000000000000000000000000000000000000..367e91d43bccfd6862aaa5ba71c29abc918ee319
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libBaz/haxelib.json
@@ -0,0 +1,11 @@
+{
+	"name": "Baz",
+	"url" : "http://example.org",
+	"license": "GPL",
+	"tags": ["baz", "test"],
+	"description": "This project is an example of an haxelib project",
+	"version": "0.1.0-alpha.0",
+	"releasenote": "Initial release, everything is working correctly",
+	"contributors": ["Baz"],
+	"main": "tools.Main"
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/test/libraries/libBaz/haxelib.xml b/extra/haxelib_src/test/libraries/libBaz/haxelib.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f3b38c975c6f0719f69e31a359c8f58ffd799be8
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libBaz/haxelib.xml
@@ -0,0 +1,7 @@
+<project name="Baz" url="http://example.org" license="GPL">
+	<user name="Baz"/>
+	<tag v="baz"/>
+	<tag v="test"/>
+	<description>This project is an example of an haxelib project</description>
+	<version name="1.0.0-alpha.0">Initial release, everything is working correctly</version>
+</project>
\ No newline at end of file
diff --git a/extra/haxelib_src/test/libraries/libBaz/tools/Main.hx b/extra/haxelib_src/test/libraries/libBaz/tools/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9bd8887517d74446e2da1239444ce871bea7ceb8
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libBaz/tools/Main.hx
@@ -0,0 +1,7 @@
+package tools;
+
+class Main {
+	static function main() {
+		Sys.print('Baz tools.Main script');
+	}
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/test/libraries/libDeep2/libDeep/bar/Bar.hx b/extra/haxelib_src/test/libraries/libDeep2/libDeep/bar/Bar.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2936374c09fd9ec3ac752b23c93de783ce5e94fc
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libDeep2/libDeep/bar/Bar.hx
@@ -0,0 +1,9 @@
+package bar;
+
+class Bar {
+
+	static function new() {
+		trace("new Bar");
+	}
+
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/test/libraries/libDeep2/libDeep/haxelib.json b/extra/haxelib_src/test/libraries/libDeep2/libDeep/haxelib.json
new file mode 100644
index 0000000000000000000000000000000000000000..826f0be4c15fd77dbcca5e393b3e104694f12f80
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libDeep2/libDeep/haxelib.json
@@ -0,0 +1,10 @@
+{
+	"name": "Deep",
+	"url" : "http://example.org",
+	"license": "Public",
+	"tags": ["deep", "test"],
+	"description": "This project's zip contains a folder that holds the lib.",
+	"version": "1.0.1",
+	"releasenote": "AnotherGuy took over the ownership.",
+	"contributors": ["AnotherGuy", "DeepAuthor"]
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/test/libraries/libDeep3/libDeep/bar/Bar.hx b/extra/haxelib_src/test/libraries/libDeep3/libDeep/bar/Bar.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2936374c09fd9ec3ac752b23c93de783ce5e94fc
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libDeep3/libDeep/bar/Bar.hx
@@ -0,0 +1,9 @@
+package bar;
+
+class Bar {
+
+	static function new() {
+		trace("new Bar");
+	}
+
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/test/libraries/libDeep3/libDeep/haxelib.json b/extra/haxelib_src/test/libraries/libDeep3/libDeep/haxelib.json
new file mode 100644
index 0000000000000000000000000000000000000000..1c2d7486536ddf37bb07f5267207121002ffe082
--- /dev/null
+++ b/extra/haxelib_src/test/libraries/libDeep3/libDeep/haxelib.json
@@ -0,0 +1,10 @@
+{
+	"name": "Deep",
+	"url" : "http://example.org",
+	"license": "Public",
+	"tags": ["deep", "test"],
+	"description": "This project's zip contains a folder that holds the lib.",
+	"version": "1.0.2",
+	"releasenote": "Removed DeepAuthor in contributors, add Foo.",
+	"contributors": ["AnotherGuy", "Foo"]
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/test/tests/TestGit.hx b/extra/haxelib_src/test/tests/TestGit.hx
index 6cceea46321910e9d7101d3150d0bcebd123fa41..4417ee7d37174b37c895c32a8e8ee968c9ce8474 100644
--- a/extra/haxelib_src/test/tests/TestGit.hx
+++ b/extra/haxelib_src/test/tests/TestGit.hx
@@ -1,9 +1,17 @@
 package tests;
 
+import sys.FileSystem;
 import haxelib.client.Vcs;
 
 class TestGit extends TestVcs {
+	static inline var REPO_PATH = 'test/repo/git';
+
+	static public function init() {
+		HaxelibTests.deleteDirectory(REPO_PATH);
+		HaxelibTests.runCommand('git', ['clone', 'https://github.com/fzzr-/hx.signal.git', REPO_PATH]);
+	}
+
 	public function new():Void {
-		super(VcsID.Git, "Git", "https://github.com/fzzr-/hx.signal.git", "0.9.2");
+		super(VcsID.Git, "Git", FileSystem.fullPath(REPO_PATH), "0.9.2");
 	}
 }
\ No newline at end of file
diff --git a/extra/haxelib_src/test/tests/TestHg.hx b/extra/haxelib_src/test/tests/TestHg.hx
index c4c8c2d0981738a7254f5f9fe922503064c6f927..d5a953f107f4e91355c62b9ef896c85ee698ba21 100644
--- a/extra/haxelib_src/test/tests/TestHg.hx
+++ b/extra/haxelib_src/test/tests/TestHg.hx
@@ -1,9 +1,17 @@
 package tests;
 
+import sys.FileSystem;
 import haxelib.client.Vcs;
 
 class TestHg extends TestVcs {
+	static inline var REPO_PATH = 'test/repo/hg';
+
+	static public function init() {
+		HaxelibTests.deleteDirectory(REPO_PATH);
+		HaxelibTests.runCommand('hg', ['clone', 'https://bitbucket.org/fzzr/hx.signal', REPO_PATH]);
+	}
+
 	public function new():Void {
-		super(VcsID.Hg, "Mercurial", "https://bitbucket.org/fzzr/hx.signal", "78edb4b");
+		super(VcsID.Hg, "Mercurial", FileSystem.fullPath(REPO_PATH), "78edb4b");
 	}
 }
\ No newline at end of file
diff --git a/extra/haxelib_src/test/tests/TestInstall.hx b/extra/haxelib_src/test/tests/TestInstall.hx
index 9cb6bdd7250e40283ff1e3456a05a006afd21bf5..3b726b87a624fbeb703e46710d8b9d8932f72633 100644
--- a/extra/haxelib_src/test/tests/TestInstall.hx
+++ b/extra/haxelib_src/test/tests/TestInstall.hx
@@ -20,7 +20,7 @@ class TestInstall extends TestBase
 
 	//--------------- constructor ---------------//
 
-	public function new() 
+	public function new()
 	{
 		super();
 		this.repo = Path.join([Sys.getCwd(), "test", REPO]);
@@ -33,11 +33,11 @@ class TestInstall extends TestBase
 	{
 		origRepo = ~/\r?\n/.split(runHaxelib(["config"]).stdout)[0];
 		origRepo = Path.normalize(origRepo);
-		
+
 		if (runHaxelib(["setup", repo]).exitCode != 0) {
 			throw "haxelib setup failed";
 		}
-		
+
 		CWD = Sys.getCwd();
 		var dir = Path.join([CWD, REPO_ROOT, PROJECT_FOLDER]);
 		Sys.setCwd(dir);
@@ -47,12 +47,12 @@ class TestInstall extends TestBase
 	{
 		// restore original CWD:
 		Sys.setCwd(CWD);
-		
+
 		if (runHaxelib(["setup", origRepo]).exitCode != 0) {
 			throw "haxelib setup failed";
 		}
 		deleteDirectory(repo);
-		
+
 	}
 
 	//----------------- tests -------------------//
@@ -61,22 +61,31 @@ class TestInstall extends TestBase
 	{
 		var r = runHaxelib(["install", "haxelib.json"]);
 		assertTrue(r.exitCode == 0);
-		
+
 		checkLibrary(getLibraryName());
 	}
-	
+
 	public function testInstallHaxelibDependencyWithTag():Void
 	{
 		var r = runHaxelib(["install", "tag_haxelib.json"]);
 		assertTrue(r.exitCode == 0);
-		
+
 		var lib = getLibraryName();
 		checkLibrary(lib);
-		
+
 		// if that repo "README.md" was added in tag/rev.: "0.9.3"
 		assertFalse(FileSystem.exists(Path.join([lib, "git", "README.md"])));
 	}
-	
+
+	public function testReinstallHxml() {
+		var r = runHaxelib(["install", "git-deps.hxml", "--always"]);
+		assertEquals(0, r.exitCode);
+		var r = runHaxelib(["install", "git-deps.hxml", "--always"]);
+		assertEquals(0, r.exitCode);
+		var r = runHaxelib(["path", "hx.signal"]);
+		assertEquals(0, r.exitCode);
+	}
+
 	function getLibraryName():String
 	{
 		var haxelibFile = File.read("haxelib.json", false);
@@ -84,14 +93,14 @@ class TestInstall extends TestBase
 		haxelibFile.close();
 		return details.dependencies.toArray()[0].name;
 	}
-	
+
 	function checkLibrary(lib:String):Void
 	{
 		// Library folder exists
 		var libFolder = Path.join([repo, lib]);
 		assertTrue(FileSystem.exists(libFolder));
 		assertTrue(FileSystem.isDirectory(libFolder));
-		
+
 		// Library version is set to git
 		var current = File.read(Path.join([libFolder, ".current"]), false);
 		assertTrue(current.readAll().toString() == "git");
diff --git a/extra/haxelib_src/test/tests/integration/TestOwner.hx b/extra/haxelib_src/test/tests/integration/TestOwner.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ab78daae116f47e025693c8f9b50af5190d69aa1
--- /dev/null
+++ b/extra/haxelib_src/test/tests/integration/TestOwner.hx
@@ -0,0 +1,65 @@
+package tests.integration;
+
+import haxe.io.*;
+import IntegrationTests.*;
+using IntegrationTests;
+
+class TestOwner extends IntegrationTests {
+    function test():Void {
+        {
+            var r = haxelib(["register", deepAuthor.user, deepAuthor.email, deepAuthor.fullname, deepAuthor.pw, deepAuthor.pw]).result();
+            assertSuccess(r);
+        }
+        {
+            var r = haxelib(["register", anotherGuy.user, anotherGuy.email, anotherGuy.fullname, anotherGuy.pw, anotherGuy.pw]).result();
+            assertSuccess(r);
+        }
+        {
+            var r = haxelib(["register", foo.user, foo.email, foo.fullname, foo.pw, foo.pw]).result();
+            assertSuccess(r);
+        }
+
+
+        /*
+            Only the owner can submit the first version.
+         */
+
+        {
+            var r = haxelib(["submit", Path.join([IntegrationTests.projectRoot, "test/libraries/libDeep.zip"]), anotherGuy.user, anotherGuy.pw]).result();
+            assertFail(r);
+        }
+
+        {
+            var r = haxelib(["submit", Path.join([IntegrationTests.projectRoot, "test/libraries/libDeep.zip"]), deepAuthor.user, deepAuthor.pw]).result();
+            assertSuccess(r);
+        }
+
+        /*
+            Only the owner can change ownership.
+        */
+
+        {
+            var r = haxelib(["submit", Path.join([IntegrationTests.projectRoot, "test/libraries/libDeep2.zip"]), anotherGuy.user, anotherGuy.pw]).result();
+            assertFail(r);
+        }
+
+        {
+            var r = haxelib(["submit", Path.join([IntegrationTests.projectRoot, "test/libraries/libDeep2.zip"]), deepAuthor.user, deepAuthor.pw]).result();
+            assertSuccess(r);
+        }
+
+        /*
+            Only the owner can change contributors.
+        */
+
+        {
+            var r = haxelib(["submit", Path.join([IntegrationTests.projectRoot, "test/libraries/libDeep3.zip"]), foo.user, foo.pw]).result();
+            assertFail(r);
+        }
+
+        {
+            var r = haxelib(["submit", Path.join([IntegrationTests.projectRoot, "test/libraries/libDeep3.zip"]), anotherGuy.user, anotherGuy.pw]).result();
+            assertSuccess(r);
+        }
+    }
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/test/tests/integration/TestPath.hx b/extra/haxelib_src/test/tests/integration/TestPath.hx
new file mode 100644
index 0000000000000000000000000000000000000000..58d14c374ff2427acb0c6c8e25e0fd9d19266735
--- /dev/null
+++ b/extra/haxelib_src/test/tests/integration/TestPath.hx
@@ -0,0 +1,15 @@
+package tests.integration;
+
+import haxe.io.Path;
+using IntegrationTests;
+
+class TestPath extends IntegrationTests {
+#if !system_haxelib
+	function testMain():Void {
+		var r = haxelib(["dev", "BadHaxelibJson", Path.join([IntegrationTests.projectRoot, "test/libraries/libBadHaxelibJson"])]).result();
+		assertSuccess(r);
+		var r = haxelib(["path", "BadHaxelibJson"]).result();
+		assertFail(r);
+	}
+#end
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/test/tests/integration/TestRun.hx b/extra/haxelib_src/test/tests/integration/TestRun.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c226859a5f7331ded6dfe2030bff1d91155baa76
--- /dev/null
+++ b/extra/haxelib_src/test/tests/integration/TestRun.hx
@@ -0,0 +1,31 @@
+package tests.integration;
+
+import haxe.io.Path;
+using IntegrationTests;
+
+class TestRun extends IntegrationTests {
+#if (haxe_ver >= 4.0)
+	function testMain():Void {
+		var r = haxelib(["dev", "Baz", Path.join([IntegrationTests.projectRoot, "test/libraries/libBaz"])]).result();
+		assertSuccess(r);
+		var r = haxelib(["run", "Baz"]).result();
+		assertSuccess(r);
+		assertEquals('Baz tools.Main script', r.out);
+	}
+
+	function testMain_noValueButRunHxExists():Void {
+		var r = haxelib(["dev", "Bar", Path.join([IntegrationTests.projectRoot, "test/libraries/libBar"])]).result();
+		assertSuccess(r);
+		var r = haxelib(["run", "Bar"]).result();
+		assertSuccess(r);
+		assertEquals('Bar Run.hx script', r.out);
+	}
+#end
+	function testRunN_preferredOverRunHx():Void {
+		var r = haxelib(["dev", "Bar2", Path.join([IntegrationTests.projectRoot, "test/libraries/libBar2"])]).result();
+		assertSuccess(r);
+		var r = haxelib(["run", "Bar2"]).result();
+		assertSuccess(r);
+		assertEquals('Bar2 run.n script', r.out);
+	}
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/www/.htaccess b/extra/haxelib_src/www/.htaccess
index b9b20dd820cefc98d01aac266c66d0faf80a97a7..48acf19563fb6f45389e1f840bdf03db85cd8d06 100644
--- a/extra/haxelib_src/www/.htaccess
+++ b/extra/haxelib_src/www/.htaccess
@@ -4,19 +4,37 @@ DirectoryIndex index.n index.php index.html
 
 RewriteEngine On
 
+# Redirect http to https
+RewriteBase /
+RewriteCond %{HTTPS} !=on
+RewriteCond %{HTTP:X-Forwarded-Proto} !https
+RewriteCond %{HTTP_HOST} !^localhost(:[0-9]+)?$
+RewriteCond %{REQUEST_URI} !index\.n/?$
+RewriteCond %{REQUEST_URI} !^/api/
+RewriteCond %{REQUEST_URI} !^/files/
+RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=302,L,QSA]
+
 # /files are stored in S3
 
+# for recent versions of haxelib client, which send UA, use https, and support redirection
+RewriteBase /
+RewriteCond %{HTTPS} =on [OR]
+RewriteCond %{HTTP:X-Forwarded-Proto} =https
+RewriteCond %{ENV:HAXELIB_CDN} !^$
+RewriteCond %{HTTP_USER_AGENT} !^$
+RewriteRule "^files/(.*)$" "https://%{ENV:HAXELIB_CDN}/files/$1" [L,R=302]
+
+# for older versions of haxelib client
 RewriteBase /
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{ENV:HAXELIB_S3BUCKET} !^$
-RewriteCond %{ENV:AWS_DEFAULT_REGION} !^$
-RewriteRule "^files/(.*)$" "http://%{ENV:HAXELIB_S3BUCKET}.s3-%{ENV:AWS_DEFAULT_REGION}.amazonaws.com/files/$1" [P]
+RewriteCond %{ENV:HAXELIB_CDN} !^$
+RewriteRule "^files/(.*)$" "http://%{ENV:HAXELIB_CDN}/files/$1" [P]
 
 # Rewrite rules to send Haxe remoting calls on "/" to "haxelib1/".  If it matches, that's [L], the last rule - go their immediately.
 
 RewriteBase /
 RewriteCond %{HTTP:X-Haxe-Remoting}: 1
-RewriteRule ^index.n$ legacy/index.n [L]
+RewriteRule ^index\.n$ legacy/index.n [L]
 
 # Enable rewrite for the new site's pages, only if the file or dir doesn't exist
 
diff --git a/extra/haxelib_src/www/bower.json b/extra/haxelib_src/www/bower.json
deleted file mode 100644
index 730bbc82c1035808b942601431f5490eb06300de..0000000000000000000000000000000000000000
--- a/extra/haxelib_src/www/bower.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "haxelib-server",
-  "homepage": "https://github.com/HaxeFoundation/haxelib",
-  "description": "Haxelib server",
-  "keywords": [
-    "haxe",
-    "haxelib"
-  ],
-  "license": "MIT",
-  "private": true,
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "jquery": "^1.12.2",
-    "bootstrap": "^3.3.6",
-    "font-awesome": "^4.5.0"
-  }
-}
diff --git a/extra/haxelib_src/www/css/style.css b/extra/haxelib_src/www/css/style.css
index 07a68efcc779cab2568445b38dc9617b3ae9e3c4..2aafc3655cae94283c60f5da9e6f1dbc1ec0606d 100644
--- a/extra/haxelib_src/www/css/style.css
+++ b/extra/haxelib_src/www/css/style.css
@@ -3,13 +3,14 @@
 **/
 * {
 	margin: 0;
+	box-sizing:border-box;
 }
 html, body {
 	height: 100%;
 }
 .page-wrap {
 	margin-bottom: 0; /* equal to footer height */
-  flex: 1 0 auto; 
+	flex: 1 0 auto; 
 }
 .page-wrap:after {
 	content: "";
@@ -233,6 +234,13 @@ a.anch {
   }
 }
 
+/**
+	Error page
+**/
+.error-data {
+	white-space: pre;
+}
+
 /**
 	Billboard / head on homepage
 **/
@@ -383,30 +391,35 @@ html pre, html pre code {
 	line-height: 20px;
 	white-space: pre;
 	overflow-x: auto;
+	tab-size: 20px;
 }
-pre, div.pre {
-	color: #333;
-	background-color: #f3f3f3;
-	border: 1px solid #bbb;
-	margin: 15px;
-	padding: 5px;
-	padding-left: 20px;
+code.prettyprint { 
+  display: block;
+  color: #333;
+  padding: 0.5em;
+}
+code.prettyprint .type  {
+  color: #0086b3;
 }
-pre .kwd, div.pre .kwd {
-	color: #008;
+code.prettyprint .kwd {
+  color: #00a;
 }
-pre .val, div.pre .val {
-	color: #448;
+code.prettyprint .val  {
+  color: #44a;
 }
-pre .str, div.pre .str {
-	color: #800;
+code.prettyprint .str, code.prettyprint .str .kwd, code.prettyprint .str .val, code.prettyprint .str .type {
+  color: #a00;
 }
-pre .cmt, div.pre .cmt {
-	color: #080;
+code.prettyprint .cmt {
+  color: #998;
+  font-style: italic;
 }
-/* Make sure keywords inside comments are not highlighted*/
-pre .cmt .kwd, pre .cmt .str, pre .cmt .val {
-	color: #080;
+code.prettyprint .ereg, code.prettyprint .ereg .type {
+  color: #f01;
+}
+/* Make sure keywords inside comments are not highlighted */
+code.prettyprint .cmt .kwd, code.prettyprint .cmt .str, code.prettyprint .cmt .val, code.prettyprint .cmt .type {
+  color: #998;
 }
 
 /**
@@ -682,17 +695,47 @@ h2 i.fa, h3 i.fa, h4 i.fa, h5 i.fa {
 	margin: 0;
 	padding-left: 0;
 }
-.breadcrumb > li:first-child {
-	padding-left: 0;
+.panel.file-list {
+	margin-bottom: 20px;
+	border: 1px solid #ddd;
+	border-radius: 4px;
+	box-shadow: 0 1px 1px rgba(0,0,0,.05);
 }
-pre.panel-body {
-	margin: 0;
+.panel .btn-toolbar.pull-right {
+	margin-right:10px;
+	margin-top: 5px;
+}
+.panel .btn-toolbar li{
+	padding-left:0;
+}
+.panel-disabled.panel-body {
+	background-color:#f5f5f5;
+	padding:1em 2em 2em 2em;
+}
+
+.breadcrumb li:not(:first-child):before {
+	content: "/";
+	display:inline-block;
+	padding-right: 10px;
+}
+
+.panel-body {
 	border: none;
 	background: white;
+	width:100%;
+	padding:1em;
+}
+.panel-body pre {
+	border-color:#ddd;
+	background:#fcfcfc;
 }
+
 /** Project lists. **/
 .project-list small {
 	font-weight: normal;
+	color:#999;
+	display:inline-block;
+	width:100px;
 }
 /** Homepage Banner **/
 .section.homepage-banner {
@@ -748,6 +791,17 @@ pre.panel-body {
   }
 }
 
+.project-details table td {
+	padding-top:0.5em;
+	padding-bottom:0.5em;
+	word-break:break-all;
+}
+
+.project-details table tr:first-child td {
+	border:0;
+	padding-top:0;
+}
+
 table .img-circle {
   max-width:none;
 }
@@ -784,6 +838,38 @@ pre.example .comment {
   float:left;
   margin-right:10px;
 }
-.user {
-  clear:both;
+
+.popular-libs-list .title, .popular-libs-list .title {
+	font-size:21px;
+}
+
+.well form, .well .control-group {
+	margin:0;
+}
+
+.file-list .dropdown-menu {
+	max-height: 20em;
+	overflow-y: auto;
+}
+
+.file-list .list-group a {
+	display:block;
+	padding: 6px 3px;
+	line-height: 20px;
+}
+.file-list .list-group a:not(:first-child) {
+	border-top: 1px solid #eaecef;
 }
+.file-list .list-group .fa {
+	padding-right:10px;
+}
+.file-list .list-group a:hover {
+	background:#f0f0f0;
+}
+.tag-list h3 a {
+	text-decoration:none;
+}
+
+.description {
+	word-break: break-word;
+}
\ No newline at end of file
diff --git a/extra/haxelib_src/www/documentation-files/creating-a-haxelib-package.md b/extra/haxelib_src/www/documentation-files/creating-a-haxelib-package.md
index 5589f8afd0e3519eb2b7684c7b2f179fa796ed0a..1684d036b0082a56ab3b260f72371dd804c16024 100644
--- a/extra/haxelib_src/www/documentation-files/creating-a-haxelib-package.md
+++ b/extra/haxelib_src/www/documentation-files/creating-a-haxelib-package.md
@@ -14,8 +14,9 @@ Each Haxe library requires a `haxelib.json` file in which the following attribut
 * version: The version string of the library. This is detailed in [Versioning](#versioning).
 * classPath: The path string to the source files.
 * releasenote: The release notes of the current version.
-* contributors: An array of user names which identify contributors to the library that are allowed to upload to haxelib.
-* dependencies: An object describing the dependencies of the library. This is detailed in [Dependencies](haxelib-json-dependencies.md).
+* contributors: An array of user names which identify contributors to the library that are allowed to upload to haxelib. The first user will be defined as the owner, who is the only one that can change description, url, license, contributors, and ownership (by changing who come first in contributors).
+* dependencies (optional): An object describing the dependencies of the library. This is detailed in [Dependencies](#dependencies).
+* main (optional): A class to run on `haxelib run libraryname` command. Relative to library root. E.g. to run `tools/Main.hx` the value should be `tools.Main`. Default value since Haxe 4: `Run`
 
 The following JSON is a simple example of a haxelib.json:
 
@@ -33,7 +34,8 @@ The following JSON is a simple example of a haxelib.json:
   "dependencies": {
     "tink_macro": "",
     "nme": "3.5.5"
-  }
+  },
+  "main": "tools.Main"
 }
 ```
 
@@ -80,6 +82,26 @@ Examples:
 * "1.0.0-rc.2": The 2nd release candidate for 1.0.0
 * "1.0.0": The final release!
 
+<a name="dependencies"></a>
+
+### Dependencies
+
+As of Haxe 3.1.0, haxelib supports only exact version matching for dependencies. Dependencies are defined as part of the [haxelib.json](haxelib-json.md), with the library name serving as key and the expected version (if required) as value in the format described in [Versioning](#versioning).
+
+We have seen an example of this when introducing haxelib.json:
+
+```haxe
+"dependencies": {
+  "tink_macros": "",
+  "nme": "3.5.5"
+}
+```
+
+This adds two dependencies to the given Haxe library:
+
+1. The library "tink_macros" can be used in any version. Haxelib will then always try to use the latest version.
+2. The library "nme" is required in version "3.5.5". Haxelib will make sure that this exact version is used, avoiding potential breaking changes with future versions.
+
 ### extraParams.hxml
 
 If you add a file named `extraParams.hxml` to your library root (at the same level as `haxelib.json`), these parameters will be automatically added to the compilation parameters when someone use your library with `-lib`.
diff --git a/extra/haxelib_src/www/documentation-files/faq.md b/extra/haxelib_src/www/documentation-files/faq.md
index 5be8f1bba8d29bb56ad46f671ec77b6ec98ab560..f17a9555435d5ee7ccea2bc6bd9773f344576929 100644
--- a/extra/haxelib_src/www/documentation-files/faq.md
+++ b/extra/haxelib_src/www/documentation-files/faq.md
@@ -1,3 +1,50 @@
 # FAQ
 
-More information to go here...
+
+### How do I change my password?  
+At the moment there is no way to change your password using the website or command-line. Please contact contact@haxe.org with the emailaddress of your account.  
+
+---
+
+### How to use `haxelib` on the command line   
+Check out [using haxelib](/documentation/using-haxelib/).  
+
+---
+
+### Can a project have multiple contributors?
+Yes, just add multiple usernames in the contributors list (`"contributors": ["Juraj","Jason","Nicolas"],`) and make a new release. This will allow multiple users to submit.
+
+---
+
+### How do I transfer ownership of a haxelib?  
+Haxelib only sees contributors, so you can add the new "owner" and remove the old one and make a new release.  
+
+---
+
+### How to make a haxelib.json file?  
+Check out [creating a haxelib package](/documentation/creating-a-haxelib-package/). 
+
+---
+
+### How do I validate my haxelib.json file?  
+If you want to be sure if the haxelib json file is correct, try using `haxelib submit`. This will validate if the data is correct. Press ctrl+c to terminate the actual submission.  
+
+---
+
+### How do I get a readme/changelog/license tab on my haxelib project page?  
+Add a "README.md", "CHANGELOG.md" and/or "LICENSE.md" markdown file in your zip file that is submitted.
+
+---
+
+### Why doesn't my project have stats graph?  
+The project stats graph is only shown when the project has more than one release.
+
+---
+
+### How do I remove my haxelib?  
+At the moment there is no way to remove a library from the registry, because this could break existing projects. If there serious issues like vulnerabilities or copyright infringements, please contact contact@haxe.orgs with the emailaddress of your account.  
+
+---
+
+### Where can I report haxelib issues? 
+Go to <https://github.com/HaxeFoundation/haxelib/issues>.
diff --git a/extra/haxelib_src/www/documentation-files/haxelibs-in-projects.md b/extra/haxelib_src/www/documentation-files/haxelibs-in-projects.md
new file mode 100644
index 0000000000000000000000000000000000000000..8bc3148f6144f550e32064701e594d2d08744726
--- /dev/null
+++ b/extra/haxelib_src/www/documentation-files/haxelibs-in-projects.md
@@ -0,0 +1,30 @@
+# Adding libraries to Haxe projects
+
+When the haxelib is installed, it is ready to be used it code. This is a matter of adding `--library libraryname` (or `-L libraryname`) to the [compiler arguments](https://haxe.org/manual/compiler-usage.html).
+
+```
+haxe --main Main --library libraryname --js bin/main.js
+```
+
+The same parameters you pass to the compiler can be stored in a [hxml file](https://haxe.org/manual/compiler-usage-hxml.html):
+
+```
+--main Main
+--library libraryname
+--js bin/main.js
+```
+<hr/>
+
+## Using Haxelib in OpenFL
+
+When using OpenFL, add `<haxelib />` tags in the project.xml to include Haxe libraries:
+
+```xml
+<haxelib name="actuate" />
+```
+
+To specify a version:
+
+```xml
+<haxelib name="actuate" version="1.0.0" />
+```
diff --git a/extra/haxelib_src/www/documentation-files/index.md b/extra/haxelib_src/www/documentation-files/index.md
index 6445b5b20ad6b495e51c44f12a4d7930fe386197..7f78691eb385d682a7941363fb8c36a995bf4f58 100644
--- a/extra/haxelib_src/www/documentation-files/index.md
+++ b/extra/haxelib_src/www/documentation-files/index.md
@@ -6,7 +6,7 @@ A basic Haxe library is a collection of `.hx` files. That is, libraries are dist
 
 ### Using with Haxe
 
-Any installed Haxe library can be made available to the compiler through the `-lib <library-name>` argument. This is very similiar to the `-cp <path>` argument, but expects a library name instead of a directory path. These commands are explained thoroughly in [Compiler Usage](http://haxe.org/manual/compiler-usage.html).
+Any installed Haxe library can be made available to the compiler through the `--library <library-name>` (or `-L <library-name>`) argument. This is very similiar to the `--class-path <path>` argument, but expects a library name instead of a directory path. These commands are explained thoroughly in [Compiler Usage](http://haxe.org/manual/compiler-usage.html).
 
 For our exemplary usage we chose a very simple Haxe library called "random". It provides a set of static convenience methods to achieve various random effects, such as picking a random element from an array.
 
@@ -19,6 +19,6 @@ class Main {
 }
 ```
 
-Compiling this without any `-lib` argument causes an error message along the lines of `Unknown identifier : Random`. This shows that installed Haxe libraries are not available to the compiler by default unless they are explicitly added. A working command line for above program is `haxe -lib random -main Main --interp`.
+Compiling this without any `--library` argument causes an error message along the lines of `Unknown identifier : Random`. This shows that installed Haxe libraries are not available to the compiler by default unless they are explicitly added. A working command line for above program is `haxe --library random --main Main --interp`.
 
 If the compiler emits an error `Error: Library random is not installed : run 'haxelib install random'` the library has to be installed via the `haxelib` command first. As the error message suggests, this is achieved through `haxelib install random`. We will learn more about the `haxelib` command in [Using Haxelib](/documentation/using-haxelib/).
diff --git a/extra/haxelib_src/www/documentation-files/per-project-setup.md b/extra/haxelib_src/www/documentation-files/per-project-setup.md
index d8fcf99ba5d439c7bd5f8c0f4a8461b0f21ed12e..bd0306c5b009209857c9b4bbc250b7aaa6aa603c 100644
--- a/extra/haxelib_src/www/documentation-files/per-project-setup.md
+++ b/extra/haxelib_src/www/documentation-files/per-project-setup.md
@@ -1,7 +1,3 @@
-TODO: this needs editing and adding to the website
-
-
-
 ## Per-project setup
 
 Currently haxelib has two ways to have project local setups.
@@ -11,16 +7,15 @@ Currently haxelib has two ways to have project local setups.
 
 ### Using haxelib newrepo
 
-When using `haxelib newrepo` you can have a project-local haxelib repository. This feature is quite new and a little rough around the edges.
+When using `haxelib newrepo` you can have a project-local haxelib repository.
 
 Caveats:
 
 - libraries get downloaded for each project
-- if you mistakenly run a haxelib command in a subdirectory of your project, it will be executed on the global repo ([to be fixed](https://github.com/HaxeFoundation/haxelib/issues/292))
 
 ### Using haxelib install all
 
-Haxe allows you to define specific versions of the libraries you want to use with `-lib <libname>:<version>`. If you make sure to use this in all your hxmls, then `haxelib install all --always` (the `--always` avoiding you being prompted for confirmation) will be able to ensure the libraries your project needs are available in the necessary versions. If in fact you run this in a checkout hook, your get to track your dependencies in your git repo (some other VCSs should allow for a similar setup), allowing you to have a well defined and replicable setup for any state (commit/branch/etc.).
+Haxe allows you to define specific versions of the libraries you want to use with `--library <libname>:<version>`. If you make sure to use this in all your hxmls, then `haxelib install all --always` (the `--always` avoiding you being prompted for confirmation) will be able to ensure the libraries your project needs are available in the necessary versions. If in fact you run this in a checkout hook, your get to track your dependencies in your git repo (some other VCSs should allow for a similar setup), allowing you to have a well defined and replicable setup for any state (commit/branch/etc.).
 
 Disadvantages:
 
@@ -32,9 +27,10 @@ Advantages:
 - as pointed out above, this approach allows defining a *versionable* and *replicable* state.
 - you don't have to download libraries for each project, which does make a difference for heavy weights like openfl and hxcpp
 
-#### Sidestepping haxelib git issues
+#### Using haxelib with git versions
 
-Because you cannot specify git versions with `-lib` paremeters, we suggest using git submodules instead, as again they provide an adequate way of definining a *versionable* and *replicable* state.
+You can specify git versions with `--library libname:git:https://github.com/user/repo#branch` branch can be a branch or a specific commit SHA.
+As alternative, you might use git submodules instead, they also provide an adequate way of definining a *versionable* and *replicable* state.
 
 ### Combining both approaches
 
diff --git a/extra/haxelib_src/www/documentation-files/using-haxelib.md b/extra/haxelib_src/www/documentation-files/using-haxelib.md
index cf5251f58fb25825a0bb3a963b0d8fd653eec2ce..72bc75f9028b09c1c7a76c626b4e35da239d5b93 100644
--- a/extra/haxelib_src/www/documentation-files/using-haxelib.md
+++ b/extra/haxelib_src/www/documentation-files/using-haxelib.md
@@ -1,6 +1,6 @@
 # Using Haxelib
 
-If the `haxelib` command is executed without any arguments, it prints an exhaustive list of all available arguments. 
+If the `haxelib` command is executed without any arguments, it prints an exhaustive list of all available arguments.
 
 The following commands are available:
 
@@ -24,6 +24,7 @@ The following commands are available:
     <li><a href="#user">user</a></li>
     <li><a href="#config">config</a></li>
     <li><a href="#path">path</a></li>
+    <li><a href="#libpath">libpath</a></li>
     <li><a href="#version">version</a></li>
     <li><a href="#help">help</a></li>
   </ul>
@@ -77,98 +78,123 @@ The following commands are available:
 </div>
 </div>
 
+Also, following environment variables affect haxelib behavior if set:
 
-<a name="basic" class="anch"></a>
-
-## Basic
+<div class="row">
+<div class="span3">
+  <h4><a href="#environment_variables">Environment variables</a></h4>
+  <ul>
+    <li><a href="#HAXELIB_NO_SSL">HAXELIB_NO_SSL</a></li>
+    <li><a href="#HAXELIB_REMOTE">HAXELIB_REMOTE</a></li>
+  </ul>
+</div>
+</div>
 
+<a name="basic" class="anch"></a>
 
+# Basic
 
 <a name="install" class="anch"></a>
 
-#### `haxelib install`
+## haxelib install
 
+Installs the given project. You can optionally specify a specific version to be installed. By default, latest released version will be installed.
 
+### haxelib install [project-name]
+Installs latests released version of the library.
 ```
-haxelib install [project-name] [version]
-haxelib install actuate         # Install latest version
-haxelib install actuate 1.8.2   # Install specific version
+haxelib install actuate
 ```
 
-> Install the given project. You can optionally specify a specific version to be installed. By default, latest released version will be installed.
-
+### haxelib install [project-name] [version]
+Installs a specific version of the library.
 ```
-haxelib install [library-file]
-haxelib install actuate.zip     # Install from zip file
+haxelib install actuate 1.8.2
 ```
 
-> Install the project contained in the zip file.
-
+### haxelib install all
+Install all dependencies in all hxml files
 ```
-haxelib install [hxml-file]
-haxelib install build.hxml      # Install all dependencies listed in hxml file
+haxelib install all
 ```
 
-> Install all the dependencies from a hxml file.
+### haxelib install [hxml-file]
+Install all dependencies listed in hxml file
 
 ```
-haxelib install all             # Install all dependencies in all hxml files
+haxelib install build.hxml
 ```
 
-> Install all the dependencies from all hxml files in the current directory.
-
+### haxelib install [library-file]
 
+Install the project contained in the zip file.
+```
+haxelib install actuate.zip
+```
 
 <a name="update" class="anch"></a>
 
-#### `haxelib update`
+## haxelib update [project-name]
 
+Update a single library to the latest version.
 ```
-haxelib update [project-name]
 haxelib update minject
 ```
 
-> Update a single library to the latest version.
+### haxelib update
 
+Update all the installed projects to their latest version. This command prompts a confirmation for each updating project.
 ```
 haxelib update
 ```
 
-> Update all the installed projects to their latest version. This command prompts a confirmation for each updating project.
 
+<a name="remove" class="anch"></a>
 
+## haxelib remove
 
-<a name="remove" class="anch"></a>
+Remove a complete project or only a specified version if specified.
+Note: this doesn't remove the library from the registry but from the machine it is installed on.
 
-#### `haxelib remove`
 
+### haxelib remove [project-name]
+Remove all versions of the project
 ```
-haxelib remove [project-name] [version]
-haxelib remove format            # Remove all versions
-haxelib remove format 3.1.2      # Remove the specified version
+haxelib remove format
 ```
 
-> Remove a complete project or only a specified version if specified.
-
+### haxelib remove [project-name] [version]
 
+Remove the specified version
+```
+haxelib remove format 3.1.2
+```
 
 <a name="list" class="anch"></a>
 
-#### `haxelib list`
+## haxelib list [search]
+
+List all the installed projects and their versions. For each project, the version surrounded by brackets is the current one.
+
+### haxelib list
 
+
+List all installed projects
 ```
-haxelib list [search]
-haxelib list                     # List all installed projects
-haxelib list ufront              # List all projects with "ufront" in their name
+haxelib list
 ```
 
-> List all the installed projects and their versions. For each project, the version surrounded by brackets is the current one.
+### haxelib list [search]
 
+List all projects with "ufront" in their name
+```
+haxelib list ufront
+```
 
 
 <a name="set" class="anch"></a>
 
-#### `haxelib set`
+### haxelib set
 
 ```
 haxelib set [project-name] [version]
@@ -181,13 +207,13 @@ haxelib set tink_core 1.0.0-rc.8
 
 <a name="information" class="anch"></a>
 
-## Information
+# Information
 
 
 
 <a name="search" class="anch"></a>
 
-#### `haxelib search`
+### haxelib search
 
 ```
 haxelib search [word]
@@ -200,7 +226,7 @@ haxelib search tween
 
 <a name="info" class="anch"></a>
 
-#### `haxelib info`
+### haxelib info
 
 ```
 haxelib info [project-name]
@@ -213,7 +239,7 @@ haxelib info openfl
 
 <a name="user" class="anch"></a>
 
-#### `haxelib user`
+### haxelib user
 
 ```
 haxelib user [user-name]
@@ -226,7 +252,7 @@ haxelib user jason
 
 <a name="config" class="anch"></a>
 
-#### `haxelib config`
+### haxelib config
 
 ```
 haxelib config
@@ -240,7 +266,7 @@ haxelib config
 
 <a name="path" class="anch"></a>
 
-#### `haxelib path`
+### haxelib path
 
 ```
 haxelib path [project-name[:version]...]
@@ -249,8 +275,19 @@ haxelib path hscript:2.0.0
 haxelib path hscript erazor buddy
 haxelib path hscript erazor buddy:1.0.0
 ```
+Example output :
+```
+haxelib path openfl hxcpp format
+--macro openfl._internal.utils.ExtraParams.include()
+/usr/local/lib/haxe/lib/openfl/6.5.3/
+-D openfl=6.5.3
+/usr/local/lib/haxe/lib/hxcpp/git/
+-D hxcpp=3.4.0
+/usr/local/lib/haxe/lib/format/3,3,0/
+-D format=3.3.0
+```
 
-> Prints the path to one or more libraries, as well as any dependencies and compiler definitions required by those libraries.
+> Prints the source paths to one or more libraries, as well as any dependencies and compiler definitions required by those libraries.
 >
 > You can specify a version by appending `:version` to the library name. If no version is specified the set version is used.
 >
@@ -260,9 +297,36 @@ haxelib path hscript erazor buddy:1.0.0
 
 
 
+<a name="libpath" class="anch"></a>
+
+### haxelib libpath
+
+```
+haxelib libpath [project-name[:version]...]
+haxelib libpath hscript
+haxelib libpath hscript:2.0.0
+haxelib libpath hscript erazor buddy
+haxelib libpath hscript erazor buddy:1.0.0
+```
+Example output :
+```
+haxelib libpath hxcpp format hscript
+/usr/local/lib/haxe/lib/hxcpp/git/
+/usr/local/lib/haxe/lib/format/3,3,0/
+/usr/local/lib/haxe/lib/hxcpp/2,1,1/
+```
+
+> Prints the root path of one or more libraries. Will output 1 path per line.
+>
+> You can specify a version by appending `:version` to the library name. If no version is specified the set version is used.
+>
+> If a [development](#dev) version is set it'll be used even if a version is specified.
+
+
+
 <a name="version" class="anch"></a>
 
-#### `haxelib version`
+### haxelib version
 
 ```
 haxelib version
@@ -276,7 +340,7 @@ haxelib version
 
 <a name="help" class="anch"></a>
 
-#### `haxelib help`
+### haxelib help
 
 ```
 haxelib help
@@ -288,18 +352,18 @@ haxelib help
 
 <a name="development" class="anch"></a>
 
-## Development
+# Development
 
 
 
 <a name="submit" class="anch"></a>
 
-#### `haxelib submit`
+## haxelib submit
 
 ```
 haxelib submit [project.zip]
 haxelib submit detox.zip
-haxelib sumbit
+haxelib submit
 ```
 
 > Submits a zip package to Haxelib so other users can install it.
@@ -316,7 +380,7 @@ haxelib sumbit
 
 <a name="register" class="anch"></a>
 
-#### `haxelib register`
+### haxelib register
 
 ```
 haxelib register [username] [email] [fullname] [password] [passwordconfirmation]
@@ -330,7 +394,7 @@ haxelib register [username] [email] [fullname] [password] [passwordconfirmation]
 
 <a name="dev" class="anch"></a>
 
-#### `haxelib dev`
+### haxelib dev
 
 ```
 haxelib dev [project-name] [directory]
@@ -348,7 +412,7 @@ haxelib dev starling                     # Cancel dev, use installed version.
 
 <a name="git" class="anch"></a>
 
-#### `haxelib git`
+### haxelib git
 
 ```
 haxelib git [project-name] [git-clone-path] [branch]
@@ -367,7 +431,7 @@ haxelib git minject git@github.com:massiveinteractive/minject.git v2          #
 
 <a name="hg" class="anch"></a>
 
-#### `haxelib hg`
+### haxelib hg
 
 ```
 haxelib hg [project-name] [mercurial-clone-path] [branch]
@@ -381,13 +445,13 @@ haxelib hg [project-name] [mercurial-clone-path] [branch]
 
 <a name="miscellaneous" class="anch"></a>
 
-## Miscellaneous
+# Miscellaneous
 
 
 
 <a name="setup" class="anch"></a>
 
-#### `haxelib setup`
+### haxelib setup
 
 ```
 haxelib setup [path]
@@ -401,7 +465,7 @@ haxelib setup [path]
 
 <a name="newrepo" class="anch"></a>
 
-#### `haxelib newrepo`
+### haxelib newrepo
 
 ```
 haxelib newrepo
@@ -417,7 +481,7 @@ haxelib newrepo
 
 <a name="deleterepo" class="anch"></a>
 
-#### `haxelib deleterepo`
+### haxelib deleterepo
 
 ```
 haxelib deleterepo
@@ -431,7 +495,7 @@ haxelib deleterepo
 
 <a name="convertxml" class="anch"></a>
 
-#### `haxelib convertxml`
+### haxelib convertxml
 
 ```
 haxelib convertxml
@@ -442,7 +506,7 @@ haxelib convertxml
 
 <a name="run" class="anch"></a>
 
-#### `haxelib run`
+### haxelib run
 
 ```
 haxelib run [project-name[:version]] [parameters]
@@ -461,7 +525,7 @@ haxelib run openfl create DisplayingABitmap
 
 <a name="proxy" class="anch"></a>
 
-#### `haxelib proxy`
+### haxelib proxy
 
 ```
 haxelib proxy [host port [username password]]
@@ -488,7 +552,7 @@ otherwise they'll be passed as arguments to the library.
 
 <a name="flat" class="anch"></a>
 
-#### `haxelib --flat`
+### haxelib --flat
 
 ```
 haxelib --flat
@@ -500,7 +564,7 @@ haxelib --flat
 
 <a name="always" class="anch"></a>
 
-#### `haxelib --always`
+### haxelib --always
 
 ```
 haxelib --always
@@ -512,7 +576,7 @@ haxelib --always
 
 <a name="system" class="anch"></a>
 
-#### `haxelib --system`
+### haxelib --system
 
 ```
 haxelib --system
@@ -526,7 +590,7 @@ haxelib --system
 
 <a name="debug" class="anch"></a>
 
-#### `haxelib --debug`
+### haxelib --debug
 
 ```
 haxelib --debug
@@ -538,7 +602,7 @@ haxelib --debug
 
 <a name="quiet" class="anch"></a>
 
-#### `haxelib --quiet`
+### haxelib --quiet
 
 ```
 haxelib --quiet
@@ -550,7 +614,7 @@ haxelib --quiet
 
 <a name="never" class="anch"></a>
 
-#### `haxelib --never`
+### haxelib --never
 
 ```
 haxelib --never
@@ -562,7 +626,7 @@ haxelib --never
 
 <a name="global" class="anch"></a>
 
-#### `haxelib --global`
+### haxelib --global
 
 ```
 haxelib --global
@@ -574,7 +638,7 @@ haxelib --global
 
 <a name="parameters" class="anch"></a>
 
-## Parameters
+# Parameters
 
 
 
@@ -585,7 +649,7 @@ otherwise they'll be passed as arguments to the library.
 
 <a name="cwd" class="anch"></a>
 
-#### `haxelib -cwd`
+### haxelib -cwd
 
 ```
 haxelib -cwd [dir]
@@ -597,7 +661,7 @@ haxelib -cwd [dir]
 
 <a name="notimeout" class="anch"></a>
 
-#### `haxelib -no-timeout`
+### haxelib -no-timeout
 
 ```
 haxelib -no-timeout
@@ -609,10 +673,25 @@ haxelib -no-timeout
 
 <a name="R" class="anch"></a>
 
-#### `haxelib -R`
+### haxelib -R
 
 ```
 haxelib -R [host:port[/dir]]
 ```
 
 > Allow the usage of a custom Haxelib server instead of `lib.haxe.org`.
+
+<a name="environment_variables" class="anch"></a>
+
+# Environment Variables
+
+<a name="HAXELIB_NO_SSL" class="anch"></a>
+
+## HAXELIB_NO_SSL
+
+If `HAXELIB_NO_SSL` is set to `1` or `true`, then haxelib client will use http instead of https.
+
+## HAXELIB_REMOTE
+
+`HAXELIB_REMOTE` may contain a url to a custom Haxelib server instead of `https://lib.haxe.org/`.
+However, if <a href="#R">-R</a> command line argument is provided, then `HAXELIB_REMOTE` is ignored.
\ No newline at end of file
diff --git a/extra/haxelib_src/www/package-lock.json b/extra/haxelib_src/www/package-lock.json
new file mode 100644
index 0000000000000000000000000000000000000000..19e76d732fd17662acd17a32e41909315bb599a5
--- /dev/null
+++ b/extra/haxelib_src/www/package-lock.json
@@ -0,0 +1,1686 @@
+{
+  "name": "haxelib-server",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "ansi-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+      "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
+      "dev": true
+    },
+    "bl": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.6",
+        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.2",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.2"
+          }
+        }
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "buffer": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz",
+      "integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=",
+      "dev": true,
+      "requires": {
+        "base64-js": "0.0.8",
+        "ieee754": "1.1.12",
+        "isarray": "1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        }
+      }
+    },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc-unsafe": "1.1.0",
+        "buffer-fill": "1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        }
+      }
+    },
+    "caw": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
+      "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
+      "dev": true,
+      "requires": {
+        "get-proxy": "2.1.0",
+        "isurl": "1.0.0",
+        "tunnel-agent": "0.6.0",
+        "url-to-options": "1.0.1"
+      }
+    },
+    "cliui": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+      "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "2.1.1",
+        "strip-ansi": "4.0.0",
+        "wrap-ansi": "2.1.0"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+      "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+      "dev": true,
+      "requires": {
+        "graceful-readlink": "1.0.1"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "config-chain": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
+      "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
+      "dev": true,
+      "requires": {
+        "ini": "1.3.5",
+        "proto-list": "1.2.4"
+      }
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+      "dev": true
+    },
+    "copyfiles": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.0.0.tgz",
+      "integrity": "sha512-NSSJdwCH27/hEiBlhkXYWh3AaPo8IATxLX5XtJQgknOvOehrREtETsGd/BNr2vuj0URgKBC/50PNRM3yShQGJQ==",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "noms": "0.0.0",
+        "through2": "2.0.3",
+        "yargs": "11.1.0"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.3",
+        "shebang-command": "1.2.0",
+        "which": "1.3.1"
+      }
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "1.0.2"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decompress": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz",
+      "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "4.1.1",
+        "decompress-tarbz2": "4.1.1",
+        "decompress-targz": "4.1.1",
+        "decompress-unzip": "4.0.1",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.3.0",
+        "pify": "2.3.0",
+        "strip-dirs": "2.1.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "1.0.1"
+      }
+    },
+    "decompress-tar": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
+      "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+      "dev": true,
+      "requires": {
+        "file-type": "5.2.0",
+        "is-stream": "1.1.0",
+        "tar-stream": "1.6.1"
+      }
+    },
+    "decompress-tarbz2": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
+      "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "4.1.1",
+        "file-type": "6.2.0",
+        "is-stream": "1.1.0",
+        "seek-bzip": "1.0.5",
+        "unbzip2-stream": "1.2.5"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
+          "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
+          "dev": true
+        }
+      }
+    },
+    "decompress-targz": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
+      "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "4.1.1",
+        "file-type": "5.2.0",
+        "is-stream": "1.1.0"
+      }
+    },
+    "decompress-unzip": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
+      "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
+      "dev": true,
+      "requires": {
+        "file-type": "3.9.0",
+        "get-stream": "2.3.1",
+        "pify": "2.3.0",
+        "yauzl": "2.10.0"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
+          "dev": true
+        },
+        "get-stream": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
+          "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
+          "dev": true,
+          "requires": {
+            "object-assign": "4.1.1",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "download": {
+      "version": "6.2.5",
+      "resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz",
+      "integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==",
+      "dev": true,
+      "requires": {
+        "caw": "2.0.1",
+        "content-disposition": "0.5.2",
+        "decompress": "4.2.0",
+        "ext-name": "5.0.0",
+        "file-type": "5.2.0",
+        "filenamify": "2.1.0",
+        "get-stream": "3.0.0",
+        "got": "7.1.0",
+        "make-dir": "1.3.0",
+        "p-event": "1.3.0",
+        "pify": "3.0.0"
+      }
+    },
+    "download-cli": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/download-cli/-/download-cli-1.1.1.tgz",
+      "integrity": "sha512-Q8NPjnYKGYLKTzmS8QyrLz9QbDat17WKkIc21lzNxhUotsAweaSSjh1f/Lp50k1Tpc86/6ikFtGoHRrsuWFAfA==",
+      "dev": true,
+      "requires": {
+        "download": "6.2.5",
+        "meow": "3.7.0"
+      }
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "5.1.0",
+        "get-stream": "3.0.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
+      }
+    },
+    "ext-list": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
+      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.35.0"
+      }
+    },
+    "ext-name": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
+      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+      "dev": true,
+      "requires": {
+        "ext-list": "2.2.2",
+        "sort-keys-length": "1.0.1"
+      }
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
+      "requires": {
+        "pend": "1.2.0"
+      }
+    },
+    "file-type": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+      "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+      "dev": true
+    },
+    "filename-reserved-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
+      "dev": true
+    },
+    "filenamify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
+      "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
+      "dev": true,
+      "requires": {
+        "filename-reserved-regex": "2.0.0",
+        "strip-outer": "1.0.1",
+        "trim-repeated": "1.0.0"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "requires": {
+        "locate-path": "2.0.0"
+      }
+    },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
+      "dev": true
+    },
+    "get-proxy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
+      "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
+      "dev": true,
+      "requires": {
+        "npm-conf": "1.1.3"
+      }
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "got": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+      "dev": true,
+      "requires": {
+        "decompress-response": "3.3.0",
+        "duplexer3": "0.1.4",
+        "get-stream": "3.0.0",
+        "is-plain-obj": "1.1.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "isurl": "1.0.0",
+        "lowercase-keys": "1.0.1",
+        "p-cancelable": "0.3.0",
+        "p-timeout": "1.2.1",
+        "safe-buffer": "5.1.2",
+        "timed-out": "4.0.1",
+        "url-parse-lax": "1.0.0",
+        "url-to-options": "1.0.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "has-symbol-support-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+      "dev": true
+    },
+    "has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "dev": true,
+      "requires": {
+        "has-symbol-support-x": "1.4.2"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "dev": true
+    },
+    "ieee754": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "1.1.1"
+      }
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-natural-number": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
+      "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
+      "dev": true
+    },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+      "dev": true
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "is-retry-allowed": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isurl": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "dev": true,
+      "requires": {
+        "has-to-string-tag-x": "1.4.1",
+        "is-object": "1.0.1"
+      }
+    },
+    "jquery": {
+      "version": "1.12.4",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-1.12.4.tgz",
+      "integrity": "sha1-AeHfuikP5z3rp3zurLD5ui/sngw=",
+      "dev": true
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "1.0.0"
+      }
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
+      }
+    },
+    "make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
+      "requires": {
+        "pify": "3.0.0"
+      }
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "1.2.0"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.4.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "mime-db": {
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==",
+      "dev": true
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
+    },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "1.1.11"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "noms": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz",
+      "integrity": "sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "1.0.34"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "2.7.1",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.5.0",
+        "validate-npm-package-license": "3.0.3"
+      }
+    },
+    "npm-conf": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+      "dev": true,
+      "requires": {
+        "config-chain": "1.1.11",
+        "pify": "3.0.0"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "2.0.1"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "os-locale": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+      "dev": true,
+      "requires": {
+        "execa": "0.7.0",
+        "lcid": "1.0.0",
+        "mem": "1.1.0"
+      }
+    },
+    "p-cancelable": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
+      "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
+      "dev": true
+    },
+    "p-event": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz",
+      "integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=",
+      "dev": true,
+      "requires": {
+        "p-timeout": "1.2.1"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "requires": {
+        "p-try": "1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "1.3.0"
+      }
+    },
+    "p-timeout": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
+      "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
+      "dev": true,
+      "requires": {
+        "p-finally": "1.0.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "1.3.2"
+      }
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
+    },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "2.0.1"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "0.0.1",
+        "string_decoder": "0.10.31"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
+      }
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "1.0.2"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "seek-bzip": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
+      "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
+      "dev": true,
+      "requires": {
+        "commander": "2.8.1"
+      }
+    },
+    "semver": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+      "dev": true
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "1.1.0"
+      }
+    },
+    "sort-keys-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
+      "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
+      "dev": true,
+      "requires": {
+        "sort-keys": "1.1.2"
+      }
+    },
+    "spdx-correct": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
+      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "3.0.0",
+        "spdx-license-ids": "3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "2.1.0",
+        "spdx-license-ids": "3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
+      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "2.0.0",
+        "strip-ansi": "4.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "3.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "0.2.1"
+      }
+    },
+    "strip-dirs": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
+      "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
+      "dev": true,
+      "requires": {
+        "is-natural-number": "4.0.1"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1"
+      }
+    },
+    "strip-outer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
+    "tar-stream": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz",
+      "integrity": "sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==",
+      "dev": true,
+      "requires": {
+        "bl": "1.2.2",
+        "buffer-alloc": "1.2.0",
+        "end-of-stream": "1.4.1",
+        "fs-constants": "1.0.0",
+        "readable-stream": "2.3.6",
+        "to-buffer": "1.1.1",
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.2",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.2"
+          }
+        }
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.6",
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.2",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.2"
+          }
+        }
+      }
+    },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true
+    },
+    "to-buffer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
+      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
+      "dev": true
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
+    "trim-repeated": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "unbzip2-stream": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz",
+      "integrity": "sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==",
+      "dev": true,
+      "requires": {
+        "buffer": "3.6.0",
+        "through": "2.3.8"
+      }
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "1.0.4"
+      }
+    },
+    "url-to-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
+      "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "3.0.0",
+        "spdx-expression-parse": "3.0.0"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
+      "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
+      "dev": true,
+      "requires": {
+        "cliui": "4.1.0",
+        "decamelize": "1.2.0",
+        "find-up": "2.1.0",
+        "get-caller-file": "1.0.2",
+        "os-locale": "2.1.0",
+        "require-directory": "2.1.1",
+        "require-main-filename": "1.0.1",
+        "set-blocking": "2.0.0",
+        "string-width": "2.1.1",
+        "which-module": "2.0.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "9.0.2"
+      }
+    },
+    "yargs-parser": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+      "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "4.1.0"
+      }
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "fd-slicer": "1.1.0"
+      }
+    }
+  }
+}
diff --git a/extra/haxelib_src/www/package.json b/extra/haxelib_src/www/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..ce9831a6e7612e10e847a929a995309c36935172
--- /dev/null
+++ b/extra/haxelib_src/www/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "haxelib-server",
+  "description": "Haxelib server",
+  "scripts": {
+    "postinstall": "download https://stackpath.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js --out js && download https://stackpath.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css --out css && copyfiles -f node_modules/jquery/dist/jquery.min.js js"
+  },
+  "keywords": [],
+  "author": "Haxe Foundation",
+  "license": "MIT",
+  "private": true,
+  "devDependencies": {
+    "copyfiles": "^2.0.0",
+    "download-cli": "^1.1.1",
+    "jquery": "^1.12.4"
+  },
+  "dependencies": {}
+}
diff --git a/extra/haxelib_src/www/robots.txt b/extra/haxelib_src/www/robots.txt
index 27a4026cc864b002397e8402be430eaf3cc0a9d1..bee18f1e091eeab38e5343ff2506ff6f140bf62d 100644
--- a/extra/haxelib_src/www/robots.txt
+++ b/extra/haxelib_src/www/robots.txt
@@ -1,7 +1,1078 @@
 User-agent: *
 Disallow: /api/
-Disallow: /bower_components/
 Disallow: /files/
 Disallow: /tmp/
 Disallow: /p/*/*/files/
+Disallow: /p/*/*/raw-files/
 Disallow: /p/*/*/download/
+
+
+# https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/blob/V3.2018.06.1119/robots.txt/robots.txt
+
+### Version Information #
+###################################################
+### Version: V3.2018.06.1119
+### Updated: Thu Jun 28 16:29:29 SAST 2018
+### Bad Bot Count: 528
+###################################################
+### Version Information ##
+
+User-agent: *
+Disallow: /wp-admin/
+Allow: /wp-admin/admin-ajax.php
+User-agent: 360Spider
+Disallow:/
+User-agent: 404checker
+Disallow:/
+User-agent: 404enemy
+Disallow:/
+User-agent: 80legs
+Disallow:/
+User-agent: Abonti
+Disallow:/
+User-agent: Aboundex
+Disallow:/
+User-agent: Acunetix
+Disallow:/
+User-agent: ADmantX
+Disallow:/
+User-agent: AfD-Verbotsverfahren
+Disallow:/
+User-agent: AhrefsBot
+Disallow:/
+User-agent: AIBOT
+Disallow:/
+User-agent: AiHitBot
+Disallow:/
+User-agent: Aipbot
+Disallow:/
+User-agent: Alexibot
+Disallow:/
+User-agent: Alligator
+Disallow:/
+User-agent: AllSubmitter
+Disallow:/
+User-agent: AlphaBot
+Disallow:/
+User-agent: Anarchie
+Disallow:/
+User-agent: Apexoo
+Disallow:/
+User-agent: ASPSeek
+Disallow:/
+User-agent: Asterias
+Disallow:/
+User-agent: Attach
+Disallow:/
+User-agent: autoemailspider
+Disallow:/
+User-agent: BackDoorBot
+Disallow:/
+User-agent: Backlink-Ceck
+Disallow:/
+User-agent: backlink-check
+Disallow:/
+User-agent: BacklinkCrawler
+Disallow:/
+User-agent: BackStreet
+Disallow:/
+User-agent: BackWeb
+Disallow:/
+User-agent: Badass
+Disallow:/
+User-agent: Bandit
+Disallow:/
+User-agent: Barkrowler
+Disallow:/
+User-agent: BatchFTP
+Disallow:/
+User-agent: Battleztar Bazinga
+Disallow:/
+User-agent: BBBike
+Disallow:/
+User-agent: BDCbot
+Disallow:/
+User-agent: BDFetch
+Disallow:/
+User-agent: BetaBot
+Disallow:/
+User-agent: Bigfoot
+Disallow:/
+User-agent: Bitacle
+Disallow:/
+User-agent: Blackboard
+Disallow:/
+User-agent: Black Hole
+Disallow:/
+User-agent: BlackWidow
+Disallow:/
+User-agent: BLEXBot
+Disallow:/
+User-agent: Blow
+Disallow:/
+User-agent: BlowFish
+Disallow:/
+User-agent: Boardreader
+Disallow:/
+User-agent: Bolt
+Disallow:/
+User-agent: BotALot
+Disallow:/
+User-agent: Brandprotect
+Disallow:/
+User-agent: Brandwatch
+Disallow:/
+User-agent: Bubing
+Disallow:/
+User-agent: Buddy
+Disallow:/
+User-agent: BuiltBotTough
+Disallow:/
+User-agent: BuiltWith
+Disallow:/
+User-agent: Bullseye
+Disallow:/
+User-agent: BunnySlippers
+Disallow:/
+User-agent: BuzzSumo
+Disallow:/
+User-agent: Calculon
+Disallow:/
+User-agent: CATExplorador
+Disallow:/
+User-agent: CazoodleBot
+Disallow:/
+User-agent: CCBot
+Disallow:/
+User-agent: Cegbfeieh
+Disallow:/
+User-agent: CheeseBot
+Disallow:/
+User-agent: CherryPicker
+Disallow:/
+User-agent: ChinaClaw
+Disallow:/
+User-agent: Chlooe
+Disallow:/
+User-agent: Claritybot
+Disallow:/
+User-agent: Cliqzbot
+Disallow:/
+User-agent: Cloud mapping
+Disallow:/
+User-agent: coccocbot-web
+Disallow:/
+User-agent: Cogentbot
+Disallow:/
+User-agent: cognitiveseo
+Disallow:/
+User-agent: Collector
+Disallow:/
+User-agent: com.plumanalytics
+Disallow:/
+User-agent: Copier
+Disallow:/
+User-agent: CopyRightCheck
+Disallow:/
+User-agent: Copyscape
+Disallow:/
+User-agent: Cosmos
+Disallow:/
+User-agent: Craftbot
+Disallow:/
+User-agent: crawler4j
+Disallow:/
+User-agent: crawler.feedback
+Disallow:/
+User-agent: CrazyWebCrawler
+Disallow:/
+User-agent: Crescent
+Disallow:/
+User-agent: CSHttp
+Disallow:/
+User-agent: Curious
+Disallow:/
+User-agent: Custo
+Disallow:/
+User-agent: DatabaseDriverMysqli
+Disallow:/
+User-agent: DataCha0s
+Disallow:/
+User-agent: DBLBot
+Disallow:/
+User-agent: demandbase-bot
+Disallow:/
+User-agent: Demon
+Disallow:/
+User-agent: Deusu
+Disallow:/
+User-agent: Devil
+Disallow:/
+User-agent: Digincore
+Disallow:/
+User-agent: DigitalPebble
+Disallow:/
+User-agent: DIIbot
+Disallow:/
+User-agent: Dirbuster
+Disallow:/
+User-agent: Disco
+Disallow:/
+User-agent: Discobot
+Disallow:/
+User-agent: Discoverybot
+Disallow:/
+User-agent: DittoSpyder
+Disallow:/
+User-agent: DnyzBot
+Disallow:/
+User-agent: DomainAppender
+Disallow:/
+User-agent: DomainCrawler
+Disallow:/
+User-agent: DomainSigmaCrawler
+Disallow:/
+User-agent: DomainStatsBot
+Disallow:/
+User-agent: Dotbot
+Disallow:/
+User-agent: Download Wonder
+Disallow:/
+User-agent: Dragonfly
+Disallow:/
+User-agent: Drip
+Disallow:/
+User-agent: DTS Agent
+Disallow:/
+User-agent: EasyDL
+Disallow:/
+User-agent: Ebingbong
+Disallow:/
+User-agent: eCatch
+Disallow:/
+User-agent: ECCP/1.0
+Disallow:/
+User-agent: Ecxi
+Disallow:/
+User-agent: EirGrabber
+Disallow:/
+User-agent: EMail Siphon
+Disallow:/
+User-agent: EMail Wolf
+Disallow:/
+User-agent: EroCrawler
+Disallow:/
+User-agent: evc-batch
+Disallow:/
+User-agent: Evil
+Disallow:/
+User-agent: Exabot
+Disallow:/
+User-agent: Express WebPictures
+Disallow:/
+User-agent: ExtLinksBot
+Disallow:/
+User-agent: Extractor
+Disallow:/
+User-agent: ExtractorPro
+Disallow:/
+User-agent: Extreme Picture Finder
+Disallow:/
+User-agent: EyeNetIE
+Disallow:/
+User-agent: Ezooms
+Disallow:/
+User-agent: FDM
+Disallow:/
+User-agent: FemtosearchBot
+Disallow:/
+User-agent: FHscan
+Disallow:/
+User-agent: Fimap
+Disallow:/
+User-agent: Firefox/7.0
+Disallow:/
+User-agent: FlashGet
+Disallow:/
+User-agent: Flunky
+Disallow:/
+User-agent: Foobot
+Disallow:/
+User-agent: Freeuploader
+Disallow:/
+User-agent: FrontPage
+Disallow:/
+User-agent: Fyrebot
+Disallow:/
+User-agent: GalaxyBot
+Disallow:/
+User-agent: Genieo
+Disallow:/
+User-agent: GermCrawler
+Disallow:/
+User-agent: Getintent
+Disallow:/
+User-agent: GetRight
+Disallow:/
+User-agent: GetWeb
+Disallow:/
+User-agent: Gigablast
+Disallow:/
+User-agent: Gigabot
+Disallow:/
+User-agent: G-i-g-a-b-o-t
+Disallow:/
+User-agent: Go-Ahead-Got-It
+Disallow:/
+User-agent: Gotit
+Disallow:/
+User-agent: GoZilla
+Disallow:/
+User-agent: Go!Zilla
+Disallow:/
+User-agent: Grabber
+Disallow:/
+User-agent: GrabNet
+Disallow:/
+User-agent: Grafula
+Disallow:/
+User-agent: GrapeFX
+Disallow:/
+User-agent: GrapeshotCrawler
+Disallow:/
+User-agent: GridBot
+Disallow:/
+User-agent: GT::WWW
+Disallow:/
+User-agent: Haansoft
+Disallow:/
+User-agent: HaosouSpider
+Disallow:/
+User-agent: Harvest
+Disallow:/
+User-agent: Havij
+Disallow:/
+User-agent: HEADMasterSEO
+Disallow:/
+User-agent: Heritrix
+Disallow:/
+User-agent: Hloader
+Disallow:/
+User-agent: HMView
+Disallow:/
+User-agent: HTMLparser
+Disallow:/
+User-agent: HTTP::Lite
+Disallow:/
+User-agent: HTTrack
+Disallow:/
+User-agent: Humanlinks
+Disallow:/
+User-agent: HybridBot
+Disallow:/
+User-agent: Iblog
+Disallow:/
+User-agent: IDBot
+Disallow:/
+User-agent: Id-search
+Disallow:/
+User-agent: IlseBot
+Disallow:/
+User-agent: Image Fetch
+Disallow:/
+User-agent: Image Sucker
+Disallow:/
+User-agent: IndeedBot
+Disallow:/
+User-agent: Indy Library
+Disallow:/
+User-agent: InfoNaviRobot
+Disallow:/
+User-agent: InfoTekies
+Disallow:/
+User-agent: instabid
+Disallow:/
+User-agent: Intelliseek
+Disallow:/
+User-agent: InterGET
+Disallow:/
+User-agent: Internet Ninja
+Disallow:/
+User-agent: InternetSeer
+Disallow:/
+User-agent: internetVista monitor
+Disallow:/
+User-agent: ips-agent
+Disallow:/
+User-agent: Iria
+Disallow:/
+User-agent: IRLbot
+Disallow:/
+User-agent: Iskanie
+Disallow:/
+User-agent: IstellaBot
+Disallow:/
+User-agent: JamesBOT
+Disallow:/
+User-agent: Jbrofuzz
+Disallow:/
+User-agent: JennyBot
+Disallow:/
+User-agent: JetCar
+Disallow:/
+User-agent: JikeSpider
+Disallow:/
+User-agent: JOC Web Spider
+Disallow:/
+User-agent: Joomla
+Disallow:/
+User-agent: Jorgee
+Disallow:/
+User-agent: JustView
+Disallow:/
+User-agent: Jyxobot
+Disallow:/
+User-agent: Kenjin Spider
+Disallow:/
+User-agent: Keyword Density
+Disallow:/
+User-agent: Kozmosbot
+Disallow:/
+User-agent: Lanshanbot
+Disallow:/
+User-agent: Larbin
+Disallow:/
+User-agent: LeechFTP
+Disallow:/
+User-agent: LeechGet
+Disallow:/
+User-agent: LexiBot
+Disallow:/
+User-agent: Lftp
+Disallow:/
+User-agent: LibWeb
+Disallow:/
+User-agent: Libwhisker
+Disallow:/
+User-agent: Lightspeedsystems
+Disallow:/
+User-agent: Likse
+Disallow:/
+User-agent: Linkdexbot
+Disallow:/
+User-agent: LinkextractorPro
+Disallow:/
+User-agent: LinkpadBot
+Disallow:/
+User-agent: LinkScan
+Disallow:/
+User-agent: LinksManager
+Disallow:/
+User-agent: LinkWalker
+Disallow:/
+User-agent: LinqiaMetadataDownloaderBot
+Disallow:/
+User-agent: LinqiaRSSBot
+Disallow:/
+User-agent: LinqiaScrapeBot
+Disallow:/
+User-agent: Lipperhey
+Disallow:/
+User-agent: Litemage_walker
+Disallow:/
+User-agent: Lmspider
+Disallow:/
+User-agent: LNSpiderguy
+Disallow:/
+User-agent: Ltx71
+Disallow:/
+User-agent: lwp-request
+Disallow:/
+User-agent: LWP::Simple
+Disallow:/
+User-agent: lwp-trivial
+Disallow:/
+User-agent: Magnet
+Disallow:/
+User-agent: Mag-Net
+Disallow:/
+User-agent: magpie-crawler
+Disallow:/
+User-agent: Mail.RU_Bot
+Disallow:/
+User-agent: Majestic12
+Disallow:/
+User-agent: MarkMonitor
+Disallow:/
+User-agent: MarkWatch
+Disallow:/
+User-agent: Masscan
+Disallow:/
+User-agent: Mass Downloader
+Disallow:/
+User-agent: Mata Hari
+Disallow:/
+User-agent: MauiBot
+Disallow:/
+User-agent: Meanpathbot
+Disallow:/
+User-agent: mediawords
+Disallow:/
+User-agent: MegaIndex.ru
+Disallow:/
+User-agent: Metauri
+Disallow:/
+User-agent: MFC_Tear_Sample
+Disallow:/
+User-agent: Microsoft Data Access
+Disallow:/
+User-agent: Microsoft URL Control
+Disallow:/
+User-agent: MIDown tool
+Disallow:/
+User-agent: MIIxpc
+Disallow:/
+User-agent: Mister PiX
+Disallow:/
+User-agent: MJ12bot
+Disallow:/
+User-agent: Mojeek
+Disallow:/
+User-agent: Morfeus Fucking Scanner
+Disallow:/
+User-agent: Mr.4x3
+Disallow:/
+User-agent: MSFrontPage
+Disallow:/
+User-agent: MSIECrawler
+Disallow:/
+User-agent: Msrabot
+Disallow:/
+User-agent: MS Web Services Client Protocol
+Disallow:/
+User-agent: muhstik-scan
+Disallow:/
+User-agent: Musobot
+Disallow:/
+User-agent: Name Intelligence
+Disallow:/
+User-agent: Nameprotect
+Disallow:/
+User-agent: Navroad
+Disallow:/
+User-agent: NearSite
+Disallow:/
+User-agent: Needle
+Disallow:/
+User-agent: Nessus
+Disallow:/
+User-agent: NetAnts
+Disallow:/
+User-agent: Netcraft
+Disallow:/
+User-agent: netEstate NE Crawler
+Disallow:/
+User-agent: NetLyzer
+Disallow:/
+User-agent: NetMechanic
+Disallow:/
+User-agent: NetSpider
+Disallow:/
+User-agent: Nettrack
+Disallow:/
+User-agent: Net Vampire
+Disallow:/
+User-agent: Netvibes
+Disallow:/
+User-agent: NetZIP
+Disallow:/
+User-agent: NextGenSearchBot
+Disallow:/
+User-agent: Nibbler
+Disallow:/
+User-agent: NICErsPRO
+Disallow:/
+User-agent: Niki-bot
+Disallow:/
+User-agent: Nikto
+Disallow:/
+User-agent: NimbleCrawler
+Disallow:/
+User-agent: Ninja
+Disallow:/
+User-agent: Nmap
+Disallow:/
+User-agent: NPbot
+Disallow:/
+User-agent: Nutch
+Disallow:/
+User-agent: oBot
+Disallow:/
+User-agent: Octopus
+Disallow:/
+User-agent: Offline Explorer
+Disallow:/
+User-agent: Offline Navigator
+Disallow:/
+User-agent: Openfind
+Disallow:/
+User-agent: OpenLinkProfiler
+Disallow:/
+User-agent: Openvas
+Disallow:/
+User-agent: OrangeBot
+Disallow:/
+User-agent: OrangeSpider
+Disallow:/
+User-agent: OutclicksBot
+Disallow:/
+User-agent: OutfoxBot
+Disallow:/
+User-agent: PageAnalyzer
+Disallow:/
+User-agent: Page Analyzer
+Disallow:/
+User-agent: PageGrabber
+Disallow:/
+User-agent: page scorer
+Disallow:/
+User-agent: PageScorer
+Disallow:/
+User-agent: Panscient
+Disallow:/
+User-agent: Papa Foto
+Disallow:/
+User-agent: Pavuk
+Disallow:/
+User-agent: pcBrowser
+Disallow:/
+User-agent: PECL::HTTP
+Disallow:/
+User-agent: PeoplePal
+Disallow:/
+User-agent: PHPCrawl
+Disallow:/
+User-agent: Picscout
+Disallow:/
+User-agent: Picsearch
+Disallow:/
+User-agent: PictureFinder
+Disallow:/
+User-agent: Pimonster
+Disallow:/
+User-agent: Pi-Monster
+Disallow:/
+User-agent: Pixray
+Disallow:/
+User-agent: PleaseCrawl
+Disallow:/
+User-agent: plumanalytics
+Disallow:/
+User-agent: Pockey
+Disallow:/
+User-agent: POE-Component-Client-HTTP
+Disallow:/
+User-agent: Probethenet
+Disallow:/
+User-agent: ProPowerBot
+Disallow:/
+User-agent: ProWebWalker
+Disallow:/
+User-agent: Psbot
+Disallow:/
+User-agent: Pump
+Disallow:/
+User-agent: PxBroker
+Disallow:/
+User-agent: PyCurl
+Disallow:/
+User-agent: QueryN Metasearch
+Disallow:/
+User-agent: Quick-Crawler
+Disallow:/
+User-agent: RankActive
+Disallow:/
+User-agent: RankActiveLinkBot
+Disallow:/
+User-agent: RankFlex
+Disallow:/
+User-agent: RankingBot
+Disallow:/
+User-agent: RankingBot2
+Disallow:/
+User-agent: Rankivabot
+Disallow:/
+User-agent: RankurBot
+Disallow:/
+User-agent: RealDownload
+Disallow:/
+User-agent: Reaper
+Disallow:/
+User-agent: RebelMouse
+Disallow:/
+User-agent: Recorder
+Disallow:/
+User-agent: RedesScrapy
+Disallow:/
+User-agent: ReGet
+Disallow:/
+User-agent: RepoMonkey
+Disallow:/
+User-agent: Ripper
+Disallow:/
+User-agent: RocketCrawler
+Disallow:/
+User-agent: Rogerbot
+Disallow:/
+User-agent: SalesIntelligent
+Disallow:/
+User-agent: SBIder
+Disallow:/
+User-agent: ScanAlert
+Disallow:/
+User-agent: Scanbot
+Disallow:/
+User-agent: scan.lol
+Disallow:/
+User-agent: Scrapy
+Disallow:/
+User-agent: Screaming
+Disallow:/
+User-agent: ScreenerBot
+Disallow:/
+User-agent: Searchestate
+Disallow:/
+User-agent: SearchmetricsBot
+Disallow:/
+User-agent: Semrush
+Disallow:/
+User-agent: SemrushBot
+Disallow:/
+User-agent: SEOkicks
+Disallow:/
+User-agent: SEOlyticsCrawler
+Disallow:/
+User-agent: Seomoz
+Disallow:/
+User-agent: SEOprofiler
+Disallow:/
+User-agent: seoscanners
+Disallow:/
+User-agent: SEOstats
+Disallow:/
+User-agent: sexsearcher
+Disallow:/
+User-agent: Seznam
+Disallow:/
+User-agent: SeznamBot
+Disallow:/
+User-agent: Shodan
+Disallow:/
+User-agent: Siphon
+Disallow:/
+User-agent: SISTRIX
+Disallow:/
+User-agent: Sitebeam
+Disallow:/
+User-agent: SiteExplorer
+Disallow:/
+User-agent: Siteimprove
+Disallow:/
+User-agent: SiteLockSpider
+Disallow:/
+User-agent: SiteSnagger
+Disallow:/
+User-agent: SiteSucker
+Disallow:/
+User-agent: Site Sucker
+Disallow:/
+User-agent: Sitevigil
+Disallow:/
+User-agent: Slackbot-LinkExpanding
+Disallow:/
+User-agent: SlySearch
+Disallow:/
+User-agent: SmartDownload
+Disallow:/
+User-agent: SMTBot
+Disallow:/
+User-agent: Snake
+Disallow:/
+User-agent: Snapbot
+Disallow:/
+User-agent: Snoopy
+Disallow:/
+User-agent: SocialRankIOBot
+Disallow:/
+User-agent: Sogou web spider
+Disallow:/
+User-agent: Sosospider
+Disallow:/
+User-agent: Sottopop
+Disallow:/
+User-agent: SpaceBison
+Disallow:/
+User-agent: Spammen
+Disallow:/
+User-agent: SpankBot
+Disallow:/
+User-agent: Spanner
+Disallow:/
+User-agent: Spbot
+Disallow:/
+User-agent: Spinn3r
+Disallow:/
+User-agent: SputnikBot
+Disallow:/
+User-agent: Sqlmap
+Disallow:/
+User-agent: Sqlworm
+Disallow:/
+User-agent: Sqworm
+Disallow:/
+User-agent: Steeler
+Disallow:/
+User-agent: Stripper
+Disallow:/
+User-agent: Sucker
+Disallow:/
+User-agent: Sucuri
+Disallow:/
+User-agent: SuperBot
+Disallow:/
+User-agent: SuperHTTP
+Disallow:/
+User-agent: Surfbot
+Disallow:/
+User-agent: SurveyBot
+Disallow:/
+User-agent: Suzuran
+Disallow:/
+User-agent: Swiftbot
+Disallow:/
+User-agent: sysscan
+Disallow:/
+User-agent: Szukacz
+Disallow:/
+User-agent: T0PHackTeam
+Disallow:/
+User-agent: T8Abot
+Disallow:/
+User-agent: tAkeOut
+Disallow:/
+User-agent: Teleport
+Disallow:/
+User-agent: TeleportPro
+Disallow:/
+User-agent: Telesoft
+Disallow:/
+User-agent: Telesphoreo
+Disallow:/
+User-agent: Telesphorep
+Disallow:/
+User-agent: The Intraformant
+Disallow:/
+User-agent: TheNomad
+Disallow:/
+User-agent: TightTwatBot
+Disallow:/
+User-agent: Titan
+Disallow:/
+User-agent: Toata
+Disallow:/
+User-agent: Toweyabot
+Disallow:/
+User-agent: Trendiction
+Disallow:/
+User-agent: Trendictionbot
+Disallow:/
+User-agent: trendiction.com
+Disallow:/
+User-agent: trendiction.de
+Disallow:/
+User-agent: True_Robot
+Disallow:/
+User-agent: Turingos
+Disallow:/
+User-agent: Turnitin
+Disallow:/
+User-agent: TurnitinBot
+Disallow:/
+User-agent: TwengaBot
+Disallow:/
+User-agent: Twice
+Disallow:/
+User-agent: Typhoeus
+Disallow:/
+User-agent: UnisterBot
+Disallow:/
+User-agent: URLy.Warning
+Disallow:/
+User-agent: URLy Warning
+Disallow:/
+User-agent: Vacuum
+Disallow:/
+User-agent: Vagabondo
+Disallow:/
+User-agent: VB Project
+Disallow:/
+User-agent: VCI
+Disallow:/
+User-agent: VeriCiteCrawler
+Disallow:/
+User-agent: VidibleScraper
+Disallow:/
+User-agent: Virusdie
+Disallow:/
+User-agent: VoidEYE
+Disallow:/
+User-agent: Voil
+Disallow:/
+User-agent: Voltron
+Disallow:/
+User-agent: Wallpapers/3.0
+Disallow:/
+User-agent: WallpapersHD
+Disallow:/
+User-agent: WASALive-Bot
+Disallow:/
+User-agent: WBSearchBot
+Disallow:/
+User-agent: Webalta
+Disallow:/
+User-agent: WebAuto
+Disallow:/
+User-agent: Web Auto
+Disallow:/
+User-agent: WebBandit
+Disallow:/
+User-agent: WebCollage
+Disallow:/
+User-agent: Web Collage
+Disallow:/
+User-agent: WebCopier
+Disallow:/
+User-agent: WEBDAV
+Disallow:/
+User-agent: WebEnhancer
+Disallow:/
+User-agent: Web Enhancer
+Disallow:/
+User-agent: WebFetch
+Disallow:/
+User-agent: Web Fetch
+Disallow:/
+User-agent: WebFuck
+Disallow:/
+User-agent: Web Fuck
+Disallow:/
+User-agent: WebGo IS
+Disallow:/
+User-agent: WebImageCollector
+Disallow:/
+User-agent: WebLeacher
+Disallow:/
+User-agent: WebmasterWorldForumBot
+Disallow:/
+User-agent: webmeup-crawler
+Disallow:/
+User-agent: WebPix
+Disallow:/
+User-agent: Web Pix
+Disallow:/
+User-agent: WebReaper
+Disallow:/
+User-agent: WebSauger
+Disallow:/
+User-agent: Web Sauger
+Disallow:/
+User-agent: Webshag
+Disallow:/
+User-agent: WebsiteExtractor
+Disallow:/
+User-agent: WebsiteQuester
+Disallow:/
+User-agent: Website Quester
+Disallow:/
+User-agent: Webster
+Disallow:/
+User-agent: WebStripper
+Disallow:/
+User-agent: WebSucker
+Disallow:/
+User-agent: Web Sucker
+Disallow:/
+User-agent: WebWhacker
+Disallow:/
+User-agent: WebZIP
+Disallow:/
+User-agent: WeSEE
+Disallow:/
+User-agent: Whack
+Disallow:/
+User-agent: Whacker
+Disallow:/
+User-agent: Whatweb
+Disallow:/
+User-agent: Who.is Bot
+Disallow:/
+User-agent: Widow
+Disallow:/
+User-agent: WinHTTrack
+Disallow:/
+User-agent: WiseGuys Robot
+Disallow:/
+User-agent: WISENutbot
+Disallow:/
+User-agent: Wonderbot
+Disallow:/
+User-agent: Woobot
+Disallow:/
+User-agent: Wotbox
+Disallow:/
+User-agent: Wprecon
+Disallow:/
+User-agent: WPScan
+Disallow:/
+User-agent: WWW-Collector-E
+Disallow:/
+User-agent: WWW-Mechanize
+Disallow:/
+User-agent: WWW::Mechanize
+Disallow:/
+User-agent: WWWOFFLE
+Disallow:/
+User-agent: x09Mozilla
+Disallow:/
+User-agent: x22Mozilla
+Disallow:/
+User-agent: Xaldon_WebSpider
+Disallow:/
+User-agent: Xaldon WebSpider
+Disallow:/
+User-agent: Xenu
+Disallow:/
+User-agent: xpymep1.exe
+Disallow:/
+User-agent: YoudaoBot
+Disallow:/
+User-agent: Zade
+Disallow:/
+User-agent: Zauba
+Disallow:/
+User-agent: zauba.io
+Disallow:/
+User-agent: Zermelo
+Disallow:/
+User-agent: Zeus
+Disallow:/
+User-agent: zgrab
+Disallow:/
+User-agent: Zitebot
+Disallow:/
+User-agent: ZmEu
+Disallow:/
+User-agent: ZumBot
+Disallow:/
+User-agent: ZyBorg
+Disallow:/
diff --git a/extra/haxelib_src/www/view/home/homepage.html b/extra/haxelib_src/www/view/home/homepage.html
index d2b11ddd48e0f55529d43eb2c4bdf7e9a4a4bfc9..eefb07fd16508ea7e18cfac749f30f223cb0a2ac 100644
--- a/extra/haxelib_src/www/view/home/homepage.html
+++ b/extra/haxelib_src/www/view/home/homepage.html
@@ -7,13 +7,13 @@
 			</h1>
 			<hr/>
 			<form action="/search/" method="GET" class="form-search">
-        <div class="control-group">
-          <div class="controls">
-              <span class="add-on"><i class="icon-envelope"></i></span>
-              <input type="search" name="v" class="input-xxlarge search-query" style="width:75%" placeholder="Search Haxe libraries..." />
-              <input type="submit" class="btn btn-default" value="Search" />
-          </div>
-        </div>
+				<div class="control-group">
+				  <div class="controls">
+					  <span class="add-on"><i class="icon-envelope"></i></span>
+					  <input type="search" name="v" class="input-xxlarge search-query" style="width:75%" placeholder="Search Haxe libraries..." />
+					  <input type="submit" class="btn btn-default" value="Search" />
+				  </div>
+				</div>
 			</form>
 			<hr/>
 			<p class="lead">
@@ -26,92 +26,97 @@
 </div>
 <div class="section homepage">
 	<div class="container">
-			<div class="btn-toolbar">
-				<a class="btn btn-default btn-large" href="/all/"><i class="fa fa-star"></i> <strong>View all Haxelibs</strong></a>
-				<a class="btn btn-default btn-large" href="/t/"><i class="fa fa-tags"></i> Browse by tag</a>
-				<a class="btn btn-default btn-large" href="/u/"><i class="fa fa-user"></i> Browse by author</a>
-				<a class="btn btn-default btn-large" href="/documentation/">Documentation</a>
-			</div>
-    <hr/>
-			<!-- <div class="col-md-5">
-				<h4><i class="fa fa-star"></i> Featured Project</h4>
-				<h5><a href="/p/munit/">munit</a></h5>
-				<p class="lead">MassiveUnit, or munit, is a full featured unit testing framework by Massive Interactive.</p>
-				<p>With support for AS3, JS, Neko and CPP, automatic test importers, support for ignoring tests, asynchronous tests and more, it's a great library.</p>
-				<pre><code>haxelib install munit</code></pre>
-				<div class="btn-toolbar">
-					<a class="btn btn-primary" href="/p/munit/">View project page</a>
-					<a class="btn btn-default" href="#">View older featured projects</a>
-				</div>
-			</div> -->
-		<div class="row">
-			<div class="span3">
-				<h3><i class="fa fa-tags"></i> Popular tags</h3>
-				<ul class="tags unstyled">
-					@for( t in tags ) {
-						<li><i class="tag tag-inline"></i> <a href="/t/@t.tag/"><strong>@escape(t.tag)</strong> <span class="badge">@t.count</span></a></li>
+		<div class="btn-toolbar">
+			<a class="btn btn-default btn-large" href="/all/"><i class="fa fa-star"></i> <strong>View all Haxelibs</strong></a>
+			<a class="btn btn-default btn-large" href="/t/"><i class="fa fa-tags"></i> Browse by tag</a>
+			<a class="btn btn-default btn-large" href="/u/"><i class="fa fa-user"></i> Browse by author</a>
+			<a class="btn btn-default btn-large" href="/recent/"><i class="fa fa-paperclip"></i> Recent library updates</a>
+			<a class="btn btn-default btn-large" href="/documentation/">Learn Haxelib</a>
+		</div>
+		<hr/>
+		
+		<div class="tags unstyled">
+			@for( t in tags ) {
+				<span class="tag tag-inline"><i class="fa fa-tags"></i> <a href="/t/@t.tag/"><strong>@escape(t.tag)</strong></a>&nbsp;<small>(@t.count)</small></span>
+			}
+		</div>
+		<hr/>
+		
+		<h1><i class="fa fa-paperclip"></i> Recently updated</h1>
+		<div class="row popular-libs-list">
+			@for( i in 0...3) {
+			<div class="span4">
+				@for( update in latestProjects(i * 4, 4) ) {
+					@if(update != null) {
+					<p>
+						<strong class="title"><a href="/p/@update.p.name/">@update.p.name</a></strong><br/>
+						<small class="description">
+							@if (update.v.comments !=null && update.v.comments.length>0){<em>@escape(update.v.comments)</em><br />}
+							<a href="/p/@update.p.name/@update.v.name">@update.v.name</a> &nbsp;<span title="@update.v.date">updated @formatDate(update.v.date)</span>
+						</small>
+					</p>
 					}
-				</ul>
+				}
 			</div>
-			<div class="span5">
-				<h3><i class="fa fa-paperclip"></i> Recently updated</h3>
-				<div>
-					@for( update in latestProjects ) {
+			}
+		</div>
+		
+		<a class="btn btn-large" href="/recent/">See <strong>more recent updates</strong></a>
+			
+		<hr/>
+		
+		<h1><i class="fa fa-star"></i> Popular libraries</h1>
+		<div class="row popular-libs-list">
+			@for( i in 0...3) {
+			<div class="span4">
+				@{var popular = popularProjects(i * 2, 2);}
+				@for (j in 0...popular.length) {
+					@{var p = popular[j];}
+					@if(p != null) {
 						<p>
-							<strong><a href="/p/@update.p.name/@update.v.name/">@update.p.name</a>:</strong> @escape(update.p.description)
-							<br /><strong>@update.v.name:</strong> @escape(update.v.comments) 
+							<strong class="title"><a href="/p/@p.name/">@p.name</a></strong><br/> by <a href="/u/@p.author/">@p.author</a><br/>
+							<em class="description">@escape(p.description)</em><br/>
+							<small>
+								<a href="/p/@p.name/@p.version.toSemver()">@p.version.toSemver()</a> &nbsp;<span title="@p.version.date">published @formatDate(p.version.date)</span> <br/>
+								<strong>@p.downloads downloads</strong>
+							</small>
+							<div class="btn-toolbar">
+								<a class="btn btn-default" href="/p/@p.name/"><i class="fa fa-star"></i> View project page</a>
+							</div>
 						</p>
+						@if(j<1){<hr/>}
 					}
-				</div>
+				}
 			</div>
-			<div class="span4">
-				<h3><i class="fa fa-user"></i> Popular contributors</h3>
-				<div>
-					@for( u in users ) {
+			}
+		</div>
+		
+		<a class="btn btn-large" href="/all/">See <strong>all haxelibs</strong></a>
+		<hr/>
+		
+		<h1><i class="fa fa-user"></i> Popular contributors</h1>
+		<br/>
+		<div class="row contributors-list">
+			@for( i in 0...4) {
+			<div class="span3">
+				@for( u in users(i*4, 4) ) {
+					@if (u != null){
 						<p class="user">
-							<img src="//www.gravatar.com/avatar/@(u.emailHash).jpg?s=150" class="img-circle" width="48" height="48" alt="Avatar of @u.user.name" />
+							<img src="//www.gravatar.com/avatar/@(u.emailHash).jpg?s=144" class="img-circle" width="48" height="48" alt="Avatar of @u.user.name" />
 							<strong><a href="/u/@u.user.name/">@u.user.fullname</a></strong><br/><small>(@u.projects.length&nbsp;projects)</small>
 						</p>
 					}
+				}
 				</div>
-			</div>
-
-		</div>
-        
-    <hr/>
-    
-    <h4><strong>Many libraries are just one <code>haxelib install</code> away.</strong> This example demonstrates some of <a href="/documentation/using-haxelib/">all haxelib commands</a>.</h4>
-    
-    <pre class="example"><code>@exampleCode</code></pre>
-        
-    <hr/>
-	</div>
-</div>
-<div class="section info">
-	<div class="container">
-    
-	<div class="row">
-		<div class="span4">
-			<h3><i class="fa fa-big fa-rocket"></i> All libraries are free</h3>
-			<p>Every month, more than thousand developers use haxelib to find, share, and reuse code — and assemble it in powerful new ways.
-			Enjoy Haxe; It is great!</p>
-		</div>
-		<div class="span4">
-			<h3><i class="fa fa-big fa-gears"></i> Explore Haxe</h3>
-			<p>
-				<p><i class="fa fa-external-link"></i> <a href="https://haxe.org/manual">Haxe Manual</a></p>
-				<p><i class="fa fa-external-link"></i> <a href="https://code.haxe.org">Haxe Code Cookbook</a></p>
-				<p><i class="fa fa-external-link"></i> <a href="https://api.haxe.org">Haxe API documentation</a></p>
-				<p>You can try Haxe in the browser! <a href="https://try.haxe.org">try.haxe.org</a></p>
-			</p>
-		</div>
-		<div class="span4">
-			<h3><i class="fa fa-big fa-globe"></i> Join us on Github!</h3>
-			<p>Haxe is being developed on GitHub. Feel free to contribute or report issues to our projects.</p>
-			<p><i class="fa fa-github"></i> <a href="https://github.com/HaxeFoundation/">Haxe on Github</a></p>
+			}
 		</div>
+		<a class="btn btn-large" href="/u/">See <strong>all contributors</strong></a>
+		
+		<hr/>
+		
+		<h4><strong>Many libraries are just one <code>haxelib install</code> away.</strong> This example demonstrates some of <a href="/documentation/using-haxelib/">all haxelib commands</a>.</h4>
+		
+		<pre class="example"><code>@exampleCode</code></pre>
+			
 	</div>
-    
-    
-  </div>
 </div>
\ No newline at end of file
diff --git a/extra/haxelib_src/www/view/home/projectList.html b/extra/haxelib_src/www/view/home/projectList.html
index 9121cbcd566bb3bfe53ede0dd4511e909eb0421a..c181af9ca6983bd23f5faf00aab2a0f6dbef8e1a 100644
--- a/extra/haxelib_src/www/view/home/projectList.html
+++ b/extra/haxelib_src/www/view/home/projectList.html
@@ -1,6 +1,18 @@
 <h1><i class="fa @icon"></i> @title</h1>
 <p class="lead">@description</p>
 
+<center class="well">
+	<form action="/search/" method="GET" class="form-search">
+		<div class="control-group">
+		  <div class="controls">
+			  <span class="add-on"><i class="icon-envelope"></i></span>
+			  <input type="search" name="v" class="input-xxlarge search-query" style="width:75%" placeholder="Search Haxe libraries..." />
+			  <input type="submit" class="btn btn-default" value="Search" />
+		  </div>
+		</div>
+	</form>
+</center>
+	
 <table class="table table-compact table-hover project-list">
 	<thead>
 		<tr>
@@ -18,7 +30,7 @@
 					<br/><small><a href="/u/@p.author/">@@@p.author</a></small>
 				</th>
 				<td>@p.description</td>
-				<td>@p.version</td>
+				<td>@p.version.name<br/><small title="@p.version.date">@formatDate(p.version.date)</small></td>
 				<td>@p.downloads</td>
 			</tr>
 		}
diff --git a/extra/haxelib_src/www/view/home/recent.html b/extra/haxelib_src/www/view/home/recent.html
new file mode 100644
index 0000000000000000000000000000000000000000..25a3f8099b1c8f5d83ba76087f0c34950a0fa064
--- /dev/null
+++ b/extra/haxelib_src/www/view/home/recent.html
@@ -0,0 +1,39 @@
+<h1><i class="fa fa-paperclip"></i> Latest updates</h1>
+<p class="lead">@description</p>
+
+<center class="well">
+	<form action="/search/" method="GET" class="form-search">
+		<div class="control-group">
+		  <div class="controls">
+			  <span class="add-on"><i class="icon-envelope"></i></span>
+			  <input type="search" name="v" class="input-xxlarge search-query" style="width:75%" placeholder="Search Haxe libraries..." />
+			  <input type="submit" class="btn btn-default" value="Search" />
+		  </div>
+		</div>
+	</form>
+</center>
+
+@{ var prevDate = null;}
+<table class="table table-compact table-hover project-list">
+@for (update in projects) {
+	@{ var curDate = formatDate(update.v.date); }
+	@if(prevDate != curDate) { 
+		<tr><td colspan="3" style="border:0"><h2>@curDate</h2></td></tr>
+		<tr>
+			<th>Project</th>
+			<th>Changes</th>
+			<th>Version</th>
+		</tr>
+	} 
+	<tr>
+		<th>
+			<a href="/p/@update.p.name/">@update.p.name</a>
+			<!--br/><small><a href="/u/@update.p.author/">@@@update.p.author</a></small-->
+		</th>
+		<td>@if (update.v.comments != null && update.v.comments.length > 0){<em>@escape(update.v.comments)</em>}</td>
+		<td>@update.v.name<br/><small title="@formatDate(update.v.date)">@formatDate(update.v.date, true)</small></td>
+	</tr>
+
+	@{prevDate = curDate;}
+}
+</table>
diff --git a/extra/haxelib_src/www/view/home/search.html b/extra/haxelib_src/www/view/home/search.html
index 133421e9bbbfe276b4d25c012b90ee8c6f3a9834..d5a2efda2bda10e7cbe1048d8ebe4ac59008e379 100644
--- a/extra/haxelib_src/www/view/home/search.html
+++ b/extra/haxelib_src/www/view/home/search.html
@@ -1,19 +1,18 @@
 <h1><i class="fa fa-search"></i> @title</h1>
-
-
-<form action="/search/" method="GET" class="form-search">
-  <div class="control-group">
-    <div class="controls">
-        <span class="add-on"><i class="icon-envelope"></i></span>
-        <input type="search" name="v" class="input-xxlarge search-query" style="width:75%" placeholder="Search Haxe libraries..." />
-        <input type="submit" class="btn btn-default" value="Search" />
-    </div>
-  </div>
-</form>
-
-  
 <p class="lead">@description</p>
 
+<center class="well">
+	<form action="/search/" method="GET" class="form-search">
+		<div class="control-group">
+		  <div class="controls">
+			  <span class="add-on"><i class="icon-envelope"></i></span>
+			  <input type="search" name="v" class="input-xxlarge search-query" style="width:75%" placeholder="Search Haxe libraries..." />
+			  <input type="submit" class="btn btn-default" value="Search" />
+		  </div>
+		</div>
+	</form>
+</center>
+
 @if (projects!=null && projects.length>0) {
 	<table class="table table-compact table-hover">
 		<thead>
@@ -32,7 +31,7 @@
 						<br/><small>(By <a href="/u/@p.author/">@@@p.author</a>)</small>
 					</th>
 					<td>@p.description</td>
-					<td>@p.version</td>
+					<td>@p.version.name<br/><small title="@p.version.date">@formatDate(p.version.date)</small></td>
 					<td>@p.downloads</td>
 				</tr>
 			}
@@ -41,8 +40,7 @@
 
 }
 else if (projects!=null && projects.length==0) {
-	<p>No search results found.</p>
-<br/>
+	<p class="alert alert-warning">No search results found.</p>
 }
 
 <br/>
@@ -53,4 +51,7 @@ else if (projects!=null && projects.length==0) {
 	</a>
 </p>
 <br/>
-<br/>
+
+@if (projects!=null && projects.length==0) {
+<p style="height:200px;">&nbsp;</p>
+}
diff --git a/extra/haxelib_src/www/view/home/tagList.html b/extra/haxelib_src/www/view/home/tagList.html
index 59f069d7111e2844e33255072a33e79eb33a040f..81e2697b49e51980afc14d3cb5fe0326faf41cc8 100644
--- a/extra/haxelib_src/www/view/home/tagList.html
+++ b/extra/haxelib_src/www/view/home/tagList.html
@@ -1,21 +1,51 @@
 
+<h1><i class="fa fa-tag"></i> @title</h1>
+<p class="lead">@description</p>
 
+<center class="well">
+	<form action="/search/" method="GET" class="form-search">
+		<div class="control-group">
+		  <div class="controls">
+			  <span class="add-on"><i class="icon-envelope"></i></span>
+			  <input type="search" name="v" class="input-xxlarge search-query" style="width:75%" placeholder="Search Haxe libraries..." />
+			  <input type="submit" class="btn btn-default" value="Search" />
+		  </div>
+		</div>
+	</form>
+</center>
+	
 <div class="row">
 	<div class="span3">
     <h2>All Tags</h2>
 		<ul class="tags unstyled">
-				@for (t in tags) {
-					<li class="tag"><i class="fa fa-tag"></i> <a href="/t/@t.tag/">@escape(t.tag)</a> <small>(@t.count)</small></li>
-				}
+			@for (t in tags) {
+				<li class="tag"><i class="fa fa-tag"></i> <a href="/t/@t.tag/">@escape(t.tag)</a> <small>(@t.count)</small></li>
+			}
 		</ul>
 	</div>
 	<div class="span9">
-		<h1><i class="fa fa-tag"></i> @title</h1>
-		<p class="lead">@description</p>
-		<div class="tag-cloud text-center">
-			@for (t in tagCloud) {
-				<a href="/t/@t.tag/" style="font-size: @(t.size)px">@escape(t.tag)</a>
+		<div class="tag-list"> 
+			@for (i in 0...min(tags.length, 10)) {
+				@{var t = tags[i];}
+				<h3><a href="/t/@t.tag/"><small class="fa fa-tag"></small> @escape(t.tag)</a></h3>
+				<div class="row">
+					@for( i in 0...3) {
+					<div class="span3">
+						@for( p in taggedProjects(t.tag, i * 3, 3) ) {
+							<p>
+								<strong class="title"><a href="/p/@p.name/">@p.name</a></strong><br/>
+								<small>
+									<a href="/p/@p.name/@p.version.name">@p.version.name</a> &nbsp;<span title="@p.version.date">updated @formatDate(p.version.date)</span>
+								</small>
+							</p>
+						}
+					</div>
+					}
+				</div>
+				<a href="/t/@t.tag/" class="btn">More haxelibs tagged with "@escape(t.tag)" <small>(@t.count)</small></a>
+				<hr/>
 			}
 		</div>
 	</div>
 </div>
+ 
\ No newline at end of file
diff --git a/extra/haxelib_src/www/view/home/tagProjectList.html b/extra/haxelib_src/www/view/home/tagProjectList.html
index 8684d1f3fffd53fcc8671f4b88daf60b815c9bd4..eb1d675e7fb65e1712a5ed434f3eb954e74c8bed 100644
--- a/extra/haxelib_src/www/view/home/tagProjectList.html
+++ b/extra/haxelib_src/www/view/home/tagProjectList.html
@@ -1,4 +1,19 @@
 
+<h1><i class="fa @icon"></i> Tagged with <em>@currentTag</em></h1>
+<p class="lead">@description</p>
+
+<center class="well">
+	<form action="/search/" method="GET" class="form-search">
+		<div class="control-group">
+		  <div class="controls">
+			  <span class="add-on"><i class="icon-envelope"></i></span>
+			  <input type="search" name="v" class="input-xxlarge search-query" style="width:75%" placeholder="Search Haxe libraries..." />
+			  <input type="submit" class="btn btn-default" value="Search" />
+		  </div>
+		</div>
+	</form>
+</center>
+	
 <div class="row">
 	<div class="span3">
     <h2>All Tags</h2>
@@ -9,8 +24,6 @@
 		</ul>
 	</div>
 	<div class="span9">
-		<h1><i class="fa @icon"></i> Tagged with <em>@currentTag</em></h1>
-		<p class="lead">@description</p>
 
 <table class="table table-compact table-hover project-list">
 	<thead>
@@ -29,7 +42,7 @@
 					<br/><small><a href="/u/@p.author/">@@@p.author</a></small>
 				</th>
 				<td>@p.description</td>
-				<td>@p.version</td>
+				<td>@p.version.name</td>
 				<td>@p.downloads</td>
 			</tr>
 		}
diff --git a/extra/haxelib_src/www/view/layout.html b/extra/haxelib_src/www/view/layout.html
index f9648efa8df53fb3fe9c62363c7feaec0d1af496..bc23baeb3fdbde3f05bb6a86add90cf0f08576f8 100644
--- a/extra/haxelib_src/www/view/layout.html
+++ b/extra/haxelib_src/www/view/layout.html
@@ -5,34 +5,34 @@
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
 	<meta name="viewport" content="width=device-width" />
 	<title>@title</title>
-	<link href="//haxe.org/css/bootstrap.min.css" rel="stylesheet">
+	<link href="/css/bootstrap-combined.min.css" rel="stylesheet" rel="stylesheet">
 	<link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css" rel="stylesheet">
-	<link rel="stylesheet" type="text/css" href="/css/style.css"/>
-	<link rel="stylesheet" type="text/css" href="/css/haxe-nav.css"/>
-	<!--<link rel="stylesheet" type="text/css" href="/css/haxelib.css"/>-->
+	<link href="/css/style.css" rel="stylesheet">
+	<link href="/css/haxe-nav.css" rel="stylesheet">
+		
 	<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
-	<link href='//fonts.googleapis.com/css?family=Source+Sans+Pro:200,600,600italic,400' rel='stylesheet' type='text/css'>
-	<link href='//fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-	<link href='//fonts.googleapis.com/css?family=Source+Code+Pro' rel='stylesheet' type='text/css'>
+	<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:200,600,600italic,400" rel="stylesheet">
+	<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic" rel="stylesheet">
+	<link href="//fonts.googleapis.com/css?family=Source+Code+Pro" rel="stylesheet">
 
 	<!-- Google -->
 	<link rel="author" href="https://plus.google.com/113704686911055424796/posts"/>
 	<link rel="publisher" href="https://plus.google.com/113704686911055424796/"/>
-	<meta name="description" content="@description" />
+	<meta name="description" content="@escape(description)" />
 
 	<!-- Twitter card -->
 	<meta name="twitter:card" content="summary" />
 	<meta name="twitter:creator" content="@@haxelang" />
 	<meta name="twitter:site" content="@@haxelang" />
-	<meta name="twitter:title" content="@title" />
-	<meta name="twitter:description" value="@description">
+	<meta name="twitter:title" content="@escape(title)" />
+	<meta name="twitter:description" value="@escape(description)">
 
 	<!-- OpenGraph -->
-	<meta property="og:title" content="@title" />
+	<meta property="og:title" content="@escape(title)" />
 	<meta property="og:type" content="article" />
 	<meta property="og:url" content="@pageUrl" />
-	<meta property="og:image" content="//haxe.org/img/branding/haxe-logo-glyph.png" />
-	<meta property="og:description" content="@description" />
+	<meta property="og:image" content="https://haxe.org/img/branding/haxe-logo-glyph.png" />
+	<meta property="og:description" content="@escape(description)" />
 	<meta property="og:site_name" content="Haxe - The Cross-platform Toolkit" />
 
 	<!-- Facebook -->
@@ -41,62 +41,75 @@
 <body>
 
 <nav class="section nav dark">
-		<div class="navbar navbar-fixed-top navbar-inverse">
-			<div class="navbar-inner">
-				<button class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse" type="button"><span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button> <a class="brand haxe-logo" href="https://haxe.org/"><img alt="Haxe" height="21" onerror="this.src='https://haxe.org/img/haxe-logo-horizontal-on-dark.png'" src="https://haxe.org/img/haxe-logo-horizontal-on-dark.svg" width="107" /></a>
-				<a class="brand sub lib" href="/">LIB</a>
+	<div class="navbar navbar-fixed-top navbar-inverse">
+		<div class="navbar-inner">
+			<button class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse" type="button"><span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button> <a class="brand haxe-logo" href="https://haxe.org/"><img alt="Haxe" height="21" onerror="this.src='https://haxe.org/img/haxe-logo-horizontal-on-dark.png'" src="https://haxe.org/img/haxe-logo-horizontal-on-dark.svg" width="107" /></a>
+			<a class="brand sub lib" href="/">LIB</a>
 
-				<div class="nav-collapse collapse">
-				<ul class="nav pull-right search-link-menu">
-					<li><a href="/search"><i class="fa fa-search"></i></a></li>
-				</ul>
-				<ul class="nav">
-					<li class="dropdown">
-						<a href="/all" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-folder-open-o"></i> Browse Projects <span class="caret"></span></a>
-						<ul class="dropdown-menu" role="menu">
-							<li><a href="/all/"><i class="fa fa-star"></i> Browse by popularity</a></li>
-							<li><a href="/t/"><i class="fa fa-tags"></i> Browse by tag</a></li>
-							<li><a href="/u/"><i class="fa fa-user"></i>  Browse by author</a></li>
-							<!--<li><a href="/recent/">Recently Updated</a></li>-->
-							<!--<li class="divider"></li>-->
-						</ul>
-					</li>
-					<li class="dropdown">
-						<a href="/documentation" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-file-o"></i> Documentation <span class="caret"></span></a>
-						<ul class="dropdown-menu" role="menu">
-							@for (url in documentationPages.keys()) {
-								<li @if(url==currentPage){ class="active" }><a href="@url">@documentationPages.get(url)</a></li>
-							}
-							<li class="divider"></li>
-							<li><a href="/rss/"><i class="fa fa-rss"></i> Recent Updates RSS Feed</a></li>
-							<li><a href="//lib.haxe.org/legacy/"><i class="fa fa-folder-open-o"></i> Haxe 2 Haxelib repository</a></li>
-						</ul>
-					</li>
-					
-					<li class=" divider"></li><li class=" dropdown"><a href="/documentation/" data-toggle="dropdown" class="dropdown-toggle">Learn Haxe <b class="caret"></b></a><ul class="dropdown-menu"><li class=""><a href="/documentation/introduction/">Introduction</a></li><li class=" divider"></li><li class=""><a href="/manual/">Manual</a></li><li class=""><a href="https://api.haxe.org/">API Documentation</a></li><li class=" divider"></li><li class=""><a href="https://try.haxe.org/">Try Haxe</a></li><li class=""><a href="https://lib.haxe.org/">Haxelib</a></li><li class=""><a href="https://code.haxe.org/">Code Cookbook</a></li></ul></li>
-					<li class=" dropdown">
-						<a href="/HaxeFoundation" data-toggle="dropdown" class="dropdown-toggle">Connect <b class="caret"></b></a>
-						<ul class="dropdown-menu">
-							<li><a href="https://github.com/HaxeFoundation"><i class="fa fa-github"></i> Github</a></li>
-							<li><a href="https://github.com/HaxeFoundation/haxe/issues"><i class="fa fa-github"></i> Bug reports</a></li>
-							<li><a href="https://stackoverflow.com/questions/tagged/haxe"><i class="fa fa-stack-exchange"></i> Stack Overflow</a></li>
-							<li><a href="https://groups.google.com/group/haxelang?hl=en"><i class="fa fa-envelope-o"></i> Google Groups</a></li>
-							<li><a href="https://webchat.freenode.net/?channels=haxe"><i class="fa fa-comments-o"></i> IRC</a></li>
-							<li><a href="https://haxe.org/blog"><i class="fa fa-rss"></i> Blog</a></li>
-							<li class="divider"></li>
-							<li><a href="https://plus.google.com/communities/103302587329918132234"><i class="fa fa-google-plus"></i> Google+</a></li>
-							<li><a href="https://www.facebook.com/haxe.org/"><i class="fa fa-facebook"></i> Facebook</a></li>
-							<li><a href="https://twitter.com/search?q=%23haxe"><i class="fa fa-twitter"></i> #haxe</a></li>
-							<li><a href="https://twitter.com/haxelang"><i class="fa fa-twitter"></i> &#64;haxelang</a></li>
-							<li><a href="https://twitter.com/haxe_org"><i class="fa fa-twitter"></i> &#64;haxe_org</a></li>
-							<li class="divider"></li>
-							<li><a href="https://haxe.org/foundation/contact.html">Contact</a></li>
-						</ul>
-					</li>
-				</ul></div>
-			</div>
+			<div class="nav-collapse collapse">
+			<ul class="nav pull-right search-link-menu">
+				<li><a href="/search"><i class="fa fa-search"></i></a></li>
+			</ul>
+			<ul class="nav">
+				<li class="dropdown">
+					<a href="/all" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-folder-open-o"></i> Browse Projects <span class="caret"></span></a>
+					<ul class="dropdown-menu" role="menu">
+						<li><a href="/all/"><i class="fa fa-star"></i> Browse by popularity</a></li>
+						<li><a href="/t/"><i class="fa fa-tags"></i> Browse by tag</a></li>
+						<li><a href="/u/"><i class="fa fa-user"></i>  Browse by author</a></li>
+						<li><a href="/recent/"><i class="fa fa-paperclip"></i> Recent library updates</a></li>
+					</ul>
+				</li>
+				<li class="dropdown">
+					<a href="/documentation" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-file-o"></i> Documentation <span class="caret"></span></a>
+					<ul class="dropdown-menu" role="menu">
+						@for (url in documentationPages.keys()) {
+							<li @if(url==currentPage){ class="active" }><a href="@url">@documentationPages.get(url)</a></li>
+						}
+						<li class="divider"></li>
+						<li><a href="/rss/"><i class="fa fa-rss"></i> Recent Updates RSS Feed</a></li>
+						<li><a href="//lib.haxe.org/legacy/"><i class="fa fa-folder-open-o"></i> Haxe 2 Haxelib repository</a></li>
+					</ul>
+				</li>
+				
+				<li class=" divider"></li>
+				<li class="dropdown">
+					<a class="dropdown-toggle" data-toggle="dropdown" href="https://haxe.org/documentation/">Learn Haxe <b class="caret"></b></a>
+					<ul class="dropdown-menu">
+						<li><a href="https://haxe.org/documentation/introduction/" rel="external">Introduction</a></li>
+						<li><a href="https://haxe.org/manual/" rel="external">Manual</a></li>
+						<li><a href="https://code.haxe.org" rel="external">Code Cookbook</a></li>
+						<li><a href="https://api.haxe.org" rel="external">API Documentation</a></li>
+						<li class="divider"></li>
+						<li><a href="https://haxe.org/videos/" rel="external">Videos</a></a></li>
+						<li class="divider"></li>
+						<li><a href="https://try.haxe.org" rel="external">Try Haxe online</a></li>
+						<li class="active"><a href="https://lib.haxe.org" rel="external">Haxelib</a></li>
+					</ul>
+				</li>
+				<li class="dropdown">
+					<a href="/HaxeFoundation" data-toggle="dropdown" class="dropdown-toggle">Connect <b class="caret"></b></a>
+					<ul class="dropdown-menu">
+						<li><a href="https://github.com/HaxeFoundation" rel="external"><i class="fa fa-github"></i> GitHub</a></li>
+						<li><a href="https://github.com/HaxeFoundation/haxe/issues" rel="external"><i class="fa fa-github"></i> Bug reports</a></li>
+						<li><a href="https://stackoverflow.com/questions/tagged/haxe" rel="external"><i class="fa fa-stack-overflow"></i> Stack Overflow</a></li>
+						<li><a href="http://community.haxe.org/" rel="external"><i class="fa fa-envelope-o"></i> Forums</a></li>
+						<li><a href="https://discordapp.com/invite/0uEuWH3spjck73Lo" rel="external nofollow"><i class="fa fa-comments-o"></i> Discord</a></li>
+						<li><a href="https://gitter.im/HaxeFoundation/haxe" rel="external nofollow"><i class="fa fa-comments-o"></i> Gitter</a></li>
+						<li><a href="https://haxe.org/blog"><i class="fa fa-rss"></i> Blog</a></li>
+						<li class="divider"></li>
+						<li><a href="https://www.facebook.com/haxe.org/" rel="external"><i class="fa fa-facebook"></i> Facebook</a></li>
+						<li><a href="https://twitter.com/search?q=%23haxe" rel="external"><i class="fa fa-twitter"></i> #haxe</a></li>
+						<li><a href="https://twitter.com/haxelang" rel="external"><i class="fa fa-twitter"></i> @@haxelang</a></li>
+						<li><a href="https://twitter.com/haxe_org" rel="external"><i class="fa fa-twitter"></i> @@haxe_org</a></li>
+						<li class="divider"></li>
+						<li><a href="https://haxe.org/foundation/contact.html">Contact</a></li>
+					</ul>
+				</li>
+			</ul></div>
 		</div>
-	</nav>
+	</div>
+</nav>
 
 <div class="page-wrap">
 	@if( useWrapper ) {
@@ -111,19 +124,47 @@
 	}
 </div>
 
+<div class="section info">
+	<div class="container">
+		
+		<div class="row">
+			<div class="span4">
+				<h3><i class="fa fa-big fa-rocket"></i> All libraries are free</h3>
+				<p>Every month, more than a thousand developers use Haxelib to find, share, and reuse code — and assemble it in powerful new ways.
+				Enjoy Haxe; It is great!</p>
+			</div>
+			<div class="span4">
+				<h3><i class="fa fa-big fa-gears"></i> Explore Haxe</h3>
+				<p>
+					<p><i class="fa fa-external-link"></i> <a href="https://haxe.org/manual">Haxe Manual</a></p>
+					<p><i class="fa fa-external-link"></i> <a href="https://code.haxe.org">Haxe Code Cookbook</a></p>
+					<p><i class="fa fa-external-link"></i> <a href="https://api.haxe.org">Haxe API documentation</a></p>
+					<p>You can try Haxe in the browser! <a href="https://try.haxe.org">try.haxe.org</a></p>
+				</p>
+			</div>
+			<div class="span4">
+				<h3><i class="fa fa-big fa-globe"></i> Join us on GitHub!</h3>
+				<p>Haxe is being developed on GitHub. Feel free to contribute or report issues to our projects.</p>
+				<p><i class="fa fa-github"></i> <a href="https://github.com/HaxeFoundation/">Haxe on GitHub</a></p>
+			</div>
+		</div>
+  </div>
+</div>
+
 <footer class="section dark site-footer">
 	<div class="container">
 		<div class="copyright">
 			<p>&copy;@todaysDate.getFullYear()
 				<a href="//haxe.org/foundation/" title="Haxe Foundation Website" class="hf-link">Haxe Foundation</a> | 
-				<a href="https://github.com/HaxeFoundation/haxelib" title="Haxelib Github Repository" class="hf-link">Haxelib on Github</a>
+				<a href="https://github.com/HaxeFoundation/haxelib" title="Haxelib GitHub Repository" class="hf-link">Haxelib on GitHub</a>
+			</p>
 		</div>
 	</div>
 </footer>
 
-<script src="//haxe.org/js/jquery.min.js"></script>
-<script src="//haxe.org/js/bootstrap.min.js"></script>
-<script src="//haxe.org/js/client.min.js"></script>
+<script src="/js/jquery.min.js"></script>
+<script src="/js/bootstrap.min.js"></script>
+
 <!-- Google Tag Manager -->
 <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-N6H4RQ"
                   height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
diff --git a/extra/haxelib_src/www/view/project/file.html b/extra/haxelib_src/www/view/project/file.html
index 2998406898a1a3b0bff105577648953b94973e16..e5e4be1b0751f9eed577bbe198ba81a1800f32b6 100644
--- a/extra/haxelib_src/www/view/project/file.html
+++ b/extra/haxelib_src/www/view/project/file.html
@@ -1,11 +1,19 @@
-<h1>@project <small>@version</small></h1>
-<p class="lead">@info.desc</p>
 
-<div class="panel panel-default">
+<div>
+	<h1><i class="fa fa-star"></i> @project</h1>
+	<p class="lead">@info.desc<br/><a href="@info.website">@info.website <span class="fa fa-external-link"></span></a></p>
+</div>
+
+<ul class="nav nav-tabs nav-justified" role="tablist">
+	<li><a href="/p/@project/@if(version!=info.curversion) {@info.curversion}">@project <small>@version</small></a></li>
+	<li class="active"><a href="/p/@project/@info.curversion/files/">Files</a></li>
+	<li><a href="/p/@project/versions/">All Versions <small>(@allVersions.length)</small></a></li>
+</ul>
+
+<div class="panel panel-default file-list">
 	<div class="panel-heading">
 		<div class="btn-toolbar pull-right">
-			@if( type=="text" && extension=="hx" ) { <a href="#" class="btn btn-default"><i class="fa fa-cogs"></i> View API Docs</a> }
-			@if( type!="directory" ) { <a href="@downloadLink" class="btn btn-default"><i class="fa fa-download"></i> Download</a> }
+			@if( type!="directory" && (type=="text" || type=="markdown" || type=="img")) { <a href="@downloadLink" class="btn btn-default"><i class="fa fa-download"></i> Download</a> }
 			<div class="btn-group">
 				<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
 					@version <span class="caret"></span>
@@ -23,51 +31,52 @@
 				var i = 0;
 				var breadcrumbBase = baseUri+project+"/"+version+"/files";
 			}
-			<li>
-				@if ( type=="directory" ) { <i class="fa fa-folder"></i> }
-				else if ( type=="text" ) { <i class="fa fa-file"></i> }
-			</li>
-			<li><a href="@breadcrumbBase">@project : @version</a></li>
+			<li><a href="@breadcrumbBase"><strong>@project : @version</strong></a></li>
 			@while(i < fileParts.length) {
 				@if (i+1<fileParts.length){
 					<li><a href="@breadcrumbBase/@fileParts.slice(0,i+1).join('/')">@fileParts[i]</a></li>
 				}
 				else {
-					<li class="active">@fileParts[i]</li>
+					<li class="active">@fileParts[i] @if(size!=null){<small>(@size)</small>}</li>
 				}
 				@{ i++; }
 			}
 		</ol>
 	</div>
-	@if ( type=="directory" ) {
-		<!-- Show the directory list -->
-
-		<div class="list-group">
-			@for (dir in dirListing) { <a href="@currentDir/@dir/" class="list-group-item"><i class="fa fa-folder"></i> @dir/</a> }
-			@for (file in fileListing) { <a href="@currentDir/@file" class="list-group-item" @if(extensionAllowed(file)==false) { rel="nofollow"}><i class="fa fa-file"></i> @file</a> }
-		</div>
-	}
-	else if ( type=="text" ) {
-		<!-- Show the content -->
-		<pre class="panel-body"><code class="prettyprint haxe">@fileContent</code></pre>
-		<!--<div class="panel-body">-->
-		<!--</div>-->
-	}
-	else if ( type=="markdown" ) {
-		<div class="panel-body">
-			@fileContent
-		</div>
-	}
-	else if ( type=="img" ) {
-		<!-- Display an image -->
-		<div class="panel-body text-center">
-			<img src="@downloadLink" alt="Viewing image @filename... sorry we don't have a better description"/>
-		</div>
-	}
-	else {
-		<!-- Show a link to download the file -->
-		<div class="panel-body text-center">
-			<a href="@downloadLink" class="btn btn-success btn-large"><i class="fa fa-download"></i> Download @filename (@size)</a>
-		</div>
-	}
+		@if ( type=="directory" ) {
+			<div class="panel-body">
+				<!-- Show the directory list -->
+				<div class="list-group">
+					@for (dir in dirListing) { <a href="@currentDir/@dir/" class="list-group-item"><i class="fa fa-folder"></i>@dir/</a> }
+					@for (file in fileListing) { <a href="@currentDir/@file" class="list-group-item" @if(extensionAllowed(file)==false) { rel="nofollow"}><i class="fa fa-@icon(file)"></i>@file</a>}
+				</div>
+			</div>
+		}
+		else if ( type=="text" ) {
+			<div class="panel-body">
+				<h1>@fileParts[fileParts.length-1]</h1>
+				<!-- Show the content -->
+				<pre><code class="prettyprint @if(fileExt=="hx"){haxe}else {@fileExt}">@fileContent</code></pre>
+				
+			</div>
+		}
+		else if ( type=="markdown" ) {
+			<div class="panel-body">@fileContent</div>
+		}
+		else if ( type=="img" ) {
+			<div class="panel-body">
+				<h1>@fileParts[fileParts.length-1]</h1>
+				<!-- Display an image -->
+				<img src="@downloadLink" alt="@filename"/>
+			</div>
+		}
+		else {
+			<div class="panel-body panel-disabled">
+				<h1>@fileParts[fileParts.length-1]</h1>
+				<p>This file cannot be viewed</p>
+				<!-- Show a link to download the file -->
+				<a href="@downloadLink" class="btn btn-success"><i class="fa fa-download"></i> Download @filename (@size)</a>
+			</div>
+		}
+	</div>
 </div>
diff --git a/extra/haxelib_src/www/view/project/version.html b/extra/haxelib_src/www/view/project/version.html
index 7c3518423fded662c197b10c145619d9cc511d46..82487b3fa5bc4a820201c1e25f339e4907779544 100644
--- a/extra/haxelib_src/www/view/project/version.html
+++ b/extra/haxelib_src/www/view/project/version.html
@@ -1,66 +1,150 @@
 
+<div>
+	<h1><i class="fa fa-star"></i> @project</h1>
+	<p class="lead">@info.desc<br/><a href="@info.website">@info.website <span class="fa fa-external-link"></span></a></p>
+</div>
 
-
+<ul class="nav nav-tabs nav-justified" role="tablist">
+	<li class="active"><a href="/p/@project/@if(version!=info.curversion) {@version}">@project <small>@version</small></a></li>
+	<li><a href="/p/@project/@info.curversion/files/">Files</a></li>
+	<li><a href="/p/@project/versions/">All Versions <small>(@allVersions.length)</small></a></li>
+</ul>
 
 <div class="row">
 	<div class="span8">
-
-		<!-- Title and description -->
-		<h1>@project <small>@version</small></h1>
-		<p class="lead">@info.desc</p>
-		<p><small>Released @versionDate.</small></p>
-
-		<!-- Installation Instruction -->
-		<p></p>
+		
+		@if (false) {<!-- Warning if they're looking at an old version -->}
+		@if( version!=info.curversion ) {
+			<p class="alert alert-warning">This is not the latest stable version of @project. See version <a href="/p/@project/@info.curversion/">@info.curversion</a> for the latest version.</p>
+		}
+		
+		@if (false) {<!-- Installation Instruction -->}
 		<div class="well">
 			<p>To install, run:</p>
-			<pre><code>haxelib install @project @version</code></pre>
+			<pre><code>haxelib install @project @version</code> <a class="btn btn-small pull-right" href="/p/@project/@version/download/" title="Download @project:@version zip"><i class="fa fa-download"></i></a></pre>
 			<p>See <a href="/documentation/using-haxelib/">using Haxelib</a> in Haxelib documentation for more information.</p>
+			
 		</div>
 
-		<!-- Links and buttons -->
-		<div class="btn-toolbar">
-			<a class="btn btn-success" href="@downloadUrl"><i class="fa fa-download"></i> <strong>Download @project:@version</strong></a>
-			<a class="btn btn-default" href="/p/@project/versions/">Other Versions</a>
-			<a class="btn btn-default" href="/p/@project/@version/files/">Files</a>
-			<!-- <a class="btn btn-default" href="/p/@project/@version/doc/">API Docs</a> -->
-			<a class="btn btn-default" href="@info.website">Project Website</a>
-		</div>
+		<ul class="nav nav-tabs nav-justified" role="tablist">
+			@if(hasReadme){<li @if (type == "readme") {class="active"}><a href="/p/@project/@info.curversion">About</a></li>}
+			<li @if (type =="releasenotes") {class="active"}><a href="/p/@project/@info.curversion/releasenotes">Release notes</a></li>
+			@if(hasChangelog){<li @if (type =="changelog") {class="active"}><a href="/p/@project/@info.curversion/changelog">Changelog</a></li>}
+			@if(hasLicense){<li @if (type =="license") {class="active"}><a href="/p/@project/@info.curversion/license/" >License</a></li>}
+		</ul>
 
-		<!-- Warning if they're looking at an old version -->
-		<p></p>
-		@if( version!=info.curversion ) {
-			<p class="alert alert-warning">This is not the latest stable version of @project. See version <a href="/p/@project/@info.curversion/">@info.curversion</a> for the latest version.</p>
+		@if (type == "readme") {
+			@if (false) {<!-- README -->}
+			@if (hasReadme) {
+				<div class="tab-pane panel panel-default active" id="readme">
+					<div class="panel-heading">
+						<h1 class="panel-title"><i class="fa fa-book"></i> README.md</h1>
+					</div>
+					<article class="panel-body readme site-content">
+						@readme
+					</article>
+				</div>
+			}
+		}
+			
+		@if (type == "releasenotes") {
+			<section class="tab-pane" id="releasenotes">
+			@if (hasReleaseNotes) { 
+				<h1><i class="fa fa-book"></i> @project @version Release notes</h1>
+				<p>@escape(releaseNotes)</p>
+			}
+			</section>
+		}
+		
+		@if (type == "changelog") {
+			@if (false) {<!-- CHANGELOG -->}
+			@if (hasChangelog) {
+				<div class="tab-pane panel panel-default" id="changelog">
+					<div class="panel-heading">
+						<h1 c1ass="panel-title"><i class="fa fa-book"></i> CHANGELOG.md</h1>
+					</div>
+					<article class="panel-body changelog site-content">
+						@changelog
+					</article>
+				</div>
+			}
+		}
+			
+			
+		@if (type == "license") {
+			@if (false) {<!-- LICENSE -->}
+			@if (hasLicense) {
+				<div class="tab-pane panel panel-default" id="license">
+					<div class="panel-heading">
+						<h1 c1ass="panel-title"><i class="fa fa-book"></i> LICENSE.md</h1>
+					</div>
+					<article class="panel-body changelog site-content">
+						@license
+					</article>
+				</div>
+			}
 		}
-
 	</div>
 	<div class="span4">
-
-		<!-- Project details -->
-		<div class="table-responsive">
+		@if (false) {<!-- Project details -->}
+		<div class="table-responsive project-details">
 			<table class="table table-condensed">
-				<tr class="owner"><th>Maintainer</th><td><a href="/u/@info.owner">@info.owner</a></td></tr>
-				<tr class="url"><th>Website</th><td><a href="@info.website">@info.website</a></td></tr>
-				<tr class="social">
-					<th>Social</th>
+				<tr>
+					<td width="50%">
+						<strong>Contributors</strong><br/>
+					</td>
 					<td>
-						<div class="hidden" id="github-buttons">
-							<iframe id="github-button-star" src="" frameborder="0" scrolling="0" width="100" height="20"></iframe>
-							<iframe id="github-button-fork" src="" frameborder="0" scrolling="0" width="100" height="20"></iframe>
-						</div>
+						@for(d in info.contributors) { 
+							<a href="/u/@d.name">@d.name</a><br/>
+						}
 					</td>
 				</tr>
-				<tr class="version"><th>Current version</th><td>@info.curversion</td></tr>
-				<tr class="owner"><th>Statistics</th><td>Installed <strong>@info.downloads</strong> times</td></tr>
-				<tr class="license"><th>License</th><td>@info.license</td></tr>
+				<tr>
+					<td><strong>Version</strong><br/>@version</a></td>
+					<td><strong>Published</strong><br/><span title="@versionDate">@formatDate(versionDate)</span></td>
+				</tr>
+				@if (dependencies.length > 0) {
+				<tr>
+					<td colspan="2">
+					<strong>Dependencies</strong>
+					<ul class="dependencies">
+					@for (dep in dependencies) { 
+						@if (dep.version != null) { 
+						<li><a href="/p/@dep.name/@dep.version/">@dep.name</a> <small>(@dep.version)</small> </li>
+						}
+						else { 
+						<li><a href="/p/@dep.name/">@dep.name</a></li>
+						}
+					}
+					</ul>
+					</td>
+				</tr>
+				}
+				<tr>
+					<td colspan="2"><strong>License</strong><br/>@info.license</a></td>
+				</tr>
+				@if (info.tags != null && info.tags.length > 0) { 
 				<tr class="tags">
-					<th>Tags</th>
+					<td colspan="2">
+						<ul class="tags unstyled">
+							@for( t in info.tags ) {
+								 <li class="tag tag-inline"><i class="fa fa-tag"></i> <a href="/t/@t/">@t</a></li>
+							}
+						</ul>
+					</td>
+				</tr>
+				}
+				<tr id="github-info" style="display:none">
 					<td>
-            <ul class="tags unstyled">
-						@for( t in info.tags ) {
-							 <li class="tag tag-inline"><i class="fa fa-tag"></i> <a href="/t/@t/">@t</a></li>
-						}
-          </ul>
+						<p><strong>Repository</strong></p>
+						<span id="github-user-image"></span>
+					</td>
+					<td>
+						<p id="github-user-website"></p>
+						<div class="hidden" id="github-buttons">
+							<iframe id="github-button-star" src="" frameborder="0" scrolling="0" width="100" height="20"></iframe>
+							<iframe id="github-button-fork" src="" frameborder="0" scrolling="0" width="100" height="20"></iframe>
+						</div>
 					</td>
 				</tr>
 			</table>
@@ -69,28 +153,29 @@
 	</div>
 </div>
 
-<hr/>
+@if (info.website.indexOf("github.com") > -1) {
+@{var githubInfo = info.website.split("github.com/").pop().split("/");}
+@{var githubUser = githubInfo[0];}
+@{var githubRepo = githubInfo[1];}
+<script>
+var baseGithubUrl = "https://ghbtns.com/github-btn.html?user=@githubUser";
+@if (githubRepo != null) { baseGithubUrl += "&repo=@githubRepo"; }
 
-@if (readme!="") {
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			<h3 class="panel-title"><i class="fa fa-book"></i> README.md</h3>
-		</div>
-		<article class="panel-body readme site-content">
-			@readme
-		</article>
-	</div>
+document.getElementById("github-info").style.display = "table-row";
+
+document.getElementById("github-button-star").src = baseGithubUrl + "&type=star&count=true";
+document.getElementById("github-button-fork").src = baseGithubUrl + "&type=fork&count=true";
+document.getElementById("github-buttons").className = "show";
+
+document.getElementById("github-user-website").innerHTML = '<span class="fa fa-github"></span> <a href="@info.website">@githubUser</a>';
+document.getElementById("github-user-image").innerHTML = '<a href="@info.website"><img src="https://github.com/'+'@githubUser'+'.png?size=512" width="100%" title="@githubUser on GitHub"/></a>';
+</script>
 }
 
+<script src="/js/highlighter.js"></script>
+
 <script>
-	var website = "@info.website";
-	if (website.indexOf("github.com") > -1)
-	{
-		var githubInfo = website.split("github.com/").pop().split("/");
-		var githubUser = githubInfo[0];
-		var githubRepo = githubInfo[1];
-		document.getElementById("github-button-star").src = "https://ghbtns.com/github-btn.html?user="+githubUser+"&repo="+githubRepo+"&type=star&count=true";
-		document.getElementById("github-button-fork").src = "https://ghbtns.com/github-btn.html?user="+githubUser+"&repo="+githubRepo+"&type=fork&count=true";
-		document.getElementById("github-buttons").className = "show";
-	}
+window.addEventListener("load", function() {
+	$(".site-content table").addClass("table");
+});
 </script>
diff --git a/extra/haxelib_src/www/view/project/versionList.html b/extra/haxelib_src/www/view/project/versionList.html
index 3404d05ec2b49cb5dc6fa1581028b7e5c069b1fd..a8368d9a8efa888498303b8d1d8487a8032b2afa 100644
--- a/extra/haxelib_src/www/view/project/versionList.html
+++ b/extra/haxelib_src/www/view/project/versionList.html
@@ -1,21 +1,70 @@
+
 <div>
-	<h1>@project <small>All Versions</small></h1>
-	<p class="lead">@info.desc</p>
-	<div class="btn-toolbar">
-		<a class="btn btn-success" href="/p/@project/@info.curversion/">Current Version</a>
-		<a class="btn btn-default" href="@info.website">Project Website</a>
-	</div>
-	<p></p>
-	<p><a href="@info.website">@info.website</a></p>
+	<h1><i class="fa fa-star"></i> @project</h1>
+	<p class="lead">@info.desc<br/><a href="@info.website">@info.website <span class="fa fa-external-link"></span></a></p>
 </div>
 
+<ul class="nav nav-tabs nav-justified" role="tablist">
+	<li><a href="/p/@project/">@project <small>@info.curversion</small></a></li>
+	<li><a href="/p/@project/@info.curversion/files/">Files</a></li>
+	<li class="active"><a href="/p/@project/versions/">All Versions <small>(@allVersions.length)</small></a></li>
+</ul>
+
+@if (allVersions.length > 1) {
+<div id="downloads-chart"></div>
+<link rel="stylesheet" href="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.css">
+<script src="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.js"></script>
+<script>
+var data = {
+  labels: [ @for (i in 0...allVersions.length) {'v@allVersions[i].name'@if(i<allVersions.length-1){, }}],
+  series: [ [@for (i in 0...allVersions.length) { {x: Date.parse('@allVersions[i].date'), y: @allVersions[i].downloads}@if(i<allVersions.length-1){, }}] ]
+};
+
+
+var total = 0;
+
+var serieData = data.series[0];
+data.labels.reverse();
+serieData.reverse();
+for (var i=0;i<serieData.length;i++) {
+	var t = serieData[i].y;
+	serieData[i].y += total;
+	total += t;
+}
+
+console.log(serieData);
+
+var options = {
+	fullWidth: true
+};
+
+options.axisX = {
+	type: Chartist.FixedScaleAxis,
+	divisor: 10,
+	labelInterpolationFnc: function(value) {
+		var d = new Date(value);
+		var m = d.getMonth() + 1;
+		var YYYY = d.getFullYear();
+		var MM = m < 10 ? "0" + m : "" + m;
+		return YYYY + "/" + MM;
+	}
+}
+
+var serieData = data.series[0];
+if (serieData.length > 100) {
+	
+}
+new Chartist.Line('#downloads-chart', data, options);
+</script>
+}
+
 <table class="table table-hover table-condensed">
 	<thead>
 		<tr>
-			<th>Version</th>
+			<th width="100">Version</th>
 			<th>Release Notes</th>
-			<th>Install</th>
-			<th>Downloads</th>
+			<th width="220">Install</th>
+			<th width="100">Downloads</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -23,19 +72,13 @@
 	<tr>
 		<td>
 			<a href="/p/@project/@v.name/" class="text-nowrap">@v.name</a>
-			<br /><small style="white-space: nowrap">@v.date.substr(0,10)</small>
+			<br /><small style="white-space: nowrap" title="@v.date">@formatDate(v.date)</small>
 		</td>
 		<td>@escape(v.comments)</td>
 		<td><code class="text-nowrap">haxelib install @project @v.name</code></td>
 		<td>@v.downloads</td>
-		<!--<td>-->
-			<!--<div class="btn-toolbar btn-group">-->
-				<!--<a class="btn btn-small btn-default" href="/p/@project/@v.name/">View Version</a>-->
-				<!--<a class="btn btn-small btn-default" href="/p/@project/@v.name/files/">Files</a>-->
-				<!--<a class="btn btn-small btn-default" href="/p/@project/@v.name/api/">API Docs</a>-->
-			<!--</div>-->
-		<!--</td>-->
 	</tr>
 	}
 	</tbody>
 </table>
+	
\ No newline at end of file
diff --git a/extra/haxelib_src/www/view/user/list.html b/extra/haxelib_src/www/view/user/list.html
index 2d0cdf1e94e88424efc0ef1cace730b75aa2ce1b..f55a99ba126d6c2ea1e916a1f6cb371a4df75c2c 100644
--- a/extra/haxelib_src/www/view/user/list.html
+++ b/extra/haxelib_src/www/view/user/list.html
@@ -1,6 +1,6 @@
 <h1><i class="fa fa-user"></i> @title</h1>
 
-<table class="table table-condensed">
+<table class="table">
 	<thead>
 		<tr>
 			<th colspan="3">User</th>
@@ -8,7 +8,7 @@
 		</tr>
 	</thead>
 	<tbody>
-		@for (u in list) {
+		@for (u in list) { 
 			<tr>
 				<td><img src="//www.gravatar.com/avatar/@(u.emailHash).jpg?s=150" class="img-circle" width="48" height="48" alt="Avatar of @u.user.name" /></td>
 				<th><a href="/u/@u.user.name/">@u.user.name</a></th>
diff --git a/extra/haxelib_src/www/view/user/profile.html b/extra/haxelib_src/www/view/user/profile.html
index 72ac08bb0de344c48b2fb63f6ae6d367bbf46c22..9e775a47f53a98d304d1c9c9de5575dbe12abcf6 100644
--- a/extra/haxelib_src/www/view/user/profile.html
+++ b/extra/haxelib_src/www/view/user/profile.html
@@ -1,3 +1,7 @@
+<div>
+	<p>&laquo; <a href="/u/">All Haxelib Contributors</a></p>
+</div>
+
 <div class="user-profile well">
 	<div class="pull-left">
 		<img src="//www.gravatar.com/avatar/@(emailHash).jpg?s=150" class="img-circle avatar" width="150" height="150" alt="Avatar of @user" />
diff --git a/extra/images/Readme.png b/extra/images/Readme.png
new file mode 100644
index 0000000000000000000000000000000000000000..f101ccf0aeeecb651f6992fd6009e2073a173838
Binary files /dev/null and b/extra/images/Readme.png differ
diff --git a/extra/installer.nsi b/extra/installer.nsi
index 26affb2fa225cbe96c7c814be803aaa88251df6b..535154efa7655661d870653679b2228a83211000 100644
--- a/extra/installer.nsi
+++ b/extra/installer.nsi
@@ -20,12 +20,12 @@
 !define VERLONG "%%VERLONG%%"
 
 ; Define Neko info
-!define NEKO_VERSION "2.1.0"
+!define NEKO_VERSION "2.2.0"
 
 ; Installer details
 VIAddVersionKey "CompanyName" "Haxe Foundation"
 VIAddVersionKey "ProductName" "Haxe Installer"
-VIAddVersionKey "LegalCopyright" "Haxe Foundation 2005-2017"
+VIAddVersionKey "LegalCopyright" "Haxe Foundation 2005-2018"
 VIAddVersionKey "FileDescription" "Haxe Installer"
 VIAddVersionKey "ProductVersion" "${VERSION}.0"
 VIAddVersionKey "FileVersion" "${VERSION}.0"
diff --git a/extra/release-checklist.txt b/extra/release-checklist.txt
index 67aa42f397f5a5b0d12157799a4aa292e2553e91..ae28e8e518ec904184a566056b0afc5a8d0fe682 100644
--- a/extra/release-checklist.txt
+++ b/extra/release-checklist.txt
@@ -4,32 +4,21 @@
 - Make sure to update the haxelib submodule
 - Check that the run-time haxelibs are ready for release: hxcpp, hxjava, hxcs
 
-# Building the binaries and installers
-
-- Make sure CHANGES.txt has a proper date set!
-- Make sure `version` in globals.ml has the correct value.
-- Update README.md:
-  - Version compatibility: add/update the Haxe/Neko version
-- Merge development branch into master.
-- Wait for Travis to greenlight master.
-- Tag master as MAJOR.MINOR.PATCH.
-- Wait for builds.haxe.org to build master.
-- Get https://github.com/waneck/hxbuilds/tree/master/release-helper
-- Run it with the fileName corresponding to the latest master file name on builds.haxe.org.
-
 # Making the release
 
-- Regenerate API documentation (check --title and -D version values).
-- Make a GitHub release in https://github.com/HaxeFoundation/haxe/releases with
-  - the generated binaries and installers
-  - the API documentation
-- Update haxe.org
-  - Copy relevant changelog part to downloads/$version/CHANGES.md.
-  - Write announcement post in downloads/$version/RELEASE.md.
-  - Update downloads/versions.json.
-  - Push to staging, check https://staging.haxe.org/.
-  - Merge staging to master, check https://haxe.org/.
+- Make sure CHANGES.txt has a proper date set!
+- Make sure `version` in globals.ml has the correct value
+- Check if the protocolVersion in displayJson.ml has to be updated
+- Make an empty GitHub release in https://github.com/HaxeFoundation/haxe/releases (do this first because we need the tag for the builds)
+- Wait for the CI to build (check https://build.haxe.org/builds/haxe/)
+- Get https://github.com/simn/hxgithub
+- Store your GitHub personal access token in .github-token
+- Run something like this: `neko release.n -h 4.0.0-rc.1 -u -uw -ur -d haxe_2019-02-01_development_1fdd3d5.zip --dry`
+- Tell yourself that you're gonna fix `-doc` generation next time
+- Write the announcement to `./haxe-version/RELEASE.md`
+- If everything was working, run the command again without `--dry` (and probably without the `-d`)
+- Update https://github.com/HaxeFoundation/haxe.org/blob/staging/downloads/versions.json
 
 # Announcing the release
 
-- Post announcement post to haxelang.
+- Find someone to announce the release on our various communication channels
\ No newline at end of file
diff --git a/haxe.hxproj b/haxe.hxproj
deleted file mode 100644
index b29fe73b826a32504fed2eaa20be4ea2b4f719e7..0000000000000000000000000000000000000000
--- a/haxe.hxproj
+++ /dev/null
@@ -1,436 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project version="2">
-  <!-- Output SWF options -->
-  <output>
-    <movie outputType="CustomBuild" />
-    <movie input="" />
-    <movie path="" />
-    <movie fps="30" />
-    <movie width="800" />
-    <movie height="600" />
-    <movie version="10" />
-    <movie minorVersion="3" />
-    <movie platform="Flash Player" />
-    <movie background="#FFFFFF" />
-  </output>
-  <!-- Other classes to be compiled into your SWF -->
-  <classpaths>
-    <class path="std" />
-  </classpaths>
-  <!-- Build options -->
-  <build>
-    <option directives="" />
-    <option flashStrict="False" />
-    <option noInlineOnDebug="False" />
-    <option mainClass="" />
-    <option enabledebug="False" />
-    <option additional="" />
-  </build>
-  <!-- haxelib libraries -->
-  <haxelib>
-    <!-- example: <library name="..." /> -->
-  </haxelib>
-  <!-- Class files to compile (other referenced classes will automatically be included) -->
-  <compileTargets>
-    <!-- example: <compile path="..." /> -->
-  </compileTargets>
-  <!-- Assets to embed into the output SWF -->
-  <library>
-    <!-- example: <asset path="..." id="..." update="..." glyphs="..." mode="..." place="..." sharepoint="..." /> -->
-  </library>
-  <!-- Paths to exclude from the Project Explorer tree -->
-  <hiddenPaths>
-    <hidden path="ast.cmi" />
-    <hidden path="ast.cmx" />
-    <hidden path="typer.cmi" />
-    <hidden path="haxe.vcxproj.user" />
-    <hidden path="haxesetup.exe" />
-    <hidden path="interp.cmi" />
-    <hidden path="interp.cmx" />
-    <hidden path="interp.obj" />
-    <hidden path="lexer.cmi" />
-    <hidden path="lexer.cmx" />
-    <hidden path="lexer.ml" />
-    <hidden path="lexer.obj" />
-    <hidden path="main.cmi" />
-    <hidden path="main.cmx" />
-    <hidden path="main.obj" />
-    <hidden path="optimizer.cmi" />
-    <hidden path="optimizer.cmx" />
-    <hidden path="optimizer.obj" />
-    <hidden path="parser.cmi" />
-    <hidden path="parser.cmx" />
-    <hidden path="parser.obj" />
-    <hidden path="tmp.cmi" />
-    <hidden path="type.cmi" />
-    <hidden path="type.cmx" />
-    <hidden path="type.obj" />
-    <hidden path="typecore.cmi" />
-    <hidden path="typecore.cmx" />
-    <hidden path="typecore.obj" />
-    <hidden path="typeload.cmi" />
-    <hidden path="typeload.cmx" />
-    <hidden path="typeload.obj" />
-    <hidden path="haxe.vcproj" />
-    <hidden path="typer.obj" />
-    <hidden path="gencpp.cmi" />
-    <hidden path="gencpp.cmx" />
-    <hidden path="gencpp.obj" />
-    <hidden path="gencs.cmi" />
-    <hidden path="gencs.cmx" />
-    <hidden path="gencs.obj" />
-    <hidden path="genjava.cmi" />
-    <hidden path="genjava.cmx" />
-    <hidden path="genjava.obj" />
-    <hidden path="genjs.cmi" />
-    <hidden path="genjs.cmx" />
-    <hidden path="genjs.obj" />
-    <hidden path="genneko.cmi" />
-    <hidden path="genneko.cmx" />
-    <hidden path="genneko.obj" />
-    <hidden path="genphp.cmi" />
-    <hidden path="genphp.cmx" />
-    <hidden path="genphp.obj" />
-    <hidden path="genswf.cmi" />
-    <hidden path="genswf.cmx" />
-    <hidden path="genswf.obj" />
-    <hidden path="genswf8.cmi" />
-    <hidden path="genswf8.cmx" />
-    <hidden path="genswf8.obj" />
-    <hidden path="genswf9.cmi" />
-    <hidden path="genswf9.cmx" />
-    <hidden path="genswf9.obj" />
-    <hidden path="genxml.cmi" />
-    <hidden path="genxml.cmx" />
-    <hidden path="genxml.obj" />
-    <hidden path="haxe.exe" />
-    <hidden path="haxe.sdf" />
-    <hidden path="haxe.sln" />
-    <hidden path="haxe.suo" />
-    <hidden path="typer.cmx" />
-    <hidden path="gencommon.obj" />
-    <hidden path="codegen.cmi" />
-    <hidden path="codegen.cmx" />
-    <hidden path="codegen.obj" />
-    <hidden path="common.cmi" />
-    <hidden path="common.cmx" />
-    <hidden path="common.obj" />
-    <hidden path="dce.cmi" />
-    <hidden path="dce.cmx" />
-    <hidden path="dce.obj" />
-    <hidden path="genas3.cmi" />
-    <hidden path="genas3.cmx" />
-    <hidden path="genas3.obj" />
-    <hidden path="gencommon.cmi" />
-    <hidden path="gencommon.cmx" />
-    <hidden path="ast.obj" />
-    <hidden path="haxelib.exe" />
-    <hidden path="haxe.hxml" />
-    <hidden path="matcher.obj" />
-    <hidden path="matcher.cmx" />
-    <hidden path="matcher.cmi" />
-    <hidden path="version.obj" />
-    <hidden path="version.cmi" />
-    <hidden path="version.cmx" />
-    <hidden path="haxe.exe.manifest" />
-    <hidden path="obj" />
-    <hidden path="filters.obj" />
-    <hidden path="filters.cmi" />
-    <hidden path="filters.cmx" />
-    <hidden path="genpy.obj" />
-    <hidden path="genpy.cmi" />
-    <hidden path="genpy.cmx" />
-    <hidden path="analyzer.cmi" />
-    <hidden path="analyzer.cmx" />
-    <hidden path="analyzer.obj" />
-    <hidden path="CONTRIBUTING.md" />
-    <hidden path="README.md" />
-    <hidden path="Makefile" />
-    <hidden path="Makefile.win" />
-    <hidden path="appveyor.yml" />
-    <hidden path="version.ml" />
-    <hidden path="lib" />
-    <hidden path="Makefile.version_extra" />
-    <hidden path="genheaps.cmx" />
-    <hidden path="genheaps.obj" />
-    <hidden path="genheaps.cmi" />
-    <hidden path="genhl.cmx" />
-    <hidden path="genhl.obj" />
-    <hidden path="genhl.cmi" />
-    <hidden path="src\version.obj" />
-    <hidden path="src\version.cmi" />
-    <hidden path="src\version.cmx" />
-    <hidden path="src\main.obj" />
-    <hidden path="src\main.cmx" />
-    <hidden path="src\main.cmi" />
-    <hidden path="src\typing\typer.obj" />
-    <hidden path="src\typing\typer.cmx" />
-    <hidden path="src\typing\typer.cmi" />
-    <hidden path="src\typing\typeload.obj" />
-    <hidden path="src\typing\typeload.cmx" />
-    <hidden path="src\typing\typeload.cmi" />
-    <hidden path="src\typing\typecore.obj" />
-    <hidden path="src\typing\typecore.cmx" />
-    <hidden path="src\typing\typecore.cmi" />
-    <hidden path="src\typing\type.obj" />
-    <hidden path="src\typing\type.cmx" />
-    <hidden path="src\typing\type.cmi" />
-    <hidden path="src\typing\matcher.obj" />
-    <hidden path="src\typing\matcher.cmx" />
-    <hidden path="src\typing\matcher.cmi" />
-    <hidden path="src\typing\common.obj" />
-    <hidden path="src\typing\common.cmx" />
-    <hidden path="src\typing\common.cmi" />
-    <hidden path="src\syntax\parser.obj" />
-    <hidden path="src\syntax\parser.cmx" />
-    <hidden path="src\syntax\parser.cmi" />
-    <hidden path="src\syntax\lexer.obj" />
-    <hidden path="src\syntax\lexer.ml" />
-    <hidden path="src\syntax\lexer.cmx" />
-    <hidden path="src\syntax\lexer.cmi" />
-    <hidden path="src\syntax\ast.obj" />
-    <hidden path="src\syntax\ast.cmx" />
-    <hidden path="src\syntax\ast.cmi" />
-    <hidden path="src\optimization\optimizer.obj" />
-    <hidden path="src\optimization\optimizer.cmx" />
-    <hidden path="src\optimization\optimizer.cmi" />
-    <hidden path="src\optimization\filters.obj" />
-    <hidden path="src\optimization\filters.cmx" />
-    <hidden path="src\optimization\filters.cmi" />
-    <hidden path="src\optimization\dce.obj" />
-    <hidden path="src\optimization\dce.cmi" />
-    <hidden path="src\optimization\analyzer.obj" />
-    <hidden path="src\optimization\dce.cmx" />
-    <hidden path="src\optimization\analyzer.cmx" />
-    <hidden path="src\optimization\analyzer.cmi" />
-    <hidden path="src\macro\interp.obj" />
-    <hidden path="src\macro\interp.cmx" />
-    <hidden path="src\macro\interp.cmi" />
-    <hidden path="src\generators\genxml.obj" />
-    <hidden path="src\generators\genxml.cmx" />
-    <hidden path="src\generators\genxml.cmi" />
-    <hidden path="src\generators\genswf9.obj" />
-    <hidden path="src\generators\genswf9.cmi" />
-    <hidden path="src\generators\genswf9.cmx" />
-    <hidden path="src\generators\genswf.obj" />
-    <hidden path="src\generators\genswf.cmx" />
-    <hidden path="src\generators\genswf.cmi" />
-    <hidden path="src\generators\genpy.obj" />
-    <hidden path="src\generators\genpy.cmx" />
-    <hidden path="src\generators\genpy.cmi" />
-    <hidden path="src\generators\genphp.obj" />
-    <hidden path="src\generators\genphp.cmx" />
-    <hidden path="src\generators\genneko.obj" />
-    <hidden path="src\generators\genphp.cmi" />
-    <hidden path="src\generators\genneko.cmx" />
-    <hidden path="src\generators\genneko.cmi" />
-    <hidden path="src\generators\genjs.obj" />
-    <hidden path="src\generators\genjs.cmx" />
-    <hidden path="src\generators\genjs.cmi" />
-    <hidden path="src\generators\genjava.obj" />
-    <hidden path="src\generators\genjava.cmx" />
-    <hidden path="src\generators\genjava.cmi" />
-    <hidden path="src\generators\genhl.obj" />
-    <hidden path="src\generators\genhl.cmx" />
-    <hidden path="src\generators\genhl.cmi" />
-    <hidden path="src\generators\gencs.obj" />
-    <hidden path="src\generators\gencs.cmx" />
-    <hidden path="src\generators\gencs.cmi" />
-    <hidden path="src\generators\gencpp.obj" />
-    <hidden path="src\generators\gencpp.cmx" />
-    <hidden path="src\generators\gencpp.cmi" />
-    <hidden path="src\generators\gencommon.obj" />
-    <hidden path="src\generators\gencommon.cmx" />
-    <hidden path="src\generators\gencommon.cmi" />
-    <hidden path="src\generators\genas3.obj" />
-    <hidden path="src\generators\genas3.cmx" />
-    <hidden path="src\generators\genas3.cmi" />
-    <hidden path="src\generators\codegen.obj" />
-    <hidden path="src\generators\codegen.cmx" />
-    <hidden path="src\generators\codegen.cmi" />
-    <hidden path="src\optimization\analyzerConfig.cmi" />
-    <hidden path="src\optimization\analyzerConfig.cmx" />
-    <hidden path="src\optimization\analyzerConfig.obj" />
-    <hidden path="src\optimization\analyzerTexpr.cmi" />
-    <hidden path="src\optimization\analyzerTexpr.cmx" />
-    <hidden path="src\optimization\analyzerTexpr.obj" />
-    <hidden path="src\optimization\analyzerTexprTransformer.cmi" />
-    <hidden path="src\optimization\analyzerTexprTransformer.cmx" />
-    <hidden path="src\optimization\analyzerTexprTransformer.obj" />
-    <hidden path="src\optimization\analyzerTypes.cmi" />
-    <hidden path="src\optimization\analyzerTypes.cmx" />
-    <hidden path="src\optimization\analyzerTypes.obj" />
-    <hidden path="src\json.cmi" />
-    <hidden path="src\json.cmx" />
-    <hidden path="src\json.o" />
-    <hidden path="src\main.o" />
-    <hidden path="src\version.o" />
-    <hidden path="src\display\display.cmx" />
-    <hidden path="src\display\display.o" />
-    <hidden path="src\display\display.cmi" />
-    <hidden path="src\generators\codegen.o" />
-    <hidden path="src\generators\genas3.o" />
-    <hidden path="src\generators\gencommon.o" />
-    <hidden path="src\generators\gencpp.o" />
-    <hidden path="src\generators\gencs.o" />
-    <hidden path="src\generators\genhl.o" />
-    <hidden path="src\generators\genjava.o" />
-    <hidden path="src\generators\genjs.o" />
-    <hidden path="src\generators\genlua.cmi" />
-    <hidden path="src\generators\genlua.cmx" />
-    <hidden path="src\generators\genlua.o" />
-    <hidden path="src\generators\genneko.o" />
-    <hidden path="src\generators\genphp.o" />
-    <hidden path="src\generators\genpy.o" />
-    <hidden path="src\generators\genswf.o" />
-    <hidden path="src\generators\genswf9.o" />
-    <hidden path="src\generators\genxml.o" />
-    <hidden path="src\macro\interp.o" />
-    <hidden path="src\optimization\analyzer.o" />
-    <hidden path="src\optimization\analyzerConfig.o" />
-    <hidden path="src\optimization\analyzerTexpr.o" />
-    <hidden path="src\optimization\analyzerTexprTransformer.o" />
-    <hidden path="src\optimization\analyzerTypes.o" />
-    <hidden path="src\optimization\dce.o" />
-    <hidden path="src\optimization\filters.o" />
-    <hidden path="src\optimization\optimizer.o" />
-    <hidden path="src\syntax\ast.o" />
-    <hidden path="src\syntax\lexer.o" />
-    <hidden path="src\syntax\parser.o" />
-    <hidden path="src\typing\common.o" />
-    <hidden path="src\typing\matcher.o" />
-    <hidden path="src\typing\type.o" />
-    <hidden path="src\typing\typecore.o" />
-    <hidden path="src\typing\typeload.o" />
-    <hidden path="src\typing\typer.o" />
-    <hidden path=".travis" />
-    <hidden path="src\json.obj" />
-    <hidden path="src\display\display.obj" />
-    <hidden path="src\generators\genlua.obj" />
-    <hidden path="src\display\display.cmt" />
-    <hidden path="src\display\displayTypes.cmt" />
-    <hidden path="src\display\displayTypes.cmi" />
-    <hidden path="src\display\displayTypes.cmx" />
-    <hidden path="src\display\displayTypes.o" />
-    <hidden path="src\generators\codegen.cmt" />
-    <hidden path="src\generators\genas3.cmt" />
-    <hidden path="src\generators\gencommon.cmt" />
-    <hidden path="src\generators\gencpp.cmt" />
-    <hidden path="src\generators\gencs.cmt" />
-    <hidden path="src\generators\genhl.cmt" />
-    <hidden path="src\generators\genjava.cmt" />
-    <hidden path="src\generators\genjs.cmt" />
-    <hidden path="src\generators\genlua.cmt" />
-    <hidden path="src\generators\genneko.cmt" />
-    <hidden path="src\generators\genphp.cmt" />
-    <hidden path="src\generators\genpy.cmt" />
-    <hidden path="src\generators\genswf.cmt" />
-    <hidden path="src\generators\genswf9.cmt" />
-    <hidden path="src\generators\genxml.cmt" />
-    <hidden path="src\macro\interp.cmt" />
-    <hidden path="src\optimization\analyzer.cmt" />
-    <hidden path="src\optimization\analyzerConfig.cmt" />
-    <hidden path="src\optimization\analyzerTexpr.cmt" />
-    <hidden path="src\optimization\analyzerTexprTransformer.cmt" />
-    <hidden path="src\optimization\analyzerTypes.cmt" />
-    <hidden path="src\optimization\dce.cmt" />
-    <hidden path="src\optimization\filters.cmt" />
-    <hidden path="src\optimization\optimizer.cmt" />
-    <hidden path="src\syntax\ast.cmt" />
-    <hidden path="src\syntax\lexer.cmt" />
-    <hidden path="src\syntax\parser.cmt" />
-    <hidden path="src\typing\common.cmt" />
-    <hidden path="src\typing\matcher.cmt" />
-    <hidden path="src\typing\type.cmt" />
-    <hidden path="src\typing\typecore.cmt" />
-    <hidden path="src\typing\typeload.cmt" />
-    <hidden path="src\typing\typer.cmt" />
-    <hidden path="src\globals.cmi" />
-    <hidden path="src\globals.cmt" />
-    <hidden path="src\globals.cmx" />
-    <hidden path="src\globals.o" />
-    <hidden path="src\main.cmt" />
-    <hidden path="src\path.cmi" />
-    <hidden path="src\path.cmt" />
-    <hidden path="src\path.cmx" />
-    <hidden path="src\path.o" />
-    <hidden path="src\server.cmi" />
-    <hidden path="src\server.cmt" />
-    <hidden path="src\server.cmx" />
-    <hidden path="src\server.o" />
-    <hidden path="src\typing\overloads.cmi" />
-    <hidden path="src\typing\overloads.cmt" />
-    <hidden path="src\typing\overloads.cmx" />
-    <hidden path="src\typing\overloads.o" />
-    <hidden path="src\display\displayOutput.cmi" />
-    <hidden path="src\display\displayOutput.cmt" />
-    <hidden path="src\display\displayOutput.cmx" />
-    <hidden path="src\display\displayOutput.o" />
-    <hidden path="src\generators\hlcode.cmt" />
-    <hidden path="src\generators\hlinterp.cmt" />
-    <hidden path="src\generators\hlcode.o" />
-    <hidden path="src\generators\hlcode.cmi" />
-    <hidden path="src\generators\hlcode.cmx" />
-    <hidden path="src\typing\error.cmi" />
-    <hidden path="src\typing\error.cmt" />
-    <hidden path="src\typing\error.cmx" />
-    <hidden path="src\typing\error.o" />
-    <hidden path="src\generators\hl2c.cmt" />
-    <hidden path="src\generators\hlinterp.cmi" />
-    <hidden path="src\generators\hlinterp.cmx" />
-    <hidden path="src\generators\hlinterp.o" />
-    <hidden path="src\generators\hl2c.cmi" />
-    <hidden path="src\generators\hl2c.cmx" />
-    <hidden path="src\generators\hl2c.o" />
-    <hidden path="src\optimization\optimizerTexpr.cmi" />
-    <hidden path="src\optimization\optimizerTexpr.cmt" />
-    <hidden path="src\optimization\optimizerTexpr.cmx" />
-    <hidden path="src\optimization\optimizerTexpr.o" />
-    <hidden path="src\generators\hlopt.cmi" />
-    <hidden path="src\generators\hlopt.cmt" />
-    <hidden path="src\generators\hlopt.cmx" />
-    <hidden path="src\generators\hlopt.o" />
-    <hidden path="src\json.cmt" />
-    <hidden path="src\version.cmt" />
-    <hidden path="src\context\common.cmi" />
-    <hidden path="src\context\common.cmt" />
-    <hidden path="src\context\common.cmx" />
-    <hidden path="src\context\common.o" />
-    <hidden path="src\context\meta.cmi" />
-    <hidden path="src\context\meta.cmt" />
-    <hidden path="src\context\meta.cmx" />
-    <hidden path="src\context\meta.o" />
-    <hidden path="src\typing\abstract.cmi" />
-    <hidden path="src\typing\abstract.cmt" />
-    <hidden path="src\typing\abstract.cmx" />
-    <hidden path="src\typing\abstract.o" />
-    <hidden path="src\macro\macroContext.cmt" />
-    <hidden path="src\macro\macroContext.cmi" />
-    <hidden path="src\macro\macroContext.cmx" />
-    <hidden path="src\macro\macroContext.o" />
-    <hidden path="src\macro\hlmacro.cmi" />
-    <hidden path="src\macro\hlmacro.cmt" />
-    <hidden path="src\macro\hlmacro.cmx" />
-    <hidden path="src\macro\hlmacro.o" />
-    <hidden path="src\macro\macroApi.cmi" />
-    <hidden path="src\macro\macroApi.cmt" />
-    <hidden path="src\macro\macroApi.cmx" />
-    <hidden path="src\macro\macroApi.o" />
-    <hidden path="src\generators\genphp7.cmi" />
-    <hidden path="src\generators\genphp7.cmt" />
-    <hidden path="src\generators\genphp7.cmx" />
-    <hidden path="src\generators\genphp7.o" />
-  </hiddenPaths>
-  <!-- Executed before build -->
-  <preBuildCommand>make -j4 FD_OUTPUT=1 -f Makefile.win kill haxe</preBuildCommand>
-  <!-- Executed after build -->
-  <postBuildCommand alwaysRun="False" />
-  <!-- Other project options -->
-  <options>
-    <option showHiddenPaths="False" />
-    <option testMovie="Custom" />
-    <option testMovieCommand="" />
-  </options>
-  <!-- Plugin storage -->
-  <storage />
-</project>
\ No newline at end of file
diff --git a/libs/.editorconfig b/libs/.editorconfig
deleted file mode 100755
index 703bf30aca700e7d382df3df247799b8c3de9e36..0000000000000000000000000000000000000000
--- a/libs/.editorconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# http://editorconfig.org
-
-[*.c]
-charset = utf-8
-indent_style = tab
-indent_size = 4
-end_of_line = lf
-indent_brace_style = K&R
-insert_final_newline = true
-trim_trailing_whitespace = true
-max_line_length = 100
diff --git a/libs/.travis.yml b/libs/.travis.yml
deleted file mode 100644
index c0c2d803345336a6988ba41c1fc6fb769a722cd0..0000000000000000000000000000000000000000
--- a/libs/.travis.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-language: generic
-
-os:
-  - linux
-  - osx
-
-dist: trusty
-sudo: required
-
-env:
-  global:
-    # 3.4_bugfix is not safe-string compatible
-    - OCAMLPARAM="safe-string=0,_"
-
-install:
-  # Install dependencies
-  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-      sudo add-apt-repository ppa:haxe/ocaml -y;
-      sudo apt-get update -qq;
-      sudo apt-get install ocaml camlp4 zlib1g-dev -qqy;
-    fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
-      travis_retry brew update;
-      travis_retry brew install ocaml camlp4;
-    fi
-
-script:
-  - make
diff --git a/libs/Makefile b/libs/Makefile
index 913d020f2188d8f3b1126fb53a3bd692e64d1680..0e0f53d939f7ca4d1417367dbb114ef4b8efc390 100644
--- a/libs/Makefile
+++ b/libs/Makefile
@@ -1,24 +1,23 @@
 OCAMLOPT = ocamlopt
 OCAMLC = ocamlc
 TARGET_FLAG = all
-LIBS=extlib extc neko javalib ilib ziplib swflib xml-light ttflib objsize pcre
+LIBS=extlib-leftovers extc neko javalib ilib swflib ttflib objsize pcre ziplib
 
 all: $(LIBS)
 $(LIBS):
-	make -C $@ OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
+	$(MAKE) -C $@ OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
 
 clean:
-	make -C extlib clean
-	make -C extc clean
-	make -C neko clean
-	make -C ziplib clean
-	make -C javalib clean
-	make -C ilib clean
-	make -C swflib clean
-	make -C xml-light clean
-	make -C ttflib clean
-	make -C objsize clean
-	make -C pcre clean
+	$(MAKE) -C extlib-leftovers clean
+	$(MAKE) -C extc clean
+	$(MAKE) -C neko clean
+	$(MAKE) -C javalib clean
+	$(MAKE) -C ilib clean
+	$(MAKE) -C swflib clean
+	$(MAKE) -C ttflib clean
+	$(MAKE) -C objsize clean
+	$(MAKE) -C pcre clean
+	$(MAKE) -C ziplib clean
 
 .PHONY: all clean $(LIBS)
 
diff --git a/libs/extc/Makefile b/libs/extc/Makefile
index 101efd300ffc5e3a08b795756cd6c92781913bc1..d3c14e521facbea3d850f5639f4b0225ce5c80dc 100644
--- a/libs/extc/Makefile
+++ b/libs/extc/Makefile
@@ -1,5 +1,4 @@
 ALL_CFLAGS = $(CFLAGS)
-LIBS = -I ../extlib
 OCAMLOPT=ocamlopt
 OCAMLC=ocamlc
 SRC = extc.ml process.ml extc_stubs.c process_stubs.c
@@ -11,24 +10,21 @@ bytecode: extc.cma
 native: extc.cmxa
 
 extc.cma: extc_stubs.o process_stubs.o extc.ml process.ml
-	$(OCAMLC) -a -o extc.cma $(LIBS) extc.ml process.ml
+	ocamlfind $(OCAMLC) -safe-string -a -o extc.cma -package extlib extc.ml process.ml
 
 extc.cmxa: extc.ml process.ml extc_stubs.o process_stubs.o
-	$(OCAMLOPT) -a -o extc.cmxa $(LIBS) extc.ml process.ml
+	ocamlfind $(OCAMLOPT) -safe-string -a -o extc.cmxa -package extlib extc.ml process.ml
 
 extc_stubs.o: extc_stubs.c
-	$(OCAMLC) $(ALL_CFLAGS) extc_stubs.c
+	ocamlfind $(OCAMLC) -safe-string $(ALL_CFLAGS) extc_stubs.c
 
 process_stubs.o: process_stubs.c
-	$(OCAMLC) $(ALL_CFLAGS) process_stubs.c
-	
+	ocamlfind $(OCAMLC) -safe-string $(ALL_CFLAGS) process_stubs.c
+
 clean:
 	rm -f extc.cma extc.cmi extc.cmx extc.cmxa extc.o extc.obj extc.lib extc_stubs.obj extc_stubs.o process.cmx process.obj process.cmi process.o process_stubs.obj process_stubs.o
 	rm -f extc.a libextc.a libextc.lib extc.cmo process.cmo
 
-test: native
-	ocamlopt -o test.exe -I ../extLib extLib.cmxa zlib/zlib.lib extc_stubs.obj process_stubs.obj extc.cmxa test.ml
-	
 .PHONY: all bytecode native clean
 Makefile: ;
 $(SRC): ;
diff --git a/libs/extc/extc.ml b/libs/extc/extc.ml
index be7a6057cf3cfb13cb20cfa2c087c141d4bd34de..65b375ddc5a7199c17583dcbc687a2ddfaef998e 100644
--- a/libs/extc/extc.ml
+++ b/libs/extc/extc.ml
@@ -34,11 +34,11 @@ type zresult = {
 }
 
 external zlib_deflate_init2 : int -> int -> zstream = "zlib_deflate_init2"
-external zlib_deflate : zstream -> src:string -> spos:int -> slen:int -> dst:string -> dpos:int -> dlen:int -> zflush -> zresult = "zlib_deflate_bytecode" "zlib_deflate"
+external zlib_deflate : zstream -> src:string -> spos:int -> slen:int -> dst:bytes -> dpos:int -> dlen:int -> zflush -> zresult = "zlib_deflate_bytecode" "zlib_deflate"
 external zlib_deflate_end : zstream -> unit = "zlib_deflate_end"
 
 external zlib_inflate_init2 : int -> zstream = "zlib_inflate_init"
-external zlib_inflate : zstream -> src:string -> spos:int -> slen:int -> dst:string -> dpos:int -> dlen:int -> zflush -> zresult = "zlib_inflate_bytecode" "zlib_inflate"
+external zlib_inflate : zstream -> src:string -> spos:int -> slen:int -> dst:bytes -> dpos:int -> dlen:int -> zflush -> zresult = "zlib_inflate_bytecode" "zlib_inflate"
 external zlib_inflate_end : zstream -> unit = "zlib_inflate_end"
 
 external _executable_path : string -> string = "executable_path"
@@ -47,6 +47,8 @@ external get_real_path : string -> string = "get_real_path"
 
 external zlib_deflate_bound : zstream -> int -> int = "zlib_deflate_bound"
 
+external zlib_crc32 : bytes -> int -> int32 = "zlib_crc32"
+
 external time : unit -> float = "sys_time"
 
 type library
@@ -91,26 +93,26 @@ let executable_path() =
 
 let zlib_op op z str =
 	let bufsize = 1 lsl 14 in
-	let tmp = String.create bufsize in
+	let tmp = Bytes.create bufsize in
 	let total = ref 0 in
 	let rec loop pos len acc =
 		let r = op z ~src:str ~spos:pos ~slen:len ~dst:tmp ~dpos:0 ~dlen:bufsize (if len = 0 then Z_FINISH else Z_SYNC_FLUSH) in
 		total := !total + r.z_wrote;
-		let acc = String.sub tmp 0 r.z_wrote :: acc in
+		let acc = Bytes.sub tmp 0 r.z_wrote :: acc in
 		if r.z_finish then
 			acc
 		else
 			loop (pos + r.z_read) (len - r.z_read) acc
 	in
 	let strings = loop 0 (String.length str) [] in
-	let big = String.create !total in
+	let big = Bytes.create !total in
 	ignore(List.fold_left (fun p s ->
-		let l = String.length s in
+		let l = Bytes.length s in
 		let p = p - l in
-		String.unsafe_blit s 0 big p l;
+		Bytes.unsafe_blit s 0 big p l;
 		p
 	) !total strings);
-	big
+	Bytes.unsafe_to_string big
 
 let zip str =
 	let z = zlib_deflate_init 9 in
@@ -125,8 +127,8 @@ let unzip str =
 	s
 
 let input_zip ?(bufsize=65536) ch =
-	let tmp_out = String.create bufsize in
-	let tmp_in = String.create bufsize in
+	let tmp_out = Bytes.create bufsize in
+	let tmp_in = Bytes.create bufsize in
 	let tmp_buf = Buffer.create bufsize in
 	let buf = ref "" in
 	let p = ref 0 in
@@ -134,8 +136,8 @@ let input_zip ?(bufsize=65536) ch =
 	let rec fill_buffer() =
 		let rec loop pos len =
 			if len > 0 || pos = 0 then begin
-				let r = zlib_inflate z tmp_in pos len tmp_out 0 bufsize (if pos = 0 && len = 0 then Z_FINISH else Z_SYNC_FLUSH) in
-				Buffer.add_substring tmp_buf tmp_out 0 r.z_wrote;
+				let r = zlib_inflate z (Bytes.unsafe_to_string tmp_in) pos len tmp_out 0 bufsize (if pos = 0 && len = 0 then Z_FINISH else Z_SYNC_FLUSH) in
+				Buffer.add_subbytes tmp_buf tmp_out 0 r.z_wrote;
 				loop (pos + r.z_read) (len - r.z_read);
 			end
 		in
@@ -172,30 +174,30 @@ let input_zip ?(bufsize=65536) ch =
 
 let output_zip ?(bufsize=65536) ?(level=9) ch =
 	let z = zlib_deflate_init level in
-	let out = String.create bufsize in
-	let tmp_out = String.create bufsize in
+	let out = Bytes.create bufsize in
+	let tmp_out = Bytes.create bufsize in
 	let p = ref 0 in
 	let rec flush finish =
-		let r = zlib_deflate z out 0 !p tmp_out 0 bufsize (if finish then Z_FINISH else Z_SYNC_FLUSH) in
+		let r = zlib_deflate z (Bytes.unsafe_to_string out) 0 !p tmp_out 0 bufsize (if finish then Z_FINISH else Z_SYNC_FLUSH) in
 		ignore(IO.really_output ch tmp_out 0 r.z_wrote);
 		let remain = !p - r.z_read in
-		String.blit out r.z_read out 0 remain;
+		Bytes.blit out r.z_read out 0 remain;
 		p := remain;
 		if finish && not r.z_finish then flush true
 	in
 	let write c =
 		if !p = bufsize then flush false;
-		String.unsafe_set out !p c;
+		Bytes.unsafe_set out !p c;
 		incr p
 	in
 	let rec output str pos len =
 		let b = bufsize - !p in
 		if len <= b then begin
-			String.blit str pos out !p len;
+			Bytes.blit str pos out !p len;
 			p := !p + len;
 			len
 		end else begin
-			String.blit str pos out !p b;
+			Bytes.blit str pos out !p b;
 			p := !p + b;
 			flush false;
 			b + output str (pos + b) (len - b);
diff --git a/libs/extc/extc_stubs.c b/libs/extc/extc_stubs.c
index a5564b479b391be1a8482d17bf2e6f57c202f67a..b5dd96dad5ff7e7e6c1f57038fcf08abdcbd2254 100644
--- a/libs/extc/extc_stubs.c
+++ b/libs/extc/extc_stubs.c
@@ -19,6 +19,7 @@
 
 #include <assert.h>
 #include <caml/alloc.h>
+#include <caml/memory.h>
 #include <caml/callback.h>
 #include <caml/custom.h>
 #include <caml/mlvalues.h>
@@ -34,6 +35,7 @@
 #	include <string.h>
 #	include <termios.h>
 #	include <stdio.h>
+#	include <time.h>
 #	include <sys/time.h>
 #	include <sys/times.h>
 #	include <sys/stat.h>
@@ -43,6 +45,8 @@
 #	include <sys/param.h>
 #	include <sys/syslimits.h>
 #	include <mach-o/dyld.h>
+#include <mach/mach.h>
+#include <mach/mach_time.h>
 #endif
 #ifdef __FreeBSD__
 #	include <sys/param.h>
@@ -352,6 +356,14 @@ CAMLprim value zlib_deflate_bound(value zv,value len) {
 	return Val_int(deflateBound(ZStreamP_val(zv),Int_val(len)));
 }
 
+CAMLprim value zlib_crc32( value src, value len ) {
+	CAMLparam2(src,len);
+	CAMLlocal1(result);
+	uLong crc = crc32(0L, (Bytef*)(String_val(src)), Int_val(len));
+	result = caml_copy_int32(crc);
+	CAMLreturn(result);
+}
+
 CAMLprim value executable_path(value u) {
 #ifdef _WIN32
 	char path[MAX_PATH];
@@ -443,8 +455,16 @@ CAMLprim value get_real_path( value path ) {
 
 		// get actual file/dir name with proper case
 		if ((handle = FindFirstFile(out, &data)) != INVALID_HANDLE_VALUE) {
+			int klen = strlen(data.cFileName);
+			// a ~ was expanded !
+			if( klen != i - last ) {
+				int d = klen - (i - last);
+				memmove(out + i + d, out + i, len - i + 1);
+				len += d;
+				i += d;
+			}
 			// replace the component with proper case
-			memcpy(out + last, data.cFileName, i - last);
+			memcpy(out + last, data.cFileName, klen + 1);
 			FindClose(handle);
 		}
 
@@ -463,6 +483,10 @@ CAMLprim value get_real_path( value path ) {
 #endif
 }
 
+#ifndef _WIN32
+#define TimeSpecToSeconds(ts) (double)ts.tv_sec + (double)ts.tv_nsec / 1000000000.0
+#endif
+
 CAMLprim value sys_time() {
 #ifdef _WIN32
 #define EPOCH_DIFF	(134774*24*60*60.0)
@@ -483,10 +507,29 @@ CAMLprim value sys_time() {
 		return caml_copy_double( ((double)ui.QuadPart) / 10000000.0 - EPOCH_DIFF );
 	}
 	return caml_copy_double( ((double)counter.QuadPart) / ((double)freq.QuadPart) );
+#elif __APPLE__
+
+	uint64_t time;
+	uint64_t elapsedNano;
+	static mach_timebase_info_data_t sTimebaseInfo;
+
+	time = mach_absolute_time();
+
+	if ( sTimebaseInfo.denom == 0 ) {
+		(void) mach_timebase_info(&sTimebaseInfo);
+	}
+
+	elapsedNano = time * sTimebaseInfo.numer / sTimebaseInfo.denom;
+
+	return caml_copy_double(time / 1000000000.0);
+#elif defined CLOCK_MONOTONIC_RAW
+	struct timespec t;
+	clock_gettime(CLOCK_MONOTONIC_RAW, &t);
+	return caml_copy_double(TimeSpecToSeconds(t));
 #else
-	struct tms t;
-	times(&t);
-	return caml_copy_double( ((double)(t.tms_utime + t.tms_stime)) / CLK_TCK );
+	struct timespec t;
+	clock_gettime(CLOCK_MONOTONIC, &t);
+	return caml_copy_double(TimeSpecToSeconds(t));
 #endif
 }
 
diff --git a/libs/extc/process_stubs.c b/libs/extc/process_stubs.c
index 97bb7fe9adf842d13f011e4e13c4192280923c0d..a8bedb5a718bf3dd6aba488e12352b82d9844434 100644
--- a/libs/extc/process_stubs.c
+++ b/libs/extc/process_stubs.c
@@ -23,6 +23,7 @@
  // ported from NekoVM
 
 #include <caml/alloc.h>
+#include <caml/memory.h>
 #include <caml/callback.h>
 #include <caml/mlvalues.h>
 #include <caml/fail.h>
@@ -31,6 +32,7 @@
 #	include <windows.h>
 #else
 #	include <sys/types.h>
+#	include <signal.h>
 #	include <unistd.h>
 #	include <errno.h>
 #	include <string.h>
@@ -241,12 +243,13 @@ static void free_process( value vp ) {
 	<doc>
 	Start a process using a command and the specified arguments.
 	When args is not null, cmd and args will be auto-quoted/escaped.
-	If no auto-quoting/escaping is desired, you should append necessary 
+	If no auto-quoting/escaping is desired, you should append necessary
 	arguments to cmd as if it is inputted to the shell directly, and pass
 	null as args.
 	</doc>
 **/
 CAMLprim value process_run( value cmd, value vargs ) {
+	CAMLparam2(cmd,vargs);
 	int i, isRaw;
 	vprocess *p;
 	val_check(cmd,string);
@@ -337,7 +340,7 @@ CAMLprim value process_run( value cmd, value vargs ) {
 		CloseHandle(oread);
 		CloseHandle(eread);
 		CloseHandle(iwrite);
-		
+
 		if( !CreateProcess(NULL,val_string(sargs),NULL,NULL,TRUE,0,NULL,NULL,&sinf,&p->pinf) ) {
 			CloseHandle(p->eread);
 			CloseHandle(p->oread);
@@ -404,9 +407,10 @@ CAMLprim value process_run( value cmd, value vargs ) {
 	p->eread = error[0];
 #	endif
 	{
-		value vp = alloc_abstract(k_process,p);
+		CAMLlocal1(vp);
+		vp = alloc_abstract(k_process,p);
 		val_gc(vp,free_process);
-		return vp;
+		CAMLreturn(vp);
 	}
 }
 
diff --git a/libs/extlib-leftovers/Makefile b/libs/extlib-leftovers/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..cc8bae9e415ffc1cd552af252b415695a184fc20
--- /dev/null
+++ b/libs/extlib-leftovers/Makefile
@@ -0,0 +1,35 @@
+# Makefile contributed by Alain Frisch
+OCAMLOPT=ocamlopt
+OCAMLC=ocamlc
+
+MODULES = \
+ multiArray rbuffer uCharExt uTF8
+
+# the list is topologically sorted
+
+MLI = $(MODULES:=.mli)
+SRC = $(MLI) $(MODULES:=.ml)
+
+all: bytecode native
+
+opt: native
+
+bytecode: extlib-leftovers.cma
+
+native: extlib-leftovers.cmxa
+
+extlib-leftovers.cma: $(SRC)
+	$(OCAMLC) -safe-string -a -o extlib-leftovers.cma $(SRC)
+
+extlib-leftovers.cmxa: $(SRC)
+	$(OCAMLOPT) -safe-string -g -a -o extlib-leftovers.cmxa $(SRC)
+
+clean:
+	rm -f $(wildcard *.cmo) $(wildcard *.cmx) $(wildcard *.o) $(wildcard *.cmi) $(wildcard *.cma) $(wildcard *.cmxa) $(wildcard *.a) $(wildcard *.lib) $(wildcard *.obj)
+	rm -Rf doc
+
+.PHONY: all opt bytecode native doc copy install uninstall clean
+
+Makefile: ;
+
+$(SRC): ;
diff --git a/libs/extlib/multiArray.ml b/libs/extlib-leftovers/multiArray.ml
similarity index 100%
rename from libs/extlib/multiArray.ml
rename to libs/extlib-leftovers/multiArray.ml
diff --git a/libs/extlib/multiArray.mli b/libs/extlib-leftovers/multiArray.mli
similarity index 100%
rename from libs/extlib/multiArray.mli
rename to libs/extlib-leftovers/multiArray.mli
diff --git a/libs/extlib/rbuffer.ml b/libs/extlib-leftovers/rbuffer.ml
similarity index 82%
rename from libs/extlib/rbuffer.ml
rename to libs/extlib-leftovers/rbuffer.ml
index 9c4d15c527459da3678a00200e5dabcc92d8155e..3615154f3af8006550bfd5d94756c9a15444018f 100644
--- a/libs/extlib/rbuffer.ml
+++ b/libs/extlib-leftovers/rbuffer.ml
@@ -34,14 +34,14 @@ let rec rope_nth i = function
 
 type t = {
   mutable rope : rope;     (* the left part is a rope *)
-  mutable buffer : string; (* the right part is a buffer... *)
+  mutable buffer : bytes; (* the right part is a buffer... *)
   mutable position : int;  (* ...with [position] bytes used *)
 }
 
 let create n =
   let n = if n < 1 then 1 else n in
   let n = if n > Sys.max_string_length then Sys.max_string_length else n in
-  let s = String.create n in
+  let s = Bytes.create n in
   { rope = rope_empty; buffer = s; position = 0; }
 
 let reset b =
@@ -68,10 +68,10 @@ let unsafe_contents b =
   let n = b.position in
   let len = r + n in
   if len > Sys.max_string_length then invalid_arg "Rbuffer.contents";
-  let s = String.create len in
+  let s = Bytes.create len in
   blit_rope s 0 b.rope;
-  String.blit b.buffer 0 s r n;
-  s
+  Bytes.blit b.buffer 0 s r n;
+  Bytes.unsafe_to_string s
 
 (* [blit_subrope s i ofs len] blits the subrope [r[ofs..ofs+len-1]] in string
    [s] at index [i] *)
@@ -96,49 +96,49 @@ let sub b ofs len =
   if len > Sys.max_string_length ||
      ofs < 0 || len < 0 || ofs > r + b.position - len
   then invalid_arg "Buffer.sub";
-  let s = String.create len in
+  let s = Bytes.create len in
   if ofs + len <= r then
     blit_subrope s 0 ofs len b.rope
   else if ofs >= r then
-    String.blit b.buffer (ofs - r) s 0 len
+    Bytes.blit b.buffer (ofs - r) s 0 len
   else begin
     blit_subrope s 0 ofs (r - ofs) b.rope;
-    String.blit b.buffer 0 s (r - ofs) (ofs + len - r)
+    Bytes.blit b.buffer 0 s (r - ofs) (ofs + len - r)
   end;
-  s
+  Bytes.unsafe_to_string s
 
 let nth b i =
   let r = rope_length b.rope in
   if i < 0 || i >= r + b.position then invalid_arg "Buffer.nth";
-  if i < r then rope_nth i b.rope else String.unsafe_get b.buffer (i - r)
+  if i < r then rope_nth i b.rope else Bytes.unsafe_get b.buffer (i - r)
 
 (* moves the data in [b.buffer], if any, to the rope; ensures [b.position=0] *)
 let move_buffer_to_rope b =
   let pos = b.position in
   if pos > 0 then begin
-    let n = String.length b.buffer in
+    let n = Bytes.length b.buffer in
     if pos = n then begin
       (* whole buffer goes to the rope; faster to allocate a new buffer *)
-      b.rope <- App (b.rope, Str b.buffer, rope_length b.rope + pos);
-      b.buffer <- String.create n
+      b.rope <- App (b.rope, Str (Bytes.unsafe_to_string b.buffer), rope_length b.rope + pos);
+      b.buffer <- Bytes.create n
     end else begin
       (* part of the buffer goes to the rope; easier to copy it *)
-      b.rope <- App (b.rope, Str (String.sub b.buffer 0 pos),
+      b.rope <- App (b.rope, Str (Bytes.sub_string b.buffer 0 pos),
 		     rope_length b.rope + pos)
     end;
     b.position <- 0
   end
 
 let add_char b c =
-  if b.position = String.length b.buffer then move_buffer_to_rope b;
+  if b.position = Bytes.length b.buffer then move_buffer_to_rope b;
   let pos = b.position in
-  b.buffer.[pos] <- c;
+  Bytes.set b.buffer pos c;
   b.position <- pos + 1
 
 (* allocates space for [len] bytes and returns the corresponding place
    (as a string and an offset within that string) *)
 let alloc b len =
-  let n = String.length b.buffer in
+  let n = Bytes.length b.buffer in
   let pos = b.position in
   let len' = pos + len in
   if len' <= n then begin
@@ -147,16 +147,16 @@ let alloc b len =
     b.buffer, pos
   end else if len' <= Sys.max_string_length then begin
     (* buffer and len fit in a new string, allocated in the rope *)
-    let str = String.create len' in
-    String.blit b.buffer 0 str 0 pos;
-    b.rope <- App (b.rope, Str str, rope_length b.rope + len');
+    let str = Bytes.create len' in
+    Bytes.blit b.buffer 0 str 0 pos;
+    b.rope <- App (b.rope, Str (Bytes.unsafe_to_string str), rope_length b.rope + len');
     b.position <- 0;
     str, pos
   end else begin
     (* buffer and len require two strings, allocated in the rope *)
-    let str = String.create len in
+    let str = Bytes.create len in
     b.rope <- App (b.rope,
-		   App (Str (String.sub b.buffer 0 pos), Str str, len'),
+		   App (Str (Bytes.sub_string b.buffer 0 pos), Str (Bytes.unsafe_to_string str), len'),
 		   rope_length b.rope + len');
     b.position <- 0;
     str, 0
@@ -178,7 +178,7 @@ let add_buffer b b2 =
   if b.position > 0 then move_buffer_to_rope b;
   (* now we have b.position = 0 *)
   b.rope <- App (b.rope, b2.rope, rope_length b.rope + rope_length b2.rope);
-  add_substring b b2.buffer 0 b2.position
+  add_substring b (Bytes.unsafe_to_string b2.buffer) 0 b2.position
 
 let rec add_channel b ic len =
   if len <= Sys.max_string_length then begin
@@ -193,7 +193,7 @@ let rec add_channel b ic len =
 let output_buffer oc b =
   let rec loop wl = match wl with
     | Str s :: wl ->
-      output oc s 0 (String.length s);
+      output oc (Bytes.of_string s) 0 (String.length s);
       loop wl
     | App( l, r, _) :: wl ->
       loop (l :: r :: wl)
@@ -216,4 +216,4 @@ let print fmt b =
       ()
   in
   loop [b.rope];
-  pp_print_string fmt (String.sub b.buffer 0 b.position)
+  pp_print_string fmt (Bytes.sub_string b.buffer 0 b.position)
diff --git a/libs/extlib/rbuffer.mli b/libs/extlib-leftovers/rbuffer.mli
similarity index 99%
rename from libs/extlib/rbuffer.mli
rename to libs/extlib-leftovers/rbuffer.mli
index 90725fe800f3514b8195919d29f1504e7e685eff..b74cd5b9803ab3f3e0e0be20d58f07c95e28191f 100644
--- a/libs/extlib/rbuffer.mli
+++ b/libs/extlib-leftovers/rbuffer.mli
@@ -27,7 +27,7 @@ val unsafe_contents : t -> string
 val sub : t -> int -> int -> string
 val nth : t -> int -> char
 
-  
+
 val add_char : t -> char -> unit
 
 val add_substring : t -> string -> int -> int -> unit
diff --git a/libs/extlib/uChar.ml b/libs/extlib-leftovers/uCharExt.ml
similarity index 100%
rename from libs/extlib/uChar.ml
rename to libs/extlib-leftovers/uCharExt.ml
diff --git a/libs/extlib/uChar.mli b/libs/extlib-leftovers/uCharExt.mli
similarity index 100%
rename from libs/extlib/uChar.mli
rename to libs/extlib-leftovers/uCharExt.mli
diff --git a/libs/extlib/uTF8.ml b/libs/extlib-leftovers/uTF8.ml
similarity index 95%
rename from libs/extlib/uTF8.ml
rename to libs/extlib-leftovers/uTF8.ml
index 3929228b46c3a669a6013024998d4e5859ae305b..ef61364deb07101a40732c227512ecc7f5381cbd 100644
--- a/libs/extlib/uTF8.ml
+++ b/libs/extlib-leftovers/uTF8.ml
@@ -1,6 +1,6 @@
-(* 
+(*
  * UTF-8 - UTF-8 encoded Unicode string
- * Copyright 2002, 2003 (C) Yamagata Yoriyuki. 
+ * Copyright 2002, 2003 (C) Yamagata Yoriyuki.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  *)
 
-open UChar
+open UCharExt
 
 type t = string
 type index = int
-  
+
 let look s i =
   let n' =
     let n = Char.code s.[i] in
@@ -42,7 +42,7 @@ let look s i =
       let n' = n' lsl 6 lor (0x7f land m) in
       let m = Char.code (String.unsafe_get s (i + 2)) in
       let n' = n' lsl 6 lor (0x7f land m) in
-      n' lsl 6 lor (0x7f land m0)     
+      n' lsl 6 lor (0x7f land m0)
     else if n <= 0xfb then
       let n' = n - 0xf8 in
       let m0 = Char.code s.[i + 4] in
@@ -52,7 +52,7 @@ let look s i =
       let n' = n' lsl 6 lor (0x7f land m) in
       let m = Char.code (String.unsafe_get s (i + 3)) in
       let n' = n' lsl 6 lor (0x7f land m) in
-      n' lsl 6 lor (0x7f land m0)     
+      n' lsl 6 lor (0x7f land m0)
     else if n <= 0xfd then
       let n' = n - 0xfc in
       let m0 = Char.code s.[i + 5] in
@@ -75,7 +75,7 @@ let rec search_head s i =
   if n < 0x80 || n >= 0xc2 then i else
   search_head s (i + 1)
 
-let next s i = 
+let next s i =
   let n = Char.code s.[i] in
   if n < 0x80 then i + 1 else
   if n < 0xc0 then search_head s (i + 1) else
@@ -121,7 +121,7 @@ let add_uchar buf u =
   let k = int_of_uchar u in
   if k < 0 || k >= 0x4000000 then begin
     Buffer.add_char buf (Char.chr (0xfc + (k lsr 30)));
-    Buffer.add_char buf (Char.unsafe_chr (0x80 lor ((k lsr 24) land masq))); 
+    Buffer.add_char buf (Char.unsafe_chr (0x80 lor ((k lsr 24) land masq)));
     Buffer.add_char buf (Char.unsafe_chr (0x80 lor ((k lsr 18) land masq)));
     Buffer.add_char buf (Char.unsafe_chr (0x80 lor ((k lsr 12) land masq)));
     Buffer.add_char buf (Char.unsafe_chr (0x80 lor ((k lsr 6) land masq)));
@@ -146,7 +146,7 @@ let add_uchar buf u =
     Buffer.add_char buf (Char.unsafe_chr (0x80 lor ((k lsr 12) land masq)));
     Buffer.add_char buf (Char.unsafe_chr (0x80 lor ((k lsr 6) land masq)));
     Buffer.add_char buf (Char.unsafe_chr (0x80 lor (k land masq)));
-  end 
+  end
 
 let init len f =
   let buf = Buffer.create len in
@@ -193,26 +193,26 @@ let validate s =
     let n = Char.code (String.unsafe_get s i) in
     if n < 0x80 then main (i + 1) else
     if n < 0xc2 then raise Malformed_code else
-    if n <= 0xdf then 
-      if trail 1 (i + 1) (n - 0xc0) < 0x80 then raise Malformed_code else 
+    if n <= 0xdf then
+      if trail 1 (i + 1) (n - 0xc0) < 0x80 then raise Malformed_code else
       main (i + 2)
-    else if n <= 0xef then 
-      if trail 2 (i + 1) (n - 0xe0) < 0x800 then raise Malformed_code else 
+    else if n <= 0xef then
+      if trail 2 (i + 1) (n - 0xe0) < 0x800 then raise Malformed_code else
       main (i + 3)
-    else if n <= 0xf7 then 
+    else if n <= 0xf7 then
       if trail 3 (i + 1) (n - 0xf0) < 0x10000 then raise Malformed_code else
       main (i + 4)
-    else if n <= 0xfb then 
+    else if n <= 0xfb then
       if trail 4 (i + 1) (n - 0xf8) < 0x200000 then raise Malformed_code else
       main (i + 5)
-    else if n <= 0xfd then 
+    else if n <= 0xfd then
       let n = trail 5 (i + 1) (n - 0xfc) in
       if n lsr 16 < 0x400 then raise Malformed_code else
       main (i + 6)
     else raise Malformed_code in
   main 0
 
-module Buf = 
+module Buf =
   struct
     include Buffer
     type buf = t
diff --git a/libs/extlib/uTF8.mli b/libs/extlib-leftovers/uTF8.mli
similarity index 89%
rename from libs/extlib/uTF8.mli
rename to libs/extlib-leftovers/uTF8.mli
index 55720d1401fee86875c0c079972299df8e450e0a..373ea6759dc3ce45b0b01d293630cba6d952255a 100644
--- a/libs/extlib/uTF8.mli
+++ b/libs/extlib-leftovers/uTF8.mli
@@ -1,6 +1,6 @@
-(* 
+(*
  * UTF-8 - UTF-8 encoded Unicode string
- * Copyright 2002, 2003 (C) Yamagata Yoriyuki. 
+ * Copyright 2002, 2003 (C) Yamagata Yoriyuki.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  *)
 
-(** UTF-8 encoded Unicode strings. 
+(** UTF-8 encoded Unicode strings.
 
    The Module for UTF-8 encoded Unicode strings.
 *)
 
-open UChar
+open UCharExt
 
 (** UTF-8 encoded Unicode strings. the type is normal string. *)
 type t = string
@@ -43,19 +43,19 @@ val validate : t -> unit
    The call requires O(n)-time. *)
 val get : t -> int -> uchar
 
-(** [init len f] 
+(** [init len f]
    returns a new string which contains [len] Unicode characters.
    The i-th Unicode character is initialized by [f i] *)
 val init : int -> (int -> uchar) -> t
 
 (** [length s] returns the number of Unicode characters contained in s *)
 val length : t -> int
-    
+
 (** Positions in the string represented by the number of bytes from the head.
    The location of the first character is [0] *)
 type index = int
 
-(** [nth s n] returns the position of the [n]-th Unicode character. 
+(** [nth s n] returns the position of the [n]-th Unicode character.
    The call requires O(n)-time *)
 val nth : t -> int -> index
 
@@ -71,26 +71,26 @@ val look : t -> index -> uchar
 val out_of_range : t -> index -> bool
 
 (** [compare_index s i1 i2] returns
-   a value < 0 if [i1] is the position located before [i2], 
+   a value < 0 if [i1] is the position located before [i2],
    0 if [i1] and [i2] points the same location,
    a value > 0 if [i1] is the position located after [i2]. *)
 val compare_index : t -> index -> index -> int
 
 (** [next s i]
    returns the position of the head of the Unicode character
-   located immediately after [i]. 
+   located immediately after [i].
    If [i] is inside of [s], the function always successes.
    If [i] is inside of [s] and there is no Unicode character after [i],
-   the position outside [s] is returned.  
+   the position outside [s] is returned.
    If [i] is not inside of [s], the behaviour is unspecified. *)
 val next : t -> index -> index
 
 (** [prev s i]
    returns the position of the head of the Unicode character
-   located immediately before [i]. 
+   located immediately before [i].
    If [i] is inside of [s], the function always successes.
    If [i] is inside of [s] and there is no Unicode character before [i],
-   the position outside [s] is returned.  
+   the position outside [s] is returned.
    If [i] is not inside of [s], the behaviour is unspecified. *)
 val prev : t -> index -> index
 
@@ -99,10 +99,10 @@ val prev : t -> index -> index
    [n]-th Unicode character before [i] if n < 0.
    If there is no such character, the result is unspecified. *)
 val move : t -> index -> int -> index
-    
+
 (** [iter f s]
-   applies [f] to all Unicode characters in [s].  
-   The order of application is same to the order 
+   applies [f] to all Unicode characters in [s].
+   The order of application is same to the order
    of the Unicode characters in [s]. *)
 val iter : (uchar -> unit) -> t -> unit
 
@@ -113,19 +113,21 @@ val iter : (uchar -> unit) -> t -> unit
    a negative integer if [s1] < [s2]. *)
 val compare : t -> t -> int
 
+val add_uchar : Buffer.t -> uchar -> unit
+
 (** Buffer module for UTF-8 strings *)
 module Buf : sig
-  (** Buffers for UTF-8 strings. *) 
+  (** Buffers for UTF-8 strings. *)
   type buf
 
-  (** [create n] creates a buffer with the initial size [n]-bytes. *)   
+  (** [create n] creates a buffer with the initial size [n]-bytes. *)
   val create : int -> buf
 
   (* The rest of functions is similar to the ones of Buffer in stdlib. *)
   (** [contents buf] returns the contents of the buffer. *)
   val contents : buf -> t
 
-  (** Empty the buffer, 
+  (** Empty the buffer,
      but retains the internal storage which was holding the contents *)
   val clear : buf -> unit
 
diff --git a/libs/extlib/IO.ml b/libs/extlib/IO.ml
deleted file mode 100644
index 1dec21650070fa06019865180303cbbf40ea92bf..0000000000000000000000000000000000000000
--- a/libs/extlib/IO.ml
+++ /dev/null
@@ -1,796 +0,0 @@
-(*
- * IO - Abstract input/output
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-type input = {
-	mutable in_read : unit -> char;
-	mutable in_input : string -> int -> int -> int;
-	mutable in_close : unit -> unit;
-}
-
-type 'a output = {
-	mutable out_write : char -> unit;
-	mutable out_output : string -> int -> int -> int;
-	mutable out_close : unit -> 'a;
-	mutable out_flush : unit -> unit;
-}
-
-exception No_more_input
-exception Input_closed
-exception Output_closed
-
-(* -------------------------------------------------------------- *)
-(* API *)
-
-let default_close = (fun () -> ())
-
-let create_in ~read ~input ~close =
-	{
-		in_read = read;
-		in_input = input;
-		in_close = close;
-	}
-
-let create_out ~write ~output ~flush ~close =
-	{
-		out_write = write;
-		out_output = output;
-		out_close = close;
-		out_flush = flush;
-	}
-
-let read i = i.in_read()
-
-let nread i n =
-	if n < 0 then invalid_arg "IO.nread";
-	if n = 0 then
-		""
-	else
-	let s = String.create n in
-	let l = ref n in
-	let p = ref 0 in
-	try
-		while !l > 0 do
-			let r = i.in_input s !p !l in
-			if r = 0 then raise No_more_input;
-			p := !p + r;
-			l := !l - r;
-		done;
-		s
-	with
-		No_more_input as e ->
-			if !p = 0 then raise e;
-			String.sub s 0 !p
-
-let really_output o s p l' =
-	let sl = String.length s in
-	if p + l' > sl || p < 0 || l' < 0 then invalid_arg "IO.really_output";
-   	let l = ref l' in
-	let p = ref p in
-	while !l > 0 do
-		let w = o.out_output s !p !l in
-		if w = 0 then raise Sys_blocked_io;
-		p := !p + w;
-		l := !l - w;
-	done;
-	l'
-
-let input i s p l =
-	let sl = String.length s in
-	if p + l > sl || p < 0 || l < 0 then invalid_arg "IO.input";
-	if l = 0 then
-		0
-	else
-		i.in_input s p l
-
-let really_input i s p l' =
-	let sl = String.length s in
-	if p + l' > sl || p < 0 || l' < 0 then invalid_arg "IO.really_input";
-	let l = ref l' in
-	let p = ref p in
-	while !l > 0 do
-		let r = i.in_input s !p !l in
-		if r = 0 then raise Sys_blocked_io;
-		p := !p + r;
-		l := !l - r;
-	done;
-	l'
-
-let really_nread i n =
-	if n < 0 then invalid_arg "IO.really_nread";
-	if n = 0 then ""
-	else
-	let s = String.create n
-	in
-	ignore(really_input i s 0 n);
-	s
-
-let close_in i =
-	let f _ = raise Input_closed in
-	i.in_close();
-	i.in_read <- f;
-	i.in_input <- f;
-	i.in_close <- f
-
-let write o x = o.out_write x
-
-let nwrite o s =
-	let p = ref 0 in
-	let l = ref (String.length s) in
-	while !l > 0 do
-		let w = o.out_output s !p !l in
-		if w = 0 then raise Sys_blocked_io;
-		p := !p + w;
-		l := !l - w;
-	done
-
-let output o s p l =
-	let sl = String.length s in
-	if p + l > sl || p < 0 || l < 0 then invalid_arg "IO.output";
-	o.out_output s p l
-
-let printf o fmt =
-	Printf.kprintf (fun s -> nwrite o s) fmt
-
-let flush o = o.out_flush()
-
-let close_out o =
-	let f _ = raise Output_closed in
-	let r = o.out_close() in
-	o.out_write <- f;
-	o.out_output <- f;
-	o.out_close <- f;
-	o.out_flush <- f;
-	r
-
-let read_all i =
-	let maxlen = 1024 in
-	let str = ref [] in
-	let pos = ref 0 in
-	let rec loop() =
-		let s = nread i maxlen in
-		str := (s,!pos) :: !str;
-		pos := !pos + String.length s;
-		loop()
-	in
-	try
-		loop()
-	with
-		No_more_input ->
-			let buf = String.create !pos in
-			List.iter (fun (s,p) ->
-				String.unsafe_blit s 0 buf p (String.length s)
-			) !str;
-			buf
-
-let pos_in i =
-	let p = ref 0 in
-	{
-		in_read = (fun () ->
-			let c = i.in_read() in
-			incr p;
-			c
-		);
-		in_input = (fun s sp l ->
-			let n = i.in_input s sp l in
-			p := !p + n;
-			n
-		);
-		in_close = i.in_close
-	} , (fun () -> !p)
-
-let pos_out o =
-	let p = ref 0 in
-	{
-		out_write = (fun c ->
-			o.out_write c;
-			incr p
-		);
-		out_output = (fun s sp l ->
-			let n = o.out_output s sp l in
-			p := !p + n;
-			n
-		);
-		out_close = o.out_close;
-		out_flush = o.out_flush;
-	} , (fun () -> !p)
-
-(* -------------------------------------------------------------- *)
-(* Standard IO *)
-
-let input_string s =
-	let pos = ref 0 in
-	let len = String.length s in
-	{
-		in_read = (fun () ->
-			if !pos >= len then raise No_more_input;
-			let c = String.unsafe_get s !pos in
-			incr pos;
-			c
-		);
-		in_input = (fun sout p l ->
-			if !pos >= len then raise No_more_input;
-			let n = (if !pos + l > len then len - !pos else l) in
-			String.unsafe_blit s !pos sout p n;
-			pos := !pos + n;
-			n
-		);
-		in_close = (fun () -> ());
-	}
-
-let output_string() =
-	let b = Buffer.create 0 in
-	{
-		out_write = (fun c ->
-			Buffer.add_char b c
-		);
-		out_output = (fun s p l ->
-			Buffer.add_substring b s p l;
-			l
-		);
-		out_close = (fun () -> Buffer.contents b);
-		out_flush = (fun () -> ());
-	}
-
-let output_strings() =
-	let sl = ref [] in
-	let size = ref 0 in
-	let b = Buffer.create 0 in
-	{
-		out_write = (fun c ->
-			if !size = Sys.max_string_length then begin
-				sl := Buffer.contents b :: !sl;
-				Buffer.clear b;
-				size := 0;
-			end else incr size;
-			Buffer.add_char b c
-		);
-		out_output = (fun s p l ->
-			if !size + l > Sys.max_string_length then begin
-				sl := Buffer.contents b :: !sl;
-				Buffer.clear b;
-				size := 0;
-			end else size := !size + l;
-			Buffer.add_substring b s p l;
-			l
-		);
-		out_close = (fun () -> sl := Buffer.contents b :: !sl; List.rev (!sl));
-		out_flush = (fun () -> ());
-	}
-
-
-let input_channel ch =
-	{
-		in_read = (fun () ->
-			try
-				input_char ch
-			with
-				End_of_file -> raise No_more_input
-		);
-		in_input = (fun s p l ->
-			let n = Pervasives.input ch s p l in
-			if n = 0 then raise No_more_input;
-			n
-		);
-		in_close = (fun () -> Pervasives.close_in ch);
-	}
-
-let output_channel ch =
-	{
-		out_write = (fun c -> output_char ch c);
-		out_output = (fun s p l -> Pervasives.output ch s p l; l);
-		out_close = (fun () -> Pervasives.close_out ch);
-		out_flush = (fun () -> Pervasives.flush ch);
-	}
-
-let input_enum e =
-	let pos = ref 0 in
-	{
-		in_read = (fun () ->
-			match Enum.get e with
-			| None -> raise No_more_input
-			| Some c ->
-				incr pos;
-				c
-		);
-		in_input = (fun s p l ->
-			let rec loop p l =
-				if l = 0 then
-					0
-				else
-					match Enum.get e with
-					| None -> l
-					| Some c ->
-						String.unsafe_set s p c;
-						loop (p + 1) (l - 1)
-			in
-			let k = loop p l in
-			if k = l then raise No_more_input;
-			l - k
-		);
-		in_close = (fun () -> ());
-	}
-
-let output_enum() =
-	let b = Buffer.create 0 in
-	{
-		out_write = (fun x ->
-			Buffer.add_char b x
-		);
-		out_output = (fun s p l ->
-			Buffer.add_substring b s p l;
-			l
-		);
-		out_close = (fun () ->
-			let s = Buffer.contents b in
-			ExtString.String.enum s
-		);
-		out_flush = (fun () -> ());
-	}
-
-let pipe() =
-	let input = ref "" in
-	let inpos = ref 0 in
-	let output = Buffer.create 0 in
-	let flush() =
-		input := Buffer.contents output;
-		inpos := 0;
-		Buffer.reset output;
-		if String.length !input = 0 then raise No_more_input
-	in
-	let read() =
-		if !inpos = String.length !input then flush();
-		let c = String.unsafe_get !input !inpos in
-		incr inpos;
-		c
-	in
-	let input s p l =
-		if !inpos = String.length !input then flush();
-		let r = (if !inpos + l > String.length !input then String.length !input - !inpos else l) in
-		String.unsafe_blit !input !inpos s p r;
-		inpos := !inpos + r;
-		r
-	in
-	let write c =
-		Buffer.add_char output c
-	in
-	let output s p l =
-		Buffer.add_substring output s p l;
-		l
-	in
-	let input = {
-		in_read = read;
-		in_input = input;
-		in_close = (fun () -> ());
-	} in
-	let output = {
-		out_write = write;
-		out_output = output;
-		out_close = (fun () -> ());
-		out_flush = (fun () -> ());
-	} in
-	input , output
-
-external cast_output : 'a output -> unit output = "%identity"
-
-(* -------------------------------------------------------------- *)
-(* BINARY APIs *)
-
-exception Overflow of string
-
-let read_byte i = int_of_char (i.in_read())
-
-let read_signed_byte i =
-	let c = int_of_char (i.in_read()) in
-	if c land 128 <> 0 then
-		c - 256
-	else
-		c
-
-let read_string i =
-	let b = Buffer.create 8 in
-	let rec loop() =
-		let c = i.in_read() in
-		if c <> '\000' then begin
-			Buffer.add_char b c;
-			loop();
-		end;
-	in
-	loop();
-	Buffer.contents b
-
-let read_line i =
-	let b = Buffer.create 8 in
-	let cr = ref false in
-	let rec loop() =
-		let c = i.in_read() in
-		match c with
-		| '\n' ->
-			()
-		| '\r' ->
-			cr := true;
-			loop()
-		| _ when !cr ->
-			cr := false;
-			Buffer.add_char b '\r';
-			Buffer.add_char b c;
-			loop();
-		| _ ->
-			Buffer.add_char b c;
-			loop();
-	in
-	try
-		loop();
-		Buffer.contents b
-	with
-		No_more_input ->
-			if !cr then Buffer.add_char b '\r';
-			if Buffer.length b > 0 then
-				Buffer.contents b
-			else
-				raise No_more_input
-
-let read_ui16 i =
-	let ch1 = read_byte i in
-	let ch2 = read_byte i in
-	ch1 lor (ch2 lsl 8)
-
-let read_i16 i =
-	let ch1 = read_byte i in
-	let ch2 = read_byte i in
-	let n = ch1 lor (ch2 lsl 8) in
-	if ch2 land 128 <> 0 then
-		n - 65536
-	else
-		n
-
-let read_i32 ch =
-	let ch1 = read_byte ch in
-	let ch2 = read_byte ch in
-	let ch3 = read_byte ch in
-	let ch4 = read_byte ch in
-	if ch4 land 128 <> 0 then begin
-		if ch4 land 64 = 0 then raise (Overflow "read_i32");
-		ch1 lor (ch2 lsl 8) lor (ch3 lsl 16) lor ((ch4 land 127) lsl 24)
-	end else begin
-		if ch4 land 64 <> 0 then raise (Overflow "read_i32");
-		ch1 lor (ch2 lsl 8) lor (ch3 lsl 16) lor (ch4 lsl 24)
-	end
-
-let read_real_i32 ch =
-	let ch1 = read_byte ch in
-	let ch2 = read_byte ch in
-	let ch3 = read_byte ch in
-	let base = Int32.of_int (ch1 lor (ch2 lsl 8) lor (ch3 lsl 16)) in
-	let big = Int32.shift_left (Int32.of_int (read_byte ch)) 24 in
-	Int32.logor base big
-
-let read_i64 ch =
-	let ch1 = read_byte ch in
-	let ch2 = read_byte ch in
-	let ch3 = read_byte ch in
-	let ch4 = read_byte ch in
-	let base = Int64.of_int (ch1 lor (ch2 lsl 8) lor (ch3 lsl 16)) in
-	let small = Int64.logor base (Int64.shift_left (Int64.of_int ch4) 24) in
-	let big = Int64.of_int32 (read_real_i32 ch) in
-	Int64.logor (Int64.shift_left big 32) small
-
-let read_double ch =
-	Int64.float_of_bits (read_i64 ch)
-
-let write_byte o n =
-	(* doesn't test bounds of n in order to keep semantics of Pervasives.output_byte *)
-	write o (Char.unsafe_chr (n land 0xFF))
-
-let write_string o s =
-	nwrite o s;
-	write o '\000'
-
-let write_line o s =
-	nwrite o s;
-	write o '\n'
-
-let write_ui16 ch n =
-	if n < 0 || n > 0xFFFF then raise (Overflow "write_ui16");
-	write_byte ch n;
-	write_byte ch (n lsr 8)
-
-let write_i16 ch n =
-	if n < -0x8000 || n > 0x7FFF then raise (Overflow "write_i16");
-	if n < 0 then
-		write_ui16 ch (65536 + n)
-	else
-		write_ui16 ch n
-
-let write_i32 ch n =
-	write_byte ch n;
-	write_byte ch (n lsr 8);
-	write_byte ch (n lsr 16);
-	write_byte ch (n asr 24)
-
-let write_real_i32 ch n =
-	let base = Int32.to_int n in
-	let big = Int32.to_int (Int32.shift_right_logical n 24) in
-	write_byte ch base;
-	write_byte ch (base lsr 8);
-	write_byte ch (base lsr 16);
-	write_byte ch big
-
-let write_i64 ch n =
-	write_real_i32 ch (Int64.to_int32 n);
-	write_real_i32 ch (Int64.to_int32 (Int64.shift_right_logical n 32))
-
-let write_double ch f =
-	write_i64 ch (Int64.bits_of_float f)
-
-(* -------------------------------------------------------------- *)
-(* Big Endians *)
-
-module BigEndian = struct
-
-let read_ui16 i =
-	let ch2 = read_byte i in
-	let ch1 = read_byte i in
-	ch1 lor (ch2 lsl 8)
-
-let read_i16 i =
-	let ch2 = read_byte i in
-	let ch1 = read_byte i in
-	let n = ch1 lor (ch2 lsl 8) in
-	if ch2 land 128 <> 0 then
-		n - 65536
-	else
-		n
-
-let read_i32 ch =
-	let ch4 = read_byte ch in
-	let ch3 = read_byte ch in
-	let ch2 = read_byte ch in
-	let ch1 = read_byte ch in
-	if ch4 land 128 <> 0 then begin
-		if ch4 land 64 = 0 then raise (Overflow "read_i32");
-		ch1 lor (ch2 lsl 8) lor (ch3 lsl 16) lor ((ch4 land 127) lsl 24)
-	end else begin
-		if ch4 land 64 <> 0 then raise (Overflow "read_i32");
-		ch1 lor (ch2 lsl 8) lor (ch3 lsl 16) lor (ch4 lsl 24)
-	end
-
-let read_real_i32 ch =
-	let big = Int32.shift_left (Int32.of_int (read_byte ch)) 24 in
-	let ch3 = read_byte ch in
-	let ch2 = read_byte ch in
-	let ch1 = read_byte ch in
-	let base = Int32.of_int (ch1 lor (ch2 lsl 8) lor (ch3 lsl 16)) in
-	Int32.logor base big
-
-let read_i64 ch =
-	let big = Int64.of_int32 (read_real_i32 ch) in
-	let ch4 = read_byte ch in
-	let ch3 = read_byte ch in
-	let ch2 = read_byte ch in
-	let ch1 = read_byte ch in
-	let base = Int64.of_int (ch1 lor (ch2 lsl 8) lor (ch3 lsl 16)) in
-	let small = Int64.logor base (Int64.shift_left (Int64.of_int ch4) 24) in
-	Int64.logor (Int64.shift_left big 32) small
-
-let read_double ch =
-	Int64.float_of_bits (read_i64 ch)
-
-let write_ui16 ch n =
-	if n < 0 || n > 0xFFFF then raise (Overflow "write_ui16");
-	write_byte ch (n lsr 8);
-	write_byte ch n
-
-let write_i16 ch n =
-	if n < -0x8000 || n > 0x7FFF then raise (Overflow "write_i16");
-	if n < 0 then
-		write_ui16 ch (65536 + n)
-	else
-		write_ui16 ch n
-
-let write_i32 ch n =
-	write_byte ch (n asr 24);
-	write_byte ch (n lsr 16);
-	write_byte ch (n lsr 8);
-	write_byte ch n
-
-let write_real_i32 ch n =
-	let base = Int32.to_int n in
-	let big = Int32.to_int (Int32.shift_right_logical n 24) in
-	write_byte ch big;
-	write_byte ch (base lsr 16);
-	write_byte ch (base lsr 8);
-	write_byte ch base
-
-let write_i64 ch n =
-	write_real_i32 ch (Int64.to_int32 (Int64.shift_right_logical n 32));
-	write_real_i32 ch (Int64.to_int32 n)
-
-let write_double ch f =
-	write_i64 ch (Int64.bits_of_float f)
-
-end
-
-(* -------------------------------------------------------------- *)
-(* Bits API *)
-
-type 'a bc = {
-	ch : 'a;
-	mutable nbits : int;
-	mutable bits : int;
-}
-
-type in_bits = input bc
-type out_bits = unit output bc
-
-exception Bits_error
-
-let input_bits ch =
-	{
-		ch = ch;
-		nbits = 0;
-		bits = 0;
-	}
-
-let output_bits ch =
-	{
-		ch = cast_output ch;
-		nbits = 0;
-		bits = 0;
-	}
-
-let rec read_bits b n =
-	if b.nbits >= n then begin
-		let c = b.nbits - n in
-		let k = (b.bits asr c) land ((1 lsl n) - 1) in
-		b.nbits <- c;
-		k
-	end else begin
-		let k = read_byte b.ch in
-		if b.nbits >= 24 then begin
-			if n > 31 then raise Bits_error;
-			let c = 8 + b.nbits - n in
-			let d = b.bits land ((1 lsl b.nbits) - 1) in
-			let d = (d lsl (8 - c)) lor (k lsr c) in
-			b.bits <- k;
-			b.nbits <- c;
-			d
-		end else begin
-			b.bits <- (b.bits lsl 8) lor k;
-			b.nbits <- b.nbits + 8;
-			read_bits b n;
-		end
-	end
-
-let drop_bits b =
-	b.nbits <- 0
-
-let rec write_bits b ~nbits x =
-	let n = nbits in
-	if n + b.nbits >= 32 then begin
-		if n > 31 then raise Bits_error;
-		let n2 = 32 - b.nbits - 1 in
-		let n3 = n - n2 in
-		write_bits b ~nbits:n2 (x asr n3);
-		write_bits b ~nbits:n3 (x land ((1 lsl n3) - 1));
-	end else begin
-		if n < 0 then raise Bits_error;
-		if (x < 0 || x > (1 lsl n - 1)) && n <> 31 then raise Bits_error;
-		b.bits <- (b.bits lsl n) lor x;
-		b.nbits <- b.nbits + n;
-		while b.nbits >= 8 do
-			b.nbits <- b.nbits - 8;
-			write_byte b.ch (b.bits asr b.nbits)
-		done
-	end
-
-let flush_bits b =
-	if b.nbits > 0 then write_bits b (8 - b.nbits) 0
-
-(* -------------------------------------------------------------- *)
-(* Generic IO *)
-
-class in_channel ch =
-  object
-	method input s pos len = input ch s pos len
-	method close_in() = close_in ch
-  end
-
-class out_channel ch =
-  object
-	method output s pos len = output ch s pos len
-	method flush() = flush ch
-	method close_out() = ignore(close_out ch)
-  end
-
-class in_chars ch =
-  object
-	method get() = try read ch with No_more_input -> raise End_of_file
-	method close_in() = close_in ch
-  end
-
-class out_chars ch =
-  object
-	method put t = write ch t
-	method flush() = flush ch
-	method close_out() = ignore(close_out ch)
-  end
-
-let from_in_channel ch =
-	let cbuf = String.create 1 in
-	let read() =
-		try
-			if ch#input cbuf 0 1 = 0 then raise Sys_blocked_io;
-			String.unsafe_get cbuf 0
-		with
-			End_of_file -> raise No_more_input
-	in
-	let input s p l =
-		ch#input s p l
-	in
-	create_in
-		~read
-		~input
-		~close:ch#close_in
-
-let from_out_channel ch =
-	let cbuf = String.create 1 in
-	let write c =
-		String.unsafe_set cbuf 0 c;
-		if ch#output cbuf 0 1 = 0 then raise Sys_blocked_io;
-	in
-	let output s p l =
-		ch#output s p l
-	in
-	create_out
-		~write
-		~output
-		~flush:ch#flush
-		~close:ch#close_out
-
-let from_in_chars ch =
-	let input s p l =
-		let i = ref 0 in
-		try
-			while !i < l do
-				String.unsafe_set s (p + !i) (ch#get());
-				incr i
-			done;
-			l
-		with
-			End_of_file when !i > 0 ->
-				!i
-	in
-	create_in
-		~read:ch#get
-		~input
-		~close:ch#close_in
-
-let from_out_chars ch =
-	let output s p l =
-		for i = p to p + l - 1 do
-			ch#put (String.unsafe_get s i)
-		done;
-		l
-	in
-	create_out
-		~write:ch#put
-		~output
-		~flush:ch#flush
-		~close:ch#close_out
diff --git a/libs/extlib/IO.mli b/libs/extlib/IO.mli
deleted file mode 100644
index e3f217fd0028acc5075236609bc11023dfb2cd9c..0000000000000000000000000000000000000000
--- a/libs/extlib/IO.mli
+++ /dev/null
@@ -1,327 +0,0 @@
-(* 
- * IO - Abstract input/output
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** High-order abstract I/O.
-
-	IO module simply deals with abstract inputs/outputs. It provides a
-	set of methods for working with these IO as well as several
-	constructors that enable to write to an underlying channel, buffer,
-	or enum.
-*)
-
-type input
-(** The abstract input type. *)
-
-type 'a output
-(** The abstract output type, ['a] is the accumulator data, it is returned
-	when the [close_out] function is called. *)
-
-exception No_more_input
-(** This exception is raised when reading on an input with the [read] or
-  [nread] functions while there is no available token to read. *)
-
-exception Input_closed
-(** This exception is raised when reading on a closed input. *)
-
-exception Output_closed
-(** This exception is raised when reading on a closed output. *)
-
-(** {6 Standard API} *)
-
-val read : input -> char
-(** Read a single char from an input or raise [No_more_input] if
-  no input available. *)
-
-val nread : input -> int -> string
-(** [nread i n] reads a string of size up to [n] from an input.
-  The function will raise [No_more_input] if no input is available.
-  It will raise [Invalid_argument] if [n] < 0. *)
-
-val really_nread : input -> int -> string
-(** [really_nread i n] reads a string of exactly [n] characters
-  from the input. Raises [No_more_input] if at least [n] characters are
-  not available. Raises [Invalid_argument] if [n] < 0. *)
-
-val input : input -> string -> int -> int -> int
-(** [input i s p l] reads up to [l] characters from the given input, storing
-  them in string [s], starting at character number [p]. It returns the actual
-  number of characters read or raise [No_more_input] if no character can be
-  read. It will raise [Invalid_argument] if [p] and [l] do not designate a
-  valid substring of [s]. *)
-
-val really_input : input -> string -> int -> int -> int
-(** [really_input i s p l] reads exactly [l] characters from the given input,
-  storing them in the string [s], starting at position [p]. For consistency with
-  {!IO.input} it returns [l]. Raises [No_more_input] if at [l] characters are
-  not available. Raises [Invalid_argument] if [p] and [l] do not designate a
-  valid substring of [s]. *)
-
-val close_in : input -> unit
-(** Close the input. It can no longer be read from. *)
-
-val write : 'a output -> char -> unit
-(** Write a single char to an output. *)
-
-val nwrite : 'a output -> string -> unit
-(** Write a string to an output. *)
-
-val output : 'a output -> string -> int -> int -> int
-(** [output o s p l] writes up to [l] characters from string [s], starting at
-  offset [p]. It returns the number of characters written. It will raise
-  [Invalid_argument] if [p] and [l] do not designate a valid substring of [s]. *)
-
-val really_output : 'a output -> string -> int -> int -> int
-(** [really_output o s p l] writes exactly [l] characters from string [s] onto
-  the the output, starting with the character at offset [p]. For consistency with
-  {!IO.output} it returns [l]. Raises [Invalid_argument] if [p] and [l] do not
-  designate a valid substring of [s]. *)
-
-val flush : 'a output -> unit
-(** Flush an output. *)
-
-val close_out : 'a output -> 'a
-(** Close the output and return its accumulator data.
-  It can no longer be written. *)
-
-(** {6 Creation of IO Inputs/Outputs} *)
-
-val input_string : string -> input
-(** Create an input that will read from a string. *)
-
-val output_string : unit -> string output
-(** Create an output that will write into a string in an efficient way.
-  When closed, the output returns all the data written into it. *)
-
-val output_strings : unit -> string list output
-(** Create an output that will write into a string in an efficient way.
-  When closed, the output returns all the data written into it. 
-  Several strings are used in case the output size excess max_string_length
-*)
-
-val input_channel : in_channel -> input
-(** Create an input that will read from a channel. *)
-
-val output_channel : out_channel -> unit output
-(** Create an output that will write into a channel. *) 
-
-val input_enum : char Enum.t -> input
-(** Create an input that will read from an [enum]. *)
-
-val output_enum : unit -> char Enum.t output
-(** Create an output that will write into an [enum]. The 
-  final enum is returned when the output is closed. *)
-
-val create_in :
-  read:(unit -> char) ->
-  input:(string -> int -> int -> int) -> close:(unit -> unit) -> input
-(** Fully create an input by giving all the needed functions. *)
-
-val create_out :
-  write:(char -> unit) ->
-  output:(string -> int -> int -> int) ->   
-  flush:(unit -> unit) -> close:(unit -> 'a) -> 'a output
-(** Fully create an output by giving all the needed functions. *)
-
-(** {6 Utilities} *)
-
-val printf : 'a output -> ('b, unit, string, unit) format4 -> 'b
-(** The printf function works for any output. *)
-
-val read_all : input -> string
-(** read all the contents of the input until [No_more_input] is raised. *)
-
-val pipe : unit -> input * unit output
-(** Create a pipe between an input and an ouput. Data written from
-  the output can be read from the input. *)
-
-val pos_in : input -> input * (unit -> int)
-(** Create an input that provide a count function of the number of bytes
-  read from it. *)
-
-val pos_out : 'a output -> 'a output * (unit -> int)
-(** Create an output that provide a count function of the number of bytes
-  written through it. *)
-
-external cast_output : 'a output -> unit output = "%identity"
-(** You can safely transform any output to an unit output in a safe way 
-  by using this function. *)
-
-(** {6 Binary files API}
-
-	Here is some API useful for working with binary files, in particular
-	binary files generated by C applications. By default, encoding of
-	multibyte integers is low-endian. The BigEndian module provide multibyte
-	operations with other encoding.
-*)
-
-exception Overflow of string
-(** Exception raised when a read or write operation cannot be completed. *)
-
-val read_byte : input -> int
-(** Read an unsigned 8-bit integer. *)
-
-val read_signed_byte : input -> int
-(** Read an signed 8-bit integer. *)
-
-val read_ui16 : input -> int
-(** Read an unsigned 16-bit word. *)
-
-val read_i16 : input -> int
-(** Read a signed 16-bit word. *)
-
-val read_i32 : input -> int
-(** Read a signed 32-bit integer. Raise [Overflow] if the
-  read integer cannot be represented as a Caml 31-bit integer. *)
-
-val read_real_i32 : input -> int32
-(** Read a signed 32-bit integer as an OCaml int32. *)
-
-val read_i64 : input -> int64
-(** Read a signed 64-bit integer as an OCaml int64. *)
-
-val read_double : input -> float
-(** Read an IEEE double precision floating point value. *)
-
-val read_string : input -> string
-(** Read a null-terminated string. *)
-
-val read_line : input -> string
-(** Read a LF or CRLF terminated string. *)
-
-val write_byte : 'a output -> int -> unit
-(** Write an unsigned 8-bit byte. *)
-
-val write_ui16 : 'a output -> int -> unit
-(** Write an unsigned 16-bit word. *)
-
-val write_i16 : 'a output -> int -> unit
-(** Write a signed 16-bit word. *)
-
-val write_i32 : 'a output -> int -> unit
-(** Write a signed 32-bit integer. *) 
-
-val write_real_i32 : 'a output -> int32 -> unit
-(** Write an OCaml int32. *)
-
-val write_i64 : 'a output -> int64 -> unit
-(** Write an OCaml int64. *)
-
-val write_double : 'a output -> float -> unit
-(** Write an IEEE double precision floating point value. *)
-
-val write_string : 'a output -> string -> unit
-(** Write a string and append an null character. *)
-
-val write_line : 'a output -> string -> unit
-(** Write a line and append a LF (it might be converted
-	to CRLF on some systems depending on the underlying IO). *)
-
-(** Same as operations above, but use big-endian encoding *)
-module BigEndian :
-sig
-
-	val read_ui16 : input -> int
-	val read_i16 : input -> int
-	val read_i32 : input -> int
-	val read_real_i32 : input -> int32
-	val read_i64 : input -> int64
-	val read_double : input -> float
-	
-	val write_ui16 : 'a output -> int -> unit
-	val write_i16 : 'a output -> int -> unit
-	val write_i32 : 'a output -> int -> unit
-	val write_real_i32 : 'a output -> int32 -> unit
-	val write_i64 : 'a output -> int64 -> unit
-	val write_double : 'a output -> float -> unit
-
-end
-
-(** {6 Bits API}
-
-	This enable you to read and write from an IO bit-by-bit or several bits
-	at the same time.
-*)
-
-type in_bits
-type out_bits
-
-exception Bits_error
-
-val input_bits : input -> in_bits
-(** Read bits from an input *)
-
-val output_bits : 'a output -> out_bits
-(** Write bits to an output *)
-
-val read_bits : in_bits -> int -> int
-(** Read up to 31 bits, raise Bits_error if n < 0 or n > 31 *)
-
-val write_bits : out_bits -> nbits:int -> int -> unit
-(** Write up to 31 bits represented as a value, raise Bits_error if nbits < 0
- or nbits > 31 or the value representation excess nbits. *)
-
-val flush_bits : out_bits -> unit
-(** Flush remaining unwritten bits, adding up to 7 bits which values 0. *)
-
-val drop_bits : in_bits -> unit
-(** Drop up to 7 buffered bits and restart to next input character. *)
-
-(** {6 Generic IO Object Wrappers}
-
-	Theses OO Wrappers have been written to provide easy support of ExtLib
-	IO by external librairies. If you want your library to support ExtLib
-	IO without actually requiring ExtLib to compile, you can should implement
-	the classes [in_channel], [out_channel], [poly_in_channel] and/or
-	[poly_out_channel] which are the common IO specifications established
-	for ExtLib, OCamlNet and Camomile.
-
-	(see http://www.ocaml-programming.de/tmp/IO-Classes.html for more details).
-*)
-
-class in_channel : input ->
-  object
-	method input : string -> int -> int -> int
-	method close_in : unit -> unit
-  end
-
-class out_channel : 'a output ->
-  object
-	method output : string -> int -> int -> int
-	method flush : unit -> unit
-	method close_out : unit -> unit
-  end
-
-class in_chars : input ->
-  object
-	method get : unit -> char
-	method close_in : unit -> unit
-  end
-
-class out_chars : 'a output ->
-  object
-	method put : char -> unit
-	method flush : unit -> unit
-	method close_out : unit -> unit
-  end
-
-val from_in_channel : #in_channel -> input
-val from_out_channel : #out_channel -> unit output
-val from_in_chars : #in_chars -> input
-val from_out_chars : #out_chars -> unit output
diff --git a/libs/extlib/LICENSE b/libs/extlib/LICENSE
deleted file mode 100644
index 62dca13d71f20956be5f85cdce9cf407819596a9..0000000000000000000000000000000000000000
--- a/libs/extlib/LICENSE
+++ /dev/null
@@ -1,521 +0,0 @@
-The Library is distributed under the terms of the GNU Library General
-Public License version 2 (included below).
-
-As a special exception to the GNU Library General Public License, you
-may link, statically or dynamically, a "work that uses the Library"
-with a publicly distributed version of the Library to produce an
-executable file containing portions of the Library, and distribute
-that executable file under terms of your choice, without any of the
-additional requirements listed in clause 6 of the GNU Library General
-Public License.  By "a publicly distributed version of the Library",
-we mean either the unmodified Library as distributed, or a
-modified version of the Library that is distributed under the
-conditions defined in clause 3 of the GNU Library General Public
-License.  This exception does not however invalidate any other reasons
-why the executable file might be covered by the GNU Library General
-Public License.
-
-------------
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/libs/extlib/META.txt b/libs/extlib/META.txt
deleted file mode 100644
index 2fdb54e97fb6e8add7b79d4b46a032a26ff006ea..0000000000000000000000000000000000000000
--- a/libs/extlib/META.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-version="1.3"
-archive(byte)="extLib.cma"
-archive(native)="extLib.cmxa"
diff --git a/libs/extlib/Makefile b/libs/extlib/Makefile
deleted file mode 100644
index 9ed56c469950894e6394278235bd4548dc76859d..0000000000000000000000000000000000000000
--- a/libs/extlib/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Makefile contributed by Alain Frisch
-OCAMLOPT=ocamlopt
-OCAMLC=ocamlc
-
-MODULES = \
- enum bitSet dynArray extArray extHashtbl extList extString global rbuffer IO option \
- pMap std uChar uTF8 base64 unzip refList optParse dllist multiArray sMap
-
-# the list is topologically sorted
-
-MLI = $(MODULES:=.mli)
-SRC = $(MLI) $(MODULES:=.ml) extLib.ml
-
-all: bytecode native
-
-opt: native
-
-bytecode: extLib.cma
-
-native: extLib.cmxa
-
-extLib.cma: $(SRC)
-	$(OCAMLC) -a -o extLib.cma $(SRC)
-
-extLib.cmxa: $(SRC)
-	$(OCAMLOPT) -g -a -o extLib.cmxa $(SRC)
-
-doc:
-	$(OCAMLC) -c $(MODULES:=.mli)
-	mkdir -p doc/
-	ocamldoc -sort -html -d doc/ $(MODULES:=.mli)
-	cp odoc_style.css doc/style.css
-
-copy:
-	mv *.cmi *.cmx *.cma *.cmxa extLib.lib c:/ocaml/lib/
-
-install:
-	cp META.txt META
-	ocamlfind install extlib META *.cmi *.cma $(MLI) $(wildcard *.cmxa) $(wildcard *.a)
-
-uninstall:
-	ocamlfind remove extlib
-
-clean:
-	rm -f $(wildcard *.cmo) $(wildcard *.cmx) $(wildcard *.o) $(wildcard *.cmi) $(wildcard *.cma) $(wildcard *.cmxa) $(wildcard *.a) $(wildcard *.lib) $(wildcard *.obj)
-	rm -Rf doc
-
-.PHONY: all opt bytecode native doc copy install uninstall clean
-
-Makefile: ;
-
-$(SRC): ;
diff --git a/libs/extlib/README.txt b/libs/extlib/README.txt
deleted file mode 100644
index 70e68e7d258090b584264029e609cd57129b098e..0000000000000000000000000000000000000000
--- a/libs/extlib/README.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-OCaml Extended standard Library - ExtLib.
-=========================================
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-What is ExtLib ?
-----------------
-
-ExtLib is a set of additional useful functions and modules for OCaml.
-You can watch the SourceForge project page here :
-	http://sourceforge.net/projects/ocaml-lib/
-The web site is here :
-	http://ocaml-lib.sourceforge.net/
-and you can join the mailing list here :
-	http://lists.sourceforge.net/lists/listinfo/ocaml-lib-devel
-
-People are encouraged to contribute and to report any bug or problem
-they might have with ExtLib by using the mailing list.
-
-Installation :
---------------
-
-Unzip or untar in any directory, then simply run
-
-> ocaml install.ml
-
-and follow the instructions.
-
-Usage :
--------
-
-Generate and watch the documentation.
-
-Contributors :
---------------
-
-Nicolas Cannasse (ncannasse@motion-twin.com)
-Brian Hurt (brian.hurt@qlogic.com)
-Yamagata Yoriyuki (yori@users.sourceforge.net)
-
-License :
----------
-
-See LICENSE
\ No newline at end of file
diff --git a/libs/extlib/base64.ml b/libs/extlib/base64.ml
deleted file mode 100644
index 87893a0aace09f3a90fb5c32c25d7e3a23fef50e..0000000000000000000000000000000000000000
--- a/libs/extlib/base64.ml
+++ /dev/null
@@ -1,119 +0,0 @@
-(*
- * Base64 - Base64 codec
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-exception Invalid_char
-exception Invalid_table
-
-external unsafe_char_of_int : int -> char = "%identity"
-
-type encoding_table = char array
-type decoding_table = int array
-
-let chars = [|
-	'A';'B';'C';'D';'E';'F';'G';'H';'I';'J';'K';'L';'M';'N';'O';'P';
-	'Q';'R';'S';'T';'U';'V';'W';'X';'Y';'Z';'a';'b';'c';'d';'e';'f';
-	'g';'h';'i';'j';'k';'l';'m';'n';'o';'p';'q';'r';'s';'t';'u';'v';
-	'w';'x';'y';'z';'0';'1';'2';'3';'4';'5';'6';'7';'8';'9';'+';'/'
-|]
-
-let make_decoding_table tbl =
-	if Array.length tbl <> 64 then raise Invalid_table;
-	let d = Array.make 256 (-1) in
-	for i = 0 to 63 do
-		Array.unsafe_set d (int_of_char (Array.unsafe_get tbl i)) i;
-	done;
-	d
-
-let inv_chars = make_decoding_table chars
-
-let encode ?(tbl=chars) ch =
-	if Array.length tbl <> 64 then raise Invalid_table;
-	let data = ref 0 in
-	let count = ref 0 in
-	let flush() =
-		if !count > 0 then begin
-			let d = (!data lsl (6 - !count)) land 63 in
-			IO.write ch (Array.unsafe_get tbl d);
-		end;		
-	in
-	let write c =
-		let c = int_of_char c in
-		data := (!data lsl 8) lor c;
-		count := !count + 8;
-		while !count >= 6 do
-			count := !count - 6;
-			let d = (!data asr !count) land 63 in
-			IO.write ch (Array.unsafe_get tbl d)
-		done;
-	in
-	let output s p l =
-		for i = p to p + l - 1 do
-			write (String.unsafe_get s i)
-		done;
-		l
-	in
-	IO.create_out ~write ~output
-		~flush:(fun () -> flush(); IO.flush ch)
-		~close:(fun() -> flush(); IO.close_out ch)
-
-let decode ?(tbl=inv_chars) ch =
-	if Array.length tbl <> 256 then raise Invalid_table;
-	let data = ref 0 in
-	let count = ref 0 in
-	let rec fetch() =
-		if !count >= 8 then begin
-			count := !count - 8;
-			let d = (!data asr !count) land 0xFF in
-			unsafe_char_of_int d
-		end else
-			let c = int_of_char (IO.read ch) in
-			let c = Array.unsafe_get tbl c in
-			if c = -1 then raise Invalid_char;
-			data := (!data lsl 6) lor c;
-			count := !count + 6;
-			fetch()
-	in
-	let read = fetch in
-	let input s p l =
-		let i = ref 0 in
-		try
-			while !i < l do
-				String.unsafe_set s (p + !i) (fetch());
-				incr i;
-			done;
-			l
-		with
-			IO.No_more_input when !i > 0 ->
-				!i
-	in
-	let close() =
-		count := 0;
-		IO.close_in ch
-	in
-	IO.create_in ~read ~input ~close
-
-let str_encode ?(tbl=chars) s =
-	let ch = encode ~tbl (IO.output_string()) in
-	IO.nwrite ch s;
-	IO.close_out ch
-
-let str_decode ?(tbl=inv_chars) s =
-	let ch = decode ~tbl (IO.input_string s) in
-	IO.nread ch ((String.length s * 6) / 8)
diff --git a/libs/extlib/base64.mli b/libs/extlib/base64.mli
deleted file mode 100644
index c812efcdef15816fdbb6a8959324fe2c2d23cbdb..0000000000000000000000000000000000000000
--- a/libs/extlib/base64.mli
+++ /dev/null
@@ -1,57 +0,0 @@
-(*
- * Base64 - Base64 codec
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Base64 codec.
-
-	8-bit characters are encoded into 6-bit ones using ASCII lookup tables.
-	Default tables maps 0..63 values on characters A-Z, a-z, 0-9, '+' and '/'
-	(in that order). 
-*)
-
-(** This exception is raised when reading an invalid character
-	from a base64 input. *)
-exception Invalid_char
-
-(** This exception is raised if the encoding or decoding table
-	size is not correct. *)
-exception Invalid_table
-
-(** An encoding table maps integers 0..63 to the corresponding char. *)
-type encoding_table = char array
-
-(** A decoding table mais chars 0..255 to the corresponding 0..63 value
- or -1 if the char is not accepted. *)
-type decoding_table = int array
-
-(** Encode a string into Base64. *)
-val str_encode : ?tbl:encoding_table -> string -> string
-
-(** Decode a string encoded into Base64, raise [Invalid_char] if a
-	character in the input string is not a valid one. *)
-val str_decode : ?tbl:decoding_table -> string -> string
-
-(** Generic base64 encoding over an output. *)
-val encode : ?tbl:encoding_table -> 'a IO.output -> 'a IO.output
-
-(** Generic base64 decoding over an input. *)
-val decode : ?tbl:decoding_table -> IO.input -> IO.input
-
-(** Create a valid decoding table from an encoding one. *)
-val make_decoding_table : encoding_table -> decoding_table
diff --git a/libs/extlib/bitSet.ml b/libs/extlib/bitSet.ml
deleted file mode 100644
index 184408455e351b7637c1d3d1d5386857a12a6f62..0000000000000000000000000000000000000000
--- a/libs/extlib/bitSet.ml
+++ /dev/null
@@ -1,312 +0,0 @@
-(*
- * Bitset - Efficient bit sets
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-type intern
-
-let bcreate : int -> intern = Obj.magic String.create
-external fast_get : intern -> int -> int = "%string_unsafe_get"
-external fast_set : intern -> int -> int -> unit = "%string_unsafe_set"
-external fast_bool : int -> bool = "%identity"
-let fast_blit : intern -> int -> intern -> int -> int -> unit = Obj.magic String.blit
-let fast_fill : intern -> int -> int -> int -> unit = Obj.magic String.fill
-let fast_length : intern -> int= Obj.magic String.length
-
-let bget s ndx =
-  assert (ndx >= 0 && ndx < fast_length s);
-  fast_get s ndx
-
-let bset s ndx v =
-  assert (ndx >= 0 && ndx < fast_length s);
-  fast_set s ndx v
-
-let bblit src srcoff dst dstoff len = 
-  assert (srcoff >= 0 && dstoff >= 0 && len >= 0);
-  fast_blit src srcoff dst dstoff len
-
-let bfill dst start len c = 
-  assert (start >= 0 && len >= 0);
-  fast_fill dst start len c
-
-exception Negative_index of string
-
-type t = {
-	mutable data : intern;
-	mutable len : int;
-}
-
-let error fname = raise (Negative_index fname)
-
-let empty() =
-	{
-		data = bcreate 0;
-		len = 0;
-	}
-
-let int_size = 7 (* value used to round up index *)
-let log_int_size = 3 (* number of shifts *)
-
-let create n =
-	if n < 0 then error "create";
-	let size = (n+int_size) lsr log_int_size in
-	let b = bcreate size in
-	bfill b 0 size 0;
-	{
-		data = b;
-		len = size;
-	}
-
-let copy t =
-	let b = bcreate t.len in
-	bblit t.data 0 b 0 t.len;
-	{
-		data = b;
-		len = t.len
-	}
-
-let clone = copy
-
-let set t x =
-	if x < 0 then error "set";
-	let pos = x lsr log_int_size and delta = x land int_size in
-	let size = t.len in
-	if pos >= size then begin
-		let b = bcreate (pos+1) in
-		bblit t.data 0 b 0 size;
-		bfill b size (pos - size + 1) 0;
-		t.len <- pos + 1;
-		t.data <- b;
-	end;
-	bset t.data pos ((bget t.data pos) lor (1 lsl delta))
-
-let unset t x =
-	if x < 0 then error "unset";
-	let pos = x lsr log_int_size and delta = x land int_size in
-	if pos < t.len then
-		bset t.data pos ((bget t.data pos) land (0xFF lxor (1 lsl delta)))
-
-let toggle t x =
-	if x < 0 then error "toggle";
-	let pos = x lsr log_int_size and delta = x land int_size in
-	let size = t.len in
-	if pos >= size then begin
-		let b = bcreate (pos+1) in
-		bblit t.data 0 b 0 size;
-		bfill b size (pos - size + 1) 0;
-		t.len <- pos + 1;
-		t.data <- b;
-	end;
-	bset t.data pos ((bget t.data pos) lxor (1 lsl delta))
-
-let put t = function
-	| true -> set t
-	| false -> unset t
-
-let is_set t x =
-  if x < 0 then error "is_set";
-  let pos = x lsr log_int_size and delta = x land int_size in
-  let size = t.len in
-  if pos < size then
-	fast_bool (((bget t.data pos) lsr delta) land 1)
-  else
-	false
-
-
-exception Break_int of int
-
-(* Find highest set element or raise Not_found *)
-let find_msb t =
-  (* Find highest set bit in a byte.  Does not work with zero. *)
-  let byte_msb b = 
-    assert (b <> 0);
-    let rec loop n = 
-      if b land (1 lsl n) = 0 then
-        loop (n-1)
-      else n in
-    loop 7 in
-  let n = t.len - 1
-  and buf = t.data in
-  try 
-    for i = n downto 0 do
-      let byte = bget buf i in
-      if byte <> 0 then raise (Break_int ((i lsl log_int_size)+(byte_msb byte)))
-    done;
-    raise Not_found
-  with 
-    Break_int n -> n
-  | _ -> raise Not_found
-
-let compare t1 t2 =
-  let some_msb b = try Some (find_msb b) with Not_found -> None in
-  match (some_msb t1, some_msb t2) with
-    (None, Some _) -> -1 (* 0-y -> -1 *)
-  | (Some _, None) -> 1  (* x-0 ->  1 *)
-  | (None, None) -> 0    (* 0-0 ->  0 *)
-  | (Some a, Some b) ->  (* x-y *)
-      if a < b then -1
-      else if a > b then 1
-      else
-        begin
-          (* MSBs differ, we need to scan arrays until we find a
-             difference *)
-          let ndx = a lsr log_int_size in 
-          assert (ndx < t1.len && ndx < t2.len);
-          try
-            for i = ndx downto 0 do
-              let b1 = bget t1.data i 
-              and b2 = bget t2.data i in
-              if b1 <> b2 then raise (Break_int (compare b1 b2))
-            done;
-            0
-          with
-            Break_int res -> res
-        end
-
-let equals t1 t2 =
-	compare t1 t2 = 0
-
-let partial_count t x =
-	let rec nbits x =
-		if x = 0 then
-			0
-		else if fast_bool (x land 1) then
-			1 + (nbits (x lsr 1))
-		else
-			nbits (x lsr 1)
-	in
-	let size = t.len in
-	let pos = x lsr log_int_size and delta = x land int_size in
-	let rec loop n acc =
-		if n = size then
-			acc
-		else
-			let x = bget t.data n in
-			loop (n+1) (acc + nbits x)
-	in
-	if pos >= size then
-		0
-	else
-		loop (pos+1) (nbits ((bget t.data pos) lsr delta))
-
-let count t =
-	partial_count t 0
-
-let enum t =
-	let rec make n =
-		let cur = ref n in
-		let rec next() =
-			let pos = !cur lsr log_int_size and delta = !cur land int_size in
-			if pos >= t.len then raise Enum.No_more_elements;
-			let x = bget t.data pos in
-			let rec loop i =
-	if i = 8 then
-		next()
-	else if x land (1 lsl i) = 0 then begin
-		incr cur;
-		loop (i+1)
-	end else
-		!cur
-			in
-			let b = loop delta in
-			incr cur;
-			b
-		in
-		Enum.make
-			~next
-			~count:(fun () -> partial_count t !cur)
-			~clone:(fun () -> make !cur)
-	in
-	make 0
-
-let raw_create size = 
-  let b = bcreate size in
-  bfill b 0 size 0;
-  { data = b; len = size }
-
-let inter a b =
-  let max_size = max a.len b.len in
-  let d = raw_create max_size in
-  let sl = min a.len b.len in
-  let abuf = a.data
-  and bbuf = b.data in
-  (* Note: rest of the array is set to zero automatically *)
-  for i = 0 to sl-1 do
-    bset d.data i ((bget abuf i) land (bget bbuf i))
-  done;
-  d
-
-(* Note: rest of the array is handled automatically correct, since we
-   took a copy of the bigger set. *)
-let union a b = 
-  let d = if a.len > b.len then copy a else copy b in
-  let sl = min a.len b.len in
-  let abuf = a.data
-  and bbuf = b.data in
-  for i = 0 to sl-1 do
-    bset d.data i ((bget abuf i) lor (bget bbuf i))
-  done;
-  d
-
-let diff a b = 
-  let maxlen = max a.len b.len in
-  let buf = bcreate maxlen in
-  bblit a.data 0 buf 0 a.len;
-  let sl = min a.len b.len in
-  let abuf = a.data
-  and bbuf = b.data in
-  for i = 0 to sl-1 do
-    bset buf i ((bget abuf i) land (lnot (bget bbuf i)))
-  done;
-  { data = buf; len = maxlen }
-
-let sym_diff a b = 
-  let maxlen = max a.len b.len in
-  let buf = bcreate maxlen in
-  (* Copy larger (assumes missing bits are zero) *)
-  bblit (if a.len > b.len then a.data else b.data) 0 buf 0 maxlen;
-  let sl = min a.len b.len in
-  let abuf = a.data
-  and bbuf = b.data in
-  for i = 0 to sl-1 do
-    bset buf i ((bget abuf i) lxor (bget bbuf i))
-  done;
-  { data = buf; len = maxlen }
-
-(* TODO the following set operations can be made faster if you do the
-   set operation in-place instead of taking a copy.  But be careful
-   when the sizes of the bitvector strings differ. *)
-let intersect t t' =
-  let d = inter t t' in
-  t.data <- d.data;
-  t.len <- d.len
-
-let differentiate t t' =
-  let d = diff t t' in
-  t.data <- d.data;
-  t.len <- d.len
-
-let unite t t' =
-  let d = union t t' in
-  t.data <- d.data;
-  t.len <- d.len
-
-let differentiate_sym t t' =
-  let d = sym_diff t t' in
-  t.data <- d.data;
-  t.len <- d.len
diff --git a/libs/extlib/bitSet.mli b/libs/extlib/bitSet.mli
deleted file mode 100644
index 9412f446785cae071dc3fe622b0d3948dec1ce52..0000000000000000000000000000000000000000
--- a/libs/extlib/bitSet.mli
+++ /dev/null
@@ -1,101 +0,0 @@
-(*
- * Bitset - Efficient bit sets
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Efficient bit sets.
-
- A bitset is an array of boolean values that can be accessed with indexes
- like an array but provides a better memory usage (divided by 8) for a
- very small speed trade-off. *)
-
-type t
-
-exception Negative_index of string
-(** When a negative bit value is used for one of the BitSet functions,
- this exception is raised with the name of the function. *)
-
-val empty : unit ->  t
-(** Create an empty bitset of size 0, the bitset will automatically expand
- when needed. *)
-
-val create : int -> t
-(** Create an empty bitset with an initial size (in number of bits). *)
-
-val copy : t -> t
-(** Copy a bitset : further modifications of first one will not affect the
- copy. *)
-
-val clone : t -> t
-(** Same as [copy] *)
-
-val set : t -> int -> unit
-(** [set s n] sets the nth-bit in the bitset [s] to true. *)
-
-val unset : t -> int -> unit
-(** [unset s n] sets the nth-bit in the bitset [s] to false. *)
-
-val put : t -> bool -> int -> unit
-(** [put s v n] sets the nth-bit in the bitset [s] to [v]. *)
-
-val toggle : t -> int -> unit
-(** [toggle s n] changes the nth-bit value in the bitset [s]. *)
-
-val is_set : t -> int -> bool
-(** [is_set s n] returns true if nth-bit in the bitset [s] is set,
- or false otherwise. *)
-
-val compare : t -> t -> int
-(** [compare s1 s2] compares two bitsets. Highest bit indexes are
- compared first. *)
-
-val equals : t -> t -> bool
-(** [equals s1 s2] returns true if, and only if, all bits values in s1 are
-  the same as in s2. *)
-
-val count : t -> int
-(** [count s] returns the number of bits set in the bitset [s]. *)
-
-val enum : t -> int Enum.t
-(** [enum s] returns an enumeration of bits which are set
-  in the bitset [s]. *)
-
-val intersect : t -> t -> unit
-(** [intersect s t] sets [s] to the intersection of the sets [s] and [t]. *)
-
-val unite : t -> t -> unit
-(** [unite s t] sets [s] to the union of the sets [s] and [t]. *)
-
-val differentiate : t -> t -> unit
-(** [differentiate s t] removes the elements of [t] from [s]. *)
-
-val differentiate_sym : t -> t -> unit
-(** [differentiate_sym s t] sets [s] to the symmetrical difference of the
-  sets [s] and [t]. *)
-
-val inter : t -> t -> t
-(** [inter s t] returns the intersection of sets [s] and [t]. *)
-
-val union : t -> t -> t
-(** [union s t] return the union of sets [s]  and [t]. *)
-
-val diff : t -> t -> t
-(** [diff s t] returns [s]-[t]. *)
-
-val sym_diff : t -> t -> t
-(** [sym_diff s t] returns the symmetrical difference of [s] and [t]. *)
diff --git a/libs/extlib/dllist.ml b/libs/extlib/dllist.ml
deleted file mode 100644
index 308cfabc42a68182223fdacfaaba64d13c9ee209..0000000000000000000000000000000000000000
--- a/libs/extlib/dllist.ml
+++ /dev/null
@@ -1,287 +0,0 @@
-(*
- * Dllist- a mutable, circular, doubly linked list library
- * Copyright (C) 2004 Brian Hurt, Jesse Guardiani
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-type 'a node_t = {
-	mutable data : 'a;
-	mutable next : 'a node_t;
-	mutable prev : 'a node_t
-}
-
-type 'a enum_t = {
-	mutable curr : 'a node_t;
-	mutable valid : bool
-}
-
-exception Empty
-
-let create x = let rec nn = { data = x; next = nn; prev = nn} in nn
-
-let length node =
-	let rec loop cnt n =
-		if n == node then
-			cnt
-		else
-			loop (cnt + 1) n.next
-	in
-	loop 1 node.next
-
-let add node elem =
-	let nn = { data = elem; next = node.next; prev = node } in
-	node.next.prev <- nn;
-	node.next <- nn
-
-let append node elem =
-	let nn = { data = elem; next = node.next; prev = node } in
-	node.next.prev <- nn;
-	node.next <- nn;
-	nn
-
-let prepend node elem =
-	let nn = { data = elem; next = node; prev = node.prev } in
-	node.prev.next <- nn;
-	node.prev <- nn;
-	nn
-
-let promote node =
-	let next = node.next in
-	let prev = node.prev in
-	if next != prev then begin
-		next.next.prev <- node;
-		node.next <- next.next;
-		node.prev <- next;
-		next.next <- node;
-		next.prev <- prev;
-		prev.next <- next
-	end
-
-let demote node =
-	let next = node.next in
-	let prev = node.prev in
-	if next != prev then begin
-		prev.prev.next <- node;
-		node.prev <- prev.prev;
-		node.next <- prev;
-		prev.prev <- node;
-		prev.next <- next;
-		next.prev <- prev
-	end
-
-let remove node =
-	let next = node.next in
-	let prev = node.prev in
-	prev.next <- next;
-	next.prev <- prev;
-	node.next <- node;
-	node.prev <- node
-
-let drop node =
-	let next = node.next in
-	let prev = node.prev in
-	prev.next <- next;
-	next.prev <- prev;
-	node.next <- node;
-	node.prev <- node;
-	next
-
-let rev_drop node =
-	let next = node.next in
-	let prev = node.prev in
-	prev.next <- next;
-	next.prev <- prev;
-	node.next <- node;
-	node.prev <- node;
-	prev
-
-let splice node1 node2 =
-	let next = node1.next in
-	let prev = node2.prev in
-	node1.next <- node2;
-	node2.prev <- node1;
-	next.prev <- prev;
-	prev.next <- next
-
-let set node data = node.data <- data
-
-let get node = node.data
-
-let next node = node.next
-
-let prev node = node.prev
-
-let skip node idx =
-	let m = if idx > 0 then -1 else 1 in
-	let rec loop idx n =
-		if idx == 0 then
-			n
-		else
-			loop (idx + m) n.next
-	in
-	loop idx node
-
-let rev node =
-	let rec loop next n =
-		begin
-			let prev = n.prev in
-			n.next <- prev;
-			n.prev <- next;
-
-			if n != node then
-				loop n prev
-		end
-	in
-	loop node node.prev
-
-let iter f node =
-	let () = f node.data in
-	let rec loop n =
-		if n != node then
-			let () = f n.data in
-			loop n.next
-	in
-	loop node.next
-
-let fold_left f init node =
-	let rec loop accu n =
-		if n == node then
-			accu
-		else
-			loop (f accu n.data) n.next
-	in
-	loop (f init node.data) node.next
-
-let fold_right f node init =
-	let rec loop accu n =
-		if n == node then
-			f n.data accu
-		else
-			loop (f n.data accu) n.prev
-	in
-	loop init node.prev
-
-let map f node =
-	let first = create (f node.data) in
-	let rec loop last n =
-		if n == node then
-			begin
-				first.prev <- last;
-				first
-			end
-		else
-			begin
-				let nn = { data = f n.data; next = first; prev = last } in
-				last.next <- nn;
-				loop nn n.next
-			end
-	in
-	loop first node.next
-
-let copy node = map (fun x -> x) node
-
-let to_list node = fold_right (fun d l -> d::l) node []
-
-let of_list lst =
-	match lst with
-		| [] -> raise Empty
-		| h :: t ->
-			let first = create h in
-			let rec loop last = function
-				| [] ->
-					last.next <- first;
-					first.prev <- last;
-					first
-				| h :: t ->
-					let nn = { data = h; next = first; prev = last } in
-					last.next <- nn;
-					loop nn t
-			in
-			loop first t
-
-let enum node =
-	let next e () =
-		if e.valid == false then
-			raise Enum.No_more_elements
-		else
-			begin
-			let rval = e.curr.data in
-			e.curr <- e.curr.next;
-
-			if (e.curr == node) then
-				e.valid <- false;
-			rval
-			end
-	and count e () =
-		if e.valid == false then
-			0
-		else
-			let rec loop cnt n =
-				if n == node then
-					cnt
-				else
-					loop (cnt + 1) (n.next)
-			in
-			loop 1 (e.curr.next)
-	in
-	let rec clone e () =
-		let e' = { curr = e.curr; valid = e.valid } in
-		Enum.make ~next:(next e') ~count:(count e') ~clone:(clone e')
-	in
-	let e = { curr = node; valid = true } in
-	Enum.make ~next:(next e) ~count:(count e) ~clone:(clone e)
-
-let rev_enum node =
-	let prev e () =
-		if e.valid == false then
-			raise Enum.No_more_elements
-		else
-			begin
-			let rval = e.curr.data in
-			e.curr <- e.curr.prev;
-
-			if (e.curr == node) then
-				e.valid <- false;
-			rval
-			end
-	and count e () =
-		if e.valid == false then
-			0
-		else
-			let rec loop cnt n =
-				if n == node then
-					cnt
-				else
-					loop (cnt + 1) (n.prev)
-			in
-			loop 1 (e.curr.prev)
-	in
-	let rec clone e () =
-		let e' = { curr = e.curr; valid = e.valid } in
-		Enum.make ~next:(prev e') ~count:(count e') ~clone:(clone e')
-	in
-	let e = { curr = node; valid = true } in
-	Enum.make ~next:(prev e) ~count:(count e) ~clone:(clone e)
-
-let of_enum enm =
-	match Enum.get enm with
-		| None -> raise Empty
-		| Some(d) ->
-			let first = create d in
-			let f d n = append n d in
-			ignore(Enum.fold f first enm);
-			first
diff --git a/libs/extlib/dllist.mli b/libs/extlib/dllist.mli
deleted file mode 100644
index 1c992ae867b75993803740606b9afff2bd61ac6d..0000000000000000000000000000000000000000
--- a/libs/extlib/dllist.mli
+++ /dev/null
@@ -1,182 +0,0 @@
-(*
- * Dllist- a mutable, circular, doubly linked list library
- * Copyright (C) 2004 Brian Hurt, Jesse Guardiani
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** A mutable, imperative, circular, doubly linked list library
-
-    This module implements a doubly linked list in a mutable or imperitive
-    style (changes to the list are visible to all copies of the list).
-*)
-
-
-type 'a node_t (* abstract *)
-
-exception Empty
-
-(** {6 node functions } *)
-
-(** Creates a node.  This is an O(1) operation. *)
-val create : 'a -> 'a node_t
-
-(** Copy the list attached to the given node and return the copy of the given
-    node.  This is an O(N) operation.
-*)
-val copy : 'a node_t -> 'a node_t
-
-(** Returns the length of the list.  This is an O(N) operation. *)
-val length : 'a node_t -> int
-
-(** List reversal.  This is an O(N) operation.
-*)
-val rev : 'a node_t -> unit
-
-(** [add n a] Creates a new node containing data [a] and inserts it into
-    the list after node [n].  This is an O(1) operation.
-*)
-val add : 'a node_t -> 'a -> unit
-
-(** [append n a] Creates a new node containing data [a] and inserts it into
-    the list after node [n]. Returns new node.  This is an O(1) operation.
-*)
-val append : 'a node_t -> 'a -> 'a node_t
-
-(** [prepend n a] Creates a new node containing data [a] and inserts it into
-    the list before node [n]. Returns new node.  This is an O(1) operation.
-*)
-val prepend : 'a node_t -> 'a -> 'a node_t
-
-(** [promote n] Swaps [n] with [next n].  This is an O(1) operation.
-*)
-val promote : 'a node_t -> unit
-
-(** [demote n] Swaps [n] with [prev n].  This is an O(1) operation.
-*)
-val demote : 'a node_t -> unit
-
-(** Remove node from the list no matter where it is.  This is an O(1) operation.
-*)
-val remove : 'a node_t -> unit
-
-(** Remove node from the list no matter where it is. Return next node.  This is
-    an O(1) operation.
-*)
-val drop : 'a node_t -> 'a node_t
-
-(** Remove node from the list no matter where it is. Return previous node.  This
-    is an O(1) operation.
-*)
-val rev_drop : 'a node_t -> 'a node_t
-
-(** [splice n1 n2] Connects [n1] and [n2] so that
-    [next n1 == n2 && prev n2 == n1]. This can be used to connect two discrete
-    lists, or, if used on two nodes within the same list, it can be used to
-    separate the nodes between [n1] and [n2] from the rest of the list. In this
-    case, those nodes become a discrete list by themselves.  This is an O(1)
-    operation.
-*)   
-val splice : 'a node_t -> 'a node_t -> unit
-
-(** Given a node, get the data associated with that node.  This is an
-    O(1) operation.
-*)
-val get : 'a node_t -> 'a
-
-(** Given a node, set the data associated with that node.  This is an O(1)
-    operation.
-*)
-val set : 'a node_t -> 'a -> unit
-
-(** Given a node, get the next element in the list after the node.  
-
-    The list is circular, so the last node of the list returns the first 
-    node of the list as it's next node.
-    
-    This is an O(1) operation.
-*)
-val next : 'a node_t -> 'a node_t
-
-(** Given a node, get the previous element in the list before the node.
- 
-    The list is circular, so the first node of the list returns the
-    last element of the list as it's previous node.
-
-    This is an O(1) operation.
-*)
-val prev : 'a node_t -> 'a node_t
-
-(** [skip n i] Return the node that is [i] nodes after node [n] in the list.
-    If [i] is negative then return the node that is [i] nodes before node [n]
-    in the list.  This is an O(N) operation.
-*)
-val skip : 'a node_t -> int -> 'a node_t
-
-(** [iter f n] Apply [f] to every element in the list, starting at [n].  This
-    is an O(N) operation.
-*)
-val iter : ('a -> unit) -> 'a node_t -> unit
-
-(** Accumulate a value over the entire list.  
-    This works like List.fold_left. This is an O(N) operation.
-*)
-val fold_left : ('a -> 'b -> 'a) -> 'a -> 'b node_t -> 'a
-
-(** Accumulate a value over the entire list.
-    This works like List.fold_right, but since the list is bidirectional,
-    it doesn't suffer the performance problems of List.fold_right.
-    This is an O(N) operation.
-*)
-val fold_right : ('a -> 'b -> 'b) -> 'a node_t -> 'b -> 'b
-
-(** Allocate a new list, with entirely new nodes, whose values are
-    the transforms of the values of the original list.  Note that this
-    does not modify the given list.  This is an O(N) operation.
-*)
-val map : ('a -> 'b) -> 'a node_t -> 'b node_t
-
-
-(** {6 list conversion } *)
-
-(** Converts a dllist to a normal list.  This is an O(N) operation. *)
-val to_list : 'a node_t -> 'a list
-
-(** Converts from a normal list to a Dllist and returns the first node. Raises
-    [Empty] if given list is empty.  This is an O(N) operation.
-*)
-val of_list : 'a list -> 'a node_t
-
-
-(** {6 enums } *)
-
-(** Create an enum of the list.
-    Note that modifying the list while the enum exists will have undefined
-    effects.  This is an O(1) operation.
-*)
-val enum : 'a node_t -> 'a Enum.t
-
-(** Create a reverse enum of the list.
-    Note that modifying the list while the enum exists will have undefined
-    effects.  This is an O(1) operation.
-*)
-val rev_enum : 'a node_t -> 'a Enum.t
-
-(** Create a dllist from an enum.
-    This consumes the enum, and allocates a whole new dllist. Raises
-    [Empty] if given enum is empty.  This is an O(N) operation.
-*)
-val of_enum : 'a Enum.t -> 'a node_t
diff --git a/libs/extlib/dynArray.ml b/libs/extlib/dynArray.ml
deleted file mode 100644
index 0f6f14b0c6a37e497ee802a51c0840cb5d42bdce..0000000000000000000000000000000000000000
--- a/libs/extlib/dynArray.ml
+++ /dev/null
@@ -1,448 +0,0 @@
-(*
- * DynArray - Resizeable Ocaml arrays
- * Copyright (C) 2003 Brian Hurt
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-type resizer_t = currslots:int -> oldlength:int -> newlength:int -> int
-
-type 'a intern
-
-external ilen : 'a intern -> int = "%obj_size"
-let idup (x : 'a intern) = if ilen x = 0 then x else (Obj.magic (Obj.dup (Obj.repr x)) : 'a intern)
-let imake tag len = (Obj.magic (Obj.new_block tag len) : 'a intern)
-external iget : 'a intern -> int -> 'a = "%obj_field"
-external iset : 'a intern -> int -> 'a -> unit = "%obj_set_field"
-
-type 'a t = {
-	mutable arr : 'a intern;
-	mutable len : int;
-	mutable resize: resizer_t;
-}
-
-exception Invalid_arg of int * string * string
-
-let invalid_arg n f p = raise (Invalid_arg (n,f,p))
-
-let length d = d.len
-
-let exponential_resizer ~currslots ~oldlength ~newlength =
-	let rec doubler x = if x >= newlength then x else doubler (x * 2) in
-	let rec halfer x = if x / 2 < newlength then x else halfer (x / 2) in
-	if newlength = 1 then
-		1
-	else if currslots = 0 then
-		doubler 1
-	else if currslots < newlength then
-		doubler currslots
-	else
-		halfer currslots
-
-let step_resizer step =
-	if step <= 0 then invalid_arg step "step_resizer" "step";
-	(fun ~currslots ~oldlength ~newlength ->
-		if currslots < newlength || newlength < (currslots - step)
-		then
-		   (newlength + step - (newlength mod step))
-		else
-			currslots)
-
-let conservative_exponential_resizer ~currslots ~oldlength ~newlength =
-	let rec doubler x = if x >= newlength then x else doubler (x * 2) in
-	let rec halfer x = if x / 2 < newlength then x else halfer (x / 2) in
-	if currslots < newlength then begin
-		if newlength = 1 then
-			1
-		else if currslots = 0 then
-			doubler 1
-		else
-			doubler currslots
-	end else if oldlength < newlength then
-		halfer currslots
-	else
-		currslots
-
-let default_resizer = conservative_exponential_resizer
-
-let changelen (d : 'a t) newlen =
-	let oldsize = ilen d.arr in
-	let r = d.resize
-			~currslots:oldsize
-			~oldlength:d.len
-			~newlength:newlen
-	in
-	(* We require the size to be at least large enough to hold the number
-	 * of elements we know we need!
-	 *)
-	let newsize = if r < newlen then newlen else r in
-	if newsize <> oldsize then begin
-		let newarr = imake 0 newsize in
-		let cpylen = (if newlen < d.len then newlen else d.len) in
-		for i = 0 to cpylen - 1 do
-			iset newarr i (iget d.arr i);
-		done;
-		d.arr <- newarr;
-	end;
-	d.len <- newlen
-
-let compact d =
-	if d.len <> ilen d.arr then begin
-		let newarr = imake 0 d.len in
-		for i = 0 to d.len - 1 do
-			iset newarr i (iget d.arr i)
-		done;
-		d.arr <- newarr;
-	end
-
-let create() =
-	{
-		resize = default_resizer;
-		len = 0;
-		arr = imake 0 0;
-	}
-
-let make initsize =
-	if initsize < 0 then invalid_arg initsize "make" "size";
-	{
-		resize = default_resizer;
-		len = 0;
-		arr = imake 0 initsize;
-	}
-
-let init initlen f =
-	if initlen < 0 then invalid_arg initlen "init" "len";
-	let arr = imake 0 initlen in
-	for i = 0 to initlen-1 do
-		iset arr i (f i)
-	done;
-	{
-		resize = default_resizer;
-		len = initlen;
-		arr = arr;
-	}
-
-let set_resizer d resizer =
-	d.resize <- resizer
-
-let get_resizer d =
-	d.resize
-
-let empty d =
-	d.len = 0
-
-let get d idx =
-	if idx < 0 || idx >= d.len then invalid_arg idx "get" "index";
-	iget d.arr idx
-
-let last d =
-	if d.len = 0 then invalid_arg 0 "last" "<array len is 0>";
-	iget d.arr (d.len - 1)
-
-let set d idx v =
-	if idx < 0 || idx >= d.len then 	invalid_arg idx "set" "index";
-	iset d.arr idx v
-
-let insert d idx v =
-	if idx < 0 || idx > d.len then invalid_arg idx "insert" "index";
-	if d.len = ilen d.arr then changelen d (d.len + 1) else d.len <- d.len + 1;
-	if idx < d.len - 1 then begin
-		for i = d.len - 2 downto idx do
-			iset d.arr (i+1) (iget d.arr i)
-		done;
-	end;
-	iset d.arr idx v
-
-let add d v =
-	if d.len = ilen d.arr then changelen d (d.len + 1) else d.len <- d.len + 1;
-	iset d.arr (d.len - 1) v
-
-let delete d idx =
-	if idx < 0 || idx >= d.len then invalid_arg idx "delete" "index";
-	let oldsize = ilen d.arr in
-	(* we don't call changelen because we want to blit *)
-	let r = d.resize
-		~currslots:oldsize
-		~oldlength:d.len
-		~newlength:(d.len - 1)
-	in
-	let newsize = (if r < d.len - 1 then d.len - 1 else r) in
-	if oldsize <> newsize then begin
-		let newarr = imake 0 newsize in
-		for i = 0 to idx - 1 do
-			iset newarr i (iget d.arr i);
-		done;
-		for i = idx to d.len - 2 do
-			iset newarr i (iget d.arr (i+1));
-		done;
-		d.arr <- newarr;
-	end else begin
-		for i = idx to d.len - 2 do
-			iset d.arr i (iget d.arr (i+1));
-		done;
-		iset d.arr (d.len - 1) (Obj.magic 0)
-	end;
-	d.len <- d.len - 1
-
-
-let delete_range d idx len =
-	if len < 0 then invalid_arg len "delete_range" "length";
-	if idx < 0 || idx + len > d.len then invalid_arg idx "delete_range" "index";
-	let oldsize = ilen d.arr in
-	(* we don't call changelen because we want to blit *)
-	let r = d.resize
-		~currslots:oldsize
-		~oldlength:d.len
-		~newlength:(d.len - len)
-	in
-	let newsize = (if r < d.len - len then d.len - len else r) in
-	if oldsize <> newsize then begin
-		let newarr = imake 0 newsize in
-		for i = 0 to idx - 1 do
-			iset newarr i (iget d.arr i);
-		done;
-		for i = idx to d.len - len - 1 do
-			iset newarr i (iget d.arr (i+len));
-		done;
-		d.arr <- newarr;
-	end else begin
-		for i = idx to d.len - len - 1 do
-			iset d.arr i (iget d.arr (i+len));
-		done;
-		for i = d.len - len to d.len - 1 do
-			iset d.arr i (Obj.magic 0)
-		done;
-	end;
-	d.len <- d.len - len
-
-let clear d =
-	d.len <- 0;
-	d.arr <- imake 0 0
-
-let delete_last d =
-	if d.len <= 0 then invalid_arg 0 "delete_last" "<array len is 0>";
-	(* erase for GC, in case changelen don't resize our array *)
-	iset d.arr (d.len - 1) (Obj.magic 0);
-	changelen d (d.len - 1)
-
-let rec blit src srcidx dst dstidx len =
-	if len < 0 then invalid_arg len "blit" "len";
-	if srcidx < 0 || srcidx + len > src.len then invalid_arg srcidx "blit" "source index";
-	if dstidx < 0 || dstidx > dst.len then invalid_arg dstidx "blit" "dest index";
-	let newlen = dstidx + len in
-	if newlen > ilen dst.arr then begin
-		(* this case could be inlined so we don't blit on just-copied elements *)
-		changelen dst newlen
-	end else begin
-		if newlen > dst.len then dst.len <- newlen;
-	end;
-	(* same array ! we need to copy in reverse order *)
-	if src.arr == dst.arr && dstidx > srcidx then
-		for i = len - 1 downto 0 do
-			iset dst.arr (dstidx+i) (iget src.arr (srcidx+i));
-		done
-	else
-		for i = 0 to len - 1 do
-			iset dst.arr (dstidx+i) (iget src.arr (srcidx+i));
-		done
-
-let append src dst =
-	blit src 0 dst dst.len src.len
-
-let to_list d =
-	let rec loop idx accum =
-		if idx < 0 then accum else loop (idx - 1) (iget d.arr idx :: accum)
-	in
-	loop (d.len - 1) []
-
-let to_array d =
-	if d.len = 0 then begin
-		(* since the empty array is an atom, we don't care if float or not *)
-		[||]
-	end else begin
-		let arr = Array.make d.len (iget d.arr 0) in
-		for i = 1 to d.len - 1 do
-			Array.unsafe_set arr i (iget d.arr i)
-		done;
-		arr;
-	end
-
-let of_list lst =
-	let size = List.length lst in
-	let arr = imake 0 size in
-	let rec loop idx =  function
-		| h :: t -> iset arr idx h; loop (idx + 1) t
-		| [] -> ()
-	in
-	loop 0 lst;
-	{
-		resize = default_resizer;
-		len = size;
-		arr = arr;
-	}
-
-let of_array src =
-	let size = Array.length src in
-	let is_float = Obj.tag (Obj.repr src) = Obj.double_array_tag in
-	let arr = (if is_float then begin
-			let arr = imake 0 size in
-			for i = 0 to size - 1 do
-				iset arr i (Array.unsafe_get src i);
-			done;
-			arr
-		end else
-			(* copy the fields *)
-			idup (Obj.magic src : 'a intern))
-	in
-	{
-		resize = default_resizer;
-		len = size;
-		arr = arr;
-	}
-
-let copy src =
-	{
-		resize = src.resize;
-		len = src.len;
-		arr = idup src.arr;
-	}
-
-let sub src start len =
-	if len < 0 then invalid_arg len "sub" "len";
-	if start < 0 || start + len > src.len then invalid_arg start "sub" "start";
-	let arr = imake 0 len in
-	for i = 0 to len - 1 do
-		iset arr i (iget src.arr (i+start));
-	done;
-	{
-		resize = src.resize;
-		len = len;
-		arr = arr;
-	}
-
-let iter f d =
-	for i = 0 to d.len - 1 do
-		f (iget d.arr i)
-	done
-
-let iteri f d =
-	for i = 0 to d.len - 1 do
-		f i (iget d.arr i)
-	done
-
-let filter f d =
-	let l = d.len in
-	let a = imake 0 l in
-	let a2 = d.arr in
-	let p = ref 0 in
-	for i = 0 to l - 1 do
-		let x = iget a2 i in
-		if f x then begin
-			iset a !p x;
-			incr p;
-		end;
-	done;
-	d.len <- !p;
-	d.arr <- a
-
-let index_of f d =
-	let rec loop i =
-		if i >= d.len then
-			raise Not_found
-		else
-			if f (iget d.arr i) then
-				i
-			else
-				loop (i+1)
-	in
-	loop 0
-
-let map f src =
-	let arr = imake 0 src.len in
-	for i = 0 to src.len - 1 do
-		iset arr i (f (iget src.arr i))
-	done;
-	{
-		resize = src.resize;
-		len = src.len;
-		arr = arr;
-	}
-
-let mapi f src =
-	let arr = imake 0 src.len in
-	for i = 0 to src.len - 1 do
-		iset arr i (f i (iget src.arr i))
-	done;
-	{
-		resize = src.resize;
-		len = src.len;
-		arr = arr;
-	}
-
-let fold_left f x a =
-	let rec loop idx x =
-		if idx >= a.len then x else loop (idx + 1) (f x (iget a.arr idx))
-	in
-	loop 0 x
-
-let fold_right f a x =
-	let rec loop idx x =
-		if idx < 0 then x
-		else loop (idx - 1) (f (iget a.arr idx) x)
-	in
-	loop (a.len - 1) x
-
-let enum d =
-	let rec make start =
-		let idxref = ref 0 in
-		let next () =
-			if !idxref >= d.len then
-				raise Enum.No_more_elements
-			else
-				let retval = iget d.arr !idxref in
-				incr idxref;
-				retval
-		and count () =
-			if !idxref >= d.len then 0
-			else d.len - !idxref
-		and clone () =
-			make !idxref
-		in
-		Enum.make ~next:next ~count:count ~clone:clone
-	in
-	make 0
-
-let of_enum e =
-	if Enum.fast_count e then begin
-		let c = Enum.count e in
-		let arr = imake 0 c in
-		Enum.iteri (fun i x -> iset arr i x) e;
-		{
-			resize = default_resizer;
-			len = c;
-			arr = arr;
-		}
-	end else
-		let d = make 0 in
-		Enum.iter (add d) e;
-		d
-
-let unsafe_get a n =
-	iget a.arr n
-
-let unsafe_set a n x =
-	iset a.arr n x
diff --git a/libs/extlib/dynArray.mli b/libs/extlib/dynArray.mli
deleted file mode 100644
index 2ce39e98ad2e6489a6d91e0e8cf0b2af01c98070..0000000000000000000000000000000000000000
--- a/libs/extlib/dynArray.mli
+++ /dev/null
@@ -1,281 +0,0 @@
-(*
- * DynArray - Resizeable Ocaml arrays
- * Copyright (C) 2003 Brian Hurt
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Dynamic arrays.
-
-   A dynamic array is equivalent to a OCaml array that will resize itself
-   when elements are added or removed, except that floats are boxed and
-   that no initialization element is required.
-*)
-
-type 'a t
-
-exception Invalid_arg of int * string * string
-(** When an operation on an array fails, [Invalid_arg] is raised. The
-	integer is the value that made the operation fail, the first string
-	contains the function name that has been called and the second string
-	contains the parameter name that made the operation fail.
-*)
-
-(** {6 Array creation} *)
-
-val create : unit -> 'a t
-(** [create()] returns a new empty dynamic array. *)
-
-val make : int -> 'a t
-(** [make count] returns an array with some memory already allocated so
-	up to [count] elements can be stored into it without resizing. *)
-
-val init : int -> (int -> 'a) -> 'a t
-(** [init n f] returns an array of [n] elements filled with values
-	returned by [f 0 , f 1, ... f (n-1)]. *)
-
-(** {6 Array manipulation functions} *)
-
-val empty : 'a t -> bool
-(** Return true if the number of elements in the array is 0. *)
-
-val length : 'a t -> int
-(** Return the number of elements in the array. *)
-
-val get : 'a t -> int -> 'a
-(** [get darr idx] gets the element in [darr] at index [idx]. If [darr] has
-	[len] elements in it, then the valid indexes range from [0] to [len-1]. *)
-
-val last : 'a t -> 'a
-(** [last darr] returns the last element of [darr]. *)
-
-val set : 'a t -> int -> 'a -> unit
-(** [set darr idx v] sets the element of [darr] at index [idx] to value
-	[v].  The previous value is overwritten. *)
-
-val insert : 'a t -> int -> 'a -> unit
-(** [insert darr idx v] inserts [v] into [darr] at index [idx].  All elements
-	of [darr] with an index greater than or equal to [idx] have their
-	index incremented (are moved up one place) to make room for the new
-	element. *)
-
-val add : 'a t -> 'a -> unit
-(** [add darr v] appends [v] onto [darr].  [v] becomes the new
-	last element of [darr]. *)
-
-val append : 'a t -> 'a t -> unit
-(** [append src dst] adds all elements of [src] to the end of [dst]. *)
-
-val delete : 'a t -> int -> unit
-(** [delete darr idx] deletes the element of [darr] at [idx].  All elements
-	with an index greater than [idx] have their index decremented (are
-	moved down one place) to fill in the hole. *)
-
-val delete_last : 'a t -> unit
-(** [delete_last darr] deletes the last element of [darr]. This is equivalent
-	of doing [delete darr ((length darr) - 1)]. *)
-
-val delete_range : 'a t -> int -> int -> unit
-(** [delete_range darr p len] deletes [len] elements starting at index [p].
-	All elements with an index greater than [p+len] are moved to fill
-	in the hole. *)
-
-val clear : 'a t -> unit
-(** remove all elements from the array and resize it to 0. *)
-
-val blit : 'a t -> int -> 'a t -> int -> int -> unit
-(** [blit src srcidx dst dstidx len] copies [len] elements from [src]
-	starting with index [srcidx] to [dst] starting at [dstidx]. *)
-
-val compact : 'a t -> unit
-(** [compact darr] ensures that the space allocated by the array is minimal.*)
-
-(** {6 Array copy and conversion} *)
-
-val to_list : 'a t -> 'a list
-(** [to_list darr] returns the elements of [darr] in order as a list. *)
-
-val to_array : 'a t -> 'a array
-(** [to_array darr] returns the elements of [darr] in order as an array. *)
-
-val enum : 'a t -> 'a Enum.t
-(** [enum darr] returns the enumeration of [darr] elements. *)
-
-val of_list : 'a list -> 'a t
-(** [of_list lst] returns a dynamic array with the elements of [lst] in
-	it in order. *)
-
-val of_array : 'a array -> 'a t
-(** [of_array arr] returns an array with the elements of [arr] in it
-	in order. *)
-
-val of_enum : 'a Enum.t -> 'a t
-(** [of_enum e] returns an array that holds, in order, the elements of [e]. *)
-
-val copy : 'a t -> 'a t
-(** [copy src] returns a fresh copy of [src], such that no modification of
-	[src] affects the copy, or vice versa (all new memory is allocated for
-	the copy).   *)
-
-val sub : 'a t -> int -> int -> 'a t
-(** [sub darr start len] returns an array holding the subset of [len]
-	elements from [darr] starting with the element at index [idx]. *)
-
-(** {6 Array functional support} *)
-
-val iter : ('a -> unit) -> 'a t -> unit
-(** [iter f darr] calls the function [f] on every element of [darr].  It
-	is equivalent to [for i = 0 to length darr - 1 do f (get darr i) done;] *)
-
-val iteri : (int -> 'a -> unit) -> 'a t -> unit
-(** [iter f darr] calls the function [f] on every element of [darr].  It
-	is equivalent to [for i = 0 to length darr - 1 do f i (get darr i) done;]
-	*)
-
-val map : ('a -> 'b) -> 'a t -> 'b t
-(** [map f darr] applies the function [f] to every element of [darr]
-	and creates a dynamic array from the results - similar to [List.map] or
-	[Array.map]. *)
-
-val mapi : (int -> 'a -> 'b) -> 'a t -> 'b t
-(** [mapi f darr] applies the function [f] to every element of [darr]
-	and creates a dynamic array from the results - similar to [List.mapi] or
-	[Array.mapi]. *)
-
-val fold_left : ('a -> 'b -> 'a) -> 'a -> 'b t -> 'a
-(** [fold_left f x darr] computes
-	[f ( ... ( f ( f (get darr 0) x) (get darr 1) ) ... ) (get darr n-1)],
-	similar to [Array.fold_left] or [List.fold_left]. *)
-
-val fold_right : ('a -> 'b -> 'b) -> 'a t -> 'b -> 'b
-(** [fold_right f darr x] computes
-	[ f (get darr 0) (f (get darr 1) ( ... ( f (get darr n-1) x ) ... ) ) ]
-	similar to [Array.fold_right] or [List.fold_right]. *)
-
-val index_of : ('a -> bool) -> 'a t -> int
-(** [index_of f darr] returns the index of the first element [x] in darr such
-	as [f x] returns [true] or raise [Not_found] if not found. *)
-
-val filter : ('a -> bool) -> 'a t -> unit
-
-(** {6 Array resizers} *)
-
-type resizer_t = currslots:int -> oldlength:int -> newlength:int -> int
-(** The type of a resizer function.
-
-	Resizer functions are called whenever elements are added to
-	or removed from the dynamic array to determine what the current number of
-	storage spaces in the array should be.  The three named arguments
-	passed to a resizer are the current number of storage spaces in
-	the array, the length of the array before the elements are
-	added or removed, and the length the array will be after the
-	elements are added or removed.  If elements are being added, newlength
-	will be larger than oldlength, if elements are being removed,
-	newlength will be smaller than oldlength. If the resizer function
-	returns exactly oldlength, the size of the array is only changed when
-	adding an element while there is not enough space for it.
-
-	By default, all dynamic arrays are created with the [default_resizer].
-	When a dynamic array is created from another dynamic array (using [copy],
-	[map] , etc. ) the resizer of the copy will be the same as the original
-	dynamic array resizer. To change the resizer, use the [set_resizer]
-	function.
-*)
-
-val set_resizer : 'a t -> resizer_t -> unit
-(** Change the resizer for this array. *)
-
-val get_resizer : 'a t -> resizer_t
-(** Get the current resizer function for a given array *)
-
-val default_resizer : resizer_t
-(** The default resizer function the library is using - in this version
-	of DynArray, this is the [exponential_resizer] but should change in
-	next versions. *)
-
-val exponential_resizer : resizer_t
-(** The exponential resizer- The default resizer except when the resizer
-	is being copied from some other darray.
-
-	[exponential_resizer] works by doubling or halving the number of
-	slots until they "fit".  If the number of slots is less than the
-	new length, the number of slots is doubled until it is greater
-	than the new length (or Sys.max_array_size is reached).
-
-	If the number of slots is more than four times the new length,
-	the number of slots is halved until it is less than four times the
-	new length.
-
-	Allowing darrays to fall below 25% utilization before shrinking them
-	prevents "thrashing".  Consider the case where the caller is constantly
-	adding a few elements, and then removing a few elements, causing
-	the length to constantly cross above and below a power of two.
-	Shrinking the array when it falls below 50% would causing the
-	underlying array to be constantly allocated and deallocated.
-	A few elements would be added, causing the array to be reallocated
-	and have a usage of just above 50%.  Then a few elements would be
-	remove, and the array would fall below 50% utilization and be
-	reallocated yet again.  The bulk of the array, untouched, would be
-	copied and copied again.  By setting the threshold at 25% instead,
-	such "thrashing" only occurs with wild swings- adding and removing
-	huge numbers of elements (more than half of the elements in the array).
-
-	[exponential_resizer] is a good performing resizer for most
-	applications.  A list allocates 2 words for every element, while an
-	array (with large numbers of elements) allocates only 1 word per
-	element (ignoring unboxed floats).  On insert, [exponential_resizer]
-	keeps the amount of wasted "extra" array elements below 50%, meaning
-	that less than 2 words per element are used.  Even on removals
-	where the amount of wasted space is allowed to rise to 75%, that
-	only means that darray is using 4 words per element.  This is
-	generally not a significant overhead.
-
-	Furthermore, [exponential_resizer] minimizes the number of copies
-	needed- appending n elements into an empty darray with initial size
-	0 requires between n and 2n elements of the array be copied- O(n)
-	work, or O(1) work per element (on average).  A similar argument
-	can be made that deletes from the end of the array are O(1) as
-	well (obviously deletes from anywhere else are O(n) work- you
-	have to move the n or so elements above the deleted element down).
-
-*)
-
-val step_resizer : int -> resizer_t
-(** The stepwise resizer- another example of a resizer function, this
-	time of a parameterized resizer.
-
-	The resizer returned by [step_resizer step] returns the smallest
-	multiple of [step] larger than [newlength] if [currslots] is less
-	then [newlength]-[step] or greater than [newlength].
-
-	For example, to make an darray with a step of 10, a length
-	of len, and a null of null, you would do:
-	[make] ~resizer:([step_resizer] 10) len null
-*)
-
-val conservative_exponential_resizer : resizer_t
-(** [conservative_exponential_resizer] is an example resizer function
-	which uses the oldlength parameter.  It only shrinks the array
-	on inserts- no deletes shrink the array, only inserts.  It does
-	this by comparing the oldlength and newlength parameters.  Other
-	than that, it acts like [exponential_resizer].
-*)
-
-(** {6 Unsafe operations} **)
-
-val unsafe_get : 'a t -> int -> 'a
-val unsafe_set : 'a t -> int -> 'a -> unit
diff --git a/libs/extlib/enum.ml b/libs/extlib/enum.ml
deleted file mode 100644
index 4528ad3e8801631251b8262f4423fd08b86ee3d8..0000000000000000000000000000000000000000
--- a/libs/extlib/enum.ml
+++ /dev/null
@@ -1,376 +0,0 @@
-(* 
- * Enum - Enumeration over abstract collection of elements.
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-type 'a t = {
-	mutable count : unit -> int;
-	mutable next : unit -> 'a;
-	mutable clone : unit -> 'a t;
-	mutable fast : bool;
-}
-
-(* raised by 'next' functions, should NOT go outside the API *)
-exception No_more_elements
-
-let _dummy () = assert false
-
-let make ~next ~count ~clone =
-	{
-		count = count;
-		next = next;
-		clone = clone;
-		fast = true;
-	}
-
-let rec init n f =
-	if n < 0 then invalid_arg "Enum.init";
-	let count = ref n in
-	{
-		count = (fun () -> !count);
-		next = (fun () ->
-			match !count with
-			| 0 -> raise No_more_elements
-			| _ ->
-				decr count;
-				f (n - 1 - !count));
-		clone = (fun () -> init !count f);
-		fast = true;
-	}			
-
-let rec empty () =
-	{
-		count = (fun () -> 0);
-		next = (fun () -> raise No_more_elements);
-		clone = (fun () -> empty());
-		fast = true;
-	}
-
-type 'a _mut_list = {
-	hd : 'a;
-	mutable tl : 'a _mut_list;
-}
-
-let force t =
-	let rec clone enum count =
-		let enum = ref !enum
-		and	count = ref !count in
-		{
-			count = (fun () -> !count);
-			next = (fun () ->
-				match !enum with
-				| [] -> raise No_more_elements
-				| h :: t -> decr count; enum := t; h);
-			clone = (fun () ->
-				let enum = ref !enum
-				and count = ref !count in
-				clone enum count);
-			fast = true;
-		}
-	in
-	let count = ref 0 in
-	let _empty = Obj.magic [] in
-	let rec loop dst =
-		let x = { hd = t.next(); tl = _empty } in
-		incr count;
-		dst.tl <- x;
-		loop x
-	in
-	let enum = ref _empty  in 
-	(try
-		enum := { hd = t.next(); tl = _empty };
-		incr count;
-		loop !enum;
-	with No_more_elements -> ());
-	let tc = clone (Obj.magic enum) count in
-	t.clone <- tc.clone;
-	t.next <- tc.next;
-	t.count <- tc.count;
-	t.fast <- true
-
-let from f =
-	let e = {
-		next = f;
-		count = _dummy;
-		clone = _dummy;
-		fast = false;
-	} in
-	e.count <- (fun () -> force e; e.count());
-	e.clone <- (fun () -> force e; e.clone());
-	e
-
-let from2 next clone =
-	let e = {
-		next = next;
-		count = _dummy;
-		clone = clone;
-		fast = false;
-	} in
-	e.count <- (fun () -> force e; e.count());
-	e
-
-let get t =
-	try
-		Some (t.next())
-	with
-		No_more_elements -> None
-
-let push t e =
-	let rec make t =
-		let fnext = t.next in
-		let fcount = t.count in
-		let fclone = t.clone in
-		let next_called = ref false in
-		t.next <- (fun () ->
-			next_called := true;
-			t.next <- fnext;
-			t.count <- fcount;
-			t.clone <- fclone;
-			e);
-		t.count <- (fun () ->
-			let n = fcount() in
-			if !next_called then n else n+1);
-		t.clone <- (fun () ->
-			let tc = fclone() in
-			if not !next_called then make tc;
-			tc);
-	in
-	make t
-
-let peek t =
-	match get t with
-	| None -> None
-	| Some x ->
-		push t x;
-		Some x
-
-let junk t =
-	try
-		ignore(t.next())
-	with
-		No_more_elements -> ()
-
-let is_empty t =
-	if t.fast then
-		t.count() = 0
-	else
-		peek t = None
-
-let count t =
-	t.count()
-
-let fast_count t =
-	t.fast
-
-let clone t =
-	t.clone()
-
-let iter f t =
-	let rec loop () =
-		f (t.next());
-		loop();
-	in
-	try
-		loop();
-	with
-		No_more_elements -> ()
-
-let iteri f t =
-	let rec loop idx =
-		f idx (t.next());
-		loop (idx+1);
-	in
-	try
-		loop 0;
-	with
-		No_more_elements -> ()
-
-let iter2 f t u =
-	let push_t = ref None in
-	let rec loop () =
-		push_t := None;
-		let e = t.next() in
-		push_t := Some e;
-		f e (u.next());
-		loop ()
-	in
-	try
-		loop ()
-	with
-		No_more_elements ->
-			match !push_t with
-			| None -> ()
-			| Some e ->
-				push t e
-
-let iter2i f t u =
-	let push_t = ref None in
-	let rec loop idx =
-		push_t := None;
-		let e = t.next() in
-		push_t := Some e;
-		f idx e (u.next());
-		loop (idx + 1)
-	in
-	try
-		loop 0
-	with
-		No_more_elements ->
-			match !push_t with
-			| None -> ()
-			| Some e -> push t e
-
-let fold f init t =
-	let acc = ref init in
-	let rec loop() =
-		acc := f (t.next()) !acc;
-		loop()
-	in
-	try
-		loop()
-	with
-		No_more_elements -> !acc
-
-let foldi f init t =
-	let acc = ref init in
-	let rec loop idx =
-		acc := f idx (t.next()) !acc;
-		loop (idx + 1)
-	in
-	try
-		loop 0
-	with
-		No_more_elements -> !acc
-
-let fold2 f init t u =
-	let acc = ref init in
-	let push_t = ref None in
-	let rec loop() =
-		push_t := None;
-		let e = t.next() in
-		push_t := Some e;
-		acc := f e (u.next()) !acc;
-		loop()
-	in
-	try
-		loop()
-	with
-		No_more_elements ->
-			match !push_t with
-			| None -> !acc
-			| Some e ->
-				push t e;
-				!acc
-
-let fold2i f init t u =
-	let acc = ref init in
-	let push_t = ref None in
-	let rec loop idx =
-		push_t := None;
-		let e = t.next() in
-		push_t := Some e;
-		acc := f idx e (u.next()) !acc;
-		loop (idx + 1)
-	in
-	try
-		loop 0
-	with
-		No_more_elements ->
-			match !push_t with
-			| None -> !acc
-			| Some e ->
-				push t e;
-				!acc
-
-let find f t =
-	let rec loop () =
-		let x = t.next() in
-		if f x then x else loop()
-	in
-	try
-		loop()
-	with
-		No_more_elements -> raise Not_found
-
-let rec map f t =
-	{
-		count = t.count;
-		next = (fun () -> f (t.next()));
-		clone = (fun () -> map f (t.clone()));
-		fast = t.fast;
-	}
-
-let rec mapi f t =
-	let idx = ref (-1) in
-	{
-		count = t.count;
-		next = (fun () -> incr idx; f !idx (t.next()));
-		clone = (fun () -> mapi f (t.clone()));
-		fast = t.fast;
-	}
-
-let rec filter f t =
-	let rec next() =
-		let x = t.next() in
-		if f x then x else next()
-	in
-	from2 next (fun () -> filter f (t.clone()))
-
-let rec filter_map f t =
-    let rec next () =
-        match f (t.next()) with
-        | None -> next()
-        | Some x -> x
-    in
-	from2 next (fun () -> filter_map f (t.clone()))
-
-let rec append ta tb = 
-	let t = {
-		count = (fun () -> ta.count() + tb.count());
-		next = _dummy;
-		clone = (fun () -> append (ta.clone()) (tb.clone()));
-		fast = ta.fast && tb.fast;
-	} in
-	t.next <- (fun () ->
-		try
-			ta.next()
-		with
-			No_more_elements ->
-				(* add one indirection because tb can mute *)
-				t.next <- (fun () -> tb.next());
-				t.count <- (fun () -> tb.count());
-				t.clone <- (fun () -> tb.clone());
-				t.fast <- tb.fast;
-				t.next()
-	);
-	t
-
-let rec concat t =
-	let concat_ref = ref _dummy in
-	let rec concat_next() =
-		let tn = t.next() in
-		concat_ref := (fun () ->
-			try
-				tn.next()
-			with
-				No_more_elements ->
-					concat_next());
-		!concat_ref ()
-	in
-	concat_ref := concat_next;
-	from2 (fun () -> !concat_ref ()) (fun () -> concat (t.clone()))
diff --git a/libs/extlib/enum.mli b/libs/extlib/enum.mli
deleted file mode 100644
index 79c102e8f1fc346dce2b34c04924d23bf59d4ffc..0000000000000000000000000000000000000000
--- a/libs/extlib/enum.mli
+++ /dev/null
@@ -1,201 +0,0 @@
-(* 
- * Enum - enumeration over abstract collection of elements.
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Enumeration over abstract collection of elements.
-
- Enumerations are entirely functional and most of the operations do not
- actually require the allocation of data structures. Using enumerations
- to manipulate data is therefore efficient and simple. All data structures in
- ExtLib such as lists, arrays, etc. have support to convert from and to
- enumerations.
-*)
-
-
-type 'a t
-
-(** {6 Final functions}
-
- These functions consume the enumeration until
- it ends or an exception is raised by the first
- argument function.
-*)
-
-val iter : ('a -> unit) -> 'a t -> unit
-(** [iter f e] calls the function [f] with each elements of [e] in turn. *)
-
-val iter2 : ('a -> 'b -> unit) -> 'a t -> 'b t -> unit
-(** [iter2 f e1 e2] calls the function [f] with the next elements of [e] and
- [e2] repeatedly until one of the two enumerations ends. *)
-
-val fold : ('a -> 'b -> 'b) -> 'b -> 'a t -> 'b
-(** [fold f v e] returns v if e is empty,
-  otherwise [f (... (f (f v a1) a2) ...) aN] where a1..N are
-  the elements of [e]. 
-*)
-
-val fold2 : ('a -> 'b -> 'c -> 'c) -> 'c -> 'a t -> 'b t -> 'c
-(** [fold2] is similar to [fold] but will fold over two enumerations at the
- same time until one of the two enumerations ends. *)
-
-(** Indexed functions : these functions are similar to previous ones
- except that they call the function with one additional argument which
- is an index starting at 0 and incremented after each call to the function. *)
-
-val iteri : (int -> 'a -> unit) -> 'a t -> unit
-
-val iter2i : ( int -> 'a -> 'b -> unit) -> 'a t -> 'b t -> unit
-
-val foldi : (int -> 'a -> 'b -> 'b) -> 'b -> 'a t -> 'b
-
-val fold2i : (int -> 'a -> 'b -> 'c -> 'c) -> 'c -> 'a t -> 'b t -> 'c
-
-(** {6 Useful functions} *)
-
-val find : ('a -> bool) -> 'a t -> 'a
-(** [find f e] returns the first element [x] of [e] such that [f x] returns
- [true], consuming the enumeration up to and including the
- found element, or, raises [Not_found] if no such element exists
- in the enumeration, consuming the whole enumeration in the search.
-
- Since [find] consumes a prefix of the enumeration, it can be used several 
- times on the same enumeration to find the next element. *)
-
-val is_empty : 'a t -> bool
-(** [is_empty e] returns true if [e] does not contains any element. *)
-
-val peek : 'a t -> 'a option
-(** [peek e] returns [None] if [e] is empty or [Some x] where [x] is
- the next element of [e]. The element is not removed from the enumeration. *)
-
-val get : 'a t -> 'a option
-(** [get e] returns [None] if [e] is empty or [Some x] where [x] is
-  the next element of [e], in which case the element is removed from the enumeration. *)
-
-val push : 'a t -> 'a -> unit
-(** [push e x] will add [x] at the beginning of [e]. *)
-
-val junk : 'a t -> unit
-(** [junk e] removes the first element from the enumeration, if any. *)
-
-val clone : 'a t -> 'a t
-(** [clone e] creates a new enumeration that is copy of [e]. If [e]
- is consumed by later operations, the clone will not get affected. *)
-
-val force : 'a t -> unit
-(** [force e] forces the application of all lazy functions and the
- enumeration of all elements, exhausting the enumeration. 
- 
-  An efficient intermediate data structure
-  of enumerated elements is constructed and [e] will now enumerate over
-  that data structure. *)
-
-(** {6 Lazy constructors}
-
- These functions are lazy which means that they will create a new modified
- enumeration without actually enumerating any element until they are asked
- to do so by the programmer (using one of the functions above).
- 
- When the resulting enumerations of these functions are consumed, the
- underlying enumerations they were created from are also consumed. *)
-
-val map : ('a -> 'b) -> 'a t -> 'b t
-(** [map f e] returns an enumeration over [(f a1, f a2, ... , f aN)] where
- a1...N are the elements of [e]. *)
-
-val mapi : (int -> 'a -> 'b) -> 'a t -> 'b t
-(** [mapi] is similar to [map] except that [f] is passed one extra argument
- which is the index of the element in the enumeration, starting from 0. *)
-
-val filter : ('a -> bool) -> 'a t -> 'a t
-(** [filter f e] returns an enumeration over all elements [x] of [e] such
- as [f x] returns [true]. *)
-
-val filter_map : ('a -> 'b option) -> 'a t -> 'b t
-(** [filter_map f e] returns an enumeration over all elements [x] such as
- [f y] returns [Some x] , where [y] is an element of [e]. *)
-
-val append : 'a t -> 'a t -> 'a t
-(** [append e1 e2] returns an enumeration that will enumerate over all
- elements of [e1] followed by all elements of [e2]. *)
-
-val concat : 'a t t -> 'a t
-(** [concat e] returns an enumeration over all elements of all enumerations
- of [e]. *)
-
-(** {6 Constructors} 
-
- In this section the word {i shall} denotes a semantic
- requirement. The correct operation
- of the functions in this interface are conditional
- on the client meeting these requirements.
-*)
-
-exception No_more_elements
-(** This exception {i shall} be raised by the [next] function of [make] 
-  or [from] when no more elements can be enumerated, it {i shall not}
-  be raised by any function which is an argument to any
-  other function specified in the interface.
-*)
-
-val empty : unit -> 'a t
-(** The empty enumeration : contains no element *)
-
-val make : next:(unit -> 'a) -> count:(unit -> int) -> clone:(unit -> 'a t) -> 'a t
-(** This function creates a fully defined enumeration.
-	{ul {li the [next] function {i shall} return the next element of the
-	enumeration or raise [No_more_elements] if the underlying data structure
-	does not have any more elements to enumerate.}
-	{li the [count] function {i shall} return the actual number of remaining
-	elements in the enumeration.}
-	{li the [clone] function {i shall} create a clone of the enumeration
-	such as operations on the original enumeration will not affect the
-	clone. }}
- 
-	For some samples on how to correctly use [make], you can have a look
-		at implementation of [ExtList.enum]. 
-*)
-
-val from : (unit -> 'a) -> 'a t
-(** [from next] creates an enumeration from the [next] function.
- [next] {i shall} return the next element of the enumeration or raise
- [No_more_elements] when no more elements can be enumerated. Since the
- enumeration definition is incomplete, a call to [clone] or [count] will
- result in a call to [force] that will enumerate all elements in order to
- return a correct value. *)
-
-val init : int -> (int -> 'a) -> 'a t
-(** [init n f] creates a new enumeration over elements
-  [f 0, f 1, ..., f (n-1)] *)
-
-(** {6 Counting} *)
-
-val count : 'a t -> int
-(** [count e] returns the number of remaining elements in [e] without
-  consuming the enumeration.
-
-Depending of the underlying data structure that is implementing the
-enumeration functions, the count operation can be costly, and even sometimes
-can cause a call to [force]. *)
-
-val fast_count : 'a t -> bool
-(** For users worried about the speed of [count] you can call the [fast_count]
-    function that will give an hint about [count] implementation. Basically, if
-    the enumeration has been created with [make] or [init] or if [force] has
-    been called on it, then [fast_count] will return true. *)
diff --git a/libs/extlib/extArray.ml b/libs/extlib/extArray.ml
deleted file mode 100644
index 07c83905c2a330fb5ea2de261a8ab0ad099bbbd9..0000000000000000000000000000000000000000
--- a/libs/extlib/extArray.ml
+++ /dev/null
@@ -1,165 +0,0 @@
-(*
- * ExtList - additional and modified functions for lists.
- * Copyright (C) 2005 Richard W.M. Jones (rich @ annexia.org)
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-module Array = struct
-
-include Array
-
-let rev_in_place xs =
-  let n = length xs in
-  let j = ref (n-1) in
-  for i = 0 to n/2-1 do
-    let c = xs.(i) in
-    xs.(i) <- xs.(!j);
-    xs.(!j) <- c;
-    decr j
-  done
-
-let rev xs =
-  let ys = Array.copy xs in
-  rev_in_place ys;
-  ys
-
-let for_all p xs =
-  let n = length xs in
-  let rec loop i =
-    if i = n then true
-    else if p xs.(i) then loop (succ i)
-    else false
-  in
-  loop 0
-
-let exists p xs =
-  let n = length xs in
-  let rec loop i =
-    if i = n then false
-    else if p xs.(i) then true
-    else loop (succ i)
-  in
-  loop 0
-
-let mem a xs =
-  let n = length xs in
-  let rec loop i =
-    if i = n then false
-    else if a = xs.(i) then true
-    else loop (succ i)
-  in
-  loop 0
-
-let memq a xs =
-  let n = length xs in
-  let rec loop i =
-    if i = n then false
-    else if a == xs.(i) then true
-    else loop (succ i)
-  in
-  loop 0
-
-let findi p xs =
-  let n = length xs in
-  let rec loop i =
-    if i = n then raise Not_found
-    else if p xs.(i) then i
-    else loop (succ i)
-  in
-  loop 0
-
-let find p xs = xs.(findi p xs)
-
-(* Use of BitSet suggested by Brian Hurt. *)
-let filter p xs =
-  let n = length xs in
-  (* Use a bitset to store which elements will be in the final array. *)
-  let bs = BitSet.create n in
-  for i = 0 to n-1 do
-    if p xs.(i) then BitSet.set bs i
-  done;
-  (* Allocate the final array and copy elements into it. *)
-  let n' = BitSet.count bs in
-  let j = ref 0 in
-  let xs' = init n'
-    (fun _ ->
-       (* Find the next set bit in the BitSet. *)
-       while not (BitSet.is_set bs !j) do incr j done;
-       let r = xs.(!j) in
-       incr j;
-       r) in
-  xs'
-
-let find_all = filter
-
-let partition p xs =
-  let n = length xs in
-  (* Use a bitset to store which elements will be in which final array. *)
-  let bs = BitSet.create n in
-  for i = 0 to n-1 do
-    if p xs.(i) then BitSet.set bs i
-  done;
-  (* Allocate the final arrays and copy elements into them. *)
-  let n1 = BitSet.count bs in
-  let n2 = n - n1 in
-  let j = ref 0 in
-  let xs1 = init n1
-    (fun _ ->
-       (* Find the next set bit in the BitSet. *)
-       while not (BitSet.is_set bs !j) do incr j done;
-       let r = xs.(!j) in
-       incr j;
-       r) in
-  let j = ref 0 in
-  let xs2 = init n2
-    (fun _ ->
-       (* Find the next clear bit in the BitSet. *)
-       while BitSet.is_set bs !j do incr j done;
-       let r = xs.(!j) in
-       incr j;
-       r) in
-  xs1, xs2
-
-let enum xs =
-  let rec make start xs =
-    let n = length xs in
-    Enum.make
-      ~next:(fun () ->
-	       if !start < n then (
-		 let r = xs.(!start) in
-		 incr start;
-		 r
-	       ) else
-		 raise Enum.No_more_elements)
-      ~count:(fun () ->
-		n - !start)
-      ~clone:(fun () ->
-		let xs' = Array.sub xs !start (n - !start) in
-		make (ref 0) xs')
-  in
-  make (ref 0) xs
-
-let of_enum e =
-  let n = Enum.count e in
-  (* This assumes, reasonably, that init traverses the array in order. *)
-  Array.init n
-    (fun i ->
-       match Enum.get e with
-       | Some x -> x
-       | None -> assert false)
-
-end
diff --git a/libs/extlib/extArray.mli b/libs/extlib/extArray.mli
deleted file mode 100755
index ae198618903242477651a00126bf60c51339c487..0000000000000000000000000000000000000000
--- a/libs/extlib/extArray.mli
+++ /dev/null
@@ -1,129 +0,0 @@
-(*
- * ExtArray - additional and modified functions for arrays.
- * Copyright (C) 2005 Richard W.M. Jones (rich @ annexia.org)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Additional and modified functions for arrays.
-
-	The OCaml standard library provides a module of array functions.
-	This ExtArray module can be used to override the Array module or
-	as a standalone module. It provides some additional functions.
-*)
-
-module Array :
-sig
-
-  (** {6 New functions} *)
-  val rev : 'a array -> 'a array
-    (** Array reversal. *)
-
-  val rev_in_place : 'a array -> unit
-    (** In-place array reversal.  The array argument is updated. *)
-
-  val for_all : ('a -> bool) -> 'a array -> bool
-    (** [for_all p [a1; ...; an]] checks if all elements of the array
-	satisfy the predicate [p].  That is, it returns
-	[ (p a1) && (p a2) && ... && (p an)].
-    *)
-
-  val exists : ('a -> bool) -> 'a array -> bool
-    (** [exists p [a1; ...; an]] checks if at least one element of
-	the array satisfies the predicate [p].  That is, it returns
-	[ (p a1) || (p a2) || ... || (p an)].
-    *)
-
-  val mem : 'a -> 'a array -> bool
-    (** [mem m a] is true if and only if [m] is equal to an element of [a]. *)
-
-  val memq : 'a -> 'a array -> bool
-    (** Same as {!Array.mem} but uses physical equality instead of
-	structural equality to compare array elements.
-    *)
-
-  val find : ('a -> bool) -> 'a array -> 'a
-    (** [find p a] returns the first element of array [a]
-	that satisfies the predicate [p].
-	Raise [Not_found] if there is no value that satisfies [p] in the
-	array [a].
-    *)
-
-  val findi : ('a -> bool) -> 'a array -> int
-    (** [findi p a] returns the index of the first element of array [a]
-	that satisfies the predicate [p].
-	Raise [Not_found] if there is no value that satisfies [p] in the
-	array [a].
-    *)
-
-  val filter : ('a -> bool) -> 'a array -> 'a array
-    (** [filter p a] returns all the elements of the array [a]
-	that satisfy the predicate [p].  The order of the elements
-	in the input array is preserved.  *)
-
-  val find_all : ('a -> bool) -> 'a array -> 'a array
-    (** [find_all] is another name for {!Array.filter}. *)
-
-  val partition : ('a -> bool) -> 'a array -> 'a array * 'a array
-    (** [partition p a] returns a pair of arrays [(a1, a2)], where
-	[a1] is the array of all the elements of [a] that
-	satisfy the predicate [p], and [a2] is the array of all the
-	elements of [a] that do not satisfy [p].
-	The order of the elements in the input array is preserved. *)
-
-  (** {6 Enumerations} *)
-
-  val enum : 'a array -> 'a Enum.t
-    (** Returns an enumeration of the elements of an array. *)
-
-  val of_enum : 'a Enum.t -> 'a array
-    (** Build an array from an enumeration. *)
-
-  (** {6 Old functions} *)
-
-  (** These functions are already part of the Ocaml standard library
-      and have not been modified. Please refer to the Ocaml Manual for
-      documentation. *)
-
-  external length : 'a array -> int = "%array_length"
-  external get : 'a array -> int -> 'a = "%array_safe_get"
-  external set : 'a array -> int -> 'a -> unit = "%array_safe_set"
-  external make : int -> 'a -> 'a array = "caml_make_vect"
-  external create : int -> 'a -> 'a array = "caml_make_vect"
-  val init : int -> (int -> 'a) -> 'a array
-  val make_matrix : int -> int -> 'a -> 'a array array
-  val create_matrix : int -> int -> 'a -> 'a array array
-  val append : 'a array -> 'a array -> 'a array
-  val concat : 'a array list -> 'a array
-  val sub : 'a array -> int -> int -> 'a array
-  val copy : 'a array -> 'a array
-  val fill : 'a array -> int -> int -> 'a -> unit
-  val blit : 'a array -> int -> 'a array -> int -> int -> unit
-  val to_list : 'a array -> 'a list
-  val of_list : 'a list -> 'a array
-  val iter : ('a -> unit) -> 'a array -> unit
-  val map : ('a -> 'b) -> 'a array -> 'b array
-  val iteri : (int -> 'a -> unit) -> 'a array -> unit
-  val mapi : (int -> 'a -> 'b) -> 'a array -> 'b array
-  val fold_left : ('a -> 'b -> 'a) -> 'a -> 'b array -> 'a
-  val fold_right : ('b -> 'a -> 'a) -> 'b array -> 'a -> 'a
-  val sort : ('a -> 'a -> int) -> 'a array -> unit
-  val stable_sort : ('a -> 'a -> int) -> 'a array -> unit
-  val fast_sort : ('a -> 'a -> int) -> 'a array -> unit
-  external unsafe_get : 'a array -> int -> 'a = "%array_unsafe_get"
-  external unsafe_set : 'a array -> int -> 'a -> unit = "%array_unsafe_set"
-
-end
diff --git a/libs/extlib/extHashtbl.ml b/libs/extlib/extHashtbl.ml
deleted file mode 100644
index aaac6494cf5362db2b0c5dff9dfe967126ea7361..0000000000000000000000000000000000000000
--- a/libs/extlib/extHashtbl.ml
+++ /dev/null
@@ -1,136 +0,0 @@
-(* 
- * ExtHashtbl, extra functions over hashtables.
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
- 
-
-module Hashtbl =
-  struct
-
-	type ('a, 'b) h_bucketlist =
-		| Empty
-		| Cons of 'a * 'b * ('a, 'b) h_bucketlist
-
-	type ('a, 'b) h_t = {
-		mutable size: int;
-		mutable data: ('a, 'b) h_bucketlist array
-	}
-
-	include Hashtbl
-
-	external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity"
-	external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity"
-
-	let create (size:int) = create size
-	
-	let exists = mem
-
-	let enum h =
-		let rec make ipos ibuck idata icount =
-			let pos = ref ipos in
-			let buck = ref ibuck in
-			let hdata = ref idata in
-			let hcount = ref icount in
-			let force() =
-				(** this is a hack in order to keep an O(1) enum constructor **)
-				if !hcount = -1 then begin
-					hcount := (h_conv h).size;
-					hdata := Array.copy (h_conv h).data;
-				end;
-			in
-			let rec next() =
-				force();
-				match !buck with
-				| Empty ->					
-					if !hcount = 0 then raise Enum.No_more_elements;
-					incr pos;
-					buck := Array.unsafe_get !hdata !pos;
-					next()
-				| Cons (k,i,next_buck) ->
-					buck := next_buck;
-					decr hcount;
-					(k,i)
-			in
-			let count() =
-				if !hcount = -1 then (h_conv h).size else !hcount
-			in
-			let clone() =
-				force();
-				make !pos !buck !hdata !hcount
-			in
-			Enum.make ~next ~count ~clone
-		in		
-		make (-1) Empty (Obj.magic()) (-1)
-
-	let keys h =
-		Enum.map (fun (k,_) -> k) (enum h)
-
-	let values h =
-		Enum.map (fun (_,v) -> v) (enum h)
-
-	let map f h =
-		let rec loop = function
-			| Empty -> Empty
-			| Cons (k,v,next) -> Cons (k,f v,loop next)
-		in
-		h_make {
-			size = (h_conv h).size;
-			data = Array.map loop (h_conv h).data; 
-		}
-
-	let remove_all h key =
-		let hc = h_conv h in
-		let rec loop = function
-			| Empty -> Empty
-			| Cons(k,v,next) ->
-				if k = key then begin
-					hc.size <- pred hc.size;
-					loop next
-				end else
-					Cons(k,v,loop next)
-		in
-		let pos = (hash key) mod (Array.length hc.data) in
-		Array.unsafe_set hc.data pos (loop (Array.unsafe_get hc.data pos))
-
-	let find_default h key defval =
-		let rec loop = function
-			| Empty -> defval
-			| Cons (k,v,next) ->
-				if k = key then v else loop next
-		in
-		let pos = (hash key) mod (Array.length (h_conv h).data) in
-		loop (Array.unsafe_get (h_conv h).data pos)
-
-	let find_option h key =
-		let rec loop = function
-			| Empty -> None
-			| Cons (k,v,next) ->
-				if k = key then Some v else loop next
-		in
-		let pos = (hash key) mod (Array.length (h_conv h).data) in
-		loop (Array.unsafe_get (h_conv h).data pos)
-
-	let of_enum e =
-		let h = create (if Enum.fast_count e then Enum.count e else 0) in
-		Enum.iter (fun (k,v) -> add h k v) e;
-		h
-	
-	let length h =
-		(h_conv h).size
-
-  end
diff --git a/libs/extlib/extHashtbl.mli b/libs/extlib/extHashtbl.mli
deleted file mode 100644
index d6254d1e73d8ca68acda31260f21d19925b5846e..0000000000000000000000000000000000000000
--- a/libs/extlib/extHashtbl.mli
+++ /dev/null
@@ -1,89 +0,0 @@
-(* 
- * ExtHashtbl - extra functions over hashtables.
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
- 
-(** Extra functions over hashtables. *)
-
-module Hashtbl :
-  (** The wrapper module *)
-  sig
-
-	type ('a,'b) t = ('a,'b) Hashtbl.t
-	(** The type of a hashtable. *)
-
-	(** {6 New Functions} *)
-
-	val exists : ('a,'b) t -> 'a -> bool
-	(** [exists h k] returns true is at least one item with key [k] is
-		found in the hashtable. *)
-
-	val keys : ('a,'b) t -> 'a Enum.t
-	(** Return an enumeration of all the keys of a hashtable.
-	    If the key is in the Hashtable multiple times, all occurrences
-	    will be returned.  *)
-
-	val values : ('a,'b) t -> 'b Enum.t
-	(** Return an enumeration of all the values of a hashtable. *)
-
-	val enum : ('a, 'b) t -> ('a * 'b) Enum.t
-	(** Return an enumeration of (key,value) pairs of a hashtable. *)
-
-	val of_enum : ('a * 'b) Enum.t -> ('a, 'b) t
-	(** Create a hashtable from a (key,value) enumeration. *)
-
-	val find_default : ('a,'b) t -> 'a -> 'b -> 'b
-	  (** Find a binding for the key, and return a default
-	    value if not found *)
-
-	val find_option : ('a,'b) Hashtbl.t -> 'a -> 'b option
-	(** Find a binding for the key, or return [None] if no
-		value is found *)
-
-	val remove_all : ('a,'b) t -> 'a -> unit
-	(** Remove all bindings for the given key *)
-
-	val map : ('b -> 'c) -> ('a,'b) t -> ('a,'c) t
-	(** [map f x] creates a new hashtable with the same
-	    keys as [x], but with the function [f] applied to
-		all the values *)
-
-	val length : ('a,'b) t -> int
-	(** Return the number of elements inserted into the Hashtbl 
-		(including duplicates) *)
-	
-	(** {6 Older Functions} *)
-
-	(** Please refer to the Ocaml Manual for documentation of these
-		functions. (note : functor support removed to avoid code
-		duplication). *)
-
-	val create : int -> ('a, 'b) t
-	val clear : ('a, 'b) t -> unit
-	val add : ('a, 'b) t -> 'a -> 'b -> unit
-	val copy : ('a, 'b) t -> ('a, 'b) t
-	val find : ('a, 'b) t -> 'a -> 'b
-	val find_all : ('a, 'b) t -> 'a -> 'b list
-	val mem : ('a, 'b) t -> 'a -> bool
-	val remove : ('a, 'b) t -> 'a -> unit
-	val replace : ('a, 'b) t -> 'a -> 'b -> unit
-	val iter : ('a -> 'b -> unit) -> ('a, 'b) t -> unit
-	val fold : ('a -> 'b -> 'c -> 'c) -> ('a, 'b) t -> 'c -> 'c
-	val hash : 'a -> int
-
-  end
diff --git a/libs/extlib/extLib.ml b/libs/extlib/extLib.ml
deleted file mode 100755
index bfaf31b633b9b83513d62f22f24e18fdfd6868f4..0000000000000000000000000000000000000000
--- a/libs/extlib/extLib.ml
+++ /dev/null
@@ -1,43 +0,0 @@
-(* 
- * ExtLib - use extensions as separate modules
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(* 
-	Note:
-	
-	Since ExtLib is provided for namespace convenience for
-	users who wants to keep the usage of the original
-	Ocaml Standard Library, no MLI CMI nor documentation will
-	be provided for this module.
-
-	Users can simply do an "open ExtLib" to import all Ext*
-	namespaces instead of doing "open ExtList" for example.
-
-	The trade-off is that they'll have to link all the modules
-	included below so the resulting binary is bigger.
-*)
-
-module List = ExtList.List
-module String = ExtString.String
-module Hashtbl = ExtHashtbl.Hashtbl
-module Array = ExtArray.Array
-
-exception Invalid_string = ExtString.Invalid_string
-
-include Std
diff --git a/libs/extlib/extList.ml b/libs/extlib/extList.ml
deleted file mode 100644
index f699feccb2ff2932b9f0f95db6cf248114dd0c62..0000000000000000000000000000000000000000
--- a/libs/extlib/extList.ml
+++ /dev/null
@@ -1,508 +0,0 @@
-(*
- * ExtList - additional and modified functions for lists.
- * Copyright (C) 2003 Brian Hurt
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-module List = struct
-
-exception Empty_list
-exception Invalid_index of int
-exception Different_list_size of string
-
-include List
-
-(* Thanks to Jacques Garrigue for suggesting the following structure *)
-type 'a mut_list =  {
-	hd: 'a; 
-	mutable tl: 'a list
-}
-external inj : 'a mut_list -> 'a list = "%identity"
-
-
-let dummy_node () = { hd = Obj.magic (); tl = [] }
-
-let hd = function
-	| [] -> raise Empty_list
-	| h :: t -> h
-
-let tl = function
-	| [] -> raise Empty_list
-	| h :: t -> t
-
-let nth l index =
-	if index < 0 then raise (Invalid_index index);
-	let rec loop n = function
-		| [] -> raise (Invalid_index index);
-		| h :: t -> 
-			if n = 0 then h else loop (n - 1) t
-	in
-	loop index l
-
-let append l1 l2 =
-	match l1 with
-	| [] -> l2
-	| h :: t ->
-		let rec loop dst = function
-		| [] ->
-			dst.tl <- l2
-		| h :: t ->
-			let cell = { hd = h; tl = [] } in
-			dst.tl <- inj cell;
-			loop cell t
-		in
-		let r = { hd = h; tl = [] } in
-		loop r t;
-		inj r
-
-let rec flatten l =
-	let rec inner dst = function
-		| [] -> dst
-		| h :: t ->
-			let r = { hd = h; tl = [] } in
-			dst.tl <- inj r;
-			inner r t
-	in
-	let rec outer dst = function
-		| [] -> ()
-		| h :: t -> outer (inner dst h) t
-	in
-	let r = dummy_node () in
-	outer r l;
-	r.tl
-
-let concat = flatten
-
-let map f = function
-	| [] -> []
-	| h :: t ->
-		let rec loop dst = function
-		| [] -> ()
-		| h :: t ->
-			let r = { hd = f h; tl = [] } in
-			dst.tl <- inj r;
-			loop r t
-		in
-		let r = { hd = f h; tl = [] } in
-		loop r t;
-		inj r
-
-let rec drop n = function
-	| _ :: l when n > 0 -> drop (n-1) l
-	| l -> l
-
-let take n l =
-	let rec loop n dst = function
-		| h :: t when n > 0 ->
-			let r = { hd = h; tl = [] } in
-			dst.tl <- inj r;
-			loop (n-1) r t
-		| _ ->
-			()
-	in
-	let dummy = dummy_node() in
-	loop n dummy l;
-	dummy.tl
-
-(* takewhile and dropwhile by Richard W.M. Jones. *)
-let rec takewhile f = function
-  | [] -> []
-  | x :: xs when f x -> x :: takewhile f xs
-  | _ -> []
-
-let rec dropwhile f = function
-  | [] -> []
-  | x :: xs when f x -> dropwhile f xs
-  | xs -> xs
-
-
-let rec unique ?(cmp = ( = )) l =
-	let rec loop dst = function
-		| [] -> ()
-		| h :: t ->
-			match exists (cmp h) t with
-			| true -> loop dst t
-			| false ->
-				let r = { hd =  h; tl = [] }  in
-				dst.tl <- inj r;
-				loop r t
-	in
-	let dummy = dummy_node() in
-	loop dummy l;
-	dummy.tl
-
-let filter_map f l =
-	let rec loop dst = function
-		| [] -> ()
-		| h :: t ->
-			match f h with
-			| None -> loop dst t
-			| Some x ->
-				let r = { hd = x; tl = [] }  in
-				dst.tl <- inj r;
-				loop r t
-	in
-	let dummy = dummy_node() in
-	loop dummy l;
-	dummy.tl
-	
-let fold_right_max = 1000
-
-let fold_right f l init =
-	let rec tail_loop acc = function
-		| [] -> acc
-		| h :: t -> tail_loop (f h acc) t
-	in
-	let rec loop n = function
-		| [] -> init
-		| h :: t ->
-			if n < fold_right_max then
-				f h (loop (n+1) t)
-			else
-				f h (tail_loop init (rev t))
-	in
-	loop 0 l
-
-let map2 f l1 l2 =
-	let rec loop dst src1 src2 =
-		match src1, src2 with
-			| [], [] -> ()
-			| h1 :: t1, h2 :: t2 ->
-				let r = { hd = f h1 h2; tl = [] } in
-				dst.tl <- inj r;
-				loop r t1 t2
-			| _ -> raise (Different_list_size "map2")
-	in
-	let dummy = dummy_node () in
-	loop dummy l1 l2;
-	dummy.tl
-
-let rec iter2 f l1 l2 =
-	match l1, l2 with
-	| [], [] -> ()
-	| h1 :: t1, h2 :: t2 -> f h1 h2; iter2 f t1 t2
-	| _ -> raise (Different_list_size "iter2")
-
-let rec fold_left2 f accum l1 l2 =
-	match l1, l2 with
-	| [], [] -> accum
-	| h1 :: t1, h2 :: t2 -> fold_left2 f (f accum h1 h2) t1 t2
-	| _ -> raise (Different_list_size "fold_left2")
-
-let fold_right2 f l1 l2 init =
-	let rec tail_loop acc l1 l2 =
-		match l1, l2 with
-		| [] , [] -> acc
-		| h1 :: t1 , h2 :: t2 -> tail_loop (f h1 h2 acc) t1 t2
-		| _ -> raise (Different_list_size "fold_right2")
-	in
-	let rec loop n l1 l2 =
-		match l1, l2 with
-		| [], [] -> init
-		| h1 :: t1, h2 :: t2 ->
-			if n < fold_right_max then
-				f h1 h2 (loop (n+1) t1 t2)
-			else
-				f h1 h2 (tail_loop init (rev t1) (rev t2))
-		| _ -> raise (Different_list_size "fold_right2")
-	in
-	loop 0 l1 l2
-
-let for_all2 p l1 l2 =
-	let rec loop l1 l2 =
-		match l1, l2 with
-		| [], [] -> true
-		| h1 :: t1, h2 :: t2 -> if p h1 h2 then loop t1 t2 else false
-		| _ -> raise (Different_list_size "for_all2")
-	in
-	loop l1 l2
-
-let exists2 p l1 l2 =
-	let rec loop l1 l2 =
-		match l1, l2 with
-			| [], [] -> false
-			| h1 :: t1, h2 :: t2 -> if p h1 h2 then true else loop t1 t2
-			| _ -> raise (Different_list_size "exists2")
-	in
-	loop l1 l2
-
-let remove_assoc x lst = 
-	let rec loop dst = function
-		| [] -> ()
-		| (a, _ as pair) :: t ->
-			if a = x then
-				dst.tl <- t
-			else
-				let r = { hd = pair; tl = [] } in
-				dst.tl <- inj r;
-				loop r t
-	in
-	let dummy = dummy_node () in
-	loop dummy lst;
-	dummy.tl
-
-let remove_assq x lst = 
-	let rec loop dst = function
-		| [] -> ()
-		| (a, _ as pair) :: t ->
-			if a == x then
-				dst.tl <- t
-			else
-				let r = { hd =  pair; tl = [] } in
-				dst.tl <- inj r;
-				loop r t
-	in
-	let dummy = dummy_node() in
-	loop dummy lst;
-	dummy.tl
-
-let rfind p l = find p (rev l)
-
-let find_all p l = 
-	let rec findnext dst = function
-		| [] -> ()
-		| h :: t -> 
-			if p h then
-				let r = { hd = h; tl = [] } in
-				dst.tl <- inj r;
-				findnext r t
-			else
-				findnext dst t
-	in
-	let dummy = dummy_node () in
-	findnext dummy l;
-	dummy.tl
-
-let rec findi p l =
-	let rec loop n = function
-		| [] -> raise Not_found
-		| h :: t ->
-			if p n h then (n,h) else loop (n+1) t
-	in
-	loop 0 l
-
-let filter = find_all
-
-let partition p lst = 
-	let rec loop yesdst nodst = function
-		| [] -> ()
-		| h :: t ->
-			let r = { hd = h; tl = [] } in
-			if p h then
-				begin
-					yesdst.tl <- inj r;
-					loop r nodst t
-				end
-			else
-				begin
-					nodst.tl <- inj r;
-					loop yesdst r t
-				end
-	in
-	let yesdummy = dummy_node()
-	and nodummy = dummy_node()
-	in
-	loop yesdummy nodummy lst;
-	yesdummy.tl, nodummy.tl
-
-let split lst =
-	let rec loop adst bdst = function
-		| [] -> ()
-		| (a, b) :: t -> 
-			let x = { hd = a; tl = [] } 
-			and y = { hd = b; tl = [] } in
-			adst.tl <- inj x;
-			bdst.tl <- inj y;
-			loop x y t
-	in
-	let adummy = dummy_node ()
-	and bdummy = dummy_node ()
-	in
-	loop adummy bdummy lst;
-	adummy.tl, bdummy.tl
-
-let combine l1 l2 =
-	let rec loop dst l1 l2 =
-		match l1, l2 with
-		| [], [] -> ()
-		| h1 :: t1, h2 :: t2 -> 
-			let r = { hd = h1, h2; tl = [] } in
-			dst.tl <- inj r;
-			loop r t1 t2
-		| _, _ -> raise (Different_list_size "combine")
-	in
-	let dummy = dummy_node () in
-	loop dummy l1 l2;
-	dummy.tl
-
-let sort ?(cmp=compare) = List.sort cmp
-
-let rec init size f =
-	if size = 0 then [] 
-	else if size < 0 then invalid_arg "ExtList.init"
-	else
-		let rec loop dst n =
-			if n < size then
-				let r = { hd = f n; tl = [] } in
-				dst.tl <- inj r;
-				loop r (n+1)
-		in
-		let r = { hd = f 0; tl = [] } in
-		loop r 1;
-		inj r
-
-(* make by Richard W.M. Jones. *)
-let make i x =
-  if i < 0 then invalid_arg "ExtList.List.make";
-  let rec make' x = function
-    | 0 -> []
-    | i -> x :: make' x (i-1)
-  in
-  make' x i
-
-let mapi f = function
-	| [] -> []
-	| h :: t ->
-		let rec loop dst n = function
-			| [] -> ()
-			| h :: t -> 
-				let r = { hd = f n h; tl = [] } in
-				dst.tl <- inj r;
-				loop r (n+1) t
-		in	
-		let r = { hd = f 0 h; tl = [] } in
-		loop r 1 t;
-		inj r
-
-let iteri f l = 
-	let rec loop n = function
-		| [] -> ()
-		| h :: t ->
-			f n h;
-			loop (n+1) t
-	in
-	loop 0 l
-
-let first = hd
-
-let rec last = function
-	| [] -> raise Empty_list
-	| h :: [] -> h
-	| _ :: t -> last t
-
-let split_nth index = function
-	| [] -> if index = 0 then [],[] else raise (Invalid_index index)
-	| (h :: t as l) ->
-		if index = 0 then [],l
-		else if index < 0 then raise (Invalid_index index)
-		else
-			let rec loop n dst l =
-				if n = 0 then l else
-				match l with
-				| [] -> raise (Invalid_index index)
-				| h :: t ->
-					let r = { hd =  h; tl = [] } in
-					dst.tl <- inj r;
-					loop (n-1) r t 
-			in
-			let r = { hd = h; tl = [] } in
-			inj r, loop (index-1) r t
-
-let find_exc f e l =
-	try
-		find f l
-	with
-		Not_found -> raise e
-
-let remove l x =
-	let rec loop dst = function
-		| [] -> raise Not_found
-		| h :: t ->
-			if x = h then 
-				dst.tl <- t
-			else
-				let r = { hd = h; tl = [] } in
-				dst.tl <- inj r;
-				loop r t
-	in
-	let dummy = dummy_node () in
-	loop dummy l;
-	dummy.tl
-
-let rec remove_if f lst =
-	let rec loop dst = function
-		| [] -> ()
-		| x :: l ->
-			if f x then
-				dst.tl <- l
-			else
-				let r = { hd = x; tl = [] } in
-				dst.tl <- inj r;
-				loop r l
-	in
-	let dummy = dummy_node () in
-	loop dummy lst;
-	dummy.tl
-
-let rec remove_all l x =
-	let rec loop dst = function
-		| [] -> ()
-		| h :: t ->
-			if x = h then
-				loop dst t
-			else
-				let r = { hd = h; tl = [] } in
-				dst.tl <- inj r;
-				loop r t
-	in
-	let dummy = dummy_node () in
-	loop dummy l;
-	dummy.tl
-
-let enum l =
-	let rec make lr count =
-		Enum.make
-			~next:(fun () ->
-				match !lr with
-				| [] -> raise Enum.No_more_elements
-				| h :: t ->
-					decr count;
-					lr := t;
-					h
-			)
-			~count:(fun () ->
-				if !count < 0 then count := length !lr;
-				!count
-			)
-			~clone:(fun () ->
-				make (ref !lr) (ref !count)
-			)
-	in
-	make (ref l) (ref (-1))
-
-let of_enum e =
-	let h = dummy_node() in
-	let _ = Enum.fold (fun x acc ->
-		let r = { hd = x; tl = [] }  in
-		acc.tl <- inj r;
-		r) h e in
-	h.tl
-
-end
-
-let ( @ ) = List.append
diff --git a/libs/extlib/extList.mli b/libs/extlib/extList.mli
deleted file mode 100755
index 87db836e6486516ee7d23ceb1653940d65d3f7d6..0000000000000000000000000000000000000000
--- a/libs/extlib/extList.mli
+++ /dev/null
@@ -1,238 +0,0 @@
-(*
- * ExtList - additional and modified functions for lists.
- * Copyright (C) 2003 Brian Hurt
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Additional and modified functions for lists.
-
-	The OCaml standard library provides a module for list functions.
-	This ExtList module can be used to override the List module or
-	as a standalone module. It provides new functions and modify
-	the behavior of some other ones (in particular all functions
-	are now {b tail-recursive}).
-*)
-
-module List :
-    sig
-
-	(** {6 New functions} *)
-
-	val init : int -> (int -> 'a) -> 'a list
-	(** Similar to [Array.init], [init n f] returns the list containing
-	 the results of (f 0),(f 1).... (f (n-1)).
-	 Raise [Invalid_arg "ExtList.init"] if n < 0.*)
-
-	val make : int -> 'a -> 'a list
-	  (** Similar to [String.make], [make n x] returns a
-	    * list containing [n] elements [x].
-    	    *)
-
-	val first : 'a list -> 'a
-	(** Returns the first element of the list, or raise [Empty_list] if
-	 the list is empty (similar to [hd]). *)
-
-	val last : 'a list -> 'a
-	(** Returns the last element of the list, or raise [Empty_list] if
-	 the list is empty. This function takes linear time. *)
-
-	val iteri : (int -> 'a -> 'b) -> 'a list -> unit
-	(** [iteri f l] will call [(f 0 a0);(f 1 a1) ... (f n an)] where
-	 [a0..an] are the elements of the list [l]. *)
-
-	val mapi : (int -> 'a -> 'b) -> 'a list -> 'b list
-	(** [mapi f l] will build the list containing
-	 [(f 0 a0);(f 1 a1) ... (f n an)] where [a0..an] are the elements of
-	 the list [l]. *)
-
-	val rfind : ('a -> bool) -> 'a list -> 'a
-	(** [rfind p l] returns the last element [x] of [l] such as [p x] returns
-	 [true] or raises [Not_found] if such element as not been found. *)
-
-	val find_exc : ('a -> bool) -> exn -> 'a list -> 'a
-	(** [find_exc p e l] returns the first element of [l] such as [p x]
-	 returns [true] or raises [e] if such element as not been found. *)
-
-	val findi : (int -> 'a -> bool) -> 'a list -> (int * 'a)
-	(** [findi p e l] returns the first element [ai] of [l] along with its
-	 index [i] such that [p i ai] is true, or raises [Not_found] if no
-	 such element has been found. *)
-
-	val unique : ?cmp:('a -> 'a -> bool) -> 'a list -> 'a list
-	(** [unique cmp l] returns the list [l] without any duplicate element.
-	 Default comparator ( = ) is used if no comparison function specified. *)
-
-	val filter_map : ('a -> 'b option) -> 'a list -> 'b list
-	(** [filter_map f l] call [(f a0) (f a1).... (f an)] where [a0..an] are
-	 the elements of [l]. It returns the list of elements [bi] such as
-	 [f ai = Some bi] (when [f] returns [None], the corresponding element of
-	 [l] is discarded). *)
-
-	val split_nth : int -> 'a list -> 'a list * 'a list
-	(** [split_nth n l] returns two lists [l1] and [l2], [l1] containing the
-	 first [n] elements of [l] and [l2] the others. Raise [Invalid_index] if
-	 [n] is outside of [l] size bounds. *)
-
-	val remove : 'a list -> 'a -> 'a list
-	(** [remove l x] returns the list [l] without the first element [x] found
-	 or returns  [l] if no element is equal to [x]. Elements are compared
-	 using ( = ). *)
-
-	val remove_if : ('a -> bool) -> 'a list -> 'a list
-	(** [remove_if cmp l] is similar to [remove], but with [cmp] used
-	 instead of ( = ). *)
-
-	val remove_all : 'a list -> 'a -> 'a list
-	(** [remove_all l x] is similar to [remove] but removes all elements that
-	 are equal to [x] and not only the first one. *)
-
-	val take : int -> 'a list -> 'a list
-	(** [take n l] returns up to the [n] first elements from list [l], if
-	 available. *)
-
-	val drop : int -> 'a list -> 'a list
-	(** [drop n l] returns [l] without the first [n] elements, or the empty
-	 list if [l] have less than [n] elements. *)
-
-	val takewhile : ('a -> bool) -> 'a list -> 'a list
-	  (** [takewhile f xs] returns the first elements of list [xs]
-	      which satisfy the predicate [f]. *)
-
-	val dropwhile : ('a -> bool) -> 'a list -> 'a list
-	  (** [dropwhile f xs] returns the list [xs] with the first
-	      elements satisfying the predicate [f] dropped. *)
-
-	(** {6 Enum functions} *)
-
-	(** Enumerations are important in ExtLib, they are a good way to work with
-	 abstract enumeration of elements, regardless if they are located in a list,
-	 an array, or a file. *)
-
-	val enum : 'a list -> 'a Enum.t
-	(** Returns an enumeration of the elements of a list. *)
-
-	val of_enum : 'a Enum.t -> 'a list
-	(** Build a list from an enumeration. *)
-
-	(** {6 Modified functions} *)
-
-	(** Some minor modifications have been made to the specification of some
-	 functions, especially concerning exceptions raised. *)
-
-	val hd : 'a list -> 'a
-	(** Returns the first element of the list or raise [Empty_list] if the
-	 list is empty. *)
-
-	val tl : 'a list -> 'a list
-	(** Returns the list without its first elements or raise [Empty_list] if
-	 the list is empty. *)
-
-	val nth : 'a list -> int -> 'a
-	(** [nth l n] returns the n-th element of the list [l] or raise
-	 [Invalid_index] is the index is outside of [l] bounds. *)
-
-	val sort : ?cmp:('a -> 'a -> int) -> 'a list -> 'a list
-	(** Sort the list using optional comparator (by default [compare]). *)
-
-	(** The following functions have been improved so all of them are
-	 tail-recursive. They have also been modified so they no longer
-	 raise [Invalid_arg] but [Different_list_size] when used on two
-	 lists having a different number of elements. *)
-
-	val map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-	val iter2 : ('a -> 'b -> unit) -> 'a list -> 'b list -> unit
-	val fold_left2 : ('a -> 'b -> 'c -> 'a) -> 'a -> 'b list -> 'c list -> 'a
-	val fold_right2 : ('a -> 'b -> 'c -> 'c) -> 'a list -> 'b list -> 'c -> 'c
-	val for_all2 : ('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-	val exists2 : ('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-	val combine : 'a list -> 'b list -> ('a * 'b) list
-
-
-	(** {6 Improved functions} *)
-
-	(** The following functions have the same behavior as the [List]
-		module ones but are tail-recursive. That means they will not
-		cause a [Stack_overflow] when used on very long list.
-
-		The implementation might be a little more slow in bytecode,
-		but compiling in native code will not affect performances. *)
-
-	val map : ('a -> 'b) -> 'a list -> 'b list
-	val append : 'a list -> 'a list -> 'a list
-	val flatten : 'a list list -> 'a list
-	val concat : 'a list list -> 'a list
-	val fold_right : ('a -> 'b -> 'b) -> 'a list -> 'b -> 'b
-	val remove_assoc : 'a -> ('a * 'b) list -> ('a * 'b) list
-	val remove_assq : 'a -> ('a * 'b) list -> ('a * 'b) list
-	val split : ('a * 'b) list -> 'a list * 'b list
-
-	(** The following functions were already tail-recursive in the [List]
-		module but were using [List.rev] calls. The new implementations
-		have better performances. *)
-
-	val filter : ('a -> bool) -> 'a list -> 'a list
-	val find_all : ('a -> bool) -> 'a list -> 'a list
-	val partition : ('a -> bool) -> 'a list -> 'a list * 'a list
-
-	(** {6 Older functions} *)
-
-	(** These functions are already part of the Ocaml standard library
-		and have not been modified. Please refer to the Ocaml Manual for
-		documentation. *)
-
-	val length : 'a list -> int
-	val rev_append : 'a list -> 'a list -> 'a list
-	val rev : 'a list -> 'a list
-	val rev_map : ('a -> 'b) -> 'a list -> 'b list
-	val iter : ('a -> unit) -> 'a list -> unit
-	val fold_left : ('b -> 'a -> 'b) -> 'b -> 'a list -> 'b
-	val for_all : ('a -> bool) -> 'a list -> bool
-	val exists : ('a -> bool) -> 'a list -> bool
-	val find : ('a -> bool) -> 'a list -> 'a
-
-	val mem : 'a -> 'a list -> bool
-	val memq : 'a -> 'a list -> bool
-	val assoc : 'a -> ('a * 'b) list -> 'b
-	val assq : 'a -> ('a * 'b) list -> 'b
-	val mem_assoc : 'a -> ('a * 'b) list -> bool
-	val mem_assq : 'a -> ('a * 'b) list -> bool
-
-
-	val stable_sort : ('a -> 'a -> int) -> 'a list -> 'a list
-	val fast_sort : ('a -> 'a -> int) -> 'a list -> 'a list
-	val merge : ('a -> 'a -> int) -> 'a list -> 'a list -> 'a list
-
-	(** {6 Exceptions} *)
-
-	exception Empty_list
-	(** [Empty_list] is raised when an operation applied on an empty list
-		is invalid : [hd] for example. *)
-
-	exception Invalid_index of int
-	(** [Invalid_index] is raised when an indexed access on a list is
-		out of list bounds. *)
-
-	exception Different_list_size of string
-	(** [Different_list_size] is raised when applying functions such as
-		[iter2] on two lists having different size. *)
-
-
-end
-
-val ( @ ) : 'a list -> 'a list -> 'a list
-(** the new implementation for ( @ ) operator, see [List.append]. *)
diff --git a/libs/extlib/extString.ml b/libs/extlib/extString.ml
deleted file mode 100644
index ffe96a2f3f412ae719ce07edff5288db3390706b..0000000000000000000000000000000000000000
--- a/libs/extlib/extString.ml
+++ /dev/null
@@ -1,237 +0,0 @@
-(*
- * ExtString - Additional functions for string manipulations.
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-exception Invalid_string
-
-module String = struct
-
-include String
-
-let init len f =
-	let s = create len in
-	for i = 0 to len - 1 do
-		unsafe_set s i (f i)
-	done;
-	s
-
-let starts_with str p =
-	let len = length p in
-	if length str < len then 
-		false
-	else
-		sub str 0 len = p
-
-let ends_with s e =
-	let el = length e in
-	let sl = length s in
-	if sl < el then
-		false
-	else
-		sub s (sl-el) el = e
-
-let find str sub =
-	let sublen = length sub in
-	if sublen = 0 then
-		0
-	else
-		let found = ref 0 in
-		let len = length str in
-		try
-			for i = 0 to len - sublen do
-				let j = ref 0 in
-				while unsafe_get str (i + !j) = unsafe_get sub !j do
-					incr j;
-					if !j = sublen then begin found := i; raise Exit; end;
-				done;
-			done;
-			raise Invalid_string
-		with
-			Exit -> !found
-
-let exists str sub =
-	try
-		ignore(find str sub);
-		true
-	with
-		Invalid_string -> false
-
-let strip ?(chars=" \t\r\n") s =
-	let p = ref 0 in
-	let l = length s in
-	while !p < l && contains chars (unsafe_get s !p) do
-		incr p;
-	done;
-	let p = !p in
-	let l = ref (l - 1) in
-	while !l >= p && contains chars (unsafe_get s !l) do
-		decr l;
-	done;
-	sub s p (!l - p + 1)
-
-let split str sep =
-	let p = find str sep in
-	let len = length sep in
-	let slen = length str in
-	sub str 0 p, sub str (p + len) (slen - p - len)
-
-let rec nsplit str sep =
-	try
-		let s1 , s2 = split str sep in
-		s1 :: nsplit s2 sep
-	with
-		Invalid_string -> [str]
-
-let join = concat
-
-let slice ?(first=0) ?(last=Sys.max_string_length) s =
-	let clip _min _max x = max _min (min _max x) in
-	let i = clip 0 (length s)
-		(if (first<0) then (length s) + first else first)
-	and j = clip 0 (length s)
-		(if (last<0) then (length s) + last else last)
-	in
-	if i>=j || i=length s then
-		create 0
-        else
-          	sub s i (j-i)
-
-let lchop s =
-	if s = "" then "" else sub s 1 (length s - 1)
-
-let rchop s =
-	if s = "" then "" else sub s 0 (length s - 1)
-
-let of_int = string_of_int
-
-let of_float = string_of_float
-
-let of_char = make 1
-
-let to_int s =
-	try
-		int_of_string s
-	with
-		_ -> raise Invalid_string
-
-let to_float s =
-	try
-		float_of_string s
-	with
-		_ -> raise Invalid_string
-
-let enum s =
-	let l = length s in
-	let rec make i =
-		Enum.make 
-		~next:(fun () ->
-			if !i = l then
-				raise Enum.No_more_elements
-			else
-				let p = !i in
-				incr i;
-				unsafe_get s p
-			)
-		~count:(fun () -> l - !i)
-		~clone:(fun () -> make (ref !i))
-	in
-	make (ref 0)
-
-let of_enum e =
-	let l = Enum.count e in
-	let s = create l in
-	let i = ref 0 in
-	Enum.iter (fun c -> unsafe_set s !i c; incr i) e;
-	s
-
-let map f s =
-	let len = length s in
-	let sc = create len in
-	for i = 0 to len - 1 do
-		unsafe_set sc i (f (unsafe_get s i))
-	done;
-	sc
-
-(* fold_left and fold_right by Eric C. Cooper *)
-let fold_left f init str =
-  let n = String.length str in
-  let rec loop i result =
-    if i = n then result
-    else loop (i + 1) (f result str.[i])
-  in
-  loop 0 init
-
-let fold_right f str init =
-  let n = String.length str in
-  let rec loop i result =
-    if i = 0 then result
-    else
-      let i' = i - 1 in
-      loop i' (f str.[i'] result)
-  in
-  loop n init
-
-(* explode and implode from the OCaml Expert FAQ. *)
-let explode s =
-  let rec exp i l =
-    if i < 0 then l else exp (i - 1) (s.[i] :: l) in
-  exp (String.length s - 1) []
-
-let implode l =
-  let res = String.create (List.length l) in
-  let rec imp i = function
-  | [] -> res
-  | c :: l -> res.[i] <- c; imp (i + 1) l in
-  imp 0 l
-
-
-let replace_chars f s =
-	let len = String.length s in
-	let tlen = ref 0 in
-	let rec loop i acc =
-		if i = len then
-			acc
-		else 
-			let s = f (unsafe_get s i) in
-			tlen := !tlen + length s;
-			loop (i+1) (s :: acc)
-	in
-	let strs = loop 0 [] in
-	let sbuf = create !tlen in
-	let pos = ref !tlen in
-	let rec loop2 = function
-		| [] -> ()
-		| s :: acc ->
-			let len = length s in
-			pos := !pos - len;
-			blit s 0 sbuf !pos len;
-			loop2 acc
-	in
-	loop2 strs;
-	sbuf
-
-let replace ~str ~sub ~by =
-	try
-		let i = find str sub in
-		(true, (slice ~last:i str) ^ by ^ 
-                   (slice ~first:(i+(String.length sub)) str))
-        with
-		Invalid_string -> (false, String.copy str)
-
-end
diff --git a/libs/extlib/extString.mli b/libs/extlib/extString.mli
deleted file mode 100644
index 93213c0cae2317b3051dea4240352889d2df9ce4..0000000000000000000000000000000000000000
--- a/libs/extlib/extString.mli
+++ /dev/null
@@ -1,180 +0,0 @@
-(*
- * ExtString - Additional functions for string manipulations.
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Additional functions for string manipulations. *)
-
-exception Invalid_string
-
-module String :
-  sig
-
-	(** {6 New Functions} *)
-
-	val init : int -> (int -> char) -> string
-	(** [init l f] returns the string of length [l] with the chars
-		f 0 , f 1 , f 2 ... f (l-1). *)
-
-	val find : string -> string -> int
-	(** [find s x] returns the starting index of the string [x]
-	    within the string [s] or raises [Invalid_string] if [x]
-	    is not a substring of [s]. *)
-
-	val split : string -> string -> string * string
-	(** [split s sep] splits the string [s] between the first
-		occurrence of [sep].
-	    raises [Invalid_string] if the separator is not found. *)
-
-	val nsplit : string -> string -> string list
-	(** [nsplit s sep] splits the string [s] into a list of strings
-		which are separated by [sep]. *)
-
-	val join : string -> string list -> string
-	(** Same as [concat] *)
-
-        val slice : ?first:int -> ?last:int -> string -> string
-        (** [slice ?first ?last s] returns a "slice" of the string
-          which corresponds to the characters [s.[first]],
-          [s.[first+1]], ..., [s[last-1]]. Note that the character at
-          index [last] is {b not} included! If [first] is omitted it
-          defaults to the start of the string, i.e. index 0, and if
-          [last] is omitted is defaults to point just past the end of
-          [s], i.e. [length s].  Thus, [slice s] is equivalent to
-          [copy s].
-
-          Negative indexes are interpreted as counting from the end of
-          the string. For example, [slice ~last:-2 s] will return the
-          string [s], but without the last two characters.
-
-          This function {b never} raises any exceptions. If the
-          indexes are out of bounds they are automatically clipped.
-        *)
-
-	val lchop : string -> string
-	(** Returns the same string but without the first character.
-	    does nothing if the string is empty. *)
-
-	val rchop : string -> string
-	(** Returns the same string but without the last character.
-	   does nothing if the string is empty. *)
-
-	val of_int : int -> string
-	(** Returns the string representation of an int. *)
-
-	val of_float : float -> string
-	(** Returns the string representation of an float. *)
-
-	val of_char : char -> string
-	(** Returns a string containing one given character. *)
-
-	val to_int : string -> int
-	(** Returns the integer represented by the given string or
-	    raises [Invalid_string] if the string does not represent an integer.*)
-
-	val to_float : string -> float
-	(** Returns the float represented by the given string or
-	    raises Invalid_string if the string does not represent a float. *)
-
-	val ends_with : string -> string -> bool
-	(** [ends_with s x] returns true if the string [s] is ending with [x]. *)
-
-	val starts_with : string -> string -> bool
-	(** [starts_with s x] return true if [s] is starting with [x]. *)
-
-	val enum : string -> char Enum.t
-	(** Returns an enumeration of the characters of a string.*)
-
-	val of_enum : char Enum.t -> string
-	(** Creates a string from a character enumeration. *)
-	
-	val map : (char -> char) -> string -> string
-	(** [map f s] returns a string where all characters [c] in [s] have been
-		replaced by [f c]. **)
-
-	val fold_left : ('a -> char -> 'a) -> 'a -> string -> 'a
-	  (** [fold_left f a s] is
-	      [f (... (f (f a s.[0]) s.[1]) ...) s.[n-1]] *)
-	val fold_right : (char -> 'a -> 'a) -> string -> 'a -> 'a
-	  (** [fold_right f s b] is
-	      [f s.[0] (f s.[1] (... (f s.[n-1] b) ...))] *)
-
-	val explode : string -> char list
-	  (** [explode s] returns the list of characters in the string [s]. *)
-	val implode : char list -> string
-	  (** [implode cs] returns a string resulting from concatenating
-	      the characters in the list [cs]. *)
-
-	val strip : ?chars:string -> string -> string
-	(** Returns the string without the chars if they are at the beginning or
-		at the end of the string. By default chars are " \t\r\n". *)
-
-	val exists : string -> string -> bool
-	(** [exists str sub] returns true if [sub] is a substring of [str] or
-		false otherwise. *)
-
-	val replace_chars : (char -> string) -> string -> string
-	(** [replace_chars f s] returns a string where all chars [c] of [s] have been
-		replaced by the string returned by [f c]. *)
-
-        val replace : str:string -> sub:string -> by:string -> bool * string
-        (** [replace ~str ~sub ~by] returns a tuple constisting of a boolean
-		and a string where the first occurrence of the string [sub]
-		within [str] has been replaced by the string [by]. The boolean
-		is true if a subtitution has taken place. *)
-
-	(** {6 Older Functions} *)
-
-	(** Please refer to the Ocaml Manual for documentation of these
-		functions. *)
-
-	val length : string -> int
-	val get : string -> int -> char
-	val set : string -> int -> char -> unit
-	val create : int -> string
-	val make : int -> char -> string
-	val copy : string -> string
-	val sub : string -> int -> int -> string
-	val fill : string -> int -> int -> char -> unit
-	val blit : string -> int -> string -> int -> int -> unit
-	val concat : string -> string list -> string
-	val iter : (char -> unit) -> string -> unit
-	val escaped : string -> string
-	val index : string -> char -> int
-	val rindex : string -> char -> int
-	val index_from : string -> int -> char -> int
-	val rindex_from : string -> int -> char -> int
-	val contains : string -> char -> bool
-	val contains_from : string -> int -> char -> bool
-	val rcontains_from : string -> int -> char -> bool
-	val uppercase : string -> string
-	val lowercase : string -> string
-	val capitalize : string -> string
-	val uncapitalize : string -> string
-
-	type t = string
-	val compare : t -> t -> int
-
-	(**/**)
-
-	external unsafe_get : string -> int -> char = "%string_unsafe_get"
-	external unsafe_set : string -> int -> char -> unit = "%string_unsafe_set"
-	external unsafe_blit : string -> int -> string -> int -> int -> unit = "caml_blit_string" "noalloc"
-	external unsafe_fill : string -> int -> int -> char -> unit = "caml_fill_string" "noalloc"
-
-  end
diff --git a/libs/extlib/global.ml b/libs/extlib/global.ml
deleted file mode 100644
index 7cfe62325aa89d515ff316664bfbaf777cc3df37..0000000000000000000000000000000000000000
--- a/libs/extlib/global.ml
+++ /dev/null
@@ -1,40 +0,0 @@
-(*
- * Global - Mutable global variable
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
- 
-exception Global_not_initialized of string
-
-type 'a t = ('a option ref * string)
-
-let empty name = ref None,name
-
-let name = snd
-
-let set (r,_) v = r := Some v
-
-let get (r,name) =
-	match !r with
-	| None -> raise (Global_not_initialized name)
-	| Some v -> v
-
-let undef (r,_) = r := None
-
-let isdef (r,_) = !r <> None
-
-let opt (r,_) = !r
diff --git a/libs/extlib/global.mli b/libs/extlib/global.mli
deleted file mode 100644
index 76436bb333aafc12067f5c9d1b47427abb889a87..0000000000000000000000000000000000000000
--- a/libs/extlib/global.mli
+++ /dev/null
@@ -1,58 +0,0 @@
-(*
- * Global - Mutable global variable
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Mutable global variable.
- 
-	Often in OCaml you want to have a global variable, which is mutable 
-    and uninitialized when declared. You can use a ['a option ref] but
-	this is not very convenient. The Global module provides functions
-	to easily create and manipulate such variables.
-*)
-
-type 'a t
-(** Abstract type of a global *)
-
-exception Global_not_initialized of string
-(** Raised when a global variable is accessed without first having been
- assigned a value. The parameter contains the name of the global. *)
-
-val empty : string -> 'a t
-(** Returns an new named empty global. The name of the global can be any
- string. It identifies the global and makes debugging easier. *)
-
-val name : 'a t -> string
-(** Retrieve the name of a global. *)
-
-val set : 'a t -> 'a -> unit
-(** Set the global value contents. *)
-
-val get : 'a t -> 'a
-(** Get the global value contents - raise Global_not_initialized if not
- defined. *)
-
-val undef : 'a t -> unit 
-(** Reset the global value contents to undefined. *)
-
-val isdef : 'a t -> bool 
-  (** Return [true] if the global value has been set. *)
-
-val opt : 'a t -> 'a option 
-  (** Return [None] if the global is undefined, else [Some v] where v is the
-  current global value contents. *)
diff --git a/libs/extlib/install.ml b/libs/extlib/install.ml
deleted file mode 100644
index 862adeffc0f349ad0c12e4cf437c2406c5133d63..0000000000000000000000000000000000000000
--- a/libs/extlib/install.ml
+++ /dev/null
@@ -1,218 +0,0 @@
-(*
- * Install - ExtLib installation
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-open Printf
-
-type path =
-	| PathUnix
-	| PathDos
-
-let modules = [
-	"enum";
-	"bitSet";
-	"dynArray";
-	"extArray";
-	"extHashtbl";
-	"extList";
-	"extString";
-	"global";
-	"IO";
-	"option";
-	"pMap";
-	"std";
-	"uChar";
-	"uTF8";
-	"base64";
-	"unzip";
-	"refList";
-	"optParse";
-    "dllist";
-    "multiArray";
-]
-
-let m_list suffix =
-	String.concat " " (List.map (fun m -> m ^ suffix) modules)
-
-let obj_ext , lib_ext , cp_cmd , path_type = match Sys.os_type with
-	| "Unix" | "Cygwin" | "MacOS" -> ".o" , ".a" , "cp", PathUnix
-	| "Win32" -> ".obj" , ".lib" , "copy", PathDos
-	| _ -> failwith "Unknown OS"
-
-let run cmd =
-	print_endline cmd;
-	let ecode = Sys.command cmd in
-	if ecode <> 0 then failwith (sprintf "Exit Code %d - Stopped" ecode)
-
-let copy file dest =
-	if dest <> "" && dest <> "." then begin
-		print_endline ("Installing " ^ file);
-		let path = dest ^ file in
-		(try Sys.remove path with _ -> ());
-		try
-			Sys.rename file path;
-		with
-			_ -> failwith "Aborted"
-	end
-
-let complete_path p =
-	if p = "" then
-		p
-	else
-		let c = p.[String.length p - 1] in
-		if c = '/' || c = '\\' then
-			p
-		else
-			p ^ (match path_type with PathUnix -> "/" | PathDos -> "\\")
-
-let remove file =
-	try
-		Sys.remove file
-	with
-		_ -> prerr_endline ("Warning : failed to delete " ^ file)
-
-let is_findlib() =
-	let findlib = Sys.command (if Sys.os_type = "Win32" then "ocamlfind printconf 2>NUL" else "ocamlfind printconf") = 0 in
-	if findlib then	print_endline "Using Findlib";
-	findlib
-
-type install_dir = Findlib | Dir of string
-
-let install() =
-	let autodir = ref None in
-	let docflag = ref None in
-	let autodoc = ref false in
-	let autobyte = ref false in
-	let autonative = ref false in
-	let usage = "ExtLib installation program v1.3\n(c)2003,2004 Nicolas Cannasse" in
-	Arg.parse [
-		("-d", Arg.String (fun s -> autodir := Some s) , "<dir> : install in target directory");
-		("-b", Arg.Unit (fun () -> autobyte := true) , ": byte code installation");
-		("-n", Arg.Unit (fun () -> autonative := true) , ": native code installation");
-		("-doc", Arg.Unit (fun () -> docflag := Some true) , ": documentation installation");
-		("-nodoc", Arg.Unit (fun () -> docflag := Some false) , ": documentation installation");
-	] (fun s -> raise (Arg.Bad s)) usage;
-	let findlib = is_findlib () in
-	let install_dir = (
-		match !autodir with
-		| Some dir ->
-			if not !autobyte && not !autonative && not !autodoc then failwith "Nothing to do.";
-			Dir (complete_path dir)
-		| None ->
-			let byte, native =
-			  if !autobyte || !autonative then
-			    (!autobyte, !autonative)
-			  else begin
-			printf "Choose one of the following :\n1- Bytecode installation only\n2- Native installation only\n3- Both Native and Bytecode installation\n> ";
-			  (match read_line() with
-				| "1" -> true, false
-				| "2" -> false, true
-				| "3" -> true, true
-				| _ -> failwith "Invalid choice, exit.")
-			  end
-			in
-			let dest =
-			  if not findlib then begin
-			    printf "Choose installation directory :\n> ";
-			    let dest = complete_path (read_line()) in
-			    (try
-			      close_out (open_out (dest ^ "test.file"));
-			      Sys.remove (dest ^ "test.file");
-			    with
-			      _ -> failwith ("Directory " ^ dest ^ " does not exists or cannot be written."));
-			    Dir dest;
-			  end else Findlib in
-			autobyte := byte;
-			autonative := native;
-			dest
-	) in
-	let doc =
-		match !docflag with
-		Some doc -> doc
-		| None ->
-			printf "Do you want to generate ocamldoc documentation (Y/N) ?\n> ";
-			(match read_line() with
-			| "y" | "Y" -> true
-			| "n" | "N" -> false
-			| _ -> failwith "Invalid choice, exit.")
-	in
-	autodoc := doc;
-	let doc_dir =
-	  match install_dir with
-	    Findlib -> "extlib-doc"
-	  | Dir install_dir ->
-	      sprintf "%sextlib-doc" install_dir in
-	if !autodoc && not (Sys.file_exists doc_dir) then run (sprintf "mkdir %s" doc_dir);
-	run (sprintf "ocamlc -c %s" (m_list ".mli"));
-	if !autobyte then begin
-		List.iter (fun m -> run (sprintf "ocamlc -c %s.ml" m)) modules;
-		run (sprintf "ocamlc -a -o extLib.cma %s extLib.ml" (m_list ".cmo"));
-		List.iter (fun m -> remove (m ^ ".cmo")) modules;
-		remove "extLib.cmo";
-	end;
-	if !autonative then begin
-		List.iter (fun m -> run (sprintf "ocamlopt -c %s.ml" m)) modules;
-		run (sprintf "ocamlopt -a -o extLib.cmxa %s extLib.ml" (m_list ".cmx"));
-		List.iter (fun m -> remove (m ^ obj_ext)) modules;
-		remove ("extLib" ^ obj_ext);
-	end;
-	if !autodoc then begin
-		run (sprintf "ocamldoc -sort -html -d %s %s" doc_dir (m_list ".mli"));
-		run ((match path_type with
-				| PathDos -> sprintf "%s odoc_style.css %s\\style.css";
-				| PathUnix -> sprintf "%s odoc_style.css %s/style.css") cp_cmd doc_dir);
-	end;
-	match install_dir with
-	  Findlib ->
-	    let files = Buffer.create 0 in
-	    List.iter (fun m ->
-	      Buffer.add_string files (m ^ ".cmi");
-	      Buffer.add_char files ' ';
-	      Buffer.add_string files (m ^ ".mli");
-	      Buffer.add_char files ' ')
-	      modules;
-	    Buffer.add_string files "extLib.cmi ";
-	    if !autobyte then Buffer.add_string files "extLib.cma ";
-	    if !autonative then begin
-	      Buffer.add_string files "extLib.cmxa ";
-	      Buffer.add_string files ("extLib" ^ lib_ext^ " ");
-	    end;
-	    run (sprintf "%s META.txt META" cp_cmd);
-	    let files = Buffer.contents files in
-	    run (sprintf "ocamlfind install extlib %s META" files);
-	| Dir install_dir ->
-	    List.iter (fun m ->
-			copy (m ^ ".cmi") install_dir;
-			if !autonative then copy (m ^ ".cmx") install_dir
-		) ("extLib" :: modules);
-	    if !autobyte then copy "extLib.cma"  install_dir;
-	    if !autonative then begin
-	      copy "extLib.cmxa" install_dir;
-	      copy ("extLib" ^ lib_ext) install_dir;
-	    end;
-;;
-try
-	install();
-	printf "Done.";
-with
-	Failure msg ->
-		prerr_endline msg;
-		exit 1
-
-
diff --git a/libs/extlib/odoc_style.css b/libs/extlib/odoc_style.css
deleted file mode 100644
index e1db9ad736245592b986e9d581bfac5480134a48..0000000000000000000000000000000000000000
--- a/libs/extlib/odoc_style.css
+++ /dev/null
@@ -1,24 +0,0 @@
-body { padding: 0px 20px 0px 26px; background: #ffffff; color: #000000; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 90%; }
-h1 { padding : 5px 0px 5px 0px; font-size : 16pt; font-weight : normal; background-color : #E0E0FF }
-h6 { padding : 5px 0px 5px 20px; font-size : 16pt; font-weight : normal; background-color : #E0E0FF }
-a:link, a:visited, a:active { text-decoration: none; }
-a:link { color: #000077; }
-a:visited { color: #000077; }
-a:hover { color: #cc9900; }
-.keyword { font-weight : bold ; color : Blue }
-.keywordsign { color : #606060 }
-.superscript { font-size : 4 }
-.subscript { font-size : 4 }
-.comment { color : #606060 }
-.constructor { color : #808080; }
-.type { color : #606060 }
-.string { color : Red }
-.warning { color : Red ; font-weight : bold }
-.info { margin-left : 3em; margin-right : 3em }
-.code { color : #606060 ; }
-.title1 { font-size : 16pt ; background-color : #E0E0E0 }
-.title2 { font-size : 16pt ; background-color : #E0E0E0 }
-.title3 { font-size : 16pt ; background-color : #E0E0E0 }
-.title4 { font-size : 16pt ; background-color : #E0E0E0 }
-.title5 { font-size : 16pt ; background-color : #E0E0E0 }
-.title6 { font-size : 16pt ; background-color : #E0E0E0; }
\ No newline at end of file
diff --git a/libs/extlib/optParse.ml b/libs/extlib/optParse.ml
deleted file mode 100644
index ef64e72d8987959bf27b35663293cff6d26ec9cb..0000000000000000000000000000000000000000
--- a/libs/extlib/optParse.ml
+++ /dev/null
@@ -1,720 +0,0 @@
-(*
- * optParse - Functions for parsing command line arguments.
- * Copyright (C) 2004 Bardur Arantsson
- *
- * Heavily influenced by the optparse.py module from the Python
- * standard library, but with lots of adaptation to the 'Ocaml Way'
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-open Printf
-open ExtString
-open ExtList
-
-
-let terminal_width =
-  try 
-    int_of_string (Sys.getenv "COLUMNS")    (* Might as well use it if it's there... *)
-  with
-    Failure _ -> 80
-  | Not_found -> 80
-
-module GetOpt =
-  struct
-
-    type action = string -> string list -> unit
-    type long_opt = string * int * action
-    type short_opt = char * int * action
-
-    exception Error of (string * string)
-
-    let split1 haystack needle =
-      try 
-        let (h, x) = String.split haystack needle in h, [x] 
-      with
-        Invalid_string -> haystack, []
-
-    let find_opt format_name options s =
-      let rec loop l =
-        match l with
-          (x, y, z) :: t -> if x = s then x, y, z else loop t
-        | [] -> raise (Error (format_name s, "no such option"))
-      in
-      loop options
-
-    let find_short_opt options = find_opt (fun c -> sprintf "-%c" c) options
-
-    let find_long_opt options = find_opt (fun s -> "--" ^ s) options
-
-    let parse other find_short_opt find_long_opt args =
-      let rec loop args =
-        let rec gather_args name n args =
-          try 
-            List.split_nth n args 
-          with
-            List.Invalid_index _ ->
-              raise (Error (name, "missing required arguments"))
-        in
-        let gather_long_opt s args =
-          let (h, t) = split1 s "=" in
-          let (_, nargs, action) = find_long_opt (String.slice ~first:2 h) in
-          let (accum, args') = gather_args h (nargs - List.length t) args in
-          action h (t @ accum); args'
-        in
-        let rec gather_short_opt_concat seen_args s k args =
-          if k < String.length s then
-            let ostr = sprintf "-%c" s.[k]
-            and (_, nargs, action) = find_short_opt s.[k] in
-            if nargs = 0 then
-              begin
-                action ostr [];
-                gather_short_opt_concat seen_args s (k + 1) args
-              end
-            else if not seen_args then
-              let (accum, args') = gather_args ostr nargs args in
-              action ostr accum; gather_short_opt_concat true s (k + 1) args'
-            else
-              raise
-                (Error
-                   (sprintf "-%c" s.[k],
-                    sprintf "option list '%s' already contains an option requiring an argument"
-                      s))
-          else args
-        in
-        let gather_short_opt s k args =
-          let ostr = sprintf "-%c" s.[k] in
-          let (_, nargs, action) = find_short_opt s.[k] in
-          if nargs = 0 then gather_short_opt_concat false s k args
-          else
-            let (accum, args') =
-              let h = String.slice ~first:(k+1) s in
-              if String.length h = 0 then gather_args ostr nargs args
-              else
-                let (t, args'') = gather_args ostr (nargs - 1) args in
-                h :: t, args''
-            in
-            action ostr accum; args'
-        in
-        match args with
-          [] -> []
-        | arg :: args' ->
-            if arg = "--" then args'
-            else if String.starts_with arg "--" then
-              loop (gather_long_opt arg args')
-            else if arg = "-" then begin other arg; loop args' end
-            else if String.starts_with arg "-" then
-              loop (gather_short_opt arg 1 args')
-            else begin other arg; loop args' end
-      in
-      let args' = loop args in List.iter other args'
-  end
-
-
-module Opt =
-  struct
-
-    exception No_value
-    exception Option_error of string * string
-    exception Option_help
-
-    type 'a t = { 
-      option_set : string -> string list -> unit;
-      option_set_value : 'a -> unit;
-      option_get : unit -> 'a option;
-      option_metavars : string list;
-      option_defhelp : string option 
-    }
-
-    let get opt =
-      match opt.option_get () with
-        Some x -> x
-      | None -> raise No_value
-
-    let set opt v =
-      opt.option_set_value v
-
-    let is_set opt = Option.is_some (opt.option_get ())
-
-    let opt opt = opt.option_get ()
-
-    let value_option metavar default coerce errfmt =
-      let data = ref default in
-      {
-        option_metavars = [metavar]; 
-        option_defhelp = None;
-        option_get = (fun _ -> !data);
-        option_set_value = (fun x -> data := Some x);
-        option_set =
-         (fun option args ->
-            let arg = List.hd args in
-              try 
-                data := Some (coerce arg)
-              with
-                  exn -> raise (Option_error (option, errfmt exn arg)))
-      }
-
-    let callback_option metavar coerce errfmt f =
-      {
-        option_metavars = [metavar]; 
-        option_defhelp = None;
-        option_get = (fun _ -> Some ());
-        option_set_value = (fun () -> ());
-        option_set =
-         (fun option args ->
-            let arg = List.hd args in
-            let datum = ref None in
-              begin 
-              try 
-                datum := Some (coerce arg)
-              with
-                  exn -> raise (Option_error (option, errfmt exn arg))
-              end;
-
-              Option.may f !datum)
-      }
-  end
-
-module StdOpt =
-  struct
-
-    open Opt
-
-    let store_const ?default const =
-      let data = ref default in
-      {
-        option_metavars = []; 
-        option_defhelp = None;
-        option_get = (fun _ -> !data);
-        option_set_value = (fun x -> data := Some x);
-        option_set = fun _ _ -> data := Some const
-      }
-
-    let store_true () = store_const ~default:false true
-
-    let store_false () = store_const ~default:true false
-
-    let int_option ?default ?(metavar = "INT") () =
-      value_option metavar default int_of_string
-        (fun _ s -> sprintf "invalid integer value '%s'" s)
-
-    let int_callback ?(metavar = "INT") =
-      callback_option metavar int_of_string
-        (fun _ s -> sprintf "invalid integer value '%s'" s)
-
-    let float_option ?default ?(metavar = "FLOAT") () =
-      value_option metavar default float_of_string
-        (fun _ s -> sprintf "invalid floating point value '%s'" s)
-
-    let float_callback ?(metavar = "FLOAT") =
-      callback_option metavar float_of_string
-        (fun _ s -> sprintf "invalid floating point value '%s'" s)
-
-    let str_option ?default ?(metavar = "STR") () =
-      value_option metavar default (fun s -> s) (fun _ _ -> "cannot happen")
-
-    let str_callback ?(metavar = "STR") =
-      callback_option metavar (fun s -> s) (fun _ _ -> "cannot happen")
-
-    let count_option ?(dest = ref 0) ?(increment = 1) () =
-      {
-        option_metavars = []; 
-        option_defhelp = None;
-        option_get = (fun _ -> Some !dest);
-        option_set_value = (fun x -> dest := x);
-        option_set = fun _ _ -> dest := !dest + increment
-      }
-
-    let incr_option ?(dest = ref 0) = 
-      count_option ~dest ~increment:1
-
-    let decr_option ?(dest = ref 0) = 
-      count_option ~dest ~increment:(-1)
-
-    let help_option () =
-      {
-        option_metavars = [];
-        option_defhelp = Some "show this help message and exit";
-        option_get = (fun _ -> raise No_value);
-        option_set_value = (fun _ -> ());
-        option_set = fun _ _ -> raise Option_help
-      }
-
-    let version_option vfunc =
-      {
-        option_metavars = [];
-        option_defhelp = Some "show program's version and exit";
-        option_get = (fun _ -> raise No_value);
-        option_set_value = (fun _ -> ());
-        option_set = fun _ _ -> print_endline (vfunc ()); exit 0
-      }
-  end
-
-
-
-
-module Formatter =
-  struct
-
-    (* Note that the whitespace regexps must NOT treat the non-breaking
-       space character as whitespace. *)
-    let whitespace = "\t\n\013\014\r "
-
-    let split_into_chunks s =
-      let buf = Buffer.create (String.length s) in
-      let flush () =
-        let s = Buffer.contents buf
-        in
-          Buffer.clear buf;
-          s
-      in
-      let rec loop state accum i =
-        if (i<String.length s) then
-          if ((state && not (String.contains whitespace s.[i])) || 
-              ((not state) && String.contains whitespace s.[i])) then
-            if Buffer.length buf > 0 then
-               loop (not state) (flush () :: accum) i 
-             else 
-               loop (not state) accum i
-          else
-            begin
-              Buffer.add_char buf s.[i];
-              loop state accum (i+1)
-            end
-        else
-          if Buffer.length buf > 0 then
-            flush () :: accum
-          else 
-            accum
-      in
-        List.rev (loop false [] 0)
-
-    let is_whitespace s =
-      let rec loop i =
-        if i<String.length s then
-          if String.contains whitespace s.[i] then
-            loop (i+1)
-          else 
-            false
-        else 
-          true
-      in
-        loop 0
-
-    let expand_tabs ?(tab_size = 8) s =
-      let len = String.length s in
-      let spaces n = String.make n ' '
-      and b = Buffer.create len in
-      let rec expand i col =
-        if i < len then
-          match s.[i] with
-            '\t' ->
-              let n = tab_size - col mod tab_size in
-              Buffer.add_string b (spaces n);
-              expand (i + 1) (col + n)
-          | '\n' -> 
-              Buffer.add_string b "\n";
-              expand (i + 1) 0
-          | c -> 
-              Buffer.add_char b c;
-              expand  (i + 1) (col + 1)
-      in
-      expand 0 0; 
-      Buffer.contents b
-
-    let wrap ?(initial_indent = 0) ?(subsequent_indent = 0) text _width =
-      let wrap_chunks_line width acc =
-        let rec wrap (chunks, cur_line, cur_len) =
-          match chunks with
-            [] -> [], cur_line, cur_len
-          | hd :: tl ->
-              let l = String.length hd in
-              if cur_len + l <= width then
-                wrap (tl, hd :: cur_line, cur_len + l)
-              else chunks, cur_line, cur_len
-        in
-        wrap acc
-      in
-      let wrap_long_last_word width (chunks, cur_line, cur_len) =
-        match chunks with
-          [] -> [], cur_line, cur_len
-        | hd :: tl ->
-            let l = String.length hd in
-            if l > width then
-              match cur_line with
-                [] -> tl, [hd], cur_len + l
-              | _ -> chunks, cur_line, cur_len
-            else chunks, cur_line, cur_len
-      in
-      let wrap_remove_last_ws (chunks, cur_line, cur_len) =
-        match cur_line with
-          [] -> chunks, cur_line, cur_len
-        | hd :: tl ->
-            if is_whitespace hd then chunks, tl, cur_len - String.length hd
-            else chunks, cur_line, cur_len
-      in
-      let rec wrap_chunks_lines chunks lines =
-        let indent =
-          match lines with
-            [] -> initial_indent
-          | _ -> subsequent_indent
-        in
-        let width = _width - indent in
-        match chunks with
-          hd :: tl ->
-            if is_whitespace hd && lines <> [] then wrap_chunks_lines tl lines
-            else (* skip *)
-              let (chunks', cur_line, _) =
-                wrap_remove_last_ws
-                  (wrap_long_last_word width
-                     (wrap_chunks_line width (chunks, [], 0)))
-              in
-              wrap_chunks_lines chunks'
-                ((String.make indent ' ' ^
-                    String.concat "" (List.rev cur_line)) ::
-                   lines)
-        | [] -> List.rev lines
-      in
-      let chunks = split_into_chunks (expand_tabs text) in
-      wrap_chunks_lines chunks []
-
-
-    let fill ?(initial_indent = 0) ?(subsequent_indent = 0) text width =
-      String.concat "\n" (wrap ~initial_indent ~subsequent_indent text width)
-
-
-
-    type t = { 
-      indent : unit -> unit;
-      dedent : unit -> unit;
-      format_usage : string -> string;
-      format_heading : string -> string;
-      format_description : string -> string;
-      format_option : char list * string list -> string list -> 
-                                             string option -> string
-    }
-
-    let format_option_strings short_first (snames, lnames) metavars =
-      let metavar = String.concat " " metavars in
-      let lopts =
-        List.map
-          (match metavar with
-             "" -> (fun z -> sprintf "--%s" z)
-           | _ -> fun z -> sprintf "--%s=%s" z metavar)
-          lnames
-      and sopts = List.map (fun x -> sprintf "-%c%s" x metavar) snames in
-      match short_first with
-        true -> String.concat ", " (sopts @ lopts)
-      | false -> String.concat ", " (lopts @ sopts)
-
-
-    let indented_formatter ?level:(extlevel = ref 0)
-      ?indent:(extindent = ref 0) ?(indent_increment = 2) 
-      ?(max_help_position = 24) ?(width = terminal_width - 1) 
-      ?(short_first = true) () =
-      let indent = ref 0
-      and level = ref 0 in
-      let help_position = ref max_help_position
-      and help_width = ref (width - max_help_position) in
-      {
-        indent =
-         (fun () ->
-            indent := !indent + indent_increment;
-            level := !level + 1;
-            extindent := !indent;
-            extlevel := !level);
-
-        dedent =
-         (fun () ->
-            indent := !indent - indent_increment;
-            level := !level - 1;
-            assert (!level >= 0);
-            extindent := !indent;
-            extlevel := !level);
-        
-        format_usage = (fun usage -> sprintf "usage: %s\n" usage);
-        
-        format_heading =
-         (fun heading -> sprintf "%*s%s:\n\n" !indent "" heading);
-        
-        format_description =
-         (fun description ->
-            let x =
-              fill ~initial_indent:(!indent) ~subsequent_indent:(!indent)
-                description (width - !indent)
-            in
-              if not (String.ends_with x "\n") then x ^ "\n\n" else x ^ "\n");
-        
-        format_option =
-         fun names metavars help ->
-           let opt_width = !help_position - !indent - 2 in
-           let opt_strings =
-             format_option_strings short_first names metavars
-           in
-           let buf = Buffer.create 256 in
-           let indent_first =
-             if String.length opt_strings > opt_width then
-               begin
-                 bprintf buf "%*s%s\n" !indent "" opt_strings; !help_position
-               end
-             else
-               begin
-                 bprintf buf "%*s%-*s  " !indent "" opt_width opt_strings; 0
-               end
-           in
-           Option.may
-             (fun option_help ->
-                let lines = wrap option_help !help_width in
-                match lines with
-                  h :: t ->
-                    bprintf buf "%*s%s\n" indent_first "" h;
-                    List.iter
-                      (fun x -> bprintf buf "%*s%s\n" !help_position "" x) t
-                | [] -> ())
-             help;
-
-           let contents =
-             Buffer.contents buf
-           in
-             if String.length contents > 0 && not (String.ends_with contents "\n") then
-               contents ^ "\n"
-             else
-               contents
-      }
-
-    let titled_formatter ?(level = ref 0) ?(indent = ref 0) 
-      ?(indent_increment = 0) ?(max_help_position = 24) 
-      ?(width = terminal_width - 1) ?(short_first = true) 
-      () =
-      let formatter =
-        indented_formatter ~level ~indent ~indent_increment ~max_help_position
-          ~width ~short_first ()
-      in
-      let format_heading h =
-        let c =
-          match !level with
-            0 -> '='
-          | 1 -> '-'
-          | _ -> failwith "titled_formatter: Too much indentation"
-        in
-        sprintf "%*s%s\n%*s%s\n\n" !indent "" (String.capitalize h) !indent ""
-          (String.make (String.length h) c)
-      in
-      let format_usage usage =
-        sprintf "%s  %s\n" (format_heading "Usage") usage
-      in
-      { formatter with 
-          format_usage = format_usage;
-          format_heading = format_heading
-      }
-  end
-
-
-
-open Opt
-open Formatter
-
-module OptParser =
-  struct
-
-    exception Option_conflict of string
-
-    type group = { 
-      og_heading : string;
-      og_description : string option;
-      og_options :
-        ((char list * string list) * string list * string option) RefList.t;
-      og_children : group RefList.t 
-    }
-
-    type t = { 
-      op_usage : string;
-      op_suppress_usage : bool;
-      op_prog : string;
-
-      op_formatter : Formatter.t;
-      
-      op_long_options : GetOpt.long_opt RefList.t;
-      op_short_options : GetOpt.short_opt RefList.t;
-      
-      op_groups : group 
-    }
-
-    let unprogify optparser s =
-      (snd (String.replace ~str:s ~sub:"%prog" ~by:optparser.op_prog))
-
-    let add optparser ?(group = optparser.op_groups) ?help ?(hide = false)
-      ?short_name ?(short_names = []) ?long_name ?(long_names = []) opt =
-      let lnames =
-        match long_name with
-            None -> long_names
-          | Some x -> x :: long_names
-      and snames =
-        match short_name with
-            None -> short_names
-          | Some x -> x :: short_names
-      in
-      if lnames = [] && snames = [] then
-        failwith "Options must have at least one name"
-      else
-        (* Checking for duplicates: *)
-        let snames' =
-          List.fold_left (fun r (x, _, _) -> x :: r) []
-            (RefList.to_list optparser.op_short_options)
-        and lnames' =
-          List.fold_left (fun r (x, _, _) -> x :: r) []
-            (RefList.to_list optparser.op_long_options)
-        in
-        let sconf =
-          List.filter (fun e -> List.exists (( = ) e) snames') snames
-        and lconf =
-          List.filter (fun e -> List.exists (( = ) e) lnames') lnames
-        in
-        if List.length sconf > 0 then
-          raise (Option_conflict (sprintf "-%c" (List.hd sconf)))
-        else if List.length lconf > 0 then
-          raise (Option_conflict (sprintf "--%s" (List.hd lconf)));
-          
-        (* Add to display list. *)
-        if not hide then
-          RefList.add group.og_options
-            ((snames, lnames), opt.option_metavars,
-             (match help with
-                  None -> opt.option_defhelp
-                | Some _ -> help));
-          
-        (* Getopt: *)
-        let nargs = List.length opt.option_metavars in
-          List.iter
-            (fun short ->
-               RefList.add optparser.op_short_options
-               (short, nargs, opt.option_set))
-            snames;
-          List.iter
-            (fun long ->
-               RefList.add optparser.op_long_options
-               (long, nargs, opt.option_set))
-            lnames
-            
-    let add_group optparser ?(parent = optparser.op_groups) ?description heading =
-      let g =
-        {
-          og_heading = heading; 
-          og_description = description;
-          og_options = RefList.empty (); 
-          og_children = RefList.empty ()
-        }
-      in
-      RefList.add parent.og_children g; g
-
-    let make ?(usage = "%prog [options]") ?description ?version
-      ?(suppress_usage = false) ?(suppress_help = false) ?prog 
-      ?(formatter = Formatter.indented_formatter ()) () =
-      let optparser =
-        {
-          op_usage = usage; 
-          op_suppress_usage = suppress_usage;
-          op_prog = Option.default (Filename.basename Sys.argv.(0)) prog;
-          op_formatter = formatter; 
-          op_short_options = RefList.empty ();
-          op_long_options = RefList.empty ();
-          op_groups = {
-            og_heading = "options"; 
-            og_options = RefList.empty ();
-            og_children = RefList.empty ();
-            og_description = description
-          }
-        }
-      in
-      Option.may                         (* Add version option? *)
-        (fun version ->
-           add optparser ~long_name:"version"
-             (StdOpt.version_option
-                (fun () -> unprogify optparser version)))
-        version;
-      if not suppress_help then              (* Add help option? *)
-        add optparser ~short_name:'h' ~long_name:"help"
-          (StdOpt.help_option ());
-
-      optparser
-
-    let format_usage optparser eol =
-      match optparser.op_suppress_usage with
-        true -> ""
-      | false ->
-          unprogify optparser
-            (optparser.op_formatter.format_usage optparser.op_usage) ^ eol
-
-    let error optparser ?(chn = stderr) ?(status = 1) message =
-      fprintf chn "%s%s: %s\n" (format_usage optparser "\n") optparser.op_prog
-        message;
-      flush chn;
-      exit status
-
-    let usage optparser ?(chn = stdout) () =
-      let rec loop g =
-        (* Heading: *)
-        output_string chn
-          (optparser.op_formatter.format_heading g.og_heading);
-
-        optparser.op_formatter.indent ();
-        (* Description: *)
-        Option.may
-          (fun x ->
-             output_string chn (optparser.op_formatter.format_description x))
-          g.og_description;
-        (* Options: *)
-        RefList.iter
-          (fun (names, metavars, help) ->
-             output_string chn
-               (optparser.op_formatter.format_option names metavars help))
-          g.og_options;
-        (* Child groups: *)
-        output_string chn "\n";
-        RefList.iter loop g.og_children;
-
-        optparser.op_formatter.dedent ()
-      in
-      output_string chn (format_usage optparser "\n");
-      loop optparser.op_groups;
-      flush chn
-
-    let parse optparser ?(first = 0) ?last argv =
-      let args = RefList.empty ()
-      and n =
-        match last with
-          None -> Array.length argv - first
-        | Some m -> m - first + 1
-      in
-      begin 
-        try
-          GetOpt.parse (RefList.push args)
-            (GetOpt.find_short_opt
-               (RefList.to_list optparser.op_short_options))
-            (GetOpt.find_long_opt (RefList.to_list optparser.op_long_options))
-            (Array.to_list (Array.sub argv first n))
-        with
-            GetOpt.Error (opt, errmsg) ->
-              error optparser (sprintf "option '%s': %s" opt errmsg)
-          | Option_error (opt, errmsg) ->
-              error optparser (sprintf "option '%s': %s" opt errmsg)
-          | Option_help -> usage optparser (); exit 0
-      end;
-      List.rev (RefList.to_list args)
-
-    let parse_argv optparser = 
-      parse optparser ~first:1 Sys.argv
-  end
diff --git a/libs/extlib/optParse.mli b/libs/extlib/optParse.mli
deleted file mode 100644
index 65fa71205e83f8800ff0103f6397b9657842bc60..0000000000000000000000000000000000000000
--- a/libs/extlib/optParse.mli
+++ /dev/null
@@ -1,466 +0,0 @@
-(*
- * optParse - Functions for parsing command line arguments.
- * Copyright (C) 2004 Bardur Arantsson
- *
- * Heavily influenced by the optparse.py module from the Python
- * standard library, but with lots of adaptation to the 'Ocaml Way'
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Modules for GNU [getopt(3)]-style command line parsing. *)
-
-
-(** This module contains the basic functions and types for defining
-  new option types and accessing the values of options. *)
-module Opt :
-  sig
-
-    (** {6 Exceptions} *)
-
-    exception No_value
-    (** [No_value] gets raised by {!OptParse.Opt.get} when an option
-      value is not available. *)
-
-    exception Option_error of string * string
-    (** This exception signals that an option value is invalid. The
-      first string contains the option string ('-x' or '--long-name')
-      and the second string contains an error message.
-
-      This exception is only used when implementing custom option types
-      and can never "escape" the scope of a {!OptParse.OptParser.parse}.
-      The user should therefore not attempt to catch it.  *)
-
-    exception Option_help
-    (** When an option wants to display a usage message, this exception
-      may be raised.  It can never "escape" the scope of a
-      {!OptParse.OptParser.parse} call and the user should therefore not
-      attempt to catch it. *)
-
-
-    (** {6 Types} *)
-
-    type 'a t = {
-      option_set : string -> string list -> unit;
-      option_set_value : 'a -> unit;
-      option_get : unit -> 'a option;
-      option_metavars : string list;
-      option_defhelp : string option
-    }
-    (** Option type.
-
-      [option_set] is a closure which converts and records the value of
-      an option so that it can be retrieved with a later call to the
-      [option_get] closure. It is called with the option name which was
-      given on the command line and a list of strings, each representing
-      one of the argument values given on the command line. It may raise
-      [Option_error] if the value is invalid (for whatever reason).
-
-      [option_set_value] is a closure which sets the value of an option
-      to a particular value.
-
-      [option_get] is a closure which retrieves the recorded value
-      of the option. If the option value has not been set from the
-      command line, the default value is used.  If there is no default
-      value, then [None] should be returned.
-
-      [option_metavars] is a list of "meta-variables" (arguments)
-      which this option accepts. This is mainly for display purposes,
-      but the length of this list determines how many arguments the
-      option parser accepts for this option (currently only lists of
-      length 0 or 1 are supported).
-
-      [option_defhelp] is the default help string (if any).  It is
-      used for displaying help messages whenever the user does {b
-      not} specify a help string manually when adding this
-      option. Using a non-None value here only makes sense for
-      completely generic options like {!OptParse.StdOpt.help_option}.
-
-    *)
-
-
-    (** {6 Option value retrieval} *)
-
-    val get : 'a t -> 'a
-    (** Get the value of an option.
-
-      @return the value of the option. If the option has not been
-      encountered while parsing the command line, the default value is
-      returned.
-
-      @raise No_value if no default values has been given
-      and the option value has not been set from the command line.
-
-    *)
-
-    val set : 'a t -> 'a -> unit
-    (** Set the value of an option. *)
-
-    val opt : 'a t -> 'a option
-    (** Get the value of an option as an optional value.
-
-      @return [Some x] if the option has value [x] (either by default or
-      from the command line). If the option doesn't have a value [None]
-      is returned. *)
-
-    val is_set : 'a t -> bool
-    (** Find out if the option has a value (either by default or
-      from the command line).
-
-      @return [True] iff the option has a value.
-    *)
-
-
-
-    (** {6 Option creation} *)
-
-    val value_option :
-      string -> 'a option -> (string -> 'a) -> (exn -> string -> string) ->
-        'a t
-    (** Make an option which takes a single argument.
-
-      [value_option metavar default coerce errfmt] returns an option
-      which takes a single argument from the command line and calls
-      [coerce] to coerce it to the proper type. If [coerce] raises an
-      exception, [exn], then [errfmt exn argval] is called to generate
-      an error message for display. [metavar] is the name of the
-      metavariable of the option.
-
-      [default] is the default value of the option. If [None], the the
-      option has no default value.
-
-      @return the newly created option.
-
-    *)
-
-    val callback_option :
-      string -> (string -> 'a) -> (exn -> string -> string) -> ('a -> unit) ->
-        unit t
-    (** Make a callback option which takes a single argument.
-
-      [callback_option metavar coerce errfmt f] returns an option which
-      takes a single argument from the command line and calls [coerce]
-      to coerce it to the proper type. If [coerce] raises an exception
-      [errfmt exn argval] is called to format an error message for
-      display. If [coerce] succeeds, the callback function [f] is called
-      with the coerced value. Finally, [metavar] is the name of the
-      metavariable of the option.
-
-      @return the newly created option.
-    *)
-
-
-  end
-
-
-(** This module contains various standard options. *)
-module StdOpt :
-  sig
-
-    (** {6 Flag options} *)
-
-    val store_const : ?default: 'a -> 'a -> 'a Opt.t
-    (** [store_const ?default const] returns a flag option which
-      stores the constant value [const] when the option is
-      encountered on the command line. *)
-
-    val store_true : unit -> bool Opt.t
-    (** [store_true ()] returns an option which is set to true when
-      it is encountered on the command line. The default value is
-      false. *)
-
-    val store_false : unit -> bool Opt.t
-    (** [store_false ()] returns an option which is set to false when
-      it is encountered on the command line. The default value is
-      true. *)
-
-    val count_option : ?dest: int ref -> ?increment: int -> unit -> int Opt.t
-    (** Create a counting option which increments its value each time the
-      option is encountered on the command line.
-
-      @param increment Increment to add to the option value each
-      time the option is encountered.
-
-      @param dest Reference to the option value. Useful for making
-      options like '--quiet' and '--verbose' sharing a single value.
-
-      @return the newly created option.
-    *)
-
-    val incr_option : ?dest: int ref -> unit -> int Opt.t
-    (** Exactly identical to [count_option ~dest:dest ~increment:1 ()]. *)
-
-    val decr_option : ?dest: int ref -> unit -> int Opt.t
-    (** Exactly identical to [count_option ~dest:dest ~increment:(-1) ()]. *)
-
-
-    (** {6 Value options} *)
-
-    val int_option : ?default: int -> ?metavar: string -> unit -> int Opt.t
-    (** [int_option ?default ?metavar ()] returns an option which takes
-      a single integer argument. If [~default] is given it is the
-      default value returned when the option has not been encountered
-      on the command line. *)
-
-    val float_option :
-      ?default: float -> ?metavar: string -> unit -> float Opt.t
-    (** See {!OptParse.StdOpt.int_option}. *)
-
-    val str_option :
-      ?default: string -> ?metavar: string -> unit -> string Opt.t
-    (** See {!OptParse.StdOpt.int_option}. *)
-
-
-    (** {6 Callback options} *)
-
-    val int_callback : ?metavar: string -> (int -> unit) -> unit Opt.t
-    (** [int_callback ?metavar f] returns an option which takes a single
-      integer argument and calls [f] with that argument when encountered
-      on the command line. *)
-
-    val float_callback : ?metavar: string -> (float -> unit) -> unit Opt.t
-    (** See {!OptParse.StdOpt.int_callback}. *)
-
-    val str_callback : ?metavar: string -> (string -> unit) -> unit Opt.t
-    (** See {!OptParse.StdOpt.int_callback}. *)
-
-
-    (** {6 Special options} *)
-
-    val help_option : unit -> 'a Opt.t
-    (** [help_option ()] returns the standard help option which
-      displays a usage message and exits the program when encountered
-      on the command line. *)
-
-    val version_option : (unit -> string) -> 'a Opt.t
-    (** [version_option f] returns the standard version option which
-      displays the string returned by [f ()] (and nothing else) on
-      standard output and exits. *)
-
-  end
-
-
-(** This module contains the types and functions for implementing
-  custom usage message formatters. *)
-module Formatter :
-  sig
-    type t = {
-      indent : unit -> unit; (** Increase the indentation level. *)
-      dedent : unit -> unit; (** Decrease the indentation level. *)
-      format_usage : string -> string; (** Format usage string into style of this formatter. *)
-      format_heading : string -> string; (** Format heading into style of this formatter. *)
-      format_description : string -> string; (** Format description into style of this formatter. *)
-      format_option :
-        char list * string list -> string list -> string option -> string (** Format option into style of this formatter (see explanation below). *)
-    }
-
-    (** This is the type of a formatter. The [format_option] has
-      signature [format_option (snames,lnames) metavars help], where
-      [snames] is a list of the short option names, [lnames] is a
-      list of the long option names, [metavars] is a list of the
-      metavars the option takes as arguments, and [help] is the help
-      string supplied by the user.  *)
-
-
-    (** {6 Standard formatters} *)
-
-
-    val indented_formatter :
-      ?level: int ref -> ?indent: int ref -> ?indent_increment: int ->
-        ?max_help_position: int -> ?width: int -> ?short_first: bool ->
-        unit -> t
-    (** Create an "indented" formatter with the given options.
-
-      @param width Total with of the usage messages printed.
-
-      @param max_help_position Maximum starting column for the help
-      messages relating to each option.
-
-      @param short_first List all the short option names first?
-
-      @param indent_increment Number of columns to indent by when
-      more indentation is required.
-
-      @param indent Reference to the current indentation amount. Its
-      value reflects changes in indentation level.
-
-      @param level Reference to the current indentation level. Its
-      value reflects changes in indentation level.  *)
-
-    val titled_formatter : ?level: int ref -> ?indent: int ref ->
-      ?indent_increment: int -> ?max_help_position: int ->
-      ?width: int -> ?short_first: bool -> unit -> t
-    (** Creates a titled formatter which is quite similar to the
-      indented formatter. See
-      {!OptParse.Formatter.indented_formatter} for a description of
-      the options. *)
-
-
-    (** {6 Low-level formatting} *)
-
-
-    val wrap : ?initial_indent: int -> ?subsequent_indent: int ->
-      string -> int -> string list
-    (** [wrap text width] reflows the given text paragraph into lines
-      of width at most [width] (lines may exceed this if the are
-      single words that exceed this limit).
-
-      @param initial_indent Indentation of the first line.
-
-      @param subsequent_indent Indentation of the following lines.
-
-      @return a list of lines making up the reformatted paragraph. *)
-
-    val fill : ?initial_indent: int -> ?subsequent_indent: int ->
-      string -> int -> string
-    (** See {!OptParse.Formatter.wrap}.
-
-      @return a string containing the reformatted paragraph. *)
-
-  end
-
-
-
-(** This module contains the option parser itself.
-
-  It provides functions to create, populate and use option parsers to
-  parse command line arguments. *)
-module OptParser :
-  sig
-
-    (** {6 Exceptions} *)
-
-
-    exception Option_conflict of string
-    (** [Option_conflic name] is raised by {!OptParse.OptParser.add}
-      when two different options are added with identical
-      names. Usually this doesn't need to be caught since this error
-      is usually easily fixed permanently by removing/renaming the
-      conflicting option names. *)
-
-
-    (** {6 Types} *)
-
-
-    type t
-    (** The type of an option parser. *)
-
-    type group
-    (** The type of an option group. *)
-
-
-    (** {6 Option parser creation} *)
-
-    val make : ?usage: string -> ?description: string -> ?version: string ->
-      ?suppress_usage: bool -> ?suppress_help: bool -> ?prog: string ->
-      ?formatter: Formatter.t -> unit -> t
-    (** Creates a new option parser with the given options.
-
-      @param usage Usage message. The default is a reasonable usage
-      message for most programs. Any occurrence of the substring
-      ["%prog"] in [usage] is replaced with the name of the program
-      (see [prog]).
-
-      @param prog Program name. The default is the base name of the
-      executable.
-
-      @param suppress_usage Suppress the usage message if set.
-
-      @param suppress_help Suppress the 'help' option which is
-      otherwise added by default.
-
-      @param version Version string. If set, a '--version' option is
-      automatically added. When encountered on the command line it
-      causes [version] to be printed to the standard output and the
-      program to exit.
-
-      @param description: description of the main purpose of the
-      program.
-
-      @return the new option parser.
-
-    *)
-
-
-    val add : t -> ?group: group -> ?help: string -> ?hide: bool ->
-        ?short_name: char -> ?short_names: char list -> ?long_name: string ->
-        ?long_names: string list -> 'a Opt.t -> unit
-    (** Add an option to the option parser.
-
-      @raise Option_conflict if the short name(s) or long name(s)
-      have alread been used for some other option.
-
-      @param help Short help message describing the option (for the usage message).
-
-      @param hide If true, hide the option from the usage
-      message. This can be used to implement "secret" options which
-      are not shown, but work just the same as regular options in all
-      other respects.
-
-      @param short_name is the name for the short form of the option
-      (e.g. ['x'] means that the option is invoked with [-x] on the
-      command line).
-
-      @param short_names is a list of names for the short form of the
-      option (see [short_name]).
-
-      @param long_name is the name for the long form of the option
-      (e.g. ["xyzzy"] means that the option is invoked with [--xyzzy]
-      on the command line).
-
-      @param long_names is a list of names for the long form of the
-      option (see [long_name]).
-    *)
-
-
-    val add_group : t -> ?parent: group -> ?description: string ->
-      string -> group
-    (** Add a group to the option parser.
-
-      @param parent is the parent group (if any).
-
-      @param description is a description of the group.
-
-      @return the new group.
-
-    *)
-
-    (** {6 Output and error handling} *)
-
-    val error : t -> ?chn: out_channel -> ?status: int -> string -> unit
-    (** Display an error message and exit the program. The error
-      message is printed to the channel [chn] (default is
-      [Pervasives.stderr]) and the program exits with exit status
-      [status] (default is 1). *)
-
-    val usage : t -> ?chn: out_channel -> unit -> unit
-    (** Display the usage message to the channel [chn] (default is
-      [Pervasives.stdout]) and return. *)
-
-
-    (** {6 Option parsing} *)
-
-    val parse : t -> ?first: int -> ?last: int -> string array -> string list
-    (** Parse arguments as if the arguments [args.(first)],
-      [args.(first+1)], ..., [args.(last)] had been given on the
-      command line. By default [first] is 0 and [last] is the index
-      of the last element of the array. *)
-
-    val parse_argv : t -> string list
-    (** Parse all the arguments in [Sys.argv]. *)
-
-  end
diff --git a/libs/extlib/option.ml b/libs/extlib/option.ml
deleted file mode 100644
index 46601008a8eb2afb6477619eaa7ec488d6a06998..0000000000000000000000000000000000000000
--- a/libs/extlib/option.ml
+++ /dev/null
@@ -1,49 +0,0 @@
-(*
- * Option - functions for the option type
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
- 
-exception No_value
-
-let may f = function
-	| None -> ()
-	| Some v -> f v
-
-let map f = function
-	| None -> None
-	| Some v -> Some (f v)
-
-let default v = function
-	| None -> v
-	| Some v -> v
-
-let is_some = function
-	| None -> false
-	| _ -> true
-
-let is_none = function
-	| None -> true
-	| _ -> false
-
-let get = function
-	| None -> raise No_value
-	| Some v -> v
-
-let map_default f v = function
-	| None -> v
-	| Some v2 -> f v2
diff --git a/libs/extlib/option.mli b/libs/extlib/option.mli
deleted file mode 100644
index 21960d6833ffe709f5f521b028de184052512432..0000000000000000000000000000000000000000
--- a/libs/extlib/option.mli
+++ /dev/null
@@ -1,53 +0,0 @@
-(*
- * Options - functions for the option type
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Functions for the option type.
-
-    Options are an Ocaml standard type that can be either [None] (undefined)
-	or [Some x] where x can be any value. Options are widely used in Ocaml
-	to represent undefined values (a little like NULL in C, but in a type
-	and memory safe way). This module adds some functions for working with
-	options.
-*)
-
-val may : ('a -> unit) -> 'a option -> unit
-(** [may f (Some x)] calls [f x] and [may f None] does nothing. *)
-
-val map : ('a -> 'b) -> 'a option -> 'b option
-(** [map f (Some x)] returns [Some (f x)] and [map None] returns [None]. *)
-
-val default : 'a -> 'a option -> 'a
-(** [default x (Some v)] returns [v] and [default x None] returns [x]. *)
-
-val map_default : ('a -> 'b) -> 'b -> 'a option -> 'b
-(** [map_default f x (Some v)] returns [f v] and [map_default f x None]
-	returns [x]. *)
-
-val is_none : 'a option -> bool
-(** [is_none None] returns [true] otherwise it returns [false]. *)
-
-val is_some : 'a option -> bool
-(** [is_some (Some x)] returns [true] otherwise it returns [false]. *)
-
-val get : 'a option -> 'a
-(** [get (Some x)] returns [x] and [get None] raises [No_value]. *)
-
-exception No_value
-(** Raised when calling [get None]. *)
diff --git a/libs/extlib/pMap.ml b/libs/extlib/pMap.ml
deleted file mode 100644
index c6dcbc7544eedc1c036a651fcbe44bc91aaf4e93..0000000000000000000000000000000000000000
--- a/libs/extlib/pMap.ml
+++ /dev/null
@@ -1,197 +0,0 @@
-(*
- * PMap - Polymorphic maps
- * Copyright (C) 1996-2003 Xavier Leroy, Nicolas Cannasse, Markus Mottl
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-type ('k, 'v) map =
-  | Empty
-  | Node of ('k, 'v) map * 'k * 'v * ('k, 'v) map * int
-
-type ('k, 'v) t =
-  {
-    cmp : 'k -> 'k -> int;
-    map : ('k, 'v) map;
-  }
-
-let height = function
-  | Node (_, _, _, _, h) -> h
-  | Empty -> 0
-
-let make l k v r = Node (l, k, v, r, max (height l) (height r) + 1)
-
-let bal l k v r =
-  let hl = height l in
-  let hr = height r in
-  if hl > hr + 2 then
-    match l with
-    | Node (ll, lk, lv, lr, _) ->
-        if height ll >= height lr then make ll lk lv (make lr k v r)
-        else
-          (match lr with
-          | Node (lrl, lrk, lrv, lrr, _) ->
-              make (make ll lk lv lrl) lrk lrv (make lrr k v r)
-          | Empty -> assert false)
-    | Empty -> assert false
-  else if hr > hl + 2 then
-    match r with
-    | Node (rl, rk, rv, rr, _) ->
-        if height rr >= height rl then make (make l k v rl) rk rv rr
-        else
-          (match rl with
-          | Node (rll, rlk, rlv, rlr, _) ->
-              make (make l k v rll) rlk rlv (make rlr rk rv rr)
-          | Empty -> assert false)
-    | Empty -> assert false
-  else Node (l, k, v, r, max hl hr + 1)
-
-let rec min_binding = function
-  | Node (Empty, k, v, _, _) -> k, v
-  | Node (l, _, _, _, _) -> min_binding l
-  | Empty -> raise Not_found
-
-let rec remove_min_binding = function
-  | Node (Empty, _, _, r, _) -> r
-  | Node (l, k, v, r, _) -> bal (remove_min_binding l) k v r
-  | Empty -> invalid_arg "PMap.remove_min_binding"
-
-let merge t1 t2 =
-  match t1, t2 with
-  | Empty, _ -> t2
-  | _, Empty -> t1
-  | _ ->
-      let k, v = min_binding t2 in
-      bal t1 k v (remove_min_binding t2)
-
-let create cmp = { cmp = cmp; map = Empty }
-let empty = { cmp = compare; map = Empty }
-
-let is_empty x = 
-	x.map = Empty
-
-let add x d { cmp = cmp; map = map } =
-  let rec loop = function
-    | Node (l, k, v, r, h) ->
-        let c = cmp x k in
-        if c = 0 then Node (l, x, d, r, h)
-        else if c < 0 then
-          let nl = loop l in
-          bal nl k v r
-        else
-          let nr = loop r in
-          bal l k v nr
-    | Empty -> Node (Empty, x, d, Empty, 1) in
-  { cmp = cmp; map = loop map }
-
-let find x { cmp = cmp; map = map } =
-  let rec loop = function
-    | Node (l, k, v, r, _) ->
-        let c = cmp x k in
-        if c < 0 then loop l
-        else if c > 0 then loop r
-        else v
-    | Empty -> raise Not_found in
-  loop map
-
-let remove x { cmp = cmp; map = map } =
-  let rec loop = function
-    | Node (l, k, v, r, _) ->
-        let c = cmp x k in
-        if c = 0 then merge l r else
-        if c < 0 then bal (loop l) k v r else bal l k v (loop r)
-    | Empty -> Empty in
-  { cmp = cmp; map = loop map }
-
-let mem x { cmp = cmp; map = map } =
-  let rec loop = function
-    | Node (l, k, v, r, _) ->
-        let c = cmp x k in
-        c = 0 || loop (if c < 0 then l else r)
-    | Empty -> false in
-  loop map
-
-let exists = mem
-
-let iter f { map = map } =
-  let rec loop = function
-    | Empty -> ()
-    | Node (l, k, v, r, _) -> loop l; f k v; loop r in
-  loop map
-
-let map f { cmp = cmp; map = map } =
-  let rec loop = function
-    | Empty -> Empty
-    | Node (l, k, v, r, h) -> 
-	  let l = loop l in
-	  let r = loop r in
-	  Node (l, k, f v, r, h) in
-  { cmp = cmp; map = loop map }
-
-let mapi f { cmp = cmp; map = map } =
-  let rec loop = function
-    | Empty -> Empty
-    | Node (l, k, v, r, h) ->
-	  let l = loop l in
-	  let r = loop r in
-	  Node (l, k, f k v, r, h) in
-  { cmp = cmp; map = loop map }
-
-let fold f { cmp = cmp; map = map } acc =
-  let rec loop acc = function
-    | Empty -> acc
-    | Node (l, k, v, r, _) ->
-	  loop (f v (loop acc l)) r in
-  loop acc map
-
-let foldi f { cmp = cmp; map = map } acc =
-  let rec loop acc = function
-    | Empty -> acc
-	| Node (l, k, v, r, _) ->
-       loop (f k v (loop acc l)) r in
-  loop acc map
-
-let rec enum m =
-  let rec make l =
-    let l = ref l in
-    let rec next() =
-      match !l with
-      | [] -> raise Enum.No_more_elements
-      | Empty :: tl -> l := tl; next()
-      | Node (m1, key, data, m2, h) :: tl ->
-        l := m1 :: m2 :: tl;
-        (key, data)
-    in
-    let count() =
-      let n = ref 0 in
-      let r = !l in
-      try
-        while true do
-          ignore (next());
-          incr n
-        done;
-        assert false
-      with
-		Enum.No_more_elements -> l := r; !n
-    in
-    let clone() = make !l in
-	Enum.make ~next ~count ~clone
-  in
-  make [m.map]
-
-
-let uncurry_add (k, v) m = add k v m
-let of_enum ?(cmp = compare) e = Enum.fold uncurry_add (create cmp) e
diff --git a/libs/extlib/pMap.mli b/libs/extlib/pMap.mli
deleted file mode 100644
index 0e703d84d80395f51f949f22649dca5dc7fc29d8..0000000000000000000000000000000000000000
--- a/libs/extlib/pMap.mli
+++ /dev/null
@@ -1,92 +0,0 @@
-(*
- * PMap - Polymorphic maps
- * Copyright (C) 1996-2003 Xavier Leroy, Nicolas Cannasse, Markus Mottl
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Polymorphic Map.
-
-	This is a polymorphic map, similar to standard library [Map] module
-	but in a defunctorized style.
-*)
-
-type ('a, 'b) t
-
-val empty : ('a, 'b) t
-(** The empty map, using [compare] as key comparison function. *)
-
-val is_empty : ('a, 'b) t -> bool
-(** returns true if the map is empty. *)
-
-val create : ('a -> 'a -> int) -> ('a, 'b) t
-(** creates a new empty map, using the provided function for key comparison.*)
-
-val add : 'a -> 'b -> ('a, 'b) t -> ('a, 'b) t
-(** [add x y m] returns a map containing the same bindings as
-    [m], plus a binding of [x] to [y]. If [x] was already bound
-    in [m], its previous binding disappears. *)
-
-val find : 'a -> ('a, 'b) t -> 'b
-(** [find x m] returns the current binding of [x] in [m],
-    or raises [Not_found] if no such binding exists. *)
-
-val remove : 'a -> ('a, 'b) t -> ('a, 'b) t
-(** [remove x m] returns a map containing the same bindings as
-    [m], except for [x] which is unbound in the returned map. *)
-
-val mem : 'a -> ('a, 'b) t -> bool
-(** [mem x m] returns [true] if [m] contains a binding for [x],
-    and [false] otherwise. *)
-
-val exists : 'a -> ('a, 'b) t -> bool
-(** same as [mem]. *)
-
-val iter : ('a -> 'b -> unit) -> ('a, 'b) t -> unit
-(** [iter f m] applies [f] to all bindings in map [m].
-    [f] receives the key as first argument, and the associated value
-    as second argument. The order in which the bindings are passed to
-    [f] is unspecified. Only current bindings are presented to [f]:
-    bindings hidden by more recent bindings are not passed to [f]. *)
-
-val map : ('b -> 'c) -> ('a, 'b) t -> ('a, 'c) t
-(** [map f m] returns a map with same domain as [m], where the
-    associated value [a] of all bindings of [m] has been
-    replaced by the result of the application of [f] to [a].
-    The order in which the associated values are passed to [f]
-    is unspecified. *)
-
-val mapi : ('a -> 'b -> 'c) -> ('a, 'b) t -> ('a, 'c) t
-(** Same as [map], but the function receives as arguments both the
-    key and the associated value for each binding of the map. *)
-
-val fold : ('b -> 'c -> 'c) -> ('a , 'b) t -> 'c -> 'c
-(** [fold f m a] computes [(f kN dN ... (f k1 d1 a)...)],
-    where [k1 ... kN] are the keys of all bindings in [m],
-    and [d1 ... dN] are the associated data.
-    The order in which the bindings are presented to [f] is
-    unspecified. *)
-
-val foldi : ('a -> 'b -> 'c -> 'c) -> ('a , 'b) t -> 'c -> 'c
-(** Same as [fold], but the function receives as arguments both the
-    key and the associated value for each binding of the map. *)
-
-val enum : ('a, 'b) t -> ('a * 'b) Enum.t
-(** creates an enumeration for this map. *)
-
-val of_enum : ?cmp:('a -> 'a -> int) -> ('a * 'b) Enum.t -> ('a, 'b) t
-(** creates a map from an enumeration, using the specified function
-  for key comparison or [compare] by default. *)
diff --git a/libs/extlib/refList.ml b/libs/extlib/refList.ml
deleted file mode 100644
index c031cebb530dbcaa84cc4270e590000405d8768f..0000000000000000000000000000000000000000
--- a/libs/extlib/refList.ml
+++ /dev/null
@@ -1,139 +0,0 @@
-(*
- * RefList - List reference
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-open ExtList
-
-exception Empty_list
-exception Invalid_index of int
-
-type 'a t = 'a list ref
-
-let empty () = ref []
-
-let is_empty x =
-	match !x with
-	| [] -> true
-	| _ -> false
-
-let of_list l = ref l
-let to_list rl = !rl
-let copy ~dst ~src = dst := !src
-let copy_list ~dst ~src = dst := src
-
-let add rl item = rl := List.append !rl [item]
-let push rl item = rl := item::!rl
-
-let clear rl = rl := []
-
-let length rl = List.length !rl
-let hd rl = try List.hd !rl with _ -> raise Empty_list
-let tl rl = try ref (List.tl !rl) with _ -> raise Empty_list
-let iter f rl = List.iter f !rl
-let for_all f rl = List.for_all f !rl
-let map f rl = ref (List.map f !rl)
-let transform f rl = rl := List.map f !rl
-let map_list f rl = List.map f !rl
-let find f rl = List.find f !rl
-let rev rl = rl := List.rev !rl
-let find_exc f exn rl = try List.find f !rl with _ -> raise exn
-let exists f rl = List.exists f !rl
-let sort ?(cmp=compare) rl = rl := List.sort ~cmp !rl
-
-let rfind f rl = List.rfind f !rl
-
-let first = hd
-
-let last rl = 
-	let rec loop = function
-		| x :: [] -> x
-		| x :: l -> loop l
-		| [] -> assert false
-	in
-	match !rl with
-	| [] -> raise Empty_list
-	| l -> loop l
-
-let remove rl item = rl := List.remove !rl item
-let remove_if pred rl = rl := List.remove_if pred !rl
-let remove_all rl item = rl := List.remove_all !rl item
-let filter pred rl = rl := List.filter pred !rl
-
-let add_sort ?(cmp=compare) rl item =
-	let rec add_aux = function
-		| x::lnext as l ->
-			let r = cmp x item in
-			if r < 0 then item::l else x::(add_aux lnext)
-		| [] -> [item]
-	in
-	rl := add_aux !rl
-
-let pop rl =
-	match !rl with
-	| [] -> raise Empty_list
-	| e::l -> rl := l; e
-
-let npop rl n =		
-	let rec pop_aux l n =
-		if n = 0 then begin
-			rl := l;
-			[]
-		end else
-			match l with
-			| [] -> raise Empty_list
-			| x::l -> x::(pop_aux l (n-1))
-	in
-	pop_aux !rl n
-
-let copy_enum ~dst ~src = dst := List.of_enum src
-let enum rl = List.enum !rl
-let of_enum e = ref (List.of_enum e)
-
-module Index = struct
-
-	let remove_at rl pos =
-		let p = ref (-1) in
-		let rec del_aux = function			
-			| x::l -> incr p; if !p = pos then l else x::(del_aux l)
-			| [] -> raise (Invalid_index pos)
-		in
-		rl := del_aux !rl
-
-	let index pred rl =
-		let index = ref (-1) in
-		List.find (fun it -> incr index; pred it; ) !rl;
-		!index
-
-	let index_of rl item =
-		let index = ref (-1) in
-		List.find (fun it -> incr index; it = item; ) !rl;
-		!index
-
-	let at_index rl pos =
-		try
-			List.nth !rl pos
-		with
-			_ -> raise (Invalid_index pos)
-
-	let set rl pos newitem =
-		let p = ref (-1) in
-		rl := List.map (fun item -> incr p; if !p = pos then newitem else item) !rl;
-		if !p < pos || pos < 0 then raise (Invalid_index pos)
-
-
-end
diff --git a/libs/extlib/refList.mli b/libs/extlib/refList.mli
deleted file mode 100644
index fac93435168c1b63c8e180ae8818ff6d768e5267..0000000000000000000000000000000000000000
--- a/libs/extlib/refList.mli
+++ /dev/null
@@ -1,201 +0,0 @@
-(*
- * RefList - List reference
- * Copyright (C) 2003 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Reference on lists.
-
-  RefList is a extended set of functions that manipulate list
-  references.
-*)
-
-exception Empty_list
-exception Invalid_index of int
-
-type 'a t
-
-val empty : unit -> 'a t
-(** Returns a new empty ref list *)
-  
-val is_empty : 'a t -> bool
-(** Return [true] if a ref list is empty *)
-
-val clear : 'a t -> unit
-(** Removes all elements *)
-
-val length : 'a t -> int
-(** Returns the number of elements - O(n) *)
-
-val copy : dst:'a t -> src:'a t -> unit
-(** Makes a copy of a ref list - O(1) *)
-
-val copy_list : dst:'a t -> src:'a list -> unit
-(** Makes a copy of a list - O(1) *)
-
-val copy_enum : dst:'a t -> src:'a Enum.t -> unit
-(** Makes a copy of a enum *)
-
-val of_list : 'a list -> 'a t
-(** Creates a ref list from a list - O(1) *)
-
-val to_list : 'a t -> 'a list
-(** Returns the current elements as a list - O(1) *)
-
-val of_enum : 'a Enum.t -> 'a t
-(** Creates a ref list from an enumeration *)
-
-val enum : 'a t -> 'a Enum.t
-(** Returns an enumeration of current elements in the ref list *)
-
-val add : 'a t -> 'a -> unit
-(** Adds an element at the end - O(n) *)
-
-val push : 'a t -> 'a -> unit
-(** Adds an element at the head - O(1) *)
-
-val add_sort : ?cmp:('a -> 'a -> int) -> 'a t -> 'a -> unit
-(** Adds an element in a sorted list, using optional comparator
-    or 'compare' as default. *)
-
-val first : 'a t -> 'a
-(** Returns the first element or
-    raises [Empty_list] if the ref list is empty *)
-
-val last : 'a t -> 'a
-(** Returns the last element - O(n) or
-    raises Empty_list if the ref list is empty *)
-
-val pop : 'a t -> 'a
-(** Removes and returns the first element or
-   raises [Empty_list] if the ref list is empty *)
-
-val npop : 'a t -> int -> 'a list
-(** Removes and returns the n first elements or
-   raises [Empty_list] if the ref list does not
-   contain enough elements *)
-
-val hd : 'a t -> 'a
-(** same as [first] *)
-
-val tl : 'a t -> 'a t
-(** Returns a ref list containing the same elements
-    but without the first one or
-    raises [Empty_list] if the ref list is empty *)
-
-val rev : 'a t -> unit
-(** Reverses the ref list - O(n) *)
-
-(** {6 Functional Operations} *)
-
-val iter : ('a -> unit) -> 'a t -> unit
-(** Apply the given function to all elements of the
-    ref list, in respect with the order of the list *)
-
-val find : ('a -> bool) -> 'a t -> 'a
-(** Find the first element matching
-    the specified predicate
-    raise [Not_found] if no element is found *)
-
-val rfind : ('a -> bool) -> 'a t -> 'a
-(** Find the first element in the reversed ref list matching
-    the specified predicate
-    raise [Not_found] if no element is found *)
-
-val find_exc : ('a -> bool) -> exn -> 'a t -> 'a
-(** Same as find but takes an exception to be raised when
-    no element is found as additional parameter *)
-
-val exists : ('a -> bool) -> 'a t -> bool
-(** Return [true] if an element matches the specified
-    predicate *)
-
-val for_all : ('a -> bool) -> 'a t -> bool
-(** Return [true] if all elements match the specified
-    predicate *)
-
-val map : ('a -> 'b) -> 'a t -> 'b t
-(** Apply a function to all elements
-    and return the ref list constructed with
-    the function returned values *)
-
-val transform : ('a -> 'a) -> 'a t -> unit
-(** transform all elements in the ref list
-    using a function. *)
-
-val map_list : ('a -> 'b) -> 'a t -> 'b list
-(** Apply a function to all elements
-    and return the list constructed with
-    the function returned values *)
-
-val sort : ?cmp:('a -> 'a -> int) -> 'a t -> unit
-(** Sort elements using the specified comparator
-    or compare as default comparator *)
-
-val filter : ('a -> bool) -> 'a t -> unit
-(** Remove all elements that do not match the
-    specified predicate *)
-
-val remove : 'a t -> 'a -> unit
-(** Remove an element from the ref list
-    raise [Not_found] if the element is not found *)
-
-val remove_if : ('a -> bool) -> 'a t -> unit
-(** Remove the first element matching the
-    specified predicate
-    raise [Not_found] if no element has been removed *)
-
-val remove_all : 'a t -> 'a -> unit
-(** Remove all elements equal to the specified
-    element from the ref list *)
-
-
-
-(** Functions that operate on the [i]th element of a list.
-
-    While it is sometimes necessary to perform these
-    operations on lists (hence their inclusion here), the
-    functions were moved to an inner module to prevent
-    their overuse: all functions work in O(n) time. You
-	might prefer to use [Array] or [DynArray] for constant
-	time indexed element access.
-*)
-module Index : sig
-
-	val index_of : 'a t -> 'a -> int
-	(** Return the index (position : 0 starting) of an element in
-	    a ref list, using ( = ) for testing element equality
-	    raise [Not_found] if no element was found *)
-
-	val index : ('a -> bool) -> 'a t -> int
-	(** Return the index (position : 0 starting) of an element in
-	    a ref list, using the specified comparator
-	    raise [Not_found] if no element was found *)
-
-	val at_index : 'a t -> int -> 'a
-	(** Return the element of ref list at the specified index
-	    raise [Invalid_index] if the index is outside [0 ; length-1] *)
-
-	val set : 'a t -> int -> 'a -> unit
-	(** Change the element at the specified index
-	    raise [Invalid_index] if the index is outside [0 ; length-1] *)
-
-	val remove_at : 'a t -> int -> unit
-	(** Remove the element at the specified index
-	    raise [Invalid_index] if the index is outside [0 ; length-1] *)
-
-end
diff --git a/libs/extlib/sMap.ml b/libs/extlib/sMap.ml
deleted file mode 100644
index 025f3cc4ddcf38309cddea869436a5a3c8b39084..0000000000000000000000000000000000000000
--- a/libs/extlib/sMap.ml
+++ /dev/null
@@ -1,169 +0,0 @@
-(*
- * SMap - Fast String maps
- * Copyright (C) 2016 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-type 'a t =
-  | Empty
-  | Node of 'a t * string * 'a * 'a t * int
-
-let height = function
-  | Node (_, _, _, _, h) -> h
-  | Empty -> 0
-
-type bucket =
-	| Eof
-	| Entry of string * int * bucket
-
-let size = 256
-let string_h = Array.make size Eof
-let string_a = DynArray.create()
-
-let string_id s = s
-let id_to_string x = x
-
-let make l k v r = Node (l, k, v, r, max (height l) (height r) + 1)
-
-let bal l k v r =
-  let hl = height l in
-  let hr = height r in
-  if hl > hr + 2 then
-    match l with
-    | Node (ll, lk, lv, lr, _) ->
-        if height ll >= height lr then make ll lk lv (make lr k v r)
-        else
-          (match lr with
-          | Node (lrl, lrk, lrv, lrr, _) ->
-              make (make ll lk lv lrl) lrk lrv (make lrr k v r)
-          | Empty -> assert false)
-    | Empty -> assert false
-  else if hr > hl + 2 then
-    match r with
-    | Node (rl, rk, rv, rr, _) ->
-        if height rr >= height rl then make (make l k v rl) rk rv rr
-        else
-          (match rl with
-          | Node (rll, rlk, rlv, rlr, _) ->
-              make (make l k v rll) rlk rlv (make rlr rk rv rr)
-          | Empty -> assert false)
-    | Empty -> assert false
-  else Node (l, k, v, r, max hl hr + 1)
-
-let rec min_binding = function
-  | Node (Empty, k, v, _, _) -> k, v
-  | Node (l, _, _, _, _) -> min_binding l
-  | Empty -> raise Not_found
-
-let rec remove_min_binding = function
-  | Node (Empty, _, _, r, _) -> r
-  | Node (l, k, v, r, _) -> bal (remove_min_binding l) k v r
-  | Empty -> invalid_arg "PMap.remove_min_binding"
-
-let merge t1 t2 =
-  match t1, t2 with
-  | Empty, _ -> t2
-  | _, Empty -> t1
-  | _ ->
-      let k, v = min_binding t2 in
-      bal t1 k v (remove_min_binding t2)
-
-let empty = Empty
-
-let is_empty x = x = Empty
-
-let add x d map =
-  let x = string_id x in
-  let rec loop = function
-    | Node (l, k, v, r, h) ->
-        if x = k then Node (l, x, d, r, h)
-        else if x < k then
-          let nl = loop l in
-          bal nl k v r
-        else
-          let nr = loop r in
-          bal l k v nr
-    | Empty -> Node (Empty, x, d, Empty, 1) in
-  loop map
-
-let find x map =
-  let x = string_id x in
-  let rec loop = function
-    | Node (l, k, v, r, _) ->
-        if x < k then loop l
-        else if x > k then loop r
-        else v
-    | Empty -> raise Not_found in
-  loop map
-
-let remove x map =
-  let x = string_id x in
-  let rec loop = function
-    | Node (l, k, v, r, _) ->
-        if x = k then merge l r else
-        if x < k then bal (loop l) k v r else bal l k v (loop r)
-    | Empty -> Empty in
-  loop map
-
-let mem x map =
-  let x = string_id x in
-  let rec loop = function
-    | Node (l, k, v, r, _) ->
-        x = k || loop (if x < k then l else r)
-    | Empty -> false in
-  loop map
-
-let exists = mem
-
-let iter f map =
-  let rec loop = function
-    | Empty -> ()
-    | Node (l, k, v, r, _) -> loop l; f (id_to_string k) v; loop r in
-  loop map
-
-let map f map =
-  let rec loop = function
-    | Empty -> Empty
-    | Node (l, k, v, r, h) ->
-	  let l = loop l in
-	  let r = loop r in
-	  Node (l, k, f v, r, h) in
-  loop map
-
-let mapi f map =
-  let rec loop = function
-    | Empty -> Empty
-    | Node (l, k, v, r, h) ->
-	  let l = loop l in
-	  let r = loop r in
-	  Node (l, k, f (id_to_string k) v, r, h) in
-  loop map
-
-let fold f map acc =
-  let rec loop acc = function
-    | Empty -> acc
-    | Node (l, k, v, r, _) ->
-	  loop (f v (loop acc l)) r in
-  loop acc map
-
-let foldi f map acc =
-  let rec loop acc = function
-    | Empty -> acc
-	| Node (l, k, v, r, _) ->
-       loop (f (id_to_string k) v (loop acc l)) r in
-  loop acc map
-
diff --git a/libs/extlib/sMap.mli b/libs/extlib/sMap.mli
deleted file mode 100644
index e35746767945dd02fe93ff84a28a8eb700a2c495..0000000000000000000000000000000000000000
--- a/libs/extlib/sMap.mli
+++ /dev/null
@@ -1,83 +0,0 @@
-(*
- * SMap - Polymorphic maps
- * Copyright (C) 2016 Nicolas Cannasse
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Polymorphic Map.
-
-	This is a polymorphic map, similar to standard library [Map] module
-	but in a defunctorized style.
-*)
-
-type 'a t
-
-val empty : 'a t
-(** The empty map, using [compare] as key comparison function. *)
-
-val is_empty : 'a t -> bool
-(** returns true if the map is empty. *)
-
-val add : string -> 'a -> 'a t -> 'a t
-(** [add x y m] returns a map containing the same bindings as
-    [m], plus a binding of [x] to [y]. If [x] was already bound
-    in [m], its previous binding disappears. *)
-
-val find : string -> 'a t -> 'a
-(** [find x m] returns the current binding of [x] in [m],
-    or raises [Not_found] if no such binding exists. *)
-
-val remove : string -> 'a t -> 'a t
-(** [remove x m] returns a map containing the same bindings as
-    [m], except for [x] which is unbound in the returned map. *)
-
-val mem : string -> 'a t -> bool
-(** [mem x m] returns [true] if [m] contains a binding for [x],
-    and [false] otherwise. *)
-
-val exists : string -> 'a t -> bool
-(** same as [mem]. *)
-
-val iter : (string -> 'a -> unit) -> 'a t -> unit
-(** [iter f m] applies [f] to all bindings in map [m].
-    [f] receives the key as first argument, and the associated value
-    as second argument. The order in which the bindings are passed to
-    [f] is unspecified. Only current bindings are presented to [f]:
-    bindings hidden by more recent bindings are not passed to [f]. *)
-
-val map : ('a -> 'b) -> 'a t -> 'b t
-(** [map f m] returns a map with same domain as [m], where the
-    associated value [a] of all bindings of [m] has been
-    replaced by the result of the application of [f] to [a].
-    The order in which the associated values are passed to [f]
-    is unspecified. *)
-
-val mapi : (string -> 'a -> 'b) -> 'a t -> 'b t
-(** Same as [map], but the function receives as arguments both the
-    key and the associated value for each binding of the map. *)
-
-val fold : ('a -> 'b -> 'b) -> 'a t -> 'b -> 'b
-(** [fold f m a] computes [(f kN dN ... (f k1 d1 a)...)],
-    where [k1 ... kN] are the keys of all bindings in [m],
-    and [d1 ... dN] are the associated data.
-    The order in which the bindings are presented to [f] is
-    unspecified. *)
-
-val foldi : (string -> 'a -> 'b -> 'b) -> 'a t -> 'b -> 'b
-(** Same as [fold], but the function receives as arguments both the
-    key and the associated value for each binding of the map. *)
-
diff --git a/libs/extlib/std.ml b/libs/extlib/std.ml
deleted file mode 100644
index 157bb3724b082e2d6eb7213ef5f186d340445972..0000000000000000000000000000000000000000
--- a/libs/extlib/std.ml
+++ /dev/null
@@ -1,185 +0,0 @@
-(*
- * Std - Additional functions
- * Copyright (C) 2003 Nicolas Cannasse and Markus Mottl
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-let input_lines ch =
-  Enum.from (fun () ->
-    try input_line ch with End_of_file -> raise Enum.No_more_elements)
-
-let input_chars ch =
-  Enum.from (fun () ->
-    try input_char ch with End_of_file -> raise Enum.No_more_elements)
-
-type 'a _mut_list = {
-  hd : 'a;
-  mutable tl : 'a _mut_list;
-}
-
-let input_list ch =
-  let _empty = Obj.magic [] in
-  let rec loop dst =
-    let r = { hd = input_line ch; tl = _empty } in
-    dst.tl <- r;
-    loop r in
-  let r = { hd = Obj.magic(); tl = _empty } in
-  try loop r
-  with
-    End_of_file ->
-      Obj.magic r.tl
-
-let buf_len = 8192
-
-let input_all ic =
-  let rec loop acc total buf ofs =
-    let n = input ic buf ofs (buf_len - ofs) in
-    if n = 0 then
-      let res = String.create total in
-      let pos = total - ofs in
-      let _ = String.blit buf 0 res pos ofs in
-      let coll pos buf =
-        let new_pos = pos - buf_len in
-        String.blit buf 0 res new_pos buf_len;
-        new_pos in
-      let _ = List.fold_left coll pos acc in
-      res
-    else
-      let new_ofs = ofs + n in
-      let new_total = total + n in
-      if new_ofs = buf_len then
-        loop (buf :: acc) new_total (String.create buf_len) 0
-      else loop acc new_total buf new_ofs in
-  loop [] 0 (String.create buf_len) 0
-
-let input_file ?(bin=false) fname =
-  let ch = (if bin then open_in_bin else open_in) fname in
-  let str = input_all ch in
-  close_in ch;
-  str
-
-let output_file ~filename ~text =
-  let ch = open_out filename in
-  output_string ch text;
-  close_out ch
-
-let print_bool = function
-  | true -> print_string "true"
-  | false -> print_string "false"
-
-let prerr_bool = function
-  | true -> prerr_string "true"
-  | false -> prerr_string "false"
-
-let string_of_char c = String.make 1 c
-
-external identity : 'a -> 'a = "%identity"
-
-let rec dump r =
-	if Obj.is_int r then
-		string_of_int (Obj.magic r : int)
-	else (* Block. *)
-	let rec get_fields acc = function
-		| 0 -> acc
-		| n -> let n = n-1 in get_fields (Obj.field r n :: acc) n
-	in
-    let rec is_list r =
-		if Obj.is_int r then
-			r = Obj.repr 0 (* [] *)
-		else
-			let s = Obj.size r and t = Obj.tag r in
-			t = 0 && s = 2 && is_list (Obj.field r 1) (* h :: t *)
-	in
-    let rec get_list r =
-		if Obj.is_int r then
-			[]
-		else 
-			let h = Obj.field r 0 and t = get_list (Obj.field r 1) in
-			h :: t
-    in
-    let opaque name =
-		(* XXX In future, print the address of value 'r'.  Not possible in
-		* pure OCaml at the moment.
-		*)
-		"<" ^ name ^ ">"
-    in
-    let s = Obj.size r and t = Obj.tag r in
-    (* From the tag, determine the type of block. *)
-	match t with 
-	| _ when is_list r ->
-		let fields = get_list r in
-		"[" ^ String.concat "; " (List.map dump fields) ^ "]"
-	| 0 ->
-		let fields = get_fields [] s in
-		"(" ^ String.concat ", " (List.map dump fields) ^ ")"
-	| x when x = Obj.lazy_tag ->
-		(* Note that [lazy_tag .. forward_tag] are < no_scan_tag.  Not
-		* clear if very large constructed values could have the same
-		* tag. XXX *)
-		opaque "lazy"
-	| x when x = Obj.closure_tag ->
-		opaque "closure"
-	| x when x = Obj.object_tag ->
-		let fields = get_fields [] s in
-		let clasz, id, slots =
-			match fields with
-			| h::h'::t -> h, h', t 
-			| _ -> assert false
-		in
-		(* No information on decoding the class (first field).  So just print
-		* out the ID and the slots. *)
-		"Object #" ^ dump id ^ " (" ^ String.concat ", " (List.map dump slots) ^ ")"
-    | x when x = Obj.infix_tag ->
-		opaque "infix"
-    | x when x = Obj.forward_tag ->
-		opaque "forward"
-	| x when x < Obj.no_scan_tag ->
-		let fields = get_fields [] s in
-		"Tag" ^ string_of_int t ^
-		" (" ^ String.concat ", " (List.map dump fields) ^ ")"
-	| x when x = Obj.string_tag ->
-		"\"" ^ String.escaped (Obj.magic r : string) ^ "\""
-	| x when x = Obj.double_tag ->
-		string_of_float (Obj.magic r : float)
-	| x when x = Obj.abstract_tag ->
-		opaque "abstract"
-	| x when x = Obj.custom_tag ->
-		opaque "custom"
-	| x when x = Obj.final_tag ->
-		opaque "final"
-	| _ ->
-		failwith ("Std.dump: impossible tag (" ^ string_of_int t ^ ")")
-
-let dump v = dump (Obj.repr v)
-
-let print v = print_endline (dump v)
-
-let finally handler f x =
-	let r = (
-		try
-			f x
-		with
-			e -> handler(); raise e
-	) in
-	handler();
-	r
-
-let __unique_counter = ref 0
-
-let unique() =
-  incr __unique_counter;
-  !__unique_counter
\ No newline at end of file
diff --git a/libs/extlib/std.mli b/libs/extlib/std.mli
deleted file mode 100644
index ce243161ecad30dc69e2949b49fa51d1e5687bdc..0000000000000000000000000000000000000000
--- a/libs/extlib/std.mli
+++ /dev/null
@@ -1,69 +0,0 @@
-(*
- * Std - Additional functions
- * Copyright (C) 2003 Nicolas Cannasse
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Additional functions. *)
-
-val input_lines : in_channel -> string Enum.t
-(** Returns an enumeration over lines of an input channel, as read by the
- [input_line] function. *)
-
-val input_chars : in_channel -> char Enum.t
-(** Returns an enumeration over characters of an input channel. *)
-
-val input_list : in_channel -> string list
-(** Returns the list of lines read from an input channel. *)
-
-val input_all : in_channel -> string
-(** Return the whole contents of an input channel as a single
- string. *)
-
-val print_bool : bool -> unit
-(** Print a boolean to stdout. *)
-
-val prerr_bool : bool -> unit
-(** Print a boolean to stderr. *)
-
-val input_file : ?bin:bool -> string -> string
-(** returns the data of a given filename. *)
-
-val output_file : filename:string -> text:string -> unit
-(** creates a filename, write text into it and close it. *)
-
-val string_of_char : char -> string
-(** creates a string from a char. *)
-
-external identity : 'a -> 'a = "%identity"
-(** the identity function. *)
-
-val unique : unit -> int
-(** returns an unique identifier every time it is called. *)
-
-val dump : 'a -> string
-(** represent a runtime value as a string. Since types are lost at compile
-	time, the representation might not match your type. For example, None
-	will be printed 0 since they share the same runtime representation. *)
-
-val print : 'a -> unit
-(** print the representation of a runtime value on stdout.
-	See remarks for [dump]. *)
-
-val finally : (unit -> unit) -> ('a -> 'b) -> 'a -> 'b 
-(** finally [fend f x] calls [f x] and then [fend()] even if [f x] raised
-	an exception. *)
diff --git a/libs/extlib/unzip.ml b/libs/extlib/unzip.ml
deleted file mode 100644
index bce81032baadbf8b377f6f4c8d5acec571e54324..0000000000000000000000000000000000000000
--- a/libs/extlib/unzip.ml
+++ /dev/null
@@ -1,449 +0,0 @@
-(*
- * Unzip - inflate format decompression algorithm
- * Copyright (C) 2004 Nicolas Cannasse
- * Compliant with RFC 1950 and 1951
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-type huffman =
-	| Found of int
-	| NeedBit of huffman * huffman
-	| NeedBits of int * huffman array
-
-
-type adler32 = {
-	mutable a1 : int;
-	mutable a2 : int;
-}
-
-type window = {
-	mutable wbuffer : string;
-	mutable wpos : int;
-	wcrc : adler32;
-}
-
-type state =
-	| Head
-	| Block
-	| CData
-	| Flat
-	| Crc
-	| Dist
-	| DistOne
-	| Done
-
-type t = {
-	mutable znbits : int;
-	mutable zbits : int;
-	mutable zstate : state;
-	mutable zfinal : bool;
-	mutable zhuffman : huffman;
-	mutable zhuffdist : huffman option;
-	mutable zlen : int;
-	mutable zdist : int;
-	mutable zneeded : int;
-	mutable zoutput : string;
-	mutable zoutpos : int;
-	zinput : IO.input;
-	zlengths : int array;
-	zwindow : window;
-}
-
-type error_msg =
-	| Invalid_huffman
-	| Invalid_data
-	| Invalid_crc
-	| Truncated_data
-	| Unsupported_dictionary
-
-exception Error of error_msg
-
-let error msg = raise (Error msg)
-
-(* ************************************************************************ *)
-(* HUFFMAN TREES *)
-
-let rec tree_depth = function
-	| Found _ -> 0
-	| NeedBits _ -> assert false
-	| NeedBit (a,b) ->
-		1 + min (tree_depth a) (tree_depth b)
-
-let rec tree_compress t =
-	match tree_depth t with
-	| 0 -> t
-	| 1 ->
-		(match t with
-		| NeedBit (a,b) -> NeedBit (tree_compress a,tree_compress b)
-		| _ -> assert false)
-	| d ->
-		let size = 1 lsl d in
-		let tbl = Array.make size (Found (-1)) in
-		tree_walk tbl 0 0 d t;
-		NeedBits (d,tbl)
-
-and tree_walk tbl p cd d = function
-	| NeedBit (a,b) when d > 0 ->
-		tree_walk tbl p (cd + 1) (d-1) a;
-		tree_walk tbl (p lor (1 lsl cd)) (cd + 1) (d-1) b;
-	| t ->
-		Array.set tbl p (tree_compress t)
-
-let make_huffman lengths pos nlengths maxbits =
-	let counts = Array.make maxbits 0 in
-	for i = 0 to nlengths - 1 do
-		let p = Array.unsafe_get lengths (i + pos) in
-		if p >= maxbits then error Invalid_huffman;
-		Array.unsafe_set counts p (Array.unsafe_get counts p + 1);
-	done;
-	let code = ref 0 in
-	let tmp = Array.make maxbits 0 in
-	for i = 1 to maxbits - 2 do
-		code := (!code + Array.unsafe_get counts i) lsl 1;
-		Array.unsafe_set tmp i !code;
-	done;
-	let bits = Hashtbl.create 0 in
-	for i = 0 to nlengths - 1 do
-		let l = Array.unsafe_get lengths (i + pos) in
-		if l <> 0 then begin
-			let n = Array.unsafe_get tmp (l - 1) in
-			Array.unsafe_set tmp (l - 1) (n + 1);
-			Hashtbl.add bits (n,l) i;
-		end;
-	done;
-	let rec tree_make v l =
-		if l > maxbits then error Invalid_huffman;
-		try
-			Found (Hashtbl.find bits (v,l))
-		with
-			Not_found ->
-				NeedBit (tree_make (v lsl 1) (l + 1) , tree_make (v lsl 1 lor 1) (l + 1))
-	in
-	tree_compress (NeedBit (tree_make 0 1 , tree_make 1 1))
-
-(* ************************************************************************ *)
-(* ADLER32 (CRC) *)
-
-let adler32_create() = {
-	a1 = 1;
-	a2 = 0;
-}
-
-let adler32_update a s p l =
-	let p = ref p in
-	for i = 0 to l - 1 do
-		let c = int_of_char (String.unsafe_get s !p) in
-		a.a1 <- (a.a1 + c) mod 65521;
-		a.a2 <- (a.a2 + a.a1) mod 65521;
-		incr p;
-	done
-
-let adler32_read ch =
-	let a2a = IO.read_byte ch in
-	let a2b = IO.read_byte ch in
-	let a1a = IO.read_byte ch in
-	let a1b = IO.read_byte ch in
-	{
-		a1 = (a1a lsl 8) lor a1b;
-		a2 = (a2a lsl 8) lor a2b;
-	}
-
-(* ************************************************************************ *)
-(* WINDOW *)
-
-let window_size = 1 lsl 15
-let buffer_size = 1 lsl 16
-
-let window_create size = {
-		wbuffer = String.create buffer_size;
-		wpos = 0;
-		wcrc = adler32_create()
-	}
-
-let window_slide w =
-	adler32_update w.wcrc w.wbuffer 0 window_size;
-	let b = String.create buffer_size in
-	w.wpos <- w.wpos - window_size;
-	String.unsafe_blit w.wbuffer window_size b 0 w.wpos;
-	w.wbuffer <- b
-
-let window_add_string w s p len =
-	if w.wpos + len > buffer_size then window_slide w;
-	String.unsafe_blit s p w.wbuffer w.wpos len;
-	w.wpos <- w.wpos + len
-
-let window_add_char w c =
-	if w.wpos = buffer_size then window_slide w;
-	String.unsafe_set w.wbuffer w.wpos c;
-	w.wpos <- w.wpos + 1
-
-let window_get_last_char w =
-	String.unsafe_get w.wbuffer (w.wpos - 1)
-
-let window_available w =
-	w.wpos
-
-let window_checksum w =
-	adler32_update w.wcrc w.wbuffer 0 w.wpos;
-	w.wcrc
-
-(* ************************************************************************ *)
-
-let len_extra_bits_tbl = [|0;0;0;0;0;0;0;0;1;1;1;1;2;2;2;2;3;3;3;3;4;4;4;4;5;5;5;5;0;-1;-1|]
-let len_base_val_tbl = [|3;4;5;6;7;8;9;10;11;13;15;17;19;23;27;31;35;43;51;59;67;83;99;115;131;163;195;227;258|]
-let dist_extra_bits_tbl = [|0;0;0;0;1;1;2;2;3;3;4;4;5;5;6;6;7;7;8;8;9;9;10;10;11;11;12;12;13;13;-1;-1|]
-let dist_base_val_tbl = [|1;2;3;4;5;7;9;13;17;25;33;49;65;97;129;193;257;385;513;769;1025;1537;2049;3073;4097;6145;8193;12289;16385;24577|]
-let code_lengths_pos = [|16;17;18;0;8;7;9;6;10;5;11;4;12;3;13;2;14;1;15|]
-
-let fixed_huffman = make_huffman (Array.init 288 (fun n ->
-									if n <= 143 then 8
-									else if n <= 255 then 9
-									else if n <= 279 then 7
-									else 8
-								)) 0 288 10
-
-let get_bits z n =
-	while z.znbits < n do
-		z.zbits <- z.zbits lor ((IO.read_byte z.zinput) lsl z.znbits);
-		z.znbits <- z.znbits + 8;
-	done;
-	let b = z.zbits land (1 lsl n - 1) in
-	z.znbits <- z.znbits - n;
-	z.zbits <- z.zbits lsr n;
-	b
-
-let get_bit z =
-	if z.znbits = 0 then begin
-		z.znbits <- 8;
-		z.zbits <- IO.read_byte z.zinput;
-	end;
-	let b = z.zbits land 1 = 1 in
-	z.znbits <- z.znbits - 1;
-	z.zbits <- z.zbits lsr 1;
-	b
-
-let rec get_rev_bits z n =
-	if n = 0 then
-		0
-	else if get_bit z then
-		(1 lsl (n - 1)) lor (get_rev_bits z (n-1))
-	else
-		get_rev_bits z (n-1)
-
-let reset_bits z =
-	z.zbits <- 0;
-	z.znbits <- 0
-
-let add_string z s p l =
-	window_add_string z.zwindow s p l;
-	String.unsafe_blit s p z.zoutput z.zoutpos l;
-	z.zneeded <- z.zneeded - l;
-	z.zoutpos <- z.zoutpos + l
-
-let add_char z c =
-	window_add_char z.zwindow c;
-	String.unsafe_set z.zoutput z.zoutpos c;
-	z.zneeded <- z.zneeded - 1;
-	z.zoutpos <- z.zoutpos + 1
-
-let add_dist_one z n =
-	let c = window_get_last_char z.zwindow in
-	let s = String.make n c in
-	add_string z s 0 n
-
-let add_dist z d l =
-	add_string z z.zwindow.wbuffer (z.zwindow.wpos - d) l
-
-let rec apply_huffman z = function
-	| Found n -> n
-	| NeedBit (a,b) -> apply_huffman z (if get_bit z then b else a)
-	| NeedBits (n,t) -> apply_huffman z (Array.unsafe_get t (get_bits z n))
-
-let inflate_lengths z a max =
-	let i = ref 0 in
-	let prev = ref 0 in
-	while !i < max do
-		match apply_huffman z z.zhuffman with
-		| n when n <= 15 ->
-			prev := n;
-			Array.unsafe_set a !i n;
-			incr i
-		| 16 ->
-			let n = 3 + get_bits z 2 in
-			if !i + n > max then error Invalid_data;
-			for k = 0 to n - 1 do
-				Array.unsafe_set a !i !prev;
-				incr i;
-			done;
-		| 17 ->
-			let n = 3 + get_bits z 3 in
-			i := !i + n;
-			if !i > max then error Invalid_data;
-		| 18 ->
-			let n = 11 + get_bits z 7 in
-			i := !i + n;
-			if !i > max then error Invalid_data;
-		| _ ->
-			error Invalid_data
-	done
-
-let rec inflate_loop z =
-	match z.zstate with
-	| Head ->
-		let cmf = IO.read_byte z.zinput in
-		let cm = cmf land 15 in
-		let cinfo = cmf lsr 4 in
-		if cm <> 8 || cinfo <> 7 then error Invalid_data;
-		let flg = IO.read_byte z.zinput in
-		(*let fcheck = flg land 31 in*)
-		let fdict = flg land 32 <> 0 in
-		(*let flevel = flg lsr 6 in*)
-		if (cmf lsl 8 + flg) mod 31 <> 0 then error Invalid_data;
-		if fdict then error Unsupported_dictionary;
-		z.zstate <- Block;
-		inflate_loop z
-	| Crc ->
-		let calc = window_checksum z.zwindow in
-		let crc = adler32_read z.zinput in
-		if calc <> crc then error Invalid_crc;
-		z.zstate <- Done;
-		inflate_loop z
-	| Done ->
-		()
-	| Block ->
-		z.zfinal <- get_bit z;
-		let btype = get_bits z 2 in
-		(match btype with
-		| 0 -> (* no compression *)
-			z.zlen <- IO.read_ui16 z.zinput;
-			let nlen = IO.read_ui16 z.zinput in
-			if nlen <> 0xFFFF - z.zlen then error Invalid_data;
-			z.zstate <- Flat;
-			inflate_loop z;
-			reset_bits z
-		| 1 -> (* fixed Huffman *)
-			z.zhuffman <- fixed_huffman;
-			z.zhuffdist <- None;
-			z.zstate <- CData;
-			inflate_loop z
-		| 2 -> (* dynamic Huffman *)
-			let hlit = get_bits z 5 + 257 in
-			let hdist = get_bits z 5 + 1 in
-			let hclen = get_bits z 4 + 4 in
-			for i = 0 to hclen - 1 do
-				Array.unsafe_set z.zlengths (Array.unsafe_get code_lengths_pos i) (get_bits z 3);
-			done;
-			for i = hclen to 18 do
-				Array.unsafe_set z.zlengths (Array.unsafe_get code_lengths_pos i) 0;
-			done;
-			z.zhuffman <- make_huffman z.zlengths 0 19 8;
-			let lengths = Array.make (hlit + hdist) 0 in
-			inflate_lengths z lengths (hlit + hdist);
-			z.zhuffdist <- Some (make_huffman lengths hlit hdist 16);
-			z.zhuffman <- make_huffman lengths 0 hlit 16;
-			z.zstate <- CData;
-			inflate_loop z
-		| _ ->
-			error Invalid_data)
-	| Flat ->
-		let rlen = min z.zlen z.zneeded in
-		let str = IO.nread z.zinput rlen in
-		let len = String.length str in
-		z.zlen <- z.zlen - len;
-		add_string z str 0 len;
-		if z.zlen = 0 then z.zstate <- (if z.zfinal then Crc else Block);
-		if z.zneeded > 0 then inflate_loop z
-	| DistOne ->
-		let len = min z.zlen z.zneeded in
-		add_dist_one z len;
-		z.zlen <- z.zlen - len;
-		if z.zlen = 0 then z.zstate <- CData;
-		if z.zneeded > 0 then inflate_loop z
-	| Dist ->
-		while z.zlen > 0 && z.zneeded > 0 do
-			let len = min z.zneeded (min z.zlen z.zdist) in
-			add_dist z z.zdist len;
-			z.zlen <- z.zlen - len;
-		done;
-		if z.zlen = 0 then z.zstate <- CData;
-		if z.zneeded > 0 then inflate_loop z
-	| CData ->
-		match apply_huffman z z.zhuffman with
-		| n when n < 256 ->
-			add_char z (Char.unsafe_chr n);
-			if z.zneeded > 0 then inflate_loop z
-		| 256 ->
-			z.zstate <- if z.zfinal then Crc else Block;
-			inflate_loop z
-		| n ->
-			let n = n - 257 in
-			let extra_bits = Array.unsafe_get len_extra_bits_tbl n in
-			if extra_bits = -1 then error Invalid_data;
-			z.zlen <- (Array.unsafe_get len_base_val_tbl n) + (get_bits z extra_bits);
-			let dist_code = (match z.zhuffdist with None -> get_rev_bits z 5 | Some h -> apply_huffman z h) in
-			let extra_bits = Array.unsafe_get dist_extra_bits_tbl dist_code in
-			if extra_bits = -1 then error Invalid_data;
-			z.zdist <- (Array.unsafe_get dist_base_val_tbl dist_code) + (get_bits z extra_bits);
-			if z.zdist > window_available z.zwindow then error Invalid_data;
-			z.zstate <- (if z.zdist = 1 then DistOne else Dist);
-			inflate_loop z
-
-let inflate_data z s pos len =
-	if pos < 0 || len < 0 || pos + len > String.length s then invalid_arg "inflate_data";
-	z.zneeded <- len;
-	z.zoutpos <- pos;
-	z.zoutput <- s;
-	try
-		if len > 0 then inflate_loop z;
-		len - z.zneeded
-	with
-		IO.No_more_input -> error Truncated_data
-
-let inflate_init ?(header=true) ch =
-	{
-		zfinal = false;
-		zhuffman = fixed_huffman;
-		zhuffdist = None;
-		zlen = 0;
-		zdist = 0;
-		zstate = (if header then Head else Block);
-		zinput = ch;
-		zbits = 0;
-		znbits = 0;
-		zneeded = 0;
-		zoutput = "";
-		zoutpos = 0;
-		zlengths = Array.make 19 (-1);
-		zwindow = window_create (1 lsl 15)
-	}
-
-let inflate ?(header=true) ch =
-	let z = inflate_init ~header ch in
-	let s = String.create 1 in
-	IO.create_in
-		~read:(fun() ->
-			let l = inflate_data z s 0 1 in
-			if l = 1 then String.unsafe_get s 0 else raise IO.No_more_input
-		)
-		~input:(fun s p l ->
-			let n = inflate_data z s p l in
-			if n = 0 then raise IO.No_more_input;
-			n
-		)
-		~close:(fun () ->
-			IO.close_in ch
-		)
diff --git a/libs/extlib/unzip.mli b/libs/extlib/unzip.mli
deleted file mode 100644
index 7de371734cb6d55f6f11054f2df92e4f5b272655..0000000000000000000000000000000000000000
--- a/libs/extlib/unzip.mli
+++ /dev/null
@@ -1,45 +0,0 @@
-(*
- * Unzip - inflate format decompression algorithm
- * Copyright (C) 2004 Nicolas Cannasse
- * Compliant with RFC 1950 and 1951
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version,
- * with the special exception on linking described in file LICENSE.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *)
-
-(** Decompression algorithm.
-
-	Unzip decompression algorithm is compliant with RFC 1950 and 1951 which
-	are describing the "inflate" algorithm used in most popular file formats.
-	This format is also the one used by the popular ZLib library.	
-*)
-
-type error_msg =
-	| Invalid_huffman
-	| Invalid_data
-	| Invalid_crc
-	| Truncated_data
-	| Unsupported_dictionary
-
-exception Error of error_msg
-
-val inflate : ?header:bool -> IO.input -> IO.input
-(** wrap an input using "inflate" decompression algorithm. raises [Error] if
-  an error occurs (this can only be caused by malformed input data). *)
-
-type t
-
-val inflate_init : ?header:bool -> IO.input -> t
-val inflate_data : t -> string -> int -> int -> int
diff --git a/libs/ilib/Makefile b/libs/ilib/Makefile
index 6317f3f7c198948ae54ace55c6aac2d6f6c3685d..11aaec9f268d6b0395961769da72e5a0b321f599 100644
--- a/libs/ilib/Makefile
+++ b/libs/ilib/Makefile
@@ -5,20 +5,20 @@ SRCS=peData.ml peReader.ml peWriter.ml ilMeta.mli ilData.mli ilMetaTools.ml ilMe
 
 all: native bytecode
 
-native: il.cmxa
-bytecode: il.cma
+native: ilib.cmxa
+bytecode: ilib.cma
 
-il.cmxa: $(SRCS)
-	$(OCAMLOPT) -g -I ../extlib -a -o il.cmxa $(SRCS)
+ilib.cmxa: $(SRCS)
+	ocamlfind $(OCAMLOPT) -g -package extlib -safe-string -a -o ilib.cmxa $(SRCS)
 
-il.cma: $(SRCS)
-	$(OCAMLC) -g -I ../extlib -a -o il.cma $(SRCS)
+ilib.cma: $(SRCS)
+	ocamlfind $(OCAMLC) -g -package extlib -safe-string -a -o ilib.cma $(SRCS)
 
-dump: il.cmxa dump.ml peDataDebug.ml ilMetaDebug.ml
-	$(OCAMLOPT) -g -I ../extlib -o dump ../extlib/extLib.cmxa il.cmxa peDataDebug.ml dump.ml
+dump: ilib.cmxa dump.ml peDataDebug.ml ilMetaDebug.ml
+	ocamlfind $(OCAMLOPT) -g -package extlib -safe-string -o dump ../extlib/extLib.cmxa ilib.cmxa peDataDebug.ml dump.ml
 
 clean:
-	rm -f il.cma il.cmxa il.lib il.a $(wildcard *.cmx) $(wildcard *.cmo) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.cmi) dump
+	rm -f ilib.cma ilib.cmxa ilib.lib ilib.a $(wildcard *.cmx) $(wildcard *.cmo) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.cmi) dump
 
 .PHONY: all bytecode native clean
 
diff --git a/libs/ilib/ilMeta.mli b/libs/ilib/ilMeta.mli
index 4c77746b4c5afcbd73aef890a8eae42d95b0ba69..c0d74bdb8dc264dfd88313bacadfcc4fc045f0a0 100644
--- a/libs/ilib/ilMeta.mli
+++ b/libs/ilib/ilMeta.mli
@@ -373,7 +373,7 @@ and meta_method_impl = {
 	mutable mi_method_body : method_def_or_ref;
 		(* overriding method *)
 	mutable mi_method_declaration : method_def_or_ref;
-		(* overriden method *)
+		(* overridden method *)
 }
 
 and meta_module_ref = {
@@ -707,7 +707,7 @@ and method_vtable =
 	| VNewSlot (* 0x100 *)
 		(* a new vtable slot is created, so it doesn't override the old implementation *)
 	| VStrict (* 0x200 *)
-		(* virtual method can be overriden only if it is accessible from the overriding class *)
+		(* virtual method can be overridden only if it is accessible from the overriding class *)
 
 and method_impl =
 	(* implementation flags - mask 0x2C08 *)
diff --git a/libs/ilib/ilMetaReader.ml b/libs/ilib/ilMetaReader.ml
index b123d19b3bb1719c4cf6b7881e4845488a3e1666..ec472a9718a770f458c5643b84ae0db413be604d 100644
--- a/libs/ilib/ilMetaReader.ml
+++ b/libs/ilib/ilMetaReader.ml
@@ -270,7 +270,7 @@ let param_flags_of_int i =
 
 let null_param_flags = param_flags_of_int 0
 
-let callconv_of_int i =
+let callconv_of_int ?match_generic_inst:(match_generic_inst=false) i =
 	let basic = match i land 0xF with
 		| 0x0 -> CallDefault (* 0x0 *)
 		| 0x1 -> CallCDecl
@@ -282,6 +282,7 @@ let callconv_of_int i =
 		| 0x7 -> CallLocal (* 0x7 *)
 		| 0x8 -> CallProp (* 0x8 *)
 		| 0x9 -> CallUnmanaged (* 0x9 *)
+		| 0xa when match_generic_inst -> CallGenericInst (* 0xA *)
 		| i -> printf "error 0x%x\n\n" i; assert false
 	in
 	match i land 0x20 with
@@ -566,30 +567,12 @@ let read_sguid_idx ctx pos =
 
 let read_callconv ctx s pos =
 	let pos, conv = read_compressed_i32 s pos in
-	let basic = match conv land 0xF with
-		| 0x0 -> CallDefault (* 0x0 *)
-		| 0x5 -> CallVararg (* 0x5 *)
-		| 0x6 -> CallField (* 0x6 *)
-		| 0x7 -> CallLocal (* 0x7 *)
-		| 0x8 -> CallProp (* 0x8 *)
-		| 0x9 -> CallUnmanaged (* 0x9 *)
-		| 0xa -> CallGenericInst (* 0xA *)
-		| i -> printf "error 0x%x\n" i; assert false
+	let callconv = callconv_of_int conv ~match_generic_inst:true in
+	let pos = match conv land 0x10 with
+		| 0x10 -> fst (read_compressed_i32 s pos)
+		| _ -> pos
 	in
-	let basic = [basic] in
-	let pos, c = match conv land 0x10 with
-		| 0x10 ->
-			let pos, nparams = read_compressed_i32 s pos in
-			pos, CallGeneric nparams :: basic
-		| _ ->
-			pos, basic
-	in
-	match conv land 0x20 with
-		| 0x20 ->
-			pos, CallHasThis :: basic
-		| _ when conv land 0x40 = 0x40 ->
-			pos, CallExplicitThis :: basic
-		| _ -> pos, basic
+	pos, callconv
 
 let read_constant ctx with_type s pos =
 	match with_type with
@@ -2320,7 +2303,7 @@ let read_padded i npad =
 let read_meta_tables pctx header module_cache =
 	let i = pctx.r.i in
 	seek_rva pctx (fst header.clr_meta);
-	let magic = nread i 4 in
+	let magic = nread_string i 4 in
 	if magic <> "BSJB" then error ("Error reading metadata table: Expected magic 'BSJB'. Got " ^ magic);
 	let major = read_ui16 i in
 	let minor = read_ui16 i in
@@ -2362,21 +2345,21 @@ let read_meta_tables pctx header module_cache =
 		seek_rva pctx rva;
 		match String.lowercase s.str_name with
 		| "#guid" ->
-			sguid := nread i (Int32.to_int s.str_size)
+			sguid := nread_string i (Int32.to_int s.str_size)
 		| "#strings" ->
-			sstrings := nread i (Int32.to_int s.str_size)
+			sstrings := nread_string i (Int32.to_int s.str_size)
 		| "#us" ->
-			sus := nread i (Int32.to_int s.str_size)
+			sus := nread_string i (Int32.to_int s.str_size)
 		| "#blob" ->
-			sblob := nread i (Int32.to_int s.str_size)
+			sblob := nread_string i (Int32.to_int s.str_size)
 		| "#~" ->
 			assert (Option.is_none !compressed);
 			compressed := Some true;
-			smeta := nread i (Int32.to_int s.str_size)
+			smeta := nread_string i (Int32.to_int s.str_size)
 		| "#-" ->
 			assert (Option.is_none !compressed);
 			compressed := Some false;
-			smeta := nread i (Int32.to_int s.str_size)
+			smeta := nread_string i (Int32.to_int s.str_size)
 		| _ ->
 			extra := s :: !extra
 	) streams;
diff --git a/libs/ilib/peReader.ml b/libs/ilib/peReader.ml
index 1bd1f7e8e73b834c4f40f304cda5289b3f79118d..53703e9d897e2f6ce98f7b75087e84bdbd20d91b 100644
--- a/libs/ilib/peReader.ml
+++ b/libs/ilib/peReader.ml
@@ -263,7 +263,7 @@ let read_pe_header r header =
 	let nsections = header.coff_nsections in
 	seek r sections_offset;
 	let sections = Array.init nsections (fun n ->
-		let name = nread i 8 in
+		let name = nread_string i 8 in
 		let name = try
 			let index = String.index name '\x00' in
 			String.sub name 0 index
@@ -482,7 +482,7 @@ let read r =
 	seek r 0x3c;
 	let pe_sig_offset = read_i32 i in
 	seek r pe_sig_offset;
-	if really_nread i 4 <> "PE\x00\x00" then
+	if really_nread_string i 4 <> "PE\x00\x00" then
 		error "Invalid PE header signature: PE expected";
 	let header = read_coff_header i in
 	let pe_header = read_pe_header r header in
diff --git a/libs/javalib/Makefile b/libs/javalib/Makefile
index e5b1d78ff0f81a5c10b51aaec8020bdfb64c054a..2e7ddd22d8f290d313f5658a6cb5505ad9287504 100644
--- a/libs/javalib/Makefile
+++ b/libs/javalib/Makefile
@@ -4,17 +4,17 @@ SRC=jData.ml jReader.ml jWriter.ml
 
 all: bytecode native
 
-native: java.cmxa
-bytecode: java.cma
+native: javalib.cmxa
+bytecode: javalib.cma
 
-java.cmxa: $(SRC)
-	$(OCAMLOPT) -g -I ../extlib -a -o java.cmxa $(SRC)
+javalib.cmxa: $(SRC)
+	ocamlfind $(OCAMLOPT) -g -package extlib -safe-string -a -o javalib.cmxa $(SRC)
 
-java.cma: $(SRC)
-	$(OCAMLC) -g -I ../extlib -a -o java.cma $(SRC)
+javalib.cma: $(SRC)
+	ocamlfind $(OCAMLC) -g -package extlib -safe-string -a -o javalib.cma $(SRC)
 
 clean:
-	rm -rf java.cmxa java.cma java.lib java.a $(wildcard *.cmx) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.cmi) $(wildcard *.cmo)
+	rm -rf javalib.cmxa javalib.cma javalib.lib javalib.a $(wildcard *.cmx) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.cmi) $(wildcard *.cmo)
 
 .PHONY: all bytecode native clean
 
diff --git a/libs/javalib/jReader.ml b/libs/javalib/jReader.ml
index 95a7c5248ba817e772c2b33f375f7a4fc2b18269..b5ea1e437e591b914906ea370d675672a7eb2955 100644
--- a/libs/javalib/jReader.ml
+++ b/libs/javalib/jReader.ml
@@ -78,7 +78,7 @@ let parse_constant max idx ch =
     KNameAndType (n1, n2)
   | 1 ->
     let len = read_ui16 ch in
-    let str = IO.nread ch len in
+    let str = IO.nread_string ch len in
     (* TODO: correctly decode modified UTF8 *)
     KUtf8String str
   | 15 ->
@@ -424,7 +424,7 @@ let parse_attribute on_special consts ch =
     Some (AttrInvisibleAnnotations (List.init anncount (fun _ -> parse_annotation consts ch)))
   | _ ->
     let do_default () =
-      Some (AttrUnknown (aname,IO.nread ch alen))
+      Some (AttrUnknown (aname,IO.nread_string ch alen))
     in
     match on_special with
     | None -> do_default()
diff --git a/libs/neko/Makefile b/libs/neko/Makefile
index 793fc470ccc1594013119948ec0f1d65467dfa69..9784625fcab0c773097bc23c14b8600e19e4e3f8 100644
--- a/libs/neko/Makefile
+++ b/libs/neko/Makefile
@@ -1,23 +1,23 @@
-OCAMLOPT=ocamlopt
-OCAMLC=ocamlc
-SRC=nast.ml nxml.ml binast.ml nbytecode.ml ncompile.ml
-
-all: bytecode native
-
-native: neko.cmxa
-
-bytecode: neko.cma
-
-neko.cmxa: $(SRC)
-	$(OCAMLOPT) -I ../extlib -a -o neko.cmxa $(SRC)
-
-neko.cma: $(SRC)
-	$(OCAMLC) -I ../extlib -a -o neko.cma $(SRC)
-
-clean:
-	rm -rf neko.cmxa neko.cma neko.lib neko.a $(wildcard *.cmx) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.cmi) $(wildcard *.cmo)
-
-.PHONY: all bytecode native clean
-
-Makefile: ;
-$(SRC): ;
+OCAMLOPT=ocamlopt
+OCAMLC=ocamlc
+SRC=nast.ml nxml.ml binast.ml nbytecode.ml ncompile.ml
+
+all: bytecode native
+
+native: neko.cmxa
+
+bytecode: neko.cma
+
+neko.cmxa: $(SRC)
+	ocamlfind $(OCAMLOPT) -package extlib -safe-string -a -o neko.cmxa $(SRC)
+
+neko.cma: $(SRC)
+	ocamlfind $(OCAMLC) -package extlib -safe-string -a -o neko.cma $(SRC)
+
+clean:
+	rm -rf neko.cmxa neko.cma neko.lib neko.a $(wildcard *.cmx) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.cmi) $(wildcard *.cmo)
+
+.PHONY: all bytecode native clean
+
+Makefile: ;
+$(SRC): ;
diff --git a/libs/neko/binast.ml b/libs/neko/binast.ml
index c73398734baa3b6a5034f58d836d5ecf73e3d2f0..f4ca65c7a03b71f169147d66e5744ea7fb38dbd4 100644
--- a/libs/neko/binast.ml
+++ b/libs/neko/binast.ml
@@ -45,7 +45,7 @@ let write_string ctx s =
 			ctx.scount <- ctx.scount + 1;
 			b ctx 0;
 			IO.write_ui16 ctx.ch (String.length s);
-			IO.nwrite ctx.ch s
+			IO.nwrite_string ctx.ch s
 
 let write_constant ctx = function
 	| True -> b ctx 0
@@ -254,7 +254,7 @@ and write_expr ctx (e,p) =
 	| ENeko s ->
 		b ctx 27;
 		write_ui24 ctx (String.length s);
-		IO.nwrite ctx.ch s
+		IO.nwrite_string ctx.ch s
 
 let write ch e =
 	let ctx = {
@@ -264,6 +264,6 @@ let write ch e =
 		scount = 0;
 		strings = Hashtbl.create 0;
 	} in
-	IO.nwrite ctx.ch "NBA\001";
+	IO.nwrite_string ctx.ch "NBA\001";
 	write_expr ctx e
 
diff --git a/libs/neko/nbytecode.ml b/libs/neko/nbytecode.ml
index 8965013bc56c177e620b1eff8b271aefb8dcc822..a9c48481caedd7dfd444aac416486e2fd094719a 100644
--- a/libs/neko/nbytecode.ml
+++ b/libs/neko/nbytecode.ml
@@ -270,7 +270,7 @@ let write_debug_infos ch files inf =
 	flush_repeat(!curpos)
 
 let write ch (globals,ops) =
-	IO.nwrite ch "NEKO";
+	IO.nwrite_string ch "NEKO";
 	let ids , pos , csize = code_tables ops in
 	IO.write_i32 ch (Array.length globals);
 	IO.write_i32 ch (Array.length ids);
@@ -279,7 +279,7 @@ let write ch (globals,ops) =
 		match x with
 		| GlobalVar s -> IO.write_byte ch 1; IO.write_string ch s
 		| GlobalFunction (p,nargs) -> IO.write_byte ch 2; IO.write_i32 ch (pos.(p) lor (nargs lsl 24))
-		| GlobalString s -> IO.write_byte ch 3; IO.write_ui16 ch (String.length s); IO.nwrite ch s
+		| GlobalString s -> IO.write_byte ch 3; IO.write_ui16 ch (String.length s); IO.nwrite_string ch s
 		| GlobalFloat s -> IO.write_byte ch 4; IO.write_string ch s
 		| GlobalDebug (files,inf) -> IO.write_byte ch 5; write_debug_infos ch files inf;
 		| GlobalVersion v -> IO.write_byte ch 6; IO.write_byte ch v
diff --git a/libs/neko/nxml.ml b/libs/neko/nxml.ml
index 4e373e0b2766cc8eb555f00bed97d4f59d7305c9..bdb1ba4e3ce34b5abfe7a3539132dc1ef9877082 100644
--- a/libs/neko/nxml.ml
+++ b/libs/neko/nxml.ml
@@ -55,7 +55,7 @@ let rec to_xml_rec p2 ast =
 		)
 	| EBlock el ->
 		name := "b";
-		childs := List.map (to_xml_rec p) el; 
+		childs := List.map (to_xml_rec p) el;
 	| EParenthesis e ->
 		name := "p";
 		childs := [to_xml_rec p e];
@@ -68,7 +68,7 @@ let rec to_xml_rec p2 ast =
 		childs := to_xml_rec p e :: List.map (to_xml_rec p) el;
 	| EArray (a,b) ->
 		name := "a";
-		childs := [to_xml_rec p a; to_xml_rec p b]; 
+		childs := [to_xml_rec p a; to_xml_rec p b];
 	| EVars vl ->
 		name := "var";
 		childs := List.map (fun(v,e) ->
@@ -140,9 +140,9 @@ let rec write_fmt_rec tabs ch x =
 	| Node (name,att,childs) ->
 		IO.printf ch "%s<%s%s" tabs name (String.concat "" (List.map (fun(a,v) -> " " ^ a ^ "=\"" ^ escape v ^ "\"") att));
 		match childs with
-		| [] -> IO.nwrite ch "/>"
+		| [] -> IO.nwrite_string ch "/>"
 		| l ->
-			IO.nwrite ch ">\n";
+			IO.nwrite_string ch ">\n";
 			List.iter (fun(x) -> write_fmt_rec (tabs ^ " ") ch x; IO.write ch '\n') l;
 			IO.printf ch "%s</%s>" tabs name
 
@@ -156,9 +156,9 @@ let rec write_rec ch x =
 	| Node (name,att,childs) ->
 		IO.printf ch "<%s%s" name (String.concat "" (List.map (fun(a,v) -> " " ^ a ^ "=\"" ^ escape v ^ "\"") att));
 		match childs with
-		| [] -> IO.nwrite ch "/>"
+		| [] -> IO.nwrite_string ch "/>"
 		| l ->
-			IO.nwrite ch ">";
+			IO.nwrite_string ch ">";
 			List.iter (fun(x) -> write_rec ch x) l;
 			IO.printf ch "</%s>" name
 
diff --git a/libs/objsize/Makefile b/libs/objsize/Makefile
index 756c62a166d6dbd64358ef5b47c9caab55328886..b7908e6300e0eda23ea403c35b6ab3d273b28648 100644
--- a/libs/objsize/Makefile
+++ b/libs/objsize/Makefile
@@ -11,13 +11,13 @@ bytecode: objsize.cma
 native: objsize.cmxa
 
 objsize.cma: c_objsize.o $(SRC)
-	$(OCAMLC) -a -o objsize.cma $(LIBS) $(SRC)
+	$(OCAMLC) -safe-string -a -o objsize.cma $(LIBS) $(SRC)
 
 objsize.cmxa: c_objsize.o $(SRC)
-	$(OCAMLOPT) -a -o objsize.cmxa $(LIBS) $(SRC)
+	$(OCAMLOPT) -safe-string -a -o objsize.cmxa $(LIBS) $(SRC)
 
 c_objsize.o: c_objsize.c
-	$(OCAMLC) $(ALL_CFLAGS) c_objsize.c
+	$(OCAMLC) -safe-string $(ALL_CFLAGS) c_objsize.c
 
 clean:
 	rm -rf $(wildcard *.cma) $(wildcard *.cmxa) $(wildcard *.cmx) $(wildcard *.cmi) $(wildcard *.cmo) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.a)
diff --git a/libs/ocamake/ocamake.dsp b/libs/ocamake/ocamake.dsp
index e18f64b0951e05a07044c611782a5f1c31d0219d..461ebd15741a854ebfb5224e3e8031c236d50c3f 100644
--- a/libs/ocamake/ocamake.dsp
+++ b/libs/ocamake/ocamake.dsp
@@ -1,66 +1,66 @@
-# Microsoft Developer Studio Project File - Name="ocamake" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=ocamake - Win32 Native code
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ocamake.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ocamake.mak" CFG="ocamake - Win32 Native code"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ocamake - Win32 Native code" (based on "Win32 (x86) External Target")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "ocamake -opt ocamake.dsp -o ocamake.exe"
-# PROP BASE Rebuild_Opt "-all"
-# PROP BASE Target_File "ocamake_opt.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "ocamake str.cmxa unix.cmxa -opt ocamake.dsp -o ocadbg.exe"
-# PROP Rebuild_Opt "-all"
-# PROP Target_File "ocadbg.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-# Begin Target
-
-# Name "ocamake - Win32 Native code"
-
-!IF  "$(CFG)" == "ocamake - Win32 Native code"
-
-!ENDIF 
-
-# Begin Group "ML Files"
-
-# PROP Default_Filter "ml;mly;mll"
-# Begin Source File
-
-SOURCE=.\ocamake.ml
-# End Source File
-# End Group
-# Begin Group "MLI Files"
-
-# PROP Default_Filter "mli"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="ocamake" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=ocamake - Win32 Native code
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "ocamake.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "ocamake.mak" CFG="ocamake - Win32 Native code"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ocamake - Win32 Native code" (based on "Win32 (x86) External Target")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir ""
+# PROP BASE Cmd_Line "ocamake -opt ocamake.dsp -o ocamake.exe"
+# PROP BASE Rebuild_Opt "-all"
+# PROP BASE Target_File "ocamake_opt.exe"
+# PROP BASE Bsc_Name ""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
+# PROP Cmd_Line "ocamake str.cmxa unix.cmxa -opt ocamake.dsp -o ocadbg.exe"
+# PROP Rebuild_Opt "-all"
+# PROP Target_File "ocadbg.exe"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+# Begin Target
+
+# Name "ocamake - Win32 Native code"
+
+!IF  "$(CFG)" == "ocamake - Win32 Native code"
+
+!ENDIF 
+
+# Begin Group "ML Files"
+
+# PROP Default_Filter "ml;mly;mll"
+# Begin Source File
+
+SOURCE=.\ocamake.ml
+# End Source File
+# End Group
+# Begin Group "MLI Files"
+
+# PROP Default_Filter "mli"
+# End Group
+# End Target
+# End Project
diff --git a/libs/ocamake/ocamake.dsw b/libs/ocamake/ocamake.dsw
index a5e699a475d9d7dc238765c9992f301b3b331f20..620f4514a982ed87d5495d84c667ed2055323d48 100644
--- a/libs/ocamake/ocamake.dsw
+++ b/libs/ocamake/ocamake.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ocamake"=.\ocamake.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "ocamake"=.\ocamake.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/libs/ocamake/ocamake.html b/libs/ocamake/ocamake.html
index 1e0e613e20605cf08e129d6052559254ed5d7b33..9af8925b504738a295b3288674a048b1bc6d2857 100644
--- a/libs/ocamake/ocamake.html
+++ b/libs/ocamake/ocamake.html
@@ -50,7 +50,7 @@ OCamake works with the following files :
 	<li><code>dsp, vcproj</code> (Visual Studio Project) : all the files included in the project are added to the ocamake file list.
 </ul>
 <br>
-Once the final file list is made, OCamake run <code>ocamldep</code> to build module dependencies tree, and then build and link the tree in the good order (for more informations on the algorithm used, see sources).
+Once the final file list is made, OCamake run <code>ocamldep</code> to build module dependencies tree, and then build and link the tree in the good order (for more information on the algorithm used, see sources).
 Only modified sources files or files with one dependency modified are rebuilt.<br>
 <br>
 If one <code>dsp</code> file has been found or if the <code>-epp</code> flag has been set, then all compilation errors are processed by OCamake to transform them into a Visual Studio compatible format.<br>
@@ -81,7 +81,7 @@ The following command-line options are available :
 <br>
 <li><b><font color="#000099">Licence:</font></b><br>
 <br>
-The full source code of OCamake is included, so you can modify, use, and redistribute it as you want for any usage conform to the licence. This code is under the LGPL (GNU Lesser General Public Licence), you can get more informations on www.gnu.org.<br>
+The full source code of OCamake is included, so you can modify, use, and redistribute it as you want for any usage conform to the licence. This code is under the LGPL (GNU Lesser General Public Licence), you can get more information on www.gnu.org.<br>
 <br>
 <li><b><font color="#000099">Author:</font></b><br>
 <br>
diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile
index 8561650ae114e3387520506b7c3254f27c32edf5..dcbad32f085453af6a8f57c4e345cd5dbc3f74b9 100644
--- a/libs/pcre/Makefile
+++ b/libs/pcre/Makefile
@@ -1,4 +1,5 @@
 ALL_CFLAGS = $(CFLAGS) -I pcre
+LIBS =
 OCAMLOPT=ocamlopt
 OCAMLC=ocamlc
 SRC = pcre.ml pcre_stubs.c
@@ -10,13 +11,13 @@ bytecode: pcre.cma
 native: pcre.cmxa
 
 pcre.cma: pcre_stubs.o pcre.ml
-	$(OCAMLC) -a -o pcre.cma $(LIBS) pcre.ml
+	$(OCAMLC) -safe-string -a -o pcre.cma $(LIBS) pcre.ml
 
 pcre.cmxa: pcre.ml pcre_stubs.o
-	$(OCAMLOPT) -a -o pcre.cmxa $(LIBS) pcre.ml
+	$(OCAMLOPT) -safe-string -a -o pcre.cmxa $(LIBS) pcre.ml
 
 pcre_stubs.o: pcre_stubs.c
-	$(OCAMLC) $(ALL_CFLAGS) pcre_stubs.c
+	$(OCAMLC) -safe-string $(ALL_CFLAGS) pcre_stubs.c
 
 clean:
 	rm -f pcre.cma pcre.cmi pcre.cmx pcre.cmxa pcre.o pcre.obj pcre_stubs.obj pcre_stubs.o
diff --git a/libs/pcre/pcre.ml b/libs/pcre/pcre.ml
index 59eaad119b55c717fac19354ff40f4b6d0e58446..1619666aa15946964628f7d08ade8b63aa272716 100644
--- a/libs/pcre/pcre.ml
+++ b/libs/pcre/pcre.ml
@@ -1,29 +1,25 @@
 (*
    PCRE-OCAML - Perl Compatibility Regular Expressions for OCaml
-
    Copyright (C) 1999-  Markus Mottl
    email: markus.mottl@gmail.com
    WWW:   http://www.ocaml.info
-
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
+   version 2.1 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
-
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 *)
 
 (* Public exceptions and their registration with the C runtime *)
 
-(* Copied from pcre_compat.ml *)
 let string_copy str = str
+let buffer_add_subbytes = Buffer.add_subbytes
 
 type error =
   | Partial
@@ -71,6 +67,7 @@ type cflag =
   | `NO_AUTO_CAPTURE
   | `AUTO_CALLOUT
   | `FIRSTLINE
+  | `UCP
   ]
 
 let int_of_cflag = function
@@ -87,6 +84,7 @@ let int_of_cflag = function
   | `NO_UTF8_CHECK -> 0x2000
   | `AUTO_CALLOUT -> 0x4000
   | `FIRSTLINE -> 0x40000
+  | `UCP -> 0x20000000
 
 let coll_icflag icflag flag = int_of_cflag flag lor icflag
 let cflags flags = List.fold_left coll_icflag 0 flags
@@ -105,12 +103,14 @@ let cflag_of_int = function
   | 0x2000 -> `NO_UTF8_CHECK
   | 0x4000 -> `AUTO_CALLOUT
   | 0x40000 -> `FIRSTLINE
+  | 0x20000000 -> `UCP
   | _ -> failwith "Pcre.cflag_list: unknown compilation flag"
 
 let all_cflags =
   [
     0x0001; 0x0002; 0x0004; 0x0008; 0x0010; 0x0020;
     0x0040; 0x0200; 0x0800; 0x1000; 0x2000; 0x4000; 0x40000;
+	0x20000000
   ]
 
 let cflag_list icflags =
@@ -162,22 +162,22 @@ let rflag_list irflags =
 
 external pcre_version : unit -> string = "pcre_version_stub"
 
-external pcre_config_utf8 : unit -> bool = "pcre_config_utf8_stub" "noalloc"
+external pcre_config_utf8 : unit -> bool = "pcre_config_utf8_stub" [@@noalloc]
 
 external pcre_config_newline :
-  unit -> char = "pcre_config_newline_stub" "noalloc"
+  unit -> char = "pcre_config_newline_stub" [@@noalloc]
 
 external pcre_config_link_size :
-  unit -> int = "pcre_config_link_size_stub" "noalloc"
+  unit -> int = "pcre_config_link_size_stub" [@@noalloc]
 
 external pcre_config_match_limit :
-  unit -> int = "pcre_config_match_limit_stub" "noalloc"
+  unit -> int = "pcre_config_match_limit_stub" [@@noalloc]
 
 external pcre_config_match_limit_recursion :
-  unit -> int = "pcre_config_match_limit_recursion_stub" "noalloc"
+  unit -> int = "pcre_config_match_limit_recursion_stub" [@@noalloc]
 
 external pcre_config_stackrecurse :
-  unit -> bool = "pcre_config_stackrecurse_stub" "noalloc"
+  unit -> bool = "pcre_config_stackrecurse_stub" [@@noalloc]
 
 let version = pcre_version ()
 let config_utf8 = pcre_config_utf8 ()
@@ -213,7 +213,7 @@ external nameentrysize : regexp -> int = "pcre_nameentrysize_stub"
 external firstbyte : regexp -> firstbyte_info = "pcre_firstbyte_stub"
 external firsttable : regexp -> string option = "pcre_firsttable_stub"
 external lastliteral : regexp -> char option = "pcre_lastliteral_stub"
-external study_stat : regexp -> study_stat = "pcre_study_stat_stub" "noalloc"
+external study_stat : regexp -> study_stat = "pcre_study_stat_stub" [@@noalloc]
 
 
 (* Compilation of patterns *)
@@ -232,14 +232,14 @@ external get_match_limit : regexp -> int option = "pcre_get_match_limit_stub"
 
 (* Internal use only! *)
 external set_imp_match_limit :
-  regexp -> int -> regexp = "pcre_set_imp_match_limit_stub" "noalloc"
+  regexp -> int -> regexp = "pcre_set_imp_match_limit_stub" [@@noalloc]
 
 external get_match_limit_recursion :
   regexp -> int option = "pcre_get_match_limit_recursion_stub"
 
 (* Internal use only! *)
 external set_imp_match_limit_recursion :
-  regexp -> int -> regexp = "pcre_set_imp_match_limit_recursion_stub" "noalloc"
+  regexp -> int -> regexp = "pcre_set_imp_match_limit_recursion_stub" [@@noalloc]
 
 let regexp
       ?(study = true) ?limit ?limit_recursion
@@ -273,29 +273,29 @@ let regexp_or
   regexp ?study ?limit ?limit_recursion ~iflags ?flags ?chtables big_pat
 
 let bytes_unsafe_blit_string str str_ofs bts bts_ofs len =
-  let str_bts = str in
-  String.unsafe_blit str_bts str_ofs bts bts_ofs len
+  let str_bts = Bytes.unsafe_of_string str in
+  Bytes.unsafe_blit str_bts str_ofs bts bts_ofs len
 
 let string_unsafe_sub str ofs len =
-  let res = String.create len in
+  let res = Bytes.create len in
   bytes_unsafe_blit_string str ofs res 0 len;
-  res
+  Bytes.unsafe_to_string res
 
 let quote s =
   let len = String.length s in
-  let buf = String.create (len lsl 1) in
+  let buf = Bytes.create (len lsl 1) in
   let pos = ref 0 in
   for i = 0 to len - 1 do
     match String.unsafe_get s i with
     | '\\' | '^' | '$' | '.' | '[' | '|'
     | '('  | ')' | '?' | '*' | '+' | '{' as c ->
-      String.unsafe_set buf !pos '\\';
+      Bytes.unsafe_set buf !pos '\\';
       incr pos;
-      String.unsafe_set buf !pos c;
+      Bytes.unsafe_set buf !pos c;
       incr pos
-    | c -> String.unsafe_set buf !pos c; incr pos
+    | c -> Bytes.unsafe_set buf !pos c; incr pos
   done;
-  string_unsafe_sub (buf) 0 !pos
+  string_unsafe_sub (Bytes.unsafe_to_string buf) 0 !pos
 
 
 (* Matching of patterns and subpattern extraction *)
@@ -586,7 +586,7 @@ let replace ?(iflags = 0) ?flags ?(rex = def_rex) ?pat
     then
       let postfix_len = max (subj_len - cur_pos) 0 in
       let left = pos + full_len in
-      let res = String.create (left + postfix_len) in
+      let res = Bytes.create (left + postfix_len) in
       bytes_unsafe_blit_string subj 0 res 0 pos;
       bytes_unsafe_blit_string subj cur_pos res left postfix_len;
       let inner_coll ofs (templ, ix, len) =
@@ -596,7 +596,7 @@ let replace ?(iflags = 0) ?flags ?(rex = def_rex) ?pat
         let _ = List.fold_left inner_coll new_ofs trans_lst in
         new_ofs in
       let _ = List.fold_left coll left trans_lsts in
-      res
+      Bytes.unsafe_to_string res
     else
       let first = Array.unsafe_get ovector 0 in
       let len = first - cur_pos in
@@ -636,7 +636,7 @@ let qreplace ?(iflags = 0) ?flags ?(rex = def_rex) ?pat
     then
       let postfix_len = max (subj_len - cur_pos) 0 in
       let left = pos + full_len in
-      let res = String.create (left + postfix_len) in
+      let res = Bytes.create (left + postfix_len) in
       bytes_unsafe_blit_string subj 0 res 0 pos;
       bytes_unsafe_blit_string subj cur_pos res left postfix_len;
       let coll ofs = function
@@ -649,7 +649,7 @@ let qreplace ?(iflags = 0) ?flags ?(rex = def_rex) ?pat
             bytes_unsafe_blit_string templ 0 res new_ofs templ_len;
             new_ofs in
       let _ = List.fold_left coll left subst_lst in
-      res
+      Bytes.unsafe_to_string res
     else
       let first = Array.unsafe_get ovector 0 in
       let len = first - cur_pos in
@@ -684,7 +684,7 @@ let substitute_substrings ?(iflags = 0) ?flags ?(rex = def_rex) ?pat
     then
       let postfix_len = max (subj_len - cur_pos) 0 in
       let left = pos + full_len in
-      let res = String.create (left + postfix_len) in
+      let res = Bytes.create (left + postfix_len) in
       bytes_unsafe_blit_string subj 0 res 0 pos;
       bytes_unsafe_blit_string subj cur_pos res left postfix_len;
       let coll ofs (templ, ix, len) =
@@ -692,7 +692,7 @@ let substitute_substrings ?(iflags = 0) ?flags ?(rex = def_rex) ?pat
         bytes_unsafe_blit_string templ ix res new_ofs len;
         new_ofs in
       let _ = List.fold_left coll left subst_lst in
-      res
+      Bytes.unsafe_to_string res
     else
       let first = Array.unsafe_get ovector 0 in
       let len = first - cur_pos in
@@ -739,13 +739,13 @@ let replace_first ?(iflags = 0) ?flags ?(rex = def_rex) ?pat ?(pos = 0)
     let first = Array.unsafe_get ovector 0 in
     let last = Array.unsafe_get ovector 1 in
     let rest = String.length subj - last in
-    let res = String.create (first + res_len + rest) in
+    let res = Bytes.create (first + res_len + rest) in
     bytes_unsafe_blit_string subj 0 res 0 first;
     let coll ofs (templ, ix, len) =
       bytes_unsafe_blit_string templ ix res ofs len; ofs + len in
     let ofs = List.fold_left coll first trans_lst in
     bytes_unsafe_blit_string subj last res ofs rest;
-    res
+    Bytes.unsafe_to_string res
   with Not_found -> string_copy subj
 
 let qreplace_first ?(iflags = 0) ?flags ?(rex = def_rex) ?pat
@@ -760,11 +760,11 @@ let qreplace_first ?(iflags = 0) ?flags ?(rex = def_rex) ?pat
     let len = String.length templ in
     let rest = String.length subj - last in
     let postfix_start = first + len in
-    let res = String.create (postfix_start + rest) in
+    let res = Bytes.create (postfix_start + rest) in
     bytes_unsafe_blit_string subj 0 res 0 first;
     bytes_unsafe_blit_string templ 0 res first len;
     bytes_unsafe_blit_string subj last res postfix_start rest;
-    res
+    Bytes.unsafe_to_string res
   with Not_found -> string_copy subj
 
 let substitute_substrings_first ?(iflags = 0) ?flags ?(rex = def_rex) ?pat
@@ -781,11 +781,11 @@ let substitute_substrings_first ?(iflags = 0) ?flags ?(rex = def_rex) ?pat
     let postfix_len = subj_len - last in
     let templ_len = String.length templ in
     let postfix_start = prefix_len + templ_len in
-    let res = String.create (postfix_start + postfix_len) in
+    let res = Bytes.create (postfix_start + postfix_len) in
     bytes_unsafe_blit_string subj 0 res 0 prefix_len;
     bytes_unsafe_blit_string templ 0 res prefix_len templ_len;
     bytes_unsafe_blit_string subj last res postfix_start postfix_len;
-    res
+    Bytes.unsafe_to_string res
   with Not_found -> string_copy subj
 
 let substitute_first ?iflags ?flags ?rex ?pat ?pos
@@ -880,7 +880,7 @@ let internal_psplit flags rex max pos callout subj =
 
 let rec strip_all_empty = function "" :: t -> strip_all_empty t | l -> l
 
-external isspace : char -> bool = "pcre_isspace_stub" "noalloc"
+external isspace : char -> bool = "pcre_isspace_stub" [@@noalloc]
 
 let rec find_no_space ix len str =
   if ix = len || not (isspace (String.unsafe_get str ix)) then ix
@@ -1031,4 +1031,4 @@ let foreach_file filenames f =
     let file = open_in filename in
     try f filename file; close_in file
     with exn -> close_in file; raise exn in
-  List.iter do_with_file filenames
+  List.iter do_with_file filenames
\ No newline at end of file
diff --git a/libs/swflib/Makefile b/libs/swflib/Makefile
index ed80b6f57a2d58e0cf51bc80d52f83983bac94fc..ca751b2d192777317bb13752f886e4146b267367 100644
--- a/libs/swflib/Makefile
+++ b/libs/swflib/Makefile
@@ -1,81 +1,81 @@
-# Makefile generated by OCamake
-# http://tech.motion-twin.com
-OCAMLOPT=ocamlopt
-OCAMLC=ocamlc
-.SUFFIXES : .ml .mli .cmo .cmi .cmx .mll .mly
-
-ALL_CFLAGS= $(CFLAGS) -I ../extlib -I ../extc -g
-LIBS=
-
-SRC=actionScript.ml as3hl.mli as3.mli png.ml swflib.sln swf.ml swfPic.ml as3code.ml as3hlparse.ml as3parse.ml png.mli swfParser.ml
-
-MODULES=as3code.cmx png.cmx swf.cmx actionScript.cmx as3parse.cmx swfPic.cmx as3hlparse.cmx swfParser.cmx
-
-all: native bytecode
-
-native: swflib.cmxa
-
-bytecode: swflib.cma
-
-swflib.cmxa: $(MODULES)
-	$(OCAMLOPT) -o swflib.cmxa -a $(LIBS) $(MODULES)
-
-swflib.cma: $(MODULES:.cmx=.cmo)
-	$(OCAMLC) -o swflib.cma -a $(LFLAGS) $(LIBS) $(MODULES:.cmx=.cmo)
-
-actionScript.cmx: swf.cmx
-
-actionScript.cmo: swf.cmi
-
-as3code.cmo: as3.cmi
-
-as3code.cmx: as3.cmi
-
-as3hl.cmi: as3.cmi
-
-as3hlparse.cmo: as3parse.cmo as3hl.cmi as3code.cmo as3.cmi
-
-as3hlparse.cmx: as3parse.cmx as3hl.cmi as3code.cmx as3.cmi
-
-as3parse.cmo: as3code.cmo as3.cmi
-
-as3parse.cmx: as3code.cmx as3.cmi
-
-png.cmo: png.cmi
-
-png.cmx: png.cmi
-
-swf.cmo: as3.cmi
-
-swf.cmx: as3.cmi
-
-swfParser.cmo: swf.cmo as3parse.cmo actionScript.cmo
-
-swfParser.cmx: swf.cmx as3parse.cmx actionScript.cmx
-
-swfPic.cmx: swf.cmx png.cmi
-
-clean:
-	rm -f swflib.cmxa swflib.cma swflib.lib swflib.a as3.cmi as3hl.cmi
-	rm -f $(MODULES) $(MODULES:.cmx=.obj) $(MODULES:.cmx=.cmi) $(MODULES:.cmx=.o) $(MODULES:.cmx=.cmo)
-
-# SUFFIXES
-.ml.cmo:
-	$(OCAMLC) $(ALL_CFLAGS) -c $<
-
-.ml.cmx:
-	$(OCAMLOPT) $(ALL_CFLAGS) -c $<
-
-.mli.cmi:
-	$(OCAMLC) $(ALL_CFLAGS) $<
-
-.mll.ml:
-	ocamllex $<
-
-.mly.ml:
-	ocamlyacc $<
-
-.PHONY: all bytecode native clean
-
-Makefile: ;
-$(SRC): ;
+# Makefile generated by OCamake
+# http://tech.motion-twin.com
+OCAMLOPT=ocamlopt
+OCAMLC=ocamlc
+.SUFFIXES : .ml .mli .cmo .cmi .cmx .mll .mly
+
+ALL_CFLAGS= $(CFLAGS) -safe-string -package extlib -I ../extlib-leftovers -I ../extc -g
+LIBS=
+
+SRC=actionScript.ml as3hl.mli as3.mli png.ml swflib.sln swf.ml swfPic.ml as3code.ml as3hlparse.ml as3parse.ml png.mli swfParser.ml
+
+MODULES=as3code.cmx png.cmx swf.cmx actionScript.cmx as3parse.cmx swfPic.cmx as3hlparse.cmx swfParser.cmx
+
+all: native bytecode
+
+native: swflib.cmxa
+
+bytecode: swflib.cma
+
+swflib.cmxa: $(MODULES)
+	ocamlfind $(OCAMLOPT) -safe-string -o swflib.cmxa -a $(LIBS) $(MODULES)
+
+swflib.cma: $(MODULES:.cmx=.cmo)
+	ocamlfind $(OCAMLC) -safe-string -o swflib.cma -a $(LFLAGS) $(LIBS) $(MODULES:.cmx=.cmo)
+
+actionScript.cmx: swf.cmx
+
+actionScript.cmo: swf.cmi
+
+as3code.cmo: as3.cmi
+
+as3code.cmx: as3.cmi
+
+as3hl.cmi: as3.cmi
+
+as3hlparse.cmo: as3parse.cmo as3hl.cmi as3code.cmo as3.cmi
+
+as3hlparse.cmx: as3parse.cmx as3hl.cmi as3code.cmx as3.cmi
+
+as3parse.cmo: as3code.cmo as3.cmi
+
+as3parse.cmx: as3code.cmx as3.cmi
+
+png.cmo: png.cmi
+
+png.cmx: png.cmi
+
+swf.cmo: as3.cmi
+
+swf.cmx: as3.cmi
+
+swfParser.cmo: swf.cmo as3parse.cmo actionScript.cmo
+
+swfParser.cmx: swf.cmx as3parse.cmx actionScript.cmx
+
+swfPic.cmx: swf.cmx png.cmi
+
+clean:
+	rm -f swflib.cmxa swflib.cma swflib.lib swflib.a as3.cmi as3hl.cmi
+	rm -f $(MODULES) $(MODULES:.cmx=.obj) $(MODULES:.cmx=.cmi) $(MODULES:.cmx=.o) $(MODULES:.cmx=.cmo)
+
+# SUFFIXES
+.ml.cmo:
+	ocamlfind $(OCAMLC) $(ALL_CFLAGS) -c $<
+
+.ml.cmx:
+	ocamlfind $(OCAMLOPT) $(ALL_CFLAGS) -c $<
+
+.mli.cmi:
+	ocamlfind $(OCAMLC) $(ALL_CFLAGS) $<
+
+.mll.ml:
+	ocamlfind ocamllex $<
+
+.mly.ml:
+	ocamlfind ocamlyacc $<
+
+.PHONY: all bytecode native clean
+
+Makefile: ;
+$(SRC): ;
diff --git a/libs/swflib/actionScript.ml b/libs/swflib/actionScript.ml
index 69ad6f5e007b4987ce3ba2b7728785d516506768..4fbe016f64eca05b1d80ede9f22bbc8d35b6759b 100644
--- a/libs/swflib/actionScript.ml
+++ b/libs/swflib/actionScript.ml
@@ -387,7 +387,7 @@ let parse_action ch =
 			with
 				Not_found ->
 					printf "Unknown Action 0x%.2X (%d)\n" id len;
-					AUnknown (id,nread ch len)
+					AUnknown (id,nread_string ch len)
 	) in
 (*	let len2 = action_data_length act in
 	if len <> len2 then error (sprintf "Datalen mismatch for action 0x%.2X (%d != %d)" id len len2);
@@ -572,7 +572,7 @@ let write_action_data acts curindex ch = function
 	| ACallFrame ->
 		()
 	| AUnknown (_,data) ->
-		nwrite ch data
+		nwrite_string ch data
 	| _ ->
 		assert false
 
diff --git a/libs/swflib/as3code.ml b/libs/swflib/as3code.ml
index 859da70a5e6fb93bf7860b9adda97817e680dcfe..02e8e7fc8fc0c015ee389fa3904445a8aeb05d2c 100644
--- a/libs/swflib/as3code.ml
+++ b/libs/swflib/as3code.ml
@@ -437,7 +437,7 @@ let opcode ch =
 			A3Unk (char_of_int op)
 
 let parse ch len =
-	let data = nread ch len in
+	let data = nread_string ch len in
 	let ch = input_string data in
 	let a = MultiArray.create() in
 	let rec loop() =
diff --git a/libs/swflib/as3parse.ml b/libs/swflib/as3parse.ml
index 95c4a71f771e27d25f8af4c8a030c37c52ba25d7..cdb042025b31f96bafd6db5cee6b5bd5abb147b7 100644
--- a/libs/swflib/as3parse.ml
+++ b/libs/swflib/as3parse.ml
@@ -282,7 +282,7 @@ let read_int ch =
 	Int32.to_int (read_as3_int ch)
 
 let read_ident ch =
-	IO.nread ch (read_int ch)
+	IO.nread_string ch (read_int ch)
 
 let read_namespace idents ch =
 	let k = IO.read_byte ch in
@@ -605,7 +605,7 @@ let parse ch len =
 	if parse_statics then ctx.as3_statics <- Array.map (fun _ -> read_static ctx ch) ctx.as3_classes;
 	if parse_inits then ctx.as3_inits <- read_list2 ch (read_static ctx);
 	if parse_functions then ctx.as3_functions <- read_list2 ch (read_function ctx);
-	ctx.as3_unknown <- IO.really_nread ch (len - (get_pos()));
+	ctx.as3_unknown <- IO.really_nread_string ch (len - (get_pos()));
 	if parse_functions && String.length ctx.as3_unknown <> 0 then assert false;
 (*	let len2 = as3_length ctx in
 	if len2 <> len then begin Printf.printf "%d != %d" len len2; assert false; end;
@@ -655,7 +655,7 @@ let write_index_opt ch = function
 
 let write_as3_ident ch id =
 	write_int ch (String.length id);
-	IO.nwrite ch id
+	IO.nwrite_string ch id
 
 let write_namespace empty_index ch = function
 	| A3NPrivate n ->
@@ -890,9 +890,9 @@ let write ch1 ctx =
 	if parse_statics then Array.iter (write_static ch) ctx.as3_statics;
 	if parse_inits then write_list2 ch write_static ctx.as3_inits;
 	if parse_functions then write_list2 ch write_function ctx.as3_functions;
-	IO.nwrite ch ctx.as3_unknown;
+	IO.nwrite_string ch ctx.as3_unknown;
 	let str = IO.close_out ch in
-	List.iter (IO.nwrite ch1) str
+	List.iter (IO.nwrite_string ch1) str
 
 (* ************************************************************************ *)
 (* DUMP *)
diff --git a/libs/swflib/png.ml b/libs/swflib/png.ml
index 38804a058c06913d24345a1163526901edd3eed8..0a851b3ba190eac99f1243e77fd55583a8d8bb9d 100644
--- a/libs/swflib/png.ml
+++ b/libs/swflib/png.ml
@@ -110,9 +110,9 @@ let rec header = function
 	| CHeader h :: _ -> h
 	| _ :: l -> header l
 
-let data f = 
+let data f =
 	let rec loop acc = function
-		| [] -> 
+		| [] ->
 			(match List.rev acc with
 			| [] -> error Invalid_file
 			| l -> String.concat "" l)
@@ -166,7 +166,7 @@ let input_crc ch =
 		~input:(fun s p l ->
 			let l = IO.input ch s p l in
 			for i = 0 to l - 1 do
-				update s.[p+i]
+				update (Bytes.get s (p+i))
 			done;
 			l
 		)
@@ -191,7 +191,7 @@ let output_crc ch =
 		~output:(fun s p l ->
 			let l = IO.output ch s p l in
 			for i = 0 to l - 1 do
-				update s.[p+i]
+				update (Bytes.get s (p+i))
 			done;
 			l
 		)
@@ -233,9 +233,9 @@ let parse_header ch =
 let parse_chunk ch =
 	let len = IO.BigEndian.read_i32 ch in
 	let ch2 , crc = input_crc ch in
-	let id = IO.nread ch2 4 in
+	let id = IO.nread_string ch2 4 in
 	if len < 0 || not (is_id_char id.[0]) || not (is_id_char id.[1]) || not (is_id_char id.[2]) || not (is_id_char id.[3]) then error Invalid_file;
-	let data = IO.nread ch2 len in
+	let data = IO.nread_string ch2 len in
 	let crc_val = IO.BigEndian.read_real_i32 ch in
 	if crc_val <> crc() then error Invalid_CRC;
 	match id with
@@ -248,7 +248,7 @@ let parse_chunk ch =
 let png_sign = "\137\080\078\071\013\010\026\010"
 
 let parse ch =
-	let sign = (try IO.nread ch (String.length png_sign) with IO.No_more_input -> error Invalid_header) in
+	let sign = (try IO.nread_string ch (String.length png_sign) with IO.No_more_input -> error Invalid_header) in
 	if sign <> png_sign then error Invalid_header;
 	let rec loop acc =
 		match parse_chunk ch with
@@ -264,8 +264,8 @@ let parse ch =
 let write_chunk ch cid cdata =
 	IO.BigEndian.write_i32 ch (String.length cdata);
 	let ch2 , crc = output_crc ch in
-	IO.nwrite ch2 cid;
-	IO.nwrite ch2 cdata;
+	IO.nwrite_string ch2 cid;
+	IO.nwrite_string ch2 cdata;
 	IO.BigEndian.write_real_i32 ch (crc())
 
 let write_header real_ch h =
@@ -286,7 +286,7 @@ let write_header real_ch h =
 	write_chunk real_ch "IHDR" data
 
 let write ch png =
-	IO.nwrite ch png_sign;
+	IO.nwrite_string ch png_sign;
 	List.iter (function
 		| CEnd -> write_chunk ch "IEND" ""
 		| CHeader h -> write_header ch h
@@ -306,14 +306,14 @@ let filter png data =
 	| ClTrueColor (TBits16,_) -> error Unsupported_colors
 	| ClTrueColor (TBits8,alpha) ->
 		let alpha = (match alpha with NoAlpha -> false | HaveAlpha -> true) in
-		let buf = String.create (w * h * 4) in
+		let buf = Bytes.create (w * h * 4) in
 		let nbytes = if alpha then 4 else 3 in
 		let stride = nbytes * w + 1 in
 		if String.length data < h * stride then error Invalid_datasize;
 		let bp = ref 0 in
 		let get p = int_of_char (String.unsafe_get data p) in
-		let bget p = int_of_char (String.unsafe_get buf p) in
-		let set v = String.unsafe_set buf !bp (Char.unsafe_chr v); incr bp in
+		let bget p = int_of_char (Bytes.unsafe_get buf p) in
+		let set v = Bytes.unsafe_set buf !bp (Char.unsafe_chr v); incr bp in
 		let filters = [|
 			(fun x y v -> v
 			);
@@ -364,12 +364,12 @@ let filter png data =
 				end;
 			done;
 		done;
-		buf
+		Bytes.to_string buf
 
 let make ~width ~height ~pixel ~compress =
-	let data = String.create (width * height * 4 + height) in
+	let data = Bytes.create (width * height * 4 + height) in
 	let p = ref 0 in
-	let set v = String.unsafe_set data !p (Char.unsafe_chr v); incr p in
+	let set v = Bytes.unsafe_set data !p (Char.unsafe_chr v); incr p in
 	for y = 0 to height - 1 do
 		set 0;
 		for x = 0 to width - 1 do
@@ -382,6 +382,7 @@ let make ~width ~height ~pixel ~compress =
 			set (Int32.to_int (Int32.shift_right_logical c 24));
 		done;
 	done;
+	let data = Bytes.to_string data in
 	let data = compress data in
 	let header = {
 		png_width = width;
diff --git a/libs/swflib/swfParser.ml b/libs/swflib/swfParser.ml
index 4cd9698c9971744dfcf890080c6ccd23c8a78691..2f647453261e8916ba7cd3f17e37aa24f92aa4a6 100644
--- a/libs/swflib/swfParser.ml
+++ b/libs/swflib/swfParser.ml
@@ -925,7 +925,7 @@ let parse_bitmap_lossless ch len =
 	let format = read_byte ch in
 	let width = read_ui16 ch in
 	let height = read_ui16 ch in
-	let data = nread ch (len - 7) in
+	let data = nread_string ch (len - 7) in
 	{
 		bll_id = id;
 		bll_format = format;
@@ -1028,7 +1028,7 @@ let parse_edit_text ch =
 
 let parse_cid_data ch len =
 	let id = read_ui16 ch in
-	let data = nread ch (len - 2) in
+	let data = nread_string ch (len - 2) in
 	{
 		cd_id = id;
 		cd_data = data;
@@ -1038,7 +1038,7 @@ let parse_morph_shape ch len =
 	let id = read_ui16 ch in
 	let sbounds = read_rect ch in
 	let ebounds = read_rect ch in
-	let data = nread ch (len - 2 - rect_length sbounds - rect_length ebounds) in
+	let data = nread_string ch (len - 2 - rect_length sbounds - rect_length ebounds) in
 	{
 		msh_id = id;
 		msh_start_bounds = sbounds;
@@ -1050,7 +1050,7 @@ let parse_filter_gradient ch =
 	let ncolors = read_byte ch in
 	let colors = read_count ncolors read_rgba ch in
 	let cvals = read_count ncolors read_byte ch in
-	let data = nread ch 19 in
+	let data = nread_string ch 19 in
 	{
 		fgr_colors = List.combine colors cvals;
 		fgr_data = data;
@@ -1058,12 +1058,12 @@ let parse_filter_gradient ch =
 
 let parse_filter ch =
 	match read_byte ch with
-	| 0 -> FDropShadow (nread ch 23)
-	| 1 -> FBlur (nread ch 9)
-	| 2 -> FGlow (nread ch 15)
-	| 3 -> FBevel (nread ch 27)
+	| 0 -> FDropShadow (nread_string ch 23)
+	| 1 -> FBlur (nread_string ch 9)
+	| 2 -> FGlow (nread_string ch 15)
+	| 3 -> FBevel (nread_string ch 27)
 	| 4 -> FGradientGlow (parse_filter_gradient ch)
-	| 6 -> FAdjustColor (nread ch 80)
+	| 6 -> FAdjustColor (nread_string ch 80)
 	| 7 -> FGradientBevel (parse_filter_gradient ch)
 	| _ -> assert false
 
@@ -1187,14 +1187,14 @@ let rec parse_tag ch h =
 			}
 		| 0x06 ->
 			let id = read_ui16 ch in
-			let data = nread ch (len - 2) in
+			let data = nread_string ch (len - 2) in
 			TBitsJPEG {
 				jpg_id = id;
 				jpg_data = data;
 			}
 		(*//0x07 TButton *)
 		| 0x08 ->
-			TJPEGTables (nread ch len)
+			TJPEGTables (nread_string ch len)
 		| 0x09 ->
 			TSetBgColor (read_rgb ch)
 		| 0x0A ->
@@ -1209,7 +1209,7 @@ let rec parse_tag ch h =
 			let sid = read_ui16 ch in
 			let flags = read_byte ch in
 			let samples = read_i32 ch in
-			let data = nread ch (len - 7) in
+			let data = nread_string ch (len - 7) in
 			TSound {
 				so_id = sid;
 				so_flags = flags;
@@ -1218,7 +1218,7 @@ let rec parse_tag ch h =
 			}
 		| 0x0F ->
 			let sid = read_ui16 ch in
-			let data = nread ch (len - 2) in
+			let data = nread_string ch (len - 2) in
 			TStartSound {
 				sts_id = sid;
 				sts_data = data;
@@ -1231,7 +1231,7 @@ let rec parse_tag ch h =
 			TBitsLossless (parse_bitmap_lossless ch len)
 		| 0x15 ->
 			let id = read_ui16 ch in
-			let data = nread ch (len - 2) in
+			let data = nread_string ch (len - 2) in
 			let data, table = extract_jpg_table data in
 			TBitsJPEG2 {
 				bd_id = id;
@@ -1262,9 +1262,9 @@ let rec parse_tag ch h =
 		| 0x23 ->
 			let id = read_ui16 ch in
 			let size = read_i32 ch in
-			let data = nread ch size in
+			let data = nread_string ch size in
 			let data, table = extract_jpg_table data in
-			let alpha = nread ch (len - 6 - size) in
+			let alpha = nread_string ch (len - 6 - size) in
 			TBitsJPEG3 {
 				bd_id = id;
 				bd_table = table;
@@ -1289,7 +1289,7 @@ let rec parse_tag ch h =
 		(* 0x28 invalid *)
 		| 0x29 ->
 			(* undocumented ? *)
-			TProductInfo (nread ch len)
+			TProductInfo (nread_string ch len)
 		(* 0x2A invalid *)
 		| 0x2B ->
 			let label = read_string ch in
@@ -1297,7 +1297,7 @@ let rec parse_tag ch h =
 			TFrameLabel (label,id)
 		(* 0x2C invalid *)
 		| 0x2D ->
-			TSoundStreamHead2 (nread ch len)
+			TSoundStreamHead2 (nread_string ch len)
 		| 0x2E when !full_parsing ->
 			TMorphShape (parse_morph_shape ch len)
 		(* 0x2F invalid *)
@@ -1333,7 +1333,7 @@ let rec parse_tag ch h =
 			TFontInfo2 (parse_cid_data ch len)
 		| 0x3F ->
 			(* undocumented ? *)
-			TDebugID (nread ch len)
+			TDebugID (nread_string ch len)
 		| 0x40 ->
 			let tag = read_ui16 ch in
 			(* 0 in general, 6517 for some swfs *)
@@ -1420,10 +1420,10 @@ let rec parse_tag ch h =
 			if read_i32 ch <> 0 then assert false;
 			let rec loop len =
 				if len > Sys.max_string_length then
-					let s = nread ch Sys.max_string_length in
+					let s = nread_string ch Sys.max_string_length in
 					s :: loop (len - Sys.max_string_length)
 				else
-					[nread ch len]
+					[nread_string ch len]
 			in
 			(match loop (len - 6) with
 			| [data] -> TBinaryData (cid,data)
@@ -1435,9 +1435,9 @@ let rec parse_tag ch h =
 			let id = read_ui16 ch in
 			let size = read_i32 ch in
 			let deblock = read_ui16 ch in
-			let data = nread ch size in
+			let data = nread_string ch size in
 			let data, table = extract_jpg_table data in
-			let alpha = nread ch (len - 6 - size) in
+			let alpha = nread_string ch (len - 6 - size) in
 			TBitsJPEG4 {
 				bd_id = id;
 				bd_table = table;
@@ -1449,7 +1449,7 @@ let rec parse_tag ch h =
 			TFont4 (parse_cid_data ch len)
 		| _ ->
 			(*if !Swf.warnings then Printf.printf "Unknown tag 0x%.2X\n" id;*)
-			TUnknown (id,nread ch len)
+			TUnknown (id,nread_string ch len)
 	) in
 (*	let len2 = tag_data_length t in
 	if len <> len2 then error (Printf.sprintf "Datalen mismatch for tag 0x%.2X (%d != %d)" id len len2);
@@ -1469,7 +1469,7 @@ and parse_tag_list ch =
 	loop []
 
 let parse ch =
-	let sign = nread ch 3 in
+	let sign = nread_string ch 3 in
 	if sign <> "FWS" && sign <> "CWS" then error "Invalid SWF signature";
 	let ver = read_byte ch in
 	swf_version := ver;
@@ -1703,13 +1703,13 @@ let write_bitmap_lossless ch b =
 	write_byte ch b.bll_format;
 	write_ui16 ch b.bll_width;
 	write_ui16 ch b.bll_height;
-	nwrite ch b.bll_data
+	nwrite_string ch b.bll_data
 
 let write_morph_shape ch s =
 	write_ui16 ch s.msh_id;
 	write_rect ch s.msh_start_bounds;
 	write_rect ch s.msh_end_bounds;
-	nwrite ch s.msh_data
+	nwrite_string ch s.msh_data
 
 let write_text_record ch t r =
 	write_byte ch (make_flags [flag r.txr_dx; flag r.txr_dy; flag r.txr_color; flag r.txr_font; false; false; false; true]);
@@ -1760,33 +1760,33 @@ let write_edit_text ch t =
 
 let write_cid_data ch c =
 	write_ui16 ch c.cd_id;
-	nwrite ch c.cd_data
+	nwrite_string ch c.cd_data
 
 let write_filter_gradient ch fg =
 	write_byte ch (List.length fg.fgr_colors);
 	List.iter (fun (c,_) -> write_rgba ch c) fg.fgr_colors;
 	List.iter (fun (_,n) -> write_byte ch n) fg.fgr_colors;
-	nwrite ch fg.fgr_data
+	nwrite_string ch fg.fgr_data
 
 let write_filter ch = function
 	| FDropShadow s ->
 		write_byte ch 0;
-		nwrite ch s
+		nwrite_string ch s
 	| FBlur s ->
 		write_byte ch 1;
-		nwrite ch s
+		nwrite_string ch s
 	| FGlow s ->
 		write_byte ch 2;
-		nwrite ch s
+		nwrite_string ch s
 	| FBevel s ->
 		write_byte ch 3;
-		nwrite ch s
+		nwrite_string ch s
 	| FGradientGlow fg ->
 		write_byte ch 4;
 		write_filter_gradient ch fg
 	| FAdjustColor s ->
 		write_byte ch 6;
-		nwrite ch s
+		nwrite_string ch s
 	| FGradientBevel fg ->
 		write_byte ch 7;
 		write_filter_gradient ch fg
@@ -1871,9 +1871,9 @@ let rec write_tag_data ch = function
 		write_ui16 ch r.rmo_depth;
 	| TBitsJPEG b ->
 		write_ui16 ch b.jpg_id;
-		nwrite ch b.jpg_data
+		nwrite_string ch b.jpg_data
 	| TJPEGTables tab ->
-		nwrite ch tab
+		nwrite_string ch tab
 	| TSetBgColor c ->
 		write_rgb ch c
 	| TFont c ->
@@ -1888,16 +1888,16 @@ let rec write_tag_data ch = function
 		write_ui16 ch s.so_id;
 		write_byte ch s.so_flags;
 		write_i32 ch s.so_samples;
-		nwrite ch s.so_data
+		nwrite_string ch s.so_data
 	| TStartSound s ->
 		write_ui16 ch s.sts_id;
-		nwrite ch s.sts_data
+		nwrite_string ch s.sts_data
 	| TBitsLossless b ->
 		write_bitmap_lossless ch b
 	| TBitsJPEG2 b ->
 		write_ui16 ch b.bd_id;
-		opt (nwrite ch) b.bd_table;
-		nwrite ch b.bd_data;
+		opt (nwrite_string ch) b.bd_table;
+		nwrite_string ch b.bd_data;
 	| TShape2 s ->
 		write_shape ch s
 	| TProtect ->
@@ -1915,9 +1915,9 @@ let rec write_tag_data ch = function
 	| TBitsJPEG3 b ->
 		write_ui16 ch b.bd_id;
 		write_i32 ch (String.length b.bd_data + opt_len String.length b.bd_table);
-		opt (nwrite ch) b.bd_table;
-		nwrite ch b.bd_data;
-		opt (nwrite ch) b.bd_alpha;
+		opt (nwrite_string ch) b.bd_table;
+		nwrite_string ch b.bd_data;
+		opt (nwrite_string ch) b.bd_alpha;
 	| TBitsLossless2 b ->
 		write_bitmap_lossless ch b
 	| TEditText t ->
@@ -1928,12 +1928,12 @@ let rec write_tag_data ch = function
 		List.iter (write_tag ch) c.c_tags;
 		write_tag ch tag_end;
 	| TProductInfo s ->
-		nwrite ch s
+		nwrite_string ch s
 	| TFrameLabel (label,id) ->
 		write_string ch label;
 		opt (write ch) id;
 	| TSoundStreamHead2 data ->
-		nwrite ch data
+		nwrite_string ch data
 	| TMorphShape s ->
 		write_morph_shape ch s
 	| TFont2 c ->
@@ -1961,7 +1961,7 @@ let rec write_tag_data ch = function
 	| TFontInfo2 c ->
 		write_cid_data ch c
 	| TDebugID s ->
-		nwrite ch s
+		nwrite_string ch s
 	| TEnableDebugger2 (tag,pass) ->
 		write_ui16 ch tag;
 		write_string ch pass
@@ -2025,24 +2025,24 @@ let rec write_tag_data ch = function
 	| TBinaryData (id,data) ->
 		write_ui16 ch id;
 		write_i32 ch 0;
-		nwrite ch data
+		nwrite_string ch data
 	| TBigBinaryData (id,data) ->
 		write_ui16 ch id;
 		write_i32 ch 0;
-		List.iter (nwrite ch) data
+		List.iter (nwrite_string ch) data
 	| TFontName c ->
 		write_cid_data ch c
 	| TBitsJPEG4 b ->
 		write_ui16 ch b.bd_id;
 		write_i32 ch (String.length b.bd_data + opt_len String.length b.bd_table);
 		opt (write_ui16 ch) b.bd_deblock;
-		opt (nwrite ch) b.bd_table;
-		nwrite ch b.bd_data;
-		opt (nwrite ch) b.bd_alpha;
+		opt (nwrite_string ch) b.bd_table;
+		nwrite_string ch b.bd_data;
+		opt (nwrite_string ch) b.bd_alpha;
 	| TFont4 c ->
 		write_cid_data ch c
 	| TUnknown (_,data) ->
-		nwrite ch data
+		nwrite_string ch data
 
 and write_tag ch t =
 	let id = tag_id t.tdata in
@@ -2057,7 +2057,7 @@ and write_tag ch t =
 
 let write ch (h,tags) =
 	swf_version := h.h_version;
-	nwrite ch (if h.h_compressed then "CWS" else "FWS");
+	nwrite_string ch (if h.h_compressed then "CWS" else "FWS");
 	write ch (char_of_int h.h_version);
 	let rec calc_len = function
 		| [] -> tag_length tag_end
diff --git a/libs/swflib/swfPic.ml b/libs/swflib/swfPic.ml
index 6fb95f1bb8fc8260d8521ba015bd93529e2a2a63..7e69e28eb62d39f4ba678b0779b3ed1832cfdddf 100644
--- a/libs/swflib/swfPic.ml
+++ b/libs/swflib/swfPic.ml
@@ -73,6 +73,7 @@ let load_picture file id =
 		let w = header.png_width in
 		let h = header.png_height in
 		let data = (try Png.filter png data with Png.Error msg -> error (PngError msg)) in
+		let data = Bytes.unsafe_of_string data in
 		{
 			pwidth = w;
 			pheight = h;
@@ -82,30 +83,30 @@ let load_picture file id =
 				| ClTrueColor (TBits8,NoAlpha) ->
 					(* set alpha to 0 *)
 					for p = 0 to w * h - 1 do
-						String.unsafe_set data (p * 4) '\000';
+						Bytes.unsafe_set data (p * 4) '\000';
 					done;
 					TBitsLossless {
 						bll_id = id;
 						bll_format = 5;
 						bll_width = w;
 						bll_height = h;
-						bll_data = Extc.zip data;
+						bll_data = Extc.zip (Bytes.unsafe_to_string data);
 					}
 				| ClTrueColor (TBits8,HaveAlpha) ->
 					(* premultiply rgb by alpha *)
 					for p = 0 to w * h - 1 do
 						let k = p * 4 in
-						let a = int_of_char (String.unsafe_get data k) in
-						String.unsafe_set data (k + 1) (Char.unsafe_chr ((int_of_char (String.unsafe_get data (k + 1)) * a) / 0xFF));
-						String.unsafe_set data (k + 2) (Char.unsafe_chr ((int_of_char (String.unsafe_get data (k + 2)) * a) / 0xFF));
-						String.unsafe_set data (k + 3) (Char.unsafe_chr ((int_of_char (String.unsafe_get data (k + 3)) * a) / 0xFF));
+						let a = int_of_char (Bytes.unsafe_get data k) in
+						Bytes.unsafe_set data (k + 1) (Char.unsafe_chr ((int_of_char (Bytes.unsafe_get data (k + 1)) * a) / 0xFF));
+						Bytes.unsafe_set data (k + 2) (Char.unsafe_chr ((int_of_char (Bytes.unsafe_get data (k + 2)) * a) / 0xFF));
+						Bytes.unsafe_set data (k + 3) (Char.unsafe_chr ((int_of_char (Bytes.unsafe_get data (k + 3)) * a) / 0xFF));
 					done;
 					TBitsLossless2 {
 						bll_id = id;
 						bll_format = 5;
 						bll_width = w;
 						bll_height = h;
-						bll_data = Extc.zip data;
+						bll_data = Extc.zip (Bytes.unsafe_to_string data);
 					}
 				| _ -> error UnsupportedColorModel);
 		}
diff --git a/libs/ttflib/Makefile b/libs/ttflib/Makefile
index 164c21618896d811bb7a21b573d7d9b43d0db1d2..3cbb76d3e41f4cbe37d2ff6d9d7c82f52c58b7f5 100644
--- a/libs/ttflib/Makefile
+++ b/libs/ttflib/Makefile
@@ -1,7 +1,7 @@
 OCAMLOPT=ocamlopt
 OCAMLC=ocamlc
 
-FLAGS=-I ../extlib -I ../swflib
+FLAGS=-package extlib -safe-string -I ../extlib-leftovers -I ../swflib
 FILES=tTFData tTFParser tTFTools tTFSwfWriter tTFCanvasWriter tTFJsonWriter
 LIBS=extLib swflib unix
 
@@ -9,21 +9,21 @@ OUTPUT=ttf
 
 all: native bytecode
 
-native: ttf.cmxa
+native: ttflib.cmxa
 
-bytecode: ttf.cma
+bytecode: ttflib.cma
 
-ttf.cmxa: $(FILES:=.ml)
-	$(OCAMLOPT) $(FLAGS) $(FILES:=.ml) -g -a -o ttf.cmxa
+ttflib.cmxa: $(FILES:=.ml)
+	ocamlfind $(OCAMLOPT) $(FLAGS) $(FILES:=.ml) -g -a -o ttflib.cmxa
 
-ttf.cma: $(FILES:=.ml)
-	$(OCAMLC) $(FLAGS) $(FILES:=.ml) -g -a -o ttf.cma
+ttflib.cma: $(FILES:=.ml)
+	ocamlfind $(OCAMLC) $(FLAGS) $(FILES:=.ml) -g -a -o ttflib.cma
 
 exec:
-	$(OCAMLOPT) $(FLAGS) $(LIBS:=.cmxa) $(FILES:=.ml) main.ml -g -o $(OUTPUT)
+	ocamlfind $(OCAMLOPT) $(FLAGS) $(LIBS:=.cmxa) $(FILES:=.ml) main.ml -g -o $(OUTPUT)
 
 clean:
-	rm -rf ttf.cmxa ttf.cma ttf.lib ttf.a $(wildcard *.cmx) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.cmi) $(wildcard *.cmo)
+	rm -rf ttflib.cmxa ttflib.cma ttflib.lib ttflib.a $(wildcard *.cmx) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.cmi) $(wildcard *.cmo)
 
 .PHONY: all native bytecode clean exec
 
diff --git a/libs/ttflib/main.ml b/libs/ttflib/main.ml
index e5e4e71ec5b52bdccb44e3988fb4600c94414fb0..068a6fad4bbafffe35be03d4b44d8c165ceb1164 100644
--- a/libs/ttflib/main.ml
+++ b/libs/ttflib/main.ml
@@ -1,137 +1,137 @@
-open TTFData
-
-exception Abort
-
-let gen_hxswfml_debug fontname =
-	let xml = "<?xml version=\"1.0\" ?>
-	<swf>
-		<FileAttributes/>
-		<Custom tagId=\"75\" file=\"" ^ fontname ^ ".dat\" comment=\"DefineFont3\"/>
-		<SymbolClass id=\"1\" class=\"TestFont\" base=\"flash.text.Font\"/>
-		<DefineABC file=\"Main.swf\" isBoot=\"true\"/>
-		<ShowFrame/>
-	</swf>"
-	in
-	Std.output_file (fontname ^ ".fxml") xml;
-	if Sys.command "haxe -main Main -swf main.swf" <> 0 then failwith "Error while executing haxe";
-	if Sys.command ("hxswfml xml2swf \"" ^ fontname ^ ".fxml\" \"" ^ fontname ^ ".swf\" -no-strict") <> 0 then failwith "Error while executing hxswfml";
-	Unix.unlink (fontname ^ ".fxml");
-	Unix.unlink "main.swf"
-
-let normalize_path p =
-	let l = String.length p in
-	if l = 0 then
-		"./"
-	else begin
-		let p = String.concat "/" (ExtString.String.nsplit p "\\") in
-		match p.[l-1] with
-		| '/' -> p
-		| _ -> p ^ "/"
-	end
-
-let mk_dir_rec dir =
-	let dir = normalize_path dir in
-	let parts = ExtString.String.nsplit dir "/" in
-	let rec create acc = function
-		| [] -> ()
-		| "" :: [] -> ()
-		| d :: l ->
-			let dir = String.concat "/" (List.rev (d :: acc)) in
-			if not (Sys.file_exists dir) then Unix.mkdir dir 0o755;
-			create (d :: acc) l
-	in
-	create [] parts
-
-let exit msg =
-	prerr_endline msg;
-	raise Abort
-
-let process args =
-	let fonts = ref [] in
-	let range_str = ref "" in
-	let targets = ref [] in
-	let debug_hxswfml = ref false in
-	let args_callback s = fonts := s :: !fonts in
-	let usage = Printf.sprintf
-		"Ttf <font paths> (-swf|-canvas)"
-	in
-	let basic_args = [
-		("-range",Arg.String (fun str ->
-			range_str := str;
-		),"<str> : specifies the character range");
-		("-swf",Arg.String (fun dir ->
-			mk_dir_rec dir;
- 			let f ttf range_str =
- 				let config = {
- 					ttfc_range_str = range_str;
- 					ttfc_font_name = None;
- 				} in
-				let f2 = TTFSwfWriter.to_swf ttf config in
-				let ch = IO.output_channel (open_out_bin (dir ^ "/" ^ ttf.ttf_font_name ^ ".dat")) in
-				let b = IO.output_bits ch in
-				IO.write_i16 ch 1;
-				TTFSwfWriter.write_font2 ch b f2;
-				IO.close_out ch;
-				if !debug_hxswfml then begin
-					if not (Sys.file_exists "Main.hx") then failwith "Could not find Main.hx required for -hxswfml-debug";
-					let main = Std.input_file "Main.hx" in
-					let old = Sys.getcwd () in
-					Sys.chdir dir;
-					Std.output_file ~filename:"Main.hx" ~text:main;
-					gen_hxswfml_debug ttf.ttf_font_name;
-					Unix.unlink "Main.hx";
-					Sys.chdir old;
-				end
-			in
-			targets := f :: !targets;
-		),"<dir> : generate swf tag data to <dir>");
-		("-canvas", Arg.String (fun dir ->
-			mk_dir_rec dir;
- 			let f ttf range_str =
- 				let glyphs = TTFCanvasWriter.to_canvas ttf range_str in
-				let ch = IO.output_channel (open_out_bin (dir ^ "/" ^ ttf.ttf_font_name ^ ".js")) in
-				TTFCanvasWriter.write_font ch ttf glyphs;
-				IO.close_out ch;
-			in
-			targets := f :: !targets;
-		),"<dir> : generate canvas draw commands to <dir>");
-		("-json", Arg.String (fun dir ->
-			mk_dir_rec dir;
- 			let f ttf range_str =
- 				let glyphs = TTFJsonWriter.to_json ttf range_str in
-				let ch = IO.output_channel (open_out_bin (dir ^ "/" ^ ttf.ttf_font_name ^ ".js")) in
-				TTFJsonWriter.write_font ch ttf glyphs;
-				IO.close_out ch;
-			in
-			targets := f :: !targets;
-		),"<dir> : generate json-encoded glyph information to <dir>");
-		("-hxswfml-debug", Arg.Unit (fun () ->
-			debug_hxswfml := true;
-		),": generate debug swf with hxswfml")
-	] in
-	if Array.length Sys.argv = 1 then
-		Arg.usage basic_args usage
-	else begin
-		Arg.parse basic_args args_callback usage;
-		match !fonts,!targets with
-		| [],_ ->
-			prerr_endline "Missing font argument";
-			Arg.usage basic_args usage
-		| _,[] ->
-			prerr_endline "No targets specified (-swf|-canvas|-json)";
-			Arg.usage basic_args usage
-		| fonts,targets ->
-			List.iter (fun font ->
-				let ch = try open_in_bin font with _ -> exit ("No such file: " ^ font) in
-				let ttf = TTFParser.parse ch in
-				List.iter (fun target ->
-					target ttf !range_str
-				) targets;
-				close_in ch;
-			) fonts;
-	end
-;;
-try
-	process Sys.argv;
-with Abort ->
-	()
\ No newline at end of file
+open TTFData
+
+exception Abort
+
+let gen_hxswfml_debug fontname =
+	let xml = "<?xml version=\"1.0\" ?>
+	<swf>
+		<FileAttributes/>
+		<Custom tagId=\"75\" file=\"" ^ fontname ^ ".dat\" comment=\"DefineFont3\"/>
+		<SymbolClass id=\"1\" class=\"TestFont\" base=\"flash.text.Font\"/>
+		<DefineABC file=\"Main.swf\" isBoot=\"true\"/>
+		<ShowFrame/>
+	</swf>"
+	in
+	Std.output_file (fontname ^ ".fxml") xml;
+	if Sys.command "haxe -main Main -swf main.swf" <> 0 then failwith "Error while executing haxe";
+	if Sys.command ("hxswfml xml2swf \"" ^ fontname ^ ".fxml\" \"" ^ fontname ^ ".swf\" -no-strict") <> 0 then failwith "Error while executing hxswfml";
+	Unix.unlink (fontname ^ ".fxml");
+	Unix.unlink "main.swf"
+
+let normalize_path p =
+	let l = String.length p in
+	if l = 0 then
+		"./"
+	else begin
+		let p = String.concat "/" (ExtString.String.nsplit p "\\") in
+		match p.[l-1] with
+		| '/' -> p
+		| _ -> p ^ "/"
+	end
+
+let mk_dir_rec dir =
+	let dir = normalize_path dir in
+	let parts = ExtString.String.nsplit dir "/" in
+	let rec create acc = function
+		| [] -> ()
+		| "" :: [] -> ()
+		| d :: l ->
+			let dir = String.concat "/" (List.rev (d :: acc)) in
+			if not (Sys.file_exists dir) then Unix.mkdir dir 0o755;
+			create (d :: acc) l
+	in
+	create [] parts
+
+let exit msg =
+	prerr_endline msg;
+	raise Abort
+
+let process args =
+	let fonts = ref [] in
+	let range_str = ref "" in
+	let targets = ref [] in
+	let debug_hxswfml = ref false in
+	let args_callback s = fonts := s :: !fonts in
+	let usage = Printf.sprintf
+		"Ttf <font paths> (-swf|-canvas)"
+	in
+	let basic_args = [
+		("-range",Arg.String (fun str ->
+			range_str := str;
+		),"<str> : specifies the character range");
+		("-swf",Arg.String (fun dir ->
+			mk_dir_rec dir;
+ 			let f ttf range_str =
+ 				let config = {
+ 					ttfc_range_str = range_str;
+ 					ttfc_font_name = None;
+ 				} in
+				let f2 = TTFSwfWriter.to_swf ttf config in
+				let ch = IO.output_channel (open_out_bin (dir ^ "/" ^ ttf.ttf_font_name ^ ".dat")) in
+				let b = IO.output_bits ch in
+				IO.write_i16 ch 1;
+				TTFSwfWriter.write_font2 ch b f2;
+				IO.close_out ch;
+				if !debug_hxswfml then begin
+					if not (Sys.file_exists "Main.hx") then failwith "Could not find Main.hx required for -hxswfml-debug";
+					let main = Std.input_file "Main.hx" in
+					let old = Sys.getcwd () in
+					Sys.chdir dir;
+					Std.output_file ~filename:"Main.hx" ~text:main;
+					gen_hxswfml_debug ttf.ttf_font_name;
+					Unix.unlink "Main.hx";
+					Sys.chdir old;
+				end
+			in
+			targets := f :: !targets;
+		),"<dir> : generate swf tag data to <dir>");
+		("-canvas", Arg.String (fun dir ->
+			mk_dir_rec dir;
+ 			let f ttf range_str =
+ 				let glyphs = TTFCanvasWriter.to_canvas ttf range_str in
+				let ch = IO.output_channel (open_out_bin (dir ^ "/" ^ ttf.ttf_font_name ^ ".js")) in
+				TTFCanvasWriter.write_font ch ttf glyphs;
+				IO.close_out ch;
+			in
+			targets := f :: !targets;
+		),"<dir> : generate canvas draw commands to <dir>");
+		("-json", Arg.String (fun dir ->
+			mk_dir_rec dir;
+ 			let f ttf range_str =
+ 				let glyphs = TTFJsonWriter.to_json ttf range_str in
+				let ch = IO.output_channel (open_out_bin (dir ^ "/" ^ ttf.ttf_font_name ^ ".js")) in
+				TTFJsonWriter.write_font ch ttf glyphs;
+				IO.close_out ch;
+			in
+			targets := f :: !targets;
+		),"<dir> : generate json-encoded glyph information to <dir>");
+		("-hxswfml-debug", Arg.Unit (fun () ->
+			debug_hxswfml := true;
+		),": generate debug swf with hxswfml")
+	] in
+	if Array.length Sys.argv = 1 then
+		Arg.usage basic_args usage
+	else begin
+		Arg.parse basic_args args_callback usage;
+		match !fonts,!targets with
+		| [],_ ->
+			prerr_endline "Missing font argument";
+			Arg.usage basic_args usage
+		| _,[] ->
+			prerr_endline "No targets specified (-swf|-canvas|-json)";
+			Arg.usage basic_args usage
+		| fonts,targets ->
+			List.iter (fun font ->
+				let ch = try open_in_bin font with _ -> exit ("No such file: " ^ font) in
+				let ttf = TTFParser.parse ch in
+				List.iter (fun target ->
+					target ttf !range_str
+				) targets;
+				close_in ch;
+			) fonts;
+	end
+;;
+try
+	process Sys.argv;
+with Abort ->
+	()
diff --git a/libs/ttflib/tTFCanvasWriter.ml b/libs/ttflib/tTFCanvasWriter.ml
index ba719e78bc86815424ed5c0c432b4fc9f902490b..c8112315688271f333567ec4cc2a7fa8acde9acf 100644
--- a/libs/ttflib/tTFCanvasWriter.ml
+++ b/libs/ttflib/tTFCanvasWriter.ml
@@ -1,50 +1,50 @@
-(*
- * Copyright (C)2005-2014 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.
- *)
-
-open TTFData
-open TTFTools
-
-let rec write_glyph ttf key glyf =
-	key,TTFTools.build_glyph_paths ttf false glyf
-
-let write_font ch ttf glyphs =
-	let scale = 1024. /. (float_of_int ttf.ttf_head.hd_units_per_em) in
-	List.iter (fun (key,paths) ->
-		IO.nwrite ch (Printf.sprintf "\tfunction key%i(ctx) {\n" key);
-		IO.nwrite ch "\t\tctx.beginPath();\n";
-		List.iter (fun path ->
-			IO.nwrite ch (match path.gp_type with
-			| 0 -> Printf.sprintf "\t\tctx.moveTo(%.2f,%.2f);\n" (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
-			| 1 -> Printf.sprintf "\t\tctx.lineTo(%.2f,%.2f);\n" (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
-			| 2 -> Printf.sprintf "\t\tctx.quadraticCurveTo(%.2f,%.2f,%.2f,%.2f);\n" (path.gp_cx *. scale) (path.gp_cy *. scale *. (-1.)) (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
-			| _ -> assert false)
-		) paths;
-		IO.nwrite ch "\t\tctx.fill();\n";
-		IO.nwrite ch "\t}\n";
-	) glyphs;
-	()
-
-let to_canvas ttf range_str =
-	let lut = TTFTools.build_lut ttf range_str in
-	let glyfs = Hashtbl.fold (fun k v acc -> (k,ttf.ttf_glyfs.(v)) :: acc) lut [] in
-	let glyfs = List.stable_sort (fun a b -> compare (fst a) (fst b)) glyfs in
-	List.map (fun (k,g) -> write_glyph ttf k g) glyfs
\ No newline at end of file
+(*
+ * Copyright (C)2005-2014 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.
+ *)
+
+open TTFData
+open TTFTools
+
+let rec write_glyph ttf key glyf =
+	key,TTFTools.build_glyph_paths ttf false glyf
+
+let write_font ch ttf glyphs =
+	let scale = 1024. /. (float_of_int ttf.ttf_head.hd_units_per_em) in
+	List.iter (fun (key,paths) ->
+		IO.nwrite_string ch (Printf.sprintf "\tfunction key%i(ctx) {\n" key);
+		IO.nwrite_string ch "\t\tctx.beginPath();\n";
+		List.iter (fun path ->
+			IO.nwrite_string ch (match path.gp_type with
+			| 0 -> Printf.sprintf "\t\tctx.moveTo(%.2f,%.2f);\n" (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
+			| 1 -> Printf.sprintf "\t\tctx.lineTo(%.2f,%.2f);\n" (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
+			| 2 -> Printf.sprintf "\t\tctx.quadraticCurveTo(%.2f,%.2f,%.2f,%.2f);\n" (path.gp_cx *. scale) (path.gp_cy *. scale *. (-1.)) (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
+			| _ -> assert false)
+		) paths;
+		IO.nwrite_string ch "\t\tctx.fill();\n";
+		IO.nwrite_string ch "\t}\n";
+	) glyphs;
+	()
+
+let to_canvas ttf range_str =
+	let lut = TTFTools.build_lut ttf range_str in
+	let glyfs = Hashtbl.fold (fun k v acc -> (k,ttf.ttf_glyfs.(v)) :: acc) lut [] in
+	let glyfs = List.stable_sort (fun a b -> compare (fst a) (fst b)) glyfs in
+	List.map (fun (k,g) -> write_glyph ttf k g) glyfs
diff --git a/libs/ttflib/tTFData.ml b/libs/ttflib/tTFData.ml
index 1be335cfb685edd6590f96a5bdb2ea3bf7e8a298..bd917a9c2180f727fd8f2d3907c2bd2c7a8bfb2c 100644
--- a/libs/ttflib/tTFData.ml
+++ b/libs/ttflib/tTFData.ml
@@ -1,350 +1,360 @@
-(*
- * Copyright (C)2005-2014 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.
- *)
-
-type header = {
-	hd_major_version : int;
-	hd_minor_version : int;
-	hd_num_tables : int;
-	hd_search_range : int;
-	hd_entry_selector : int;
-	hd_range_shift : int;
-}
-
-type entry = {
-	entry_table_name : string;
-	entry_checksum : int32;
-	entry_offset : int32;
-	entry_length: int32;
-}
-
-(* GLYF *)
-
-type glyf_header = {
-	gh_num_contours : int;
-	gh_xmin : int;
-	gh_ymin : int;
-	gh_xmax : int;
-	gh_ymax : int;
-}
-
-type glyf_simple = {
-	gs_end_pts_of_contours : int array;
-	gs_instruction_length : int;
-	gs_instructions : char array;
-	gs_flags : int array;
-	gs_x_coordinates : int array;
-	gs_y_coordinates : int array;
-}
-
-type transformation_option =
-	| NoScale
-	| Scale of float
-	| ScaleXY of float * float
-	| ScaleMatrix of float * float * float * float
-
-type glyf_component = {
-	gc_flags : int;
-	gc_glyf_index : int;
-	gc_arg1 : int;
-	gc_arg2 : int;
-	gc_transformation : transformation_option;
-}
-
-type glyf =
-	| TGlyfSimple of glyf_header * glyf_simple
-	| TGlyfComposite of glyf_header * glyf_component list
-	| TGlyfNull
-
-(* HMTX *)
-
-type hmtx = {
-	advance_width : int;
-	left_side_bearing : int;
-}
-
-(* CMAP *)
-
-type cmap_subtable_header = {
-	csh_platform_id : int;
-	csh_platform_specific_id : int;
-	csh_offset : int32;
-}
-
-type cmap_format_0 = {
-	c0_format : int;
-	c0_length : int;
-	c0_language : int;
-	c0_glyph_index_array : char array;
-}
-
-type cmap_format_4 = {
-	c4_format : int;
-	c4_length : int;
-	c4_language : int;
-	c4_seg_count_x2 : int;
-	c4_search_range : int;
-	c4_entry_selector : int;
-	c4_range_shift : int;
-	c4_end_code : int array;
-	c4_reserved_pad : int;
-	c4_start_code : int array;
-	c4_id_delta : int array;
-	c4_id_range_offset : int array;
-	c4_glyph_index_array : int array;
-}
-
-type cmap_format_6 = {
-	c6_format : int;
-	c6_length : int;
-	c6_language : int;
-	c6_first_code : int;
-	c6_entry_count : int;
-	c6_glyph_index_array : int array;
-}
-
-type cmap_format_12_group = {
-	c12g_start_char_code : int32;
-	c12g_end_char_code : int32;
-	c12g_start_glyph_code : int32;
-}
-
-type cmap_format_12 = {
-	c12_format : int32;
-	c12_length : int32;
-	c12_language : int32;
-	c12_num_groups : int32;
-	c12_groups : cmap_format_12_group list;
-}
-
-type cmap_subtable_def =
-	| Cmap0 of cmap_format_0
-	| Cmap4 of cmap_format_4
-	| Cmap6 of cmap_format_6
-	| Cmap12 of cmap_format_12
-	| CmapUnk of string
-
-type cmap_subtable = {
-	cs_header : cmap_subtable_header;
-	cs_def : cmap_subtable_def;
-}
-
-type cmap = {
-	cmap_version : int;
-	cmap_num_subtables : int;
-	cmap_subtables : cmap_subtable list;
-}
-
-(* KERN *)
-
-type kern_subtable_header = {
-	ksh_length : int32;
-	ksh_coverage : int;
-	ksh_tuple_index : int;
-}
-
-type kern_pair = {
-	kern_left : int;
-	kern_right : int;
-	kern_value : int;
-}
-
-type kern_format_0 = {
-	k0_num_pairs : int;
-	k0_search_range : int;
-	k0_entry_selector : int;
-	k0_range_shift : int;
-	k0_pairs : kern_pair list;
-}
-
-type kern_format_2 = {
-	k2_row_width : int;
-	k2_left_offset_table : int;
-	k2_right_offset_table : int;
-	k2_array : int;
-	k2_first_glyph : int;
-	k2_num_glyphs : int;
-	k2_offsets : int list;
-}
-
-type kern_subtable_def =
-	| Kern0 of kern_format_0
-	| Kern2 of kern_format_2
-
-type kern_subtable = {
-	ks_header : kern_subtable_header;
-	ks_def : kern_subtable_def;
-}
-
-type kern = {
-	kern_version : int32;
-	kern_num_tables : int32;
-	kern_subtables : kern_subtable list;
-}
-
-(* NAME *)
-
-type name_record = {
-	nr_platform_id : int;
-	nr_platform_specific_id : int;
-	nr_language_id : int;
-	nr_name_id : int;
-	nr_length : int;
-	nr_offset : int;
-	mutable nr_value : string;
-}
-
-type name = {
-	name_format : int;
-	name_num_records : int;
-	name_offset : int;
-	name_records : name_record array;
-}
-
-(* HEAD *)
-
-type head = {
-	hd_version : int32;
-	hd_font_revision : int32;
-	hd_checksum_adjustment : int32;
-	hd_magic_number : int32;
-	hd_flags : int;
-	hd_units_per_em : int;
-	hd_created : float;
-	hd_modified : float;
-	hd_xmin : int;
-	hd_ymin : int;
-	hd_xmax : int;
-	hd_ymax : int;
-	hd_mac_style : int;
-	hd_lowest_rec_ppem : int;
-	hd_font_direction_hint : int;
-	hd_index_to_loc_format : int;
-	hd_glyph_data_format : int;
-}
-
-(* HHEA *)
-
-type hhea = {
-	hhea_version : int32;
-	hhea_ascent : int;
-	hhea_descent : int;
-	hhea_line_gap : int;
-	hhea_advance_width_max : int;
-	hhea_min_left_side_bearing : int;
-	hhea_min_right_side_bearing : int;
-	hhea_x_max_extent : int;
-	hhea_caret_slope_rise : int;
-	hhea_caret_slope_run : int;
-	hhea_caret_offset : int;
-	hhea_reserved : string;
-	hhea_metric_data_format : int;
-	hhea_number_of_hmetrics :int;
-}
-
-(* LOCA *)
-
-type loca = int32 array
-
-(* MAXP *)
-
-type maxp = {
-	maxp_version_number : int32;
-	maxp_num_glyphs : int;
-	maxp_max_points : int;
-	maxp_max_contours : int;
-	maxp_max_component_points : int;
-	maxp_max_component_contours : int;
-	maxp_max_zones : int;
-	maxp_max_twilight_points : int;
-	maxp_max_storage : int;
-	maxp_max_function_defs : int;
-	maxp_max_instruction_defs :int;
-	maxp_max_stack_elements : int;
-	maxp_max_size_of_instructions :int;
-	maxp_max_component_elements :int;
-	maxp_max_component_depth :int;
-}
-
-(* OS2 *)
-
-type os2 = {
-	os2_version : int;
-	os2_x_avg_char_width : int;
-	os2_us_weight_class : int;
-	os2_us_width_class : int;
-	os2_fs_type : int;
-	os2_y_subscript_x_size : int;
-	os2_y_subscript_y_size : int;
-	os2_y_subscript_x_offset : int;
-	os2_y_subscript_y_offset : int;
-	os2_y_superscript_x_size : int;
-	os2_y_superscript_y_size : int;
-	os2_y_superscript_x_offset : int;
-	os2_y_superscript_y_offset : int;
-	os2_y_strikeout_size : int;
-	os2_y_strikeout_position : int;
-	os2_s_family_class : int;
-	os2_b_family_type : int;
-	os2_b_serif_style : int;
-	os2_b_weight : int;
-	os2_b_proportion : int;
-	os2_b_contrast : int;
-	os2_b_stroke_variation : int;
-	os2_b_arm_style : int;
-	os2_b_letterform : int;
-	os2_b_midline : int;
-	os2_b_x_height : int;
-	os2_ul_unicode_range_1 : int32;
-	os2_ul_unicode_range_2 : int32;
-	os2_ul_unicode_range_3 : int32;
-	os2_ul_unicode_range_4 : int32;
-	os2_ach_vendor_id : int32;
-	os2_fs_selection : int;
-	os2_us_first_char_index : int;
-	os2_us_last_char_index : int;
-	os2_s_typo_ascender : int;
-	os2_s_typo_descender : int;
-	os2_s_typo_line_gap : int;
-	os2_us_win_ascent : int;
-	os2_us_win_descent : int;
-}
-
-type ttf = {
-	ttf_header : header;
-	ttf_font_name : string;
-	ttf_directory: (string,entry) Hashtbl.t;
-	ttf_glyfs : glyf array;
-	ttf_hmtx : hmtx array;
-	ttf_cmap : cmap;
-	ttf_head : head;
-	ttf_loca : loca;
-	ttf_hhea : hhea;
-	ttf_maxp : maxp;
-	ttf_name : name;
-	ttf_os2 : os2;
-	ttf_kern : kern option;
-}
-
-type ttf_config = {
-	mutable ttfc_range_str : string;
-	mutable ttfc_font_name : string option;
-}
\ No newline at end of file
+(*
+ * Copyright (C)2005-2014 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.
+ *)
+
+type header = {
+	hd_major_version : int;
+	hd_minor_version : int;
+	hd_num_tables : int;
+	hd_search_range : int;
+	hd_entry_selector : int;
+	hd_range_shift : int;
+}
+
+type entry = {
+	entry_table_name : string;
+	entry_checksum : int32;
+	entry_offset : int32;
+	entry_length: int32;
+}
+
+(* GLYF *)
+
+type glyf_header = {
+	gh_num_contours : int;
+	gh_xmin : int;
+	gh_ymin : int;
+	gh_xmax : int;
+	gh_ymax : int;
+}
+
+type glyf_simple = {
+	gs_end_pts_of_contours : int array;
+	gs_instruction_length : int;
+	gs_instructions : char array;
+	gs_flags : int array;
+	gs_x_coordinates : int array;
+	gs_y_coordinates : int array;
+}
+
+type transformation_option =
+	| NoScale
+	| Scale of float
+	| ScaleXY of float * float
+	| ScaleMatrix of float * float * float * float
+
+type glyf_component = {
+	gc_flags : int;
+	gc_glyf_index : int;
+	gc_arg1 : int;
+	gc_arg2 : int;
+	gc_transformation : transformation_option;
+}
+
+type glyf =
+	| TGlyfSimple of glyf_header * glyf_simple
+	| TGlyfComposite of glyf_header * glyf_component list
+	| TGlyfNull
+
+(* HMTX *)
+
+type hmtx = {
+	advance_width : int;
+	left_side_bearing : int;
+}
+
+(* CMAP *)
+
+type cmap_subtable_header = {
+	csh_platform_id : int;
+	csh_platform_specific_id : int;
+	csh_offset : int32;
+}
+
+type cmap_format_0 = {
+	c0_format : int;
+	c0_length : int;
+	c0_language : int;
+	c0_glyph_index_array : char array;
+}
+
+type cmap_format_4 = {
+	c4_format : int;
+	c4_length : int;
+	c4_language : int;
+	c4_seg_count_x2 : int;
+	c4_search_range : int;
+	c4_entry_selector : int;
+	c4_range_shift : int;
+	c4_end_code : int array;
+	c4_reserved_pad : int;
+	c4_start_code : int array;
+	c4_id_delta : int array;
+	c4_id_range_offset : int array;
+	c4_glyph_index_array : int array;
+}
+
+type cmap_format_6 = {
+	c6_format : int;
+	c6_length : int;
+	c6_language : int;
+	c6_first_code : int;
+	c6_entry_count : int;
+	c6_glyph_index_array : int array;
+}
+
+type cmap_format_12_group = {
+	c12g_start_char_code : int32;
+	c12g_end_char_code : int32;
+	c12g_start_glyph_code : int32;
+}
+
+type cmap_format_12 = {
+	c12_format : int32;
+	c12_length : int32;
+	c12_language : int32;
+	c12_num_groups : int32;
+	c12_groups : cmap_format_12_group list;
+}
+
+type cmap_subtable_def =
+	| Cmap0 of cmap_format_0
+	| Cmap4 of cmap_format_4
+	| Cmap6 of cmap_format_6
+	| Cmap12 of cmap_format_12
+	| CmapUnk of string
+
+type cmap_subtable = {
+	cs_header : cmap_subtable_header;
+	cs_def : cmap_subtable_def;
+}
+
+type cmap = {
+	cmap_version : int;
+	cmap_num_subtables : int;
+	cmap_subtables : cmap_subtable list;
+}
+
+(* KERN *)
+
+type kern_subtable_header = {
+	ksh_length : int32;
+	ksh_coverage : int;
+	ksh_tuple_index : int;
+}
+
+type kern_pair = {
+	kern_left : int;
+	kern_right : int;
+	kern_value : int;
+}
+
+type kern_format_0 = {
+	k0_num_pairs : int;
+	k0_search_range : int;
+	k0_entry_selector : int;
+	k0_range_shift : int;
+	k0_pairs : kern_pair list;
+}
+
+type kern_format_2 = {
+	k2_row_width : int;
+	k2_left_offset_table : int;
+	k2_right_offset_table : int;
+	k2_array : int;
+	k2_first_glyph : int;
+	k2_num_glyphs : int;
+	k2_offsets : int list;
+}
+
+type kern_subtable_def =
+	| Kern0 of kern_format_0
+	| Kern2 of kern_format_2
+
+type kern_subtable = {
+	ks_header : kern_subtable_header;
+	ks_def : kern_subtable_def;
+}
+
+type kern = {
+	kern_version : int32;
+	kern_num_tables : int32;
+	kern_subtables : kern_subtable list;
+}
+
+(* NAME *)
+
+type name_record = {
+	nr_platform_id : int;
+	nr_platform_specific_id : int;
+	nr_language_id : int;
+	nr_name_id : int;
+	nr_length : int;
+	nr_offset : int;
+	mutable nr_value : string;
+}
+
+type name = {
+	name_format : int;
+	name_num_records : int;
+	name_offset : int;
+	name_records : name_record array;
+}
+
+(* HEAD *)
+
+type head = {
+	hd_version : int32;
+	hd_font_revision : int32;
+	hd_checksum_adjustment : int32;
+	hd_magic_number : int32;
+	hd_flags : int;
+	hd_units_per_em : int;
+	hd_created : float;
+	hd_modified : float;
+	hd_xmin : int;
+	hd_ymin : int;
+	hd_xmax : int;
+	hd_ymax : int;
+	hd_mac_style : int;
+	hd_lowest_rec_ppem : int;
+	hd_font_direction_hint : int;
+	hd_index_to_loc_format : int;
+	hd_glyph_data_format : int;
+}
+
+(* HHEA *)
+
+type hhea = {
+	hhea_version : int32;
+	hhea_ascent : int;
+	hhea_descent : int;
+	hhea_line_gap : int;
+	hhea_advance_width_max : int;
+	hhea_min_left_side_bearing : int;
+	hhea_min_right_side_bearing : int;
+	hhea_x_max_extent : int;
+	hhea_caret_slope_rise : int;
+	hhea_caret_slope_run : int;
+	hhea_caret_offset : int;
+	hhea_reserved : string;
+	hhea_metric_data_format : int;
+	hhea_number_of_hmetrics :int;
+}
+
+(* LOCA *)
+
+type loca = int32 array
+
+(* MAXP *)
+
+type maxp = {
+	maxp_version_number : int32;
+	maxp_num_glyphs : int;
+	maxp_max_points : int;
+	maxp_max_contours : int;
+	maxp_max_component_points : int;
+	maxp_max_component_contours : int;
+	maxp_max_zones : int;
+	maxp_max_twilight_points : int;
+	maxp_max_storage : int;
+	maxp_max_function_defs : int;
+	maxp_max_instruction_defs :int;
+	maxp_max_stack_elements : int;
+	maxp_max_size_of_instructions :int;
+	maxp_max_component_elements :int;
+	maxp_max_component_depth :int;
+}
+
+(* OS2 *)
+
+type os2 = {
+	os2_version : int;
+	os2_x_avg_char_width : int;
+	os2_us_weight_class : int;
+	os2_us_width_class : int;
+	os2_fs_type : int;
+	os2_y_subscript_x_size : int;
+	os2_y_subscript_y_size : int;
+	os2_y_subscript_x_offset : int;
+	os2_y_subscript_y_offset : int;
+	os2_y_superscript_x_size : int;
+	os2_y_superscript_y_size : int;
+	os2_y_superscript_x_offset : int;
+	os2_y_superscript_y_offset : int;
+	os2_y_strikeout_size : int;
+	os2_y_strikeout_position : int;
+	os2_s_family_class : int;
+	os2_b_family_type : int;
+	os2_b_serif_style : int;
+	os2_b_weight : int;
+	os2_b_proportion : int;
+	os2_b_contrast : int;
+	os2_b_stroke_variation : int;
+	os2_b_arm_style : int;
+	os2_b_letterform : int;
+	os2_b_midline : int;
+	os2_b_x_height : int;
+	os2_ul_unicode_range_1 : int32;
+	os2_ul_unicode_range_2 : int32;
+	os2_ul_unicode_range_3 : int32;
+	os2_ul_unicode_range_4 : int32;
+	os2_ach_vendor_id : int32;
+	os2_fs_selection : int;
+	os2_us_first_char_index : int;
+	os2_us_last_char_index : int;
+	os2_s_typo_ascender : int;
+	os2_s_typo_descender : int;
+	os2_s_typo_line_gap : int;
+	os2_us_win_ascent : int;
+	os2_us_win_descent : int;
+}
+
+type ttf = {
+	ttf_header : header;
+	ttf_font_name : string;
+	ttf_directory: (string,entry) Hashtbl.t;
+	ttf_glyfs : glyf array;
+	ttf_hmtx : hmtx array;
+	ttf_cmap : cmap;
+	ttf_head : head;
+	ttf_loca : loca;
+	ttf_hhea : hhea;
+	ttf_maxp : maxp;
+	ttf_name : name;
+	ttf_os2 : os2;
+	ttf_kern : kern option;
+}
+
+type ttf_font_weight =
+	| TFWRegular
+	| TFWBold
+
+type ttf_font_posture =
+	| TFPNormal
+	| TFPItalic
+
+type ttf_config = {
+	mutable ttfc_range_str : string;
+	mutable ttfc_font_name : string option;
+	mutable ttfc_font_weight : ttf_font_weight;
+	mutable ttfc_font_posture : ttf_font_posture;
+}
diff --git a/libs/ttflib/tTFJsonWriter.ml b/libs/ttflib/tTFJsonWriter.ml
index 126cb6f073df8b502eac47d54ee1489d5416d892..dbc1f3a5a40702427ab207b06969760733bd114b 100644
--- a/libs/ttflib/tTFJsonWriter.ml
+++ b/libs/ttflib/tTFJsonWriter.ml
@@ -1,49 +1,49 @@
-(*
- * Copyright (C)2005-2014 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.
- *)
-
-open TTFData
-open TTFTools
-
-let rec write_glyph ttf key glyf =
-	key,TTFTools.build_glyph_paths ttf false glyf
-
-let write_font ch ttf glyphs =
-	let scale = 1024. /. (float_of_int ttf.ttf_head.hd_units_per_em) in
-	IO.nwrite ch "{\n\t";
-	IO.nwrite ch (String.concat ",\n\t" (List.map (fun (key,paths) ->
-		(Printf.sprintf "\"g%i\":[" key)
-		^ (String.concat "," (List.map (fun path ->
-			match path.gp_type with
-			| 0 -> Printf.sprintf "[0,%.2f,%.2f]" (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
-			| 1 -> Printf.sprintf "[1,%.2f,%.2f]" (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
-			| 2 -> Printf.sprintf "[2,%.2f,%.2f,%.2f,%.2f]" (path.gp_cx *. scale) (path.gp_cy *. scale *. (-1.)) (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
-			| _ -> assert false
-		) paths))
-		^ "]";
-	) glyphs));
-	IO.nwrite ch "\n}"
-
-let to_json ttf range_str =
-	let lut = TTFTools.build_lut ttf range_str in
-	let glyfs = Hashtbl.fold (fun k v acc -> (k,ttf.ttf_glyfs.(v)) :: acc) lut [] in
-	let glyfs = List.stable_sort (fun a b -> compare (fst a) (fst b)) glyfs in
-	List.map (fun (k,g) -> write_glyph ttf k g) glyfs
\ No newline at end of file
+(*
+ * Copyright (C)2005-2014 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.
+ *)
+
+open TTFData
+open TTFTools
+
+let rec write_glyph ttf key glyf =
+	key,TTFTools.build_glyph_paths ttf false glyf
+
+let write_font ch ttf glyphs =
+	let scale = 1024. /. (float_of_int ttf.ttf_head.hd_units_per_em) in
+	IO.nwrite_string ch "{\n\t";
+	IO.nwrite_string ch (String.concat ",\n\t" (List.map (fun (key,paths) ->
+		(Printf.sprintf "\"g%i\":[" key)
+		^ (String.concat "," (List.map (fun path ->
+			match path.gp_type with
+			| 0 -> Printf.sprintf "[0,%.2f,%.2f]" (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
+			| 1 -> Printf.sprintf "[1,%.2f,%.2f]" (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
+			| 2 -> Printf.sprintf "[2,%.2f,%.2f,%.2f,%.2f]" (path.gp_cx *. scale) (path.gp_cy *. scale *. (-1.)) (path.gp_x *. scale) (path.gp_y *. scale *. (-1.))
+			| _ -> assert false
+		) paths))
+		^ "]";
+	) glyphs));
+	IO.nwrite_string ch "\n}"
+
+let to_json ttf range_str =
+	let lut = TTFTools.build_lut ttf range_str in
+	let glyfs = Hashtbl.fold (fun k v acc -> (k,ttf.ttf_glyfs.(v)) :: acc) lut [] in
+	let glyfs = List.stable_sort (fun a b -> compare (fst a) (fst b)) glyfs in
+	List.map (fun (k,g) -> write_glyph ttf k g) glyfs
diff --git a/libs/ttflib/tTFParser.ml b/libs/ttflib/tTFParser.ml
index 455485a8a2a0d2b2813d0b3ab080dcdf2ed9fdb6..68d1e26329ab3d0610cddf5760d2b738d86ba527 100644
--- a/libs/ttflib/tTFParser.ml
+++ b/libs/ttflib/tTFParser.ml
@@ -1,688 +1,688 @@
-(*
- * Copyright (C)2005-2014 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.
- *)
-
-open TTFData
-open IO
-
-type ctx = {
-	file : Pervasives.in_channel;
-	ch : input;
-	mutable entry : entry;
-}
-
-let rd16 = BigEndian.read_i16
-let rdu16 = BigEndian.read_ui16
-let rd32 = BigEndian.read_i32
-let rd32r = BigEndian.read_real_i32
-
-let parse_header ctx =
-	let ch = ctx.ch in
-	let major_version = rdu16 ch in
-	let minor_version = rdu16 ch in
-	let num_tables = rdu16 ch in
-	let search_range = rdu16 ch in
-	let entry_selector = rdu16 ch in
-	let range_shift = rdu16 ch in
-	{
-		hd_major_version = major_version;
-		hd_minor_version = minor_version;
-		hd_num_tables = num_tables;
-		hd_search_range = search_range;
-		hd_entry_selector = entry_selector;
-		hd_range_shift = range_shift;
-	}
-
-let parse_directory ctx header =
-	let ch = ctx.ch in
-	let directory = Hashtbl.create 0 in
-	for i = 0 to header.hd_num_tables - 1 do
-		let name = nread ch 4 in
-		let cs = rd32r ch in
-		let off = rd32r ch in
-		let length = rd32r ch in
-		Hashtbl.add directory name {
-			entry_table_name = name;
-			entry_checksum = cs;
-			entry_offset = off;
-			entry_length = length;
-		}
-	done;
-	directory
-
-let parse_head_table ctx =
-	let ch = ctx.ch in
-	let version = rd32r ch in
-	let font_revision = rd32r ch in
-	let checksum_adjustment = rd32r ch in
-	let magic_number = rd32r ch in
-	let flags = rdu16 ch in
-	let units_per_em = rdu16 ch in
-	let created = BigEndian.read_double ch in
-	let modified = BigEndian.read_double ch in
-	let xmin = rd16 ch in
-	let ymin = rd16 ch in
-	let xmax = rd16 ch in
-	let ymax = rd16 ch in
-	let mac_style = rdu16 ch in
-	let lowest_rec_ppem = rdu16 ch in
-	let font_direction_hint = rd16 ch in
-	let index_to_loc_format = rd16 ch in
-	let glyph_data_format = rd16 ch in
-	{
-		hd_version = version;
-		hd_font_revision = font_revision;
-		hd_checksum_adjustment = checksum_adjustment;
-		hd_magic_number = magic_number;
-		hd_flags = flags;
-		hd_units_per_em = units_per_em;
-		hd_created = created;
-		hd_modified = modified;
-		hd_xmin = xmin;
-		hd_ymin = ymin;
-		hd_xmax = xmax;
-		hd_ymax = ymax;
-		hd_mac_style = mac_style;
-		hd_lowest_rec_ppem = lowest_rec_ppem;
-		hd_font_direction_hint = font_direction_hint;
-		hd_index_to_loc_format = index_to_loc_format;
-		hd_glyph_data_format = glyph_data_format;
-	}
-
-let parse_hhea_table ctx =
-	let ch = ctx.ch in
-	let version = rd32r ch in
-	let ascender = rd16 ch in
-	let descender = rd16 ch in
-	let line_gap = rd16 ch in
-	let advance_width_max = rdu16 ch in
-	let min_left_side_bearing = rd16 ch in
-	let min_right_side_bearing = rd16 ch in
-	let x_max_extent = rd16 ch in
-	let caret_slope_rise = rd16 ch in
-	let caret_slope_run = rd16 ch in
-	let caret_offset = rd16 ch in
-	let reserved = nread ch 8 in
-	let metric_data_format = rd16 ch in
-	let number_of_hmetrics = rdu16 ch in
-	{
-		hhea_version = version;
-		hhea_ascent = ascender;
-		hhea_descent = descender;
-		hhea_line_gap = line_gap;
-		hhea_advance_width_max = advance_width_max;
-		hhea_min_left_side_bearing = min_left_side_bearing;
-		hhea_min_right_side_bearing = min_right_side_bearing;
-		hhea_x_max_extent = x_max_extent;
-		hhea_caret_slope_rise = caret_slope_rise;
-		hhea_caret_slope_run = caret_slope_run;
-		hhea_caret_offset = caret_offset;
-		hhea_reserved = reserved;
-		hhea_metric_data_format = metric_data_format;
-		hhea_number_of_hmetrics = number_of_hmetrics;
-	}
-
-let parse_maxp_table ctx =
-	let ch = ctx.ch in
-	let version_number = rd32r ch in
-	let num_glyphs = rdu16 ch in
-	let max_points = rdu16 ch in
-	let max_contours = rdu16 ch in
-	let max_component_points = rdu16 ch in
-	let max_component_contours = rdu16 ch in
-	let max_zones = rdu16 ch in
-	let max_twilight_points = rdu16 ch in
-	let max_storage = rdu16 ch in
-	let max_function_defs = rdu16 ch in
-	let max_instruction_defs = rdu16 ch in
-	let max_stack_elements = rdu16 ch in
-	let max_size_of_instructions = rdu16 ch in
-	let max_component_elements = rdu16 ch in
-	let max_component_depth = rdu16 ch in
-	{
-		maxp_version_number = version_number;
-		maxp_num_glyphs = num_glyphs;
-		maxp_max_points = max_points;
-		maxp_max_contours = max_contours;
-		maxp_max_component_points = max_component_points;
-		maxp_max_component_contours = max_component_contours;
-		maxp_max_zones = max_zones;
-		maxp_max_twilight_points = max_twilight_points;
-		maxp_max_storage = max_storage;
-		maxp_max_function_defs = max_function_defs;
-		maxp_max_instruction_defs = max_instruction_defs;
-		maxp_max_stack_elements = max_stack_elements;
-		maxp_max_size_of_instructions = max_size_of_instructions;
-		maxp_max_component_elements = max_component_elements;
-		maxp_max_component_depth = max_component_depth;
-	}
-
-let parse_loca_table head maxp ctx =
-	let ch = ctx.ch in
-	if head.hd_index_to_loc_format = 0 then
-		Array.init (maxp.maxp_num_glyphs + 1) (fun _ -> Int32.of_int ((rdu16 ch) * 2))
-	else
-		Array.init (maxp.maxp_num_glyphs + 1) (fun _ -> rd32r ch)
-
-let parse_hmtx_table maxp hhea ctx =
-	let ch = ctx.ch in
-	let last_advance_width = ref 0 in (* check me 1/2*)
-	Array.init maxp.maxp_num_glyphs (fun i ->
-		let advance_width = if i > hhea.hhea_number_of_hmetrics-1 then (* check me 2/2*)
-			!last_advance_width
-		else
-			rdu16 ch
-		in
-		last_advance_width := advance_width;
-		let left_side_bearing = rd16 ch in
-		{
-			advance_width = advance_width;
-			left_side_bearing = left_side_bearing;
-		}
-	)
-
-let parse_cmap_table ctx =
-	let ch = ctx.ch in
-	let version = rdu16 ch in
-	let num_subtables = rdu16 ch in
-	let dir = ExtList.List.init num_subtables (fun _ ->
-		let platform_id = rdu16 ch in
-		let platform_specific_id = rdu16 ch in
-		let offset = rd32r ch in
-		{
-			csh_platform_id = platform_id;
-			csh_platform_specific_id = platform_specific_id;
-			csh_offset = offset;
-		}
-	) in
-	let dir = List.stable_sort (fun csh1 csh2 ->
-		if csh1.csh_platform_id < csh2.csh_platform_id then -1
-		else if csh1.csh_platform_id > csh2.csh_platform_id then 1
-		else compare csh1.csh_platform_specific_id csh2.csh_platform_specific_id
-	) dir in
-	let parse_sub entry =
-		seek_in ctx.file ((Int32.to_int ctx.entry.entry_offset) + (Int32.to_int entry.csh_offset));
-		let format = rdu16 ch in
-		let def = match format with
-			| 0 ->
-				let length = rdu16 ch in
-				let language = rdu16 ch in
-				let glyph_index = Array.init 256 (fun _ -> read ch) in
-				Cmap0 {
-					c0_format = 0;
-					c0_length = length;
-					c0_language = language;
-					c0_glyph_index_array = glyph_index;
-				}
-			| 4 ->
-				let length = rdu16 ch in
-				let language = rdu16 ch in
-				let seg_count_x2 = rdu16 ch in
-				let seg_count = seg_count_x2 / 2 in
-				let search_range = rdu16 ch in
-				let entry_selector = rdu16 ch in
-				let range_shift = rdu16 ch in
-				let end_code = Array.init seg_count (fun _ -> rdu16 ch) in
-				let reserved = rdu16 ch in
-				assert (reserved = 0);
-				let start_code = Array.init seg_count (fun _ -> rdu16 ch) in
-				let id_delta = Array.init seg_count (fun _ -> rdu16 ch) in
-				let id_range_offset = Array.init seg_count (fun _ -> rdu16 ch) in
-				let count = (length - (8 * seg_count + 16)) / 2 in
-				let glyph_index = Array.init count (fun _ -> rdu16 ch) in
-				Cmap4 {
-					c4_format = format;
-					c4_length = length;
-					c4_language = language;
-					c4_seg_count_x2 = seg_count_x2;
-					c4_search_range = search_range;
-					c4_entry_selector = entry_selector;
-					c4_range_shift = range_shift;
-					c4_end_code = end_code;
-					c4_reserved_pad = reserved;
-					c4_start_code = start_code;
-					c4_id_delta = id_delta;
-					c4_id_range_offset = id_range_offset;
-					c4_glyph_index_array = glyph_index;
-				}
-			| 6 ->
-				let length = rdu16 ch in
-				let language = rdu16 ch in
-				let first_code = rdu16 ch in
-				let entry_count = rdu16 ch in
-				let glyph_index = Array.init entry_count (fun _ -> rdu16 ch) in
-				Cmap6 {
-					c6_format = format;
-					c6_length = length;
-					c6_language = language;
-					c6_first_code = first_code;
-					c6_entry_count = entry_count;
-					c6_glyph_index_array = glyph_index;
-				}
-  			| 12 ->
-				ignore (rd16 ch);
-				let length = rd32r ch in
-				let language = rd32r ch in
-				let num_groups = rd32r ch in
-				let groups = ExtList.List.init (Int32.to_int num_groups) (fun _ ->
-					let start = rd32r ch in
-					let stop = rd32r ch in
-					let start_glyph = rd32r ch in
-					{
-						c12g_start_char_code = start;
-						c12g_end_char_code = stop;
-						c12g_start_glyph_code = start_glyph;
-					}
-				) in
-				Cmap12 {
-					c12_format = Int32.of_int 12;
-					c12_length = length;
-					c12_language = language;
-					c12_num_groups = num_groups;
-					c12_groups = groups;
-				}
-			| x ->
-				failwith ("Not implemented format: " ^ (string_of_int x));
-		in
-		{
-			cs_def = def;
-			cs_header = entry;
-		}
-
-	in
-	{
-		cmap_version = version;
-		cmap_num_subtables = num_subtables;
-		cmap_subtables = List.map parse_sub dir;
-	}
-
-let parse_glyf_table maxp loca cmap hmtx ctx =
-	let ch = ctx.ch in
-	let parse_glyf i =
-		seek_in ctx.file ((Int32.to_int ctx.entry.entry_offset) + (Int32.to_int loca.(i)));
-		let num_contours = rd16 ch in
-		let xmin = rd16 ch in
-		let ymin = rd16 ch in
-		let xmax = rd16 ch in
-		let ymax = rd16 ch in
-		let header = {
-			gh_num_contours = num_contours;
-			gh_xmin = xmin;
-			gh_ymin = ymin;
-			gh_xmax = xmax;
-			gh_ymax = ymax;
-		} in
-		if num_contours >= 0 then begin
-			let num_points = ref 0 in
-			let end_pts_of_contours = Array.init num_contours (fun i ->
-				let v = rdu16 ch in
-				if i = num_contours - 1 then num_points := v + 1;
-				v
-			) in
-			let instruction_length = rdu16 ch in
-			let instructions = Array.init instruction_length (fun _ ->
-				read ch
-			) in
-			let flags = DynArray.create () in
-			let rec loop index =
-				if index >= !num_points then () else begin
-					let v = read_byte ch in
-					let incr = if (v land 8) == 0 then begin
-						DynArray.add flags v;
-						1
-					end else begin
-						let r = (int_of_char (read ch)) in
-						for i = 0 to r do DynArray.add flags v done;
-						r + 1
-					end in
-					loop (index + incr)
-				end
-			in
-			loop 0;
-			assert (DynArray.length flags = !num_points);
-			let x_coordinates = Array.init !num_points (fun i ->
-				let flag = DynArray.get flags i in
-				if flag land 0x10 <> 0 then begin
-					if flag land 0x02 <> 0 then read_byte ch
-					else 0
-				end else begin
-					if flag land 0x02 <> 0 then -read_byte ch
-					else rd16 ch
-				end
-			) in
-			let y_coordinates = Array.init !num_points (fun i ->
-				let flag = DynArray.get flags i in
-				if flag land 0x20 <> 0 then begin
-					if flag land 0x04 <> 0 then read_byte ch
-					else 0
-				end else begin
-					if flag land 0x04 <> 0 then -read_byte ch
-					else rd16 ch
-				end;
-			) in
-			TGlyfSimple (header, {
-				gs_end_pts_of_contours = end_pts_of_contours;
-				gs_instruction_length = instruction_length;
-				gs_instructions = instructions;
-				gs_flags = DynArray.to_array flags;
-				gs_x_coordinates = x_coordinates;
-				gs_y_coordinates = y_coordinates;
-			})
-		end else if num_contours = -1 then begin
-			let acc = DynArray.create () in
-			let rec loop () =
-				let flags = rdu16 ch in
-				let glyph_index = rdu16 ch in
-				let arg1,arg2 = if flags land 1 <> 0 then begin
-					let arg1 = rd16 ch in
-					let arg2 = rd16 ch in
-					arg1,arg2
-				end else begin
-					let arg1 = read_byte ch in
-					let arg2 = read_byte ch in
-					arg1,arg2
-				end in
-				let fmt214 i = (float_of_int i) /. (float_of_int 0x4000) in
-				let fmode =	if flags land 8 <> 0 then
-					Scale (fmt214 (rd16 ch))
-				else if flags land 64 <> 0 then begin
-					let s1 = fmt214 (rd16 ch) in
-					let s2 = fmt214 (rd16 ch) in
-					ScaleXY (s1,s2)
-				end else if flags land 128 <> 0 then begin
-					let a = fmt214 (rd16 ch) in
-					let b = fmt214 (rd16 ch) in
-					let c = fmt214 (rd16 ch) in
-					let d = fmt214 (rd16 ch) in
-					ScaleMatrix (a,b,c,d)
-				end else
-					NoScale
-				in
-				DynArray.add acc {
-					gc_flags = flags;
-					gc_glyf_index = glyph_index;
-					gc_arg1 = if flags land 2 <> 0 then arg1 else 0;
-					gc_arg2 = if flags land 2 <> 0 then arg2 else 0;
-					gc_transformation = fmode;
-				};
-				if flags land 0x20 <> 0 then loop ();
-			in
-			loop ();
-			TGlyfComposite (header,(DynArray.to_list acc))
-		end else
-			failwith "Unknown Glyf"
-	in
-	Array.init maxp.maxp_num_glyphs (fun i ->
-		let len = (Int32.to_int loca.(i + 1)) - (Int32.to_int loca.(i)) in
-		if len > 0 then parse_glyf i else TGlyfNull
-	)
-
-let parse_kern_table ctx =
-	let ch = ctx.ch in
-	let version = Int32.of_int (rd16 ch) in
-	let num_tables = Int32.of_int (rd16 ch) in
-	let tables = ExtList.List.init (Int32.to_int num_tables) (fun _ ->
-		let length = Int32.of_int (rdu16 ch) in
-		let tuple_index = rdu16 ch in
-		let coverage = rdu16 ch in
-		let def = match coverage lsr 8 with
-		| 0 ->
-			let num_pairs = rdu16 ch in
-			let search_range = rdu16 ch in
-			let entry_selector = rdu16 ch in
-			let range_shift = rdu16 ch in
-			let kerning_pairs = ExtList.List.init num_pairs (fun _ ->
-				let left = rdu16 ch in
-				let right = rdu16 ch in
-				let value = rd16 ch in
-				{
-					kern_left = left;
-					kern_right = right;
-					kern_value = value;
-				}
-			) in
-			Kern0 {
-				k0_num_pairs = num_pairs;
-				k0_search_range = search_range;
-				k0_entry_selector = entry_selector;
-				k0_range_shift = range_shift;
-				k0_pairs = kerning_pairs;
-			}
-		| 2 ->
-			let row_width = rdu16 ch in
-			let left_offset_table = rdu16 ch in
-			let right_offset_table = rdu16 ch in
-			let array_offset = rdu16 ch in
-			let first_glyph = rdu16 ch in
-			let num_glyphs = rdu16 ch in
-			let offsets = ExtList.List.init num_glyphs (fun _ ->
-				rdu16 ch
-			) in
-			Kern2 {
-				k2_row_width = row_width;
-				k2_left_offset_table = left_offset_table;
-				k2_right_offset_table = right_offset_table;
-				k2_array = array_offset;
-				k2_first_glyph = first_glyph;
-				k2_num_glyphs = num_glyphs;
-				k2_offsets = offsets;
-			}
-		| i ->
-			failwith ("Unknown kerning: " ^ (string_of_int i));
-		in
-		{
-			ks_def = def;
-			ks_header = {
-				ksh_length = length;
-				ksh_coverage = coverage;
-				ksh_tuple_index = tuple_index;
-			}
-		}
-	) in
-	{
-		kern_version = version;
-		kern_num_tables = num_tables;
-		kern_subtables = tables;
-	}
-
-let parse_name_table ctx =
-	let ch = ctx.ch in
-	let format = rdu16 ch in
-	let num_records = rdu16 ch in
-	let offset = rdu16 ch in
-	let records = Array.init num_records (fun _ ->
-		let platform_id = rdu16 ch in
-		let platform_specific_id = rdu16 ch in
-		let language_id = rdu16 ch in
-		let name_id = rdu16 ch in
-		let length = rdu16 ch in
-		let offset = rdu16 ch in
-		{
-			nr_platform_id = platform_id;
-			nr_platform_specific_id = platform_specific_id;
-			nr_language_id = language_id;
-			nr_name_id = name_id;
-			nr_length = length;
-			nr_offset = offset;
-			nr_value = "";
-		}
-	) in
-	let ttf_name = ref "" in
-	(* TODO: use real utf16 conversion *)
-	let set_name n =
-		let l = ExtList.List.init (String.length n / 2) (fun i -> String.make 1 n.[i * 2 + 1]) in
-		ttf_name := String.concat "" l
-	in
-	let records = Array.map (fun r ->
-		seek_in ctx.file ((Int32.to_int ctx.entry.entry_offset) + offset + r.nr_offset);
-		r.nr_value <- nread ch r.nr_length;
-		if r.nr_name_id = 4 && r.nr_platform_id = 3 || r.nr_platform_id = 0 then set_name r.nr_value;
-		r
-	) records in
-	{
-		name_format = format;
-		name_num_records = num_records;
-		name_offset = offset;
-		name_records = records;
-	},!ttf_name
-
-let parse_os2_table ctx =
-	let ch = ctx.ch in
-	let version = rdu16 ch in
-	let x_avg_char_width = rd16 ch in
-	let us_weight_class = rdu16 ch in
-	let us_width_class = rdu16 ch in
-	let fs_type = rd16 ch in
-	let y_subscript_x_size = rd16 ch in
-	let y_subscript_y_size = rd16 ch in
-	let y_subscript_x_offset = rd16 ch in
-	let y_subscript_y_offset = rd16 ch in
-	let y_superscript_x_size = rd16 ch in
-	let y_superscript_y_size = rd16 ch in
-	let y_superscript_x_offset = rd16 ch in
-	let y_superscript_y_offset = rd16 ch in
-	let y_strikeout_size = rd16 ch in
-	let y_strikeout_position = rd16 ch in
-	let s_family_class = rd16 ch in
-
-	let b_family_type = read_byte ch in
-	let b_serif_style = read_byte ch in
-	let b_weight = read_byte ch in
-	let b_proportion = read_byte ch in
-	let b_contrast = read_byte ch in
-	let b_stroke_variation = read_byte ch in
-	let b_arm_style = read_byte ch in
-	let b_letterform = read_byte ch in
-	let b_midline = read_byte ch in
-	let b_x_height = read_byte ch in
-
-	let ul_unicode_range_1 = rd32r ch in
-	let ul_unicode_range_2 = rd32r ch in
-	let ul_unicode_range_3 = rd32r ch in
-	let ul_unicode_range_4 = rd32r ch in
-	let ach_vendor_id = rd32r ch in
-	let fs_selection = rd16 ch in
-	let us_first_char_index = rdu16 ch in
-	let us_last_char_index = rdu16 ch in
-	let s_typo_ascender = rd16 ch in
-	let s_typo_descender = rd16 ch in
-	let s_typo_line_gap = rd16 ch in
-	let us_win_ascent = rdu16 ch in
-	let us_win_descent = rdu16 ch in
-	{
-		os2_version = version;
-		os2_x_avg_char_width = x_avg_char_width;
-		os2_us_weight_class = us_weight_class;
-		os2_us_width_class = us_width_class;
-		os2_fs_type = fs_type;
-		os2_y_subscript_x_size = y_subscript_x_size;
-		os2_y_subscript_y_size = y_subscript_y_size;
-		os2_y_subscript_x_offset = y_subscript_x_offset;
-		os2_y_subscript_y_offset = y_subscript_y_offset;
-		os2_y_superscript_x_size = y_superscript_x_size;
-		os2_y_superscript_y_size = y_superscript_y_size;
-		os2_y_superscript_x_offset = y_superscript_x_offset;
-		os2_y_superscript_y_offset = y_superscript_y_offset;
-		os2_y_strikeout_size = y_strikeout_size;
-		os2_y_strikeout_position = y_strikeout_position;
-		os2_s_family_class = s_family_class;
-		os2_b_family_type = b_family_type;
-		os2_b_serif_style = b_serif_style;
-		os2_b_weight = b_weight;
-		os2_b_proportion = b_proportion;
-		os2_b_contrast = b_contrast;
-		os2_b_stroke_variation = b_stroke_variation;
-		os2_b_arm_style = b_arm_style;
-		os2_b_letterform = b_letterform;
-		os2_b_midline = b_midline;
-		os2_b_x_height = b_x_height;
-		os2_ul_unicode_range_1 = ul_unicode_range_1;
-		os2_ul_unicode_range_2 = ul_unicode_range_2;
-		os2_ul_unicode_range_3 = ul_unicode_range_3;
-		os2_ul_unicode_range_4 = ul_unicode_range_4;
-		os2_ach_vendor_id = ach_vendor_id;
-		os2_fs_selection = fs_selection;
-		os2_us_first_char_index = us_first_char_index;
-		os2_us_last_char_index = us_last_char_index;
-		os2_s_typo_ascender = s_typo_ascender;
-		os2_s_typo_descender = s_typo_descender;
-		os2_s_typo_line_gap = s_typo_line_gap;
-		os2_us_win_ascent = us_win_ascent;
-		os2_us_win_descent = us_win_descent;
-	}
-
-let parse file : ttf =
-	let ctx = {
-		file = file;
-		ch = input_channel file;
-		entry = {
-			entry_table_name = "";
-			entry_offset = Int32.of_int 0;
-			entry_length = Int32.of_int 0;
-			entry_checksum = Int32.of_int 0;
-		}
-	} in
-	let header = parse_header ctx in
-	let directory = parse_directory ctx header in
-	let parse_table entry f =
-		seek_in file (Int32.to_int entry.entry_offset);
-		ctx.entry <- entry;
-		f ctx
-	in
-	let parse_req_table name f =
-		try
-			let entry = Hashtbl.find directory name in
-			parse_table entry f
-		with Not_found ->
-			failwith (Printf.sprintf "Required table %s could not be found" name)
-	in
-	let parse_opt_table name f =
-		try
-			let entry = Hashtbl.find directory name in
-			Some (parse_table entry f)
-		with Not_found ->
-			None
-	in
-	let head = parse_req_table "head" parse_head_table in
-	let hhea = parse_req_table "hhea" parse_hhea_table in
-	let maxp = parse_req_table "maxp" parse_maxp_table in
-	let loca = parse_req_table "loca" (parse_loca_table head maxp) in
-	let hmtx = parse_req_table "hmtx" (parse_hmtx_table maxp hhea) in
-	let cmap = parse_req_table "cmap" (parse_cmap_table) in
-	let glyfs = parse_req_table "glyf" (parse_glyf_table maxp loca cmap hmtx) in
-	let kern = parse_opt_table "kern" (parse_kern_table) in
-	let name,ttf_name = parse_req_table "name" (parse_name_table) in
-	let os2 = parse_req_table "OS/2" (parse_os2_table) in
-	{
-		ttf_header = header;
-		ttf_font_name = ttf_name;
-		ttf_directory = directory;
-		ttf_head = head;
-		ttf_hhea = hhea;
-		ttf_maxp = maxp;
-		ttf_loca = loca;
-		ttf_hmtx = hmtx;
-		ttf_cmap = cmap;
-		ttf_glyfs = glyfs;
-		ttf_name = name;
-		ttf_os2 = os2;
-		ttf_kern = kern;
-	}
\ No newline at end of file
+(*
+ * Copyright (C)2005-2014 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.
+ *)
+
+open TTFData
+open IO
+
+type ctx = {
+	file : Pervasives.in_channel;
+	ch : input;
+	mutable entry : entry;
+}
+
+let rd16 = BigEndian.read_i16
+let rdu16 = BigEndian.read_ui16
+let rd32 = BigEndian.read_i32
+let rd32r = BigEndian.read_real_i32
+
+let parse_header ctx =
+	let ch = ctx.ch in
+	let major_version = rdu16 ch in
+	let minor_version = rdu16 ch in
+	let num_tables = rdu16 ch in
+	let search_range = rdu16 ch in
+	let entry_selector = rdu16 ch in
+	let range_shift = rdu16 ch in
+	{
+		hd_major_version = major_version;
+		hd_minor_version = minor_version;
+		hd_num_tables = num_tables;
+		hd_search_range = search_range;
+		hd_entry_selector = entry_selector;
+		hd_range_shift = range_shift;
+	}
+
+let parse_directory ctx header =
+	let ch = ctx.ch in
+	let directory = Hashtbl.create 0 in
+	for i = 0 to header.hd_num_tables - 1 do
+		let name = nread_string ch 4 in
+		let cs = rd32r ch in
+		let off = rd32r ch in
+		let length = rd32r ch in
+		Hashtbl.add directory name {
+			entry_table_name = name;
+			entry_checksum = cs;
+			entry_offset = off;
+			entry_length = length;
+		}
+	done;
+	directory
+
+let parse_head_table ctx =
+	let ch = ctx.ch in
+	let version = rd32r ch in
+	let font_revision = rd32r ch in
+	let checksum_adjustment = rd32r ch in
+	let magic_number = rd32r ch in
+	let flags = rdu16 ch in
+	let units_per_em = rdu16 ch in
+	let created = BigEndian.read_double ch in
+	let modified = BigEndian.read_double ch in
+	let xmin = rd16 ch in
+	let ymin = rd16 ch in
+	let xmax = rd16 ch in
+	let ymax = rd16 ch in
+	let mac_style = rdu16 ch in
+	let lowest_rec_ppem = rdu16 ch in
+	let font_direction_hint = rd16 ch in
+	let index_to_loc_format = rd16 ch in
+	let glyph_data_format = rd16 ch in
+	{
+		hd_version = version;
+		hd_font_revision = font_revision;
+		hd_checksum_adjustment = checksum_adjustment;
+		hd_magic_number = magic_number;
+		hd_flags = flags;
+		hd_units_per_em = units_per_em;
+		hd_created = created;
+		hd_modified = modified;
+		hd_xmin = xmin;
+		hd_ymin = ymin;
+		hd_xmax = xmax;
+		hd_ymax = ymax;
+		hd_mac_style = mac_style;
+		hd_lowest_rec_ppem = lowest_rec_ppem;
+		hd_font_direction_hint = font_direction_hint;
+		hd_index_to_loc_format = index_to_loc_format;
+		hd_glyph_data_format = glyph_data_format;
+	}
+
+let parse_hhea_table ctx =
+	let ch = ctx.ch in
+	let version = rd32r ch in
+	let ascender = rd16 ch in
+	let descender = rd16 ch in
+	let line_gap = rd16 ch in
+	let advance_width_max = rdu16 ch in
+	let min_left_side_bearing = rd16 ch in
+	let min_right_side_bearing = rd16 ch in
+	let x_max_extent = rd16 ch in
+	let caret_slope_rise = rd16 ch in
+	let caret_slope_run = rd16 ch in
+	let caret_offset = rd16 ch in
+	let reserved = nread_string ch 8 in
+	let metric_data_format = rd16 ch in
+	let number_of_hmetrics = rdu16 ch in
+	{
+		hhea_version = version;
+		hhea_ascent = ascender;
+		hhea_descent = descender;
+		hhea_line_gap = line_gap;
+		hhea_advance_width_max = advance_width_max;
+		hhea_min_left_side_bearing = min_left_side_bearing;
+		hhea_min_right_side_bearing = min_right_side_bearing;
+		hhea_x_max_extent = x_max_extent;
+		hhea_caret_slope_rise = caret_slope_rise;
+		hhea_caret_slope_run = caret_slope_run;
+		hhea_caret_offset = caret_offset;
+		hhea_reserved = reserved;
+		hhea_metric_data_format = metric_data_format;
+		hhea_number_of_hmetrics = number_of_hmetrics;
+	}
+
+let parse_maxp_table ctx =
+	let ch = ctx.ch in
+	let version_number = rd32r ch in
+	let num_glyphs = rdu16 ch in
+	let max_points = rdu16 ch in
+	let max_contours = rdu16 ch in
+	let max_component_points = rdu16 ch in
+	let max_component_contours = rdu16 ch in
+	let max_zones = rdu16 ch in
+	let max_twilight_points = rdu16 ch in
+	let max_storage = rdu16 ch in
+	let max_function_defs = rdu16 ch in
+	let max_instruction_defs = rdu16 ch in
+	let max_stack_elements = rdu16 ch in
+	let max_size_of_instructions = rdu16 ch in
+	let max_component_elements = rdu16 ch in
+	let max_component_depth = rdu16 ch in
+	{
+		maxp_version_number = version_number;
+		maxp_num_glyphs = num_glyphs;
+		maxp_max_points = max_points;
+		maxp_max_contours = max_contours;
+		maxp_max_component_points = max_component_points;
+		maxp_max_component_contours = max_component_contours;
+		maxp_max_zones = max_zones;
+		maxp_max_twilight_points = max_twilight_points;
+		maxp_max_storage = max_storage;
+		maxp_max_function_defs = max_function_defs;
+		maxp_max_instruction_defs = max_instruction_defs;
+		maxp_max_stack_elements = max_stack_elements;
+		maxp_max_size_of_instructions = max_size_of_instructions;
+		maxp_max_component_elements = max_component_elements;
+		maxp_max_component_depth = max_component_depth;
+	}
+
+let parse_loca_table head maxp ctx =
+	let ch = ctx.ch in
+	if head.hd_index_to_loc_format = 0 then
+		Array.init (maxp.maxp_num_glyphs + 1) (fun _ -> Int32.of_int ((rdu16 ch) * 2))
+	else
+		Array.init (maxp.maxp_num_glyphs + 1) (fun _ -> rd32r ch)
+
+let parse_hmtx_table maxp hhea ctx =
+	let ch = ctx.ch in
+	let last_advance_width = ref 0 in (* check me 1/2*)
+	Array.init maxp.maxp_num_glyphs (fun i ->
+		let advance_width = if i > hhea.hhea_number_of_hmetrics-1 then (* check me 2/2*)
+			!last_advance_width
+		else
+			rdu16 ch
+		in
+		last_advance_width := advance_width;
+		let left_side_bearing = rd16 ch in
+		{
+			advance_width = advance_width;
+			left_side_bearing = left_side_bearing;
+		}
+	)
+
+let parse_cmap_table ctx =
+	let ch = ctx.ch in
+	let version = rdu16 ch in
+	let num_subtables = rdu16 ch in
+	let dir = ExtList.List.init num_subtables (fun _ ->
+		let platform_id = rdu16 ch in
+		let platform_specific_id = rdu16 ch in
+		let offset = rd32r ch in
+		{
+			csh_platform_id = platform_id;
+			csh_platform_specific_id = platform_specific_id;
+			csh_offset = offset;
+		}
+	) in
+	let dir = List.stable_sort (fun csh1 csh2 ->
+		if csh1.csh_platform_id < csh2.csh_platform_id then -1
+		else if csh1.csh_platform_id > csh2.csh_platform_id then 1
+		else compare csh1.csh_platform_specific_id csh2.csh_platform_specific_id
+	) dir in
+	let parse_sub entry =
+		seek_in ctx.file ((Int32.to_int ctx.entry.entry_offset) + (Int32.to_int entry.csh_offset));
+		let format = rdu16 ch in
+		let def = match format with
+			| 0 ->
+				let length = rdu16 ch in
+				let language = rdu16 ch in
+				let glyph_index = Array.init 256 (fun _ -> read ch) in
+				Cmap0 {
+					c0_format = 0;
+					c0_length = length;
+					c0_language = language;
+					c0_glyph_index_array = glyph_index;
+				}
+			| 4 ->
+				let length = rdu16 ch in
+				let language = rdu16 ch in
+				let seg_count_x2 = rdu16 ch in
+				let seg_count = seg_count_x2 / 2 in
+				let search_range = rdu16 ch in
+				let entry_selector = rdu16 ch in
+				let range_shift = rdu16 ch in
+				let end_code = Array.init seg_count (fun _ -> rdu16 ch) in
+				let reserved = rdu16 ch in
+				assert (reserved = 0);
+				let start_code = Array.init seg_count (fun _ -> rdu16 ch) in
+				let id_delta = Array.init seg_count (fun _ -> rdu16 ch) in
+				let id_range_offset = Array.init seg_count (fun _ -> rdu16 ch) in
+				let count = (length - (8 * seg_count + 16)) / 2 in
+				let glyph_index = Array.init count (fun _ -> rdu16 ch) in
+				Cmap4 {
+					c4_format = format;
+					c4_length = length;
+					c4_language = language;
+					c4_seg_count_x2 = seg_count_x2;
+					c4_search_range = search_range;
+					c4_entry_selector = entry_selector;
+					c4_range_shift = range_shift;
+					c4_end_code = end_code;
+					c4_reserved_pad = reserved;
+					c4_start_code = start_code;
+					c4_id_delta = id_delta;
+					c4_id_range_offset = id_range_offset;
+					c4_glyph_index_array = glyph_index;
+				}
+			| 6 ->
+				let length = rdu16 ch in
+				let language = rdu16 ch in
+				let first_code = rdu16 ch in
+				let entry_count = rdu16 ch in
+				let glyph_index = Array.init entry_count (fun _ -> rdu16 ch) in
+				Cmap6 {
+					c6_format = format;
+					c6_length = length;
+					c6_language = language;
+					c6_first_code = first_code;
+					c6_entry_count = entry_count;
+					c6_glyph_index_array = glyph_index;
+				}
+  			| 12 ->
+				ignore (rd16 ch);
+				let length = rd32r ch in
+				let language = rd32r ch in
+				let num_groups = rd32r ch in
+				let groups = ExtList.List.init (Int32.to_int num_groups) (fun _ ->
+					let start = rd32r ch in
+					let stop = rd32r ch in
+					let start_glyph = rd32r ch in
+					{
+						c12g_start_char_code = start;
+						c12g_end_char_code = stop;
+						c12g_start_glyph_code = start_glyph;
+					}
+				) in
+				Cmap12 {
+					c12_format = Int32.of_int 12;
+					c12_length = length;
+					c12_language = language;
+					c12_num_groups = num_groups;
+					c12_groups = groups;
+				}
+			| x ->
+				failwith ("Not implemented format: " ^ (string_of_int x));
+		in
+		{
+			cs_def = def;
+			cs_header = entry;
+		}
+
+	in
+	{
+		cmap_version = version;
+		cmap_num_subtables = num_subtables;
+		cmap_subtables = List.map parse_sub dir;
+	}
+
+let parse_glyf_table maxp loca cmap hmtx ctx =
+	let ch = ctx.ch in
+	let parse_glyf i =
+		seek_in ctx.file ((Int32.to_int ctx.entry.entry_offset) + (Int32.to_int loca.(i)));
+		let num_contours = rd16 ch in
+		let xmin = rd16 ch in
+		let ymin = rd16 ch in
+		let xmax = rd16 ch in
+		let ymax = rd16 ch in
+		let header = {
+			gh_num_contours = num_contours;
+			gh_xmin = xmin;
+			gh_ymin = ymin;
+			gh_xmax = xmax;
+			gh_ymax = ymax;
+		} in
+		if num_contours >= 0 then begin
+			let num_points = ref 0 in
+			let end_pts_of_contours = Array.init num_contours (fun i ->
+				let v = rdu16 ch in
+				if i = num_contours - 1 then num_points := v + 1;
+				v
+			) in
+			let instruction_length = rdu16 ch in
+			let instructions = Array.init instruction_length (fun _ ->
+				read ch
+			) in
+			let flags = DynArray.create () in
+			let rec loop index =
+				if index >= !num_points then () else begin
+					let v = read_byte ch in
+					let incr = if (v land 8) == 0 then begin
+						DynArray.add flags v;
+						1
+					end else begin
+						let r = (int_of_char (read ch)) in
+						for i = 0 to r do DynArray.add flags v done;
+						r + 1
+					end in
+					loop (index + incr)
+				end
+			in
+			loop 0;
+			assert (DynArray.length flags = !num_points);
+			let x_coordinates = Array.init !num_points (fun i ->
+				let flag = DynArray.get flags i in
+				if flag land 0x10 <> 0 then begin
+					if flag land 0x02 <> 0 then read_byte ch
+					else 0
+				end else begin
+					if flag land 0x02 <> 0 then -read_byte ch
+					else rd16 ch
+				end
+			) in
+			let y_coordinates = Array.init !num_points (fun i ->
+				let flag = DynArray.get flags i in
+				if flag land 0x20 <> 0 then begin
+					if flag land 0x04 <> 0 then read_byte ch
+					else 0
+				end else begin
+					if flag land 0x04 <> 0 then -read_byte ch
+					else rd16 ch
+				end;
+			) in
+			TGlyfSimple (header, {
+				gs_end_pts_of_contours = end_pts_of_contours;
+				gs_instruction_length = instruction_length;
+				gs_instructions = instructions;
+				gs_flags = DynArray.to_array flags;
+				gs_x_coordinates = x_coordinates;
+				gs_y_coordinates = y_coordinates;
+			})
+		end else if num_contours = -1 then begin
+			let acc = DynArray.create () in
+			let rec loop () =
+				let flags = rdu16 ch in
+				let glyph_index = rdu16 ch in
+				let arg1,arg2 = if flags land 1 <> 0 then begin
+					let arg1 = rd16 ch in
+					let arg2 = rd16 ch in
+					arg1,arg2
+				end else begin
+					let arg1 = read_byte ch in
+					let arg2 = read_byte ch in
+					arg1,arg2
+				end in
+				let fmt214 i = (float_of_int i) /. (float_of_int 0x4000) in
+				let fmode =	if flags land 8 <> 0 then
+					Scale (fmt214 (rd16 ch))
+				else if flags land 64 <> 0 then begin
+					let s1 = fmt214 (rd16 ch) in
+					let s2 = fmt214 (rd16 ch) in
+					ScaleXY (s1,s2)
+				end else if flags land 128 <> 0 then begin
+					let a = fmt214 (rd16 ch) in
+					let b = fmt214 (rd16 ch) in
+					let c = fmt214 (rd16 ch) in
+					let d = fmt214 (rd16 ch) in
+					ScaleMatrix (a,b,c,d)
+				end else
+					NoScale
+				in
+				DynArray.add acc {
+					gc_flags = flags;
+					gc_glyf_index = glyph_index;
+					gc_arg1 = if flags land 2 <> 0 then arg1 else 0;
+					gc_arg2 = if flags land 2 <> 0 then arg2 else 0;
+					gc_transformation = fmode;
+				};
+				if flags land 0x20 <> 0 then loop ();
+			in
+			loop ();
+			TGlyfComposite (header,(DynArray.to_list acc))
+		end else
+			failwith "Unknown Glyf"
+	in
+	Array.init maxp.maxp_num_glyphs (fun i ->
+		let len = (Int32.to_int loca.(i + 1)) - (Int32.to_int loca.(i)) in
+		if len > 0 then parse_glyf i else TGlyfNull
+	)
+
+let parse_kern_table ctx =
+	let ch = ctx.ch in
+	let version = Int32.of_int (rd16 ch) in
+	let num_tables = Int32.of_int (rd16 ch) in
+	let tables = ExtList.List.init (Int32.to_int num_tables) (fun _ ->
+		let length = Int32.of_int (rdu16 ch) in
+		let tuple_index = rdu16 ch in
+		let coverage = rdu16 ch in
+		let def = match coverage lsr 8 with
+		| 0 ->
+			let num_pairs = rdu16 ch in
+			let search_range = rdu16 ch in
+			let entry_selector = rdu16 ch in
+			let range_shift = rdu16 ch in
+			let kerning_pairs = ExtList.List.init num_pairs (fun _ ->
+				let left = rdu16 ch in
+				let right = rdu16 ch in
+				let value = rd16 ch in
+				{
+					kern_left = left;
+					kern_right = right;
+					kern_value = value;
+				}
+			) in
+			Kern0 {
+				k0_num_pairs = num_pairs;
+				k0_search_range = search_range;
+				k0_entry_selector = entry_selector;
+				k0_range_shift = range_shift;
+				k0_pairs = kerning_pairs;
+			}
+		| 2 ->
+			let row_width = rdu16 ch in
+			let left_offset_table = rdu16 ch in
+			let right_offset_table = rdu16 ch in
+			let array_offset = rdu16 ch in
+			let first_glyph = rdu16 ch in
+			let num_glyphs = rdu16 ch in
+			let offsets = ExtList.List.init num_glyphs (fun _ ->
+				rdu16 ch
+			) in
+			Kern2 {
+				k2_row_width = row_width;
+				k2_left_offset_table = left_offset_table;
+				k2_right_offset_table = right_offset_table;
+				k2_array = array_offset;
+				k2_first_glyph = first_glyph;
+				k2_num_glyphs = num_glyphs;
+				k2_offsets = offsets;
+			}
+		| i ->
+			failwith ("Unknown kerning: " ^ (string_of_int i));
+		in
+		{
+			ks_def = def;
+			ks_header = {
+				ksh_length = length;
+				ksh_coverage = coverage;
+				ksh_tuple_index = tuple_index;
+			}
+		}
+	) in
+	{
+		kern_version = version;
+		kern_num_tables = num_tables;
+		kern_subtables = tables;
+	}
+
+let parse_name_table ctx =
+	let ch = ctx.ch in
+	let format = rdu16 ch in
+	let num_records = rdu16 ch in
+	let offset = rdu16 ch in
+	let records = Array.init num_records (fun _ ->
+		let platform_id = rdu16 ch in
+		let platform_specific_id = rdu16 ch in
+		let language_id = rdu16 ch in
+		let name_id = rdu16 ch in
+		let length = rdu16 ch in
+		let offset = rdu16 ch in
+		{
+			nr_platform_id = platform_id;
+			nr_platform_specific_id = platform_specific_id;
+			nr_language_id = language_id;
+			nr_name_id = name_id;
+			nr_length = length;
+			nr_offset = offset;
+			nr_value = "";
+		}
+	) in
+	let ttf_name = ref "" in
+	(* TODO: use real utf16 conversion *)
+	let set_name n =
+		let l = ExtList.List.init (String.length n / 2) (fun i -> String.make 1 n.[i * 2 + 1]) in
+		ttf_name := String.concat "" l
+	in
+	let records = Array.map (fun r ->
+		seek_in ctx.file ((Int32.to_int ctx.entry.entry_offset) + offset + r.nr_offset);
+		r.nr_value <- nread_string ch r.nr_length;
+		if r.nr_name_id = 4 && r.nr_platform_id = 3 || r.nr_platform_id = 0 then set_name r.nr_value;
+		r
+	) records in
+	{
+		name_format = format;
+		name_num_records = num_records;
+		name_offset = offset;
+		name_records = records;
+	},!ttf_name
+
+let parse_os2_table ctx =
+	let ch = ctx.ch in
+	let version = rdu16 ch in
+	let x_avg_char_width = rd16 ch in
+	let us_weight_class = rdu16 ch in
+	let us_width_class = rdu16 ch in
+	let fs_type = rd16 ch in
+	let y_subscript_x_size = rd16 ch in
+	let y_subscript_y_size = rd16 ch in
+	let y_subscript_x_offset = rd16 ch in
+	let y_subscript_y_offset = rd16 ch in
+	let y_superscript_x_size = rd16 ch in
+	let y_superscript_y_size = rd16 ch in
+	let y_superscript_x_offset = rd16 ch in
+	let y_superscript_y_offset = rd16 ch in
+	let y_strikeout_size = rd16 ch in
+	let y_strikeout_position = rd16 ch in
+	let s_family_class = rd16 ch in
+
+	let b_family_type = read_byte ch in
+	let b_serif_style = read_byte ch in
+	let b_weight = read_byte ch in
+	let b_proportion = read_byte ch in
+	let b_contrast = read_byte ch in
+	let b_stroke_variation = read_byte ch in
+	let b_arm_style = read_byte ch in
+	let b_letterform = read_byte ch in
+	let b_midline = read_byte ch in
+	let b_x_height = read_byte ch in
+
+	let ul_unicode_range_1 = rd32r ch in
+	let ul_unicode_range_2 = rd32r ch in
+	let ul_unicode_range_3 = rd32r ch in
+	let ul_unicode_range_4 = rd32r ch in
+	let ach_vendor_id = rd32r ch in
+	let fs_selection = rd16 ch in
+	let us_first_char_index = rdu16 ch in
+	let us_last_char_index = rdu16 ch in
+	let s_typo_ascender = rd16 ch in
+	let s_typo_descender = rd16 ch in
+	let s_typo_line_gap = rd16 ch in
+	let us_win_ascent = rdu16 ch in
+	let us_win_descent = rdu16 ch in
+	{
+		os2_version = version;
+		os2_x_avg_char_width = x_avg_char_width;
+		os2_us_weight_class = us_weight_class;
+		os2_us_width_class = us_width_class;
+		os2_fs_type = fs_type;
+		os2_y_subscript_x_size = y_subscript_x_size;
+		os2_y_subscript_y_size = y_subscript_y_size;
+		os2_y_subscript_x_offset = y_subscript_x_offset;
+		os2_y_subscript_y_offset = y_subscript_y_offset;
+		os2_y_superscript_x_size = y_superscript_x_size;
+		os2_y_superscript_y_size = y_superscript_y_size;
+		os2_y_superscript_x_offset = y_superscript_x_offset;
+		os2_y_superscript_y_offset = y_superscript_y_offset;
+		os2_y_strikeout_size = y_strikeout_size;
+		os2_y_strikeout_position = y_strikeout_position;
+		os2_s_family_class = s_family_class;
+		os2_b_family_type = b_family_type;
+		os2_b_serif_style = b_serif_style;
+		os2_b_weight = b_weight;
+		os2_b_proportion = b_proportion;
+		os2_b_contrast = b_contrast;
+		os2_b_stroke_variation = b_stroke_variation;
+		os2_b_arm_style = b_arm_style;
+		os2_b_letterform = b_letterform;
+		os2_b_midline = b_midline;
+		os2_b_x_height = b_x_height;
+		os2_ul_unicode_range_1 = ul_unicode_range_1;
+		os2_ul_unicode_range_2 = ul_unicode_range_2;
+		os2_ul_unicode_range_3 = ul_unicode_range_3;
+		os2_ul_unicode_range_4 = ul_unicode_range_4;
+		os2_ach_vendor_id = ach_vendor_id;
+		os2_fs_selection = fs_selection;
+		os2_us_first_char_index = us_first_char_index;
+		os2_us_last_char_index = us_last_char_index;
+		os2_s_typo_ascender = s_typo_ascender;
+		os2_s_typo_descender = s_typo_descender;
+		os2_s_typo_line_gap = s_typo_line_gap;
+		os2_us_win_ascent = us_win_ascent;
+		os2_us_win_descent = us_win_descent;
+	}
+
+let parse file : ttf =
+	let ctx = {
+		file = file;
+		ch = input_channel file;
+		entry = {
+			entry_table_name = "";
+			entry_offset = Int32.of_int 0;
+			entry_length = Int32.of_int 0;
+			entry_checksum = Int32.of_int 0;
+		}
+	} in
+	let header = parse_header ctx in
+	let directory = parse_directory ctx header in
+	let parse_table entry f =
+		seek_in file (Int32.to_int entry.entry_offset);
+		ctx.entry <- entry;
+		f ctx
+	in
+	let parse_req_table name f =
+		try
+			let entry = Hashtbl.find directory name in
+			parse_table entry f
+		with Not_found ->
+			failwith (Printf.sprintf "Required table %s could not be found" name)
+	in
+	let parse_opt_table name f =
+		try
+			let entry = Hashtbl.find directory name in
+			Some (parse_table entry f)
+		with Not_found ->
+			None
+	in
+	let head = parse_req_table "head" parse_head_table in
+	let hhea = parse_req_table "hhea" parse_hhea_table in
+	let maxp = parse_req_table "maxp" parse_maxp_table in
+	let loca = parse_req_table "loca" (parse_loca_table head maxp) in
+	let hmtx = parse_req_table "hmtx" (parse_hmtx_table maxp hhea) in
+	let cmap = parse_req_table "cmap" (parse_cmap_table) in
+	let glyfs = parse_req_table "glyf" (parse_glyf_table maxp loca cmap hmtx) in
+	let kern = parse_opt_table "kern" (parse_kern_table) in
+	let name,ttf_name = parse_req_table "name" (parse_name_table) in
+	let os2 = parse_req_table "OS/2" (parse_os2_table) in
+	{
+		ttf_header = header;
+		ttf_font_name = ttf_name;
+		ttf_directory = directory;
+		ttf_head = head;
+		ttf_hhea = hhea;
+		ttf_maxp = maxp;
+		ttf_loca = loca;
+		ttf_hmtx = hmtx;
+		ttf_cmap = cmap;
+		ttf_glyfs = glyfs;
+		ttf_name = name;
+		ttf_os2 = os2;
+		ttf_kern = kern;
+	}
diff --git a/libs/ttflib/tTFSwfWriter.ml b/libs/ttflib/tTFSwfWriter.ml
index 3b2de89cd107531bca04e65abfa8a19150a57233..8bf2ca8de330a9429853ef1cc00ca06381ac1887 100644
--- a/libs/ttflib/tTFSwfWriter.ml
+++ b/libs/ttflib/tTFSwfWriter.ml
@@ -1,210 +1,210 @@
-(*
- * Copyright (C)2005-2014 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.
- *)
-
-open TTFData
-open Swf
-
-let num_bits x =
-	if x = 0 then
-		0
-	else
-		let rec loop n v =
-			if v = 0 then n else loop (n + 1) (v lsr 1)
-		in
-		loop 1 (abs x)
-
-let round x = int_of_float (floor (x +. 0.5))
-
-let to_twips v = round (v *. 20.)
-
-type ctx = {
-	ttf : ttf;
-}
-
-let begin_fill =
-	SRStyleChange {
-		scsr_move = None;
-		scsr_fs0 = Some(1);
-		scsr_fs1 = None;
-		scsr_ls = None;
-		scsr_new_styles = None;
-	}
-
-let end_fill =
-	SRStyleChange {
-		scsr_move = None;
-		scsr_fs0 = None;
-		scsr_fs1 = None;
-		scsr_ls = None;
-		scsr_new_styles = None;
-	}
-
-let align_bits x nbits = x land ((1 lsl nbits ) - 1)
-
-let move_to ctx x y =
-	let x = to_twips x in
-	let y = to_twips y in
-	let nbits = max (num_bits x) (num_bits y) in
-	SRStyleChange {
-		scsr_move = Some (nbits, align_bits x nbits, align_bits y nbits);
-		scsr_fs0 = Some(1);
-		scsr_fs1 = None;
-		scsr_ls = None;
-		scsr_new_styles = None;
-	}
-
-let line_to ctx x y =
-	let x = to_twips x in
-	let y = to_twips y in
-	if x = 0 && y = 0 then raise Exit;
-	let nbits = max (num_bits x) (num_bits y) in
-	SRStraightEdge {
-		sser_nbits = nbits;
-		sser_line = (if x = 0 then None else Some(align_bits x nbits)), (if y = 0 then None else Some(align_bits y nbits));
-	}
-
-let curve_to ctx cx cy ax ay =
-	let cx = to_twips cx in
-	let cy = to_twips cy in
-	let ax = to_twips ax in
-	let ay = to_twips ay in
-	let nbits = max (max (num_bits cx) (num_bits cy)) (max (num_bits ax) (num_bits ay)) in
-	SRCurvedEdge {
-		scer_nbits = nbits;
-		scer_cx = align_bits cx nbits;
-		scer_cy = align_bits cy nbits;
-		scer_ax = align_bits ax nbits;
-		scer_ay = align_bits ay nbits;
-	}
-
-open TTFTools
-
-let write_paths ctx paths =
-	let scale = 1024. /. (float_of_int ctx.ttf.ttf_head.hd_units_per_em) in
-	let srl = DynArray.create () in
-	List.iter (fun path ->
-		try
-			DynArray.add srl (match path.gp_type with
-			| 0 -> move_to ctx (path.gp_x *. scale) ((-1.) *. path.gp_y *. scale);
-			| 1 -> line_to ctx (path.gp_x *. scale) ((-1.) *. path.gp_y *. scale);
-			| 2 -> curve_to ctx (path.gp_cx *. scale) ((-1.) *. path.gp_cy *. scale) (path.gp_x *. scale) ((-1.) *. path.gp_y *. scale);
-			| _ -> assert false)
-		with Exit ->
-			()
-	) paths;
-	DynArray.add srl (end_fill);
-	{
-		srs_nfbits = 1;
-		srs_nlbits = 0;
-		srs_records = DynArray.to_list srl;
-	}
-
-let rec write_glyph ctx key glyf =
-	{
-		font_char_code = key;
-		font_shape = write_paths ctx (TTFTools.build_glyph_paths ctx.ttf true glyf);
-	}
-
-let write_font_layout ctx lut =
-	let scale = 1024. /. (float_of_int ctx.ttf.ttf_head.hd_units_per_em) in
-	let hmtx = Hashtbl.fold (fun k v acc -> (k,ctx.ttf.ttf_hmtx.(v)) :: acc) lut [] in
-	let hmtx = List.stable_sort (fun a b -> compare (fst a) (fst b)) hmtx in
-	let hmtx = List.map (fun (k,g) -> g) hmtx in
-	{
-			font_ascent = round((float_of_int ctx.ttf.ttf_os2.os2_us_win_ascent) *. scale *. 20.);
-			font_descent = round((float_of_int ctx.ttf.ttf_os2.os2_us_win_descent) *. scale *. 20.);
-			font_leading = round(((float_of_int(ctx.ttf.ttf_os2.os2_us_win_ascent + ctx.ttf.ttf_os2.os2_us_win_descent - ctx.ttf.ttf_head.hd_units_per_em)) *. scale) *. 20.);
-			font_glyphs_layout = Array.of_list( ExtList.List.mapi (fun i h ->
-			{
-				font_advance = round((float_of_int h.advance_width) *. scale *. 20.);
-				font_bounds = {rect_nbits=0; left=0; right=0; top=0; bottom=0};
-			}) hmtx );
-			font_kerning = [];
-	}
-
-let bi v = if v then 1 else 0
-
-let int_from_langcode lc =
-	match lc with
-	| LCNone -> 0
-	| LCLatin -> 1
-	| LCJapanese -> 2
-	| LCKorean -> 3
-	| LCSimplifiedChinese -> 4
-	| LCTraditionalChinese -> 5
-
-let write_font2 ch b f2 =
-	IO.write_bits b 1 (bi true);
-	IO.write_bits b 1 (bi f2.font_shift_jis);
-	IO.write_bits b 1 (bi f2.font_is_small);
-	IO.write_bits b 1 (bi f2.font_is_ansi);
-	IO.write_bits b 1 (bi f2.font_wide_offsets);
-	IO.write_bits b 1 (bi f2.font_wide_codes);
-	IO.write_bits b 1 (bi f2.font_is_italic);
-	IO.write_bits b 1 (bi f2.font_is_bold);
-	IO.write_byte ch (int_from_langcode f2.font_language);
-	IO.write_byte ch (String.length f2.font_name);
-	IO.nwrite ch f2.font_name;
-	IO.write_ui16 ch (Array.length f2.font_glyphs);
-	let glyph_offset = ref (((Array.length f2.font_glyphs) * 4)+4) in
-	Array.iter (fun g ->
-		IO.write_i32 ch !glyph_offset;
-		glyph_offset := !glyph_offset + SwfParser.font_shape_records_length g.font_shape;
-	)f2.font_glyphs;
-	IO.write_i32 ch !glyph_offset;
-	Array.iter (fun g -> SwfParser.write_shape_without_style ch g.font_shape;) f2.font_glyphs;
-	Array.iter (fun g -> IO.write_ui16 ch g.font_char_code; )f2.font_glyphs;
-	IO.write_i16 ch f2.font_layout.font_ascent;
-	IO.write_i16 ch f2.font_layout.font_descent;
-	IO.write_i16 ch f2.font_layout.font_leading;
-	Array.iter (fun g ->
-		let fa = ref g.font_advance in
-		if (!fa) <  -32767 then fa := -32768;(* fix or check *)
-		if (!fa) > 32766 then fa := 32767;
-		IO.write_i16 ch !fa;) f2.font_layout.font_glyphs_layout;
-	Array.iter (fun g -> SwfParser.write_rect ch g.font_bounds;) f2.font_layout.font_glyphs_layout;
-	IO.write_ui16 ch 0 (* TODO: optional FontKerningTable *)
-
-let to_swf ttf config =
-	let ctx = {
-		ttf = ttf;
-	} in
-	let lut = TTFTools.build_lut ttf config.ttfc_range_str in
-	let glyfs = Hashtbl.fold (fun k v acc -> (k,ctx.ttf.ttf_glyfs.(v)) :: acc) lut [] in
-	let glyfs = List.stable_sort (fun a b -> compare (fst a) (fst b)) glyfs in
-	let glyfs = List.map (fun (k,g) -> write_glyph ctx k g) glyfs in
-	let glyfs_font_layout = write_font_layout ctx lut in
-	let glyfs = Array.of_list glyfs in
-	{
-		font_shift_jis = false;
-		font_is_small = false;
-		font_is_ansi = false;
-		font_wide_offsets = true;
-		font_wide_codes = true;
-		font_is_italic = false;
-		font_is_bold = false;
-		font_language = LCNone;
-		font_name = (match config.ttfc_font_name with Some s -> s | None -> ttf.ttf_font_name);
-		font_glyphs = glyfs;
-		font_layout = glyfs_font_layout;
-	}
-;;
\ No newline at end of file
+(*
+ * Copyright (C)2005-2014 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.
+ *)
+
+open TTFData
+open Swf
+
+let num_bits x =
+	if x = 0 then
+		0
+	else
+		let rec loop n v =
+			if v = 0 then n else loop (n + 1) (v lsr 1)
+		in
+		loop 1 (abs x)
+
+let round x = int_of_float (floor (x +. 0.5))
+
+let to_twips v = round (v *. 20.)
+
+type ctx = {
+	ttf : ttf;
+}
+
+let begin_fill =
+	SRStyleChange {
+		scsr_move = None;
+		scsr_fs0 = Some(1);
+		scsr_fs1 = None;
+		scsr_ls = None;
+		scsr_new_styles = None;
+	}
+
+let end_fill =
+	SRStyleChange {
+		scsr_move = None;
+		scsr_fs0 = None;
+		scsr_fs1 = None;
+		scsr_ls = None;
+		scsr_new_styles = None;
+	}
+
+let align_bits x nbits = x land ((1 lsl nbits ) - 1)
+
+let move_to ctx x y =
+	let x = to_twips x in
+	let y = to_twips y in
+	let nbits = max (num_bits x) (num_bits y) in
+	SRStyleChange {
+		scsr_move = Some (nbits, align_bits x nbits, align_bits y nbits);
+		scsr_fs0 = Some(1);
+		scsr_fs1 = None;
+		scsr_ls = None;
+		scsr_new_styles = None;
+	}
+
+let line_to ctx x y =
+	let x = to_twips x in
+	let y = to_twips y in
+	if x = 0 && y = 0 then raise Exit;
+	let nbits = max (num_bits x) (num_bits y) in
+	SRStraightEdge {
+		sser_nbits = nbits;
+		sser_line = (if x = 0 then None else Some(align_bits x nbits)), (if y = 0 then None else Some(align_bits y nbits));
+	}
+
+let curve_to ctx cx cy ax ay =
+	let cx = to_twips cx in
+	let cy = to_twips cy in
+	let ax = to_twips ax in
+	let ay = to_twips ay in
+	let nbits = max (max (num_bits cx) (num_bits cy)) (max (num_bits ax) (num_bits ay)) in
+	SRCurvedEdge {
+		scer_nbits = nbits;
+		scer_cx = align_bits cx nbits;
+		scer_cy = align_bits cy nbits;
+		scer_ax = align_bits ax nbits;
+		scer_ay = align_bits ay nbits;
+	}
+
+open TTFTools
+
+let write_paths ctx paths =
+	let scale = 1024. /. (float_of_int ctx.ttf.ttf_head.hd_units_per_em) in
+	let srl = DynArray.create () in
+	List.iter (fun path ->
+		try
+			DynArray.add srl (match path.gp_type with
+			| 0 -> move_to ctx (path.gp_x *. scale) ((-1.) *. path.gp_y *. scale);
+			| 1 -> line_to ctx (path.gp_x *. scale) ((-1.) *. path.gp_y *. scale);
+			| 2 -> curve_to ctx (path.gp_cx *. scale) ((-1.) *. path.gp_cy *. scale) (path.gp_x *. scale) ((-1.) *. path.gp_y *. scale);
+			| _ -> assert false)
+		with Exit ->
+			()
+	) paths;
+	DynArray.add srl (end_fill);
+	{
+		srs_nfbits = 1;
+		srs_nlbits = 0;
+		srs_records = DynArray.to_list srl;
+	}
+
+let rec write_glyph ctx key glyf =
+	{
+		font_char_code = key;
+		font_shape = write_paths ctx (TTFTools.build_glyph_paths ctx.ttf true glyf);
+	}
+
+let write_font_layout ctx lut =
+	let scale = 1024. /. (float_of_int ctx.ttf.ttf_head.hd_units_per_em) in
+	let hmtx = Hashtbl.fold (fun k v acc -> (k,ctx.ttf.ttf_hmtx.(v)) :: acc) lut [] in
+	let hmtx = List.stable_sort (fun a b -> compare (fst a) (fst b)) hmtx in
+	let hmtx = List.map (fun (k,g) -> g) hmtx in
+	{
+			font_ascent = round((float_of_int ctx.ttf.ttf_os2.os2_us_win_ascent) *. scale *. 20.);
+			font_descent = round((float_of_int ctx.ttf.ttf_os2.os2_us_win_descent) *. scale *. 20.);
+			font_leading = round(((float_of_int(ctx.ttf.ttf_os2.os2_us_win_ascent + ctx.ttf.ttf_os2.os2_us_win_descent - ctx.ttf.ttf_head.hd_units_per_em)) *. scale) *. 20.);
+			font_glyphs_layout = Array.of_list( ExtList.List.mapi (fun i h ->
+			{
+				font_advance = round((float_of_int h.advance_width) *. scale *. 20.);
+				font_bounds = {rect_nbits=0; left=0; right=0; top=0; bottom=0};
+			}) hmtx );
+			font_kerning = [];
+	}
+
+let bi v = if v then 1 else 0
+
+let int_from_langcode lc =
+	match lc with
+	| LCNone -> 0
+	| LCLatin -> 1
+	| LCJapanese -> 2
+	| LCKorean -> 3
+	| LCSimplifiedChinese -> 4
+	| LCTraditionalChinese -> 5
+
+let write_font2 ch b f2 =
+	IO.write_bits b 1 (bi true);
+	IO.write_bits b 1 (bi f2.font_shift_jis);
+	IO.write_bits b 1 (bi f2.font_is_small);
+	IO.write_bits b 1 (bi f2.font_is_ansi);
+	IO.write_bits b 1 (bi f2.font_wide_offsets);
+	IO.write_bits b 1 (bi f2.font_wide_codes);
+	IO.write_bits b 1 (bi f2.font_is_italic);
+	IO.write_bits b 1 (bi f2.font_is_bold);
+	IO.write_byte ch (int_from_langcode f2.font_language);
+	IO.write_byte ch (String.length f2.font_name);
+	IO.nwrite_string ch f2.font_name;
+	IO.write_ui16 ch (Array.length f2.font_glyphs);
+	let glyph_offset = ref (((Array.length f2.font_glyphs) * 4)+4) in
+	Array.iter (fun g ->
+		IO.write_i32 ch !glyph_offset;
+		glyph_offset := !glyph_offset + SwfParser.font_shape_records_length g.font_shape;
+	)f2.font_glyphs;
+	IO.write_i32 ch !glyph_offset;
+	Array.iter (fun g -> SwfParser.write_shape_without_style ch g.font_shape;) f2.font_glyphs;
+	Array.iter (fun g -> IO.write_ui16 ch g.font_char_code; )f2.font_glyphs;
+	IO.write_i16 ch f2.font_layout.font_ascent;
+	IO.write_i16 ch f2.font_layout.font_descent;
+	IO.write_i16 ch f2.font_layout.font_leading;
+	Array.iter (fun g ->
+		let fa = ref g.font_advance in
+		if (!fa) <  -32767 then fa := -32768;(* fix or check *)
+		if (!fa) > 32766 then fa := 32767;
+		IO.write_i16 ch !fa;) f2.font_layout.font_glyphs_layout;
+	Array.iter (fun g -> SwfParser.write_rect ch g.font_bounds;) f2.font_layout.font_glyphs_layout;
+	IO.write_ui16 ch 0 (* TODO: optional FontKerningTable *)
+
+let to_swf ttf config =
+	let ctx = {
+		ttf = ttf;
+	} in
+	let lut = TTFTools.build_lut ttf config.ttfc_range_str in
+	let glyfs = Hashtbl.fold (fun k v acc -> (k,ctx.ttf.ttf_glyfs.(v)) :: acc) lut [] in
+	let glyfs = List.stable_sort (fun a b -> compare (fst a) (fst b)) glyfs in
+	let glyfs = List.map (fun (k,g) -> write_glyph ctx k g) glyfs in
+	let glyfs_font_layout = write_font_layout ctx lut in
+	let glyfs = Array.of_list glyfs in
+	{
+		font_shift_jis = false;
+		font_is_small = false;
+		font_is_ansi = false;
+		font_wide_offsets = true;
+		font_wide_codes = true;
+		font_is_italic = config.ttfc_font_posture = TFPItalic;
+		font_is_bold = config.ttfc_font_weight = TFWBold;
+		font_language = LCNone;
+		font_name = (match config.ttfc_font_name with Some s -> s | None -> ttf.ttf_font_name);
+		font_glyphs = glyfs;
+		font_layout = glyfs_font_layout;
+	}
+;;
diff --git a/libs/ttflib/tTFTools.ml b/libs/ttflib/tTFTools.ml
index a4ea6539ddf7f2a6b89d0572ccd504e0e2418a51..e3dade3ecc115b47dc3aa72d5bf031a575c4be4a 100644
--- a/libs/ttflib/tTFTools.ml
+++ b/libs/ttflib/tTFTools.ml
@@ -1,275 +1,275 @@
-(*
- * Copyright (C)2005-2014 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.
- *)
-
-open TTFData
-
-type glyf_transformation_matrix = {
-	mutable a : float;
-	mutable b : float;
-	mutable c : float;
-	mutable d : float;
-	mutable tx : float;
-	mutable ty : float;
-}
-
-type glyf_path = {
-	gp_type : int;
-	gp_x : float;
-	gp_y : float;
-	gp_cx : float;
-	gp_cy : float;
-}
-
-type simple_point = {
-	x : float;
-	y : float;
-}
-
-let mk_path t x y cx cy = {
-	gp_type = t;
-	gp_x = x;
-	gp_y = y;
-	gp_cx = cx;
-	gp_cy = cy;
-}
-
-let identity () = {
-	a = 1.0;
-	b = 0.0;
-	c = 0.0;
-	d = 1.0;
-	tx = 0.0;
-	ty = 0.0;
-}
-
-let multiply m x y =
-	x *. m.a +. y *. m.b +. m.tx,
-	x *. m.c +. y *. m.d +. m.ty
-
-(* TODO: check if this can be done in the parser directly *)
-let matrix_from_composite gc =
-	let a,b,c,d = match gc.gc_transformation with
-		| NoScale -> 1.0,0.0,0.0,1.0
-		| Scale f -> f,0.0,0.0,f
-		| ScaleXY(fx,fy) -> fx,0.0,0.0,fy
-		| ScaleMatrix (a,b,c,d) -> a,b,c,d
-	in
-	let arg1 = float_of_int gc.gc_arg1 in
-	let arg2 = float_of_int gc.gc_arg2 in
-	{
-		a = a;
-		b = b;
-		c = c;
-		d = d;
-		(* TODO: point offsets *)
-		tx = arg1 *. a +. arg2 *. b;
-		ty = arg1 *. c +. arg2 *. d;
-	}
-
-let relative_matrix m = {m with tx = 0.0; ty = 0.0}
-
-let make_coords relative mo g = match mo with
-	| None ->
-		Array.init (Array.length g.gs_x_coordinates) (fun i -> float_of_int g.gs_x_coordinates.(i),float_of_int g.gs_y_coordinates.(i))
-	| Some m ->
-		let m = if relative then relative_matrix m else m in
-		Array.init (Array.length g.gs_x_coordinates) (fun i ->
-			let x,y = float_of_int g.gs_x_coordinates.(i),float_of_int g.gs_y_coordinates.(i) in
-			multiply m x y
-		)
-
-let build_paths relative mo g =
-	let len = Array.length g.gs_x_coordinates in
-	let current_end = ref 0 in
-	let end_pts = Array.init len (fun i ->
-		if g.gs_end_pts_of_contours.(!current_end) = i then begin
-			incr current_end;
-			true
-		end else
-			false
-	) in
-	let is_on i = g.gs_flags.(i) land 0x01 <> 0 in
-	let is_end i = end_pts.(i) in
-	let arr = DynArray.create () in
-	let tx,ty = match mo with None -> 0.0,0.0 | Some m -> m.tx,m.ty in
-	let last_added = ref {
-		x = 0.0;
-		y = 0.0;
-	} in
-	let add_rel t x y cx cy =
-		let p = match t with
-			| 0 ->
-				mk_path t (x +. tx) (y +. ty) cx cy
-			| 1 ->
-				mk_path t (x -. !last_added.x) (y -. !last_added.y) cx cy
-			| 2 ->
-				mk_path t (x -. cx) (y -. cy) (cx -. !last_added.x) (cy -. !last_added.y)
-			| _ ->
-				assert false
-		in
-		last_added := { x = x; y = y; };
-		DynArray.add arr p
-	in
-	let add_abs t x y cx cy = DynArray.add arr (mk_path t x y cx cy) in
-	let add = if relative then add_rel else add_abs in
-	let coords = make_coords relative mo g in
-
-	let left = ref [] in
-	let right = ref [] in
-	let new_contour = ref true in
-	let p = ref { x = 0.0; y = 0.0 } in
-	for i = 0 to len - 1 do
-		p := {
-			x = !p.x +. fst coords.(i);
-			y = !p.y +. snd coords.(i);
-		};
-		let p = !p in
-		let is_on = is_on i in
-		let is_end = is_end i in
-		let rec flush pl = match pl with
-			| c :: a :: [] -> add 2 a.x a.y c.x c.y
-			| a :: [] -> add 1 a.x a.y 0.0 0.0
-			| c1 :: c2 :: pl ->
-				add 2 (c1.x +. (c2.x -. c1.x) /. 2.0) (c1.y +. (c2.y -. c1.y) /. 2.0) c1.x c1.y;
-				flush (c2 :: pl)
-			| _ ->
-				Printf.printf "Fail, len: %i\n" (List.length pl);
-		in
-		if !new_contour then begin
-			if is_on then begin
-				new_contour := false;
-				add 0 p.x p.y 0.0 0.0;
-			end;
-			left := p :: !left
-		end else if is_on || is_end then begin
-			right := p :: !right;
-			if is_on then begin
-				flush (List.rev !right);
-				right := []
-			end;
-			if is_end then begin
-				new_contour := true;
-				flush ((List.rev !right) @ (List.rev !left));
-				left := [];
-				right := [];
-			end
-		end else
-			right := p :: !right
-	done;
-	DynArray.to_list arr
-
-let rec build_glyph_paths ttf relative ?(transformation=None) glyf =
-	match glyf with
-	| TGlyfSimple (h,g) ->
-		build_paths relative transformation g
-	| TGlyfComposite (h,gl) ->
-		List.concat (List.map (fun g ->
-			let t = Some (matrix_from_composite g) in
-			build_glyph_paths ttf relative ~transformation:t (ttf.ttf_glyfs.(g.gc_glyf_index))
-		) gl)
-	| TGlyfNull ->
-		[]
-
-let map_char_code cc c4 =
-	let index = ref 0 in
-	let seg_count = c4.c4_seg_count_x2 / 2 in
-	if cc >= 0xFFFF then 0 else begin
-		for i = 0 to seg_count - 1 do
-			if c4.c4_end_code.(i) >= cc && c4.c4_start_code.(i) <= cc then begin
-				if c4.c4_id_range_offset.(i) > 0 then
-					let v = c4.c4_id_range_offset.(i)/2 + cc - c4.c4_start_code.(i) - seg_count + i in
-					index := c4.c4_glyph_index_array.(v)
-				else
-					index := (c4.c4_id_delta.(i) + cc) mod 65536
-			end
-		done;
-		!index
-	end
-
-let parse_range_str str =
-	let last = ref (Char.code '\\') in
-	let range = ref false in
-	let lut = Hashtbl.create 0 in
-	UTF8.iter (fun code ->
-		let code = UChar.code code in
-		if code = Char.code '-' && !last <> Char.code '\\' then
-			range := true
-		else if !range then begin
-			range := false;
-			for i = !last to code do
-				Hashtbl.replace lut i true;
-			done;
-		end else begin
-			Hashtbl.replace lut code true;
-			last := code;
-		end
-	) str;
-	if !range then Hashtbl.replace lut (Char.code '-') true;
-	lut
-
-let build_lut ttf range_str =
-	let lut = Hashtbl.create 0 in
-	Hashtbl.add lut 0 0;
-	Hashtbl.add lut 1 1;
-	Hashtbl.add lut 2 2;
-	let add_character = if range_str = "" then
-			fun k v -> Hashtbl.replace lut k v
-		else begin
-			let range = parse_range_str range_str in
-			fun k v -> if Hashtbl.mem range k then Hashtbl.replace lut k v
-		end
-	in
-	let make_cmap4_map c4 =
-		let seg_count = c4.c4_seg_count_x2 / 2 in
-		for i = 0 to seg_count - 1 do
-			for j = c4.c4_start_code.(i) to c4.c4_end_code.(i) do
-				let index = map_char_code j c4 in
-				add_character j index;
-			done;
-		done
-	in
-(*  	let make_cmap12_map c12 =
-		List.iter (fun group ->
-			let rec loop cc gi =
-				add_character cc gi;
-				if cc < (Int32.to_int group.c12g_end_char_code) then loop (cc + 1) (gi + 1)
-			in
-			loop (Int32.to_int group.c12g_start_char_code) (Int32.to_int group.c12g_start_glyph_code)
-		) c12.c12_groups
-	in *)
-	List.iter (fun st -> match st.cs_def with
-		| Cmap0 c0 ->
-			Array.iteri (fun i c -> add_character i (int_of_char c)) c0.c0_glyph_index_array;
-		| Cmap4 c4 ->
-			make_cmap4_map c4;
-		| Cmap12 c12 ->
-			(*
-				TODO: this causes an exception with some fonts:
-				Fatal error: exception IO.Overflow("write_ui16")
-			*)
-			(* make_cmap12_map ctx lut c12; *)
-			()
-		| _ ->
-			(* TODO *)
-			()
-	) ttf.ttf_cmap.cmap_subtables;
-	lut
\ No newline at end of file
+(*
+ * Copyright (C)2005-2014 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.
+ *)
+
+open TTFData
+
+type glyf_transformation_matrix = {
+	mutable a : float;
+	mutable b : float;
+	mutable c : float;
+	mutable d : float;
+	mutable tx : float;
+	mutable ty : float;
+}
+
+type glyf_path = {
+	gp_type : int;
+	gp_x : float;
+	gp_y : float;
+	gp_cx : float;
+	gp_cy : float;
+}
+
+type simple_point = {
+	x : float;
+	y : float;
+}
+
+let mk_path t x y cx cy = {
+	gp_type = t;
+	gp_x = x;
+	gp_y = y;
+	gp_cx = cx;
+	gp_cy = cy;
+}
+
+let identity () = {
+	a = 1.0;
+	b = 0.0;
+	c = 0.0;
+	d = 1.0;
+	tx = 0.0;
+	ty = 0.0;
+}
+
+let multiply m x y =
+	x *. m.a +. y *. m.b +. m.tx,
+	x *. m.c +. y *. m.d +. m.ty
+
+(* TODO: check if this can be done in the parser directly *)
+let matrix_from_composite gc =
+	let a,b,c,d = match gc.gc_transformation with
+		| NoScale -> 1.0,0.0,0.0,1.0
+		| Scale f -> f,0.0,0.0,f
+		| ScaleXY(fx,fy) -> fx,0.0,0.0,fy
+		| ScaleMatrix (a,b,c,d) -> a,b,c,d
+	in
+	let arg1 = float_of_int gc.gc_arg1 in
+	let arg2 = float_of_int gc.gc_arg2 in
+	{
+		a = a;
+		b = b;
+		c = c;
+		d = d;
+		(* TODO: point offsets *)
+		tx = arg1 *. a +. arg2 *. b;
+		ty = arg1 *. c +. arg2 *. d;
+	}
+
+let relative_matrix m = {m with tx = 0.0; ty = 0.0}
+
+let make_coords relative mo g = match mo with
+	| None ->
+		Array.init (Array.length g.gs_x_coordinates) (fun i -> float_of_int g.gs_x_coordinates.(i),float_of_int g.gs_y_coordinates.(i))
+	| Some m ->
+		let m = if relative then relative_matrix m else m in
+		Array.init (Array.length g.gs_x_coordinates) (fun i ->
+			let x,y = float_of_int g.gs_x_coordinates.(i),float_of_int g.gs_y_coordinates.(i) in
+			multiply m x y
+		)
+
+let build_paths relative mo g =
+	let len = Array.length g.gs_x_coordinates in
+	let current_end = ref 0 in
+	let end_pts = Array.init len (fun i ->
+		if g.gs_end_pts_of_contours.(!current_end) = i then begin
+			incr current_end;
+			true
+		end else
+			false
+	) in
+	let is_on i = g.gs_flags.(i) land 0x01 <> 0 in
+	let is_end i = end_pts.(i) in
+	let arr = DynArray.create () in
+	let tx,ty = match mo with None -> 0.0,0.0 | Some m -> m.tx,m.ty in
+	let last_added = ref {
+		x = 0.0;
+		y = 0.0;
+	} in
+	let add_rel t x y cx cy =
+		let p = match t with
+			| 0 ->
+				mk_path t (x +. tx) (y +. ty) cx cy
+			| 1 ->
+				mk_path t (x -. !last_added.x) (y -. !last_added.y) cx cy
+			| 2 ->
+				mk_path t (x -. cx) (y -. cy) (cx -. !last_added.x) (cy -. !last_added.y)
+			| _ ->
+				assert false
+		in
+		last_added := { x = x; y = y; };
+		DynArray.add arr p
+	in
+	let add_abs t x y cx cy = DynArray.add arr (mk_path t x y cx cy) in
+	let add = if relative then add_rel else add_abs in
+	let coords = make_coords relative mo g in
+
+	let left = ref [] in
+	let right = ref [] in
+	let new_contour = ref true in
+	let p = ref { x = 0.0; y = 0.0 } in
+	for i = 0 to len - 1 do
+		p := {
+			x = !p.x +. fst coords.(i);
+			y = !p.y +. snd coords.(i);
+		};
+		let p = !p in
+		let is_on = is_on i in
+		let is_end = is_end i in
+		let rec flush pl = match pl with
+			| c :: a :: [] -> add 2 a.x a.y c.x c.y
+			| a :: [] -> add 1 a.x a.y 0.0 0.0
+			| c1 :: c2 :: pl ->
+				add 2 (c1.x +. (c2.x -. c1.x) /. 2.0) (c1.y +. (c2.y -. c1.y) /. 2.0) c1.x c1.y;
+				flush (c2 :: pl)
+			| _ ->
+				Printf.printf "Fail, len: %i\n" (List.length pl);
+		in
+		if !new_contour then begin
+			if is_on then begin
+				new_contour := false;
+				add 0 p.x p.y 0.0 0.0;
+			end;
+			left := p :: !left
+		end else if is_on || is_end then begin
+			right := p :: !right;
+			if is_on then begin
+				flush (List.rev !right);
+				right := []
+			end;
+			if is_end then begin
+				new_contour := true;
+				flush ((List.rev !right) @ (List.rev !left));
+				left := [];
+				right := [];
+			end
+		end else
+			right := p :: !right
+	done;
+	DynArray.to_list arr
+
+let rec build_glyph_paths ttf relative ?(transformation=None) glyf =
+	match glyf with
+	| TGlyfSimple (h,g) ->
+		build_paths relative transformation g
+	| TGlyfComposite (h,gl) ->
+		List.concat (List.map (fun g ->
+			let t = Some (matrix_from_composite g) in
+			build_glyph_paths ttf relative ~transformation:t (ttf.ttf_glyfs.(g.gc_glyf_index))
+		) gl)
+	| TGlyfNull ->
+		[]
+
+let map_char_code cc c4 =
+	let index = ref 0 in
+	let seg_count = c4.c4_seg_count_x2 / 2 in
+	if cc >= 0xFFFF then 0 else begin
+		for i = 0 to seg_count - 1 do
+			if c4.c4_end_code.(i) >= cc && c4.c4_start_code.(i) <= cc then begin
+				if c4.c4_id_range_offset.(i) > 0 then
+					let v = c4.c4_id_range_offset.(i)/2 + cc - c4.c4_start_code.(i) - seg_count + i in
+					index := c4.c4_glyph_index_array.(v)
+				else
+					index := (c4.c4_id_delta.(i) + cc) mod 65536
+			end
+		done;
+		!index
+	end
+
+let parse_range_str str =
+	let last = ref (Char.code '\\') in
+	let range = ref false in
+	let lut = Hashtbl.create 0 in
+	UTF8.iter (fun code ->
+		let code = UCharExt.code code in
+		if code = Char.code '-' && !last <> Char.code '\\' then
+			range := true
+		else if !range then begin
+			range := false;
+			for i = !last to code do
+				Hashtbl.replace lut i true;
+			done;
+		end else begin
+			Hashtbl.replace lut code true;
+			last := code;
+		end
+	) str;
+	if !range then Hashtbl.replace lut (Char.code '-') true;
+	lut
+
+let build_lut ttf range_str =
+	let lut = Hashtbl.create 0 in
+	Hashtbl.add lut 0 0;
+	Hashtbl.add lut 1 1;
+	Hashtbl.add lut 2 2;
+	let add_character = if range_str = "" then
+			fun k v -> Hashtbl.replace lut k v
+		else begin
+			let range = parse_range_str range_str in
+			fun k v -> if Hashtbl.mem range k then Hashtbl.replace lut k v
+		end
+	in
+	let make_cmap4_map c4 =
+		let seg_count = c4.c4_seg_count_x2 / 2 in
+		for i = 0 to seg_count - 1 do
+			for j = c4.c4_start_code.(i) to c4.c4_end_code.(i) do
+				let index = map_char_code j c4 in
+				add_character j index;
+			done;
+		done
+	in
+(*  	let make_cmap12_map c12 =
+		List.iter (fun group ->
+			let rec loop cc gi =
+				add_character cc gi;
+				if cc < (Int32.to_int group.c12g_end_char_code) then loop (cc + 1) (gi + 1)
+			in
+			loop (Int32.to_int group.c12g_start_char_code) (Int32.to_int group.c12g_start_glyph_code)
+		) c12.c12_groups
+	in *)
+	List.iter (fun st -> match st.cs_def with
+		| Cmap0 c0 ->
+			Array.iteri (fun i c -> add_character i (int_of_char c)) c0.c0_glyph_index_array;
+		| Cmap4 c4 ->
+			make_cmap4_map c4;
+		| Cmap12 c12 ->
+			(*
+				TODO: this causes an exception with some fonts:
+				Fatal error: exception IO.Overflow("write_ui16")
+			*)
+			(* make_cmap12_map ctx lut c12; *)
+			()
+		| _ ->
+			(* TODO *)
+			()
+	) ttf.ttf_cmap.cmap_subtables;
+	lut
diff --git a/libs/xml-light/META.in b/libs/xml-light/META.in
deleted file mode 100644
index f198c6d334ac61b3f22f8adcbaa1d7106fc5eaf0..0000000000000000000000000000000000000000
--- a/libs/xml-light/META.in
+++ /dev/null
@@ -1,3 +0,0 @@
-version="@VERSION@"
-archive(byte)="xml-light.cma"
-archive(native)="xml-light.cmxa"
diff --git a/libs/xml-light/Makefile b/libs/xml-light/Makefile
deleted file mode 100644
index 06ae73f7521990f3bff2c32d8e3959fd779082b7..0000000000000000000000000000000000000000
--- a/libs/xml-light/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-# Makefile generated by OCamake 
-# http://tech.motion-twin.com
-VERSION=2.3
-OCAMLOPT=ocamlopt
-OCAMLC=ocamlc
-OCAMLFIND=ocamlfind
-
-.SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly
-
-INSTALLDIR=`$(OCAMLC) -where`
-ALL_CFLAGS= $(CFLAGS)
-LFLAGS= -a
-LIBS=
-SRC=dtd.mli xml.dsp xml_lexer.mli xml.ml xmlParser.ml xml_parser.mly dtd.ml test.ml xml.dsw xml_lexer.mll xml.mli xmlParser.mli
-
-
-all: bytecode test.exe doc
-
-opt: native
-
-native: xml-light.cmxa
-
-bytecode: xml-light.cma
-
-installcommon: all
-	cp xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi dtd.cmi $(INSTALLDIR)
-
-installbyte: all installcommon
-	cp xml-light.cma $(INSTALLDIR)
-
-installopt: opt installcommon
-	cp xml-light.a xml-light.cmxa xml.cmx dtd.cmx xmlParser.cmx $(INSTALLDIR)
-
-install: installbyte installopt
-
-wininstall: all opt
-	cp xml-light.cmxa xml-light.lib xml-light.cma xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi dtd.cmi xml.cmx dtd.cmx xmlParser.cmx c:\ocaml\lib
-
-install_ocamlfind: all opt
-	cp META.in META
-	sed -itmp "s|@VERSION@|$(VERSION)|g" META
-	rm -rf METAtmp
-	$(OCAMLFIND) install xml-light META xml-light.a xml-light.cma xml-light.cmxa xml.cmx dtd.cmx xmlParser.cmx xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi dtd.cmi
-
-doc: doc/index.html
-doc/index.html: xml.mli dtd.mli xmlParser.mli
-	mkdir -p doc
-	ocamldoc -sort -html -d doc xml.mli dtd.mli xmlParser.mli
-
-test.exe: xml-light.cma
-	$(OCAMLC) xml-light.cma test.ml -o test.exe
-
-test_opt.exe: xml-light.cmxa
-	$(OCAMLOPT) xml-light.cmxa test.ml -o test_opt.exe
-
-xml-light.cma: xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo 
-	$(OCAMLC) -o xml-light.cma $(LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo
-
-xml-light.cmxa: xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx 
-	$(OCAMLOPT) -o xml-light.cmxa $(LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx
-
-dtd.cmo: xml.cmi xml_lexer.cmi dtd.cmi
-
-dtd.cmx: xml.cmi xml_lexer.cmi dtd.cmi
-
-xml.cmo: dtd.cmi xmlParser.cmi xml_lexer.cmi xml.cmi
-
-xml.cmx: dtd.cmi xmlParser.cmi xml_lexer.cmi xml.cmi
-
-xmlParser.cmo: dtd.cmi xml.cmi xml_lexer.cmi xmlParser.cmi
-
-xmlParser.cmx: dtd.cmi xml.cmi xml_lexer.cmi xmlParser.cmi
-
-dtd.cmi: xml.cmi
-
-xml.cmi: 
-
-xmlParser.cmi: dtd.cmi xml.cmi
-
-xml_lexer.cmi: dtd.cmi
-
-xml_parser.cmo: xml_parser.ml dtd.cmi xml_parser.mli xml_parser.cmi
-
-xml_parser.cmx: xml_parser.ml dtd.cmi xml_parser.mli xml_parser.cmi
-
-xml_parser.cmi: xml_parser.mli dtd.cmi xml.cmi
-
-xml_lexer.cmo: xml_lexer.ml xml_lexer.cmi
-
-xml_lexer.cmx: xml_lexer.ml xml_lexer.cmi
-
-clean:
-	rm -f xml-light.cma test.exe dtd.cmo dtd.cmi test.cmo test.cmi xml.cmo xml.cmi xmlParser.cmo xmlParser.cmi dtd.cmi xml.cmi xmlParser.cmi xml_lexer.cmi xml_lexer.cmo xml_lexer.ml xml_parser.mli xml_parser.cmi xml_parser.ml xml_parser.cmo
-	rm -f xml-light.lib xml-light.a xml-light.cmxa test_opt.exe dtd.cmx dtd.obj dtd.o test.cmx test.obj test.o xml.cmx xml.obj xml.o xmlParser.cmx xmlParser.obj xmlParser.o xml_lexer.cmx xml_lexer.obj xml_lexer.o xml_parser.cmx xml_parser.obj xml_parser.o
-	rm -rf doc
-
-
-# SUFFIXES
-.ml.cmo:
-	$(OCAMLC) $(ALL_CFLAGS) -c $<
-
-.ml.cmx:
-	$(OCAMLOPT) $(ALL_CFLAGS) -c $<
-
-.mli.cmi:
-	$(OCAMLC) $(ALL_CFLAGS) $<
-
-.mll.ml:
-	ocamllex $<
-
-.mly.ml:
-	ocamlyacc $<
-
-Makefile: ;
-$(SRC): ;
-.PHONY: all opt native bytecode installcommon installbyte installopt install wininstall install_ocamlfind doc clean
diff --git a/libs/xml-light/README b/libs/xml-light/README
deleted file mode 100644
index 2056d86be25d56cbf8e84c2030c87527fa699312..0000000000000000000000000000000000000000
--- a/libs/xml-light/README
+++ /dev/null
@@ -1,79 +0,0 @@
-Xml-Light Version 2.3 :
------------------------
-
-Last version : http://tech.motion-twin.com
-
-  Xml Light is a minimal Xml parser & printer for OCaml.
-  It provide few functions to parse a basic Xml document into
-  an OCaml data structure and to print back the data structures
-  to an Xml document.
-
-  Xml Light has also support for DTD (Document Type Definition).
-
-
-Install
--------
-
-make install
-
-by default, Xml Light is installed in the 'ocamlc -where' directory.
-you can change it by editing the Makefile.
-
-for Windows users, if you're using the MSVC version of ocaml and
-don't have cygwin tools installed, you can do : nmake all
-and then copy manually the files to the place you want.
-
-Usage
------
-
-simple samples :
-
-
--- parse / print an xml string ---
-
-let x = Xml.parse_string "<a href='url'>TEXT<begin/><end/></a>" in
-Printf.printf "XML formated = \n%s" (Xml.to_string_fmt x);
-
--- load an xml and a dtd , prove and print ---
-
-let x = Xml.parse_file "myfile.xml" in
-let dtd = Dtd.parse_file "myfile.dtd" in
-let x = Dtd.prove (Dtd.check dtd) "start" x in
-print_endline (Xml.to_string x)
-
-
-Documentation
--------------
-
-HTML documentation can be generated with ocamldoc :
-
-make doc
-
-you can also directly browse the MLI files to read it.
-
-Licence
--------
-
-Xml Light is distributed under the terms of the GNU Library General
-Public License, with the special exception on linking described
-below. (This is the OCaml library licence.)
-
-As a special exception to the GNU Library General Public License, you
-may link, statically or dynamically, a "work that uses the Library"
-with a publicly distributed version of the Library to produce an
-executable file containing portions of the Library, and distribute
-that executable file under terms of your choice, without any of the
-additional requirements listed in clause 6 of the GNU Library General
-Public License. By "a publicly distributed version of the Library", we
-mean either the unmodified Library as distributed by INRIA, or a
-modified version of the Library that is distributed under the
-conditions defined in clause 3 of the GNU Library General Public
-License. This exception does not however invalidate any other reasons
-why the executable file might be covered by the GNU Library General
-Public License.
-
-Credits
--------
-(c)2003-2005 Nicolas Cannasse (ncannasse@motion-twin.com)
-(c)2003-2005 Motion-Twin
-Some parts of this code source has an additionnal copyright to Jacques Garrigue
diff --git a/libs/xml-light/dtd.ml b/libs/xml-light/dtd.ml
deleted file mode 100644
index 7f9e9ed96e29b5d5b663d7964ea12ef678b68455..0000000000000000000000000000000000000000
--- a/libs/xml-light/dtd.ml
+++ /dev/null
@@ -1,555 +0,0 @@
-(*
- * Xml Light, an small Xml parser/printer with DTD support.
- * Copyright (C) 2003 Nicolas Cannasse (ncannasse@motion-twin.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library has the special exception on linking described in file
- * README.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *)
-
-open Xml
-open Printf
-
-type parse_error_msg =
-	| InvalidDTDDecl
-	| InvalidDTDElement
-	| InvalidDTDAttribute
-	| InvalidDTDTag
-	| DTDItemExpected
-
-type check_error =
-	| ElementDefinedTwice of string
-	| AttributeDefinedTwice of string * string
-	| ElementEmptyContructor of string
-	| ElementReferenced of string * string
-	| ElementNotDeclared of string
-	| WrongImplicitValueForID of string * string
-
-type prove_error =
-	| UnexpectedPCData
-	| UnexpectedTag of string
-	| UnexpectedAttribute of string
-	| InvalidAttributeValue of string
-	| RequiredAttribute of string
-	| ChildExpected of string
-	| EmptyExpected
-	| DuplicateID of string
-	| MissingID of string
-
-type dtd_child =
-	| DTDTag of string
-	| DTDPCData
-	| DTDOptional of dtd_child
-	| DTDZeroOrMore of dtd_child
-	| DTDOneOrMore of dtd_child
-	| DTDChoice of dtd_child list
-	| DTDChildren of dtd_child list
-
-type dtd_element_type =
-	| DTDEmpty
-	| DTDAny
-	| DTDChild of dtd_child
-
-type dtd_attr_default =
-	| DTDDefault of string
-	| DTDRequired
-	| DTDImplied
-	| DTDFixed of string
-
-type dtd_attr_type =
-	| DTDCData
-	| DTDNMToken
-	| DTDEnum of string list
-	| DTDID
-	| DTDIDRef
-
-type dtd_item =
-	| DTDAttribute of string * string * dtd_attr_type * dtd_attr_default
-	| DTDElement of string * dtd_element_type
-
-type dtd_result =
-	| DTDNext
-	| DTDNotMatched
-	| DTDMatched
-	| DTDMatchedResult of dtd_child
-
-type error_pos = {
-	eline : int;
-	eline_start : int;
-	emin : int;
-	emax : int;
-}
-
-type parse_error = parse_error_msg * Xml.error_pos
-
-exception Parse_error of parse_error
-exception Check_error of check_error
-exception Prove_error of prove_error
-
-type dtd = dtd_item list
-
-module StringMap = Map.Make(String)
-
-type 'a map = 'a StringMap.t ref
-
-type checked = {
-	c_elements : dtd_element_type map;
-	c_attribs : (dtd_attr_type * dtd_attr_default) map map;
-}
-
-type dtd_state = {
-	elements : dtd_element_type map;
-	attribs : (dtd_attr_type * dtd_attr_default) map map;
-	mutable current : dtd_element_type;
-	mutable curtag : string;
-	state : (string * dtd_element_type) Stack.t;
-}
-
-let file_not_found = ref (fun _ -> assert false)
-
-let _raises e =
-	file_not_found := e
-
-let create_map() = ref StringMap.empty
-
-let empty_map = create_map()
-
-let find_map m k = StringMap.find k (!m)
-
-let set_map m k v = m := StringMap.add k v (!m)
-
-let unset_map m k = m := StringMap.remove k (!m)
-
-let iter_map f m = StringMap.iter f (!m)
-
-let fold_map f m = StringMap.fold f (!m)
-
-let mem_map m k = StringMap.mem k (!m)
-
-let pos source =
-	let line, lstart, min, max = Xml_lexer.pos source in
-	(Obj.magic {
-		eline = line;
-		eline_start = lstart;
-		emin = min;
-		emax = max;
-	} : Xml.error_pos)
-
-let convert = function
-	| Xml_lexer.EInvalidDTDDecl -> InvalidDTDDecl
-	| Xml_lexer.EInvalidDTDElement -> InvalidDTDElement
-	| Xml_lexer.EInvalidDTDTag -> InvalidDTDTag
-	| Xml_lexer.EDTDItemExpected -> DTDItemExpected
-	| Xml_lexer.EInvalidDTDAttribute -> InvalidDTDAttribute
-
-let parse source =
-	try
-		Xml_lexer.init source;
-		(* local cast Dtd.dtd -> dtd *)
-		let dtd = (Obj.magic Xml_lexer.dtd source : dtd) in
-		Xml_lexer.close source;
-		dtd
-	with
-		| Xml_lexer.DTDError e ->
-			Xml_lexer.close source;
-			raise (Parse_error (convert e,pos source))
-
-let parse_string s = parse (Lexing.from_string s)
-let parse_in ch = parse (Lexing.from_channel ch)
-
-let parse_file fname =
-	let ch = (try open_in fname with Sys_error _ -> raise (!file_not_found fname)) in
-	try
-		let x = parse (Lexing.from_channel ch) in
-		close_in ch;
-		x
-	with
-		e ->
-			close_in ch;
-			raise e
-
-let check dtd =
-	let attribs = create_map() in
-	let hdone = create_map() in
-	let htodo = create_map() in
-	let ftodo tag from =
-		try
-			ignore(find_map hdone tag);
-		with
-			Not_found ->
-				try
-					match find_map htodo tag with
-					| None -> set_map htodo tag from
-					| Some _ -> ()
-				with
-					Not_found ->
-						set_map htodo tag from
-	in
-	let fdone tag edata =
-		try
-			ignore(find_map hdone tag);
-			raise (Check_error (ElementDefinedTwice tag));
-		with
-			Not_found ->
-				unset_map htodo tag;
-				set_map hdone tag edata
-	in
-	let fattrib tag aname adata =
-		(match adata with
-	    | DTDID,DTDImplied -> ()
-	    | DTDID,DTDRequired -> ()
-	    | DTDID,_ -> raise (Check_error (WrongImplicitValueForID (tag,aname)))
-	    | _ -> ());
-		let h = (try
-				find_map attribs tag
-			with
-				Not_found ->
-					let h = create_map() in
-					set_map attribs tag h;
-					h) in
-		try
-			ignore(find_map h aname);
-			raise (Check_error (AttributeDefinedTwice (tag,aname)));
-		with
-			Not_found ->
-				set_map h aname adata
-	in
-	let check_item = function
-		| DTDAttribute (tag,aname,atype,adef) ->
-			let utag = String.uppercase tag in
-			ftodo utag None;
-			fattrib utag (String.uppercase aname) (atype,adef)
-		| DTDElement (tag,etype) ->
-			let utag = String.uppercase tag in
-			fdone utag etype;
-			let check_type = function
-				| DTDEmpty -> ()
-				| DTDAny -> ()
-				| DTDChild x ->
-					let rec check_child = function
-						| DTDTag s -> ftodo (String.uppercase s) (Some utag)
-						| DTDPCData -> ()
-						| DTDOptional c
-						| DTDZeroOrMore c
-						| DTDOneOrMore c ->
-							check_child c
-						| DTDChoice []
-						| DTDChildren [] ->
-							raise (Check_error (ElementEmptyContructor tag))
-						| DTDChoice l
-						| DTDChildren l ->
-							List.iter check_child l
-					in
-					check_child x
-			in
-			check_type etype
-	in
-	List.iter check_item dtd;
-	iter_map (fun t from ->
-		match from with
-		| None -> raise (Check_error (ElementNotDeclared t))
-		| Some tag -> raise (Check_error (ElementReferenced (t,tag)))
-	) htodo;
-	{
-		c_elements = hdone;
-		c_attribs = attribs;
-	}
-
-let start_prove dtd root =
-	let d = {
-		elements = dtd.c_elements;
-		attribs = dtd.c_attribs;
-		state = Stack.create();
-		current = DTDChild (DTDTag root);
-		curtag = "_root";
-	} in
-	try
-		ignore(find_map d.elements (String.uppercase root));
-		d
-	with
-		Not_found -> raise (Check_error (ElementNotDeclared root))
-
-
-(* - for debug only - *)
-
-let to_string_ref = ref (fun _ -> assert false)
-
-let trace dtd tag =
-	let item = DTDElement ("current",dtd.current) in
-	printf "%s : %s\n"
-		(match tag with None -> "#PCDATA" | Some t -> t)
-		(!to_string_ref item)
-
-exception TmpResult of dtd_result
-
-let prove_child dtd tag =
-	match dtd.current with
-	| DTDEmpty -> raise (Prove_error EmptyExpected)
-	| DTDAny -> ()
-	| DTDChild elt ->
-		let rec update = function
-		| DTDTag s ->
-			(match tag with
-			| None -> DTDNotMatched
-			| Some t when t = String.uppercase s -> DTDMatched
-			| Some _ -> DTDNotMatched)
-		| DTDPCData ->
-			(match tag with
-			| None -> DTDMatched
-			| Some _ -> DTDNotMatched)
-		| DTDOptional x ->
-			(match update x with
-			| DTDNotMatched
-			| DTDNext -> DTDNext
-			| DTDMatched
-			| DTDMatchedResult _ -> DTDMatched)
-		| DTDZeroOrMore x ->
-			(match update x with
-			| DTDNotMatched
-			| DTDNext -> DTDNext
-			| DTDMatched
-			| DTDMatchedResult _ -> DTDMatchedResult (DTDZeroOrMore x))
-		| DTDOneOrMore x ->
-			(match update x with
-			| DTDNotMatched
-			| DTDNext -> DTDNotMatched
-			| DTDMatched
-			| DTDMatchedResult _ -> DTDMatchedResult (DTDZeroOrMore x))
-		| DTDChoice l ->
-			(try
-				(match List.exists (fun x ->
-					match update x with
-					| DTDMatched -> true
-					| DTDMatchedResult _ as r -> raise (TmpResult r)
-					| DTDNext | DTDNotMatched -> false) l with
-				| true -> DTDMatched
-				| false -> DTDNotMatched)
-			with
-				TmpResult r -> r)
-		| DTDChildren [] -> assert false (* DTD is checked ! *)
-		| DTDChildren (h :: t) ->
-			(match update h with
-			| DTDNext ->
-				(match t with
-				| [] -> DTDNotMatched
-				| _ -> update (DTDChildren t))
-			| DTDNotMatched -> DTDNotMatched
-			| DTDMatchedResult r ->
-				DTDMatchedResult (DTDChildren (r::t))
-			| DTDMatched ->
-				match t with
-				| [] -> DTDMatched
-				| _ -> DTDMatchedResult (DTDChildren t))
-		in
-		match update elt with
-		| DTDNext | DTDNotMatched ->
-			(match tag with
-			| None -> raise (Prove_error UnexpectedPCData)
-			| Some t -> raise (Prove_error (UnexpectedTag t)))
-		| DTDMatched ->
-			dtd.current <- DTDEmpty
-		| DTDMatchedResult r ->
-			dtd.current <- DTDChild r
-
-let is_nmtoken_char = function
-	| 'A'..'Z' | 'a'..'z' | '0'..'9' | '.' | '-' | '_' | ':' -> true
-	| _ -> false
-
-let prove_attrib dtd hid hidref attr aname (atype,adef) accu =
-	let aval = (try Some (List.assoc aname attr) with Not_found -> None) in
-	(match atype, aval with
-	| DTDCData, _ -> ()
-	| DTDNMToken, None -> ()
-	| DTDNMToken, Some v ->
-		for i = 0 to String.length v - 1 do
-			if not (is_nmtoken_char v.[i]) then raise (Prove_error (InvalidAttributeValue aname));
-		done
-	| DTDEnum l, None -> ()
-	| DTDEnum l, Some v ->
-		if not (List.exists ((=) v) l) then raise (Prove_error (InvalidAttributeValue aname))
-	| DTDID, None -> ()
-	| DTDID, Some id ->
-		if mem_map hid id then raise (Prove_error (DuplicateID id));
-		set_map hid id ()
-	| DTDIDRef, None -> ()
-	| DTDIDRef, Some idref ->
-		set_map hidref idref ());
-	match adef, aval with
-	| DTDRequired, None -> raise (Prove_error (RequiredAttribute aname))
-	| DTDFixed v, Some av when v <> av -> raise (Prove_error (InvalidAttributeValue aname))
-	| DTDImplied, None -> accu
-	| DTDFixed v , None
-	| DTDDefault _, Some v
-	| DTDDefault v, None
-	| DTDRequired,  Some v
-	| DTDImplied, Some v
-	| DTDFixed _, Some v -> (aname,v) :: accu
-
-let check_attrib ahash (aname,_) =
-	try
-		ignore(find_map ahash aname);
-	with
-		Not_found -> raise (Prove_error (UnexpectedAttribute aname))
-
-let rec do_prove hid hidref dtd = function
-	| PCData s ->
-		prove_child dtd None;
-		PCData s
-	| Element (tag,attr,childs) ->
-		let utag = String.uppercase tag in
-		let uattr = List.map (fun (aname,aval) -> String.uppercase aname , aval) attr in
-		prove_child dtd (Some utag);
-		Stack.push (dtd.curtag,dtd.current) dtd.state;
-		let elt = (try find_map dtd.elements utag with Not_found -> raise (Prove_error (UnexpectedTag tag))) in
-		let ahash = (try find_map dtd.attribs utag with Not_found -> empty_map) in
-		dtd.curtag <- tag;
-		dtd.current <- elt;
-		List.iter (check_attrib ahash) uattr;
-		let attr = fold_map (prove_attrib dtd hid hidref uattr) ahash [] in
-		let childs = ref (List.map (do_prove hid hidref dtd) childs) in
-		(match dtd.current with
-		| DTDAny
-		| DTDEmpty -> ()
-		| DTDChild elt ->
-			let name = ref "" in
-			let rec check = function
-				| DTDTag t ->
-					name := t;
-					false
-				| DTDPCData when !childs = [] ->
-					childs := [PCData ""];
-					true
-				| DTDPCData ->
-					name := "#PCDATA";
-					false
-				| DTDOptional _ -> true
-				| DTDZeroOrMore _ -> true
-				| DTDOneOrMore e ->
-					ignore(check e);
-					false
-				| DTDChoice l -> List.exists check l
-				| DTDChildren l -> List.for_all check l
-			in
-			match check elt with
-			| true -> ()
-			| false -> raise (Prove_error (ChildExpected !name)));
-		let ctag, cur = Stack.pop dtd.state in
-		dtd.curtag <- tag;
-		dtd.current <- cur;
-		Element (tag,attr,!childs)
-
-let prove dtd root xml =
-	let hid = create_map() in
-	let hidref = create_map() in
-	let x = do_prove hid hidref (start_prove dtd root) xml in
-	iter_map (fun id () ->
-		if not (mem_map hid id) then raise (Prove_error (MissingID id))
-	) hidref;
-	x
-
-let parse_error_msg = function
-	| InvalidDTDDecl -> "Invalid DOCTYPE declaration"
-	| InvalidDTDElement -> "Invalid DTD element declaration"
-	| InvalidDTDAttribute -> "Invalid DTD attribute declaration"
-	| InvalidDTDTag -> "Invalid DTD tag"
-	| DTDItemExpected -> "DTD item expected"
-
-let parse_error (msg,pos) =
-	let pos = (Obj.magic pos : error_pos) in
-	if pos.emin = pos.emax then
-		sprintf "%s line %d character %d" (parse_error_msg msg) pos.eline (pos.emin - pos.eline_start)
-	else
-		sprintf "%s line %d characters %d-%d" (parse_error_msg msg) pos.eline (pos.emin - pos.eline_start) (pos.emax - pos.eline_start)
-
-let check_error = function
-	| ElementDefinedTwice tag -> sprintf "Element '%s' defined twice" tag
-	| AttributeDefinedTwice (tag,aname) -> sprintf "Attribute '%s' of element '%s' defined twice" aname tag
-	| ElementEmptyContructor tag -> sprintf "Element '%s' has empty constructor" tag
-	| ElementReferenced (tag,from) -> sprintf "Element '%s' referenced by '%s' is not declared" tag from
-	| ElementNotDeclared tag -> sprintf "Element '%s' needed but is not declared" tag
-	| WrongImplicitValueForID (tag,idname) -> sprintf "Attribute '%s' of type ID of element '%s' not defined with implicit value #REQUIRED or #IMPLIED" idname tag
-
-let prove_error = function
-	| UnexpectedPCData -> "Unexpected PCData"
-	| UnexpectedTag tag -> sprintf "Unexpected tag : '%s'" tag
-	| UnexpectedAttribute att -> sprintf "Unexpected attribute : '%s'" att
-	| InvalidAttributeValue att -> sprintf "Invalid attribute value for '%s'" att
-	| RequiredAttribute att -> sprintf "Required attribute not found : '%s'" att
-	| ChildExpected cname -> sprintf "Child expected : '%s'" cname
-	| EmptyExpected -> "No more children expected"
-	| DuplicateID id  -> sprintf "ID '%s' used several times" id
-	| MissingID idref -> sprintf "missing ID value for IDREF '%s'" idref
-
-let to_string = function
-	| DTDAttribute (tag,aname,atype,adef) ->
-		let atype_to_string = function
-			| DTDCData -> "CDATA"
-			| DTDNMToken -> "NMTOKEN"
-			| DTDEnum l -> sprintf "(%s)" (String.concat "|" l)
-			| DTDID -> "ID"
-			| DTDIDRef -> "IDREF"
-		in
-		let adefault_to_string = function
-			| DTDDefault s -> sprintf "\"%s\"" s
-			| DTDRequired -> "#REQUIRED"
-			| DTDImplied -> "#IMPLIED"
-			| DTDFixed s -> sprintf "#FIXED \"%s\"" s
-		in
-		sprintf "<!ATTLIST %s %s %s %s>" tag aname (atype_to_string atype) (adefault_to_string adef)
-	| DTDElement (tag,etype) ->
-		let rec echild_to_string = function
-			| DTDTag s -> s
-			| DTDPCData -> "#PCDATA"
-			| DTDOptional c -> sprintf "%s?" (echild_to_string c)
-			| DTDZeroOrMore c -> sprintf "%s*" (echild_to_string c)
-			| DTDOneOrMore c -> sprintf "%s+" (echild_to_string c)
-			| DTDChoice [c] -> echild_to_string c
-			| DTDChoice l -> sprintf "(%s)" (String.concat "|" (List.map echild_to_string l))
-			| DTDChildren [c] -> echild_to_string c
-			| DTDChildren l -> sprintf "(%s)" (String.concat "," (List.map echild_to_string l))
-		in
-		let etype_to_string = function
-			| DTDEmpty -> "EMPTY"
-			| DTDAny -> "ANY"
-			| DTDChild x ->
-				let rec op_to_string = function
-					| DTDOptional c -> sprintf "%s?" (op_to_string c)
-					| DTDZeroOrMore c -> sprintf "%s*" (op_to_string c)
-					| DTDOneOrMore c -> sprintf "%s+" (op_to_string c)
-					| _ -> ""
-				in
-				let rec root = function
-					| DTDOptional c
-					| DTDZeroOrMore c
-					| DTDOneOrMore c ->
-						root c
-					| DTDChoice [_]
-					| DTDChildren [_] as x ->
-						x, false
-					| DTDChoice _
-					| DTDChildren _ as x ->
-						x, true
-					| x -> x, false
-				in
-				match root x with
-				| r, true -> sprintf "%s%s" (echild_to_string r) (op_to_string x)
-				| r, false -> sprintf "(%s%s)" (echild_to_string r) (op_to_string x)
-		in
-		sprintf "<!ELEMENT %s %s>" tag (etype_to_string etype)
-
-;;
-to_string_ref := to_string
diff --git a/libs/xml-light/dtd.mli b/libs/xml-light/dtd.mli
deleted file mode 100644
index 316dfe225d49824c5a1a3b50283bbc4c49783a28..0000000000000000000000000000000000000000
--- a/libs/xml-light/dtd.mli
+++ /dev/null
@@ -1,175 +0,0 @@
-(*
- * Xml Light, an small Xml parser/printer with DTD support.
- * Copyright (C) 2003 Nicolas Cannasse (ncannasse@motion-twin.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library has the special exception on linking described in file
- * README.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *)
-
-(** Xml Light DTD
-
-	This module provide several functions to create, check, and use DTD
-	to prove Xml documents : {ul
-	{li using the DTD types, you can directly create your own DTD structure}
-	{li the {!Dtd.check} function can then be used to check that all DTD
-		states have been declared, that no attributes are declared twice,
-		and so on.}
-	{li the {!Dtd.prove} function can be used to check an {!Xml} data
-		structure with a checked DTD. The function will return the
-		expanded Xml document or raise an exception if the DTD proving
-		fails.}
-	}
-
-	{i Note about ENTITIES:}
-	
-	While parsing Xml, PCDATA is always parsed and
-	the Xml entities &amp; &gt; &lt; &apos; &quot; are replaced by their
-	corresponding ASCII characters. For Xml attributes, theses can be
-	put between either double or simple quotes, and the backslash character
-	can be used to escape inner quotes. There is no support for CDATA Xml
-	nodes or PCDATA attributes declarations in DTD, and no support for
-	user-defined entities using the ENTITY DTD element.
-*)
-
-(** {6 The DTD Types} *)
-
-type dtd_child =
-	| DTDTag of string
-	| DTDPCData
-	| DTDOptional of dtd_child
-	| DTDZeroOrMore of dtd_child
-	| DTDOneOrMore of dtd_child
-	| DTDChoice of dtd_child list
-	| DTDChildren of dtd_child list
-
-type dtd_element_type =
-	| DTDEmpty
-	| DTDAny
-	| DTDChild of dtd_child
-
-type dtd_attr_default =
-	| DTDDefault of string
-	| DTDRequired
-	| DTDImplied
-	| DTDFixed of string
-
-type dtd_attr_type =
-	| DTDCData
-	| DTDNMToken
-	| DTDEnum of string list
-	| DTDID
-	| DTDIDRef
-
-type dtd_item =
-	| DTDAttribute of string * string * dtd_attr_type * dtd_attr_default
-	| DTDElement of string * dtd_element_type
-
-type dtd = dtd_item list
-
-type checked
-
-(** {6 The DTD Functions} *)
-
-(** Parse the named file into a Dtd data structure. Raise
-	{!Xml.File_not_found} if an error occured while opening the file. 
-	Raise {!Dtd.Parse_error} if parsing failed. *)
-val parse_file : string -> dtd
-
-(** Read the content of the in_channel and parse it into a Dtd data
- structure. Raise {!Dtd.Parse_error} if parsing failed. *)
-val parse_in : in_channel -> dtd
-
-(** Parse the string containing a Dtd document into a Dtd data
- structure. Raise {!Dtd.Parse_error} if parsing failed. *)
-val parse_string : string -> dtd
-
-(** Check the Dtd data structure declaration and return a checked
- DTD. Raise {!Dtd.Check_error} if the DTD checking failed. *)
-val check : dtd -> checked
-
-(** Prove an Xml document using a checked DTD and an entry point.
- The entry point is the first excepted tag of the Xml document,
- the returned Xml document has the same structure has the original
- one, excepted that non declared optional attributes have been set
- to their default value specified in the DTD.
- Raise {!Dtd.Check_error} [ElementNotDeclared] if the entry point
- is not found, raise {!Dtd.Prove_error} if the Xml document failed
- to be proved with the DTD. *)
-val prove : checked -> string -> Xml.xml -> Xml.xml
-
-(** Print a DTD element into a string. You can easily get a DTD
- document from a DTD data structure using for example
- [String.concat "\n" (List.map Dtd.to_string) my_dtd] *)
-val to_string : dtd_item -> string
-
-(** {6 The DTD Exceptions} *)
-
-(** There is three types of DTD excecptions : {ul
-	{li {!Dtd.Parse_error} is raised when an error occured while
-	parsing a DTD document into a DTD data structure.}
-	{li {!Dtd.Check_error} is raised when an error occured while
-	checking a DTD data structure for completeness, or when the
-	prove entry point is not found when calling {!Dtd.prove}.}
-	{li {!Dtd.Prove_error} is raised when an error occured while
-	proving an Xml document.}
-	}
-
-	Several string conversion functions are provided to enable you
-	to report errors to the user.
-*)
-
-type parse_error_msg =
-	| InvalidDTDDecl
-	| InvalidDTDElement
-	| InvalidDTDAttribute
-	| InvalidDTDTag
-	| DTDItemExpected
-
-type check_error =
-	| ElementDefinedTwice of string
-	| AttributeDefinedTwice of string * string
-	| ElementEmptyContructor of string
-	| ElementReferenced of string * string
-	| ElementNotDeclared of string
-	| WrongImplicitValueForID of string * string
-
-type prove_error =
-	| UnexpectedPCData
-	| UnexpectedTag of string
-	| UnexpectedAttribute of string
-	| InvalidAttributeValue of string
-	| RequiredAttribute of string
-	| ChildExpected of string
-	| EmptyExpected
-	| DuplicateID of string
-	| MissingID of string
-
-type parse_error = parse_error_msg * Xml.error_pos
-
-exception Parse_error of parse_error
-exception Check_error of check_error
-exception Prove_error of prove_error
-
-val parse_error : parse_error -> string
-val check_error : check_error -> string
-val prove_error : prove_error -> string
-
-(**/**)
-
-(* internal usage only... *)
-val _raises : (string -> exn) -> unit
diff --git a/libs/xml-light/makedoc.bat b/libs/xml-light/makedoc.bat
deleted file mode 100644
index 45d041079265d938dee1c0087ed85d4002be0483..0000000000000000000000000000000000000000
--- a/libs/xml-light/makedoc.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@ocamldoc -sort -html -d doc xml.mli dtd.mli xmlParser.mli
-@pause
\ No newline at end of file
diff --git a/libs/xml-light/test.ml b/libs/xml-light/test.ml
deleted file mode 100644
index 5cd04fc949549e85b4c5d19ddc0f27be8aabfc24..0000000000000000000000000000000000000000
--- a/libs/xml-light/test.ml
+++ /dev/null
@@ -1,58 +0,0 @@
-(*
- * Xml Light, an small Xml parser/printer with DTD support.
- * Copyright (C) 2003 Nicolas Cannasse (ncannasse@motion-twin.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library has the special exception on linking described in file
- * README.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *)
-
-open Xml
-open Dtd
-
-let parse data =
-	match data.[0] with
-	| '#' -> Xml.parse_file (String.sub data 1 ((String.length data)-2))
-	| _ -> Xml.parse_string data
-
-;;
-let buf = ref "" in
-print_endline "Please enter some XML data followed (press return twice to parse) :";
-try
-	while true do
-		match read_line() with
-		| "" when !buf <> "" ->
-			let data = !buf in
-			buf := "";
-			(try
-				let x = parse data in
-				print_endline "Parsing...";
-				print_endline (Xml.to_string_fmt x);
-			with
-				| Xml.Error msg as e ->
-					Printf.printf "Xml error : %s\n" (Xml.error msg)
-				| Dtd.Parse_error msg as e ->
-					Printf.printf "Dtd parse error : %s\n" (Dtd.parse_error msg)
-				| Dtd.Check_error msg as e ->
-					Printf.printf "Dtd check error : %s\n" (Dtd.check_error msg)
-				| Dtd.Prove_error msg as e ->
-					Printf.printf "Dtd prove error : %s\n" (Dtd.prove_error msg))
-		| s -> 
-			buf := !buf ^ s ^ "\n"
-	done
-with
-	End_of_file -> print_endline "Exit."
\ No newline at end of file
diff --git a/libs/xml-light/xml.dsp b/libs/xml-light/xml.dsp
deleted file mode 100644
index c20858b7fa2efcd31ef420894367e1a72f2dd116..0000000000000000000000000000000000000000
--- a/libs/xml-light/xml.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="xml" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=xml - Win32 Bytecode
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "xml.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xml.mak" CFG="xml - Win32 Bytecode"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xml - Win32 Bytecode" (based on "Win32 (x86) External Target")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "ocamake xml.dsp"
-# PROP BASE Rebuild_Opt "-all"
-# PROP BASE Target_File "xml.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "ocamake xml.dsp -P xml_parser.ml -P xml_lexer.ml -P dtd.ml -P xmlParser.ml"
-# PROP Rebuild_Opt "-all"
-# PROP Target_File "xml.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-# Begin Target
-
-# Name "xml - Win32 Bytecode"
-
-!IF  "$(CFG)" == "xml - Win32 Bytecode"
-
-!ENDIF 
-
-# Begin Group "ML Files"
-
-# PROP Default_Filter "ml;mly;mll"
-# Begin Source File
-
-SOURCE=.\dtd.ml
-# End Source File
-# Begin Source File
-
-SOURCE=.\test.ml
-# End Source File
-# Begin Source File
-
-SOURCE=.\xml.ml
-# End Source File
-# Begin Source File
-
-SOURCE=.\xml_lexer.mll
-# End Source File
-# Begin Source File
-
-SOURCE=.\xml_parser.mly
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmlParser.ml
-# End Source File
-# End Group
-# Begin Group "MLI Files"
-
-# PROP Default_Filter "mli"
-# Begin Source File
-
-SOURCE=.\dtd.mli
-# End Source File
-# Begin Source File
-
-SOURCE=.\xml.mli
-# End Source File
-# Begin Source File
-
-SOURCE=.\xml_lexer.mli
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmlParser.mli
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/libs/xml-light/xml.dsw b/libs/xml-light/xml.dsw
deleted file mode 100644
index 69c7604f886d3428f69b462ca0f6a23d60d86278..0000000000000000000000000000000000000000
--- a/libs/xml-light/xml.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "xml"=".\xml.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/libs/xml-light/xml.ml b/libs/xml-light/xml.ml
deleted file mode 100644
index d9fcc13963c290d415f882a8e47922f27c169500..0000000000000000000000000000000000000000
--- a/libs/xml-light/xml.ml
+++ /dev/null
@@ -1,268 +0,0 @@
-(*
- * Xml Light, an small Xml parser/printer with DTD support.
- * Copyright (C) 2003 Nicolas Cannasse (ncannasse@motion-twin.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library has the special exception on linking described in file
- * README.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *)
-
-open Printf
-
-type xml = 
-	| Element of (string * (string * string) list * xml list)
-	| PCData of string
-
-type error_pos = {
-	eline : int;
-	eline_start : int;
-	emin : int;
-	emax : int;
-}
-
-type error_msg =
-	| UnterminatedComment
-	| UnterminatedString
-	| UnterminatedEntity
-	| IdentExpected
-	| CloseExpected
-	| NodeExpected
-	| AttributeNameExpected
-	| AttributeValueExpected
-	| EndOfTagExpected of string
-	| EOFExpected
-
-type error = error_msg * error_pos
-
-exception Error of error
-exception File_not_found of string
-
-exception Not_element of xml
-exception Not_pcdata of xml
-exception No_attribute of string
-
-let default_parser = XmlParser.make()
-
-let pos source =
-	let line, lstart, min, max = Xml_lexer.pos source in
-	{
-		eline = line;
-		eline_start = lstart;
-		emin = min;
-		emax = max;
-	}
-
-let parse (p:XmlParser.t) (source:XmlParser.source) =
-	(* local cast Xml.xml -> xml *)
-	(Obj.magic XmlParser.parse p source : xml)
-
-let parse_in ch = parse default_parser (XmlParser.SChannel ch)
-let parse_string str = parse default_parser (XmlParser.SString str)
-
-let parse_file f =
-	let p = XmlParser.make() in
-	let path = Filename.dirname f in
-	XmlParser.resolve p (fun file -> 
-		let name = (match path with "." -> file | _ -> path ^ "/" ^ file) in
-		Dtd.check (Dtd.parse_file name)
-	);
-	parse p (XmlParser.SFile f)
-
-let error_msg = function
-	| UnterminatedComment -> "Unterminated comment"
-	| UnterminatedString -> "Unterminated string"
-	| UnterminatedEntity -> "Unterminated entity"
-	| IdentExpected -> "Ident expected"
-	| CloseExpected -> "Element close expected"
-	| NodeExpected -> "Xml node expected"
-	| AttributeNameExpected -> "Attribute name expected"
-	| AttributeValueExpected -> "Attribute value expected"
-	| EndOfTagExpected tag -> sprintf "End of tag expected : '%s'" tag
-	| EOFExpected -> "End of file expected"
-
-let error (msg,pos) =
-	if pos.emin = pos.emax then
-		sprintf "%s line %d character %d" (error_msg msg) pos.eline (pos.emin - pos.eline_start)
-	else
-		sprintf "%s line %d characters %d-%d" (error_msg msg) pos.eline (pos.emin - pos.eline_start) (pos.emax - pos.eline_start)
-	
-let line e = e.eline
-
-let range e = 
-	e.emin - e.eline_start , e.emax - e.eline_start
-
-let abs_range e =
-	e.emin , e.emax
-
-let tag = function
-	| Element (tag,_,_) -> tag
-	| x -> raise (Not_element x)
-
-let pcdata = function 
-	| PCData text -> text
-	| x -> raise (Not_pcdata x)
-
-let attribs = function 
-	| Element (_,attr,_) -> attr
-	| x -> raise (Not_element x)
-
-let attrib x att =
-	match x with
-	| Element (_,attr,_) ->
-		(try
-			let att = String.lowercase att in
-			snd (List.find (fun (n,_) -> String.lowercase n = att) attr)
-		with
-			Not_found ->
-				raise (No_attribute att))
-	| x ->
-		raise (Not_element x)
-
-let children = function
-	| Element (_,_,clist) -> clist
-	| x -> raise (Not_element x)
-
-(*let enum = function
-	| Element (_,_,clist) -> List.to_enum clist
-	| x -> raise (Not_element x)
-*)
-
-let iter f = function
-	| Element (_,_,clist) -> List.iter f clist
-	| x -> raise (Not_element x)
-
-let map f = function
-	| Element (_,_,clist) -> List.map f clist
-	| x -> raise (Not_element x)
-
-let fold f v = function
-	| Element (_,_,clist) -> List.fold_left f v clist
-	| x -> raise (Not_element x)
-
-let tmp = Buffer.create 200
-
-let buffer_pcdata text =
-	let l = String.length text in
-	for p = 0 to l-1 do 
-		match text.[p] with
-		| '>' -> Buffer.add_string tmp "&gt;"
-		| '<' -> Buffer.add_string tmp "&lt;"
-		| '&' ->
-			if p < l-1 && text.[p+1] = '#' then
-				Buffer.add_char tmp '&'
-			else
-				Buffer.add_string tmp "&amp;"
-		| '\'' -> Buffer.add_string tmp "&apos;"
-		| '"' -> Buffer.add_string tmp "&quot;"
-		| c -> Buffer.add_char tmp c
-	done
-
-let buffer_attr (n,v) =
-	Buffer.add_char tmp ' ';
-	Buffer.add_string tmp n;
-	Buffer.add_string tmp "=\"";
-	let l = String.length v in
-	for p = 0 to l-1 do
-		match v.[p] with
-		| '\\' -> Buffer.add_string tmp "\\\\"
-		| '"' -> Buffer.add_string tmp "\\\""
-		| c -> Buffer.add_char tmp c
-	done;
-	Buffer.add_char tmp '"'
-
-let to_string x = 
-	let pcdata = ref false in
-	let rec loop = function
-		| Element (tag,alist,[]) ->
-			Buffer.add_char tmp '<';
-			Buffer.add_string tmp tag;
-			List.iter buffer_attr alist;
-			Buffer.add_string tmp "/>";
-			pcdata := false;
-		| Element (tag,alist,l) ->
-			Buffer.add_char tmp '<';
-			Buffer.add_string tmp tag;
-			List.iter buffer_attr alist;
-			Buffer.add_char tmp '>';
-			pcdata := false;
-			List.iter loop l;
-			Buffer.add_string tmp "</";
-			Buffer.add_string tmp tag;
-			Buffer.add_char tmp '>';
-			pcdata := false;
-		| PCData text ->
-			if !pcdata then Buffer.add_char tmp ' ';
-			buffer_pcdata text;
-			pcdata := true;
-	in
-	Buffer.reset tmp;
-	loop x;
-	let s = Buffer.contents tmp in
-	Buffer.reset tmp;
-	s
-
-let to_string_fmt x =
-	let rec loop ?(newl=false) tab = function
-		| Element (tag,alist,[]) ->
-			Buffer.add_string tmp tab;
-			Buffer.add_char tmp '<';
-			Buffer.add_string tmp tag;
-			List.iter buffer_attr alist;
-			Buffer.add_string tmp "/>";
-			if newl then Buffer.add_char tmp '\n';
-		| Element (tag,alist,[PCData text]) ->
-			Buffer.add_string tmp tab;
-			Buffer.add_char tmp '<';
-			Buffer.add_string tmp tag;
-			List.iter buffer_attr alist;
-			Buffer.add_string tmp ">";
-			buffer_pcdata text;
-			Buffer.add_string tmp "</";
-			Buffer.add_string tmp tag;
-			Buffer.add_char tmp '>';
-			if newl then Buffer.add_char tmp '\n';
-		| Element (tag,alist,l) ->
-			Buffer.add_string tmp tab;
-			Buffer.add_char tmp '<';
-			Buffer.add_string tmp tag;
-			List.iter buffer_attr alist;
-			Buffer.add_string tmp ">\n";
-			List.iter (loop ~newl:true (tab^"  ")) l;
-			Buffer.add_string tmp tab;
-			Buffer.add_string tmp "</";
-			Buffer.add_string tmp tag;
-			Buffer.add_char tmp '>';
-			if newl then Buffer.add_char tmp '\n';
-		| PCData text ->
-			buffer_pcdata text;
-			if newl then Buffer.add_char tmp '\n';
-	in
-	Buffer.reset tmp;
-	loop "" x;
-	let s = Buffer.contents tmp in
-	Buffer.reset tmp;
-	s
-
-;;
-XmlParser._raises (fun x p -> 
-	(* local cast : Xml.error_msg -> error_msg *)
-	Error ((Obj.magic x : error_msg),pos p))
-	(fun f -> File_not_found f)
-	(fun x p -> Dtd.Parse_error (x,
-	(* local cast : Xml.error_pos -> error_pos *)
-		(Obj.magic (pos p))));
-Dtd._raises (fun f -> File_not_found f);
\ No newline at end of file
diff --git a/libs/xml-light/xml.mli b/libs/xml-light/xml.mli
deleted file mode 100644
index 01df71682ed9cacce18e4bf0733080a6ff79cd96..0000000000000000000000000000000000000000
--- a/libs/xml-light/xml.mli
+++ /dev/null
@@ -1,170 +0,0 @@
-(*
- * Xml Light, an small Xml parser/printer with DTD support.
- * Copyright (C) 2003 Nicolas Cannasse (ncannasse@motion-twin.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library has the special exception on linking described in file
- * README.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *)
-
-(** Xml Light
- 
-  Xml Light is a minimal Xml parser & printer for OCaml.
-  It provide few functions to parse a basic Xml document into
-  an OCaml data structure and to print back the data structures
-  to an Xml document.
-
-  Xml Light has also support for {b DTD} (Document Type Definition).
-
-  {i (c)Copyright 2002-2003 Nicolas Cannasse}
-*)
-
-(** {6 Xml Data Structure} *)
-
-(** An Xml node is either
-	[Element (tag-name, attributes, children)] or [PCData text] *)
-type xml = 
-	| Element of (string * (string * string) list * xml list)
-	| PCData of string
-
-(** {6 Xml Parsing} *)
-
-(** For easily parsing an Xml data source into an xml data structure,
-	you can use theses functions. But if you want advanced parsing usage,
-	please look at the {!XmlParser} module.
-	All the parsing functions can raise some exceptions, see the
-	{{:#exc}Exceptions} section for more informations. *)
-
-(** Parse the named file into an Xml data structure. *)
-val parse_file : string -> xml
-
-(** Read the content of the in_channel and parse it into an Xml data
- structure. *)
-val parse_in : in_channel -> xml
-
-(** Parse the string containing an Xml document into an Xml data
- structure. *)
-val parse_string : string -> xml
-
-(** {6:exc Xml Exceptions} *)
-
-(** Several exceptions can be raised when parsing an Xml document : {ul
-	{li {!Xml.Error} is raised when an xml parsing error occurs. the
-		{!Xml.error_msg} tells you which error occured during parsing
-		and the {!Xml.error_pos} can be used to retreive the document
-		location where the error occured at.}
-	{li {!Xml.File_not_found} is raised when and error occured while
-		opening a file with the {!Xml.parse_file} function or when a
-		DTD file declared by the Xml document is not found {i (see the
-		{!XmlParser} module for more informations on how to handle the
-		DTD file loading)}.}
-	}
-	If the Xml document is containing a DTD, then some other exceptions
-	can be raised, see the module {!Dtd} for more informations.
- *)
-
-type error_pos
-
-type error_msg =
-	| UnterminatedComment
-	| UnterminatedString
-	| UnterminatedEntity
-	| IdentExpected
-	| CloseExpected
-	| NodeExpected
-	| AttributeNameExpected
-	| AttributeValueExpected
-	| EndOfTagExpected of string
-	| EOFExpected
-
-type error = error_msg * error_pos
-
-exception Error of error
-
-exception File_not_found of string
-
-(** Get a full error message from an Xml error. *)
-val error : error -> string
-
-(** Get the Xml error message as a string. *)
-val error_msg : error_msg -> string 
-
-(** Get the line the error occured at. *)
-val line : error_pos -> int
-
-(** Get the relative character range (in current line) the error occured at.*)
-val range : error_pos -> int * int
-
-(** Get the absolute character range the error occured at. *)
-val abs_range : error_pos -> int * int
-
-(** {6 Xml Functions} *)
-
-exception Not_element of xml
-exception Not_pcdata of xml
-exception No_attribute of string
-
-(** [tag xdata] returns the tag value of the xml node.
- Raise {!Xml.Not_element} if the xml is not an element *)
-val tag : xml -> string
-
-(** [pcdata xdata] returns the PCData value of the xml node.
- Raise {!Xml.Not_pcdata} if the xml is not a PCData *)
-val pcdata : xml -> string
-
-(** [attribs xdata] returns the attribute list of the xml node.
- First string if the attribute name, second string is attribute value.
- Raise {!Xml.Not_element} if the xml is not an element *)
-val attribs : xml -> (string * string) list 
-
-(** [attrib xdata "href"] returns the value of the ["href"]
- attribute of the xml node (attribute matching is case-insensitive).
- Raise {!Xml.No_attribute} if the attribute does not exists in the node's
- attribute list 
- Raise {!Xml.Not_element} if the xml is not an element *)
-val attrib : xml -> string -> string
-
-(** [children xdata] returns the children list of the xml node
- Raise {!Xml.Not_element} if the xml is not an element *)
-val children : xml -> xml list
-
-(*** [enum xdata] returns the children enumeration of the xml node
- Raise {!Xml.Not_element} if the xml is not an element *)
-(* val enum : xml -> xml Enum.t *)
-
-(** [iter f xdata] calls f on all children of the xml node.
- Raise {!Xml.Not_element} if the xml is not an element *)
-val iter : (xml -> unit) -> xml -> unit
-
-(** [map f xdata] is equivalent to [List.map f (Xml.children xdata)]
- Raise {!Xml.Not_element} if the xml is not an element *)
-val map : (xml -> 'a) -> xml -> 'a list
-
-(** [fold f init xdata] is equivalent to
- [List.fold_left f init (Xml.children xdata)]
- Raise {!Xml.Not_element} if the xml is not an element *)
-val fold : ('a -> xml -> 'a) -> 'a -> xml -> 'a
-
-(** {6 Xml Printing} *)
-
-(** Print the xml data structure into a compact xml string (without
- any user-readable formating ). *)
-val to_string : xml -> string
-
-(** Print the xml data structure into an user-readable string with
- tabs and lines break between different nodes. *)
-val to_string_fmt : xml -> string
diff --git a/libs/xml-light/xmlParser.ml b/libs/xml-light/xmlParser.ml
deleted file mode 100644
index 2bbe045f87e8ae62ac2164e901ef9cbbbe916bb7..0000000000000000000000000000000000000000
--- a/libs/xml-light/xmlParser.ml
+++ /dev/null
@@ -1,185 +0,0 @@
-(*
- * Xml Light, an small Xml parser/printer with DTD support.
- * Copyright (C) 2003 Nicolas Cannasse (ncannasse@motion-twin.com)
- * Copyright (C) 2003 Jacques Garrigue
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library has the special exception on linking described in file
- * README.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *)
-
-open Printf
-open Dtd
-open Xml
-
-type t = {
-	mutable prove : bool;
-	mutable check_eof : bool;
-	mutable concat_pcdata : bool;
-	mutable resolve : (string -> checked);
-}
-
-type source = 
-	| SFile of string
-	| SChannel of in_channel
-	| SString of string
-	| SLexbuf of Lexing.lexbuf
-
-type state = {
-	source : Lexing.lexbuf;
-	stack : Xml_lexer.token Stack.t;
-	xparser : t;
-}
-
-exception Internal_error of Xml.error_msg
-exception NoMoreData
-
-let xml_error = ref (fun _ -> assert false)
-let dtd_error = ref (fun _ -> assert false)
-let file_not_found = ref (fun _ -> assert false)
-
-let _raises e f d =
-	xml_error := e;
-	file_not_found := f;
-	dtd_error := d
-
-let make () =
-	{
-		prove = true;
-		check_eof = true;
-		concat_pcdata = true;
-		resolve = (fun file -> raise (!file_not_found file))
-	}
-
-let prove p v = p.prove <- v
-let resolve p f = p.resolve <- f
-let check_eof p v = p.check_eof <- v
-let concat_pcdata p v = p.concat_pcdata <- v
-
-let pop s =
-	try
-		Stack.pop s.stack
-	with
-		Stack.Empty ->
-			Xml_lexer.token s.source
-
-let push t s =
-	Stack.push t s.stack
-
-let rec read_node s =
-	match pop s with
-	| Xml_lexer.PCData s -> PCData s
-	| Xml_lexer.Tag (tag, attr, true) -> Element (tag, attr, [])
-	| Xml_lexer.Tag (tag, attr, false) -> Element (tag, attr, read_elems ~tag s)
-	| t ->
-		push t s;
-		raise NoMoreData
-and
-	read_elems ?tag s =
-		let elems = ref [] in
-		(try
-			while true do
-				match s.xparser.concat_pcdata , read_node s , !elems with
-				| true , PCData c , (PCData c2) :: q ->
-					elems := PCData (sprintf "%s\n%s" c2 c) :: q
-				| _ , x , l ->
-					elems := x :: l
-			done
-		with
-			NoMoreData -> ());
-		match pop s with
-		| Xml_lexer.Endtag s when Some s = tag -> List.rev !elems
-		| Xml_lexer.Eof when tag = None -> List.rev !elems
-		| t ->
-			match tag with
-			| None -> raise (Internal_error EOFExpected)
-			| Some s -> raise (Internal_error (EndOfTagExpected s))
-
-let read_xml s =
-	match s.xparser.prove, pop s with
-	| true, Xml_lexer.DocType (root, Xml_lexer.DTDFile file) ->
-		let pos = Xml_lexer.pos s.source in
-		let dtd = s.xparser.resolve file in
-		Xml_lexer.restore pos;
-		let x = read_node s in
-		Dtd.prove dtd root x
-	| true, Xml_lexer.DocType (root, Xml_lexer.DTDData dtd) ->
-		let dtd = Dtd.check dtd in
-		let x = read_node s in
-		Dtd.prove dtd root x
-	| false, Xml_lexer.DocType _ ->
-		read_node s
-	| _, t ->
-		push t s;
-		read_node s
-
-let convert = function
-	| Xml_lexer.EUnterminatedComment -> UnterminatedComment
-	| Xml_lexer.EUnterminatedString -> UnterminatedString
-	| Xml_lexer.EIdentExpected -> IdentExpected
-	| Xml_lexer.ECloseExpected -> CloseExpected
-	| Xml_lexer.ENodeExpected -> NodeExpected
-	| Xml_lexer.EAttributeNameExpected -> AttributeNameExpected
-	| Xml_lexer.EAttributeValueExpected -> AttributeValueExpected
-	| Xml_lexer.EUnterminatedEntity -> 	UnterminatedEntity
-
-let dtd_convert = function
-	| Xml_lexer.EInvalidDTDDecl -> InvalidDTDDecl
-	| Xml_lexer.EInvalidDTDTag -> InvalidDTDTag
-	| Xml_lexer.EDTDItemExpected -> DTDItemExpected
-	| Xml_lexer.EInvalidDTDElement -> InvalidDTDElement
-	| Xml_lexer.EInvalidDTDAttribute -> InvalidDTDAttribute
-
-let do_parse xparser source =
-	try
-		Xml_lexer.init source;
-		let s = { source = source; xparser = xparser; stack = Stack.create(); } in
-		let tk = pop s in
-		(* skip UTF8 BOM *)
-		if tk <> Xml_lexer.PCData "\239\187\191" then push tk s;
-		let x = read_xml s in
-		if xparser.check_eof && pop s <> Xml_lexer.Eof then raise (Internal_error EOFExpected);
-		Xml_lexer.close source;
-		x
-	with
-		| NoMoreData ->
-			Xml_lexer.close source;
-			raise (!xml_error NodeExpected source)
-		| Internal_error e ->
-			Xml_lexer.close source;
-			raise (!xml_error e source)
-		| Xml_lexer.Error e ->
-			Xml_lexer.close source;
-			raise (!xml_error (convert e) source)
-		| Xml_lexer.DTDError e ->
-			Xml_lexer.close source;
-			raise (!dtd_error (dtd_convert e) source)
-
-let parse p = function
-	| SChannel ch -> do_parse p (Lexing.from_channel ch)
-	| SString str -> do_parse p (Lexing.from_string str)
-	| SLexbuf lex -> do_parse p lex
-	| SFile fname ->
-		let ch = (try open_in fname with Sys_error _ -> raise (!file_not_found fname)) in
-		try
-			let x = do_parse p (Lexing.from_channel ch) in
-			close_in ch;
-			x
-		with
-			e ->
-				close_in ch;
-				raise e
diff --git a/libs/xml-light/xmlParser.mli b/libs/xml-light/xmlParser.mli
deleted file mode 100644
index 16cfd41161d1b6d0ca3c88668572c6bf31d12bd6..0000000000000000000000000000000000000000
--- a/libs/xml-light/xmlParser.mli
+++ /dev/null
@@ -1,82 +0,0 @@
-(*
- * Xml Light, an small Xml parser/printer with DTD support.
- * Copyright (C) 2003 Nicolas Cannasse (ncannasse@motion-twin.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library has the special exception on linking described in file
- * README.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *)
-
-(** Xml Light Parser
-
- While basic parsing functions can be used in the {!Xml} module, this module
- is providing a way to create, configure and run an Xml parser.
-
-*)
-
-(** Abstract type for an Xml parser. *)
-type t
-
-(** Several kind of resources can contain Xml documents. *)
-type source = 
-	| SFile of string
-	| SChannel of in_channel
-	| SString of string
-	| SLexbuf of Lexing.lexbuf
-
-(** This function returns a new parser with default options. *)
-val make : unit -> t
-
-(** This function enable or disable automatic DTD proving with the parser. 
- Note that Xml documents having no reference to a DTD are never proved
- when parsed (but you can prove them later using the {!Dtd} module
- {i (by default, prove is true)}. *)
-val prove : t -> bool -> unit
-
-(** When parsing an Xml document from a file using the {!Xml.parse_file}
- function, the DTD file if declared by the Xml document has to be in the
- same directory as the xml file. When using other parsing functions, 
- such as on a string or on a channel, the parser will raise everytime
- {!Xml.File_not_found} if a DTD file is needed and prove enabled. To enable
- the DTD loading of the file, the user have to configure the Xml parser
- with a [resolve] function which is taking as argument the DTD filename and
- is returning a checked DTD. The user can then implement any kind of DTD
- loading strategy, and can use the {!Dtd} module functions to parse and check
- the DTD file {i (by default, the resolve function is raising}
- {!Xml.File_not_found}). *)
-val resolve : t -> (string -> Dtd.checked) -> unit
-
-(** When a Xml document is parsed, the parser will check that the end of the
- document is reached, so for example parsing ["<A/><B/>"] will fail instead
- of returning only the A element. You can turn off this check by setting
- [check_eof] to [false] {i (by default, check_eof is true)}. *)
-val check_eof : t -> bool -> unit
-
-(** Once the parser is configurated, you can run the parser on a any kind
- of xml document source to parse its contents into an Xml data structure. *)
-val parse :  t -> source -> Xml.xml
-
-(** When several PCData elements are separed by a \n (or \r\n), you can
- either split the PCData in two distincts PCData or merge them with \n
- as seperator into one PCData. The default behavior is to concat the
- PCData, but this can be changed for a given parser with this flag. *)
-val concat_pcdata : t -> bool -> unit
-
-(**/**)
-
-(* internal usage only... *)
-val _raises : (Xml.error_msg -> Lexing.lexbuf -> exn) -> (string -> exn) -> (Dtd.parse_error_msg -> Lexing.lexbuf -> exn) -> unit
\ No newline at end of file
diff --git a/libs/xml-light/xml_lexer.mli b/libs/xml-light/xml_lexer.mli
deleted file mode 100644
index e78ae7c6bb1fbc6db2445a2671238d64263975f8..0000000000000000000000000000000000000000
--- a/libs/xml-light/xml_lexer.mli
+++ /dev/null
@@ -1,62 +0,0 @@
-(*
- * Xml Light, an small Xml parser/printer with DTD support.
- * Copyright (C) 2003 Nicolas Cannasse (ncannasse@motion-twin.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library has the special exception on linking described in file
- * README.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *)
-
-type error =
-	| EUnterminatedComment
-	| EUnterminatedString
-	| EIdentExpected
-	| ECloseExpected
-	| ENodeExpected
-	| EAttributeNameExpected
-	| EAttributeValueExpected
-	| EUnterminatedEntity
-
-type dtd_error =
-	| EInvalidDTDDecl
-	| EInvalidDTDTag
-	| EDTDItemExpected
-	| EInvalidDTDElement
-	| EInvalidDTDAttribute
-
-exception Error of error
-exception DTDError of dtd_error
-
-type dtd_decl =
-	| DTDFile of string
-	| DTDData of Dtd.dtd
-
-type token =
-	| Tag of string * (string * string) list * bool
-	| PCData of string
-	| Endtag of string
-	| DocType of (string * dtd_decl)
-	| Eof
-
-type pos = int * int * int * int
-
-val init : Lexing.lexbuf -> unit 
-val close : Lexing.lexbuf -> unit
-val token : Lexing.lexbuf -> token
-val dtd : Lexing.lexbuf -> Dtd.dtd
-val pos : Lexing.lexbuf -> pos
-val restore : pos -> unit
\ No newline at end of file
diff --git a/libs/xml-light/xml_lexer.mll b/libs/xml-light/xml_lexer.mll
deleted file mode 100644
index d8ca3c3337cf5048136616ff15be5badbc356180..0000000000000000000000000000000000000000
--- a/libs/xml-light/xml_lexer.mll
+++ /dev/null
@@ -1,673 +0,0 @@
-{(*
- * Xml Light, an small Xml parser/printer with DTD support.
- * Copyright (C) 2003 Nicolas Cannasse (ncannasse@motion-twin.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library has the special exception on linking described in file
- * README.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *)
-
-open Lexing
-open Xml_parser
-open Dtd
-
-type error =
-	| EUnterminatedComment
-	| EUnterminatedString
-	| EIdentExpected
-	| ECloseExpected
-	| ENodeExpected
-	| EAttributeNameExpected
-	| EAttributeValueExpected
-	| EUnterminatedEntity
-
-type dtd_error =
-	| EInvalidDTDDecl
-	| EInvalidDTDTag
-	| EDTDItemExpected
-	| EInvalidDTDElement
-	| EInvalidDTDAttribute
-
-exception Error of error
-exception DTDError of dtd_error
-
-type pos = int * int * int * int
-
-type dtd_decl =
-	| DTDFile of string
-	| DTDData of dtd
-
-type dtd_item_type =
-	| TElement
-	| TAttribute
-
-type token =
-	| Tag of string * (string * string) list * bool
-	| PCData of string
-	| Endtag of string
-	| DocType of (string * dtd_decl)
-	| Eof
-
-let last_pos = ref 0
-and current_line = ref 0
-and current_line_start = ref 0
-
-let tmp = Buffer.create 200
-
-let idents = Hashtbl.create 0
-
-let _ = begin
-	Hashtbl.add idents "gt;" ">";
-	Hashtbl.add idents "lt;" "<";
-	Hashtbl.add idents "amp;" "&";
-	Hashtbl.add idents "apos;" "'";
-	Hashtbl.add idents "quot;" "\"";
-end
-
-let init lexbuf =
-	current_line := 1;
-	current_line_start := lexeme_start lexbuf;
-	last_pos := !current_line_start
-
-let close lexbuf =
-	Buffer.reset tmp
-
-let pos lexbuf =
-	!current_line ,	!current_line_start ,
-	!last_pos ,
-	lexeme_start lexbuf
-
-let restore (cl,cls,lp,_) =
-	current_line := cl;
-	current_line_start := cls;
-	last_pos := lp
-
-let newline lexbuf =
-	incr current_line;
-	last_pos := lexeme_end lexbuf;
-	current_line_start := !last_pos
-
-let error lexbuf e =
-	last_pos := lexeme_start lexbuf;
-	raise (Error e)
-
-let dtd_error lexbuf e =
-	last_pos := lexeme_start lexbuf;
-	raise (DTDError e)
-}
-
-let newline = ['\n']
-let break = ['\r']
-let space = [' ' '\t']
-let identchar =  ['A'-'Z' 'a'-'z' '_' '0'-'9' ':' '-']
-let entitychar = ['A'-'Z' 'a'-'z']
-let pcchar = [^ '\r' '\n' '<' '>' '&']
-let cdata_start = ['c''C']['d''D']['a''A']['t''T']['a''A']
-
-rule token = parse
-	| newline
-		{
-			newline lexbuf;
-			token lexbuf
-		}
-	| (space | break) +
-		{
-			last_pos := lexeme_end lexbuf;
-			token lexbuf
-		}
-	| "<!DOCTYPE"
-		{
-			last_pos := lexeme_start lexbuf;
-			ignore_spaces lexbuf;
-			let root = ident_name lexbuf in
-			ignore_spaces lexbuf;
-			let data = dtd_data lexbuf in
-			DocType (root, data)
-		}
-	| "<![" cdata_start '['
-		{
-			last_pos := lexeme_start lexbuf;
-			Buffer.reset tmp;
-			PCData (cdata lexbuf)
-		}		
-	| "<!--"
-		{
-			last_pos := lexeme_start lexbuf;
-			comment lexbuf;
-			token lexbuf
-		}
-	| "<?"
-		{
-			last_pos := lexeme_start lexbuf;
-			header lexbuf;
-			token lexbuf;
-		}
-	| '<' space* '/' space*
-		{
-			last_pos := lexeme_start lexbuf;
-			let tag = ident_name lexbuf in
-			ignore_spaces lexbuf;
-			close_tag lexbuf;
-			Endtag tag
-		}
-	| '<' space*
-		{
-			last_pos := lexeme_start lexbuf;
-			let tag = ident_name lexbuf in
-			ignore_spaces lexbuf;
-			let attribs, closed = attributes lexbuf in
-			Tag(tag, attribs, closed)
-		}
-	| "&#"
-		{
-			last_pos := lexeme_start lexbuf;
-			Buffer.reset tmp;
-			Buffer.add_string tmp (lexeme lexbuf);
-			PCData (pcdata lexbuf)
-		}
-	| '&'
-		{
-			last_pos := lexeme_start lexbuf;
-			Buffer.reset tmp;
-			Buffer.add_string tmp (entity lexbuf);
-			PCData (pcdata lexbuf)
-		}
-	| space* pcchar+
-		{
-			last_pos := lexeme_start lexbuf;
-			Buffer.reset tmp;
-			Buffer.add_string tmp (lexeme lexbuf);
-			PCData (pcdata lexbuf)
-		}
-	| eof { Eof }
-	| _
-		{ error lexbuf ENodeExpected }
-
-and ignore_spaces = parse
-	| newline
-		{
-			newline lexbuf;
-			ignore_spaces lexbuf
-		}
-	| (space | break) +
-		{ ignore_spaces lexbuf }
-	| ""
-		{ () }
-
-and comment = parse
-	| newline
-		{
-			newline lexbuf;
-			comment lexbuf
-		}
-	| "-->"
-		{ () }
-	| eof
-		{ raise (Error EUnterminatedComment) }
-	| _
-		{ comment lexbuf }
-
-and header = parse
-	| newline
-		{
-			newline lexbuf;
-			header lexbuf
-		}
-	| "?>"
-		{ () }
-	| eof
-		{ error lexbuf ECloseExpected }
-	| _
-		{ header lexbuf }		
-
-and cdata = parse
-	| [^ ']' '\n']+
-		{
-			Buffer.add_string tmp (lexeme lexbuf);
-			cdata lexbuf
-		}
-	| newline 
-		{
-			newline lexbuf;
-			Buffer.add_string tmp (lexeme lexbuf);
-			cdata lexbuf
-		}
-	| "]]>"
-		{ Buffer.contents tmp }
-	| ']'
-		{
-			Buffer.add_string tmp (lexeme lexbuf);
-			cdata lexbuf
-		}
-	| eof
-		{ error lexbuf ECloseExpected }
-
-and pcdata = parse
-	| pcchar+
-		{
-			Buffer.add_string tmp (lexeme lexbuf);
-			pcdata lexbuf
-		}
-	| "&#"
-		{
-			Buffer.add_string tmp (lexeme lexbuf);
-			pcdata lexbuf;
-		}
-	| '&'
-		{
-			Buffer.add_string tmp (entity lexbuf);
-			pcdata lexbuf
-		}
-	| ""
-		{ Buffer.contents tmp }
-
-and entity = parse
-	| entitychar+ ';'
-		{
-			let ident = lexeme lexbuf in
-			try
-				Hashtbl.find idents (String.lowercase ident)
-			with
-				Not_found -> "&" ^ ident
-		}
-	| _ | eof
-		{ raise (Error EUnterminatedEntity) }
-
-and ident_name = parse
-	| identchar+
-		{ lexeme lexbuf }
-	| _ | eof
-		{ error lexbuf EIdentExpected }
-
-and close_tag = parse
-	| '>'
-		{ () }
-	| _ | eof
-		{ error lexbuf ECloseExpected }
-
-and attributes = parse
-	| '>'
-		{ [], false }
-	| "/>"
-		{ [], true }
-	| "" (* do not read a char ! *)
-		{
-			let key = attribute lexbuf in
-			let data = attribute_data lexbuf in
-			ignore_spaces lexbuf;
-			let others, closed = attributes lexbuf in
-			(key, data) :: others, closed
-		}
-
-and attribute = parse
-	| identchar+
-		{ lexeme lexbuf }
-	| _ | eof
-		{ error lexbuf EAttributeNameExpected }
-
-and attribute_data = parse
-	| space* '=' space* '"'
-		{
-			Buffer.reset tmp;
-			last_pos := lexeme_end lexbuf;
-			dq_string lexbuf
-		}
-	| space* '=' space* '\''
-		{
-			Buffer.reset tmp;
-			last_pos := lexeme_end lexbuf;
-			q_string lexbuf
-		}
-	| _ | eof
-		{ error lexbuf EAttributeValueExpected }
-
-and dq_string = parse
-	| '"'
-		{ Buffer.contents tmp }
-	| '\\' [ '"' '\\' ]
-		{
-			Buffer.add_char tmp (lexeme_char lexbuf 1);
-			dq_string lexbuf
-		}
-	| eof
-		{ raise (Error EUnterminatedString) }
-	| _
-		{ 
-			Buffer.add_char tmp (lexeme_char lexbuf 0);
-			dq_string lexbuf
-		}
-
-and q_string = parse
-	| '\''
-		{ Buffer.contents tmp }
-	| '\\' [ '\'' '\\' ]
-		{
-			Buffer.add_char tmp (lexeme_char lexbuf 1);
-			q_string lexbuf
-		}
-	| eof
-		{ raise (Error EUnterminatedString) }
-	| _
-		{ 
-			Buffer.add_char tmp (lexeme_char lexbuf 0);
-			q_string lexbuf
-		}
-
-and dtd_data = parse
-	| "PUBLIC"
-		{
-			ignore_spaces lexbuf;
-			(* skipping Public ID *)
-			let _ = dtd_file lexbuf in
-			let file = dtd_file lexbuf in
-			dtd_end_decl lexbuf;
-			DTDFile file
-		}
-	| "SYSTEM"
-		{
-			ignore_spaces lexbuf;
-			let file = dtd_file lexbuf in
-			dtd_end_decl lexbuf;
-			DTDFile file
-		}
-	| '['
-		{
-			ignore_spaces lexbuf;
-			let data = dtd_intern lexbuf in
-			dtd_end_decl lexbuf;
-			DTDData data
-		}
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDDecl }
-
-and dtd_file = parse
-	| '"'
-		{
-			Buffer.reset tmp;
-			let s = dq_string lexbuf in
-			ignore_spaces lexbuf;
-			s
-		}
-	| '\''
-		{
-			Buffer.reset tmp;
-			let s = q_string lexbuf in
-			ignore_spaces lexbuf;
-			s
-		}
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDDecl }
-
-and dtd_intern = parse
-	| ']'
-		{ 
-			ignore_spaces lexbuf;
-			[]
-		}
-	| ""
-		{
-			let l = dtd_item lexbuf in
-			l @ (dtd_intern lexbuf)
-		}
-
-and dtd = parse
-	| eof
-		{ [] }
-	| newline
-		{
-			newline lexbuf;
-			dtd lexbuf
-		}
-	| (space | break)+
-		{ dtd lexbuf }
-	| ""
-		{
-			let l = dtd_item lexbuf in
-			l @ (dtd lexbuf)
-		}
-
-and dtd_end_decl = parse
-	| '>'
-		{ ignore_spaces lexbuf }
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDDecl }
-
-and dtd_item = parse
-	| "<!--"
-		{
-			comment lexbuf;
-			[];
-		}
-	| "<!"
-		{
-			ignore_spaces lexbuf;
-			let t = dtd_item_type lexbuf in
-			let name = (try ident_name lexbuf with Error EIdentExpected -> raise (DTDError EInvalidDTDDecl)) in
-			ignore_spaces lexbuf;
-			match t with
-			| TElement -> [ DTDElement (name , (dtd_element_type lexbuf)) ]
-			| TAttribute -> List.map (fun (attrname,atype,adef) -> DTDAttribute (name, attrname, atype, adef)) (dtd_attributes lexbuf)
-		}
-	| _ | eof
-		{  dtd_error lexbuf EDTDItemExpected }
-
-and dtd_attributes = parse
-	| '>'
-		{
-			ignore_spaces lexbuf;
-			[]
-		}
-	| ""
-		{
-			let attrname = (try ident_name lexbuf with Error EIdentExpected -> raise (DTDError EInvalidDTDAttribute)) in
-			ignore_spaces lexbuf;
-			let atype = dtd_attr_type lexbuf in
-			let adef = dtd_attr_default lexbuf in
-			let a = (attrname, atype, adef) in
-			a :: (dtd_attributes lexbuf)
-		}
-
-and dtd_item_type = parse
-	| "ELEMENT"
-		{
-			ignore_spaces lexbuf;
-			TElement
-		}
-	| "ATTLIST"
-		{
-			ignore_spaces lexbuf;
-			TAttribute
-		} 
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDTag }
-
-and dtd_element_type = parse
-	| "ANY"
-		{ 
-			ignore_spaces lexbuf;
-			dtd_end_element lexbuf;
-			DTDAny
-		}
-	| "EMPTY"
-		{ 
-			ignore_spaces lexbuf;
-			dtd_end_element lexbuf;
-			DTDEmpty
-		}
-	| '('
-		{
-			try
-				let item = Xml_parser.dtd_element dtd_element_token lexbuf in
-				ignore_spaces lexbuf;
-				DTDChild item
-			with
-				Parsing.Parse_error -> dtd_error lexbuf EInvalidDTDElement
-		}
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDElement }
-
-and dtd_end_element = parse
-	| '>' 
-		{ ignore_spaces lexbuf }
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDElement }
-
-and dtd_end_attribute = parse
-	| '>' 
-		{ ignore_spaces lexbuf }
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDAttribute }
-
-and dtd_element_token = parse
-	| newline
-		{
-			newline lexbuf;
-			dtd_element_token lexbuf
-		}
-	| (space | break) +
-		{ dtd_element_token lexbuf }
-	| '('
-		{ OPEN }
-	| ')'
-		{ CLOSE }
-	| ','
-		{ NEXT }
-	| '>'
-		{ END }
-	| '|'
-		{ OR }
-	| "#PCDATA"
-		{ PCDATA }
-	| '*'
-		{ STAR }
-	| '+'
-		{ PLUS }
-	| '?'
-		{ QUESTION }
-	| identchar+
-		{ IDENT (lexeme lexbuf) }
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDElement }
-
-and dtd_attr_type = parse
-	| "CDATA"
-		{
-			ignore_spaces lexbuf;
-			DTDCData
-		}
-	| "NMTOKEN"
-		{
-			ignore_spaces lexbuf;
-			DTDNMToken
-		}
-	| "ID"
-		{
-			ignore_spaces lexbuf;
-		 	DTDID
-		}
-	| "IDREF"
-		{
-			ignore_spaces lexbuf;
-			DTDIDRef
-		}
-	| '('
-		{
-			ignore_spaces lexbuf;
-			DTDEnum (dtd_attr_enum lexbuf)
-		}
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDAttribute }
-	
-and dtd_attr_enum = parse
-	| identchar+
-		{
-			let v = lexeme lexbuf in
-			ignore_spaces lexbuf;
-			v :: (dtd_attr_enum_next lexbuf)
-		}
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDAttribute }
-
-and dtd_attr_enum_next = parse
-	| ')'
-		{
-			ignore_spaces lexbuf;
-			[]
-		}
-	| '|'
-		{
-			ignore_spaces lexbuf;
-			dtd_attr_enum lexbuf
-		}
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDAttribute }
-
-and dtd_attr_default = parse
-	| '"'
-		{
-			Buffer.reset tmp;
-			let v = (try dq_string lexbuf with Error EUnterminatedString -> raise (DTDError EInvalidDTDAttribute)) in
-			ignore_spaces lexbuf;
-			DTDDefault v
-		}
-	| '\''
-		{
-			Buffer.reset tmp;
-			let v = (try q_string lexbuf with Error EUnterminatedString -> raise (DTDError EInvalidDTDAttribute)) in
-			ignore_spaces lexbuf;
-			DTDDefault v
-		}
-	| "#REQUIRED"
-		{
-			ignore_spaces lexbuf;
-			DTDRequired
-		}
-	| "#IMPLIED"
-		{
-			ignore_spaces lexbuf;
-			DTDImplied
-		}
-	| "#FIXED"
-		{
-			ignore_spaces lexbuf;
-			DTDFixed (dtd_attr_string lexbuf)
-		}
-	| "#DEFAULT"
-		{
-			ignore_spaces lexbuf;
-			DTDDefault (dtd_attr_string lexbuf)
-		}
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDAttribute }
-
-and dtd_attr_string = parse
-	| '"'
-		{
-			Buffer.reset tmp;
-			let v = (try dq_string lexbuf with Error EUnterminatedString -> raise (DTDError EInvalidDTDAttribute)) in
-			ignore_spaces lexbuf;
-			v
-		}
-	| '\''
-		{
-			Buffer.reset tmp;
-			let v = (try q_string lexbuf with Error EUnterminatedString -> raise (DTDError EInvalidDTDAttribute)) in
-			ignore_spaces lexbuf;
-			v
-		}
-	| _ | eof
-		{ dtd_error lexbuf EInvalidDTDAttribute }
diff --git a/libs/xml-light/xml_parser.mly b/libs/xml-light/xml_parser.mly
deleted file mode 100644
index 6acfd3ecad87a1809bd9779400ad705d501bf235..0000000000000000000000000000000000000000
--- a/libs/xml-light/xml_parser.mly
+++ /dev/null
@@ -1,96 +0,0 @@
-%{(*
- * Xml Light, an small Xml parser/printer with DTD support.
- * Copyright (C) 2003 Nicolas Cannasse (ncannasse@motion-twin.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library has the special exception on linking described in file
- * README.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *)	
-%}
-%token NEXT OR
-%token <string>IDENT
-%token PCDATA
-%token STAR QUESTION PLUS
-%token OPEN CLOSE
-%token END
-
-%right STAR QUESTION PLUS
-
-%start dtd_element
-%type <Dtd.dtd_child> dtd_element
-%%
-
-dtd_element:
-	| dtd_full_seq END
-		{ $1 }
-;
-dtd_full_seq:
-	| dtd_seq CLOSE dtd_op
-		{ $3 $1 }
-	| dtd_seq CLOSE
-		{ $1 }
-;
-dtd_seq:
-	| dtd_item NEXT dtd_children
-		{ Dtd.DTDChildren ($1 :: $3) }
-	| dtd_item OR dtd_choice
-		{ Dtd.DTDChoice ($1 :: $3) }
-	| dtd_item
-		{ $1 }
-;
-dtd_children:
-	| dtd_item NEXT dtd_children
-		{ $1 :: $3 }
-	| dtd_item
-		{ [$1] }
-;
-dtd_choice:
-	| dtd_item OR dtd_choice
-		{ $1 :: $3 }
-	| dtd_item
-		{ [$1] }
-;
-dtd_item:
-	| OPEN dtd_full_seq
-		{ $2 }
-	| dtd_member
-		{ $1 }
-;
-dtd_member:
-	| IDENT dtd_op
-		{ $2 (Dtd.DTDTag $1) }
-	| PCDATA dtd_op
-		{ $2 Dtd.DTDPCData }
-	| IDENT
-		{ Dtd.DTDTag $1 }
-	| PCDATA
-		{ Dtd.DTDPCData }
-;
-dtd_op:
-	| dtd_op_item dtd_op
-		{ (fun x -> $2 ($1 x)) }
-	| dtd_op_item 
-		{ $1 }
-;
-dtd_op_item:
-	| STAR
-		{ (fun x -> Dtd.DTDZeroOrMore x) }
-	| QUESTION
-		{ (fun x -> Dtd.DTDOptional x) }
-	| PLUS
-		{ (fun x -> Dtd.DTDOneOrMore x) }
-;
\ No newline at end of file
diff --git a/libs/ziplib/Makefile b/libs/ziplib/Makefile
index e532cbd95251099ba182b2ad01e90b8138cc113c..aec59d005a089fbacf5ba3ea54eac820cbcd3ca8 100644
--- a/libs/ziplib/Makefile
+++ b/libs/ziplib/Makefile
@@ -4,16 +4,16 @@ SRC=zlib.mli zlib.ml zip.mli zip.ml
 
 all: native bytecode
 
-native: zip.cmxa
-zip.cmxa: $(SRC)
-	$(OCAMLOPT) -g -I ../extlib -I ../extc -a -o zip.cmxa $(SRC)
+native: ziplib.cmxa
+ziplib.cmxa: $(SRC)
+	ocamlfind $(OCAMLOPT) -safe-string -g -I ../extlib -I ../extc -a -o ziplib.cmxa $(SRC)
 
-bytecode: zip.cma
-zip.cma: $(SRC)
-	$(OCAMLC) -g -I ../extlib -I ../extc -a -o zip.cma $(SRC)
+bytecode: ziplib.cma
+ziplib.cma: $(SRC)
+	ocamlfind $(OCAMLC) -safe-string -g -I ../extlib -I ../extc -a -o ziplib.cma $(SRC)
 
 clean:
-	rm -rf zip.cmxa zip.cma zip.lib zip.a $(wildcard *.cmx) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.cmi) $(wildcard *.cmo)
+	rm -rf ziplib.cmxa ziplib.cma ziplib.lib ziplib.a $(wildcard *.cmx) $(wildcard *.obj) $(wildcard *.o) $(wildcard *.cmi) $(wildcard *.cmo)
 
 .PHONY: all native bytecode clean
 
diff --git a/libs/ziplib/zip.ml b/libs/ziplib/zip.ml
index 27f286e120e1794a68875d35e97c657b9824d97d..9245f0d00a21895242dd11c3f2a1e9dd1b3aebd0 100644
--- a/libs/ziplib/zip.ml
+++ b/libs/ziplib/zip.ml
@@ -29,8 +29,8 @@ let read4_int ic =
   if hw > max_int lsr 16 then raise (Error("", "", "32-bit data too large"));
   lw lor (hw lsl 16)
 let readstring ic n =
-  let s = String.create n in
-  really_input ic s 0 n; s
+  let s = Bytes.create n in
+  really_input ic s 0 n; Bytes.to_string s
 
 let write1 = output_byte
 let write2 oc n =
@@ -42,7 +42,9 @@ let write4_int oc n =
   write2 oc n;
   write2 oc (n lsr 16)
 let writestring oc s =
-  output oc s 0 (String.length s)
+  output oc (Bytes.of_string s) 0 (String.length s)
+let writebytes oc s =
+  output oc s 0 (Bytes.length s)
 
 type compression_method = Stored | Deflated
 
@@ -116,7 +118,7 @@ let dostime_of_unixtime t =
 (* Read end of central directory record *)
 
 let read_ecd filename ic =
-  let buf = String.create 256 in
+  let buf = Bytes.create 256 in
   let filelen = in_channel_length ic in
   let rec find_ecd pos len =
     (* On input, bytes 0 ... len - 1 of buf reflect what is at pos in ic *)
@@ -125,16 +127,16 @@ let read_ecd filename ic =
                    "end of central directory not found, not a ZIP file"));
     let toread = min pos 128 in
     (* Make room for "toread" extra bytes, and read them *)
-    String.blit buf 0 buf toread (256 - toread);
+    Bytes.blit buf 0 buf toread (256 - toread);
     let newpos = pos - toread in
     seek_in ic newpos;
     really_input ic buf 0 toread;
     let newlen = min (toread + len) 256 in
     (* Search for magic number *)
-    let ofs = strrstr "PK\005\006" buf 0 newlen in
+    let ofs = strrstr "PK\005\006" (Bytes.to_string buf) 0 newlen in
     if ofs < 0 || newlen < 22 ||
        (let comment_len =
-          Char.code buf.[ofs + 20] lor (Char.code buf.[ofs + 21] lsl 8) in
+          Char.code (Bytes.get buf (ofs + 20)) lor (Char.code (Bytes.get buf (ofs + 21)) lsl 8) in
         newpos + ofs + 22 + comment_len <> filelen) then
       find_ecd newpos newlen
     else
@@ -268,14 +270,14 @@ let goto_entry ifile e =
 let read_entry ifile e =
   try
     goto_entry ifile e;
-    let res = String.create e.uncompressed_size in
+    let res = Bytes.create e.uncompressed_size in
     match e.methd with
       Stored ->
         if e.compressed_size <> e.uncompressed_size then
           raise (Error(ifile.if_filename, e.filename,
                        "wrong size for stored entry"));
         really_input ifile.if_channel res 0 e.uncompressed_size;
-        res
+        Bytes.to_string res
     | Deflated ->
         let in_avail = ref e.compressed_size in
         let out_pos = ref 0 in
@@ -284,25 +286,25 @@ let read_entry ifile e =
           Zlib.uncompress ~header:false
             (fun buf ->
               let read = input ifile.if_channel buf 0
-                               (min !in_avail (String.length buf)) in
+                               (min !in_avail (Bytes.length buf)) in
               in_avail := !in_avail - read;
               read)
             (fun buf len ->
-              if !out_pos + len > String.length res then
+              if !out_pos + len > Bytes.length res then
                 raise (Error(ifile.if_filename, e.filename,
                              "wrong size for deflated entry (too much data)"));
-              String.blit buf 0 res !out_pos len;
+              Bytes.blit buf 0 res !out_pos len;
               out_pos := !out_pos + len)
         with Failure(_) ->
           raise (Error(ifile.if_filename, e.filename, "decompression error"))
         end;
-        if !out_pos <> String.length res then
+        if !out_pos <> Bytes.length res then
           raise (Error(ifile.if_filename, e.filename,
                        "wrong size for deflated entry (not enough data)"));
-        let crc = Zlib.update_crc Int32.zero res 0 (String.length res) in
+        let crc = Zlib.update_crc Int32.zero res 0 (Bytes.length res) in
         if crc <> e.crc then
           raise (Error(ifile.if_filename, e.filename, "CRC mismatch"));
-        res
+        Bytes.to_string res
   with End_of_file ->
     raise (Error(ifile.if_filename, e.filename, "truncated data"))
 
@@ -316,10 +318,10 @@ let copy_entry_to_channel ifile e oc =
         if e.compressed_size <> e.uncompressed_size then
           raise (Error(ifile.if_filename, e.filename,
                        "wrong size for stored entry"));
-        let buf = String.create 4096 in
+        let buf = Bytes.create 4096 in
         let rec copy n =
           if n > 0 then begin
-            let r = input ifile.if_channel buf 0 (min n (String.length buf)) in
+            let r = input ifile.if_channel buf 0 (min n (Bytes.length buf)) in
             output oc buf 0 r;
             copy (n - r)
           end in
@@ -331,7 +333,7 @@ let copy_entry_to_channel ifile e oc =
           Zlib.uncompress ~header:false
             (fun buf ->
               let read = input ifile.if_channel buf 0
-                               (min !in_avail (String.length buf)) in
+                               (min !in_avail (Bytes.length buf)) in
               in_avail := !in_avail - read;
               read)
             (fun buf len ->
@@ -471,22 +473,23 @@ let add_data_descriptor ofile crc compr_size uncompr_size entry =
 
 let add_entry data ofile ?(extra = "") ?(comment = "")
                          ?(level = 6) ?(mtime = Unix.time()) name =
+  let data = Bytes.of_string data in
   let e = add_entry_header ofile extra comment level mtime name in
-  let crc = Zlib.update_crc Int32.zero data 0 (String.length data) in
+  let crc = Zlib.update_crc Int32.zero data 0 (Bytes.length data) in
   let compr_size =
     match level with
       0 ->
-        output ofile.of_channel data 0 (String.length data);
-        String.length data
+        output ofile.of_channel data 0 (Bytes.length data);
+        Bytes.length data
     | _ ->
         let in_pos = ref 0 in
         let out_pos = ref 0 in
         try
           Zlib.compress ~level ~header:false
             (fun buf ->
-               let n = min (String.length data - !in_pos)
-                           (String.length buf) in
-               String.blit data !in_pos buf 0 n;
+               let n = min (Bytes.length data - !in_pos)
+                           (Bytes.length buf) in
+               Bytes.blit data !in_pos buf 0 n;
                in_pos := !in_pos + n;
                n)
             (fun buf n ->
@@ -495,7 +498,7 @@ let add_entry data ofile ?(extra = "") ?(comment = "")
           !out_pos
         with Failure _ ->
           raise (Error(ofile.of_filename, name, "compression error")) in
-  let e' = add_data_descriptor ofile crc compr_size (String.length data) e in
+  let e' = add_data_descriptor ofile crc compr_size (Bytes.length data) e in
   ofile.of_entries <- e' :: ofile.of_entries
 
 (* Add an entry with the contents of an in channel *)
@@ -507,9 +510,9 @@ let copy_channel_to_entry ic ofile ?(extra = "") ?(comment = "")
   let (compr_size, uncompr_size) =
     match level with
       0 ->
-        let buf = String.create 4096 in
+        let buf = Bytes.create 4096 in
         let rec copy sz =
-          let r = input ic buf 0 (String.length buf) in
+          let r = input ic buf 0 (Bytes.length buf) in
           if r = 0 then sz else begin
             crc := Zlib.update_crc !crc buf 0 r;
             output ofile.of_channel buf 0 r;
@@ -523,7 +526,7 @@ let copy_channel_to_entry ic ofile ?(extra = "") ?(comment = "")
         try
           Zlib.compress ~level ~header:false
             (fun buf ->
-               let r = input ic buf 0 (String.length buf) in
+               let r = input ic buf 0 (Bytes.length buf) in
                crc := Zlib.update_crc !crc buf 0 r;
                in_pos := !in_pos + r;
                r)
@@ -575,6 +578,7 @@ let add_entry_generator ofile ?(extra = "") ?(comment = "")
   match level with
   | 0 ->
       (fun buf pos len ->
+        let buf = Bytes.of_string buf in
         check ();
         output ofile.of_channel buf pos len;
         compr_size := !compr_size + len;
@@ -591,6 +595,7 @@ let add_entry_generator ofile ?(extra = "") ?(comment = "")
             compr_size := !compr_size + n)
       in
       (fun buf pos len ->
+        let buf = Bytes.of_string buf in
         check ();
         try
           send buf pos len;
diff --git a/libs/ziplib/zlib.ml b/libs/ziplib/zlib.ml
index 58b0cbfcd39c6e3ac7cba32964a82e3c6ab05d1f..479211df6c99e3a302abf03026cecef95f1258d9 100644
--- a/libs/ziplib/zlib.ml
+++ b/libs/ziplib/zlib.ml
@@ -33,21 +33,21 @@ let crc_table = Array.init 256 (fun n ->
 let max_wbits = 15
 
 let compress ?(level = 6) ?(header = true) refill flush =
-  let inbuf = String.create buffer_size
-  and outbuf = String.create buffer_size in
+  let inbuf = Bytes.create buffer_size
+  and outbuf = Bytes.create buffer_size in
   let zs = Extc.zlib_deflate_init2 level (if header then max_wbits else -max_wbits) in
   let rec compr inpos inavail =
     if inavail = 0 then begin
       let incount = refill inbuf in
       if incount = 0 then compr_finish() else compr 0 incount
     end else begin
-      let res = Extc.zlib_deflate zs ~src:inbuf ~spos:inpos ~slen:inavail ~dst:outbuf ~dpos:0 ~dlen:buffer_size Z_NO_FLUSH in
+      let res = Extc.zlib_deflate zs ~src:(Bytes.to_string inbuf) ~spos:inpos ~slen:inavail ~dst:outbuf ~dpos:0 ~dlen:buffer_size Z_NO_FLUSH in
       let used_in, used_out = res.z_read, res.z_wrote in
       flush outbuf used_out;
       compr (inpos + used_in) (inavail - used_in)
     end
   and compr_finish () =
-    let ret = Extc.zlib_deflate zs ~src:inbuf ~spos:0 ~slen:0 ~dst:outbuf ~dpos:0 ~dlen:buffer_size Z_FINISH in
+    let ret = Extc.zlib_deflate zs ~src:(Bytes.to_string inbuf) ~spos:0 ~slen:0 ~dst:outbuf ~dpos:0 ~dlen:buffer_size Z_FINISH in
     let (finished, _, used_out) = ret.z_finish, ret.z_read, ret.z_wrote in
     flush outbuf used_out;
     if not finished then compr_finish()
@@ -56,12 +56,12 @@ let compress ?(level = 6) ?(header = true) refill flush =
     Extc.zlib_deflate_end zs
 
 let compress_direct  ?(level = 6) ?(header = true) flush =
-  let outbuf = String.create buffer_size in
+  let outbuf = Bytes.create buffer_size in
   let zs = Extc.zlib_deflate_init2 level (if header then max_wbits else -max_wbits) in
   let rec compr inbuf inpos inavail =
     if inavail = 0 then ()
     else begin
-      let res = Extc.zlib_deflate zs ~src:inbuf ~spos:inpos ~slen:inavail ~dst:outbuf ~dpos:0 ~dlen:buffer_size Z_NO_FLUSH in
+      let res = Extc.zlib_deflate zs ~src:(Bytes.to_string inbuf) ~spos:inpos ~slen:inavail ~dst:outbuf ~dpos:0 ~dlen:buffer_size Z_NO_FLUSH in
       let used_in, used_out = res.z_read, res.z_wrote in
       flush outbuf used_out;
       compr inbuf (inpos + used_in) (inavail - used_in)
@@ -75,15 +75,15 @@ let compress_direct  ?(level = 6) ?(header = true) flush =
   compr, compr_finish
 
 let uncompress ?(header = true) refill flush =
-  let inbuf = String.create buffer_size
-  and outbuf = String.create buffer_size in
+  let inbuf = Bytes.create buffer_size
+  and outbuf = Bytes.create buffer_size in
   let zs = Extc.zlib_inflate_init2 (if header then max_wbits else -max_wbits) in
   let rec uncompr inpos inavail =
     if inavail = 0 then begin
       let incount = refill inbuf in
       if incount = 0 then uncompr_finish true else uncompr 0 incount
     end else begin
-      let ret = Extc.zlib_inflate zs ~src:inbuf ~spos: inpos ~slen:inavail ~dst:outbuf ~dpos:0 ~dlen:buffer_size Z_SYNC_FLUSH in
+      let ret = Extc.zlib_inflate zs ~src:(Bytes.to_string inbuf) ~spos: inpos ~slen:inavail ~dst:outbuf ~dpos:0 ~dlen:buffer_size Z_SYNC_FLUSH in
       let (finished, used_in, used_out) = ret.z_finish, ret.z_read, ret.z_wrote in
       flush outbuf used_out;
       if not finished then uncompr (inpos + used_in) (inavail - used_in)
@@ -93,7 +93,7 @@ let uncompress ?(header = true) refill flush =
        after the compressed stream in order to complete decompression
        and return finished = true. *)
     let dummy_byte = if first_finish && not header then 1 else 0 in
-    let ret = Extc.zlib_inflate zs ~src:inbuf ~spos:0 ~slen:dummy_byte ~dst:outbuf ~dpos:0 ~dlen:buffer_size Z_SYNC_FLUSH in
+    let ret = Extc.zlib_inflate zs ~src:(Bytes.to_string inbuf) ~spos:0 ~slen:dummy_byte ~dst:outbuf ~dpos:0 ~dlen:buffer_size Z_SYNC_FLUSH in
     let (finished, _, used_out) = ret.z_finish, ret.z_read, ret.z_wrote in
     flush outbuf used_out;
     if not finished then uncompr_finish false
@@ -104,7 +104,7 @@ let uncompress ?(header = true) refill flush =
 let update_crc crc buf pos len =
   let c = ref (Int32.lognot crc) in
   for i = pos to (len + pos - 1) do
-    let b = Int32.of_int (int_of_char (String.get buf i)) in
+    let b = Int32.of_int (int_of_char (Bytes.get buf i)) in
     c := Int32.logxor (Array.get crc_table (Int32.to_int (Int32.logand (Int32.logxor !c b) 0xFFl))) (Int32.shift_right_logical !c 8);
   done;
   let ret = Int32.lognot !c in
diff --git a/libs/ziplib/zlib.mli b/libs/ziplib/zlib.mli
index 97310ae5db106fc985d866b4fc42dd4f8252f46f..c559a2c9a0e58e2d51e4b90dec0c45d9f814a6ad 100644
--- a/libs/ziplib/zlib.mli
+++ b/libs/ziplib/zlib.mli
@@ -16,14 +16,14 @@
 
 val compress:
   ?level: int -> ?header: bool -> 
-  (string -> int) -> (string -> int -> unit) -> unit
+  (bytes -> int) -> (bytes -> int -> unit) -> unit
 
 val compress_direct:
-  ?level: int -> ?header: bool -> (string -> int -> unit) ->
-  (string -> int -> int -> unit) * (unit -> unit)
+  ?level: int -> ?header: bool -> (bytes -> int -> unit) ->
+  (bytes -> int -> int -> unit) * (unit -> unit)
 
 val uncompress:
-  ?header: bool -> (string -> int) -> (string -> int -> unit) -> unit
+  ?header: bool -> (bytes -> int) -> (bytes -> int -> unit) -> unit
 
 val update_crc: 
-  int32 -> string -> int -> int -> int32
\ No newline at end of file
+  int32 -> bytes -> int -> int -> int32
\ No newline at end of file
diff --git a/opam b/opam
index fff046a70071049d2fb55474a8b3810609e85872..95bc53d1914fe83db1dadc4eed64290a3c317056 100644
--- a/opam
+++ b/opam
@@ -1,27 +1,34 @@
-
-opam-version: "1.2"
+opam-version: "2.0"
 name: "haxe"
-version: "3.4.4"
+version: "4.0.0"
+synopsis: "Multi-target universal programming language"
+description: """
+Haxe is an open source toolkit based on a modern,
+high level, static-typed programming language, a cross-compiler,
+a complete cross-platform standard library and ways to access each
+platform's native capabilities."""
 maintainer: ["Haxe Foundation <contact@haxe.org>" "Andy Li <andy@onthewings.net>"]
-author: "Haxe Foundation <contact@haxe.org>"
+authors: "Haxe Foundation <contact@haxe.org>"
 homepage: "https://haxe.org/"
 bug-reports: "https://github.com/HaxeFoundation/haxe/issues"
 license: ["GPL2+" "MIT"]
-dev-repo: "https://github.com/HaxeFoundation/haxe"
+dev-repo: "git+https://github.com/HaxeFoundation/haxe.git"
 build: [
-  [ "env" "OCAMLPARAM=safe-string=0,_" make ]
-]
-install: [
-  ["cp" "haxe" "haxelib" "%{bin}%"]
-  ["mkdir" "-p" "%{share}%/haxe"]
-  ["cp" "-r" "std" "%{share}%/haxe/std"]
-]
-remove: [
-  ["rm" "%{bin}%/haxe" "%{bin}%/haxelib"]
-  ["rm" "-r" "%{share}%/haxe"]
+  [make]
 ]
+install: [make "install" "INSTALL_DIR=%{prefix}%"]
+remove: [make "uninstall" "INSTALL_DIR=%{prefix}%"]
 depends: [
-  "ocamlfind" {build}
-  "camlp4"    {build}
-]
-available: [ ocaml-version > "4.02" ]
+  "ocaml"               {>= "4.02"}
+  "ocamlfind"           {build}
+  "camlp5"              {build}
+  "sedlex"              {build}
+  "ppx_tools_versioned" {build & != "5.2.1"} #https://github.com/alainfrisch/sedlex/issues/64
+  "xml-light"           {build}
+  "extlib"              {build & >= "1.7.6"}
+  "ptmap"               {build}
+  "sha"                 {build}
+  "conf-libpcre"
+  "conf-zlib"
+  "conf-neko"
+]
\ No newline at end of file
diff --git a/src-json/define.json b/src-json/define.json
new file mode 100644
index 0000000000000000000000000000000000000000..5e0f0c31aa498f4c954bb5540209aaa82f30a033
--- /dev/null
+++ b/src-json/define.json
@@ -0,0 +1,656 @@
+[
+	{
+		"name": "AbsolutePath",
+		"define": "absolute_path",
+		"doc": "Print absolute file path in trace output."
+	},
+	{
+		"name": "AdvancedTelemetry",
+		"define": "advanced-telemetry",
+		"doc": "Allow the SWF to be measured with Monocle tool.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "AnnotateSource",
+		"define": "annotate_source",
+		"doc": "Add additional comments to generated source code.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "As3",
+		"define": "as3",
+		"doc": "Defined when outputting flash9 as3 source code."
+	},
+	{
+		"name": "CheckXmlProxy",
+		"define": "check_xml_proxy",
+		"doc": "Check the used fields of the XML proxy."
+	},
+	{
+		"name": "CoreApi",
+		"define": "core_api",
+		"doc": "Defined in the core API context."
+	},
+	{
+		"name": "CoreApiSerialize",
+		"define": "core_api_serialize",
+		"doc": "Mark some generated core API classes with the `Serializable` attribute on C#.",
+		"platforms": ["cs"]
+	},
+	{
+		"name": "Cppia",
+		"define": "cppia",
+		"doc": "Generate cpp instruction assembly."
+	},
+	{
+		"name": "CsVer",
+		"define": "cs_ver",
+		"doc": "The C# version to target.",
+		"platforms": ["cs"]
+	},
+	{
+		"name": "NoCppiaAst",
+		"define": "nocppiaast",
+		"doc": "Use legacy cppia generation."
+	},
+	{
+		"name": "Dce",
+		"define": "dce",
+		"doc": "Set the dead code elimination mode. (default: std)",
+		"params": ["mode: std | full | no"],
+		"links": ["https://haxe.org/manual/cr-dce.html"]
+	},
+	{
+		"name": "DceDebug",
+		"define": "dce_debug",
+		"doc": "Show DCE log.",
+		"links": ["https://haxe.org/manual/cr-dce.html"]
+	},
+	{
+		"name": "Debug",
+		"define": "debug",
+		"doc": "Activated when compiling with -debug."
+	},
+	{
+		"name": "DisableUnicodeStrings",
+		"define": "disable_unicode_strings",
+		"doc": "Disable Unicode support in `String` type.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "Display",
+		"define": "display",
+		"doc": "Activated during completion.",
+		"links": ["https://haxe.org/manual/cr-completion.html"]
+	},
+	{
+		"name": "DisplayStdin",
+		"define": "display_stdin",
+		"doc": "Read the contents of a file specified in `--display` from standard input."
+	},
+	{
+		"name": "DllExport",
+		"define": "dll_export",
+		"doc": "GenCPP experimental linking.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "DllImport",
+		"define": "dll_import",
+		"doc": "Handle Haxe-generated .NET DLL imports.",
+		"platforms": ["cs"]
+	},
+	{
+		"name": "DocGen",
+		"define": "doc_gen",
+		"doc": "Do not perform any removal/change in order to correctly generate documentation."
+	},
+	{
+		"name": "Dump",
+		"define": "dump",
+		"doc": "Dump typed AST in dump subdirectory using specified mode or non-prettified default.",
+		"params": ["mode: pretty | record | position | legacy"]
+	},
+	{
+		"name": "DumpPath",
+		"define": "dump_path",
+		"doc": "Path to generate dumps to (default: \"dump\")."
+	},
+	{
+		"name": "DumpDependencies",
+		"define": "dump_dependencies",
+		"doc": "Dump the classes dependencies in a dump subdirectory."
+	},
+	{
+		"name": "DumpIgnoreVarIds",
+		"define": "dump_ignore_var_ids",
+		"doc": "Remove variable IDs from non-pretty dumps (helps with diff)."
+	},
+	{
+		"name": "DynamicInterfaceClosures",
+		"define": "dynamic_interface_closures",
+		"doc": "Use slow path for interface closures to save space.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "EraseGenerics",
+		"define": "erase_generics",
+		"doc": "Erase generic classes on C#.",
+		"platforms": ["cs"]
+	},
+	{
+		"name": "EvalCallStackDepth",
+		"define": "eval_call_stack_depth",
+		"doc": "Set maximum call stack depth for eval. (default: 1000)",
+		"platforms": ["eval"],
+		"params": ["depth"]
+	},
+	{
+		"name": "EvalDebugger",
+		"define": "eval_debugger",
+		"doc": "Support debugger in macro/interp mode. Allows `host:port` value to open a socket. Implies eval_stack.",
+		"platforms": ["eval"]
+	},
+	{
+		"name": "EvalStack",
+		"define": "eval_stack",
+		"doc": "Record stack information in macro/interp mode.",
+		"platforms": ["eval"]
+	},
+	{
+		"name": "EvalTimes",
+		"define": "eval_times",
+		"doc": "Record per-method execution times in macro/interp mode. Implies eval_stack.",
+		"platforms": ["eval"]
+	},
+	{
+		"name": "FastCast",
+		"define": "fast_cast",
+		"doc": "Enables an experimental casts cleanup on C# and Java.",
+		"platforms": ["cs", "java"]
+	},
+	{
+		"name": "Fdb",
+		"define": "fdb",
+		"doc": "Enable full flash debug infos for FDB interactive debugging.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "FileExtension",
+		"define": "file_extension",
+		"doc": "Output filename extension for cpp source code.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "FlashStrict",
+		"define": "flash_strict",
+		"doc": "More strict typing for flash target.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "FlashUseStage",
+		"define": "flash_use_stage",
+		"doc": "Keep the SWF library initial stage.",
+		"platforms": ["flash"]
+	},
+	{
+		"devcomment": "force_lib_check is only here as a debug facility - compiler checking allows errors to be found more easily",
+		"name": "ForceLibCheck",
+		"define": "force_lib_check",
+		"doc": "Force the compiler to check `--net-lib` and `–-java-lib` added classes (internal).",
+		"platforms": ["cs", "java"]
+	},
+	{
+		"name": "ForceNativeProperty",
+		"define": "force_native_property",
+		"doc": "Tag all properties with `:nativeProperty` metadata for 3.1 compatibility.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "GencommonDebug",
+		"define": "gencommon_debug",
+		"doc": "GenCommon internal.",
+		"platforms": ["cs", "java"]
+	},
+	{
+		"name": "Haxe3Compat",
+		"define": "haxe3compat",
+		"doc": "Gives warnings about transition from Haxe 3.x to Haxe 4.0."
+	},
+	{
+		"name": "HaxeBoot",
+		"define": "haxe_boot",
+		"doc": "Give the name 'haxe' to the flash boot class instead of a generated name.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "HaxeVer",
+		"define": "haxe_ver",
+		"doc": "The current Haxe version value as decimal number. E.g. 3.407 for 3.4.7."
+	},
+	{
+		"name": "Haxe",
+		"define": "haxe",
+		"doc": "The current Haxe version value in SemVer format."
+	},
+	{
+		"name": "HxcppApiLevel",
+		"define": "hxcpp_api_level",
+		"doc": "Provided to allow compatibility between hxcpp versions.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "HxcppGcGenerational",
+		"define": "HXCPP_GC_GENERATIONAL",
+		"doc": "Experimental Garbage Collector.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "HxcppDebugger",
+		"define": "HXCPP_DEBUGGER",
+		"doc": "Include additional information for hxcpp_debugger.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "HxcppSmartStings",
+		"define": "hxcpp_smart_strings",
+		"doc": "Use wide strings in hxcpp. (Turned on by default unless `-D disable_unicode_strings` is specified.)",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "IncludePrefix",
+		"define": "include_prefix",
+		"doc": "Prepend path to generated include files.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "Interp",
+		"define": "interp",
+		"doc": "The code is compiled to be run with `--interp`."
+	},
+	{
+		"name": "JavaVer",
+		"define": "java_ver",
+		"doc": "Sets the Java version to be targeted.",
+		"platforms": ["java"],
+		"params": ["version: 5-7"]
+	},
+	{
+		"name": "JsClassic",
+		"define": "js_classic",
+		"doc": "Don't use a function wrapper and strict mode in JS output.",
+		"platforms": ["js"]
+	},
+	{
+		"name": "JsEs",
+		"define": "js_es",
+		"doc": "Generate JS compliant with given ES standard version. (default: 5)",
+		"platforms": ["js"],
+		"params": ["version number"],
+		"links": ["https://haxe.org/manual/target-javascript-es6.html"]
+	},
+	{
+		"name": "JsEnumsAsArrays",
+		"define": "js_enums_as_arrays",
+		"doc": "Generate enum representation as array instead of as object.",
+		"platforms": ["js"]
+	},
+	{
+		"name": "JsUnflatten",
+		"define": "js_unflatten",
+		"doc": "Generate nested objects for packages and types.",
+		"platforms": ["js"]
+	},
+	{
+		"name": "JsSourceMap",
+		"define": "js_source_map",
+		"doc": "Generate JavaScript source map even in non-debug mode. Deprecated in favor of `-D source_map`.",
+		"platforms": ["js"]
+	},
+	{
+		"name": "SourceMap",
+		"define": "source_map",
+		"doc": "Generate source map for compiled files.",
+		"platforms": ["php", "js"]
+	},
+	{
+		"name": "Jvm",
+		"define": "jvm",
+		"doc": "Generate jvm directly.",
+		"platforms": ["java"]
+	},
+	{
+		"name": "KeepOldOutput",
+		"define": "keep_old_output",
+		"doc": "Keep old source files in the output directory.",
+		"platforms": ["cs", "java"]
+	},
+	{
+		"name": "LoopUnrollMaxCost",
+		"define": "loop_unroll_max_cost",
+		"doc": "Maximum cost (number of expressions * iterations) before loop unrolling is canceled. (default: 250)",
+		"params": ["cost"]
+	},
+	{
+		"name": "LuaJit",
+		"define": "lua_jit",
+		"doc": "Enable the jit compiler for lua (version 5.2 only).",
+		"platforms": ["lua"]
+	},
+	{
+		"name": "LuaVanilla",
+		"define": "lua_vanilla",
+		"doc": "Generate code lacking compiled extern lib support (e.g. utf8).",
+		"platforms": ["lua"]
+	},
+	{
+		"name": "LuaVer",
+		"define": "lua_ver",
+		"doc": "The lua version to target.",
+		"platforms": ["lua"],
+		"params": ["version"]
+	},
+	{
+		"name": "Macro",
+		"define": "macro",
+		"doc": "Defined when code is compiled in the macro context.",
+		"links": ["https://haxe.org/manual/macro.html"]
+	},
+	{
+		"name": "MacroTimes",
+		"define": "macro_times",
+		"doc": "Display per-macro timing when used with `--times`."
+	},
+	{
+		"name": "NetVer",
+		"define": "net_ver",
+		"doc": "Sets the .NET version to be targeted.",
+		"platforms": ["cs"],
+		"params": ["version: 20-45"]
+	},
+	{
+		"name": "NetcoreVer",
+		"define": "netcore_ver",
+		"doc": "Sets the .NET core version to be targeted",
+		"platforms": ["cs"],
+		"params": ["version: x.x.x"]
+	},
+	{
+		"name": "NetTarget",
+		"define": "net_target",
+		"doc": "Sets the .NET target. `netcore` (.NET core), `xbox`, `micro` (Micro Framework), `compact` (Compact Framework) are some valid values. (default: `net`)",
+		"platforms": ["cs"],
+		"params": ["name"]
+	},
+	{
+		"name": "NekoSource",
+		"define": "neko_source",
+		"doc": "Output neko source instead of bytecode.",
+		"platforms": ["neko"]
+	},
+	{
+		"name": "NekoV1",
+		"define": "neko_v1",
+		"doc": "Keep Neko 1.x compatibility.",
+		"platforms": ["neko"]
+	},
+	{
+		"name": "NetworkSandbox",
+		"define": "network-sandbox",
+		"doc": "Use local network sandbox instead of local file access one.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "NoCompilation",
+		"define": "no-compilation",
+		"doc": "Disable final compilation.",
+		"platforms": ["cs", "java", "cpp", "hl"]
+	},
+	{
+		"name": "NoCOpt",
+		"define": "no_copt",
+		"doc": "Disable completion optimization (for debug purposes)."
+	},
+	{
+		"name": "NoDebug",
+		"define": "no_debug",
+		"doc": "Remove all debug macros from cpp output."
+	},
+	{
+		"name": "NoDeprecationWarnings",
+		"define": "no-deprecation-warnings",
+		"doc": "Do not warn if fields annotated with `@:deprecated` are used."
+	},
+	{
+		"name": "NoFlashOverride",
+		"define": "no-flash-override",
+		"doc": "Change overrides on some basic classes into HX suffixed methods",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "NoOpt",
+		"define": "no_opt",
+		"doc": "Disable optimizations."
+	},
+	{
+		"name": "NoInline",
+		"define": "no_inline",
+		"doc": "Disable inlining.",
+		"links": ["https://haxe.org/manual/class-field-inline.html"]
+	},
+	{
+		"name": "KeepInlinePositions",
+		"define": "keep_inline_positions",
+		"doc": "Don't substitute positions of inlined expressions with the position of the place of inlining.",
+		"links": ["https://haxe.org/manual/class-field-inline.html"]
+	},
+	{
+		"name": "NoRoot",
+		"define": "no_root",
+		"doc": "Generate top-level types into the `haxe.root` namespace.",
+		"platforms": ["cs"]
+	},
+	{
+		"name": "NoMacroCache",
+		"define": "no_macro_cache",
+		"doc": "Disable macro context caching."
+	},
+	{
+		"name": "NoSwfCompress",
+		"define": "no_swf_compress",
+		"doc": "Disable SWF output compression.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "NoTraces",
+		"define": "no_traces",
+		"doc": "Disable all trace calls."
+	},
+	{
+		"name": "Objc",
+		"define": "objc",
+		"doc": "Sets the hxcpp output to Objective-C++ classes. Must be defined for interop.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "OldConstructorInline",
+		"define": "old-constructor-inline",
+		"doc": "Use old constructor inlining logic (from Haxe 3.4.2) instead of the reworked version."
+	},
+	{
+		"name": "OldErrorFormat",
+		"define": "old-error-format",
+		"doc": "Use Haxe 3.x zero-based column error messages instead of new one-based format."
+	},
+	{
+		"name": "PhpPrefix",
+		"define": "php_prefix",
+		"doc": "Root namespace for generated php classes. E.g. if compiled with`-D php-prefix=some.sub`, then all classes will be generated in `\\some\\sub` namespace.",
+		"platforms": ["php"],
+		"params": ["dot-separated namespace"]
+	},
+	{
+		"name": "PhpLib",
+		"define": "php_lib",
+		"doc": "Select the name for the php lib folder.",
+		"platforms": ["php"],
+		"params": ["folder name"]
+	},
+	{
+		"name": "PhpFront",
+		"define": "php_front",
+		"doc": "Select the name for the php front file. (default: `index.php`)",
+		"platforms": ["php"],
+		"params": ["filename"]
+	},
+	{
+		"name": "PythonVersion",
+		"define": "python_version",
+		"doc": "The python version to target. (default: 3.3)",
+		"platforms": ["python"],
+		"params": ["version"]
+	},
+	{
+		"name": "RealPosition",
+		"define": "real_position",
+		"doc": "Disables Haxe source mapping when targetting C#, removes position comments in Java and Php output.",
+		"platforms": ["cs", "java", "php"]
+	},
+	{
+		"name": "ReplaceFiles",
+		"define": "replace_files",
+		"doc": "GenCommon internal.",
+		"platforms": ["cs", "java"]
+	},
+	{
+		"name": "Scriptable",
+		"define": "scriptable",
+		"doc": "GenCPP internal.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "ShallowExpose",
+		"define": "shallow-expose",
+		"doc": "Expose types to surrounding scope of Haxe generated closure without writing to window object.",
+		"platforms": ["js"]
+	},
+	{
+		"name": "SourceHeader",
+		"define": "source-header",
+		"doc": "Print value as comment on top of generated files, use '' value to disable."
+	},
+	{
+		"name": "SourceMapContent",
+		"define": "source-map-content",
+		"doc": "Include the Haxe sources as part of the JS source map.",
+		"platforms": ["js"]
+	},
+	{
+		"name": "Static",
+		"define": "static",
+		"doc": "Defined if the current target is static."
+	},
+	{
+		"name": "StdEncodingUtf8",
+		"define": "std-encoding-utf8",
+		"doc": "Force utf8 encoding for stdin, stdout and stderr",
+		"platforms": ["java", "cs", "python"]
+	},
+	{
+		"name": "Swc",
+		"define": "swc",
+		"doc": "Output a SWC instead of a SWF.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "SwfCompressLevel",
+		"define": "swf_compress_level",
+		"doc": "Set the amount of compression for the SWF output.",
+		"platforms": ["flash"],
+		"params": ["level: 1-9"]
+	},
+	{
+		"name": "SwfDebugPassword",
+		"define": "swf_debug_password",
+		"doc": "Set a password for debugging.",
+		"platforms": ["flash"],
+		"params": ["password"]
+	},
+	{
+		"name": "SwfDirectBlit",
+		"define": "swf_direct_blit",
+		"doc": "Use hardware acceleration to blit graphics.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "SwfGpu",
+		"define": "swf_gpu",
+		"doc": "Use GPU compositing features when drawing graphics.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "SwfMetadata",
+		"define": "swf_metadata",
+		"doc": "Include contents of the given file as metadata in the SWF.",
+		"platforms": ["flash"],
+		"params": ["file"]
+	},
+	{
+		"name": "SwfPreloaderFrame",
+		"define": "swf_preloader_frame",
+		"doc": "Insert empty first frame in SWF.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "SwfProtected",
+		"define": "swf_protected",
+		"doc": "Compile Haxe `private` as `protected` in the SWF instead of `public`.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "SwfScriptTimeout",
+		"define": "swf_script_timeout",
+		"doc": "Maximum ActionScript processing time before script stuck dialog box displays.",
+		"platforms": ["flash"],
+		"params": ["time in seconds"]
+	},
+	{
+		"name": "SwfUseDoAbc",
+		"define": "swf_use_doabc",
+		"doc": "Use `DoAbc` SWF-tag instead of `DoAbcDefine`.",
+		"platforms": ["flash"]
+	},
+	{
+		"name": "Sys",
+		"define": "sys",
+		"doc": "Defined for all system platforms."
+	},
+	{
+		"name": "Unsafe",
+		"define": "unsafe",
+		"doc": "Allow unsafe code when targeting C#.",
+		"platforms": ["cs"]
+	},
+	{
+		"name": "UseNekoc",
+		"define": "use_nekoc",
+		"doc": "Use `nekoc` compiler instead of the internal one.",
+		"platforms": ["neko"]
+	},
+	{
+		"name": "Utf16",
+		"define": "utf16",
+		"doc": "Defined for all platforms that use UTF-16 string encoding with UCS-2 API."
+	},
+	{
+		"name": "Vcproj",
+		"define": "vcproj",
+		"doc": "GenCPP internal.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "WarnVarShadowing",
+		"define": "warn_var_shadowing",
+		"doc": "Warn about shadowing variable declarations."
+	}
+]
diff --git a/src-json/meta.json b/src-json/meta.json
new file mode 100644
index 0000000000000000000000000000000000000000..10ac2079f37fe5f6e9cfd246b1b84dc0444e3107
--- /dev/null
+++ b/src-json/meta.json
@@ -0,0 +1,1202 @@
+[
+	{
+		"name": "Abi",
+		"metadata": ":abi",
+		"doc": "Function ABI/calling convention.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "Abstract",
+		"metadata": ":abstract",
+		"doc": "Sets the underlying class implementation as `abstract`.",
+		"platforms": ["java", "cs"]
+	},
+	{
+		"name": "Access",
+		"metadata": ":access",
+		"doc": "Forces private access to package, type or field.",
+		"params": ["Target path"],
+		"targets": ["TClass", "TClassField"],
+		"links": ["https://haxe.org/manual/lf-access-control.html"]
+	},
+	{
+		"name": "Accessor",
+		"metadata": ":accessor",
+		"doc": "Used internally by DCE to mark property accessors.",
+		"targets": ["TClassField"],
+		"internal": true
+	},
+	{
+		"name": "Allow",
+		"metadata": ":allow",
+		"doc": "Allows private access from package, type or field.",
+		"params": ["Target path"],
+		"links": ["https://haxe.org/manual/lf-access-control.html"]
+	},
+	{
+		"name": "Analyzer",
+		"metadata": ":analyzer",
+		"doc": "Used to configure the static analyzer."
+	},
+	{
+		"name": "Annotation",
+		"metadata": ":annotation",
+		"doc": "Annotation (`@interface`) definitions on `--java-lib` imports will be annotated with this metadata. Has no effect on types compiled by Haxe.",
+		"platforms": ["java"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "ArrayAccess",
+		"metadata": ":arrayAccess",
+		"doc": "Allows array access on an abstract.",
+		"targets": ["TAbstract", "TAbstractField"],
+		"links": ["https://haxe.org/manual/types-abstract-array-access.html"]
+	},
+	{
+		"name": "Ast",
+		"metadata": ":ast",
+		"doc": "Internally used to pass the AST source into the typed AST.",
+		"internal": true
+	},
+	{
+		"name": "AstSource",
+		"metadata": ":astSource",
+		"doc": "Filled by the compiler with the parsed expression of the field.",
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "AutoBuild",
+		"metadata": ":autoBuild",
+		"doc": "Extends `@:build` metadata to all extending and implementing classes.",
+		"params": ["Build macro call"],
+		"targets": ["TClass"],
+		"links": ["https://haxe.org/manual/macro-auto-build.html"]
+	},
+	{
+		"name": "Bind",
+		"metadata": ":bind",
+		"doc": "Override SWF class declaration.",
+		"platforms": ["flash"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "Bitmap",
+		"metadata": ":bitmap",
+		"doc": "Embeds given bitmap data into the class (must extend `flash.display.BitmapData`).",
+		"platforms": ["flash"],
+		"params": ["Bitmap file path"],
+		"targets": ["TClass"],
+		"links": ["https://haxe.org/manual/target-flash-resources.html"]
+	},
+	{
+		"name": "BridgeProperties",
+		"metadata": ":bridgeProperties",
+		"doc": "Creates native property bridges for all Haxe properties in this class.",
+		"platforms": ["cs"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "Build",
+		"metadata": ":build",
+		"doc": "Builds a class or enum from a macro.",
+		"params": ["Build macro call"],
+		"targets": ["TClass", "TEnum"],
+		"links": ["https://haxe.org/manual/macro-type-building.html"]
+	},
+	{
+		"name": "BuildXml",
+		"metadata": ":buildXml",
+		"doc": "Specify XML data to be injected into `Build.xml`.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "BypassAccessor",
+		"metadata": ":bypassAccessor",
+		"doc": "Do not call property accessor method and access the field directly.",
+		"targets": ["TExpr"],
+		"links": ["https://haxe.org/manual/class-field-property.html"]
+	},
+	{
+		"name": "Callable",
+		"metadata": ":callable",
+		"doc": "Abstract forwards call to its underlying type.",
+		"targets": ["TAbstract"]
+	},
+	{
+		"name": "Class",
+		"metadata": ":class",
+		"doc": "Used internally to annotate an enum that will be generated as a class.",
+		"platforms": ["java", "cs"],
+		"targets": ["TEnum"],
+		"internal": true
+	},
+	{
+		"name": "ClassCode",
+		"metadata": ":classCode",
+		"doc": "Used to inject platform-native code into a class.",
+		"platforms": ["java", "cs"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "Commutative",
+		"metadata": ":commutative",
+		"doc": "Declares an abstract operator as commutative.",
+		"targets": ["TAbstractField"],
+		"links": ["https://haxe.org/manual/types-abstract-operator-overloading.html"]
+	},
+	{
+		"name": "CompilerGenerated",
+		"metadata": ":compilerGenerated",
+		"doc": "Marks a field as generated by the compiler. Should not be used by the end user.",
+		"platforms": ["java", "cs"]
+	},
+	{
+		"name": "Const",
+		"metadata": ":const",
+		"doc": "Allows a type parameter to accept expression values.",
+		"targets": ["TTypeParameter"]
+	},
+	{
+		"name": "CoreApi",
+		"metadata": ":coreApi",
+		"doc": "Identifies this class as a core API class (forces API check).",
+		"targets": ["TClass", "TEnum", "TTypedef", "TAbstract"]
+	},
+	{
+		"name": "CoreType",
+		"metadata": ":coreType",
+		"doc": "Identifies an abstract as core type so that it requires no implementation.",
+		"targets": ["TAbstract"],
+		"links": ["https://haxe.org/manual/types-abstract-core-type.html"]
+	},
+	{
+		"name": "CppFileCode",
+		"metadata": ":cppFileCode",
+		"doc": "Code to be injected into generated cpp file.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "CppInclude",
+		"metadata": ":cppInclude",
+		"doc": "File to be included in generated cpp file.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "CppNamespaceCode",
+		"metadata": ":cppNamespaceCode",
+		"doc": "",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "CsNative",
+		"metadata": ":csNative",
+		"doc": "Automatically added by `--net-lib` on classes generated from .NET DLL files.",
+		"platforms": ["cs"],
+		"targets": ["TClass", "TEnum"],
+		"internal": true
+	},
+	{
+		"name": "Dce",
+		"metadata": ":dce",
+		"doc": "Forces dead code elimination even when `--dce full` is not specified.",
+		"targets": ["TClass", "TEnum"],
+		"links": ["https://haxe.org/manual/cr-dce.html"]
+	},
+	{
+		"name": "Debug",
+		"metadata": ":debug",
+		"doc": "Forces debug information to be generated into the SWF even without `--debug`.",
+		"platforms": ["flash"],
+		"targets": ["TClass", "TClassField"]
+	},
+	{
+		"name": "Decl",
+		"metadata": ":decl",
+		"doc": "",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "DefParam",
+		"metadata": ":defParam",
+		"doc": "Default function argument value loaded from the SWF and used for documentation in Genxml.",
+		"platforms": ["flash"],
+		"internal": true
+	},
+	{
+		"name": "Delegate",
+		"metadata": ":delegate",
+		"doc": "Automatically added by `--net-lib` on delegates.",
+		"platforms": ["cs"],
+		"targets": ["TAbstract"]
+	},
+	{
+		"name": "Depend",
+		"metadata": ":depend",
+		"doc": "",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "Deprecated",
+		"metadata": ":deprecated",
+		"doc": "Mark a type or field as deprecated."
+	},
+	{
+		"name": "DirectlyUsed",
+		"metadata": ":directlyUsed",
+		"doc": "Marks types that are directly referenced by non-extern code.",
+		"internal": true
+	},
+	{
+		"name": "DisplayOverride",
+		"metadata": ":?display.override",
+		"doc": "Internally used to mark override fields for completion",
+		"internal": true
+	},
+	{
+		"name": "DynamicObject",
+		"metadata": ":dynamicObject",
+		"doc": "Used internally to identify the Dynamic Object implementation.",
+		"platforms": ["java", "cs"],
+		"targets": ["TClass"],
+		"internal": true
+	},
+	{
+		"name": "Eager",
+		"metadata": ":eager",
+		"doc": "Forces typedefs to be followed early.",
+		"targets": ["TTypedef"]
+	},
+	{
+		"name": "Enum",
+		"metadata": ":enum",
+		"doc": "Defines finite value sets to abstract definitions.",
+		"targets": ["TAbstract"],
+		"links": ["https://haxe.org/manual/types-abstract-enum.html"]
+	},
+	{
+		"name": "EnumConstructorParam",
+		"metadata": ":enumConstructorParam",
+		"doc": "Used internally to annotate GADT type parameters.",
+		"targets": ["TClass"],
+		"internal": true
+	},
+	{
+		"name": "Event",
+		"metadata": ":event",
+		"doc": "Automatically added by `--net-lib` on events. Has no effect on types compiled by Haxe.",
+		"platforms": ["cs"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "Exhaustive",
+		"metadata": ":exhaustive",
+		"doc": "Used internally to mark that a switch is exhaustive.",
+		"internal": true,
+		"links": ["https://haxe.org/manual/lf-pattern-matching-exhaustiveness.html"]
+	},
+	{
+		"name": "Expose",
+		"metadata": ":expose",
+		"doc": "Includes the class or field in Haxe exports (default name is the classpath).",
+		"platforms": ["js", "lua"],
+		"params": ["name"],
+		"links": ["https://haxe.org/manual/target-javascript-expose.html"]
+	},
+	{
+		"name": "Extern",
+		"metadata": ":extern",
+		"doc": "Marks the field as extern so it is not generated.",
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "File",
+		"metadata": ":file",
+		"doc": "Includes a given binary file into the target SWF and associates it with the class (must extend `flash.utils.ByteArray`).",
+		"platforms": ["flash"],
+		"params": ["File path"],
+		"targets": ["TClass"],
+		"links": ["https://haxe.org/manual/target-flash-resources.html"]
+	},
+	{
+		"name": "FileXml",
+		"metadata": ":fileXml",
+		"doc": "Include a given XML attribute snippet in the `Build.xml` entry for the file.",
+		"platforms": ["cpp"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "Final",
+		"metadata": ":final",
+		"doc": "Prevents a class or interface from being extended or a method from being overridden. Deprecated by the keyword `final`.",
+		"targets": ["TClass", "TClassField"],
+		"links": ["https://haxe.org/manual/class-field-final.html"]
+	},
+	{
+		"devcomment": "this used to have UsedOn TObjectDecl(_)",
+		"name": "Fixed",
+		"metadata": ":fixed",
+		"doc": "Declares an anonymous object to have fixed fields."
+	},
+	{
+		"name": "FlashProperty",
+		"metadata": ":flash.property",
+		"doc": "",
+		"platforms": ["flash"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "FlatEnum",
+		"metadata": ":flatEnum",
+		"doc": "Internally used to mark an enum as being flat, i.e. having no function constructors.",
+		"targets": ["TEnum"],
+		"internal": true
+	},
+	{
+		"name": "Font",
+		"metadata": ":font",
+		"doc": "Embeds the given TrueType font into the class (must extend `flash.text.Font`).",
+		"params": ["TTF path", "Range String"],
+		"targets": ["TClass"],
+		"links": ["https://haxe.org/manual/target-flash-resources.html"]
+	},
+	{
+		"name": "ForLoopVariable",
+		"metadata": ":forLoopVariable",
+		"doc": "Internally used to mark for-loop variables.",
+		"internal": true
+	},
+	{
+		"name": "Forward",
+		"metadata": ":forward",
+		"doc": "Forwards field access to underlying type.",
+		"params": ["List of field names"],
+		"targets": ["TAbstract"],
+		"links": ["https://haxe.org/manual/types-abstract-forward.html"]
+	},
+	{
+		"name": "ForwardStatics",
+		"metadata": ":forwardStatics",
+		"doc": "Forwards static field access to underlying type.",
+		"params": ["List of field names"],
+		"targets": ["TAbstract"],
+		"links": ["https://haxe.org/manual/types-abstract-forward.html"]
+	},
+	{
+		"name": "From",
+		"metadata": ":from",
+		"doc": "Specifies that the field of the abstract is a cast operation from the type identified in the function.",
+		"targets": ["TAbstractField"],
+		"links": ["https://haxe.org/manual/types-abstract-implicit-casts.html"]
+	},
+	{
+		"name": "FunctionCode",
+		"metadata": ":functionCode",
+		"doc": "Used to inject platform-native code into a function.",
+		"platforms": ["cpp", "java", "cs"]
+	},
+	{
+		"name": "FunctionTailCode",
+		"metadata": ":functionTailCode",
+		"doc": "",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "Generic",
+		"metadata": ":generic",
+		"doc": "Marks a class or class field as generic so each type parameter combination generates its own type/field.",
+		"links": ["https://haxe.org/manual/type-system-generic.html"]
+	},
+	{
+		"name": "GenericBuild",
+		"metadata": ":genericBuild",
+		"doc": "Builds instances of a type using the specified macro.",
+		"targets": ["TClass"]
+	},
+	{
+		"name": "GenericInstance",
+		"metadata": ":genericInstance",
+		"doc": "Internally used to mark instances of `@:generic` methods.",
+		"targets": ["TClassField"],
+		"internal": true
+	},
+	{
+		"name": "Getter",
+		"metadata": ":getter",
+		"doc": "Generates a native getter function on the given field.",
+		"platforms": ["flash"],
+		"params": ["Class field name"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "Hack",
+		"metadata": ":hack",
+		"doc": "Allows extending classes marked as `@:final`. Not guaranteed to work on all targets.",
+		"targets": ["TClass"]
+	},
+	{
+		"name": "HasUntyped",
+		"metadata": ":has_untyped",
+		"doc": "Used by the typer to mark fields that have untyped expressions.",
+		"internal": true
+	},
+	{
+		"name": "HaxeGeneric",
+		"metadata": ":haxeGeneric",
+		"doc": "Used internally to annotate non-native generic classes.",
+		"platforms": ["cs"],
+		"targets": ["TClass", "TEnum"],
+		"internal": true
+	},
+	{
+		"name": "HeaderClassCode",
+		"metadata": ":headerClassCode",
+		"doc": "Code to be injected into the generated class, in the header.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "HeaderCode",
+		"metadata": ":headerCode",
+		"doc": "Code to be injected into the generated header file.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "HeaderInclude",
+		"metadata": ":headerInclude",
+		"doc": "File to be included in generated header file.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "HeaderNamespaceCode",
+		"metadata": ":headerNamespaceCode",
+		"doc": "",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "HlNative",
+		"metadata": ":hlNative",
+		"doc": "Specifies `hdll` name and function prefix for native functions.",
+		"platforms": ["hl"],
+		"targets": ["TClass", "TClassField"]
+	},
+	{
+		"name": "HxGen",
+		"metadata": ":hxGen",
+		"doc": "Annotates that an extern class was generated by Haxe.",
+		"platforms": ["java", "cs"],
+		"targets": ["TClass", "TEnum"]
+	},
+	{
+		"name": "IfFeature",
+		"metadata": ":ifFeature",
+		"doc": "Causes a field to be kept by DCE if the given feature is part of the compilation.",
+		"params": ["Feature name"],
+		"targets": ["TClassField"],
+		"links": ["https://haxe.org/manual/cr-dce.html"]
+	},
+	{
+		"name": "Impl",
+		"metadata": ":impl",
+		"doc": "Used internally to mark abstract implementation fields.",
+		"targets": ["TAbstractField"],
+		"internal": true
+	},
+	{
+		"name": "PythonImport",
+		"metadata": ":pythonImport",
+		"doc": "Generates python import statement for extern classes.",
+		"platforms": ["python"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "ImplicitCast",
+		"metadata": ":implicitCast",
+		"doc": "Generated automatically on the AST when an implicit abstract cast happens.",
+		"targets": ["TExpr"],
+		"internal": true
+	},
+	{
+		"name": "ImplicitReturn",
+		"metadata": ":implicitReturn",
+		"doc": "Generated automatically on the AST when an implicit return is inserted for arrow function.",
+		"targets": ["TExpr"],
+		"internal": true
+	},
+	{
+		"name": "Include",
+		"metadata": ":include",
+		"doc": "",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "InitPackage",
+		"metadata": ":initPackage",
+		"doc": "Some weird thing for Genjs we want to remove someday.",
+		"platforms": ["js"],
+		"internal": true
+	},
+	{
+		"name": "Inline",
+		"metadata": ":inline",
+		"doc": "Inserted by the parser in case of `inline expr` and `inline function`.",
+		"targets": ["TExpr"]
+	},
+	{
+		"name": "InlineConstructorArgument",
+		"metadata": ":inlineConstructorArgument",
+		"doc": "Internally used to mark expressions that were passed as arguments of an inlined constructor.",
+		"internal": true
+	},
+	{
+		"name": "Internal",
+		"metadata": ":internal",
+		"doc": "Generates the annotated field/class with 'internal' access.",
+		"platforms": ["java", "cs"],
+		"targets": ["TClass", "TEnum", "TClassField"]
+	},
+	{
+		"name": "IsVar",
+		"metadata": ":isVar",
+		"doc": "Forces a physical field to be generated for properties that otherwise would not require one.",
+		"targets": ["TClassField"],
+		"links": ["https://haxe.org/manual/class-field-property-rules.html"]
+	},
+	{
+		"name": "JavaCanonical",
+		"metadata": ":javaCanonical",
+		"doc": "Used by the Java target to annotate the canonical path of the type.",
+		"platforms": ["java"],
+		"params": ["Output type package", "Output type name"],
+		"targets": ["TClass", "TEnum"]
+	},
+	{
+		"name": "JavaNative",
+		"metadata": ":javaNative",
+		"doc": "Automatically added by `--java-lib` on classes generated from JAR/class files.",
+		"platforms": ["java"],
+		"targets": ["TClass", "TEnum"],
+		"internal": true
+	},
+	{
+		"name": "JsRequire",
+		"metadata": ":jsRequire",
+		"doc": "Generate JavaScript module require expression for given extern.",
+		"platforms": ["js"],
+		"targets": ["TClass"],
+		"links": ["https://haxe.org/manual/target-javascript-require.html"]
+	},
+	{
+		"name": "LuaRequire",
+		"metadata": ":luaRequire",
+		"doc": "Generate Lua module require expression for given extern.",
+		"platforms": ["lua"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "LuaDotMethod",
+		"metadata": ":luaDotMethod",
+		"doc": "Indicates that the given extern type instance should have dot-style invocation for methods instead of colon.",
+		"platforms": ["lua"]
+	},
+	{
+		"name": "Keep",
+		"metadata": ":keep",
+		"doc": "Causes a field or type to be kept by DCE.",
+		"links": ["https://haxe.org/manual/cr-dce.html"]
+	},
+	{
+		"name": "KeepInit",
+		"metadata": ":keepInit",
+		"doc": "Causes a class to be kept by DCE even if all its field are removed.",
+		"targets": ["TClass"],
+		"links": ["https://haxe.org/manual/cr-dce.html"]
+	},
+	{
+		"name": "KeepSub",
+		"metadata": ":keepSub",
+		"doc": "Extends `@:keep` metadata to all implementing and extending classes.",
+		"targets": ["TClass"],
+		"links": ["https://haxe.org/manual/cr-dce.html"]
+	},
+	{
+		"name": "LibType",
+		"metadata": ":libType",
+		"doc": "Used by `--net-lib` and `--java-lib` to mark a class that should not be checked (overrides, interfaces, etc) by the type loader.",
+		"platforms": ["java", "cs"],
+		"targets": ["TClass"],
+		"internal": true
+	},
+	{
+		"name": "LoopLabel",
+		"metadata": ":loopLabel",
+		"doc": "Mark loop and break expressions with a label to support breaking from within switch.",
+		"internal": true
+	},
+	{
+		"name": "Markup",
+		"metadata": ":markup",
+		"doc": "Used as a result of inline XML parsing.",
+		"links": ["https://haxe.org/manual/lf-markup.html"]
+	},
+	{
+		"name": "Meta",
+		"metadata": ":meta",
+		"doc": "Internally used to mark a class field as being the metadata field.",
+		"internal": true
+	},
+	{
+		"name": "Macro",
+		"metadata": ":macro",
+		"doc": "(deprecated)"
+	},
+	{
+		"name": "MaybeUsed",
+		"metadata": ":maybeUsed",
+		"doc": "Internally used by DCE to mark fields that might be kept.",
+		"internal": true
+	},
+	{
+		"name": "MergeBlock",
+		"metadata": ":mergeBlock",
+		"doc": "Merge the annotated block into the current scope.",
+		"targets": ["TExpr"]
+	},
+	{
+		"name": "MultiReturn",
+		"metadata": ":multiReturn",
+		"doc": "Annotates an extern class as the result of multi-return function.",
+		"platforms": ["lua"],
+		"targets": ["TClass"],
+		"links": ["https://haxe.org/manual/target-lua-multireturns.html"]
+	},
+	{
+		"name": "MultiType",
+		"metadata": ":multiType",
+		"doc": "Specifies that an abstract chooses its this-type from its `@:to` functions.",
+		"params": ["Relevant type parameters"],
+		"targets": ["TAbstract"]
+	},
+	{
+		"name": "Native",
+		"metadata": ":native",
+		"doc": "Rewrites the path of a class or enum during generation.",
+		"params": ["Output type path"],
+		"targets": ["TClass", "TEnum"],
+		"links": ["https://haxe.org/manual/lf-externs.html"]
+	},
+	{
+		"name": "NativeChildren",
+		"metadata": ":nativeChildren",
+		"doc": "Annotates that all children from a type should be treated as if it were an extern definition - platform native.",
+		"platforms": ["java", "cs"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "NativeGen",
+		"metadata": ":nativeGen",
+		"doc": "Annotates that a type should be treated as if it were an extern definition - platform native.",
+		"platforms": ["java", "cs", "python"],
+		"targets": ["TClass", "TEnum"]
+	},
+	{
+		"name": "NativeGeneric",
+		"metadata": ":nativeGeneric",
+		"doc": "Used internally to annotate native generic classes.",
+		"platforms": ["cs"],
+		"targets": ["TClass", "TEnum"],
+		"internal": true
+	},
+	{
+		"name": "NativeProperty",
+		"metadata": ":nativeProperty",
+		"doc": "Use native properties which will execute even with dynamic usage.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "NativeStaticExtension",
+		"metadata": ":nativeStaticExtension",
+		"doc": "Converts static function syntax into member call.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "NoCompletion",
+		"metadata": ":noCompletion",
+		"doc": "Prevents the compiler from suggesting completion on this field or type.",
+		"targets": ["TClassField"],
+		"links": ["https://haxe.org/manual/cr-completion.html"]
+	},
+	{
+		"name": "NoClosure",
+		"metadata": ":noClosure",
+		"doc": "Prevents a method or all methods in a class from being used as a value.",
+		"targets": ["TClass", "TClassField"]
+	},
+	{
+		"name": "NoDebug",
+		"metadata": ":noDebug",
+		"doc": "Does not generate debug information even if `--debug` is set.",
+		"platforms": ["flash", "cpp"],
+		"targets": ["TClass", "TClassField"]
+	},
+	{
+		"name": "NoDoc",
+		"metadata": ":noDoc",
+		"doc": "Prevents a type from being included in documentation generation."
+	},
+	{
+		"name": "NoExpr",
+		"metadata": ":noExpr",
+		"doc": "Internally used to mark abstract fields which have no expression by design.",
+		"internal": true
+	},
+	{
+		"name": "NoImportGlobal",
+		"metadata": ":noImportGlobal",
+		"doc": "Prevents a static field from being imported with `import Class.*`.",
+		"targets": ["TAnyField"]
+	},
+	{
+		"name": "NonVirtual",
+		"metadata": ":nonVirtual",
+		"doc": "Declares function to be non-virtual in cpp.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "NoPackageRestrict",
+		"metadata": ":noPackageRestrict",
+		"doc": "Allows a module to be accessed across all targets if found on its first type.",
+		"internal": true
+	},
+	{
+		"name": "NoPrivateAccess",
+		"metadata": ":noPrivateAccess",
+		"doc": "Disallow private access to anything for the annotated expression.",
+		"targets": ["TExpr"]
+	},
+	{
+		"name": "NoStack",
+		"metadata": ":noStack",
+		"doc": "",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "NotNull",
+		"metadata": ":notNull",
+		"doc": "Declares an abstract type as not accepting null values.",
+		"targets": ["TAbstract"],
+		"links": ["https://haxe.org/manual/types-nullability.html"]
+	},
+	{
+		"name": "NoUsing",
+		"metadata": ":noUsing",
+		"doc": "Prevents a field from being used with static extension.",
+		"targets": ["TClassField"],
+		"links": ["https://haxe.org/manual/lf-static-extension.html"]
+	},
+	{
+		"name": "Ns",
+		"metadata": ":ns",
+		"doc": "Internally used by the SWF generator to handle namespaces.",
+		"platforms": ["flash"],
+		"internal": true
+	},
+	{
+		"name": "NullSafety",
+		"metadata": ":nullSafety",
+		"doc": "Enables null safety for classes or fields. Disables null safety for classes, fields or expressions if provided with `Off` as an argument.",
+		"params": ["Off | Loose | Strict"],
+		"targets": ["TClass", "TClassField", "TExpr"],
+		"links": ["https://haxe.org/manual/cr-null-safety.html"]
+	},
+	{
+		"name": "Objc",
+		"metadata": ":objc",
+		"doc": "Declares a class or interface that is used to interoperate with Objective-C code.",
+		"platforms": ["cpp"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "ObjcProtocol",
+		"metadata": ":objcProtocol",
+		"doc": "Associates an interface with, or describes a function in, a native Objective-C protocol.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "Op",
+		"metadata": ":op",
+		"doc": "Declares an abstract field as being an operator overload.",
+		"params": ["The operation"],
+		"targets": ["TAbstractField"],
+		"links": ["https://haxe.org/manual/types-abstract-operator-overloading.html"]
+	},
+	{
+		"name": "Optional",
+		"metadata": ":optional",
+		"doc": "Marks the field of a structure as optional.",
+		"targets": ["TClassField"],
+		"links": ["https://haxe.org/manual/types-nullability-optional-arguments.html"]
+	},
+	{
+		"name": "Overload",
+		"metadata": ":overload",
+		"doc": "Allows the field to be called with different argument types.",
+		"params": ["Function specification (no expression)"],
+		"targets": ["TClassField"],
+		"links": ["https://haxe.org/manual/target-javascript-external-libraries.html"]
+	},
+	{
+		"name": "Persistent",
+		"metadata": ":persistent",
+		"doc": "Keeps the value of static variables in macro context across compilations.",
+		"targets": ["TAnyField"],
+		"platforms": ["eval"]
+	},
+	{
+		"name": "PhpGlobal",
+		"metadata": ":phpGlobal",
+		"doc": "Indicates that static fields of an extern class actually are located in the global PHP namespace.",
+		"platforms": ["php"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "PhpClassConst",
+		"metadata": ":phpClassConst",
+		"doc": "Indicates that a static var of an extern class is a PHP class constant.",
+		"platforms": ["php"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "PhpMagic",
+		"metadata": ":phpMagic",
+		"doc": "Treat annotated field as special PHP magic field - this meta makes compiler avoid renaming such fields on generating PHP code.",
+		"platforms": ["php"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "PhpNoConstructor",
+		"metadata": ":phpNoConstructor",
+		"doc": "Special meta for extern classes which do not have native constructor in PHP, but need a constructor in Haxe extern.",
+		"platforms": ["php"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "Pos",
+		"metadata": ":pos",
+		"doc": "Sets the position of a reified expression.",
+		"params": ["Position"],
+		"targets": ["TExpr"],
+		"links": ["https://haxe.org/manual/macro-reification.html"]
+	},
+	{
+		"name": "Public",
+		"metadata": ":public",
+		"doc": "Marks a class field as being public.",
+		"targets": ["TClassField"],
+		"internal": true
+	},
+	{
+		"name": "PublicFields",
+		"metadata": ":publicFields",
+		"doc": "Forces all class fields of inheriting classes to be public.",
+		"targets": ["TClass"]
+	},
+	{
+		"name": "Private",
+		"metadata": ":private",
+		"doc": "Marks a class field as being private.",
+		"platforms": ["cs"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "PrivateAccess",
+		"metadata": ":privateAccess",
+		"doc": "Allow private access to anything for the annotated expression.",
+		"targets": ["TExpr"]
+	},
+	{
+		"name": "Protected",
+		"metadata": ":protected",
+		"doc": "Marks a class field as being protected.",
+		"platforms": ["cs", "java", "flash"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "Property",
+		"metadata": ":property",
+		"doc": "Marks a property field to be compiled as a native C# property.",
+		"platforms": ["cs"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "Pure",
+		"metadata": ":pure",
+		"doc": "Marks a class field, class or expression as pure (side-effect free).",
+		"targets": ["TClass", "TClassField", "TExpr"]
+	},
+	{
+		"name": "ReadOnly",
+		"metadata": ":readOnly",
+		"doc": "Generates a field with the `readonly` native keyword.",
+		"platforms": ["cs"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "RealPath",
+		"metadata": ":realPath",
+		"doc": "Internally used on `@:native` types to retain original path information.",
+		"internal": true
+	},
+	{
+		"name": "Remove",
+		"metadata": ":remove",
+		"doc": "Causes an interface to be removed from all implementing classes before generation.",
+		"targets": ["TClass"]
+	},
+	{
+		"name": "Require",
+		"metadata": ":require",
+		"doc": "Allows access to a field only if the specified compiler flag is set.",
+		"params": ["Compiler flag to check"],
+		"targets": ["TClassField"],
+		"links": ["https://haxe.org/manual/lf-condition-compilation.html"]
+	},
+	{
+		"name": "RequiresAssign",
+		"metadata": ":requiresAssign",
+		"doc": "Used internally to mark certain abstract operator overloads.",
+		"internal": true
+	},
+	{
+		"name": "Resolve",
+		"metadata": ":resolve",
+		"doc": "Abstract fields marked with this metadata can be used to resolve unknown fields.",
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "Rtti",
+		"metadata": ":rtti",
+		"doc": "Adds runtime type information.",
+		"targets": ["TClass"],
+		"links": ["https://haxe.org/manual/cr-rtti.html"]
+	},
+	{
+		"name": "Runtime",
+		"metadata": ":runtime",
+		"doc": "",
+		"internal": true
+	},
+	{
+		"name": "RuntimeValue",
+		"metadata": ":runtimeValue",
+		"doc": "Marks an abstract as being a runtime value.",
+		"targets": ["TAbstract"]
+	},
+	{
+		"name": "Scalar",
+		"metadata": ":scalar",
+		"doc": "Used by hxcpp to mark a custom coreType abstract.",
+		"platforms": ["cpp"],
+		"targets": ["TAbstract"]
+	},
+	{
+		"name": "SelfCall",
+		"metadata": ":selfCall",
+		"doc": "Translates method calls into calling object directly.",
+		"platforms": ["js", "lua"],
+		"targets": ["TClassField"],
+		"links": ["https://haxe.org/manual/target-javascript-external-libraries.html"]
+	},
+	{
+		"name": "Semantics",
+		"metadata": ":semantics",
+		"doc": "The native semantics of the type.",
+		"params": ["value | reference | variable"],
+		"targets": ["TClass", "TTypedef", "TAbstract"]
+	},
+	{
+		"name": "Setter",
+		"metadata": ":setter",
+		"doc": "Generates a native setter function on the given field.",
+		"platforms": ["flash"],
+		"params": ["Class field name"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "SkipCtor",
+		"metadata": ":skipCtor",
+		"doc": "Used internally to generate a constructor as if it were a native type (no `__hx_ctor`).",
+		"platforms": ["java", "cs"],
+		"internal": true
+	},
+	{
+		"name": "SkipReflection",
+		"metadata": ":skipReflection",
+		"doc": "Used internally to annotate a field that shouldn't have its reflection data generated.",
+		"platforms": ["java", "cs"],
+		"targets": ["TClassField"],
+		"internal": true
+	},
+	{
+		"name": "Sound",
+		"metadata": ":sound",
+		"doc": "Includes a given .wav or .mp3 file into the target SWF and associates it with the class (must extend `flash.media.Sound`).",
+		"platforms": ["flash"],
+		"params": ["File path"],
+		"targets": ["TClass"],
+		"links": ["https://haxe.org/manual/target-flash-resources.html"]
+	},
+	{
+		"name": "SourceFile",
+		"metadata": ":sourceFile",
+		"doc": "Source code filename for external class.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "StackOnly",
+		"metadata": ":stackOnly",
+		"doc": "Instances of this type can only appear on the stack.",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "StaticExtension",
+		"metadata": "haxe.internal.static_extension",
+		"doc": "Used internally to mark static extension fields.",
+		"internal": true
+	},
+	{
+		"name": "StoredTypedExpr",
+		"metadata": ":storedTypedExpr",
+		"doc": "Used internally to reference a typed expression returned from a macro.",
+		"internal": true
+	},
+	{
+		"name": "Strict",
+		"metadata": ":strict",
+		"doc": "Used to declare a native C# attribute or a native Java metadata; is type checked.",
+		"platforms": ["java", "cs"]
+	},
+	{
+		"name": "Struct",
+		"metadata": ":struct",
+		"doc": "Marks a class definition as a struct.",
+		"platforms": ["cs", "hl"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "StructAccess",
+		"metadata": ":structAccess",
+		"doc": "Marks an extern class as using struct access (`.`) not pointer (`->`).",
+		"platforms": ["cpp"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "StructInit",
+		"metadata": ":structInit",
+		"doc": "Allows one to initialize the class with a structure that matches constructor parameters.",
+		"targets": ["TClass"]
+	},
+	{
+		"name": "SuppressWarnings",
+		"metadata": ":suppressWarnings",
+		"doc": "Adds a `SuppressWarnings` annotation for the generated Java class.",
+		"platforms": ["java"],
+		"targets": ["TClass"]
+	},
+	{
+		"name": "TemplatedCall",
+		"metadata": ":templatedCall",
+		"doc": "Indicates that the first parameter of static call should be treated as a template argument.",
+		"platforms": ["cpp"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "Throws",
+		"metadata": ":throws",
+		"doc": "Adds a `throws` declaration to the generated function.",
+		"platforms": ["java"],
+		"params": ["Type as String"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "This",
+		"metadata": ":this",
+		"doc": "Internally used to pass a `this` expression to macros.",
+		"targets": ["TExpr"],
+		"internal": true
+	},
+	{
+		"name": "To",
+		"metadata": ":to",
+		"doc": "Specifies that the field of the abstract is a cast operation to the type identified in the function.",
+		"targets": ["TAbstractField"],
+		"links": ["https://haxe.org/manual/types-abstract-implicit-casts.html"]
+	},
+	{
+		"name": "ToString",
+		"metadata": ":toString",
+		"doc": "Internally used.",
+		"internal": true
+	},
+	{
+		"name": "Transient",
+		"metadata": ":transient",
+		"doc": "Adds the `transient` flag to the class field.",
+		"platforms": ["java"],
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "ValueUsed",
+		"metadata": ":valueUsed",
+		"doc": "Internally used by DCE to mark an abstract value as used.",
+		"internal": true
+	},
+	{
+		"name": "Volatile",
+		"metadata": ":volatile",
+		"doc": "",
+		"platforms": ["java", "cs"]
+	},
+	{
+		"name": "UnifyMinDynamic",
+		"metadata": ":unifyMinDynamic",
+		"doc": "Allows a collection of types to unify to `Dynamic`.",
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "Unreflective",
+		"metadata": ":unreflective",
+		"doc": "",
+		"platforms": ["cpp"]
+	},
+	{
+		"name": "Unsafe",
+		"metadata": ":unsafe",
+		"doc": "Declares a class, or a method with the C#'s `unsafe` flag.",
+		"platforms": ["cs"],
+		"targets": ["TClass", "TClassField"]
+	},
+	{
+		"name": "Used",
+		"metadata": ":used",
+		"doc": "Internally used by DCE to mark a class or field as used.",
+		"internal": true
+	},
+	{
+		"name": "Using",
+		"metadata": ":using",
+		"doc": "Automatically uses the argument types as static extensions for the annotated type.",
+		"targets": ["TClass", "TEnum", "TAbstract"],
+		"links": ["https://haxe.org/manual/lf-static-extension-metadata.html"]
+	},
+	{
+		"name": "Value",
+		"metadata": ":value",
+		"doc": "Used to store default values for fields and function arguments.",
+		"targets": ["TClassField"]
+	},
+	{
+		"name": "Void",
+		"metadata": ":void",
+		"doc": "Use Cpp native `void` return type.",
+		"platforms": ["cpp"]
+	}
+]
\ No newline at end of file
diff --git a/src/generators/codegen.ml b/src/codegen/codegen.ml
similarity index 61%
rename from src/generators/codegen.ml
rename to src/codegen/codegen.ml
index 1e9b08436b55962a54862b5833c8b6a841f92493..7a1bc02cb802ad014fe51e00d5f6547265d3a6d1 100644
--- a/src/generators/codegen.ml
+++ b/src/codegen/codegen.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -26,94 +26,6 @@ open Globals
 (* -------------------------------------------------------------------------- *)
 (* TOOLS *)
 
-(* Collection of functions that return expressions *)
-module ExprBuilder = struct
-	let make_static_this c p =
-		let ta = TAnon { a_fields = c.cl_statics; a_status = ref (Statics c) } in
-		mk (TTypeExpr (TClassDecl c)) ta p
-
-	let make_static_field c cf p =
-		let e_this = make_static_this c p in
-		mk (TField(e_this,FStatic(c,cf))) cf.cf_type p
-
-	let make_int com i p =
-		mk (TConst (TInt (Int32.of_int i))) com.basic.tint p
-
-	let make_float com f p =
-		mk (TConst (TFloat f)) com.basic.tfloat p
-
-	let make_bool com b p =
-		mk (TConst(TBool b)) com.basic.tbool p
-
-	let make_string com s p =
-		mk (TConst (TString s)) com.basic.tstring p
-
-	let make_null t p =
-		mk (TConst TNull) t p
-
-	let make_local v p =
-		mk (TLocal v) v.v_type p
-
-	let make_const_texpr com ct p = match ct with
-		| TString s -> mk (TConst (TString s)) com.basic.tstring p
-		| TInt i -> mk (TConst (TInt i)) com.basic.tint p
-		| TFloat f -> mk (TConst (TFloat f)) com.basic.tfloat p
-		| TBool b -> mk (TConst (TBool b)) com.basic.tbool p
-		| TNull -> mk (TConst TNull) (com.basic.tnull (mk_mono())) p
-		| _ -> error "Unsupported constant" p
-end
-
-let field e name t p =
-	mk (TField (e,try quick_field e.etype name with Not_found -> assert false)) t p
-
-let fcall e name el ret p =
-	let ft = tfun (List.map (fun e -> e.etype) el) ret in
-	mk (TCall (field e name ft p,el)) ret p
-
-let mk_parent e =
-	mk (TParenthesis e) e.etype e.epos
-
-let binop op a b t p =
-	mk (TBinop (op,a,b)) t p
-
-let index com e index t p =
-	mk (TArray (e,mk (TConst (TInt (Int32.of_int index))) com.basic.tint p)) t p
-
-let maybe_cast e t =
-	try
-		type_eq EqDoNotFollowNull e.etype t;
-		e
-	with
-		Unify_error _ -> mk (TCast(e,None)) t e.epos
-
-let type_constant com c p =
-	let t = com.basic in
-	match c with
-	| Int s ->
-		if String.length s > 10 && String.sub s 0 2 = "0x" then error "Invalid hexadecimal integer" p;
-		(try mk (TConst (TInt (Int32.of_string s))) t.tint p
-		with _ -> mk (TConst (TFloat s)) t.tfloat p)
-	| Float f -> mk (TConst (TFloat f)) t.tfloat p
-	| String s -> mk (TConst (TString s)) t.tstring p
-	| Ident "true" -> mk (TConst (TBool true)) t.tbool p
-	| Ident "false" -> mk (TConst (TBool false)) t.tbool p
-	| Ident "null" -> mk (TConst TNull) (t.tnull (mk_mono())) p
-	| Ident t -> error ("Invalid constant :  " ^ t) p
-	| Regexp _ -> error "Invalid constant" p
-
-let rec type_constant_value com (e,p) =
-	match e with
-	| EConst c ->
-		type_constant com c p
-	| EParenthesis e ->
-		type_constant_value com e
-	| EObjectDecl el ->
-		mk (TObjectDecl (List.map (fun ((n,_),e) -> n, type_constant_value com e) el)) (TAnon { a_fields = PMap.empty; a_status = ref Closed }) p
-	| EArrayDecl el ->
-		mk (TArrayDecl (List.map (type_constant_value com) el)) (com.basic.tarray t_dynamic) p
-	| _ ->
-		error "Constant value expected" p
-
 let rec has_properties c =
 	List.exists (fun f ->
 		match f.cf_kind with
@@ -144,7 +56,7 @@ let add_property_field com c =
 	| _ ->
 		let fields,values = List.fold_left (fun (fields,values) (n,v) ->
 			let cf = mk_field n com.basic.tstring p null_pos in
-			PMap.add n cf fields,(n, ExprBuilder.make_string com v p) :: values
+			PMap.add n cf fields,((n,null_pos,NoQuotes),Texpr.Builder.make_string com.basic v p) :: values
 		) (PMap.empty,[]) props in
 		let t = mk_anon fields in
 		let e = mk (TObjectDecl values) t p in
@@ -162,48 +74,6 @@ let escape_res_name name allow_dirs =
 		else
 			"-x" ^ (string_of_int (Char.code chr))) name
 
-(* -------------------------------------------------------------------------- *)
-(* BUILD META DATA OBJECT *)
-
-let build_metadata com t =
-	let api = com.basic in
-	let p, meta, fields, statics = (match t with
-		| TClassDecl c ->
-			let fields = List.map (fun f -> f.cf_name,f.cf_meta) (c.cl_ordered_fields @ (match c.cl_constructor with None -> [] | Some f -> [{ f with cf_name = "_" }])) in
-			let statics =  List.map (fun f -> f.cf_name,f.cf_meta) c.cl_ordered_statics in
-			(c.cl_pos, ["",c.cl_meta],fields,statics)
-		| TEnumDecl e ->
-			(e.e_pos, ["",e.e_meta],List.map (fun n -> n, (PMap.find n e.e_constrs).ef_meta) e.e_names, [])
-		| TTypeDecl t ->
-			(t.t_pos, ["",t.t_meta],(match follow t.t_type with TAnon a -> PMap.fold (fun f acc -> (f.cf_name,f.cf_meta) :: acc) a.a_fields [] | _ -> []),[])
-		| TAbstractDecl a ->
-			(a.a_pos, ["",a.a_meta],[],[])
-	) in
-	let filter l =
-		let l = List.map (fun (n,ml) -> n, ExtList.List.filter_map (fun (m,el,p) -> match m with Meta.Custom s when String.length s > 0 && s.[0] <> ':' -> Some (s,el,p) | _ -> None) ml) l in
-		List.filter (fun (_,ml) -> ml <> []) l
-	in
-	let meta, fields, statics = filter meta, filter fields, filter statics in
-	let make_meta_field ml =
-		let h = Hashtbl.create 0 in
-		mk (TObjectDecl (List.map (fun (f,el,p) ->
-			if Hashtbl.mem h f then error ("Duplicate metadata '" ^ f ^ "'") p;
-			Hashtbl.add h f ();
-			f, mk (match el with [] -> TConst TNull | _ -> TArrayDecl (List.map (type_constant_value com) el)) (api.tarray t_dynamic) p
-		) ml)) t_dynamic p
-	in
-	let make_meta l =
-		mk (TObjectDecl (List.map (fun (f,ml) -> f,make_meta_field ml) l)) t_dynamic p
-	in
-	if meta = [] && fields = [] && statics = [] then
-		None
-	else
-		let meta_obj = [] in
-		let meta_obj = (if fields = [] then meta_obj else ("fields",make_meta fields) :: meta_obj) in
-		let meta_obj = (if statics = [] then meta_obj else ("statics",make_meta statics) :: meta_obj) in
-		let meta_obj = (try ("obj", make_meta_field (List.assoc "" meta)) :: meta_obj with Not_found -> meta_obj) in
-		Some (mk (TObjectDecl meta_obj) t_dynamic p)
-
 let update_cache_dependencies t =
 	let rec check_t m t = match t with
 		| TInst(c,tl) ->
@@ -228,7 +98,7 @@ let update_cache_dependencies t =
 			| Some t -> check_t m t
 			| _ -> ())
 		| TLazy f ->
-			check_t m (!f())
+			check_t m (lazy_type f)
 		| TDynamic t ->
 			if t == t_dynamic then
 				()
@@ -245,114 +115,12 @@ let update_cache_dependencies t =
 		| _ ->
 			()
 
-(* -------------------------------------------------------------------------- *)
-(* STACK MANAGEMENT EMULATION *)
-
-type stack_context = {
-	stack_var : string;
-	stack_exc_var : string;
-	stack_pos_var : string;
-	stack_pos : pos;
-	stack_expr : texpr;
-	stack_pop : texpr;
-	stack_save_pos : texpr;
-	stack_restore : texpr list;
-	stack_push : tclass -> string -> texpr;
-	stack_return : texpr -> texpr;
-}
-
-let stack_context_init com stack_var exc_var pos_var tmp_var use_add p =
-	let t = com.basic in
-	let st = t.tarray t.tstring in
-	let stack_var = alloc_var stack_var st p in
-	let exc_var = alloc_var exc_var st p in
-	let pos_var = alloc_var pos_var t.tint p in
-	let stack_e = mk (TLocal stack_var) st p in
-	let exc_e = mk (TLocal exc_var) st p in
-	let stack_pop = fcall stack_e "pop" [] t.tstring p in
-	let stack_push c m =
-		fcall stack_e "push" [
-			if use_add then
-				binop OpAdd (ExprBuilder.make_string com (s_type_path c.cl_path ^ "::") p) (ExprBuilder.make_string com m p) t.tstring p
-			else
-				ExprBuilder.make_string com (s_type_path c.cl_path ^ "::" ^ m) p
-		] t.tvoid p
-	in
-	let stack_return e =
-		let tmp = alloc_var tmp_var e.etype e.epos in
-		mk (TBlock [
-			mk (TVar (tmp, Some e)) t.tvoid e.epos;
-			stack_pop;
-			mk (TReturn (Some (mk (TLocal tmp) e.etype e.epos))) e.etype e.epos
-		]) e.etype e.epos
-	in
-	{
-		stack_var = stack_var.v_name;
-		stack_exc_var = exc_var.v_name;
-		stack_pos_var = pos_var.v_name;
-		stack_pos = p;
-		stack_expr = stack_e;
-		stack_pop = stack_pop;
-		stack_save_pos = mk (TVar (pos_var, Some (field stack_e "length" t.tint p))) t.tvoid p;
-		stack_push = stack_push;
-		stack_return = stack_return;
-		stack_restore = [
-			binop OpAssign exc_e (mk (TArrayDecl []) st p) st p;
-			mk (TWhile (
-				mk_parent (binop OpGte (field stack_e "length" t.tint p) (mk (TLocal pos_var) t.tint p) t.tbool p),
-				fcall exc_e "unshift" [fcall stack_e "pop" [] t.tstring p] t.tvoid p,
-				NormalWhile
-			)) t.tvoid p;
-			fcall stack_e "push" [index com exc_e 0 t.tstring p] t.tvoid p
-		];
-	}
-
-let stack_init com use_add =
-	stack_context_init com "$s" "$e" "$spos" "$tmp" use_add null_pos
-
-let rec stack_block_loop ctx e =
-	match e.eexpr with
-	| TFunction _ ->
-		e
-	| TReturn None | TReturn (Some { eexpr = TConst _ }) | TReturn (Some { eexpr = TLocal _ }) ->
-		mk (TBlock [
-			ctx.stack_pop;
-			e;
-		]) e.etype e.epos
-	| TReturn (Some e) ->
-		ctx.stack_return (stack_block_loop ctx e)
-	| TTry (v,cases) ->
-		let v = stack_block_loop ctx v in
-		let cases = List.map (fun (v,e) ->
-			let e = stack_block_loop ctx e in
-			let e = (match (mk_block e).eexpr with
-				| TBlock l -> mk (TBlock (ctx.stack_restore @ l)) e.etype e.epos
-				| _ -> assert false
-			) in
-			v , e
-		) cases in
-		mk (TTry (v,cases)) e.etype e.epos
-	| _ ->
-		map_expr (stack_block_loop ctx) e
-
-let stack_block ctx c m e =
-	match (mk_block e).eexpr with
-	| TBlock l ->
-		mk (TBlock (
-			ctx.stack_push c m ::
-			ctx.stack_save_pos ::
-			List.map (stack_block_loop ctx) l
-			@ [ctx.stack_pop]
-		)) e.etype e.epos
-	| _ ->
-		assert false
-
 (* -------------------------------------------------------------------------- *)
 (* FIX OVERRIDES *)
 
 (*
 	on some platforms which doesn't support type parameters, we must have the
-	exact same type for overriden/implemented function as the original one
+	exact same type for overridden/implemented function as the original one
 *)
 
 let rec find_field com c f =
@@ -402,7 +170,7 @@ let fix_override com c f fd =
 					end;
 					cur
 				with Unify_error _ ->
-					let v2 = alloc_var (prefix ^ v.v_name) t2 v.v_pos in
+					let v2 = alloc_var VGenerated (prefix ^ v.v_name) t2 v.v_pos in
 					changed_args := (v,v2) :: !changed_args;
 					v2,ct
 			) fd.tf_args targs in
@@ -422,7 +190,7 @@ let fix_override com c f fd =
 				);
 			} in
 			(* as3 does not allow wider visibility, so the base method has to be made public *)
-			if Common.defined com Define.As3 && f.cf_public then f2.cf_public <- true;
+			if Common.defined com Define.As3 && has_class_field_flag f CfPublic then add_class_field_flag f2 CfPublic;
 			let targs = List.map (fun(v,c) -> (v.v_name, Option.is_some c, v.v_type)) nargs in
 			let fde = (match f.cf_expr with None -> assert false | Some e -> e) in
 			f.cf_expr <- Some { fde with eexpr = TFunction fd2 };
@@ -483,75 +251,31 @@ let rec is_volatile t =
 		| Some t -> is_volatile t
 		| _ -> false)
 	| TLazy f ->
-		is_volatile (!f())
+		is_volatile (lazy_type f)
 	| TType (t,tl) ->
 		(match t.t_path with
 		| _ -> is_volatile (apply_params t.t_params tl t.t_type))
 	| _ ->
 		false
 
-let set_default ctx a c p =
-	let t = a.v_type in
-	let ve = mk (TLocal a) t p in
-	let cond =  TBinop (OpEq,ve,mk (TConst TNull) t p) in
-	mk (TIf (mk_parent (mk cond ctx.basic.tbool p), mk (TBinop (OpAssign,ve,mk (TConst c) t p)) t p,None)) ctx.basic.tvoid p
-
 let bytes_serialize data =
 	let b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" in
 	let tbl = Array.init (String.length b64) (fun i -> String.get b64 i) in
-	Base64.str_encode ~tbl data
-
-(*
-	Tells if the constructor might be called without any issue whatever its parameters
-*)
-let rec constructor_side_effects e =
-	match e.eexpr with
-	| TBinop (op,_,_) when op <> OpAssign ->
-		true
-	| TField (_,FEnum _) ->
-		false
-	| TUnop _ | TArray _ | TField _ | TEnumParameter _ | TCall _ | TNew _ | TFor _ | TWhile _ | TSwitch _ | TReturn _ | TThrow _ ->
-		true
-	| TBinop _ | TTry _ | TIf _ | TBlock _ | TVar _
-	| TFunction _ | TArrayDecl _ | TObjectDecl _
-	| TParenthesis _ | TTypeExpr _ | TLocal _ | TMeta _
-	| TConst _ | TContinue | TBreak | TCast _ ->
-		try
-			Type.iter (fun e -> if constructor_side_effects e then raise Exit) e;
-			false;
-		with Exit ->
-			true
+	Bytes.unsafe_to_string (Base64.str_encode ~tbl data)
 
 module Dump = struct
-	let make_valid_filename s =
-		let r = Str.regexp "[^A-Za-z0-9_\\-\\.,]" in
-		Str.global_substitute r (fun s -> "_") s
-
-	let rec create_file ext acc = function
-		| [] -> assert false
-		| d :: [] ->
-			let d = make_valid_filename d in
-			let maxlen = 200 - String.length ext in
-			let d = if String.length d > maxlen then String.sub d 0 maxlen else d in
-			let ch = open_out (String.concat "/" (List.rev (d :: acc)) ^ ext) in
-			ch
-		| d :: l ->
-			let dir = String.concat "/" (List.rev (d :: acc)) in
-			if not (Sys.file_exists dir) then Unix.mkdir dir 0o755;
-			create_file ext (d :: acc) l
-
 	(*
 		Make a dump of the full typed AST of all types
 	*)
 	let create_dumpfile acc l =
-		let ch = create_file ".dump" acc l in
+		let ch = Path.create_file false ".dump" acc l in
 		let buf = Buffer.create 0 in
 		buf, (fun () ->
 			output_string ch (Buffer.contents buf);
 			close_out ch)
 
 	let create_dumpfile_from_path com path =
-		let buf,close = create_dumpfile [] ("dump" :: (platform_name com.platform) :: fst path @ [snd path]) in
+		let buf,close = create_dumpfile [] ((dump_path com) :: (platform_name_macro com) :: fst path @ [snd path]) in
 		buf,close
 
 	let dump_types com s_expr =
@@ -565,7 +289,7 @@ module Dump = struct
 				let args el =
 					match el with
 					| [] -> ""
-					| el -> Printf.sprintf "(%s)" (String.concat ", " (List.map (fun e -> Ast.s_expr e) el)) in
+					| el -> Printf.sprintf "(%s)" (String.concat ", " (List.map (fun e -> Ast.Printer.s_expr e) el)) in
 				match ml with
 				| [] -> ""
 				| ml -> String.concat " " (List.map (fun me -> match me with (m,el,_) -> "@" ^ Meta.to_string m ^ args el) ml) ^ "\n" ^ tabs in
@@ -579,7 +303,7 @@ module Dump = struct
 				let rec print_field stat f =
 					print "\n\t%s%s%s%s%s %s%s"
 						(s_metas f.cf_meta "\t")
-						(if (f.cf_public && not (c.cl_extern || c.cl_interface)) then "public " else "")
+						(if (has_class_field_flag f CfPublic && not (c.cl_extern || c.cl_interface)) then "public " else "")
 						(if stat then "static " else "")
 						(match f.cf_kind with
 							| Var v when (is_inline_var f.cf_kind) -> "inline "
@@ -615,7 +339,6 @@ module Dump = struct
 				print "%s%s%s%s %s%s" (s_metas c.cl_meta "") (if c.cl_private then "private " else "") (if c.cl_extern then "extern " else "") (if c.cl_interface then "interface" else "class") (s_type_path path) (params c.cl_params);
 				(match c.cl_super with None -> () | Some (c,pl) -> print " extends %s" (s_type (TInst (c,pl))));
 				List.iter (fun (c,pl) -> print " implements %s" (s_type (TInst (c,pl)))) c.cl_implements;
-				(match c.cl_dynamic with None -> () | Some t -> print " implements Dynamic<%s>" (s_type t));
 				(match c.cl_array_access with None -> () | Some t -> print " implements ArrayAccess<%s>" (s_type t));
 				print " {\n";
 				(match c.cl_constructor with
@@ -664,19 +387,43 @@ module Dump = struct
 			close();
 		) com.types
 
+	let dump_position com =
+		List.iter (fun mt ->
+			match mt with
+				| TClassDecl c ->
+					let buf,close = create_dumpfile_from_path com (t_path mt) in
+					Printf.bprintf buf "%s\n" (s_type_path c.cl_path);
+					let field cf =
+						Printf.bprintf buf "\t%s\n" cf.cf_name;
+						begin match cf.cf_expr with
+						| None -> ()
+						| Some e ->
+							Printf.bprintf buf "%s\n" (Texpr.dump_with_pos "\t" e);
+						end
+					in
+					Option.may field c.cl_constructor;
+					List.iter field c.cl_ordered_statics;
+					List.iter field c.cl_ordered_fields;
+					close();
+				| _ ->
+					()
+		) com.types
+
 	let dump_types com =
 		match Common.defined_value_safe com Define.Dump with
 			| "pretty" -> dump_types com (Type.s_expr_pretty false "\t" true)
 			| "legacy" -> dump_types com Type.s_expr
 			| "record" -> dump_record com
+			| "position" -> dump_position com
 			| _ -> dump_types com (Type.s_expr_ast (not (Common.defined com Define.DumpIgnoreVarIds)) "\t")
 
 	let dump_dependencies ?(target_override=None) com =
 		let target_name = match target_override with
-			| None -> platform_name com.platform
+			| None -> platform_name_macro com
 			| Some s -> s
 		in
-		let buf,close = create_dumpfile [] ["dump";target_name;".dependencies"] in
+		let dump_dependencies_path = [dump_path com;target_name;".dependencies"] in
+		let buf,close = create_dumpfile [] dump_dependencies_path in
 		let print fmt = Printf.kprintf (fun s -> Buffer.add_string buf s) fmt in
 		let dep = Hashtbl.create 0 in
 		List.iter (fun m ->
@@ -688,7 +435,8 @@ module Dump = struct
 			) m.m_extra.m_deps;
 		) com.Common.modules;
 		close();
-		let buf,close = create_dumpfile [] ["dump";target_name;".dependants"] in
+		let dump_dependants_path = [dump_path com;target_name;".dependants"] in
+		let buf,close = create_dumpfile [] dump_dependants_path in
 		let print fmt = Printf.kprintf (fun s -> Buffer.add_string buf s) fmt in
 		Hashtbl.iter (fun n ml ->
 			print "%s:\n" n;
@@ -711,7 +459,7 @@ let default_cast ?(vtmp="$t") com e texpr t p =
 		| TAbstractDecl a -> TAnon { a_fields = PMap.empty; a_status = ref (AbstractStatics a) }
 		| TTypeDecl _ -> assert false
 	in
-	let vtmp = alloc_var vtmp e.etype e.epos in
+	let vtmp = alloc_var VGenerated vtmp e.etype e.epos in
 	let var = mk (TVar (vtmp,Some e)) api.tvoid p in
 	let vexpr = mk (TLocal vtmp) e.etype p in
 	let texpr = mk (TTypeExpr texpr) (mk_texpr texpr) p in
@@ -725,12 +473,15 @@ let default_cast ?(vtmp="$t") com e texpr t p =
 	let std = mk (TTypeExpr std) (mk_texpr std) p in
 	let is = mk (TField (std,fis)) (tfun [t_dynamic;t_dynamic] api.tbool) p in
 	let is = mk (TCall (is,[vexpr;texpr])) api.tbool p in
+	let enull = Texpr.Builder.make_null vexpr.etype p in
+	let eop = Texpr.Builder.binop OpEq vexpr enull api.tbool p in
+	let echeck = Texpr.Builder.binop OpBoolOr is eop api.tbool p in
 	let exc = mk (TThrow (mk (TConst (TString "Class cast error")) api.tstring p)) t p in
-	let check = mk (TIf (mk_parent is,mk (TCast (vexpr,None)) t p,Some exc)) t p in
+	let check = mk (TIf (Texpr.Builder.mk_parent echeck,mk (TCast (vexpr,None)) t p,Some exc)) t p in
 	mk (TBlock [var;check;vexpr]) t p
 
 module UnificationCallback = struct
-	let tf_stack = ref []
+	let tf_stack = new_rec_stack()
 
 	let check_call_params f el tl =
 		let rec loop acc el tl = match el,tl with
@@ -785,20 +536,20 @@ module UnificationCallback = struct
 			| TObjectDecl fl ->
 				begin match follow e.etype with
 					| TAnon an ->
-						let fl = List.map (fun (n,e) ->
+						let fl = List.map (fun ((n,p,qs),e) ->
 							let e = try
 								let t = (PMap.find n an.a_fields).cf_type in
 								f e t
 							with Not_found ->
 								e
 							in
-							n,e
+							(n,p,qs),e
 						) fl in
 						{ e with eexpr = TObjectDecl fl }
 					| _ -> e
 				end
 			| TReturn (Some e1) ->
-				begin match !tf_stack with
+				begin match tf_stack.rec_stack with
 					| tf :: _ -> { e with eexpr = TReturn (Some (f e1 tf.tf_type))}
 					| _ -> e
 				end
@@ -807,10 +558,7 @@ module UnificationCallback = struct
 		in
 		match e.eexpr with
 			| TFunction tf ->
-				tf_stack := tf :: !tf_stack;
-				let etf = {e with eexpr = TFunction({tf with tf_expr = run f tf.tf_expr})} in
-				tf_stack := List.tl !tf_stack;
-				etf
+				rec_stack_loop tf_stack tf (fun() -> {e with eexpr = TFunction({tf with tf_expr = run f tf.tf_expr})}) ()
 			| _ ->
 				check (Type.map_expr (run ff) e)
 end;;
@@ -839,7 +587,7 @@ let interpolate_code com code tl f_string f_expr p =
 				let expr = Array.get exprs (int_of_string n) in
 				f_expr expr;
 			with
-			| Failure "int_of_string" ->
+			| Failure _ ->
 				f_string ("{" ^ n ^ "}");
 			| Invalid_argument _ ->
 				err ("Out-of-bounds special parameter: " ^ n)
@@ -867,23 +615,8 @@ module ExtClass = struct
 			| Some e' -> c.cl_init <- Some (concat e' e)
 
 	let add_static_init c cf e p =
-		let ethis = ExprBuilder.make_static_this c p in
+		let ethis = Texpr.Builder.make_static_this c p in
 		let ef1 = mk (TField(ethis,FStatic(c,cf))) cf.cf_type p in
 		let e_assign = mk (TBinop(OpAssign,ef1,e)) e.etype p in
 		add_cl_init c e_assign
 end
-
-let for_remap com v e1 e2 p =
-	let v' = alloc_var v.v_name e1.etype e1.epos in
-	let ev' = mk (TLocal v') e1.etype e1.epos in
-	let t1 = (Abstract.follow_with_abstracts e1.etype) in
-	let ehasnext = mk (TField(ev',quick_field t1 "hasNext")) (tfun [] com.basic.tbool) e1.epos in
-	let ehasnext = mk (TCall(ehasnext,[])) com.basic.tbool ehasnext.epos in
-	let enext = mk (TField(ev',quick_field t1 "next")) (tfun [] v.v_type) e1.epos in
-	let enext = mk (TCall(enext,[])) v.v_type e1.epos in
-	let eassign = mk (TVar(v,Some enext)) com.basic.tvoid p in
-	let ebody = Type.concat eassign e2 in
-	mk (TBlock [
-		mk (TVar (v',Some e1)) com.basic.tvoid e1.epos;
-		mk (TWhile((mk (TParenthesis ehasnext) ehasnext.etype ehasnext.epos),ebody,NormalWhile)) com.basic.tvoid e1.epos;
-	]) com.basic.tvoid p
\ No newline at end of file
diff --git a/src/codegen/dotnet.ml b/src/codegen/dotnet.ml
new file mode 100644
index 0000000000000000000000000000000000000000..5b36117164d2a09a4fab996e32b6671a7d3d1cf7
--- /dev/null
+++ b/src/codegen/dotnet.ml
@@ -0,0 +1,1303 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open ExtString
+open Common
+open Globals
+open Ast
+open IlData
+open IlMeta
+open NativeLibraries
+
+(* see http://msdn.microsoft.com/en-us/library/2sk3x8a7(v=vs.71).aspx *)
+let cs_binops =
+	[Ast.OpAdd, "op_Addition";
+	Ast.OpSub, "op_Subtraction";
+	Ast.OpMult, "op_Multiply";
+	Ast.OpDiv, "op_Division";
+	Ast.OpMod, "op_Modulus";
+	Ast.OpXor, "op_ExclusiveOr";
+	Ast.OpOr, "op_BitwiseOr";
+	Ast.OpAnd, "op_BitwiseAnd";
+	Ast.OpBoolAnd, "op_LogicalAnd";
+	Ast.OpBoolOr, "op_LogicalOr";
+	Ast.OpAssign, "op_Assign";
+	Ast.OpShl, "op_LeftShift";
+	Ast.OpShr, "op_RightShift";
+	Ast.OpShr, "op_SignedRightShift";
+	Ast.OpUShr, "op_UnsignedRightShift";
+	Ast.OpEq, "op_Equality";
+	Ast.OpGt, "op_GreaterThan";
+	Ast.OpLt, "op_LessThan";
+	Ast.OpNotEq, "op_Inequality";
+	Ast.OpGte, "op_GreaterThanOrEqual";
+	Ast.OpLte, "op_LessThanOrEqual";
+	Ast.OpAssignOp Ast.OpMult, "op_MultiplicationAssignment";
+	Ast.OpAssignOp Ast.OpSub, "op_SubtractionAssignment";
+	Ast.OpAssignOp Ast.OpXor, "op_ExclusiveOrAssignment";
+	Ast.OpAssignOp Ast.OpShl, "op_LeftShiftAssignment";
+	Ast.OpAssignOp Ast.OpMod, "op_ModulusAssignment";
+	Ast.OpAssignOp Ast.OpAdd, "op_AdditionAssignment";
+	Ast.OpAssignOp Ast.OpAnd, "op_BitwiseAndAssignment";
+	Ast.OpAssignOp Ast.OpOr, "op_BitwiseOrAssignment";
+	(* op_Comma *)
+	Ast.OpAssignOp Ast.OpDiv, "op_DivisionAssignment";]
+
+let cs_unops =
+	[Ast.Decrement, "op_Decrement";
+	Ast.Increment, "op_Increment";
+	Ast.Neg, "op_UnaryNegation";
+	Ast.Not, "op_LogicalNot";
+	Ast.NegBits, "op_OnesComplement"]
+
+let netname_to_hx name =
+	let len = String.length name in
+	let chr = String.get name 0 in
+	String.make 1 (Char.uppercase chr) ^ (String.sub name 1 (len-1))
+
+(* -net-lib implementation *)
+
+type net_lib_ctx = {
+	nstd : bool;
+	ncom : Common.context;
+	nil : IlData.ilctx;
+}
+
+let is_haxe_keyword = function
+	| "cast" | "extern" | "function" | "in" | "typedef" | "using" | "var" | "untyped" | "inline" -> true
+	| _ -> false
+
+let hxpath_to_net ctx path =
+	try
+		Hashtbl.find ctx.ncom.net_path_map path
+	with
+	 | Not_found ->
+			[],[],"Not_found"
+
+let add_cs = function
+	| "haxe" :: ns -> "haxe" :: ns
+	| "std" :: ns -> "std" :: ns
+	| "cs" :: ns -> "cs" :: ns
+	| "system" :: ns -> "cs" :: "system" :: ns
+	| ns -> ns
+
+let escape_chars =
+	String.replace_chars (fun chr ->
+		if (chr >= 'a' && chr <= 'z') || (chr >= 'A' && chr <= 'Z') || (chr >= '0' && chr <= '9') || chr = '_' then
+			Char.escaped chr
+		else
+			"_x" ^ (string_of_int (Char.code chr)) ^ "_")
+
+let netcl_to_hx cl =
+	let cl = if String.length cl > 0 && String.get cl 0 >= 'a' && String.get cl 0 <= 'z' then
+			Char.escaped (Char.uppercase (String.get cl 0)) ^ (String.sub cl 1 (String.length cl - 1))
+		else
+			cl
+	in
+	try
+		let cl, nargs = String.split cl "`" in
+		(escape_chars cl) ^ "_" ^ nargs
+	with | Invalid_string ->
+		escape_chars cl
+
+let netpath_to_hx std = function
+	| [],[], cl -> [], netcl_to_hx cl
+	| ns,[], cl ->
+		let ns = (List.map (fun s -> String.lowercase (escape_chars s)) ns) in
+		add_cs ns, netcl_to_hx cl
+	| ns,(nhd :: ntl as nested), cl ->
+		let nested = List.map (netcl_to_hx) nested in
+		let ns = (List.map (fun s -> String.lowercase (escape_chars s)) ns) @ [nhd] in
+		add_cs ns, String.concat "_" nested ^ "_" ^ netcl_to_hx cl
+
+let lookup_ilclass std com ilpath =
+	let path = netpath_to_hx std ilpath in
+	List.fold_right (fun net_lib acc ->
+		match acc with
+		| None -> net_lib#lookup path
+		| Some p -> acc
+	) com.native_libs.net_libs None
+
+let discard_nested = function
+	| (ns,_),cl -> (ns,[]),cl
+
+let mk_type_path ctx path params =
+	let pack, sub, name = match path with
+		| ns,[], cl ->
+			ns, None, netcl_to_hx cl
+		| ns, (nhd :: ntl as nested), cl ->
+			let nhd = netcl_to_hx nhd in
+			let nested = List.map (netcl_to_hx) nested in
+			ns, Some (String.concat "_" nested ^ "_" ^ netcl_to_hx cl), nhd
+	in
+	CTPath {
+		tpackage = fst (netpath_to_hx ctx.nstd (pack,[],""));
+		Ast.tname = name;
+		tparams = params;
+		tsub = sub;
+	}
+
+let raw_type_path ctx path params =
+	{
+		tpackage = fst path;
+		Ast.tname = snd path;
+		tparams = params;
+		tsub = None;
+	}
+
+let rec convert_signature ctx p = function
+	| LVoid ->
+		mk_type_path ctx ([],[],"Void") []
+	| LBool ->
+		mk_type_path ctx ([],[],"Bool") []
+	| LChar ->
+		mk_type_path ctx (["cs";"types"],[],"Char16") []
+	| LInt8 ->
+		mk_type_path ctx (["cs";"types"],[],"Int8") []
+	| LUInt8 ->
+		mk_type_path ctx (["cs";"types"],[],"UInt8") []
+	| LInt16 ->
+		mk_type_path ctx (["cs";"types"],[],"Int16") []
+	| LUInt16 ->
+		mk_type_path ctx (["cs";"types"],[],"UInt16") []
+	| LInt32 ->
+		mk_type_path ctx ([],[],"Int") []
+	| LUInt32 ->
+		mk_type_path ctx ([],[],"UInt") []
+	| LInt64 ->
+		mk_type_path ctx (["haxe"],[],"Int64") []
+	| LUInt64 ->
+		mk_type_path ctx (["cs";"types"],[],"UInt64") []
+	| LFloat32 ->
+		mk_type_path ctx ([],[],"Single") []
+	| LFloat64 ->
+		mk_type_path ctx ([],[],"Float") []
+	| LString ->
+		mk_type_path ctx (["std"],[],"String") []
+	| LObject ->
+		mk_type_path ctx ([],[],"Dynamic") []
+	| LPointer s | LManagedPointer s ->
+		mk_type_path ctx (["cs"],[],"Pointer") [ TPType (convert_signature ctx p s,null_pos) ]
+	| LTypedReference ->
+		mk_type_path ctx (["cs";"system"],[],"TypedReference") []
+	| LIntPtr ->
+		mk_type_path ctx (["cs";"system"],[],"IntPtr") []
+	| LUIntPtr ->
+		mk_type_path ctx (["cs";"system"],[],"UIntPtr") []
+	| LValueType (s,args) | LClass (s,args) ->
+		mk_type_path ctx s (List.map (fun s -> TPType (convert_signature ctx p s,null_pos)) args)
+	| LTypeParam i ->
+		mk_type_path ctx ([],[],"T" ^ string_of_int i) []
+	| LMethodTypeParam i ->
+		mk_type_path ctx ([],[],"M" ^ string_of_int i) []
+	| LVector s ->
+		mk_type_path ctx (["cs"],[],"NativeArray") [TPType (convert_signature ctx p s,null_pos)]
+	(* | LArray of ilsig_norm * (int option * int option) array *)
+	| LMethod (_,ret,args) ->
+		CTFunction (List.map (fun v -> convert_signature ctx p v,null_pos) args, (convert_signature ctx p ret,null_pos))
+	| _ -> mk_type_path ctx ([],[], "Dynamic") []
+
+let ilpath_s = function
+	| ns,[], name -> s_type_path (ns,name)
+	| [],nested,name -> String.concat "." nested ^ "." ^ name
+	| ns, nested, name -> String.concat "." ns ^ "." ^ String.concat "." nested ^ "." ^ name
+
+let get_cls = function
+	| _,_,c -> c
+
+(* TODO: When possible on Haxe, use this to detect flag enums, and make an abstract with @:op() *)
+(* that behaves like an enum, and with an enum as its underlying type *)
+let enum_is_flag ilcls =
+	let check_flag name ns = name = "FlagsAttribute" && ns = ["System"] in
+	List.exists (fun a ->
+		match a.ca_type with
+			| TypeRef r ->
+				check_flag r.tr_name r.tr_namespace
+			| TypeDef d ->
+				check_flag d.td_name d.td_namespace
+			| Method m ->
+				(match m.m_declaring with
+					| Some d ->
+						check_flag d.td_name d.td_namespace
+					| _ -> false)
+			| MemberRef r ->
+				(match r.memr_class with
+					| TypeRef r ->
+						check_flag r.tr_name r.tr_namespace
+					| TypeDef d ->
+						check_flag d.td_name d.td_namespace
+					| _ -> false)
+			| _ ->
+				false
+	) ilcls.cattrs
+
+let convert_ilenum ctx p ?(is_flag=false) ilcls =
+	let meta = ref [
+		Meta.Native, [EConst (String (ilpath_s ilcls.cpath,SDoubleQuotes) ), p], p;
+		Meta.CsNative, [], p;
+	] in
+
+	let data = ref [] in
+	List.iter (fun f -> match f.fname with
+		| "value__" -> ()
+		| _ when not (List.mem CStatic f.fflags.ff_contract) -> ()
+		| _ ->
+			let meta, const = match f.fconstant with
+				| Some IChar i
+				| Some IByte i
+				| Some IShort i ->
+					[Meta.CsNative, [EConst (Int (string_of_int i) ), p], p ], Int64.of_int i
+				| Some IInt i ->
+					[Meta.CsNative, [EConst (Int (Int32.to_string i) ), p], p ], Int64.of_int32 i
+				| Some IFloat32 f | Some IFloat64 f ->
+					[], Int64.of_float f
+				| Some IInt64 i ->
+					[], i
+				| _ ->
+					[], Int64.zero
+			in
+			data := ( { ec_name = f.fname,null_pos; ec_doc = None; ec_meta = meta; ec_args = []; ec_pos = p; ec_params = []; ec_type = None; }, const) :: !data;
+	) ilcls.cfields;
+	let data = List.stable_sort (fun (_,i1) (_,i2) -> Int64.compare i1 i2) (List.rev !data) in
+
+	let _, c = netpath_to_hx ctx.nstd ilcls.cpath in
+	let name = netname_to_hx c in
+	EEnum {
+		d_name = (if is_flag then name ^ "_FlagsEnum" else name),null_pos;
+		d_doc = None;
+		d_params = []; (* enums never have type parameters *)
+		d_meta = !meta;
+		d_flags = [EExtern];
+		d_data = List.map fst data;
+	}
+
+let rec has_unmanaged = function
+	| LPointer _ -> true
+	| LManagedPointer s -> has_unmanaged s
+	| LValueType (p,pl) -> List.exists (has_unmanaged) pl
+	| LClass (p,pl) -> List.exists (has_unmanaged) pl
+	| LVector s -> has_unmanaged s
+	| LArray (s,a) -> has_unmanaged s
+	| LMethod (c,r,args) -> has_unmanaged r || List.exists (has_unmanaged) args
+	| _ -> false
+
+let convert_ilfield ctx p field =
+	if not (Common.defined ctx.ncom Define.Unsafe) && has_unmanaged field.fsig.snorm then raise Exit;
+	let p = { p with pfile =	p.pfile ^" (" ^field.fname ^")" } in
+	let cff_doc = None in
+	let cff_pos = p in
+	let cff_meta = ref [] in
+	let cff_name = match field.fname with
+		| name when String.length name > 5 ->
+				(match String.sub name 0 5 with
+				| "__hx_" -> raise Exit
+				| _ -> name)
+		| name -> name
+	in
+	let cff_access = match field.fflags.ff_access with
+		| FAFamily | FAFamOrAssem -> (APrivate,null_pos)
+		| FAPublic -> (APublic,null_pos)
+		| _ -> raise Exit (* private instances aren't useful on externs *)
+	in
+	let readonly, acc = List.fold_left (fun (readonly,acc) -> function
+		| CStatic -> readonly, (AStatic,null_pos) :: acc
+		| CInitOnly | CLiteral -> true, acc
+		| _ -> readonly,acc
+	) (false,[cff_access]) field.fflags.ff_contract in
+	if PMap.mem "net_loader_debug" ctx.ncom.defines.Define.values then
+		Printf.printf "\t%sfield %s : %s\n" (if List.mem_assoc AStatic acc then "static " else "") cff_name (IlMetaDebug.ilsig_s field.fsig.ssig);
+	let kind = match readonly with
+		| true ->
+			cff_meta := (Meta.ReadOnly, [], cff_pos) :: !cff_meta;
+			FProp (("default",null_pos), ("never",null_pos), Some (convert_signature ctx p field.fsig.snorm,null_pos), None)
+		| false ->
+			FVar (Some (convert_signature ctx p field.fsig.snorm,null_pos), None)
+	in
+	let cff_name, cff_meta =
+		if String.get cff_name 0 = '%' then
+			let name = (String.sub cff_name 1 (String.length cff_name - 1)) in
+			"_" ^ name,
+			(Meta.Native, [EConst (String (name,SDoubleQuotes) ), cff_pos], cff_pos) :: !cff_meta
+		else
+			cff_name, !cff_meta
+	in
+	{
+		cff_name = cff_name,null_pos;
+		cff_doc = cff_doc;
+		cff_pos = cff_pos;
+		cff_meta = cff_meta;
+		cff_access = acc;
+		cff_kind = kind;
+	}
+
+let convert_ilevent ctx p ev =
+	let p = { p with pfile =	p.pfile ^" (" ^ev.ename ^")" } in
+	let name = ev.ename in
+	let kind = FVar (Some (convert_signature ctx p ev.esig.snorm,null_pos), None) in
+	let meta = [Meta.Event, [], p; Meta.Keep,[],p; Meta.SkipReflection,[],p] in
+	let acc = [APrivate,null_pos] in
+	let add_m acc m = match m with
+		| None -> acc
+		| Some (name,flags) ->
+			if List.mem (CMStatic) flags.mf_contract then
+				(AStatic,null_pos) :: acc
+			else
+				acc
+	in
+	if PMap.mem "net_loader_debug" ctx.ncom.defines.Define.values then
+		Printf.printf "\tevent %s : %s\n" name (IlMetaDebug.ilsig_s ev.esig.ssig);
+	let acc = add_m acc ev.eadd in
+	let acc = add_m acc ev.eremove in
+	let acc = add_m acc ev.eraise in
+	{
+		cff_name = name,null_pos;
+		cff_doc = None;
+		cff_pos = p;
+		cff_meta = meta;
+		cff_access = acc;
+		cff_kind = kind;
+	}
+
+let convert_ilmethod ctx p m is_explicit_impl =
+	if not (Common.defined ctx.ncom Define.Unsafe) && has_unmanaged m.msig.snorm then raise Exit;
+	let force_check = Common.defined ctx.ncom Define.ForceLibCheck in
+	let p = { p with pfile =	p.pfile ^" (" ^m.mname ^")" } in
+	let cff_doc = None in
+	let cff_pos = p in
+	let cff_name = match m.mname with
+		| ".ctor" -> "new"
+		| ".cctor"-> raise Exit (* __init__ field *)
+		| "Finalize" -> raise Exit (* destructor (~ClassName) *)
+		| "Equals" | "GetHashCode" -> raise Exit
+		| name when String.length name > 5 ->
+				(match String.sub name 0 5 with
+				| "__hx_" -> raise Exit
+				| _ -> name)
+		| name -> name
+	in
+	let meta = [Meta.Overload, [], p] in
+	let acc, meta = match m.mflags.mf_access with
+		| FAFamily | FAFamOrAssem ->
+			(APrivate,null_pos), ((Meta.Protected, [], p) :: meta)
+		(* | FAPrivate -> APrivate *)
+		| FAPublic when List.mem SGetter m.msemantics || List.mem SSetter m.msemantics ->
+			(APrivate,null_pos), meta
+		| FAPublic -> (APublic,null_pos), meta
+		| _ ->
+			if PMap.mem "net_loader_debug" ctx.ncom.defines.Define.values then
+				Printf.printf "\tmethod %s (skipped) : %s\n" cff_name (IlMetaDebug.ilsig_s m.msig.ssig);
+			raise Exit
+	in
+	let is_static = ref false in
+	let acc, is_final = List.fold_left (fun (acc,is_final) -> function
+		| CMStatic when cff_name <> "new" -> is_static := true; (AStatic,null_pos) :: acc, is_final
+		| CMVirtual when is_final = None -> acc, Some false
+		| CMFinal -> acc, Some true
+		| _ -> acc, is_final
+	) ([acc],None) m.mflags.mf_contract in
+	if PMap.mem "net_loader_debug" ctx.ncom.defines.Define.values then
+		Printf.printf "\t%smethod %s : %s\n" (if !is_static then "static " else "") cff_name (IlMetaDebug.ilsig_s m.msig.ssig);
+
+	let acc = match is_final with
+		| None | Some true when not force_check ->
+			(AFinal,null_pos) :: acc
+		| _ ->
+			acc
+	in
+	let meta = if is_explicit_impl then
+			(Meta.NoCompletion,[],p) :: (Meta.SkipReflection,[],p) :: meta
+		else
+			meta
+	in
+	(* let meta = if List.mem OSynchronized m.mflags.mf_interop then *)
+	(*	(Meta.Synchronized,[],p) :: meta *)
+	(* else *)
+	(*	meta *)
+	(* in *)
+
+	let rec change_sig = function
+		| LManagedPointer s -> LManagedPointer (change_sig s)
+		| LPointer s -> LPointer (change_sig s)
+		| LValueType (p,pl) -> LValueType(p, List.map change_sig pl)
+		| LClass (p,pl) -> LClass(p, List.map change_sig pl)
+		| LTypeParam i -> LObject
+		| LVector s -> LVector (change_sig s)
+		| LArray (s,a) -> LArray (change_sig s, a)
+		| LMethod (c,r,args) -> LMethod (c, change_sig r, List.map change_sig args)
+		| p -> p
+	in
+	let change_sig = if !is_static then change_sig else (fun s -> s) in
+
+	let ret =
+		if String.length cff_name > 4 && String.sub cff_name 0 4 = "set_" then
+			match m.mret.snorm, m.margs with
+			| LVoid, [_,_,s] ->
+				s.snorm
+			| _ -> m.mret.snorm
+		else
+			m.mret.snorm
+	in
+
+	let kind =
+		let args = List.map (fun (name,flag,s) ->
+			let t = match s.snorm with
+				| LManagedPointer s ->
+					let is_out = List.mem POut flag.pf_io && not (List.mem PIn flag.pf_io) in
+					let name = if is_out then "Out" else "Ref" in
+					mk_type_path ctx (["cs"],[],name) [ TPType (convert_signature ctx p s,null_pos) ]
+				| _ ->
+					convert_signature ctx p (change_sig s.snorm)
+			in
+			(name,null_pos),false,[],Some (t,null_pos),None) m.margs
+		in
+		let ret = convert_signature ctx p (change_sig ret) in
+		let types = List.map (fun t ->
+			{
+				tp_name = "M" ^ string_of_int t.tnumber,null_pos;
+				tp_params = [];
+				tp_constraints = None;
+				tp_meta = [];
+			}
+		) m.mtypes in
+		FFun {
+			f_params = types;
+			f_args = args;
+			f_type = Some (ret,null_pos);
+			f_expr = None;
+		}
+	in
+	let cff_name, cff_meta =
+		if String.get cff_name 0 = '%' then
+			let name = (String.sub cff_name 1 (String.length cff_name - 1)) in
+			"_" ^ name,
+			(Meta.Native, [EConst (String (name,SDoubleQuotes) ), cff_pos], cff_pos) :: meta
+		else
+			cff_name, meta
+	in
+	let acc = match m.moverride with
+		| None -> acc
+		| _ when cff_name = "new" -> acc
+		| Some (path,s) -> match lookup_ilclass ctx.nstd ctx.ncom path with
+			| Some ilcls when not (List.mem SInterface ilcls.cflags.tdf_semantics) ->
+				(AOverride,null_pos) :: acc
+			| None when ctx.ncom.verbose ->
+				print_endline ("(net-lib) A referenced assembly for path " ^ ilpath_s path ^ " was not found");
+				acc
+			| _ -> acc
+	in
+	{
+		cff_name = cff_name,null_pos;
+		cff_doc = cff_doc;
+		cff_pos = cff_pos;
+		cff_meta = cff_meta;
+		cff_access = acc;
+		cff_kind = kind;
+	}
+
+let convert_ilprop ctx p prop is_explicit_impl =
+	if not (Common.defined ctx.ncom Define.Unsafe) && has_unmanaged prop.psig.snorm then raise Exit;
+	let p = { p with pfile =	p.pfile ^" (" ^prop.pname ^")" } in
+	let pmflags = match prop.pget, prop.pset with
+		| Some(_,fl1), _ -> Some fl1
+		| _, Some(_,fl2) -> Some fl2
+		| _ -> None
+	in
+	let cff_access = match pmflags with
+		| Some { mf_access = FAFamily | FAFamOrAssem } -> (APrivate,null_pos)
+		| Some { mf_access = FAPublic } -> (APublic,null_pos)
+		| _ -> raise Exit (* non-public / protected fields don't interest us *)
+	in
+	let access acc = acc.mf_access in
+	let cff_access = match pmflags with
+		| Some m when List.mem CMStatic m.mf_contract ->
+			[AStatic,null_pos;cff_access]
+		| _ -> [cff_access]
+	in
+	let get = match prop.pget with
+		| None -> "never"
+		| Some(s,_) when String.length s <= 4 || String.sub s 0 4 <> "get_" ->
+			raise Exit (* special (?) getter; not used *)
+		| Some(_,m) when access m <> FAPublic -> (match access m with
+			| FAFamily
+			| FAFamOrAssem -> "null"
+			| _ -> "never")
+		| Some _ -> "get"
+	in
+	let set = match prop.pset with
+		| None -> "never"
+		| Some(s,_) when String.length s <= 4 || String.sub s 0 4 <> "set_" ->
+			raise Exit (* special (?) getter; not used *)
+		| Some(_,m) when access m <> FAPublic -> (match access m with
+			| FAFamily
+			| FAFamOrAssem -> "never"
+			| _ -> "never");
+		| Some _ -> "set"
+	in
+	if PMap.mem "net_loader_debug" ctx.ncom.defines.Define.values then
+		Printf.printf "\tproperty %s (%s,%s) : %s\n" prop.pname get set (IlMetaDebug.ilsig_s prop.psig.ssig);
+	let ilsig = match prop.psig.snorm with
+		| LMethod (_,ret,[]) -> ret
+		| s -> raise Exit
+	in
+
+	let meta = if is_explicit_impl then
+			[ Meta.NoCompletion,[],p; Meta.SkipReflection,[],p ]
+		else
+			[]
+	in
+
+	let kind =
+		FProp ((get,null_pos), (set,null_pos), Some(convert_signature ctx p ilsig,null_pos), None)
+	in
+	{
+		cff_name = prop.pname,null_pos;
+		cff_doc = None;
+		cff_pos = p;
+		cff_meta = meta;
+		cff_access = cff_access;
+		cff_kind = kind;
+	}
+
+let get_type_path ctx ct = match ct with | CTPath p -> p | _ -> assert false
+
+let is_explicit ctx ilcls i =
+	let s = match i with
+		| LClass(path,_) | LValueType(path,_) -> ilpath_s path
+		| _ -> assert false
+	in
+	let len = String.length s in
+	List.exists (fun m ->
+		String.length m.mname > len && String.sub m.mname 0 len = s
+	) ilcls.cmethods
+
+let mke e p = (e,p)
+
+let mk_special_call name p args =
+	mke (ECast( mke (EUntyped( mke (ECall( mke (EConst(Ident name)) p, args )) p )) p , None)) p
+
+let mk_this_call name p args =
+	mke (ECall( mke (EField(mke (EConst(Ident "this")) p ,name)) p, args )) p
+
+let mk_metas metas p =
+	List.map (fun m -> m,[],p) metas
+
+let mk_abstract_fun name p kind metas acc =
+	let metas = mk_metas metas p in
+	{
+		cff_name = name,null_pos;
+		cff_doc = None;
+		cff_pos = p;
+		cff_meta = metas;
+		cff_access = acc;
+		cff_kind = kind;
+	}
+
+let convert_fun_arg ctx p = function
+	| LManagedPointer s ->
+		mk_type_path ctx (["cs"],[],"Ref") [ TPType (convert_signature ctx p s,null_pos) ],p
+	| s ->
+		convert_signature ctx p s,p
+
+let convert_fun ctx p ret args =
+	let args = List.map (convert_fun_arg ctx p) args in
+	CTFunction(args, (convert_signature ctx p ret,null_pos))
+
+let get_clsname ctx cpath =
+	match netpath_to_hx ctx.nstd cpath with
+		| (_,n) -> n
+
+let convert_delegate ctx p ilcls =
+	let p = { p with pfile =	p.pfile ^" (abstract delegate)" } in
+	(* will have the following methods: *)
+	(* - new (haxeType:Func) *)
+	(* - FromHaxeFunction(haxeType) *)
+	(* - Invoke() *)
+	(* - AsDelegate():Super *)
+	(* - @:op(A+B) Add(d:absType) *)
+	(* - @:op(A-B) Remove(d:absType) *)
+	let abs_type = mk_type_path ctx (ilcls.cpath) (List.map (fun t -> TPType (mk_type_path ctx ([],[],"T" ^ string_of_int t.tnumber) [],null_pos)) ilcls.ctypes) in
+	let invoke = List.find (fun m -> m.mname = "Invoke") ilcls.cmethods in
+	let ret = invoke.mret.snorm in
+	let args = List.map (fun (_,_,s) -> s.snorm) invoke.margs in
+	let haxe_type = convert_fun ctx p ret args in
+	let types = List.map (fun t ->
+		{
+			tp_name = ("T" ^ string_of_int t.tnumber),null_pos;
+			tp_params = [];
+			tp_constraints = None;
+			tp_meta = [];
+		}
+	) ilcls.ctypes in
+	let mk_op_fn op name p =
+		let fn_name = List.assoc op cs_binops in
+		let clsname = match ilcls.cpath with
+			| (ns,inner,n) -> get_clsname ctx (ns,inner,"Delegate_"^n)
+		in
+		let expr = (ECall( (EField( (EConst(Ident (clsname)),p), fn_name ),p), [(EConst(Ident"arg1"),p);(EConst(Ident"arg2"),p)]),p) in
+		FFun {
+			f_params = types;
+			f_args = [("arg1",null_pos),false,[],Some (abs_type,null_pos),None;("arg2",null_pos),false,[],Some (abs_type,null_pos),None];
+			f_type = Some (abs_type,null_pos);
+			f_expr = Some ( (EReturn (Some expr), p) );
+		}
+	in
+	let mk_op op name =
+		let p = { p with pfile = p.pfile ^" (op " ^ name ^ ")" } in
+		{
+			cff_name = name,null_pos;
+			cff_doc = None;
+			cff_pos = p;
+			cff_meta = [ Meta.Op, [ (EBinop(op, (EConst(Ident"A"),p), (EConst(Ident"B"),p)),p) ], p ];
+			cff_access = [APublic,null_pos;AInline,null_pos;AStatic,null_pos;AExtern,null_pos];
+			cff_kind = mk_op_fn op name p;
+		}
+	in
+	let params = (List.map (fun s ->
+		TPType (mk_type_path ctx ([],[],fst s.tp_name) [],null_pos)
+	) types) in
+	let underlying_type = match ilcls.cpath with
+		| ns,inner,name ->
+			mk_type_path ctx (ns,inner,"Delegate_" ^ name) params
+	in
+
+	let fn_new = FFun {
+		f_params = [];
+		f_args = [("hxfunc",null_pos),false,[],Some (haxe_type,null_pos),None];
+		f_type = None;
+		f_expr = Some ( EBinop(Ast.OpAssign, (EConst(Ident "this"),p), (mk_special_call "__delegate__" p [EConst(Ident "hxfunc"),p]) ), p );
+	} in
+	let fn_from_hx = FFun {
+		f_params = types;
+		f_args = [("hxfunc",null_pos),false,[],Some (haxe_type,null_pos),None];
+		f_type = Some( mk_type_path ctx ilcls.cpath params,null_pos );
+		f_expr = Some( EReturn( Some (mk_special_call "__delegate__" p [EConst(Ident "hxfunc"),p] )), p);
+	} in
+	let fn_asdel = FFun {
+		f_params = [];
+		f_args = [];
+		f_type = None;
+		f_expr = Some(
+			EReturn( Some ( EConst(Ident "this"), p ) ), p
+		);
+	} in
+	let fn_new = mk_abstract_fun "new" p fn_new [] [APublic,null_pos;AInline,null_pos;AExtern,null_pos] in
+	let fn_from_hx = mk_abstract_fun "FromHaxeFunction" p fn_from_hx [Meta.From] [APublic,null_pos;AInline,null_pos;AStatic,null_pos;AExtern,null_pos] in
+	let fn_asdel = mk_abstract_fun "AsDelegate" p fn_asdel [] [APublic,null_pos;AInline,null_pos;AExtern,null_pos] in
+	let _, c = netpath_to_hx ctx.nstd ilcls.cpath in
+	EAbstract {
+		d_name = netname_to_hx c,null_pos;
+		d_doc = None;
+		d_params = types;
+		d_meta = mk_metas [Meta.Delegate; Meta.Forward] p;
+		d_flags = [AbOver (underlying_type,null_pos)];
+		d_data = [fn_new;fn_from_hx;fn_asdel;mk_op Ast.OpAdd "Add";mk_op Ast.OpSub "Remove"];
+	}
+
+let convert_ilclass ctx p ?(delegate=false) ilcls = match ilcls.csuper with
+	| Some { snorm = LClass ((["System"],[],"Enum"),[]) } ->
+		convert_ilenum ctx p ilcls
+	| _ ->
+		let flags = ref [HExtern] in
+		(* todo: instead of CsNative, use more specific definitions *)
+		if PMap.mem "net_loader_debug" ctx.ncom.defines.Define.values then begin
+			let sup = match ilcls.csuper with | None -> [] | Some c -> [IlMetaDebug.ilsig_s c.ssig] in
+			let sup = sup @ List.map (fun i -> IlMetaDebug.ilsig_s i.ssig) ilcls.cimplements in
+			print_endline ("converting " ^ ilpath_s ilcls.cpath ^ " : " ^ (String.concat ", " sup))
+		end;
+		let meta = ref [Meta.CsNative, [], p; Meta.Native, [EConst (String (ilpath_s ilcls.cpath,SDoubleQuotes) ), p], p] in
+		let force_check = Common.defined ctx.ncom Define.ForceLibCheck in
+		if not force_check then
+			meta := (Meta.LibType,[],p) :: !meta;
+
+		let is_interface = ref false in
+		List.iter (fun f -> match f with
+			| SSealed ->
+				flags := HFinal :: !flags
+			| SInterface ->
+				is_interface := true;
+				flags := HInterface :: !flags
+			| SAbstract -> meta := (Meta.Abstract, [], p) :: !meta
+			| _ -> ()
+		) ilcls.cflags.tdf_semantics;
+
+		(* (match ilcls.cflags.tdf_vis with *)
+		(*	| VPublic | VNestedFamOrAssem | VNestedFamily -> () *)
+		(*	| _ -> raise Exit); *)
+		(match ilcls.csuper with
+			| Some { snorm = LClass ( (["System"],[],"Object"), [] ) } -> ()
+			| Some ({ snorm = LClass ( (["System"],[],"ValueType"), [] ) } as s) ->
+				flags := HExtends (get_type_path ctx (convert_signature ctx p s.snorm),null_pos) :: !flags;
+				meta := (Meta.Struct,[],p) :: !meta
+			| Some { snorm = LClass ( (["haxe";"lang"],[],"HxObject"), [] ) } ->
+				meta := (Meta.HxGen,[],p) :: !meta
+			| Some s ->
+				flags := HExtends (get_type_path ctx (convert_signature ctx p s.snorm),null_pos) :: !flags
+			| _ -> ());
+
+			let has_explicit_ifaces = ref false in
+			List.iter (fun i ->
+				match i.snorm with
+				| LClass ( (["haxe";"lang"],[], "IHxObject"), _ ) ->
+					meta := (Meta.HxGen,[],p) :: !meta
+				(* | i when is_explicit ctx ilcls i -> () *)
+				| i ->
+					if is_explicit ctx ilcls i then has_explicit_ifaces := true;
+					flags := if !is_interface then
+						HExtends (get_type_path ctx (convert_signature ctx p i),null_pos) :: !flags
+					else
+						HImplements (get_type_path ctx (convert_signature ctx p i),null_pos) :: !flags
+			) ilcls.cimplements;
+			(* this is needed because of explicit interfaces. see http://msdn.microsoft.com/en-us/library/aa288461(v=vs.71).aspx *)
+			(* explicit interfaces can't be mapped into Haxe in any way - since their fields can't be accessed directly, but they still implement that interface *)
+			if !has_explicit_ifaces && force_check then (* do not check on this specific case *)
+				meta := (Meta.LibType,[],p) :: !meta;
+
+			(* ArrayAccess *)
+			ignore (List.exists (function
+			| { psig = { snorm = LMethod(_,ret,[v]) } } ->
+				flags := if !is_interface then
+					(HExtends( raw_type_path ctx ([],"ArrayAccess") [ TPType (convert_signature ctx p ret,null_pos) ],null_pos) :: !flags)
+				else
+					(HImplements( raw_type_path ctx ([],"ArrayAccess") [ TPType (convert_signature ctx p ret,null_pos) ],null_pos) :: !flags);
+				true
+			| _ -> false) ilcls.cprops);
+
+			let fields = ref [] in
+			let run_fields fn f =
+				List.iter (fun f ->
+					try
+						fields := fn f :: !fields
+					with
+						| Exit -> ()
+				) f
+			in
+			let meths = if !is_interface then
+					List.filter (fun m -> m.moverride = None) ilcls.cmethods
+				else
+					ilcls.cmethods
+			in
+			run_fields (fun m ->
+				convert_ilmethod ctx p m (List.exists (fun m2 -> m != m2 && String.get m2.mname 0 <> '.' && String.ends_with m2.mname ("." ^ m.mname)) meths)
+			) meths;
+			run_fields (convert_ilfield ctx p) ilcls.cfields;
+			run_fields (fun prop ->
+				convert_ilprop ctx p prop (List.exists (fun p2 -> prop != p2 && String.get p2.pname 0 <> '.' && String.ends_with p2.pname ("." ^ prop.pname)) ilcls.cprops)
+			) ilcls.cprops;
+			run_fields (convert_ilevent ctx p) ilcls.cevents;
+
+			let params = List.map (fun p ->
+				{
+					tp_name = "T" ^ string_of_int p.tnumber,null_pos;
+					tp_params = [];
+					tp_constraints = None;
+					tp_meta = [];
+				}) ilcls.ctypes
+			in
+
+			if delegate then begin
+				(* add op_Addition and op_Subtraction *)
+				let path = ilcls.cpath in
+				let thist = mk_type_path ctx path (List.map (fun t -> TPType (mk_type_path ctx ([],[],"T" ^ string_of_int t.tnumber) [],null_pos)) ilcls.ctypes) in
+				let op name =
+					{
+						cff_name = name,null_pos;
+						cff_doc = None;
+						cff_pos = p;
+						cff_meta = [];
+						cff_access = [APublic,null_pos;AStatic,null_pos];
+						cff_kind = FFun {
+							f_params = params;
+							f_args = [("arg1",null_pos),false,[],Some (thist,null_pos),None;("arg2",null_pos),false,[],Some (thist,null_pos),None];
+							f_type = Some (thist,null_pos);
+							f_expr = None;
+						};
+					}
+				in
+				fields := op "op_Addition" :: op "op_Subtraction" :: !fields;
+			end;
+			let path = match ilcls.cpath with
+				| ns,inner,name when delegate ->
+					ns,inner,"Delegate_"^name
+				| _ -> ilcls.cpath
+			in
+			let _, c = netpath_to_hx ctx.nstd path in
+			EClass {
+				d_name = netname_to_hx c,null_pos;
+				d_doc = None;
+				d_params = params;
+				d_meta = !meta;
+				d_flags = !flags;
+				d_data = !fields;
+			}
+
+type il_any_field =
+	| IlField of ilfield
+	| IlMethod of ilmethod
+	| IlProp of ilprop
+
+let get_fname = function
+	| IlField f -> f.fname
+	| IlMethod m -> m.mname
+	| IlProp p -> p.pname
+
+let is_static = function
+	| IlField f ->
+		List.mem CStatic f.fflags.ff_contract
+	| IlMethod m ->
+		List.mem CMStatic m.mflags.mf_contract
+	| IlProp p ->
+		List.exists (function
+		 | None -> false
+		 | Some (_,m) -> List.mem CMStatic m.mf_contract
+		) [p.pget;p.pset]
+	(* | _ -> false *)
+
+let change_name name = function
+	| IlField f -> IlField { f with fname = name }
+	| IlMethod m -> IlMethod { m with mname = name }
+	| IlProp p -> IlProp { p with pname = name }
+
+let compatible_methods m1 m2 = match m1,m2 with
+	| IlMethod { msig = { snorm = LMethod(_,ret1,args1) } }, IlMethod { msig = { snorm = LMethod(_,ret2,args2) } } ->
+		ret1 = ret2 && args1 = args2
+	| _ -> false
+
+let ilcls_from_ilsig ctx ilsig =
+	let path, params = match ilsig with
+		| LClass(path, params) | LValueType(path, params) ->
+			path, params
+		| LObject ->
+			(["System"],[],"Object"),[]
+		| _ -> raise Not_found (* all other types won't appear as superclass *)
+	in
+	match lookup_ilclass ctx.nstd ctx.ncom path with
+	| None -> raise Not_found
+	| Some c ->
+		c, params
+
+let rec ilapply_params params = function
+	| LManagedPointer s -> LManagedPointer (ilapply_params params s)
+	| LPointer s -> LPointer (ilapply_params params s)
+	| LValueType (p,pl) -> LValueType(p, List.map (ilapply_params params) pl)
+	| LClass (p,pl) -> LClass(p, List.map (ilapply_params params) pl)
+	| LTypeParam i ->
+		List.nth params i (* TODO: maybe i - 1? *)
+	| LVector s -> LVector (ilapply_params params s)
+	| LArray (s,a) -> LArray (ilapply_params params s, a)
+	| LMethod (c,r,args) -> LMethod (c, ilapply_params params r, List.map (ilapply_params params) args)
+	| p -> p
+
+let ilcls_with_params ctx cls params =
+	match cls.ctypes with
+	| [] -> cls
+	| _ ->
+		{ cls with
+			cfields = List.map (fun f -> { f with fsig = { f.fsig with snorm = ilapply_params params f.fsig.snorm } }) cls.cfields;
+			cmethods = List.map (fun m -> { m with
+				msig = { m.msig with snorm = ilapply_params params m.msig.snorm };
+				margs = List.map (fun (n,f,s) -> (n,f,{ s with snorm = ilapply_params params s.snorm })) m.margs;
+				mret = { m.mret with snorm = ilapply_params params m.mret.snorm };
+			}) cls.cmethods;
+			cprops = List.map (fun p -> { p with psig = { p.psig with snorm = ilapply_params params p.psig.snorm } }) cls.cprops;
+			csuper = Option.map (fun s -> { s with snorm = ilapply_params params s.snorm } ) cls.csuper;
+			cimplements = List.map (fun s -> { s with snorm = ilapply_params params s.snorm } ) cls.cimplements;
+		}
+
+let rec compatible_params t1 t2 = match t1,t2 with
+	| LManagedPointer(s1), LManagedPointer(s2) -> compatible_params s1 s2
+	| LManagedPointer(s1), s2 | s1, LManagedPointer(s2) ->
+		compatible_params s1 s2
+	| _ -> t1 = t2
+
+let compatible_methods m1 m2 = match m1, m2 with
+	| LMethod(_,r1,a1), LMethod(_,r2,a2) -> (try
+		List.for_all2 (fun a1 a2 -> compatible_params a1 a2) a1 a2
+	with | Invalid_argument _ ->
+		false)
+	| _ -> false
+
+let compatible_field f1 f2 = match f1, f2 with
+	| IlMethod { msig = { snorm = LMethod(_,_,a1) } },
+		IlMethod { msig = { snorm = LMethod(_,_,a2) } } ->
+			a1 = a2
+	| IlProp p1, IlProp p2 ->
+			(* p1.psig.snorm = p2.psig.snorm *)
+			true
+	| IlField f1, IlField f2 ->
+			(* f1.fsig.snorm = f2.fsig.snorm *)
+			true
+	| _ -> false
+
+let get_all_fields cls =
+	let all_fields = List.map (fun f -> IlField f, cls.cpath, f.fname, List.mem CStatic f.fflags.ff_contract) cls.cfields in
+	let all_fields = all_fields @ List.map (fun m -> IlMethod m, cls.cpath, m.mname, List.mem CMStatic m.mflags.mf_contract) cls.cmethods in
+	let all_fields = all_fields @ List.map (fun p -> IlProp p, cls.cpath, p.pname, is_static (IlProp p)) cls.cprops in
+	all_fields
+
+let normalize_ilcls ctx cls =
+	let force_check = Common.defined ctx.ncom Define.ForceLibCheck in
+	(* first filter out overloaded fields of same signature *)
+	let rec loop acc = function
+		| [] -> acc
+		| m :: cmeths ->
+			let static = List.mem CMStatic m.mflags.mf_contract in
+			if List.exists (fun m2 -> m.mname = m2.mname && List.mem CMStatic m2.mflags.mf_contract = static && compatible_methods m.msig.snorm m2.msig.snorm) cmeths then
+				loop acc cmeths
+			else
+				loop (m :: acc) cmeths
+	in
+	let meths = loop [] cls.cmethods in
+	(* fix overrides *)
+	(* get only the methods that aren't declared as override, but may be *)
+	let meths = List.map (fun v -> ref v) meths in
+	let no_overrides = List.filter (fun m ->
+		let m = !m in
+		not (List.mem CMStatic m.mflags.mf_contract)
+	) meths in
+	let no_overrides = ref no_overrides in
+
+	let all_fields = ref [] in
+	let all_events_name = Hashtbl.create 0 in
+	(* avoid naming collision between events and functions *)
+	let add_cls_events_collision cls =
+		List.iter (fun m -> if not (List.mem CMStatic m.mflags.mf_contract) then Hashtbl.replace all_events_name m.mname true) cls.cmethods;
+		List.iter (fun p -> if not (is_static (IlProp p)) then Hashtbl.replace all_events_name p.pname true) cls.cprops;
+	in
+
+	let rec loop cls = try
+		match cls.csuper with
+		| Some { snorm = LClass((["System"],[],"Object"),_) }
+		| Some { snorm = LObject } | None -> ()
+		| Some s ->
+			let cls, params = ilcls_from_ilsig ctx s.snorm in
+			let cls = ilcls_with_params ctx cls params in
+			if force_check then no_overrides := List.filter (fun v ->
+				let m = !v in
+				let is_override_here = List.exists (fun m2 ->
+					m2.mname = m.mname && not (List.mem CMStatic m2.mflags.mf_contract) && compatible_methods m.msig.snorm m2.msig.snorm
+				) cls.cmethods in
+				if is_override_here then v := { m with moverride = Some(cls.cpath, m.mname) };
+				not is_override_here
+			) !no_overrides;
+			all_fields := get_all_fields cls @ !all_fields;
+
+			add_cls_events_collision cls;
+			List.iter (fun ev -> Hashtbl.replace all_events_name ev.ename true) cls.cevents;
+
+			loop cls
+		with | Not_found -> ()
+	in
+	loop cls;
+
+	add_cls_events_collision cls;
+	if force_check then List.iter (fun v -> v := { !v with moverride = None }) !no_overrides;
+	let added = ref [] in
+
+	let current_all = ref (get_all_fields cls @ !all_fields) in
+	(* look for interfaces and add missing implementations (some methods' implementation is optional) *)
+	let rec loop_interface cls iface = try
+		match iface.snorm with
+		| LClass((["System"],[],"Object"),_) | LObject -> ()
+		| LClass(path,_) when path = cls.cpath -> ()
+		| s ->
+			let cif, params = ilcls_from_ilsig ctx s in
+			let cif = ilcls_with_params ctx cif params in
+			List.iter (function
+				| (f,_,name,false) as ff ->
+					(* look for compatible fields *)
+					if not (List.exists (function
+						| (f2,_,name2,false) when (name = name2 || String.ends_with name2 ("." ^ name)) -> (* consider explicit implementations as implementations *)
+							compatible_field f f2
+						| _ -> false
+					) !current_all) then begin
+						current_all := ff :: !current_all;
+						added := ff :: !added
+					end else
+						(* ensure it's public *)
+						List.iter (fun mref -> match !mref with
+							| m when m.mname = name && compatible_field f (IlMethod m) ->
+								mref := { m with mflags = { m.mflags with mf_access = FAPublic } }
+							| _ -> ()
+						) meths
+				| _ -> ()
+			) (get_all_fields cif);
+			List.iter (loop_interface cif) cif.cimplements
+		with | Not_found -> ()
+	in
+	List.iter (loop_interface cls) cls.cimplements;
+	let added = List.map (function
+		| (IlMethod m,a,name,b) when m.mflags.mf_access <> FAPublic ->
+			(IlMethod { m with mflags = { m.mflags with mf_access = FAPublic } },a,name,b)
+		| (IlField f,a,name,b) when f.fflags.ff_access <> FAPublic ->
+			(IlField { f with fflags = { f.fflags with ff_access = FAPublic } },a,name,b)
+		| s -> s
+	) !added in
+
+	(* filter out properties that were already declared *)
+	let props = if force_check then List.filter (function
+			| p ->
+				let static = is_static (IlProp p) in
+				let name = p.pname in
+				not (List.exists (function (IlProp _,_,n,s) -> s = static && name = n | _ -> false) !all_fields)
+			(* | _ -> false *)
+		) cls.cprops
+		else
+			cls.cprops
+	in
+	let cls = { cls with cmethods = List.map (fun v -> !v) meths; cprops = props } in
+
+	let clsfields = (get_all_fields cls) @ added in
+	let super_fields = !all_fields in
+	all_fields := clsfields @ !all_fields;
+	let refclsfields = (List.map (fun v -> ref v) clsfields) in
+	(* search static / non-static name clash *)
+	(* change field name to not collide with haxe keywords *)
+	let fold_field acc v =
+		let f, p, name, is_static = !v in
+		let change, copy = match name with
+		| _ when is_haxe_keyword name ->
+			true, false
+		| _ ->
+			((is_static && List.exists (function | (f,_,n,false) -> name = n | _ -> false) !all_fields) ||
+			(not is_static && match f with (* filter methods that have the same name as fields *)
+			| IlMethod _ ->
+				List.exists (function | ( (IlProp _ | IlField _),_,n,false) -> name = n | _ -> false) super_fields ||
+				List.exists (function | ( (IlProp _ | IlField _),_,n,s) -> name = n | _ -> false) clsfields
+			| _ -> false)), true
+		in
+		if change then begin
+			let name = "%" ^ name in
+			let changed = change_name name f, p, name, is_static in
+			if not copy then
+				v := changed;
+			if copy then
+				v :: ref changed :: acc
+			else
+				v :: acc
+		end else
+			v :: acc
+	in
+	let refclsfields = List.fold_left fold_field [] refclsfields in
+
+	let rec fold (fields,methods,props) f = match !f with
+		| IlField f,_,_,_ -> f :: fields,methods,props
+		| IlMethod m,_,_,_ -> fields,m :: methods,props
+		| IlProp p,_,_,_ -> fields,methods,p :: props
+	in
+	let fields, methods, props = List.fold_left fold ([],[],[]) refclsfields in
+	{ cls with
+		cfields = fields;
+		cprops = props;
+		cmethods = methods;
+		cevents = List.filter (fun ev -> not (Hashtbl.mem all_events_name ev.ename)) cls.cevents;
+	}
+
+let add_net_std com file =
+	com.net_std <- file :: com.net_std
+
+class net_library com name file_path std = object(self)
+	inherit [net_lib_type,unit] native_library name file_path
+
+	val mutable ilctx = None
+	val cache = Hashtbl.create 0
+
+	method private netpath_to_hx =
+		netpath_to_hx std
+
+	method load =
+		let r = PeReader.create_r (open_in_bin file_path) com.defines.Define.values in
+		let ctx = PeReader.read r in
+		let clr_header = PeReader.read_clr_header ctx in
+		let cache = IlMetaReader.create_cache () in
+		let meta = IlMetaReader.read_meta_tables ctx clr_header cache in
+		close_in (r.PeReader.ch);
+		if PMap.mem "net_loader_debug" com.defines.Define.values then
+			print_endline ("for lib " ^ file_path);
+		let il_typedefs = Hashtbl.copy meta.il_typedefs in
+		Hashtbl.clear meta.il_typedefs;
+
+		Hashtbl.iter (fun _ td ->
+			let path = IlMetaTools.get_path (TypeDef td) in
+			if PMap.mem "net_loader_debug" com.defines.Define.values then
+				Printf.printf "found %s\n" (s_type_path (self#netpath_to_hx path));
+			Hashtbl.replace com.net_path_map (self#netpath_to_hx path) path;
+			Hashtbl.replace meta.il_typedefs path td
+		) il_typedefs;
+		let meta = { nstd = std; ncom = com; nil = meta } in
+		ilctx <- Some meta
+
+	method get_ctx = match ilctx with
+		| None ->
+			self#load;
+			self#get_ctx
+		| Some ctx ->
+			ctx
+
+	method close =
+		()
+
+	method list_modules =
+		Hashtbl.fold (fun path _ acc -> match path with
+			| _,_ :: _, _ -> acc
+			| _ -> self#netpath_to_hx path :: acc) (self#get_ctx).nil.il_typedefs []
+
+	method lookup path : net_lib_type =
+		try
+			Hashtbl.find cache path
+		with | Not_found -> try
+			let ctx = self#get_ctx in
+			let ns, n, cl = hxpath_to_net ctx path in
+			let cls = IlMetaTools.convert_class ctx.nil (ns,n,cl) in
+			let cls = normalize_ilcls ctx cls in
+			Hashtbl.add cache path (Some cls);
+			Some cls
+		with | Not_found ->
+			Hashtbl.add cache path None;
+			None
+
+	method build (path : path) (p : pos) : Ast.package option =
+		let p = { pfile = file_path ^ " @ " ^ s_type_path path; pmin = 0; pmax = 0; } in
+		let pack = match fst path with | ["haxe";"root"] -> [] | p -> p in
+		let cp = ref [] in
+		let rec build path = try
+			if PMap.mem "net_loader_debug" com.defines.Define.values then
+				Printf.printf "looking up %s\n" (s_type_path path);
+			match self#lookup path with
+			| Some({csuper = Some{snorm = LClass( (["System"],[],("Delegate"|"MulticastDelegate")),_)}} as cls)
+				when List.mem SSealed cls.cflags.tdf_semantics ->
+				let ctx = self#get_ctx in
+				let hxcls = convert_ilclass ctx p ~delegate:true cls in
+				let delegate = convert_delegate ctx p cls in
+				cp := (hxcls,p) :: (delegate,p) :: !cp;
+				List.iter (fun ilpath ->
+					let path = netpath_to_hx std ilpath in
+					build path
+				) cls.cnested
+			| Some cls ->
+				let ctx = self#get_ctx in
+				let hxcls = convert_ilclass ctx p cls in
+				cp := (hxcls,p) :: !cp;
+				List.iter (fun ilpath ->
+					let path = netpath_to_hx std ilpath in
+					build path
+				) cls.cnested
+			| _ -> ()
+		with | Not_found | Exit ->
+			()
+		in
+		build path;
+		match !cp with
+			| [] -> None
+			| cp -> Some (pack,cp)
+
+	method get_data = ()
+
+	initializer
+		if std then self#add_flag FlagIsStd
+end
+
+let add_net_lib com file std extern =
+	let real_file = if Sys.file_exists file then
+		file
+	else try Common.find_file com file with
+		| Not_found -> try Common.find_file com (file ^ ".dll") with
+		| Not_found ->
+			failwith (".NET lib " ^ file ^ " not found")
+	in
+	let net_lib = new net_library com file real_file std in
+	if extern then net_lib#add_flag FlagIsExtern;
+	com.native_libs.net_libs <- (net_lib :> (net_lib_type,unit) native_library) :: com.native_libs.net_libs;
+	CommonCache.handle_native_lib com net_lib
+
+let before_generate com =
+	(* netcore version *)
+	let netcore_ver = try Some(PMap.find "netcore_ver" com.defines.Define.values) with Not_found -> None in
+
+	(* net version *)
+	let net_ver =
+		try
+			let ver = PMap.find "net_ver" com.defines.Define.values in
+			try int_of_string ver with Failure _ -> raise (Arg.Bad "Invalid value for -D net-ver. Expected format: xx (e.g. 20, 35, 40, 45)")
+		with Not_found when netcore_ver != None ->
+			(* 4.7 was released around .NET core 2.1 *)
+			(* Note: better version mapping should be implemented some day,
+			 * unless we just wait for .NET unification in october 2020 *)
+			Common.define_value com Define.NetVer "47";
+			47
+		| Not_found ->
+			Common.define_value com Define.NetVer "20";
+			20
+	in
+	if net_ver < 20 then
+		failwith (
+			".NET version is defined to target .NET "
+			^ string_of_int net_ver
+			^ ", but the compiler can only output code to versions equal or superior to .NET 2.0 (defined as 20)"
+		);
+	let rec loop = function
+		| v :: acc when v <= net_ver ->
+			Common.raw_define com ("NET_" ^ string_of_int v);
+			loop acc
+		| _ -> ()
+	in
+	loop [20;21;30;35;40;45];
+
+	(* net target *)
+	let net_target = try
+			String.lowercase (PMap.find "net_target" com.defines.Define.values)
+		with | Not_found ->
+			"net"
+	in
+	Common.define_value com Define.NetTarget net_target;
+	Common.raw_define com net_target;
+
+	(* std dirs *)
+	let stds = match com.net_std with
+		| [] -> ["netlib"]
+		| s -> s
+	in
+	(* look for all dirs that have the digraph NET_TARGET-NET_VER *)
+	let digraph = match net_target with
+	| "netcore" ->
+		(match netcore_ver with
+		| None -> failwith (".NET target is defined as netcore but -D netcore-ver is missing");
+		| Some(ver) -> net_target ^ "-" ^ ver);
+	| _ -> net_target ^ "-" ^ string_of_int net_ver in
+
+	let matched = ref [] in
+	List.iter (fun f -> try
+		let f = Common.find_file com (f ^ "/" ^ digraph) in
+		matched := (f, Unix.opendir f) :: !matched
+	with | _ -> ()) stds;
+
+	if !matched = [] then failwith (
+		"No .NET std lib directory with the pattern '" ^ digraph ^ "' was found in the -net-std search path. " ^
+		"Try updating the hxcs lib to the latest version, or specifying another -net-std path.");
+	List.iter (fun (path,f) ->
+		let rec loop () =
+			try
+				let f = Unix.readdir f in
+				let finsens = String.lowercase f in
+				if String.ends_with finsens ".dll" then
+					add_net_lib com (path ^ "/" ^ f) true false ();
+				loop()
+			with | End_of_file ->
+				Unix.closedir f
+		in
+		loop()
+	) !matched
diff --git a/src/codegen/gencommon/abstractImplementationFix.ml b/src/codegen/gencommon/abstractImplementationFix.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b27949f03cec66dbd599c19a2f76be7cae0a79e7
--- /dev/null
+++ b/src/codegen/gencommon/abstractImplementationFix.ml
@@ -0,0 +1,43 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Type
+open Gencommon
+
+(** add abstract type parameters to abstract implementation methods *)
+let add_abstract_params = function
+	| TClassDecl ({ cl_kind = KAbstractImpl a } as c) ->
+		List.iter (
+			function
+			| ({ cf_name = "_new" } as cf) ->
+				cf.cf_params <- cf.cf_params @ a.a_params
+			| cf when Meta.has Meta.Impl cf.cf_meta ->
+				(match cf.cf_expr with
+				| Some({ eexpr = TFunction({ tf_args = (v, _) :: _ }) }) when Meta.has Meta.This v.v_meta ->
+					cf.cf_params <- cf.cf_params @ a.a_params
+				| _ -> ())
+			| _ -> ()
+		) c.cl_ordered_statics
+	| _ -> ()
+
+let name = "abstract_implementation_fix"
+let priority = solve_deps name []
+
+let configure gen =
+	let run md = (add_abstract_params md; md) in
+	gen.gmodule_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/arrayDeclSynf.ml b/src/codegen/gencommon/arrayDeclSynf.ml
new file mode 100644
index 0000000000000000000000000000000000000000..bcdc3f7de6d8e5cbb9795e8b1d78b5b6914ad141
--- /dev/null
+++ b/src/codegen/gencommon/arrayDeclSynf.ml
@@ -0,0 +1,51 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Type
+open Gencommon
+
+(*
+	A syntax filter that will change array declarations to the actual native array declarations plus
+	the haxe array initialization
+
+	dependencies:
+		Must run after ObjectDeclMap since it can add TArrayDecl expressions
+*)
+let init (native_array_cl : tclass) (change_type_params : module_type -> t list -> t list) =
+	let rec run e =
+		match e.eexpr with
+		| TArrayDecl el ->
+			let cl, params = match follow e.etype with
+				| TInst(({ cl_path = ([], "Array") } as cl), ( _ :: _  as params)) -> cl, params
+				| TInst(({ cl_path = ([], "Array") } as cl), []) -> cl, [t_dynamic]
+				| _ -> assert false
+			in
+			let params = change_type_params (TClassDecl cl) params in
+			let e_inner_decl = mk (TArrayDecl (List.map run el)) (TInst (native_array_cl, params)) e.epos in
+			mk (TNew (cl, params, [e_inner_decl])) e.etype e.epos
+		| _ ->
+			Type.map_expr run e
+	in
+	run
+
+let name = "array_decl_synf"
+let priority = solve_deps name [DAfter ObjectDeclMap.priority]
+
+let configure gen native_array_cl change_type_params =
+	let run = init native_array_cl change_type_params in
+	gen.gsyntax_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/arraySpliceOptimization.ml b/src/codegen/gencommon/arraySpliceOptimization.ml
new file mode 100644
index 0000000000000000000000000000000000000000..0abeddb94c258c9c158b9d4397dcda3479235bb4
--- /dev/null
+++ b/src/codegen/gencommon/arraySpliceOptimization.ml
@@ -0,0 +1,40 @@
+open Common
+open Type
+open Gencommon
+
+(*
+	This filter finds lone array.splice(...) calls within blocks
+	and replaces them with array.spliceVoid(...) calls
+	that don't allocate additional array for removed items.
+*)
+let init com =
+	let rec run e =
+		match e.eexpr with
+		| TBlock el ->
+			let el = List.map (fun e ->
+				match e.eexpr with
+				| TCall ({ eexpr = TField (eobj, FInstance ({ cl_path = [],"Array" } as cl, params, { cf_name = "splice" })) } as e_splice, args) ->
+					let f_spliceVoid = PMap.find "spliceVoid" cl.cl_fields in
+					let e_spliceVoid = { e_splice with
+						eexpr = TField (eobj, FInstance (cl, params, f_spliceVoid));
+						etype = f_spliceVoid.cf_type;
+					} in
+					{ e with
+						eexpr = TCall (e_spliceVoid, args);
+						etype = com.basic.tvoid;
+					}
+				| _ ->
+					run e
+			) el in
+			{ e with eexpr = TBlock el }
+		| _ ->
+			Type.map_expr run e
+	in
+	run
+
+let name = "array_splice_synf"
+let priority = solve_deps name [DAfter ExpressionUnwrap.priority]
+
+let configure gen =
+	let run = init gen.gcon in
+	gen.gsyntax_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/castDetect.ml b/src/codegen/gencommon/castDetect.ml
new file mode 100644
index 0000000000000000000000000000000000000000..a240de57d4734236dd0ec48dad7e6dd9d0bd9dae
--- /dev/null
+++ b/src/codegen/gencommon/castDetect.ml
@@ -0,0 +1,1262 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Option
+open Common
+open Ast
+open Globals
+open Type
+open Codegen
+open Gencommon
+
+(* ******************************************* *)
+(* Casts detection v2 *)
+(* ******************************************* *)
+(*
+	Will detect implicit casts and add TCast for them. Since everything is already followed by follow_all, typedefs are considered a new type altogether
+
+	Types shouldn't be cast if:
+		* When an instance is being coerced to a superclass or to an implemented interface
+		* When anything is being coerced to Dynamic
+
+	edit:
+		As a matter of performance, we will also run the type parameters casts in here. Otherwise the exact same computation would have to be performed twice,
+		with maybe even some loss of information
+
+		* TAnon / TDynamic will call
+		* Type parameter handling will be abstracted
+
+	dependencies:
+		Must run before ExpressionUnwrap
+
+*)
+let name = "cast_detect"
+let priority = solve_deps name [DBefore RealTypeParams.priority; DBefore ExpressionUnwrap.priority]
+
+(* ******************************************* *)
+(* ReturnCast *)
+(* ******************************************* *)
+(*
+	Cast detection for return types can't be done at CastDetect time, since we need an
+	unwrapped expression to make sure we catch all return cast detections. So this module
+	is specifically to deal with that, and is configured automatically by CastDetect
+*)
+module ReturnCast =
+struct
+	let name = "return_cast"
+	let priority = solve_deps name [DAfter priority; DAfter ExpressionUnwrap.priority]
+
+	let default_implementation gen =
+		let rec extract_expr e = match e.eexpr with
+			| TParenthesis e
+			| TMeta (_,e)
+			| TCast(e,_) -> extract_expr e
+			| _ -> e
+		in
+		let current_ret_type = ref None in
+		let handle e tto tfrom = gen.ghandle_cast (gen.greal_type tto) (gen.greal_type tfrom) e in
+		let in_value = ref false in
+
+		let rec run e =
+			let was_in_value = !in_value in
+			in_value := true;
+			match e.eexpr with
+			| TReturn (eopt) ->
+				(* a return must be inside a function *)
+				let ret_type = match !current_ret_type with | Some(s) -> s | None -> gen.gcon.error "Invalid return outside function declaration." e.epos; assert false in
+				(match eopt with
+				| None when not (ExtType.is_void ret_type) ->
+					Texpr.Builder.mk_return (null ret_type e.epos)
+				| None -> e
+				| Some eret ->
+					Texpr.Builder.mk_return (handle (run eret) ret_type eret.etype))
+			| TFunction(tfunc) ->
+				let last_ret = !current_ret_type in
+				current_ret_type := Some(tfunc.tf_type);
+				let ret = Type.map_expr run e in
+				current_ret_type := last_ret;
+				ret
+			| TBlock el ->
+				{ e with eexpr = TBlock ( List.map (fun e -> in_value := false; run e) el ) }
+			| TBinop ( (Ast.OpAssign as op),e1,e2)
+			| TBinop ( (Ast.OpAssignOp _ as op),e1,e2) when was_in_value ->
+				let e1 = extract_expr (run e1) in
+				let r = { e with eexpr = TBinop(op, e1, handle (run e2) e1.etype e2.etype); etype = e1.etype } in
+				handle r e.etype e1.etype
+			| TBinop ( (Ast.OpAssign as op),({ eexpr = TField(tf, f) } as e1), e2 )
+			| TBinop ( (Ast.OpAssignOp _ as op),({ eexpr = TField(tf, f) } as e1), e2 ) ->
+				(match field_access_esp gen (gen.greal_type tf.etype) (f) with
+					| FClassField(cl,params,_,_,is_static,actual_t,_) ->
+						let actual_t = if is_static then actual_t else apply_params cl.cl_params params actual_t in
+						let e1 = extract_expr (run e1) in
+						{ e with eexpr = TBinop(op, e1, handle (run e2) actual_t e2.etype); etype = e1.etype }
+					| _ ->
+						let e1 = extract_expr (run e1) in
+						{ e with eexpr = TBinop(op, e1, handle (run e2) e1.etype e2.etype); etype = e1.etype }
+				)
+			| TBinop ( (Ast.OpAssign as op),e1,e2)
+			| TBinop ( (Ast.OpAssignOp _ as op),e1,e2) ->
+				let e1 = extract_expr (run e1) in
+				{ e with eexpr = TBinop(op, e1, handle (run e2) e1.etype e2.etype); etype = e1.etype }
+			| _ -> Type.map_expr run e
+		in
+		run
+
+	let configure gen =
+		let map = default_implementation gen in
+		gen.gsyntax_filters#add name (PCustom priority) map
+end;;
+
+(*
+	Since this function is applied under native-context only, the type paraters will already be changed
+*)
+let map_cls gen also_implements fn super =
+	let rec loop c tl =
+		if c == super then
+			fn c tl
+		else
+			(match c.cl_super with
+				| None -> false
+				| Some (cs,tls) ->
+					let tls = gen.greal_type_param (TClassDecl cs) tls in
+					loop cs (List.map (apply_params c.cl_params tl) tls)
+			)
+			||
+			(if also_implements then
+				List.exists (fun (cs,tls) -> loop cs (List.map (apply_params c.cl_params tl) tls)) c.cl_implements
+			else
+				false)
+	in
+	loop
+
+let follow_dyn t = match follow t with
+	| TMono _ | TLazy _ -> t_dynamic
+	| t -> t
+
+(*
+	this has a slight change from the type.ml version, in which it doesn't
+	change a TMono into the other parameter
+*)
+let rec type_eq gen param a b =
+	if a == b then
+		()
+	else match follow_dyn (gen.greal_type a) , follow_dyn (gen.greal_type b) with
+	| TEnum (e1,tl1) , TEnum (e2,tl2) ->
+		if e1 != e2 && not (param = EqCoreType && e1.e_path = e2.e_path) then Type.error [cannot_unify a b];
+		List.iter2 (type_eq gen param) tl1 tl2
+	| TAbstract (a1,tl1) , TAbstract (a2,tl2) ->
+		if a1 != a2 && not (param = EqCoreType && a1.a_path = a2.a_path) then Type.error [cannot_unify a b];
+		List.iter2 (type_eq gen param) tl1 tl2
+	| TInst (c1,tl1) , TInst (c2,tl2) ->
+		if c1 != c2 && not (param = EqCoreType && c1.cl_path = c2.cl_path) && (match c1.cl_kind, c2.cl_kind with KExpr _, KExpr _ -> false | _ -> true) then Type.error [cannot_unify a b];
+		List.iter2 (type_eq gen param) tl1 tl2
+	| TFun (l1,r1) , TFun (l2,r2) when List.length l1 = List.length l2 ->
+		(try
+			type_eq gen param r1 r2;
+			List.iter2 (fun (n,o1,t1) (_,o2,t2) ->
+				if o1 <> o2 then Type.error [Not_matching_optional n];
+				type_eq gen param t1 t2
+			) l1 l2
+		with
+			Unify_error l -> Type.error (cannot_unify a b :: l))
+	| TDynamic a , TDynamic b ->
+		type_eq gen param a b
+	| TAnon a1, TAnon a2 ->
+		(try
+			PMap.iter (fun n f1 ->
+				try
+					let f2 = PMap.find n a2.a_fields in
+					if f1.cf_kind <> f2.cf_kind && (param = EqStrict || param = EqCoreType || not (unify_kind f1.cf_kind f2.cf_kind)) then Type.error [invalid_kind n f1.cf_kind f2.cf_kind];
+					try
+						type_eq gen param f1.cf_type f2.cf_type
+					with
+						Unify_error l -> Type.error (invalid_field n :: l)
+				with
+					Not_found ->
+						if is_closed a2 then Type.error [has_no_field b n];
+						if not (link (ref None) b f1.cf_type) then Type.error [cannot_unify a b];
+						a2.a_fields <- PMap.add n f1 a2.a_fields
+			) a1.a_fields;
+			PMap.iter (fun n f2 ->
+				if not (PMap.mem n a1.a_fields) then begin
+					if is_closed a1 then Type.error [has_no_field a n];
+					if not (link (ref None) a f2.cf_type) then Type.error [cannot_unify a b];
+					a1.a_fields <- PMap.add n f2 a1.a_fields
+				end;
+			) a2.a_fields;
+		with
+			Unify_error l -> Type.error (cannot_unify a b :: l))
+	| _ , _ ->
+		if b == t_dynamic && (param = EqRightDynamic || param = EqBothDynamic) then
+			()
+		else if a == t_dynamic && param = EqBothDynamic then
+			()
+		else
+			Type.error [cannot_unify a b]
+
+let type_iseq gen a b =
+	try
+		type_eq gen EqStrict a b;
+		true
+	with
+		Unify_error _ -> false
+
+(* will return true if both arguments are compatible. If it's not the case, a runtime error is very likely *)
+let is_cl_related gen cl tl super superl =
+	let is_cl_related cl tl super superl = map_cls gen (match cl.cl_kind,super.cl_kind with KTypeParameter _, _ | _,KTypeParameter _ -> false | _ -> true) (fun _ _ -> true) super cl tl in
+	is_cl_related cl tl super superl || is_cl_related super superl cl tl
+
+let is_exactly_basic gen t1 t2 =
+	match gen.gfollow#run_f t1, gen.gfollow#run_f t2 with
+		| TAbstract(a1, []), TAbstract(a2, []) ->
+			a1 == a2 && Common.defined gen.gcon Define.FastCast
+		| TInst(c1, []), TInst(c2, []) ->
+			c1 == c2 && Common.defined gen.gcon Define.FastCast
+		| TEnum(e1, []), TEnum(e2, []) ->
+			e1 == e2 && Common.defined gen.gcon Define.FastCast
+		| _ ->
+			false
+
+let rec is_unsafe_cast gen to_t from_t =
+	match (follow to_t, follow from_t) with
+		| TInst(cl_to, to_params), TInst(cl_from, from_params) ->
+			not (is_cl_related gen cl_from from_params cl_to to_params)
+		| TEnum(e_to, _), TEnum(e_from, _) ->
+			e_to.e_path <> e_from.e_path
+		| TFun _, TFun _ ->
+			(* functions are never unsafe cast by default. This behavior might be changed *)
+			(* with a later AST pass which will run through TFun to TFun casts *)
+			false
+		| TMono _, _
+		| _, TMono _
+		| TDynamic _, _
+		| _, TDynamic _ ->
+			false
+		| TAnon _, _
+		| _, TAnon _ ->
+			(* anonymous are never unsafe also. *)
+			(* Though they will generate a cast, so if this cast is unneeded it's better to avoid them by tweaking gen.greal_type *)
+			false
+		| TAbstract _, _
+		| _, TAbstract _ ->
+			(try
+				unify from_t to_t;
+				false
+			with | Unify_error _ ->
+				try
+					unify to_t from_t; (* still not unsafe *)
+					false
+				with | Unify_error _ ->
+					true)
+		| _ -> true
+
+let unifies tfrom tto = try
+	unify tfrom tto;
+	true
+with | _ ->
+	false
+
+let do_unsafe_cast gen from_t to_t e	=
+	let t_path t =
+		match t with
+			| TInst(cl, _) -> cl.cl_path
+			| TEnum(e, _) -> e.e_path
+			| TType(t, _) -> t.t_path
+			| TAbstract(a, _) -> a.a_path
+			| TDynamic _ -> ([], "Dynamic")
+			| _ -> raise Not_found
+	in
+	match gen.gfollow#run_f from_t, gen.gfollow#run_f to_t with
+	| TInst({ cl_kind = KTypeParameter tl },_), t2 when List.exists (fun t -> unifies t t2) tl ->
+		mk_cast to_t (mk_cast t_dynamic e)
+	| from_t, to_t when gen.gspecial_needs_cast to_t from_t ->
+		mk_cast to_t e
+	| _ ->
+		let do_default () =
+			gen.gon_unsafe_cast to_t e.etype e.epos;
+			mk_cast to_t (mk_cast t_dynamic e)
+		in
+		(* TODO: there really should be a better way to write that *)
+		try
+			if (Hashtbl.find gen.gsupported_conversions (t_path from_t)) from_t to_t then
+				mk_cast to_t e
+			else
+				do_default()
+		with
+			| Not_found ->
+				try
+					if (Hashtbl.find gen.gsupported_conversions (t_path to_t)) from_t to_t then
+						mk_cast to_t e
+					else
+						do_default()
+				with
+					| Not_found -> do_default()
+
+(* ****************************** *)
+(* cast handler *)
+(* decides if a cast should be emitted, given a from and a to type *)
+(*
+	this function is like a mini unify, without e.g. subtyping, which makes sense
+	at the backend level, since most probably Anons and TInst will have a different representation there
+*)
+let rec handle_cast gen e real_to_t real_from_t =
+	let do_unsafe_cast () = do_unsafe_cast gen real_from_t real_to_t { e with etype = real_from_t } in
+	let to_t, from_t = real_to_t, real_from_t in
+
+	let mk_cast fast t e =
+		match e.eexpr with
+			(* TThrow is always typed as Dynamic, we just need to type it accordingly *)
+			| TThrow _ -> { e with etype = t }
+			| _ -> if fast then mk_castfast t e else mk_cast t e
+	in
+
+	let e = { e with etype = real_from_t } in
+	if try fast_eq real_to_t real_from_t with Invalid_argument _ -> false then e else
+	match real_to_t, real_from_t with
+		(* string is the only type that can be implicitly converted from any other *)
+		| TInst( { cl_path = ([], "String") }, []), TInst( { cl_path = ([], "String") }, [] ) ->
+			mk_cast true to_t e
+		| TInst( { cl_path = ([], "String") }, []), _ ->
+			mk_cast false to_t e
+		| TInst( ({ cl_path = (["cs"|"java"], "NativeArray") } as c_array), [tp_to] ), TInst({ cl_path = (["cs"|"java"], "NativeArray") }, [tp_from]) when not (type_iseq gen (gen.greal_type tp_to) (gen.greal_type tp_from)) ->
+			(* see #5751 . NativeArray is special because of its ties to Array. We could potentially deal with this for all *)
+			(* TNew expressions, but it's not that simple, since we don't want to retype the whole expression list with the *)
+			(* updated type. *)
+			(match e.eexpr with
+				| TNew(c,_,el) when c == c_array ->
+					mk_cast false (TInst(c_array,[tp_to])) { e with eexpr = TNew(c, [tp_to], el); etype = TInst(c_array,[tp_to]) }
+				| _ ->
+					e
+			)
+		| TInst(cl_to, params_to), TInst(cl_from, params_from) ->
+			let ret = ref None in
+			(*
+				this is a little confusing:
+				we are here mapping classes until we have the same to and from classes, applying the type parameters in each step, so we can
+				compare the type parameters;
+
+				If a class is found - meaning that the cl_from can be converted without a cast into cl_to,
+				we still need to check their type parameters.
+			*)
+			ignore (map_cls gen (match cl_from.cl_kind,cl_to.cl_kind with KTypeParameter _, _ | _,KTypeParameter _ -> false | _ -> true) (fun _ tl ->
+				try
+					(* type found, checking type parameters *)
+					List.iter2 (type_eq gen EqStrict) tl params_to;
+					ret := Some e;
+					true
+				with | Unify_error _ ->
+					(* type parameters need casting *)
+					if gen.ghas_tparam_cast_handler then begin
+						(*
+							if we are already handling type parameter casts on other part of code (e.g. RealTypeParameters),
+							we'll just make a cast to indicate that this place needs type parameter-involved casting
+						*)
+						ret := Some (mk_cast true to_t e);
+						true
+					end else
+						(*
+							if not, we're going to check if we only need a simple cast,
+							or if we need to first cast into the dynamic version of it
+						*)
+						try
+							List.iter2 (type_eq gen EqRightDynamic) tl params_to;
+							ret := Some (mk_cast true to_t e);
+							true
+						with | Unify_error _ ->
+							ret := Some (mk_cast true to_t (mk_cast true (TInst(cl_to, List.map (fun _ -> t_dynamic) params_to)) e));
+							true
+			) cl_to cl_from params_from);
+			if is_some !ret then
+				get !ret
+			else if is_cl_related gen cl_from params_from cl_to params_to then
+				mk_cast true to_t e
+			else
+				(* potential unsafe cast *)
+				(do_unsafe_cast ())
+		| TMono _, TMono _
+		| TMono _, TDynamic _
+		| TDynamic _, TDynamic _
+		| TDynamic _, TMono _ ->
+			e
+		| TMono _, _
+		| TDynamic _, _
+		| TAnon _, _ when gen.gneeds_box real_from_t ->
+			mk_cast false to_t e
+		| TMono _, _
+		| TDynamic _, _ -> e
+		| _, TMono _
+		| _, TDynamic _ -> mk_cast false to_t e
+		| TAnon (a_to), TAnon (a_from) ->
+			if a_to == a_from then
+				e
+			else if type_iseq gen to_t from_t then (* FIXME apply unify correctly *)
+				e
+			else
+				mk_cast true to_t e
+		| _, TAnon(anon) -> (try
+			let p2 = match !(anon.a_status) with
+			| Statics c -> TInst(c,List.map (fun _ -> t_dynamic) c.cl_params)
+			| EnumStatics e -> TEnum(e, List.map (fun _ -> t_dynamic) e.e_params)
+			| AbstractStatics a -> TAbstract(a, List.map (fun _ -> t_dynamic) a.a_params)
+			| _ -> raise Not_found
+			in
+			let tclass = match get_type gen ([],"Class") with
+			| TAbstractDecl(a) -> a
+			| _ -> assert false in
+			handle_cast gen e real_to_t (gen.greal_type (TAbstract(tclass, [p2])))
+		with | Not_found ->
+			mk_cast false to_t e)
+		| TAbstract (a_to, _), TAbstract(a_from, _) when a_to == a_from ->
+			e
+		| TAbstract _, TInst({ cl_kind = KTypeParameter _ }, _)
+		| TInst({ cl_kind = KTypeParameter _ }, _), TAbstract _ ->
+			do_unsafe_cast()
+		| TAbstract _, _
+		| _, TAbstract _ ->
+			(try
+				unify from_t to_t;
+				mk_cast true to_t e
+			with | Unify_error _ ->
+				try
+					unify to_t from_t;
+					mk_cast true to_t e
+				with | Unify_error _ ->
+					do_unsafe_cast())
+		| TEnum(e_to, []), TEnum(e_from, []) ->
+			if e_to == e_from then
+				e
+			else
+				(* potential unsafe cast *)
+				(do_unsafe_cast ())
+		| TEnum(e_to, params_to), TEnum(e_from, params_from) when e_to.e_path = e_from.e_path ->
+			(try
+					List.iter2 (type_eq gen (if gen.gallow_tp_dynamic_conversion then EqRightDynamic else EqStrict)) params_from params_to;
+					e
+				with
+					| Unify_error _ -> do_unsafe_cast ()
+			)
+		| TEnum(en, params_to), TInst(cl, params_from)
+			| TInst(cl, params_to), TEnum(en, params_from) ->
+				(* this is here for max compatibility with EnumsToClass module *)
+			if en.e_path = cl.cl_path && Meta.has Meta.Class en.e_meta then begin
+				(try
+					List.iter2 (type_eq gen (if gen.gallow_tp_dynamic_conversion then EqRightDynamic else EqStrict)) params_from params_to;
+					e
+				with
+					| Invalid_argument _ ->
+						(*
+							this is a hack for RealTypeParams. Since there is no way at this stage to know if the class is the actual
+							EnumsToClass derived from the enum, we need to imply from possible ArgumentErrors (because of RealTypeParams interfaces),
+							that they would only happen if they were a RealTypeParams created interface
+						*)
+						e
+					| Unify_error _ -> do_unsafe_cast ()
+				)
+			end else
+				do_unsafe_cast ()
+		| TType(t_to, params_to), TType(t_from, params_from) when t_to == t_from ->
+			if gen.gspecial_needs_cast real_to_t real_from_t then
+				(try
+					List.iter2 (type_eq gen (if gen.gallow_tp_dynamic_conversion then EqRightDynamic else EqStrict)) params_from params_to;
+					e
+				with
+					| Unify_error _ -> do_unsafe_cast ()
+				)
+			else
+				e
+		| TType(t_to, _), TType(t_from,_) ->
+			if gen.gspecial_needs_cast real_to_t real_from_t then
+				mk_cast false to_t e
+			else
+				e
+		| TType _, _ when gen.gspecial_needs_cast real_to_t real_from_t ->
+			mk_cast false to_t e
+		| _, TType _ when gen.gspecial_needs_cast real_to_t real_from_t ->
+			mk_cast false to_t e
+		(*| TType(t_to, _), TType(t_from, _) ->
+			if t_to.t_path = t_from.t_path then
+				e
+			else if is_unsafe_cast gen real_to_t real_from_t then (* is_unsafe_cast will already follow both *)
+				(do_unsafe_cast ())
+			else
+				mk_cast to_t e*)
+		| TType _, _
+		| _, TType _ ->
+			if is_unsafe_cast gen real_to_t real_from_t then (* is_unsafe_cast will already follow both *)
+				(do_unsafe_cast ())
+			else
+				mk_cast false to_t e
+		| TAnon anon, _ ->
+			if PMap.is_empty anon.a_fields then
+				e
+			else
+				mk_cast true to_t e
+		| TFun(args, ret), TFun(args2, ret2) ->
+			let get_args = List.map (fun (_,_,t) -> t) in
+			(try List.iter2 (type_eq gen (EqBothDynamic)) (ret :: get_args args) (ret2 :: get_args args2); e with | Unify_error _ | Invalid_argument _ -> mk_cast true to_t e)
+		| _, _ ->
+			do_unsafe_cast ()
+
+(* end of cast handler *)
+(* ******************* *)
+
+let is_static_overload c name =
+	match c.cl_super with
+	| None -> false
+	| Some (sup,_) ->
+		let rec loop c =
+			(PMap.mem name c.cl_statics) || (match c.cl_super with
+				| None -> false
+				| Some (sup,_) -> loop sup)
+		in
+		loop sup
+
+(* this is a workaround for issue #1743, as FInstance() is returning the incorrect classfield *)
+let rec clean_t t = match follow t with
+	| TAbstract(a,tl) when not (Meta.has Meta.CoreType a.a_meta) ->
+		clean_t (Abstract.get_underlying_type a tl)
+	| t -> t
+
+let select_overload gen applied_f overloads types params =
+	let rec check_arg arglist elist =
+		match arglist, elist with
+			| [], [] -> true (* it is valid *)
+			| (_,_,TAbstract({ a_path = (["haxe";"extern"],"Rest") }, [t])) :: [], elist ->
+				List.for_all (fun (_,_,et) -> Type.type_iseq (clean_t et) (clean_t t)) elist
+			| (_,_,t) :: arglist, (_,_,et) :: elist when Type.type_iseq (clean_t et) (clean_t t) ->
+				check_arg arglist elist
+			| _ -> false
+	in
+	match follow applied_f with
+	| TFun _ ->
+		replace_mono applied_f;
+		let args, _ = get_fun applied_f in
+		let elist = List.rev args in
+		let rec check_overload overloads =
+			match overloads with
+			| (t, cf) :: overloads ->
+					let cft = apply_params types params t in
+					let cft = monomorphs cf.cf_params cft in
+					let args, _ = get_fun cft in
+					if check_arg (List.rev args) elist then
+						cf,t,false
+					else if overloads = [] then
+						cf,t,true (* no compatible overload was found *)
+					else
+						check_overload overloads
+			| [] -> assert false
+		in
+		check_overload overloads
+	| _ -> match overloads with  (* issue #1742 *)
+	| (t,cf) :: [] -> cf,t,true
+	| (t,cf) :: _ -> cf,t,false
+	| _ -> assert false
+
+let rec cur_ctor c tl =
+	match c.cl_constructor with
+	| Some ctor ->
+		ctor, c, tl
+	| None ->
+		match c.cl_super with
+		| None ->
+			raise Not_found
+		| Some (sup,stl) ->
+			cur_ctor sup (List.map (apply_params c.cl_params tl) stl)
+
+let choose_ctor gen cl tparams etl maybe_empty_t p =
+	let ctor, sup, stl = cur_ctor cl tparams in
+	(* get returned stl, with Dynamic as t_empty *)
+	let rec get_changed_stl c tl =
+		if c == sup then
+			tl
+		else match c.cl_super with
+		| None -> stl
+		| Some(sup,stl) -> get_changed_stl sup (List.map (apply_params c.cl_params tl) stl)
+	in
+	let ret_tparams = List.map (fun t -> match follow t with
+		| TDynamic _ | TMono _ -> t_empty
+		| _ -> t) tparams
+	in
+	let ret_stl = get_changed_stl cl ret_tparams in
+	let ctors = ctor :: ctor.cf_overloads in
+	List.iter replace_mono etl;
+	(* first filter out or select outright maybe_empty *)
+	let ctors, is_overload = match etl, maybe_empty_t with
+		| [t], Some empty_t ->
+			let count = ref 0 in
+			let is_empty_call = Type.type_iseq t empty_t in
+			let ret = List.filter (fun cf -> match follow cf.cf_type with
+				| TFun([_,_,t],_) ->
+					replace_mono t; incr count; is_empty_call = (Type.type_iseq t empty_t)
+				| _ -> false) ctors
+			in
+			ret, !count > 1
+		| _ ->
+			let len = List.length etl in
+			let ret = List.filter (fun cf -> List.length (fst (get_fun cf.cf_type)) = len) ctors in
+			ret, (match ret with | _ :: [] -> false | _ -> true)
+	in
+	let rec check_arg arglist elist =
+		match arglist, elist with
+		| [], [] -> true
+		| (_,_,t) :: arglist, et :: elist -> (try
+			let t = run_follow gen t in
+			unify et t;
+			check_arg arglist elist
+		with | Unify_error el ->
+			(* List.iter (fun el -> gen.gcon.warning (Error.unify_error_msg (print_context()) el) p) el; *)
+			false)
+		| _ ->
+			false
+	in
+	let rec check_cf cf =
+		let t = apply_params sup.cl_params stl cf.cf_type in
+		replace_mono t;
+		let args, _ = get_fun t in
+		check_arg args etl
+	in
+	match is_overload, ctors with
+		| false, [c] ->
+			false, c, sup, ret_stl
+		| _ ->
+			is_overload, List.find check_cf ctors, sup, ret_stl
+
+let change_rest tfun elist =
+	let rec loop acc arglist elist = match arglist, elist with
+		| (_,_,TAbstract({ a_path = (["haxe";"extern"],"Rest") },[t])) :: [], elist ->
+			List.rev (List.map (fun _ -> "rest",false,t) elist @ acc)
+		| (n,o,t) :: arglist, _ :: elist ->
+			loop ((n,o,t) :: acc) arglist elist
+		| _, _ ->
+			List.rev acc
+	in
+	let args,ret = get_fun tfun in
+	TFun(loop [] args elist, ret)
+
+let fastcast_if_needed gen expr real_to_t real_from_t =
+	if Common.defined gen.gcon Define.FastCast then begin
+		if type_iseq gen real_to_t real_from_t then
+			{ expr with etype = real_to_t }
+		else
+			mk_castfast real_to_t { expr with etype=real_from_t }
+	end else
+		handle_cast gen expr real_to_t real_from_t
+
+(*
+	Type parameter handling
+	It will detect if/what type parameters were used, and call the cast handler
+	It will handle both TCall(TField) and TCall by receiving a texpr option field: e
+	Also it will transform the type parameters with greal_type_param and make
+
+	handle_impossible_tparam - should cases where the type parameter is impossible to be determined from the called parameters be Dynamic?
+	e.g. static function test<T>():T {}
+*)
+
+(* match e.eexpr with | TCall( ({ eexpr = TField(ef, f) }) as e1, elist ) -> *)
+let handle_type_parameter gen e e1 ef ~clean_ef ~overloads_cast_to_base f elist calls_parameters_explicitly =
+	(* the ONLY way to know if this call has parameters is to analyze the calling field. *)
+	(* To make matters a little worse, on both C# and Java only in some special cases that type parameters will be used *)
+	(* Namely, when using reflection type parameters are useless, of course. This also includes anonymous types *)
+	(* this will have to be handled by gparam_func_call *)
+
+	let return_var efield =
+		match e with
+			| None ->
+				efield
+			| Some ecall ->
+				match follow efield.etype with
+					| TFun(_,ret) ->
+						(* closures will be handled by the closure handler. So we will just hint what's the expected type *)
+						(* FIXME: should closures have also its arguments cast correctly? In the current implementation I think not. TO_REVIEW *)
+						handle_cast gen { ecall with eexpr = TCall(efield, elist) } (gen.greal_type ecall.etype) ret
+					| _ ->
+						{ ecall with eexpr = TCall(efield, elist) }
+	in
+
+	(* this function will receive the original function argument, the applied function argument and the original function parameters. *)
+	(* from this info, it will infer the applied tparams for the function *)
+	let infer_params pos (original_args:((string * bool * t) list * t)) (applied_args:((string * bool * t) list * t)) (params:(string * t) list) calls_parameters_explicitly : tparams =
+		match params with
+		| [] -> []
+		| _ ->
+			let args_list args = (if not calls_parameters_explicitly then t_dynamic else snd args) :: (List.map (fun (n,o,t) -> t) (fst args)) in
+
+			let monos = List.map (fun _ -> mk_mono()) params in
+			let original = args_list (get_fun (apply_params params monos (TFun(fst original_args,snd original_args)))) in
+			let applied = args_list applied_args in
+
+			(try
+				List.iter2 (fun a o ->
+					unify a o
+					(* type_eq EqStrict a o *)
+				) applied original
+				(* unify applied original *)
+			with
+				| Unify_error el ->
+						(match el with
+						(*
+							Don't emit a warning for abstracts if underlying type is the same as the second type.
+							This situation is caused by `Normalize.filter_param` not "unpacking" abstracts.
+						*)
+						| [Cannot_unify (TAbstract(a,params), b)]
+						| [Cannot_unify (b, TAbstract(a,params))] ->
+							let a = apply_params a.a_params params a.a_this in
+							if not (shallow_eq a b) then
+								gen.gcon.warning ("This expression may be invalid") pos
+						| _ ->
+							gen.gcon.warning ("This expression may be invalid") pos
+						)
+				| Invalid_argument _ ->
+						gen.gcon.warning ("This expression may be invalid") pos
+			);
+
+			List.map (fun t ->
+				match follow t with
+					| TMono _ ->	t_empty
+					| t -> t
+			) monos
+	in
+
+	let real_type = gen.greal_type ef.etype in
+	(* this part was rewritten at roughly r6477 in order to correctly support overloads *)
+	(match field_access_esp gen real_type (f) with
+	| FClassField (cl, params, _, cf, is_static, actual_t, declared_t) when e <> None && (cf.cf_kind = Method MethNormal || cf.cf_kind = Method MethInline) ->
+			(* C# target changes params with a real_type function *)
+			let params = match follow clean_ef.etype with
+				| TInst(_,params) -> params
+				| _ -> params
+			in
+			let local_mk_cast t expr =
+				(* handle_cast gen expr t expr.etype *)
+				if is_exactly_basic gen t expr.etype then
+					expr
+				else
+					mk_castfast t expr
+			in
+
+			let ecall = get e in
+			let ef = ref ef in
+			let is_overload = cf.cf_overloads <> [] || Meta.has Meta.Overload cf.cf_meta || (is_static && is_static_overload cl (field_name f)) in
+			let cf, actual_t, error = match is_overload with
+				| false ->
+						(* since actual_t from FClassField already applies greal_type, we're using the get_overloads helper to get this info *)
+						let t = if cf.cf_params = [] then (* this if statement must be eliminated - it's a workaround for #3516 + infer params. *)
+							actual_t
+						else
+							declared_t
+						in
+						cf,t,false
+				| true ->
+				let (cf, actual_t, error), is_static = match f with
+					| FInstance(c,_,cf) | FClosure(Some (c,_),cf) ->
+						(* get from overloads *)
+						(* FIXME: this is a workaround for issue #1743 . Uncomment this code after it was solved *)
+						(* let t, cf = List.find (fun (t,cf2) -> cf == cf2) (Overloads.get_overloads cl (field_name f)) in *)
+						(* cf, t, false *)
+						select_overload gen e1.etype (Overloads.get_overloads cl (field_name f)) cl.cl_params params, false
+					| FStatic(c,f) ->
+						(* workaround for issue #1743 *)
+						(* f,f.cf_type, false *)
+						select_overload gen e1.etype ((f.cf_type,f) :: List.map (fun f -> f.cf_type,f) f.cf_overloads) [] [], true
+					| _ ->
+						gen.gcon.warning "Overloaded classfield typed as anonymous" ecall.epos;
+						(cf, actual_t, true), true
+				in
+
+				if not (is_static || error) then match find_first_declared_field gen cl ~exact_field:{ cf with cf_type = actual_t } cf.cf_name with
+				| Some(cf_orig,actual_t,_,_,declared_cl,tl,tlch) ->
+					let rec is_super e = match e.eexpr with
+						| TConst TSuper -> true
+						| TParenthesis p | TMeta(_,p) -> is_super p
+						| _ -> false
+					in
+					if declared_cl != cl && overloads_cast_to_base && not (is_super !ef) then begin
+						let pos = (!ef).epos in
+						ef := {
+							eexpr = TCall(
+								{ eexpr = TIdent "__as__"; etype = t_dynamic; epos = pos },
+								[!ef]);
+							etype = TInst(declared_cl,List.map (apply_params cl.cl_params params) tl);
+							epos = pos
+						}
+					end;
+					{ cf_orig with cf_name = cf.cf_name },actual_t,false
+				| None ->
+					gen.gcon.warning "Cannot find matching overload" ecall.epos;
+					cf, actual_t, true
+				else
+					cf,actual_t,error
+			in
+
+			(* take off Rest param *)
+			let actual_t = change_rest actual_t elist in
+			(* set the real (selected) class field *)
+			let f = match f with
+				| FInstance(c,tl,_) -> FInstance(c,tl,cf)
+				| FClosure(c,_) -> FClosure(c,cf)
+				| FStatic(c,_) -> FStatic(c,cf)
+				| f -> f
+			in
+			let error = error || (match follow actual_t with | TFun _ -> false | _ -> true) in
+			if error then (* if error, ignore arguments *)
+				if ExtType.is_void ecall.etype then
+					{ ecall with eexpr = TCall({ e1 with eexpr = TField(!ef, f) }, elist ) }
+				else
+					local_mk_cast ecall.etype { ecall with eexpr = TCall({ e1 with eexpr = TField(!ef, f) }, elist ) }
+			else begin
+				(* infer arguments *)
+				(* let called_t = TFun(List.map (fun e -> "arg",false,e.etype) elist, ecall.etype) in *)
+				let called_t = match follow e1.etype with | TFun _ -> e1.etype | _ -> TFun(List.map (fun e -> "arg",false,e.etype) elist, ecall.etype)	in (* workaround for issue #1742 *)
+				let called_t = change_rest called_t elist in
+				let fparams = infer_params ecall.epos (get_fun (apply_params cl.cl_params params actual_t)) (get_fun called_t) cf.cf_params calls_parameters_explicitly in
+				(* get what the backend actually sees *)
+				(* actual field's function *)
+				let actual_t = get_real_fun gen actual_t in
+				let real_params = gen.greal_type_param (TClassDecl cl) params in
+				let function_t = apply_params cl.cl_params real_params actual_t in
+				let real_fparams = if calls_parameters_explicitly then
+					gen.greal_type_param (TClassDecl cl) fparams
+				else
+					gen.greal_type_param (TClassDecl cl) (infer_params ecall.epos (get_fun function_t) (get_fun (get_real_fun gen called_t)) cf.cf_params calls_parameters_explicitly) in
+				let function_t = get_real_fun gen (apply_params cf.cf_params real_fparams function_t) in
+				let args_ft, ret_ft = get_fun function_t in
+				(* applied function *)
+				let applied = elist in
+				(* check types list *)
+				let new_ecall, elist = try
+					let elist = List.map2 (fun applied (_,_,funct) ->
+						match is_overload || real_fparams <> [], applied.eexpr with
+						| true, TConst TNull ->
+							mk_castfast (gen.greal_type funct) applied
+						| true, _ -> (* when not (type_iseq gen (gen.greal_type applied.etype) funct) -> *)
+							let ret = handle_cast gen applied (funct) (gen.greal_type applied.etype) in
+							(match ret.eexpr with
+							| TCast _ -> ret
+							| _ -> local_mk_cast (funct) ret)
+						| _ ->
+							handle_cast gen applied (funct) (gen.greal_type applied.etype)
+					) applied args_ft in
+					{ ecall with
+						eexpr = TCall(
+							{ e1 with eexpr = TField(!ef, f) },
+							elist);
+					}, elist
+				with Invalid_argument _ ->
+					gen.gcon.warning ("This expression may be invalid" ) ecall.epos;
+					{ ecall with eexpr = TCall({ e1 with eexpr = TField(!ef, f) }, elist) }, elist
+				in
+				let new_ecall = if fparams <> [] then gen.gparam_func_call new_ecall { e1 with eexpr = TField(!ef, f) } fparams elist else new_ecall in
+				let ret = handle_cast gen new_ecall (gen.greal_type ecall.etype) (gen.greal_type ret_ft) in
+				(match gen.gcon.platform, cf.cf_params, ret.eexpr with
+					| _, _, TCast _ -> ret
+					| Java, _ :: _, _ ->
+						(* this is a workaround for a javac openjdk issue with unused type parameters and return type inference *)
+						(* see more at issue #3123 *)
+						mk_cast (gen.greal_type ret_ft) new_ecall
+					| _ -> ret)
+			end
+	| FClassField (cl,params,_,{ cf_kind = (Method MethDynamic | Var _) },_,actual_t,_) ->
+		(* if it's a var, we will just try to apply the class parameters that have been changed with greal_type_param *)
+		let t = apply_params cl.cl_params (gen.greal_type_param (TClassDecl cl) params) (gen.greal_type actual_t) in
+		return_var (handle_cast gen { e1 with eexpr = TField(ef, f) } (gen.greal_type e1.etype) (gen.greal_type t))
+	| FClassField (cl,params,_,cf,_,actual_t,_) ->
+		return_var (handle_cast gen { e1 with eexpr = TField({ ef with etype = t_dynamic }, f) } e1.etype t_dynamic) (* force dynamic and cast back to needed type *)
+	| FEnumField (en, efield, true) ->
+		let ecall = match e with | None -> trace (field_name f); trace efield.ef_name; gen.gcon.error "This field should be called immediately" ef.epos; assert false | Some ecall -> ecall in
+		(match en.e_params with
+			(*
+			| [] ->
+				let args, ret = get_fun (efield.ef_type) in
+				let ef = { ef with eexpr = TTypeExpr( TEnumDecl en ); etype = TEnum(en, []) } in
+				handle_cast gen { ecall with eexpr = TCall({ e1 with eexpr = TField(ef, FEnum(en, efield)) }, List.map2 (fun param (_,_,t) -> handle_cast gen param (gen.greal_type t) (gen.greal_type param.etype)) elist args) } (gen.greal_type ecall.etype) (gen.greal_type ret)
+		*)
+			| _ ->
+				let pt = match e with | None -> real_type | Some _ -> snd (get_fun e1.etype) in
+				let _params = match follow pt with | TEnum(_, p) -> p | _ -> gen.gcon.warning (debug_expr e1) e1.epos; assert false in
+				let args, ret = get_fun efield.ef_type in
+				let actual_t = TFun(List.map (fun (n,o,t) -> (n,o,gen.greal_type t)) args, gen.greal_type ret) in
+				(*
+					because of differences on how <Dynamic> is handled on the platforms, this is a hack to be able to
+					correctly use class field type parameters with RealTypeParams
+				*)
+				let cf_params = List.map (fun t -> match follow t with | TDynamic _ -> t_empty | _ -> t) _params in
+				let t = apply_params en.e_params (gen.greal_type_param (TEnumDecl en) cf_params) actual_t in
+				let t = apply_params efield.ef_params (List.map (fun _ -> t_dynamic) efield.ef_params) t in
+
+				let args, ret = get_fun t in
+
+				let elist = List.map2 (fun param (_,_,t) -> handle_cast gen (param) (gen.greal_type t) (gen.greal_type param.etype)) elist args in
+				let e1 = { e1 with eexpr = TField({ ef with eexpr = TTypeExpr( TEnumDecl en ); etype = TEnum(en, _params) }, FEnum(en, efield) ) } in
+				let new_ecall = gen.gparam_func_call ecall e1 _params elist in
+
+				handle_cast gen new_ecall (gen.greal_type ecall.etype) (gen.greal_type ret)
+		)
+	| FEnumField _ when is_some e -> assert false
+	| FEnumField (en,efield,_) ->
+			return_var { e1 with eexpr = TField({ ef with eexpr = TTypeExpr( TEnumDecl en ); },FEnum(en,efield)) }
+	(* no target by date will uses this.so this code may not be correct at all *)
+	| FAnonField cf ->
+		let t = gen.greal_type cf.cf_type in
+		return_var (handle_cast gen { e1 with eexpr = TField(ef, f) } (gen.greal_type e1.etype) t)
+	| FNotFound
+	| FDynamicField _ ->
+		if is_some e then
+			return_var { e1 with eexpr = TField(ef, f) }
+		else
+			return_var (handle_cast gen { e1 with eexpr = TField({ ef with etype = t_dynamic }, f) } e1.etype t_dynamic) (* force dynamic and cast back to needed type *)
+	)
+
+(* end of type parameter handling *)
+(* ****************************** *)
+
+(** overloads_cast_to_base argument will cast overloaded function types to the class that declared it. **)
+(**			This is necessary for C#, and if true, will require the target to implement __as__, as a `quicker` form of casting **)
+let configure gen ?(overloads_cast_to_base = false) maybe_empty_t calls_parameters_explicitly =
+	let handle e t1 t2 = handle_cast gen e (gen.greal_type t1) (gen.greal_type t2) in
+
+	let in_value = ref false in
+
+	let rec clean_cast e = match e.eexpr with
+		| TCast(e,_) -> clean_cast e
+		| TParenthesis(e) | TMeta(_,e) -> clean_cast e
+		| _ -> e
+	in
+
+	let get_abstract_impl t = match t with
+		| TAbstract(a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
+			Abstract.get_underlying_type a pl
+		| t -> t
+	in
+
+	let rec is_abstract_to_struct t = match t with
+		| TAbstract(a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
+			is_abstract_to_struct (Abstract.get_underlying_type a pl)
+		| TInst(c,_) when Meta.has Meta.Struct c.cl_meta ->
+			true
+		| _ -> false
+	in
+
+	let binop_type fast_cast op main_expr e1 e2 =
+		let name = platform_name gen.gcon.platform in
+		let basic = gen.gcon.basic in
+		(* If either operand is of type decimal, the other operand is converted to type decimal, or a compile-time error occurs if the other operand is of type float or double.
+			* Otherwise, if either operand is of type double, the other operand is converted to type double.
+			* Otherwise, if either operand is of type float, the other operand is converted to type float.
+			* Otherwise, if either operand is of type ulong, the other operand is converted to type ulong, or a compile-time error occurs if the other operand is of type sbyte, short, int, or long.
+			* Otherwise, if either operand is of type long, the other operand is converted to type long.
+			* Otherwise, if either operand is of type uint and the other operand is of type sbyte, short, or int, both operands are converted to type long.
+			* Otherwise, if either operand is of type uint, the other operand is converted to type uint.
+			* Otherwise, both operands are converted to type int.
+			*  *)
+		let t1, t2 = follow (run_follow gen e1.etype), follow (run_follow gen e2.etype) in
+		let result =
+			match t1, t2 with
+			| TAbstract(a1,[]), TAbstract(a2,[]) when fast_cast && a1 == a2 ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
+			| TInst(i1,[]), TInst(i2,[]) when fast_cast && i1 == i2 ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
+			| TInst({ cl_path = ([],"String") },[]), _ when fast_cast && op = OpAdd ->
+				{ main_expr with eexpr = TBinop(op, e1, mk_cast basic.tstring e2); etype = basic.tstring }
+			| _, TInst({ cl_path = ([],"String") },[]) when fast_cast && op = OpAdd ->
+				{ main_expr with eexpr = TBinop(op, mk_cast basic.tstring e1, e2); etype = basic.tstring }
+			| TAbstract({ a_path = ([], "Float") }, []), _ when fast_cast ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
+			| _, TAbstract({ a_path = ([], "Float") }, []) when fast_cast ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e2.etype }
+			| TAbstract({ a_path = ([], "Single") }, []), _ when fast_cast ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
+			| _, TAbstract({ a_path = ([], "Single") }, []) when fast_cast ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e2.etype }
+			| TAbstract({ a_path = ([pf], "UInt64") }, []), _ when fast_cast && pf = name ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
+			| _, TAbstract({ a_path = ([pf], "UInt64") }, []) when fast_cast && pf = name ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e2.etype }
+			| TAbstract({ a_path = ([pf], "Int64") }, []), _ when fast_cast && pf = name ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
+			| _, TAbstract({ a_path = ([pf], "Int64") }, []) when fast_cast && pf = name ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e2.etype }
+			| TAbstract({ a_path = ([], "UInt") }, []), tother when like_int tother ->
+				let ti64 = mt_to_t_dyn ( get_type gen ([name], "Int64") ) in
+				let ret = { main_expr with eexpr = TBinop(op, e1, e2); etype = ti64 } in
+				if op <> OpDiv then
+					mk_cast t1 ret
+				else
+					ret
+			| tother, TAbstract({ a_path = ([], "UInt") }, []) when like_int tother ->
+				let ti64 = mt_to_t_dyn ( get_type gen ([name], "Int64") ) in
+				let ret = { main_expr with eexpr = TBinop(op, e1, e2); etype = ti64 } in
+				if op <> OpDiv then
+					mk_cast t2 ret
+				else
+					ret
+			| TAbstract({ a_path = ([], "UInt") }, []), _ ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
+			| _, TAbstract({ a_path = ([], "UInt") }, []) ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = e2.etype }
+			| TAbstract(a1,[]), TAbstract(a2,[]) when fast_cast ->
+				{ main_expr with eexpr = TBinop(op, e1, e2); etype = basic.tint }
+			| _ ->
+				{ main_expr with eexpr = TBinop(op, e1, e2) }
+		in
+		(* maintain nullability *)
+		match follow_without_null main_expr.etype, follow_without_null result.etype with
+		| TAbstract ({ a_path = ([],"Null") },_), TAbstract ({ a_path = ([],"Null") },_) ->
+			result
+		| TAbstract ({ a_path = ([],"Null") } as null,_), _ ->
+			{ result with etype = TAbstract(null, [result.etype]) }
+		| _, TAbstract ({ a_path = ([],"Null") },[t]) ->
+			{ result with etype = t }
+		| _ -> result
+	in
+	let binop_type = binop_type (Common.defined gen.gcon Define.FastCast) in
+
+	let rec run ?(just_type = false) e =
+		let handle = if not just_type then handle else fun e t1 t2 -> { e with etype = gen.greal_type t2 } in
+		let was_in_value = !in_value in
+		in_value := true;
+		match e.eexpr with
+			| TConst ( TInt _ | TFloat _ | TBool _ as const ) ->
+				(* take off any Null<> that it may have *)
+				let t = follow (run_follow gen e.etype) in
+				(* do not allow constants typed as Single - need to cast them *)
+				let real_t = match const with
+					| TInt _ -> gen.gcon.basic.tint
+					| TFloat _ -> gen.gcon.basic.tfloat
+					| TBool _ -> gen.gcon.basic.tbool
+					| _ -> assert false
+				in
+				handle e t real_t
+			| TCast( { eexpr = TConst TNull }, _ ) ->
+				{ e with eexpr = TConst TNull }
+			| TCast( { eexpr = TCall( { eexpr = TIdent "__delegate__" } as local, [del] ) } as e2, _) ->
+				{ e with eexpr = TCast({ e2 with eexpr = TCall(local, [Type.map_expr run del]) }, None) }
+
+			| TBinop ( (Ast.OpAssign | Ast.OpAssignOp _ as op), e1, e2 ) ->
+				let e1 = run ~just_type:true e1 in
+				let e2 = handle (run e2) e1.etype e2.etype in
+				{ e with eexpr = TBinop(op, clean_cast e1, e2) }
+			| TBinop ( (Ast.OpShl | Ast.OpShr | Ast.OpUShr as op), e1, e2 ) ->
+				let e1 = run e1 in
+				let e2 = handle (run e2) (gen.gcon.basic.tint) e2.etype in
+				let rett = binop_type op e e1 e2 in
+				{ e with eexpr = TBinop(op, e1, e2); etype = rett.etype }
+			| TBinop( (OpAdd | OpMult | OpDiv | OpSub | OpAnd | OpOr | OpXor | OpMod) as op, e1, e2 ) ->
+				binop_type op e (run e1) (run e2)
+			| TBinop( (OpEq | OpNotEq | OpGt | OpGte | OpLt | OpLte | OpBoolAnd | OpBoolOr) as op, e1, e2 ) ->
+				handle { e with eexpr = TBinop(op, run e1, run e2) } e.etype gen.gcon.basic.tbool
+			| TField(ef, f) ->
+				handle_type_parameter gen None e (run ef) ~clean_ef:ef ~overloads_cast_to_base:overloads_cast_to_base f [] calls_parameters_explicitly
+			| TArrayDecl el ->
+				let et = e.etype in
+				let base_type = match follow et with
+					| TInst({ cl_path = ([], "Array") } as cl, bt) -> gen.greal_type_param (TClassDecl cl) bt
+					| _ ->
+						gen.gcon.warning (debug_type et) e.epos;
+						(match gen.gcurrent_class with
+							| Some cl -> print_endline (s_type_path cl.cl_path)
+							| _ -> ());
+						assert false
+				in
+				let base_type = List.hd base_type in
+				{ e with eexpr = TArrayDecl( List.map (fun e -> handle (run e) base_type e.etype) el ); etype = et }
+			| TCall ({ eexpr = TIdent "__array__" } as arr_local, el) ->
+				let et = e.etype in
+				let base_type = match follow et with
+					| TInst(cl, bt) -> gen.greal_type_param (TClassDecl cl) bt
+					| _ -> assert false
+				in
+				let base_type = List.hd base_type in
+				{ e with eexpr = TCall(arr_local, List.map (fun e -> handle (run e) base_type e.etype) el ); etype = et }
+			| TCall( ({ eexpr = TIdent s } as local), params ) when String.get s 0 = '_' && String.get s 1 = '_' && Hashtbl.mem gen.gspecial_vars s ->
+				{ e with eexpr = TCall(local, List.map (fun e -> (match e.eexpr with TBlock _ -> in_value := false | _ -> ()); run e) params) }
+			| TCall( ({ eexpr = TField(ef, f) }) as e1, elist ) ->
+				handle_type_parameter gen (Some e) (e1) (run ef) ~clean_ef:ef ~overloads_cast_to_base:overloads_cast_to_base f (List.map run elist) calls_parameters_explicitly
+
+			| TCall( { eexpr = TConst TSuper } as ef, eparams ) ->
+				let cl, tparams = match follow ef.etype with
+				| TInst(cl,p) ->
+					cl,p
+				| _ -> assert false in
+				(try
+					let is_overload, cf, sup, stl = choose_ctor gen cl tparams (List.map (fun e -> e.etype) eparams) maybe_empty_t e.epos in
+					let handle e t1 t2 =
+						if is_overload then
+							let ret = handle e t1 t2 in
+							match ret.eexpr with
+							| TCast _ -> ret
+							| _ -> mk_cast (gen.greal_type t1) e
+						else
+							handle e t1 t2
+					in
+					let stl = gen.greal_type_param (TClassDecl sup) stl in
+					let args, _ = get_fun (apply_params sup.cl_params stl cf.cf_type) in
+					let eparams = List.map2 (fun e (_,_,t) ->
+						handle (run e) t e.etype
+					) eparams args in
+					{ e with eexpr = TCall(ef, eparams) }
+				with | Not_found ->
+					gen.gcon.warning "No overload found for this constructor call" e.epos;
+					{ e with eexpr = TCall(ef, List.map run eparams) })
+			| TCall (ef, eparams) ->
+				(match ef.etype with
+					| TFun(p, ret) ->
+						handle ({ e with eexpr = TCall(run ef, List.map2 (fun param (_,_,t) -> handle (run param) t param.etype) eparams p) }) e.etype ret
+					| _ -> Type.map_expr run e
+				)
+			| TNew ({ cl_kind = KTypeParameter _ }, _, _) ->
+				Type.map_expr run e
+			| TNew (cl, tparams, eparams) -> (try
+				let is_overload, cf, sup, stl = choose_ctor gen cl tparams (List.map (fun e -> e.etype) eparams) maybe_empty_t e.epos in
+				let handle e t1 t2 =
+					if is_overload then
+						let ret = handle e t1 t2 in
+						match ret.eexpr with
+						| TCast _ -> ret
+						| _ -> mk_cast (gen.greal_type t1) e
+					else
+						handle e t1 t2
+				in
+				let stl = gen.greal_type_param (TClassDecl sup) stl in
+				let args, _ = get_fun (apply_params sup.cl_params stl cf.cf_type) in
+				let eparams = List.map2 (fun e (_,_,t) ->
+					handle (run e) t e.etype
+				) eparams args in
+				{ e with eexpr = TNew(cl, tparams, eparams) }
+			with | Not_found ->
+				gen.gcon.warning "No overload found for this constructor call" e.epos;
+				{ e with eexpr = TNew(cl, tparams, List.map run eparams) })
+			| TUnop((Increment | Decrement) as op, flag, ({ eexpr = TArray (arr, idx) } as e2))
+				when (match follow arr.etype with TInst({ cl_path = ["cs"],"NativeArray" },_) -> true | _ -> false) ->
+				{ e with eexpr = TUnop(op, flag, { e2 with eexpr = TArray(run arr, idx) })}
+			| TArray(arr, idx) ->
+				let arr_etype = match follow arr.etype with
+					| (TInst _ as t) -> t
+					| TAbstract (a, pl) when not (Meta.has Meta.CoreType a.a_meta) ->
+						follow (Abstract.get_underlying_type a pl)
+					| t -> t
+				in
+				let idx = run idx in
+				let idx = match gen.greal_type idx.etype with
+					| TAbstract({ a_path = [],"Int" },_) -> idx
+					| _ -> match handle idx gen.gcon.basic.tint (gen.greal_type idx.etype) with
+						| ({ eexpr = TCast _ } as idx) -> idx
+						| idx -> mk_cast gen.gcon.basic.tint idx
+				in
+				let e = { e with eexpr = TArray(run arr, idx) } in
+				(* get underlying class (if it's a class *)
+				(match arr_etype with
+					| TInst({ cl_path = ["cs"],"NativeArray" }, _) when
+							(match Abstract.follow_with_abstracts e.etype with TInst _ | TEnum _ -> true | _ -> false)
+							|| Common.defined gen.gcon Define.EraseGenerics
+						->
+						mk_cast e.etype e
+					| TInst(cl, params) ->
+						(* see if it implements ArrayAccess *)
+						(match cl.cl_array_access with
+							| None -> e
+							| Some t ->
+								(* if it does, apply current parameters (and change them) *)
+								(* let real_t = apply_params_internal (List.map (gen.greal_type_param (TClassDecl cl))) cl params t in *)
+								let param = apply_params cl.cl_params (gen.greal_type_param (TClassDecl cl) params) t in
+								let real_t = apply_params cl.cl_params params param in
+								(* see if it needs a cast *)
+
+								fastcast_if_needed gen e (gen.greal_type e.etype) (gen.greal_type real_t)
+								(* handle (e) (gen.greal_type e.etype) (gen.greal_type real_t) *)
+						)
+					| _ -> Type.map_expr run e)
+			| TVar (v, eopt) ->
+				{ e with eexpr = TVar (v, match eopt with
+						| None -> eopt
+						| Some e -> Some( handle (run e) v.v_type e.etype ))
+				}
+			(* FIXME deal with in_value when using other statements that may not have a TBlock wrapped on them *)
+			| TIf (econd, ethen, Some(eelse)) when was_in_value ->
+				{ e with eexpr = TIf (handle (run econd) gen.gcon.basic.tbool econd.etype, handle (run ethen) e.etype ethen.etype, Some( handle (run eelse) e.etype eelse.etype ) ) }
+			| TIf (econd, ethen, eelse) ->
+				{ e with eexpr = TIf (handle (run econd) gen.gcon.basic.tbool econd.etype, (in_value := false; run (mk_block ethen)), Option.map (fun e -> in_value := false; run (mk_block e)) eelse) }
+			| TWhile (econd, e1, flag) ->
+				{ e with eexpr = TWhile (handle (run econd) gen.gcon.basic.tbool econd.etype, (in_value := false; run (mk_block e1)), flag) }
+			| TSwitch (cond, el_e_l, edef) ->
+				{ e with eexpr = TSwitch(run cond, List.map (fun (el,e) -> (List.map run el, (in_value := false; run (mk_block e)))) el_e_l, Option.map (fun e -> in_value := false; run (mk_block e)) edef) }
+			| TFor (v,cond,e1) ->
+				{ e with eexpr = TFor(v, run cond, (in_value := false; run (mk_block e1))) }
+			| TTry (e, ve_l) ->
+				{ e with eexpr = TTry((in_value := false; run (mk_block e)), List.map (fun (v,e) -> in_value := false; (v, run (mk_block e))) ve_l) }
+			| TBlock el ->
+				let i = ref 0 in
+				let len = List.length el in
+				{ e with eexpr = TBlock ( List.map (fun e ->
+					incr i;
+					if !i <> len || not was_in_value then
+						in_value := false;
+					run e
+				) el ) }
+			| TCast (expr, md) when ExtType.is_void (follow e.etype) ->
+				run expr
+			| TCast (expr, md) ->
+				let rec get_null e =
+					match e.eexpr with
+					| TConst TNull -> Some e
+					| TParenthesis e | TMeta(_,e) -> get_null e
+					| _ -> None
+				in
+
+				(match get_null expr with
+				| Some enull ->
+						if gen.gcon.platform = Cs then
+							{ enull with etype = gen.greal_type e.etype }
+						else
+							mk_cast (gen.greal_type e.etype) enull
+				| _ when is_abstract_to_struct expr.etype && type_iseq gen e.etype (get_abstract_impl expr.etype) ->
+					run { expr with etype = expr.etype }
+				| _ when is_exactly_basic gen expr.etype e.etype ->
+					run { expr with etype = expr.etype }
+				| _ ->
+					match gen.greal_type e.etype, gen.greal_type expr.etype with
+						| (TInst(c,tl) as tinst1), TAbstract({ a_path = ["cs"],"Pointer" }, [tinst2]) when type_iseq gen tinst1 (gen.greal_type tinst2) ->
+							run expr
+						| _ ->
+							let expr = run expr in
+							let last_unsafe = gen.gon_unsafe_cast in
+							gen.gon_unsafe_cast <- (fun t t2 pos -> ());
+							let ret = handle expr e.etype expr.etype in
+							gen.gon_unsafe_cast <- last_unsafe;
+							match ret.eexpr with
+								| TCast _ -> { ret with etype = gen.greal_type e.etype }
+								| _ -> { e with eexpr = TCast(ret,md); etype = gen.greal_type e.etype }
+				)
+			(*| TCast _ ->
+				(* if there is already a cast, we should skip this cast check *)
+				Type.map_expr run e*)
+			| TFunction f ->
+				in_value := false;
+				Type.map_expr run e
+
+			| _ -> Type.map_expr run e
+	in
+	gen.ghandle_cast <- (fun tto tfrom expr -> handle_cast gen expr (gen.greal_type tto) (gen.greal_type tfrom));
+	let map e =
+		match gen.gcurrent_classfield with
+		| Some cf when Meta.has (Meta.Custom ":skipCastDetect") cf.cf_meta ->
+			e
+		| _ ->
+			run e
+	in
+	gen.gsyntax_filters#add name (PCustom priority) map;
+	ReturnCast.configure gen
diff --git a/src/codegen/gencommon/classInstance.ml b/src/codegen/gencommon/classInstance.ml
new file mode 100644
index 0000000000000000000000000000000000000000..f35e38f1ea9bd803c0c40f310b30bb20fc333d53
--- /dev/null
+++ b/src/codegen/gencommon/classInstance.ml
@@ -0,0 +1,57 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Type
+open Gencommon
+
+(*
+	When we pass a class as an object, in some languages we will need a special construct to be able to
+	access its statics as if they were normal object fields. On C# and Java the way found to do that is
+	by handling statics reflection also by a normal instance. This also happens in hxcpp and neko, so I
+	guess it's a valid practice.
+
+	So if we want to handle the reflection of the static MyClass, here's roughly how it will be done:
+
+	var x = MyClass;
+	gets converted into
+	var x = typeof(MyClass);
+*)
+let add_typeof =
+	let rec run e =
+		match e.eexpr with
+		| TCall (({ eexpr = TIdent ("__is__" | "__as__" | "__typeof__") } as elocal), args) ->
+			let args = List.map (fun e -> match e.eexpr with TTypeExpr _ -> e | _ -> run e) args in
+			{ e with eexpr = TCall (elocal, args) }
+		| TField ({ eexpr = TTypeExpr _ }, _) ->
+			e
+		| TField (ef, f) ->
+			(match anon_class ef.etype with
+			| None -> Type.map_expr run e
+			| Some t -> { e with eexpr = TField ({ ef with eexpr = TTypeExpr t }, f)})
+		| TTypeExpr _ ->
+			{ e with eexpr = TCall (mk (TIdent "__typeof__") t_dynamic e.epos, [e]) }
+		| _ ->
+			Type.map_expr run e
+	in
+	run
+
+let name = "class_instance"
+let priority = solve_deps name []
+
+let configure gen =
+	gen.gsyntax_filters#add name (PCustom priority) add_typeof
diff --git a/src/codegen/gencommon/closuresToClass.ml b/src/codegen/gencommon/closuresToClass.ml
new file mode 100644
index 0000000000000000000000000000000000000000..d4a3e74020d7b0e38bfae3ef16a07bc649d19bd0
--- /dev/null
+++ b/src/codegen/gencommon/closuresToClass.ml
@@ -0,0 +1,1183 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Option
+open Common
+open Globals
+open Codegen
+open Texpr.Builder
+open Ast
+open Type
+open Gencommon
+
+(* ******************************************* *)
+(* Closures To Class *)
+(* ******************************************* *)
+(*
+
+	This is a very important filter. It will take all anonymous functions from the AST, will search for all captured variables, and will create a class
+	that implements an abstract interface for calling functions. This is very important for targets that don't support anonymous functions to work correctly.
+	Also it is possible to implement some strategies to avoid value type boxing, such as NaN tagging or double/object arguments. All this will be abstracted away
+	from this interface.
+
+
+	dependencies:
+		must run after dynamic field access, because of conflicting ways to deal with invokeField
+		(module filter) must run after OverloadingConstructor so we can also change the dynamic function expressions
+
+		uses TArray expressions for array. TODO see interaction
+		uses TThrow expressions.
+*)
+let name = "closures_to_class"
+let priority = solve_deps name [ DAfter DynamicFieldAccess.priority ]
+
+type closures_ctx = {
+	func_class : tclass;
+
+	(*
+		this is what will actually turn the function into class field.
+		The standard implementation by default will already take care of creating the class, and setting the captured variables.
+
+		It will also return the super arguments to be called
+	*)
+	closure_to_classfield : tfunc->t->pos->tclass_field * (texpr list);
+
+	(*
+		when a dynamic function call is made, we need to convert it as if it were calling the dynamic function interface.
+
+		TCall expr -> new TCall expr
+	*)
+	dynamic_fun_call : texpr->texpr;
+
+	(*
+		Provide a toolchain so we can easily create classes that extend Function and add more functionality on top of it.
+
+		arguments:
+			tclass -> subject (so we know the type of this)
+			( int -> (int->t->tconstant option->texpr) -> ( (tvar * tconstant option) list * texpr) )
+				int -> current arity of the function whose member will be mapped; -1 for dynamic function. It is guaranteed that dynamic function will be called last
+				t -> the return type of the function
+				(int->t->tconstant option->texpr) -> api to get exprs that unwrap arguments correctly
+					int -> argument wanted to unwrap
+					t -> solicited type
+					tconstant option -> map to this default value if null
+					returns a texpr that tells how the default
+				should return a list with additional arguments (only works if is_function_base = true)
+				and the underlying function expression
+	*)
+	map_base_classfields : tclass->( int -> t -> (tvar list) -> (int->t->tconstant option->texpr) -> texpr )->tclass_field list;
+}
+
+type map_info = {
+	in_unsafe : bool;
+	in_unused : bool;
+}
+
+let null_map_info = { in_unsafe = false; in_unused = false; }
+
+(*
+	the default implementation will take 3 transformation functions:
+		* one that will transform closures that are not called immediately (instance.myFunc).
+			normally on this case it's best to have a runtime handler that will take the instance, the function and call its invokeField when invoked
+		* one that will actually handle the anonymous functions themselves.
+		* one that will transform calling a dynamic function. So for example, dynFunc(arg1, arg2) might turn into dynFunc.apply2(arg1, arg2);
+		( suspended ) * an option to match papplied functions
+		* handling parameterized anonymous function declaration (optional - tparam_anon_decl and tparam_anon_acc)
+*)
+
+let rec cleanup_delegate e = match e.eexpr with
+	| TParenthesis e | TMeta(_,e)
+	| TCast(e,_) -> cleanup_delegate e
+	| _ -> e
+
+let funct gen t = match follow (run_follow gen t) with
+	| TFun(args,ret) -> args,ret
+	| _ -> raise Not_found
+
+let mk_conversion_fun gen e =
+	let args, ret = funct gen e.etype in
+	let i = ref 0 in
+	let tf_args = List.map (fun (n,o,t) ->
+		let n = if n = "" then ("arg" ^ string_of_int(!i)) else n in
+		incr i;
+		alloc_var n t,None) args
+	in
+	let block, local = match e.eexpr with
+		| TLocal v ->
+			v.v_capture <- true;
+			[],e
+		| _ ->
+			let tmp = mk_temp "delegate_conv" e.etype in
+			tmp.v_capture <- true;
+			[{ eexpr = TVar(tmp,Some e); etype = gen.gcon.basic.tvoid; epos = e.epos }], mk_local tmp e.epos
+	in
+	let body = {
+		eexpr = TCall(local, List.map (fun (v,_) -> mk_local v e.epos) tf_args);
+		etype = ret;
+		epos = e.epos;
+	} in
+	let body = if not (ExtType.is_void ret) then
+		mk_return body
+	else
+		body
+	in
+	let body = {
+		eexpr = TBlock([body]);
+		etype = body.etype;
+		epos = body.epos;
+	} in
+	block, {
+		tf_args = tf_args;
+		tf_expr = body;
+		tf_type = ret;
+	}
+
+let traverse gen ?tparam_anon_decl ?tparam_anon_acc (handle_anon_func:texpr->tfunc->map_info->t option->texpr) (dynamic_func_call:texpr->texpr) e =
+	let info = ref null_map_info in
+	let rec run e =
+		match e.eexpr with
+			| TCast({ eexpr = TCall({ eexpr = TIdent "__delegate__" } as local, [del] ) } as e2, _) ->
+				let e2 = { e2 with etype = e.etype } in
+				let replace_delegate ex =
+					{ e with eexpr = TCast({ e2 with eexpr = TCall(local, [ex]) }, None) }
+				in
+				(* found a delegate; let's see if it's a closure or not *)
+				let clean = cleanup_delegate del in
+				(match clean.eexpr with
+					| TField( ef, (FClosure _ as f)) | TField( ef, (FStatic _ as f)) ->
+						(* a closure; let's leave this unchanged for FilterClosures to handle it *)
+						replace_delegate { clean with eexpr = TField( run ef, f ) }
+					| TFunction tf ->
+						(* handle like we'd handle a normal function, but create an unchanged closure field for it *)
+						let ret = handle_anon_func clean { tf with tf_expr = run tf.tf_expr } !info (Some e.etype) in
+						replace_delegate ret
+					| _ -> try
+						let block, tf = mk_conversion_fun gen del in
+						let block = List.map run block in
+						let tf = { tf with tf_expr = run tf.tf_expr } in
+						let ret = handle_anon_func { clean with eexpr = TFunction(tf) } { tf with tf_expr = run tf.tf_expr } !info (Some e.etype) in
+						let ret = replace_delegate ret in
+						if block = [] then
+							ret
+						else
+							{ ret with eexpr = TBlock(block @ [ret]) }
+					with Not_found ->
+						gen.gcon.error "This delegate construct is unsupported" e.epos;
+						replace_delegate (run clean))
+
+			| TCall(({ eexpr = TIdent "__unsafe__" } as local), [arg]) ->
+				let old = !info in
+				info := { !info with in_unsafe = true };
+				let arg2 = run arg in
+				info := old;
+				{ e with eexpr = TCall(local,[arg2]) }
+			(* parameterized functions handling *)
+			| TVar(vv, ve) -> (match tparam_anon_decl with
+				| None -> Type.map_expr run e
+				| Some tparam_anon_decl ->
+					(match (vv, ve) with
+						| ({ v_extra = Some( _ :: _, _) } as v), Some ({ eexpr = TFunction tf } as f)
+						| ({ v_extra = Some( _ :: _, _) } as v), Some { eexpr = TArrayDecl([{ eexpr = TFunction tf } as f]) | TCall({ eexpr = TIdent "__array__" }, [{ eexpr = TFunction tf } as f]) } -> (* captured transformation *)
+							tparam_anon_decl v f { tf with tf_expr = run tf.tf_expr };
+							{ e with eexpr = TBlock([]) }
+						| _ ->
+							Type.map_expr run { e with eexpr = TVar(vv, ve) })
+					)
+			| TBinop(OpAssign, { eexpr = TLocal({ v_extra = Some(_ :: _, _) } as v)}, ({ eexpr= TFunction tf } as f)) when is_some tparam_anon_decl ->
+				(match tparam_anon_decl with
+					| None -> assert false
+					| Some tparam_anon_decl ->
+						tparam_anon_decl v f { tf with tf_expr = run tf.tf_expr };
+						{ e with eexpr = TBlock([]) }
+				)
+			| TLocal ({ v_extra = Some( _ :: _, _) } as v) ->
+				(match tparam_anon_acc with
+				| None -> Type.map_expr run e
+				| Some tparam_anon_acc -> tparam_anon_acc v e false)
+			| TArray ( ({ eexpr = TLocal ({ v_extra = Some( _ :: _, _) } as v) } as expr), _) -> (* captured transformation *)
+				(match tparam_anon_acc with
+				| None -> Type.map_expr run e
+				| Some tparam_anon_acc -> tparam_anon_acc v { expr with etype = e.etype } false)
+			| TMeta((Meta.Custom ":tparamcall",_,_),({ eexpr=TLocal ({ v_extra = Some( _ :: _, _) } as v) } as expr)) ->
+				(match tparam_anon_acc with
+				| None -> Type.map_expr run e
+				| Some tparam_anon_acc -> tparam_anon_acc v expr true)
+			| TCall( { eexpr = TField(_, FEnum _) }, _ ) ->
+				Type.map_expr run e
+			(* if a TClosure is being call immediately, there's no need to convert it to a TClosure *)
+			| TCall(( { eexpr = TField(ecl,f) } as e1), params) ->
+				(* check to see if called field is known and if it is a MethNormal (only MethNormal fields can be called directly) *)
+				(* let name = field_name f in *)
+				(match field_access_esp gen (gen.greal_type ecl.etype) f with
+					| FClassField(_,_,_,cf,_,_,_) ->
+						(match cf.cf_kind with
+							| Method MethNormal
+							| Method MethInline ->
+								{ e with eexpr = TCall({ e1 with eexpr = TField(run ecl, f) }, List.map run params) }
+							| _ ->
+								match gen.gfollow#run_f e1.etype with
+									| TFun _ ->
+										dynamic_func_call { e with eexpr = TCall(run e1, List.map run params) }
+									| _ ->
+										let i = ref 0 in
+										let t = TFun(List.map (fun e -> incr i; "arg" ^ (string_of_int !i), false, e.etype) params, e.etype) in
+										dynamic_func_call { e with eexpr = TCall( mk_castfast t (run e1), List.map run params ) }
+						)
+					(* | FNotFound ->
+						{ e with eexpr = TCall({ e1 with eexpr = TField(run ecl, f) }, List.map run params) }
+							(* expressions by now may have generated invalid expressions *) *)
+					| _ ->
+						match gen.gfollow#run_f e1.etype with
+							| TFun _ ->
+								dynamic_func_call { e with eexpr = TCall(run e1, List.map run params) }
+							| _ ->
+								let i = ref 0 in
+								let t = TFun(List.map (fun e -> incr i; "arg" ^ (string_of_int !i), false, e.etype) params, e.etype) in
+								dynamic_func_call { e with eexpr = TCall( mk_castfast t (run e1), List.map run params ) }
+				)
+			| TFunction tf ->
+				handle_anon_func e { tf with tf_expr = run tf.tf_expr } !info None
+			| TCall({ eexpr = TConst(TSuper) }, _) ->
+				Type.map_expr run e
+			| TCall({ eexpr = TIdent s }, args) when String.get s 0 = '_' && Hashtbl.mem gen.gspecial_vars s ->
+				Type.map_expr run e
+			| TCall(tc,params) ->
+				let i = ref 0 in
+				let may_cast = match gen.gfollow#run_f tc.etype with
+					| TFun _ -> fun e -> e
+					| _ ->
+						let t = TFun(List.map (fun e ->
+								incr i;
+								("p" ^ (string_of_int !i), false, e.etype)
+							) params, e.etype)
+						in
+						fun e -> mk_castfast t e
+				in
+				dynamic_func_call { e with eexpr = TCall(run (may_cast tc), List.map run params) }
+			| _ -> Type.map_expr run e
+	in
+
+	(match e.eexpr with
+		| TFunction(tf) -> Type.map_expr run e
+		| _ -> run e)
+
+let rec get_type_params acc t =
+	match t with
+		| TInst(( { cl_kind = KTypeParameter constraints } as cl), []) ->
+			let params = List.fold_left get_type_params acc constraints in
+			List.filter (fun t -> not (List.memq t acc)) (cl :: params) @ acc;
+		| TFun (params,tret) ->
+			List.fold_left get_type_params acc ( tret :: List.map (fun (_,_,t) -> t) params )
+		| TDynamic t ->
+			(match t with | TDynamic _ -> acc | _ -> get_type_params acc t)
+		| TAbstract (a, pl) when not (Meta.has Meta.CoreType a.a_meta) ->
+				get_type_params acc ( Abstract.get_underlying_type a pl)
+		| TAnon a ->
+			PMap.fold (fun cf acc ->
+				let params = List.map (fun (_,t) -> match follow t with
+					| TInst(c,_) -> c
+					| _ -> assert false) cf.cf_params
+				in
+				List.filter (fun t -> not (List.memq t params)) (get_type_params acc cf.cf_type)
+			) a.a_fields acc
+		| TType(_, [])
+		| TAbstract (_, [])
+		| TInst(_, [])
+		| TEnum(_, []) ->
+			acc
+		| TType(_, params)
+		| TAbstract(_, params)
+		| TEnum(_, params)
+		| TInst(_, params) ->
+			List.fold_left get_type_params acc params
+		| TMono r -> (match !r with
+			| Some t -> get_type_params acc t
+			| None -> acc)
+		| _ -> get_type_params acc (follow_once t)
+
+let get_captured expr =
+	let ret = Hashtbl.create 1 in
+	let ignored = Hashtbl.create 0 in
+
+	let params = ref [] in
+	let check_params t = params := get_type_params !params t in
+	let rec traverse expr =
+		match expr.eexpr with
+			| TFor (v, _, _) ->
+				Hashtbl.add ignored v.v_id v;
+				check_params v.v_type;
+				Type.iter traverse expr
+			| TFunction(tf) ->
+				List.iter (fun (v,_) -> Hashtbl.add ignored v.v_id v) tf.tf_args;
+				(match follow expr.etype with
+					| TFun(args,ret) ->
+						List.iter (fun (_,_,t) ->
+							check_params t
+						) args;
+						check_params ret
+					| _ -> ());
+				Type.iter traverse expr
+			| TVar (v, opt) ->
+				(match v.v_extra with
+					| Some(_ :: _, _) -> ()
+					| _ ->
+						check_params v.v_type);
+				Hashtbl.add ignored v.v_id v;
+				ignore(Option.map traverse opt)
+			| TLocal { v_extra = Some( (_ :: _ ),_) } ->
+				()
+			| TLocal(( { v_capture = true } ) as v) ->
+				(if not (Hashtbl.mem ignored v.v_id || Hashtbl.mem ret v.v_id) then begin check_params v.v_type; Hashtbl.replace ret v.v_id expr end);
+			| _ -> Type.iter traverse expr
+	in traverse expr;
+	ret, !params
+
+(*
+	OPTIMIZEME:
+
+	Take off from Codegen the code that wraps captured variables,
+
+	traverse through all variables, looking for their use (just like local_usage)
+	three possible outcomes for captured variables:
+		- become a function member variable <- best performance.
+			Will not work on functions that can be created more than once (functions inside a loop or functions inside functions)
+			The function will have to be created on top of the block, so its variables can be filled in instead of being declared
+		- single-element array - the most compatible way, though also creates a slight overhead.
+	- we'll have some labels for captured variables:
+		- used in loop
+*)
+
+(*
+	The default implementation will impose a naming convention:
+		invoke(arity)_(o for returning object/d for returning double) when arity < max_arity
+		invoke_dynamic_(o/d) when arity > max_arity
+
+	This means that it also imposes that the dynamic function return types may only be Dynamic or Float, and all other basic types must be converted to/from it.
+*)
+let configure gen ft =
+
+	let tvar_to_cdecl = Hashtbl.create 0 in
+
+	let handle_anon_func fexpr ?tvar tfunc mapinfo delegate_type : texpr * (tclass * texpr list) =
+		let fexpr = match fexpr.eexpr with
+			| TFunction(_) ->
+				{ fexpr with eexpr = TFunction(tfunc) }
+			| _ ->
+				gen.gcon.error "Function expected" fexpr.epos;
+				fexpr
+		in
+		let in_unsafe = mapinfo.in_unsafe || match gen.gcurrent_class, gen.gcurrent_classfield with
+			| Some c, _ when Meta.has Meta.Unsafe c.cl_meta -> true
+			| _, Some cf when Meta.has Meta.Unsafe cf.cf_meta -> true
+			| _ -> false
+		in
+		(* get all captured variables it uses *)
+		let captured_ht, tparams = get_captured fexpr in
+		let captured = Hashtbl.fold (fun _ e acc -> e :: acc) captured_ht [] in
+		let captured = List.sort (fun e1 e2 -> match e1, e2 with
+			| { eexpr = TLocal v1 }, { eexpr = TLocal v2 } ->
+				compare v1.v_name v2.v_name
+			| _ -> assert false) captured
+		in
+
+		(*let cltypes = List.map (fun cl -> (snd cl.cl_path, TInst(map_param cl, []) )) tparams in*)
+		let cltypes = List.map (fun cl -> (snd cl.cl_path, TInst(cl, []) )) tparams in
+
+		(* create a new class that extends abstract function class, with a ctor implementation that will setup all captured variables *)
+		let cfield = match gen.gcurrent_classfield with
+			| None -> "Anon"
+			| Some cf -> cf.cf_name
+		in
+		let cur_line = Lexer.get_error_line fexpr.epos in
+		let name = match tvar with
+			| None ->
+				Printf.sprintf "%s_%s_%d__Fun" (snd gen.gcurrent_path) cfield cur_line
+			| Some (v) ->
+				Printf.sprintf "%s_%s_%d__Fun" (snd gen.gcurrent_path) v.v_name cur_line
+		in
+		let path = (fst gen.gcurrent_path, name) in
+		let cls = mk_class (get gen.gcurrent_class).cl_module path tfunc.tf_expr.epos in
+		if in_unsafe then cls.cl_meta <- (Meta.Unsafe,[],null_pos) :: cls.cl_meta;
+
+		(* forward NativeGen meta for Cs target *)
+		if (Common.platform gen.gcon Cs) && not(is_hxgen (TClassDecl (get gen.gcurrent_class))) && Meta.has(Meta.NativeGen) (get gen.gcurrent_class).cl_meta then
+			cls.cl_meta <- (Meta.NativeGen,[],null_pos) :: cls.cl_meta;
+
+		if Common.defined gen.gcon Define.EraseGenerics then begin
+			cls.cl_meta <- (Meta.HaxeGeneric,[],null_pos) :: cls.cl_meta
+		end;
+		cls.cl_module <- (get gen.gcurrent_class).cl_module;
+		cls.cl_params <- cltypes;
+
+		let mk_this v pos =
+			{
+				(mk_field_access gen { eexpr = TConst TThis; etype = TInst(cls, List.map snd cls.cl_params); epos = pos } v.v_name pos)
+				with etype = v.v_type
+			}
+		in
+
+		let mk_this_assign v pos =
+		{
+			eexpr = TBinop(OpAssign, mk_this v pos, { eexpr = TLocal(v); etype = v.v_type; epos = pos });
+			etype = v.v_type;
+			epos = pos
+		} in
+
+		(* mk_class_field name t public pos kind params *)
+		let ctor_args, ctor_sig, ctor_exprs = List.fold_left (fun (ctor_args, ctor_sig, ctor_exprs) lexpr ->
+			match lexpr.eexpr with
+				| TLocal(v) ->
+					let cf = mk_class_field v.v_name v.v_type false lexpr.epos (Var({ v_read = AccNormal; v_write = AccNormal; })) [] in
+					cls.cl_fields <- PMap.add v.v_name cf cls.cl_fields;
+					cls.cl_ordered_fields <- cf :: cls.cl_ordered_fields;
+
+					let ctor_v = alloc_var v.v_name v.v_type in
+					((ctor_v, None) :: ctor_args, (v.v_name, false, v.v_type) :: ctor_sig, (mk_this_assign v cls.cl_pos) :: ctor_exprs)
+				| _ -> assert false
+		) ([],[],[]) captured in
+
+		(* change all captured variables to this.capturedVariable *)
+		let rec change_captured e =
+			match e.eexpr with
+				| TLocal( ({ v_capture = true }) as v ) when Hashtbl.mem captured_ht v.v_id ->
+					mk_this v e.epos
+				| _ -> Type.map_expr change_captured e
+		in
+		let func_expr = change_captured tfunc.tf_expr in
+
+		let invokecf, invoke_field, super_args = match delegate_type with
+			| None -> (* no delegate *)
+				let ifield, sa = ft.closure_to_classfield { tfunc with tf_expr = func_expr } fexpr.etype fexpr.epos in
+				ifield,ifield,sa
+			| Some _ ->
+				let pos = cls.cl_pos in
+				let cf = mk_class_field "Delegate" (TFun(fun_args tfunc.tf_args, tfunc.tf_type)) true pos (Method MethNormal) [] in
+				cf.cf_expr <- Some { fexpr with eexpr = TFunction { tfunc with tf_expr = func_expr }; };
+				add_class_field_flag cf CfFinal;
+				cls.cl_ordered_fields <- cf :: cls.cl_ordered_fields;
+				cls.cl_fields <- PMap.add cf.cf_name cf cls.cl_fields;
+				(* invoke function body: call Delegate function *)
+				let ibody = {
+					eexpr = TCall({
+						eexpr = TField({
+							eexpr = TConst TThis;
+							etype = TInst(cls, List.map snd cls.cl_params);
+							epos = pos;
+						}, FInstance(cls, List.map snd cls.cl_params, cf));
+						etype = cf.cf_type;
+						epos = pos;
+					}, List.map (fun (v,_) -> mk_local v pos) tfunc.tf_args);
+					etype = tfunc.tf_type;
+					epos = pos
+				} in
+				let ibody = if not (ExtType.is_void tfunc.tf_type) then
+					mk_return ibody
+				else
+					ibody
+				in
+				let ifield, sa = ft.closure_to_classfield { tfunc with tf_expr = ibody } fexpr.etype fexpr.epos in
+				cf,ifield,sa
+		in
+
+		(* create the constructor *)
+		(* todo properly abstract how type var is set *)
+
+		cls.cl_super <- Some(ft.func_class, []);
+		let pos = cls.cl_pos in
+		let super_call =
+		{
+			eexpr = TCall({ eexpr = TConst(TSuper); etype = TInst(ft.func_class,[]); epos = pos }, super_args);
+			etype = gen.gcon.basic.tvoid;
+			epos = pos;
+		} in
+
+		let ctor_type = (TFun(ctor_sig, gen.gcon.basic.tvoid)) in
+		let ctor = mk_class_field "new" ctor_type true cls.cl_pos (Method(MethNormal)) [] in
+		ctor.cf_expr <- Some(
+		{
+			eexpr = TFunction(
+			{
+				tf_args = ctor_args;
+				tf_type = gen.gcon.basic.tvoid;
+				tf_expr = { eexpr = TBlock(super_call :: ctor_exprs); etype = gen.gcon.basic.tvoid; epos = cls.cl_pos }
+			});
+			etype = ctor_type;
+			epos = cls.cl_pos;
+		});
+		cls.cl_constructor <- Some(ctor);
+
+		(* add invoke function to the class *)
+		cls.cl_ordered_fields <- invoke_field :: cls.cl_ordered_fields;
+		cls.cl_fields <- PMap.add invoke_field.cf_name invoke_field cls.cl_fields;
+		cls.cl_overrides <- invoke_field :: cls.cl_overrides;
+
+		(match tvar with
+		| None -> ()
+		| Some ({ v_extra = Some(_ :: _, _) } as v) ->
+			Hashtbl.add tvar_to_cdecl v.v_id (cls,captured)
+		| _ -> ());
+
+		(* set priority as priority + 0.00001 so that this filter runs again *)
+		gen.gadd_to_module (TClassDecl cls) (priority +. 0.000001);
+
+		(* if there are no captured variables, we can create a cache so subsequent calls don't need to create a new function *)
+		let expr, clscapt =
+			match captured, tparams with
+			| [], [] ->
+				let cache_var = mk_internal_name "hx" "current" in
+				let cache_cf = mk_class_field cache_var (TInst(cls,[])) false func_expr.epos (Var({ v_read = AccNormal; v_write = AccNormal })) [] in
+				cls.cl_ordered_statics <- cache_cf :: cls.cl_ordered_statics;
+				cls.cl_statics <- PMap.add cache_var cache_cf cls.cl_statics;
+
+				(* if (FuncClass.hx_current != null) FuncClass.hx_current; else (FuncClass.hx_current = new FuncClass()); *)
+
+				(* let mk_static_field_access cl field fieldt pos = *)
+				let hx_current = mk_static_field_access cls cache_var (TInst(cls,[])) func_expr.epos in
+
+				let pos = func_expr.epos in
+				{ fexpr with
+					etype = hx_current.etype;
+					eexpr = TIf(
+						{
+							eexpr = TBinop(OpNotEq, hx_current, null (TInst(cls,[])) pos);
+							etype = gen.gcon.basic.tbool;
+							epos = pos;
+						},
+						hx_current,
+						Some(
+						{
+							eexpr = TBinop(OpAssign, hx_current, { fexpr with eexpr = TNew(cls, [], captured) });
+							etype = (TInst(cls,[]));
+							epos = pos;
+						}))
+				}, (cls,captured)
+			| _ ->
+				(* change the expression so it will be a new "added class" ( captured variables arguments ) *)
+				{ fexpr with eexpr = TNew(cls, List.map (fun cl -> TInst(cl,[])) tparams, List.rev captured) }, (cls,captured)
+		in
+		match delegate_type with
+		| None ->
+			expr,clscapt
+		| Some _ ->
+			{
+				eexpr = TField(expr, FClosure(Some (cls,[]),invokecf)); (* TODO: FClosure change *)
+				etype = invokecf.cf_type;
+				epos = cls.cl_pos
+			}, clscapt
+	in
+
+
+	let run = traverse
+		gen
+		~tparam_anon_decl:(fun v e fn ->
+			let _, (cls,captured) = handle_anon_func e ~tvar:v fn null_map_info None in
+			Hashtbl.add tvar_to_cdecl v.v_id (cls,captured)
+		)
+		~tparam_anon_acc:(fun v e in_tparam -> try
+			let cls, captured = Hashtbl.find tvar_to_cdecl v.v_id in
+			let captured = List.sort (fun e1 e2 -> match e1, e2 with
+				| { eexpr = TLocal v1 }, { eexpr = TLocal v2 } ->
+					compare v1.v_name v2.v_name
+				| _ -> assert false) captured
+			in
+			let types = match v.v_extra with
+				| Some(t,_) -> t
+				| _ -> assert false
+			in
+			let monos = List.map (fun _ -> mk_mono()) types in
+			let vt = match follow v.v_type with
+				| TInst(_, [v]) -> v
+				| v -> v
+			in
+			let et = match follow e.etype with
+				| TInst(_, [v]) -> v
+				| v -> v
+			in
+			let original = apply_params types monos vt in
+			unify et original;
+
+			let monos = List.map (fun t -> apply_params types (List.map (fun _ -> t_dynamic) types) t) monos in
+
+			let same_cl t1 t2 = match follow t1, follow t2 with
+				| TInst(c,_), TInst(c2,_) -> c == c2
+				| _ -> false
+			in
+			let passoc = List.map2 (fun (_,t) m -> t,m) types monos in
+			let cltparams = List.map (fun (_,t) ->
+				try
+					snd (List.find (fun (t2,_) -> same_cl t t2) passoc)
+				with | Not_found -> t) cls.cl_params
+			in
+			{ e with eexpr = TNew(cls, cltparams, List.rev captured) }
+		with
+			| Not_found ->
+				if in_tparam then begin
+					gen.gcon.warning "This expression may be invalid" e.epos;
+					e
+				end else
+					(* It is possible that we are recursively calling a function
+					   that has type parameters. In this case, we must leave it be
+					   because as soon as the new class is added to the module,
+					   this filter will run again. By this time, the tvar-to-cdecl
+					   hashtable will be already filled with all functions, so
+					   it should run correctly. In this case, if it keeps failing.
+					   we will add the "Expression may be invalid warning" like we did
+					   before (see Issue #7118) *)
+					{ e with eexpr = TMeta(
+						(Meta.Custom(":tparamcall"), [], e.epos), e
+					) }
+			| Unify_error el ->
+				List.iter (fun el -> gen.gcon.warning (Error.unify_error_msg (print_context()) el) e.epos) el;
+				gen.gcon.warning "This expression may be invalid" e.epos;
+				e
+		)
+		(* (handle_anon_func:texpr->tfunc->texpr) (dynamic_func_call:texpr->texpr->texpr list->texpr) *)
+		(fun e f info delegate_type -> fst (handle_anon_func e f info delegate_type))
+		ft.dynamic_fun_call
+		(* (dynamic_func_call:texpr->texpr->texpr list->texpr) *)
+	in
+	gen.gexpr_filters#add name (PCustom priority) run
+
+
+(*
+	this submodule will provide the default implementation for the C# and Java targets.
+
+	it will have two return types: double and dynamic, and
+*)
+module DoubleAndDynamicClosureImpl =
+struct
+	let get_ctx gen parent_func_class max_arity mk_arg_exception (* e.g. new haxe.lang.ClassClosure *) =
+		let basic = gen.gcon.basic in
+
+		let func_args_i i =
+			let rec loop i (acc) =
+				if i = 0 then (acc) else begin
+					let vfloat = alloc_var (mk_internal_name "fn" ("float" ^ string_of_int i)) basic.tfloat in
+					let vdyn = alloc_var (mk_internal_name "fn" ("dyn" ^ string_of_int i)) t_dynamic in
+
+					loop (i - 1) ((vfloat, None) :: (vdyn, None) :: acc)
+				end
+			in
+			loop i []
+		in
+
+		let args_real_to_func args =
+			let arity = List.length args in
+			if arity >= max_arity then
+				[ alloc_var (mk_internal_name "fn" "dynargs") (gen.gclasses.nativearray t_dynamic), None ]
+			else func_args_i arity
+		in
+
+		let func_sig_i i =
+			let rec loop i acc =
+				if i = 0 then acc else begin
+					let vfloat = mk_internal_name "fn" ("float" ^ string_of_int i) in
+					let vdyn = mk_internal_name "fn" ("dyn" ^ string_of_int i) in
+
+					loop (i - 1) ( (vfloat,false,basic.tfloat) :: (vdyn,false,t_dynamic) :: acc )
+				end
+			in
+			loop i []
+		in
+
+		let args_real_to_func_sig args =
+			let arity = List.length args in
+			if arity >= max_arity then
+				[mk_internal_name "fn" "dynargs", false, gen.gclasses.nativearray t_dynamic]
+			else begin
+				func_sig_i arity
+			end
+		in
+
+		let rettype_real_to_func t = match run_follow gen t with
+			| TAbstract({ a_path = [],"Null" }, _) ->
+				0,t_dynamic
+			| _ when like_float t && not (like_i64 t) ->
+				(1, basic.tfloat)
+			| _ ->
+				(0, t_dynamic)
+		in
+
+		let args_real_to_func_call el (pos:pos) =
+			if List.length el >= max_arity then
+				[mk_nativearray_decl gen t_dynamic el pos]
+			else begin
+				List.fold_left (fun acc e ->
+					if like_float (gen.greal_type e.etype) && not (like_i64 (gen.greal_type e.etype)) then
+						( e :: undefined e.epos :: acc )
+					else
+						( null basic.tfloat e.epos :: e :: acc )
+				) ([]) (List.rev el)
+			end
+		in
+
+		let get_args_func args changed_args pos =
+			let arity = List.length args in
+			let mk_const const elocal t =
+				match const with
+				| None ->
+					mk_cast t elocal
+				| Some const ->
+					{ eexpr = TIf(
+						{ elocal with eexpr = TBinop(Ast.OpEq, elocal, null elocal.etype elocal.epos); etype = basic.tbool },
+						const,
+						Some ( mk_cast t elocal )
+					); etype = t; epos = elocal.epos }
+			in
+
+			if arity >= max_arity then begin
+				let varray = match changed_args with | [v,_] -> v | _ -> assert false in
+				let varray_local = mk_local varray pos in
+				let mk_varray i = { eexpr = TArray(varray_local, make_int gen.gcon.basic i pos); etype = t_dynamic; epos = pos } in
+				let el =
+					snd (List.fold_left (fun (count,acc) (v,const) ->
+						(count + 1, (mk (TVar(v, Some(mk_const const (mk_varray count) v.v_type))) basic.tvoid pos) :: acc)
+					) (0, []) args)
+				in
+				List.rev el
+			end else begin
+				let _, dyn_args, float_args = List.fold_left (fun (count,fargs, dargs) arg ->
+					if count land 1 = 0 then
+						(count + 1, fargs, arg :: dargs)
+					else
+						(count + 1, arg :: fargs, dargs)
+				) (1,[],[]) (List.rev changed_args) in
+
+				let rec loop acc args fargs dargs =
+					match args, fargs, dargs with
+						| [], [], [] -> acc
+						| (v,const) :: args, (vf,_) :: fargs, (vd,_) :: dargs ->
+							let acc = { eexpr = TVar(v, Some(
+								{
+									eexpr = TIf(
+										{ eexpr = TBinop(Ast.OpEq, mk_local vd pos, undefined pos); etype = basic.tbool; epos = pos },
+										mk_cast v.v_type (mk_local vf pos),
+										Some ( mk_const const (mk_local vd pos) v.v_type )
+									);
+									etype = v.v_type;
+									epos = pos
+								} )); etype = basic.tvoid; epos = pos } :: acc in
+							loop acc args fargs dargs
+						| _ -> assert false
+				in
+
+				loop [] args float_args dyn_args
+			end
+		in
+
+		let closure_to_classfield tfunc old_sig pos =
+			(* change function signature *)
+			let old_args = tfunc.tf_args in
+			let changed_args = args_real_to_func old_args in
+
+			(*
+				FIXME properly handle int64 cases, which will break here (because of inference to int)
+				UPDATE: the fix will be that Int64 won't be a typedef to Float/Int
+			*)
+			let changed_sig, arity, type_number, changed_sig_ret, is_void, is_dynamic_func = match follow old_sig with
+				| TFun(_sig, ret) ->
+					let type_n, ret_t = rettype_real_to_func ret in
+					let arity = List.length _sig in
+					let is_dynamic_func = arity >= max_arity in
+					let ret_t = if is_dynamic_func then t_dynamic else ret_t in
+
+					(TFun(args_real_to_func_sig _sig, ret_t), arity, type_n, ret_t, ExtType.is_void ret, is_dynamic_func)
+				| _ -> (print_endline (s_type (print_context()) (follow old_sig) )); assert false
+			in
+
+			let tf_expr = if is_void then begin
+				let rec map e =
+					match e.eexpr with
+						| TReturn None ->
+							mk_return (null t_dynamic e.epos)
+						| _ -> Type.map_expr map e
+				in
+				let e = mk_block (map tfunc.tf_expr) in
+				match e.eexpr with
+					| TBlock bl -> { e with eexpr = TBlock (bl @ [mk_return (null t_dynamic e.epos)]) }
+					| _ -> assert false
+			end else tfunc.tf_expr in
+
+			let changed_sig_ret = if is_dynamic_func then t_dynamic else changed_sig_ret in
+
+			(* get real arguments on top of function body *)
+			let get_args = get_args_func tfunc.tf_args changed_args pos in
+			(*
+				FIXME HACK: in order to be able to run the filters that have already ran for this piece of code,
+				we will cheat and run it as if it was the whole code
+				We could just make ClosuresToClass run before TArrayTransform, but we cannot because of the
+				dependency between ClosuresToClass (after DynamicFieldAccess, and before TArrayTransform)
+
+				maybe a way to solve this would be to add an "until" field to run_from
+			*)
+			let real_get_args = gen.gexpr_filters#run (mk (TBlock get_args) basic.tvoid pos) in
+
+			let func_expr = Type.concat real_get_args tf_expr in
+
+			(* set invoke function *)
+			(* todo properly abstract how naming for invoke is made *)
+			let invoke_name = if is_dynamic_func then "invokeDynamic" else ("invoke" ^ (string_of_int arity) ^ (if type_number = 0 then "_o" else "_f")) in
+			let invoke_name = mk_internal_name "hx" invoke_name in
+			let invoke_field = mk_class_field invoke_name changed_sig false func_expr.epos (Method(MethNormal)) [] in
+			let invoke_fun = {
+				eexpr = TFunction {
+					tf_args = changed_args;
+					tf_type = changed_sig_ret;
+					tf_expr = func_expr;
+				};
+				etype = changed_sig;
+				epos = func_expr.epos;
+			} in
+			invoke_field.cf_expr <- Some invoke_fun;
+
+			invoke_field, [
+				make_int gen.gcon.basic arity pos;
+				make_int gen.gcon.basic type_number pos;
+			]
+		in
+
+		let dynamic_fun_call call_expr =
+			let tc, params = match call_expr.eexpr with
+				| TCall(tc, params) -> tc, params
+				| _ -> assert false
+			in
+			let ct = gen.greal_type call_expr.etype in
+			let postfix, ret_t =
+				if like_float ct && not (like_i64 ct) then
+						"_f", gen.gcon.basic.tfloat
+				else
+					"_o", t_dynamic
+			in
+			let params_len = List.length params in
+			let ret_t = if params_len >= max_arity then t_dynamic else ret_t in
+
+			let invoke_fun = if params_len >= max_arity then "invokeDynamic" else "invoke" ^ (string_of_int params_len) ^ postfix in
+			let invoke_fun = mk_internal_name "hx" invoke_fun in
+			let fun_t = match follow tc.etype with
+				| TFun(_sig, _) ->
+					TFun(args_real_to_func_sig _sig, ret_t)
+				| _ ->
+					let i = ref 0 in
+					let _sig = List.map (fun p -> let name = "arg" ^ (string_of_int !i) in incr i; (name,false,p.etype) ) params in
+					TFun(args_real_to_func_sig _sig, ret_t)
+			in
+
+			let may_cast = match follow call_expr.etype with
+				| TAbstract ({ a_path = ([], "Void") },[]) -> (fun e -> e)
+				| _ -> mk_cast call_expr.etype
+			in
+
+			may_cast
+			{
+				eexpr = TCall(
+					{ (mk_field_access gen { tc with etype = gen.greal_type tc.etype } invoke_fun tc.epos) with etype = fun_t },
+					args_real_to_func_call params call_expr.epos
+				);
+				etype = ret_t;
+				epos = call_expr.epos
+			}
+		in
+
+		let iname i is_float =
+			let postfix = if is_float then "_f" else "_o" in
+			mk_internal_name "hx" ("invoke" ^ string_of_int i) ^ postfix
+		in
+
+		let map_base_classfields cl map_fn =
+			let pos = cl.cl_pos in
+			let this_t = TInst(cl,List.map snd cl.cl_params) in
+			let this = { eexpr = TConst(TThis); etype = this_t; epos = pos } in
+			let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
+
+			let mk_invoke_i i is_float =
+				let cf = mk_class_field (iname i is_float) (TFun(func_sig_i i, if is_float then basic.tfloat else t_dynamic)) false pos (Method MethNormal) [] in
+				cf
+			in
+
+			let type_name = mk_internal_name "fn" "type" in
+			let dynamic_arg = alloc_var (mk_internal_name "fn" "dynargs") (gen.gclasses.nativearray t_dynamic) in
+
+			let mk_invoke_complete_i i is_float =
+
+				(* let arity = i in *)
+				let args = func_args_i i in
+
+				(* api fn *)
+
+				(* only cast if needed *)
+				let mk_cast tto efrom = gen.ghandle_cast (gen.greal_type tto) (gen.greal_type efrom.etype) efrom in
+				let api i t const =
+					let vf, _ = List.nth args (i * 2) in
+					let vo, _ = List.nth args (i * 2 + 1) in
+
+					let needs_cast, is_float = match t, like_float t && not (like_i64 t) with
+						| TAbstract({ a_path = ([], "Float") },[]), _ -> false, true
+						| _, true -> true, true
+						| _ -> false,false
+					in
+
+					let olocal = mk_local vo pos in
+					let flocal = mk_local vf pos in
+
+					let get_from_obj e = match const with
+						| None -> mk_cast t e
+						| Some tc ->
+							{
+								eexpr = TIf(
+									{ eexpr = TBinop(Ast.OpEq, olocal, null t_dynamic pos); etype = basic.tbool; epos = pos } ,
+									{ eexpr = TConst(tc); etype = t; epos = pos },
+									Some (mk_cast t e)
+								);
+								etype = t;
+								epos = pos;
+							}
+					in
+
+					{
+						eexpr = TIf(
+							{ eexpr = TBinop(Ast.OpEq, olocal, undefined pos); etype = basic.tbool; epos = pos },
+							(if needs_cast then mk_cast t flocal else flocal),
+							Some ( get_from_obj olocal )
+						);
+						etype = t;
+						epos = pos
+					}
+				in
+				(* end of api fn *)
+
+				let ret = if is_float then basic.tfloat else t_dynamic in
+
+				let fn_expr = map_fn i ret (List.map fst args) api in
+
+				let t = TFun(fun_args args, ret) in
+
+				let tfunction =
+					{
+						eexpr = TFunction({
+							tf_args = args;
+							tf_type = ret;
+							tf_expr =
+							mk_block fn_expr
+						});
+						etype = t;
+						epos = pos;
+					}
+				in
+
+				let cf = mk_invoke_i i is_float in
+				cf.cf_expr <- Some tfunction;
+				cf
+			in
+
+			let rec loop i cfs =
+				if i < 0 then cfs else begin
+					(*let mk_invoke_complete_i i is_float =*)
+					(mk_invoke_complete_i i false) :: (mk_invoke_complete_i i true) :: (loop (i-1) cfs)
+				end
+			in
+
+			let cfs = loop max_arity [] in
+
+			let switch =
+				let api i t const =
+					match i with
+						| -1 ->
+							mk_local dynamic_arg pos
+						| _ ->
+							mk_cast t {
+								eexpr = TArray(
+									mk_local dynamic_arg pos,
+									{ eexpr = TConst(TInt(Int32.of_int i)); etype = basic.tint; epos = pos });
+								etype = t;
+								epos = pos;
+							}
+				in
+				map_fn (-1) t_dynamic [dynamic_arg] api
+			in
+
+			let args = [dynamic_arg, None] in
+			let dyn_t = TFun(fun_args args, t_dynamic) in
+			let dyn_cf = mk_class_field (mk_internal_name "hx" "invokeDynamic") dyn_t false pos (Method MethNormal) [] in
+
+			dyn_cf.cf_expr <- Some {
+				eexpr = TFunction {
+					tf_args = args;
+					tf_type = t_dynamic;
+					tf_expr = mk_block switch
+				};
+				etype = dyn_t;
+				epos = pos;
+			};
+
+			let additional_cfs = begin
+				let new_t = TFun(["arity", false, basic.tint; "type", false, basic.tint],basic.tvoid) in
+				let new_cf = mk_class_field "new" (new_t) true pos (Method MethNormal) [] in
+				let v_arity, v_type = alloc_var "arity" basic.tint, alloc_var "type" basic.tint in
+				let mk_assign v field = mk (TBinop (OpAssign, mk_this field v.v_type, mk_local v pos)) v.v_type pos in
+
+				let arity_name = mk_internal_name "hx" "arity" in
+				new_cf.cf_expr <- Some {
+					eexpr = TFunction({
+						tf_args = [v_arity, None; v_type, None];
+						tf_type = basic.tvoid;
+						tf_expr =
+						{
+							eexpr = TBlock([
+								mk_assign v_type type_name;
+								mk_assign v_arity arity_name
+							]);
+							etype = basic.tvoid;
+							epos = pos;
+						}
+					});
+					etype = new_t;
+					epos = pos;
+				};
+
+				[
+					new_cf;
+					mk_class_field type_name basic.tint true pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
+					mk_class_field arity_name basic.tint true pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
+				]
+			end in
+
+			dyn_cf :: (additional_cfs @ cfs)
+		in
+
+		begin
+			(*
+				setup fields for the abstract implementation of the Function class
+
+				new(arity, type)
+				{
+					this.arity = arity;
+					this.type = type;
+				}
+
+				hx::invokeX_f|o (where X is from 0 to max_arity) (args)
+				{
+					if (this.type == 0|1) return invokeX_o|f(args); else throw "Invalid number of arguments."
+				}
+
+				hx::invokeDynamic, which will work in the same way
+			*)
+			let cl = parent_func_class in
+			let pos = cl.cl_pos in
+
+			let rec mk_dyn_call arity api =
+				let zero = make_float gen.gcon.basic "0.0" pos in
+				let rec loop i acc =
+					if i = 0 then
+						acc
+					else begin
+						let arr = api (i - 1) t_dynamic None in
+						loop (i - 1) (zero :: arr :: acc)
+					end
+				in
+				loop arity []
+			in
+
+			let this = mk (TConst TThis) (TInst (cl, List.map snd cl.cl_params)) pos in
+			let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
+
+			let mk_invoke_switch i api =
+				let t = TFun (func_sig_i i, t_dynamic) in
+				(* case i: return this.invokeX_o(0, 0, 0, 0, 0, ... arg[0], args[1]....); *)
+				[make_int gen.gcon.basic i pos], mk_return (mk (TCall(mk_this (iname i false) t, mk_dyn_call i api)) t_dynamic pos)
+			in
+			let rec loop_cases api arity acc =
+				if arity < 0 then
+					acc
+				else
+					loop_cases api (arity - 1) (mk_invoke_switch arity api :: acc)
+			in
+
+			let type_name = mk_internal_name "fn" "type" in
+			let mk_expr i is_float vars =
+				let call_expr =
+					let call_t = TFun(List.map (fun v -> (v.v_name, false, v.v_type)) vars, if is_float then t_dynamic else basic.tfloat) in
+					{
+						eexpr = TCall(mk_this (iname i (not is_float)) call_t, List.map (fun v -> mk_local v pos) vars);
+						etype = if is_float then t_dynamic else basic.tfloat;
+						epos = pos
+					}
+				in
+				{
+					eexpr = TIf(
+						mk (TBinop (Ast.OpNotEq, mk_this type_name basic.tint, (make_int gen.gcon.basic (if is_float then 0 else 1) pos))) basic.tbool pos,
+						make_throw (mk_arg_exception "Wrong number of arguments" pos) pos,
+						Some (mk_return call_expr)
+					);
+					etype = t_dynamic;
+					epos = pos;
+				}
+			in
+
+			let arities_processed = Hashtbl.create 10 in
+			let max_arity = ref 0 in
+
+			let map_fn cur_arity fun_ret_type vars (api:int->t->tconstant option->texpr) =
+				let is_float = like_float fun_ret_type && not (like_i64 fun_ret_type) in
+				match cur_arity with
+				| -1 ->
+					let dynargs = api (-1) t_dynamic None in
+
+					(* (dynargs == null) ? 0 : dynargs.length *)
+					let switch_cond = {
+						eexpr = TIf(
+							mk (TBinop (OpEq, dynargs, null dynargs.etype pos)) basic.tbool pos,
+							mk (TConst (TInt Int32.zero)) basic.tint pos,
+							Some (gen.gclasses.nativearray_len dynargs pos));
+						etype = basic.tint;
+						epos = pos;
+					} in
+
+					{
+						eexpr = TSwitch(
+							switch_cond,
+							loop_cases api !max_arity [],
+							Some(make_throw (mk_arg_exception "Too many arguments" pos) pos));
+						etype = basic.tvoid;
+						epos = pos;
+					}
+				| _ ->
+					if not (Hashtbl.mem arities_processed cur_arity) then begin
+						Hashtbl.add arities_processed cur_arity true;
+						if cur_arity > !max_arity then max_arity := cur_arity
+					end;
+
+					mk_expr cur_arity is_float vars
+			in
+
+			let cfs = map_base_classfields cl map_fn in
+			List.iter (fun cf ->
+				if cf.cf_name = "new" then
+					parent_func_class.cl_constructor <- Some cf
+				else
+					parent_func_class.cl_fields <- PMap.add cf.cf_name cf parent_func_class.cl_fields
+			) cfs;
+			parent_func_class.cl_ordered_fields <- (List.filter (fun cf -> cf.cf_name <> "new") cfs) @ parent_func_class.cl_ordered_fields
+		end;
+
+		{
+			func_class = parent_func_class;
+			closure_to_classfield = closure_to_classfield;
+			dynamic_fun_call = dynamic_fun_call;
+			map_base_classfields = map_base_classfields;
+		}
+end;;
diff --git a/src/codegen/gencommon/dynamicFieldAccess.ml b/src/codegen/gencommon/dynamicFieldAccess.ml
new file mode 100644
index 0000000000000000000000000000000000000000..2ecbc07260d30aeffc9496dcd36ded49975286bd
--- /dev/null
+++ b/src/codegen/gencommon/dynamicFieldAccess.ml
@@ -0,0 +1,132 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Option
+open Ast
+open Type
+open Gencommon
+
+(*
+	This module will filter every dynamic field access in haxe.
+
+	On platforms that do not support dynamic access, it is with this that you should
+	replace dynamic calls with x.field / Reflect.setField calls, and guess what -
+	this is the default implemenation!
+	Actually there is a problem with Reflect.setField because it returns void, which is a bad thing for us,
+	so even in the default implementation, the function call should be specified to a Reflect.setField version that returns
+	the value that was set
+
+	(TODO: should it be separated?)
+	As a plus, the default implementation adds something that doesn't hurt anybody, it looks for
+	TAnon with Statics / EnumStatics field accesses and transforms them into real static calls.
+	This means it will take this
+
+	var m = Math;
+	for (i in 0...1000) m.cos(10);
+
+	which is an optimization in dynamic platforms, but performs horribly on strongly typed platforms
+	and transform into:
+
+	var m = Math;
+	for (i in 0...1000) Math.cos(10);
+
+	depends on:
+		(ok) must run AFTER Binop/Unop handler - so Unops / Binops are already unrolled
+*)
+let name = "dynamic_field_access"
+let priority = solve_deps name [DAfter DynamicOperators.priority]
+
+(*
+	is_dynamic (expr) (field_access_expr) (field) : a function that indicates if the field access should be changed
+	change_expr (expr) (field_access_expr) (field) (setting expr) (is_unsafe) : changes the expression
+	call_expr (expr) (field_access_expr) (field) (call_params) : changes a call expression
+*)
+let configure gen (is_dynamic:texpr->Type.tfield_access->bool) (change_expr:texpr->texpr->string->texpr option->bool->texpr) (call_expr:texpr->texpr->string->texpr list->texpr) =
+	let is_nondynamic_tparam fexpr f = match follow fexpr.etype with
+		| TInst({ cl_kind = KTypeParameter(tl) }, _) ->
+			List.exists (fun t -> not (is_dynamic { fexpr with etype = t } f)) tl
+		| _ -> false
+	in
+
+	let rec run e =
+		match e.eexpr with
+		(* class types *)
+		| TField(fexpr, f) when is_nondynamic_tparam fexpr f ->
+			(match follow fexpr.etype with
+				| TInst( ({ cl_kind = KTypeParameter(tl) } as tp_cl), tp_tl) ->
+					let t = apply_params tp_cl.cl_params tp_tl (List.find (fun t -> not (is_dynamic { fexpr with etype = t } f)) tl) in
+					{ e with eexpr = TField(mk_cast t (run fexpr), f) }
+				| _ -> assert false)
+
+		| TField(fexpr, f) when is_some (anon_class fexpr.etype) ->
+			let decl = get (anon_class fexpr.etype) in
+			let name = field_name f in
+			(try
+				match decl with
+				| TClassDecl cl ->
+					let cf = PMap.find name cl.cl_statics in
+					{ e with eexpr = TField ({ fexpr with eexpr = TTypeExpr decl }, FStatic (cl, cf)) }
+				| TEnumDecl en ->
+					let ef = PMap.find name en.e_constrs in
+					{ e with eexpr = TField ({ fexpr with eexpr = TTypeExpr decl }, FEnum (en, ef)) }
+				| TAbstractDecl _ (* abstracts don't have TFields *)
+				| TTypeDecl _ -> (* anon_class doesn't return TTypeDecl *)
+					assert false
+			with Not_found ->
+				match f with
+				| FStatic (cl, cf) when has_class_field_flag cf CfExtern ->
+					{ e with eexpr = TField ({ fexpr with eexpr = TTypeExpr decl }, FStatic (cl, cf)) }
+				| _ ->
+					change_expr e { fexpr with eexpr = TTypeExpr decl } (field_name f) None true)
+
+		| TField (fexpr, f) when is_dynamic fexpr f ->
+			change_expr e (run fexpr) (field_name f) None true
+
+		| TCall ({ eexpr = TField (_, FStatic({ cl_path = ([], "Reflect") }, { cf_name = "field" })) }, [obj; { eexpr = TConst (TString field) }]) ->
+			let t = match gen.greal_type obj.etype with
+			| TDynamic _ | TAnon _ | TMono _ -> t_dynamic
+			| t -> t
+			in
+			change_expr (mk_field_access gen { obj with etype = t } field obj.epos) (run obj) field None false
+
+		| TCall ({ eexpr = TField (_, FStatic({ cl_path = ([], "Reflect") }, { cf_name = "setField" } )) }, [obj; { eexpr = TConst(TString field) }; evalue]) ->
+			change_expr (mk_field_access gen obj field obj.epos) (run obj) field (Some (run evalue)) false
+
+		| TBinop (OpAssign, { eexpr = TField(fexpr, f) }, evalue) when is_dynamic fexpr f ->
+			change_expr e (run fexpr) (field_name f) (Some (run evalue)) true
+
+		| TBinop (OpAssign, { eexpr = TField(fexpr, f) }, evalue) ->
+			(match field_access_esp gen fexpr.etype f with
+			| FClassField(_,_,_,cf,false,t,_) when (try PMap.find cf.cf_name gen.gbase_class_fields == cf with Not_found -> false) ->
+				change_expr e (run fexpr) (field_name f) (Some (run evalue)) true
+			| _ ->
+				Type.map_expr run e)
+
+		| TBinop (OpAssignOp _, { eexpr = TField (fexpr, f) }, _) when is_dynamic fexpr f ->
+			assert false (* this case shouldn't happen *)
+		| TUnop (Increment, _, { eexpr = TField (({ eexpr = TLocal _ } as fexpr), f)})
+		| TUnop (Decrement, _, { eexpr = TField (({ eexpr = TLocal _ } as fexpr), f)}) when is_dynamic fexpr f ->
+			assert false (* this case shouldn't happen *)
+
+		| TCall ({ eexpr = TField (fexpr, f) }, params) when is_dynamic fexpr f && (not (is_nondynamic_tparam fexpr f)) ->
+			call_expr e (run fexpr) (field_name f) (List.map run params)
+
+		| _ ->
+			Type.map_expr run e
+	in
+	gen.gexpr_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/dynamicOperators.ml b/src/codegen/gencommon/dynamicOperators.ml
new file mode 100644
index 0000000000000000000000000000000000000000..538a9a06818d913b58392e4fc49652145896e163
--- /dev/null
+++ b/src/codegen/gencommon/dynamicOperators.ml
@@ -0,0 +1,190 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Ast
+open Type
+open Codegen
+open Texpr.Builder
+open Gencommon
+
+(* ******************************************* *)
+(* Dynamic Binop/Unop handler *)
+(* ******************************************* *)
+(*
+	On some languages there is limited support for operations on
+	dynamic variables, so those operations must be changed.
+
+	There are 5 types of binary operators:
+		1 - can take any variable and returns a bool (== and !=)
+		2 - can take either a string, or a number and returns either a bool or the underlying type ( >, < for bool and + for returning its type)
+		3 - take numbers and return a number ( *, /, ...)
+		4 - take ints and return an int (bit manipulation)
+		5 - take a bool and returns a bool ( &&, || ...)
+
+	On the default implementation, type 1 and the plus function will be handled with a function call;
+	Type 2 will be handled with the parameter "compare_handler", which will do something like Reflect.compare(x1, x2);
+	Types 3, 4 and 5 will perform a cast to double, int and bool, which will then be handled normally by the platform
+
+	Unary operators are the most difficult to handle correctly.
+	With unary operators, there are 2 types:
+
+		1 - can take a number, changes and returns the result (++, --, ~)
+		2 - can take a number (-) or bool (!), and returns the result
+
+	The first case is much trickier, because it doesn't seem a good idea to change any variable to double just because it is dynamic,
+	but this is how we will handle right now.
+	something like that:
+
+	var x:Dynamic = 10;
+	x++;
+
+	will be:
+	object x = 10;
+	x = ((IConvertible)x).ToDouble(null) + 1;
+
+	depends on:
+		(syntax) must run before expression/statment normalization because it may generate complex expressions
+		must run before OverloadingConstructor due to later priority conflicts. Since ExpressionUnwrap is only
+		defined afterwards, we will set this value with absolute values
+*)
+let init com handle_strings (should_change:texpr->bool) (equals_handler:texpr->texpr->texpr) (dyn_plus_handler:texpr->texpr->texpr->texpr) (compare_handler:Ast.binop->texpr->texpr->texpr->texpr) =
+	let get_etype_one e =
+		if like_int e.etype then
+			make_int com.basic 1 e.epos
+		else
+			make_float com.basic "1.0" e.epos
+	in
+	let rec run e =
+		match e.eexpr with
+		| TBinop (OpAssignOp op, e1, e2) when should_change e -> (* e1 will never contain another TBinop *)
+			(match e1.eexpr with
+			| TLocal _ ->
+				mk_paren { e with eexpr = TBinop(OpAssign, e1, run { e with eexpr = TBinop(op, e1, e2) }) }
+			| TField _ | TArray _ ->
+				let eleft, rest =
+					match e1.eexpr with
+					| TField(ef, f) ->
+						let v = mk_temp "dynop" ef.etype in
+						{ e1 with eexpr = TField (mk_local v ef.epos, f) }, [mk (TVar (v, Some (run ef))) com.basic.tvoid ef.epos]
+					| TArray(e1a, e2a) ->
+						let v = mk_temp "dynop" e1a.etype in
+						let v2 = mk_temp "dynopi" e2a.etype in
+						{ e1 with eexpr = TArray(mk_local v e1a.epos, mk_local v2 e2a.epos) }, [
+							(mk (TVar (v, Some (run e1a))) com.basic.tvoid e1.epos);
+							(mk (TVar (v2, Some (run e2a))) com.basic.tvoid e1.epos)
+						]
+					| _ -> assert false
+				in
+				{ e with eexpr = TBlock (rest @ [{ e with eexpr = TBinop (OpAssign, eleft, run { e with eexpr = TBinop (op, eleft, e2) }) }]) }
+			| _ ->
+				assert false)
+
+		| TBinop (OpAssign, e1, e2)
+		| TBinop (OpInterval, e1, e2) ->
+			Type.map_expr run e
+
+		| TBinop (op, e1, e2) when should_change e ->
+			(match op with
+			| OpEq -> (* type 1 *)
+				equals_handler (run e1) (run e2)
+			| OpNotEq -> (* != -> !equals() *)
+				mk_parent (mk (TUnop (Not, Prefix, (equals_handler (run e1) (run e2)))) com.basic.tbool e.epos)
+			| OpAdd  ->
+				if handle_strings && (is_string e.etype || is_string e1.etype || is_string e2.etype) then
+					{ e with eexpr = TBinop (op, mk_cast com.basic.tstring (run e1), mk_cast com.basic.tstring (run e2)) }
+				else
+					dyn_plus_handler e (run e1) (run e2)
+			| OpGt | OpGte | OpLt | OpLte  -> (* type 2 *)
+				compare_handler op e (run e1) (run e2)
+			| OpMult | OpDiv | OpSub | OpMod -> (* always cast everything to double *)
+				let etype = (get_etype_one e).etype in
+				{ e with eexpr = TBinop (op, mk_cast etype (run e1), mk_cast etype (run e2)) }
+			| OpBoolAnd | OpBoolOr ->
+				{ e with eexpr = TBinop (op, mk_cast com.basic.tbool (run e1), mk_cast com.basic.tbool (run e2)) }
+			| OpAnd | OpOr | OpXor | OpShl | OpShr | OpUShr ->
+				{ e with eexpr = TBinop (op, mk_cast com.basic.tint (run e1), mk_cast com.basic.tint (run e2)) }
+			| OpAssign | OpAssignOp _ | OpInterval | OpArrow | OpIn ->
+				assert false)
+
+		| TUnop (Increment as op, flag, e1)
+		| TUnop (Decrement as op, flag, e1) when should_change e ->
+			(*
+				some naming definitions:
+				* ret => the returning variable
+				* _g => the get body
+				* getvar => the get variable expr
+
+				This will work like this:
+					- if e1 is a TField, set _g = get body, getvar = (get body).varname
+					- if Prefix, return getvar = getvar + 1.0
+					- if Postfix, set ret = getvar; getvar = getvar + 1.0; ret;
+			*)
+			let one = get_etype_one e in
+			let etype = one.etype in
+			let op = (match op with Increment -> OpAdd | Decrement -> OpSub | _ -> assert false) in
+
+			let block =
+				let vars, getvar =
+					match e1.eexpr with
+					| TField (fexpr, field) ->
+						let tmp = mk_temp "getvar" fexpr.etype in
+						let var = mk (TVar (tmp, Some (run fexpr))) com.basic.tvoid e.epos in
+						([var], mk (TField (make_local tmp fexpr.epos, field)) etype e1.epos)
+					| _ ->
+						([], e1)
+				in
+				match flag with
+				| Prefix ->
+					vars @ [
+						mk_cast etype { e with eexpr = TBinop(OpAssign, getvar, binop op (mk_cast etype getvar) one etype e.epos); etype = getvar.etype }
+					]
+				| Postfix ->
+					let ret = mk_temp "ret" etype in
+					let retlocal = make_local ret e.epos in
+					vars @ [
+						mk (TVar (ret, Some (mk_cast etype getvar))) com.basic.tvoid e.epos;
+						{ e with eexpr = TBinop (OpAssign, getvar, binop op retlocal one getvar.etype e.epos) };
+						retlocal
+					]
+			in
+			mk (TBlock block) etype e.epos
+
+	| TUnop (op, flag, e1) when should_change e ->
+		let etype = match op with
+			| Not -> com.basic.tbool
+			| Neg ->
+				if like_float e.etype || like_i64 e.etype then
+					e.etype
+				else
+					com.basic.tfloat
+			| _ -> com.basic.tint
+		in
+		mk_parent (mk (TUnop (op, flag, mk_cast etype (run e1))) etype e.epos)
+
+	| _ ->
+		Type.map_expr run e
+	in
+	run
+
+let name = "dyn_ops"
+let priority = 0.0
+
+let configure gen ~handle_strings should_change equals_handler dyn_plus_handler compare_handler =
+	let run = init gen.gcon handle_strings should_change equals_handler dyn_plus_handler compare_handler in
+	gen.gexpr_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/enumToClass.ml b/src/codegen/gencommon/enumToClass.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b4331cd6de7271a10713a26095b0f9671551a9e4
--- /dev/null
+++ b/src/codegen/gencommon/enumToClass.ml
@@ -0,0 +1,302 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Globals
+open Ast
+open Type
+open Codegen
+open Texpr.Builder
+open Gencommon
+
+(* ******************************************* *)
+(* EnumToClass *)
+(* ******************************************* *)
+(*
+	For languages that don't support parameterized enums and/or metadata in enums, we need to transform
+	enums into normal classes. This is done at the first module pass by creating new classes with the same
+	path inside the modules, and removing the actual enum module by setting it as en extern.
+
+	* The target must create its own strategy to deal with reflection. As it is right now, we will have a base class
+	which the class will extend, create @:$IsEnum metadata for the class, and create @:alias() metadatas for the fields,
+	with their tag order (as a string) as their alias. If you are using ReflectionCFs, then you don't have to worry
+	about that, as it's already generating all information needed by the haxe runtime.
+	so they can be
+*)
+let name = "enum_to_class"
+let priority = solve_deps name []
+
+type t = {
+	ec_tbl : (path, tclass) Hashtbl.t;
+}
+
+let new_t () = {
+	ec_tbl = Hashtbl.create 10
+}
+
+(* ******************************************* *)
+(* EnumToClassModf *)
+(* ******************************************* *)
+(*
+	The actual Module Filter that will transform the enum into a class
+
+	dependencies:
+		Should run before ReflectionCFs, in order to enable proper reflection access.
+		Should run before RealTypeParams.RealTypeParamsModf, since generic enums must be first converted to generic classes
+		It needs that the target platform implements __array__() as a shortcut to declare haxe.ds.Vector
+*)
+module EnumToClassModf =
+struct
+	let name = "enum_to_class_mod"
+	let priority = solve_deps name [DBefore ReflectionCFs.priority; DBefore RealTypeParams.RealTypeParamsModf.priority]
+
+	let pmap_exists fn pmap = try PMap.iter (fun a b -> if fn a b then raise Exit) pmap; false with | Exit -> true
+
+	let has_any_meta en =
+		let has_meta meta = List.exists (fun (m,_,_) -> match m with Meta.Custom _ -> true | _ -> false) meta in
+		has_meta en.e_meta || pmap_exists (fun _ ef -> has_meta ef.ef_meta) en.e_constrs
+
+	let convert gen t base_class base_param_class en =
+		let handle_type_params = false in (* TODO: look into this *)
+		let basic = gen.gcon.basic in
+		let pos = en.e_pos in
+
+		(* create the class *)
+		let cl = mk_class en.e_module en.e_path pos in
+		Hashtbl.add t.ec_tbl en.e_path cl;
+
+		(match Texpr.build_metadata gen.gcon.basic (TEnumDecl en) with
+			| Some expr ->
+				let cf = mk_class_field "__meta__" expr.etype false expr.epos (Var { v_read = AccNormal; v_write = AccNormal }) [] in
+				cf.cf_expr <- Some expr;
+				cl.cl_statics <- PMap.add "__meta__" cf cl.cl_statics;
+				cl.cl_ordered_statics <- cf :: cl.cl_ordered_statics
+			| _ -> ()
+		);
+
+		let super, has_params = if Meta.has Meta.FlatEnum en.e_meta then base_class, false else base_param_class, true in
+
+		cl.cl_super <- Some(super,[]);
+		cl.cl_extern <- en.e_extern;
+		en.e_meta <- (Meta.Class, [], pos) :: en.e_meta;
+		cl.cl_module <- en.e_module;
+		cl.cl_meta <- ( Meta.Enum, [], pos ) :: cl.cl_meta;
+
+		(match gen.gcon.platform with
+			| Cs when Common.defined gen.gcon Define.CoreApiSerialize ->
+				cl.cl_meta <- ( Meta.Meta, [ (EField( (EConst (Ident "System"), null_pos ), "Serializable" ), null_pos) ], null_pos ) :: cl.cl_meta
+			| _ -> ());
+		let c_types =
+			if handle_type_params then
+				List.map (fun (s,t) -> (s, TInst (map_param (get_cl_t t), []))) en.e_params
+			else
+				[]
+		in
+
+		cl.cl_params <- c_types;
+
+		let i = ref 0 in
+		let cfs = List.map (fun name ->
+			let ef = PMap.find name en.e_constrs in
+			let pos = ef.ef_pos in
+			let old_i = !i in
+			incr i;
+
+			let cf = match follow ef.ef_type with
+				| TFun(params,ret) ->
+					let dup_types =
+						if handle_type_params then
+							List.map (fun (s,t) -> (s, TInst (map_param (get_cl_t t), []))) en.e_params
+						else
+							[]
+					in
+
+					let ef_type =
+						let fn, types = if handle_type_params then snd, dup_types else (fun _ -> t_dynamic), en.e_params in
+						let t = apply_params en.e_params (List.map fn types) ef.ef_type in
+						apply_params ef.ef_params (List.map fn ef.ef_params) t
+					in
+
+					let params, ret = get_fun ef_type in
+					let cf_params = if handle_type_params then dup_types @ ef.ef_params else [] in
+
+					let cf = mk_class_field name ef_type true pos (Method MethNormal) cf_params in
+					cf.cf_meta <- [];
+
+					let tf_args = List.map (fun (name,opt,t) ->  (alloc_var name t, if opt then Some (Texpr.Builder.make_null t null_pos) else None) ) params in
+					let arr_decl = mk_nativearray_decl gen t_dynamic (List.map (fun (v,_) -> mk_local v pos) tf_args) pos in
+					let expr = {
+						eexpr = TFunction({
+							tf_args = tf_args;
+							tf_type = ret;
+							tf_expr = mk_block ( mk_return { eexpr = TNew(cl,List.map snd dup_types, [make_int gen.gcon.basic old_i pos; arr_decl] ); etype = TInst(cl, List.map snd dup_types); epos = pos } );
+						});
+						etype = ef_type;
+						epos = pos
+					} in
+					cf.cf_expr <- Some expr;
+					cf
+				| _ ->
+					let actual_t = match follow ef.ef_type with
+						| TEnum(e, p) -> TEnum(e, List.map (fun _ -> t_dynamic) p)
+						| _ -> assert false
+					in
+					let cf = mk_class_field name actual_t true pos (Var { v_read = AccNormal; v_write = AccNever }) [] in
+					let args = if has_params then
+						[make_int gen.gcon.basic old_i pos; null (gen.gclasses.nativearray t_dynamic) pos]
+					else
+						[make_int gen.gcon.basic old_i pos]
+					in
+					cf.cf_meta <- [Meta.ReadOnly,[],pos];
+					cf.cf_expr <- Some {
+						eexpr = TNew(cl, List.map (fun _ -> t_empty) cl.cl_params, args);
+						etype = TInst(cl, List.map (fun _ -> t_empty) cl.cl_params);
+						epos = pos;
+					};
+					cf
+			in
+			cl.cl_statics <- PMap.add cf.cf_name cf cl.cl_statics;
+			cf
+		) en.e_names in
+		let constructs_cf = mk_class_field "__hx_constructs" (gen.gclasses.nativearray basic.tstring) true pos (Var { v_read = AccNormal; v_write = AccNever }) [] in
+		constructs_cf.cf_meta <- [Meta.ReadOnly,[],pos];
+		constructs_cf.cf_expr <- Some (mk_nativearray_decl gen basic.tstring (List.map (fun s -> { eexpr = TConst(TString s); etype = basic.tstring; epos = pos }) en.e_names) pos);
+
+		cl.cl_ordered_statics <- constructs_cf :: cfs @ cl.cl_ordered_statics ;
+		cl.cl_statics <- PMap.add "__hx_constructs" constructs_cf cl.cl_statics;
+
+		let getTag_cf_type = tfun [] basic.tstring in
+		let getTag_cf = mk_class_field "getTag" getTag_cf_type true pos (Method MethNormal) [] in
+		add_class_field_flag getTag_cf CfFinal;
+		getTag_cf.cf_expr <- Some {
+			eexpr = TFunction {
+				tf_args = [];
+				tf_type = basic.tstring;
+				tf_expr = mk_return (
+					let e_constructs = mk_static_field_access_infer cl "__hx_constructs" pos [] in
+					let e_this = mk (TConst TThis) (TInst (cl,[])) pos in
+					let e_index = mk_field_access gen e_this "index" pos in
+					{
+						eexpr = TArray(e_constructs,e_index);
+						etype = basic.tstring;
+						epos = pos;
+					}
+				)
+			};
+			etype = getTag_cf_type;
+			epos = pos;
+		};
+
+		cl.cl_ordered_fields <- getTag_cf :: cl.cl_ordered_fields ;
+		cl.cl_fields <- PMap.add "getTag" getTag_cf cl.cl_fields;
+		cl.cl_overrides <- getTag_cf :: cl.cl_overrides;
+		cl.cl_meta <- (Meta.NativeGen,[],cl.cl_pos) :: cl.cl_meta;
+		gen.gadd_to_module (TClassDecl cl) (max_dep);
+
+		TEnumDecl en
+
+	(*
+		traverse
+			gen - gen context
+			convert_all : bool - should we convert all enums? If set, convert_if_has_meta will be ignored.
+			convert_if_has_meta : bool - should we convert only if it has meta?
+			enum_base_class : tclass - the enum base class.
+			should_be_hxgen : bool - should the created enum be hxgen?
+	*)
+	let configure gen t convert_all convert_if_has_meta enum_base_class param_enum_class =
+		let convert e = convert gen t enum_base_class param_enum_class e in
+		let run md =
+			match md with
+			| TEnumDecl e when is_hxgen md ->
+				if convert_all then
+					convert e
+				else if convert_if_has_meta && has_any_meta e then
+					convert e
+				else if not (Meta.has Meta.FlatEnum e.e_meta) then
+					convert e
+				else begin
+					(* take off the :hxgen meta from it, if there's any *)
+					e.e_meta <- List.filter (fun (n,_,_) -> not (n = Meta.HxGen)) e.e_meta;
+					md
+				end
+			| _ ->
+				md
+		in
+		gen.gmodule_filters#add name (PCustom priority) run
+end;;
+
+(* ******************************************* *)
+(* EnumToClassExprf *)
+(* ******************************************* *)
+(*
+	Enum to class Expression Filter
+
+	dependencies:
+		Should run before TArrayTransform, since it generates array access expressions
+*)
+module EnumToClassExprf =
+struct
+	let name = "enum_to_class_exprf"
+	let priority = solve_deps name [DBefore TArrayTransform.priority]
+
+	let configure gen t mk_enum_index_call =
+		let rec run e =
+			let get_converted_enum_type et =
+				let en, eparams = match follow (gen.gfollow#run_f et) with
+					| TEnum(en,p) -> en, p
+					| _ -> raise Not_found
+				in
+				let cl = Hashtbl.find t.ec_tbl en.e_path in
+				TInst(cl, eparams)
+			in
+
+			match e.eexpr with
+			| TEnumIndex f ->
+				let f = run f in
+				(try
+					mk_field_access gen {f with etype = get_converted_enum_type f.etype} "index" e.epos
+				with Not_found ->
+					mk_enum_index_call f e.epos)
+			| TCall (({eexpr = TField(_, FStatic({cl_path=[],"Type"},{cf_name="enumIndex"}))} as left), [f]) ->
+				let f = run f in
+				(try
+					mk_field_access gen {f with etype = get_converted_enum_type f.etype} "index" e.epos
+				with Not_found ->
+					{ e with eexpr = TCall(left, [f]) })
+			| TEnumParameter(f, _,i) ->
+				let f = run f in
+				(* check if en was converted to class *)
+				(* if it was, switch on tag field and change cond type *)
+				let f = try
+					{ f with etype = get_converted_enum_type f.etype }
+				with Not_found ->
+					f
+				in
+				let cond_array = { (mk_field_access gen f "params" f.epos) with etype = gen.gclasses.nativearray t_dynamic } in
+				index gen.gcon.basic cond_array i e.etype e.epos
+			| _ ->
+				Type.map_expr run e
+		in
+		gen.gexpr_filters#add name (PCustom priority) run
+
+end;;
+
+let configure gen convert_all convert_if_has_meta enum_base_class param_enum_class mk_enum_index_call =
+	let t = new_t () in
+	EnumToClassModf.configure gen t convert_all convert_if_has_meta enum_base_class param_enum_class;
+	EnumToClassExprf.configure gen t mk_enum_index_call
diff --git a/src/codegen/gencommon/enumToClass2.ml b/src/codegen/gencommon/enumToClass2.ml
new file mode 100644
index 0000000000000000000000000000000000000000..1c4ebef2a43bc67f58aa7cd43c6a709d7ce2525b
--- /dev/null
+++ b/src/codegen/gencommon/enumToClass2.ml
@@ -0,0 +1,399 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Ast
+open Codegen
+open Texpr.Builder
+open Type
+open Gencommon
+
+let add_static c cf =
+	c.cl_statics <- PMap.add cf.cf_name cf c.cl_statics;
+	c.cl_ordered_statics <- cf :: c.cl_ordered_statics
+
+let add_field c cf override =
+	c.cl_fields <- PMap.add cf.cf_name cf c.cl_fields;
+	c.cl_ordered_fields <- cf :: c.cl_ordered_fields;
+	if override then c.cl_overrides <- cf :: c.cl_overrides
+
+let add_meta com en cl_enum =
+	Option.may (fun expr ->
+		let cf_meta = mk_field "__meta__" expr.etype expr.epos expr.epos in
+		cf_meta.cf_expr <- Some expr;
+		add_static cl_enum cf_meta;
+	) (Texpr.build_metadata com.basic (TEnumDecl en));
+
+type enclasses = {
+	base : tclass;
+	ctors : (string, tclass) PMap.t;
+}
+
+module EnumToClass2Modf = struct
+	let name = "enum_to_class2_mod"
+	let priority = solve_deps name [DBefore ReflectionCFs.priority; DBefore RealTypeParams.RealTypeParamsModf.priority]
+
+	let convert gen ec_tbl base_class en =
+		let pos = en.e_pos in
+
+		(* create the class *)
+		let cl_enum = mk_class en.e_module en.e_path pos in
+		cl_enum.cl_super <- Some (base_class,[]);
+		cl_enum.cl_extern <- en.e_extern;
+		cl_enum.cl_meta <- [(Meta.Enum,[],pos); (Meta.NativeGen,[],pos)] @ cl_enum.cl_meta;
+
+		(* mark the enum that it's generated as a class *)
+		en.e_meta <- (Meta.Class,[],pos) :: en.e_meta;
+
+		(* add metadata *)
+		add_meta gen.gcon en cl_enum;
+
+		let basic = gen.gcon.basic in
+		let mk_array_decl t el p = mk_nativearray_decl gen t el p in
+
+		(* add constructs field (for reflection) *)
+		if has_feature gen.gcon "Type.getEnumConstructs" then begin
+			let e_constructs = mk_array_decl basic.tstring (List.map (fun s -> make_string gen.gcon.basic s pos) en.e_names) pos in
+			let cf_constructs = mk_field "__hx_constructs" e_constructs.etype pos pos in
+			cf_constructs.cf_kind <- Var { v_read = AccNormal; v_write = AccNever };
+			cf_constructs.cf_meta <- (Meta.ReadOnly,[],pos) :: (Meta.Protected,[],pos) :: cf_constructs.cf_meta;
+			cf_constructs.cf_expr <- Some e_constructs;
+			add_static cl_enum cf_constructs
+		end;
+
+		(* add the class to the module *)
+		gen.gadd_to_module (TClassDecl cl_enum) max_dep;
+
+		let eparamsToString = mk_static_field_access_infer base_class "paramsToString" pos [] in
+		let eparamsGetHashCode = mk_static_field_access_infer base_class "paramsGetHashCode" pos [] in
+
+		let e_pack, e_name = en.e_path in
+		let cl_enum_t = TInst (cl_enum, []) in
+		let cf_getTag_t = tfun [] basic.tstring in
+		let cf_getParams_ret = basic.tarray (mk_anon PMap.empty) in
+		let cf_getParams_t = tfun [] cf_getParams_ret in
+		let static_ctors = ref [] in
+		let ctors_map = ref PMap.empty in
+		let add_ctor name index =
+			let ef = PMap.find name en.e_constrs in
+			let pos = ef.ef_pos in
+
+			let cl_ctor = mk_class en.e_module (e_pack, e_name ^ "_" ^ name) pos in
+			cl_ctor.cl_final <- true;
+			cl_ctor.cl_super <- Some (cl_enum, []);
+			cl_ctor.cl_meta <- [
+				(Meta.Enum,[],pos);
+				(Meta.NativeGen,[],pos);
+			] @ cl_ctor.cl_meta;
+			ctors_map := PMap.add name cl_ctor !ctors_map;
+
+			gen.gadd_to_module (TClassDecl cl_ctor) max_dep;
+
+			let esuper = mk (TConst TSuper) cl_enum_t pos in
+			let etag = make_string gen.gcon.basic name pos in
+			let efields = ref [] in
+			(match follow ef.ef_type with
+				| TFun(_, _) ->
+					(* erase type params *)
+					let ef_type =
+						let t = apply_params en.e_params (List.map (fun _ -> t_dynamic) en.e_params) ef.ef_type in
+						apply_params ef.ef_params (List.map (fun _ -> t_dynamic) ef.ef_params) t
+					in
+					let params, ret = get_fun ef_type in
+
+					let cl_ctor_t = TInst (cl_ctor,[]) in
+					let other_en_v = alloc_var "en" cl_ctor_t in
+					let other_en_local = mk_local other_en_v pos in
+					let enumeq = mk_static_field_access_infer (get_cl (get_type gen ([],"Type"))) "enumEq" pos [t_dynamic] in
+					let refeq = mk_static_field_access_infer (get_cl (get_type gen (["System"],"Object"))) "ReferenceEquals" pos [] in
+
+					let param_equal_checks = ref [] in
+					let ctor_block = ref [] in
+					let ctor_args = ref [] in
+					let static_ctor_args = ref [] in
+					let ethis = mk (TConst TThis) cl_ctor_t pos in
+					List.iter (fun (n,_,t) ->
+						(* create a field for enum argument *)
+						let cf_param = mk_field n t pos pos in
+						cf_param.cf_kind <- Var { v_read = AccNormal; v_write = AccNever };
+						cf_param.cf_meta <- (Meta.ReadOnly,[],pos) :: cf_param.cf_meta;
+						add_field cl_ctor cf_param false;
+
+						(* add static constructor method argument *)
+						static_ctor_args := (alloc_var n t, None) :: !static_ctor_args;
+
+						(* generate argument field access *)
+						let efield = mk (TField (ethis, FInstance (cl_ctor, [], cf_param))) t pos in
+						efields := efield :: !efields;
+
+						(* add constructor argument *)
+						let ctor_arg_v = alloc_var n t in
+						ctor_args := (ctor_arg_v, None) :: !ctor_args;
+
+						(* generate assignment for the constructor *)
+						let assign = binop OpAssign efield (mk_local ctor_arg_v pos) t pos in
+						ctor_block := assign :: !ctor_block;
+
+						(* generate an enumEq check for the Equals method (TODO: extract this) *)
+						let eotherfield = mk (TField (other_en_local, FInstance (cl_ctor, [], cf_param))) t pos in
+						let e_enumeq_check = mk (TCall (enumeq, [efield; eotherfield])) basic.tbool pos in
+						let e_param_check =
+							mk (TIf (mk (TUnop (Not, Prefix, e_enumeq_check)) basic.tbool pos,
+							         mk_return (make_bool gen.gcon.basic false pos),
+							         None)
+							) basic.tvoid pos in
+						param_equal_checks := e_param_check :: !param_equal_checks;
+					) (List.rev params);
+
+					ctor_block := (mk (TCall(esuper,[make_int gen.gcon.basic index pos])) basic.tvoid pos) :: !ctor_block;
+
+					let cf_ctor_t = TFun (params, basic.tvoid) in
+					let cf_ctor = mk_class_field "new" cf_ctor_t true pos (Method MethNormal) [] in
+					cf_ctor.cf_expr <- Some {
+						eexpr = TFunction {
+							tf_args = !ctor_args;
+							tf_type = basic.tvoid;
+							tf_expr = mk (TBlock !ctor_block) basic.tvoid pos;
+						};
+						etype = cf_ctor_t;
+						epos = pos;
+					};
+					cl_ctor.cl_constructor <- Some cf_ctor;
+
+					let cf_toString_t = TFun ([],basic.tstring) in
+					let cf_toString = mk_class_field "toString" cf_toString_t true pos (Method MethNormal) [] in
+
+					let etoString_args = mk_array_decl t_dynamic !efields pos in
+					cf_toString.cf_expr <- Some {
+						eexpr = TFunction {
+							tf_args = [];
+							tf_type = basic.tstring;
+							tf_expr = mk_block (mk_return (
+								mk (TCall (eparamsToString, [etag; etoString_args])) basic.tstring pos
+							));
+						};
+						etype = cf_toString_t;
+						epos = pos;
+					};
+					add_field cl_ctor cf_toString true;
+
+					let cf_static_ctor = mk_class_field name ef_type true pos (Method MethNormal) [] in
+					cf_static_ctor.cf_expr <- Some {
+						eexpr = TFunction {
+							tf_args = !static_ctor_args;
+							tf_type = ef_type;
+							tf_expr = mk_block (mk_return {eexpr = TNew(cl_ctor,[], (List.map (fun (v,_) -> mk_local v pos) !static_ctor_args)); etype = ef_type; epos = pos});
+						};
+						etype = ef_type;
+						epos = pos;
+					};
+					static_ctors := cf_static_ctor :: !static_ctors;
+
+					(* add Equals field *)
+					begin
+						let other_v = alloc_var "other" t_dynamic in
+						let eother_local = mk_local other_v pos in
+						let eas = mk (TIdent "__as__") t_dynamic pos in
+						let ecast = mk (TCall(eas,[eother_local])) cl_ctor_t pos in
+
+						let equals_exprs = ref (List.rev [
+							mk (TIf (
+								mk (TCall(refeq,[ethis;eother_local])) basic.tbool pos,
+								mk_return (make_bool gen.gcon.basic true pos),
+								None
+							)) basic.tvoid pos;
+							mk (TVar(other_en_v, Some ecast)) basic.tvoid pos;
+							mk (TIf(
+								mk (TBinop(OpEq,other_en_local,make_null cl_ctor_t pos)) basic.tbool pos,
+								mk_return (make_bool gen.gcon.basic false pos),
+								None
+							)) basic.tvoid pos;
+						]) in
+						equals_exprs := (List.rev !param_equal_checks) @ !equals_exprs;
+						equals_exprs := mk_return (make_bool gen.gcon.basic true pos) :: !equals_exprs;
+
+						let cf_Equals_t = TFun([("other",false,t_dynamic)],basic.tbool) in
+						let cf_Equals = mk_class_field "Equals" cf_Equals_t true pos (Method MethNormal) [] in
+						cf_Equals.cf_expr <- Some {
+							eexpr = TFunction {
+								tf_args = [(other_v,None)];
+								tf_type = basic.tbool;
+								tf_expr = mk (TBlock (List.rev !equals_exprs)) basic.tvoid pos;
+							};
+							etype = cf_Equals_t;
+							epos = pos;
+						};
+						add_field cl_ctor cf_Equals true;
+					end;
+
+					(* add GetHashCode field *)
+					begin
+						let cf_GetHashCode_t = TFun([],basic.tint) in
+						let cf_GetHashCode = mk_class_field "GetHashCode" cf_GetHashCode_t true pos (Method MethNormal) [] in
+						cf_GetHashCode.cf_expr <- Some {
+							eexpr = TFunction {
+								tf_args = [];
+								tf_type = basic.tint;
+								tf_expr = mk_block (mk_return (
+									mk (TCall(eparamsGetHashCode, [make_int gen.gcon.basic index pos;etoString_args])) basic.tint pos
+								));
+							};
+							etype = cf_GetHashCode_t;
+							epos = pos;
+						};
+						add_field cl_ctor cf_GetHashCode true;
+					end
+
+				| _ ->
+					let cf_ctor_t = TFun([], basic.tvoid) in
+					let cf_ctor = mk_class_field "new" cf_ctor_t true pos (Method MethNormal) [] in
+					cf_ctor.cf_expr <- Some {
+						eexpr = TFunction {
+							tf_args = [];
+							tf_type = basic.tvoid;
+							tf_expr = mk (TBlock [mk (TCall(esuper,[make_int gen.gcon.basic index pos])) basic.tvoid pos]) basic.tvoid pos;
+						};
+						etype = cf_ctor_t;
+						epos = pos;
+					};
+					cl_ctor.cl_constructor <- Some cf_ctor;
+
+					let cf_static_inst = mk_class_field name cl_enum_t true pos (Var { v_read = AccNormal; v_write = AccNever }) [] in
+					cf_static_inst.cf_meta <- [Meta.ReadOnly,[],pos];
+					cf_static_inst.cf_expr <- Some {
+						eexpr = TNew(cl_ctor, [], []);
+						etype = cl_enum_t;
+						epos = pos;
+					};
+
+					static_ctors := cf_static_inst :: !static_ctors;
+			);
+
+			let cf_getTag = mk_class_field "getTag" cf_getTag_t true pos (Method MethNormal) [] in
+			cf_getTag.cf_expr <- Some {
+				eexpr = TFunction {
+					tf_args = [];
+					tf_type = basic.tstring;
+					tf_expr = mk_block (mk_return etag);
+				};
+				etype = cf_getTag_t;
+				epos = pos;
+			};
+			add_field cl_ctor cf_getTag true;
+
+			if !efields <> [] then begin
+				let cf_getParams = mk_class_field "getParams" cf_getParams_t true pos (Method MethNormal) [] in
+				cf_getParams.cf_expr <- Some {
+					eexpr = TFunction {
+						tf_args = [];
+						tf_type = cf_getParams_ret;
+						tf_expr = mk_block (mk_return (mk (TArrayDecl !efields) cf_getParams_ret pos));
+					};
+					etype = cf_getParams_t;
+					epos = pos;
+				};
+				add_field cl_ctor cf_getParams true
+			end
+		in
+
+
+		(* generate constructor subclasses and add static functions to create them *)
+		let i = ref 0 in
+		List.iter (fun name -> add_ctor name !i; incr i) en.e_names;
+
+		List.iter (add_static cl_enum) !static_ctors;
+
+		Hashtbl.add ec_tbl en.e_path {
+			base = cl_enum;
+			ctors = !ctors_map;
+		};
+
+		TEnumDecl en
+
+	let configure gen t enum_base_class =
+		let run md = match md with
+			| TEnumDecl e when is_hxgen md ->
+				convert gen t enum_base_class e
+			| _ ->
+				md
+		in
+		gen.gmodule_filters#add name (PCustom priority) run
+end;;
+
+
+module EnumToClass2Exprf = struct
+	let init com ec_tbl mk_enum_index_call =
+		let rec run e =
+			let get_converted_enum_classes et =
+				let en = match follow et with
+					| TEnum (en,_) -> en
+					| _ -> raise Not_found
+				in
+				Hashtbl.find ec_tbl en.e_path
+			in
+			let mk_converted_enum_index_access f =
+				let cl = (get_converted_enum_classes f.etype).base in
+				let e_enum = { f with etype = TInst (cl, []) } in
+				field e_enum "_hx_index" com.basic.tint e.epos
+			in
+			match e.eexpr with
+			| TEnumIndex f ->
+				let f = run f in
+				(try
+					mk_converted_enum_index_access f
+				with Not_found ->
+					mk_enum_index_call f e.epos)
+			| TCall ({ eexpr = TField (_, FStatic ({ cl_path = ([], "Type") }, { cf_name = "enumIndex" })) } as left, [f]) ->
+				let f = run f in
+				(try
+					mk_converted_enum_index_access f
+				with Not_found ->
+					{ e with eexpr = TCall(left, [f]) })
+			| TEnumParameter(f, ef, i) ->
+				let f = run f in
+				(* check if en was converted to class *)
+				(* if it was, switch on tag field and change cond type *)
+				let classes = get_converted_enum_classes f.etype in
+				let cl_enum = classes.base in
+				let f = { f with etype = TInst(cl_enum, []) } in
+
+				let cl_ctor = PMap.find ef.ef_name classes.ctors in
+				let ecast = mk (TCall (mk (TIdent "__as__") t_dynamic f.epos, [f])) (TInst (cl_ctor, [])) f.epos in
+
+				(match ef.ef_type with
+				| TFun (params, _) ->
+					let fname, _, _ = List.nth params i in
+					field ecast fname e.etype e.epos
+				| _ -> assert false)
+			| _ ->
+				Type.map_expr run e
+		in
+		run
+
+	let name = "enum_to_class2_exprf"
+	let priority = solve_deps name []
+
+	let configure gen ec_tbl mk_enum_index_call =
+		let run = init gen.gcon ec_tbl mk_enum_index_call in
+		gen.gexpr_filters#add name (PCustom priority) run
+end;;
+
+let configure gen enum_base_class mk_enum_index_call =
+	let ec_tbl = Hashtbl.create 10 in
+	EnumToClass2Modf.configure gen ec_tbl enum_base_class;
+	EnumToClass2Exprf.configure gen ec_tbl mk_enum_index_call;
diff --git a/src/codegen/gencommon/expressionUnwrap.ml b/src/codegen/gencommon/expressionUnwrap.ml
new file mode 100644
index 0000000000000000000000000000000000000000..1a4d2be9f26beda4390b68702454b9d3672f067b
--- /dev/null
+++ b/src/codegen/gencommon/expressionUnwrap.ml
@@ -0,0 +1,638 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Ast
+open Type
+open Gencommon
+
+(*
+	This is the most important module for source-code based targets. It will follow a convention of what's an expression and what's a statement,
+	and will unwrap statements where expressions are expected, and vice-versa.
+
+	It should be one of the first syntax filters to be applied. As a consequence, it's applied after all filters that add code to the AST, and by being
+	the first of the syntax filters, it will also have the AST retain most of the meaning of normal Haxe code. So it's easier to detect cases which are
+	side-effects free, for example
+
+	Any target can make use of this, but there is one requirement: The target must accept null to be set to any kind of variable. For example,
+	var i:Int = null; must be accepted. The best way to deal with this is to (like it's done in C#) make null equal to "default(Type)"
+
+	dependencies:
+		While it's best for Expression Unwrap to delay its execution as much as possible, since theoretically any
+		filter can return an expression that needs to be unwrapped, it is also desirable for ExpresionUnwrap to have
+		the AST as close as possible as Haxe's, so it can make some correct predictions (for example, so it can
+		more accurately know what can be side-effects-free and what can't).
+		This way, it will run slightly after the Normal priority, so if you don't say that a syntax filter must run
+		before Expression Unwrap, it will run after it.
+
+	TODO : While statement must become do / while, with the actual block inside an if for the condition, and else for 'break'
+*)
+
+(* priority: first syntax filter *)
+let priority = -10.0
+
+(*
+	We always need to rely on Blocks to be able to unwrap expressions correctly.
+	So the the standard traverse will always be based on blocks.
+	Normal block statements, like for(), while(), if(), ... will be mk_block'ed so there is always a block inside of them.
+
+		At the block level, we'll define an "add_statement" function, which will allow the current expression to
+		add statements to the block. This statement may or may not contain statements as expressions, so the texpr will be evaluated recursively before being added.
+
+		- traverse will always evaluate TBlocks
+		- for each texpr in a TBlock list,
+			check shallow type
+				if type is Statement or Both when it has problematic expression (var problematic_expr = count_problematic_expressions),
+					if we can eagerly call unwrap_statement on the whole expression (try_call_unwrap_statement), use the return expression
+					else
+						check expr_type of each underlying type (with expr_stat_map)
+							if it has ExprWithStatement or Statement,
+								call problematic_expression_unwrap in it
+								problematic_expr--
+							else if problematic_expr == 0, just add the unchanged expression
+							else if NoSideEffects and doesn't have short-circuit, just add the unchanged expression
+							else call problematic_expression_unwrap in it
+				if type is Expression, check if there are statements or Both inside.
+					if there are, problematic_expression_unwrap in it
+				aftewards, use on_expr_as_statement to get it
+
+	helpers:
+		try_call_unwrap_statement: (returns texpr option)
+			if underlying statement is TBinop(OpAssign/OpAssignOp), or TVar, with the right side being a Statement or a short circuit op, we can call apply_assign.
+
+		apply_assign:
+			if is TVar, first declare the tvar with default expression = null;
+			will receive the left and right side of the assignment; right-side must be Statement
+			see if right side is a short-circuit operation, call short_circuit_op_unwrap
+			else see eexpr of the right side
+				if it's void, just add the statement with add_statement, and set the right side as null;
+				if not, it will have a block inside. set the left side = to the last expression on each block inside. add_statement for it.
+
+		short_circuit_op_unwrap: x() && (1 + {var x = 0; x + 1;} == 2) && z()
+			-> var x = x();
+					var y = false;
+					var z = false;
+					if (x) //for &&, neg for ||
+					{
+					var temp = null;
+					{
+						var x = 0;
+						temp = x + 1;
+					}
+
+					y = (1 + temp) == 2;
+					if (y)
+					{
+						z = z();
+					}
+					}
+			expects to receive a texpr with TBinop(OpBoolAnd/OpBoolOr)
+			will traverse the AST while there is a TBinop(OpBoolAnd/OpBoolOr) as a right-side expr, and declare new temp vars in the	for each found.
+			will collect the return value, a mapped expr with all exprs as TLocal of the temp vars created
+
+
+		problematic_expression_unwrap:
+			check expr_kind:
+				if it is NoSideEffects and not short-circuit, leave it there
+				if it is ExprWithStatement and not short-circuit, call Type.map_expr problematic_expression_unwrap
+				if it is Statement or Expression or short-circuit expr, call add_assign for this expression
+
+		add_assign:
+			see if the type is void. If it is, just add_statement the expression argument, and return a null value
+			else create a new variable, set TVar with Some() with the expression argument, add TVar with add_statement, and return the TLocal of this expression.
+
+		map_problematic_expr:
+			call expr_stat_map on statement with problematic_expression_unwrap
+
+	types:
+		type shallow_expr_type = | Statement | Expression | Both (* shallow expression classification. Both means that they can be either Statements as Expressions *)
+
+		type expr_kind = | NormalExpr | ExprNoSideEffects (* -> short-circuit is considered side-effects *) | ExprWithStatement | Statement
+			evaluates an expression (as in not a statement) type. If it is ExprWithStatement or Statement, it means it contains errors
+
+	functions:
+		shallow_expr_type (expr:texpr) : shallow_expr_type
+
+		expr_kind (expr:texpr) : expr_kind
+			deeply evaluates an expression type
+
+		expr_stat_map (fn:texpr->texpr) (expr:texpr) : texpr
+			it will traverse the AST looking for places where an expression is expected, and map the value according to fn
+
+		aggregate_expr_type (is_side_effects_free:bool) (children:expr_type list) : expr_type
+			helper function to deal with expr_type aggregation (e.g. an Expression + a Statement as a children, is a ExprWithStatement)
+
+		check_statement_in_expression (expr:texpr) : texpr option :
+			will check
+
+*)
+
+type shallow_expr_type = | Statement | Expression of texpr | Both of texpr (* shallow expression classification. Both means that they can be either Statements as Expressions *)
+
+type expr_kind = | KNormalExpr | KNoSideEffects (* -> short-circuit is considered side-effects *) | KExprWithStatement | KStatement
+
+let rec no_paren e =
+	match e.eexpr with
+		| TParenthesis e -> no_paren e
+		| _ -> e
+
+(* must be called in a statement. Will execute fn whenever an expression (not statement) is expected *)
+let rec expr_stat_map fn (expr:texpr) =
+	match (no_paren expr).eexpr with
+		| TBinop ( (OpAssign as op), left_e, right_e )
+		| TBinop ( (OpAssignOp _ as op), left_e, right_e ) ->
+			{ expr with eexpr = TBinop(op, fn left_e, fn right_e) }
+		| TParenthesis _ -> assert false
+		| TCall(left_e, params) ->
+			{ expr with eexpr = TCall(fn left_e, List.map fn params) }
+		| TNew(cl, tparams, params) ->
+			{ expr with eexpr = TNew(cl, tparams, List.map fn params) }
+		| TVar(v,eopt) ->
+			{ expr with eexpr = TVar(v, Option.map fn eopt) }
+		| TFor (v,cond,block) ->
+			{ expr with eexpr = TFor(v, fn cond, block) }
+		| TIf(cond,eif,eelse) ->
+			{ expr with eexpr = TIf(fn cond, eif, eelse) }
+		| TWhile(cond, block, flag) ->
+			{ expr with eexpr = TWhile(fn cond, block, flag) }
+		| TSwitch(cond, el_block_l, default) ->
+			{ expr with eexpr = TSwitch( fn cond, List.map (fun (el,block) -> (List.map fn el, block)) el_block_l, default ) }
+		| TReturn(eopt) ->
+			{ expr with eexpr = TReturn(Option.map fn eopt) }
+		| TThrow (texpr) ->
+			{ expr with eexpr = TThrow(fn texpr) }
+		| TBreak
+		| TContinue
+		| TTry _
+		| TUnop (Increment, _, _)
+		| TUnop (Decrement, _, _) (* unop is a special case because the haxe compiler won't let us generate complex expressions with Increment/Decrement *)
+		| TBlock _ -> expr (* there is no expected expression here. Only statements *)
+		| TMeta(m,e) ->
+			{ expr with eexpr = TMeta(m,expr_stat_map fn e) }
+		| _ -> assert false (* we only expect valid statements here. other expressions aren't valid statements *)
+
+let is_expr = function | Expression _ -> true | _ -> false
+
+let aggregate_expr_type map_fn side_effects_free children =
+	let rec loop acc children =
+		match children with
+			| [] -> acc
+			| hd :: children ->
+				match acc, map_fn hd with
+					| _, KExprWithStatement
+					| _, KStatement
+					| KExprWithStatement, _
+					| KStatement, _ -> KExprWithStatement
+					| KNormalExpr, KNoSideEffects
+					| KNoSideEffects, KNormalExpr
+					| KNormalExpr, KNormalExpr -> loop KNormalExpr children
+					| KNoSideEffects, KNoSideEffects -> loop KNoSideEffects children
+	in
+	loop (if side_effects_free then KNoSideEffects else KNormalExpr) children
+
+(* statements: *)
+(* Error CS0201: Only assignment, call, increment,					 *)
+(* decrement, and new object expressions can be used as a		 *)
+(* statement (CS0201). *)
+let rec shallow_expr_type expr : shallow_expr_type =
+	match expr.eexpr with
+		| TCall _ when not (ExtType.is_void expr.etype) -> Both expr
+		| TNew _
+		| TUnop (Increment, _, _)
+		| TUnop (Decrement, _, _)
+		| TBinop (OpAssign, _, _)
+		| TBinop (OpAssignOp _, _, _) -> Both expr
+		| TIf (cond, eif, Some(eelse)) -> (match aggregate_expr_type expr_kind true [cond;eif;eelse] with
+			| KExprWithStatement -> Statement
+			| _ -> Both expr)
+		| TConst _
+		| TLocal _
+		| TIdent _
+		| TArray _
+		| TBinop _
+		| TField _
+		| TEnumParameter _
+		| TEnumIndex _
+		| TTypeExpr _
+		| TObjectDecl _
+		| TArrayDecl _
+		| TFunction _
+		| TCast _
+		| TUnop _ -> Expression (expr)
+		| TParenthesis p | TMeta(_,p) -> shallow_expr_type p
+		| TBlock ([e]) -> shallow_expr_type e
+		| TCall _
+		| TVar _
+		| TBlock _
+		| TFor _
+		| TWhile _
+		| TSwitch _
+		| TTry _
+		| TReturn _
+		| TBreak
+		| TContinue
+		| TIf _
+		| TThrow _ -> Statement
+
+and expr_kind expr =
+	match shallow_expr_type expr with
+	| Statement -> KStatement
+	| Both expr | Expression expr ->
+		let aggregate = aggregate_expr_type expr_kind in
+		match expr.eexpr with
+		| TConst _
+		| TLocal _
+		| TFunction _
+		| TTypeExpr _
+		| TIdent _ ->
+			KNoSideEffects
+		| TCall (ecall, params) ->
+			aggregate false (ecall :: params)
+		| TNew (_,_,params) ->
+			aggregate false params
+		| TUnop (Increment,_,e)
+		| TUnop (Decrement,_,e) ->
+			aggregate false [e]
+		| TUnop (_,_,e) ->
+			aggregate true [e]
+		| TBinop (OpBoolAnd, e1, e2)
+		| TBinop (OpBoolOr, e1, e2) ->	(* TODO: should OpBool never be side-effects free? *)
+			aggregate true [e1;e2]
+		| TBinop (OpAssign, e1, e2)
+		| TBinop (OpAssignOp _, e1, e2) ->
+			aggregate false [e1;e2]
+		| TBinop (_, e1, e2) ->
+			aggregate true [e1;e2]
+		| TIf (cond, eif, Some(eelse)) -> (match aggregate true [cond;eif;eelse] with
+			| KExprWithStatement -> KStatement
+			| k -> k)
+		| TArray (e1,e2) ->
+			aggregate true [e1;e2]
+		| TParenthesis e
+		| TMeta(_,e)
+		| TField (e,_) ->
+			aggregate true [e]
+		| TArrayDecl (el) ->
+			aggregate true el
+		| TObjectDecl (sel) ->
+			aggregate true (List.map snd sel)
+		| TCast (e,_) ->
+			aggregate false [e]
+		| _ -> trace (debug_expr expr); assert false (* should have been read as Statement by shallow_expr_type *)
+
+let get_kinds (statement:texpr) =
+	let kinds = ref [] in
+	ignore (expr_stat_map (fun e ->
+		kinds := (expr_kind e) :: !kinds;
+		e
+	) statement);
+	List.rev !kinds
+
+let has_problematic_expressions (kinds:expr_kind list) =
+	let rec loop kinds =
+		match kinds with
+			| [] -> false
+			| KStatement :: _
+			| KExprWithStatement :: _ -> true
+			| _ :: tl -> loop tl
+	in
+	loop kinds
+
+let count_problematic_expressions (statement:texpr) =
+	let count = ref 0 in
+	ignore (expr_stat_map (fun e ->
+		(match expr_kind e with
+			| KStatement | KExprWithStatement -> incr count
+			| _ -> ()
+		);
+		e
+	) statement);
+	!count
+
+let apply_assign_block assign_fun elist =
+	let rec assign acc elist =
+		match elist with
+			| [] -> acc
+			| last :: [] ->
+				(assign_fun last) :: acc
+			| hd :: tl ->
+				assign (hd :: acc) tl
+	in
+	List.rev (assign [] elist)
+
+let mk_get_block assign_fun e =
+	match e.eexpr with
+		| TBlock [] -> e
+		| TBlock (el) ->
+			{ e with eexpr = TBlock(apply_assign_block assign_fun el) }
+		| _ ->
+			{ e with eexpr = TBlock([ assign_fun e ]) }
+
+let add_assign add_statement expr =
+	match expr.eexpr, follow expr.etype with
+		| _, TAbstract ({ a_path = ([],"Void") },[])
+		| TThrow _, _ ->
+			add_statement expr;
+			null expr.etype expr.epos
+		| _ ->
+			let var = mk_temp "stmt" expr.etype in
+			let tvars = { expr with eexpr = TVar(var,Some(expr)) } in
+			let local = { expr with eexpr = TLocal(var) } in
+			add_statement tvars;
+			local
+
+(* requirement: right must be a statement *)
+let rec apply_assign assign_fun right =
+	match right.eexpr with
+		| TBlock el ->
+			{ right with eexpr = TBlock(apply_assign_block assign_fun el) }
+		| TSwitch (cond, elblock_l, default) ->
+			{ right with eexpr = TSwitch(cond, List.map (fun (el,block) -> (el, mk_get_block assign_fun block)) elblock_l, Option.map (mk_get_block assign_fun) default) }
+		| TTry (block, catches) ->
+			{ right with eexpr = TTry(mk_get_block assign_fun block, List.map (fun (v,block) -> (v,mk_get_block assign_fun block) ) catches) }
+		| TIf (cond,eif,eelse) ->
+			{ right with eexpr = TIf(cond, mk_get_block assign_fun eif, Option.map (mk_get_block assign_fun) eelse) }
+		| TThrow _
+		| TWhile _
+		| TFor _
+		| TReturn _
+		| TBreak
+		| TContinue -> right
+		| TParenthesis p | TMeta(_,p) ->
+			apply_assign assign_fun p
+		| TVar _ ->
+			right
+		| _ ->
+			match follow right.etype with
+				| TAbstract ({ a_path = ([], "Void") },[]) ->
+					right
+				| _ -> trace (debug_expr right); assert false (* a statement is required *)
+
+let short_circuit_op_unwrap com add_statement expr :texpr =
+	let do_not expr =
+		{ expr with eexpr = TUnop(Not, Prefix, expr) }
+	in
+
+	(* loop will always return its own TBlock, and the mapped expression *)
+	let rec loop acc expr =
+		match expr.eexpr with
+			| TBinop ( (OpBoolAnd as op), left, right) ->
+				let var = mk_temp "boolv" right.etype in
+				let tvars = { right with eexpr = TVar(var, Some( { right with eexpr = TConst(TBool false); etype = com.basic.tbool } )); etype = com.basic.tvoid } in
+				let local = { right with eexpr = TLocal(var) } in
+
+				let mapped_left, ret_acc = loop ( (local, { right with eexpr = TBinop(OpAssign, local, right) } ) :: acc) left in
+
+				add_statement tvars;
+				({ expr with eexpr = TBinop(op, mapped_left, local) }, ret_acc)
+			(* we only accept OpBoolOr when it's the first to be evaluated *)
+			| TBinop ( (OpBoolOr as op), left, right) when acc = [] ->
+				let left = match left.eexpr with
+					| TLocal _ | TConst _ -> left
+					| _ -> add_assign add_statement left
+				in
+
+				let var = mk_temp "boolv" right.etype in
+				let tvars = { right with eexpr = TVar(var, Some( { right with eexpr = TConst(TBool false); etype = com.basic.tbool } )); etype = com.basic.tvoid } in
+				let local = { right with eexpr = TLocal(var) } in
+				add_statement tvars;
+
+				({ expr with eexpr = TBinop(op, left, local) }, [ do_not left, { right with eexpr = TBinop(OpAssign, local, right) } ])
+			| _ when acc = [] -> assert false
+			| _ ->
+				let var = mk_temp "boolv" expr.etype in
+				let tvars = { expr with eexpr = TVar(var, Some( { expr with etype = com.basic.tbool } )); etype = com.basic.tvoid } in
+				let local = { expr with eexpr = TLocal(var) } in
+
+				let last_local = ref local in
+				let acc = List.map (fun (local, assign) ->
+					let l = !last_local in
+					last_local := local;
+					(l, assign)
+				) acc in
+
+				add_statement tvars;
+				(local, acc)
+	in
+
+	let mapped_expr, local_assign_list = loop [] expr in
+
+	let rec loop local_assign_list : texpr =
+		match local_assign_list with
+			| [local, assign] ->
+				{ eexpr = TIf(local, assign, None); etype = com.basic.tvoid; epos = assign.epos }
+			| (local, assign) :: tl ->
+				{ eexpr = TIf(local,
+					{
+						eexpr = TBlock ( assign :: [loop tl] );
+						etype = com.basic.tvoid;
+						epos = assign.epos;
+					},
+				None); etype = com.basic.tvoid; epos = assign.epos }
+			| [] -> assert false
+	in
+
+	add_statement (loop local_assign_list);
+	mapped_expr
+
+let twhile_with_condition_statement com add_statement twhile cond e1 flag =
+	(* when a TWhile is found with a problematic condition *)
+	let block =
+		if flag = NormalWhile then
+			{ e1 with eexpr = TIf(cond, e1, Some({ e1 with eexpr = TBreak; etype = com.basic.tvoid })) }
+		else
+			Type.concat e1 { e1 with
+				eexpr = TIf({
+					eexpr = TUnop(Not, Prefix, mk_paren cond);
+					etype = com.basic.tbool;
+					epos = cond.epos
+				}, { e1 with eexpr = TBreak; etype = com.basic.tvoid }, None);
+				etype = com.basic.tvoid
+			}
+	in
+	add_statement { twhile with
+		eexpr = TWhile(
+			{ eexpr = TConst(TBool true); etype = com.basic.tbool; epos = cond.epos },
+			block,
+			DoWhile
+		);
+	}
+
+let try_call_unwrap_statement com handle_cast problematic_expression_unwrap (add_statement:texpr->unit) (expr:texpr) : texpr option =
+	let check_left left =
+		match expr_kind left with
+			| KExprWithStatement ->
+				problematic_expression_unwrap add_statement left KExprWithStatement
+			| KStatement -> assert false (* doesn't make sense a KStatement as a left side expression *)
+			| _ -> left
+	in
+
+	let handle_assign op left right =
+		let left = check_left left in
+		Some (apply_assign (fun e -> { e with eexpr = TBinop(op, left, if ExtType.is_void left.etype then e else handle_cast left.etype e.etype e) }) right )
+	in
+
+	let handle_return e =
+		Some( apply_assign (fun e ->
+			match e.eexpr with
+				| TThrow _ -> e
+				| _ when ExtType.is_void e.etype ->
+					{ e with eexpr = TBlock([e; { e with eexpr = TReturn None }]) }
+				| _ ->
+					Texpr.Builder.mk_return e
+		) e )
+	in
+
+	let is_problematic_if right =
+		match expr_kind right with
+			| KStatement | KExprWithStatement -> true
+			| _ -> false
+	in
+
+	match expr.eexpr with
+		| TBinop((OpAssign as op),left,right)
+		| TBinop((OpAssignOp _ as op),left,right) when shallow_expr_type right = Statement ->
+			handle_assign op left right
+		| TReturn( Some right ) when shallow_expr_type right = Statement ->
+			handle_return right
+		| TBinop((OpAssign as op),left, ({ eexpr = TBinop(OpBoolAnd,_,_) } as right) )
+		| TBinop((OpAssign as op),left,({ eexpr = TBinop(OpBoolOr,_,_) } as right))
+		| TBinop((OpAssignOp _ as op),left,({ eexpr = TBinop(OpBoolAnd,_,_) } as right) )
+		| TBinop((OpAssignOp _ as op),left,({ eexpr = TBinop(OpBoolOr,_,_) } as right) ) ->
+			let right = short_circuit_op_unwrap com add_statement right in
+			Some { expr with eexpr = TBinop(op, check_left left, right) }
+		| TVar(v,Some({ eexpr = TBinop(OpBoolAnd,_,_) } as right))
+		| TVar(v,Some({ eexpr = TBinop(OpBoolOr,_,_) } as right)) ->
+			let right = short_circuit_op_unwrap com add_statement right in
+			Some { expr with eexpr = TVar(v, Some(right)) }
+		| TVar(v,Some(right)) when shallow_expr_type right = Statement ->
+			add_statement ({ expr with eexpr = TVar(v, Some(null right.etype right.epos)) });
+			handle_assign OpAssign { expr with eexpr = TLocal(v); etype = v.v_type } right
+		(* TIf handling *)
+		| TBinop((OpAssign as op),left, ({ eexpr = TIf _ } as right))
+		| TBinop((OpAssignOp _ as op),left,({ eexpr = TIf _ } as right)) when is_problematic_if right ->
+			handle_assign op left right
+		| TVar(v,Some({ eexpr = TIf _ } as right)) when is_problematic_if right ->
+			add_statement ({ expr with eexpr = TVar(v, Some(null right.etype right.epos)) });
+			handle_assign OpAssign { expr with eexpr = TLocal(v); etype = v.v_type } right
+		| TWhile(cond, e1, flag) when is_problematic_if cond ->
+			twhile_with_condition_statement com add_statement expr cond e1 flag;
+			Some (null expr.etype expr.epos)
+		| _ -> None
+
+let problematic_expression_unwrap add_statement expr e_type =
+	let rec problematic_expression_unwrap is_first expr e_type =
+		match e_type, expr.eexpr with
+			| _, TBinop(OpBoolAnd, _, _)
+			| _, TBinop(OpBoolOr, _, _) -> add_assign add_statement expr (* add_assign so try_call_unwrap_expr *)
+			| KNoSideEffects, _ -> expr
+			| KStatement, _
+			| KNormalExpr, _ -> add_assign add_statement expr
+			| KExprWithStatement, TCall _
+			| KExprWithStatement, TNew _
+			| KExprWithStatement, TBinop (OpAssign,_,_)
+			| KExprWithStatement, TBinop (OpAssignOp _,_,_)
+			| KExprWithStatement, TUnop (Increment,_,_) (* all of these may have side-effects, so they must also be add_assign'ed . is_first avoids infinite loop *)
+			| KExprWithStatement, TUnop (Decrement,_,_) when not is_first -> add_assign add_statement expr
+
+			(* bugfix: Type.map_expr doesn't guarantee the correct order of execution *)
+			| KExprWithStatement, TBinop(op,e1,e2) ->
+				let e1 = problematic_expression_unwrap false e1 (expr_kind e1) in
+				let e2 = problematic_expression_unwrap false e2 (expr_kind e2) in
+				{ expr with eexpr = TBinop(op, e1, e2) }
+			| KExprWithStatement, TArray(e1,e2) ->
+				let e1 = problematic_expression_unwrap false e1 (expr_kind e1) in
+				let e2 = problematic_expression_unwrap false e2 (expr_kind e2) in
+				{ expr with eexpr = TArray(e1, e2) }
+			(* bugfix: calls should not be transformed into closure calls *)
+			| KExprWithStatement, TCall(( { eexpr = TField (ef_left, f) } as ef ), eargs) ->
+				{ expr with eexpr = TCall(
+					{ ef with eexpr = TField(problematic_expression_unwrap false ef_left (expr_kind ef_left), f) },
+					List.map (fun e -> problematic_expression_unwrap false e (expr_kind e)) eargs)
+				}
+			| KExprWithStatement, _ -> Type.map_expr (fun e -> problematic_expression_unwrap false e (expr_kind e)) expr
+	in
+	problematic_expression_unwrap true expr e_type
+
+let configure gen =
+	let rec traverse e =
+		match e.eexpr with
+		| TBlock el ->
+			let new_block = ref [] in
+			let rec process_statement e =
+				let e = no_paren e in
+				match e.eexpr, shallow_expr_type e with
+				| TCall( { eexpr = TIdent s } as elocal, elist ), _ when String.get s 0 = '_' && Hashtbl.mem gen.gspecial_vars s ->
+					new_block := { e with eexpr = TCall( elocal, List.map (fun e ->
+						match e.eexpr with
+							| TBlock _ -> traverse e
+							| _ -> e
+					) elist ) } :: !new_block
+				| _, Statement | _, Both _ ->
+					let e = match e.eexpr with TReturn (Some ({ eexpr = TThrow _ } as ethrow)) -> ethrow | _ -> e in
+					let kinds = get_kinds e in
+					if has_problematic_expressions kinds then begin
+						match try_call_unwrap_statement gen.gcon gen.ghandle_cast problematic_expression_unwrap process_statement e with
+							| Some { eexpr = TConst(TNull) } (* no op *)
+							| Some { eexpr = TBlock [] } -> ()
+							| Some e ->
+								if has_problematic_expressions (get_kinds e) then begin
+									process_statement e
+								end else
+									new_block := (traverse e) :: !new_block
+							| None ->
+							(
+								let acc = ref kinds in
+								let new_e = expr_stat_map (fun e ->
+									match !acc with
+										| hd :: tl ->
+											acc := tl;
+											if has_problematic_expressions (hd :: tl) then begin
+												problematic_expression_unwrap process_statement e hd
+											end else
+												e
+										| [] -> assert false
+								) e in
+
+								new_block := (traverse new_e) :: !new_block
+							)
+					end else begin new_block := (traverse e) :: !new_block end
+				| _, Expression e ->
+					let e = mk (TVar (mk_temp "expr" e.etype, Some e)) gen.gcon.basic.tvoid e.epos in
+					process_statement e
+			in
+			List.iter process_statement el;
+			let block = List.rev !new_block in
+			{ e with eexpr = TBlock block }
+		| TTry (block, catches) ->
+			{ e with eexpr = TTry(traverse (mk_block block), List.map (fun (v,block) -> (v, traverse (mk_block block))) catches) }
+		| TSwitch (cond,el_e_l, default) ->
+			{ e with eexpr = TSwitch(cond, List.map (fun (el,e) -> (el, traverse (mk_block e))) el_e_l, Option.map (fun e -> traverse (mk_block e)) default) }
+		| TWhile (cond,block,flag) ->
+			{e with eexpr = TWhile(cond,traverse (mk_block block), flag) }
+		| TIf (cond, eif, eelse) ->
+			{ e with eexpr = TIf(cond, traverse (mk_block eif), Option.map (fun e -> traverse (mk_block e)) eelse) }
+		| TFor (v,it,block) ->
+			{ e with eexpr = TFor(v,it, traverse (mk_block block)) }
+		| TFunction (tfunc) ->
+			{ e with eexpr = TFunction({ tfunc with tf_expr = traverse (mk_block tfunc.tf_expr) }) }
+		| TMeta (m, e2) ->
+			{ e with eexpr = TMeta (m, traverse e2)}
+		| _ -> e (* if expression doesn't have a block, we will exit *)
+	in
+	gen.gsyntax_filters#add "expression_unwrap" (PCustom priority) traverse
diff --git a/src/codegen/gencommon/filterClosures.ml b/src/codegen/gencommon/filterClosures.ml
new file mode 100644
index 0000000000000000000000000000000000000000..1f2308a2d2a2e76ccea7850fcfa2bd78d77325ee
--- /dev/null
+++ b/src/codegen/gencommon/filterClosures.ml
@@ -0,0 +1,86 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Type
+open Gencommon
+
+(* ******************************************* *)
+(* Closure Detection *)
+(* ******************************************* *)
+(*
+	Just a small utility filter that detects when a closure must be created.
+	On the default implementation, this means when a function field is being accessed
+	not via reflection and not to be called instantly
+
+	dependencies:
+		must run after DynamicFieldAccess, so any TAnon { Statics / EnumStatics } will be changed to the corresponding TTypeExpr
+*)
+let name = "filter_closures"
+let priority = solve_deps name [DAfter DynamicFieldAccess.priority]
+
+let configure gen (should_change:texpr->string->bool) (filter:texpr->texpr->string->bool->texpr) =
+	let rec run e =
+		match e.eexpr with
+			(*(* this is precisely the only case where we won't even ask if we should change, because it is a direct use of TClosure *)
+			| TCall ( {eexpr = TClosure(e1,s)} as clos, args ) ->
+				{ e with eexpr = TCall({ clos with eexpr = TClosure(run e1, s) }, List.map run args ) }
+			| TCall ( clos, args ) ->
+				let rec loop clos = match clos.eexpr with
+					| TClosure(e1,s) -> Some (clos, e1, s)
+					| TParenthesis p -> loop p
+					| _ -> None
+				in
+				let clos = loop clos in
+				(match clos with
+					| Some (clos, e1, s) -> { e with eexpr = TCall({ clos with eexpr = TClosure(run e1, s) }, List.map run args ) }
+					| None -> Type.map_expr run e)*)
+				| TCall({ eexpr = TIdent "__delegate__" } as local, [del]) ->
+					{ e with eexpr = TCall(local, [Type.map_expr run del]) }
+				| TCall(({ eexpr = TField(_, _) } as ef), params) ->
+					{ e with eexpr = TCall(Type.map_expr run ef, List.map run params) }
+				| TField(ef, FEnum(en, field)) ->
+						(* FIXME replace t_dynamic with actual enum Anon field *)
+						let ef = run ef in
+						(match follow field.ef_type with
+							| TFun _ when should_change ef field.ef_name ->
+								filter e ef field.ef_name true
+							| _ ->
+									{ e with eexpr = TField(ef, FEnum(en,field)) }
+						)
+				| TField(({ eexpr = TTypeExpr _ } as tf), f) ->
+					(match field_access_esp gen tf.etype (f) with
+						| FClassField(_,_,_,cf,_,_,_) ->
+							(match cf.cf_kind with
+								| Method(MethDynamic)
+								| Var _ ->
+									e
+								| _ when should_change tf cf.cf_name ->
+									filter e tf cf.cf_name true
+								| _ ->
+									e
+							)
+						| _ -> e)
+				| TField(e1, FClosure (Some _, cf)) when should_change e1 cf.cf_name ->
+					(match cf.cf_kind with
+					| Method MethDynamic | Var _ ->
+						Type.map_expr run e
+					| _ ->
+						filter e (run e1) cf.cf_name false)
+				| _ -> Type.map_expr run e
+	in
+	gen.gexpr_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/fixOverrides.ml b/src/codegen/gencommon/fixOverrides.ml
new file mode 100644
index 0000000000000000000000000000000000000000..002702543b685ce47ea8cdbd3500eb97ec2413c2
--- /dev/null
+++ b/src/codegen/gencommon/fixOverrides.ml
@@ -0,0 +1,270 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Option
+open Common
+open Type
+open Codegen
+open Gencommon
+
+(* ******************************************* *)
+(* FixOverrides *)
+(* ******************************************* *)
+(*
+
+	Covariant return types, contravariant function arguments and applied type parameters may change
+	in a way that expected implementations / overrides aren't recognized as such.
+	This filter will fix that.
+
+	dependencies:
+		FixOverrides expects that the target platform is able to deal with overloaded functions
+		It must run after DefaultArguments, otherwise code added by the default arguments may be invalid
+
+*)
+let name = "fix_overrides"
+let priority = solve_deps name []
+
+(*
+	if the platform allows explicit interface implementation (C#),
+	specify a explicit_fn_name function (tclass->string->string)
+	Otherwise, it expects the platform to be able to handle covariant return types
+*)
+let run ~explicit_fn_name ~get_vmtype gen =
+	let implement_explicitly = is_some explicit_fn_name in
+	let run md = match md with
+		| TClassDecl ( { cl_interface = true; cl_extern = false } as c ) ->
+			(* overrides can be removed from interfaces *)
+			c.cl_ordered_fields <- List.filter (fun f ->
+				try
+					if Meta.has Meta.Overload f.cf_meta then raise Not_found;
+					let f2 = Codegen.find_field gen.gcon c f in
+					if f2 == f then raise Not_found;
+					c.cl_fields <- PMap.remove f.cf_name c.cl_fields;
+					false;
+				with Not_found ->
+					true
+			) c.cl_ordered_fields;
+			md
+		| TClassDecl({ cl_extern = false } as c) ->
+			let this = { eexpr = TConst TThis; etype = TInst(c,List.map snd c.cl_params); epos = c.cl_pos } in
+			(* look through all interfaces, and try to find a type that applies exactly *)
+			let rec loop_iface (iface:tclass) itl =
+				List.iter (fun (s,stl) -> loop_iface s (List.map (apply_params iface.cl_params itl) stl)) iface.cl_implements;
+				let real_itl = gen.greal_type_param (TClassDecl iface) itl in
+				let rec loop_f f =
+					List.iter loop_f f.cf_overloads;
+					let ftype = apply_params iface.cl_params itl f.cf_type in
+					let real_ftype = get_real_fun gen (apply_params iface.cl_params real_itl f.cf_type) in
+					replace_mono real_ftype;
+					let overloads = Overloads.get_overloads c f.cf_name in
+					try
+						let t2, f2 =
+							match overloads with
+							| (_, cf) :: _ when Meta.has Meta.Overload cf.cf_meta -> (* overloaded function *)
+								(* try to find exact function *)
+								List.find (fun (t,f2) ->
+									Overloads.same_overload_args ~get_vmtype ftype t f f2
+								) overloads
+							| _ :: _ ->
+								(match field_access gen (TInst(c, List.map snd c.cl_params)) f.cf_name with
+								| FClassField(_,_,_,f2,false,t,_) -> t,f2 (* if it's not an overload, all functions should have the same signature *)
+								| _ -> raise Not_found)
+							| [] -> raise Not_found
+						in
+						replace_mono t2;
+						(* if we find a function with the exact type of real_ftype, it means this interface has already been taken care of *)
+						if not (type_iseq (get_real_fun gen (apply_params f2.cf_params (List.map snd f.cf_params) t2)) real_ftype) then begin
+							(match f.cf_kind with | Method (MethNormal | MethInline) -> () | _ -> raise Not_found);
+							let t2 = get_real_fun gen t2 in
+							if List.length f.cf_params <> List.length f2.cf_params then raise Not_found;
+							replace_mono t2;
+							match follow (apply_params f2.cf_params (List.map snd f.cf_params) t2), follow real_ftype with
+							| TFun(a1,r1), TFun(a2,r2) when not implement_explicitly && not (type_iseq r1 r2) && Overloads.same_overload_args ~get_vmtype real_ftype t2 f f2 ->
+								(* different return types are the trickiest cases to deal with *)
+								(* check for covariant return type *)
+								let is_covariant = match follow r1, follow r2 with
+									| _, TDynamic _ -> false
+									| r1, r2 -> try
+										unify r1 r2;
+										if like_int r1 then like_int r2 else true
+									with | Unify_error _ -> false
+								in
+								(* we only have to worry about non-covariant issues *)
+								if not is_covariant then begin
+									(* override return type and cast implemented function *)
+									let args, newr = match follow t2, follow (apply_params f.cf_params (List.map snd f2.cf_params) real_ftype) with
+										| TFun(a,_), TFun(_,r) -> a,r
+										| _ -> assert false
+									in
+									f2.cf_type <- TFun(args,newr);
+									(match f2.cf_expr with
+									| Some ({ eexpr = TFunction tf } as e) ->
+											f2.cf_expr <- Some { e with eexpr = TFunction { tf with tf_type = newr } }
+									| _ -> ())
+								end
+							| TFun(a1,r1), TFun(a2,r2) ->
+								(* just implement a function that will call the main one *)
+								let name, is_explicit = match explicit_fn_name with
+									| Some fn when not (type_iseq r1 r2) && Overloads.same_overload_args ~get_vmtype real_ftype t2 f f2 ->
+											fn iface itl f.cf_name, true
+									| _ -> f.cf_name, false
+								in
+								let p = f2.cf_pos in
+								let newf = mk_class_field name real_ftype true f.cf_pos (Method MethNormal) f.cf_params in
+								(* make sure that there isn't already an overload with the same exact type *)
+								if List.exists (fun (t,f2) ->
+									type_iseq (get_real_fun gen t) real_ftype
+								) overloads then raise Not_found;
+								let vars = List.map (fun (n,_,t) -> alloc_var n t) a2 in
+
+								let args = List.map2 (fun v (_,_,t) -> mk_cast t (mk_local v f2.cf_pos)) vars a1 in
+								let field = { eexpr = TField(this, FInstance(c,List.map snd c.cl_params,f2)); etype = TFun(a1,r1); epos = p } in
+								let call = { eexpr = TCall(field, args); etype = r1; epos = p } in
+								(* let call = gen.gparam_func_call call field (List.map snd f.cf_params) args in *)
+								let is_void = ExtType.is_void r2 in
+
+								newf.cf_expr <- Some {
+									eexpr = TFunction({
+										tf_args = List.map (fun v -> v,None) vars;
+										tf_type = r2;
+										tf_expr = if is_void then call else (Texpr.Builder.mk_return (mk_cast r2 call));
+									});
+									etype = real_ftype;
+									epos = p;
+								};
+								(try
+									let fm = PMap.find name c.cl_fields in
+									fm.cf_overloads <- newf :: fm.cf_overloads
+								with | Not_found ->
+									c.cl_fields <- PMap.add name newf c.cl_fields;
+									c.cl_ordered_fields <- newf :: c.cl_ordered_fields)
+							| _ -> assert false
+						end
+					with | Not_found -> ()
+				in
+				List.iter (fun f -> match f.cf_kind with | Var _ -> () | _ -> loop_f f) iface.cl_ordered_fields
+			in
+			List.iter (fun (iface,itl) -> loop_iface iface itl) c.cl_implements;
+			(* now go through all overrides, *)
+			let rec check_f f =
+				(* find the first declared field *)
+				let is_overload = Meta.has Meta.Overload f.cf_meta in
+				let decl = if is_overload then
+					find_first_declared_field gen c ~get_vmtype ~exact_field:f f.cf_name
+				else
+					find_first_declared_field gen c ~get_vmtype f.cf_name
+				in
+				match decl with
+				| Some(f2,actual_t,_,t,declared_cl,_,_)
+					when not (Overloads.same_overload_args ~get_vmtype actual_t (get_real_fun gen f.cf_type) f2 f) ->
+						(match f.cf_expr with
+						| Some({ eexpr = TFunction(tf) } as e) ->
+							let actual_args, _ = get_fun (get_real_fun gen actual_t) in
+							let new_args, vars_to_declare = List.fold_left2 (fun (args,vdecl) (v,_) (_,_,t) ->
+								if not (type_iseq (gen.greal_type v.v_type) (gen.greal_type t)) then begin
+									let new_var = mk_temp v.v_name t in
+									(new_var,None) :: args, (v, Some(mk_cast v.v_type (mk_local new_var f.cf_pos))) :: vdecl
+								end else
+									(v,None) :: args, vdecl
+							) ([],[]) tf.tf_args actual_args in
+							let block = { eexpr = TBlock(List.map (fun (v,ve) ->
+								{
+									eexpr = TVar(v,ve);
+									etype = gen.gcon.basic.tvoid;
+									epos = tf.tf_expr.epos
+								}) vars_to_declare);
+								etype = gen.gcon.basic.tvoid;
+								epos = tf.tf_expr.epos
+							} in
+							let has_contravariant_args = match (get_real_fun gen f.cf_type, actual_t) with
+								| TFun(current_args,_), TFun(original_args,_) ->
+										List.exists2 (fun (_,_,cur_arg) (_,_,orig_arg) -> try
+											unify orig_arg cur_arg;
+											try
+												unify cur_arg orig_arg;
+												false
+											with Unify_error _ ->
+												true
+										with Unify_error _ -> false) current_args original_args
+								| _ -> assert false
+							in
+							if (not (Meta.has Meta.Overload f.cf_meta) && has_contravariant_args) then
+								f.cf_meta <- (Meta.Overload, [], f.cf_pos) :: f.cf_meta;
+							if Meta.has Meta.Overload f.cf_meta then begin
+								(* if it is overload, create another field with the requested type *)
+								let f3 = mk_class_field f.cf_name t (has_class_field_flag f CfPublic) f.cf_pos f.cf_kind f.cf_params in
+								let p = f.cf_pos in
+								let old_args, old_ret = get_fun f.cf_type in
+								let args, ret = get_fun t in
+								let tf_args = List.rev new_args in
+								let f3_mk_return = if ExtType.is_void ret then (fun e -> e) else (fun e -> Texpr.Builder.mk_return (mk_cast ret e)) in
+								f3.cf_expr <- Some {
+									eexpr = TFunction({
+										tf_args = tf_args;
+										tf_type = ret;
+										tf_expr = Type.concat block (mk_block (f3_mk_return {
+											eexpr = TCall(
+												{
+													eexpr = TField(
+														{ eexpr = TConst TThis; etype = TInst(c, List.map snd c.cl_params); epos = p },
+														FInstance(c,List.map snd c.cl_params,f));
+													etype = f.cf_type;
+													epos = p
+												},
+												List.map2 (fun (v,_) (_,_,t) -> mk_cast t (mk_local v p)) tf_args old_args);
+											etype = old_ret;
+											epos = p
+										}))
+									});
+									etype = t;
+									epos = p;
+								};
+								(* make sure we skip cast detect - otherwise this new function will make the overload detection go crazy *)
+								f3.cf_meta <- (Meta.Custom(":skipCastDetect"), [], f3.cf_pos) :: f3.cf_meta;
+								gen.gafter_expr_filters_ended <- ((fun () ->
+									f.cf_overloads <- f3 :: f.cf_overloads;
+								) :: gen.gafter_expr_filters_ended);
+								f3
+							end else begin
+								(* if it's not overload, just cast the vars *)
+								if vars_to_declare <> [] then
+								f.cf_expr <- Some({ e with
+									eexpr = TFunction({ tf with
+										tf_args = List.rev new_args;
+										tf_expr = Type.concat block tf.tf_expr
+									});
+								});
+								f
+							end
+						| _ -> f)
+				| _ -> f
+			in
+			if not c.cl_extern then
+				c.cl_overrides <- List.map (fun f -> check_f f) c.cl_overrides;
+			md
+		| _ -> md
+	in
+	run
+
+let configure ?explicit_fn_name ~get_vmtype gen =
+	let delay () =
+		Hashtbl.clear gen.greal_field_types
+	in
+	gen.gafter_mod_filters_ended <- delay :: gen.gafter_mod_filters_ended;
+	let run = run ~explicit_fn_name ~get_vmtype gen in
+	gen.gmodule_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/gencommon.ml b/src/codegen/gencommon/gencommon.ml
new file mode 100644
index 0000000000000000000000000000000000000000..c05245c37209f7e277d8c6a1eb5c5ba82e61b38b
--- /dev/null
+++ b/src/codegen/gencommon/gencommon.ml
@@ -0,0 +1,1319 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+
+(*
+	Gen Common API
+
+	This is the key module for generation of Java and C# sources
+	In order for both modules to share as much code as possible, some
+	rules were devised:
+
+	- every feature has its own submodule, and may contain the following methods:
+		- configure
+			sets all the configuration variables for the module to run. If a module has this method,
+			it *should* be called once before running any filter
+		- run_filter ->
+			runs the filter immediately on the context
+		- add_filter ->
+			adds the filter to an expr->expr list. Most filter modules will provide this option so the filter
+			function can only run once.
+	- most submodules will have side-effects so the order of operations will matter.
+		When running configure / add_filter this might be taken care of with the rule-based dispatch system working
+		underneath, but still there might be some incompatibilities. There will be an effort to document it.
+		The modules can hint on the order by suffixing their functions with _first or _last.
+	- any of those methods might have different parameters, that configure how the filter will run.
+		For example, a simple filter that maps switch() expressions to if () .. else if... might receive
+		a function that filters what content should be mapped
+	- Other targets can use those filters on their own code. In order to do that,
+		a simple configuration step is needed: you need to initialize a generator_ctx type with
+		Gencommon.new_gen (context:Common.context)
+		with a generator_ctx context you will be able to add filters to your code, and execute them with
+		Gencommon.run_filters (gen_context:Gencommon.generator_ctx)
+
+		After running the filters, you can run your own generator normally.
+
+		(* , or you can run
+		Gencommon.generate_modules (gen_context:Gencommon.generator_ctx) (extension:string) (module_gen:module_type list->bool)
+		where module_gen will take a whole module (can be *)
+*)
+open Unix
+open Ast
+open Type
+open Common
+open Globals
+open Option
+open Printf
+open ExtString
+open Codegen
+open Overloads
+
+(* ******************************************* *)
+(* common helpers *)
+(* ******************************************* *)
+
+let rec like_float t =
+	match follow t with
+	| TAbstract ({ a_path = ([], "Float") }, [])
+	| TAbstract ({ a_path = ([], "Int") }, []) ->
+		true
+	| TAbstract ({ a_path = (["cs"], "Pointer") }, _) ->
+		false
+	| TAbstract (a, _) ->
+		List.exists like_float a.a_from || List.exists like_float a.a_to
+	| _ ->
+		false
+
+let rec like_int t =
+	match follow t with
+	| TAbstract ({ a_path = ([], "Int") }, []) ->
+		true
+	| TAbstract ({ a_path = (["cs"], "Pointer") }, _) ->
+		false
+	| TAbstract (a, _) ->
+		List.exists like_int a.a_from || List.exists like_int a.a_to
+	| _ ->
+		false
+
+let rec like_i64 t =
+	match follow t with
+	| TAbstract ({ a_path = (["cs"], ("Int64" | "UInt64")) }, [])
+	| TAbstract ({ a_path = (["java"], "Int64") }, [])
+	| TAbstract ({ a_path = (["haxe"], "Int64") }, []) ->
+		true
+	| TAbstract (a, _) ->
+		List.exists like_i64 a.a_from || List.exists like_i64 a.a_to
+	| _ ->
+		false
+
+let follow_once t =
+	match t with
+	| TMono r ->
+		(match !r with
+		| Some t -> t
+		| _ -> t_dynamic) (* avoid infinite loop / should be the same in this context *)
+	| TLazy f ->
+		lazy_type f
+	| TType (t,tl) ->
+		apply_params t.t_params tl t.t_type
+	| TAbstract({a_path = [],"Null"},[t]) ->
+		t
+	| _ ->
+		t
+
+let t_empty = TAnon({ a_fields = PMap.empty; a_status = ref Closed })
+
+let alloc_var n t = Type.alloc_var VGenerated n t null_pos
+
+let mk_local = Texpr.Builder.make_local
+
+(* the undefined is a special var that works like null, but can have special meaning *)
+let undefined =
+	(fun pos -> mk (TIdent "__undefined__") t_dynamic pos)
+
+let path_of_md_def md_def =
+	match md_def.m_types with
+		| [TClassDecl c] -> c.cl_path
+		| _ -> md_def.m_path
+
+let debug_type t = (s_type (print_context())) t
+let debug_expr = s_expr debug_type
+
+let debug_mode = ref false
+let trace s = if !debug_mode then print_endline s else ()
+let timer name = if !debug_mode then Timer.timer name else fun () -> ()
+
+let is_string t =
+	match follow t with
+	| TInst({ cl_path = ([], "String") }, []) -> true
+	| _ -> false
+
+let anon_class t =
+	match follow t with
+	| TAnon anon ->
+		(match !(anon.a_status) with
+		| Statics cl -> Some (TClassDecl cl)
+		| EnumStatics e -> Some (TEnumDecl e)
+		| AbstractStatics a -> Some (TAbstractDecl a)
+		| _ -> None)
+	| _ -> None
+
+ let rec t_to_md t = match t with
+	| TInst (cl,_) -> TClassDecl cl
+	| TEnum (e,_) -> TEnumDecl e
+	| TType (t,_) -> TTypeDecl t
+	| TAbstract (a,_) -> TAbstractDecl a
+	| TAnon anon ->
+		(match !(anon.a_status) with
+			| EnumStatics e -> TEnumDecl e
+			| Statics cl -> TClassDecl cl
+			| AbstractStatics a -> TAbstractDecl a
+			| _ -> assert false)
+	| TLazy f -> t_to_md (lazy_type f)
+	| TMono r -> (match !r with | Some t -> t_to_md t | None -> assert false)
+	| _ -> assert false
+
+
+let get_cl mt = match mt with TClassDecl cl -> cl | _ -> failwith (Printf.sprintf "Unexpected module type (class expected) for %s: %s" (s_type_path (t_path mt)) (s_module_type_kind mt))
+let get_abstract mt = match mt with TAbstractDecl a -> a | _ -> failwith (Printf.sprintf "Unexpected module type (abstract expected) for %s: %s" (s_type_path (t_path mt)) (s_module_type_kind mt))
+
+let get_fun t =
+	match follow t with
+	| TFun (args, ret) -> args, ret
+	| t -> (trace (debug_type t)); assert false
+
+let mk_cast t e = Type.mk_cast e t e.epos
+
+(** TODO: when adding new AST, make a new cast type for those fast casts. For now, we're using this hack
+ *        of using null_class to tell a fast cast from a normal one. Also note that this only works since both
+ *        C# and Java do not use the second part of TCast for anything *)
+let mk_castfast t e = { e with eexpr = TCast(e, Some (TClassDecl null_class)); etype = t }
+
+let mk_static_field_access_infer cl field pos params =
+	try
+		let e_type = Texpr.Builder.make_static_this cl pos in
+		let cf = PMap.find field cl.cl_statics in
+		let t = if params = [] then cf.cf_type else apply_params cf.cf_params params cf.cf_type in
+		mk (TField(e_type, FStatic(cl, cf))) t pos
+	with Not_found ->
+		failwith ("Cannot find field " ^ field ^ " in class " ^ (s_type_path cl.cl_path))
+
+let mk_static_field_access cl field fieldt pos =
+	{ (mk_static_field_access_infer cl field pos []) with etype = fieldt }
+
+(* stolen from Hugh's sources ;-) *)
+(* this used to be a class, but there was something in there that crashed ocaml native compiler in windows *)
+module SourceWriter =
+struct
+
+	type source_writer =
+	{
+		sw_buf : Buffer.t;
+		mutable sw_has_content : bool;
+		mutable sw_indent : string;
+		mutable sw_indents : string list;
+	}
+
+	let new_source_writer () =
+		{
+			sw_buf = Buffer.create 0;
+			sw_has_content = false;
+			sw_indent = "";
+			sw_indents = [];
+		}
+
+	let add_writer w_write w_read = Buffer.add_buffer w_read.sw_buf w_write.sw_buf
+
+	let contents w = Buffer.contents w.sw_buf
+
+	let len w = Buffer.length w.sw_buf
+
+	let write w x =
+		(if not w.sw_has_content then begin w.sw_has_content <- true; Buffer.add_string w.sw_buf w.sw_indent; Buffer.add_string w.sw_buf x; end else Buffer.add_string w.sw_buf x);
+		let len = (String.length x)-1 in
+		if len >= 0 && String.get x len = '\n' then begin w.sw_has_content <- false end else w.sw_has_content <- true
+
+	let push_indent w = w.sw_indents <- "\t"::w.sw_indents; w.sw_indent <- String.concat "" w.sw_indents
+
+	let pop_indent w =
+		match w.sw_indents with
+			| h::tail -> w.sw_indents <- tail; w.sw_indent <- String.concat "" w.sw_indents
+			| [] -> w.sw_indent <- "/*?*/"
+
+	let newline w = write w "\n"
+
+	let begin_block w = (if w.sw_has_content then newline w); write w "{"; push_indent w; newline w
+
+	let end_block w = pop_indent w; (if w.sw_has_content then newline w); write w "}"; newline w
+
+	let print w =
+		(if not w.sw_has_content then begin w.sw_has_content <- true; Buffer.add_string w.sw_buf w.sw_indent end);
+		bprintf w.sw_buf;
+
+end;;
+
+(* rule_dispatcher's priority *)
+type priority =
+	| PFirst
+	| PLast
+	| PZero
+	| PCustom of float
+
+exception DuplicateName of string
+exception NoRulesApplied
+
+let indent = ref []
+
+(* the rule dispatcher is the primary way to deal with distributed "plugins" *)
+(* we will define rules that will form a distributed / extensible match system *)
+class ['tp, 'ret] rule_dispatcher name =
+	object(self)
+	val tbl = Hashtbl.create 16
+	val mutable keys = []
+	val names = Hashtbl.create 16
+
+	method add (name : string) (* name helps debugging *) (priority : priority) (rule : 'tp->'ret option) =
+		let p = match priority with
+			| PFirst -> infinity
+			| PLast -> neg_infinity
+			| PZero -> 0.0
+			| PCustom i -> i
+		in
+
+		let q = if not( Hashtbl.mem tbl p ) then begin
+			let q = Stack.create() in
+			Hashtbl.add tbl p q;
+			keys <- p :: keys;
+			keys <- List.sort (fun x y -> - (compare x y)) keys;
+			q
+		end else Hashtbl.find tbl p in
+		(if Hashtbl.mem names name then raise (DuplicateName(name)));
+		Hashtbl.add names name q;
+
+		Stack.push (name, rule) q
+
+	method describe =
+		Hashtbl.iter (fun s _ -> (trace s)) names;
+
+	method run_f tp = get (self#run tp)
+
+	method run_from (priority:float) (tp:'tp) : 'ret option =
+		let ok = ref false in
+		let ret = ref None in
+		indent := "\t" :: !indent;
+
+		(try begin
+			List.iter (fun key ->
+				if key < priority then begin
+					let q = Hashtbl.find tbl key in
+					Stack.iter (fun (n, rule) ->
+						let t = if !debug_mode then Timer.timer [("rule dispatcher rule: " ^ n)] else fun () -> () in
+						let r = rule(tp) in
+						t();
+						if is_some r then begin ret := r; raise Exit end
+					) q
+				end
+			) keys
+
+		end with Exit -> ok := true);
+
+		(match !indent with
+			| [] -> ()
+			| h::t -> indent := t);
+
+		(if not (!ok) then raise NoRulesApplied);
+		!ret
+
+	method run (tp:'tp) : 'ret option =
+		self#run_from infinity tp
+
+end;;
+
+(* this is a special case where tp = tret and you stack their output as the next's input *)
+class ['tp] rule_map_dispatcher name = object(self)
+	val tbl = Hashtbl.create 16
+	val mutable keys = []
+	val names = Hashtbl.create 16
+
+	method add (name : string) (* name helps debugging *) (priority : priority) (rule : 'tp->'tp) =
+		let p = match priority with
+			| PFirst -> infinity
+			| PLast -> neg_infinity
+			| PZero -> 0.0
+			| PCustom i -> i
+		in
+		let q = if not (Hashtbl.mem tbl p) then begin
+			let q = Stack.create() in
+			Hashtbl.add tbl p q;
+			keys <- p :: keys;
+			keys <- List.sort (fun x y -> - (compare x y)) keys;
+			q
+		end else Hashtbl.find tbl p in
+		if Hashtbl.mem names name then raise (DuplicateName name);
+		Hashtbl.add names name q;
+
+		Stack.push (name, rule) q
+
+	method describe =
+		Hashtbl.iter (fun s _ -> (trace s)) names;
+
+	method run (tp:'tp) : 'tp =
+		self#run_from infinity tp
+
+	method run_from (priority:float) (tp:'tp) : 'tp =
+		let cur = ref tp in
+		List.iter (fun key ->
+			if key < priority then begin
+				let q = Hashtbl.find tbl key in
+				Stack.iter (fun (n, rule) ->
+					trace ("running rule " ^ n);
+					let t = if !debug_mode then Timer.timer [("rule map dispatcher rule: " ^ n)] else fun () -> () in
+					cur := rule !cur;
+					t();
+				) q
+			end
+		) keys;
+		!cur
+end;;
+
+
+type generator_ctx =
+{
+	(* these are the basic context fields. If another target is using this context, *)
+	(* this is all you need to care about *)
+	gcon : Common.context;
+
+	gclasses : gen_classes;
+
+	gtools : gen_tools;
+
+	(*
+		module filters run before module filters and they should generate valid haxe syntax as a result.
+		Module filters shouldn't go through the expressions as it adds an unnecessary burden to the GC,
+		and it can all be done in a single step with gexpr_filters and proper priority selection.
+
+		As a convention, Module filters should end their name with Modf, so they aren't mistaken with expression filters
+	*)
+	gmodule_filters : (module_type) rule_map_dispatcher;
+
+	(*
+		expression filters are the most common filters to be applied.
+		They should also generate only valid haxe expressions, so e.g. calls to non-existant methods
+		should be avoided, although there are some ways around them (like gspecial_methods)
+	*)
+	gexpr_filters : (texpr) rule_map_dispatcher;
+	(*
+		syntax filters are also expression filters but they no longer require
+		that the resulting expressions be valid haxe expressions.
+		They then have no guarantee that either the input expressions or the output one follow the same
+		rules as normal haxe code.
+	*)
+	gsyntax_filters : (texpr) rule_map_dispatcher;
+
+	(* these are more advanced features, but they would require a rewrite of targets *)
+	(* they are just helpers to ditribute functions like "follow" or "type to string" *)
+	(* so adding a module will already take care of correctly following a certain type of *)
+	(* variable, for example *)
+
+	(* follows the type through typedefs, lazy typing, etc. *)
+	(* it's the place to put specific rules to handle typedefs, like *)
+	(* other basic types like UInt *)
+	gfollow : (t, t) rule_dispatcher;
+
+	gtypes : (path, module_type) Hashtbl.t;
+	mutable gtypes_list : module_type list;
+	mutable gmodules : Type.module_def list;
+
+	(* cast detection helpers / settings *)
+	(* this is a cache for all field access types *)
+	greal_field_types : (path * string, (tclass_field (* does the cf exist *) * t (*cf's type in relation to current class type params *) * t * tclass (* declared class *) ) option) Hashtbl.t;
+	(* this function allows any code to handle casts as if it were inside the cast_detect module *)
+	mutable ghandle_cast : t->t->texpr->texpr;
+	(* when an unsafe cast is made, we can warn the user *)
+	mutable gon_unsafe_cast : t->t->pos->unit;
+	(* does this type needs to be boxed? Normally always false, unless special type handling must be made *)
+	mutable gneeds_box : t->bool;
+	(* does this 'special type' needs cast to this other type? *)
+	(* this is here so we can implement custom behavior for "opaque" typedefs *)
+	mutable gspecial_needs_cast : t->t->bool;
+	(* sometimes we may want to support unrelated conversions on cast detection *)
+	(* for example, haxe.lang.Null<T> -> T on C# *)
+	(* every time an unrelated conversion is found, each to/from path is searched on this hashtbl *)
+	(* if found, the function will be executed with from_type, to_type. If returns true, it means that *)
+	(* it is a supported conversion, and the unsafe cast routine changes to a simple cast *)
+	gsupported_conversions : (path, t->t->bool) Hashtbl.t;
+
+	(* API for filters *)
+	(* add type can be called at any time, and will add a new module_def that may or may not be filtered *)
+	(* module_type -> should_filter *)
+	mutable gadd_type : module_type -> bool -> unit;
+	(* during expr filters, add_to_module will be available so module_types can be added to current module_def. we must pass the priority argument so the filters can be resumed	*)
+	mutable gadd_to_module : module_type -> float -> unit;
+	(* during expr filters, shows the current class path *)
+	mutable gcurrent_path : path;
+	(* current class *)
+	mutable gcurrent_class : tclass option;
+	(* current class field, if any *)
+	mutable gcurrent_classfield : tclass_field option;
+
+	(* events *)
+	(* after module filters ended *)
+	mutable gafter_mod_filters_ended : (unit -> unit) list;
+	(* after expression filters ended *)
+	mutable gafter_expr_filters_ended : (unit -> unit) list;
+	(* after all filters are run *)
+	mutable gafter_filters_ended : (unit -> unit) list;
+
+	mutable gbase_class_fields : (string, tclass_field) PMap.t;
+
+	(* real type is the type as it is read by the target. *)
+	(* This function is here because most targets don't have *)
+	(* a 1:1 translation between haxe types and its native types *)
+	(* But types aren't changed to this representation as we might lose *)
+	(* some valuable type information in the process *)
+	mutable greal_type : t -> t;
+	(*
+		the same as greal_type but for type parameters.
+	*)
+	mutable greal_type_param : module_type -> tparams -> tparams;
+	(*
+		is the type a value type?
+		This may be used in some optimizations where reference types and value types
+		are handled differently. At first the default is very good to use, and if tweaks are needed,
+		it's best to be done by adding @:struct meta to the value types
+	*
+	mutable gis_value_type : t -> bool;*)
+
+	(* misc configuration *)
+	(*
+		Should the target allow type parameter dynamic conversion,
+		or should we add a cast to those cases as well?
+	*)
+	mutable gallow_tp_dynamic_conversion : bool;
+
+	(* internal apis *)
+	(* param_func_call : used by RealTypeParams and CastDetection *)
+	mutable gparam_func_call : texpr->texpr->tparams->texpr list->texpr;
+	(* does it already have a type parameter cast handler? This is used by CastDetect to know if it should handle type parameter casts *)
+	mutable ghas_tparam_cast_handler : bool;
+	(* type parameter casts - special cases *)
+	(* function cast_from, cast_to -> texpr *)
+	gtparam_cast : (path, (texpr->t->texpr)) Hashtbl.t;
+
+	(*
+		special vars are used for adding special behavior to
+	*)
+	gspecial_vars : (string, bool) Hashtbl.t;
+}
+
+and gen_classes =
+{
+	cl_reflect : tclass;
+	cl_type : tclass;
+	cl_dyn : tclass;
+
+	mutable nativearray_len : texpr -> pos -> texpr;
+	mutable nativearray_type : Type.t -> Type.t;
+	mutable nativearray : Type.t -> Type.t;
+}
+
+(* add here all reflection transformation additions *)
+and gen_tools =
+{
+	(* Reflect.fields(). The bool is if we are iterating in a read-only manner. If it is read-only we might not need to allocate a new array *)
+	r_fields : bool->texpr->texpr;
+	(* (first argument = return type. should be void in most cases) Reflect.setField(obj, field, val) *)
+	r_set_field : t->texpr->texpr->texpr->texpr;
+	(* Reflect.field. bool indicates if is safe (no error throwing) or unsafe; t is the expected return type true = safe *)
+	r_field : bool->t->texpr->texpr->texpr;
+
+	(*
+		return an expression that creates an unitialized instance of a class, used for the generic cast helper method.
+	*)
+	mutable r_create_empty : tclass->tparams->pos->texpr;
+}
+
+(**
+	Function that receives a desired name and makes it "internal", doing the best to ensure that it will not be called from outside.
+	To avoid name clashes between internal names, user must specify two strings: a "namespace" and the name itself
+*)
+let mk_internal_name ns name = Printf.sprintf "__%s_%s" ns name
+
+let mk_temp, reset_temps =
+	let tmp_count = ref 0 in
+	(fun name t ->
+		incr tmp_count;
+		let name = mk_internal_name "temp" (name ^ (string_of_int !tmp_count)) in
+		alloc_var name t
+	),
+	(fun () -> tmp_count := 0)
+
+let new_ctx con =
+	let types = Hashtbl.create (List.length con.types) in
+	List.iter (fun mt ->
+		match mt with
+			| TClassDecl cl -> Hashtbl.add types cl.cl_path mt
+			| TEnumDecl e -> Hashtbl.add types e.e_path mt
+			| TTypeDecl t -> Hashtbl.add types t.t_path mt
+			| TAbstractDecl a ->
+				(* There are some cases where both an abstract and a class
+				   have the same name (e.g. java.lang.Double/Integer/etc)
+				   in this case we generally want the class to have priority *)
+				if not (Hashtbl.mem types a.a_path) then
+					Hashtbl.add types a.a_path mt
+	) con.types;
+
+	let get_type path =
+		List.find (fun md -> (t_path md) = path) con.types
+	in
+
+	let cl_dyn = match get_type  ([], "Dynamic") with
+		| TClassDecl c -> c
+		| TAbstractDecl a ->
+				mk_class a.a_module ([], "Dynamic") a.a_pos null_pos
+		| _ -> assert false
+	in
+
+	let rec gen = {
+		gcon = con;
+		gclasses = {
+			cl_reflect = get_cl (get_type ([], "Reflect"));
+			cl_type = get_cl (get_type ([], "Type"));
+			cl_dyn = cl_dyn;
+
+			nativearray = (fun _ -> assert false);
+			nativearray_type = (fun _ -> assert false);
+			nativearray_len = (fun _ -> assert false);
+		};
+		gtools = {
+			r_fields = (fun is_used_only_by_iteration expr ->
+				let fieldcall = mk_static_field_access_infer gen.gclasses.cl_reflect "fields" expr.epos [] in
+				{ eexpr = TCall(fieldcall, [expr]); etype = gen.gcon.basic.tarray gen.gcon.basic.tstring; epos = expr.epos }
+			);
+			(* Reflect.setField(obj, field, val). t by now is ignored. FIXME : fix this implementation *)
+			r_set_field = (fun t obj field v ->
+				let fieldcall = mk_static_field_access_infer gen.gclasses.cl_reflect "setField" v.epos [] in
+				{ eexpr = TCall(fieldcall, [obj; field; v]); etype = t_dynamic; epos = v.epos }
+			);
+			(* Reflect.field. bool indicates if is safe (no error throwing) or unsafe. true = safe *)
+			r_field = (fun is_safe t obj field ->
+				let fieldcall = mk_static_field_access_infer gen.gclasses.cl_reflect "field" obj.epos [] in
+				(* FIXME: should we see if needs to cast? *)
+				mk_cast t { eexpr = TCall(fieldcall, [obj; field]); etype = t_dynamic; epos = obj.epos }
+			);
+
+			r_create_empty = (fun _ _ pos -> gen.gcon.error "r_create_empty implementation is not provided" pos; assert false);
+		};
+		gexpr_filters = new rule_map_dispatcher "gexpr_filters";
+		gmodule_filters = new rule_map_dispatcher "gmodule_filters";
+		gsyntax_filters = new rule_map_dispatcher "gsyntax_filters";
+		gfollow = new rule_dispatcher "gfollow";
+		gtypes = types;
+		gtypes_list = con.types;
+		gmodules = con.modules;
+
+		greal_field_types = Hashtbl.create 0;
+		ghandle_cast = (fun to_t from_t e -> mk_cast to_t e);
+		gon_unsafe_cast = (fun t t2 pos -> (gen.gcon.warning ("Type " ^ (debug_type t2) ^ " is being cast to the unrelated type " ^ (s_type (print_context()) t)) pos));
+		gneeds_box = (fun t -> false);
+		gspecial_needs_cast = (fun to_t from_t -> false);
+		gsupported_conversions = Hashtbl.create 0;
+
+		gadd_type = (fun md should_filter ->
+			if should_filter then begin
+				gen.gtypes_list <- md :: gen.gtypes_list;
+				gen.gmodules <- { m_id = alloc_mid(); m_path = (t_path md); m_types = [md]; m_extra = module_extra "" "" 0. MFake [] } :: gen.gmodules;
+				Hashtbl.add gen.gtypes (t_path md) md;
+			end else gen.gafter_filters_ended <- (fun () ->
+				gen.gtypes_list <- md :: gen.gtypes_list;
+				gen.gmodules <- { m_id = alloc_mid(); m_path = (t_path md); m_types = [md]; m_extra = module_extra "" "" 0. MFake [] } :: gen.gmodules;
+				Hashtbl.add gen.gtypes (t_path md) md;
+			) :: gen.gafter_filters_ended;
+		);
+		gadd_to_module = (fun md pr -> failwith "module added outside expr filters");
+		gcurrent_path = ([],"");
+		gcurrent_class = None;
+		gcurrent_classfield = None;
+
+		gafter_mod_filters_ended = [];
+		gafter_expr_filters_ended = [];
+		gafter_filters_ended = [];
+
+		gbase_class_fields = PMap.empty;
+
+		greal_type = (fun t -> t);
+		greal_type_param = (fun _ t -> t);
+
+		gallow_tp_dynamic_conversion = false;
+
+		(* as a default, ignore the params *)
+		gparam_func_call = (fun ecall efield params elist -> { ecall with eexpr = TCall(efield, elist) });
+		ghas_tparam_cast_handler = false;
+		gtparam_cast = Hashtbl.create 0;
+
+		gspecial_vars = Hashtbl.create 0;
+	} in
+	gen
+
+let init_ctx gen =
+	(* ultimately add a follow once handler as the last follow handler *)
+	let follow_f = gen.gfollow#run in
+	let follow t =
+		match t with
+		| TMono r ->
+			(match !r with
+			| Some t -> follow_f t
+			| _ -> Some t)
+		| TLazy f ->
+			follow_f (lazy_type f)
+		| TType (t,tl) ->
+			follow_f (apply_params t.t_params tl t.t_type)
+		| TAbstract({a_path = [],"Null"},[t]) ->
+			follow_f t
+		| _ -> Some t
+	in
+	gen.gfollow#add "final" PLast follow
+
+let run_follow gen = gen.gfollow#run_f
+
+let reorder_modules gen =
+	let modules = Hashtbl.create 20 in
+	List.iter (fun md ->
+		Hashtbl.add modules ( (t_infos md).mt_module ).m_path md
+	) gen.gtypes_list;
+
+	gen.gmodules <- [];
+	let processed = Hashtbl.create 20 in
+	Hashtbl.iter (fun md_path md ->
+		if not (Hashtbl.mem processed md_path) then begin
+			Hashtbl.add processed md_path true;
+			gen.gmodules <- { m_id = alloc_mid(); m_path = md_path; m_types = List.rev ( Hashtbl.find_all modules md_path ); m_extra = (t_infos md).mt_module.m_extra } :: gen.gmodules
+		end
+	) modules
+
+let run_filters_from gen t filters =
+	match t with
+	| TClassDecl c ->
+		trace (snd c.cl_path);
+		gen.gcurrent_path <- c.cl_path;
+		gen.gcurrent_class <- Some(c);
+
+		gen.gcurrent_classfield <- None;
+		let rec process_field f =
+			reset_temps();
+			gen.gcurrent_classfield <- Some(f);
+
+			trace f.cf_name;
+			(match f.cf_expr with
+			| None -> ()
+			| Some e ->
+				f.cf_expr <- Some (List.fold_left (fun e f -> f e) e filters));
+			List.iter process_field f.cf_overloads;
+		in
+		List.iter process_field c.cl_ordered_fields;
+		List.iter process_field c.cl_ordered_statics;
+
+		(match c.cl_constructor with
+		| None -> ()
+		| Some f -> process_field f);
+		gen.gcurrent_classfield <- None;
+		(match c.cl_init with
+		| None -> ()
+		| Some e ->
+			c.cl_init <- Some (List.fold_left (fun e f -> f e) e filters));
+	| TEnumDecl _ | TTypeDecl _ | TAbstractDecl _ ->
+		()
+
+let run_filters gen =
+	let last_error = gen.gcon.error in
+	let has_errors = ref false in
+	gen.gcon.error <- (fun msg pos -> has_errors := true; last_error msg pos);
+	(* first of all, we have to make sure that the filters won't trigger a major Gc collection *)
+	let t = Timer.timer ["gencommon_filters"] in
+	(if Common.defined gen.gcon Define.GencommonDebug then debug_mode := true else debug_mode := false);
+	let run_filters (filter : texpr rule_map_dispatcher) =
+		let rec loop acc mds =
+			match mds with
+				| [] -> acc
+				| md :: tl ->
+					let filters = [ filter#run ] in
+					let added_types = ref [] in
+					gen.gadd_to_module <- (fun md_type priority ->
+						gen.gtypes_list <- md_type :: gen.gtypes_list;
+						added_types := (md_type, priority) :: !added_types
+					);
+
+					run_filters_from gen md filters;
+
+					let added_types = List.map (fun (t,p) ->
+						run_filters_from gen t [ fun e -> filter#run_from p e ];
+						if Hashtbl.mem gen.gtypes (t_path t) then begin
+							let rec loop i =
+								let p = t_path t in
+								let new_p = (fst p, snd p ^ "_" ^ (string_of_int i)) in
+								if Hashtbl.mem gen.gtypes new_p then
+									loop (i+1)
+								else
+									match t with
+										| TClassDecl cl -> cl.cl_path <- new_p
+										| TEnumDecl e -> e.e_path <- new_p
+										| TTypeDecl _ | TAbstractDecl _ -> ()
+							in
+							loop 0
+						end;
+						Hashtbl.add gen.gtypes (t_path t) t;
+						t
+					) !added_types in
+
+					loop (added_types @ (md :: acc)) tl
+		in
+		List.rev (loop [] gen.gtypes_list)
+	in
+
+	let run_mod_filter (filter : module_type rule_map_dispatcher) =
+		let last_add_to_module = gen.gadd_to_module in
+		let added_types = ref [] in
+		gen.gadd_to_module <- (fun md_type priority ->
+			Hashtbl.add gen.gtypes (t_path md_type) md_type;
+			added_types := (md_type, priority) :: !added_types
+		);
+
+		let rec loop processed not_processed =
+			match not_processed with
+				| hd :: tl ->
+					(match hd with
+						| TClassDecl c ->
+							gen.gcurrent_class <- Some c
+						| _ ->
+							gen.gcurrent_class <- None);
+					let new_hd = filter#run hd in
+
+					let added_types_new = !added_types in
+					added_types := [];
+					let added_types = List.map (fun (t,p) -> filter#run_from p t) added_types_new in
+
+					loop ( added_types @ (new_hd :: processed) ) tl
+				| [] ->
+					processed
+		in
+
+		let filtered = loop [] gen.gtypes_list in
+		gen.gadd_to_module <- last_add_to_module;
+		gen.gtypes_list <- List.rev (filtered)
+	in
+
+	run_mod_filter gen.gmodule_filters;
+	List.iter (fun fn -> fn()) gen.gafter_mod_filters_ended;
+
+	let last_add_to_module = gen.gadd_to_module in
+	gen.gtypes_list <- run_filters gen.gexpr_filters;
+	gen.gadd_to_module <- last_add_to_module;
+
+	List.iter (fun fn -> fn()) gen.gafter_expr_filters_ended;
+	gen.gtypes_list <- run_filters gen.gsyntax_filters;
+	List.iter (fun fn -> fn()) gen.gafter_filters_ended;
+
+	reorder_modules gen;
+	t();
+	if !has_errors then raise (Abort("Compilation aborted with errors",null_pos))
+
+(* ******************************************* *)
+(* basic generation module that source code compilation implementations can use *)
+(* ******************************************* *)
+
+let write_file gen w source_dir path extension out_files =
+	let t = timer ["write";"file"] in
+	let s_path = source_dir	^ "/" ^ (snd path) ^ "." ^ (extension) in
+	(* create the folders if they don't exist *)
+	Path.mkdir_from_path s_path;
+
+	let contents = SourceWriter.contents w in
+	let should_write = if not (Common.defined gen.gcon Define.ReplaceFiles) && Sys.file_exists s_path then begin
+		let in_file = open_in s_path in
+		let old_contents = Std.input_all in_file in
+		close_in in_file;
+		contents <> old_contents
+	end else true in
+
+	if should_write then begin
+		let f = open_out_bin s_path in
+		output_string f contents;
+		close_out f
+	end;
+
+	out_files := (Path.unique_full_path s_path) :: !out_files;
+
+	t()
+
+
+let clean_files path excludes verbose =
+	let rec iter_files pack dir path = try
+		let file = Unix.readdir dir in
+
+		if file <> "." && file <> ".." then begin
+			let filepath = path ^ "/" ^ file in
+			if (Unix.stat filepath).st_kind = S_DIR then
+				let pack = pack @ [file] in
+				iter_files (pack) (Unix.opendir filepath) filepath;
+				try Unix.rmdir filepath with Unix.Unix_error (ENOTEMPTY,_,_) -> ();
+			else if not (String.ends_with filepath ".meta") && not (List.mem (Path.unique_full_path filepath) excludes) then begin
+				if verbose then print_endline ("Removing " ^ filepath);
+			 	Sys.remove filepath
+			end
+		end;
+
+		iter_files pack dir path
+	with | End_of_file | Unix.Unix_error _ ->
+		Unix.closedir dir
+	in
+	iter_files [] (Unix.opendir path) path
+
+
+let dump_descriptor gen name path_s module_s =
+	let w = SourceWriter.new_source_writer () in
+	(* dump called path *)
+	SourceWriter.write w (Sys.getcwd());
+	SourceWriter.newline w;
+	(* dump all defines. deprecated *)
+	SourceWriter.write w "begin defines";
+	SourceWriter.newline w;
+	PMap.iter (fun name _ ->
+		SourceWriter.write w name;
+		SourceWriter.newline w
+	) gen.gcon.defines.Define.values;
+	SourceWriter.write w "end defines";
+	SourceWriter.newline w;
+	(* dump all defines with their values; keeping the old defines for compatibility *)
+	SourceWriter.write w "begin defines_data";
+	SourceWriter.newline w;
+	PMap.iter (fun name v ->
+		SourceWriter.write w name;
+		SourceWriter.write w "=";
+		SourceWriter.write w v;
+		SourceWriter.newline w
+	) gen.gcon.defines.Define.values;
+	SourceWriter.write w "end defines_data";
+	SourceWriter.newline w;
+	(* dump all generated types *)
+	SourceWriter.write w "begin modules";
+	SourceWriter.newline w;
+	let main_paths = Hashtbl.create 0 in
+	List.iter (fun md_def ->
+		SourceWriter.write w "M ";
+		SourceWriter.write w (path_s (path_of_md_def md_def));
+		SourceWriter.newline w;
+		List.iter (fun m ->
+			match m with
+				| TClassDecl cl when not cl.cl_extern ->
+					SourceWriter.write w "C ";
+					let s = module_s m in
+					Hashtbl.add main_paths cl.cl_path s;
+					SourceWriter.write w (s);
+					SourceWriter.newline w
+				| TEnumDecl e when not e.e_extern ->
+					SourceWriter.write w "E ";
+					SourceWriter.write w (module_s m);
+					SourceWriter.newline w
+				| _ -> () (* still no typedef or abstract is generated *)
+		) md_def.m_types
+	) gen.gmodules;
+	SourceWriter.write w "end modules";
+	SourceWriter.newline w;
+	(* dump all resources *)
+	(match gen.gcon.main_class with
+		| Some path ->
+			SourceWriter.write w "begin main";
+			SourceWriter.newline w;
+			(try
+				SourceWriter.write w (Hashtbl.find main_paths path)
+			with
+				| Not_found -> SourceWriter.write w (path_s path));
+			SourceWriter.newline w;
+			SourceWriter.write w "end main";
+			SourceWriter.newline w
+	| _ -> ()
+	);
+	SourceWriter.write w "begin resources";
+	SourceWriter.newline w;
+	Hashtbl.iter (fun name _ ->
+		SourceWriter.write w name;
+		SourceWriter.newline w
+	) gen.gcon.resources;
+	SourceWriter.write w "end resources";
+	SourceWriter.newline w;
+	SourceWriter.write w "begin libs";
+	SourceWriter.newline w;
+	let path file ext =
+		if Sys.file_exists file then
+			file
+		else try Common.find_file gen.gcon file with
+			| Not_found -> try Common.find_file gen.gcon (file ^ ext) with
+			| Not_found ->
+				file
+	in
+	if Common.platform gen.gcon Java then
+		List.iter (fun java_lib ->
+			if not (java_lib#has_flag NativeLibraries.FlagIsStd) && not (java_lib#has_flag NativeLibraries.FlagIsExtern) then begin
+				SourceWriter.write w (path java_lib#get_file_path ".jar");
+				SourceWriter.newline w;
+			end
+		) gen.gcon.native_libs.java_libs
+	else if Common.platform gen.gcon Cs then
+		List.iter (fun net_lib ->
+			if not (net_lib#has_flag NativeLibraries.FlagIsStd) && not (net_lib#has_flag NativeLibraries.FlagIsExtern) then begin
+				SourceWriter.write w (path net_lib#get_name ".dll");
+				SourceWriter.newline w;
+			end
+		) gen.gcon.native_libs.net_libs;
+	SourceWriter.write w "end libs";
+	SourceWriter.newline w;
+	let args = gen.gcon.c_args in
+	if args <> [] then begin
+		SourceWriter.write w "begin opts";
+		SourceWriter.newline w;
+		List.iter (fun opt -> SourceWriter.write w opt; SourceWriter.newline w) (List.rev args);
+		SourceWriter.write w "end opts";
+		SourceWriter.newline w;
+	end;
+
+	let contents = SourceWriter.contents w in
+	let f = open_out (gen.gcon.file ^ "/" ^ name) in
+	output_string f contents;
+	close_out f
+
+(*
+	various helper functions
+*)
+
+let mk_paren e =
+	match e.eexpr with | TParenthesis _ -> e | _ -> { e with eexpr=TParenthesis(e) }
+
+(* private *)
+
+let get_real_fun gen t =
+	match follow t with
+	| TFun(args,t) -> TFun(List.map (fun (n,o,t) -> n,o,gen.greal_type t) args, gen.greal_type t)
+	| _ -> t
+
+let mk_nativearray_decl gen t el pos =
+	mk (TCall (mk (TIdent "__array__") t_dynamic pos, el)) (gen.gclasses.nativearray t) pos
+
+let ensure_local com block name e =
+	match e.eexpr with
+	| TLocal _ -> e
+	| _ ->
+		let v = mk_temp name e.etype in
+		block := (mk (TVar (v, Some e)) com.basic.tvoid e.epos) :: !block;
+		mk_local v e.epos
+
+let follow_module follow_func md = match md with
+	| TClassDecl _
+	| TEnumDecl _
+	| TAbstractDecl _ -> md
+	| TTypeDecl tdecl -> match (follow_func (TType(tdecl, List.map snd tdecl.t_params))) with
+		| TInst(cl,_) -> TClassDecl cl
+		| TEnum(e,_) -> TEnumDecl e
+		| TType(t,_) -> TTypeDecl t
+		| TAbstract(a,_) -> TAbstractDecl a
+		| _ -> assert false
+
+(*
+	hxgen means if the type was generated by haxe. If a type was generated by haxe, it means
+	it will contain special constructs for speedy reflection, for example
+
+	@see SetHXGen module
+ *)
+let rec is_hxgen md =
+	match md with
+		| TClassDecl cl -> Meta.has Meta.HxGen cl.cl_meta
+		| TEnumDecl e -> Meta.has Meta.HxGen e.e_meta
+		| TTypeDecl t -> Meta.has Meta.HxGen t.t_meta || ( match follow t.t_type with | TInst(cl,_) -> is_hxgen (TClassDecl cl) | TEnum(e,_) -> is_hxgen (TEnumDecl e) | _ -> false )
+		| TAbstractDecl a -> Meta.has Meta.HxGen a.a_meta
+
+let is_hxgen_t t =
+	match t with
+		| TInst (cl, _) -> Meta.has Meta.HxGen cl.cl_meta
+		| TEnum (e, _) -> Meta.has Meta.HxGen e.e_meta
+		| TAbstract (a, _) -> Meta.has Meta.HxGen a.a_meta
+		| TType (t, _) -> Meta.has Meta.HxGen t.t_meta
+		| _ -> false
+
+let mt_to_t_dyn md =
+	match md with
+		| TClassDecl cl -> TInst(cl, List.map (fun _ -> t_dynamic) cl.cl_params)
+		| TEnumDecl e -> TEnum(e, List.map (fun _ -> t_dynamic) e.e_params)
+		| TAbstractDecl a -> TAbstract(a, List.map (fun _ -> t_dynamic) a.a_params)
+		| TTypeDecl t -> TType(t, List.map (fun _ -> t_dynamic) t.t_params)
+
+let mt_to_t mt params =
+	match mt with
+		| TClassDecl (cl) -> TInst(cl, params)
+		| TEnumDecl (e) -> TEnum(e, params)
+		| TAbstractDecl a -> TAbstract(a, params)
+		| _ -> assert false
+
+let t_to_mt t =
+	match follow t with
+		| TInst(cl, _) -> TClassDecl(cl)
+		| TEnum(e, _) -> TEnumDecl(e)
+		| TAbstract(a, _) -> TAbstractDecl a
+		| _ -> assert false
+
+let rec get_last_ctor cl =
+	Option.map_default (fun (super,_) -> if is_some super.cl_constructor then Some(get super.cl_constructor) else get_last_ctor super) None cl.cl_super
+
+let add_constructor cl cf =
+	match cl.cl_constructor with
+	| None -> cl.cl_constructor <- Some cf
+	| Some ctor ->
+			if ctor != cf && not (List.memq cf ctor.cf_overloads) then
+				ctor.cf_overloads <- cf :: ctor.cf_overloads
+
+(* replace open TMonos with TDynamic *)
+let rec replace_mono t =
+	match t with
+	| TMono t ->
+		(match !t with
+		| None -> t := Some t_dynamic
+		| Some _ -> ())
+	| TEnum (_,p) | TInst (_,p) | TType (_,p) | TAbstract (_,p) ->
+		List.iter replace_mono p
+	| TFun (args,ret) ->
+		List.iter (fun (_,_,t) -> replace_mono t) args;
+		replace_mono ret
+	| TAnon _
+	| TDynamic _ -> ()
+	| TLazy f ->
+		replace_mono (lazy_type f)
+
+(* helper *)
+let mk_class_field name t public pos kind params =
+	let f = mk_field name ~public t pos null_pos in
+	f.cf_meta <- [ Meta.CompilerGenerated, [], null_pos ]; (* annotate that this class field was generated by the compiler *)
+	f.cf_kind <- kind;
+	f.cf_params <- params;
+	f
+
+(* this helper just duplicates the type parameter class, which is assumed that cl is. *)
+(* This is so we can use class parameters on function parameters, without running the risk of name clash *)
+(* between both *)
+let map_param cl =
+	let ret = mk_class cl.cl_module (fst cl.cl_path, snd cl.cl_path ^ "_c") cl.cl_pos null_pos in
+	ret.cl_implements <- cl.cl_implements;
+	ret.cl_kind <- cl.cl_kind;
+	ret
+
+let get_cl_t t =
+	match follow t with | TInst (cl,_) -> cl | _ -> assert false
+
+let mk_class m path pos =
+	let cl = Type.mk_class m path pos null_pos in
+	cl.cl_meta <- [ Meta.CompilerGenerated, [], null_pos ];
+	cl
+
+type tfield_access =
+	| FClassField of tclass * tparams * tclass (* declared class *) * tclass_field * bool (* is static? *) * t (* the actual cf type, in relation to the class type params *) * t (* declared type *)
+	| FEnumField of tenum * tenum_field * bool (* is parameterized enum ? *)
+	| FAnonField of tclass_field
+	| FDynamicField of t
+	| FNotFound
+
+let is_var f = match f.cf_kind with | Var _ -> true | _ -> false
+
+let find_first_declared_field gen orig_cl ?get_vmtype ?exact_field field =
+	let get_vmtype = match get_vmtype with None -> (fun t -> t) | Some f -> f in
+	let chosen = ref None in
+	let is_overload = ref false in
+	let rec loop_cl depth c tl tlch =
+		(try
+			let ret = PMap.find field c.cl_fields in
+			if Meta.has Meta.Overload ret.cf_meta then is_overload := true;
+			match !chosen, exact_field with
+			| Some(d,f,_,_,_), _ when depth <= d || (is_var ret && not (is_var f)) -> ()
+			| _, None ->
+				chosen := Some(depth,ret,c,tl,tlch)
+			| _, Some f2 ->
+				List.iter (fun f ->
+					let declared_t = apply_params c.cl_params tl f.cf_type in
+					if same_overload_args ~get_vmtype declared_t f2.cf_type f f2 then
+						chosen := Some(depth,f,c,tl,tlch)
+				) (ret :: ret.cf_overloads)
+		with | Not_found -> ());
+		(match c.cl_super with
+		| Some (sup,stl) ->
+			let tl = List.map (apply_params c.cl_params tl) stl in
+			let stl = gen.greal_type_param (TClassDecl sup) stl in
+			let tlch = List.map (apply_params c.cl_params tlch) stl in
+			loop_cl (depth+1) sup tl tlch
+		| None -> ());
+		if c.cl_interface then
+			List.iter (fun (sup,stl) ->
+				let tl = List.map (apply_params c.cl_params tl) stl in
+				let stl = gen.greal_type_param (TClassDecl sup) stl in
+				let tlch = List.map (apply_params c.cl_params tlch) stl in
+				loop_cl (depth+1) sup tl tlch
+			) c.cl_implements
+	in
+	loop_cl 0 orig_cl (List.map snd orig_cl.cl_params) (List.map snd orig_cl.cl_params);
+	match !chosen with
+	| None ->
+		None
+	| Some(_,f,c,tl,tlch) ->
+		if !is_overload && not (Meta.has Meta.Overload f.cf_meta) then
+			f.cf_meta <- (Meta.Overload,[],f.cf_pos) :: f.cf_meta;
+		let declared_t = apply_params c.cl_params tl f.cf_type in
+		let params_t = apply_params c.cl_params tlch f.cf_type in
+		let actual_t = match follow params_t with
+		| TFun(args,ret) -> TFun(List.map (fun (n,o,t) -> (n,o,gen.greal_type t)) args, gen.greal_type ret)
+		| _ -> gen.greal_type params_t in
+		Some(f,actual_t,declared_t,params_t,c,tl,tlch)
+
+let rec field_access gen (t:t) (field:string) : (tfield_access) =
+	(*
+		t can be either an haxe-type as a real-type;
+		'follow' should be applied here since we can generalize that a TType will be accessible as its
+		underlying type.
+	*)
+
+	(* let pointers to values be accessed as the underlying values *)
+	let t = match gen.greal_type t with
+		| TAbstract({ a_path = ["cs"],"Pointer" },[t]) ->
+			gen.greal_type t
+		| _ -> t
+	in
+
+	match follow t with
+		| TInst(cl, params) ->
+			let orig_cl = cl in
+			let orig_params = params in
+			let rec not_found cl params =
+				match cl.cl_dynamic with
+					| Some t ->
+						let t = apply_params cl.cl_params params t in
+						FDynamicField t
+					| None ->
+						match cl.cl_super with
+							| None -> FNotFound
+							| Some (super,p) ->  not_found super p
+			in
+
+			let not_found () =
+				try
+					let cf = PMap.find field gen.gbase_class_fields in
+					FClassField (orig_cl, orig_params, gen.gclasses.cl_dyn, cf, false, cf.cf_type, cf.cf_type)
+				with
+					| Not_found -> not_found cl params
+			in
+
+			(* this is a hack for C#'s different generic types with same path *)
+			let hashtbl_field = (String.concat "" (List.map (fun _ -> "]") cl.cl_params)) ^ field in
+			let types = try
+				Hashtbl.find gen.greal_field_types (orig_cl.cl_path, hashtbl_field)
+			with | Not_found ->
+				let ret = find_first_declared_field gen cl field in
+				let ret = match ret with
+					| None -> None
+					| Some(cf,t,dt,_,cl,_,_) -> Some(cf,t,dt,cl)
+				in
+				if ret <> None then Hashtbl.add gen.greal_field_types (orig_cl.cl_path, hashtbl_field) ret;
+				ret
+			in
+			(match types with
+					| None -> not_found()
+					| Some (cf, actual_t, declared_t, declared_cl) ->
+						FClassField(orig_cl, orig_params, declared_cl, cf, false, actual_t, declared_t))
+		| TEnum (en,params) when Meta.has Meta.Class en.e_meta ->
+			(* A field access to an enum could mean accessing field of its generated class (e.g. `index` for switches).
+			   Ideally, we should change all TEnum instances to relevant TInst instances so we never reach this case,
+			   but for now, we're going to find the generated class and make a field access to it instead. *)
+			(try
+				let cl_enum = List.find (function TClassDecl cl when cl.cl_path = en.e_path && Meta.has Meta.Enum cl.cl_meta -> true | _ -> false) gen.gtypes_list in
+				let cl_enum = match cl_enum with TClassDecl cl -> TInst (cl,params) | _ -> assert false in
+				field_access gen cl_enum field
+			with Not_found ->
+				FNotFound)
+		| TAnon anon ->
+			(try match !(anon.a_status) with
+				| Statics cl ->
+					let cf = PMap.find field cl.cl_statics in
+					FClassField(cl, List.map (fun _ -> t_dynamic) cl.cl_params, cl, cf, true, cf.cf_type, cf.cf_type)
+				| EnumStatics e ->
+					let f = PMap.find field e.e_constrs in
+					let is_param = match follow f.ef_type with | TFun _ -> true | _ -> false in
+					FEnumField(e, f, is_param)
+				| _ when PMap.mem field gen.gbase_class_fields ->
+					let cf = PMap.find field gen.gbase_class_fields in
+					FClassField(gen.gclasses.cl_dyn, [t_dynamic], gen.gclasses.cl_dyn, cf, false, cf.cf_type, cf.cf_type)
+				| _ ->
+					FAnonField(PMap.find field anon.a_fields)
+			with | Not_found -> FNotFound)
+		| _ when PMap.mem field gen.gbase_class_fields ->
+			let cf = PMap.find field gen.gbase_class_fields in
+			FClassField(gen.gclasses.cl_dyn, [t_dynamic], gen.gclasses.cl_dyn, cf, false, cf.cf_type, cf.cf_type)
+		| TDynamic t -> FDynamicField t
+		| TMono _ -> FDynamicField t_dynamic
+		| _ -> FNotFound
+
+let field_access_esp gen t field = match field with
+	| FStatic(cl,cf) | FInstance(cl,_,cf) when has_class_field_flag cf CfExtern ->
+		let static = match field with
+			| FStatic _ -> true
+			| _ -> false
+		in
+		let p = match follow (run_follow gen t) with
+			| TInst(_,p) -> p
+			| _ -> List.map snd cl.cl_params
+		in
+		FClassField(cl,p,cl,cf,static,cf.cf_type,cf.cf_type)
+	| _ -> field_access gen t (field_name field)
+
+let mk_field_access gen expr field pos =
+	match field_access gen expr.etype field with
+		| FClassField(c,p,dc,cf,false,at,_) ->
+				{ eexpr = TField(expr, FInstance(dc,p,cf)); etype = apply_params c.cl_params p at; epos = pos }
+		| FClassField(c,p,dc,cf,true,at,_) ->
+				{ eexpr = TField(expr, FStatic(dc,cf)); etype = at; epos = pos }
+		| FAnonField cf ->
+				{ eexpr = TField(expr, FAnon cf); etype = cf.cf_type; epos = pos }
+		| FDynamicField t ->
+				{ eexpr = TField(expr, FDynamic field); etype = t; epos = pos }
+		| FNotFound ->
+				{ eexpr = TField(expr, FDynamic field); etype = t_dynamic; epos = pos }
+		| FEnumField _ -> assert false
+
+(* ******************************************* *)
+(* Module dependency resolution *)
+(* ******************************************* *)
+
+type t_dependency =
+	| DAfter of float
+	| DBefore of float
+
+exception ImpossibleDependency of string
+
+let max_dep = 10000.0
+let min_dep = - (10000.0)
+
+let solve_deps name (deps:t_dependency list) =
+	let vmin = min_dep -. 1.0 in
+	let vmax = max_dep +. 1.0 in
+	let rec loop dep vmin vmax =
+		match dep with
+			| [] ->
+				(if vmin >= vmax then raise (ImpossibleDependency name));
+				(vmin +. vmax) /. 2.0
+			| head :: tail ->
+				match head with
+					| DBefore f ->
+						loop tail (max vmin f) vmax
+					| DAfter f ->
+						loop tail vmin (min vmax f)
+	in
+	loop deps vmin vmax
+
+(* type resolution *)
+
+exception TypeNotFound of path
+
+let get_type gen path =
+	try Hashtbl.find gen.gtypes path with | Not_found -> raise (TypeNotFound path)
+
+
+let fun_args l =
+	List.map (fun (v,s) -> (v.v_name, (s <> None), v.v_type)) l
+
diff --git a/src/codegen/gencommon/hardNullableSynf.ml b/src/codegen/gencommon/hardNullableSynf.ml
new file mode 100644
index 0000000000000000000000000000000000000000..d2f944a678174a1007cb16c91a20e08254469dac
--- /dev/null
+++ b/src/codegen/gencommon/hardNullableSynf.ml
@@ -0,0 +1,284 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Option
+open Common
+open Type
+open Gencommon
+
+(* ******************************************* *)
+(* HardNullableSynf *)
+(* ******************************************* *)
+(*
+	This module will handle Null<T> types for languages that offer a way of dealing with
+	stack-allocated structures or tuples and generics. Essentialy on those targets a Null<T>
+	will be a tuple ( 'a * bool ), where bool is whether the value is null or not.
+
+	At first (configure-time), we will modify the follow function so it can follow correctly nested Null<Null<T>>,
+	and do not follow Null<T> to its underlying type
+
+	Then we will run a syntax filter, which will look for casts to Null<T> and replace them by
+	a call to the new Null<T> creation;
+	Also casts from Null<T> to T or direct uses of Null<T> (call, field access, array access, closure)
+	will result in the actual value being accessed
+	For compatibility with the C# target, HardNullable will accept both Null<T> and haxe.lang.Null<T> types
+
+	dependencies:
+		Needs to be run after all cast detection modules
+*)
+let name = "hard_nullable"
+let priority = solve_deps name [DAfter CastDetect.ReturnCast.priority]
+
+let rec is_null_t gen t = match gen.greal_type t with
+	| TAbstract( { a_path = ([], "Null") }, [of_t])
+	| TInst( { cl_path = (["haxe";"lang"], "Null") }, [of_t]) ->
+		let rec take_off_null t =
+			match is_null_t gen t with | None -> t | Some s -> take_off_null s
+		in
+
+		Some (take_off_null of_t)
+	| TMono r -> (match !r with | Some t -> is_null_t gen t | None -> None)
+	| TLazy f -> is_null_t gen (lazy_type f)
+	| TType (t, tl) ->
+		is_null_t gen (apply_params t.t_params tl t.t_type)
+	| _ -> None
+
+let follow_addon gen t =
+	let rec strip_off_nullable t =
+		let t = gen.gfollow#run_f t in
+		match t with
+			(* haxe.lang.Null<haxe.lang.Null<>> wouldn't be a valid construct, so only follow Null<> *)
+			| TAbstract ( { a_path = ([], "Null") }, [of_t] ) -> strip_off_nullable of_t
+			| _ -> t
+	in
+
+	match t with
+		| TAbstract( ({ a_path = ([], "Null") } as tab), [of_t]) ->
+			Some( TAbstract(tab, [ strip_off_nullable of_t ]) )
+		| _ -> None
+
+let configure gen unwrap_null wrap_val null_to_dynamic has_value opeq_handler =
+	gen.gfollow#add (name ^ "_follow") PZero (follow_addon gen);
+
+	let is_null_t = is_null_t gen in
+	let is_string t = match gen.greal_type t with
+		| TInst({ cl_path=([],"String") },_) -> true
+		| _ -> false
+	in
+	let handle_unwrap to_t e =
+		let e_null_t = get (is_null_t e.etype) in
+		match gen.greal_type to_t with
+			| TDynamic _ | TMono _ | TAnon _ ->
+				(match e_null_t with
+					| TDynamic _ | TMono _ | TAnon _ ->
+						gen.ghandle_cast to_t e_null_t (unwrap_null e)
+					| _ -> null_to_dynamic e
+				)
+			| _ ->
+				gen.ghandle_cast to_t e_null_t (unwrap_null e)
+	in
+
+	let handle_wrap e t =
+		match e.eexpr with
+			| TConst(TNull) ->
+				wrap_val e t false
+			| _ ->
+				wrap_val e t true
+	in
+
+	let cur_block = ref [] in
+	let add_tmp v e p =
+		cur_block := { eexpr = TVar(v,e); etype = gen.gcon.basic.tvoid; epos = p } :: !cur_block
+	in
+	let get_local e = match e.eexpr with
+		| TLocal _ ->
+			e, e
+		| _ ->
+			let v = mk_temp "nulltmp" e.etype in
+			add_tmp v (Some (null e.etype e.epos)) e.epos;
+			let local = { e with eexpr = TLocal(v) } in
+			mk_paren { e with eexpr = TBinop(Ast.OpAssign, local, e) }, local
+	in
+	let rec run e =
+		match e.eexpr with
+			| TBlock(bl) ->
+				let lst = !cur_block in
+				cur_block := [];
+				List.iter (fun e ->
+					let e = run e in
+					cur_block := (e :: !cur_block)
+				) bl;
+				let ret = !cur_block in
+				cur_block := lst;
+				{ e with eexpr = TBlock(List.rev ret) }
+			| TCast(v, _) ->
+				let v = match v.eexpr with
+					| TLocal l -> { v with etype = l.v_type }
+					| _ -> v
+				in
+				let null_et = is_null_t e.etype in
+				let null_vt = is_null_t v.etype in
+				(match null_vt, null_et with
+					| Some(vt), None when is_string e.etype ->
+						let v = run v in
+						{ e with eexpr = TCast(null_to_dynamic v,None) }
+					| Some(vt), None ->
+						(match v.eexpr with
+							(* is there an unnecessary cast to Nullable? *)
+							| TCast(v2, _) ->
+								run { v with etype = e.etype }
+							| _ ->
+								handle_unwrap e.etype (run v)
+						)
+					| None, Some(et) ->
+						handle_wrap (run v) et
+					| Some(vt), Some(et) when not (type_iseq (run_follow gen vt) (run_follow gen et)) ->
+						(* check if has value and convert *)
+						let vlocal_fst, vlocal = get_local (run v) in
+						{
+							eexpr = TIf(
+								has_value vlocal_fst,
+								handle_wrap (mk_cast et (unwrap_null vlocal)) et,
+								Some( handle_wrap (null et e.epos) et ));
+							etype = e.etype;
+							epos = e.epos
+						}
+					| _ ->
+						Type.map_expr run e
+				)
+			| TField(ef, field) when is_some (is_null_t ef.etype) ->
+				let to_t = get (is_null_t ef.etype) in
+				{ e with eexpr = TField(handle_unwrap to_t (run ef), field) }
+			| TCall(ecall, params) when is_some (is_null_t ecall.etype) ->
+				let to_t = get (is_null_t ecall.etype) in
+				{ e with eexpr = TCall(handle_unwrap to_t (run ecall), List.map run params) }
+			| TArray(earray, p) when is_some (is_null_t earray.etype) ->
+				let to_t = get (is_null_t earray.etype) in
+				{ e with eexpr = TArray(handle_unwrap to_t (run earray), p) }
+			| TBinop(op, e1, e2) ->
+				let e1_t = is_null_t e1.etype in
+				let e2_t = is_null_t e2.etype in
+
+				(match op with
+					| Ast.OpAssign
+					| Ast.OpAssignOp _ ->
+						(match e1_t, e2_t with
+							| Some t1, Some t2 ->
+								(match op with
+									| Ast.OpAssign ->
+										Type.map_expr run e
+									| Ast.OpAssignOp op ->
+										(match e1.eexpr with
+											| TLocal _ ->
+												{ e with eexpr = TBinop( Ast.OpAssign, e1, handle_wrap { e with eexpr = TBinop (op, handle_unwrap t1 e1, handle_unwrap t2 (run e2) ) } t1 ) }
+											| _ ->
+												let v, e1, evars = match e1.eexpr with
+													| TField(ef, f) ->
+														let v = mk_temp "nullbinop" ef.etype in
+														v, { e1 with eexpr = TField(mk_local v ef.epos, f) }, ef
+													| _ ->
+														let v = mk_temp "nullbinop" e1.etype in
+														v, mk_local v e1.epos, e1
+												in
+												{ e with eexpr = TBlock([
+													{ eexpr = TVar(v, Some evars); etype = gen.gcon.basic.tvoid; epos = e.epos };
+													{ e with eexpr = TBinop( Ast.OpAssign, e1, handle_wrap { e with eexpr = TBinop (op, handle_unwrap t1 e1, handle_unwrap t2 (run e2) ) } t1 ) }
+												]) }
+										)
+									| _ -> assert false
+								)
+
+							| _ ->
+								Type.map_expr run e (* casts are already dealt with normal CastDetection module *)
+						)
+					| Ast.OpEq | Ast.OpNotEq ->
+						(match e1.eexpr, e2.eexpr with
+							| TConst(TNull), _ when is_some e2_t ->
+								let e = has_value (run e2) in
+								if op = Ast.OpEq then
+									{ e with eexpr = TUnop(Ast.Not, Ast.Prefix, e) }
+								else
+									e
+							| _, TConst(TNull) when is_some e1_t ->
+								let e = has_value (run e1) in
+								if op = Ast.OpEq then
+									{ e with eexpr = TUnop(Ast.Not, Ast.Prefix, e) }
+								else
+									e
+							| _ when is_some e1_t || is_some e2_t ->
+									let e1, e2 =
+										if not (is_some e1_t) then
+											run e2, handle_wrap (run e1) (get e2_t)
+										else if not (is_some e2_t) then
+											run e1, handle_wrap (run e2) (get e1_t)
+										else
+											run e1, run e2
+									in
+									let e = opeq_handler e1 e2 in
+									if op = Ast.OpEq then
+										{ e with eexpr = TUnop(Ast.Not, Ast.Prefix, e) }
+									else
+										e
+							| _ ->
+								Type.map_expr run e
+						)
+					| Ast.OpAdd when is_string e1.etype || is_string e2.etype ->
+						let e1 = if is_some e1_t then
+							null_to_dynamic (run e1)
+						else
+							run e1
+						in
+						let e2 = if is_some e2_t then
+							null_to_dynamic (run e2)
+						else
+							run e2
+						in
+						let e_t = is_null_t e.etype in
+						if is_some e_t then
+							wrap_val { eexpr = TBinop(op,e1,e2); etype = get e_t; epos = e.epos } (get e_t) true
+						else
+							{ e with eexpr = TBinop(op,e1,e2) }
+					| _ ->
+						let e1 = if is_some e1_t then
+							handle_unwrap (get e1_t) (run e1)
+						else run e1 in
+						let e2 = if is_some e2_t then
+							handle_unwrap (get e2_t) (run e2)
+						else
+							run e2 in
+
+						(* if it is Null<T>, we need to convert the result again to null *)
+						let e_t = (is_null_t e.etype) in
+						if is_some e_t then
+							wrap_val { eexpr = TBinop(op, e1, e2); etype = get e_t; epos = e.epos } (get e_t) true
+						else
+							{ e with eexpr = TBinop(op, e1, e2) }
+				)
+			(*| TUnop( (Ast.Increment as op)*)
+			| _ -> Type.map_expr run e
+	in
+	let run e = match e.eexpr with
+		| TFunction tf ->
+			run { e with eexpr = TFunction { tf with tf_expr = mk_block tf.tf_expr } }
+		| TBlock _ ->
+			run e
+		| _ -> match run (mk_block e) with
+			| { eexpr = TBlock([e]) } -> e
+			| e -> e
+	in
+	gen.gsyntax_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/initFunction.ml b/src/codegen/gencommon/initFunction.ml
new file mode 100644
index 0000000000000000000000000000000000000000..4f10bd83711bdac39c8cae3e7bb1b2b00240b4cb
--- /dev/null
+++ b/src/codegen/gencommon/initFunction.ml
@@ -0,0 +1,238 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Type
+open Codegen
+open Texpr.Builder
+open Gencommon
+
+(*
+	This module will take proper care of the init function, by taking off all expressions from static vars and putting them
+	in order in the init function.
+
+	It will also initialize dynamic functions, both by putting them in the constructor and in the init function
+
+	depends on:
+		(syntax) must run before ExprStatement module
+		(ok) must run before OverloadingConstructor module so the constructor can be in the correct place
+		(syntax) must run before FunctionToClass module
+*)
+
+let ensure_simple_expr com e =
+	let rec iter e =
+		match e.eexpr with
+		| TConst _ | TLocal _ | TArray _ | TBinop _
+		| TField _ | TTypeExpr _ | TParenthesis _ | TCast _ | TMeta _
+		| TCall _ | TNew _ | TUnop _ | TIdent _ ->
+			Type.iter iter e
+		| _ ->
+			print_endline (debug_expr e);
+			com.error "Expression is too complex for a readonly variable initialization" e.epos
+	in
+	iter e
+
+let handle_override_dynfun acc e this field =
+	let v = mk_temp ("super_" ^ field) e.etype in
+	v.v_capture <- true;
+
+	let add_expr = ref None in
+
+	let rec loop e =
+		match e.eexpr with
+		| TField ({ eexpr = TConst TSuper }, f) ->
+			let n = field_name f in
+			if n <> field then assert false;
+			if Option.is_none !add_expr then
+				add_expr := Some { e with eexpr = TVar(v, Some this) };
+			mk_local v e.epos
+		| TConst TSuper -> assert false
+		| _ -> Type.map_expr loop e
+	in
+	let e = loop e in
+
+	match !add_expr with
+	| None -> e :: acc
+	| Some add_expr -> add_expr :: e :: acc
+
+let handle_class com cl =
+	let init = match cl.cl_init with
+		| None -> []
+		| Some i -> [i]
+	in
+	let init = List.fold_left (fun acc cf ->
+		match cf.cf_kind with
+			| Var v when Meta.has Meta.ReadOnly cf.cf_meta ->
+					if v.v_write <> AccNever && not (Meta.has Meta.CoreApi cl.cl_meta) then com.warning "@:readOnly variable declared without `never` setter modifier" cf.cf_pos;
+					(match cf.cf_expr with
+					| None -> com.warning "Uninitialized readonly variable" cf.cf_pos
+					| Some e -> ensure_simple_expr com e);
+					acc
+			| Var _
+			| Method MethDynamic when Type.is_physical_field cf ->
+				(match cf.cf_expr with
+				| Some e ->
+					(match cf.cf_params with
+					| [] ->
+						let var = mk (TField (make_static_this cl cf.cf_pos, FStatic(cl,cf))) cf.cf_type cf.cf_pos in
+						let ret = binop Ast.OpAssign var e cf.cf_type cf.cf_pos in
+						cf.cf_expr <- None;
+						ret :: acc
+					| _ ->
+						let params = List.map (fun _ -> t_dynamic) cf.cf_params in
+						let fn = apply_params cf.cf_params params in
+						let var = mk (TField (make_static_this cl cf.cf_pos, FStatic(cl,cf))) (fn cf.cf_type) cf.cf_pos in
+						let rec change_expr e =
+							Type.map_expr_type change_expr fn (fun v -> v.v_type <- fn v.v_type; v) e
+						in
+						let ret = binop Ast.OpAssign var (change_expr e) (fn cf.cf_type) cf.cf_pos in
+						cf.cf_expr <- None;
+						ret :: acc)
+				| None -> acc)
+			| _ -> acc
+	) init cl.cl_ordered_statics in
+	let init = List.rev init in
+	(match init with
+	| [] -> cl.cl_init <- None
+	| _ -> cl.cl_init <- Some (mk (TBlock init) com.basic.tvoid cl.cl_pos));
+
+	(* FIXME: find a way to tell OverloadingConstructor to execute this code even with empty constructors *)
+	let vars, funs = List.fold_left (fun (acc_vars,acc_funs) cf ->
+		match cf.cf_kind with
+		| Var v when Meta.has Meta.ReadOnly cf.cf_meta ->
+				if v.v_write <> AccNever && not (Meta.has Meta.CoreApi cl.cl_meta) then com.warning "@:readOnly variable declared without `never` setter modifier" cf.cf_pos;
+				Option.may (ensure_simple_expr com) cf.cf_expr;
+				(acc_vars,acc_funs)
+		| Var _
+		| Method MethDynamic ->
+			let is_var = match cf.cf_kind with Var _ -> true | _ -> false in
+			(match cf.cf_expr, cf.cf_params with
+			| Some e, [] ->
+				let var = mk (TField ((mk (TConst TThis) (TInst (cl, List.map snd cl.cl_params)) cf.cf_pos), FInstance(cl, List.map snd cl.cl_params, cf))) cf.cf_type cf.cf_pos in
+				let ret = binop Ast.OpAssign var e cf.cf_type cf.cf_pos in
+				cf.cf_expr <- None;
+				let is_override = List.memq cf cl.cl_overrides in
+
+				if is_override then begin
+					cl.cl_ordered_fields <- List.filter (fun f -> f.cf_name <> cf.cf_name) cl.cl_ordered_fields;
+					cl.cl_fields <- PMap.remove cf.cf_name cl.cl_fields;
+					acc_vars, handle_override_dynfun acc_funs ret var cf.cf_name
+				end else if is_var then
+					ret :: acc_vars, acc_funs
+				else
+					acc_vars, ret :: acc_funs
+			| Some e, _ ->
+				let params = List.map (fun _ -> t_dynamic) cf.cf_params in
+				let fn = apply_params cf.cf_params params in
+				let var = mk (TField ((mk (TConst TThis) (TInst (cl, List.map snd cl.cl_params)) cf.cf_pos), FInstance(cl, List.map snd cl.cl_params, cf))) cf.cf_type cf.cf_pos in
+				let rec change_expr e =
+					Type.map_expr_type (change_expr) fn (fun v -> v.v_type <- fn v.v_type; v) e
+				in
+
+				let ret = binop Ast.OpAssign var (change_expr e) (fn cf.cf_type) cf.cf_pos in
+				cf.cf_expr <- None;
+				let is_override = List.memq cf cl.cl_overrides in
+
+				if is_override then begin
+					cl.cl_ordered_fields <- List.filter (fun f -> f.cf_name <> cf.cf_name) cl.cl_ordered_fields;
+					cl.cl_fields <- PMap.remove cf.cf_name cl.cl_fields;
+					acc_vars, handle_override_dynfun acc_funs ret var cf.cf_name
+				end else if is_var then
+					ret :: acc_vars, acc_funs
+				else
+					acc_vars, ret :: acc_funs
+			| None, _ -> acc_vars,acc_funs)
+		| _ -> acc_vars,acc_funs
+	) ([],[]) cl.cl_ordered_fields
+	in
+	(* let vars = List.rev vars in *)
+	(* let funs = List.rev funs in *)
+	(* see if there is any *)
+	(match vars, funs with
+	| [], [] -> ()
+	| _ ->
+		(* if there is, we need to find the constructor *)
+		let ctors =
+			match cl.cl_constructor with
+			| Some ctor ->
+				ctor
+			| None ->
+				try
+					let sctor, sup, stl = OverloadingConstructor.prev_ctor cl (List.map snd cl.cl_params) in
+					let ctor = OverloadingConstructor.clone_ctors com sctor sup stl cl in
+					cl.cl_constructor <- Some ctor;
+					ctor
+				with Not_found ->
+					let ctor = mk_class_field "new" (TFun([], com.basic.tvoid)) false cl.cl_pos (Method MethNormal) [] in
+					ctor.cf_expr <- Some
+					{
+						eexpr = TFunction {
+							tf_args = [];
+							tf_type = com.basic.tvoid;
+							tf_expr = { eexpr = TBlock[]; etype = com.basic.tvoid; epos = cl.cl_pos };
+						};
+						etype = ctor.cf_type;
+						epos = ctor.cf_pos;
+					};
+					cl.cl_constructor <- Some ctor;
+					ctor
+		in
+		let process ctor =
+			let func =
+				match ctor.cf_expr with
+				| Some ({ eexpr = TFunction tf } as e) ->
+					let rec add_fn e =
+						match e.eexpr with
+						| TBlock(hd :: tl) ->
+							(match hd.eexpr with
+							| TCall ({ eexpr = TConst TSuper }, _) ->
+								let tl_block = { e with eexpr = TBlock(tl) } in
+								if not (OverloadingConstructor.descends_from_native_or_skipctor cl) then
+									{ e with eexpr = TBlock (vars @ (hd :: (funs @ [tl_block]))) }
+								else
+									{ e with eexpr = TBlock (hd :: (vars @ funs @ [tl_block])) }
+							| TBlock _ ->
+								let tl_block = { e with eexpr = TBlock(tl) } in
+								{ e with eexpr = TBlock ((add_fn hd) :: [tl_block]) }
+							| _ ->
+								{ e with eexpr = TBlock (vars @ funs @ [{ e with eexpr = TBlock(hd :: tl) }]) })
+						| _ ->
+							Type.concat { e with eexpr = TBlock (vars @ funs) } { e with eexpr = TBlock([e]) }
+					in
+					let tf_expr = add_fn (mk_block tf.tf_expr) in
+					{ e with eexpr = TFunction { tf with tf_expr = tf_expr } }
+				| _ ->
+					assert false
+			in
+			ctor.cf_expr <- Some func
+		in
+		List.iter process (ctors :: ctors.cf_overloads)
+	)
+
+let mod_filter com md =
+	match md with
+	| TClassDecl cl when not cl.cl_extern ->
+		handle_class com cl
+	| _ -> ()
+
+let name = "init_funcs"
+let priority = solve_deps name [DBefore OverloadingConstructor.priority]
+
+let configure gen =
+	let run = (fun md -> mod_filter gen.gcon md; md) in
+	gen.gmodule_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/intDivisionSynf.ml b/src/codegen/gencommon/intDivisionSynf.ml
new file mode 100644
index 0000000000000000000000000000000000000000..71d51618976be21f7dca3a321e89298d42066e94
--- /dev/null
+++ b/src/codegen/gencommon/intDivisionSynf.ml
@@ -0,0 +1,89 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Ast
+open Type
+open Gencommon
+
+(*
+	On targets that support int division, this module will force a float division to be performed.
+	It will also look for casts to int or use of Std.int() to optimize this kind of operation.
+
+	dependencies:
+		since it depends on nothing, but many modules might generate division expressions,
+		it will be one of the last modules to run
+*)
+let init com =
+	let rec is_int e =
+		let rec is_int_type t =
+			match follow t with
+				| TInst ({ cl_path = (["haxe";"lang"],"Null") }, [t]) ->
+					is_int_type t
+				| t ->
+					like_int t && not (like_i64 t)
+		in
+		is_int_type e.etype || begin
+			match e.eexpr with
+			| TUnop (_, _, e) -> is_int e
+			| _ -> false
+		end
+	in
+	let rec is_exactly_int e =
+		match follow e.etype with
+		| TAbstract ({ a_path = ([],"Int") }, []) -> true
+		| _ ->
+			match e.eexpr with
+			| TUnop (_, _, e) -> is_exactly_int e
+			| _ -> false
+	in
+	let rec run e =
+		match e.eexpr with
+		| TBinop ((OpDiv as op), e1, e2) when is_int e1 && is_int e2 ->
+			{ e with eexpr = TBinop (op, mk_cast com.basic.tfloat (run e1), run e2) }
+
+		| TCall (
+				{ eexpr = TField (_, FStatic ({ cl_path = ([], "Std") }, { cf_name = "int" })) },
+				[ { eexpr = TBinop ((OpDiv as op), e1, e2) } as ebinop ]
+			) when is_int e1 && is_int e2 ->
+
+			let e = { ebinop with eexpr = TBinop (op, run e1, run e2); etype = com.basic.tint } in
+			if not (is_exactly_int e1 && is_exactly_int e2) then
+				mk_cast com.basic.tint e
+			else
+				Type.map_expr run e
+
+		| TCast ({ eexpr = TBinop((OpDiv as op), e1, e2) } as ebinop, _ )
+		| TCast ({ eexpr = TBinop(((OpAssignOp OpDiv) as op), e1, e2) } as ebinop, _ ) when is_int e1 && is_int e2 && is_int e ->
+			let ret = { ebinop with eexpr = TBinop (op, run e1, run e2); etype = e.etype } in
+			if not (is_exactly_int e1 && is_exactly_int e2) then
+				mk_cast e.etype ret
+			else
+				Type.map_expr run e
+
+		| _ ->
+			Type.map_expr run e
+	in
+	run
+
+let name = "int_division_synf"
+let priority = solve_deps name [ DAfter ExpressionUnwrap.priority; DAfter ObjectDeclMap.priority; DAfter ArrayDeclSynf.priority ]
+
+let configure gen =
+	let run = init gen.gcon in
+	gen.gsyntax_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/interfaceProps.ml b/src/codegen/gencommon/interfaceProps.ml
new file mode 100644
index 0000000000000000000000000000000000000000..7d92d74594fe8c93b9ddd91f3e65f8d7ec430f47
--- /dev/null
+++ b/src/codegen/gencommon/interfaceProps.ml
@@ -0,0 +1,43 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Globals
+open Type
+
+(*
+	This module filter will go through all declared properties, and see if they are conforming to a native interface.
+	If they are, it will add Meta.Property to it.
+*)
+let run = function
+	| TClassDecl ({ cl_interface = false; cl_extern = false } as cl) ->
+		let vars = List.fold_left (fun acc (iface,_) ->
+			if Meta.has Meta.CsNative iface.cl_meta then
+				let props = List.filter (fun cf -> match cf.cf_kind with Var { v_read = AccCall } | Var { v_write = AccCall } -> true | _ -> false) iface.cl_ordered_fields in
+				props @ acc
+			else
+				acc
+		) [] cl.cl_implements in
+		if vars <> [] then
+			let vars = List.map (fun cf -> cf.cf_name) vars in
+			List.iter (fun cf -> match cf.cf_kind with
+				| Var { v_read = AccCall } | Var { v_write = AccCall } when List.mem cf.cf_name vars ->
+					cf.cf_meta <- (Meta.Property, [], null_pos) :: cf.cf_meta
+				| _ -> ()
+			) cl.cl_ordered_fields
+	| _ ->
+		()
diff --git a/src/codegen/gencommon/interfaceVarsDeleteModf.ml b/src/codegen/gencommon/interfaceVarsDeleteModf.ml
new file mode 100644
index 0000000000000000000000000000000000000000..ea067f75ecdc470b25359e2516fa198cf11201b9
--- /dev/null
+++ b/src/codegen/gencommon/interfaceVarsDeleteModf.ml
@@ -0,0 +1,84 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Globals
+open Type
+open Gencommon
+
+(* ******************************************* *)
+(* Interface Variables Removal Modf *)
+(* ******************************************* *)
+(*
+	This module filter will take care of sanitizing interfaces for targets that do not support
+	variables declaration in interfaces. By now this will mean that if anything is typed as the interface,
+	and a variable access is made, a FNotFound will be returned for the field_access, so
+	the field will be only accessible by reflection.
+	Speed-wise, ideally it would be best to create getProp/setProp functions in this case and change
+	the AST to call them when accessing by interface. (TODO)
+	But right now it will be accessed by reflection.
+*)
+let name = "interface_vars"
+let priority = solve_deps name []
+
+let configure gen =
+	let run md =
+		match md with
+		| TClassDecl ({ cl_interface = true } as cl) ->
+			let to_add = ref [] in
+			let fields = List.filter (fun cf ->
+				match cf.cf_kind with
+				| Var _ when gen.gcon.platform = Cs && Meta.has Meta.Event cf.cf_meta ->
+					true
+				| Var vkind when Type.is_physical_field cf || not (Meta.has Meta.Property cf.cf_meta) ->
+					(match vkind.v_read with
+						| AccCall ->
+							let newcf = mk_class_field ("get_" ^ cf.cf_name) (TFun([],cf.cf_type)) true cf.cf_pos (Method MethNormal) [] in
+							to_add := newcf :: !to_add;
+						| _ -> ()
+					);
+					(match vkind.v_write with
+						| AccCall ->
+							let newcf = mk_class_field ("set_" ^ cf.cf_name) (TFun(["val",false,cf.cf_type],cf.cf_type)) true cf.cf_pos (Method MethNormal) [] in
+							to_add := newcf :: !to_add;
+						| _ -> ()
+					);
+					cl.cl_fields <- PMap.remove cf.cf_name cl.cl_fields;
+					false
+				| Method MethDynamic ->
+					(* TODO OPTIMIZATION - add a `_dispatch` method to the interface which will call the dynamic function itself *)
+					cl.cl_fields <- PMap.remove cf.cf_name cl.cl_fields;
+					false
+				| _ ->
+					true
+			) cl.cl_ordered_fields in
+
+			cl.cl_ordered_fields <- fields;
+
+			List.iter (fun cf ->
+				match field_access gen (TInst(cl,List.map snd cl.cl_params)) cf.cf_name with
+				| FNotFound | FDynamicField _ ->
+					cl.cl_ordered_fields <- cf :: cl.cl_ordered_fields;
+					cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields
+				| _ ->
+					()
+			) !to_add
+		| _ -> ()
+	in
+	let map md = run md; md in
+	gen.gmodule_filters#add name (PCustom priority) map
diff --git a/src/codegen/gencommon/normalize.ml b/src/codegen/gencommon/normalize.ml
new file mode 100644
index 0000000000000000000000000000000000000000..2b687bf8ff61f869ef346fd645cf2dfd2f98c57c
--- /dev/null
+++ b/src/codegen/gencommon/normalize.ml
@@ -0,0 +1,100 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Type
+open Gencommon
+
+(*
+	- Filters out enum constructor type parameters from the AST; See Issue #1796
+	- Filters out monomorphs
+	- Filters out all non-whitelisted AST metadata
+
+	dependencies:
+		No dependencies; but it still should be one of the first filters to run,
+		as it will help normalize the AST
+*)
+
+let rec filter_param (stack:t list) t =
+	match t with
+	| TInst({ cl_kind = KTypeParameter _ } as c,_) when Meta.has Meta.EnumConstructorParam c.cl_meta ->
+		t_dynamic
+	| TMono r ->
+		(match !r with
+		| None -> t_dynamic
+		| Some t -> filter_param stack t)
+	| TInst(_,[]) | TEnum(_,[]) | TAbstract(_,[]) ->
+		t
+	| TType(td,tl) ->
+		TType(td,List.map (filter_param stack) tl)
+	| TInst(c,tl) ->
+		TInst(c,List.map (filter_param stack) tl)
+	| TEnum(e,tl) ->
+		TEnum(e,List.map (filter_param stack) tl)
+	| TAbstract({ a_path = (["haxe";"extern"],"Rest") } as a,tl) ->
+		TAbstract(a, List.map (filter_param stack) tl)
+	| TAbstract({a_path = [],"Null"} as a,[t]) ->
+		TAbstract(a,[filter_param stack t])
+	| TAbstract(a,tl) when (Meta.has Meta.MultiType a.a_meta) ->
+		filter_param stack (Abstract.get_underlying_type a tl)
+	| TAbstract(a,tl) ->
+		TAbstract(a, List.map (filter_param stack) tl)
+	| TAnon a ->
+		TAnon {
+			a_fields = PMap.map (fun f -> { f with cf_type = filter_param stack f.cf_type }) a.a_fields;
+			a_status = a.a_status
+		}
+	| TFun(args,ret) ->
+		TFun(List.map (fun (n,o,t) -> (n,o,filter_param stack t)) args, filter_param stack ret)
+	| TDynamic _ ->
+		t
+	| TLazy f ->
+		filter_param stack (lazy_type f)
+
+let filter_param t = filter_param [] t
+
+let init_expr_filter allowed_metas =
+	let rec run e =
+		match e.eexpr with
+		| TMeta ((m,_,_), e) when not (Hashtbl.mem allowed_metas m) ->
+			run e
+		| _ ->
+			map_expr_type (fun e -> run e) filter_param (fun v -> v.v_type <- filter_param v.v_type; v) e
+	in
+	run
+
+let type_filter = function
+	| TClassDecl cl ->
+		let rec map cf =
+			cf.cf_type <- filter_param cf.cf_type;
+			List.iter map cf.cf_overloads
+		in
+		List.iter map cl.cl_ordered_fields;
+		List.iter map cl.cl_ordered_statics;
+		Option.may map cl.cl_constructor
+	| _ ->
+		()
+
+let name = "normalize_type"
+let priority = max_dep
+
+let configure gen ~allowed_metas =
+	let run = init_expr_filter allowed_metas in
+	gen.gexpr_filters#add name (PCustom priority) run;
+
+	let map md = type_filter md; md in
+	gen.gmodule_filters#add name (PCustom priority) map
diff --git a/src/codegen/gencommon/objectDeclMap.ml b/src/codegen/gencommon/objectDeclMap.ml
new file mode 100644
index 0000000000000000000000000000000000000000..7d657ac83d5c6f2fb78d8bf4dc826ffe8c60ede2
--- /dev/null
+++ b/src/codegen/gencommon/objectDeclMap.ml
@@ -0,0 +1,37 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Type
+open Gencommon
+
+(* ******************************************* *)
+(* Object Declaration Mapper *)
+(* ******************************************* *)
+let name = "object_decl_map"
+let priority = solve_deps name []
+
+let configure gen map_fn =
+	let rec run e =
+		match e.eexpr with
+		| TObjectDecl odecl ->
+			let e = Type.map_expr run e in
+			(match e.eexpr with TObjectDecl odecl -> map_fn e odecl | _ -> assert false)
+		| _ ->
+			Type.map_expr run e
+	in
+	gen.gsyntax_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/overloadingConstructor.ml b/src/codegen/gencommon/overloadingConstructor.ml
new file mode 100644
index 0000000000000000000000000000000000000000..f1f2b9f3a70d209b01ebfd23e4b6a53898bebf25
--- /dev/null
+++ b/src/codegen/gencommon/overloadingConstructor.ml
@@ -0,0 +1,444 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Option
+open Common
+open Type
+open Codegen
+open Gencommon
+
+(* ******************************************* *)
+(* overloading reflection constructors *)
+(* ******************************************* *)
+(*
+	this module works on languages that support function overloading and
+	enable function hiding via static functions.
+	it takes the constructor body out of the constructor and adds it to a special ctor
+	static function. The static function will receive the same parameters as the constructor,
+	plus the special "me" var, which will replace "this"
+
+	Then it always adds two constructors to the class: one that receives a special marker class,
+	indicating that the object should be constructed without executing constructor body,
+	and one that executes its normal constructor.
+	Both will only include a super() call to the superclasses' emtpy constructor.
+
+	This enables two things:
+		empty construction without the need of incompatibility with the platform's native construction method
+		the ability to call super() constructor in any place in the constructor
+*)
+
+let rec prev_ctor c tl =
+	match c.cl_super with
+	| None ->
+		raise Not_found
+	| Some (sup,stl) ->
+		let stl = List.map (apply_params c.cl_params tl) stl in
+		match sup.cl_constructor with
+		| None -> prev_ctor sup stl
+		| Some ctor -> ctor, sup, stl
+
+let make_static_ctor_name cl =
+	let name = mk_internal_name "hx" "ctor" in
+	name ^ "_" ^ (String.concat "_" (fst cl.cl_path)) ^ "_" ^ (snd cl.cl_path)
+
+(* replaces super() call with last static constructor call *)
+let replace_super_call com c tl with_params me p follow_type =
+	let rec loop_super c tl =
+		match c.cl_super with
+		| None ->
+			raise Not_found
+		| Some(sup,stl) ->
+			let stl = List.map (apply_params c.cl_params tl) stl in
+			try
+				let static_ctor_name = make_static_ctor_name sup in
+				sup, stl, PMap.find static_ctor_name sup.cl_statics
+			with Not_found ->
+				loop_super sup stl
+	in
+	let sup, stl, cf = loop_super c tl in
+	let with_params = (mk (TLocal me) me.v_type p) :: with_params in
+	let cf =
+		try
+			(* choose best super function *)
+			List.iter (fun e -> replace_mono e.etype) with_params;
+			List.find (fun cf ->
+				replace_mono cf.cf_type;
+				let args, _ = get_fun (apply_params cf.cf_params stl cf.cf_type) in
+				try
+					List.for_all2 (fun (_,_,t) e -> try
+						let e_etype = follow_type e.etype in
+						let t = follow_type t in
+						unify e_etype t; true
+					with Unify_error _ ->
+						false
+					) args with_params
+				with Invalid_argument _ ->
+					false
+			) (cf :: cf.cf_overloads)
+		with Not_found ->
+			com.error "No suitable overload for the super call arguments was found" p; cf
+	in
+	{
+		eexpr = TCall(
+			{
+				eexpr = TField(Texpr.Builder.make_static_this sup p, FStatic(sup,cf));
+				etype = apply_params cf.cf_params stl cf.cf_type;
+				epos = p
+			},
+			with_params
+		);
+		etype = com.basic.tvoid;
+		epos = p;
+	}
+
+(* will create a static counterpart of 'ctor', and replace its contents to a call to the static version*)
+let create_static_ctor com ~empty_ctor_expr cl ctor follow_type =
+	match Meta.has Meta.SkipCtor ctor.cf_meta with
+	| true -> ()
+	| false when is_none ctor.cf_expr -> ()
+	| false ->
+		let static_ctor_name = make_static_ctor_name cl in
+		(* create the static constructor *)
+		let ctor_types = List.map (fun (s,t) -> (s, TInst(map_param (get_cl_t t), []))) cl.cl_params in
+		let ctor_type_params = List.map snd ctor_types in
+		List.iter (function (_,TInst(c,[])) -> (
+			match c.cl_kind with
+			| KTypeParameter (hd :: tail) ->
+				let before = hd :: tail in
+				let after = List.map (apply_params cl.cl_params ctor_type_params) (before) in
+				c.cl_kind <- KTypeParameter(after)
+			| _ -> ())
+		| _ -> ()) ctor_types;
+		let me = alloc_var "__hx_this" (TInst(cl, List.map snd ctor_types)) in
+		me.v_capture <- true;
+
+		let fn_args, _ = get_fun ctor.cf_type in
+		let ctor_params = List.map snd ctor_types in
+		let fn_type = TFun((me.v_name,false, me.v_type) :: List.map (fun (n,o,t) -> (n,o,apply_params cl.cl_params ctor_params t)) fn_args, com.basic.tvoid) in
+		let cur_tf_args = match ctor.cf_expr with
+		| Some { eexpr = TFunction(tf) } -> tf.tf_args
+		| _ -> assert false
+		in
+
+		let changed_tf_args = List.map (fun (v,_) -> (v,None)) cur_tf_args in
+
+		let local_map = Hashtbl.create (List.length cur_tf_args) in
+		let static_tf_args = (me, None) :: List.map (fun (v,b) ->
+			let new_v = alloc_var v.v_name (apply_params cl.cl_params ctor_params v.v_type) in
+			new_v.v_capture <- v.v_capture;
+			Hashtbl.add local_map v.v_id new_v;
+			(new_v, b)
+		) cur_tf_args in
+
+		let static_ctor = mk_class_field static_ctor_name fn_type false ctor.cf_pos (Method MethNormal) ctor_types in
+		let static_ctor_meta = if cl.cl_final then Meta.Private else Meta.Protected in
+		static_ctor.cf_meta <- (static_ctor_meta,[],ctor.cf_pos) :: static_ctor.cf_meta;
+
+		(* change ctor contents to reference the 'me' var instead of 'this' *)
+		let actual_super_call = ref None in
+		let rec map_expr ~is_first e = match e.eexpr with
+			| TCall (({ eexpr = TConst TSuper } as tsuper), params) -> (try
+				let params = List.map (fun e -> map_expr ~is_first:false e) params in
+				actual_super_call := Some { e with eexpr = TCall(tsuper, [empty_ctor_expr]) };
+				replace_super_call com cl ctor_params params me e.epos follow_type
+			with | Not_found ->
+				(* last static function was not found *)
+				actual_super_call := Some e;
+				if not is_first then
+					com.error "Super call must be the first call when extending native types" e.epos;
+				{ e with eexpr = TBlock([]) })
+			| TFunction tf when is_first ->
+				do_map ~is_first:true e
+			| TConst TThis ->
+				mk_local me e.epos
+			| TBlock (fst :: bl) ->
+				let fst = map_expr ~is_first:is_first fst in
+				{ e with eexpr = TBlock(fst :: List.map (fun e -> map_expr ~is_first:false e) bl); etype = apply_params cl.cl_params ctor_params e.etype }
+			| _ ->
+				do_map e
+		and do_map ?(is_first=false) e =
+			let do_t = apply_params cl.cl_params ctor_params in
+			let do_v v = try
+					Hashtbl.find local_map v.v_id
+				with | Not_found ->
+					v.v_type <- do_t v.v_type; v
+			in
+			Type.map_expr_type (map_expr ~is_first:is_first) do_t do_v e
+		in
+
+		let expr = do_map ~is_first:true (get ctor.cf_expr) in
+		let expr = match expr.eexpr with
+		| TFunction(tf) ->
+			{ expr with etype = fn_type; eexpr = TFunction({ tf with tf_args = static_tf_args }) }
+		| _ -> assert false in
+		static_ctor.cf_expr <- Some expr;
+		(* add to the statics *)
+		(try
+			let stat = PMap.find static_ctor_name cl.cl_statics in
+			stat.cf_overloads <- static_ctor :: stat.cf_overloads
+		with | Not_found ->
+			cl.cl_ordered_statics <- static_ctor :: cl.cl_ordered_statics;
+			cl.cl_statics <- PMap.add static_ctor_name static_ctor cl.cl_statics);
+		(* change current super call *)
+		match ctor.cf_expr with
+		| Some({ eexpr = TFunction(tf) } as e) ->
+			let block_contents, p = match !actual_super_call with
+			| None -> [], ctor.cf_pos
+			| Some super -> [super], super.epos
+			in
+			let block_contents = block_contents @ [{
+				eexpr = TCall(
+					{
+						eexpr = TField(
+							Texpr.Builder.make_static_this cl p,
+							FStatic(cl, static_ctor));
+						etype = apply_params static_ctor.cf_params (List.map snd cl.cl_params) static_ctor.cf_type;
+						epos = p
+					},
+					[{ eexpr = TConst TThis; etype = TInst(cl, List.map snd cl.cl_params); epos = p }]
+					@ List.map (fun (v,_) -> mk_local v p) cur_tf_args
+				);
+				etype = com.basic.tvoid;
+				epos = p
+			}] in
+			ctor.cf_expr <- Some { e with eexpr = TFunction({ tf with tf_expr = { tf.tf_expr with eexpr = TBlock block_contents }; tf_args = changed_tf_args }) }
+		| _ -> assert false
+
+(* makes constructors that only call super() for the 'ctor' argument *)
+let clone_ctors com ctor sup stl cl =
+	let rec clone cf =
+		let ncf = mk_class_field "new" (apply_params sup.cl_params stl cf.cf_type) (has_class_field_flag cf CfPublic) cf.cf_pos cf.cf_kind cf.cf_params in
+		if Meta.has Meta.Protected cf.cf_meta then
+			ncf.cf_meta <- (Meta.Protected,[],ncf.cf_pos) :: ncf.cf_meta;
+		let args, ret = get_fun ncf.cf_type in
+		(* single expression: call to super() *)
+		let tf_args = List.map (fun (name,_,t) ->
+			(* the constructor will have no optional arguments, as presumably this will be handled by the underlying expr *)
+			alloc_var name t, None
+		) args in
+		let super_call =
+		{
+			eexpr = TCall(
+				{ eexpr = TConst TSuper; etype = TInst(cl, List.map snd cl.cl_params); epos = ctor.cf_pos },
+				List.map (fun (v,_) -> mk_local v ctor.cf_pos) tf_args);
+			etype = com.basic.tvoid;
+			epos = ctor.cf_pos;
+		} in
+		ncf.cf_expr <- Some
+		{
+			eexpr = TFunction {
+				tf_args = tf_args;
+				tf_type = com.basic.tvoid;
+				tf_expr = mk_block super_call;
+			};
+			etype = ncf.cf_type;
+			epos = ctor.cf_pos;
+		};
+		ncf
+	in
+	(* take off createEmpty *)
+	let all = List.filter (fun cf -> replace_mono cf.cf_type; not (Meta.has Meta.SkipCtor cf.cf_meta)) (ctor :: ctor.cf_overloads) in
+	let clones = List.map clone all in
+	match clones with
+	| [] ->
+		(* raise Not_found *)
+		assert false (* should never happen *)
+	| cf :: [] -> cf
+	| cf :: overl ->
+		cf.cf_meta <- (Meta.Overload,[],cf.cf_pos) :: cf.cf_meta;
+		cf.cf_overloads <- overl; cf
+
+let rec descends_from_native_or_skipctor cl =
+	not (is_hxgen (TClassDecl cl)) || Meta.has Meta.SkipCtor cl.cl_meta || match cl.cl_super with
+	| None -> false
+	| Some(c,_) -> descends_from_native_or_skipctor c
+
+let ensure_super_is_first com cf =
+	let rec loop e =
+		match e.eexpr with
+		| TBlock (b :: block) ->
+			loop b
+		| TBlock []
+		| TCall({ eexpr = TConst TSuper },_) -> ()
+		| _ ->
+			com.error "Types that derive from a native class must have its super() call as the first statement in the constructor" cf.cf_pos
+	in
+	match cf.cf_expr with
+	| None -> ()
+	| Some e -> Type.iter loop e
+
+let init com (empty_ctor_type : t) (empty_ctor_expr : texpr) (follow_type : t -> t) =
+	let basic = com.basic in
+	let should_change cl = not cl.cl_interface && (not cl.cl_extern || is_hxgen (TClassDecl cl)) && (match cl.cl_kind with KAbstractImpl _ -> false | _ -> true) in
+	let msize = List.length com.types in
+	let processed, empty_ctors = Hashtbl.create msize, Hashtbl.create msize in
+
+	let rec get_last_empty cl =
+		try
+			Hashtbl.find empty_ctors cl.cl_path
+		with | Not_found ->
+			match cl.cl_super with
+			| None -> raise Not_found
+			| Some (sup,_) -> get_last_empty sup
+	in
+
+	let rec change cl =
+		if not (Hashtbl.mem processed cl.cl_path) then begin
+			Hashtbl.add processed cl.cl_path true;
+
+			(* make sure we've processed the super types *)
+			Option.may (fun (super,_) -> if should_change super then change super) cl.cl_super;
+
+			(* implement static hx_ctor and reimplement constructors *)
+			(try
+				let ctor =
+					match cl.cl_constructor with
+					| Some ctor ->
+						ctor
+					| None ->
+						try
+							let sctor, sup, stl = prev_ctor cl (List.map snd cl.cl_params) in
+							(* we'll make constructors that will only call super() *)
+							let ctor = clone_ctors com sctor sup stl cl in
+							cl.cl_constructor <- Some ctor;
+							ctor
+						with Not_found -> (* create default constructor *)
+							let ctor = mk_class_field "new" (TFun ([], basic.tvoid)) false cl.cl_pos (Method MethNormal) [] in
+							ctor.cf_expr <- Some {
+								eexpr = TFunction {
+									tf_args = [];
+									tf_type = basic.tvoid;
+									tf_expr = mk (TBlock []) basic.tvoid cl.cl_pos;
+								};
+								etype = ctor.cf_type;
+								epos = ctor.cf_pos;
+							};
+							cl.cl_constructor <- Some ctor;
+							ctor
+				in
+
+				let has_super_constructor =
+					match cl.cl_super with
+						| None -> false
+						| Some (csup,_) -> has_constructor csup
+				in
+
+				(* now that we made sure we have a constructor, exit if native gen *)
+				if not (is_hxgen (TClassDecl cl)) || Meta.has Meta.SkipCtor cl.cl_meta then begin
+					if descends_from_native_or_skipctor cl && has_super_constructor then
+						List.iter (fun cf -> ensure_super_is_first com cf) (ctor :: ctor.cf_overloads);
+					raise Exit
+				end;
+
+				(* if cl descends from a native class, we cannot use the static constructor strategy *)
+				if descends_from_native_or_skipctor cl && has_super_constructor then
+					List.iter (fun cf -> ensure_super_is_first com cf) (ctor :: ctor.cf_overloads)
+				else
+					(* now that we have a current ctor, create the static counterparts *)
+					List.iter (fun cf -> create_static_ctor com ~empty_ctor_expr:empty_ctor_expr cl cf follow_type) (ctor :: ctor.cf_overloads)
+			with Exit -> ());
+
+			(* implement empty ctor *)
+			(try
+				(* now that we made sure we have a constructor, exit if native gen *)
+				if not (is_hxgen (TClassDecl cl)) then raise Exit;
+
+				(* get first *)
+				let empty_type = TFun (["empty",false,empty_ctor_type],basic.tvoid) in
+				let super =
+					match cl.cl_super with
+					| None -> (* implement empty *)
+							[]
+					| Some (sup,_) ->
+						try
+							ignore (get_last_empty sup);
+							let esuper = mk (TConst TSuper) (TInst (cl, List.map snd cl.cl_params)) cl.cl_pos in
+							[mk (TCall (esuper, [empty_ctor_expr])) basic.tvoid cl.cl_pos]
+						with Not_found ->
+							try
+								(* super type is native: find super constructor with least arguments *)
+								let sctor, sup, stl = prev_ctor cl (List.map snd cl.cl_params) in
+								let rec loop remaining (best,n) =
+									match remaining with
+									| [] -> best
+									| cf :: r ->
+										let args,_ = get_fun cf.cf_type in
+										if (List.length args) < n then
+											loop r (cf,List.length args)
+										else
+											loop r (best,n)
+								in
+								let args,_ = get_fun sctor.cf_type in
+								let best = loop sctor.cf_overloads (sctor, List.length args) in
+								let args,_ = get_fun (apply_params sup.cl_params stl best.cf_type) in
+								let esuper = mk (TConst TSuper) (TInst (sup, stl)) cl.cl_pos in
+								[mk (TCall (esuper, List.map (fun (n,o,t) -> null t cl.cl_pos) args)) basic.tvoid cl.cl_pos]
+							with Not_found ->
+								(* extends native type, but no ctor found *)
+								[]
+				in
+				let ctor = mk_class_field "new" empty_type false cl.cl_pos (Method MethNormal) [] in
+				ctor.cf_expr <- Some {
+					eexpr = TFunction {
+						tf_type = basic.tvoid;
+						tf_args = [alloc_var "empty" empty_ctor_type, None];
+						tf_expr = mk (TBlock super) basic.tvoid cl.cl_pos
+					};
+					etype = empty_type;
+					epos = cl.cl_pos;
+				};
+				ctor.cf_meta <- [Meta.SkipCtor, [], ctor.cf_pos];
+				Hashtbl.add empty_ctors cl.cl_path ctor;
+				match cl.cl_constructor with
+				| None ->
+					cl.cl_constructor <- Some ctor
+				| Some c ->
+					c.cf_overloads <- ctor :: c.cf_overloads
+			with Exit -> ());
+		end
+	in
+
+	let module_filter md =
+		(match md with
+		| TClassDecl cl when should_change cl ->
+			change cl;
+		| _ ->
+			());
+		md
+	in
+	module_filter
+
+let init_expr_filter create_empty =
+	let rec run e =
+		match e.etype, e.eexpr with
+		| TInst (cl, params), TCall ({ eexpr = TField (_, FStatic ({cl_path = [],"Type"}, {cf_name = "createEmptyInstance"})) }, [{eexpr = TTypeExpr ((TClassDecl cl_arg) as mt_arg) }]) when cl == cl_arg && is_hxgen mt_arg ->
+			create_empty cl params e.epos
+		| _ ->
+			Type.map_expr run e
+	in
+	run
+
+let priority = 0.0
+let name = "overloading_constructor"
+
+let configure gen ~empty_ctor_type ~empty_ctor_expr =
+	gen.gtools.r_create_empty <- (fun cl params pos -> mk (TNew(cl,params,[empty_ctor_expr])) (TInst(cl,params)) pos);
+	let module_filter = init gen.gcon empty_ctor_type empty_ctor_expr (run_follow gen) in
+	gen.gmodule_filters#add name (PCustom priority) module_filter;
+	let expr_filter = init_expr_filter gen.gtools.r_create_empty in
+	gen.gexpr_filters#add name (PCustom priority) expr_filter
diff --git a/src/codegen/gencommon/realTypeParams.ml b/src/codegen/gencommon/realTypeParams.ml
new file mode 100644
index 0000000000000000000000000000000000000000..4d8b3b0e3e60b0db1632580ababd2e14675e88f7
--- /dev/null
+++ b/src/codegen/gencommon/realTypeParams.ml
@@ -0,0 +1,783 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Option
+open Common
+open Ast
+open Type
+open Codegen
+open Texpr.Builder
+open Gencommon
+
+(* ******************************************* *)
+(* Type Parameters *)
+(* ******************************************* *)
+(*
+	This module will handle type parameters. There are lots of changes we need to do to correctly support type parameters:
+
+	traverse will:
+		V Detect when parameterized function calls are made
+		* Detect when a parameterized class instance is being cast to another parameter
+		* Change new<> parameterized function calls
+		*
+
+	extras:
+		* On languages that support "real" type parameters, a Cast function is provided that will convert from a <Dynamic> to the requested type.
+			This cast will call createEmpty with the correct type, and then set each variable to the new form. Some types will be handled specially, namely the Native Array.
+			Other implementations may be delegated to the runtime.
+		* parameterized classes will implement a new interface (with only a Cast<> function added to it), so we can access the <Dynamic> type parameter for them. Also any reference to <Dynamic> will be replaced by a reference to this interface. (also on TTypeExpr - Std.is())
+		* Type parameter renaming to avoid name clash
+		* Detect type parameter casting and call Cast<> instead
+
+	for java:
+		* for specially assigned classes, parameters will be replaced by _d and _i versions of parameterized functions. This will only work for parameterized classes, not functions.
+
+	dependencies:
+		must run after casts are detected. This will be ensured at CastDetect module.
+*)
+(* ******************************************* *)
+(* Real Type Parameters Module *)
+(* ******************************************* *)
+(*
+	This submodule is by now specially made for the .NET platform. There might be other targets that will
+	make use of this, but it IS very specific.
+
+	On the .NET platform, generics are real specialized classes that are JIT compiled. For this reason, we cannot
+	cast from one type parameter to another. Also there is no common type for the type parameters, so for example
+	an instance of type Array<Int> will return false for instance is Array<object> .
+
+	So we need to:
+		1. create a common interface (without type parameters) (e.g. "Array") which will only contain a __Cast<> function, which will cast from one type into another
+		2. Implement the __Cast function. This part is a little hard, as we must identify all type parameter-dependent fields contained in the class and convert them.
+		In most cases the conversion will just be to call .__Cast<>() on the instances, or just a simple cast. But when the instance is a @:nativegen type, there will be no .__Cast
+		function, and we will need to deal with this case either at compile-time (added handlers - specially for NativeArray), or at runtime (adding new runtime handlers)
+		3. traverse the AST looking for casts involving type parameters, and replace them with .__Cast<>() calls. If type is @:nativegen, throw a warning. If really casting from one type parameter to another on a @:nativegen context, throw an error.
+
+
+	special literals:
+		it will use the special literal __typehandle__ that the target must implement in order to run this. This literal is a way to get the typehandle of e.g. the type parameters,
+		so we can compare them. In C# it's the equivalent of typeof(T).TypeHandle (TypeHandle compare is faster than System.Type.Equals())
+
+	dependencies:
+		(module filter) Interface creation must run AFTER enums are converted into classes, otherwise there is no way to tell parameterized enums to implement an interface
+		Must run AFTER CastDetect. This will be ensured per CastDetect
+
+*)
+let name = "real_type_params"
+let priority = max_dep -. 20.
+
+let rec has_type_params t =
+	match follow t with
+		| TInst( { cl_kind = KTypeParameter _ }, _) -> true
+		| TAbstract(_, params)
+		| TEnum(_, params)
+		| TInst(_, params) -> List.exists (fun t -> has_type_params t) params
+		| TFun(args,ret) ->
+			List.exists (fun (n,o,t) -> has_type_params t) args || has_type_params ret
+		| _ -> false
+
+let rec follow_all_md md =
+	let t = match md with
+		| TClassDecl { cl_kind = KAbstractImpl a } ->
+			TAbstract(a, List.map snd a.a_params)
+		| TClassDecl c ->
+			TInst(c, List.map snd c.cl_params)
+		| TEnumDecl e ->
+			TEnum(e, List.map snd e.e_params)
+		| TTypeDecl t ->
+			TType(t, List.map snd t.t_params)
+		| TAbstractDecl a ->
+			TAbstract(a, List.map snd a.a_params)
+	in
+	Abstract.follow_with_abstracts t
+
+let rec is_hxgeneric md =
+	match md with
+	| TClassDecl { cl_kind = KAbstractImpl a } ->
+		is_hxgeneric (TAbstractDecl a)
+	| TClassDecl(cl) ->
+		not (Meta.has Meta.NativeGeneric cl.cl_meta)
+	| TEnumDecl(e) ->
+		not (Meta.has Meta.NativeGeneric e.e_meta)
+	| TAbstractDecl(a) when Meta.has Meta.NativeGeneric a.a_meta ->
+		not (Meta.has Meta.NativeGeneric a.a_meta)
+	| md -> match follow_all_md md with
+		| TInst(cl,_) -> is_hxgeneric (TClassDecl cl)
+		| TEnum(e,_) -> is_hxgeneric (TEnumDecl e)
+		| TAbstract(a,_) -> not (Meta.has Meta.NativeGeneric a.a_meta)
+		| _ -> true
+
+type nativegeneric_reason =
+	| ReasonField of string * Type.t
+	| ReasonSuper of Globals.path
+	| ReasonExplicit
+
+exception Cannot_be_native of Globals.path * pos * Globals.path * nativegeneric_reason
+
+let rec set_hxgeneric gen mds isfirst md =
+	let iface_path, raise_pos, raise_if_native = match md with
+		| TClassDecl(cl) -> (try
+			(fst (List.find (fun (cl,_) -> (set_hxgeneric gen mds isfirst (TClassDecl cl) ) = Some(true) ) cl.cl_implements)).cl_path, cl.cl_pos, true
+		with Not_found ->
+			([],""), Globals.null_pos, false)
+		| _ -> ([],""), Globals.null_pos, false
+	in
+	let path = t_path md in
+	if List.exists (fun m -> path = t_path m) mds then begin
+		if isfirst then
+			None (* we still can't determine *)
+		else
+			Some true (* if we're in second pass and still can't determine, it's because it can be hxgeneric *)
+	end else begin
+		let has_unresolved = ref false in
+		let is_false v =
+			match v with
+				| Some false -> true
+				| None -> has_unresolved := true; false
+				| Some true -> false
+		in
+		let mds = md :: mds in
+		match md with
+			| TClassDecl(cl)	->
+				(* first see if any meta is present (already processed) *)
+				if Meta.has Meta.NativeGeneric cl.cl_meta then begin
+					if raise_if_native then raise (Cannot_be_native(path, raise_pos, iface_path, ReasonExplicit));
+					Some false
+				end else if Meta.has Meta.HaxeGeneric cl.cl_meta then
+					Some true
+				else if cl.cl_params = [] && is_hxgen md then
+					(cl.cl_meta <- (Meta.HaxeGeneric,[],cl.cl_pos) :: cl.cl_meta;
+					Some true)
+				else if cl.cl_params = [] then
+					(cl.cl_meta <- (Meta.NativeGeneric, [], cl.cl_pos) :: cl.cl_meta;
+					Some false)
+				else if not (is_hxgen md) then
+					(cl.cl_meta <- (Meta.NativeGeneric, [], cl.cl_pos) :: cl.cl_meta;
+					Some false)
+				else begin
+					(*
+						if it's not present, see if any superclass is nativegeneric.
+						nativegeneric is inherited, while hxgeneric can be later changed to nativegeneric
+					*)
+					(* on the first pass, our job is to find any evidence that makes it not be hxgeneric. Otherwise it will be hxgeneric *)
+					match cl.cl_super with
+						| Some (c,_) when is_false (set_hxgeneric gen mds isfirst (TClassDecl c)) ->
+							if raise_if_native then raise (Cannot_be_native(path, raise_pos, iface_path, ReasonSuper(c.cl_path)));
+							cl.cl_meta <- (Meta.NativeGeneric, [], cl.cl_pos) :: cl.cl_meta;
+							Some false
+						| _ ->
+							(* see if it's a generic class *)
+							match cl.cl_params with
+								| [] ->
+									(* if it's not, then it will follow hxgen *)
+									if is_hxgen (TClassDecl cl) then
+										cl.cl_meta <- (Meta.HaxeGeneric, [], cl.cl_pos) :: cl.cl_meta
+									else
+										cl.cl_meta <- (Meta.NativeGeneric, [], cl.cl_pos) :: cl.cl_meta;
+									Some true
+								| _ ->
+									(* if it is, loop through all fields + statics and look for non-hxgeneric
+										generic classes that have KTypeParameter as params *)
+									let raise_or_return_true = if raise_if_native then
+											(fun cf -> raise (Cannot_be_native(path, raise_pos, iface_path, ReasonField(cf.cf_name, cf.cf_type))))
+										else
+											(fun cf -> true)
+									in
+									let rec cfs_must_be_native cfs =
+										match cfs with
+											| [] -> false
+											| cf :: cfs when Type.is_physical_field cf ->
+												let t = follow (gen.greal_type cf.cf_type) in
+												(match t with
+													| TInst( { cl_kind = KTypeParameter _ }, _ ) -> cfs_must_be_native cfs
+													| TInst(cl,p) when has_type_params t && is_false (set_hxgeneric gen mds isfirst (TClassDecl cl)) ->
+														if not (Hashtbl.mem gen.gtparam_cast cl.cl_path) then raise_or_return_true cf else cfs_must_be_native cfs
+													| TEnum(e,p) when has_type_params t && is_false (set_hxgeneric gen mds isfirst (TEnumDecl e)) ->
+														if not (Hashtbl.mem gen.gtparam_cast e.e_path) then raise_or_return_true cf else cfs_must_be_native cfs
+													| _ -> cfs_must_be_native cfs (* TAbstracts / Dynamics can't be generic *)
+												)
+											| _ :: cfs ->
+												cfs_must_be_native cfs
+									in
+									if cfs_must_be_native cl.cl_ordered_fields then begin
+										cl.cl_meta <- (Meta.NativeGeneric, [], cl.cl_pos) :: cl.cl_meta;
+										Some false
+									end else if isfirst && !has_unresolved then
+										None
+									else begin
+										cl.cl_meta <- (Meta.HaxeGeneric, [], cl.cl_pos) :: cl.cl_meta;
+										Some true
+									end
+				end
+			| TEnumDecl e ->
+				if Meta.has Meta.NativeGeneric e.e_meta then begin
+					if raise_if_native then raise (Cannot_be_native(path, raise_pos, iface_path, ReasonExplicit));
+					Some false
+				end else if Meta.has Meta.HaxeGeneric e.e_meta then
+					Some true
+				else if not (is_hxgen (TEnumDecl e)) then begin
+					e.e_meta <- (Meta.NativeGeneric, [], e.e_pos) :: e.e_meta;
+					Some false
+				end else begin
+					(* if enum is not generic, then it's hxgeneric *)
+					match e.e_params with
+						| [] ->
+							e.e_meta <- (Meta.HaxeGeneric, [], e.e_pos) :: e.e_meta;
+							Some true
+						| _ ->
+							let raise_or_return_true = if raise_if_native then
+									(fun name t -> raise (Cannot_be_native(path, raise_pos, iface_path, ReasonField(name, t))))
+								else
+									(fun _ _ -> true)
+							in
+							let rec efs_must_be_native efs =
+								match efs with
+									| [] -> false
+									| ef :: efs ->
+										let t = follow (gen.greal_type ef.ef_type) in
+										match t with
+											| TFun(args, _) ->
+												if List.exists (fun (n,o,t) ->
+													let t = follow t in
+													match t with
+														| TInst( { cl_kind = KTypeParameter _ }, _ ) ->
+															false
+														| TInst(cl,p) when has_type_params t && is_false (set_hxgeneric gen mds isfirst (TClassDecl cl)) ->
+															if not (Hashtbl.mem gen.gtparam_cast cl.cl_path) then raise_or_return_true ef.ef_name t else false
+														| TEnum(e,p) when has_type_params t && is_false (set_hxgeneric gen mds isfirst (TEnumDecl e)) ->
+															if not (Hashtbl.mem gen.gtparam_cast e.e_path) then raise_or_return_true ef.ef_name t else false
+														| _ -> false
+												) args then
+													true
+												else
+													efs_must_be_native efs
+											| _ -> efs_must_be_native efs
+							in
+							let efs = PMap.fold (fun ef acc -> ef :: acc) e.e_constrs [] in
+							if efs_must_be_native efs then begin
+								e.e_meta <- (Meta.NativeGeneric, [], e.e_pos) :: e.e_meta;
+								Some false
+							end else if isfirst && !has_unresolved then
+								None
+							else begin
+								e.e_meta <- (Meta.HaxeGeneric, [], e.e_pos) :: e.e_meta;
+								Some true
+							end
+				end
+			| _ -> assert false
+	end
+
+let path_s = function
+	| [],name -> name
+	| pack,name -> String.concat "." pack ^ "." ^ name
+
+let set_hxgeneric gen md =
+	try
+		let ret = match md with
+			| TClassDecl { cl_kind = KAbstractImpl a } -> (match follow_all_md md with
+				| (TInst _ | TEnum _ as t) -> (
+					let md = match t with
+						| TInst(cl,_) -> TClassDecl cl
+						| TEnum(e,_) -> TEnumDecl e
+						| _ -> assert false
+					in
+					let ret = set_hxgeneric gen [] true md in
+					if ret = None then get (set_hxgeneric gen [] false md) else get ret)
+				| TAbstract(a,_) -> true
+				| _ -> true)
+			| _ -> match set_hxgeneric gen [] true md with
+				| None ->
+					get (set_hxgeneric gen [] false md)
+				| Some v ->
+					v
+		in
+		if not ret then begin
+			match md with
+			| TClassDecl c ->
+				let set_hxgeneric (_,param) = match follow param with
+					| TInst(c,_) ->
+						c.cl_meta <- (Meta.NativeGeneric, [], c.cl_pos) :: c.cl_meta
+					| _ -> ()
+				in
+				List.iter set_hxgeneric c.cl_params;
+				let rec handle_field cf =
+					List.iter set_hxgeneric cf.cf_params;
+					List.iter handle_field cf.cf_overloads
+				in
+				(match c.cl_kind with
+					| KAbstractImpl a ->
+						List.iter set_hxgeneric a.a_params;
+					| _ -> ());
+				List.iter handle_field c.cl_ordered_fields;
+				List.iter handle_field c.cl_ordered_statics
+			| _ -> ()
+		end;
+		ret
+	with Cannot_be_native(path, pos, iface_path, reason) ->
+		let reason_start = "The class at path " ^ path_s path ^ " implements a haxe generic interface " ^ path_s iface_path
+			^ ". It however cannot be a haxe generic class "
+		in
+		let reason = reason_start ^ match reason with
+			| ReasonField (field_name, t) ->
+				"because its field " ^ field_name ^ " is of type " ^ debug_type t
+			| ReasonSuper (path) ->
+				"because it extends the type " ^ path_s path ^ " that was determined to be a native generic type"
+			| ReasonExplicit ->
+				"because it explicitly has the metadata @:nativeGeneric set"
+		in
+		gen.gcon.error (reason) pos;
+		assert false
+
+let params_has_tparams params =
+	List.fold_left (fun acc t -> acc || has_type_params t) false params
+
+(* ******************************************* *)
+(* RealTypeParamsModf *)
+(* ******************************************* *)
+
+(*
+
+	This is the module filter of Real Type Parameters. It will traverse through all types and look for hxgeneric classes (only classes).
+	When found, a parameterless interface will be created and associated via the "ifaces" Hashtbl to the original class.
+	Also a "cast" function will be automatically generated which will handle unsafe downcasts to more specific type parameters (necessary for serialization)
+
+	dependencies:
+		Anything that may create hxgeneric classes must run before it.
+		Should run before ReflectionCFs (this dependency will be added to ReflectionCFs), so the added interfaces also get to be real IHxObject's
+
+*)
+
+module RealTypeParamsModf =
+struct
+
+	let set_only_hxgeneric gen =
+		let rec run md =
+			match md with
+				| TTypeDecl _ | TAbstractDecl _ -> md
+				| _ -> ignore (set_hxgeneric gen md); md
+		in
+		run
+
+	let name = "real_type_params_modf"
+
+	let priority = solve_deps name []
+
+	let rec get_fields gen cl params_cl params_cf acc =
+		let fields = List.fold_left (fun acc cf ->
+			match follow (gen.greal_type (gen.gfollow#run_f (cf.cf_type))) with
+				| TInst(cli, ((_ :: _) as p)) when (not (is_hxgeneric (TClassDecl cli))) && params_has_tparams p ->
+					(cf, apply_params cl.cl_params params_cl cf.cf_type, apply_params cl.cl_params params_cf cf.cf_type) :: acc
+				| TEnum(e, ((_ :: _) as p)) when not (is_hxgeneric (TEnumDecl e)) && params_has_tparams p ->
+					(cf, apply_params cl.cl_params params_cl cf.cf_type, apply_params cl.cl_params params_cf cf.cf_type) :: acc
+				| _ -> acc
+		) [] cl.cl_ordered_fields in
+		match cl.cl_super with
+			| Some(cs, tls) ->
+				get_fields gen cs (List.map (apply_params cl.cl_params params_cl) tls) (List.map (apply_params cl.cl_params params_cf) tls) (fields @ acc)
+			| None -> (fields @ acc)
+
+	let get_cast_name cl = String.concat "_" ((fst cl.cl_path) @ [snd cl.cl_path; "cast"]) (* explicitly define it *)
+
+	(* overrides all needed cast functions from super classes / interfaces to call the new cast function *)
+	let create_stub_casts gen cl cast_cfield =
+		(* go through superclasses and interfaces *)
+		let p = cl.cl_pos in
+		let this = { eexpr = TConst TThis; etype = (TInst(cl, List.map snd cl.cl_params)); epos = p } in
+
+		let rec loop curcls params level reverse_params =
+			if (level <> 0 || curcls.cl_interface) && params <> [] && is_hxgeneric (TClassDecl curcls) then begin
+				let cparams = List.map (fun (s,t) -> (s, TInst (map_param (get_cl_t t), []))) curcls.cl_params in
+				let name = get_cast_name curcls in
+				if not (PMap.mem name cl.cl_fields) then begin
+					let reverse_params = List.map (apply_params curcls.cl_params params) reverse_params in
+					let cfield = mk_class_field name (TFun([], t_dynamic)) false cl.cl_pos (Method MethNormal) cparams in
+					let field = { eexpr = TField(this, FInstance(cl,List.map snd cl.cl_params, cast_cfield)); etype = apply_params cast_cfield.cf_params reverse_params cast_cfield.cf_type; epos = p } in
+					let call =
+					{
+						eexpr = TCall(field, []);
+						etype = t_dynamic;
+						epos = p;
+					} in
+					let call = gen.gparam_func_call call field reverse_params [] in
+					let delay () =
+						cfield.cf_expr <-
+						Some {
+							eexpr = TFunction(
+							{
+								tf_args = [];
+								tf_type = t_dynamic;
+								tf_expr = mk_return call
+							});
+							etype = cfield.cf_type;
+							epos = p;
+						}
+					in
+					gen.gafter_filters_ended <- delay :: gen.gafter_filters_ended; (* do not let filters alter this expression content *)
+					cl.cl_ordered_fields <- cfield :: cl.cl_ordered_fields;
+					cl.cl_fields <- PMap.add cfield.cf_name cfield cl.cl_fields;
+					if level <> 0 then cl.cl_overrides <- cfield :: cl.cl_overrides
+				end
+			end;
+			let get_reverse super supertl =
+				List.map (apply_params super.cl_params supertl) reverse_params
+			in
+			(match curcls.cl_super with
+			| None -> ()
+			| Some(super, supertl) ->
+				let super_params = List.map (apply_params curcls.cl_params params) supertl in
+				loop super (super_params) (level + 1) (get_reverse super super_params));
+			List.iter (fun (iface, ifacetl) ->
+				let iface_params = List.map (apply_params curcls.cl_params params) ifacetl in
+				loop iface (iface_params) level (get_reverse iface iface_params);
+			) curcls.cl_implements
+		in
+		loop cl (List.map snd cl.cl_params) 0 (List.map snd cl.cl_params)
+
+	(*
+		Creates a cast classfield, with the desired name
+
+		Will also look for previous cast() definitions and override them, to reflect the current type and fields
+
+		FIXME: this function still doesn't support generics that extend generics, and are cast as one of its subclasses. This needs to be taken care, by
+		looking at previous superclasses and whenever a generic class is found, its cast argument must be overridden. the toughest part is to know how to type
+		the current type correctly.
+	*)
+	let create_cast_cfield gen cl name =
+		reset_temps();
+		let basic = gen.gcon.basic in
+		let cparams = List.map (fun (s,t) -> (s, TInst (map_param (get_cl_t t), []))) cl.cl_params in
+		let cfield = mk_class_field name (TFun([], t_dynamic)) false cl.cl_pos (Method MethNormal) cparams in
+		let params = List.map snd cparams in
+
+		let fields = get_fields gen cl (List.map snd cl.cl_params) params [] in
+		let fields = List.filter (fun (cf,_,_) -> Type.is_physical_field cf) fields in
+
+		(* now create the contents of the function *)
+		(*
+			it will look something like:
+			if (typeof(T) == typeof(T2)) return this;
+
+			var new_me = new CurrentClass<T2>(EmptyInstnace);
+
+			for (field in Reflect.fields(this))
+			{
+				switch(field)
+				{
+					case "aNativeArray":
+						var newArray = new NativeArray(this.aNativeArray.Length);
+
+					default:
+						Reflect.setField(new_me, field, Reflect.field(this, field));
+				}
+			}
+		*)
+		let pos = cl.cl_pos in
+
+		let new_me_var = alloc_var "new_me" (TInst (cl, params)) in
+		let local_new_me = mk_local new_me_var pos in
+		let this = mk (TConst TThis) (TInst (cl, List.map snd cl.cl_params)) pos in
+		let field_var = alloc_var "field" basic.tstring in
+		let local_field = mk_local field_var pos in
+		let i_var = alloc_var "i" basic.tint in
+		let local_i = mk_local i_var pos in
+		let incr_i = mk (TUnop (Increment, Postfix, local_i)) basic.tint pos in
+		let fields_var = alloc_var "fields" (basic.tarray basic.tstring) in
+		let local_fields = mk_local fields_var pos in
+
+		let fields_to_cases fields =
+			let get_path t =
+				match follow t with
+				| TInst (cl,_) -> cl.cl_path
+				| TEnum (e,_) -> e.e_path
+				| TAbstract (a,_) -> a.a_path
+				| TMono _ | TDynamic _ -> ([], "Dynamic")
+				| _ -> assert false
+			in
+			List.map (fun (cf, t_cl, t_cf) ->
+				let t_cf = follow (gen.greal_type t_cf) in
+				let this_field = mk (TField (this, FInstance (cl, List.map snd cl.cl_params, cf))) t_cl pos in
+				let expr =
+					binop
+						OpAssign
+						(mk (TField (local_new_me, FInstance(cl, List.map snd cl.cl_params, cf))) t_cf pos)
+						(try (Hashtbl.find gen.gtparam_cast (get_path t_cf)) this_field t_cf with Not_found ->
+							(* if not found tparam cast, it shouldn't be a valid hxgeneric *)
+							print_endline ("Could not find a gtparam_cast for " ^ (String.concat "." (fst (get_path t_cf)) ^ "." ^ (snd (get_path t_cf))));
+							assert false)
+						t_cf
+						pos
+				in
+				[make_string gen.gcon.basic cf.cf_name pos], expr
+			) fields
+		in
+
+		let mk_typehandle =
+			(fun cl -> mk (TCall (mk (TIdent "__typeof__") t_dynamic pos, [make_static_this cl pos])) t_dynamic pos)
+		in
+		let mk_eq cl1 cl2 =
+			binop OpEq (mk_typehandle cl1) (mk_typehandle cl2) basic.tbool pos
+		in
+		let rec mk_typehandle_cond thisparams cfparams =
+			match thisparams, cfparams with
+			| TInst (cl_this,[]) :: [], TInst (cl_cf,[]) :: [] ->
+				mk_eq cl_this cl_cf
+			| TInst (cl_this,[]) :: hd, TInst (cl_cf,[]) :: hd2 ->
+				binop OpBoolAnd (mk_eq cl_this cl_cf) (mk_typehandle_cond hd hd2) basic.tbool pos
+			| v :: hd, v2 :: hd2 ->
+				(match follow v, follow v2 with
+				| (TInst(cl1,[]) as v), (TInst(cl2,[]) as v2) ->
+					mk_typehandle_cond (v :: hd) (v2 :: hd2)
+				| _ ->
+					assert false)
+			| _ -> assert false
+		in
+		let fn = {
+			tf_args = [];
+			tf_type = t_dynamic;
+			tf_expr = mk (TBlock [
+				(* if (typeof(T) == typeof(T2)) return this *)
+				mk (TIf (mk_typehandle_cond (List.map snd cl.cl_params) params, mk_return this, None)) basic.tvoid pos;
+				(* var new_me = /*special create empty with tparams construct*/ *)
+				mk (TVar (new_me_var, Some (gen.gtools.r_create_empty cl params pos))) basic.tvoid pos;
+				(* var fields = Reflect.fields(this); *)
+				mk (TVar (fields_var, Some (gen.gtools.r_fields true this))) basic.tvoid pos;
+				(* var i = 0; *)
+				mk (TVar (i_var, Some (make_int gen.gcon.basic 0 pos))) basic.tvoid pos;
+				(* while (i < fields.length) *)
+				mk (TWhile (
+					binop OpLt local_i (mk_field_access gen local_fields "length" pos) basic.tbool pos,
+					mk (TBlock [
+						(* var field = fields[i++]; *)
+						mk (TVar (field_var, Some (mk (TArray (local_fields, incr_i)) basic.tstring pos))) basic.tvoid pos;
+						(
+							(* default: Reflect.setField(new_me, field, Reflect.field(this, field)) *)
+							let edef = gen.gtools.r_set_field basic.tvoid local_new_me local_field (gen.gtools.r_field false basic.tvoid this local_field) in
+							if fields <> [] then
+								(* switch(field) { ... } *)
+								mk (TSwitch (local_field, fields_to_cases fields, Some edef)) basic.tvoid pos
+							else
+								edef;
+						)
+					]) basic.tvoid pos,
+					NormalWhile
+				)) basic.tvoid pos;
+				(* return new_me *)
+				mk_return local_new_me
+			]) t_dynamic pos
+		}
+		in
+		cfield.cf_expr <- Some (mk (TFunction fn) cfield.cf_type pos);
+		cfield
+
+	let create_static_cast_cf gen iface cf =
+		let p = iface.cl_pos in
+		let basic = gen.gcon.basic in
+		let cparams = List.map (fun (s,t) -> ("To_" ^ s, TInst (map_param (get_cl_t t), []))) cf.cf_params in
+		let me_type = TInst(iface,[]) in
+		let cfield = mk_class_field "__hx_cast" (TFun(["me",false,me_type], t_dynamic)) false iface.cl_pos (Method MethNormal) (cparams) in
+		let params = List.map snd cparams in
+
+		let me = alloc_var "me" me_type in
+		let field = { eexpr = TField(mk_local me p, FInstance(iface, List.map snd iface.cl_params, cf)); etype = apply_params cf.cf_params params cf.cf_type; epos = p } in
+		let call =
+		{
+			eexpr = TCall(field, []);
+			etype = t_dynamic;
+			epos = p;
+		} in
+		let call = gen.gparam_func_call call field params [] in
+
+		(* since object.someCall<ExplicitParameterDefinition>() isn't allowed on Haxe, we need to directly apply the params and delay this call *)
+		let delay () =
+			cfield.cf_expr <-
+			Some {
+				eexpr = TFunction(
+				{
+					tf_args = [me,None];
+					tf_type = t_dynamic;
+					tf_expr = mk_return {
+						eexpr = TIf(
+							{ eexpr = TBinop(Ast.OpNotEq, mk_local me p, null me.v_type p); etype = basic.tbool; epos = p },
+							call,
+							Some( null me.v_type p )
+						);
+						etype = t_dynamic;
+						epos = p;
+					}
+				});
+				etype = cfield.cf_type;
+				epos = p;
+			}
+		in
+		cfield, delay
+
+	let default_implementation gen ifaces base_generic =
+		let add_iface cl =
+			gen.gadd_to_module (TClassDecl cl) (max_dep);
+		in
+
+		let implement_stub_cast cthis iface tl =
+			let name = get_cast_name iface in
+			if not (PMap.mem name cthis.cl_fields) then begin
+				let cparams = List.map (fun (s,t) -> ("To_" ^ s, TInst(map_param (get_cl_t t), []))) iface.cl_params in
+				let field = mk_class_field name (TFun([],t_dynamic)) false iface.cl_pos (Method MethNormal) cparams in
+				let this = { eexpr = TConst TThis; etype = TInst(cthis, List.map snd cthis.cl_params); epos = cthis.cl_pos } in
+				field.cf_expr <- Some {
+					etype = TFun([],t_dynamic);
+					epos = this.epos;
+					eexpr = TFunction {
+						tf_type = t_dynamic;
+						tf_args = [];
+						tf_expr = mk_block (mk_return this)
+					}
+				};
+				cthis.cl_ordered_fields <- field :: cthis.cl_ordered_fields;
+				cthis.cl_fields <- PMap.add name field cthis.cl_fields
+			end
+		in
+
+		let rec run md =
+			match md with
+				| TClassDecl ({ cl_params = [] } as cl) ->
+					(* see if we're implementing any generic interface *)
+					let rec check (iface,tl) =
+						if tl <> [] && set_hxgeneric gen (TClassDecl iface) then
+							(* implement cast stub *)
+							implement_stub_cast cl iface tl;
+						List.iter (fun (s,stl) -> check (s, List.map (apply_params iface.cl_params tl) stl)) iface.cl_implements;
+					in
+					List.iter (check) cl.cl_implements;
+					md
+				| TClassDecl ({ cl_params = hd :: tl } as cl) when set_hxgeneric gen md ->
+					let iface = mk_class cl.cl_module cl.cl_path cl.cl_pos in
+					iface.cl_array_access <- Option.map (apply_params (cl.cl_params) (List.map (fun _ -> t_dynamic) cl.cl_params)) cl.cl_array_access;
+					iface.cl_extern <- cl.cl_extern;
+					iface.cl_module <- cl.cl_module;
+					iface.cl_private <- cl.cl_private;
+					iface.cl_meta <-
+						(Meta.HxGen, [], cl.cl_pos)
+						::
+						(Meta.Custom "generic_iface", [(EConst(Int(string_of_int(List.length cl.cl_params))), cl.cl_pos)], cl.cl_pos)
+						::
+						iface.cl_meta;
+					Hashtbl.add ifaces cl.cl_path iface;
+
+					iface.cl_implements <- (base_generic, []) :: iface.cl_implements;
+					iface.cl_interface <- true;
+					cl.cl_implements <- (iface, []) :: cl.cl_implements;
+
+					let name = get_cast_name cl in
+					let cast_cf = create_cast_cfield gen cl name in
+					if not cl.cl_interface then create_stub_casts gen cl cast_cf;
+
+					let rec loop c = match c.cl_super with
+						| None -> ()
+						| Some(sup,_) -> try
+							let siface = Hashtbl.find ifaces sup.cl_path in
+							iface.cl_implements <- (siface,[]) :: iface.cl_implements;
+							()
+						with | Not_found -> loop sup
+					in
+					loop cl;
+
+					(if not cl.cl_interface then cl.cl_ordered_fields <- cast_cf :: cl.cl_ordered_fields);
+					let iface_cf = mk_class_field name cast_cf.cf_type false cast_cf.cf_pos (Method MethNormal) cast_cf.cf_params in
+					let cast_static_cf, delay = create_static_cast_cf gen iface iface_cf in
+
+					cl.cl_ordered_statics <- cast_static_cf :: cl.cl_ordered_statics;
+					cl.cl_statics <- PMap.add cast_static_cf.cf_name cast_static_cf cl.cl_statics;
+					gen.gafter_filters_ended <- delay :: gen.gafter_filters_ended; (* do not let filters alter this expression content *)
+
+					iface_cf.cf_type <- cast_cf.cf_type;
+					iface.cl_fields <- PMap.add name iface_cf iface.cl_fields;
+					let fields = List.filter (fun cf -> match cf.cf_kind with
+						| Var _ | Method MethDynamic -> false
+						| _ ->
+							let is_override = List.memq cf cl.cl_overrides in
+							let cf_type = if is_override && not (Meta.has Meta.Overload cf.cf_meta) then
+								match find_first_declared_field gen cl cf.cf_name with
+									| Some(_,_,declared_t,_,_,_,_) -> declared_t
+									| _ -> assert false
+							else
+								cf.cf_type
+							in
+
+							not (has_type_params cf_type)
+						) cl.cl_ordered_fields
+					in
+					let fields = List.map (fun f -> mk_class_field f.cf_name f.cf_type (has_class_field_flag f CfPublic) f.cf_pos f.cf_kind f.cf_params) fields in
+					let fields = iface_cf :: fields in
+					iface.cl_ordered_fields <- fields;
+					List.iter (fun f -> iface.cl_fields <- PMap.add f.cf_name f iface.cl_fields) fields;
+
+					add_iface iface;
+					md
+				| TTypeDecl _ | TAbstractDecl _ -> md
+				| TEnumDecl _ ->
+					ignore (set_hxgeneric gen md);
+					md
+				| _ -> ignore (set_hxgeneric gen md); md
+		in
+		run
+
+	let configure gen mapping_func =
+		gen.gmodule_filters#add name (PCustom priority) mapping_func
+
+end;;
+
+(* create a common interface without type parameters and only a __Cast<> function *)
+let default_implementation gen (dyn_tparam_cast:texpr->t->texpr) ifaces =
+	let change_expr e cl iface params =
+		let field = mk_static_field_access_infer cl "__hx_cast" e.epos params in
+		let elist = [mk_cast (TInst(iface,[])) e] in
+		let call = { eexpr = TCall(field, elist); etype = t_dynamic; epos = e.epos } in
+
+		gen.gparam_func_call call field params elist
+	in
+
+	let rec run e =
+		match e.eexpr with
+				| TCast(cast_expr, _) ->
+					(* see if casting to a native generic class *)
+					let t = gen.greal_type e.etype in
+					let unifies =
+						let ctype = gen.greal_type cast_expr.etype in
+						match follow ctype with
+						| TInst(cl,_) -> (try
+							unify ctype t;
+							true
+						with | Unify_error el ->
+							false)
+						| _ -> false
+					in
+					let unifies = unifies && not (PMap.mem "cs_safe_casts" gen.gcon.defines.Define.values) in
+					(match follow t with
+						| TInst(cl, p1 :: pl) when is_hxgeneric (TClassDecl cl) && not unifies && not (Meta.has Meta.Enum cl.cl_meta) ->
+							let iface = Hashtbl.find ifaces cl.cl_path in
+							mk_cast e.etype (change_expr (Type.map_expr run cast_expr) cl iface (p1 :: pl))
+						| _ -> Type.map_expr run e
+					)
+				| _ -> Type.map_expr run e
+	in
+	run
+
+let configure gen (dyn_tparam_cast:texpr->t->texpr) ifaces base_generic =
+	gen.ghas_tparam_cast_handler <- true;
+	let traverse = default_implementation gen dyn_tparam_cast ifaces in
+	gen.gsyntax_filters#add name (PCustom priority) traverse;
+	RealTypeParamsModf.configure gen (RealTypeParamsModf.default_implementation gen ifaces base_generic)
diff --git a/src/codegen/gencommon/reflectionCFs.ml b/src/codegen/gencommon/reflectionCFs.ml
new file mode 100644
index 0000000000000000000000000000000000000000..a283d53766338624a761faef30d0497d8fead9dc
--- /dev/null
+++ b/src/codegen/gencommon/reflectionCFs.ml
@@ -0,0 +1,1528 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Option
+open Common
+open Ast
+open Type
+open Codegen
+open Texpr.Builder
+open Gencommon
+open ClosuresToClass
+
+(* ******************************************* *)
+(* Reflection-enabling Class fields *)
+(* ******************************************* *)
+(*
+	This is the most hardcore codegen part of the code. There's much to improve so this code can be more readable, but at least it's running correctly right now! This will be improved. (TODO)
+
+	This module will create class fields that enable reflection for targets that have a slow or inexistent reflection abilities. Because of the similarity
+	of strategies between what should have been different modules, they are all unified in this reflection-enabling class fields.
+
+	They include:
+		* Get(throwErrors, isCheck) / Set fields . Remember to allow implements Dynamic also.
+		* Invoke fields() -> You need to configure how many invoke_field fields there will be. + invokeDynamic
+		* Has field -> parameter in get field that returns __undefined__ if it doesn't exist.
+
+		* GetType -> return the current Class<> / Enum<>
+		* Fields() -> returns all the fields / static fields. Remember to allow implements Dynamic also
+
+		* Create(arguments array), CreateEmpty - calls new() or create empty
+		* getInstanceFields / getClassFields -> show even function fields, everything!
+
+		* deleteField -> only for implements Dynamic
+
+		for enums:
+		* createEnum -> invokeField for classes
+		* createEnumIndex -> use invokeField as well, and use numbers e.g. "0", "1", "2" .... For this, use "@:alias" metadata
+		* getEnumConstructs -> fields()
+
+		need to be solved outside:
+		* getEnumName
+		* enumIndex
+		*
+
+		need to be solved by haxe code:
+		* enumParameters -> for (field in Reflect.fields(enum)) arr.push(Reflect.field(enum, field))
+
+	Standard:
+		if a class contains a @:$enum metadata, it's treated as a converted enum to class
+
+
+	Optimizations:
+		* if optimize is true, all fields will be hashed by the same hashing function as neko (31 bits int : always positive). Every function that expects a string for the field will expect also an int, for the hash
+			a string (which is nullable for compile-time hashes) + an int.
+			At compile-time, a collision will throw an error (like neko).
+			At runtime, a collision will make a negative int. Negative ints will always resolve to a special Hash<> field which takes a string.
+		* if optimize is true, Reflect.field/setField will be replaced by either the runtime version (with already hashed string), either by the own .Field()/.SetField() HxObject's version,
+			if the type is detected to already be hxgen
+		* TODO: if for() optimization for arrays is disabled, we can replace for(field in Reflect.fields(obj)) to:
+			for (field in ( (Std.is(obj, HxObject) ? ((HxObject)obj).Fields() : Reflect.fields(obj)) )) // no array copying . for further optimization this could be guaranteed to return
+			the already hashed fields.
+
+	Mappings:
+		* if create Dynamic class is true, TObjectDecl will be mapped to new DynamicClass(fields, [hashedFields], values)
+		*
+
+	dependencies:
+		There is no big dependency from this target. Though it should be a syntax filter, mainly one of the first so most expression generation has already been done,
+		while the AST has its meaning close to haxe's.
+		Should run before InitFunction so it detects variables containing expressions as "always-execute" expressions, even when using CreateEmpty
+
+		* Must run before switch() syntax changes
+
+*)
+let name = "reflection_cfs"
+
+type rcf_hash_conflict_ctx = {
+	t : t;
+	add_names : texpr->texpr->texpr;
+	get_conflict : texpr->texpr->texpr->texpr;
+	set : texpr->texpr->texpr->texpr->texpr;
+	delete : texpr->texpr->texpr->texpr;
+}
+
+type rcf_ctx =
+{
+	rcf_gen : generator_ctx;
+	rcf_ft : ClosuresToClass.closures_ctx;
+	rcf_optimize : bool;
+
+	rcf_object_iface : tclass;
+	rcf_dynamic_data_class : tclass option;
+
+	rcf_max_func_arity : int;
+
+	(*
+		the hash lookup function. can be an inlined expr or simply a function call.
+		its only needed features is that it should return the index of the key if found, and the
+		complement of the index of where it should be inserted if not found (Ints).
+
+		hash->hash_array->length->returning expression
+	*)
+	rcf_hash_function : texpr->texpr->texpr->texpr;
+
+	rcf_lookup_function : texpr->texpr;
+
+	(* hash_array->length->pos->value *)
+	rcf_insert_function : texpr->texpr->texpr->texpr->texpr;
+
+	(* hash_array->length->pos->value *)
+	rcf_remove_function : texpr->texpr->texpr->texpr;
+
+	rcf_hash_fields : (int, string) Hashtbl.t;
+
+	rcf_hash_paths : (Globals.path * int, string) Hashtbl.t;
+
+	rcf_hash_conflict_ctx : rcf_hash_conflict_ctx option;
+
+	rcf_mk_exception : string -> pos -> texpr;
+
+	(*
+		main expr -> field expr -> field string -> possible hash int (if optimize) -> possible set expr -> should_throw_exceptions -> changed expression
+
+		Changes a get / set field to the runtime resolution function
+	*)
+	rcf_on_getset_field : texpr->texpr->string->int32 option->texpr option->bool->texpr;
+
+	rcf_on_call_field : texpr->texpr->string->int32 option->texpr list->texpr;
+}
+
+let new_ctx gen ft object_iface ?dynamic_data_class optimize dynamic_getset_field dynamic_call_field hash_function lookup_function insert_function remove_function hash_conflict_ctx rcf_mk_exception =
+	{
+		rcf_gen = gen;
+		rcf_ft = ft;
+
+		rcf_optimize = optimize;
+		rcf_dynamic_data_class = dynamic_data_class;
+
+		rcf_object_iface = object_iface;
+
+		rcf_max_func_arity = 10;
+
+		rcf_hash_function = hash_function;
+		rcf_lookup_function = lookup_function;
+
+		rcf_insert_function = insert_function;
+		rcf_remove_function = remove_function;
+
+		rcf_hash_fields = Hashtbl.create 100;
+		rcf_hash_paths = Hashtbl.create 100;
+
+		rcf_on_getset_field = dynamic_getset_field;
+		rcf_on_call_field = dynamic_call_field;
+		rcf_hash_conflict_ctx = hash_conflict_ctx;
+		rcf_mk_exception = rcf_mk_exception;
+	}
+
+(*
+	methods as a bool option is a little laziness of my part.
+		None means that methods are included with normal fields;
+		Some(true) means collect only methods
+		Some(false) means collect only fields (and MethDynamic fields)
+*)
+let collect_fields cl (methods : bool option) =
+	let collected = Hashtbl.create 0 in
+	let collect cf acc =
+		if Meta.has Meta.CompilerGenerated cf.cf_meta || Meta.has Meta.SkipReflection cf.cf_meta then
+			acc
+		else match methods, cf.cf_kind with
+			| None, _ when not (Hashtbl.mem collected cf.cf_name) -> Hashtbl.add collected cf.cf_name true; ([cf.cf_name], cf) :: acc
+			| Some true, Method MethDynamic -> acc
+			| Some true, Method _ when not (Hashtbl.mem collected cf.cf_name) -> Hashtbl.add collected cf.cf_name true; ([cf.cf_name], cf) :: acc
+			| Some false, Method MethDynamic
+			| Some false, Var _ when not (Hashtbl.mem collected cf.cf_name) -> Hashtbl.add collected cf.cf_name true; ([cf.cf_name], cf) :: acc
+			| _ -> acc
+	in
+	let collect_cfs cfs acc =
+		let rec loop cfs acc =
+			match cfs with
+				| [] -> acc
+				| hd :: tl -> loop tl (collect hd acc)
+		in
+		loop cfs acc
+	in
+	let rec loop cl acc =
+		let acc = collect_cfs cl.cl_ordered_fields acc in
+		match cl.cl_super with
+			| None -> acc
+			| Some(cl,_) ->
+				if not (is_hxgen (TClassDecl cl)) then loop cl acc else acc
+	in
+
+	loop cl []
+
+let hash_field ctx f pos =
+	let h = hash f in
+	(try
+		let f2 = Hashtbl.find ctx.rcf_hash_paths (ctx.rcf_gen.gcurrent_path, h) in
+		if f <> f2 then ctx.rcf_gen.gcon.error ("Field conflict between " ^ f ^ " and " ^ f2) pos
+	with Not_found ->
+		Hashtbl.add ctx.rcf_hash_paths (ctx.rcf_gen.gcurrent_path, h) f;
+		Hashtbl.replace ctx.rcf_hash_fields h f);
+	h
+
+(* ( tf_args, switch_var ) *)
+let field_type_args ctx pos =
+	match ctx.rcf_optimize with
+		| true ->
+			let field_name, field_hash = alloc_var "field" ctx.rcf_gen.gcon.basic.tstring, alloc_var "hash" ctx.rcf_gen.gcon.basic.tint in
+
+			[field_name, None; field_hash, None], field_hash
+		| false ->
+			let field_name = alloc_var "field" ctx.rcf_gen.gcon.basic.tstring in
+			[field_name, None], field_name
+
+let hash_field_i32 ctx pos field_name =
+	let i = hash_field ctx field_name pos in
+	let i = Int32.of_int (i) in
+	if i < Int32.zero then
+		Int32.logor (Int32.logand i (Int32.of_int 0x3FFFFFFF)) (Int32.shift_left Int32.one 30)
+	else i
+
+let switch_case ctx pos field_name =
+	match ctx.rcf_optimize with
+		| true ->
+			let i = hash_field_i32 ctx pos field_name in
+			mk (TConst (TInt i)) ctx.rcf_gen.gcon.basic.tint pos
+		| false ->
+			make_string ctx.rcf_gen.gcon.basic field_name pos
+
+let call_super ctx fn_args ret_t cf cl this_t pos =
+	{
+		eexpr = TCall({
+			eexpr = TField({ eexpr = TConst(TSuper); etype = this_t; epos = pos }, FInstance(cl,List.map snd cl.cl_params,cf));
+			etype = TFun(fun_args fn_args, ret_t);
+			epos = pos;
+		}, List.map (fun (v,_) -> mk_local v pos) fn_args);
+		etype = ret_t;
+		epos = pos;
+	}
+
+
+let enumerate_dynamic_fields ctx cl when_found base_arr =
+	let gen = ctx.rcf_gen in
+	let basic = gen.gcon.basic in
+	let pos = cl.cl_pos in
+
+	let vtmp = alloc_var "i" basic.tint in
+
+	let mk_for arr len =
+		let t = if ctx.rcf_optimize then basic.tint else basic.tstring in
+		let convert_str e = if ctx.rcf_optimize then ctx.rcf_lookup_function e else e in
+		let tmpinc = { eexpr = TUnop(Ast.Increment, Ast.Postfix, mk_local vtmp pos); etype = basic.tint; epos = pos } in
+		[
+			{ eexpr = TBinop(OpAssign, mk_local vtmp pos, make_int ctx.rcf_gen.gcon.basic 0 pos); etype = basic.tint; epos = pos };
+			{
+				eexpr = TWhile (
+					{ eexpr = TBinop(Ast.OpLt, mk_local vtmp pos, len); etype = basic.tbool; epos = pos },
+					mk_block (when_found (convert_str { eexpr = TArray (arr, tmpinc); etype = t; epos = pos })),
+					Ast.NormalWhile
+				);
+				etype = basic.tvoid;
+				epos = pos
+			}
+		]
+	in
+
+	let this_t = TInst(cl, List.map snd cl.cl_params) in
+	let this = { eexpr = TConst(TThis); etype = this_t; epos = pos } in
+	let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
+
+	{ eexpr = TVar (vtmp,None); etype = basic.tvoid; epos = pos }
+	::
+	if ctx.rcf_optimize then
+		mk_for (mk_this (mk_internal_name "hx" "hashes") (gen.gclasses.nativearray basic.tint)) (mk_this (mk_internal_name "hx" "length") basic.tint)
+		@
+		mk_for (mk_this (mk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray basic.tint)) (mk_this (mk_internal_name "hx" "length_f") basic.tint)
+		@
+		(
+			let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
+			let ehead = mk_this (mk_internal_name "hx" "conflicts") conflict_ctx.t in
+			[conflict_ctx.add_names ehead base_arr]
+		)
+	else
+		mk_for (mk_this (mk_internal_name "hx" "hashes") (gen.gclasses.nativearray basic.tstring)) (mk_this (mk_internal_name "hx" "length") basic.tint)
+		@
+		mk_for (mk_this (mk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray basic.tstring)) (mk_this (mk_internal_name "hx" "length_f") basic.tint)
+
+(* *********************
+		Dynamic lookup
+		*********************
+
+		This is the behavior of standard <implements Dynamic> classes. It will replace the error throwing
+		if a field doesn't exists when looking it up.
+
+		In order for it to work, an implementation for hash_function must be created.
+		hash_function is the function to be called/inlined that will allow us to lookup the hash into a sorted array of hashes.
+		A binary search or linear search algorithm may be implemented. The only need is that if not found, the NegBits of
+		the place where it should be inserted must be returned.
+*)
+let abstract_dyn_lookup_implementation ctx this field_local hash_local may_value is_float pos =
+	let gen = ctx.rcf_gen in
+	let basic = gen.gcon.basic in
+	let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
+	let a_t = if ctx.rcf_optimize then basic.tint else basic.tstring in
+	let hx_hashes = mk_this (mk_internal_name "hx" "hashes") (gen.gclasses.nativearray a_t) in
+	let hx_hashes_f = mk_this (mk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray a_t) in
+	let hx_dynamics = mk_this (mk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) in
+	let hx_dynamics_f = mk_this (mk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) in
+	let hx_length = mk_this (mk_internal_name "hx" "length") (basic.tint) in
+	let hx_length_f = mk_this (mk_internal_name "hx" "length_f") (basic.tint) in
+	let res = alloc_var "res" basic.tint in
+	let fst_hash, snd_hash, fst_dynamics, snd_dynamics, fst_length, snd_length =
+		if is_float then
+			hx_hashes_f, hx_hashes, hx_dynamics_f, hx_dynamics, hx_length_f, hx_length
+		else
+			hx_hashes, hx_hashes_f, hx_dynamics, hx_dynamics_f, hx_length, hx_length_f
+	in
+	let res_local = mk_local res pos in
+	let gte = {
+		eexpr = TBinop(Ast.OpGte, res_local, { eexpr = TConst(TInt(Int32.zero)); etype = basic.tint; epos = pos });
+		etype = basic.tbool;
+		epos = pos;
+	} in
+	let mk_tarray arr idx =
+		{
+			eexpr = TArray(arr, idx);
+			etype = gen.gclasses.nativearray_type arr.etype;
+			epos = pos;
+		}
+	in
+	let ret_t = if is_float then basic.tfloat else t_dynamic in
+
+	match may_value with
+		| None ->
+			(*
+				var res = lookup(this.__hx_hashes/f, hash);
+				if (res < 0)
+				{
+					res = lookup(this.__hx_hashes_f/_, hash);
+					if(res < 0)
+						return null;
+					else
+						return __hx_dynamics_f[res];
+				} else {
+					return __hx_dynamics[res];
+				}
+			*)
+			let block =
+			[
+				{ eexpr = TVar(res, Some(ctx.rcf_hash_function hash_local fst_hash fst_length)); etype = basic.tvoid; epos = pos };
+				{ eexpr = TIf(gte, mk_return (mk_tarray fst_dynamics res_local), Some({
+					eexpr = TBlock(
+					[
+						{ eexpr = TBinop(Ast.OpAssign, res_local, ctx.rcf_hash_function hash_local snd_hash snd_length); etype = basic.tint; epos = pos };
+						{ eexpr = TIf(gte, mk_return (mk_tarray snd_dynamics res_local), None); etype = ret_t; epos = pos }
+					]);
+					etype = ret_t;
+					epos = pos;
+				})); etype = ret_t; epos = pos }
+			] in
+
+			if ctx.rcf_optimize then
+				let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
+				let ehead = mk_this (mk_internal_name "hx" "conflicts") conflict_ctx.t in
+				let vconflict = alloc_var "conflict" conflict_ctx.t in
+				let local_conflict = mk_local vconflict pos in
+				[mk (TIf (
+					mk (TBinop (OpLt, hash_local, make_int gen.gcon.basic 0 pos)) basic.tbool pos,
+					mk (TBlock [
+						mk (TVar (vconflict, Some (conflict_ctx.get_conflict ehead hash_local field_local))) basic.tvoid pos;
+						mk (TIf (
+							mk (TBinop (OpNotEq, local_conflict, mk (TConst TNull) local_conflict.etype pos)) basic.tbool pos,
+							mk_return (field local_conflict "value" t_dynamic pos),
+							None
+						)) basic.tvoid pos;
+					]) basic.tvoid pos,
+					Some (mk (TBlock block) basic.tvoid pos)
+				)) basic.tvoid pos]
+			else
+				block
+		| Some value_local ->
+			(*
+				//if is not float:
+				//if (isNumber(value_local)) return this.__hx_setField_f(field, getNumber(value_local), false(not static));
+				var res = lookup(this.__hx_hashes/f, hash);
+				if (res >= 0)
+				{
+					return __hx_dynamics/f[res] = value_local;
+				} else {
+					res = lookup(this.__hx_hashes_f/_, hash);
+					if (res >= 0)
+					{
+						__hx_dynamics_f/_.splice(res,1);
+						__hx_hashes_f/_.splice(res,1);
+					}
+				}
+
+				__hx_hashses/_f.insert(~res, hash);
+				__hx_dynamics/_f.insert(~res, value_local);
+				return value_local;
+			*)
+			let neg_res = { eexpr = TUnop(Ast.NegBits, Ast.Prefix, res_local); etype = basic.tint; epos = pos } in
+
+			let res2 = alloc_var "res2" basic.tint in
+			let res2_local = mk_local res2 pos in
+			let gte2 = {
+				eexpr = TBinop(Ast.OpGte, res2_local, { eexpr = TConst(TInt(Int32.zero)); etype = basic.tint; epos = pos });
+				etype = basic.tbool;
+				epos = pos;
+			} in
+
+			let block =
+			[
+				{ eexpr = TVar(res, Some(ctx.rcf_hash_function hash_local fst_hash fst_length)); etype = basic.tvoid; epos = pos };
+				{
+					eexpr = TIf(gte,
+						mk_return { eexpr = TBinop(Ast.OpAssign, mk_tarray fst_dynamics res_local, value_local); etype = value_local.etype; epos = pos },
+						Some({ eexpr = TBlock([
+							{ eexpr = TVar( res2, Some(ctx.rcf_hash_function hash_local snd_hash snd_length)); etype = basic.tvoid; epos = pos };
+							{
+								eexpr = TIf(gte2, { eexpr = TBlock([
+									ctx.rcf_remove_function snd_hash snd_length res2_local;
+									ctx.rcf_remove_function snd_dynamics snd_length res2_local;
+									mk (TUnop(Decrement,Postfix,snd_length)) basic.tint pos
+								]); etype = t_dynamic; epos = pos }, None);
+								etype = t_dynamic;
+								epos = pos;
+							}
+						]); etype = t_dynamic; epos = pos }));
+					etype = t_dynamic;
+					epos = pos;
+				};
+				ctx.rcf_insert_function fst_hash fst_length neg_res hash_local;
+				ctx.rcf_insert_function fst_dynamics fst_length neg_res value_local;
+				mk (TUnop(Increment,Postfix,fst_length)) basic.tint pos;
+			] in
+
+			let block =
+				if ctx.rcf_optimize then
+					let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
+					let ehead = mk_this (mk_internal_name "hx" "conflicts") conflict_ctx.t in
+					[mk (TIf (
+						mk (TBinop (OpLt, hash_local, make_int gen.gcon.basic 0 pos)) basic.tbool pos,
+						conflict_ctx.set ehead hash_local field_local value_local,
+						Some (mk (TBlock block) basic.tvoid pos)
+					)) basic.tvoid pos]
+				else
+					block
+			in
+			block @ [mk_return value_local]
+
+let get_delete_field ctx cl is_dynamic =
+	let pos = cl.cl_pos in
+	let this_t = TInst(cl, List.map snd cl.cl_params) in
+	let this = { eexpr = TConst(TThis); etype = this_t; epos = pos } in
+	let gen = ctx.rcf_gen in
+	let basic = gen.gcon.basic in
+	let tf_args, switch_var = field_type_args ctx pos in
+	let local_switch_var = mk_local switch_var pos in
+	let fun_type = TFun(fun_args tf_args,basic.tbool) in
+	let cf = mk_class_field (mk_internal_name "hx" "deleteField") fun_type false pos (Method MethNormal) [] in
+	let body = if is_dynamic then begin
+		let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
+		let a_t = if ctx.rcf_optimize then basic.tint else basic.tstring in
+		let hx_hashes = mk_this (mk_internal_name "hx" "hashes") (gen.gclasses.nativearray a_t) in
+		let hx_hashes_f = mk_this (mk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray a_t) in
+		let hx_dynamics = mk_this (mk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) in
+		let hx_dynamics_f = mk_this (mk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) in
+		let hx_length = mk_this (mk_internal_name "hx" "length") (basic.tint) in
+		let hx_length_f = mk_this (mk_internal_name "hx" "length_f") (basic.tint) in
+		let res = alloc_var "res" basic.tint in
+		let res_local = mk_local res pos in
+		let gte = {
+			eexpr = TBinop(Ast.OpGte, res_local, { eexpr = TConst(TInt(Int32.zero)); etype = basic.tint; epos = pos });
+			etype = basic.tbool;
+			epos = pos;
+		} in
+		(*
+			var res = lookup(this.__hx_hashes, hash);
+			if (res >= 0)
+			{
+				__hx_dynamics.splice(res,1);
+				__hx_hashes.splice(res,1);
+
+				return true;
+			} else {
+				res = lookup(this.__hx_hashes_f, hash);
+				if (res >= 0)
+				{
+					__hx_dynamics_f.splice(res,1);
+					__hx_hashes_f.splice(res,1);
+
+					return true;
+				}
+			}
+
+			return false;
+		*)
+		let common = [
+			{ eexpr = TVar(res,Some(ctx.rcf_hash_function local_switch_var hx_hashes hx_length)); etype = basic.tvoid; epos = pos };
+			{
+				eexpr = TIf(gte, { eexpr = TBlock([
+					ctx.rcf_remove_function hx_hashes hx_length res_local;
+					ctx.rcf_remove_function hx_dynamics hx_length res_local;
+					mk (TUnop(Decrement,Postfix,hx_length)) basic.tint pos;
+					mk_return { eexpr = TConst(TBool true); etype = basic.tbool; epos = pos }
+				]); etype = t_dynamic; epos = pos }, Some({ eexpr = TBlock([
+					{ eexpr = TBinop(Ast.OpAssign, res_local, ctx.rcf_hash_function local_switch_var hx_hashes_f hx_length_f); etype = basic.tint; epos = pos };
+					{ eexpr = TIf(gte, { eexpr = TBlock([
+						ctx.rcf_remove_function hx_hashes_f hx_length_f res_local;
+						ctx.rcf_remove_function hx_dynamics_f hx_length_f res_local;
+						mk (TUnop(Decrement,Postfix,hx_length_f)) basic.tint pos;
+						mk_return { eexpr = TConst(TBool true); etype = basic.tbool; epos = pos }
+					]); etype = t_dynamic; epos = pos }, None); etype = t_dynamic; epos = pos }
+				]); etype = t_dynamic; epos = pos }));
+				etype = t_dynamic;
+				epos = pos;
+			};
+			mk_return { eexpr = TConst(TBool false); etype = basic.tbool; epos = pos }
+		] in
+
+		if ctx.rcf_optimize then
+			let v_name = match tf_args with (v,_) :: _ -> v | _ -> assert false in
+			let local_name = mk_local v_name pos in
+			let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
+			let ehead = mk_this (mk_internal_name "hx" "conflicts") conflict_ctx.t in
+			(mk (TIf (
+				binop OpLt local_switch_var (make_int gen.gcon.basic 0 pos) basic.tbool pos,
+				mk_return (conflict_ctx.delete ehead local_switch_var local_name),
+				None
+			)) basic.tvoid pos) :: common
+		else
+			common
+	end else
+	[
+		mk_return { eexpr = TConst(TBool false); etype = basic.tbool; epos = pos }
+	] in
+
+	(* create function *)
+	let fn =
+	{
+		tf_args = tf_args;
+		tf_type = basic.tbool;
+		tf_expr = { eexpr = TBlock(body); etype = t_dynamic; epos = pos }
+	} in
+	cf.cf_expr <- Some({ eexpr = TFunction(fn); etype = fun_type; epos = pos });
+	cf
+
+let is_override cl = match cl.cl_super with
+	| Some (cl, _) when is_hxgen (TClassDecl cl) -> true
+	| _ -> false
+
+(* WARNING: this will only work if overloading contructors is possible on target language *)
+let implement_dynamic_object_ctor ctx cl =
+	let rec is_side_effects_free e =
+		match e.eexpr with
+			| TConst _
+			| TLocal _
+			| TFunction _
+			| TTypeExpr _ ->
+				true
+			| TNew(clnew,[],params) when clnew == cl ->
+				List.for_all is_side_effects_free params
+			| TUnop(Increment,_,_)
+			| TUnop(Decrement,_,_)
+			| TBinop(OpAssign,_,_)
+			| TBinop(OpAssignOp _,_,_) ->
+				false
+			| TUnop(_,_,e) ->
+				is_side_effects_free e
+			| TArray(e1,e2)
+			| TBinop(_,e1,e2) ->
+				is_side_effects_free e1 && is_side_effects_free e2
+			| TIf(cond,e1,Some e2) ->
+				is_side_effects_free cond && is_side_effects_free e1 && is_side_effects_free e2
+			| TField(e,_)
+			| TParenthesis e | TMeta(_,e) -> is_side_effects_free e
+			| TArrayDecl el -> List.for_all is_side_effects_free el
+			| TCast(e,_) -> is_side_effects_free e
+			| _ -> false
+	in
+
+	let pos = cl.cl_pos in
+	let gen = ctx.rcf_gen in
+	let basic = gen.gcon.basic in
+	let hasht = if ctx.rcf_optimize then basic.tint else basic.tstring in
+
+	(* and finally we will return a function that transforms a TObjectDecl into a new DynamicObject() call *)
+	let rec loop objdecl acc acc_f =
+		match objdecl with
+			| [] -> acc,acc_f
+			| (name,expr) :: tl ->
+				let real_t = gen.greal_type expr.etype in
+				match follow expr.etype with
+					| TInst ( { cl_path = ["haxe"], "Int64" }, [] ) ->
+						loop tl ((name, gen.ghandle_cast t_dynamic real_t expr) :: acc) acc_f
+					| _ ->
+						if like_float real_t && not (like_i64 real_t) then
+							loop tl acc ((name, gen.ghandle_cast basic.tfloat real_t expr) :: acc_f)
+						else
+							loop tl ((name, gen.ghandle_cast t_dynamic real_t expr) :: acc) acc_f
+	in
+
+	let may_hash_field s =
+		if ctx.rcf_optimize then begin
+			mk (TConst (TInt (hash_field_i32 ctx pos s))) basic.tint pos
+		end else begin
+			make_string gen.gcon.basic s pos
+		end
+	in
+
+	let do_objdecl e objdecl =
+		let exprs_before = ref [] in
+		let rec change_exprs decl acc = match decl with
+			| ((name,_,_),expr) :: tl ->
+				if is_side_effects_free expr then
+					change_exprs tl ((name,expr) :: acc)
+				else begin
+					let var = mk_temp "odecl" expr.etype in
+					exprs_before := { eexpr = TVar(var,Some expr); etype = basic.tvoid; epos = expr.epos } :: !exprs_before;
+					change_exprs tl ((name,mk_local var expr.epos) :: acc)
+				end
+			| [] -> acc
+		in
+		let objdecl = change_exprs objdecl [] in
+
+		let odecl, odecl_f = loop objdecl [] [] in
+		let changed_expr = List.map (fun (s,e) -> (may_hash_field s,e)) in
+		let odecl, odecl_f = changed_expr odecl, changed_expr odecl_f in
+		let sort_fn (e1,_) (e2,_) =
+			match e1.eexpr, e2.eexpr with
+				| TConst(TInt i1), TConst(TInt i2) -> compare i1 i2
+				| TConst(TString s1), TConst(TString s2) -> compare s1 s2
+				| _ -> assert false
+		in
+
+		let odecl, odecl_f = List.sort sort_fn odecl, List.sort sort_fn odecl_f in
+		let ret = {
+			e with eexpr = TNew(cl,[],
+				[
+					mk_nativearray_decl gen hasht (List.map fst odecl) pos;
+					mk_nativearray_decl gen t_empty (List.map snd odecl) pos;
+					mk_nativearray_decl gen hasht (List.map fst odecl_f) pos;
+					mk_nativearray_decl gen basic.tfloat (List.map snd odecl_f) pos;
+				]);
+		} in
+		match !exprs_before with
+			| [] -> ret
+			| block ->
+				{
+					eexpr = TBlock(List.rev block @ [ret]);
+					etype = ret.etype;
+					epos = ret.epos;
+				}
+	in
+	do_objdecl
+
+(*
+	Implements:
+		__hx_lookupField(field:String, throwErrors:Bool, isCheck:Bool, handleProperties:Bool, isFirst:Bool):Dynamic
+
+		__hx_lookupField_f(field:String, throwErrors:Bool, handleProperties:Bool, isFirst:Bool):Float
+
+		__hx_lookupSetField(field:String, value:Dynamic, handleProperties:Bool, isFirst:Bool):Dynamic;
+
+		__hx_lookupSetField(field:String, value:Float, handleProperties:Bool, isFirst:Bool):Float;
+*)
+let implement_final_lookup ctx cl =
+	let gen = ctx.rcf_gen in
+	let basic = gen.gcon.basic in
+	let pos = cl.cl_pos in
+	let is_override = is_override cl in
+
+	(* let this = { eexpr = TConst(TThis); etype = TInst(cl, List.map snd cl.cl_params); epos = pos } in *)
+
+	let mk_throw str pos =
+		let e = ctx.rcf_mk_exception str pos in
+		make_throw e pos
+	in
+
+	(*
+		this function will create the class fields and call callback for each version
+
+		callback : is_float fields_args switch_var throw_errors_option is_check_option value_option : texpr list
+	*)
+	let create_cfs is_dynamic callback =
+		let create_cf is_float is_set =
+			let name = mk_internal_name "hx" ( (if is_set then "lookupSetField" else "lookupField") ^ (if is_float then "_f" else "") ) in
+			let field_args, switch_var = field_type_args ctx pos in
+			let ret_t = if is_float then basic.tfloat else t_dynamic in
+			let tf_args, throw_errors_opt =
+				if is_set then
+					field_args, None
+				else
+					let v = alloc_var "throwErrors" basic.tbool in
+					field_args @ [v,None], Some v
+			in
+			let tf_args, is_check_opt =
+				if is_set || is_float then
+					tf_args, None
+				else
+					let v = alloc_var "isCheck" basic.tbool in
+					tf_args @ [v,None], Some v
+			in
+			let tf_args, value_opt =
+				if not is_set then
+					tf_args, None
+				else
+					let v = alloc_var "value" ret_t in
+					field_args @ [v,None], Some v
+			in
+
+			let fun_t = TFun(fun_args tf_args, ret_t) in
+			let cf = mk_class_field name fun_t false pos (Method MethNormal) [] in
+			let block = callback is_float field_args switch_var throw_errors_opt is_check_opt value_opt in
+			let block = if not is_set then let tl = begin
+				let throw_errors_local = mk_local (get throw_errors_opt) pos in
+				let mk_check_throw msg =
+				{
+					eexpr = TIf(throw_errors_local, mk_throw msg pos, Some (mk_return (null ret_t pos)));
+					etype = ret_t;
+					epos = pos
+				} in
+
+				let mk_may_check_throw msg = if is_dynamic then mk_return (null ret_t pos) else mk_check_throw msg in
+				if is_float then begin
+					[
+						mk_may_check_throw "Field not found or incompatible field type.";
+					]
+				end else begin
+					let is_check_local = mk_local (get is_check_opt) pos in
+					[
+						{
+							eexpr = TIf(is_check_local, mk_return (undefined pos), Some( mk_may_check_throw "Field not found." ));
+							etype = ret_t;
+							epos = pos;
+						}
+					]
+				end
+			end in block @ tl else block in
+			cf.cf_expr <- Some(
+				{
+					eexpr = TFunction({
+						tf_args = tf_args;
+						tf_type = ret_t;
+						tf_expr = { eexpr = TBlock(block); etype = ret_t; epos = pos }
+					});
+					etype = fun_t;
+					epos = pos
+				}
+			);
+			cf
+		in
+		let cfs =
+		[
+			create_cf false false;
+			create_cf true false;
+			create_cf false true;
+			create_cf true true
+		] in
+		cl.cl_ordered_fields <- cl.cl_ordered_fields @ cfs;
+		List.iter (fun cf ->
+			cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields;
+			if is_override then cl.cl_overrides <- cf :: cl.cl_overrides
+		) cfs
+	in
+	if not is_override then begin
+		create_cfs false (fun is_float fields_args switch_var _ _ value_opt ->
+			match value_opt with
+			| None -> (* is not set *)
+				[]
+			| Some _ -> (* is set *)
+				if is_float then
+					[ mk_throw "Cannot access field for writing or incompatible type." pos ]
+				else
+					[ mk_throw "Cannot access field for writing." pos ]
+		)
+	end
+
+(* *)
+let implement_get_set ctx cl =
+	let gen = ctx.rcf_gen in
+	let mk_cfield is_set is_float =
+		let pos = cl.cl_pos in
+		let basic = ctx.rcf_gen.gcon.basic in
+		let tf_args, switch_var = field_type_args ctx pos in
+		let field_args = tf_args in
+		let local_switch_var = { eexpr = TLocal(switch_var); etype = switch_var.v_type; epos = pos } in
+
+		let handle_prop = alloc_var "handleProperties" basic.tbool in
+		let handle_prop_local = mk_local handle_prop pos in
+
+		let this = { eexpr = TConst TThis; etype = TInst(cl, List.map snd cl.cl_params); epos = pos } in
+		let mk_this_call_raw name fun_t params =
+			{ eexpr = TCall( { (mk_field_access gen this name pos) with etype = fun_t; }, params ); etype = snd (get_fun fun_t); epos = pos }
+		in
+
+		let fun_type = ref (TFun([], basic.tvoid)) in
+		let fun_name = mk_internal_name "hx" ( (if is_set then "setField" else "getField") ^ (if is_float then "_f" else "") ) in
+		let cfield = mk_class_field fun_name !fun_type false pos (Method MethNormal) [] in
+
+		let maybe_cast e = e in
+
+		let t = TInst(cl, List.map snd cl.cl_params) in
+
+		(* if it's not latest hxgen class -> check super *)
+		let mk_do_default args do_default =
+			match cl.cl_super with
+				| None -> fun () -> maybe_cast (do_default ())
+				| Some (super, sparams) when not (is_hxgen (TClassDecl super)) ->
+					fun () -> maybe_cast (do_default ())
+				| _ ->
+					fun () ->
+						mk_return {
+							eexpr = TCall(
+								{ eexpr = TField({ eexpr = TConst TSuper; etype = t; epos = pos }, FInstance(cl, List.map snd cl.cl_params, cfield)); etype = !fun_type; epos = pos },
+								(List.map (fun (v,_) -> mk_local v pos) args) );
+							etype = if is_float then basic.tfloat else t_dynamic;
+							epos = pos;
+						};
+		in
+
+		(* if it is set function, there are some different set fields to do *)
+		let do_default, do_field, tf_args = if is_set then begin
+			let value_var = alloc_var "value" (if is_float then basic.tfloat else t_dynamic) in
+			let value_local = { eexpr = TLocal(value_var); etype = value_var.v_type; epos = pos } in
+			let tf_args = tf_args @ [value_var,None; handle_prop, None; ] in
+			let lookup_name = mk_internal_name "hx" ("lookupSetField" ^ if is_float then "_f" else "") in
+
+			let do_default =
+					fun () ->
+						mk_return (mk_this_call_raw lookup_name (TFun(fun_args (field_args @ [value_var,None]),value_var.v_type)) ( List.map (fun (v,_) -> mk_local v pos) field_args @ [ value_local ] ))
+			in
+
+			let do_field cf cf_type =
+				let get_field ethis = { eexpr = TField (ethis, FInstance(cl, List.map snd cl.cl_params, cf)); etype = cf_type; epos = pos } in
+				let this = { eexpr = TConst(TThis); etype = t; epos = pos } in
+				let value_local = if is_float then match follow cf_type with
+					| TInst({ cl_kind = KTypeParameter _ }, _) ->
+						mk_cast t_dynamic value_local
+					| _ ->
+						value_local
+					else
+						value_local
+				in
+
+				let ret =
+				{
+					eexpr = TBlock([
+						{
+							eexpr = TBinop(Ast.OpAssign,
+								get_field this,
+								mk_cast cf_type value_local);
+							etype = cf_type;
+							epos = pos;
+						};
+						mk_return value_local
+					]);
+					etype = cf_type;
+					epos = pos;
+				} in
+				match cf.cf_kind with
+					| Var { v_write = AccCall } ->
+						let bl =
+						[
+							mk_this_call_raw ("set_" ^ cf.cf_name) (TFun(["value",false,cf.cf_type], cf.cf_type)) [ value_local ];
+							mk_return value_local
+						] in
+						if not (Type.is_physical_field cf) then
+							{ eexpr = TBlock bl; etype = value_local.etype; epos = pos }
+						else
+							{
+								eexpr = TIf(
+									handle_prop_local,
+									{ eexpr = TBlock bl; etype = value_local.etype; epos = pos },
+									Some ret);
+								etype = value_local.etype;
+								epos = pos;
+							}
+					| _ ->
+						ret
+			in
+
+			(mk_do_default tf_args do_default, do_field, tf_args)
+		end else begin
+			let throw_errors = alloc_var "throwErrors" basic.tbool in
+			let throw_errors_local = mk_local throw_errors pos in
+			let do_default, tf_args = if not is_float then begin
+				let is_check = alloc_var "isCheck" basic.tbool in
+				let is_check_local = mk_local is_check pos in
+
+				let tf_args = tf_args @ [ throw_errors,None; ] in
+
+				(* default: if (isCheck) return __undefined__ else if(throwErrors) throw "Field not found"; else return null; *)
+				let lookup_name = mk_internal_name "hx" "lookupField" in
+				let do_default =
+						fun () ->
+							mk_return (mk_this_call_raw lookup_name (TFun(fun_args (field_args @ [throw_errors,None;is_check,None; ]),t_dynamic)) ( List.map (fun (v,_) -> mk_local v pos) field_args @ [ throw_errors_local; is_check_local; ] ))
+				in
+
+				(do_default, tf_args @ [ is_check,None; handle_prop,None; ])
+			end else begin
+				let tf_args = tf_args @ [ throw_errors,None; ] in
+
+				let lookup_name = mk_internal_name "hx" "lookupField_f" in
+				let do_default =
+						fun () ->
+							mk_return (mk_this_call_raw lookup_name (TFun(fun_args (field_args @ [throw_errors,None; ]),basic.tfloat)) ( List.map (fun (v,_) -> mk_local v pos) field_args @ [ throw_errors_local; ] ))
+				in
+
+				(do_default, tf_args @ [ handle_prop,None; ])
+			end in
+
+			let get_field cf cf_type ethis cl name =
+				match cf.cf_kind with
+					| Var { v_read = AccCall } when not (Type.is_physical_field cf) ->
+						mk_this_call_raw ("get_" ^ cf.cf_name) (TFun(["value",false,cf.cf_type], cf.cf_type)) []
+					| Var { v_read = AccCall } ->
+						{
+							eexpr = TIf(
+								handle_prop_local,
+								mk_this_call_raw ("get_" ^ cf.cf_name) (TFun(["value",false,cf.cf_type], cf.cf_type)) [],
+								Some { eexpr = TField (ethis, FInstance(cl, List.map snd cl.cl_params, cf)); etype = cf_type; epos = pos }
+							);
+							etype = cf_type;
+							epos = pos;
+						}
+					| Var _
+					| Method MethDynamic -> { eexpr = TField (ethis, FInstance(cl,List.map snd cl.cl_params,cf)); etype = cf_type; epos = pos }
+					| _ ->
+							{ eexpr = TField (this, FClosure(Some (cl,List.map snd cl.cl_params), cf)); etype = cf_type; epos = pos }
+			in
+
+			let do_field cf cf_type =
+				let this = { eexpr = TConst(TThis); etype = t; epos = pos } in
+				match is_float, follow cf_type with
+					| true, TInst( { cl_kind = KTypeParameter _ }, _ ) ->
+						mk_return (mk_cast basic.tfloat (mk_cast t_dynamic (get_field cf cf_type this cl cf.cf_name)))
+					| _ ->
+						mk_return (maybe_cast (get_field cf cf_type this cl cf.cf_name ))
+			in
+			(mk_do_default tf_args do_default, do_field, tf_args)
+		end in
+
+		let get_fields() =
+			let ret = collect_fields cl ( if is_float || is_set then Some (false) else None ) in
+			let ret = if is_set then List.filter (fun (_,cf) ->
+				match cf.cf_kind with
+				(* | Var { v_write = AccNever } -> false *)
+				| _ -> not (Meta.has Meta.ReadOnly cf.cf_meta)) ret
+			else
+				List.filter (fun (_,cf) ->
+				match cf.cf_kind with
+				(* | Var { v_read = AccNever } -> false *)
+				| _ -> true) ret in
+			if is_float then
+				List.filter (fun (_,cf) -> (* TODO: maybe really apply_params in cf.cf_type. The benefits would be limited, though *)
+					match follow (ctx.rcf_gen.greal_type (ctx.rcf_gen.gfollow#run_f cf.cf_type)) with
+						| TDynamic _ | TMono _
+						| TInst ({ cl_kind = KTypeParameter _ }, _) -> true
+						| t when like_float t && not (like_i64 t) -> true
+						| _ -> false
+				) ret
+			else
+				(* dynamic will always contain all references *)
+				ret
+		in
+
+		(* now we have do_default, do_field and tf_args *)
+		(* so create the switch expr *)
+		fun_type := TFun(List.map (fun (v,_) -> (v.v_name, false, v.v_type)) tf_args, if is_float then basic.tfloat else t_dynamic );
+		let has_fields = ref false in
+
+		let content =
+			let fields = get_fields() in
+			let fields = List.filter
+				(fun (_, cf) -> match is_set, cf.cf_kind with
+					| true, Var { v_write = AccCall } -> true
+					| false, Var { v_read = AccCall } -> true
+					| _ -> Type.is_physical_field cf && not (has_meta Meta.ReadOnly cf.cf_meta)
+				)
+				fields
+			in
+			(if fields <> [] then has_fields := true);
+			let cases = List.map (fun (names, cf) ->
+				(if names = [] then assert false);
+				(List.map (switch_case ctx pos) names, do_field cf cf.cf_type)
+			) fields in
+			let default = Some(do_default()) in
+
+			mk_block { eexpr = TSwitch(local_switch_var, cases, default); etype = basic.tvoid; epos = pos }
+		in
+
+		let is_override = match cl.cl_super with
+			| Some (cl, _) when is_hxgen (TClassDecl cl) -> true
+			| _ -> false
+		in
+
+		if !has_fields || (not is_override) then begin
+			let func =
+			{
+				tf_args = tf_args;
+				tf_type = if is_float then basic.tfloat else t_dynamic;
+				tf_expr = content;
+			} in
+
+			let func = { eexpr = TFunction(func); etype = !fun_type; epos = pos } in
+
+			cfield.cf_type <- !fun_type;
+			cfield.cf_expr <- Some func;
+
+			cl.cl_ordered_fields <- cl.cl_ordered_fields @ [cfield];
+			cl.cl_fields <- PMap.add fun_name cfield cl.cl_fields;
+
+			(if is_override then cl.cl_overrides <- cfield	:: cl.cl_overrides)
+		end else ()
+	in
+	mk_cfield true true;
+	mk_cfield true false;
+	mk_cfield false false;
+	mk_cfield false true
+
+let implement_getFields ctx cl =
+	let gen = ctx.rcf_gen in
+	let basic = gen.gcon.basic in
+	let pos = cl.cl_pos in
+
+	(*
+		function __hx_getFields(baseArr:Array<String>)
+		{
+			//add all variable fields
+			//then:
+			super.__hx_getFields(baseArr);
+		}
+	*)
+	let name = mk_internal_name "hx" "getFields" in
+	let v_base_arr = alloc_var "baseArr" (basic.tarray basic.tstring) in
+	let base_arr = mk_local v_base_arr pos in
+
+	let tf_args = [(v_base_arr,None)] in
+	let t = TFun(fun_args tf_args, basic.tvoid) in
+	let cf = mk_class_field name t false pos (Method MethNormal) [] in
+
+	let e_pushfield = mk_field_access gen base_arr "push" pos in
+	let mk_push value = mk (TCall (e_pushfield, [value])) basic.tint pos in
+
+	let has_value = ref false in
+	let map_fields =
+		List.map (fun (_,cf) ->
+			match cf.cf_kind with
+				| Var _
+				| Method MethDynamic when not (List.memq cf cl.cl_overrides) ->
+					has_value := true;
+					mk_push (make_string gen.gcon.basic cf.cf_name pos)
+				| _ -> null basic.tvoid pos
+		)
+	in
+
+	(*
+		if it is first_dynamic, then we need to enumerate the dynamic fields
+	*)
+	let exprs =
+		if is_override cl then
+			let tparams = List.map snd cl.cl_params in
+			let esuper = mk (TConst TSuper) (TInst(cl, tparams)) pos in
+			let efield = mk (TField (esuper, FInstance (cl, tparams, cf))) t pos in
+			[mk (TCall (efield, [base_arr])) basic.tvoid pos]
+		else
+			[]
+	in
+
+	let exprs = map_fields (collect_fields cl (Some false)) @ exprs in
+
+	cf.cf_expr <- Some {
+		eexpr = TFunction({
+			tf_args = tf_args;
+			tf_type = basic.tvoid;
+			tf_expr = mk (TBlock exprs) basic.tvoid pos
+		});
+		etype = t;
+		epos = pos
+	};
+
+	if !has_value || not (is_override cl) then begin
+		cl.cl_ordered_fields <- cl.cl_ordered_fields @ [cf];
+		cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields;
+		(if is_override cl then cl.cl_overrides <- cf :: cl.cl_overrides)
+	end
+
+
+let implement_invokeField ctx slow_invoke cl =
+	(*
+		There are two ways to implement an haxe reflection-enabled class:
+		When we extend a non-hxgen class, and when we extend the base HxObject class.
+
+		Because of the added boiler plate we'd add every time we extend a non-hxgen class to implement a big IHxObject
+		interface, we'll handle the cases differently when implementing each interface.
+
+		At the IHxObject interface, there's only invokeDynamic(field, args[]), while at the HxObject class there are
+		the other, more optimized methods, that follow the Function class interface.
+
+		Since this will only be called by the Closure class, this conversion can be properly dealt with later.
+
+		TODO: create the faster version. By now only invokeDynamic will be implemented
+	*)
+	let gen = ctx.rcf_gen in
+	let basic = gen.gcon.basic in
+	let pos = cl.cl_pos in
+
+	let has_method = ref false in
+
+	let is_override = ref false in
+	let rec extends_hxobject cl =
+		match cl.cl_super with
+			| None -> true
+			| Some (cl,_) when is_hxgen (TClassDecl cl) -> is_override := true; extends_hxobject cl
+			| _ -> false
+	in
+
+	let field_args, switch_var = field_type_args ctx cl.cl_pos in
+	let field_args_exprs = List.map (fun (v,_) -> mk_local v pos) field_args in
+
+	let dynamic_arg = alloc_var "dynargs" (gen.gclasses.nativearray t_dynamic) in
+	let all_args = field_args @ [ dynamic_arg, None ] in
+	let fun_t = TFun(fun_args all_args, t_dynamic) in
+
+	let this_t = TInst(cl, List.map snd cl.cl_params) in
+	let this = { eexpr = TConst(TThis); etype = this_t; epos = pos } in
+
+	let mk_this_call_raw name fun_t params =
+		{ eexpr = TCall( { (mk_field_access gen this name pos) with etype = fun_t }, params ); etype = snd (get_fun fun_t); epos = pos }
+	in
+
+	let extends_hxobject = extends_hxobject cl in
+	ignore extends_hxobject;
+
+	(* creates a invokeField of the class fields listed here *)
+	(*
+		function invokeField(field, dynargs)
+		{
+			switch(field)
+			{
+				case "a": this.a(dynargs[0], dynargs[1], dynargs[2]...);
+				default: super.invokeField //or this.getField(field).invokeDynamic(dynargs)
+			}
+		}
+	*)
+
+	let dyn_fun = mk_class_field (mk_internal_name "hx" "invokeField") fun_t false cl.cl_pos (Method MethNormal) [] in
+
+	let mk_switch_dyn cfs old =
+		let get_case (names,cf) =
+			has_method := true;
+			let i = ref 0 in
+			let dyn_arg_local = mk_local dynamic_arg pos in
+			let cases = List.map (switch_case ctx pos) names in
+
+			let mk_this_call cf params =
+				let t = apply_params cf.cf_params (List.map (fun _ -> t_dynamic) cf.cf_params) cf.cf_type in
+				mk_this_call_raw cf.cf_name t params
+			in
+			(cases,
+				mk_return (
+					mk_this_call cf (List.map (fun (name,_,t) ->
+						let ret = { eexpr = TArray(dyn_arg_local, make_int ctx.rcf_gen.gcon.basic !i pos); etype = t_dynamic; epos = pos } in
+						incr i;
+						ret
+					) (fst (get_fun (cf.cf_type))))
+				)
+			)
+		in
+
+		let cfs = List.filter (fun (_,cf) -> match cf.cf_kind with
+			| Method _ -> if List.memq cf cl.cl_overrides then false else true
+			| _ -> true) cfs
+		in
+
+		let cases = List.map get_case cfs in
+		let cases = match old with
+			| [] -> cases
+			| _ ->
+				let ncases = List.map (fun cf -> switch_case ctx pos cf.cf_name) old in
+				( ncases, mk_return (slow_invoke this (mk_local (fst (List.hd field_args)) pos) (mk_local dynamic_arg pos)) ) :: cases
+		in
+
+		let default = if !is_override then
+			mk_return (call_super ctx all_args t_dynamic dyn_fun cl this_t pos)
+		else (
+			let field = begin
+				let fun_name = mk_internal_name "hx" "getField" in
+				let tf_args, _ = field_type_args ctx pos in
+				let tf_args, args = fun_args tf_args, field_args_exprs in
+
+				let tf_args, args = tf_args @ ["throwErrors",false, basic.tbool],       args @ [make_bool gen.gcon.basic true pos] in
+				let tf_args, args = tf_args @ ["isCheck", false, basic.tbool],          args @ [make_bool gen.gcon.basic false pos] in
+				let tf_args, args = tf_args @ ["handleProperties", false, basic.tbool], args @ [make_bool gen.gcon.basic false pos] in
+
+				mk (TCall ({ (mk_field_access gen this fun_name pos) with etype = TFun(tf_args, t_dynamic) }, args)) t_dynamic pos
+			end in
+			let field = mk_cast (TInst(ctx.rcf_ft.func_class,[])) field in
+			mk_return {
+				eexpr = TCall(
+					mk_field_access gen field (mk_internal_name "hx" "invokeDynamic") pos,
+					[mk_local dynamic_arg pos]);
+				etype = t_dynamic;
+				epos = pos
+			} )
+		in
+
+		{
+			eexpr = TSwitch(mk_local switch_var pos, cases, Some default);
+			etype = basic.tvoid;
+			epos = pos;
+		}
+	in
+
+	let contents =
+		let nonstatics = collect_fields cl (Some true) in
+
+		let old_nonstatics = ref [] in
+
+		let nonstatics =
+			List.filter (fun (n,cf) ->
+				let is_old = not (PMap.mem cf.cf_name cl.cl_fields) || List.memq cf cl.cl_overrides in
+				(if is_old then old_nonstatics := cf :: !old_nonstatics);
+				not is_old
+			) nonstatics
+		in
+
+		mk_switch_dyn nonstatics !old_nonstatics
+	in
+
+	dyn_fun.cf_expr <- Some
+		{
+			eexpr = TFunction(
+			{
+				tf_args = all_args;
+				tf_type = t_dynamic;
+				tf_expr = mk_block contents;
+			});
+			etype = TFun(fun_args all_args, t_dynamic);
+			epos = pos;
+		};
+	if !is_override && not (!has_method) then () else begin
+		cl.cl_ordered_fields <- cl.cl_ordered_fields @ [dyn_fun];
+		cl.cl_fields <- PMap.add dyn_fun.cf_name dyn_fun cl.cl_fields;
+		(if !is_override then cl.cl_overrides <- dyn_fun :: cl.cl_overrides)
+	end
+
+let implement_varargs_cl ctx cl =
+	let pos = cl.cl_pos in
+	let gen = ctx.rcf_gen in
+
+	let this_t = TInst(cl, List.map snd cl.cl_params) in
+	let this = { eexpr = TConst(TThis); etype = this_t ; epos = pos } in
+	let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
+
+	let invokedyn = mk_internal_name "hx" "invokeDynamic" in
+	let idyn_t = TFun([mk_internal_name "fn" "dynargs", false, gen.gclasses.nativearray t_dynamic], t_dynamic) in
+	let this_idyn = mk_this invokedyn idyn_t in
+
+	let map_fn arity ret vars api =
+
+		let rec loop i acc =
+			if i < 0 then
+				acc
+			else
+				let obj = api i t_dynamic None in
+				loop (i - 1) (obj :: acc)
+		in
+
+		let call_arg = if arity = (-1) then
+			api (-1) t_dynamic None
+		else if arity = 0 then
+			null (gen.gclasses.nativearray t_empty) pos
+		else
+			mk_nativearray_decl gen t_empty (loop (arity - 1) []) pos
+		in
+
+		let expr = {
+			eexpr = TCall(
+				this_idyn,
+				[ call_arg ]
+			);
+			etype = t_dynamic;
+			epos = pos
+		} in
+
+		let expr = if like_float ret && not (like_int ret) then mk_cast ret expr else expr in
+
+		mk_return expr
+	in
+
+	let all_cfs = List.filter (fun cf -> cf.cf_name <> "new" && cf.cf_name <> (invokedyn) && match cf.cf_kind with Method _ -> true | _ -> false) (ctx.rcf_ft.map_base_classfields cl map_fn) in
+
+	cl.cl_ordered_fields <- cl.cl_ordered_fields @ all_cfs;
+	List.iter (fun cf ->
+		cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields
+	) all_cfs;
+
+	List.iter (fun cf ->
+		cl.cl_overrides <- cf :: cl.cl_overrides
+	) cl.cl_ordered_fields
+
+let implement_closure_cl ctx cl =
+	let pos = cl.cl_pos in
+	let gen = ctx.rcf_gen in
+	let basic = gen.gcon.basic in
+
+	let field_args, _ = field_type_args ctx pos in
+	let obj_arg = alloc_var "target" (TInst(ctx.rcf_object_iface, [])) in
+
+	let this_t = TInst(cl, List.map snd cl.cl_params) in
+	let this = { eexpr = TConst(TThis); etype = this_t ; epos = pos } in
+	let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
+
+	let tf_args = field_args @ [obj_arg, None] in
+	let cfs, ctor_body = List.fold_left (fun (acc_cf,acc_expr) (v,_) ->
+		let cf = mk_class_field v.v_name v.v_type false pos (Var { v_read = AccNormal; v_write = AccNormal } ) [] in
+		let expr = { eexpr = TBinop(Ast.OpAssign, mk_this v.v_name v.v_type, mk_local v pos); etype = v.v_type; epos = pos } in
+		(cf :: acc_cf, expr :: acc_expr)
+	) ([], [])	tf_args in
+
+	let map_fn arity ret vars api =
+		let this_obj = mk_this "target" (TInst(ctx.rcf_object_iface, [])) in
+
+		let rec loop i acc =
+			if i < 0 then
+				acc
+			else
+				let obj = api i t_dynamic None in
+				loop (i - 1) (obj :: acc)
+		in
+
+		let call_arg = if arity = (-1) then
+			api (-1) t_dynamic None
+		else if arity = 0 then
+			null (gen.gclasses.nativearray t_empty) pos
+		else
+			mk_nativearray_decl gen t_empty  (loop (arity - 1) []) pos
+		in
+
+		let expr = {
+			eexpr = TCall(
+				mk_field_access gen this_obj (mk_internal_name "hx" "invokeField") pos,
+				(List.map (fun (v,_) -> mk_this v.v_name v.v_type) field_args) @ [ call_arg ]
+			);
+			etype = t_dynamic;
+			epos = pos
+		} in
+
+		let expr = if like_float ret && not (like_int ret) then mk_cast ret expr else expr in
+
+		mk_return expr
+	in
+
+	let all_cfs = List.filter (fun cf -> cf.cf_name <> "new" && match cf.cf_kind with Method _ -> true | _ -> false) (ctx.rcf_ft.map_base_classfields cl map_fn) in
+
+	List.iter (fun cf ->
+		cl.cl_overrides <- cf :: cl.cl_overrides
+	) all_cfs;
+	let all_cfs = cfs @ all_cfs in
+
+	cl.cl_ordered_fields <- cl.cl_ordered_fields @ all_cfs;
+	List.iter (fun cf ->
+		cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields
+	) all_cfs;
+
+	let ctor_t = TFun(fun_args tf_args, basic.tvoid) in
+	let ctor_cf = mk_class_field "new" ctor_t true pos (Method MethNormal) [] in
+	ctor_cf.cf_expr <- Some {
+		eexpr = TFunction({
+			tf_args = tf_args;
+			tf_type = basic.tvoid;
+			tf_expr = { eexpr = TBlock({
+				eexpr = TCall({ eexpr = TConst(TSuper); etype = TInst(cl,[]); epos = pos }, [make_int ctx.rcf_gen.gcon.basic (-1) pos; make_int ctx.rcf_gen.gcon.basic (-1) pos]);
+				etype = basic.tvoid;
+				epos = pos
+			} :: ctor_body); etype = basic.tvoid; epos = pos }
+		});
+		etype = ctor_t;
+		epos = pos
+	};
+
+	cl.cl_constructor <- Some ctor_cf;
+
+	let closure_fun eclosure e field is_static =
+		let f = make_string gen.gcon.basic field eclosure.epos in
+		let args = if ctx.rcf_optimize then [ f; { eexpr = TConst(TInt (hash_field_i32 ctx eclosure.epos field)); etype = basic.tint; epos = eclosure.epos } ] else [ f ] in
+		let args = args @ [ mk_cast (TInst(ctx.rcf_object_iface, [])) e ] in
+
+		{ eclosure with eexpr = TNew(cl,[],args) }
+	in
+	closure_fun
+
+let get_closure_func ctx closure_cl =
+	let gen = ctx.rcf_gen in
+	let basic = gen.gcon.basic in
+	let closure_func eclosure e field is_static =
+		mk_cast eclosure.etype { eclosure with
+			eexpr = TNew(closure_cl, [], [
+				e;
+				make_string gen.gcon.basic field eclosure.epos
+			] @ (
+				if ctx.rcf_optimize then [ { eexpr = TConst(TInt (hash_field_i32 ctx eclosure.epos field)); etype = basic.tint; epos = eclosure.epos } ] else []
+			));
+			etype = TInst(closure_cl,[])
+		}
+	in
+	closure_func
+
+(*
+		main expr -> field expr -> field string -> possible set expr -> should_throw_exceptions -> changed expression
+
+		Changes a get / set
+	*
+	mutable rcf_on_getset_field : texpr->texpr->string->texpr option->bool->texpr;*)
+
+let configure_dynamic_field_access ctx =
+	let gen = ctx.rcf_gen in
+	let is_dynamic fexpr field =
+		match (field_access_esp gen (gen.greal_type fexpr.etype) field) with
+		| FEnumField _
+		| FClassField _ -> false
+		| _ -> true
+	in
+
+	let maybe_hash = if ctx.rcf_optimize then fun str pos -> Some (hash_field_i32 ctx pos str) else fun str pos -> None in
+	DynamicFieldAccess.configure gen is_dynamic
+		(fun expr fexpr field set is_unsafe ->
+			let hash = maybe_hash field fexpr.epos in
+			ctx.rcf_on_getset_field expr fexpr field hash set is_unsafe
+		)
+		(fun ecall fexpr field call_list ->
+			let hash = maybe_hash field fexpr.epos in
+			ctx.rcf_on_call_field ecall fexpr field hash call_list
+		);
+	()
+
+
+(* ******************************************* *)
+(* UniversalBaseClass *)
+(* ******************************************* *)
+(*
+	Sets the universal base class for hxgen types (HxObject / IHxObject)
+
+	dependencies:
+		As a rule, it should be one of the last module filters to run so any @:hxgen class created in the process
+		-Should- only run after RealTypeParams.Modf
+*)
+module UniversalBaseClass =
+struct
+	let name = "rcf_universal_base_class"
+	let priority = min_dep +. 10.
+
+	let configure gen baseclass baseinterface basedynamic =
+		let rec run md =
+			if is_hxgen md then
+				match md with
+				| TClassDecl ({ cl_interface = true } as cl) when cl.cl_path <> baseclass.cl_path && cl.cl_path <> baseinterface.cl_path && cl.cl_path <> basedynamic.cl_path ->
+					cl.cl_implements <- (baseinterface, []) :: cl.cl_implements
+				| TClassDecl ({ cl_kind = KAbstractImpl _ }) ->
+					(* don't add any base classes to abstract implementations *)
+					()
+				| TClassDecl ({ cl_super = None } as cl) when cl.cl_path <> baseclass.cl_path && cl.cl_path <> baseinterface.cl_path && cl.cl_path <> basedynamic.cl_path ->
+					cl.cl_super <- Some (baseclass,[])
+				| TClassDecl ({ cl_super = Some(super,_) } as cl) when cl.cl_path <> baseclass.cl_path && cl.cl_path <> baseinterface.cl_path && not (is_hxgen (TClassDecl super)) ->
+					cl.cl_implements <- (baseinterface, []) :: cl.cl_implements
+				| _ ->
+					()
+		in
+		let map md = run md; md in
+		gen.gmodule_filters#add name (PCustom priority) map
+end;;
+
+
+(*
+	Priority: must run AFTER UniversalBaseClass
+*)
+let priority = solve_deps name [DAfter UniversalBaseClass.priority]
+
+let add_override cl cf =
+	if List.memq cf cl.cl_overrides then
+		cl.cl_overrides
+	else
+		cf :: cl.cl_overrides
+
+let has_field_override cl name =
+	try
+		cl.cl_overrides <- add_override cl (PMap.find name cl.cl_fields);
+		true
+	with | Not_found ->
+		false
+
+let configure ctx baseinterface ~slow_invoke =
+	let run md =
+		(match md with
+		| TClassDecl ({ cl_extern = false } as cl) when is_hxgen md && ( not cl.cl_interface || cl.cl_path = baseinterface.cl_path ) && (match cl.cl_kind with KAbstractImpl _ -> false | _ -> true) ->
+			if is_some cl.cl_super then begin
+				ignore (has_field_override cl (mk_internal_name "hx" "setField"));
+				ignore (has_field_override cl (mk_internal_name "hx" "setField_f"));
+				ignore (has_field_override cl (mk_internal_name "hx" "getField_f"));
+			end;
+
+			if not (has_field_override cl (mk_internal_name "hx" "lookupField")) then implement_final_lookup ctx cl;
+			if not (has_field_override cl (mk_internal_name "hx" "getField")) then implement_get_set ctx cl;
+			if not (has_field_override cl (mk_internal_name "hx" "invokeField")) then implement_invokeField ctx slow_invoke cl;
+			if not (has_field_override cl (mk_internal_name "hx" "getFields")) then implement_getFields ctx cl;
+		| _ -> ());
+		md
+	in
+	ctx.rcf_gen.gmodule_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/renameTypeParameters.ml b/src/codegen/gencommon/renameTypeParameters.ml
new file mode 100644
index 0000000000000000000000000000000000000000..716aae029e40d898f54b32d0ae3a0c59c93855d5
--- /dev/null
+++ b/src/codegen/gencommon/renameTypeParameters.ml
@@ -0,0 +1,101 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Type
+
+(* ******************************************* *)
+(* Rename Type Parameters *)
+(* ******************************************* *)
+(*
+	This module should run after everything is already applied,
+	it will look for possible type parameter name clashing and change the classes names to a
+*)
+let run types =
+	let i = ref 0 in
+	let found_types = ref PMap.empty in
+	let check_type name on_changed =
+		let rec loop name =
+			incr i;
+			let changed_name = (name ^ (string_of_int !i)) in
+			if PMap.mem changed_name !found_types then loop name else changed_name
+		in
+		if PMap.mem name !found_types then begin
+			let new_name = loop name in
+			found_types := PMap.add new_name true !found_types;
+			on_changed new_name
+		end else found_types := PMap.add name true !found_types
+	in
+
+	let get_cls t =
+		match follow t with
+		| TInst(cl,_) -> cl
+		| _ -> assert false
+	in
+
+	let iter_types (nt,t) =
+		let cls = get_cls t in
+		let orig = cls.cl_path in
+		check_type (snd orig) (fun name -> cls.cl_path <- (fst orig, name))
+	in
+
+	let save_params save params =
+		List.fold_left (fun save (_,t) ->
+			let cls = get_cls t in
+			(cls.cl_path,t) :: save) save params
+	in
+
+	List.iter (function
+		| TClassDecl cl ->
+			i := 0;
+
+			let save = [] in
+
+			found_types := PMap.empty;
+			let save = save_params save cl.cl_params in
+			List.iter iter_types cl.cl_params;
+			let cur_found_types = !found_types in
+			let save = ref save in
+			List.iter (fun cf ->
+				found_types := cur_found_types;
+				save := save_params !save cf.cf_params;
+				List.iter iter_types cf.cf_params
+			) (cl.cl_ordered_fields @ cl.cl_ordered_statics);
+
+			if !save <> [] then begin
+				let save = !save in
+				let res = cl.cl_restore in
+				cl.cl_restore <- (fun () ->
+					res();
+					List.iter (fun (path,t) ->
+						let cls = get_cls t in
+						cls.cl_path <- path) save
+				);
+			end
+
+		| TEnumDecl ( ({ e_params = hd :: tl }) ) ->
+			i := 0;
+			found_types := PMap.empty;
+			List.iter iter_types (hd :: tl)
+
+		| TAbstractDecl { a_params = hd :: tl } ->
+			i := 0;
+			found_types := PMap.empty;
+			List.iter iter_types (hd :: tl)
+
+		| _ -> ()
+	) types
diff --git a/src/codegen/gencommon/setHXGen.ml b/src/codegen/gencommon/setHXGen.ml
new file mode 100644
index 0000000000000000000000000000000000000000..dd9be5f5285d415e2d180560fe83dd6d7ea39a1e
--- /dev/null
+++ b/src/codegen/gencommon/setHXGen.ml
@@ -0,0 +1,101 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Type
+
+(* ******************************************* *)
+(* set hxgen module *)
+(* ******************************************* *)
+(*
+	Goes through all module types and adds the @:hxGen or @:nativeGen meta to them.
+	Basically, everything that is extern is assumed to not be hxgen, unless meta :hxGen is set,
+	and everything that is not extern is assumed to be hxgen, unless meta :nativeGgen is set.
+*)
+
+(*
+	The only option is to run this filter eagerly, because it must be one of the first filters to run,
+	since many others depend of it.
+*)
+let run_filter com types =
+	let rec is_hxgen md =
+		match md with
+		| TClassDecl { cl_kind = KAbstractImpl a } ->
+			is_hxgen (TAbstractDecl a)
+		| TClassDecl cl ->
+			let rec is_hxgen_class (c,_) =
+				if c.cl_extern then begin
+					if Meta.has Meta.HxGen c.cl_meta then
+						true
+					else
+						Option.map_default (is_hxgen_class) false c.cl_super || List.exists is_hxgen_class c.cl_implements
+				end else begin
+					if Meta.has Meta.NativeChildren c.cl_meta || Meta.has Meta.NativeGen c.cl_meta || Meta.has Meta.Struct c.cl_meta then
+						Option.map_default is_hxgen_class false c.cl_super || List.exists is_hxgen_class c.cl_implements
+					else
+						let rec has_nativec (c,p) =
+							if is_hxgen_class (c,p) then
+								false
+							else if Meta.has Meta.Struct c.cl_meta then begin
+								com.error ("Struct types cannot be subclassed") c.cl_pos;
+								true
+							end else
+								(Meta.has Meta.NativeChildren c.cl_meta && not (Option.map_default is_hxgen_class false c.cl_super || List.exists is_hxgen_class c.cl_implements))
+								|| Option.map_default has_nativec false c.cl_super
+						in
+						if Option.map_default has_nativec false c.cl_super && not (List.exists is_hxgen_class c.cl_implements) then
+							false
+						else
+							true
+				end
+			in
+			is_hxgen_class (cl,[])
+		| TEnumDecl e ->
+			if e.e_extern then
+				Meta.has Meta.HxGen e.e_meta
+			else if Meta.has Meta.NativeGen e.e_meta then
+				if Meta.has Meta.FlatEnum e.e_meta then
+					false
+				else begin
+					com.error "Only flat enums may be @:nativeGen" e.e_pos;
+					true
+				end
+			else
+				true
+		| TAbstractDecl a when Meta.has Meta.CoreType a.a_meta ->
+			not (Meta.has Meta.NativeGen a.a_meta)
+		| TAbstractDecl a ->
+			(match follow a.a_this with
+			| TInst _ | TEnum _ | TAbstract _ ->
+				is_hxgen (module_type_of_type (follow a.a_this))
+			| _ ->
+				not (Meta.has Meta.NativeGen a.a_meta))
+		| TTypeDecl t -> (* TODO see when would we use this *)
+			false
+	in
+
+	let filter md =
+		let meta = if is_hxgen md then Meta.HxGen else Meta.NativeGen in
+		match md with
+		| TClassDecl cl -> cl.cl_meta <- (meta, [], cl.cl_pos) :: cl.cl_meta
+		| TEnumDecl e -> e.e_meta <- (meta, [], e.e_pos) :: e.e_meta
+		| TTypeDecl t -> t.t_meta <- (meta, [], t.t_pos) :: t.t_meta
+		| TAbstractDecl a -> a.a_meta <- (meta, [], a.a_pos) :: a.a_meta
+	in
+
+	List.iter filter types
diff --git a/src/codegen/gencommon/switchToIf.ml b/src/codegen/gencommon/switchToIf.ml
new file mode 100644
index 0000000000000000000000000000000000000000..01803c44e0054ff994d52bc59dfe691fff9ea0a1
--- /dev/null
+++ b/src/codegen/gencommon/switchToIf.ml
@@ -0,0 +1,162 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Type
+open Codegen
+open Gencommon
+
+(* ******************************************* *)
+(* SwitchToIf *)
+(* ******************************************* *)
+(*
+	A syntax filter which changes switch expressions to if() else if() else if() ...
+
+	Also it handles switches on native enums (which are not converted to classes) by
+	rewriting the switch expression to what's supported directly by the targets.
+*)
+let name = "switch_to_if"
+let priority = solve_deps name []
+
+let rec simplify_expr e =
+	match e.eexpr with
+	| TParenthesis e | TMeta (_, e) -> simplify_expr e
+	| _ -> e
+
+let configure gen (should_convert:texpr->bool) =
+	let basic = gen.gcon.basic in
+	let rec run e =
+		match e.eexpr with
+		| TSwitch (cond, cases, default) when should_convert e ->
+			let cond_etype, should_cache =
+				match gen.gfollow#run_f cond.etype with
+				| TAbstract ({ a_path = [], "Null" }, [t]) ->
+					let rec take_off_nullable t =
+						match gen.gfollow#run_f t with
+						| TAbstract ({ a_path = [], "Null" }, [t]) -> take_off_nullable t
+						| _ -> t
+					in
+					take_off_nullable t, true
+				| _ ->
+					cond.etype, false
+			in
+
+			if should_cache && not (should_convert { e with eexpr = TSwitch ({ cond with etype = cond_etype }, cases, default) }) then begin
+				{ e with eexpr = TSwitch (mk_cast cond_etype (run cond), List.map (fun (cs,e) -> (List.map run cs, run e)) cases, Option.map run default) }
+			end else begin
+				let local, fst_block =
+					match cond.eexpr, should_cache with
+					| TLocal _, false ->
+						cond, []
+					| _ ->
+						let var = mk_temp "switch" cond_etype in
+						let cond = run cond in
+						let cond = if should_cache then mk_cast cond_etype cond else cond in
+						mk_local var cond.epos, [ mk (TVar (var,Some cond)) basic.tvoid cond.epos ]
+				in
+
+				let mk_eq cond =
+					mk (TBinop (Ast.OpEq, local, cond)) basic.tbool cond.epos
+				in
+
+				let rec mk_many_cond conds =
+					match conds with
+					| cond :: [] ->
+						mk_eq cond
+					| cond :: tl ->
+						mk (TBinop (Ast.OpBoolOr, mk_eq (run cond), mk_many_cond tl)) basic.tbool cond.epos
+					| [] ->
+						assert false
+				in
+
+				let mk_many_cond conds =
+					let ret = mk_many_cond conds in
+					(*
+						this might be considered a hack. But since we're on a syntax filter and
+						the condition is guaranteed to not have run twice, we can really run the
+						expr filters again for it (to change e.g. OpEq accordingly)
+					*)
+					gen.gexpr_filters#run ret
+				in
+
+				let rec loop cases =
+					match cases with
+					| (conds, e) :: [] ->
+						mk (TIf (mk_many_cond conds, run e, Option.map run default)) e.etype e.epos
+					| (conds, e) :: tl ->
+						mk (TIf (mk_many_cond conds, run e, Some (loop tl))) e.etype e.epos
+					| [] ->
+						match default with
+						| None ->
+							raise Exit
+						| Some d ->
+							run d
+				in
+
+				try
+					{ e with eexpr = TBlock (fst_block @ [loop cases]) }
+				with Exit ->
+					{ e with eexpr = TBlock [] }
+			end
+
+		(*
+			Convert a switch on a non-class enum (e.g. native enums) to the native switch,
+			effectively chancing `switch enumIndex(e) { case 1: ...; case 2: ...; }` to
+			`switch e { case MyEnum.A: ...; case MyEnum.B: ...; }`, which is supported natively
+			by some target languages like Java and C#.
+		*)
+		| TSwitch (cond, cases, default) ->
+			begin
+				try
+					match (simplify_expr cond).eexpr with
+					| TEnumIndex enum
+					| TCall  ({ eexpr = TField (_, FStatic ({ cl_path = [],"Type" }, { cf_name = "enumIndex" })) }, [enum]) ->
+						let real_enum =
+							match enum.etype with
+							| TEnum (e, _) -> e
+							| _ -> raise Not_found
+						in
+						if Meta.has Meta.Class real_enum.e_meta then
+							raise Not_found;
+
+						let fields = Hashtbl.create (List.length real_enum.e_names) in
+						PMap.iter (fun _ ef -> Hashtbl.add fields ef.ef_index ef) real_enum.e_constrs;
+
+						let enum_expr = Texpr.Builder.make_typeexpr (TEnumDecl real_enum) e.epos in
+						let cases = List.map (fun (patterns, body) ->
+							let patterns = List.map (fun e ->
+								match e.eexpr with
+								| TConst (TInt i) ->
+									let ef = Hashtbl.find fields (Int32.to_int i) in
+									{ e with eexpr = TField (enum_expr, FEnum (real_enum, ef)); etype = TEnum (real_enum, List.map (fun _ -> t_dynamic) real_enum.e_params) }
+								| _ ->
+									raise Not_found
+							) patterns in
+							let body = run body in
+							patterns, body
+						) cases in
+						{ e with eexpr = TSwitch (enum, cases, Option.map run default) }
+					| _ ->
+						raise Not_found
+				with Not_found ->
+					Type.map_expr run e
+			end
+		| _ ->
+			Type.map_expr run e
+	in
+	gen.gsyntax_filters#add name (PCustom priority) run
diff --git a/src/codegen/gencommon/tArrayTransform.ml b/src/codegen/gencommon/tArrayTransform.ml
new file mode 100644
index 0000000000000000000000000000000000000000..60e36304e58c594769cf520b9eb182451d0cff88
--- /dev/null
+++ b/src/codegen/gencommon/tArrayTransform.ml
@@ -0,0 +1,104 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Ast
+open Type
+open Gencommon
+
+(* ******************************************* *)
+(* Dynamic TArray Handling *)
+(* ******************************************* *)
+(*
+	In some languages you cannot overload the [] operator,
+	so we need to decide what is kept as TArray and what gets mapped.
+
+	depends on:
+		(syntax) must run before expression/statment normalization because it may generate complex expressions
+		(ok) must run before binop transformations because it may generate some untreated binop ops
+		(ok) must run before dynamic field access is transformed into reflection
+*)
+let name = "dyn_tarray"
+let priority = solve_deps name [DBefore DynamicOperators.priority; DBefore DynamicFieldAccess.priority]
+
+(* should change signature: tarray expr -> binop operation -> should change? *)
+let configure gen (should_change:texpr->Ast.binop option->bool) (get_fun:string) (set_fun:string) =
+	let basic = gen.gcon.basic in
+	let mk_get e e1 e2 =
+		let efield = mk_field_access gen e1 get_fun e.epos in
+		{ e with eexpr = TCall(efield, [e2]) }
+	in
+	let mk_set e e1 e2 evalue =
+		let efield = mk_field_access gen e1 set_fun e.epos in
+		{ e with eexpr = TCall(efield, [e2; evalue]) }
+	in
+	let rec run e =
+		match e.eexpr with
+			| TArray(e1, e2) ->
+				(* e1 should always be a var; no need to map there *)
+				if should_change e None then mk_get e (run e1) (run e2) else Type.map_expr run e
+			| TBinop (Ast.OpAssign, ({ eexpr = TArray(e1a,e2a) } as earray), evalue) when should_change earray (Some Ast.OpAssign) ->
+				mk_set e (run e1a) (run e2a) (run evalue)
+			| TBinop (Ast.OpAssignOp op,({ eexpr = TArray(e1a,e2a) } as earray) , evalue) when should_change earray (Some (Ast.OpAssignOp op)) ->
+				(* cache all arguments in vars so they don't get executed twice *)
+				(* let ensure_local gen block name e = *)
+				let block = ref [] in
+
+				let arr_local = ensure_local gen.gcon block "array" (run e1a) in
+				let idx_local = ensure_local gen.gcon block "index" (run e2a) in
+				block := (mk_set e arr_local idx_local ( { e with eexpr=TBinop(op, mk_get earray arr_local idx_local, run evalue) } )) :: !block;
+
+				{ e with eexpr = TBlock (List.rev !block) }
+			| TUnop(op, flag, ({ eexpr = TArray(e1a, e2a) } as earray)) ->
+				if should_change earray None && match op with | Not | Neg -> false | _ -> true then begin
+
+					let block = ref [] in
+
+					let actual_t = match op with
+						| Ast.Increment | Ast.Decrement -> (match follow earray.etype with
+							| TInst _ | TAbstract _ | TEnum _ -> earray.etype
+							| _ -> basic.tfloat)
+						| Ast.Not -> basic.tbool
+						| _ -> basic.tint
+					in
+
+					let val_v = mk_temp "arrVal" actual_t in
+					let ret_v = mk_temp "arrRet" actual_t in
+
+					let arr_local = ensure_local gen.gcon block "arr" (run e1a) in
+					let idx_local = ensure_local gen.gcon block "arrIndex" (run e2a) in
+
+					let val_local = { earray with eexpr = TLocal(val_v) } in
+					let ret_local = { earray with eexpr = TLocal(ret_v) } in
+					(* var idx = 1; var val = x._get(idx); var ret = val++; x._set(idx, val); ret; *)
+					block := { eexpr = TVar(val_v, Some(mk_get earray arr_local idx_local)); (* var val = x._get(idx) *)
+											etype = gen.gcon.basic.tvoid;
+											epos = e2a.epos
+										} :: !block;
+					block := { eexpr = TVar(ret_v, Some { e with eexpr = TUnop(op, flag, val_local) }); (* var ret = val++ *)
+											etype = gen.gcon.basic.tvoid;
+											epos = e2a.epos
+										} :: !block;
+					block := (mk_set e arr_local idx_local val_local) (*x._set(idx,val)*) :: !block;
+					block := ret_local :: !block;
+					{ e with eexpr = TBlock (List.rev !block) }
+				end else
+					Type.map_expr run e
+			| _ -> Type.map_expr run e
+	in
+	gen.gexpr_filters#add "dyn_tarray" (PCustom priority) run
diff --git a/src/codegen/gencommon/unnecessaryCastsRemoval.ml b/src/codegen/gencommon/unnecessaryCastsRemoval.ml
new file mode 100644
index 0000000000000000000000000000000000000000..8fced4edb0c03c551b559aa583a23369266cdb11
--- /dev/null
+++ b/src/codegen/gencommon/unnecessaryCastsRemoval.ml
@@ -0,0 +1,60 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Gencommon
+open Type
+
+(*
+	This module will take care of simplifying unnecessary casts, specially those made by the compiler
+	when inlining. Right now, it will only take care of casts used as a statement, which are always useless;
+
+	TODO: Take care of more cases, e.g. when the to and from types are the same
+
+	dependencies:
+		This must run after CastDetection, but before ExpressionUnwrap
+*)
+let rec take_off_cast run e =
+	match e.eexpr with
+	| TCast (c, _) -> take_off_cast run c
+	| _ -> run e
+
+let rec traverse e =
+	match e.eexpr with
+	| TBlock bl ->
+		let bl = List.map (take_off_cast traverse) bl in
+		{ e with eexpr = TBlock bl }
+	| TTry (block, catches) ->
+		{ e with eexpr = TTry(traverse (mk_block block), List.map (fun (v,block) -> (v, traverse (mk_block block))) catches) }
+	| TSwitch (cond,el_e_l, default) ->
+		{ e with eexpr = TSwitch(cond, List.map (fun (el,e) -> (el, traverse (mk_block e))) el_e_l, Option.map (fun e -> traverse (mk_block e)) default) }
+	| TWhile (cond,block,flag) ->
+		{e with eexpr = TWhile(cond,traverse (mk_block block), flag) }
+	| TIf (cond, eif, eelse) ->
+		{ e with eexpr = TIf(cond, traverse (mk_block eif), Option.map (fun e -> traverse (mk_block e)) eelse) }
+	| TFor (v,it,block) ->
+		{ e with eexpr = TFor(v,it, traverse (mk_block block)) }
+	| TFunction (tfunc) ->
+		{ e with eexpr = TFunction({ tfunc with tf_expr = traverse (mk_block tfunc.tf_expr) }) }
+	| _ ->
+		e (* if expression doesn't have a block, we will exit *)
+
+let name = "casts_removal"
+let priority = solve_deps name [DAfter CastDetect.priority; DBefore ExpressionUnwrap.priority]
+
+let configure gen =
+	gen.gsyntax_filters#add name (PCustom priority) traverse
diff --git a/src/codegen/gencommon/unreachableCodeEliminationSynf.ml b/src/codegen/gencommon/unreachableCodeEliminationSynf.ml
new file mode 100644
index 0000000000000000000000000000000000000000..718599481ae07d96be76551dfc1ed5f1ce10f5f3
--- /dev/null
+++ b/src/codegen/gencommon/unreachableCodeEliminationSynf.ml
@@ -0,0 +1,212 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Ast
+open Type
+open Gencommon
+
+(*
+	In some source code platforms, the code won't compile if there is Unreachable code, so this filter will take off any unreachable code.
+		If the parameter "handle_switch_break" is set to true, it will already add a "break" statement on switch cases when suitable;
+			in order to not confuse with while break, it will be a special expression __sbreak__
+		If the parameter "handle_not_final_returns" is set to true, it will also add final returns when functions are detected to be lacking of them.
+			(Will respect __fallback__ expressions)
+		If the parameter "java_mode" is set to true, some additional checks following the java unreachable specs
+			(http://docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.21) will be added
+
+	dependencies:
+		This must run before SwitchBreakSynf (see SwitchBreakSynf dependecy value)
+		This must be the LAST syntax filter to run. It expects ExpressionUnwrap to have run correctly, since this will only work for source-code based targets
+*)
+type uexpr_kind =
+	| Normal
+	| BreaksLoop
+	| BreaksFunction
+
+let aggregate_kind e1 e2 =
+	match e1, e2 with
+		| Normal, _
+		| _, Normal -> Normal
+		| BreaksLoop, _
+		| _, BreaksLoop -> BreaksLoop
+		| BreaksFunction, BreaksFunction -> BreaksFunction
+
+let aggregate_constant op c1 c2=
+	match op, c1, c2 with
+		| OpEq, Some v1, Some v2 -> Some (TBool (v1 = v2))
+		| OpNotEq, Some v1, Some v2 -> Some (TBool (v1 <> v2))
+		| OpBoolOr, Some (TBool v1) , Some (TBool v2) -> Some (TBool (v1 || v2))
+		| OpBoolAnd, Some (TBool v1) , Some (TBool v2) -> Some (TBool (v1 && v2))
+		| OpAssign, _, Some v2 -> Some v2
+		| _ -> None
+
+let rec get_constant_expr e =
+	match e.eexpr with
+		| TConst (v) -> Some v
+		| TBinop(op, v1, v2) -> aggregate_constant op (get_constant_expr v1) (get_constant_expr v2)
+		| TParenthesis(e) | TMeta(_,e) -> get_constant_expr e
+		| _ -> None
+
+let init com java_mode =
+	let should_warn = false in
+
+	let do_warn =
+		if should_warn then com.warning "Unreachable code" else (fun pos -> ())
+	in
+
+	let return_loop expr kind =
+		match kind with
+			| Normal | BreaksLoop -> expr, Normal
+			| _ -> expr, kind
+	in
+
+	let mk_sbreak = mk (TIdent "__sbreak__") t_dynamic in
+
+	let rec has_fallback expr = match expr.eexpr with
+		| TBlock(bl) -> (match List.rev bl with
+			| { eexpr = TIdent "__fallback__" } :: _ -> true
+			| ({ eexpr = TBlock(_) } as bl) :: _ -> has_fallback bl
+			| _ -> false)
+		| TIdent "__fallback__" -> true
+		| _ -> false
+	in
+
+	let handle_case = fun (expr,kind) ->
+		match kind with
+		| Normal when has_fallback expr -> expr
+		| Normal -> Type.concat expr (mk_sbreak expr.epos)
+		| BreaksLoop | BreaksFunction -> expr
+	in
+
+	let has_break = ref false in
+
+	let rec process_expr expr =
+		match expr.eexpr with
+			| TMeta (m,expr) ->
+				let expr,kind = process_expr expr in
+				{ expr with eexpr = TMeta (m, expr) }, kind
+			| TReturn _ | TThrow _ -> expr, BreaksFunction
+			| TContinue -> expr, BreaksLoop
+			| TBreak -> has_break := true; expr, BreaksLoop
+			| TCall( { eexpr = TIdent "__goto__" }, _ ) -> expr, BreaksLoop
+
+			| TBlock bl ->
+				let new_block = ref [] in
+				let is_unreachable = ref false in
+				let ret_kind = ref Normal in
+
+				List.iter (fun e ->
+					if !is_unreachable then
+						do_warn e.epos
+					else begin
+						let changed_e, kind = process_expr e in
+						new_block := changed_e :: !new_block;
+						match kind with
+							| BreaksLoop | BreaksFunction ->
+								ret_kind := kind;
+								is_unreachable := true
+							| _ -> ()
+					end
+				) bl;
+
+				{ expr with eexpr = TBlock(List.rev !new_block) }, !ret_kind
+			| TFunction tf ->
+				let changed, kind = process_expr tf.tf_expr in
+				let changed = if not (ExtType.is_void tf.tf_type) && kind <> BreaksFunction then
+					Type.concat changed (Texpr.Builder.mk_return (null tf.tf_type expr.epos))
+				else
+					changed
+				in
+
+				{ expr with eexpr = TFunction({ tf with tf_expr = changed }) }, Normal
+			| TFor(var, cond, block) ->
+				let last_has_break = !has_break in
+				has_break := false;
+
+				let changed_block, _ = process_expr block in
+				has_break := last_has_break;
+				let expr = { expr with eexpr = TFor(var, cond, changed_block) } in
+				return_loop expr Normal
+			| TIf(cond, eif, None) ->
+				if java_mode then
+					match get_constant_expr cond with
+						| Some (TBool true) ->
+							process_expr eif
+						| _ ->
+							{ expr with eexpr = TIf(cond, fst (process_expr eif), None) }, Normal
+				else
+					{ expr with eexpr = TIf(cond, fst (process_expr eif), None) }, Normal
+			| TIf(cond, eif, Some eelse) ->
+				let eif, eif_k = process_expr eif in
+				let eelse, eelse_k = process_expr eelse in
+				let k = aggregate_kind eif_k eelse_k in
+				{ expr with eexpr = TIf(cond, eif, Some eelse) }, k
+			| TWhile(cond, block, flag) ->
+				let last_has_break = !has_break in
+				has_break := false;
+
+				let block, k = process_expr block in
+				if java_mode then
+					match get_constant_expr cond, flag, !has_break with
+						| Some (TBool true), _, false ->
+							has_break := last_has_break;
+							{ expr with eexpr = TWhile(cond, block, flag) }, BreaksFunction
+						| Some (TBool false), NormalWhile, _ ->
+							has_break := last_has_break;
+							do_warn expr.epos;
+							null expr.etype expr.epos, Normal
+						| _ ->
+							has_break := last_has_break;
+							return_loop { expr with eexpr = TWhile(cond,block,flag) } Normal
+				else begin
+					has_break := last_has_break;
+					return_loop { expr with eexpr = TWhile(cond,block,flag) } Normal
+				end
+			| TSwitch(cond, el_e_l, None) ->
+				{ expr with eexpr = TSwitch(cond, List.map (fun (el, e) -> (el, handle_case (process_expr e))) el_e_l, None) }, Normal
+			| TSwitch(cond, el_e_l, Some def) ->
+				let def, k = process_expr def in
+				let def = handle_case (def, k) in
+				let k = ref k in
+				let ret = { expr with eexpr = TSwitch(cond, List.map (fun (el, e) ->
+					let e, ek = process_expr e in
+					k := aggregate_kind !k ek;
+					(el, handle_case (e, ek))
+				) el_e_l, Some def) } in
+				ret, !k
+			| TTry (e, catches) ->
+				let e, k = process_expr e in
+				let k = ref k in
+				let ret = { expr with eexpr = TTry(e, List.map (fun (v, e) ->
+					let e, ek = process_expr e in
+					k := aggregate_kind !k ek;
+					(v, e)
+				) catches) } in
+				ret, !k
+			| _ -> expr, Normal
+	in
+
+	let run e = fst (process_expr e) in
+	run
+
+let priority = min_dep -. 100.0
+
+let configure gen java_mode =
+	let run = init gen.gcon java_mode in
+	gen.gsyntax_filters#add "unreachable_synf" (PCustom priority) run
diff --git a/src/generators/genxml.ml b/src/codegen/genxml.ml
similarity index 51%
rename from src/generators/genxml.ml
rename to src/codegen/genxml.ml
index 5fa9b37f31023868fa2984fdeeb861acabb4bf3b..0fa5854421f40056b75e932ae7ffd5101990e884 100644
--- a/src/generators/genxml.ml
+++ b/src/codegen/genxml.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -60,7 +60,7 @@ let gen_arg_name (name,opt,_) =
 let real_path path meta =
 	let rec loop = function
 		| [] -> path
-		| (Meta.RealPath,[(Ast.EConst (Ast.String s),_)],_) :: _ -> parse_path s
+		| (Meta.RealPath,[(Ast.EConst (Ast.String(s,_)),_)],_) :: _ -> parse_path s
 		| _ :: l -> loop l
 	in
 	loop meta
@@ -75,8 +75,8 @@ let rec follow_param t =
 		(match !r with
 		| Some t -> follow_param t
 		| _ -> t)
-	| TType ({ t_path = [],"Null" } as t,tl) ->
-		follow_param (apply_params t.t_params tl t.t_type)
+	| TAbstract ({ a_path = [],"Null" },[t]) ->
+		follow_param t
 	| _ ->
 		t
 
@@ -86,7 +86,7 @@ let gen_meta meta =
 	| [] -> []
 	| _ ->
 		let nodes = List.map (fun (m,el,_) ->
-			node "m" ["n",Meta.to_string m] (List.map (fun e -> node "e" [] [gen_string (Ast.s_expr e)]) el)
+			node "m" ["n",Meta.to_string m] (List.map (fun e -> node "e" [] [gen_string (Ast.Printer.s_expr e)]) el)
 		) meta in
 		[node "meta" [] nodes]
 
@@ -107,7 +107,7 @@ let rec gen_type ?(values=None) t =
 					try
 						let e = PMap.find n values in
 						has_value := true;
-						let s = Ast.s_expr e in
+						let s = Ast.Printer.s_expr e in
 						s
 					with Not_found ->
 						""
@@ -121,9 +121,9 @@ let rec gen_type ?(values=None) t =
 			if opt then follow_param t else t
 		) args in
 		node "f" (("a",names) :: values) (List.map gen_type (args @ [r]))
-	| TAnon a -> node "a" [] (pmap (fun f -> gen_field [] { f with cf_public = false }) a.a_fields)
+	| TAnon a -> node "a" [] (pmap (fun f -> gen_field [] { f with cf_flags = unset_flag f.cf_flags (int_of_class_field_flag CfPublic) }) a.a_fields)
 	| TDynamic t2 -> node "d" [] (if t == t2 then [] else [gen_type t2])
-	| TLazy f -> gen_type (!f())
+	| TLazy f -> gen_type (lazy_type f)
 
 and gen_type_decl n t pl =
 	let i = t_infos t in
@@ -132,7 +132,7 @@ and gen_type_decl n t pl =
 and gen_field att f =
 	let add_get_set acc name att =
 		match acc with
-		| AccNormal | AccResolve | AccRequire _ -> att
+		| AccNormal | AccResolve | AccRequire _ | AccCtor -> att
 		| AccNo | AccNever -> (name, "null") :: att
 		| AccCall -> (name,"accessor") :: att
 		| AccInline -> (name,"inline") :: att
@@ -142,7 +142,7 @@ and gen_field att f =
 		| Var v ->
 			let att = try
 				begin match Meta.get Meta.Value f.cf_meta with
-					| (_,[e],_) -> ("expr",Ast.s_expr e) :: att
+					| (_,[e],_) -> ("expr",Ast.Printer.s_expr e) :: att
 					| _ -> att
 				end
 			with Not_found ->
@@ -165,13 +165,15 @@ and gen_field att f =
 	let field_name cf =
 		try
 			begin match Meta.get Meta.RealPath cf.cf_meta with
-				| _,[EConst (String (s)),_],_ -> s
+				| _,[EConst (String (s,_)),_],_ -> s
 				| _ -> raise Not_found
 			end;
 		with Not_found ->
 			cf.cf_name
 	in
-	node (field_name f) (if f.cf_public then ("public","1") :: att else att) (gen_type ~values:(Some values) f.cf_type :: gen_meta f.cf_meta @ gen_doc_opt f.cf_doc @ overloads)
+	let att = if has_class_field_flag f CfPublic then ("public","1") :: att else att in
+	let att = if has_class_field_flag f CfFinal then ("final","1") :: att else att in
+	node (field_name f) att (gen_type ~values:(Some values) f.cf_type :: gen_meta f.cf_meta @ gen_doc_opt f.cf_doc @ overloads)
 
 let gen_constr e =
 	let doc = gen_doc_opt e.ef_doc in
@@ -234,11 +236,7 @@ let rec gen_type_decl com pos t =
 		let meta = gen_meta c.cl_meta in
 		let ext = (if c.cl_extern then [("extern","1")] else []) in
 		let interf = (if c.cl_interface then [("interface","1")] else []) in
-		let dynamic = (match c.cl_dynamic with
-			| None -> []
-			| Some t -> [node "haxe_dynamic" [] [gen_type t]]
-		) in
-		node "class" (gen_type_params pos c.cl_private (tpath t) c.cl_params c.cl_pos m @ ext @ interf) (tree @ stats @ fields @ constr @ doc @ meta @ dynamic)
+		node "class" (gen_type_params pos c.cl_private (tpath t) c.cl_params c.cl_pos m @ ext @ interf) (tree @ stats @ fields @ constr @ doc @ meta)
 	| TEnumDecl e ->
 		let doc = gen_doc_opt e.e_doc in
 		let meta = gen_meta e.e_meta in
@@ -286,11 +284,12 @@ let rec write_xml ch tabs x =
 		IO.printf ch "<![CDATA[%s]]>" s
 
 let generate com file =
-	let t = Common.timer ["generate";"xml"] in
+	let t = Timer.timer ["generate";"xml"] in
 	let x = node "haxe" [] (List.map (gen_type_decl com true) (List.filter (fun t -> not (Meta.has Meta.NoDoc (t_infos t).mt_meta)) com.types)) in
 	t();
-	let t = Common.timer ["write";"xml"] in
+	let t = Timer.timer ["write";"xml"] in
 	let ch = IO.output_channel (open_out_bin file) in
+	IO.printf ch "<!-- This file can be parsed by haxe.rtti.XmlParser -->\n";
 	write_xml ch "" x;
 	IO.close_out ch;
 	t()
@@ -300,256 +299,3 @@ let gen_type_string ctx t =
 	let ch = IO.output_string() in
 	write_xml ch "" x;
 	IO.close_out ch
-
-
-(* -------------------------------------------------------------------------- *)
-(* PRINT HX FROM TYPE *)
-
-let rec create_dir acc = function
-	| [] -> ()
-	| d :: l ->
-		let path = acc ^ "/" ^ d in
-		(try Unix.mkdir path 0o777 with _ -> ());
-		create_dir path l
-
-let conv_path p =
-	match List.rev (fst p) with
-	| x :: l when x.[0] = '_' -> List.rev (("priv" ^ x) :: l), snd p
-	| _ -> p
-
-let get_real_path meta path =
-	try
-		let real_path = match Meta.get Meta.RealPath meta with
-			| (_,[(EConst(String s),_)],_) ->
-				s
-			| _ -> raise Not_found
-		in
-		match List.rev (String.nsplit real_path ".") with
-			| name :: pack ->
-				(List.rev pack), name
-			| _ -> raise Not_found
-	with | Not_found ->
-		path
-
-
-let generate_type com t =
-	let base_path = "hxclasses" in
-	let pack, name =
-		let info = t_infos t in
-		get_real_path info.mt_meta info.mt_path
-	in
-	create_dir "." (base_path :: pack);
-	match pack, name with
-	| ["flash";"net"], "NetStreamPlayTransitions"
-	| ["flash";"filters"], "BitmapFilterQuality"
-	| ["flash";"display"], ("BitmapDataChannel" | "GraphicsPathCommand")  -> ()
-	| _ ->
-	let f = open_out_bin (base_path ^ "/" ^ (match pack with [] -> "" | l -> String.concat "/" l ^ "/") ^ name ^ ".hx") in
-	let ch = IO.output_channel f in
-	let p fmt = IO.printf ch fmt in
-	if pack <> [] then IO.printf ch "package %s;\n\n" (String.concat "." pack);
-	let rec notnull t =
-		match t with
-		| TMono r ->
-			(match !r with
-			| None -> t
-			| Some t -> notnull t)
-		| TLazy f ->
-			notnull ((!f)())
-		| TType ({ t_path = [],"Null" },[t]) ->
-			t
-		| _ ->
-			t
-	in
-	let rec path meta p tl =
-		let p = conv_path (get_real_path meta p) in
-		(if fst p = pack then snd p else s_type_path p) ^ (match tl with [] -> "" | _ -> "<" ^ String.concat "," (List.map stype tl) ^ ">")
-	and stype t =
-		match t with
-		| TMono r ->
-			(match !r with
-			| None -> "Unknown"
-			| Some t -> stype t)
-		| TInst ({ cl_kind = KTypeParameter _ } as c,tl) ->
-			path [] ([],snd c.cl_path) tl
-		| TInst (c,tl) ->
-			path c.cl_meta c.cl_path tl
-		| TEnum (e,tl) ->
-			path e.e_meta e.e_path tl
-		| TType (t,tl) ->
-			path t.t_meta t.t_path tl
-		| TAbstract (a,tl) ->
-			path a.a_meta a.a_path tl
-		| TAnon a ->
-			let fields = PMap.fold (fun f acc -> (f.cf_name ^ " : " ^ stype f.cf_type) :: acc) a.a_fields [] in
-			"{" ^ String.concat ", " fields ^ "}"
-		| TLazy f ->
-			stype ((!f)())
-		| TDynamic t2 ->
-			if t == t2 then "Dynamic" else "Dynamic<" ^ stype t2 ^ ">"
-		| TFun ([],ret) ->
-			"Void -> " ^ ftype ret
-		| TFun (args,ret) ->
-			String.concat " -> " (List.map (fun (_,_,t) -> ftype t) args) ^ " -> " ^ ftype ret
-	and ftype t =
-		match t with
-		| TMono r ->
-			(match !r with
-			| None -> stype t
-			| Some t -> ftype t)
-		| TLazy f ->
-			ftype ((!f)())
-		| TFun _ ->
-			"(" ^ stype t ^ ")"
-		| _ ->
-			stype t
-	in
-	let sparam (n,v,t) =
-		match v with
-		| None ->
-			n ^ " : " ^ stype t
-		| Some (Ident "null") ->
-			if is_nullable (notnull t) then
-				"?" ^ n ^ " : " ^ stype (notnull t)
-			else
-				(* we have not found a default value stored in metadata, let's generate it *)
-				n ^ " : " ^ stype t ^ " = " ^ (match follow t with
-					| TAbstract ({ a_path = [],("Int"|"Float"|"UInt") },_) -> "0"
-					| TAbstract ({ a_path = [],"Bool" },_) -> "false"
-					| _ -> "null")
-		| Some v ->
-			n ^ " : " ^ stype t ^ " = " ^ (match s_constant v with "nan" -> "0./*NaN*/" | v -> v)
-	in
-	let print_meta ml =
-		List.iter (fun (m,pl,_) ->
-			match m with
-			| Meta.DefParam | Meta.CoreApi | Meta.Used | Meta.MaybeUsed | Meta.FlatEnum | Meta.Value | Meta.DirectlyUsed -> ()
-			| _ ->
-			match pl with
-			| [] -> p "@%s " (Meta.to_string m)
-			| l -> p "@%s(%s) " (Meta.to_string m) (String.concat "," (List.map Ast.s_expr pl))
-		) ml
-	in
-	let access is_read a = s_access is_read a in
-	let rec print_field stat f =
-		p "\t";
-		print_meta f.cf_meta;
-		if stat then p "static ";
-		let name = try (match Meta.get Meta.RealPath f.cf_meta with
-				| (Meta.RealPath, [EConst( String s ), _], _) ->
-					s
-				| _ ->
-					raise Not_found)
-			with Not_found ->
-				f.cf_name
-		in
-		(match f.cf_kind with
-		| Var v ->
-			p "var %s" name;
-			if v.v_read <> AccNormal || v.v_write <> AccNormal then p "(%s,%s)" (access true v.v_read) (access false v.v_write);
-			p " : %s" (stype f.cf_type);
-		| Method m ->
-			let params, ret = (match follow f.cf_type with
-				| TFun (args,ret) ->
-					List.map (fun (a,o,t) ->
-						let rec loop = function
-							| [] -> Ident "null"
-							| (Meta.DefParam,[(EConst (String p),_);(EConst v,_)],_) :: _ when p = a ->
-								(match v with
-								| Float "1.#QNAN" -> Float "0./*NaN*/"
-								| Float "4294967295." -> Int "0xFFFFFFFF"
-								| Int "16777215" -> Int "0xFFFFFF"
-								| Float x ->
-									(try
-										let f = float_of_string x in
-										let s = string_of_int (int_of_float f) in
-										if s ^ "." = x then Int s else v
-									with _ ->
-										v)
-								| _ -> v)
-							| _ :: l -> loop l
-						in
-						a,(if o then Some (loop f.cf_meta) else None ),t
-					) args, ret
-				| _ ->
-					assert false
-			) in
-			let tparams = (match f.cf_params with [] -> "" | l -> "<" ^ String.concat "," (List.map fst l) ^ ">") in
-			p "function %s%s(%s) : %s" name tparams (String.concat ", " (List.map sparam params)) (stype ret);
-		);
-		p ";\n";
-		if Meta.has Meta.Overload f.cf_meta then List.iter (fun f -> print_field stat f) f.cf_overloads
-	in
-	(match t with
-	| TClassDecl c ->
-		print_meta c.cl_meta;
-		p "extern %s %s" (if c.cl_interface then "interface" else "class") (stype (TInst (c,List.map snd c.cl_params)));
-		let ext = (match c.cl_super with
-		| None -> []
-		| Some (c,pl) -> [" extends " ^ stype (TInst (c,pl))]
-		) in
-		let ext = List.fold_left (fun acc (i,pl) -> ((if c.cl_interface then " extends " else " implements ") ^ stype (TInst (i,pl))) :: acc) ext c.cl_implements in
-		let ext = (match c.cl_dynamic with
-			| None -> ext
-			| Some t ->
-				(match c.cl_path with
-				| ["flash";"errors"], _ -> ext
-				| _ when t == t_dynamic -> " implements Dynamic" :: ext
-				| _ -> (" implements Dynamic<" ^ stype t ^ ">") :: ext)
-		) in
-		let ext = (match c.cl_path with
-			| ["flash";"utils"], "ByteArray" -> " implements ArrayAccess<Int>" :: ext
-			| ["flash";"utils"], "Dictionary" -> [" implements ArrayAccess<Dynamic>"]
-			| ["flash";"xml"], "XML" -> [" implements Dynamic<XMLList>"]
-			| ["flash";"xml"], "XMLList" -> [" implements ArrayAccess<XML>"]
-			| ["flash";"display"],"MovieClip" -> [" extends Sprite #if !flash_strict implements Dynamic #end"]
-			| ["flash";"errors"], "Error" -> [" #if !flash_strict implements Dynamic #end"]
-			| _ -> ext
-		) in
-		p "%s" (String.concat "" (List.rev ext));
-		p " {\n";
-		let sort l =
-			let a = Array.of_list (List.filter (fun f -> f.cf_public && not (List.memq f c.cl_overrides)) l) in
-			let name = function "new" -> "" | n -> n in
-			Array.sort (fun f1 f2 ->
-				match f1.cf_kind, f2.cf_kind with
-				| Var _, Var _ | Method _ , Method _ -> compare (name f1.cf_name) (name f2.cf_name)
-				| Var _, _ -> -1
-				| _ -> 1
-			) a;
-			Array.to_list a
-		in
-		List.iter (print_field false) (sort (match c.cl_constructor with None -> c.cl_ordered_fields | Some f -> f :: c.cl_ordered_fields));
-		List.iter (print_field true) (sort c.cl_ordered_statics);
-		p "}\n";
-	| TEnumDecl e ->
-		print_meta e.e_meta;
-		p "extern enum %s {\n" (stype (TEnum(e,List.map snd e.e_params)));
-		let sort l =
-			let a = Array.of_list l in
-			Array.sort compare a;
-			Array.to_list a
-		in
-		List.iter (fun n ->
-			let c = PMap.find n e.e_constrs in
-			p "\t%s" c.ef_name;
-			(match follow c.ef_type with
-			| TFun (args,_) -> p "(%s)" (String.concat ", " (List.map sparam (List.map (fun (a,o,t) -> a,(if o then Some (Ident "null") else None),t) args)))
-			| _ -> ());
-			p ";\n";
-		) (if Meta.has Meta.FakeEnum e.e_meta then sort e.e_names else e.e_names);
-		p "}\n"
-	| TTypeDecl t ->
-		print_meta t.t_meta;
-		p "typedef %s = " (stype (TType (t,List.map snd t.t_params)));
-		p "%s" (stype t.t_type);
-		p "\n";
-	| TAbstractDecl a ->
-		print_meta a.a_meta;
-		p "abstract %s {}" (stype (TAbstract (a,List.map snd a.a_params)));
-	);
-	IO.close_out ch
-
-let generate_hx com =
-	List.iter (generate_type com) com.types
-
diff --git a/src/codegen/java.ml b/src/codegen/java.ml
new file mode 100644
index 0000000000000000000000000000000000000000..77deced1e6078b2e08986f8e2b7858f5added78c
--- /dev/null
+++ b/src/codegen/java.ml
@@ -0,0 +1,1222 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Unix
+open ExtString
+open NativeLibraries
+open Common
+open Globals
+open Ast
+open JData
+
+(** Java lib *)
+
+module SS = Set.Make(String)
+
+type java_lib_ctx = {
+	jcom : Common.context;
+	(* current tparams context *)
+	mutable jtparams : jtypes list;
+	is_std : bool;
+}
+
+exception ConversionError of string * pos
+
+let error s p = raise (ConversionError (s, p))
+
+let is_haxe_keyword = function
+	| "cast" | "extern" | "function" | "in" | "typedef" | "using" | "var" | "untyped" | "inline" -> true
+	| _ -> false
+
+let jname_to_hx name =
+	let name =
+		if name <> "" && (String.get name 0 < 'A' || String.get name 0 > 'Z') then
+			Char.escaped (Char.uppercase (String.get name 0)) ^ String.sub name 1 (String.length name - 1)
+		else
+			name
+	in
+	let name = String.concat "__" (String.nsplit name "_") in
+	String.map (function | '$' -> '_' | c -> c) name
+
+let normalize_pack pack =
+	List.map (function
+		| "" -> ""
+		| str when String.get str 0 >= 'A' && String.get str 0 <= 'Z' ->
+			String.lowercase str
+		| str -> str
+	) pack
+
+let jpath_to_hx (pack,name) = match pack, name with
+	| ["haxe";"root"], name -> [], name
+	| "com" :: ("oracle" | "sun") :: _, _
+	| "javax" :: _, _
+	| "org" :: ("ietf" | "jcp" | "omg" | "w3c" | "xml") :: _, _
+	| "sun" :: _, _
+	| "sunw" :: _, _ -> "java" :: normalize_pack pack, jname_to_hx name
+	| pack, name -> normalize_pack pack, jname_to_hx name
+
+let real_java_path ctx (pack,name) =
+	s_type_path (pack, name)
+
+let lookup_jclass com path =
+	let path = jpath_to_hx path in
+	List.fold_right (fun java_lib acc ->
+		match acc with
+		| None -> java_lib#lookup path
+		| Some p -> Some p
+	) com.native_libs.java_libs None
+
+let mk_type_path ctx path params =
+	let name, sub = try
+		let p, _ = String.split (snd path) "$" in
+		jname_to_hx p, Some (jname_to_hx (snd path))
+		with | Invalid_string ->
+			jname_to_hx (snd path), None
+	in
+	let pack = fst (jpath_to_hx path) in
+	let pack, sub, name = match path with
+		| [], ("Float" as c)
+		| [], ("Int" as c)
+		| [], ("Single" as c)
+		| [], ("Bool" as c)
+		| [], ("Dynamic" as c)
+		| [], ("Iterator" as c)
+		| [], ("ArrayAccess" as c)
+		| [], ("Iterable" as c) ->
+			[], Some c, "StdTypes"
+		| [], ("String" as c) ->
+			["std"], None, c
+		| _ ->
+			pack, sub, name
+	in
+	CTPath {
+		tpackage = pack;
+		tname = name;
+		tparams = params;
+		tsub = sub;
+	}
+
+let has_tparam name params = List.exists(fun (n,_,_) -> n = name) params
+
+let rec convert_arg ctx p arg =
+	match arg with
+	| TAny | TType (WSuper, _) -> TPType (mk_type_path ctx ([], "Dynamic") [],null_pos)
+	| TType (_, jsig) -> TPType (convert_signature ctx p jsig,null_pos)
+
+and convert_signature ctx p jsig =
+	match jsig with
+	| TByte -> mk_type_path ctx (["java"; "types"], "Int8") []
+	| TChar -> mk_type_path ctx (["java"; "types"], "Char16") []
+	| TDouble -> mk_type_path ctx ([], "Float") []
+	| TFloat -> mk_type_path ctx ([], "Single") []
+	| TInt -> mk_type_path ctx ([], "Int") []
+	| TLong -> mk_type_path ctx (["haxe"], "Int64") []
+	| TShort -> mk_type_path ctx (["java"; "types"], "Int16") []
+	| TBool -> mk_type_path ctx ([], "Bool") []
+	| TObject ( (["haxe";"root"], name), args ) -> mk_type_path ctx ([], name) (List.map (convert_arg ctx p) args)
+	(** nullable types *)
+	(* replaced from Null<Type> to the actual abstract type to fix #2738 *)
+	(* | TObject ( (["java";"lang"], "Integer"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx ([], "Int") []) ] *)
+	(* | TObject ( (["java";"lang"], "Double"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx ([], "Float") []) ] *)
+	(* | TObject ( (["java";"lang"], "Float"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx ([], "Single") []) ] *)
+	(* | TObject ( (["java";"lang"], "Boolean"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx ([], "Bool") []) ] *)
+	(* | TObject ( (["java";"lang"], "Byte"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx (["java";"types"], "Int8") []) ] *)
+	(* | TObject ( (["java";"lang"], "Character"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx (["java";"types"], "Char16") []) ] *)
+	(* | TObject ( (["java";"lang"], "Short"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx (["java";"types"], "Int16") []) ] *)
+	(* | TObject ( (["java";"lang"], "Long"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx (["haxe"], "Int64") []) ] *)
+	(** other std types *)
+	| TObject ( (["java";"lang"], "Object"), [] ) -> mk_type_path ctx ([], "Dynamic") []
+	| TObject ( (["java";"lang"], "String"), [] ) -> mk_type_path ctx ([], "String") []
+	| TObject ( (["java";"lang"], "Enum"), [_] ) -> mk_type_path ctx ([], "EnumValue") []
+	(** other types *)
+	| TObject ( path, [] ) ->
+		(match lookup_jclass ctx.jcom path with
+		| Some (jcl, _, _) -> mk_type_path ctx path (List.map (fun _ -> convert_arg ctx p TAny) jcl.ctypes)
+		| None -> mk_type_path ctx path [])
+	| TObject ( path, args ) -> mk_type_path ctx path (List.map (convert_arg ctx p) args)
+	| TObjectInner (pack, (name, params) :: inners) ->
+			let actual_param = match List.rev inners with
+			| (_, p) :: _ -> p
+			| _ -> assert false in
+			mk_type_path ctx (pack, name ^ "$" ^ String.concat "$" (List.map fst inners)) (List.map (fun param -> convert_arg ctx p param) actual_param)
+	| TObjectInner (pack, inners) -> assert false
+	| TArray (jsig, _) -> mk_type_path ctx (["java"], "NativeArray") [ TPType (convert_signature ctx p jsig,null_pos) ]
+	| TMethod _ -> JReader.error "TMethod cannot be converted directly into Complex Type"
+	| TTypeParameter s -> (match ctx.jtparams with
+		| cur :: others ->
+			if has_tparam s cur then
+				mk_type_path ctx ([], s) []
+			else begin
+				if ctx.jcom.verbose && not(List.exists (has_tparam s) others) then print_endline ("Type parameter " ^ s ^ " was not found while building type!");
+				mk_type_path ctx ([], "Dynamic") []
+			end
+		| _ ->
+			if ctx.jcom.verbose then print_endline ("Empty type parameter stack!");
+			mk_type_path ctx ([], "Dynamic") [])
+
+let convert_constant ctx p const =
+	Option.map_default (function
+		| ConstString s -> Some (EConst (String(s,SDoubleQuotes)), p)
+		| ConstInt i -> Some (EConst (Int (Printf.sprintf "%ld" i)), p)
+		| ConstFloat f | ConstDouble f -> Some (EConst (Float (Printf.sprintf "%E" f)), p)
+		| _ -> None) None const
+
+let rec same_sig parent jsig =
+	match jsig with
+	| TObject (p,targs) -> parent = p || List.exists (function | TType (_,s) -> same_sig parent s | _ -> false) targs
+	| TObjectInner(p, ntargs) ->
+			parent = (p, String.concat "$" (List.map fst ntargs)) ||
+			List.exists (fun (_,targs) -> List.exists (function | TType(_,s) -> same_sig parent s | _ -> false) targs) ntargs
+	| TArray(s,_) -> same_sig parent s
+	| _ -> false
+
+let convert_constraints ctx p tl = match tl with
+	| [] -> None
+	| [t] -> Some (convert_signature ctx p t,null_pos)
+	| tl -> Some (CTIntersection(List.map (fun t -> convert_signature ctx p t,null_pos) tl),null_pos)
+
+let convert_param ctx p parent param =
+	let name, constraints = match param with
+		| (name, Some extends_sig, implem_sig) ->
+			name, extends_sig :: implem_sig
+		| (name, None, implemem_sig) ->
+			name, implemem_sig
+		in
+		let constraints = List.map (fun s -> if same_sig parent s then (TObject( (["java";"lang"], "Object"), [])) else s) constraints in
+		{
+			tp_name = jname_to_hx name,null_pos;
+			tp_params = [];
+			tp_constraints = convert_constraints ctx p constraints;
+			tp_meta = [];
+		}
+
+let get_type_path ctx ct = match ct with | CTPath p -> p | _ -> assert false
+
+let is_override field =
+	List.exists (function | AttrVisibleAnnotations [{ ann_type = TObject( (["java";"lang"], "Override"), _ ) }] -> true | _ -> false) field.jf_attributes
+
+let mk_override field =
+	{ field with jf_attributes = ((AttrVisibleAnnotations [{ ann_type = TObject( (["java";"lang"], "Override"), [] ); ann_elements = [] }]) :: field.jf_attributes) }
+
+let del_override field =
+	{ field with jf_attributes = List.filter (fun a -> not (is_override_attrib a)) field.jf_attributes }
+
+let get_canonical ctx p pack name =
+	(Meta.JavaCanonical, [EConst (String (String.concat "." pack,SDoubleQuotes)), p; EConst (String (name,SDoubleQuotes)), p], p)
+
+let show_in_completion ctx jc =
+	if not ctx.is_std then true
+	else match fst jc.cpath with
+		| ("java" | "javax" | "org") :: _ -> true
+		| _ -> false
+
+let convert_java_enum ctx p pe =
+	let meta = ref (get_canonical ctx p (fst pe.cpath) (snd pe.cpath) :: [Meta.Native, [EConst (String (real_java_path ctx pe.cpath,SDoubleQuotes) ), p], p ]) in
+	let data = ref [] in
+	List.iter (fun f ->
+		(* if List.mem JEnum f.jf_flags then *)
+		match f.jf_vmsignature with
+		| TObject( path, [] ) when path = pe.cpath && List.mem JStatic f.jf_flags && List.mem JFinal f.jf_flags ->
+			data := { ec_name = f.jf_name,null_pos; ec_doc = None; ec_meta = []; ec_args = []; ec_pos = p; ec_params = []; ec_type = None; } :: !data;
+		| _ -> ()
+	) pe.cfields;
+
+	if not (show_in_completion ctx pe) then meta := (Meta.NoCompletion,[],null_pos) :: !meta;
+
+	EEnum {
+		d_name = jname_to_hx (snd pe.cpath),null_pos;
+		d_doc = None;
+		d_params = []; (* enums never have type parameters *)
+		d_meta = !meta;
+		d_flags = [EExtern];
+		d_data = List.rev !data;
+	}
+
+	let convert_java_field ctx p jc field =
+		let p = { p with pfile =	p.pfile ^" (" ^field.jf_name ^")" } in
+		let cff_doc = None in
+		let cff_pos = p in
+		let cff_meta = ref [] in
+		let cff_access = ref [] in
+		let cff_name = match field.jf_name with
+			| "<init>" -> "new"
+			| "<clinit>"-> raise Exit (* __init__ field *)
+			| name when String.length name > 5 ->
+					(match String.sub name 0 5 with
+					| "__hx_" | "this$" -> raise Exit
+					| _ -> name)
+			| name -> name
+		in
+		let jf_constant = ref field.jf_constant in
+		let readonly = ref false in
+
+		List.iter (function
+			| JPublic -> cff_access := (APublic,null_pos) :: !cff_access
+			| JPrivate -> raise Exit (* private instances aren't useful on externs *)
+			| JProtected ->
+				cff_meta := (Meta.Protected, [], p) :: !cff_meta;
+				cff_access := (APrivate,null_pos) :: !cff_access
+			| JStatic -> cff_access := (AStatic,null_pos) :: !cff_access
+			| JFinal ->
+				cff_access := (AFinal, p) :: !cff_access;
+				(match field.jf_kind, field.jf_vmsignature, field.jf_constant with
+				| JKField, TObject _, _ ->
+					jf_constant := None
+				| JKField, _, Some _ ->
+					readonly := true;
+					jf_constant := None;
+				| _ -> jf_constant := None)
+			(* | JSynchronized -> cff_meta := (Meta.Synchronized, [], p) :: !cff_meta *)
+			| JVolatile -> cff_meta := (Meta.Volatile, [], p) :: !cff_meta
+			| JTransient -> cff_meta := (Meta.Transient, [], p) :: !cff_meta
+			(* | JVarArgs -> cff_meta := (Meta.VarArgs, [], p) :: !cff_meta *)
+			| _ -> ()
+		) field.jf_flags;
+
+		List.iter (function
+			| AttrDeprecated when jc.cpath <> (["java";"util"],"Date") -> cff_meta := (Meta.Deprecated, [], p) :: !cff_meta
+			(* TODO: pass anotations as @:meta *)
+			| AttrVisibleAnnotations ann ->
+				List.iter (function
+					| { ann_type = TObject( (["java";"lang"], "Override"), [] ) } ->
+						cff_access := (AOverride,null_pos) :: !cff_access
+					| _ -> ()
+				) ann
+			| _ -> ()
+		) field.jf_attributes;
+
+		List.iter (fun jsig ->
+			match convert_signature ctx p jsig with
+				| CTPath path ->
+					cff_meta := (Meta.Throws, [Ast.EConst (Ast.String (s_type_path (path.tpackage,path.tname),SDoubleQuotes)), p],p) :: !cff_meta
+				| _ -> ()
+		) field.jf_throws;
+
+		let kind = match field.jf_kind with
+			| JKField when !readonly ->
+				FProp (("default",null_pos), ("null",null_pos), Some (convert_signature ctx p field.jf_signature,null_pos), None)
+			| JKField ->
+				FVar (Some (convert_signature ctx p field.jf_signature,null_pos), None)
+			| JKMethod ->
+				match field.jf_signature with
+				| TMethod (args, ret) ->
+					let old_types = ctx.jtparams in
+					(match ctx.jtparams with
+					| c :: others -> ctx.jtparams <- (c @ field.jf_types) :: others
+					| [] -> ctx.jtparams <- field.jf_types :: []);
+					let i = ref 0 in
+					let args = List.map (fun s ->
+						incr i;
+						("param" ^ string_of_int !i,null_pos), false, [], Some(convert_signature ctx p s,null_pos), None
+					) args in
+					let t = Option.map_default (convert_signature ctx p) (mk_type_path ctx ([], "Void") []) ret in
+					cff_meta := (Meta.Overload, [], p) :: !cff_meta;
+					let types = List.map (function
+						| (name, Some ext, impl) ->
+							{
+								tp_name = name,null_pos;
+								tp_params = [];
+								tp_constraints = convert_constraints ctx p (ext :: impl);
+								tp_meta = [];
+							}
+						| (name, None, impl) ->
+							{
+								tp_name = name,null_pos;
+								tp_params = [];
+								tp_constraints = convert_constraints ctx p impl;
+								tp_meta = [];
+							}
+					) field.jf_types in
+					ctx.jtparams <- old_types;
+
+					FFun ({
+						f_params = types;
+						f_args = args;
+						f_type = Some (t,null_pos);
+						f_expr = None
+					})
+				| _ -> error "Method signature was expected" p
+		in
+		let cff_name, cff_meta =
+			match String.get cff_name 0 with
+				| '%' ->
+					let name = (String.sub cff_name 1 (String.length cff_name - 1)) in
+					if not (is_haxe_keyword name) then
+						cff_meta := (Meta.Deprecated, [EConst(String(
+							"This static field `_" ^ name ^ "` is deprecated and will be removed in later versions. Please use `" ^ name ^ "` instead",SDoubleQuotes)
+						),p], p) :: !cff_meta;
+					"_" ^ name,
+					(Meta.Native, [EConst (String (name,SDoubleQuotes) ), cff_pos], cff_pos) :: !cff_meta
+				| _ ->
+					match String.nsplit cff_name "$" with
+						| [ no_dollar ] ->
+							cff_name, !cff_meta
+						| parts ->
+							String.concat "_" parts,
+							(Meta.Native, [EConst (String (cff_name,SDoubleQuotes) ), cff_pos], cff_pos) :: !cff_meta
+		in
+		if PMap.mem "java_loader_debug" ctx.jcom.defines.Define.values then
+			Printf.printf "\t%s%sfield %s : %s\n" (if List.mem_assoc AStatic !cff_access then "static " else "") (if List.mem_assoc AOverride !cff_access then "override " else "") cff_name (s_sig field.jf_signature);
+
+		{
+			cff_name = cff_name,null_pos;
+			cff_doc = cff_doc;
+			cff_pos = cff_pos;
+			cff_meta = cff_meta;
+			cff_access = !cff_access;
+			cff_kind = kind
+		}
+
+	let rec japply_params params jsig = match params with
+	| [] -> jsig
+	| _ -> match jsig with
+		| TTypeParameter s -> (try
+			List.assoc s params
+		with | Not_found -> jsig)
+		| TObject(p,tl) ->
+			TObject(p, args params tl)
+		| TObjectInner(sl, stll) ->
+			TObjectInner(sl, List.map (fun (s,tl) -> (s, args params tl)) stll)
+		| TArray(s,io) ->
+			TArray(japply_params params s, io)
+		| TMethod(sl, sopt) ->
+			TMethod(List.map (japply_params params) sl, Option.map (japply_params params) sopt)
+		| _ -> jsig
+
+	and args params tl = match params with
+	| [] -> tl
+	| _ -> List.map (function
+		| TAny -> TAny
+		| TType(w,s) -> TType(w,japply_params params s)) tl
+
+	let mk_params jtypes = List.map (fun (s,_,_) -> (s,TTypeParameter s)) jtypes
+
+	let convert_java_class ctx p jc =
+		match List.mem JEnum jc.cflags with
+		| true -> (* is enum *)
+				[convert_java_enum ctx p jc]
+		| false ->
+			let flags = ref [HExtern] in
+			if PMap.mem "java_loader_debug" ctx.jcom.defines.Define.values then begin
+				let sup = jc.csuper :: jc.cinterfaces in
+				print_endline ("converting " ^ (if List.mem JAbstract jc.cflags then "abstract " else "") ^ JData.path_s jc.cpath ^ " : " ^ (String.concat ", " (List.map s_sig sup)));
+			end;
+			(* todo: instead of JavaNative, use more specific definitions *)
+			let meta = ref [Meta.JavaNative, [], p; Meta.Native, [EConst (String (real_java_path ctx jc.cpath,SDoubleQuotes) ), p], p; get_canonical ctx p (fst jc.cpath) (snd jc.cpath)] in
+			let force_check = Common.defined ctx.jcom Define.ForceLibCheck in
+			if not force_check then
+				meta := (Meta.LibType,[],p) :: !meta;
+
+			let is_interface = ref false in
+			List.iter (fun f -> match f with
+				| JFinal -> flags := HFinal :: !flags
+				| JInterface ->
+						is_interface := true;
+						flags := HInterface :: !flags
+				| JAbstract -> meta := (Meta.Abstract, [], p) :: !meta
+				| JAnnotation -> meta := (Meta.Annotation, [], p) :: !meta
+				| _ -> ()
+			) jc.cflags;
+
+			(match jc.csuper with
+				| TObject( (["java";"lang"], "Object"), _ ) -> ()
+				| TObject( (["haxe";"lang"], "HxObject"), _ ) -> meta := (Meta.HxGen,[],p) :: !meta
+				| _ -> flags := HExtends (get_type_path ctx (convert_signature ctx p jc.csuper),null_pos) :: !flags
+			);
+
+			List.iter (fun i ->
+				match i with
+				| TObject ( (["haxe";"lang"], "IHxObject"), _ ) -> meta := (Meta.HxGen,[],p) :: !meta
+				| _ -> flags :=
+					if !is_interface then
+						HExtends (get_type_path ctx (convert_signature ctx p i),null_pos) :: !flags
+					else
+						HImplements (get_type_path ctx (convert_signature ctx p i),null_pos) :: !flags
+			) jc.cinterfaces;
+
+			let fields = ref [] in
+			let jfields = ref [] in
+
+			if jc.cpath <> (["java";"lang"], "CharSequence") then
+				List.iter (fun f ->
+					try
+						if !is_interface && List.mem JStatic f.jf_flags then
+							()
+						else begin
+							fields := convert_java_field ctx p jc f :: !fields;
+							jfields := f :: !jfields
+						end
+					with
+						| Exit -> ()
+				) (jc.cfields @ jc.cmethods);
+
+			(* make sure the throws types are imported correctly *)
+			let imports = List.concat (List.map (fun f ->
+				List.map (fun jsig ->
+					match convert_signature ctx p jsig with
+						| CTPath path ->
+							let pos = { p with pfile = p.pfile ^ " (" ^ f.jf_name ^" @:throws)" } in
+							EImport( List.map (fun s -> s,pos) (path.tpackage @ [path.tname]), INormal )
+						| _ -> assert false
+				) f.jf_throws
+			) jc.cmethods) in
+
+			if not (show_in_completion ctx jc) then meta := (Meta.NoCompletion,[],null_pos) :: !meta;
+
+			(EClass {
+				d_name = jname_to_hx (snd jc.cpath),null_pos;
+				d_doc = None;
+				d_params = List.map (convert_param ctx p jc.cpath) jc.ctypes;
+				d_meta = !meta;
+				d_flags = !flags;
+				d_data = !fields;
+			}) :: imports
+
+	let create_ctx com is_std =
+		{
+			jcom = com;
+			jtparams = [];
+			is_std = is_std;
+		}
+
+	let rec has_type_param = function
+		| TTypeParameter _ -> true
+		| TMethod (lst, opt) -> List.exists has_type_param lst || Option.map_default has_type_param false opt
+		| TArray (s,_) -> has_type_param s
+		| TObjectInner (_, stpl) -> List.exists (fun (_,sigs) -> List.exists has_type_param_arg sigs) stpl
+		| TObject(_, pl) -> List.exists has_type_param_arg pl
+		| _ -> false
+
+	and has_type_param_arg = function | TType(_,s) -> has_type_param s | _ -> false
+
+let rec japply_params jparams jsig = match jparams with
+	| [] -> jsig
+	| _ ->
+		match jsig with
+		| TObject(path,p) ->
+			TObject(path, List.map (japply_params_tp jparams ) p)
+		| TObjectInner(sl,stargl) ->
+			TObjectInner(sl,List.map (fun (s,targ) -> (s, List.map (japply_params_tp jparams) targ)) stargl)
+		| TArray(jsig,io) ->
+			TArray(japply_params jparams jsig,io)
+		| TMethod(args,ret) ->
+			TMethod(List.map (japply_params jparams ) args, Option.map (japply_params jparams ) ret)
+		| TTypeParameter s -> (try
+			List.assoc s jparams
+		with | Not_found -> jsig)
+		| _ -> jsig
+
+
+and japply_params_tp jparams jtype_argument = match jtype_argument with
+	| TAny -> TAny
+	| TType(w,jsig) -> TType(w,japply_params jparams jsig)
+
+let mk_jparams jtypes params = match jtypes, params with
+	| [], [] -> []
+	| _, [] -> List.map (fun (s,_,_) -> s, TObject( (["java";"lang"], "Object"), [] ) ) jtypes
+	| _ -> List.map2 (fun (s,_,_) jt -> match jt with
+		| TAny -> s, TObject((["java";"lang"],"Object"),[])
+		| TType(_,jsig) -> s, jsig) jtypes params
+
+let rec compatible_signature_arg ?arg_test f1 f2 =
+	let arg_test = match arg_test with
+		| None -> (fun _ _ -> true)
+		| Some a -> a
+	in
+	if f1 = f2 then
+		true
+	else match f1, f2 with
+	| TObject(p,a), TObject(p2,a2) -> p = p2 && arg_test a a2
+	| TObjectInner(sl, stal), TObjectInner(sl2, stal2) -> sl = sl2 && List.map fst stal = List.map fst stal2
+	| TArray(s,_) , TArray(s2,_) -> compatible_signature_arg s s2
+	| TTypeParameter t1 , TTypeParameter t2 -> t1 = t2
+	| _ -> false
+
+let rec compatible_param p1 p2 = match p1, p2 with
+	| TType (_,s1), TType(_,s2) -> compatible_signature_arg ~arg_test:compatible_tparams s1 s2
+	| TAny, TType(_, TObject( (["java";"lang"],"Object"), _ )) -> true
+	| TType(_, TObject( (["java";"lang"],"Object"), _ )), TAny -> true
+	| _ -> false
+
+and compatible_tparams p1 p2 = try match p1, p2 with
+	| [], [] -> true
+	| _, [] ->
+		let p2 = List.map (fun _ -> TAny) p1 in
+		List.for_all2 compatible_param p1 p2
+	| [], _ ->
+		let p1 = List.map (fun _ -> TAny) p2 in
+		List.for_all2 compatible_param p1 p2
+	| _, _ ->
+		List.for_all2 compatible_param p1 p2
+	with | Invalid_argument _ -> false
+
+let get_adapted_sig f f2 = match f.jf_types with
+	| [] ->
+		f.jf_signature
+	| _ ->
+		let jparams = mk_jparams f.jf_types (List.map (fun (s,_,_) -> TType(WNone, TTypeParameter s)) f2.jf_types) in
+		japply_params jparams f.jf_signature
+
+let compatible_methods f1 f2 =
+	if List.length f1.jf_types <> List.length f2.jf_types then
+		false
+	else match (get_adapted_sig f1 f2), f2.jf_signature with
+	| TMethod(a1,_), TMethod(a2,_) when List.length a1 = List.length a2 ->
+		List.for_all2 compatible_signature_arg a1 a2
+	| _ -> false
+
+let jcl_from_jsig com jsig =
+	let path, params = match jsig with
+	| TObject(path, params) ->
+		path,params
+	| TObjectInner(sl, stll) ->
+		let last_params = ref [] in
+		let real_path = sl, String.concat "$" (List.map (fun (s,p) -> last_params := p; s) stll) in
+		real_path, !last_params
+	| _ -> raise Not_found
+	in
+	match lookup_jclass com path with
+	| None -> raise Not_found
+	| Some(c,_,_) -> c,params
+
+let jclass_with_params com cls params = try
+	match cls.ctypes with
+	| [] -> cls
+	| _ ->
+		let jparams = mk_jparams cls.ctypes params in
+		{ cls with
+			cfields = List.map (fun f -> { f with jf_signature = japply_params jparams f.jf_signature }) cls.cfields;
+			cmethods = List.map (fun f -> { f with jf_signature = japply_params jparams f.jf_signature }) cls.cmethods;
+			csuper = japply_params jparams cls.csuper;
+			cinterfaces = List.map (japply_params jparams) cls.cinterfaces;
+		}
+	with Invalid_argument _ ->
+		if com.verbose then print_endline ("Differing parameters for class: " ^ s_type_path cls.cpath);
+		cls
+
+let is_object = function | TObject( (["java";"lang"], "Object"), [] ) -> true | _ -> false
+
+let is_tobject = function | TObject _ | TObjectInner _ -> true | _ -> false
+
+let simplify_args args =
+	if List.for_all (function | TAny -> true | _ -> false) args then [] else args
+
+let compare_type com s1 s2 =
+	if s1 = s2 then
+		0
+	else if not (is_tobject s1) then
+		if is_tobject s2 then (* Dynamic *)
+			1
+		else if compatible_signature_arg s1 s2 then
+			0
+		else
+			raise Exit
+	else if not (is_tobject s2) then
+		-1
+	else begin
+		let rec loop ?(first_error=true) s1 s2 : bool =
+			if is_object s1 then
+				s1 = s2
+			else if compatible_signature_arg s1 s2 then begin
+				let p1, p2 = match s1, s2 with
+				| TObject(_, p1), TObject(_,p2) ->
+					p1, p2
+				| TObjectInner(_, npl1), TObjectInner(_, npl2) ->
+					snd (List.hd (List.rev npl1)), snd (List.hd (List.rev npl2))
+				| _ -> assert false (* not tobject *)
+				in
+				let p1, p2 = simplify_args p1, simplify_args p2 in
+				let lp1 = List.length p1 in
+				let lp2 = List.length p2 in
+				if lp1 > lp2 then
+					true
+				else if lp2 > lp1 then
+					false
+				else begin
+					(* if compatible tparams, it's fine *)
+					if not (compatible_tparams p1 p2) then
+						raise Exit; (* meaning: found, but incompatible type parameters *)
+					true
+				end
+			end else try
+				let c, p = jcl_from_jsig com s1 in
+				let jparams = mk_jparams c.ctypes p in
+				let super = japply_params jparams c.csuper in
+				let implements = List.map (japply_params jparams) c.cinterfaces in
+				loop ~first_error:first_error super s2 || List.exists (fun super -> loop ~first_error:first_error super s2) implements
+			with | Not_found ->
+				print_endline ("-java-lib: The type " ^ (s_sig s1) ^ " is referred but was not found. Compilation may not occur correctly.");
+				print_endline "Did you forget to include a needed lib?";
+				if first_error then
+					not (loop ~first_error:false s2 s1)
+				else
+					false
+		in
+		if loop s1 s2 then
+			if loop s2 s1 then
+				0
+			else
+				1
+		else
+			if loop s2 s1 then
+				-1
+			else
+				-2
+	end
+
+(* given a list of same overload functions, choose the best (or none) *)
+let select_best com flist =
+	let rec loop cur_best = function
+		| [] ->
+			Some cur_best
+		| f :: flist -> match get_adapted_sig f cur_best, cur_best.jf_signature with
+			| TMethod(_,Some r), TMethod(_, Some r2) -> (try
+				match compare_type com r r2 with
+				| 0 -> (* same type - select any of them *)
+					loop cur_best flist
+				| 1 ->
+					loop f flist
+				| -1 ->
+					loop cur_best flist
+				| -2 -> (* error - no type is compatible *)
+					if com.verbose then print_endline (f.jf_name ^ ": The types " ^ (s_sig r) ^ " and " ^ (s_sig r2) ^ " are incompatible");
+					(* bet that the current best has "beaten" other types *)
+					loop cur_best flist
+				| _ -> assert false
+			with | Exit -> (* incompatible type parameters *)
+				(* error mode *)
+				if com.verbose then print_endline (f.jf_name ^ ": Incompatible argument return signatures: " ^ (s_sig r) ^ " and " ^ (s_sig r2));
+				None)
+			| TMethod _, _ -> (* select the method *)
+				loop f flist
+			| _ ->
+				loop cur_best flist
+	in
+	match loop (List.hd flist) (List.tl flist) with
+	| Some f ->
+		Some f
+	| None -> match List.filter (fun f -> not (is_override f)) flist with
+		(* error mode; take off all override methods *)
+		| [] -> None
+		| f :: [] -> Some f
+		| f :: flist -> Some f (* pick one *)
+
+(**** begin normalize_jclass helpers ****)
+
+let fix_overrides_jclass com cls =
+	let force_check = Common.defined com Define.ForceLibCheck in
+	let methods = if force_check then List.map (fun f -> del_override f) cls.cmethods else cls.cmethods in
+	let cmethods = methods in
+	let super_fields = [] in
+	let super_methods = [] in
+	let nonstatics = List.filter (fun f -> not (List.mem JStatic f.jf_flags)) (cls.cfields @ cls.cmethods) in
+
+	let is_pub = fun f -> List.exists (function | JPublic | JProtected -> true | _ -> false) f.jf_flags in
+	let cmethods, super_fields = if not (List.mem JInterface cls.cflags) then
+		List.filter is_pub cmethods,
+		List.filter is_pub super_fields
+	else
+		cmethods,super_fields
+	in
+
+	let rec loop cls super_methods super_fields cmethods nonstatics = try
+		match cls.csuper with
+		| TObject((["java";"lang"],"Object"),_) ->
+				super_methods,super_fields,cmethods,nonstatics
+		| _ ->
+			let cls, params = jcl_from_jsig com cls.csuper in
+			let cls = jclass_with_params com cls params in
+			let nonstatics = (List.filter (fun f -> (List.mem JStatic f.jf_flags)) (cls.cfields @ cls.cmethods)) @ nonstatics in
+			let super_methods = cls.cmethods @ super_methods in
+			let super_fields = cls.cfields @ super_fields in
+			let cmethods = if force_check then begin
+				let overridden = ref [] in
+				let cmethods = List.map (fun jm ->
+					(* TODO rewrite/standardize empty spaces *)
+					if not (is_override jm) && not (List.mem JStatic jm.jf_flags) && List.exists (fun msup ->
+						let ret = msup.jf_name = jm.jf_name && not(List.mem JStatic msup.jf_flags) && compatible_methods msup jm in
+						if ret then begin
+							let f = mk_override msup in
+							overridden := { f with jf_flags = jm.jf_flags } :: !overridden
+						end;
+						ret
+					) cls.cmethods then
+						mk_override jm
+					else
+						jm
+				) cmethods in
+				!overridden @ cmethods
+			end else
+				cmethods
+			in
+			loop cls super_methods super_fields cmethods nonstatics
+		with | Not_found ->
+			super_methods,super_fields,cmethods,nonstatics
+	in
+	loop cls super_methods super_fields cmethods nonstatics
+
+let normalize_jclass com cls =
+	(* after adding the noCheck metadata, this option will annotate what changes were needed *)
+	(* and that are now deprecated *)
+	let force_check = Common.defined com Define.ForceLibCheck in
+	(* fix overrides *)
+	let super_methods, super_fields, cmethods, nonstatics = fix_overrides_jclass com cls in
+	let all_methods = cmethods @ super_methods in
+
+	(* look for interfaces and add missing implementations (may happen on abstracts or by vmsig differences *)
+	(* (libType): even with libType enabled, we need to add these missing fields - otherwise we won't be able to use them from Haxe *)
+	let added_interface_fields = ref [] in
+	let rec loop_interface abstract cls iface = try
+		match iface with
+			| TObject ((["java";"lang"],"Object"), _) -> ()
+			| TObject (path,_) when path = cls.cpath -> ()
+			| _ ->
+				let cif, params = jcl_from_jsig com iface in
+				let cif = jclass_with_params com cif params in
+				List.iter (fun jf ->
+					if not(List.mem JStatic jf.jf_flags) && not (List.exists (fun jf2 -> jf.jf_name = jf2.jf_name && not (List.mem JStatic jf2.jf_flags) && jf.jf_signature = jf2.jf_signature) all_methods) then begin
+						let jf = if abstract && force_check then del_override jf else jf in
+						let jf = if not (List.mem JPublic jf.jf_flags) then { jf with jf_flags = JPublic :: jf.jf_flags } else jf in (* interfaces implementations are always public *)
+
+						added_interface_fields := jf :: !added_interface_fields;
+					end
+				) cif.cmethods;
+				(* we don't need to loop again in the interface unless we are in an abstract class, since these interfaces are already normalized *)
+				if abstract then List.iter (loop_interface abstract cif) cif.cinterfaces;
+		with Not_found -> ()
+	in
+	List.iter (loop_interface (List.mem JAbstract cls.cflags) cls) cls.cinterfaces;
+	let nonstatics = !added_interface_fields @ nonstatics in
+	let cmethods = !added_interface_fields @ cmethods in
+
+	(* for each added field in the interface, lookup in super_methods possible methods to include *)
+	(* so we can choose the better method still *)
+	let cmethods = if not force_check then
+		cmethods
+	else
+		List.fold_left (fun cmethods im ->
+			(* see if any of the added_interface_fields need to be declared as override *)
+			let f = List.find_all (fun jf -> jf.jf_name = im.jf_name && compatible_methods jf im) super_methods in
+			let f = List.map mk_override f in
+			f @ cmethods
+		) cmethods !added_interface_fields;
+	in
+
+	(* take off equals, hashCode and toString from interface *)
+	let cmethods = if List.mem JInterface cls.cflags then List.filter (fun jf -> match jf.jf_name, jf.jf_vmsignature with
+			| "equals", TMethod([TObject( (["java";"lang"],"Object"), _)],_)
+			| "hashCode", TMethod([], _)
+			| "toString", TMethod([], _) -> false
+			| _ -> true
+	) cmethods
+	else
+		cmethods
+	in
+
+	(* change field name to not collide with haxe keywords and with static/non-static members *)
+	let fold_field acc f =
+		let change, both = match f.jf_name with
+		| _ when List.mem JStatic f.jf_flags && List.exists (fun f2 -> f.jf_name = f2.jf_name) nonstatics -> true, true
+		| _ -> is_haxe_keyword f.jf_name, false
+		in
+		let f2 = if change then
+				{ f with jf_name = "%" ^ f.jf_name }
+			else
+				f
+		in
+		if both then f :: f2 :: acc else f2 :: acc
+	in
+
+	(* change static fields that have the same name as methods *)
+	let cfields = List.fold_left fold_field [] cls.cfields in
+	let cmethods = List.fold_left fold_field [] cmethods in
+	(* take off variable fields that have the same name as methods *)
+	(* and take off variables that already have been declared *)
+	let filter_field f f2 = f != f2 && (List.mem JStatic f.jf_flags = List.mem JStatic f2.jf_flags) && f.jf_name = f2.jf_name && f2.jf_kind <> f.jf_kind in
+	let cfields = List.filter (fun f ->
+		if List.mem JStatic f.jf_flags then
+			not (List.exists (filter_field f) cmethods)
+		else
+			not (List.exists (filter_field f) nonstatics) && not (List.exists (fun f2 -> f != f2 && f.jf_name = f2.jf_name && not (List.mem JStatic f2.jf_flags)) super_fields) ) cfields
+	in
+	(* now filter any method that clashes with a field - on a superclass *)
+	let cmethods = if force_check then List.filter (fun f ->
+		if List.mem JStatic f.jf_flags then
+			true
+		else
+			not (List.exists (filter_field f) super_fields) ) cmethods
+	else
+		cmethods
+	in
+	(* removing duplicate fields. They are there because of return type covariance in Java *)
+	(* Also, if a method overrides a previous definition, and changes a type parameters' variance, *)
+	(* we will take it off *)
+	(* this means that some rare codes will never compile on Haxe, but unless Haxe adds variance support *)
+	(* I can't see how this can be any different *)
+	let rec loop acc = function
+		| [] -> acc
+		| f :: cmeths ->
+			match List.partition (fun f2 -> f.jf_name = f2.jf_name && compatible_methods f f2) cmeths with
+			| [], cmeths ->
+				loop (f :: acc) cmeths
+			| flist, cmeths -> match select_best com (f :: flist) with
+				| None ->
+					loop acc cmeths
+				| Some f ->
+					loop (f :: acc) cmeths
+	in
+	(* last pass: take off all cfields that are internal / private (they won't be accessible anyway) *)
+	let cfields = List.filter(fun f -> List.exists (fun f -> f = JPublic || f = JProtected) f.jf_flags) cfields in
+	let cmethods = loop [] cmethods in
+	{ cls with cfields = cfields; cmethods = cmethods }
+
+(**** end normalize_jclass helpers ****)
+
+let get_classes_zip zip =
+	let ret = ref [] in
+	List.iter (function
+		| { Zip.is_directory = false; Zip.filename = f } when (String.sub (String.uncapitalize f) (String.length f - 6) 6) = ".class" && not (String.exists f "$") ->
+				(match List.rev (String.nsplit f "/") with
+				| clsname :: pack ->
+					if not (String.contains clsname '$') then begin
+						let path = jpath_to_hx (List.rev pack, String.sub clsname 0 (String.length clsname - 6)) in
+						ret := path :: !ret
+					end
+				| _ ->
+						ret := ([], jname_to_hx f) :: !ret)
+		| _ -> ()
+	) (Zip.entries zip);
+	!ret
+
+class virtual java_library com name file_path = object(self)
+	inherit [java_lib_type,unit] native_library name file_path as super
+
+	val hxpack_to_jpack = Hashtbl.create 16
+
+	method convert_path (path : path) : path =
+		Hashtbl.find hxpack_to_jpack path
+
+	method private replace_canonical_name p pack name_original name_replace decl =
+		let mk_meta name = (Meta.JavaCanonical, [EConst (String (String.concat "." pack,SDoubleQuotes)), p; EConst(String (name,SDoubleQuotes)), p], p) in
+		let add_meta name metas =
+			if Meta.has Meta.JavaCanonical metas then
+				List.map (function
+					| (Meta.JavaCanonical,[EConst (String(cpack,_)), _; EConst(String(cname,_)), _],_) ->
+						let did_replace,name = String.replace cname name_original name_replace in
+						if not did_replace then print_endline (cname ^ " -> " ^ name_original ^ " -> " ^ name_replace);
+						mk_meta name
+					| m -> m
+				) metas
+			else
+				mk_meta name :: metas
+		in
+		match decl with
+			| EClass c ->
+				EClass { c with d_meta = add_meta (fst c.d_name) c.d_meta }
+			| EEnum e ->
+				EEnum { e with d_meta = add_meta (fst e.d_name) e.d_meta }
+			| EAbstract a ->
+				EAbstract { a with d_meta = add_meta (fst a.d_name) a.d_meta }
+			| d -> d
+
+	method build path (p : pos) : Ast.package option =
+		let rec build ctx path p types =
+			try
+				if List.mem path !types then
+					None
+				else begin
+					let first = match !types with
+						| [ ["java";"lang"], "String" ] | [] -> true
+						| p :: _ ->
+							false
+					in
+					types := path :: !types;
+					match self#lookup path, path with
+					| None, ([], c) -> build ctx (["haxe";"root"], c) p types
+					| None, _ -> None
+					| Some (cls, real_path, pos_path), _ ->
+							let is_disallowed_inner = first && String.exists (snd cls.cpath) "$" in
+							let is_disallowed_inner = if is_disallowed_inner then begin
+									let outer, inner = String.split (snd cls.cpath) "$" in
+									match self#lookup (fst path, outer) with
+										| None -> false
+										| _ -> true
+								end else
+									false
+							in
+							if is_disallowed_inner then
+								None
+							else begin
+								if ctx.jcom.verbose then print_endline ("Parsed Java class " ^ (s_type_path cls.cpath));
+								let old_types = ctx.jtparams in
+								ctx.jtparams <- cls.ctypes :: ctx.jtparams;
+
+								let pos = { pfile = pos_path; pmin = 0; pmax = 0; } in
+
+								let pack = match fst path with | ["haxe";"root"] -> [] | p -> p in
+
+								let ppath = self#convert_path path in
+								let inner = List.fold_left (fun acc (path,out,_,_) ->
+									let path = jpath_to_hx path in
+									(if out <> Some ppath then
+										acc
+									else match build ctx path p types with
+										| Some(_, classes) ->
+											let base = snd ppath ^ "$" in
+											(List.map (fun (def,p) ->
+												self#replace_canonical_name p (fst ppath) base (snd ppath ^ ".") def, p) classes) @ acc
+										| _ -> acc);
+								) [] cls.cinner_types in
+
+								(* add _Statics class *)
+								let inner = try
+									if not (List.mem JInterface cls.cflags) then raise Not_found;
+									let smethods = List.filter (fun f -> List.mem JStatic f.jf_flags) cls.cmethods in
+									let sfields = List.filter (fun f -> List.mem JStatic f.jf_flags) cls.cfields in
+									if not (smethods <> [] || sfields <> []) then raise Not_found;
+									let obj = TObject( (["java";"lang"],"Object"), []) in
+									let ncls = convert_java_class ctx pos { cls with cmethods = smethods; cfields = sfields; cflags = []; csuper = obj; cinterfaces = []; cinner_types = []; ctypes = [] } in
+									match ncls with
+									| EClass c :: imports ->
+										(EClass { c with d_name = (fst c.d_name ^ "_Statics"),snd c.d_name }, pos) :: inner @ List.map (fun i -> i,pos) imports
+									| _ -> assert false
+								with | Not_found ->
+									inner
+								in
+								let inner_alias = ref SS.empty in
+								List.iter (fun x ->
+									match fst x with
+									| EClass c ->
+										inner_alias := SS.add (fst c.d_name) !inner_alias;
+									| _ -> ()
+								) inner;
+								let alias_list = ref [] in
+								List.iter (fun x ->
+									match x with
+									| (EClass c, pos) -> begin
+										let parts = String.nsplit (fst c.d_name) "_24" in
+										match parts with
+											| _ :: _ ->
+												let alias_name = String.concat "_" parts in
+												if (not (SS.mem alias_name !inner_alias)) && (not (String.exists (snd path) "_24")) then begin
+													let alias_def = ETypedef {
+														d_name = alias_name,null_pos;
+														d_doc = None;
+														d_params = c.d_params;
+														d_meta = [];
+														d_flags = [];
+														d_data = CTPath {
+															tpackage = pack;
+															tname = snd path;
+															tparams = List.map (fun tp ->
+																TPType (CTPath {
+																	tpackage = [];
+																	tname = fst tp.tp_name;
+																	tparams = [];
+																	tsub = None;
+																},null_pos)
+															) c.d_params;
+															tsub = Some(fst c.d_name);
+														},null_pos;
+													} in
+													inner_alias := SS.add alias_name !inner_alias;
+													alias_list := (alias_def, pos) :: !alias_list;
+												end
+											| _ -> ()
+									end
+									| _ -> ()
+								) inner;
+								let inner = List.concat [!alias_list ; inner] in
+								let classes = List.map (fun t -> t,pos) (convert_java_class ctx pos cls) in
+								let imports, defs = List.partition (function | (EImport(_),_) -> true | _ -> false) (classes @ inner) in
+								let ret = Some (pack, imports @ defs) in
+								ctx.jtparams <- old_types;
+								ret
+							end
+				end
+			with
+			| JReader.Error_message msg ->
+				print_endline ("Class reader failed: " ^ msg);
+				None
+			| e ->
+				if ctx.jcom.verbose then begin
+					(* print_endline (Printexc.get_backtrace ()); requires ocaml 3.11 *)
+					print_endline (Printexc.to_string e)
+				end;
+				None
+		in
+		build (create_ctx com (self#has_flag FlagIsStd)) path p (ref [["java";"lang"], "String"])
+
+	method get_data = ()
+end
+
+class java_library_jar com name file_path = object(self)
+	inherit java_library com name file_path
+
+	val zip = lazy (Zip.open_in file_path)
+	val mutable cached_files = None
+	val cached_types = Hashtbl.create 12
+	val mutable closed = false
+
+	method load =
+		List.iter (function
+			| { Zip.is_directory = false; Zip.filename = filename } when String.ends_with filename ".class" ->
+				let pack = String.nsplit filename "/" in
+				(match List.rev pack with
+					| [] -> ()
+					| name :: pack ->
+						let name = String.sub name 0 (String.length name - 6) in
+						let pack = List.rev pack in
+						Hashtbl.add hxpack_to_jpack (jpath_to_hx (pack,name)) (pack,name))
+			| _ -> ()
+		) (Zip.entries (Lazy.force zip))
+
+	method private lookup' ((pack,name) : path) : java_lib_type =
+		try
+			let zip = Lazy.force zip in
+			let location = (String.concat "/" (pack @ [name]) ^ ".class") in
+			let entry = Zip.find_entry zip location in
+			let data = Zip.read_entry zip entry in
+			Some(JReader.parse_class (IO.input_string data), file_path, file_path ^ "@" ^ location)
+		with
+			| Not_found ->
+				None
+
+	method lookup (path : path) : java_lib_type =
+		try
+			Hashtbl.find cached_types path
+		with | Not_found -> try
+			let pack, name = self#convert_path path in
+			let try_file (pack,name) =
+				match self#lookup' (pack,name) with
+				| None ->
+						Hashtbl.add cached_types path None;
+						None
+				| Some (i, p1, p2) ->
+						Hashtbl.add cached_types path (Some(i,p1,p2)); (* type loop normalization *)
+						let ret = Some (normalize_jclass com i, p1, p2) in
+						Hashtbl.replace cached_types path ret;
+						ret
+			in
+			try_file (pack,name)
+		with Not_found ->
+			None
+
+	method close =
+		if not closed then begin
+			closed <- true;
+			Zip.close_in (Lazy.force zip)
+		end
+
+	method private list_modules' : path list =
+		let ret = ref [] in
+		List.iter (function
+			| { Zip.is_directory = false; Zip.filename = f } when (String.sub (String.uncapitalize f) (String.length f - 6) 6) = ".class" && not (String.exists f "$") ->
+					(match List.rev (String.nsplit f "/") with
+					| clsname :: pack ->
+						if not (String.contains clsname '$') then begin
+							let path = jpath_to_hx (List.rev pack, String.sub clsname 0 (String.length clsname - 6)) in
+							ret := path :: !ret
+						end
+					| _ ->
+							ret := ([], jname_to_hx f) :: !ret)
+			| _ -> ()
+		) (Zip.entries (Lazy.force zip));
+		!ret
+
+	method list_modules : path list = match cached_files with
+		| None ->
+			let ret = self#list_modules' in
+			cached_files <- Some ret;
+			ret
+		| Some r ->
+			r
+end
+
+class java_library_dir com name file_path = object(self)
+	inherit java_library com name file_path
+
+	val mutable files = []
+
+	method load =
+		let all = ref [] in
+		let rec iter_files pack dir path = try
+			let file = Unix.readdir dir in
+			let filepath = path ^ "/" ^ file in
+			(if String.ends_with file ".class" then
+				let name = String.sub file 0 (String.length file - 6) in
+				let path = jpath_to_hx (pack,name) in
+				if not (String.exists file "$") then all := path :: !all;
+				Hashtbl.add hxpack_to_jpack path (pack,name)
+			else if (Unix.stat filepath).st_kind = S_DIR && file <> "." && file <> ".." then
+				let pack = pack @ [file] in
+				iter_files (pack) (Unix.opendir filepath) filepath);
+			iter_files pack dir path
+		with | End_of_file | Unix.Unix_error _ ->
+			Unix.closedir dir
+		in
+		iter_files [] (Unix.opendir file_path) file_path;
+		files <- !all
+
+	method close =
+		()
+
+	method list_modules =
+		files
+
+	method lookup (pack,name) : java_lib_type =
+		let real_path = file_path ^ "/" ^ (String.concat "/" pack) ^ "/" ^ (name ^ ".class") in
+		try
+			let data = Std.input_file ~bin:true real_path in
+			Some(JReader.parse_class (IO.input_string data), real_path, real_path)
+		with
+			| _ -> None
+end
+
+let add_java_lib com name std extern =
+	let file = if Sys.file_exists name then
+		name
+	else try Common.find_file com name with
+		| Not_found -> try Common.find_file com (name ^ ".jar") with
+		| Not_found ->
+			failwith ("Java lib " ^ name ^ " not found")
+	in
+	let java_lib = match (Unix.stat file).st_kind with
+		| S_DIR ->
+			(new java_library_dir com name file :> java_library)
+		| _ ->
+			(new java_library_jar com name file :> java_library)
+	in
+	if std then java_lib#add_flag FlagIsStd;
+	if extern then java_lib#add_flag FlagIsExtern;
+	com.native_libs.java_libs <- (java_lib :> (java_lib_type,unit) native_library) :: com.native_libs.java_libs;
+	CommonCache.handle_native_lib com java_lib
+
+let before_generate con =
+	let java_ver = try
+			int_of_string (PMap.find "java_ver" con.defines.Define.values)
+		with | Not_found ->
+			Common.define_value con Define.JavaVer "7";
+			7
+	in
+	if java_ver < 5 then failwith ("Java version is defined to target Java " ^ string_of_int java_ver ^ ", but the compiler can only output code to versions equal or superior to Java 5");
+	let rec loop i =
+		Common.raw_define con ("java" ^ (string_of_int i));
+		if i > 0 then loop (i - 1)
+	in
+	loop java_ver
diff --git a/src/typing/overloads.ml b/src/codegen/overloads.ml
similarity index 83%
rename from src/typing/overloads.ml
rename to src/codegen/overloads.ml
index 4cc8d5ca3d46318d9f01d1176d510780f58e5eed..afe5abce524a5ad7020757d335d521a0c9794436 100644
--- a/src/typing/overloads.ml
+++ b/src/codegen/overloads.ml
@@ -1,45 +1,75 @@
+open Globals
 open Type
+open Typecore
 
-let same_overload_args ?(get_vmtype) t1 t2 f1 f2 =
+type overload_args_comparison =
+  | Same
+  | Different
+  | Impl_conflict
+
+let distinguishes_funs_as_params ctx =
+  	match ctx.com.platform with
+  	| Java -> false
+  	| _ -> true
+
+let compare_overload_args ?(get_vmtype) ?(ctx) t1 t2 f1 f2 =
 	let get_vmtype = match get_vmtype with
 		| None -> (fun f -> f)
 		| Some f -> f
 	in
 	if List.length f1.cf_params <> List.length f2.cf_params then
-		false
+		Different
 	else
+	let amb_funs =
+		match ctx with
+		| None -> false
+		| Some ctx -> not (distinguishes_funs_as_params ctx) in
 	let rec follow_skip_null t = match t with
 		| TMono r ->
 			(match !r with
 			| Some t -> follow_skip_null t
 			| _ -> t)
 		| TLazy f ->
-			follow_skip_null (!f())
-		| TType ({ t_path = [],"Null" } as t, [p]) ->
-			TType(t,[follow p])
+			follow_skip_null (lazy_type f)
+		| TAbstract ({ a_path = [],"Null" } as a, [p]) ->
+			TAbstract(a,[follow p])
 		| TType (t,tl) ->
 			follow_skip_null (apply_params t.t_params tl t.t_type)
 		| _ -> t
 	in
-	let same_arg t1 t2 =
+	let compare_type t1 t2 =
+		(if type_iseq t1 t2 then
+			Same
+		else if amb_funs && type_iseq (ambiguate_funs t1) (ambiguate_funs t2) then
+			Impl_conflict
+		else
+			Different) in
+	let compare_arg t1 t2 =
 		let t1 = get_vmtype (follow_skip_null t1) in
 		let t2 = get_vmtype (follow_skip_null t2) in
 		match t1, t2 with
-			| TType _, TType _ -> type_iseq t1 t2
+			| TType _, TType _ -> compare_type t1 t2
 			| TType _, _
-			| _, TType _ -> false
-			| _ -> type_iseq t1 t2
+			| _, TType _ -> Different
+			| _ -> compare_type t1 t2
 	in
 
 	match follow (apply_params f1.cf_params (List.map (fun (_,t) -> t) f2.cf_params) t1), follow t2 with
 		| TFun(a1,_), TFun(a2,_) ->
-			(try
-				List.for_all2 (fun (_,_,t1) (_,_,t2) ->
-				same_arg t1 t2) a1 a2
-			with | Invalid_argument("List.for_all2") ->
-				false)
+			let rec loop args1 args2 =
+				match args1, args2 with
+				| [], [] -> Same
+				| [], _ | _, [] -> Different
+				| (_,_,t1) :: rest1, (_,_,t2) :: rest2 ->
+					match compare_arg t1 t2 with
+					| Same -> loop rest1 rest2
+					| result -> result
+			in
+			loop a1 a2
 		| _ -> assert false
 
+let same_overload_args ?(get_vmtype) t1 t2 f1 f2 =
+	compare_overload_args ?get_vmtype t1 t2 f1 f2 <> Different
 
 (** retrieves all overloads from class c and field i, as (Type.t * tclass_field) list *)
 let rec get_overloads c i =
@@ -69,17 +99,17 @@ let rec get_overloads c i =
 module Resolution =
 struct
 	let rec simplify_t t = match t with
-		| TAbstract(a,_) when Meta.has Meta.CoreType a.a_meta ->
-			t
 		| TInst _ | TEnum _ ->
 			t
-		| TAbstract(a,tl) -> simplify_t (Abstract.get_underlying_type a tl)
-		| TType(({ t_path = [],"Null" } as t), [t2]) -> (match simplify_t t2 with
+		| TAbstract(({ a_path = [],"Null" } as t), [t2]) -> (match simplify_t t2 with
 			| (TAbstract(a,_) as t2) when Meta.has Meta.CoreType a.a_meta ->
-				TType(t, [simplify_t t2])
+				TAbstract(t, [simplify_t t2])
 			| (TEnum _ as t2) ->
-				TType(t, [simplify_t t2])
+				TAbstract(t, [simplify_t t2])
 			| t2 -> t2)
+		| TAbstract(a,_) when Meta.has Meta.CoreType a.a_meta ->
+			t
+		| TAbstract(a,tl) -> simplify_t (Abstract.get_underlying_type a tl)
 		| TType(t, tl) ->
 			simplify_t (apply_params t.t_params tl t.t_type)
 		| TMono r -> (match !r with
@@ -87,7 +117,7 @@ struct
 			| None -> t_dynamic)
 		| TAnon _ -> t_dynamic
 		| TDynamic _ -> t
-		| TLazy f -> simplify_t (!f())
+		| TLazy f -> simplify_t (lazy_type f)
 		| TFun _ -> t
 
 	(* rate type parameters *)
@@ -143,10 +173,16 @@ struct
 			(cacc, 0)
 		| TDynamic _, _ ->
 			(max_int, 0) (* a function with dynamic will always be worst of all *)
-		| TAbstract(a, _), TDynamic _ when Meta.has Meta.CoreType a.a_meta ->
+		| TAbstract(a, _), TDynamic _ when Meta.has Meta.CoreType a.a_meta && a.a_path <> ([],"Null") ->
 			(cacc + 2, 0) (* a dynamic to a basic type will have an "unboxing" penalty *)
 		| _, TDynamic _ ->
 			(cacc + 1, 0)
+		| TAbstract({ a_path = [], "Null" }, [tf]), TAbstract({ a_path = [], "Null" }, [ta]) ->
+			rate_conv (cacc+0) tf ta
+		| TAbstract({ a_path = [], "Null" }, [tf]), ta ->
+			rate_conv (cacc+1) tf ta
+		| tf, TAbstract({ a_path = [], "Null" }, [ta]) ->
+			rate_conv (cacc+1) tf ta
 		| TAbstract(af,tlf), TAbstract(aa,tla) ->
 			(if af == aa then
 				(cacc, rate_tp tlf tla)
@@ -169,12 +205,6 @@ struct
 					Option.get !ret
 			else
 				raise Not_found)
-		| TType({ t_path = [], "Null" }, [tf]), TType({ t_path = [], "Null" }, [ta]) ->
-			rate_conv (cacc+0) tf ta
-		| TType({ t_path = [], "Null" }, [tf]), ta ->
-			rate_conv (cacc+1) tf ta
-		| tf, TType({ t_path = [], "Null" }, [ta]) ->
-			rate_conv (cacc+1) tf ta
 		| TFun _, TFun _ -> (* unify will make sure they are compatible *)
 			cacc,0
 		| tfun,targ ->
@@ -258,4 +288,4 @@ struct
 
 			let r = loop [] !rated in
 			List.map fst r
-end
\ No newline at end of file
+end
diff --git a/src/codegen/swfLoader.ml b/src/codegen/swfLoader.ml
new file mode 100644
index 0000000000000000000000000000000000000000..dbfbf906a394eb59cee5bc7ddcfb50eff8f80ff3
--- /dev/null
+++ b/src/codegen/swfLoader.ml
@@ -0,0 +1,663 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Swf
+open As3
+open As3hl
+open Common
+open Globals
+open Ast
+open NativeLibraries
+
+let lowercase_pack pack =
+	let rec loop acc pack =
+		match pack with
+		| [] -> List.rev acc
+		| name :: rest ->
+			let name =
+				let fchar = String.get name 0 in
+				if fchar >= 'A' && fchar <= 'Z' then
+					(String.make 1 (Char.lowercase fchar)) ^ String.sub name 1 (String.length name - 1)
+				else
+					name
+			in
+			loop (name :: acc) rest
+	in
+	loop [] pack
+
+
+let tp_dyn = { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None; }
+
+let ct_dyn = CTPath tp_dyn
+
+let ct_rest = CTPath {
+	tpackage = ["haxe"; "extern"];
+	tname = "Rest";
+	tparams = [TPType (ct_dyn,null_pos)];
+	tsub = None;
+}
+
+let rec make_tpath = function
+	| HMPath (pack,name) ->
+		let pdyn = ref false in
+		let pack, name = match pack, name with
+			| [], "void" -> [], "Void"
+			| [], "int" -> [], "Int"
+			| [], "uint" -> [], "UInt"
+			| [], "Number" -> [], "Float"
+			| [], "Boolean" -> [], "Bool"
+			| [], "Object" -> ["flash";"utils"], "Object"
+			| [], "Function" -> ["flash";"utils"], "Function"
+			| [], "Class" | [],"Array" -> pdyn := true; pack, name
+			| [], "Error" -> ["flash";"errors"], "Error"
+			| [] , "XML" -> ["flash";"xml"], "XML"
+			| [] , "XMLList" -> ["flash";"xml"], "XMLList"
+			| [] , "QName" -> ["flash";"utils"], "QName"
+			| [] , "Namespace" -> ["flash";"utils"], "Namespace"
+			| [] , "RegExp" -> ["flash";"utils"], "RegExp"
+			| ["__AS3__";"vec"] , "Vector" -> ["flash"], "Vector"
+			| _ -> lowercase_pack pack, name
+		in
+		{
+			tpackage = pack;
+			tname = name;
+			tparams = if !pdyn then [TPType (ct_dyn,null_pos)] else[];
+			tsub = None;
+		}
+	| HMName (id,ns) ->
+		{
+			tpackage = (match ns with
+				| HNInternal (Some ns) -> ExtString.String.nsplit ns "."
+				| HNPrivate (Some ns) ->
+					(try
+						let file, line = ExtString.String.split ns ".as$" in
+						[file ^ "_" ^ line]
+					with _ ->
+						[])
+				| _ -> []);
+			tname = id;
+			tparams = [];
+			tsub = None;
+		}
+	| HMNSAny (id) ->
+		{
+			tpackage = [];
+			tname = id;
+			tparams = [];
+			tsub = None;
+		}
+	| HMMultiName _ ->
+		assert false
+	| HMRuntimeName _ ->
+		assert false
+	| HMRuntimeNameLate ->
+		assert false
+	| HMMultiNameLate _ ->
+		assert false
+	| HMAttrib _ ->
+		assert false
+	| HMAny ->
+		assert false
+	| HMParams (t,params) ->
+		let params = List.map (fun t -> TPType (CTPath (make_tpath t),null_pos)) params in
+		{ (make_tpath t) with tparams = params }
+
+let make_topt = function
+	| None -> tp_dyn
+	| Some t -> make_tpath t
+
+let make_type t = CTPath (make_topt t)
+
+let make_dyn_type t =
+	match make_topt t with
+	| { tpackage = ["flash";"utils"]; tname = ("Object"|"Function") } -> make_type None
+	| o -> CTPath o
+
+let is_valid_path com pack name =
+	let rec loop = function
+		| [] ->
+			false
+		| (file,load) :: l ->
+			match load (pack,name) null_pos with
+			| None -> loop l
+			| Some (_,a) -> true
+	in
+	let file = Printf.sprintf "%s/%s.hx" (String.concat "/" pack) name in
+	loop com.load_extern_type || (try ignore(Common.find_file com file); true with Not_found -> false)
+
+let build_class com c file =
+	let path = make_tpath c.hlc_name in
+	let pos = { pfile = file ^ "@" ^ s_type_path (path.tpackage,path.tname); pmin = 0; pmax = 0 } in
+	match path with
+	| { tpackage = ["flash";"utils"]; tname = ("Object"|"Function") } ->
+		let inf = {
+			d_name = path.tname,null_pos;
+			d_doc = None;
+			d_params = [];
+			d_meta = [];
+			d_flags = [];
+			d_data = ct_dyn,null_pos;
+		} in
+		(path.tpackage, [(ETypedef inf,pos)])
+	| _ ->
+	(* make flags *)
+	let flags = [HExtern] in
+	let flags = if c.hlc_interface then HInterface :: flags else flags in
+	let flags = (match c.hlc_super with
+		| None | Some (HMPath ([],"Object")) -> flags
+		| Some (HMPath ([],"Function")) -> flags (* found in AIR SDK *)
+		| Some s -> HExtends (make_tpath s,null_pos) :: flags
+	) in
+	let flags = List.map (fun i ->
+		let i = (match i with
+			| HMMultiName (Some id,ns) ->
+				let rec loop = function
+					| [] -> HMPath ([],id)
+					| HNPublic (Some ns) :: _ when is_valid_path com (ExtString.String.nsplit ns ".") id -> HMPath (ExtString.String.nsplit ns ".",id)
+					| _ :: l -> loop l
+				in
+				loop ns
+			| HMPath _ -> i
+			| _ -> assert false
+		) in
+		if c.hlc_interface then HExtends (make_tpath i,null_pos) else HImplements (make_tpath i,null_pos)
+	) (Array.to_list c.hlc_implements) @ flags in
+	let flags = if c.hlc_sealed || Common.defined com Define.FlashStrict then flags else HImplements (tp_dyn,null_pos) :: flags in
+	(* make fields *)
+	let getters = Hashtbl.create 0 in
+	let setters = Hashtbl.create 0 in
+	let override = Hashtbl.create 0 in
+	let is_xml = (match path.tpackage, path.tname with
+		| ["flash";"xml"], ("XML" | "XMLList") -> true
+		| _ -> false
+	) in
+	let make_field stat acc f =
+		let meta = ref [] in
+		let flags = (match f.hlf_name with
+			| HMPath _ -> [APublic,null_pos]
+			| HMName (_,ns) ->
+				(match ns with
+				| HNPrivate _ | HNNamespace "http://www.adobe.com/2006/flex/mx/internal" -> []
+				| HNNamespace ns ->
+					if not (c.hlc_interface || is_xml) then meta := (Meta.Ns,[String(ns,SDoubleQuotes)]) :: !meta;
+					[APublic,null_pos]
+				| HNInternal (Some ns) ->
+					if not (c.hlc_interface || is_xml) then meta := (Meta.Ns,[String(ns,SDoubleQuotes); Ident "internal"]) :: !meta;
+					[APublic,null_pos]
+				| HNExplicit _ | HNInternal _ | HNPublic _ ->
+					[APublic,null_pos]
+				| HNStaticProtected _ | HNProtected _ ->
+					meta := (Meta.Protected,[]) :: !meta;
+					[APrivate,null_pos])
+			| _ -> []
+		) in
+		if flags = [] then acc else
+		let flags = if stat then (AStatic,null_pos) :: flags else flags in
+		let name = (make_tpath f.hlf_name).tname in
+		let mk_meta() =
+			List.map (fun (s,cl) -> s, List.map (fun c -> EConst c,pos) cl, pos) (!meta)
+		in
+		let cf = {
+			cff_name = name,null_pos;
+			cff_doc = None;
+			cff_pos = pos;
+			cff_meta = [];
+			cff_access = flags;
+			cff_kind = FVar (None,None);
+		} in
+		match f.hlf_kind with
+		| HFVar v ->
+			cf.cff_meta <- mk_meta();
+			cf.cff_kind <- FVar (Some (make_dyn_type v.hlv_type,null_pos),None);
+			if v.hlv_const then begin
+				cf.cff_access <- (AFinal,null_pos) :: cf.cff_access;
+			end;
+			cf :: acc
+		| HFMethod m when m.hlm_override ->
+			Hashtbl.add override (name,stat) ();
+			acc
+		| HFMethod m ->
+			(match m.hlm_kind with
+			| MK3Normal ->
+				let t = m.hlm_type in
+				let p = ref 0 and pn = ref 0 in
+				let make_type = if stat || name = "new" then make_dyn_type else make_type in
+				let args = List.map (fun at ->
+					let aname = (match t.hlmt_pnames with
+						| None -> incr pn; "p" ^ string_of_int !pn
+						| Some l ->
+							match List.nth l !p with
+							| None -> incr pn; "p" ^ string_of_int !pn
+							| Some i -> i
+					) in
+					let opt_val = (match t.hlmt_dparams with
+						| None -> None
+						| Some l ->
+							try
+								Some (List.nth l (!p - List.length t.hlmt_args + List.length l))
+							with
+								_ -> None
+					) in
+					incr p;
+					let t = make_type at in
+					let is_opt = ref false in
+					let def_val = match opt_val with
+						| None -> None
+						| Some v ->
+							let v = (match v with
+							| HVNone | HVNull | HVNamespace _ | HVString _ ->
+								is_opt := true;
+								None
+							| HVBool b ->
+								Some (Ident (if b then "true" else "false"))
+							| HVInt i | HVUInt i ->
+								Some (Int (Int32.to_string i))
+							| HVFloat f ->
+								Some (Float (Numeric.float_repres f))
+							) in
+							match v with
+							| None -> None
+							| Some v ->
+								(* add for -D gen-hx-classes generation *)
+								meta := (Meta.DefParam,[String(aname,SDoubleQuotes);v]) :: !meta;
+								Some (EConst v,pos)
+					in
+					((aname,null_pos),!is_opt,[],Some (t,null_pos),def_val)
+				) t.hlmt_args in
+				let args = if t.hlmt_var_args then
+					args @ [("restArgs",null_pos),false,[],Some (ct_rest,null_pos),None]
+				else args in
+				let f = {
+					f_params = [];
+					f_args = args;
+					f_type = Some (make_type t.hlmt_ret,null_pos);
+					f_expr = None;
+				} in
+				cf.cff_meta <- mk_meta();
+				cf.cff_kind <- FFun f;
+				cf :: acc
+			| MK3Getter ->
+				Hashtbl.add getters (name,stat) (m.hlm_type.hlmt_ret,mk_meta());
+				acc
+			| MK3Setter ->
+				Hashtbl.add setters (name,stat) ((match m.hlm_type.hlmt_args with [t] -> t | _ -> assert false),mk_meta());
+				acc
+			)
+		| _ -> acc
+	in
+	let fields = if c.hlc_interface then [] else make_field false [] {
+		hlf_name = HMPath ([],"new");
+		hlf_slot = 0;
+		hlf_metas = None;
+		hlf_kind = HFMethod {
+			hlm_type = { c.hlc_construct with hlmt_ret = Some (HMPath ([],"void")) };
+			hlm_final = false;
+			hlm_override = false;
+			hlm_kind = MK3Normal
+		}
+	} in
+	let fields = Array.fold_left (make_field false) fields c.hlc_fields in
+	let fields = Array.fold_left (make_field true) fields c.hlc_static_fields in
+	let make_get_set name stat tget tset =
+		let get, set, t, meta = (match tget, tset with
+			| None, None -> assert false
+			| Some (t,meta), None -> true, false, t, meta
+			| None, Some (t,meta) -> false, true, t, meta
+			| Some (t1,meta1), Some (t2,meta2) -> true, true, (if t1 <> t2 then None else t1), meta1 @ (List.filter (fun m -> not (List.mem m meta1)) meta2)
+		) in
+		let t = if name = "endian" then Some (HMPath (["flash";"utils"],"Endian")) else t in
+		let flags, accessor_flags = [APublic,null_pos], [APrivate,null_pos] in
+		let flags, accessor_flags = if stat then (AStatic,null_pos) :: flags, (AStatic,null_pos) :: accessor_flags else flags, accessor_flags in
+		let property_typehint = Some (make_dyn_type t,null_pos) in
+		let fields = [] in
+		let read_access, fields =
+			if get then
+				let getter = {
+					cff_name = "get_" ^ name,null_pos;
+					cff_pos = pos;
+					cff_doc = None;
+					cff_access = accessor_flags;
+					cff_meta = [];
+					cff_kind = FFun {
+						f_params = [];
+						f_args = [];
+						f_type = property_typehint;
+						f_expr = None;
+					};
+				} in
+				("get",null_pos), getter :: fields
+			else
+				("never",null_pos), fields
+		in
+		let write_access, fields =
+			if set then
+				let setter = {
+					cff_name = "set_" ^ name,null_pos;
+					cff_pos = pos;
+					cff_doc = None;
+					cff_access = accessor_flags;
+					cff_meta = [];
+					cff_kind = FFun {
+						f_params = [];
+						f_args = [(("value",null_pos),false,[],property_typehint,None)];
+						f_type = property_typehint;
+						f_expr = None;
+					};
+				} in
+				("set",null_pos), setter :: fields
+			else
+				("never",null_pos), fields
+		in
+		{
+			cff_name = name,null_pos;
+			cff_pos = pos;
+			cff_doc = None;
+			cff_access = flags;
+			cff_meta = (Meta.FlashProperty,[],pos) :: meta;
+			cff_kind = FProp (read_access,write_access,property_typehint,None);
+		} :: fields
+	in
+	let fields = Hashtbl.fold (fun (name,stat) t acc ->
+		if Hashtbl.mem override (name,stat) then acc else
+		make_get_set name stat (Some t) (try Some (Hashtbl.find setters (name,stat)) with Not_found -> None) @ acc
+	) getters fields in
+	let fields = Hashtbl.fold (fun (name,stat) t acc ->
+		if Hashtbl.mem getters (name,stat) || Hashtbl.mem override (name,stat) then
+			acc
+		else
+			make_get_set name stat None (Some t) @ acc
+	) setters fields in
+	try
+		(*
+			If the class only contains static String constants, make it an enum
+		*)
+		let real_type = ref None in
+		let rec loop = function
+			| [] -> []
+			| f :: l ->
+				match f.cff_kind with
+				| FVar (Some ((CTPath { tpackage = []; tname = ("String" | "Int" | "UInt")} as real_t),_),None)
+				| FProp (("default",_),("never",_),Some ((CTPath { tpackage = []; tname = ("String" | "Int" | "UInt")}) as real_t,_),None) when List.mem_assoc AStatic f.cff_access ->
+					(match !real_type with
+					| None ->
+						real_type := Some real_t
+					| Some t ->
+						if t <> real_t then raise Exit);
+					{
+						cff_name = f.cff_name;
+						cff_doc = None;
+						cff_pos = pos;
+						cff_meta = [];
+						cff_access = [];
+						cff_kind = FVar (Some (real_t,null_pos), None);
+					} :: loop l
+				| FFun { f_args = [] } when fst f.cff_name = "new" -> loop l
+				| _ -> raise Exit
+		in
+		List.iter (function HExtends _ | HImplements _ -> raise Exit | _ -> ()) flags;
+		let constr = loop fields in
+		let name = "enumAbstract:" ^ String.concat "." (path.tpackage @ [path.tname]) in
+		if not (Common.raw_defined com name) then raise Exit;
+		let native_path = s_type_path (path.tpackage, path.tname) in
+		let real_type = Option.get !real_type in
+		let abstract_data = {
+			d_name = path.tname,null_pos;
+			d_doc = None;
+			d_params = [];
+			d_meta = [(Meta.Enum,[],null_pos);(Meta.Native,[(EConst (String(native_path,SDoubleQuotes)),null_pos)],null_pos)];
+			d_flags = [AbExtern; AbOver (real_type,pos); AbFrom (real_type,pos)];
+			d_data = constr;
+		} in
+		(path.tpackage, [(EAbstract abstract_data,pos)])
+	with Exit ->
+	let flags = if c.hlc_final && List.exists (fun f -> fst f.cff_name <> "new" && not (List.mem_assoc AStatic f.cff_access)) fields then HFinal :: flags else flags in
+
+	let meta =
+		(* if the package was lowercased, add @:native("Original.Path") meta *)
+		match c.hlc_name with
+		| HMPath (pack,name) when (pack <> [] && pack <> path.tpackage) ->
+			let native_path = (String.concat "." pack) ^ "." ^ name in
+			[(Meta.Native,[(EConst (String(native_path,SDoubleQuotes)), pos)],pos)]
+		| _ ->
+			[]
+	in
+
+	let class_data = {
+		d_name = path.tname,null_pos;
+		d_doc = None;
+		d_params = [];
+		d_meta = meta;
+		d_flags = flags;
+		d_data = fields;
+	} in
+	(path.tpackage, [(EClass class_data,pos)])
+
+let extract_data (_,tags) =
+	let t = Timer.timer ["read";"swf"] in
+	let h = Hashtbl.create 0 in
+	let rec loop_field f =
+		match f.hlf_kind with
+		| HFClass c ->
+			let path = make_tpath f.hlf_name in
+			(match path with
+			| { tpackage = []; tname = "Float" | "Bool" | "Int" | "UInt" | "Dynamic" } -> ()
+			| { tpackage = _; tname = "MethodClosure" } -> ()
+			| _ -> Hashtbl.add h (path.tpackage,path.tname) c)
+		| _ -> ()
+	in
+	List.iter (fun t ->
+		match t.tdata with
+		| TActionScript3 (_,as3) ->
+			List.iter (fun i -> Array.iter loop_field i.hls_fields) (As3hlparse.parse as3)
+		| _ -> ()
+	) tags;
+	t();
+	h
+
+let remove_debug_infos as3 =
+	let hl = As3hlparse.parse as3 in
+	let methods = Hashtbl.create 0 in
+	let rec loop_field f =
+		{ f with hlf_kind = (match f.hlf_kind with
+			| HFMethod m -> HFMethod { m with hlm_type = loop_method m.hlm_type }
+			| HFFunction f -> HFFunction (loop_method f)
+			| HFVar v -> HFVar v
+			| HFClass c -> HFClass (loop_class c))
+		}
+	and loop_class c =
+		(* mutate in order to preserve sharing *)
+		c.hlc_construct <- loop_method c.hlc_construct;
+		c.hlc_fields <- Array.map loop_field c.hlc_fields;
+		c.hlc_static_construct <- loop_method c.hlc_static_construct;
+		c.hlc_static_fields <- Array.map loop_field c.hlc_static_fields;
+		c
+	and loop_static s =
+		{
+			hls_method = loop_method s.hls_method;
+			hls_fields = Array.map loop_field s.hls_fields;
+		}
+	and loop_method m =
+		try
+			Hashtbl.find methods m.hlmt_index
+		with Not_found ->
+			let m2 = { m with hlmt_debug_name = None; hlmt_pnames = None } in
+			Hashtbl.add methods m.hlmt_index m2;
+			m2.hlmt_function <- (match m.hlmt_function with None -> None | Some f -> Some (loop_function f));
+			m2
+	and loop_function f =
+		let cur = ref 0 in
+		let positions = MultiArray.map (fun op ->
+			let p = !cur in
+			(match op with
+			| HDebugReg _ | HDebugLine _ | HDebugFile _ | HBreakPointLine _ | HTimestamp -> ()
+			| _ -> incr cur);
+			p
+		) f.hlf_code in
+		MultiArray.add positions (!cur);
+		let code = MultiArray.create() in
+		MultiArray.iteri (fun pos op ->
+			match op with
+			| HDebugReg _ | HDebugLine _ | HDebugFile _ | HBreakPointLine _ | HTimestamp -> ()
+			| _ ->
+				let p delta =
+					MultiArray.get positions (pos + delta) - MultiArray.length code
+				in
+				let op = (match op with
+				| HJump (j,delta) -> HJump (j, p delta)
+				| HSwitch (d,deltas) -> HSwitch (p d,List.map p deltas)
+				| HFunction m -> HFunction (loop_method m)
+				| HCallStatic (m,args) -> HCallStatic (loop_method m,args)
+				| HClassDef c -> HClassDef c (* mutated *)
+				| _ -> op) in
+				MultiArray.add code op
+		) f.hlf_code;
+		f.hlf_code <- code;
+		f.hlf_trys <- Array.map (fun t ->
+			{
+				t with
+				hltc_start = MultiArray.get positions t.hltc_start;
+				hltc_end = MultiArray.get positions t.hltc_end;
+				hltc_handle = MultiArray.get positions t.hltc_handle;
+			}
+		) f.hlf_trys;
+		f
+	in
+	As3hlparse.flatten (List.map loop_static hl)
+
+let parse_swf com file =
+	let t = Timer.timer ["read";"swf"] in
+	let is_swc = file_extension file = "swc" || file_extension file = "ane" in
+	let ch = if is_swc then begin
+		let zip = Zip.open_in file in
+		try
+			let entry = Zip.find_entry zip "library.swf" in
+			let ch = IO.input_string (Zip.read_entry zip entry) in
+			Zip.close_in zip;
+			ch
+		with _ ->
+			Zip.close_in zip;
+			failwith ("The input swc " ^ file ^ " is corrupted")
+	end else
+		IO.input_channel (open_in_bin file)
+	in
+	let h, tags = try
+		Swf.parse ch
+	with Out_of_memory ->
+		failwith ("Out of memory while parsing " ^ file)
+	| _ ->
+		failwith ("The input swf " ^ file ^ " is corrupted")
+	in
+	IO.close_in ch;
+	List.iter (fun t ->
+		match t.tdata with
+		| TActionScript3 (id,as3) when not com.debug && not com.display.DisplayTypes.DisplayMode.dms_display ->
+			t.tdata <- TActionScript3 (id,remove_debug_infos as3)
+		| _ -> ()
+	) tags;
+	t();
+	(h,tags)
+
+class swf_library com name file_path = object(self)
+	inherit [swf_lib_type,Swf.swf] native_library name file_path
+
+	val mutable swf_data = None
+	val mutable swf_classes = None
+	val haxe_classes = Hashtbl.create 0
+
+	method load =
+		ignore(self#get_swf)
+
+	method get_swf = match swf_data with
+		| None ->
+			let d = parse_swf com file_path in
+			swf_data <- Some d;
+			d
+		| Some d ->
+			d
+
+	method extract = match swf_classes with
+		| None ->
+			let d = extract_data self#get_swf in
+			swf_classes <- Some d;
+			d
+		| Some d ->
+			d
+
+	method lookup path =
+		try Some (Hashtbl.find (self#extract) path)
+		with Not_found -> None
+
+	method list_modules =
+		Hashtbl.fold (fun path _ acc -> path :: acc) (self#extract) []
+
+	method close =
+		()
+
+	method build (path : path) (p : pos) : Ast.package option =
+		try
+			Some (Hashtbl.find haxe_classes path)
+		with Not_found -> try
+			let c = Hashtbl.find (self#extract) path in
+			let c = build_class com c file_path in
+			Hashtbl.add haxe_classes path c;
+			Some c
+		with Not_found ->
+			None
+
+	method get_data = self#get_swf
+end
+
+let add_swf_lib com file extern =
+	let real_file = (try Common.find_file com file with Not_found -> failwith (" Library not found : " ^ file)) in
+	let swf_lib = new swf_library com file real_file in
+	if not extern then com.native_libs.swf_libs <- (swf_lib :> (swf_lib_type,Swf.swf) native_library) :: com.native_libs.swf_libs;
+	CommonCache.handle_native_lib com swf_lib
+
+let remove_classes toremove lib l =
+	match !toremove with
+	| [] -> lib
+	| _ ->
+		let hcl = Hashtbl.create 0 in
+		List.iter (fun path -> Hashtbl.add hcl path ()) l;
+		match List.filter (fun c -> Hashtbl.mem hcl c) (!toremove) with
+		| [] -> lib
+		| classes ->
+			let rec tags = function
+				| [] -> []
+				| t :: l ->
+					match t.tdata with
+					| TActionScript3 (h,data) ->
+						let data = As3hlparse.parse data in
+						let rec loop f =
+							match f.hlf_kind with
+							| HFClass _ ->
+								let path = make_tpath f.hlf_name in
+								not (List.mem (path.tpackage,path.tname) classes)
+							| _ -> true
+						in
+						let data = List.map (fun s -> { s with hls_fields = Array.of_list (List.filter loop (Array.to_list s.hls_fields)) }) data in
+						let data = List.filter (fun s -> Array.length s.hls_fields > 0) data in
+						(if data = [] then
+							tags l
+						else
+							{ t with tdata = TActionScript3 (h,As3hlparse.flatten data) } :: tags l)
+					| _ ->
+						t :: tags l
+			in
+			toremove := List.filter (fun p -> not (List.mem p classes)) !toremove;
+			fst lib, tags (snd lib)
diff --git a/src/compiler/displayOutput.ml b/src/compiler/displayOutput.ml
new file mode 100644
index 0000000000000000000000000000000000000000..9c2bafc55638cf3680a6cd33b9c374d8dfdea7d0
--- /dev/null
+++ b/src/compiler/displayOutput.ml
@@ -0,0 +1,452 @@
+open Globals
+open Ast
+open Common
+open Filename
+open CompilationServer
+open Timer
+open DisplayTypes.DisplayMode
+open DisplayTypes.CompletionResultKind
+open CompletionItem
+open CompletionClassField
+open CompletionEnumField
+open ClassFieldOrigin
+open DisplayException
+open Type
+open Display
+open DisplayTypes
+open CompletionModuleType
+open Typecore
+open Genjson
+
+(* Old XML stuff *)
+
+let htmlescape s =
+	let s = String.concat "&amp;" (ExtString.String.nsplit s "&") in
+	let s = String.concat "&lt;" (ExtString.String.nsplit s "<") in
+	let s = String.concat "&gt;" (ExtString.String.nsplit s ">") in
+	let s = String.concat "&quot;" (ExtString.String.nsplit s "\"") in
+	s
+
+let get_timer_fields start_time =
+	let tot = ref 0. in
+	Hashtbl.iter (fun _ t -> tot := !tot +. t.total) Timer.htimers;
+	let fields = [("@TOTAL", Printf.sprintf "%.3fs" (get_time() -. start_time))] in
+	if !tot > 0. then
+		Hashtbl.fold (fun _ t acc ->
+			((String.concat "." t.id),(Printf.sprintf "%.3fs (%.0f%%)" t.total (t.total *. 100. /. !tot))) :: acc
+		) Timer.htimers fields
+	else
+		fields
+
+let print_keywords () =
+	let b = Buffer.create 0 in
+	Buffer.add_string b "<list>\n";
+	Hashtbl.iter (fun k _ ->
+		Buffer.add_string b (Printf.sprintf "<i n=\"%s\"></i>\n" k)
+	) Lexer.keywords;
+	Buffer.add_string b "</list>\n";
+	Buffer.contents b
+
+let print_fields fields =
+	let b = Buffer.create 0 in
+	Buffer.add_string b "<list>\n";
+	let convert k = match k.ci_kind with
+		| ITClassField({field = cf}) | ITEnumAbstractField(_,{field = cf}) ->
+			let kind = match cf.cf_kind with
+				| Method _ -> "method"
+				| Var _ -> "var"
+			in
+			kind,cf.cf_name,s_type (print_context()) cf.cf_type,cf.cf_doc
+		| ITEnumField ef ->
+			let ef = ef.efield in
+			let kind = match follow ef.ef_type with
+				| TFun _ -> "method"
+				| _ -> "var"
+			in
+			kind,ef.ef_name,s_type (print_context()) ef.ef_type,ef.ef_doc
+		| ITType(cm,_) ->
+			let path = CompletionItem.CompletionModuleType.get_path cm in
+			"type",snd path,s_type_path path,None
+		| ITPackage(path,_) -> "package",snd path,"",None
+		| ITModule path -> "type",snd path,"",None
+		| ITMetadata  meta ->
+			let s,(doc,_) = Meta.get_info meta in
+			"metadata","@" ^ s,"",Some doc
+		| ITTimer(name,value) -> "timer",name,"",Some value
+		| ITLiteral s ->
+			let t = match k.ci_type with None -> t_dynamic | Some (t,_) -> t in
+			"literal",s,s_type (print_context()) t,None
+		| ITLocal v -> "local",v.v_name,s_type (print_context()) v.v_type,None
+		| ITKeyword kwd -> "keyword",Ast.s_keyword kwd,"",None
+		| ITExpression _ | ITAnonymous _ | ITTypeParameter _ | ITDefine _ -> assert false
+	in
+	let fields = List.sort (fun k1 k2 -> compare (legacy_sort k1) (legacy_sort k2)) fields in
+	let fields = List.map convert fields in
+	List.iter (fun(k,n,t,d) ->
+		let d = match d with None -> "" | Some d -> d in
+		Buffer.add_string b (Printf.sprintf "<i n=\"%s\" k=\"%s\"><t>%s</t><d>%s</d></i>\n" n k (htmlescape t) (htmlescape d))
+	) fields;
+	Buffer.add_string b "</list>\n";
+	Buffer.contents b
+
+let maybe_print_doc d =
+	Option.map_default (fun s -> Printf.sprintf " d=\"%s\"" (htmlescape s)) "" d
+
+let print_toplevel il =
+	let b = Buffer.create 0 in
+	Buffer.add_string b "<il>\n";
+	let s_type t = htmlescape (s_type (print_context()) t) in
+	let s_doc d = maybe_print_doc d in
+	let identifiers = Hashtbl.create 0 in
+	let check_ident s =
+		if Hashtbl.mem identifiers s then false
+		else begin
+			Hashtbl.add identifiers s true;
+			true
+		end
+	in
+	List.iter (fun id -> match id.ci_kind with
+		| ITLocal v ->
+			if check_ident v.v_name then Buffer.add_string b (Printf.sprintf "<i k=\"local\" t=\"%s\">%s</i>\n" (s_type v.v_type) v.v_name);
+		| ITClassField({field = cf;scope = CFSMember}) ->
+			if check_ident cf.cf_name then Buffer.add_string b (Printf.sprintf "<i k=\"member\" t=\"%s\"%s>%s</i>\n" (s_type cf.cf_type) (s_doc cf.cf_doc) cf.cf_name);
+		| ITClassField({field = cf;scope = (CFSStatic | CFSConstructor)}) ->
+			if check_ident cf.cf_name then Buffer.add_string b (Printf.sprintf "<i k=\"static\" t=\"%s\"%s>%s</i>\n" (s_type cf.cf_type) (s_doc cf.cf_doc) cf.cf_name);
+		| ITEnumField ef ->
+			let ef = ef.efield in
+			if check_ident ef.ef_name then Buffer.add_string b (Printf.sprintf "<i k=\"enum\" t=\"%s\"%s>%s</i>\n" (s_type ef.ef_type) (s_doc ef.ef_doc) ef.ef_name);
+		| ITEnumAbstractField(a,cf) ->
+			let cf = cf.field in
+			if check_ident cf.cf_name then Buffer.add_string b (Printf.sprintf "<i k=\"enumabstract\" t=\"%s\"%s>%s</i>\n" (s_type cf.cf_type) (s_doc cf.cf_doc) cf.cf_name);
+		| ITType(cm,_) ->
+			let path = CompletionItem.CompletionModuleType.get_path cm in
+			Buffer.add_string b (Printf.sprintf "<i k=\"type\" p=\"%s\"%s>%s</i>\n" (s_type_path path) ("") cm.name);
+		| ITPackage(path,_) ->
+			Buffer.add_string b (Printf.sprintf "<i k=\"package\">%s</i>\n" (snd path))
+		| ITLiteral s ->
+			Buffer.add_string b (Printf.sprintf "<i k=\"literal\">%s</i>\n" s)
+		| ITTimer(s,_) ->
+			Buffer.add_string b (Printf.sprintf "<i k=\"timer\">%s</i>\n" s)
+		| ITTypeParameter c ->
+			Buffer.add_string b (Printf.sprintf "<i k=\"type\" p=\"%s\"%s>%s</i>\n" (s_type_path c.cl_path) ("") (snd c.cl_path));
+		| ITMetadata _ | ITModule _ | ITKeyword _ | ITAnonymous _ | ITExpression _ | ITDefine _ ->
+			(* compat: don't add *)
+			()
+	) il;
+	Buffer.add_string b "</il>";
+	Buffer.contents b
+
+let print_type t p doc =
+	let b = Buffer.create 0 in
+	if p = null_pos then
+		Buffer.add_string b "<type"
+	else begin
+		let error_printer file line = Printf.sprintf "%s:%d:" (Path.unique_full_path file) line in
+		let epos = Lexer.get_error_pos error_printer p in
+		Buffer.add_string b ("<type p=\"" ^ (htmlescape epos) ^ "\"")
+	end;
+	Buffer.add_string b (maybe_print_doc doc);
+	Buffer.add_string b ">\n";
+	Buffer.add_string b (htmlescape (s_type (print_context()) t));
+	Buffer.add_string b "\n</type>\n";
+	Buffer.contents b
+
+let print_signatures tl =
+	let b = Buffer.create 0 in
+	List.iter (fun (((args,ret),_),doc) ->
+		Buffer.add_string b "<type";
+		Option.may (fun s -> Buffer.add_string b (Printf.sprintf " d=\"%s\"" (htmlescape s))) doc;
+		Buffer.add_string b ">\n";
+		Buffer.add_string b (htmlescape (s_type (print_context()) (TFun(args,ret))));
+		Buffer.add_string b "\n</type>\n";
+	) tl;
+	Buffer.contents b
+
+let print_positions pl =
+	let b = Buffer.create 0 in
+	let error_printer file line = Printf.sprintf "%s:%d:" (Path.get_real_path file) line in
+	Buffer.add_string b "<list>\n";
+	List.iter (fun p ->
+		let epos = Lexer.get_error_pos error_printer p in
+		Buffer.add_string b "<pos>";
+		Buffer.add_string b epos;
+		Buffer.add_string b "</pos>\n";
+	) pl;
+	Buffer.add_string b "</list>";
+	Buffer.contents b
+
+(* New JSON stuff *)
+
+open Json
+
+let print_signature tl display_arg =
+	let st = s_type (print_context()) in
+	let s_arg (n,o,t) = Printf.sprintf "%s%s:%s" (if o then "?" else "") n (st t) in
+	let s_fun args ret = Printf.sprintf "(%s):%s" (String.concat ", " (List.map s_arg args)) (st ret) in
+	let siginf = List.map (fun (((args,ret),_),doc) ->
+		let label = s_fun args ret in
+		let parameters =
+			List.map (fun arg ->
+					let label = s_arg arg in
+					JObject [
+						"label",JString label
+					]
+			) args
+		in
+		let js = [
+			"label",JString label;
+			"parameters",JArray parameters;
+		] in
+		JObject (match doc with None -> js | Some s -> ("documentation",JString s) :: js)
+	) tl in
+	let jo = JObject [
+		"signatures",JArray siginf;
+		"activeParameter",JInt display_arg;
+		"activeSignature",JInt 0;
+	] in
+	string_of_json jo
+
+(* Mode processing *)
+
+exception Completion of string
+
+let unquote v =
+	let len = String.length v in
+	if len > 0 then
+		match v.[0], v.[len - 1] with
+			| '"', '"'
+			| '\'', '\'' -> String.sub v 1 (len - 2)
+			| _ -> v
+	else v
+
+let handle_display_argument com file_pos pre_compilation did_something =
+	match file_pos with
+	| "classes" ->
+		pre_compilation := (fun() -> raise (Parser.TypePath (["."],None,true,null_pos))) :: !pre_compilation;
+	| "keywords" ->
+		raise (Completion (print_keywords ()))
+	| "memory" ->
+		did_something := true;
+		(try Memory.display_memory com with e -> prerr_endline (Printexc.get_backtrace ()));
+	| "diagnostics" ->
+		Common.define com Define.NoCOpt;
+		com.display <- DisplayMode.create (DMDiagnostics true);
+		Parser.display_mode := DMDiagnostics true;
+	| _ ->
+		let file, pos = try ExtString.String.split file_pos "@" with _ -> failwith ("Invalid format: " ^ file_pos) in
+		let file = unquote file in
+		let pos, smode = try ExtString.String.split pos "@" with _ -> pos,"" in
+		let mode = match smode with
+			| "position" ->
+				Common.define com Define.NoCOpt;
+				DMDefinition
+			| "usage" ->
+				Common.define com Define.NoCOpt;
+				DMUsage false
+			(*| "rename" ->
+				Common.define com Define.NoCOpt;
+				DMUsage true*)
+			| "package" ->
+				DMPackage
+			| "type" ->
+				Common.define com Define.NoCOpt;
+				DMHover
+			| "toplevel" ->
+				DMDefault
+			| "module-symbols" ->
+				Common.define com Define.NoCOpt;
+				DMModuleSymbols None;
+			| "diagnostics" ->
+				Common.define com Define.NoCOpt;
+				DMDiagnostics false;
+			| "statistics" ->
+				Common.define com Define.NoCOpt;
+				DMStatistics
+			| "signature" ->
+				Common.define com Define.NoCOpt;
+				DMSignature
+			| "" ->
+				DMDefault
+			| _ ->
+				let smode,arg = try ExtString.String.split smode "@" with _ -> pos,"" in
+				match smode with
+					| "resolve" ->
+						DMResolve arg
+					| "workspace-symbols" ->
+						Common.define com Define.NoCOpt;
+						DMModuleSymbols (Some arg)
+					| _ ->
+						DMDefault
+		in
+		let pos = try int_of_string pos with _ -> failwith ("Invalid format: "  ^ pos) in
+		com.display <- DisplayMode.create mode;
+		Parser.display_mode := mode;
+		if not com.display.dms_full_typing then Common.define_value com Define.Display (if smode <> "" then smode else "1");
+		DisplayPosition.display_position#set {
+			pfile = Path.unique_full_path file;
+			pmin = pos;
+			pmax = pos;
+		}
+
+type display_path_kind =
+	| DPKNormal of path
+	| DPKMacro of path
+	| DPKNone
+
+let process_display_file com classes =
+	let get_module_path_from_file_path com spath =
+		let rec loop = function
+			| [] -> None
+			| cp :: l ->
+				let cp = (if cp = "" then "./" else cp) in
+				let c = Path.add_trailing_slash (Path.get_real_path cp) in
+				let clen = String.length c in
+				if clen < String.length spath && String.sub spath 0 clen = c then begin
+					let path = String.sub spath clen (String.length spath - clen) in
+					(try
+						let path = Path.parse_path path in
+						(match loop l with
+						| Some x as r when String.length (s_type_path x) < String.length (s_type_path path) -> r
+						| _ -> Some path)
+					with _ -> loop l)
+				end else
+					loop l
+		in
+		loop com.class_path
+	in
+	match com.display.dms_display_file_policy with
+		| DFPNo ->
+			DPKNone
+		| dfp ->
+			if dfp = DFPOnly then begin
+				classes := [];
+				com.main_class <- None;
+			end;
+			let real = Path.get_real_path (DisplayPosition.display_position#get).pfile in
+			let path = match get_module_path_from_file_path com real with
+			| Some path ->
+				if com.display.dms_kind = DMPackage then raise_package (fst path);
+				let path = match ExtString.String.nsplit (snd path) "." with
+					| [name;"macro"] ->
+						(* If we have a .macro.hx path, don't add the file to classes because the compiler won't find it.
+						   This can happen if we're completing in such a file. *)
+						DPKMacro (fst path,name)
+					| [name] ->
+						classes := path :: !classes;
+						DPKNormal path
+					| _ ->
+						assert false
+				in
+				path
+			| None ->
+				if not (Sys.file_exists real) then failwith "Display file does not exist";
+				(match List.rev (ExtString.String.nsplit real Path.path_sep) with
+				| file :: _ when file.[0] >= 'a' && file.[0] <= 'z' -> failwith ("Display file '" ^ file ^ "' should not start with a lowercase letter")
+				| _ -> ());
+				failwith "Display file was not found in class path"
+			in
+			Common.log com ("Display file : " ^ real);
+			Common.log com ("Classes found : ["  ^ (String.concat "," (List.map s_type_path !classes)) ^ "]");
+			path
+
+let promote_type_hints tctx =
+	let rec explore_type_hint (md,p,t) =
+		match t with
+		| TMono r -> (match !r with None -> () | Some t -> explore_type_hint (md,p,t))
+		| TLazy f -> explore_type_hint (md,p,lazy_type f)
+		| TInst(({cl_name_pos = pn;cl_path = (_,name)}),_)
+		| TEnum(({e_name_pos = pn;e_path = (_,name)}),_)
+		| TType(({t_name_pos = pn;t_path = (_,name)}),_)
+		| TAbstract(({a_name_pos = pn;a_path = (_,name)}),_) ->
+			md.m_type_hints <- (p,pn) :: md.m_type_hints;
+		| TDynamic _ -> ()
+		| TFun _ | TAnon _ -> ()
+	in
+	List.iter explore_type_hint tctx.g.type_hints
+
+let process_global_display_mode com tctx =
+	promote_type_hints tctx;
+	match com.display.dms_kind with
+	| DMUsage with_definition ->
+		FindReferences.find_references tctx com with_definition
+	| DMDiagnostics global ->
+		Diagnostics.run com global
+	| DMStatistics ->
+		let stats = Statistics.collect_statistics tctx (SFFile (DisplayPosition.display_position#get).pfile) in
+		raise_statistics (Statistics.Printer.print_statistics stats)
+	| DMModuleSymbols (Some "") -> ()
+	| DMModuleSymbols filter ->
+		let symbols = match CompilationServer.get() with
+			| None -> []
+			| Some cs ->
+				let l = cs#get_context_files ((Define.get_signature com.defines) :: (match com.get_macros() with None -> [] | Some com -> [Define.get_signature com.defines])) in
+				List.fold_left (fun acc (file,cfile) ->
+					if (filter <> None || DisplayPosition.display_position#is_in_file file) then
+						(file,DocumentSymbols.collect_module_symbols (filter = None) (cfile.c_package,cfile.c_decls)) :: acc
+					else
+						acc
+				) [] l
+		in
+		raise_module_symbols (DocumentSymbols.Printer.print_module_symbols com symbols filter)
+	| _ -> ()
+
+let find_doc t =
+	let doc = match follow t with
+		| TAnon an ->
+			begin match !(an.a_status) with
+				| Statics c -> c.cl_doc
+				| EnumStatics en -> en.e_doc
+				| AbstractStatics a -> a.a_doc
+				| _ -> None
+			end
+		| _ ->
+			None
+	in
+	doc
+
+let handle_syntax_completion com kind subj =
+	let open Parser in
+	let l,kind = match kind with
+		| SCClassRelation ->
+			[Extends;Implements],CRTypeRelation
+		| SCInterfaceRelation ->
+			[Extends],CRTypeRelation
+		| SCComment ->
+			[],CRTypeRelation
+		| SCTypeDecl mode ->
+			let in_import_hx = Filename.basename subj.s_insert_pos.pfile = "import.hx" in
+			let l = if in_import_hx then [] else [Private;Extern;Class;Interface;Enum;Abstract;Typedef;Final] in
+			let l = match mode with
+				| TCBeforePackage -> Package :: Import :: Using :: l
+				| TCAfterImport -> Import :: Using :: l
+				| TCAfterType -> l
+			in
+			l,CRTypeDecl
+		| SCAfterTypeFlag flags ->
+			let l = [Class;Interface] in
+			let l = if List.mem DPrivate flags then l else Private :: l in
+			let l = if List.mem DExtern flags then l else Extern :: l in
+			let l = if List.mem DFinal flags then l else
+				Final :: Enum :: Abstract :: Typedef :: l
+			in
+			l,CRTypeDecl
+	in
+	match l with
+	| [] ->
+		()
+	| _ ->
+		let l = List.map make_ci_keyword l in
+		match com.json_out with
+		| None ->
+			let b = Buffer.create 0 in
+			Buffer.add_string b "<il>\n";
+			List.iter (fun item -> match item.ci_kind with
+				| ITKeyword kwd -> Buffer.add_string b (Printf.sprintf "<i k=\"keyword\">%s</i>" (s_keyword kwd));
+				| _ -> assert false
+			) l;
+			Buffer.add_string b "</il>";
+			let s = Buffer.contents b in
+			raise (Completion s)
+		| Some api ->
+			let ctx = Genjson.create_context ~jsonrpc:api.jsonrpc GMFull in
+			api.send_result(fields_to_json ctx l kind subj)
\ No newline at end of file
diff --git a/src/compiler/main.ml b/src/compiler/main.ml
new file mode 100644
index 0000000000000000000000000000000000000000..97061d3e3cf1d65e1b3072461af5184977653cf0
--- /dev/null
+++ b/src/compiler/main.ml
@@ -0,0 +1,1229 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+(*
+	Conventions:
+	- e: expression (typed or untyped)
+	- c: class
+	- en: enum
+	- td: typedef (tdef)
+	- a: abstract
+	- an: anon
+	- tf: tfunc
+	- cf: class_field
+	- ef: enum_field
+	- t: type (t)
+	- ct: complex_type
+	- v: local variable (tvar)
+	- m: module (module_def)
+	- mt: module_type
+	- p: pos
+
+	"param" refers to type parameters
+	"arg" refers to function arguments
+	leading s_ means function returns string
+	trailing l means list (but we also use natural plurals such as "metas")
+	semantic suffixes may be used freely (e.g. e1, e_if, e')
+*)
+
+open Printf
+open Common
+open DisplayTypes.DisplayMode
+open DisplayTypes.CompletionResultKind
+open DisplayException
+open Type
+open Server
+open Globals
+open Filename
+
+exception Abort
+exception HelpMessage of string
+
+let executable_path() =
+	Extc.executable_path()
+
+let message ctx msg =
+	ctx.messages <- msg :: ctx.messages
+
+let deprecated = []
+
+let limit_string s offset =
+	let rest = 80 - offset in
+	let words = ExtString.String.nsplit s " " in
+	let rec loop i words = match words with
+		| word :: words ->
+			if String.length word + i + 1 > rest then (Printf.sprintf "\n%*s" offset "") :: word :: loop (String.length word) words
+			else (if i = 0 then "" else " ") :: word :: loop (i + 1 + String.length word) words
+		| [] ->
+			[]
+	in
+	String.concat "" (loop 0 words)
+
+let error ctx msg p =
+	let msg = try List.assoc msg deprecated with Not_found -> msg in
+	message ctx (CMError(msg,p));
+	ctx.has_error <- true
+
+let reserved_flags = [
+	"true";"false";"null";"cross";"js";"lua";"neko";"flash";"php";"cpp";"cs";"java";"python";
+	"as3";"swc";"macro";"sys";"static";"utf16";"haxe";"haxe_ver"
+	]
+
+let reserved_flag_namespaces = ["target"]
+
+let delete_file f = try Sys.remove f with _ -> ()
+
+let expand_env ?(h=None) path  =
+	let r = Str.regexp "%\\([A-Za-z0-9_]+\\)%" in
+	Str.global_substitute r (fun s ->
+		let key = Str.matched_group 1 s in
+		try
+			Sys.getenv key
+		with Not_found -> try
+			match h with
+			| None -> raise Not_found
+			| Some h -> Hashtbl.find h key
+		with Not_found ->
+			"%" ^ key ^ "%"
+	) path
+
+let add_libs com libs =
+	let global_repo = List.exists (fun a -> a = "--haxelib-global") com.args in
+	let call_haxelib() =
+		let t = Timer.timer ["haxelib"] in
+		let cmd = "haxelib" ^ (if global_repo then " --global" else "") ^ " path " ^ String.concat " " libs in
+		let pin, pout, perr = Unix.open_process_full cmd (Unix.environment()) in
+		let lines = Std.input_list pin in
+		let err = Std.input_list perr in
+		let ret = Unix.close_process_full (pin,pout,perr) in
+		if ret <> Unix.WEXITED 0 then failwith (match lines, err with
+			| [], [] -> "Failed to call haxelib (command not found ?)"
+			| [], [s] when ExtString.String.ends_with (ExtString.String.strip s) "Module not found: path" -> "The haxelib command has been strip'ed, please install it again"
+			| _ -> String.concat "\n" (lines@err));
+		t();
+		lines
+	in
+	match libs with
+	| [] -> []
+	| _ ->
+		let lines = match CompilationServer.get() with
+			| Some cs ->
+				(try
+					(* if we are compiling, really call haxelib since library path might have changed *)
+					if not com.display.dms_display then raise Not_found;
+					cs#find_haxelib libs
+				with Not_found ->
+					let lines = call_haxelib() in
+					cs#cache_haxelib libs lines;
+					lines)
+			| _ -> call_haxelib()
+		in
+		let extra_args = ref [] in
+		let lines = List.fold_left (fun acc l ->
+			let l = ExtString.String.strip l in
+			if l = "" then acc else
+			if l.[0] <> '-' then l :: acc else
+			match (try ExtString.String.split l " " with _ -> l, "") with
+			| ("-L",dir) ->
+				com.neko_libs <- String.sub l 3 (String.length l - 3) :: com.neko_libs;
+				acc
+			| param, value ->
+				extra_args := param :: !extra_args;
+				if value <> "" then extra_args := value :: !extra_args;
+				acc
+		) [] lines in
+		com.class_path <- lines @ com.class_path;
+		List.rev !extra_args
+
+let run_command ctx cmd =
+	let h = Hashtbl.create 0 in
+	Hashtbl.add h "__file__" ctx.com.file;
+	Hashtbl.add h "__platform__" (platform_name ctx.com.platform);
+	let t = Timer.timer ["command"] in
+	let cmd = expand_env ~h:(Some h) cmd in
+	let len = String.length cmd in
+	if len > 3 && String.sub cmd 0 3 = "cd " then begin
+		Sys.chdir (String.sub cmd 3 (len - 3));
+		0
+	end else
+	let binary_string s =
+		if not Globals.is_windows then s else String.concat "\n" (Str.split (Str.regexp "\r\n") s)
+	in
+	let pout, pin, perr = Unix.open_process_full cmd (Unix.environment()) in
+	let bout = Buffer.create 0 in
+	let berr = Buffer.create 0 in
+	let read_content channel buf =
+		Buffer.add_string buf (IO.read_all (IO.input_channel channel));
+	in
+	let tout = Thread.create (fun() -> read_content pout bout) () in
+	read_content perr berr;
+	Thread.join tout;
+	let result = (match Unix.close_process_full (pout,pin,perr) with Unix.WEXITED c | Unix.WSIGNALED c | Unix.WSTOPPED c -> c) in
+	let serr = binary_string (Buffer.contents berr) in
+	let sout = binary_string (Buffer.contents bout) in
+	if serr <> "" then ctx.messages <- CMError((if serr.[String.length serr - 1] = '\n' then String.sub serr 0 (String.length serr - 1) else serr),null_pos) :: ctx.messages;
+	if sout <> "" then ctx.com.print (sout ^ "\n");
+	t();
+	result
+
+module Initialize = struct
+	let set_platform com pf file =
+		if com.platform <> Cross then failwith "Multiple targets";
+		Common.init_platform com pf;
+		com.file <- file;
+		if (pf = Flash) && file_extension file = "swc" then Common.define com Define.Swc
+
+	let initialize_target ctx com classes =
+		let add_std dir =
+			com.class_path <- List.filter (fun s -> not (List.mem s com.std_path)) com.class_path @ List.map (fun p -> p ^ dir ^ "/_std/") com.std_path @ com.std_path
+		in
+		match com.platform with
+			| Cross ->
+				(* no platform selected *)
+				set_platform com Cross "";
+				"?"
+			| Flash ->
+				let rec loop = function
+					| [] -> ()
+					| (v,_) :: _ when v > com.flash_version -> ()
+					| (v,def) :: l ->
+						Common.raw_define com ("flash" ^ def);
+						loop l
+				in
+				loop Common.flash_versions;
+				Common.raw_define com "flash";
+				com.package_rules <- PMap.remove "flash" com.package_rules;
+				add_std "flash";
+				"swf"
+			| Neko ->
+				add_std "neko";
+				"n"
+			| Js ->
+				let es_version =
+					try
+						int_of_string (Common.defined_value com Define.JsEs)
+					with
+					| Not_found ->
+						(Common.define_value com Define.JsEs "5"; 5)
+					| _ ->
+						0
+				in
+
+				if es_version < 3 || es_version = 4 then (* we don't support ancient and there's no 4th *)
+					failwith "Invalid -D js-es value";
+
+				if es_version >= 5 then Common.raw_define com "js-es5"; (* backward-compatibility *)
+
+				add_std "js";
+				"js"
+			| Lua ->
+				add_std "lua";
+				"lua"
+			| Php ->
+				add_std "php";
+				"php"
+			| Cpp ->
+				Common.define_value com Define.HxcppApiLevel "400";
+				add_std "cpp";
+				if Common.defined com Define.Cppia then
+					classes := (Path.parse_path "cpp.cppia.HostClasses" ) :: !classes;
+				"cpp"
+			| Cs ->
+				let old_flush = ctx.flush in
+				ctx.flush <- (fun () ->
+					com.native_libs.net_libs <- [];
+					old_flush()
+				);
+				Dotnet.before_generate com;
+				add_std "cs"; "cs"
+			| Java ->
+				let old_flush = ctx.flush in
+				ctx.flush <- (fun () ->
+					List.iter (fun java_lib -> java_lib#close) com.native_libs.java_libs;
+					com.native_libs.java_libs <- [];
+					old_flush()
+				);
+				Java.before_generate com;
+				if defined com Define.Jvm then begin
+					add_std "jvm";
+					com.package_rules <- PMap.remove "jvm" com.package_rules;
+				end;
+				add_std "java";
+				"java"
+			| Python ->
+				add_std "python";
+				if not (Common.defined com Define.PythonVersion) then
+					Common.define_value com Define.PythonVersion "3.3";
+				"python"
+			| Hl ->
+				add_std "hl";
+				if not (Common.raw_defined com "hl_ver") then Define.raw_define_value com.defines "hl_ver" (try Std.input_file (Common.find_file com "hl/hl_version") with Not_found -> assert false);
+				"hl"
+			| Eval ->
+				add_std "eval";
+				"eval"
+end
+
+let generate tctx ext interp swf_header =
+	let com = tctx.Typecore.com in
+	(* check file extension. In case of wrong commandline, we don't want
+		to accidentaly delete a source file. *)
+	if file_extension com.file = ext then delete_file com.file;
+	if com.platform = Flash || com.platform = Cpp || com.platform = Hl then List.iter (Codegen.fix_overrides com) com.types;
+	if Common.defined com Define.Dump then begin
+		Codegen.Dump.dump_types com;
+		Option.may Codegen.Dump.dump_types (com.get_macros())
+	end;
+	if Common.defined com Define.DumpDependencies then begin
+		Codegen.Dump.dump_dependencies com;
+		if not tctx.Typecore.in_macro then match tctx.Typecore.g.Typecore.macros with
+			| None -> ()
+			| Some(_,ctx) -> Codegen.Dump.dump_dependencies ~target_override:(Some "macro") ctx.Typecore.com
+	end;
+	begin match com.platform with
+		| Neko | Hl | Eval when interp -> ()
+		| Cpp when Common.defined com Define.Cppia -> ()
+		| Cpp | Cs | Java | Php -> Path.mkdir_from_path (com.file ^ "/.")
+		| _ -> Path.mkdir_from_path com.file
+	end;
+	if interp then
+		Std.finally (Timer.timer ["interp"]) MacroContext.interpret tctx
+	else if com.platform = Cross then
+		()
+	else begin
+		let generate,name = match com.platform with
+		| Flash when Common.defined com Define.As3 ->
+			Genas3.generate,"AS3"
+		| Flash ->
+			Genswf.generate swf_header,"swf"
+		| Neko ->
+			Genneko.generate,"neko"
+		| Js ->
+			Genjs.generate,"js"
+		| Lua ->
+			Genlua.generate,"lua"
+		| Php ->
+			Genphp7.generate,"php"
+		| Cpp ->
+			Gencpp.generate,"cpp"
+		| Cs ->
+			Gencs.generate,"cs"
+		| Java ->
+			if Common.defined com Jvm then
+				Genjvm.generate,"java"
+			else
+				Genjava.generate,"java"
+		| Python ->
+			Genpy.generate,"python"
+		| Hl ->
+			Genhl.generate,"hl"
+		| Eval ->
+			(fun _ -> MacroContext.interpret tctx),"eval"
+		| Cross ->
+			assert false
+		in
+		Common.log com ("Generating " ^ name ^ ": " ^ com.file);
+		let t = Timer.timer ["generate";name] in
+		generate com;
+		t()
+	end
+
+let get_std_class_paths () =
+	try
+		let p = Sys.getenv "HAXE_STD_PATH" in
+		let rec loop = function
+			| drive :: path :: l ->
+				if String.length drive = 1 && ((drive.[0] >= 'a' && drive.[0] <= 'z') || (drive.[0] >= 'A' && drive.[0] <= 'Z')) then
+					(drive ^ ":" ^ path) :: loop l
+				else
+					drive :: loop (path :: l)
+			| l ->
+				l
+		in
+		let parts = Str.split_delim (Str.regexp "[;:]") p in
+		"" :: List.map Path.add_trailing_slash (loop parts)
+	with Not_found ->
+		let base_path = Path.get_real_path (try executable_path() with _ -> "./") in
+		if Sys.os_type = "Unix" then
+			let prefix_path = Filename.dirname base_path in
+			let lib_path = Filename.concat prefix_path "lib" in
+			let share_path = Filename.concat prefix_path "share" in
+			[
+				"";
+				Path.add_trailing_slash (Filename.concat lib_path "haxe/std");
+				Path.add_trailing_slash (Filename.concat lib_path "haxe/extraLibs");
+				Path.add_trailing_slash (Filename.concat share_path "haxe/std");
+				Path.add_trailing_slash (Filename.concat share_path "haxe/extraLibs");
+				Path.add_trailing_slash (Filename.concat base_path "std");
+				Path.add_trailing_slash (Filename.concat base_path "extraLibs")
+			]
+		else
+			[
+				"";
+				Path.add_trailing_slash (Filename.concat base_path "std");
+				Path.add_trailing_slash (Filename.concat base_path "extraLibs")
+			]
+
+let setup_common_context ctx com =
+	Common.define_value com Define.HaxeVer (Printf.sprintf "%.3f" (float_of_int Globals.version /. 1000.));
+	Common.raw_define com "haxe3";
+	Common.raw_define com "haxe4";
+	Common.define_value com Define.Haxe (s_version false);
+	Common.define_value com Define.Dce "std";
+	com.info <- (fun msg p -> message ctx (CMInfo(msg,p)));
+	com.warning <- (fun msg p -> message ctx (CMWarning(msg,p)));
+	com.error <- error ctx;
+	let filter_messages = (fun keep_errors predicate -> (List.filter (fun msg ->
+		(match msg with
+		| CMError(_,_) -> keep_errors;
+		| CMInfo(_,_) | CMWarning(_,_) -> predicate msg;)
+	) (List.rev ctx.messages))) in
+	com.get_messages <- (fun () -> (List.map (fun msg ->
+		(match msg with
+		| CMError(_,_) -> assert false;
+		| CMInfo(_,_) | CMWarning(_,_) -> msg;)
+	) (filter_messages false (fun _ -> true))));
+	com.filter_messages <- (fun predicate -> (ctx.messages <- (List.rev (filter_messages true predicate))));
+	if CompilationServer.runs() then com.run_command <- run_command ctx;
+	com.class_path <- get_std_class_paths ();
+	com.std_path <- List.filter (fun p -> ExtString.String.ends_with p "std/" || ExtString.String.ends_with p "std\\") com.class_path
+
+let process_args arg_spec =
+	(* Takes a list of arg specs including some custom info, and generates a
+	list in the format Arg.parse_argv wants. Handles multiple official or
+	deprecated names for the same arg; deprecated versions will display a
+	warning. *)
+	List.flatten(List.map (fun (cat, ok, dep, spec, hint, doc) ->
+		(* official argument names *)
+		(List.map (fun (arg) -> (arg, spec, doc)) ok) @
+		(* deprecated argument names *)
+		(* let dep_msg arg = (Printf.sprintf "WARNING: %s is deprecated" arg) ^ (if List.length ok > 0 then (Printf.sprintf ". Use %s instead" (String.concat "/" ok)) else "") in *)
+		(* For now, these warnings are a noop. Can replace this function to
+		enable error output: *)
+		(* let dep_fun = prerr_endline (dep_msg arg) in *)
+		let dep_fun arg spec = () in
+		let dep_spec arg spec = match spec with
+			| Arg.String f -> Arg.String (fun x -> dep_fun arg spec; f x)
+			| Arg.Unit f -> Arg.Unit (fun x -> dep_fun arg spec; f x)
+			| Arg.Bool f -> Arg.Bool (fun x -> dep_fun arg spec; f x)
+			| _ -> spec in
+		(List.map (fun (arg) -> (arg, dep_spec arg spec, doc)) dep)
+	) arg_spec)
+
+let usage_string ?(print_cat=true) arg_spec usage =
+	let make_label = fun names hint -> Printf.sprintf "%s %s" (String.concat ", " names) hint in
+	let args = (List.filter (fun (cat, ok, dep, spec, hint, doc) -> (List.length ok) > 0) arg_spec) in
+	let cat_order = ["Target";"Compilation";"Optimization";"Debug";"Batch";"Services";"Compilation Server";"Target-specific";"Miscellaneous"] in
+	let cats = List.filter (fun x -> List.mem x (List.map (fun (cat, _, _, _, _, _) -> cat) args)) cat_order in
+	let max_length = List.fold_left max 0 (List.map String.length (List.map (fun (_, ok, _, _, hint, _) -> make_label ok hint) args)) in
+	usage ^ (String.concat "\n" (List.flatten (List.map (fun cat -> (if print_cat then ["\n"^cat^":"] else []) @ (List.map (fun (cat, ok, dep, spec, hint, doc) ->
+		let label = make_label ok hint in
+		Printf.sprintf "  %s%s  %s" label (String.make (max_length - (String.length label)) ' ') doc
+	) (List.filter (fun (cat', _, _, _, _, _) -> (if List.mem cat' cat_order then cat' else "Miscellaneous") = cat) args))) cats)))
+
+let process_display_configuration ctx =
+	let com = ctx.com in
+	if com.display.dms_kind <> DMNone then begin
+		com.warning <-
+			if com.display.dms_error_policy = EPCollect then
+				(fun s p -> add_diagnostics_message com s p DKCompilerError DisplayTypes.DiagnosticsSeverity.Warning)
+			else
+				(fun msg p -> message ctx (CMWarning(msg,p)));
+		com.error <- error ctx;
+	end;
+	Lexer.old_format := Common.defined com Define.OldErrorFormat;
+	if !Lexer.old_format && !Parser.in_display then begin
+		let p = DisplayPosition.display_position#get in
+		(* convert byte position to utf8 position *)
+		try
+			let content = Std.input_file ~bin:true (Path.get_real_path p.pfile) in
+			let pos = UTF8.length (String.sub content 0 p.pmin) in
+			DisplayPosition.display_position#set { p with pmin = pos; pmax = pos }
+		with _ ->
+			() (* ignore *)
+	end
+
+let run_or_diagnose com f arg =
+	let handle_diagnostics global msg p kind =
+		add_diagnostics_message com msg p kind DisplayTypes.DiagnosticsSeverity.Error;
+		Diagnostics.run com global;
+	in
+	match com.display.dms_kind with
+	| DMDiagnostics global ->
+		begin try
+			f arg
+		with
+		| Error.Error(msg,p) ->
+			handle_diagnostics global (Error.error_msg msg) p DisplayTypes.DiagnosticsKind.DKCompilerError
+		| Parser.Error(msg,p) ->
+			handle_diagnostics global (Parser.error_msg msg) p DisplayTypes.DiagnosticsKind.DKParserError
+		| Lexer.Error(msg,p) ->
+			handle_diagnostics global (Lexer.error_msg msg) p DisplayTypes.DiagnosticsKind.DKParserError
+		end
+	| _ ->
+		f arg
+
+let create_typer_context ctx native_libs =
+	let com = ctx.com in
+	ctx.setup();
+	Common.log com ("Classpath: " ^ (String.concat ";" com.class_path));
+	Common.log com ("Defines: " ^ (String.concat ";" (PMap.foldi (fun k v acc -> (match v with "1" -> k | _ -> k ^ "=" ^ v) :: acc) com.defines.Define.values [])));
+	Typecore.type_expr_ref := (fun ?(mode=MGet) ctx e with_type -> Typer.type_expr ~mode ctx e with_type);
+	List.iter (fun f -> f ()) (List.rev com.callbacks#get_before_typer_create);
+	(* Native lib pass 1: Register *)
+	let fl = List.map (fun (file,extern) -> NativeLibraryHandler.add_native_lib com file extern) (List.rev native_libs) in
+	(* Native lib pass 2: Initialize *)
+	List.iter (fun f -> f()) fl;
+	Typer.create com
+
+(** Creates the typer context and types [classes] into it. *)
+let do_type tctx config_macros classes =
+	let com = tctx.Typecore.com in
+	let t = Timer.timer ["typing"] in
+	Option.may (fun cs -> CommonCache.maybe_add_context_sign cs com "before_init_macros") (CompilationServer.get ());
+	com.stage <- CInitMacrosStart;
+	List.iter (MacroContext.call_init_macro tctx) (List.rev config_macros);
+	com.stage <- CInitMacrosDone;
+	CommonCache.lock_signature com "after_init_macros";
+	List.iter (fun f -> f ()) (List.rev com.callbacks#get_after_init_macros);
+	run_or_diagnose com (fun () ->
+		List.iter (fun cpath -> ignore(tctx.Typecore.g.Typecore.do_load_module tctx cpath null_pos)) (List.rev classes);
+		Finalization.finalize tctx;
+	) ();
+	com.stage <- CTypingDone;
+	(* If we are trying to find references, let's syntax-explore everything we know to check for the
+		identifier we are interested in. We then type only those modules that contain the identifier. *)
+	begin match !CompilationServer.instance,com.display.dms_kind with
+		| Some cs,DMUsage _ -> FindReferences.find_possible_references tctx cs;
+		| _ -> ()
+	end;
+	t()
+
+let load_display_module_in_macro tctx display_file_dot_path clear = match display_file_dot_path with
+	| Some cpath ->
+		let p = null_pos in
+		begin try
+			let open Typecore in
+			let _, mctx = MacroContext.get_macro_context tctx p in
+			(* Tricky stuff: We want to remove the module from our lookups and load it again in
+				display mode. This covers some cases like --macro typing it in non-display mode (issue #7017). *)
+			if clear then begin
+				begin try
+					let m = Hashtbl.find mctx.g.modules cpath in
+					Hashtbl.remove mctx.g.modules cpath;
+					Hashtbl.remove mctx.g.types_module cpath;
+					List.iter (fun mt ->
+						let ti = t_infos mt in
+						Hashtbl.remove mctx.g.modules ti.mt_path;
+						Hashtbl.remove mctx.g.types_module ti.mt_path;
+					) m.m_types
+				with Not_found ->
+					()
+				end;
+			end;
+			let _ = MacroContext.load_macro_module tctx cpath true p in
+			Finalization.finalize mctx;
+			Some mctx
+		with DisplayException _ | Parser.TypePath _ as exc ->
+			raise exc
+		| _ ->
+			None
+		end
+	| None ->
+		None
+
+let handle_display ctx tctx display_file_dot_path =
+	let com = ctx.com in
+	if not ctx.com.display.dms_display && ctx.has_error then raise Abort;
+	begin match ctx.com.display.dms_kind,!Parser.delayed_syntax_completion with
+		| DMDefault,Some(kind,subj) -> DisplayOutput.handle_syntax_completion com kind subj
+		| _ -> ()
+	end;
+	if ctx.com.display.dms_exit_during_typing then begin
+		if ctx.has_next || ctx.has_error then raise Abort;
+		(* If we didn't find a completion point, load the display file in macro mode. *)
+		ignore(load_display_module_in_macro tctx display_file_dot_path true);
+		let no_completion_point_found = "No completion point was found" in
+		match com.json_out with
+		| Some _ -> (match ctx.com.display.dms_kind with
+			| DMDefault -> raise (DisplayException(DisplayFields None))
+			| DMSignature -> raise (DisplayException(DisplaySignatures None))
+			| DMHover -> raise (DisplayException(DisplayHover None))
+			| DMDefinition | DMTypeDefinition -> raise_positions []
+			| _ -> failwith no_completion_point_found)
+		| None ->
+			failwith no_completion_point_found;
+	end
+
+let filter ctx tctx display_file_dot_path =
+	let com = ctx.com in
+	com.stage <- CFilteringStart;
+	let t = Timer.timer ["filters"] in
+	let main, types, modules = run_or_diagnose com Finalization.generate tctx in
+	com.main <- main;
+	com.types <- types;
+	com.modules <- modules;
+	(* Special case for diagnostics: We don't want to load the display file in macro mode because there's a chance it might not be
+		macro-compatible. This means that we might some macro-specific diagnostics, but I don't see what we could do about that. *)
+	let should_load_in_macro = match ctx.com.display.dms_kind with
+		(* Special case for the special case: If the display file has a block which becomes active if `macro` is defined, we can safely
+		   type the module in macro context. (#8682). *)
+		| DMDiagnostics _ -> com.display_information.display_module_has_macro_defines
+		| _ -> true
+	in
+	if ctx.com.display.dms_force_macro_typing && should_load_in_macro then begin
+		match load_display_module_in_macro  tctx display_file_dot_path false with
+		| None -> ()
+		| Some mctx ->
+			(* We don't need a full macro flush here because we're not going to run any macros. *)
+			let _, types, modules = Finalization.generate mctx in
+			mctx.Typecore.com.types <- types;
+			mctx.Typecore.com.Common.modules <- modules
+	end;
+	DisplayOutput.process_global_display_mode com tctx;
+	if not (Common.defined com Define.NoDeprecationWarnings) then
+		DeprecationCheck.run com;
+	Filters.run com tctx main;
+	t()
+
+let check_auxiliary_output com xml_out json_out =
+	begin match xml_out with
+		| None -> ()
+		| Some "hx" ->
+			Genhxold.generate com
+		| Some file ->
+			Common.log com ("Generating xml: " ^ file);
+			Path.mkdir_from_path file;
+			Genxml.generate com file
+	end;
+	begin match json_out with
+		| None -> ()
+		| Some file ->
+			Common.log com ("Generating json : " ^ file);
+			Path.mkdir_from_path file;
+			Genjson.generate com.types file
+	end
+
+let parse_host_port hp =
+	let host, port = (try ExtString.String.split hp ":" with _ -> "127.0.0.1", hp) in
+	let port = try int_of_string port with _ -> raise (Arg.Bad "Invalid port") in
+	host, port
+
+let rec process_params create pl =
+	let each_params = ref [] in
+	let rec loop acc = function
+		| [] ->
+			let ctx = create (!each_params @ (List.rev acc)) in
+			init ctx;
+			ctx.flush()
+		| "--next" :: l when acc = [] -> (* skip empty --next *)
+			loop [] l
+		| "--next" :: l ->
+			let ctx = create (!each_params @ (List.rev acc)) in
+			ctx.has_next <- true;
+			init ctx;
+			ctx.flush();
+			loop [] l
+		| "--each" :: l ->
+			each_params := List.rev acc;
+			loop [] l
+		| "--cwd" :: dir :: l | "-C" :: dir :: l ->
+			(* we need to change it immediately since it will affect hxml loading *)
+			(try Unix.chdir dir with _ -> raise (Arg.Bad ("Invalid directory: " ^ dir)));
+			loop acc l
+		| "--connect" :: hp :: l ->
+			(match CompilationServer.get() with
+			| None ->
+				let host, port = (try ExtString.String.split hp ":" with _ -> "127.0.0.1", hp) in
+				do_connect host (try int_of_string port with _ -> raise (Arg.Bad "Invalid port")) ((List.rev acc) @ l)
+			| Some _ ->
+				(* already connected : skip *)
+				loop acc l)
+		| "--run" :: cl :: args ->
+			let acc = cl :: "-x" :: acc in
+			let ctx = create (!each_params @ (List.rev acc)) in
+			ctx.com.sys_args <- args;
+			init ctx;
+			ctx.flush()
+		| arg :: l ->
+			match List.rev (ExtString.String.nsplit arg ".") with
+			| "hxml" :: _ when (match acc with "-cmd" :: _ | "--cmd" :: _ -> false | _ -> true) ->
+				let acc, l = (try acc, parse_hxml arg @ l with Not_found -> (arg ^ " (file not found)") :: acc, l) in
+				loop acc l
+			| _ -> loop (arg :: acc) l
+	in
+	(* put --display in front if it was last parameter *)
+	let pl = (match List.rev pl with
+		| file :: "--display" :: pl when file <> "memory" -> "--display" :: file :: List.rev pl
+		| _ -> pl
+	) in
+	loop [] pl
+
+and init ctx =
+	let usage = Printf.sprintf
+		"Haxe Compiler %s - (C)2005-2019 Haxe Foundation\nUsage: haxe%s <target> [options] [hxml files...]\n"
+		(s_version true) (if Sys.os_type = "Win32" then ".exe" else "")
+	in
+	let com = ctx.com in
+	let classes = ref [([],"Std")] in
+try
+	set_binary_mode_out stdout true;
+	set_binary_mode_out stderr true;
+	let xml_out = ref None in
+	let json_out = ref None in
+	let swf_header = ref None in
+	let cmds = ref [] in
+	let config_macros = ref [] in
+	let cp_libs = ref [] in
+	let added_libs = Hashtbl.create 0 in
+	let no_output = ref false in
+	let did_something = ref false in
+	let force_typing = ref false in
+	let pre_compilation = ref [] in
+	let interp = ref false in
+	let swf_version = ref false in
+	let native_libs = ref [] in
+	let add_native_lib file extern = native_libs := (file,extern) :: !native_libs in
+	setup_common_context ctx com;
+	let define f = Arg.Unit (fun () -> Common.define com f) in
+	let process_ref = ref (fun args -> ()) in
+	let process_libs() =
+		let libs = List.filter (fun l -> not (Hashtbl.mem added_libs l)) (List.rev !cp_libs) in
+		cp_libs := [];
+		List.iter (fun l -> Hashtbl.add added_libs l ()) libs;
+		(* immediately process the arguments to insert them at the place -lib was defined *)
+		match add_libs com libs with
+		| [] -> ()
+		| args -> (!process_ref) args
+	in
+	(* category, official names, deprecated names, arg spec, usage hint, doc *)
+	let basic_args_spec = [
+		("Target",["--js"],["-js"],Arg.String (Initialize.set_platform com Js),"<file>","compile code to JavaScript file");
+		("Target",["--lua"],["-lua"],Arg.String (Initialize.set_platform com Lua),"<file>","compile code to Lua file");
+		("Target",["--swf"],["-swf"],Arg.String (Initialize.set_platform com Flash),"<file>","compile code to Flash SWF file");
+		("Target",["--as3"],["-as3"],Arg.String (fun dir ->
+			Initialize.set_platform com Flash dir;
+			Common.define com Define.As3;
+			Common.define com Define.NoInline;
+		),"<directory>","generate AS3 code into target directory");
+		("Target",["--neko"],["-neko"],Arg.String (Initialize.set_platform com Neko),"<file>","compile code to Neko Binary");
+		("Target",["--php"],["-php"],Arg.String (fun dir ->
+			classes := (["php"],"Boot") :: !classes;
+			Initialize.set_platform com Php dir;
+		),"<directory>","generate PHP code into target directory");
+		("Target",["--cpp"],["-cpp"],Arg.String (fun dir ->
+			Initialize.set_platform com Cpp dir;
+		),"<directory>","generate C++ code into target directory");
+		("Target",["--cppia"],["-cppia"],Arg.String (fun file ->
+			Common.define com Define.Cppia;
+			Initialize.set_platform com Cpp file;
+		),"<file>","generate Cppia code into target file");
+		("Target",["--cs"],["-cs"],Arg.String (fun dir ->
+			cp_libs := "hxcs" :: !cp_libs;
+			Initialize.set_platform com Cs dir;
+		),"<directory>","generate C# code into target directory");
+		("Target",["--java"],["-java"],Arg.String (fun dir ->
+			cp_libs := "hxjava" :: !cp_libs;
+			Initialize.set_platform com Java dir;
+		),"<directory>","generate Java code into target directory");
+		("Target",["--python"],["-python"],Arg.String (fun dir ->
+			Initialize.set_platform com Python dir;
+		),"<file>","generate Python code as target file");
+		("Target",["--hl"],["-hl"],Arg.String (fun file ->
+			Initialize.set_platform com Hl file;
+		),"<file>","compile HL code as target file");
+		("Target",[],["-x"], Arg.String (fun cl ->
+			let cpath = Path.parse_type_path cl in
+			(match com.main_class with
+				| Some c -> if cpath <> c then raise (Arg.Bad "Multiple --main classes specified")
+				| None -> com.main_class <- Some cpath);
+			classes := cpath :: !classes;
+			Common.define com Define.Interp;
+			Initialize.set_platform com (!Globals.macro_platform) "";
+			interp := true;
+		),"<class>","interpret the program using internal macro system");
+		("Target",["--interp"],[], Arg.Unit (fun() ->
+			Common.define com Define.Interp;
+			Initialize.set_platform com (!Globals.macro_platform) "";
+			interp := true;
+		),"","interpret the program using internal macro system");
+
+		("Compilation",["-p";"--class-path"],["-cp"],Arg.String (fun path ->
+			process_libs();
+			com.class_path <- Path.add_trailing_slash path :: com.class_path
+		),"<path>","add a directory to find source files");
+		("Compilation",["-m";"--main"],["-main"],Arg.String (fun cl ->
+			if com.main_class <> None then raise (Arg.Bad "Multiple --main classes specified");
+			let cpath = Path.parse_type_path cl in
+			com.main_class <- Some cpath;
+			classes := cpath :: !classes
+		),"<class>","select startup class");
+		("Compilation",["-L";"--library"],["-lib"],Arg.String (fun l ->
+			cp_libs := l :: !cp_libs;
+			Common.raw_define com l;
+		),"<name[:ver]>","use a haxelib library");
+		("Compilation",["-D";"--define"],[],Arg.String (fun var ->
+			let flag = try fst (ExtString.String.split var "=") with _ -> var in
+			let raise_reserved description =
+				raise (Arg.Bad (description ^ " and cannot be defined from the command line"))
+			in
+			if List.mem flag reserved_flags then raise_reserved (Printf.sprintf "`%s` is a reserved compiler flag" flag);
+			List.iter (fun ns ->
+				if ExtString.String.starts_with flag (ns ^ ".") then raise_reserved (Printf.sprintf "`%s` uses the reserved compiler flag namespace `%s.*`" flag ns)
+			) reserved_flag_namespaces;
+			Common.raw_define com var;
+		),"<var[=value]>","define a conditional compilation flag");
+		("Debug",["-v";"--verbose"],[],Arg.Unit (fun () ->
+			com.verbose <- true
+		),"","turn on verbose mode");
+		("Debug",["--debug"],["-debug"], Arg.Unit (fun() ->
+			Common.define com Define.Debug;
+			com.debug <- true;
+		),"","add debug information to the compiled code");
+		("Miscellaneous",["--version"],["-version"],Arg.Unit (fun() ->
+			com.info (s_version true) null_pos;
+			did_something := true;
+		),"","print version and exit");
+		("Miscellaneous", ["-h";"--help"], ["-help"], Arg.Unit (fun () ->
+			raise (Arg.Help "")
+		),"","show extended help information");
+		("Miscellaneous",["--help-defines"],[], Arg.Unit (fun() ->
+			let all,max_length = Define.get_documentation_list() in
+			let all = List.map (fun (n,doc) -> Printf.sprintf " %-*s: %s" max_length n (limit_string doc (max_length + 3))) all in
+			List.iter (fun msg -> ctx.com.print (msg ^ "\n")) all;
+			did_something := true
+		),"","print help for all compiler specific defines");
+		("Miscellaneous",["--help-metas"],[], Arg.Unit (fun() ->
+			let all,max_length = Meta.get_documentation_list() in
+			let all = List.map (fun (n,doc) -> Printf.sprintf " %-*s: %s" max_length n (limit_string doc (max_length + 3))) all in
+			List.iter (fun msg -> ctx.com.print (msg ^ "\n")) all;
+			did_something := true
+		),"","print help for all compiler metadatas");
+		("Misc",["--run"],[], Arg.Unit (fun() -> assert false), "<module> [args...]","compile and execute a Haxe module with command line arguments");
+	] in
+	let adv_args_spec = [
+		("Optimization",["--dce"],["-dce"],Arg.String (fun mode ->
+			(match mode with
+			| "std" | "full" | "no" -> ()
+			| _ -> raise (Arg.Bad "Invalid DCE mode, expected std | full | no"));
+			Common.define_value com Define.Dce mode
+		),"[std|full|no]","set the dead code elimination mode (default std)");
+		("Target-specific",["--swf-version"],["-swf-version"],Arg.Float (fun v ->
+			if not !swf_version || com.flash_version < v then com.flash_version <- v;
+			swf_version := true;
+		),"<version>","change the SWF version");
+		(* FIXME: replace with -D define *)
+		("Target-specific",["--swf-header"],["-swf-header"],Arg.String (fun h ->
+			try
+				swf_header := Some (match ExtString.String.nsplit h ":" with
+				| [width; height; fps] ->
+					(int_of_string width,int_of_string height,float_of_string fps,0xFFFFFF)
+				| [width; height; fps; color] ->
+					let color = if ExtString.String.starts_with color "0x" then color else "0x" ^ color in
+					(int_of_string width, int_of_string height, float_of_string fps, int_of_string color)
+				| _ -> raise Exit)
+			with
+				_ -> raise (Arg.Bad "Invalid SWF header format, expected width:height:fps[:color]")
+		),"<header>","define SWF header (width:height:fps:color)");
+		("Target-specific",["--flash-strict"],[], define Define.FlashStrict, "","more type strict flash API");
+		("Target-specific",[],["--swf-lib";"-swf-lib"],Arg.String (fun file ->
+			process_libs(); (* linked swf order matters, and lib might reference swf as well *)
+			add_native_lib file false;
+		),"<file>","add the SWF library to the compiled SWF");
+		(* FIXME: replace with -D define *)
+		("Target-specific",[],["--swf-lib-extern";"-swf-lib-extern"],Arg.String (fun file ->
+			add_native_lib file true;
+		),"<file>","use the SWF library for type checking");
+		("Target-specific",[],["--java-lib";"-java-lib"],Arg.String (fun file ->
+			add_native_lib file false;
+		),"<file>","add an external JAR or class directory library");
+		("Target-specific",[],["--net-lib";"-net-lib"],Arg.String (fun file ->
+			add_native_lib file false;
+		),"<file>[@std]","add an external .NET DLL file");
+		("Target-specific",["--net-std"],["-net-std"],Arg.String (fun file ->
+			Dotnet.add_net_std com file
+		),"<file>","add a root std .NET DLL search path");
+		(* FIXME: replace with -D define *)
+		("Target-specific",["--c-arg"],["-c-arg"],Arg.String (fun arg ->
+			com.c_args <- arg :: com.c_args
+		),"<arg>","pass option <arg> to the native Java/C# compiler");
+		("Compilation",["-r";"--resource"],["-resource"],Arg.String (fun res ->
+			let file, name = (match ExtString.String.nsplit res "@" with
+				| [file; name] -> file, name
+				| [file] -> file, file
+				| _ -> raise (Arg.Bad "Invalid Resource format, expected file@name")
+			) in
+			let file = (try Common.find_file com file with Not_found -> file) in
+			let data = (try
+				let s = Std.input_file ~bin:true file in
+				if String.length s > 12000000 then raise Exit;
+				s;
+			with
+				| Sys_error _ -> failwith ("Resource file not found: " ^ file)
+				| _ -> failwith ("Resource '" ^ file ^ "' excess the maximum size of 12MB")
+			) in
+			if Hashtbl.mem com.resources name then failwith ("Duplicate resource name " ^ name);
+			Hashtbl.add com.resources name data
+		),"<file>[@name]","add a named resource file");
+		("Debug",["--prompt"],["-prompt"], Arg.Unit (fun() -> prompt := true),"","prompt on error");
+		("Compilation",["--cmd"],["-cmd"], Arg.String (fun cmd ->
+			cmds := DisplayOutput.unquote cmd :: !cmds
+		),"<command>","run the specified command after successful compilation");
+		(* FIXME: replace with -D define *)
+		("Optimization",["--no-traces"],[], define Define.NoTraces, "","don't compile trace calls in the program");
+		("Batch",["--next"],[], Arg.Unit (fun() -> assert false), "","separate several haxe compilations");
+		("Batch",["--each"],[], Arg.Unit (fun() -> assert false), "","append preceding parameters to all Haxe compilations separated by --next");
+		("Services",["--display"],[], Arg.String (fun input ->
+			let input = String.trim input in
+			if String.length input > 0 && (input.[0] = '[' || input.[0] = '{') then begin
+				did_something := true;
+				force_typing := true;
+				DisplayJson.parse_input com input measure_times
+			end else
+				DisplayOutput.handle_display_argument com input pre_compilation did_something;
+		),"","display code tips");
+		("Services",["--xml"],["-xml"],Arg.String (fun file ->
+			xml_out := Some file
+		),"<file>","generate XML types description");
+		("Services",["--json"],[],Arg.String (fun file ->
+			json_out := Some file
+		),"<file>","generate JSON types description");
+		("Optimization",["--no-output"],[], Arg.Unit (fun() -> no_output := true),"","compiles but does not generate any file");
+		("Debug",["--times"],[], Arg.Unit (fun() -> measure_times := true),"","measure compilation times");
+		("Optimization",["--no-inline"],[], define Define.NoInline, "","disable inlining");
+		("Optimization",["--no-opt"],[], Arg.Unit (fun() ->
+			com.foptimize <- false;
+			Common.define com Define.NoOpt;
+		), "","disable code optimizations");
+		("Compilation",["--remap"],[], Arg.String (fun s ->
+			let pack, target = (try ExtString.String.split s ":" with _ -> raise (Arg.Bad "Invalid remap format, expected source:target")) in
+			com.package_rules <- PMap.add pack (Remap target) com.package_rules;
+		),"<package:target>","remap a package to another one");
+		("Compilation",["--macro"],[], Arg.String (fun e ->
+			force_typing := true;
+			config_macros := e :: !config_macros
+		),"<macro>","call the given macro before typing anything else");
+		("Compilation Server",["--server-listen"],["--wait"], Arg.String (fun hp ->
+			let accept = match hp with
+				| "stdio" ->
+					Server.init_wait_stdio()
+				| _ ->
+					let host, port = parse_host_port hp in
+					init_wait_socket host port
+			in
+			wait_loop process_params com.verbose accept
+		),"[[host:]port]|stdio]","wait on the given port (or use standard i/o) for commands to run");
+		("Compilation Server",["--server-connect"],[], Arg.String (fun hp ->
+			let host, port = parse_host_port hp in
+			let accept = Server.init_wait_connect host port in
+			wait_loop process_params com.verbose accept
+		),"[host:]port]","connect to the given port and wait for commands to run");
+		("Compilation Server",["--connect"],[],Arg.String (fun _ ->
+			assert false
+		),"<[host:]port>","connect on the given port and run commands there");
+		("Compilation",["-C";"--cwd"],[], Arg.String (fun dir ->
+			assert false
+		),"<dir>","set current working directory");
+		("Compilation",["--haxelib-global"],[], Arg.Unit (fun () -> ()),"","pass --global argument to haxelib");
+	] in
+	let args_callback cl =
+		begin try
+			let path,name = Path.parse_path cl in
+			if StringHelper.starts_uppercase_identifier name then
+				classes := (path,name) :: !classes
+			else begin
+				force_typing := true;
+				config_macros := (Printf.sprintf "include('%s', true, null, null, true)" cl) :: !config_macros;
+			end
+		with Failure _ when ctx.com.display.dms_display ->
+			()
+		end
+	in
+	let all_args = (basic_args_spec @ adv_args_spec) in
+	let all_args_spec = process_args all_args in
+	let process args =
+		let current = ref 0 in
+		(try
+			let rec loop acc args = match args with
+				| "--display" :: arg :: args ->
+					loop (arg :: "--display" :: acc) args
+				| arg :: args ->
+					loop (expand_env arg :: acc) args
+				| [] ->
+					List.rev acc
+			in
+			let args = loop [] args in
+			Arg.parse_argv ~current (Array.of_list ("" :: args)) all_args_spec args_callback "";
+		with
+		| Arg.Help _ ->
+			raise (HelpMessage (usage_string all_args usage))
+		| Arg.Bad msg ->
+			let first_line = List.nth (Str.split (Str.regexp "\n") msg) 0 in
+			let new_msg = (Printf.sprintf "%s" first_line) in
+			let r = Str.regexp "unknown option [`']?\\([-A-Za-z]+\\)[`']?" in
+			try
+				ignore(Str.search_forward r msg 0);
+				let s = Str.matched_group 1 msg in
+				let sl = List.map (fun (s,_,_) -> s) all_args_spec in
+				let sl = StringError.get_similar s sl in
+				begin match sl with
+				| [] -> raise Not_found
+				| _ ->
+					let spec = List.filter (fun (_,sl',sl'',_,_,_) ->
+						List.exists (fun s -> List.mem s sl) (sl' @ sl'')
+					) all_args in
+					let new_msg = (Printf.sprintf "%s\nDid you mean:\n%s" first_line (usage_string ~print_cat:false spec "")) in
+					raise (Arg.Bad new_msg)
+				end;
+			with Not_found ->
+				raise (Arg.Bad new_msg));
+		if com.platform = Globals.Cpp && not (Define.defined com.defines DisableUnicodeStrings) && not (Define.defined com.defines HxcppSmartStings) then begin
+			Define.define com.defines HxcppSmartStings;
+		end;
+		if Define.raw_defined com.defines "gen_hx_classes" then begin
+			(* TODO: this is something we're gonna remove once we have something nicer for generating flash externs *)
+			force_typing := true;
+			pre_compilation := (fun() ->
+				let process_lib lib =
+					if not (lib#has_flag NativeLibraries.FlagIsStd) then
+						List.iter (fun path -> if path <> (["java";"lang"],"String") then classes := path :: !classes) lib#list_modules
+				in
+				List.iter process_lib com.native_libs.net_libs;
+				List.iter process_lib com.native_libs.swf_libs;
+				List.iter process_lib com.native_libs.java_libs;
+			) :: !pre_compilation;
+			xml_out := Some "hx"
+		end;
+	in
+	process_ref := process;
+	(* Handle CLI arguments *)
+	process ctx.com.args;
+	(* Process haxelibs *)
+	process_libs();
+	(* Set up display configuration *)
+	process_display_configuration ctx;
+	let display_file_dot_path = DisplayOutput.process_display_file com classes in
+	(* Initialize target: This allows access to the appropriate std packages and sets the -D defines. *)
+	let ext = Initialize.initialize_target ctx com classes in
+	(* if we are at the last compilation step, allow all packages accesses - in case of macros or opening another project file *)
+	if com.display.dms_display then begin match com.display.dms_kind with
+		| DMDefault -> ()
+		| _ -> if not ctx.has_next then com.package_rules <- PMap.foldi (fun p r acc -> match r with Forbidden -> acc | _ -> PMap.add p r acc) com.package_rules PMap.empty;
+	end;
+	com.config <- get_config com; (* make sure to adapt all flags changes defined after platform *)
+	let t = Timer.timer ["init"] in
+	List.iter (fun f -> f()) (List.rev (!pre_compilation));
+	t();
+	com.stage <- CInitialized;
+	if !classes = [([],"Std")] && not !force_typing then begin
+		if !cmds = [] && not !did_something then raise (HelpMessage (usage_string basic_args_spec usage));
+	end else begin
+		(* Actual compilation starts here *)
+		let tctx = create_typer_context ctx !native_libs in
+		com.stage <- CTyperCreated;
+		let display_file_dot_path = match display_file_dot_path with
+			| DPKMacro path ->
+				ignore(load_display_module_in_macro tctx (Some path) true);
+				Some path
+			| DPKNormal path ->
+				Some path
+			| DPKNone ->
+				None
+		in
+		begin try
+			do_type tctx !config_macros !classes;
+		with TypeloadParse.DisplayInMacroBlock ->
+			ignore(load_display_module_in_macro tctx display_file_dot_path true);
+		end;
+		handle_display ctx tctx display_file_dot_path;
+		filter ctx tctx display_file_dot_path;
+		if ctx.has_error then raise Abort;
+		check_auxiliary_output com !xml_out !json_out;
+		com.stage <- CGenerationStart;
+		if not !no_output then generate tctx ext !interp !swf_header;
+		com.stage <- CGenerationDone;
+	end;
+	Sys.catch_break false;
+	List.iter (fun f -> f()) (List.rev com.callbacks#get_after_generation);
+	if not !no_output then begin
+		List.iter (fun c ->
+			let r = run_command ctx c in
+			if r <> 0 then failwith ("Command failed with error " ^ string_of_int r)
+		) (List.rev !cmds)
+	end
+with
+	| Abort ->
+		()
+	| Error.Fatal_error (m,p) ->
+		error ctx m p
+	| Common.Abort (m,p) ->
+		error ctx m p
+	| Lexer.Error (m,p) ->
+		error ctx (Lexer.error_msg m) p
+	| Parser.Error (m,p) ->
+		error ctx (Parser.error_msg m) p
+	| Typecore.Forbid_package ((pack,m,p),pl,pf)  ->
+		if !Parser.display_mode <> DMNone && ctx.has_next then begin
+			ctx.has_error <- false;
+			ctx.messages <- [];
+		end else begin
+			error ctx (Printf.sprintf "You cannot access the %s package while %s (for %s)" pack (if pf = "macro" then "in a macro" else "targeting " ^ pf) (s_type_path m) ) p;
+			List.iter (error ctx "    referenced here") (List.rev pl);
+		end
+	| Error.Error (m,p) ->
+		error ctx (Error.error_msg m) p
+	| Generic.Generic_Exception(m,p) ->
+		error ctx m p
+	| Arg.Bad msg ->
+		error ctx ("Error: " ^ msg) null_pos
+	| Failure msg when not is_debug_run ->
+		error ctx ("Error: " ^ msg) null_pos
+	| HelpMessage msg ->
+		com.info msg null_pos
+	| DisplayException(DisplayHover _ | DisplayPositions _ | DisplayFields _ | DisplayPackage _  | DisplaySignatures _ as de) when ctx.com.json_out <> None ->
+		begin
+			DisplayPosition.display_position#reset;
+			match ctx.com.json_out with
+			| Some api ->
+				let ctx = DisplayJson.create_json_context api.jsonrpc (match de with DisplayFields _ -> true | _ -> false) in
+				api.send_result (DisplayException.to_json ctx de)
+			| _ -> assert false
+		end
+	(* | Parser.TypePath (_,_,_,p) when ctx.com.json_out <> None ->
+		begin match com.json_out with
+		| Some (f,_) ->
+			let tctx = Typer.create ctx.com in
+			let fields = DisplayToplevel.collect tctx true Typecore.NoValue in
+			let jctx = Genjson.create_context Genjson.GMMinimum in
+			f (DisplayException.fields_to_json jctx fields CRImport (Some (Parser.cut_pos_at_display p)) false)
+		| _ -> assert false
+		end *)
+	| DisplayException(DisplayPackage pack) ->
+		DisplayPosition.display_position#reset;
+		raise (DisplayOutput.Completion (String.concat "." pack))
+	| DisplayException(DisplayFields Some r) ->
+		DisplayPosition.display_position#reset;
+		let fields = if !measure_times then begin
+			Timer.close_times();
+			(List.map (fun (name,value) ->
+				CompletionItem.make_ci_timer ("@TIME " ^ name) value
+			) (DisplayOutput.get_timer_fields !start_time)) @ r.fitems
+		end else
+			r.fitems
+		in
+		let s = match r.fkind with
+			| CRToplevel _
+			| CRTypeHint
+			| CRExtends
+			| CRImplements
+			| CRStructExtension _
+			| CRImport
+			| CRUsing
+			| CRNew
+			| CRPattern _
+			| CRTypeRelation
+			| CRTypeDecl ->
+				DisplayOutput.print_toplevel fields
+			| CRField _
+			| CRStructureField
+			| CRMetadata
+			| CROverride ->
+				DisplayOutput.print_fields fields
+		in
+		raise (DisplayOutput.Completion s)
+	| DisplayException(DisplayHover Some ({hitem = {CompletionItem.ci_type = Some (t,_)}} as hover)) ->
+		DisplayPosition.display_position#reset;
+		let doc = CompletionItem.get_documentation hover.hitem in
+		raise (DisplayOutput.Completion (DisplayOutput.print_type t hover.hpos doc))
+	| DisplayException(DisplaySignatures Some (signatures,_,display_arg,_)) ->
+		DisplayPosition.display_position#reset;
+		if ctx.com.display.dms_kind = DMSignature then
+			raise (DisplayOutput.Completion (DisplayOutput.print_signature signatures display_arg))
+		else
+			raise (DisplayOutput.Completion (DisplayOutput.print_signatures signatures))
+	| DisplayException(DisplayPositions pl) ->
+		DisplayPosition.display_position#reset;
+		raise (DisplayOutput.Completion (DisplayOutput.print_positions pl))
+	| Parser.TypePath (p,c,is_import,pos) ->
+		let fields =
+			try begin match c with
+				| None ->
+					DisplayPath.TypePathHandler.complete_type_path com p
+				| Some (c,cur_package) ->
+					let ctx = Typer.create com in
+					DisplayPath.TypePathHandler.complete_type_path_inner ctx p c cur_package is_import
+			end with Common.Abort(msg,p) ->
+				error ctx msg p;
+				None
+		in
+		begin match ctx.com.json_out,fields with
+		| None,None ->
+			()
+		| None,Some fields ->
+			raise (DisplayOutput.Completion (DisplayOutput.print_fields fields))
+		| Some api,None when is_legacy_completion com ->
+			api.send_result JNull
+		| Some api,fields ->
+			let fields = Option.default [] fields in
+			let ctx = DisplayJson.create_json_context api.jsonrpc false in
+			let path = match List.rev p with
+				| name :: pack -> List.rev pack,name
+				| [] -> [],""
+			in
+			let kind = CRField ((CompletionItem.make_ci_module path,pos,None,None)) in
+			api.send_result (DisplayException.fields_to_json ctx fields kind (DisplayTypes.make_subject None pos));
+		end
+	| Parser.SyntaxCompletion(kind,subj) ->
+		DisplayOutput.handle_syntax_completion com kind subj;
+		error ctx ("Error: No completion point was found") null_pos
+	| DisplayException(ModuleSymbols s | Diagnostics s | Statistics s | Metadata s) ->
+		DisplayPosition.display_position#reset;
+		raise (DisplayOutput.Completion s)
+	| EvalExceptions.Sys_exit i | Hlinterp.Sys_exit i ->
+		ctx.flush();
+		if !measure_times then Timer.report_times prerr_endline;
+		exit i
+	| DisplayOutput.Completion _ as exc ->
+		raise exc
+	| Out_of_memory as exc ->
+		raise exc
+	| e when (try Sys.getenv "OCAMLRUNPARAM" <> "b" || CompilationServer.runs() with _ -> true) && not is_debug_run ->
+		error ctx (Printexc.to_string e) null_pos
+
+;;
+let other = Timer.timer ["other"] in
+Sys.catch_break true;
+MacroContext.setup();
+
+let args = List.tl (Array.to_list Sys.argv) in
+(try
+	let server = Sys.getenv "HAXE_COMPILATION_SERVER" in
+	let host, port = (try ExtString.String.split server ":" with _ -> "127.0.0.1", server) in
+	do_connect host (try int_of_string port with _ -> failwith "Invalid HAXE_COMPILATION_SERVER port") args
+with Not_found -> try
+	process_params create_context args
+with DisplayOutput.Completion c ->
+	prerr_endline c;
+	exit 0
+| Arg.Bad msg ->
+	prerr_endline ("Error: " ^ msg);
+	exit 1
+);
+other();
+if !measure_times then Timer.report_times prerr_endline
diff --git a/src/compiler/server.ml b/src/compiler/server.ml
new file mode 100644
index 0000000000000000000000000000000000000000..1e7cbc08b08cd89800ffd1bc980c9a03a4207f1c
--- /dev/null
+++ b/src/compiler/server.ml
@@ -0,0 +1,819 @@
+open Printf
+open Globals
+open Ast
+open Common
+open CompilationServer
+open DisplayTypes.DisplayMode
+open Timer
+open Type
+open DisplayOutput
+open Json
+
+exception Dirty of path
+exception ServerError of string
+
+let measure_times = ref false
+let prompt = ref false
+let start_time = ref (Timer.get_time())
+
+let is_debug_run = try Sys.getenv "HAXEDEBUG" = "1" with _ -> false
+
+type context = {
+	com : Common.context;
+	mutable flush : unit -> unit;
+	mutable setup : unit -> unit;
+	mutable messages : compiler_message list;
+	mutable has_next : bool;
+	mutable has_error : bool;
+}
+
+let s_version with_build =
+	let pre = Option.map_default (fun pre -> "-" ^ pre) "" version_pre in
+	let build =
+		match with_build, Version.version_extra with
+			| true, Some (_,build) -> "+" ^ build
+			| _, _ -> ""
+	in
+	Printf.sprintf "%d.%d.%d%s%s" version_major version_minor version_revision pre build
+
+let check_display_flush ctx f_otherwise = match ctx.com.json_out with
+	| None ->
+		begin match ctx.com.display.dms_kind with
+		| DMDiagnostics global->
+			List.iter (fun msg ->
+				let msg,p,kind = match msg with
+					| CMInfo(msg,p) -> msg,p,DisplayTypes.DiagnosticsSeverity.Information
+					| CMWarning(msg,p) -> msg,p,DisplayTypes.DiagnosticsSeverity.Warning
+					| CMError(msg,p) -> msg,p,DisplayTypes.DiagnosticsSeverity.Error
+				in
+				add_diagnostics_message ctx.com msg p DisplayTypes.DiagnosticsKind.DKCompilerError kind
+			) (List.rev ctx.messages);
+			raise (Completion (Diagnostics.print ctx.com global))
+		| _ ->
+			f_otherwise ()
+		end
+	| Some api ->
+		if ctx.has_error then begin
+			let errors = List.map (fun msg ->
+				let msg,p,i = match msg with
+					| CMInfo(msg,p) -> msg,p,3
+					| CMWarning(msg,p) -> msg,p,2
+					| CMError(msg,p) -> msg,p,1
+				in
+				JObject [
+					"severity",JInt i;
+					"location",Genjson.generate_pos_as_location p;
+					"message",JString msg;
+				]
+			) (List.rev ctx.messages) in
+			api.send_error errors
+		end
+
+let default_flush ctx =
+	check_display_flush ctx (fun () ->
+		List.iter
+			(fun msg -> match msg with
+				| CMInfo _ -> print_endline (compiler_message_string msg)
+				| CMWarning _ | CMError _ -> prerr_endline (compiler_message_string msg)
+			)
+			(List.rev ctx.messages);
+		if ctx.has_error && !prompt then begin
+			print_endline "Press enter to exit...";
+			ignore(read_line());
+		end;
+		if ctx.has_error then exit 1
+	)
+
+let create_context params =
+	let ctx = {
+		com = Common.create version (s_version true) params;
+		flush = (fun()->());
+		setup = (fun()->());
+		messages = [];
+		has_next = false;
+		has_error = false;
+	} in
+	ctx.flush <- (fun() -> default_flush ctx);
+	ctx
+
+let parse_hxml_data data =
+	let lines = Str.split (Str.regexp "[\r\n]+") data in
+	List.concat (List.map (fun l ->
+		let l = unquote (ExtString.String.strip l) in
+		if l = "" || l.[0] = '#' then
+			[]
+		else if l.[0] = '-' then
+			try
+				let a, b = ExtString.String.split l " " in
+				[unquote a; unquote (ExtString.String.strip b)]
+			with
+				_ -> [l]
+		else
+			[l]
+	) lines)
+
+let parse_hxml file =
+	let ch = IO.input_channel (try open_in_bin file with _ -> raise Not_found) in
+	let data = IO.read_all ch in
+	IO.close_in ch;
+	parse_hxml_data data
+
+let ssend sock str =
+	let rec loop pos len =
+		if len = 0 then
+			()
+		else
+			let s = Unix.send sock str pos len [] in
+			loop (pos + s) (len - s)
+	in
+	loop 0 (Bytes.length str)
+
+let current_stdin = ref None
+
+let parse_file cs com file p =
+	let cc = CommonCache.get_cache cs com in
+	let ffile = Path.unique_full_path file in
+	let is_display_file = ffile = (DisplayPosition.display_position#get).pfile in
+	match is_display_file, !current_stdin with
+	| true, Some stdin when Common.defined com Define.DisplayStdin ->
+		TypeloadParse.parse_file_from_string com file p stdin
+	| _ ->
+		let ftime = file_time ffile in
+		let data = Std.finally (Timer.timer ["server";"parser cache"]) (fun () ->
+			try
+				let cfile = cc#find_file ffile in
+				if cfile.c_time <> ftime then raise Not_found;
+				Parser.ParseSuccess(cfile.c_package,cfile.c_decls)
+			with Not_found ->
+				let parse_result = TypeloadParse.parse_file com file p in
+				let info,is_unusual = match parse_result with
+					| ParseError(_,_,_) -> "not cached, has parse error",true
+					| ParseDisplayFile _ -> "not cached, is display file",true
+					| ParseSuccess data ->
+						begin try
+							(* We assume that when not in display mode it's okay to cache stuff that has #if display
+							checks. The reasoning is that non-display mode has more information than display mode. *)
+							if not com.display.dms_display then raise Not_found;
+							let ident = Hashtbl.find Parser.special_identifier_files ffile in
+							Printf.sprintf "not cached, using \"%s\" define" ident,true
+						with Not_found ->
+							cc#cache_file ffile ftime data;
+							"cached",false
+						end
+				in
+				if is_unusual then ServerMessage.parsed com "" (ffile,info);
+				parse_result
+		) () in
+		data
+
+module ServerCompilationContext = struct
+	type t = {
+		(* If true, prints some debug information *)
+		verbose : bool;
+		(* The list of changed directories per-signature *)
+		changed_directories : (Digest.t,cached_directory list) Hashtbl.t;
+		(* A reference to the compilation server instance *)
+		cs : CompilationServer.t;
+		(* A list of class paths per-signature *)
+		class_paths : (Digest.t,string list) Hashtbl.t;
+		(* Increased for each typed module *)
+		mutable mark_loop : int;
+		(* Increased for each compilation *)
+		mutable compilation_step : int;
+		(* The [mark_loop] value at which we started the current compilation *)
+		mutable compilation_mark : int;
+		(* A list of delays which are run after compilation *)
+		mutable delays : (unit -> unit) list;
+		(* True if it's an actual compilation, false if it's a display operation *)
+		mutable was_compilation : bool;
+	}
+
+	let create verbose cs = {
+		verbose = verbose;
+		cs = cs;
+		class_paths = Hashtbl.create 0;
+		changed_directories = Hashtbl.create 0;
+		compilation_step = 0;
+		compilation_mark = 0;
+		mark_loop = 0;
+		delays = [];
+		was_compilation = false;
+	}
+
+	let add_delay sctx f =
+		sctx.delays <- f :: sctx.delays
+
+	let run_delays sctx =
+		let fl = sctx.delays in
+		sctx.delays <- [];
+		List.iter (fun f -> f()) fl
+
+	let reset sctx =
+		Hashtbl.clear sctx.changed_directories;
+		sctx.was_compilation <- false
+end
+
+open ServerCompilationContext
+
+let stat dir =
+	(Unix.stat (Path.remove_trailing_slash dir)).Unix.st_mtime
+
+(* Gets a list of changed directories for the current compilation. *)
+let get_changed_directories sctx (ctx : Typecore.typer) =
+	let t = Timer.timer ["server";"module cache";"changed dirs"] in
+	let cs = sctx.cs in
+	let com = ctx.Typecore.com in
+	let sign = Define.get_signature com.defines in
+	let dirs = try
+		(* First, check if we already have determined changed directories for current compilation. *)
+		Hashtbl.find sctx.changed_directories sign
+	with Not_found ->
+		let dirs = try
+			(* Next, get all directories from the cache and filter the ones that haven't changed. *)
+			let all_dirs = cs#find_directories sign in
+			let dirs = List.fold_left (fun acc dir ->
+				try
+					let time' = stat dir.c_path in
+					if dir.c_mtime < time' then begin
+						dir.c_mtime <- time';
+						let sub_dirs = Path.find_directories (platform_name com.platform) false [dir.c_path] in
+						List.iter (fun dir ->
+							if not (cs#has_directory sign dir) then begin
+								let time = stat dir in
+								ServerMessage.added_directory com "" dir;
+								cs#add_directory sign (CompilationServer.create_directory dir time)
+							end;
+						) sub_dirs;
+						(CompilationServer.create_directory dir.c_path time') :: acc
+					end else
+						acc
+				with Unix.Unix_error _ ->
+					cs#remove_directory sign dir.c_path;
+					ServerMessage.removed_directory com "" dir.c_path;
+					acc
+			) [] all_dirs in
+			ServerMessage.changed_directories com "" dirs;
+			dirs
+		with Not_found ->
+			(* There were no directories in the cache, so this must be a new context. Let's add
+				an empty list to make sure no crazy recursion happens. *)
+			cs#add_directories sign [];
+			(* Register the delay that is going to populate the cache dirs. *)
+			sctx.delays <- (fun () ->
+				let dirs = ref [] in
+				let add_dir path =
+					try
+						let time = stat path in
+						dirs := CompilationServer.create_directory path time :: !dirs
+					with Unix.Unix_error _ ->
+						()
+				in
+				List.iter add_dir com.class_path;
+				List.iter add_dir (Path.find_directories (platform_name com.platform) true com.class_path);
+				ServerMessage.found_directories com "" !dirs;
+				cs#add_directories sign !dirs
+			) :: sctx.delays;
+			(* Returning [] should be fine here because it's a new context, so we won't do any
+				shadowing checks anyway. *)
+			[]
+		in
+		Hashtbl.add sctx.changed_directories sign dirs;
+		dirs
+	in
+	t();
+	dirs
+
+(* Checks if module [m] can be reused from the cache and returns None in that case. Otherwise, returns
+   [Some m'] where [m'] is the module responsible for [m] not being reusable. *)
+let check_module sctx ctx m p =
+	let com = ctx.Typecore.com in
+	let cc = CommonCache.get_cache sctx.cs com in
+	let content_changed m file =
+		let ffile = Path.unique_full_path file in
+		try
+			let cfile = cc#find_file ffile in
+			(* We must use the module path here because the file path is absolute and would cause
+				positions in the parsed declarations to differ. *)
+			let new_data = TypeloadParse.parse_module ctx m.m_path p in
+			cfile.c_decls <> snd new_data
+		with Not_found ->
+			true
+	in
+	let check_module_shadowing paths m =
+		List.iter (fun dir ->
+			let file = (dir.c_path ^ (snd m.m_path)) ^ ".hx" in
+			if Sys.file_exists file then begin
+				let time = file_time file in
+				if time > m.m_extra.m_time then begin
+					ServerMessage.module_path_changed com "" (m,time,file);
+					raise Not_found
+				end
+			end
+		) paths
+	in
+	let mark = sctx.mark_loop in
+	let start_mark = sctx.compilation_mark in
+	let rec check m =
+		let check_module_path () =
+			let directories = get_changed_directories sctx ctx in
+			match m.m_extra.m_kind with
+			| MFake | MImport -> () (* don't get classpath *)
+			| MExtern ->
+				(* if we have a file then this will override our extern type *)
+				let has_file = (try check_module_shadowing directories m; false with Not_found -> true) in
+				if has_file then begin
+					if sctx.verbose then print_endline ("A file is masking the library file " ^ s_type_path m.m_path); (* TODO *)
+					raise Not_found;
+				end;
+				let rec loop = function
+					| [] ->
+						if sctx.verbose then print_endline ("No library file was found for " ^ s_type_path m.m_path); (* TODO *)
+						raise Not_found (* no extern registration *)
+					| (file,load) :: l ->
+						match load m.m_path p with
+						| None -> loop l
+						| Some _ ->
+							if Path.unique_full_path file <> m.m_extra.m_file then begin
+								if sctx.verbose then print_endline ("Library file was changed for " ^ s_type_path m.m_path); (* TODO *)
+								raise Not_found;
+							end
+				in
+				loop com.load_extern_type
+			| MCode -> check_module_shadowing directories m
+			| MMacro when ctx.Typecore.in_macro -> check_module_shadowing directories m
+			| MMacro ->
+				(*
+					Creating another context while the previous one is incomplete means we have an infinite loop in the compiler.
+					Most likely because of circular dependencies in base modules (e.g. `StdTypes` or `String`)
+					Prevents spending another 5 hours for debugging.
+					@see https://github.com/HaxeFoundation/haxe/issues/8174
+				*)
+				if not ctx.g.complete && ctx.in_macro then
+					raise (ServerError ("Infinite loop in Haxe server detected. "
+						^ "Probably caused by shadowing a module of the standard library. "
+						^ "Make sure shadowed module does not pull macro context."));
+				let _, mctx = MacroContext.get_macro_context ctx p in
+				check_module_shadowing (get_changed_directories sctx mctx) m
+		in
+		let has_policy policy = List.mem policy m.m_extra.m_check_policy || match policy with
+			| NoCheckShadowing | NoCheckFileTimeModification when !ServerConfig.do_not_check_modules && !Parser.display_mode <> DMNone -> true
+			| _ -> false
+		in
+		let check_file () =
+			if file_time m.m_extra.m_file <> m.m_extra.m_time then begin
+				if has_policy CheckFileContentModification && not (content_changed m m.m_extra.m_file) then begin
+					ServerMessage.unchanged_content com "" m.m_extra.m_file;
+				end else begin
+					ServerMessage.not_cached com "" m;
+					if m.m_extra.m_kind = MFake then Hashtbl.remove Typecore.fake_modules m.m_extra.m_file;
+					raise Not_found;
+				end
+			end
+		in
+		let check_dependencies () =
+			PMap.iter (fun _ m2 -> match check m2 with
+				| None -> ()
+				| Some path -> raise (Dirty path)
+			) m.m_extra.m_deps;
+		in
+		begin match m.m_extra.m_dirty with
+		| Some path ->
+			Some path
+		| None ->
+			if m.m_extra.m_mark = mark then
+				None
+			else try
+				let old_mark = m.m_extra.m_mark in
+				m.m_extra.m_mark <- mark;
+				if old_mark <= start_mark then begin
+					if not (has_policy NoCheckShadowing) then check_module_path();
+					if not (has_policy NoCheckFileTimeModification) || file_extension m.m_extra.m_file <> "hx" then check_file();
+				end;
+				if not (has_policy NoCheckDependencies) then check_dependencies();
+				None
+			with
+			| Not_found ->
+				m.m_extra.m_dirty <- Some m.m_path;
+				Some m.m_path
+			| Dirty path ->
+				m.m_extra.m_dirty <- Some path;
+				Some path
+			end
+	in
+	check m
+
+(* Adds module [m] and all its dependencies (recursively) from the cache to the current compilation
+   context. *)
+let add_modules sctx ctx m p =
+	let com = ctx.Typecore.com in
+	let rec add_modules tabs m0 m =
+		if m.m_extra.m_added < sctx.compilation_step then begin
+			(match m0.m_extra.m_kind, m.m_extra.m_kind with
+			| MCode, MMacro | MMacro, MCode ->
+				(* this was just a dependency to check : do not add to the context *)
+				PMap.iter (Hashtbl.replace com.resources) m.m_extra.m_binded_res;
+			| _ ->
+				ServerMessage.reusing com tabs m;
+				m.m_extra.m_added <- sctx.compilation_step;
+				List.iter (fun t ->
+					match t with
+					| TClassDecl c -> c.cl_restore()
+					| TEnumDecl e ->
+						let rec loop acc = function
+							| [] -> ()
+							| (Meta.RealPath,[Ast.EConst (Ast.String(path,_)),_],_) :: l ->
+								e.e_path <- Ast.parse_path path;
+								e.e_meta <- (List.rev acc) @ l;
+							| x :: l -> loop (x::acc) l
+						in
+						loop [] e.e_meta
+					| TAbstractDecl a ->
+						a.a_meta <- List.filter (fun (m,_,_) -> m <> Meta.ValueUsed) a.a_meta
+					| _ -> ()
+				) m.m_types;
+				TypeloadModule.add_module ctx m p;
+				PMap.iter (Hashtbl.replace com.resources) m.m_extra.m_binded_res;
+				PMap.iter (fun _ m2 -> add_modules (tabs ^ "  ") m0 m2) m.m_extra.m_deps
+			)
+		end
+	in
+	add_modules "" m m
+
+(* Looks up the module referred to by [mpath] in the cache. If it exists, a check is made to
+   determine if it's still valid. If this function returns None, the module is re-typed. *)
+let type_module sctx (ctx:Typecore.typer) mpath p =
+	let t = Timer.timer ["server";"module cache"] in
+	let com = ctx.Typecore.com in
+	let cc = CommonCache.get_cache sctx.cs com in
+	sctx.mark_loop <- sctx.mark_loop + 1;
+	try
+		let m = cc#find_module mpath in
+		let tcheck = Timer.timer ["server";"module cache";"check"] in
+		begin match check_module sctx ctx m p with
+		| None -> ()
+		| Some path ->
+			ServerMessage.skipping_dep com "" (m,path);
+			tcheck();
+			raise Not_found;
+		end;
+		tcheck();
+		let tadd = Timer.timer ["server";"module cache";"add modules"] in
+		add_modules sctx ctx m p;
+		tadd();
+		t();
+		Some m
+	with Not_found ->
+		t();
+		None
+
+(* Sets up the per-compilation context. *)
+let create sctx write params =
+	let cs = sctx.cs in
+	let maybe_cache_context com =
+		if com.display.dms_full_typing then begin
+			CommonCache.cache_context sctx.cs com;
+			ServerMessage.cached_modules com "" (List.length com.modules);
+		end
+	in
+	let ctx = create_context params in
+	ctx.flush <- (fun() ->
+		sctx.compilation_step <- sctx.compilation_step + 1;
+		sctx.compilation_mark <- sctx.mark_loop;
+		check_display_flush ctx (fun () ->
+			List.iter
+				(fun msg ->
+					let s = compiler_message_string msg in
+					write (s ^ "\n");
+					ServerMessage.message s;
+				)
+				(List.rev ctx.messages);
+			sctx.was_compilation <- ctx.com.display.dms_full_typing;
+			if ctx.has_error then begin
+				measure_times := false;
+				write "\x02\n"
+			end else maybe_cache_context ctx.com;
+		)
+	);
+	ctx.setup <- (fun() ->
+		let sign = Define.get_signature ctx.com.defines in
+		ServerMessage.defines ctx.com "";
+		ServerMessage.signature ctx.com "" sign;
+		ServerMessage.display_position ctx.com "" (DisplayPosition.display_position#get);
+		(* Special case for diagnostics: It's not treated as a display mode, but we still want to invalidate the
+			current file in order to run diagnostics on it again. *)
+		if ctx.com.display.dms_display || (match ctx.com.display.dms_kind with DMDiagnostics _ -> true | _ -> false) then begin
+			let file = (DisplayPosition.display_position#get).pfile in
+			(* force parsing again : if the completion point have been changed *)
+			cs#remove_files file;
+			cs#taint_modules file;
+		end;
+		try
+			if (Hashtbl.find sctx.class_paths sign) <> ctx.com.class_path then begin
+				ServerMessage.class_paths_changed ctx.com "";
+				Hashtbl.replace sctx.class_paths sign ctx.com.class_path;
+				cs#clear_directories sign;
+				(cs#get_context sign)#set_initialized false;
+			end;
+		with Not_found ->
+			Hashtbl.add sctx.class_paths sign ctx.com.class_path;
+			()
+	);
+	ctx.com.print <- (fun str -> write ("\x01" ^ String.concat "\x01" (ExtString.String.nsplit str "\n") ^ "\n"));
+	ctx
+
+(* Resets the state for a new compilation *)
+let init_new_compilation sctx =
+	ServerCompilationContext.reset sctx;
+	Parser.reset_state();
+	return_partial_type := false;
+	measure_times := false;
+	Hashtbl.clear DeprecationCheck.warned_positions;
+	close_times();
+	stats.s_files_parsed := 0;
+	stats.s_classes_built := 0;
+	stats.s_methods_typed := 0;
+	stats.s_macros_called := 0;
+	Hashtbl.clear Timer.htimers;
+	sctx.compilation_step <- sctx.compilation_step + 1;
+	sctx.compilation_mark <- sctx.mark_loop;
+	start_time := get_time()
+
+let cleanup () =
+	begin match !MacroContext.macro_interp_cache with
+	| Some interp -> EvalContext.GlobalState.cleanup interp
+	| None -> ()
+	end
+
+module Ring = struct
+	type 'a t = {
+		values : 'a array;
+		mutable index : int;
+		mutable num_filled : int;
+	}
+
+	let create len x = {
+		values = Array.make len x;
+		index = 0;
+		num_filled = 0;
+	}
+
+	let push r x =
+		r.values.(r.index) <- x;
+		r.num_filled <- r.num_filled + 1;
+		if r.index = Array.length r.values - 1 then begin
+			r.index <- 0;
+		end else
+			r.index <- r.index + 1
+
+	let iter r f =
+		let len = Array.length r.values in
+		for i = 0 to len - 1 do
+			let off = r.index + i in
+			let off = if off >= len then off - len else off in
+			f r.values.(off)
+		done
+
+	let fold r acc f =
+		let len = Array.length r.values in
+		let rec loop i acc =
+			if i = len then
+				acc
+			else begin
+				let off = r.index + i in
+				let off = if off >= len then off - len else off in
+				loop (i + 1) (f acc r.values.(off))
+			end
+		in
+		loop 0 acc
+
+	let is_filled r =
+		r.num_filled >= Array.length r.values
+
+	let reset_filled r =
+		r.num_filled <- 0
+end
+
+let gc_heap_stats () =
+	let stats = Gc.quick_stat() in
+	stats.major_words,stats.heap_words
+
+let fmt_percent f =
+	int_of_float (f *. 100.)
+
+(* The server main loop. Waits for the [accept] call to then process the sent compilation
+   parameters through [process_params]. *)
+let wait_loop process_params verbose accept =
+	if verbose then ServerMessage.enable_all ();
+	Sys.catch_break false; (* Sys can never catch a break *)
+	(* Create server context and set up hooks for parsing and typing *)
+	let cs = CompilationServer.create () in
+	let sctx = ServerCompilationContext.create verbose cs in
+	TypeloadModule.type_module_hook := type_module sctx;
+	MacroContext.macro_enable_cache := true;
+	TypeloadParse.parse_hook := parse_file cs;
+	let ring = Ring.create 10 0. in
+	let heap_stats_start = ref (gc_heap_stats()) in
+	let update_heap () =
+		(* On every compilation: Track how many words were allocated for this compilation (working memory). *)
+		let heap_stats_now = gc_heap_stats() in
+		let words_allocated = (fst heap_stats_now) -. (fst !heap_stats_start) in
+		let heap_size = float_of_int (snd heap_stats_now) in
+		Ring.push ring words_allocated;
+		if Ring.is_filled ring then begin
+			Ring.reset_filled ring;
+			let t0 = get_time() in
+			let stats = Gc.stat() in
+			let live_words = float_of_int stats.live_words in
+			 (* Maximum working memory for the last X compilations. *)
+			let max = Ring.fold ring 0. (fun m i -> if i > m then i else m) in
+			(* Maximum heap size needed for the last X compilations = sum of what's live + max working memory. *)
+			let needed_max = live_words +. max in
+			(* Additional heap percentage needed = what's live / max of what was live. *)
+			let percent_needed = (1. -. live_words /. needed_max) in
+			(* Effective cache size percentage = what's live / heap size. *)
+			let percent_used = live_words /. heap_size in
+			(* Set allowed space_overhead to the maximum of what we needed during the last X compilations. *)
+			let new_space_overhead = int_of_float ((percent_needed +. 0.05) *. 100.) in
+			let old_gc = Gc.get() in
+			Gc.set { old_gc with Gc.space_overhead = new_space_overhead; };
+			(* Compact if less than 80% of our heap words consist of the cache and there's less than 50% overhead. *)
+			let do_compact = percent_used < 0.8 && percent_needed < 0.5 in
+			begin if do_compact then
+				Gc.compact()
+			else
+				Gc.full_major();
+			end;
+			Gc.set old_gc;
+			ServerMessage.gc_stats (get_time() -. t0) stats do_compact new_space_overhead
+		end;
+		heap_stats_start := heap_stats_now;
+	in
+	(* Main loop: accept connections and process arguments *)
+	while true do
+		let read, write, close = accept() in
+		begin try
+			(* Read arguments *)
+			let s = read() in
+			let t0 = get_time() in
+			let hxml =
+				try
+					let idx = String.index s '\001' in
+					current_stdin := Some (String.sub s (idx + 1) ((String.length s) - idx - 1));
+					(String.sub s 0 idx)
+				with Not_found ->
+					s
+			in
+			let data = parse_hxml_data hxml in
+			ServerMessage.arguments data;
+			init_new_compilation sctx;
+			begin try
+				let create = create sctx write in
+				(* Pass arguments to normal handling in main.ml *)
+				process_params create data;
+				close_times();
+				if !measure_times then report_times (fun s -> write (s ^ "\n"))
+			with
+			| Completion str ->
+				ServerMessage.completion str;
+				write str
+			| Arg.Bad msg ->
+				print_endline ("Error: " ^ msg);
+			end;
+			run_delays sctx;
+			ServerMessage.stats stats (get_time() -. t0)
+		with Unix.Unix_error _ ->
+			ServerMessage.socket_message "Connection Aborted"
+		| e ->
+			let estr = Printexc.to_string e in
+			ServerMessage.uncaught_error estr;
+			(try write ("\x02\n" ^ estr); with _ -> ());
+			if is_debug_run then print_endline (estr ^ "\n" ^ Printexc.get_backtrace());
+			if e = Out_of_memory then begin
+				close();
+				exit (-1);
+			end;
+		end;
+		(* Close connection and perform some cleanup *)
+		close();
+		current_stdin := None;
+		cleanup();
+		update_heap();
+	done
+
+let mk_length_prefixed_communication chin chout =
+	let chin = IO.input_channel chin in
+	let chout = IO.output_channel chout in
+
+	let bout = Buffer.create 0 in
+
+	let read = fun () ->
+		let len = IO.read_i32 chin in
+		IO.really_nread_string chin len
+	in
+
+	let write = Buffer.add_string bout in
+
+	let close = fun() ->
+		IO.write_i32 chout (Buffer.length bout);
+		IO.nwrite_string chout (Buffer.contents bout);
+		IO.flush chout
+	in
+
+	fun () ->
+		Buffer.clear bout;
+		read, write, close
+
+(* The accept-function to wait for a stdio connection. *)
+let init_wait_stdio() =
+	set_binary_mode_in stdin true;
+	set_binary_mode_out stderr true;
+	mk_length_prefixed_communication stdin stderr
+
+(* Connect to given host/port and return accept function for communication *)
+let init_wait_connect host port =
+	let host = Unix.inet_addr_of_string host in
+	let chin, chout = Unix.open_connection (Unix.ADDR_INET (host,port)) in
+	mk_length_prefixed_communication chin chout
+
+(* The accept-function to wait for a socket connection. *)
+let init_wait_socket host port =
+	let sock = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
+	(try Unix.setsockopt sock Unix.SO_REUSEADDR true with _ -> ());
+	(try Unix.bind sock (Unix.ADDR_INET (Unix.inet_addr_of_string host,port)) with _ -> failwith ("Couldn't wait on " ^ host ^ ":" ^ string_of_int port));
+	ServerMessage.socket_message ("Waiting on " ^ host ^ ":" ^ string_of_int port);
+	Unix.listen sock 10;
+	let bufsize = 1024 in
+	let tmp = Bytes.create bufsize in
+	let accept() = (
+		let sin, _ = Unix.accept sock in
+		Unix.set_nonblock sin;
+		ServerMessage.socket_message "Client connected";
+		let b = Buffer.create 0 in
+		let rec read_loop count =
+			try
+				let r = Unix.recv sin tmp 0 bufsize [] in
+				if r = 0 then
+					failwith "Incomplete request"
+				else begin
+					ServerMessage.socket_message (Printf.sprintf "Reading %d bytes\n" r);
+					Buffer.add_subbytes b tmp 0 r;
+					if Bytes.get tmp (r-1) = '\000' then
+						Buffer.sub b 0 (Buffer.length b - 1)
+					else
+						read_loop 0
+				end
+			with Unix.Unix_error((Unix.EWOULDBLOCK|Unix.EAGAIN),_,_) ->
+				if count = 100 then
+					failwith "Aborting inactive connection"
+				else begin
+					ServerMessage.socket_message "Waiting for data...";
+					ignore(Unix.select [] [] [] 0.05); (* wait a bit *)
+					read_loop (count + 1);
+				end
+		in
+		let read = fun() -> (let s = read_loop 0 in Unix.clear_nonblock sin; s) in
+		let write s = ssend sin (Bytes.unsafe_of_string s) in
+		let close() = Unix.close sin in
+		read, write, close
+	) in
+	accept
+
+(* The connect function to connect to [host] at [port] and send arguments [args]. *)
+let do_connect host port args =
+	let sock = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
+	(try Unix.connect sock (Unix.ADDR_INET (Unix.inet_addr_of_string host,port)) with _ -> failwith ("Couldn't connect on " ^ host ^ ":" ^ string_of_int port));
+	let args = ("--cwd " ^ Unix.getcwd()) :: args in
+	ssend sock (Bytes.of_string (String.concat "" (List.map (fun a -> a ^ "\n") args) ^ "\000"));
+	let has_error = ref false in
+	let rec print line =
+		match (if line = "" then '\x00' else line.[0]) with
+		| '\x01' ->
+			print_string (String.concat "\n" (List.tl (ExtString.String.nsplit line "\x01")));
+			flush stdout
+		| '\x02' ->
+			has_error := true;
+		| _ ->
+			prerr_endline line;
+	in
+	let buf = Buffer.create 0 in
+	let process() =
+		let lines = ExtString.String.nsplit (Buffer.contents buf) "\n" in
+		(* the last line ends with \n *)
+		let lines = (match List.rev lines with "" :: l -> List.rev l | _ -> lines) in
+		List.iter print lines;
+	in
+	let tmp = Bytes.create 1024 in
+	let rec loop() =
+		let b = Unix.recv sock tmp 0 1024 [] in
+		Buffer.add_subbytes buf tmp 0 b;
+		if b > 0 then begin
+			if Bytes.get tmp (b - 1) = '\n' then begin
+				process();
+				Buffer.reset buf;
+			end;
+			loop();
+		end
+	in
+	loop();
+	process();
+	if !has_error then exit 1
diff --git a/src/compiler/serverConfig.ml b/src/compiler/serverConfig.ml
new file mode 100644
index 0000000000000000000000000000000000000000..ec7ba308e59d84b3d49412a2ab70a652bb445348
--- /dev/null
+++ b/src/compiler/serverConfig.ml
@@ -0,0 +1,2 @@
+let do_not_check_modules = ref false
+let legacy_completion = ref false
\ No newline at end of file
diff --git a/src/compiler/serverMessage.ml b/src/compiler/serverMessage.ml
new file mode 100644
index 0000000000000000000000000000000000000000..c9af325d36e2090bedda2721664b6eb50165c855
--- /dev/null
+++ b/src/compiler/serverMessage.ml
@@ -0,0 +1,190 @@
+open Globals
+open Common
+open CompilationServer
+open Type
+open Json
+
+type server_message_options = {
+	mutable print_added_directory : bool;
+	mutable print_found_directories : bool;
+	mutable print_changed_directories : bool;
+	mutable print_module_path_changed : bool;
+	mutable print_not_cached : bool;
+	mutable print_parsed : bool;
+	mutable print_removed_directory : bool;
+	mutable print_reusing : bool;
+	mutable print_skipping_dep : bool;
+	mutable print_unchanged_content : bool;
+	mutable print_cached_modules : bool;
+	mutable print_class_paths_changed : bool;
+	mutable print_arguments : bool;
+	mutable print_completion : bool;
+	mutable print_defines : bool;
+	mutable print_signature : bool;
+	mutable print_display_position : bool;
+	mutable print_stats : bool;
+	mutable print_message : bool;
+	mutable print_socket_message : bool;
+	mutable print_uncaught_error : bool;
+	mutable print_new_context : bool;
+}
+
+let config = {
+	print_added_directory = false;
+	print_found_directories = false;
+	print_changed_directories = false;
+	print_module_path_changed = false;
+	print_not_cached = false;
+	print_parsed = false;
+	print_removed_directory = false;
+	print_reusing = false;
+	print_skipping_dep = false;
+	print_unchanged_content = false;
+	print_cached_modules = false;
+	print_class_paths_changed = false;
+	print_arguments = false;
+	print_completion = false;
+	print_defines = false;
+	print_signature = false;
+	print_display_position = false;
+	print_stats = false;
+	print_message = false;
+	print_socket_message = false;
+	print_uncaught_error = false;
+	print_new_context = false;
+}
+
+let sign_string com =
+	let sign = Define.get_signature com.defines in
+	let cs = CompilationServer.force () in
+	let	sign_id = (cs#get_context sign)#get_index in
+	Printf.sprintf "%2i,%3s: " sign_id (short_platform_name com.platform)
+
+let added_directory com tabs dir =
+	if config.print_added_directory then print_endline (Printf.sprintf "%sadded directory %s" (sign_string com) dir)
+
+let found_directories com tabs dirs =
+	if config.print_found_directories then print_endline (Printf.sprintf "%sfound %i directories" (sign_string com) (List.length dirs))
+
+let changed_directories com tabs dirs =
+	if config.print_changed_directories then print_endline (Printf.sprintf "%schanged directories: [%s]" (sign_string com) (String.concat ", " (List.map (fun dir -> "\"" ^ dir.c_path ^ "\"") dirs)))
+
+let module_path_changed com tabs (m,time,file) =
+	if config.print_module_path_changed then print_endline (Printf.sprintf "%smodule path might have changed: %s\n\twas: %2.0f %s\n\tnow: %2.0f %s"
+		(sign_string com) (s_type_path m.m_path) m.m_extra.m_time m.m_extra.m_file time file)
+
+let not_cached com tabs m =
+	if config.print_not_cached then print_endline (Printf.sprintf "%s%s not cached (%s)" (sign_string com) (s_type_path m.m_path) "modified")
+
+let parsed com tabs (ffile,info) =
+	if config.print_parsed then print_endline (Printf.sprintf "%sparsed %s (%s)" (sign_string com) ffile info)
+
+let removed_directory com tabs dir =
+	if config.print_removed_directory then print_endline (Printf.sprintf "%sremoved directory %s" (sign_string com) dir)
+
+let reusing com tabs m =
+	if config.print_reusing then print_endline (Printf.sprintf "%s%sreusing %s" (sign_string com) tabs (s_type_path m.m_path))
+
+let skipping_dep com tabs (m,path) =
+	if config.print_skipping_dep then print_endline (Printf.sprintf "%sskipping %s%s" (sign_string com) (s_type_path m.m_path) (if m.m_path = path then "" else Printf.sprintf "(%s)" (s_type_path path)))
+
+let unchanged_content com tabs file =
+	if config.print_unchanged_content then print_endline (Printf.sprintf "%s%s changed time not but content, reusing" (sign_string com) file)
+
+let cached_modules com tabs i =
+	if config.print_cached_modules then print_endline (Printf.sprintf "%sCached %i modules" (sign_string com) i)
+
+let class_paths_changed com tabs =
+	if config.print_class_paths_changed then print_endline (Printf.sprintf "%sclass paths changed, resetting directories" (sign_string com))
+
+let arguments data =
+	if config.print_arguments then print_endline (("Processing Arguments [" ^ String.concat "," data ^ "]"))
+
+let completion str =
+	if config.print_completion then print_endline ("Completion Response =\n" ^ str)
+
+let defines com tabs =
+	if config.print_defines then begin
+		let defines = PMap.foldi (fun k v acc -> (k ^ "=" ^ v) :: acc) com.defines.Define.values [] in
+		print_endline ("Defines " ^ (String.concat "," (List.sort compare defines)))
+	end
+
+let signature com tabs sign =
+	if config.print_signature then print_endline ("Using signature " ^ Digest.to_hex sign)
+
+let display_position com tabs p =
+	if config.print_display_position then print_endline ("Display position: " ^ (Printer.s_pos p))
+
+let stats stats time =
+	if config.print_stats then begin
+		print_endline (Printf.sprintf "Stats = %d files, %d classes, %d methods, %d macros" !(stats.s_files_parsed) !(stats.s_classes_built) !(stats.s_methods_typed) !(stats.s_macros_called));
+		print_endline (Printf.sprintf "Time spent : %.3fs" time)
+	end
+
+let message s =
+	if config.print_message then print_endline ("> " ^ s)
+
+let gc_stats time stats_before did_compact space_overhead =
+	if config.print_stats then begin
+		let stats = Gc.quick_stat() in
+		print_endline (Printf.sprintf "GC %s done in %.2fs with space_overhead = %i\n\tbefore: %s\n\tafter: %s"
+			(if did_compact then "compaction" else "collection")
+			time
+			space_overhead
+			(Memory.fmt_word (float_of_int stats_before.Gc.heap_words))
+			(Memory.fmt_word (float_of_int stats.heap_words))
+		)
+	end
+
+let socket_message s =
+	if config.print_socket_message then print_endline s
+
+let uncaught_error s =
+	if config.print_uncaught_error then print_endline ("Uncaught Error : " ^ s)
+
+let enable_all () =
+	config.print_added_directory <- true;
+	config.print_found_directories <- true;
+	config.print_changed_directories <- true;
+	config.print_module_path_changed <- true;
+	config.print_not_cached <- true;
+	config.print_parsed <- true;
+	config.print_removed_directory <- true;
+	config.print_reusing <- true;
+	config.print_skipping_dep <- true;
+	config.print_unchanged_content <- true;
+	config.print_cached_modules <- true;
+	config.print_arguments <- true;
+	config.print_completion <- true;
+	config.print_defines <- true;
+	config.print_signature <- true;
+	config.print_display_position <- true;
+	config.print_stats <- true;
+	config.print_message <- true;
+	config.print_socket_message <- true;
+	config.print_uncaught_error <- true;
+	config.print_new_context <- true
+
+let set_by_name name value = match name with
+	| "addedDirectory" -> config.print_added_directory <- value
+	| "foundDirectories" -> config.print_found_directories <- value;
+	| "changedDirectories" -> config.print_changed_directories <- value;
+	| "modulePathChanged" -> config.print_module_path_changed <- value;
+	| "notCached" -> config.print_not_cached <- value;
+	| "parsed" -> config.print_parsed <- value;
+	| "removedDirectory" -> config.print_removed_directory <- value;
+	| "reusing" -> config.print_reusing <- value;
+	| "skippingDep" -> config.print_skipping_dep <- value;
+	| "unchangedContent" -> config.print_unchanged_content <- value;
+	| "cachedModules" -> config.print_cached_modules <- value;
+	| "arguments" -> config.print_arguments <- value;
+	| "completion" -> config.print_completion <- value;
+	| "defines" -> config.print_defines <- value;
+	| "signature" -> config.print_signature <- value;
+	| "displayPosition" -> config.print_display_position <- value;
+	| "stats" -> config.print_stats <- value;
+	| "message" -> config.print_message <- value;
+	| "socketMessage" -> config.print_socket_message <- value;
+	| "uncaughtError" -> config.print_uncaught_error <- value;
+	| "newContext" -> config.print_new_context <- value;
+	| _ -> raise Not_found
\ No newline at end of file
diff --git a/src/context/abstractCast.ml b/src/context/abstractCast.ml
new file mode 100644
index 0000000000000000000000000000000000000000..12f0a548030cfcd6706a0e28b37d6c728aa3e0bf
--- /dev/null
+++ b/src/context/abstractCast.ml
@@ -0,0 +1,301 @@
+open Globals
+open Common
+open Ast
+open Type
+open Typecore
+open Error
+
+let cast_stack = new_rec_stack()
+
+let rec make_static_call ctx c cf a pl args t p =
+	if cf.cf_kind = Method MethMacro then begin
+		match args with
+			| [e] ->
+				let e,f = push_this ctx e in
+				ctx.with_type_stack <- (WithType.with_type t) :: ctx.with_type_stack;
+				let e = match ctx.g.do_macro ctx MExpr c.cl_path cf.cf_name [e] p with
+					| Some e -> type_expr ctx e (WithType.with_type t)
+					| None ->  type_expr ctx (EConst (Ident "null"),p) WithType.value
+				in
+				ctx.with_type_stack <- List.tl ctx.with_type_stack;
+				let e = try cast_or_unify_raise ctx t e p with Error(Unify _,_) -> raise Not_found in
+				f();
+				e
+			| _ -> assert false
+	end else
+		Typecore.make_static_call ctx c cf (apply_params a.a_params pl) args t p
+
+and do_check_cast ctx tleft eright p =
+	let recurse cf f =
+		(*
+			Without this special check for macro @:from methods we will always get "Recursive implicit cast" error
+			unlike non-macro @:from methods, which generate unification errors if no other @:from methods are involved.
+		*)
+		if cf.cf_kind = Method MethMacro then begin
+			match cast_stack.rec_stack with
+			| previous_from :: _ when previous_from == cf ->
+				raise (Error (Unify [cannot_unify eright.etype tleft], eright.epos));
+			| _ -> ()
+		end;
+		if cf == ctx.curfield || rec_stack_memq cf cast_stack then error "Recursive implicit cast" p;
+		rec_stack_loop cast_stack cf f ()
+	in
+	let find a tl f =
+		let tcf,cf = f() in
+		if (Meta.has Meta.MultiType a.a_meta) then
+			mk_cast eright tleft p
+		else match a.a_impl with
+			| Some c -> recurse cf (fun () ->
+				let ret = make_static_call ctx c cf a tl [eright] tleft p in
+				{ ret with eexpr = TMeta( (Meta.ImplicitCast,[],ret.epos), ret) }
+			)
+			| None -> assert false
+	in
+	if type_iseq tleft eright.etype then
+		eright
+	else begin
+		let rec loop stack tleft tright =
+			if List.exists (fun (tleft',tright') -> fast_eq tleft tleft' && fast_eq tright tright') stack then
+				raise Not_found
+			else begin
+				let stack = (tleft,tright) :: stack in
+				match follow tleft,follow tright with
+				| TAbstract(a1,tl1),TAbstract(a2,tl2) ->
+					Abstract.find_to_from find a1 tl1 a2 tl2 tleft eright.etype
+				| TAbstract(a,tl),_ ->
+					begin try find a tl (fun () -> Abstract.find_from a tl eright.etype tleft)
+					with Not_found ->
+						let rec loop2 tcl = match tcl with
+							| tc :: tcl ->
+								if not (type_iseq tc tleft) then loop stack (apply_params a.a_params tl tc) tright
+								else loop2 tcl
+							| [] -> raise Not_found
+						in
+						loop2 a.a_from
+					end
+				| _,TAbstract(a,tl) ->
+					begin try find a tl (fun () -> Abstract.find_to a tl tleft)
+					with Not_found ->
+						let rec loop2 tcl = match tcl with
+							| tc :: tcl ->
+								if not (type_iseq tc tright) then loop stack tleft (apply_params a.a_params tl tc)
+								else loop2 tcl
+							| [] -> raise Not_found
+						in
+						loop2 a.a_to
+					end
+				| _ ->
+					raise Not_found
+			end
+		in
+		loop [] tleft eright.etype
+	end
+
+and cast_or_unify_raise ctx tleft eright p =
+	try
+		(* can't do that anymore because this might miss macro calls (#4315) *)
+		(* if ctx.com.display <> DMNone then raise Not_found; *)
+		do_check_cast ctx tleft eright p
+	with Not_found ->
+		unify_raise ctx eright.etype tleft p;
+		eright
+
+and cast_or_unify ctx tleft eright p =
+	try
+		cast_or_unify_raise ctx tleft eright p
+	with Error (Unify l,p) ->
+		raise_or_display ctx l p;
+		eright
+
+let find_array_access_raise ctx a pl e1 e2o p =
+	let is_set = e2o <> None in
+	let ta = apply_params a.a_params pl a.a_this in
+	let rec loop cfl = match cfl with
+		| [] -> raise Not_found
+		| cf :: cfl ->
+			let monos = List.map (fun _ -> mk_mono()) cf.cf_params in
+			let map t = apply_params a.a_params pl (apply_params cf.cf_params monos t) in
+			let check_constraints () =
+				List.iter2 (fun m (name,t) -> match follow t with
+					| TInst ({ cl_kind = KTypeParameter constr },_) when constr <> [] ->
+						List.iter (fun tc -> match follow m with TMono _ -> raise (Unify_error []) | _ -> Type.unify m (map tc) ) constr
+					| _ -> ()
+				) monos cf.cf_params;
+			in
+			match follow (map cf.cf_type) with
+			| TFun([(_,_,tab);(_,_,ta1);(_,_,ta2)],r) as tf when is_set ->
+				begin try
+					Type.unify tab ta;
+					let e1 = cast_or_unify_raise ctx ta1 e1 p in
+					let e2o = match e2o with None -> None | Some e2 -> Some (cast_or_unify_raise ctx ta2 e2 p) in
+					check_constraints();
+					cf,tf,r,e1,e2o
+				with Unify_error _ | Error (Unify _,_) ->
+					loop cfl
+				end
+			| TFun([(_,_,tab);(_,_,ta1)],r) as tf when not is_set ->
+				begin try
+					Type.unify tab ta;
+					let e1 = cast_or_unify_raise ctx ta1 e1 p in
+					check_constraints();
+					cf,tf,r,e1,None
+				with Unify_error _ | Error (Unify _,_) ->
+					loop cfl
+				end
+			| _ -> loop cfl
+	in
+	loop a.a_array
+
+let find_array_access ctx a tl e1 e2o p =
+	try find_array_access_raise ctx a tl e1 e2o p
+	with Not_found -> match e2o with
+		| None ->
+			error (Printf.sprintf "No @:arrayAccess function accepts argument of %s" (s_type (print_context()) e1.etype)) p
+		| Some e2 ->
+			error (Printf.sprintf "No @:arrayAccess function accepts arguments of %s and %s" (s_type (print_context()) e1.etype) (s_type (print_context()) e2.etype)) p
+
+let find_multitype_specialization com a pl p =
+	let m = mk_mono() in
+	let tl = match Meta.get Meta.MultiType a.a_meta with
+		| _,[],_ -> pl
+		| _,el,_ ->
+			let relevant = Hashtbl.create 0 in
+			List.iter (fun e ->
+				let rec loop f e = match fst e with
+					| EConst(Ident s) ->
+						Hashtbl.replace relevant s f
+					| EMeta((Meta.Custom ":followWithAbstracts",_,_),e1) ->
+						loop Abstract.follow_with_abstracts e1;
+					| _ ->
+						error "Type parameter expected" (pos e)
+				in
+				loop (fun t -> t) e
+			) el;
+			let tl = List.map2 (fun (n,_) t ->
+				try
+					(Hashtbl.find relevant n) t
+				with Not_found ->
+					if not (has_mono t) then t
+					else t_dynamic
+			) a.a_params pl in
+			if com.platform = Globals.Js && a.a_path = (["haxe";"ds"],"Map") then begin match tl with
+				| t1 :: _ ->
+					let stack = ref [] in
+					let rec loop t =
+						if List.exists (fun t2 -> fast_eq t t2) !stack then
+							t
+						else begin
+							stack := t :: !stack;
+							match follow t with
+							| TAbstract ({ a_path = [],"Class" },_) ->
+								error (Printf.sprintf "Cannot use %s as key type to Map because Class<T> is not comparable" (s_type (print_context()) t1)) p;
+							| TEnum(en,tl) ->
+								PMap.iter (fun _ ef -> ignore(loop ef.ef_type)) en.e_constrs;
+								Type.map loop t
+							| t ->
+								Type.map loop t
+						end
+					in
+					ignore(loop t1)
+				| _ -> assert false
+			end;
+			tl
+	in
+	let _,cf =
+		try
+			Abstract.find_to a tl m
+		with Not_found ->
+			let at = apply_params a.a_params pl a.a_this in
+			let st = s_type (print_context()) at in
+			if has_mono at then
+				error ("Type parameters of multi type abstracts must be known (for " ^ st ^ ")") p
+			else
+				error ("Abstract " ^ (s_type_path a.a_path) ^ " has no @:to function that accepts " ^ st) p;
+	in
+	cf, follow m
+
+let handle_abstract_casts ctx e =
+	let rec loop ctx e = match e.eexpr with
+		| TNew({cl_kind = KAbstractImpl a} as c,pl,el) ->
+			if not (Meta.has Meta.MultiType a.a_meta) then begin
+				(* This must have been a @:generic expansion with a { new } constraint (issue #4364). In this case
+					let's construct the underlying type. *)
+				match Abstract.get_underlying_type a pl with
+				| TInst(c,tl) as t -> {e with eexpr = TNew(c,tl,el); etype = t}
+				| _ -> error ("Cannot construct " ^ (s_type (print_context()) (TAbstract(a,pl)))) e.epos
+			end else begin
+				(* a TNew of an abstract implementation is only generated if it is a multi type abstract *)
+				let cf,m = find_multitype_specialization ctx.com a pl e.epos in
+				let e = make_static_call ctx c cf a pl ((mk (TConst TNull) (TAbstract(a,pl)) e.epos) :: el) m e.epos in
+				{e with etype = m}
+			end
+		| TCall({eexpr = TField(_,FStatic({cl_path=[],"Std"},{cf_name = "string"}))},[e1]) when (match follow e1.etype with TAbstract({a_impl = Some _},_) -> true | _ -> false) ->
+			begin match follow e1.etype with
+				| TAbstract({a_impl = Some c} as a,tl) ->
+					begin try
+						let cf = PMap.find "toString" c.cl_statics in
+						make_static_call ctx c cf a tl [e1] ctx.t.tstring e.epos
+					with Not_found ->
+						e
+					end
+				| _ ->
+					assert false
+			end
+		| TCall(e1, el) ->
+			begin try
+				let rec find_abstract e t = match follow t,e.eexpr with
+					| TAbstract(a,pl),_ when Meta.has Meta.MultiType a.a_meta -> a,pl,e
+					| _,TCast(e1,None) -> find_abstract e1 e1.etype
+					| _,TLocal {v_extra = Some(_,Some e')} ->
+						begin match follow e'.etype with
+						| TAbstract(a,pl) when Meta.has Meta.MultiType a.a_meta -> a,pl,mk (TCast(e,None)) e'.etype e.epos
+						| _ -> raise Not_found
+						end
+					| _ -> raise Not_found
+				in
+				let rec find_field e1 =
+					match e1.eexpr with
+					| TCast(e2,None) ->
+						{e1 with eexpr = TCast(find_field e2,None)}
+					| TField(e2,fa) ->
+						let a,pl,e2 = find_abstract e2 e2.etype in
+						let m = Abstract.get_underlying_type a pl in
+						let fname = field_name fa in
+						let el = List.map (loop ctx) el in
+						begin try
+							let fa = quick_field m fname in
+							let get_fun_type t = match follow t with
+								| TFun(_,tr) as tf -> tf,tr
+								| _ -> raise Not_found
+							in
+							let tf,tr = match fa with
+								| FStatic(_,cf) -> get_fun_type cf.cf_type
+								| FInstance(c,tl,cf) -> get_fun_type (apply_params c.cl_params tl cf.cf_type)
+								| FAnon cf -> get_fun_type cf.cf_type
+								| _ -> raise Not_found
+							in
+							let ef = mk (TField({e2 with etype = m},fa)) tf e2.epos in
+							let ecall = make_call ctx ef el tr e.epos in
+							if not (type_iseq ecall.etype e.etype) then
+								mk (TCast(ecall,None)) e.etype e.epos
+							else
+								ecall
+						with Not_found ->
+							(* quick_field raises Not_found if m is an abstract, we have to replicate the 'using' call here *)
+							match follow m with
+							| TAbstract({a_impl = Some c} as a,pl) ->
+								let cf = PMap.find fname c.cl_statics in
+								make_static_call ctx c cf a pl (e2 :: el) e.etype e.epos
+							| _ -> raise Not_found
+						end
+					| _ ->
+						raise Not_found
+				in
+				find_field e1
+			with Not_found ->
+				Type.map_expr (loop ctx) e
+			end
+		| _ ->
+			Type.map_expr (loop ctx) e
+	in
+	loop ctx e
\ No newline at end of file
diff --git a/src/context/common.ml b/src/context/common.ml
index 3e0767f043cbfac747ff7f09d8bb7b5b5a86da46..500d448a4931a0e0cb216ec122945f9f7c395f94 100644
--- a/src/context/common.ml
+++ b/src/context/common.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -18,8 +18,11 @@
  *)
 
 open Ast
+open CompilationServer
 open Type
 open Globals
+open Define
+open NativeLibraries
 
 type package_rule =
 	| Forbidden
@@ -28,15 +31,13 @@ type package_rule =
 
 type pos = Globals.pos
 
-type basic_types = {
-	mutable tvoid : t;
-	mutable tint : t;
-	mutable tfloat : t;
-	mutable tbool : t;
-	mutable tnull : t -> t;
-	mutable tstring : t;
-	mutable tarray : t -> t;
-}
+let const_type basic const default =
+	match const with
+	| TString _ -> basic.tstring
+	| TInt _ -> basic.tint
+	| TFloat _ -> basic.tfloat
+	| TBool _ -> basic.tbool
+	| _ -> default
 
 type stats = {
 	s_files_parsed : int ref;
@@ -45,6 +46,25 @@ type stats = {
 	s_macros_called : int ref;
 }
 
+type compiler_message =
+	| CMInfo of string * pos
+	| CMWarning of string * pos
+	| CMError of string * pos
+
+let compiler_message_string msg =
+	let (str,p) = match msg with
+		| CMInfo(str,p) | CMError(str,p) -> (str,p)
+		| CMWarning(str,p) -> ("Warning : " ^ str, p)
+	in
+	if p = null_pos then
+		str
+	else begin
+		let error_printer file line = Printf.sprintf "%s:%d:" file line in
+		let epos = Lexer.get_error_pos error_printer p in
+		let str = String.concat ("\n" ^ epos ^ " : ") (ExtString.String.nsplit str "\n") in
+		Printf.sprintf "%s : %s" epos str
+	end
+
 (**
 	The capture policy tells which handling we make of captured locals
 	(the locals which are referenced in local functions)
@@ -76,163 +96,72 @@ type platform_config = {
 	pf_can_skip_non_nullable_argument : bool;
 	(** type paths that are reserved on the platform *)
 	pf_reserved_type_paths : path list;
+	(** supports function == function **)
+	pf_supports_function_equality : bool;
+	(** uses utf16 encoding with ucs2 api **)
+	pf_uses_utf16 : bool;
+	(** target supports accessing `this` before calling `super(...)` **)
+	pf_this_before_super : bool;
+	(** target supports threads **)
+	pf_supports_threads : bool;
+	(** target supports Unicode **)
+	pf_supports_unicode : bool;
 }
 
-module DisplayMode = struct
-	type t =
-		| DMNone
-		| DMField
-		| DMUsage of bool (* true = also report definition *)
-		| DMPosition
-		| DMToplevel
-		| DMResolve of string
-		| DMPackage
-		| DMType
-		| DMModuleSymbols of string option
-		| DMDiagnostics of bool (* true = global, false = only in display file *)
-		| DMStatistics
-		| DMSignature
-
-	type error_policy =
-		| EPIgnore
-		| EPCollect
-		| EPShow
-
-	type display_file_policy =
-		| DFPOnly
-		| DFPAlso
-		| DFPNo
-
-	type settings = {
-		dms_kind : t;
-		dms_display : bool;
-		dms_full_typing : bool;
-		dms_force_macro_typing : bool;
-		dms_error_policy : error_policy;
-		dms_collect_data : bool;
-		dms_check_core_api : bool;
-		dms_inline : bool;
-		dms_display_file_policy : display_file_policy;
-		dms_exit_during_typing : bool;
-	}
+class compiler_callbacks = object(self)
+	val mutable before_typer_create = [];
+	val mutable after_init_macros = [];
+	val mutable after_typing = [];
+	val mutable before_save = [];
+	val mutable after_save = [];
+	val mutable after_filters = [];
+	val mutable after_generation = [];
+	val mutable null_safety_report = [];
 
-	let default_display_settings = {
-		dms_kind = DMField;
-		dms_display = true;
-		dms_full_typing = false;
-		dms_force_macro_typing = false;
-		dms_error_policy = EPIgnore;
-		dms_collect_data = false;
-		dms_check_core_api = false;
-		dms_inline = false;
-		dms_display_file_policy = DFPOnly;
-		dms_exit_during_typing = true;
-	}
+	method add_before_typer_create (f : unit -> unit) : unit =
+		before_typer_create <- f :: before_typer_create
 
-	let default_compilation_settings = {
-		dms_kind = DMNone;
-		dms_display = false;
-		dms_full_typing = true;
-		dms_force_macro_typing = true;
-		dms_error_policy = EPShow;
-		dms_collect_data = false;
-		dms_check_core_api = true;
-		dms_inline = true;
-		dms_display_file_policy = DFPNo;
-		dms_exit_during_typing = false;
-	}
+	method add_after_init_macros (f : unit -> unit) : unit =
+		after_init_macros <- f :: after_init_macros
 
-	let create dm =
-		let settings = { default_display_settings with dms_kind = dm } in
-		match dm with
-		| DMNone -> default_compilation_settings
-		| DMField | DMPosition | DMResolve _ | DMPackage | DMType | DMSignature -> settings
-		| DMUsage _ -> { settings with
-				dms_full_typing = true;
-				dms_collect_data = true;
-				dms_display_file_policy = DFPAlso;
-				dms_exit_during_typing = false
-			}
-		| DMToplevel -> { settings with dms_full_typing = true; }
-		| DMModuleSymbols filter -> { settings with
-				dms_display_file_policy = if filter = None then DFPOnly else DFPNo;
-				dms_exit_during_typing = false;
-				dms_force_macro_typing = false;
-			}
-		| DMDiagnostics global -> { settings with
-				dms_full_typing = true;
-				dms_error_policy = EPCollect;
-				dms_collect_data = true;
-				dms_inline = true;
-				dms_display_file_policy = if global then DFPNo else DFPAlso;
-				dms_exit_during_typing = false;
-			}
-		| DMStatistics -> { settings with
-				dms_full_typing = true;
-				dms_collect_data = true;
-				dms_inline = false;
-				dms_display_file_policy = DFPAlso;
-				dms_exit_during_typing = false
-			}
+	method add_after_typing (f : module_type list -> unit) : unit =
+		after_typing <- f :: after_typing
 
-	let to_string = function
-		| DMNone -> "none"
-		| DMField -> "field"
-		| DMPosition -> "position"
-		| DMResolve s -> "resolve " ^ s
-		| DMPackage -> "package"
-		| DMType -> "type"
-		| DMUsage true -> "rename"
-		| DMUsage false -> "references"
-		| DMToplevel -> "toplevel"
-		| DMModuleSymbols None -> "module-symbols"
-		| DMModuleSymbols (Some s) -> "workspace-symbols " ^ s
-		| DMDiagnostics b -> (if b then "global " else "") ^ "diagnostics"
-		| DMStatistics -> "statistics"
-		| DMSignature -> "signature"
-end
+	method add_before_save (f : unit -> unit) : unit =
+		before_save <- f :: before_save
 
-type compiler_callback = {
-	mutable after_typing : (module_type list -> unit) list;
-	mutable before_dce : (unit -> unit) list;
-	mutable after_generation : (unit -> unit) list;
-}
+	method add_after_save (f : unit -> unit) : unit =
+		after_save <- f :: after_save
 
-module IdentifierType = struct
-	type t =
-		| ITLocal of tvar
-		| ITMember of tclass * tclass_field
-		| ITStatic of tclass * tclass_field
-		| ITEnum of tenum * tenum_field
-		| ITEnumAbstract of tabstract * tclass_field
-		| ITGlobal of module_type * string * Type.t
-		| ITType of module_type
-		| ITPackage of string
-		| ITLiteral of string
-		| ITTimer of string
-
-	let get_name = function
-		| ITLocal v -> v.v_name
-		| ITMember(_,cf) | ITStatic(_,cf) | ITEnumAbstract(_,cf) -> cf.cf_name
-		| ITEnum(_,ef) -> ef.ef_name
-		| ITGlobal(_,s,_) -> s
-		| ITType mt -> snd (t_infos mt).mt_path
-		| ITPackage s -> s
-		| ITLiteral s -> s
-		| ITTimer s -> s
+	method add_after_filters (f : unit -> unit) : unit =
+		after_filters <- f :: after_filters
+
+	method add_after_generation (f : unit -> unit) : unit =
+		after_generation <- f :: after_generation
+
+	method add_null_safety_report (f : (string*pos) list -> unit) : unit =
+		null_safety_report <- f :: null_safety_report
+
+	method get_before_typer_create = before_typer_create
+	method get_after_init_macros = after_init_macros
+	method get_after_typing = after_typing
+	method get_before_save = before_save
+	method get_after_save = after_save
+	method get_after_filters = after_filters
+	method get_after_generation = after_generation
+	method get_null_safety_report = null_safety_report
 end
 
 type shared_display_information = {
 	mutable import_positions : (pos,bool ref * placed_name list) PMap.t;
-	mutable diagnostics_messages : (string * pos * DisplayTypes.DiagnosticsSeverity.t) list;
-	mutable type_hints : (pos,Type.t) Hashtbl.t;
-	mutable document_symbols : (string * DisplayTypes.SymbolInformation.t DynArray.t) list;
-	mutable removable_code : (string * pos * pos) list;
+	mutable diagnostics_messages : (string * pos * DisplayTypes.DiagnosticsKind.t * DisplayTypes.DiagnosticsSeverity.t) list;
+	mutable dead_blocks : (string,(pos * expr) list) Hashtbl.t;
 }
 
 type display_information = {
-	mutable unresolved_identifiers : (string * pos * (string * IdentifierType.t) list) list;
+	mutable unresolved_identifiers : (string * pos * (string * CompletionItem.t * int) list) list;
 	mutable interface_field_implementations : (tclass * tclass_field * tclass * tclass_field option) list;
+	mutable display_module_has_macro_defines : bool;
 }
 
 (* This information is shared between normal and macro context. *)
@@ -240,14 +169,40 @@ type shared_context = {
 	shared_display_information : shared_display_information;
 }
 
+type json_api = {
+	send_result : Json.t -> unit;
+	send_error : Json.t list -> unit;
+	jsonrpc : Jsonrpc_handler.jsonrpc_handler;
+}
+
+type compiler_stage =
+	| CCreated          (* Context was just created *)
+	| CInitialized      (* Context was initialized (from CLI args and such). *)
+	| CTyperCreated     (* The typer context was just created. *)
+	| CInitMacrosStart  (* Init macros are about to run. *)
+	| CInitMacrosDone   (* Init macros did run - at this point the signature is locked. *)
+	| CTypingDone       (* The typer is done - at this point com.types/modules/main is filled. *)
+	| CFilteringStart   (* Filtering just started (nothing changed yet). *)
+	| CAnalyzerStart    (* Some filters did run, the analyzer is about to run. *)
+	| CAnalyzerDone     (* The analyzer just finished. *)
+	| CSaveStart        (* The type state is about to be saved. *)
+	| CSaveDone         (* The type state has been saved - at this point we can destroy things. *)
+	| CDceStart         (* DCE is about to run - everything is still available. *)
+	| CDceDone          (* DCE just finished. *)
+	| CFilteringDone    (* Filtering just finished. *)
+	| CGenerationStart  (* Generation is about to begin. *)
+	| CGenerationDone   (* Generation just finished. *)
+
 type context = {
+	mutable stage : compiler_stage;
+	mutable cache : context_cache option;
 	(* config *)
 	version : int;
 	args : string list;
 	shared : shared_context;
 	display_information : display_information;
 	mutable sys_args : string list;
-	mutable display : DisplayMode.settings;
+	mutable display : DisplayTypes.DisplayMode.settings;
 	mutable debug : bool;
 	mutable verbose : bool;
 	mutable foptimize : bool;
@@ -255,21 +210,26 @@ type context = {
 	mutable config : platform_config;
 	mutable std_path : string list;
 	mutable class_path : string list;
-	mutable main_class : Type.path option;
-	mutable defines : (string,string) PMap.t;
+	mutable main_class : path option;
 	mutable package_rules : (string,package_rule) PMap.t;
 	mutable error : string -> pos -> unit;
+	mutable info : string -> pos -> unit;
 	mutable warning : string -> pos -> unit;
-	mutable load_extern_type : (path -> pos -> (string * Ast.package) option) list; (* allow finding types which are not in sources *)
-	callbacks : compiler_callback;
-	mutable defines_signature : string option;
+	mutable get_messages : unit -> compiler_message list;
+	mutable filter_messages : (compiler_message -> bool) -> unit;
+	mutable load_extern_type : (string * (path -> pos -> Ast.package option)) list; (* allow finding types which are not in sources *)
+	callbacks : compiler_callbacks;
+	defines : Define.define;
 	mutable print : string -> unit;
 	mutable get_macros : unit -> context option;
 	mutable run_command : string -> int;
 	file_lookup_cache : (string,string option) Hashtbl.t;
+	readdir_cache : (string * string,(string array) option) Hashtbl.t;
 	parser_cache : (string,(type_def * pos) list) Hashtbl.t;
-	cached_macros : (path * string,((string * bool * t) list * t * tclass * Type.tclass_field)) Hashtbl.t;
+	module_to_file : (path,string) Hashtbl.t;
+	cached_macros : (path * string,(((string * bool * t) list * t * tclass * Type.tclass_field) * module_def)) Hashtbl.t;
 	mutable stored_typed_exprs : (int, texpr) PMap.t;
+	pass_debug_messages : string DynArray.t;
 	(* output *)
 	mutable file : string;
 	mutable flash_version : float;
@@ -280,16 +240,12 @@ type context = {
 	mutable resources : (string,string) Hashtbl.t;
 	mutable neko_libs : string list;
 	mutable include_files : (string * string) list;
-	mutable php_front : string option;
-	mutable php_lib : string option;
-	mutable php_prefix : string option;
-	mutable swf_libs : (string * (unit -> Swf.swf) * (unit -> ((string list * string),As3hl.hl_class) Hashtbl.t)) list;
-	mutable java_libs : (string * bool * (unit -> unit) * (unit -> (path list)) * (path -> ((JData.jclass * string * string) option))) list; (* (path,std,close,all_files,lookup) *)
-	mutable net_libs : (string * bool * (unit -> path list) * (path -> IlData.ilclass option)) list; (* (path,std,all_files,lookup) *)
+	mutable native_libs : native_libraries;
 	mutable net_std : string list;
 	net_path_map : (path,string list * string list * string) Hashtbl.t;
 	mutable c_args : string list;
 	mutable js_gen : (unit -> unit) option;
+	mutable json_out : json_api option;
 	(* typing *)
 	mutable basic : basic_types;
 	memory_marker : float array;
@@ -297,342 +253,38 @@ type context = {
 
 exception Abort of string * pos
 
-let display_default = ref DisplayMode.DMNone
-
-let get_signature com =
-	match com.defines_signature with
-	| Some s -> s
-	| None ->
-		let defines = PMap.foldi (fun k v acc ->
-			(* don't make much difference between these special compilation flags *)
-			match String.concat "_" (ExtString.String.nsplit k "-") with
-			(* If we add something here that might be used in conditional compilation it should be added to
-			   Parser.parse_macro_ident as well (issue #5682). *)
-			| "display" | "use_rtti_doc" | "macro_times" | "display_details" | "no_copt" | "display_stdin" -> acc
-			| _ -> (k ^ "=" ^ v) :: acc
-		) com.defines [] in
-		let str = String.concat "@" (List.sort compare defines) in
-		let s = Digest.string str in
-		com.defines_signature <- Some s;
-		s
-
-let is_php7 com = com.platform = Php && PMap.exists "php7" com.defines
-
-module CompilationServer = struct
-	type cache = {
-		c_haxelib : (string list, string list) Hashtbl.t;
-		c_files : ((string * string), float * Ast.package) Hashtbl.t;
-		c_modules : (path * string, module_def) Hashtbl.t;
-		c_directories : (string, (string * float ref) list) Hashtbl.t;
-	}
-
-	type t = {
-		cache : cache;
-		mutable signs : (string * string) list;
-	}
-
-	type context_options =
-		| NormalContext
-		| MacroContext
-		| NormalAndMacroContext
-
-	let instance : t option ref = ref None
-
-	let create_cache () = {
-		c_haxelib = Hashtbl.create 0;
-		c_files = Hashtbl.create 0;
-		c_modules = Hashtbl.create 0;
-		c_directories = Hashtbl.create 0;
-	}
-
-	let create () =
-		let cs = {
-			cache = create_cache();
-			signs = [];
-		} in
-		instance := Some cs;
-		cs
-
-	let get () =
-		!instance
-
-	let runs () =
-		!instance <> None
-
-	let get_context_files cs signs =
-		Hashtbl.fold (fun (file,sign) (_,data) acc ->
-			if (List.mem sign signs) then (file,data) :: acc
-			else acc
-		) cs.cache.c_files []
-
-	(* signatures *)
-
-	let get_sign cs sign =
-		List.assoc sign cs.signs
-
-	let add_sign cs sign =
-		let i = string_of_int (List.length cs.signs) in
-		cs.signs <- (sign,i) :: cs.signs;
-		i
-
-	(* modules *)
-
-	let find_module cs key =
-		Hashtbl.find cs.cache.c_modules key
-
-	let cache_module cs key value =
-		Hashtbl.replace cs.cache.c_modules key value
-
-	let taint_modules cs file =
-		Hashtbl.iter (fun _ m -> if m.m_extra.m_file = file then m.m_extra.m_dirty <- Some m) cs.cache.c_modules
-
-	(* files *)
+(* Defines *)
 
-	let find_file cs key =
-		Hashtbl.find cs.cache.c_files key
+module Define = Define
 
-	let cache_file cs key value =
-		Hashtbl.replace cs.cache.c_files key value
+let defined com s =
+	Define.defined com.defines s
 
-	let remove_file cs key =
-		Hashtbl.remove cs.cache.c_files key
+let raw_defined com v =
+	Define.raw_defined com.defines v
 
-	let remove_files cs file =
-		List.iter (fun (sign,_) -> remove_file cs (sign,file)) cs.signs
+let defined_value com v =
+	Define.defined_value com.defines v
 
-	(* haxelibs *)
+let defined_value_safe ?default com v =
+	match default with
+		| Some s -> Define.defined_value_safe ~default:s com.defines v
+		| None -> Define.defined_value_safe com.defines v
 
-	let find_haxelib cs key =
-		Hashtbl.find cs.cache.c_haxelib key
+let define com v =
+	Define.define com.defines v
 
-	let cache_haxelib cs key value =
-		Hashtbl.replace cs.cache.c_haxelib key value
+let raw_define com v =
+	Define.raw_define com.defines v
 
-	(* directories *)
+let define_value com k v =
+	Define.define_value com.defines k v
 
-	let find_directories cs key =
-		Hashtbl.find cs.cache.c_directories key
+let raw_defined_value com k =
+	Define.raw_defined_value com.defines k
 
-	let add_directories cs key value =
-		Hashtbl.replace cs.cache.c_directories key value
-
-	let remove_directory cs key value =
-		try
-			let current = find_directories cs key in
-			Hashtbl.replace cs.cache.c_directories key (List.filter (fun (s,_) -> s <> value) current);
-		with Not_found ->
-			()
-
-	let has_directory cs key value =
-		try
-			List.mem_assoc value (find_directories cs key)
-		with Not_found ->
-			false
-
-	let add_directory cs key value =
-		try
-			let current = find_directories cs key in
-			add_directories cs key (value :: current)
-		with Not_found ->
-			add_directories cs key [value]
-
-	let clear_directories cs key =
-		Hashtbl.remove cs.cache.c_directories key
-end
-
-module Define = struct
-
-	type strict_defined =
-		| AbsolutePath
-		| AdvancedTelemetry
-		| AnnotateSource
-		(* | Analyzer *)
-		| As3
-		| CheckXmlProxy
-		| CoreApi
-		| CoreApiSerialize
-		| Cppia
-		| Dce
-		| DceDebug
-		| Debug
-		| Display
-		| DisplayStdin
-		| DllExport
-		| DllImport
-		| DocGen
-		| Dump
-		| DumpDependencies
-		| DumpIgnoreVarIds
-		| DynamicInterfaceClosures
-		| EraseGenerics
-		| FastCast
-		| Fdb
-		| FileExtension
-		| FlashStrict
-		| FlashUseStage
-		| ForceLibCheck
-		| ForceNativeProperty
-		| FormatWarning
-		| GencommonDebug
-		| HaxeBoot
-		| HaxeVer
-		| HxcppApiLevel
-		| HxcppGcGenerational
-		| HxcppDebugger
-		| IncludePrefix
-		| Interp
-		| JavaVer
-		| JqueryVer
-		| JsClassic
-		| JsEs
-		| JsUnflatten
-		| JsSourceMap
-		| SourceMap
-		| KeepOldOutput
-		| LoopUnrollMaxCost
-		| LuaVer
-		| LuaJit
-		| Macro
-		| MacroDebug
-		| MacroTimes
-		| NekoSource
-		| NekoV1
-		| NetworkSandbox
-		| NetVer
-		| NetTarget
-		| NoCompilation
-		| NoCOpt
-		| NoDeprecationWarnings
-		| NoFlashOverride
-		| NoDebug
-		| NoInline
-		| NoOpt
-		| NoPatternMatching
-		| NoRoot
-		| NoSwfCompress
-		| NoTraces
-		| Objc
-		| PhpPrefix
-		| RealPosition
-		| ReplaceFiles
-		| Scriptable
-		| ShallowExpose
-		| SourceHeader
-		| SourceMapContent
-		| Swc
-		| SwfCompressLevel
-		| SwfDebugPassword
-		| SwfDirectBlit
-		| SwfGpu
-		| SwfMetadata
-		| SwfPreloaderFrame
-		| SwfProtected
-		| SwfScriptTimeout
-		| SwfUseDoAbc
-		| Sys
-		| Unsafe
-		| UseNekoc
-		| UseRttiDoc
-		| Vcproj
-		| NoMacroCache
-		| Last (* must be last *)
-
-	let infos = function
-		| AbsolutePath -> ("absolute_path","Print absolute file path in trace output")
-		| AdvancedTelemetry -> ("advanced-telemetry","Allow the SWF to be measured with Monocle tool")
-		| AnnotateSource -> ("annotate_source","Add additional comments to generated source code")
-		(* | Analyzer -> ("analyzer","Use static analyzer for optimization (experimental)") *)
-		| As3 -> ("as3","Defined when outputing flash9 as3 source code")
-		| CheckXmlProxy -> ("check_xml_proxy","Check the used fields of the xml proxy")
-		| CoreApi -> ("core_api","Defined in the core api context")
-		| CoreApiSerialize -> ("core_api_serialize","Mark some generated core api classes with the Serializable attribute on C#")
-		| Cppia -> ("cppia", "Generate cpp instruction assembly")
-		| Dce -> ("dce","<mode:std|full|no> Set the dead code elimination mode (default std)")
-		| DceDebug -> ("dce_debug","Show DCE log")
-		| Debug -> ("debug","Activated when compiling with -debug")
-		| Display -> ("display","Activated during completion")
-		| DisplayStdin -> ("display_stdin","Read the contents of a file specified in --display from standard input")
-		| DllExport -> ("dll_export", "GenCPP experimental linking")
-		| DllImport -> ("dll_import", "GenCPP experimental linking")
-		| DocGen -> ("doc_gen","Do not perform any removal/change in order to correctly generate documentation")
-		| Dump -> ("dump","<mode:pretty|record|legacy> Dump typed AST in dump subdirectory using specified mode or non-prettified default")
-		| DumpDependencies -> ("dump_dependencies","Dump the classes dependencies in a dump subdirectory")
-		| DumpIgnoreVarIds -> ("dump_ignore_var_ids","Remove variable IDs from non-pretty dumps (helps with diff)")
-		| DynamicInterfaceClosures -> ("dynamic_interface_closures","Use slow path for interface closures to save space")
-		| EraseGenerics -> ("erase_generics","Erase generic classes on C#")
-		| FastCast -> ("fast_cast","Enables an experimental casts cleanup on C# and Java")
-		| Fdb -> ("fdb","Enable full flash debug infos for FDB interactive debugging")
-		| FileExtension -> ("file_extension","Output filename extension for cpp source code")
-		| FlashStrict -> ("flash_strict","More strict typing for flash target")
-		| FlashUseStage -> ("flash_use_stage","Keep the SWF library initial stage")
-		(* force_lib_check is only here as a debug facility - compiler checking allows errors to be found more easily *)
-		| ForceLibCheck -> ("force_lib_check","Force the compiler to check -net-lib and -java-lib added classes (internal)")
-		| ForceNativeProperty -> ("force_native_property","Tag all properties with :nativeProperty metadata for 3.1 compatibility")
-		| FormatWarning -> ("format_warning","Print a warning for each formated string, for 2.x compatibility")
-		| GencommonDebug -> ("gencommon_debug","GenCommon internal")
-		| HaxeBoot -> ("haxe_boot","Given the name 'haxe' to the flash boot class instead of a generated name")
-		| HaxeVer -> ("haxe_ver","The current Haxe version value")
-		| HxcppApiLevel -> ("hxcpp_api_level","Provided to allow compatibility between hxcpp versions")
-		| HxcppGcGenerational -> ("HXCPP_GC_GENERATIONAL","Experimental Garbage Collector")
-		| HxcppDebugger -> ("HXCPP_DEBUGGER","Include additional information for HXCPP_DEBUGGER")
-		| IncludePrefix -> ("include_prefix","prepend path to generated include files")
-		| Interp -> ("interp","The code is compiled to be run with --interp")
-		| JavaVer -> ("java_ver", "<version:5-7> Sets the Java version to be targeted")
-		| JqueryVer -> ("jquery_ver", "The jQuery version supported by js.jquery.*. The version is encoded as an interger. e.g. 1.11.3 is encoded as 11103")
-		| JsClassic -> ("js_classic","Don't use a function wrapper and strict mode in JS output")
-		| JsEs -> ("js_es","Generate JS compilant with given ES standard version (default 5)")
-		| JsUnflatten -> ("js_unflatten","Generate nested objects for packages and types")
-		| JsSourceMap -> ("js_source_map","Generate JavaScript source map even in non-debug mode")
-		| SourceMap -> ("source_map","Generate source map for compiled files (Currently supported for php7 only)")
-		| KeepOldOutput -> ("keep_old_output","Keep old source files in the output directory (for C#/Java)")
-		| LoopUnrollMaxCost -> ("loop_unroll_max_cost","Maximum cost (number of expressions * iterations) before loop unrolling is canceled (default 250)")
-		| LuaJit -> ("lua_jit","Enable the jit compiler for lua (version 5.2 only")
-		| LuaVer -> ("lua_ver","The lua version to target")
-		| Macro -> ("macro","Defined when code is compiled in the macro context")
-		| MacroDebug -> ("macro_debug","Show warnings for potential macro problems (e.g. macro-in-macro calls)")
-		| MacroTimes -> ("macro_times","Display per-macro timing when used with --times")
-		| NetVer -> ("net_ver", "<version:20-45> Sets the .NET version to be targeted")
-		| NetTarget -> ("net_target", "<name> Sets the .NET target. Defaults to \"net\". xbox, micro (Micro Framework), compact (Compact Framework) are some valid values")
-		| NekoSource -> ("neko_source","Output neko source instead of bytecode")
-		| NekoV1 -> ("neko_v1","Keep Neko 1.x compatibility")
-		| NetworkSandbox -> ("network-sandbox","Use local network sandbox instead of local file access one")
-		| NoCompilation -> ("no-compilation","Disable final compilation for Cs, Cpp and Java")
-		| NoCOpt -> ("no_copt","Disable completion optimization (for debug purposes)")
-		| NoDebug -> ("no_debug","Remove all debug macros from cpp output")
-		| NoDeprecationWarnings -> ("no-deprecation-warnings","Do not warn if fields annotated with @:deprecated are used")
-		| NoFlashOverride -> ("no-flash-override", "Change overrides on some basic classes into HX suffixed methods, flash only")
-		| NoOpt -> ("no_opt","Disable optimizations")
-		| NoPatternMatching -> ("no_pattern_matching","Disable pattern matching")
-		| NoInline -> ("no_inline","Disable inlining")
-		| NoRoot -> ("no_root","Generate top-level types into haxe.root namespace")
-		| NoMacroCache -> ("no_macro_cache","Disable macro context caching")
-		| NoSwfCompress -> ("no_swf_compress","Disable SWF output compression")
-		| NoTraces -> ("no_traces","Disable all trace calls")
-		| Objc -> ("objc","Sets the hxcpp output to objective-c++ classes. Must be defined for interop")
-		| PhpPrefix -> ("php_prefix","Compiled with --php-prefix")
-		| RealPosition -> ("real_position","Disables Haxe source mapping when targetting C#, removes position comments in Java and Php7 output")
-		| ReplaceFiles -> ("replace_files","GenCommon internal")
-		| Scriptable -> ("scriptable","GenCPP internal")
-		| ShallowExpose -> ("shallow-expose","Expose types to surrounding scope of Haxe generated closure without writing to window object")
-		| SourceHeader -> ("source-header","Print value as comment on top of generated files, use '' value to disable")
-		| SourceMapContent -> ("source-map-content","Include the hx sources as part of the JS source map")
-		| Swc -> ("swc","Output a SWC instead of a SWF")
-		| SwfCompressLevel -> ("swf_compress_level","<level:1-9> Set the amount of compression for the SWF output")
-		| SwfDebugPassword -> ("swf_debug_password", "Set a password for debugging")
-		| SwfDirectBlit -> ("swf_direct_blit", "Use hardware acceleration to blit graphics")
-		| SwfGpu -> ("swf_gpu", "Use GPU compositing features when drawing graphics")
-		| SwfMetadata -> ("swf_metadata", "<file> Include contents of <file> as metadata in the swf")
-		| SwfPreloaderFrame -> ("swf_preloader_frame", "Insert empty first frame in swf")
-		| SwfProtected -> ("swf_protected","Compile Haxe private as protected in the SWF instead of public")
-		| SwfScriptTimeout -> ("swf_script_timeout", "Maximum ActionScript processing time before script stuck dialog box displays (in seconds)")
-		| SwfUseDoAbc -> ("swf_use_doabc", "Use DoAbc swf-tag instead of DoAbcDefine")
-		| Sys -> ("sys","Defined for all system platforms")
-		| Unsafe -> ("unsafe","Allow unsafe code when targeting C#")
-		| UseNekoc -> ("use_nekoc","Use nekoc compiler instead of internal one")
-		| UseRttiDoc -> ("use_rtti_doc","Allows access to documentation during compilation")
-		| Vcproj -> ("vcproj","GenCPP internal")
-		| Last -> assert false
-end
+let get_es_version com =
+	try int_of_string (defined_value com Define.JsEs) with _ -> 0
 
 let short_platform_name = function
 	| Cross -> "x"
@@ -646,6 +298,7 @@ let short_platform_name = function
 	| Java -> "jav"
 	| Python -> "py"
 	| Hl -> "hl"
+	| Eval -> "evl"
 
 let stats =
 	{
@@ -665,10 +318,15 @@ let default_config =
 		pf_overload = false;
 		pf_can_skip_non_nullable_argument = true;
 		pf_reserved_type_paths = [];
+		pf_supports_function_equality = true;
+		pf_uses_utf16 = true;
+		pf_this_before_super = true;
+		pf_supports_threads = false;
+		pf_supports_unicode = true;
 	}
 
 let get_config com =
-	let defined f = PMap.mem (fst (Define.infos f)) com.defines in
+	let defined f = PMap.mem (fst (Define.infos f)) com.defines.values in
 	match com.platform with
 	| Cross ->
 		default_config
@@ -679,18 +337,23 @@ let get_config com =
 			pf_sys = false;
 			pf_capture_policy = CPLoopVars;
 			pf_reserved_type_paths = [([],"Object");([],"Error")];
+			pf_this_before_super = (get_es_version com) < 6; (* cannot access `this` before `super()` when generating ES6 classes *)
 		}
 	| Lua ->
 		{
 			default_config with
 			pf_static = false;
 			pf_capture_policy = CPLoopVars;
+			pf_uses_utf16 = false;
 		}
 	| Neko ->
 		{
 			default_config with
 			pf_static = false;
 			pf_pad_nulls = true;
+			pf_uses_utf16 = false;
+			pf_supports_threads = true;
+			pf_supports_unicode = false;
 		}
 	| Flash when defined Define.As3 ->
 		{
@@ -709,23 +372,19 @@ let get_config com =
 			pf_reserved_type_paths = [([],"Object");([],"Error")];
 		}
 	| Php ->
-		if is_php7 com then
-			{
-				default_config with
-				pf_static = false;
-			}
-		else
-			{
-				default_config with
-				pf_static = false;
-				pf_pad_nulls = true;
-			}
+		{
+			default_config with
+			pf_static = false;
+			pf_uses_utf16 = false;
+		}
 	| Cpp ->
 		{
 			default_config with
 			pf_capture_policy = CPWrapRef;
 			pf_pad_nulls = true;
 			pf_add_final_return = true;
+			pf_supports_threads = true;
+			pf_supports_unicode = (defined Define.Cppia) || not (defined Define.DisableUnicodeStrings);
 		}
 	| Cs ->
 		{
@@ -733,6 +392,7 @@ let get_config com =
 			pf_capture_policy = CPWrapRef;
 			pf_pad_nulls = true;
 			pf_overload = true;
+			pf_supports_threads = true;
 		}
 	| Java ->
 		{
@@ -740,56 +400,62 @@ let get_config com =
 			pf_capture_policy = CPWrapRef;
 			pf_pad_nulls = true;
 			pf_overload = true;
+			pf_supports_threads = true;
+			pf_this_before_super = false;
 		}
 	| Python ->
 		{
 			default_config with
 			pf_static = false;
 			pf_capture_policy = CPLoopVars;
+			pf_uses_utf16 = false;
 		}
 	| Hl ->
 		{
 			default_config with
 			pf_capture_policy = CPWrapRef;
 			pf_pad_nulls = true;
-			pf_can_skip_non_nullable_argument = false;
+			pf_supports_threads = true;
+		}
+	| Eval ->
+		{
+			default_config with
+			pf_static = false;
+			pf_pad_nulls = true;
+			pf_uses_utf16 = false;
+			pf_supports_threads = true;
+			pf_capture_policy = CPWrapRef;
 		}
 
 let memory_marker = [|Unix.time()|]
 
-let create_callbacks () =
-	{
-		after_typing = [];
-		before_dce = [];
-		after_generation = [];
-	}
-
 let create version s_version args =
 	let m = Type.mk_mono() in
 	let defines =
 		PMap.add "true" "1" (
-		PMap.add "source-header" ("Generated by Haxe " ^ s_version) (
-		if !display_default <> DisplayMode.DMNone then PMap.add "display" "1" PMap.empty else PMap.empty))
+			PMap.add "source-header" ("Generated by Haxe " ^ s_version) PMap.empty
+		)
 	in
 	{
+		cache = None;
+		stage = CCreated;
 		version = version;
 		args = args;
 		shared = {
 			shared_display_information = {
 				import_positions = PMap.empty;
 				diagnostics_messages = [];
-				type_hints = Hashtbl.create 0;
-				document_symbols = [];
-				removable_code = [];
+				dead_blocks = Hashtbl.create 0;
 			}
 		};
 		display_information = {
 			unresolved_identifiers = [];
 			interface_field_implementations = [];
+			display_module_has_macro_defines = false;
 		};
 		sys_args = args;
 		debug = false;
-		display = DisplayMode.create !display_default;
+		display = DisplayTypes.DisplayMode.create !Parser.display_mode;
 		verbose = false;
 		foptimize = true;
 		features = Hashtbl.create 0;
@@ -800,32 +466,33 @@ let create version s_version args =
 		std_path = [];
 		class_path = [];
 		main_class = None;
-		defines = defines;
 		package_rules = PMap.empty;
 		file = "";
 		types = [];
-		callbacks = create_callbacks();
+		callbacks = new compiler_callbacks;
 		modules = [];
 		main = None;
 		flash_version = 10.;
 		resources = Hashtbl.create 0;
-		php_front = None;
-		php_lib = None;
-		swf_libs = [];
-		java_libs = [];
-		net_libs = [];
 		net_std = [];
+		native_libs = create_native_libs();
 		net_path_map = Hashtbl.create 0;
 		c_args = [];
 		neko_libs = [];
 		include_files = [];
-		php_prefix = None;
 		js_gen = None;
 		load_extern_type = [];
-		defines_signature = None;
+		defines = {
+			defines_signature = None;
+			values = defines;
+		};
 		get_macros = (fun() -> None);
+		info = (fun _ _ -> assert false);
 		warning = (fun _ _ -> assert false);
 		error = (fun _ _ -> assert false);
+		get_messages = (fun() -> []);
+		filter_messages = (fun _ -> ());
+		pass_debug_messages = DynArray.create();
 		basic = {
 			tvoid = m;
 			tint = m;
@@ -836,10 +503,13 @@ let create version s_version args =
 			tarray = (fun _ -> assert false);
 		};
 		file_lookup_cache = Hashtbl.create 0;
+		readdir_cache = Hashtbl.create 0;
+		module_to_file = Hashtbl.create 0;
 		stored_typed_exprs = PMap.empty;
 		cached_macros = Hashtbl.create 0;
 		memory_marker = memory_marker;
 		parser_cache = Hashtbl.create 0;
+		json_out = None;
 	}
 
 let log com str =
@@ -848,16 +518,25 @@ let log com str =
 let clone com =
 	let t = com.basic in
 	{ com with
+		cache = None;
 		basic = { t with tvoid = t.tvoid };
 		main_class = None;
 		features = Hashtbl.create 0;
 		file_lookup_cache = Hashtbl.create 0;
-		parser_cache = Hashtbl.create 0 ;
-		callbacks = create_callbacks();
+		readdir_cache = Hashtbl.create 0;
+		parser_cache = Hashtbl.create 0;
+		module_to_file = Hashtbl.create 0;
+		callbacks = new compiler_callbacks;
 		display_information = {
 			unresolved_identifiers = [];
 			interface_field_implementations = [];
+			display_module_has_macro_defines = false;
 		};
+		defines = {
+			values = com.defines.values;
+			defines_signature = com.defines.defines_signature;
+		};
+		native_libs = create_native_libs();
 	}
 
 let file_time file = Extc.filetime file
@@ -871,7 +550,7 @@ let flash_versions = List.map (fun v ->
 	let maj = int_of_float v in
 	let min = int_of_float (mod_float (v *. 10.) 10.) in
 	v, string_of_int maj ^ (if min = 0 then "" else "_" ^ string_of_int min)
-) [9.;10.;10.1;10.2;10.3;11.;11.1;11.2;11.3;11.4;11.5;11.6;11.7;11.8;11.9;12.0;13.0;14.0;15.0;16.0;17.0]
+) [9.;10.;10.1;10.2;10.3;11.;11.1;11.2;11.3;11.4;11.5;11.6;11.7;11.8;11.9;12.0;13.0;14.0;15.0;16.0;17.0;18.0;19.0;20.0;21.0;22.0;23.0;24.0;25.0;26.0;27.0;28.0;29.0;31.0;32.0]
 
 let flash_version_tag = function
 	| 6. -> 6
@@ -894,43 +573,32 @@ let flash_version_tag = function
 	| v when v >= 12.0 && float_of_int (int_of_float v) = v -> int_of_float v + 11
 	| v -> failwith ("Invalid SWF version " ^ string_of_float v)
 
-let raw_defined ctx v =
-	PMap.mem v ctx.defines
-
-let defined ctx v =
-	raw_defined ctx (fst (Define.infos v))
-
-let raw_defined_value ctx k =
-	PMap.find k ctx.defines
-
-let defined_value ctx v =
-	raw_defined_value ctx (fst (Define.infos v))
-
-let defined_value_safe ctx v =
-	try defined_value ctx v
-	with Not_found -> ""
-
-let raw_define ctx v =
-	let k,v = try ExtString.String.split v "=" with _ -> v,"1" in
-	ctx.defines <- PMap.add k v ctx.defines;
-	let k = String.concat "_" (ExtString.String.nsplit k "-") in
-	ctx.defines <- PMap.add k v ctx.defines;
-	ctx.defines_signature <- None
-
-let define_value ctx k v =
-	raw_define ctx (fst (Define.infos k) ^ "=" ^ v)
-
-let define ctx v =
-	raw_define ctx (fst (Define.infos v))
-
 let init_platform com pf =
 	com.platform <- pf;
 	let name = platform_name pf in
 	let forbid acc p = if p = name || PMap.mem p acc then acc else PMap.add p Forbidden acc in
-	com.package_rules <- List.fold_left forbid com.package_rules (List.map platform_name platforms);
+	com.package_rules <- List.fold_left forbid com.package_rules ("jvm" :: (List.map platform_name platforms));
 	com.config <- get_config com;
-(*	if com.config.pf_static then define com "static"; *)
-	if com.config.pf_sys then define com Define.Sys else com.package_rules <- PMap.add "sys" Forbidden com.package_rules;
+	if com.config.pf_static then begin
+		raw_define_value com.defines "target.static" "true";
+		define com Define.Static;
+	end;
+	if com.config.pf_sys then begin
+		raw_define_value com.defines "target.sys" "true";
+		define com Define.Sys
+	end else
+		com.package_rules <- PMap.add "sys" Forbidden com.package_rules;
+	if com.config.pf_uses_utf16 then begin
+		raw_define_value com.defines "target.utf16" "true";
+		define com Define.Utf16;
+	end;
+	if com.config.pf_supports_threads then begin
+		raw_define_value com.defines "target.threaded" "true";
+	end;
+	if com.config.pf_supports_unicode then begin
+		raw_define_value com.defines "target.unicode" "true";
+	end;
+	raw_define_value com.defines "target.name" name;
 	raw_define com name
 
 let add_feature com f =
@@ -958,22 +626,22 @@ let rec has_feature com f =
 		match List.rev (ExtString.String.nsplit f ".") with
 		| [] -> assert false
 		| [cl] -> has_feature com (cl ^ ".*")
-		| meth :: cl :: pack ->
+		| field :: cl :: pack ->
 			let r = (try
 				let path = List.rev pack, cl in
 				(match List.find (fun t -> t_path t = path && not (Meta.has Meta.RealPath (t_infos t).mt_meta)) com.types with
-				| t when meth = "*" -> (match t with TAbstractDecl a -> Meta.has Meta.ValueUsed a.a_meta | _ ->
-					Meta.has Meta.Used (t_infos t).mt_meta)
+				| t when field = "*" ->
+					not (has_dce com) ||
+					(match t with TAbstractDecl a -> Meta.has Meta.ValueUsed a.a_meta | _ -> Meta.has Meta.Used (t_infos t).mt_meta)
 				| TClassDecl ({cl_extern = true} as c) when com.platform <> Js || cl <> "Array" && cl <> "Math" ->
-					Meta.has Meta.Used (try PMap.find meth c.cl_statics with Not_found -> PMap.find meth c.cl_fields).cf_meta
+					not (has_dce com) || Meta.has Meta.Used (try PMap.find field c.cl_statics with Not_found -> PMap.find field c.cl_fields).cf_meta
 				| TClassDecl c ->
-					PMap.exists meth c.cl_statics || PMap.exists meth c.cl_fields
+					PMap.exists field c.cl_statics || PMap.exists field c.cl_fields
 				| _ ->
 					false)
 			with Not_found ->
 				false
 			) in
-			let r = r || not (has_dce com) in
 			Hashtbl.add com.features f r;
 			r
 
@@ -987,162 +655,186 @@ let abort msg p = raise (Abort (msg,p))
 
 let platform ctx p = ctx.platform = p
 
-let add_typing_filter ctx f =
-	ctx.callbacks.after_typing <- f :: ctx.callbacks.after_typing
+let platform_name_macro com =
+	if defined com Define.Macro then "macro" else platform_name com.platform
 
-let add_filter ctx f =
-	ctx.callbacks.before_dce <- f :: ctx.callbacks.before_dce
-
-let add_final_filter ctx f =
-	ctx.callbacks.after_generation <- f :: ctx.callbacks.after_generation
+let normalize_dir_separator path =
+	if is_windows then String.map (fun c -> if c = '/' then '\\' else c) path
+	else path
 
 let find_file ctx f =
 	try
-		(match Hashtbl.find ctx.file_lookup_cache f with
+		match Hashtbl.find ctx.file_lookup_cache f with
 		| None -> raise Exit
-		| Some f -> f)
+		| Some f -> f
 	with Exit ->
 		raise Not_found
 	| Not_found ->
+		let remove_extension file =
+			try String.sub file 0 (String.rindex file '.')
+			with Not_found -> file
+		in
+		let extension file =
+			try
+				let dot_pos = String.rindex file '.' in
+				String.sub file dot_pos (String.length file - dot_pos)
+			with Not_found -> file
+		in
+		let f_dir = Filename.dirname f
+		and platform_ext = "." ^ (platform_name_macro ctx)
+		and is_core_api = defined ctx Define.CoreApi in
 		let rec loop had_empty = function
 			| [] when had_empty -> raise Not_found
 			| [] -> loop true [""]
 			| p :: l ->
 				let file = p ^ f in
-				if Sys.file_exists file then begin
-					(try
-						let ext = String.rindex file '.' in
-						let file_pf = String.sub file 0 (ext + 1) ^ platform_name ctx.platform ^ String.sub file ext (String.length file - ext) in
-						if not (defined ctx Define.CoreApi) && Sys.file_exists file_pf then file_pf else file
-					with Not_found ->
-						file)
-				end else
+				let dir = Filename.dirname file in
+				if Hashtbl.mem ctx.readdir_cache (p,dir) then
 					loop (had_empty || p = "") l
+				else begin
+					let found = ref "" in
+					let dir_listing =
+						try Some (Sys.readdir dir);
+						with Sys_error _ -> None
+					in
+					Hashtbl.add ctx.readdir_cache (p,dir) dir_listing;
+					let normalized_f = normalize_dir_separator f in
+					Option.may
+						(Array.iter (fun file_name ->
+							let current_f = if f_dir = "." then file_name else f_dir ^ "/" ^ file_name in
+							let pf,current_f =
+								if is_core_api then false,current_f
+								else begin
+									let ext = extension current_f in
+									let pf_ext = extension (remove_extension current_f) in
+									if platform_ext = pf_ext then
+										true,(remove_extension (remove_extension current_f)) ^ ext
+									else
+										false,current_f
+								end
+							in
+							let is_cached = Hashtbl.mem ctx.file_lookup_cache current_f in
+							if is_core_api || pf || not is_cached then begin
+								let full_path = if dir = "." then file_name else dir ^ "/" ^ file_name in
+								if is_cached then
+									Hashtbl.remove ctx.file_lookup_cache current_f;
+								Hashtbl.add ctx.file_lookup_cache current_f (Some full_path);
+								if normalize_dir_separator current_f = normalized_f then
+									found := full_path;
+							end
+						))
+						dir_listing;
+					if !found <> "" then !found
+					else loop (had_empty || p = "") l
+				end
 		in
 		let r = (try Some (loop false ctx.class_path) with Not_found -> None) in
 		Hashtbl.add ctx.file_lookup_cache f r;
-		(match r with
+		match r with
 		| None -> raise Not_found
-		| Some f -> f)
-
-let rec mkdir_recursive base dir_list =
-	match dir_list with
-	| [] -> ()
-	| dir :: remaining ->
-		let path = match base with
-				   | "" ->  dir
-				   | "/" -> "/" ^ dir
-				   | _ -> base ^ "/" ^ dir
-		in
-		let path_len = String.length path in
-		let path =
-			if path_len > 0 && (path.[path_len - 1] = '/' || path.[path_len - 1] == '\\') then
-				String.sub path 0 (path_len - 1)
-			else
-				path
-		in
-		if not ( (path = "") || ( (path_len = 2) && ((String.sub path 1 1) = ":") ) ) then
-			if not (Sys.file_exists path) then
-				Unix.mkdir path 0o755;
-		mkdir_recursive (if (path = "") then "/" else path) remaining
-
-let mkdir_from_path path =
-	let parts = Str.split_delim (Str.regexp "[\\/]+") path in
-	match parts with
-		| [] -> (* path was "" *) ()
-		| _ ->
-			let dir_list = List.rev (List.tl (List.rev parts)) in
-			mkdir_recursive "" dir_list
+		| Some f -> f
+
+(* let find_file ctx f =
+	let timer = Timer.timer ["find_file"] in
+	Std.finally timer (find_file ctx) f *)
 
 let mem_size v =
 	Objsize.size_with_headers (Objsize.objsize v [] [])
 
-(* ------------------------- TIMERS ----------------------------- *)
-
-type timer_infos = {
-	id : string list;
-	mutable start : float list;
-	mutable total : float;
-	mutable calls : int;
-}
-
-let get_time = Extc.time
-let htimers = Hashtbl.create 0
-
-let new_timer id =
-	let key = String.concat "." id in
-	try
-		let t = Hashtbl.find htimers key in
-		t.start <- get_time() :: t.start;
-		t.calls <- t.calls + 1;
-		t
-	with Not_found ->
-		let t = { id = id; start = [get_time()]; total = 0.; calls = 1; } in
-		Hashtbl.add htimers key t;
-		t
-
-let curtime = ref []
-
-let close t =
-	let start = (match t.start with
-		| [] -> assert false
-		| s :: l -> t.start <- l; s
-	) in
-	let now = get_time() in
-	let dt = now -. start in
-	t.total <- t.total +. dt;
-	let rec loop() =
-		match !curtime with
-		| [] -> failwith ("Timer " ^ (String.concat "." t.id) ^ " closed while not active")
-		| tt :: l -> curtime := l; if t != tt then loop()
+let hash f =
+	let h = ref 0 in
+	for i = 0 to String.length f - 1 do
+		h := !h * 223 + int_of_char (String.unsafe_get f i);
+	done;
+	if Sys.word_size = 64 then Int32.to_int (Int32.shift_right (Int32.shift_left (Int32.of_int !h) 1) 1) else !h
+
+let url_encode s add_char =
+	let hex = "0123456789ABCDEF" in
+	for i = 0 to String.length s - 1 do
+		let c = String.unsafe_get s i in
+		match c with
+		| 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '-' | '.' ->
+			add_char c
+		| _ ->
+			add_char '%';
+			add_char (String.unsafe_get hex (int_of_char c lsr 4));
+			add_char (String.unsafe_get hex (int_of_char c land 0xF));
+	done
+
+let url_encode_s s =
+	let b = Buffer.create 0 in
+	url_encode s (Buffer.add_char b);
+	Buffer.contents b
+
+(* UTF8 *)
+
+let to_utf8 str p =
+	let u8 = try
+		UTF8.validate str;
+		str;
+	with
+		UTF8.Malformed_code ->
+			(* ISO to utf8 *)
+			let b = UTF8.Buf.create 0 in
+			String.iter (fun c -> UTF8.Buf.add_char b (UCharExt.of_char c)) str;
+			UTF8.Buf.contents b
 	in
-	loop();
-	(* because of rounding errors while adding small times, we need to make sure that we don't have start > now *)
-	List.iter (fun ct -> ct.start <- List.map (fun t -> let s = t +. dt in if s > now then now else s) ct.start) !curtime
-
-let timer id =
-	let t = new_timer id in
-	curtime := t :: !curtime;
-	(function() -> close t)
-
-let rec close_times() =
-	match !curtime with
-	| [] -> ()
-	| t :: _ -> close t; close_times()
-
-;;
-
-(*  Taken from OCaml source typing/oprint.ml
-
-	This is a better version of string_of_float which prints without loss of precision
-	so that float_of_string (float_repres x) = x for all floats x
-*)
-let valid_float_lexeme s =
-	let l = String.length s in
+	let ccount = ref 0 in
+	UTF8.iter (fun c ->
+		let c = UCharExt.code c in
+		if (c >= 0xD800 && c <= 0xDFFF) || c >= 0x110000 then abort "Invalid unicode char" p;
+		incr ccount;
+		if c > 0x10000 then incr ccount;
+	) u8;
+	u8, !ccount
+
+let utf16_add buf c =
+	let add c =
+		Buffer.add_char buf (char_of_int (c land 0xFF));
+		Buffer.add_char buf (char_of_int (c lsr 8));
+	in
+	if c >= 0 && c < 0x10000 then begin
+		if c >= 0xD800 && c <= 0xDFFF then failwith ("Invalid unicode char " ^ string_of_int c);
+		add c;
+	end else if c < 0x110000 then begin
+		let c = c - 0x10000 in
+		add ((c asr 10) + 0xD800);
+		add ((c land 1023) + 0xDC00);
+	end else
+		failwith ("Invalid unicode char " ^ string_of_int c)
+
+let utf8_to_utf16 str zt =
+	let b = Buffer.create (String.length str * 2) in
+	(try UTF8.iter (fun c -> utf16_add b (UCharExt.code c)) str with Invalid_argument _ | UCharExt.Out_of_range -> ()); (* if malformed *)
+	if zt then utf16_add b 0;
+	Buffer.contents b
+
+let utf16_to_utf8 str =
+	let b = Buffer.create 0 in
+	let add c = Buffer.add_char b (char_of_int (c land 0xFF)) in
+	let get i = int_of_char (String.unsafe_get str i) in
 	let rec loop i =
-		if i >= l then s ^ "." else
-		match s.[i] with
-		| '0' .. '9' | '-' -> loop (i+1)
-		| _ -> s
-	in loop 0
-
-let float_repres f =
-	match classify_float f with
-	| FP_nan -> "nan"
-	| FP_infinite ->
-		if f < 0.0 then "neg_infinity" else "infinity"
-	| _ ->
-		let float_val =
-			let s1 = Printf.sprintf "%.12g" f in
-			if f = float_of_string s1 then s1 else
-			let s2 = Printf.sprintf "%.15g" f in
-			if f = float_of_string s2 then s2 else
-			Printf.sprintf "%.18g" f
-		in valid_float_lexeme float_val
-
-let add_diagnostics_message com s p sev =
+		if i >= String.length str then ()
+		else begin
+			let c = get i in
+			if c < 0x80 then begin
+				add c;
+				loop (i + 2);
+			end else if c < 0x800 then begin
+				let c = c lor ((get (i + 1)) lsl 8) in
+				add c;
+				add (c lsr 8);
+				loop (i + 2);
+			end else
+				assert false;
+		end
+	in
+	loop 0;
+	Buffer.contents b
+
+let add_diagnostics_message com s p kind sev =
 	let di = com.shared.shared_display_information in
-	di.diagnostics_messages <- (s,p,sev) :: di.diagnostics_messages
+	di.diagnostics_messages <- (s,p,kind,sev) :: di.diagnostics_messages
 
 open Printer
 
@@ -1153,6 +845,23 @@ let dump_context com = s_record_fields "" [
 	"platform",platform_name com.platform;
 	"std_path",s_list ", " (fun s -> s) com.std_path;
 	"class_path",s_list ", " (fun s -> s) com.class_path;
-	"defines",s_pmap (fun s -> s) (fun s -> s) com.defines;
-	"defines_signature",s_opt (fun s -> Digest.to_hex s) com.defines_signature;
+	"defines",s_pmap (fun s -> s) (fun s -> s) com.defines.values;
+	"defines_signature",s_opt (fun s -> Digest.to_hex s) com.defines.defines_signature;
 ]
+
+let dump_path com =
+	Define.defined_value_safe ~default:"dump" com.defines Define.DumpPath
+
+let adapt_defines_to_macro_context defines =
+	let values = ref defines.values in
+	List.iter (fun p -> values := PMap.remove (Globals.platform_name p) !values) Globals.platforms;
+	let to_remove = List.map (fun d -> fst (Define.infos d)) [Define.NoTraces] in
+	let to_remove = to_remove @ List.map (fun (_,d) -> "flash" ^ d) flash_versions in
+	values := PMap.foldi (fun k v acc -> if List.mem k to_remove then acc else PMap.add k v acc) !values PMap.empty;
+	values := PMap.add "macro" "1" !values;
+	values := PMap.add (platform_name !Globals.macro_platform) "1" !values;
+	{values = !values; defines_signature = None }
+
+let is_legacy_completion com = match com.json_out with
+	| None -> true
+	| Some api -> !ServerConfig.legacy_completion
\ No newline at end of file
diff --git a/src/context/commonCache.ml b/src/context/commonCache.ml
new file mode 100644
index 0000000000000000000000000000000000000000..4ceb5583ed23a1040d0c018caefafe458fd164a2
--- /dev/null
+++ b/src/context/commonCache.ml
@@ -0,0 +1,84 @@
+open Globals
+open Common
+open CompilationServer
+open Type
+
+let handle_native_lib com lib =
+	com.native_libs.all_libs <- lib#get_file_path :: com.native_libs.all_libs;
+	com.load_extern_type <- com.load_extern_type @ [lib#get_file_path,lib#build];
+	match get() with
+	| Some cs when not (Define.raw_defined com.defines "haxe.noNativeLibsCache") ->
+		let init () =
+			let file = lib#get_file_path in
+			let key = file in
+			let ftime = file_time file in
+			begin match cs#get_native_lib key with
+			| Some lib when ftime <= lib.c_nl_mtime ->
+				(* Cached lib is good, set up lookup into cached files. *)
+				lib.c_nl_files;
+			| _ ->
+				(* Cached lib is outdated or doesn't exist yet, read library. *)
+				lib#load;
+				(* Created lookup and eagerly read each known type. *)
+				let h = Hashtbl.create 0 in
+				List.iter (fun path ->
+					if not (Hashtbl.mem h path) then begin
+						let p = { pfile = file ^ " @ " ^ Globals.s_type_path path; pmin = 0; pmax = 0; } in
+						try begin match lib#build path p with
+						| Some r -> Hashtbl.add h path r
+						| None -> ()
+						end with _ ->
+							()
+					end
+				) lib#list_modules;
+				(* Save and set up lookup. *)
+				cs#add_native_lib key h ftime;
+				h;
+			end;
+		in
+		(fun () ->
+			let lut = init() in
+			let build path p =
+				try Some (Hashtbl.find lut path)
+				with Not_found -> None
+			in
+			com.load_extern_type <- List.map (fun (name,f) ->
+				name,if name = lib#get_file_path then build else f
+			) com.load_extern_type
+		)
+	| _ ->
+		(* Offline mode, just read library as usual. *)
+		(fun () -> lib#load)
+
+(* context *)
+
+let get_cache cs com = match com.Common.cache with
+	| None ->
+		let sign = Define.get_signature com.defines in
+		cs#get_context sign
+	| Some cache ->
+		cache
+
+let rec cache_context cs com =
+	let cc = get_cache cs com in
+	let sign = Define.get_signature com.defines in
+	let cache_module m =
+		(* If we have a signature mismatch, look-up cache for module. Physical equality check is fine as a heueristic. *)
+		let cc = if m.m_extra.m_sign == sign then cc else cs#get_context m.m_extra.m_sign in
+		cc#cache_module m.m_path m;
+	in
+	List.iter cache_module com.modules;
+	match com.get_macros() with
+	| None -> ()
+	| Some com -> cache_context cs com
+
+let maybe_add_context_sign cs com desc =
+	let sign = Define.get_signature com.defines in
+	ignore(cs#add_info sign desc com.platform com.class_path com.defines)
+
+let lock_signature com name = match CompilationServer.get() with
+	| Some cs ->
+		maybe_add_context_sign cs com name;
+		com.cache <- Some (get_cache cs com)
+	| None ->
+		()
\ No newline at end of file
diff --git a/src/context/compilationServer.ml b/src/context/compilationServer.ml
new file mode 100644
index 0000000000000000000000000000000000000000..434121aeac23f36381f15252423a748d2152d3bd
--- /dev/null
+++ b/src/context/compilationServer.ml
@@ -0,0 +1,230 @@
+open Globals
+open Ast
+open Json
+open Type
+open Define
+
+type cached_file = {
+	c_time : float;
+	c_package : string list;
+	c_decls : type_decl list;
+	mutable c_module_name : string option;
+}
+
+type cached_directory = {
+	c_path : string;
+	mutable c_mtime : float;
+}
+
+type cached_native_lib = {
+	c_nl_mtime : float;
+	c_nl_files : (path,Ast.package) Hashtbl.t;
+}
+
+class context_cache (index : int) = object(self)
+	val files : (string,cached_file) Hashtbl.t = Hashtbl.create 0
+	val modules : (path,module_def) Hashtbl.t = Hashtbl.create 0
+	val removed_files = Hashtbl.create 0
+	val mutable json = JNull
+	val mutable initialized = false
+
+	(* files *)
+
+	method find_file key =
+		Hashtbl.find files key
+
+	method cache_file key time data =
+		Hashtbl.replace files key { c_time = time; c_package = fst data; c_decls = snd data; c_module_name = None }
+
+	method remove_file key =
+		if Hashtbl.mem files key then begin
+			Hashtbl.remove files key;
+			Hashtbl.replace removed_files key ()
+		end
+
+	(* Like remove_file, but doesn't keep track of the file *)
+	method remove_file_for_real key =
+		Hashtbl.remove files key
+
+	(* modules *)
+
+	method find_module path =
+		Hashtbl.find modules path
+
+	method cache_module path value =
+		Hashtbl.replace modules path value
+
+	(* initialization *)
+
+	method is_initialized = initialized
+	method set_initialized value = initialized <- value
+
+	method get_index = index
+	method get_files = files
+	method get_modules = modules
+	method get_removed_files = removed_files
+
+	method get_json = json
+	method set_json j = json <- j
+
+(* Pointers for memory inspection. *)
+	method get_pointers : unit array =
+		[|Obj.magic files;Obj.magic modules|]
+end
+
+let create_directory path mtime = {
+	c_path = path;
+	c_mtime = mtime;
+}
+
+class cache = object(self)
+	val contexts : (string,context_cache) Hashtbl.t = Hashtbl.create 0
+	val mutable context_list = []
+	val haxelib : (string list, string list) Hashtbl.t = Hashtbl.create 0
+	val directories : (string, cached_directory list) Hashtbl.t = Hashtbl.create 0
+	val native_libs : (string,cached_native_lib) Hashtbl.t = Hashtbl.create 0
+
+	(* contexts *)
+
+	method get_context sign =
+		try
+			Hashtbl.find contexts sign
+		with Not_found ->
+			let cache = new context_cache (Hashtbl.length contexts) in
+			context_list <- cache :: context_list;
+			Hashtbl.add contexts sign cache;
+			cache
+
+	method add_info sign desc platform class_path defines =
+		let cc = self#get_context sign in
+		let jo = JObject [
+			"index",JInt cc#get_index;
+			"desc",JString desc;
+			"platform",JString (platform_name platform);
+			"classPaths",JArray (List.map (fun s -> JString s) class_path);
+			"signature",JString (Digest.to_hex sign);
+			"defines",JArray (PMap.foldi (fun k v acc -> JObject [
+				"key",JString k;
+				"value",JString v;
+			] :: acc) defines.values []);
+		] in
+		cc#set_json jo;
+		cc#get_index
+
+	method get_contexts = context_list
+
+	(* files *)
+
+	method remove_files file =
+		Hashtbl.iter (fun _ cc-> cc#remove_file file) contexts
+
+	method get_context_files signs =
+		Hashtbl.fold (fun sign cc acc ->
+			if List.mem sign signs then Hashtbl.fold (fun file cfile acc -> (file,cfile) :: acc) cc#get_files acc
+			else acc
+		) contexts []
+
+	method get_files =
+		Hashtbl.fold (fun sign cc acc ->
+			Hashtbl.fold (fun file cfile acc -> (sign,file,cfile) :: acc) cc#get_files acc
+		) contexts []
+
+	(* modules *)
+
+	method get_modules =
+		Hashtbl.fold (fun _ cc acc ->
+			Hashtbl.fold (fun _ m acc ->
+				m :: acc
+			) cc#get_modules acc
+		) contexts []
+
+	method taint_modules file =
+		Hashtbl.iter (fun _ cc ->
+			Hashtbl.iter (fun _ m ->
+				if m.m_extra.m_file = file then m.m_extra.m_dirty <- Some m.m_path
+			) cc#get_modules
+		) contexts
+
+	(* haxelibs *)
+
+	method find_haxelib key =
+		Hashtbl.find haxelib key
+
+	method cache_haxelib key value =
+		Hashtbl.replace haxelib key value
+
+	(* directories *)
+
+	method find_directories key =
+		Hashtbl.find directories key
+
+	method add_directories key value =
+		Hashtbl.replace directories key value
+
+	method remove_directory key value =
+		try
+			let current = self#find_directories key in
+			Hashtbl.replace directories key (List.filter (fun dir -> dir.c_path <> value) current);
+		with Not_found ->
+			()
+
+	method has_directory key value =
+		try
+			List.exists (fun dir -> dir.c_path = value) (self#find_directories key)
+		with Not_found ->
+			false
+
+	method add_directory key value =
+		try
+			let current = self#find_directories key in
+			self#add_directories key (value :: current)
+		with Not_found ->
+			self#add_directories key [value]
+
+	method clear_directories key =
+		Hashtbl.remove directories key
+
+	(* native lib *)
+
+	method add_native_lib key files timestamp =
+		Hashtbl.replace native_libs key { c_nl_files = files; c_nl_mtime = timestamp }
+
+	method get_native_lib key =
+		try Some (Hashtbl.find native_libs key)
+		with Not_found -> None
+
+	(* Pointers for memory inspection. *)
+	method get_pointers : unit array =
+		[|Obj.magic contexts;Obj.magic haxelib;Obj.magic directories;Obj.magic native_libs|]
+
+end
+
+type t = cache
+
+type context_options =
+	| NormalContext
+	| MacroContext
+	| NormalAndMacroContext
+
+let instance : t option ref = ref None
+
+let create () =
+	let cs = new cache in
+	instance := Some cs;
+	cs
+
+let get () =
+	!instance
+
+let runs () =
+	!instance <> None
+
+let force () = match !instance with None -> assert false | Some i -> i
+
+let get_module_name_of_cfile file cfile = match cfile.c_module_name with
+	| None ->
+		let name = Path.module_name_of_file file in
+		cfile.c_module_name <- Some name;
+		name
+	| Some name ->
+		name
\ No newline at end of file
diff --git a/src/context/display/deprecationCheck.ml b/src/context/display/deprecationCheck.ml
new file mode 100644
index 0000000000000000000000000000000000000000..8478d7347785bdc27cffbb1bafdc8891f5022aa1
--- /dev/null
+++ b/src/context/display/deprecationCheck.ml
@@ -0,0 +1,96 @@
+open Globals
+open Type
+open Common
+open Ast
+
+let curclass = ref null_class
+
+let warned_positions = Hashtbl.create 0
+
+let warn_deprecation com s p_usage =
+	if not (Hashtbl.mem warned_positions p_usage) then begin
+		Hashtbl.replace warned_positions p_usage s;
+		match com.display.dms_kind with
+		| DMDiagnostics _ -> ()
+		| _ -> com.warning s p_usage;
+	end
+
+let print_deprecation_message com meta s p_usage =
+	let s = match meta with
+		| _,[EConst(String(s,_)),_],_ -> s
+		| _ -> Printf.sprintf "Usage of this %s is deprecated" s
+	in
+	warn_deprecation com s p_usage
+
+let check_meta com meta s p_usage =
+	try
+		print_deprecation_message com (Meta.get Meta.Deprecated meta) s p_usage;
+	with Not_found ->
+		()
+
+let check_cf com cf p = check_meta com cf.cf_meta "field" p
+
+let check_class com c p = if c != !curclass then check_meta com c.cl_meta "class" p
+
+let check_enum com en p = check_meta com en.e_meta "enum" p
+
+let check_ef com ef p = check_meta com ef.ef_meta "enum field" p
+
+let check_typedef com t p = check_meta com t.t_meta "typedef" p
+
+let check_module_type com mt p = match mt with
+	| TClassDecl c -> check_class com c p
+	| TEnumDecl en -> check_enum com en p
+	| _ -> ()
+
+let run_on_expr com e =
+	let rec expr e = match e.eexpr with
+		| TField(e1,fa) ->
+			expr e1;
+			begin match fa with
+				| FStatic(c,cf) | FInstance(c,_,cf) ->
+					check_class com c e.epos;
+					check_cf com cf e.epos
+				| FAnon cf ->
+					check_cf com cf e.epos
+				| FClosure(co,cf) ->
+					(match co with None -> () | Some (c,_) -> check_class com c e.epos);
+					check_cf com cf e.epos
+				| FEnum(en,ef) ->
+					check_enum com en e.epos;
+					check_ef com ef e.epos;
+				| _ ->
+					()
+			end
+		| TNew(c,_,el) ->
+			List.iter expr el;
+			check_class com c e.epos;
+			begin match c.cl_constructor with
+				(* The AST doesn't carry the correct overload for TNew, so let's ignore this case... (#8557). *)
+				| Some cf when cf.cf_overloads = [] -> check_cf com cf e.epos
+				| _ -> ()
+			end
+		| TTypeExpr(mt) | TCast(_,Some mt) ->
+			check_module_type com mt e.epos
+		| TMeta((Meta.Deprecated,_,_) as meta,e1) ->
+			print_deprecation_message com meta "field" e1.epos;
+			expr e1;
+		| _ ->
+			Type.iter expr e
+	in
+	expr e
+
+let run_on_field com cf = match cf.cf_expr with None -> () | Some e -> run_on_expr com e
+
+let run com =
+	List.iter (fun t -> match t with
+		| TClassDecl c ->
+			curclass := c;
+			(match c.cl_constructor with None -> () | Some cf -> run_on_field com cf);
+			(match c.cl_init with None -> () | Some e -> run_on_expr com e);
+			List.iter (run_on_field com) c.cl_ordered_statics;
+			List.iter (run_on_field com) c.cl_ordered_fields;
+			curclass := null_class;
+		| _ ->
+			()
+	) com.types
\ No newline at end of file
diff --git a/src/context/display/diagnostics.ml b/src/context/display/diagnostics.ml
new file mode 100644
index 0000000000000000000000000000000000000000..d59309a0fda976e3439fe40a3f2b621e4d9d26c6
--- /dev/null
+++ b/src/context/display/diagnostics.ml
@@ -0,0 +1,229 @@
+open Globals
+open Ast
+open Type
+open Typecore
+open Common
+open Display
+open DisplayTypes.DisplayMode
+
+type diagnostics_context = {
+	com : Common.context;
+	mutable removable_code : (string * pos * pos) list;
+}
+
+open DisplayTypes
+
+let add_removable_code ctx s p prange =
+	ctx.removable_code <- (s,p,prange) :: ctx.removable_code
+
+let find_unused_variables com e =
+	let vars = Hashtbl.create 0 in
+	let pmin_map = Hashtbl.create 0 in
+	let rec loop e = match e.eexpr with
+		| TVar({v_kind = VUser _} as v,eo) when v.v_name <> "_" ->
+			Hashtbl.add pmin_map e.epos.pmin v;
+			let p = match eo with
+				| None -> e.epos
+				| Some e1 ->
+					loop e1;
+					{ e.epos with pmax = e1.epos.pmin }
+			in
+			Hashtbl.replace vars v.v_id (v,p);
+		| TLocal ({v_kind = VUser _} as v) ->
+			Hashtbl.remove vars v.v_id;
+		| _ ->
+			Type.iter loop e
+	in
+	loop e;
+	Hashtbl.iter (fun _ (v,p) ->
+		let p = match (Hashtbl.find_all pmin_map p.pmin) with [_] -> p | _ -> null_pos in
+		add_removable_code com "Unused variable" v.v_pos p
+	) vars
+
+let check_other_things com e =
+	let had_effect = ref false in
+	let no_effect p =
+		add_diagnostics_message com "This code has no effect" p DKCompilerError DiagnosticsSeverity.Warning;
+	in
+	let pointless_compound s p =
+		add_diagnostics_message com (Printf.sprintf "This %s has no effect, but some of its sub-expressions do" s) p DKCompilerError DiagnosticsSeverity.Warning;
+	in
+	let rec compound s el p =
+		let old = !had_effect in
+		had_effect := false;
+		List.iter (loop true) el;
+		if not !had_effect then no_effect p else pointless_compound s p;
+		had_effect := old;
+	and loop in_value e = match e.eexpr with
+		| TBlock el ->
+			let rec loop2 el = match el with
+				| [] -> ()
+				| [e] -> loop in_value e
+				| e :: el -> loop false e; loop2 el
+			in
+			loop2 el
+		| TMeta((Meta.Extern,_,_),_) ->
+			(* This is so something like `[inlineFunc()]` is not reported. *)
+			had_effect := true;
+		| TConst _ | TLocal {v_kind = VUser _} | TTypeExpr _ | TFunction _ | TIdent _ when not in_value ->
+			no_effect e.epos;
+		| TConst _ | TLocal _ | TTypeExpr _ | TEnumParameter _ | TEnumIndex _ | TVar _ | TIdent _ ->
+			()
+		| TField (_, fa) when PurityState.is_explicitly_impure fa -> ()
+		| TFunction tf ->
+			loop false tf.tf_expr
+		| TCall({eexpr = TField(e1,fa)},el) when not in_value && PurityState.is_pure_field_access fa -> compound "call" el e.epos
+		| TNew _ | TCall _ | TBinop ((Ast.OpAssignOp _ | Ast.OpAssign),_,_) | TUnop ((Ast.Increment | Ast.Decrement),_,_)
+		| TReturn _ | TBreak | TContinue | TThrow _ | TCast (_,Some _)
+		| TIf _ | TTry _ | TSwitch _ | TWhile _ | TFor _ ->
+			had_effect := true;
+			Type.iter (loop true) e
+		| TParenthesis e1 | TMeta(_,e1) ->
+			loop in_value e1
+		| TArray _ | TCast (_,None) | TBinop _ | TUnop _
+		| TField _ | TArrayDecl _ | TObjectDecl _ when in_value ->
+			Type.iter (loop true) e;
+		| TArray(e1,e2) -> compound "array access" [e1;e2] e.epos
+		| TCast(e1,None) -> compound "cast" [e1] e.epos
+		| TBinop(op,e1,e2) -> compound (Printf.sprintf "'%s' operator" (s_binop op)) [e1;e2] e.epos
+		| TUnop(op,_,e1) -> compound (Printf.sprintf "'%s' operator" (s_unop op)) [e1] e.epos
+		| TField(e1,_) -> compound "field access" [e1] e.epos
+		| TArrayDecl el -> compound "array declaration" el e.epos
+		| TObjectDecl fl -> compound "object declaration" (List.map snd fl) e.epos
+	in
+	loop true e
+
+let prepare_field dctx cf = match cf.cf_expr with
+	| None -> ()
+	| Some e ->
+		find_unused_variables dctx e;
+		check_other_things dctx.com e;
+		DeprecationCheck.run_on_expr dctx.com e
+
+let prepare com global =
+	let dctx = {
+		removable_code = [];
+		com = com;
+	} in
+	List.iter (function
+		| TClassDecl c when global || DisplayPosition.display_position#is_in_file c.cl_pos.pfile ->
+			List.iter (prepare_field dctx) c.cl_ordered_fields;
+			List.iter (prepare_field dctx) c.cl_ordered_statics;
+			(match c.cl_constructor with None -> () | Some cf -> prepare_field dctx cf);
+		| _ ->
+			()
+	) com.types;
+	dctx
+
+let is_diagnostics_run p = match (!Parser.display_mode) with
+	| DMDiagnostics true -> true
+	| DMDiagnostics false -> DisplayPosition.display_position#is_in_file p.pfile
+	| _ -> false
+
+let secure_generated_code ctx e =
+	if is_diagnostics_run e.epos then mk (TMeta((Meta.Extern,[],e.epos),e)) e.etype e.epos else e
+
+module Printer = struct
+	open Json
+	open DiagnosticsKind
+	open DisplayTypes
+
+	type t = DiagnosticsKind.t * pos
+
+	module UnresolvedIdentifierSuggestion = struct
+		type t =
+			| UISImport
+			| UISTypo
+
+		let to_int = function
+			| UISImport -> 0
+			| UISTypo -> 1
+	end
+
+	open UnresolvedIdentifierSuggestion
+	open CompletionItem
+	open CompletionModuleType
+
+	let print_diagnostics dctx com global =
+		let diag = Hashtbl.create 0 in
+		let add dk p sev args =
+			let file = if p = null_pos then p.pfile else Path.get_real_path p.pfile in
+			let diag = try
+				Hashtbl.find diag file
+			with Not_found ->
+				let d = Hashtbl.create 0 in
+				Hashtbl.add diag file d;
+				d
+			in
+			if not (Hashtbl.mem diag p) then
+				Hashtbl.add diag p (dk,p,sev,args)
+		in
+		let add dk p sev args =
+			if global || p = null_pos || DisplayPosition.display_position#is_in_file p.pfile then add dk p sev args
+		in
+		List.iter (fun (s,p,suggestions) ->
+			let suggestions = ExtList.List.filter_map (fun (s,item,r) ->
+				match item.ci_kind with
+				| ITType(t,_) when r = 0 ->
+					let path = if t.module_name = t.name then (t.pack,t.name) else (t.pack @ [t.module_name],t.name) in
+					Some (JObject [
+						"kind",JInt (to_int UISImport);
+						"name",JString (s_type_path path);
+					])
+				| _ when r = 0 ->
+					(* TODO !!! *)
+					None
+				| _ ->
+					Some (JObject [
+						"kind",JInt (to_int UISTypo);
+						"name",JString s;
+					])
+			) suggestions in
+			add DKUnresolvedIdentifier p DiagnosticsSeverity.Error (JArray suggestions);
+		) com.display_information.unresolved_identifiers;
+		PMap.iter (fun p (r,_) ->
+			if not !r then add DKUnusedImport p DiagnosticsSeverity.Warning (JArray [])
+		) com.shared.shared_display_information.import_positions;
+		List.iter (fun (s,p,kind,sev) ->
+			add kind p sev (JString s)
+		) (List.rev com.shared.shared_display_information.diagnostics_messages);
+		List.iter (fun (s,p,prange) ->
+			add DKRemovableCode p DiagnosticsSeverity.Warning (JObject ["description",JString s;"range",if prange = null_pos then JNull else Genjson.generate_pos_as_range prange])
+		) dctx.removable_code;
+		Hashtbl.iter (fun p s ->
+			add DKDeprecationWarning p DiagnosticsSeverity.Warning (JString s);
+		) DeprecationCheck.warned_positions;
+		Hashtbl.iter (fun file ranges ->
+			List.iter (fun (p,e) ->
+				let jo = JObject [
+					"expr",JObject [
+						"string",JString (Ast.Printer.s_expr e)
+					]
+				] in
+				add DKInactiveBlock p DiagnosticsSeverity.Hint jo
+			) ranges
+		) com.shared.shared_display_information.dead_blocks;
+		let jl = Hashtbl.fold (fun file diag acc ->
+			let jl = Hashtbl.fold (fun _ (dk,p,sev,jargs) acc ->
+				(JObject [
+					"kind",JInt (DiagnosticsKind.to_int dk);
+					"severity",JInt (DiagnosticsSeverity.to_int sev);
+					"range",Genjson.generate_pos_as_range p;
+					"args",jargs
+				]) :: acc
+			) diag [] in
+			(JObject [
+				"file",if file = "?" then JNull else JString file;
+				"diagnostics",JArray jl
+			]) :: acc
+		) diag [] in
+		let js = JArray jl in
+		string_of_json js
+end
+
+let print com global =
+	let dctx = prepare com global in
+	Printer.print_diagnostics dctx com global
+
+let run com global =
+	DisplayException.raise_diagnostics (print com global)
\ No newline at end of file
diff --git a/src/context/display/display.ml b/src/context/display/display.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b5aa796ddc67aa994d25701e77465c1838cc42d3
--- /dev/null
+++ b/src/context/display/display.ml
@@ -0,0 +1,321 @@
+open Ast
+open Common
+open DisplayTypes
+open DisplayMode
+open DisplayPosition
+open CompletionItem
+open CompletionResultKind
+open Type
+open Typecore
+open Globals
+open Genjson
+open DisplayPosition
+open ImportStatus
+
+let merge_core_doc ctx mtype =
+	display_position#run_outside (fun () -> Typecore.merge_core_doc ctx mtype)
+
+let parse_module' com m p =
+	display_position#run_outside (fun () -> TypeloadParse.parse_module' com m p)
+
+let parse_module ctx m p =
+	display_position#run_outside (fun () -> TypeloadParse.parse_module ctx m p)
+
+module ReferencePosition = struct
+	let reference_position = ref ("",null_pos,KVar)
+	let set (s,p,k) = reference_position := (s,{p with pfile = Path.unique_full_path p.pfile},k)
+	let get () = !reference_position
+end
+
+module ExprPreprocessing = struct
+	let find_before_pos dm e =
+		let display_pos = ref (DisplayPosition.display_position#get) in
+		let was_annotated = ref false in
+		let is_annotated,is_completion = match dm with
+			| DMDefault -> (fun p -> not !was_annotated && encloses_position !display_pos p),true
+			| DMHover -> (fun p -> not !was_annotated && encloses_position_gt !display_pos p),false
+			| _ -> (fun p -> not !was_annotated && encloses_position !display_pos p),false
+		in
+		let annotate e dk =
+			was_annotated := true;
+			(EDisplay(e,dk),pos e)
+		in
+		let annotate_marked e = annotate e DKMarked in
+		let mk_null p = annotate_marked ((EConst(Ident "null")),p) in
+		let loop_el el =
+			let pr = DisplayPosition.display_position#with_pos (pos e) in
+			let rec loop el = match el with
+				| [] -> [mk_null pr]
+				| e :: el ->
+					if (pos e).pmin >= pr.pmax then (mk_null pr) :: e :: el
+					else e :: loop el
+			in
+			(* print_endline (Printf.sprintf "%i-%i: PR" pr.pmin pr.pmax);
+			List.iter (fun e ->
+				print_endline (Printf.sprintf "%i-%i: %s" (pos e).pmin (pos e).pmax (Ast.s_expr e));
+			) el; *)
+			match el with
+			| [] -> [mk_null pr]
+			| e :: el ->
+				if (pos e).pmin >= pr.pmax then (mk_null pr) :: e :: el
+				else loop (e :: el)
+		in
+		let in_pattern = ref false in
+		let loop e =
+			(* print_endline (Printf.sprintf "%i-%i: %s" (pos e).pmin (pos e).pmax (Ast.s_expr e)); *)
+			match fst e with
+			| EVars vl when is_annotated (pos e) && is_completion ->
+				let rec loop2 acc mark vl = match vl with
+					| ((s,pn),final,tho,eo) as v :: vl ->
+						if mark then
+							loop2 (v :: acc) mark vl
+						else if is_annotated pn then
+							(* If the name is the display position, mark the expression *)
+							loop2 (v :: acc) true vl
+						else begin match eo with
+							| None ->
+								(* If there is no expression, we don't have to do anything.
+								   Should the display position be on the type-hint, it will
+								   be picked up while loading the type. *)
+								loop2 (v :: acc) mark vl
+							| Some e ->
+								(* Determine the area between the `|` in `var x| = | e`. This is not really
+								   correct because we don't want completion on the left side of the `=`, but
+								   we cannot determine that correctly without knowing its position.
+								   Note: We know `e` itself isn't the display position because this entire
+								   algorithm is bottom-up and it would be marked already if it was. *)
+								let p0 = match tho with
+									| Some (_,pt) -> pt
+									| None -> pn
+								in
+								let p = {p0 with pmax = (pos e).pmin} in
+								let e = if is_annotated p then annotate_marked e else e in
+								loop2 (((s,pn),final,tho,(Some e)) :: acc) mark vl
+						end
+					| [] ->
+						List.rev acc,mark
+				in
+				let vl,mark = loop2 [] false vl in
+				let e = EVars (List.rev vl),pos e in
+				if !was_annotated then e else raise Exit
+			| EBinop((OpAssign | OpAssignOp _) as op,e1,e2) when is_annotated (pos e) && is_completion ->
+				(* Special case for assign ops: If the expression is marked, but none of its operands are,
+				   we are "probably" interested in the rhs. Like with EVars, this isn't accurate because we
+				   could be on the left side of the `=`. I don't think there's a reason for requesting
+				   completion there though. *)
+				(EBinop(op,e1,annotate_marked e2)),(pos e)
+			| EBinop(OpOr,e1,(EIf(_,(EConst(Ident "null"),_),None),p1)) when is_annotated (pos e) && is_completion && !in_pattern ->
+				(* This HAS TO come from an attempted `case pattern | guard:` completion (issue #7068). *)
+				let p = { p1 with pmin = (pos e1).pmax; pmax = p1.pmin } in
+				EBinop(OpOr,e1,mk_null p),(pos e)
+			| EIf(_,(EConst(Ident "null"),_),None) when is_completion && !in_pattern ->
+				(* This is fine. *)
+				mk_null (pos e)
+			| EBlock [] when is_annotated (pos e) ->
+				annotate e DKStructure
+			| EBlock [EDisplay((EConst(Ident s),pn),DKMarked),_] when is_completion ->
+				let e = EObjectDecl [(s,pn,NoQuotes),(EConst (Ident "null"),null_pos)],(pos e) in
+				annotate e DKStructure
+			| EBlock el when is_annotated (pos e) && is_completion ->
+				let el = loop_el el in
+				EBlock el,(pos e)
+			| ECall(e1,el) when is_annotated (pos e) && is_completion ->
+				let el = loop_el el in
+				ECall(e1,el),(pos e)
+			| ENew((tp,pp),el) when is_annotated (pos e) && is_completion ->
+				if is_annotated pp || pp.pmax >= (DisplayPosition.display_position#get).pmax then
+					annotate_marked e
+				else begin
+					let el = loop_el el in
+					ENew((tp,pp),el),(pos e)
+				end
+			| EArrayDecl el when is_annotated (pos e) && is_completion ->
+				let el = loop_el el in
+				EArrayDecl el,(pos e)
+			| EObjectDecl fl when is_annotated (pos e) && is_completion ->
+				annotate e DKStructure
+			| ESwitch(e1,cases,def) when is_annotated (pos e) ->
+				(* We must be "between" two cases, or at the end of the last case.
+				   Let's find the last case which has a position that is < the display
+				   position and mark it. *)
+				let did_mark = ref false in
+				let mark_case ec p =
+					did_mark := true;
+					let ep = mk_null p in
+					match ec with
+					| Some ec ->
+						let ec = match fst ec with
+							| EBlock el -> (EBlock (el @ [ep]),p)
+							| _ -> (EBlock [ec;ep],p)
+						in
+						Some ec
+					| None ->
+						Some (mk_null p)
+				in
+				let rec loop cases = match cases with
+					| [el,eg,ec,p1] ->
+						let ec = match def with
+						| None when (pos e).pmax > !display_pos.pmin -> (* this is so we don't trigger if we're on the } *)
+							mark_case ec p1 (* no default, must be the last case *)
+						| Some (_,p2) when p1.pmax <= !display_pos.pmin && p2.pmin >= !display_pos.pmax ->
+							mark_case ec p1 (* default is beyond display position, mark *)
+						| _ ->
+							ec (* default contains display position, don't mark *)
+						in
+						[el,eg,ec,p1]
+					| (el1,eg1,ec1,p1) :: (el2,eg2,ec2,p2) :: cases ->
+						if p1.pmax <= !display_pos.pmin && p2.pmin >= !display_pos.pmax then
+							(el1,eg1,mark_case ec1 p1,p1) :: (el2,eg2,ec2,p2) :: cases
+						else
+							(el1,eg1,ec1,p1) :: loop ((el2,eg2,ec2,p2) :: cases)
+					| [] ->
+						[]
+				in
+				let cases = loop cases in
+				let def = if !did_mark then
+					def
+				else match def with
+					| Some(eo,p) when (pos e).pmax > !display_pos.pmin -> Some (mark_case eo p,p)
+					| _ -> def
+				in
+				ESwitch(e1,cases,def),pos e
+			| EDisplay _ ->
+				raise Exit
+			| EMeta((Meta.Markup,_,_),(EConst(String _),p)) when is_annotated p ->
+				annotate_marked e
+			| EConst (String _) when (not (Lexer.is_fmt_string (pos e)) || !Parser.was_auto_triggered) && is_annotated (pos e) && is_completion ->
+				(* TODO: check if this makes any sense *)
+				raise Exit
+			| EConst(Regexp _) when is_annotated (pos e) && is_completion ->
+				raise Exit
+			| EVars vl when is_annotated (pos e) ->
+				(* We only want to mark EVars if we're on a var name. *)
+				if List.exists (fun ((_,pn),_,_,_) -> is_annotated pn) vl then
+					annotate_marked e
+				else
+					raise Exit
+			| _ ->
+				if is_annotated (pos e) then
+					annotate_marked e
+				else
+					e
+		in
+		let opt f o =
+			match o with None -> None | Some v -> Some (f v)
+		in
+		let rec map e = match fst e with
+			| ESwitch(e1,cases,def) when is_annotated (pos e) ->
+				let e1 = map e1 in
+				let cases = List.map (fun (el,eg,e,p) ->
+					let old = !in_pattern in
+					in_pattern := true;
+					let el = List.map map el in
+					in_pattern := old;
+					let eg = opt map eg in
+					let e = opt map e in
+					el,eg,e,p
+				) cases in
+				let def = opt (fun (eo,p) -> opt map eo,p) def in
+				loop (ESwitch (e1, cases, def),(pos e))
+			| _ ->
+				loop (Ast.map_expr map e)
+		in
+		try map e with Exit -> e
+
+	let find_display_call e =
+		let found = ref false in
+		let handle_el e el =
+			let call_arg_is_marked () =
+				el = [] || List.exists (fun (e,_) -> match e with EDisplay(_,DKMarked) -> true | _ -> false) el
+			in
+			if not !Parser.was_auto_triggered || call_arg_is_marked () then begin
+			found := true;
+			Parser.mk_display_expr e DKCall
+			end else
+				e
+		in
+		let loop e = match fst e with
+			| ECall(_,el) | ENew(_,el) when not !found && display_position#enclosed_in (pos e) ->
+				handle_el e el
+			| EArray(e1,e2) when not !found && display_position#enclosed_in (pos e2) ->
+				handle_el e [e2]
+			| EDisplay(_,DKCall) ->
+				raise Exit
+			| _ -> e
+		in
+		let rec map e = loop (Ast.map_expr map e) in
+		try map e with Exit -> e
+
+
+	let process_expr com e = match com.display.dms_kind with
+		| DMDefinition | DMTypeDefinition | DMUsage _ | DMHover | DMDefault -> find_before_pos com.display.dms_kind e
+		| DMSignature -> find_display_call e
+		| _ -> e
+end
+
+let get_expected_name with_type = match with_type with
+	| WithType.Value (Some src) | WithType.WithType(_,Some src) ->
+		(match src with
+		| WithType.FunctionArgument name -> Some name
+		| WithType.StructureField name -> Some name
+		| WithType.ImplicitReturn -> None
+		)
+	| _ -> None
+
+let sort_fields l with_type tk =
+	let p = match tk with
+		| TKExpr p | TKField p -> Some p
+		| _ -> None
+	in
+	let expected_name = get_expected_name with_type in
+	let l = List.map (fun ci ->
+		let i = get_sort_index tk ci (Option.default Globals.null_pos p) expected_name in
+		ci,i
+	) l in
+	let sort l =
+		List.map fst (List.sort (fun (_,i1) (_,i2) -> compare i1 i2) l)
+	in
+	(* This isn't technically accurate, but I don't think it matters. *)
+	let rec dynamify_type_params t = match follow t with
+		| TInst({cl_kind = KTypeParameter _},_) -> mk_mono()
+		| _ -> Type.map dynamify_type_params t
+	in
+	let l = match with_type with
+		| WithType.WithType(t,_) when (match follow t with TMono _ -> false | _ -> true) ->
+			let rec comp item = match item.ci_type with
+				| None -> 9
+				| Some (t',_) ->
+				(* For enum constructors, we consider the return type of the constructor function
+				   so it has the same priority as argument-less constructors. *)
+				let t' = match item.ci_kind,follow t' with
+					| ITEnumField _,TFun(_,r) -> r
+					| _ -> t'
+				in
+				let t' = dynamify_type_params t' in
+				if type_iseq t' t then 0 (* equal types - perfect *)
+				else if t' == t_dynamic then 5 (* dynamic isn't good, but better than incompatible *)
+				else try Type.unify t' t; 1 (* assignable - great *)
+				with Unify_error _ -> match follow t' with
+					| TFun(_,tr) ->
+						if type_iseq tr t then 2 (* function returns our exact type - alright *)
+						else (try Type.unify tr t; 3 (* function returns compatible type - okay *)
+						with Unify_error _ -> 7) (* incompatible function - useless *)
+					| _ ->
+						6 (* incompatible type - probably useless *)
+			in
+			let l = List.map (fun (item,i1) ->
+				let i2 = comp item in
+				item,(i2,i1)
+			) l in
+			sort l
+		| _ ->
+			sort l
+	in
+	l
+
+let get_import_status ctx path =
+	try
+		let mt' = ctx.g.do_load_type_def ctx null_pos {tpackage = []; tname = snd path; tparams = []; tsub = None} in
+		if path <> (t_infos mt').mt_path then Shadowed else Imported
+	with _ ->
+		Unimported
diff --git a/src/context/display/displayEmitter.ml b/src/context/display/displayEmitter.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b74cbde063a2f055ce7190d67e01b4ef275318bb
--- /dev/null
+++ b/src/context/display/displayEmitter.ml
@@ -0,0 +1,180 @@
+open Globals
+open Ast
+open Type
+open Typecore
+open DisplayException
+open DisplayTypes
+open DisplayMode
+open CompletionItem
+open CompletionType
+open ClassFieldOrigin
+open DisplayTypes.CompletionResultKind
+open Common
+open Display
+open DisplayPosition
+
+let display_module_type ctx mt p = match ctx.com.display.dms_kind with
+	| DMDefinition | DMTypeDefinition ->
+		begin match mt with
+		| TClassDecl c when Meta.has Meta.CoreApi c.cl_meta ->
+			let c' = ctx.g.do_load_core_class ctx c in
+			raise_positions [c.cl_name_pos;c'.cl_name_pos]
+		| _ ->
+			raise_positions [(t_infos mt).mt_name_pos];
+		end
+	| DMUsage _ ->
+		let infos = t_infos mt in
+		ReferencePosition.set (snd infos.mt_path,infos.mt_name_pos,KModuleType)
+	| DMHover ->
+		let t = type_of_module_type mt in
+		let ct = CompletionType.from_type (get_import_status ctx) t in
+		raise_hover (make_ci_type (CompletionModuleType.of_module_type mt) ImportStatus.Imported (Some (t,ct))) None p
+	| DMDefault ->
+		DisplayToplevel.collect_and_raise ctx TKType WithType.value CRTypeHint ((s_type_path (t_infos mt).mt_path),p) p
+	| _ -> ()
+
+let rec display_type ctx t p =
+	let dm = ctx.com.display in
+	try
+		display_module_type ctx (module_type_of_type t) p
+	with Exit ->
+		match follow t,follow !t_dynamic_def with
+		| _,TDynamic _ -> () (* sanity check in case it's still t_dynamic *)
+		| TDynamic _,_ -> display_type ctx !t_dynamic_def p
+		| _ ->
+			match dm.dms_kind with
+			| DMHover ->
+				let ct = CompletionType.from_type (get_import_status ctx) t in
+				let ci = make_ci_expr (mk (TConst TNull) t p) (t,ct) in
+				raise_hover ci None p
+			| _ ->
+				()
+
+let check_display_type ctx t p =
+	let add_type_hint () =
+		ctx.g.type_hints <- (ctx.m.curmod.m_extra.m_display,p,t) :: ctx.g.type_hints;
+	in
+	let maybe_display_type () =
+		if ctx.is_display_file && display_position#enclosed_in p then
+			display_type ctx t p
+	in
+	add_type_hint();
+	maybe_display_type()
+
+let raise_position_of_type t =
+	let mt =
+		let rec follow_null t =
+			match t with
+				| TMono r -> (match !r with None -> raise_positions [null_pos] | Some t -> follow_null t)
+				| TLazy f -> follow_null (lazy_type f)
+				| TAbstract({a_path = [],"Null"},[t]) -> follow_null t
+				| TDynamic _ -> !t_dynamic_def
+				| _ -> t
+		in
+		try
+			Type.module_type_of_type (follow_null t)
+		with
+			Exit -> raise_positions [null_pos]
+	in
+	raise_positions [(t_infos mt).mt_name_pos]
+
+let display_variable ctx v p = match ctx.com.display.dms_kind with
+	| DMDefinition -> raise_positions [v.v_pos]
+	| DMTypeDefinition -> raise_position_of_type v.v_type
+	| DMUsage _ -> ReferencePosition.set (v.v_name,v.v_pos,KVar)
+	| DMHover ->
+		let ct = CompletionType.from_type (get_import_status ctx) ~values:(get_value_meta v.v_meta) v.v_type in
+		raise_hover (make_ci_local v (v.v_type,ct)) None p
+	| _ -> ()
+
+let display_field ctx origin scope cf p = match ctx.com.display.dms_kind with
+	| DMDefinition -> raise_positions [cf.cf_name_pos]
+	| DMTypeDefinition -> raise_position_of_type cf.cf_type
+	| DMUsage _ ->
+		let name,kind = match cf.cf_name,origin with
+			| "new",(Self (TClassDecl c) | Parent(TClassDecl c)) ->
+				(* For constructors, we care about the class name so we don't end up looking for "new". *)
+				snd c.cl_path,KConstructor
+			| _ ->
+				cf.cf_name,KClassField
+		in
+		ReferencePosition.set (name,cf.cf_name_pos,kind)
+	| DMHover ->
+		let cf = if Meta.has Meta.Impl cf.cf_meta then
+			prepare_using_field cf
+		else
+			cf
+		in
+        let cf = match origin,scope,follow cf.cf_type with
+            | Self (TClassDecl c),CFSConstructor,TFun(tl,_) -> {cf with cf_type = TFun(tl,TInst(c,List.map snd c.cl_params))}
+            | _ -> cf
+        in
+		let ct = CompletionType.from_type (get_import_status ctx) ~values:(get_value_meta cf.cf_meta) cf.cf_type in
+		raise_hover (make_ci_class_field (CompletionClassField.make cf scope origin true) (cf.cf_type,ct)) None p
+	| _ -> ()
+
+let maybe_display_field ctx origin scope cf p =
+	if display_position#enclosed_in p then display_field ctx origin scope cf p
+
+let display_enum_field ctx en ef p = match ctx.com.display.dms_kind with
+	| DMDefinition -> raise_positions [ef.ef_name_pos]
+	| DMTypeDefinition -> raise_position_of_type ef.ef_type
+	| DMUsage _ -> ReferencePosition.set (ef.ef_name,ef.ef_name_pos,KEnumField)
+	| DMHover ->
+		let ct = CompletionType.from_type (get_import_status ctx) ef.ef_type in
+		raise_hover (make_ci_enum_field (CompletionEnumField.make ef (Self (TEnumDecl en)) true) (ef.ef_type,ct)) None p
+	| _ -> ()
+
+let display_meta com meta p = match com.display.dms_kind with
+	| DMHover ->
+		begin match meta with
+		| Meta.Custom _ | Meta.Dollar _ -> ()
+		| _ ->
+			if com.json_out = None then begin match Meta.get_documentation meta with
+				| None -> ()
+				| Some (_,s) ->
+					raise_metadata ("<metadata>" ^ s ^ "</metadata>")
+			end else
+				raise_hover (make_ci_metadata meta) None p
+		end
+	| DMDefault ->
+		let all = Meta.get_all() in
+		let all = List.map make_ci_metadata all in
+		let subject = if meta = Meta.Last then None else Some (Meta.to_string meta) in
+		raise_fields all CRMetadata (make_subject subject p);
+	| _ ->
+		()
+
+let check_display_metadata ctx meta =
+	List.iter (fun (meta,args,p) ->
+		if display_position#enclosed_in p then display_meta ctx.com meta p;
+		List.iter (fun e ->
+			if display_position#enclosed_in (pos e) then begin
+				let e = ExprPreprocessing.process_expr ctx.com e in
+				delay ctx PTypeField (fun _ -> ignore(type_expr ctx e WithType.value));
+			end
+		) args
+	) meta
+
+let check_field_modifiers ctx c cf override display_modifier =
+	match override,display_modifier with
+		| Some p,_ when display_position#enclosed_in p && ctx.com.display.dms_kind = DMDefinition ->
+			begin match c.cl_super with
+			| Some(c,tl) ->
+				let _,_,cf = raw_class_field (fun cf -> cf.cf_type) c tl cf.cf_name in
+				display_field ctx (Parent(TClassDecl c)) CFSMember cf p
+			| _ ->
+				()
+			end
+		| Some _,_ when ctx.com.display.dms_kind = DMDefault ->
+			let all_fields = TClass.get_all_super_fields c in
+			let missing_fields = List.fold_left (fun fields cf -> PMap.remove cf.cf_name fields) all_fields c.cl_ordered_fields in
+			let l = PMap.fold (fun (c,cf) fields ->
+				let origin = Parent (TClassDecl c) in
+				ignore(follow cf.cf_type);
+				let ct = CompletionType.from_type (get_import_status ctx) ~values:(get_value_meta cf.cf_meta) cf.cf_type in
+				make_ci_class_field (CompletionClassField.make cf CFSMember origin true) (cf.cf_type,ct) :: fields
+			) missing_fields [] in
+			let l = sort_fields l NoValue TKOverride in
+			raise_fields l CROverride (make_subject (Some cf.cf_name) cf.cf_name_pos)
+		| _ -> ()
\ No newline at end of file
diff --git a/src/context/display/displayException.ml b/src/context/display/displayException.ml
new file mode 100644
index 0000000000000000000000000000000000000000..d820c8428e2a7b165bf043c6bee2cd41685026ff
--- /dev/null
+++ b/src/context/display/displayException.ml
@@ -0,0 +1,211 @@
+open Globals
+open Ast
+open DisplayTypes
+open CompletionItem
+open Type
+open Genjson
+
+type hover_result = {
+	hitem : CompletionItem.t;
+	hpos : pos;
+	hexpected : WithType.t option;
+}
+
+type fields_result = {
+	fitems : CompletionItem.t list;
+	fkind : CompletionResultKind.t;
+	fsubject : completion_subject;
+}
+
+type signature_kind =
+	| SKCall
+	| SKArrayAccess
+
+type kind =
+	| Diagnostics of string
+	| Statistics of string
+	| ModuleSymbols of string
+	| Metadata of string
+	| DisplaySignatures of (((tsignature * CompletionType.ct_function) * documentation) list * int * int * signature_kind) option
+	| DisplayHover of hover_result option
+	| DisplayPositions of pos list
+	| DisplayFields of fields_result option
+	| DisplayPackage of string list
+
+exception DisplayException of kind
+
+let raise_diagnostics s = raise (DisplayException(Diagnostics s))
+let raise_statistics s = raise (DisplayException(Statistics s))
+let raise_module_symbols s = raise (DisplayException(ModuleSymbols s))
+let raise_metadata s = raise (DisplayException(Metadata s))
+let raise_signatures l isig iarg kind = raise (DisplayException(DisplaySignatures(Some(l,isig,iarg,kind))))
+let raise_hover item expected p = raise (DisplayException(DisplayHover(Some {hitem = item;hpos = p;hexpected = expected})))
+let raise_positions pl = raise (DisplayException(DisplayPositions pl))
+let raise_fields ckl cr subj = raise (DisplayException(DisplayFields(Some({fitems = ckl;fkind = cr;fsubject = subj}))))
+let raise_package sl = raise (DisplayException(DisplayPackage sl))
+
+(* global state *)
+let last_completion_result = ref (Array.make 0 (CompletionItem.make (ITModule ([],"")) None))
+let last_completion_pos = ref None
+let max_completion_items = ref 0
+
+let filter_somehow ctx items kind subj =
+	let ret = DynArray.create () in
+	let acc_types = DynArray.create () in
+	let subject = match subj.s_name with
+		| None -> ""
+		| Some name-> String.lowercase name
+	in
+	let subject_matches s =
+		let rec loop i o =
+			if i < String.length subject then begin
+				let o = String.index_from s o subject.[i] in
+				loop (i + 1) o
+			end
+		in
+		try
+			loop 0 0;
+			true
+		with Not_found ->
+			false
+	in
+	let rec loop items index =
+		match items with
+		| _ when DynArray.length ret >= !max_completion_items ->
+			()
+		| item :: items ->
+			let name = String.lowercase (get_filter_name item) in
+			if subject_matches name then begin
+				(* Treat types with lowest priority. The assumption is that they are the only kind
+				   which actually causes the limit to be hit, so we show everything else and then
+				   fill in types. *)
+				match item.ci_kind with
+				| ITType _ ->
+					if DynArray.length ret + DynArray.length acc_types < !max_completion_items then
+						DynArray.add acc_types (item,index);
+				| _ ->
+					DynArray.add ret (CompletionItem.to_json ctx (Some index) item);
+			end;
+			loop items (index + 1)
+		| [] ->
+			()
+	in
+	loop items 0;
+	DynArray.iter (fun (item,index) ->
+		if DynArray.length ret < !max_completion_items then
+			DynArray.add ret (CompletionItem.to_json ctx (Some index) item);
+	) acc_types;
+	DynArray.to_list ret,DynArray.length ret
+
+let patch_completion_subject subj =
+	let p = Parser.cut_pos_at_display subj.s_insert_pos in
+	match subj.s_name with
+	| Some name ->
+		let delta = p.pmax - p.pmin in
+		let name = if delta > 0 && delta < String.length name then
+			String.sub name 0 delta
+		else
+			name
+		in
+		{subj with s_name = Some name;s_insert_pos = p}
+	| None ->
+		{subj with s_insert_pos = p}
+
+let fields_to_json ctx fields kind subj =
+	last_completion_result := Array.of_list fields;
+	let needs_filtering = !max_completion_items > 0 && Array.length !last_completion_result > !max_completion_items in
+	(* let p_before = subj.s_insert_pos in *)
+	let subj = patch_completion_subject subj in
+	let ja,num_items = if needs_filtering then
+		filter_somehow ctx fields kind subj
+	else
+		List.mapi (fun i item -> CompletionItem.to_json ctx (Some i) item) fields,Array.length !last_completion_result
+ 	in
+	let did_filter = num_items = !max_completion_items in
+	last_completion_pos := if did_filter then Some subj.s_start_pos else None;
+	let filter_string = (match subj.s_name with None -> "" | Some name -> name) in
+	(* print_endline (Printf.sprintf "FIELDS OUTPUT:\n\tfilter_string: %s\n\t    num items: %i\n\t        start: %s\n\t     position: %s\n\t   before cut: %s"
+		filter_string
+		num_items
+		(Printer.s_pos subj.s_start_pos)
+		(Printer.s_pos subj.s_insert_pos)
+		(Printer.s_pos p_before)
+	); *)
+	let fl =
+		("items",jarray ja) ::
+		("isIncomplete",jbool did_filter) ::
+		("mode",CompletionResultKind.to_json ctx kind) ::
+		("filterString",jstring filter_string) ::
+		("replaceRange",generate_pos_as_range subj.s_insert_pos) ::
+		[]
+	in
+	jobject fl
+
+let to_json ctx de =
+	match de with
+	| Diagnostics _
+	| Statistics _
+	| ModuleSymbols _
+	| Metadata _ -> assert false
+	| DisplaySignatures None ->
+		jnull
+	| DisplaySignatures Some(sigs,isig,iarg,kind) ->
+		(* We always want full info for signatures *)
+		let ctx = Genjson.create_context GMFull in
+		let fsig ((_,signature),doc) =
+			let fl = CompletionType.generate_function' ctx signature in
+			let fl = (match doc with None -> fl | Some s -> ("documentation",jstring s) :: fl) in
+			jobject fl
+		in
+		let sigkind = match kind with
+			| SKCall -> 0
+			| SKArrayAccess -> 1
+		in
+		jobject [
+			"activeSignature",jint isig;
+			"activeParameter",jint iarg;
+			"signatures",jlist fsig sigs;
+			"kind",jint sigkind;
+		]
+	| DisplayHover None ->
+		jnull
+	| DisplayHover (Some hover) ->
+		let named_source_kind = function
+			| WithType.FunctionArgument name -> (0, name)
+			| WithType.StructureField name -> (1, name)
+			| _ -> assert false
+		in
+		let ctx = Genjson.create_context GMFull in
+		let generate_name kind =
+			let i, name = named_source_kind kind in
+			jobject [
+				"name",jstring name;
+				"kind",jint i;
+			]
+		in
+		let expected = match hover.hexpected with
+			| Some(WithType.WithType(t,src)) ->
+				jobject (("type",generate_type ctx t)
+				:: (match src with
+					| None -> []
+					| Some ImplicitReturn -> []
+					| Some src -> ["name",generate_name src])
+				)
+			| Some(Value(Some ((FunctionArgument name | StructureField name) as src))) ->
+				jobject ["name",generate_name src]
+			| _ -> jnull
+		in
+		jobject [
+			"documentation",jopt jstring (CompletionItem.get_documentation hover.hitem);
+			"range",generate_pos_as_range hover.hpos;
+			"item",CompletionItem.to_json ctx None hover.hitem;
+			"expected",expected;
+		]
+	| DisplayPositions pl ->
+		jarray (List.map generate_pos_as_location pl)
+	| DisplayFields None ->
+		jnull
+	| DisplayFields Some r ->
+		fields_to_json ctx r.fitems r.fkind r.fsubject
+	| DisplayPackage pack ->
+		jarray (List.map jstring pack)
\ No newline at end of file
diff --git a/src/context/display/displayFields.ml b/src/context/display/displayFields.ml
new file mode 100644
index 0000000000000000000000000000000000000000..0bc069d35cb68a4353ee1df074406106d44ae924
--- /dev/null
+++ b/src/context/display/displayFields.ml
@@ -0,0 +1,287 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Ast
+open Globals
+open Error
+open Typecore
+open Type
+open CompletionItem
+open ClassFieldOrigin
+open Display
+
+let get_submodule_fields ctx path =
+	let m = Hashtbl.find ctx.g.modules path in
+	let tl = List.filter (fun t -> path <> (t_infos t).mt_path && not (t_infos t).mt_private) m.m_types in
+	let tl = List.map (fun mt ->
+		make_ci_type (CompletionItem.CompletionModuleType.of_module_type mt) ImportStatus.Imported None
+	) tl in
+	tl
+
+let collect_static_extensions ctx items e p =
+	let opt_type t =
+		match t with
+		| TLazy f ->
+			return_partial_type := true;
+			let t = lazy_type f in
+			return_partial_type := false;
+			t
+		| _ ->
+			t
+	in
+	let rec loop acc = function
+		| [] ->
+			acc
+		| (c,_) :: l ->
+			let rec dup t = Type.map dup t in
+			let acc = List.fold_left (fun acc f ->
+				if Meta.has Meta.NoUsing f.cf_meta || Meta.has Meta.NoCompletion f.cf_meta || Meta.has Meta.Impl f.cf_meta || PMap.mem f.cf_name acc then
+					acc
+				else begin
+					let f = { f with cf_type = opt_type f.cf_type } in
+					let monos = List.map (fun _ -> mk_mono()) f.cf_params in
+					let map = apply_params f.cf_params monos in
+					match follow (map f.cf_type) with
+					| TFun((_,_,TType({t_path=["haxe";"macro"], "ExprOf"}, [t])) :: args, ret)
+					| TFun((_,_,t) :: args, ret) ->
+						begin try
+							let e = TyperBase.unify_static_extension ctx {e with etype = dup e.etype} t p in
+							List.iter2 (fun m (name,t) -> match follow t with
+								| TInst ({ cl_kind = KTypeParameter constr },_) when constr <> [] ->
+									List.iter (fun tc -> unify_raise ctx m (map tc) e.epos) constr
+								| _ -> ()
+							) monos f.cf_params;
+							if not (can_access ctx c f true) || follow e.etype == t_dynamic && follow t != t_dynamic then
+								acc
+							else begin
+								let f = prepare_using_field f in
+								let f = { f with cf_params = []; cf_flags = set_flag f.cf_flags (int_of_class_field_flag CfPublic); cf_type = TFun(args,ret) } in
+								let decl = match c.cl_kind with
+									| KAbstractImpl a -> TAbstractDecl a
+									| _ -> TClassDecl c
+								in
+								let origin = StaticExtension(decl) in
+								let ct = CompletionType.from_type (get_import_status ctx) ~values:(get_value_meta f.cf_meta) f.cf_type in
+								let item = make_ci_class_field (CompletionClassField.make f CFSMember origin true) (f.cf_type,ct) in
+								PMap.add f.cf_name item acc
+							end
+						with Error (Unify _,_) | Unify_error _ ->
+							acc
+						end
+					| _ ->
+						acc
+				end
+			) acc c.cl_ordered_statics in
+			loop acc l
+	in
+	match follow e.etype with
+	| TMono _ ->
+		items
+	| _ ->
+		let items = loop items ctx.m.module_using in
+		let items = loop items ctx.g.global_using in
+		let items = try
+			let mt = module_type_of_type e.etype in
+			loop items (t_infos mt).mt_using
+		with Exit ->
+			items
+		in
+		items
+
+let collect ctx e_ast e dk with_type p =
+	let opt_args args ret = TFun(List.map(fun (n,o,t) -> n,true,t) args,ret) in
+	let should_access c cf stat =
+		if Meta.has Meta.NoCompletion cf.cf_meta then false
+		else if c != ctx.curclass && not (has_class_field_flag cf CfPublic) && String.length cf.cf_name > 4 then begin match String.sub cf.cf_name 0 4 with
+			| "get_" | "set_" -> false
+			| _ -> can_access ctx c cf stat
+		end else
+			(not stat || not (Meta.has Meta.Impl cf.cf_meta)) &&
+			can_access ctx c cf stat
+	in
+	let make_class_field origin cf =
+		let ct = CompletionType.from_type (get_import_status ctx) ~values:(get_value_meta cf.cf_meta) cf.cf_type in
+		make_ci_class_field (CompletionClassField.make cf CFSMember origin true) (cf.cf_type,ct)
+	in
+	let rec loop items t =
+		let is_new_item items name = not (PMap.mem name items) in
+		match follow t with
+		| TInst ({cl_kind = KTypeParameter tl},_) ->
+			(* Type parameters can access the fields of their constraints *)
+			List.fold_left (fun acc t -> loop acc t) items tl
+		| TInst(c0,tl) ->
+			(* For classes, browse the hierarchy *)
+			let fields = TClass.get_all_fields c0 tl in
+			Display.merge_core_doc ctx (TClassDecl c0);
+			PMap.foldi (fun k (c,cf) acc ->
+				if should_access c cf false && is_new_item acc cf.cf_name then begin
+					let origin = if c == c0 then Self(TClassDecl c) else Parent(TClassDecl c) in
+					let item = make_class_field origin cf in
+					PMap.add k item acc
+				end else
+					acc
+			) fields items
+		| TEnum _ ->
+			let t = ctx.g.do_load_type_def ctx p {tpackage=[];tname="EnumValue";tsub=None;tparams=[]} in
+			begin match t with
+			| TAbstractDecl ({a_impl = Some c} as a) ->
+				begin try
+					let cf = PMap.find "match" c.cl_statics in
+					let item = make_class_field (Self(TAbstractDecl a)) cf in
+					PMap.add "match" item items
+				with Not_found ->
+					items
+				end
+			| _ ->
+				items
+			end;
+		| TAbstract({a_impl = Some c} as a,tl) ->
+			Display.merge_core_doc ctx (TAbstractDecl a);
+			(* Abstracts should show all their @:impl fields minus the constructor. *)
+			let items = List.fold_left (fun acc cf ->
+				if Meta.has Meta.Impl cf.cf_meta && not (Meta.has Meta.Enum cf.cf_meta) && should_access c cf false && is_new_item acc cf.cf_name then begin
+					let origin = Self(TAbstractDecl a) in
+					let cf = prepare_using_field cf in
+					let cf = if tl = [] then cf else {cf with cf_type = apply_params a.a_params tl cf.cf_type} in
+					let item = make_class_field origin cf in
+					PMap.add cf.cf_name item acc
+				end else
+					acc
+			) items c.cl_ordered_statics in
+			begin try
+				(* If there's a @:forward, get the fields of the underlying type and filter them. *)
+				let _,el,_ = Meta.get Meta.Forward a.a_meta in
+				let sl = ExtList.List.filter_map (fun e -> match fst e with
+					| EConst(Ident s) -> Some s
+					| _ -> None
+				) el in
+				let forwarded_fields = loop PMap.empty (apply_params a.a_params tl a.a_this) in
+				let abstract_has_own_field field_name =
+					PMap.mem field_name c.cl_fields || PMap.mem field_name c.cl_statics
+				in
+				PMap.foldi (fun name item acc ->
+					if (sl = [] || List.mem name sl && is_new_item acc name) && not (abstract_has_own_field name) then
+						PMap.add name item acc
+					else
+						acc
+				) forwarded_fields items
+			with Not_found ->
+				items
+			end
+		| TAnon an ->
+			(* @:forwardStatics *)
+			let items = match !(an.a_status) with
+				| Statics { cl_kind = KAbstractImpl { a_meta = meta; a_this = TInst (c,_) }} when Meta.has Meta.ForwardStatics meta ->
+					let items = List.fold_left (fun acc cf ->
+						if should_access c cf true && is_new_item acc cf.cf_name then begin
+							let origin = Self(TClassDecl c) in
+							let item = make_class_field origin cf in
+							PMap.add cf.cf_name item acc
+						end else
+							acc
+					) items c.cl_ordered_statics in
+					PMap.foldi (fun name item acc ->
+						if is_new_item acc name then
+							PMap.add name item acc
+						else
+							acc
+					) PMap.empty items
+				| _ -> items
+			in
+			(* Anon own fields *)
+			PMap.foldi (fun name cf acc ->
+				if is_new_item acc name then begin
+					let allow_static_abstract_access c cf =
+						should_access c cf false &&
+						(not (Meta.has Meta.Impl cf.cf_meta) || Meta.has Meta.Enum cf.cf_meta)
+					in
+					let ct = CompletionType.from_type (get_import_status ctx) ~values:(get_value_meta cf.cf_meta) cf.cf_type in
+					let add origin make_field =
+						PMap.add name (make_field (CompletionClassField.make cf CFSMember origin true) (cf.cf_type,ct)) acc
+					in
+					match !(an.a_status) with
+						| Statics ({cl_kind = KAbstractImpl a} as c) ->
+							if allow_static_abstract_access c cf then
+								let make = if Meta.has Meta.Enum cf.cf_meta then
+										(make_ci_enum_abstract_field a)
+									else
+										make_ci_class_field
+								in
+								add (Self (TAbstractDecl a)) make
+							else
+								acc;
+						| Statics c ->
+							Display.merge_core_doc ctx (TClassDecl c);
+							if should_access c cf true then add (Self (TClassDecl c)) make_ci_class_field else acc;
+						| EnumStatics en ->
+							let ef = PMap.find name en.e_constrs in
+							PMap.add name (make_ci_enum_field (CompletionEnumField.make ef (Self (TEnumDecl en)) true) (cf.cf_type,ct)) acc
+						| AbstractStatics a ->
+							Display.merge_core_doc ctx (TAbstractDecl a);
+							let check = match a.a_impl with
+								| None -> true
+								| Some c -> allow_static_abstract_access c cf
+							in
+							if check then add (Self (TAbstractDecl a)) make_ci_class_field else acc;
+						| _ ->
+							let origin = match t with
+								| TType(td,_) -> Self (TTypeDecl td)
+								| _ -> AnonymousStructure an
+							in
+							add origin make_ci_class_field;
+				end else
+					acc
+			) an.a_fields items
+		| TFun (args,ret) ->
+			(* A function has no field except the magic .bind one. *)
+			if is_new_item items "bind" then begin
+				let t = opt_args args ret in
+				let cf = mk_field "bind" (tfun [t] t) p null_pos in
+				cf.cf_kind <- Method MethNormal;
+				let ct = CompletionType.from_type (get_import_status ctx) ~values:(get_value_meta cf.cf_meta) t in
+				let item = make_ci_class_field (CompletionClassField.make cf CFSStatic BuiltIn true) (t,ct) in
+				PMap.add "bind" item items
+			end else
+				items
+		| _ ->
+			items
+	in
+	(* Add special `.code` field if we have a string of length 1 *)
+	let items = match fst e_ast with
+		| EConst(String(s,_)) when String.length s = 1 ->
+			let cf = mk_field "code" ctx.t.tint e.epos null_pos in
+			cf.cf_doc <- Some "The character code of this character (inlined at compile-time).";
+			cf.cf_kind <- Var { v_read = AccNormal; v_write = AccNever };
+			let ct = CompletionType.from_type (get_import_status ctx) ~values:(get_value_meta cf.cf_meta) cf.cf_type in
+			let item = make_ci_class_field (CompletionClassField.make cf CFSMember BuiltIn true) (cf.cf_type,ct) in
+			PMap.add cf.cf_name item PMap.empty
+		| _ ->
+			PMap.empty
+	in
+	(* Collect fields of the type *)
+	let items = loop items e.etype in
+	(* Add static extensions *)
+	let items = collect_static_extensions ctx items e p in
+	let items = PMap.fold (fun item acc -> item :: acc) items [] in
+	let items = sort_fields items WithType.value (TKField p) in
+	try
+		let sl = string_list_of_expr_path_raise e_ast in
+		(* Add submodule fields *)
+		items @ get_submodule_fields ctx (List.tl sl,List.hd sl)
+	with Exit | Not_found ->
+		items
diff --git a/src/context/display/displayJson.ml b/src/context/display/displayJson.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b099185add730a0d6c93a823c23954ae93a10cfe
--- /dev/null
+++ b/src/context/display/displayJson.ml
@@ -0,0 +1,329 @@
+open Globals
+open Json.Reader
+open JsonRpc
+open Jsonrpc_handler
+open Json
+open Common
+open DisplayTypes.DisplayMode
+open Timer
+open Genjson
+open Type
+
+(* Generate the JSON of our times. *)
+let json_of_times root =
+	let rec loop node =
+		if node == root || node.time > 0.0009 then begin
+			let children = ExtList.List.filter_map loop node.children in
+			let fl = [
+				"name",jstring node.name;
+				"path",jstring node.path;
+				"info",jstring node.info;
+				"time",jfloat node.time;
+				"calls",jint node.num_calls;
+				"percentTotal",jfloat (if root.time = 0. then 0. else (node.time *. 100. /. root.time));
+				"percentParent",jfloat (if node == root || node.parent.time = 0. then 0. else node.time *. 100. /. node.parent.time);
+			] in
+			let fl = match children with
+				| [] -> fl
+				| _ -> ("children",jarray children) :: fl
+			in
+			Some (jobject fl)
+		end else
+			None
+	in
+	loop root
+
+let supports_resolve = ref false
+
+let create_json_context jsonrpc may_resolve =
+	Genjson.create_context ~jsonrpc:jsonrpc (if may_resolve && !supports_resolve then GMMinimum else GMFull)
+
+let send_string j =
+	raise (DisplayOutput.Completion j)
+
+let send_json json =
+	send_string (string_of_json json)
+
+class display_handler (jsonrpc : jsonrpc_handler) com (cs : CompilationServer.t) = object(self)
+	val cs = cs;
+
+	method get_cs = cs
+
+	method enable_display mode =
+		com.display <- create mode;
+		Parser.display_mode := mode;
+		Common.define_value com Define.Display "1"
+
+	method set_display_file was_auto_triggered requires_offset =
+		let file = jsonrpc#get_string_param "file" in
+		let file = Path.unique_full_path file in
+		let pos = if requires_offset then jsonrpc#get_int_param "offset" else (-1) in
+		TypeloadParse.current_stdin := jsonrpc#get_opt_param (fun () ->
+			let s = jsonrpc#get_string_param "contents" in
+			Common.define com Define.DisplayStdin; (* TODO: awkward *)
+			(* Remove our current display file from the cache so the server doesn't pick it up *)
+			cs#remove_files file;
+			Some s
+		) None;
+		Parser.was_auto_triggered := was_auto_triggered;
+		DisplayPosition.display_position#set {
+			pfile = file;
+			pmin = pos;
+			pmax = pos;
+		}
+end
+
+type handler_context = {
+	com : Common.context;
+	jsonrpc : jsonrpc_handler;
+	display : display_handler;
+	send_result : Json.t -> unit;
+	send_error : 'a . Json.t list -> 'a;
+}
+
+let handler =
+	let open CompilationServer in
+	let h = Hashtbl.create 0 in
+	let l = [
+		"initialize", (fun hctx ->
+			supports_resolve := hctx.jsonrpc#get_opt_param (fun () -> hctx.jsonrpc#get_bool_param "supportsResolve") false;
+			DisplayException.max_completion_items := hctx.jsonrpc#get_opt_param (fun () -> hctx.jsonrpc#get_int_param "maxCompletionItems") 0;
+			let exclude = hctx.jsonrpc#get_opt_param (fun () -> hctx.jsonrpc#get_array_param "exclude") [] in
+			DisplayToplevel.exclude := List.map (fun e -> match e with JString s -> s | _ -> assert false) exclude;
+			let methods = Hashtbl.fold (fun k _ acc -> (jstring k) :: acc) h [] in
+			hctx.send_result (JObject [
+				"methods",jarray methods;
+				"haxeVersion",jobject [
+					"major",jint version_major;
+					"minor",jint version_minor;
+					"patch",jint version_revision;
+					"pre",(match version_pre with None -> jnull | Some pre -> jstring pre);
+					"build",(match Version.version_extra with None -> jnull | Some(_,build) -> jstring build);
+				];
+				"protocolVersion",jobject [
+					"major",jint 0;
+					"minor",jint 3;
+					"patch",jint 0;
+				]
+			])
+		);
+		"display/completionItem/resolve", (fun hctx ->
+			let i = hctx.jsonrpc#get_int_param "index" in
+			begin try
+				let item = (!DisplayException.last_completion_result).(i) in
+				let ctx = Genjson.create_context GMFull in
+				hctx.send_result (jobject ["item",CompletionItem.to_json ctx None item])
+			with Invalid_argument _ ->
+				hctx.send_error [jstring (Printf.sprintf "Invalid index: %i" i)]
+			end
+		);
+		"display/completion", (fun hctx ->
+			hctx.display#set_display_file (hctx.jsonrpc#get_bool_param "wasAutoTriggered") true;
+			hctx.display#enable_display DMDefault;
+		);
+		"display/definition", (fun hctx ->
+			Common.define hctx.com Define.NoCOpt;
+			hctx.display#set_display_file false true;
+			hctx.display#enable_display DMDefinition;
+		);
+		"display/typeDefinition", (fun hctx ->
+			Common.define hctx.com Define.NoCOpt;
+			hctx.display#set_display_file false true;
+			hctx.display#enable_display DMTypeDefinition;
+		);
+		"display/references", (fun hctx ->
+			Common.define hctx.com Define.NoCOpt;
+			hctx.display#set_display_file false true;
+			hctx.display#enable_display (DMUsage false);
+		);
+		"display/hover", (fun hctx ->
+			Common.define hctx.com Define.NoCOpt;
+			hctx.display#set_display_file false true;
+			hctx.display#enable_display DMHover;
+		);
+		"display/package", (fun hctx ->
+			hctx.display#set_display_file false false;
+			hctx.display#enable_display DMPackage;
+		);
+		"display/signatureHelp", (fun hctx ->
+			hctx.display#set_display_file (hctx.jsonrpc#get_bool_param "wasAutoTriggered") true;
+			hctx.display#enable_display DMSignature
+		);
+		"server/readClassPaths", (fun hctx ->
+			hctx.com.callbacks#add_after_init_macros (fun () ->
+				let cc = hctx.display#get_cs#get_context (Define.get_signature hctx.com.defines) in
+				cc#set_initialized true;
+				DisplayToplevel.read_class_paths hctx.com ["init"];
+				let files = hctx.display#get_cs#get_files in
+				hctx.send_result (jobject [
+					"files", jint (List.length files)
+				]);
+			)
+		);
+		"server/contexts", (fun hctx ->
+			let l = List.map (fun cc -> cc#get_json) hctx.display#get_cs#get_contexts in
+			hctx.send_result (jarray l)
+		);
+		"server/modules", (fun hctx ->
+			let sign = Digest.from_hex (hctx.jsonrpc#get_string_param "signature") in
+			let cc = hctx.display#get_cs#get_context sign in
+			let l = Hashtbl.fold (fun _ m acc ->
+				if m.m_extra.m_kind <> MFake then jstring (s_type_path m.m_path) :: acc else acc
+			) cc#get_modules [] in
+			hctx.send_result (jarray l)
+		);
+		"server/module", (fun hctx ->
+			let sign = Digest.from_hex (hctx.jsonrpc#get_string_param "signature") in
+			let path = Path.parse_path (hctx.jsonrpc#get_string_param "path") in
+			let cc = hctx.display#get_cs#get_context sign in
+			let m = try
+				cc#find_module path
+			with Not_found ->
+				hctx.send_error [jstring "No such module"]
+			in
+			hctx.send_result (generate_module () m)
+		);
+		"server/moduleCreated", (fun hctx ->
+			let file = hctx.jsonrpc#get_string_param "file" in
+			let file = Path.unique_full_path file in
+			let cs = hctx.display#get_cs in
+			List.iter (fun cc ->
+				Hashtbl.replace cc#get_removed_files file ()
+			) cs#get_contexts;
+			hctx.send_result (jstring file);
+		);
+		"server/files", (fun hctx ->
+			let sign = Digest.from_hex (hctx.jsonrpc#get_string_param "signature") in
+			let cc = hctx.display#get_cs#get_context sign in
+			let files = Hashtbl.fold (fun file cfile acc -> (file,cfile) :: acc) cc#get_files [] in
+			let files = List.sort (fun (file1,_) (file2,_) -> compare file1 file2) files in
+			let files = List.map (fun (file,cfile) ->
+				jobject [
+					"file",jstring file;
+					"time",jfloat cfile.c_time;
+					"pack",jstring (String.concat "." cfile.c_package);
+					"moduleName",jopt jstring cfile.c_module_name;
+				]
+			) files in
+			hctx.send_result (jarray files)
+		);
+		"server/invalidate", (fun hctx ->
+			let file = hctx.jsonrpc#get_string_param "file" in
+			let file = Path.unique_full_path file in
+			let cs = hctx.display#get_cs in
+			cs#taint_modules file;
+			cs#remove_files file;
+			hctx.send_result jnull
+		);
+		"server/configure", (fun hctx ->
+			let l = ref (List.map (fun (name,value) ->
+				let value = hctx.jsonrpc#get_bool "value" value in
+				try
+					ServerMessage.set_by_name name value;
+					jstring (Printf.sprintf "Printing %s %s" name (if value then "enabled" else "disabled"))
+				with Not_found ->
+					hctx.send_error [jstring ("Invalid print parame name: " ^ name)]
+			) (hctx.jsonrpc#get_opt_param (fun () -> (hctx.jsonrpc#get_object_param "print")) [])) in
+			hctx.jsonrpc#get_opt_param (fun () ->
+				let b = hctx.jsonrpc#get_bool_param "noModuleChecks" in
+				ServerConfig.do_not_check_modules := b;
+				l := jstring ("Module checks " ^ (if b then "disabled" else "enabled")) :: !l;
+				()
+			) ();
+			hctx.jsonrpc#get_opt_param (fun () ->
+				let b = hctx.jsonrpc#get_bool_param "legacyCompletion" in
+				ServerConfig.legacy_completion := b;
+				l := jstring ("Legacy completion " ^ (if b then "enabled" else "disabled")) :: !l;
+				()
+			) ();
+			hctx.send_result (jarray !l)
+		);
+		"server/memory",(fun hctx ->
+			let j = Memory.get_memory_json hctx.display#get_cs MCache in
+			hctx.send_result j
+		);
+		"server/memory/context",(fun hctx ->
+			let sign = Digest.from_hex (hctx.jsonrpc#get_string_param "signature") in
+			let j = Memory.get_memory_json hctx.display#get_cs (MContext sign) in
+			hctx.send_result j
+		);
+		"server/memory/module",(fun hctx ->
+			let sign = Digest.from_hex (hctx.jsonrpc#get_string_param "signature") in
+			let path = Path.parse_path (hctx.jsonrpc#get_string_param "path") in
+			let j = Memory.get_memory_json hctx.display#get_cs (MModule(sign,path)) in
+			hctx.send_result j
+		);
+		(* TODO: wait till gama complains about the naming, then change it to something else *)
+		"typer/compiledTypes", (fun hctx ->
+			hctx.com.callbacks#add_after_filters (fun () ->
+				let ctx = create_context GMFull in
+				let l = List.map (generate_module_type ctx) hctx.com.types in
+				hctx.send_result (jarray l)
+			);
+		);
+	] in
+	List.iter (fun (s,f) -> Hashtbl.add h s f) l;
+	h
+
+let parse_input com input report_times =
+	let input =
+		JsonRpc.handle_jsonrpc_error (fun () -> JsonRpc.parse_request input) send_json
+	in
+	let jsonrpc = new jsonrpc_handler input in
+
+	let send_result json =
+		let fl = [
+			"result",json;
+			"timestamp",jfloat (Unix.gettimeofday ());
+		] in
+		let fl = if !report_times then begin
+			close_times();
+			let _,_,root = Timer.build_times_tree () in
+			begin match json_of_times root with
+			| None -> fl
+			| Some jo -> ("timers",jo) :: fl
+			end
+		end else fl in
+		let fl = if DynArray.length com.pass_debug_messages > 0 then
+			("passMessages",jarray (List.map jstring (DynArray.to_list com.pass_debug_messages))) :: fl
+		else
+			fl
+		in
+		let jo = jobject fl in
+		send_json (JsonRpc.result jsonrpc#get_id  jo)
+	in
+
+	let send_error jl =
+		send_json (JsonRpc.error jsonrpc#get_id 0 ~data:(Some (JArray jl)) "Compiler error")
+	in
+
+	com.json_out <- Some({
+		send_result = send_result;
+		send_error = send_error;
+		jsonrpc = jsonrpc
+	});
+
+	let cs = match CompilationServer.get() with
+		| Some cs -> cs
+		| None -> send_error [jstring "compilation server not running for some reason"];
+	in
+
+	let display = new display_handler jsonrpc com cs in
+
+	let hctx = {
+		com = com;
+		jsonrpc = jsonrpc;
+		display = display;
+		send_result = send_result;
+		send_error = send_error;
+	} in
+
+	JsonRpc.handle_jsonrpc_error (fun () ->
+		let method_name = jsonrpc#get_method_name in
+		let f = try
+			Hashtbl.find handler method_name
+		with Not_found ->
+			raise_method_not_found jsonrpc#get_id method_name
+		in
+		f hctx
+	) send_json
diff --git a/src/context/display/displayPath.ml b/src/context/display/displayPath.ml
new file mode 100644
index 0000000000000000000000000000000000000000..a52c22c2e230e41db9707031fcc76f972dc7564e
--- /dev/null
+++ b/src/context/display/displayPath.ml
@@ -0,0 +1,233 @@
+open Globals
+open Typecore
+open Type
+open Common
+open CompletionItem
+open ClassFieldOrigin
+open DisplayException
+open Display
+open DisplayEmitter
+open DisplayPosition
+open ImportHandling
+
+module TypePathHandler = struct
+	let unique l =
+		let rec _unique = function
+			| [] -> []
+			| x1 :: x2 :: l when x1 = x2 -> _unique (x2 :: l)
+			| x :: l -> x :: _unique l
+		in
+		_unique (List.sort compare l)
+
+	let rec read_type_path com p =
+		let classes = ref [] in
+		let packages = ref [] in
+		let p = (match p with
+			| x :: l ->
+				(try
+					match PMap.find x com.package_rules with
+					| Directory d -> d :: l
+					| Remap s -> s :: l
+					| _ -> p
+				with
+					Not_found -> p)
+			| _ -> p
+		) in
+		List.iter (fun path ->
+			let dir = path ^ String.concat "/" p in
+			let r = (try Sys.readdir dir with _ -> [||]) in
+			Array.iter (fun f ->
+				if (try (Unix.stat (dir ^ "/" ^ f)).Unix.st_kind = Unix.S_DIR with _ -> false) then begin
+					if f.[0] >= 'a' && f.[0] <= 'z' then begin
+						if p = ["."] then
+							match read_type_path com [f] with
+							| [] , [] -> ()
+							| _ ->
+								try
+									match PMap.find f com.package_rules with
+									| Forbidden -> ()
+									| Remap f -> packages := f :: !packages
+									| Directory _ -> raise Not_found
+								with Not_found ->
+									packages := f :: !packages
+						else
+							packages := f :: !packages
+					end;
+				end else if file_extension f = "hx" && f <> "import.hx" then begin
+					let c = Filename.chop_extension f in
+					try
+						ignore(String.index c '.')
+					with Not_found ->
+						if String.length c < 2 || String.sub c (String.length c - 2) 2 <> "__" then classes := c :: !classes;
+				end;
+			) r;
+		) com.class_path;
+		let process_lib lib =
+			List.iter (fun (path,name) ->
+				if path = p then classes := name :: !classes else
+				let rec loop p1 p2 =
+					match p1, p2 with
+					| [], _ -> ()
+					| x :: _, [] -> packages := x :: !packages
+					| a :: p1, b :: p2 -> if a = b then loop p1 p2
+				in
+				loop path p
+			) lib#list_modules;
+		in
+		List.iter process_lib com.native_libs.swf_libs;
+		List.iter process_lib com.native_libs.net_libs;
+		List.iter process_lib com.native_libs.java_libs;
+		unique !packages, unique !classes
+
+	(** raise field completion listing packages and modules in a given package *)
+	let complete_type_path com p =
+		let packs, modules = read_type_path com p in
+		if packs = [] && modules = [] then
+			(abort ("No modules found in " ^ String.concat "." p) null_pos)
+		else
+			let packs = List.map (fun n -> make_ci_package (p,n) []) packs in
+			let modules = List.map (fun n -> make_ci_module (p,n)) modules in
+			Some (packs @ modules)
+
+	(** raise field completion listing module sub-types and static fields *)
+	let complete_type_path_inner ctx p c cur_package is_import =
+		try
+			let sl_pack,s_module = match List.rev p with
+				| s :: sl when s.[0] >= 'A' && s.[0] <= 'Z' -> List.rev sl,s
+				| _ -> p,c
+			in
+			(* This is a bit wacky: We want to reset the display position so that revisiting the display file
+			   does not raise another TypePath exception. However, we still want to have it treated like the
+			   display file, so we just set the position to 0 (#6558). *)
+			let old = display_position#get in
+			display_position#set {old with pmin = 0; pmax = 0};
+			let rec lookup p =
+				try
+					ctx.g.do_load_module ctx (p,s_module) null_pos
+				with e ->
+					if cur_package then
+						match List.rev p with
+						| [] -> raise e
+						| _ :: p -> lookup (List.rev p)
+					else
+						raise e
+			in
+			let m = Std.finally (fun () -> display_position#set old) lookup sl_pack in
+			let statics = ref None in
+			let enum_statics = ref None in
+			let public_types = List.filter (fun t ->
+				let tinfos = t_infos t in
+				let is_module_type = snd tinfos.mt_path = c in
+				if is_import && is_module_type then begin match t with
+					| TClassDecl c | TAbstractDecl {a_impl = Some c} ->
+						ignore(c.cl_build());
+						statics := Some c
+					| TEnumDecl en ->
+						enum_statics := Some en
+					| _ -> ()
+				end;
+				not tinfos.mt_private
+			) m.m_types in
+			let types =
+				if c <> s_module then
+					[]
+				else
+					List.map (fun mt ->
+						make_ci_type (CompletionItem.CompletionModuleType.of_module_type mt) ImportStatus.Imported None
+					) public_types
+			in
+			let class_origin c = match c.cl_kind with
+				| KAbstractImpl a -> Self (TAbstractDecl a)
+				| _ -> Self (TClassDecl c)
+			in
+			let tpair t =
+				(t,CompletionType.from_type (get_import_status ctx) t)
+			in
+			let make_field_doc c cf =
+				make_ci_class_field (CompletionClassField.make cf CFSStatic (class_origin c) true) (tpair cf.cf_type)
+			in
+			let fields = match !statics with
+				| None -> types
+				| Some c -> types @ (List.map (make_field_doc c) (List.filter (fun cf -> has_class_field_flag cf CfPublic) c.cl_ordered_statics))
+			in
+			let fields = match !enum_statics with
+				| None -> fields
+				| Some en -> PMap.fold (fun ef acc ->
+					make_ci_enum_field (CompletionEnumField.make ef (Self (TEnumDecl en)) true) (tpair ef.ef_type) :: acc
+				) en.e_constrs fields
+			in
+			Some fields
+		with _ ->
+			abort ("Could not load module " ^ (s_type_path (p,c))) null_pos
+end
+
+let resolve_position_by_path ctx path p =
+	let mt = ctx.g.do_load_type_def ctx p path in
+	let p = (t_infos mt).mt_pos in
+	raise_positions [p]
+
+
+let handle_path_display ctx path p =
+	let class_field c name =
+		ignore(c.cl_build());
+		let cf = PMap.find name c.cl_statics in
+		let origin = match c.cl_kind with
+			| KAbstractImpl a -> Self (TAbstractDecl a)
+			| _ -> Self (TClassDecl c)
+		in
+		display_field ctx origin CFSStatic cf p
+	in
+	match ImportHandling.convert_import_to_something_usable display_position#get path,ctx.com.display.dms_kind with
+		| (IDKPackage [s],p),DMDefault ->
+			DisplayToplevel.collect_and_raise ctx TKType WithType.no_value CRImport (s,p) p
+		| (IDKPackage sl,p),DMDefault ->
+			let sl = match List.rev sl with
+				| s :: sl -> List.rev sl
+				| [] -> assert false
+			in
+			raise (Parser.TypePath(sl,None,true,p))
+		| (IDKPackage _,_),_ ->
+			() (* ? *)
+		| (IDKModule(sl,s),_),(DMDefinition | DMTypeDefinition) ->
+			(* We assume that we want to go to the module file, not a specific type
+			   which might not even exist anyway. *)
+			let mt = ctx.g.do_load_module ctx (sl,s) p in
+			let p = { pfile = mt.m_extra.m_file; pmin = 0; pmax = 0} in
+			raise_positions [p]
+		| (IDKModule(sl,s),_),DMHover ->
+			let m = ctx.g.do_load_module ctx (sl,s) p in
+			begin try
+				let mt = List.find (fun mt -> snd (t_infos mt).mt_path = s) m.m_types in
+				display_module_type ctx mt p;
+			with Not_found ->
+				()
+			end
+		| (IDKSubType(sl,sm,st),p),DMHover ->
+			(* TODO: remove code duplication once load_type_def change is in *)
+			let m = ctx.g.do_load_module ctx (sl,sm) p in
+			begin try
+				let mt = List.find (fun mt -> snd (t_infos mt).mt_path = st) m.m_types in
+				display_module_type ctx mt p;
+			with Not_found ->
+				()
+			end
+		| (IDKModule(sl,s),p),_ ->
+			raise (Parser.TypePath(sl,None,true,p))
+		| (IDKSubType(sl,sm,st),p),(DMDefinition | DMTypeDefinition) ->
+			resolve_position_by_path ctx { tpackage = sl; tname = sm; tparams = []; tsub = Some st} p
+		| (IDKSubType(sl,sm,st),p),_ ->
+			raise (Parser.TypePath(sl,Some(sm,false),true,p))
+		| ((IDKSubTypeField(sl,sm,st,sf) | IDKModuleField(sl,(sm as st),sf)),p),DMDefault ->
+			raise (Parser.TypePath(sl @ [sm],Some(st,false),true,p));
+		| ((IDKSubTypeField(sl,sm,st,sf) | IDKModuleField(sl,(sm as st),sf)),p),_ ->
+			let m = ctx.g.do_load_module ctx (sl,sm) p in
+			List.iter (fun t -> match t with
+				| TClassDecl c when snd c.cl_path = st ->
+					class_field c sf
+				| TAbstractDecl {a_impl = Some c; a_path = (_,st')} when st' = st ->
+					class_field c sf
+				| _ ->
+					()
+			) m.m_types;
+		| (IDK,_),_ ->
+			()
\ No newline at end of file
diff --git a/src/context/display/displayToplevel.ml b/src/context/display/displayToplevel.ml
new file mode 100644
index 0000000000000000000000000000000000000000..674c4443f244f52fd894b46acb2fd26f49ac0ca1
--- /dev/null
+++ b/src/context/display/displayToplevel.ml
@@ -0,0 +1,477 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Ast
+open Common
+open CompilationServer
+open Type
+open Typecore
+open CompletionItem
+open ClassFieldOrigin
+open DisplayTypes
+open Genjson
+open Globals
+
+let exclude : string list ref = ref []
+
+let explore_class_paths com timer class_paths recusive f_pack f_module =
+	let rec loop dir pack =
+		let dot_path = (String.concat "." (List.rev pack)) in
+		begin
+			if (List.mem dot_path !exclude) then
+				()
+			else try
+				let entries = Sys.readdir dir in
+				Array.iter (fun file ->
+					match file with
+						| "." | ".." ->
+							()
+						| _ when Sys.is_directory (dir ^ file) && file.[0] >= 'a' && file.[0] <= 'z' ->
+							begin try
+								begin match PMap.find file com.package_rules with
+									| Forbidden | Remap _ -> ()
+									| _ -> raise Not_found
+								end
+							with Not_found ->
+								f_pack (List.rev pack,file);
+								if recusive then loop (dir ^ file ^ "/") (file :: pack)
+							end
+						| _ ->
+							let l = String.length file in
+							if l > 3 && String.sub file (l - 3) 3 = ".hx" then begin
+								try
+									let name = String.sub file 0 (l - 3) in
+									let path = (List.rev pack,name) in
+									let dot_path = if dot_path = "" then name else dot_path ^ "." ^ name in
+									if (List.mem dot_path !exclude) then () else f_module (dir ^ file) path;
+								with _ ->
+									()
+							end
+				) entries;
+			with Sys_error _ ->
+				()
+		end
+	in
+	let t = Timer.timer (timer @ ["class path exploration"]) in
+	List.iter (fun dir -> loop dir []) class_paths;
+	t()
+
+let read_class_paths com timer =
+	explore_class_paths com timer (List.filter ((<>) "") com.class_path) true (fun _ -> ()) (fun file path ->
+		(* Don't parse the display file as that would maybe overwrite the content from stdin with the file contents. *)
+		if not (DisplayPosition.display_position#is_in_file file) then begin
+			let file,_,pack,_ = Display.parse_module' com path Globals.null_pos in
+			match CompilationServer.get() with
+			| Some cs when pack <> fst path ->
+				let file = Path.unique_full_path file in
+				(CommonCache.get_cache cs com)#remove_file_for_real file
+			| _ ->
+				()
+		end
+	)
+
+let init_or_update_server cs com timer_name =
+	let cc = CommonCache.get_cache cs com in
+	if not cc#is_initialized then begin
+		cc#set_initialized true;
+		read_class_paths com timer_name
+	end;
+	(* Iterate all removed files of the current context. If they aren't part of the context again,
+		re-parse them and remove them from c_removed_files. *)
+	let removed_files = cc#get_removed_files in
+	let removed_removed_files = DynArray.create () in
+	Hashtbl.iter (fun file () ->
+		DynArray.add removed_removed_files file;
+		try
+			ignore(cc#find_file file);
+		with Not_found ->
+			try ignore(TypeloadParse.parse_module_file com file null_pos) with _ -> ()
+	) removed_files;
+	DynArray.iter (Hashtbl.remove removed_files) removed_removed_files
+
+module CollectionContext = struct
+	open ImportStatus
+
+	type t = {
+		ctx   : typer;
+		items : CompletionItem.t DynArray.t;
+		names : (string,CompletionItem.t) Hashtbl.t;
+		paths : (Globals.path,bool) Hashtbl.t;
+	}
+
+	let create ctx = {
+		ctx = ctx;
+		items = DynArray.create ();
+		names = Hashtbl.create 0;
+		paths = Hashtbl.create 0;
+	}
+
+	let add_item ctx item name =
+		DynArray.add ctx.items item;
+		match name with
+		| None -> ()
+		| Some name -> Hashtbl.replace ctx.names name item
+
+	let get_import_status ctx is_import path =
+		try
+			let _ = Hashtbl.find ctx.names (snd path) in
+			(* TODO: do we have to check if we get the same thing? *)
+			Shadowed
+		with Not_found ->
+			let check_wildcard () =
+				List.exists (fun (sl,_) -> (sl,snd path) = path) ctx.ctx.m.wildcard_packages
+			in
+			if is_import || (fst path = []) || check_wildcard () then Imported else Unimported
+
+	let is_qualified ctx name =
+		not (Hashtbl.mem ctx.names name)
+
+	let path_exists ctx path = Hashtbl.mem ctx.paths path
+	let add_path ctx path = Hashtbl.add ctx.paths path true
+end
+
+open CollectionContext
+
+(* +1 for each matching package part. 0 = no common part *)
+let pack_similarity pack1 pack2 =
+	let rec loop count pack1 pack2 = match pack1,pack2 with
+		| [],[] -> count
+		| (s1 :: pack1),(s2 :: pack2) when s1 = s2 -> loop (count + 1) pack1 pack2
+		| _ -> count
+	in
+	loop 0 pack1 pack2
+
+(* Returns `true` if `pack1` contains or is `pack2` *)
+let pack_contains pack1 pack2 =
+	let rec loop pack1 pack2 = match pack1,pack2 with
+		| [],_ -> true
+		| (s1 :: pack1),(s2 :: pack2) when s1 = s2 -> loop pack1 pack2
+		| _ -> false
+	in
+	loop pack1 pack2
+
+let is_pack_visible pack =
+	not (List.exists (fun s -> String.length s > 0 && s.[0] = '_') pack)
+
+let collect ctx tk with_type =
+	let t = Timer.timer ["display";"toplevel"] in
+	let cctx = CollectionContext.create ctx in
+	let curpack = fst ctx.curclass.cl_path in
+	(* Note: This checks for the explicit `ServerConfig.legacy_completion` setting instead of using
+	   `is_legacy_completion com` because the latter is always false for the old protocol, yet we have
+	   tests which assume advanced completion even in the old protocol. This means that we can only
+	   use "legacy mode" in the new protocol. *)
+	let is_legacy_completion = !ServerConfig.legacy_completion in
+	let packages = Hashtbl.create 0 in
+	let add_package path = Hashtbl.replace packages path true in
+
+	let add item name = add_item cctx item name in
+
+	let add_type mt =
+		match mt with
+		| TClassDecl {cl_kind = KAbstractImpl _} -> ()
+		| _ ->
+			let path = (t_infos mt).mt_path in
+			let mname = snd (t_infos mt).mt_module.m_path in
+			let path = if snd path = mname then path else (fst path @ [mname],snd path) in
+			if not (path_exists cctx path) then begin
+				Display.merge_core_doc ctx mt;
+				let is = get_import_status cctx true path in
+				if not (Meta.has Meta.NoCompletion (t_infos mt).mt_meta) then begin
+					add (make_ci_type (CompletionModuleType.of_module_type mt) is None) (Some (snd path));
+					add_path cctx path;
+				end
+			end
+	in
+
+	let process_decls pack name decls =
+		let added_something = ref false in
+		let add item name =
+			added_something := true;
+			add item name
+		in
+		let run () = List.iter (fun (d,p) ->
+			begin try
+				let tname,is_private,meta = match d with
+					| EClass d -> fst d.d_name,List.mem HPrivate d.d_flags,d.d_meta
+					| EEnum d -> fst d.d_name,List.mem EPrivate d.d_flags,d.d_meta
+					| ETypedef d -> fst d.d_name,List.mem EPrivate d.d_flags,d.d_meta
+					| EAbstract d -> fst d.d_name,List.mem AbPrivate d.d_flags,d.d_meta
+					| _ -> raise Exit
+				in
+				let path = Path.full_dot_path pack name tname in
+				if not (path_exists cctx path) && not is_private && not (Meta.has Meta.NoCompletion meta) then begin
+					add_path cctx path;
+					(* If we share a package, the module's main type shadows everything with the same name. *)
+					let shadowing_name = if pack_contains pack curpack && tname = name then (Some name) else None in
+					(* Also, this means we can access it as if it was imported (assuming it's not shadowed by something else. *)
+					let is = get_import_status cctx (shadowing_name <> None) path in
+					add (make_ci_type (CompletionModuleType.of_type_decl pack name (d,p)) is None) shadowing_name
+				end
+			with Exit ->
+				()
+			end
+		) decls in
+		if is_pack_visible pack then run();
+		!added_something
+	in
+
+	(* Collection starts here *)
+
+	let tpair ?(values=PMap.empty) t =
+		let ct = CompletionType.from_type (Display.get_import_status ctx) ~values t in
+		(t,ct)
+	in
+	begin match tk with
+	| TKType | TKOverride -> ()
+	| TKExpr p | TKPattern p | TKField p ->
+		(* locals *)
+		PMap.iter (fun _ v ->
+			if not (is_gen_local v) then
+				add (make_ci_local v (tpair ~values:(get_value_meta v.v_meta) v.v_type)) (Some v.v_name)
+		) ctx.locals;
+
+		let add_field scope origin cf =
+			let is_qualified = is_qualified cctx cf.cf_name in
+			add (make_ci_class_field (CompletionClassField.make cf scope origin is_qualified) (tpair ~values:(get_value_meta cf.cf_meta) cf.cf_type)) (Some cf.cf_name)
+		in
+		let maybe_add_field scope origin cf =
+			if not (Meta.has Meta.NoCompletion cf.cf_meta) then add_field scope origin cf
+		in
+		(* member fields *)
+		if ctx.curfun <> FunStatic then begin
+			let all_fields = Type.TClass.get_all_fields ctx.curclass (List.map snd ctx.curclass.cl_params) in
+			PMap.iter (fun _ (c,cf) ->
+				let origin = if c == ctx.curclass then Self (TClassDecl c) else Parent (TClassDecl c) in
+				maybe_add_field CFSMember origin cf
+			) all_fields;
+			(* TODO: local using? *)
+		end;
+
+		(* statics *)
+		begin match ctx.curclass.cl_kind with
+		| KAbstractImpl ({a_impl = Some c} as a) ->
+			let origin = Self (TAbstractDecl a) in
+			List.iter (fun cf ->
+				if Meta.has Meta.Impl cf.cf_meta then begin
+					if ctx.curfun = FunStatic then ()
+					else begin
+						let cf = prepare_using_field cf in
+						maybe_add_field CFSMember origin cf
+					end
+				end else
+					maybe_add_field CFSStatic origin cf
+			) c.cl_ordered_statics
+		| _ ->
+			List.iter (maybe_add_field CFSStatic (Self (TClassDecl ctx.curclass))) ctx.curclass.cl_ordered_statics
+		end;
+
+		(* enum constructors *)
+		let rec enum_ctors t =
+			match t with
+			| TAbstractDecl ({a_impl = Some c} as a) when Meta.has Meta.Enum a.a_meta && not (path_exists cctx a.a_path) && ctx.curclass != c ->
+				add_path cctx a.a_path;
+				List.iter (fun cf ->
+					let ccf = CompletionClassField.make cf CFSMember (Self (decl_of_class c)) true in
+					if (Meta.has Meta.Enum cf.cf_meta) && not (Meta.has Meta.NoCompletion cf.cf_meta) then
+						add (make_ci_enum_abstract_field a ccf (tpair cf.cf_type)) (Some cf.cf_name);
+				) c.cl_ordered_statics
+			| TTypeDecl t ->
+				begin match follow t.t_type with
+					| TEnum (e,_) -> enum_ctors (TEnumDecl e)
+					| _ -> ()
+				end
+			| TEnumDecl e when not (path_exists cctx e.e_path) ->
+				add_path cctx e.e_path;
+				let origin = Self (TEnumDecl e) in
+				PMap.iter (fun _ ef ->
+					let is_qualified = is_qualified cctx ef.ef_name in
+					add (make_ci_enum_field (CompletionEnumField.make ef origin is_qualified) (tpair ef.ef_type)) (Some ef.ef_name)
+				) e.e_constrs;
+			| _ ->
+				()
+		in
+		List.iter enum_ctors ctx.m.curmod.m_types;
+		List.iter enum_ctors (List.map fst ctx.m.module_types);
+
+		(* enum constructors of expected type *)
+		begin match with_type with
+			| WithType.WithType(t,_) ->
+				(try enum_ctors (module_type_of_type t) with Exit -> ())
+			| _ -> ()
+		end;
+
+		(* imported globals *)
+		PMap.iter (fun name (mt,s,_) ->
+			try
+				let is_qualified = is_qualified cctx name in
+				let class_import c =
+					let cf = PMap.find s c.cl_statics in
+					let cf = if name = cf.cf_name then cf else {cf with cf_name = name} in
+					let decl,make = match c.cl_kind with
+						| KAbstractImpl a -> TAbstractDecl a,
+							if Meta.has Meta.Enum cf.cf_meta then make_ci_enum_abstract_field a else make_ci_class_field
+						| _ -> TClassDecl c,make_ci_class_field
+					in
+					let origin = StaticImport decl in
+					add (make (CompletionClassField.make cf CFSStatic origin is_qualified) (tpair ~values:(get_value_meta cf.cf_meta) cf.cf_type)) (Some name)
+				in
+				match resolve_typedef mt with
+					| TClassDecl c -> class_import c;
+					| TEnumDecl en ->
+						let ef = PMap.find s en.e_constrs in
+						let ef = if name = ef.ef_name then ef else {ef with ef_name = name} in
+						let origin = StaticImport (TEnumDecl en) in
+						add (make_ci_enum_field (CompletionEnumField.make ef origin is_qualified) (tpair ef.ef_type)) (Some s)
+					| TAbstractDecl {a_impl = Some c} -> class_import c;
+					| _ -> raise Not_found
+			with Not_found ->
+				()
+		) ctx.m.module_globals;
+
+		(* literals *)
+		add (make_ci_literal "null" (tpair t_dynamic)) (Some "null");
+		add (make_ci_literal "true" (tpair ctx.com.basic.tbool)) (Some "true");
+		add (make_ci_literal "false" (tpair ctx.com.basic.tbool)) (Some "false");
+		begin match ctx.curfun with
+			| FunMember | FunConstructor | FunMemberClassLocal ->
+				let t = TInst(ctx.curclass,List.map snd ctx.curclass.cl_params) in
+				add (make_ci_literal "this" (tpair t)) (Some "this");
+				begin match ctx.curclass.cl_super with
+					| Some(c,tl) -> add (make_ci_literal "super" (tpair (TInst(c,tl)))) (Some "super")
+					| None -> ()
+				end
+			| _ ->
+				()
+		end;
+
+		if not is_legacy_completion then begin
+			(* keywords *)
+			let kwds = [
+				Function; Var; Final; If; Else; While; Do; For; Break; Return; Continue; Switch;
+				Try; New; Throw; Untyped; Cast; Inline;
+			] in
+			List.iter (fun kwd -> add(make_ci_keyword kwd) (Some (s_keyword kwd))) kwds;
+
+			(* builtins *)
+			add (make_ci_literal "trace" (tpair (TFun(["value",false,t_dynamic],ctx.com.basic.tvoid)))) (Some "trace")
+		end
+	end;
+
+	(* type params *)
+	List.iter (fun (s,t) -> match follow t with
+		| TInst(c,_) ->
+			add (make_ci_type_param c (tpair t)) (Some (snd c.cl_path))
+		| _ -> assert false
+	) ctx.type_params;
+
+	(* module types *)
+	List.iter add_type ctx.m.curmod.m_types;
+
+	(* module imports *)
+	List.iter add_type (List.rev_map fst ctx.m.module_types); (* reverse! *)
+
+	(* types from files *)
+	begin match !CompilationServer.instance with
+	| None ->
+		(* offline: explore class paths *)
+		let class_paths = ctx.com.class_path in
+		let class_paths = List.filter (fun s -> s <> "") class_paths in
+		explore_class_paths ctx.com ["display";"toplevel"] class_paths true add_package (fun file path ->
+			if not (path_exists cctx path) then begin
+				let _,decls = Display.parse_module ctx path Globals.null_pos in
+				ignore(process_decls (fst path) (snd path) decls)
+			end
+		)
+	| Some cs ->
+		(* online: iter context files *)
+		init_or_update_server cs ctx.com ["display";"toplevel"];
+		let cc = CommonCache.get_cache cs ctx.com in
+		let files = cc#get_files in
+		(* Sort files by reverse distance of their package to our current package. *)
+		let files = Hashtbl.fold (fun file cfile acc ->
+			let i = pack_similarity curpack cfile.c_package in
+			((file,cfile),i) :: acc
+		) files [] in
+		let files = List.sort (fun (_,i1) (_,i2) -> -compare i1 i2) files in
+		let check_package pack = match List.rev pack with
+			| [] -> ()
+			| s :: sl -> add_package (List.rev sl,s)
+		in
+		List.iter (fun ((file,cfile),_) ->
+			let module_name = CompilationServer.get_module_name_of_cfile file cfile in
+			let dot_path = s_type_path (cfile.c_package,module_name) in
+			(* In legacy mode we only show toplevel types. *)
+			if is_legacy_completion && cfile.c_package <> [] then begin
+				(* And only toplevel packages. *)
+				match cfile.c_package with
+				| [s] -> add_package ([],s)
+				| _ -> ()
+			end else if (List.exists (fun e -> ExtString.String.starts_with dot_path (e ^ ".")) !exclude) then
+				()
+			else begin
+				Hashtbl.replace ctx.com.module_to_file (cfile.c_package,module_name) file;
+				if process_decls cfile.c_package module_name cfile.c_decls then check_package cfile.c_package;
+			end
+		) files;
+		List.iter (fun file ->
+			match cs#get_native_lib file with
+			| Some lib ->
+				Hashtbl.iter (fun path (pack,decls) ->
+					if process_decls pack (snd path) decls then check_package pack;
+				) lib.c_nl_files
+			| None ->
+				()
+		) ctx.com.native_libs.all_libs
+	end;
+
+	(* packages *)
+	Hashtbl.iter (fun path _ ->
+		let full_pack = fst path @ [snd path] in
+		if is_pack_visible full_pack then add (make_ci_package path []) (Some (snd path))
+	) packages;
+
+	(* sorting *)
+	let l = DynArray.to_list cctx.items in
+	let l = if is_legacy_completion then
+		List.sort (fun item1 item2 -> compare (get_name item1) (get_name item2)) l
+	else
+		Display.sort_fields l with_type tk
+	in
+	t();
+	l
+
+let collect_and_raise ctx tk with_type cr (name,pname) pinsert =
+	let fields = match !DisplayException.last_completion_pos with
+	| Some p' when pname.pmin = p'.pmin ->
+		Array.to_list (!DisplayException.last_completion_result)
+	| _ ->
+		collect ctx tk with_type
+	in
+	DisplayException.raise_fields fields cr (make_subject (Some name) ~start_pos:(Some pname) pinsert)
+
+let handle_unresolved_identifier ctx i p only_types =
+	let l = collect ctx (if only_types then TKType else TKExpr p) NoValue in
+	let cl = List.map (fun it ->
+		let s = CompletionItem.get_name it in
+		let i = StringError.levenshtein i s in
+		(s,it,i),i
+	) l in
+	let cl = List.sort (fun (_,c1) (_,c2) -> compare c1 c2) cl in
+	let cl = StringError.filter_similar (fun (s,_,_) r -> r <= (min (String.length s) (String.length i)) / 3) cl in
+	ctx.com.display_information.unresolved_identifiers <- (i,p,cl) :: ctx.com.display_information.unresolved_identifiers
diff --git a/src/context/display/documentSymbols.ml b/src/context/display/documentSymbols.ml
new file mode 100644
index 0000000000000000000000000000000000000000..983c99177711a0746b6340960c2b6e6fb459a4b4
--- /dev/null
+++ b/src/context/display/documentSymbols.ml
@@ -0,0 +1,126 @@
+open Ast
+
+open DisplayTypes.SymbolKind
+
+let collect_module_symbols with_locals (pack,decls) =
+	let l = DynArray.create() in
+	let add name kind location parent deprecated =
+		let si = DisplayTypes.SymbolInformation.make name kind location (if parent = "" then None else Some parent) deprecated in
+		DynArray.add l si;
+	in
+	let rec expr parent (e,p) =
+		let add name kind location = add name kind location parent in
+		begin match e with
+		| EVars vl ->
+			List.iter (fun ((s,p),_,_,eo) ->
+				add s Variable p false;
+				expr_opt parent eo
+			) vl
+		| ETry(e1,catches) ->
+			expr parent e1;
+			List.iter (fun ((s,p),_,e,_) ->
+				add s Variable p false;
+				expr parent e
+			) catches;
+		| EFunction(FKNamed ((s,_),_),f) ->
+			add s Function p false;
+			func parent f
+		| EBinop(OpIn,(EConst(Ident s),p),e2) ->
+			add s Variable p false;
+			expr parent e2;
+		| _ ->
+			iter_expr (expr parent) (e,p)
+		end
+	and expr_opt parent eo = match eo with
+		| None -> ()
+		| Some e -> expr parent e
+	and func parent f =
+		List.iter (fun ((s,p),_,_,_,eo) ->
+			add s Variable p parent false;
+			expr_opt parent eo
+		) f.f_args;
+		expr_opt parent f.f_expr
+	in
+	let is_deprecated meta = Meta.has Meta.Deprecated meta in
+	let field parent cff =
+		let field_parent = parent ^ "." ^ (fst cff.cff_name) in
+		let add_field kind = add (fst cff.cff_name) kind cff.cff_pos parent (is_deprecated cff.cff_meta) in
+		match cff.cff_kind with
+		| FVar(_,eo) ->
+			add_field Field;
+			if with_locals then expr_opt field_parent eo
+		| FFun f ->
+			add_field (if fst cff.cff_name = "new" then Constructor else Method);
+			if with_locals then func field_parent f
+		| FProp(_,_,_,eo) ->
+			add_field Property;
+			if with_locals then expr_opt field_parent eo
+	in
+	List.iter (fun (td,p) -> match td with
+		| EImport _ | EUsing _ ->
+			() (* TODO: Can we do anything with these? *)
+		| EClass d ->
+			add (fst d.d_name) (if List.mem HInterface d.d_flags then Interface else Class) p "" (is_deprecated d.d_meta);
+			List.iter (field (fst d.d_name)) d.d_data
+		| EEnum d ->
+			add (fst d.d_name) Enum p "" (is_deprecated d.d_meta);
+			List.iter (fun ef ->
+				add (fst ef.ec_name) Method ef.ec_pos (fst d.d_name) (is_deprecated ef.ec_meta)
+			) d.d_data
+		| ETypedef d ->
+			add (fst d.d_name) Typedef p "" (is_deprecated d.d_meta);
+			(match d.d_data with
+			| CTAnonymous fields,_ ->
+				List.iter (field (fst d.d_name)) fields
+			| _ -> ())
+		| EAbstract d ->
+			add (fst d.d_name) Abstract p "" (is_deprecated d.d_meta);
+			List.iter (field (fst d.d_name)) d.d_data
+	) decls;
+	l
+
+module Printer = struct
+	open Json
+	open DisplayTypes.SymbolKind
+	open DisplayTypes.SymbolInformation
+
+	let print_module_symbols com symbols filter =
+		let regex = Option.map Str.regexp_case_fold filter in
+		let reported = Hashtbl.create 0 in
+		let add si =
+			if Hashtbl.mem reported si.pos then false
+			else begin
+				let b = match regex with
+					| None -> true
+					| Some regex -> (try ignore(Str.search_forward regex si.name 0); true with Not_found -> false)
+				in
+				Hashtbl.replace reported si.pos true;
+				b
+			end
+		in
+		let ja = List.fold_left (fun acc (file,l) ->
+			let jl = ExtList.List.filter_map (fun si ->
+				if not (add si) then
+					None
+				else begin
+					let l =
+						("name",JString si.name) ::
+						("kind",JInt (to_int si.kind)) ::
+						("range", Genjson.generate_pos_as_range si.pos) ::
+						(match si.container_name with None -> [] | Some s -> ["containerName",JString s])
+					in
+					let l = if si.deprecated then ("isDeprecated",JBool true) :: l else l in
+					Some (JObject l)
+				end
+			) (DynArray.to_list l) in
+			if jl = [] then
+				acc
+			else
+				(JObject [
+					"file",JString file;
+					"symbols",JArray jl
+				]) :: acc
+		) [] symbols in
+		let js = JArray ja in
+		string_of_json js
+end
\ No newline at end of file
diff --git a/src/context/display/findReferences.ml b/src/context/display/findReferences.ml
new file mode 100644
index 0000000000000000000000000000000000000000..1621714df68d5035545d4d46c47d4927ee99fa39
--- /dev/null
+++ b/src/context/display/findReferences.ml
@@ -0,0 +1,194 @@
+open Globals
+open Ast
+open DisplayTypes
+open Common
+open Typecore
+open CompilationServer
+open ImportHandling
+
+let find_possible_references kind name (pack,decls) =
+	(* Employ some heuristics: We know what kind of symbol we are looking for, so let's
+	   filter where we can. *)
+	let check kind' name' =
+		if name = name' then match kind',kind with
+			| KIdent,_
+			| KAnyField,(KAnyField | KClassField | KEnumField)
+			| KClassField,KClassField
+			| KEnumField,KEnumField
+			| KModuleType,KModuleType
+			| KConstructor,(KConstructor | KModuleType) ->
+				raise Exit
+			| _ ->
+				()
+	in
+	let rec type_path kind path =
+		check KModuleType path.tname;
+		Option.may (check KModuleType) path.tsub;
+		List.iter (function
+			| TPType th -> type_hint th
+			| TPExpr e -> expr e
+		) path.tparams
+	and type_hint th = match fst th with
+		| CTPath path -> type_path KModuleType path
+		| CTParent th | CTOptional th | CTNamed(_,th) -> type_hint th
+		| CTFunction(thl,th) ->
+			List.iter type_hint thl;
+			type_hint th;
+		| CTAnonymous cffl ->
+			List.iter field cffl
+		| CTExtend(tl,cffl) ->
+			List.iter (fun (path,_) -> type_path KModuleType path) tl;
+			List.iter field cffl;
+		| CTIntersection tl ->
+			List.iter type_hint tl
+	and type_param tp =
+		List.iter type_param tp.tp_params;
+		Option.may type_hint tp.tp_constraints
+	and expr (e,p) =
+		begin match e with
+		| EConst(Ident s) ->
+			check KIdent s
+		| EField(e1,s) ->
+			expr e1;
+			check KAnyField s;
+		| EVars vl ->
+			List.iter (fun (_,_,tho,eo) ->
+				Option.may type_hint tho;
+				expr_opt eo
+			) vl;
+		| ECast(e1,tho) ->
+			expr e1;
+			Option.may type_hint tho;
+		| ENew((path,_),el) ->
+			type_path KConstructor path;
+			List.iter expr el;
+		| EFunction(_,f) ->
+			func f
+		| ETry(e1,catches) ->
+			expr e1;
+			List.iter (fun (_,th,e,_) ->
+				type_hint th;
+				expr e
+			) catches;
+		| ECheckType(e1,th) ->
+			expr e1;
+			type_hint th;
+		| _ ->
+			iter_expr expr (e,p)
+		end
+	and expr_opt eo = match eo with
+		| None -> ()
+		| Some e -> expr e
+	and func f =
+		List.iter (fun ((s,p),_,_,tho,eo) ->
+			Option.may type_hint tho;
+			expr_opt eo
+		) f.f_args;
+		List.iter type_param f.f_params;
+		Option.may type_hint f.f_type;
+		expr_opt f.f_expr
+	and field cff =
+		check KClassField (fst cff.cff_name);
+		match cff.cff_kind with
+		| FVar(tho,eo) ->
+			Option.may type_hint tho;
+			expr_opt eo
+		| FFun f ->
+			func f
+		| FProp(_,_,tho,eo) ->
+			Option.may type_hint tho;
+			expr_opt eo
+	in
+	List.iter (fun (td,p) -> match td with
+		| EImport(path,_) | EUsing path ->
+			begin match fst (ImportHandling.convert_import_to_something_usable null_pos path) with
+			| IDKModule(_,s) -> check KModuleType s
+			| IDKSubType(_,s1,s2) ->
+				check KModuleType s1;
+				check KModuleType s2;
+			| IDKSubTypeField(_,s1,s2,s3) ->
+				check KModuleType s1;
+				check KModuleType s2;
+				check KAnyField s3;
+			| IDKModuleField(_,s1,s2) ->
+				check KModuleType s1;
+				check KAnyField s2;
+			| IDKPackage _ | IDK ->
+				()
+			end;
+		| EClass d ->
+			check KModuleType (fst d.d_name);
+			List.iter (function
+				| HExtends(path,_) | HImplements(path,_) -> type_path KModuleType path
+				| _ -> ()
+			) d.d_flags;
+			List.iter type_param d.d_params;
+			List.iter field d.d_data
+		| EEnum d ->
+			check KModuleType (fst d.d_name);
+			List.iter (fun ef ->
+				Option.may type_hint ef.ec_type;
+				check KEnumField (fst ef.ec_name);
+				List.iter type_param ef.ec_params;
+			) d.d_data;
+			List.iter type_param d.d_params;
+		| ETypedef d ->
+			check KModuleType (fst d.d_name);
+			List.iter type_param d.d_params;
+			type_hint d.d_data;
+		| EAbstract d ->
+			check KModuleType (fst d.d_name);
+			List.iter field d.d_data;
+			List.iter type_param d.d_params;
+			List.iter (function
+				| AbFrom th | AbTo th | AbOver th -> type_hint th
+				| _ -> ()
+			) d.d_flags;
+	) decls
+
+let find_possible_references tctx cs =
+	let name,pos,kind = Display.ReferencePosition.get () in
+	DisplayToplevel.init_or_update_server cs tctx.com ["display";"references"];
+	let cc = CommonCache.get_cache cs tctx.com in
+	let files = cc#get_files in
+	let modules = cc#get_modules in
+	let t = Timer.timer ["display";"references";"candidates"] in
+	Hashtbl.iter (fun file cfile ->
+		let module_name = CompilationServer.get_module_name_of_cfile file cfile in
+		if not (Hashtbl.mem modules (cfile.c_package,module_name)) then try
+			find_possible_references kind name (cfile.c_package,cfile.c_decls);
+		with Exit ->
+			begin try
+				ignore(tctx.g.do_load_module tctx (cfile.c_package,module_name) null_pos);
+				(* We have to flush immediately so we catch exceptions from weird modules *)
+				Typecore.flush_pass tctx Typecore.PFinal "final";
+			with _ ->
+				()
+			end
+	) files;
+	t();
+	()
+
+let find_references tctx com with_definition =
+	let name,pos,kind = Display.ReferencePosition.get () in
+	let t = Timer.timer ["display";"references";"collect"] in
+	let symbols,relations = Statistics.collect_statistics tctx (SFPos pos) in
+	t();
+	let rec loop acc relations = match relations with
+		| (Statistics.Referenced,p) :: relations -> loop (p :: acc) relations
+		| _ :: relations -> loop acc relations
+		| [] -> acc
+	in
+	let t = Timer.timer ["display";"references";"filter"] in
+	let usages = Hashtbl.fold (fun p sym acc ->
+		let acc = if with_definition then p :: acc else acc in
+		(try loop acc (Hashtbl.find relations p)
+		with Not_found -> acc)
+	) symbols [] in
+	let usages = List.sort (fun p1 p2 ->
+		let c = compare p1.pfile p2.pfile in
+		if c <> 0 then c else compare p1.pmin p2.pmin
+	) usages in
+	t();
+	Display.ReferencePosition.set ("",null_pos,KVar);
+	DisplayException.raise_positions usages
\ No newline at end of file
diff --git a/src/context/display/importHandling.ml b/src/context/display/importHandling.ml
new file mode 100644
index 0000000000000000000000000000000000000000..14ea6e1021d07a8020e81a4bf8cf8b724ecdb58b
--- /dev/null
+++ b/src/context/display/importHandling.ml
@@ -0,0 +1,59 @@
+open Globals
+open Ast
+open DisplayPosition
+open Common
+open Typecore
+
+type import_display_kind =
+	| IDKPackage of string list
+	| IDKModule of string list * string
+	| IDKSubType of string list * string * string
+	| IDKModuleField of string list * string * string
+	| IDKSubTypeField of string list * string * string * string
+	| IDK
+
+type import_display = import_display_kind * pos
+
+let convert_import_to_something_usable pt path =
+	let rec loop pack m t = function
+		| (s,p) :: l ->
+			let is_lower = is_lower_ident s in
+			let is_display_pos = encloses_position pt p in
+			begin match is_lower,m,t with
+				| _,None,Some _ ->
+					assert false (* impossible, I think *)
+				| true,Some m,None ->
+					if is_display_pos then (IDKModuleField(List.rev pack,m,s),p)
+					else (IDK,p) (* assume that we're done *)
+				| _,Some m,Some t ->
+					if is_display_pos then (IDKSubTypeField(List.rev pack,m,t,s),p)
+					else (IDK,p)
+				| true,None,None ->
+					if is_display_pos then (IDKPackage (List.rev (s :: pack)),p)
+					else loop (s :: pack) m t l
+				| false,Some sm,None ->
+					if is_display_pos then (IDKSubType (List.rev pack,sm,s),p)
+					else loop pack m (Some s) l
+				| false,None,None ->
+					if is_display_pos then (IDKModule (List.rev pack,s),p)
+					else loop pack (Some s) None l
+			end
+		| [] ->
+			(IDK,null_pos)
+	in
+	loop [] None None path
+
+let add_import_position com p path =
+	let infos = com.shared.shared_display_information in
+	if not (PMap.mem p infos.import_positions) then
+		infos.import_positions <- PMap.add p (ref false,path) infos.import_positions
+
+let mark_import_position com p =
+	try
+		let r = fst (PMap.find p com.shared.shared_display_information.import_positions) in
+		r := true
+	with Not_found ->
+		()
+
+let maybe_mark_import_position ctx p =
+	if Diagnostics.is_diagnostics_run p then mark_import_position ctx.com p
\ No newline at end of file
diff --git a/src/context/display/statistics.ml b/src/context/display/statistics.ml
new file mode 100644
index 0000000000000000000000000000000000000000..17a59124953ca0ab55fa136b56103c74f88c5c28
--- /dev/null
+++ b/src/context/display/statistics.ml
@@ -0,0 +1,280 @@
+open Globals
+open Ast
+open Type
+open Common
+open Typecore
+
+open ImportHandling
+
+type relation =
+	| Implemented
+	| Extended
+	| Overridden
+	| Referenced
+
+type symbol =
+	| SKClass of tclass
+	| SKInterface of tclass
+	| SKEnum of tenum
+	| SKTypedef of tdef
+	| SKAbstract of tabstract
+	| SKField of tclass_field
+	| SKEnumField of tenum_field
+	| SKVariable of tvar
+
+type statistics_filter =
+	| SFNone
+	| SFPos of pos
+	| SFFile of string
+
+let collect_statistics ctx pfilter =
+	let relations = Hashtbl.create 0 in
+	let symbols = Hashtbl.create 0 in
+	let handled_modules = Hashtbl.create 0 in
+	let full_path =
+		let paths = Hashtbl.create 0 in
+		(fun path ->
+			try
+				Hashtbl.find paths path
+			with Not_found ->
+				let unique = Path.unique_full_path path in
+				Hashtbl.add paths path unique;
+				unique
+		)
+	in
+	let check_pos = match pfilter with
+		| SFNone -> (fun p -> p <> null_pos)
+		| SFPos p -> (fun p' -> p.pmin = p'.pmin && p.pmax = p'.pmax && p.pfile = full_path p'.pfile)
+		| SFFile s -> (fun p -> full_path p.pfile = s)
+	in
+	let add_relation p r =
+		if check_pos p then try
+			let l = Hashtbl.find relations p in
+			if not (List.mem r l) then
+				Hashtbl.replace relations p (r :: l)
+		with Not_found ->
+			Hashtbl.add relations p [r]
+	in
+	let declare kind p =
+		if check_pos p then begin
+			if not (Hashtbl.mem relations p) then Hashtbl.add relations p [];
+			Hashtbl.replace symbols p kind;
+		end
+	in
+	let collect_overrides c =
+		List.iter (fun cf ->
+			let rec loop c = match c.cl_super with
+				| Some (c,_) ->
+					begin try
+						let cf' = PMap.find cf.cf_name c.cl_fields in
+						add_relation cf'.cf_name_pos (Overridden,cf.cf_pos)
+					with Not_found ->
+						loop c
+					end
+				| _ ->
+					()
+			in
+			loop c
+		) c.cl_overrides
+	in
+	let rec find_real_constructor c = match c.cl_constructor,c.cl_super with
+		(* The pos comparison might be a bit weak, not sure... *)
+		| Some cf,_ when not (Meta.has Meta.CompilerGenerated cf.cf_meta) && c.cl_pos <> cf.cf_pos -> cf
+		| _,Some(c,_) -> find_real_constructor c
+		| _,None -> raise Not_found
+	in
+	let var_decl v = declare (SKVariable v) v.v_pos in
+	let patch_string_pos p s = { p with pmin = p.pmax - String.length s } in
+	let field_reference cf p =
+		add_relation cf.cf_name_pos (Referenced,patch_string_pos p cf.cf_name)
+	in
+	let collect_references c e =
+		let rec loop e = match e.eexpr with
+			| TField(e1,fa) ->
+				(* Check if the sub-expression is actually shorter than the whole one. This should
+					detect cases where it was automatically generated. *)
+				if e1.epos.pmin = e.epos.pmin && e1.epos.pmax <> e.epos.pmax then
+					loop e1;
+				begin match fa with
+					| FStatic(_,cf) | FInstance(_,_,cf) | FClosure(_,cf) ->
+						field_reference cf e.epos
+					| FAnon cf ->
+						declare  (SKField cf) cf.cf_name_pos;
+						field_reference cf e.epos
+					| FEnum(_,ef) ->
+						add_relation ef.ef_name_pos (Referenced,patch_string_pos e.epos ef.ef_name)
+					| FDynamic _ ->
+						()
+				end
+			| TTypeExpr mt ->
+				let tinfos = t_infos mt in
+				add_relation tinfos.mt_name_pos (Referenced,patch_string_pos e.epos (snd tinfos.mt_path))
+			| TNew(c,_,el) ->
+				List.iter loop el;
+				(try add_relation (find_real_constructor c).cf_name_pos (Referenced,e.epos) with Not_found -> ());
+			| TCall({eexpr = TConst TSuper},el) ->
+				List.iter loop el;
+				begin match c.cl_super with
+					| Some(c,_) -> (try add_relation (find_real_constructor c).cf_name_pos (Referenced,e.epos) with Not_found -> ())
+					| None -> ()
+				end
+			| TVar(v,eo) ->
+				Option.may loop eo;
+				var_decl v;
+			| TFor(v,e1,e2) ->
+				var_decl v;
+				loop e1;
+				loop e2;
+			| TFunction tf ->
+				List.iter (fun (v,_) -> var_decl v) tf.tf_args;
+				loop tf.tf_expr;
+			| TLocal v when e.epos.pmax - e.epos.pmin = String.length v.v_name ->
+				add_relation v.v_pos (Referenced,e.epos)
+			| _ ->
+				Type.iter loop e
+		in
+		loop e
+	in
+	let check_module m =
+		if not (Hashtbl.mem handled_modules m.m_path) then begin
+			Hashtbl.add handled_modules m.m_path true;
+			List.iter (fun (p1,p2) ->
+				add_relation p1 (Referenced,p2)
+			) m.m_extra.m_display.m_inline_calls;
+			List.iter (fun (p,pn) -> add_relation pn (Referenced,p)) m.m_extra.m_display.m_type_hints
+		end
+	in
+	let f = function
+		| TClassDecl c ->
+			check_module c.cl_module;
+			declare (if c.cl_interface then (SKInterface c) else (SKClass c)) c.cl_name_pos;
+			List.iter (fun (c',_) -> add_relation c'.cl_name_pos ((if c.cl_interface then Extended else Implemented),c.cl_name_pos)) c.cl_implements;
+			begin match c.cl_super with
+				| None -> ()
+				| Some (c',_) -> add_relation c'.cl_name_pos (Extended,c.cl_name_pos);
+			end;
+			collect_overrides c;
+			let field cf =
+				if cf.cf_pos.pmin > c.cl_name_pos.pmin then declare (SKField cf) cf.cf_name_pos;
+				let _ = follow cf.cf_type in
+				match cf.cf_expr with None -> () | Some e -> collect_references c e
+			in
+			Option.may field c.cl_constructor;
+			List.iter field c.cl_ordered_fields;
+			List.iter field c.cl_ordered_statics;
+		| TEnumDecl en ->
+			check_module en.e_module;
+			declare (SKEnum en) en.e_name_pos;
+			PMap.iter (fun _ ef -> declare (SKEnumField ef) ef.ef_name_pos) en.e_constrs
+		| TTypeDecl td ->
+			check_module td.t_module;
+			declare (SKTypedef td) td.t_name_pos
+		| TAbstractDecl a ->
+			check_module a.a_module;
+			declare (SKAbstract a) a.a_name_pos
+	in
+	let rec loop com =
+		List.iter f com.types;
+		Option.may loop (com.get_macros())
+	in
+	loop ctx.com;
+	let l = List.fold_left (fun acc (_,cfi,_,cfo) -> match cfo with
+		| Some cf -> if List.mem_assoc cf.cf_name_pos acc then acc else (cf.cf_name_pos,cfi.cf_name_pos) :: acc
+		| None -> acc
+	) [] ctx.com.display_information.interface_field_implementations in
+	List.iter (fun (p,p') -> add_relation p' (Implemented,p)) l;
+	(* let deal_with_imports paths =
+		let check_subtype m s p =
+			try
+				let mt = List.find (fun mt -> snd (t_infos mt).mt_path = s) m.m_types in
+				add_relation (t_infos mt).mt_name_pos (Referenced,p);
+				Some mt
+			with Not_found ->
+				None
+		in
+		let check_module path p =
+			let m = ctx.g.do_load_module ctx path p in
+			m
+		in
+		let check_field c s p =
+			let cf = PMap.find s c.cl_statics in
+			add_relation cf.cf_name_pos (Referenced,p)
+		in
+		let check_subtype_field m ssub psub sfield pfield = match check_subtype m ssub psub with
+			| Some (TClassDecl c) -> check_field c sfield pfield
+			| _ -> ()
+		in
+		PMap.iter (fun p (_,path) ->
+			match ImportHandling.convert_import_to_something_usable { p with pmin = p.pmax - 1; pmax = p.pmax - 1 } path,List.rev path with
+			| (IDKSubType(sl,s1,s2),_),(_,psubtype) :: (_,pmodule) :: _ ->
+				let m = check_module (sl,s1) pmodule in
+				(*ignore(check_subtype m s1 pmodule);*)
+				ignore(check_subtype m s2 psubtype)
+			| (IDKModuleField(sl,s1,s2),_),(_,pfield) :: (_,pmodule) :: _ ->
+				let m = check_module (sl,s1) pmodule in
+				check_subtype_field m s1 pmodule s2 pfield
+			| (IDKSubTypeField(sl,s1,s2,s3),_),(_,pfield) :: (_,psubtype) :: (_,pmodule) :: _ ->
+				let m = check_module (sl,s1) pmodule in
+				check_subtype_field m s2 psubtype s3 pfield
+			| (IDKModule(sl,s),_),(_,pmodule) :: _ ->
+				let m = check_module (sl,s) pmodule in
+				ignore(check_subtype m s pmodule);
+			| _ ->
+				()
+		) paths
+	in
+	if false then deal_with_imports ctx.com.shared.shared_display_information.import_positions; *)
+	symbols,relations
+
+module Printer = struct
+	open Json
+
+	let relation_to_string = function
+		| Implemented -> "implementers"
+		| Extended -> "subclasses"
+		| Overridden -> "overrides"
+		| Referenced -> "references"
+
+	let symbol_to_string = function
+		| SKClass _ -> "class type"
+		| SKInterface _ -> "interface type"
+		| SKEnum _ -> "enum type"
+		| SKTypedef _ -> "typedef"
+		| SKAbstract _ -> "abstract"
+		| SKField _ -> "class field"
+		| SKEnumField _ -> "enum field"
+		| SKVariable _ -> "variable"
+
+	let print_statistics (kinds,relations) =
+		let files = Hashtbl.create 0 in
+		Hashtbl.iter (fun p rl ->
+			let file = Path.get_real_path p.pfile in
+			try
+				Hashtbl.replace files file ((p,rl) :: Hashtbl.find files file)
+			with Not_found ->
+				Hashtbl.add files file [p,rl]
+		) relations;
+		let ja = Hashtbl.fold (fun file relations acc ->
+			let l = List.map (fun (p,rl) ->
+				let h = Hashtbl.create 0 in
+				List.iter (fun (r,p) ->
+					let s = relation_to_string r in
+					let jo = JObject [
+						"range",Genjson.generate_pos_as_range p;
+						"file",JString (Path.get_real_path p.pfile);
+					] in
+					try Hashtbl.replace h s (jo :: Hashtbl.find h s)
+					with Not_found -> Hashtbl.add h s [jo]
+				) rl;
+				let l = Hashtbl.fold (fun s js acc -> (s,JArray js) :: acc) h [] in
+				let l = ("range",Genjson.generate_pos_as_range p) :: l in
+				let l = try ("kind",JString (symbol_to_string (Hashtbl.find kinds p))) :: l with Not_found -> l in
+				JObject l
+			) relations in
+			(JObject [
+				"file",JString file;
+				"statistics",JArray l
+			]) :: acc
+		) files [] in
+		string_of_json (JArray ja)
+end
\ No newline at end of file
diff --git a/src/context/memory.ml b/src/context/memory.ml
new file mode 100644
index 0000000000000000000000000000000000000000..6be1380fa59083e3571398d61a2b64dd5377a8a5
--- /dev/null
+++ b/src/context/memory.ml
@@ -0,0 +1,289 @@
+open Globals
+open CompilationServer
+open Common
+open Type
+open Genjson
+
+type memory_request =
+	| MCache
+	| MContext of string
+	| MModule of string * path
+
+let clear_descendants md =
+	List.iter (function
+		| TClassDecl c ->
+			c.cl_descendants <- []
+		| _ ->
+			()
+	) md.m_types
+
+let update_module_type_deps deps md =
+	let deps = ref (Obj.repr md :: deps) in
+	List.iter (fun t ->
+		match t with
+		| TClassDecl c ->
+			deps := Obj.repr c :: !deps;
+			c.cl_descendants <- []; (* prevent false positive *)
+			List.iter (fun f -> deps := Obj.repr f :: !deps) c.cl_ordered_statics;
+			List.iter (fun f -> deps := Obj.repr f :: !deps) c.cl_ordered_fields;
+		| TEnumDecl e ->
+			deps := Obj.repr e :: !deps;
+			List.iter (fun n -> deps := Obj.repr (PMap.find n e.e_constrs) :: !deps) e.e_names;
+		| TTypeDecl t -> deps := Obj.repr t :: !deps;
+		| TAbstractDecl a -> deps := Obj.repr a :: !deps;
+	) md.m_types;
+	!deps
+
+let rec scan_module_deps m h =
+	if Hashtbl.mem h m.m_id then
+		()
+	else begin
+		Hashtbl.add h m.m_id m;
+		PMap.iter (fun _ m -> scan_module_deps m h) m.m_extra.m_deps
+	end
+
+let module_sign key md =
+	if md.m_extra.m_sign = key then "" else "(" ^ (try Digest.to_hex md.m_extra.m_sign with _ -> "???" ^ md.m_extra.m_sign) ^ ")"
+
+let collect_leaks m deps out =
+	let leaks = ref [] in
+	let leak s =
+		leaks := s :: !leaks
+	in
+	if (Objsize.objsize m deps [Obj.repr Common.memory_marker]).Objsize.reached then leak "common";
+	if (Objsize.objsize m deps [Obj.repr Typecore.memory_marker]).Objsize.reached then leak "typecore";
+	PMap.iter (fun _ md ->
+		if (Objsize.objsize m deps [Obj.repr md]).Objsize.reached then leak (s_type_path md.m_path ^ module_sign m.m_extra.m_sign md);
+	) out;
+	!leaks
+
+let get_out out =
+	Obj.repr Common.memory_marker :: Obj.repr Typecore.memory_marker :: PMap.fold (fun m acc -> Obj.repr m :: acc) out []
+
+let get_module_memory cs all_modules m =
+	let mdeps = Hashtbl.create 0 in
+	scan_module_deps m mdeps;
+	let deps = ref [Obj.repr null_module] in
+	let out = ref all_modules in
+	let deps = Hashtbl.fold (fun _ md deps ->
+		out := PMap.remove md.m_id !out;
+		if m == md then
+			deps
+		else
+			update_module_type_deps deps md;
+	) mdeps !deps in
+	clear_descendants m;
+	let out = !out in
+	let chk = get_out out in
+	let inf = Objsize.objsize m deps chk in
+	let leaks = if inf.reached then collect_leaks m deps out else [] in
+	(Objsize.size_with_headers inf,(inf.reached,deps,out,leaks))
+
+let fmt_size sz =
+	if sz < 1024 then
+		string_of_int sz ^ " B"
+	else if sz < 1024*1024 then
+		string_of_int (sz asr 10) ^ " KB"
+	else
+		Printf.sprintf "%.1f MB" ((float_of_int sz) /. (1024.*.1024.))
+
+let fmt_word f =
+	fmt_size (int_of_float f * (Sys.word_size / 8))
+
+let size v =
+	fmt_size (mem_size v)
+
+let get_memory_json (cs : CompilationServer.t) mreq =
+	begin match mreq with
+	| MCache ->
+		let old_gc = Gc.get() in
+		Gc.set { old_gc with
+			Gc.max_overhead = 0;
+			Gc.space_overhead = 0
+		};
+		Gc.compact();
+		Gc.set old_gc;
+		let stat = Gc.quick_stat() in
+		let size = (float_of_int stat.Gc.heap_words) *. (float_of_int (Sys.word_size / 8)) in
+		let cache_mem = cs#get_pointers in
+		let contexts = cs#get_contexts in
+		let j_contexts = List.map (fun cc -> jobject [
+			"context",cc#get_json;
+			"size",jint (mem_size cc);
+		]) contexts in
+		jobject [
+			"contexts",jarray j_contexts;
+			"memory",jobject [
+				"totalCache",jint (mem_size cs);
+				"contextCache",jint (mem_size cache_mem.(0));
+				"haxelibCache",jint (mem_size cache_mem.(1));
+				"directoryCache",jint (mem_size cache_mem.(2));
+				"nativeLibCache",jint (mem_size cache_mem.(3));
+				"additionalSizes",jarray [
+					jobject ["name",jstring "macro interpreter";"size",jint (mem_size (MacroContext.macro_interp_cache))];
+					jobject ["name",jstring "macro stdlib";"size",jint (mem_size (EvalContext.GlobalState.stdlib))];
+					jobject ["name",jstring "macro macro_lib";"size",jint (mem_size (EvalContext.GlobalState.macro_lib))];
+					jobject ["name",jstring "last completion result";"size",jint (mem_size (DisplayException.last_completion_result))];
+					jobject ["name",jstring "Lexer file cache";"size",jint (mem_size (Lexer.all_files))];
+					jobject ["name",jstring "GC heap words";"size",jint (int_of_float size)];
+				];
+			]
+		]
+	| MContext sign ->
+		let cc = cs#get_context sign in
+		let all_modules = List.fold_left (fun acc m -> PMap.add m.m_id m acc) PMap.empty cs#get_modules in
+		let l = Hashtbl.fold (fun _ m acc ->
+			(m,(get_module_memory cs all_modules m)) :: acc
+		) cc#get_modules [] in
+		let l = List.sort (fun (_,(size1,_)) (_,(size2,_)) -> compare size2 size1) l in
+		let leaks = ref [] in
+		let l = List.map (fun (m,(size,(reached,_,_,mleaks))) ->
+			if reached then leaks := (m,mleaks) :: !leaks;
+			jobject [
+				"path",jstring (s_type_path m.m_path);
+				"size",jint size;
+				"hasTypes",jbool (match m.m_extra.m_kind with MCode | MMacro -> true | _ -> false);
+			]
+		) l in
+		let leaks = match !leaks with
+			| [] -> jnull
+			| leaks ->
+				let jleaks = List.map (fun (m,leaks) ->
+					let jleaks = List.map (fun s -> jobject ["path",jstring s]) leaks in
+					jobject [
+						"path",jstring (s_type_path m.m_path);
+						"leaks",jarray jleaks;
+					]
+				) leaks in
+				jarray jleaks
+		in
+		let cache_mem = cc#get_pointers in
+		jobject [
+			"leaks",leaks;
+			"syntaxCache",jobject [
+				"size",jint (mem_size cache_mem.(0));
+			];
+			"moduleCache",jobject [
+				"size",jint (mem_size cache_mem.(1));
+				"list",jarray l;
+			];
+		]
+	| MModule(sign,path) ->
+		let cc = cs#get_context sign in
+		let m = cc#find_module path in
+		let all_modules = List.fold_left (fun acc m -> PMap.add m.m_id m acc) PMap.empty cs#get_modules in
+		let _,(_,deps,out,_) = get_module_memory cs all_modules m in
+		let deps = update_module_type_deps deps m in
+		let out = get_out out in
+		let types = List.map (fun md ->
+			let fields,inf = match md with
+				| TClassDecl c ->
+					let own_deps = ref deps in
+					let field acc cf =
+						let repr = Obj.repr cf in
+						own_deps := List.filter (fun repr' -> repr != repr') !own_deps;
+						let deps = List.filter (fun repr' -> repr' != repr) deps in
+						let size = Objsize.size_with_headers (Objsize.objsize cf deps out) in
+						(cf,size) :: acc
+					in
+					let fields = List.fold_left field [] c.cl_ordered_fields in
+					let fields = List.fold_left field fields c.cl_ordered_statics in
+					let fields = List.sort (fun (_,size1) (_,size2) -> compare size2 size1) fields in
+					let fields = List.map (fun (cf,size) ->
+						jobject [
+							"name",jstring cf.cf_name;
+							"size",jint size;
+							"pos",generate_pos_as_location cf.cf_name_pos;
+						]
+					) fields in
+					let repr = Obj.repr c in
+					let deps = List.filter (fun repr' -> repr' != repr) !own_deps in
+					fields,Objsize.objsize c deps out
+				| TEnumDecl en ->
+					let repr = Obj.repr en in
+					let deps = List.filter (fun repr' -> repr' != repr) deps in
+					[],Objsize.objsize en deps out
+				| TTypeDecl td ->
+					let repr = Obj.repr td in
+					let deps = List.filter (fun repr' -> repr' != repr) deps in
+					[],Objsize.objsize td deps out
+				| TAbstractDecl a ->
+					let repr = Obj.repr a in
+					let deps = List.filter (fun repr' -> repr' != repr) deps in
+					[],Objsize.objsize a deps out
+			in
+			let size = Objsize.size_with_headers inf in
+			let jo = jobject [
+				"name",jstring (s_type_path (t_infos md).mt_path);
+				"size",jint size;
+				"pos",generate_pos_as_location (t_infos md).mt_name_pos;
+				"fields",jarray fields;
+			] in
+			size,jo
+		) m.m_types in
+		let types = List.sort (fun (size1,_) (size2,_) -> compare size2 size1) types in
+		let types = List.map snd types in
+		jobject [
+			"moduleExtra",jint (Objsize.size_with_headers (Objsize.objsize m.m_extra deps out));
+			"types",jarray types;
+		]
+	end
+
+let display_memory com =
+	let verbose = com.verbose in
+	let print = print_endline in
+	Gc.full_major();
+	Gc.compact();
+	let mem = Gc.stat() in
+	print ("Total Allocated Memory " ^ fmt_size (mem.Gc.heap_words * (Sys.word_size asr 8)));
+	print ("Free Memory " ^ fmt_size (mem.Gc.free_words * (Sys.word_size asr 8)));
+	(match get() with
+	| None ->
+		print "No cache found";
+	| Some c ->
+		print ("Total cache size " ^ size c);
+		(* print ("  haxelib " ^ size c.c_haxelib); *)
+		(* print ("  parsed ast " ^ size c.c_files ^ " (" ^ string_of_int (Hashtbl.length c.c_files) ^ " files stored)"); *)
+		(* print ("  typed modules " ^ size c.c_modules ^ " (" ^ string_of_int (Hashtbl.length c.c_modules) ^ " modules stored)"); *)
+		let module_list = c#get_modules in
+		let all_modules = List.fold_left (fun acc m -> PMap.add m.m_id m acc) PMap.empty module_list in
+		let modules = List.fold_left (fun acc m ->
+			let (size,r) = get_module_memory c all_modules m in
+			(m,size,r) :: acc
+		) [] module_list in
+		let cur_key = ref "" and tcount = ref 0 and mcount = ref 0 in
+		List.iter (fun (m,size,(reached,deps,out,leaks)) ->
+			let key = m.m_extra.m_sign in
+			if key <> !cur_key then begin
+				print (Printf.sprintf ("    --- CONFIG %s ----------------------------") (Digest.to_hex key));
+				cur_key := key;
+			end;
+			print (Printf.sprintf "    %s : %s" (s_type_path m.m_path) (fmt_size size));
+			(if reached then try
+				incr mcount;
+				let lcount = ref 0 in
+				let leak l =
+					incr lcount;
+					incr tcount;
+					print (Printf.sprintf "      LEAK %s" l);
+					if !lcount >= 3 && !tcount >= 100 && not verbose then begin
+						print (Printf.sprintf "      ...");
+						raise Exit;
+					end;
+				in
+				List.iter leak leaks;
+			with Exit ->
+				());
+			if verbose then begin
+				print (Printf.sprintf "      %d total deps" (List.length deps));
+				PMap.iter (fun _ md ->
+					print (Printf.sprintf "      dep %s%s" (s_type_path md.m_path) (module_sign key md));
+				) m.m_extra.m_deps;
+			end;
+			flush stdout
+		) (List.sort (fun (m1,s1,_) (m2,s2,_) ->
+			let k1 = m1.m_extra.m_sign and k2 = m2.m_extra.m_sign in
+			if k1 = k2 then s1 - s2 else if k1 > k2 then 1 else -1
+		) modules);
+		if !mcount > 0 then print ("*** " ^ string_of_int !mcount ^ " modules have leaks !");
+		print "Cache dump complete")
\ No newline at end of file
diff --git a/src/context/meta.ml b/src/context/meta.ml
deleted file mode 100644
index 0cbba02db5a96eb69a2ebeb55b86de474bc654b3..0000000000000000000000000000000000000000
--- a/src/context/meta.ml
+++ /dev/null
@@ -1,430 +0,0 @@
-open Globals
-
-type strict_meta =
-	| Abi
-	| Abstract
-	| Access
-	| Accessor
-	| Allow
-	| Analyzer
-	| Annotation
-	| ArrayAccess
-	| Ast
-	| AstSource
-	| AutoBuild
-	| Bind
-	| Bitmap
-	| BridgeProperties
-	| Build
-	| BuildXml
-	| Callable
-	| Class
-	| ClassCode
-	| Commutative
-	| CompilerGenerated
-	| Const
-	| CoreApi
-	| CoreType
-	| CppFileCode
-	| CppInclude
-	| CppNamespaceCode
-	| CsNative
-	| Dce
-	| Debug
-	| Decl
-	| DefParam
-	| Delegate
-	| Depend
-	| Deprecated
-	| DirectlyUsed
-	| DynamicObject
-	| Eager
-	| Enum
-	| EnumConstructorParam
-	| Event
-	| Exhaustive
-	| Expose
-	| Extern
-	| FakeEnum
-	| File
-	| FileXml
-	| Final
-	| Fixed
-	| FlatEnum
-	| Font
-	| Forward
-	| ForwardStatics
-	| From
-	| FunctionCode
-	| FunctionTailCode
-	| Generic
-	| GenericBuild
-	| GenericInstance
-	| Getter
-	| Hack
-	| HasUntyped
-	| HaxeGeneric
-	| HeaderClassCode
-	| HeaderCode
-	| HeaderInclude
-	| HeaderNamespaceCode
-	| HxGen
-	| IfFeature
-	| Impl
-	| PythonImport
-	| ImplicitCast
-	| Include
-	| InitPackage
-	| InlineConstructorVariable
-	| Internal
-	| IsVar
-	| JavaCanonical
-	| JavaNative
-	| JsRequire
-	| Keep
-	| KeepInit
-	| KeepSub
-	| LibType
-	| LuaRequire
-	| Meta
-	| Macro
-	| MaybeUsed
-	| MergeBlock
-	| MultiReturn
-	| MultiType
-	| Native
-	| NativeChildren
-	| NativeGen
-	| NativeGeneric
-	| NativeProperty
-	| NativeStaticExtension
-	| NoCompletion
-	| NoDebug
-	| NoDoc
-	| NoExpr
-	| NoImportGlobal
-	| NonVirtual
-	| NoPackageRestrict
-	| NoPrivateAccess
-	| NoStack
-	| NotNull
-	| NoUsing
-	| Ns
-	| Objc
-	| ObjcProtocol
-	| Op
-	| Optional
-	| Overload
-	| PhpConstants
-	| PhpGlobal
-	| PhpClassConst
-	| PhpMagic
-	| PhpNoConstructor
-	| PrivateAccess
-	| Property
-	| Protected
-	| Public
-	| PublicFields
-	| Pure
-	| QuotedField
-	| ReadOnly
-	| RealPath
-	| Remove
-	| Require
-	| RequiresAssign
-	| Resolve
-	| Rtti
-	| Runtime
-	| RuntimeValue
-	| Scalar
-	| SelfCall
-	| Setter
-	| SkipCtor
-	| SkipReflection
-	| Sound
-	| SourceFile
-	| StackOnly
-	| StoredTypedExpr
-	| Strict
-	| Struct
-	| StructAccess
-	| StructInit
-	| SuppressWarnings
-	| This
-	| Throws
-	| To
-	| ToString
-	| Transient
-	| TemplatedCall
-	| ValueUsed
-	| Volatile
-	| Unbound
-	| UnifyMinDynamic
-	| Unreflective
-	| Unsafe
-	| Usage
-	| Used
-	| UserVariable
-	| Value
-	| Void
-	| Last
-	(* do not put any custom metadata after Last *)
-	| Dollar of string
-	| Custom of string
-
-let has m ml = List.exists (fun (m2,_,_) -> m = m2) ml
-let get m ml = List.find (fun (m2,_,_) -> m = m2) ml
-
-type meta_usage =
-	| TClass
-	| TClassField
-	| TAbstract
-	| TAbstractField
-	| TEnum
-	| TTypedef
-	| TAnyField
-	| TExpr
-	| TTypeParameter
-
-type meta_parameter =
-	| HasParam of string
-	| Platform of platform
-	| Platforms of platform list
-	| UsedOn of meta_usage
-	| UsedOnEither of meta_usage list
-	| UsedInternally
-
-let get_info = function
-	| Abi -> ":abi",("Function ABI/calling convention",[Platforms [Cpp]])
-	| Abstract -> ":abstract",("Sets the underlying class implementation as 'abstract'",[Platforms [Java;Cs]])
-	| Access -> ":access",("Forces private access to package, type or field",[HasParam "Target path";UsedOnEither [TClass;TClassField]])
-	| Accessor -> ":accessor",("Used internally by DCE to mark property accessors",[UsedOn TClassField;UsedInternally])
-	| Allow -> ":allow",("Allows private access from package, type or field",[HasParam "Target path";UsedOnEither [TClass;TClassField]])
-	| Analyzer -> ":analyzer",("Used to configure the static analyzer",[])
-	| Annotation -> ":annotation",("Annotation (@interface) definitions on -java-lib imports will be annotated with this metadata. Has no effect on types compiled by Haxe",[Platform Java; UsedOn TClass])
-	| ArrayAccess -> ":arrayAccess",("Allows [] access on an abstract",[UsedOnEither [TAbstract;TAbstractField]])
-	| Ast -> ":ast",("Internally used to pass the AST source into the typed AST",[UsedInternally])
-	| AstSource -> ":astSource",("Filled by the compiler with the parsed expression of the field",[UsedOn TClassField])
-	| AutoBuild -> ":autoBuild",("Extends @:build metadata to all extending and implementing classes",[HasParam "Build macro call";UsedOn TClass])
-	| Bind -> ":bind",("Override Swf class declaration",[Platform Flash;UsedOn TClass])
-	| Bitmap -> ":bitmap",("Embeds given bitmap data into the class (must extend flash.display.BitmapData)",[HasParam "Bitmap file path";UsedOn TClass;Platform Flash])
-	| BridgeProperties -> ":bridgeProperties",("Creates native property bridges for all Haxe properties in this class",[UsedOn TClass;Platform Cs])
-	| Build -> ":build",("Builds a class or enum from a macro",[HasParam "Build macro call";UsedOnEither [TClass;TEnum]])
-	| BuildXml -> ":buildXml",("Specify xml data to be injected into Build.xml",[Platform Cpp])
-	| Callable -> ":callable",("Abstract forwards call to its underlying type",[UsedOn TAbstract])
-	| Class -> ":class",("Used internally to annotate an enum that will be generated as a class",[Platforms [Java;Cs]; UsedOn TEnum; UsedInternally])
-	| ClassCode -> ":classCode",("Used to inject platform-native code into a class",[Platforms [Java;Cs]; UsedOn TClass])
-	| Commutative -> ":commutative",("Declares an abstract operator as commutative",[UsedOn TAbstractField])
-	| CompilerGenerated -> ":compilerGenerated",("Marks a field as generated by the compiler. Shouldn't be used by the end user",[Platforms [Java;Cs]])
-	| Const -> ":const",("Allows a type parameter to accept expression values",[UsedOn TTypeParameter])
-	| CoreApi -> ":coreApi",("Identifies this class as a core api class (forces Api check)",[UsedOnEither [TClass;TEnum;TTypedef;TAbstract]])
-	| CoreType -> ":coreType",("Identifies an abstract as core type so that it requires no implementation",[UsedOn TAbstract])
-	| CppFileCode -> ":cppFileCode",("Code to be injected into generated cpp file",[Platform Cpp])
-	| CppInclude -> ":cppInclude",("File to be included in generated cpp file",[Platform Cpp])
-	| CppNamespaceCode -> ":cppNamespaceCode",("",[Platform Cpp])
-	| CsNative -> ":csNative",("Automatically added by -net-lib on classes generated from .NET DLL files",[Platform Cs; UsedOnEither[TClass;TEnum]; UsedInternally])
-	| Dce -> ":dce",("Forces dead code elimination even when -dce full is not specified",[UsedOnEither [TClass;TEnum]])
-	| Debug -> ":debug",("Forces debug information to be generated into the Swf even without -debug",[UsedOnEither [TClass;TClassField]; Platform Flash])
-	| Decl -> ":decl",("",[Platform Cpp])
-	| DefParam -> ":defParam",("Default function argument value loaded from the SWF and used for documentation in Genxml",[Platform Flash;UsedInternally])
-	| Delegate -> ":delegate",("Automatically added by -net-lib on delegates",[Platform Cs; UsedOn TAbstract])
-	| Depend -> ":depend",("",[Platform Cpp])
-	| Deprecated -> ":deprecated",("Mark a type or field as deprecated",[])
-	| DirectlyUsed -> ":directlyUsed",("Marks types that are directly referenced by non-extern code",[UsedInternally])
-	| DynamicObject -> ":dynamicObject",("Used internally to identify the Dynamic Object implementation",[Platforms [Java;Cs]; UsedOn TClass; UsedInternally])
-	| Eager -> ":eager",("Forces typedefs to be followed early",[UsedOn TTypedef])
-	| Enum -> ":enum",("Defines finite value sets to abstract definitions",[UsedOn TAbstract])
-	| EnumConstructorParam -> ":enumConstructorParam",("Used internally to annotate GADT type parameters",[UsedOn TClass; UsedInternally])
-	| Event -> ":event",("Automatically added by -net-lib on events. Has no effect on types compiled by Haxe",[Platform Cs; UsedOn TClassField])
-	| Exhaustive -> ":exhaustive",("",[UsedInternally])
-	| Expose -> ":expose",("Makes the class available on the window object",[HasParam "?Name=Class path";UsedOn TClass;Platform Js])
-	| Extern -> ":extern",("Marks the field as extern so it is not generated",[UsedOn TClassField])
-	| FakeEnum -> ":fakeEnum",("Treat enum as collection of values of the specified type",[HasParam "Type name";UsedOn TEnum])
-	| File -> ":file",("Includes a given binary file into the target Swf and associates it with the class (must extend flash.utils.ByteArray)",[HasParam "File path";UsedOn TClass;Platform Flash])
-	| FileXml -> ":fileXml",("Include xml attribute snippet in Build.xml entry for file",[UsedOn TClass;Platform Cpp])
-	| Final -> ":final",("Prevents a class from being extended",[UsedOn TClass])
-	| Fixed -> ":fixed",("Delcares an anonymous object to have fixed fields",[ (*UsedOn TObjectDecl(_)*)])
-	| FlatEnum -> ":flatEnum",("Internally used to mark an enum as being flat, i.e. having no function constructors",[UsedOn TEnum; UsedInternally])
-	| Font -> ":font",("Embeds the given TrueType font into the class (must extend flash.text.Font)",[HasParam "TTF path";HasParam "Range String";UsedOn TClass])
-	| Forward -> ":forward",("Forwards field access to underlying type",[HasParam "List of field names";UsedOn TAbstract])
-	| ForwardStatics -> ":forwardStatics",("Forwards static field access to underlying type",[HasParam "List of field names";UsedOn TAbstract])
-	| From -> ":from",("Specifies that the field of the abstract is a cast operation from the type identified in the function",[UsedOn TAbstractField])
-	| FunctionCode -> ":functionCode",("Used to inject platform-native code into a function",[Platforms [Cpp;Java;Cs]])
-	| FunctionTailCode -> ":functionTailCode",("",[Platform Cpp])
-	| Generic -> ":generic",("Marks a class or class field as generic so each type parameter combination generates its own type/field",[UsedOnEither [TClass;TClassField]])
-	| GenericBuild -> ":genericBuild",("Builds instances of a type using the specified macro",[UsedOn TClass])
-	| GenericInstance -> ":genericInstance",("Internally used to mark instances of @:generic methods",[UsedOn TClassField;UsedInternally])
-	| Getter -> ":getter",("Generates a native getter function on the given field",[HasParam "Class field name";UsedOn TClassField;Platform Flash])
-	| Hack -> ":hack",("Allows extending classes marked as @:final",[UsedOn TClass])
-	| HasUntyped -> (":has_untyped",("Used by the typer to mark fields that have untyped expressions",[UsedInternally]))
-	| HaxeGeneric -> ":haxeGeneric",("Used internally to annotate non-native generic classes",[Platform Cs; UsedOnEither[TClass;TEnum]; UsedInternally])
-	| HeaderClassCode -> ":headerClassCode",("Code to be injected into the generated class, in the header",[Platform Cpp])
-	| HeaderCode -> ":headerCode",("Code to be injected into the generated header file",[Platform Cpp])
-	| HeaderInclude -> ":headerInclude",("File to be included in generated header file",[Platform Cpp])
-	| HeaderNamespaceCode -> ":headerNamespaceCode",("",[Platform Cpp])
-	| HxGen -> ":hxGen",("Annotates that an extern class was generated by Haxe",[Platforms [Java;Cs]; UsedOnEither [TClass;TEnum]])
-	| IfFeature -> ":ifFeature",("Causes a field to be kept by DCE if the given feature is part of the compilation",[HasParam "Feature name";UsedOn TClassField])
-	| Impl -> ":impl",("Used internally to mark abstract implementation fields",[UsedOn TAbstractField; UsedInternally])
-	| PythonImport -> ":pythonImport",("Generates python import statement for extern classes",[Platforms [Python]; UsedOn TClass])
-	| ImplicitCast -> ":implicitCast",("Generated automatically on the AST when an implicit abstract cast happens",[UsedInternally; UsedOn TExpr])
-	| Include -> ":include",("",[Platform Cpp])
-	| InitPackage -> ":initPackage",("Some weird thing for Genjs we want to remove someday",[UsedInternally; Platform Js])
-	| InlineConstructorVariable -> ":inlineConstructorVariable",("Internally used to mark variables that come from inlined constructors",[UsedInternally])
-	| Internal -> ":internal",("Generates the annotated field/class with 'internal' access",[Platforms [Java;Cs]; UsedOnEither[TClass;TEnum;TClassField]])
-	| IsVar -> ":isVar",("Forces a physical field to be generated for properties that otherwise would not require one",[UsedOn TClassField])
-	| JavaCanonical -> ":javaCanonical",("Used by the Java target to annotate the canonical path of the type",[HasParam "Output type package";HasParam "Output type name";UsedOnEither [TClass;TEnum]; Platform Java])
-	| JavaNative -> ":javaNative",("Automatically added by -java-lib on classes generated from JAR/class files",[Platform Java; UsedOnEither[TClass;TEnum]; UsedInternally])
-	| JsRequire -> ":jsRequire",("Generate javascript module require expression for given extern",[Platform Js; UsedOn TClass])
-	| LuaRequire -> ":luaRequire",("Generate lua module require expression for given extern",[Platform Lua; UsedOn TClass])
-	| Keep -> ":keep",("Causes a field or type to be kept by DCE",[])
-	| KeepInit -> ":keepInit",("Causes a class to be kept by DCE even if all its field are removed",[UsedOn TClass])
-	| KeepSub -> ":keepSub",("Extends @:keep metadata to all implementing and extending classes",[UsedOn TClass])
-	| LibType -> ":libType",("Used by -net-lib and -java-lib to mark a class that shouldn't be checked (overrides, interfaces, etc) by the type loader",[UsedInternally; UsedOn TClass; Platforms [Java;Cs]])
-	| Meta -> ":meta",("Internally used to mark a class field as being the metadata field",[])
-	| Macro -> ":macro",("(deprecated)",[])
-	| MaybeUsed -> ":maybeUsed",("Internally used by DCE to mark fields that might be kept",[UsedInternally])
-	| MergeBlock -> ":mergeBlock",("Merge the annotated block into the current scope",[UsedOn TExpr])
-	| MultiReturn -> ":multiReturn",("Annotates an extern class as the result of multi-return function",[UsedOn TClass; Platform Lua])
-	| MultiType -> ":multiType",("Specifies that an abstract chooses its this-type from its @:to functions",[UsedOn TAbstract; HasParam "Relevant type parameters"])
-	| Native -> ":native",("Rewrites the path of a class or enum during generation",[HasParam "Output type path";UsedOnEither [TClass;TEnum]])
-	| NativeChildren -> ":nativeChildren",("Annotates that all children from a type should be treated as if it were an extern definition - platform native",[Platforms [Java;Cs]; UsedOn TClass])
-	| NativeGen -> ":nativeGen",("Annotates that a type should be treated as if it were an extern definition - platform native",[Platforms [Java;Cs;Python]; UsedOnEither[TClass;TEnum]])
-	| NativeGeneric -> ":nativeGeneric",("Used internally to annotate native generic classes",[Platform Cs; UsedOnEither[TClass;TEnum]; UsedInternally])
-	| NativeProperty -> ":nativeProperty",("Use native properties which will execute even with dynamic usage",[Platform Cpp])
-	| NativeStaticExtension -> ":nativeStaticExtension",("Converts static function syntax into member call",[Platform Cpp])
-	| NoCompletion -> ":noCompletion",("Prevents the compiler from suggesting completion on this field",[UsedOn TClassField])
-	| NoDebug -> ":noDebug",("Does not generate debug information into the Swf even if -debug is set",[UsedOnEither [TClass;TClassField];Platform Flash])
-	| NoDoc -> ":noDoc",("Prevents a type from being included in documentation generation",[])
-	| NoExpr -> ":noExpr",("Internally used to mark abstract fields which have no expression by design",[UsedInternally])
-	| NoImportGlobal -> ":noImportGlobal",("Prevents a static field from being imported with import Class.*",[UsedOn TAnyField])
-	| NonVirtual -> ":nonVirtual",("Declares function to be non-virtual in cpp",[Platform Cpp])
-	| NoPackageRestrict -> ":noPackageRestrict",("Allows a module to be accessed across all targets if found on its first type",[UsedInternally])
-	| NoPrivateAccess -> ":noPrivateAccess",("Disallow private access to anything for the annotated expression",[UsedOn TExpr])
-	| NoStack -> ":noStack",("",[Platform Cpp])
-	| NotNull -> ":notNull",("Declares an abstract type as not accepting null values",[UsedOn TAbstract])
-	| NoUsing -> ":noUsing",("Prevents a field from being used with 'using'",[UsedOn TClassField])
-	| Ns -> ":ns",("Internally used by the Swf generator to handle namespaces",[Platform Flash])
-	| Objc -> ":objc",("Declares a class or interface that is used to interoperate with Objective-C code",[Platform Cpp;UsedOn TClass])
-	| ObjcProtocol -> ":objcProtocol",("Associates an interface with, or describes a function in, a native Objective-C protocol.",[Platform Cpp;UsedOnEither [TClass;TClassField] ])
-	| Op -> ":op",("Declares an abstract field as being an operator overload",[HasParam "The operation";UsedOn TAbstractField])
-	| Optional -> ":optional",("Marks the field of a structure as optional",[UsedOn TClassField])
-	| Overload -> ":overload",("Allows the field to be called with different argument types",[HasParam "Function specification (no expression)";UsedOn TClassField])
-	| PhpConstants -> ":phpConstants",("Marks the static fields of a class as PHP constants, without $",[Platform Php;UsedOn TClass])
-	| PhpGlobal -> ":phpGlobal",("(php7) Puts the static fields of a class in the global PHP namespace",[Platforms [Php;Php];UsedOn TClass])
-	| PhpClassConst -> ":phpClassConst",("(php7)  Generate static var of an extern class as a PHP class constant",[Platform Php;UsedOn TClass])
-	| PhpMagic -> ":phpMagic",("(php7) Treat annotated field as special PHP magic field",[Platform Php;UsedOn TClassField])
-	| PhpNoConstructor -> ":phpNoConstructor",("(php7) Special meta for extern classes which does not have native constructor in PHP, but need a constructor in Haxe extern",[Platform Php;UsedOn TClass])
-	| Public -> ":public",("Marks a class field as being public",[UsedOn TClassField;UsedInternally])
-	| PublicFields -> ":publicFields",("Forces all class fields of inheriting classes to be public",[UsedOn TClass])
-	| QuotedField -> ":quotedField",("Used internally to mark structure fields which are quoted in syntax",[UsedInternally])
-	| PrivateAccess -> ":privateAccess",("Allow private access to anything for the annotated expression",[UsedOn TExpr])
-	| Protected -> ":protected",("Marks a class field as being protected",[UsedOn TClassField;Platforms [Cs;Java;Flash]])
-	| Property -> ":property",("Marks a property field to be compiled as a native C# property",[UsedOn TClassField;Platform Cs])
-	| Pure -> ":pure",("Marks a class field, class or expression as pure (side-effect free)",[UsedOnEither [TClass;TClassField;TExpr]])
-	| ReadOnly -> ":readOnly",("Generates a field with the 'readonly' native keyword",[Platform Cs; UsedOn TClassField])
-	| RealPath -> ":realPath",("Internally used on @:native types to retain original path information",[UsedInternally])
-	| Remove -> ":remove",("Causes an interface to be removed from all implementing classes before generation",[UsedOn TClass])
-	| Require -> ":require",("Allows access to a field only if the specified compiler flag is set",[HasParam "Compiler flag to check";UsedOn TClassField])
-	| RequiresAssign -> ":requiresAssign",("Used internally to mark certain abstract operator overloads",[UsedInternally])
-	| Resolve -> ":resolve",("Abstract fields marked with this metadata can be used to resolve unknown fields",[UsedOn TClassField])
-	| Rtti -> ":rtti",("Adds runtime type informations",[UsedOn TClass])
-	| Runtime -> ":runtime",("?",[])
-	| RuntimeValue -> ":runtimeValue",("Marks an abstract as being a runtime value",[UsedOn TAbstract])
-	| Scalar -> ":scalar",("Used by hxcpp to mark a custom coreType abstract",[UsedOn TAbstract; Platform Cpp])
-	| SelfCall -> ":selfCall",("Translates method calls into calling object directly",[UsedOn TClassField; Platform Js])
-	| Setter -> ":setter",("Generates a native setter function on the given field",[HasParam "Class field name";UsedOn TClassField;Platform Flash])
-	| StackOnly -> ":stackOnly",("Instances of this type can only appear on the stack",[Platform Cpp])
-	| StoredTypedExpr -> ":storedTypedExpr",("Used internally to reference a typed expression returned from a macro",[UsedInternally])
-	| SkipCtor -> ":skipCtor",("Used internally to generate a constructor as if it were a native type (no __hx_ctor)",[Platforms [Java;Cs]; UsedInternally])
-	| SkipReflection -> ":skipReflection",("Used internally to annotate a field that shouldn't have its reflection data generated",[Platforms [Java;Cs]; UsedOn TClassField; UsedInternally])
-	| Sound -> ":sound",( "Includes a given .wav or .mp3 file into the target Swf and associates it with the class (must extend flash.media.Sound)",[HasParam "File path";UsedOn TClass;Platform Flash])
-	| SourceFile -> ":sourceFile",("Source code filename for external class",[Platform Cpp])
-	| Strict -> ":strict",("Used to declare a native C# attribute or a native Java metadata. Is type checked",[Platforms [Java;Cs]])
-	| Struct -> ":struct",("Marks a class definition as a struct",[Platform Cs; UsedOn TClass])
-	| StructAccess -> ":structAccess",("Marks an extern class as using struct access('.') not pointer('->')",[Platform Cpp; UsedOn TClass])
-	| StructInit -> ":structInit",("Allows to initialize the class with a structure that matches constructor parameters",[UsedOn TClass])
-	| SuppressWarnings -> ":suppressWarnings",("Adds a SuppressWarnings annotation for the generated Java class",[Platform Java; UsedOn TClass])
-	| TemplatedCall -> ":templatedCall",("Indicates that the first parameter of static call should be treated as a template arguement",[Platform Cpp; UsedOn TClassField])
-	| Throws -> ":throws",("Adds a 'throws' declaration to the generated function",[HasParam "Type as String"; Platform Java; UsedOn TClassField])
-	| This -> ":this",("Internally used to pass a 'this' expression to macros",[UsedInternally; UsedOn TExpr])
-	| To -> ":to",("Specifies that the field of the abstract is a cast operation to the type identified in the function",[UsedOn TAbstractField])
-	| ToString -> ":toString",("Internally used",[UsedInternally])
-	| Transient -> ":transient",("Adds the 'transient' flag to the class field",[Platform Java; UsedOn TClassField])
-	| ValueUsed -> ":valueUsed",("Internally used by DCE to mark an abstract value as used",[UsedInternally])
-	| Volatile -> ":volatile",("",[Platforms [Java;Cs]])
-	| Unbound -> ":unbound", ("Compiler internal to denote unbounded global variable",[UsedInternally])
-	| UnifyMinDynamic -> ":unifyMinDynamic",("Allows a collection of types to unify to Dynamic",[UsedOn TClassField])
-	| Unreflective -> ":unreflective",("",[Platform Cpp])
-	| Unsafe -> ":unsafe",("Declares a class, or a method with the C#'s 'unsafe' flag",[Platform Cs; UsedOnEither [TClass;TClassField]])
-	| Usage -> ":usage",("Internal metadata used to mark a symbol for which usage request was invoked",[UsedInternally])
-	| Used -> ":used",("Internally used by DCE to mark a class or field as used",[UsedInternally])
-	| UserVariable -> ":userVariable",("Internally used to mark variables that come from user code",[UsedInternally])
-	| Value -> ":value",("Used to store default values for fields and function arguments",[UsedOn TClassField])
-	| Void -> ":void",("Use Cpp native 'void' return type",[Platform Cpp])
-	| Last -> assert false
-	(* do not put any custom metadata after Last *)
-	| Dollar s -> "$" ^ s,("",[])
-	| Custom s -> s,("",[])
-
-let to_string m = fst (get_info m)
-
-let hmeta =
-	let h = Hashtbl.create 0 in
-	let rec loop i =
-		let m = Obj.magic i in
-		if m <> Last then begin
-			Hashtbl.add h (fst (get_info m)) m;
-			loop (i + 1);
-		end;
-	in
-	loop 0;
-	h
-
-let parse s = try Hashtbl.find hmeta (":" ^ s) with Not_found -> Custom (":" ^ s)
-
-let from_string s =
-	if s = "" then Custom "" else match s.[0] with
-	| ':' -> (try Hashtbl.find hmeta s with Not_found -> Custom s)
-	| '$' -> Dollar (String.sub s 1 (String.length s - 1))
-	| _ -> Custom s
-
-let get_documentation d =
-	let t, (doc,flags) = get_info d in
-	if not (List.mem UsedInternally flags) then begin
-		let params = ref [] and used = ref [] and pfs = ref [] in
-		List.iter (function
-			| HasParam s -> params := s :: !params
-			| Platform f -> pfs := f :: !pfs
-			| Platforms fl -> pfs := fl @ !pfs
-			| UsedOn u -> used := u :: !used
-			| UsedOnEither ul -> used := ul @ !used
-			| UsedInternally -> assert false
-		) flags;
-		let params = (match List.rev !params with
-			| [] -> ""
-			| l -> "(" ^ String.concat "," l ^ ")"
-		) in
-		let pfs = (match List.rev !pfs with
-			| [] -> ""
-			| [p] -> " (" ^ platform_name p ^ " only)"
-			| pl -> " (for " ^ String.concat "," (List.map platform_name pl) ^ ")"
-		) in
-		let str = "@" ^ t in
-		Some (str,params ^ doc ^ pfs)
-	end else
-		None
-
-let get_documentation_list () =
-	let m = ref 0 in
-	let rec loop i =
-		let d = Obj.magic i in
-		if d <> Last then begin match get_documentation d with
-			| None -> loop (i + 1)
-			| Some (str,desc) ->
-				if String.length str > !m then m := String.length str;
-					(str,desc) :: loop (i + 1)
-		end else
-			[]
-	in
-	let all = List.sort (fun (s1,_) (s2,_) -> String.compare s1 s2) (loop 0) in
-	all,!m
\ No newline at end of file
diff --git a/src/context/nativeLibraries.ml b/src/context/nativeLibraries.ml
new file mode 100644
index 0000000000000000000000000000000000000000..2d874dfaa1613cd610c194309422756beb83f86f
--- /dev/null
+++ b/src/context/nativeLibraries.ml
@@ -0,0 +1,60 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open ExtString
+
+type native_lib_flags =
+	| FlagIsStd
+	| FlagIsExtern
+
+class virtual ['a,'data] native_library (name : string) (file_path : string) = object(self)
+	val mutable flags : native_lib_flags list = []
+
+	method add_flag flag = flags <- flag :: flags
+	method has_flag flag = List.mem flag flags
+
+	method get_name = name
+	method get_file_path = file_path
+
+	method virtual build : path -> pos -> Ast.package option
+	method virtual close : unit
+	method virtual list_modules : path list
+	method virtual load : unit
+	method virtual lookup : path -> 'a
+	method virtual get_data : 'data
+end
+
+type java_lib_type = (JData.jclass * string * string) option
+type net_lib_type = IlData.ilclass option
+type swf_lib_type = As3hl.hl_class option
+
+type native_libraries = {
+	mutable java_libs : (java_lib_type,unit) native_library list;
+	mutable net_libs : (net_lib_type,unit) native_library list;
+	mutable swf_libs : (swf_lib_type,Swf.swf) native_library list;
+	mutable all_libs : string list;
+}
+
+let create_native_libs () = {
+	java_libs = [];
+	net_libs = [];
+	swf_libs = [];
+	all_libs = [];
+}
\ No newline at end of file
diff --git a/src/context/nativeLibraryHandler.ml b/src/context/nativeLibraryHandler.ml
new file mode 100644
index 0000000000000000000000000000000000000000..810413eb8ee80b9a3b6a4db48d6364f398e88ad0
--- /dev/null
+++ b/src/context/nativeLibraryHandler.ml
@@ -0,0 +1,39 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open Common
+
+let add_native_lib com file is_extern = match com.platform with
+	| Globals.Flash ->
+		SwfLoader.add_swf_lib com file is_extern
+	| Globals.Java ->
+		let std = file = "lib/hxjava-std.jar" in
+		Java.add_java_lib com file std is_extern
+	| Globals.Cs ->
+		let file, is_std = match ExtString.String.nsplit file "@" with
+			| [file] ->
+				file,false
+			| [file;"std"] ->
+				file,true
+			| _ -> failwith ("unsupported file@`std` format: " ^ file)
+		in
+		Dotnet.add_net_lib com file is_std is_extern
+	| pf ->
+		failwith (Printf.sprintf "Target %s does not support native libraries (trying to load %s)" (platform_name pf) file);
\ No newline at end of file
diff --git a/src/context/purityState.ml b/src/context/purityState.ml
new file mode 100644
index 0000000000000000000000000000000000000000..034787def3b8a1468aa995ae2f55d9ad9d999754
--- /dev/null
+++ b/src/context/purityState.ml
@@ -0,0 +1,67 @@
+open Globals
+open Ast
+open Type
+open Error
+
+(*
+	PurityState represents whether or not something has a side-effect. Unless otherwise stated
+	by using `@:pure` (equivalent to `@:pure(true)`) or `@:pure(false)`, fields are originally
+	supposed to be "maybe pure". Once all types and fields are known, this is refined by
+	AnalyzerTexpr.Purity.
+
+	There's a special case for fields that override a parent class field or implement an
+	interface field: If the overridden/implemented field is explicitly marked as pure,
+	the type loader marks the overriding/implementing as "expected pure". If during purity
+	inference this assumption does not hold, an error is shown.
+*)
+type t =
+	| Pure
+	| Impure
+	| MaybePure
+	| ExpectPure of pos
+
+let get_purity_from_meta meta =
+	try
+		begin match Meta.get Meta.Pure meta with
+		| (_,[EConst(Ident s),p],_) ->
+			begin match s with
+			| "true" -> Pure
+			| "false" -> Impure
+			| "expect" -> ExpectPure p
+			| _ -> error ("Unsupported purity value " ^ s ^ ", expected true or false") p
+			end
+		| (_,[],_) ->
+			Pure
+		| (_,_,p) ->
+			error "Unsupported purity value" p
+		end
+	with Not_found ->
+		MaybePure
+
+let get_purity c cf = match get_purity_from_meta cf.cf_meta with
+	| Pure -> Pure
+	| Impure -> Impure
+	| ExpectPure p -> ExpectPure p
+	| _ -> get_purity_from_meta c.cl_meta
+
+let is_pure c cf = get_purity c cf = Pure
+
+let is_pure_field_access fa = match fa with
+	| FInstance(c,_,cf) | FClosure(Some(c,_),cf) | FStatic(c,cf) -> is_pure c cf
+	| FAnon cf | FClosure(None,cf) -> (get_purity_from_meta cf.cf_meta = Pure)
+	| FEnum _ -> true
+	| FDynamic _ -> false
+
+let is_explicitly_impure fa = match fa with
+	| FInstance(c,_,cf) | FClosure(Some(c,_),cf) | FStatic(c,cf) ->
+		get_purity_from_meta cf.cf_meta = Impure
+		|| get_purity_from_meta c.cl_meta = Impure
+	| FAnon cf | FClosure(None,cf) ->
+		get_purity_from_meta cf.cf_meta = Impure
+	| _ -> false
+
+let to_string = function
+	| Pure -> "pure"
+	| Impure -> "impure"
+	| MaybePure -> "maybe"
+	| ExpectPure _ -> "expect"
diff --git a/src/sourcemaps.ml b/src/context/sourcemaps.ml
similarity index 98%
rename from src/sourcemaps.ml
rename to src/context/sourcemaps.ml
index b49a2c40a1fefb042b49db3d2de86e3dd3362a35..4f48b3b2f9182cea804d625bdd552899e54b1f2c 100644
--- a/src/sourcemaps.ml
+++ b/src/context/sourcemaps.ml
@@ -131,7 +131,7 @@ class sourcemap_writer (generated_file:string) =
 			"],\n");
 		if Common.defined com Define.SourceMapContent then begin
 			output_string channel ("\"sourcesContent\":[" ^
-				(String.concat "," (List.map (fun s -> try "\"" ^ Ast.s_escape (Std.input_file ~bin:true s) ^ "\"" with _ -> "null") sources)) ^
+				(String.concat "," (List.map (fun s -> try "\"" ^ StringHelper.s_escape (Std.input_file ~bin:true s) ^ "\"" with _ -> "null") sources)) ^
 				"],\n");
 		end;
 		output_string channel "\"names\":[],\n";
diff --git a/src/context/typecore.ml b/src/context/typecore.ml
new file mode 100644
index 0000000000000000000000000000000000000000..97ab818c0f2ac668c9d5cd8dcadbfda528540bf6
--- /dev/null
+++ b/src/context/typecore.ml
@@ -0,0 +1,654 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open Ast
+open Common
+open Type
+open Error
+open DisplayTypes
+
+type type_patch = {
+	mutable tp_type : complex_type option;
+	mutable tp_remove : bool;
+	mutable tp_meta : metadata;
+}
+
+type current_fun =
+	| FunMember
+	| FunStatic
+	| FunConstructor
+	| FunMemberAbstract
+	| FunMemberClassLocal
+	| FunMemberAbstractLocal
+
+type macro_mode =
+	| MExpr
+	| MBuild
+	| MMacroType
+	| MDisplay
+
+type access_mode =
+	| MGet
+	| MSet
+	| MCall
+
+type typer_pass =
+	| PBuildModule			(* build the module structure and setup module type parameters *)
+	| PBuildClass			(* build the class structure *)
+	| PConnectField			(* handle associated fields, which may affect each other. E.g. a property and its getter *)
+	| PTypeField			(* type the class field, allow access to types structures *)
+	| PCheckConstraint		(* perform late constraint checks with inferred types *)
+	| PForce				(* usually ensure that lazy have been evaluated *)
+	| PFinal				(* not used, only mark for finalize *)
+
+type typer_module = {
+	curmod : module_def;
+	mutable module_types : (module_type * pos) list;
+	mutable module_using : (tclass * pos) list;
+	mutable module_globals : (string, (module_type * string * pos)) PMap.t;
+	mutable wildcard_packages : (string list * pos) list;
+	mutable module_imports : import list;
+}
+
+type typer_globals = {
+	types_module : (path, path) Hashtbl.t;
+	modules : (path , module_def) Hashtbl.t;
+	mutable delayed : (typer_pass * (unit -> unit) list) list;
+	mutable debug_delayed : (typer_pass * ((unit -> unit) * string * typer) list) list;
+	doinline : bool;
+	mutable core_api : typer option;
+	mutable macros : ((unit -> unit) * typer) option;
+	mutable std : module_def;
+	mutable hook_generate : (unit -> unit) list;
+	type_patches : (path, (string * bool, type_patch) Hashtbl.t * type_patch) Hashtbl.t;
+	mutable global_metadata : (string list * metadata_entry * (bool * bool * bool)) list;
+	mutable module_check_policies : (string list * module_check_policy list * bool) list;
+	mutable global_using : (tclass * pos) list;
+	(* Indicates that Typer.create() finished building this instance *)
+	mutable complete : bool;
+	mutable type_hints : (module_def_display * pos * t) list;
+	(* api *)
+	do_inherit : typer -> Type.tclass -> pos -> (bool * placed_type_path) -> bool;
+	do_create : Common.context -> typer;
+	do_macro : typer -> macro_mode -> path -> string -> expr list -> pos -> expr option;
+	do_load_module : typer -> path -> pos -> module_def;
+	do_load_type_def : typer -> pos -> type_path -> module_type;
+	do_optimize : typer -> texpr -> texpr;
+	do_build_instance : typer -> module_type -> pos -> ((string * t) list * path * (t list -> t));
+	do_format_string : typer -> string -> pos -> Ast.expr;
+	do_finalize : typer -> unit;
+	do_generate : typer -> (texpr option * module_type list * module_def list);
+	do_load_core_class : typer -> tclass -> tclass;
+}
+
+and typer = {
+	(* shared *)
+	com : context;
+	t : basic_types;
+	g : typer_globals;
+	mutable bypass_accessor : int;
+	mutable meta : metadata;
+	mutable this_stack : texpr list;
+	mutable with_type_stack : WithType.t list;
+	mutable call_argument_stack : expr list list;
+	(* variable *)
+	mutable pass : typer_pass;
+	(* per-module *)
+	mutable m : typer_module;
+	mutable is_display_file : bool;
+	(* per-class *)
+	mutable curclass : tclass;
+	mutable tthis : t;
+	mutable type_params : (string * t) list;
+	mutable get_build_infos : unit -> (module_type * t list * class_field list) option;
+	(* per-function *)
+	mutable curfield : tclass_field;
+	mutable untyped : bool;
+	mutable in_loop : bool;
+	mutable in_display : bool;
+	mutable in_macro : bool;
+	mutable macro_depth : int;
+	mutable curfun : current_fun;
+	mutable ret : t;
+	mutable locals : (string, tvar) PMap.t;
+	mutable opened : anon_status ref list;
+	mutable vthis : tvar option;
+	mutable in_call_args : bool;
+	(* events *)
+	mutable on_error : typer -> string -> pos -> unit;
+	memory_marker : float array;
+}
+exception Forbid_package of (string * path * pos) * pos list * string
+
+exception WithTypeError of error_msg * pos
+
+let memory_marker = [|Unix.time()|]
+
+let make_call_ref : (typer -> texpr -> texpr list -> t -> ?force_inline:bool -> pos -> texpr) ref = ref (fun _ _ _ _ ?force_inline:bool _ -> assert false)
+let type_expr_ref : (?mode:access_mode -> typer -> expr -> WithType.t -> texpr) ref = ref (fun ?(mode=MGet) _ _ _ -> assert false)
+let type_block_ref : (typer -> expr list -> WithType.t -> pos -> texpr) ref = ref (fun _ _ _ _ -> assert false)
+let unify_min_ref : (typer -> texpr list -> t) ref = ref (fun _ _ -> assert false)
+let unify_min_for_type_source_ref : (typer -> texpr list -> WithType.with_type_source option -> t) ref = ref (fun _ _ _ -> assert false)
+let analyzer_run_on_expr_ref : (Common.context -> texpr -> texpr) ref = ref (fun _ _ -> assert false)
+
+let pass_name = function
+	| PBuildModule -> "build-module"
+	| PBuildClass -> "build-class"
+	| PConnectField -> "connect-field"
+	| PTypeField -> "type-field"
+	| PCheckConstraint -> "check-constraint"
+	| PForce -> "force"
+	| PFinal -> "final"
+
+let display_error ctx msg p = match ctx.com.display.DisplayMode.dms_error_policy with
+	| DisplayMode.EPShow | DisplayMode.EPIgnore -> ctx.on_error ctx msg p
+	| DisplayMode.EPCollect -> add_diagnostics_message ctx.com msg p DisplayTypes.DiagnosticsKind.DKCompilerError DisplayTypes.DiagnosticsSeverity.Error
+
+let make_call ctx e el t p = (!make_call_ref) ctx e el t p
+
+let type_expr ?(mode=MGet) ctx e with_type = (!type_expr_ref) ~mode ctx e with_type
+
+let unify_min ctx el = (!unify_min_ref) ctx el
+let unify_min_for_type_source ctx el src = (!unify_min_for_type_source_ref) ctx el src
+
+let make_static_this c p =
+	let ta = TAnon { a_fields = c.cl_statics; a_status = ref (Statics c) } in
+	mk (TTypeExpr (TClassDecl c)) ta p
+
+let make_static_field_access c cf t p =
+	let ethis = make_static_this c p in
+	mk (TField (ethis,(FStatic (c,cf)))) t p
+
+let make_static_call ctx c cf map args t p =
+	let monos = List.map (fun _ -> mk_mono()) cf.cf_params in
+	let map t = map (apply_params cf.cf_params monos t) in
+	let ef = make_static_field_access c cf (map cf.cf_type) p in
+	make_call ctx ef args (map t) p
+
+let raise_or_display ctx l p =
+	if ctx.untyped then ()
+	else if ctx.in_call_args then raise (WithTypeError(Unify l,p))
+	else display_error ctx (error_msg (Unify l)) p
+
+let raise_or_display_message ctx msg p =
+	if ctx.in_call_args then raise (WithTypeError (Custom msg,p))
+	else display_error ctx msg p
+
+let unify ctx t1 t2 p =
+	try
+		Type.unify t1 t2
+	with
+		Unify_error l ->
+			raise_or_display ctx l p
+
+let unify_raise ctx t1 t2 p =
+	try
+		Type.unify t1 t2
+	with
+		Unify_error l ->
+			(* no untyped check *)
+			raise (Error (Unify l,p))
+
+let save_locals ctx =
+	let locals = ctx.locals in
+	(fun() -> ctx.locals <- locals)
+
+let add_local ctx k n t p =
+	let v = alloc_var k n t p in
+	if Define.defined ctx.com.defines Define.WarnVarShadowing && n <> "_" then begin
+		try
+			let v' = PMap.find n ctx.locals in
+			(* ignore std lib *)
+			if not (List.exists (ExtLib.String.starts_with p.pfile) ctx.com.std_path) then begin
+				ctx.com.warning "This variable shadows a previously declared variable" p;
+				ctx.com.warning "Previous variable was here" v'.v_pos
+			end
+		with Not_found ->
+			()
+	end;
+	ctx.locals <- PMap.add n v ctx.locals;
+	v
+
+let check_identifier_name ctx name kind p =
+	if starts_with name '$' then
+		display_error ctx ((StringHelper.capitalize kind) ^ " names starting with a dollar are not allowed: \"" ^ name ^ "\"") p
+	else if not (Lexer.is_valid_identifier name) then
+		display_error ctx ("\"" ^ (StringHelper.s_escape name) ^ "\" is not a valid " ^ kind ^ " name") p
+
+let check_field_name ctx name p =
+	match name with
+	| "new" -> () (* the only keyword allowed in field names *)
+	| _ -> check_identifier_name ctx name "field" p
+
+let check_uppercase_identifier_name ctx name kind p =
+	if String.length name = 0 then
+		display_error ctx ((StringHelper.capitalize kind) ^ " name must not be empty") p
+	else if Ast.is_lower_ident name then
+		display_error ctx ((StringHelper.capitalize kind) ^ " name should start with an uppercase letter: \"" ^ name ^ "\"") p
+	else
+		check_identifier_name ctx name kind p
+
+let check_module_path ctx path p =
+	check_uppercase_identifier_name ctx (snd path) "module" p;
+	let pack = fst path in
+	try
+		List.iter (fun part -> Path.check_package_name part) pack;
+	with Failure msg ->
+		display_error ctx ("\"" ^ (StringHelper.s_escape (String.concat "." pack)) ^ "\" is not a valid package name:") p;
+		display_error ctx msg p
+
+let check_local_variable_name ctx name origin p =
+	match name with
+	| "this" -> () (* TODO: vars named `this` should technically be VGenerated, not VUser *)
+	| _ ->
+		let s_var_origin origin =
+			match origin with
+			| TVOLocalVariable -> "variable"
+			| TVOArgument -> "function argument"
+			| TVOForVariable -> "for variable"
+			| TVOPatternVariable -> "pattern variable"
+			| TVOCatchVariable -> "catch variable"
+			| TVOLocalFunction -> "function"
+		in
+		check_identifier_name ctx name (s_var_origin origin) p
+
+let add_local_with_origin ctx origin n t p =
+	check_local_variable_name ctx n origin p;
+	add_local ctx (VUser origin) n t p
+
+let gen_local_prefix = "`"
+
+let gen_local ctx t p =
+	(* ensure that our generated local does not mask an existing one *)
+	let rec loop n =
+		let nv = (if n = 0 then gen_local_prefix else gen_local_prefix ^ string_of_int n) in
+		if PMap.mem nv ctx.locals then
+			loop (n+1)
+		else
+			nv
+	in
+	add_local ctx VGenerated (loop 0) t p
+
+let is_gen_local v =
+	String.unsafe_get v.v_name 0 = String.unsafe_get gen_local_prefix 0
+
+let delay ctx p f =
+	let rec loop = function
+		| [] -> [p,[f]]
+		| (p2,l) :: rest ->
+			if p2 = p then
+				(p, f :: l) :: rest
+			else if p2 < p then
+				(p2,l) :: loop rest
+			else
+				(p,[f]) :: (p2,l) :: rest
+	in
+	ctx.g.delayed <- loop ctx.g.delayed
+
+let delay_late ctx p f =
+	let rec loop = function
+		| [] -> [p,[f]]
+		| (p2,l) :: rest ->
+			if p2 <= p then
+				(p2,l) :: loop rest
+			else
+				(p,[f]) :: (p2,l) :: rest
+	in
+	ctx.g.delayed <- loop ctx.g.delayed
+
+let rec flush_pass ctx p (where:string) =
+	match ctx.g.delayed with
+	| (p2,l) :: rest when p2 <= p ->
+		(match l with
+		| [] ->
+			ctx.g.delayed <- rest;
+		| f :: l ->
+			ctx.g.delayed <- (p2,l) :: rest;
+			f());
+		flush_pass ctx p where
+	| _ ->
+		()
+
+let make_pass ctx f = f
+
+let init_class_done ctx =
+	ctx.pass <- PTypeField
+
+let exc_protect ?(force=true) ctx f (where:string) =
+	let r = ref (lazy_available t_dynamic) in
+	r := lazy_wait (fun() ->
+		try
+			let t = f r in
+			r := lazy_available t;
+			t
+		with
+			| Error (m,p) ->
+				raise (Fatal_error ((error_msg m),p))
+	);
+	if force then delay ctx PForce (fun () -> ignore(lazy_type r));
+	r
+
+let fake_modules = Hashtbl.create 0
+let create_fake_module ctx file =
+	let file = Path.unique_full_path file in
+	let mdep = (try Hashtbl.find fake_modules file with Not_found ->
+		let mdep = {
+			m_id = alloc_mid();
+			m_path = (["$DEP"],file);
+			m_types = [];
+			m_extra = module_extra file (Define.get_signature ctx.com.defines) (file_time file) MFake [];
+		} in
+		Hashtbl.add fake_modules file mdep;
+		mdep
+	) in
+	Hashtbl.replace ctx.g.modules mdep.m_path mdep;
+	mdep
+
+let push_this ctx e = match e.eexpr with
+	| TConst ((TInt _ | TFloat _ | TString _ | TBool _) as ct) ->
+		(EConst (tconst_to_const ct),e.epos),fun () -> ()
+	| _ ->
+		ctx.this_stack <- e :: ctx.this_stack;
+		let er = EMeta((Meta.This,[],e.epos), (EConst(Ident "this"),e.epos)),e.epos in
+		er,fun () -> ctx.this_stack <- List.tl ctx.this_stack
+
+let is_removable_field ctx f =
+	has_class_field_flag f CfExtern || Meta.has Meta.Generic f.cf_meta
+	|| (match f.cf_kind with
+		| Var {v_read = AccRequire (s,_)} -> true
+		| Method MethMacro -> not ctx.in_macro
+		| _ -> false)
+
+(** checks if we can access to a given class field using current context *)
+let rec can_access ctx ?(in_overload=false) c cf stat =
+	if (has_class_field_flag cf CfPublic) then
+		true
+	else if not in_overload && ctx.com.config.pf_overload && Meta.has Meta.Overload cf.cf_meta then
+		true
+	else
+	(* TODO: should we add a c == ctx.curclass short check here? *)
+	(* has metadata path *)
+	let rec make_path c f = match c.cl_kind with
+		| KAbstractImpl a -> fst a.a_path @ [snd a.a_path; f.cf_name]
+		| KGenericInstance(c,_) -> make_path c f
+		| _ when c.cl_private -> List.rev (f.cf_name :: snd c.cl_path :: (List.tl (List.rev (fst c.cl_path))))
+		| _ -> fst c.cl_path @ [snd c.cl_path; f.cf_name]
+	in
+	let rec expr_path acc e =
+		match fst e with
+		| EField (e,f) -> expr_path (f :: acc) e
+		| EConst (Ident n) -> n :: acc
+		| _ -> []
+	in
+	let rec chk_path psub pfull is_current_path =
+		match psub, pfull with
+		| [], _ -> true
+		| a :: l1, b :: l2 when a = b ->
+			if
+				(* means it's a path of a superclass or implemented interface *)
+				not is_current_path &&
+				(* it's the last part of path in a meta && it denotes a package *)
+				l1 = [] && not (StringHelper.starts_uppercase_identifier a)
+			then
+				false
+			else
+				chk_path l1 l2 is_current_path
+		| _ -> false
+	in
+	let has m c f (path,is_current_path) =
+		let rec loop = function
+			| (m2,el,_) :: l when m = m2 ->
+				List.exists (fun e ->
+					match fst e with
+					| EConst (Ident "std") ->
+						(* If we have `@:allow(std)`, check if our path has exactly two elements
+						   (type name + field name) *)
+						(match path with [_;_] -> true | _ -> false)
+					| _ ->
+						let p = expr_path [] e in
+						(p <> [] && chk_path p path is_current_path)
+				) el
+				|| loop l
+			| _ :: l -> loop l
+			| [] -> false
+		in
+		loop c.cl_meta || loop f.cf_meta
+	in
+	let cur_paths = ref [] in
+	let rec loop c is_current_path =
+		cur_paths := (make_path c ctx.curfield, is_current_path) :: !cur_paths;
+		begin match c.cl_super with
+			| Some (csup,_) -> loop csup false
+			| None -> ()
+		end;
+		List.iter (fun (c,_) -> loop c false) c.cl_implements;
+	in
+	loop ctx.curclass true;
+	let is_constr = cf.cf_name = "new" in
+	let rec loop c =
+		try
+			has Meta.Access ctx.curclass ctx.curfield ((make_path c cf), true)
+			|| (
+				(* if our common ancestor declare/override the field, then we can access it *)
+				let allowed f = is_parent c ctx.curclass || (List.exists (has Meta.Allow c f) !cur_paths) in
+				if is_constr
+				then (match c.cl_constructor with
+					| Some cf ->
+						if allowed cf then true
+						else if cf.cf_expr = None then false (* maybe it's an inherited auto-generated constructor *)
+						else raise Not_found
+					| _ -> false
+				)
+				else try allowed (PMap.find cf.cf_name (if stat then c.cl_statics else c.cl_fields)) with Not_found -> false
+			)
+			|| (match c.cl_super with
+			| Some (csup,_) -> loop csup
+			| None -> false)
+		with Not_found -> false
+	in
+	let b = loop c
+	(* access is also allowed of we access a type parameter which is constrained to our (base) class *)
+	|| (match c.cl_kind with
+		| KTypeParameter tl ->
+			List.exists (fun t -> match follow t with TInst(c,_) -> loop c | _ -> false) tl
+		| _ -> false)
+	|| (Meta.has Meta.PrivateAccess ctx.meta) in
+	(* TODO: find out what this does and move it to genas3 *)
+	if b && Common.defined ctx.com Common.Define.As3 && not (Meta.has Meta.Public cf.cf_meta) then cf.cf_meta <- (Meta.Public,[],cf.cf_pos) :: cf.cf_meta;
+	b
+
+(** removes the first argument of the class field's function type and all its overloads *)
+let prepare_using_field cf = match follow cf.cf_type with
+	| TFun((_,_,tf) :: args,ret) ->
+		let rec loop acc overloads = match overloads with
+			| ({cf_type = TFun((_,_,tfo) :: args,ret)} as cfo) :: l ->
+				let tfo = apply_params cfo.cf_params (List.map snd cfo.cf_params) tfo in
+				(* ignore overloads which have a different first argument *)
+				if type_iseq tf tfo then loop ({cfo with cf_type = TFun(args,ret)} :: acc) l else loop acc l
+			| _ :: l ->
+				loop acc l
+			| [] ->
+				acc
+		in
+		{cf with cf_overloads = loop [] cf.cf_overloads; cf_type = TFun(args,ret)}
+	| _ -> cf
+
+let merge_core_doc ctx mt =
+	(match mt with
+	| TClassDecl c | TAbstractDecl { a_impl = Some c } when Meta.has Meta.CoreApi c.cl_meta ->
+		let c_core = ctx.g.do_load_core_class ctx c in
+		if c.cl_doc = None then c.cl_doc <- c_core.cl_doc;
+		let maybe_merge cf_map cf =
+			if cf.cf_doc = None then try cf.cf_doc <- (PMap.find cf.cf_name cf_map).cf_doc with Not_found -> ()
+		in
+		List.iter (maybe_merge c_core.cl_fields) c.cl_ordered_fields;
+		List.iter (maybe_merge c_core.cl_statics) c.cl_ordered_statics;
+		begin match c.cl_constructor,c_core.cl_constructor with
+			| Some ({cf_doc = None} as cf),Some cf2 -> cf.cf_doc <- cf2.cf_doc
+			| _ -> ()
+		end
+	| _ -> ())
+
+(* -------------- debug functions to activate when debugging typer passes ------------------------------- *)
+(*/*
+
+let delay_tabs = ref ""
+
+let context_ident ctx =
+	if Common.defined ctx.com Common.Define.CoreApi then
+		" core "
+	else if Common.defined ctx.com Common.Define.Macro then
+		"macro "
+	else
+		"  out "
+
+let debug ctx str =
+	if Common.raw_defined ctx.com "cdebug" then begin
+		let s = (context_ident ctx ^ string_of_int (String.length !delay_tabs) ^ " " ^ !delay_tabs ^ str) in
+		match ctx.com.json_out with
+		| None -> print_endline s
+		| Some _ -> DynArray.add ctx.com.pass_debug_messages s
+	end
+
+let init_class_done ctx =
+	debug ctx ("init_class_done " ^ s_type_path ctx.curclass.cl_path);
+	init_class_done ctx
+
+let ctx_pos ctx =
+	let inf = s_type_path ctx.m.curmod.m_path in
+	let inf = (match snd ctx.curclass.cl_path with "" -> inf | n when n = snd ctx.m.curmod.m_path -> inf | n -> inf ^ "." ^ n) in
+	let inf = (match ctx.curfield.cf_name with "" -> inf | n -> inf ^ ":" ^ n) in
+	inf
+
+let pass_infos ctx p =
+	let inf = pass_name p ^ " ("  ^ ctx_pos ctx ^ ")" in
+	let inf = if ctx.pass > p then inf ^ " ??CURPASS=" ^ pass_name ctx.pass else inf in
+	inf
+
+let delay ctx p f =
+	let inf = pass_infos ctx p in
+	let rec loop = function
+		| [] -> [p,[f,inf,ctx]]
+		| (p2,l) :: rest ->
+			if p2 = p then
+				(p, (f,inf,ctx) :: l) :: rest
+			else if p2 < p then
+				(p2,l) :: loop rest
+			else
+				(p,[f,inf,ctx]) :: (p2,l) :: rest
+	in
+	ctx.g.debug_delayed <- loop ctx.g.debug_delayed;
+	debug ctx ("add " ^ inf)
+
+let delay_late ctx p f =
+	let inf = pass_infos ctx p in
+	let rec loop = function
+		| [] -> [p,[f,inf,ctx]]
+		| (p2,l) :: rest ->
+			if p2 <= p then
+				(p2,l) :: loop rest
+			else
+				(p,[f,inf,ctx]) :: (p2,l) :: rest
+	in
+	ctx.g.debug_delayed <- loop ctx.g.debug_delayed;
+	debug ctx ("add late " ^ inf)
+
+let pending_passes ctx =
+	let rec loop acc = function
+		| (p,l) :: pl when p < ctx.pass -> loop (acc @ l) pl
+		| _ -> acc
+	in
+	match loop [] ctx.g.debug_delayed with
+	| [] -> ""
+	| l -> " ??PENDING[" ^ String.concat ";" (List.map (fun (_,i,_) -> i) l) ^ "]"
+
+let display_error ctx msg p =
+	debug ctx ("ERROR " ^ msg);
+	display_error ctx msg p
+
+let make_pass ?inf ctx f =
+	let inf = (match inf with None -> pass_infos ctx ctx.pass | Some inf -> inf) in
+	(fun v ->
+		debug ctx ("run " ^ inf ^ pending_passes ctx);
+		let old = !delay_tabs in
+		delay_tabs := !delay_tabs ^ "\t";
+		let t = (try
+			f v
+		with
+			| Fatal_error (e,p) ->
+				delay_tabs := old;
+				raise (Fatal_error (e,p))
+			| exc when not (Common.raw_defined ctx.com "stack") ->
+				debug ctx ("FATAL " ^ Printexc.to_string exc);
+				delay_tabs := old;
+				raise exc
+		) in
+		delay_tabs := old;
+		t
+	)
+
+let rec flush_pass ctx p where =
+	let rec loop() =
+		match ctx.g.debug_delayed with
+		| (p2,l) :: rest when p2 <= p ->
+			(match l with
+			| [] ->
+				ctx.g.debug_delayed <- rest
+			| (f,inf,ctx2) :: l ->
+				ctx.g.debug_delayed <- (p2,l) :: rest;
+				match p2 with
+				| PTypeField | PBuildClass -> f()
+				| _ -> (make_pass ~inf ctx f)());
+			loop()
+		| _ ->
+			()
+	in
+	match ctx.g.debug_delayed with
+	| (p2,_) :: _ when p2 <= p ->
+		let old = !delay_tabs in
+		debug ctx ("flush " ^ pass_name p ^ "(" ^ where ^ ")");
+		delay_tabs := !delay_tabs ^ "\t";
+		loop();
+		delay_tabs := old;
+		debug ctx "flush-done";
+	| _ ->
+		()
+
+let make_where ctx where =
+	where ^ " (" ^ ctx_pos ctx ^ ")"
+
+let exc_protect ?(force=true) ctx f (where:string) =
+	let r = ref (lazy_available t_dynamic) in
+	r := lazy_wait (make_pass ~inf:(make_where ctx where) ctx (fun() ->
+		try
+			let t = f r in
+			r := lazy_available t;
+			t
+		with
+			| Error (m,p) ->
+				raise (Fatal_error ((error_msg m),p))
+	));
+	if force then delay ctx PForce (fun () -> ignore(lazy_type r));
+	r
+
+*/*)
+(* --------------------------------------------------- *)
+
+
diff --git a/src/core/abstract.ml b/src/core/abstract.ml
new file mode 100644
index 0000000000000000000000000000000000000000..812ff16a9d1a8b7c2afcb799302ea605a998c088
--- /dev/null
+++ b/src/core/abstract.ml
@@ -0,0 +1,102 @@
+open Meta
+open Type
+open Error
+
+let build_abstract a = match a.a_impl with
+	| Some c -> ignore(c.cl_build())
+	| None -> ()
+
+let has_direct_to ab pl b =
+	List.exists (unify_to ab pl ~allow_transitive_cast:false b) ab.a_to
+
+let has_direct_from ab pl a b =
+	List.exists (unify_from ab pl a ~allow_transitive_cast:false b) ab.a_from
+
+let find_field_to ab pl b =
+	build_abstract ab;
+	List.find (unify_to_field ab pl b) ab.a_to_field
+
+let find_field_from ab pl a b =
+	build_abstract ab;
+	List.find (unify_from_field ab pl a b) ab.a_from_field
+
+let find_to_from f ab_left tl_left ab_right tl_right tleft tright =
+	build_abstract ab_left;
+	build_abstract ab_right;
+	if has_direct_to ab_right tl_right tleft || has_direct_from ab_left tl_left tright tleft then
+		raise Not_found
+	else
+		try f ab_right tl_right (fun () -> find_field_to ab_right tl_right tleft)
+		with Not_found -> f ab_left tl_left (fun () -> find_field_from ab_left tl_left tright tleft)
+
+let find_to ab pl b =
+	build_abstract ab;
+	if follow b == t_dynamic then
+		List.find (fun (t,_) -> follow t == t_dynamic) ab.a_to_field
+	else if has_direct_to ab pl b then
+		raise Not_found (* legacy compatibility *)
+	else
+		find_field_to ab pl b
+
+let find_from ab pl a b =
+	build_abstract ab;
+	if follow a == t_dynamic then
+		List.find (fun (t,_) -> follow t == t_dynamic) ab.a_from_field
+	else if has_direct_from ab pl a b then
+		raise Not_found (* legacy compatibility *)
+	else
+		find_field_from ab pl a b
+
+let underlying_type_stack = new_rec_stack()
+
+let rec get_underlying_type ?(return_first=false) a pl =
+	let maybe_recurse t =
+		let rec loop t = match t with
+			| TMono r ->
+				(match !r with
+				| Some t -> loop t
+				| _ -> t)
+			| TLazy f ->
+				loop (lazy_type f)
+			| TAbstract({a_path=([],"Null")} as a,[t1]) ->
+				TAbstract(a,[loop t1])
+			| TType (t,tl) ->
+				loop (apply_params t.t_params tl t.t_type)
+			| TAbstract(a,tl) when not (Meta.has Meta.CoreType a.a_meta) ->
+				if rec_stack_exists (fast_eq t) underlying_type_stack then begin
+					let pctx = print_context() in
+					let s = String.concat " -> " (List.map (fun t -> s_type pctx t) (List.rev (t :: underlying_type_stack.rec_stack))) in
+					error ("Abstract chain detected: " ^ s) a.a_pos
+				end;
+				(*
+					Even if only the first underlying type was requested
+					keep traversing to detect mutually recursive abstracts
+				*)
+				let result = get_underlying_type a tl in
+				if return_first then t
+				else result
+			| _ ->
+				t
+		in
+		rec_stack_loop underlying_type_stack (TAbstract(a,pl)) loop t
+	in
+	try
+		if not (Meta.has Meta.MultiType a.a_meta) then raise Not_found;
+		(* TODO:
+			Look into replacing `mk_mono` & `find_to` with `build_abstract a` & `TAbstract(a, pl)`.
+			`find_to` is probably needed for `@:multiType`
+		*)
+		let m = mk_mono() in
+		let _ = find_to a pl m in
+		maybe_recurse (follow m)
+	with Not_found ->
+		if Meta.has Meta.CoreType a.a_meta then
+			t_dynamic
+		else
+			maybe_recurse (apply_params a.a_params pl a.a_this)
+
+let rec follow_with_abstracts t = match follow t with
+	| TAbstract(a,tl) when not (Meta.has Meta.CoreType a.a_meta) ->
+		follow_with_abstracts (get_underlying_type a tl)
+	| t ->
+		t
\ No newline at end of file
diff --git a/src/syntax/ast.ml b/src/core/ast.ml
similarity index 70%
rename from src/syntax/ast.ml
rename to src/core/ast.ml
index 08e11efc6e7f2b93481d4534c1cdaa4888dcf2cd..4ddbfe08a0165a5ed74139bc16e5a8ffbb705b0f 100644
--- a/src/syntax/ast.ml
+++ b/src/core/ast.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -62,6 +62,9 @@ type keyword =
 	| False
 	| Abstract
 	| Macro
+	| Final
+	| Operator
+	| Overload
 
 type binop =
 	| OpAdd
@@ -87,6 +90,7 @@ type binop =
 	| OpAssignOp of binop
 	| OpInterval
 	| OpArrow
+	| OpIn
 
 type unop =
 	| Increment
@@ -95,10 +99,15 @@ type unop =
 	| Neg
 	| NegBits
 
+type string_literal_kind =
+	| SDoubleQuotes
+	| SSingleQuotes
+	(* | SMarkup *)
+
 type constant =
 	| Int of string
 	| Float of string
-	| String of string
+	| String of string * string_literal_kind
 	| Ident of string
 	| Regexp of string * string
 
@@ -135,6 +144,10 @@ type while_flag =
 	| NormalWhile
 	| DoWhile
 
+type quote_status =
+	| NoQuotes
+	| DoubleQuotes
+
 type type_path = {
 	tpackage : string list;
 	tname : string;
@@ -155,6 +168,8 @@ and complex_type =
 	| CTParent of type_hint
 	| CTExtend of placed_type_path list * class_field list
 	| CTOptional of type_hint
+	| CTNamed of placed_name * type_hint
+	| CTIntersection of type_hint list
 
 and type_hint = complex_type * pos
 
@@ -167,22 +182,33 @@ and func = {
 
 and placed_name = string * pos
 
+and function_kind =
+	| FKAnonymous
+	| FKNamed of placed_name * bool (* bool for `inline` *)
+	| FKArrow
+
+and display_kind =
+	| DKCall
+	| DKDot
+	| DKStructure
+	| DKMarked
+	| DKPattern of bool
+
 and expr_def =
 	| EConst of constant
 	| EArray of expr * expr
 	| EBinop of binop * expr * expr
 	| EField of expr * string
 	| EParenthesis of expr
-	| EObjectDecl of (placed_name * expr) list
+	| EObjectDecl of ((string * pos * quote_status) * expr) list
 	| EArrayDecl of expr list
 	| ECall of expr * expr list
 	| ENew of placed_type_path * expr list
 	| EUnop of unop * unop_flag * expr
-	| EVars of (placed_name * type_hint option * expr option) list
-	| EFunction of string option * func
+	| EVars of (placed_name * bool * type_hint option * expr option) list
+	| EFunction of function_kind * func
 	| EBlock of expr list
 	| EFor of expr * expr
-	| EIn of expr * expr
 	| EIf of expr * expr * expr option
 	| EWhile of expr * expr * while_flag
 	| ESwitch of expr * (expr list * expr option * expr option * pos) list * (expr option * pos) option
@@ -193,7 +219,7 @@ and expr_def =
 	| EUntyped of expr
 	| EThrow of expr
 	| ECast of expr * type_hint option
-	| EDisplay of expr * bool
+	| EDisplay of expr * display_kind
 	| EDisplayNew of placed_type_path
 	| ETernary of expr * expr * expr
 	| ECheckType of expr * type_hint
@@ -204,7 +230,7 @@ and expr = expr_def * pos
 and type_param = {
 	tp_name : placed_name;
 	tp_params :	type_param list;
-	tp_constraints : type_hint list;
+	tp_constraints : type_hint option;
 	tp_meta : metadata;
 }
 
@@ -221,6 +247,10 @@ and access =
 	| ADynamic
 	| AInline
 	| AMacro
+	| AFinal
+	| AExtern
+
+and placed_access = access * pos
 
 and class_field_kind =
 	| FVar of type_hint option * expr option
@@ -232,7 +262,7 @@ and class_field = {
 	cff_doc : documentation;
 	cff_pos : pos;
 	mutable cff_meta : metadata;
-	mutable cff_access : access list;
+	mutable cff_access : placed_access list;
 	mutable cff_kind : class_field_kind;
 }
 
@@ -246,13 +276,14 @@ type class_flag =
 	| HPrivate
 	| HExtends of placed_type_path
 	| HImplements of placed_type_path
+	| HFinal
 
 type abstract_flag =
-	| APrivAbstract
-	| AFromType of type_hint
-	| AToType of type_hint
-	| AIsType of type_hint
-	| AExtern
+	| AbPrivate
+	| AbFrom of type_hint
+	| AbTo of type_hint
+	| AbOver of type_hint
+	| AbExtern
 
 type enum_constructor = {
 	ec_name : placed_name;
@@ -275,7 +306,7 @@ type ('a,'b) definition = {
 
 type import_mode =
 	| INormal
-	| IAsName of string
+	| IAsName of placed_name
 	| IAll
 
 type import = placed_name list * import_mode
@@ -293,13 +324,16 @@ type type_decl = type_def * pos
 type package = string list * type_decl list
 
 let is_lower_ident i =
-	let rec loop p =
-		match String.unsafe_get i p with
-		| 'a'..'z' -> true
-		| '_' -> if p + 1 < String.length i then loop (p + 1) else true
-		| _ -> false
-	in
-	loop 0
+	if String.length i = 0 then
+		raise (Invalid_argument "Identifier name must not be empty")
+	else
+		let rec loop p =
+			match String.unsafe_get i p with
+			| 'a'..'z' -> true
+			| '_' -> p + 1 >= String.length i || loop (p + 1)
+			| _ -> false
+		in
+		loop 0
 
 let pos = snd
 
@@ -330,27 +364,17 @@ let rec punion_el el = match el with
 
 let parse_path s =
 	match List.rev (ExtString.String.nsplit s ".") with
-	| [] -> failwith "Invalid empty path"
+	| [] -> [],"" (* This is how old extlib behaved. *)
 	| x :: l -> List.rev l, x
 
-let s_escape ?(hex=true) s =
-	let b = Buffer.create (String.length s) in
-	for i = 0 to (String.length s) - 1 do
-		match s.[i] with
-		| '\n' -> Buffer.add_string b "\\n"
-		| '\t' -> Buffer.add_string b "\\t"
-		| '\r' -> Buffer.add_string b "\\r"
-		| '"' -> Buffer.add_string b "\\\""
-		| '\\' -> Buffer.add_string b "\\\\"
-		| c when int_of_char c < 32 && hex -> Buffer.add_string b (Printf.sprintf "\\x%.2X" (int_of_char c))
-		| c -> Buffer.add_char b c
-	done;
-	Buffer.contents b
-
 let s_constant = function
 	| Int s -> s
 	| Float s -> s
-	| String s -> "\"" ^ s_escape s ^ "\""
+	| String(s,qs) ->
+		begin match qs with
+		| SDoubleQuotes -> "\"" ^ StringHelper.s_escape s ^ "\""
+		| SSingleQuotes -> "\"" ^ StringHelper.s_escape s ^ "\""
+		end
 	| Ident s -> s
 	| Regexp (r,o) -> "~/" ^ r ^ "/"
 
@@ -362,6 +386,10 @@ let s_access = function
 	| ADynamic -> "dynamic"
 	| AInline -> "inline"
 	| AMacro -> "macro"
+	| AFinal -> "final"
+	| AExtern -> "extern"
+
+let s_placed_access (a,_) = s_access a
 
 let s_keyword = function
 	| Function -> "function"
@@ -406,6 +434,9 @@ let s_keyword = function
 	| False -> "false"
 	| Abstract -> "abstract"
 	| Macro -> "macro"
+	| Final -> "final"
+	| Operator -> "operator"
+	| Overload -> "overload"
 
 let rec s_binop = function
 	| OpAdd -> "+"
@@ -431,6 +462,7 @@ let rec s_binop = function
 	| OpAssignOp op -> s_binop op ^ "="
 	| OpInterval -> "..."
 	| OpArrow -> "=>"
+	| OpIn -> " in "
 
 let s_unop = function
 	| Increment -> "++"
@@ -464,7 +496,7 @@ let s_token = function
 	| At -> "@"
 	| Dollar v -> "$" ^ v
 
-exception Invalid_escape_sequence of char * int
+exception Invalid_escape_sequence of char * int * (string option)
 
 let unescape s =
 	let b = Buffer.create 0 in
@@ -473,7 +505,7 @@ let unescape s =
 			()
 		else
 			let c = s.[i] in
-			let fail () = raise (Invalid_escape_sequence(c,i)) in
+			let fail msg = raise (Invalid_escape_sequence(c,i,msg)) in
 			if esc then begin
 				let inext = ref (i + 1) in
 				(match c with
@@ -482,14 +514,21 @@ let unescape s =
 				| 't' -> Buffer.add_char b '\t'
 				| '"' | '\'' | '\\' -> Buffer.add_char b c
 				| '0'..'3' ->
-					let c = (try char_of_int (int_of_string ("0o" ^ String.sub s i 3)) with _ -> fail()) in
-					Buffer.add_char b c;
+					let u = (try (int_of_string ("0o" ^ String.sub s i 3)) with _ -> fail None) in
+					if u > 127 then
+						fail (Some ("Values greater than \\177 are not allowed. Use \\u00" ^ (Printf.sprintf "%02x" u) ^ " instead."));
+					Buffer.add_char b (char_of_int u);
 					inext := !inext + 2;
 				| 'x' ->
-					let c = (try char_of_int (int_of_string ("0x" ^ String.sub s (i+1) 2)) with _ -> fail()) in
-					Buffer.add_char b c;
+					let fail_no_hex () = fail (Some "Must be followed by a hexadecimal sequence.") in
+					let hex = try String.sub s (i+1) 2 with _ -> fail_no_hex () in
+					let u = (try (int_of_string ("0x" ^ hex)) with _ -> fail_no_hex ()) in
+					if u > 127 then
+						fail (Some ("Values greater than \\x7f are not allowed. Use \\u00" ^ hex ^ " instead."));
+					Buffer.add_char b (char_of_int u);
 					inext := !inext + 2;
 				| 'u' ->
+					let fail_no_hex () = fail (Some "Must be followed by a hexadecimal sequence enclosed in curly brackets.") in
 					let (u, a) =
 						try
 							(int_of_string ("0x" ^ String.sub s (i+1) 4), 4)
@@ -497,17 +536,19 @@ let unescape s =
 							assert (s.[i+1] = '{');
 							let l = String.index_from s (i+3) '}' - (i+2) in
 							let u = int_of_string ("0x" ^ String.sub s (i+2) l) in
-							assert (u <= 0x10FFFF);
+							if u > 0x10FFFF then
+								fail (Some "Maximum allowed value for unicode escape sequence is \\u{10FFFF}");
 							(u, l+2)
-						with _ ->
-							fail()
+						with
+							| Invalid_escape_sequence (c,i,msg) as e -> raise e
+							| _ -> fail_no_hex ()
 					in
-					let ub = UTF8.Buf.create 0 in
-					UTF8.Buf.add_char ub (UChar.uchar_of_int u);
-					Buffer.add_string b (UTF8.Buf.contents ub);
+					if u >= 0xD800 && u < 0xE000 then
+						fail (Some "UTF-16 surrogates are not allowed in strings.");
+					UTF8.add_uchar b (UCharExt.uchar_of_int u);
 					inext := !inext + a;
 				| _ ->
-					fail());
+					fail None);
 				loop false !inext;
 			end else
 				match c with
@@ -550,9 +591,12 @@ let map_expr loop (e,p) =
 			let tl = List.map tpath tl in
 			let fl = List.map cfield fl in
 			CTExtend (tl,fl)
-		| CTOptional t -> CTOptional (type_hint t)),p
+		| CTOptional t -> CTOptional (type_hint t)
+		| CTNamed (n,t) -> CTNamed (n,type_hint t)
+		| CTIntersection tl -> CTIntersection(List.map type_hint tl)
+		),p
 	and tparamdecl t =
-		let constraints = List.map type_hint t.tp_constraints in
+		let constraints = opt type_hint t.tp_constraints in
 		let params = List.map tparamdecl t.tp_params in
 		{ tp_name = t.tp_name; tp_constraints = constraints; tp_params = params; tp_meta = t.tp_meta }
 	and func f =
@@ -584,7 +628,7 @@ let map_expr loop (e,p) =
 		EBinop (op,e1,e2)
 	| EField (e,f) -> EField (loop e, f)
 	| EParenthesis e -> EParenthesis (loop e)
-	| EObjectDecl fl -> EObjectDecl (List.map (fun ((f,p),e) -> (f,p),loop e) fl)
+	| EObjectDecl fl -> EObjectDecl (List.map (fun (k,e) -> k,loop e) fl)
 	| EArrayDecl el -> EArrayDecl (List.map loop el)
 	| ECall (e,el) ->
 		let e = loop e in
@@ -596,21 +640,17 @@ let map_expr loop (e,p) =
 		ENew (t,el)
 	| EUnop (op,f,e) -> EUnop (op,f,loop e)
 	| EVars vl ->
-		EVars (List.map (fun (n,t,eo) ->
+		EVars (List.map (fun (n,b,t,eo) ->
 			let t = opt type_hint t in
 			let eo = opt loop eo in
-			n,t,eo
+			n,b,t,eo
 		) vl)
-	| EFunction (n,f) -> EFunction (n,func f)
+	| EFunction (kind,f) -> EFunction (kind,func f)
 	| EBlock el -> EBlock (List.map loop el)
 	| EFor (e1,e2) ->
 		let e1 = loop e1 in
 		let e2 = loop e2 in
 		EFor (e1,e2)
-	| EIn (e1,e2) ->
-		let e1 = loop e1 in
-		let e2 = loop e2 in
-		EIn (e1,e2)
 	| EIf (e,e1,e2) ->
 		let e = loop e in
 		let e1 = loop e1 in
@@ -665,7 +705,7 @@ let iter_expr loop (e,p) =
 	| EConst _ | EContinue | EBreak | EDisplayNew _ | EReturn None -> ()
 	| EParenthesis e1 | EField(e1,_) | EUnop(_,_,e1) | EReturn(Some e1) | EThrow e1 | EMeta(_,e1)
 	| ECheckType(e1,_) | EDisplay(e1,_) | ECast(e1,_) | EUntyped e1 -> loop e1;
-	| EArray(e1,e2) | EBinop(_,e1,e2) | EIn(e1,e2) | EFor(e1,e2) | EWhile(e1,e2,_) | EIf(e1,e2,None) -> loop e1; loop e2;
+	| EArray(e1,e2) | EBinop(_,e1,e2) | EFor(e1,e2) | EWhile(e1,e2,_) | EIf(e1,e2,None) -> loop e1; loop e2;
 	| ETernary(e1,e2,e3) | EIf(e1,e2,Some e3) -> loop e1; loop e2; loop e3;
 	| EArrayDecl el | ENew(_,el) | EBlock el -> List.iter loop el
 	| ECall(e1,el) -> loop e1; exprs el;
@@ -684,9 +724,20 @@ let iter_expr loop (e,p) =
 	| EFunction(_,f) ->
 		List.iter (fun (_,_,_,_,eo) -> opt eo) f.f_args;
 		opt f.f_expr
-	| EVars vl -> List.iter (fun (_,_,eo) -> opt eo) vl
+	| EVars vl -> List.iter (fun (_,_,_,eo) -> opt eo) vl
 
-let s_expr e =
+let s_object_key_name name =  function
+	| DoubleQuotes -> "\"" ^ StringHelper.s_escape name ^ "\""
+	| NoQuotes -> name
+
+let s_display_kind = function
+	| DKCall -> "DKCall"
+	| DKDot -> "DKDot"
+	| DKStructure -> "DKStructure"
+	| DKMarked -> "DKMarked"
+	| DKPattern _ -> "DKPattern"
+
+module Printer = struct
 	let rec s_expr_inner tabs (e,_) =
 		match e with
 		| EConst c -> s_constant c
@@ -694,19 +745,19 @@ let s_expr e =
 		| EBinop (op,e1,e2) -> s_expr_inner tabs e1 ^ " " ^ s_binop op ^ " " ^ s_expr_inner tabs e2
 		| EField (e,f) -> s_expr_inner tabs e ^ "." ^ f
 		| EParenthesis e -> "(" ^ (s_expr_inner tabs e) ^ ")"
-		| EObjectDecl fl -> "{ " ^ (String.concat ", " (List.map (fun ((n,_),e) -> n ^ " : " ^ (s_expr_inner tabs e)) fl)) ^ " }"
+		| EObjectDecl fl -> "{ " ^ (String.concat ", " (List.map (fun ((n,_,qs),e) -> (s_object_key_name n qs) ^ " : " ^ (s_expr_inner tabs e)) fl)) ^ " }"
 		| EArrayDecl el -> "[" ^ s_expr_list tabs el ", " ^ "]"
 		| ECall (e,el) -> s_expr_inner tabs e ^ "(" ^ s_expr_list tabs el ", " ^ ")"
 		| ENew (t,el) -> "new " ^ s_complex_type_path tabs t ^ "(" ^ s_expr_list tabs el ", " ^ ")"
 		| EUnop (op,Postfix,e) -> s_expr_inner tabs e ^ s_unop op
 		| EUnop (op,Prefix,e) -> s_unop op ^ s_expr_inner tabs e
-		| EFunction (Some n,f) -> "function " ^ n ^ s_func tabs f
-		| EFunction (None,f) -> "function" ^ s_func tabs f
+		| EFunction (FKNamed((n,_),inline),f) -> (if inline then "inline " else "") ^ "function " ^ n ^ s_func tabs f
+		| EFunction (FKAnonymous,f) -> "function" ^ s_func tabs f
+		| EFunction (FKArrow,f) -> "function" ^ s_func ~is_arrow:true tabs f
 		| EVars vl -> "var " ^ String.concat ", " (List.map (s_var tabs) vl)
 		| EBlock [] -> "{ }"
 		| EBlock el -> s_block tabs el "{" "\n" "}"
 		| EFor (e1,e2) -> "for (" ^ s_expr_inner tabs e1 ^ ") " ^ s_expr_inner tabs e2
-		| EIn (e1,e2) -> s_expr_inner tabs e1 ^ " in " ^ s_expr_inner tabs e2
 		| EIf (e,e1,None) -> "if (" ^ s_expr_inner tabs e ^ ") " ^ s_expr_inner tabs e1
 		| EIf (e,e1,Some e2) -> "if (" ^ s_expr_inner tabs e ^ ") " ^ s_expr_inner tabs e1 ^ " else " ^ s_expr_inner tabs e2
 		| EWhile (econd,e,NormalWhile) -> "while (" ^ s_expr_inner tabs econd ^ ") " ^ s_expr_inner tabs e
@@ -725,7 +776,7 @@ let s_expr e =
 		| ETernary (e1,e2,e3) -> s_expr_inner tabs e1 ^ " ? " ^ s_expr_inner tabs e2 ^ " : " ^ s_expr_inner tabs e3
 		| ECheckType (e,(t,_)) -> "(" ^ s_expr_inner tabs e ^ " : " ^ s_complex_type tabs t ^ ")"
 		| EMeta (m,e) -> s_metadata tabs m ^ " " ^ s_expr_inner tabs e
-		| EDisplay (e1,iscall) -> Printf.sprintf "#DISPLAY(%s, %b)" (s_expr_inner tabs e1) iscall
+		| EDisplay (e1,dk) -> Printf.sprintf "#DISPLAY(%s, %s)" (s_expr_inner tabs e1) (s_display_kind dk)
 		| EDisplayNew tp -> Printf.sprintf "#DISPLAY_NEW(%s)" (s_complex_type_path tabs tp)
 	and s_expr_list tabs el sep =
 		(String.concat sep (List.map (s_expr_inner tabs) el))
@@ -749,13 +800,15 @@ let s_expr e =
 		| CTAnonymous fl -> "{ " ^ String.concat "; " (List.map (s_class_field tabs) fl) ^ "}";
 		| CTParent(t,_) -> "(" ^ s_complex_type tabs t ^ ")"
 		| CTOptional(t,_) -> "?" ^ s_complex_type tabs t
+		| CTNamed((n,_),(t,_)) -> n ^ ":" ^ s_complex_type tabs t
 		| CTExtend (tl, fl) -> "{> " ^ String.concat " >, " (List.map (s_complex_type_path tabs) tl) ^ ", " ^ String.concat ", " (List.map (s_class_field tabs) fl) ^ " }"
+		| CTIntersection tl -> String.concat "&" (List.map (fun (t,_) -> s_complex_type tabs t) tl)
 	and s_class_field tabs f =
 		match f.cff_doc with
 		| Some s -> "/**\n\t" ^ tabs ^ s ^ "\n**/\n"
 		| None -> "" ^
 		if List.length f.cff_meta > 0 then String.concat ("\n" ^ tabs) (List.map (s_metadata tabs) f.cff_meta) else "" ^
-		if List.length f.cff_access > 0 then String.concat " " (List.map s_access f.cff_access) else "" ^
+		if List.length f.cff_access > 0 then String.concat " " (List.map s_placed_access f.cff_access) else "" ^
 		match f.cff_kind with
 		| FVar (t,e) -> "var " ^ (fst f.cff_name) ^ s_opt_type_hint tabs t " : " ^ s_opt_expr tabs e " = "
 		| FProp ((get,_),(set,_),t,e) -> "var " ^ (fst f.cff_name) ^ "(" ^ get ^ "," ^ set ^ ")" ^ s_opt_type_hint tabs t " : " ^ s_opt_expr tabs e " = "
@@ -770,19 +823,23 @@ let s_expr e =
 		match t with
 		| Some(t,_) -> pre ^ s_complex_type tabs t
 		| None -> ""
-	and s_func tabs f =
+	and s_func ?(is_arrow=false) tabs f =
 		s_type_param_list tabs f.f_params ^
 		"(" ^ String.concat ", " (List.map (s_func_arg tabs) f.f_args) ^ ")" ^
 		s_opt_type_hint tabs f.f_type ":" ^
+		(if is_arrow then " -> " else "") ^
 		s_opt_expr tabs f.f_expr " "
 	and s_type_param tabs t =
 		fst (t.tp_name) ^ s_type_param_list tabs t.tp_params ^
-		if List.length t.tp_constraints > 0 then ":(" ^ String.concat ", " (List.map ((fun (t,_) -> s_complex_type tabs t)) t.tp_constraints) ^ ")" else ""
+		begin match t.tp_constraints with
+			| None -> ""
+			| Some(th,_) -> ":(" ^ s_complex_type tabs th ^ ")"
+		end
 	and s_type_param_list tabs tl =
 		if List.length tl > 0 then "<" ^ String.concat ", " (List.map (s_type_param tabs) tl) ^ ">" else ""
 	and s_func_arg tabs ((n,_),o,_,t,e) =
 		if o then "?" else "" ^ n ^ s_opt_type_hint tabs t ":" ^ s_opt_expr tabs e " = "
-	and s_var tabs ((n,_),t,e) =
+	and s_var tabs ((n,_),_,t,e) =
 		n ^ (s_opt_type_hint tabs t ":") ^ s_opt_expr tabs e " = "
 	and s_case tabs (el,e1,e2,_) =
 		"case " ^ s_expr_list tabs el ", " ^
@@ -797,12 +854,14 @@ let s_expr e =
 		| (EBlock [],_) -> ""
 		| (EBlock el,_) -> s_block (tabs ^ "\t") el "" "" ""
 		| _ -> s_expr_inner (tabs ^ "\t") e ^ ";"
-	in s_expr_inner "" e
+
+	let s_expr e = s_expr_inner "" e
+end
 
 let get_value_meta meta =
 	try
 		begin match Meta.get Meta.Value meta with
-			| (_,[EObjectDecl values,_],_) -> List.fold_left (fun acc ((s,_),e) -> PMap.add s e acc) PMap.empty values
+			| (_,[EObjectDecl values,_],_) -> List.fold_left (fun acc ((s,_,_),e) -> PMap.add s e acc) PMap.empty values
 			| _ -> raise Not_found
 		end
 	with Not_found ->
@@ -816,6 +875,12 @@ let rec string_list_of_expr_path_raise (e,p) =
 	| EField (e,f) -> f :: string_list_of_expr_path_raise e
 	| _ -> raise Exit
 
+let rec string_pos_list_of_expr_path_raise (e,p) =
+	match e with
+	| EConst (Ident i) -> [i,p]
+	| EField (e,f) -> (f,p) :: string_pos_list_of_expr_path_raise e (* wrong p? *)
+	| _ -> raise Exit
+
 let expr_of_type_path (sl,s) p =
 	match sl with
 	| [] -> (EConst(Ident s),p)
@@ -842,7 +907,7 @@ let match_path recursive sl sl_pattern =
 	in
 	loop sl sl_pattern
 
-let full_dot_path mpath tpath =
+let full_dot_path2 mpath tpath =
 	if mpath = tpath then
 		(fst tpath) @ [snd tpath]
 	else
@@ -862,8 +927,170 @@ module Expr = struct
 
 	let field_assoc name fl =
 		let rec loop fl = match fl with
-			| ((name',_),e) :: fl -> if name' = name then e else loop fl
+			| ((name',_,_),e) :: fl -> if name' = name then e else loop fl
 			| [] -> raise Not_found
 		in
 		loop fl
+
+	let field_mem_assoc name fl =
+		let rec loop fl = match fl with
+			| ((name',_,_),e) :: fl -> if name' = name then raise Exit else loop fl
+			| [] -> false
+		in
+		try
+			loop fl
+		with Exit ->
+			true
+
+	let dump_with_pos e =
+		let buf = Buffer.create 0 in
+		let add = Buffer.add_string buf in
+		let rec loop' tabs (e,p) =
+			let add s = add (Printf.sprintf "%4i-%4i %s%s\n" p.pmin p.pmax tabs s) in
+			let loop e = loop' (tabs ^ "  ") e in
+			match e with
+			| EConst ct -> add (s_constant ct)
+			| EArray(e1,e2) ->
+				add "EArray";
+				loop e1;
+				loop e2;
+			| EBinop(op,e1,e2) ->
+				add ("EBinop " ^ (s_binop op));
+				loop e1;
+				loop e2;
+			| EField(e1,s) ->
+				add ("EField " ^ s);
+				loop e1
+			| EParenthesis e1 ->
+				add "EParenthesis";
+				loop e1
+			| EObjectDecl fl ->
+				add "EObjectDecl";
+				List.iter (fun ((n,p,_),e1) ->
+					Buffer.add_string buf (Printf.sprintf "%4i-%4i %s%s\n" p.pmin p.pmax tabs n);
+					loop e1
+				) fl;
+			| EArrayDecl el ->
+				add "EArrayDecl";
+				List.iter loop el
+			| ECall(e1,el) ->
+				add "ECall";
+				loop e1;
+				List.iter loop el
+			| ENew((tp,_),el) ->
+				add ("ENew " ^ s_type_path(tp.tpackage,tp.tname));
+				List.iter loop el
+			| EUnop(op,_,e1) ->
+				add ("EUnop " ^ (s_unop op));
+				loop e1
+			| EVars vl ->
+				add "EVars";
+				List.iter (fun ((n,p),_,cto,eo) ->
+					add (Printf.sprintf "%s  %s%s" tabs n (match cto with None -> "" | Some (ct,_) -> ":" ^ Printer.s_complex_type "" ct));
+					match eo with
+					| None -> ()
+					| Some e ->
+						loop' (Printf.sprintf "%s      " tabs) e
+				) vl
+			| EFunction(_,f) ->
+				add "EFunction";
+				Option.may loop f.f_expr;
+			| EBlock el ->
+				add "EBlock";
+				List.iter loop el
+			| EFor(e1,e2) ->
+				add "EFor";
+				loop e1;
+				loop e2;
+			| EIf(e1,e2,eo) ->
+				add "EIf";
+				loop e1;
+				loop e2;
+				Option.may loop eo;
+			| EWhile(e1,e2,_) ->
+				add "EWhile";
+				loop e1;
+				loop e2;
+			| ESwitch(e1,cases,def) ->
+				add "ESwitch";
+				loop e1;
+				List.iter (fun (el,eg,eo,p) ->
+					List.iter (loop' (tabs ^ "    ")) el;
+					Option.may (loop' (tabs ^ "      ")) eo;
+				) cases;
+				Option.may (fun (eo,_) -> Option.may (loop' (tabs ^ "      ")) eo) def
+			| ETry(e1,catches) ->
+				add "ETry";
+				loop e1;
+				List.iter (fun (_,_,e,_) ->
+					loop' (tabs ^ "    ") e
+				) catches
+			| EReturn eo ->
+				add "EReturn";
+				Option.may loop eo;
+			| EBreak ->
+				add "EBreak";
+			| EContinue ->
+				add "EContinue"
+			| EUntyped e1 ->
+				add "EUntyped";
+				loop e1;
+			| EThrow e1 ->
+				add "EThrow";
+				loop e1
+			| ECast(e1,_) ->
+				add "ECast";
+				loop e1;
+			| EDisplay(e1,dk) ->
+				add ("EDisplay " ^ (s_display_kind dk));
+				loop e1
+			| ETernary(e1,e2,e3) ->
+				add "ETernary";
+				loop e1;
+				loop e2;
+				loop e3;
+			| ECheckType(e1,_) ->
+				add "ECheckType";
+				loop e1;
+			| EMeta((m,_,_),e1) ->
+				add ("EMeta " ^ fst (Meta.get_info m));
+				loop e1
+			| EDisplayNew _ ->
+				assert false
+		in
+		loop' "" e;
+		Buffer.contents buf
 end
+
+let has_meta_option metas meta s =
+	let rec loop ml = match ml with
+		| (meta',el,_) :: ml when meta = meta' ->
+			if List.exists (fun (e,p) ->
+				match e with
+					| EConst(Ident s2) when s = s2 -> true
+					| _ -> false
+			) el then
+				true
+			else
+				loop ml
+		| _ :: ml ->
+			loop ml
+		| [] ->
+			false
+	in
+	loop metas
+
+let get_meta_options metas meta =
+	let rec loop ml = match ml with
+		| (meta',el,_) :: ml when meta = meta' ->
+			ExtList.List.filter_map (fun (e,p) ->
+				match e with
+					| EConst(Ident s2) -> Some s2
+					| _ -> None
+			) el
+		| _ :: ml ->
+			loop ml
+		| [] ->
+			[]
+	in
+	loop metas
\ No newline at end of file
diff --git a/src/core/define.ml b/src/core/define.ml
new file mode 100644
index 0000000000000000000000000000000000000000..ed4176e3f2333124fdceb0a412e72d2ba238e5f2
--- /dev/null
+++ b/src/core/define.ml
@@ -0,0 +1,86 @@
+open Globals
+include DefineList
+
+type define = {
+	mutable values : (string,string) PMap.t;
+	mutable defines_signature : string option;
+}
+
+let get_documentation_list() =
+	let m = ref 0 in
+	let rec loop i =
+		let d = Obj.magic i in
+		if d <> Last then begin
+			let t, (doc,flags) = infos d in
+			let params = ref [] and pfs = ref [] in
+			List.iter (function
+				| HasParam s -> params := s :: !params
+				| Platforms fl -> pfs := fl @ !pfs
+				| Link _ -> ()
+			) flags;
+			let params = (match List.rev !params with
+				| [] -> ""
+				| l -> "<" ^ String.concat ">, <" l ^ "> "
+			) in
+			let pfs = platform_list_help (List.rev !pfs) in
+			if String.length t > !m then m := String.length t;
+			((String.concat "-" (ExtString.String.nsplit t "_")),params ^ doc ^ pfs) :: (loop (i + 1))
+		end else
+			[]
+	in
+	let all = List.sort (fun (s1,_) (s2,_) -> String.compare s1 s2) (loop 0) in
+	all,!m
+
+let raw_defined ctx v =
+	PMap.mem v ctx.values
+
+let defined ctx v =
+	raw_defined ctx (fst (infos v))
+
+let raw_defined_value ctx k =
+	PMap.find k ctx.values
+
+let defined_value ctx v =
+	raw_defined_value ctx (fst (infos v))
+
+let defined_value_safe ?default ctx v =
+	try defined_value ctx v
+	with Not_found -> match default with Some s -> s | None -> ""
+
+let raw_define_value ctx k v =
+	ctx.values <- PMap.add k v ctx.values;
+	let k = String.concat "_" (ExtString.String.nsplit k "-") in
+	ctx.values <- PMap.add k v ctx.values;
+	ctx.defines_signature <- None
+
+let raw_define ctx v =
+	let k,v = try ExtString.String.split v "=" with _ -> v,"1" in
+	raw_define_value ctx k v
+
+let define_value ctx k v =
+	raw_define ctx (fst (infos k) ^ "=" ^ v)
+
+let define ctx v =
+	raw_define ctx (fst (infos v))
+
+let get_signature def =
+	match def.defines_signature with
+	| Some s -> s
+	| None ->
+		let defines = PMap.foldi (fun k v acc ->
+			(* don't make much difference between these special compilation flags *)
+			match String.concat "_" (ExtString.String.nsplit k "-") with
+			(* If we add something here that might be used in conditional compilation it should be added to
+			   Parser.parse_macro_ident as well (issue #5682).
+			   Note that we should removed flags like use_rtti_doc here.
+			*)
+			| "display" | "use_rtti_doc" | "macro_times" | "display_details" | "no_copt" | "display_stdin"
+			| "dump" | "dump_dependencies" | "dump_ignore_var_ids" -> acc
+			| _ -> (k ^ "=" ^ v) :: acc
+		) def.values [] in
+		let str = String.concat "@" (List.sort compare defines) in
+		let s = Digest.string str in
+		def.defines_signature <- Some s;
+		s
+
+let is_haxe3_compat def = raw_defined def "hx3compat"
diff --git a/src/core/display/completionItem.ml b/src/core/display/completionItem.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b8ed8f54f316f2c8994ffb95740cb45195d817c8
--- /dev/null
+++ b/src/core/display/completionItem.ml
@@ -0,0 +1,796 @@
+open Globals
+open Ast
+open Type
+open Genjson
+
+type toplevel_kind =
+	| TKExpr of pos
+	| TKType
+	| TKPattern of pos
+	| TKOverride
+	| TKField of pos
+
+module CompletionModuleKind = struct
+	type t =
+		| Class
+		| Interface
+		| Enum
+		| Abstract
+		| EnumAbstract
+		| TypeAlias
+		| Struct
+		| TypeParameter
+
+	let to_int = function
+		| Class -> 0
+		| Interface -> 1
+		| Enum -> 2
+		| Abstract -> 3
+		| EnumAbstract -> 4
+		| TypeAlias -> 5
+		| Struct -> 6
+		| TypeParameter -> 7
+end
+
+module ImportStatus = struct
+	type t =
+		| Imported
+		| Unimported
+		| Shadowed
+
+	let to_int = function
+		| Imported -> 0
+		| Unimported -> 1
+		| Shadowed -> 2
+end
+
+module CompletionModuleType = struct
+	open CompletionModuleKind
+
+	type not_bool =
+		| Yes
+		| YesButPrivate
+		| No
+		| Maybe
+
+	type module_type_source =
+		| Syntax of type_def (* TODO: do we really want to keep this? *)
+		| Typed of module_type
+
+	type t = {
+		pack : string list;
+		name : string;
+		module_name : string;
+		pos : pos;
+		is_private : bool;
+		params : Ast.type_param list;
+		meta: metadata;
+		doc : documentation;
+		is_extern : bool;
+		is_final : bool;
+		kind : CompletionModuleKind.t;
+		has_constructor : not_bool;
+		source : module_type_source;
+	}
+
+	let of_type_decl pack module_name (td,p) = match td with
+		| EClass d ->
+			let ctor =
+				try
+					let cff = List.find (fun cff -> fst cff.cff_name = "new") d.d_data in
+					if List.mem HExtern d.d_flags || List.exists (fun (acc,_) -> acc = APublic) cff.cff_access then Yes
+					else YesButPrivate
+				with Not_found ->
+					if (List.exists (function HExtends _ -> true | _ -> false) d.d_flags) then Maybe
+					else No
+			in
+			{
+				pack = pack;
+				name = fst d.d_name;
+				module_name = module_name;
+				pos = p;
+				is_private = List.mem HPrivate d.d_flags;
+				params = d.d_params;
+				meta = d.d_meta;
+				doc = d.d_doc;
+				is_extern = List.mem HExtern d.d_flags;
+				is_final = List.mem HFinal d.d_flags;
+				kind = if List.mem HInterface d.d_flags then Interface else Class;
+				has_constructor = ctor;
+				source = Syntax td;
+			}
+		| EEnum d -> {
+				pack = pack;
+				name = fst d.d_name;
+				module_name = module_name;
+				pos = p;
+				is_private = List.mem EPrivate d.d_flags;
+				params = d.d_params;
+				meta = d.d_meta;
+				doc = d.d_doc;
+				is_extern = List.mem EExtern d.d_flags;
+				is_final = false;
+				kind = Enum;
+				has_constructor = No;
+				source = Syntax td;
+			}
+		| ETypedef d ->
+			let kind = match fst d.d_data with CTAnonymous _ -> Struct | _ -> TypeAlias in
+			{
+				pack = pack;
+				name = fst d.d_name;
+				module_name = module_name;
+				pos = p;
+				is_private = List.mem EPrivate d.d_flags;
+				params = d.d_params;
+				meta = d.d_meta;
+				doc = d.d_doc;
+				is_extern = List.mem EExtern d.d_flags;
+				is_final = false;
+				kind = kind;
+				has_constructor = if kind = Struct then No else Maybe;
+				source = Syntax td;
+			}
+		| EAbstract d ->
+			let ctor =
+				try
+					let cff = List.find (fun cff -> fst cff.cff_name = "new") d.d_data in
+					if List.exists (fun (acc,_) -> acc = APublic) cff.cff_access then Yes else YesButPrivate
+				with Not_found ->
+					No
+			in
+			{
+				pack = pack;
+				name = fst d.d_name;
+				module_name = module_name;
+				pos = p;
+				is_private = List.mem AbPrivate d.d_flags;
+				params = d.d_params;
+				meta = d.d_meta;
+				doc = d.d_doc;
+				is_extern = List.mem AbExtern d.d_flags;
+				is_final = false;
+				kind = if Meta.has Meta.Enum d.d_meta then EnumAbstract else Abstract;
+				has_constructor = ctor;
+				source = Syntax td;
+			}
+		| EImport _ | EUsing _ ->
+			raise Exit
+
+	let of_module_type mt =
+		let actor a = match a.a_impl with
+			| None -> No
+			| Some c ->
+				try
+					let cf = PMap.find "_new" c.cl_statics in
+					if c.cl_extern || (has_class_field_flag cf CfPublic) then Yes else YesButPrivate
+				with Not_found ->
+					No
+		in
+		let ctor c =
+			try
+				let _,cf = get_constructor (fun cf -> cf.cf_type) c in
+				if c.cl_extern || (has_class_field_flag cf CfPublic) then Yes else YesButPrivate
+			with Not_found ->
+				No
+		in
+		let is_extern,is_final,kind,ctor = match mt with
+			| TClassDecl c ->
+				c.cl_extern,c.cl_final,(if c.cl_interface then Interface else Class),ctor c
+			| TEnumDecl en ->
+				en.e_extern,false,Enum,No
+			| TTypeDecl td ->
+				let kind,ctor = match follow td.t_type with
+					| TAnon _ -> Struct,No
+					| TInst(c,_) -> TypeAlias,ctor c
+					| TAbstract(a,_) -> TypeAlias,actor a
+					| _ -> TypeAlias,No
+				in
+				false,false,kind,ctor
+			| TAbstractDecl a ->
+				false,false,(if Meta.has Meta.Enum a.a_meta then EnumAbstract else Abstract),actor a
+		in
+		let infos = t_infos mt in
+		let convert_type_param (s,t) = match follow t with
+			| TInst(c,_) -> {
+				tp_name = s,null_pos;
+				tp_params = [];
+				tp_constraints = None; (* TODO? *)
+				tp_meta = c.cl_meta
+			}
+			| _ ->
+				assert false
+		in
+		{
+			pack = fst infos.mt_path;
+			name = snd infos.mt_path;
+			module_name = snd infos.mt_module.m_path;
+			pos = infos.mt_pos;
+			is_private = infos.mt_private;
+			params = List.map convert_type_param infos.mt_params;
+			meta = infos.mt_meta;
+			doc = infos.mt_doc;
+			is_extern = is_extern;
+			is_final = is_final;
+			kind = kind;
+			has_constructor = ctor;
+			source = Typed mt;
+		}
+
+	let get_path cm = (cm.pack,cm.name)
+
+	let to_json ctx cm is =
+		let fields =
+			("path",jobject [
+				("pack",jlist jstring cm.pack);
+				("moduleName",jstring cm.module_name);
+				("typeName",jstring cm.name);
+				("importStatus",jint (ImportStatus.to_int is));
+			]) ::
+			("kind",jint (to_int cm.kind)) ::
+			(match ctx.generation_mode with
+			| GMFull | GMWithoutDoc ->
+				("meta",generate_metadata ctx cm.meta) ::
+				("pos",generate_pos ctx cm.pos) ::
+				("params",jlist (generate_ast_type_param ctx) cm.params) ::
+				("isExtern",jbool cm.is_extern) ::
+				("isFinal",jbool cm.is_final) ::
+				(if ctx.generation_mode = GMFull then ["doc",jopt jstring cm.doc] else [])
+			| GMMinimum ->
+				match generate_minimum_metadata ctx cm.meta with
+					| None -> []
+					| Some meta -> [("meta",meta)]
+			)
+		in
+		jobject fields
+end
+
+module ClassFieldOrigin = struct
+	type t =
+		| Self of module_type
+		| StaticImport of module_type
+		| Parent of module_type
+		| StaticExtension of module_type
+		| AnonymousStructure of tanon
+		| BuiltIn
+		| Unknown
+
+	let to_json ctx cfo =
+		let i,args = match cfo with
+		| Self mt -> 0,if ctx.generation_mode = GMMinimum then None else Some (generate_module_type ctx mt)
+		| StaticImport mt -> 1,if ctx.generation_mode = GMMinimum then None else Some (generate_module_type ctx mt)
+		| Parent mt -> 2,if ctx.generation_mode = GMMinimum then None else Some (generate_module_type ctx mt)
+		| StaticExtension mt -> 3,if ctx.generation_mode = GMMinimum then None else Some (generate_module_type ctx mt)
+		| AnonymousStructure an -> 4,if ctx.generation_mode = GMMinimum then None else Some (generate_anon ctx an)
+		| BuiltIn -> 5,None
+		| Unknown -> 6,None
+		in
+		jobject (
+			("kind",jint i) :: (match args with None -> [] | Some arg -> ["args",arg])
+		)
+end
+
+let decl_of_class c = match c.cl_kind with
+	| KAbstractImpl a -> TAbstractDecl a
+	| _ -> TClassDecl c
+
+module CompletionClassField = struct
+	type t = {
+		field : tclass_field;
+		scope : class_field_scope;
+		origin : ClassFieldOrigin.t;
+		is_qualified : bool;
+	}
+
+	let make cf scope origin is_qualified = {
+		field = cf;
+		scope = scope;
+		origin = origin;
+		is_qualified = is_qualified;
+	}
+end
+
+module CompletionEnumField = struct
+	type t = {
+		efield : tenum_field;
+		eorigin : ClassFieldOrigin.t;
+		eis_qualified : bool;
+	}
+
+	let make ef origin is_qualified = {
+		efield = ef;
+		eorigin = origin;
+		eis_qualified = is_qualified;
+	}
+end
+
+module PackageContentKind = struct
+	type t =
+		| PCKModule
+		| PCKPackage
+
+	let to_int = function
+		| PCKModule -> 0
+		| PCKPackage -> 1
+end
+
+module CompletionType = struct
+
+	type ct_path_with_params = {
+		ct_pack : string list;
+		ct_type_name : string;
+		ct_module_name : string;
+		ct_params : t list;
+		ct_import_status : ImportStatus.t;
+	}
+
+	and ct_function_argument = {
+		ct_name : string;
+		ct_optional : bool;
+		ct_type : t;
+		ct_value : Ast.expr option;
+	}
+
+	and ct_function = {
+		ct_args : ct_function_argument list;
+		ct_return : t;
+	}
+
+	and ct_anonymous_field = {
+		ctf_field : tclass_field;
+		ctf_type : t;
+	}
+
+	and ct_anonymous = {
+		ct_fields : ct_anonymous_field list;
+		ct_status : anon_status;
+	}
+
+	and t =
+		| CTMono
+		| CTInst of ct_path_with_params
+		| CTEnum of ct_path_with_params
+		| CTTypedef of ct_path_with_params
+		| CTAbstract of ct_path_with_params
+		| CTFunction of ct_function
+		| CTAnonymous of ct_anonymous
+		| CTDynamic of t option
+
+	let rec generate_path_with_params ctx pwp = jobject [
+		"path",jobject [
+			"pack",jlist jstring pwp.ct_pack;
+			"moduleName",jstring pwp.ct_module_name;
+			"typeName",jstring pwp.ct_type_name;
+			"importStatus",jint (ImportStatus.to_int pwp.ct_import_status);
+		];
+		"params",jlist (generate_type ctx) pwp.ct_params;
+	]
+
+	and generate_function_argument ctx cfa = jobject [
+		"name",jstring cfa.ct_name;
+		"opt",jbool cfa.ct_optional;
+		"t",generate_type ctx cfa.ct_type;
+		"value",jopt (fun e -> jobject [
+			"string",jstring (Ast.Printer.s_expr e);
+		]) cfa.ct_value;
+	]
+
+	and generate_function' ctx ctf = [
+		"args",jlist (generate_function_argument ctx) ctf.ct_args;
+		"ret",generate_type ctx ctf.ct_return;
+	]
+
+	and generate_function ctx ctf = jobject (generate_function' ctx ctf)
+
+	and generate_anon_field ctx af =
+		let fields = generate_class_field' ctx CFSMember af.ctf_field in
+		let fields = List.filter (fun (n,_) -> n <> "type") fields in
+		let fields = ("type",generate_type ctx af.ctf_type) :: fields in
+		jobject fields
+
+	and generate_anon ctx cta =
+		let fields = List.sort (fun ctf1 ctf2 ->
+			compare ctf1.ctf_field.cf_name_pos.pmin ctf2.ctf_field.cf_name_pos.pmin
+		) cta.ct_fields in
+		jobject [
+			"status",generate_anon_status ctx cta.ct_status;
+			"fields",jlist (generate_anon_field ctx) fields;
+		]
+
+	and generate_type ctx ct =
+		let name,args = match ct with
+			| CTMono -> "TMono",None
+			| CTInst pwp -> "TInst",Some (generate_path_with_params ctx pwp)
+			| CTEnum pwp -> "TEnum",Some (generate_path_with_params ctx pwp)
+			| CTTypedef pwp -> "TType",Some (generate_path_with_params ctx pwp)
+			| CTAbstract pwp -> "TAbstract",Some (generate_path_with_params ctx pwp)
+			| CTFunction ctf -> "TFun",Some (generate_function ctx ctf)
+			| CTAnonymous cta -> "TAnonymous",Some (generate_anon ctx cta)
+			| CTDynamic cto -> "TDynamic",Option.map (generate_type ctx) cto;
+		in
+		generate_adt ctx None name args
+
+	let to_json ctx ct =
+		generate_type ctx ct
+
+	let from_type get_import_status ?(values=PMap.empty) t =
+		let rec ppath mpath tpath tl = {
+			ct_pack = fst tpath;
+			ct_module_name = snd mpath;
+			ct_type_name = snd tpath;
+			ct_import_status = get_import_status tpath;
+			ct_params = List.map (from_type PMap.empty) tl;
+		}
+		and funarg value (name,opt,t) = {
+			ct_name = name;
+			ct_optional = opt;
+			ct_type = from_type PMap.empty t;
+			ct_value = value
+		}
+		and from_type values t = match t with
+			| TMono r ->
+				begin match !r with
+					| None -> CTMono
+					| Some t -> from_type values t
+				end
+			| TLazy r ->
+				from_type values (lazy_type r)
+			| TInst({cl_kind = KTypeParameter _} as c,_) ->
+				CTInst ({
+					ct_pack = fst c.cl_path;
+					ct_module_name = snd c.cl_module.m_path;
+					ct_type_name = snd c.cl_path;
+					ct_import_status = Imported;
+					ct_params = [];
+				})
+			| TInst(c,tl) ->
+				CTInst (ppath c.cl_module.m_path c.cl_path tl)
+			| TEnum(en,tl) ->
+				CTEnum (ppath en.e_module.m_path en.e_path tl)
+			| TType(td,tl) ->
+				CTTypedef (ppath td.t_module.m_path td.t_path tl)
+			| TAbstract(a,tl) ->
+				CTAbstract (ppath a.a_module.m_path a.a_path tl)
+			| TFun(tl,t) when not (PMap.is_empty values) ->
+				let get_arg n = try Some (PMap.find n values) with Not_found -> None in
+				CTFunction {
+					ct_args = List.map (fun (n,o,t) -> funarg (get_arg n) (n,o,t)) tl;
+					ct_return = from_type PMap.empty t;
+				}
+			| TFun(tl,t) ->
+				CTFunction {
+					ct_args = List.map (funarg None) tl;
+					ct_return = from_type PMap.empty t;
+				}
+			| TAnon an ->
+				let afield af = {
+					ctf_field = af;
+					ctf_type = from_type PMap.empty af.cf_type;
+				} in
+				CTAnonymous {
+					ct_fields = PMap.fold (fun cf acc -> afield cf :: acc) an.a_fields [];
+					ct_status = !(an.a_status);
+				}
+			| TDynamic t ->
+				CTDynamic (if t == t_dynamic then None else Some (from_type PMap.empty t))
+		in
+		from_type values t
+end
+
+open CompletionModuleType
+open CompletionClassField
+open CompletionEnumField
+
+type t_kind =
+	| ITLocal of tvar
+	| ITClassField of CompletionClassField.t
+	| ITEnumField of CompletionEnumField.t
+	| ITEnumAbstractField of tabstract * CompletionClassField.t
+	| ITType of CompletionModuleType.t * ImportStatus.t
+	| ITPackage of path * (string * PackageContentKind.t) list
+	| ITModule of path
+	| ITLiteral of string
+	| ITTimer of string * string
+	| ITMetadata of Meta.strict_meta
+	| ITKeyword of keyword
+	| ITAnonymous of tanon
+	| ITExpression of texpr
+	| ITTypeParameter of tclass
+	| ITDefine of string * string option
+
+type t = {
+	ci_kind : t_kind;
+	ci_type : (Type.t * CompletionType.t) option;
+}
+
+let make kind t = {
+	ci_kind = kind;
+	ci_type = t;
+}
+
+let make_ci_local v t = make (ITLocal v) (Some t)
+let make_ci_class_field ccf t = make (ITClassField ccf) (Some t)
+let make_ci_enum_abstract_field a ccf t = make (ITEnumAbstractField(a,ccf)) (Some t)
+let make_ci_enum_field cef t = make (ITEnumField cef) (Some t)
+let make_ci_type mt import_status t = make (ITType(mt,import_status)) t
+let make_ci_package path l = make (ITPackage(path,l)) None
+let make_ci_module path = make (ITModule path) None
+let make_ci_literal lit t = make (ITLiteral lit) (Some t)
+let make_ci_timer name value = make (ITTimer(name,value)) None
+let make_ci_metadata meta = make (ITMetadata meta) None
+let make_ci_keyword kwd = make (ITKeyword kwd) None
+let make_ci_anon an t = make (ITAnonymous an) (Some t)
+let make_ci_expr e t = make (ITExpression e) (Some t)
+let make_ci_type_param c t = make (ITTypeParameter c) (Some t)
+let make_ci_define n v t = make (ITDefine(n,v)) (Some t)
+
+let get_index item = match item.ci_kind with
+	| ITLocal _ -> 0
+	| ITClassField _ -> 1
+	| ITEnumField _ -> 2
+	| ITEnumAbstractField _ -> 3
+	| ITType _ -> 4
+	| ITPackage _ -> 5
+	| ITModule _ -> 6
+	| ITLiteral _ -> 7
+	| ITTimer _ -> 8
+	| ITMetadata _ -> 9
+	| ITKeyword _ -> 10
+	| ITAnonymous _ -> 11
+	| ITExpression _ -> 12
+	| ITTypeParameter _ -> 13
+	| ITDefine _ -> 14
+
+let get_sort_index tk item p expected_name = match item.ci_kind with
+	| ITLocal v ->
+		let i = p.pmin - v.v_pos.pmin in
+		let i = if i < 0 then 0 else i in
+		let s = Printf.sprintf "%05i" i in
+		let s = match expected_name with
+			| None -> s
+			| Some name ->
+				let i = StringError.levenshtein name v.v_name in
+				Printf.sprintf "%05i%s" i s
+		in
+		0,s
+	| ITClassField ccf ->
+		let open ClassFieldOrigin in
+		let i = match ccf.origin,ccf.scope with
+			| Self _,(CFSMember | CFSConstructor) -> 10
+			| Parent _,(CFSMember | CFSConstructor) -> 11
+			| StaticExtension _,_ -> 12
+			| Self _,CFSStatic -> 13
+			| StaticImport _,_ -> 14
+			| _ -> 15
+		in
+		i,ccf.field.cf_name
+	| ITEnumField ef ->
+		(match tk with TKPattern _ | TKField _ -> -1 | _ -> 20),(Printf.sprintf "%04i" ef.efield.ef_index)
+	| ITEnumAbstractField(_,ccf) ->
+		(match tk with TKPattern _ | TKField _ -> -1 | _ -> 21),ccf.field.cf_name
+	| ITTypeParameter c ->
+		30,snd c.cl_path
+	| ITType(cmt,is) ->
+		let open ImportStatus in
+		let i = match is with
+			| Imported -> 31
+			| Unimported -> 32
+			| Shadowed -> 33
+		in
+		i,(s_type_path (cmt.pack,cmt.name))
+	| ITPackage(path,_) ->
+		40,s_type_path path
+	| ITModule path ->
+		40,s_type_path path
+	| ITLiteral name ->
+		50,name
+	| ITKeyword name ->
+		60,s_keyword name
+	| ITAnonymous _
+	| ITExpression _
+	| ITTimer _
+	| ITMetadata _
+	| ITDefine _ ->
+		500,""
+
+let legacy_sort item = match item.ci_kind with
+	| ITClassField(cf) | ITEnumAbstractField(_,cf) ->
+		begin match cf.field.cf_kind with
+		| Var _ -> 0,cf.field.cf_name
+		| Method _ -> 1,cf.field.cf_name
+		end
+	| ITEnumField ef ->
+		let ef = ef.efield in
+		begin match follow ef.ef_type with
+		| TFun _ -> 1,ef.ef_name
+		| _ -> 0,ef.ef_name
+		end
+	| ITType(cm,_) -> 2,cm.name
+	| ITModule path -> 3,snd path
+	| ITPackage(path,_) -> 4,snd path
+	| ITMetadata meta -> 5,Meta.to_string meta
+	| ITTimer(s,_) -> 6,s
+	| ITLocal v -> 7,v.v_name
+	| ITLiteral s -> 9,s
+	| ITKeyword kwd -> 10,s_keyword kwd
+	| ITAnonymous _ -> 11,""
+	| ITExpression _ -> 12,""
+	| ITTypeParameter _ -> 13,""
+	| ITDefine _ -> 14,""
+
+let get_name item = match item.ci_kind with
+	| ITLocal v -> v.v_name
+	| ITClassField(cf) | ITEnumAbstractField(_,cf) -> cf.field.cf_name
+	| ITEnumField ef -> ef.efield.ef_name
+	| ITType(cm,_) -> cm.name
+	| ITPackage(path,_) -> snd path
+	| ITModule path -> snd path
+	| ITLiteral s -> s
+	| ITTimer(s,_) -> s
+	| ITMetadata meta -> Meta.to_string meta
+	| ITKeyword kwd -> s_keyword kwd
+	| ITAnonymous _ -> ""
+	| ITExpression _ -> ""
+	| ITTypeParameter c -> snd c.cl_path
+	| ITDefine(n,_) -> n
+
+let get_type item = item.ci_type
+
+let get_filter_name item = match item.ci_kind with
+	| ITLocal v -> v.v_name
+	| ITClassField(cf) | ITEnumAbstractField(_,cf) -> cf.field.cf_name
+	| ITEnumField ef -> ef.efield.ef_name
+	| ITType(cm,_) -> s_type_path (cm.pack,cm.name)
+	| ITPackage(path,_) -> s_type_path path
+	| ITModule path -> s_type_path path
+	| ITLiteral s -> s
+	| ITTimer(s,_) -> s
+	| ITMetadata meta -> Meta.to_string meta
+	| ITKeyword kwd -> s_keyword kwd
+	| ITAnonymous _ -> ""
+	| ITExpression _ -> ""
+	| ITTypeParameter c -> snd c.cl_path
+	| ITDefine(n,_) -> n
+
+let get_documentation item = match item.ci_kind with
+	| ITClassField cf | ITEnumAbstractField(_,cf) -> cf.field.cf_doc
+	| ITEnumField ef -> ef.efield.ef_doc
+	| ITType(mt,_) -> mt.doc
+	| _ -> None
+
+let to_json ctx index item =
+	let open ClassFieldOrigin in
+	let kind,data = match item.ci_kind with
+		| ITLocal v -> "Local",generate_tvar ctx v
+		| ITClassField(cf) | ITEnumAbstractField(_,cf) ->
+			let name = match item.ci_kind with
+				| ITClassField _ -> "ClassField"
+				| _ ->  "EnumAbstractField"
+			in
+			let qualifier = match cf.scope,cf.origin with
+				| CFSStatic,(Self mt | Parent mt | StaticExtension mt | StaticImport mt) ->
+					let infos = t_infos mt in
+					jstring (s_type_path (Path.full_dot_path (fst infos.mt_module.m_path) (snd infos.mt_module.m_path) (snd infos.mt_path)))
+				| CFSMember,Self _ ->
+					jstring "this"
+				| CFSMember,Parent _->
+					jstring "super"
+				| _ ->
+					jnull
+			in
+			name,jobject [
+			"field",generate_class_field ctx cf.scope cf.field;
+			"origin",ClassFieldOrigin.to_json ctx cf.origin;
+			"resolution",jobject [
+				"isQualified",jbool cf.is_qualified;
+				"qualifier",qualifier;
+			]
+		]
+		| ITEnumField ef ->
+			let qualifier = match ef.eorigin with
+				| Self mt | StaticImport mt ->
+					let infos = t_infos mt in
+					jstring (s_type_path (Path.full_dot_path (fst infos.mt_module.m_path) (snd infos.mt_module.m_path) (snd infos.mt_path)))
+				| _ ->
+					jnull
+			in
+			"EnumField",jobject [
+				"field",generate_enum_field ctx ef.efield;
+				"origin",ClassFieldOrigin.to_json ctx ef.eorigin;
+				"resolution",jobject [
+					"isQualified",jbool ef.eis_qualified;
+					"qualifier",qualifier;
+				]
+			]
+		| ITType(kind,is) -> "Type",CompletionModuleType.to_json ctx kind is
+		| ITPackage(path,contents) ->
+			let generate_package_content (name,kind) = jobject [
+				"name",jstring name;
+				"kind",jint (PackageContentKind.to_int kind);
+			] in
+			"Package",jobject [
+				"path",generate_package_path (fst path @ [snd path]);
+				"contents",jlist generate_package_content contents;
+			]
+		| ITModule path -> "Module",jobject [
+			"path",generate_module_path path;
+		]
+		| ITLiteral s -> "Literal",jobject [
+			"name",jstring s;
+		]
+		| ITTimer(s,value) -> "Timer",jobject [
+			"name",jstring s;
+			"value",jstring value;
+		]
+		| ITMetadata meta ->
+			let open Meta in
+			let name,(doc,params) = Meta.get_info meta in
+			let name = "@" ^ name in
+			let usage_to_string = function
+				| TClass -> "TClass"
+				| TClassField -> "TClassField"
+				| TAbstract -> "TAbstract"
+				| TAbstractField -> "TAbstractField"
+				| TEnum -> "TEnum"
+				| TTypedef -> "TTypedef"
+				| TAnyField -> "TAnyField"
+				| TExpr -> "TExpr"
+				| TTypeParameter -> "TTypeParameter"
+				| TVariable -> "TVariable"
+			in
+			let rec loop internal params platforms targets links l = match l with
+				| HasParam s :: l -> loop internal (s :: params) platforms targets links l
+				| Platforms pls :: l -> loop internal params ((List.map platform_name pls) @ platforms) targets links l
+				| UsedOn usages :: l -> loop internal params platforms ((List.map usage_to_string usages) @ targets) links l
+				| UsedInternally :: l -> loop true params platforms targets links l
+				| Link url :: l -> loop internal params platforms targets (url :: links) l
+				| [] -> internal,params,platforms,targets,links
+			in
+			let internal,params,platforms,targets,links = loop false [] [] [] [] params in
+			"Metadata",jobject [
+				"name",jstring name;
+				"doc",jstring doc;
+				"parameters",jlist jstring params;
+				"platforms",jlist jstring platforms;
+				"targets",jlist jstring targets;
+				"internal",jbool internal;
+				"links",jlist jstring links;
+			]
+		| ITKeyword kwd ->"Keyword",jobject [
+			"name",jstring (s_keyword kwd)
+		]
+		| ITAnonymous an -> "AnonymousStructure",generate_anon ctx an
+		| ITExpression e -> "Expression",generate_texpr ctx e
+		| ITTypeParameter c ->
+			begin match c.cl_kind with
+			| KTypeParameter tl ->
+				"TypeParameter",jobject [
+					"name",jstring (snd c.cl_path);
+					"meta",generate_metadata ctx c.cl_meta;
+					"constraints",jlist (generate_type ctx) tl;
+				]
+			| _ -> assert false
+			end
+		| ITDefine(n,v) -> "Define",jobject [
+			"name",jstring n;
+			"value",(match v with
+				| None -> jnull
+				| Some v -> jstring v
+			);
+			(* TODO: docs etc *)
+		]
+	in
+	let jindex = match index with
+		| None -> []
+		| Some index -> ["index",jint index]
+	in
+	jobject (
+		("kind",jstring kind) ::
+		("args",data) ::
+		(match item.ci_type with
+			| None ->
+				jindex
+			| Some t ->
+				("type",CompletionType.to_json ctx (snd t)) :: jindex
+		)
+	)
\ No newline at end of file
diff --git a/src/core/display/displayPosition.ml b/src/core/display/displayPosition.ml
new file mode 100644
index 0000000000000000000000000000000000000000..f9106064d4f98dc8f4eab5dac80a88d674b34ee9
--- /dev/null
+++ b/src/core/display/displayPosition.ml
@@ -0,0 +1,64 @@
+open Globals
+
+let encloses_position p_target p =
+	p_target.pmin <> -1 && p_target.pmax <> -1 && p.pmin <= p_target.pmin && p.pmax >= p_target.pmax
+
+let encloses_position_gt p_target p =
+	p_target.pmin <> -1 && p_target.pmax <> -1 && p.pmin <= p_target.pmin && p.pmax > p_target.pmax
+
+class display_position_container =
+	object (self)
+		(** Current display position *)
+		val mutable pos = null_pos
+		(**
+			Display position value which was set with the latest `display_position#set p` call.
+			Kept even after `display_position#reset` call.
+		*)
+		val mutable last_pos = null_pos
+		(**
+			Set current display position
+		*)
+		method set p =
+			pos <- p;
+			last_pos <- p
+		(**
+			Get current display position
+		*)
+		method get =
+			pos
+		(**
+			Clears current display position.
+		*)
+		method reset =
+			pos <- null_pos
+		(**
+			Check if `p` contains current display position
+		*)
+		method enclosed_in p =
+			encloses_position pos p
+		(**
+			Check if `file` contains current display position
+		*)
+		method is_in_file file =
+			file <> "?" && Path.unique_full_path file = pos.pfile
+		(**
+			Cut `p` at the position of the latest `display_position#set pos` call.
+		*)
+		method cut p =
+			{ p with pmax = last_pos.pmax }
+		(**
+			Temporarily reset display position, run `fn` and then restore display position.
+		*)
+		method run_outside : 'a . (unit->'a) -> 'a = fun fn ->
+			let display_pos = self#get in
+			self#reset;
+			Std.finally (fun () -> self#set display_pos) fn ()
+
+		(**
+			Creates a new position with the file of [p] and the min/max of the display position.
+		 *)
+		method with_pos p =
+			{p with pmin = last_pos.pmin; pmax = last_pos.pmax}
+	end
+
+let display_position = new display_position_container
\ No newline at end of file
diff --git a/src/core/displayTypes.ml b/src/core/displayTypes.ml
new file mode 100644
index 0000000000000000000000000000000000000000..55028134659bb08502520dafa536d3b2a7a88daf
--- /dev/null
+++ b/src/core/displayTypes.ml
@@ -0,0 +1,311 @@
+open Globals
+open Path
+open Ast
+open Type
+open Json
+open Genjson
+
+module SymbolKind = struct
+	type t =
+		| Class
+		| Interface
+		| Enum
+		| Typedef
+		| Abstract
+		| Field
+		| Property
+		| Method
+		| Constructor
+		| Function
+		| Variable
+
+	let to_int = function
+		| Class -> 1
+		| Interface -> 2
+		| Enum -> 3
+		| Typedef -> 4
+		| Abstract -> 5
+		| Field -> 6
+		| Property -> 7
+		| Method -> 8
+		| Constructor -> 9
+		| Function -> 10
+		| Variable -> 11
+end
+
+module SymbolInformation = struct
+	type t = {
+		name : string;
+		kind : SymbolKind.t;
+		pos : Globals.pos;
+		container_name : string option;
+		deprecated : bool;
+	}
+
+	let make name kind pos container_name deprecated = {
+		name = name;
+		kind = kind;
+		pos = pos;
+		container_name = container_name;
+		deprecated = deprecated;
+	}
+end
+
+module DiagnosticsSeverity = struct
+	type t =
+		| Error
+		| Warning
+		| Information
+		| Hint
+
+	let to_int = function
+		| Error -> 1
+		| Warning -> 2
+		| Information -> 3
+		| Hint -> 4
+end
+
+module DiagnosticsKind = struct
+	type t =
+		| DKUnusedImport
+		| DKUnresolvedIdentifier
+		| DKCompilerError
+		| DKRemovableCode
+		| DKParserError
+		| DKDeprecationWarning
+		| DKInactiveBlock
+
+	let to_int = function
+		| DKUnusedImport -> 0
+		| DKUnresolvedIdentifier -> 1
+		| DKCompilerError -> 2
+		| DKRemovableCode -> 3
+		| DKParserError -> 4
+		| DKDeprecationWarning -> 5
+		| DKInactiveBlock -> 6
+end
+
+module CompletionResultKind = struct
+	type t =
+		| CRField of CompletionItem.t * pos * Type.t option * (Type.t * Type.t) option
+		| CRStructureField
+		| CRToplevel of (CompletionItem.CompletionType.t * CompletionItem.CompletionType.t) option
+		| CRMetadata
+		| CRTypeHint
+		| CRExtends
+		| CRImplements
+		| CRStructExtension of bool
+		| CRImport
+		| CRUsing
+		| CRNew
+		| CRPattern of (CompletionItem.CompletionType.t * CompletionItem.CompletionType.t) option * bool
+		| CROverride
+		| CRTypeRelation
+		| CRTypeDecl
+
+	let to_json ctx kind =
+		let expected_type_fields t = match t with
+			| None -> []
+			| Some(ct1,ct2) -> [
+					"expectedType",CompletionItem.CompletionType.to_json ctx ct1;
+					"expectedTypeFollowed",CompletionItem.CompletionType.to_json ctx ct2;
+				]
+		in
+		let i,args = match kind with
+			| CRField(item,p,iterator,keyValueIterator) ->
+				let t = CompletionItem.get_type item in
+				let t = match t with
+					| None ->
+						None
+					| Some (t,ct) ->
+						try
+							let mt = module_type_of_type t in
+							let ctx = {ctx with generate_abstract_impl = true} in
+							let make mt = generate_module_type ctx mt in
+							let j_mt = make mt in
+							let j_mt_followed = if t == follow t then jnull else make (module_type_of_type (follow t)) in
+							Some (j_mt,j_mt_followed,CompletionItem.CompletionType.to_json ctx ct)
+						with _ ->
+							None
+				in
+				let fields =
+					("item",CompletionItem.to_json ctx None item) ::
+					("range",generate_pos_as_range p) ::
+					("iterator", match iterator with
+						| None -> jnull
+						| Some t -> jobject ["type",generate_type ctx t]
+					) ::
+					("keyValueIterator", match keyValueIterator with
+						| None -> jnull
+						| Some (key,value) -> jobject [
+							"key",generate_type ctx key;
+							"value",generate_type ctx value
+						]
+					) ::
+					(match t with
+						| None -> []
+						| Some (mt,mt_followed,ct) -> ["type",ct;"moduleType",mt;"moduleTypeFollowed",mt_followed]
+					)
+				in
+				0,Some (jobject fields)
+			| CRStructureField -> 1,None
+			| CRToplevel t -> 2,Some (jobject (expected_type_fields t))
+			| CRMetadata -> 3,None
+			| CRTypeHint -> 4,None
+			| CRExtends -> 5,None
+			| CRImplements -> 6,None
+			| CRStructExtension isIntersectionType -> 7,Some (jobject [
+					"isIntersectionType",jbool isIntersectionType
+				])
+			| CRImport -> 8,None
+			| CRUsing -> 9,None
+			| CRNew -> 10,None
+			| CRPattern (t,isOutermostPattern) ->
+				let fields =
+					("isOutermostPattern",jbool isOutermostPattern) ::
+					(expected_type_fields t)
+				in
+				11,Some (jobject fields)
+			| CROverride -> 12,None
+			| CRTypeRelation -> 13,None
+			| CRTypeDecl -> 14,None
+		in
+		jobject (
+			("kind",jint i) :: (match args with None -> [] | Some arg -> ["args",arg])
+		)
+
+end
+
+module DisplayMode = struct
+	type t =
+		| DMNone
+		| DMDefault
+		| DMUsage of bool (* true = also report definition *)
+		| DMDefinition
+		| DMTypeDefinition
+		| DMResolve of string
+		| DMPackage
+		| DMHover
+		| DMModuleSymbols of string option
+		| DMDiagnostics of bool (* true = global, false = only in display file *)
+		| DMStatistics
+		| DMSignature
+
+	type error_policy =
+		| EPIgnore
+		| EPCollect
+		| EPShow
+
+	type display_file_policy =
+		| DFPOnly
+		| DFPAlso
+		| DFPNo
+
+	type settings = {
+		dms_kind : t;
+		dms_display : bool;
+		dms_full_typing : bool;
+		dms_force_macro_typing : bool;
+		dms_error_policy : error_policy;
+		dms_collect_data : bool;
+		dms_check_core_api : bool;
+		dms_inline : bool;
+		dms_display_file_policy : display_file_policy;
+		dms_exit_during_typing : bool;
+	}
+
+	let default_display_settings = {
+		dms_kind = DMDefault;
+		dms_display = true;
+		dms_full_typing = false;
+		dms_force_macro_typing = false;
+		dms_error_policy = EPIgnore;
+		dms_collect_data = false;
+		dms_check_core_api = false;
+		dms_inline = false;
+		dms_display_file_policy = DFPOnly;
+		dms_exit_during_typing = true;
+	}
+
+	let default_compilation_settings = {
+		dms_kind = DMNone;
+		dms_display = false;
+		dms_full_typing = true;
+		dms_force_macro_typing = true;
+		dms_error_policy = EPShow;
+		dms_collect_data = false;
+		dms_check_core_api = true;
+		dms_inline = true;
+		dms_display_file_policy = DFPNo;
+		dms_exit_during_typing = false;
+	}
+
+	let create dm =
+		let settings = { default_display_settings with dms_kind = dm } in
+		match dm with
+		| DMNone -> default_compilation_settings
+		| DMDefault | DMDefinition | DMTypeDefinition | DMResolve _ | DMPackage | DMHover | DMSignature -> settings
+		| DMUsage _ -> { settings with
+				dms_full_typing = true;
+				dms_force_macro_typing = true;
+				dms_collect_data = true;
+				dms_display_file_policy = DFPAlso;
+				dms_exit_during_typing = false
+			}
+		| DMModuleSymbols filter -> { settings with
+				dms_display_file_policy = if filter = None then DFPOnly else DFPNo;
+				dms_exit_during_typing = false;
+				dms_force_macro_typing = false;
+			}
+		| DMDiagnostics global -> { default_compilation_settings with
+				dms_kind = DMDiagnostics global;
+				dms_error_policy = EPCollect;
+				dms_collect_data = true;
+				dms_display_file_policy = if global then DFPNo else DFPAlso;
+			}
+		| DMStatistics -> { settings with
+				dms_full_typing = true;
+				dms_collect_data = true;
+				dms_inline = false;
+				dms_display_file_policy = DFPAlso;
+				dms_exit_during_typing = false;
+				dms_force_macro_typing = true;
+			}
+
+	let to_string = function
+		| DMNone -> "none"
+		| DMDefault -> "field"
+		| DMDefinition -> "position"
+		| DMTypeDefinition -> "type-definition"
+		| DMResolve s -> "resolve " ^ s
+		| DMPackage -> "package"
+		| DMHover -> "type"
+		| DMUsage true -> "rename"
+		| DMUsage false -> "references"
+		| DMModuleSymbols None -> "module-symbols"
+		| DMModuleSymbols (Some s) -> "workspace-symbols " ^ s
+		| DMDiagnostics b -> (if b then "global " else "") ^ "diagnostics"
+		| DMStatistics -> "statistics"
+		| DMSignature -> "signature"
+end
+
+type reference_kind =
+	| KVar
+	| KIdent
+	| KAnyField
+	| KClassField
+	| KEnumField
+	| KModuleType
+	| KConstructor
+
+type completion_subject = {
+	s_name : string option;
+	s_start_pos : pos;
+	s_insert_pos : pos;
+}
+
+let make_subject name ?(start_pos=None) insert_pos = {
+	s_name = name;
+	s_start_pos = (match start_pos with None -> insert_pos | Some p -> p);
+	s_insert_pos = insert_pos;
+}
\ No newline at end of file
diff --git a/src/core/error.ml b/src/core/error.ml
new file mode 100644
index 0000000000000000000000000000000000000000..0bdff27d74d3a8ef4875806b059b9a49be585c5b
--- /dev/null
+++ b/src/core/error.ml
@@ -0,0 +1,294 @@
+open Globals
+open Type
+
+type call_error =
+	| Not_enough_arguments of (string * bool * t) list
+	| Too_many_arguments
+	| Could_not_unify of error_msg
+	| Cannot_skip_non_nullable of string
+
+and error_msg =
+	| Module_not_found of path
+	| Type_not_found of path * string
+	| Unify of unify_error list
+	| Custom of string
+	| Unknown_ident of string
+	| Stack of error_msg * error_msg
+	| Call_error of call_error
+	| No_constructor of module_type
+
+exception Fatal_error of string * Globals.pos
+exception Error of error_msg * Globals.pos
+
+let string_source t = match follow t with
+	| TInst(c,tl) -> PMap.foldi (fun s _ acc -> s :: acc) (TClass.get_all_fields c tl) []
+	| TAnon a -> PMap.fold (fun cf acc -> cf.cf_name :: acc) a.a_fields []
+	| TAbstract({a_impl = Some c},_) -> List.map (fun cf -> cf.cf_name) c.cl_ordered_statics
+	| _ -> []
+
+let short_type ctx t =
+	let tstr = s_type ctx t in
+	if String.length tstr > 150 then String.sub tstr 0 147 ^ "..." else tstr
+
+let unify_error_msg ctx = function
+	| Cannot_unify (t1,t2) ->
+		s_type ctx t1 ^ " should be " ^ s_type ctx t2
+	| Invalid_field_type s ->
+		"Invalid type for field " ^ s ^ " :"
+	| Has_no_field (t,n) ->
+		StringError.string_error n (string_source t) (short_type ctx t ^ " has no field " ^ n)
+	| Has_no_runtime_field (t,n) ->
+		s_type ctx t ^ "." ^ n ^ " is not accessible at runtime"
+	| Has_extra_field (t,n) ->
+		short_type ctx t ^ " has extra field " ^ n
+	| Invalid_kind (f,a,b) ->
+		(match a, b with
+		| Var va, Var vb ->
+			let name, stra, strb = if va.v_read = vb.v_read then
+				"setter", s_access false va.v_write, s_access false vb.v_write
+			else if va.v_write = vb.v_write then
+				"getter", s_access true va.v_read, s_access true vb.v_read
+			else
+				"access", "(" ^ s_access true va.v_read ^ "," ^ s_access false va.v_write ^ ")", "(" ^ s_access true vb.v_read ^ "," ^ s_access false vb.v_write ^ ")"
+			in
+			"Inconsistent " ^ name ^ " for field " ^ f ^ " : " ^ stra ^ " should be " ^ strb
+		| _ ->
+			"Field " ^ f ^ " is " ^ s_kind a ^ " but should be " ^ s_kind b)
+	| Invalid_visibility n ->
+		"The field " ^ n ^ " is not public"
+	| Not_matching_optional n ->
+		"Optional attribute of parameter " ^ n ^ " differs"
+	| Cant_force_optional ->
+		"Optional parameters can't be forced"
+	| Invariant_parameter _ ->
+		"Type parameters are invariant"
+	| Constraint_failure name ->
+		"Constraint check failure for " ^ name
+	| Missing_overload (cf, t) ->
+		cf.cf_name ^ " has no overload for " ^ s_type ctx t
+	| FinalInvariance ->
+		"Cannot unify final and non-final fields"
+	| Invalid_function_argument(i,_) ->
+		Printf.sprintf "Cannot unify argument %i" i
+	| Invalid_return_type ->
+		"Cannot unify return types"
+	| Unify_custom msg ->
+		msg
+
+module BetterErrors = struct
+	type access_kind =
+		| Field of string
+		| FunctionArgument of int * int
+		| FunctionReturn
+		| TypeParameter of int
+		| Root
+
+	type access = {
+		acc_kind : access_kind;
+		mutable acc_expected : Type.t;
+		mutable acc_actual : Type.t;
+		mutable acc_messages : unify_error list;
+		mutable acc_next : access option;
+	}
+
+	let s_access_kind = function
+		| Field s -> "Field " ^ s
+		| FunctionArgument(i,l) -> Printf.sprintf "FunctionArgument(%i, %i)" i l
+		| FunctionReturn -> "FunctionReturn"
+		| TypeParameter i -> Printf.sprintf "TypeParameter %i" i
+		| Root -> "Root"
+
+	let get_access_chain ctx l =
+		let make_acc kind actual expected = {
+			acc_kind = kind;
+			acc_expected = expected;
+			acc_actual = actual;
+			acc_messages = [];
+			acc_next = None;
+		} in
+		let root_acc = make_acc Root t_dynamic t_dynamic in
+		let current_acc = ref root_acc in
+		let add_message msg =
+			!current_acc.acc_messages <- msg :: !current_acc.acc_messages
+		in
+		let add_access kind =
+			let acc = make_acc kind t_dynamic t_dynamic in
+			!current_acc.acc_next <- Some acc;
+			current_acc := acc;
+		in
+		List.iter (fun err -> match err with
+			| Cannot_unify(t1,t2) ->
+				!current_acc.acc_actual <- t1;
+				!current_acc.acc_expected <- t2;
+				add_message err
+			| Invalid_field_type s ->
+				add_access (Field s);
+			| Invalid_function_argument(i,l) ->
+				add_access (FunctionArgument(i,l));
+			| Invalid_return_type ->
+				add_access FunctionReturn;
+			| Invariant_parameter i ->
+				add_access (TypeParameter i);
+			| _ ->
+				add_message err
+		) l;
+		root_acc
+
+	(* non-recursive s_type *)
+	let rec s_type ctx t =
+		match t with
+		| TMono r ->
+			(match !r with
+			| None -> Printf.sprintf "Unknown<%d>" (try List.assq t (!ctx) with Not_found -> let n = List.length !ctx in ctx := (t,n) :: !ctx; n)
+			| Some t -> s_type ctx t)
+		| TEnum (e,tl) ->
+			s_type_path e.e_path ^ s_type_params ctx tl
+		| TInst (c,tl) ->
+			(match c.cl_kind with
+			| KExpr e -> Ast.Printer.s_expr e
+			| _ -> s_type_path c.cl_path ^ s_type_params ctx tl)
+		| TType (t,tl) ->
+			s_type_path t.t_path ^ s_type_params ctx tl
+		| TAbstract (a,tl) ->
+			s_type_path a.a_path ^ s_type_params ctx tl
+		| TFun ([],_) ->
+			"Void -> ..."
+		| TFun (l,t) ->
+			let args = match l with
+				| [] -> "()"
+				| ["",b,t] -> ("...")
+				| _ ->
+					let args = String.concat ", " (List.map (fun (s,b,t) ->
+						(if b then "?" else "") ^ ("...")
+					) l) in
+					"(" ^ args ^ ")"
+			in
+			Printf.sprintf "%s -> ..." args
+		| TAnon a ->
+			begin
+				match !(a.a_status) with
+				| Statics c -> Printf.sprintf "{ Statics %s }" (s_type_path c.cl_path)
+				| EnumStatics e -> Printf.sprintf "{ EnumStatics %s }" (s_type_path e.e_path)
+				| AbstractStatics a -> Printf.sprintf "{ AbstractStatics %s }" (s_type_path a.a_path)
+				| _ ->
+					let fl = PMap.fold (fun f acc -> ((if Meta.has Meta.Optional f.cf_meta then " ?" else " ") ^ f.cf_name) :: acc) a.a_fields [] in
+					"{" ^ (if not (is_closed a) then "+" else "") ^  String.concat "," fl ^ " }"
+			end
+		| TDynamic t2 ->
+			"Dynamic" ^ s_type_params ctx (if t == t2 then [] else [t2])
+		| TLazy f ->
+			s_type ctx (lazy_type f)
+
+	and s_type_params ctx = function
+		| [] -> ""
+		| l -> "<" ^ String.concat ", " (List.map (fun _ -> "...") l) ^ ">"
+
+	let better_error_message l =
+		let ctx = print_context() in
+		let rec loop acc l = match l with
+			| (Cannot_unify _) as err1 :: (Cannot_unify _) :: l ->
+				loop acc (err1 :: l)
+			| x :: l ->
+				loop (x :: acc) l
+			| [] ->
+				List.rev acc
+		in
+		let l = loop [] l in
+		let access = get_access_chain ctx l in
+		let message_buffer = Buffer.create 0 in
+		let rec fill s i acc k l =
+			if l = 0 then
+				List.rev acc
+			else begin
+				if k = i then fill s i (s :: acc) (k + 1) (l - 1)
+				else fill s i ("..." :: acc) (k + 1) (l - 1)
+			end
+		in
+		let rec loop access access_prev =
+			let loop () = match access.acc_next with
+				| Some access' -> loop access' access
+				| None ->
+					begin match access.acc_messages with
+						| err :: _ ->
+							let msg = unify_error_msg ctx err in
+							Buffer.add_string message_buffer msg;
+						| [] ->
+							()
+					end;
+					s_type ctx access.acc_actual,s_type ctx access.acc_expected
+			in
+			begin match access.acc_kind with
+			| Field s ->
+				let s1,s2 = loop() in
+				Printf.sprintf "{ %s: %s }" s s1,Printf.sprintf "{ %s: %s }" s s2
+			| FunctionArgument(i,l) ->
+				let s1,s2 = loop() in
+				let sl1 = fill s1 i [] 1 l in
+				let sl2 = fill s2 i [] 1 l in
+				Printf.sprintf "(%s) -> ..." (String.concat ", " sl2),Printf.sprintf "(%s) -> ..." (String.concat ", " sl1)
+			| FunctionReturn ->
+				let s1,s2 = loop() in
+				Printf.sprintf "(...) -> %s" s1,Printf.sprintf "(...) -> %s" s2
+			| TypeParameter i ->
+				let rec get_params t = match t with
+					| TInst({cl_path = path},params) | TEnum({e_path = path},params) | TAbstract({a_path = path},params) | TType({t_path = path},params) ->
+						path,params
+					| _ ->
+						assert false
+				in
+				let s1,s2 = loop() in
+				let path1,params1 = get_params access_prev.acc_actual in
+				let path2,params2 = get_params access_prev.acc_expected in
+				let sl1 = fill s1 i [] 1 (List.length params1) in
+				let sl2 = fill s2 i [] 1 (List.length params2) in
+				Printf.sprintf "%s<%s>" (s_type_path path1) (String.concat ", " sl1),Printf.sprintf "%s<%s>" (s_type_path path2) (String.concat ", " sl2)
+			| Root ->
+				loop()
+			end;
+		in
+		match access.acc_next with
+		| None ->
+			String.concat "\n" (List.rev_map (unify_error_msg ctx) access.acc_messages)
+		| Some access_next ->
+			let slhs,srhs = loop access_next access  in
+			Printf.sprintf "error: %s\n have: %s\n want: %s" (Buffer.contents message_buffer) slhs srhs
+end
+
+let rec error_msg = function
+	| Module_not_found m -> "Type not found : " ^ s_type_path m
+	| Type_not_found (m,t) -> "Module " ^ s_type_path m ^ " does not define type " ^ t
+	| Unify l -> BetterErrors.better_error_message l
+	| Unknown_ident s -> "Unknown identifier : " ^ s
+	| Custom s -> s
+	| Stack (m1,m2) -> error_msg m1 ^ "\n" ^ error_msg m2
+	| Call_error err -> s_call_error err
+	| No_constructor mt -> (s_type_path (t_infos mt).mt_path ^ " does not have a constructor")
+
+and s_call_error = function
+	| Not_enough_arguments tl ->
+		let pctx = print_context() in
+		"Not enough arguments, expected " ^ (String.concat ", " (List.map (fun (n,_,t) -> n ^ ":" ^ (short_type pctx t)) tl))
+	| Too_many_arguments -> "Too many arguments"
+	| Could_not_unify err -> error_msg err
+	| Cannot_skip_non_nullable s -> "Cannot skip non-nullable argument " ^ s
+
+let error msg p = raise (Error (Custom msg,p))
+
+let raise_error err p = raise (Error(err,p))
+
+let error_require r p =
+	if r = "" then
+		error "This field is not available with the current compilation flags" p
+	else
+	let r = if r = "sys" then
+		"a system platform (php,neko,cpp,etc.)"
+	else try
+		if String.sub r 0 5 <> "flash" then raise Exit;
+		let _, v = ExtString.String.replace (String.sub r 5 (String.length r - 5)) "_" "." in
+		"flash version " ^ v ^ " (use -swf-version " ^ v ^ ")"
+	with _ ->
+		"'" ^ r ^ "' to be enabled"
+	in
+	error ("Accessing this field requires " ^ r) p
+
+let invalid_assign p = error "Invalid assign" p
\ No newline at end of file
diff --git a/src/globals.ml b/src/core/globals.ml
similarity index 64%
rename from src/globals.ml
rename to src/core/globals.ml
index 95bb1a44b3df960df8d0e402402beacbb0a5b97a..d16a74d68c981a4702f5fd0769c7f2ba5f7d7bd1 100644
--- a/src/globals.ml
+++ b/src/core/globals.ml
@@ -4,8 +4,11 @@ type pos = {
 	pmax : int;
 }
 
-module IntMap = Map.Make(struct type t = int let compare a b = a - b end)
+type path = string list * string
+
+module IntMap = Ptmap
 module StringMap = Map.Make(struct type t = string let compare = String.compare end)
+module Int32Map = Map.Make(struct type t = Int32.t let compare = Int32.compare end)
 
 type platform =
 	| Cross
@@ -19,18 +22,19 @@ type platform =
 	| Java
 	| Python
 	| Hl
+	| Eval
 
-let version = 3407
+let version = 4000
 let version_major = version / 1000
 let version_minor = (version mod 1000) / 100
 let version_revision = (version mod 100)
+let version_pre = None
 
 let macro_platform = ref Neko
 
-let is_windows = Sys.os_type = "Win32" || Sys.os_type = "Cygwin"
+let return_partial_type = ref false
 
-let s_version =
-	Printf.sprintf "%d.%d.%d%s" version_major version_minor version_revision (match Version.version_extra with None -> "" | Some v -> " " ^ v)
+let is_windows = Sys.os_type = "Win32" || Sys.os_type = "Cygwin"
 
 let platforms = [
 	Js;
@@ -43,6 +47,7 @@ let platforms = [
 	Java;
 	Python;
 	Hl;
+	Eval;
 ]
 
 let platform_name = function
@@ -57,7 +62,16 @@ let platform_name = function
 	| Java -> "java"
 	| Python -> "python"
 	| Hl -> "hl"
+	| Eval -> "eval"
+
+let platform_list_help = function
+	| [] -> ""
+	| [p] -> " (" ^ platform_name p ^ " only)"
+	| pl -> " (for " ^ String.concat "," (List.map platform_name pl) ^ ")"
 
 let null_pos = { pfile = "?"; pmin = -1; pmax = -1 }
 
-let s_type_path (p,s) = match p with [] -> s | _ -> String.concat "." p ^ "." ^ s
\ No newline at end of file
+let s_type_path (p,s) = match p with [] -> s | _ -> String.concat "." p ^ "." ^ s
+
+let starts_with s c =
+	String.length s > 0 && s.[0] = c
\ No newline at end of file
diff --git a/src/core/json/genjson.ml b/src/core/json/genjson.ml
new file mode 100644
index 0000000000000000000000000000000000000000..27a27a8030a70a757bedc1a5fae9d5c2ba24fa37
--- /dev/null
+++ b/src/core/json/genjson.ml
@@ -0,0 +1,710 @@
+open Ast
+open Globals
+open Type
+open Meta
+
+type generation_mode =
+	| GMFull
+	| GMWithoutDoc
+	| GMMinimum
+
+type context = {
+	generation_mode : generation_mode;
+	generate_abstract_impl : bool;
+	request : JsonRequest.json_request option
+}
+
+let jnull = Json.JNull
+let jstring s = Json.JString s
+let jint i = Json.JInt i
+let jfloat f = Json.JFloat f
+let jbool b = Json.JBool b
+let jarray l = Json.JArray l
+let jobject l = Json.JObject l
+
+let jtodo = Json.JNull
+let jopt f o = Option.map_default f Json.JNull o
+let jlist f o = jarray (List.map f o)
+
+let generate_package_path' pack = [
+	("pack",jarray (List.map jstring pack))
+]
+
+let generate_package_path pack = jobject (generate_package_path' pack)
+
+let generate_module_path' mpath =
+	("moduleName",jstring (snd mpath)) ::
+	generate_package_path' (fst mpath)
+
+let generate_module_path mpath = jobject (generate_module_path' mpath)
+
+let generate_type_path' mpath tpath =
+	("typeName",jstring (snd tpath)) ::
+	generate_module_path' mpath
+
+let generate_type_path mpath tpath = jobject (generate_type_path' mpath tpath)
+
+let generate_adt ctx tpath name args =
+	let field = ("kind",jstring name) in
+	let fields = match args with
+		| None -> [field]
+		| Some arg -> [field;("args",arg)]
+	in
+	jobject fields
+
+let class_ref ctx c = generate_type_path c.cl_module.m_path c.cl_path
+let enum_ref ctx en = generate_type_path en.e_module.m_path  en.e_path
+let typedef_ref ctx td = generate_type_path td.t_module.m_path td.t_path
+let abstract_ref ctx a = generate_type_path a.a_module.m_path a.a_path
+let moduletype_ref ctx mt = generate_module_path (t_path mt)
+let classfield_ref ctx cf = jstring cf.cf_name
+let enumfield_ref ctx ef = jstring ef.ef_name
+let local_ref ctx v = jint v.v_id
+
+let generate_pos ctx p =
+	jobject [
+		"file",jstring p.pfile;
+		"min",jint p.pmin;
+		"max",jint p.pmax;
+	]
+
+let generate_expr_pos ctx p =
+	jtodo
+
+let generate_doc ctx d = match ctx.generation_mode with
+	| GMFull -> jopt jstring d
+	| GMWithoutDoc | GMMinimum -> jnull
+
+(** return a range JSON structure for given position
+    positions are 0-based and the result object looks like this:
+    {
+        start: {line: 0, character: 0},
+        end: {line: 3, character: 42},
+    }
+*)
+let pos_to_range p =
+	let l1, p1, l2, p2 = Lexer.get_pos_coords p in
+	let to_json l c = jobject [("line", jint (l - 1)); ("character", jint (c - 1))] in
+	[
+		("start", to_json l1 p1);
+		("end", to_json l2 p2);
+	]
+
+let generate_pos_as_range p =
+	if p.pmin = -1 then jnull
+	else jobject (pos_to_range p)
+
+let generate_pos_as_location p =
+	if p.pmin = -1 then
+		jnull
+	else
+		jobject [("file",jstring (Path.get_real_path p.pfile));"range",generate_pos_as_range p]
+
+(* AST expr *)
+
+let rec generate_binop ctx op =
+	let name,args = match op with
+	| OpAdd -> "OpAdd",None
+	| OpMult -> "OpMult",None
+	| OpDiv -> "OpDiv",None
+	| OpSub -> "OpSub",None
+	| OpAssign -> "OpAssign",None
+	| OpEq -> "OpEq",None
+	| OpNotEq -> "OpNotEq",None
+	| OpGt -> "OpGt",None
+	| OpGte -> "OpGte",None
+	| OpLt -> "OpLt",None
+	| OpLte -> "OpLte",None
+	| OpAnd -> "OpAnd",None
+	| OpOr -> "OpOr",None
+	| OpXor -> "OpXor",None
+	| OpBoolAnd -> "OpBoolAnd",None
+	| OpBoolOr -> "OpBoolOr",None
+	| OpShl -> "OpShl",None
+	| OpShr -> "OpShr",None
+	| OpUShr -> "OpUShr",None
+	| OpMod -> "OpMod",None
+	| OpAssignOp op -> "OpAssignOp", (Some (generate_binop ctx op))
+	| OpInterval -> "OpInterval",None
+	| OpArrow -> "OpArrow",None
+	| OpIn -> "OpIn",None
+	in
+	generate_adt ctx (Some (["haxe";"macro"],"Binop")) name args
+
+let generate_unop ctx op =
+	let name = match op with
+		| Increment -> "OpIncrement"
+		| Decrement -> "OpDecrement"
+		| Not -> "OpNot"
+		| Neg -> "OpNeg"
+		| NegBits -> "OpNegBits"
+	in
+	jstring name
+
+let rec generate_expr ctx e =
+	jtodo
+
+(* metadata *)
+
+and generate_metadata_entry ctx (m,el,p) =
+	jobject [
+		"name",jstring (Meta.to_string m);
+		"params",jlist (generate_expr ctx) el;
+		"pos",generate_pos ctx p;
+	]
+
+and generate_metadata ctx ml =
+	let ml = List.filter (fun (m,_,_) ->
+		let (_,(_,flags)) = Meta.get_info m in
+		not (List.mem UsedInternally flags)
+	) ml in
+	jlist (generate_metadata_entry ctx) ml
+
+and generate_minimum_metadata ctx ml =
+	match ctx.request with
+		| None -> None
+		| Some request ->
+			match request#get_requested_meta_list with
+				| None -> None
+				| Some requested ->
+					let ml =
+						List.filter
+							(fun (m,_,_) -> List.exists (fun r -> r = to_string m) requested)
+							ml
+					in
+					Some (jlist (generate_metadata_entry ctx) ml)
+
+(* AST.ml structures *)
+
+let rec generate_ast_type_param ctx tp = jobject [
+	"name",jstring (fst tp.tp_name);
+	"params",jlist (generate_ast_type_param ctx) tp.tp_params;
+	"constraints",jtodo;
+	"metadata",generate_metadata ctx tp.tp_meta
+]
+
+(* type instance *)
+
+let rec generate_type ctx t =
+	let rec loop t = match t with
+		| TMono r ->
+			begin match !r with
+			| None -> "TMono",None
+			| Some t -> loop t
+			end
+		| TLazy f ->
+			(* return_partial_type := true; *)
+			let t = lazy_type f in
+			(* return_partial_type := false; *)
+			loop t
+		| TDynamic t -> "TDynamic",Some (if t == t_dynamic then jnull else generate_type ctx t)
+		| TInst(c,tl) -> "TInst",Some (generate_type_path_with_params ctx c.cl_module.m_path c.cl_path tl)
+		| TEnum(en,tl) -> "TEnum",Some (generate_type_path_with_params ctx en.e_module.m_path en.e_path tl)
+		| TType(td,tl) -> "TType",Some (generate_type_path_with_params ctx td.t_module.m_path td.t_path tl)
+		| TAbstract(a,tl) -> "TAbstract",Some (generate_type_path_with_params ctx a.a_module.m_path a.a_path tl)
+		| TAnon an -> "TAnonymous", Some(generate_anon ctx an)
+		| TFun(tl,tr) -> "TFun", Some (jobject (generate_function_signature ctx tl tr))
+	in
+	let name,args = loop t in
+	generate_adt ctx None name args
+
+and generate_anon_status ctx status =
+	let name,args = match status with
+		| Closed -> "AClosed",None
+		| Opened -> "AOpened",None
+		| Const -> "AConst",None
+		| Extend tl -> "AExtend", Some (generate_types ctx tl)
+		| Statics c -> "AClassStatics",Some (class_ref ctx c)
+		| EnumStatics en -> "AEnumStatics",Some (enum_ref ctx en)
+		| AbstractStatics a -> "AAbstractStatics", Some (abstract_ref ctx a)
+	in
+	generate_adt ctx None name args
+
+and generate_anon ctx an =
+	let generate_anon_fields () =
+		let fields = PMap.fold (fun cf acc -> generate_class_field ctx CFSMember cf :: acc) an.a_fields [] in
+		jarray fields
+	in
+	jobject [
+		"fields",generate_anon_fields();
+		"status",generate_anon_status ctx !(an.a_status);
+	]
+
+and generate_function_argument ctx (name,opt,t) =
+	jobject [
+		"name",jstring name;
+		"opt",jbool opt;
+		"t",generate_type ctx t;
+	]
+
+and generate_function_signature ctx tl tr =
+	[
+		"args",jlist (generate_function_argument ctx) tl;
+		"ret",generate_type ctx tr;
+	]
+
+and generate_types ctx tl =
+	jlist (generate_type ctx) tl
+
+and generate_type_path_with_params ctx mpath tpath tl =
+	jobject [
+		"path",generate_type_path mpath tpath;
+		"params",generate_types ctx tl;
+	]
+
+(* type parameter *)
+
+and generate_type_parameter ctx (s,t) =
+	let generate_constraints () = match follow t with
+		| TInst({cl_kind = KTypeParameter tl},_) -> generate_types ctx tl
+		| _ -> assert false
+	in
+	jobject [
+		"name",jstring s;
+		"constraints",generate_constraints ();
+	]
+
+(* texpr *)
+
+and generate_tvar ctx v =
+	let generate_extra (params,eo) = jobject (
+		("params",jlist (generate_type_parameter ctx) params) ::
+		(match eo with
+		| None -> []
+		| Some e ->	["expr",jobject [
+			("string",jstring (s_expr_pretty false "" false (s_type (print_context())) e))
+		]]);
+	) in
+	let fields = [
+		"id",jint v.v_id;
+		"name",jstring v.v_name;
+		"type",generate_type ctx v.v_type;
+		"capture",jbool v.v_capture;
+		"extra",jopt generate_extra v.v_extra;
+		"meta",generate_metadata ctx v.v_meta;
+		"pos",generate_pos ctx v.v_pos;
+		"isFinal",jbool v.v_final;
+		"isInline",jbool (match v.v_extra with Some (_,Some _) -> true | _ -> false);
+	] in
+	let origin_to_int = function
+		| TVOLocalVariable -> 0
+		| TVOArgument -> 1
+		| TVOForVariable -> 2
+		| TVOPatternVariable -> 3
+		| TVOCatchVariable -> 4
+		| TVOLocalFunction -> 5
+	in
+	let fields = match v.v_kind with
+			| VUser origin -> ("origin",jint (origin_to_int origin)) :: fields
+			| _ -> fields
+	in
+	jobject fields
+
+and generate_tconstant ctx ct =
+	let name,args = match ct with
+		| TInt i32 -> "TInt",Some (jstring (Int32.to_string i32))
+		| TFloat s -> "TFloat",Some (jstring s)
+		| TString s -> "TString",Some (jstring s)
+		| TBool b -> "TBool",Some (jbool b)
+		| TNull -> "TNull",None
+		| TThis -> "TThis",None
+		| TSuper -> "TSuper",None
+	in
+	generate_adt ctx None name args
+
+and generate_tfunction ctx tf =
+	let generate_arg (v,cto) = jobject [
+		"v",generate_tvar ctx v;
+		"value",jopt (generate_texpr ctx) cto;
+	] in
+	jobject [
+		"args",jlist generate_arg tf.tf_args;
+		"ret",generate_type ctx tf.tf_type;
+		"expr",generate_expr ctx tf.tf_expr;
+	]
+
+and generate_texpr ctx e =
+	jtodo
+	(* let name,args = match e.eexpr with
+	| TConst ct ->
+		"TConst",Some (generate_tconstant ctx ct)
+	| TLocal v ->
+		"TLocal",Some (local_ref ctx v)
+	| TArray(e1,e2) ->
+		"TArray",Some (jobject [
+			"expr1",generate_texpr ctx e1;
+			"expr2",generate_texpr ctx e2;
+		])
+	| TBinop(op,e1,e2) ->
+		"TBinop",Some (jobject [
+			"op",generate_binop ctx op;
+			"expr1",generate_texpr ctx e1;
+			"expr2",generate_texpr ctx e2;
+		]);
+	| TField(e1,fa) ->
+		"TField",Some (jobject [
+			"expr",generate_texpr ctx e1;
+			"name",jstring (field_name fa);
+			(* TODO *)
+		]);
+	| TTypeExpr mt ->
+		"TTypeExpr",Some (moduletype_ref ctx mt)
+	| TParenthesis e1 ->
+		"TParenthesis",Some (generate_texpr ctx e1)
+	| TObjectDecl fl ->
+		let generate_quote_status qs =
+			let name = match qs with
+				| DoubleQuotes -> "DoubleQuotes"
+				| NoQuotes -> "NoQuotes"
+			in
+			generate_adt ctx None name None
+		in
+		let generate_key (name,pos,qs) = jobject [
+			"name",jstring name;
+			"pos",generate_expr_pos ctx pos;
+			"quoteStatus",generate_quote_status qs;
+		] in
+		let generate_entry (key,value) = jobject [
+			"key",generate_key key;
+			"value",generate_texpr ctx value;
+		] in
+		let fields = List.map generate_entry fl in
+		"TObjectDecl",Some (jarray fields)
+	| TArrayDecl el ->
+		let fields = List.map (generate_texpr ctx) el in
+		"TArrayDecl",Some (jarray fields)
+	| TCall(e1,el) ->
+		let args = List.map (generate_texpr ctx) el in
+		"TCall",Some (jobject [
+			"expr",generate_texpr ctx e1;
+			"args",jarray args;
+		]);
+	| TNew(c,tl,el) ->
+		let args = List.map (generate_texpr ctx) el in
+		"TNew",Some (jobject [
+			"path",generate_type_path_with_params ctx c.cl_path tl;
+			"args",jarray args;
+		]);
+	| TUnop(op,flag,e1) ->
+		"TUnop",Some (jobject [
+			"op",generate_unop ctx op;
+			"prefix",jbool (flag = Prefix);
+			"expr",generate_texpr ctx e1;
+		]);
+	| TFunction tf ->
+		"TFunction",Some (generate_tfunction ctx tf)
+	| TVar(v,eo) ->
+		"TVar",Some (jobject [
+			"v",generate_tvar ctx v;
+			"expr",jopt (generate_texpr ctx) eo;
+		])
+	| TBlock el ->
+		let el = List.map (generate_texpr ctx) el in
+		"TBlock",Some (jarray el)
+	| TFor(v,e1,e2) ->
+		"TFor",Some (jobject [
+			"v",generate_tvar ctx v;
+			"expr1",generate_texpr ctx e1;
+			"expr2",generate_texpr ctx e2;
+		]);
+	| TIf(e1,e2,eo) ->
+		"TIf",Some (jobject [
+			"eif",generate_texpr ctx e1;
+			"ethen",generate_expr ctx e1;
+			"eelse",jopt (generate_expr ctx) eo;
+		]);
+	| TWhile(e1,e2,flag) ->
+		"TWhile",Some (jobject [
+			"econd",generate_texpr ctx e1;
+			"ebody",generate_texpr ctx e2;
+			"isDoWhile",jbool (flag = DoWhile);
+		]);
+	| TSwitch(e1,cases,edef) ->
+		let generate_case (el,e) = jobject [
+			"patterns",jlist (generate_texpr ctx) el;
+			"expr",generate_texpr ctx e;
+		] in
+		"TSwitch",Some (jobject [
+			"subject",generate_texpr ctx e1;
+			"cases",jlist generate_case cases;
+			"def",jopt (generate_texpr ctx) edef;
+		])
+	| TTry(e1,catches) ->
+		let generate_catch (v,e) = jobject [
+			"v",generate_tvar ctx v;
+			"expr",generate_texpr ctx e;
+		] in
+		"TTry",Some (jobject [
+			"expr",generate_texpr ctx e1;
+			"catches",jlist generate_catch catches;
+		])
+	| TReturn eo ->
+		"TReturn",Option.map (generate_texpr ctx) eo
+	| TBreak ->
+		"TBreak",None
+	| TContinue ->
+		"TContinue",None
+	| TThrow e1 ->
+		"TThrow",Some (generate_texpr ctx e1)
+	| TCast(e1,mto) ->
+		"TCast",Some (jobject [
+			"expr",generate_texpr ctx e1;
+			"moduleType",jopt (moduletype_ref ctx) mto;
+		]);
+	| TMeta(m,e1) ->
+		"TMeta",Some (jobject [
+			"meta",generate_metadata_entry ctx m;
+			"expr",generate_texpr ctx e1;
+		])
+	| TEnumParameter(e1,ef,i) ->
+		"TEnumParameter",Some (jobject [
+			"expr",generate_texpr ctx e1;
+			"enumField",enumfield_ref ctx ef;
+			"index",jint i;
+		]);
+	| TEnumIndex e1 ->
+		"TEnumIndex",Some (generate_texpr ctx e1)
+	| TIdent s ->
+		"TIdent",Some (jstring s)
+	in
+	jobject [
+		"expr",generate_adt ctx None name args;
+		(* TODO: pos? *)
+		"type",generate_type ctx e.etype;
+	] *)
+
+(* fields *)
+
+and generate_class_field' ctx cfs cf =
+	let generate_class_kind () =
+		let generate_var_access va =
+			let name,args = match va with
+				| AccNormal -> "AccNormal",None
+				| AccNo -> "AccNo",None
+				| AccNever -> "AccNever",None
+				| AccCtor -> "AccCtor",None
+				| AccResolve -> "AccResolve",None
+				| AccCall -> "AccCall",None
+				| AccInline -> "AccInline",None
+				| AccRequire(s,so) -> "AccRequire",Some (jobject ["require",jstring s;"message",jopt jstring so])
+			in
+			generate_adt ctx None name args
+		in
+		let generate_method_kind m =
+			let name = match m with
+				| MethNormal -> "MethNormal"
+				| MethInline -> "MethInline"
+				| MethDynamic -> "MethDynamic"
+				| MethMacro -> "MethMacro"
+			in
+			jstring name
+		in
+		let name,args = match cf.cf_kind with
+			| Var vk -> "FVar",Some (jobject ["read",generate_var_access vk.v_read;"write",generate_var_access vk.v_write])
+			| Method m -> "FMethod", Some (generate_method_kind m)
+		in
+		generate_adt ctx None name args
+	in
+	let expr = match ctx.generation_mode with
+		| GMFull | GMWithoutDoc ->
+			let value = match cf.cf_kind with
+				| Method _ -> None
+				| Var _ ->
+					try
+						begin match Meta.get Meta.Value cf.cf_meta with
+							| (_,[e],_) -> Some e
+							| _ -> None
+						end
+					with Not_found ->
+						None
+			in
+			begin match value with
+				| None ->
+					if Meta.has (Meta.Custom ":testHack") cf.cf_meta then begin match cf.cf_expr with
+						| Some e -> jobject ["testHack",jstring (s_expr_pretty false "" false (s_type (print_context())) e)] (* TODO: haha *)
+						| None -> jnull
+					end else
+						jnull
+				| Some e -> jobject ["string",jstring (Ast.Printer.s_expr e)]
+			end
+		| GMMinimum ->
+			jnull
+	in
+	[
+		"name",jstring cf.cf_name;
+		"type",generate_type ctx cf.cf_type;
+		"isPublic",jbool (has_class_field_flag cf CfPublic);
+		"isFinal",jbool (has_class_field_flag cf CfFinal);
+		"params",jlist (generate_type_parameter ctx) cf.cf_params;
+		"meta",generate_metadata ctx cf.cf_meta;
+		"kind",generate_class_kind ();
+		"expr",expr;
+		"pos",generate_pos ctx cf.cf_pos;
+		"doc",generate_doc ctx cf.cf_doc;
+		"overloads",jlist (generate_class_field ctx cfs) cf.cf_overloads;
+		"scope",jint (Obj.magic cfs);
+	]
+
+and generate_class_field ctx cfs cf =
+	jobject (generate_class_field' ctx cfs cf)
+
+let generate_enum_field ctx ef =
+	jobject [
+		"name",jstring ef.ef_name;
+		"type",generate_type ctx ef.ef_type;
+		"pos",generate_pos ctx ef.ef_pos;
+		"meta",generate_metadata ctx ef.ef_meta;
+		"index",jint ef.ef_index;
+		"doc",generate_doc ctx ef.ef_doc;
+		"params",jlist (generate_type_parameter ctx) ef.ef_params;
+	]
+
+(* module type *)
+
+let generate_module_type_fields ctx inf =
+	[
+		"pack",jlist jstring (fst inf.mt_path);
+		"name",jstring (snd inf.mt_path);
+		"moduleName",jstring (snd inf.mt_module.m_path);
+		"pos",generate_pos ctx inf.mt_pos;
+		"isPrivate",jbool inf.mt_private;
+		"params",jlist (generate_type_parameter ctx) inf.mt_params;
+		"meta",generate_metadata ctx inf.mt_meta;
+		"doc",generate_doc ctx inf.mt_doc;
+	]
+
+let generate_class ctx c =
+	let generate_class_kind ck =
+		let ctor,args = match ck with
+		| KNormal -> "KNormal",None
+		| KTypeParameter tl -> "KTypeParameter",Some (generate_types ctx tl)
+		| KExpr e -> "KExpr",Some (generate_expr ctx e)
+		| KGeneric -> "KGeneric",None
+		| KGenericInstance(c,tl) -> "KGenericInstance",Some (generate_type_path_with_params ctx c.cl_module.m_path c.cl_path tl)
+		| KMacroType -> "KMacroType",None
+		| KGenericBuild _ -> "KGenericBuild",None
+		| KAbstractImpl a -> "KAbstractImpl",Some (abstract_ref ctx a)
+		in
+		generate_adt ctx (Some (["haxe";"macro"],"ClassKind")) ctor args
+	in
+	let generate_class_relation (c,tl) =
+		jobject [
+			"t",class_ref ctx c;
+			"params",generate_types ctx tl;
+		]
+	in
+	[
+		"kind",generate_class_kind c.cl_kind;
+		"isInterface",jbool c.cl_interface;
+		"superClass",jopt generate_class_relation c.cl_super;
+		"interfaces",jlist generate_class_relation c.cl_implements;
+		"fields",jlist (generate_class_field ctx CFSMember) c.cl_ordered_fields;
+		"statics",jlist (generate_class_field ctx CFSStatic) c.cl_ordered_statics;
+		"constructor",jopt (generate_class_field ctx CFSConstructor) c.cl_constructor;
+		"init",jopt (generate_texpr ctx) c.cl_init;
+		"overrides",jlist (classfield_ref ctx) c.cl_overrides;
+		"isExtern",jbool c.cl_extern;
+	]
+
+let generate_enum ctx e =
+	let generate_enum_constructors () =
+		jarray (List.map (fun s ->
+			let ef = PMap.find s e.e_constrs in
+			generate_enum_field ctx ef
+		) e.e_names)
+	in
+	[
+		"constructors",generate_enum_constructors ();
+		"isExtern",jbool e.e_extern;
+	]
+
+let generate_typedef ctx td =
+	[
+		"type",generate_type ctx td.t_type;
+	]
+
+let generate_abstract ctx a =
+	let generate_cast_relation t cfo =
+		jobject [
+			"t",generate_type ctx t;
+			"field",jopt (classfield_ref ctx) cfo
+		]
+	in
+	let generate_casts fields casts =
+		let l1 = List.map (fun (t,cf) -> generate_cast_relation t (Some cf)) fields in
+		let l2 = List.map (fun t -> generate_cast_relation t None) casts in
+		jarray (l1 @ l2)
+	in
+	let generate_binop (op,cf) =
+		jobject [
+			"op",generate_binop ctx op;
+			"field",classfield_ref ctx cf;
+		]
+	in
+	let generate_unop (op,flag,cf) =
+		jobject [
+			"op",generate_unop ctx op;
+			"postFix",jbool (flag = Postfix);
+			"field",classfield_ref ctx cf;
+		]
+	in
+	let impl = match a.a_impl with
+		| None -> jnull
+		| Some c ->
+			if ctx.generate_abstract_impl then jobject (generate_class ctx c)
+			else class_ref ctx c
+	in
+	[
+		"type",generate_type ctx a.a_this;
+		"impl",impl;
+		"binops",jlist generate_binop a.a_ops;
+		"unops",jlist generate_unop a.a_unops;
+		"from",generate_casts a.a_from_field a.a_from;
+		"to",generate_casts a.a_to_field a.a_to;
+		"array",jlist (classfield_ref ctx) a.a_array;
+		"read",jopt (classfield_ref ctx) a.a_read;
+		"write",jopt (classfield_ref ctx) a.a_write;
+	]
+
+let generate_module_type ctx mt =
+	let fields1 = generate_module_type_fields ctx (t_infos mt) in
+	let kind,fields2 = match mt with
+		| TClassDecl c -> "class",generate_class ctx c
+		| TEnumDecl e -> "enum",generate_enum ctx e
+		| TTypeDecl t -> "typedef",generate_typedef ctx t
+		| TAbstractDecl a -> "abstract",generate_abstract ctx a
+	in
+	let fields1 = ("kind",jstring kind) :: fields1 @ [("args",jobject fields2)] in
+	jobject fields1
+
+(* module *)
+
+let generate_module ctx m =
+	jobject [
+		"id",jint m.m_id;
+		"path",generate_module_path m.m_path;
+		"types",jlist (fun mt -> generate_type_path m.m_path (t_infos mt).mt_path) m.m_types;
+		"file",jstring m.m_extra.m_file;
+		"sign",jstring (Digest.to_hex m.m_extra.m_sign);
+		"dependencies",jarray (PMap.fold (fun m acc -> (jobject [
+			"path",jstring (s_type_path m.m_path);
+			"sign",jstring (Digest.to_hex m.m_extra.m_sign);
+		]) :: acc) m.m_extra.m_deps []);
+	]
+
+let create_context ?jsonrpc gm = {
+	generation_mode = gm;
+	generate_abstract_impl = false;
+	request = match jsonrpc with None -> None | Some jsonrpc -> Some (new JsonRequest.json_request jsonrpc)
+}
+
+let generate types file =
+	let t = Timer.timer ["generate";"json";"construct"] in
+	let ctx = create_context GMFull in
+	let json = jarray (List.map (generate_module_type ctx) types) in
+	t();
+	let t = Timer.timer ["generate";"json";"write"] in
+	let ch = open_out_bin file in
+	Json.write_json (output_string ch) json;
+	close_out ch;
+	t()
\ No newline at end of file
diff --git a/src/core/json/json.ml b/src/core/json/json.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b50779a46247fc1626d57168fc0bc58acec0c715
--- /dev/null
+++ b/src/core/json/json.ml
@@ -0,0 +1,401 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+type t =
+	| JString of string
+	| JFloat of float
+	| JInt of int
+	| JObject of (string * t) list
+	| JArray of t list
+	| JBool of bool
+	| JNull
+
+let write_iter f_el f_sep l =
+	let rec rest = function
+		| [] -> ()
+		| v :: l ->
+			f_sep();
+			f_el v;
+			rest l
+	in
+	match l with
+	| [] -> ()
+	| v :: l ->
+		f_el v;
+		rest l
+
+let write_sep w =
+	w ","
+
+let rec write_json w v =
+	match v with
+	| JNull -> write_null w
+	| JBool b -> write_bool w b
+	| JString s -> write_string w s
+	| JFloat f -> write_float w f
+	| JInt i -> write_int w i
+	| JObject o -> write_object w o
+	| JArray a -> write_array w a
+
+and write_null w =
+	w "null"
+
+and write_bool w b =
+	w (if b then "true" else "false")
+
+and write_string w s =
+	w "\"";
+	let b = Buffer.create (String.length s) in
+	for i = 0 to String.length s - 1 do
+		match String.unsafe_get s i with
+		| '"' -> Buffer.add_string b "\\\""
+		| '\t' -> Buffer.add_string b "\\t"
+		| '\r' -> Buffer.add_string b "\\r"
+		| '\b' -> Buffer.add_string b "\\b"
+		| '\n' -> Buffer.add_string b "\\n"
+		| '\012' -> Buffer.add_string b "\\f"
+		| '\\' -> Buffer.add_string b "\\\\"
+		| '\x00'..'\x1F' | '\x7F' as c -> Buffer.add_string b (Printf.sprintf "\\u%04X" (int_of_char c))
+		| c -> Buffer.add_char b c
+	done;
+	w (Buffer.contents b);
+	w "\""
+
+and write_int w i =
+	w (string_of_int i)
+
+and write_float w f =
+	match classify_float f with
+	| FP_nan | FP_infinite -> failwith "NaN and infinity floats are unsupported in JSON"
+	| _ ->
+		let s = Printf.sprintf "%.16g" f in
+		let s = if float_of_string s = f then s else Printf.sprintf "%.17g" f in
+		w s
+
+and write_array w a =
+	w "[";
+	write_iter (write_json w) (fun() -> write_sep w) a;
+	w "]"
+
+and write_object w o =
+	let write_el (k, v) =
+		write_string w k;
+		w ":";
+		write_json w v
+	in
+	w "{";
+	write_iter write_el (fun() -> write_sep w) o;
+	w "}"
+
+let string_of_json json =
+	let b = Buffer.create 0 in
+	write_json (Buffer.add_string b) json;
+	Buffer.contents b;
+
+module Reader = struct
+	(*
+		The following code is basically stripped down yojson (https://github.com/mjambon/yojson),
+		adapted to our data structures and using sedlex instad of ocamllex.
+
+		TODO: we could probably re-use utf-8 stuff from our extlib, but I don't know enough about it.
+	*)
+	open Sedlexing
+	open Sedlexing.Utf8
+
+	exception Json_error of string
+	exception Int_overflow
+
+	let dec c =
+		Char.code c - 48
+
+	let hex c =
+		match (char_of_int c) with
+		| '0'..'9' -> c - int_of_char '0'
+		| 'a'..'f' -> c - int_of_char 'a' + 10
+		| 'A'..'F' -> c - int_of_char 'A' + 10
+		| _ -> assert false
+
+	let min10 = min_int / 10 - (if min_int mod 10 = 0 then 0 else 1)
+	let max10 = max_int / 10 + (if max_int mod 10 = 0 then 0 else 1)
+
+	let json_error s = raise (Json_error s)
+
+	let extract_positive_int lexbuf =
+		let s = Sedlexing.Utf8.lexeme lexbuf in
+		let n = ref 0 in
+		for i = 0 to (lexeme_length lexbuf) - 1 do
+			if !n >= max10 then
+				raise Int_overflow
+			else
+				n := 10 * !n + dec s.[i]
+		done;
+		if !n < 0 then
+			raise Int_overflow
+		else
+			!n
+
+	let make_positive_int lexbuf =
+		try JInt (extract_positive_int lexbuf)
+		with Int_overflow -> JFloat (float_of_string (lexeme lexbuf))
+
+	let extract_negative_int lexbuf =
+		let s = Sedlexing.Utf8.lexeme lexbuf in
+		let n = ref 0 in
+		for i = 1 to (lexeme_length lexbuf) - 1 do
+			if !n <= min10 then
+				raise Int_overflow
+			else
+				n := 10 * !n - dec s.[i]
+		done;
+		if !n > 0 then
+			raise Int_overflow
+		else
+			!n
+
+	let make_negative_int lexbuf =
+		try JInt (extract_negative_int lexbuf)
+		with Int_overflow -> JFloat (float_of_string (lexeme lexbuf))
+
+	let utf8_of_code buf x =
+		let add = Buffer.add_char in
+
+		(* Straight <= doesn't work with signed 31-bit ints *)
+		let maxbits n x = x lsr n = 0 in
+
+		if maxbits 7 x then
+			(* 7 *)
+			add buf (Char.chr x)
+		else if maxbits 11 x then (
+			(* 5 + 6 *)
+			add buf (Char.chr (0b11000000 lor ((x lsr 6) land 0b00011111)));
+			add buf (Char.chr (0b10000000 lor (x         land 0b00111111)))
+		)
+		else if maxbits 16 x then (
+			(* 4 + 6 + 6 *)
+			add buf (Char.chr (0b11100000 lor ((x lsr 12) land 0b00001111)));
+			add buf (Char.chr (0b10000000 lor ((x lsr  6) land 0b00111111)));
+			add buf (Char.chr (0b10000000 lor (x          land 0b00111111)))
+		)
+		else if maxbits 21 x then (
+			(* 3 + 6 + 6 + 6 *)
+			add buf (Char.chr (0b11110000 lor ((x lsr 18) land 0b00000111)));
+			add buf (Char.chr (0b10000000 lor ((x lsr 12) land 0b00111111)));
+			add buf (Char.chr (0b10000000 lor ((x lsr  6) land 0b00111111)));
+			add buf (Char.chr (0b10000000 lor (x          land 0b00111111)));
+		)
+		else if maxbits 26 x then (
+			(* 2 + 6 + 6 + 6 + 6 *)
+			add buf (Char.chr (0b11111000 lor ((x lsr 24) land 0b00000011)));
+			add buf (Char.chr (0b10000000 lor ((x lsr 18) land 0b00111111)));
+			add buf (Char.chr (0b10000000 lor ((x lsr 12) land 0b00111111)));
+			add buf (Char.chr (0b10000000 lor ((x lsr  6) land 0b00111111)));
+			add buf (Char.chr (0b10000000 lor (x          land 0b00111111)));
+		)
+		else (
+			assert (maxbits 31 x);
+			(* 1 + 6 + 6 + 6 + 6 + 6 *)
+			add buf (Char.chr (0b11111100 lor ((x lsr 30) land 0b00000001)));
+			add buf (Char.chr (0b10000000 lor ((x lsr 24) land 0b00111111)));
+			add buf (Char.chr (0b10000000 lor ((x lsr 18) land 0b00111111)));
+			add buf (Char.chr (0b10000000 lor ((x lsr 12) land 0b00111111)));
+			add buf (Char.chr (0b10000000 lor ((x lsr  6) land 0b00111111)));
+			add buf (Char.chr (0b10000000 lor (x          land 0b00111111)));
+		)
+
+	let code_of_surrogate_pair i j =
+		let high10 = i - 0xD800 in
+		let low10 = j - 0xDC00 in
+		0x10000 + ((high10 lsl 10) lor low10)
+
+	let utf8_of_surrogate_pair buf i j =
+		utf8_of_code buf (code_of_surrogate_pair i j)
+
+	let space = [%sedlex.regexp? Plus (Chars " \t\r\n")]
+	let digit = [%sedlex.regexp? '0' .. '9']
+	let nonzero = [%sedlex.regexp? '1' .. '9']
+	let digits = [%sedlex.regexp? Plus digit]
+	let frac = [%sedlex.regexp? '.', digits]
+	let e = [%sedlex.regexp? (Chars "eE"),(Opt (Chars "+-"))]
+	let exp = [%sedlex.regexp? e, digits]
+	let positive_int = [%sedlex.regexp? digit | (nonzero, digits)]
+	let float = [%sedlex.regexp? (Opt '-'), positive_int, (frac | exp | (frac, exp))]
+	let hex = [%sedlex.regexp? '0'..'9' | 'a'..'f' | 'A'..'F' ]
+
+	let rec read_json lexbuf =
+		match%sedlex lexbuf with
+		| "true" ->
+			JBool true
+		| "false" ->
+			JBool false
+		| "null" ->
+			JNull
+		| '"' ->
+			JString (finish_string (Buffer.create 0) lexbuf)
+		| positive_int ->
+			make_positive_int lexbuf
+		| '-', positive_int ->
+			make_negative_int lexbuf
+		| float ->
+			JFloat (float_of_string (lexeme lexbuf))
+		| '{' ->
+			let acc = ref [] in
+			begin try
+				skip_space lexbuf;
+				read_object_end lexbuf;
+				let field_name = read_string lexbuf in
+				skip_space lexbuf;
+				read_colon lexbuf;
+				skip_space lexbuf;
+				acc := (field_name, read_json lexbuf) :: !acc;
+				while true do
+					skip_space lexbuf;
+					read_object_sep lexbuf;
+					skip_space lexbuf;
+					let field_name = read_string lexbuf in
+					skip_space lexbuf;
+					read_colon lexbuf;
+					skip_space lexbuf;
+					acc := (field_name, read_json lexbuf) :: !acc;
+				done;
+				assert false
+			with Exit ->
+				JObject (List.rev !acc)
+			end
+		| '[' ->
+			let acc = ref [] in
+			begin try
+				skip_space lexbuf;
+				read_array_end lexbuf;
+				acc := read_json lexbuf :: !acc;
+				while true do
+					skip_space lexbuf;
+					read_array_sep lexbuf;
+					skip_space lexbuf;
+					acc := read_json lexbuf :: !acc;
+				done;
+				assert false
+			with Exit ->
+				JArray (List.rev !acc)
+			end
+		| space ->
+			read_json lexbuf
+		| eof ->
+			json_error "Unexpected end of input"
+		| _ ->
+			json_error "Invalid token"
+
+	and finish_string buf lexbuf =
+		match%sedlex lexbuf with
+		| '"' -> Buffer.contents buf
+		| '\\' ->
+			finish_escaped_char buf lexbuf;
+			finish_string buf lexbuf
+		| Plus (Compl ('"' | '\\')) ->
+			Buffer.add_string buf (Sedlexing.Utf8.lexeme lexbuf);
+			finish_string buf lexbuf
+		| eof -> json_error "Unexpected end of input"
+		| _ -> assert false
+
+	and finish_escaped_char buf lexbuf =
+		match%sedlex lexbuf with
+		| '"' | '\\' | '/' ->
+			Buffer.add_char buf (Uchar.to_char (Sedlexing.lexeme_char lexbuf 0))
+		| 'b' ->
+			Buffer.add_char buf '\b'
+		| 'f' ->
+			Buffer.add_char buf '\012'
+		| 'n' ->
+			Buffer.add_char buf '\n'
+		| 'r' ->
+			Buffer.add_char buf '\r'
+		| 't' ->
+			Buffer.add_char buf '\t'
+		| 'u', hex, hex, hex, hex ->
+			let a,b,c,d =
+				match Sedlexing.lexeme lexbuf with
+				| [|_; a; b; c; d|] -> Uchar.to_int a, Uchar.to_int b, Uchar.to_int c, Uchar.to_int d
+				| _ -> assert false
+			in
+			let x =
+				(hex a lsl 12) lor (hex b lsl 8) lor (hex c lsl 4) lor hex d
+			in
+			if x >= 0xD800 && x <= 0xDBFF then
+				finish_surrogate_pair buf x lexbuf
+			else
+				utf8_of_code buf x
+		| _ ->
+			json_error "Invalid escape sequence"
+
+	and finish_surrogate_pair buf x lexbuf =
+		match%sedlex lexbuf with
+		| "\\u", hex, hex, hex, hex ->
+			let a,b,c,d =
+				match Sedlexing.lexeme lexbuf with
+				| [|_;_ ; a; b; c; d|] -> Uchar.to_int a, Uchar.to_int b, Uchar.to_int c, Uchar.to_int d
+				| _ -> assert false
+			in
+			let y =
+				(hex a lsl 12) lor (hex b lsl 8) lor (hex c lsl 4) lor hex d
+			in
+			if y >= 0xDC00 && y <= 0xDFFF then
+				utf8_of_surrogate_pair buf x y
+			else
+				json_error "Invalid low surrogate for code point beyond U+FFFF"
+		| _ ->
+			json_error "Missing escape sequence representing low surrogate for code point beyond U+FFFF"
+
+	and skip_space lexbuf =
+		match%sedlex lexbuf with
+		| space | "" -> ()
+		| _ -> assert false
+
+	and read_string lexbuf =
+		match%sedlex lexbuf with
+		| '"' -> finish_string (Buffer.create 0) lexbuf
+		| _ -> json_error "Expected string"
+
+	and read_array_end lexbuf =
+		match%sedlex lexbuf with
+		| ']' -> raise Exit
+		| "" -> ()
+		| _ -> assert false
+
+	and read_array_sep lexbuf =
+		match%sedlex lexbuf with
+		| ',' -> ()
+		| ']' -> raise Exit
+		| _ -> json_error "Expected ',' or ']'"
+
+	and read_object_end lexbuf =
+		match%sedlex lexbuf with
+		| '}' -> raise Exit
+		| "" -> ()
+		| _ -> assert false
+
+	and read_object_sep lexbuf =
+		match%sedlex lexbuf with
+		| ',' -> ()
+		| '}' -> raise Exit
+		| _ -> json_error "Expected ',' or '}'"
+
+	and read_colon lexbuf =
+		match%sedlex lexbuf with
+		| ':' -> ()
+		| _ -> json_error "Expected ':'"
+end
diff --git a/src/core/json/jsonRequest.ml b/src/core/json/jsonRequest.ml
new file mode 100644
index 0000000000000000000000000000000000000000..0e3a2828305325e5bcd41e170c7614d35d9d915d
--- /dev/null
+++ b/src/core/json/jsonRequest.ml
@@ -0,0 +1,19 @@
+open Jsonrpc_handler
+
+class json_request (rpc:jsonrpc_handler) = object (self)
+	val mutable requested_meta_list = None
+	(**
+		The contents of `params.meta` field of the request json
+	*)
+	method get_requested_meta_list : string list option =
+		match requested_meta_list with
+			| Some result -> result
+			| None ->
+				let result =
+					rpc#get_opt_param
+						(fun () -> Some (List.map (rpc#get_string "Metadata name") (rpc#get_array_param "meta")))
+						None
+				in
+				requested_meta_list <- Some result;
+				result
+end
\ No newline at end of file
diff --git a/src/core/json/jsonRpc.ml b/src/core/json/jsonRpc.ml
new file mode 100644
index 0000000000000000000000000000000000000000..180c9d62f89d5d092768db9b9b70699f17e43f96
--- /dev/null
+++ b/src/core/json/jsonRpc.ml
@@ -0,0 +1,79 @@
+open Json
+
+let jsonrpc_field = "jsonrpc", JString "2.0"
+
+let notification method_name params =
+	let fl = [
+		jsonrpc_field;
+		"method", JString method_name;
+	] in
+	let fl = Option.map_default (fun params -> ("params",params) :: fl) fl params in
+	JObject fl
+
+let result id data =
+	JObject [
+		jsonrpc_field;
+		"id", id;
+		"result", data;
+	]
+
+let error id code ?(data=None) message =
+	JObject [
+		jsonrpc_field;
+		"id", id;
+		"error", JObject (
+			("code", JInt code) ::
+			("message", JString message) ::
+			(match data with None -> [] | Some data -> ["data",data])
+		)
+	]
+
+type json_rpc_error =
+	| Parse_error of string
+	| Invalid_request of string
+	| Method_not_found of Json.t * string (* id->methodname *)
+	| Invalid_params of Json.t
+	| Custom of Json.t * int * string (* id->code->message *)
+
+exception JsonRpc_error of json_rpc_error
+
+let raise_method_not_found id name = raise (JsonRpc_error (Method_not_found(id,name)))
+let raise_custom id code message = raise (JsonRpc_error (Custom(id,code,message)))
+let raise_invalid_params json = raise (JsonRpc_error (Invalid_params json))
+
+let handle_jsonrpc_error f output =
+	try f () with JsonRpc_error e ->
+		match e with
+		| Parse_error s -> output (error JNull (-32700) s)
+		| Invalid_request s -> output (error JNull (-32600) s)
+		| Method_not_found (id,meth) -> output (error id (-32601) (Printf.sprintf "Method `%s` not found" meth))
+		| Invalid_params id -> output (error id (-32602) "Invalid params")
+		| Custom (id,code,msg) -> output (error id code msg)
+
+let parse_request input =
+	let open Json.Reader in
+	let lexbuf = Sedlexing.Utf8.from_string input in
+	let json = try read_json lexbuf with Json_error s -> raise (JsonRpc_error (Parse_error s)) in
+	let fields = match json with JObject fl -> fl | _ -> raise (JsonRpc_error (Invalid_request "not an object")) in
+	let get_field name map =
+		let field = try List.find (fun (n,_) -> n = name) fields with Not_found -> raise (JsonRpc_error (Invalid_request ("no `" ^ name ^ "` field"))) in
+		let value = map (snd field) in
+		match value with
+		| None -> raise (JsonRpc_error (Invalid_request (Printf.sprintf "`%s` field has invalid data" name)))
+		| Some v -> v
+	in
+	let id = get_field "id" (fun v -> Some v) in
+	let meth = get_field "method" (function JString s -> Some s | _ -> None) in
+	let params =
+		try
+			let f = List.find (fun (n,_) -> n = "params") fields in
+			Some (snd f)
+		with Not_found ->
+			None
+	in
+	id,meth,params
+
+let process_request input handle output =
+	let id,meth,params = parse_request input in
+	let res = handle id meth params in
+	output id res
\ No newline at end of file
diff --git a/src/core/json/jsonRpcSocket.ml b/src/core/json/jsonRpcSocket.ml
new file mode 100644
index 0000000000000000000000000000000000000000..41a71a74a661fa0318e019feba819fbf1653f986
--- /dev/null
+++ b/src/core/json/jsonRpcSocket.ml
@@ -0,0 +1,7 @@
+open Json
+
+let send_json socket json =
+	Socket.send_string socket (string_of_json json)
+
+let send_event socket event data =
+	send_json socket (JsonRpc.notification event data)
\ No newline at end of file
diff --git a/src/core/json/jsonrpc_handler.ml b/src/core/json/jsonrpc_handler.ml
new file mode 100644
index 0000000000000000000000000000000000000000..a396f77b2945abe31257a694e9a2982392f48dfc
--- /dev/null
+++ b/src/core/json/jsonrpc_handler.ml
@@ -0,0 +1,86 @@
+open Json
+open JsonRpc
+
+type haxe_json_error =
+	| MissingField of string * string
+	| BadType of string * string
+
+class jsonrpc_handler (id,name,params) = object(self)
+	val id = id
+	val method_name : string = name
+	val params = match params with
+		| Some json -> json
+		| None -> JNull
+
+	method get_id = id
+	method get_method_name = method_name
+
+	method raise_haxe_json_error : 'a . haxe_json_error -> 'a = function
+		| MissingField(name,on) -> raise_custom id 1 (Printf.sprintf "Missing param \"%s\" on \"%s\"" name on)
+		| BadType(desc,expected) -> raise_custom id 2 (Printf.sprintf "Unexpected value for \"%s\", expected %s" desc expected)
+
+	method get_field desc fl name : Json.t =
+		try
+			List.assoc name fl
+		with Not_found ->
+			self#raise_haxe_json_error (MissingField(name,desc))
+
+	method get_string desc j = match j with
+		| JString s -> s
+		| _ -> self#raise_haxe_json_error (BadType(desc,"String"))
+
+	method get_int desc j = match j with
+		| JInt i -> i
+		| _ -> self#raise_haxe_json_error (BadType(desc,"String"))
+
+	method get_bool desc j = match j with
+		| JBool b -> b
+		| _ -> self#raise_haxe_json_error (BadType(desc,"Bool"))
+
+	method get_array desc j : Json.t list = match j with
+		| JArray a -> a
+		| _ -> self#raise_haxe_json_error (BadType(desc,"Array"))
+
+	method get_object desc j = match j with
+		| JObject o -> o
+		| _ -> self#raise_haxe_json_error (BadType(desc,"Object"))
+
+	method get_string_field desc name fl =
+		self#get_string desc (self#get_field desc fl name)
+
+	method get_int_field desc name fl =
+		self#get_int desc (self#get_field desc fl name)
+
+	method get_bool_field desc name fl =
+		self#get_bool desc (self#get_field desc fl name)
+
+	method get_array_field desc name fl =
+		self#get_array desc (self#get_field desc fl name)
+
+	method get_object_field desc name fl =
+		self#get_object desc (self#get_field desc fl name)
+
+	method private get_obj_params = match params with
+		| JObject fl -> fl
+		| _ -> invalid_arg "params"
+
+	method get_string_param name =
+		self#get_string_field "params" name (self#get_obj_params)
+
+	method get_int_param name =
+		self#get_int_field "params" name (self#get_obj_params)
+
+	method get_bool_param name =
+		self#get_bool_field "params" name (self#get_obj_params)
+
+	method get_array_param name =
+		self#get_array_field "params" name (self#get_obj_params)
+
+	method get_object_param name =
+		self#get_object_field "params" name (self#get_obj_params)
+
+	method get_opt_param : 'a . (unit -> 'a) -> 'a -> 'a = fun f def ->
+		try f() with JsonRpc_error _ -> def
+
+	method get_params = params
+end
\ No newline at end of file
diff --git a/src/core/meta.ml b/src/core/meta.ml
new file mode 100644
index 0000000000000000000000000000000000000000..6ea21382eefcdd4992b4d9a5649da256e448744f
--- /dev/null
+++ b/src/core/meta.ml
@@ -0,0 +1,77 @@
+open Globals
+include MetaList
+
+let has m ml = List.exists (fun (m2,_,_) -> m = m2) ml
+let has_one_of ml1 ml2 = List.exists (fun (m2,_,_) -> List.mem m2 ml1) ml2
+let get m ml = List.find (fun (m2,_,_) -> m = m2) ml
+
+let rec remove m = function
+	| [] -> []
+	| (m2,_,_) :: l when m = m2 -> l
+	| x :: l -> x :: remove m l
+
+let to_string m = fst (get_info m)
+
+let hmeta =
+	let h = Hashtbl.create 0 in
+	let rec loop i =
+		let m = Obj.magic i in
+		if m <> Last then begin
+			Hashtbl.add h (fst (get_info m)) m;
+			loop (i + 1);
+		end;
+	in
+	loop 0;
+	h
+
+let parse s = try Hashtbl.find hmeta (":" ^ s) with Not_found -> Custom (":" ^ s)
+
+let from_string s =
+	if s = "" then Custom "" else match s.[0] with
+	| ':' -> (try Hashtbl.find hmeta s with Not_found -> Custom s)
+	| '$' -> Dollar (String.sub s 1 (String.length s - 1))
+	| _ -> Custom s
+
+let get_documentation d =
+	let t, (doc,flags) = get_info d in
+	if not (List.mem UsedInternally flags) then begin
+		let params = ref [] and used = ref [] and pfs = ref [] in
+		List.iter (function
+			| HasParam s -> params := s :: !params
+			| Platforms fl -> pfs := fl @ !pfs
+			| UsedOn ul -> used := ul @ !used
+			| UsedInternally -> assert false
+			| Link _ -> ()
+		) flags;
+		let params = (match List.rev !params with
+			| [] -> ""
+			| l -> "(<" ^ String.concat ">, <" l ^ ">) "
+		) in
+		let pfs = platform_list_help (List.rev !pfs) in
+		let str = "@" ^ t in
+		Some (str,params ^ doc ^ pfs)
+	end else
+		None
+
+let get_documentation_list () =
+	let m = ref 0 in
+	let rec loop i =
+		let d = Obj.magic i in
+		if d <> Last then begin match get_documentation d with
+			| None -> loop (i + 1)
+			| Some (str,desc) ->
+				if String.length str > !m then m := String.length str;
+					(str,desc) :: loop (i + 1)
+		end else
+			[]
+	in
+	let all = List.sort (fun (s1,_) (s2,_) -> String.compare s1 s2) (loop 0) in
+	all,!m
+
+let get_all () =
+	let rec loop i =
+		let d = Obj.magic i in
+		if d <> Last then d :: loop (i + 1)
+		else []
+	in
+	loop 0
diff --git a/src/core/numeric.ml b/src/core/numeric.ml
new file mode 100644
index 0000000000000000000000000000000000000000..1fbd80df9aa6ecc474bfa4754cc680aab4d2daeb
--- /dev/null
+++ b/src/core/numeric.ml
@@ -0,0 +1,74 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+(*  Taken from OCaml source typing/oprint.ml
+
+	This is a better version of string_of_float which prints without loss of precision
+	so that float_of_string (float_repres x) = x for all floats x
+*)
+let valid_float_lexeme s =
+	let l = String.length s in
+	let rec loop i =
+		if i >= l then s ^ "." else
+		match s.[i] with
+		| '0' .. '9' | '-' -> loop (i+1)
+		| _ -> s
+	in loop 0
+
+let float_repres f =
+	match classify_float f with
+	| FP_nan -> "nan"
+	| FP_infinite ->
+		if f < 0.0 then "neg_infinity" else "infinity"
+	| _ ->
+		let float_val =
+			let s1 = Printf.sprintf "%.12g" f in
+			if f = float_of_string s1 then s1 else
+			let s2 = Printf.sprintf "%.15g" f in
+			if f = float_of_string s2 then s2 else
+			Printf.sprintf "%.18g" f
+		in valid_float_lexeme float_val
+
+let parse_float s =
+	let rec loop sp i =
+		if i = String.length s then (if sp = 0 then s else String.sub s sp (i - sp)) else
+		match String.unsafe_get s i with
+		| ' ' when sp = i -> loop (sp + 1) (i + 1)
+		| '0'..'9' | '-' | '+' | 'e' | 'E' | '.' -> loop sp (i + 1)
+		| _ -> String.sub s sp (i - sp)
+	in
+	float_of_string (loop 0 0)
+
+let parse_int s =
+	let rec loop_hex i =
+		if i = String.length s then s else
+		match String.unsafe_get s i with
+		| '0'..'9' | 'a'..'f' | 'A'..'F' -> loop_hex (i + 1)
+		| _ -> String.sub s 0 i
+	in
+	let rec loop sp i =
+		if i = String.length s then (if sp = 0 then s else String.sub s sp (i - sp)) else
+		match String.unsafe_get s i with
+		| '0'..'9' -> loop sp (i + 1)
+		| ' ' when sp = i -> loop (sp + 1) (i + 1)
+		| '-' when i = 0 -> loop sp (i + 1)
+		| ('x' | 'X') when i = 1 && String.get s 0 = '0' -> loop_hex (i + 1)
+		| _ -> String.sub s sp (i - sp)
+	in
+	Int32.of_string (loop 0 0)
\ No newline at end of file
diff --git a/src/core/path.ml b/src/core/path.ml
new file mode 100644
index 0000000000000000000000000000000000000000..7c5e3ddbe3c168471668ea1d291e948de53aaf27
--- /dev/null
+++ b/src/core/path.ml
@@ -0,0 +1,260 @@
+open StringHelper
+
+let get_path_parts f =
+	(*
+		this function is quite weird: it tries to determine whether the given
+		argument is a .hx file path with slashes or a dotted module path and
+		based on that it returns path "parts", which are basically a list of
+		either folders or packages (which are folders too) appended by the module name
+
+		TODO: i started doubting my sanity while writing this comment, let's somehow
+		refactor this stuff so it doesn't mix up file and module paths and doesn't introduce
+		the weird "path part" entity.
+	*)
+	let l = String.length f in
+	if l > 3 && (String.sub f (l-3) 3) = ".hx" then
+		let f = String.sub f 0 (l-3) in (* strip the .hx *)
+		ExtString.String.nsplit (String.concat "/" (ExtString.String.nsplit f "\\")) "/" (* TODO: wouldn't it be faster to Str.split here? *)
+	else
+		ExtString.String.nsplit f "."
+
+let check_invalid_char x =
+	for i = 1 to String.length x - 1 do
+		match x.[i] with
+		| 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '.' -> ()
+		| c -> failwith ("Invalid character: " ^ (StringHelper.s_escape (String.make 1 c)))
+	done
+
+let check_package_name x =
+	if String.length x = 0 then
+		failwith "Package name must not be empty"
+	else if (x.[0] < 'a' || x.[0] > 'z') && x.[0] <> '_' then
+		failwith "Package name must start with a lowercase letter";
+	check_invalid_char x
+
+let parse_path f =
+	let cl = get_path_parts f in
+	let error msg =
+		let msg = "Could not process argument " ^ f ^ "\n" ^ msg in
+		failwith msg
+	in
+	let rec loop = function
+		| [] ->
+			error "Package name must not be empty"
+		| [x] ->
+			check_invalid_char x;
+			[],x
+		| x :: l ->
+			check_package_name x;
+			let path,name = loop l in
+			x :: path,name
+	in
+	try
+		loop cl
+	with Failure msg ->
+		error msg
+
+let parse_type_path s =
+	let pack,name = parse_path s in
+	check_uppercase name;
+	pack,name
+
+let path_regex = Str.regexp "[/\\]+"
+let normalize_path path =
+	let rec normalize acc m =
+		match m with
+		| [] ->
+			List.rev acc
+		| Str.Text "." :: Str.Delim _ :: tl when acc = [] ->
+			normalize [] tl
+		| Str.Text ".." :: Str.Delim _ :: tl ->
+			(match acc with
+			| [] -> raise Exit
+			| _ :: acc -> normalize acc tl)
+		| Str.Text t :: Str.Delim _ :: tl ->
+			normalize (t :: acc) tl
+		| Str.Delim _ :: tl ->
+			normalize ("" :: acc) tl
+		| Str.Text t :: [] ->
+			List.rev (t :: acc)
+		| Str.Text _ :: Str.Text  _ :: _ ->
+			assert false
+	in
+	String.concat "/" (normalize [] (Str.full_split path_regex path))
+
+let path_sep = if Globals.is_windows then "\\" else "/"
+
+(** Returns absolute path. Doesn't fix path case on Windows. *)
+let get_full_path f = try Extc.get_full_path f with _ -> f
+
+(** Returns absolute path (on Windows ensures proper case with drive letter upper-cased)
+    Use for returning positions from IDE support functions *)
+let get_real_path =
+	if Globals.is_windows then
+		(fun p -> try Extc.get_real_path p with _ -> p)
+	else
+		get_full_path
+
+(** Returns absolute path guaranteed to be the same for different letter case.
+    Use where equality comparison is required, lowercases the path on Windows *)
+let unique_full_path =
+	if Globals.is_windows then
+		(fun f -> String.lowercase (get_full_path f))
+	else
+		get_full_path
+
+let add_trailing_slash p =
+	let l = String.length p in
+	if l = 0 then
+		"./"
+	else match p.[l-1] with
+		| '\\' | '/' -> p
+		| _ -> p ^ "/"
+
+let rec remove_trailing_slash p =
+	let l = String.length p in
+	if l = 0 then
+		"./"
+	else match p.[l-1] with
+		| '\\' | '/' -> remove_trailing_slash (String.sub p 0 (l - 1))
+		| _ -> p
+
+let flat_path (p,s) =
+	(* Replace _ with _$ in paths to prevent name collisions. *)
+	let escape str = String.concat "_$" (ExtString.String.nsplit str "_") in
+
+	match p with
+	| [] -> escape s
+	| _ -> String.concat "_" (List.map escape p) ^ "_" ^ (escape s)
+
+open Globals
+
+let find_directories target recursive paths =
+	let target_dirs = List.map platform_name platforms in
+	let rec loop acc dir =
+		try
+			let entries = Sys.readdir dir in
+			Array.fold_left (fun acc file ->
+				match file with
+					| "." | ".." ->
+						acc
+					| _ when Sys.is_directory (dir ^ file) && file.[0] >= 'a' && file.[0] <= 'z' ->
+						if List.mem file target_dirs && file <> target then
+							acc
+						else begin
+							let full = (dir ^ file) in
+							if recursive then loop (full :: acc) (full ^ "/")
+							else full :: acc
+						end
+					| _ ->
+						acc
+			) acc entries;
+		with Sys_error _ ->
+			acc
+	in
+	List.fold_left (fun acc dir -> loop acc dir) [] paths
+
+let make_valid_filename s =
+	let r = Str.regexp "[^A-Za-z0-9_\\-\\.,]" in
+	Str.global_substitute r (fun s -> "_") s
+
+let module_name_of_file file =
+	match List.rev (Str.split path_regex (get_real_path file)) with
+	| s :: _ ->
+		let s = match List.rev (ExtString.String.nsplit s ".") with
+		| [s] -> s
+		| _ :: sl -> String.concat "." (List.rev sl)
+		| [] -> ""
+		in
+		s
+	| [] ->
+		assert false
+
+let rec create_file bin ext acc = function
+	| [] -> assert false
+	| d :: [] ->
+		let d = make_valid_filename d in
+		let maxlen = 200 - String.length ext in
+		let d = if String.length d > maxlen then String.sub d 0 maxlen else d in
+		let ch = (if bin then open_out_bin else open_out) (String.concat "/" (List.rev (d :: acc)) ^ ext) in
+		ch
+	| d :: l ->
+		let dir = String.concat "/" (List.rev (d :: acc)) in
+		if not (Sys.file_exists (remove_trailing_slash dir)) then Unix.mkdir dir 0o755;
+		create_file bin ext (d :: acc) l
+
+let rec mkdir_recursive base dir_list =
+	match dir_list with
+	| [] -> ()
+	| dir :: remaining ->
+		let path = match base with
+				   | "" ->  dir
+				   | "/" -> "/" ^ dir
+				   | _ -> base ^ "/" ^ dir
+		in
+		let path_len = String.length path in
+		let path =
+			if path_len > 0 && (path.[path_len - 1] = '/' || path.[path_len - 1] == '\\') then
+				String.sub path 0 (path_len - 1)
+			else
+				path
+		in
+		if not ( (path = "") || ( (path_len = 2) && ((String.sub path 1 1) = ":") ) ) then
+			if not (Sys.file_exists path) then
+				Unix.mkdir path 0o755;
+		mkdir_recursive (if (path = "") then "/" else path) remaining
+
+let mkdir_from_path path =
+	let parts = Str.split_delim (Str.regexp "[\\/]+") path in
+	match parts with
+		| [] -> (* path was "" *) ()
+		| _ ->
+			let dir_list = List.rev (List.tl (List.rev parts)) in
+			mkdir_recursive "" dir_list
+
+let full_dot_path pack mname tname =
+	if tname = mname then (pack,mname) else (pack @ [mname],tname)
+
+module FilePath = struct
+	type t = {
+		directory : string option;
+		file_name : string option;
+		extension : string option;
+		backslash : bool;
+	}
+
+	let create directory file_name extension backslash = {
+		directory = directory;
+		file_name = file_name;
+		extension = extension;
+		backslash = backslash;
+	}
+
+	let parse path = match path with
+		| "." | ".." ->
+			create (Some path) None None false
+		| _ ->
+			let c1 = String.rindex path '/' in
+			let c2 = String.rindex path '\\' in
+			let split s at = String.sub s 0 at,String.sub s (at + 1) (String.length s - at - 1) in
+			let dir,path,backslash = if c1 < c2 then begin
+				let dir,path = split path c2 in
+				Some dir,path,true
+			end else if c2 < c1 then begin
+				let dir,path = split path c1 in
+				Some dir,path,false
+			end else
+				None,path,false
+			in
+			let file,ext = if String.length path = 0 then
+				None,None
+			else begin
+				let cp = String.rindex path '.' in
+				if cp <> -1 then begin
+					let file,ext = split path cp in
+					Some file,Some ext
+				end else
+					Some path,None
+			end in
+			create dir file ext backslash
+end
\ No newline at end of file
diff --git a/src/core/socket.ml b/src/core/socket.ml
new file mode 100644
index 0000000000000000000000000000000000000000..58888134db84480d5f0e8d906ed0e91e80cdcd92
--- /dev/null
+++ b/src/core/socket.ml
@@ -0,0 +1,63 @@
+open Unix
+
+type t = {
+	addr : Unix.inet_addr;
+	port : int;
+	mutable socket : Unix.file_descr option;
+	send_mutex : Mutex.t;
+}
+
+let create host port =
+	let host = Unix.inet_addr_of_string host in
+	let socket = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
+	Unix.connect socket (Unix.ADDR_INET (host,port));
+	{
+		addr = host;
+		port = port;
+		socket = Some socket;
+		send_mutex = Mutex.create();
+	}
+
+let read_byte this i = int_of_char (Bytes.get this i)
+
+let read_ui16 this i =
+	let ch1 = read_byte this i in
+	let ch2 = read_byte this (i + 1) in
+	ch1 lor (ch2 lsl 8)
+
+let read_string socket =
+	match socket.socket with
+		| None ->
+			failwith "no socket" (* TODO: reconnect? *)
+		| Some socket ->
+			let buf = Bytes.create 2 in
+			let _ = recv socket buf 0 2 [] in
+			let i = read_ui16 buf 0 in
+			let buf = Bytes.create i in
+			let _ = recv socket buf 0 i [] in
+			Bytes.to_string buf
+
+let send_string socket s =
+	match socket.socket with
+	| None ->
+		failwith "no socket" (* TODO: reconnect? *)
+	| Some socket ->
+		let b = Bytes.unsafe_of_string s in
+		let l = Bytes.length b in
+		let buf = Bytes.make 4 ' ' in
+		EvalBytes.write_i32 buf 0 (Int32.of_int l);
+		ignore(send socket buf 0 4 []);
+		let rec loop length offset =
+			if length <= 0 then
+				()
+			else begin
+				let k = min length 0xFFFF in
+				ignore(send socket b offset k []);
+				loop (length - k) (offset + k)
+			end
+		in
+		loop l 0
+
+let send_string socket s =
+	Mutex.lock socket.send_mutex;
+	Std.finally (fun () -> Mutex.unlock socket.send_mutex) (send_string socket) s
\ No newline at end of file
diff --git a/src/core/stringError.ml b/src/core/stringError.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b16e43cba17dc5285fa2deafd06a48bbc0accc43
--- /dev/null
+++ b/src/core/stringError.ml
@@ -0,0 +1,73 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+(* Source: http://en.wikibooks.org/wiki/Algorithm_implementation/Strings/Levenshtein_distance#OCaml *)
+let levenshtein a b =
+	let x = Array.init (String.length a) (fun i -> a.[i]) in
+	let y = Array.init (String.length b) (fun i -> b.[i]) in
+	let minimum (x:int) y z =
+		let m' (a:int) b = if a < b then a else b in
+		m' (m' x y) z
+	in
+	let init_matrix n m =
+		let init_col = Array.init m in
+			Array.init n (function
+			| 0 -> init_col (function j -> j)
+			| i -> init_col (function 0 -> i | _ -> 0)
+		)
+	in
+	match Array.length x, Array.length y with
+		| 0, n -> n
+		| m, 0 -> m
+		| m, n ->
+			let matrix = init_matrix (m + 1) (n + 1) in
+			for i = 1 to m do
+				let s = matrix.(i) and t = matrix.(i - 1) in
+				for j = 1 to n do
+					let cost = abs (compare x.(i - 1) y.(j - 1)) in
+					s.(j) <- minimum (t.(j) + 1) (s.(j - 1) + 1) (t.(j - 1) + cost)
+				done
+			done;
+			matrix.(m).(n)
+
+let filter_similar f cl =
+	let rec loop sl = match sl with
+		| (x,i) :: sl when f x i -> x :: loop sl
+		| _ -> []
+	in
+	loop cl
+
+let get_similar s sl =
+	if sl = [] then [] else
+	let cl = List.map (fun s2 -> s2,levenshtein s s2) sl in
+	let cl = List.sort (fun (_,c1) (_,c2) -> compare c1 c2) cl in
+	let cl = filter_similar (fun s2 i -> i <= (min (String.length s) (String.length s2)) / 3) cl in
+	cl
+
+let string_error_raise s sl msg =
+	if sl = [] then msg else
+	let cl = get_similar s sl in
+	match cl with
+		| [] -> raise Not_found
+		| [s] -> Printf.sprintf "%s (Suggestion: %s)" msg s
+		| sl -> Printf.sprintf "%s (Suggestions: %s)" msg (String.concat ", " sl)
+
+let string_error s sl msg =
+	try string_error_raise s sl msg
+	with Not_found -> msg
\ No newline at end of file
diff --git a/src/core/stringHelper.ml b/src/core/stringHelper.ml
new file mode 100644
index 0000000000000000000000000000000000000000..7890d5991402fe9bc23a8a59272fd5d877202610
--- /dev/null
+++ b/src/core/stringHelper.ml
@@ -0,0 +1,51 @@
+let uppercase s =
+	let bytes = Bytes.of_string s in
+	Bytes.iteri
+		(fun idx char ->
+			let code = Char.code char in
+			if 97 <= code && code <= 122 then
+				Bytes.set bytes idx (Char.chr (code - 32))
+		)
+		bytes;
+	Bytes.to_string bytes
+
+let capitalize s =
+	if String.length s = 0 then ""
+	else
+		let bytes = Bytes.of_string s in
+		let code = Char.code (Bytes.get bytes 0) in
+		if 97 <= code && code <= 122 then
+			Bytes.set bytes 0 (Char.chr (code - 32));
+		Bytes.to_string bytes
+
+let starts_uppercase_identifier x =
+	if String.length x = 0 then
+		raise (Invalid_argument "Identifier name must not be empty")
+	else
+		let rec loop p =
+			match String.unsafe_get x p with
+			| 'A'..'Z' -> true
+			| '_' -> p + 1 < String.length x && loop (p + 1)
+			| _ -> false
+		in
+		loop 0
+
+let check_uppercase x =
+	if String.length x = 0 then
+		failwith "empty part"
+	else if not (starts_uppercase_identifier x) then
+		failwith "Class name must start with an uppercase letter"
+
+let s_escape ?(hex=true) s =
+	let b = Buffer.create (String.length s) in
+	for i = 0 to (String.length s) - 1 do
+		match s.[i] with
+		| '\n' -> Buffer.add_string b "\\n"
+		| '\t' -> Buffer.add_string b "\\t"
+		| '\r' -> Buffer.add_string b "\\r"
+		| '"' -> Buffer.add_string b "\\\""
+		| '\\' -> Buffer.add_string b "\\\\"
+		| c when int_of_char c < 32 && hex -> Buffer.add_string b (Printf.sprintf "\\x%.2X" (int_of_char c))
+		| c -> Buffer.add_char b c
+	done;
+	Buffer.contents b
\ No newline at end of file
diff --git a/src/core/texpr.ml b/src/core/texpr.ml
new file mode 100644
index 0000000000000000000000000000000000000000..200a1ea3a790ed7f1ad8aba1e4593e809b4f54be
--- /dev/null
+++ b/src/core/texpr.ml
@@ -0,0 +1,558 @@
+open Globals
+open Ast
+open Type
+open Error
+
+let equal_fa fa1 fa2 = match fa1,fa2 with
+	| FStatic(c1,cf1),FStatic(c2,cf2) -> c1 == c2 && cf1.cf_name == cf2.cf_name
+	| FInstance(c1,tl1,cf1),FInstance(c2,tl2,cf2) -> c1 == c2 && safe_for_all2 type_iseq tl1 tl2 && cf1.cf_name == cf2.cf_name
+	| FAnon cf1,FAnon cf2 -> cf1.cf_name = cf2.cf_name
+	| FDynamic s1,FDynamic s2 -> s1 = s2
+	| FClosure(None,cf1),FClosure(None,cf2) -> cf1.cf_name == cf2.cf_name
+	| FClosure(Some(c1,tl1),cf1),FClosure(Some(c2,tl2),cf2) -> c1 == c2 && safe_for_all2 type_iseq tl1 tl2 && cf1.cf_name == cf2.cf_name
+	| FEnum(en1,ef1),FEnum(en2,ef2) -> en1 == en2 && ef1.ef_name == ef2.ef_name
+	| _ -> false
+
+let rec equal e1 e2 = match e1.eexpr,e2.eexpr with
+	| TConst ct1,TConst ct2 -> ct1 = ct2
+	| TLocal v1,TLocal v2 -> v1 == v2
+	| TArray(eb1,ei1),TArray(eb2,ei2) -> equal eb1 eb2 && equal ei1 ei2
+	| TBinop(op1,lhs1,rhs1),TBinop(op2,lhs2,rhs2) -> op1 = op2 && equal lhs1 lhs2 && equal rhs1 rhs2
+	| TField(e1,fa1),TField(e2,fa2) -> equal e1 e2 && equal_fa fa1 fa2
+	| TTypeExpr (TClassDecl c1),TTypeExpr (TClassDecl c2) -> c1 == c2
+	| TTypeExpr (TEnumDecl e1),TTypeExpr (TEnumDecl e2) -> e1 == e2
+	| TTypeExpr (TTypeDecl t1),TTypeExpr (TTypeDecl t2) -> t1 == t2
+	| TTypeExpr (TAbstractDecl a1),TTypeExpr (TAbstractDecl a2) -> a1 == a2
+	| TTypeExpr _,TTypeExpr _ -> false
+	| TParenthesis e1,TParenthesis e2 -> equal e1 e2
+	| TObjectDecl fl1,TObjectDecl fl2 -> safe_for_all2 (fun (s1,e1) (s2,e2) -> s1 = s2 && equal e1 e2) fl1 fl2
+	| (TArrayDecl el1,TArrayDecl el2) | (TBlock el1,TBlock el2) -> safe_for_all2 equal el1 el2
+	| TCall(e1,el1),TCall(e2,el2) -> equal e1 e2 && safe_for_all2 equal el1 el2
+	| TNew(c1,tl1,el1),TNew(c2,tl2,el2) -> c1 == c2 && safe_for_all2 type_iseq tl1 tl2 && safe_for_all2 equal el1 el2
+	| TUnop(op1,flag1,e1),TUnop(op2,flag2,e2) -> op1 = op2 && flag1 = flag2 && equal e1 e2
+	| TFunction tf1,TFunction tf2 -> tf1 == tf2
+	| TVar(v1,None),TVar(v2,None) -> v1 == v2
+	| TVar(v1,Some e1),TVar(v2,Some e2) -> v1 == v2 && equal e1 e2
+	| TFor(v1,ec1,eb1),TFor(v2,ec2,eb2) -> v1 == v2 && equal ec1 ec2 && equal eb1 eb2
+	| TIf(e1,ethen1,None),TIf(e2,ethen2,None) -> equal e1 e2 && equal ethen1 ethen2
+	| TIf(e1,ethen1,Some eelse1),TIf(e2,ethen2,Some eelse2) -> equal e1 e2 && equal ethen1 ethen2 && equal eelse1 eelse2
+	| TWhile(e1,eb1,flag1),TWhile(e2,eb2,flag2) -> equal e1 e2 && equal eb2 eb2 && flag1 = flag2
+	| TSwitch(e1,cases1,eo1),TSwitch(e2,cases2,eo2) ->
+		equal e1 e2 &&
+		safe_for_all2 (fun (el1,e1) (el2,e2) -> safe_for_all2 equal el1 el2 && equal e1 e2) cases1 cases2 &&
+		(match eo1,eo2 with None,None -> true | Some e1,Some e2 -> equal e1 e2 | _ -> false)
+	| TTry(e1,catches1),TTry(e2,catches2) -> equal e1 e2 && safe_for_all2 (fun (v1,e1) (v2,e2) -> v1 == v2 && equal e1 e2) catches1 catches2
+	| TReturn None,TReturn None -> true
+	| TReturn(Some e1),TReturn(Some e2) -> equal e1 e2
+	| TThrow e1,TThrow e2 -> equal e1 e2
+	| TCast(e1,None),TCast(e2,None) -> equal e1 e2
+	| TCast(e1,Some mt1),TCast(e2,Some mt2) -> equal e1 e2 && mt1 == mt2
+	| TMeta((m1,el1,_),e1),TMeta((m2,el2,_),e2) -> m1 = m2 && safe_for_all2 (fun e1 e2 -> (* TODO: cheating? *) (Ast.Printer.s_expr e1) = (Ast.Printer.s_expr e2)) el1 el2 && equal e1 e2
+	| (TBreak,TBreak) | (TContinue,TContinue) -> true
+	| TEnumParameter(e1,ef1,i1),TEnumParameter(e2,ef2,i2) -> equal e1 e2 && ef1 == ef2 && i1 = i2
+	| _ -> false
+
+let duplicate_tvars e =
+	let vars = Hashtbl.create 0 in
+	let copy_var v =
+		let v2 = alloc_var v.v_kind v.v_name v.v_type v.v_pos in
+		v2.v_meta <- v.v_meta;
+		v2.v_extra <- v.v_extra;
+		Hashtbl.add vars v.v_id v2;
+		v2;
+	in
+	let rec build_expr e =
+		match e.eexpr with
+		| TVar (v,eo) ->
+			let v2 = copy_var v in
+			{e with eexpr = TVar(v2, Option.map build_expr eo)}
+		| TFor (v,e1,e2) ->
+			let v2 = copy_var v in
+			{e with eexpr = TFor(v2, build_expr e1, build_expr e2)}
+		| TTry (e1,cl) ->
+			let cl = List.map (fun (v,e) ->
+				let v2 = copy_var v in
+				v2, build_expr e
+			) cl in
+			{e with eexpr = TTry(build_expr e1, cl)}
+		| TFunction f ->
+			let args = List.map (fun (v,c) -> copy_var v, c) f.tf_args in
+			let f = {
+				tf_args = args;
+				tf_type = f.tf_type;
+				tf_expr = build_expr f.tf_expr;
+			} in
+			{e with eexpr = TFunction f}
+		| TLocal v ->
+			(try
+				let v2 = Hashtbl.find vars v.v_id in
+				{e with eexpr = TLocal v2}
+			with _ ->
+				e)
+		| _ ->
+			map_expr build_expr e
+	in
+	build_expr e
+
+let rec skip e = match e.eexpr with
+	| TParenthesis e1 | TMeta(_,e1) | TBlock [e1] | TCast(e1,None) -> skip e1
+	| _ -> e
+
+let foldmap_list f acc el =
+	let rec loop acc el acc2 = (match el with
+		| [] -> acc,(List.rev acc2)
+		| e1 :: el ->
+			let acc,e1 = f acc e1 in
+			loop acc el (e1 :: acc2))
+	in loop acc el []
+
+let foldmap_opt f acc eo = match eo with
+	| Some(e) -> let acc,e = f acc e in acc,Some(e)
+	| None    -> acc,eo
+
+let foldmap_pairs f acc pairs =
+	let acc,pairs = List.fold_left
+		(fun (acc,el) (v,e) -> let acc,e = f acc e in (acc,(v,e) :: el))
+		(acc,[])
+		pairs
+	in acc,(List.rev pairs)
+
+let foldmap f acc e =
+	begin match e.eexpr with
+	| TConst _
+	| TLocal _
+	| TBreak
+	| TContinue
+	| TTypeExpr _
+	| TIdent _ ->
+		acc,e
+	| TArray (e1,e2) ->
+		let acc,e1 = f acc e1 in
+		let acc,e2 = f acc e2 in
+		acc,{ e with eexpr = TArray (e1, e2) }
+	| TBinop (op,e1,e2) ->
+		let acc,e1 = f acc e1 in
+		let acc,e2 = f acc e2 in
+		acc,{ e with eexpr = TBinop (op,e1,e2) }
+	| TFor (v,e1,e2) ->
+		let acc,e1 = f acc e1 in
+		let acc,e2 = f acc e2 in
+		acc,{ e with eexpr = TFor (v,e1,e2) }
+	| TWhile (e1,e2,flag) ->
+		let acc,e1 = f acc e1 in
+		let acc,e2 = f acc e2 in
+		acc,{ e with eexpr = TWhile (e1,e2,flag) }
+	| TThrow e1 ->
+		let acc,e1 = f acc e1 in
+		acc,{ e with eexpr = TThrow (e1) }
+	| TEnumParameter (e1,ef,i) ->
+		let acc,e1 = f acc e1 in
+		acc,{ e with eexpr = TEnumParameter(e1,ef,i) }
+	| TEnumIndex e1 ->
+		let acc,e1 = f acc e1 in
+		acc,{ e with eexpr = TEnumIndex e1 }
+	| TField (e1,v) ->
+		let acc,e1 = f acc e1 in
+		acc,{ e with eexpr = TField (e1,v) }
+	| TParenthesis e1 ->
+		let acc,e1 = f acc e1 in
+		acc,{ e with eexpr = TParenthesis (e1) }
+	| TUnop (op,pre,e1) ->
+		let acc,e1 = f acc e1 in
+		acc,{ e with eexpr = TUnop (op,pre,e1) }
+	| TArrayDecl el ->
+		let acc,el = foldmap_list f acc el in
+		acc,{ e with eexpr = TArrayDecl el }
+	| TNew (t,pl,el) ->
+		let acc,el = foldmap_list f acc el in
+		acc,{ e with eexpr = TNew (t,pl,el) }
+	| TBlock el ->
+		let acc,el = foldmap_list f acc el in
+		acc,{ e with eexpr = TBlock (el) }
+	| TObjectDecl el ->
+		let acc,el = foldmap_pairs f acc el in
+		acc,{ e with eexpr = TObjectDecl el }
+	| TCall (e1,el) ->
+		let acc,e1 = f acc e1 in
+		let acc,el = foldmap_list f acc el in
+		acc,{ e with eexpr = TCall (e1,el) }
+	| TVar (v,eo) ->
+		let acc,eo = foldmap_opt f acc eo in
+		acc,{ e with eexpr = TVar (v, eo) }
+	| TFunction fu ->
+		let acc,e1 = f acc fu.tf_expr in
+		acc,{ e with eexpr = TFunction { fu with tf_expr = e1 } }
+	| TIf (ec,e1,eo) ->
+		let acc,ec = f acc ec in
+		let acc,e1 = f acc e1 in
+		let acc,eo = foldmap_opt f acc eo in
+		acc,{ e with eexpr = TIf (ec,e1,eo)}
+	| TSwitch (e1,cases,def) ->
+		let acc,e1 = f acc e1 in
+		let acc,cases = List.fold_left (fun (acc,cases) (el,e2) ->
+			let acc,el = foldmap_list f acc el in
+			let acc,e2 = f acc e2 in
+			acc,((el,e2) :: cases)
+		) (acc,[]) cases in
+		let acc,def = foldmap_opt f acc def in
+		acc,{ e with eexpr = TSwitch (e1, cases, def) }
+	| TTry (e1,catches) ->
+		let acc,e1 = f acc e1 in
+		let acc,catches = foldmap_pairs f acc catches in
+		acc,{ e with eexpr = TTry (e1, catches) }
+	| TReturn eo ->
+		let acc,eo = foldmap_opt f acc eo in
+		acc,{ e with eexpr = TReturn eo }
+	| TCast (e1,t) ->
+		let acc,e1 = f acc e1 in
+		acc,{ e with eexpr = TCast (e1,t) }
+	| TMeta (m,e1) ->
+		let acc,e1 = f acc e1 in
+		acc,{ e with eexpr = TMeta(m,e1)}
+	end
+
+(* Collection of functions that return expressions *)
+module Builder = struct
+	let make_static_this c p =
+		let ta = TAnon { a_fields = c.cl_statics; a_status = ref (Statics c) } in
+		mk (TTypeExpr (TClassDecl c)) ta p
+
+	let make_typeexpr mt pos =
+		let t =
+			match resolve_typedef mt with
+			| TClassDecl c -> TAnon { a_fields = c.cl_statics; a_status = ref (Statics c) }
+			| TEnumDecl e -> TAnon { a_fields = PMap.empty; a_status = ref (EnumStatics e) }
+			| TAbstractDecl a -> TAnon { a_fields = PMap.empty; a_status = ref (AbstractStatics a) }
+			| _ -> assert false
+		in
+		mk (TTypeExpr mt) t pos
+
+	let make_static_field c cf p =
+		let e_this = make_static_this c p in
+		mk (TField(e_this,FStatic(c,cf))) cf.cf_type p
+
+	let make_throw e p =
+		mk (TThrow e) t_dynamic p
+
+	let make_int basic i p =
+		mk (TConst (TInt (Int32.of_int i))) basic.tint p
+
+	let make_float basic f p =
+		mk (TConst (TFloat f)) basic.tfloat p
+
+	let make_bool basic b p =
+		mk (TConst(TBool b)) basic.tbool p
+
+	let make_string basic s p =
+		mk (TConst (TString s)) basic.tstring p
+
+	let make_null t p =
+		mk (TConst TNull) t p
+
+	let make_local v p =
+		mk (TLocal v) v.v_type p
+
+	let make_const_texpr basic ct p = match ct with
+		| TString s -> mk (TConst (TString s)) basic.tstring p
+		| TInt i -> mk (TConst (TInt i)) basic.tint p
+		| TFloat f -> mk (TConst (TFloat f)) basic.tfloat p
+		| TBool b -> mk (TConst (TBool b)) basic.tbool p
+		| TNull -> mk (TConst TNull) (basic.tnull (mk_mono())) p
+		| _ -> error "Unsupported constant" p
+
+	let field e name t p =
+		mk (TField (e,try quick_field e.etype name with Not_found -> assert false)) t p
+
+	let fcall e name el ret p =
+		let ft = tfun (List.map (fun e -> e.etype) el) ret in
+		mk (TCall (field e name ft p,el)) ret p
+
+	let mk_parent e =
+		mk (TParenthesis e) e.etype e.epos
+
+	let mk_return e =
+		mk (TReturn (Some e)) t_dynamic e.epos
+
+	let binop op a b t p =
+		mk (TBinop (op,a,b)) t p
+
+	let index basic e index t p =
+		mk (TArray (e,mk (TConst (TInt (Int32.of_int index))) basic.tint p)) t p
+end
+
+let set_default basic a c p =
+	let t = a.v_type in
+	let ve = mk (TLocal a) t p in
+	let cond =  TBinop (OpEq,ve,mk (TConst TNull) t p) in
+	mk (TIf (Builder.mk_parent (mk cond basic.tbool p), mk (TBinop (OpAssign,ve,c)) t p,None)) basic.tvoid p
+
+(*
+	Tells if the constructor might be called without any issue whatever its parameters
+*)
+let rec constructor_side_effects e =
+	match e.eexpr with
+	| TBinop (op,_,_) when op <> OpAssign ->
+		true
+	| TField (_,FEnum _) ->
+		false
+	| TUnop _ | TArray _ | TField _ | TEnumParameter _ | TEnumIndex _ | TCall _ | TNew _ | TFor _ | TWhile _ | TSwitch _ | TReturn _ | TThrow _ ->
+		true
+	| TBinop _ | TTry _ | TIf _ | TBlock _ | TVar _
+	| TFunction _ | TArrayDecl _ | TObjectDecl _
+	| TParenthesis _ | TTypeExpr _ | TLocal _ | TMeta _
+	| TConst _ | TContinue | TBreak | TCast _ | TIdent _ ->
+		try
+			Type.iter (fun e -> if constructor_side_effects e then raise Exit) e;
+			false;
+		with Exit ->
+			true
+
+let type_constant basic c p =
+	match c with
+	| Int s ->
+		if String.length s > 10 && String.sub s 0 2 = "0x" then error "Invalid hexadecimal integer" p;
+		(try mk (TConst (TInt (Int32.of_string s))) basic.tint p
+		with _ -> mk (TConst (TFloat s)) basic.tfloat p)
+	| Float f -> mk (TConst (TFloat f)) basic.tfloat p
+	| String(s,qs) -> mk (TConst (TString s)) basic.tstring p (* STRINGTODO: qs? *)
+	| Ident "true" -> mk (TConst (TBool true)) basic.tbool p
+	| Ident "false" -> mk (TConst (TBool false)) basic.tbool p
+	| Ident "null" -> mk (TConst TNull) (basic.tnull (mk_mono())) p
+	| Ident t -> error ("Invalid constant :  " ^ t) p
+	| Regexp _ -> error "Invalid constant" p
+
+let rec type_constant_value basic (e,p) =
+	match e with
+	| EConst c ->
+		type_constant basic c p
+	| EParenthesis e ->
+		type_constant_value basic e
+	| EObjectDecl el ->
+		mk (TObjectDecl (List.map (fun (k,e) -> k,type_constant_value basic e) el)) (TAnon { a_fields = PMap.empty; a_status = ref Closed }) p
+	| EArrayDecl el ->
+		mk (TArrayDecl (List.map (type_constant_value basic) el)) (basic.tarray t_dynamic) p
+	| _ ->
+		error "Constant value expected" p
+
+let for_remap basic v e1 e2 p =
+	let v' = alloc_var v.v_kind v.v_name e1.etype e1.epos in
+	let ev' = mk (TLocal v') e1.etype e1.epos in
+	let t1 = (Abstract.follow_with_abstracts e1.etype) in
+	let ehasnext = mk (TField(ev',try quick_field t1 "hasNext" with Not_found -> error (s_type (print_context()) t1 ^ "has no field hasNext()") p)) (tfun [] basic.tbool) e1.epos in
+	let ehasnext = mk (TCall(ehasnext,[])) basic.tbool ehasnext.epos in
+	let enext = mk (TField(ev',quick_field t1 "next")) (tfun [] v.v_type) e1.epos in
+	let enext = mk (TCall(enext,[])) v.v_type e1.epos in
+	let eassign = mk (TVar(v,Some enext)) basic.tvoid p in
+	let ebody = Type.concat eassign e2 in
+	mk (TBlock [
+		mk (TVar (v',Some e1)) basic.tvoid e1.epos;
+		mk (TWhile((mk (TParenthesis ehasnext) ehasnext.etype ehasnext.epos),ebody,NormalWhile)) basic.tvoid e1.epos;
+	]) basic.tvoid p
+
+(* -------------------------------------------------------------------------- *)
+(* BUILD META DATA OBJECT *)
+
+let build_metadata api t =
+	let p, meta, fields, statics = (match t with
+		| TClassDecl c ->
+			let fields = List.map (fun f -> f.cf_name,f.cf_meta) (c.cl_ordered_fields @ (match c.cl_constructor with None -> [] | Some f -> [{ f with cf_name = "_" }])) in
+			let statics =  List.map (fun f -> f.cf_name,f.cf_meta) c.cl_ordered_statics in
+			(c.cl_pos, ["",c.cl_meta],fields,statics)
+		| TEnumDecl e ->
+			(e.e_pos, ["",e.e_meta],List.map (fun n -> n, (PMap.find n e.e_constrs).ef_meta) e.e_names, [])
+		| TTypeDecl t ->
+			(t.t_pos, ["",t.t_meta],(match follow t.t_type with TAnon a -> PMap.fold (fun f acc -> (f.cf_name,f.cf_meta) :: acc) a.a_fields [] | _ -> []),[])
+		| TAbstractDecl a ->
+			(a.a_pos, ["",a.a_meta],[],[])
+	) in
+	let filter l =
+		let l = List.map (fun (n,ml) -> n, ExtList.List.filter_map (fun (m,el,p) -> match m with Meta.Custom s when String.length s > 0 && s.[0] <> ':' -> Some (s,el,p) | _ -> None) ml) l in
+		List.filter (fun (_,ml) -> ml <> []) l
+	in
+	let meta, fields, statics = filter meta, filter fields, filter statics in
+	let make_meta_field ml =
+		let h = Hashtbl.create 0 in
+		mk (TObjectDecl (List.map (fun (f,el,p) ->
+			if Hashtbl.mem h f then error ("Duplicate metadata '" ^ f ^ "'") p;
+			Hashtbl.add h f ();
+			(f,null_pos,NoQuotes), mk (match el with [] -> TConst TNull | _ -> TArrayDecl (List.map (type_constant_value api) el)) (api.tarray t_dynamic) p
+		) ml)) t_dynamic p
+	in
+	let make_meta l =
+		mk (TObjectDecl (List.map (fun (f,ml) -> (f,null_pos,NoQuotes),make_meta_field ml) l)) t_dynamic p
+	in
+	if meta = [] && fields = [] && statics = [] then
+		None
+	else
+		let meta_obj = [] in
+		let meta_obj = (if fields = [] then meta_obj else (("fields",null_pos,NoQuotes),make_meta fields) :: meta_obj) in
+		let meta_obj = (if statics = [] then meta_obj else (("statics",null_pos,NoQuotes),make_meta statics) :: meta_obj) in
+		let meta_obj = (try (("obj",null_pos,NoQuotes), make_meta_field (List.assoc "" meta)) :: meta_obj with Not_found -> meta_obj) in
+		Some (mk (TObjectDecl meta_obj) t_dynamic p)
+
+let dump_with_pos tabs e =
+	let buf = Buffer.create 0 in
+	let add = Buffer.add_string buf in
+	let rec loop' tabs e =
+		let p = e.epos in
+		let add s = add (Printf.sprintf "%4i-%4i %s%s\n" p.pmin p.pmax tabs s) in
+		let loop e = loop' (tabs ^ "  ") e in
+		match e.eexpr with
+		| TConst ct -> add (s_const ct)
+		| TLocal v -> add ("TLocal " ^ v.v_name)
+		| TTypeExpr mt -> add ("TTypeExpr " ^ (s_type_path (t_infos mt).mt_path))
+		| TIdent s -> add ("TIdent " ^ s)
+		| TEnumParameter(e1,ef,_) ->
+			add ("TEnumParameter " ^ ef.ef_name);
+			loop e1
+		| TEnumIndex e1 ->
+			add "TEnumIndex";
+			loop e1
+		| TArray(e1,e2) ->
+			add "TArray";
+			loop e1;
+			loop e2;
+		| TBinop(op,e1,e2) ->
+			add ("TBinop " ^ (s_binop op));
+			loop e1;
+			loop e2;
+		| TField(e1,s) ->
+			add ("TField " ^ (field_name s));
+			loop e1
+		| TParenthesis e1 ->
+			add "TParenthesis";
+			loop e1
+		| TObjectDecl fl ->
+			add "TObjectDecl";
+			List.iter (fun ((n,p,_),e1) ->
+				Buffer.add_string buf (Printf.sprintf "%4i-%4i %s%s\n" p.pmin p.pmax tabs n);
+				loop e1
+			) fl;
+		| TArrayDecl el ->
+			add "TArrayDecl";
+			List.iter loop el
+		| TCall(e1,el) ->
+			add "TCall";
+			loop e1;
+			List.iter loop el
+		| TNew(c,_,el) ->
+			add ("TNew " ^ s_type_path c.cl_path);
+			List.iter loop el
+		| TUnop(op,_,e1) ->
+			add ("TUnop " ^ (s_unop op));
+			loop e1
+		| TVar(v,eo) ->
+			add ("TVar " ^ v.v_name);
+			begin match eo with
+				| None -> ()
+				| Some e ->
+					loop' (Printf.sprintf "%s  " tabs) e
+			end
+		| TFunction tf ->
+			add "TFunction";
+			loop tf.tf_expr;
+		| TBlock el ->
+			add "TBlock";
+			List.iter loop el
+		| TFor(v,e1,e2) ->
+			add ("TFor " ^ v.v_name);
+			loop e1;
+			loop e2;
+		| TIf(e1,e2,eo) ->
+			add "TIf";
+			loop e1;
+			loop e2;
+			Option.may loop eo;
+		| TWhile(e1,e2,_) ->
+			add "TWhile";
+			loop e1;
+			loop e2;
+		| TSwitch(e1,cases,def) ->
+			add "TSwitch";
+			loop e1;
+			List.iter (fun (el,e) ->
+				List.iter (loop' (tabs ^ "    ")) el;
+				loop' (tabs ^ "      ") e;
+			) cases;
+			Option.may (loop' (tabs ^ "      ")) def
+		| TTry(e1,catches) ->
+			add "TTry";
+			loop e1;
+			List.iter (fun (v,e) ->
+				loop' (tabs ^ "    ") e
+			) catches
+		| TReturn eo ->
+			add "TReturn";
+			Option.may loop eo;
+		| TBreak ->
+			add "TBreak";
+		| TContinue ->
+			add "TContinue"
+		| TThrow e1 ->
+			add "EThrow";
+			loop e1
+		| TCast(e1,_) ->
+			add "TCast";
+			loop e1;
+		| TMeta((m,_,_),e1) ->
+			add ("TMeta " ^ fst (Meta.get_info m));
+			loop e1
+	in
+	loop' tabs e;
+	Buffer.contents buf
+
+let collect_captured_vars e =
+	let known = Hashtbl.create 0 in
+	let unknown = ref [] in
+	let accesses_this = ref false in
+	let declare v = Hashtbl.add known v.v_id () in
+	let rec loop e = match e.eexpr with
+		| TLocal ({v_capture = true; v_id = id} as v) when not (Hashtbl.mem known id) ->
+			Hashtbl.add known id ();
+			unknown := v :: !unknown
+		| TConst (TThis | TSuper) ->
+			accesses_this := true;
+		| TVar(v,eo) ->
+			Option.may loop eo;
+			declare v
+		| TFor(v,e1,e2) ->
+			declare v;
+			loop e1;
+			loop e2;
+		| TFunction tf ->
+			List.iter (fun (v,_) -> declare v) tf.tf_args;
+			loop tf.tf_expr
+		| TTry(e1,catches) ->
+			loop e1;
+			List.iter (fun (v,e) ->
+				declare v;
+				loop e;
+			) catches
+		| _ ->
+			Type.iter loop e
+	in
+	loop e;
+	List.rev !unknown,!accesses_this
+
+(**
+	If `e` contains a sequence of unsafe casts, then look if that sequence
+	already has casts to `t` and return the bottom-most of such casts.
+	If `require_cast` is `false` and the first non-cast expression has type `t`, then return that expression without any casts.
+	In other cases return `e` as-is.
+*)
+let reduce_unsafe_casts ?(require_cast=false) e t =
+	let same_type t1 t2 =
+		fast_eq (follow_without_null t1) (follow_without_null t2)
+	in
+	let rec loop e =
+		match e.eexpr with
+		| TCast(subject,None) ->
+			let result = loop subject in
+			if same_type e.etype subject.etype then result
+			else { e with eexpr = TCast(result,None) }
+		| _ -> e
+	in
+	match loop e with
+	| { eexpr = TCast _ } as result -> result
+	| result when require_cast -> { e with eexpr = TCast(result,None) }
+	| result -> result
diff --git a/src/core/timer.ml b/src/core/timer.ml
new file mode 100644
index 0000000000000000000000000000000000000000..8abd752a3d62538c169b93a77a5e39fa9a2e7710
--- /dev/null
+++ b/src/core/timer.ml
@@ -0,0 +1,183 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+type timer_infos = {
+	id : string list;
+	mutable start : float list;
+	mutable pauses : float list;
+	mutable total : float;
+	mutable calls : int;
+}
+
+let get_time = Extc.time
+let htimers = Hashtbl.create 0
+
+let new_timer id =
+	let now = get_time() in
+	try
+		let t = Hashtbl.find htimers id in
+		t.start <- now :: t.start;
+		t.pauses <- 0. :: t.pauses;
+		t.calls <- t.calls + 1;
+		t
+	with Not_found ->
+		let t = { id = id; start = [now]; pauses = [0.]; total = 0.; calls = 1; } in
+		Hashtbl.add htimers id t;
+		t
+
+let curtime = ref []
+
+let rec close now t =
+	match !curtime with
+	| [] ->
+		failwith ("Timer " ^ (String.concat "." t.id) ^ " closed while not active")
+	| tt :: rest ->
+		if t == tt then begin
+			match t.start, t.pauses with
+			| start :: rest_start, pauses :: rest_pauses ->
+				let dt = now -. start in
+				t.total <- t.total +. dt -. pauses;
+				t.start <- rest_start;
+				t.pauses <- rest_pauses;
+				curtime := rest;
+				(match !curtime with
+				| [] -> ()
+				| current :: _ ->
+					match current.pauses with
+					| pauses :: rest -> current.pauses <- (dt +. pauses) :: rest
+					| _ -> assert false
+				)
+			| _ -> assert false
+		end else
+			close now tt
+
+let timer id =
+	let t = new_timer id in
+	curtime := t :: !curtime;
+	(function() -> close (get_time()) t)
+
+let rec close_times() =
+	let now = get_time() in
+	match !curtime with
+	| [] -> ()
+	| t :: _ -> close now t; close_times()
+
+let close = close (get_time())
+
+(* Printing *)
+
+type timer_node = {
+	name : string;
+	path : string;
+	parent : timer_node;
+	info : string;
+	mutable time : float;
+	mutable num_calls : int;
+	mutable children : timer_node list;
+}
+
+let build_times_tree () =
+	let nodes = Hashtbl.create 0 in
+	let rec root = {
+		name = "";
+		path = "";
+		parent = root;
+		info = "";
+		time = 0.;
+		num_calls = 0;
+		children = [];
+	} in
+	Hashtbl.iter (fun _ timer ->
+		let rec loop parent sl = match sl with
+			| [] -> assert false
+			| s :: sl ->
+				let path = (match parent.path with "" -> "" | _ -> parent.path ^ ".") ^ s in
+				let node = try
+					let node = Hashtbl.find nodes path in
+					node.num_calls <- node.num_calls + timer.calls;
+					node.time <- node.time +. timer.total;
+					node
+				with Not_found ->
+					let name,info = try
+						let i = String.rindex s '.' in
+						String.sub s (i + 1) (String.length s - i - 1),String.sub s 0 i
+					with Not_found ->
+						s,""
+					in
+					let node = {
+						name = name;
+						path = path;
+						parent = parent;
+						info = info;
+						time = timer.total;
+						num_calls = timer.calls;
+						children = [];
+					} in
+					Hashtbl.add nodes path node;
+					node
+				in
+				begin match sl with
+					| [] -> ()
+					| _ ->
+						let child = loop node sl in
+						if not (List.memq child node.children) then
+							node.children <- child :: node.children;
+				end;
+				node
+		in
+		let node = loop root timer.id in
+		if not (List.memq node root.children) then
+			root.children <- node :: root.children
+	) htimers;
+	let max_name = ref 0 in
+	let max_calls = ref 0 in
+	let rec loop depth node =
+		let l = (String.length node.name) + 2 * depth in
+		List.iter (fun child ->
+			if depth = 0 then begin
+				node.num_calls <- node.num_calls + child.num_calls;
+				node.time <- node.time +. child.time;
+			end;
+			loop (depth + 1) child;
+		) node.children;
+		node.children <- List.sort (fun node1 node2 -> compare node2.time node1.time) node.children;
+		if node.num_calls > !max_calls then max_calls := node.num_calls;
+		if node.time > 0.0009 && l > !max_name then max_name := l;
+	in
+	loop 0 root;
+	!max_name,!max_calls,root
+
+let report_times print =
+	let max_name,max_calls,root = build_times_tree () in
+	let max_calls = String.length (string_of_int max_calls) in
+	print (Printf.sprintf "%-*s | %7s |   %% |  p%% | %*s | info" max_name "name" "time(s)" max_calls "#");
+	let sep = String.make (max_name + max_calls + 27) '-' in
+	print sep;
+	let print_time name node =
+		if node.time > 0.0009 then
+			print (Printf.sprintf "%-*s | %7.3f | %3.0f | %3.0f | %*i | %s" max_name name node.time (node.time *. 100. /. root.time) (node.time *. 100. /. node.parent.time) max_calls node.num_calls node.info)
+	in
+	let rec loop depth node =
+		let name = (String.make (depth * 2) ' ') ^ node.name in
+		print_time name node;
+		List.iter (loop (depth + 1)) node.children
+	in
+	List.iter (loop 0) root.children;
+	print sep;
+	print_time "total" root
\ No newline at end of file
diff --git a/src/typing/type.ml b/src/core/type.ml
similarity index 71%
rename from src/typing/type.ml
rename to src/core/type.ml
index 04c3c81ee24baddbb932ec825dda6da25c1dcc67..3102b95775a3ba914d863a76fa742b9f18bd065a 100644
--- a/src/typing/type.ml
+++ b/src/core/type.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -20,8 +20,6 @@
 open Ast
 open Globals
 
-type path = string list * string
-
 type field_kind =
 	| Var of var_kind
 	| Method of method_kind
@@ -33,11 +31,12 @@ and var_kind = {
 
 and var_access =
 	| AccNormal
-	| AccNo				(* can't be accessed outside of the class itself and its subclasses *)
-	| AccNever			(* can't be accessed, even in subclasses *)
-	| AccResolve		(* call resolve("field") when accessed *)
-	| AccCall			(* perform a method call when accessed *)
-	| AccInline			(* similar to Normal but inline when accessed *)
+	| AccNo             (* can't be accessed outside of the class itself and its subclasses *)
+	| AccNever          (* can't be accessed, even in subclasses *)
+	| AccCtor           (* can only be accessed from the constructor *)
+	| AccResolve        (* call resolve("field") when accessed *)
+	| AccCall           (* perform a method call when accessed *)
+	| AccInline         (* similar to Normal but inline when accessed *)
 	| AccRequire of string * string option (* set when @:require(cond) fails *)
 
 and method_kind =
@@ -60,9 +59,14 @@ type t =
 	| TFun of tsignature
 	| TAnon of tanon
 	| TDynamic of t
-	| TLazy of (unit -> t) ref
+	| TLazy of tlazy ref
 	| TAbstract of tabstract * tparams
 
+and tlazy =
+	| LAvailable of t
+	| LProcessing of (unit -> t)
+	| LWait of (unit -> t)
+
 and tsignature = (string * bool * t) list * t
 
 and tparams = t list
@@ -80,18 +84,35 @@ and tconstant =
 
 and tvar_extra = (type_params * texpr option) option
 
+and tvar_origin =
+	| TVOLocalVariable
+	| TVOArgument
+	| TVOForVariable
+	| TVOPatternVariable
+	| TVOCatchVariable
+	| TVOLocalFunction
+
+and tvar_kind =
+	| VUser of tvar_origin
+	| VGenerated
+	| VInlined
+	| VInlinedConstructorVariable
+	| VExtractorVariable
+
 and tvar = {
 	mutable v_id : int;
 	mutable v_name : string;
 	mutable v_type : t;
+	mutable v_kind : tvar_kind;
 	mutable v_capture : bool;
+	mutable v_final : bool;
 	mutable v_extra : tvar_extra;
 	mutable v_meta : metadata;
 	v_pos : pos;
 }
 
 and tfunc = {
-	tf_args : (tvar * tconstant option) list;
+	tf_args : (tvar * texpr option) list;
 	tf_type : t;
 	tf_expr : texpr;
 }
@@ -118,7 +139,7 @@ and texpr_expr =
 	| TField of texpr * tfield_access
 	| TTypeExpr of module_type
 	| TParenthesis of texpr
-	| TObjectDecl of (string * texpr) list
+	| TObjectDecl of ((string * pos * quote_status) * texpr) list
 	| TArrayDecl of texpr list
 	| TCall of texpr * texpr list
 	| TNew of tclass * tparams * texpr list
@@ -138,6 +159,8 @@ and texpr_expr =
 	| TCast of texpr * module_type option
 	| TMeta of metadata_entry * texpr
 	| TEnumParameter of texpr * tenum_field * int
+	| TEnumIndex of texpr
+	| TIdent of string
 
 and tfield_access =
 	| FInstance of tclass * tparams * tclass_field
@@ -156,7 +179,6 @@ and texpr = {
 and tclass_field = {
 	mutable cf_name : string;
 	mutable cf_type : t;
-	mutable cf_public : bool;
 	cf_pos : pos;
 	cf_name_pos : pos;
 	mutable cf_doc : Ast.documentation;
@@ -166,6 +188,7 @@ and tclass_field = {
 	mutable cf_expr : texpr option;
 	mutable cf_expr_unoptimized : tfunc option;
 	mutable cf_overloads : tclass_field list;
+	mutable cf_flags : int;
 }
 
 and tclass_kind =
@@ -189,6 +212,7 @@ and tinfos = {
 	mt_doc : Ast.documentation;
 	mutable mt_meta : metadata;
 	mt_params : type_params;
+	mutable mt_using : (tclass * pos) list;
 }
 
 and tclass = {
@@ -200,9 +224,11 @@ and tclass = {
 	mutable cl_doc : Ast.documentation;
 	mutable cl_meta : metadata;
 	mutable cl_params : type_params;
+	mutable cl_using : (tclass * pos) list;
 	(* do not insert any fields above *)
 	mutable cl_kind : tclass_kind;
 	mutable cl_extern : bool;
+	mutable cl_final : bool;
 	mutable cl_interface : bool;
 	mutable cl_super : (tclass * tparams) option;
 	mutable cl_implements : (tclass * tparams) list;
@@ -222,17 +248,17 @@ and tclass = {
 		These are classes which directly extend or directly implement this class.
 		Populated automatically in post-processing step (Filters.run)
 	*)
-	mutable cl_descendants : (path, tclass) Hashtbl.t;
+	mutable cl_descendants : tclass list;
 }
 
 and tenum_field = {
 	ef_name : string;
-	ef_type : t;
+	mutable ef_type : t;
 	ef_pos : pos;
 	ef_name_pos : pos;
 	ef_doc : Ast.documentation;
 	ef_index : int;
-	ef_params : type_params;
+	mutable ef_params : type_params;
 	mutable ef_meta : metadata;
 }
 
@@ -245,6 +271,7 @@ and tenum = {
 	e_doc : Ast.documentation;
 	mutable e_meta : metadata;
 	mutable e_params : type_params;
+	mutable e_using : (tclass * pos) list;
 	(* do not insert any fields above *)
 	e_type : tdef;
 	mutable e_extern : bool;
@@ -261,6 +288,7 @@ and tdef = {
 	t_doc : Ast.documentation;
 	mutable t_meta : metadata;
 	mutable t_params : type_params;
+	mutable t_using : (tclass * pos) list;
 	(* do not insert any fields above *)
 	mutable t_type : t;
 }
@@ -274,6 +302,7 @@ and tabstract = {
 	a_doc : Ast.documentation;
 	mutable a_meta : metadata;
 	mutable a_params : type_params;
+	mutable a_using : (tclass * pos) list;
 	(* do not insert any fields above *)
 	mutable a_ops : (Ast.binop * tclass_field) list;
 	mutable a_unops : (Ast.unop * unop_flag * tclass_field) list;
@@ -284,7 +313,8 @@ and tabstract = {
 	mutable a_to : t list;
 	mutable a_to_field : (t * tclass_field) list;
 	mutable a_array : tclass_field list;
-	mutable a_resolve : tclass_field option;
+	mutable a_read : tclass_field option;
+	mutable a_write : tclass_field option;
 }
 
 and module_type =
@@ -300,19 +330,24 @@ and module_def = {
 	m_extra : module_def_extra;
 }
 
+and module_def_display = {
+	mutable m_inline_calls : (pos * pos) list; (* calls whatever is at pos1 from pos2 *)
+	mutable m_type_hints : (pos * pos) list;
+}
+
 and module_def_extra = {
 	m_file : string;
 	m_sign : string;
+	m_display : module_def_display;
 	mutable m_check_policy : module_check_policy list;
 	mutable m_time : float;
-	mutable m_dirty : module_def option;
+	mutable m_dirty : path option;
 	mutable m_added : int;
 	mutable m_mark : int;
 	mutable m_deps : (int,module_def) PMap.t;
 	mutable m_processed : int;
 	mutable m_kind : module_kind;
 	mutable m_binded_res : (string, string) PMap.t;
-	mutable m_macro_calls : string list;
 	mutable m_if_feature : (string *(tclass * tclass_field * bool)) list;
 	mutable m_features : (string,bool) Hashtbl.t;
 }
@@ -321,25 +356,76 @@ and module_kind =
 	| MCode
 	| MMacro
 	| MFake
-	| MSub
 	| MExtern
 	| MImport
 
 and build_state =
 	| Built
-	| Building
+	| Building of tclass list
 	| BuildMacro of (unit -> unit) list ref
 
+type basic_types = {
+	mutable tvoid : t;
+	mutable tint : t;
+	mutable tfloat : t;
+	mutable tbool : t;
+	mutable tnull : t -> t;
+	mutable tstring : t;
+	mutable tarray : t -> t;
+}
+
+type class_field_scope =
+	| CFSStatic
+	| CFSMember
+	| CFSConstructor
+
+type flag_tclass_field =
+	| CfPublic
+	| CfExtern (* This is only set if the field itself is extern, not just the class. *)
+	| CfFinal
+	| CfModifiesThis (* This is set for methods which reassign `this`. E.g. `this = value` *)
+
+(* Flags *)
+
+let has_flag flags flag =
+	flags land (1 lsl flag) > 0
+
+let set_flag flags flag =
+	flags lor (1 lsl flag)
+
+let unset_flag flags flag =
+	flags land (lnot (1 lsl flag))
+
+let int_of_class_field_flag (flag : flag_tclass_field) =
+	Obj.magic flag
+
+let add_class_field_flag cf (flag : flag_tclass_field) =
+	cf.cf_flags <- set_flag cf.cf_flags (int_of_class_field_flag flag)
+
+let remove_class_field_flag cf (flag : flag_tclass_field) =
+	cf.cf_flags <- unset_flag cf.cf_flags (int_of_class_field_flag flag)
+
+let has_class_field_flag cf (flag : flag_tclass_field) =
+	has_flag cf.cf_flags (int_of_class_field_flag flag)
+
 (* ======= General utility ======= *)
 
 let alloc_var =
 	let uid = ref 0 in
-	(fun n t p -> incr uid; { v_name = n; v_type = t; v_id = !uid; v_capture = false; v_extra = None; v_meta = []; v_pos = p })
-
-let alloc_unbound_var n t p =
-	let v = alloc_var n t p in
-	v.v_meta <- [Meta.Unbound,[],null_pos];
-	v
+	(fun kind n t p ->
+		incr uid;
+		{
+			v_kind = kind;
+			v_name = n;
+			v_type = t;
+			v_id = !uid;
+			v_capture = false;
+			v_final = (match kind with VUser TVOLocalFunction -> true | _ -> false);
+			v_extra = None;
+			v_meta = [];
+			v_pos = p
+		}
+	)
 
 let alloc_mid =
 	let mid = ref 0 in
@@ -352,9 +438,6 @@ let mk_block e =
 	| TBlock _ -> e
 	| _ -> mk (TBlock [e]) e.etype e.epos
 
-let is_unbound v =
-	Meta.has Meta.Unbound v.v_meta
-
 let mk_cast e t p = mk (TCast(e,None)) t p
 
 let null t p = mk (TConst TNull) t p
@@ -363,8 +446,7 @@ let mk_mono() = TMono (ref None)
 
 let rec t_dynamic = TDynamic t_dynamic
 
-let not_opened = ref Closed
-let mk_anon fl = TAnon { a_fields = fl; a_status = not_opened; }
+let mk_anon fl = TAnon { a_fields = fl; a_status = ref Closed; }
 
 (* We use this for display purposes because otherwise we never see the Dynamic type that
    is defined in StdTypes.hx. This is set each time a typer is created, but this is fine
@@ -387,8 +469,10 @@ let mk_class m path pos name_pos =
 		cl_private = false;
 		cl_kind = KNormal;
 		cl_extern = false;
+		cl_final = false;
 		cl_interface = false;
 		cl_params = [];
+		cl_using = [];
 		cl_super = None;
 		cl_implements = [];
 		cl_fields = PMap.empty;
@@ -402,13 +486,17 @@ let mk_class m path pos name_pos =
 		cl_overrides = [];
 		cl_build = (fun() -> Built);
 		cl_restore = (fun() -> ());
-		cl_descendants = Hashtbl.create 10
+		cl_descendants = [];
 	}
 
 let module_extra file sign time kind policy =
 	{
 		m_file = file;
 		m_sign = sign;
+		m_display = {
+			m_inline_calls = [];
+			m_type_hints = [];
+		};
 		m_dirty = None;
 		m_added = 0;
 		m_mark = 0;
@@ -417,26 +505,25 @@ let module_extra file sign time kind policy =
 		m_deps = PMap.empty;
 		m_kind = kind;
 		m_binded_res = PMap.empty;
-		m_macro_calls = [];
 		m_if_feature = [];
 		m_features = Hashtbl.create 0;
 		m_check_policy = policy;
 	}
 
 
-let mk_field name t p name_pos = {
+let mk_field name ?(public = true) t p name_pos = {
 	cf_name = name;
 	cf_type = t;
 	cf_pos = p;
 	cf_name_pos = name_pos;
 	cf_doc = None;
 	cf_meta = [];
-	cf_public = true;
 	cf_kind = Var { v_read = AccNormal; v_write = AccNormal };
 	cf_expr = None;
 	cf_expr_unoptimized = None;
 	cf_params = [];
 	cf_overloads = [];
+	cf_flags = if public then set_flag 0 (int_of_class_field_flag CfPublic) else 0;
 }
 
 let null_module = {
@@ -462,6 +549,7 @@ let null_abstract = {
 	a_doc = None;
 	a_meta = [];
 	a_params = [];
+	a_using = [];
 	a_ops = [];
 	a_unops = [];
 	a_impl = None;
@@ -471,7 +559,8 @@ let null_abstract = {
 	a_to = [];
 	a_to_field = [];
 	a_array = [];
-	a_resolve = None;
+	a_read = None;
+	a_write = None;
 }
 
 let add_dependency m mdep =
@@ -496,7 +585,16 @@ let rec is_parent csup c =
 		| Some (c,_) -> is_parent csup c
 
 let add_descendant c descendant =
-	Hashtbl.replace c.cl_descendants descendant.cl_path descendant
+	c.cl_descendants <- descendant :: c.cl_descendants
+
+let lazy_type f =
+	match !f with
+	| LAvailable t -> t
+	| LProcessing f | LWait f -> f()
+
+let lazy_available t = LAvailable t
+let lazy_processing f = LProcessing f
+let lazy_wait f = LWait f
 
 let map loop t =
 	match t with
@@ -529,13 +627,13 @@ let map loop t =
 				}
 		end
 	| TLazy f ->
-		let ft = !f() in
+		let ft = lazy_type f in
 		let ft2 = loop ft in
 		if ft == ft2 then t else ft2
 	| TDynamic t2 ->
 		if t == t2 then	t else TDynamic (loop t2)
 
-let dup t =
+let duplicate t =
 	let monos = ref [] in
 	let rec loop t =
 		match t with
@@ -551,15 +649,17 @@ let dup t =
 	in
 	loop t
 
+exception ApplyParamsRecursion
+
 (* substitute parameters with other types *)
-let apply_params cparams params t =
+let apply_params ?stack cparams params t =
 	match cparams with
 	| [] -> t
 	| _ ->
 	let rec loop l1 l2 =
 		match l1, l2 with
 		| [] , [] -> []
-		| (x,TLazy f) :: l1, _ -> loop ((x,(!f)()) :: l1) l2
+		| (x,TLazy f) :: l1, _ -> loop ((x,lazy_type f) :: l1) l2
 		| (_,t1) :: l1 , t2 :: l2 -> (t1,t2) :: loop l1 l2
 		| _ -> assert false
 	in
@@ -580,7 +680,52 @@ let apply_params cparams params t =
 		| TType (t2,tl) ->
 			(match tl with
 			| [] -> t
-			| _ -> TType (t2,List.map loop tl))
+			| _ ->
+				let new_applied_params = List.map loop tl in
+				(match stack with
+				| None -> ()
+				| Some stack ->
+					List.iter (fun (subject, old_applied_params) ->
+						(*
+							E.g.:
+							```
+							typedef Rec<T> = { function method():Rec<Array<T>> }
+							```
+							We need to make sure that we are not applying the result of previous
+							application to the same place, which would mean the result of current
+							application would go into `apply_params` again and then again and so on.
+
+							Argument `stack` holds all previous results of `apply_params` to typedefs in current
+							unification process.
+
+							Imagine we are trying to unify `Rec<Int>` with something.
+
+							Once `apply_params Array<T> Int Rec<Array<T>>` is called for the first time the result
+							will be `Rec< Array<Int> >`. Store `Array<Int>` into `stack`
+
+							Then the next params application looks like this:
+								`apply_params Array<T> Array<Int> Rec<Array<T>>`
+							Notice the second argument is actually the result of a previous `apply_params` call.
+							And the result of the current call is `Rec< Array<Array<Int>> >`.
+
+							The third call would be:
+								`apply_params Array<T> Array<Array<Int>> Rec<Array<T>>`
+							and so on.
+
+							To stop infinite params application we need to check that we are trying to apply params
+							produced by the previous `apply_params Array<Int> _ Rec<Array<T>>` to the same `Rec<Array<T>>`
+						*)
+						if
+							subject == t (* Check the place that we're applying to is the same `Rec<Array<T>>` *)
+							&& old_applied_params == params (* Check that params we're applying are the same params
+																produced by the previous call to
+																`apply_params Array<T> _ Rec<Array<T>>` *)
+						then
+							raise ApplyParamsRecursion
+					) !stack;
+					stack := (t, new_applied_params) :: !stack;
+				);
+				TType (t2,new_applied_params))
 		| TAbstract (a,tl) ->
 			(match tl with
 			| [] -> t
@@ -615,7 +760,7 @@ let apply_params cparams params t =
 					}
 			end
 		| TLazy f ->
-			let ft = !f() in
+			let ft = lazy_type f in
 			let ft2 = loop ft in
 			if ft == ft2 then
 				t
@@ -632,6 +777,21 @@ let apply_params cparams params t =
 let monomorphs eparams t =
 	apply_params eparams (List.map (fun _ -> mk_mono()) eparams) t
 
+let apply_params_stack = ref []
+
+let try_apply_params_rec cparams params t success =
+	let old_stack = !apply_params_stack in
+	try
+		let result = success (apply_params ~stack:apply_params_stack cparams params t) in
+		apply_params_stack := old_stack;
+		result
+	with
+		| ApplyParamsRecursion ->
+			apply_params_stack := old_stack;
+		| err ->
+			apply_params_stack := old_stack;
+			raise err
+
 let rec follow t =
 	match t with
 	| TMono r ->
@@ -639,18 +799,55 @@ let rec follow t =
 		| Some t -> follow t
 		| _ -> t)
 	| TLazy f ->
-		follow (!f())
+		follow (lazy_type f)
 	| TType (t,tl) ->
 		follow (apply_params t.t_params tl t.t_type)
+	| TAbstract({a_path = [],"Null"},[t]) ->
+		follow t
+	| _ -> t
+
+let rec follow_without_null t =
+	match t with
+	| TMono r ->
+		(match !r with
+		| Some t -> follow_without_null t
+		| _ -> t)
+	| TLazy f ->
+		follow_without_null (lazy_type f)
+	| TType (t,tl) ->
+		follow_without_null (apply_params t.t_params tl t.t_type)
 	| _ -> t
 
+(** Assumes `follow` has already been applied *)
+let rec ambiguate_funs t =
+	match t with
+	| TFun _ -> TFun ([], t_dynamic)
+	| TMono r ->
+		(match !r with
+		| Some _ -> assert false
+		| _ -> t)
+	| TInst (a, pl) ->
+	    TInst (a, List.map ambiguate_funs pl)
+	| TEnum (a, pl) ->
+	    TEnum (a, List.map ambiguate_funs pl)
+	| TAbstract (a, pl) ->
+	    TAbstract (a, List.map ambiguate_funs pl)
+	| TType (a, pl) ->
+	    TType (a, List.map ambiguate_funs pl)
+	| TDynamic _ -> t
+	| TAnon a ->
+	    TAnon { a with a_fields =
+		    PMap.map (fun af -> { af with cf_type =
+				ambiguate_funs af.cf_type }) a.a_fields }
+	| TLazy _ -> assert false
+
 let rec is_nullable = function
 	| TMono r ->
 		(match !r with None -> false | Some t -> is_nullable t)
-	| TType ({ t_path = ([],"Null") },[_]) ->
+	| TAbstract ({ a_path = ([],"Null") },[_]) ->
 		true
 	| TLazy f ->
-		is_nullable (!f())
+		is_nullable (lazy_type f)
 	| TType (t,tl) ->
 		is_nullable (apply_params t.t_params tl t.t_type)
 	| TFun _ ->
@@ -674,10 +871,10 @@ let rec is_nullable = function
 let rec is_null ?(no_lazy=false) = function
 	| TMono r ->
 		(match !r with None -> false | Some t -> is_null t)
-	| TType ({ t_path = ([],"Null") },[t]) ->
+	| TAbstract ({ a_path = ([],"Null") },[t]) ->
 		not (is_nullable (follow t))
 	| TLazy f ->
-		if no_lazy then raise Exit else is_null (!f())
+		if no_lazy then raise Exit else is_null (lazy_type f)
 	| TType (t,tl) ->
 		is_null (apply_params t.t_params tl t.t_type)
 	| _ ->
@@ -686,13 +883,13 @@ let rec is_null ?(no_lazy=false) = function
 (* Determines if we have a Null<T>. Unlike is_null, this returns true even if the wrapped type is nullable itself. *)
 let rec is_explicit_null = function
 	| TMono r ->
-		(match !r with None -> false | Some t -> is_null t)
-	| TType ({ t_path = ([],"Null") },[t]) ->
+		(match !r with None -> false | Some t -> is_explicit_null t)
+	| TAbstract ({ a_path = ([],"Null") },[t]) ->
 		true
 	| TLazy f ->
-		is_null (!f())
+		is_explicit_null (lazy_type f)
 	| TType (t,tl) ->
-		is_null (apply_params t.t_params tl t.t_type)
+		is_explicit_null (apply_params t.t_params tl t.t_type)
 	| _ ->
 		false
 
@@ -707,8 +904,8 @@ let rec has_mono t = match t with
 		has_mono r || List.exists (fun (_,_,t) -> has_mono t) args
 	| TAnon a ->
 		PMap.fold (fun cf b -> has_mono cf.cf_type || b) a.a_fields false
-	| TLazy r ->
-		has_mono (!r())
+	| TLazy f ->
+		has_mono (lazy_type f)
 
 let concat e1 e2 =
 	let e = (match e1.eexpr, e2.eexpr with
@@ -732,7 +929,7 @@ let rec module_type_of_type = function
 	| TEnum(en,_) -> TEnumDecl en
 	| TType(t,_) -> TTypeDecl t
 	| TAbstract(a,_) -> TAbstractDecl a
-	| TLazy f -> module_type_of_type (!f())
+	| TLazy f -> module_type_of_type (lazy_type f)
 	| TMono r ->
 		(match !r with
 		| Some t -> module_type_of_type t
@@ -743,7 +940,7 @@ let rec module_type_of_type = function
 let tconst_to_const = function
 	| TInt i -> Int (Int32.to_string i)
 	| TFloat s -> Float s
-	| TString s -> String s
+	| TString s -> String(s,SDoubleQuotes)
 	| TBool b -> Ident (if b then "true" else "false")
 	| TNull -> Ident "null"
 	| TThis -> Ident "this"
@@ -781,12 +978,6 @@ let is_physical_field f =
 	| Method _ -> true
 	| _ -> is_physical_var_field f
 
-let is_extern_field f =
-	match f.cf_kind with
-	| Method _ -> false
-	| Var { v_read = AccNormal | AccInline | AccNo } | Var { v_write = AccNormal | AccNo } -> false
-	| _ -> not (Meta.has Meta.IsVar f.cf_meta)
-
 let field_type f =
 	match f.cf_params with
 	| [] -> f.cf_type
@@ -892,6 +1083,12 @@ let rec get_constructor build_type c =
 		let t, c = get_constructor build_type csup in
 		apply_params csup.cl_params cparams t, c
 
+let has_constructor c =
+	try
+		ignore(get_constructor (fun cf -> cf.cf_type) c);
+		true
+	with Not_found -> false
+
 (* ======= Printing ======= *)
 
 let print_context() = ref []
@@ -929,7 +1126,7 @@ let rec s_type ctx t =
 		s_type_path e.e_path ^ s_type_params ctx tl
 	| TInst (c,tl) ->
 		(match c.cl_kind with
-		| KExpr e -> Ast.s_expr e
+		| KExpr e -> Ast.Printer.s_expr e
 		| _ -> s_type_path c.cl_path ^ s_type_params ctx tl)
 	| TType (t,tl) ->
 		s_type_path t.t_path ^ s_type_params ctx tl
@@ -938,16 +1135,30 @@ let rec s_type ctx t =
 	| TFun ([],t) ->
 		"Void -> " ^ s_fun ctx t false
 	| TFun (l,t) ->
-		String.concat " -> " (List.map (fun (s,b,t) ->
-			(if b then "?" else "") ^ (if s = "" then "" else s ^ " : ") ^ s_fun ctx t true
-		) l) ^ " -> " ^ s_fun ctx t false
+		let args = match l with
+			| [] -> "()"
+			| ["",b,t] -> Printf.sprintf "%s%s" (if b then "?" else "") (s_fun ctx t true)
+			| _ ->
+				let args = String.concat ", " (List.map (fun (s,b,t) ->
+					(if b then "?" else "") ^ (if s = "" then "" else s ^ " : ") ^ s_fun ctx t true
+				) l) in
+				"(" ^ args ^ ")"
+		in
+		Printf.sprintf "%s -> %s" args (s_fun ctx t false)
 	| TAnon a ->
-		let fl = PMap.fold (fun f acc -> ((if Meta.has Meta.Optional f.cf_meta then " ?" else " ") ^ f.cf_name ^ " : " ^ s_type ctx f.cf_type) :: acc) a.a_fields [] in
-		"{" ^ (if not (is_closed a) then "+" else "") ^  String.concat "," fl ^ " }"
+		begin
+			match !(a.a_status) with
+			| Statics c -> Printf.sprintf "{ Statics %s }" (s_type_path c.cl_path)
+			| EnumStatics e -> Printf.sprintf "{ EnumStatics %s }" (s_type_path e.e_path)
+			| AbstractStatics a -> Printf.sprintf "{ AbstractStatics %s }" (s_type_path a.a_path)
+			| _ ->
+				let fl = PMap.fold (fun f acc -> ((if Meta.has Meta.Optional f.cf_meta then " ?" else " ") ^ f.cf_name ^ " : " ^ s_type ctx f.cf_type) :: acc) a.a_fields [] in
+				"{" ^ (if not (is_closed a) then "+" else "") ^  String.concat "," fl ^ " }"
+		end
 	| TDynamic t2 ->
 		"Dynamic" ^ s_type_params ctx (if t == t2 then [] else [t2])
 	| TLazy f ->
-		s_type ctx (!f())
+		s_type ctx (lazy_type f)
 
 and s_fun ctx t void =
 	match t with
@@ -960,7 +1171,7 @@ and s_fun ctx t void =
 		| None -> s_type ctx t
 		| Some t -> s_fun ctx t void)
 	| TLazy f ->
-		s_fun ctx (!f()) void
+		s_fun ctx (lazy_type f) void
 	| _ ->
 		s_type ctx t
 
@@ -976,6 +1187,7 @@ let s_access is_read = function
 	| AccCall -> if is_read then "get" else "set"
 	| AccInline	-> "inline"
 	| AccRequire (n,_) -> "require " ^ n
+	| AccCtor -> "ctor"
 
 let s_kind = function
 	| Var { v_read = AccNormal; v_write = AccNormal } -> "var"
@@ -994,6 +1206,7 @@ let s_expr_kind e =
 	| TArray (_,_) -> "Array"
 	| TBinop (_,_,_) -> "Binop"
 	| TEnumParameter (_,_,_) -> "EnumParameter"
+	| TEnumIndex _ -> "EnumIndex"
 	| TField (_,_) -> "Field"
 	| TTypeExpr _ -> "TypeExpr"
 	| TParenthesis _ -> "Parenthesis"
@@ -1016,16 +1229,25 @@ let s_expr_kind e =
 	| TThrow _ -> "Throw"
 	| TCast _ -> "Cast"
 	| TMeta _ -> "Meta"
+	| TIdent _ -> "Ident"
 
 let s_const = function
 	| TInt i -> Int32.to_string i
 	| TFloat s -> s
-	| TString s -> Printf.sprintf "\"%s\"" (Ast.s_escape s)
+	| TString s -> Printf.sprintf "\"%s\"" (StringHelper.s_escape s)
 	| TBool b -> if b then "true" else "false"
 	| TNull -> "null"
 	| TThis -> "this"
 	| TSuper -> "super"
 
+let s_field_access s_type fa = match fa with
+	| FStatic (c,f) -> "static(" ^ s_type_path c.cl_path ^ "." ^ f.cf_name ^ ")"
+	| FInstance (c,_,f) -> "inst(" ^ s_type_path c.cl_path ^ "." ^ f.cf_name ^ " : " ^ s_type f.cf_type ^ ")"
+	| FClosure (c,f) -> "closure(" ^ (match c with None -> f.cf_name | Some (c,_) -> s_type_path c.cl_path ^ "." ^ f.cf_name)  ^ ")"
+	| FAnon f -> "anon(" ^ f.cf_name ^ ")"
+	| FEnum (en,f) -> "enum(" ^ s_type_path en.e_path ^ "." ^ f.ef_name ^ ")"
+	| FDynamic f -> "dynamic(" ^ f ^ ")"
+
 let rec s_expr s_type e =
 	let sprintf = Printf.sprintf in
 	let slist f l = String.concat "," (List.map f l) in
@@ -1040,24 +1262,19 @@ let rec s_expr s_type e =
 		sprintf "%s[%s]" (loop e1) (loop e2)
 	| TBinop (op,e1,e2) ->
 		sprintf "(%s %s %s)" (loop e1) (s_binop op) (loop e2)
+	| TEnumIndex e1 ->
+		sprintf "EnumIndex %s" (loop e1)
 	| TEnumParameter (e1,_,i) ->
 		sprintf "%s[%i]" (loop e1) i
 	| TField (e,f) ->
-		let fstr = (match f with
-			| FStatic (c,f) -> "static(" ^ s_type_path c.cl_path ^ "." ^ f.cf_name ^ ")"
-			| FInstance (c,_,f) -> "inst(" ^ s_type_path c.cl_path ^ "." ^ f.cf_name ^ " : " ^ s_type f.cf_type ^ ")"
-			| FClosure (c,f) -> "closure(" ^ (match c with None -> f.cf_name | Some (c,_) -> s_type_path c.cl_path ^ "." ^ f.cf_name)  ^ ")"
-			| FAnon f -> "anon(" ^ f.cf_name ^ ")"
-			| FEnum (en,f) -> "enum(" ^ s_type_path en.e_path ^ "." ^ f.ef_name ^ ")"
-			| FDynamic f -> "dynamic(" ^ f ^ ")"
-		) in
+		let fstr = s_field_access s_type f in
 		sprintf "%s.%s" (loop e) fstr
 	| TTypeExpr m ->
 		sprintf "TypeExpr %s" (s_type_path (t_path m))
 	| TParenthesis e ->
 		sprintf "Parenthesis %s" (loop e)
 	| TObjectDecl fl ->
-		sprintf "ObjectDecl {%s}" (slist (fun (f,e) -> sprintf "%s : %s" f (loop e)) fl)
+		sprintf "ObjectDecl {%s}" (slist (fun ((f,_,qs),e) -> sprintf "%s : %s" (s_object_key_name f qs) (loop e)) fl)
 	| TArrayDecl el ->
 		sprintf "ArrayDecl [%s]" (slist loop el)
 	| TCall (e,el) ->
@@ -1069,7 +1286,7 @@ let rec s_expr s_type e =
 		| Prefix -> sprintf "(%s %s)" (s_unop op) (loop e)
 		| Postfix -> sprintf "(%s %s)" (loop e) (s_unop op))
 	| TFunction f ->
-		let args = slist (fun (v,o) -> sprintf "%s : %s%s" (s_var v) (s_type v.v_type) (match o with None -> "" | Some c -> " = " ^ s_const c)) f.tf_args in
+		let args = slist (fun (v,o) -> sprintf "%s : %s%s" (s_var v) (s_type v.v_type) (match o with None -> "" | Some c -> " = " ^ loop c)) f.tf_args in
 		sprintf "Function(%s) : %s = %s" args (s_type f.tf_type) (loop f.tf_expr)
 	| TVar (v,eo) ->
 		sprintf "Vars %s" (sprintf "%s : %s%s" (s_var v) (s_type v.v_type) (match eo with None -> "" | Some e -> " = " ^ loop e))
@@ -1100,7 +1317,9 @@ let rec s_expr s_type e =
 	| TCast (e,t) ->
 		sprintf "Cast %s%s" (match t with None -> "" | Some t -> s_type_path (t_path t) ^ ": ") (loop e)
 	| TMeta ((n,el,_),e) ->
-		sprintf "@%s%s %s" (Meta.to_string n) (match el with [] -> "" | _ -> "(" ^ (String.concat ", " (List.map Ast.s_expr el)) ^ ")") (loop e)
+		sprintf "@%s%s %s" (Meta.to_string n) (match el with [] -> "" | _ -> "(" ^ (String.concat ", " (List.map Ast.Printer.s_expr el)) ^ ")") (loop e)
+	| TIdent s ->
+		"Ident " ^ s
 	) in
 	sprintf "(%s : %s)" str (s_type e.etype)
 
@@ -1116,10 +1335,11 @@ let rec s_expr_pretty print_var_ids tabs top_level s_type e =
 	| TArray (e1,e2) -> sprintf "%s[%s]" (loop e1) (loop e2)
 	| TBinop (op,e1,e2) -> sprintf "%s %s %s" (loop e1) (s_binop op) (loop e2)
 	| TEnumParameter (e1,_,i) -> sprintf "%s[%i]" (loop e1) i
+	| TEnumIndex e1 -> sprintf "enumIndex %s" (loop e1)
 	| TField (e1,s) -> sprintf "%s.%s" (loop e1) (field_name s)
 	| TTypeExpr mt -> (s_type_path (t_path mt))
 	| TParenthesis e1 -> sprintf "(%s)" (loop e1)
-	| TObjectDecl fl -> sprintf "{%s}" (clist (fun (f,e) -> sprintf "%s : %s" f (loop e)) fl)
+	| TObjectDecl fl -> sprintf "{%s}" (clist (fun ((f,_,qs),e) -> sprintf "%s : %s" (s_object_key_name f qs) (loop e)) fl)
 	| TArrayDecl el -> sprintf "[%s]" (clist loop el)
 	| TCall (e1,el) -> sprintf "%s(%s)" (loop e1) (clist loop el)
 	| TNew (c,pl,el) ->
@@ -1129,7 +1349,7 @@ let rec s_expr_pretty print_var_ids tabs top_level s_type e =
 		| Prefix -> sprintf "%s %s" (s_unop op) (loop e)
 		| Postfix -> sprintf "%s %s" (loop e) (s_unop op))
 	| TFunction f ->
-		let args = clist (fun (v,o) -> sprintf "%s:%s%s" (local v) (s_type v.v_type) (match o with None -> "" | Some c -> " = " ^ s_const c)) f.tf_args in
+		let args = clist (fun (v,o) -> sprintf "%s:%s%s" (local v) (s_type v.v_type) (match o with None -> "" | Some c -> " = " ^ loop c)) f.tf_args in
 		sprintf "%s(%s) %s" (if top_level then "" else "function") args (loop f.tf_expr)
 	| TVar (v,eo) ->
 		sprintf "var %s" (sprintf "%s%s" (local v) (match eo with None -> "" | Some e -> " = " ^ loop e))
@@ -1168,7 +1388,9 @@ let rec s_expr_pretty print_var_ids tabs top_level s_type e =
 	| TCast (e,Some mt) ->
 		sprintf "cast (%s,%s)" (loop e) (s_type_path (t_path mt))
 	| TMeta ((n,el,_),e) ->
-		sprintf "@%s%s %s" (Meta.to_string n) (match el with [] -> "" | _ -> "(" ^ (String.concat ", " (List.map Ast.s_expr el)) ^ ")") (loop e)
+		sprintf "@%s%s %s" (Meta.to_string n) (match el with [] -> "" | _ -> "(" ^ (String.concat ", " (List.map Ast.Printer.s_expr el)) ^ ")") (loop e)
+	| TIdent s ->
+		s
 
 let rec s_expr_ast print_var_ids tabs s_type e =
 	let sprintf = Printf.sprintf in
@@ -1189,35 +1411,36 @@ let rec s_expr_ast print_var_ids tabs s_type e =
 	in
 	let var_id v = if print_var_ids then v.v_id else 0 in
 	let const c t = tag "Const" ~t [s_const c] in
-	let local v = sprintf "[Local %s(%i):%s]" v.v_name (var_id v) (s_type v.v_type) in
+	let local v t = sprintf "[Local %s(%i):%s%s]" v.v_name (var_id v) (s_type v.v_type) (match t with None -> "" | Some t -> ":" ^ (s_type t)) in
 	let var v sl = sprintf "[Var %s(%i):%s]%s" v.v_name (var_id v) (s_type v.v_type) (tag_args tabs sl) in
 	let module_type mt = sprintf "[TypeExpr %s:%s]" (s_type_path (t_path mt)) (s_type e.etype) in
 	match e.eexpr with
 	| TConst c -> const c (Some e.etype)
-	| TLocal v -> local v
+	| TLocal v -> local v (Some e.etype)
 	| TArray (e1,e2) -> tag "Array" [loop e1; loop e2]
 	| TBinop (op,e1,e2) -> tag "Binop" [loop e1; s_binop op; loop e2]
 	| TUnop (op,flag,e1) -> tag "Unop" [s_unop op; if flag = Postfix then "Postfix" else "Prefix"; loop e1]
 	| TEnumParameter (e1,ef,i) -> tag "EnumParameter" [loop e1; ef.ef_name; string_of_int i]
+	| TEnumIndex e1 -> tag "EnumIndex" [loop e1]
 	| TField (e1,fa) ->
 		let sfa = match fa with
-			| FInstance(c,tl,cf) -> tag "FInstance" ~extra_tabs:"\t" [s_type (TInst(c,tl)); cf.cf_name]
-			| FStatic(c,cf) -> tag "FStatic" ~extra_tabs:"\t" [s_type_path c.cl_path; cf.cf_name]
-			| FClosure(co,cf) -> tag "FClosure" ~extra_tabs:"\t" [(match co with None -> "None" | Some (c,tl) -> s_type (TInst(c,tl))); cf.cf_name]
-			| FAnon cf -> tag "FAnon" ~extra_tabs:"\t" [cf.cf_name]
+			| FInstance(c,tl,cf) -> tag "FInstance" ~extra_tabs:"\t" [s_type (TInst(c,tl)); Printf.sprintf "%s:%s" cf.cf_name (s_type cf.cf_type)]
+			| FStatic(c,cf) -> tag "FStatic" ~extra_tabs:"\t" [s_type_path c.cl_path; Printf.sprintf "%s:%s" cf.cf_name (s_type cf.cf_type)]
+			| FClosure(co,cf) -> tag "FClosure" ~extra_tabs:"\t" [(match co with None -> "None" | Some (c,tl) -> s_type (TInst(c,tl))); Printf.sprintf "%s:%s" cf.cf_name (s_type cf.cf_type)]
+			| FAnon cf -> tag "FAnon" ~extra_tabs:"\t" [Printf.sprintf "%s:%s" cf.cf_name (s_type cf.cf_type)]
 			| FDynamic s -> tag "FDynamic" ~extra_tabs:"\t" [s]
 			| FEnum(en,ef) -> tag "FEnum" ~extra_tabs:"\t" [s_type_path en.e_path; ef.ef_name]
 		in
 		tag "Field" [loop e1; sfa]
 	| TTypeExpr mt -> module_type mt
 	| TParenthesis e1 -> tag "Parenthesis" [loop e1]
-	| TObjectDecl fl -> tag "ObjectDecl" (List.map (fun (s,e) -> sprintf "%s: %s" s (loop e)) fl)
+	| TObjectDecl fl -> tag "ObjectDecl" (List.map (fun ((s,_,qs),e) -> sprintf "%s: %s" (s_object_key_name s qs) (loop e)) fl)
 	| TArrayDecl el -> tag "ArrayDecl" (List.map loop el)
 	| TCall (e1,el) -> tag "Call" (loop e1 :: (List.map loop el))
 	| TNew (c,tl,el) -> tag "New" ((s_type (TInst(c,tl))) :: (List.map loop el))
 	| TFunction f ->
 		let arg (v,cto) =
-			tag "Arg" ~t:(Some v.v_type) ~extra_tabs:"\t" (match cto with None -> [local v] | Some ct -> [local v;const ct None])
+			tag "Arg" ~t:(Some v.v_type) ~extra_tabs:"\t" (match cto with None -> [local v None] | Some ct -> [local v None;loop ct])
 		in
 		tag "Function" ((List.map arg f.tf_args) @ [loop f.tf_expr])
 	| TVar (v,eo) -> var v (match eo with None -> [] | Some e -> [loop e])
@@ -1232,10 +1455,10 @@ let rec s_expr_ast print_var_ids tabs s_type e =
 	| TReturn (Some e1) -> tag "Return" [loop e1]
 	| TWhile (e1,e2,NormalWhile) -> tag "While" [loop e1; loop e2]
 	| TWhile (e1,e2,DoWhile) -> tag "Do" [loop e1; loop e2]
-	| TFor (v,e1,e2) -> tag "For" [local v; loop e1; loop e2]
+	| TFor (v,e1,e2) -> tag "For" [local v None; loop e1; loop e2]
 	| TTry (e1,catches) ->
 		let sl = List.map (fun (v,e) ->
-			sprintf "Catch %s%s" (local v) (tag_args (tabs ^ "\t") [loop ~extra_tabs:"\t" e]);
+			sprintf "Catch %s%s" (local v None) (tag_args (tabs ^ "\t") [loop ~extra_tabs:"\t" e]);
 		) catches in
 		tag "Try" ((loop e1) :: sl)
 	| TSwitch (e1,cases,eo) ->
@@ -1251,9 +1474,11 @@ let rec s_expr_ast print_var_ids tabs s_type e =
 		let s = Meta.to_string m in
 		let s = match el with
 			| [] -> s
-			| _ -> sprintf "%s(%s)" s (String.concat ", " (List.map Ast.s_expr el))
+			| _ -> sprintf "%s(%s)" s (String.concat ", " (List.map Ast.Printer.s_expr el))
 		in
 		tag "Meta" [s; loop e1]
+	| TIdent s ->
+		tag "Ident" [s]
 
 let s_types ?(sep = ", ") tl =
 	let pctx = print_context() in
@@ -1279,8 +1504,8 @@ let s_class_kind = function
 
 module Printer = struct
 
-	let s_type =
-		s_type (print_context())
+	let s_type t =
+		s_type (print_context()) t
 
 	let s_pair s1 s2 =
 		Printf.sprintf "(%s,%s)" s1 s2
@@ -1308,7 +1533,7 @@ module Printer = struct
 	let s_doc = s_opt (fun s -> s)
 
 	let s_metadata_entry (s,el,_) =
-		Printf.sprintf "@%s%s" (Meta.to_string s) (match el with [] -> "" | el -> "(" ^ (String.concat ", " (List.map Ast.s_expr el)) ^ ")")
+		Printf.sprintf "@%s%s" (Meta.to_string s) (match el with [] -> "" | el -> "(" ^ (String.concat ", " (List.map Ast.Printer.s_expr el)) ^ ")")
 
 	let s_metadata metadata =
 		s_list " " s_metadata_entry metadata
@@ -1329,7 +1554,6 @@ module Printer = struct
 			"cf_name",cf.cf_name;
 			"cf_doc",s_doc cf.cf_doc;
 			"cf_type",s_type_kind (follow cf.cf_type);
-			"cf_public",string_of_bool cf.cf_public;
 			"cf_pos",s_pos cf.cf_pos;
 			"cf_name_pos",s_pos cf.cf_name_pos;
 			"cf_meta",s_metadata cf.cf_meta;
@@ -1350,10 +1574,10 @@ module Printer = struct
 			"cl_params",s_type_params c.cl_params;
 			"cl_kind",s_class_kind c.cl_kind;
 			"cl_extern",string_of_bool c.cl_extern;
+			"cl_final",string_of_bool c.cl_final;
 			"cl_interface",string_of_bool c.cl_interface;
 			"cl_super",s_opt (fun (c,tl) -> s_type (TInst(c,tl))) c.cl_super;
 			"cl_implements",s_list ", " (fun (c,tl) -> s_type (TInst(c,tl))) c.cl_implements;
-			"cl_dynamic",s_opt s_type c.cl_dynamic;
 			"cl_array_access",s_opt s_type c.cl_array_access;
 			"cl_overrides",s_list "," (fun cf -> cf.cf_name) c.cl_overrides;
 			"cl_init",s_opt (s_expr_ast true "" s_type) c.cl_init;
@@ -1422,7 +1646,8 @@ module Printer = struct
 			"a_from_field",s_list ", " (fun (t,cf) -> Printf.sprintf "%s: %s" (s_type_kind t) cf.cf_name) a.a_from_field;
 			"a_to_field",s_list ", " (fun (t,cf) -> Printf.sprintf "%s: %s" (s_type_kind t) cf.cf_name) a.a_to_field;
 			"a_array",s_list ", " (fun cf -> cf.cf_name) a.a_array;
-			"a_resolve",s_opt (fun cf -> cf.cf_name) a.a_resolve;
+			"a_read",s_opt (fun cf -> cf.cf_name) a.a_read;
+			"a_write",s_opt (fun cf -> cf.cf_name) a.a_write;
 		]
 
 	let s_tvar_extra (tl,eo) =
@@ -1442,7 +1667,6 @@ module Printer = struct
 		| MCode -> "MCode"
 		| MMacro -> "MMacro"
 		| MFake -> "MFake"
-		| MSub -> "MSub"
 		| MExtern -> "MExtern"
 		| MImport -> "MImport"
 
@@ -1451,14 +1675,13 @@ module Printer = struct
 			"m_file",me.m_file;
 			"m_sign",me.m_sign;
 			"m_time",string_of_float me.m_time;
-			"m_dirty",s_opt (fun m -> s_type_path m.m_path) me.m_dirty;
+			"m_dirty",s_opt s_type_path me.m_dirty;
 			"m_added",string_of_int me.m_added;
 			"m_mark",string_of_int me.m_mark;
 			"m_deps",s_pmap string_of_int (fun m -> snd m.m_path) me.m_deps;
 			"m_processed",string_of_int me.m_processed;
 			"m_kind",s_module_kind me.m_kind;
 			"m_binded_res",""; (* TODO *)
-			"m_macro_calls",String.concat ", " me.m_macro_calls;
 			"m_if_feature",""; (* TODO *)
 			"m_features",""; (* TODO *)
 		]
@@ -1484,6 +1707,7 @@ module Printer = struct
 		| HPrivate -> "HPrivate"
 		| HExtends tp -> "HExtends " ^ (s_type_path (fst tp))
 		| HImplements tp -> "HImplements " ^ (s_type_path (fst tp))
+		| HFinal -> "HFinal"
 
 	let s_placed f (x,p) =
 		s_pair (f x) (s_pos p)
@@ -1494,7 +1718,7 @@ module Printer = struct
 			"cff_doc",s_opt (fun s -> s) cff.cff_doc;
 			"cff_pos",s_pos cff.cff_pos;
 			"cff_meta",s_metadata cff.cff_meta;
-			"cff_access",s_list ", " Ast.s_access cff.cff_access;
+			"cff_access",s_list ", " Ast.s_placed_access cff.cff_access;
 		]
 end
 
@@ -1516,7 +1740,7 @@ let rec link e a b =
 			else
 				loop t2
 		| TLazy f ->
-			loop (!f())
+			loop (lazy_type f)
 		| TAnon a ->
 			try
 				PMap.iter (fun _ f -> if loop f.cf_type then raise Exit) a.a_fields;
@@ -1534,47 +1758,92 @@ let rec link e a b =
 		true
 	end
 
+let would_produce_recursive_anon field_acceptor field_donor =
+	try
+		(match !(field_acceptor.a_status) with
+		| Opened ->
+			PMap.iter (fun n field ->
+				match follow field.cf_type with
+				| TAnon a when field_acceptor == a -> raise Exit
+				| _ -> ()
+			) field_donor.a_fields;
+		| _ -> ());
+		false
+	with Exit -> true
+
 let link_dynamic a b = match follow a,follow b with
 	| TMono r,TDynamic _ -> r := Some b
 	| TDynamic _,TMono r -> r := Some a
 	| _ -> ()
 
-let rec fast_eq a b =
+let fast_eq_check type_param_check a b =
 	if a == b then
 		true
 	else match a , b with
 	| TFun (l1,r1) , TFun (l2,r2) when List.length l1 = List.length l2 ->
-		List.for_all2 (fun (_,_,t1) (_,_,t2) -> fast_eq t1 t2) l1 l2 && fast_eq r1 r2
+		List.for_all2 (fun (_,_,t1) (_,_,t2) -> type_param_check t1 t2) l1 l2 && type_param_check r1 r2
 	| TType (t1,l1), TType (t2,l2) ->
-		t1 == t2 && List.for_all2 fast_eq l1 l2
+		t1 == t2 && List.for_all2 type_param_check l1 l2
 	| TEnum (e1,l1), TEnum (e2,l2) ->
-		e1 == e2 && List.for_all2 fast_eq l1 l2
+		e1 == e2 && List.for_all2 type_param_check l1 l2
 	| TInst (c1,l1), TInst (c2,l2) ->
-		c1 == c2 && List.for_all2 fast_eq l1 l2
+		c1 == c2 && List.for_all2 type_param_check l1 l2
 	| TAbstract (a1,l1), TAbstract (a2,l2) ->
-		a1 == a2 && List.for_all2 fast_eq l1 l2
+		a1 == a2 && List.for_all2 type_param_check l1 l2
 	| _ , _ ->
 		false
 
+let rec fast_eq a b = fast_eq_check fast_eq a b
+
 let rec fast_eq_mono ml a b =
-	if a == b then
+	if fast_eq_check (fast_eq_mono ml) a b then
 		true
 	else match a , b with
-	| TFun (l1,r1) , TFun (l2,r2) when List.length l1 = List.length l2 ->
-		List.for_all2 (fun (_,_,t1) (_,_,t2) -> fast_eq_mono ml t1 t2) l1 l2 && fast_eq_mono ml r1 r2
-	| TType (t1,l1), TType (t2,l2) ->
-		t1 == t2 && List.for_all2 (fast_eq_mono ml) l1 l2
-	| TEnum (e1,l1), TEnum (e2,l2) ->
-		e1 == e2 && List.for_all2 (fast_eq_mono ml) l1 l2
-	| TInst (c1,l1), TInst (c2,l2) ->
-		c1 == c2 && List.for_all2 (fast_eq_mono ml) l1 l2
-	| TAbstract (a1,l1), TAbstract (a2,l2) ->
-		a1 == a2 && List.for_all2 (fast_eq_mono ml) l1 l2
 	| TMono _, _ ->
 		List.memq a ml
 	| _ , _ ->
 		false
 
+let rec shallow_eq a b =
+	a == b
+	|| begin
+		let a = follow a
+		and b = follow b in
+		fast_eq_check shallow_eq a b
+		|| match a , b with
+			| t, TMono { contents = None } when t == t_dynamic -> true
+			| TMono { contents = None }, t when t == t_dynamic -> true
+			| TMono { contents = None }, TMono { contents = None } -> true
+			| TAnon a1, TAnon a2 ->
+				let fields_eq() =
+					let rec loop fields1 fields2 =
+						match fields1, fields2 with
+						| [], [] -> true
+						| _, [] | [], _ -> false
+						| f1 :: rest1, f2 :: rest2 ->
+							f1.cf_name = f2.cf_name
+							&& (try shallow_eq f1.cf_type f2.cf_type with Not_found -> false)
+							&& loop rest1 rest2
+					in
+					let fields1 = PMap.fold (fun field fields -> field :: fields) a1.a_fields []
+					and fields2 = PMap.fold (fun field fields -> field :: fields) a2.a_fields []
+					and sort_compare f1 f2 = compare f1.cf_name f2.cf_name in
+					loop (List.sort sort_compare fields1) (List.sort sort_compare fields2)
+				in
+				(match !(a2.a_status), !(a1.a_status) with
+				| Statics c, Statics c2 -> c == c2
+				| EnumStatics e, EnumStatics e2 -> e == e2
+				| AbstractStatics a, AbstractStatics a2 -> a == a2
+				| Extend tl1, Extend tl2 -> fields_eq() && List.for_all2 shallow_eq tl1 tl2
+				| Closed, Closed -> fields_eq()
+				| Opened, Opened -> fields_eq()
+				| Const, Const -> fields_eq()
+				| _ -> false
+				)
+			| _ , _ ->
+				false
+	end
+
 (* perform unification with subtyping.
    the first type is always the most down in the class hierarchy
    it's also the one that is pointed by the position.
@@ -1590,9 +1859,12 @@ type unify_error =
 	| Invalid_visibility of string
 	| Not_matching_optional of string
 	| Cant_force_optional
-	| Invariant_parameter of t * t
+	| Invariant_parameter of int
 	| Constraint_failure of string
 	| Missing_overload of tclass_field * t
+	| FinalInvariance (* nice band name *)
+	| Invalid_function_argument of int (* index *) * int (* total *)
+	| Invalid_return_type
 	| Unify_custom of string
 
 exception Unify_error of unify_error list
@@ -1618,7 +1890,7 @@ let unify_access a1 a2 =
 	| _ -> false
 
 let direct_access = function
-	| AccNo | AccNever | AccNormal | AccInline | AccRequire _ -> true
+	| AccNo | AccNever | AccNormal | AccInline | AccRequire _ | AccCtor -> true
 	| AccResolve | AccCall -> false
 
 let unify_kind k1 k2 =
@@ -1643,7 +1915,59 @@ let unify_kind k1 k2 =
 			| MethDynamic, MethNormal -> true
 			| _ -> false
 
-let eq_stack = ref []
+type 'a rec_stack = {
+	mutable rec_stack : 'a list;
+}
+
+let new_rec_stack() = { rec_stack = [] }
+let rec_stack_exists f s = List.exists f s.rec_stack
+let rec_stack_memq v s = List.memq v s.rec_stack
+let rec_stack_loop stack value f arg =
+	stack.rec_stack <- value :: stack.rec_stack;
+	try
+		let r = f arg in
+		stack.rec_stack <- List.tl stack.rec_stack;
+		r
+	with e ->
+		stack.rec_stack <- List.tl stack.rec_stack;
+		raise e
+
+let eq_stack = new_rec_stack()
+
+let rec_stack stack value fcheck frun ferror =
+	if not (rec_stack_exists fcheck stack) then begin
+		try
+			stack.rec_stack <- value :: stack.rec_stack;
+			let v = frun() in
+			stack.rec_stack <- List.tl stack.rec_stack;
+			v
+		with
+			Unify_error l ->
+				stack.rec_stack <- List.tl stack.rec_stack;
+				ferror l
+			| e ->
+				stack.rec_stack <- List.tl stack.rec_stack;
+				raise e
+	end
+
+let rec_stack_default stack value fcheck frun def =
+	if not (rec_stack_exists fcheck stack) then rec_stack_loop stack value frun () else def
+
+let rec_stack_bool stack value fcheck frun =
+	if (rec_stack_exists fcheck stack) then false else begin
+		try
+			stack.rec_stack <- value :: stack.rec_stack;
+			frun();
+			stack.rec_stack <- List.tl stack.rec_stack;
+			true
+		with
+			Unify_error l ->
+				stack.rec_stack <- List.tl stack.rec_stack;
+				false
+			| e ->
+				stack.rec_stack <- List.tl stack.rec_stack;
+				raise e
+	end
 
 type eq_kind =
 	| EqStrict
@@ -1661,8 +1985,8 @@ let rec type_eq param a b =
 	if a == b then
 		()
 	else match a , b with
-	| TLazy f , _ -> type_eq param (!f()) b
-	| _ , TLazy f -> type_eq param a (!f())
+	| TLazy f , _ -> type_eq param (lazy_type f) b
+	| _ , TLazy f -> type_eq param a (lazy_type f)
 	| TMono t , _ ->
 		(match !t with
 		| None -> if param = EqCoreType || not (link t a b) then error [cannot_unify a b]
@@ -1671,60 +1995,62 @@ let rec type_eq param a b =
 		(match !t with
 		| None -> if param = EqCoreType || not (link t b a) then error [cannot_unify a b]
 		| Some t -> type_eq param a t)
+	| TAbstract ({a_path=[],"Null"},[t1]),TAbstract ({a_path=[],"Null"},[t2]) ->
+		type_eq param t1 t2
+	| TAbstract ({a_path=[],"Null"},[t]),_ when param <> EqDoNotFollowNull ->
+		type_eq param t b
+	| _,TAbstract ({a_path=[],"Null"},[t]) when param <> EqDoNotFollowNull ->
+		type_eq param a t
 	| TType (t1,tl1), TType (t2,tl2) when (t1 == t2 || (param = EqCoreType && t1.t_path = t2.t_path)) && List.length tl1 = List.length tl2 ->
-		List.iter2 (type_eq param) tl1 tl2
+		type_eq_params param a b tl1 tl2
 	| TType (t,tl) , _ when can_follow a ->
 		type_eq param (apply_params t.t_params tl t.t_type) b
 	| _ , TType (t,tl) when can_follow b ->
-		if List.exists (fun (a2,b2) -> fast_eq a a2 && fast_eq b b2) (!eq_stack) then
-			()
-		else begin
-			eq_stack := (a,b) :: !eq_stack;
-			try
-				type_eq param a (apply_params t.t_params tl t.t_type);
-				eq_stack := List.tl !eq_stack;
-			with
-				Unify_error l ->
-					eq_stack := List.tl !eq_stack;
-					error (cannot_unify a b :: l)
-		end
+		rec_stack eq_stack (a,b)
+			(fun (a2,b2) -> fast_eq a a2 && fast_eq b b2)
+			(fun() -> type_eq param a (apply_params t.t_params tl t.t_type))
+			(fun l -> error (cannot_unify a b :: l))
 	| TEnum (e1,tl1) , TEnum (e2,tl2) ->
 		if e1 != e2 && not (param = EqCoreType && e1.e_path = e2.e_path) then error [cannot_unify a b];
-		List.iter2 (type_eq param) tl1 tl2
+		type_eq_params param a b tl1 tl2
 	| TInst (c1,tl1) , TInst (c2,tl2) ->
 		if c1 != c2 && not (param = EqCoreType && c1.cl_path = c2.cl_path) && (match c1.cl_kind, c2.cl_kind with KExpr _, KExpr _ -> false | _ -> true) then error [cannot_unify a b];
-		List.iter2 (type_eq param) tl1 tl2
+		type_eq_params param a b tl1 tl2
 	| TFun (l1,r1) , TFun (l2,r2) when List.length l1 = List.length l2 ->
+		let i = ref 0 in
 		(try
 			type_eq param r1 r2;
 			List.iter2 (fun (n,o1,t1) (_,o2,t2) ->
+				incr i;
 				if o1 <> o2 then error [Not_matching_optional n];
 				type_eq param t1 t2
 			) l1 l2
 		with
-			Unify_error l -> error (cannot_unify a b :: l))
+			Unify_error l ->
+				let msg = if !i = 0 then Invalid_return_type else Invalid_function_argument(!i,List.length l1) in
+				error (cannot_unify a b :: msg :: l)
+		)
 	| TDynamic a , TDynamic b ->
 		type_eq param a b
 	| TAbstract (a1,tl1) , TAbstract (a2,tl2) ->
 		if a1 != a2 && not (param = EqCoreType && a1.a_path = a2.a_path) then error [cannot_unify a b];
-		List.iter2 (type_eq param) tl1 tl2
+		type_eq_params param a b tl1 tl2
 	| TAnon a1, TAnon a2 ->
 		(try
+			(match !(a2.a_status) with
+			| Statics c -> (match !(a1.a_status) with Statics c2 when c == c2 -> () | _ -> error [])
+			| EnumStatics e -> (match !(a1.a_status) with EnumStatics e2 when e == e2 -> () | _ -> error [])
+			| AbstractStatics a -> (match !(a1.a_status) with AbstractStatics a2 when a == a2 -> () | _ -> error [])
+			| _ -> ()
+			);
+			if would_produce_recursive_anon a1 a2 || would_produce_recursive_anon a2 a1 then error [cannot_unify a b];
 			PMap.iter (fun n f1 ->
 				try
 					let f2 = PMap.find n a2.a_fields in
 					if f1.cf_kind <> f2.cf_kind && (param = EqStrict || param = EqCoreType || not (unify_kind f1.cf_kind f2.cf_kind)) then error [invalid_kind n f1.cf_kind f2.cf_kind];
 					let a = f1.cf_type and b = f2.cf_type in
-					if not (List.exists (fun (a2,b2) -> fast_eq a a2 && fast_eq b b2) (!eq_stack)) then begin
-						eq_stack := (a,b) :: !eq_stack;
-						try
-							type_eq param a b;
-							eq_stack := List.tl !eq_stack;
-						with
-							Unify_error l ->
-								eq_stack := List.tl !eq_stack;
-								error (invalid_field n :: l)
-					end;
+					(try type_eq param a b with Unify_error l -> error (invalid_field n :: l));
+					if (has_class_field_flag f1 CfPublic) != (has_class_field_flag f2 CfPublic) then error [invalid_visibility n];
 				with
 					Not_found ->
 						if is_closed a2 then error [has_no_field b n];
@@ -1748,6 +2074,17 @@ let rec type_eq param a b =
 		else
 			error [cannot_unify a b]
 
+and type_eq_params param a b tl1 tl2 =
+	let i = ref 0 in
+	List.iter2 (fun t1 t2 ->
+		incr i;
+		try
+			type_eq param t1 t2
+		with Unify_error l ->
+			let err = cannot_unify a b in
+			error (err :: (Invariant_parameter !i) :: l)
+		) tl1 tl2
+
 let type_iseq a b =
 	try
 		type_eq EqStrict a b;
@@ -1762,26 +2099,26 @@ let type_iseq_strict a b =
 	with Unify_error _ ->
 		false
 
-let unify_stack = ref []
-let abstract_cast_stack = ref []
-let unify_new_monos = ref []
+let unify_stack = new_rec_stack()
+let abstract_cast_stack = new_rec_stack()
+let unify_new_monos = new_rec_stack()
 
 let print_stacks() =
 	let ctx = print_context() in
 	let st = s_type ctx in
 	print_endline "unify_stack";
-	List.iter (fun (a,b) -> Printf.printf "\t%s , %s\n" (st a) (st b)) !unify_stack;
+	List.iter (fun (a,b) -> Printf.printf "\t%s , %s\n" (st a) (st b)) unify_stack.rec_stack;
 	print_endline "monos";
-	List.iter (fun m -> print_endline ("\t" ^ st m)) !unify_new_monos;
+	List.iter (fun m -> print_endline ("\t" ^ st m)) unify_new_monos.rec_stack;
 	print_endline "abstract_cast_stack";
-	List.iter (fun (a,b) -> Printf.printf "\t%s , %s\n" (st a) (st b)) !abstract_cast_stack
+	List.iter (fun (a,b) -> Printf.printf "\t%s , %s\n" (st a) (st b)) abstract_cast_stack.rec_stack
 
 let rec unify a b =
 	if a == b then
 		()
 	else match a, b with
-	| TLazy f , _ -> unify (!f()) b
-	| _ , TLazy f -> unify a (!f())
+	| TLazy f , _ -> unify (lazy_type f) b
+	| _ , TLazy f -> unify a (lazy_type f)
 	| TMono t , _ ->
 		(match !t with
 		| None -> if not (link t a b) then error [cannot_unify a b]
@@ -1791,30 +2128,24 @@ let rec unify a b =
 		| None -> if not (link t b a) then error [cannot_unify a b]
 		| Some t -> unify a t)
 	| TType (t,tl) , _ ->
-		if not (List.exists (fun (a2,b2) -> fast_eq a a2 && fast_eq b b2) (!unify_stack)) then begin
-			try
-				unify_stack := (a,b) :: !unify_stack;
-				unify (apply_params t.t_params tl t.t_type) b;
-				unify_stack := List.tl !unify_stack;
-			with
-				Unify_error l ->
-					unify_stack := List.tl !unify_stack;
-					error (cannot_unify a b :: l)
-		end
+		rec_stack unify_stack (a,b)
+			(fun(a2,b2) -> fast_eq a a2 && fast_eq b b2)
+			(fun() -> try_apply_params_rec t.t_params tl t.t_type (fun a -> unify a b))
+			(fun l -> error (cannot_unify a b :: l))
 	| _ , TType (t,tl) ->
-		if not (List.exists (fun (a2,b2) -> fast_eq a a2 && fast_eq b b2) (!unify_stack)) then begin
-			try
-				unify_stack := (a,b) :: !unify_stack;
-				unify a (apply_params t.t_params tl t.t_type);
-				unify_stack := List.tl !unify_stack;
-			with
-				Unify_error l ->
-					unify_stack := List.tl !unify_stack;
-					error (cannot_unify a b :: l)
-		end
+		rec_stack unify_stack (a,b)
+			(fun(a2,b2) -> fast_eq a a2 && fast_eq b b2)
+			(fun() -> try_apply_params_rec t.t_params tl t.t_type (unify a))
+			(fun l -> error (cannot_unify a b :: l))
 	| TEnum (ea,tl1) , TEnum (eb,tl2) ->
 		if ea != eb then error [cannot_unify a b];
 		unify_type_params a b tl1 tl2
+	| TAbstract ({a_path=[],"Null"},[t]),_ ->
+		begin try unify t b
+		with Unify_error l -> error (cannot_unify a b :: l) end
+	| _,TAbstract ({a_path=[],"Null"},[t]) ->
+		begin try unify a t
+		with Unify_error l -> error (cannot_unify a b :: l) end
 	| TAbstract (a1,tl1) , TAbstract (a2,tl2) when a1 == a2 ->
 		begin try
 			unify_type_params a b tl1 tl2
@@ -1856,7 +2187,7 @@ let rec unify a b =
 	| TFun (l1,r1) , TFun (l2,r2) when List.length l1 = List.length l2 ->
 		let i = ref 0 in
 		(try
-			(match r2 with
+			(match follow r2 with
 			| TAbstract ({a_path=[],"Void"},_) -> incr i
 			| _ -> unify r1 r2; incr i);
 			List.iter2 (fun (_,o1,t1) (_,o2,t2) ->
@@ -1866,8 +2197,8 @@ let rec unify a b =
 			) l2 l1 (* contravariance *)
 		with
 			Unify_error l ->
-				let msg = if !i = 0 then "Cannot unify return types" else "Cannot unify argument " ^ (string_of_int !i) in
-				error (cannot_unify a b :: Unify_custom msg :: l))
+				let msg = if !i = 0 then Invalid_return_type else Invalid_function_argument(!i,List.length l1) in
+				error (cannot_unify a b :: msg :: l))
 	| TInst (c,tl) , TAnon an ->
 		if PMap.is_empty an.a_fields then (match c.cl_kind with
 			| KTypeParameter pl ->
@@ -1892,45 +2223,31 @@ let rec unify a b =
 				let _, ft, f1 = (try raw_class_field make_type c tl n with Not_found -> error [has_no_field a n]) in
 				let ft = apply_params c.cl_params tl ft in
 				if not (unify_kind f1.cf_kind f2.cf_kind) then error [invalid_kind n f1.cf_kind f2.cf_kind];
-				if f2.cf_public && not f1.cf_public then error [invalid_visibility n];
+				if (has_class_field_flag f2 CfPublic) && not (has_class_field_flag f1 CfPublic) then error [invalid_visibility n];
 
 				(match f2.cf_kind with
 				| Var { v_read = AccNo } | Var { v_read = AccNever } ->
 					(* we will do a recursive unification, so let's check for possible recursion *)
-					let old_monos = !unify_new_monos in
-					unify_new_monos := !monos @ !unify_new_monos;
-					if not (List.exists (fun (a2,b2) -> fast_eq b2 f2.cf_type && fast_eq_mono !unify_new_monos ft a2) (!unify_stack)) then begin
-						unify_stack := (ft,f2.cf_type) :: !unify_stack;
-						(try
-							unify_with_access ft f2
-						with
-							Unify_error l ->
-								unify_new_monos := old_monos;
-								unify_stack := List.tl !unify_stack;
-								error (invalid_field n :: l));
-						unify_stack := List.tl !unify_stack;
-					end;
-					unify_new_monos := old_monos;
+					let old_monos = unify_new_monos.rec_stack in
+					unify_new_monos.rec_stack <- !monos @ unify_new_monos.rec_stack;
+					rec_stack unify_stack (ft,f2.cf_type)
+						(fun (a2,b2) -> fast_eq b2 f2.cf_type && fast_eq_mono unify_new_monos.rec_stack ft a2)
+						(fun() -> try unify_with_access f1 ft f2 with e -> unify_new_monos.rec_stack <- old_monos; raise e)
+						(fun l -> error (invalid_field n :: l));
+					unify_new_monos.rec_stack <- old_monos;
 				| Method MethNormal | Method MethInline | Var { v_write = AccNo } | Var { v_write = AccNever } ->
 					(* same as before, but unification is reversed (read-only var) *)
-					let old_monos = !unify_new_monos in
-					unify_new_monos := !monos @ !unify_new_monos;
-					if not (List.exists (fun (a2,b2) -> fast_eq b2 ft && fast_eq_mono !unify_new_monos f2.cf_type a2) (!unify_stack)) then begin
-						unify_stack := (f2.cf_type,ft) :: !unify_stack;
-						(try
-							unify_with_access ft f2
-						with
-							Unify_error l ->
-								unify_new_monos := old_monos;
-								unify_stack := List.tl !unify_stack;
-								error (invalid_field n :: l));
-						unify_stack := List.tl !unify_stack;
-					end;
-					unify_new_monos := old_monos;
+					let old_monos = unify_new_monos.rec_stack in
+					unify_new_monos.rec_stack <- !monos @ unify_new_monos.rec_stack;
+					rec_stack unify_stack (f2.cf_type,ft)
+						(fun(a2,b2) -> fast_eq_mono unify_new_monos.rec_stack b2 ft && fast_eq f2.cf_type a2)
+						(fun() -> try unify_with_access f1 ft f2 with e -> unify_new_monos.rec_stack <- old_monos; raise e)
+						(fun l -> error (invalid_field n :: l));
+					unify_new_monos.rec_stack <- old_monos;
 				| _ ->
 					(* will use fast_eq, which have its own stack *)
 					try
-						unify_with_access ft f2
+						unify_with_access f1 ft f2
 					with
 						Unify_error l ->
 							error (invalid_field n :: l));
@@ -1940,10 +2257,25 @@ let rec unify a b =
 					then error [Missing_overload (f1, f2o.cf_type)]
 				) f2.cf_overloads;
 				(* we mark the field as :?used because it might be used through the structure *)
-				if not (Meta.has Meta.MaybeUsed f1.cf_meta) then f1.cf_meta <- (Meta.MaybeUsed,[],f1.cf_pos) :: f1.cf_meta;
+				if not (Meta.has Meta.MaybeUsed f1.cf_meta) then begin
+					f1.cf_meta <- (Meta.MaybeUsed,[],f1.cf_pos) :: f1.cf_meta;
+					match f2.cf_kind with
+					| Var vk ->
+						let check name =
+							try
+								let _,_,cf = raw_class_field make_type c tl name in
+								if not (Meta.has Meta.MaybeUsed cf.cf_meta) then
+									cf.cf_meta <- (Meta.MaybeUsed,[],f1.cf_pos) :: cf.cf_meta
+							with Not_found ->
+								()
+						in
+						(match vk.v_read with AccCall -> check ("get_" ^ f1.cf_name) | _ -> ());
+						(match vk.v_write with AccCall -> check ("set_" ^ f1.cf_name) | _ -> ());
+					| _ -> ()
+				end;
 				(match f1.cf_kind with
 				| Method MethInline ->
-					if (c.cl_extern || Meta.has Meta.Extern f1.cf_meta) && not (Meta.has Meta.Runtime f1.cf_meta) then error [Has_no_runtime_field (a,n)];
+					if (c.cl_extern || has_class_field_flag f1 CfExtern) && not (Meta.has Meta.Runtime f1.cf_meta) then error [Has_no_runtime_field (a,n)];
 				| _ -> ());
 			) an.a_fields;
 			(match !(an.a_status) with
@@ -1976,8 +2308,8 @@ let rec unify a b =
 					if not (List.exists (fun t -> match follow t with TAbstract({a_path = ["haxe"],"Constructible"},[t2]) -> type_iseq t1 t2 | _ -> false) tl) then error [cannot_unify a b]
 				| _ ->
 					let _,t,cf = class_field c tl "new" in
-					if not cf.cf_public then error [invalid_visibility "new"];
-					begin try unify t1 t
+					if not (has_class_field_flag cf CfPublic) then error [invalid_visibility "new"];
+					begin try unify t t1
 					with Unify_error l -> error (cannot_unify a b :: l) end
 			end
 		with Not_found ->
@@ -2050,6 +2382,7 @@ and unify_abstracts a b a1 tl1 a2 tl2 =
 			error [cannot_unify a b]
 
 and unify_anons a b a1 a2 =
+	if would_produce_recursive_anon a1 a2 then error [cannot_unify a b];
 	(try
 		PMap.iter (fun n f2 ->
 		try
@@ -2059,9 +2392,13 @@ and unify_anons a b a1 a2 =
 				| Opened, Var { v_read = AccNormal; v_write = AccNo }, Var { v_read = AccNormal; v_write = AccNormal } ->
 					f1.cf_kind <- f2.cf_kind;
 				| _ -> error [invalid_kind n f1.cf_kind f2.cf_kind]);
-			if f2.cf_public && not f1.cf_public then error [invalid_visibility n];
+			if (has_class_field_flag f2 CfPublic) && not (has_class_field_flag f1 CfPublic) then error [invalid_visibility n];
 			try
-				unify_with_access f1.cf_type f2;
+				let f1_type =
+					if fast_eq f1.cf_type f2.cf_type then f1.cf_type
+					else field_type f1
+				in
+				unify_with_access f1 f1_type f2;
 				(match !(a1.a_status) with
 				| Statics c when not (Meta.has Meta.MaybeUsed f1.cf_meta) -> f1.cf_meta <- (Meta.MaybeUsed,[],f1.cf_pos) :: f1.cf_meta
 				| _ -> ());
@@ -2094,19 +2431,12 @@ and unify_anons a b a1 a2 =
 		Unify_error l -> error (cannot_unify a b :: l))
 
 and unify_from ab tl a b ?(allow_transitive_cast=true) t =
-	if (List.exists (fun (a2,b2) -> fast_eq a a2 && fast_eq b b2) (!abstract_cast_stack)) then false else begin
-	abstract_cast_stack := (a,b) :: !abstract_cast_stack;
-	let t = apply_params ab.a_params tl t in
-	let unify_func = if allow_transitive_cast then unify else type_eq EqStrict in
-	let b = try
-		unify_func a t;
-		true
-	with Unify_error _ ->
-		false
-	in
-	abstract_cast_stack := List.tl !abstract_cast_stack;
-	b
-	end
+	rec_stack_bool abstract_cast_stack (a,b)
+		(fun (a2,b2) -> fast_eq a a2 && fast_eq b b2)
+		(fun() ->
+			let t = apply_params ab.a_params tl t in
+			let unify_func = if allow_transitive_cast then unify else type_eq EqRightDynamic in
+			unify_func a t)
 
 and unify_to ab tl b ?(allow_transitive_cast=true) t =
 	let t = apply_params ab.a_params tl t in
@@ -2118,11 +2448,11 @@ and unify_to ab tl b ?(allow_transitive_cast=true) t =
 		false
 
 and unify_from_field ab tl a b ?(allow_transitive_cast=true) (t,cf) =
-	if (List.exists (fun (a2,b2) -> fast_eq a a2 && fast_eq b b2) (!abstract_cast_stack)) then false else begin
-	abstract_cast_stack := (a,b) :: !abstract_cast_stack;
-	let unify_func = if allow_transitive_cast then unify else type_eq EqStrict in
-	let b = try
-		begin match follow cf.cf_type with
+	rec_stack_bool abstract_cast_stack (a,b)
+		(fun (a2,b2) -> fast_eq a a2 && fast_eq b b2)
+		(fun() ->
+			let unify_func = if allow_transitive_cast then unify else type_eq EqStrict in
+			match follow cf.cf_type with
 			| TFun(_,r) ->
 				let monos = List.map (fun _ -> mk_mono()) cf.cf_params in
 				let map t = apply_params ab.a_params tl (apply_params cf.cf_params monos t) in
@@ -2133,22 +2463,16 @@ and unify_from_field ab tl a b ?(allow_transitive_cast=true) (t,cf) =
 					| _ -> ()
 				) monos cf.cf_params;
 				unify_func (map r) b;
-			| _ -> assert false
-		end;
-		true
-	with Unify_error _ -> false
-	in
-	abstract_cast_stack := List.tl !abstract_cast_stack;
-	b
-	end
+				true
+			| _ -> assert false)
 
 and unify_to_field ab tl b ?(allow_transitive_cast=true) (t,cf) =
 	let a = TAbstract(ab,tl) in
-	if (List.exists (fun (b2,a2) -> fast_eq a a2 && fast_eq b b2) (!abstract_cast_stack)) then false else begin
-	abstract_cast_stack := (b,a) :: !abstract_cast_stack;
-	let unify_func = if allow_transitive_cast then unify else type_eq EqStrict in
-	let r = try
-		begin match follow cf.cf_type with
+	rec_stack_bool abstract_cast_stack (b,a)
+		(fun (b2,a2) -> fast_eq a a2 && fast_eq b b2)
+		(fun() ->
+			let unify_func = if allow_transitive_cast then unify else type_eq EqStrict in
+			match follow cf.cf_type with
 			| TFun((_,_,ta) :: _,_) ->
 				let monos = List.map (fun _ -> mk_mono()) cf.cf_params in
 				let map t = apply_params ab.a_params tl (apply_params cf.cf_params monos t) in
@@ -2163,14 +2487,7 @@ and unify_to_field ab tl b ?(allow_transitive_cast=true) (t,cf) =
 					| _ -> ()
 				) monos cf.cf_params;
 				unify_func (map t) b;
-			| _ -> assert false
-		end;
-		true
-	with Unify_error _ -> false
-	in
-	abstract_cast_stack := List.tl !abstract_cast_stack;
-	r
-	end
+			| _ -> assert false)
 
 and unify_with_variance f t1 t2 =
 	let allows_variance_to t tf = type_iseq tf t in
@@ -2195,18 +2512,23 @@ and unify_with_variance f t1 t2 =
 	| t,TAbstract(a,pl) ->
 		type_eq EqBothDynamic t (apply_params a.a_params pl a.a_this);
 		if not (List.exists (fun t2 -> allows_variance_to t (apply_params a.a_params pl t2)) a.a_from) then error [cannot_unify t1 t2]
-	| TAnon a1,TAnon a2 ->
-		unify_anons t1 t2 a1 a2
+	| (TAnon a1 as t1), (TAnon a2 as t2) ->
+		rec_stack unify_stack (t1,t2)
+			(fun (a,b) -> fast_eq a t1 && fast_eq b t2)
+			(fun() -> unify_anons t1 t2 a1 a2)
+			(fun l -> error l)
 	| _ ->
 		error [cannot_unify t1 t2]
 
 and unify_type_params a b tl1 tl2 =
+	let i = ref 0 in
 	List.iter2 (fun t1 t2 ->
+		incr i;
 		try
 			with_variance (type_eq EqRightDynamic) t1 t2
 		with Unify_error l ->
 			let err = cannot_unify a b in
-			error (err :: (Invariant_parameter (t1,t2)) :: l)
+			error (err :: (Invariant_parameter !i) :: l)
 	) tl1 tl2
 
 and with_variance f t1 t2 =
@@ -2217,15 +2539,24 @@ and with_variance f t1 t2 =
 	with Unify_error _ ->
 		raise (Unify_error l)
 
-and unify_with_access t1 f2 =
+and unify_with_access f1 t1 f2 =
 	match f2.cf_kind with
 	(* write only *)
 	| Var { v_read = AccNo } | Var { v_read = AccNever } -> unify f2.cf_type t1
 	(* read only *)
-	| Method MethNormal | Method MethInline | Var { v_write = AccNo } | Var { v_write = AccNever } -> unify t1 f2.cf_type
+	| Method MethNormal | Method MethInline | Var { v_write = AccNo } | Var { v_write = AccNever } ->
+		if (has_class_field_flag f1 CfFinal) <> (has_class_field_flag f2 CfFinal) then raise (Unify_error [FinalInvariance]);
+		unify t1 f2.cf_type
 	(* read/write *)
 	| _ -> with_variance (type_eq EqBothDynamic) t1 f2.cf_type
 
+let does_unify a b =
+	try
+		unify a b;
+		true
+	with Unify_error _ ->
+		false
+
 (* ======= Mapping and iterating ======= *)
 
 let iter f e =
@@ -2234,7 +2565,8 @@ let iter f e =
 	| TLocal _
 	| TBreak
 	| TContinue
-	| TTypeExpr _ ->
+	| TTypeExpr _
+	| TIdent _ ->
 		()
 	| TArray (e1,e2)
 	| TBinop (_,e1,e2)
@@ -2245,6 +2577,7 @@ let iter f e =
 	| TThrow e
 	| TField (e,_)
 	| TEnumParameter (e,_,_)
+	| TEnumIndex e
 	| TParenthesis e
 	| TCast (e,_)
 	| TUnop (_,_,e)
@@ -2277,13 +2610,47 @@ let iter f e =
 	| TReturn eo ->
 		(match eo with None -> () | Some e -> f e)
 
+(**
+	Returns `true` if `predicate` is evaluated to `true` for at least one of sub-expressions.
+	Returns `false` otherwise.
+	Does not evaluate `predicate` for the `e` expression.
+*)
+let check_expr predicate e =
+	match e.eexpr with
+		| TConst _ | TLocal _ | TBreak | TContinue | TTypeExpr _ | TIdent _ ->
+			false
+		| TArray (e1,e2) | TBinop (_,e1,e2) | TFor (_,e1,e2) | TWhile (e1,e2,_) ->
+			predicate e1 || predicate e2;
+		| TThrow e | TField (e,_) | TEnumParameter (e,_,_) | TEnumIndex e | TParenthesis e
+		| TCast (e,_) | TUnop (_,_,e) | TMeta(_,e) ->
+			predicate e
+		| TArrayDecl el | TNew (_,_,el) | TBlock el ->
+			List.exists predicate el
+		| TObjectDecl fl ->
+			List.exists (fun (_,e) -> predicate e) fl
+		| TCall (e,el) ->
+			predicate e ||  List.exists predicate el
+		| TVar (_,eo) | TReturn eo ->
+			(match eo with None -> false | Some e -> predicate e)
+		| TFunction fu ->
+			predicate fu.tf_expr
+		| TIf (e,e1,e2) ->
+			predicate e || predicate e1 || (match e2 with None -> false | Some e -> predicate e)
+		| TSwitch (e,cases,def) ->
+			predicate e
+			|| List.exists (fun (el,e2) -> List.exists predicate el || predicate e2) cases
+			|| (match def with None -> false | Some e -> predicate e)
+		| TTry (e,catches) ->
+			predicate e || List.exists (fun (_,e) -> predicate e) catches
+
 let map_expr f e =
 	match e.eexpr with
 	| TConst _
 	| TLocal _
 	| TBreak
 	| TContinue
-	| TTypeExpr _ ->
+	| TTypeExpr _
+	| TIdent _ ->
 		e
 	| TArray (e1,e2) ->
 		let e1 = f e1 in
@@ -2300,7 +2667,9 @@ let map_expr f e =
 	| TThrow e1 ->
 		{ e with eexpr = TThrow (f e1) }
 	| TEnumParameter (e1,ef,i) ->
-		 { e with eexpr = TEnumParameter(f e1,ef,i) }
+		{ e with eexpr = TEnumParameter(f e1,ef,i) }
+	| TEnumIndex e1 ->
+		{ e with eexpr = TEnumIndex (f e1) }
 	| TField (e1,v) ->
 		{ e with eexpr = TField (f e1,v) }
 	| TParenthesis e1 ->
@@ -2345,7 +2714,8 @@ let map_expr_type f ft fv e =
 	| TConst _
 	| TBreak
 	| TContinue
-	| TTypeExpr _ ->
+	| TTypeExpr _
+	| TIdent _ ->
 		{ e with etype = ft e.etype }
 	| TLocal v ->
 		{ e with eexpr = TLocal (fv v); etype = ft e.etype }
@@ -2365,7 +2735,9 @@ let map_expr_type f ft fv e =
 	| TThrow e1 ->
 		{ e with eexpr = TThrow (f e1); etype = ft e.etype }
 	| TEnumParameter (e1,ef,i) ->
-		{ e with eexpr = TEnumParameter(f e1,ef,i); etype = ft e.etype }
+		{ e with eexpr = TEnumParameter (f e1,ef,i); etype = ft e.etype }
+	| TEnumIndex e1 ->
+		{ e with eexpr = TEnumIndex (f e1); etype = ft e.etype }
 	| TField (e1,v) ->
 		let e1 = f e1 in
 		let v = try
@@ -2447,13 +2819,13 @@ module TExprToExpr = struct
 			CTPath {
 				tpackage = fst p;
 				tname = snd p;
-				tparams = List.map (fun t -> TPType t) pl;
+				tparams = pl;
 				tsub = None;
 			}
 		else CTPath {
 				tpackage = fst mp;
 				tname = snd mp;
-				tparams = List.map (fun t -> TPType t) pl;
+				tparams = pl;
 				tsub = Some (snd p);
 			}
 
@@ -2469,26 +2841,28 @@ module TExprToExpr = struct
 			CTPath {
 				tpackage = [];
 				tname = name;
-				tparams = List.map (fun t -> TPType (convert_type' t)) tl;
+				tparams = List.map tparam tl;
 				tsub = None;
 			}
 		| TEnum (e,pl) ->
-			tpath e.e_path e.e_module.m_path (List.map convert_type' pl)
+			tpath e.e_path e.e_module.m_path (List.map tparam pl)
+		| TInst({cl_kind = KExpr e} as c,pl) ->
+			tpath ([],snd c.cl_path) ([],snd c.cl_path) (List.map tparam pl)
 		| TInst({cl_kind = KTypeParameter _} as c,pl) ->
-			tpath ([],snd c.cl_path) ([],snd c.cl_path) (List.map convert_type' pl)
+			tpath ([],snd c.cl_path) ([],snd c.cl_path) (List.map tparam pl)
 		| TInst (c,pl) ->
-			tpath c.cl_path c.cl_module.m_path (List.map convert_type' pl)
+			tpath c.cl_path c.cl_module.m_path (List.map tparam pl)
 		| TType (t,pl) as tf ->
 			(* recurse on type-type *)
-			if (snd t.t_path).[0] = '#' then convert_type (follow tf) else tpath t.t_path t.t_module.m_path (List.map convert_type' pl)
+			if (snd t.t_path).[0] = '#' then convert_type (follow tf) else tpath t.t_path t.t_module.m_path (List.map tparam pl)
 		| TAbstract (a,pl) ->
-			tpath a.a_path a.a_module.m_path (List.map convert_type' pl)
+			tpath a.a_path a.a_module.m_path (List.map tparam pl)
 		| TFun (args,ret) ->
 			CTFunction (List.map (fun (_,_,t) -> convert_type' t) args, (convert_type' ret))
 		| TAnon a ->
 			begin match !(a.a_status) with
-			| Statics c -> tpath ([],"Class") ([],"Class") [tpath c.cl_path c.cl_path [],null_pos]
-			| EnumStatics e -> tpath ([],"Enum") ([],"Enum") [tpath e.e_path e.e_path [],null_pos]
+			| Statics c -> tpath ([],"Class") ([],"Class") [TPType (tpath c.cl_path c.cl_path [],null_pos)]
+			| EnumStatics e -> tpath ([],"Enum") ([],"Enum") [TPType (tpath e.e_path e.e_path [],null_pos)]
 			| _ ->
 				CTAnonymous (PMap.foldi (fun _ f acc ->
 					{
@@ -2502,13 +2876,17 @@ module TExprToExpr = struct
 				) a.a_fields [])
 			end
 		| (TDynamic t2) as t ->
-			tpath ([],"Dynamic") ([],"Dynamic") (if t == t_dynamic then [] else [convert_type' t2])
+			tpath ([],"Dynamic") ([],"Dynamic") (if t == t_dynamic then [] else [tparam t2])
 		| TLazy f ->
-			convert_type ((!f)())
+			convert_type (lazy_type f)
 
 	and convert_type' t =
 		convert_type t,null_pos
 
+	and tparam = function
+		| TInst ({cl_kind = KExpr e}, _) -> TPExpr e
+		| t -> TPType (convert_type' t)
+
 	and mk_type_hint t p =
 		match follow t with
 		| TMono _ -> None
@@ -2539,19 +2917,19 @@ module TExprToExpr = struct
 		| TField (e,f) -> EField (convert_expr e, field_name f)
 		| TTypeExpr t -> fst (mk_path (full_type_path t) e.epos)
 		| TParenthesis e -> EParenthesis (convert_expr e)
-		| TObjectDecl fl -> EObjectDecl (List.map (fun (f,e) -> (f,null_pos), convert_expr e) fl)
+		| TObjectDecl fl -> EObjectDecl (List.map (fun (k,e) -> k, convert_expr e) fl)
 		| TArrayDecl el -> EArrayDecl (List.map convert_expr el)
 		| TCall (e,el) -> ECall (convert_expr e,List.map convert_expr el)
 		| TNew (c,pl,el) -> ENew ((match (try convert_type (TInst (c,pl)) with Exit -> convert_type (TInst (c,[]))) with CTPath p -> p,null_pos | _ -> assert false),List.map convert_expr el)
 		| TUnop (op,p,e) -> EUnop (op,p,convert_expr e)
 		| TFunction f ->
-			let arg (v,c) = (v.v_name,v.v_pos), false, v.v_meta, mk_type_hint v.v_type null_pos, (match c with None -> None | Some c -> Some (EConst (tconst_to_const c),e.epos)) in
-			EFunction (None,{ f_params = []; f_args = List.map arg f.tf_args; f_type = mk_type_hint f.tf_type null_pos; f_expr = Some (convert_expr f.tf_expr) })
+			let arg (v,c) = (v.v_name,v.v_pos), false, v.v_meta, mk_type_hint v.v_type null_pos, (match c with None -> None | Some c -> Some (convert_expr c)) in
+			EFunction (FKAnonymous,{ f_params = []; f_args = List.map arg f.tf_args; f_type = mk_type_hint f.tf_type null_pos; f_expr = Some (convert_expr f.tf_expr) })
 		| TVar (v,eo) ->
-			EVars ([(v.v_name,v.v_pos), mk_type_hint v.v_type v.v_pos, eopt eo])
+			EVars ([(v.v_name,v.v_pos), v.v_final, mk_type_hint v.v_type v.v_pos, eopt eo])
 		| TBlock el -> EBlock (List.map convert_expr el)
 		| TFor (v,it,e) ->
-			let ein = (EIn ((EConst (Ident v.v_name),it.epos),convert_expr it),it.epos) in
+			let ein = (EBinop (OpIn,(EConst (Ident v.v_name),it.epos),convert_expr it),it.epos) in
 			EFor (ein,convert_expr e)
 		| TIf (e,e1,e2) -> EIf (convert_expr e,convert_expr e1,eopt e2)
 		| TWhile (e1,e2,flag) -> EWhile (convert_expr e1, convert_expr e2, flag)
@@ -2561,6 +2939,7 @@ module TExprToExpr = struct
 			) cases in
 			let def = match eopt def with None -> None | Some (EBlock [],_) -> Some (None,null_pos) | Some e -> Some (Some e,pos e) in
 			ESwitch (convert_expr e,cases,def)
+		| TEnumIndex _
 		| TEnumParameter _ ->
 			(* these are considered complex, so the AST is handled in TMeta(Meta.Ast) *)
 			assert false
@@ -2585,267 +2964,166 @@ module TExprToExpr = struct
 			) in
 			ECast (convert_expr e,t)
 		| TMeta ((Meta.Ast,[e1,_],_),_) -> e1
-		| TMeta (m,e) -> EMeta(m,convert_expr e))
+		| TMeta (m,e) -> EMeta(m,convert_expr e)
+		| TIdent s -> EConst (Ident s))
 		,e.epos)
 
 end
 
-module Texpr = struct
-	let equal_fa fa1 fa2 = match fa1,fa2 with
-		| FStatic(c1,cf1),FStatic(c2,cf2) -> c1 == c2 && cf1 == cf2
-		| FInstance(c1,tl1,cf1),FInstance(c2,tl2,cf2) -> c1 == c2 && safe_for_all2 type_iseq tl1 tl2 && cf1 == cf2
-		(* TODO: This is technically not correct but unfortunately the compiler makes a distinct tclass_field for each anon field access. *)
-		| FAnon cf1,FAnon cf2 -> cf1.cf_name = cf2.cf_name
-		| FDynamic s1,FDynamic s2 -> s1 = s2
-		| FClosure(None,cf1),FClosure(None,cf2) -> cf1 == cf2
-		| FClosure(Some(c1,tl1),cf1),FClosure(Some(c2,tl2),cf2) -> c1 == c2 && safe_for_all2 type_iseq tl1 tl2 && cf1 == cf2
-		| FEnum(en1,ef1),FEnum(en2,ef2) -> en1 == en2 && ef1 == ef2
+module ExtType = struct
+	let is_mono = function
+		| TMono { contents = None } -> true
 		| _ -> false
 
-	let rec equal e1 e2 = match e1.eexpr,e2.eexpr with
-		| TConst ct1,TConst ct2 -> ct1 = ct2
-		| TLocal v1,TLocal v2 -> v1 == v2
-		| TArray(eb1,ei1),TArray(eb2,ei2) -> equal eb1 eb2 && equal ei1 ei2
-		| TBinop(op1,lhs1,rhs1),TBinop(op2,lhs2,rhs2) -> op1 = op2 && equal lhs1 lhs2 && equal rhs1 rhs2
-		| TField(e1,fa1),TField(e2,fa2) -> equal e1 e2 && equal_fa fa1 fa2
-		| TTypeExpr mt1,TTypeExpr mt2 -> mt1 == mt2
-		| TParenthesis e1,TParenthesis e2 -> equal e1 e2
-		| TObjectDecl fl1,TObjectDecl fl2 -> safe_for_all2 (fun (s1,e1) (s2,e2) -> s1 = s2 && equal e1 e2) fl1 fl2
-		| (TArrayDecl el1,TArrayDecl el2) | (TBlock el1,TBlock el2) -> safe_for_all2 equal el1 el2
-		| TCall(e1,el1),TCall(e2,el2) -> equal e1 e2 && safe_for_all2 equal el1 el2
-		| TNew(c1,tl1,el1),TNew(c2,tl2,el2) -> c1 == c2 && safe_for_all2 type_iseq tl1 tl2 && safe_for_all2 equal el1 el2
-		| TUnop(op1,flag1,e1),TUnop(op2,flag2,e2) -> op1 = op2 && flag1 = flag2 && equal e1 e2
-		| TFunction tf1,TFunction tf2 -> tf1 == tf2
-		| TVar(v1,None),TVar(v2,None) -> v1 == v2
-		| TVar(v1,Some e1),TVar(v2,Some e2) -> v1 == v2 && equal e1 e2
-		| TFor(v1,ec1,eb1),TFor(v2,ec2,eb2) -> v1 == v2 && equal ec1 ec2 && equal eb1 eb2
-		| TIf(e1,ethen1,None),TIf(e2,ethen2,None) -> equal e1 e2 && equal ethen1 ethen2
-		| TIf(e1,ethen1,Some eelse1),TIf(e2,ethen2,Some eelse2) -> equal e1 e2 && equal ethen1 ethen2 && equal eelse1 eelse2
-		| TWhile(e1,eb1,flag1),TWhile(e2,eb2,flag2) -> equal e1 e2 && equal eb2 eb2 && flag1 = flag2
-		| TSwitch(e1,cases1,eo1),TSwitch(e2,cases2,eo2) ->
-			equal e1 e2 &&
-			safe_for_all2 (fun (el1,e1) (el2,e2) -> safe_for_all2 equal el1 el2 && equal e1 e2) cases1 cases2 &&
-			(match eo1,eo2 with None,None -> true | Some e1,Some e2 -> equal e1 e2 | _ -> false)
-		| TTry(e1,catches1),TTry(e2,catches2) -> equal e1 e2 && safe_for_all2 (fun (v1,e1) (v2,e2) -> v1 == v2 && equal e1 e2) catches1 catches2
-		| TReturn None,TReturn None -> true
-		| TReturn(Some e1),TReturn(Some e2) -> equal e1 e2
-		| TThrow e1,TThrow e2 -> equal e1 e2
-		| TCast(e1,None),TCast(e2,None) -> equal e1 e2
-		| TCast(e1,Some mt1),TCast(e2,Some mt2) -> equal e1 e2 && mt1 == mt2
-		| TMeta((m1,el1,_),e1),TMeta((m2,el2,_),e2) -> m1 = m2 && safe_for_all2 (fun e1 e2 -> (* TODO: cheating? *) (Ast.s_expr e1) = (Ast.s_expr e2)) el1 el2 && equal e1 e2
-		| (TBreak,TBreak) | (TContinue,TContinue) -> true
-		| TEnumParameter(e1,ef1,i1),TEnumParameter(e2,ef2,i2) -> equal e1 e2 && ef1 == ef2 && i1 = i2
+	let is_void = function
+		| TAbstract({a_path=[],"Void"},_) -> true
 		| _ -> false
 
-	let duplicate_tvars e =
-		let vars = Hashtbl.create 0 in
-		let copy_var v =
-			let v2 = alloc_var v.v_name v.v_type v.v_pos in
-			v2.v_meta <- v.v_meta;
-			Hashtbl.add vars v.v_id v2;
-			v2;
+	let is_int t = match t with
+		| TAbstract({a_path=[],"Int"},_) -> true
+		| _ -> false
+
+	let is_float t = match t with
+		| TAbstract({a_path=[],"Float"},_) -> true
+		| _ -> false
+
+	let is_numeric t = match t with
+		| TAbstract({a_path=[],"Float"},_) -> true
+		| TAbstract({a_path=[],"Int"},_) -> true
+		| _ -> false
+
+	let is_string t = match t with
+		| TInst({cl_path=[],"String"},_) -> true
+		| _ -> false
+
+	let is_bool t = match t with
+		| TAbstract({a_path=[],"Bool"},_) -> true
+		| _ -> false
+
+	type semantics =
+		| VariableSemantics
+		| ReferenceSemantics
+		| ValueSemantics
+
+	let semantics_name = function
+		| VariableSemantics -> "variable"
+		| ReferenceSemantics -> "reference"
+		| ValueSemantics -> "value"
+
+	let has_semantics t sem =
+		let name = semantics_name sem in
+		let check meta =
+			has_meta_option meta Meta.Semantics name
 		in
-		let rec build_expr e =
-			match e.eexpr with
-			| TVar (v,eo) ->
-				let v2 = copy_var v in
-				{e with eexpr = TVar(v2, Option.map build_expr eo)}
-			| TFor (v,e1,e2) ->
-				let v2 = copy_var v in
-				{e with eexpr = TFor(v2, build_expr e1, build_expr e2)}
-			| TTry (e1,cl) ->
-				let cl = List.map (fun (v,e) ->
-					let v2 = copy_var v in
-					v2, build_expr e
-				) cl in
-				{e with eexpr = TTry(build_expr e1, cl)}
-			| TFunction f ->
-				let args = List.map (fun (v,c) -> copy_var v, c) f.tf_args in
-				let f = {
-					tf_args = args;
-					tf_type = f.tf_type;
-					tf_expr = build_expr f.tf_expr;
-				} in
-				{e with eexpr = TFunction f}
-			| TLocal v ->
-				(try
-					let v2 = Hashtbl.find vars v.v_id in
-					{e with eexpr = TLocal v2}
-				with _ ->
-					e)
+		let rec loop t = match t with
+			| TInst(c,_) -> check c.cl_meta
+			| TEnum(en,_) -> check en.e_meta
+			| TType(t,tl) -> check t.t_meta || (loop (apply_params t.t_params tl t.t_type))
+			| TAbstract(a,_) -> check a.a_meta
+			| TLazy f -> loop (lazy_type f)
+			| TMono r ->
+				(match !r with
+				| Some t -> loop t
+				| _ -> false)
 			| _ ->
-				map_expr build_expr e
+				false
 		in
-		build_expr e
-
-	let rec skip e = match e.eexpr with
-		| TParenthesis e1 | TMeta(_,e1) | TBlock [e1] | TCast(e1,None) -> skip e1
-		| _ -> e
-
-	let foldmap_list f acc el =
-		let rec loop acc el acc2 = (match el with
-			| [] -> acc,(List.rev acc2)
-			| e1 :: el ->
-				let acc,e1 = f acc e1 in
-				loop acc el (e1 :: acc2))
-		in loop acc el []
-
-	let foldmap_opt f acc eo = match eo with
-		| Some(e) -> let acc,e = f acc e in acc,Some(e)
-		| None    -> acc,eo
-
-	let foldmap_pairs f acc pairs =
-		let acc,pairs = List.fold_left
-			(fun (acc,el) (v,e) -> let acc,e = f acc e in (acc,(v,e) :: el))
-			(acc,[])
-			pairs
-		in acc,(List.rev pairs)
-
-	let foldmap f acc e =
-		begin match e.eexpr with
-		| TConst _
-		| TLocal _
-		| TBreak
-		| TContinue
-		| TTypeExpr _ ->
-			acc,e
-		| TArray (e1,e2) ->
-			let acc,e1 = f acc e1 in
-			let acc,e2 = f acc e2 in
-			acc,{ e with eexpr = TArray (e1, e2) }
-		| TBinop (op,e1,e2) ->
-			let acc,e1 = f acc e1 in
-			let acc,e2 = f acc e2 in
-			acc,{ e with eexpr = TBinop (op,e1,e2) }
-		| TFor (v,e1,e2) ->
-			let acc,e1 = f acc e1 in
-			let acc,e2 = f acc e2 in
-			acc,{ e with eexpr = TFor (v,e1,e2) }
-		| TWhile (e1,e2,flag) ->
-			let acc,e1 = f acc e1 in
-			let acc,e2 = f acc e2 in
-			acc,{ e with eexpr = TWhile (e1,e2,flag) }
-		| TThrow e1 ->
-			let acc,e1 = f acc e1 in
-			acc,{ e with eexpr = TThrow (e1) }
-		| TEnumParameter (e1,ef,i) ->
-			let acc,e1 = f acc e1 in
-			acc,{ e with eexpr = TEnumParameter(e1,ef,i) }
-		| TField (e1,v) ->
-			let acc,e1 = f acc e1 in
-			acc,{ e with eexpr = TField (e1,v) }
-		| TParenthesis e1 ->
-			let acc,e1 = f acc e1 in
-			acc,{ e with eexpr = TParenthesis (e1) }
-		| TUnop (op,pre,e1) ->
-			let acc,e1 = f acc e1 in
-			acc,{ e with eexpr = TUnop (op,pre,e1) }
-		| TArrayDecl el ->
-			let acc,el = foldmap_list f acc el in
-			acc,{ e with eexpr = TArrayDecl el }
-		| TNew (t,pl,el) ->
-			let acc,el = foldmap_list f acc el in
-			acc,{ e with eexpr = TNew (t,pl,el) }
-		| TBlock el ->
-			let acc,el = foldmap_list f acc el in
-			acc,{ e with eexpr = TBlock (el) }
-		| TObjectDecl el ->
-			let acc,el = foldmap_pairs f acc el in
-			acc,{ e with eexpr = TObjectDecl el }
-		| TCall (e1,el) ->
-			let acc,e1 = f acc e1 in
-			let acc,el = foldmap_list f acc el in
-			acc,{ e with eexpr = TCall (e1,el) }
-		| TVar (v,eo) ->
-			let acc,eo = foldmap_opt f acc eo in
-			acc,{ e with eexpr = TVar (v, eo) }
-		| TFunction fu ->
-			let acc,e1 = f acc fu.tf_expr in
-			acc,{ e with eexpr = TFunction { fu with tf_expr = e1 } }
-		| TIf (ec,e1,eo) ->
-			let acc,ec = f acc ec in
-			let acc,e1 = f acc e1 in
-			let acc,eo = foldmap_opt f acc eo in
-			acc,{ e with eexpr = TIf (ec,e1,eo)}
-		| TSwitch (e1,cases,def) ->
-			let acc,e1 = f acc e1 in
-			let acc,cases = List.fold_left (fun (acc,cases) (el,e2) ->
-				let acc,el = foldmap_list f acc el in
-				let acc,e2 = f acc e2 in
-				acc,((el,e2) :: cases)
-			) (acc,[]) cases in
-			let acc,def = foldmap_opt f acc def in
-			acc,{ e with eexpr = TSwitch (e1, cases, def) }
-		| TTry (e1,catches) ->
-			let acc,e1 = f acc e1 in
-			let acc,catches = foldmap_pairs f acc catches in
-			acc,{ e with eexpr = TTry (e1, catches) }
-		| TReturn eo ->
-			let acc,eo = foldmap_opt f acc eo in
-			acc,{ e with eexpr = TReturn eo }
-		| TCast (e1,t) ->
-			let acc,e1 = f acc e1 in
-			acc,{ e with eexpr = TCast (e1,t) }
-		| TMeta (m,e1) ->
-			let acc,e1 = f acc e1 in
-			acc,{ e with eexpr = TMeta(m,e1)}
-		end
-end
+		loop t
 
-module ExtType = struct
-	let is_void = function
-		| TAbstract({a_path=[],"Void"},_) -> true
-		| _ -> false
+	let has_variable_semantics t = has_semantics t VariableSemantics
+	let has_reference_semantics t = has_semantics t ReferenceSemantics
+	let has_value_semantics t = has_semantics t ValueSemantics
 end
 
-module StringError = struct
-	(* Source: http://en.wikibooks.org/wiki/Algorithm_implementation/Strings/Levenshtein_distance#OCaml *)
-	let levenshtein a b =
-		let x = Array.init (String.length a) (fun i -> a.[i]) in
-		let y = Array.init (String.length b) (fun i -> b.[i]) in
-		let minimum (x:int) y z =
-			let m' (a:int) b = if a < b then a else b in
-			m' (m' x y) z
-		in
-		let init_matrix n m =
-			let init_col = Array.init m in
-				Array.init n (function
-				| 0 -> init_col (function j -> j)
-				| i -> init_col (function 0 -> i | _ -> 0)
-			)
+let class_module_type c = {
+	t_path = [],"Class<" ^ (s_type_path c.cl_path) ^ ">" ;
+	t_module = c.cl_module;
+	t_doc = None;
+	t_pos = c.cl_pos;
+	t_name_pos = null_pos;
+	t_type = TAnon {
+		a_fields = c.cl_statics;
+		a_status = ref (Statics c);
+	};
+	t_private = true;
+	t_params = [];
+	t_using = [];
+	t_meta = no_meta;
+}
+
+let enum_module_type m path p  = {
+	t_path = [], "Enum<" ^ (s_type_path path) ^ ">";
+	t_module = m;
+	t_doc = None;
+	t_pos = p;
+	t_name_pos = null_pos;
+	t_type = mk_mono();
+	t_private = true;
+	t_params = [];
+	t_using = [];
+	t_meta = [];
+}
+
+let abstract_module_type a tl = {
+	t_path = [],Printf.sprintf "Abstract<%s%s>" (s_type_path a.a_path) (s_type_params (ref []) tl);
+	t_module = a.a_module;
+	t_doc = None;
+	t_pos = a.a_pos;
+	t_name_pos = null_pos;
+	t_type = TAnon {
+		a_fields = PMap.empty;
+		a_status = ref (AbstractStatics a);
+	};
+	t_private = true;
+	t_params = [];
+	t_using = [];
+	t_meta = no_meta;
+}
+
+module TClass = struct
+	let get_member_fields' self_too c0 tl =
+		let rec loop acc c tl =
+			let apply = apply_params c.cl_params tl in
+			let maybe_add acc cf =
+				if not (PMap.mem cf.cf_name acc) then begin
+					let cf = if tl = [] then cf else {cf with cf_type = apply cf.cf_type} in
+					PMap.add cf.cf_name (c,cf) acc
+				end else acc
+			in
+			let acc = if self_too || c != c0 then List.fold_left maybe_add acc c.cl_ordered_fields else acc in
+			if c.cl_interface then
+				List.fold_left (fun acc (i,tl) -> loop acc i (List.map apply tl)) acc c.cl_implements
+			else
+				match c.cl_super with
+				| Some(c,tl) -> loop acc c (List.map apply tl)
+				| None -> acc
 		in
-		match Array.length x, Array.length y with
-			| 0, n -> n
-			| m, 0 -> m
-			| m, n ->
-				let matrix = init_matrix (m + 1) (n + 1) in
-				for i = 1 to m do
-					let s = matrix.(i) and t = matrix.(i - 1) in
-					for j = 1 to n do
-						let cost = abs (compare x.(i - 1) y.(j - 1)) in
-						s.(j) <- minimum (t.(j) + 1) (s.(j - 1) + 1) (t.(j - 1) + cost)
-					done
-				done;
-				matrix.(m).(n)
-
-	let filter_similar f cl =
-		let rec loop sl = match sl with
-			| (x,i) :: sl when f x i -> x :: loop sl
-			| _ -> []
+		loop PMap.empty c0 tl
+
+	let get_all_super_fields c =
+		get_member_fields' false c (List.map snd c.cl_params)
+
+	let get_all_fields c tl =
+		get_member_fields' true c tl
+
+	let get_overridden_fields c cf =
+		let rec loop acc c = match c.cl_super with
+			| None ->
+				acc
+			| Some(c,_) ->
+				begin try
+					let cf' = PMap.find cf.cf_name c.cl_fields in
+					loop (cf' :: acc) c
+				with Not_found ->
+					loop acc c
+				end
 		in
-		loop cl
-
-	let string_error_raise s sl msg =
-		if sl = [] then msg else
-		let cl = List.map (fun s2 -> s2,levenshtein s s2) sl in
-		let cl = List.sort (fun (_,c1) (_,c2) -> compare c1 c2) cl in
-		let cl = filter_similar (fun s2 i -> i <= (min (String.length s) (String.length s2)) / 3) cl in
-		match cl with
-			| [] -> raise Not_found
-			| [s] -> Printf.sprintf "%s (Suggestion: %s)" msg s
-			| sl -> Printf.sprintf "%s (Suggestions: %s)" msg (String.concat ", " sl)
-
-	let string_error s sl msg =
-		try string_error_raise s sl msg
-		with Not_found -> msg
+		loop [] c
 end
+
+let s_class_path c =
+	let path = match c.cl_kind with
+		| KAbstractImpl a -> a.a_path
+		| _ -> c.cl_path
+	in
+	s_type_path path
diff --git a/src/core/withType.ml b/src/core/withType.ml
new file mode 100644
index 0000000000000000000000000000000000000000..99d1e32f181220a58e80d3884557025af6e47061
--- /dev/null
+++ b/src/core/withType.ml
@@ -0,0 +1,31 @@
+open Type
+
+type with_type_source =
+	| FunctionArgument of string
+	| StructureField of string
+	| ImplicitReturn
+
+type t =
+	| NoValue
+	| Value of with_type_source option
+	| WithType of Type.t * with_type_source option
+
+let with_type t = WithType(t,None)
+let of_implicit_return t = WithType(t,Some ImplicitReturn)
+let with_argument t name = WithType(t,Some(FunctionArgument name))
+let with_structure_field t name = WithType(t,Some(StructureField name))
+let value = Value None
+let named_argument name = Value (Some(FunctionArgument name))
+let named_structure_field name = Value (Some(StructureField name))
+let no_value = NoValue
+
+let to_string = function
+	| NoValue -> "NoValue"
+	| Value (None | Some ImplicitReturn) -> "Value"
+	| Value (Some(FunctionArgument s | StructureField s)) -> "Value " ^ s
+	| WithType(t,s) ->
+		let name = match s with
+			| Some(FunctionArgument s | StructureField s) -> s
+			| _ -> "None"
+		in
+		Printf.sprintf "WithType(%s, %s)" (s_type (print_context()) t) name
diff --git a/src/display/display.ml b/src/display/display.ml
deleted file mode 100644
index 523df41a2264c3658037d5527c850afb60ffd6da..0000000000000000000000000000000000000000
--- a/src/display/display.ml
+++ /dev/null
@@ -1,926 +0,0 @@
-open Ast
-open Common
-open Common.DisplayMode
-open Type
-open Typecore
-open Globals
-
-type display_field_kind =
-	| FKVar of t
-	| FKMethod of t
-	| FKType of t
-	| FKModule
-	| FKPackage
-	| FKMetadata
-	| FKTimer of string
-
-let display_field_kind_index = function
-	| FKVar _ -> 0
-	| FKMethod _ -> 1
-	| FKType _ -> 2
-	| FKModule -> 3
-	| FKPackage -> 4
-	| FKMetadata -> 5
-	| FKTimer _ -> 6
-
-exception Diagnostics of string
-exception Statistics of string
-exception ModuleSymbols of string
-exception Metadata of string
-exception DisplaySignatures of (tsignature * documentation) list * int
-exception DisplayType of t * pos * string option
-exception DisplayPosition of pos list
-exception DisplayFields of (string * display_field_kind * documentation) list
-exception DisplayToplevel of IdentifierType.t list
-exception DisplayPackage of string list
-
-let is_display_file file =
-	file <> "?" && Path.unique_full_path file = (!Parser.resume_display).pfile
-
-let encloses_position p_target p =
-	p.pmin <= p_target.pmin && p.pmax >= p_target.pmax
-
-let is_display_position p =
-	encloses_position !Parser.resume_display p
-
-module ExprPreprocessing = struct
-	let find_enclosing com e =
-		let display_pos = ref (!Parser.resume_display) in
-		let mk_null p = (EDisplay(((EConst(Ident "null")),p),false),p) in
-		let encloses_display_pos p =
-			if encloses_position !display_pos p then begin
-				let p = !display_pos in
-				display_pos := { pfile = ""; pmin = -2; pmax = -2 };
-				Some p
-			end else
-				None
-		in
-		let rec loop e = match fst e with
-			| EBlock el ->
-				let p = pos e in
-				(* We want to find the innermost block which contains the display position. *)
-				let el = List.map loop el in
-				let el = match encloses_display_pos p with
-					| None ->
-						el
-					| Some p2 ->
-						let b,el = List.fold_left (fun (b,el) e ->
-							let p = pos e in
-							if b || p.pmax <= p2.pmin then begin
-								(b,e :: el)
-							end else begin
-								let e_d = (EDisplay(mk_null p,false)),p in
-								(true,e :: e_d :: el)
-							end
-						) (false,[]) el in
-						let el = if b then
-							el
-						else begin
-							mk_null p :: el
-						end in
-						List.rev el
-				in
-				(EBlock el),(pos e)
-			| _ ->
-				Ast.map_expr loop e
-		in
-		loop e
-
-	let find_before_pos com e =
-		let display_pos = ref (!Parser.resume_display) in
-		let is_annotated p =
-			if p.pmin <= !display_pos.pmin && p.pmax >= !display_pos.pmax then begin
-				display_pos := { pfile = ""; pmin = -2; pmax = -2 };
-				true
-			end else
-				false
-		in
-		let loop e =
-			if is_annotated (pos e) then
-				(EDisplay(e,false),(pos e))
-			else
-				e
-		in
-		let rec map e =
-			loop (Ast.map_expr map e)
-		in
-		map e
-
-	let find_display_call e =
-		let found = ref false in
-		let loop e = if !found then e else match fst e with
-			| ECall _ | ENew _ when is_display_position (pos e) ->
-				found := true;
-				(EDisplay(e,true),(pos e))
-			| _ ->
-				e
-		in
-		let rec map e = match fst e with
-			| EDisplay(_,true) ->
-				found := true;
-				e
-			| EDisplay(e1,false) -> map e1
-			| _ -> loop (Ast.map_expr map e)
-		in
-		map e
-
-
-	let process_expr com e = match com.display.dms_kind with
-		| DMToplevel -> find_enclosing com e
-		| DMPosition | DMUsage _ | DMType -> find_before_pos com e
-		| DMSignature -> find_display_call e
-		| _ -> e
-end
-
-module DisplayEmitter = struct
-	let display_module_type dm mt p = match dm.dms_kind with
-		| DMPosition -> raise (DisplayPosition [(t_infos mt).mt_pos]);
-		| DMUsage _ ->
-			let ti = t_infos mt in
-			ti.mt_meta <- (Meta.Usage,[],ti.mt_pos) :: ti.mt_meta
-		| DMType -> raise (DisplayType (type_of_module_type mt,p,None))
-		| _ -> ()
-
-	let rec display_type dm t p = match dm.dms_kind with
-		| DMType -> raise (DisplayType (t,p,None))
-		| _ ->
-			try display_module_type dm (module_type_of_type t) p
-			with Exit -> match follow t,follow !t_dynamic_def with
-				| _,TDynamic _ -> () (* sanity check in case it's still t_dynamic *)
-				| TDynamic _,_ -> display_type dm !t_dynamic_def p
-				| _ -> ()
-
-	let check_display_type ctx t p =
-		let add_type_hint () =
-			Hashtbl.replace ctx.com.shared.shared_display_information.type_hints p t;
-		in
-		let maybe_display_type () =
-			if ctx.is_display_file && is_display_position p then
-				display_type ctx.com.display t p
-		in
-		match ctx.com.display.dms_kind with
-		| DMStatistics -> add_type_hint()
-		| DMUsage _ -> add_type_hint(); maybe_display_type()
-		| _ -> maybe_display_type()
-
-	let display_variable dm v p = match dm.dms_kind with
-		| DMPosition -> raise (DisplayPosition [v.v_pos])
-		| DMUsage _ -> v.v_meta <- (Meta.Usage,[],v.v_pos) :: v.v_meta;
-		| DMType -> raise (DisplayType (v.v_type,p,None))
-		| _ -> ()
-
-	let display_field dm cf p = match dm.dms_kind with
-		| DMPosition -> raise (DisplayPosition [cf.cf_pos]);
-		| DMUsage _ -> cf.cf_meta <- (Meta.Usage,[],cf.cf_pos) :: cf.cf_meta;
-		| DMType -> raise (DisplayType (cf.cf_type,p,cf.cf_doc))
-		| _ -> ()
-
-	let maybe_display_field ctx p cf =
-		if is_display_position p then display_field ctx.com.display cf p
-
-	let display_enum_field dm ef p = match dm.dms_kind with
-		| DMPosition -> raise (DisplayPosition [p]);
-		| DMUsage _ -> ef.ef_meta <- (Meta.Usage,[],p) :: ef.ef_meta;
-		| DMType -> raise (DisplayType (ef.ef_type,p,ef.ef_doc))
-		| _ -> ()
-
-	let display_meta dm meta = match dm.dms_kind with
-		| DMType ->
-			begin match meta with
-			| Meta.Custom _ | Meta.Dollar _ -> ()
-			| _ -> match Meta.get_documentation meta with
-				| None -> ()
-				| Some (_,s) ->
-					(* TODO: hack until we support proper output for hover display mode *)
-					raise (Metadata ("<metadata>" ^ s ^ "</metadata>"));
-			end
-		| DMField ->
-			let all,_ = Meta.get_documentation_list() in
-			let all = List.map (fun (s,doc) -> (s,FKMetadata,Some doc)) all in
-			raise (DisplayFields all)
-		| _ ->
-			()
-
-	let check_display_metadata ctx meta =
-		List.iter (fun (meta,args,p) ->
-			if is_display_position p then display_meta ctx.com.display meta;
-			List.iter (fun e ->
-				if is_display_position (pos e) then begin
-					let e = ExprPreprocessing.process_expr ctx.com e in
-					delay ctx PTypeField (fun _ -> ignore(type_expr ctx e Value));
-				end
-			) args
-		) meta
-end
-
-module DocumentSymbols = struct
-	open DisplayTypes.SymbolKind
-
-	let collect_module_symbols (pack,decls) =
-		let l = DynArray.create() in
-		let add name kind location parent =
-			let si = DisplayTypes.SymbolInformation.make name kind location (if parent = "" then None else Some parent) in
-			DynArray.add l si;
-		in
-		let rec expr parent (e,p) =
-			let add name kind location = add name kind location parent in
-			begin match e with
-			| EVars vl ->
-				List.iter (fun ((s,p),_,eo) ->
-					add s Variable p;
-					expr_opt parent eo
-				) vl
-			| ETry(e1,catches) ->
-				expr parent e1;
-				List.iter (fun ((s,p),_,e,_) ->
-					add s Variable p;
-					expr parent e
-				) catches;
-			| EFunction(Some s,f) ->
-				add s Function p;
-				func parent f
-			| EIn((EConst(Ident s),p),e2) ->
-				add s Variable p;
-				expr parent e2;
-			| _ ->
-				iter_expr (expr parent) (e,p)
-			end
-		and expr_opt parent eo = match eo with
-			| None -> ()
-			| Some e -> expr parent e
-		and func parent f =
-			List.iter (fun ((s,p),_,_,_,eo) ->
-				add s Variable p parent;
-				expr_opt parent eo
-			) f.f_args;
-			expr_opt parent f.f_expr
-		in
-		let field parent cff =
-			let field_parent = parent ^ "." ^ (fst cff.cff_name) in
-			match cff.cff_kind with
-			| FVar(_,eo) ->
-				add (fst cff.cff_name) Field cff.cff_pos parent;
-				expr_opt field_parent eo
-			| FFun f ->
-				add (fst cff.cff_name) (if fst cff.cff_name = "new" then Constructor else Method) cff.cff_pos parent;
-				func field_parent f
-			| FProp(_,_,_,eo) ->
-				add (fst cff.cff_name) Property cff.cff_pos parent;
-				expr_opt field_parent eo
-		in
-		List.iter (fun (td,p) -> match td with
-			| EImport _ | EUsing _ ->
-				() (* TODO: Can we do anything with these? *)
-			| EClass d ->
-				add (fst d.d_name) (if List.mem HInterface d.d_flags then Interface else Class) p "";
-				List.iter (field (fst d.d_name)) d.d_data
-			| EEnum d ->
-				add (fst d.d_name) Enum p "";
-				List.iter (fun ef ->
-					add (fst ef.ec_name) Method ef.ec_pos (fst d.d_name)
-				) d.d_data
-			| ETypedef d ->
-				add (fst d.d_name) Typedef p "";
-				(match d.d_data with
-				| CTAnonymous fields,_ ->
-					List.iter (field (fst d.d_name)) fields
-				| _ -> ())
-			| EAbstract d ->
-				add (fst d.d_name) Abstract p "";
-				List.iter (field (fst d.d_name)) d.d_data
-		) decls;
-		l
-end
-
-module DeprecationCheck = struct
-
-	let curclass = ref null_class
-
-	let warned_positions = Hashtbl.create 0
-
-	let print_deprecation_message com meta s p_usage =
-		let s = match meta with
-			| _,[EConst(String s),_],_ -> s
-			| _ -> Printf.sprintf "Usage of this %s is deprecated" s
-		in
-		if not (Hashtbl.mem warned_positions p_usage) then begin
-			Hashtbl.replace warned_positions p_usage true;
-			com.warning s p_usage;
-		end
-
-	let check_meta com meta s p_usage =
-		try
-			print_deprecation_message com (Meta.get Meta.Deprecated meta) s p_usage;
-		with Not_found ->
-			()
-
-	let check_cf com cf p = check_meta com cf.cf_meta "field" p
-
-	let check_class com c p = if c != !curclass then check_meta com c.cl_meta "class" p
-
-	let check_enum com en p = check_meta com en.e_meta "enum" p
-
-	let check_ef com ef p = check_meta com ef.ef_meta "enum field" p
-
-	let check_typedef com t p = check_meta com t.t_meta "typedef" p
-
-	let check_module_type com mt p = match mt with
-		| TClassDecl c -> check_class com c p
-		| TEnumDecl en -> check_enum com en p
-		| _ -> ()
-
-	let run_on_expr com e =
-		let rec expr e = match e.eexpr with
-			| TField(e1,fa) ->
-				expr e1;
-				begin match fa with
-					| FStatic(c,cf) | FInstance(c,_,cf) ->
-						check_class com c e.epos;
-						check_cf com cf e.epos
-					| FAnon cf ->
-						check_cf com cf e.epos
-					| FClosure(co,cf) ->
-						(match co with None -> () | Some (c,_) -> check_class com c e.epos);
-						check_cf com cf e.epos
-					| FEnum(en,ef) ->
-						check_enum com en e.epos;
-						check_ef com ef e.epos;
-					| _ ->
-						()
-				end
-			| TNew(c,_,el) ->
-				List.iter expr el;
-				check_class com c e.epos;
-				(match c.cl_constructor with None -> () | Some cf -> check_cf com cf e.epos)
-			| TTypeExpr(mt) | TCast(_,Some mt) ->
-				check_module_type com mt e.epos
-			| TMeta((Meta.Deprecated,_,_) as meta,e1) ->
-				print_deprecation_message com meta "field" e1.epos;
-				expr e1;
-			| _ ->
-				Type.iter expr e
-		in
-		expr e
-
-	let run_on_field com cf = match cf.cf_expr with None -> () | Some e -> run_on_expr com e
-
-	let run com =
-		List.iter (fun t -> match t with
-			| TClassDecl c ->
-				curclass := c;
-				(match c.cl_constructor with None -> () | Some cf -> run_on_field com cf);
-				(match c.cl_init with None -> () | Some e -> run_on_expr com e);
-				List.iter (run_on_field com) c.cl_ordered_statics;
-				List.iter (run_on_field com) c.cl_ordered_fields;
-			| _ ->
-				()
-		) com.types
-end
-
-module Diagnostics = struct
-	module DiagnosticsKind = struct
-		type t =
-			| DKUnusedImport
-			| DKUnresolvedIdentifier
-			| DKCompilerError
-			| DKRemovableCode
-
-		let to_int = function
-			| DKUnusedImport -> 0
-			| DKUnresolvedIdentifier -> 1
-			| DKCompilerError -> 2
-			| DKRemovableCode -> 3
-	end
-
-	open DiagnosticsKind
-	open DisplayTypes
-
-	let add_removable_code com s p prange =
-		let di = com.shared.shared_display_information in
-		di.removable_code <- (s,p,prange) :: di.removable_code
-
-	let find_unused_variables com e =
-		let vars = Hashtbl.create 0 in
-		let pmin_map = Hashtbl.create 0 in
-		let rec loop e = match e.eexpr with
-			| TVar(v,eo) when Meta.has Meta.UserVariable v.v_meta ->
-				Hashtbl.add pmin_map e.epos.pmin v;
-				let p = match eo with
-					| None -> e.epos
-					| Some e1 ->
-						loop e1;
-						{ e.epos with pmax = e1.epos.pmin }
-				in
-				Hashtbl.replace vars v.v_id (v,p);
-			| TLocal v when Meta.has Meta.UserVariable v.v_meta ->
-				Hashtbl.remove vars v.v_id;
-			| _ ->
-				Type.iter loop e
-		in
-		loop e;
-		Hashtbl.iter (fun _ (v,p) ->
-			let p = match (Hashtbl.find_all pmin_map p.pmin) with [_] -> p | _ -> null_pos in
-			add_removable_code com "Unused variable" v.v_pos p
-		) vars
-
-	let check_other_things com e =
-		let had_effect = ref false in
-		let no_effect p =
-			add_diagnostics_message com "This code has no effect" p DiagnosticsSeverity.Warning;
-		in
-		let pointless_compound s p =
-			add_diagnostics_message com (Printf.sprintf "This %s has no effect, but some of its sub-expressions do" s) p DiagnosticsSeverity.Warning;
-		in
-		let rec compound s el p =
-			let old = !had_effect in
-			had_effect := false;
-			List.iter (loop true) el;
-			if not !had_effect then no_effect p else pointless_compound s p;
-			had_effect := old;
-		and loop in_value e = match e.eexpr with
-			| TBlock el ->
-				let rec loop2 el = match el with
-					| [] -> ()
-					| [e] -> loop in_value e
-					| e :: el -> loop false e; loop2 el
-				in
-				loop2 el
-			| TMeta((Meta.Extern,_,_),_) ->
-				(* This is so something like `[inlineFunc()]` is not reported. *)
-				had_effect := true;
-			| TLocal v when not (Meta.has Meta.UserVariable v.v_meta) ->
-				()
-			| TConst _ | TLocal _ | TTypeExpr _ | TFunction _ when not in_value ->
-				no_effect e.epos;
-			| TConst _ | TLocal _ | TTypeExpr _ | TEnumParameter _ | TVar _ ->
-				()
-			| TFunction tf ->
-				loop false tf.tf_expr
-			| TNew _ | TCall _ | TBinop ((Ast.OpAssignOp _ | Ast.OpAssign),_,_) | TUnop ((Ast.Increment | Ast.Decrement),_,_)
-			| TReturn _ | TBreak | TContinue | TThrow _ | TCast (_,Some _)
-			| TIf _ | TTry _ | TSwitch _ | TWhile _ | TFor _ ->
-				had_effect := true;
-				Type.iter (loop true) e
-			| TParenthesis e1 | TMeta(_,e1) ->
-				loop in_value e1
-			| TArray _ | TCast (_,None) | TBinop _ | TUnop _
-			| TField _ | TArrayDecl _ | TObjectDecl _ when in_value ->
-				Type.iter (loop true) e;
-			| TArray(e1,e2) -> compound "array access" [e1;e2] e.epos
-			| TCast(e1,None) -> compound "cast" [e1] e.epos
-			| TBinop(op,e1,e2) -> compound (Printf.sprintf "'%s' operator" (s_binop op)) [e1;e2] e.epos
-			| TUnop(op,_,e1) -> compound (Printf.sprintf "'%s' operator" (s_unop op)) [e1] e.epos
-			| TField(e1,_) -> compound "field access" [e1] e.epos
-			| TArrayDecl el -> compound "array declaration" el e.epos
-			| TObjectDecl fl -> compound "object declaration" (List.map snd fl) e.epos
-		in
-		loop true e
-
-	let prepare_field com cf = match cf.cf_expr with
-		| None -> ()
-		| Some e ->
-			find_unused_variables com e;
-			check_other_things com e;
-			DeprecationCheck.run_on_expr com e
-
-	let prepare com global =
-		List.iter (function
-			| TClassDecl c when global || is_display_file c.cl_pos.pfile ->
-				List.iter (prepare_field com) c.cl_ordered_fields;
-				List.iter (prepare_field com) c.cl_ordered_statics;
-				(match c.cl_constructor with None -> () | Some cf -> prepare_field com cf);
-			| _ ->
-				()
-		) com.types
-
-	let is_diagnostics_run ctx = match ctx.com.display.dms_kind with
-		| DMDiagnostics true -> true
-		| DMDiagnostics false -> ctx.is_display_file
-		| _ -> false
-
-	let secure_generated_code ctx e =
-		if is_diagnostics_run ctx then mk (TMeta((Meta.Extern,[],e.epos),e)) e.etype e.epos else e
-end
-
-module ImportHandling = struct
-	type import_display_kind =
-		| IDKPackage of string list
-		| IDKModule of string list * string
-		| IDKSubType of string list * string * string
-		| IDKModuleField of string list * string * string
-		| IDKSubTypeField of string list * string * string * string
-		| IDK
-
-	type import_display = import_display_kind * pos
-
-	let convert_import_to_something_usable pt path =
-		let rec loop pack m t = function
-			| (s,p) :: l ->
-				let is_lower = is_lower_ident s in
-				let is_display_pos = encloses_position pt p in
-				begin match is_lower,m,t with
-					| _,None,Some _ ->
-						assert false (* impossible, I think *)
-					| true,Some m,None ->
-						if is_display_pos then (IDKModuleField(List.rev pack,m,s),p)
-						else (IDK,p) (* assume that we're done *)
-					| _,Some m,Some t ->
-						if is_display_pos then (IDKSubTypeField(List.rev pack,m,t,s),p)
-						else (IDK,p)
-					| true,None,None ->
-						if is_display_pos then (IDKPackage (List.rev (s :: pack)),p)
-						else loop (s :: pack) m t l
-					| false,Some sm,None ->
-						if is_display_pos then (IDKSubType (List.rev pack,sm,s),p)
-						else loop pack m (Some s) l
-					| false,None,None ->
-						if is_display_pos then (IDKModule (List.rev pack,s),p)
-						else loop pack (Some s) None l
-				end
-			| [] ->
-				(IDK,null_pos)
-		in
-		loop [] None None path
-
-	let add_import_position com p path =
-		com.shared.shared_display_information.import_positions <- PMap.add p (ref false,path) com.shared.shared_display_information.import_positions
-
-	let mark_import_position com p =
-		try
-			let r = fst (PMap.find p com.shared.shared_display_information.import_positions) in
-			r := true
-		with Not_found ->
-			()
-
-	let maybe_mark_import_position ctx p =
-		if Diagnostics.is_diagnostics_run ctx then mark_import_position ctx.com p
-end
-
-module Statistics = struct
-	open ImportHandling
-
-	type relation =
-		| Implemented
-		| Extended
-		| Overridden
-		| Referenced
-
-	type symbol =
-		| SKClass of tclass
-		| SKInterface of tclass
-		| SKEnum of tenum
-		| SKField of tclass_field
-		| SKEnumField of tenum_field
-		| SKVariable of tvar
-
-	let is_usage_symbol symbol =
-		let meta = match symbol with
-			| SKClass c | SKInterface c -> c.cl_meta
-			| SKEnum en -> en.e_meta
-			| SKField cf -> cf.cf_meta
-			| SKEnumField ef -> ef.ef_meta
-			| SKVariable v -> v.v_meta
-		in
-		Meta.has Meta.Usage meta
-
-	let collect_statistics ctx =
-		let relations = Hashtbl.create 0 in
-		let symbols = Hashtbl.create 0 in
-		let add_relation pos r =
-			if is_display_file pos.pfile then try
-				Hashtbl.replace relations pos (r :: Hashtbl.find relations pos)
-			with Not_found ->
-				Hashtbl.add relations pos [r]
-		in
-		let declare kind p =
-			if is_display_file p.pfile then begin
-				if not (Hashtbl.mem relations p) then Hashtbl.add relations p [];
-				Hashtbl.replace symbols p kind;
-			end
-		in
-		let collect_overrides c =
-			List.iter (fun cf ->
-				let rec loop c = match c.cl_super with
-					| Some (c,_) ->
-						begin try
-							let cf' = PMap.find cf.cf_name c.cl_fields in
-							add_relation cf'.cf_name_pos (Overridden,cf.cf_pos)
-						with Not_found ->
-							loop c
-						end
-					| _ ->
-						()
-				in
-				loop c
-			) c.cl_overrides
-		in
-		let rec find_real_constructor c = match c.cl_constructor,c.cl_super with
-			(* The pos comparison might be a bit weak, not sure... *)
-			| Some cf,_ when not (Meta.has Meta.CompilerGenerated cf.cf_meta) && c.cl_pos <> cf.cf_pos -> cf
-			| _,Some(c,_) -> find_real_constructor c
-			| _,None -> raise Not_found
-		in
-		let var_decl v = declare (SKVariable v) v.v_pos in
-		let patch_string_pos p s = { p with pmin = p.pmax - String.length s } in
-		let patch_string_pos_front p s  = { p with pmax = p.pmin + String.length s } in
-		let field_reference cf p =
-			add_relation cf.cf_name_pos (Referenced,patch_string_pos p cf.cf_name)
-		in
-		let collect_references c e =
-			let rec loop e = match e.eexpr with
-				| TField(e1,fa) ->
-					(* Check if the sub-expression is actually shorter than the whole one. This should
-					   detect cases where it was automatically generated. *)
-					if e1.epos.pmin = e.epos.pmin && e1.epos.pmax <> e.epos.pmax then
-						loop e1;
-					begin match fa with
-						| FStatic(_,cf) | FInstance(_,_,cf) | FClosure(_,cf) ->
-							field_reference cf e.epos
-						| FAnon cf ->
-							declare  (SKField cf) cf.cf_name_pos;
-							field_reference cf e.epos
-						| FEnum(_,ef) ->
-							add_relation ef.ef_name_pos (Referenced,patch_string_pos e.epos ef.ef_name)
-						| FDynamic _ ->
-							()
-					end
-				| TTypeExpr mt ->
-					let tinfos = t_infos mt in
-					add_relation tinfos.mt_name_pos (Referenced,patch_string_pos e.epos (snd tinfos.mt_path))
-				| TNew(c,_,el) ->
-					List.iter loop el;
-					(try add_relation (find_real_constructor c).cf_name_pos (Referenced,e.epos) with Not_found -> ());
-				| TCall({eexpr = TConst TSuper},el) ->
-					List.iter loop el;
-					begin match c.cl_super with
-						| Some(c,_) -> (try add_relation (find_real_constructor c).cf_name_pos (Referenced,e.epos) with Not_found -> ())
-						| None -> ()
-					end
-				| TVar(v,eo) ->
-					Option.may loop eo;
-					var_decl v;
-				| TFor(v,e1,e2) ->
-					var_decl v;
-					loop e1;
-					loop e2;
-				| TFunction tf ->
-					List.iter (fun (v,_) -> var_decl v) tf.tf_args;
-					loop tf.tf_expr;
-				| TLocal v when e.epos.pmax - e.epos.pmin = String.length v.v_name ->
-					add_relation v.v_pos (Referenced,e.epos)
-				| _ ->
-					Type.iter loop e
-			in
-			loop e
-		in
-		List.iter (function
-			| TClassDecl c ->
-				declare (if c.cl_interface then (SKInterface c) else (SKClass c)) c.cl_name_pos;
-				List.iter (fun (c',_) -> add_relation c'.cl_name_pos ((if c.cl_interface then Extended else Implemented),c.cl_name_pos)) c.cl_implements;
-				begin match c.cl_super with
-					| None -> ()
-					| Some (c',_) -> add_relation c'.cl_name_pos (Extended,c.cl_name_pos);
-				end;
-				collect_overrides c;
-				let field cf =
-					if cf.cf_pos.pmin > c.cl_name_pos.pmin then declare (SKField cf) cf.cf_name_pos;
-					let _ = follow cf.cf_type in
-					match cf.cf_expr with None -> () | Some e -> collect_references c e
-				in
-				Option.may field c.cl_constructor;
-				List.iter field c.cl_ordered_fields;
-				List.iter field c.cl_ordered_statics;
-			| TEnumDecl en ->
-				declare (SKEnum en) en.e_name_pos;
-				PMap.iter (fun _ ef -> declare (SKEnumField ef) ef.ef_name_pos) en.e_constrs
-			| _ ->
-				()
-		) ctx.com.types;
-		let explore_type_hint p t = match follow t with
-			| TInst(c,_) -> add_relation c.cl_name_pos (Referenced,(patch_string_pos_front p (snd c.cl_path)))
-			| _ -> ()
-		in
-		Hashtbl.iter (fun p t ->
-			explore_type_hint p t
-		) ctx.com.shared.shared_display_information.type_hints;
-		let l = List.fold_left (fun acc (_,cfi,_,cfo) -> match cfo with
-			| Some cf -> if List.mem_assoc cf.cf_name_pos acc then acc else (cf.cf_name_pos,cfi.cf_name_pos) :: acc
-			| None -> acc
-		) [] ctx.com.display_information.interface_field_implementations in
-		List.iter (fun (p,p') -> add_relation p' (Implemented,p)) l;
-		let deal_with_imports paths =
-			let check_subtype m s p =
-				try
-					let mt = List.find (fun mt -> snd (t_infos mt).mt_path = s) m.m_types in
-					add_relation (t_infos mt).mt_name_pos (Referenced,p);
-					Some mt
-				with Not_found ->
-					None
-			in
-			let check_module path p =
-				let m = ctx.g.do_load_module ctx path p in
-				m
-			in
-			let check_field c s p =
-				let cf = PMap.find s c.cl_statics in
-				add_relation cf.cf_name_pos (Referenced,p)
-			in
-			let check_subtype_field m ssub psub sfield pfield = match check_subtype m ssub psub with
-				| Some (TClassDecl c) -> check_field c sfield pfield
-				| _ -> ()
-			in
-			PMap.iter (fun p (_,path) ->
-				match ImportHandling.convert_import_to_something_usable { p with pmin = p.pmax - 1; pmax = p.pmax - 1 } path,List.rev path with
-				| (IDKSubType(sl,s1,s2),_),(_,psubtype) :: (_,pmodule) :: _ ->
-					let m = check_module (sl,s1) pmodule in
-					(*ignore(check_subtype m s1 pmodule);*)
-					ignore(check_subtype m s2 psubtype)
-				| (IDKModuleField(sl,s1,s2),_),(_,pfield) :: (_,pmodule) :: _ ->
-					let m = check_module (sl,s1) pmodule in
-					check_subtype_field m s1 pmodule s2 pfield
-				| (IDKSubTypeField(sl,s1,s2,s3),_),(_,pfield) :: (_,psubtype) :: (_,pmodule) :: _ ->
-					let m = check_module (sl,s1) pmodule in
-					check_subtype_field m s2 psubtype s3 pfield
-				| (IDKModule(sl,s),_),(_,pmodule) :: _ ->
-					let m = check_module (sl,s) pmodule in
-					ignore(check_subtype m s pmodule);
-				| _ ->
-					()
-			) paths
-		in
-		if false then deal_with_imports ctx.com.shared.shared_display_information.import_positions;
-		symbols,relations
-end
-
-let explore_class_paths ctx class_paths recusive f_pack f_module f_type =
-	let rec loop dir pack =
-		try
-			let entries = Sys.readdir dir in
-			Array.iter (fun file ->
-				match file with
-					| "." | ".." ->
-						()
-					| _ when Sys.is_directory (dir ^ file) && file.[0] >= 'a' && file.[0] <= 'z' ->
-						f_pack file;
-						if recusive then loop (dir ^ file ^ "/") (file :: pack)
-					| _ ->
-						let l = String.length file in
-						if l > 3 && String.sub file (l - 3) 3 = ".hx" then begin
-							try
-								let name = String.sub file 0 (l - 3) in
-								let path = (List.rev pack,name) in
-								let md = ctx.g.do_load_module ctx path null_pos in
-								f_module md;
-								List.iter (fun mt -> f_type mt) md.m_types
-							with _ ->
-								()
-						end
-			) entries;
-		with Sys_error _ ->
-			()
-	in
-	List.iter (fun dir -> loop dir []) class_paths
-
-module ToplevelCollector = struct
-	open IdentifierType
-
-	let run ctx only_types =
-		let acc = DynArray.create () in
-
-		if not only_types then begin
-			(* locals *)
-			PMap.iter (fun _ v ->
-				if not (is_gen_local v) then
-					DynArray.add acc (ITLocal v)
-			) ctx.locals;
-
-			(* member vars *)
-			if ctx.curfun <> FunStatic then begin
-				let rec loop c =
-					List.iter (fun cf ->
-						DynArray.add acc (ITMember(ctx.curclass,cf))
-					) c.cl_ordered_fields;
-					match c.cl_super with
-						| None ->
-							()
-						| Some (csup,tl) ->
-							loop csup; (* TODO: type parameters *)
-				in
-				loop ctx.curclass;
-				(* TODO: local using? *)
-			end;
-
-			(* statics *)
-			List.iter (fun cf ->
-				DynArray.add acc (ITStatic(ctx.curclass,cf))
-			) ctx.curclass.cl_ordered_statics;
-
-			(* enum constructors *)
-			let rec enum_ctors t =
-				match t with
-				| TAbstractDecl ({a_impl = Some c} as a) when Meta.has Meta.Enum a.a_meta ->
-					List.iter (fun cf ->
-						if (Meta.has Meta.Enum cf.cf_meta) then DynArray.add acc (ITEnumAbstract(a,cf));
-					) c.cl_ordered_statics
-				| TClassDecl _ | TAbstractDecl _ ->
-					()
-				| TTypeDecl t ->
-					begin match follow t.t_type with
-						| TEnum (e,_) -> enum_ctors (TEnumDecl e)
-						| _ -> ()
-					end
-				| TEnumDecl e ->
-					PMap.iter (fun _ ef ->
-						DynArray.add acc (ITEnum(e,ef))
-					) e.e_constrs;
-			in
-			List.iter enum_ctors ctx.m.curmod.m_types;
-			List.iter enum_ctors (List.map fst ctx.m.module_types);
-
-			(* imported globals *)
-			PMap.iter (fun _ (mt,s,_) ->
-				try
-					let t = match resolve_typedef mt with
-						| TClassDecl c -> (PMap.find s c.cl_statics).cf_type
-						| TEnumDecl en -> (PMap.find s en.e_constrs).ef_type
-						| TAbstractDecl {a_impl = Some c} -> (PMap.find s c.cl_statics).cf_type
-						| _ -> raise Not_found
-					in
-					DynArray.add acc (ITGlobal(mt,s,t))
-				with Not_found ->
-					()
-			) ctx.m.module_globals;
-
-			(* literals *)
-			DynArray.add acc (ITLiteral "null");
-			DynArray.add acc (ITLiteral "true");
-			DynArray.add acc (ITLiteral "false");
-		end;
-
-		let module_types = ref [] in
-
-		let add_type mt =
-			match mt with
-			| TClassDecl {cl_kind = KAbstractImpl _} -> ()
-			| _ ->
-				let path = (t_infos mt).mt_path in
-				if not (List.exists (fun mt2 -> (t_infos mt2).mt_path = path) !module_types) then begin
-					(match mt with
-					| TClassDecl c | TAbstractDecl { a_impl = Some c } when Meta.has Meta.CoreApi c.cl_meta ->
-						!merge_core_doc_ref ctx c
-					| _ -> ());
-					module_types := mt :: !module_types
-				end
-		in
-
-		(* module types *)
-		List.iter add_type ctx.m.curmod.m_types;
-
-		(* module imports *)
-		List.iter add_type (List.map fst ctx.m.module_types);
-
-		(* module using *)
-		List.iter (fun (c,_) ->
-			add_type (TClassDecl c)
-		) ctx.m.module_using;
-
-		(* TODO: wildcard packages. How? *)
-
-		(* packages and toplevel types *)
-		let class_paths = ctx.com.class_path in
-		let class_paths = List.filter (fun s -> s <> "") class_paths in
-
-		let packages = ref [] in
-		let add_package pack =
-			try
-				begin match PMap.find pack ctx.com.package_rules with
-					| Forbidden ->
-						()
-					| _ ->
-						raise Not_found
-				end
-			with Not_found ->
-				if not (List.mem pack !packages) then packages := pack :: !packages
-		in
-
-		explore_class_paths ctx class_paths false add_package (fun _ -> ()) add_type;
-
-		List.iter (fun pack ->
-			DynArray.add acc (ITPackage pack)
-		) !packages;
-
-		List.iter (fun mt ->
-			DynArray.add acc (ITType mt)
-		) !module_types;
-		DynArray.to_list acc
-
-	let handle_unresolved_identifier ctx i p only_types =
-		let l = run ctx only_types in
-		let cl = List.map (fun it ->
-			let s = IdentifierType.get_name it in
-			(s,it),StringError.levenshtein i s
-		) l in
-		let cl = List.sort (fun (_,c1) (_,c2) -> compare c1 c2) cl in
-		let cl = StringError.filter_similar (fun (s,_) r -> r > 0 && r <= (min (String.length s) (String.length i)) / 3) cl in
-		ctx.com.display_information.unresolved_identifiers <- (i,p,cl) :: ctx.com.display_information.unresolved_identifiers
-end
\ No newline at end of file
diff --git a/src/display/displayOutput.ml b/src/display/displayOutput.ml
deleted file mode 100644
index c16f157718c765ad8e37d50859c5d578c35cc8dd..0000000000000000000000000000000000000000
--- a/src/display/displayOutput.ml
+++ /dev/null
@@ -1,801 +0,0 @@
-open Globals
-open Common
-open Common.DisplayMode
-open Type
-open Display
-open Typecore
-
-(* Old XML stuff *)
-
-let htmlescape s =
-	let s = String.concat "&amp;" (ExtString.String.nsplit s "&") in
-	let s = String.concat "&lt;" (ExtString.String.nsplit s "<") in
-	let s = String.concat "&gt;" (ExtString.String.nsplit s ">") in
-	let s = String.concat "&quot;" (ExtString.String.nsplit s "\"") in
-	s
-
-let get_timer_fields start_time =
-	let tot = ref 0. in
-	Hashtbl.iter (fun _ t -> tot := !tot +. t.total) Common.htimers;
-	let fields = [("@TOTAL", Printf.sprintf "%.3fs" (get_time() -. start_time))] in
-	if !tot > 0. then
-		Hashtbl.fold (fun _ t acc ->
-			((String.concat "." t.id),(Printf.sprintf "%.3fs (%.0f%%)" t.total (t.total *. 100. /. !tot))) :: acc
-		) Common.htimers fields
-	else
-		fields
-
-let print_keywords () =
-	let b = Buffer.create 0 in
-	Buffer.add_string b "<list>\n";
-	Hashtbl.iter (fun k _ ->
-		Buffer.add_string b (Printf.sprintf "<i n=\"%s\"></i>\n" k)
-	) Lexer.keywords;
-	Buffer.add_string b "</list>\n";
-	Buffer.contents b
-
-let print_fields fields =
-	let b = Buffer.create 0 in
-	Buffer.add_string b "<list>\n";
-	List.iter (fun (n,k,d) ->
-		let s_kind, t = match k with
-			| FKVar t -> "var", s_type (print_context()) t
-			| FKMethod t -> "method", s_type (print_context()) t
-			| FKType t -> "type", s_type (print_context()) t
-			| FKPackage -> "package", ""
-			| FKModule -> "type", ""
-			| FKMetadata -> "metadata", ""
-			| FKTimer s -> "timer", s
-		in
-		Buffer.add_string b (Printf.sprintf "<i n=\"%s\" k=\"%s\"><t>%s</t><d>%s</d></i>\n" n s_kind (htmlescape t) (htmlescape d))
-	) (List.sort (fun (a,ak,_) (b,bk,_) -> compare (display_field_kind_index ak,a) (display_field_kind_index bk,b)) fields);
-	Buffer.add_string b "</list>\n";
-	Buffer.contents b
-
-let maybe_print_doc d =
-	Option.map_default (fun s -> Printf.sprintf " d=\"%s\"" (htmlescape s)) "" d
-
-let print_toplevel il =
-	let b = Buffer.create 0 in
-	Buffer.add_string b "<il>\n";
-	let s_type t = htmlescape (s_type (print_context()) t) in
-	let s_doc d = maybe_print_doc d in
-	List.iter (fun id -> match id with
-		| IdentifierType.ITLocal v ->
-			Buffer.add_string b (Printf.sprintf "<i k=\"local\" t=\"%s\">%s</i>\n" (s_type v.v_type) v.v_name);
-		| IdentifierType.ITMember(c,cf) ->
-			Buffer.add_string b (Printf.sprintf "<i k=\"member\" t=\"%s\"%s>%s</i>\n" (s_type cf.cf_type) (s_doc cf.cf_doc) cf.cf_name);
-		| IdentifierType.ITStatic(c,cf) ->
-			Buffer.add_string b (Printf.sprintf "<i k=\"static\" t=\"%s\"%s>%s</i>\n" (s_type cf.cf_type) (s_doc cf.cf_doc) cf.cf_name);
-		| IdentifierType.ITEnum(en,ef) ->
-			Buffer.add_string b (Printf.sprintf "<i k=\"enum\" t=\"%s\"%s>%s</i>\n" (s_type ef.ef_type) (s_doc ef.ef_doc) ef.ef_name);
-		| IdentifierType.ITEnumAbstract(a,cf) ->
-			Buffer.add_string b (Printf.sprintf "<i k=\"enumabstract\" t=\"%s\"%s>%s</i>\n" (s_type cf.cf_type) (s_doc cf.cf_doc) cf.cf_name);
-		| IdentifierType.ITGlobal(mt,s,t) ->
-			Buffer.add_string b (Printf.sprintf "<i k=\"global\" p=\"%s\" t=\"%s\">%s</i>\n" (s_type_path (t_infos mt).mt_path) (s_type t) s);
-		| IdentifierType.ITType(mt) ->
-			let infos = t_infos mt in
-			Buffer.add_string b (Printf.sprintf "<i k=\"type\" p=\"%s\"%s>%s</i>\n" (s_type_path infos.mt_path) (s_doc infos.mt_doc) (snd infos.mt_path));
-		| IdentifierType.ITPackage s ->
-			Buffer.add_string b (Printf.sprintf "<i k=\"package\">%s</i>\n" s)
-		| IdentifierType.ITLiteral s ->
-			Buffer.add_string b (Printf.sprintf "<i k=\"literal\">%s</i>\n" s)
-		| IdentifierType.ITTimer s ->
-			Buffer.add_string b (Printf.sprintf "<i k=\"timer\">%s</i>\n" s)
-	) il;
-	Buffer.add_string b "</il>";
-	Buffer.contents b
-
-let print_type t p doc =
-	let b = Buffer.create 0 in
-	if p = null_pos then
-		Buffer.add_string b "<type"
-	else begin
-		let error_printer file line = Printf.sprintf "%s:%d:" (Path.unique_full_path file) line in
-		let epos = Lexer.get_error_pos error_printer p in
-		Buffer.add_string b ("<type p=\"" ^ (htmlescape epos) ^ "\"")
-	end;
-	Buffer.add_string b (maybe_print_doc doc);
-	Buffer.add_string b ">\n";
-	Buffer.add_string b (htmlescape (s_type (print_context()) t));
-	Buffer.add_string b "\n</type>\n";
-	Buffer.contents b
-
-let print_signatures tl =
-	let b = Buffer.create 0 in
-	List.iter (fun ((args,ret),doc) ->
-		Buffer.add_string b "<type";
-		Option.may (fun s -> Buffer.add_string b (Printf.sprintf " d=\"%s\"" (htmlescape s))) doc;
-		Buffer.add_string b ">\n";
-		Buffer.add_string b (htmlescape (s_type (print_context()) (TFun(args,ret))));
-		Buffer.add_string b "\n</type>\n";
-	) tl;
-	Buffer.contents b
-
-let print_positions pl =
-	let b = Buffer.create 0 in
-	let error_printer file line = Printf.sprintf "%s:%d:" (Path.get_real_path file) line in
-	Buffer.add_string b "<list>\n";
-	List.iter (fun p ->
-		let epos = Lexer.get_error_pos error_printer p in
-		Buffer.add_string b "<pos>";
-		Buffer.add_string b epos;
-		Buffer.add_string b "</pos>\n";
-	) pl;
-	Buffer.add_string b "</list>";
-	Buffer.contents b
-
-let display_memory com =
-	let verbose = com.verbose in
-	let print = print_endline in
-	let fmt_size sz =
-		if sz < 1024 then
-			string_of_int sz ^ " B"
-		else if sz < 1024*1024 then
-			string_of_int (sz asr 10) ^ " KB"
-		else
-			Printf.sprintf "%.1f MB" ((float_of_int sz) /. (1024.*.1024.))
-	in
-	let size v =
-		fmt_size (mem_size v)
-	in
-	Gc.full_major();
-	Gc.compact();
-	let mem = Gc.stat() in
-	print ("Total Allocated Memory " ^ fmt_size (mem.Gc.heap_words * (Sys.word_size asr 8)));
-	print ("Free Memory " ^ fmt_size (mem.Gc.free_words * (Sys.word_size asr 8)));
-	(match CompilationServer.get() with
-	| None ->
-		print "No cache found";
-	| Some {CompilationServer.cache = c} ->
-		print ("Total cache size " ^ size c);
-		print ("  haxelib " ^ size c.CompilationServer.c_haxelib);
-		print ("  parsed ast " ^ size c.CompilationServer.c_files ^ " (" ^ string_of_int (Hashtbl.length c.CompilationServer.c_files) ^ " files stored)");
-		print ("  typed modules " ^ size c.CompilationServer.c_modules ^ " (" ^ string_of_int (Hashtbl.length c.CompilationServer.c_modules) ^ " modules stored)");
-		let rec scan_module_deps m h =
-			if Hashtbl.mem h m.m_id then
-				()
-			else begin
-				Hashtbl.add h m.m_id m;
-				PMap.iter (fun _ m -> scan_module_deps m h) m.m_extra.m_deps
-			end
-		in
-		let all_modules = Hashtbl.fold (fun _ m acc -> PMap.add m.m_id m acc) c.CompilationServer.c_modules PMap.empty in
-		let modules = Hashtbl.fold (fun (path,key) m acc ->
-			let mdeps = Hashtbl.create 0 in
-			scan_module_deps m mdeps;
-			let deps = ref [] in
-			let out = ref all_modules in
-			Hashtbl.iter (fun _ md ->
-				out := PMap.remove md.m_id !out;
-				if m == md then () else begin
-				deps := Obj.repr md :: !deps;
-				List.iter (fun t ->
-					match t with
-					| TClassDecl c ->
-						deps := Obj.repr c :: !deps;
-						List.iter (fun f -> deps := Obj.repr f :: !deps) c.cl_ordered_statics;
-						List.iter (fun f -> deps := Obj.repr f :: !deps) c.cl_ordered_fields;
-					| TEnumDecl e ->
-						deps := Obj.repr e :: !deps;
-						List.iter (fun n -> deps := Obj.repr (PMap.find n e.e_constrs) :: !deps) e.e_names;
-					| TTypeDecl t -> deps := Obj.repr t :: !deps;
-					| TAbstractDecl a -> deps := Obj.repr a :: !deps;
-				) md.m_types;
-				end
-			) mdeps;
-			let chk = Obj.repr Common.memory_marker :: PMap.fold (fun m acc -> Obj.repr m :: acc) !out [] in
-			let inf = Objsize.objsize m !deps chk in
-			(m,Objsize.size_with_headers inf, (inf.Objsize.reached,!deps,!out)) :: acc
-		) c.CompilationServer.c_modules [] in
-		let cur_key = ref "" and tcount = ref 0 and mcount = ref 0 in
-		List.iter (fun (m,size,(reached,deps,out)) ->
-			let key = m.m_extra.m_sign in
-			if key <> !cur_key then begin
-				print (Printf.sprintf ("    --- CONFIG %s ----------------------------") (Digest.to_hex key));
-				cur_key := key;
-			end;
-			let sign md =
-				if md.m_extra.m_sign = key then "" else "(" ^ (try Digest.to_hex md.m_extra.m_sign with _ -> "???" ^ md.m_extra.m_sign) ^ ")"
-			in
-			print (Printf.sprintf "    %s : %s" (s_type_path m.m_path) (fmt_size size));
-			(if reached then try
-				incr mcount;
-				let lcount = ref 0 in
-				let leak l =
-					incr lcount;
-					incr tcount;
-					print (Printf.sprintf "      LEAK %s" l);
-					if !lcount >= 3 && !tcount >= 100 && not verbose then begin
-						print (Printf.sprintf "      ...");
-						raise Exit;
-					end;
-				in
-				if (Objsize.objsize m deps [Obj.repr Common.memory_marker]).Objsize.reached then leak "common";
-				PMap.iter (fun _ md ->
-					if (Objsize.objsize m deps [Obj.repr md]).Objsize.reached then leak (s_type_path md.m_path ^ sign md);
-				) out;
-			with Exit ->
-				());
-			if verbose then begin
-				print (Printf.sprintf "      %d total deps" (List.length deps));
-				PMap.iter (fun _ md ->
-					print (Printf.sprintf "      dep %s%s" (s_type_path md.m_path) (sign md));
-				) m.m_extra.m_deps;
-			end;
-			flush stdout
-		) (List.sort (fun (m1,s1,_) (m2,s2,_) ->
-			let k1 = m1.m_extra.m_sign and k2 = m2.m_extra.m_sign in
-			if k1 = k2 then s1 - s2 else if k1 > k2 then 1 else -1
-		) modules);
-		if !mcount > 0 then print ("*** " ^ string_of_int !mcount ^ " modules have leaks !");
-		print "Cache dump complete")
-
-module TypePathHandler = struct
-	let unique l =
-		let rec _unique = function
-			| [] -> []
-			| x1 :: x2 :: l when x1 = x2 -> _unique (x2 :: l)
-			| x :: l -> x :: _unique l
-		in
-		_unique (List.sort compare l)
-
-	let rec read_type_path com p =
-		let classes = ref [] in
-		let packages = ref [] in
-		let p = (match p with
-			| x :: l ->
-				(try
-					match PMap.find x com.package_rules with
-					| Directory d -> d :: l
-					| Remap s -> s :: l
-					| _ -> p
-				with
-					Not_found -> p)
-			| _ -> p
-		) in
-		List.iter (fun path ->
-			let dir = path ^ String.concat "/" p in
-			let r = (try Sys.readdir dir with _ -> [||]) in
-			Array.iter (fun f ->
-				if (try (Unix.stat (dir ^ "/" ^ f)).Unix.st_kind = Unix.S_DIR with _ -> false) then begin
-					if f.[0] >= 'a' && f.[0] <= 'z' then begin
-						if p = ["."] then
-							match read_type_path com [f] with
-							| [] , [] -> ()
-							| _ ->
-								try
-									match PMap.find f com.package_rules with
-									| Forbidden -> ()
-									| Remap f -> packages := f :: !packages
-									| Directory _ -> raise Not_found
-								with Not_found ->
-									packages := f :: !packages
-						else
-							packages := f :: !packages
-					end;
-				end else if file_extension f = "hx" then begin
-					let c = Filename.chop_extension f in
-					if String.length c < 2 || String.sub c (String.length c - 2) 2 <> "__" then classes := c :: !classes;
-				end;
-			) r;
-		) com.class_path;
-		List.iter (fun (_,_,extract) ->
-			Hashtbl.iter (fun (path,name) _ ->
-				if path = p then classes := name :: !classes else
-				let rec loop p1 p2 =
-					match p1, p2 with
-					| [], _ -> ()
-					| x :: _, [] -> packages := x :: !packages
-					| a :: p1, b :: p2 -> if a = b then loop p1 p2
-				in
-				loop path p
-			) (extract());
-		) com.swf_libs;
-		List.iter (fun (path,std,close,all_files,lookup) ->
-			List.iter (fun (path, name) ->
-				if path = p then classes := name :: !classes else
-				let rec loop p1 p2 =
-					match p1, p2 with
-					| [], _ -> ()
-					| x :: _, [] -> packages := x :: !packages
-					| a :: p1, b :: p2 -> if a = b then loop p1 p2
-				in
-				loop path p
-			) (all_files())
-		) com.java_libs;
-		List.iter (fun (path,std,all_files,lookup) ->
-			List.iter (fun (path, name) ->
-				if path = p then classes := name :: !classes else
-				let rec loop p1 p2 =
-					match p1, p2 with
-					| [], _ -> ()
-					| x :: _, [] -> packages := x :: !packages
-					| a :: p1, b :: p2 -> if a = b then loop p1 p2
-				in
-			loop path p
-			) (all_files())
-		) com.net_libs;
-		unique !packages, unique !classes
-
-	(** raise field completion listing packages and modules in a given package *)
-	let complete_type_path com p =
-		let packs, modules = read_type_path com p in
-		if packs = [] && modules = [] then
-			(abort ("No classes found in " ^ String.concat "." p) null_pos)
-		else
-			let packs = List.map (fun n -> n,Display.FKPackage,"") packs in
-			let modules = List.map (fun n -> n,Display.FKModule,"") modules in
-			Some (packs @ modules)
-
-	(** raise field completion listing module sub-types and static fields *)
-	let complete_type_path_inner com p c cur_package is_import =
-		try
-			let sl_pack,s_module = match List.rev p with
-				| s :: sl when s.[0] >= 'A' && s.[0] <= 'Z' -> List.rev sl,s
-				| _ -> p,c
-			in
-			let ctx = Typer.create com in
-			let rec lookup p =
-				try
-					Typeload.load_module ctx (p,s_module) null_pos
-				with e ->
-					if cur_package then
-						match List.rev p with
-						| [] -> raise e
-						| _ :: p -> lookup (List.rev p)
-					else
-						raise e
-			in
-			let m = lookup sl_pack in
-			let statics = ref None in
-			let public_types = List.filter (fun t ->
-				let tinfos = t_infos t in
-				let is_module_type = snd tinfos.mt_path = c in
-				if is_import && is_module_type then begin match t with
-					| TClassDecl c ->
-						ignore(c.cl_build());
-						statics := Some c.cl_ordered_statics
-					| _ -> ()
-				end;
-				not tinfos.mt_private
-			) m.m_types in
-			let types =
-				if c <> s_module then
-					[]
-				else
-					List.map (fun t ->
-						let infos = t_infos t in
-						(snd infos.mt_path), Display.FKModule, (Option.default "" infos.mt_doc)
-					) public_types
-			in
-			let make_field_doc cf =
-				cf.cf_name,
-				(match cf.cf_kind with Method _ -> Display.FKMethod cf.cf_type | Var _ -> Display.FKVar cf.cf_type),
-				(match cf.cf_doc with Some s -> s | None -> "")
-			in
-			let fields = match !statics with
-				| None -> types
-				| Some cfl -> types @ (List.map make_field_doc (List.filter (fun cf -> cf.cf_public) cfl))
-			in
-			Some fields
-		with _ ->
-			abort ("Could not load module " ^ (s_type_path (p,c))) null_pos
-end
-
-(* New JSON stuff *)
-
-open Json
-
-(** return a range JSON structure for given position
-    positions are 0-based and the result object looks like this:
-    {
-        start: {line: 0, character: 0},
-        end: {line: 3, character: 42},
-    }
-*)
-let pos_to_json_range p =
-	if p.pmin = -1 then
-		JNull
-	else
-		let l1, p1, l2, p2 = Lexer.get_pos_coords p in
-		let to_json l c = JObject [("line", JInt (l - 1)); ("character", JInt c)] in
-		JObject [
-			("start", to_json l1 p1);
-			("end", to_json l2 p2);
-		]
-
-let print_signature tl display_arg =
-	let st = s_type (print_context()) in
-	let s_arg (n,o,t) = Printf.sprintf "%s%s:%s" (if o then "?" else "") n (st t) in
-	let s_fun args ret = Printf.sprintf "(%s):%s" (String.concat ", " (List.map s_arg args)) (st ret) in
-	let siginf = List.map (fun ((args,ret),doc) ->
-		let label = s_fun args ret in
-		let parameters =
-			List.map (fun arg ->
-					let label = s_arg arg in
-					JObject [
-						"label",JString label
-					]
-			) args
-		in
-		let js = [
-			"label",JString label;
-			"parameters",JArray parameters;
-		] in
-		JObject (match doc with None -> js | Some s -> ("documentation",JString s) :: js)
-	) tl in
-	let jo = JObject [
-		"signatures",JArray siginf;
-		"activeParameter",JInt display_arg;
-		"activeSignature",JInt 0;
-	] in
-	let b = Buffer.create 0 in
-	write_json (Buffer.add_string b) jo;
-	Buffer.contents b
-
-module StatisticsPrinter = struct
-	open Statistics
-
-	let relation_to_string = function
-		| Implemented -> "implementers"
-		| Extended -> "subclasses"
-		| Overridden -> "overrides"
-		| Referenced -> "references"
-
-	let symbol_to_string = function
-		| SKClass _ -> "class type"
-		| SKInterface _ -> "interface type"
-		| SKEnum _ -> "enum type"
-		| SKField _ -> "class field"
-		| SKEnumField _ -> "enum field"
-		| SKVariable _ -> "variable"
-
-	let print_statistics (kinds,relations) =
-		let files = Hashtbl.create 0 in
-		Hashtbl.iter (fun p rl ->
-			let file = Path.get_real_path p.pfile in
-			try
-				Hashtbl.replace files file ((p,rl) :: Hashtbl.find files file)
-			with Not_found ->
-				Hashtbl.add files file [p,rl]
-		) relations;
-		let ja = Hashtbl.fold (fun file relations acc ->
-			let l = List.map (fun (p,rl) ->
-				let h = Hashtbl.create 0 in
-				List.iter (fun (r,p) ->
-					let s = relation_to_string r in
-					let jo = JObject [
-						"range",pos_to_json_range p;
-						"file",JString (Path.get_real_path p.pfile);
-					] in
-					try Hashtbl.replace h s (jo :: Hashtbl.find h s)
-					with Not_found -> Hashtbl.add h s [jo]
-				) rl;
-				let l = Hashtbl.fold (fun s js acc -> (s,JArray js) :: acc) h [] in
-				let l = ("range",pos_to_json_range p) :: l in
-				let l = try ("kind",JString (symbol_to_string (Hashtbl.find kinds p))) :: l with Not_found -> l in
-				JObject l
-			) relations in
-			(JObject [
-				"file",JString file;
-				"statistics",JArray l
-			]) :: acc
-		) files [] in
-		let b = Buffer.create 0 in
-		write_json (Buffer.add_string b) (JArray ja);
-		Buffer.contents b
-end
-
-module DiagnosticsPrinter = struct
-	open Diagnostics
-	open Diagnostics.DiagnosticsKind
-	open DisplayTypes
-
-	type t = DiagnosticsKind.t * pos
-
-	module UnresolvedIdentifierSuggestion = struct
-		type t =
-			| UISImport
-			| UISTypo
-
-		let to_int = function
-			| UISImport -> 0
-			| UISTypo -> 1
-	end
-
-	let print_diagnostics ctx global =
-		let com = ctx.com in
-		let diag = Hashtbl.create 0 in
-		let add dk p sev args =
-			let file = Path.get_real_path p.pfile in
-			let diag = try
-				Hashtbl.find diag file
-			with Not_found ->
-				let d = DynArray.create() in
-				Hashtbl.add diag file d;
-				d
-			in
-			DynArray.add diag (dk,p,sev,args)
-		in
-		let add dk p sev args =
-			if global || is_display_file p.pfile then add dk p sev args
-		in
-		let find_type i =
-			let types = ref [] in
-			Hashtbl.iter (fun _ m ->
-				List.iter (fun mt ->
-					let s_full_type_path (p,s) n = s_type_path (p,s) ^ if (s <> n) then "." ^ n else "" in
-					let tinfos = t_infos mt in
-					if snd tinfos.mt_path = i then
-						types := JObject [
-							"kind",JInt (UnresolvedIdentifierSuggestion.to_int UnresolvedIdentifierSuggestion.UISImport);
-							"name",JString (s_full_type_path m.m_path i)
-						] :: !types
-				) m.m_types;
-			) ctx.g.modules;
-			!types
-		in
-		List.iter (fun (s,p,suggestions) ->
-			let suggestions = List.map (fun (s,_) ->
-				JObject [
-					"kind",JInt (UnresolvedIdentifierSuggestion.to_int UnresolvedIdentifierSuggestion.UISTypo);
-					"name",JString s
-				]
-			) suggestions in
-			add DKUnresolvedIdentifier p DiagnosticsSeverity.Error (JArray (suggestions @ (find_type s)));
-		) com.display_information.unresolved_identifiers;
-		PMap.iter (fun p (r,_) ->
-			if not !r then add DKUnusedImport p DiagnosticsSeverity.Warning (JArray [])
-		) com.shared.shared_display_information.import_positions;
-		List.iter (fun (s,p,sev) ->
-			add DKCompilerError p sev (JString s)
-		) com.shared.shared_display_information.diagnostics_messages;
-		List.iter (fun (s,p,prange) ->
-			add DKRemovableCode p DiagnosticsSeverity.Warning (JObject ["description",JString s;"range",if prange = null_pos then JNull else pos_to_json_range prange])
-		) com.shared.shared_display_information.removable_code;
-		let jl = Hashtbl.fold (fun file diag acc ->
-			let jl = DynArray.fold_left (fun acc (dk,p,sev,jargs) ->
-				(JObject [
-					"kind",JInt (to_int dk);
-					"severity",JInt (DiagnosticsSeverity.to_int sev);
-					"range",pos_to_json_range p;
-					"args",jargs
-				]) :: acc
-			) [] diag in
-			(JObject [
-				"file",JString file;
-				"diagnostics",JArray jl
-			]) :: acc
-		) diag [] in
-		let js = JArray jl in
-		let b = Buffer.create 0 in
-		write_json (Buffer.add_string b) js;
-		Buffer.contents b
-end
-
-module ModuleSymbolsPrinter = struct
-	open DisplayTypes.SymbolKind
-	open DisplayTypes.SymbolInformation
-
-	let print_module_symbols com symbols filter =
-		let regex = Option.map Str.regexp_case_fold filter in
-		let reported = Hashtbl.create 0 in
-		let add si =
-			if Hashtbl.mem reported si.pos then false
-			else begin
-				let b = match regex with
-					| None -> true
-					| Some regex -> (try ignore(Str.search_forward regex si.name 0); true with Not_found -> false)
-				in
-				Hashtbl.replace reported si.pos true;
-				b
-			end
-		in
-		let ja = List.fold_left (fun acc (file,l) ->
-			let jl = ExtList.List.filter_map (fun si ->
-				if not (add si) then
-					None
-				else begin
-					let l =
-						("name",JString si.name) ::
-						("kind",JInt (to_int si.kind)) ::
-						("range", pos_to_json_range si.pos) ::
-						(match si.container_name with None -> [] | Some s -> ["containerName",JString s])
-					in
-					Some (JObject l)
-				end
-			) (DynArray.to_list l) in
-			if jl = [] then
-				acc
-			else
-				(JObject [
-					"file",JString file;
-					"symbols",JArray jl
-				]) :: acc
-		) [] symbols in
-		let js = JArray ja in
-		let b = Buffer.create 0 in
-		write_json (Buffer.add_string b) js;
-		Buffer.contents b
-end
-
-(* Mode processing *)
-
-exception Completion of string
-
-let unquote v =
-	let len = String.length v in
-	if len > 0 && v.[0] = '"' && v.[len - 1] = '"' then String.sub v 1 (len - 2) else v
-
-let handle_display_argument com file_pos pre_compilation did_something =
-	match file_pos with
-	| "classes" ->
-		pre_compilation := (fun() -> raise (Parser.TypePath (["."],None,true))) :: !pre_compilation;
-	| "keywords" ->
-		raise (Completion (print_keywords ()))
-	| "memory" ->
-		did_something := true;
-		(try display_memory com with e -> prerr_endline (Printexc.get_backtrace ()));
-	| "diagnostics" ->
-		Common.define com Define.NoCOpt;
-		com.display <- DisplayMode.create (DMDiagnostics true);
-		Common.display_default := DMDiagnostics true;
-	| _ ->
-		let file, pos = try ExtString.String.split file_pos "@" with _ -> failwith ("Invalid format: " ^ file_pos) in
-		let file = unquote file in
-		let pos, smode = try ExtString.String.split pos "@" with _ -> pos,"" in
-		let mode = match smode with
-			| "position" ->
-				Common.define com Define.NoCOpt;
-				DMPosition
-			| "usage" ->
-				Common.define com Define.NoCOpt;
-				DMUsage false
-			(*| "rename" ->
-				Common.define com Define.NoCOpt;
-				DMUsage true*)
-			| "package" ->
-				DMPackage
-			| "type" ->
-				Common.define com Define.NoCOpt;
-				DMType
-			| "toplevel" ->
-				Common.define com Define.NoCOpt;
-				DMToplevel
-			| "module-symbols" ->
-				Common.define com Define.NoCOpt;
-				DMModuleSymbols None;
-			| "diagnostics" ->
-				Common.define com Define.NoCOpt;
-				DMDiagnostics false;
-			| "statistics" ->
-				Common.define com Define.NoCOpt;
-				DMStatistics
-			| "signature" ->
-				DMSignature
-			| "" ->
-				DMField
-			| _ ->
-				let smode,arg = try ExtString.String.split smode "@" with _ -> pos,"" in
-				match smode with
-					| "resolve" ->
-						DMResolve arg
-					| "workspace-symbols" ->
-						Common.define com Define.NoCOpt;
-						DMModuleSymbols (Some arg)
-					| _ ->
-						DMField
-		in
-		let pos = try int_of_string pos with _ -> failwith ("Invalid format: "  ^ pos) in
-		com.display <- DisplayMode.create mode;
-		Common.display_default := mode;
-		Common.define_value com Define.Display (if smode <> "" then smode else "1");
-		Parser.use_doc := true;
-		Parser.resume_display := {
-			pfile = Path.unique_full_path file;
-			pmin = pos;
-			pmax = pos;
-		}
-
-let process_display_file com classes =
-	let get_module_path_from_file_path com spath =
-		let rec loop = function
-			| [] -> None
-			| cp :: l ->
-				let cp = (if cp = "" then "./" else cp) in
-				let c = Path.add_trailing_slash (Path.get_real_path cp) in
-				let clen = String.length c in
-				if clen < String.length spath && String.sub spath 0 clen = c then begin
-					let path = String.sub spath clen (String.length spath - clen) in
-					(try
-						let path = Path.parse_path path in
-						(match loop l with
-						| Some x as r when String.length (s_type_path x) < String.length (s_type_path path) -> r
-						| _ -> Some path)
-					with _ -> loop l)
-				end else
-					loop l
-		in
-		loop com.class_path
-	in
-	match com.display.dms_display_file_policy with
-		| DFPNo ->
-			()
-		| dfp ->
-			if dfp = DFPOnly then begin
-				classes := [];
-				com.main_class <- None;
-			end;
-			let real = Path.get_real_path (!Parser.resume_display).pfile in
-			(match get_module_path_from_file_path com real with
-			| Some path ->
-				if com.display.dms_kind = DMPackage then raise (DisplayPackage (fst path));
-				classes := path :: !classes
-			| None ->
-				if not (Sys.file_exists real) then failwith "Display file does not exist";
-				(match List.rev (ExtString.String.nsplit real Path.path_sep) with
-				| file :: _ when file.[0] >= 'a' && file.[0] <= 'z' -> failwith ("Display file '" ^ file ^ "' should not start with a lowercase letter")
-				| _ -> ());
-				failwith "Display file was not found in class path"
-			);
-			Common.log com ("Display file : " ^ real);
-			Common.log com ("Classes found : ["  ^ (String.concat "," (List.map s_type_path !classes)) ^ "]")
-
-let process_global_display_mode com tctx = match com.display.dms_kind with
-	| DMUsage with_definition ->
-		let symbols,relations = Statistics.collect_statistics tctx in
-		let rec loop acc relations = match relations with
-			| (Statistics.Referenced,p) :: relations -> loop (p :: acc) relations
-			| _ :: relations -> loop acc relations
-			| [] -> acc
-		in
-		let usages = Hashtbl.fold (fun p sym acc ->
-			if Statistics.is_usage_symbol sym then begin
-				let acc = if with_definition then p :: acc else acc in
-				(try loop acc (Hashtbl.find relations p)
-				with Not_found -> acc)
-			end else
-				acc
-		) symbols [] in
-		let usages = List.sort (fun p1 p2 ->
-			let c = compare p1.pfile p2.pfile in
-			if c <> 0 then c else compare p1.pmin p2.pmin
-		) usages in
-		raise (DisplayPosition usages)
-	| DMDiagnostics global ->
-		Diagnostics.prepare com global;
-		raise (Diagnostics (DiagnosticsPrinter.print_diagnostics tctx global))
-	| DMStatistics ->
-		let stats = Statistics.collect_statistics tctx in
-		raise (Statistics (StatisticsPrinter.print_statistics stats))
-	| DMModuleSymbols filter ->
-		let symbols = com.shared.shared_display_information.document_symbols in
-		let symbols = match CompilationServer.get() with
-			| None -> symbols
-			| Some cs ->
-				let l = CompilationServer.get_context_files cs ((get_signature com) :: (match com.get_macros() with None -> [] | Some com -> [get_signature com])) in
-				List.fold_left (fun acc (file,data) ->
-					print_endline (Printf.sprintf "%s %b" file (is_display_file file));
-					if (filter <> None || is_display_file file) then
-						(file,DocumentSymbols.collect_module_symbols data) :: acc
-					else
-						acc
-				) symbols l
-		in
-		raise (ModuleSymbols(ModuleSymbolsPrinter.print_module_symbols com symbols filter))
-	| _ -> ()
-
-let find_doc t =
-	let doc = match follow t with
-		| TAnon an ->
-			begin match !(an.a_status) with
-				| Statics c -> c.cl_doc
-				| EnumStatics en -> en.e_doc
-				| AbstractStatics a -> a.a_doc
-				| _ -> None
-			end
-		| _ ->
-			None
-	in
-	doc
\ No newline at end of file
diff --git a/src/display/displayTypes.ml b/src/display/displayTypes.ml
deleted file mode 100644
index 83c13cf4f8fea8a367ee71adbf4d40fab0106070..0000000000000000000000000000000000000000
--- a/src/display/displayTypes.ml
+++ /dev/null
@@ -1,59 +0,0 @@
-open Ast
-
-module SymbolKind = struct
-	type t =
-		| Class
-		| Interface
-		| Enum
-		| Typedef
-		| Abstract
-		| Field
-		| Property
-		| Method
-		| Constructor
-		| Function
-		| Variable
-
-	let to_int = function
-		| Class -> 1
-		| Interface -> 2
-		| Enum -> 3
-		| Typedef -> 4
-		| Abstract -> 5
-		| Field -> 6
-		| Property -> 7
-		| Method -> 8
-		| Constructor -> 9
-		| Function -> 10
-		| Variable -> 11
-end
-
-module SymbolInformation = struct
-	type t = {
-		name : string;
-		kind : SymbolKind.t;
-		pos : Globals.pos;
-		container_name : string option;
-	}
-
-	let make name kind pos container_name = {
-		name = name;
-		kind = kind;
-		pos = pos;
-		container_name = container_name;
-	}
-end
-
-module DiagnosticsSeverity = struct
-	type t =
-		| Error
-		| Warning
-		| Information
-		| Hint
-
-	let to_int = function
-		| Error -> 1
-		| Warning -> 2
-		| Information -> 3
-		| Hint -> 4
-end
\ No newline at end of file
diff --git a/src/filters/ES6Ctors.ml b/src/filters/ES6Ctors.ml
new file mode 100644
index 0000000000000000000000000000000000000000..766cbbb5de308204af225455927b0aed3c849016
--- /dev/null
+++ b/src/filters/ES6Ctors.ml
@@ -0,0 +1,243 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+open Common
+open Globals
+open Type
+open Texpr.Builder
+
+(* name of the method to which the constructor is extracted *)
+let ctor_method_name = "_hx_constructor"
+
+(* name of the static bool flag to skip constructor body execution *)
+let skip_ctor_flag_name = "_hx_skip_constructor"
+
+(* replace super(a,b,c) with super._hx_constructor(a,b,c) *)
+let rec replace_super_call e =
+	match e.eexpr with
+	| TCall ({ eexpr = TConst TSuper } as e_super, args) ->
+		let e_super_hxctor = { e_super with eexpr = TField (e_super, FDynamic ctor_method_name) } in
+		{ e with eexpr = TCall (e_super_hxctor, args) }
+	| _ ->
+		map_expr replace_super_call e
+
+exception Accessed_this of texpr
+
+(* return whether given expression has `this` access before calling `super` *)
+let has_this_before_super e =
+	let rec loop e =
+		match e.eexpr with
+		| TCall ({ eexpr = TConst TSuper }, args) ->
+			List.iter loop args;
+			raise Exit
+		| TConst TThis ->
+			raise (Accessed_this e)
+		| _ ->
+			Type.iter loop e
+	in
+	try
+		(loop e; None)
+	with
+		| Exit -> None
+		| Accessed_this e -> Some e
+
+let get_num_args cf =
+	match follow cf.cf_type with
+	| TFun (args, _) -> List.length args
+	| _ -> assert false
+
+(*
+	the filter works in two passes:
+	- mark classes whether they need to support constructor skipping and/or they skip parent's constructor
+	- change the constructors of marked classes (extract body into method and/or add skipping super calls)
+*)
+let rewrite_ctors com =
+	(* we mark classes that need changing by storing them in these two maps *)
+	let needs_ctor_skipping, does_ctor_skipping, inject_super =
+		let l = List.length com.types in
+		Hashtbl.create l, Hashtbl.create l, Hashtbl.create l
+	in
+
+	(*
+		we're using a reference to the root of the inheritance chain so we can easily
+		generate RootClass._hx_skip_constructor expressions
+	*)
+	let mark_does_ctor_skipping cl cl_super p_this_access =
+		let rec mark_needs_ctor_skipping cl =
+			(* for non haxe-generated extern classes we can't generate any valid code, so just fail *)
+			if cl.cl_extern && not (Meta.has Meta.HxGen cl.cl_meta) then begin
+				abort "Must call `super()` constructor before accessing `this` in classes derived from an extern class with constructor" p_this_access;
+			end;
+			try
+				Hashtbl.find needs_ctor_skipping cl.cl_path
+			with Not_found ->
+				let root =
+					match cl.cl_super with
+					| Some ({ cl_constructor = Some ctor_super } as cl_super,_) ->
+						let root = mark_needs_ctor_skipping cl_super in
+						Option.may (fun ctor ->
+							(* if parent's constructor receives less arguments than needed for this - we need to override the constructor *)
+							if get_num_args ctor > get_num_args ctor_super then
+								Hashtbl.add does_ctor_skipping cl.cl_path root;
+						) cl.cl_constructor;
+						root
+					| _ ->
+						cl
+				in
+				Hashtbl.add needs_ctor_skipping cl.cl_path root;
+				root
+		in
+		let root_cl = mark_needs_ctor_skipping cl_super in
+		Hashtbl.add does_ctor_skipping cl.cl_path root_cl;
+	in
+
+	let e_empty_super_call = (* super() *)
+		let e_super = mk (TConst TSuper) t_dynamic null_pos in
+		mk (TCall (e_super,[])) com.basic.tvoid null_pos
+	in
+
+	let activated = ref false in
+	let mark t =
+		match t with
+		| TClassDecl ({ cl_constructor = Some { cf_expr = Some { eexpr = TFunction tf } }; cl_super = Some (cl_super,_) } as cl) ->
+			if Type.has_constructor cl_super then begin
+				(* if parent class has a constructor, check for `this` accesses before calling `super()` *)
+				let this_before_super = has_this_before_super tf.tf_expr in
+				Option.may (fun e_this_access ->
+					activated := true;
+					mark_does_ctor_skipping cl cl_super e_this_access.epos
+				) this_before_super
+			end else begin
+				(* if there was no ctor in the parent class, we still gotta call `super` *)
+				Hashtbl.add inject_super cl.cl_path cl;
+			end
+		| _ -> ()
+	in
+	List.iter mark com.types;
+
+	if !activated then begin
+		(* just some helper common exprs *)
+		let e_false = (make_bool com.basic false null_pos) in
+		let e_true = (make_bool com.basic true null_pos) in
+		let e_hx_ctor = (* this._hx_constructor *)
+			let ethis = mk (TConst TThis) t_dynamic null_pos  in
+			mk (TField (ethis, FDynamic ctor_method_name)) t_dynamic null_pos
+		in
+
+		let change t =
+			match t with
+			| TClassDecl ({ cl_constructor = Some ({ cf_expr = Some ({ eexpr = TFunction tf_ctor } as ctor_expr) } as cf_ctor) } as cl) ->
+				let does_ctor_skipping = try Some (Hashtbl.find does_ctor_skipping cl.cl_path) with Not_found -> None in
+
+				let add_hx_ctor_method () =
+					let cf_fun_ctor = mk_field ctor_method_name cf_ctor.cf_type cf_ctor.cf_pos null_pos in
+					cf_fun_ctor.cf_expr <- Some (replace_super_call ctor_expr);
+					cf_fun_ctor.cf_kind <- Method MethNormal;
+					cl.cl_ordered_fields <- cf_fun_ctor :: cl.cl_ordered_fields;
+					cl.cl_fields <- PMap.add cf_fun_ctor.cf_name cf_fun_ctor cl.cl_fields;
+				in
+
+				let make_hx_ctor_call e_skip_flag = (* this._hx_constructor(a,b,c) *)
+					let hxctor_call_args = List.map (fun (v,_) -> make_local v null_pos) tf_ctor.tf_args in
+					let hx_ctor_call = mk (TCall (e_hx_ctor, hxctor_call_args)) com.basic.tvoid null_pos in
+					if does_ctor_skipping <> None then
+						mk (TBlock [
+							mk (TBinop (OpAssign, e_skip_flag, e_true)) com.basic.tbool null_pos;
+							e_empty_super_call;
+							mk (TBinop (OpAssign, e_skip_flag, e_false)) com.basic.tbool null_pos;
+							hx_ctor_call
+						]) com.basic.tvoid null_pos
+					else
+						hx_ctor_call
+				in
+
+				let make_skip_flag root_cl = (* TopClass._hx_skip_constructor *)
+					let e_top = mk (TTypeExpr (TClassDecl root_cl)) t_dynamic null_pos in
+					mk (TField (e_top, FDynamic skip_ctor_flag_name)) com.basic.tbool null_pos
+				in
+
+				(match (try Some (Hashtbl.find needs_ctor_skipping cl.cl_path) with Not_found -> None) with
+				| Some root ->
+					add_hx_ctor_method ();
+
+					if does_ctor_skipping = None && cl != root then
+						(* for intermediate classes that support skipping but don't do skipping themselves, we can just remove the constructor altogether,
+						because the skipping logic is implemented in the parent constructor, and the actual constructor body is moved into _hx_constructor *)
+						cf_ctor.cf_expr <- None
+					else begin
+						let e_skip =
+							let e_return = (mk (TReturn None) t_dynamic null_pos) in
+							if cl.cl_super = None || (Hashtbl.mem inject_super cl.cl_path)  then
+								(* just `return` *)
+								e_return
+							else
+								(* `{ super(); return; }` *)
+								mk (TBlock [
+									e_empty_super_call;
+									e_return;
+								]) com.basic.tvoid null_pos
+						in
+
+						let e_skip_flag = make_skip_flag root in
+
+						let e_ctor_replaced = { tf_ctor.tf_expr with
+							eexpr = TBlock [
+								mk (TIf (mk_parent e_skip_flag, e_skip, None)) com.basic.tvoid null_pos;
+								make_hx_ctor_call e_skip_flag
+							]
+						} in
+
+						cf_ctor.cf_expr <- Some { ctor_expr with eexpr = TFunction { tf_ctor with tf_expr = e_ctor_replaced } };
+					end;
+
+					if cl == root then begin
+						let cf_skip_ctor = mk_field skip_ctor_flag_name com.basic.tbool null_pos null_pos in
+						cf_skip_ctor.cf_expr <- Some e_false;
+						cl.cl_ordered_statics <- cf_skip_ctor :: cl.cl_ordered_statics;
+						cl.cl_statics <- PMap.add cf_skip_ctor.cf_name cf_skip_ctor cl.cl_statics;
+					end
+				| None ->
+					(match does_ctor_skipping with
+					| Some root ->
+
+						add_hx_ctor_method ();
+
+						let e_skip_flag = make_skip_flag root in
+
+						let e_ctor_replaced = { tf_ctor.tf_expr with
+							eexpr = TBlock [
+								make_hx_ctor_call e_skip_flag
+							]
+						} in
+						cf_ctor.cf_expr <- Some { ctor_expr with eexpr = TFunction { tf_ctor with tf_expr = e_ctor_replaced } };
+
+					| None -> ())
+				)
+			| _ ->
+				()
+		in
+		List.iter change com.types
+	end;
+
+	Hashtbl.iter (fun _ cl ->
+		match cl with
+		| { cl_constructor = Some ({ cf_expr = Some ({ eexpr = TFunction tf } as e_ctor) } as cf_ctor); cl_super = Some (cl_super,_) } ->
+			cl.cl_constructor <- Some { cf_ctor with cf_expr = Some { e_ctor with eexpr = TFunction { tf with tf_expr = { tf.tf_expr with eexpr = TBlock [e_empty_super_call; tf.tf_expr] } } } };
+		| _ ->
+			assert false
+	) inject_super;
diff --git a/src/filters/capturedVars.ml b/src/filters/capturedVars.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b8396312a1cf2909b174729830372cdd99fba0ab
--- /dev/null
+++ b/src/filters/capturedVars.ml
@@ -0,0 +1,291 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+open Globals
+open Type
+open Common
+open LocalUsage
+
+(* BLOCK VARIABLES CAPTURE *)
+(*
+	For some platforms, it will simply mark the variables which are used in closures
+	using the v_capture flag so it can be processed in a more optimized
+
+	For Flash/JS platforms, it will ensure that variables used in loop sub-functions
+	have an unique scope. It transforms the following expression :
+
+	for( x in array )
+		funs.push(function() return x++);
+
+	Into the following :
+
+	for( _x in array ) {
+		var x = [_x];
+		funs.push(function(x) { function() return x[0]++; }(x));
+	}
+*)
+let captured_vars com e =
+	let t = com.basic in
+
+	let impl = match com.platform with
+	(* optimized version for C#/Java - use native arrays *)
+	| Cs | Java ->
+		let cnativearray =
+			match (List.find (fun md -> match md with
+					| TClassDecl ({ cl_path = ["cs"|"java"],"NativeArray" }) -> true
+					| _ -> false
+				) com.types)
+			with TClassDecl cl -> cl | _ -> assert false
+		in
+
+		object
+			method captured_type t = TInst (cnativearray,[t])
+
+			method mk_ref v ve p =
+				match ve with
+				| None ->
+					let eone = mk (TConst (TInt (Int32.of_int 1))) t.tint p in
+					let t = match v.v_type with TInst (_, [t]) -> t | _ -> assert false in
+					mk (TNew (cnativearray,[t],[eone])) v.v_type p
+				| Some e ->
+					{ (Inline.mk_untyped_call "__array__" p [e]) with etype = v.v_type }
+
+			method mk_ref_access e v =
+				mk (TArray ({ e with etype = v.v_type }, mk (TConst (TInt 0l)) t.tint e.epos)) e.etype e.epos
+
+			method mk_init av v pos =
+				let elocal = mk (TLocal v) v.v_type pos in
+				let earray = { (Inline.mk_untyped_call "__array__" pos [elocal]) with etype = av.v_type } in
+				mk (TVar (av,Some earray)) t.tvoid pos
+		end
+	(* default implementation - use haxe array *)
+	| _ ->
+		object
+			method captured_type = t.tarray
+			method mk_ref v ve p =
+				mk (TArrayDecl (match ve with None -> [] | Some e -> [e])) v.v_type p
+			method mk_ref_access e v =
+				mk (TArray ({ e with etype = v.v_type }, mk (TConst (TInt 0l)) t.tint e.epos)) e.etype e.epos
+			method mk_init av v pos =
+				mk (TVar (av,Some (mk (TArrayDecl [mk (TLocal v) v.v_type pos]) av.v_type pos))) t.tvoid pos
+		end
+	in
+
+	let mk_var v used =
+		let v2 = alloc_var v.v_kind v.v_name (PMap.find v.v_id used) v.v_pos in
+		v2.v_meta <- v.v_meta;
+		v2
+	in
+
+	let rec wrap used e =
+		match e.eexpr with
+		| TVar (v,ve) ->
+			let v,ve =
+				if PMap.mem v.v_id used then
+					v, Some (impl#mk_ref v (Option.map (wrap used) ve) e.epos)
+				else
+					v, (match ve with None -> None | Some e -> Some (wrap used e))
+			 in
+			{ e with eexpr = TVar (v,ve) }
+		| TLocal v when PMap.mem v.v_id used ->
+			impl#mk_ref_access e v
+		| TFor (v,it,expr) when PMap.mem v.v_id used ->
+			let vtmp = mk_var v used in
+			let it = wrap used it in
+			let expr = wrap used expr in
+			mk (TFor (vtmp,it,Type.concat (impl#mk_init v vtmp e.epos) expr)) e.etype e.epos
+		| TTry (expr,catchs) ->
+			let catchs = List.map (fun (v,e) ->
+				let e = wrap used e in
+				try
+					let vtmp = mk_var v used in
+					vtmp, Type.concat (impl#mk_init v vtmp e.epos) e
+				with Not_found ->
+					v, e
+			) catchs in
+			mk (TTry (wrap used expr,catchs)) e.etype e.epos
+		| TFunction f ->
+			(*
+				list variables that are marked as used, but also used in that
+				function and which are not declared inside it !
+			*)
+			let fused = ref PMap.empty in
+			let tmp_used = ref used in
+			let rec browse = function
+				| Block f | Loop f | Function f -> f browse
+				| Use ({ v_extra = Some( _ :: _, _) })
+				| Assign ({ v_extra = Some( _ :: _, _) }) when com.platform = Cs || (com.platform = Java && not (Common.defined com Define.Jvm)) ->
+					(* Java and C# deal with functions with type parameters in a different way *)
+					(* so they do should not be wrapped *)
+					()
+				| Use v | Assign v ->
+					if PMap.mem v.v_id !tmp_used then fused := PMap.add v.v_id v !fused;
+				| Declare v ->
+					tmp_used := PMap.remove v.v_id !tmp_used
+			in
+			local_usage browse e;
+			let vars = PMap.fold (fun v acc -> v :: acc) !fused [] in
+
+			(* in case the variable has been marked as used in a parallel scope... *)
+			let fexpr = ref (wrap used f.tf_expr) in
+			let fargs = List.map (fun (v,o) ->
+				if PMap.mem v.v_id used then
+					let vtmp = mk_var v used in
+					fexpr := Type.concat (impl#mk_init v vtmp e.epos) !fexpr;
+					vtmp, o
+				else
+					v, o
+			) f.tf_args in
+			let e = { e with eexpr = TFunction { f with tf_args = fargs; tf_expr = !fexpr } } in
+			(*
+				Create a new function scope to make sure that the captured loop variable
+				will not be overwritten in next loop iteration
+			*)
+			if com.config.pf_capture_policy = CPLoopVars then
+				(* We don't want to duplicate any variable declarations, so let's make copies (issue #3902). *)
+				let new_vars = List.map (fun v -> v.v_id,alloc_var v.v_kind v.v_name v.v_type v.v_pos) vars in
+				let rec loop e = match e.eexpr with
+					| TLocal v ->
+						begin try
+							let v' = List.assoc v.v_id new_vars in
+							v'.v_capture <- true;
+							{e with eexpr = TLocal v'}
+						with Not_found ->
+							e
+						end
+					| _ ->
+						Type.map_expr loop e
+				in
+				let e = loop e in
+				mk (TCall (
+					Texpr.Builder.mk_parent (mk (TFunction {
+						tf_args = List.map (fun (_,v) -> v, None) new_vars;
+						tf_type = e.etype;
+						tf_expr = mk_block (mk (TReturn (Some e)) e.etype e.epos);
+					}) (TFun (List.map (fun (_,v) -> v.v_name,false,v.v_type) new_vars,e.etype)) e.epos),
+					List.map (fun v -> mk (TLocal v) v.v_type e.epos) vars)
+				) e.etype e.epos
+			else
+				e
+		| _ ->
+			map_expr (wrap used) e
+
+	and do_wrap used e =
+		if PMap.is_empty used then
+			e
+		else
+			let used = PMap.map (fun v ->
+				let vt = v.v_type in
+				v.v_type <- impl#captured_type vt;
+				v.v_capture <- true;
+				vt
+			) used in
+			wrap used e
+
+	and out_loop e =
+		match e.eexpr with
+		| TFor _ | TWhile _ ->
+			(*
+				collect variables that are declared in loop but used in subfunctions
+			*)
+			let vars = ref PMap.empty in
+			let used = ref PMap.empty in
+			let depth = ref 0 in
+			let rec collect_vars in_loop = function
+				| Block f ->
+					let old = !vars in
+					f (collect_vars in_loop);
+					vars := old;
+				| Loop f ->
+					let old = !vars in
+					f (collect_vars true);
+					vars := old;
+				| Function f ->
+					incr depth;
+					f (collect_vars false);
+					decr depth;
+				| Use ({ v_extra = Some( _ :: _, _) })
+				| Assign ({ v_extra = Some( _ :: _, _) }) when com.platform = Cs || (com.platform = Java && not (Common.defined com Define.Jvm)) ->
+					(* Java/C# use a special handling for functions with type parmaters *)
+					()
+				| Declare v ->
+					if in_loop then vars := PMap.add v.v_id !depth !vars;
+				| Use v | Assign v ->
+					try
+						let d = PMap.find v.v_id !vars in
+						if d <> !depth then used := PMap.add v.v_id v !used;
+					with Not_found ->
+						()
+			in
+			local_usage (collect_vars false) e;
+			do_wrap !used e
+		| _ ->
+			map_expr out_loop e
+	and all_vars e =
+		let vars = ref PMap.empty in
+		let used = ref PMap.empty in
+		let assigned = ref PMap.empty in
+		let depth = ref 0 in
+		let rec collect_vars = function
+		| Block f ->
+			let old = !vars in
+			f collect_vars;
+			vars := old;
+		| Loop f ->
+			let old = !vars in
+			f collect_vars;
+			vars := old;
+		| Function f ->
+			incr depth;
+			f collect_vars;
+			decr depth;
+		| Declare v ->
+			vars := PMap.add v.v_id !depth !vars;
+		| Use ({ v_extra = Some( _ :: _, _) })
+		| Assign ({ v_extra = Some( _ :: _, _) }) when com.platform = Cs || (com.platform = Java && not (Common.defined com Define.Jvm)) ->
+			()
+		| Use v ->
+			(try
+				let d = PMap.find v.v_id !vars in
+				if d <> !depth then used := PMap.add v.v_id v !used;
+			with Not_found -> ())
+		| Assign v ->
+			(try
+				let d = PMap.find v.v_id !vars in
+				(* different depth - needs wrap *)
+				if d <> !depth then begin
+					used := PMap.add v.v_id v !used;
+					assigned := PMap.add v.v_id v !assigned;
+				end
+				(* same depth but assigned after being used on a different depth - needs wrap *)
+				else if PMap.mem v.v_id !used then
+					assigned := PMap.add v.v_id v !assigned;
+			with Not_found -> ())
+		in
+		local_usage collect_vars e;
+
+		(* mark all capture variables - also used in rename_local_vars at later stage *)
+		PMap.iter (fun _ v -> v.v_capture <- true) !used;
+
+		!assigned
+	in
+	let captured = all_vars e in
+	match com.config.pf_capture_policy with
+	| CPNone -> e
+	| CPWrapRef -> do_wrap captured e
+	| CPLoopVars -> out_loop e
diff --git a/src/filters/defaultArguments.ml b/src/filters/defaultArguments.ml
new file mode 100644
index 0000000000000000000000000000000000000000..bf8379ed83c5407eaeba1d922a01bca51c7686b4
--- /dev/null
+++ b/src/filters/defaultArguments.ml
@@ -0,0 +1,158 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Common
+open Type
+open Codegen
+open Texpr.Builder
+
+(*
+	This Module Filter will go through all defined functions in all modules and change them
+	so they set all default arguments to be of a Nullable type, and adds the unroll from nullable to
+	the not-nullable type in the beginning of the function.
+*)
+
+let gen_check basic t nullable_var const pos =
+	let needs_cast t1 t2 =
+		let is_null t = match t with TAbstract ({a_path = ([],"Null")}, _) -> true | _ -> false in
+		(is_null t1) <> (is_null t2)
+	in
+
+	let const_t = const.etype in
+	let const = if needs_cast t const_t then mk_cast const t pos else const in
+
+	let arg = make_local nullable_var pos in
+	let arg = if needs_cast t nullable_var.v_type then mk_cast arg t pos else arg in
+
+	let check = binop Ast.OpEq (make_local nullable_var pos) (null nullable_var.v_type pos) basic.tbool pos in
+	mk (TIf (check, const, Some arg)) t pos
+
+let add_opt com block pos (var,opt) =
+	match opt with
+	| None | Some {eexpr = TConst TNull} ->
+		(var,opt)
+	| Some ({eexpr = TConst (TString str)} as e) ->
+		block := Texpr.set_default com.basic var e pos :: !block;
+		(var, opt)
+	| Some const ->
+		let basic = com.basic in
+		let nullable_var = alloc_var var.v_kind var.v_name (basic.tnull var.v_type) pos in
+		(* var v = (temp_var == null) ? const : cast temp_var; *)
+		let evar = mk (TVar(var, Some(gen_check basic var.v_type nullable_var const pos))) basic.tvoid pos in
+		block := evar :: !block;
+		(nullable_var, opt)
+
+let rec change_func com cl cf =
+	List.iter (change_func com cl) cf.cf_overloads;
+
+	match cf.cf_kind, follow cf.cf_type with
+	| Var _, _ | Method MethDynamic, _ ->
+		()
+	| _, TFun(args, ret) ->
+		let is_ctor = cf.cf_name = "new" in
+		let basic = com.basic in
+
+		let found = ref false in
+
+		let args = ref (List.map (fun (n,opt,t) ->
+			(n,opt, if opt then (found := true; basic.tnull t) else t)
+		) args) in
+
+		(match !found, cf.cf_expr with
+		| true, Some ({ eexpr = TFunction tf } as texpr) ->
+			let block = ref [] in
+			let tf_args = List.map (add_opt com block tf.tf_expr.epos) tf.tf_args in
+			let arg_assoc = List.map2 (fun (v,o) (v2,_) -> v,(v2,o) ) tf.tf_args tf_args in
+			let rec extract_super e = match e.eexpr with
+				| TBlock (({ eexpr = TCall ({ eexpr = TConst TSuper }, _) } as e2) :: tl) ->
+					e2, tl
+				| TBlock (hd :: tl) ->
+					let e2, tl2 = extract_super hd in
+					e2, tl2 @ tl
+				| _ ->
+					raise Not_found
+			in
+			let block =
+				try
+					if not is_ctor then raise Not_found;
+
+					(* issue #2570 *)
+					(* check if the class really needs the super as the first statement -
+					just to make sure we don't inadvertently break any existing code *)
+					let rec check cl =
+						if not (Meta.has Meta.HxGen cl.cl_meta) then
+							()
+						else match cl.cl_super with
+							| None ->
+								raise Not_found
+							| Some (cl, _) ->
+								check cl
+					in
+					check cl;
+
+					let super, tl = extract_super tf.tf_expr in
+					(match super.eexpr with
+					| TCall ({ eexpr = TConst TSuper } as e1, args) ->
+						(* any super argument will be replaced by an inlined version of the check *)
+						let found = ref false in
+						let rec replace_args e =
+							match e.eexpr with
+							| TLocal v ->
+								(try
+									let v2,o = List.assq v arg_assoc in
+									let o = match o with
+									| None -> raise Not_found
+									| Some o -> o
+									in
+									found := true;
+									gen_check com.basic v.v_type v2 o e.epos
+								with Not_found -> e)
+							| _ ->
+								Type.map_expr replace_args e
+						in
+						let args = List.map replace_args args in
+						{ tf.tf_expr with eexpr = TBlock ((if !found then { super with eexpr = TCall (e1, args) } else super) :: !block @ tl) }
+					| _ -> assert false)
+				with Not_found ->
+					Type.concat { tf.tf_expr with eexpr = TBlock !block; etype = basic.tvoid } tf.tf_expr
+			in
+
+			args := List.map (fun (v,s) -> (v.v_name, (s <> None), v.v_type)) tf_args;
+
+			let cf_type = TFun (!args, ret) in
+			cf.cf_expr <- Some { texpr with
+				eexpr = TFunction { tf with
+					tf_args = tf_args;
+					tf_expr = block
+				};
+				etype = cf_type
+			};
+			cf.cf_type <- cf_type
+
+		| _ -> ());
+		(if !found then cf.cf_type <- TFun(!args, ret))
+	| _, _ -> assert false
+
+let run com md =
+	match md with
+	| TClassDecl cl ->
+		let apply = change_func com cl in
+		List.iter apply cl.cl_ordered_fields;
+		List.iter apply cl.cl_ordered_statics;
+		Option.may apply cl.cl_constructor;
+	| _ -> ()
diff --git a/src/optimization/filters.ml b/src/filters/filters.ml
similarity index 63%
rename from src/optimization/filters.ml
rename to src/filters/filters.ml
index 24df042ef6a05b620be56068d3bfa7e20bc27acc..bc80bfc9d0ad5284f137516e93b7624cff69e746 100644
--- a/src/optimization/filters.ml
+++ b/src/filters/filters.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -23,6 +23,9 @@ open Type
 open Typecore
 open Error
 open Globals
+open FiltersCommon
+
+let get_native_name = TypeloadCheck.get_native_name
 
 (* PASS 1 begin *)
 
@@ -63,33 +66,6 @@ let rec add_final_return e =
 			{ e with eexpr = TFunction f }
 		| _ -> e
 
-let rec wrap_js_exceptions com e =
-	let rec is_error t =
-		match follow t with
-		| TInst ({cl_path = (["js"],"Error")},_) -> true
-		| TInst ({cl_super = Some (csup,tl)}, _) -> is_error (TInst (csup,tl))
-		| _ -> false
-	in
-	let rec loop e =
-		match e.eexpr with
-		| TThrow eerr when not (is_error eerr.etype) ->
-			let terr = List.find (fun mt -> match mt with TClassDecl {cl_path = ["js";"_Boot"],"HaxeError"} -> true | _ -> false) com.types in
-			let cerr = match terr with TClassDecl c -> c | _ -> assert false in
-			(match eerr.etype with
-			| TDynamic _ ->
-				let eterr = Codegen.ExprBuilder.make_static_this cerr e.epos in
-				let ewrap = Codegen.fcall eterr "wrap" [eerr] t_dynamic e.epos in
-				{ e with eexpr = TThrow ewrap }
-			| _ ->
-				let ewrap = { eerr with eexpr = TNew (cerr,[],[eerr]); etype = TInst (cerr,[]) } in
-				{ e with eexpr = TThrow ewrap }
-			)
-		| _ ->
-			Type.map_expr loop e
-	in
-
-	loop e
-
 (* -------------------------------------------------------------------------- *)
 (* CHECK LOCAL VARS INIT *)
 
@@ -119,7 +95,7 @@ let check_local_vars_init e =
 		| TVar (v,eo) ->
 			begin
 				match eo with
-				| None when Meta.has Meta.InlineConstructorVariable v.v_meta ->
+				| None when v.v_kind = VInlinedConstructorVariable ->
 					()
 				| None ->
 					declared := v.v_id :: !declared;
@@ -213,324 +189,36 @@ let check_local_vars_init e =
 	e
 
 (* -------------------------------------------------------------------------- *)
-(* BLOCK VARIABLES CAPTURE *)
-
-(*
-	For some platforms, it will simply mark the variables which are used in closures
-	using the v_capture flag so it can be processed in a more optimized
-
-	For Flash/JS platforms, it will ensure that variables used in loop sub-functions
-	have an unique scope. It transforms the following expression :
-
-	for( x in array )
-		funs.push(function() return x++);
-
-	Into the following :
-
-	for( _x in array ) {
-		var x = [_x];
-		funs.push(function(x) { function() return x[0]++; }(x));
-	}
-*)
-
-type usage =
-	| Block of ((usage -> unit) -> unit)
-	| Loop of ((usage -> unit) -> unit)
-	| Function of ((usage -> unit) -> unit)
-	| Declare of tvar
-	| Use of tvar
-	| Assign of tvar
-
-let rec local_usage f e =
-	match e.eexpr with
-	| TBinop ((OpAssign | OpAssignOp _), { eexpr = TLocal v }, e2) ->
-		local_usage f e2;
-		f (Assign v)
-	| TUnop ((Increment | Decrement), _, { eexpr = TLocal v }) ->
-		f (Assign v)
-	| TLocal v ->
-		f (Use v)
-	| TVar (v,eo) ->
-		(match eo with None -> () | Some e -> local_usage f e);
-		f (Declare v);
-	| TFunction tf ->
-		let cc f =
-			List.iter (fun (v,_) -> f (Declare v)) tf.tf_args;
-			local_usage f tf.tf_expr;
-		in
-		f (Function cc)
-	| TBlock l ->
-		f (Block (fun f -> List.iter (local_usage f) l))
-	| TFor (v,it,e) ->
-		local_usage f it;
-		f (Loop (fun f ->
-			f (Declare v);
-			local_usage f e;
-		))
-	| TWhile _ ->
-		f (Loop (fun f ->
-			iter (local_usage f) e
-		))
-	| TTry (e,catchs) ->
-		local_usage f e;
-		List.iter (fun (v,e) ->
-			f (Block (fun f ->
-				f (Declare v);
-				local_usage f e;
-			))
-		) catchs;
-	| _ ->
-		iter (local_usage f) e
-
-let captured_vars com e =
-
-	let t = com.basic in
-
-	let impl = match com.platform with
-	(* optimized version for C#/Java - use native arrays *)
-	| Cs | Java ->
-		let cnativearray =
-			match (List.find (fun md -> match md with
-					| TClassDecl ({ cl_path = ["cs"|"java"],"NativeArray" }) -> true
-					| _ -> false
-				) com.types)
-			with TClassDecl cl -> cl | _ -> assert false
-		in
-
-		object
-			method captured_type t = TInst (cnativearray,[t])
-
-			method mk_ref v ve p =
-				match ve with
-				| None ->
-					let eone = mk (TConst (TInt (Int32.of_int 1))) t.tint p in
-					let t = match v.v_type with TInst (_, [t]) -> t | _ -> assert false in
-					mk (TNew (cnativearray,[t],[eone])) v.v_type p
-				| Some e ->
-					{ (Optimizer.mk_untyped_call "__array__" p [e]) with etype = v.v_type }
-
-			method mk_ref_access e v =
-				mk (TArray ({ e with etype = v.v_type }, mk (TConst (TInt 0l)) t.tint e.epos)) e.etype e.epos
-
-			method mk_init av v pos =
-				let elocal = mk (TLocal v) v.v_type pos in
-				let earray = { (Optimizer.mk_untyped_call "__array__" pos [elocal]) with etype = av.v_type } in
-				mk (TVar (av,Some earray)) t.tvoid pos
-		end
-	(* default implementation - use haxe array *)
-	| _ ->
-		object
-			method captured_type = t.tarray
-			method mk_ref v ve p =
-				mk (TArrayDecl (match ve with None -> [] | Some e -> [e])) v.v_type p
-			method mk_ref_access e v =
-				mk (TArray ({ e with etype = v.v_type }, mk (TConst (TInt 0l)) t.tint e.epos)) e.etype e.epos
-			method mk_init av v pos =
-				mk (TVar (av,Some (mk (TArrayDecl [mk (TLocal v) v.v_type pos]) av.v_type pos))) t.tvoid pos
-		end
-	in
-
-	let mk_var v used =
-		let v2 = alloc_var v.v_name (PMap.find v.v_id used) v.v_pos in
-		v2.v_meta <- v.v_meta;
-		v2
-	in
-
-	let rec wrap used e =
-		match e.eexpr with
-		| TVar (v,ve) ->
-			let v,ve =
-				if PMap.mem v.v_id used then
-					v, Some (impl#mk_ref v (Option.map (wrap used) ve) e.epos)
-				else
-					v, (match ve with None -> None | Some e -> Some (wrap used e))
-			 in
-			{ e with eexpr = TVar (v,ve) }
-		| TLocal v when PMap.mem v.v_id used ->
-			impl#mk_ref_access e v
-		| TFor (v,it,expr) when PMap.mem v.v_id used ->
-			let vtmp = mk_var v used in
-			let it = wrap used it in
-			let expr = wrap used expr in
-			mk (TFor (vtmp,it,Type.concat (impl#mk_init v vtmp e.epos) expr)) e.etype e.epos
-		| TTry (expr,catchs) ->
-			let catchs = List.map (fun (v,e) ->
-				let e = wrap used e in
-				try
-					let vtmp = mk_var v used in
-					vtmp, Type.concat (impl#mk_init v vtmp e.epos) e
-				with Not_found ->
-					v, e
-			) catchs in
-			mk (TTry (wrap used expr,catchs)) e.etype e.epos
-		| TFunction f ->
-			(*
-				list variables that are marked as used, but also used in that
-				function and which are not declared inside it !
-			*)
-			let fused = ref PMap.empty in
-			let tmp_used = ref used in
-			let rec browse = function
-				| Block f | Loop f | Function f -> f browse
-				| Use v | Assign v ->
-					if PMap.mem v.v_id !tmp_used then fused := PMap.add v.v_id v !fused;
-				| Declare v ->
-					tmp_used := PMap.remove v.v_id !tmp_used
-			in
-			local_usage browse e;
-			let vars = PMap.fold (fun v acc -> v :: acc) !fused [] in
+(* RENAME LOCAL VARS *)
 
-			(* in case the variable has been marked as used in a parallel scope... *)
-			let fexpr = ref (wrap used f.tf_expr) in
-			let fargs = List.map (fun (v,o) ->
-				if PMap.mem v.v_id used then
-					let vtmp = mk_var v used in
-					fexpr := Type.concat (impl#mk_init v vtmp e.epos) !fexpr;
-					vtmp, o
-				else
-					v, o
-			) f.tf_args in
-			let e = { e with eexpr = TFunction { f with tf_args = fargs; tf_expr = !fexpr } } in
-			(*
-				Create a new function scope to make sure that the captured loop variable
-				will not be overwritten in next loop iteration
-			*)
-			if com.config.pf_capture_policy = CPLoopVars then
-				(* We don't want to duplicate any variable declarations, so let's make copies (issue #3902). *)
-				let new_vars = List.map (fun v -> v.v_id,alloc_var v.v_name v.v_type v.v_pos) vars in
-				let rec loop e = match e.eexpr with
-					| TLocal v ->
-						begin try
-							let v' = List.assoc v.v_id new_vars in
-							v'.v_capture <- true;
-							{e with eexpr = TLocal v'}
-						with Not_found ->
-							e
-						end
-					| _ ->
-						Type.map_expr loop e
-				in
-				let e = loop e in
-				mk (TCall (
-					Codegen.mk_parent (mk (TFunction {
-						tf_args = List.map (fun (_,v) -> v, None) new_vars;
-						tf_type = e.etype;
-						tf_expr = mk_block (mk (TReturn (Some e)) e.etype e.epos);
-					}) (TFun (List.map (fun (_,v) -> v.v_name,false,v.v_type) new_vars,e.etype)) e.epos),
-					List.map (fun v -> mk (TLocal v) v.v_type e.epos) vars)
-				) e.etype e.epos
+let collect_reserved_local_names com =
+	match com.platform with
+	| Js ->
+		let h = ref StringMap.empty in
+		let add name = h := StringMap.add name true !h in
+		List.iter (fun mt ->
+			let tinfos = t_infos mt in
+			let native_name = try fst (get_native_name tinfos.mt_meta) with Not_found -> Path.flat_path tinfos.mt_path in
+			if native_name = "" then
+				match mt with
+				| TClassDecl c ->
+					List.iter (fun cf ->
+						let native_name = try fst (get_native_name cf.cf_meta) with Not_found -> cf.cf_name in
+						add native_name
+					) c.cl_ordered_statics;
+				| _ -> ()
 			else
-				e
-		| _ ->
-			map_expr (wrap used) e
-
-	and do_wrap used e =
-		if PMap.is_empty used then
-			e
-		else
-			let used = PMap.map (fun v ->
-				let vt = v.v_type in
-				v.v_type <- impl#captured_type vt;
-				v.v_capture <- true;
-				vt
-			) used in
-			wrap used e
-
-	and out_loop e =
-		match e.eexpr with
-		| TFor _ | TWhile _ ->
-			(*
-				collect variables that are declared in loop but used in subfunctions
-			*)
-			let vars = ref PMap.empty in
-			let used = ref PMap.empty in
-			let depth = ref 0 in
-			let rec collect_vars in_loop = function
-				| Block f ->
-					let old = !vars in
-					f (collect_vars in_loop);
-					vars := old;
-				| Loop f ->
-					let old = !vars in
-					f (collect_vars true);
-					vars := old;
-				| Function f ->
-					incr depth;
-					f (collect_vars false);
-					decr depth;
-				| Declare v ->
-					if in_loop then vars := PMap.add v.v_id !depth !vars;
-				| Use v | Assign v ->
-					try
-						let d = PMap.find v.v_id !vars in
-						if d <> !depth then used := PMap.add v.v_id v !used;
-					with Not_found ->
-						()
-			in
-			local_usage (collect_vars false) e;
-			do_wrap !used e
-		| _ ->
-			map_expr out_loop e
-	and all_vars e =
-		let vars = ref PMap.empty in
-		let used = ref PMap.empty in
-		let assigned = ref PMap.empty in
-		let depth = ref 0 in
-		let rec collect_vars = function
-		| Block f ->
-			let old = !vars in
-			f collect_vars;
-			vars := old;
-		| Loop f ->
-			let old = !vars in
-			f collect_vars;
-			vars := old;
-		| Function f ->
-			incr depth;
-			f collect_vars;
-			decr depth;
-		| Declare v ->
-			vars := PMap.add v.v_id !depth !vars;
-		| Use v ->
-			(try
-				let d = PMap.find v.v_id !vars in
-				if d <> !depth then used := PMap.add v.v_id v !used;
-			with Not_found -> ())
-		| Assign v ->
-			(try
-				let d = PMap.find v.v_id !vars in
-				(* different depth - needs wrap *)
-				if d <> !depth then begin
-					used := PMap.add v.v_id v !used;
-					assigned := PMap.add v.v_id v !assigned;
-				end
-				(* same depth but assigned after being used on a different depth - needs wrap *)
-				else if PMap.mem v.v_id !used then
-					assigned := PMap.add v.v_id v !assigned;
-			with Not_found -> ())
-		in
-		local_usage collect_vars e;
-
-		(* mark all capture variables - also used in rename_local_vars at later stage *)
-		PMap.iter (fun _ v -> v.v_capture <- true) !used;
-
-		!assigned
-	in
-	let captured = all_vars e in
-	match com.config.pf_capture_policy with
-	| CPNone -> e
-	| CPWrapRef -> do_wrap captured e
-	| CPLoopVars -> out_loop e
+				add native_name
+		) com.types;
+		!h
+	| _ -> StringMap.empty
 
-(* -------------------------------------------------------------------------- *)
-(* RENAME LOCAL VARS *)
-
-let rename_local_vars ctx e =
+let rename_local_vars ctx reserved e =
 	let vars = ref [] in
 	let declare v =
 		vars := v :: !vars
 	in
-	let reserved = ref StringMap.empty in
+	let reserved = ref reserved in
 	let reserve name =
 		reserved := StringMap.add name true !reserved
 	in
@@ -598,12 +286,59 @@ let rename_local_vars ctx e =
 		reserve !name;
 		Hashtbl.replace count_table v.v_name !count;
 		if not (Meta.has Meta.RealPath v.v_meta) then
-			v.v_meta <- (Meta.RealPath,[EConst (String v.v_name),e.epos],e.epos) :: v.v_meta;
+			v.v_meta <- (Meta.RealPath,[EConst (String(v.v_name,SDoubleQuotes)),e.epos],e.epos) :: v.v_meta;
 		v.v_name <- !name;
 	in
 	List.iter maybe_rename (List.rev !vars);
 	e
 
+let mark_switch_break_loops e =
+	let add_loop_label n e =
+		{ e with eexpr = TMeta ((Meta.LoopLabel,[(EConst(Int(string_of_int n)),e.epos)],e.epos), e) }
+	in
+	let in_switch = ref false in
+	let did_found = ref (-1) in
+	let num = ref 0 in
+	let cur_num = ref 0 in
+	let rec run e =
+		match e.eexpr with
+		| TFunction _ ->
+			let old_num = !num in
+			num := 0;
+				let ret = Type.map_expr run e in
+			num := old_num;
+			ret
+		| TWhile _ | TFor _ ->
+			let last_switch = !in_switch in
+			let last_found = !did_found in
+			let last_num = !cur_num in
+			in_switch := false;
+			incr num;
+			cur_num := !num;
+			did_found := -1;
+				let new_e = Type.map_expr run e in (* assuming that no loop will be found in the condition *)
+				let new_e = if !did_found <> -1 then add_loop_label !did_found new_e else new_e in
+			did_found := last_found;
+			in_switch := last_switch;
+			cur_num := last_num;
+
+			new_e
+		| TSwitch _ ->
+			let last_switch = !in_switch in
+			in_switch := true;
+				let new_e = Type.map_expr run e in
+			in_switch := last_switch;
+			new_e
+		| TBreak ->
+			if !in_switch then (
+				did_found := !cur_num;
+				add_loop_label !cur_num e
+			) else
+				e
+		| _ -> Type.map_expr run e
+	in
+	run e
+
 let check_unification ctx e t =
 	begin match e.eexpr,t with
 		| TLocal v,TType({t_path = ["cs"],("Ref" | "Out")},_) ->
@@ -614,12 +349,57 @@ let check_unification ctx e t =
 	end;
 	e
 
+let rec fix_return_dynamic_from_void_function ctx return_is_void e =
+	match e.eexpr with
+	| TFunction fn ->
+		let is_void = ExtType.is_void (follow fn.tf_type) in
+		let body = fix_return_dynamic_from_void_function ctx is_void fn.tf_expr in
+		{ e with eexpr = TFunction { fn with tf_expr = body } }
+	| TReturn (Some return_expr) when return_is_void && t_dynamic == follow return_expr.etype ->
+		let return_pos = { e.epos with pmax = return_expr.epos.pmin - 1 } in
+		let exprs = [
+			fix_return_dynamic_from_void_function ctx return_is_void return_expr;
+			{ e with eexpr = TReturn None; epos = return_pos };
+		] in
+		{ e with
+			eexpr = TMeta (
+				(Meta.MergeBlock, [], null_pos),
+				mk (TBlock exprs) e.etype e.epos
+			);
+		}
+	| _ -> Type.map_expr (fix_return_dynamic_from_void_function ctx return_is_void) e
+
+let check_abstract_as_value e =
+	let rec loop e =
+		match e.eexpr with
+		| TField ({ eexpr = TTypeExpr _ }, _) -> ()
+		| TTypeExpr(TClassDecl {cl_kind = KAbstractImpl a}) when not (Meta.has Meta.RuntimeValue a.a_meta) ->
+			error "Cannot use abstract as value" e.epos
+		| _ -> Type.iter loop e
+	in
+	loop e;
+	e
+
 (* PASS 1 end *)
 
 (* Saves a class state so it can be restored later, e.g. after DCE or native path rewrite *)
 let save_class_state ctx t = match t with
 	| TClassDecl c ->
+		let vars = ref [] in
+		let rec save_vars e =
+			let add v = vars := (v, v.v_type) :: !vars in
+			match e.eexpr with
+				| TFunction fn ->
+					List.iter (fun (v, _) -> add v) fn.tf_args;
+					save_vars fn.tf_expr
+				| TVar (v, e) ->
+					add v;
+					Option.may save_vars e
+				| _ ->
+					iter save_vars e
+		in
 		let mk_field_restore f =
+			Option.may save_vars f.cf_expr;
 			let rec mk_overload_restore f =
 				f.cf_name,f.cf_kind,f.cf_expr,f.cf_type,f.cf_meta,f.cf_params
 			in
@@ -644,6 +424,7 @@ let save_class_state ctx t = match t with
 		let ofr = List.map (mk_field_restore) c.cl_ordered_fields in
 		let osr = List.map (mk_field_restore) c.cl_ordered_statics in
 		let init = c.cl_init in
+		Option.may save_vars init;
 		c.cl_restore <- (fun() ->
 			c.cl_super <- sup;
 			c.cl_implements <- impl;
@@ -657,32 +438,14 @@ let save_class_state ctx t = match t with
 			c.cl_statics <- mk_pmap c.cl_ordered_statics;
 			c.cl_constructor <- Option.map restore_field csr;
 			c.cl_overrides <- over;
-			Hashtbl.clear c.cl_descendants;
+			c.cl_descendants <- [];
+			List.iter (fun (v, t) -> v.v_type <- t) !vars;
 		)
 	| _ ->
 		()
 
 (* PASS 2 begin *)
 
-let rec is_removable_class c =
-	match c.cl_kind with
-	| KGeneric ->
-		(Meta.has Meta.Remove c.cl_meta ||
-		(match c.cl_super with
-			| Some (c,_) -> is_removable_class c
-			| _ -> false) ||
-		List.exists (fun (_,t) -> match follow t with
-			| TInst(c,_) ->
-				has_ctor_constraint c || Meta.has Meta.Const c.cl_meta
-			| _ ->
-				false
-		) c.cl_params)
-	| KTypeParameter _ ->
-		(* this shouldn't happen, have to investigate (see #4092) *)
-		true
-	| _ ->
-		false
-
 let remove_generic_base ctx t = match t with
 	| TClassDecl c when is_removable_class c ->
 		c.cl_extern <- true
@@ -722,30 +485,13 @@ let check_private_path ctx t = match t with
 
 (* Rewrites class or enum paths if @:native metadata is set *)
 let apply_native_paths ctx t =
-	let get_native_name meta =
-		let rec get_native meta = match meta with
-			| [] -> raise Not_found
-			| (Meta.Native,[v],p as meta) :: _ ->
-				meta
-			| _ :: meta ->
-				get_native meta
-		in
-		let (_,e,mp) = get_native meta in
-		match e with
-		| [Ast.EConst (Ast.String name),p] ->
-			name,p
-		| [] ->
-			raise Not_found
-		| _ ->
-			error "String expected" mp
-	in
 	let get_real_name meta name =
 		let name',p = get_native_name meta in
-		(Meta.RealPath,[Ast.EConst (Ast.String (name)), p], p), name'
+		(Meta.RealPath,[Ast.EConst (Ast.String (name,SDoubleQuotes)), p], p), name'
 	in
 	let get_real_path meta path =
 		let name,p = get_native_name meta in
-		(Meta.RealPath,[Ast.EConst (Ast.String (s_type_path path)), p], p), parse_path name
+		(Meta.RealPath,[Ast.EConst (Ast.String (s_type_path path,SDoubleQuotes)), p], p), parse_path name
 	in
 	try
 		(match t with
@@ -798,12 +544,12 @@ let add_rtti ctx t =
 		()
 
 (* Adds member field initializations as assignments to the constructor *)
-let add_field_inits ctx t =
+let add_field_inits reserved ctx t =
 	let is_as3 = Common.defined ctx.com Define.As3 && not ctx.in_macro in
 	let apply c =
 		let ethis = mk (TConst TThis) (TInst (c,List.map snd c.cl_params)) c.cl_pos in
 		(* TODO: we have to find a variable name which is not used in any of the functions *)
-		let v = alloc_var "_g" ethis.etype ethis.epos in
+		let v = alloc_var VGenerated "_g" ethis.etype ethis.epos in
 		let need_this = ref false in
 		let inits,fields = List.fold_left (fun (inits,fields) cf ->
 			match cf.cf_kind,cf.cf_expr with
@@ -839,9 +585,9 @@ let add_field_inits ctx t =
 				match cf.cf_expr with
 				| None -> assert false
 				| Some e ->
-					let lhs = mk (TField(ethis,FInstance (c,List.map snd c.cl_params,cf))) cf.cf_type e.epos in
+					let lhs = mk (TField({ ethis with epos = cf.cf_pos },FInstance (c,List.map snd c.cl_params,cf))) cf.cf_type cf.cf_pos in
 					cf.cf_expr <- None;
-					let eassign = mk (TBinop(OpAssign,lhs,e)) e.etype e.epos in
+					let eassign = mk (TBinop(OpAssign,lhs,e)) cf.cf_type e.epos in
 					if is_as3 then begin
 						let echeck = mk (TBinop(OpEq,lhs,(mk (TConst TNull) lhs.etype e.epos))) ctx.com.basic.tbool e.epos in
 						mk (TIf(echeck,eassign,None)) eassign.etype e.epos
@@ -874,7 +620,7 @@ let add_field_inits ctx t =
 			(match cf.cf_expr with
 			| Some e ->
 				(* This seems a bit expensive, but hopefully constructor expressions aren't that massive. *)
-				let e = rename_local_vars ctx e in
+				let e = rename_local_vars ctx reserved e in
 				let e = Optimizer.sanitize ctx.com e in
 				cf.cf_expr <- Some e
 			| _ ->
@@ -890,30 +636,28 @@ let add_field_inits ctx t =
 (* Adds the __meta__ field if required *)
 let add_meta_field ctx t = match t with
 	| TClassDecl c ->
-		(match Codegen.build_metadata ctx.com t with
+		(match Texpr.build_metadata ctx.com.basic t with
 		| None -> ()
 		| Some e ->
 			add_feature ctx.com "has_metadata";
-			let f = mk_field "__meta__" t_dynamic c.cl_pos null_pos in
-			f.cf_expr <- Some e;
+			let cf = mk_field "__meta__" e.etype e.epos null_pos in
+			cf.cf_expr <- Some e;
 			let can_deal_with_interface_metadata () = match ctx.com.platform with
 				| Flash when Common.defined ctx.com Define.As3 -> false
-				| Php when not (Common.is_php7 ctx.com) -> false
+				| Cs | Java -> false
 				| _ -> true
 			in
 			if c.cl_interface && not (can_deal_with_interface_metadata()) then begin
 				(* borrowed from gencommon, but I did wash my hands afterwards *)
 				let path = fst c.cl_path,snd c.cl_path ^ "_HxMeta" in
 				let ncls = mk_class c.cl_module path c.cl_pos null_pos in
-				let cf = mk_field "__meta__" e.etype e.epos null_pos in
-				cf.cf_expr <- Some e;
-				ncls.cl_statics <- PMap.add "__meta__" cf ncls.cl_statics;
 				ncls.cl_ordered_statics <- cf :: ncls.cl_ordered_statics;
-				ctx.com.types <- (TClassDecl ncls) :: ctx.com.types;
+				ncls.cl_statics <- PMap.add cf.cf_name cf ncls.cl_statics;
+				ctx.com.types <- ctx.com.types @ [ TClassDecl ncls ];
 				c.cl_meta <- (Meta.Custom ":hasMetadata",[],e.epos) :: c.cl_meta
 			end else begin
-				c.cl_ordered_statics <- f :: c.cl_ordered_statics;
-				c.cl_statics <- PMap.add f.cf_name f c.cl_statics
+				c.cl_ordered_statics <- cf :: c.cl_ordered_statics;
+				c.cl_statics <- PMap.add cf.cf_name cf c.cl_statics
 			end)
 	| _ ->
 		()
@@ -928,7 +672,7 @@ let check_cs_events com t = match t with
 		let check fields f =
 			match f.cf_kind with
 			| Var { v_read = AccNormal; v_write = AccNormal } when Meta.has Meta.Event f.cf_meta ->
-				if f.cf_public then error "@:event fields must be private" f.cf_pos;
+				if (has_class_field_flag f CfPublic) then error "@:event fields must be private" f.cf_pos;
 
 				(* prevent generating reflect helpers for the event in gencommon *)
 				f.cf_meta <- (Meta.SkipReflection, [], f.cf_pos) :: f.cf_meta;
@@ -1018,36 +762,6 @@ let check_reserved_type_paths ctx t =
 
 (* PASS 3 end *)
 
-let run_expression_filters ctx filters t =
-	let run e =
-		List.fold_left (fun e f -> f e) e filters
-	in
-	match t with
-	| TClassDecl c when is_removable_class c -> ()
-	| TClassDecl c ->
-		ctx.curclass <- c;
-		let rec process_field f =
-			(match f.cf_expr with
-			| Some e when not (is_removable_field ctx f) ->
-				AbstractCast.cast_stack := f :: !AbstractCast.cast_stack;
-				f.cf_expr <- Some (run e);
-				AbstractCast.cast_stack := List.tl !AbstractCast.cast_stack;
-			| _ -> ());
-			List.iter process_field f.cf_overloads
-		in
-		List.iter process_field c.cl_ordered_fields;
-		List.iter process_field c.cl_ordered_statics;
-		(match c.cl_constructor with
-		| None -> ()
-		| Some f -> process_field f);
-		(match c.cl_init with
-		| None -> ()
-		| Some e ->
-			c.cl_init <- Some (run e));
-	| TEnumDecl _ -> ()
-	| TTypeDecl _ -> ()
-	| TAbstractDecl _ -> ()
-
 let pp_counter = ref 1
 
 let is_cached t =
@@ -1074,41 +788,135 @@ let iter_expressions fl mt =
 	| _ ->
 		()
 
+let filter_timer detailed s =
+	Timer.timer (if detailed then "filters" :: s else ["filters"])
+
+module ForRemap = struct
+	let apply ctx e =
+		let rec loop e = match e.eexpr with
+		| TFor(v,e1,e2) ->
+			let e1 = loop e1 in
+			let e2 = loop e2 in
+			let iterator = ForLoop.IterationKind.of_texpr ctx e1 (ForLoop.is_cheap_enough_t ctx e2) e.epos in
+			let restore = save_locals ctx in
+			let e = ForLoop.IterationKind.to_texpr ctx v iterator e2 e.epos in
+			restore();
+			e
+		| _ ->
+			Type.map_expr loop e
+		in
+		loop e
+end
+
 let run com tctx main =
+	let detail_times = Common.raw_defined com "filter-times" in
 	let new_types = List.filter (fun t ->
-		(match t with
+		let cached = is_cached t in
+		begin match t with
 			| TClassDecl cls ->
 				List.iter (fun (iface,_) -> add_descendant iface cls) cls.cl_implements;
-				(match cls.cl_super with
+				begin match cls.cl_super with
 					| Some (csup,_) -> add_descendant csup cls
-					| None -> ())
-			| _ -> ());
-		not (is_cached t)
+					| None -> ()
+				end;
+				(* Save cf_expr_unoptimized early: We want to inline with the original expression
+				   on the next compilation. *)
+				if not cached then begin
+					let field cf = match cf.cf_expr with
+						| Some {eexpr = TFunction tf} -> cf.cf_expr_unoptimized <- Some tf
+						| _ -> ()
+					in
+					List.iter field cls.cl_ordered_fields;
+					List.iter field cls.cl_ordered_statics;
+					Option.may field cls.cl_constructor;
+				end;
+			| _ -> ()
+		end;
+		not cached
 	) com.types in
+	NullSafety.run com new_types;
 	(* PASS 1: general expression filters *)
 	let filters = [
+		(* ForRemap.apply tctx; *)
+		VarLazifier.apply com;
 		AbstractCast.handle_abstract_casts tctx;
-		Optimizer.inline_constructors tctx;
+	] in
+	let t = filter_timer detail_times ["expr 0"] in
+	List.iter (run_expression_filters tctx filters) new_types;
+	t();
+	let filters = [
+		fix_return_dynamic_from_void_function tctx true;
 		check_local_vars_init;
+		check_abstract_as_value;
+		if Common.defined com Define.OldConstructorInline then Optimizer.inline_constructors tctx else InlineConstructors.inline_constructors tctx;
 		Optimizer.reduce_expression tctx;
-		captured_vars com;
+		CapturedVars.captured_vars com;
 	] in
+	let filters =
+		match com.platform with
+		| Cs ->
+			SetHXGen.run_filter com new_types;
+			filters @ [
+				TryCatchWrapper.configure_cs com
+			]
+		| Java when not (Common.defined com Jvm)->
+			SetHXGen.run_filter com new_types;
+			filters @ [
+				TryCatchWrapper.configure_java com
+			]
+		| Js ->
+			filters @ [JsExceptions.init tctx];
+		| _ -> filters
+	in
+	let t = filter_timer detail_times ["expr 1"] in
 	List.iter (run_expression_filters tctx filters) new_types;
+	t();
 	(* PASS 1.5: pre-analyzer type filters *)
-	List.iter (fun t ->
-		if com.platform = Cs then check_cs_events tctx.com t;
-	) new_types;
+	let filters =
+		match com.platform with
+		| Cs ->
+			[
+				check_cs_events tctx.com;
+				DefaultArguments.run com;
+			]
+		| Java ->
+			[
+				DefaultArguments.run com;
+			]
+		| _ ->
+			[]
+	in
+	let t = filter_timer detail_times ["type 1"] in
+	List.iter (fun f -> List.iter f new_types) filters;
+	t();
+	com.stage <- CAnalyzerStart;
 	if com.platform <> Cross then Analyzer.Run.run_on_types tctx new_types;
+	com.stage <- CAnalyzerDone;
+	let reserved = collect_reserved_local_names com in
 	let filters = [
 		Optimizer.sanitize com;
 		if com.config.pf_add_final_return then add_final_return else (fun e -> e);
-		if com.platform = Js then wrap_js_exceptions com else (fun e -> e);
-		rename_local_vars tctx;
+		(match com.platform with
+		| Eval -> (fun e -> e)
+		| _ -> rename_local_vars tctx reserved);
+		mark_switch_break_loops;
 	] in
+	let t = filter_timer detail_times ["expr 2"] in
 	List.iter (run_expression_filters tctx filters) new_types;
+	t();
 	next_compilation();
-	List.iter (fun f -> f()) (List.rev com.callbacks.before_dce); (* macros onGenerate etc. *)
+	let t = filter_timer detail_times ["callbacks"] in
+	List.iter (fun f -> f()) (List.rev com.callbacks#get_before_save); (* macros onGenerate etc. *)
+	t();
+	com.stage <- CSaveStart;
+	let t = filter_timer detail_times ["save state"] in
 	List.iter (save_class_state tctx) new_types;
+	t();
+	com.stage <- CSaveDone;
+	let t = filter_timer detail_times ["callbacks"] in
+	List.iter (fun f -> f()) (List.rev com.callbacks#get_after_save); (* macros onGenerate etc. *)
+	t();
+	let t = filter_timer detail_times ["type 2"] in
 	(* PASS 2: type filters pre-DCE *)
 	List.iter (fun t ->
 		remove_generic_base tctx t;
@@ -1117,28 +925,43 @@ let run com tctx main =
 		(* check @:remove metadata before DCE so it is ignored there (issue #2923) *)
 		check_remove_metadata tctx t;
 	) com.types;
+	t();
+	com.stage <- CDceStart;
+	let t = filter_timer detail_times ["dce"] in
 	(* DCE *)
 	let dce_mode = if Common.defined com Define.As3 then
 		"no"
 	else
 		(try Common.defined_value com Define.Dce with _ -> "no")
 	in
-	begin match dce_mode with
-		| "full" -> Dce.run com main (not (Common.defined com Define.Interp))
-		| "std" -> Dce.run com main false
-		| "no" -> Dce.fix_accessors com
+	let dce_mode = match dce_mode with
+		| "full" -> if Common.defined com Define.Interp then Dce.DceNo else DceFull
+		| "std" -> DceStd
+		| "no" -> DceNo
 		| _ -> failwith ("Unknown DCE mode " ^ dce_mode)
-	end;
+	in
+	Dce.run com main dce_mode;
+	t();
+	com.stage <- CDceDone;
 	(* PASS 3: type filters post-DCE *)
 	let type_filters = [
 		check_private_path;
 		apply_native_paths;
 		add_rtti;
-		(match com.platform with | Java | Cs -> (fun _ _ -> ()) | _ -> add_field_inits);
+		(match com.platform with | Java | Cs -> (fun _ _ -> ()) | _ -> add_field_inits reserved);
 		(match com.platform with Hl -> (fun _ _ -> ()) | _ -> add_meta_field);
 		check_void_field;
 		(match com.platform with | Cpp -> promote_first_interface_to_super | _ -> (fun _ _ -> ()) );
 		commit_features;
 		(if com.config.pf_reserved_type_paths <> [] then check_reserved_type_paths else (fun _ _ -> ()));
 	] in
-	List.iter (fun t -> List.iter (fun f -> f tctx t) type_filters) com.types
+	let type_filters = match com.platform with
+		| Cs -> type_filters @ [ fun _ t -> InterfaceProps.run t ]
+		| Js -> JsExceptions.inject_callstack com type_filters
+		| _ -> type_filters
+	in
+	let t = filter_timer detail_times ["type 3"] in
+	List.iter (fun t -> List.iter (fun f -> f tctx t) type_filters) com.types;
+	t();
+	List.iter (fun f -> f()) (List.rev com.callbacks#get_after_filters);
+	com.stage <- CFilteringDone
diff --git a/src/filters/filtersCommon.ml b/src/filters/filtersCommon.ml
new file mode 100644
index 0000000000000000000000000000000000000000..fc31b179382746d91acbe6872de51b5105b73157
--- /dev/null
+++ b/src/filters/filtersCommon.ml
@@ -0,0 +1,68 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Type
+open Typecore
+
+let rec is_removable_class c =
+	match c.cl_kind with
+	| KGeneric ->
+		(Meta.has Meta.Remove c.cl_meta ||
+		(match c.cl_super with
+			| Some (c,_) -> is_removable_class c
+			| _ -> false) ||
+		List.exists (fun (_,t) -> match follow t with
+			| TInst(c,_) ->
+				has_ctor_constraint c || Meta.has Meta.Const c.cl_meta
+			| _ ->
+				false
+		) c.cl_params)
+	| KTypeParameter _ ->
+		(* this shouldn't happen, have to investigate (see #4092) *)
+		true
+	| _ ->
+		false
+
+let run_expression_filters ctx filters t =
+	let run e =
+		List.fold_left (fun e f -> f e) e filters
+	in
+	match t with
+	| TClassDecl c when is_removable_class c -> ()
+	| TClassDecl c ->
+		ctx.curclass <- c;
+		let rec process_field f =
+			ctx.curfield <- f;
+			(match f.cf_expr with
+			| Some e when not (is_removable_field ctx f) ->
+				f.cf_expr <- Some (rec_stack_loop AbstractCast.cast_stack f run e);
+			| _ -> ());
+			List.iter process_field f.cf_overloads
+		in
+		List.iter process_field c.cl_ordered_fields;
+		List.iter process_field c.cl_ordered_statics;
+		(match c.cl_constructor with
+		| None -> ()
+		| Some f -> process_field f);
+		(match c.cl_init with
+		| None -> ()
+		| Some e ->
+			c.cl_init <- Some (run e));
+	| TEnumDecl _ -> ()
+	| TTypeDecl _ -> ()
+	| TAbstractDecl _ -> ()
diff --git a/src/filters/jsExceptions.ml b/src/filters/jsExceptions.ml
new file mode 100644
index 0000000000000000000000000000000000000000..c7f537d63601459698162442f9e1ec42b4925ea1
--- /dev/null
+++ b/src/filters/jsExceptions.ml
@@ -0,0 +1,212 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+(*
+	This filter handles everything related to exceptions for the JavaScript target:
+
+	- wrapping non-js.Error types in HaxeError on throwing
+	- unwrapping HaxeError on catch
+	- transforming series of catches into a single catch with Std.is checks (optimized)
+	- re-throwing caught exception with js.Lib.rethrow
+	- storing caught exception in haxe.CallStack.lastException (if haxe.CallStack is used)
+
+	Basically it translates this:
+
+	 try throw "fail"
+	 catch (e:String) { trace(e); js.Lib.rethrow(); }
+	 catch (e:Bool) {}
+
+	into something like this (JS):
+
+	 try {
+		 throw new HaxeError("fail");
+	 } catch (e) {
+		 haxe.CallStack.lastException = e;
+		 var e1 = (e instanceof HaxeError) e.val : e;
+		 if (typeof e1 == "string") {
+			 trace(e1);
+			 throw e;
+		 } else if (typeof e1 == "boolean") {
+		 } else {
+			 throw e;
+		 }
+	 }
+*)
+
+open Common
+open Type
+open Typecore
+open Texpr.Builder
+
+let follow = Abstract.follow_with_abstracts
+
+let rec is_js_error c =
+	match c with
+	| { cl_path = ["js";"lib"],"Error" } -> true
+	| { cl_super = Some (csup,_) } -> is_js_error csup
+	| _ -> false
+
+let find_cl com path =
+	ExtList.List.find_map (function
+		| TClassDecl c when c.cl_path = path -> Some c
+		| _ -> None
+	) com.types
+
+let init ctx =
+	let cJsError = find_cl ctx.com (["js";"lib"],"Error") in
+	let cHaxeError = find_cl ctx.com (["js";"_Boot"],"HaxeError") in
+	let cStd = find_cl ctx.com ([],"Std") in
+	let cBoot = find_cl ctx.com (["js"],"Boot") in
+	let cSyntax = find_cl ctx.com (["js"],"Syntax") in
+
+	let dynamic_wrap e =
+		let eHaxeError = make_static_this cHaxeError e.epos in
+		fcall eHaxeError "wrap" [e] (TInst (cJsError, [])) e.epos
+	in
+
+	let static_wrap e =
+		{ e with eexpr = TNew (cHaxeError,[],[e]); etype = TInst (cHaxeError,[]) }
+	in
+
+	let rec loop vrethrow e =
+		match e.eexpr with
+		| TThrow eexc ->
+			let eexc = loop vrethrow eexc in
+			let eexc =
+				match follow eexc.etype with
+				| TDynamic _ | TMono _ ->
+					(match eexc.eexpr with
+					| TConst (TInt _ | TFloat _ | TString _ | TBool _ | TNull) -> static_wrap eexc
+					| _ -> dynamic_wrap eexc)
+				| TInst (c,_) when (is_js_error c) ->
+					eexc
+				| _ ->
+					static_wrap eexc
+			in
+			{ e with eexpr = TThrow eexc }
+
+		| TCall ({ eexpr = TField (_, FStatic ({ cl_path = ["js"],"Lib" }, { cf_name = "getOriginalException" })) }, _) ->
+			(match vrethrow with
+			| Some erethrowvar -> erethrowvar
+			| None -> abort "js.Lib.getOriginalException can only be called inside a catch block" e.epos)
+
+		| TCall ({ eexpr = TField (_, FStatic ({ cl_path = ["js"],"Lib" }, { cf_name = "rethrow" })) }, _) ->
+			(match vrethrow with
+			| Some erethrowvar -> { e with eexpr = TThrow erethrowvar }
+			| None -> abort "js.Lib.rethrow can only be called inside a catch block" e.epos)
+
+		| TTry (etry, catches) ->
+			let etry = loop vrethrow etry in
+
+			let catchall_name, catchall_kind = match catches with [(v,_)] -> v.v_name, (VUser TVOCatchVariable) | _ -> "e", VGenerated in
+			let vcatchall = alloc_var catchall_kind catchall_name t_dynamic e.epos in
+			let ecatchall = make_local vcatchall e.epos in
+			let erethrow = mk (TThrow ecatchall) t_dynamic e.epos in
+
+			let eSyntax = make_static_this cSyntax e.epos in
+			let eHaxeError = make_static_this cHaxeError e.epos in
+			let eInstanceof = fcall eSyntax "instanceof" [ecatchall;eHaxeError] ctx.com.basic.tbool e.epos in
+			let eVal = field { ecatchall with etype = TInst (cHaxeError,[]) } "val" t_dynamic e.epos in
+			let eunwrap = mk (TIf (eInstanceof, eVal, Some (ecatchall))) t_dynamic e.epos in
+
+			let vunwrapped = alloc_var catchall_kind catchall_name t_dynamic e.epos in
+			vunwrapped.v_kind <- VGenerated;
+			let eunwrapped = make_local vunwrapped e.epos in
+
+			let ecatch = List.fold_left (fun acc (v,ecatch) ->
+				let ecatch = loop (Some ecatchall) ecatch in
+
+				(* it's not really compiler-generated, but it kind of is, since it was used as catch identifier and we add a TVar for it *)
+				v.v_kind <- VGenerated;
+
+				match follow v.v_type with
+				| TDynamic _ ->
+					{ ecatch with
+						eexpr = TBlock [
+							mk (TVar (v, Some eunwrapped)) ctx.com.basic.tvoid ecatch.epos;
+							ecatch;
+						]
+					}
+				| t ->
+					let etype = make_typeexpr (module_type_of_type t) e.epos in
+					let args = [eunwrapped;etype] in
+					let echeck =
+						match Inline.api_inline ctx cStd "is" args e.epos with
+						| Some e -> e
+						| None ->
+							let eBoot = make_static_this cBoot e.epos in
+							fcall eBoot "__instanceof" [eunwrapped;etype] ctx.com.basic.tbool e.epos
+					in
+					let ecatch = { ecatch with
+						eexpr = TBlock [
+							mk (TVar (v, Some eunwrapped)) ctx.com.basic.tvoid ecatch.epos;
+							ecatch;
+						]
+					} in
+					mk (TIf (echeck, ecatch, Some acc)) e.etype e.epos
+			) erethrow (List.rev catches) in
+
+			let ecatch = { ecatch with
+				eexpr = TBlock [
+					mk (TVar (vunwrapped, Some eunwrap)) ctx.com.basic.tvoid e.epos;
+					ecatch;
+				]
+			} in
+			{ e with eexpr = TTry (etry, [(vcatchall,ecatch)]) }
+		| _ ->
+			Type.map_expr (loop vrethrow) e
+	in
+	loop None
+
+let inject_callstack com type_filters =
+	let cCallStack =
+		if Common.has_dce com then
+			if Common.has_feature com "haxe.CallStack.lastException" then
+				Some (find_cl com (["haxe"],"CallStack"))
+			else
+				None
+		else
+			try Some (find_cl com (["haxe"],"CallStack")) with Not_found -> None
+	in
+	match cCallStack with
+	| Some cCallStack ->
+		let run mt e =
+			let rec loop e =
+				match e.eexpr with
+				| TTry (etry,[(v,ecatch)]) ->
+					let etry = loop etry in
+					let ecatch = loop ecatch in
+					add_dependency (t_infos mt).mt_module cCallStack.cl_module;
+					let eCallStack = make_static_this cCallStack ecatch.epos in
+					let elastException = field eCallStack "lastException" t_dynamic ecatch.epos in
+					let elocal = make_local v ecatch.epos in
+					let eStoreException = mk (TBinop (Ast.OpAssign, elastException, elocal)) ecatch.etype ecatch.epos in
+					let ecatch = Type.concat eStoreException ecatch in
+					{ e with eexpr = TTry (etry,[(v,ecatch)]) }
+				| TTry _ ->
+					(* this should be handled by the filter above *)
+					assert false
+				| _ ->
+					Type.map_expr loop e
+			in
+			loop e
+		in
+		type_filters @ [ fun ctx t -> FiltersCommon.run_expression_filters ctx [run t] t ]
+	| None ->
+		type_filters
diff --git a/src/filters/localUsage.ml b/src/filters/localUsage.ml
new file mode 100644
index 0000000000000000000000000000000000000000..28ea565b5960723e1ed83a07156d631741a34617
--- /dev/null
+++ b/src/filters/localUsage.ml
@@ -0,0 +1,69 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+open Ast
+open Type
+
+type usage =
+	| Block of ((usage -> unit) -> unit)
+	| Loop of ((usage -> unit) -> unit)
+	| Function of ((usage -> unit) -> unit)
+	| Declare of tvar
+	| Use of tvar
+	| Assign of tvar
+
+let rec local_usage f e =
+	match e.eexpr with
+	| TBinop ((OpAssign | OpAssignOp _), { eexpr = TLocal v }, e2) ->
+		local_usage f e2;
+		f (Assign v)
+	| TUnop ((Increment | Decrement), _, { eexpr = TLocal v }) ->
+		f (Assign v)
+	| TLocal v ->
+		f (Use v)
+	| TVar (v,eo) ->
+		(match eo with None -> () | Some e -> local_usage f e);
+		f (Declare v);
+	| TFunction tf ->
+		let cc f =
+			List.iter (fun (v,_) -> f (Declare v)) tf.tf_args;
+			local_usage f tf.tf_expr;
+		in
+		f (Function cc)
+	| TBlock l ->
+		f (Block (fun f -> List.iter (local_usage f) l))
+	| TFor (v,it,e) ->
+		local_usage f it;
+		f (Loop (fun f ->
+			f (Declare v);
+			local_usage f e;
+		))
+	| TWhile _ ->
+		f (Loop (fun f ->
+			iter (local_usage f) e
+		))
+	| TTry (e,catchs) ->
+		local_usage f e;
+		List.iter (fun (v,e) ->
+			f (Block (fun f ->
+				f (Declare v);
+				local_usage f e;
+			))
+		) catchs;
+	| _ ->
+		iter (local_usage f) e
diff --git a/src/filters/tryCatchWrapper.ml b/src/filters/tryCatchWrapper.ml
new file mode 100644
index 0000000000000000000000000000000000000000..e7e4e4c92c5a7bdcc6590e8b565acb74db116ccf
--- /dev/null
+++ b/src/filters/tryCatchWrapper.ml
@@ -0,0 +1,187 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*)
+open Globals
+open Common
+open Ast
+open Type
+open Codegen
+open Texpr.Builder
+
+(* ******************************************* *)
+(* Try / Catch + throw native types handling *)
+(* ******************************************* *)
+(*
+	Some languages/vm's do not support throwing any kind of value. For them, only
+	special kinds of objects can be thrown. Because of this, we must wrap some throw
+	statements with an expression, and also we must unwrap it on the catch() phase, and
+	maybe manually test with Std.is()
+*)
+
+(*
+	should_wrap : does the type should be wrapped? This of course works on the reverse way, so it tells us if the type should be unwrapped as well
+	wrap_throw : the wrapper for throw (throw expr->returning wrapped expression)
+	unwrap_expr : the other way around : given the catch var (maybe will need casting to wrapper_type) , return the unwrap expr
+	rethrow_expr : how to rethrow ane exception in the platform
+	catchall_type : the class used for catchall (e:Dynamic)
+	wrapper_type : the wrapper type, so we can test if exception is of type 'wrapper'
+	catch_map : maps the catch expression to include some intialization code (e.g. setting up Stack.exceptionStack)
+	gen_typecheck : generate Std.is (or similar) check expression for given expression and type
+*)
+let init com (should_wrap:t->bool) (wrap_throw:texpr->texpr) (unwrap_expr:texpr->texpr) (rethrow_expr:texpr->texpr) (catchall_type:t) (wrapper_type:t) (catch_map:tvar->texpr->texpr) (gen_typecheck:texpr->t->pos->texpr) =
+	let rec run e =
+		match e.eexpr with
+		| TThrow texpr when should_wrap texpr.etype ->
+			wrap_throw (run texpr)
+		| TTry (ttry, catches) ->
+			let nowrap_catches, must_wrap_catches, catchall = List.fold_left (fun (nowrap_catches, must_wrap_catches, catchall) (v, catch) ->
+				(* first we'll see if the type is Dynamic (catchall) *)
+				match follow v.v_type with
+				| TDynamic _ ->
+					assert (Option.is_none catchall);
+					(nowrap_catches, must_wrap_catches, Some(v, run catch))
+				(* see if we should unwrap it *)
+				| _ when should_wrap (follow v.v_type) ->
+					(nowrap_catches, (v,run catch) :: must_wrap_catches, catchall)
+				| _ ->
+					((v,catch_map v (run catch)) :: nowrap_catches, must_wrap_catches, catchall)
+			) ([], [], None) catches in
+
+			(* temp (?) fix for https://github.com/HaxeFoundation/haxe/issues/4134 *)
+			let must_wrap_catches = List.rev must_wrap_catches in
+
+			(*
+				1st catch all nowrap "the easy way"
+				2nd see if there are any must_wrap or catchall. If there is,
+					do a catchall first with a temp var.
+					then get catchall var (as dynamic) (or create one), and declare it = catchall exception
+					then test if it is of type wrapper_type. If it is, unwrap it
+					then start doing Std.is() tests for each catch type
+					if there is a catchall in the end, end with it. If there isn't, rethrow
+			*)
+			let dyn_catch = match catchall, must_wrap_catches with
+			| Some (v,c), _
+			| _, (v, c) :: _ ->
+				let pos = c.epos in
+
+				let temp_var = alloc_var VGenerated "catchallException" catchall_type pos in
+				let temp_local = make_local temp_var pos in
+				let catchall_var = alloc_var VGenerated "realException" t_dynamic pos in
+				let catchall_local = make_local catchall_var pos in
+
+				(* if it is of type wrapper_type, unwrap it *)
+				let catchall_expr = mk (TIf (gen_typecheck temp_local wrapper_type pos, unwrap_expr temp_local, Some temp_local)) t_dynamic pos in
+				let catchall_decl = mk (TVar (catchall_var, Some catchall_expr)) com.basic.tvoid pos in
+
+				let rec loop must_wrap_catches =
+					match must_wrap_catches with
+					| (vcatch,catch) :: tl ->
+						mk (TIf (gen_typecheck catchall_local vcatch.v_type catch.epos,
+							     mk (TBlock [(mk (TVar (vcatch, Some(mk_cast (* TODO: this should be a fast non-dynamic cast *) catchall_local vcatch.v_type pos))) com.basic.tvoid catch.epos); catch]) catch.etype catch.epos,
+							     Some (loop tl))
+						) catch.etype catch.epos
+					| [] ->
+						match catchall with
+						| Some (v,s) ->
+							Type.concat (mk (TVar (v, Some catchall_local)) com.basic.tvoid pos) s
+						| None ->
+							mk_block (rethrow_expr temp_local)
+				in
+				[(temp_var, catch_map temp_var { e with eexpr = TBlock [catchall_decl; loop must_wrap_catches] })]
+			| _ ->
+				[]
+			in
+			{ e with eexpr = TTry(run ttry, (List.rev nowrap_catches) @ dyn_catch) }
+		| _ ->
+			Type.map_expr run e
+	in
+	run
+
+let find_class com path =
+	let mt = List.find (fun mt -> match mt with TClassDecl c -> c.cl_path = path | _ -> false) com.types in
+	match mt with TClassDecl c -> c | _ -> assert false
+
+let configure_cs com =
+	let base_exception = find_class com (["cs";"system"], "Exception") in
+	let base_exception_t = TInst(base_exception, []) in
+	let hx_exception = find_class com (["cs";"internal";"_Exceptions"], "HaxeException") in
+	let hx_exception_t = TInst (hx_exception, []) in
+	let exc_cl = find_class com (["cs";"internal"],"Exceptions") in
+	let rec is_exception t =
+		match follow t with
+		| TInst (cl,_) -> is_parent base_exception cl
+		| _ -> false
+	in
+	let e_rethrow = mk (TIdent "__rethrow__") t_dynamic null_pos in
+	let should_wrap t = not (is_exception t) in
+	let wrap_throw expr =
+		match expr.eexpr with
+		| TIdent "__rethrow__" ->
+			make_throw expr expr.epos
+		| _ ->
+			let e_hxexception = make_static_this hx_exception expr.epos in
+			let e_wrap = fcall e_hxexception "wrap" [expr] base_exception_t expr.epos in
+			make_throw e_wrap expr.epos
+	in
+	let unwrap_expr local_to_unwrap = field (mk_cast local_to_unwrap hx_exception_t local_to_unwrap.epos) "obj" t_dynamic local_to_unwrap.epos in
+	let rethrow_expr rethrow = make_throw e_rethrow rethrow.epos in
+	let catch_map v e =
+		let e_exc = make_static_this exc_cl e.epos in
+		let e_field = field e_exc "exception" base_exception_t e.epos in
+		let e_setstack = binop OpAssign e_field (make_local v e.epos) v.v_type e.epos in
+		Type.concat e_setstack e
+	in
+	let std_cl = find_class com ([],"Std") in
+	let gen_typecheck e t pos =
+		let std = make_static_this std_cl pos in
+		let e_type = make_typeexpr (module_type_of_type t) pos in
+		fcall std "is" [e; e_type] com.basic.tbool pos
+	in
+	init com should_wrap wrap_throw unwrap_expr rethrow_expr base_exception_t hx_exception_t catch_map gen_typecheck
+
+let configure_java com =
+	let base_exception = find_class com (["java"; "lang"], "Throwable") in
+	let base_exception_t = TInst (base_exception, []) in
+	let hx_exception = find_class com (["java";"internal";"_Exceptions"], "HaxeException") in
+	let hx_exception_t = TInst (hx_exception, []) in
+	let exc_cl = find_class com (["java";"internal"],"Exceptions") in
+	let rec is_exception t =
+		match follow t with
+		| TInst (cl,_) -> is_parent base_exception cl
+		| _ -> false
+	in
+	let should_wrap t = not (is_exception t) in
+	let wrap_throw expr =
+		let e_hxexception = make_static_this hx_exception expr.epos in
+		let e_wrap = fcall e_hxexception "wrap" [expr] base_exception_t expr.epos in
+		make_throw e_wrap expr.epos
+	in
+	let unwrap_expr local_to_unwrap = field (mk_cast local_to_unwrap hx_exception_t local_to_unwrap.epos) "obj" t_dynamic local_to_unwrap.epos in
+	let rethrow_expr exc = { exc with eexpr = TThrow exc } in
+	let catch_map v e =
+		let exc = make_static_this exc_cl e.epos in
+		let e_setstack = fcall exc "setException" [make_local v e.epos] com.basic.tvoid e.epos in
+		Type.concat e_setstack e;
+	in
+	let std_cl = find_class com ([],"Std") in
+	let gen_typecheck e t pos =
+		let std = make_static_this std_cl pos in
+		let e_type = make_typeexpr (module_type_of_type t) pos in
+		fcall std "is" [e; e_type] com.basic.tbool pos
+	in
+	init com should_wrap wrap_throw unwrap_expr rethrow_expr base_exception_t hx_exception_t catch_map gen_typecheck
diff --git a/src/filters/varLazifier.ml b/src/filters/varLazifier.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b22dba8d26334b5b93d7ffb91a70b75c8ef189bc
--- /dev/null
+++ b/src/filters/varLazifier.ml
@@ -0,0 +1,36 @@
+open Ast
+open Type
+
+let apply com e =
+	let rec loop var_inits e = match e.eexpr with
+		| TVar(v,Some e1) when v.v_kind = VExtractorVariable ->
+			let var_inits = PMap.add v.v_id e1 var_inits in
+			var_inits,{e with eexpr = TVar(v,None)}
+		| TLocal v ->
+			begin try
+				let e_init = PMap.find v.v_id var_inits in
+				let var_inits,e_init = loop var_inits e_init in
+				let e = {e with eexpr = TBinop(OpAssign,e,e_init)} in
+				let e = {e with eexpr = TParenthesis e} in
+				let var_inits = PMap.remove v.v_id var_inits in
+				var_inits,e
+			with Not_found ->
+				var_inits,e
+			end
+		| TIf(e1,e2,eo) ->
+			let var_inits,e1 = loop var_inits e1 in
+			let _,e2 = loop var_inits e2 in
+			let eo = match eo with None -> None | Some e -> Some (snd (loop var_inits e)) in
+			var_inits,{e with eexpr = TIf(e1,e2,eo)}
+		| TSwitch(e1,cases,edef) ->
+			let var_inits,e1 = loop var_inits e1 in
+			let cases = List.map (fun (el,e) ->
+				let _,e = loop var_inits e in
+				el,e
+			) cases in
+			let edef = match edef with None -> None | Some e -> Some (snd (loop var_inits e)) in
+			var_inits,{e with eexpr = TSwitch(e1,cases,edef)}
+		| _ ->
+			Texpr.foldmap loop var_inits e
+	in
+	snd (loop PMap.empty e)
\ No newline at end of file
diff --git a/src/generators/flashProps.ml b/src/generators/flashProps.ml
new file mode 100644
index 0000000000000000000000000000000000000000..18e29d442be9dbecee8273b2f8532f7cea1480cc
--- /dev/null
+++ b/src/generators/flashProps.ml
@@ -0,0 +1,60 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+open Type
+
+let is_getter_name name = ExtString.String.starts_with name "get_"
+let is_setter_name name = ExtString.String.starts_with name "set_"
+let get_property_name accessor_name = String.sub accessor_name 4 (String.length accessor_name - 4)
+let is_flash_property cf = Meta.has Meta.FlashProperty cf.cf_meta
+
+let find_property_for_accessor ~isget cl tl accessor_name =
+	let prop_name = get_property_name accessor_name in
+	try
+		match Type.class_field cl tl prop_name with
+		| Some (prop_cl, prop_tl), _, prop_cf ->
+			(match prop_cf.cf_kind with
+			| Var { v_read = AccCall; v_write = AccCall | AccNever } when isget && is_flash_property prop_cf -> Some (prop_cl, prop_tl, prop_cf)
+			| Var { v_read = AccCall | AccNever; v_write = AccCall } when not isget && is_flash_property prop_cf -> Some (prop_cl, prop_tl, prop_cf)
+			| _ -> None)
+		| _ -> None
+	with Not_found ->
+		None
+
+let is_extern_instance_accessor ~isget cl tl cf =
+	if cl.cl_extern && (if isget then is_getter_name cf.cf_name else is_setter_name cf.cf_name) then
+		find_property_for_accessor ~isget cl tl cf.cf_name
+	else
+		None
+
+let find_static_property_for_accessor ~isget cl accessor_name =
+	let prop_name = get_property_name accessor_name in
+	try
+		let prop_cf = PMap.find prop_name cl.cl_statics in
+		(match prop_cf.cf_kind with
+		| Var { v_read = AccCall; v_write = AccCall | AccNever } when isget && is_flash_property prop_cf -> Some prop_cf
+		| Var { v_read = AccCall | AccNever; v_write = AccCall } when not isget && is_flash_property prop_cf -> Some prop_cf
+		| _ -> None)
+	with Not_found ->
+		None
+
+let is_extern_static_accessor ~isget cl cf =
+	if cl.cl_extern && (if isget then is_getter_name cf.cf_name else is_setter_name cf.cf_name) then
+		find_static_property_for_accessor ~isget cl cf.cf_name
+	else
+		None
diff --git a/src/generators/genas3.ml b/src/generators/genas3.ml
index b673e31dd873e8d55b44245e4cfcd14671e2b2a9..10dbcd094c76034ba0a060ded124fdb5aae10fc2 100644
--- a/src/generators/genas3.ml
+++ b/src/generators/genas3.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -19,6 +19,7 @@
 
 open Type
 open Common
+open FlashProps
 
 type context_infos = {
 	com : Common.context;
@@ -28,7 +29,7 @@ type context = {
 	inf : context_infos;
 	ch : out_channel;
 	buf : Buffer.t;
-	path : path;
+	path : Globals.path;
 	mutable get_sets : (string * bool,string) Hashtbl.t;
 	mutable curclass : tclass;
 	mutable tabs : string;
@@ -146,7 +147,7 @@ let valid_as3_ident s =
 
 let anon_field s =
 	let s = s_ident s in
-	if not (valid_as3_ident s) then "\"" ^ (Ast.s_escape s) ^ "\"" else s
+	if not (valid_as3_ident s) then "\"" ^ (StringHelper.s_escape s) ^ "\"" else s
 
 let rec create_dir acc = function
 	| [] -> ()
@@ -247,6 +248,13 @@ let rec type_str ctx t p =
 	match t with
 	| TEnum _ | TInst _ when List.memq t ctx.local_types ->
 		"*"
+	| TAbstract ({a_path = [],"Null"},[t]) ->
+		(match follow t with
+		| TAbstract ({ a_path = [],"UInt" },_)
+		| TAbstract ({ a_path = [],"Int" },_)
+		| TAbstract ({ a_path = [],"Float" },_)
+		| TAbstract ({ a_path = [],"Bool" },_) -> "*"
+		| _ -> type_str ctx t p)
 	| TAbstract (a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
 		type_str ctx (Abstract.get_underlying_type a pl) p
 	| TAbstract (a,_) ->
@@ -256,24 +264,10 @@ let rec type_str ctx t p =
 		| [], "Int" -> "int"
 		| [], "Float" -> "Number"
 		| [], "Bool" -> "Boolean"
+		| ["flash"], "AnyType" -> "*"
 		| _ -> s_path ctx true a.a_path p)
 	| TEnum (e,_) ->
-		if e.e_extern then (match e.e_path with
-			| [], "Void" -> "void"
-			| [], "Bool" -> "Boolean"
-			| _ ->
-				let rec loop = function
-					| [] -> "Object"
-					| (Meta.FakeEnum,[Ast.EConst (Ast.Ident n),_],_) :: _ ->
-						(match n with
-						| "Int" -> "int"
-						| "UInt" -> "uint"
-						| _ -> n)
-					| _ :: l -> loop l
-				in
-				loop e.e_meta
-		) else
-			s_path ctx true e.e_path p
+		if e.e_extern then "Object" else s_path ctx true e.e_path p
 	| TInst ({ cl_path = ["flash"],"Vector" },[pt]) ->
 		(match pt with
 		| TInst({cl_kind = KTypeParameter _},_) -> "*"
@@ -291,19 +285,9 @@ let rec type_str ctx t p =
 	| TType (t,args) ->
 		(match t.t_path with
 		| [], "UInt" -> "uint"
-		| [] , "Null" ->
-			(match args with
-			| [t] ->
-				(match follow t with
-				| TAbstract ({ a_path = [],"UInt" },_)
-				| TAbstract ({ a_path = [],"Int" },_)
-				| TAbstract ({ a_path = [],"Float" },_)
-				| TAbstract ({ a_path = [],"Bool" },_) -> "*"
-				| _ -> type_str ctx t p)
-			| _ -> assert false);
 		| _ -> type_str ctx (apply_params t.t_params args t.t_type) p)
 	| TLazy f ->
-		type_str ctx ((!f)()) p
+		type_str ctx (lazy_type f) p
 
 let rec iter_switch_break in_switch e =
 	match e.eexpr with
@@ -338,7 +322,7 @@ let generate_resources infos =
 		let dir = (infos.com.file :: ["__res"]) in
 		create_dir [] dir;
 		let add_resource name data =
-			let name = Base64.str_encode name in
+			let name = Bytes.unsafe_to_string (Base64.str_encode name) in
 			let ch = open_out_bin (String.concat "/" (dir @ [name])) in
 			output_string ch data;
 			close_out ch
@@ -353,9 +337,9 @@ let generate_resources infos =
 		Hashtbl.iter (fun name _ ->
 			let varname = ("v" ^ (string_of_int !k)) in
 			k := !k + 1;
-			print ctx "\t\t[Embed(source = \"__res/%s\", mimeType = \"application/octet-stream\")]\n" (Base64.str_encode name);
+			print ctx "\t\t[Embed(source = \"__res/%s\", mimeType = \"application/octet-stream\")]\n" (Bytes.unsafe_to_string (Base64.str_encode name));
 			print ctx "\t\tpublic static var %s:Class;\n" varname;
-			inits := ("list[\"" ^ Ast.s_escape name ^ "\"] = " ^ varname ^ ";") :: !inits;
+			inits := ("list[\"" ^ StringHelper.s_escape name ^ "\"] = " ^ varname ^ ";") :: !inits;
 		) infos.com.resources;
 		spr ctx "\t\tstatic public function __init__():void {\n";
 		spr ctx "\t\t\tlist = new Dictionary();\n";
@@ -371,13 +355,13 @@ let generate_resources infos =
 let gen_constant ctx p = function
 	| TInt i -> print ctx "%ld" i
 	| TFloat s -> spr ctx s
-	| TString s -> print ctx "\"%s\"" (Ast.s_escape s)
+	| TString s -> print ctx "\"%s\"" (StringHelper.s_escape s)
 	| TBool b -> spr ctx (if b then "true" else "false")
 	| TNull -> spr ctx "null"
 	| TThis -> spr ctx (this ctx)
 	| TSuper -> spr ctx "super"
 
-let gen_function_header ctx name f params p =
+let rec gen_function_header ctx name f params p =
 	let old = ctx.in_value in
 	let old_t = ctx.local_types in
 	let old_bi = ctx.block_inits in
@@ -385,10 +369,10 @@ let gen_function_header ctx name f params p =
 	ctx.local_types <- List.map snd params @ ctx.local_types;
 	let init () =
  		List.iter (fun (v,o) -> match o with
-			| Some c when is_nullable v.v_type && c <> TNull ->
+			| Some c when is_nullable v.v_type && c.eexpr <> TConst TNull ->
 				newline ctx;
 				print ctx "if(%s==null) %s=" v.v_name v.v_name;
-				gen_constant ctx p c;
+				gen_expr ctx c;
 			| _ -> ()
 		) f.tf_args;
 		ctx.block_inits <- None;
@@ -413,9 +397,11 @@ let gen_function_header ctx name f params p =
 				match c with
 				| None ->
 					if ctx.constructor_block then print ctx " = %s" (default_value tstr);
-				| Some c ->
+				| Some ({eexpr = TConst _ } as e) ->
 					spr ctx " = ";
-					gen_constant ctx p c
+					gen_expr ctx e
+				| _ ->
+					spr ctx " = null"
 	) f.tf_args;
 	print ctx ") : %s " (type_str ctx f.tf_type p);
 	(fun () ->
@@ -424,7 +410,7 @@ let gen_function_header ctx name f params p =
 		ctx.block_inits <- old_bi;
 	)
 
-let rec gen_call ctx e el r =
+and gen_call ctx e el r =
 	match e.eexpr , el with
 	| TCall (x,_) , el ->
 		spr ctx "(";
@@ -433,32 +419,32 @@ let rec gen_call ctx e el r =
 		spr ctx "(";
 		concat ctx "," (gen_value ctx) el;
 		spr ctx ")";
-	| TLocal { v_name = "__is__" } , [e1;e2] ->
+	| TIdent "__is__" , [e1;e2] ->
 		gen_value ctx e1;
 		spr ctx " is ";
 		gen_value ctx e2;
-	| TLocal { v_name = "__in__" } , [e1;e2] ->
+	| TIdent "__in__" , [e1;e2] ->
 		spr ctx "(";
 		gen_value ctx e1;
 		spr ctx " in ";
 		gen_value ctx e2;
 		spr ctx ")"
-	| TLocal { v_name = "__as__" }, [e1;e2] ->
+	| TIdent "__as__", [e1;e2] ->
 		gen_value ctx e1;
 		spr ctx " as ";
 		gen_value ctx e2;
-	| TLocal { v_name = "__int__" }, [e] ->
+	| TIdent "__int__", [e] ->
 		spr ctx "int(";
 		gen_value ctx e;
 		spr ctx ")";
-	| TLocal { v_name = "__float__" }, [e] ->
+	| TIdent "__float__", [e] ->
 		spr ctx "Number(";
 		gen_value ctx e;
 		spr ctx ")";
-	| TLocal { v_name = "__typeof__" }, [e] ->
+	| TIdent "__typeof__", [e] ->
 		spr ctx "typeof ";
 		gen_value ctx e;
-	| TLocal { v_name = "__keys__" }, [e] ->
+	| TIdent "__keys__", [e] ->
 		let ret = (match ctx.in_value with None -> assert false | Some r -> r) in
 		print ctx "%s = new Array()" ret.v_name;
 		newline ctx;
@@ -466,7 +452,7 @@ let rec gen_call ctx e el r =
 		print ctx "for(var %s : String in " tmp;
 		gen_value ctx e;
 		print ctx ") %s.push(%s)" ret.v_name tmp;
-	| TLocal { v_name = "__hkeys__" }, [e] ->
+	| TIdent "__hkeys__", [e] ->
 		let ret = (match ctx.in_value with None -> assert false | Some r -> r) in
 		print ctx "%s = new Array()" ret.v_name;
 		newline ctx;
@@ -474,7 +460,7 @@ let rec gen_call ctx e el r =
 		print ctx "for(var %s : String in " tmp;
 		gen_value ctx e;
 		print ctx ") %s.push(%s.substr(1))" ret.v_name tmp;
-	| TLocal { v_name = "__foreach__" }, [e] ->
+	| TIdent "__foreach__", [e] ->
 		let ret = (match ctx.in_value with None -> assert false | Some r -> r) in
 		print ctx "%s = new Array()" ret.v_name;
 		newline ctx;
@@ -482,22 +468,25 @@ let rec gen_call ctx e el r =
 		print ctx "for each(var %s : * in " tmp;
 		gen_value ctx e;
 		print ctx ") %s.push(%s)" ret.v_name tmp;
-	| TLocal { v_name = "__new__" }, e :: args ->
+	| TIdent "__new__", e :: args ->
 		spr ctx "new ";
 		gen_value ctx e;
 		spr ctx "(";
 		concat ctx "," (gen_value ctx) args;
 		spr ctx ")";
-	| TLocal { v_name = "__delete__" }, [e;f] ->
+	| TIdent "__delete__", [e;f] ->
 		spr ctx "delete(";
 		gen_value ctx e;
 		spr ctx "[";
 		gen_value ctx f;
 		spr ctx "]";
 		spr ctx ")";
-	| TLocal { v_name = "__unprotect__" }, [e] ->
+	| TIdent "__unprotect__", [e] ->
 		gen_value ctx e
-	| TLocal { v_name = "__vector__" }, [e] ->
+	| TIdent "__vector__", [] ->
+		let t = match r with TAbstract ({a_path = [],"Class"}, [vt]) -> vt | _ -> assert false in
+		spr ctx (type_str ctx t e.epos);
+	| TIdent "__vector__", [e] ->
 		spr ctx (type_str ctx r e.epos);
 		spr ctx "(";
 		gen_value ctx e;
@@ -537,11 +526,55 @@ let rec gen_call ctx e el r =
 		concat ctx "," (gen_value ctx) el;
 		spr ctx ")";
 		print ctx ") as %s)" s
+	| TField (e1, f), el ->
+		begin
+		let default () = gen_call_default ctx e el in
+		let mk_prop_acccess prop_cl prop_tl prop_cf = mk (TField (e1, FInstance (prop_cl, prop_tl, prop_cf))) prop_cf.cf_type e.epos in
+		let mk_static_acccess cl prop_cf = mk (TField (e1, FStatic (cl, prop_cf))) prop_cf.cf_type e.epos in
+		let gen_assign lhs rhs = gen_expr ctx (mk (TBinop (OpAssign, lhs, rhs)) rhs.etype e.epos) in
+		match f, el with
+		| FInstance (cl, tl, cf), [] ->
+			(match is_extern_instance_accessor ~isget:true cl tl cf with
+			| Some (prop_cl, prop_tl, prop_cf) ->
+				let efield = mk_prop_acccess prop_cl prop_tl prop_cf in
+				gen_expr ctx efield
+			| None ->
+				default ())
+
+		| FInstance (cl, tl, cf), [evalue] ->
+			(match is_extern_instance_accessor ~isget:false cl tl cf with
+			| Some (prop_cl, prop_tl, prop_cf) ->
+				let efield = mk_prop_acccess prop_cl prop_tl prop_cf in
+				gen_assign efield evalue
+			| None ->
+				default ())
+
+		| FStatic (cl, cf), [] ->
+			(match is_extern_static_accessor ~isget:true cl cf with
+			| Some prop_cf ->
+				let efield = mk_static_acccess cl prop_cf in
+				gen_expr ctx efield
+			| None ->
+				default ())
+
+		| FStatic (cl, cf), [evalue] ->
+			(match is_extern_static_accessor ~isget:false cl cf with
+			| Some prop_cf ->
+				let efield = mk_static_acccess cl prop_cf in
+				gen_assign efield evalue
+			| None ->
+				default ())
+		| _ ->
+			default ()
+		end
 	| _ ->
-		gen_value ctx e;
-		spr ctx "(";
-		concat ctx "," (gen_value ctx) el;
-		spr ctx ")"
+		gen_call_default ctx e el
+
+and gen_call_default ctx e el =
+	gen_value ctx e;
+	spr ctx "(";
+	concat ctx "," (gen_value ctx) el;
+	spr ctx ")"
 
 and gen_value_op ctx e =
 	match e.eexpr with
@@ -595,7 +628,7 @@ and gen_expr ctx e =
 		gen_constant ctx e.epos c
 	| TLocal v ->
 		spr ctx (s_ident v.v_name)
-	| TArray ({ eexpr = TLocal { v_name = "__global__" } },{ eexpr = TConst (TString s) }) ->
+	| TArray ({ eexpr = TIdent "__global__" },{ eexpr = TConst (TString s) }) ->
 		let path = Ast.parse_path s in
 		spr ctx (s_path ctx false path e.epos)
 	| TArray (e1,e2) ->
@@ -633,6 +666,9 @@ and gen_expr ctx e =
 		gen_expr ctx e1;
 		spr ctx ")";
 		gen_field_access ctx e1.etype (field_name s)
+	| TEnumIndex e ->
+		gen_value ctx e;
+		print ctx ".index";
 	| TEnumParameter (e,_,i) ->
 		gen_value ctx e;
 		print ctx ".params[%i]" i;
@@ -676,7 +712,7 @@ and gen_expr ctx e =
 		let bend = open_block ctx in
 		let cb = (if not ctx.constructor_block then
 			(fun () -> ())
-		else if not (Codegen.constructor_side_effects e) then begin
+		else if not (Texpr.constructor_side_effects e) then begin
 			ctx.constructor_block <- false;
 			(fun () -> ())
 		end else begin
@@ -754,7 +790,7 @@ and gen_expr ctx e =
 		handle_break();
 	| TObjectDecl fields ->
 		spr ctx "{ ";
-		concat ctx ", " (fun (f,e) -> print ctx "%s : " (anon_field f); gen_value ctx e) fields;
+		concat ctx ", " (fun ((f,_,_),e) -> print ctx "%s : " (anon_field f); gen_value ctx e) fields;
 		spr ctx "}"
 	| TFor (v,it,e) ->
 		let handle_break = handle_break ctx e in
@@ -811,6 +847,8 @@ and gen_expr ctx e =
 		end
 	| TCast (e1,Some t) ->
 		gen_expr ctx (Codegen.default_cast ctx.inf.com e1 t e.etype e.epos)
+	| TIdent s ->
+		spr ctx s
 
 and gen_block_element ctx e = match e.eexpr with
 	| TObjectDecl fl ->
@@ -840,7 +878,7 @@ and gen_value ctx e =
 	let value block =
 		let old = ctx.in_value in
 		let t = type_str ctx e.etype e.epos in
-		let r = alloc_var (gen_local ctx "$r") e.etype e.epos in
+		let r = alloc_var VGenerated (gen_local ctx "$r") e.etype e.epos in
 		ctx.in_value <- Some r;
 		if ctx.in_static then
 			print ctx "function() : %s " t
@@ -872,7 +910,7 @@ and gen_value ctx e =
 		)
 	in
 	match e.eexpr with
-	| TCall ({ eexpr = TLocal { v_name = "__keys__" } },_) | TCall ({ eexpr = TLocal { v_name = "__hkeys__" } },_) ->
+	| TCall ({ eexpr = TIdent "__keys__" },_) | TCall ({ eexpr = TIdent "__hkeys__" },_) ->
 		let v = value true in
 		gen_expr ctx e;
 		v()
@@ -882,6 +920,7 @@ and gen_value ctx e =
 	| TBinop _
 	| TField _
 	| TEnumParameter _
+	| TEnumIndex _
 	| TTypeExpr _
 	| TParenthesis _
 	| TObjectDecl _
@@ -889,7 +928,8 @@ and gen_value ctx e =
 	| TCall _
 	| TNew _
 	| TUnop _
-	| TFunction _ ->
+	| TFunction _
+	| TIdent _ ->
 		gen_expr ctx e
 	| TMeta (_,e1) ->
 		gen_value ctx e1
@@ -963,9 +1003,6 @@ and gen_value ctx e =
 		)) e.etype e.epos);
 		v()
 
-let final m =
-	if Meta.has Meta.Final m then " final " else ""
-
 let generate_field ctx static f =
 	newline ctx;
 	ctx.in_static <- static;
@@ -975,8 +1012,8 @@ let generate_field ctx static f =
 		| Meta.Meta, [Ast.ECall ((Ast.EConst (Ast.Ident n),_),args),_] ->
 			let mk_arg (a,p) =
 				match a with
-				| Ast.EConst (Ast.String s) -> (None, s)
-				| Ast.EBinop (Ast.OpAssign,(Ast.EConst (Ast.Ident n),_),(Ast.EConst (Ast.String s),_)) -> (Some n, s)
+				| Ast.EConst (Ast.String(s,_)) -> (None, s)
+				| Ast.EBinop (Ast.OpAssign,(Ast.EConst (Ast.Ident n),_),(Ast.EConst (Ast.String(s,_)),_)) -> (Some n, s)
 				| _ -> abort "Invalid meta definition" p
 			in
 			print ctx "[%s" n;
@@ -993,16 +1030,19 @@ let generate_field ctx static f =
 			print ctx "]";
 		| _ -> ()
 	) f.cf_meta;
-	let public = f.cf_public || Hashtbl.mem ctx.get_sets (f.cf_name,static) || (f.cf_name = "main" && static)
+	let cfl_overridden = TClass.get_overridden_fields ctx.curclass f in
+	let overrides_public = List.exists (fun cf -> Meta.has Meta.Public cf.cf_meta) cfl_overridden in
+	let public = (has_class_field_flag f CfPublic) || Hashtbl.mem ctx.get_sets (f.cf_name,static) || (f.cf_name = "main" && static)
 		|| f.cf_name = "resolve" || Meta.has Meta.Public f.cf_meta
 		(* consider all abstract methods public to avoid issues with inlined private access *)
 	    || (match ctx.curclass.cl_kind with KAbstractImpl _ -> true | _ -> false)
+		|| overrides_public
 	in
 	let rights = (if static then "static " else "") ^ (if public then "public" else "protected") in
 	let p = ctx.curclass.cl_pos in
 	match f.cf_expr, f.cf_kind with
 	| Some { eexpr = TFunction fd }, Method (MethNormal | MethInline) ->
-		print ctx "%s%s " rights (if static then "" else final f.cf_meta);
+		print ctx "%s%s " rights (if static || not (has_class_field_flag f CfFinal) then "" else " final ");
 		let rec loop c =
 			match c.cl_super with
 			| None -> ()
@@ -1024,8 +1064,8 @@ let generate_field ctx static f =
 			| TFun (args,r) when (match f.cf_kind with Method MethDynamic | Var _ -> false | _ -> true) ->
 				let rec loop = function
 					| [] -> f.cf_name
-					| (Meta.Getter,[Ast.EConst (Ast.String name),_],_) :: _ -> "get " ^ name
-					| (Meta.Setter,[Ast.EConst (Ast.String name),_],_) :: _ -> "set " ^ name
+					| (Meta.Getter,[Ast.EConst (Ast.String(name,_)),_],_) :: _ -> "get " ^ name
+					| (Meta.Setter,[Ast.EConst (Ast.String(name,_)),_],_) :: _ -> "set " ^ name
 					| _ :: l -> loop l
 				in
 				print ctx "function %s(" (loop f.cf_meta);
@@ -1095,7 +1135,7 @@ let generate_class ctx c =
 	define_getset ctx false c;
 	ctx.local_types <- List.map snd c.cl_params;
 	let pack = open_block ctx in
-	print ctx "\tpublic %s%s%s %s " (final c.cl_meta) (match c.cl_dynamic with None -> "" | Some _ -> if c.cl_interface then "" else "dynamic ") (if c.cl_interface then "interface" else "class") (snd c.cl_path);
+	print ctx "\tpublic %s%s%s %s " (if c.cl_final then " final " else "") "" (if c.cl_interface then "interface" else "class") (snd c.cl_path);
 	(match c.cl_super with
 	| None -> ()
 	| Some (csup,_) -> print ctx "extends %s " (s_path ctx true csup.cl_path c.cl_pos));
@@ -1111,7 +1151,7 @@ let generate_class ctx c =
 	| Some f ->
 		let f = { f with
 			cf_name = snd c.cl_path;
-			cf_public = true;
+			cf_flags = set_flag f.cf_flags (int_of_class_field_flag CfPublic);
 			cf_kind = Method MethNormal;
 		} in
 		ctx.constructor_block <- true;
@@ -1200,13 +1240,13 @@ let generate_enum ctx e =
 			print ctx "public static var %s : %s = new %s(\"%s\",%d)" c.ef_name ename ename c.ef_name c.ef_index;
 	) e.e_constrs;
 	newline ctx;
-	(match Codegen.build_metadata ctx.inf.com (TEnumDecl e) with
+	(match Texpr.build_metadata ctx.inf.com.basic (TEnumDecl e) with
 	| None -> ()
 	| Some e ->
 		print ctx "public static var __meta__ : * = ";
 		gen_expr ctx e;
 		newline ctx);
-	print ctx "public static var __constructs__ : Array = [%s];" (String.concat "," (List.map (fun s -> "\"" ^ Ast.s_escape s ^ "\"") e.e_names));
+	print ctx "public static var __constructs__ : Array = [%s];" (String.concat "," (List.map (fun s -> "\"" ^ StringHelper.s_escape s ^ "\"") e.e_names));
 	cl();
 	newline ctx;
 	print ctx "}";
@@ -1238,6 +1278,7 @@ let generate_base_enum ctx =
 	newline ctx
 
 let generate com =
+	com.warning "-as3 target is deprecated. Use -swf instead. See https://github.com/HaxeFoundation/haxe/issues/8295" Globals.null_pos;
 	let infos = {
 		com = com;
 	} in
diff --git a/src/generators/gencommon.ml b/src/generators/gencommon.ml
deleted file mode 100644
index 3e7c9e823e2f9387348d785d05b2b2b409d3e7d9..0000000000000000000000000000000000000000
--- a/src/generators/gencommon.ml
+++ /dev/null
@@ -1,10183 +0,0 @@
-(*
-	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *)
-
-(*
-	Gen Common API
-
-	This is the key module for generation of Java and C# sources
-	In order for both modules to share as much code as possible, some
-	rules were devised:
-
-	- every feature has its own submodule, and may contain the following methods:
-		- configure
-			sets all the configuration variables for the module to run. If a module has this method,
-			it *should* be called once before running any filter
-		- run_filter ->
-			runs the filter immediately on the context
-		- add_filter ->
-			adds the filter to an expr->expr list. Most filter modules will provide this option so the filter
-			function can only run once.
-	- most submodules will have side-effects so the order of operations will matter.
-		When running configure / add_filter this might be taken care of with the rule-based dispatch system working
-		underneath, but still there might be some incompatibilities. There will be an effort to document it.
-		The modules can hint on the order by suffixing their functions with _first or _last.
-	- any of those methods might have different parameters, that configure how the filter will run.
-		For example, a simple filter that maps switch() expressions to if () .. else if... might receive
-		a function that filters what content should be mapped
-	- Other targets can use those filters on their own code. In order to do that,
-		a simple configuration step is needed: you need to initialize a generator_ctx type with
-		Gencommon.new_gen (context:Common.context)
-		with a generator_ctx context you will be able to add filters to your code, and execute them with
-		Gencommon.run_filters (gen_context:Gencommon.generator_ctx)
-
-		After running the filters, you can run your own generator normally.
-
-		(* , or you can run
-		Gencommon.generate_modules (gen_context:Gencommon.generator_ctx) (extension:string) (module_gen:module_type list->bool)
-		where module_gen will take a whole module (can be *)
-*)
-open Unix
-open Ast
-open Type
-open Common
-open Globals
-open Option
-open Printf
-open ExtString
-open Codegen
-open Overloads
-
-let alloc_var n t = alloc_var n t null_pos
-
-let debug_type_ctor = function
-	| TMono _ -> "TMono"
-	| TEnum _ -> "TEnum"
-	| TInst _ -> "TInst"
-	| TType _ -> "TType"
-	| TFun _ -> "TFun"
-	| TAnon _ -> "TAnon"
-	| TDynamic _ -> "TDynamic"
-	| TLazy _ -> "TLazy"
-	| TAbstract _ -> "TAbstract"
-
-let debug_type = (s_type (print_context()))
-
-let debug_expr = s_expr debug_type
-
-let rec like_float t =
-	match follow t with
-		| TAbstract({ a_path = ([], "Float") },[])
-		| TAbstract({ a_path = ([], "Int") },[]) -> true
-		| TAbstract({ a_path = (["cs"], "Pointer") },_) -> false
-		| TAbstract(a, _) -> List.exists (fun t -> like_float t) a.a_from || List.exists (fun t -> like_float t) a.a_to
-		| _ -> false
-
-let rec like_int t =
-	match follow t with
-		| TAbstract({ a_path = ([], "Int") },[]) -> true
-		| TAbstract({ a_path = (["cs"], "Pointer") },_) -> false
-		| TAbstract(a, _) -> List.exists (fun t -> like_int t) a.a_from || List.exists (fun t -> like_int t) a.a_to
-		| _ -> false
-
-let rec like_i64 t =
-	match follow t with
-		| TAbstract({ a_path = (["cs"], "Int64") },[])
-		| TAbstract({ a_path = (["cs"], "UInt64") },[])
-		| TAbstract({ a_path = (["java"], "Int64") },[])
-		| TAbstract({ a_path = (["haxe"], "Int64") },[]) -> true
-		| TAbstract(a, _) -> List.exists (fun t -> like_i64 t) a.a_from || List.exists (fun t -> like_i64 t) a.a_to
-		| _ -> false
-
-let follow_once t =
-	match t with
-	| TMono r ->
-		(match !r with
-		| Some t -> t
-		| _ -> t_dynamic (* avoid infinite loop / should be the same in this context *))
-	| TLazy f ->
-		!f()
-	| TType (t,tl) ->
-		apply_params t.t_params tl t.t_type
-	| _ -> t
-
-let t_empty = TAnon({ a_fields = PMap.empty; a_status = ref (Closed) })
-
-let tmp_count = ref 0
-
-let reset_temps () = tmp_count := 0
-
-(* the undefined is a special var that works like null, but can have special meaning *)
-let v_undefined = alloc_var "__undefined__" t_dynamic
-
-let undefined pos = ExprBuilder.make_local v_undefined pos
-
-let path_of_md_def md_def =
-	match md_def.m_types with
-		| [TClassDecl c] -> c.cl_path
-		| _ -> md_def.m_path
-
-
-(* ******************************************* *)
-(* common helpers *)
-(* ******************************************* *)
-
-let assertions = false (* when assertions == true, many assertions will be made to guarantee the quality of the data input *)
-let debug_mode = ref false
-let trace s = if !debug_mode then print_endline s else ()
-let timer name = if !debug_mode then Common.timer name else fun () -> ()
-
-let is_string t =
-	match follow t with
-	| TInst({ cl_path = ([], "String") }, []) -> true
-	| _ -> false
-
-(* helper function for creating Anon types of class / enum modules *)
-
-let anon_of_classtype cl =
-	TAnon {
-		a_fields = cl.cl_statics;
-		a_status = ref (Statics cl)
-	}
-
-let anon_of_enum e =
-	TAnon {
-		a_fields = PMap.empty;
-		a_status = ref (EnumStatics e)
-	}
-
-let anon_of_abstract a =
-	TAnon {
-		a_fields = PMap.empty;
-		a_status = ref (AbstractStatics a)
-	}
-
-let anon_of_mt mt = match mt with
-	| TClassDecl cl -> anon_of_classtype cl
-	| TEnumDecl e -> anon_of_enum e
-	| TAbstractDecl a -> anon_of_abstract a
-	| _ -> assert false
-
-let anon_class t =
-	match follow t with
-	| TAnon anon ->
-		(match !(anon.a_status) with
-		| Statics cl -> Some(TClassDecl cl)
-		| EnumStatics e -> Some(TEnumDecl e)
-		| AbstractStatics a -> Some(TAbstractDecl a)
-		| _ -> None)
-	| _ -> None
-
- let rec t_to_md t = match t with
-	| TInst (cl,_) -> TClassDecl cl
-	| TEnum (e,_) -> TEnumDecl e
-	| TType (t,_) -> TTypeDecl t
-	| TAbstract (a,_) -> TAbstractDecl a
-	| TAnon anon ->
-		(match !(anon.a_status) with
-			| EnumStatics e -> TEnumDecl e
-			| Statics cl -> TClassDecl cl
-			| AbstractStatics a -> TAbstractDecl a
-			| _ -> assert false)
-	| TLazy f -> t_to_md (!f())
-	| TMono r -> (match !r with | Some t -> t_to_md t | None -> assert false)
-	| _ -> assert false
-
-let get_cl mt = match mt with | TClassDecl cl -> cl | _ -> failwith (Printf.sprintf "Unexpected module type (class expected) for %s: %s" (s_type_path (t_path mt)) (s_module_type_kind mt))
-
-let get_abstract mt = match mt with | TAbstractDecl a -> a | _ -> failwith (Printf.sprintf "Unexpected module type (abstract expected) for %s: %s" (s_type_path (t_path mt)) (s_module_type_kind mt))
-
-let get_tdef mt = match mt with | TTypeDecl t -> t | _ -> assert false
-
-let mk_mt_access mt pos = { eexpr = TTypeExpr(mt); etype = anon_of_mt mt; epos = pos }
-
-let mk_local = ExprBuilder.make_local
-
-(* this function is used by CastDetection module *)
-let get_fun t =
-	match follow t with
-	| TFun(r1,r2) -> (r1,r2)
-	| t -> (trace (debug_type t)); assert false
-
-let mk_cast t e = Type.mk_cast e t e.epos
-
-(** TODO: when adding new AST, make a new cast type for those fast casts. For now, we're using this hack
- *        of using null_class to tell a fast cast from a normal one. Also note that this only works since both
- *        C# and Java do not use the second part of TCast for anything *)
-let mk_castfast t e = { e with eexpr = TCast(e, Some (TClassDecl null_class)); etype = t }
-
-let mk_static_field_access_infer cl field pos params =
-	try
-		let cf = (PMap.find field cl.cl_statics) in
-		{ eexpr = TField(ExprBuilder.make_static_this cl pos, FStatic(cl, cf)); etype = (if params = [] then cf.cf_type else apply_params cf.cf_params params cf.cf_type); epos = pos }
-	with | Not_found -> failwith ("Cannot find field " ^ field ^ " in type " ^ (s_type_path cl.cl_path))
-
-let mk_static_field_access cl field fieldt pos =
-	{ (mk_static_field_access_infer cl field pos []) with etype = fieldt }
-
-(* stolen from Hugh's sources ;-) *)
-(* this used to be a class, but there was something in there that crashed ocaml native compiler in windows *)
-module SourceWriter =
-struct
-
-	type source_writer =
-	{
-		sw_buf : Buffer.t;
-		mutable sw_has_content : bool;
-		mutable sw_indent : string;
-		mutable sw_indents : string list;
-	}
-
-	let new_source_writer () =
-		{
-			sw_buf = Buffer.create 0;
-			sw_has_content = false;
-			sw_indent = "";
-			sw_indents = [];
-		}
-
-	let add_writer w_write w_read = Buffer.add_buffer w_read.sw_buf w_write.sw_buf
-
-	let contents w = Buffer.contents w.sw_buf
-
-	let len w = Buffer.length w.sw_buf
-
-	let write w x =
-		(if not w.sw_has_content then begin w.sw_has_content <- true; Buffer.add_string w.sw_buf w.sw_indent; Buffer.add_string w.sw_buf x; end else Buffer.add_string w.sw_buf x);
-		let len = (String.length x)-1 in
-		if len >= 0 && String.get x len = '\n' then begin w.sw_has_content <- false end else w.sw_has_content <- true
-
-	let push_indent w = w.sw_indents <- "\t"::w.sw_indents; w.sw_indent <- String.concat "" w.sw_indents
-
-	let pop_indent w =
-		match w.sw_indents with
-			| h::tail -> w.sw_indents <- tail; w.sw_indent <- String.concat "" w.sw_indents
-			| [] -> w.sw_indent <- "/*?*/"
-
-	let newline w = write w "\n"
-
-	let begin_block w = (if w.sw_has_content then newline w); write w "{"; push_indent w; newline w
-
-	let end_block w = pop_indent w; (if w.sw_has_content then newline w); write w "}"; newline w
-
-	let print w =
-		(if not w.sw_has_content then begin w.sw_has_content <- true; Buffer.add_string w.sw_buf w.sw_indent end);
-		bprintf w.sw_buf;
-
-end;;
-
-(* rule_dispatcher's priority *)
-type priority =
-	| PFirst
-	| PLast
-	| PZero
-	| PCustom of float
-
-exception DuplicateName of string
-exception NoRulesApplied
-
-let indent = ref []
-
-(* the rule dispatcher is the primary way to deal with distributed "plugins" *)
-(* we will define rules that will form a distributed / extensible match system *)
-class ['tp, 'ret] rule_dispatcher name ignore_not_found =
-	object(self)
-	val tbl = Hashtbl.create 16
-	val mutable keys = []
-	val names = Hashtbl.create 16
-	val mutable temp = 0
-
-	method add ?(name : string option) (* name helps debugging *) ?(priority : priority = PZero) (rule : 'tp->'ret option) =
-		let p = match priority with
-			| PFirst -> infinity
-			| PLast -> neg_infinity
-			| PZero -> 0.0
-			| PCustom i -> i
-		in
-
-		let q = if not( Hashtbl.mem tbl p ) then begin
-			let q = Stack.create() in
-			Hashtbl.add tbl p q;
-			keys <- p :: keys;
-			keys <- List.sort (fun x y -> - (compare x y)) keys;
-			q
-		end else Hashtbl.find tbl p in
-		let name = match name with
-			| None -> temp <- temp + 1; "$_" ^ (string_of_int temp)
-			| Some s -> s
-		in
-		(if Hashtbl.mem names name then raise (DuplicateName(name)));
-		Hashtbl.add names name q;
-
-		Stack.push (name, rule) q
-
-	method describe =
-		Hashtbl.iter (fun s _ -> (trace s)) names;
-
-	method remove (name : string) =
-		if Hashtbl.mem names name then begin
-			let q = Hashtbl.find names name in
-			let q_temp = Stack.create () in
-			Stack.iter (function
-				| (n, _) when n = name -> ()
-				| _ as r -> Stack.push r q_temp
-			) q;
-
-			Stack.clear q;
-			Stack.iter (fun r -> Stack.push r q) q_temp;
-
-			Hashtbl.remove names name;
-			true
-		end else false
-
-	method run_f tp = get (self#run tp)
-
-	method did_run tp = is_some (self#run tp)
-
-	method get_list =
-		let ret = ref [] in
-		List.iter (fun key ->
-			let q = Hashtbl.find tbl key in
-			Stack.iter (fun (_, rule) -> ret := rule :: !ret) q
-		) keys;
-
-		List.rev !ret
-
-	method run_from (priority:float) (tp:'tp) : 'ret option =
-		let ok = ref ignore_not_found in
-		let ret = ref None in
-		indent := "\t" :: !indent;
-
-		(try begin
-			List.iter (fun key ->
-				if key < priority then begin
-					let q = Hashtbl.find tbl key in
-					Stack.iter (fun (n, rule) ->
-						let t = if !debug_mode then Common.timer [("rule dispatcher rule: " ^ n)] else fun () -> () in
-						let r = rule(tp) in
-						t();
-						if is_some r then begin ret := r; raise Exit end
-					) q
-				end
-			) keys
-
-		end with Exit -> ok := true);
-
-		(match !indent with
-			| [] -> ()
-			| h::t -> indent := t);
-
-		(if not (!ok) then raise NoRulesApplied);
-		!ret
-
-	method run (tp:'tp) : 'ret option =
-		self#run_from infinity tp
-
-end;;
-
-(* this is a special case where tp = tret and you stack their output as the next's input *)
-class ['tp] rule_map_dispatcher name =
-	object(self)
-	inherit ['tp, 'tp] rule_dispatcher name true as super
-
-	method run_f tp = get (self#run tp)
-
-	method run_from (priority:float) (tp:'tp) : 'ret option =
-		let cur = ref tp in
-		(try begin
-			List.iter (fun key ->
-
-				if key < priority then begin
-					let q = Hashtbl.find tbl key in
-					Stack.iter (fun (n, rule) ->
-						trace ("running rule " ^ n);
-						let t = if !debug_mode then Common.timer [("rule map dispatcher rule: " ^ n)] else fun () -> () in
-						let r = rule(!cur) in
-						t();
-						if is_some r then begin cur := get r end
-					) q
-				end
-			) keys
-
-		end with Exit -> ());
-		Some (!cur)
-
-end;;
-
-
-type generator_ctx =
-{
-	(* these are the basic context fields. If another target is using this context, *)
-	(* this is all you need to care about *)
-	gcon : Common.context;
-
-	gclasses : gen_classes;
-
-	gtools : gen_tools;
-
-	(*
-		configurable function that receives a desired name and makes it "internal", doing the best
-		to ensure that it will not be called from outside.
-		To avoid name clashes between internal names, user must specify two strings: a "namespace" and the name itself
-	 *)
-	gmk_internal_name : string->string->string;
-
-	(*
-		module filters run before module filters and they should generate valid haxe syntax as a result.
-		Module filters shouldn't go through the expressions as it adds an unnecessary burden to the GC,
-		and it can all be done in a single step with gexpr_filters and proper priority selection.
-
-		As a convention, Module filters should end their name with Modf, so they aren't mistaken with expression filters
-	*)
-	gmodule_filters : (module_type) rule_map_dispatcher;
-
-	(*
-		expression filters are the most common filters to be applied.
-		They should also generate only valid haxe expressions, so e.g. calls to non-existant methods
-		should be avoided, although there are some ways around them (like gspecial_methods)
-	*)
-	gexpr_filters : (texpr) rule_map_dispatcher;
-	(*
-		syntax filters are also expression filters but they no longer require
-		that the resulting expressions be valid haxe expressions.
-		They then have no guarantee that either the input expressions or the output one follow the same
-		rules as normal haxe code.
-	*)
-	gsyntax_filters : (texpr) rule_map_dispatcher;
-
-	(* these are more advanced features, but they would require a rewrite of targets *)
-	(* they are just helpers to ditribute functions like "follow" or "type to string" *)
-	(* so adding a module will already take care of correctly following a certain type of *)
-	(* variable, for example *)
-
-	(* follows the type through typedefs, lazy typing, etc. *)
-	(* it's the place to put specific rules to handle typedefs, like *)
-	(* other basic types like UInt *)
-	gfollow : (t, t) rule_dispatcher;
-
-	gtypes : (path, module_type) Hashtbl.t;
-	mutable gtypes_list : module_type list;
-	mutable gmodules : Type.module_def list;
-
-	(* cast detection helpers / settings *)
-	(* this is a cache for all field access types *)
-	greal_field_types : (path * string, (tclass_field (* does the cf exist *) * t (*cf's type in relation to current class type params *) * t * tclass (* declared class *) ) option) Hashtbl.t;
-	(* this function allows any code to handle casts as if it were inside the cast_detect module *)
-	mutable ghandle_cast : t->t->texpr->texpr;
-	(* when an unsafe cast is made, we can warn the user *)
-	mutable gon_unsafe_cast : t->t->pos->unit;
-	(* does this type needs to be boxed? Normally always false, unless special type handling must be made *)
-	mutable gneeds_box : t->bool;
-	(* does this 'special type' needs cast to this other type? *)
-	(* this is here so we can implement custom behavior for "opaque" typedefs *)
-	mutable gspecial_needs_cast : t->t->bool;
-	(* sometimes we may want to support unrelated conversions on cast detection *)
-	(* for example, haxe.lang.Null<T> -> T on C# *)
-	(* every time an unrelated conversion is found, each to/from path is searched on this hashtbl *)
-	(* if found, the function will be executed with from_type, to_type. If returns true, it means that *)
-	(* it is a supported conversion, and the unsafe cast routine changes to a simple cast *)
-	gsupported_conversions : (path, t->t->bool) Hashtbl.t;
-
-	(* API for filters *)
-	(* add type can be called at any time, and will add a new module_def that may or may not be filtered *)
-	(* module_type -> should_filter *)
-	mutable gadd_type : module_type -> bool -> unit;
-	(* during expr filters, add_to_module will be available so module_types can be added to current module_def. we must pass the priority argument so the filters can be resumed	*)
-	mutable gadd_to_module : module_type -> float -> unit;
-	(* during expr filters, shows the current class path *)
-	mutable gcurrent_path : path;
-	(* current class *)
-	mutable gcurrent_class : tclass option;
-	(* current class field, if any *)
-	mutable gcurrent_classfield : tclass_field option;
-
-	(* events *)
-	(* is executed once every new classfield *)
-	mutable gon_classfield_start : (unit -> unit) list;
-	(* is executed once every new module type *)
-	mutable gon_new_module_type : (unit -> unit) list;
-	(* after module filters ended *)
-	mutable gafter_mod_filters_ended : (unit -> unit) list;
-	(* after expression filters ended *)
-	mutable gafter_expr_filters_ended : (unit -> unit) list;
-	(* after all filters are run *)
-	mutable gafter_filters_ended : (unit -> unit) list;
-
-	mutable gbase_class_fields : (string, tclass_field) PMap.t;
-
-	(* real type is the type as it is read by the target. *)
-	(* This function is here because most targets don't have *)
-	(* a 1:1 translation between haxe types and its native types *)
-	(* But types aren't changed to this representation as we might lose *)
-	(* some valuable type information in the process *)
-	mutable greal_type : t -> t;
-	(*
-		the same as greal_type but for type parameters.
-	*)
-	mutable greal_type_param : module_type -> tparams -> tparams;
-	(*
-		is the type a value type?
-		This may be used in some optimizations where reference types and value types
-		are handled differently. At first the default is very good to use, and if tweaks are needed,
-		it's best to be done by adding @:struct meta to the value types
-	*
-	mutable gis_value_type : t -> bool;*)
-
-	(* misc configuration *)
-	(*
-		Should the target allow type parameter dynamic conversion,
-		or should we add a cast to those cases as well?
-	*)
-	mutable gallow_tp_dynamic_conversion : bool;
-
-	(* internal apis *)
-	(* param_func_call : used by TypeParams and CastDetection *)
-	mutable gparam_func_call : texpr->texpr->tparams->texpr list->texpr;
-	(* does it already have a type parameter cast handler? This is used by CastDetect to know if it should handle type parameter casts *)
-	mutable ghas_tparam_cast_handler : bool;
-	(* type parameter casts - special cases *)
-	(* function cast_from, cast_to -> texpr *)
-	gtparam_cast : (path, (texpr->t->texpr)) Hashtbl.t;
-
-	(*
-		special vars are used for adding special behavior to
-	*)
-	gspecial_vars : (string, bool) Hashtbl.t;
-}
-
-and gen_classes =
-{
-	cl_reflect : tclass;
-	cl_type : tclass;
-	cl_dyn : tclass;
-
-	mutable nativearray_len : texpr -> pos -> texpr;
-	mutable nativearray_type : Type.t -> Type.t;
-	mutable nativearray : Type.t -> Type.t;
-}
-
-(* add here all reflection transformation additions *)
-and gen_tools =
-{
-	(* Reflect.fields(). The bool is if we are iterating in a read-only manner. If it is read-only we might not need to allocate a new array *)
-	r_fields : bool->texpr->texpr;
-	(* (first argument = return type. should be void in most cases) Reflect.setField(obj, field, val) *)
-	r_set_field : t->texpr->texpr->texpr->texpr;
-	(* Reflect.field. bool indicates if is safe (no error throwing) or unsafe; t is the expected return type true = safe *)
-	r_field : bool->t->texpr->texpr->texpr;
-
-	(*
-		return an expression that creates an unitialized instance of a class, used for the generic cast helper method.
-	*)
-	mutable r_create_empty : tclass->tparams->pos->texpr;
-}
-
-let get_type types path =
-	List.find (fun md -> match md with
-		| TClassDecl cl when cl.cl_path = path -> true
-		| TEnumDecl e when e.e_path = path -> true
-		| TTypeDecl t when t.t_path = path -> true
-		| TAbstractDecl a when a.a_path = path -> true
-		| _ -> false
-	) types
-
-let new_ctx con =
-	let types = Hashtbl.create (List.length con.types) in
-	List.iter (fun mt ->
-		match mt with
-			| TClassDecl cl -> Hashtbl.add types cl.cl_path mt
-			| TEnumDecl e -> Hashtbl.add types e.e_path mt
-			| TTypeDecl t -> Hashtbl.add types t.t_path mt
-			| TAbstractDecl a -> Hashtbl.add types a.a_path mt
-	) con.types;
-
-	let cl_dyn = match get_type con.types ([], "Dynamic") with
-		| TClassDecl c -> c
-		| TAbstractDecl a ->
-				mk_class a.a_module ([], "Dynamic") a.a_pos null_pos
-		| _ -> assert false
-	in
-
-	let rec gen = {
-		gcon = con;
-		gclasses = {
-			cl_reflect = get_cl (get_type con.types ([], "Reflect"));
-			cl_type = get_cl (get_type con.types ([], "Type"));
-			cl_dyn = cl_dyn;
-
-			nativearray = (fun _ -> assert false);
-			nativearray_type = (fun _ -> assert false);
-			nativearray_len = (fun _ -> assert false);
-		};
-		gtools = {
-			r_fields = (fun is_used_only_by_iteration expr ->
-				let fieldcall = mk_static_field_access_infer gen.gclasses.cl_reflect "fields" expr.epos [] in
-				{ eexpr = TCall(fieldcall, [expr]); etype = gen.gcon.basic.tarray gen.gcon.basic.tstring; epos = expr.epos }
-			);
-			(* Reflect.setField(obj, field, val). t by now is ignored. FIXME : fix this implementation *)
-			r_set_field = (fun t obj field v ->
-				let fieldcall = mk_static_field_access_infer gen.gclasses.cl_reflect "setField" v.epos [] in
-				{ eexpr = TCall(fieldcall, [obj; field; v]); etype = t_dynamic; epos = v.epos }
-			);
-			(* Reflect.field. bool indicates if is safe (no error throwing) or unsafe. true = safe *)
-			r_field = (fun is_safe t obj field ->
-				let fieldcall = mk_static_field_access_infer gen.gclasses.cl_reflect "field" obj.epos [] in
-				(* FIXME: should we see if needs to cast? *)
-				mk_cast t { eexpr = TCall(fieldcall, [obj; field]); etype = t_dynamic; epos = obj.epos }
-			);
-
-			r_create_empty = (fun _ _ pos -> gen.gcon.error "r_create_empty implementation is not provided" pos; assert false);
-		};
-		gmk_internal_name = (fun ns s -> sprintf "__%s_%s" ns s);
-		gexpr_filters = new rule_map_dispatcher "gexpr_filters";
-		gmodule_filters = new rule_map_dispatcher "gmodule_filters";
-		gsyntax_filters = new rule_map_dispatcher "gsyntax_filters";
-		gfollow = new rule_dispatcher "gfollow" false;
-		gtypes = types;
-		gtypes_list = con.types;
-		gmodules = con.modules;
-
-		greal_field_types = Hashtbl.create 0;
-		ghandle_cast = (fun to_t from_t e -> mk_cast to_t e);
-		gon_unsafe_cast = (fun t t2 pos -> (gen.gcon.warning ("Type " ^ (debug_type t2) ^ " is being cast to the unrelated type " ^ (s_type (print_context()) t)) pos));
-		gneeds_box = (fun t -> false);
-		gspecial_needs_cast = (fun to_t from_t -> true);
-		gsupported_conversions = Hashtbl.create 0;
-
-		gadd_type = (fun md should_filter ->
-			if should_filter then begin
-				gen.gtypes_list <- md :: gen.gtypes_list;
-				gen.gmodules <- { m_id = alloc_mid(); m_path = (t_path md); m_types = [md]; m_extra = module_extra "" "" 0. MFake [] } :: gen.gmodules;
-				Hashtbl.add gen.gtypes (t_path md) md;
-			end else gen.gafter_filters_ended <- (fun () ->
-				gen.gtypes_list <- md :: gen.gtypes_list;
-				gen.gmodules <- { m_id = alloc_mid(); m_path = (t_path md); m_types = [md]; m_extra = module_extra "" "" 0. MFake [] } :: gen.gmodules;
-				Hashtbl.add gen.gtypes (t_path md) md;
-			) :: gen.gafter_filters_ended;
-		);
-		gadd_to_module = (fun md pr -> failwith "module added outside expr filters");
-		gcurrent_path = ([],"");
-		gcurrent_class = None;
-		gcurrent_classfield = None;
-
-		gon_classfield_start = [];
-		gon_new_module_type = [];
-		gafter_mod_filters_ended = [];
-		gafter_expr_filters_ended = [];
-		gafter_filters_ended = [];
-
-		gbase_class_fields = PMap.empty;
-
-		greal_type = (fun t -> t);
-		greal_type_param = (fun _ t -> t);
-
-		gallow_tp_dynamic_conversion = false;
-
-		(* as a default, ignore the params *)
-		gparam_func_call = (fun ecall efield params elist -> { ecall with eexpr = TCall(efield, elist) });
-		ghas_tparam_cast_handler = false;
-		gtparam_cast = Hashtbl.create 0;
-
-		gspecial_vars = Hashtbl.create 0;
-	} in
-	gen
-
-let init_ctx gen =
-	(* ultimately add a follow once handler as the last follow handler *)
-	let follow_f = gen.gfollow#run in
-	let follow t =
-		match t with
-		| TMono r ->
-			(match !r with
-			| Some t -> follow_f t
-			| _ -> Some t)
-		| TLazy f ->
-			follow_f (!f())
-		| TType (t,tl) ->
-			follow_f (apply_params t.t_params tl t.t_type)
-		| _ -> Some t
-	in
-	gen.gfollow#add ~name:"final" ~priority:PLast follow
-
-(* run_follow (gen:generator_ctx) (t:t) *)
-let run_follow gen = gen.gfollow#run_f
-
-let reorder_modules gen =
-	let modules = Hashtbl.create 20 in
-	List.iter (fun md ->
-		Hashtbl.add modules ( (t_infos md).mt_module ).m_path md
-	) gen.gtypes_list;
-
-	gen.gmodules <- [];
-	let processed = Hashtbl.create 20 in
-	Hashtbl.iter (fun md_path md ->
-		if not (Hashtbl.mem processed md_path) then begin
-			Hashtbl.add processed md_path true;
-			gen.gmodules <- { m_id = alloc_mid(); m_path = md_path; m_types = List.rev ( Hashtbl.find_all modules md_path ); m_extra = (t_infos md).mt_module.m_extra } :: gen.gmodules
-		end
-	) modules
-
-let run_filters_from gen t filters =
-	match t with
-	| TClassDecl c ->
-		trace (snd c.cl_path);
-		gen.gcurrent_path <- c.cl_path;
-		gen.gcurrent_class <- Some(c);
-
-		List.iter (fun fn -> fn()) gen.gon_new_module_type;
-
-		gen.gcurrent_classfield <- None;
-		let rec process_field f =
-			reset_temps();
-			gen.gcurrent_classfield <- Some(f);
-			List.iter (fun fn -> fn()) gen.gon_classfield_start;
-
-			trace f.cf_name;
-			(match f.cf_expr with
-			| None -> ()
-			| Some e ->
-				f.cf_expr <- Some (List.fold_left (fun e f -> f e) e filters));
-			List.iter process_field f.cf_overloads;
-		in
-		List.iter process_field c.cl_ordered_fields;
-		List.iter process_field c.cl_ordered_statics;
-
-		(match c.cl_constructor with
-		| None -> ()
-		| Some f -> process_field f);
-		gen.gcurrent_classfield <- None;
-		(match c.cl_init with
-		| None -> ()
-		| Some e ->
-			c.cl_init <- Some (List.fold_left (fun e f -> f e) e filters));
-	| TEnumDecl _ | TTypeDecl _ | TAbstractDecl _ ->
-		()
-
-let run_filters gen =
-	let last_error = gen.gcon.error in
-	let has_errors = ref false in
-	gen.gcon.error <- (fun msg pos -> has_errors := true; last_error msg pos);
-	(* first of all, we have to make sure that the filters won't trigger a major Gc collection *)
-	let t = Common.timer ["gencommon_filters"] in
-	(if Common.defined gen.gcon Define.GencommonDebug then debug_mode := true else debug_mode := false);
-	let run_filters filter =
-		let rec loop acc mds =
-			match mds with
-				| [] -> acc
-				| md :: tl ->
-					let filters = [ filter#run_f ] in
-					let added_types = ref [] in
-					gen.gadd_to_module <- (fun md_type priority ->
-						gen.gtypes_list <- md_type :: gen.gtypes_list;
-						added_types := (md_type, priority) :: !added_types
-					);
-
-					run_filters_from gen md filters;
-
-					let added_types = List.map (fun (t,p) ->
-						run_filters_from gen t [ fun e -> get (filter#run_from p e) ];
-						if Hashtbl.mem gen.gtypes (t_path t) then begin
-							let rec loop i =
-								let p = t_path t in
-								let new_p = (fst p, snd p ^ "_" ^ (string_of_int i)) in
-								if Hashtbl.mem gen.gtypes new_p then
-									loop (i+1)
-								else
-									match t with
-										| TClassDecl cl -> cl.cl_path <- new_p
-										| TEnumDecl e -> e.e_path <- new_p
-										| TTypeDecl _ | TAbstractDecl _ -> ()
-							in
-							loop 0
-						end;
-						Hashtbl.add gen.gtypes (t_path t) t;
-						t
-					) !added_types in
-
-					loop (added_types @ (md :: acc)) tl
-		in
-		List.rev (loop [] gen.gtypes_list)
-	in
-
-	let run_mod_filter filter =
-		let last_add_to_module = gen.gadd_to_module in
-		let added_types = ref [] in
-		gen.gadd_to_module <- (fun md_type priority ->
-			Hashtbl.add gen.gtypes (t_path md_type) md_type;
-			added_types := (md_type, priority) :: !added_types
-		);
-
-		let rec loop processed not_processed =
-			match not_processed with
-				| hd :: tl ->
-					(match hd with
-						| TClassDecl c ->
-							gen.gcurrent_class <- Some c
-						| _ ->
-							gen.gcurrent_class <- None);
-					let new_hd = filter#run_f hd in
-
-					let added_types_new = !added_types in
-					added_types := [];
-					let added_types = List.map (fun (t,p) ->
-						get (filter#run_from p t)
-					) added_types_new in
-
-					loop ( added_types @ (new_hd :: processed) ) tl
-				| [] ->
-					processed
-		in
-
-		let filtered = loop [] gen.gtypes_list in
-		gen.gadd_to_module <- last_add_to_module;
-		gen.gtypes_list <- List.rev (filtered)
-	in
-
-	run_mod_filter gen.gmodule_filters;
-	List.iter (fun fn -> fn()) gen.gafter_mod_filters_ended;
-
-	let last_add_to_module = gen.gadd_to_module in
-	gen.gtypes_list <- run_filters gen.gexpr_filters;
-	gen.gadd_to_module <- last_add_to_module;
-
-	List.iter (fun fn -> fn()) gen.gafter_expr_filters_ended;
-	(* Codegen.post_process gen.gtypes_list [gen.gexpr_filters#run_f]; *)
-	gen.gtypes_list <- run_filters gen.gsyntax_filters;
-	List.iter (fun fn -> fn()) gen.gafter_filters_ended;
-
-	reorder_modules gen;
-	t();
-	if !has_errors then raise (Abort("Compilation aborted with errors",null_pos))
-
-(* ******************************************* *)
-(* basic generation module that source code compilation implementations can use *)
-(* ******************************************* *)
-
-let write_file gen w source_dir path extension out_files =
-	let t = timer ["write";"file"] in
-	let s_path = source_dir	^ "/" ^ (snd path) ^ "." ^ (extension) in
-	(* create the folders if they don't exist *)
-	mkdir_from_path s_path;
-
-	let contents = SourceWriter.contents w in
-	let should_write = if not (Common.defined gen.gcon Define.ReplaceFiles) && Sys.file_exists s_path then begin
-		let in_file = open_in s_path in
-		let old_contents = Std.input_all in_file in
-		close_in in_file;
-		contents <> old_contents
-	end else true in
-
-	if should_write then begin
-		let f = open_out_bin s_path in
-		output_string f contents;
-		close_out f
-	end;
-
-	out_files := (Path.unique_full_path s_path) :: !out_files;
-
-	t()
-
-
-let clean_files path excludes verbose =
-	let rec iter_files pack dir path = try
-		let file = Unix.readdir dir in
-
-		if file <> "." && file <> ".." then begin
-			let filepath = path ^ "/" ^ file in
-			if (Unix.stat filepath).st_kind = S_DIR then
-				let pack = pack @ [file] in
-				iter_files (pack) (Unix.opendir filepath) filepath;
-				try Unix.rmdir filepath with Unix.Unix_error (ENOTEMPTY,_,_) -> ();
-			else if not (String.ends_with filepath ".meta") && not (List.mem (Path.unique_full_path filepath) excludes) then begin
-				if verbose then print_endline ("Removing " ^ filepath);
-			 	Sys.remove filepath
-			end
-		end;
-
-		iter_files pack dir path
-	with | End_of_file | Unix.Unix_error _ ->
-		Unix.closedir dir
-	in
-	iter_files [] (Unix.opendir path) path
-
-
-let dump_descriptor gen name path_s module_s =
-	let w = SourceWriter.new_source_writer () in
-	(* dump called path *)
-	SourceWriter.write w (Sys.getcwd());
-	SourceWriter.newline w;
-	(* dump all defines. deprecated *)
-	SourceWriter.write w "begin defines";
-	SourceWriter.newline w;
-	PMap.iter (fun name _ ->
-		SourceWriter.write w name;
-		SourceWriter.newline w
-	) gen.gcon.defines;
-	SourceWriter.write w "end defines";
-	SourceWriter.newline w;
-	(* dump all defines with their values; keeping the old defines for compatibility *)
-	SourceWriter.write w "begin defines_data";
-	SourceWriter.newline w;
-	PMap.iter (fun name v ->
-		SourceWriter.write w name;
-		SourceWriter.write w "=";
-		SourceWriter.write w v;
-		SourceWriter.newline w
-	) gen.gcon.defines;
-	SourceWriter.write w "end defines_data";
-	SourceWriter.newline w;
-	(* dump all generated types *)
-	SourceWriter.write w "begin modules";
-	SourceWriter.newline w;
-	let main_paths = Hashtbl.create 0 in
-	List.iter (fun md_def ->
-		SourceWriter.write w "M ";
-		SourceWriter.write w (path_s (path_of_md_def md_def));
-		SourceWriter.newline w;
-		List.iter (fun m ->
-			match m with
-				| TClassDecl cl when not cl.cl_extern ->
-					SourceWriter.write w "C ";
-					let s = module_s m in
-					Hashtbl.add main_paths cl.cl_path s;
-					SourceWriter.write w (s);
-					SourceWriter.newline w
-				| TEnumDecl e when not e.e_extern ->
-					SourceWriter.write w "E ";
-					SourceWriter.write w (module_s m);
-					SourceWriter.newline w
-				| _ -> () (* still no typedef or abstract is generated *)
-		) md_def.m_types
-	) gen.gmodules;
-	SourceWriter.write w "end modules";
-	SourceWriter.newline w;
-	(* dump all resources *)
-	(match gen.gcon.main_class with
-		| Some path ->
-			SourceWriter.write w "begin main";
-			SourceWriter.newline w;
-			(try
-				SourceWriter.write w (Hashtbl.find main_paths path)
-			with
-				| Not_found -> SourceWriter.write w (path_s path));
-			SourceWriter.newline w;
-			SourceWriter.write w "end main";
-			SourceWriter.newline w
-	| _ -> ()
-	);
-	SourceWriter.write w "begin resources";
-	SourceWriter.newline w;
-	Hashtbl.iter (fun name _ ->
-		SourceWriter.write w name;
-		SourceWriter.newline w
-	) gen.gcon.resources;
-	SourceWriter.write w "end resources";
-	SourceWriter.newline w;
-	SourceWriter.write w "begin libs";
-	SourceWriter.newline w;
-	let path file ext =
-		if Sys.file_exists file then
-			file
-		else try Common.find_file gen.gcon file with
-			| Not_found -> try Common.find_file gen.gcon (file ^ ext) with
-			| Not_found ->
-				file
-	in
-	if Common.platform gen.gcon Java then
-		List.iter (fun (s,std,_,_,_) ->
-			if not std then begin
-				SourceWriter.write w (path s ".jar");
-				SourceWriter.newline w;
-			end
-		) gen.gcon.java_libs
-	else if Common.platform gen.gcon Cs then
-		List.iter (fun (s,std,_,_) ->
-			if not std then begin
-				SourceWriter.write w (path s ".dll");
-				SourceWriter.newline w;
-			end
-		) gen.gcon.net_libs;
-	SourceWriter.write w "end libs";
-	SourceWriter.newline w;
-	let args = gen.gcon.c_args in
-	if args <> [] then begin
-		SourceWriter.write w "begin opts";
-		SourceWriter.newline w;
-		List.iter (fun opt -> SourceWriter.write w opt; SourceWriter.newline w) (List.rev args);
-		SourceWriter.write w "end opts";
-		SourceWriter.newline w;
-	end;
-
-	let contents = SourceWriter.contents w in
-	let f = open_out (gen.gcon.file ^ "/" ^ name) in
-	output_string f contents;
-	close_out f
-
-(*
-	various helper functions
-*)
-
-let mk_paren e =
-	match e.eexpr with | TParenthesis _ -> e | _ -> { e with eexpr=TParenthesis(e) }
-
-(* private *)
-
-let get_real_fun gen t =
-	match follow t with
-	| TFun(args,t) -> TFun(List.map (fun (n,o,t) -> n,o,gen.greal_type t) args, gen.greal_type t)
-	| _ -> t
-
-let mk_return e = { eexpr = TReturn (Some e); etype = e.etype; epos = e.epos }
-
-let mk_temp gen name t =
-	incr tmp_count;
-	let name = gen.gmk_internal_name "temp" (name ^ (string_of_int !tmp_count)) in
-	alloc_var name t
-
-let v_nativearray = alloc_var "__array__" t_dynamic
-let mk_nativearray_decl gen t el pos =
-	{
-		eexpr = TCall(mk_local v_nativearray pos, el);
-		etype = gen.gclasses.nativearray t;
-		epos = pos;
-	}
-
-let ensure_local gen block name e =
-	match e.eexpr with
-		| TLocal _ -> e
-		| _ ->
-			let var = mk_temp gen name e.etype in
-			block := { e with eexpr = TVar(var, Some e); etype = gen.gcon.basic.tvoid; } :: !block;
-			{ e with eexpr = TLocal var }
-
-let follow_module follow_func md = match md with
-	| TClassDecl _
-	| TEnumDecl _
-	| TAbstractDecl _ -> md
-	| TTypeDecl tdecl -> match (follow_func (TType(tdecl, List.map snd tdecl.t_params))) with
-		| TInst(cl,_) -> TClassDecl cl
-		| TEnum(e,_) -> TEnumDecl e
-		| TType(t,_) -> TTypeDecl t
-		| TAbstract(a,_) -> TAbstractDecl a
-		| _ -> assert false
-
-(*
-	hxgen means if the type was generated by haxe. If a type was generated by haxe, it means
-	it will contain special constructs for speedy reflection, for example
-
-	@see SetHXGen module
- *)
-let rec is_hxgen md =
-	match md with
-		| TClassDecl cl -> Meta.has Meta.HxGen cl.cl_meta
-		| TEnumDecl e -> Meta.has Meta.HxGen e.e_meta
-		| TTypeDecl t -> Meta.has Meta.HxGen t.t_meta || ( match follow t.t_type with | TInst(cl,_) -> is_hxgen (TClassDecl cl) | TEnum(e,_) -> is_hxgen (TEnumDecl e) | _ -> false )
-		| TAbstractDecl a -> Meta.has Meta.HxGen a.a_meta
-
-let is_hxgen_t t =
-	match t with
-		| TInst (cl, _) -> Meta.has Meta.HxGen cl.cl_meta
-		| TEnum (e, _) -> Meta.has Meta.HxGen e.e_meta
-		| TAbstract (a, _) -> Meta.has Meta.HxGen a.a_meta
-		| TType (t, _) -> Meta.has Meta.HxGen t.t_meta
-		| _ -> false
-
-let mt_to_t_dyn md =
-	match md with
-		| TClassDecl cl -> TInst(cl, List.map (fun _ -> t_dynamic) cl.cl_params)
-		| TEnumDecl e -> TEnum(e, List.map (fun _ -> t_dynamic) e.e_params)
-		| TAbstractDecl a -> TAbstract(a, List.map (fun _ -> t_dynamic) a.a_params)
-		| TTypeDecl t -> TType(t, List.map (fun _ -> t_dynamic) t.t_params)
-
-let mt_to_t mt params =
-	match mt with
-		| TClassDecl (cl) -> TInst(cl, params)
-		| TEnumDecl (e) -> TEnum(e, params)
-		| TAbstractDecl a -> TAbstract(a, params)
-		| _ -> assert false
-
-let t_to_mt t =
-	match follow t with
-		| TInst(cl, _) -> TClassDecl(cl)
-		| TEnum(e, _) -> TEnumDecl(e)
-		| TAbstract(a, _) -> TAbstractDecl a
-		| _ -> assert false
-
-let rec get_last_ctor cl =
-	Option.map_default (fun (super,_) -> if is_some super.cl_constructor then Some(get super.cl_constructor) else get_last_ctor super) None cl.cl_super
-
-let add_constructor cl cf =
-	match cl.cl_constructor with
-	| None -> cl.cl_constructor <- Some cf
-	| Some ctor ->
-			if ctor != cf && not (List.memq cf ctor.cf_overloads) then
-				ctor.cf_overloads <- cf :: ctor.cf_overloads
-
-(* replace open TMonos with TDynamic *)
-let rec replace_mono t =
-	match t with
-	| TMono t ->
-		(match !t with
-		| None -> t := Some t_dynamic
-		| Some _ -> ())
-	| TEnum (_,p) | TInst (_,p) | TType (_,p) | TAbstract (_,p) ->
-		List.iter replace_mono p
-	| TFun (args,ret) ->
-		List.iter (fun (_,_,t) -> replace_mono t) args;
-		replace_mono ret
-	| TAnon _
-	| TDynamic _ -> ()
-	| TLazy f ->
-		replace_mono (!f())
-
-(* helper *)
-let mk_class_field name t public pos kind params =
-	{
-		cf_name = name;
-		cf_type = t;
-		cf_public = public;
-		cf_pos = pos;
-		cf_name_pos = null_pos;
-		cf_doc = None;
-		cf_meta = [ Meta.CompilerGenerated, [], null_pos ]; (* annotate that this class field was generated by the compiler *)
-		cf_kind = kind;
-		cf_params = params;
-		cf_expr = None;
-		cf_expr_unoptimized = None;
-		cf_overloads = [];
-	}
-
-(* this helper just duplicates the type parameter class, which is assumed that cl is. *)
-(* This is so we can use class parameters on function parameters, without running the risk of name clash *)
-(* between both *)
-let map_param cl =
-	let ret = mk_class cl.cl_module (fst cl.cl_path, snd cl.cl_path ^ "_c") cl.cl_pos null_pos in
-	ret.cl_implements <- cl.cl_implements;
-	ret.cl_kind <- cl.cl_kind;
-	ret
-
-let get_cl_t t =
-	match follow t with | TInst (cl,_) -> cl | _ -> assert false
-
-let mk_class m path pos =
-	let cl = Type.mk_class m path pos null_pos in
-	cl.cl_meta <- [ Meta.CompilerGenerated, [], null_pos ];
-	cl
-
-type tfield_access =
-	| FClassField of tclass * tparams * tclass (* declared class *) * tclass_field * bool (* is static? *) * t (* the actual cf type, in relation to the class type params *) * t (* declared type *)
-	| FEnumField of tenum * tenum_field * bool (* is parameterized enum ? *)
-	| FAnonField of tclass_field
-	| FDynamicField of t
-	| FNotFound
-
-let is_var f = match f.cf_kind with | Var _ -> true | _ -> false
-
-let find_first_declared_field gen orig_cl ?get_vmtype ?exact_field field =
-	let get_vmtype = match get_vmtype with None -> (fun t -> t) | Some f -> f in
-	let chosen = ref None in
-	let is_overload = ref false in
-	let rec loop_cl depth c tl tlch =
-		(try
-			let ret = PMap.find field c.cl_fields in
-			if Meta.has Meta.Overload ret.cf_meta then is_overload := true;
-			match !chosen, exact_field with
-			| Some(d,f,_,_,_), _ when depth <= d || (is_var ret && not (is_var f)) -> ()
-			| _, None ->
-				chosen := Some(depth,ret,c,tl,tlch)
-			| _, Some f2 ->
-				List.iter (fun f ->
-					let declared_t = apply_params c.cl_params tl f.cf_type in
-					if same_overload_args ~get_vmtype declared_t f2.cf_type f f2 then
-						chosen := Some(depth,f,c,tl,tlch)
-				) (ret :: ret.cf_overloads)
-		with | Not_found -> ());
-		(match c.cl_super with
-		| Some (sup,stl) ->
-			let tl = List.map (apply_params c.cl_params tl) stl in
-			let stl = gen.greal_type_param (TClassDecl sup) stl in
-			let tlch = List.map (apply_params c.cl_params tlch) stl in
-			loop_cl (depth+1) sup tl tlch
-		| None -> ());
-		if c.cl_interface then
-			List.iter (fun (sup,stl) ->
-				let tl = List.map (apply_params c.cl_params tl) stl in
-				let stl = gen.greal_type_param (TClassDecl sup) stl in
-				let tlch = List.map (apply_params c.cl_params tlch) stl in
-				loop_cl (depth+1) sup tl tlch
-			) c.cl_implements
-	in
-	loop_cl 0 orig_cl (List.map snd orig_cl.cl_params) (List.map snd orig_cl.cl_params);
-	match !chosen with
-	| None ->
-		None
-	| Some(_,f,c,tl,tlch) ->
-		if !is_overload && not (Meta.has Meta.Overload f.cf_meta) then
-			f.cf_meta <- (Meta.Overload,[],f.cf_pos) :: f.cf_meta;
-		let declared_t = apply_params c.cl_params tl f.cf_type in
-		let params_t = apply_params c.cl_params tlch f.cf_type in
-		let actual_t = match follow params_t with
-		| TFun(args,ret) -> TFun(List.map (fun (n,o,t) -> (n,o,gen.greal_type t)) args, gen.greal_type ret)
-		| _ -> gen.greal_type params_t in
-		Some(f,actual_t,declared_t,params_t,c,tl,tlch)
-
-let field_access gen (t:t) (field:string) : (tfield_access) =
-	(*
-		t can be either an haxe-type as a real-type;
-		'follow' should be applied here since we can generalize that a TType will be accessible as its
-		underlying type.
-	*)
-
-	(* let pointers to values be accessed as the underlying values *)
-	let t = match gen.greal_type t with
-		| TAbstract({ a_path = ["cs"],"Pointer" },[t]) ->
-			gen.greal_type t
-		| _ -> t
-	in
-
-	match follow t with
-		| TInst(cl, params) ->
-			let orig_cl = cl in
-			let orig_params = params in
-			let rec not_found cl params =
-				match cl.cl_dynamic with
-					| Some t ->
-						let t = apply_params cl.cl_params params t in
-						FDynamicField t
-					| None ->
-						match cl.cl_super with
-							| None -> FNotFound
-							| Some (super,p) ->  not_found super p
-			in
-
-			let not_found () =
-				try
-					let cf = PMap.find field gen.gbase_class_fields in
-					FClassField (orig_cl, orig_params, gen.gclasses.cl_dyn, cf, false, cf.cf_type, cf.cf_type)
-				with
-					| Not_found -> not_found cl params
-			in
-
-			(* this is a hack for C#'s different generic types with same path *)
-			let hashtbl_field = (String.concat "" (List.map (fun _ -> "]") cl.cl_params)) ^ field in
-			let types = try
-				Hashtbl.find gen.greal_field_types (orig_cl.cl_path, hashtbl_field)
-			with | Not_found ->
-				let ret = find_first_declared_field gen cl field in
-				let ret = match ret with
-					| None -> None
-					| Some(cf,t,dt,_,cl,_,_) -> Some(cf,t,dt,cl)
-				in
-				if ret <> None then Hashtbl.add gen.greal_field_types (orig_cl.cl_path, hashtbl_field) ret;
-				ret
-			in
-			(match types with
-					| None -> not_found()
-					| Some (cf, actual_t, declared_t, declared_cl) ->
-						FClassField(orig_cl, orig_params, declared_cl, cf, false, actual_t, declared_t))
-		| TEnum _ | TAbstract _ ->
-			(* enums have no field *) FNotFound
-		| TAnon anon ->
-			(try match !(anon.a_status) with
-				| Statics cl ->
-					let cf = PMap.find field cl.cl_statics in
-					FClassField(cl, List.map (fun _ -> t_dynamic) cl.cl_params, cl, cf, true, cf.cf_type, cf.cf_type)
-				| EnumStatics e ->
-					let f = PMap.find field e.e_constrs in
-					let is_param = match follow f.ef_type with | TFun _ -> true | _ -> false in
-					FEnumField(e, f, is_param)
-				| _ when PMap.mem field gen.gbase_class_fields ->
-					let cf = PMap.find field gen.gbase_class_fields in
-					FClassField(gen.gclasses.cl_dyn, [t_dynamic], gen.gclasses.cl_dyn, cf, false, cf.cf_type, cf.cf_type)
-				| _ ->
-					FAnonField(PMap.find field anon.a_fields)
-			with | Not_found -> FNotFound)
-		| _ when PMap.mem field gen.gbase_class_fields ->
-			let cf = PMap.find field gen.gbase_class_fields in
-			FClassField(gen.gclasses.cl_dyn, [t_dynamic], gen.gclasses.cl_dyn, cf, false, cf.cf_type, cf.cf_type)
-		| TDynamic t -> FDynamicField t
-		| TMono _ -> FDynamicField t_dynamic
-		| _ -> FNotFound
-
-let field_access_esp gen t field = match field with
-	| FStatic(cl,cf) | FInstance(cl,_,cf) when Meta.has Meta.Extern cf.cf_meta ->
-		let static = match field with
-			| FStatic _ -> true
-			| _ -> false
-		in
-		let p = match follow (run_follow gen t) with
-			| TInst(_,p) -> p
-			| _ -> List.map snd cl.cl_params
-		in
-		FClassField(cl,p,cl,cf,static,cf.cf_type,cf.cf_type)
-	| _ -> field_access gen t (field_name field)
-
-let mk_field_access gen expr field pos =
-	match field_access gen expr.etype field with
-		| FClassField(c,p,dc,cf,false,at,_) ->
-				{ eexpr = TField(expr, FInstance(dc,p,cf)); etype = apply_params c.cl_params p at; epos = pos }
-		| FClassField(c,p,dc,cf,true,at,_) ->
-				{ eexpr = TField(expr, FStatic(dc,cf)); etype = at; epos = pos }
-		| FAnonField cf ->
-				{ eexpr = TField(expr, FAnon cf); etype = cf.cf_type; epos = pos }
-		| FDynamicField t ->
-				{ eexpr = TField(expr, FDynamic field); etype = t; epos = pos }
-		| FNotFound ->
-				{ eexpr = TField(expr, FDynamic field); etype = t_dynamic; epos = pos }
-		| FEnumField _ -> assert false
-
-(* ******************************************* *)
-(* Module dependency resolution *)
-(* ******************************************* *)
-
-type t_dependency =
-	| DAfter of float
-	| DBefore of float
-
-exception ImpossibleDependency of string
-
-let max_dep = 10000.0
-let min_dep = - (10000.0)
-
-let solve_deps name (deps:t_dependency list) =
-	let vmin = min_dep -. 1.0 in
-	let vmax = max_dep +. 1.0 in
-	let rec loop dep vmin vmax =
-		match dep with
-			| [] ->
-				(if vmin >= vmax then raise (ImpossibleDependency name));
-				(vmin +. vmax) /. 2.0
-			| head :: tail ->
-				match head with
-					| DBefore f ->
-						loop tail (max vmin f) vmax
-					| DAfter f ->
-						loop tail vmin (min vmax f)
-	in
-	loop deps vmin vmax
-
-(* type resolution *)
-
-exception TypeNotFound of path
-
-let get_type gen path =
-	try Hashtbl.find gen.gtypes path with | Not_found -> raise (TypeNotFound path)
-
-
-(* ******************************************* *)
-(* set hxgen module *)
-(* ******************************************* *)
-(*
-	Goes through all module types and adds the @:hxGen or @:nativeGen meta to them.
-	Basically, everything that is extern is assumed to not be hxgen, unless meta :hxGen is set,
-	and everything that is not extern is assumed to be hxgen, unless meta :nativeGgen is set.
-*)
-module SetHXGen =
-struct
-	(*
-		The only option is to run this filter eagerly, because it must be one of the first filters to run,
-		since many others depend of it.
-	*)
-	let run_filter gen =
-		let rec is_hxgen md =
-			match md with
-			| TClassDecl { cl_kind = KAbstractImpl a } ->
-				is_hxgen (TAbstractDecl a)
-			| TClassDecl cl ->
-				let rec is_hxgen_class (c,_) =
-					if c.cl_extern then begin
-						if Meta.has Meta.HxGen c.cl_meta then
-							true
-						else
-							Option.map_default (is_hxgen_class) false c.cl_super || List.exists is_hxgen_class c.cl_implements
-					end else begin
-						if Meta.has Meta.NativeChildren c.cl_meta || Meta.has Meta.NativeGen c.cl_meta then
-							Option.map_default is_hxgen_class false c.cl_super || List.exists is_hxgen_class c.cl_implements
-						else
-							let rec has_nativec (c,p) =
-								if is_hxgen_class (c,p) then
-									false
-								else
-									(Meta.has Meta.NativeChildren c.cl_meta && not (Option.map_default is_hxgen_class false c.cl_super || List.exists is_hxgen_class c.cl_implements))
-									|| Option.map_default has_nativec false c.cl_super
-							in
-							if Option.map_default has_nativec false c.cl_super && not (List.exists is_hxgen_class c.cl_implements) then
-								false
-							else
-								true
-					end
-				in
-				is_hxgen_class (cl,[])
-			| TEnumDecl e ->
-				if e.e_extern then
-					Meta.has Meta.HxGen e.e_meta
-				else if Meta.has Meta.NativeGen e.e_meta then
-					if Meta.has Meta.FlatEnum e.e_meta then
-						false
-					else begin
-						gen.gcon.error "Only flat enums may be @:nativeGen" e.e_pos;
-						true
-					end
-				else
-					true
-			| TAbstractDecl a when Meta.has Meta.CoreType a.a_meta ->
-				not (Meta.has Meta.NativeGen a.a_meta)
-			| TAbstractDecl a ->
-				(match follow a.a_this with
-				| TInst _ | TEnum _ | TAbstract _ ->
-					is_hxgen (t_to_md (follow a.a_this))
-				| _ ->
-					not (Meta.has Meta.NativeGen a.a_meta))
-			| TTypeDecl t -> (* TODO see when would we use this *)
-				false
-		in
-
-		let filter md =
-			let meta = if is_hxgen md then Meta.HxGen else Meta.NativeGen in
-			match md with
-			| TClassDecl cl -> cl.cl_meta <- (meta, [], cl.cl_pos) :: cl.cl_meta
-			| TEnumDecl e -> e.e_meta <- (meta, [], e.e_pos) :: e.e_meta
-			| TTypeDecl t -> t.t_meta <- (meta, [], t.t_pos) :: t.t_meta
-			| TAbstractDecl a -> a.a_meta <- (meta, [], a.a_pos) :: a.a_meta
-		in
-
-		List.iter filter gen.gtypes_list
-end;;
-
-
-(* ******************************************* *)
-(* overloading reflection constructors *)
-(* ******************************************* *)
-(*
-	this module works on languages that support function overloading and
-	enable function hiding via static functions.
-	it takes the constructor body out of the constructor and adds it to a special ctor
-	static function. The static function will receive the same parameters as the constructor,
-	plus the special "me" var, which will replace "this"
-
-	Then it always adds two constructors to the class: one that receives a special marker class,
-	indicating that the object should be constructed without executing constructor body,
-	and one that executes its normal constructor.
-	Both will only include a super() call to the superclasses' emtpy constructor.
-
-	This enables two things:
-		empty construction without the need of incompatibility with the platform's native construction method
-		the ability to call super() constructor in any place in the constructor
-
-	This will insert itself in the default reflection-related module filter
-*)
-module OverloadingConstructor =
-struct
-	let priority = 0.0
-	let name = "overloading_constructor"
-
-	let rec cur_ctor c tl =
-		match c.cl_constructor with
-		| Some ctor ->
-			ctor, c, tl
-		| None ->
-			match c.cl_super with
-			| None ->
-				raise Not_found
-			| Some (sup,stl) ->
-				cur_ctor sup (List.map (apply_params c.cl_params tl) stl)
-
-	let rec prev_ctor c tl =
-		match c.cl_super with
-		| None ->
-			raise Not_found
-		| Some (sup,stl) ->
-			let stl = List.map (apply_params c.cl_params tl) stl in
-			match sup.cl_constructor with
-			| None -> prev_ctor sup stl
-			| Some ctor -> ctor, sup, stl
-
-	let make_static_ctor_name gen cl =
-		let name = gen.gmk_internal_name "hx" "ctor" in
-		name ^ "_" ^ (String.concat "_" (fst cl.cl_path)) ^ "_" ^ (snd cl.cl_path)
-
-	(* replaces super() call with last static constructor call *)
-	let replace_super_call gen c tl with_params me p =
-		let rec loop_super c tl =
-			match c.cl_super with
-			| None ->
-				raise Not_found
-			| Some(sup,stl) ->
-				let stl = List.map (apply_params c.cl_params tl) stl in
-				try
-					let static_ctor_name = make_static_ctor_name gen sup in
-					sup, stl, PMap.find static_ctor_name sup.cl_statics
-				with Not_found ->
-					loop_super sup stl
-		in
-		let sup, stl, cf = loop_super c tl in
-		let with_params = (mk (TLocal me) me.v_type p) :: with_params in
-		let cf =
-			try
-				(* choose best super function *)
-				List.iter (fun e -> replace_mono e.etype) with_params;
-				List.find (fun cf ->
-					replace_mono cf.cf_type;
-					let args, _ = get_fun (apply_params cf.cf_params stl cf.cf_type) in
-					try
-						List.for_all2 (fun (_,_,t) e -> try
-							let e_etype = run_follow gen e.etype in
-							let t = run_follow gen t in
-							unify e_etype t; true
-						with Unify_error _ ->
-							false
-						) args with_params
-					with Invalid_argument("List.for_all2") ->
-						false
-				) (cf :: cf.cf_overloads)
-			with Not_found ->
-				gen.gcon.error "No suitable overload for the super call arguments was found" p; cf
-		in
-		{
-			eexpr = TCall(
-				{
-					eexpr = TField(ExprBuilder.make_static_this sup p, FStatic(sup,cf));
-					etype = apply_params cf.cf_params stl cf.cf_type;
-					epos = p
-				},
-				with_params
-			);
-			etype = gen.gcon.basic.tvoid;
-			epos = p;
-		}
-
-	(* will create a static counterpart of 'ctor', and replace its contents to a call to the static version*)
-	let create_static_ctor gen ~empty_ctor_expr cl ctor =
-		match Meta.has Meta.SkipCtor ctor.cf_meta with
-		| true -> ()
-		| false when is_none ctor.cf_expr -> ()
-		| false ->
-			let static_ctor_name = make_static_ctor_name gen cl in
-			(* create the static constructor *)
-			let basic = gen.gcon.basic in
-			let ctor_types = List.map (fun (s,t) -> (s, TInst(map_param (get_cl_t t), []))) cl.cl_params in
-			let me = alloc_var "__hx_this" (TInst(cl, List.map snd ctor_types)) in
-			me.v_capture <- true;
-
-			let fn_args, _ = get_fun ctor.cf_type in
-			let ctor_params = List.map snd ctor_types in
-			let fn_type = TFun((me.v_name,false, me.v_type) :: List.map (fun (n,o,t) -> (n,o,apply_params cl.cl_params ctor_params t)) fn_args, basic.tvoid) in
-			let cur_tf_args = match ctor.cf_expr with
-			| Some { eexpr = TFunction(tf) } -> tf.tf_args
-			| _ -> assert false
-			in
-
-			let changed_tf_args = List.map (fun (v,_) -> (v,None)) cur_tf_args in
-
-			let local_map = Hashtbl.create (List.length cur_tf_args) in
-			let static_tf_args = (me, None) :: List.map (fun (v,b) ->
-				let new_v = alloc_var v.v_name (apply_params cl.cl_params ctor_params v.v_type) in
-				new_v.v_capture <- v.v_capture;
-				Hashtbl.add local_map v.v_id new_v;
-				(new_v, b)
-			) cur_tf_args in
-
-			let static_ctor = mk_class_field static_ctor_name fn_type false ctor.cf_pos (Method MethNormal) ctor_types in
-
-			(* change ctor contents to reference the 'me' var instead of 'this' *)
-			let actual_super_call = ref None in
-			let rec map_expr ~is_first e = match e.eexpr with
-				| TCall (({ eexpr = TConst TSuper } as tsuper), params) -> (try
-					let params = List.map (fun e -> map_expr ~is_first:false e) params in
-					actual_super_call := Some { e with eexpr = TCall(tsuper, [empty_ctor_expr]) };
-					replace_super_call gen cl ctor_params params me e.epos
-				with | Not_found ->
-					(* last static function was not found *)
-					actual_super_call := Some e;
-					if not is_first then
-						gen.gcon.error "Super call must be the first call when extending native types" e.epos;
-					{ e with eexpr = TBlock([]) })
-				| TFunction tf when is_first ->
-					do_map ~is_first:true e
-				| TConst TThis ->
-					mk_local me e.epos
-				| TBlock (fst :: bl) ->
-					let fst = map_expr ~is_first:is_first fst in
-					{ e with eexpr = TBlock(fst :: List.map (fun e -> map_expr ~is_first:false e) bl); etype = apply_params cl.cl_params ctor_params e.etype }
-				| _ ->
-					do_map e
-			and do_map ?(is_first=false) e =
-				let do_t = apply_params cl.cl_params ctor_params in
-				let do_v v = try
-						Hashtbl.find local_map v.v_id
-					with | Not_found ->
-						v.v_type <- do_t v.v_type; v
-				in
-				Type.map_expr_type (map_expr ~is_first:is_first) do_t do_v e
-			in
-
-			let expr = do_map ~is_first:true (get ctor.cf_expr) in
-			let expr = match expr.eexpr with
-			| TFunction(tf) ->
-				{ expr with etype = fn_type; eexpr = TFunction({ tf with tf_args = static_tf_args }) }
-			| _ -> assert false in
-			static_ctor.cf_expr <- Some expr;
-			(* add to the statics *)
-			(try
-				let stat = PMap.find static_ctor_name cl.cl_statics in
-				stat.cf_overloads <- static_ctor :: stat.cf_overloads
-			with | Not_found ->
-				cl.cl_ordered_statics <- static_ctor :: cl.cl_ordered_statics;
-				cl.cl_statics <- PMap.add static_ctor_name static_ctor cl.cl_statics);
-			(* change current super call *)
-			match ctor.cf_expr with
-			| Some({ eexpr = TFunction(tf) } as e) ->
-				let block_contents, p = match !actual_super_call with
-				| None -> [], ctor.cf_pos
-				| Some super -> [super], super.epos
-				in
-				let block_contents = block_contents @ [{
-					eexpr = TCall(
-						{
-							eexpr = TField(
-								ExprBuilder.make_static_this cl p,
-								FStatic(cl, static_ctor));
-							etype = apply_params static_ctor.cf_params (List.map snd cl.cl_params) static_ctor.cf_type;
-							epos = p
-						},
-						[{ eexpr = TConst TThis; etype = TInst(cl, List.map snd cl.cl_params); epos = p }]
-						@ List.map (fun (v,_) -> mk_local v p) cur_tf_args
-					);
-					etype = basic.tvoid;
-					epos = p
-				}] in
-				ctor.cf_expr <- Some { e with eexpr = TFunction({ tf with tf_expr = { tf.tf_expr with eexpr = TBlock block_contents }; tf_args = changed_tf_args }) }
-			| _ -> assert false
-
-	(* makes constructors that only call super() for the 'ctor' argument *)
-	let clone_ctors gen ctor sup stl cl =
-		let basic = gen.gcon.basic in
-		let rec clone cf =
-			let ncf = mk_class_field "new" (apply_params sup.cl_params stl cf.cf_type) cf.cf_public cf.cf_pos cf.cf_kind cf.cf_params in
-			let args, ret = get_fun ncf.cf_type in
-			(* single expression: call to super() *)
-			let tf_args = List.map (fun (name,_,t) ->
-				(* the constructor will have no optional arguments, as presumably this will be handled by the underlying expr *)
-				alloc_var name t, None
-			) args in
-			let super_call =
-			{
-				eexpr = TCall(
-					{ eexpr = TConst TSuper; etype = TInst(cl, List.map snd cl.cl_params); epos = ctor.cf_pos },
-					List.map (fun (v,_) -> mk_local v ctor.cf_pos) tf_args);
-				etype = basic.tvoid;
-				epos = ctor.cf_pos;
-			} in
-			ncf.cf_expr <- Some
-			{
-				eexpr = TFunction {
-					tf_args = tf_args;
-					tf_type = basic.tvoid;
-					tf_expr = mk_block super_call;
-				};
-				etype = ncf.cf_type;
-				epos = ctor.cf_pos;
-			};
-			ncf
-		in
-		(* take off createEmpty *)
-		let all = List.filter (fun cf -> replace_mono cf.cf_type; not (Meta.has Meta.SkipCtor cf.cf_meta)) (ctor :: ctor.cf_overloads) in
-		let clones = List.map clone all in
-		match clones with
-		| [] ->
-			(* raise Not_found *)
-			assert false (* should never happen *)
-		| cf :: [] -> cf
-		| cf :: overl ->
-			cf.cf_meta <- (Meta.Overload,[],cf.cf_pos) :: cf.cf_meta;
-			cf.cf_overloads <- overl; cf
-
-	let rec descends_from_native_or_skipctor cl =
-		not (is_hxgen (TClassDecl cl)) || Meta.has Meta.SkipCtor cl.cl_meta || match cl.cl_super with
-		| None -> false
-		| Some(c,_) -> descends_from_native_or_skipctor c
-
-	let ensure_super_is_first gen cf =
-		let rec loop e =
-			match e.eexpr with
-			| TBlock (b :: block) ->
-				loop b
-			| TBlock []
-			| TCall({ eexpr = TConst TSuper },_) -> ()
-			| _ ->
-				gen.gcon.error "Types that derive from a native class must have its super() call as the first statement in the constructor" cf.cf_pos
-		in
-		match cf.cf_expr with
-		| None -> ()
-		| Some e -> Type.iter loop e
-
-	let configure ~(empty_ctor_type : t) ~(empty_ctor_expr : texpr) gen =
-		gen.gtools.r_create_empty <- (fun cl params pos -> mk (TNew(cl,params,[empty_ctor_expr])) (TInst(cl,params)) pos);
-
-		let basic = gen.gcon.basic in
-		let should_change cl = not cl.cl_interface && (not cl.cl_extern || is_hxgen (TClassDecl cl)) && (match cl.cl_kind with KAbstractImpl _ -> false | _ -> true) in
-		let msize = List.length gen.gtypes_list in
-		let processed, empty_ctors = Hashtbl.create msize, Hashtbl.create msize in
-
-
-		let rec get_last_empty cl =
-			try
-				Hashtbl.find empty_ctors cl.cl_path
-			with | Not_found ->
-				match cl.cl_super with
-				| None -> raise Not_found
-				| Some (sup,_) -> get_last_empty sup
-		in
-
-		let rec change cl =
-			if not (Hashtbl.mem processed cl.cl_path) then begin
-				Hashtbl.add processed cl.cl_path true;
-
-				(* make sure we've processed the super types *)
-				Option.may (fun (super,_) -> if should_change super then change super) cl.cl_super;
-
-				(* implement static hx_ctor and reimplement constructors *)
-				(try
-					let ctor =
-						match cl.cl_constructor with
-						| Some ctor ->
-							ctor
-						| None ->
-							try
-								let sctor, sup, stl = prev_ctor cl (List.map snd cl.cl_params) in
-								(* we'll make constructors that will only call super() *)
-								let ctor = clone_ctors gen sctor sup stl cl in
-								cl.cl_constructor <- Some ctor;
-								ctor
-							with Not_found -> (* create default constructor *)
-								let ctor = mk_class_field "new" (TFun ([], basic.tvoid)) false cl.cl_pos (Method MethNormal) [] in
-								ctor.cf_expr <- Some {
-									eexpr = TFunction {
-										tf_args = [];
-										tf_type = basic.tvoid;
-										tf_expr = mk (TBlock []) basic.tvoid cl.cl_pos;
-									};
-									etype = ctor.cf_type;
-									epos = ctor.cf_pos;
-								};
-								cl.cl_constructor <- Some ctor;
-								ctor
-					in
-					(* now that we made sure we have a constructor, exit if native gen *)
-					if not (is_hxgen (TClassDecl cl)) || Meta.has Meta.SkipCtor cl.cl_meta then begin
-						if descends_from_native_or_skipctor cl && is_some cl.cl_super then
-							List.iter (fun cf -> ensure_super_is_first gen cf) (ctor :: ctor.cf_overloads);
-						raise Exit
-					end;
-
-					(* if cl descends from a native class, we cannot use the static constructor strategy *)
-					if descends_from_native_or_skipctor cl && is_some cl.cl_super then
-						List.iter (fun cf -> ensure_super_is_first gen cf) (ctor :: ctor.cf_overloads)
-					else
-						(* now that we have a current ctor, create the static counterparts *)
-						List.iter (fun cf -> create_static_ctor gen ~empty_ctor_expr:empty_ctor_expr cl cf) (ctor :: ctor.cf_overloads)
-				with Exit -> ());
-
-				(* implement empty ctor *)
-				(try
-					(* now that we made sure we have a constructor, exit if native gen *)
-					if not (is_hxgen (TClassDecl cl)) then raise Exit;
-
-					(* get first *)
-					let empty_type = TFun (["empty",false,empty_ctor_type],basic.tvoid) in
-					let super =
-						match cl.cl_super with
-						| None -> (* implement empty *)
-								[]
-						| Some (sup,_) ->
-							try
-								ignore (get_last_empty sup);
-								let esuper = mk (TConst TSuper) (TInst (cl, List.map snd cl.cl_params)) cl.cl_pos in
-								[mk (TCall (esuper, [empty_ctor_expr])) basic.tvoid cl.cl_pos]
-							with Not_found ->
-								try
-									(* super type is native: find super constructor with least arguments *)
-									let sctor, sup, stl = prev_ctor cl (List.map snd cl.cl_params) in
-									let rec loop remaining (best,n) =
-										match remaining with
-										| [] -> best
-										| cf :: r ->
-											let args,_ = get_fun cf.cf_type in
-											if (List.length args) < n then
-												loop r (cf,List.length args)
-											else
-												loop r (best,n)
-									in
-									let args,_ = get_fun sctor.cf_type in
-									let best = loop sctor.cf_overloads (sctor, List.length args) in
-									let args,_ = get_fun (apply_params sup.cl_params stl best.cf_type) in
-									let esuper = mk (TConst TSuper) (TInst (sup, stl)) cl.cl_pos in
-									[mk (TCall (esuper, List.map (fun (n,o,t) -> null t cl.cl_pos) args)) basic.tvoid cl.cl_pos]
-								with Not_found ->
-									(* extends native type, but no ctor found *)
-									[]
-					in
-					let ctor = mk_class_field "new" empty_type false cl.cl_pos (Method MethNormal) [] in
-					ctor.cf_expr <- Some {
-						eexpr = TFunction {
-							tf_type = basic.tvoid;
-							tf_args = [alloc_var "empty" empty_ctor_type, None];
-							tf_expr = mk (TBlock super) basic.tvoid cl.cl_pos
-						};
-						etype = empty_type;
-						epos = cl.cl_pos;
-					};
-					ctor.cf_meta <- [Meta.SkipCtor, [], ctor.cf_pos];
-					Hashtbl.add empty_ctors cl.cl_path ctor;
-					match cl.cl_constructor with
-					| None ->
-						cl.cl_constructor <- Some ctor
-					| Some c ->
-						c.cf_overloads <- ctor :: c.cf_overloads
-				with Exit -> ());
-			end
-		in
-
-		let module_filter md =
-			(match md with
-			| TClassDecl cl when should_change cl ->
-				change cl;
-			| _ ->
-				());
-			None
-		in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) module_filter
-
-end;;
-
-(* ******************************************* *)
-(* init function module *)
-(* ******************************************* *)
-(*
-	This module will take proper care of the init function, by taking off all expressions from static vars and putting them
-	in order in the init function.
-	It will also initialize dynamic functions, both by putting them in the constructor and in the init function
-
-	depends on:
-		(syntax) must run before ExprStatement module
-		(ok) must run before OverloadingConstructor module so the constructor can be in the correct place
-		(syntax) must run before FunctionToClass module
-*)
-module InitFunction =
-struct
-	let name = "init_funcs"
-	let priority = solve_deps name [DBefore OverloadingConstructor.priority]
-
-	let ensure_simple_expr gen e =
-		let rec iter e = match e.eexpr with
-			| TConst _ | TLocal _ | TArray _ | TBinop _
-			| TField _ | TTypeExpr _ | TParenthesis _ | TCast _ | TMeta _
-			| TCall _ | TNew _ | TUnop _ ->
-				Type.iter iter e
-			| _ ->
-				print_endline (debug_expr e);
-				gen.gcon.error "Expression is too complex for a readonly variable initialization" e.epos
-		in
-		iter e
-
-	let configure gen =
-		let handle_override_dynfun acc e this field =
-			let add_expr = ref None in
-			let v = mk_temp gen ("super_" ^ field) e.etype in
-			v.v_capture <- true;
-
-			let rec loop e =
-				match e.eexpr with
-					| TField({ eexpr = TConst(TSuper) }, f) ->
-						let n = field_name f in
-						(if n <> field then assert false);
-						let local = mk_local v e.epos in
-						(match !add_expr with
-							| None ->
-								add_expr := Some { e with eexpr = TVar(v, Some this) }
-							| Some _ -> ());
-						local
-					| TConst TSuper -> assert false
-					| _ -> Type.map_expr loop e
-			in
-			let e = loop e in
-
-			match !add_expr with
-				| None -> e :: acc
-				| Some add_expr -> add_expr :: e :: acc
-		in
-
-		let handle_class cl =
-			let init = match cl.cl_init with
-				| None -> []
-				| Some i -> [i]
-			in
-			let init = List.fold_left (fun acc cf ->
-				match cf.cf_kind with
-					| Var v when Meta.has Meta.ReadOnly cf.cf_meta ->
-							if v.v_write <> AccNever && not (Meta.has Meta.CoreApi cl.cl_meta) then gen.gcon.warning "@:readOnly variable declared without `never` setter modifier" cf.cf_pos;
-							(match cf.cf_expr with
-								| None -> gen.gcon.warning "Uninitialized readonly variable" cf.cf_pos; acc
-								| Some e -> ensure_simple_expr gen e; acc)
-					| Var _
-					| Method MethDynamic when not (Type.is_extern_field cf) ->
-						(match cf.cf_expr with
-							| Some e ->
-								(match cf.cf_params with
-									| [] ->
-										let var = { eexpr = TField(ExprBuilder.make_static_this cl cf.cf_pos, FStatic(cl,cf)); etype = cf.cf_type; epos = cf.cf_pos } in
-										let ret = ({ eexpr = TBinop(Ast.OpAssign, var, e); etype = cf.cf_type; epos = cf.cf_pos; }) in
-										cf.cf_expr <- None;
-
-										ret :: acc
-									| _ ->
-										let params = List.map (fun _ -> t_dynamic) cf.cf_params in
-										let fn = apply_params cf.cf_params params in
-										let var = { eexpr = TField(ExprBuilder.make_static_this cl cf.cf_pos, FStatic(cl,cf)); etype = fn cf.cf_type; epos = cf.cf_pos } in
-										let rec change_expr e =
-											Type.map_expr_type (change_expr) fn (fun v -> v.v_type <- fn v.v_type; v) e
-										in
-
-										let ret = ({ eexpr = TBinop(Ast.OpAssign, var, change_expr e); etype = fn cf.cf_type; epos = cf.cf_pos; }) in
-										cf.cf_expr <- None;
-										ret :: acc
-								)
-							| None -> acc)
-					| _ -> acc
-			) init cl.cl_ordered_statics
-			in
-			let init = List.rev init in
-			(match init with
-				| [] -> cl.cl_init <- None
-				| _ -> cl.cl_init <- Some { eexpr = TBlock(init); epos = cl.cl_pos; etype = gen.gcon.basic.tvoid; });
-
-			(* FIXME: find a way to tell OverloadingConstructor to execute this code even with empty constructors *)
-			let vars, funs = List.fold_left (fun (acc_vars,acc_funs) cf ->
-				match cf.cf_kind with
-					| Var v when Meta.has Meta.ReadOnly cf.cf_meta ->
-							if v.v_write <> AccNever && not (Meta.has Meta.CoreApi cl.cl_meta) then gen.gcon.warning "@:readOnly variable declared without `never` setter modifier" cf.cf_pos;
-							(match cf.cf_expr with
-								| None -> (acc_vars,acc_funs)
-								| Some e -> ensure_simple_expr gen e; (acc_vars,acc_funs))
-					| Var _
-					| Method MethDynamic ->
-						let is_var = match cf.cf_kind with | Var _ -> true | _ -> false in
-						(match cf.cf_expr, cf.cf_params with
-							| Some e, [] ->
-								let var = { eexpr = TField({ eexpr = TConst(TThis); epos = cf.cf_pos; etype = TInst(cl, List.map snd cl.cl_params); }, FInstance(cl, List.map snd cl.cl_params, cf)); etype = cf.cf_type; epos = cf.cf_pos } in
-								let ret = ({ eexpr = TBinop(Ast.OpAssign, var, e); etype = cf.cf_type; epos = cf.cf_pos; }) in
-								cf.cf_expr <- None;
-								let is_override = List.memq cf cl.cl_overrides in
-
-								if is_override then begin
-									cl.cl_ordered_fields <- List.filter (fun f -> f.cf_name <> cf.cf_name) cl.cl_ordered_fields;
-									cl.cl_fields <- PMap.remove cf.cf_name cl.cl_fields;
-									acc_vars, handle_override_dynfun acc_funs ret var cf.cf_name
-								end else if is_var then
-									ret :: acc_vars, acc_funs
-								else
-									acc_vars, ret :: acc_funs
-							| Some e, _ ->
-								let params = List.map (fun _ -> t_dynamic) cf.cf_params in
-								let fn = apply_params cf.cf_params params in
-								let var = { eexpr = TField({ eexpr = TConst(TThis); epos = cf.cf_pos; etype = TInst(cl, List.map snd cl.cl_params); }, FInstance(cl, List.map snd cl.cl_params, cf)); etype = cf.cf_type; epos = cf.cf_pos } in
-								let rec change_expr e =
-									Type.map_expr_type (change_expr) fn (fun v -> v.v_type <- fn v.v_type; v) e
-								in
-
-								let ret = ({ eexpr = TBinop(Ast.OpAssign, var, change_expr e); etype = fn cf.cf_type; epos = cf.cf_pos; }) in
-								cf.cf_expr <- None;
-								let is_override = List.memq cf cl.cl_overrides in
-
-								if is_override then begin
-									cl.cl_ordered_fields <- List.filter (fun f -> f.cf_name <> cf.cf_name) cl.cl_ordered_fields;
-									cl.cl_fields <- PMap.remove cf.cf_name cl.cl_fields;
-									acc_vars, handle_override_dynfun acc_funs ret var cf.cf_name
-								end else if is_var then
-									ret :: acc_vars, acc_funs
-								else
-									acc_vars, ret :: acc_funs
-							| None, _ -> acc_vars,acc_funs)
-					| _ -> acc_vars,acc_funs
-			) ([],[]) cl.cl_ordered_fields
-			in
-			(* let vars = List.rev vars in *)
-			(* let funs = List.rev funs in *)
-			(* see if there is any *)
-			(match vars, funs with
-				| [], [] -> ()
-				| _ ->
-					(* if there is, we need to find the constructor *)
-					let ctors = match cl.cl_constructor with
-					| Some ctor -> ctor
-					| None -> try
-						let sctor, sup, stl = OverloadingConstructor.prev_ctor cl (List.map snd cl.cl_params) in
-						let ctor = OverloadingConstructor.clone_ctors gen sctor sup stl cl in
-						cl.cl_constructor <- Some ctor;
-						ctor
-					with | Not_found ->
-						let basic = gen.gcon.basic in
-						let ctor = mk_class_field "new" (TFun([], basic.tvoid)) false cl.cl_pos (Method MethNormal) [] in
-						ctor.cf_expr <- Some
-						{
-							eexpr = TFunction {
-								tf_args = [];
-								tf_type = basic.tvoid;
-								tf_expr = { eexpr = TBlock[]; etype = basic.tvoid; epos = cl.cl_pos };
-							};
-							etype = ctor.cf_type;
-							epos = ctor.cf_pos;
-						};
-						cl.cl_constructor <- Some ctor;
-						ctor
-					in
-
-					let process ctor =
-						let func = match ctor.cf_expr with
-							| Some({eexpr = TFunction(tf)} as e) ->
-								let rec add_fn e = match e.eexpr with
-									| TBlock(hd :: tl) -> (match hd.eexpr with
-										| TCall({ eexpr = TConst TSuper }, _) ->
-											if not (OverloadingConstructor.descends_from_native_or_skipctor cl) then
-												{ e with eexpr = TBlock(vars @ (hd :: (funs @ tl))) }
-											else
-												{ e with eexpr = TBlock(hd :: (vars @ funs @ tl)) }
-										| TBlock(_) ->
-											{ e with eexpr = TBlock( (add_fn hd) :: tl ) }
-										| _ ->
-											{ e with eexpr = TBlock( vars @ funs @ (hd :: tl) ) })
-									| _ -> Type.concat { e with eexpr = TBlock(vars @ funs) } e
-								in
-								let tf_expr = add_fn (mk_block tf.tf_expr) in
-								{ e with eexpr = TFunction({ tf with tf_expr = tf_expr }) }
-							| _ -> assert false
-						in
-						ctor.cf_expr <- Some(func)
-					in
-					List.iter process (ctors :: ctors.cf_overloads)
-			)
-		in
-
-		let mod_filter = function
-			| TClassDecl cl -> (if not cl.cl_extern then handle_class cl); None
-			| _ -> None in
-
-		gen.gmodule_filters#add ~name:"init_funcs" ~priority:(PCustom priority) mod_filter
-
-end;;
-
-
-(* ******************************************* *)
-(* Dynamic Binop/Unop handler *)
-(* ******************************************* *)
-(*
-	On some languages there is limited support for operations on
-	dynamic variables, so those operations must be changed.
-
-	There are 5 types of binary operators:
-		1 - can take any variable and returns a bool (== and !=)
-		2 - can take either a string, or a number and returns either a bool or the underlying type ( >, < for bool and + for returning its type)
-		3 - take numbers and return a number ( *, /, ...)
-		4 - take ints and return an int (bit manipulation)
-		5 - take a bool and returns a bool ( &&, || ...)
-
-	On the default implementation, type 1 and the plus function will be handled with a function call;
-	Type 2 will be handled with the parameter "compare_handler", which will do something like Reflect.compare(x1, x2);
-	Types 3, 4 and 5 will perform a cast to double, int and bool, which will then be handled normally by the platform
-
-	Unary operators are the most difficult to handle correctly.
-	With unary operators, there are 2 types:
-
-		1 - can take a number, changes and returns the result (++, --, ~)
-		2 - can take a number (-) or bool (!), and returns the result
-
-	The first case is much trickier, because it doesn't seem a good idea to change any variable to double just because it is dynamic,
-	but this is how we will handle right now.
-	something like that:
-
-	var x:Dynamic = 10;
-	x++;
-
-	will be:
-	object x = 10;
-	x = ((IConvertible)x).ToDouble(null) + 1;
-
-	depends on:
-		(syntax) must run before expression/statment normalization because it may generate complex expressions
-		must run before OverloadingConstructor due to later priority conflicts. Since ExpressionUnwrap is only
-		defined afterwards, we will set this value with absolute values
-*)
-module DynamicOperators =
-struct
-	let name = "dyn_ops"
-	let priority = 0.0
-
-	let configure gen ?(handle_strings = true) (should_change:texpr->bool) (equals_handler:texpr->texpr->texpr) (dyn_plus_handler:texpr->texpr->texpr->texpr) (compare_handler:texpr->texpr->texpr) =
-		let get_etype_one e =
-			if like_int e.etype then
-				ExprBuilder.make_int gen.gcon 1 e.epos
-			else
-				ExprBuilder.make_float gen.gcon "1.0" e.epos
-		in
-
-		let basic = gen.gcon.basic in
-
-		let rec run e =
-			match e.eexpr with
-				| TBinop (OpAssignOp op, e1, e2) when should_change e -> (* e1 will never contain another TBinop *)
-					(match e1.eexpr with
-						| TLocal _ ->
-							mk_paren { e with eexpr = TBinop(OpAssign, e1, run { e with eexpr = TBinop(op, e1, e2) }) }
-						| TField _ | TArray _ ->
-							let eleft, rest = match e1.eexpr with
-								| TField(ef, f) ->
-									let v = mk_temp gen "dynop" ef.etype in
-									{ e1 with eexpr = TField(mk_local v ef.epos, f) }, [ { eexpr = TVar(v,Some (run ef)); etype = basic.tvoid; epos = ef.epos } ]
-								| TArray(e1a, e2a) ->
-									let v = mk_temp gen "dynop" e1a.etype in
-									let v2 = mk_temp gen "dynopi" e2a.etype in
-									{ e1 with eexpr = TArray(mk_local v e1a.epos, mk_local v2 e2a.epos) }, [
-										{ eexpr = TVar(v,Some (run e1a)); etype = basic.tvoid; epos = e1.epos };
-										{ eexpr = TVar(v2, Some (run e2a)); etype = basic.tvoid; epos = e1.epos }
-									]
-								| _ -> assert false
-							in
-							{ e with
-								eexpr = TBlock (rest @ [ { e with eexpr = TBinop(OpAssign, eleft, run { e with eexpr = TBinop(op, eleft, e2) }) } ]);
-							}
-						| _ ->
-							assert false
-					)
-
-				| TBinop (OpAssign, e1, e2)
-				| TBinop (OpInterval, e1, e2) -> Type.map_expr run e
-				| TBinop (op, e1, e2) when should_change e->
-					(match op with
-						| OpEq -> (* type 1 *)
-							equals_handler (run e1) (run e2)
-						| OpNotEq -> (* != -> !equals() *)
-							mk_paren { eexpr = TUnop(Ast.Not, Prefix, (equals_handler (run e1) (run e2))); etype = gen.gcon.basic.tbool; epos = e.epos }
-						| OpAdd  ->
-							if handle_strings && (is_string e.etype || is_string e1.etype || is_string e2.etype) then
-								{ e with eexpr = TBinop(op, mk_cast gen.gcon.basic.tstring (run e1), mk_cast gen.gcon.basic.tstring (run e2)) }
-							else
-								dyn_plus_handler e (run e1) (run e2)
-						| OpGt | OpGte | OpLt | OpLte  -> (* type 2 *)
-							{ eexpr = TBinop(op, compare_handler (run e1) (run e2), { eexpr = TConst(TInt(Int32.zero)); etype = gen.gcon.basic.tint; epos = e.epos} ); etype = gen.gcon.basic.tbool; epos = e.epos }
-						| OpMult | OpDiv | OpSub | OpMod -> (* always cast everything to double *)
-							let etype = (get_etype_one e).etype in
-							{ e with eexpr = TBinop(op, mk_cast etype (run e1), mk_cast etype (run e2)) }
-						| OpBoolAnd | OpBoolOr ->
-							{ e with eexpr = TBinop(op, mk_cast gen.gcon.basic.tbool (run e1), mk_cast gen.gcon.basic.tbool (run e2)) }
-						| OpAnd | OpOr | OpXor | OpShl | OpShr | OpUShr ->
-							{ e with eexpr = TBinop(op, mk_cast gen.gcon.basic.tint (run e1), mk_cast gen.gcon.basic.tint (run e2)) }
-						| OpAssign | OpAssignOp _ | OpInterval | OpArrow -> assert false)
-				| TUnop (Increment as op, flag, e1)
-				| TUnop (Decrement as op, flag, e1) when should_change e ->
-					(*
-						some naming definitions:
-						* ret => the returning variable
-						* _g => the get body
-						* getvar => the get variable expr
-
-						This will work like this:
-							- if e1 is a TField, set _g = get body, getvar = (get body).varname
-							- if Prefix, return getvar = getvar + 1.0
-							- if Postfix, set ret = getvar; getvar = getvar + 1.0; ret;
-					*)
-					let one = get_etype_one e in
-					let etype = one.etype in
-					let op = (match op with Increment -> OpAdd | Decrement -> OpSub | _ -> assert false) in
-
-					let var, getvar =
-						match e1.eexpr with
-							| TField(fexpr, field) ->
-								let tmp = mk_temp gen "getvar" fexpr.etype in
-								let var = { eexpr = TVar(tmp, Some(run fexpr)); etype = gen.gcon.basic.tvoid; epos = e.epos } in
-								(Some var, { eexpr = TField( { fexpr with eexpr = TLocal(tmp) }, field); etype = etype; epos = e1.epos })
-							| _ ->
-								(None, e1)
-					in
-
-					(match flag with
-						| Prefix ->
-							let block = (match var with | Some e -> [e] | None -> []) @
-							[
-								mk_cast etype { e with eexpr = TBinop(OpAssign, getvar,{ eexpr = TBinop(op, mk_cast etype getvar, one); etype = etype; epos = e.epos }); etype = getvar.etype; }
-							]
-							in
-							{ eexpr = TBlock(block); etype = etype; epos = e.epos }
-						| Postfix ->
-							let ret = mk_temp gen "ret" etype in
-							let vars = (match var with Some e -> [e] | None -> []) @ [{ eexpr = TVar(ret, Some (mk_cast etype getvar)); etype = gen.gcon.basic.tvoid; epos = e.epos }] in
-							let retlocal = { eexpr = TLocal(ret); etype = etype; epos = e.epos } in
-							let block = vars @
-							[
-							{ e with eexpr = TBinop(OpAssign, getvar, { eexpr = TBinop(op, retlocal, one); etype = getvar.etype; epos = e.epos }) };
-							retlocal
-						] in
-						{ eexpr = TBlock(block); etype = etype; epos = e.epos }
-				)
-			| TUnop (op, flag, e1) when should_change e ->
-				let etype = match op with | Not -> gen.gcon.basic.tbool | _ -> gen.gcon.basic.tint in
-				mk_paren { eexpr = TUnop(op, flag, mk_cast etype (run e1)); etype = etype; epos = e.epos }
-			| _ -> Type.map_expr run e
-		in
-		let map e = Some(run e) in
-		gen.gexpr_filters#add ~name:"dyn_ops" ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* Dynamic Field Access *)
-(* ******************************************* *)
-(*
-	This module will filter every dynamic field access in haxe.
-
-	On platforms that do not support dynamic access, it is with this that you should
-	replace dynamic calls with x.field / Reflect.setField calls, and guess what -
-	this is the default implemenation!
-	Actually there is a problem with Reflect.setField because it returns void, which is a bad thing for us,
-	so even in the default implementation, the function call should be specified to a Reflect.setField version that returns
-	the value that was set
-
-	(TODO: should it be separated?)
-	As a plus, the default implementation adds something that doesn't hurt anybody, it looks for
-	TAnon with Statics / EnumStatics field accesses and transforms them into real static calls.
-	This means it will take this
-
-	var m = Math;
-	for (i in 0...1000) m.cos(10);
-
-	which is an optimization in dynamic platforms, but performs horribly on strongly typed platforms
-	and transform into:
-
-	var m = Math;
-	for (i in 0...1000) Math.cos(10);
-
-	depends on:
-		(ok) must run AFTER Binop/Unop handler - so Unops / Binops are already unrolled
-*)
-module DynamicFieldAccess =
-struct
-	let name = "dynamic_field_access"
-	let priority = solve_deps name [DAfter DynamicOperators.priority]
-
-	(*
-		is_dynamic (expr) (field_access_expr) (field) : a function that indicates if the field access should be changed
-		change_expr (expr) (field_access_expr) (field) (setting expr) (is_unsafe) : changes the expression
-		call_expr (expr) (field_access_expr) (field) (call_params) : changes a call expression
-	*)
-	let configure gen (is_dynamic:texpr->texpr->Type.tfield_access->bool) (change_expr:texpr->texpr->string->texpr option->bool->texpr) (call_expr:texpr->texpr->string->texpr list->texpr) =
-		let rec run e =
-			match e.eexpr with
-			(* class types *)
-			| TField(fexpr, f) when is_some (anon_class fexpr.etype) ->
-				let decl = get (anon_class fexpr.etype) in
-				let name = field_name f in
-				(try
-					match decl with
-						| TClassDecl cl ->
-								let cf = PMap.find name cl.cl_statics in
-								{ e with eexpr = TField({ fexpr with eexpr = TTypeExpr decl }, FStatic(cl, cf)) }
-						| TEnumDecl en ->
-								let ef = PMap.find name en.e_constrs in
-								{ e with eexpr = TField({ fexpr with eexpr = TTypeExpr decl }, FEnum(en, ef)) }
-						| TAbstractDecl _ -> (* abstracts don't have TFields *) assert false
-						| TTypeDecl _ -> (* anon_class doesn't return TTypeDecl *) assert false
-					with
-						| Not_found -> match f with
-							| FStatic(cl,cf) when Meta.has Meta.Extern cf.cf_meta ->
-								{ e with eexpr = TField({ fexpr with eexpr = TTypeExpr decl }, FStatic(cl, cf)) }
-							| _ ->
-								change_expr e { fexpr with eexpr = TTypeExpr decl } (field_name f) None true
-				)
-			| TField(fexpr, f) when is_dynamic e fexpr (f) ->
-				change_expr e (run fexpr) (field_name f) None true
-			| TCall(
-				{ eexpr = TField(_, FStatic({ cl_path = ([], "Reflect") }, { cf_name = "field" })) } ,
-					[obj; { eexpr = TConst(TString(field)) }]
-				) ->
-				let t = match gen.greal_type obj.etype with
-					| TDynamic _ | TAnon _ | TMono _ -> t_dynamic
-					| t -> t
-				in
-				change_expr (mk_field_access gen { obj with etype = t } field obj.epos) (run obj) field None false
-			| TCall(
-				{ eexpr = TField(_, FStatic({ cl_path = ([], "Reflect") }, { cf_name = "setField" } )) },
-					[obj; { eexpr = TConst(TString(field)) }; evalue]
-				) ->
-				change_expr (mk_field_access gen obj field obj.epos) (run obj) field (Some (run evalue)) false
-			| TBinop(OpAssign, ({eexpr = TField(fexpr, f)}), evalue) when is_dynamic e fexpr (f) ->
-				change_expr e (run fexpr) (field_name f) (Some (run evalue)) true
-			| TBinop(OpAssign, { eexpr = TField(fexpr, f) }, evalue) ->
-					(match field_access_esp gen fexpr.etype (f) with
-						| FClassField(_,_,_,cf,false,t,_) when (try PMap.find cf.cf_name gen.gbase_class_fields == cf with Not_found -> false) ->
-								change_expr e (run fexpr) (field_name f) (Some (run evalue)) true
-						| _ -> Type.map_expr run e
-					)
-			(* #if debug *)
-			| TBinop(OpAssignOp op, ({eexpr = TField(fexpr, f)}), evalue) when is_dynamic e fexpr (f) -> assert false (* this case shouldn't happen *)
-			| TUnop(Increment, _, ({eexpr = TField( ( { eexpr=TLocal(local) } as fexpr ), f)}))
-			| TUnop(Decrement, _, ({eexpr = TField( ( { eexpr=TLocal(local) } as fexpr ), f)})) when is_dynamic e fexpr (f) -> assert false (* this case shouldn't happen *)
-			(* #end *)
-			| TCall( ({ eexpr = TField(fexpr, f) }), params ) when is_dynamic e fexpr (f) ->
-				call_expr e (run fexpr) (field_name f) (List.map run params)
-			| _ -> Type.map_expr run e
-		in
-		let map e = Some(run e) in
-		gen.gexpr_filters#add ~name:"dynamic_field_access" ~priority:(PCustom(priority)) map
-end;;
-
-
-(* ******************************************* *)
-(* Closure Detection *)
-(* ******************************************* *)
-(*
-	Just a small utility filter that detects when a closure must be created.
-	On the default implementation, this means when a function field is being accessed
-	not via reflection and not to be called instantly
-
-	dependencies:
-		must run after DynamicFieldAccess, so any TAnon { Statics / EnumStatics } will be changed to the corresponding TTypeExpr
-*)
-module FilterClosures =
-struct
-	let name = "filter_closures"
-	let priority = solve_deps name [DAfter DynamicFieldAccess.priority]
-
-	let configure gen (should_change:texpr->string->bool) (filter:texpr->texpr->string->bool->texpr) =
-		let rec run e =
-			match e.eexpr with
-				(*(* this is precisely the only case where we won't even ask if we should change, because it is a direct use of TClosure *)
-				| TCall ( {eexpr = TClosure(e1,s)} as clos, args ) ->
-					{ e with eexpr = TCall({ clos with eexpr = TClosure(run e1, s) }, List.map run args ) }
-				| TCall ( clos, args ) ->
-					let rec loop clos = match clos.eexpr with
-						| TClosure(e1,s) -> Some (clos, e1, s)
-						| TParenthesis p -> loop p
-						| _ -> None
-					in
-					let clos = loop clos in
-					(match clos with
-						| Some (clos, e1, s) -> { e with eexpr = TCall({ clos with eexpr = TClosure(run e1, s) }, List.map run args ) }
-						| None -> Type.map_expr run e)*)
-					| TCall({ eexpr = TLocal{ v_name = "__delegate__" } } as local, [del]) ->
-						{ e with eexpr = TCall(local, [Type.map_expr run del]) }
-					| TCall(({ eexpr = TField(_, _) } as ef), params) ->
-						{ e with eexpr = TCall(Type.map_expr run ef, List.map run params) }
-					| TField(ef, FEnum(en, field)) ->
-							(* FIXME replace t_dynamic with actual enum Anon field *)
-							let ef = run ef in
-							(match follow field.ef_type with
-								| TFun _ when should_change ef field.ef_name ->
-									filter e ef field.ef_name true
-								| _ ->
-										{ e with eexpr = TField(ef, FEnum(en,field)) }
-							)
-					| TField(({ eexpr = TTypeExpr _ } as tf), f) ->
-						(match field_access_esp gen tf.etype (f) with
-							| FClassField(_,_,_,cf,_,_,_) ->
-								(match cf.cf_kind with
-									| Method(MethDynamic)
-									| Var _ ->
-										e
-									| _ when should_change tf cf.cf_name ->
-										filter e tf cf.cf_name true
-									| _ ->
-										e
-							 )
-							| _ -> e)
-					| TField(e1, FClosure (Some _, cf)) when should_change e1 cf.cf_name ->
-						(match cf.cf_kind with
-						| Method MethDynamic | Var _ ->
-							Type.map_expr run e
-						| _ ->
-							filter e (run e1) cf.cf_name false)
-					| _ -> Type.map_expr run e
-		in
-		let map e = Some(run e) in
-		gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* Dynamic TArray Handling *)
-(* ******************************************* *)
-(*
-	In some languages you cannot overload the [] operator,
-	so we need to decide what is kept as TArray and what gets mapped.
-
-	depends on:
-		(syntax) must run before expression/statment normalization because it may generate complex expressions
-		(ok) must run before binop transformations because it may generate some untreated binop ops
-		(ok) must run before dynamic field access is transformed into reflection
-*)
-module TArrayTransform =
-struct
-	let name = "dyn_tarray"
-	let priority = solve_deps name [DBefore DynamicOperators.priority; DBefore DynamicFieldAccess.priority]
-
-	(* should change signature: tarray expr -> binop operation -> should change? *)
-	let configure gen (should_change:texpr->Ast.binop option->bool) (get_fun:string) (set_fun:string) =
-		let basic = gen.gcon.basic in
-		let mk_get e e1 e2 =
-			let efield = mk_field_access gen e1 get_fun e.epos in
-			{ e with eexpr = TCall(efield, [e2]) }
-		in
-		let mk_set e e1 e2 evalue =
-			let efield = mk_field_access gen e1 set_fun e.epos in
-			{ e with eexpr = TCall(efield, [e2; evalue]) }
-		in
-		let rec run e =
-			match e.eexpr with
-				| TArray(e1, e2) ->
-					(* e1 should always be a var; no need to map there *)
-					if should_change e None then mk_get e (run e1) (run e2) else Type.map_expr run e
-				| TBinop (Ast.OpAssign, ({ eexpr = TArray(e1a,e2a) } as earray), evalue) when should_change earray (Some Ast.OpAssign) ->
-					mk_set e (run e1a) (run e2a) (run evalue)
-				| TBinop (Ast.OpAssignOp op,({ eexpr = TArray(e1a,e2a) } as earray) , evalue) when should_change earray (Some (Ast.OpAssignOp op)) ->
-					(* cache all arguments in vars so they don't get executed twice *)
-					(* let ensure_local gen block name e = *)
-					let block = ref [] in
-
-					let arr_local = ensure_local gen block "array" (run e1a) in
-					let idx_local = ensure_local gen block "index" (run e2a) in
-					block := (mk_set e arr_local idx_local ( { e with eexpr=TBinop(op, mk_get earray arr_local idx_local, run evalue) } )) :: !block;
-
-					{ e with eexpr = TBlock (List.rev !block) }
-				| TUnop(op, flag, ({ eexpr = TArray(e1a, e2a) } as earray)) ->
-					if should_change earray None && match op with | Not | Neg -> false | _ -> true then begin
-
-						let block = ref [] in
-
-						let actual_t = match op with
-							| Ast.Increment | Ast.Decrement -> (match follow earray.etype with
-								| TInst _ | TAbstract _ | TEnum _ -> earray.etype
-								| _ -> basic.tfloat)
-							| Ast.Not -> basic.tbool
-							| _ -> basic.tint
-						in
-
-						let val_v = mk_temp gen "arrVal" actual_t in
-						let ret_v = mk_temp gen "arrRet" actual_t in
-
-						let arr_local = ensure_local gen block "arr" (run e1a) in
-						let idx_local = ensure_local gen block "arrIndex" (run e2a) in
-
-						let val_local = { earray with eexpr = TLocal(val_v) } in
-						let ret_local = { earray with eexpr = TLocal(ret_v) } in
-						(* var idx = 1; var val = x._get(idx); var ret = val++; x._set(idx, val); ret; *)
-						block := { eexpr = TVar(val_v, Some(mk_get earray arr_local idx_local)); (* var val = x._get(idx) *)
-											 etype = gen.gcon.basic.tvoid;
-											 epos = e2a.epos
-										 } :: !block;
-						block := { eexpr = TVar(ret_v, Some { e with eexpr = TUnop(op, flag, val_local) }); (* var ret = val++ *)
-												etype = gen.gcon.basic.tvoid;
-												epos = e2a.epos
-										 } :: !block;
-						block := (mk_set e arr_local idx_local val_local) (*x._set(idx,val)*) :: !block;
-						block := ret_local :: !block;
-						{ e with eexpr = TBlock (List.rev !block) }
-					end else
-						Type.map_expr run e
-				| _ -> Type.map_expr run e
-		in
-		let map e = Some(run e) in
-		gen.gexpr_filters#add ~name:"dyn_tarray" ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* Try / Catch + throw native types handling *)
-(* ******************************************* *)
-(*
-	Some languages/vm's do not support throwing any kind of value. For them, only
-	special kinds of objects can be thrown. Because of this, we must wrap some throw
-	statements with an expression, and also we must unwrap it on the catch() phase, and
-	maybe manually test with Std.is()
-
-	dependencies:
-		must run before dynamic field access (?) TODO review
-		It's a syntax filter, as it alters types (throw wrapper)
-*)
-module TryCatchWrapper =
-struct
-	let priority = solve_deps "try_catch" [DBefore DynamicFieldAccess.priority]
-
-	(*
-		should_wrap : does the type should be wrapped? This of course works on the reverse way, so it tells us if the type should be unwrapped as well
-		wrap_throw : the wrapper for throw (throw expr->expr inside throw->returning wrapped expression)
-		unwrap_expr : the other way around : given the catch var (maybe will need casting to wrapper_type) , return the unwrap expr
-		rethrow_expr : how to rethrow ane exception in the platform
-		catchall_type : the class used for catchall (e:Dynamic)
-		wrapper_type : the wrapper type, so we can test if exception is of type 'wrapper'
-		catch_map : maps the catch expression to include some intialization code (e.g. setting up Stack.exceptionStack)
-	*)
-	let configure gen (should_wrap:t->bool) (wrap_throw:texpr->texpr->texpr) (unwrap_expr:tvar->pos->texpr) (rethrow_expr:texpr->texpr) (catchall_type:t) (wrapper_type:t) (catch_map:tvar->texpr->texpr) =
-		let rec run e =
-			match e.eexpr with
-					| TThrow texpr when should_wrap texpr.etype -> wrap_throw e (run texpr)
-					| TTry (ttry, catches) ->
-						let nowrap_catches, must_wrap_catches, catchall = List.fold_left (fun (nowrap_catches, must_wrap_catches, catchall) (v, catch) ->
-							(* first we'll see if the type is Dynamic (catchall) *)
-							match follow v.v_type with
-								| TDynamic _ ->
-									assert (is_none catchall);
-									(nowrap_catches, must_wrap_catches, Some(v,run catch))
-								(* see if we should unwrap it *)
-								| _ when should_wrap (follow v.v_type) ->
-									(nowrap_catches, (v,run catch) :: must_wrap_catches, catchall)
-								| _ ->
-									( (v,catch_map v (run catch)) :: nowrap_catches, must_wrap_catches, catchall )
-						) ([], [], None) catches
-						in
-						(* temp (?) fix for https://github.com/HaxeFoundation/haxe/issues/4134 *)
-						let must_wrap_catches = List.rev must_wrap_catches in
-						(*
-							1st catch all nowrap "the easy way"
-							2nd see if there are any must_wrap or catchall. If there is,
-								do a catchall first with a temp var.
-								then get catchall var (as dynamic) (or create one), and declare it = catchall exception
-								then test if it is of type wrapper_type. If it is, unwrap it
-								then start doing Std.is() tests for each catch type
-								if there is a catchall in the end, end with it. If there isn't, rethrow
-						*)
-						let dyn_catch = match (catchall, must_wrap_catches) with
-							| Some (v,c), _
-							| _, (v, c) :: _ ->
-								let pos = c.epos in
-								let temp_var = mk_temp gen "catchallException" catchall_type in
-								let temp_local = { eexpr=TLocal(temp_var); etype = temp_var.v_type; epos = pos } in
-								let catchall_var = (*match catchall with
-									| None -> *) mk_temp gen "catchall" t_dynamic
-									(*| Some (v,_) -> v*)
-								in
-								let catchall_decl = { eexpr = TVar(catchall_var, Some(temp_local)); etype=gen.gcon.basic.tvoid; epos = pos } in
-								let catchall_local = { eexpr = TLocal(catchall_var); etype = t_dynamic; epos = pos } in
-								(* if it is of type wrapper_type, unwrap it *)
-								let std_is = mk_static_field_access (get_cl (get_type gen ([],"Std"))) "is" (TFun(["v",false,t_dynamic;"cl",false,mt_to_t (get_type gen ([], "Class")) [t_dynamic]],gen.gcon.basic.tbool)) pos in
-								let mk_std_is t pos = { eexpr = TCall(std_is, [catchall_local; mk_mt_access (t_to_mt t) pos]); etype = gen.gcon.basic.tbool; epos = pos } in
-
-								let if_is_wrapper_expr = { eexpr = TIf(mk_std_is wrapper_type pos,
-									{ eexpr = TBinop(OpAssign, catchall_local, unwrap_expr temp_var pos); etype = t_dynamic; epos = pos }
-								, None); etype = gen.gcon.basic.tvoid; epos = pos } in
-								let rec loop must_wrap_catches = match must_wrap_catches with
-									| (vcatch,catch) :: tl ->
-										{ eexpr = TIf(mk_std_is vcatch.v_type catch.epos,
-											{ eexpr = TBlock({ eexpr=TVar(vcatch, Some(mk_cast vcatch.v_type catchall_local)); etype=gen.gcon.basic.tvoid; epos=catch.epos } :: [catch] ); etype = catch.etype; epos = catch.epos },
-											Some (loop tl));
-										etype = catch.etype; epos = catch.epos }
-									| [] ->
-										match catchall with
-											| Some (v,s) ->
-												Type.concat { eexpr = TVar(v, Some(catchall_local)); etype = gen.gcon.basic.tvoid; epos = pos } s
-											| None ->
-												mk_block (rethrow_expr temp_local)
-								in
-								[ ( temp_var, catch_map temp_var { e with eexpr = TBlock([ catchall_decl; if_is_wrapper_expr; loop must_wrap_catches ]) } ) ]
-							| _ ->
-								[]
-						in
-						{ e with eexpr = TTry(run ttry, (List.rev nowrap_catches) @ dyn_catch) }
-					| _ -> Type.map_expr run e
-		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:"try_catch" ~priority:(PCustom priority) map
-end;;
-
-
-let fun_args = List.map (function | (v,s) -> (v.v_name, (match s with | None -> false | Some _ -> true), v.v_type))
-
-(* ******************************************* *)
-(* Closures To Class *)
-(* ******************************************* *)
-
-(*
-
-	This is a very important filter. It will take all anonymous functions from the AST, will search for all captured variables, and will create a class
-	that implements an abstract interface for calling functions. This is very important for targets that don't support anonymous functions to work correctly.
-	Also it is possible to implement some strategies to avoid value type boxing, such as NaN tagging or double/object arguments. All this will be abstracted away
-	from this interface.
-
-
-	dependencies:
-		must run after dynamic field access, because of conflicting ways to deal with invokeField
-		(module filter) must run after OverloadingConstructor so we can also change the dynamic function expressions
-
-		uses TArray expressions for array. TODO see interaction
-		uses TThrow expressions.
-*)
-
-module ClosuresToClass =
-struct
-	let name = "closures_to_class"
-	let priority = solve_deps name [ DAfter DynamicFieldAccess.priority ]
-
-	type closures_ctx = {
-		func_class : tclass;
-
-		(*
-			this is what will actually turn the function into class field.
-			The standard implementation by default will already take care of creating the class, and setting the captured variables.
-
-			It will also return the super arguments to be called
-		*)
-		closure_to_classfield : tfunc->t->pos->tclass_field * (texpr list);
-
-		(*
-			when a dynamic function call is made, we need to convert it as if it were calling the dynamic function interface.
-
-			TCall expr -> new TCall expr
-		*)
-		dynamic_fun_call : texpr->texpr;
-
-		(*
-			Provide a toolchain so we can easily create classes that extend Function and add more functionality on top of it.
-
-			arguments:
-				tclass -> subject (so we know the type of this)
-				( int -> (int->t->tconstant option->texpr) -> ( (tvar * tconstant option) list * texpr) )
-					int -> current arity of the function whose member will be mapped; -1 for dynamic function. It is guaranteed that dynamic function will be called last
-					t -> the return type of the function
-					(int->t->tconstant option->texpr) -> api to get exprs that unwrap arguments correctly
-						int -> argument wanted to unwrap
-						t -> solicited type
-						tconstant option -> map to this default value if null
-						returns a texpr that tells how the default
-					should return a list with additional arguments (only works if is_function_base = true)
-					and the underlying function expression
-		*)
-		map_base_classfields : tclass->( int -> t -> (tvar list) -> (int->t->tconstant option->texpr) -> texpr )->tclass_field list;
-	}
-
-	type map_info = {
-		in_unsafe : bool;
-		in_unused : bool;
-	}
-
-	let null_map_info = { in_unsafe = false; in_unused = false; }
-
-	(*
-		the default implementation will take 3 transformation functions:
-			* one that will transform closures that are not called immediately (instance.myFunc).
-				normally on this case it's best to have a runtime handler that will take the instance, the function and call its invokeField when invoked
-			* one that will actually handle the anonymous functions themselves.
-			* one that will transform calling a dynamic function. So for example, dynFunc(arg1, arg2) might turn into dynFunc.apply2(arg1, arg2);
-			( suspended ) * an option to match papplied functions
-			* handling parameterized anonymous function declaration (optional - tparam_anon_decl and tparam_anon_acc)
-	*)
-
-	let rec cleanup_delegate e = match e.eexpr with
-		| TParenthesis e | TMeta(_,e)
-		| TCast(e,_) -> cleanup_delegate e
-		| _ -> e
-
-	let funct gen t = match follow (run_follow gen t) with
-		| TFun(args,ret) -> args,ret
-		| _ -> raise Not_found
-
-	let mk_conversion_fun gen e =
-		let args, ret = funct gen e.etype in
-		let tf_args = List.map (fun (n,o,t) -> alloc_var n t,None) args in
-		let block, local = match e.eexpr with
-			| TLocal v ->
-				v.v_capture <- true;
-				[],e
-			| _ ->
-				let tmp = mk_temp gen "delegate_conv" e.etype in
-				tmp.v_capture <- true;
-				[{ eexpr = TVar(tmp,Some e); etype = gen.gcon.basic.tvoid; epos = e.epos }], mk_local tmp e.epos
-		in
-		let body = {
-			eexpr = TCall(local, List.map (fun (v,_) -> mk_local v e.epos) tf_args);
-			etype = ret;
-			epos = e.epos;
-		} in
-		let body = if not (ExtType.is_void ret) then
-			{ body with eexpr = TReturn( Some body ) }
-		else
-			body
-		in
-		let body = {
-			eexpr = TBlock([body]);
-			etype = body.etype;
-			epos = body.epos;
-		} in
-		block, {
-			tf_args = tf_args;
-			tf_expr = body;
-			tf_type = ret;
-		}
-
-	let traverse gen ?tparam_anon_decl ?tparam_anon_acc (handle_anon_func:texpr->tfunc->map_info->t option->texpr) (dynamic_func_call:texpr->texpr) e =
-		let info = ref null_map_info in
-		let rec run e =
-			match e.eexpr with
-				| TCast({ eexpr = TCall({ eexpr = TLocal{ v_name = "__delegate__" } } as local, [del] ) } as e2, _) ->
-					let e2 = { e2 with etype = e.etype } in
-					let replace_delegate ex =
-						{ e with eexpr = TCast({ e2 with eexpr = TCall(local, [ex]) }, None) }
-					in
-					(* found a delegate; let's see if it's a closure or not *)
-					let clean = cleanup_delegate del in
-					(match clean.eexpr with
-						| TField( ef, (FClosure _ as f)) | TField( ef, (FStatic _ as f)) ->
-							(* a closure; let's leave this unchanged for FilterClosures to handle it *)
-							replace_delegate { clean with eexpr = TField( run ef, f ) }
-						| TFunction tf ->
-							(* handle like we'd handle a normal function, but create an unchanged closure field for it *)
-							let ret = handle_anon_func clean { tf with tf_expr = run tf.tf_expr } !info (Some e.etype) in
-							replace_delegate ret
-						| _ -> try
-							let block, tf = mk_conversion_fun gen del in
-							let block = List.map run block in
-							let tf = { tf with tf_expr = run tf.tf_expr } in
-							let ret = handle_anon_func { clean with eexpr = TFunction(tf) } { tf with tf_expr = run tf.tf_expr } !info (Some e.etype) in
-							let ret = replace_delegate ret in
-							if block = [] then
-								ret
-							else
-								{ ret with eexpr = TBlock(block @ [ret]) }
-						with Not_found ->
-							gen.gcon.error "This delegate construct is unsupported" e.epos;
-							replace_delegate (run clean))
-
-				| TCall(({ eexpr = TLocal{ v_name = "__unsafe__" } } as local), [arg]) ->
-					let old = !info in
-					info := { !info with in_unsafe = true };
-					let arg2 = run arg in
-					info := old;
-					{ e with eexpr = TCall(local,[arg2]) }
-				(* parameterized functions handling *)
-				| TVar(vv, ve) -> (match tparam_anon_decl with
-					| None -> Type.map_expr run e
-					| Some tparam_anon_decl ->
-						(match (vv, ve) with
-							| ({ v_extra = Some( _ :: _, _) } as v), Some ({ eexpr = TFunction tf } as f)
-							| ({ v_extra = Some( _ :: _, _) } as v), Some { eexpr = TArrayDecl([{ eexpr = TFunction tf } as f]) | TCall({ eexpr = TLocal { v_name = "__array__" } }, [{ eexpr = TFunction tf } as f]) } -> (* captured transformation *)
-								ignore(tparam_anon_decl v f { tf with tf_expr = run tf.tf_expr });
-								{ e with eexpr = TBlock([]) }
-							| _ ->
-								Type.map_expr run { e with eexpr = TVar(vv, ve) })
-						)
-				| TLocal ({ v_extra = Some( _ :: _, _) } as v)
-				| TArray ({ eexpr = TLocal ({ v_extra = Some( _ :: _, _) } as v) }, _) -> (* captured transformation *)
-					(match tparam_anon_acc with
-					| None -> Type.map_expr run e
-					| Some tparam_anon_acc -> tparam_anon_acc v e)
-				| TCall( { eexpr = TField(_, FEnum _) }, _ ) ->
-					Type.map_expr run e
-				(* if a TClosure is being call immediately, there's no need to convert it to a TClosure *)
-				| TCall(( { eexpr = TField(ecl,f) } as e1), params) ->
-					(* check to see if called field is known and if it is a MethNormal (only MethNormal fields can be called directly) *)
-					(* let name = field_name f in *)
-					(match field_access_esp gen (gen.greal_type ecl.etype) f with
-						| FClassField(_,_,_,cf,_,_,_) ->
-							(match cf.cf_kind with
-								| Method MethNormal
-								| Method MethInline ->
-									{ e with eexpr = TCall({ e1 with eexpr = TField(run ecl, f) }, List.map run params) }
-								| _ ->
-									match gen.gfollow#run_f e1.etype with
-										| TFun _ ->
-											dynamic_func_call { e with eexpr = TCall(run e1, List.map run params) }
-										| _ ->
-											let i = ref 0 in
-											let t = TFun(List.map (fun e -> incr i; "arg" ^ (string_of_int !i), false, e.etype) params, e.etype) in
-											dynamic_func_call { e with eexpr = TCall( mk_castfast t (run e1), List.map run params ) }
-							)
-						(* | FNotFound ->
-							{ e with eexpr = TCall({ e1 with eexpr = TField(run ecl, f) }, List.map run params) }
-								(* expressions by now may have generated invalid expressions *) *)
-						| _ ->
-							match gen.gfollow#run_f e1.etype with
-								| TFun _ ->
-									dynamic_func_call { e with eexpr = TCall(run e1, List.map run params) }
-								| _ ->
-									let i = ref 0 in
-									let t = TFun(List.map (fun e -> incr i; "arg" ^ (string_of_int !i), false, e.etype) params, e.etype) in
-									dynamic_func_call { e with eexpr = TCall( mk_castfast t (run e1), List.map run params ) }
-					)
-				| TFunction tf ->
-					handle_anon_func e { tf with tf_expr = run tf.tf_expr } !info None
-				| TCall({ eexpr = TConst(TSuper) }, _) ->
-					Type.map_expr run e
-				| TCall({ eexpr = TLocal(v) }, args) when String.get v.v_name 0 = '_' && Hashtbl.mem gen.gspecial_vars v.v_name ->
-					Type.map_expr run e
-				| TCall(tc,params) ->
-					let i = ref 0 in
-					let may_cast = match gen.gfollow#run_f tc.etype with
-						| TFun _ -> fun e -> e
-						| _ ->
-							let t = TFun(List.map (fun e ->
-									incr i;
-									("p" ^ (string_of_int !i), false, e.etype)
-								) params, e.etype)
-							in
-							fun e -> mk_castfast t e
-					in
-					dynamic_func_call { e with eexpr = TCall(run (may_cast tc), List.map run params) }
-				| _ -> Type.map_expr run e
-		in
-
-		(match e.eexpr with
-			| TFunction(tf) -> Type.map_expr run e
-			| _ -> run e)
-
-	let rec get_type_params acc t =
-		match t with
-			| TInst(( { cl_kind = KTypeParameter _ } as cl), []) ->
-				if List.memq cl acc then acc else cl :: acc
-			| TFun (params,tret) ->
-				List.fold_left get_type_params acc ( tret :: List.map (fun (_,_,t) -> t) params )
-			| TDynamic t ->
-				(match t with | TDynamic _ -> acc | _ -> get_type_params acc t)
-			| TAbstract (a, pl) when not (Meta.has Meta.CoreType a.a_meta) ->
-					get_type_params acc ( Abstract.get_underlying_type a pl)
-			| TAnon a ->
-				PMap.fold (fun cf acc ->
-					let params = List.map (fun (_,t) -> match follow t with
-						| TInst(c,_) -> c
-						| _ -> assert false) cf.cf_params
-					in
-					List.filter (fun t -> not (List.memq t params)) (get_type_params acc cf.cf_type)
-				) a.a_fields acc
-			| TType(_, [])
-			| TAbstract (_, [])
-			| TInst(_, [])
-			| TEnum(_, []) ->
-				acc
-			| TType(_, params)
-			| TAbstract(_, params)
-			| TEnum(_, params)
-			| TInst(_, params) ->
-				List.fold_left get_type_params acc params
-			| TMono r -> (match !r with
-				| Some t -> get_type_params acc t
-				| None -> acc)
-			| _ -> get_type_params acc (follow_once t)
-
-	let get_captured expr =
-		let ret = Hashtbl.create 1 in
-		let ignored = Hashtbl.create 0 in
-
-		let params = ref [] in
-		let check_params t = params := get_type_params !params t in
-		let rec traverse expr =
-			match expr.eexpr with
-				| TFor (v, _, _) ->
-					Hashtbl.add ignored v.v_id v;
-					check_params v.v_type;
-					Type.iter traverse expr
-				| TFunction(tf) ->
-					List.iter (fun (v,_) -> Hashtbl.add ignored v.v_id v) tf.tf_args;
-					(match follow expr.etype with
-						| TFun(args,ret) ->
-							List.iter (fun (_,_,t) ->
-								check_params t
-							) args;
-							check_params ret
-						| _ -> ());
-					Type.iter traverse expr
-				| TVar (v, opt) ->
-					(match v.v_extra with
-						| Some(_ :: _, _) -> ()
-						| _ ->
-							check_params v.v_type);
-					Hashtbl.add ignored v.v_id v;
-					ignore(Option.map traverse opt)
-				| TLocal { v_extra = Some( (_ :: _ ),_) } ->
-					()
-				| TLocal(( { v_capture = true } ) as v) ->
-					(if not (Hashtbl.mem ignored v.v_id || Hashtbl.mem ret v.v_id) then begin check_params v.v_type; Hashtbl.replace ret v.v_id expr end);
-				| _ -> Type.iter traverse expr
-		in traverse expr;
-		ret, !params
-
-	(*
-		OPTIMIZEME:
-
-		Take off from Codegen the code that wraps captured variables,
-
-		traverse through all variables, looking for their use (just like local_usage)
-		three possible outcomes for captured variables:
-			- become a function member variable <- best performance.
-				Will not work on functions that can be created more than once (functions inside a loop or functions inside functions)
-				The function will have to be created on top of the block, so its variables can be filled in instead of being declared
-			- single-element array - the most compatible way, though also creates a slight overhead.
-		- we'll have some labels for captured variables:
-			- used in loop
-	*)
-
-	(*
-		The default implementation will impose a naming convention:
-			invoke(arity)_(o for returning object/d for returning double) when arity < max_arity
-			invoke_dynamic_(o/d) when arity > max_arity
-
-		This means that it also imposes that the dynamic function return types may only be Dynamic or Float, and all other basic types must be converted to/from it.
-	*)
-	let configure gen ft =
-
-		let handle_anon_func fexpr tfunc mapinfo delegate_type : texpr * (tclass * texpr list) =
-			let in_unsafe = mapinfo.in_unsafe || match gen.gcurrent_class, gen.gcurrent_classfield with
-				| Some c, _ when Meta.has Meta.Unsafe c.cl_meta -> true
-				| _, Some cf when Meta.has Meta.Unsafe cf.cf_meta -> true
-				| _ -> false
-			in
-			(* get all captured variables it uses *)
-			let captured_ht, tparams = get_captured fexpr in
-			let captured = Hashtbl.fold (fun _ e acc -> e :: acc) captured_ht [] in
-			let captured = List.sort (fun e1 e2 -> match e1, e2 with
-				| { eexpr = TLocal v1 }, { eexpr = TLocal v2 } ->
-					compare v1.v_name v2.v_name
-				| _ -> assert false) captured
-			in
-
-			(*let cltypes = List.map (fun cl -> (snd cl.cl_path, TInst(map_param cl, []) )) tparams in*)
-			let cltypes = List.map (fun cl -> (snd cl.cl_path, TInst(cl, []) )) tparams in
-
-			(* create a new class that extends abstract function class, with a ctor implementation that will setup all captured variables *)
-			let cfield = match gen.gcurrent_classfield with
-				| None -> "Anon"
-				| Some cf -> cf.cf_name
-			in
-			let cur_line = Lexer.get_error_line fexpr.epos in
-			let path = (fst gen.gcurrent_path, Printf.sprintf "%s_%s_%d__Fun" (snd gen.gcurrent_path) cfield cur_line) in
-			let cls = mk_class (get gen.gcurrent_class).cl_module path tfunc.tf_expr.epos in
-			if in_unsafe then cls.cl_meta <- (Meta.Unsafe,[],null_pos) :: cls.cl_meta;
-
-			if Common.defined gen.gcon Define.EraseGenerics then begin
-				cls.cl_meta <- (Meta.HaxeGeneric,[],null_pos) :: cls.cl_meta
-			end;
-			cls.cl_module <- (get gen.gcurrent_class).cl_module;
-			cls.cl_params <- cltypes;
-
-			let mk_this v pos =
-				{
-					(mk_field_access gen { eexpr = TConst TThis; etype = TInst(cls, List.map snd cls.cl_params); epos = pos } v.v_name pos)
-					with etype = v.v_type
-				}
-			in
-
-			let mk_this_assign v pos =
-			{
-				eexpr = TBinop(OpAssign, mk_this v pos, { eexpr = TLocal(v); etype = v.v_type; epos = pos });
-				etype = v.v_type;
-				epos = pos
-			} in
-
-			(* mk_class_field name t public pos kind params *)
-			let ctor_args, ctor_sig, ctor_exprs = List.fold_left (fun (ctor_args, ctor_sig, ctor_exprs) lexpr ->
-				match lexpr.eexpr with
-					| TLocal(v) ->
-						let cf = mk_class_field v.v_name v.v_type false lexpr.epos (Var({ v_read = AccNormal; v_write = AccNormal; })) [] in
-						cls.cl_fields <- PMap.add v.v_name cf cls.cl_fields;
-						cls.cl_ordered_fields <- cf :: cls.cl_ordered_fields;
-
-						let ctor_v = alloc_var v.v_name v.v_type in
-						((ctor_v, None) :: ctor_args, (v.v_name, false, v.v_type) :: ctor_sig, (mk_this_assign v cls.cl_pos) :: ctor_exprs)
-					| _ -> assert false
-			) ([],[],[]) captured in
-
-			(* change all captured variables to this.capturedVariable *)
-			let rec change_captured e =
-				match e.eexpr with
-					| TLocal( ({ v_capture = true }) as v ) when Hashtbl.mem captured_ht v.v_id ->
-						mk_this v e.epos
-					| _ -> Type.map_expr change_captured e
-			in
-			let func_expr = change_captured tfunc.tf_expr in
-
-			let invokecf, invoke_field, super_args = match delegate_type with
-				| None -> (* no delegate *)
-					let ifield, sa = ft.closure_to_classfield { tfunc with tf_expr = func_expr } fexpr.etype fexpr.epos in
-					ifield,ifield,sa
-				| Some _ ->
-					let pos = cls.cl_pos in
-					let cf = mk_class_field "Delegate" (TFun(fun_args tfunc.tf_args, tfunc.tf_type)) true pos (Method MethNormal) [] in
-					cf.cf_expr <- Some { fexpr with eexpr = TFunction { tfunc with tf_expr = func_expr }; };
-					cf.cf_meta <- (Meta.Final,[],pos) :: cf.cf_meta;
-					cls.cl_ordered_fields <- cf :: cls.cl_ordered_fields;
-					cls.cl_fields <- PMap.add cf.cf_name cf cls.cl_fields;
-					(* invoke function body: call Delegate function *)
-					let ibody = {
-						eexpr = TCall({
-							eexpr = TField({
-								eexpr = TConst TThis;
-								etype = TInst(cls, List.map snd cls.cl_params);
-								epos = pos;
-							}, FInstance(cls, List.map snd cls.cl_params, cf));
-							etype = cf.cf_type;
-							epos = pos;
-						}, List.map (fun (v,_) -> mk_local v pos) tfunc.tf_args);
-						etype = tfunc.tf_type;
-						epos = pos
-					} in
-					let ibody = if not (ExtType.is_void tfunc.tf_type) then
-						{ ibody with eexpr = TReturn( Some ibody ) }
-					else
-						ibody
-					in
-					let ifield, sa = ft.closure_to_classfield { tfunc with tf_expr = ibody } fexpr.etype fexpr.epos in
-					cf,ifield,sa
-			in
-
-			(* create the constructor *)
-			(* todo properly abstract how type var is set *)
-
-			cls.cl_super <- Some(ft.func_class, []);
-			let pos = cls.cl_pos in
-			let super_call =
-			{
-				eexpr = TCall({ eexpr = TConst(TSuper); etype = TInst(ft.func_class,[]); epos = pos }, super_args);
-				etype = gen.gcon.basic.tvoid;
-				epos = pos;
-			} in
-
-			let ctor_type = (TFun(ctor_sig, gen.gcon.basic.tvoid)) in
-			let ctor = mk_class_field "new" ctor_type true cls.cl_pos (Method(MethNormal)) [] in
-			ctor.cf_expr <- Some(
-			{
-				eexpr = TFunction(
-				{
-					tf_args = ctor_args;
-					tf_type = gen.gcon.basic.tvoid;
-					tf_expr = { eexpr = TBlock(super_call :: ctor_exprs); etype = gen.gcon.basic.tvoid; epos = cls.cl_pos }
-				});
-				etype = ctor_type;
-				epos = cls.cl_pos;
-			});
-			cls.cl_constructor <- Some(ctor);
-
-			(* add invoke function to the class *)
-			cls.cl_ordered_fields <- invoke_field :: cls.cl_ordered_fields;
-			cls.cl_fields <- PMap.add invoke_field.cf_name invoke_field cls.cl_fields;
-			cls.cl_overrides <- invoke_field :: cls.cl_overrides;
-
-			gen.gadd_to_module (TClassDecl cls) priority;
-
-			(* if there are no captured variables, we can create a cache so subsequent calls don't need to create a new function *)
-			let expr, clscapt =
-				match captured, tparams with
-				| [], [] ->
-					let cache_var = gen.gmk_internal_name "hx" "current" in
-					let cache_cf = mk_class_field cache_var (TInst(cls,[])) false func_expr.epos (Var({ v_read = AccNormal; v_write = AccNormal })) [] in
-					cls.cl_ordered_statics <- cache_cf :: cls.cl_ordered_statics;
-					cls.cl_statics <- PMap.add cache_var cache_cf cls.cl_statics;
-
-					(* if (FuncClass.hx_current != null) FuncClass.hx_current; else (FuncClass.hx_current = new FuncClass()); *)
-
-					(* let mk_static_field_access cl field fieldt pos = *)
-					let hx_current = mk_static_field_access cls cache_var (TInst(cls,[])) func_expr.epos in
-
-					let pos = func_expr.epos in
-					{ fexpr with
-						etype = hx_current.etype;
-						eexpr = TIf(
-							{
-								eexpr = TBinop(OpNotEq, hx_current, null (TInst(cls,[])) pos);
-								etype = gen.gcon.basic.tbool;
-								epos = pos;
-							},
-							hx_current,
-							Some(
-							{
-								eexpr = TBinop(OpAssign, hx_current, { fexpr with eexpr = TNew(cls, [], captured) });
-								etype = (TInst(cls,[]));
-								epos = pos;
-							}))
-					}, (cls,captured)
-				| _ ->
-					(* change the expression so it will be a new "added class" ( captured variables arguments ) *)
-					{ fexpr with eexpr = TNew(cls, List.map (fun cl -> TInst(cl,[])) tparams, List.rev captured) }, (cls,captured)
-			in
-			match delegate_type with
-			| None ->
-				expr,clscapt
-			| Some _ ->
-				{
-					eexpr = TField(expr, FClosure(Some (cls,[]),invokecf)); (* TODO: FClosure change *)
-					etype = invokecf.cf_type;
-					epos = cls.cl_pos
-				}, clscapt
-		in
-
-		let tvar_to_cdecl = Hashtbl.create 0 in
-
-		let run = traverse
-			gen
-			~tparam_anon_decl:(fun v e fn ->
-				let _, info = handle_anon_func e fn null_map_info None in
-				Hashtbl.add tvar_to_cdecl v.v_id info
-			)
-			~tparam_anon_acc:(fun v e -> try
-				let cls, captured = Hashtbl.find tvar_to_cdecl v.v_id in
-				let captured = List.sort (fun e1 e2 -> match e1, e2 with
-					| { eexpr = TLocal v1 }, { eexpr = TLocal v2 } ->
-						compare v1.v_name v2.v_name
-					| _ -> assert false) captured
-				in
-				let types = match v.v_extra with
-					| Some(t,_) -> t
-					| _ -> assert false
-				in
-				let monos = List.map (fun _ -> mk_mono()) types in
-				let vt = match follow v.v_type with
-					| TInst(_, [v]) -> v
-					| v -> v
-				in
-				let et = match follow e.etype with
-					| TInst(_, [v]) -> v
-					| v -> v
-				in
-				let original = apply_params types monos vt in
-				unify et original;
-
-				let monos = List.map (fun t -> apply_params types (List.map (fun _ -> t_dynamic) types) t) monos in
-
-				let same_cl t1 t2 = match follow t1, follow t2 with
-					| TInst(c,_), TInst(c2,_) -> c == c2
-					| _ -> false
-				in
-				let passoc = List.map2 (fun (_,t) m -> t,m) types monos in
-				let cltparams = List.map (fun (_,t) ->
-					try
-						snd (List.find (fun (t2,_) -> same_cl t t2) passoc)
-					with | Not_found -> t) cls.cl_params
-				in
-				{ e with eexpr = TNew(cls, cltparams, List.rev captured) }
-			with
-				| Not_found ->
-				gen.gcon.warning "This expression may be invalid" e.epos;
-				e
-				| Unify_error el ->
-					List.iter (fun el -> gen.gcon.warning (Error.unify_error_msg (print_context()) el) e.epos) el;
-				gen.gcon.warning "This expression may be invalid" e.epos;
-				e
-			)
-			(* (handle_anon_func:texpr->tfunc->texpr) (dynamic_func_call:texpr->texpr->texpr list->texpr) *)
-			(fun e f info delegate_type -> fst (handle_anon_func e f info delegate_type))
-			ft.dynamic_fun_call
-			(* (dynamic_func_call:texpr->texpr->texpr list->texpr) *)
-		in
-		let map e = Some(run e) in
-		gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map
-
-
-	(*
-		this submodule will provide the default implementation for the C# and Java targets.
-
-		it will have two return types: double and dynamic, and
-	*)
-	module DoubleAndDynamicClosureImpl =
-	struct
-		let get_ctx gen parent_func_class max_arity (* e.g. new haxe.lang.ClassClosure *) =
-			let basic = gen.gcon.basic in
-
-			let func_args_i i =
-				let rec loop i (acc) =
-					if i = 0 then (acc) else begin
-						let vfloat = alloc_var (gen.gmk_internal_name "fn" ("float" ^ string_of_int i)) basic.tfloat in
-						let vdyn = alloc_var (gen.gmk_internal_name "fn" ("dyn" ^ string_of_int i)) t_dynamic in
-
-						loop (i - 1) ((vfloat, None) :: (vdyn, None) :: acc)
-					end
-				in
-				loop i []
-			in
-
-			let args_real_to_func args =
-				let arity = List.length args in
-				if arity >= max_arity then
-					[ alloc_var (gen.gmk_internal_name "fn" "dynargs") (basic.tarray t_dynamic), None ]
-				else func_args_i arity
-			in
-
-			let func_sig_i i =
-				let rec loop i acc =
-					if i = 0 then acc else begin
-						let vfloat = gen.gmk_internal_name "fn" ("float" ^ string_of_int i) in
-						let vdyn = gen.gmk_internal_name "fn" ("dyn" ^ string_of_int i) in
-
-						loop (i - 1) ( (vfloat,false,basic.tfloat) :: (vdyn,false,t_dynamic) :: acc )
-					end
-				in
-				loop i []
-			in
-
-			let args_real_to_func_sig args =
-				let arity = List.length args in
-				if arity >= max_arity then
-					[gen.gmk_internal_name "fn" "dynargs", false, basic.tarray t_dynamic]
-				else begin
-					func_sig_i arity
-				end
-			in
-
-			let rettype_real_to_func t = match run_follow gen t with
-				| TType({ t_path = [],"Null" }, _) ->
-					0,t_dynamic
-				| _ when like_float t && not (like_i64 t) ->
-					(1, basic.tfloat)
-				| _ ->
-					(0, t_dynamic)
-			in
-
-			let args_real_to_func_call el (pos:pos) =
-				if List.length el >= max_arity then
-					[{ eexpr = TArrayDecl el; etype = basic.tarray t_dynamic; epos = pos }]
-				else begin
-					List.fold_left (fun acc e ->
-						if like_float (gen.greal_type e.etype) && not (like_i64 (gen.greal_type e.etype)) then
-							( e :: undefined e.epos :: acc )
-						else
-							( null basic.tfloat e.epos :: e :: acc )
-					) ([]) (List.rev el)
-				end
-			in
-
-			let const_type c def =
-				match c with
-				| TString _ -> basic.tstring
-				| TInt _ -> basic.tint
-				| TFloat _ -> basic.tfloat
-				| TBool _ -> basic.tbool
-				| _ -> def
-			in
-
-			let get_args_func args changed_args pos =
-				let arity = List.length args in
-				let mk_const const elocal t =
-					match const with
-					| None ->
-						mk_cast t elocal
-					| Some const ->
-						{ eexpr = TIf(
-							{ elocal with eexpr = TBinop(Ast.OpEq, elocal, null elocal.etype elocal.epos); etype = basic.tbool },
-							{ elocal with eexpr = TConst(const); etype = const_type const t },
-							Some ( mk_cast t elocal )
-						); etype = t; epos = elocal.epos }
-				in
-
-				if arity >= max_arity then begin
-					let varray = match changed_args with | [v,_] -> v | _ -> assert false in
-					let varray_local = mk_local varray pos in
-					let mk_varray i = { eexpr = TArray(varray_local, { eexpr = TConst(TInt(Int32.of_int i)); etype = basic.tint; epos = pos }); etype = t_dynamic; epos = pos } in
-
-					snd (List.fold_left (fun (count,acc) (v,const) ->
-						(count + 1, (mk (TVar(v, Some(mk_const const (mk_varray count) v.v_type))) basic.tvoid pos) :: acc)
-					) (0,[]) args)
-				end else begin
-					let _, dyn_args, float_args = List.fold_left (fun (count,fargs, dargs) arg ->
-						if count land 1 = 0 then
-							(count + 1, fargs, arg :: dargs)
-						else
-							(count + 1, arg :: fargs, dargs)
-					) (1,[],[]) (List.rev changed_args) in
-
-					let rec loop acc args fargs dargs =
-						match args, fargs, dargs with
-							| [], [], [] -> acc
-							| (v,const) :: args, (vf,_) :: fargs, (vd,_) :: dargs ->
-								let acc = { eexpr = TVar(v, Some(
-									{
-										eexpr = TIf(
-											{ eexpr = TBinop(Ast.OpEq, mk_local vd pos, undefined pos); etype = basic.tbool; epos = pos },
-											mk_cast v.v_type (mk_local vf pos),
-											Some ( mk_const const (mk_local vd pos) v.v_type )
-										);
-										etype = v.v_type;
-										epos = pos
-									} )); etype = basic.tvoid; epos = pos } :: acc in
-								loop acc args fargs dargs
-							| _ -> assert false
-					in
-
-					loop [] args float_args dyn_args
-				end
-			in
-
-			let closure_to_classfield tfunc old_sig pos =
-				(* change function signature *)
-				let old_args = tfunc.tf_args in
-				let changed_args = args_real_to_func old_args in
-
-				(*
-					FIXME properly handle int64 cases, which will break here (because of inference to int)
-					UPDATE: the fix will be that Int64 won't be a typedef to Float/Int
-				*)
-				let changed_sig, arity, type_number, changed_sig_ret, is_void, is_dynamic_func = match follow old_sig with
-					| TFun(_sig, ret) ->
-						let type_n, ret_t = rettype_real_to_func ret in
-						let arity = List.length _sig in
-						let is_dynamic_func = arity >= max_arity in
-						let ret_t = if is_dynamic_func then t_dynamic else ret_t in
-
-						(TFun(args_real_to_func_sig _sig, ret_t), arity, type_n, ret_t, ExtType.is_void ret, is_dynamic_func)
-					| _ -> (print_endline (s_type (print_context()) (follow old_sig) )); assert false
-				in
-
-				let tf_expr = if is_void then begin
-					let rec map e =
-						match e.eexpr with
-							| TReturn None -> { e with eexpr = TReturn (Some (null t_dynamic e.epos)) }
-							| _ -> Type.map_expr map e
-					in
-					let e = mk_block (map tfunc.tf_expr) in
-					match e.eexpr with
-						| TBlock(bl) ->
-							{ e with eexpr = TBlock(bl @ [{ eexpr = TReturn (Some (null t_dynamic e.epos)); etype = t_dynamic; epos = e.epos }]) }
-						| _ -> assert false
-				end else tfunc.tf_expr in
-
-				let changed_sig_ret = if is_dynamic_func then t_dynamic else changed_sig_ret in
-
-				(* get real arguments on top of function body *)
-				let get_args = get_args_func tfunc.tf_args changed_args pos in
-				(*
-					FIXME HACK: in order to be able to run the filters that have already ran for this piece of code,
-					we will cheat and run it as if it was the whole code
-					We could just make ClosuresToClass run before TArrayTransform, but we cannot because of the
-					dependency between ClosuresToClass (after DynamicFieldAccess, and before TArrayTransform)
-
-					maybe a way to solve this would be to add an "until" field to run_from
-				*)
-				let real_get_args = gen.gexpr_filters#run_f { eexpr = TBlock(get_args); etype = basic.tvoid; epos = pos } in
-
-				let func_expr = Type.concat real_get_args tf_expr in
-
-				(* set invoke function *)
-				(* todo properly abstract how naming for invoke is made *)
-				let invoke_name = if is_dynamic_func then "invokeDynamic" else ("invoke" ^ (string_of_int arity) ^ (if type_number = 0 then "_o" else "_f")) in
-				let invoke_name = gen.gmk_internal_name "hx" invoke_name in
-				let invoke_field = mk_class_field invoke_name changed_sig false func_expr.epos (Method(MethNormal)) [] in
-				let invoke_fun = {
-					eexpr = TFunction {
-						tf_args = changed_args;
-						tf_type = changed_sig_ret;
-						tf_expr = func_expr;
-					};
-					etype = changed_sig;
-					epos = func_expr.epos;
-				} in
-				invoke_field.cf_expr <- Some invoke_fun;
-
-				invoke_field, [
-					ExprBuilder.make_int gen.gcon arity pos;
-					ExprBuilder.make_int gen.gcon type_number pos;
-				]
-			in
-
-			let dynamic_fun_call call_expr =
-				let tc, params = match call_expr.eexpr with
-					| TCall(tc, params) -> tc, params
-					| _ -> assert false
-				in
-				let ct = gen.greal_type call_expr.etype in
-				let postfix, ret_t =
-					if like_float ct && not (like_i64 ct) then
-							"_f", gen.gcon.basic.tfloat
-					else
-						"_o", t_dynamic
-				in
-				let params_len = List.length params in
-				let ret_t = if params_len >= max_arity then t_dynamic else ret_t in
-
-				let invoke_fun = if params_len >= max_arity then "invokeDynamic" else "invoke" ^ (string_of_int params_len) ^ postfix in
-				let invoke_fun = gen.gmk_internal_name "hx" invoke_fun in
-				let fun_t = match follow tc.etype with
-					| TFun(_sig, _) ->
-						TFun(args_real_to_func_sig _sig, ret_t)
-					| _ ->
-						let i = ref 0 in
-						let _sig = List.map (fun p -> let name = "arg" ^ (string_of_int !i) in incr i; (name,false,p.etype) ) params in
-						TFun(args_real_to_func_sig _sig, ret_t)
-				in
-
-				let may_cast = match follow call_expr.etype with
-					| TAbstract ({ a_path = ([], "Void") },[]) -> (fun e -> e)
-					| _ -> mk_cast call_expr.etype
-				in
-
-				may_cast
-				{
-					eexpr = TCall(
-						{ (mk_field_access gen { tc with etype = gen.greal_type tc.etype } invoke_fun tc.epos) with etype = fun_t },
-						args_real_to_func_call params call_expr.epos
-					);
-					etype = ret_t;
-					epos = call_expr.epos
-				}
-			in
-
-			let iname i is_float =
-				let postfix = if is_float then "_f" else "_o" in
-				gen.gmk_internal_name "hx" ("invoke" ^ string_of_int i) ^ postfix
-			in
-
-			let map_base_classfields cl map_fn =
-				let pos = cl.cl_pos in
-				let this_t = TInst(cl,List.map snd cl.cl_params) in
-				let this = { eexpr = TConst(TThis); etype = this_t; epos = pos } in
-				let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
-
-				let mk_invoke_i i is_float =
-					let cf = mk_class_field (iname i is_float) (TFun(func_sig_i i, if is_float then basic.tfloat else t_dynamic)) false pos (Method MethNormal) [] in
-					cf
-				in
-
-				let type_name = gen.gmk_internal_name "fn" "type" in
-				let dynamic_arg = alloc_var (gen.gmk_internal_name "fn" "dynargs") (basic.tarray t_dynamic) in
-
-				let mk_invoke_complete_i i is_float =
-
-					(* let arity = i in *)
-					let args = func_args_i i in
-
-					(* api fn *)
-
-					(* only cast if needed *)
-					let mk_cast tto efrom = gen.ghandle_cast (gen.greal_type tto) (gen.greal_type efrom.etype) efrom in
-					let api i t const =
-						let vf, _ = List.nth args (i * 2) in
-						let vo, _ = List.nth args (i * 2 + 1) in
-
-						let needs_cast, is_float = match t, like_float t && not (like_i64 t) with
-							| TAbstract({ a_path = ([], "Float") },[]), _ -> false, true
-							| _, true -> true, true
-							| _ -> false,false
-						in
-
-						let olocal = mk_local vo pos in
-						let flocal = mk_local vf pos in
-
-						let get_from_obj e = match const with
-							| None -> mk_cast t e
-							| Some tc ->
-								{
-									eexpr = TIf(
-										{ eexpr = TBinop(Ast.OpEq, olocal, null t_dynamic pos); etype = basic.tbool; epos = pos } ,
-										{ eexpr = TConst(tc); etype = t; epos = pos },
-										Some (mk_cast t e)
-									);
-									etype = t;
-									epos = pos;
-								}
-						in
-
-						{
-							eexpr = TIf(
-								{ eexpr = TBinop(Ast.OpEq, olocal, undefined pos); etype = basic.tbool; epos = pos },
-								(if needs_cast then mk_cast t flocal else flocal),
-								Some ( get_from_obj olocal )
-							);
-							etype = t;
-							epos = pos
-						}
-					in
-					(* end of api fn *)
-
-					let ret = if is_float then basic.tfloat else t_dynamic in
-
-					let fn_expr = map_fn i ret (List.map fst args) api in
-
-					let t = TFun(fun_args args, ret) in
-
-					let tfunction =
-						{
-							eexpr = TFunction({
-								tf_args = args;
-								tf_type = ret;
-								tf_expr =
-								mk_block fn_expr
-							});
-							etype = t;
-							epos = pos;
-						}
-					in
-
-					let cf = mk_invoke_i i is_float in
-					cf.cf_expr <- Some tfunction;
-					cf
-				in
-
-				let rec loop i cfs =
-					if i < 0 then cfs else begin
-						(*let mk_invoke_complete_i i is_float =*)
-						(mk_invoke_complete_i i false) :: (mk_invoke_complete_i i true) :: (loop (i-1) cfs)
-					end
-				in
-
-				let cfs = loop max_arity [] in
-
-				let switch =
-					let api i t const =
-						match i with
-							| -1 ->
-								mk_local dynamic_arg pos
-							| _ ->
-								mk_cast t {
-									eexpr = TArray(
-										mk_local dynamic_arg pos,
-										{ eexpr = TConst(TInt(Int32.of_int i)); etype = basic.tint; epos = pos });
-									etype = t;
-									epos = pos;
-								}
-					in
-					map_fn (-1) t_dynamic [dynamic_arg] api
-				in
-
-				let args = [dynamic_arg, None] in
-				let dyn_t = TFun(fun_args args, t_dynamic) in
-				let dyn_cf = mk_class_field (gen.gmk_internal_name "hx" "invokeDynamic") dyn_t false pos (Method MethNormal) [] in
-
-				dyn_cf.cf_expr <- Some {
-					eexpr = TFunction {
-						tf_args = args;
-						tf_type = t_dynamic;
-						tf_expr = mk_block switch
-					};
-					etype = dyn_t;
-					epos = pos;
-				};
-
-				let additional_cfs = begin
-					let new_t = TFun(["arity", false, basic.tint; "type", false, basic.tint],basic.tvoid) in
-					let new_cf = mk_class_field "new" (new_t) true pos (Method MethNormal) [] in
-					let v_arity, v_type = alloc_var "arity" basic.tint, alloc_var "type" basic.tint in
-					let mk_assign v field = mk (TBinop (OpAssign, mk_this field v.v_type, mk_local v pos)) v.v_type pos in
-
-					let arity_name = gen.gmk_internal_name "hx" "arity" in
-					new_cf.cf_expr <- Some {
-						eexpr = TFunction({
-							tf_args = [v_arity, None; v_type, None];
-							tf_type = basic.tvoid;
-							tf_expr =
-							{
-								eexpr = TBlock([
-									mk_assign v_type type_name;
-									mk_assign v_arity arity_name
-								]);
-								etype = basic.tvoid;
-								epos = pos;
-							}
-						});
-						etype = new_t;
-						epos = pos;
-					};
-
-					[
-						new_cf;
-						mk_class_field type_name basic.tint true pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-						mk_class_field arity_name basic.tint true pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-					]
-				end in
-
-				dyn_cf :: (additional_cfs @ cfs)
-			in
-
-			begin
-				(*
-					setup fields for the abstract implementation of the Function class
-
-					new(arity, type)
-					{
-						this.arity = arity;
-						this.type = type;
-					}
-
-					hx::invokeX_f|o (where X is from 0 to max_arity) (args)
-					{
-						if (this.type == 0|1) return invokeX_o|f(args); else throw "Invalid number of arguments."
-					}
-
-					hx::invokeDynamic, which will work in the same way
-				*)
-				let cl = parent_func_class in
-				let pos = cl.cl_pos in
-
-				let rec mk_dyn_call arity api =
-					let zero = ExprBuilder.make_float gen.gcon "0.0" pos in
-					let rec loop i acc =
-						if i = 0 then
-							acc
-						else begin
-							let arr = api (i - 1) t_dynamic None in
-							loop (i - 1) (zero :: arr :: acc)
-						end
-					in
-					loop arity []
-				in
-
-				let this = mk (TConst TThis) (TInst (cl, List.map snd cl.cl_params)) pos in
-				let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
-
-				let mk_invoke_switch i api =
-					let t = TFun (func_sig_i i, t_dynamic) in
-					(* case i: return this.invokeX_o(0, 0, 0, 0, 0, ... arg[0], args[1]....); *)
-					[ExprBuilder.make_int gen.gcon i pos], mk_return (mk (TCall(mk_this (iname i false) t, mk_dyn_call i api)) t_dynamic pos)
-				in
-				let rec loop_cases api arity acc =
-					if arity < 0 then
-						acc
-					else
-						loop_cases api (arity - 1) (mk_invoke_switch arity api :: acc)
-				in
-
-				let type_name = gen.gmk_internal_name "fn" "type" in
-				let mk_expr i is_float vars =
-					let call_expr =
-						let call_t = TFun(List.map (fun v -> (v.v_name, false, v.v_type)) vars, if is_float then t_dynamic else basic.tfloat) in
-						{
-							eexpr = TCall(mk_this (iname i (not is_float)) call_t, List.map (fun v -> mk_local v pos) vars);
-							etype = if is_float then t_dynamic else basic.tfloat;
-							epos = pos
-						}
-					in
-					{
-						eexpr = TIf(
-							mk (TBinop (Ast.OpNotEq, mk_this type_name basic.tint, (ExprBuilder.make_int gen.gcon (if is_float then 0 else 1) pos))) basic.tbool pos,
-							mk (TThrow (ExprBuilder.make_string gen.gcon "Wrong number of arguments" pos)) t_dynamic pos,
-							Some (mk_return call_expr)
-						);
-						etype = t_dynamic;
-						epos = pos;
-					}
-				in
-
-				let arities_processed = Hashtbl.create 10 in
-				let max_arity = ref 0 in
-
-				let map_fn cur_arity fun_ret_type vars (api:int->t->tconstant option->texpr) =
-					let is_float = like_float fun_ret_type && not (like_i64 fun_ret_type) in
-					match cur_arity with
-					| -1 ->
-						let dynargs = api (-1) t_dynamic None in
-
-						(* (dynargs == null) ? 0 : dynargs.length *)
-						let switch_cond = {
-							eexpr = TIf(
-								mk (TBinop (OpEq, dynargs, null dynargs.etype pos)) basic.tbool pos,
-								mk (TConst (TInt Int32.zero)) basic.tint pos,
-								Some (mk_field_access gen dynargs "length" pos));
-							etype = basic.tint;
-							epos = pos;
-						} in
-
-						{
-							eexpr = TSwitch(
-								switch_cond,
-								loop_cases api !max_arity [],
-								Some(mk (TThrow (ExprBuilder.make_string gen.gcon "Too many arguments" pos)) basic.tvoid pos));
-							etype = basic.tvoid;
-							epos = pos;
-						}
-					| _ ->
-						if not (Hashtbl.mem arities_processed cur_arity) then begin
-							Hashtbl.add arities_processed cur_arity true;
-							if cur_arity > !max_arity then max_arity := cur_arity
-						end;
-
-						mk_expr cur_arity is_float vars
-				in
-
-				let cfs = map_base_classfields cl map_fn in
-				List.iter (fun cf ->
-					if cf.cf_name = "new" then
-						parent_func_class.cl_constructor <- Some cf
-					else
-						parent_func_class.cl_fields <- PMap.add cf.cf_name cf parent_func_class.cl_fields
-				) cfs;
-				parent_func_class.cl_ordered_fields <- (List.filter (fun cf -> cf.cf_name <> "new") cfs) @ parent_func_class.cl_ordered_fields
-			end;
-
-			{
-				func_class = parent_func_class;
-				closure_to_classfield = closure_to_classfield;
-				dynamic_fun_call = dynamic_fun_call;
-				map_base_classfields = map_base_classfields;
-			}
-	end;;
-end;;
-
-
-(* ******************************************* *)
-(* Type Parameters *)
-(* ******************************************* *)
-
-(*
-
-	This module will handle type parameters. There are lots of changes we need to do to correctly support type parameters:
-
-	traverse will:
-		V Detect when parameterized function calls are made
-		* Detect when a parameterized class instance is being cast to another parameter
-		* Change new<> parameterized function calls
-		*
-
-	extras:
-		* On languages that support "real" type parameters, a Cast function is provided that will convert from a <Dynamic> to the requested type.
-			This cast will call createEmpty with the correct type, and then set each variable to the new form. Some types will be handled specially, namely the Native Array.
-			Other implementations may be delegated to the runtime.
-		* parameterized classes will implement a new interface (with only a Cast<> function added to it), so we can access the <Dynamic> type parameter for them. Also any reference to <Dynamic> will be replaced by a reference to this interface. (also on TTypeExpr - Std.is())
-		* Type parameter renaming to avoid name clash
-		* Detect type parameter casting and call Cast<> instead
-
-	for java:
-		* for specially assigned classes, parameters will be replaced by _d and _i versions of parameterized functions. This will only work for parameterized classes, not functions.
-
-	dependencies:
-		must run after casts are detected. This will be ensured at CastDetect module.
-
-*)
-
-module TypeParams =
-struct
-
-	let name = "type_params"
-
-	let priority = max_dep -. 20.
-
-	(* this function will receive the original function argument, the applied function argument and the original function parameters. *)
-	(* from this info, it will infer the applied tparams for the function *)
-	(* this function is used by CastDetection module *)
-	let infer_params gen pos (original_args:((string * bool * t) list * t)) (applied_args:((string * bool * t) list * t)) (params:(string * t) list) calls_parameters_explicitly : tparams =
-		match params with
-		| [] -> []
-		| _ ->
-			let args_list args = (if not calls_parameters_explicitly then t_dynamic else snd args) :: (List.map (fun (n,o,t) -> t) (fst args)) in
-
-			let monos = List.map (fun _ -> mk_mono()) params in
-			let original = args_list (get_fun (apply_params params monos (TFun(fst original_args,snd original_args)))) in
-			let applied = args_list applied_args in
-
-			(try
-				List.iter2 (fun a o ->
-					unify a o
-					(* type_eq EqStrict a o *)
-				) applied original
-				(* unify applied original *)
-			with | Unify_error el ->
-					(* List.iter (fun el -> gen.gcon.warning (Typecore.unify_error_msg (print_context()) el) pos) el; *)
-					gen.gcon.warning ("This expression may be invalid") pos
-		 | Invalid_argument("List.map2") ->
-					gen.gcon.warning ("This expression may be invalid") pos
-			);
-
-			List.map (fun t ->
-				match follow t with
-					| TMono _ ->	t_empty
-					| t -> t
-			) monos
-
-	(* ******************************************* *)
-	(* Real Type Parameters Module *)
-	(* ******************************************* *)
-
-	(*
-		This submodule is by now specially made for the .NET platform. There might be other targets that will
-		make use of this, but it IS very specific.
-
-		On the .NET platform, generics are real specialized classes that are JIT compiled. For this reason, we cannot
-		cast from one type parameter to another. Also there is no common type for the type parameters, so for example
-		an instance of type Array<Int> will return false for instance is Array<object> .
-
-		So we need to:
-			1. create a common interface (without type parameters) (e.g. "Array") which will only contain a __Cast<> function, which will cast from one type into another
-			2. Implement the __Cast function. This part is a little hard, as we must identify all type parameter-dependent fields contained in the class and convert them.
-			In most cases the conversion will just be to call .__Cast<>() on the instances, or just a simple cast. But when the instance is a @:nativegen type, there will be no .__Cast
-			function, and we will need to deal with this case either at compile-time (added handlers - specially for NativeArray), or at runtime (adding new runtime handlers)
-			3. traverse the AST looking for casts involving type parameters, and replace them with .__Cast<>() calls. If type is @:nativegen, throw a warning. If really casting from one type parameter to another on a @:nativegen context, throw an error.
-
-
-		special literals:
-			it will use the special literal __typehandle__ that the target must implement in order to run this. This literal is a way to get the typehandle of e.g. the type parameters,
-			so we can compare them. In C# it's the equivalent of typeof(T).TypeHandle (TypeHandle compare is faster than System.Type.Equals())
-
-		dependencies:
-			(module filter) Interface creation must run AFTER enums are converted into classes, otherwise there is no way to tell parameterized enums to implement an interface
-			Must run AFTER CastDetect. This will be ensured per CastDetect
-
-	*)
-
-	module RealTypeParams =
-	struct
-
-		let name = "real_type_params"
-
-		let priority = priority
-
-		let rec has_type_params t =
-			match follow t with
-				| TInst( { cl_kind = KTypeParameter _ }, _) -> true
-				| TAbstract(_, params)
-				| TEnum(_, params)
-				| TInst(_, params) -> List.exists (fun t -> has_type_params t) params
-				| TFun(args,ret) ->
-					List.exists (fun (n,o,t) -> has_type_params t) args || has_type_params ret
-				| _ -> false
-
-		let rec follow_all_md md =
-			let t = match md with
-				| TClassDecl { cl_kind = KAbstractImpl a } ->
-					TAbstract(a, List.map snd a.a_params)
-				| TClassDecl c ->
-					TInst(c, List.map snd c.cl_params)
-				| TEnumDecl e ->
-					TEnum(e, List.map snd e.e_params)
-				| TTypeDecl t ->
-					TType(t, List.map snd t.t_params)
-				| TAbstractDecl a ->
-					TAbstract(a, List.map snd a.a_params)
-			in
-			Abstract.follow_with_abstracts t
-
-		let rec is_hxgeneric md =
-			match md with
-			| TClassDecl { cl_kind = KAbstractImpl a } ->
-				is_hxgeneric (TAbstractDecl a)
-			| TClassDecl(cl) ->
-				not (Meta.has Meta.NativeGeneric cl.cl_meta)
-			| TEnumDecl(e) ->
-				not (Meta.has Meta.NativeGeneric e.e_meta)
-			| TAbstractDecl(a) when Meta.has Meta.NativeGeneric a.a_meta ->
-				not (Meta.has Meta.NativeGeneric a.a_meta)
-			| md -> match follow_all_md md with
-				| TInst(cl,_) -> is_hxgeneric (TClassDecl cl)
-				| TEnum(e,_) -> is_hxgeneric (TEnumDecl e)
-				| TAbstract(a,_) -> not (Meta.has Meta.NativeGeneric a.a_meta)
-				| _ -> true
-
-		let rec set_hxgeneric gen mds isfirst md =
-			let path = t_path md in
-			if List.exists (fun m -> path = t_path m) mds then begin
-				if isfirst then
-					None (* we still can't determine *)
-				else
-					Some true (* if we're in second pass and still can't determine, it's because it can be hxgeneric *)
-			end else begin
-				let has_unresolved = ref false in
-				let is_false v =
-					match v with
-						| Some false -> true
-						| None -> has_unresolved := true; false
-						| Some true -> false
-				in
-
-				let mds = md :: mds in
-				match md with
-					| TClassDecl(cl)	->
-						(* first see if any meta is present (already processed) *)
-						if Meta.has Meta.NativeGeneric cl.cl_meta then
-							Some false
-						else if Meta.has Meta.HaxeGeneric cl.cl_meta then
-							Some true
-						else if cl.cl_params = [] && is_hxgen md then
-							(cl.cl_meta <- (Meta.HaxeGeneric,[],cl.cl_pos) :: cl.cl_meta;
-							Some true)
-						else if cl.cl_params = [] then
-							(cl.cl_meta <- (Meta.NativeGeneric, [], cl.cl_pos) :: cl.cl_meta;
-							Some false)
-						else if not (is_hxgen md) then
-							(cl.cl_meta <- (Meta.NativeGeneric, [], cl.cl_pos) :: cl.cl_meta;
-							Some false)
-						else begin
-							(*
-								if it's not present, see if any superclass is nativegeneric.
-								nativegeneric is inherited, while hxgeneric can be later changed to nativegeneric
-							*)
-							(* on the first pass, our job is to find any evidence that makes it not be hxgeneric. Otherwise it will be hxgeneric *)
-							match cl.cl_super with
-								| Some (c,_) when is_false (set_hxgeneric gen mds isfirst (TClassDecl c)) ->
-									cl.cl_meta <- (Meta.NativeGeneric, [], cl.cl_pos) :: cl.cl_meta;
-									Some false
-								| _ ->
-									(* see if it's a generic class *)
-									match cl.cl_params with
-										| [] ->
-											(* if it's not, then it will follow hxgen *)
-											if is_hxgen (TClassDecl cl) then
-												cl.cl_meta <- (Meta.HaxeGeneric, [], cl.cl_pos) :: cl.cl_meta
-											else
-												cl.cl_meta <- (Meta.NativeGeneric, [], cl.cl_pos) :: cl.cl_meta;
-											Some true
-										| _ ->
-											(* if it is, loop through all fields + statics and look for non-hxgeneric
-												generic classes that have KTypeParameter as params *)
-											let rec loop cfs =
-												match cfs with
-													| [] -> false
-													| cf :: cfs ->
-														let t = follow (gen.greal_type cf.cf_type) in
-														match t with
-															| TInst( { cl_kind = KTypeParameter _ }, _ ) -> loop cfs
-															| TInst(cl,p) when has_type_params t && is_false (set_hxgeneric gen mds isfirst (TClassDecl cl)) ->
-																if not (Hashtbl.mem gen.gtparam_cast cl.cl_path) then true else loop cfs
-															| TEnum(e,p) when has_type_params t && is_false (set_hxgeneric gen mds isfirst (TEnumDecl e)) ->
-																if not (Hashtbl.mem gen.gtparam_cast e.e_path) then true else loop cfs
-															| _ -> loop cfs (* TAbstracts / Dynamics can't be generic *)
-											in
-											if loop cl.cl_ordered_fields then begin
-												cl.cl_meta <- (Meta.NativeGeneric, [], cl.cl_pos) :: cl.cl_meta;
-												Some false
-											end else if isfirst && !has_unresolved then
-												None
-											else begin
-												cl.cl_meta <- (Meta.HaxeGeneric, [], cl.cl_pos) :: cl.cl_meta;
-												Some true
-											end
-						end
-					| TEnumDecl e ->
-						if Meta.has Meta.NativeGeneric e.e_meta then
-							Some false
-						else if Meta.has Meta.HaxeGeneric e.e_meta then
-							Some true
-						else if not (is_hxgen (TEnumDecl e)) then begin
-							e.e_meta <- (Meta.NativeGeneric, [], e.e_pos) :: e.e_meta;
-							Some false
-						end else begin
-							(* if enum is not generic, then it's hxgeneric *)
-							match e.e_params with
-								| [] ->
-									e.e_meta <- (Meta.HaxeGeneric, [], e.e_pos) :: e.e_meta;
-									Some true
-								| _ ->
-									let rec loop efs =
-										match efs with
-											| [] -> false
-											| ef :: efs ->
-												let t = follow (gen.greal_type ef.ef_type) in
-												match t with
-													| TFun(args, _) ->
-														if List.exists (fun (n,o,t) ->
-															let t = follow t in
-															match t with
-																| TInst( { cl_kind = KTypeParameter _ }, _ ) ->
-																	false
-																| TInst(cl,p) when has_type_params t && is_false (set_hxgeneric gen mds isfirst (TClassDecl cl)) ->
-																	not (Hashtbl.mem gen.gtparam_cast cl.cl_path)
-																| TEnum(e,p) when has_type_params t && is_false (set_hxgeneric gen mds isfirst (TEnumDecl e)) ->
-																	not (Hashtbl.mem gen.gtparam_cast e.e_path)
-																| _ -> false
-														) args then
-															true
-														else
-															loop efs
-													| _ -> loop efs
-									in
-									let efs = PMap.fold (fun ef acc -> ef :: acc) e.e_constrs [] in
-									if loop efs then begin
-										e.e_meta <- (Meta.NativeGeneric, [], e.e_pos) :: e.e_meta;
-										Some false
-									end else if isfirst && !has_unresolved then
-										None
-									else begin
-										e.e_meta <- (Meta.HaxeGeneric, [], e.e_pos) :: e.e_meta;
-										Some true
-									end
-						end
-					| _ -> assert false
-			end
-
-		let set_hxgeneric gen md =
-			let ret = match md with
-				| TClassDecl { cl_kind = KAbstractImpl a } -> (match follow_all_md md with
-					| (TInst _ | TEnum _ as t) -> (
-						let md = match t with
-							| TInst(cl,_) -> TClassDecl cl
-							| TEnum(e,_) -> TEnumDecl e
-							| _ -> assert false
-						in
-						let ret = set_hxgeneric gen [] true md in
-						if ret = None then get (set_hxgeneric gen [] false md) else get ret)
-					| TAbstract(a,_) -> true
-					| _ -> true)
-				| _ -> match set_hxgeneric gen [] true md with
-					| None ->
-						get (set_hxgeneric gen [] false md)
-					| Some v ->
-						v
-			in
-			if not ret then begin
-				match md with
-				| TClassDecl c ->
-					let set_hxgeneric (_,param) = match follow param with
-						| TInst(c,_) ->
-							c.cl_meta <- (Meta.NativeGeneric, [], c.cl_pos) :: c.cl_meta
-						| _ -> ()
-					in
-					List.iter set_hxgeneric c.cl_params;
-					let rec handle_field cf =
-						List.iter set_hxgeneric cf.cf_params;
-						List.iter handle_field cf.cf_overloads
-					in
-					(match c.cl_kind with
-						| KAbstractImpl a ->
-							List.iter set_hxgeneric a.a_params;
-						| _ -> ());
-					List.iter handle_field c.cl_ordered_fields;
-					List.iter handle_field c.cl_ordered_statics
-				| _ -> ()
-			end;
-			ret
-
-		let params_has_tparams params =
-			List.fold_left (fun acc t -> acc || has_type_params t) false params
-
-		(* ******************************************* *)
-		(* RealTypeParamsModf *)
-		(* ******************************************* *)
-
-		(*
-
-			This is the module filter of Real Type Parameters. It will traverse through all types and look for hxgeneric classes (only classes).
-			When found, a parameterless interface will be created and associated via the "ifaces" Hashtbl to the original class.
-			Also a "cast" function will be automatically generated which will handle unsafe downcasts to more specific type parameters (necessary for serialization)
-
-			dependencies:
-				Anything that may create hxgeneric classes must run before it.
-				Should run before ReflectionCFs (this dependency will be added to ReflectionCFs), so the added interfaces also get to be real IHxObject's
-
-		*)
-
-		module RealTypeParamsModf =
-		struct
-
-			let set_only_hxgeneric gen =
-				let rec run md =
-					match md with
-						| TTypeDecl _ | TAbstractDecl _ -> md
-						| _ -> ignore (set_hxgeneric gen md); md
-				in
-				run
-
-			let name = "real_type_params_modf"
-
-			let priority = solve_deps name []
-
-			let rec get_fields gen cl params_cl params_cf acc =
-				let fields = List.fold_left (fun acc cf ->
-					match follow (gen.greal_type (gen.gfollow#run_f (cf.cf_type))) with
-						| TInst(cli, ((_ :: _) as p)) when (not (is_hxgeneric (TClassDecl cli))) && params_has_tparams p ->
-							(cf, apply_params cl.cl_params params_cl cf.cf_type, apply_params cl.cl_params params_cf cf.cf_type) :: acc
-						| TEnum(e, ((_ :: _) as p)) when not (is_hxgeneric (TEnumDecl e)) && params_has_tparams p ->
-							(cf, apply_params cl.cl_params params_cl cf.cf_type, apply_params cl.cl_params params_cf cf.cf_type) :: acc
-						| _ -> acc
-				) [] cl.cl_ordered_fields in
-				match cl.cl_super with
-					| Some(cs, tls) ->
-						get_fields gen cs (List.map (apply_params cl.cl_params params_cl) tls) (List.map (apply_params cl.cl_params params_cf) tls) (fields @ acc)
-					| None -> (fields @ acc)
-
-			let get_cast_name cl = String.concat "_" ((fst cl.cl_path) @ [snd cl.cl_path; "cast"]) (* explicitly define it *)
-
-			(* overrides all needed cast functions from super classes / interfaces to call the new cast function *)
-			let create_stub_casts gen cl cast_cfield =
-				(* go through superclasses and interfaces *)
-				let p = cl.cl_pos in
-				let this = { eexpr = TConst TThis; etype = (TInst(cl, List.map snd cl.cl_params)); epos = p } in
-
-				let rec loop cls tls level reverse_params =
-					if (level <> 0 || cls.cl_interface) && tls <> [] && is_hxgeneric (TClassDecl cls) then begin
-						let cparams = List.map (fun (s,t) -> (s, TInst (map_param (get_cl_t t), []))) cls.cl_params in
-						let name = get_cast_name cls in
-						if not (PMap.mem name cl.cl_fields) then begin
-							let reverse_params = List.map (apply_params cls.cl_params (List.map snd cparams)) reverse_params in
-							let cfield = mk_class_field name (TFun([], t_dynamic)) false cl.cl_pos (Method MethNormal) cparams in
-							let field = { eexpr = TField(this, FInstance(cl,List.map snd cl.cl_params, cast_cfield)); etype = apply_params cast_cfield.cf_params reverse_params cast_cfield.cf_type; epos = p } in
-							let call =
-							{
-								eexpr = TCall(field, []);
-								etype = t_dynamic;
-								epos = p;
-							} in
-							let call = gen.gparam_func_call call field reverse_params [] in
-							let delay () =
-								cfield.cf_expr <-
-								Some {
-									eexpr = TFunction(
-									{
-										tf_args = [];
-										tf_type = t_dynamic;
-										tf_expr =
-										{
-											eexpr = TReturn( Some call );
-											etype = t_dynamic;
-											epos = p;
-										}
-									});
-									etype = cfield.cf_type;
-									epos = p;
-								}
-							in
-							gen.gafter_filters_ended <- delay :: gen.gafter_filters_ended; (* do not let filters alter this expression content *)
-							cl.cl_ordered_fields <- cfield :: cl.cl_ordered_fields;
-							cl.cl_fields <- PMap.add cfield.cf_name cfield cl.cl_fields;
-							if level <> 0 then cl.cl_overrides <- cfield :: cl.cl_overrides
-						end
-					end;
-					let get_reverse super supertl =
-						let kv = List.map2 (fun (_,tparam) applied -> (follow applied, follow tparam)) super.cl_params supertl in
-						List.map (fun t ->
-							try
-								List.assq (follow t) kv
-							with | Not_found -> t
-						) reverse_params
-					in
-					(match cls.cl_super with
-					| None -> ()
-					| Some(super, supertl) ->
-						loop super supertl (level + 1) (get_reverse super supertl));
-					List.iter (fun (iface, ifacetl) ->
-						loop iface ifacetl level (get_reverse iface ifacetl)
-					) cls.cl_implements
-				in
-				loop cl (List.map snd cl.cl_params) 0 (List.map snd cl.cl_params)
-
-			(*
-				Creates a cast classfield, with the desired name
-
-				Will also look for previous cast() definitions and override them, to reflect the current type and fields
-
-				FIXME: this function still doesn't support generics that extend generics, and are cast as one of its subclasses. This needs to be taken care, by
-				looking at previous superclasses and whenever a generic class is found, its cast argument must be overriden. the toughest part is to know how to type
-				the current type correctly.
-			*)
-			let create_cast_cfield gen cl name =
-				let basic = gen.gcon.basic in
-				let cparams = List.map (fun (s,t) -> (s, TInst (map_param (get_cl_t t), []))) cl.cl_params in
-				let cfield = mk_class_field name (TFun([], t_dynamic)) false cl.cl_pos (Method MethNormal) cparams in
-				let params = List.map snd cparams in
-
-				let fields = get_fields gen cl (List.map snd cl.cl_params) params [] in
-
-				(* now create the contents of the function *)
-				(*
-					it will look something like:
-					if (typeof(T) == typeof(T2)) return this;
-
-					var new_me = new CurrentClass<T2>(EmptyInstnace);
-
-					for (field in Reflect.fields(this))
-					{
-						switch(field)
-						{
-							case "aNativeArray":
-								var newArray = new NativeArray(this.aNativeArray.Length);
-
-							default:
-								Reflect.setField(new_me, field, Reflect.field(this, field));
-						}
-					}
-				*)
-
-				let new_t = TInst(cl, params) in
-				let pos = cl.cl_pos in
-
-				let new_me_var = alloc_var "new_me" new_t in
-				let local_new_me = { eexpr = TLocal(new_me_var); etype = new_t; epos = pos } in
-				let this = { eexpr = TConst(TThis); etype = (TInst(cl, List.map snd cl.cl_params)); epos = pos } in
-				let field_var = alloc_var "field" gen.gcon.basic.tstring in
-				let local_field = { eexpr = TLocal(field_var); etype = field_var.v_type; epos = pos } in
-				let i_var = alloc_var "i" gen.gcon.basic.tint in
-				let local_i = { eexpr = TLocal(i_var); etype = gen.gcon.basic.tint; epos = pos } in
-				let incr_i = { eexpr = TUnop(Ast.Increment, Ast.Postfix, local_i); etype = basic.tint; epos = pos } in
-				let fields_var = alloc_var "fields" (gen.gcon.basic.tarray gen.gcon.basic.tstring) in
-				let local_fields = { eexpr = TLocal(fields_var); etype = (gen.gcon.basic.tarray gen.gcon.basic.tstring); epos = pos } in
-
-				let get_path t =
-					match follow t with
-						| TInst(cl,_) -> cl.cl_path
-						| TEnum(e,_) -> e.e_path
-						| TAbstract(a,_) -> a.a_path
-						| TMono _
-						| TDynamic _ -> ([], "Dynamic")
-						| _ -> assert false
-				in
-
-				(* this will take all fields that were *)
-				let fields_to_cases fields =
-					List.map (fun (cf, t_cl, t_cf) ->
-						let this_field = { eexpr = TField(this, FInstance(cl, List.map snd cl.cl_params, cf)); etype = t_cl; epos = pos } in
-						let expr =
-						{
-							eexpr = TBinop(OpAssign, { eexpr = TField(local_new_me, FInstance(cl, List.map snd cl.cl_params, cf) ); etype = t_cf; epos = pos },
-								try (Hashtbl.find gen.gtparam_cast (get_path t_cf)) this_field t_cf with | Not_found -> (* if not found tparam cast, it shouldn't be a valid hxgeneric *) assert false
-							);
-							etype = t_cf;
-							epos = pos;
-						} in
-
-						[ExprBuilder.make_string gen.gcon cf.cf_name pos], expr
-					) fields
-				in
-
-				let mk_typehandle =
-					let thandle = alloc_var "__typeof__" t_dynamic in
-					(fun cl -> { eexpr = TCall(mk_local thandle pos, [ ExprBuilder.make_static_this cl pos ]); etype = t_dynamic; epos = pos })
-				in
-				let mk_eq cl1 cl2 =
-					{ eexpr = TBinop(Ast.OpEq, mk_typehandle cl1, mk_typehandle cl2); etype = basic.tbool; epos = pos }
-				in
-
-				let rec mk_typehandle_cond thisparams cfparams =
-					match thisparams, cfparams with
-						| TInst(cl_this,[]) :: [], TInst(cl_cf,[]) :: [] ->
-							mk_eq cl_this cl_cf
-						| TInst(cl_this,[]) :: hd, TInst(cl_cf,[]) :: hd2 ->
-							{ eexpr = TBinop(Ast.OpBoolAnd, mk_eq cl_this cl_cf, mk_typehandle_cond hd hd2); etype = basic.tbool; epos = pos }
-						| v :: hd, v2 :: hd2 ->
-							(match follow v, follow v2 with
-								| (TInst(cl1,[]) as v), (TInst(cl2,[]) as v2) ->
-									mk_typehandle_cond (v :: hd) (v2 :: hd2)
-								| _ ->
-									assert false
-							)
-						| _ -> assert false
-				in
-
-				let fn =
-				{
-					tf_args = [];
-					tf_type = t_dynamic;
-					tf_expr =
-						{
-							eexpr = TBlock([
-								(* if (typeof(T) == typeof(T2)) return this *)
-								{
-									eexpr = TIf(
-										mk_typehandle_cond (List.map snd cl.cl_params) params,
-										mk_return this,
-										None);
-									etype = basic.tvoid;
-									epos = pos;
-								};
-								(* var new_me = /*special create empty with tparams construct*/ *)
-								{
-									eexpr = TVar(new_me_var, Some(gen.gtools.r_create_empty cl params pos));
-									etype = gen.gcon.basic.tvoid;
-									epos = pos
-								};
-								(* var fields = Reflect.fields(this); *)
-								{
-									eexpr = TVar(fields_var, Some(gen.gtools.r_fields true this));
-									etype = gen.gcon.basic.tvoid;
-									epos = pos
-								};
-								(* var i = 0; *)
-								{
-									eexpr = TVar(i_var, Some(ExprBuilder.make_int gen.gcon 0 pos));
-									etype = gen.gcon.basic.tvoid;
-									epos = pos
-								};
-								{
-									eexpr = TWhile( (* while (i < fields.length) *)
-										{
-											eexpr = TBinop(Ast.OpLt,
-												local_i,
-												mk_field_access gen local_fields "length" pos);
-											etype = gen.gcon.basic.tbool;
-											epos = pos
-										},
-										{
-											eexpr = TBlock [
-												(* var field = fields[i++]; *)
-												{
-													eexpr = TVar(field_var, Some { eexpr = TArray (local_fields, incr_i); etype = gen.gcon.basic.tstring; epos = pos });
-													etype = gen.gcon.basic.tvoid;
-													epos = pos
-												};
-												(
-													(* default: Reflect.setField(new_me, field, Reflect.field(this, field)) *)
-													let edef = gen.gtools.r_set_field gen.gcon.basic.tvoid local_new_me local_field (gen.gtools.r_field false gen.gcon.basic.tvoid this local_field) in
-													if fields <> [] then
-														(* switch(field) { ... } *)
-														{
-															eexpr = TSwitch(local_field, fields_to_cases fields, Some(edef));
-															etype = gen.gcon.basic.tvoid;
-															epos = pos;
-														}
-													else
-														edef;
-												)
-											];
-											etype = gen.gcon.basic.tvoid;
-											epos = pos
-										},
-										Ast.NormalWhile
-									);
-									etype = gen.gcon.basic.tvoid;
-									epos = pos;
-								};
- 								(* return new_me *)
-								mk_return local_new_me
-							]);
-							etype = t_dynamic;
-							epos = pos;
-						};
-				}
-				in
-
-				cfield.cf_expr <- Some( { eexpr = TFunction(fn); etype = cfield.cf_type; epos = pos } );
-
-				cfield
-
-			let create_static_cast_cf gen iface cf =
-				let p = iface.cl_pos in
-				let basic = gen.gcon.basic in
-				let cparams = List.map (fun (s,t) -> ("To_" ^ s, TInst (map_param (get_cl_t t), []))) cf.cf_params in
-				let me_type = TInst(iface,[]) in
-				let cfield = mk_class_field "__hx_cast" (TFun(["me",false,me_type], t_dynamic)) false iface.cl_pos (Method MethNormal) (cparams) in
-				let params = List.map snd cparams in
-
-				let me = alloc_var "me" me_type in
-				let field = { eexpr = TField(mk_local me p, FInstance(iface, List.map snd iface.cl_params, cf)); etype = apply_params cf.cf_params params cf.cf_type; epos = p } in
-				let call =
-				{
-					eexpr = TCall(field, []);
-					etype = t_dynamic;
-					epos = p;
-				} in
-				let call = gen.gparam_func_call call field params [] in
-
-				(* since object.someCall<ExplicitParameterDefinition>() isn't allowed on Haxe, we need to directly apply the params and delay this call *)
-				let delay () =
-					cfield.cf_expr <-
-					Some {
-						eexpr = TFunction(
-						{
-							tf_args = [me,None];
-							tf_type = t_dynamic;
-							tf_expr =
-							{
-								eexpr = TReturn( Some
-								{
-									eexpr = TIf(
-										{ eexpr = TBinop(Ast.OpNotEq, mk_local me p, null me.v_type p); etype = basic.tbool; epos = p },
-										call,
-										Some( null me.v_type p )
-									);
-									etype = t_dynamic;
-									epos = p;
-								});
-								etype = basic.tvoid;
-								epos = p;
-							}
-						});
-						etype = cfield.cf_type;
-						epos = p;
-					}
-				in
-				cfield, delay
-
-			let default_implementation gen ifaces base_generic =
-				let add_iface cl =
-					gen.gadd_to_module (TClassDecl cl) (max_dep);
-				in
-
-				let implement_stub_cast cthis iface tl =
-					let name = get_cast_name iface in
-					if not (PMap.mem name cthis.cl_fields) then begin
-						let cparams = List.map (fun (s,t) -> ("To_" ^ s, TInst(map_param (get_cl_t t), []))) iface.cl_params in
-						let field = mk_class_field name (TFun([],t_dynamic)) false iface.cl_pos (Method MethNormal) cparams in
-						let this = { eexpr = TConst TThis; etype = TInst(cthis, List.map snd cthis.cl_params); epos = cthis.cl_pos } in
-						field.cf_expr <- Some {
-							etype = TFun([],t_dynamic);
-							epos = this.epos;
-							eexpr = TFunction {
-								tf_type = t_dynamic;
-								tf_args = [];
-								tf_expr = mk_block { this with
-									eexpr = TReturn (Some this)
-								}
-							}
-						};
-						cthis.cl_ordered_fields <- field :: cthis.cl_ordered_fields;
-						cthis.cl_fields <- PMap.add name field cthis.cl_fields
-					end
-				in
-
-				let rec run md =
-					match md with
-						| TClassDecl ({ cl_params = [] } as cl) ->
-							(* see if we're implementing any generic interface *)
-							let rec check (iface,tl) =
-								if tl <> [] && set_hxgeneric gen (TClassDecl iface) then
-									(* implement cast stub *)
-									implement_stub_cast cl iface tl;
-								List.iter (fun (s,stl) -> check (s, List.map (apply_params iface.cl_params tl) stl)) iface.cl_implements;
-							in
-							List.iter (check) cl.cl_implements;
-							md
-						| TClassDecl ({ cl_params = hd :: tl } as cl) when set_hxgeneric gen md ->
-							let iface = mk_class cl.cl_module cl.cl_path cl.cl_pos in
-							iface.cl_array_access <- Option.map (apply_params (cl.cl_params) (List.map (fun _ -> t_dynamic) cl.cl_params)) cl.cl_array_access;
-							iface.cl_extern <- cl.cl_extern;
-							iface.cl_module <- cl.cl_module;
-							iface.cl_private <- cl.cl_private;
-							iface.cl_meta <-
-								(Meta.HxGen, [], cl.cl_pos)
-								::
-								(Meta.Custom "generic_iface", [(EConst(Int(string_of_int(List.length cl.cl_params))), cl.cl_pos)], cl.cl_pos)
-								::
-								iface.cl_meta;
-							Hashtbl.add ifaces cl.cl_path iface;
-
-							iface.cl_implements <- (base_generic, []) :: iface.cl_implements;
-							iface.cl_interface <- true;
-							cl.cl_implements <- (iface, []) :: cl.cl_implements;
-
-							let name = get_cast_name cl in
-							let cast_cf = create_cast_cfield gen cl name in
-							if not cl.cl_interface then create_stub_casts gen cl cast_cf;
-
-							let rec loop c = match c.cl_super with
-								| None -> ()
-								| Some(sup,_) -> try
-									let siface = Hashtbl.find ifaces sup.cl_path in
-									iface.cl_implements <- (siface,[]) :: iface.cl_implements;
-									()
-								with | Not_found -> loop sup
-							in
-							loop cl;
-
-							(if not cl.cl_interface then cl.cl_ordered_fields <- cast_cf :: cl.cl_ordered_fields);
-							let iface_cf = mk_class_field name cast_cf.cf_type false cast_cf.cf_pos (Method MethNormal) cast_cf.cf_params in
-							let cast_static_cf, delay = create_static_cast_cf gen iface iface_cf in
-
-							cl.cl_ordered_statics <- cast_static_cf :: cl.cl_ordered_statics;
-							cl.cl_statics <- PMap.add cast_static_cf.cf_name cast_static_cf cl.cl_statics;
-							gen.gafter_filters_ended <- delay :: gen.gafter_filters_ended; (* do not let filters alter this expression content *)
-
-							iface_cf.cf_type <- cast_cf.cf_type;
-							iface.cl_fields <- PMap.add name iface_cf iface.cl_fields;
-							let fields = List.filter (fun cf -> match cf.cf_kind with
-								| Var _ | Method MethDynamic -> false
-								| _ ->
-									let is_override = List.memq cf cl.cl_overrides in
-									let cf_type = if is_override && not (Meta.has Meta.Overload cf.cf_meta) then
-										match find_first_declared_field gen cl cf.cf_name with
-											| Some(_,_,declared_t,_,_,_,_) -> declared_t
-											| _ -> assert false
-									else
-										cf.cf_type
-									in
-
-									not (has_type_params cf_type)
-								) cl.cl_ordered_fields
-							in
-							let fields = List.map (fun f -> mk_class_field f.cf_name f.cf_type f.cf_public f.cf_pos f.cf_kind f.cf_params) fields in
-							let fields = iface_cf :: fields in
-							iface.cl_ordered_fields <- fields;
-							List.iter (fun f -> iface.cl_fields <- PMap.add f.cf_name f iface.cl_fields) fields;
-
-							add_iface iface;
-							md
-						| TTypeDecl _ | TAbstractDecl _ -> md
-						| TEnumDecl _ ->
-							ignore (set_hxgeneric gen md);
-							md
-						| _ -> ignore (set_hxgeneric gen md); md
-				in
-				run
-
-			let configure gen mapping_func =
-				let map e = Some(mapping_func e) in
-				gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
-
-		end;;
-
-		(* create a common interface without type parameters and only a __Cast<> function *)
-		let default_implementation gen (dyn_tparam_cast:texpr->t->texpr) ifaces =
-			let change_expr e cl iface params =
-				let field = mk_static_field_access_infer cl "__hx_cast" e.epos params in
-				let elist = [mk_cast (TInst(iface,[])) e] in
-				let call = { eexpr = TCall(field, elist); etype = t_dynamic; epos = e.epos } in
-
-				gen.gparam_func_call call field params elist
-			in
-
-			let rec run e =
-				match e.eexpr with
-						| TCast(cast_expr, _) ->
-							(* see if casting to a native generic class *)
-							let t = gen.greal_type e.etype in
-							let unifies =
-								let ctype = gen.greal_type cast_expr.etype in
-								match follow ctype with
-								| TInst(cl,_) -> (try
-									unify ctype t;
-									true
-								with | Unify_error el ->
-									false)
-								| _ -> false
-							in
-							let unifies = unifies && not (PMap.mem "cs_safe_casts" gen.gcon.defines) in
-							(match follow t with
-								| TInst(cl, p1 :: pl) when is_hxgeneric (TClassDecl cl) && not unifies && not (Meta.has Meta.Enum cl.cl_meta) ->
-									let iface = Hashtbl.find ifaces cl.cl_path in
-									mk_cast e.etype (change_expr (Type.map_expr run cast_expr) cl iface (p1 :: pl))
-								| _ -> Type.map_expr run e
-							)
-						| _ -> Type.map_expr run e
-			in
-			run
-
-		let configure gen (dyn_tparam_cast:texpr->t->texpr) ifaces base_generic =
-			gen.ghas_tparam_cast_handler <- true;
-			let traverse = default_implementation gen dyn_tparam_cast ifaces in
-			let map e = Some(traverse e) in
-			gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map;
-			RealTypeParamsModf.configure gen (RealTypeParamsModf.default_implementation gen ifaces base_generic)
-
-	end;;
-
-	(* ******************************************* *)
-	(* Rename Type Parameters *)
-	(* ******************************************* *)
-
-	(*
-
-		This module should run after everything is already applied,
-		it will look for possible type parameter name clashing and change the classes names to a
-
-		dependencies:
-			should run after everything is already applied. There's no configure on this module, only 'run'.
-
-	*)
-
-	module RenameTypeParameters =
-	struct
-
-		let name = "rename_type_parameters"
-
-		let run gen =
-			let i = ref 0 in
-			let found_types = ref PMap.empty in
-			let check_type name on_changed =
-				let rec loop name =
-					incr i;
-					let changed_name = (name ^ (string_of_int !i)) in
-					if PMap.mem changed_name !found_types then loop name else changed_name
-				in
-				if PMap.mem name !found_types then begin
-					let new_name = loop name in
-					found_types := PMap.add new_name true !found_types;
-					on_changed new_name
-				end else found_types := PMap.add name true !found_types
-			in
-
-			let get_cls t =
-				match follow t with
-					| TInst(cl,_) -> cl
-					| _ -> assert false
-			in
-
-			let iter_types (nt,t) =
-				let cls = get_cls t in
-				let orig = cls.cl_path in
-				check_type (snd orig) (fun name -> cls.cl_path <- (fst orig, name))
-			in
-
-			let save_params save params =
-				List.fold_left (fun save (_,t) ->
-					let cls = get_cls t in
-					(cls.cl_path,t) :: save) save params
-			in
-
-			List.iter (function
-				| TClassDecl cl ->
-					i := 0;
-
-					let save = [] in
-
-					found_types := PMap.empty;
-					let save = save_params save cl.cl_params in
-					List.iter iter_types cl.cl_params;
-					let cur_found_types = !found_types in
-					let save = ref save in
-					List.iter (fun cf ->
-						found_types := cur_found_types;
-						save := save_params !save cf.cf_params;
-						List.iter iter_types cf.cf_params
-					) (cl.cl_ordered_fields @ cl.cl_ordered_statics);
-
-					if !save <> [] then begin
-						let save = !save in
-						let res = cl.cl_restore in
-						cl.cl_restore <- (fun () ->
-							res();
-							List.iter (fun (path,t) ->
-								let cls = get_cls t in
-								cls.cl_path <- path) save
-						);
-					end
-
-				| TEnumDecl ( ({ e_params = hd :: tl }) ) ->
-					i := 0;
-					found_types := PMap.empty;
-					List.iter iter_types (hd :: tl)
-
-				| TAbstractDecl { a_params = hd :: tl } ->
-					i := 0;
-					found_types := PMap.empty;
-					List.iter iter_types (hd :: tl)
-
-				| _ -> ()
-
-			) gen.gtypes_list
-
-	end;;
-
-end;;
-
-(**************************************************************************************************************************)
-(*																									 SYNTAX FILTERS																												*)
-(**************************************************************************************************************************)
-
-(* ******************************************* *)
-(* Expression Unwrap *)
-(* ******************************************* *)
-(*
-	This is the most important module for source-code based targets. It will follow a convention of what's an expression and what's a statement,
-	and will unwrap statements where expressions are expected, and vice-versa.
-
-	It should be one of the first syntax filters to be applied. As a consequence, it's applied after all filters that add code to the AST, and by being
-	the first of the syntax filters, it will also have the AST retain most of the meaning of normal Haxe code. So it's easier to detect cases which are
-	side-effects free, for example
-
-	Any target can make use of this, but there is one requirement: The target must accept null to be set to any kind of variable. For example,
-	var i:Int = null; must be accepted. The best way to deal with this is to (like it's done in C#) make null equal to "default(Type)"
-
-	dependencies:
-		While it's best for Expression Unwrap to delay its execution as much as possible, since theoretically any
-		filter can return an expression that needs to be unwrapped, it is also desirable for ExpresionUnwrap to have
-		the AST as close as possible as Haxe's, so it can make some correct predictions (for example, so it can
-		more accurately know what can be side-effects-free and what can't).
-		This way, it will run slightly after the Normal priority, so if you don't say that a syntax filter must run
-		before Expression Unwrap, it will run after it.
-
-	TODO : While statement must become do / while, with the actual block inside an if for the condition, and else for 'break'
-*)
-module ExpressionUnwrap =
-struct
-	let name = "expression_unwrap"
-
-	(* priority: first syntax filter *)
-	let priority = -10.0
-
-	(*
-		We always need to rely on Blocks to be able to unwrap expressions correctly.
-		So the the standard traverse will always be based on blocks.
-		Normal block statements, like for(), while(), if(), ... will be mk_block'ed so there is always a block inside of them.
-
-			At the block level, we'll define an "add_statement" function, which will allow the current expression to
-			add statements to the block. This statement may or may not contain statements as expressions, so the texpr will be evaluated recursively before being added.
-
-			- traverse will always evaluate TBlocks
-			- for each texpr in a TBlock list,
-				check shallow type
-					if type is Statement or Both when it has problematic expression (var problematic_expr = count_problematic_expressions),
-						if we can eagerly call unwrap_statement on the whole expression (try_call_unwrap_statement), use the return expression
-						else
-							check expr_type of each underlying type (with expr_stat_map)
-								if it has ExprWithStatement or Statement,
-									call problematic_expression_unwrap in it
-									problematic_expr--
-								else if problematic_expr == 0, just add the unchanged expression
-								else if NoSideEffects and doesn't have short-circuit, just add the unchanged expression
-								else call problematic_expression_unwrap in it
-					if type is Expression, check if there are statements or Both inside.
-						if there are, problematic_expression_unwrap in it
-					aftewards, use on_expr_as_statement to get it
-
-		helpers:
-			try_call_unwrap_statement: (returns texpr option)
-				if underlying statement is TBinop(OpAssign/OpAssignOp), or TVar, with the right side being a Statement or a short circuit op, we can call apply_assign.
-
-			apply_assign:
-				if is TVar, first declare the tvar with default expression = null;
-				will receive the left and right side of the assignment; right-side must be Statement
-				see if right side is a short-circuit operation, call short_circuit_op_unwrap
-				else see eexpr of the right side
-					if it's void, just add the statement with add_statement, and set the right side as null;
-					if not, it will have a block inside. set the left side = to the last expression on each block inside. add_statement for it.
-
-			short_circuit_op_unwrap: x() && (1 + {var x = 0; x + 1;} == 2) && z()
-				-> var x = x();
-					 var y = false;
-					 var z = false;
-					 if (x) //for &&, neg for ||
-					 {
-						var temp = null;
-						{
-							var x = 0;
-							temp = x + 1;
-						}
-
-						y = (1 + temp) == 2;
-						if (y)
-						{
-							z = z();
-						}
-					 }
-				expects to receive a texpr with TBinop(OpBoolAnd/OpBoolOr)
-				will traverse the AST while there is a TBinop(OpBoolAnd/OpBoolOr) as a right-side expr, and declare new temp vars in the	for each found.
-				will collect the return value, a mapped expr with all exprs as TLocal of the temp vars created
-
-
-			problematic_expression_unwrap:
-				check expr_kind:
-					if it is NoSideEffects and not short-circuit, leave it there
-					if it is ExprWithStatement and not short-circuit, call Type.map_expr problematic_expression_unwrap
-					if it is Statement or Expression or short-circuit expr, call add_assign for this expression
-
-			add_assign:
-				see if the type is void. If it is, just add_statement the expression argument, and return a null value
-				else create a new variable, set TVar with Some() with the expression argument, add TVar with add_statement, and return the TLocal of this expression.
-
-			map_problematic_expr:
-				call expr_stat_map on statement with problematic_expression_unwrap
-
-		types:
-			type shallow_expr_type = | Statement | Expression | Both (* shallow expression classification. Both means that they can be either Statements as Expressions *)
-
-			type expr_kind = | NormalExpr | ExprNoSideEffects (* -> short-circuit is considered side-effects *) | ExprWithStatement | Statement
-				evaluates an expression (as in not a statement) type. If it is ExprWithStatement or Statement, it means it contains errors
-
-		functions:
-			shallow_expr_type (expr:texpr) : shallow_expr_type
-
-			expr_kind (expr:texpr) : expr_kind
-				deeply evaluates an expression type
-
-			expr_stat_map (fn:texpr->texpr) (expr:texpr) : texpr
-				it will traverse the AST looking for places where an expression is expected, and map the value according to fn
-
-			aggregate_expr_type (is_side_effects_free:bool) (children:expr_type list) : expr_type
-				helper function to deal with expr_type aggregation (e.g. an Expression + a Statement as a children, is a ExprWithStatement)
-
-			check_statement_in_expression (expr:texpr) : texpr option :
-				will check
-
-	*)
-
-	type shallow_expr_type = | Statement | Expression of texpr | Both of texpr (* shallow expression classification. Both means that they can be either Statements as Expressions *)
-
-	type expr_kind = | KNormalExpr | KNoSideEffects (* -> short-circuit is considered side-effects *) | KExprWithStatement | KStatement
-
-	let rec no_paren e =
-		match e.eexpr with
-			| TParenthesis e -> no_paren e
-			| _ -> e
-
-	(* must be called in a statement. Will execute fn whenever an expression (not statement) is expected *)
-	let rec expr_stat_map fn (expr:texpr) =
-		match (no_paren expr).eexpr with
-			| TBinop ( (Ast.OpAssign as op), left_e, right_e )
-			| TBinop ( (Ast.OpAssignOp _ as op), left_e, right_e ) ->
-				{ expr with eexpr = TBinop(op, fn left_e, fn right_e) }
-			| TParenthesis _ -> assert false
-			| TCall(left_e, params) ->
-				{ expr with eexpr = TCall(fn left_e, List.map fn params) }
-			| TNew(cl, tparams, params) ->
-				{ expr with eexpr = TNew(cl, tparams, List.map fn params) }
-			| TVar(v,eopt) ->
-				{ expr with eexpr = TVar(v, Option.map fn eopt) }
-			| TFor (v,cond,block) ->
-				{ expr with eexpr = TFor(v, fn cond, block) }
-			| TIf(cond,eif,eelse) ->
-				{ expr with eexpr = TIf(fn cond, eif, eelse) }
-			| TWhile(cond, block, flag) ->
-				{ expr with eexpr = TWhile(fn cond, block, flag) }
-			| TSwitch(cond, el_block_l, default) ->
-				{ expr with eexpr = TSwitch( fn cond, List.map (fun (el,block) -> (List.map fn el, block)) el_block_l, default ) }
-			| TReturn(eopt) ->
-				{ expr with eexpr = TReturn(Option.map fn eopt) }
-			| TThrow (texpr) ->
-				{ expr with eexpr = TThrow(fn texpr) }
-			| TBreak
-			| TContinue
-			| TTry _
-			| TUnop (Ast.Increment, _, _)
-			| TUnop (Ast.Decrement, _, _) (* unop is a special case because the haxe compiler won't let us generate complex expressions with Increment/Decrement *)
-			| TBlock _ -> expr (* there is no expected expression here. Only statements *)
-			| TMeta(m,e) ->
-				{ expr with eexpr = TMeta(m,expr_stat_map fn e) }
-			| _ -> assert false (* we only expect valid statements here. other expressions aren't valid statements *)
-
-	let is_expr = function | Expression _ -> true | _ -> false
-
-	let aggregate_expr_type map_fn side_effects_free children =
-		let rec loop acc children =
-			match children with
-				| [] -> acc
-				| hd :: children ->
-					match acc, map_fn hd with
-						| _, KExprWithStatement
-						| _, KStatement
-						| KExprWithStatement, _
-						| KStatement, _ -> KExprWithStatement
-						| KNormalExpr, KNoSideEffects
-						| KNoSideEffects, KNormalExpr
-						| KNormalExpr, KNormalExpr -> loop KNormalExpr children
-						| KNoSideEffects, KNoSideEffects -> loop KNoSideEffects children
-		in
-		loop (if side_effects_free then KNoSideEffects else KNormalExpr) children
-
-	(* statements: *)
-	(* Error CS0201: Only assignment, call, increment,					 *)
-	(* decrement, and new object expressions can be used as a		 *)
-	(* statement (CS0201). *)
-	let rec shallow_expr_type expr : shallow_expr_type =
-		match expr.eexpr with
-			| TCall _ when not (ExtType.is_void expr.etype) -> Both expr
-			| TNew _
-			| TUnop (Ast.Increment, _, _)
-			| TUnop (Ast.Decrement, _, _)
-			| TBinop (Ast.OpAssign, _, _)
-			| TBinop (Ast.OpAssignOp _, _, _) -> Both expr
-			| TIf (cond, eif, Some(eelse)) -> (match aggregate_expr_type expr_kind true [cond;eif;eelse] with
-				| KExprWithStatement -> Statement
-				| _ -> Both expr)
-			| TConst _
-			| TLocal _
-			| TArray _
-			| TBinop _
-			| TField _
-			| TEnumParameter _
-			| TTypeExpr _
-			| TObjectDecl _
-			| TArrayDecl _
-			| TFunction _
-			| TCast _
-			| TUnop _ -> Expression (expr)
-			| TParenthesis p | TMeta(_,p) -> shallow_expr_type p
-			| TBlock ([e]) -> shallow_expr_type e
-			| TCall _
-			| TVar _
-			| TBlock _
-			| TFor _
-			| TWhile _
-			| TSwitch _
-			| TTry _
-			| TReturn _
-			| TBreak
-			| TContinue
-			| TIf _
-			| TThrow _ -> Statement
-
-	and expr_kind expr =
-		match shallow_expr_type expr with
-			| Statement -> KStatement
-			| Both expr | Expression expr ->
-				let aggregate = aggregate_expr_type expr_kind in
-				match expr.eexpr with
-					| TConst _
-					| TLocal _
-					| TFunction _
-					| TTypeExpr _ ->
-						KNoSideEffects
-					| TCall (ecall, params) ->
-						aggregate false (ecall :: params)
-					| TNew (_,_,params) ->
-						aggregate false params
-					| TUnop (Increment,_,e)
-					| TUnop (Decrement,_,e) ->
-						aggregate false [e]
-					| TUnop (_,_,e) ->
-						aggregate true [e]
-					| TBinop (Ast.OpBoolAnd, e1, e2)
-					| TBinop (Ast.OpBoolOr, e1, e2) ->	(* TODO: should OpBool never be side-effects free? *)
-						aggregate true [e1;e2]
-					| TBinop (Ast.OpAssign, e1, e2)
-					| TBinop (Ast.OpAssignOp _, e1, e2) ->
-						aggregate false [e1;e2]
-					| TBinop (_, e1, e2) ->
-						aggregate true [e1;e2]
-					| TIf (cond, eif, Some(eelse)) -> (match aggregate true [cond;eif;eelse] with
-						| KExprWithStatement -> KStatement
-						| k -> k)
-					| TArray (e1,e2) ->
-						aggregate true [e1;e2]
-					| TParenthesis e
-					| TMeta(_,e)
-					| TField (e,_) ->
-						aggregate true [e]
-					| TArrayDecl (el) ->
-						aggregate true el
-					| TObjectDecl (sel) ->
-						aggregate true (List.map snd sel)
-					| TCast (e,_) ->
-						aggregate true [e]
-					| _ -> trace (debug_expr expr); assert false (* should have been read as Statement by shallow_expr_type *)
-
-	let is_side_effects_free e =
-		match expr_kind e with | KNoSideEffects -> true | _ -> false
-
-	let get_kinds (statement:texpr) =
-		let kinds = ref [] in
-		ignore (expr_stat_map (fun e ->
-			kinds := (expr_kind e) :: !kinds;
-			e
-		) statement);
-		List.rev !kinds
-
-	let has_problematic_expressions (kinds:expr_kind list) =
-		let rec loop kinds =
-			match kinds with
-				| [] -> false
-				| KStatement :: _
-				| KExprWithStatement :: _ -> true
-				| _ :: tl -> loop tl
-		in
-		loop kinds
-
-	let count_problematic_expressions (statement:texpr) =
-		let count = ref 0 in
-		ignore (expr_stat_map (fun e ->
-			(match expr_kind e with
-				| KStatement | KExprWithStatement -> incr count
-				| _ -> ()
-			);
-			e
-		) statement);
-		!count
-
-	let apply_assign_block assign_fun elist =
-		let rec assign acc elist =
-			match elist with
-				| [] -> acc
-				| last :: [] ->
-					(assign_fun last) :: acc
-				| hd :: tl ->
-					assign (hd :: acc) tl
-		in
-		List.rev (assign [] elist)
-
-	let mk_get_block assign_fun e =
-		match e.eexpr with
-			| TBlock [] -> e
-			| TBlock (el) ->
-				{ e with eexpr = TBlock(apply_assign_block assign_fun el) }
-			| _ ->
-				{ e with eexpr = TBlock([ assign_fun e ]) }
-
-	let add_assign gen add_statement expr =
-		match expr.eexpr, follow expr.etype with
-			| _, TAbstract ({ a_path = ([],"Void") },[])
-			| TThrow _, _ ->
-				add_statement expr;
-				null expr.etype expr.epos
-			| _ ->
-				let var = mk_temp gen "stmt" expr.etype in
-				let tvars = { expr with eexpr = TVar(var,Some(expr)) } in
-				let local = { expr with eexpr = TLocal(var) } in
-				add_statement tvars;
-				local
-
-	(* requirement: right must be a statement *)
-	let rec apply_assign assign_fun right =
-		match right.eexpr with
-			| TBlock el ->
-				{ right with eexpr = TBlock(apply_assign_block assign_fun el) }
-			| TSwitch (cond, elblock_l, default) ->
-				{ right with eexpr = TSwitch(cond, List.map (fun (el,block) -> (el, mk_get_block assign_fun block)) elblock_l, Option.map (mk_get_block assign_fun) default) }
-			| TTry (block, catches) ->
-				{ right with eexpr = TTry(mk_get_block assign_fun block, List.map (fun (v,block) -> (v,mk_get_block assign_fun block) ) catches) }
-			| TIf (cond,eif,eelse) ->
-				{ right with eexpr = TIf(cond, mk_get_block assign_fun eif, Option.map (mk_get_block assign_fun) eelse) }
-			| TThrow _
-			| TWhile _
-			| TFor _
-			| TReturn _
-			| TBreak
-			| TContinue -> right
-			| TParenthesis p | TMeta(_,p) ->
-				apply_assign assign_fun p
-			| TVar _ ->
-				right
-			| _ ->
-				match follow right.etype with
-					| TAbstract ({ a_path = ([], "Void") },[]) ->
-						right
-					| _ -> trace (debug_expr right); assert false (* a statement is required *)
-
-	let short_circuit_op_unwrap gen add_statement expr :texpr =
-		let do_not expr =
-			{ expr with eexpr = TUnop(Ast.Not, Ast.Prefix, expr) }
-		in
-
-		(* loop will always return its own TBlock, and the mapped expression *)
-		let rec loop acc expr =
-			match expr.eexpr with
-				| TBinop ( (Ast.OpBoolAnd as op), left, right) ->
-					let var = mk_temp gen "boolv" right.etype in
-					let tvars = { right with eexpr = TVar(var, Some( { right with eexpr = TConst(TBool false); etype = gen.gcon.basic.tbool } )); etype = gen.gcon.basic.tvoid } in
-					let local = { right with eexpr = TLocal(var) } in
-
-					let mapped_left, ret_acc = loop ( (local, { right with eexpr = TBinop(Ast.OpAssign, local, right) } ) :: acc) left in
-
-					add_statement tvars;
-					({ expr with eexpr = TBinop(op, mapped_left, local) }, ret_acc)
-				(* we only accept OpBoolOr when it's the first to be evaluated *)
-				| TBinop ( (Ast.OpBoolOr as op), left, right) when acc = [] ->
-					let left = match left.eexpr with
-						| TLocal _ | TConst _ -> left
-						| _ -> add_assign gen add_statement left
-					in
-
-					let var = mk_temp gen "boolv" right.etype in
-					let tvars = { right with eexpr = TVar(var, Some( { right with eexpr = TConst(TBool false); etype = gen.gcon.basic.tbool } )); etype = gen.gcon.basic.tvoid } in
-					let local = { right with eexpr = TLocal(var) } in
-					add_statement tvars;
-
-					({ expr with eexpr = TBinop(op, left, local) }, [ do_not left, { right with eexpr = TBinop(Ast.OpAssign, local, right) } ])
-				| _ when acc = [] -> assert false
-				| _ ->
-					let var = mk_temp gen "boolv" expr.etype in
-					let tvars = { expr with eexpr = TVar(var, Some( { expr with etype = gen.gcon.basic.tbool } )); etype = gen.gcon.basic.tvoid } in
-					let local = { expr with eexpr = TLocal(var) } in
-
-					let last_local = ref local in
-					let acc = List.map (fun (local, assign) ->
-						let l = !last_local in
-						last_local := local;
-						(l, assign)
-					) acc in
-
-					add_statement tvars;
-					(local, acc)
-		in
-
-		let mapped_expr, local_assign_list = loop [] expr in
-
-		let rec loop local_assign_list : texpr =
-			match local_assign_list with
-				| [local, assign] ->
-					{ eexpr = TIf(local, assign, None); etype = gen.gcon.basic.tvoid; epos = assign.epos }
-				| (local, assign) :: tl ->
-					{ eexpr = TIf(local,
-						{
-							eexpr = TBlock ( assign :: [loop tl] );
-							etype = gen.gcon.basic.tvoid;
-							epos = assign.epos;
-						},
-					None); etype = gen.gcon.basic.tvoid; epos = assign.epos }
-				| [] -> assert false
-		in
-
-		add_statement (loop local_assign_list);
-		mapped_expr
-
-	(* there are two short_circuit fuctions as I'm still testing the best way to do it *)
-	(*let short_circuit_op_unwrap gen add_statement expr :texpr =
-		let block = ref [] in
-		let rec short_circuit_op_unwrap is_first last_block expr =
-			match expr.eexpr with
-				| TBinop ( (Ast.OpBoolAnd as op), left, right)
-				| TBinop ( (Ast.OpBoolOr as op), left, right) ->
-					let var = mk_temp gen "boolv" left.etype in
-					let tvars = { left with eexpr = TVar([var, if is_first then Some(left) else Some( { left with eexpr = TConst(TBool false) } )]); etype = gen.gcon.basic.tvoid } in
-					let local = { left with eexpr = TLocal(var) } in
-					if not is_first then begin
-						last_block := !last_block @ [ { left with eexpr = TBinop(Ast.OpAssign, local, left) } ]
-					end;
-
-					add_statement tvars;
-					let local_op = match op with | Ast.OpBoolAnd -> local | Ast.OpBoolOr -> { local with eexpr = TUnop(Ast.Not, Ast.Prefix, local) } | _ -> assert false in
-
-					let new_block = ref [] in
-					let new_right = short_circuit_op_unwrap false new_block right in
-					last_block := !last_block @ [ { expr with eexpr = TIf(local_op, { right with eexpr = TBlock(!new_block) }, None) } ];
-
-					{ expr with eexpr = TBinop(op, local, new_right) }
-				| _ when is_first -> assert false
-				| _ ->
-					let var = mk_temp gen "boolv" expr.etype in
-					let tvars = { expr with eexpr = TVar([var, Some ( { expr with eexpr = TConst(TBool false) } ) ]); etype = gen.gcon.basic.tvoid } in
-					let local = { expr with eexpr = TLocal(var) } in
-					last_block := !last_block @ [ { expr with eexpr = TBinop(Ast.OpAssign, local, expr) } ];
-					add_statement tvars;
-
-					local
-		in
-		let mapped_expr = short_circuit_op_unwrap true block expr in
-		add_statement { eexpr = TBlock(!block); etype = gen.gcon.basic.tvoid; epos = expr.epos };
-		mapped_expr*)
-
-	let twhile_with_condition_statement gen add_statement twhile cond e1 flag =
-		(* when a TWhile is found with a problematic condition *)
-		let basic = gen.gcon.basic in
-
-		let block = if flag = Ast.NormalWhile then
-			{ e1 with eexpr = TIf(cond, e1, Some({ e1 with eexpr = TBreak; etype = basic.tvoid })) }
-		else
-			Type.concat e1 { e1 with
-				eexpr = TIf({
-					eexpr = TUnop(Ast.Not, Ast.Prefix, mk_paren cond);
-					etype = basic.tbool;
-					epos = cond.epos
-				}, { e1 with eexpr = TBreak; etype = basic.tvoid }, None);
-				etype = basic.tvoid
-			}
-		in
-
-		add_statement { twhile with
-			eexpr = TWhile(
-				{ eexpr = TConst(TBool true); etype = basic.tbool; epos = cond.epos },
-				block,
-				Ast.DoWhile
-			);
-		}
-
-	let try_call_unwrap_statement gen problematic_expression_unwrap (add_statement:texpr->unit) (expr:texpr) : texpr option =
-		let check_left left =
-			match expr_kind left with
-				| KExprWithStatement ->
-					problematic_expression_unwrap add_statement left KExprWithStatement
-				| KStatement -> assert false (* doesn't make sense a KStatement as a left side expression *)
-				| _ -> left
-		in
-
-		let handle_assign op left right =
-			let left = check_left left in
-			Some (apply_assign (fun e -> { e with eexpr = TBinop(op, left, if ExtType.is_void left.etype then e else gen.ghandle_cast left.etype e.etype e) }) right )
-		in
-
-		let handle_return e =
-			Some( apply_assign (fun e ->
-				match e.eexpr with
-					| TThrow _ -> e
-					| _ when ExtType.is_void e.etype ->
-							{ e with eexpr = TBlock([e; { e with eexpr = TReturn None }]) }
-					| _ ->
-							{ e with eexpr = TReturn( Some e ) }
-			) e )
-		in
-
-		let is_problematic_if right =
-			match expr_kind right with
-				| KStatement | KExprWithStatement -> true
-				| _ -> false
-		in
-
-		match expr.eexpr with
-			| TBinop((Ast.OpAssign as op),left,right)
-			| TBinop((Ast.OpAssignOp _ as op),left,right) when shallow_expr_type right = Statement ->
-				handle_assign op left right
-			| TReturn( Some right ) when shallow_expr_type right = Statement ->
-				handle_return right
-			| TBinop((Ast.OpAssign as op),left, ({ eexpr = TBinop(Ast.OpBoolAnd,_,_) } as right) )
-			| TBinop((Ast.OpAssign as op),left,({ eexpr = TBinop(Ast.OpBoolOr,_,_) } as right))
-			| TBinop((Ast.OpAssignOp _ as op),left,({ eexpr = TBinop(Ast.OpBoolAnd,_,_) } as right) )
-			| TBinop((Ast.OpAssignOp _ as op),left,({ eexpr = TBinop(Ast.OpBoolOr,_,_) } as right) ) ->
-				let right = short_circuit_op_unwrap gen add_statement right in
-				Some { expr with eexpr = TBinop(op, check_left left, right) }
-			| TVar(v,Some({ eexpr = TBinop(Ast.OpBoolAnd,_,_) } as right))
-			| TVar(v,Some({ eexpr = TBinop(Ast.OpBoolOr,_,_) } as right)) ->
-				let right = short_circuit_op_unwrap gen add_statement right in
-				Some { expr with eexpr = TVar(v, Some(right)) }
-			| TVar(v,Some(right)) when shallow_expr_type right = Statement ->
-				add_statement ({ expr with eexpr = TVar(v, Some(null right.etype right.epos)) });
-				handle_assign Ast.OpAssign { expr with eexpr = TLocal(v); etype = v.v_type } right
-			(* TIf handling *)
-			| TBinop((Ast.OpAssign as op),left, ({ eexpr = TIf _ } as right))
-			| TBinop((Ast.OpAssignOp _ as op),left,({ eexpr = TIf _ } as right)) when is_problematic_if right ->
-				handle_assign op left right
-			| TVar(v,Some({ eexpr = TIf _ } as right)) when is_problematic_if right ->
-				add_statement ({ expr with eexpr = TVar(v, Some(null right.etype right.epos)) });
-				handle_assign Ast.OpAssign { expr with eexpr = TLocal(v); etype = v.v_type } right
-			| TWhile(cond, e1, flag) when is_problematic_if cond ->
-				twhile_with_condition_statement gen add_statement expr cond e1 flag;
-				Some (null expr.etype expr.epos)
-			| _ -> None
-
-	let configure gen (on_expr_as_statement:texpr->texpr option) =
-		let add_assign = add_assign gen in
-
-		let problematic_expression_unwrap add_statement expr e_type =
-			let rec problematic_expression_unwrap is_first expr e_type =
-				match e_type, expr.eexpr with
-					| _, TBinop(Ast.OpBoolAnd, _, _)
-					| _, TBinop(Ast.OpBoolOr, _, _) -> add_assign add_statement expr (* add_assign so try_call_unwrap_expr *)
-					| KNoSideEffects, _ -> expr
-					| KStatement, _
-					| KNormalExpr, _ -> add_assign add_statement expr
-					| KExprWithStatement, TCall _
-					| KExprWithStatement, TNew _
-					| KExprWithStatement, TBinop (Ast.OpAssign,_,_)
-					| KExprWithStatement, TBinop (Ast.OpAssignOp _,_,_)
-					| KExprWithStatement, TUnop (Ast.Increment,_,_) (* all of these may have side-effects, so they must also be add_assign'ed . is_first avoids infinite loop *)
-					| KExprWithStatement, TUnop (Ast.Decrement,_,_) when not is_first -> add_assign add_statement expr
-
-					(* bugfix: Type.map_expr doesn't guarantee the correct order of execution *)
-					| KExprWithStatement, TBinop(op,e1,e2) ->
-						let e1 = problematic_expression_unwrap false e1 (expr_kind e1) in
-						let e2 = problematic_expression_unwrap false e2 (expr_kind e2) in
-						{ expr with eexpr = TBinop(op, e1, e2) }
-					| KExprWithStatement, TArray(e1,e2) ->
-						let e1 = problematic_expression_unwrap false e1 (expr_kind e1) in
-						let e2 = problematic_expression_unwrap false e2 (expr_kind e2) in
-						{ expr with eexpr = TArray(e1, e2) }
-					(* bugfix: calls should not be transformed into closure calls *)
-					| KExprWithStatement, TCall(( { eexpr = TField (ef_left, f) } as ef ), eargs) ->
-						{ expr with eexpr = TCall(
-							{ ef with eexpr = TField(problematic_expression_unwrap false ef_left (expr_kind ef_left), f) },
-							List.map (fun e -> problematic_expression_unwrap false e (expr_kind e)) eargs)
-						}
-					| KExprWithStatement, _ -> Type.map_expr (fun e -> problematic_expression_unwrap false e (expr_kind e)) expr
-			in
-			problematic_expression_unwrap true expr e_type
-		in
-
-		let rec traverse e =
-			match e.eexpr with
-				| TBlock el ->
-					let new_block = ref [] in
-					let rec process_statement e =
-						let e = no_paren e in
-						match e.eexpr, shallow_expr_type e with
-							| TCall( { eexpr = TLocal v } as elocal, elist ), _ when String.get v.v_name 0 = '_' && Hashtbl.mem gen.gspecial_vars v.v_name ->
-								new_block := { e with eexpr = TCall( elocal, List.map (fun e ->
-									match e.eexpr with
-										| TBlock _ -> traverse e
-										| _ -> e
-								) elist ) } :: !new_block
-							| _, Statement | _, Both _ ->
-								let e = match e.eexpr with | TReturn (Some ({ eexpr = TThrow _ } as ethrow)) -> ethrow | _ -> e in
-								let kinds = get_kinds e in
-								if has_problematic_expressions kinds then begin
-									match try_call_unwrap_statement gen problematic_expression_unwrap add_statement e with
-										| Some { eexpr = TConst(TNull) } (* no op *)
-										| Some { eexpr = TBlock [] } -> ()
-										| Some e ->
-											if has_problematic_expressions (get_kinds e) then begin
-												process_statement e
-											end else
-												new_block := (traverse e) :: !new_block
-										| None ->
-										(
-											let acc = ref kinds in
-											let new_e = expr_stat_map (fun e ->
-												match !acc with
-													| hd :: tl ->
-														acc := tl;
-														if has_problematic_expressions (hd :: tl) then begin
-															problematic_expression_unwrap add_statement e hd
-														end else
-															e
-													| [] -> assert false
-											) e in
-
-											new_block := (traverse new_e) :: !new_block
-										)
-								end else begin new_block := (traverse e) :: !new_block end
-							| _, Expression e ->
-								match on_expr_as_statement e with
-									| None -> ()
-									| Some e -> process_statement e
-					and add_statement expr =
-						process_statement expr
-					in
-
-					List.iter (process_statement) el;
-					let block = List.rev !new_block in
-					{ e with eexpr = TBlock(block) }
-				| TTry (block, catches) ->
-					{ e with eexpr = TTry(traverse (mk_block block), List.map (fun (v,block) -> (v, traverse (mk_block block))) catches) }
-				| TSwitch (cond,el_e_l, default) ->
-					{ e with eexpr = TSwitch(cond, List.map (fun (el,e) -> (el, traverse (mk_block e))) el_e_l, Option.map (fun e -> traverse (mk_block e)) default) }
-				| TWhile (cond,block,flag) ->
-					{e with eexpr = TWhile(cond,traverse (mk_block block), flag) }
-				| TIf (cond, eif, eelse) ->
-					{ e with eexpr = TIf(cond, traverse (mk_block eif), Option.map (fun e -> traverse (mk_block e)) eelse) }
-				| TFor (v,it,block) ->
-					{ e with eexpr = TFor(v,it, traverse (mk_block block)) }
-				| TFunction (tfunc) ->
-					{ e with eexpr = TFunction({ tfunc with tf_expr = traverse (mk_block tfunc.tf_expr) }) }
-				| _ -> e (* if expression doesn't have a block, we will exit *)
-		in
-		let map e = Some(traverse e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-(* ******************************************* *)
-(* Casts detection v2 *)
-(* ******************************************* *)
-
-(*
-
-	Will detect implicit casts and add TCast for them. Since everything is already followed by follow_all, typedefs are considered a new type altogether
-
-	Types shouldn't be cast if:
-		* When an instance is being coerced to a superclass or to an implemented interface
-		* When anything is being coerced to Dynamic
-
-	edit:
-		As a matter of performance, we will also run the type parameters casts in here. Otherwise the exact same computation would have to be performed twice,
-		with maybe even some loss of information
-
-		* TAnon / TDynamic will call
-		* Type parameter handling will be abstracted
-
-	dependencies:
-		Must run before ExpressionUnwrap
-
-*)
-
-module CastDetect =
-struct
-
-	let name = "cast_detect_2"
-
-	let priority = solve_deps name [DBefore TypeParams.priority; DBefore ExpressionUnwrap.priority]
-
-	(* ******************************************* *)
-	(* ReturnCast *)
-	(* ******************************************* *)
-
-	(*
-
-		Cast detection for return types can't be done at CastDetect time, since we need an
-		unwrapped expression to make sure we catch all return cast detections. So this module
-		is specifically to deal with that, and is configured automatically by CastDetect
-
-		dependencies:
-
-
-	*)
-
-	module ReturnCast =
-	struct
-
-		let name = "return_cast"
-
-		let priority = solve_deps name [DAfter priority; DAfter ExpressionUnwrap.priority]
-
-		let default_implementation gen =
-			let rec extract_expr e = match e.eexpr with
-				| TParenthesis e
-				| TMeta (_,e)
-				| TCast(e,_) -> extract_expr e
-				| _ -> e
-			in
-			let current_ret_type = ref None in
-			let handle e tto tfrom = gen.ghandle_cast (gen.greal_type tto) (gen.greal_type tfrom) e in
-			let in_value = ref false in
-
-			let rec run e =
-				let was_in_value = !in_value in
-				in_value := true;
-				match e.eexpr with
-				| TReturn (eopt) ->
-					(* a return must be inside a function *)
-					let ret_type = match !current_ret_type with | Some(s) -> s | None -> gen.gcon.error "Invalid return outside function declaration." e.epos; assert false in
-					(match eopt with
-					| None when not (ExtType.is_void ret_type) ->
-						{ e with eexpr = TReturn( Some(null ret_type e.epos)) }
-					| None -> e
-					| Some eret ->
-						{ e with eexpr = TReturn( Some(handle (run eret) ret_type eret.etype ) ) })
-				| TFunction(tfunc) ->
-					let last_ret = !current_ret_type in
-					current_ret_type := Some(tfunc.tf_type);
-					let ret = Type.map_expr run e in
-					current_ret_type := last_ret;
-					ret
-				| TBlock el ->
-					{ e with eexpr = TBlock ( List.map (fun e -> in_value := false; run e) el ) }
-				| TBinop ( (Ast.OpAssign as op),e1,e2)
-				| TBinop ( (Ast.OpAssignOp _ as op),e1,e2) when was_in_value ->
-					let e1 = extract_expr (run e1) in
-					let r = { e with eexpr = TBinop(op, e1, handle (run e2) e1.etype e2.etype); etype = e1.etype } in
-					handle r e.etype e1.etype
-				| TBinop ( (Ast.OpAssign as op),({ eexpr = TField(tf, f) } as e1), e2 )
-				| TBinop ( (Ast.OpAssignOp _ as op),({ eexpr = TField(tf, f) } as e1), e2 ) ->
-					(match field_access_esp gen (gen.greal_type tf.etype) (f) with
-						| FClassField(cl,params,_,_,is_static,actual_t,_) ->
-							let actual_t = if is_static then actual_t else apply_params cl.cl_params params actual_t in
-							let e1 = extract_expr (run e1) in
-							{ e with eexpr = TBinop(op, e1, handle (run e2) actual_t e2.etype); etype = e1.etype }
-						| _ ->
-							let e1 = extract_expr (run e1) in
-							{ e with eexpr = TBinop(op, e1, handle (run e2) e1.etype e2.etype); etype = e1.etype }
-					)
-				| TBinop ( (Ast.OpAssign as op),e1,e2)
-				| TBinop ( (Ast.OpAssignOp _ as op),e1,e2) ->
-					let e1 = extract_expr (run e1) in
-					{ e with eexpr = TBinop(op, e1, handle (run e2) e1.etype e2.etype); etype = e1.etype }
-				| _ -> Type.map_expr run e
-			in
-			run
-
-		let configure gen =
-			let map e = Some(default_implementation gen e) in
-			gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-
-	end;;
-
-	let get_args t = match follow t with
-		| TFun(args,ret) -> args,ret
-		| _ -> trace (debug_type t); assert false
-
-	(*
-		Since this function is applied under native-context only, the type paraters will already be changed
-	*)
-	let map_cls gen also_implements fn super =
-		let rec loop c tl =
-			if c == super then
-				fn c tl
-			else
-				(match c.cl_super with
-					| None -> false
-					| Some (cs,tls) ->
-						let tls = gen.greal_type_param (TClassDecl cs) tls in
-						loop cs (List.map (apply_params c.cl_params tl) tls)
-				)
-				||
-				(if also_implements then
-					List.exists (fun (cs,tls) -> loop cs (List.map (apply_params c.cl_params tl) tls)) c.cl_implements
-				else
-					false)
-		in
-		loop
-
-	let follow_dyn t = match follow t with
-		| TMono _ | TLazy _ -> t_dynamic
-		| t -> t
-
-	(*
-		this has a slight change from the type.ml version, in which it doesn't
-		change a TMono into the other parameter
-	*)
-	let rec type_eq gen param a b =
-		if a == b then
-			()
-		else match follow_dyn (gen.greal_type a) , follow_dyn (gen.greal_type b) with
-		| TEnum (e1,tl1) , TEnum (e2,tl2) ->
-			if e1 != e2 && not (param = EqCoreType && e1.e_path = e2.e_path) then Type.error [cannot_unify a b];
-			List.iter2 (type_eq gen param) tl1 tl2
-		| TAbstract (a1,tl1) , TAbstract (a2,tl2) ->
-			if a1 != a2 && not (param = EqCoreType && a1.a_path = a2.a_path) then Type.error [cannot_unify a b];
-			List.iter2 (type_eq gen param) tl1 tl2
-		| TInst (c1,tl1) , TInst (c2,tl2) ->
-			if c1 != c2 && not (param = EqCoreType && c1.cl_path = c2.cl_path) && (match c1.cl_kind, c2.cl_kind with KExpr _, KExpr _ -> false | _ -> true) then Type.error [cannot_unify a b];
-			List.iter2 (type_eq gen param) tl1 tl2
-		| TFun (l1,r1) , TFun (l2,r2) when List.length l1 = List.length l2 ->
-			(try
-				type_eq gen param r1 r2;
-				List.iter2 (fun (n,o1,t1) (_,o2,t2) ->
-					if o1 <> o2 then Type.error [Not_matching_optional n];
-					type_eq gen param t1 t2
-				) l1 l2
-			with
-				Unify_error l -> Type.error (cannot_unify a b :: l))
-		| TDynamic a , TDynamic b ->
-			type_eq gen param a b
-		| TAnon a1, TAnon a2 ->
-			(try
-				PMap.iter (fun n f1 ->
-					try
-						let f2 = PMap.find n a2.a_fields in
-						if f1.cf_kind <> f2.cf_kind && (param = EqStrict || param = EqCoreType || not (unify_kind f1.cf_kind f2.cf_kind)) then Type.error [invalid_kind n f1.cf_kind f2.cf_kind];
-						try
-							type_eq gen param f1.cf_type f2.cf_type
-						with
-							Unify_error l -> Type.error (invalid_field n :: l)
-					with
-						Not_found ->
-							if is_closed a2 then Type.error [has_no_field b n];
-							if not (link (ref None) b f1.cf_type) then Type.error [cannot_unify a b];
-							a2.a_fields <- PMap.add n f1 a2.a_fields
-				) a1.a_fields;
-				PMap.iter (fun n f2 ->
-					if not (PMap.mem n a1.a_fields) then begin
-						if is_closed a1 then Type.error [has_no_field a n];
-						if not (link (ref None) a f2.cf_type) then Type.error [cannot_unify a b];
-						a1.a_fields <- PMap.add n f2 a1.a_fields
-					end;
-				) a2.a_fields;
-			with
-				Unify_error l -> Type.error (cannot_unify a b :: l))
-		| _ , _ ->
-			if b == t_dynamic && (param = EqRightDynamic || param = EqBothDynamic) then
-				()
-			else if a == t_dynamic && param = EqBothDynamic then
-				()
-			else
-				Type.error [cannot_unify a b]
-
-	let type_iseq gen a b =
-		try
-			type_eq gen EqStrict a b;
-			true
-		with
-			Unify_error _ -> false
-
-	(* will return true if both arguments are compatible. If it's not the case, a runtime error is very likely *)
-	let is_cl_related gen cl tl super superl =
-		let is_cl_related cl tl super superl = map_cls gen (match cl.cl_kind,super.cl_kind with KTypeParameter _, _ | _,KTypeParameter _ -> false | _ -> true) (fun _ _ -> true) super cl tl in
-		is_cl_related cl tl super superl || is_cl_related super superl cl tl
-
-	let is_exactly_basic gen t1 t2 =
-		match gen.gfollow#run_f t1, gen.gfollow#run_f t2 with
-			| TAbstract(a1, []), TAbstract(a2, []) ->
-				a1 == a2 && Common.defined gen.gcon Define.FastCast
-			| TInst(c1, []), TInst(c2, []) ->
-				c1 == c2 && Common.defined gen.gcon Define.FastCast
-			| TEnum(e1, []), TEnum(e2, []) ->
-				e1 == e2 && Common.defined gen.gcon Define.FastCast
-			| _ ->
-				false
-
-	let rec is_unsafe_cast gen to_t from_t =
-		match (follow to_t, follow from_t) with
-			| TInst(cl_to, to_params), TInst(cl_from, from_params) ->
-				not (is_cl_related gen cl_from from_params cl_to to_params)
-			| TEnum(e_to, _), TEnum(e_from, _) ->
-				e_to.e_path <> e_from.e_path
-			| TFun _, TFun _ ->
-				(* functions are never unsafe cast by default. This behavior might be changed *)
-				(* with a later AST pass which will run through TFun to TFun casts *)
-				false
-			| TMono _, _
-			| _, TMono _
-			| TDynamic _, _
-			| _, TDynamic _ ->
-				false
-			| TAnon _, _
-			| _, TAnon _ ->
-				(* anonymous are never unsafe also. *)
-				(* Though they will generate a cast, so if this cast is unneeded it's better to avoid them by tweaking gen.greal_type *)
-				false
-			| TAbstract _, _
-			| _, TAbstract _ ->
-				(try
-					unify from_t to_t;
-					false
-				with | Unify_error _ ->
-					try
-						unify to_t from_t; (* still not unsafe *)
-						false
-					with | Unify_error _ ->
-						true)
-			| _ -> true
-
-	let unifies tfrom tto = try
-		unify tfrom tto;
-		true
-	with | _ ->
-		false
-
-	let do_unsafe_cast gen from_t to_t e	=
-		let t_path t =
-			match t with
-				| TInst(cl, _) -> cl.cl_path
-				| TEnum(e, _) -> e.e_path
-				| TType(t, _) -> t.t_path
-				| TAbstract(a, _) -> a.a_path
-				| TDynamic _ -> ([], "Dynamic")
-				| _ -> raise Not_found
-		in
-		match gen.gfollow#run_f from_t, gen.gfollow#run_f to_t with
-		| TInst({ cl_kind = KTypeParameter tl },_), t2 when List.exists (fun t -> unifies t t2) tl ->
-			mk_cast to_t (mk_cast t_dynamic e)
-		| _ ->
-			let do_default () =
-				gen.gon_unsafe_cast to_t e.etype e.epos;
-				mk_cast to_t (mk_cast t_dynamic e)
-			in
-			(* TODO: there really should be a better way to write that *)
-			try
-				if (Hashtbl.find gen.gsupported_conversions (t_path from_t)) from_t to_t then
-					mk_cast to_t e
-				else
-					do_default()
-			with
-				| Not_found ->
-					try
-						if (Hashtbl.find gen.gsupported_conversions (t_path to_t)) from_t to_t then
-							mk_cast to_t e
-						else
-							do_default()
-					with
-						| Not_found -> do_default()
-
-	(* ****************************** *)
-	(* cast handler *)
-	(* decides if a cast should be emitted, given a from and a to type *)
-	(*
-		this function is like a mini unify, without e.g. subtyping, which makes sense
-		at the backend level, since most probably Anons and TInst will have a different representation there
-	*)
-	let rec handle_cast gen e real_to_t real_from_t =
-		let do_unsafe_cast () = do_unsafe_cast gen real_from_t real_to_t { e with etype = real_from_t } in
-		let to_t, from_t = real_to_t, real_from_t in
-
-		let mk_cast fast t e =
-			match e.eexpr with
-				(* TThrow is always typed as Dynamic, we just need to type it accordingly *)
-				| TThrow _ -> { e with etype = t }
-				| _ -> if fast then mk_castfast t e else mk_cast t e
-		in
-
-		let e = { e with etype = real_from_t } in
-		if try fast_eq real_to_t real_from_t with Invalid_argument("List.for_all2") -> false then e else
-		match real_to_t, real_from_t with
-			(* string is the only type that can be implicitly converted from any other *)
-			| TInst( { cl_path = ([], "String") }, []), TInst( { cl_path = ([], "String") }, [] ) ->
-				mk_cast true to_t e
-			| TInst( { cl_path = ([], "String") }, []), _ ->
-				mk_cast false to_t e
-			| TInst(cl_to, params_to), TInst(cl_from, params_from) ->
-				let ret = ref None in
-				(*
-					this is a little confusing:
-					we are here mapping classes until we have the same to and from classes, applying the type parameters in each step, so we can
-					compare the type parameters;
-
-					If a class is found - meaning that the cl_from can be converted without a cast into cl_to,
-					we still need to check their type parameters.
-				*)
-				ignore (map_cls gen (match cl_from.cl_kind,cl_to.cl_kind with KTypeParameter _, _ | _,KTypeParameter _ -> false | _ -> true) (fun _ tl ->
-					try
-						(* type found, checking type parameters *)
-						List.iter2 (type_eq gen EqStrict) tl params_to;
-						ret := Some e;
-						true
-					with | Unify_error _ ->
-						(* type parameters need casting *)
-						if gen.ghas_tparam_cast_handler then begin
-							(*
-								if we are already handling type parameter casts on other part of code (e.g. RealTypeParameters),
-								we'll just make a cast to indicate that this place needs type parameter-involved casting
-							*)
-							ret := Some (mk_cast true to_t e);
-							true
-						end else
-							(*
-								if not, we're going to check if we only need a simple cast,
-								or if we need to first cast into the dynamic version of it
-							*)
-							try
-								List.iter2 (type_eq gen EqRightDynamic) tl params_to;
-								ret := Some (mk_cast true to_t e);
-								true
-							with | Unify_error _ ->
-								ret := Some (mk_cast true to_t (mk_cast true (TInst(cl_to, List.map (fun _ -> t_dynamic) params_to)) e));
-								true
-				) cl_to cl_from params_from);
-				if is_some !ret then
-					get !ret
-				else if is_cl_related gen cl_from params_from cl_to params_to then
-					mk_cast true to_t e
-				else
-					(* potential unsafe cast *)
-					(do_unsafe_cast ())
-			| TMono _, TMono _
-			| TMono _, TDynamic _
-			| TDynamic _, TDynamic _
-			| TDynamic _, TMono _ ->
-				e
-			| TMono _, _
-			| TDynamic _, _
-			| TAnon _, _ when gen.gneeds_box real_from_t ->
-				mk_cast false to_t e
-			| TMono _, _
-			| TDynamic _, _ -> e
-			| _, TMono _
-			| _, TDynamic _ -> mk_cast false to_t e
-			| TAnon (a_to), TAnon (a_from) ->
-				if a_to == a_from then
-					e
-				else if type_iseq gen to_t from_t then (* FIXME apply unify correctly *)
-					e
-				else
-					mk_cast true to_t e
-			| _, TAnon(anon) -> (try
-				let p2 = match !(anon.a_status) with
-				| Statics c -> TInst(c,List.map (fun _ -> t_dynamic) c.cl_params)
-				| EnumStatics e -> TEnum(e, List.map (fun _ -> t_dynamic) e.e_params)
-				| AbstractStatics a -> TAbstract(a, List.map (fun _ -> t_dynamic) a.a_params)
-				| _ -> raise Not_found
-				in
-				let tclass = match get_type gen ([],"Class") with
-				| TAbstractDecl(a) -> a
-				| _ -> assert false in
-				handle_cast gen e real_to_t (gen.greal_type (TAbstract(tclass, [p2])))
-			with | Not_found ->
-				mk_cast false to_t e)
-			| TAbstract (a_to, _), TAbstract(a_from, _) when a_to == a_from ->
-				e
-			| TAbstract _, TInst({ cl_kind = KTypeParameter _ }, _)
-			| TInst({ cl_kind = KTypeParameter _ }, _), TAbstract _ ->
-				do_unsafe_cast()
-			| TAbstract _, _
-			| _, TAbstract _ ->
-				(try
-					unify from_t to_t;
-					mk_cast true to_t e
-				with | Unify_error _ ->
-					try
-						unify to_t from_t;
-						mk_cast true to_t e
-					with | Unify_error _ ->
-						do_unsafe_cast())
-			| TEnum(e_to, []), TEnum(e_from, []) ->
-				if e_to == e_from then
-					e
-				else
-					(* potential unsafe cast *)
-					(do_unsafe_cast ())
-			| TEnum(e_to, params_to), TEnum(e_from, params_from) when e_to.e_path = e_from.e_path ->
-				(try
-						List.iter2 (type_eq gen (if gen.gallow_tp_dynamic_conversion then EqRightDynamic else EqStrict)) params_from params_to;
-						e
-					with
-						| Unify_error _ -> do_unsafe_cast ()
-				)
-			| TEnum(en, params_to), TInst(cl, params_from)
-				| TInst(cl, params_to), TEnum(en, params_from) ->
-					(* this is here for max compatibility with EnumsToClass module *)
-				if en.e_path = cl.cl_path && Meta.has Meta.Class en.e_meta then begin
-					(try
-						List.iter2 (type_eq gen (if gen.gallow_tp_dynamic_conversion then EqRightDynamic else EqStrict)) params_from params_to;
-						e
-					with
-						| Invalid_argument("List.iter2") ->
-							(*
-								this is a hack for RealTypeParams. Since there is no way at this stage to know if the class is the actual
-								EnumsToClass derived from the enum, we need to imply from possible ArgumentErrors (because of RealTypeParams interfaces),
-								that they would only happen if they were a RealTypeParams created interface
-							*)
-							e
-						| Unify_error _ -> do_unsafe_cast ()
-					)
-				end else
-					do_unsafe_cast ()
-			| TType(t_to, params_to), TType(t_from, params_from) when t_to == t_from ->
-				if gen.gspecial_needs_cast real_to_t real_from_t then
-					(try
-						List.iter2 (type_eq gen (if gen.gallow_tp_dynamic_conversion then EqRightDynamic else EqStrict)) params_from params_to;
-						e
-					with
-						| Unify_error _ -> do_unsafe_cast ()
-					)
-				else
-					e
-			| TType(t_to, _), TType(t_from,_) ->
-				if gen.gspecial_needs_cast real_to_t real_from_t then
-					mk_cast false to_t e
-				else
-					e
-			| TType _, _ when gen.gspecial_needs_cast real_to_t real_from_t ->
-				mk_cast false to_t e
-			| _, TType _ when gen.gspecial_needs_cast real_to_t real_from_t ->
-				mk_cast false to_t e
-			(*| TType(t_to, _), TType(t_from, _) ->
-				if t_to.t_path = t_from.t_path then
-					e
-				else if is_unsafe_cast gen real_to_t real_from_t then (* is_unsafe_cast will already follow both *)
-					(do_unsafe_cast ())
-				else
-					mk_cast to_t e*)
-			| TType _, _
-			| _, TType _ ->
-				if is_unsafe_cast gen real_to_t real_from_t then (* is_unsafe_cast will already follow both *)
-					(do_unsafe_cast ())
-				else
-					mk_cast false to_t e
-			| TAnon anon, _ ->
-				if PMap.is_empty anon.a_fields then
-					e
-				else
-					mk_cast true to_t e
-			| TFun(args, ret), TFun(args2, ret2) ->
-				let get_args = List.map (fun (_,_,t) -> t) in
-				(try List.iter2 (type_eq gen (EqBothDynamic)) (ret :: get_args args) (ret2 :: get_args args2); e with | Unify_error _ | Invalid_argument("List.iter2") -> mk_cast true to_t e)
-			| _, _ ->
-				do_unsafe_cast ()
-
-	(* end of cast handler *)
-	(* ******************* *)
-
-	let is_static_overload c name =
-		match c.cl_super with
-		| None -> false
-		| Some (sup,_) ->
-			let rec loop c =
-				(PMap.mem name c.cl_statics) || (match c.cl_super with
-					| None -> false
-					| Some (sup,_) -> loop sup)
-			in
-			loop sup
-
-	(* this is a workaround for issue #1743, as FInstance() is returning the incorrect classfield *)
-	let rec clean_t t = match follow t with
-		| TAbstract(a,tl) when not (Meta.has Meta.CoreType a.a_meta) ->
-			clean_t (Abstract.get_underlying_type a tl)
-		| t -> t
-
-	let select_overload gen applied_f overloads types params =
-		let rec check_arg arglist elist =
-			match arglist, elist with
-				| [], [] -> true (* it is valid *)
-				| (_,_,TAbstract({ a_path = (["haxe";"extern"],"Rest") }, [t])) :: [], elist ->
-					List.for_all (fun (_,_,et) -> Type.type_iseq (clean_t et) (clean_t t)) elist
-				| (_,_,t) :: arglist, (_,_,et) :: elist when Type.type_iseq (clean_t et) (clean_t t) ->
-					check_arg arglist elist
-				| _ -> false
-		in
-		match follow applied_f with
-		| TFun _ ->
-			replace_mono applied_f;
-			let args, _ = get_fun applied_f in
-			let elist = List.rev args in
-			let rec check_overload overloads =
-				match overloads with
-				| (t, cf) :: overloads ->
-						let cft = apply_params types params t in
-						let cft = monomorphs cf.cf_params cft in
-						let args, _ = get_fun cft in
-						if check_arg (List.rev args) elist then
-							cf,t,false
-						else if overloads = [] then
-							cf,t,true (* no compatible overload was found *)
-						else
-							check_overload overloads
-				| [] -> assert false
-			in
-			check_overload overloads
-		| _ -> match overloads with  (* issue #1742 *)
-		| (t,cf) :: [] -> cf,t,true
-		| (t,cf) :: _ -> cf,t,false
-		| _ -> assert false
-
-	let choose_ctor gen cl tparams etl maybe_empty_t p =
-		let ctor, sup, stl = OverloadingConstructor.cur_ctor cl tparams in
-		(* get returned stl, with Dynamic as t_empty *)
-		let rec get_changed_stl c tl =
-			if c == sup then
-				tl
-			else match c.cl_super with
-			| None -> stl
-			| Some(sup,stl) -> get_changed_stl sup (List.map (apply_params c.cl_params tl) stl)
-		in
-		let ret_tparams = List.map (fun t -> match follow t with
-		| TDynamic _ | TMono _ -> t_empty
-		| _ -> t) tparams in
-		let ret_stl = get_changed_stl cl ret_tparams in
-		let ctors = ctor :: ctor.cf_overloads in
-		List.iter replace_mono etl;
-		(* first filter out or select outright maybe_empty *)
-		let ctors, is_overload = match etl, maybe_empty_t with
-		| [t], Some empty_t ->
-			let count = ref 0 in
-			let is_empty_call = Type.type_iseq t empty_t in
-			let ret = List.filter (fun cf -> match follow cf.cf_type with
-			(* | TFun([_,_,t],_) -> incr count; true *)
-			| TFun([_,_,t],_) ->
-				replace_mono t; incr count; is_empty_call = (Type.type_iseq t empty_t)
-			| _ -> false) ctors in
-			ret, !count > 1
-		| _ ->
-			let len = List.length etl in
-			let ret = List.filter (fun cf -> List.length (fst (get_fun cf.cf_type)) = len) ctors in
-			ret, (match ret with | _ :: [] -> false | _ -> true)
-		in
-		let rec check_arg arglist elist =
-			match arglist, elist with
-			| [], [] -> true
-			| (_,_,t) :: arglist, et :: elist -> (try
-				let t = run_follow gen t in
-				unify et t;
-				check_arg arglist elist
-			with | Unify_error el ->
-				(* List.iter (fun el -> gen.gcon.warning (Typecore.unify_error_msg (print_context()) el) p) el; *)
-				false)
-			| _ ->
-				false
-		in
-		let rec check_cf cf =
-			let t = apply_params sup.cl_params stl cf.cf_type in
-			replace_mono t;
-			let args, _ = get_fun t in
-			check_arg args etl
-		in
-		match is_overload, ctors with
-			| false, [c] ->
-				false, c, sup, ret_stl
-			| _ ->
-				is_overload, List.find check_cf ctors, sup, ret_stl
-
-	let change_rest tfun elist =
-		let rec loop acc arglist elist = match arglist, elist with
-			| (_,_,TAbstract({ a_path = (["haxe";"extern"],"Rest") },[t])) :: [], elist ->
-				List.rev (List.map (fun _ -> "rest",false,t) elist @ acc)
-			| (n,o,t) :: arglist, _ :: elist ->
-				loop ((n,o,t) :: acc) arglist elist
-			| _, _ ->
-				List.rev acc
-		in
-		let args,ret = get_fun tfun in
-		TFun(loop [] args elist, ret)
-
-	let fastcast_if_needed gen expr real_to_t real_from_t =
-		if Common.defined gen.gcon Define.FastCast then begin
-			if type_iseq gen real_to_t real_from_t then
-				{ expr with etype = real_to_t }
-			else
-				mk_castfast real_to_t { expr with etype=real_from_t }
-		end else
-			handle_cast gen expr real_to_t real_from_t
-
-	(*
-		Type parameter handling
-		It will detect if/what type parameters were used, and call the cast handler
-		It will handle both TCall(TField) and TCall by receiving a texpr option field: e
-		Also it will transform the type parameters with greal_type_param and make
-
-		handle_impossible_tparam - should cases where the type parameter is impossible to be determined from the called parameters be Dynamic?
-		e.g. static function test<T>():T {}
-	*)
-
-	(* match e.eexpr with | TCall( ({ eexpr = TField(ef, f) }) as e1, elist ) -> *)
-	let handle_type_parameter gen e e1 ef ~clean_ef ~overloads_cast_to_base f elist calls_parameters_explicitly =
-		(* the ONLY way to know if this call has parameters is to analyze the calling field. *)
-		(* To make matters a little worse, on both C# and Java only in some special cases that type parameters will be used *)
-		(* Namely, when using reflection type parameters are useless, of course. This also includes anonymous types *)
-		(* this will have to be handled by gparam_func_call *)
-
-		let return_var efield =
-			match e with
-				| None ->
-					efield
-				| Some ecall ->
-					match follow efield.etype with
-						| TFun(_,ret) ->
-							(* closures will be handled by the closure handler. So we will just hint what's the expected type *)
-							(* FIXME: should closures have also its arguments cast correctly? In the current implementation I think not. TO_REVIEW *)
-							handle_cast gen { ecall with eexpr = TCall(efield, elist) } (gen.greal_type ecall.etype) ret
-						| _ ->
-							{ ecall with eexpr = TCall(efield, elist) }
-		in
-
-		let real_type = gen.greal_type ef.etype in
-		(* this part was rewritten at roughly r6477 in order to correctly support overloads *)
-		(match field_access_esp gen real_type (f) with
-		| FClassField (cl, params, _, cf, is_static, actual_t, declared_t) when e <> None && (cf.cf_kind = Method MethNormal || cf.cf_kind = Method MethInline) ->
-				(* C# target changes params with a real_type function *)
-				let params = match follow clean_ef.etype with
-					| TInst(_,params) -> params
-					| _ -> params
-				in
-				let local_mk_cast t expr =
-					(* handle_cast gen expr t expr.etype *)
-					if is_exactly_basic gen t expr.etype then
-						expr
-					else
-						mk_castfast t expr
-				in
-
-				let ecall = get e in
-				let ef = ref ef in
-				let is_overload = cf.cf_overloads <> [] || Meta.has Meta.Overload cf.cf_meta || (is_static && is_static_overload cl (field_name f)) in
-				let cf, actual_t, error = match is_overload with
-					| false ->
-							(* since actual_t from FClassField already applies greal_type, we're using the get_overloads helper to get this info *)
-							let t = if cf.cf_params = [] then (* this if statement must be eliminated - it's a workaround for #3516 + infer params. *)
-								actual_t
-							else
-								declared_t
-							in
-							cf,t,false
-					| true ->
-					let (cf, actual_t, error), is_static = match f with
-						| FInstance(c,_,cf) | FClosure(Some (c,_),cf) ->
-							(* get from overloads *)
-							(* FIXME: this is a workaround for issue #1743 . Uncomment this code after it was solved *)
-							(* let t, cf = List.find (fun (t,cf2) -> cf == cf2) (Overloads.get_overloads cl (field_name f)) in *)
-							(* cf, t, false *)
-							select_overload gen e1.etype (Overloads.get_overloads cl (field_name f)) cl.cl_params params, false
-						| FStatic(c,f) ->
-							(* workaround for issue #1743 *)
-							(* f,f.cf_type, false *)
-							select_overload gen e1.etype ((f.cf_type,f) :: List.map (fun f -> f.cf_type,f) f.cf_overloads) [] [], true
-						| _ ->
-							gen.gcon.warning "Overloaded classfield typed as anonymous" ecall.epos;
-							(cf, actual_t, true), true
-					in
-
-					if not (is_static || error) then match find_first_declared_field gen cl ~exact_field:{ cf with cf_type = actual_t } cf.cf_name with
-					| Some(cf_orig,actual_t,_,_,declared_cl,tl,tlch) ->
-						let rec is_super e = match e.eexpr with
-							| TConst TSuper -> true
-							| TParenthesis p | TMeta(_,p) -> is_super p
-							| _ -> false
-						in
-						if declared_cl != cl && overloads_cast_to_base && not (is_super !ef) then begin
-							let pos = (!ef).epos in
-							ef := {
-								eexpr = TCall(
-									{ eexpr = TLocal(alloc_var "__as__" t_dynamic); etype = t_dynamic; epos = pos },
-									[!ef]);
-								etype = TInst(declared_cl,List.map (apply_params cl.cl_params params) tl);
-								epos = pos
-							}
-						end;
-						{ cf_orig with cf_name = cf.cf_name },actual_t,false
-					| None ->
-						gen.gcon.warning "Cannot find matching overload" ecall.epos;
-						cf, actual_t, true
-					else
-						cf,actual_t,error
-				in
-
-				(* take off Rest param *)
-				let actual_t = change_rest actual_t elist in
-				(* set the real (selected) class field *)
-				let f = match f with
-					| FInstance(c,tl,_) -> FInstance(c,tl,cf)
-					| FClosure(c,_) -> FClosure(c,cf)
-					| FStatic(c,_) -> FStatic(c,cf)
-					| f -> f
-				in
-				let error = error || (match follow actual_t with | TFun _ -> false | _ -> true) in
-				if error then (* if error, ignore arguments *)
-					if ExtType.is_void ecall.etype then
-						{ ecall with eexpr = TCall({ e1 with eexpr = TField(!ef, f) }, elist ) }
-					else
-						local_mk_cast ecall.etype { ecall with eexpr = TCall({ e1 with eexpr = TField(!ef, f) }, elist ) }
-				else begin
-					(* infer arguments *)
-					(* let called_t = TFun(List.map (fun e -> "arg",false,e.etype) elist, ecall.etype) in *)
-					let called_t = match follow e1.etype with | TFun _ -> e1.etype | _ -> TFun(List.map (fun e -> "arg",false,e.etype) elist, ecall.etype)	in (* workaround for issue #1742 *)
-					let called_t = change_rest called_t elist in
-					let fparams = TypeParams.infer_params gen ecall.epos (get_fun (apply_params cl.cl_params params actual_t)) (get_fun called_t) cf.cf_params calls_parameters_explicitly in
-					(* get what the backend actually sees *)
-					(* actual field's function *)
-					let actual_t = get_real_fun gen actual_t in
-					let real_params = gen.greal_type_param (TClassDecl cl) params in
-					let function_t = apply_params cl.cl_params real_params actual_t in
-					let real_fparams = if calls_parameters_explicitly then
-						gen.greal_type_param (TClassDecl cl) fparams
-					else
-						gen.greal_type_param (TClassDecl cl) (TypeParams.infer_params gen ecall.epos (get_fun function_t) (get_fun (get_real_fun gen called_t)) cf.cf_params calls_parameters_explicitly) in
-					let function_t = get_real_fun gen (apply_params cf.cf_params real_fparams function_t) in
-					let args_ft, ret_ft = get_fun function_t in
-					(* applied function *)
-					let applied = elist in
-					(* check types list *)
-					let new_ecall, elist = try
-						let elist = List.map2 (fun applied (_,_,funct) ->
-							match is_overload || real_fparams <> [], applied.eexpr with
-							| true, TConst TNull ->
-								mk_castfast (gen.greal_type funct) applied
-							| true, _ -> (* when not (type_iseq gen (gen.greal_type applied.etype) funct) -> *)
-								let ret = handle_cast gen applied (funct) (gen.greal_type applied.etype) in
-								(match ret.eexpr with
-								| TCast _ -> ret
-								| _ -> local_mk_cast (funct) ret)
-							| _ ->
-								handle_cast gen applied (funct) (gen.greal_type applied.etype)
-						) applied args_ft in
-						{ ecall with
-							eexpr = TCall(
-								{ e1 with eexpr = TField(!ef, f) },
-								elist);
-						}, elist
-					with | Invalid_argument("List.map2") ->
-						gen.gcon.warning ("This expression may be invalid" ) ecall.epos;
-						{ ecall with eexpr = TCall({ e1 with eexpr = TField(!ef, f) }, elist) }, elist
-					in
-					let new_ecall = if fparams <> [] then gen.gparam_func_call new_ecall { e1 with eexpr = TField(!ef, f) } fparams elist else new_ecall in
-					let ret = handle_cast gen new_ecall (gen.greal_type ecall.etype) (gen.greal_type ret_ft) in
-					(match gen.gcon.platform, cf.cf_params, ret.eexpr with
-						| _, _, TCast _ -> ret
-						| Java, _ :: _, _ ->
-							(* this is a workaround for a javac openjdk issue with unused type parameters and return type inference *)
-							(* see more at issue #3123 *)
-							mk_cast (gen.greal_type ret_ft) new_ecall
-						| _ -> ret)
-				end
-		| FClassField (cl,params,_,{ cf_kind = (Method MethDynamic | Var _) },_,actual_t,_) ->
-			(* if it's a var, we will just try to apply the class parameters that have been changed with greal_type_param *)
-			let t = apply_params cl.cl_params (gen.greal_type_param (TClassDecl cl) params) (gen.greal_type actual_t) in
-			return_var (handle_cast gen { e1 with eexpr = TField(ef, f) } (gen.greal_type e1.etype) (gen.greal_type t))
-		| FClassField (cl,params,_,cf,_,actual_t,_) ->
-			return_var (handle_cast gen { e1 with eexpr = TField({ ef with etype = t_dynamic }, f) } e1.etype t_dynamic) (* force dynamic and cast back to needed type *)
-		| FEnumField (en, efield, true) ->
-			let ecall = match e with | None -> trace (field_name f); trace efield.ef_name; gen.gcon.error "This field should be called immediately" ef.epos; assert false | Some ecall -> ecall in
-			(match en.e_params with
-				(*
-				| [] ->
-					let args, ret = get_args (efield.ef_type) in
-					let ef = { ef with eexpr = TTypeExpr( TEnumDecl en ); etype = TEnum(en, []) } in
-					handle_cast gen { ecall with eexpr = TCall({ e1 with eexpr = TField(ef, FEnum(en, efield)) }, List.map2 (fun param (_,_,t) -> handle_cast gen param (gen.greal_type t) (gen.greal_type param.etype)) elist args) } (gen.greal_type ecall.etype) (gen.greal_type ret)
-			*)
-				| _ ->
-					let pt = match e with | None -> real_type | Some _ -> snd (get_fun e1.etype) in
-					let _params = match follow pt with | TEnum(_, p) -> p | _ -> gen.gcon.warning (debug_expr e1) e1.epos; assert false in
-					let args, ret = get_args efield.ef_type in
-					let actual_t = TFun(List.map (fun (n,o,t) -> (n,o,gen.greal_type t)) args, gen.greal_type ret) in
-					(*
-						because of differences on how <Dynamic> is handled on the platforms, this is a hack to be able to
-						correctly use class field type parameters with RealTypeParams
-					*)
-					let cf_params = List.map (fun t -> match follow t with | TDynamic _ -> t_empty | _ -> t) _params in
-					let t = apply_params en.e_params (gen.greal_type_param (TEnumDecl en) cf_params) actual_t in
-					let t = apply_params efield.ef_params (List.map (fun _ -> t_dynamic) efield.ef_params) t in
-
-					let args, ret = get_args t in
-
-					let elist = List.map2 (fun param (_,_,t) -> handle_cast gen (param) (gen.greal_type t) (gen.greal_type param.etype)) elist args in
-					let e1 = { e1 with eexpr = TField({ ef with eexpr = TTypeExpr( TEnumDecl en ); etype = TEnum(en, _params) }, FEnum(en, efield) ) } in
-					let new_ecall = gen.gparam_func_call ecall e1 _params elist in
-
-					handle_cast gen new_ecall (gen.greal_type ecall.etype) (gen.greal_type ret)
-			)
-		| FEnumField _ when is_some e -> assert false
-		| FEnumField (en,efield,_) ->
-				return_var { e1 with eexpr = TField({ ef with eexpr = TTypeExpr( TEnumDecl en ); },FEnum(en,efield)) }
-		(* no target by date will uses this.so this code may not be correct at all *)
-		| FAnonField cf ->
-			let t = gen.greal_type cf.cf_type in
-			return_var (handle_cast gen { e1 with eexpr = TField(ef, f) } (gen.greal_type e1.etype) t)
-		| FNotFound
-		| FDynamicField _ ->
-			if is_some e then
-				return_var { e1 with eexpr = TField(ef, f) }
-			else
-				return_var (handle_cast gen { e1 with eexpr = TField({ ef with etype = t_dynamic }, f) } e1.etype t_dynamic) (* force dynamic and cast back to needed type *)
-		)
-
-	(* end of type parameter handling *)
-	(* ****************************** *)
-
-	(** overloads_cast_to_base argument will cast overloaded function types to the class that declared it. **)
-	(**			This is necessary for C#, and if true, will require the target to implement __as__, as a `quicker` form of casting **)
-	let configure gen ?(overloads_cast_to_base = false) maybe_empty_t calls_parameters_explicitly =
-		let handle e t1 t2 = handle_cast gen e (gen.greal_type t1) (gen.greal_type t2) in
-
-		let in_value = ref false in
-
-		let rec clean_cast e = match e.eexpr with
-		 | TCast(e,_) -> clean_cast e
-		 | TParenthesis(e) | TMeta(_,e) -> clean_cast e
-		 | _ -> e
-		in
-
-		let get_abstract_impl t = match t with
-			| TAbstract(a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
-				Abstract.get_underlying_type a pl
-			| t -> t
-		in
-
-		let rec is_abstract_to_struct t = match t with
-			| TAbstract(a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
-				is_abstract_to_struct (Abstract.get_underlying_type a pl)
-			| TInst(c,_) when Meta.has Meta.Struct c.cl_meta ->
-				true
-			| _ -> false
-		in
-
-		let binop_type op main_expr e1 e2 =
-			let name = platform_name gen.gcon.platform in
-			let basic = gen.gcon.basic in
-			(* If either operand is of type decimal, the other operand is converted to type decimal, or a compile-time error occurs if the other operand is of type float or double.
-			 * Otherwise, if either operand is of type double, the other operand is converted to type double.
-			 * Otherwise, if either operand is of type float, the other operand is converted to type float.
-			 * Otherwise, if either operand is of type ulong, the other operand is converted to type ulong, or a compile-time error occurs if the other operand is of type sbyte, short, int, or long.
-			 * Otherwise, if either operand is of type long, the other operand is converted to type long.
-			 * Otherwise, if either operand is of type uint and the other operand is of type sbyte, short, or int, both operands are converted to type long.
-			 * Otherwise, if either operand is of type uint, the other operand is converted to type uint.
-			 * Otherwise, both operands are converted to type int.
-			 *  *)
-			let t1, t2 = follow (run_follow gen e1.etype), follow (run_follow gen e2.etype) in
-			match t1, t2 with
-				| TAbstract(a1,[]), TAbstract(a2,[]) when a1 == a2 ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
-				| TInst(i1,[]), TInst(i2,[]) when i1 == i2 ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
-				| TInst({ cl_path = ([],"String") },[]), _ when op = OpAdd ->
-					{ main_expr with eexpr = TBinop(op, e1, mk_cast basic.tstring e2); etype = basic.tstring }
-				| _, TInst({ cl_path = ([],"String") },[]) when op = OpAdd ->
-					{ main_expr with eexpr = TBinop(op, mk_cast basic.tstring e1, e2); etype = basic.tstring }
-				| TAbstract({ a_path = ([], "Float") }, []), _ ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
-				| _, TAbstract({ a_path = ([], "Float") }, []) ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e2.etype }
-				| TAbstract({ a_path = ([], "Single") }, []), _ ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
-				| _, TAbstract({ a_path = ([], "Single") }, []) ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e2.etype }
-				| TAbstract({ a_path = ([pf], "UInt64") }, []), _ when pf = name ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
-				| _, TAbstract({ a_path = ([pf], "UInt64") }, []) when pf = name ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e2.etype }
-				| TAbstract({ a_path = ([pf], "Int64") }, []), _ when pf = name ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
-				| _, TAbstract({ a_path = ([pf], "Int64") }, []) when pf = name ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e2.etype }
-				| TAbstract({ a_path = ([], "UInt") }, []), tother when like_int tother ->
-					let ti64 = mt_to_t_dyn ( get_type gen ([name], "Int64") ) in
-					let ret = { main_expr with eexpr = TBinop(op, e1, e2); etype = ti64 } in
-					if op <> OpDiv then
-						mk_cast t1 ret
-					else
-						ret
-				| tother, TAbstract({ a_path = ([], "UInt") }, []) when like_int tother ->
-					let ti64 = mt_to_t_dyn ( get_type gen ([name], "Int64") ) in
-					let ret = { main_expr with eexpr = TBinop(op, e1, e2); etype = ti64 } in
-					if op <> OpDiv then
-						mk_cast t2 ret
-					else
-						ret
-				| TAbstract({ a_path = ([], "UInt") }, []), _ ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e1.etype }
-				| _, TAbstract({ a_path = ([], "UInt") }, []) ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = e2.etype }
-				| TAbstract(a1,[]), TAbstract(a2,[]) ->
-					{ main_expr with eexpr = TBinop(op, e1, e2); etype = basic.tint }
-				| _ ->
-					{ main_expr with eexpr = TBinop(op, e1, e2) }
-		in
-		let binop_type = if Common.defined gen.gcon Define.FastCast then
-			binop_type
-		else
-			fun op main_expr e1 e2 -> { main_expr with eexpr = TBinop(op, e1, e2) }
-		in
-
-		let rec run ?(just_type = false) e =
-			let handle = if not just_type then handle else fun e t1 t2 -> { e with etype = gen.greal_type t2 } in
-			let was_in_value = !in_value in
-			in_value := true;
-			match e.eexpr with
-				| TConst ( TInt _ | TFloat _ | TBool _ as const ) ->
-					(* take off any Null<> that it may have *)
-					let t = follow (run_follow gen e.etype) in
-					(* do not allow constants typed as Single - need to cast them *)
-					let real_t = match const with
-						| TInt _ -> gen.gcon.basic.tint
-						| TFloat _ -> gen.gcon.basic.tfloat
-						| TBool _ -> gen.gcon.basic.tbool
-						| _ -> assert false
-					in
-					handle e t real_t
-				| TCast( { eexpr = TConst TNull }, _ ) ->
-					{ e with eexpr = TConst TNull }
-				| TCast( { eexpr = TCall( { eexpr = TLocal { v_name = "__delegate__" } } as local, [del] ) } as e2, _) ->
-					{ e with eexpr = TCast({ e2 with eexpr = TCall(local, [Type.map_expr run del]) }, None) }
-
-				| TBinop ( (Ast.OpAssign | Ast.OpAssignOp _ as op), e1, e2 ) ->
-					let e1 = run ~just_type:true e1 in
-					let e2 = handle (run e2) e1.etype e2.etype in
-					{ e with eexpr = TBinop(op, clean_cast e1, e2) }
-				| TBinop ( (Ast.OpShl | Ast.OpShr | Ast.OpUShr as op), e1, e2 ) ->
-					let e1 = run e1 in
-					let e2 = handle (run e2) (gen.gcon.basic.tint) e2.etype in
-					let rett = binop_type op e e1 e2 in
-					{ e with eexpr = TBinop(op, e1, e2); etype = rett.etype }
-				| TBinop( (OpAdd | OpMult | OpDiv | OpSub | OpAnd | OpOr | OpXor | OpMod) as op, e1, e2 ) ->
-					binop_type op e (run e1) (run e2)
-				| TBinop( (OpEq | OpNotEq | OpGt | OpGte | OpLt | OpLte | OpBoolAnd | OpBoolOr) as op, e1, e2 ) ->
-					handle { e with eexpr = TBinop(op, run e1, run e2) } e.etype gen.gcon.basic.tbool
-				| TField(ef, f) ->
-					handle_type_parameter gen None e (run ef) ~clean_ef:ef ~overloads_cast_to_base:overloads_cast_to_base f [] calls_parameters_explicitly
-				| TArrayDecl el ->
-					let et = e.etype in
-					let base_type = match follow et with
-						| TInst({ cl_path = ([], "Array") } as cl, bt) -> gen.greal_type_param (TClassDecl cl) bt
-						| _ ->
-							gen.gcon.warning (debug_type et) e.epos;
-							(match gen.gcurrent_class with
-								| Some cl -> print_endline (s_type_path cl.cl_path)
-								| _ -> ());
-							assert false
-					in
-					let base_type = List.hd base_type in
-					{ e with eexpr = TArrayDecl( List.map (fun e -> handle (run e) base_type e.etype) el ); etype = et }
-				| TCall ({ eexpr = TLocal { v_name = "__array__" } } as arr_local, el) ->
-					let et = e.etype in
-					let base_type = match follow et with
-						| TInst(cl, bt) -> gen.greal_type_param (TClassDecl cl) bt
-						| _ -> assert false
-					in
-					let base_type = List.hd base_type in
-					{ e with eexpr = TCall(arr_local, List.map (fun e -> handle (run e) base_type e.etype) el ); etype = et }
-				| TCall( ({ eexpr = TLocal v } as local), params ) when String.get v.v_name 0 = '_' && String.get v.v_name 1 = '_' && Hashtbl.mem gen.gspecial_vars v.v_name ->
-					{ e with eexpr = TCall(local, List.map (fun e -> (match e.eexpr with TBlock _ -> in_value := false | _ -> ()); run e) params) }
-				| TCall( ({ eexpr = TField(ef, f) }) as e1, elist ) ->
-					handle_type_parameter gen (Some e) (e1) (run ef) ~clean_ef:ef ~overloads_cast_to_base:overloads_cast_to_base f (List.map run elist) calls_parameters_explicitly
-
-				(* the TNew and TSuper code was modified at r6497 *)
-				| TCall( { eexpr = TConst TSuper } as ef, eparams ) ->
-					let cl, tparams = match follow ef.etype with
-					| TInst(cl,p) ->
-						cl,p
-					| _ -> assert false in
-					(try
-						let is_overload, cf, sup, stl = choose_ctor gen cl tparams (List.map (fun e -> e.etype) eparams) maybe_empty_t e.epos in
-						let handle e t1 t2 =
-							if is_overload then
-								let ret = handle e t1 t2 in
-								match ret.eexpr with
-								| TCast _ -> ret
-								| _ -> mk_cast (gen.greal_type t1) e
-							else
-								handle e t1 t2
-						in
-						let stl = gen.greal_type_param (TClassDecl sup) stl in
-						let args, _ = get_fun (apply_params sup.cl_params stl cf.cf_type) in
-						let eparams = List.map2 (fun e (_,_,t) ->
-							handle (run e) t e.etype
-						) eparams args in
-						{ e with eexpr = TCall(ef, eparams) }
-					with | Not_found ->
-						gen.gcon.warning "No overload found for this constructor call" e.epos;
-						{ e with eexpr = TCall(ef, List.map run eparams) })
-				| TCall (ef, eparams) ->
-					(match ef.etype with
-						| TFun(p, ret) ->
-							handle ({ e with eexpr = TCall(run ef, List.map2 (fun param (_,_,t) -> handle (run param) t param.etype) eparams p) }) e.etype ret
-						| _ -> Type.map_expr run e
-					)
-				(* the TNew and TSuper code was modified at r6497 *)
-				| TNew ({ cl_kind = KTypeParameter _ }, _, _) ->
-					Type.map_expr run e
-				| TNew (cl, tparams, eparams) -> (try
-					let is_overload, cf, sup, stl = choose_ctor gen cl tparams (List.map (fun e -> e.etype) eparams) maybe_empty_t e.epos in
-					let handle e t1 t2 =
-						if is_overload then
-							let ret = handle e t1 t2 in
-							match ret.eexpr with
-							| TCast _ -> ret
-							| _ -> mk_cast (gen.greal_type t1) e
-						else
-							handle e t1 t2
-					in
-					let stl = gen.greal_type_param (TClassDecl sup) stl in
-					let args, _ = get_fun (apply_params sup.cl_params stl cf.cf_type) in
-					let eparams = List.map2 (fun e (_,_,t) ->
-						handle (run e) t e.etype
-					) eparams args in
-					{ e with eexpr = TNew(cl, tparams, eparams) }
-				with | Not_found ->
-					gen.gcon.warning "No overload found for this constructor call" e.epos;
-					{ e with eexpr = TNew(cl, tparams, List.map run eparams) })
-				| TArray(arr, idx) ->
-					let arr_etype = match follow arr.etype with
-						| (TInst _ as t) -> t
-						| TAbstract (a, pl) when not (Meta.has Meta.CoreType a.a_meta) ->
-							follow (Abstract.get_underlying_type a pl)
-						| t -> t
-					in
-					let idx = run idx in
-					let idx = match gen.greal_type idx.etype with
-						| TAbstract({ a_path = [],"Int" },_) -> idx
-						| _ -> match handle idx gen.gcon.basic.tint (gen.greal_type idx.etype) with
-							| ({ eexpr = TCast _ } as idx) -> idx
-							| idx -> mk_cast gen.gcon.basic.tint idx
-					in
-					let e = { e with eexpr = TArray(run arr, idx) } in
-					(* get underlying class (if it's a class *)
-					(match arr_etype with
-						| TInst(cl, params) ->
-							(* see if it implements ArrayAccess *)
-							(match cl.cl_array_access with
-								| None -> e
-								| Some t ->
-									(* if it does, apply current parameters (and change them) *)
-									(* let real_t = apply_params_internal (List.map (gen.greal_type_param (TClassDecl cl))) cl params t in *)
-									let param = apply_params cl.cl_params (gen.greal_type_param (TClassDecl cl) params) t in
-									let real_t = apply_params cl.cl_params params param in
-									(* see if it needs a cast *)
-
-									fastcast_if_needed gen e (gen.greal_type e.etype) (gen.greal_type real_t)
-									(* handle (e) (gen.greal_type e.etype) (gen.greal_type real_t) *)
-							)
-						| _ -> Type.map_expr run e)
-				| TVar (v, eopt) ->
-					{ e with eexpr = TVar (v, match eopt with
-							| None -> eopt
-							| Some e -> Some( handle (run e) v.v_type e.etype ))
-					}
-				(* FIXME deal with in_value when using other statements that may not have a TBlock wrapped on them *)
-				| TIf (econd, ethen, Some(eelse)) when was_in_value ->
-					{ e with eexpr = TIf (handle (run econd) gen.gcon.basic.tbool econd.etype, handle (run ethen) e.etype ethen.etype, Some( handle (run eelse) e.etype eelse.etype ) ) }
-				| TIf (econd, ethen, eelse) ->
-					{ e with eexpr = TIf (handle (run econd) gen.gcon.basic.tbool econd.etype, (in_value := false; run (mk_block ethen)), Option.map (fun e -> in_value := false; run (mk_block e)) eelse) }
-				| TWhile (econd, e1, flag) ->
-					{ e with eexpr = TWhile (handle (run econd) gen.gcon.basic.tbool econd.etype, (in_value := false; run (mk_block e1)), flag) }
-				| TSwitch (cond, el_e_l, edef) ->
-					{ e with eexpr = TSwitch(run cond, List.map (fun (el,e) -> (List.map run el, (in_value := false; run (mk_block e)))) el_e_l, Option.map (fun e -> in_value := false; run (mk_block e)) edef) }
-				| TFor (v,cond,e1) ->
-					{ e with eexpr = TFor(v, run cond, (in_value := false; run (mk_block e1))) }
-				| TTry (e, ve_l) ->
-					{ e with eexpr = TTry((in_value := false; run (mk_block e)), List.map (fun (v,e) -> in_value := false; (v, run (mk_block e))) ve_l) }
-				| TBlock el ->
-					let i = ref 0 in
-					let len = List.length el in
-					{ e with eexpr = TBlock ( List.map (fun e ->
-						incr i;
-						if !i <> len || not was_in_value then
-							in_value := false;
-						run e
-					) el ) }
-				| TCast (expr, md) when ExtType.is_void (follow e.etype) ->
-					run expr
-				| TCast (expr, md) ->
-					let rec get_null e =
-						match e.eexpr with
-						| TConst TNull -> Some e
-						| TParenthesis e | TMeta(_,e) -> get_null e
-						| _ -> None
-					in
-
-					(match get_null expr with
-					| Some enull ->
-							if gen.gcon.platform = Cs then
-								{ enull with etype = gen.greal_type e.etype }
-							else
-								mk_cast (gen.greal_type e.etype) enull
-					| _ when is_abstract_to_struct expr.etype && type_iseq gen e.etype (get_abstract_impl expr.etype) ->
-						run { expr with etype = expr.etype }
-					| _ when is_exactly_basic gen expr.etype e.etype ->
-						run { expr with etype = expr.etype }
-					| _ ->
-						match gen.greal_type e.etype, gen.greal_type expr.etype with
-							| (TInst(c,tl) as tinst1), TAbstract({ a_path = ["cs"],"Pointer" }, [tinst2]) when type_iseq gen tinst1 (gen.greal_type tinst2) ->
-								run expr
-							| _ ->
-								let last_unsafe = gen.gon_unsafe_cast in
-								gen.gon_unsafe_cast <- (fun t t2 pos -> ());
-								let ret = handle (run expr) e.etype expr.etype in
-								gen.gon_unsafe_cast <- last_unsafe;
-								match ret.eexpr with
-									| TCast _ -> { ret with etype = gen.greal_type e.etype }
-									| _ -> { e with eexpr = TCast(ret,md); etype = gen.greal_type e.etype }
-					)
-				(*| TCast _ ->
-					(* if there is already a cast, we should skip this cast check *)
-					Type.map_expr run e*)
-				| TFunction f ->
-					in_value := false;
-					Type.map_expr run e
-
-				| _ -> Type.map_expr run e
-		in
-		gen.ghandle_cast <- (fun tto tfrom expr -> handle_cast gen expr (gen.greal_type tto) (gen.greal_type tfrom));
-		let map e = match gen.gcurrent_classfield with
-			| Some(cf) when Meta.has (Meta.Custom ":skipCastDetect") cf.cf_meta ->
-				None
-			| _ ->
-				Some(run e)
-		in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map;
-		ReturnCast.configure gen
-
-end;;
-
-(* ******************************************* *)
-(* Reflection-enabling Class fields *)
-(* ******************************************* *)
-
-(*
-	This is the most hardcore codegen part of the code. There's much to improve so this code can be more readable, but at least it's running correctly right now! This will be improved. (TODO)
-
-	This module will create class fields that enable reflection for targets that have a slow or inexistent reflection abilities. Because of the similarity
-	of strategies between what should have been different modules, they are all unified in this reflection-enabling class fields.
-
-	They include:
-		* Get(throwErrors, isCheck) / Set fields . Remember to allow implements Dynamic also.
-		* Invoke fields() -> You need to configure how many invoke_field fields there will be. + invokeDynamic
-		* Has field -> parameter in get field that returns __undefined__ if it doesn't exist.
-
-		* GetType -> return the current Class<> / Enum<>
-		* Fields() -> returns all the fields / static fields. Remember to allow implements Dynamic also
-
-		* Create(arguments array), CreateEmpty - calls new() or create empty
-		* getInstanceFields / getClassFields -> show even function fields, everything!
-
-		* deleteField -> only for implements Dynamic
-
-		for enums:
-		* createEnum -> invokeField for classes
-		* createEnumIndex -> use invokeField as well, and use numbers e.g. "0", "1", "2" .... For this, use "@:alias" metadata
-		* getEnumConstructs -> fields()
-
-		need to be solved outside:
-		* getEnumName
-		* enumIndex
-		*
-
-		need to be solved by haxe code:
-		* enumParameters -> for (field in Reflect.fields(enum)) arr.push(Reflect.field(enum, field))
-
-	Standard:
-		if a class contains a @:$enum metadata, it's treated as a converted enum to class
-
-
-	Optimizations:
-		* if optimize is true, all fields will be hashed by the same hashing function as neko (31 bits int : always positive). Every function that expects a string for the field will expect also an int, for the hash
-			a string (which is nullable for compile-time hashes) + an int.
-			At compile-time, a collision will throw an error (like neko).
-			At runtime, a collision will make a negative int. Negative ints will always resolve to a special Hash<> field which takes a string.
-		* if optimize is true, Reflect.field/setField will be replaced by either the runtime version (with already hashed string), either by the own .Field()/.SetField() HxObject's version,
-			if the type is detected to already be hxgen
-		* TODO: if for() optimization for arrays is disabled, we can replace for(field in Reflect.fields(obj)) to:
-			for (field in ( (Std.is(obj, HxObject) ? ((HxObject)obj).Fields() : Reflect.fields(obj)) )) // no array copying . for further optimization this could be guaranteed to return
-			the already hashed fields.
-
-	Mappings:
-		* if create Dynamic class is true, TObjectDecl will be mapped to new DynamicClass(fields, [hashedFields], values)
-		*
-
-	dependencies:
-		There is no big dependency from this target. Though it should be a syntax filter, mainly one of the first so most expression generation has already been done,
-		while the AST has its meaning close to haxe's.
-		Should run before InitFunction so it detects variables containing expressions as "always-execute" expressions, even when using CreateEmpty
-
-		* Must run before switch() syntax changes
-
-*)
-
-open ClosuresToClass;;
-module ReflectionCFs =
-struct
-
-	let name = "reflection_cfs"
-
-	type rcf_hash_conflict_ctx = {
-		t : t;
-		add_names : texpr->texpr->texpr;
-		get_conflict : texpr->texpr->texpr->texpr;
-		set : texpr->texpr->texpr->texpr->texpr;
-		delete : texpr->texpr->texpr->texpr;
-	}
-
-	type rcf_ctx =
-	{
-		rcf_gen : generator_ctx;
-		rcf_ft : ClosuresToClass.closures_ctx;
-		rcf_optimize : bool;
-
-		rcf_object_iface : tclass;
-
-		rcf_max_func_arity : int;
-
-		(*
-			the hash lookup function. can be an inlined expr or simply a function call.
-			its only needed features is that it should return the index of the key if found, and the
-			complement of the index of where it should be inserted if not found (Ints).
-
-			hash->hash_array->length->returning expression
-		*)
-		rcf_hash_function : texpr->texpr->texpr->texpr;
-
-		rcf_lookup_function : texpr->texpr;
-
-		(* hash_array->length->pos->value *)
-		rcf_insert_function : texpr->texpr->texpr->texpr->texpr;
-
-		(* hash_array->length->pos->value *)
-		rcf_remove_function : texpr->texpr->texpr->texpr;
-
-		rcf_hash_fields : (int, string) Hashtbl.t;
-
-		rcf_hash_paths : (path * int, string) Hashtbl.t;
-
-		rcf_hash_conflict_ctx : rcf_hash_conflict_ctx option;
-
-		(*
-			main expr -> field expr -> field string -> possible hash int (if optimize) -> possible set expr -> should_throw_exceptions -> changed expression
-
-			Changes a get / set field to the runtime resolution function
-		*)
-		rcf_on_getset_field : texpr->texpr->string->int32 option->texpr option->bool->texpr;
-
-		rcf_on_call_field : texpr->texpr->string->int32 option->texpr list->texpr;
-	}
-
-	let new_ctx gen ft object_iface optimize dynamic_getset_field dynamic_call_field hash_function lookup_function insert_function remove_function hash_conflict_ctx =
-		{
-			rcf_gen = gen;
-			rcf_ft = ft;
-
-			rcf_optimize = optimize;
-
-			rcf_object_iface = object_iface;
-
-			rcf_max_func_arity = 10;
-
-			rcf_hash_function = hash_function;
-			rcf_lookup_function = lookup_function;
-
-			rcf_insert_function = insert_function;
-			rcf_remove_function = remove_function;
-
-			rcf_hash_fields = Hashtbl.create 100;
-			rcf_hash_paths = Hashtbl.create 100;
-
-			rcf_on_getset_field = dynamic_getset_field;
-			rcf_on_call_field = dynamic_call_field;
-			rcf_hash_conflict_ctx = hash_conflict_ctx;
-		}
-
-	(*
-		methods as a bool option is a little laziness of my part.
-			None means that methods are included with normal fields;
-			Some(true) means collect only methods
-			Some(false) means collect only fields (and MethDynamic fields)
-	*)
-	let collect_fields cl (methods : bool option) =
-		let collected = Hashtbl.create 0 in
-		let collect cf acc =
-			if Meta.has Meta.CompilerGenerated cf.cf_meta || Meta.has Meta.SkipReflection cf.cf_meta then
-				acc
-			else match methods, cf.cf_kind with
-				| None, _ when not (Hashtbl.mem collected cf.cf_name) -> Hashtbl.add collected cf.cf_name true; ([cf.cf_name], cf) :: acc
-				| Some true, Method MethDynamic -> acc
-				| Some true, Method _ when not (Hashtbl.mem collected cf.cf_name) -> Hashtbl.add collected cf.cf_name true; ([cf.cf_name], cf) :: acc
-				| Some false, Method MethDynamic
-				| Some false, Var _ when not (Hashtbl.mem collected cf.cf_name) -> Hashtbl.add collected cf.cf_name true; ([cf.cf_name], cf) :: acc
-				| _ -> acc
-		in
-		let collect_cfs cfs acc =
-			let rec loop cfs acc =
-				match cfs with
-					| [] -> acc
-					| hd :: tl -> loop tl (collect hd acc)
-			in
-			loop cfs acc
-		in
-		let rec loop cl acc =
-			let acc = collect_cfs cl.cl_ordered_fields acc in
-			match cl.cl_super with
-				| None -> acc
-				| Some(cl,_) ->
-					if not (is_hxgen (TClassDecl cl)) then loop cl acc else acc
-		in
-
-		loop cl []
-
-	let hash f =
-		let h = ref 0 in
-		for i = 0 to String.length f - 1 do
-			h := !h * 223 + int_of_char (String.unsafe_get f i);
-		done;
-		if Sys.word_size = 64 then Int32.to_int (Int32.shift_right (Int32.shift_left (Int32.of_int !h) 1) 1) else !h
-
-	let hash_field ctx f pos =
-		let h = hash f in
-		(try
-			let f2 = Hashtbl.find ctx.rcf_hash_paths (ctx.rcf_gen.gcurrent_path, h) in
-			if f <> f2 then ctx.rcf_gen.gcon.error ("Field conflict between " ^ f ^ " and " ^ f2) pos
-		with Not_found ->
-			Hashtbl.add ctx.rcf_hash_paths (ctx.rcf_gen.gcurrent_path, h) f;
-			Hashtbl.replace ctx.rcf_hash_fields h f);
-		h
-
-	(* ( tf_args, switch_var ) *)
-	let field_type_args ctx pos =
-		match ctx.rcf_optimize with
-			| true ->
-				let field_name, field_hash = alloc_var "field" ctx.rcf_gen.gcon.basic.tstring, alloc_var "hash" ctx.rcf_gen.gcon.basic.tint in
-
-				[field_name, None; field_hash, None], field_hash
-			| false ->
-				let field_name = alloc_var "field" ctx.rcf_gen.gcon.basic.tstring in
-				[field_name, None], field_name
-
-	let hash_field_i32 ctx pos field_name =
-		let i = hash_field ctx field_name pos in
-		let i = Int32.of_int (i) in
-		if i < Int32.zero then
-			Int32.logor (Int32.logand i (Int32.of_int 0x3FFFFFFF)) (Int32.shift_left Int32.one 30)
-		else i
-
-	let switch_case ctx pos field_name =
-		match ctx.rcf_optimize with
-			| true ->
-				let i = hash_field_i32 ctx pos field_name in
-				mk (TConst (TInt i)) ctx.rcf_gen.gcon.basic.tint pos
-			| false ->
-				ExprBuilder.make_string ctx.rcf_gen.gcon field_name pos
-
-	let call_super ctx fn_args ret_t cf cl this_t pos =
-		{
-			eexpr = TCall({
-				eexpr = TField({ eexpr = TConst(TSuper); etype = this_t; epos = pos }, FInstance(cl,List.map snd cl.cl_params,cf));
-				etype = TFun(fun_args fn_args, ret_t);
-				epos = pos;
-			}, List.map (fun (v,_) -> mk_local v pos) fn_args);
-			etype = ret_t;
-			epos = pos;
-		}
-
-
-	let mk_throw ctx str pos = { eexpr = TThrow (ExprBuilder.make_string ctx.rcf_gen.gcon str pos); etype = ctx.rcf_gen.gcon.basic.tvoid; epos = pos }
-
-	let enumerate_dynamic_fields ctx cl when_found base_arr =
-		let gen = ctx.rcf_gen in
-		let basic = gen.gcon.basic in
-		let pos = cl.cl_pos in
-
-		let vtmp = alloc_var "i" basic.tint in
-
-		let mk_for arr len =
-			let t = if ctx.rcf_optimize then basic.tint else basic.tstring in
-			let convert_str e = if ctx.rcf_optimize then ctx.rcf_lookup_function e else e in
-			let tmpinc = { eexpr = TUnop(Ast.Increment, Ast.Postfix, mk_local vtmp pos); etype = basic.tint; epos = pos } in
-			[
-				{ eexpr = TBinop(OpAssign, mk_local vtmp pos, ExprBuilder.make_int ctx.rcf_gen.gcon 0 pos); etype = basic.tint; epos = pos };
-				{
-					eexpr = TWhile (
-						{ eexpr = TBinop(Ast.OpLt, mk_local vtmp pos, len); etype = basic.tbool; epos = pos },
-						mk_block (when_found (convert_str { eexpr = TArray (arr, tmpinc); etype = t; epos = pos })),
-						Ast.NormalWhile
-					);
-					etype = basic.tvoid;
-					epos = pos
-				}
-			]
- 		in
-
-		let this_t = TInst(cl, List.map snd cl.cl_params) in
-		let this = { eexpr = TConst(TThis); etype = this_t; epos = pos } in
-		let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
-
-		{ eexpr = TVar (vtmp,None); etype = basic.tvoid; epos = pos }
-		::
-		if ctx.rcf_optimize then
-			mk_for (mk_this (gen.gmk_internal_name "hx" "hashes") (gen.gclasses.nativearray basic.tint)) (mk_this (gen.gmk_internal_name "hx" "length") basic.tint)
-			@
-			mk_for (mk_this (gen.gmk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray basic.tint)) (mk_this (gen.gmk_internal_name "hx" "length_f") basic.tint)
-			@
-			(
-				let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
-				let ehead = mk_this (gen.gmk_internal_name "hx" "conflicts") conflict_ctx.t in
-				[conflict_ctx.add_names ehead base_arr]
-			)
-		else
-			mk_for (mk_this (gen.gmk_internal_name "hx" "hashes") (gen.gclasses.nativearray basic.tstring)) (mk_this (gen.gmk_internal_name "hx" "length") basic.tint)
-			@
-			mk_for (mk_this (gen.gmk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray basic.tstring)) (mk_this (gen.gmk_internal_name "hx" "length_f") basic.tint)
-
-	(* *********************
-		 Dynamic lookup
-		 *********************
-
-		 This is the behavior of standard <implements Dynamic> classes. It will replace the error throwing
-		 if a field doesn't exists when looking it up.
-
-		 In order for it to work, an implementation for hash_function must be created.
-		 hash_function is the function to be called/inlined that will allow us to lookup the hash into a sorted array of hashes.
-		 A binary search or linear search algorithm may be implemented. The only need is that if not found, the NegBits of
-		 the place where it should be inserted must be returned.
-	*)
-	let abstract_dyn_lookup_implementation ctx this field_local hash_local may_value is_float pos =
-		let gen = ctx.rcf_gen in
-		let basic = gen.gcon.basic in
-		let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
-		let a_t = if ctx.rcf_optimize then basic.tint else basic.tstring in
-		let hx_hashes = mk_this (gen.gmk_internal_name "hx" "hashes") (gen.gclasses.nativearray a_t) in
-		let hx_hashes_f = mk_this (gen.gmk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray a_t) in
-		let hx_dynamics = mk_this (gen.gmk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) in
-		let hx_dynamics_f = mk_this (gen.gmk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) in
-		let hx_length = mk_this (gen.gmk_internal_name "hx" "length") (basic.tint) in
-		let hx_length_f = mk_this (gen.gmk_internal_name "hx" "length_f") (basic.tint) in
-		let res = alloc_var "res" basic.tint in
-		let fst_hash, snd_hash, fst_dynamics, snd_dynamics, fst_length, snd_length =
-			if is_float then
-				hx_hashes_f, hx_hashes, hx_dynamics_f, hx_dynamics, hx_length_f, hx_length
-			else
-				hx_hashes, hx_hashes_f, hx_dynamics, hx_dynamics_f, hx_length, hx_length_f
-		in
-		let res_local = mk_local res pos in
-		let gte = {
-			eexpr = TBinop(Ast.OpGte, res_local, { eexpr = TConst(TInt(Int32.zero)); etype = basic.tint; epos = pos });
-			etype = basic.tbool;
-			epos = pos;
-		} in
-		let mk_tarray arr idx =
-			{
-				eexpr = TArray(arr, idx);
-				etype = gen.gclasses.nativearray_type arr.etype;
-				epos = pos;
-			}
-		in
-		let ret_t = if is_float then basic.tfloat else t_dynamic in
-
-		match may_value with
-			| None ->
-				(*
-					var res = lookup(this.__hx_hashes/f, hash);
-					if (res < 0)
-					{
-						res = lookup(this.__hx_hashes_f/_, hash);
-						if(res < 0)
-							return null;
-						else
-							return __hx_dynamics_f[res];
-					} else {
-						return __hx_dynamics[res];
-					}
-				*)
-				let block =
-				[
-					{ eexpr = TVar(res, Some(ctx.rcf_hash_function hash_local fst_hash fst_length)); etype = basic.tvoid; epos = pos };
-					{ eexpr = TIf(gte, mk_return (mk_tarray fst_dynamics res_local), Some({
-						eexpr = TBlock(
-						[
-							{ eexpr = TBinop(Ast.OpAssign, res_local, ctx.rcf_hash_function hash_local snd_hash snd_length); etype = basic.tint; epos = pos };
-							{ eexpr = TIf(gte, mk_return (mk_tarray snd_dynamics res_local), None); etype = ret_t; epos = pos }
-						]);
-						etype = ret_t;
-						epos = pos;
-					})); etype = ret_t; epos = pos }
-				] in
-
-				if ctx.rcf_optimize then
-					let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
-					let ehead = mk_this (gen.gmk_internal_name "hx" "conflicts") conflict_ctx.t in
-					let vconflict = alloc_var "conflict" conflict_ctx.t in
-					let local_conflict = mk_local vconflict pos in
-					[mk (TIf (
-						mk (TBinop (OpLt, hash_local, ExprBuilder.make_int gen.gcon 0 pos)) basic.tbool pos,
-						mk (TBlock [
-							mk (TVar (vconflict, Some (conflict_ctx.get_conflict ehead hash_local field_local))) basic.tvoid pos;
-							mk (TIf (
-								mk (TBinop (OpNotEq, local_conflict, mk (TConst TNull) local_conflict.etype pos)) basic.tbool pos,
-								mk_return (Codegen.field local_conflict "value" t_dynamic pos),
-								None
-							)) basic.tvoid pos;
-						]) basic.tvoid pos,
-						Some (mk (TBlock block) basic.tvoid pos)
-					)) basic.tvoid pos]
-				else
-					block
-			| Some value_local ->
-				(*
-					//if is not float:
-					//if (isNumber(value_local)) return this.__hx_setField_f(field, getNumber(value_local), false(not static));
-					var res = lookup(this.__hx_hashes/f, hash);
-					if (res >= 0)
-					{
-						return __hx_dynamics/f[res] = value_local;
-					} else {
-						res = lookup(this.__hx_hashes_f/_, hash);
-						if (res >= 0)
-						{
-							__hx_dynamics_f/_.splice(res,1);
-							__hx_hashes_f/_.splice(res,1);
-						}
-					}
-
-					__hx_hashses/_f.insert(~res, hash);
-					__hx_dynamics/_f.insert(~res, value_local);
-					return value_local;
-				*)
-				let neg_res = { eexpr = TUnop(Ast.NegBits, Ast.Prefix, res_local); etype = basic.tint; epos = pos } in
-
-				let res2 = alloc_var "res2" basic.tint in
-				let res2_local = mk_local res2 pos in
-				let gte2 = {
-					eexpr = TBinop(Ast.OpGte, res2_local, { eexpr = TConst(TInt(Int32.zero)); etype = basic.tint; epos = pos });
-					etype = basic.tbool;
-					epos = pos;
-				} in
-
-				let block =
-				[
-					{ eexpr = TVar(res, Some(ctx.rcf_hash_function hash_local fst_hash fst_length)); etype = basic.tvoid; epos = pos };
-					{
-						eexpr = TIf(gte,
-							mk_return { eexpr = TBinop(Ast.OpAssign, mk_tarray fst_dynamics res_local, value_local); etype = value_local.etype; epos = pos },
-							Some({ eexpr = TBlock([
-								{ eexpr = TVar( res2, Some(ctx.rcf_hash_function hash_local snd_hash snd_length)); etype = basic.tvoid; epos = pos };
-								{
-									eexpr = TIf(gte2, { eexpr = TBlock([
-										ctx.rcf_remove_function snd_hash snd_length res2_local;
-										ctx.rcf_remove_function snd_dynamics snd_length res2_local;
-										mk (TUnop(Decrement,Postfix,snd_length)) basic.tint pos
-									]); etype = t_dynamic; epos = pos }, None);
-									etype = t_dynamic;
-									epos = pos;
-								}
-							]); etype = t_dynamic; epos = pos }));
-						etype = t_dynamic;
-						epos = pos;
-					};
-					ctx.rcf_insert_function fst_hash fst_length neg_res hash_local;
-					ctx.rcf_insert_function fst_dynamics fst_length neg_res value_local;
-					mk (TUnop(Increment,Postfix,fst_length)) basic.tint pos;
-				] in
-
-				let block =
-					if ctx.rcf_optimize then
-						let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
-						let ehead = mk_this (gen.gmk_internal_name "hx" "conflicts") conflict_ctx.t in
-						[mk (TIf (
-							mk (TBinop (OpLt, hash_local, ExprBuilder.make_int gen.gcon 0 pos)) basic.tbool pos,
-							conflict_ctx.set ehead hash_local field_local value_local,
-							Some (mk (TBlock block) basic.tvoid pos)
-						)) basic.tvoid pos]
-					else
-						block
-				in
-				block @ [mk_return value_local]
-
-	let get_delete_field ctx cl is_dynamic =
-		let pos = cl.cl_pos in
-		let this_t = TInst(cl, List.map snd cl.cl_params) in
-		let this = { eexpr = TConst(TThis); etype = this_t; epos = pos } in
-		let gen = ctx.rcf_gen in
-		let basic = gen.gcon.basic in
-		let tf_args, switch_var = field_type_args ctx pos in
-		let local_switch_var = mk_local switch_var pos in
-		let fun_type = TFun(fun_args tf_args,basic.tbool) in
-		let cf = mk_class_field (gen.gmk_internal_name "hx" "deleteField") fun_type false pos (Method MethNormal) [] in
-		let body = if is_dynamic then begin
-			let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
-			let a_t = if ctx.rcf_optimize then basic.tint else basic.tstring in
-			let hx_hashes = mk_this (gen.gmk_internal_name "hx" "hashes") (gen.gclasses.nativearray a_t) in
-			let hx_hashes_f = mk_this (gen.gmk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray a_t) in
-			let hx_dynamics = mk_this (gen.gmk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) in
-			let hx_dynamics_f = mk_this (gen.gmk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) in
-			let hx_length = mk_this (gen.gmk_internal_name "hx" "length") (basic.tint) in
-			let hx_length_f = mk_this (gen.gmk_internal_name "hx" "length_f") (basic.tint) in
-			let res = alloc_var "res" basic.tint in
-			let res_local = mk_local res pos in
-			let gte = {
-				eexpr = TBinop(Ast.OpGte, res_local, { eexpr = TConst(TInt(Int32.zero)); etype = basic.tint; epos = pos });
-				etype = basic.tbool;
-				epos = pos;
-			} in
-			(*
-				var res = lookup(this.__hx_hashes, hash);
-				if (res >= 0)
-				{
-					__hx_dynamics.splice(res,1);
-					__hx_hashes.splice(res,1);
-
-					return true;
-				} else {
-					res = lookup(this.__hx_hashes_f, hash);
-					if (res >= 0)
-					{
-						__hx_dynamics_f.splice(res,1);
-						__hx_hashes_f.splice(res,1);
-
-						return true;
-					}
-				}
-
-				return false;
-			*)
-			let common = [
-				{ eexpr = TVar(res,Some(ctx.rcf_hash_function local_switch_var hx_hashes hx_length)); etype = basic.tvoid; epos = pos };
-				{
-					eexpr = TIf(gte, { eexpr = TBlock([
-						ctx.rcf_remove_function hx_hashes hx_length res_local;
-						ctx.rcf_remove_function hx_dynamics hx_length res_local;
-						mk (TUnop(Decrement,Postfix,hx_length)) basic.tint pos;
-						mk_return { eexpr = TConst(TBool true); etype = basic.tbool; epos = pos }
-					]); etype = t_dynamic; epos = pos }, Some({ eexpr = TBlock([
-						{ eexpr = TBinop(Ast.OpAssign, res_local, ctx.rcf_hash_function local_switch_var hx_hashes_f hx_length_f); etype = basic.tint; epos = pos };
-						{ eexpr = TIf(gte, { eexpr = TBlock([
-							ctx.rcf_remove_function hx_hashes_f hx_length_f res_local;
-							ctx.rcf_remove_function hx_dynamics_f hx_length_f res_local;
-							mk (TUnop(Decrement,Postfix,hx_length_f)) basic.tint pos;
-							mk_return { eexpr = TConst(TBool true); etype = basic.tbool; epos = pos }
-						]); etype = t_dynamic; epos = pos }, None); etype = t_dynamic; epos = pos }
-					]); etype = t_dynamic; epos = pos }));
-					etype = t_dynamic;
-					epos = pos;
-				};
-				mk_return { eexpr = TConst(TBool false); etype = basic.tbool; epos = pos }
-			] in
-
-			if ctx.rcf_optimize then
-				let v_name = match tf_args with (v,_) :: _ -> v | _ -> assert false in
-				let local_name = mk_local v_name pos in
-				let conflict_ctx = Option.get ctx.rcf_hash_conflict_ctx in
-				let ehead = mk_this (gen.gmk_internal_name "hx" "conflicts") conflict_ctx.t in
-				(mk (TIf (
-					mk (TBinop (OpLt, local_switch_var, ExprBuilder.make_int gen.gcon 0 pos)) basic.tbool pos,
-					mk (TReturn (Some (conflict_ctx.delete ehead local_switch_var local_name))) basic.tvoid pos,
-					None
-				)) basic.tvoid pos) :: common
-			else
-				common
-		end else
-		[
-			mk_return { eexpr = TConst(TBool false); etype = basic.tbool; epos = pos }
-		] in
-
-		(* create function *)
-		let fn =
-		{
-			tf_args = tf_args;
-			tf_type = basic.tbool;
-			tf_expr = { eexpr = TBlock(body); etype = t_dynamic; epos = pos }
-		} in
-		cf.cf_expr <- Some({ eexpr = TFunction(fn); etype = fun_type; epos = pos });
-		cf
-
-	let rec is_first_dynamic cl =
-		match cl.cl_super with
-			| Some(cl,_) ->
-				if is_some cl.cl_dynamic then false else is_first_dynamic cl
-			| None -> true
-
-	let is_override cl = match cl.cl_super with
-		| Some (cl, _) when is_hxgen (TClassDecl cl) -> true
-		| _ -> false
-
-	let get_args t = match follow t with
-		| TFun(args,ret) -> args,ret
-		| _ -> assert false
-
-	(* WARNING: this will only work if overloading contructors is possible on target language *)
-	let implement_dynamic_object_ctor ctx cl =
-		let rec is_side_effects_free e =
-			match e.eexpr with
-				| TConst _
-				| TLocal _
-				| TFunction _
-				| TTypeExpr _ ->
-					true
-				| TNew(clnew,[],params) when clnew == cl ->
-					List.for_all is_side_effects_free params
-				| TUnop(Increment,_,_)
-				| TUnop(Decrement,_,_)
-				| TBinop(OpAssign,_,_)
-				| TBinop(OpAssignOp _,_,_) ->
-					false
-				| TUnop(_,_,e) ->
-					is_side_effects_free e
-				| TArray(e1,e2)
-				| TBinop(_,e1,e2) ->
-					is_side_effects_free e1 && is_side_effects_free e2
-				| TIf(cond,e1,Some e2) ->
-					is_side_effects_free cond && is_side_effects_free e1 && is_side_effects_free e2
-				| TField(e,_)
-				| TParenthesis e | TMeta(_,e) -> is_side_effects_free e
-				| TArrayDecl el -> List.for_all is_side_effects_free el
-				| TCast(e,_) -> is_side_effects_free e
-				| _ -> false
-		in
-
-		let pos = cl.cl_pos in
-		let gen = ctx.rcf_gen in
-		let basic = gen.gcon.basic in
-		let hasht = if ctx.rcf_optimize then basic.tint else basic.tstring in
-
-		let hashes_field = gen.gmk_internal_name "hx" "hashes", gen.gclasses.nativearray hasht in
-		let hashes_f_field = gen.gmk_internal_name "hx" "hashes_f", gen.gclasses.nativearray hasht in
-		let dynamics_field = gen.gmk_internal_name "hx" "dynamics", gen.gclasses.nativearray t_empty in
-		let dynamics_f_field = gen.gmk_internal_name "hx" "dynamics_f", gen.gclasses.nativearray basic.tfloat in
-		let fields =
-		[
-			hashes_field;
-			dynamics_field;
-			hashes_f_field;
-			dynamics_f_field;
-		] in
-
-		let hashes_var = alloc_var (fst hashes_field) (snd hashes_field) in
-		let hashes_f_var = alloc_var (fst hashes_f_field) (snd hashes_f_field) in
-		let tf_args = [
-			hashes_var, None;
-			alloc_var (fst dynamics_field) (snd dynamics_field), None;
-			hashes_f_var, None;
-			alloc_var (fst dynamics_f_field) (snd dynamics_f_field), None;
-		] in
-
-		let this = { eexpr = TConst TThis; etype = TInst(cl, List.map snd cl.cl_params); epos = pos } in
-		let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
-		let fun_t = TFun(fun_args tf_args,basic.tvoid) in
-		let ctor = mk_class_field "new" fun_t true pos (Method MethNormal) [] in
-		ctor.cf_expr <- Some(
-		{
-			eexpr = TFunction({
-				tf_args = tf_args;
-				tf_type = basic.tvoid;
-				tf_expr =
-				{
-					eexpr = TBlock(
-						List.map (fun (v,_) ->
-							{ eexpr = TBinop(Ast.OpAssign, mk_this v.v_name v.v_type, mk_local v pos); etype = v.v_type; epos = pos }
-						) tf_args
-						@
-						[
-							mk (TBinop(OpAssign, mk_this (gen.gmk_internal_name "hx" "length") basic.tint, gen.gclasses.nativearray_len (mk_local hashes_var pos) pos)) basic.tint pos;
-							mk (TBinop(OpAssign, mk_this (gen.gmk_internal_name "hx" "length_f") basic.tint, gen.gclasses.nativearray_len (mk_local hashes_f_var pos) pos)) basic.tint pos;
-						]
-					);
-					etype = basic.tvoid;
-					epos = pos
-				}
-			});
-			etype = fun_t;
-			epos = pos
-		});
-
-		add_constructor cl ctor;
-		(* default ctor also *)
-		let ctor = mk_class_field "new" (TFun([],basic.tvoid)) false pos (Method MethNormal) [] in
-		ctor.cf_expr <- Some {
-			eexpr = TFunction {
-				tf_type = basic.tvoid;
-				tf_args = [];
-				tf_expr = {
-					eexpr = TBlock(List.map (fun (f,t) ->
-						{ eexpr = TBinop(Ast.OpAssign, mk_this f t,{ eexpr = TCall(mk_local v_nativearray pos, []); etype = t; epos = pos; }); etype = t; epos = pos }
-					) fields);
-					etype = basic.tvoid;
-					epos = pos;
-				}
-			};
-			etype = ctor.cf_type;
-			epos = pos;
-		};
-		add_constructor cl ctor;
-		(* and finally we will return a function that transforms a TObjectDecl into a new DynamicObject() call *)
-		let rec loop objdecl acc acc_f =
-			match objdecl with
-				| [] -> acc,acc_f
-				| (name,expr) :: tl ->
-					let real_t = gen.greal_type expr.etype in
-					match follow expr.etype with
-						| TInst ( { cl_path = ["haxe"], "Int64" }, [] ) ->
-							loop tl ((name, gen.ghandle_cast t_dynamic real_t expr) :: acc) acc_f
-						| _ ->
-							if like_float real_t && not (like_i64 real_t) then
-								loop tl acc ((name, gen.ghandle_cast basic.tfloat real_t expr) :: acc_f)
-							else
-								loop tl ((name, gen.ghandle_cast t_dynamic real_t expr) :: acc) acc_f
-		in
-
-		let may_hash_field s =
-			if ctx.rcf_optimize then begin
-				mk (TConst (TInt (hash_field_i32 ctx pos s))) basic.tint pos
-			end else begin
-				ExprBuilder.make_string gen.gcon s pos
-			end
-		in
-
-		let do_objdecl e objdecl =
-			let exprs_before = ref [] in
-			let rec change_exprs decl acc = match decl with
-				| (name,expr) :: tl ->
-					if is_side_effects_free expr then
-						change_exprs tl ((name,expr) :: acc)
-					else begin
-						let var = mk_temp gen "odecl" expr.etype in
-						exprs_before := { eexpr = TVar(var,Some expr); etype = basic.tvoid; epos = expr.epos } :: !exprs_before;
-						change_exprs tl ((name,mk_local var expr.epos) :: acc)
-					end
-				| [] -> acc
-			in
-			let objdecl = change_exprs objdecl [] in
-
-			let odecl, odecl_f = loop objdecl [] [] in
-			let changed_expr = List.map (fun (s,e) -> (may_hash_field s,e)) in
-			let odecl, odecl_f = changed_expr odecl, changed_expr odecl_f in
-			let sort_fn (e1,_) (e2,_) =
-				match e1.eexpr, e2.eexpr with
-					| TConst(TInt i1), TConst(TInt i2) -> compare i1 i2
-					| TConst(TString s1), TConst(TString s2) -> compare s1 s2
-					| _ -> assert false
-			in
-
-			let odecl, odecl_f = List.sort sort_fn odecl, List.sort sort_fn odecl_f in
-
-			let ret = {
-				e with eexpr = TNew(cl,[],
-					[
-						mk_nativearray_decl gen hasht (List.map fst odecl) pos;
-						mk_nativearray_decl gen t_empty (List.map snd odecl) pos;
-						mk_nativearray_decl gen hasht (List.map fst odecl_f) pos;
-						mk_nativearray_decl gen basic.tfloat (List.map snd odecl_f) pos;
-					]);
-			} in
-			match !exprs_before with
-				| [] -> ret
-				| block ->
-					{
-						eexpr = TBlock(List.rev block @ [ret]);
-						etype = ret.etype;
-						epos = ret.epos;
-					}
-		in
-		do_objdecl
-
-	let implement_dynamics ctx cl =
-		let pos = cl.cl_pos in
-		let is_override = is_override cl in
-		if is_some cl.cl_dynamic then begin
-			if is_first_dynamic cl then begin
-				(*
-					* add hx_hashes, hx_hashes_f, hx_dynamics, hx_dynamics_f to class
-					* implement hx_deleteField
-				*)
-				let gen = ctx.rcf_gen in
-				let basic = gen.gcon.basic in
-				let hasht = if ctx.rcf_optimize then basic.tint else basic.tstring in
-
-				let new_fields =
-				[
-					mk_class_field (gen.gmk_internal_name "hx" "hashes") (gen.gclasses.nativearray hasht) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-					mk_class_field (gen.gmk_internal_name "hx" "dynamics") (gen.gclasses.nativearray t_empty) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-					mk_class_field (gen.gmk_internal_name "hx" "hashes_f") (gen.gclasses.nativearray hasht) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-					mk_class_field (gen.gmk_internal_name "hx" "dynamics_f") (gen.gclasses.nativearray basic.tfloat) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-				] in
-
-				(if cl.cl_path <> (["haxe"; "lang"], "DynamicObject") then
-					List.iter (fun cf -> cf.cf_expr <- Some { eexpr = TCall(mk_local v_nativearray pos, []); etype = cf.cf_type; epos = cf.cf_pos }) new_fields
-				);
-
-				let new_fields =
-					if ctx.rcf_optimize then
-						let f = mk_class_field (gen.gmk_internal_name "hx" "conflicts") (Option.get ctx.rcf_hash_conflict_ctx).t false pos (Var { v_read = AccNormal; v_write = AccNormal }) [] in
-						f :: new_fields
-					else
-						new_fields
-				in
-
-				let delete = get_delete_field ctx cl true in
-
-				let new_fields = new_fields @ [
-					mk_class_field (gen.gmk_internal_name "hx" "length") (basic.tint) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-					mk_class_field (gen.gmk_internal_name "hx" "length_f") (basic.tint) false pos (Var { v_read = AccNormal; v_write = AccNormal }) [];
-					delete;
-				] in
-
-				List.iter (fun cf ->
-					cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields
-				) new_fields;
-
-		(*
-				let rec last_ctor cl =
-					match cl.cl_constructor with
-						| None -> (match cl.cl_super with | None -> None | Some (cl,_) -> last_ctor cl)
-						| Some c -> Some c
-				in
-		*)
-				(*
-					in order for the next to work, we need to execute our script before InitFunction, so the expressions inside the variables are initialized by the constructor
-				*)
-				(*
-					Now we need to add their initialization.
-					This will consist of different parts:
-						Check if there are constructors. If not, create one and add initialization to it (calling super, ok)
-						If there are, add as first statement (or second if there is a super() call in the first)
-						If class has @:dynamicObject meta, also create another new() class with its parameters as constructor arguments
-				*)
-
-				cl.cl_ordered_fields <- cl.cl_ordered_fields @ new_fields;
-				if is_override then cl.cl_overrides <- delete :: cl.cl_overrides
-			end
-		end else if not is_override then begin
-			let delete = get_delete_field ctx cl false in
-			cl.cl_ordered_fields <- cl.cl_ordered_fields @ [delete];
-			cl.cl_fields <- PMap.add delete.cf_name delete cl.cl_fields
-		end
-
-
-	(*
-		Implements:
-			__hx_lookupField(field:String, throwErrors:Bool, isCheck:Bool, handleProperties:Bool, isFirst:Bool):Dynamic
-
-			__hx_lookupField_f(field:String, throwErrors:Bool, handleProperties:Bool, isFirst:Bool):Float
-
-			__hx_lookupSetField(field:String, value:Dynamic, handleProperties:Bool, isFirst:Bool):Dynamic;
-
-			__hx_lookupSetField(field:String, value:Float, handleProperties:Bool, isFirst:Bool):Float;
-	*)
-	let implement_final_lookup ctx cl =
-		let gen = ctx.rcf_gen in
-		let basic = gen.gcon.basic in
-		let pos = cl.cl_pos in
-		let is_override = is_override cl in
-
-		let this = { eexpr = TConst(TThis); etype = TInst(cl, List.map snd cl.cl_params); epos = pos } in
-
-		(*
-			this function will create the class fields and call callback for each version
-
-			callback : is_float fields_args switch_var throw_errors_option is_check_option value_option : texpr list
-		*)
-		let create_cfs is_dynamic callback =
-			let create_cf is_float is_set =
-				let name = gen.gmk_internal_name "hx" ( (if is_set then "lookupSetField" else "lookupField") ^ (if is_float then "_f" else "") ) in
-				let field_args, switch_var = field_type_args ctx pos in
-				let ret_t = if is_float then basic.tfloat else t_dynamic in
-				let tf_args, throw_errors_opt =
-					if is_set then
-						field_args, None
-					else
-						let v = alloc_var "throwErrors" basic.tbool in
-						field_args @ [v,None], Some v
-				in
-				let tf_args, is_check_opt =
-					if is_set || is_float then
-						tf_args, None
-					else
-						let v = alloc_var "isCheck" basic.tbool in
-						tf_args @ [v,None], Some v
-				in
-				let tf_args, value_opt =
-					if not is_set then
-						tf_args, None
-					else
-						let v = alloc_var "value" ret_t in
-						field_args @ [v,None], Some v
-				in
-
-				let fun_t = TFun(fun_args tf_args, ret_t) in
-				let cf = mk_class_field name fun_t false pos (Method MethNormal) [] in
-				let block = callback is_float field_args switch_var throw_errors_opt is_check_opt value_opt in
-				let block = if not is_set then let tl = begin
-					let throw_errors_local = mk_local (get throw_errors_opt) pos in
-					let mk_check_throw msg =
-					{
-						eexpr = TIf(throw_errors_local, mk_throw ctx msg pos, Some (mk_return (null ret_t pos)));
-						etype = ret_t;
-						epos = pos
-					} in
-
-					let mk_may_check_throw msg = if is_dynamic then mk_return (null ret_t pos) else mk_check_throw msg in
-					if is_float then begin
-						[
-							mk_may_check_throw "Field not found or incompatible field type.";
-						]
-					end else begin
-						let is_check_local = mk_local (get is_check_opt) pos in
-						[
-							{
-								eexpr = TIf(is_check_local, mk_return (undefined pos), Some( mk_may_check_throw "Field not found." ));
-								etype = ret_t;
-								epos = pos;
-							}
-						]
-					end
-				end in block @ tl else block in
-				cf.cf_expr <- Some(
-					{
-						eexpr = TFunction({
-							tf_args = tf_args;
-							tf_type = ret_t;
-							tf_expr = { eexpr = TBlock(block); etype = ret_t; epos = pos }
-						});
-						etype = fun_t;
-						epos = pos
-					}
-				);
-				cf
-			in
-			let cfs =
-			[
-				create_cf false false;
-				create_cf true false;
-				create_cf false true;
-				create_cf true true
-			] in
-			cl.cl_ordered_fields <- cl.cl_ordered_fields @ cfs;
-			List.iter (fun cf ->
-				cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields;
-				if is_override then cl.cl_overrides <- cf :: cl.cl_overrides
-			) cfs
-		in
-
-		if is_some cl.cl_dynamic then begin
-			(* let abstract_dyn_lookup_implementation ctx this hash_local may_value is_float pos = *)
-			(* callback : is_float fields_args switch_var throw_errors_option is_check_option value_option : texpr list *)
-			if is_first_dynamic cl then
-				create_cfs true (fun is_float fields_args switch_var _ _ value_opt ->
-					let v_name = match fields_args with (v,_) :: _ -> v | _ -> assert false in
-					abstract_dyn_lookup_implementation ctx this (mk_local v_name pos) (mk_local switch_var pos) (Option.map (fun v -> mk_local v pos) value_opt) is_float pos
-				)
-		end else if not is_override then begin
-			create_cfs false (fun is_float fields_args switch_var _ _ value_opt ->
-				match value_opt with
-					| None -> (* is not set *)
-						[]
-					| Some _ -> (* is set *)
-						if is_float then
-							[ mk_throw ctx "Cannot access field for writing or incompatible type." pos ]
-						else
-							[ mk_throw ctx "Cannot access field for writing." pos ]
-			)
-		end
-
-	(* *)
-	let implement_get_set ctx cl =
-		let gen = ctx.rcf_gen in
-		let mk_cfield is_set is_float =
-			let pos = cl.cl_pos in
-			let basic = ctx.rcf_gen.gcon.basic in
-			let tf_args, switch_var = field_type_args ctx pos in
-			let field_args = tf_args in
-			let local_switch_var = { eexpr = TLocal(switch_var); etype = switch_var.v_type; epos = pos } in
-
-			let handle_prop = alloc_var "handleProperties" basic.tbool in
-			let handle_prop_local = mk_local handle_prop pos in
-
-			let this = { eexpr = TConst TThis; etype = TInst(cl, List.map snd cl.cl_params); epos = pos } in
-			let mk_this_call_raw name fun_t params =
-				{ eexpr = TCall( { (mk_field_access gen this name pos) with etype = fun_t; }, params ); etype = snd (get_args fun_t); epos = pos }
-			in
-
-			let fun_type = ref (TFun([], basic.tvoid)) in
-			let fun_name = ctx.rcf_gen.gmk_internal_name "hx" ( (if is_set then "setField" else "getField") ^ (if is_float then "_f" else "") ) in
-			let cfield = mk_class_field fun_name !fun_type false pos (Method MethNormal) [] in
-
-			let maybe_cast e = e in
-
-			let t = TInst(cl, List.map snd cl.cl_params) in
-
-			(* if it's not latest hxgen class -> check super *)
-			let mk_do_default args do_default =
-				match cl.cl_super with
-					| None -> fun () -> maybe_cast (do_default ())
-					| Some (super, sparams) when not (is_hxgen (TClassDecl super)) ->
-						fun () -> maybe_cast (do_default ())
-					| _ ->
-						fun () ->
-							mk_return {
-								eexpr = TCall(
-									{ eexpr = TField({ eexpr = TConst TSuper; etype = t; epos = pos }, FInstance(cl, List.map snd cl.cl_params, cfield)); etype = !fun_type; epos = pos },
-									(List.map (fun (v,_) -> mk_local v pos) args) );
-								etype = if is_float then basic.tfloat else t_dynamic;
-								epos = pos;
-							};
-			in
-
-			(* if it is set function, there are some different set fields to do *)
-			let do_default, do_field, tf_args = if is_set then begin
-				let value_var = alloc_var "value" (if is_float then basic.tfloat else t_dynamic) in
-				let value_local = { eexpr = TLocal(value_var); etype = value_var.v_type; epos = pos } in
-				let tf_args = tf_args @ [value_var,None; handle_prop, None; ] in
-				let lookup_name = gen.gmk_internal_name "hx" ("lookupSetField" ^ if is_float then "_f" else "") in
-
-				let do_default =
-						fun () ->
-							mk_return (mk_this_call_raw lookup_name (TFun(fun_args (field_args @ [value_var,None]),value_var.v_type)) ( List.map (fun (v,_) -> mk_local v pos) field_args @ [ value_local ] ))
-				in
-
-				let do_field cf cf_type =
-					let get_field ethis = { eexpr = TField (ethis, FInstance(cl, List.map snd cl.cl_params, cf)); etype = cf_type; epos = pos } in
-					let this = { eexpr = TConst(TThis); etype = t; epos = pos } in
-					let value_local = if is_float then match follow cf_type with
-						| TInst({ cl_kind = KTypeParameter _ }, _) ->
-							mk_cast t_dynamic value_local
-						| _ ->
-							value_local
-						else
-							value_local
-					in
-
-					let ret =
-					{
-						eexpr = TBlock([
-							{
-								eexpr = TBinop(Ast.OpAssign,
-									get_field this,
-									mk_cast cf_type value_local);
-								etype = cf_type;
-								epos = pos;
-							};
-							mk_return value_local
-						]);
-						etype = cf_type;
-						epos = pos;
-					} in
-					match cf.cf_kind with
-						| Var { v_write = AccCall } ->
-							let bl =
-							[
-								mk_this_call_raw ("set_" ^ cf.cf_name) (TFun(["value",false,cf.cf_type], cf.cf_type)) [ value_local ];
-								mk_return value_local
-							] in
-							if Type.is_extern_field cf then
-								{ eexpr = TBlock bl; etype = value_local.etype; epos = pos }
-							else
-								{
-									eexpr = TIf(
-										handle_prop_local,
-										{ eexpr = TBlock bl; etype = value_local.etype; epos = pos },
-										Some ret);
-									etype = value_local.etype;
-									epos = pos;
-								}
-						| _ ->
-							ret
-				in
-
-				(mk_do_default tf_args do_default, do_field, tf_args)
-			end else begin
-				let throw_errors = alloc_var "throwErrors" basic.tbool in
-				let throw_errors_local = mk_local throw_errors pos in
-				let do_default, tf_args = if not is_float then begin
-					let is_check = alloc_var "isCheck" basic.tbool in
-					let is_check_local = mk_local is_check pos in
-
-					let tf_args = tf_args @ [ throw_errors,None; ] in
-
-					(* default: if (isCheck) return __undefined__ else if(throwErrors) throw "Field not found"; else return null; *)
-					let lookup_name = gen.gmk_internal_name "hx" "lookupField" in
-					let do_default =
-							fun () ->
-								mk_return (mk_this_call_raw lookup_name (TFun(fun_args (field_args @ [throw_errors,None;is_check,None; ]),t_dynamic)) ( List.map (fun (v,_) -> mk_local v pos) field_args @ [ throw_errors_local; is_check_local; ] ))
-					in
-
-					(do_default, tf_args @ [ is_check,None; handle_prop,None; ])
-				end else begin
-					let tf_args = tf_args @ [ throw_errors,None; ] in
-
-					let lookup_name = gen.gmk_internal_name "hx" "lookupField_f" in
-					let do_default =
-							fun () ->
-								mk_return (mk_this_call_raw lookup_name (TFun(fun_args (field_args @ [throw_errors,None; ]),basic.tfloat)) ( List.map (fun (v,_) -> mk_local v pos) field_args @ [ throw_errors_local; ] ))
-					in
-
-					(do_default, tf_args @ [ handle_prop,None; ])
-				end in
-
-				 let get_field cf cf_type ethis cl name =
-					match cf.cf_kind with
-						| Var { v_read = AccCall } when Type.is_extern_field cf ->
-							mk_return (mk_this_call_raw ("get_" ^ cf.cf_name) (TFun(["value",false,cf.cf_type], cf.cf_type)) [	])
-						| Var { v_read = AccCall } ->
-							{
-								eexpr = TIf(
-									handle_prop_local,
-									mk_return (mk_this_call_raw ("get_" ^ cf.cf_name) (TFun(["value",false,cf.cf_type], cf.cf_type)) [	]),
-									Some { eexpr = TField (ethis, FInstance(cl, List.map snd cl.cl_params, cf)); etype = cf_type; epos = pos }
-								);
-								etype = cf_type;
-								epos = pos;
-							}
-						| Var _
-						| Method MethDynamic -> { eexpr = TField (ethis, FInstance(cl,List.map snd cl.cl_params,cf)); etype = cf_type; epos = pos }
-						| _ ->
-								{ eexpr = TField (this, FClosure(Some (cl,[]), cf)); etype = cf_type; epos = pos } (* TODO: FClosure change *)
-				in
-
-				let do_field cf cf_type =
-					let this = { eexpr = TConst(TThis); etype = t; epos = pos } in
-					match is_float, follow cf_type with
-						| true, TInst( { cl_kind = KTypeParameter _ }, _ ) ->
-							mk_return (mk_cast basic.tfloat (mk_cast t_dynamic (get_field cf cf_type this cl cf.cf_name)))
-						| _ ->
-							mk_return (maybe_cast (get_field cf cf_type this cl cf.cf_name ))
-				in
-				(mk_do_default tf_args do_default, do_field, tf_args)
-			end in
-
-			let get_fields() =
-				let ret = collect_fields cl ( if is_float || is_set then Some (false) else None ) in
-				let ret = if is_set then List.filter (fun (_,cf) ->
-					match cf.cf_kind with
-					(* | Var { v_write = AccNever } -> false *)
-					| _ -> not (Meta.has Meta.ReadOnly cf.cf_meta)) ret
-				else
-					List.filter (fun (_,cf) ->
-					match cf.cf_kind with
-					(* | Var { v_read = AccNever } -> false *)
-					| _ -> true) ret in
-				if is_float then
-					List.filter (fun (_,cf) -> (* TODO: maybe really apply_params in cf.cf_type. The benefits would be limited, though *)
-						match follow (ctx.rcf_gen.greal_type (ctx.rcf_gen.gfollow#run_f cf.cf_type)) with
-							| TDynamic _ | TMono _
-							| TInst ({ cl_kind = KTypeParameter _ }, _) -> true
-							| t when like_float t && not (like_i64 t) -> true
-							| _ -> false
-					) ret
-				else
-					(* dynamic will always contain all references *)
-					ret
-			in
-
-			(* now we have do_default, do_field and tf_args *)
-			(* so create the switch expr *)
-			fun_type := TFun(List.map (fun (v,_) -> (v.v_name, false, v.v_type)) tf_args, if is_float then basic.tfloat else t_dynamic );
-			let has_fields = ref false in
-
-			let content =
-				let fields = get_fields() in
-				let fields = List.filter (fun (_, cf) -> match is_set, cf.cf_kind with
-					| true, Var { v_write = AccCall } -> true
-					| false, Var { v_read = AccCall } -> true
-					| _ -> not (Type.is_extern_field cf)) fields
-				in
-				(if fields <> [] then has_fields := true);
-				let cases = List.map (fun (names, cf) ->
-					(if names = [] then assert false);
-					(List.map (switch_case ctx pos) names, do_field cf cf.cf_type)
-				) fields in
-				let default = Some(do_default()) in
-
-				mk_block { eexpr = TSwitch(local_switch_var, cases, default); etype = basic.tvoid; epos = pos }
-			in
-
-			let is_override = match cl.cl_super with
-				| Some (cl, _) when is_hxgen (TClassDecl cl) -> true
-				| _ -> false
-			in
-
-			if !has_fields || (not is_override) then begin
-				let func =
-				{
-					tf_args = tf_args;
-					tf_type = if is_float then basic.tfloat else t_dynamic;
-					tf_expr = content;
-				} in
-
-				let func = { eexpr = TFunction(func); etype = !fun_type; epos = pos } in
-
-				cfield.cf_type <- !fun_type;
-				cfield.cf_expr <- Some func;
-
-				cl.cl_ordered_fields <- cl.cl_ordered_fields @ [cfield];
-				cl.cl_fields <- PMap.add fun_name cfield cl.cl_fields;
-
-				(if is_override then cl.cl_overrides <- cfield	:: cl.cl_overrides)
-			end else ()
-		in
-		mk_cfield true true;
-		mk_cfield true false;
-		mk_cfield false false;
-		mk_cfield false true
-
-	let implement_getFields ctx cl =
-		let gen = ctx.rcf_gen in
-		let basic = gen.gcon.basic in
-		let pos = cl.cl_pos in
-
-		(*
-			function __hx_getFields(baseArr:Array<String>)
-			{
-				//add all variable fields
-				//then:
-				super.__hx_getFields(baseArr);
-			}
-		*)
-		let name = gen.gmk_internal_name "hx" "getFields" in
-		let v_base_arr = alloc_var "baseArr" (basic.tarray basic.tstring) in
-		let base_arr = mk_local v_base_arr pos in
-
-		let tf_args = [(v_base_arr,None)] in
-		let t = TFun(fun_args tf_args, basic.tvoid) in
-		let cf = mk_class_field name t false pos (Method MethNormal) [] in
-
-		let e_pushfield = mk_field_access gen base_arr "push" pos in
-		let mk_push value = mk (TCall (e_pushfield, [value])) basic.tint pos in
-
-		let has_value = ref false in
-		let map_fields =
-			List.map (fun (_,cf) ->
-				match cf.cf_kind with
-					| Var _
-					| Method MethDynamic when not (List.memq cf cl.cl_overrides) ->
-						has_value := true;
-						mk_push (ExprBuilder.make_string gen.gcon cf.cf_name pos)
-					| _ -> null basic.tvoid pos
-			)
-		in
-
-		(*
-			if it is first_dynamic, then we need to enumerate the dynamic fields
-		*)
-		let exprs =
-			if is_some cl.cl_dynamic && is_first_dynamic cl then begin
-				has_value := true;
-				enumerate_dynamic_fields ctx cl mk_push base_arr
-			end else
-				[]
-		in
-
-		let exprs =
-			if is_override cl then
-				let tparams = List.map snd cl.cl_params in
-				let esuper = mk (TConst TSuper) (TInst(cl, tparams)) pos in
-				let efield = mk (TField (esuper, FInstance (cl, tparams, cf))) t pos in
-				exprs @ [mk (TCall (efield, [base_arr])) basic.tvoid pos]
-			else
-				exprs
-		in
-
-		let exprs = map_fields (collect_fields cl (Some false)) @ exprs in
-
-		cf.cf_expr <- Some {
-			eexpr = TFunction({
-				tf_args = tf_args;
-				tf_type = basic.tvoid;
-				tf_expr = mk (TBlock exprs) basic.tvoid pos
-			});
-			etype = t;
-			epos = pos
-		};
-
-		if !has_value || not (is_override cl) then begin
-			cl.cl_ordered_fields <- cl.cl_ordered_fields @ [cf];
-			cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields;
-			(if is_override cl then cl.cl_overrides <- cf :: cl.cl_overrides)
-		end
-
-
-	let implement_invokeField ctx ~slow_invoke cl =
-		(*
-			There are two ways to implement an haxe reflection-enabled class:
-			When we extend a non-hxgen class, and when we extend the base HxObject class.
-
-			Because of the added boiler plate we'd add every time we extend a non-hxgen class to implement a big IHxObject
-			interface, we'll handle the cases differently when implementing each interface.
-
-			At the IHxObject interface, there's only invokeDynamic(field, args[]), while at the HxObject class there are
-			the other, more optimized methods, that follow the Function class interface.
-
-			Since this will only be called by the Closure class, this conversion can be properly dealt with later.
-
-			TODO: create the faster version. By now only invokeDynamic will be implemented
-		*)
-		let gen = ctx.rcf_gen in
-		let basic = gen.gcon.basic in
-		let pos = cl.cl_pos in
-
-		let has_method = ref false in
-
-		let is_override = ref false in
-		let rec extends_hxobject cl =
-			match cl.cl_super with
-				| None -> true
-				| Some (cl,_) when is_hxgen (TClassDecl cl) -> is_override := true; extends_hxobject cl
-				| _ -> false
-		in
-
-		let field_args, switch_var = field_type_args ctx cl.cl_pos in
-		let field_args_exprs = List.map (fun (v,_) -> mk_local v pos) field_args in
-
-		let dynamic_arg = alloc_var "dynargs" (basic.tarray t_dynamic) in
-		let all_args = field_args @ [ dynamic_arg, None ] in
-		let fun_t = TFun(fun_args all_args, t_dynamic) in
-
-		let this_t = TInst(cl, List.map snd cl.cl_params) in
-		let this = { eexpr = TConst(TThis); etype = this_t; epos = pos } in
-		let apply_object cf = apply_params cf.cf_params (List.map (fun _ -> t_dynamic) cf.cf_params) cf.cf_type in
-
-		let mk_this_call_raw name fun_t params =
-			{ eexpr = TCall( { (mk_field_access gen this name pos) with etype = fun_t }, params ); etype = snd (get_args fun_t); epos = pos }
-		in
-
-		let mk_this_call cf params =
-			let t = apply_object cf in
-			(* the return type transformation into Dynamic *)
-			(* is meant to avoid return-type casting after functions with *)
-			(* type parameters are properly inferred at TypeParams.infer_params *)
-			(* e.g. function getArray<T : SomeType>(t:T):Array<T>; after infer_params, *)
-			(* T will be inferred as SomeType, but the returned type will still be typed *)
-			(* as Array<Dynamic> *)
-			let args, ret = get_args t in
-			let ret = match follow ret with
-				| TAbstract ({ a_path = ([], "Void") },[]) -> ret
-				| _ -> ret
-			in
-			mk_this_call_raw cf.cf_name (TFun(args, ret)) params
-		in
-
-		let extends_hxobject = extends_hxobject cl in
-		ignore extends_hxobject;
-
-		(* creates a invokeField of the class fields listed here *)
-		(*
-			function invokeField(field, dynargs)
-			{
-				switch(field)
-				{
-					case "a": this.a(dynargs[0], dynargs[1], dynargs[2]...);
-					default: super.invokeField //or this.getField(field).invokeDynamic(dynargs)
-				}
-			}
-		*)
-
-		let dyn_fun = mk_class_field (ctx.rcf_gen.gmk_internal_name "hx" "invokeField") fun_t false cl.cl_pos (Method MethNormal) [] in
-
-		let mk_switch_dyn cfs old =
-			let get_case (names,cf) =
-				has_method := true;
-				let i = ref 0 in
-				let dyn_arg_local = mk_local dynamic_arg pos in
-				let cases = List.map (switch_case ctx pos) names in
-				(cases,
-					{ eexpr = TReturn(Some (mk_this_call cf (List.map (fun (name,_,t) ->
-							let ret = { eexpr = TArray(dyn_arg_local, ExprBuilder.make_int ctx.rcf_gen.gcon !i pos); etype = t_dynamic; epos = pos } in
-							incr i;
-							ret
-						) (fst (get_args (cf.cf_type))) ) ));
-						etype = basic.tvoid;
-						epos = pos
-					}
-				)
-			in
-
-			let cfs = List.filter (fun (_,cf) -> match cf.cf_kind with
-				| Method _ -> if List.memq cf cl.cl_overrides then false else true
-				| _ -> true) cfs
-			in
-
-			let cases = List.map get_case cfs in
-			let cases = match old with
-				| [] -> cases
-				| _ ->
-					let ncases = List.map (fun cf -> switch_case ctx pos cf.cf_name) old in
-					( ncases, mk_return ((get slow_invoke) this (mk_local (fst (List.hd field_args)) pos) (mk_local dynamic_arg pos)) ) :: cases
-			in
-
-			let default = if !is_override then
-				{ eexpr = TReturn(Some (call_super ctx all_args t_dynamic dyn_fun cl this_t pos) ); etype = basic.tvoid; epos = pos }
-			else (
-				let field = begin
-					let fun_name = ctx.rcf_gen.gmk_internal_name "hx" "getField" in
-					let tf_args, _ = field_type_args ctx pos in
-					let tf_args, args = fun_args tf_args, field_args_exprs in
-
-					let tf_args, args = tf_args @ ["throwErrors",false, basic.tbool],       args @ [ExprBuilder.make_bool gen.gcon true pos] in
-					let tf_args, args = tf_args @ ["isCheck", false, basic.tbool],          args @ [ExprBuilder.make_bool gen.gcon false pos] in
-					let tf_args, args = tf_args @ ["handleProperties", false, basic.tbool], args @ [ExprBuilder.make_bool gen.gcon false pos] in
-
-					mk (TCall ({ (mk_field_access gen this fun_name pos) with etype = TFun(tf_args, t_dynamic) }, args)) t_dynamic pos
-				end in
-				let field = mk_cast (TInst(ctx.rcf_ft.func_class,[])) field in
-				mk_return {
-					eexpr = TCall(
-						mk_field_access gen field (gen.gmk_internal_name "hx" "invokeDynamic") pos,
-						[mk_local dynamic_arg pos]);
-					etype = t_dynamic;
-					epos = pos
-				} )
-			in
-
-			{
-				eexpr = TSwitch(mk_local switch_var pos, cases, Some default);
-				etype = basic.tvoid;
-				epos = pos;
-			}
-		in
-
-		let contents =
-			let nonstatics = collect_fields cl (Some true) in
-
-			let old_nonstatics = ref [] in
-
-			let nonstatics = match slow_invoke with
-				| None -> nonstatics
-				| Some _ ->
-					List.filter (fun (n,cf) ->
-						let is_old = not (PMap.mem cf.cf_name cl.cl_fields) || List.memq cf cl.cl_overrides in
-						(if is_old then old_nonstatics := cf :: !old_nonstatics);
-						not is_old
-					) nonstatics
-			in
-
-			mk_switch_dyn nonstatics !old_nonstatics
-		in
-
-		dyn_fun.cf_expr <- Some
-			{
-				eexpr = TFunction(
-				{
-					tf_args = all_args;
-					tf_type = t_dynamic;
-					tf_expr = mk_block contents;
-				});
-				etype = TFun(fun_args all_args, t_dynamic);
-				epos = pos;
-			};
-		if !is_override && not (!has_method) then () else begin
-			cl.cl_ordered_fields <- cl.cl_ordered_fields @ [dyn_fun];
-			cl.cl_fields <- PMap.add dyn_fun.cf_name dyn_fun cl.cl_fields;
-			(if !is_override then cl.cl_overrides <- dyn_fun :: cl.cl_overrides)
-		end
-
-	let implement_varargs_cl ctx cl =
-		let pos = cl.cl_pos in
-		let gen = ctx.rcf_gen in
-		let basic = gen.gcon.basic in
-
-		let this_t = TInst(cl, List.map snd cl.cl_params) in
-		let this = { eexpr = TConst(TThis); etype = this_t ; epos = pos } in
-		let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
-
-		let invokedyn = gen.gmk_internal_name "hx" "invokeDynamic" in
-		let idyn_t = TFun([gen.gmk_internal_name "fn" "dynargs", false, basic.tarray t_dynamic], t_dynamic) in
-		let this_idyn = mk_this invokedyn idyn_t in
-
-		let map_fn arity ret vars api =
-
-			let rec loop i acc =
-				if i < 0 then
-					acc
-				else
-					let obj = api i t_dynamic None in
-					loop (i - 1) (obj :: acc)
-			in
-
-			let call_arg = if arity = (-1) then
-				api (-1) t_dynamic None
-			else if arity = 0 then
-				null (basic.tarray t_empty) pos
-			else
-				{ eexpr = TArrayDecl(loop (arity - 1) []); etype = basic.tarray t_empty; epos = pos }
-			in
-
-			let expr = {
-				eexpr = TCall(
-					this_idyn,
-					[ call_arg ]
-				);
-				etype = t_dynamic;
-				epos = pos
-			} in
-
-			let expr = if like_float ret && not (like_int ret) then mk_cast ret expr else expr in
-
-			mk_return expr
-		in
-
-		let all_cfs = List.filter (fun cf -> cf.cf_name <> "new" && cf.cf_name <> (invokedyn) && match cf.cf_kind with Method _ -> true | _ -> false) (ctx.rcf_ft.map_base_classfields cl map_fn) in
-
-		cl.cl_ordered_fields <- cl.cl_ordered_fields @ all_cfs;
-		List.iter (fun cf ->
-			cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields
-		) all_cfs;
-
-		List.iter (fun cf ->
-			cl.cl_overrides <- cf :: cl.cl_overrides
-		) cl.cl_ordered_fields
-
-	let implement_closure_cl ctx cl =
-		let pos = cl.cl_pos in
-		let gen = ctx.rcf_gen in
-		let basic = gen.gcon.basic in
-
-		let field_args, _ = field_type_args ctx pos in
-		let obj_arg = alloc_var "target" (TInst(ctx.rcf_object_iface, [])) in
-
-		let this_t = TInst(cl, List.map snd cl.cl_params) in
-		let this = { eexpr = TConst(TThis); etype = this_t ; epos = pos } in
-		let mk_this field t = { (mk_field_access gen this field pos) with etype = t } in
-
-		let tf_args = field_args @ [obj_arg, None] in
-		let cfs, ctor_body = List.fold_left (fun (acc_cf,acc_expr) (v,_) ->
-			let cf = mk_class_field v.v_name v.v_type false pos (Var { v_read = AccNormal; v_write = AccNormal } ) [] in
-			let expr = { eexpr = TBinop(Ast.OpAssign, mk_this v.v_name v.v_type, mk_local v pos); etype = v.v_type; epos = pos } in
-			(cf :: acc_cf, expr :: acc_expr)
-		) ([], [])	tf_args in
-
-		let map_fn arity ret vars api =
-			let this_obj = mk_this "target" (TInst(ctx.rcf_object_iface, [])) in
-
-			let rec loop i acc =
-				if i < 0 then
-					acc
-				else
-					let obj = api i t_dynamic None in
-					loop (i - 1) (obj :: acc)
-			in
-
-			let call_arg = if arity = (-1) then
-				api (-1) t_dynamic None
-			else if arity = 0 then
-				null (basic.tarray t_empty) pos
-			else
-				{ eexpr = TArrayDecl(loop (arity - 1) []); etype = basic.tarray t_empty; epos = pos }
-			in
-
-			let expr = {
-				eexpr = TCall(
-					mk_field_access gen this_obj (gen.gmk_internal_name "hx" "invokeField") pos,
-					(List.map (fun (v,_) -> mk_this v.v_name v.v_type) field_args) @ [ call_arg ]
-				);
-				etype = t_dynamic;
-				epos = pos
-			} in
-
-			let expr = if like_float ret && not (like_int ret) then mk_cast ret expr else expr in
-
-			mk_return expr
-		in
-
-		let all_cfs = List.filter (fun cf -> cf.cf_name <> "new" && match cf.cf_kind with Method _ -> true | _ -> false) (ctx.rcf_ft.map_base_classfields cl map_fn) in
-
-		List.iter (fun cf ->
-			cl.cl_overrides <- cf :: cl.cl_overrides
-		) all_cfs;
-		let all_cfs = cfs @ all_cfs in
-
-		cl.cl_ordered_fields <- cl.cl_ordered_fields @ all_cfs;
-		List.iter (fun cf ->
-			cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields
-		) all_cfs;
-
-		let ctor_t = TFun(fun_args tf_args, basic.tvoid) in
-		let ctor_cf = mk_class_field "new" ctor_t true pos (Method MethNormal) [] in
-		ctor_cf.cf_expr <- Some {
-			eexpr = TFunction({
-				tf_args = tf_args;
-				tf_type = basic.tvoid;
-				tf_expr = { eexpr = TBlock({
-					eexpr = TCall({ eexpr = TConst(TSuper); etype = TInst(cl,[]); epos = pos }, [ExprBuilder.make_int ctx.rcf_gen.gcon (-1) pos; ExprBuilder.make_int ctx.rcf_gen.gcon (-1) pos]);
-					etype = basic.tvoid;
-					epos = pos
-				} :: ctor_body); etype = basic.tvoid; epos = pos }
-			});
-			etype = ctor_t;
-			epos = pos
-		};
-
-		cl.cl_constructor <- Some ctor_cf;
-
-		let closure_fun eclosure e field is_static =
-			let f = ExprBuilder.make_string gen.gcon field eclosure.epos in
-			let args = if ctx.rcf_optimize then [ f; { eexpr = TConst(TInt (hash_field_i32 ctx eclosure.epos field)); etype = basic.tint; epos = eclosure.epos } ] else [ f ] in
-			let args = args @ [ mk_cast (TInst(ctx.rcf_object_iface, [])) e ] in
-
-			{ eclosure with eexpr = TNew(cl,[],args) }
-		in
-		closure_fun
-
-	let get_closure_func ctx closure_cl =
-		let gen = ctx.rcf_gen in
-		let basic = gen.gcon.basic in
-		let closure_func eclosure e field is_static =
-			mk_cast eclosure.etype { eclosure with
-				eexpr = TNew(closure_cl, [], [
-					e;
-					ExprBuilder.make_string gen.gcon field eclosure.epos
-				] @ (
-					if ctx.rcf_optimize then [ { eexpr = TConst(TInt (hash_field_i32 ctx eclosure.epos field)); etype = basic.tint; epos = eclosure.epos } ] else []
-				));
-				etype = TInst(closure_cl,[])
-			}
-		in
-		closure_func
-
-	(*
-			main expr -> field expr -> field string -> possible set expr -> should_throw_exceptions -> changed expression
-
-			Changes a get / set
-		*
-		mutable rcf_on_getset_field : texpr->texpr->string->texpr option->bool->texpr;*)
-
-	let configure_dynamic_field_access ctx =
-		let gen = ctx.rcf_gen in
-		let is_dynamic expr fexpr field =
-			match (field_access_esp gen (gen.greal_type fexpr.etype) field) with
-			| FEnumField _
-			| FClassField _ -> false
-			| _ -> true
-		in
-
-		let maybe_hash = if ctx.rcf_optimize then fun str pos -> Some (hash_field_i32 ctx pos str) else fun str pos -> None in
-		DynamicFieldAccess.configure gen is_dynamic
-			(fun expr fexpr field set is_unsafe ->
-				let hash = maybe_hash field fexpr.epos in
-				ctx.rcf_on_getset_field expr fexpr field hash set is_unsafe
-			)
-			(fun ecall fexpr field call_list ->
-				let hash = maybe_hash field fexpr.epos in
-				ctx.rcf_on_call_field ecall fexpr field hash call_list
-			);
-		()
-
-
-	(* ******************************************* *)
-	(* UniversalBaseClass *)
-	(* ******************************************* *)
-	(*
-		Sets the universal base class for hxgen types (HxObject / IHxObject)
-
-		dependencies:
-			As a rule, it should be one of the last module filters to run so any @:hxgen class created in the process
-			-Should- only run after TypeParams.RealTypeParams.Modf
-	*)
-	module UniversalBaseClass =
-	struct
-		let name = "rcf_universal_base_class"
-		let priority = min_dep +. 10.
-
-		let configure gen baseclass baseinterface basedynamic =
-			let rec run md =
-				if is_hxgen md then
-					match md with
-					| TClassDecl ({ cl_interface = true } as cl) when cl.cl_path <> baseclass.cl_path && cl.cl_path <> baseinterface.cl_path && cl.cl_path <> basedynamic.cl_path ->
-						cl.cl_implements <- (baseinterface, []) :: cl.cl_implements
-					| TClassDecl ({ cl_kind = KAbstractImpl _ }) ->
-						(* don't add any base classes to abstract implementations *)
-						()
-					| TClassDecl ({ cl_super = None } as cl) when cl.cl_path <> baseclass.cl_path && cl.cl_path <> baseinterface.cl_path && cl.cl_path <> basedynamic.cl_path ->
-						if is_some cl.cl_dynamic then
-							cl.cl_super <- Some (basedynamic,[])
-						else
-							cl.cl_super <- Some (baseclass,[])
-					| TClassDecl ({ cl_super = Some(super,_) } as cl) when cl.cl_path <> baseclass.cl_path && cl.cl_path <> baseinterface.cl_path && not (is_hxgen (TClassDecl super)) ->
-						cl.cl_implements <- (baseinterface, []) :: cl.cl_implements
-					| _ ->
-						()
-			in
-			let map md = Some(run md; md) in
-			gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
-	end;;
-
-
-	(*
-		Priority: must run AFTER UniversalBaseClass
-	*)
-	let priority = solve_deps name [DAfter UniversalBaseClass.priority]
-
-	let configure ?slow_invoke ctx baseinterface =
-		let gen = ctx.rcf_gen in
-		let run = (fun md -> match md with
-			| TClassDecl cl when is_hxgen md && ( not cl.cl_interface || cl.cl_path = baseinterface.cl_path ) && (match cl.cl_kind with KAbstractImpl _ -> false | _ -> true) ->
-				(implement_dynamics ctx cl);
-				(if not (PMap.mem (gen.gmk_internal_name "hx" "lookupField") cl.cl_fields) then implement_final_lookup ctx cl);
-				(if not (PMap.mem (gen.gmk_internal_name "hx" "getField") cl.cl_fields) then implement_get_set ctx cl);
-				(if not (PMap.mem (gen.gmk_internal_name "hx" "invokeField") cl.cl_fields) then implement_invokeField ctx ~slow_invoke:slow_invoke cl);
-				(if not (PMap.mem (gen.gmk_internal_name "hx" "getFields") cl.cl_fields) then implement_getFields ctx cl);
-				None
-			| _ -> None)
-		in
-
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) run
-
-end;;
-
-(* ******************************************* *)
-(* Object Declaration Mapper *)
-(* ******************************************* *)
-module ObjectDeclMap =
-struct
-	let name = "object_decl_map"
-	let priority = solve_deps name []
-
-	let configure gen map_fn =
-		let rec run e =
-			match e.eexpr with
-			| TObjectDecl odecl ->
-				let e = Type.map_expr run e in
-				(match e.eexpr with TObjectDecl odecl -> map_fn e odecl | _ -> assert false)
-			| _ ->
-				Type.map_expr run e
-		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* EnumToClass *)
-(* ******************************************* *)
-(*
-	For languages that don't support parameterized enums and/or metadata in enums, we need to transform
-	enums into normal classes. This is done at the first module pass by creating new classes with the same
-	path inside the modules, and removing the actual enum module by setting it as en extern.
-
-	* The target must create its own strategy to deal with reflection. As it is right now, we will have a base class
-	which the class will extend, create @:$IsEnum metadata for the class, and create @:alias() metadatas for the fields,
-	with their tag order (as a string) as their alias. If you are using ReflectionCFs, then you don't have to worry
-	about that, as it's already generating all information needed by the haxe runtime.
-	so they can be
-*)
-module EnumToClass =
-struct
-	let name = "enum_to_class"
-	let priority = solve_deps name []
-
-	type t = {
-		ec_tbl : (path, tclass) Hashtbl.t;
-	}
-
-	let new_t () = {
-		ec_tbl = Hashtbl.create 10
-	}
-
-	(* ******************************************* *)
-	(* EnumToClassModf *)
-	(* ******************************************* *)
-	(*
-		The actual Module Filter that will transform the enum into a class
-
-		dependencies:
-			Should run before ReflectionCFs, in order to enable proper reflection access.
-			Should run before TypeParams.RealTypeParams.RealTypeParamsModf, since generic enums must be first converted to generic classes
-			It needs that the target platform implements __array__() as a shortcut to declare haxe.ds.Vector
-	*)
-	module EnumToClassModf =
-	struct
-		let name = "enum_to_class_mod"
-		let priority = solve_deps name [DBefore ReflectionCFs.priority; DBefore TypeParams.RealTypeParams.RealTypeParamsModf.priority]
-
-		let pmap_exists fn pmap = try PMap.iter (fun a b -> if fn a b then raise Exit) pmap; false with | Exit -> true
-
-		let has_any_meta en =
-			let has_meta meta = List.exists (fun (m,_,_) -> match m with Meta.Custom _ -> true | _ -> false) meta in
-			has_meta en.e_meta || pmap_exists (fun _ ef -> has_meta ef.ef_meta) en.e_constrs
-
-		let convert gen t base_class base_param_class en =
-			let handle_type_params = false in (* TODO: look into this *)
-			let basic = gen.gcon.basic in
-			let pos = en.e_pos in
-
-			(* create the class *)
-			let cl = mk_class en.e_module en.e_path pos in
-			Hashtbl.add t.ec_tbl en.e_path cl;
-
-			(match Codegen.build_metadata gen.gcon (TEnumDecl en) with
-				| Some expr ->
-					let cf = mk_class_field "__meta__" expr.etype false expr.epos (Var { v_read = AccNormal; v_write = AccNormal }) [] in
-					cf.cf_expr <- Some expr;
-					cl.cl_statics <- PMap.add "__meta__" cf cl.cl_statics;
-					cl.cl_ordered_statics <- cf :: cl.cl_ordered_statics
-				| _ -> ()
-			);
-
-			let super, has_params = if Meta.has Meta.FlatEnum en.e_meta then base_class, false else base_param_class, true in
-
-			cl.cl_super <- Some(super,[]);
-			cl.cl_extern <- en.e_extern;
-			en.e_meta <- (Meta.Class, [], pos) :: en.e_meta;
-			cl.cl_module <- en.e_module;
-			cl.cl_meta <- ( Meta.Enum, [], pos ) :: cl.cl_meta;
-
-			(match gen.gcon.platform with
-				| Cs when Common.defined gen.gcon Define.CoreApiSerialize ->
-					cl.cl_meta <- ( Meta.Meta, [ (EField( (EConst (Ident "System"), null_pos ), "Serializable" ), null_pos) ], null_pos ) :: cl.cl_meta
-				| _ -> ());
-			let c_types =
-				if handle_type_params then
-					List.map (fun (s,t) -> (s, TInst (map_param (get_cl_t t), []))) en.e_params
-				else
-					[]
-			in
-
-			cl.cl_params <- c_types;
-
-			let i = ref 0 in
-			let cfs = List.map (fun name ->
-				let ef = PMap.find name en.e_constrs in
-				let pos = ef.ef_pos in
-				let old_i = !i in
-				incr i;
-
-				let cf = match follow ef.ef_type with
-					| TFun(params,ret) ->
-						let dup_types =
-							if handle_type_params then
-								List.map (fun (s,t) -> (s, TInst (map_param (get_cl_t t), []))) en.e_params
-							else
-								[]
-						in
-
-						let ef_type =
-							let fn, types = if handle_type_params then snd, dup_types else (fun _ -> t_dynamic), en.e_params in
-							let t = apply_params en.e_params (List.map fn types) ef.ef_type in
-							apply_params ef.ef_params (List.map fn ef.ef_params) t
-						in
-
-						let params, ret = get_fun ef_type in
-						let cf_params = if handle_type_params then dup_types @ ef.ef_params else [] in
-
-						let cf = mk_class_field name ef_type true pos (Method MethNormal) cf_params in
-						cf.cf_meta <- [];
-
-						let tf_args = List.map (fun (name,opt,t) ->  (alloc_var name t, if opt then Some TNull else None) ) params in
-						let arr_decl = mk_nativearray_decl gen t_dynamic (List.map (fun (v,_) -> mk_local v pos) tf_args) pos in
-						let expr = {
-							eexpr = TFunction({
-								tf_args = tf_args;
-								tf_type = ret;
-								tf_expr = mk_block ( mk_return { eexpr = TNew(cl,List.map snd dup_types, [ExprBuilder.make_int gen.gcon old_i pos; arr_decl] ); etype = TInst(cl, List.map snd dup_types); epos = pos } );
-							});
-							etype = ef_type;
-							epos = pos
-						} in
-						cf.cf_expr <- Some expr;
-						cf
-					| _ ->
-						let actual_t = match follow ef.ef_type with
-							| TEnum(e, p) -> TEnum(e, List.map (fun _ -> t_dynamic) p)
-							| _ -> assert false
-						in
-						let cf = mk_class_field name actual_t true pos (Var { v_read = AccNormal; v_write = AccNever }) [] in
-						let args = if has_params then
-							[ExprBuilder.make_int gen.gcon old_i pos; null (gen.gclasses.nativearray t_dynamic) pos]
-						else
-							[ExprBuilder.make_int gen.gcon old_i pos]
-						in
-						cf.cf_meta <- [Meta.ReadOnly,[],pos];
-						cf.cf_expr <- Some {
-							eexpr = TNew(cl, List.map (fun _ -> t_empty) cl.cl_params, args);
-							etype = TInst(cl, List.map (fun _ -> t_empty) cl.cl_params);
-							epos = pos;
-						};
-						cf
-				in
-				cl.cl_statics <- PMap.add cf.cf_name cf cl.cl_statics;
-				cf
-			) en.e_names in
-			let constructs_cf = mk_class_field "__hx_constructs" (gen.gclasses.nativearray basic.tstring) true pos (Var { v_read = AccNormal; v_write = AccNever }) [] in
-			constructs_cf.cf_meta <- [Meta.ReadOnly,[],pos];
-			constructs_cf.cf_expr <- Some (mk_nativearray_decl gen basic.tstring (List.map (fun s -> { eexpr = TConst(TString s); etype = basic.tstring; epos = pos }) en.e_names) pos);
-
-			cl.cl_ordered_statics <- constructs_cf :: cfs @ cl.cl_ordered_statics ;
-			cl.cl_statics <- PMap.add "__hx_constructs" constructs_cf cl.cl_statics;
-
-			let getTag_cf_type = tfun [] basic.tstring in
-			let getTag_cf = mk_class_field "getTag" getTag_cf_type true pos (Method MethNormal) [] in
-			getTag_cf.cf_meta <- [(Meta.Final, [], pos)];
-			getTag_cf.cf_expr <- Some {
-				eexpr = TFunction {
-					tf_args = [];
-					tf_type = basic.tstring;
-					tf_expr = {
-						eexpr = TReturn (Some (
-							let e_constructs = mk_static_field_access_infer cl "__hx_constructs" pos [] in
-							let e_this = mk (TConst TThis) (TInst (cl,[])) pos in
-							let e_index = mk_field_access gen e_this "index" pos in
-							{
-								eexpr = TArray(e_constructs,e_index);
-								etype = basic.tstring;
-								epos = pos;
-							}
-						));
-						epos = pos;
-						etype = basic.tvoid;
-					}
-				};
-				etype = getTag_cf_type;
-				epos = pos;
-			};
-
-			cl.cl_ordered_fields <- getTag_cf :: cl.cl_ordered_fields ;
-			cl.cl_fields <- PMap.add "getTag" getTag_cf cl.cl_fields;
-			cl.cl_overrides <- getTag_cf :: cl.cl_overrides;
-			cl.cl_meta <- (Meta.NativeGen,[],cl.cl_pos) :: cl.cl_meta;
-			gen.gadd_to_module (TClassDecl cl) (max_dep);
-
-			TEnumDecl en
-
-		(*
-			traverse
-				gen - gen context
-				convert_all : bool - should we convert all enums? If set, convert_if_has_meta will be ignored.
-				convert_if_has_meta : bool - should we convert only if it has meta?
-				enum_base_class : tclass - the enum base class.
-				should_be_hxgen : bool - should the created enum be hxgen?
-		*)
-		let configure gen t convert_all convert_if_has_meta enum_base_class param_enum_class =
-			let convert e = convert gen t enum_base_class param_enum_class e in
-			let run md =
-				match md with
-				| TEnumDecl e when is_hxgen md ->
-					if convert_all then
-						convert e
-					else if convert_if_has_meta && has_any_meta e then
-						convert e
-					else if not (Meta.has Meta.FlatEnum e.e_meta) then
-						convert e
-					else begin
-						(* take off the :hxgen meta from it, if there's any *)
-						e.e_meta <- List.filter (fun (n,_,_) -> not (n = Meta.HxGen)) e.e_meta;
-						md
-					end
-				| _ ->
-					md
-			in
-			let map md = Some(run md) in
-			gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
-	end;;
-
-	(* ******************************************* *)
-	(* EnumToClassExprf *)
-	(* ******************************************* *)
-	(*
-		Enum to class Expression Filter
-
-		dependencies:
-			Should run before TArrayTransform, since it generates array access expressions
-	*)
-	module EnumToClassExprf =
-	struct
-		let name = "enum_to_class_exprf"
-		let priority = solve_deps name [DBefore TArrayTransform.priority]
-
-		let configure gen t opt_get_native_enum_tag =
-			let rec run e =
-				let get_converted_enum_type et =
-					let en, eparams = match follow (gen.gfollow#run_f et) with
-						| TEnum(en,p) -> en, p
-						| _ -> raise Not_found
-					in
-					let cl = Hashtbl.find t.ec_tbl en.e_path in
-					TInst(cl, eparams)
-				in
-
-				match e.eexpr with
-				| TCall (({eexpr = TField(_, FStatic({cl_path=[],"Type"},{cf_name="enumIndex"}))} as left), [f]) ->
-					let f = run f in
-					(try
-						mk_field_access gen {f with etype = get_converted_enum_type f.etype} "index" e.epos
-					with Not_found ->
-						{ e with eexpr = TCall(left, [f]) })
-				| TEnumParameter(f, _,i) ->
-					let f = run f in
-					(* check if en was converted to class *)
-					(* if it was, switch on tag field and change cond type *)
-					let f = try
-						{ f with etype = get_converted_enum_type f.etype }
-					with Not_found ->
-						f
-					in
-					let cond_array = { (mk_field_access gen f "params" f.epos) with etype = gen.gclasses.nativearray t_dynamic } in
-					Codegen.index gen.gcon cond_array i e.etype e.epos
-				| _ ->
-					Type.map_expr run e
-			in
-			let map e = Some(run e) in
-			gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map
-
-	end;;
-
-	let configure gen opt_get_native_enum_tag convert_all convert_if_has_meta enum_base_class param_enum_class =
-		let t = new_t () in
-		EnumToClassModf.configure gen t convert_all convert_if_has_meta enum_base_class param_enum_class;
-		EnumToClassExprf.configure gen t opt_get_native_enum_tag
-end;;
-
-(* ******************************************* *)
-(* IteratorsInterface *)
-(* ******************************************* *)
-
-(*
-
-	This module will handle with Iterators, Iterables and TFor() expressions.
-	At first, a module filter will receive a Iterator<T> and Iterable<T> interface, which will be implemented
-	if hasNext(), next() or iterator() fields are detected with the correct type.
-	At this part a custom function will be called which can adequate the class fields so they are compatible with
-	native Iterators as well
-
-	The expression filter part of this module will look for TFor() expressions, and transform like that:
-	for (anInt in value.iterator())
-	{
-
-	}
-
-	{
-		var s:haxe.lang.Iterator<Int> = ExternalFunction.getIterator(value.iterator());
-		while (s.hasNext())
-		{
-			var anInt:Int = s.next();
-
-		}
-	}
-
-	dependencies:
-		None.
-
-*)
-
-module IteratorsInterface =
-struct
-	let name = "iterators_interface"
-	(* TODO later
-	(* ******************************************* *)
-	(* IteratorsInterfaceModf *)
-	(* ******************************************* *)
-	(*
-		The module filter for Iterators Interface, which will implement the iterator/iterable interface on each
-		class that conforms with the typedefs Iterator<> and Iterable<>
-
-		It's a very simple module and it will rely on cast detection to work correctly. This is so that
-		when the
-
-		dependencies:
-			Must run at the Module Filters, so cast detection can detect a cast to the interface and we can
-	*)
-	module IteratorsInterfaceModf =
-	struct
-		let name = "iterators_interface_modf"
-
-		let conforms_cfs has_next next =
-			try (match follow has_next.cf_type with
-				| TFun([],ret) when
-					(match follow ret with | TAbstract({ a_path = ([], "Bool") }, []) -> () | _ -> raise Not_found) ->
-						()
-				| _ -> raise Not_found);
-			(match follow next.cf_type with
-				| TFun([], ret) -> ret
-				| _ -> raise Not_found
-			)
-
-		let conforms_type_iterator t =
-			try match follow t with
-				| TInst(cl,params) ->
-						let has_next = PMap.find "hasNext" cl.cl_fields in
-						let next = PMap.find "next" cl.cl_fields in
-						Some (conforms_cfs has_next next)
-				| TAnon(anon) ->
-						let has_next = PMap.find "hasNext" anon.a_fields in
-						let next = PMap.find "next" anon.a_fields in
-						Some (conforms_cfs has_next next)
-				| _ -> None
-			with | Not_found -> None
-
-		let conforms_as_iterable cl =
-			try
-				let iterator = PMap.find "iterator" cl.cl_fields in
-				match follow iterator.cf_type with
-					| TFun([], ret) -> conforms_type_iterator ret
-					| _ -> None
-			with | Not_found -> None
-
-		let conforms_as_iterator cl =
-			try
-				let has_next = PMap.find "hasNext" cl.cl_fields in
-				let next = PMap.find "next" cl.cl_fields in
-				Some (conforms_cfs has_next next)
-			with | Not_found -> None
-
-		let priority = solve_deps name []
-
-		let traverse gen iterator_iface iterable_iface on_found_iterator on_found_iterable =
-			let rec run md =
-				match md with
-					| TClassDecl cl when not cl.cl_extern && is_hxgen cl ->
-						let conforms_iterator = conforms_as_iterator cl in
-						let conforms_iterable = conforms_as_iterable cl in
-						if is_some conforms_iterator then begin
-							let it_t = get conforms_iterator in
-							cl.cl_interfaces <- (iterator_iface, [it_t]);
-							on_found_iterator cl
-						end;
-						if is_some conforms_iterable then begin
-							let it_t = get conforms_iterable in
-							cl.cl_interfaces <- (iterable_iface, [it_t]);
-							on_found_iterable cl
-						end;
-
-						md
-					| _ -> md
-			in
-			run
-
-		let configure gen (mapping_func:texpr->texpr) =
-			let map e = Some(mapping_func e) in
-			gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map
-
-	end;;
-	*)
-
-	(* ******************************************* *)
-	(* IteratorsInterfaceExprf *)
-	(* ******************************************* *)
-	(*
-		The expression filter for Iterators. Will look for TFor, transform it into
-		{
-			var iterator = // in expression here
-			while (iterator.hasNext())
-			{
-				var varName = iterator.next();
-			}
-		}
-
-		dependencies:
-			Must run before Dynamic fields access is run
-
-		TODO: I think TFor is always rewritten to TWhile before getting into the generator nowadays,
-		so this filter could probably be removed. Gotta ask Simon about it.
-	*)
-	module IteratorsInterfaceExprf =
-	struct
-		let name = "iterators_interface_exprf"
-		let priority = solve_deps name [DBefore DynamicFieldAccess.priority]
-
-		let mk_access gen v name pos =
-			let field_t =
-				try match follow v.v_type with
-					| TInst(cl, params) ->
-						let field = PMap.find name cl.cl_fields in
-						apply_params cl.cl_params params field.cf_type
-					| TAnon(anon) ->
-						let field = PMap.find name anon.a_fields in
-						field.cf_type
-					| _ -> t_dynamic
-				with | Not_found -> t_dynamic
-			in
-			{ (mk_field_access gen (mk_local v pos) name pos) with etype = field_t }
-
-		let configure gen =
-			let basic = gen.gcon.basic in
-			let rec run e =
-				match e.eexpr with
-				| TFor(var, in_expr, block) ->
-					let in_expr = run in_expr in
-					let temp = mk_temp gen "iterator" in_expr.etype in
-					let block = [
-						{ eexpr = TVar(temp, Some(in_expr)); etype = basic.tvoid; epos = in_expr.epos };
-						{
-							eexpr = TWhile(
-								{ eexpr = TCall(mk_access gen temp "hasNext" in_expr.epos, []); etype = basic.tbool; epos = in_expr.epos },
-								Type.concat ({
-									eexpr = TVar(var, Some({ eexpr = TCall(mk_access gen temp "next" in_expr.epos, []); etype = var.v_type; epos = in_expr.epos }));
-									etype = basic.tvoid;
-									epos = in_expr.epos
-								}) ( run block ),
-								Ast.NormalWhile);
-							etype = basic.tvoid;
-							epos = e.epos
-						}
-					] in
-					{ eexpr = TBlock(block); etype = e.etype; epos = e.epos }
-				| _ ->
-					Type.map_expr run e
-			in
-			let map e = Some(run e) in
-			gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map
-	end;;
-
-	let configure gen =
-		IteratorsInterfaceExprf.configure gen
-
-end;;
-
-
-(* ******************************************* *)
-(* SwitchToIf *)
-(* ******************************************* *)
-(*
-	Just a syntax filter which changes switch expressions to if() else if() else if() ...
-*)
-module SwitchToIf =
-struct
-	let name = "switch_to_if"
-	let priority = solve_deps name []
-
-	let rec simplify_expr e = match e.eexpr with
-		| TParenthesis e
-		| TMeta(_,e) -> simplify_expr e
-		| _ -> e
-
-	let configure gen (should_convert:texpr->bool) =
-		let basic = gen.gcon.basic in
-		let rec run e =
-			match e.eexpr with
-				| TSwitch(cond,cases,default) when should_convert e ->
-					let cond_etype, should_cache = match gen.gfollow#run_f cond.etype with
-						| TType({ t_path = ([], "Null") }, [t]) ->
-							let rec take_off_nullable t = match gen.gfollow#run_f t with
-								| TType({ t_path = ([], "Null") }, [t]) -> take_off_nullable t
-								| _ -> t
-							in
-
-							take_off_nullable t, true
-						| _ -> cond.etype, false
-					in
-
-					if should_cache && not (should_convert { e with eexpr = TSwitch({ cond with etype = cond_etype }, cases, default) }) then begin
-						{ e with eexpr = TSwitch(mk_cast cond_etype (run cond), List.map (fun (cs,e) -> (List.map run cs, run e)) cases, Option.map run default) }
-					end else begin
-						let local, fst_block = match cond.eexpr, should_cache with
-							| TLocal _, false -> cond, []
-							| _ ->
-								let var = mk_temp gen "switch" cond_etype in
-								let cond = run cond in
-								let cond = if should_cache then mk_cast cond_etype cond else cond in
-
-								mk_local var cond.epos, [ { eexpr = TVar(var,Some(cond)); etype = basic.tvoid; epos = cond.epos } ]
-						in
-
-						let mk_eq cond =
-							{ eexpr = TBinop(Ast.OpEq, local, cond); etype = basic.tbool; epos = cond.epos }
-						in
-
-						let rec mk_many_cond conds =
-							match conds with
-								| cond :: [] ->
-									mk_eq cond
-								| cond :: tl ->
-									{ eexpr = TBinop(Ast.OpBoolOr, mk_eq (run cond), mk_many_cond tl); etype = basic.tbool; epos = cond.epos }
-								| [] -> assert false
-						in
-
-						let mk_many_cond conds =
-							let ret = mk_many_cond conds in
-							(*
-								this might be considered a hack. But since we're on a syntax filter and
-								the condition is guaranteed to not have run twice, we can really run the
-								expr filters again for it (so to change e.g. OpEq accordingly
-							*)
-							gen.gexpr_filters#run_f ret
-						in
-
-						let rec loop cases = match cases with
-							| (conds,e) :: [] ->
-								{ eexpr = TIf(mk_many_cond conds, run e, Option.map run default); etype = e.etype; epos = e.epos }
-							| (conds,e) :: tl ->
-								{ eexpr = TIf(mk_many_cond conds, run e, Some(loop tl)); etype = e.etype; epos = e.epos }
-							| [] -> match default with
-								| None ->
-									raise Exit
-								| Some d -> run d
-						in
-
-						try
-							{ e with eexpr = TBlock(fst_block @ [loop cases]) }
-						with | Exit ->
-							{ e with eexpr = TBlock [] }
-					end
-				| TSwitch(cond,cases,default) -> (try
-					match (simplify_expr cond).eexpr with
-						| TCall( { eexpr = TField(_,FStatic({ cl_path = [],"Type" }, { cf_name = "enumIndex" })) }, [enum] ) ->
-							let real_enum = match enum.etype with
-								| TEnum(e,_) -> e
-								| _ -> raise Not_found
-							in
-							if Meta.has Meta.Class real_enum.e_meta then raise Not_found;
-							let enum_expr = mk_mt_access (TEnumDecl(real_enum)) e.epos in
-							let fields = Hashtbl.create (List.length real_enum.e_names) in
-							PMap.iter (fun _ ef -> Hashtbl.add fields ef.ef_index ef) real_enum.e_constrs;
-							let cases = List.map (fun (el,e) ->
-								List.map (fun e -> match e.eexpr with
-								| TConst(TInt i) ->
-									let ef = Hashtbl.find fields (Int32.to_int i) in
-									{ e with eexpr = TField(enum_expr, FEnum(real_enum,ef)); etype = TEnum(real_enum,List.map (fun _ -> t_dynamic) real_enum.e_params) }
-								| _ -> raise Not_found) el, run e
-							) cases in
-							{ e with eexpr = TSwitch(enum,cases,Option.map run default) }
-						| _ -> raise Not_found
-					with Not_found -> Type.map_expr run e)
-				| _ -> Type.map_expr run e
-		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* Anonymous Class object handling *)
-(* ******************************************* *)
-(*
-	(syntax)
-	When we pass a class as an object, in some languages we will need a special construct to be able to
-	access its statics as if they were normal object fields. On C# and Java the way found to do that is
-	by handling statics reflection also by a normal instance. This also happens in hxcpp and neko, so I
-	guess it's a valid practice.
-	So if we want to handle the reflection of the static MyClass, here's roughly how it will be done:
-
-	var x = MyClass;
-	gets converted into
-	Haxe.Lang.Class x = Haxe.Lang.Runtime.GetType(typeof(MyClass).RuntimeHandle);
-
-	which will in turn look in its cache but roughly would do:
-	Haxe.Lang.Class x = new Haxe.Lang.Class(new MyClass(EmptyObject.EMPTY));
-
-	This module will of course let the caller choose how this will be implemented. It will just identify all
-	uses of class that will require it to be cast as an object.
-*)
-module ClassInstance =
-struct
-	let priority = solve_deps "class_instance" []
-
-	let configure gen (change_expr:texpr->module_type->texpr) =
-		let rec run e =
-			match e.eexpr with
-					| TCall( ({ eexpr = TLocal({ v_name = ("__is__" | "__as__" | "__typeof__") } as v) } as local), calls ) when Hashtbl.mem gen.gspecial_vars v.v_name ->
-						{ e with eexpr = TCall(local, List.map (fun e ->
-							match e.eexpr with
-							| TTypeExpr _ -> e
-							| _ -> run e) calls) }
-					| TField({ eexpr = TTypeExpr(mt) }, f) ->
-							e
-					| TField(ef, f) ->
-						(match anon_class ef.etype with
-							| None -> Type.map_expr run e
-							| Some t ->
-								{ e with eexpr = TField( { ef with eexpr = TTypeExpr(t) }, f) }
-						)
-					| TTypeExpr(mt) -> change_expr e mt
-					| _ -> Type.map_expr run e
-		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:"class_instance" ~priority:(PCustom priority) map
-end;;
-
-(* ******************************************* *)
-(* HardNullableSynf *)
-(* ******************************************* *)
-(*
-	This module will handle Null<T> types for languages that offer a way of dealing with
-	stack-allocated structures or tuples and generics. Essentialy on those targets a Null<T>
-	will be a tuple ( 'a * bool ), where bool is whether the value is null or not.
-
-	At first (configure-time), we will modify the follow function so it can follow correctly nested Null<Null<T>>,
-	and do not follow Null<T> to its underlying type
-
-	Then we will run a syntax filter, which will look for casts to Null<T> and replace them by
-	a call to the new Null<T> creation;
-	Also casts from Null<T> to T or direct uses of Null<T> (call, field access, array access, closure)
-	will result in the actual value being accessed
-	For compatibility with the C# target, HardNullable will accept both Null<T> and haxe.lang.Null<T> types
-
-	dependencies:
-		Needs to be run after all cast detection modules
-*)
-module HardNullableSynf =
-struct
-	let name = "hard_nullable"
-	let priority = solve_deps name [DAfter CastDetect.ReturnCast.priority]
-
-	let rec is_null_t gen t = match gen.greal_type t with
-		| TType( { t_path = ([], "Null") }, [of_t])
-		| TInst( { cl_path = (["haxe";"lang"], "Null") }, [of_t]) ->
-			let rec take_off_null t =
-				match is_null_t gen t with | None -> t | Some s -> take_off_null s
-			in
-
-			Some (take_off_null of_t)
-		| TMono r -> (match !r with | Some t -> is_null_t gen t | None -> None)
-		| TLazy f -> is_null_t gen (!f())
-		| TType (t, tl) ->
-			is_null_t gen (apply_params t.t_params tl t.t_type)
-		| _ -> None
-
-	let follow_addon gen t =
-		let rec strip_off_nullable t =
-			let t = gen.gfollow#run_f t in
-			match t with
-				(* haxe.lang.Null<haxe.lang.Null<>> wouldn't be a valid construct, so only follow Null<> *)
-				| TType ( { t_path = ([], "Null") }, [of_t] ) -> strip_off_nullable of_t
-				| _ -> t
-		in
-
-		match t with
-			| TType( ({ t_path = ([], "Null") } as tdef), [of_t]) ->
-				Some( TType(tdef, [ strip_off_nullable of_t ]) )
-			| _ -> None
-
-	let configure gen unwrap_null wrap_val null_to_dynamic has_value opeq_handler =
-		gen.gfollow#add ~name:(name ^ "_follow") (follow_addon gen);
-
-		let is_null_t = is_null_t gen in
-		let is_string t = match gen.greal_type t with
-			| TInst({ cl_path=([],"String") },_) -> true
-			| _ -> false
-		in
-		let handle_unwrap to_t e =
-			let e_null_t = get (is_null_t e.etype) in
-			match gen.greal_type to_t with
-				| TDynamic _ | TMono _ | TAnon _ ->
-					(match e_null_t with
-						| TDynamic _ | TMono _ | TAnon _ ->
-							gen.ghandle_cast to_t e_null_t (unwrap_null e)
-						| _ -> null_to_dynamic e
-					)
-				| _ ->
-					gen.ghandle_cast to_t e_null_t (unwrap_null e)
-		in
-
-		let handle_wrap e t =
-			match e.eexpr with
-				| TConst(TNull) ->
-					wrap_val e t false
-				| _ ->
-					wrap_val e t true
-		in
-
-		let cur_block = ref [] in
-		let add_tmp v e p =
-			cur_block := { eexpr = TVar(v,e); etype = gen.gcon.basic.tvoid; epos = p } :: !cur_block
-		in
-		let get_local e = match e.eexpr with
-			| TLocal _ ->
-				e, e
-			| _ ->
-				let v = mk_temp gen "nulltmp" e.etype in
-				add_tmp v (Some (null e.etype e.epos)) e.epos;
-				let local = { e with eexpr = TLocal(v) } in
-				mk_paren { e with eexpr = TBinop(Ast.OpAssign, local, e) }, local
-		in
-		let rec run e =
-			match e.eexpr with
-				| TBlock(bl) ->
-					let lst = !cur_block in
-					cur_block := [];
-					List.iter (fun e ->
-						let e = run e in
-						cur_block := (e :: !cur_block)
-					) bl;
-					let ret = !cur_block in
-					cur_block := lst;
-					{ e with eexpr = TBlock(List.rev ret) }
-				| TCast(v, _) ->
-					let null_et = is_null_t e.etype in
-					let null_vt = is_null_t v.etype in
-					(match null_vt, null_et with
-						| Some(vt), None when is_string e.etype ->
-							let v = run v in
-							{ e with eexpr = TCast(null_to_dynamic v,None) }
-						| Some(vt), None ->
-							(match v.eexpr with
-								(* is there an unnecessary cast to Nullable? *)
-								| TCast(v2, _) ->
-									run { v with etype = e.etype }
-								| _ ->
-									handle_unwrap e.etype (run v)
-							)
-						| None, Some(et) ->
-							handle_wrap (run v) et
-						| Some(vt), Some(et) when not (type_iseq (run_follow gen vt) (run_follow gen et)) ->
-							(* check if has value and convert *)
-							let vlocal_fst, vlocal = get_local (run v) in
-							{
-								eexpr = TIf(
-									has_value vlocal_fst,
-									handle_wrap (mk_cast et (unwrap_null vlocal)) et,
-									Some( handle_wrap (null et e.epos) et ));
-								etype = e.etype;
-								epos = e.epos
-							}
-						| _ ->
-							Type.map_expr run e
-					)
-				| TField(ef, field) when is_some (is_null_t ef.etype) ->
-					let to_t = get (is_null_t ef.etype) in
-					{ e with eexpr = TField(handle_unwrap to_t (run ef), field) }
-				| TCall(ecall, params) when is_some (is_null_t ecall.etype) ->
-					let to_t = get (is_null_t ecall.etype) in
-					{ e with eexpr = TCall(handle_unwrap to_t (run ecall), List.map run params) }
-				| TArray(earray, p) when is_some (is_null_t earray.etype) ->
-					let to_t = get (is_null_t earray.etype) in
-					{ e with eexpr = TArray(handle_unwrap to_t (run earray), p) }
-				| TBinop(op, e1, e2) ->
-					let e1_t = is_null_t e1.etype in
-					let e2_t = is_null_t e2.etype in
-
-					(match op with
-						| Ast.OpAssign
-						| Ast.OpAssignOp _ ->
-							(match e1_t, e2_t with
-								| Some t1, Some t2 ->
-									(match op with
-										| Ast.OpAssign ->
-											Type.map_expr run e
-										| Ast.OpAssignOp op ->
-											(match e1.eexpr with
-												| TLocal _ ->
-													{ e with eexpr = TBinop( Ast.OpAssign, e1, handle_wrap { e with eexpr = TBinop (op, handle_unwrap t1 e1, handle_unwrap t2 (run e2) ) } t1 ) }
-												| _ ->
-													let v, e1, evars = match e1.eexpr with
-														| TField(ef, f) ->
-															let v = mk_temp gen "nullbinop" ef.etype in
-															v, { e1 with eexpr = TField(mk_local v ef.epos, f) }, ef
-														| _ ->
-															let v = mk_temp gen "nullbinop" e1.etype in
-															v, mk_local v e1.epos, e1
-													in
-													{ e with eexpr = TBlock([
-														{ eexpr = TVar(v, Some evars); etype = gen.gcon.basic.tvoid; epos = e.epos };
-														{ e with eexpr = TBinop( Ast.OpAssign, e1, handle_wrap { e with eexpr = TBinop (op, handle_unwrap t1 e1, handle_unwrap t2 (run e2) ) } t1 ) }
-													]) }
-											)
-										| _ -> assert false
-									)
-
-								| _ ->
-									Type.map_expr run e (* casts are already dealt with normal CastDetection module *)
-							)
-						| Ast.OpEq | Ast.OpNotEq ->
-							(match e1.eexpr, e2.eexpr with
-								| TConst(TNull), _ when is_some e2_t ->
-									let e = has_value (run e2) in
-									if op = Ast.OpEq then
-										{ e with eexpr = TUnop(Ast.Not, Ast.Prefix, e) }
-									else
-										e
-								| _, TConst(TNull) when is_some e1_t ->
-									let e = has_value (run e1) in
-									if op = Ast.OpEq then
-										{ e with eexpr = TUnop(Ast.Not, Ast.Prefix, e) }
-									else
-										e
-								| _ when is_some e1_t || is_some e2_t ->
-										let e1, e2 =
-											if not (is_some e1_t) then
-												run e2, handle_wrap (run e1) (get e2_t)
-											else if not (is_some e2_t) then
-												run e1, handle_wrap (run e2) (get e1_t)
-											else
-												run e1, run e2
-										in
-										let e = opeq_handler e1 e2 in
-										if op = Ast.OpEq then
-											{ e with eexpr = TUnop(Ast.Not, Ast.Prefix, e) }
-										else
-											e
-								| _ ->
-									Type.map_expr run e
-							)
-						| Ast.OpAdd when is_string e1.etype || is_string e2.etype ->
-							let e1 = if is_some e1_t then
-								null_to_dynamic (run e1)
-							else
-								run e1
-							in
-							let e2 = if is_some e2_t then
-								null_to_dynamic (run e2)
-							else
-								run e2
-							in
-							let e_t = is_null_t e.etype in
-							if is_some e_t then
-								wrap_val { eexpr = TBinop(op,e1,e2); etype = get e_t; epos = e.epos } (get e_t) true
-							else
-								{ e with eexpr = TBinop(op,e1,e2) }
-						| _ ->
-							let e1 = if is_some e1_t then
-								handle_unwrap (get e1_t) (run e1)
-							else run e1 in
-							let e2 = if is_some e2_t then
-								handle_unwrap (get e2_t) (run e2)
-							else
-								run e2 in
-
-							(* if it is Null<T>, we need to convert the result again to null *)
-							let e_t = (is_null_t e.etype) in
-							if is_some e_t then
-								wrap_val { eexpr = TBinop(op, e1, e2); etype = get e_t; epos = e.epos } (get e_t) true
-							else
-								{ e with eexpr = TBinop(op, e1, e2) }
-					)
-				(*| TUnop( (Ast.Increment as op)*)
-				| _ -> Type.map_expr run e
-		in
-		let run e = match e.eexpr with
-			| TFunction tf ->
-				run { e with eexpr = TFunction { tf with tf_expr = mk_block tf.tf_expr } }
-			| TBlock _ ->
-				run e
-			| _ -> match run (mk_block e) with
-				| { eexpr = TBlock([e]) } -> e
-				| e -> e
-		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-
-end;;
-
-(* ******************************************* *)
-(* ArrayDeclSynf *)
-(* ******************************************* *)
-(*
-	A syntax filter that will change array declarations to the actual native array declarations plus
-	the haxe array initialization
-
-	dependencies:
-		Must run after ObjectDeclMap since it can add TArrayDecl expressions
-*)
-module ArrayDeclSynf =
-struct
-	let name = "array_decl_synf"
-	let priority = solve_deps name [DAfter ObjectDeclMap.priority]
-
-	let configure gen native_array_cl =
-		let rec run e =
-			match e.eexpr with
-			| TArrayDecl el ->
-				let cl, params = match follow e.etype with
-					| TInst(({ cl_path = ([], "Array") } as cl), ( _ :: _  as params)) -> cl, params
-					| TInst(({ cl_path = ([], "Array") } as cl), []) -> cl, [t_dynamic]
-					| _ -> assert false
-				in
-				let changed_params = gen.greal_type_param (TClassDecl cl) params in
-				{ e with eexpr = TNew(cl, changed_params, [ { e with eexpr = TArrayDecl(List.map run el); etype = TInst(native_array_cl, changed_params) } ]	); }
-			| _ -> Type.map_expr run e
-		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* SwitchBreakSynf *)
-(* ******************************************* *)
-(*
-	In most languages, 'break' is used as a statement also to break from switch statements.
-	This generates an incompatibility with haxe code, as we can use break to break from loops from inside a switch
-
-	This script will detect 'breaks' inside switch statements, and will offer the opportunity to change both
-	when this pattern is found.
-
-	Some options are possible:
-		On languages that support goto, 'break' may mean goto " after the loop ". There also can be special labels for
-			loops, so you can write "break label" (javascript, java, d)
-		On languages that do not support goto, a custom solution must be enforced
-
-	dependencies:
-		Since UnreachableCodeElimination must run before it, and Unreachable should be one of the
-		very last filters to run, we will make a fixed value which runs after UnreachableCodeElimination
-		(meaning: it's the very last filter)
-*)
-module SwitchBreakSynf =
-struct
-	let name = "switch_break_synf"
-	let priority = min_dep -. 150.0
-
-	type add_to_block_api = texpr->bool->unit
-
-	let configure gen (change_loop:texpr->int->add_to_block_api->texpr) (change_break:texpr->int->add_to_block_api->texpr) =
-		let in_switch = ref false in
-		let cur_block = ref [] in
-		let to_add = ref [] in
-		let did_found = ref (-1) in
-
-		let api expr before =
-			if before then cur_block := expr :: !cur_block else to_add := expr :: !to_add
-		in
-		let num = ref 0 in
-		let cur_num = ref 0 in
-
-		let rec run e =
-			match e.eexpr with
-			| TFunction _ ->
-				let old_num = !num in
-				num := 0;
-					let ret = Type.map_expr run e in
-				num := old_num;
-				ret
-			| TFor _
-			| TWhile _ ->
-				let last_switch = !in_switch in
-				let last_found = !did_found in
-				let last_num = !cur_num in
-				in_switch := false;
-				incr num;
-				cur_num := !num;
-				did_found := -1;
-					let new_e = Type.map_expr run e in (* assuming that no loop will be found in the condition *)
-					let new_e = if !did_found <> -1 then change_loop new_e !did_found api else new_e in
-				did_found := last_found;
-				in_switch := last_switch;
-				cur_num := last_num;
-
-				new_e
-			| TSwitch _ ->
-				let last_switch = !in_switch in
-				in_switch := true;
-
-					let new_e = Type.map_expr run e in
-
-				in_switch := last_switch;
-				new_e
-			| TBlock bl ->
-				let last_block = !cur_block in
-				let last_toadd = !to_add in
-				to_add := [];
-				cur_block := [];
-
-					List.iter (fun e ->
-						let new_e = run e in
-						cur_block := new_e :: !cur_block;
-						match !to_add with
-							| [] -> ()
-							| _ -> cur_block := !to_add @ !cur_block; to_add := []
-					) bl;
-
-				let ret = List.rev !cur_block in
-				cur_block := last_block;
-				to_add := last_toadd;
-
-				{ e with eexpr = TBlock(ret) }
-			| TBreak ->
-				if !in_switch then (did_found := !cur_num; change_break e !cur_num api) else e
-			| _ -> Type.map_expr run e
-		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* Unreachable Code Elimination *)
-(* ******************************************* *)
-(*
-	In some source code platforms, the code won't compile if there is Unreachable code, so this filter will take off any unreachable code.
-		If the parameter "handle_switch_break" is set to true, it will already add a "break" statement on switch cases when suitable;
-			in order to not confuse with while break, it will be a special expression __sbreak__
-		If the parameter "handle_not_final_returns" is set to true, it will also add final returns when functions are detected to be lacking of them.
-			(Will respect __fallback__ expressions)
-		If the parameter "java_mode" is set to true, some additional checks following the java unreachable specs
-			(http://docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.21) will be added
-
-	dependencies:
-		This must run before SwitchBreakSynf (see SwitchBreakSynf dependecy value)
-		This must be the LAST syntax filter to run. It expects ExpressionUnwrap to have run correctly, since this will only work for source-code based targets
-*)
-module UnreachableCodeEliminationSynf =
-struct
-
-	let name = "unreachable_synf"
-
-	let priority = min_dep -. 100.0
-
-	type uexpr_kind =
-		| Normal
-		| BreaksLoop
-		| BreaksFunction
-
-	let aggregate_kind e1 e2 =
-		match e1, e2 with
-			| Normal, _
-			| _, Normal -> Normal
-			| BreaksLoop, _
-			| _, BreaksLoop -> BreaksLoop
-			| BreaksFunction, BreaksFunction -> BreaksFunction
-
-	let aggregate_constant op c1 c2=
-		match op, c1, c2 with
-			| OpEq, Some v1, Some v2 -> Some (TBool (v1 = v2))
-			| OpNotEq, Some v1, Some v2 -> Some (TBool (v1 <> v2))
-			| OpBoolOr, Some (TBool v1) , Some (TBool v2) -> Some (TBool (v1 || v2))
-			| OpBoolAnd, Some (TBool v1) , Some (TBool v2) -> Some (TBool (v1 && v2))
-			| OpAssign, _, Some v2 -> Some v2
-			| _ -> None
-
-	let rec get_constant_expr e =
-		match e.eexpr with
-			| TConst (v) -> Some v
-			| TBinop(op, v1, v2) -> aggregate_constant op (get_constant_expr v1) (get_constant_expr v2)
-			| TParenthesis(e) | TMeta(_,e) -> get_constant_expr e
-			| _ -> None
-
-	let traverse gen java_mode =
-		let basic = gen.gcon.basic in
-		let should_warn = false in
-
-		let do_warn =
-			if should_warn then gen.gcon.warning "Unreachable code" else (fun pos -> ())
-		in
-
-		let return_loop expr kind =
-			match kind with
-				| Normal | BreaksLoop -> expr, Normal
-				| _ -> expr, kind
-		in
-
-		let sbreak = alloc_var "__sbreak__" t_dynamic in
-		let mk_sbreak = mk_local sbreak in
-
-		let rec has_fallback expr = match expr.eexpr with
-			| TBlock(bl) -> (match List.rev bl with
-				| { eexpr = TLocal { v_name = "__fallback__" } } :: _ -> true
-				| ({ eexpr = TBlock(_) } as bl) :: _ -> has_fallback bl
-				| _ -> false)
-			| TLocal { v_name = "__fallback__" } -> true
-			| _ -> false
-		in
-
-		let handle_case = fun (expr,kind) ->
-			match kind with
-			| Normal when has_fallback expr -> expr
-			| Normal -> Type.concat expr (mk_sbreak expr.epos)
-			| BreaksLoop | BreaksFunction -> expr
-		in
-
-		let has_break = ref false in
-
-		let rec process_expr expr =
-			match expr.eexpr with
-				| TReturn _ | TThrow _ -> expr, BreaksFunction
-				| TContinue -> expr, BreaksLoop
-				| TBreak -> has_break := true; expr, BreaksLoop
-				| TCall( { eexpr = TLocal { v_name = "__goto__" } }, _ ) -> expr, BreaksLoop
-
-				| TBlock bl ->
-					let new_block = ref [] in
-					let is_unreachable = ref false in
-					let ret_kind = ref Normal in
-
-					List.iter (fun e ->
-						if !is_unreachable then
-							do_warn e.epos
-						else begin
-							let changed_e, kind = process_expr e in
-							new_block := changed_e :: !new_block;
-							match kind with
-								| BreaksLoop | BreaksFunction ->
-									ret_kind := kind;
-									is_unreachable := true
-								| _ -> ()
-						end
-					) bl;
-
-					{ expr with eexpr = TBlock(List.rev !new_block) }, !ret_kind
-				| TFunction tf ->
-					let changed, kind = process_expr tf.tf_expr in
-					let changed = if not (ExtType.is_void tf.tf_type) && kind <> BreaksFunction then
-						Type.concat changed { eexpr = TReturn( Some (null tf.tf_type expr.epos) ); etype = basic.tvoid; epos = expr.epos }
-					else
-						changed
-					in
-
-					{ expr with eexpr = TFunction({ tf with tf_expr = changed }) }, Normal
-				| TFor(var, cond, block) ->
-					let last_has_break = !has_break in
-					has_break := false;
-
-					let changed_block, _ = process_expr block in
-					has_break := last_has_break;
-					let expr = { expr with eexpr = TFor(var, cond, changed_block) } in
-					return_loop expr Normal
-				| TIf(cond, eif, None) ->
-					if java_mode then
-						match get_constant_expr cond with
-							| Some (TBool true) ->
-								process_expr eif
-							| _ ->
-								{ expr with eexpr = TIf(cond, fst (process_expr eif), None) }, Normal
-					else
-						{ expr with eexpr = TIf(cond, fst (process_expr eif), None) }, Normal
-				| TIf(cond, eif, Some eelse) ->
-					let eif, eif_k = process_expr eif in
-					let eelse, eelse_k = process_expr eelse in
-					let k = aggregate_kind eif_k eelse_k in
-					{ expr with eexpr = TIf(cond, eif, Some eelse) }, k
-				| TWhile(cond, block, flag) ->
-					let last_has_break = !has_break in
-					has_break := false;
-
-					let block, k = process_expr block in
-					if java_mode then
-						match get_constant_expr cond, flag, !has_break with
-							| Some (TBool true), _, false ->
-								has_break := last_has_break;
-								{ expr with eexpr = TWhile(cond, block, flag) }, BreaksFunction
-							| Some (TBool false), NormalWhile, _ ->
-								has_break := last_has_break;
-								do_warn expr.epos;
-								null expr.etype expr.epos, Normal
-							| _ ->
-								has_break := last_has_break;
-								return_loop { expr with eexpr = TWhile(cond,block,flag) } Normal
-					else begin
-						has_break := last_has_break;
-						return_loop { expr with eexpr = TWhile(cond,block,flag) } Normal
-					end
-				| TSwitch(cond, el_e_l, None) ->
-					{ expr with eexpr = TSwitch(cond, List.map (fun (el, e) -> (el, handle_case (process_expr e))) el_e_l, None) }, Normal
-				| TSwitch(cond, el_e_l, Some def) ->
-					let def, k = process_expr def in
-					let def = handle_case (def, k) in
-					let k = ref k in
-					let ret = { expr with eexpr = TSwitch(cond, List.map (fun (el, e) ->
-						let e, ek = process_expr e in
-						k := aggregate_kind !k ek;
-						(el, handle_case (e, ek))
-					) el_e_l, Some def) } in
-					ret, !k
-				| TTry (e, catches) ->
-					let e, k = process_expr e in
-					let k = ref k in
-					let ret = { expr with eexpr = TTry(e, List.map (fun (v, e) ->
-						let e, ek = process_expr e in
-						k := aggregate_kind !k ek;
-						(v, e)
-					) catches) } in
-					ret, !k
-				| _ -> expr, Normal
-		in
-
-		let run e = fst (process_expr e) in
-		run
-
-	let configure gen java_mode =
-		let run = traverse gen java_mode in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* DefaultArguments *)
-(* ******************************************* *)
-(*
-	This Module Filter will go through all defined functions in all modules and change them
-	so they set all default arguments to be of a Nullable type, and adds the unroll from nullable to
-	the not-nullable type in the beginning of the function.
-
-	dependencies:
-		It must run before OverloadingConstructor, since OverloadingConstructor will change optional structures behavior
-*)
-module DefaultArguments =
-struct
-	let name = "default_arguments"
-	let priority = solve_deps name [ DBefore OverloadingConstructor.priority ]
-
-	let gen_check basic t nullable_var const pos =
-		let is_null t = match t with TType({t_path = ([],"Null")}, _) -> true | _ -> false in
-		let needs_cast t1 t2 = match is_null t1, is_null t2 with
-			| true, false | false, true -> true
-			| _ -> false
-		in
-
-		let const_t = match const with
-			| TString _ -> basic.tstring | TInt _ -> basic.tint | TFloat _ -> basic.tfloat
-			| TNull -> t | TBool _ -> basic.tbool | _ -> assert false
-		in
-		let const = { eexpr = TConst(const); etype = const_t; epos = pos } in
-		let const = if needs_cast t const_t then mk_cast t const else const in
-
-		let arg = mk_local nullable_var pos in
-		let arg = if needs_cast t nullable_var.v_type then mk_cast t arg else arg in
-
-		{
-			eexpr = TIf(
-				{ eexpr = TBinop(Ast.OpEq, mk_local nullable_var pos, null nullable_var.v_type pos); etype = basic.tbool; epos = pos },
-				const,
-				Some(arg)
-			);
-			etype = t;
-			epos = pos;
-		}
-
-	let add_opt gen block pos (var,opt) =
-		match opt with
-		| None | Some TNull ->
-			(var,opt)
-		| Some (TString str) ->
-			block := Codegen.set_default gen.gcon var (TString str) pos :: !block;
-			(var, opt)
-		| Some const ->
-			let basic = gen.gcon.basic in
-			let nullable_var = mk_temp gen var.v_name (basic.tnull var.v_type) in
-			let orig_name = var.v_name in
-			var.v_name <- nullable_var.v_name;
-			nullable_var.v_name <- orig_name;
-			(* var v = (temp_var == null) ? const : cast temp_var; *)
-			let evar = mk (TVar(var, Some(gen_check basic var.v_type nullable_var const pos))) basic.tvoid pos in
-			block := evar :: !block;
-			(nullable_var, opt)
-
-	let rec change_func gen cf =
-		List.iter (change_func gen) cf.cf_overloads;
-		let is_ctor = cf.cf_name = "new" in
-		let basic = gen.gcon.basic in
-		match cf.cf_kind, follow cf.cf_type with
-			| Var _, _ | Method MethDynamic, _ -> ()
-			| _, TFun(args, ret) ->
-				let found = ref false in
-				let args = ref (List.map (fun (n,opt,t) ->
-					(n,opt, if opt then (found := true; basic.tnull t) else t)
-				) args) in
-				(match !found, cf.cf_expr with
-					| true, Some ({ eexpr = TFunction tf } as texpr) ->
-						let block = ref [] in
-						let tf_args = List.map (add_opt gen block tf.tf_expr.epos) tf.tf_args in
-						let arg_assoc = List.map2 (fun (v,o) (v2,_) -> v,(v2,o) ) tf.tf_args tf_args in
-						let rec extract_super e = match e.eexpr with
-							| TBlock(({ eexpr = TCall({ eexpr = TConst TSuper }, _) } as e2) :: tl) ->
-								e2, tl
-							| TBlock(hd :: tl) ->
-								let e2, tl2 = extract_super hd in
-								e2, tl2 @ tl
-							| _ -> raise Not_found
-						in
-						let block = try
-							if not is_ctor then raise Not_found;
-							(* issue #2570 *)
-							(* check if the class really needs the super as the first statement -
-							just to make sure we don't inadvertently break any existing code *)
-							let rec check cl =
-								if not (is_hxgen (TClassDecl cl)) then
-									()
-								else match cl.cl_super with
-									| None ->
-										raise Not_found
-									| Some (cl,_) ->
-										check cl
-							in
-							(match gen.gcurrent_class with
-								| Some cl -> check cl
-								| _ -> ());
-							let super, tl = extract_super tf.tf_expr in
-							(match super.eexpr with
-								| TCall({ eexpr = TConst TSuper } as e1, args) ->
-									(* any super argument will be replaced by an inlined version of the check *)
-									let found = ref false in
-									let rec replace_args e = match e.eexpr with
-										| TLocal(v) -> (try
-											let v2,o = List.assq v arg_assoc in
-											let o = match o with
-												| None -> raise Not_found
-												| Some o -> o
-											in
-											found := true;
-											gen_check gen.gcon.basic v.v_type v2 o e.epos
-										with | Not_found -> e)
-										| _ -> Type.map_expr replace_args e
-									in
-									let args = List.map (replace_args) args in
-									{ tf.tf_expr with eexpr = TBlock((if !found then { super with eexpr = TCall(e1,args) } else super) :: !block @ tl) }
-								| _ -> assert false)
-							with | Not_found ->
-								Type.concat { tf.tf_expr with eexpr = TBlock(!block); etype = basic.tvoid } tf.tf_expr
-						in
-
-						args := fun_args tf_args;
-						cf.cf_expr <- Some( {texpr with eexpr = TFunction( { tf with
-							tf_args = tf_args;
-							tf_expr = block
-						} ); etype = TFun(!args, ret) } );
-						cf.cf_type <- TFun(!args, ret)
-
-					| _ -> ()
-				);
-				(if !found then cf.cf_type <- TFun(!args, ret))
-			| _, _ -> assert false
-
-	let configure gen =
-		let run md =
-			(match md with
-			| TClassDecl cl ->
-				List.iter (change_func gen) cl.cl_ordered_fields;
-				List.iter (change_func gen) cl.cl_ordered_statics;
-				Option.may (change_func gen) cl.cl_constructor;
-			| _ -> ());
-			Some(md);
-		in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) run
-
-end;;
-
-
-(* ******************************************* *)
-(* Interface Variables Removal Modf *)
-(* ******************************************* *)
-(*
-	This module filter will take care of sanitizing interfaces for targets that do not support
-	variables declaration in interfaces. By now this will mean that if anything is typed as the interface,
-	and a variable access is made, a FNotFound will be returned for the field_access, so
-	the field will be only accessible by reflection.
-	Speed-wise, ideally it would be best to create getProp/setProp functions in this case and change
-	the AST to call them when accessing by interface. (TODO)
-	But right now it will be accessed by reflection.
-*)
-module InterfaceVarsDeleteModf =
-struct
-	let name = "interface_vars"
-	let priority = solve_deps name []
-
-	let configure gen =
-		let run md =
-			match md with
-			| TClassDecl ({ cl_interface = true } as cl) ->
-				let to_add = ref [] in
-				let fields = List.filter (fun cf ->
-					match cf.cf_kind with
-					| Var _ when gen.gcon.platform = Cs && Meta.has Meta.Event cf.cf_meta ->
-						true
-					| Var vkind when not (Type.is_extern_field cf && Meta.has Meta.Property cf.cf_meta) ->
-						(match vkind.v_read with
-							| AccCall ->
-								let newcf = mk_class_field ("get_" ^ cf.cf_name) (TFun([],cf.cf_type)) true cf.cf_pos (Method MethNormal) [] in
-								to_add := newcf :: !to_add;
-							| _ -> ()
-						);
-						(match vkind.v_write with
-							| AccCall ->
-								let newcf = mk_class_field ("set_" ^ cf.cf_name) (TFun(["val",false,cf.cf_type],cf.cf_type)) true cf.cf_pos (Method MethNormal) [] in
-								to_add := newcf :: !to_add;
-							| _ -> ()
-						);
-						cl.cl_fields <- PMap.remove cf.cf_name cl.cl_fields;
-						false
-					| Method MethDynamic ->
-						(* TODO OPTIMIZATION - add a `_dispatch` method to the interface which will call the dynamic function itself *)
-						cl.cl_fields <- PMap.remove cf.cf_name cl.cl_fields;
-						false
-					| _ ->
-						true
-				) cl.cl_ordered_fields in
-
-				cl.cl_ordered_fields <- fields;
-
-				List.iter (fun cf ->
-					match field_access gen (TInst(cl,List.map snd cl.cl_params)) cf.cf_name with
-					| FNotFound | FDynamicField _ ->
-						cl.cl_ordered_fields <- cf :: cl.cl_ordered_fields;
-						cl.cl_fields <- PMap.add cf.cf_name cf cl.cl_fields
-					| _ ->
-						()
-				) !to_add
-			| _ -> ()
-		in
-		let map md = Some(run md; md) in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* InterfaceProps *)
-(* ******************************************* *)
-(*
-	This module filter will go through all declared properties, and see if they are conforming to a native interface.
-	If they are, it will add Meta.Property to it.
-*)
-module InterfaceProps =
-struct
-	let name = "interface_props"
-	let priority = solve_deps name []
-
-	let configure gen =
-		let run md =
-			match md with
-			| TClassDecl ({ cl_interface = false; cl_extern = false } as cl) ->
-				let vars = List.fold_left (fun acc (iface,_) ->
-					if Meta.has Meta.CsNative iface.cl_meta then
-						List.filter (fun cf -> match cf.cf_kind with
-							| Var { v_read = AccCall } | Var { v_write = AccCall } -> true
-							| _ -> false
-						) iface.cl_ordered_fields @ acc
-					else
-						acc
-				) [] cl.cl_implements in
-				let vars = List.map (fun cf -> cf.cf_name) vars in
-				if vars <> [] then
-					List.iter (fun cf -> match cf.cf_kind with
-						| Var { v_read = AccCall } | Var { v_write = AccCall } when List.mem cf.cf_name vars ->
-							cf.cf_meta <- (Meta.Property, [], null_pos) :: cf.cf_meta
-						| _ -> ()
-					) cl.cl_ordered_fields
-			| _ ->
-				()
-		in
-		let map md = Some(run md; md) in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* Int Division Synf *)
-(* ******************************************* *)
-(*
-	On targets that support int division, this module will force a float division to be performed.
-	It will also look for casts to int or use of Std.int() to optimize this kind of operation.
-
-	dependencies:
-		since it depends on nothing, but many modules might generate division expressions,
-		it will be one of the last modules to run
-*)
-module IntDivisionSynf =
-struct
-	let name = "int_division_synf"
-	let priority = solve_deps name [ DAfter ExpressionUnwrap.priority; DAfter ObjectDeclMap.priority; DAfter ArrayDeclSynf.priority ]
-
-	let configure gen =
-		let basic = gen.gcon.basic in
-		let rec is_int t = match follow t with
-			| TInst({ cl_path = (["haxe";"lang"],"Null") }, [t]) -> is_int t
-			| t ->
-				like_int t && not (like_i64 t)
-		in
-		let is_exactly_int t = match follow t with
-			| TAbstract ({ a_path=[],"Int" }, []) -> true
-			| _ -> false
-		in
-		let rec run e =
-			match e.eexpr with
-			| TBinop((Ast.OpDiv as op), e1, e2) when is_int e1.etype && is_int e2.etype ->
-				{ e with eexpr = TBinop(op, mk_cast basic.tfloat (run e1), run e2) }
-			| TCall(
-					{ eexpr = TField(_, FStatic({ cl_path = ([], "Std") }, { cf_name = "int" })) },
-					[ ({ eexpr = TBinop((Ast.OpDiv as op), e1, e2) } as ebinop ) ]
-				) when is_int e1.etype && is_int e2.etype ->
-				let e = { ebinop with eexpr = TBinop(op, run e1, run e2); etype = basic.tint } in
-				if not (is_exactly_int e1.etype && is_exactly_int e2.etype) then
-					mk_cast basic.tint e
-				else
-					e
-			| TCast( ({ eexpr = TBinop((Ast.OpDiv as op), e1, e2) } as ebinop ), _ )
-			| TCast( ({ eexpr = TBinop(( (Ast.OpAssignOp Ast.OpDiv) as op), e1, e2) } as ebinop ), _ ) when is_int e1.etype && is_int e2.etype && is_int e.etype ->
-				let ret = { ebinop with eexpr = TBinop(op, run e1, run e2); etype = e.etype } in
-				if not (is_exactly_int e1.etype && is_exactly_int e2.etype) then
-					mk_cast e.etype ret
-				else
-					e
-			| _ ->
-				Type.map_expr run e
-		in
-
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* UnnecessaryCastsRemoval *)
-(* ******************************************* *)
-(*
-	This module will take care of simplifying unnecessary casts, specially those made by the compiler
-	when inlining. Right now, it will only take care of casts used as a statement, which are always useless;
-	TODO: Take care of more cases, e.g. when the to and from types are the same
-
-	dependencies:
-		This must run after CastDetection, but before ExpressionUnwrap
-*)
-module UnnecessaryCastsRemoval =
-struct
-	let name = "casts_removal"
-	let priority = solve_deps name [DAfter CastDetect.priority; DBefore ExpressionUnwrap.priority]
-
-	let configure gen =
-		let rec take_off_cast run e =
-			match e.eexpr with
-			| TCast (c, _) -> take_off_cast run c
-			| _ -> run e
-		in
-		let rec traverse e =
-			match e.eexpr with
-			| TBlock bl ->
-				let bl = List.map (take_off_cast traverse) bl in
-				{ e with eexpr = TBlock bl }
-			| TTry (block, catches) ->
-				{ e with eexpr = TTry(traverse (mk_block block), List.map (fun (v,block) -> (v, traverse (mk_block block))) catches) }
-			| TSwitch (cond,el_e_l, default) ->
-				{ e with eexpr = TSwitch(cond, List.map (fun (el,e) -> (el, traverse (mk_block e))) el_e_l, Option.map (fun e -> traverse (mk_block e)) default) }
-			| TWhile (cond,block,flag) ->
-				{e with eexpr = TWhile(cond,traverse (mk_block block), flag) }
-			| TIf (cond, eif, eelse) ->
-				{ e with eexpr = TIf(cond, traverse (mk_block eif), Option.map (fun e -> traverse (mk_block e)) eelse) }
-			| TFor (v,it,block) ->
-				{ e with eexpr = TFor(v,it, traverse (mk_block block)) }
-			| TFunction (tfunc) ->
-				{ e with eexpr = TFunction({ tfunc with tf_expr = traverse (mk_block tfunc.tf_expr) }) }
-			| _ -> e (* if expression doesn't have a block, we will exit *)
-		in
-		let map e = Some(traverse e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* AbstractImplementationFix *)
-(* ******************************************* *)
-(*
-	This module filter will map the compiler created classes from abstract
-	implementations to valid haxe code, as needed by gencommon
-
-	dependencies:
-		No dependencies
-*)
-module AbstractImplementationFix =
-struct
-	let name = "abstract_implementation_fix"
-	let priority = solve_deps name []
-
-	let configure gen =
-		let run md =
-			(match md with
-			| TClassDecl ({ cl_kind = KAbstractImpl a } as c) ->
-				List.iter (
-					function
-					| ({ cf_name = "_new" } as cf) ->
-						cf.cf_params <- cf.cf_params @ a.a_params
-					| cf when Meta.has Meta.Impl cf.cf_meta ->
-						(match cf.cf_expr with
-						| Some({ eexpr = TFunction({ tf_args = (v, _) :: _ }) }) when Meta.has Meta.This v.v_meta ->
-							cf.cf_params <- cf.cf_params @ a.a_params
-						| _ -> ())
-					| _ -> ()
-				) c.cl_ordered_statics
-			| _ -> ());
-			Some md
-		in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) run
-end;;
-
-(* ******************************************* *)
-(* FixOverrides *)
-(* ******************************************* *)
-
-(*
-
-	Covariant return types, contravariant function arguments and applied type parameters may change
-	in a way that expected implementations / overrides aren't recognized as such.
-	This filter will fix that.
-
-	dependencies:
-		FixOverrides expects that the target platform is able to deal with overloaded functions
-		It must run after DefaultArguments, otherwise code added by the default arguments may be invalid
-
-*)
-
-module FixOverrides =
-struct
-
-	let name = "fix_overrides"
-
-	let priority = solve_deps name [DAfter DefaultArguments.priority]
-
-	(*
-		if the platform allows explicit interface implementation (C#),
-		specify a explicit_fn_name function (tclass->string->string)
-		Otherwise, it expects the platform to be able to handle covariant return types
-	*)
-	let run ~explicit_fn_name ~get_vmtype gen =
-		let implement_explicitly = is_some explicit_fn_name in
-		let run md = match md with
-			| TClassDecl ( { cl_interface = true; cl_extern = false } as c ) ->
-				(* overrides can be removed from interfaces *)
-				c.cl_ordered_fields <- List.filter (fun f ->
-					try
-						if Meta.has Meta.Overload f.cf_meta then raise Not_found;
-						let f2 = Codegen.find_field gen.gcon c f in
-						if f2 == f then raise Not_found;
-						c.cl_fields <- PMap.remove f.cf_name c.cl_fields;
-						false;
-					with Not_found ->
-						true
-				) c.cl_ordered_fields;
-				md
-			| TClassDecl({ cl_extern = false } as c) ->
-				let this = { eexpr = TConst TThis; etype = TInst(c,List.map snd c.cl_params); epos = c.cl_pos } in
-				(* look through all interfaces, and try to find a type that applies exactly *)
-				let rec loop_iface (iface:tclass) itl =
-					List.iter (fun (s,stl) -> loop_iface s (List.map (apply_params iface.cl_params itl) stl)) iface.cl_implements;
-					let real_itl = gen.greal_type_param (TClassDecl iface) itl in
-					let rec loop_f f =
-						List.iter loop_f f.cf_overloads;
-						let ftype = apply_params iface.cl_params itl f.cf_type in
-						let real_ftype = get_real_fun gen (apply_params iface.cl_params real_itl f.cf_type) in
-						replace_mono real_ftype;
-						let overloads = Overloads.get_overloads c f.cf_name in
-						try
-							let t2, f2 =
-								match overloads with
-								| (_, cf) :: _ when Meta.has Meta.Overload cf.cf_meta -> (* overloaded function *)
-									(* try to find exact function *)
-									List.find (fun (t,f2) ->
-										Overloads.same_overload_args ~get_vmtype ftype t f f2
-									) overloads
-								| _ :: _ ->
-									(match field_access gen (TInst(c, List.map snd c.cl_params)) f.cf_name with
-									| FClassField(_,_,_,f2,false,t,_) -> t,f2 (* if it's not an overload, all functions should have the same signature *)
-									| _ -> raise Not_found)
-								| [] -> raise Not_found
-							in
-							replace_mono t2;
-							(* if we find a function with the exact type of real_ftype, it means this interface has already been taken care of *)
-							if not (type_iseq (get_real_fun gen (apply_params f2.cf_params (List.map snd f.cf_params) t2)) real_ftype) then begin
-								(match f.cf_kind with | Method (MethNormal | MethInline) -> () | _ -> raise Not_found);
-								let t2 = get_real_fun gen t2 in
-								if List.length f.cf_params <> List.length f2.cf_params then raise Not_found;
-								replace_mono t2;
-								match follow (apply_params f2.cf_params (List.map snd f.cf_params) t2), follow real_ftype with
-								| TFun(a1,r1), TFun(a2,r2) when not implement_explicitly && not (type_iseq r1 r2) && Overloads.same_overload_args ~get_vmtype real_ftype t2 f f2 ->
-									(* different return types are the trickiest cases to deal with *)
-									(* check for covariant return type *)
-									let is_covariant = match follow r1, follow r2 with
-										| _, TDynamic _ -> false
-										| r1, r2 -> try
-											unify r1 r2;
-											true
-										with | Unify_error _ -> false
-									in
-									(* we only have to worry about non-covariant issues *)
-									if not is_covariant then begin
-										(* override return type and cast implemented function *)
-										let args, newr = match follow t2, follow (apply_params f.cf_params (List.map snd f2.cf_params) real_ftype) with
-											| TFun(a,_), TFun(_,r) -> a,r
-											| _ -> assert false
-										in
-										f2.cf_type <- TFun(args,newr);
-										(match f2.cf_expr with
-										| Some ({ eexpr = TFunction tf } as e) ->
-												f2.cf_expr <- Some { e with eexpr = TFunction { tf with tf_type = newr } }
-										| _ -> ())
-									end
-								| TFun(a1,r1), TFun(a2,r2) ->
-									(* just implement a function that will call the main one *)
-									let name, is_explicit = match explicit_fn_name with
-										| Some fn when not (type_iseq r1 r2) && Overloads.same_overload_args ~get_vmtype real_ftype t2 f f2 ->
-												fn iface itl f.cf_name, true
-										| _ -> f.cf_name, false
-									in
-									let p = f2.cf_pos in
-									let newf = mk_class_field name real_ftype true f.cf_pos (Method MethNormal) f.cf_params in
-									let vars = List.map (fun (n,_,t) -> alloc_var n t) a2 in
-
-									let args = List.map2 (fun v (_,_,t) -> mk_cast t (mk_local v f2.cf_pos)) vars a1 in
-									let field = { eexpr = TField(this, FInstance(c,List.map snd c.cl_params,f2)); etype = TFun(a1,r1); epos = p } in
-									let call = { eexpr = TCall(field, args); etype = r1; epos = p } in
-									(* let call = gen.gparam_func_call call field (List.map snd f.cf_params) args in *)
-									let is_void = ExtType.is_void r2 in
-
-									newf.cf_expr <- Some {
-										eexpr = TFunction({
-											tf_args = List.map (fun v -> v,None) vars;
-											tf_type = r2;
-											tf_expr = (if is_void then call else {
-												eexpr = TReturn (Some (mk_cast r2 call));
-												etype = r2;
-												epos = p
-											})
-										});
-										etype = real_ftype;
-										epos = p;
-									};
-									(try
-										let fm = PMap.find name c.cl_fields in
-										fm.cf_overloads <- newf :: fm.cf_overloads
-									with | Not_found ->
-										c.cl_fields <- PMap.add name newf c.cl_fields;
-										c.cl_ordered_fields <- newf :: c.cl_ordered_fields)
-								| _ -> assert false
-							end
-						with | Not_found -> ()
-					in
-					List.iter (fun f -> match f.cf_kind with | Var _ -> () | _ -> loop_f f) iface.cl_ordered_fields
-				in
-				List.iter (fun (iface,itl) -> loop_iface iface itl) c.cl_implements;
-				(* now go through all overrides, *)
-				let rec check_f f =
-					(* find the first declared field *)
-					let is_overload = Meta.has Meta.Overload f.cf_meta in
-					let decl = if is_overload then
-						find_first_declared_field gen c ~get_vmtype ~exact_field:f f.cf_name
-					else
-						find_first_declared_field gen c ~get_vmtype f.cf_name
-					in
-					match decl with
-					| Some(f2,actual_t,_,t,declared_cl,_,_)
-						when not (Overloads.same_overload_args ~get_vmtype actual_t (get_real_fun gen f.cf_type) f2 f) ->
-							(match f.cf_expr with
-							| Some({ eexpr = TFunction(tf) } as e) ->
-								let actual_args, _ = get_fun (get_real_fun gen actual_t) in
-								let new_args, vardecl = List.fold_left2 (fun (args,vdecl) (v,_) (_,_,t) ->
-									if not (type_iseq (gen.greal_type v.v_type) (gen.greal_type t)) then begin
-										let new_var = mk_temp gen v.v_name t in
-										(new_var,None) :: args, (v, Some(mk_cast v.v_type (mk_local new_var f.cf_pos))) :: vdecl
-									end else
-										(v,None) :: args, vdecl
-								) ([],[]) tf.tf_args actual_args in
-								let block = { eexpr = TBlock(List.map (fun (v,ve) ->
-									{
-										eexpr = TVar(v,ve);
-										etype = gen.gcon.basic.tvoid;
-										epos = tf.tf_expr.epos
-									}) vardecl);
-									etype = gen.gcon.basic.tvoid;
-									epos = tf.tf_expr.epos
-								} in
-								if Meta.has Meta.Overload f.cf_meta then begin
-									(* if it is overload, create another field with the requested type *)
-									let f3 = mk_class_field f.cf_name t f.cf_public f.cf_pos f.cf_kind f.cf_params in
-									let p = f.cf_pos in
-									let old_args, old_ret = get_fun f.cf_type in
-									let args, ret = get_fun t in
-									let tf_args = List.map (fun (n,o,t) -> alloc_var n t, None) args in
-									let f3_mk_return = if ExtType.is_void ret then (fun e -> e) else (fun e -> mk_return (mk_cast ret e)) in
-									f3.cf_expr <- Some {
-										eexpr = TFunction({
-											tf_args = List.rev new_args;
-											tf_type = ret;
-											tf_expr = Type.concat block (mk_block (f3_mk_return {
-												eexpr = TCall(
-													{
-														eexpr = TField(
-															{ eexpr = TConst TThis; etype = TInst(c, List.map snd c.cl_params); epos = p },
-															FInstance(c,List.map snd c.cl_params,f));
-														etype = f.cf_type;
-														epos = p
-													},
-													List.map2 (fun (v,_) (_,_,t) -> mk_cast t (mk_local v p)) tf_args old_args);
-												etype = old_ret;
-												epos = p
-											}))
-										});
-										etype = t;
-										epos = p;
-									};
-									(* make sure we skip cast detect - otherwise this new function will make the overload detection go crazy *)
-									f3.cf_meta <- (Meta.Custom(":skipCastDetect"), [], f3.cf_pos) :: f3.cf_meta;
-									gen.gafter_expr_filters_ended <- ((fun () ->
-										f.cf_overloads <- f3 :: f.cf_overloads;
-									) :: gen.gafter_expr_filters_ended);
-									f3
-								end else begin
-									(* if it's not overload, just cast the vars *)
-									if vardecl <> [] then
-									f.cf_expr <- Some({ e with
-										eexpr = TFunction({ tf with
-											tf_args = List.rev new_args;
-											tf_expr = Type.concat block tf.tf_expr
-										});
-									});
-									f
-								end
-							| _ -> f)
-					| _ -> f
-				in
-				if not c.cl_extern then
-					c.cl_overrides <- List.map (fun f -> check_f f) c.cl_overrides;
-				md
-			| _ -> md
-		in
-		run
-
-	let configure ?explicit_fn_name ~get_vmtype gen =
-		let delay () =
-			Hashtbl.clear gen.greal_field_types
-		in
-		gen.gafter_mod_filters_ended <- delay :: gen.gafter_mod_filters_ended;
-		let run = run ~explicit_fn_name ~get_vmtype gen in
-		let map md = Some(run md) in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
-
-
-(* ******************************************* *)
-(* Normalize *)
-(* ******************************************* *)
-(*
-	- Filters out enum constructor type parameters from the AST; See Issue #1796
-	- Filters out monomorphs
-	- Filters out all non-whitelisted AST metadata
-
-	dependencies:
-		No dependencies; but it still should be one of the first filters to run,
-		as it will help normalize the AST
-*)
-module Normalize =
-struct
-	let name = "normalize_type"
-	let priority = max_dep
-
-	let rec filter_param t =
-		match t with
-		| TInst({ cl_kind = KTypeParameter _ } as c,_) when Meta.has Meta.EnumConstructorParam c.cl_meta ->
-			t_dynamic
-		| TMono r ->
-			(match !r with
-			| None -> t_dynamic
-			| Some t -> filter_param t)
-		| TInst(_,[]) | TEnum(_,[]) | TType(_,[]) | TAbstract(_,[]) ->
-			t
-		| TType(t,tl) ->
-			TType(t,List.map filter_param tl)
-		| TInst(c,tl) ->
-			TInst(c,List.map filter_param tl)
-		| TEnum(e,tl) ->
-			TEnum(e,List.map filter_param tl)
-		| TAbstract({ a_path = (["haxe";"extern"],"Rest") } as a,tl) ->
-			TAbstract(a, List.map filter_param tl)
-		| TAbstract(a,tl) when not (Meta.has Meta.CoreType a.a_meta) ->
-			filter_param (Abstract.get_underlying_type a tl)
-		| TAbstract(a,tl) ->
-			TAbstract(a, List.map filter_param tl)
-		| TAnon a ->
-			TAnon {
-				a_fields = PMap.map (fun f -> { f with cf_type = filter_param f.cf_type }) a.a_fields;
-				a_status = a.a_status;
-			}
-		| TFun(args,ret) ->
-			TFun(List.map (fun (n,o,t) -> (n,o,filter_param t)) args, filter_param ret)
-		| TDynamic _ ->
-			t
-		| TLazy f ->
-			filter_param (!f())
-
-	let configure gen ~metas =
-		let rec run e =
-			match e.eexpr with
-			| TMeta (entry, e) when not (Hashtbl.mem metas entry) ->
-				run e
-			| _ ->
-				map_expr_type (fun e -> run e) filter_param (fun v -> v.v_type <- filter_param v.v_type; v) e
-		in
-		let map e = Some (run e) in
-		gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map;
-
-		let run md =
-			match md with
-			| TClassDecl cl ->
-				let rec map cf =
-					cf.cf_type <- filter_param cf.cf_type;
-					List.iter map cf.cf_overloads
-				in
-				List.iter map cl.cl_ordered_fields;
-				List.iter map cl.cl_ordered_statics;
-				Option.may map cl.cl_constructor
-			| _ ->
-				()
-		in
-		let map md = Some (run md; md) in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
-
-end;;
-
-
-(* ******************************************* *)
-(* InterfaceMetas *)
-(* ******************************************* *)
-(*
-	Deal with metadata on interfaces by taking it off from interface, and adding a new class with `_HxMeta` suffix
-
-	dependencies:
-		Must run before InitFunction
-*)
-module InterfaceMetas =
-struct
-	let name = "interface_metas"
-	let priority = solve_deps name [ DBefore InitFunction.priority ]
-
-	let configure gen =
-		let run md =
-			match md with
-			| TClassDecl ({ cl_interface = true; cl_ordered_statics = (_ :: _) } as cl) ->
-				cl.cl_ordered_statics <- [];
-				let path = fst cl.cl_path,snd cl.cl_path ^ "_HxMeta" in
-				(match Codegen.build_metadata gen.gcon (TClassDecl cl) with
-				| Some expr ->
-					let ncls = mk_class cl.cl_module path cl.cl_pos in
-					let cf = mk_class_field "__meta__" expr.etype false expr.epos (Var { v_read = AccNormal; v_write = AccNormal }) [] in
-					cf.cf_expr <- Some expr;
-					ncls.cl_statics <- PMap.add "__meta__" cf ncls.cl_statics;
-					ncls.cl_ordered_statics <- cf :: ncls.cl_ordered_statics;
-					gen.gadd_to_module (TClassDecl(ncls)) priority;
-				| _ -> ())
-			| _ -> ()
-		in
-		let map md = run md; Some(md) in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
-end;;
diff --git a/src/generators/gencpp.ml b/src/generators/gencpp.ml
index 35cba0cd828724e646f860db5e40b24c7f02f698..b6fa1aee87cfc6b5fe04dde6fa91cf430f5643ae 100644
--- a/src/generators/gencpp.ml
+++ b/src/generators/gencpp.ml
@@ -1,6 +1,6 @@
 (*
    The Haxe Compiler
-   Copyright (C) 2005-2017  Haxe Foundation
+   Copyright (C) 2005-2019  Haxe Foundation
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -68,7 +68,7 @@ let is_internal_class = function
    |  (["cpp"],"Int16") | (["cpp"],"UInt16")
    |  (["cpp"],"Int32") | (["cpp"],"UInt32")
    |  (["cpp"],"Int64") | (["cpp"],"UInt64")
-   |  (["cpp"],"Float32") | (["cpp"],"Float64") -> true
+   |  (["cpp"],"Float32") | (["cpp"],"Float64") | ([],"Single") -> true
    | _ -> false;;
 
 let get_include_prefix common_ctx with_slash =
@@ -176,7 +176,7 @@ let cached_source_writer common_ctx filename =
    new source_writer common_ctx (add_header) (add_buf) (close)
 ;;
 
-let make_class_directories = Common.mkdir_recursive;;
+let make_class_directories = Path.mkdir_recursive;;
 
 let make_base_directory dir =
    make_class_directories "" ( ( Str.split_delim (Str.regexp "[\\/]+") dir ) );;
@@ -387,7 +387,7 @@ let keyword_remap name =
    | "_Complex" | "INFINITY" | "NAN"
    | "INT_MIN" | "INT_MAX" | "INT8_MIN" | "INT8_MAX" | "UINT8_MAX" | "INT16_MIN"
    | "INT16_MAX" | "UINT16_MAX" | "INT32_MIN" | "INT32_MAX" | "UINT32_MAX"
-   | "asm" | "near" | "far"
+   | "asm" | "near" | "far" | "_w64"
    | "HX_" | "HXLINE" | "HXDLIN"
    | "NO" | "YES"
    | "abstract" | "decltype" | "finally" | "nullptr" | "static_assert"
@@ -419,7 +419,7 @@ let join_class_path_remap path separator =
 let get_meta_string meta key =
    let rec loop = function
       | [] -> ""
-      | (k,[Ast.EConst (Ast.String name),_],_) :: _  when k=key-> name
+      | (k,[Ast.EConst (Ast.String(name,_)),_],_) :: _  when k=key-> name
       | _ :: l -> loop l
       in
    loop meta
@@ -430,7 +430,7 @@ let get_meta_string meta key =
 let get_meta_string_path meta key =
    let rec loop = function
       | [] -> ""
-      | (k,[Ast.EConst (Ast.String name),_], pos) :: _  when k=key->
+      | (k,[Ast.EConst (Ast.String(name,_)),_], pos) :: _  when k=key->
            (try
            if (String.sub name 0 2) = "./" then begin
               let base = if (Filename.is_relative pos.pfile) then
@@ -587,7 +587,7 @@ let is_numeric = function
    | "::cpp::UInt32" | "::cpp::Int32"
    | "::cpp::UInt64" | "::cpp::Int64"
    | "::cpp::Float32" | "::cpp::Float64"
-   | "int" | "bool" | "double" | "float" -> true
+   | "int" | "bool" | "double" | "float" | "Single" -> true
    | _ -> false
 
 
@@ -634,7 +634,7 @@ let rec is_objc_type t =
    | TType(td,_) -> (Meta.has Meta.Objc td.t_meta)
    | TAbstract (a,_) -> (Meta.has Meta.Objc a.a_meta)
    | TMono r -> (match !r with | Some t -> is_objc_type t | _ -> false)
-   | TLazy f -> is_objc_type (!f())
+   | TLazy f -> is_objc_type (lazy_type f)
    | _ -> false
 ;;
 
@@ -760,20 +760,17 @@ and type_string_suff suffix haxe_type remap =
    | TAbstract ({ a_path = ([],"Int") },[]) -> "int"
    | TAbstract ({ a_path = (["cpp"],"UInt8") },[]) -> "unsigned char"
    | TAbstract( { a_path = ([], "EnumValue") }, _  ) -> "Dynamic"
+   | TAbstract ({ a_path = ([],"Null") }, [t]) ->
+		(match follow t with
+		| TAbstract ({ a_path = [],"Int" },_)
+		| TAbstract ({ a_path = [],"Float" },_)
+		| TAbstract ({ a_path = [],"Bool" },_) -> "Dynamic" ^ suffix
+		| t when type_has_meta_key t Meta.NotNull -> "Dynamic" ^ suffix
+		| _ -> type_string_suff suffix t remap)
    | TEnum (enum,params) ->  "::" ^ (join_class_path_remap enum.e_path "::") ^ suffix
    | TInst (klass,params) ->  (class_string klass suffix params remap)
    | TType (type_def,params) ->
       (match type_def.t_path with
-      | [] , "Null" ->
-         (match params with
-         | [t] ->
-            (match follow t with
-            | TAbstract ({ a_path = [],"Int" },_)
-            | TAbstract ({ a_path = [],"Float" },_)
-            | TAbstract ({ a_path = [],"Bool" },_) -> "Dynamic" ^ suffix
-            | t when type_has_meta_key t Meta.NotNull -> "Dynamic" ^ suffix
-            | _ -> type_string_suff suffix t remap)
-         | _ -> assert false);
       | [] , "Array" ->
          (match params with
          | [t] when (type_string (follow t) ) = "Dynamic" -> "Dynamic"
@@ -809,7 +806,7 @@ and type_string_suff suffix haxe_type remap =
       | _ -> "Dynamic"  ^ suffix )
       *)
    | TDynamic haxe_type -> "Dynamic" ^ suffix
-   | TLazy func -> type_string_suff suffix ((!func)()) remap
+   | TLazy func -> type_string_suff suffix (lazy_type func) remap
    | TAbstract (abs,pl) when abs.a_impl <> None ->
       type_string_suff suffix (Abstract.get_underlying_type abs pl) remap
    | TAbstract (abs,pl) ->
@@ -952,7 +949,7 @@ let member_type ctx field_object member =
 *)
 let is_interface obj = is_interface_type obj.etype;;
 
-let should_implement_field x = not (is_extern_field x);;
+let should_implement_field x = is_physical_field x;;
 
 let is_extern_class class_def =
    class_def.cl_extern || (has_meta_key class_def.cl_meta Meta.Extern) ||
@@ -988,18 +985,6 @@ let rec is_dynamic_accessor name acc field class_def =
    && (match class_def.cl_super with None -> true | Some (parent,_) -> is_dynamic_accessor name acc field parent )
 ;;
 
-
-(* Check to see if we are the first object in the parent tree to implement a dynamic interface *)
-let implement_dynamic_here class_def =
-   let implements_dynamic c = match c.cl_dynamic with None -> false | _ -> true  in
-   let rec super_implements_dynamic c = match c.cl_super with
-      | None -> false
-      | Some (csup, _) -> if (implements_dynamic csup) then true else
-            super_implements_dynamic csup;
-   in
-   ( (implements_dynamic class_def) && (not (super_implements_dynamic class_def) ) );;
-
-
 let gen_hash32 seed str =
    let h = ref (Int32.of_int seed) in
    let cycle = Int32.of_int 223 in
@@ -1017,15 +1002,6 @@ let gen_hash_small seed str =
    Printf.sprintf "%08lx" (gen_hash32 seed str)
 ;;
 
-let gen_string_hash str =
-   let h = gen_hash32 0 str in
-   Printf.sprintf "\"\\x%02lx\",\"\\x%02lx\",\"\\x%02lx\",\"\\x%02lx\""
-       (Int32.shift_right_logical (Int32.shift_left h 24) 24)
-       (Int32.shift_right_logical (Int32.shift_left h 16) 24)
-       (Int32.shift_right_logical (Int32.shift_left h 8) 24)
-       (Int32.shift_right_logical h 24)
-;;
-
 let gen_qstring_hash str =
    let h = gen_hash32 0 str in
    Printf.sprintf "%02lx,%02lx,%02lx,%02lx"
@@ -1035,32 +1011,16 @@ let gen_qstring_hash str =
        (Int32.shift_right_logical h 24)
 ;;
 
+let gen_wqstring_hash str =
+   let h = gen_hash32 0 str in
+   Printf.sprintf "%04lx,%04lx"
+       (Int32.shift_right_logical (Int32.shift_left h 16) 16)
+       (Int32.shift_right_logical h 16)
+;;
 
 
 
 
-(* Make string printable for c++ code *)
-(* Here we know there are no utf8 characters, so use the L"" notation to avoid conversion *)
-let escape_stringw s l =
-   let b = Buffer.create 0 in
-   Buffer.add_char b 'L';
-   Buffer.add_char b '"';
-   let skip = ref 0 in
-   for i = 0 to String.length s - 1 do
-      if (!skip>0) then begin
-         skip := !skip -1;
-         l := !l-1;
-      end else
-      match Char.code (String.unsafe_get s i) with
-      | c when (c>127) ->
-         let encoded =  ((c land 0x3F) lsl 6) lor ( Char.code ((String.unsafe_get s (i+1))) land 0x7F) in
-         skip := 1;
-         Buffer.add_string b (Printf.sprintf "\\x%X\"L\"" encoded)
-      | c when (c < 32) -> Buffer.add_string b (Printf.sprintf "\\x%X\"L\"" c)
-      | c -> Buffer.add_char b (Char.chr c)
-   done;
-   Buffer.add_char b '"';
-   Buffer.contents b;;
 
 let special_to_hex s =
    let l = String.length s in
@@ -1100,7 +1060,7 @@ let escape_command s =
 
 let gen_str macro gen s =
    let rec split s plus =
-      let escaped = Ast.s_escape ~hex:false s in
+      let escaped = StringHelper.s_escape ~hex:false s in
       let hexed = (special_to_hex escaped) in
       if (String.length hexed <= 16000 ) then
          plus ^ " HX_CSTRING(\"" ^ hexed ^ "\")"
@@ -1110,7 +1070,7 @@ let gen_str macro gen s =
          (split (String.sub s 0 half) plus ) ^ (split (String.sub s half (len-half)) "+" )
       end
    in
-   let escaped = Ast.s_escape ~hex:false s in
+   let escaped = StringHelper.s_escape ~hex:false s in
    let hexed = (special_to_hex escaped) in
    if (String.length hexed <= 16000 ) then
       macro ^ "(\"" ^ hexed ^ "\"," ^ (gen s) ^ ")"
@@ -1118,13 +1078,32 @@ let gen_str macro gen s =
       "(" ^ (split s "" ) ^ ")"
 ;;
 
-let str s = gen_str "HX_HCSTRING" gen_string_hash s;;
-let strq s = gen_str "HX_" gen_qstring_hash s;;
 
+let strq ctx s =
+   if (Common.defined ctx Define.HxcppSmartStings) && (has_utf8_chars s) then
+      let b = Buffer.create 0 in
+
+      let add ichar =
+         match ichar with
+            | 92 (* \ *) -> Buffer.add_string b "\\\\"
+            | 39 (* ' *) -> Buffer.add_string b "\\\'"
+            | 34 -> Buffer.add_string b "\\\""
+            | 13 (* \r *) -> Buffer.add_string b "\\r"
+            | 10 (* \n *) -> Buffer.add_string b "\\n"
+            | 9 (* \t *) -> Buffer.add_string b "\\t"
+            | c when c < 32 || (c >= 127 && c <= 0xFFFF) -> Buffer.add_string b (Printf.sprintf "\\u%04x" c)
+            | c when c > 0xFFFF -> Buffer.add_string b (Printf.sprintf "\\U%08x" c)
+            | c -> Buffer.add_char b (Char.chr c)
+      in
+      UTF8.iter (fun c -> add (UCharExt.code c) ) s;
+      "HX_W(u\"" ^ (Buffer.contents b) ^ "\"," ^ (gen_wqstring_hash s) ^ ")"
+   else
+       gen_str "HX_" gen_qstring_hash s
+;;
 
 
 let const_char_star s =
-   let escaped = Ast.s_escape ~hex:false s in
+   let escaped = StringHelper.s_escape ~hex:false s in
    "\"" ^ special_to_hex escaped ^ "\"";
 ;;
 
@@ -1191,7 +1170,7 @@ let rec is_dynamic_in_cpp ctx expr =
       | TCall(func,args) ->
          let is_IaCall =
             (match (remove_parens_cast func).eexpr with
-            | TField ( { eexpr = TLocal  { v_name = "__global__" }}, field ) -> false
+            | TField ( { eexpr = TIdent "__global__" }, field ) -> false
             | TField (obj,FStatic (class_def,field) ) when is_real_function field -> false
             | TField (obj,FInstance (_,_,field) ) when (is_this obj) && (is_real_function field) -> false
             | TField (obj,FInstance (_,_,field) ) when is_super obj -> false
@@ -1211,7 +1190,7 @@ let rec is_dynamic_in_cpp ctx expr =
          );
       | TParenthesis(expr) | TMeta(_,expr) -> is_dynamic_in_cpp ctx expr
       | TCast (e,None) -> (type_string expr.etype) = "Dynamic"
-      | TLocal { v_name = "__global__" } -> false
+      | TIdent "__global__" -> false
       | TConst TNull -> true
       | _ -> false (* others ? *) )
       in
@@ -1281,16 +1260,6 @@ let is_matching_interface_type t0 t1 =
 
 
 
-let default_value_string = function
-   | TInt i -> Printf.sprintf "%ld" i
-   | TFloat float_as_string -> "((Float)" ^ float_as_string ^ ")"
-   | TString s -> str s
-   | TBool b -> (if b then "true" else "false")
-   | TNull -> "null()"
-   | _ -> "/* Hmmm */"
-;;
-
-
 
 let get_nth_type field index =
    match follow field.ef_type with
@@ -1307,12 +1276,6 @@ let get_nth_type field index =
 
 
 
-let has_default_values args =
-   List.exists ( fun (_,o) -> match o with
-            | Some TNull -> false
-            | Some _ -> true
-            | _ -> false ) args ;;
-
 exception PathFound of string;;
 
 
@@ -1334,7 +1297,7 @@ let strip_file ctx file = (match Common.defined ctx Common.Define.AbsolutePath w
 let hx_stack_push ctx output clazz func_name pos gc_stack =
    if ctx.ctx_debug_level > 0 then begin
       let stripped_file = strip_file ctx.ctx_common pos.pfile in
-      let esc_file = (Ast.s_escape stripped_file) in
+      let esc_file = (StringHelper.s_escape stripped_file) in
       ctx.ctx_file_info := PMap.add stripped_file pos.pfile !(ctx.ctx_file_info);
       let full_name = clazz ^ "." ^ func_name ^ (
         if (clazz="*") then
@@ -1409,7 +1372,7 @@ and tcppexpr = {
 
 and tcpp_closure = {
    close_type : tcpp;
-   close_args : (tvar * tconstant option) list;
+   close_args : (tvar * texpr option) list;
    close_expr : tcppexpr;
    close_id : int;
    close_undeclared : (string,tvar) Hashtbl.t;
@@ -1434,7 +1397,7 @@ and tcppthis =
 and tcppvarloc =
    | VarLocal of tvar
    | VarClosure of tvar
-   | VarThis of tclass_field
+   | VarThis of tclass_field * tcpp
    | VarInstance of tcppexpr * tclass_field * string * string
    | VarInterface of tcppexpr * tclass_field
    | VarStatic of tclass * bool * tclass_field
@@ -1446,22 +1409,22 @@ and tcppinst =
    | InstStruct
 
 and tcppfuncloc =
-   | FuncThis of tclass_field
+   | FuncThis of tclass_field * tcpp
    | FuncInstance of tcppexpr * tcppinst * tclass_field
    | FuncStatic of tclass * bool * tclass_field
    | FuncTemplate of tclass * tclass_field * path * bool
    | FuncInterface of tcppexpr * tclass * tclass_field
    | FuncEnumConstruct of tenum * tenum_field
-   | FuncSuperConstruct
-   | FuncSuper of tcppthis * tclass_field
+   | FuncSuperConstruct of tcpp
+   | FuncSuper of tcppthis * tcpp * tclass_field
    | FuncNew of tcpp
    | FuncExpression of tcppexpr
    | FuncInternal of tcppexpr * string * string
-   | FuncGlobal of string
+   | FuncExtern of string * bool
    | FuncFromStaticFunction
 
 and tcpparrayloc =
-   | ArrayTyped of tcppexpr * tcppexpr
+   | ArrayTyped of tcppexpr * tcppexpr * tcpp
    | ArrayPointer of tcppexpr * tcppexpr
    | ArrayRawPointer of tcppexpr * tcppexpr
    | ArrayObject of tcppexpr * tcppexpr * tcpp
@@ -1473,7 +1436,7 @@ and tcpplvalue =
    | CppVarRef of tcppvarloc
    | CppArrayRef of tcpparrayloc
    | CppDynamicRef of tcppexpr * string
-   | CppGlobalRef of string
+   | CppExternRef of string * bool
 
 
 and tcpp_expr_expr =
@@ -1489,7 +1452,7 @@ and tcpp_expr_expr =
    | CppCode of string * tcppexpr list
    | CppClosure of tcpp_closure
    | CppVar of tcppvarloc
-   | CppGlobal of string
+   | CppExtern of string * bool
    | CppDynamicField of tcppexpr * string
    | CppFunction of tcppfuncloc * tcpp
    | CppEnumIndex of tcppexpr
@@ -1503,7 +1466,7 @@ and tcpp_expr_expr =
    | CppSet of tcpplvalue * tcppexpr
    | CppModify of Ast.binop * tcpplvalue * tcppexpr
    | CppBinop of Ast.binop * tcppexpr * tcppexpr
-   | CppCompare of string * tcppexpr * tcppexpr
+   | CppCompare of string * tcppexpr * tcppexpr * Ast.binop
    | CppNullCompare of string * tcppexpr
    | CppObjectDecl of (string * tcppexpr) list * bool
    | CppPosition of string * int32 * string * string
@@ -1554,7 +1517,7 @@ let rec s_tcpp = function
    | CppVar VarStatic(_) -> "CppVarStatic"
    | CppVar VarInternal(_) -> "CppVarInternal"
    | CppDynamicField _ -> "CppDynamicField"
-   | CppGlobal _ -> "CppGlobal"
+   | CppExtern _ -> "CppExtern"
    | CppFunction _ -> "CppFunction"
    | CppEnumIndex _ -> "CppEnumIndex"
    | CppEnumField  _ -> "CppEnumField"
@@ -1568,12 +1531,12 @@ let rec s_tcpp = function
    | CppCall (FuncStatic  (_,objC,_),_) -> if objC then "CppCallStaticObjC" else "CppCallStatic"
    | CppCall (FuncTemplate  _,_) -> "CppCallTemplate"
    | CppCall (FuncEnumConstruct _,_) -> "CppCallEnumConstruct"
-   | CppCall (FuncSuperConstruct,_) -> "CppCallSuperConstruct"
+   | CppCall (FuncSuperConstruct _,_) -> "CppCallSuperConstruct"
    | CppCall (FuncSuper _,_) -> "CppCallSuper"
    | CppCall (FuncNew _,_) -> "CppCallNew"
    | CppCall (FuncExpression _,_) -> "CppCallExpression"
    | CppCall (FuncInternal _,_) -> "CppCallInternal"
-   | CppCall (FuncGlobal _,_) -> "CppCallGlobal"
+   | CppCall (FuncExtern _,_) -> "CppCallExtern"
    | CppCall (FuncFromStaticFunction,_) -> "CppCallFromStaticFunction"
    | CppAddressOf _  -> "CppAddressOf"
    | CppDereference _  -> "CppDereference"
@@ -1665,7 +1628,7 @@ and tcpp_to_string_suffix suffix tcpp = match tcpp with
         (cpp_class_path_of klass) ^ suffix
    | TCppInterface _ -> "::Dynamic"
    | TCppClass -> "hx::Class" ^ suffix;
-   | TCppGlobal -> "";
+   | TCppGlobal -> "::Dynamic";
    | TCppNull -> " ::Dynamic";
    | TCppCode _ -> "Code"
 
@@ -1765,43 +1728,48 @@ let cpp_is_dynamic_type = function
 ;;
 
 
-let rec cpp_type_of ctx haxe_type =
-   (match haxe_type with
-   | TMono r -> (match !r with None -> TCppDynamic | Some t -> cpp_type_of ctx t)
+let rec cpp_type_of stack ctx haxe_type =
+   if List.exists (fast_eq haxe_type) stack then
+      TCppDynamic
+   else begin
+      let stack = haxe_type :: stack in
+      (match haxe_type with
+      | TMono r -> (match !r with None -> TCppDynamic | Some t -> cpp_type_of stack ctx t)
 
-   | TEnum (enum,params) ->  TCppEnum(enum)
+      | TEnum (enum,params) ->  TCppEnum(enum)
 
-   | TInst ({ cl_path=([],"Array"); cl_kind = KTypeParameter _},_)
-      -> TCppObject
+      | TInst ({ cl_path=([],"Array"); cl_kind = KTypeParameter _},_)
+         -> TCppObject
 
-   | TInst ({ cl_kind = KTypeParameter _},_)
-      -> TCppDynamic
+      | TInst ({ cl_kind = KTypeParameter _},_)
+         -> TCppDynamic
 
-   | TInst (klass,params) ->
-      cpp_instance_type ctx klass params
+      | TInst (klass,params) ->
+         cpp_instance_type stack ctx klass params
 
-   | TAbstract (abs,pl) when not (Meta.has Meta.CoreType abs.a_meta) ->
-       cpp_type_from_path ctx abs.a_path pl (fun () ->
-            cpp_type_of ctx (Abstract.get_underlying_type abs pl) )
+      | TAbstract (abs,pl) when not (Meta.has Meta.CoreType abs.a_meta) ->
+         cpp_type_from_path stack ctx abs.a_path pl (fun () ->
+               cpp_type_of stack ctx (Abstract.get_underlying_type abs pl) )
 
-   | TAbstract (a,params) ->
-       cpp_type_from_path ctx a.a_path params (fun () ->
-            if is_scalar_abstract a then begin
-               let native =  get_meta_string a.a_meta Meta.Native in
-               TCppScalar(if native="" then join_class_path a.a_path "::" else native)
-            end else
-               TCppDynamic)
+      | TAbstract (a,params) ->
+         cpp_type_from_path stack ctx a.a_path params (fun () ->
+               if is_scalar_abstract a then begin
+                  let native =  get_meta_string a.a_meta Meta.Native in
+                  TCppScalar(if native="" then join_class_path a.a_path "::" else native)
+               end else
+                  TCppDynamic)
 
-   | TType (type_def,params) ->
-       cpp_type_from_path ctx type_def.t_path params (fun () ->
-          cpp_type_of ctx (apply_params type_def.t_params params type_def.t_type) )
+      | TType (type_def,params) ->
+         cpp_type_from_path stack ctx type_def.t_path params (fun () ->
+            cpp_type_of stack ctx (apply_params type_def.t_params params type_def.t_type) )
 
-   | TFun _ -> TCppObject
-   | TAnon _ -> TCppObject
-   | TDynamic _ -> TCppDynamic
-   | TLazy func -> cpp_type_of ctx ((!func)())
-   )
-   and  cpp_type_from_path ctx path params default =
+      | TFun _ -> TCppObject
+      | TAnon _ -> TCppObject
+      | TDynamic _ -> TCppDynamic
+      | TLazy func -> cpp_type_of stack ctx (lazy_type func)
+      )
+   end
+   and  cpp_type_from_path stack ctx path params default =
       match path,params with
       | ([],"Void"),_ -> TCppVoid
       | ([],"void"),_ -> TCppVoid (* for old code with @:void *)
@@ -1811,6 +1779,7 @@ let rec cpp_type_of ctx haxe_type =
       | ([], "EnumValue"),_ -> TCppObject
       | ([], "Class"),_ -> TCppClass
       | ([], "Enum"),_  -> TCppClass
+      | ([], "Single"),_ -> TCppScalar("float")
       | (["cpp"], "Char"),_ -> TCppScalar("char")
       | (["cpp"], "Object"),_ -> TCppObjectPtr
       | (["cpp"], "Float32"),_ -> TCppScalar("float")
@@ -1831,25 +1800,25 @@ let rec cpp_type_of ctx haxe_type =
 
       (* Things with type parameters hxcpp knows about ... *)
       | (["cpp"],"FastIterator"), [p] ->
-            TCppFastIterator(cpp_type_of ctx p)
+            TCppFastIterator(cpp_type_of stack ctx p)
       | (["cpp"],"Pointer"), [p] ->
-            TCppPointer("Pointer", cpp_type_of ctx p)
+            TCppPointer("Pointer", cpp_type_of stack ctx p)
       | (["cpp"],"ConstPointer"), [p] ->
-            TCppPointer("ConstPointer", cpp_type_of ctx p)
+            TCppPointer("ConstPointer", cpp_type_of stack ctx p)
       | (["cpp"],"RawPointer"), [p] ->
-            TCppRawPointer("", cpp_type_of ctx p)
+            TCppRawPointer("", cpp_type_of stack ctx p)
       | (["cpp"],"RawConstPointer"), [p] ->
-            TCppRawPointer("const ", cpp_type_of ctx p)
+            TCppRawPointer("const ", cpp_type_of stack ctx p)
       | (["cpp"],"Function"), [function_type; abi] ->
-            cpp_function_type_of ctx function_type abi;
+            cpp_function_type_of stack ctx function_type abi;
       | (["cpp"],"Callable"), [function_type]
       | (["cpp"],"CallableData"), [function_type] ->
-            cpp_function_type_of_string ctx function_type "";
+            cpp_function_type_of_string stack ctx function_type "";
       | (("cpp"::["objc"]),"ObjcBlock"), [function_type] ->
-            let args,ret = (cpp_function_type_of_args_ret ctx function_type) in
+            let args,ret = (cpp_function_type_of_args_ret stack ctx function_type) in
             TCppObjCBlock(args,ret)
       | (["haxe";"extern"], "Rest"),[rest] ->
-            TCppRest(cpp_type_of ctx rest)
+            TCppRest(cpp_type_of stack ctx rest)
       | (("cpp"::["objc"]),"Protocol"), [interface_type] ->
             (match follow interface_type with
             | TInst (klass,[]) when klass.cl_interface ->
@@ -1859,16 +1828,16 @@ let rec cpp_type_of ctx haxe_type =
                    assert false;
             )
       | (["cpp"],"Reference"), [param] ->
-            TCppReference(cpp_type_of ctx param)
+            TCppReference(cpp_type_of stack ctx param)
       | (["cpp"],"Struct"), [param] ->
-            TCppStruct(cpp_type_of ctx param)
+            TCppStruct(cpp_type_of stack ctx param)
       | (["cpp"],"Star"), [param] ->
-            TCppStar(cpp_type_of ctx param,false)
+            TCppStar(cpp_type_of_pointer stack ctx param,false)
       | (["cpp"],"ConstStar"), [param] ->
-            TCppStar(cpp_type_of ctx param,true)
+            TCppStar(cpp_type_of_pointer stack ctx param,true)
 
       | ([],"Array"), [p] ->
-         let arrayOf = cpp_type_of ctx p in
+         let arrayOf = cpp_type_of stack ctx p in
          (match arrayOf with
             | TCppVoid (* ? *)
             | TCppDynamic ->
@@ -1893,52 +1862,55 @@ let rec cpp_type_of ctx haxe_type =
          )
 
       | ([],"Null"), [p] ->
-            cpp_type_of_null ctx p
+            cpp_type_of_null stack ctx p
 
       | _ -> default ()
 
-   and cpp_type_of_null ctx p =
-     let baseType = cpp_type_of ctx p in
+   and cpp_type_of_null stack ctx p =
+     let baseType = cpp_type_of stack ctx p in
      if (type_has_meta_key p Meta.NotNull) || (is_cpp_scalar baseType) then
         TCppObject
      else
         baseType
-
+   and cpp_type_of_pointer stack ctx p =
+     match p with
+     | TAbstract ({ a_path = ([],"Null") },[t]) -> cpp_type_of stack ctx t
+     | x ->  cpp_type_of stack ctx x
    (* Optional types are Dynamic if they norally could not be null *)
-   and cpp_fun_arg_type_of ctx tvar opt =
+   and cpp_fun_arg_type_of stack ctx tvar opt =
       match opt with
-      | Some _ -> cpp_type_of_null ctx tvar.t_type
-      | _ -> cpp_type_of ctx tvar.t_type
+      | Some _ -> cpp_type_of_null stack ctx tvar.t_type
+      | _ -> cpp_type_of stack ctx tvar.t_type
 
-   and cpp_tfun_arg_type_of ctx opt t =
-      if opt then cpp_type_of_null ctx t else cpp_type_of ctx t
+   and cpp_tfun_arg_type_of stack ctx opt t =
+      if opt then cpp_type_of_null stack ctx t else cpp_type_of stack ctx t
 
-   and cpp_function_type_of ctx function_type abi =
+   and cpp_function_type_of stack ctx function_type abi =
       let abi = (match follow abi with
                  | TInst (klass1,_) -> get_meta_string klass1.cl_meta Meta.Abi
                  | _ -> assert false )
       in
-      cpp_function_type_of_string ctx function_type abi
-   and cpp_function_type_of_string ctx function_type abi_string =
-      let args,ret = cpp_function_type_of_args_ret ctx function_type in
+      cpp_function_type_of_string stack ctx function_type abi
+   and cpp_function_type_of_string stack ctx function_type abi_string =
+      let args,ret = cpp_function_type_of_args_ret stack ctx function_type in
       TCppFunction(args, ret, abi_string)
 
-   and cpp_function_type_of_args_ret ctx function_type =
+   and cpp_function_type_of_args_ret stack ctx function_type =
       match follow function_type with
       | TFun(args,ret) ->
           (* Optional types are Dynamic if they norally could not be null *)
           let  cpp_arg_type_of = fun(_,optional,haxe_type) ->
              if optional then
-                cpp_type_of_null ctx haxe_type
+                cpp_type_of_null stack ctx haxe_type
              else
-                cpp_type_of ctx haxe_type
+                cpp_type_of stack ctx haxe_type
           in
-          List.map cpp_arg_type_of args, cpp_type_of ctx ret
+          List.map cpp_arg_type_of args, cpp_type_of stack ctx ret
       | _ ->  (* ? *)
           [TCppVoid], TCppVoid
 
-   and cpp_instance_type ctx klass params =
-      cpp_type_from_path ctx klass.cl_path params (fun () ->
+   and cpp_instance_type stack ctx klass params =
+      cpp_type_from_path stack ctx klass.cl_path params (fun () ->
          if is_objc_class klass then
             TCppObjC(klass)
          else if klass.cl_interface && is_native_gen_class klass then
@@ -1950,6 +1922,17 @@ let rec cpp_type_of ctx haxe_type =
          else
             TCppInst(klass)
        )
+
+let cpp_type_of ctx = cpp_type_of [] ctx
+and cpp_type_from_path ctx = cpp_type_from_path [] ctx
+and cpp_type_of_null ctx = cpp_type_of_null [] ctx
+and cpp_type_of_pointer ctx = cpp_type_of_pointer [] ctx
+and cpp_fun_arg_type_of ctx = cpp_fun_arg_type_of [] ctx
+and cpp_tfun_arg_type_of ctx = cpp_tfun_arg_type_of [] ctx
+and cpp_function_type_of ctx = cpp_function_type_of [] ctx
+and cpp_function_type_of_string ctx = cpp_function_type_of_string [] ctx
+and cpp_function_type_of_args_ret ctx = cpp_function_type_of_args_ret [] ctx
+and cpp_instance_type ctx = cpp_instance_type [] ctx
 ;;
 
 
@@ -2109,7 +2092,7 @@ let ctx_arg_type_name ctx name default_val arg_type prefix =
    let remap_name = keyword_remap name in
    let type_str = (ctx_type_string ctx arg_type) in
    match default_val with
-   | Some TNull  -> (type_str,remap_name)
+   | Some {eexpr = TConst TNull}  -> (type_str,remap_name)
    | Some constant when (ctx_cant_be_null ctx arg_type) -> ("hx::Null< " ^ type_str ^ " > ",prefix ^ remap_name)
    | Some constant  -> (type_str,prefix ^ remap_name)
    | _ -> (type_str,remap_name);;
@@ -2186,7 +2169,7 @@ let cpp_var_name_of var =
 
 let cpp_var_debug_name_of v =
    let rec loop meta = match meta with
-      | (Meta.RealPath,[EConst (String s),_],_) :: _ -> s
+      | (Meta.RealPath,[EConst (String(s,_)),_],_) :: _ -> s
       | _ :: meta -> loop meta
       | [] -> v.v_name
    in
@@ -2195,7 +2178,7 @@ let cpp_var_debug_name_of v =
 
 
 let cpp_no_debug_synbol ctx var =
-   (ctx.ctx_debug_level<=1) || (has_meta_key var.v_meta Meta.CompilerGenerated) ||
+   (ctx.ctx_debug_level<=1) || (match var.v_kind with VUser _ -> false | _ -> true) ||
       match cpp_type_of ctx var.v_type with
       | TCppStar _ | TCppReference _ -> true
       | TCppInst (class_def) when (has_meta_key class_def.cl_meta Meta.StructAccess) -> true
@@ -2236,6 +2219,35 @@ let is_array_splice_call obj member =
    | _,_ -> false
 ;;
 
+let is_map_get_call obj member =
+   member.cf_name="get" &&
+   (match obj.cpptype  with
+   | TCppInst({cl_path=(["haxe";"ds"],"IntMap")}) -> true
+   | TCppInst({cl_path=(["haxe";"ds"],"StringMap")}) -> true
+   | TCppInst({cl_path=(["haxe";"ds"],"ObjectMap")}) -> true
+   | _ -> false
+   )
+;;
+
+let is_map_set_call obj member =
+   member.cf_name="set" &&
+   (match obj.cpptype  with
+   | TCppInst({cl_path=(["haxe";"ds"],"IntMap")}) -> true
+   | TCppInst({cl_path=(["haxe";"ds"],"StringMap")}) -> true
+   | TCppInst({cl_path=(["haxe";"ds"],"ObjectMap")}) -> true
+   | _ -> false
+   )
+;;
+
+
+
+let is_array_concat_call obj member =
+   match obj.cpptype, member.cf_name with
+   | TCppScalarArray _, "concat"
+   | TCppObjectArray _, "concat" -> true
+   | _,_ -> false
+;;
+
 let cpp_can_static_cast funcType inferredType =
    match funcType with
    | TCppReference(_) | TCppStar(_) | TCppStruct(_) -> false
@@ -2295,9 +2307,11 @@ let cpp_enum_name_of field =
       keyword_remap field.ef_name
 ;;
 
-let is_gc_element ctx member_type =
-  Common.defined ctx.ctx_common Define.HxcppGcGenerational &&
+let is_object_element ctx member_type =
   match member_type with
+   | TCppInst x
+   | TCppInterface x
+       -> not (is_extern_class x)
    | TCppDynamic
    | TCppObject
    | TCppObjectPtr
@@ -2308,15 +2322,15 @@ let is_gc_element ctx member_type =
    | TCppObjectArray _
    | TCppWrapped _
    | TCppScalarArray _
-   | TCppInst _
-   | TCppInterface _ 
    | TCppClass
        -> true
    | _ -> false
-
 ;;
 
-
+let is_gc_element ctx member_type =
+  Common.defined ctx.ctx_common Define.HxcppGcGenerational &&
+  (is_object_element ctx member_type)
+;;
 
 let retype_expression ctx request_type function_args function_type expression_tree forInjection =
    let rev_closures = ref [] in
@@ -2330,6 +2344,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
    let file_id = ctx.ctx_file_id in
    let function_return_type = ref (cpp_type_of ctx function_type) in
    let loop_stack = ref [] in
+   let forCppia = Common.defined ctx.ctx_common Define.Cppia in
    let alloc_file_id () =
       incr file_id;
       !file_id
@@ -2353,12 +2368,18 @@ let retype_expression ctx request_type function_args function_type expression_tr
       match value.cppexpr with
       | CppVar( VarClosure(var) as varloc) when is_gc_element ctx (cpp_type_of ctx var.v_type) ->
            CppVarRef(varloc), true
-      | CppVar( VarThis(member) as varloc) when is_gc_element ctx (cpp_type_of ctx member.cf_type) ->
+      | CppVar( VarThis(member,_) as varloc) when is_gc_element ctx (cpp_type_of ctx member.cf_type) ->
            CppVarRef(varloc), true
       | CppVar( VarInstance(obj,member,_,"->") as varloc) when is_gc_element ctx (cpp_type_of ctx member.cf_type) ->
            CppVarRef(varloc), true
       | CppVar varloc -> CppVarRef(varloc), false
-      | CppArray arrayloc -> CppArrayRef(arrayloc), false
+
+      | CppArray arrayloc ->
+         CppArrayRef(arrayloc), (match arrayloc with
+         | ArrayObject(arrayObj, index, _) when (is_gc_element ctx TCppDynamic) -> true
+         | ArrayTyped(arrayObj, index, t) when (is_gc_element ctx t) -> true
+         | _ -> false)
+
       | CppDynamicField(expr, name) -> CppDynamicRef(expr,name), false
       | CppTCast(cppExpr,_)
       | CppCast(cppExpr,_)
@@ -2367,7 +2388,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
       | CppCastObjCBlock(cppExpr,_,_)
       | CppCastScalar(cppExpr,_) -> to_lvalue cppExpr
       | CppCastVariant(cppExpr) -> to_lvalue cppExpr
-      | CppGlobal(name) -> CppGlobalRef(name), false
+      | CppExtern(name,isGlobal) -> CppExternRef(name,isGlobal), false
 
       | _ -> abort ("Could not convert expression to l-value (" ^ s_tcpp value.cppexpr ^ ")") value.cpppos
    in
@@ -2393,6 +2414,10 @@ let retype_expression ctx request_type function_args function_type expression_tr
             let retypedObj = retype TCppDynamic enumObj in
             CppEnumParameter( retypedObj, enumField, enumIndex ), cpp_cast_variant_type_of (cpp_type_of (get_nth_type enumField enumIndex))
 
+         | TEnumIndex enumObj ->
+            let retypedObj = retype TCppDynamic enumObj in
+            CppEnumIndex retypedObj, TCppScalar "int"
+
          | TConst TThis ->
             uses_this := Some !this_real;
             CppThis(!this_real), if !this_real=ThisDynamic then TCppDynamic else cpp_type_of expr.etype
@@ -2407,7 +2432,8 @@ let retype_expression ctx request_type function_args function_type expression_tr
          | TConst x ->
             cpp_const_type x
 
-         | TLocal { v_name = "__global__" } ->
+         | TIdent "__global__" ->
+            (* functions/vars will appear to be members of the virtual global object *)
             CppClassOf(([],""),false), TCppGlobal
 
          | TLocal tvar ->
@@ -2421,11 +2447,16 @@ let retype_expression ctx request_type function_args function_type expression_tr
                if tvar.v_capture then
                   CppVar(VarClosure(tvar)), cpp_type_of tvar.v_type
                else
-                  CppGlobal(name), cpp_type_of tvar.v_type
+                  CppExtern(name,false), cpp_type_of tvar.v_type
             end
 
+         | TIdent name ->
+             CppExtern(name,false), return_type
+
          | TBreak ->
-            begin match !loop_stack with
+            if forCppia then
+               CppBreak, TCppVoid
+            else begin match !loop_stack with
                | [] ->
                   CppBreak, TCppVoid
                | (label_id,used) :: _ ->
@@ -2472,7 +2503,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
 
                   match retypedObj.cppexpr with
                   | CppThis ThisReal ->
-                      CppVar(VarThis(member)), exprType
+                      CppVar(VarThis(member, retypedObj.cpptype)), exprType
                   | _ -> if (is_var_field member) then
                          CppVar( VarInstance(retypedObj,member,tcpp_to_string clazzType, ".") ), exprType
                      else
@@ -2489,11 +2520,11 @@ let retype_expression ctx request_type function_args function_type expression_tr
 
                   match retypedObj.cppexpr with
                   | CppThis ThisReal ->
-                     CppVar(VarThis(member) ), exprType
+                     CppVar(VarThis(member, retypedObj.cpptype) ), exprType
                   | _ ->
                      (match retypedObj.cpptype, member.cf_name with
                      (* Special variable remapping ... *)
-                     | TCppDynamicArray, "length" ->
+                     | TCppDynamicArray, "length" when (  not forCppia )->
                         CppCall(FuncInternal(retypedObj,"get_length","->"),[]), exprType
 
                      | TCppInterface _,_
@@ -2533,9 +2564,9 @@ let retype_expression ctx request_type function_args function_type expression_tr
                  in
                  (match retypedObj.cppexpr with
                  | CppThis ThisReal ->
-                    CppFunction( FuncThis(member), funcReturn ), exprType
+                    CppFunction( FuncThis(member, retypedObj.cpptype), funcReturn ), exprType
                  | CppSuper this ->
-                    CppFunction( FuncSuper(this,member), funcReturn ), exprType
+                    CppFunction( FuncSuper(this, retypedObj.cpptype,member), funcReturn ), exprType
                  | _ ->
                     CppFunction( FuncInstance(retypedObj,(if is_objc then InstObjC else InstPtr),member), funcReturn ), exprType
                  )
@@ -2559,7 +2590,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
                let obj = retype TCppDynamic obj in
                let fieldName = field.cf_name in
                if obj.cpptype=TCppGlobal then
-                  CppGlobal(fieldName), cpp_type_of expr.etype
+                  CppExtern(fieldName,true), cpp_type_of expr.etype
                else if obj.cpptype=TCppNull then
                   CppNullAccess, TCppDynamic
                else if is_internal_member fieldName then begin
@@ -2578,7 +2609,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
                else if fieldName="cca" && obj.cpptype=TCppString then
                   CppFunction( FuncInternal(obj,"cca","."), TCppScalar("int")), TCppDynamic
                else if fieldName="__s" && obj.cpptype=TCppString then
-                  CppVar( VarInternal(obj,".","__s")), TCppPointer("ConstPointer", TCppScalar("char"))
+                  CppVar( VarInternal(obj,".","utf8_str()")), TCppPointer("ConstPointer", TCppScalar("char"))
                else if fieldName="__Index" then
                   CppEnumIndex(obj), TCppScalar("int")
                else if is_internal_member fieldName || cpp_is_real_array obj then begin
@@ -2588,11 +2619,11 @@ let retype_expression ctx request_type function_args function_type expression_tr
                   else
                      CppFunction( FuncInternal(obj,fieldName,"->"), cppType), cppType
                end else if (obj.cpptype=TCppGlobal) then
-                  CppGlobal(fieldName), cpp_type_of expr.etype
+                  CppExtern(fieldName,true), cpp_type_of expr.etype
                else if (obj.cpptype=TCppClass) then begin
                   match obj.cppexpr with
                   | CppClassOf(path,_) ->
-                     CppGlobal ( (join_class_path_remap path "::" ) ^ "_obj::" ^ fieldName ), cpp_type_of expr.etype
+                     CppExtern ( (join_class_path_remap path "::" ) ^ "_obj::" ^ fieldName, true ), cpp_type_of expr.etype
                   | _ ->
                      CppVar( VarInternal(obj,"->",fieldName)), cpp_type_of expr.etype
                end else
@@ -2602,7 +2633,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
                   CppEnumField(enum, enum_field), TCppEnum(enum)
             )
 
-         | TCall( {eexpr = TLocal { v_name = "__cpp__" }}, arg_list ) ->
+         | TCall( {eexpr = TIdent "__cpp__"}, arg_list ) ->
             let  cppExpr = match arg_list with
             | [{ eexpr = TConst (TString code) }] -> CppCode(code, [])
             | ({ eexpr = TConst (TString code) }) :: remaining ->
@@ -2638,13 +2669,27 @@ let retype_expression ctx request_type function_args function_type expression_tr
                   (* Not actually a TCall...*)
                   retypedFunc.cppexpr, retypedFunc.cpptype
 
-               | CppFunction( FuncInstance(obj, InstPtr, member), _ ) when return_type=TCppVoid && is_array_splice_call obj member ->
+               | CppFunction( FuncInstance(obj, InstPtr, member), _ ) when not forCppia && return_type=TCppVoid && is_array_splice_call obj member ->
                   let retypedArgs = List.map (retype TCppDynamic ) args in
                   CppCall( FuncInstance(obj, InstPtr, {member with cf_name="removeRange"}), retypedArgs), TCppVoid
 
+               | CppFunction( FuncInstance(obj, InstPtr, member), _ ) when is_array_concat_call obj member ->
+                  let retypedArgs = List.map (retype obj.cpptype) args in
+                  CppCall( FuncInstance(obj, InstPtr, member), retypedArgs), return_type
+
                | CppFunction( FuncStatic(obj, false, member), _ ) when member.cf_name = "hx::AddressOf" ->
                     let arg = retype TCppUnchanged (List.hd args) in
-                    CppAddressOf(arg), TCppRawPointer("", arg.cpptype)
+                    let rawType = match arg.cpptype with | TCppReference(x) -> x | x -> x in
+                    CppAddressOf(arg), TCppRawPointer("", rawType)
+
+               | CppFunction( FuncStatic(obj, false, member), _ ) when member.cf_name = "hx::StarOf" ->
+                    let arg = retype TCppUnchanged (List.hd args) in
+                    let rawType = match arg.cpptype with | TCppReference(x) -> x | x -> x in
+                    CppAddressOf(arg), TCppStar(rawType,false)
+
+               | CppFunction( FuncStatic(obj, false, member), _ ) when member.cf_name = "hx::Dereference" ->
+                    let arg = retype TCppUnchanged (List.hd args) in
+                    CppDereference(arg), arg.cpptype
 
                | CppFunction( FuncStatic(obj, false, member), _ ) when member.cf_name = "_hx_create_array_length" ->
                   let retypedArgs = List.map (retype TCppDynamic ) args in
@@ -2663,6 +2708,38 @@ let retype_expression ctx request_type function_args function_type expression_tr
                   | _ -> abort "First parameter of template function must be a Class" retypedFunc.cpppos
                   )
 
+               | CppFunction( FuncInstance(obj, InstPtr, member), _ ) when is_map_get_call obj member ->
+                  let retypedArgs = List.map (retype TCppDynamic ) args in
+                  let fname, cppType = match return_type with
+                  | TCppVoid | TCppScalar("bool")  -> (if forCppia then "getBool" else "get_bool"), return_type
+                  | TCppScalar("int")  -> (if forCppia then "getInt" else "get_int"), return_type
+                  | TCppScalar("Float")  -> (if forCppia then "getFloat" else "get_float"), return_type
+                  | TCppString  -> (if forCppia then "getString" else "get_string"), return_type
+                  | _ -> "get", TCppDynamic
+                  in
+                  let func = FuncInstance(obj, InstPtr, {member with cf_name=fname}) in
+                  (*
+                  if  cpp_can_static_cast cppType return_type then begin
+                     let call = mk_cppexpr (CppCall(func,retypedArgs)) cppType in
+                     CppCastStatic(call, cppType), cppType
+                  end else
+                  *)
+                     CppCall( func, retypedArgs), cppType
+
+
+               | CppFunction( FuncInstance(obj, InstPtr, member), _ ) when forCppia && is_map_set_call obj member ->
+                  let retypedArgs = List.map (retype TCppDynamic ) args in
+                  let fname = match retypedArgs with
+                  | [_;{cpptype=TCppScalar("bool")}]  -> "setBool"
+                  | [_;{cpptype=TCppScalar("int")}]  -> "setInt"
+                  | [_;{cpptype=TCppScalar("Float")}]  -> "setFloat"
+                  | [_;{cpptype=TCppString}]  -> "setString"
+                  | _ -> "set"
+                  in
+                  let func = FuncInstance(obj, InstPtr, {member with cf_name=fname}) in
+                  CppCall( func, retypedArgs), cppType
+
+
                | CppFunction( FuncInstance(obj,InstPtr,member) as func, returnType ) when cpp_can_static_cast returnType cppType ->
                   let retypedArgs = List.map (retype TCppDynamic ) args in
                   let call = mk_cppexpr (CppCall(func,retypedArgs)) returnType in
@@ -2677,7 +2754,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
                (* Other functions ... *)
                | CppFunction( FuncInstance(_,_,{cf_type=TFun(arg_types,_)} ) as func, returnType )
                | CppFunction( FuncStatic(_,_,{cf_type=TFun(arg_types,_)} ) as func, returnType )
-               | CppFunction( FuncThis({cf_type=TFun(arg_types,_)} ) as func, returnType ) ->
+               | CppFunction( FuncThis({cf_type=TFun(arg_types,_)},_ ) as func, returnType ) ->
                   let arg_types = List.map (fun (_,opt,t) -> cpp_tfun_arg_type_of ctx opt t) arg_types in
                   (* retype args specifically (not just CppDynamic) *)
                   let retypedArgs = retype_function_args args arg_types in
@@ -2695,14 +2772,15 @@ let retype_expression ctx request_type function_args function_type expression_tr
                | CppSuper(_) ->
                   (* TODO - proper re-typing *)
                   let retypedArgs = List.map (retype TCppDynamic ) args in
-                  CppCall( FuncSuperConstruct ,retypedArgs), TCppVoid
+                  CppCall( FuncSuperConstruct(retypedFunc.cpptype) ,retypedArgs), TCppVoid
 
                | CppDynamicField(expr,name) ->
                   let retypedArgs = List.map (retype TCppDynamic ) args in
                   (* Special function calls *)
                   (match expr.cpptype, name with
                   | TCppGlobal, _  ->
-                     CppCall( FuncGlobal(name),retypedArgs), cppType
+                     let retypedArgs = List.map (retype TCppUnchanged ) args in
+                     CppCall( FuncExtern(name,true),retypedArgs), cppType
 
                   | TCppString, _  ->
                      CppCall( FuncInternal(expr,name,"."),retypedArgs), cppType
@@ -2717,9 +2795,9 @@ let retype_expression ctx request_type function_args function_type expression_tr
                      CppCall( FuncExpression(retypedFunc), retypedArgs), TCppDynamic
                   )
 
-               |  CppGlobal(_) ->
-                  let retypedArgs = List.map (retype TCppDynamic ) args in
-                  CppCall( FuncExpression(retypedFunc) ,retypedArgs), cppType
+               |  CppExtern(name,isGlobal) ->
+                  let retypedArgs = List.map (retype TCppUnchanged ) args in
+                  CppCall( FuncExtern(name,isGlobal) ,retypedArgs), cppType
 
                | _ ->
                   let retypedArgs = List.map (retype TCppDynamic ) args in
@@ -2727,9 +2805,15 @@ let retype_expression ctx request_type function_args function_type expression_tr
                )
             )
 
-         | TNew (clazz,params,args) ->
-            (* New DynamicArray ? *)
-            let retypedArgs = List.map (retype TCppDynamic ) args in
+         | TNew (class_def,params,args) ->
+            let rec find_constructor c = (match c.cl_constructor, c.cl_super with
+            | (Some constructor), _  -> constructor.cf_type
+            | _ , Some (super,_)  -> find_constructor super
+            | _ -> abort "TNew without constructor " expr.epos
+            ) in
+            let constructor_type = find_constructor class_def in
+            let arg_types, _ = cpp_function_type_of_args_ret ctx constructor_type in
+            let retypedArgs = retype_function_args args arg_types in
             let created_type = cpp_type_of expr.etype in
             gc_stack := !gc_stack || (match created_type with | TCppInst(_) -> true | _ -> false );
             CppCall( FuncNew(created_type), retypedArgs), created_type
@@ -2777,7 +2861,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
             let retypedIdx = retype (TCppScalar("int")) e2 in
             let arrayExpr, elemType = (match retypedObj.cpptype with
               | TCppScalarArray scalar ->
-                 CppArray( ArrayTyped(retypedObj,retypedIdx) ), scalar
+                 CppArray( ArrayTyped(retypedObj,retypedIdx,scalar) ), scalar
               | TCppPointer (_,elem) ->
                  CppArray( ArrayPointer(retypedObj, retypedIdx) ), elem
               | TCppRawPointer (_,elem) ->
@@ -2803,13 +2887,18 @@ let retype_expression ctx request_type function_args function_type expression_tr
             let path = t_path module_type in
             CppClassOf(path, is_native_gen_module module_type), TCppClass
 
-         | TBinop (op,e1,e2) ->
-            let objC1 = (is_objc_type e1.etype) in
-            let objC2 = (is_objc_type e2.etype) in
-            let compareObjC = (objC1<>objC2) && (op=OpEq || op=OpNotEq) in
-            let e2 = retype (if compareObjC && objC2 then TCppUnchanged
-                else cpp_type_of (if op=OpAssign then e1 else e2).etype) e2 in
-            let e1 = retype (if compareObjC && objC1 then TCppUnchanged else cpp_type_of e1.etype) e1 in
+         | TBinop (op,left,right) ->
+            let binOpType = match op with
+            | OpDiv -> TCppScalar("Float")
+            | OpBoolAnd | OpBoolOr -> TCppScalar("bool")
+            | OpAnd | OpOr | OpXor | OpShl | OpShr | OpUShr -> TCppScalar("int")
+            | OpAssign -> (retype TCppUnchanged left).cpptype
+            | OpMult | OpSub -> cpp_type_of expr.etype
+            | _ -> TCppUnchanged
+            in
+            let e1 = retype binOpType left in
+            let e2 = retype binOpType right in
+
             let complex = (is_complex_compare e1.cpptype) || (is_complex_compare e2.cpptype) in
             let e1_null = e1.cpptype=TCppNull in
             let e2_null = e2.cpptype=TCppNull in
@@ -2838,16 +2927,21 @@ let retype_expression ctx request_type function_args function_type expression_tr
                | OpLte when   e2_null -> CppNullCompare("IsNull", e1)
                | OpNotEq when e2_null -> CppNullCompare("IsNotNull", e1)
 
-               | OpEq when complex -> CppCompare("IsEq", e1, e2)
-               | OpNotEq when complex -> CppCompare("IsNotEq", e1, e2)
-               | OpGte when complex -> CppCompare("IsGreaterEq", e1, e2)
-               | OpLte when complex -> CppCompare("IsLessEq", e1, e2)
-               | OpGt when complex -> CppCompare("IsGreater", e1, e2)
-               | OpLt  when complex -> CppCompare("IsLess", e1, e2)
+               | OpEq when complex -> CppCompare("IsEq", e1, e2, op)
+               | OpNotEq when complex -> CppCompare("IsNotEq", e1, e2, op)
+               | OpGte when complex -> CppCompare("IsGreaterEq", e1, e2, op)
+               | OpLte when complex -> CppCompare("IsLessEq", e1, e2, op)
+               | OpGt when complex -> CppCompare("IsGreater", e1, e2, op)
+               | OpLt  when complex -> CppCompare("IsLess", e1, e2, op)
 
                | _ -> CppBinop(op,e1,e2)
             in
-            reference, cpp_type_of expr.etype
+            (match op,e1.cpptype,e2.cpptype  with
+            (* Variant + Variant = Variant *)
+            | OpAdd, _, TCppVariant | OpAdd, TCppVariant, _
+                -> reference, TCppVariant
+            | _,_,_ -> reference, cpp_type_of expr.etype
+            )
 
          | TUnop (op,pre,e1) ->
             let targetType = match op with
@@ -2892,7 +2986,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
          | TBlock expr_list ->
             let inject = !injection in
             injection := false;
-            if (return_type<>TCppVoid) then
+            if (return_type<>TCppVoid) && not forCppia then
                print_endline ("Value from a block not handled " ^
                (expr.epos.pfile ) ^ " " ^  (string_of_int (Lexer.get_error_line expr.epos) ));
 
@@ -2915,14 +3009,14 @@ let retype_expression ctx request_type function_args function_type expression_tr
             CppBlock(cppExprs, List.rev !local_closures, !gc_stack ), TCppVoid
 
          | TObjectDecl (
-            ("fileName" , { eexpr = (TConst (TString file)) }) ::
-               ("lineNumber" , { eexpr = (TConst (TInt line)) }) ::
-                  ("className" , { eexpr = (TConst (TString class_name)) }) ::
-                     ("methodName", { eexpr = (TConst (TString meth)) }) :: [] ) ->
+            (("fileName",_,_) , { eexpr = (TConst (TString file)) }) ::
+               (("lineNumber",_,_) , { eexpr = (TConst (TInt line)) }) ::
+                  (("className",_,_) , { eexpr = (TConst (TString class_name)) }) ::
+                     (("methodName",_,_), { eexpr = (TConst (TString meth)) }) :: [] ) ->
               CppPosition(file,line,class_name,meth), TCppDynamic
 
          | TObjectDecl el ->
-            let retypedEls = List.map ( fun(v,e) -> v, retype TCppDynamic e) el in
+            let retypedEls = List.map ( fun((v,_,_),e) -> v, retype TCppDynamic e) el in
             (match return_type with
             | TCppVoid -> CppObjectDecl(retypedEls,false), TCppVoid
             | _ -> CppObjectDecl(retypedEls,false), TCppDynamic
@@ -2950,7 +3044,12 @@ let retype_expression ctx request_type function_args function_type expression_tr
             let conditionType = cpp_type_of condition.etype in
             let condition = retype conditionType condition in
             let cppDef = match def with None -> None | Some e -> Some (retype TCppVoid (mk_block e)) in
-            (try
+            if forCppia then begin
+               let cases = List.map (fun (el,e2) ->
+                  let cppBlock = retype TCppVoid (mk_block e2) in
+                  (List.map (retype conditionType) el), cppBlock ) cases in
+               CppSwitch(condition, conditionType, cases, cppDef, -1), TCppVoid
+            end else (try
                (match conditionType with TCppScalar("int") | TCppScalar("bool") -> () | _ -> raise Not_found );
                let cases = List.map (fun (el,e2) ->
                   (List.map const_int_of el), (retype TCppVoid (mk_block e2)) ) cases in
@@ -2993,6 +3092,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
             else (match return_type with
                | TCppObjC(k) -> CppCastObjC(baseCpp,k), return_type
                | TCppPointer(_,_)
+               | TCppStar(_)
                | TCppInst(_) -> CppCast(baseCpp,return_type), return_type
                | TCppString -> CppCastScalar(baseCpp,"::String"), return_type
                | TCppCode(t) when baseStr <> (tcpp_to_string t)  ->
@@ -3007,16 +3107,16 @@ let retype_expression ctx request_type function_args function_type expression_tr
          | TCast (base,Some t) ->
             let baseCpp = retype (cpp_type_of base.etype) base in
             let baseStr = (tcpp_to_string baseCpp.cpptype) in
-            let return_type = if return_type=TCppUnchanged then cpp_type_of expr.etype else return_type in
+            let default_return_type = if return_type=TCppUnchanged then cpp_type_of expr.etype else return_type in
+            let return_type = cpp_type_from_path ctx (t_path t) [] (fun () -> default_return_type ) in
             let returnStr = (tcpp_to_string return_type) in
 
             if baseStr=returnStr then
                baseCpp.cppexpr, baseCpp.cpptype (* nothing to do *)
             else (match return_type with
             | TCppNativePointer(klass) -> CppCastNative(baseCpp), return_type
-            | TCppVoid -> baseCpp.cppexpr, TCppVoid
-            | TCppInterface _ ->
-                  baseCpp.cppexpr, return_type
+            | TCppVoid ->
+               CppTCast(baseCpp, cpp_type_of expr.etype), return_type
             | TCppDynamic ->
                   baseCpp.cppexpr, baseCpp.cpptype
             | _ ->
@@ -3032,11 +3132,11 @@ let retype_expression ctx request_type function_args function_type expression_tr
          match cpp_variant_type_of cppExpr.cpptype with
          | TCppVoidStar
          | TCppScalar _ -> cppExpr
-         | TCppString ->  mk_cppexpr (CppVar(VarInternal(cppExpr,".","__s"))) (TCppPointer("ConstPointer", TCppScalar("char")))
+         | TCppString ->  mk_cppexpr (CppVar(VarInternal(cppExpr,".","raw_ptr()"))) (TCppPointer("ConstPointer", TCppScalar("char")))
          | TCppDynamic ->  mk_cppexpr (CppCastNative(cppExpr)) TCppVoidStar
          | _ -> let toDynamic = mk_cppexpr (CppCast(cppExpr, TCppDynamic)) TCppDynamic in
                 mk_cppexpr (CppCastNative(toDynamic)) TCppVoidStar
-      end else if (cppExpr.cpptype=TCppVariant || cppExpr.cpptype=TCppDynamic) then begin
+      end else if (cppExpr.cpptype=TCppVariant || cppExpr.cpptype=TCppDynamic || cppExpr.cpptype==TCppObject) then begin
          match return_type with
          | TCppUnchanged -> cppExpr
          | TCppInst(t) when (has_meta_key t.cl_meta Meta.StructAccess) ->
@@ -3083,7 +3183,7 @@ let retype_expression ctx request_type function_args function_type expression_tr
             Using the 'typedef hack', where we use typedef X<T> = T, allows the
             haxe compiler to use these types interchangeably. We then work
             out the correct way to convert between them when one is expected, but another provided.
- 
+
             TCppFunction: these do not really interact with the haxe function type, T
             Since they are implemented with cpp::Function, conversion to/from Dynamic should happen automatically
                CallableData<T> = T;
@@ -3149,6 +3249,15 @@ let retype_expression ctx request_type function_args function_type expression_tr
 
          | _, TCppObjectPtr ->
              mk_cppexpr (CppCast(cppExpr,TCppObjectPtr)) TCppObjectPtr
+
+         | TCppDynamicArray, TCppScalarArray _
+         | TCppDynamicArray, TCppObjectArray _
+         | TCppScalarArray _, TCppDynamicArray
+         | TCppObjectArray _, TCppDynamicArray when forCppia ->
+             mk_cppexpr (CppCast(cppExpr,return_type)) return_type
+         | TCppScalar(from), TCppScalar(too) when from<>too ->
+             mk_cppexpr (CppCastScalar(cppExpr,too)) return_type
+
          | _ -> cppExpr
    in
    retype request_type expression_tree
@@ -3169,28 +3278,64 @@ let cpp_arg_type_name ctx tvar default_val prefix =
    let remap_name = (cpp_var_name_of tvar) in
    let type_str = (cpp_var_type_of ctx tvar) in
    match default_val with
-   | Some TNull  -> (tcpp_to_string (cpp_type_of_null ctx tvar.v_type)),remap_name
+   | Some {eexpr = TConst TNull}  -> (tcpp_to_string (cpp_type_of_null ctx tvar.v_type)),remap_name
    | Some constant -> (tcpp_to_string (cpp_type_of_null ctx tvar.v_type)),prefix ^ remap_name
    | _ -> type_str,remap_name
 ;;
 
 
+
+let string_of_path path =
+      "::" ^ (join_class_path_remap path "::") ^ "_obj"
+;;
+
+let default_value_string ctx value =
+match value.eexpr with
+   | TConst (TInt i) -> Printf.sprintf "%ld" i
+   | TConst (TFloat float_as_string) -> "((Float)" ^ float_as_string ^ ")"
+   | TConst (TString s) -> strq ctx s
+   | TConst (TBool b) -> (if b then "true" else "false")
+   | TConst TNull -> "null()"
+   | TField (_, FEnum(enum,field) ) -> (string_of_path enum.e_path) ^ "::" ^ (cpp_enum_name_of field) ^ "_dyn()"
+   | _ -> "/* Hmmm " ^ (s_expr_kind value) ^ " */"
+;;
+
+
+
 let cpp_gen_default_values ctx args prefix =
    List.iter ( fun (tvar,o) ->
+      let vtype = cpp_type_of ctx tvar.v_type in
+      let not_null = (type_has_meta_key tvar.v_type Meta.NotNull) || (is_cpp_scalar vtype) in
       match o with
-      | Some TNull -> ()
+      | Some {eexpr = TConst TNull} -> ()
       | Some const ->
          let name = cpp_var_name_of tvar in
-         ctx.ctx_output ((cpp_var_type_of ctx tvar) ^ " " ^ name ^ " = " ^ prefix ^ name ^ ".Default(" ^
-            (default_value_string const) ^ ");\n")
+         let spacer = if (ctx.ctx_debug_level>0) then "            \t" else "" in
+         let pname = prefix ^ name in
+         ctx.ctx_output ( spacer ^ "\t" ^ (tcpp_to_string vtype) ^ " " ^ name ^ " = " ^ pname );
+         ctx.ctx_output ( if not_null then
+                ".Default(" ^ (default_value_string ctx.ctx_common const) ^ ");\n"
+            else
+                ";\n" ^ spacer ^ "\tif (hx::IsNull(" ^ pname ^ ")) " ^  name ^  " = " ^ (default_value_string ctx.ctx_common const) ^ ";\n"
+            );
       | _ -> ()
    ) args;
 ;;
 
-let is_constant_zero expr =
+let ctx_default_values ctx args prefix =
+    cpp_gen_default_values ctx args prefix
+;;
+
+let cpp_class_hash interface =
+   gen_hash 0 (join_class_path interface.cl_path "::" )
+;;
+
+
+let rec is_constant_zero expr =
   match expr.cppexpr with
   | CppFloat x when (float_of_string x) = 0.0 -> true
   | CppInt i when i = Int32.of_int 0 -> true
+  | CppCastScalar(expr,_) -> is_constant_zero(expr)
   | _ -> false
 ;;
 
@@ -3217,13 +3362,26 @@ let cpp_arg_list ctx args prefix =
 ;;
 
 
-let ctx_default_values ctx args prefix =
-    cpp_gen_default_values ctx args prefix
+let gen_type ctx haxe_type =
+   ctx.ctx_output (ctx_type_string ctx haxe_type)
 ;;
 
 
-let gen_type ctx haxe_type =
-   ctx.ctx_output (ctx_type_string ctx haxe_type)
+
+
+
+let rec implements_native_interface class_def =
+   List.exists (fun (intf_def,_) ->
+        is_native_gen_class intf_def ||
+           implements_native_interface intf_def
+    ) class_def.cl_implements ||
+        (match class_def.cl_super with
+           | Some (i,_) -> implements_native_interface i
+           | _ -> false )
+;;
+
+let can_quick_alloc klass =
+   not (implements_native_interface klass)
 ;;
 
 
@@ -3232,6 +3390,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
    let out = ctx.ctx_output in
    let lastLine = ref (-1) in
    let tempId = ref 0 in
+   let strq = strq ctx.ctx_common in
 
    let spacer = if (ctx.ctx_debug_level>0) then "            \t" else "" in
    let output_i value = out spacer; writer#write_i value in
@@ -3252,8 +3411,9 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
    let cppTree =  retype_expression ctx TCppVoid function_args function_type tree forInjection in
    let label_name i = Printf.sprintf "_hx_goto_%i" i in
    let class_hash = gen_hash_small 0 class_name in
+   (*let genGc = Common.defined ctx.ctx_common Define.HxcppGcGenerational in*)
 
-   let rec gen_with_injection injection expr =
+   let rec gen_with_injection injection expr new_line =
       (match expr.cppexpr with
       | CppBlock(exprs,closures,gc_stack) ->
          writer#begin_block;
@@ -3271,9 +3431,9 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
          ) exprs;
          (match injection with Some inject -> out inject.inj_tail | _ -> () );
          out spacer;
-         writer#end_block;
+         if new_line then writer#end_block else writer#end_block_line;
 
-      | CppInt i -> out (Printf.sprintf "(int)%ld" i)
+      | CppInt i -> out (Printf.sprintf (if i> Int32.of_int(-1000000000) && i< Int32.of_int(1000000000) then "%ld" else "(int)%ld") i)
       | CppFloat float_as_string -> out ("((Float)" ^ float_as_string ^")")
       | CppString s -> out (strq s)
       | CppBool b -> out (if b then "true" else "false")
@@ -3307,14 +3467,14 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
 
       | CppEnumIndex(obj) ->
          gen obj;
-         (*if cpp_is_dynamic_type obj.cpptype then*)
+         if cpp_is_dynamic_type obj.cpptype then
             out ".StaticCast< ::hx::EnumBase >()";
-         out "->getIndex()"
+         out "->_hx_getIndex()"
 
       | CppNullAccess -> out ("hx::Throw(" ^ strq "Null access" ^ ")")
       | CppFunction(func,_) ->
          (match func with
-         | FuncThis(field) ->
+         | FuncThis(field,_) ->
               out ("this->" ^ (cpp_member_name_of field) ^ "_dyn()");
          | FuncInstance(expr,inst,field) ->
               gen expr; out ((if expr.cpptype=TCppString || inst=InstStruct then "." else "->") ^ (cpp_member_name_of field) ^ "_dyn()");
@@ -3329,11 +3489,12 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
                  (out (cpp_class_name clazz); out ("::" ^ (cpp_member_name_of field) ^ "_dyn()"))
          | FuncExpression(expr) ->
               gen expr;
-         | FuncGlobal(name) ->
-              out ("::" ^ name);
+         | FuncExtern(name, isGlobal) ->
+              if isGlobal then out " ::";
+              out name;
          | FuncInternal(expr,name,_) ->
               gen expr; out ("->__Field(" ^ (strq name) ^ ",hx::paccDynamic)")
-         | FuncSuper _ | FuncSuperConstruct -> abort "Can't create super closure" expr.cpppos
+         | FuncSuper _ | FuncSuperConstruct _ -> abort "Can't create super closure" expr.cpppos
          | FuncNew _ -> abort "Can't create new closure" expr.cpppos
          | FuncEnumConstruct _ -> abort "Enum constructor outside of CppCall" expr.cpppos
          | FuncFromStaticFunction -> abort "Can't create cpp.Function.fromStaticFunction closure" expr.cpppos
@@ -3378,7 +3539,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
            expr.cpppos);
          out " ]"
 
-      | CppCall(FuncNew( TCppInst klass), args) ->
+      | CppCall(FuncNew( TCppInst klass), args) when can_quick_alloc klass ->
          out ((cpp_class_path_of klass) ^ "_obj::__alloc( HX_CTX ");
          List.iter (fun arg -> out ","; gen arg ) args;
          out (")")
@@ -3387,7 +3548,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
          let closeCall = ref "" in
          let argsRef = ref args in
          (match func with
-         | FuncThis(field) ->
+         | FuncThis(field,_) ->
               out ("this->" ^ (cpp_member_name_of field) );
          | FuncInstance(expr,inst,field) ->
               let operator = if (expr.cpptype = TCppString || inst=InstStruct) then "." else "->" in
@@ -3432,9 +3593,9 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
          | FuncEnumConstruct(enum,field) ->
             out ((string_of_path enum.e_path) ^ "::" ^ (cpp_enum_name_of field));
 
-         | FuncSuperConstruct -> out ((if not ctx.ctx_real_this_ptr then "__this->" else "") ^  "super::__construct")
+         | FuncSuperConstruct _ -> out ((if not ctx.ctx_real_this_ptr then "__this->" else "") ^  "super::__construct")
 
-         | FuncSuper(this,field) ->
+         | FuncSuper(this,_,field) ->
               out ( (if this==ThisReal then "this->" else "__->") ^ "super::" ^ (cpp_member_name_of field) )
 
          | FuncNew(newType) ->
@@ -3455,8 +3616,9 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
          | FuncInternal(func,name,join) ->
             gen func; out (join ^ name);
 
-         | FuncGlobal(name) ->
-              out ("::" ^ name);
+         | FuncExtern(name, isGlobal) ->
+              if isGlobal then out " ::";
+              out name;
          | FuncExpression(expr)  ->
               gen expr;
          );
@@ -3479,15 +3641,16 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
          out ("&::" ^(join_class_path_remap klass.cl_path "::")^ "_obj::" ^ name );
          out " ))"
 
-      | CppGlobal(name) ->
-         out ("::" ^ name)
+      | CppExtern(name,isGlobal) ->
+         if isGlobal then out " ::";
+         out name;
 
       | CppDynamicField(obj,name) ->
          gen obj;
          out ("->__Field(" ^ (strq name)  ^ ",hx::paccDynamic)");
 
       | CppArray(arrayLoc) -> (match arrayLoc with
-         | ArrayTyped(arrayObj,index) ->
+         | ArrayTyped(arrayObj,index,_) ->
             gen arrayObj; out "->__get("; gen index; out ")"
 
          | ArrayPointer(arrayObj,index) ->
@@ -3523,7 +3686,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
          | CppVarRef( VarClosure(var)) when is_gc_element ctx (cpp_type_of ctx var.v_type) ->
               out ("this->_hx_set_" ^ (cpp_var_name_of var) ^ "(HX_CTX, "); gen rvalue; out ")"
 
-         | CppVarRef( VarThis(member)) when is_gc_element ctx (cpp_type_of ctx member.cf_type) ->
+         | CppVarRef( VarThis(member,_)) when is_gc_element ctx (cpp_type_of ctx member.cf_type) ->
               out ("this->_hx_set_" ^ (cpp_member_name_of member) ^ "(HX_CTX, "); gen rvalue; out ")"
 
          | CppVarRef( VarInstance(obj,member,_,"->")) when is_gc_element ctx (cpp_type_of ctx member.cf_type) ->
@@ -3538,8 +3701,10 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
          | CppArrayRef arrayLoc -> (match arrayLoc with
             | ArrayObject(arrayObj, index, _) when (is_gc_element ctx TCppDynamic) ->
                gen arrayObj; out "->setCtx( HX_CTX, "; gen index; out ","; gen rvalue; out ")"
+            | ArrayTyped(arrayObj, index, t) when (is_gc_element ctx t) ->
+               gen arrayObj; out "->setCtx( HX_CTX, "; gen index; out ","; gen rvalue; out ")"
             | ArrayObject(arrayObj, index, _)
-            | ArrayTyped(arrayObj, index)
+            | ArrayTyped(arrayObj, index, _)
             | ArrayRawPointer(arrayObj, index) ->
                gen arrayObj; out "["; gen index; out "] = "; gen rvalue
             | ArrayPointer(arrayObj, index) ->
@@ -3555,7 +3720,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
             )
          | CppDynamicRef(expr,name) ->
             gen expr; out ("->__SetField(" ^ (strq name) ^ ","); gen rvalue; out ",hx::paccDynamic)"
-         | CppGlobalRef(name) -> out ("::" ^ name ^ " = ");
+         | CppExternRef(name, isGlobal) -> if isGlobal then out " ::"; out (name ^ " = ");
          );
          out close;
 
@@ -3676,18 +3841,13 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
 
       | CppBinop(op, left, right) ->
          let op = string_of_op op expr.cpppos in
-         let castOpen, castClose = (match op with
-         | ">>" | "<<" | "&" | "|" | "^"  -> "(int)", ""
-         | "&&" | "||" -> "(bool)", ""
-         | "/" -> "(Float)", ""
-         | _ -> "","") in
           out "(";
-          out castOpen; gen left; out castClose;
+          gen left;
           out (" " ^ op ^ " ");
-          out castOpen; gen right; out castClose;
+          gen right;
           out ")";
-      | CppCompare(op, left, right) ->
-          out ("hx::" ^ op ^ "( ");
+      | CppCompare(opName, left, right, _) ->
+          out ("hx::" ^ opName ^ "( ");
           gen left;
           out (",");
           gen right;
@@ -3769,11 +3929,13 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
           (match while_flag with
           | NormalWhile ->
               out "while("; gen condition; out (")");
+              lastLine := -1;
               gen block;
           | DoWhile ->
               out ("do ");
-              gen block;
-              out "while("; gen condition; out ")"
+              lastLine := -1;
+              gen_with_injection None block false;
+              out " while("; gen condition; out ");\n"
           );
           if loop_id > -1 then output_i ((label_name loop_id) ^ ":");
 
@@ -3799,7 +3961,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
          let prologue = fun _ ->
             output_i ( varType ^ " " ^ (cpp_var_name_of tvar) ^ " = __it->next();\n" );
          in
-         gen_with_injection (mk_injection prologue "" "") loop;
+         gen_with_injection (mk_injection prologue "" "") loop true;
 
 
       | CppTry(block,catches) ->
@@ -3809,25 +3971,34 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
              ) catches
           in
           out ("try ");
-          gen_with_injection (mk_injection prologue "" "" ) block;
+          gen_with_injection (mk_injection prologue "" "" ) block (List.length catches < 0);
           if (List.length catches > 0 ) then begin
-             output_i "catch( ::Dynamic _hx_e)";
+             out " catch( ::Dynamic _hx_e) ";
              writer#begin_block;
 
              let seen_dynamic = ref false in
              let else_str = ref "" in
              List.iter (fun (v,catch) ->
                 let type_name = cpp_var_type_of ctx v in
-                if (type_name="Dynamic") then begin
-                   seen_dynamic := true;
-                   output_i !else_str;
-                end else
-                   output_i (!else_str ^ "if (_hx_e.IsClass< " ^ type_name ^ " >() )");
+                (match cpp_type_of ctx v.v_type with
+                | TCppInterface(klass) ->
+                   let hash = (cpp_class_hash klass) in
+                   output_i (!else_str ^ "if (hx::TIsInterface< (int)" ^ hash  ^ " >(_hx_e.mPtr))")
+                | TCppString ->
+                   output_i (!else_str ^ "if (_hx_e.IsClass< ::String >() && _hx_e->toString()!=null() )");
+                | _ ->
+                   if (type_name="Dynamic") then begin
+                      seen_dynamic := true;
+                      output_i !else_str;
+                   end else
+                      output_i (!else_str ^ "if (_hx_e.IsClass< " ^ type_name ^ " >() )");
+                );
+
                 let prologue = function _ ->
                    output_i "HX_STACK_BEGIN_CATCH\n";
                    output_i (type_name ^ " " ^ (cpp_var_name_of v) ^ " = _hx_e;\n");
                 in
-                gen_with_injection (mk_injection prologue "" "") catch;
+                gen_with_injection (mk_injection prologue "" "") catch true;
                 else_str := "else ";
                 ) catches;
 
@@ -3843,11 +4014,19 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
       | CppCode(value, exprs) ->
          Codegen.interpolate_code ctx.ctx_common (format_code value) exprs out (fun e -> gen e) expr.cpppos
       | CppTCast(expr,cppType) ->
-         let toType = tcpp_to_string cppType in
-         if toType="Dynamic" then
-            (out " ::Dynamic("; gen expr; out ")")
-         else
-            (out ("hx::TCast< " ^ toType ^ " >::cast("); gen expr; out ")")
+         (match cppType with
+         | TCppInterface(i) ->
+             out " hx::interface_check(";
+             gen expr;
+             out ("," ^ (cpp_class_hash i) ^")")
+         | _ -> begin
+            let toType = tcpp_to_string cppType in
+            if toType="Dynamic" then
+               (out " ::Dynamic("; gen expr; out ")")
+            else
+               (out ("hx::TCast< " ^ toType ^ " >::cast("); gen expr; out ")")
+            end
+         )
 
       | CppCastStatic(expr,toType) ->
          let close = match expr.cpptype with
@@ -3898,7 +4077,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
          out ("/* " ^ (s_tcpp expr.cppexpr) ^ ":" ^ tcpp_to_string expr.cpptype ^ " */")
 
    and gen expr =
-      gen_with_injection None expr
+      gen_with_injection None expr true
 
    and gen_lvalue lvalue =
       match lvalue with
@@ -3907,7 +4086,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
       | CppArrayRef arrayLoc -> (match arrayLoc with
          | ArrayObject(arrayObj, index, _) ->
             out "hx::IndexRef("; gen arrayObj; out ".mPtr,"; gen index; out ")";
-         | ArrayTyped(arrayObj, index) ->
+         | ArrayTyped(arrayObj, index, _) ->
             gen arrayObj; out "["; gen index; out "]";
          | ArrayPointer(arrayObj, index) ->
             gen arrayObj; out ".ptr["; gen index; out "]";
@@ -3919,7 +4098,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
          | ArrayImplements(_,arrayObj,index) ->
             out "hx::__ArrayImplRef("; gen arrayObj; out ","; gen index; out ")";
          )
-      | CppGlobalRef(name) -> out ("::" ^ name)
+      | CppExternRef(name,isGlobal) -> if isGlobal then out " ::"; out name
       | CppDynamicRef(expr,name) ->
          let objPtr = match expr.cpptype with
          |  TCppVariant -> "getObject()"
@@ -3940,7 +4119,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
              (out ( (join_class_path_remap clazz.cl_path "::") ); out ("." ^ (cpp_member_name_of member)))
           else
              (out (cpp_class_name clazz ); out ("::" ^ (cpp_member_name_of member)))
-      | VarThis(member) ->
+      | VarThis(member,_) ->
          out ("this->" ^ (cpp_member_name_of member))
       | VarInstance(obj,member,_,operator) ->
          gen obj; out (operator ^ (cpp_member_name_of member))
@@ -3984,9 +4163,8 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
       | OpMod -> "%"
       | OpInterval -> "..."
       | OpArrow -> "->"
+      | OpIn -> " in "
       | OpAssign | OpAssignOp _ -> abort "Unprocessed OpAssign" pos
-   and string_of_path path =
-      "::" ^ (join_class_path_remap path "::") ^ "_obj"
 
    and gen_closure closure =
       let argc = Hashtbl.length closure.close_undeclared in
@@ -4021,8 +4199,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
              out ("HXLINE(" ^ lineName ^ ")\n" );
           end
       in
-
-      gen_with_injection (mk_injection prologue "" "") closure.close_expr;
+      gen_with_injection (mk_injection prologue "" "") closure.close_expr true;
 
       let return = match closure.close_type with TCppVoid -> "(void)" | _ -> "return" in
 
@@ -4032,7 +4209,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args function_
 
    (*out "\t";*)
 
-   gen_with_injection injection cppTree;
+   gen_with_injection injection cppTree true;
 
 ;;
 
@@ -4106,21 +4283,59 @@ let is_override class_def field =
    List.exists (fun f -> f.cf_name = field) class_def.cl_overrides
 ;;
 
-let current_virtual_functions clazz =
-  List.rev (List.fold_left (fun result elem -> match follow elem.cf_type, elem.cf_kind  with
-    | _, Method MethDynamic -> result
-    | TFun (args,return_type), Method _  when not (is_override clazz elem.cf_name ) -> (elem,args,return_type) :: result
-    | _,_ -> result ) [] clazz.cl_ordered_fields)
+(*
+   Functions are added in reverse order (oldest on right), then list is reversed because this is easier in ocaml
+   The order is important because cppia looks up functions by index
+*)
+
+
+let current_virtual_functions_rev clazz base_functions =
+   List.fold_left (fun result elem -> match follow elem.cf_type, elem.cf_kind  with
+      | _, Method MethDynamic -> result
+      | TFun (args,return_type), Method _  ->
+          if (is_override clazz elem.cf_name ) then
+             List.map (fun (e,a,r) ->  if e.cf_name<>elem.cf_name then (e,a,r) else  (elem,args,return_type) ) result
+          else
+             (elem,args,return_type) :: result
+      | _,_ -> result
+    ) base_functions clazz.cl_ordered_fields
 ;;
 
 let all_virtual_functions clazz =
-  let rec all_virtual_functions clazz =
-   (match clazz.cl_super with
-   | Some def -> all_virtual_functions (fst def)
-   | _ -> [] ) @ current_virtual_functions clazz
+  let rec all_virtual_functions_rec clazz =
+   current_virtual_functions_rev clazz (match clazz.cl_super with
+       | Some def -> all_virtual_functions_rec (fst def)
+       | _ -> []
+     )
+   in
+   List.rev (all_virtual_functions_rec clazz)
+;;
+
+
+
+(*
+let current_virtual_functions clazz parents override_types =
+  List.fold_left (fun result elem -> match follow elem.cf_type, elem.cf_kind  with
+    | _, Method MethDynamic -> result
+    | TFun (args,return_type), Method _ ->
+        if override_types then
+           (elem,args,return_type) :: (List.filter (fun (e,a,r) -> e.cf_name<>elem.cf_name) result)
+        else if (is_override clazz elem.cf_name ) then
+           result
+        else
+           (elem,args,return_type) :: result
+    | _,_ -> result ) parents (List.rev clazz.cl_ordered_fields)
+;;
+
+let all_virtual_functions clazz override_types =
+   let rec all_virtual_functions clazz =
+      current_virtual_functions clazz (match clazz.cl_super with
+         | Some def -> all_virtual_functions (fst def)
+         | _ -> [] ) false
    in
    all_virtual_functions clazz
 ;;
+*)
 
 
 let rec unreflective_type t =
@@ -4251,7 +4466,7 @@ let gen_field ctx class_def class_name ptr_name dot_name is_static is_interface
                        | TCppStar (t,const) ->
                           output ("(cpp::" ^ (if const then "Const" else "") ^"Pointer<" ^ (tcpp_to_string t)^" >) ")
                        | TCppInst(t) when has_meta_key t.cl_meta Meta.StructAccess ->
-                          output ("(cpp::Struct< " ^ (tcpp_to_string return_type) ^ " >) ");
+                          output ("(cpp::Struct< " ^ (tcpp_to_string arg) ^ " >) ");
                        | _ -> () );
                      output ("a" ^ (string_of_int i));
                   )  tcpp_args;
@@ -4296,7 +4511,7 @@ let gen_field ctx class_def class_name ptr_name dot_name is_static is_interface
          output ( " " ^ class_name ^ "::" ^ remap_name ^ ";\n\n");
       end
    | _ ->
-      if is_static && (not (is_extern_field field)) then begin
+      if is_static && is_physical_field field then begin
          gen_type ctx field.cf_type;
          output ( " " ^ class_name ^ "::" ^ remap_name ^ ";\n\n");
       end
@@ -4336,10 +4551,6 @@ let cpp_interface_impl_name ctx interface =
 ;;
 
 
-let cpp_class_hash interface =
-   gen_hash 0 (join_class_path interface.cl_path "::" )
-;;
-
 
 
 let has_field_init field =
@@ -4369,7 +4580,7 @@ let gen_member_def ctx class_def is_static is_interface field =
             output (if (not is_static) then ")=0;\n" else ");\n");
             if (reflective class_def field) then begin
                if (Common.defined ctx.ctx_common Define.DynamicInterfaceClosures) then
-                  output ("		inline ::Dynamic " ^ remap_name ^ "_dyn() { return __Field( " ^ (str field.cf_name) ^ ", hx::paccDynamic); }\n" )
+                  output ("		inline ::Dynamic " ^ remap_name ^ "_dyn() { return __Field( " ^ (strq ctx.ctx_common field.cf_name) ^ ", hx::paccDynamic); }\n" )
                else
                   output ("		virtual ::Dynamic " ^ remap_name ^ "_dyn()=0;\n" );
             end
@@ -4378,7 +4589,7 @@ let gen_member_def ctx class_def is_static is_interface field =
             let returnType = ctx_type_string ctx return_type in
             let returnStr = if returnType = "void" then "" else "return " in
             let commaArgList = if argList="" then argList else "," ^ argList in
-            let cast = "static_cast< ::" ^ join_class_path_remap class_def.cl_path "::" ^ "_obj *>" in
+            let cast = "hx::interface_cast< ::" ^ join_class_path_remap class_def.cl_path "::" ^ "_obj *>" in
             output ("		" ^ returnType ^ " (hx::Object :: *_hx_" ^ remap_name ^ ")(" ^ argList ^ "); \n");
             output ("		static inline " ^ returnType ^ " " ^ remap_name ^ "( ::Dynamic _hx_" ^ commaArgList ^ ") {\n");
             output ("			" ^ returnStr ^ "(_hx_.mPtr->*( " ^ cast ^ "(_hx_.mPtr->_hx_getInterface(" ^ (cpp_class_hash class_def) ^ ")))->_hx_" ^ remap_name ^ ")(" ^ cpp_arg_names args ^ ");\n		}\n" );
@@ -4398,7 +4609,7 @@ let gen_member_def ctx class_def is_static is_interface field =
             if ( doDynamic ) then begin
                output ("::Dynamic " ^ remap_name ^ ";\n");
                if (not is_static) && (is_gc_element ctx TCppDynamic) then
-                  output ("\t\tinline ::Dynamic _hx_set_" ^ remap_name ^ "(hx::Ctx *_hx_ctx,::Dynamic _hx_v) { HX_OBJ_WB(this,_hx_v) return " ^ remap_name ^ "=_hx_v; }\n");
+                  output ("\t\tinline ::Dynamic _hx_set_" ^ remap_name ^ "(hx::StackContext *_hx_ctx,::Dynamic _hx_v) { HX_OBJ_WB(this,_hx_v.mPtr) return " ^ remap_name ^ "=_hx_v; }\n");
                output (if is_static then "\t\tstatic " else "\t\t");
                output ("inline ::Dynamic &" ^ remap_name ^ "_dyn() " ^ "{return " ^ remap_name^ "; }\n")
             end
@@ -4435,8 +4646,10 @@ let gen_member_def ctx class_def is_static is_interface field =
             abort ("Variables of type " ^ tcppStr ^ " may not be used as members") field.cf_pos;
 
          output (tcppStr ^ " " ^ remap_name ^ ";\n" );
-         if not is_static && (is_gc_element ctx tcpp) then
-            output ("\t\tinline " ^ tcppStr ^ " _hx_set_" ^ remap_name ^ "(hx::Ctx *_hx_ctx," ^ tcppStr ^ " _hx_v) { HX_OBJ_WB(this,_hx_v) return " ^ remap_name ^ "=_hx_v; }\n");
+         if not is_static && (is_gc_element ctx tcpp) then begin
+            let getPtr = match tcpp with | TCppString -> ".raw_ref()" | _ -> ".mPtr" in
+            output ("\t\tinline " ^ tcppStr ^ " _hx_set_" ^ remap_name ^ "(hx::StackContext *_hx_ctx," ^ tcppStr ^ " _hx_v) { HX_OBJ_WB(this,_hx_v" ^ getPtr ^ ") return " ^ remap_name ^ "=_hx_v; }\n");
+         end;
 
          (* Add a "dyn" function for variable to unify variable/function access *)
          (match follow field.cf_type with
@@ -4471,6 +4684,11 @@ let path_of_string path =
 *)
 let find_referenced_types_flags ctx obj field_name super_deps constructor_deps header_only for_depends include_super_args =
    let types = ref PMap.empty in
+   if for_depends then begin
+      let include_file = get_meta_string_path (t_infos obj).mt_meta Meta.Depend in
+      if (include_file<>"") then
+         types := (PMap.add ( path_of_string include_file ) true !types);
+   end;
    let rec add_type_flag isNative in_path =
       if ( not (PMap.mem in_path !types)) then begin
          types := (PMap.add in_path isNative !types);
@@ -4625,7 +4843,7 @@ let find_referenced_types_flags ctx obj field_name super_deps constructor_deps h
          | _ -> () );
          ) enum_def.e_constrs;
       if (not header_only) then begin
-         let meta = Codegen.build_metadata ctx.ctx_common (TEnumDecl enum_def) in
+         let meta = Texpr.build_metadata ctx.ctx_common.basic (TEnumDecl enum_def) in
          match meta with Some expr -> visit_params expr | _ -> ();
       end;
    in
@@ -4860,6 +5078,7 @@ let generate_enum_files baseCtx enum_def super_deps meta =
       then 0 else 1 in
 
    let ctx = file_context baseCtx cpp_file debug false in
+   let strq = strq ctx.ctx_common in
 
    if (debug>1) then
       print_endline ("Found enum definition:" ^ (join_class_path  class_path "::" ));
@@ -4951,40 +5170,20 @@ let generate_enum_files baseCtx enum_def super_deps meta =
 
    output_cpp "\t::String(null())\n};\n\n";
 
-   (* ENUM - Mark static as used by GC *)
-   output_cpp ("static void " ^ class_name ^ "_sMarkStatics(HX_MARK_PARAMS) {\n");
-   PMap.iter (fun _ constructor ->
-      let name = keyword_remap constructor.ef_name in
-      match constructor.ef_type with
-      | TFun (_,_) -> ()
-      | _ -> output_cpp ("\tHX_MARK_MEMBER_NAME(" ^ class_name ^ "::" ^ name ^ ",\"" ^ name ^ "\");\n") )
-   enum_def.e_constrs;
-   output_cpp "};\n\n";
-
-   (* ENUM - Visit static as used by GC *)
-   output_cpp "#ifdef HXCPP_VISIT_ALLOCS\n";
-   output_cpp ("static void " ^ class_name ^ "_sVisitStatic(HX_VISIT_PARAMS) {\n");
-   output_cpp ("\tHX_VISIT_MEMBER_NAME(" ^ class_name ^ "::__mClass,\"__mClass\");\n");
-   PMap.iter (fun _ constructor ->
-      let name = keyword_remap constructor.ef_name in
-      match constructor.ef_type with
-      | TFun (_,_) -> ()
-      | _ -> output_cpp ("\tHX_VISIT_MEMBER_NAME(" ^ class_name ^ "::" ^ name ^ ",\"" ^ name ^ "\");\n") )
-   enum_def.e_constrs;
-   output_cpp "};\n";
-   output_cpp "#endif\n\n";
+   (* ENUM - Mark static as used by GC - they are const now, so no marking*)
+   (* ENUM - Visit static as used by GC - none *)
 
    output_cpp ("hx::Class " ^ class_name ^ "::__mClass;\n\n");
 
    output_cpp ("Dynamic __Create_" ^ class_name ^ "() { return new " ^ class_name ^ "; }\n\n");
 
    output_cpp ("void " ^ class_name ^ "::__register()\n{\n");
-   let text_name = str (join_class_path class_path ".") in
+   let text_name = strq (join_class_path class_path ".") in
    output_cpp ("\nhx::Static(__mClass) = hx::_hx_RegisterClass(" ^ text_name ^
                ", hx::TCanCast< " ^ class_name ^ " >," ^ class_name ^ "_sStaticFields,0,\n");
    output_cpp ("\t&__Create_" ^ class_name ^ ", &__Create,\n");
-   output_cpp ("\t&super::__SGetClass(), &Create" ^ class_name ^ ", " ^ class_name ^ "_sMarkStatics\n");
-   output_cpp("#ifdef HXCPP_VISIT_ALLOCS\n    , " ^ class_name ^ "_sVisitStatic\n#endif\n");
+   output_cpp ("\t&super::__SGetClass(), &Create" ^ class_name ^ ", 0\n");
+   output_cpp("#ifdef HXCPP_VISIT_ALLOCS\n    , 0\n#endif\n");
    output_cpp ("#ifdef HXCPP_SCRIPTABLE\n    , 0\n#endif\n");
       output_cpp (");\n");
    output_cpp ("\t__mClass->mGetStaticField = &" ^ class_name ^"::__GetStatic;\n");
@@ -5001,8 +5200,8 @@ let generate_enum_files baseCtx enum_def super_deps meta =
       match constructor.ef_type with
       | TFun (_,_) -> ()
       | _ ->
-         output_cpp ( (keyword_remap name) ^ " = hx::CreateEnum< " ^ class_name ^ " >(" ^ (str name) ^  "," ^
-            (string_of_int constructor.ef_index) ^ ",0);\n" )
+         output_cpp ( (keyword_remap name) ^ " = hx::CreateConstEnum< " ^ class_name ^ " >(" ^ (strq name) ^  "," ^
+            (string_of_int constructor.ef_index) ^ ");\n" )
    ) enum_def.e_constrs;
    output_cpp ("}\n\n");
 
@@ -5024,6 +5223,8 @@ let generate_enum_files baseCtx enum_def super_deps meta =
 
    List.iter2 (fun r f -> gen_forward_decl h_file r f) referenced flags;
 
+   output_h ( get_code enum_def.e_meta Meta.HeaderCode );
+
    gen_open_namespace output_h class_path;
 
    output_h "\n\n";
@@ -5036,8 +5237,8 @@ let generate_enum_files baseCtx enum_def super_deps meta =
    output_h ("\t\tstatic void __boot();\n");
    output_h ("\t\tstatic void __register();\n");
    output_h ("\t\tstatic bool __GetStatic(const ::String &inName, Dynamic &outValue, hx::PropertyAccess inCallProp);\n");
-   output_h ("\t\t::String GetEnumName( ) const { return " ^ (str (join_class_path class_path "."))  ^ "; }\n" );
-   output_h ("\t\t::String __ToString() const { return " ^ (str (just_class_name ^ ".") )^ " + _hx_tag; }\n\n");
+   output_h ("\t\t::String GetEnumName( ) const { return " ^ (strq (join_class_path class_path "."))  ^ "; }\n" );
+   output_h ("\t\t::String __ToString() const { return " ^ (strq (just_class_name ^ ".") )^ " + _hx_tag; }\n\n");
 
 
    PMap.iter (fun _ constructor ->
@@ -5071,14 +5272,12 @@ let list_iteri func in_list =
 ;;
 
 let has_new_gc_references ctx class_def =
-   match class_def.cl_dynamic with
-   | Some _ -> true
-   | _ -> (
+   (
       let is_gc_reference field =
       (should_implement_field field) && (is_data_member field) && not (ctx_cant_be_null ctx field.cf_type)
       in
       List.exists is_gc_reference class_def.cl_ordered_fields
-      )
+   )
 ;;
 
 
@@ -5116,7 +5315,7 @@ let variable_field field =
 
 let is_readable class_def field =
    (match field.cf_kind with
-   | Var { v_read = AccNever } when (is_extern_field field) -> false
+   | Var { v_read = AccNever } when not (is_physical_field field) -> false
    | Var { v_read = AccInline } -> false
    | Var _ when is_abstract_impl class_def -> false
    | _ -> true)
@@ -5124,7 +5323,7 @@ let is_readable class_def field =
 
 let is_writable class_def field =
    (match field.cf_kind with
-   | Var { v_write = AccNever } when (is_extern_field field) -> false
+   | Var { v_write = AccNever } when not (is_physical_field field) -> false
    | Var { v_read = AccInline } -> false
    | Var _ when is_abstract_impl class_def -> false
    | _ -> true)
@@ -5134,7 +5333,7 @@ let is_writable class_def field =
 let statics_except_meta class_def = (List.filter (fun static -> static.cf_name <> "__meta__" && static.cf_name <> "__rtti") class_def.cl_ordered_statics);;
 
 let has_set_member_field class_def =
-   implement_dynamic_here class_def || (
+   (
       let reflect_fields = List.filter (reflective class_def) (class_def.cl_ordered_fields) in
       let reflect_writable = List.filter (is_writable class_def) reflect_fields in
       List.exists variable_field reflect_writable
@@ -5150,14 +5349,14 @@ let has_set_static_field class_def =
 
 
 let has_get_fields class_def =
-   implement_dynamic_here class_def || (
+   (
       let is_data_field field = (match follow field.cf_type with | TFun _ -> false | _ -> true) in
       List.exists is_data_field class_def.cl_ordered_fields
    )
 ;;
 
 let has_get_member_field class_def =
-   implement_dynamic_here class_def || (
+   (
       let reflect_fields = List.filter (reflective class_def) (class_def.cl_ordered_fields) in
       List.exists (is_readable class_def) reflect_fields
    )
@@ -5169,6 +5368,9 @@ let has_get_static_field class_def =
       List.exists (is_readable class_def) reflect_fields
 ;;
 
+let has_compare_field class_def =
+    List.exists (fun f -> f.cf_name="__compare") class_def.cl_ordered_fields
+;;
 
 
 let has_boot_field class_def =
@@ -5227,7 +5429,8 @@ let access_str a = match a with
    | AccResolve -> "AccResolve"
    | AccCall -> "AccCall"
    | AccInline -> "AccInline"
-   | AccRequire(_,_) -> "AccRequire" ;;
+   | AccRequire(_,_) -> "AccRequire"
+   | AccCtor -> "AccCtor";;
 
 
 let script_type t optional = if optional then begin
@@ -5236,11 +5439,13 @@ let script_type t optional = if optional then begin
    | _ -> "Object"
    end else match type_string t with
    | "bool" -> "Int"
-   | "int" -> "Int"
+   | "int" | "::cpp::Int32" -> "Int"
    | "Float" -> "Float"
    | "::String" -> "String"
    | "Null" -> "Void"
    | "Void" -> "Void"
+   | "float" | "::cpp::Float32" | "::cpp::Float64" -> "Float"
+   | "::cpp::Int64" | "::cpp::UInt64" -> "Object"
    | _ -> "Object"
 ;;
 
@@ -5402,7 +5607,6 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
    let classIdTxt = Printf.sprintf "0x%08lx" classId in
 
    (* Config *)
-   let implement_dynamic = implement_dynamic_here class_def in
    let override_iteration = (not nativeGen) && (has_new_gc_references baseCtx class_def) in
    let dynamic_interface_closures =  (Common.defined baseCtx.ctx_common Define.DynamicInterfaceClosures) in
 
@@ -5482,43 +5686,49 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
 
    let isContainer = if (has_gc_references common_ctx class_def) then "true" else "false" in
 
+   let can_quick_alloc = can_quick_alloc class_def in
+
    let outputConstructor ctx out isHeader =
       let classScope = if isHeader then "" else class_name ^ "::" in
-      out (ptr_name ^ " " ^ classScope ^ "__new(" ^constructor_type_args ^") {\n");
+      let staticHead = if isHeader then "inline static " else "" in
+      out (staticHead ^ ptr_name ^ " " ^ classScope ^ "__new(" ^constructor_type_args ^") {\n");
       out ("\t" ^ ptr_name ^ " __this = new " ^ class_name ^ "();\n");
          out ("\t__this->__construct(" ^ constructor_args ^ ");\n");
       out ("\treturn __this;\n");
       out ("}\n\n");
 
-      out ((if isHeader then "static " else "") ^ ptr_name ^ " " ^ classScope ^ "__alloc(hx::Ctx *_hx_ctx" ^ (if constructor_type_args="" then "" else "," ^constructor_type_args)  ^") {\n");
-      out ("\t" ^ class_name ^ " *__this = (" ^ class_name ^ "*)(hx::Ctx::alloc(_hx_ctx, sizeof(" ^ class_name ^ "), " ^ isContainer ^", " ^ gcName ^ "));\n");
-      out ("\t*(void **)__this = " ^ class_name ^ "::_hx_vtable;\n");
-      let rec dump_dynamic class_def =
-         if has_dynamic_member_functions class_def then
-            out ("\t" ^ (join_class_path_remap class_def.cl_path "::") ^ "_obj::__alloc_dynamic_functions(_hx_ctx,__this);\n")
-         else match class_def.cl_super with
-         | Some super -> dump_dynamic (fst super)
-         | _ -> ()
-      in
-      dump_dynamic class_def;
-
-      if isHeader then begin
-        match class_def.cl_constructor with
-         | Some ( { cf_expr = Some ( { eexpr = TFunction(function_def) } ) } as definition ) ->
-            let old_debug = ctx.ctx_debug_level in
-            if has_meta_key definition.cf_meta Meta.NoDebug then
-               ctx.ctx_debug_level <- 0;
-            ctx.ctx_real_this_ptr <- false;
-            gen_cpp_function_body ctx class_def false "new" function_def "" "" (has_meta_key definition.cf_meta Meta.NoDebug);
-            out "\n";
-
-            ctx.ctx_debug_level <- old_debug;
-         | _ -> ()
-      end else
-         out ("\t__this->__construct(" ^ constructor_args ^ ");\n");
+      if can_quick_alloc then begin
+         out (staticHead ^ ptr_name ^ " " ^ classScope ^ "__alloc(hx::Ctx *_hx_ctx" ^
+            (if constructor_type_args="" then "" else "," ^constructor_type_args)  ^") {\n");
+         out ("\t" ^ class_name ^ " *__this = (" ^ class_name ^ "*)(hx::Ctx::alloc(_hx_ctx, sizeof(" ^ class_name ^ "), " ^ isContainer ^", " ^ gcName ^ "));\n");
+         out ("\t*(void **)__this = " ^ class_name ^ "::_hx_vtable;\n");
+         let rec dump_dynamic class_def =
+            if has_dynamic_member_functions class_def then
+               out ("\t" ^ (join_class_path_remap class_def.cl_path "::") ^ "_obj::__alloc_dynamic_functions(_hx_ctx,__this);\n")
+            else match class_def.cl_super with
+            | Some super -> dump_dynamic (fst super)
+            | _ -> ()
+         in
+         dump_dynamic class_def;
+
+         if isHeader then begin
+           match class_def.cl_constructor with
+            | Some ( { cf_expr = Some ( { eexpr = TFunction(function_def) } ) } as definition ) ->
+               let old_debug = ctx.ctx_debug_level in
+               if has_meta_key definition.cf_meta Meta.NoDebug then
+                  ctx.ctx_debug_level <- 0;
+               ctx.ctx_real_this_ptr <- false;
+               gen_cpp_function_body ctx class_def false "new" function_def "" "" (has_meta_key definition.cf_meta Meta.NoDebug);
+               out "\n";
+
+               ctx.ctx_debug_level <- old_debug;
+            | _ -> ()
+         end else
+            out ("\t__this->__construct(" ^ constructor_args ^ ");\n");
 
-      out ("\treturn __this;\n");
-      out ("}\n\n");
+         out ("\treturn __this;\n");
+         out ("}\n\n");
+      end;
    in
 
    (* State *)
@@ -5537,6 +5747,7 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
    (*let cpp_file = new_cpp_file common_ctx.file class_path in*)
    let ctx = cpp_ctx in
    let output_cpp = (cpp_file#write) in
+   let strq = strq ctx.ctx_common in
 
    let class_super_name = (match class_def.cl_super with
       | Some (klass, params) -> (tcpp_to_string_suffix "_obj" (cpp_instance_type ctx klass params) )
@@ -5640,17 +5851,19 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
                          *)
                          let castKey = if interface_name="_hx_haxe_IMap" && realName="set" then castKey ^ "*" else castKey in
                          let implementationKey = realName ^ "::" ^ class_implementation in
-                         if castKey <> implementationKey && not (Hashtbl.mem alreadyGlued castKey) then begin
-                            Hashtbl.replace alreadyGlued castKey ();
+                         if castKey <> implementationKey then begin
                             let glue =  Printf.sprintf "%s_%08lx" field.cf_name (gen_hash32 0 cast) in
-                            let argList = ctx_tfun_arg_list ctx true args in
-                            let returnType = ctx_type_string ctx return_type in
-                            let returnStr = if returnType="void" then "" else "return " in
-                            let cppCode = returnType ^ " " ^ class_name ^ "::" ^ glue ^ "(" ^ argList ^ ") {\n" ^
-                               "\t\t\t" ^ returnStr ^ realName ^ "(" ^ cpp_arg_names args ^ ");\n}\n" in
-                            let headerCode = "\t\t" ^ returnType ^ " " ^ glue ^ "(" ^ argList ^ ");\n" in
-                            header_glue := headerCode :: !header_glue;
-                            cpp_glue := cppCode :: !cpp_glue;
+                            if not (Hashtbl.mem alreadyGlued castKey) then begin
+                               Hashtbl.replace alreadyGlued castKey ();
+                               let argList = ctx_tfun_arg_list ctx true args in
+                               let returnType = ctx_type_string ctx return_type in
+                               let returnStr = if returnType="void" then "" else "return " in
+                               let cppCode = returnType ^ " " ^ class_name ^ "::" ^ glue ^ "(" ^ argList ^ ") {\n" ^
+                                  "\t\t\t" ^ returnStr ^ realName ^ "(" ^ cpp_arg_names args ^ ");\n}\n" in
+                               let headerCode = "\t\t" ^ returnType ^ " " ^ glue ^ "(" ^ argList ^ ");\n" in
+                               header_glue := headerCode :: !header_glue;
+                               cpp_glue := cppCode :: !cpp_glue;
+                            end;
                             output_cpp ("	" ^ cast ^ "&" ^ implname ^ "::" ^ glue ^ ",\n");
                          end else
                             output_cpp ("	" ^ cast ^ "&" ^ implname ^ "::" ^ realName ^ ",\n");
@@ -5699,7 +5912,7 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
    | _ -> ());
 
 
-   let dump_field_name = (fun field -> output_cpp ("\t" ^  (str field.cf_name) ^ ",\n")) in
+   let dump_field_name = (fun field -> output_cpp ("\t" ^  (strq field.cf_name) ^ ",\n")) in
 
    List.iter
       (gen_field ctx class_def class_name smart_class_name dot_name false class_def.cl_interface)
@@ -5763,8 +5976,6 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
          (* MARK function - explicitly mark all child pointers *)
          output_cpp ("void " ^ class_name ^ "::__Mark(HX_MARK_PARAMS)\n{\n");
          output_cpp ("\tHX_MARK_BEGIN_CLASS(" ^ smart_class_name ^ ");\n");
-         if (implement_dynamic) then
-            output_cpp "\tHX_MARK_DYNAMIC;\n";
          List.iter (dump_field_iterator "HX_MARK_MEMBER_NAME") implemented_instance_fields;
          (match super_needs_iteration with
          | "" -> ()
@@ -5774,8 +5985,6 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
 
          (* Visit function - explicitly visit all child pointers *)
          output_cpp ("void " ^ class_name ^ "::__Visit(HX_VISIT_PARAMS)\n{\n");
-         if (implement_dynamic) then
-            output_cpp "\tHX_VISIT_DYNAMIC;\n";
          List.iter (dump_field_iterator "HX_VISIT_MEMBER_NAME") implemented_instance_fields;
          (match super_needs_iteration with
          | "" -> ()
@@ -5796,7 +6005,7 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
                   output_cpp ("\tcase " ^ (string_of_int l) ^ ":\n");
                   len_case := l;
                end;
-               output_cpp ("\t\tif (HX_FIELD_EQ(inName,\"" ^  (Ast.s_escape field)  ^ "\") ) { " ^ result ^ " }\n");
+               output_cpp ("\t\tif (HX_FIELD_EQ(inName,\"" ^  (StringHelper.s_escape field)  ^ "\") ) { " ^ result ^ " }\n");
             ) sfields;
             output_cpp "\t}\n";
          end;
@@ -5829,7 +6038,7 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
          let get_field_dat = List.map (fun f ->
             (f.cf_name, String.length f.cf_name,
                (match f.cf_kind with
-               | Var { v_read = AccCall } when is_extern_field f ->
+               | Var { v_read = AccCall } when not (is_physical_field f) ->
                      "if (" ^ (checkPropCall f) ^ ") return " ^ (toVal f ((keyword_remap ("get_" ^ f.cf_name)) ^ "()" ) ) ^ ";"
                | Var { v_read = AccCall } -> "return " ^ (toVal f ((checkPropCall f) ^ " ? " ^ (keyword_remap ("get_" ^ f.cf_name)) ^ "() : " ^
                      ((keyword_remap f.cf_name) ^ (if (variable_field f) then "" else "_dyn()")) ) ) ^ ";"
@@ -5837,8 +6046,6 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
             ) ) )
          in
          dump_quick_field_test (get_field_dat reflect_member_readable);
-         if (implement_dynamic) then
-            output_cpp "\tHX_CHECK_DYNAMIC_GET_FIELD(inName);\n";
          output_cpp ("\treturn super::__Field(inName,inCallProp);\n}\n\n");
 
       end;
@@ -5848,7 +6055,7 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
          let get_field_dat = List.map (fun f ->
             (f.cf_name, String.length f.cf_name,
                (match f.cf_kind with
-               | Var { v_read = AccCall } when is_extern_field f ->
+               | Var { v_read = AccCall } when not (is_physical_field f) ->
                      "if (" ^ (checkPropCall f) ^ ") { outValue = " ^ (toDynamic f (keyword_remap ("get_" ^ f.cf_name) ^ "()")) ^ "; return true; }"
                | Var { v_read = AccCall } -> "outValue = " ^ (toDynamic f ((checkPropCall f) ^ " ? " ^ (keyword_remap ("get_" ^ f.cf_name)) ^ "() : " ^
                      ((keyword_remap f.cf_name) ^ if (variable_field f) then "" else "_dyn()"))) ^ "; return true;";
@@ -5886,19 +6093,14 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
                   let inVal =  "(inValue.Cast< " ^ (castable f) ^ " >())" in
                   let setter = keyword_remap ("set_" ^ f.cf_name) in
                   "if (" ^ (checkPropCall f) ^ ") return " ^ (toVal f (setter ^inVal) ) ^ ";" ^
-                      ( if is_extern_field f then "" else default_action )
+                      ( if not (is_physical_field f) then "" else default_action )
                | _ -> default_action
                )
             )
          ) in
 
          dump_quick_field_test (set_field_dat reflect_write_member_variables);
-         if (implement_dynamic) then begin
-            output_cpp ("\ttry { return super::__SetField(inName,inValue,inCallProp); }\n");
-            output_cpp ("\tcatch(Dynamic e) { HX_DYNAMIC_SET_FIELD(inName,inValue); }\n");
-            output_cpp "\treturn inValue;\n}\n\n";
-         end else
-            output_cpp ("\treturn super::__SetField(inName,inValue,inCallProp);\n}\n\n");
+         output_cpp ("\treturn super::__SetField(inName,inValue,inCallProp);\n}\n\n");
       end;
 
       if (has_set_static_field class_def) then begin
@@ -5914,7 +6116,7 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
                   let inVal = "(ioValue.Cast< " ^ (castable f) ^ " >())" in
                   let setter = keyword_remap ("set_" ^ f.cf_name) in
                   "if (" ^ (checkPropCall f) ^ ")  ioValue = " ^ (toDynamic f (setter ^ inVal) ) ^ ";"
-                      ^ ( if is_extern_field f then "" else " else " ^ default_action )
+                      ^ ( if not (is_physical_field f) then "" else " else " ^ default_action )
                | _ -> default_action
                )
             )
@@ -5930,36 +6132,35 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
       (* For getting a list of data members (eg, for serialization) *)
       if (has_get_fields class_def) then begin
          let append_field =
-            (fun field -> output_cpp ("\toutFields->push(" ^( str field.cf_name )^ ");\n")) in
+            (fun field -> output_cpp ("\toutFields->push(" ^( strq field.cf_name )^ ");\n")) in
          let is_data_field field = (match follow field.cf_type with | TFun _ -> false | _ -> true) in
 
          output_cpp ("void " ^ class_name ^ "::__GetFields(Array< ::String> &outFields)\n{\n");
          List.iter append_field (List.filter is_data_field class_def.cl_ordered_fields);
-         if (implement_dynamic) then
-            output_cpp "\tHX_APPEND_DYNAMIC_FIELDS(outFields);\n";
          output_cpp "\tsuper::__GetFields(outFields);\n";
          output_cpp "};\n\n";
       end;
 
-      let storage field = match type_string field.cf_type with
-         | "bool" -> "hx::fsBool"
-         | "int" -> "hx::fsInt"
-         | "Float" -> "hx::fsFloat"
-         | "::String" -> "hx::fsString"
-         | str -> "hx::fsObject" ^ " /*" ^ str ^ "*/ "
+      let storage field = match (cpp_type_of ctx field.cf_type) with
+         | TCppScalar("bool") -> "hx::fsBool"
+         | TCppScalar("int") -> "hx::fsInt"
+         | TCppScalar("Float") -> "hx::fsFloat"
+         | TCppString -> "hx::fsString"
+         | o when is_object_element ctx o -> "hx::fsObject" ^ " /* " ^ (tcpp_to_string o ) ^ " */ "
+         | u -> "hx::fsUnknown" ^ " /* " ^ (tcpp_to_string u) ^ " */ "
          in
       let dump_member_storage = (fun field ->
          output_cpp ("\t{" ^ (storage field) ^ ",(int)offsetof(" ^ class_name ^"," ^ (keyword_remap field.cf_name) ^")," ^
-            (str field.cf_name) ^ "},\n")
+            (strq field.cf_name) ^ "},\n")
          )
       in
       let dump_static_storage = (fun field ->
          output_cpp ("\t{" ^ (storage field) ^ ",(void *) &" ^ class_name ^"::" ^ (keyword_remap field.cf_name) ^"," ^
-            (str field.cf_name) ^ "},\n")
+            (strq field.cf_name) ^ "},\n")
          )
       in
 
-      output_cpp "#if HXCPP_SCRIPTABLE\n";
+      output_cpp "#ifdef HXCPP_SCRIPTABLE\n";
 
       let stored_fields = List.filter is_data_member implemented_instance_fields in
       if ( (List.length stored_fields) > 0) then begin
@@ -5990,10 +6191,11 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
       "0 /* sMemberFields */";
    in
 
-   if (not nativeGen) then begin
+   let hasMarkFunc = (not nativeGen) && (List.exists is_data_member implemented_fields) in
+
+   if (hasMarkFunc) then begin
       (* Mark static variables as used *)
       output_cpp ("static void " ^ class_name ^ "_sMarkStatics(HX_MARK_PARAMS) {\n");
-      output_cpp ("\tHX_MARK_MEMBER_NAME(" ^ class_name ^ "::__mClass,\"__mClass\");\n");
       List.iter (fun field ->
          if (is_data_member field) then
             output_cpp ("\tHX_MARK_MEMBER_NAME(" ^ class_name ^ "::" ^ (keyword_remap field.cf_name) ^ ",\"" ^  field.cf_name ^ "\");\n") )
@@ -6003,7 +6205,6 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
       (* Visit static variables *)
       output_cpp "#ifdef HXCPP_VISIT_ALLOCS\n";
       output_cpp ("static void " ^ class_name ^ "_sVisitStatics(HX_VISIT_PARAMS) {\n");
-      output_cpp ("\tHX_VISIT_MEMBER_NAME(" ^ class_name ^ "::__mClass,\"__mClass\");\n");
       List.iter (fun field ->
          if (is_data_member field) then
             output_cpp ("\tHX_VISIT_MEMBER_NAME(" ^ class_name ^ "::" ^ (keyword_remap field.cf_name) ^ ",\"" ^  field.cf_name ^ "\");\n") )
@@ -6015,22 +6216,38 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
    let generate_script_function isStatic field scriptName callName =
       match follow field.cf_type  with
       | TFun (args,return_type) when not (is_data_member field) ->
+         let isTemplated = not isStatic && not class_def.cl_interface in
+         if isTemplated then output_cpp ("\ntemplate<bool _HX_SUPER=false>");
          output_cpp ("\nstatic void CPPIA_CALL " ^ scriptName ^ "(hx::CppiaCtx *ctx) {\n");
-         let ret = script_signature return_type false in
+         let ret = match cpp_type_of ctx return_type with TCppScalar("bool") -> "b" | _ -> script_signature return_type false in
          if (ret<>"v") then output_cpp ("ctx->return" ^ (script_type return_type false) ^ "(");
-         if class_def.cl_interface then begin
-            output_cpp (class_name ^ "::" ^ callName ^ "(ctx->getThis()" ^ (if (List.length args) > 0 then "," else ""));
-         end else if isStatic then
-            output_cpp (class_name ^ "::" ^ callName ^ "(")
-         else
-            output_cpp ("((" ^  class_name ^ "*)ctx->getThis())->" ^  callName ^ "(");
 
-         let (signature,_,_) = List.fold_left (fun (signature,sep,size) (_,opt,t) ->
-            output_cpp (sep ^ "ctx->get" ^ (script_type t opt) ^ "(" ^ size ^ ")");
-            (signature ^ (script_signature t opt ), ",", (size^"+sizeof(" ^ (script_size_type t opt) ^ ")") ) ) (ret,"","sizeof(void*)")  args
+
+         let dump_call cast =
+            if class_def.cl_interface then begin
+               output_cpp (class_name ^ "::" ^ callName ^ "(ctx->getThis()" ^ (if (List.length args) > 0 then "," else ""));
+            end else if isStatic then
+               output_cpp (class_name ^ "::" ^ callName ^ "(")
+            else
+               output_cpp ("((" ^  class_name ^ "*)ctx->getThis())->" ^ cast ^ callName ^ "(");
+
+            let (signature,_,_) = List.fold_left (fun (signature,sep,size) (_,opt,t) ->
+               output_cpp (sep ^ "ctx->get" ^ (script_type t opt) ^ "(" ^ size ^ ")");
+               (signature ^ (script_signature t opt ), ",", (size^"+sizeof(" ^ (script_size_type t opt) ^ ")") ) ) (ret,"","sizeof(void*)")  args
+            in
+            output_cpp ")";
+            signature
+         in
+         let signature =
+            if isTemplated then begin
+               output_cpp (" _HX_SUPER ? ");
+               ignore( dump_call (class_name ^ "::") );
+               output_cpp (" : ");
+               dump_call ""
+            end else
+               dump_call "";
          in
 
-         output_cpp ")";
          if (ret<>"v") then output_cpp (")");
          output_cpp (";\n}\n");
          signature;
@@ -6095,7 +6312,7 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
       let new_sctipt_functions = if newInteface then
             all_virtual_functions class_def
          else
-            current_virtual_functions class_def
+            List.rev (current_virtual_functions_rev class_def [])
       in
       let sctipt_name = class_name ^ "__scriptable" in
 
@@ -6114,8 +6331,7 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
             output_cpp ("   HX_DEFINE_SCRIPTABLE_INTERFACE\n")
          else begin
             output_cpp ("   HX_DEFINE_SCRIPTABLE(HX_ARR_LIST" ^ (string_of_int (List.length constructor_var_list) ) ^ ")\n");
-            if (not implement_dynamic) then
-               output_cpp "\tHX_DEFINE_SCRIPTABLE_DYNAMIC;\n";
+            output_cpp "\tHX_DEFINE_SCRIPTABLE_DYNAMIC;\n";
          end;
       end;
 
@@ -6139,14 +6355,20 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
          in
          List.iter dump_script_static class_def.cl_ordered_statics;
 
+         output_cpp "#ifndef HXCPP_CPPIA_SUPER_ARG\n";
+         output_cpp "#define HXCPP_CPPIA_SUPER_ARG(x)\n";
+         output_cpp "#endif\n";
          output_cpp "static hx::ScriptNamedFunction __scriptableFunctions[] = {\n";
-         let dump_func f isStaticFlag = 
+         let dump_func f isStaticFlag =
             let s = try Hashtbl.find sigs f.cf_name with Not_found -> "v" in
-            output_cpp ("  hx::ScriptNamedFunction(\"" ^ f.cf_name ^ "\",__s_" ^ f.cf_name ^ ",\"" ^ s ^ "\", " ^ isStaticFlag ^ " ),\n" )
+            output_cpp ("  hx::ScriptNamedFunction(\"" ^ f.cf_name ^ "\",__s_" ^ f.cf_name ^ ",\"" ^ s ^ "\", " ^ isStaticFlag ^ " " );
+            let superCall = if (isStaticFlag="true") || class_def.cl_interface then "0" else ("__s_" ^ f.cf_name ^ "<true>") in
+            output_cpp ("HXCPP_CPPIA_SUPER_ARG(" ^ superCall ^")" );
+            output_cpp (" ),\n" )
          in
          List.iter (fun (f,_,_) -> dump_func f "false") new_sctipt_functions;
          List.iter (fun f -> dump_func f "true") static_functions;
-         output_cpp "  hx::ScriptNamedFunction(0,0,0) };\n";
+         output_cpp "  hx::ScriptNamedFunction(0,0,0 HXCPP_CPPIA_SUPER_ARG(0) ) };\n";
       end else
          output_cpp "static hx::ScriptNamedFunction *__scriptableFunctions = 0;\n";
 
@@ -6189,10 +6411,10 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
       in
 
       output_cpp ("void " ^ class_name ^ "::__register()\n{\n");
-      output_cpp ("\thx::Object *dummy = new " ^ class_name ^ ";\n");
-      output_cpp ("\t" ^ class_name ^ "::_hx_vtable = *(void **)dummy;\n");
+      output_cpp ("\t" ^ class_name ^ " _hx_dummy;\n");
+      output_cpp ("\t" ^ class_name ^ "::_hx_vtable = *(void **)&_hx_dummy;\n");
       output_cpp ("\thx::Static(__mClass) = new hx::Class_obj();\n");
-      output_cpp ("\t__mClass->mName = " ^  (str class_name_text)  ^ ";\n");
+      output_cpp ("\t__mClass->mName = " ^  (strq class_name_text)  ^ ";\n");
       output_cpp ("\t__mClass->mSuper = &super::__SGetClass();\n");
       output_cpp ("\t__mClass->mConstructEmpty = &__CreateEmpty;\n");
       output_cpp ("\t__mClass->mConstructArgs = &__Create;\n");
@@ -6200,11 +6422,13 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
          if (has_get_static_field class_def) then class_name ^ "::__GetStatic;\n" else "hx::Class_obj::GetNoStaticField;\n" ));
       output_cpp ("\t__mClass->mSetStaticField = &" ^ (
          if (has_set_static_field class_def) then class_name ^ "::__SetStatic;\n" else "hx::Class_obj::SetNoStaticField;\n" ));
-      output_cpp ("\t__mClass->mMarkFunc = " ^ class_name ^ "_sMarkStatics;\n");
+      if hasMarkFunc then
+         output_cpp ("\t__mClass->mMarkFunc = " ^ class_name ^ "_sMarkStatics;\n");
       output_cpp ("\t__mClass->mStatics = hx::Class_obj::dupFunctions(" ^ sStaticFields ^ ");\n");
       output_cpp ("\t__mClass->mMembers = hx::Class_obj::dupFunctions(" ^ sMemberFields ^ ");\n");
       output_cpp ("\t__mClass->mCanCast = hx::TCanCast< " ^ class_name ^ " >;\n");
-      output_cpp ("#ifdef HXCPP_VISIT_ALLOCS\n\t__mClass->mVisitFunc = " ^ class_name ^ "_sVisitStatics;\n#endif\n");
+      if hasMarkFunc then
+         output_cpp ("#ifdef HXCPP_VISIT_ALLOCS\n\t__mClass->mVisitFunc = " ^ class_name ^ "_sVisitStatics;\n#endif\n");
       output_cpp ("#ifdef HXCPP_SCRIPTABLE\n\t__mClass->mMemberStorageInfo = " ^ class_name ^ "_sMemberStorageInfo;\n#endif\n");
       output_cpp ("#ifdef HXCPP_SCRIPTABLE\n\t__mClass->mStaticStorageInfo = " ^ class_name ^ "_sStaticStorageInfo;\n#endif\n");
       output_cpp ("\thx::_hx_RegisterClass(__mClass->mName, __mClass);\n");
@@ -6220,13 +6444,14 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
       output_cpp ("void " ^ class_name ^ "::__register()\n{\n");
 
       output_cpp ("\thx::Static(__mClass) = new hx::Class_obj();\n");
-      output_cpp ("\t__mClass->mName = " ^  (str class_name_text)  ^ ";\n");
+      output_cpp ("\t__mClass->mName = " ^  (strq class_name_text)  ^ ";\n");
       output_cpp ("\t__mClass->mSuper = &super::__SGetClass();\n");
-      output_cpp ("\t__mClass->mMarkFunc = " ^ class_name ^ "_sMarkStatics;\n");
-      (*output_cpp ("\t__mClass->mStatics = hx::Class_obj::dupFunctions(" ^ sStaticFields ^ ");\n");*)
+      if hasMarkFunc then
+         output_cpp ("\t__mClass->mMarkFunc = " ^ class_name ^ "_sMarkStatics;\n");
       output_cpp ("\t__mClass->mMembers = hx::Class_obj::dupFunctions(" ^ sMemberFields ^ ");\n");
       output_cpp ("\t__mClass->mCanCast = hx::TIsInterface< (int)" ^ (cpp_class_hash class_def)  ^ " >;\n");
-      output_cpp ("#ifdef HXCPP_VISIT_ALLOCS\n\t__mClass->mVisitFunc = " ^ class_name ^ "_sVisitStatics;\n#endif\n");
+      if hasMarkFunc then
+         output_cpp ("#ifdef HXCPP_VISIT_ALLOCS\n\t__mClass->mVisitFunc = " ^ class_name ^ "_sVisitStatics;\n#endif\n");
       output_cpp ("\thx::_hx_RegisterClass(__mClass->mName, __mClass);\n");
       if (scriptable) then
          output_cpp ("  HX_SCRIPTABLE_REGISTER_INTERFACE(\""^class_name_text^"\"," ^ class_name ^ ");\n");
@@ -6272,6 +6497,7 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
 
    let h_file = new_header_file common_ctx common_ctx.file class_path in
    let ctx = file_context baseCtx h_file debug true in
+   let strq = strq ctx.ctx_common in
 
 
    let parent,super = match class_def.cl_super with
@@ -6361,7 +6587,9 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
          outputConstructor ctx (fun str -> output_h ("\t\t" ^ str) ) true
       end else begin
          output_h ("\t\tstatic " ^ptr_name^ " __new(" ^constructor_type_args ^");\n");
-         output_h ("\t\tstatic " ^ptr_name^ " __alloc(hx::Ctx *_hx_ctx" ^ (if constructor_type_args="" then "" else "," ^constructor_type_args)  ^");\n");
+         if can_quick_alloc then
+             output_h ("\t\tstatic " ^ptr_name^ " __alloc(hx::Ctx *_hx_ctx" ^
+                 (if constructor_type_args="" then "" else "," ^constructor_type_args)  ^");\n");
       end;
       output_h ("\t\tstatic void * _hx_vtable;\n");
       output_h ("\t\tstatic Dynamic __CreateEmpty();\n");
@@ -6383,8 +6611,10 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
       if (has_get_fields class_def) then
          output_h ("\t\tvoid __GetFields(Array< ::String> &outFields);\n");
 
-      if (implement_dynamic) then
-         output_h ("\t\tHX_DECLARE_IMPLEMENT_DYNAMIC;\n");
+      if (has_compare_field class_def) then
+         output_h ("\t\tint __Compare(const hx::Object *inRHS) const { " ^
+                           "return const_cast<" ^ class_name ^ " *>(this)->__compare(Dynamic((hx::Object *)inRHS)); }\n");
+
       output_h ("\t\tstatic void __register();\n");
       if (override_iteration) then begin
          output_h ("\t\tvoid __Mark(HX_MARK_PARAMS);\n");
@@ -6417,7 +6647,7 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
 
       if (has_init_field class_def) then
          output_h "\t\tstatic void __init__();\n\n";
-      output_h ("\t\t::String __ToString() const { return " ^ (str smart_class_name) ^ "; }\n\n");
+      output_h ("\t\t::String __ToString() const { return " ^ (strq smart_class_name) ^ "; }\n\n");
    end else if not nativeGen then begin
       output_h ("\t\tHX_DO_INTERFACE_RTTI;\n\n");
    end else begin
@@ -6463,8 +6693,8 @@ let generate_class_files baseCtx super_deps constructor_deps class_def inScripta
   generate_class_header ()
 ;;
 
-let generate_class_deps ctx class_def super_deps constructor_deps =
-   find_referenced_types ctx (TClassDecl class_def) super_deps constructor_deps false true false
+let generate_class_deps ctx class_def super_deps constructor_deps scriptable =
+   find_referenced_types ctx (TClassDecl class_def) super_deps constructor_deps false true scriptable
 ;;
 
 
@@ -6479,7 +6709,7 @@ let write_resources common_ctx =
       let resource_file = new_cpp_file common_ctx common_ctx.file (["resources"],id) in
       resource_file#write "namespace hx {\n";
       resource_file#write_i ("unsigned char " ^ id ^ "[] = {\n");
-      resource_file#write_i "0xff, 0xff, 0xff, 0xff,\n";
+      resource_file#write_i "0x80, 0x00, 0x00, 0x80,\n";
       for i = 0 to String.length data - 1 do
       let code = Char.code (String.unsafe_get data i) in
          resource_file#write  (Printf.sprintf "%d," code);
@@ -6511,7 +6741,7 @@ let write_resources common_ctx =
    Hashtbl.iter (fun name data ->
       let id = "__res_" ^ (string_of_int !idx) in
       resource_file#write_i
-         ("{ " ^ (str name) ^ "," ^ (string_of_int (String.length data)) ^ "," ^
+         ("{ " ^ (strq common_ctx name) ^ "," ^ (string_of_int (String.length data)) ^ "," ^
             "hx::" ^ id ^ " + 4 },\n");
       incr idx;
    ) common_ctx.resources;
@@ -6550,8 +6780,8 @@ let write_build_data common_ctx filename classes main_deps boot_deps build_extra
    in
 
    output_string buildfile "<xml>\n";
-   output_string buildfile ("<set name=\"HXCPP_API_LEVEL\" value=\"" ^
-            (Common.defined_value common_ctx Define.HxcppApiLevel) ^ "\" />\n");
+   let api_string = (Common.defined_value common_ctx Define.HxcppApiLevel) in
+   output_string buildfile ("<set name=\"HXCPP_API_LEVEL\" value=\"" ^ api_string ^ "\" />\n");
    output_string buildfile "<files id=\"haxe\">\n";
    output_string buildfile "<compilerflag value=\"-Iinclude\"/>\n";
    List.iter add_classdef_to_buildfile classes;
@@ -6583,6 +6813,8 @@ let write_build_data common_ctx filename classes main_deps boot_deps build_extra
    output_string buildfile ("<set name=\"HAXE_OUTPUT\" value=\"" ^ exe_name ^ "\" />\n");
    output_string buildfile "<include name=\"${HXCPP}/build-tool/BuildCommon.xml\"/>\n";
    output_string buildfile build_extra;
+   if (Common.defined common_ctx Define.HxcppSmartStings) then
+      output_string buildfile ("<error value=\"Hxcpp is out of date - please update\" unlessApi=\"400\" />\n");
    output_string buildfile "</xml>\n";
    close_out buildfile;;
 
@@ -6652,9 +6884,22 @@ let is_assign_op op =
    | _ -> false
 ;;
 
+
+
+
+
+(*
+  ------------------ CPPIA ----------------------------------------
+*)
+
+
+
+
+
+
 let rec script_type_string haxe_type =
    match haxe_type with
-   | TType ({ t_path = ([],"Null") },[t]) ->
+   | TAbstract ({ a_path = ([],"Null") },[t]) ->
       (match follow t with
       | TAbstract ({ a_path = [],"Int" },_)
       | TAbstract ({ a_path = [],"Float" },_)
@@ -6690,6 +6935,45 @@ let rec script_type_string haxe_type =
          type_string_suff "" haxe_type false
 ;;
 
+
+let rec script_cpptype_string cppType = match cppType with
+   | TCppDynamic
+   | TCppUnchanged
+   | TCppWrapped _
+   | TCppObject -> "Dynamic"
+   | TCppObjectPtr -> ".*.hx.Object*"
+   | TCppReference t -> ".ref." ^ (script_cpptype_string t)
+   | TCppStruct t -> ".struct." ^ (script_cpptype_string t)
+   | TCppStar(t,_) -> "*." ^ (script_cpptype_string t)
+   | TCppVoid -> "void"
+   | TCppVoidStar -> "*.void"
+   | TCppRest _ -> "vaarg_list"
+   | TCppVarArg -> "vararg"
+   | TCppAutoCast -> ".cpp.AutoCast"
+   | TCppVariant -> ".cpp.Variant"
+   | TCppEnum(enum) -> (join_class_path enum.e_path ".")
+   | TCppScalar(scalar) -> scalar
+   | TCppString -> "String"
+   | TCppFastIterator it -> "cpp.FastIterator." ^ (script_cpptype_string it)
+   | TCppPointer(_,valueType) -> "cpp.Pointer." ^ (script_cpptype_string valueType)
+   | TCppRawPointer(_,valueType) -> "cpp.RawPointer." ^ (script_cpptype_string valueType)
+   | TCppFunction _ -> "cpp.Function"
+   | TCppObjCBlock _ -> "cpp.ObjCBlock"
+   | TCppDynamicArray -> "Array.Any"
+   | TCppObjectArray _ -> "Array.Object"
+   | TCppScalarArray(value) -> "Array." ^ (script_cpptype_string value)
+   | TCppObjC _ -> "cpp.ObjC"
+   | TCppProtocol _ -> "cpp.ObjC.Protocol"
+   | TCppNativePointer klass -> "cpp.Pointer." ^ (join_class_path klass.cl_path ".")
+   | TCppInterface klass -> (join_class_path klass.cl_path ".")
+   | TCppInst klass -> (join_class_path klass.cl_path ".")
+   | TCppClass -> "Class"
+   | TCppGlobal -> "?global";
+   | TCppNull -> "null";
+   | TCppCode _ -> "Dynamic"
+;;
+
+
 type array_of =
    | ArrayInterface of int
    | ArrayData of string
@@ -6890,6 +7174,7 @@ let cppia_op_info = function
 	| IaBinOp OpMod -> ("%", 120)
 	| IaBinOp OpInterval -> ("...", 121)
 	| IaBinOp OpArrow -> ("=>", 122)
+	| IaBinOp OpIn -> (" in ", 123)
 	| IaBinOp OpAssignOp OpAdd -> ("+=", 201)
 	| IaBinOp OpAssignOp OpMult -> ("*=", 202)
 	| IaBinOp OpAssignOp OpDiv -> ("/=", 203)
@@ -6906,6 +7191,7 @@ let cppia_op_info = function
 	| IaBinOp OpAssignOp OpShl -> ("<<=", 219)
 	| IaBinOp OpAssignOp OpMod -> ("%=", 220)
 
+	| IaBinOp OpAssignOp OpIn
 	| IaBinOp OpAssignOp OpInterval
 	| IaBinOp OpAssignOp OpAssign
 	| IaBinOp OpAssignOp OpEq
@@ -6919,6 +7205,8 @@ let cppia_op_info = function
 	| IaTCast -> ("TCAST", 221)
 ;;
 
+
+
 class script_writer ctx filename asciiOut =
    object(this)
    val debug = asciiOut
@@ -6933,6 +7221,7 @@ class script_writer ctx filename asciiOut =
    val identTable = Hashtbl.create 0
    val fileTable = Hashtbl.create 0
    val identBuffer = Buffer.create 0
+   val cppiaAst = not (Common.defined ctx.ctx_common Define.NoCppiaAst)
 
    method stringId name =
       try ( Hashtbl.find identTable name )
@@ -6981,20 +7270,26 @@ class script_writer ctx filename asciiOut =
    method comment text = if doComment then this#write ("# " ^ text ^ "\n")
    method commentOf text = if doComment then " # " ^ text else ""
    method typeTextString typeName = (string_of_int (this#typeId typeName)) ^ " "
-   method typeText typeT = (string_of_int (this#typeId (script_type_string typeT))) ^ " "
+   method typeText typeT =
+      let tname = if cppiaAst then script_cpptype_string (cpp_type_of ctx typeT) else script_type_string typeT in
+      (string_of_int (this#typeId tname)) ^ " "
+   method astType cppType = (string_of_int (this#typeId (script_cpptype_string cppType))) ^ " "
    method writeType typeT = this#write (this#typeText typeT)
+   method toCppType etype = (string_of_int (this#typeId (script_cpptype_string (cpp_type_of ctx etype) ))) ^ " "
    method boolText value = if value then "1" else "0"
    method writeBool value = this#write (if value then "1 " else "0 ")
    method staticText value = if value then "1" else "0"
    method writeData str = Buffer.add_string buffer str;
    method wint ival = this#write ((string_of_int ival)^" ")
    method ident name = this#wint (this#stringId name)
+   method cppInstText clazz = match clazz.cl_path with
+      | ([],"Array") -> this#typeTextString "Array"
+      | x -> this#typeTextString (join_class_path x ".")
    method instText clazz = match clazz.cl_path with
       | ([],"Array") -> string_of_int (this#typeId "Array< ::Dynamic >") ^ " "
       | _ -> this#typeText (TInst(clazz,[]))
-   method instName clazz = this#write (this#instText clazz)
+   method instName clazz = this#write (if cppiaAst then (this#cppInstText clazz) else (this#instText clazz))
    method enumText e = this#typeText (TEnum(e,[]))
-   method enumName e = this#write (this#enumText e)
    method close =
       let out_file = open_out_bin filename in
       output_string out_file (if asciiOut then "CPPIA\n" else "CPPIB\n");
@@ -7073,7 +7368,19 @@ class script_writer ctx filename asciiOut =
       this#write "\n";
       if (not isInterface) then begin
          match fieldExpression with
-         | Some ({ eexpr = TFunction function_def } as e) -> this#gen_expression e
+         | Some ({ eexpr = TFunction function_def } as e) ->
+            if cppiaAst  then begin
+               let args = List.map fst function_def.tf_args in
+               let cppExpr = retype_expression ctx TCppVoid args function_def.tf_type function_def.tf_expr false in
+               this#begin_expr;
+               this#writePos function_def.tf_expr;
+               this#write ( (this#op IaFun) ^ (this#typeText function_def.tf_type) ^ (string_of_int (List.length args)) ^ "\n" );
+               let close = this#gen_func_args function_def.tf_args in
+               this#gen_expression_tree cppExpr;
+               this#end_expr;
+               close()
+            end else
+               this#gen_expression e
          | _ -> print_endline ("Missing function body for " ^ funcName );
       end
    method var readAcc writeAcc isExtern isStatic name varType varExpr =
@@ -7082,7 +7389,13 @@ class script_writer ctx filename asciiOut =
          (match varExpr with Some _ -> "1" | _ -> "0" )  ^
          (if doComment then (" # " ^ name ^ "\n") else "\n") );
       match varExpr with
-      | Some expression -> this#gen_expression expression
+      | Some expression ->
+            if cppiaAst then begin
+               let varType = cpp_type_of ctx expression.etype in
+               let cppExpr = retype_expression ctx varType [] t_dynamic expression false in
+               this#gen_expression_tree cppExpr
+            end else
+               this#gen_expression expression
       | _ -> ()
    method implDynamic = this#writeOpLine IaImplDynamic;
    method writeVar v =
@@ -7091,8 +7404,10 @@ class script_writer ctx filename asciiOut =
       this#writeBool v.v_capture;
       this#writeType v.v_type;
    method writeList prefix len = this#write (prefix ^" "  ^ (string_of_int (len)) ^ "\n");
-   method writePos expr = if debug then
-      this#write ( (this#fileText expr.epos.pfile) ^ "\t" ^ (string_of_int (Lexer.get_error_line expr.epos) ) ^ indent);
+   method wpos p = if debug then
+      this#write ( (this#fileText p.pfile) ^ "\t" ^ (string_of_int (Lexer.get_error_line p) ) ^ indent);
+   method writePos expr = this#wpos expr.epos
+   method writeCppPos expr = this#wpos expr.cpppos
    method checkCast toType expr forceCast fromGenExpression=
    let write_cast text =
       if (not fromGenExpression) then
@@ -7155,23 +7470,73 @@ class script_writer ctx filename asciiOut =
       end;
       this#gen_expression expr;
    end
+
+   method gen_func_args args =
+      let gen_inits = ref [] in
+      List.iter (fun(arg,init) ->
+         this#write (indent ^ indent_str );
+         this#writeVar arg;
+         match init with
+         | Some ({eexpr = TConst TNull}) -> this#write "0\n"
+         | Some const ->
+            let argType = (cpp_type_of ctx const.etype) in
+            if (is_cpp_scalar argType || argType==TCppString ) then begin
+               this#write ("1 ");
+               this#gen_expression_only const;
+               this#write "\n";
+            end else begin
+               gen_inits := (arg, const) :: !gen_inits;
+               this#write "0\n";
+            end
+         | _ -> this#write "0\n";
+      ) args;
+
+      if (List.length !gen_inits)==0  then begin
+         fun () -> ( )
+      end else begin
+         this#begin_expr;
+         this#writePos (snd (List.hd !gen_inits) );
+         this#writeList (this#op IaBlock) ((List.length !gen_inits) + 1);
+         List.iter (fun(arg,const) ->
+            let start_expr( ) = this#begin_expr; this#writePos const; in
+            let local_var( ) =
+               this#begin_expr;
+               this#writePos const;
+               this#write ((this#op IaVar) ^ (string_of_int arg.v_id) ^ (this#commentOf arg.v_name) );
+               this#end_expr;
+            in
+
+            start_expr();
+            this#writeOpLine IaIf;
+               start_expr();
+               this#writeOpLine IaIsNull;
+                  local_var();
+               this#end_expr;
+               start_expr();
+               this#writeOpLine IaSet;
+                  local_var();
+                  this#gen_expression const;
+               this#end_expr;
+            this#begin_expr;
+         ) !gen_inits;
+         fun () -> this#end_expr;
+      end
+
    method gen_expression expr =
+      this#begin_expr;
+      this#writePos expr;
+      this#gen_expression_only expr;
+      this#end_expr;
+
+   method gen_expression_only expr = (* { *)
    let expression = remove_parens expr in
-   this#begin_expr;
-   (*this#write ( (this#fileText expression.epos.pfile) ^ "\t" ^ (string_of_int (Lexer.get_error_line expression.epos) ) ^ indent);*)
-   this#writePos expression;
    (match expression.eexpr with
    | TFunction function_def -> this#write ( (this#op IaFun) ^ (this#typeText function_def.tf_type) ^ (string_of_int (List.length function_def.tf_args)) ^ "\n" );
-         List.iter (fun(arg,init) ->
-            this#write (indent ^ indent_str );
-            this#writeVar arg;
-            match init with
-            | Some const -> this#write ("1 " ^ (this#constText const) ^ "\n")
-            | _ -> this#write "0\n";
-         ) function_def.tf_args;
+         let close = this#gen_func_args function_def.tf_args in
          let pop = this#pushReturn function_def.tf_type in
          this#gen_expression function_def.tf_expr;
          pop ();
+         close()
    | TBlock expr_list -> this#writeList (this#op IaBlock) (List.length expr_list);
          List.iter this#gen_expression expr_list;
    | TConst const -> this#write (this#constText const)
@@ -7213,7 +7578,7 @@ class script_writer ctx filename asciiOut =
       let argN = (string_of_int (List.length arg_list)) ^ " " in
       let gen_call () =
          (match (remove_parens_cast func).eexpr with
-         | TField ( { eexpr = TLocal  { v_name = "__global__" }}, field ) ->
+         | TField ( { eexpr = TIdent "__global__" }, field ) ->
                   this#write ( (this#op IaCallGlobal) ^ (this#stringText (field_name field)) ^ argN ^ (this#commentOf (field_name field)) ^ "\n");
          | TField (obj,FStatic (class_def,field) ) when is_real_function field ->
                   this#write ( (this#op IaCallStatic) ^ (this#instText class_def) ^ " " ^ (this#stringText field.cf_name) ^
@@ -7347,16 +7712,16 @@ class script_writer ctx filename asciiOut =
               this#checkCast return_type value false false;
          )
    | TObjectDecl (
-      ("fileName" , { eexpr = (TConst (TString file)) }) ::
-         ("lineNumber" , { eexpr = (TConst (TInt line)) }) ::
-            ("className" , { eexpr = (TConst (TString class_name)) }) ::
-               ("methodName", { eexpr = (TConst (TString meth)) }) :: [] ) ->
+      (("fileName",_,_) , { eexpr = (TConst (TString file)) }) ::
+         (("lineNumber",_,_) , { eexpr = (TConst (TInt line)) }) ::
+            (("className",_,_) , { eexpr = (TConst (TString class_name)) }) ::
+               (("methodName",_,_), { eexpr = (TConst (TString meth)) }) :: [] ) ->
             this#write ( (this#op IaPosInfo) ^ (this#stringText file) ^ (Printf.sprintf "%ld" line) ^ " " ^
                         (this#stringText class_name) ^ " " ^  (this#stringText meth))
 
    | TObjectDecl values ->this#write ( (this#op IaObjDef) ^ (string_of_int (List.length values)));
          this#write " ";
-         List.iter (fun (name,_) -> this#write (this#stringText name)  ) values;
+         List.iter (fun ((name,_,_),_) -> this#write (this#stringText name)  ) values;
          this#write "\n";
          List.iter (fun (_,e) -> this#gen_expression e ) values;
    | TTypeExpr type_expr ->
@@ -7377,6 +7742,9 @@ class script_writer ctx filename asciiOut =
          in
          this#write ( (this#op IaEnumI) ^ (this#typeText (TEnum(enum,[])) ) ^ (string_of_int i) ^ "\n");
          this#gen_expression expr;
+   | TEnumIndex expr ->
+         this#write ( (this#op IaCallMember) ^ (this#typeTextString "hx::EnumBase") ^ " " ^ (this#stringText "__Index") ^ "0" ^ (this#commentOf ("Enum index") ) ^ "\n");
+         this#gen_expression expr;
    | TSwitch (condition,cases,optional_default)  ->
          this#write ( (this#op IaSwitch) ^ (string_of_int (List.length cases)) ^ " " ^
                            (match optional_default with None -> "0" | Some _ -> "1") ^ "\n");
@@ -7402,10 +7770,370 @@ class script_writer ctx filename asciiOut =
    | TCast (cast,_) -> this#checkCast expression.etype cast true true;
    | TParenthesis _ -> abort "Unexpected parens" expression.epos
    | TMeta(_,_) -> abort "Unexpected meta" expression.epos
+   | TIdent _ -> abort "Unexpected ident" expression.epos
    );
-   this#end_expr;
+   (* } *)
+   method gen_expression_tree expression_tree = (* { *)
+      let rec gen_expression expression =
+      begin
+         this#begin_expr;
+         this#writeCppPos expression;
+         let rec match_expr expression = match expression.cppexpr with
+         | CppBlock(exprs,closures,_) ->
+            this#writeList (this#op IaBlock) (List.length exprs);
+            List.iter gen_expression exprs;
+
+         | CppVarDecl(var,init) ->
+            let name =  cpp_var_name_of var in
+            this#write ( (this#op IaTVars) ^ (string_of_int (1)) ^ (this#commentOf (name ^ ":" ^ (script_type_string var.v_type)) ) ^ "\n");
+            this#write ("\t\t" ^ indent);
+            (match init with
+            | None -> this#writeOp IaVarDecl; this#writeVar var;
+            | Some init ->this#writeOp IaVarDeclI;
+                this#writeVar var;
+                this#write (" " ^ (this#astType init.cpptype));
+                this#write "\n";
+                gen_expression init;
+            )
+         | CppInt i -> this#write ((this#op IaConstInt) ^ (Printf.sprintf "%ld " i))
+         | CppFloat float_as_string -> this#write ((this#op IaConstFloat) ^ (this#stringText float_as_string))
+         | CppString s -> this#write ((this#op IaConstString) ^ (this#stringText s))
+         | CppBool false -> this#writeOp IaConstFalse
+         | CppBool true -> this#writeOp IaConstTrue
+         | CppNull -> this#writeOp IaConstNull
+         | CppNil -> abort "Nil not supported in cppia" expression.cpppos
+         | CppThis _ -> this#writeOp IaConsThis
+         | CppSuper _ -> this#writeOp IaConstSuper
+         | CppBreak -> this#writeOp IaBreak
+         | CppContinue -> this#writeOp IaContinue
+         | CppGoto label -> abort "Goto not supported in cppia" expression.cpppos
+         | CppReturn None -> this#writeOpLine IaReturn;
+
+         | CppReturn Some value ->
+             this#write ( (this#op IaRetVal) ^ (this#astType value.cpptype) ^ "\n");
+             gen_expression value;
+
+         | CppWhile(condition, block, while_flag, _) ->
+             this#write ( (this#op IaWhile) ^ (if while_flag=NormalWhile then "1" else "0" ) ^ "\n");
+             gen_expression condition;
+             gen_expression block;
+
+         | CppIf (condition,block,None) ->
+            this#writeOpLine IaIf;
+            gen_expression condition;
+            gen_expression block;
+
+         | CppIf (condition,block,Some elze) ->
+            this#writeOpLine IaIfElse;
+            gen_expression condition;
+            gen_expression block;
+            gen_expression elze;
+
+         | CppBinop(op, left, right) ->
+            this#writeOpLine (IaBinOp op);
+            gen_expression left;
+            gen_expression right;
+
+         | CppVar var -> gen_var_loc var
+
+         | CppExtern (name,_) -> abort ("Unexpected global '"^ name ^"' in cppia") expression.cpppos
+
+         | CppSet(lvalue,rvalue) ->
+            this#writeOpLine IaSet;
+            gen_lvalue lvalue expression.cpppos;
+            gen_expression rvalue;
+
+         | CppCall(func, args) ->
+            let argN = (string_of_int (List.length args)) ^ " " in
+            (match func with
+            | FuncThis(field, inst) ->
+               let name = field.cf_name in
+               this#write ( (this#op IaCallThis) ^ (this#astType inst) ^ " " ^ (this#stringText name) ^
+                     argN ^ (this#commentOf name) ^ "\n");
+            | FuncInstance(expr,_,field)
+            | FuncInterface(expr,_,field) ->
+               this#write ( (this#op IaCallMember) ^ (this#astType expr.cpptype) ^ " " ^ (this#stringText field.cf_name) ^
+                     argN ^ (this#commentOf field.cf_name) ^ "\n");
+               gen_expression expr;
+            | FuncStatic(class_def,_,field) ->
+               this#write ( (this#op IaCallStatic) ^ (this#cppInstText class_def) ^ " " ^ (this#stringText field.cf_name) ^
+                     argN ^ (this#commentOf ( join_class_path class_def.cl_path "." ^ "." ^ field.cf_name) ) ^ "\n");
+            | FuncTemplate _ -> abort "Templated function call not supported in cppia" expression.cpppos
+            | FuncFromStaticFunction -> abort "Unexpected FuncFromStaticFunction" expression.cpppos
+            | FuncEnumConstruct(enum,field) ->
+               this#write ((this#op IaCreateEnum) ^ (this#enumText enum) ^ " " ^ (this#stringText field.ef_name) ^ argN ^
+                   (this#commentOf field.ef_name) ^ "\n");
+            | FuncSuperConstruct childType ->
+               this#write ((this#op IaCallSuperNew) ^ (this#astType childType) ^ " " ^ argN ^ "\n");
+            | FuncSuper(_,objType,field) ->
+               this#write ( (this#op IaCallSuper) ^ (this#astType objType) ^ " " ^ (this#stringText field.cf_name) ^
+                  argN ^ (this#commentOf field.cf_name) ^ "\n");
+            | FuncExtern(name,_) ->
+               this#write ( (this#op IaCallGlobal) ^ (this#stringText name) ^ argN ^ (this#commentOf name) ^ "\n");
+
+            | FuncNew(newType) ->
+               this#write ((this#op IaNew) ^ (this#astType newType) ^ argN ^ "\n");
+
+            | FuncInternal(obj,"cca",".") when obj.cpptype=TCppString ->
+               this#write ( (this#op IaCallMember) ^ (this#astType obj.cpptype) ^ " " ^ (this#stringText "cca") ^
+                     argN ^ (this#commentOf "cca") ^ "\n");
+               gen_expression obj;
+            | FuncInternal(obj,name,join) ->
+               (* abort ("Internal function call '" ^ name ^ "' not supported in cppia") expression.cpppos; *)
+               this#write ( (this#op IaCallMember) ^ (this#astType obj.cpptype) ^ " " ^ (this#stringText name) ^
+                     argN ^ (this#commentOf name) ^ "\n");
+               gen_expression obj;
+            | FuncExpression(expr)  ->
+               this#write ( (this#op IaCall) ^ argN ^ "\n");
+               gen_expression expr;
+            );
+            List.iter gen_expression args;
+
+         | CppFunction(func,_) ->
+            (match func with
+            | FuncThis(field, inst) ->
+               this#write ( (this#op IaFThisName) ^ (this#astType inst) ^ " " ^ (this#stringText field.cf_name) ^
+                  (this#commentOf ((script_cpptype_string inst) ^ "." ^ field.cf_name)) );
+            | FuncInternal(expr,name,_) ->
+               this#write ( (this#op IaFLink) ^ (this#astType expr.cpptype) ^ " " ^ (this#stringText name) ^
+                 (this#commentOf ( "Internal " ^ (script_cpptype_string expr.cpptype) ^ "." ^ name)) ^ "\n");
+               gen_expression expr;
+
+            | FuncInstance(expr,_,field)
+            | FuncInterface(expr,_,field) ->
+               this#write ( (this#op IaFName) ^ (this#astType expr.cpptype) ^ " " ^ (this#stringText field.cf_name) ^
+                 (this#commentOf ( (script_cpptype_string expr.cpptype) ^ "." ^ field.cf_name)) ^ "\n");
+               gen_expression expr;
+
+            | FuncStatic(class_def,_,field) ->
+               this#write ( (this#op IaFStatic)  ^ (this#cppInstText class_def) ^ " " ^ (this#stringText field.cf_name) ^ (this#commentOf field.cf_name) );
+            | FuncExpression(expr) -> match_expr expr;
+            | FuncExtern(name,_) ->abort ("Can't create extern " ^ name ^ " closure") expression.cpppos
+            | FuncSuper _ | FuncSuperConstruct _ -> abort "Can't create super closure" expression.cpppos
+            | FuncNew _ -> abort "Can't create new closure" expression.cpppos
+            | FuncEnumConstruct _ -> abort "Enum constructor outside of CppCall" expression.cpppos
+            | FuncFromStaticFunction -> abort "Can't create cpp.Function.fromStaticFunction closure" expression.cpppos
+            | FuncTemplate _ -> abort "Can't create template function closure" expression.cpppos
+            )
+
+         | CppPosition(file,line,class_name,meth) ->
+            this#write ( (this#op IaPosInfo) ^ (this#stringText file) ^ (Printf.sprintf "%ld" line) ^ " " ^
+                        (this#stringText class_name) ^ " " ^  (this#stringText meth))
+
+         | CppNullCompare("IsNull", e) ->
+            this#writeOpLine IaIsNull;
+            gen_expression e;
+
+         | CppNullCompare(_, e) ->
+            this#writeOpLine IaNotNull;
+            gen_expression e;
+
+         | CppCompare(_, left, right, op) ->
+            this#writeOpLine (IaBinOp op);
+            gen_expression left;
+            gen_expression right;
+
+         | CppArray(arrayLoc) -> gen_array arrayLoc expression.cpppos
+
+         | CppArrayDecl(exprList) ->
+            this#write ( (this#op IaADef) ^ (this#astType expression.cpptype) ^ " " ^(string_of_int (List.length exprList))^"\n");
+            List.iter gen_expression exprList;
+
+         | CppEnumField(enum,field) ->
+            this#write ( (this#op IaFEnum)  ^ (this#enumText enum) ^ " " ^ (this#stringText field.ef_name) ^ (this#commentOf field.ef_name) );
+
+         | CppEnumIndex(obj) ->
+            (* Cppia does not have a "GetEnumIndex" op code - must use IaCallMember hx::EnumBase.__Index *)
+            this#write ( (this#op IaCallMember) ^ (this#typeTextString "hx::EnumBase") ^ " " ^ (this#stringText "__Index") ^
+                     "0" ^ (this#commentOf ("Enum index") ) ^ "\n");
+            gen_expression obj;
+
+         | CppDynamicField(obj,name) ->
+            this#write ( (this#op IaFName) ^ (this#typeTextString "Dynamic") ^ " " ^ (this#stringText name) ^  (this#commentOf name) ^ "\n");
+            gen_expression obj;
+
+         | CppClassOf (path,native) ->
+            let klass =  (join_class_path path "." ) in
+            this#write ((this#op IaClassOf) ^ (this#typeTextString klass) ^  (this#commentOf klass) );
+
+         | CppEnumParameter(obj,field,index) ->
+            this#write ( (this#op IaEnumI) ^ (this#typeTextString "Dynamic") ^ (string_of_int index) ^ "\n");
+            gen_expression obj;
+
+         | CppClosure closure ->
+            this#write ( (this#op IaFun) ^ (this#astType closure.close_type) ^ (string_of_int (List.length closure.close_args)) ^ "\n" );
+            let close = this#gen_func_args closure.close_args in
+            gen_expression closure.close_expr;
+            close()
+
+         | CppObjectDecl (values,isStruct) ->this#write ( (this#op IaObjDef) ^ (string_of_int (List.length values)));
+            this#write " ";
+            List.iter (fun (name,_) -> this#write (this#stringText name)  ) values;
+            this#write "\n";
+            List.iter (fun (_,e) -> gen_expression e ) values;
+
+         | CppCrement(incFlag,preFlag,lvalue) ->
+            let op = match incFlag, preFlag with
+            | CppIncrement, Prefix -> IaPlusPlus
+            | CppIncrement, Postfix -> IaPlusPlusPost
+            | CppDecrement, Prefix -> IaMinusMinus
+            | CppDecrement, Postfix -> IaMinusMinusPost
+            in
+            this#writeOpLine op;
+            gen_lvalue lvalue expression.cpppos;
+
+         | CppModify(op,lvalue,rvalue) ->
+            this#writeOpLine (IaBinOp (OpAssignOp op));
+            gen_lvalue lvalue expression.cpppos;
+            gen_expression rvalue;
+
+         | CppUnop(op,expr) ->
+            let op = match op with
+            | CppNot -> IaLogicNot
+            | CppNeg -> IaNeg
+            | CppNegBits -> IaBitNot
+            in
+            this#writeOpLine op;
+            gen_expression expr;
+
+         | CppThrow(value) -> this#writeOpLine IaThrow;
+            gen_expression value;
+
+         | CppTry(block,catches) ->
+            this#writeList (this#op IaTry) (List.length catches);
+            gen_expression block;
+            List.iter ( fun (tvar,catch_expr) ->
+               this#write ("\t\t\t"^indent);
+               this#writeVar tvar;
+               this#write "\n";
+               gen_expression catch_expr;
+            ) catches;
+
+         | CppIntSwitch _ -> abort "CppIntSwitch not supported in cppia" expression.cpppos;
+         | CppSwitch(condition,_, cases, optional_default, _) ->
+            this#write ( (this#op IaSwitch) ^ (string_of_int (List.length cases)) ^ " " ^
+                              (match optional_default with None -> "0" | Some _ -> "1") ^ "\n");
+            gen_expression condition;
+            List.iter (fun (cases_list,expression) ->
+               this#writeList ("\t\t\t"^indent) (List.length cases_list);
+               List.iter (fun value -> gen_expression value ) cases_list;
+               gen_expression expression;
+            ) cases;
+            (match optional_default with None -> () | Some expr -> gen_expression expr);
+
+
+         | CppTCast(expr,toType) ->
+            this#write ((this#op IaTCast) ^ (this#astType toType) ^ "\n");
+            gen_expression expr;
+
+         | CppCast(expr,toType) ->
+            (match toType with
+            | TCppDynamicArray ->
+               this#write ((this#op IaToDynArray) ^ "\n");
+               gen_expression expr;
+            | TCppObjectArray(_) ->
+               this#write ((this#op IaToDataArray) ^ (this#typeTextString ("Array.Object")) ^ "\n");
+               gen_expression expr;
+            | TCppScalarArray(t) ->
+               this#write ((this#op IaToDataArray)  ^ (this#typeTextString ("Array." ^ (script_cpptype_string t))) ^ "\n");
+               gen_expression expr;
+            | _ -> match_expr expr
+            )
+
+         | CppCastScalar(expr,"bool") ->
+             this#writeOpLine IaCastBool;
+             gen_expression expr;
+
+         | CppCastScalar(expr,"int") ->
+             this#writeOpLine IaCastInt;
+             gen_expression expr;
+
+         | CppCastScalar(expr,"Float") ->
+            this#write ((this#op IaTCast) ^ (this#astType (TCppScalar("Float"))) ^ "\n");
+            gen_expression expr;
+
+         | CppCastScalar(expr,_) -> match_expr expr
+         | CppCastVariant(expr) -> match_expr expr
+         | CppCastStatic(expr,_) -> match_expr expr
+         | CppNullAccess ->
+            this#writeOpLine IaThrow;
+            this#begin_expr;
+            this#writeCppPos expression;
+            this#write ((this#op IaConstString) ^ (this#stringText "Null access"));
+            this#end_expr;
+
+         | CppCode _
+         | CppFunctionAddress _
+         | CppDereference _
+         | CppAddressOf _
+         | CppFor _
+         | CppCastObjC _
+         | CppCastObjCBlock _
+         | CppCastProtocol _
+         | CppCastNative _ -> abort ("Unsupported operation in cppia :" ^ (s_tcpp expression.cppexpr) ) expression.cpppos
+
+         (*| x -> print_endline ("Unknown cppexpr " ^ (s_tcpp x) );*)
+         in
+         match_expr expression;
+         this#end_expr;
+      end and gen_array arrayLoc pos =
+         match arrayLoc with
+            | ArrayObject(arrayObj, index, _)
+            | ArrayTyped(arrayObj, index, _) ->
+               this#write ((this#op IaArrayI) ^ (this#astType arrayObj.cpptype) ^ "\n");
+               gen_expression arrayObj;
+               gen_expression index;
+            | ArrayPointer(_, _)
+            | ArrayRawPointer(_,_) -> abort "Unvalid array access in cppia" pos
+            | ArrayVirtual(arrayObj, index)
+            | ArrayImplements(_,arrayObj,index)
+            | ArrayDynamic(arrayObj, index) ->
+               this#write ((this#op IaArrayI) ^ (this#astType arrayObj.cpptype) ^ "\n");
+               gen_expression arrayObj;
+               gen_expression index;
+      and gen_lvalue lvalue pos =
+         this#begin_expr;
+         this#wpos pos;
+         (match lvalue with
+         | CppVarRef varLoc -> gen_var_loc varLoc
+         | CppArrayRef arrayLoc -> gen_array arrayLoc pos
+         | CppExternRef(name,_) -> abort ("Unsupported extern '" ^ name ^ "' in cppia") pos;
+         | CppDynamicRef(expr,name) ->
+            let typeText = this#typeTextString "Dynamic" in
+            this#write ( (this#op IaFName) ^ typeText ^ " " ^ (this#stringText name) ^  (this#commentOf name) ^ "\n");
+            gen_expression expr;
+         );
+         this#end_expr;
+
+      and gen_var_loc loc =
+         match loc with
+         | VarClosure(var)
+         | VarLocal(var) ->
+            this#write ((this#op IaVar) ^ (string_of_int var.v_id) ^ (this#commentOf var.v_name) )
+         | VarStatic(class_def,_,field) ->
+            this#write ( (this#op IaFStatic)  ^ (this#cppInstText class_def) ^ " " ^ (this#stringText field.cf_name) ^ (this#commentOf field.cf_name) );
+         | VarThis(field, thisType) ->
+            this#write ( (this#op IaFThisInst) ^ (this#astType thisType) ^ " " ^ (this#stringText field.cf_name) ^ (this#commentOf field.cf_name) );
+         | VarInstance(obj,field,_,_)
+         | VarInterface(obj,field) ->
+            let objType = script_cpptype_string obj.cpptype in
+            this#write ( (this#op IaFLink) ^ (this#astType obj.cpptype) ^ " " ^ (this#stringText field.cf_name) ^ (this#commentOf ( objType ^ "." ^ field.cf_name)) ^ "\n");
+            gen_expression obj;
+         | VarInternal(obj,_,name) ->
+            let objType = script_cpptype_string obj.cpptype in
+            this#write ( (this#op IaFLink) ^ (this#astType obj.cpptype) ^ " " ^ (this#stringText name) ^ (this#commentOf ( objType ^ "." ^ name)) ^ "\n");
+            gen_expression obj;
+      (*
+      and get_array_type elem =
+         this#stringText (script_cpptype_string elem.cpptype);
+      *)
+      in
+      gen_expression expression_tree
 end;;
 
+
+
+
 let generate_script_class common_ctx script class_def =
    script#incClasses;
    let classText = (join_class_path class_def.cl_path ".") in
@@ -7432,7 +8160,6 @@ let generate_script_class common_ctx script class_def =
    script#write ((string_of_int ( (List.length ordered_fields) +
                                  (List.length ordered_statics) +
                                  (match class_def.cl_constructor with Some _ -> 1 | _ -> 0 ) +
-                                 (if (implement_dynamic_here class_def) then 1 else 0) +
                                  (match class_def.cl_init with Some _ -> 1 | _ -> 0 ) ) )
                                  ^ "\n");
 
@@ -7442,7 +8169,7 @@ let generate_script_class common_ctx script class_def =
          script#writeOpLine IaInline;
       | Var v,_ ->
          let mode_code mode = match mode with
-         | AccNormal -> IaAccessNormal
+         | AccNormal | AccCtor -> IaAccessNormal
          | AccNo -> IaAccessNot
          | AccNever -> IaAccessNot
          | AccResolve -> IaAccessResolve
@@ -7453,7 +8180,7 @@ let generate_script_class common_ctx script class_def =
          | AccInline -> IaAccessNormal
          | AccRequire (_,_) -> IaAccessNormal
          in
-         let isExtern = is_extern_field field in
+         let isExtern = not (is_physical_field field) in
          script#var (mode_code v.v_read) (mode_code v.v_write) isExtern isStatic field.cf_name field.cf_type field.cf_expr
       | Method MethDynamic, TFun(args,ret) ->
          script#func isStatic true field.cf_name ret args class_def.cl_interface field.cf_expr
@@ -7473,8 +8200,6 @@ let generate_script_class common_ctx script class_def =
 
    List.iter (generate_field false) ordered_fields;
    List.iter (generate_field true) ordered_statics;
-   if (implement_dynamic_here class_def) then
-      script#implDynamic;
    script#write "\n";
 ;;
 
@@ -7525,7 +8250,7 @@ let generate_cppia ctx =
          if (is_internal) then
             (if (debug>=4) then print_endline (" internal enum " ^ (join_class_path enum_def.e_path ".") ))
          else begin
-            let meta = Codegen.build_metadata common_ctx object_def in
+            let meta = Texpr.build_metadata common_ctx.basic object_def in
             if (enum_def.e_extern) then
                (if (debug>=4) then print_endline ("external enum " ^  (join_class_path enum_def.e_path ".") ));
             generate_script_enum common_ctx script enum_def meta
@@ -7594,13 +8319,13 @@ let generate_source ctx =
                let id = gen_hash32 seed class_name in
                (* reserve first 100 ids for runtime *)
                if id < Int32.of_int 100 || Hashtbl.mem existingIds id then
-                  makeId class_name (seed+100) 
+                  makeId class_name (seed+100)
                else begin
                   Hashtbl.add existingIds id true;
                   Hashtbl.add ctx.ctx_type_ids class_name id;
                end in
             makeId name 0;
- 
+
             build_xml := !build_xml ^ (get_class_code class_def Meta.BuildXml);
             if (has_init_field class_def) then
                init_classes := class_def.cl_path ::  !init_classes;
@@ -7609,7 +8334,7 @@ let generate_source ctx =
             else if not (has_meta_key class_def.cl_meta Meta.NativeGen) then
                nonboot_classes := class_def.cl_path ::  !nonboot_classes;
             jobs := (fun () -> generate_class_files ctx super_deps constructor_deps class_def scriptable ) :: !jobs;
-            let deps = generate_class_deps ctx class_def super_deps constructor_deps in
+            let deps = generate_class_deps ctx class_def super_deps constructor_deps scriptable in
             if not (class_def.cl_interface && (is_native_gen_class class_def)) then
                exe_classes := (class_def.cl_path, deps, object_def)  ::  !exe_classes;
          end
@@ -7620,7 +8345,7 @@ let generate_source ctx =
          if (is_internal) then
             (if (debug>1) then print_endline (" internal enum " ^ name ))
          else begin
-            let meta = Codegen.build_metadata common_ctx object_def in
+            let meta = Texpr.build_metadata common_ctx.basic object_def in
             if (enum_def.e_extern) then
                (if (debug>1) then print_endline ("external enum " ^ name ));
             boot_enums := enum_def.e_path :: !boot_enums;
@@ -7638,7 +8363,9 @@ let generate_source ctx =
    (match common_ctx.main with
    | None -> generate_dummy_main common_ctx
    | Some e ->
-      let main_field = { cf_name = "__main__"; cf_type = t_dynamic; cf_expr = Some e; cf_expr_unoptimized = None; cf_pos = e.epos; cf_name_pos = null_pos; cf_public = true; cf_meta = []; cf_overloads = []; cf_doc = None; cf_kind = Var { v_read = AccNormal; v_write = AccNormal; }; cf_params = [] } in
+      let main_field = { (mk_field "__main__" t_dynamic e.epos null_pos) with
+         cf_expr = Some e;
+	  } in
       let class_def = { null_class with cl_path = ([],"@Main"); cl_ordered_statics = [main_field] } in
       main_deps := find_referenced_types ctx (TClassDecl class_def) super_deps constructor_deps false true false;
       generate_main ctx super_deps class_def
@@ -7704,10 +8431,10 @@ let generate_source ctx =
    let cmd_defines = ref "" in
    PMap.iter ( fun name value -> match name with
       | "true" | "sys" | "dce" | "cpp" | "debug" -> ()
-      | _ -> cmd_defines := !cmd_defines ^ " -D" ^ name ^ "=\"" ^ (escape_command value) ^ "\"" ) common_ctx.defines;
-   write_build_options common_ctx (common_ctx.file ^ "/Options.txt") common_ctx.defines;
+      | _ -> cmd_defines := !cmd_defines ^ " -D" ^ name ^ "=\"" ^ (escape_command value) ^ "\"" ) common_ctx.defines.Define.values;
+   write_build_options common_ctx (common_ctx.file ^ "/Options.txt") common_ctx.defines.Define.values;
    if ( not (Common.defined common_ctx Define.NoCompilation) ) then begin
-      let t = Common.timer ["generate";"cpp";"native compilation"] in
+      let t = Timer.timer ["generate";"cpp";"native compilation"] in
       let old_dir = Sys.getcwd() in
       Sys.chdir common_ctx.file;
       let cmd = ref "haxelib run hxcpp Build.xml haxe" in
@@ -7722,11 +8449,12 @@ let generate_source ctx =
    ;;
 
 let generate common_ctx =
+   let debug_level = if (Common.defined common_ctx Define.NoDebug) then 0 else 1 in
    if (Common.defined common_ctx Define.Cppia) then begin
-      let ctx = new_context common_ctx 1 (ref PMap.empty) (Hashtbl.create 0)  in
+      let ctx = new_context common_ctx debug_level (ref PMap.empty) (Hashtbl.create 0)  in
       generate_cppia ctx
    end else begin
-      let ctx = new_context common_ctx 1 (ref PMap.empty) (create_member_types common_ctx) in
+      let ctx = new_context common_ctx debug_level (ref PMap.empty) (create_member_types common_ctx) in
       generate_source ctx
    end
 ;;
diff --git a/src/generators/gencs.ml b/src/generators/gencs.ml
index 4831558d65e44762abf7ec2117c81846e7303dc6..3f7a21db97d2e23184ba8501bb5d68cfa40ff393 100644
--- a/src/generators/gencs.ml
+++ b/src/generators/gencs.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -17,22 +17,32 @@
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *)
 
+open ReflectionCFs
 open Globals
-open Gencommon.ReflectionCFs
 open Ast
 open Common
 open Type
 open Gencommon
 open Gencommon.SourceWriter
 open Codegen
+open Texpr.Builder
 open Printf
 open Option
 open ExtString
 
-let netname_to_hx name =
-	let len = String.length name in
-	let chr = String.get name 0 in
-	String.make 1 (Char.uppercase chr) ^ (String.sub name 1 (len-1))
+type cs_native_constraint =
+	| CsStruct
+	| CsClass
+	| CsUnmanaged
+	| CsConstructible
+	| CsConstraint of string
+
+let get_constraint = function
+	| CsStruct -> "struct"
+	| CsClass -> "class"
+	| CsUnmanaged -> "unmanaged"
+	| CsConstructible -> "new()"
+	| CsConstraint s -> s
 
 let rec is_cs_basic_type t =
 	match follow t with
@@ -50,56 +60,12 @@ let rec is_cs_basic_type t =
 			true
 		| TAbstract(a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
 			is_cs_basic_type (Abstract.get_underlying_type a pl)
-		| TEnum(e, _) when not (Meta.has Meta.Class e.e_meta) -> true
+		| TEnum(e, _) as t when not (is_hxgen_t t) -> true
 		| TInst(cl, _) when Meta.has Meta.Struct cl.cl_meta -> true
 		| _ -> false
 
-(* see http://msdn.microsoft.com/en-us/library/2sk3x8a7(v=vs.71).aspx *)
-let cs_binops =
-	[Ast.OpAdd, "op_Addition";
-	Ast.OpSub, "op_Subtraction";
-	Ast.OpMult, "op_Multiply";
-	Ast.OpDiv, "op_Division";
-	Ast.OpMod, "op_Modulus";
-	Ast.OpXor, "op_ExclusiveOr";
-	Ast.OpOr, "op_BitwiseOr";
-	Ast.OpAnd, "op_BitwiseAnd";
-	Ast.OpBoolAnd, "op_LogicalAnd";
-	Ast.OpBoolOr, "op_LogicalOr";
-	Ast.OpAssign, "op_Assign";
-	Ast.OpShl, "op_LeftShift";
-	Ast.OpShr, "op_RightShift";
-	Ast.OpShr, "op_SignedRightShift";
-	Ast.OpUShr, "op_UnsignedRightShift";
-	Ast.OpEq, "op_Equality";
-	Ast.OpGt, "op_GreaterThan";
-	Ast.OpLt, "op_LessThan";
-	Ast.OpNotEq, "op_Inequality";
-	Ast.OpGte, "op_GreaterThanOrEqual";
-	Ast.OpLte, "op_LessThanOrEqual";
-	Ast.OpAssignOp Ast.OpMult, "op_MultiplicationAssignment";
-	Ast.OpAssignOp Ast.OpSub, "op_SubtractionAssignment";
-	Ast.OpAssignOp Ast.OpXor, "op_ExclusiveOrAssignment";
-	Ast.OpAssignOp Ast.OpShl, "op_LeftShiftAssignment";
-	Ast.OpAssignOp Ast.OpMod, "op_ModulusAssignment";
-	Ast.OpAssignOp Ast.OpAdd, "op_AdditionAssignment";
-	Ast.OpAssignOp Ast.OpAnd, "op_BitwiseAndAssignment";
-	Ast.OpAssignOp Ast.OpOr, "op_BitwiseOrAssignment";
-	(* op_Comma *)
-	Ast.OpAssignOp Ast.OpDiv, "op_DivisionAssignment";]
-
-let cs_unops =
-	[Ast.Decrement, "op_Decrement";
-	Ast.Increment, "op_Increment";
-	Ast.Neg, "op_UnaryNegation";
-	Ast.Not, "op_LogicalNot";
-	Ast.NegBits, "op_OnesComplement"]
-
-let binops_names = List.fold_left (fun acc (op,n) -> PMap.add n op acc) PMap.empty cs_binops
-let unops_names = List.fold_left (fun acc (op,n) -> PMap.add n op acc) PMap.empty cs_unops
-
-let get_item = "get_Item"
-let set_item = "set_Item"
+let binops_names = List.fold_left (fun acc (op,n) -> PMap.add n op acc) PMap.empty Dotnet.cs_binops
+let unops_names = List.fold_left (fun acc (op,n) -> PMap.add n op acc) PMap.empty Dotnet.cs_unops
 
 let is_tparam t =
 	match follow t with
@@ -143,20 +109,20 @@ let is_pointer gen t =
 let rec is_null t =
 	match t with
 		| TInst( { cl_path = (["haxe"; "lang"], "Null") }, _ )
-		| TType( { t_path = ([], "Null") }, _ ) -> true
+		| TAbstract( { a_path = ([], "Null") }, _ ) -> true
 		| TType( t, tl ) -> is_null (apply_params t.t_params tl t.t_type)
 		| TMono r ->
 			(match !r with
 			| Some t -> is_null t
 			| _ -> false)
 		| TLazy f ->
-			is_null (!f())
+			is_null (lazy_type f)
 		| _ -> false
 
 let rec get_ptr e = match e.eexpr with
 	| TParenthesis e | TMeta(_,e)
 	| TCast(e,_) -> get_ptr e
-	| TCall( { eexpr = TLocal({ v_name = "__ptr__" }) }, [ e ] ) ->
+	| TCall( { eexpr = TIdent "__ptr__" }, [ e ] ) ->
 		Some e
 	| _ -> None
 
@@ -173,11 +139,6 @@ let parse_explicit_iface =
 		get_iface split []
 	in parse_explicit_iface
 
-let is_string t =
-	match follow t with
-		| TInst( { cl_path = ([], "String") }, [] ) -> true
-		| _ -> false
-
 let rec change_md = function
 	| TAbstractDecl(a) when Meta.has Meta.Delegate a.a_meta && not (Meta.has Meta.CoreType a.a_meta) ->
 		change_md (t_to_md a.a_this)
@@ -187,6 +148,62 @@ let rec change_md = function
 		TAbstractDecl a
 	| md -> md
 
+(**
+	Generates method overloads for a method with trailing optional arguments.
+	E.g. for `function method(a:Int, b:Bool = false) {...}`
+	generates `function method(a:Int) { method(a, false); }`
+*)
+let get_overloads_for_optional_args gen cl cf is_static =
+	match cf.cf_params,cf.cf_kind with
+	| [],Method (MethNormal | MethDynamic | MethInline) ->
+		(match cf.cf_expr, follow cf.cf_type with
+		| Some ({ eexpr = TFunction fn } as method_expr), TFun (args, return_type) ->
+			let type_params = List.map snd cl.cl_params in
+			let rec collect_overloads tf_args_rev args_rev default_values_rev =
+				match tf_args_rev, args_rev with
+				| (_, Some default_value) :: rest_tf_args_rev, _ :: rest_args_rev ->
+					let field_expr =
+						let cl_type = TInst (cl,type_params) in
+						if cf.cf_name = "new" then
+							mk (TConst TThis) cl_type cf.cf_pos
+						else if is_static then
+							let class_expr =
+								mk (TTypeExpr (TClassDecl cl)) cl_type cf.cf_pos
+							in
+							mk (TField (class_expr, FStatic(cl,cf))) cf.cf_type cf.cf_pos
+						else
+							let this_expr =
+								mk (TConst TThis) cl_type cf.cf_pos
+							in
+							mk (TField (this_expr, FInstance(cl,type_params,cf))) cf.cf_type cf.cf_pos
+					in
+					let default_values_rev = default_values_rev @ [default_value] in
+					let args_exprs =
+						List.rev (
+							default_values_rev
+							@ (List.map (fun (v,_) -> mk_local v v.v_pos ) rest_tf_args_rev)
+						)
+					in
+					let call = { fn.tf_expr with eexpr = TCall (field_expr, args_exprs) } in
+					let fn_body =
+						if ExtType.is_void (follow return_type) then call
+						else { fn.tf_expr with eexpr = TReturn (Some call) }
+					in
+					let fn =
+						{ fn with tf_args = List.rev rest_tf_args_rev; tf_expr = mk_block fn_body }
+					in
+					{ cf with
+						cf_overloads = [];
+						cf_type = TFun (List.rev rest_args_rev, return_type);
+						cf_expr = Some { method_expr with eexpr = TFunction fn };
+					} :: collect_overloads rest_tf_args_rev rest_args_rev default_values_rev
+				| _ -> []
+			in
+			collect_overloads (List.rev fn.tf_args) (List.rev args) []
+		| _ -> []
+		)
+	| _ -> []
+
 (* used in c#-specific filters to skip some of them for the special haxe.lang.Runtime class *)
 let in_runtime_class gen =
 	match gen.gcurrent_class with
@@ -206,7 +223,7 @@ let in_runtime_class gen =
 module CSharpSpecificESynf =
 struct
 	let name = "csharp_specific_e"
-	let priority = solve_deps name [DBefore ExpressionUnwrap.priority; DBefore ClassInstance.priority; DAfter TryCatchWrapper.priority]
+	let priority = solve_deps name [DBefore ExpressionUnwrap.priority; DBefore ClassInstance.priority]
 
 	let get_cl_from_t t =
 		match follow t with
@@ -222,8 +239,6 @@ struct
 		let basic = gen.gcon.basic in
 		let uint = match get_type gen ([], "UInt") with | TTypeDecl t -> TType(t, []) | TAbstractDecl a -> TAbstract(a, []) | _ -> assert false in
 
-		let is_var = alloc_var "__is__" t_dynamic in
-
 		let rec run e =
 			match e.eexpr with
 				(* Std.is() *)
@@ -238,7 +253,7 @@ struct
 					) ->
 					let md = change_md md in
 					let mk_is obj md =
-						{ e with eexpr = TCall( { eexpr = TLocal is_var; etype = t_dynamic; epos = e.epos }, [
+						{ e with eexpr = TCall( { eexpr = TIdent "__is__"; etype = t_dynamic; epos = e.epos }, [
 							obj;
 							{ eexpr = TTypeExpr md; etype = t_dynamic (* this is after all a syntax filter *); epos = e.epos }
 						] ) }
@@ -257,7 +272,7 @@ struct
 						match obj.eexpr with
 							| TLocal(v) -> f obj
 							| _ ->
-								let var = mk_temp gen "is" obj.etype in
+								let var = mk_temp "is" obj.etype in
 								let added = { obj with eexpr = TVar(var, Some(obj)); etype = basic.tvoid } in
 								let local = mk_local var obj.epos in
 								{
@@ -331,7 +346,7 @@ struct
 					in
 
 					let mk_local obj =
-						let var = mk_temp gen "opUshr" obj.etype in
+						let var = mk_temp "opUshr" obj.etype in
 						let added = { obj with eexpr = TVar(var, Some(obj)); etype = basic.tvoid } in
 						let local = mk_local var obj.epos in
 						local, added
@@ -359,8 +374,7 @@ struct
 
 				| _ -> Type.map_expr run e
 		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gsyntax_filters#add name (PCustom priority) run
 end;;
 
 (* ******************************************* *)
@@ -393,13 +407,12 @@ struct
 
 	let configure gen runtime_cl =
 		let basic = gen.gcon.basic in
-		let tchar = match ( get_type gen (["cs"], "Char16") ) with
+		(* let tchar = match ( get_type gen (["cs"], "Char16") ) with
 			| TTypeDecl t -> TType(t,[])
 			| TAbstractDecl a -> TAbstract(a,[])
 			| _ -> assert false
-		in
+		in *)
 		let string_ext = get_cl ( get_type gen (["haxe";"lang"], "StringExt")) in
-		let clstring = match basic.tstring with | TInst(cl,_) -> cl | _ -> assert false in
 		let ti64 = match ( get_type gen (["cs"], "Int64") ) with | TTypeDecl t -> TType(t,[]) | TAbstractDecl a -> TAbstract(a,[]) | _ -> assert false in
 		let boxed_ptr =
 			if Common.defined gen.gcon Define.Unsafe then
@@ -417,7 +430,6 @@ struct
 
 		let is_cl t = match gen.greal_type t with | TInst ( { cl_path = (["System"], "Type") }, [] ) -> true | _ -> false in
 
-		let as_var = alloc_var "__as__" t_dynamic in
 		let fast_cast = Common.defined gen.gcon Define.FastCast in
 
 		let rec run e =
@@ -440,7 +452,7 @@ struct
 					{ e with eexpr = TField(run ef, FDynamic "ToUpperInvariant") }
 
 				| TCall( { eexpr = TField(_, FStatic({ cl_path = [], "String" }, { cf_name = "fromCharCode" })) }, [cc] ) ->
-					{ e with eexpr = TNew(get_cl_from_t basic.tstring, [], [mk_cast tchar (run cc); ExprBuilder.make_int gen.gcon 1 cc.epos]) }
+					{ e with eexpr = TCall(mk_static_field_access_infer string_ext "fromCharCode" e.epos [], [run cc]) }
 				| TCall( { eexpr = TField(ef, FInstance({ cl_path = [], "String" }, _, { cf_name = ("charAt" as field) })) }, args )
 				| TCall( { eexpr = TField(ef, FInstance({ cl_path = [], "String" }, _, { cf_name = ("charCodeAt" as field) })) }, args )
 				| TCall( { eexpr = TField(ef, FInstance({ cl_path = [], "String" }, _, { cf_name = ("indexOf" as field) })) }, args )
@@ -514,24 +526,14 @@ struct
 					if is_cs_basic_type (gen.greal_type e.etype) || is_tparam (gen.greal_type e.etype) then
 						{ e with eexpr = TCast(run expr, Some(TClassDecl null_class)) }
 					else
-						{ e with eexpr = TCall(mk_local as_var e.epos, [run expr]) }
+						{ e with eexpr = TCall(mk (TIdent "__as__") t_dynamic e.epos, [run expr]) }
 
 				| TCast(expr, _) when (is_string e.etype) && (not (is_string expr.etype)) && not (in_runtime_class gen) ->
 					{ e with eexpr = TCall( mk_static_field_access_infer runtime_cl "toString" expr.epos [], [run expr] ) }
-				| TBinop( (Ast.OpNotEq as op), e1, e2)
-				| TBinop( (Ast.OpEq as op), e1, e2) when is_string e1.etype || is_string e2.etype ->
-					let mk_ret e = match op with | Ast.OpNotEq -> { e with eexpr = TUnop(Ast.Not, Ast.Prefix, e) } | _ -> e in
-					mk_ret { e with
-						eexpr = TCall({
-							eexpr = TField(ExprBuilder.make_static_this clstring e.epos, FDynamic "Equals");
-							etype = TFun(["obj1",false,basic.tstring; "obj2",false,basic.tstring], basic.tbool);
-							epos = e1.epos
-						}, [ run e1; run e2 ])
-					}
 
 				| TCast(expr, _) when is_tparam e.etype && not (in_runtime_class gen) && not (Common.defined gen.gcon Define.EraseGenerics) ->
 					let static = mk_static_field_access_infer (runtime_cl) "genericCast" e.epos [e.etype] in
-					{ e with eexpr = TCall(static, [mk_local (alloc_var "$type_param" e.etype) expr.epos; run expr]); }
+					{ e with eexpr = TCall(static, [mk (TIdent "$type_param") e.etype expr.epos; run expr]); }
 
 				| TBinop( (Ast.OpNotEq as op), e1, e2)
 				| TBinop( (Ast.OpEq as op), e1, e2) when is_struct e1.etype || is_struct e2.etype ->
@@ -555,8 +557,7 @@ struct
 
 				| _ -> Type.map_expr run e
 		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gsyntax_filters#add name (PCustom priority) run
 end;;
 
 let add_cast_handler gen =
@@ -587,10 +588,10 @@ let add_cast_handler gen =
 		let old_param = get_narr_param e.etype in
 		let new_param = get_narr_param to_t in
 
-		let new_v = mk_temp gen "new_arr" to_t in
-		let i = mk_temp gen "i" basic.tint in
+		let new_v = mk_temp "new_arr" to_t in
+		let i = mk_temp "i" basic.tint in
 		let old_len = mk_field_access gen e "Length" e.epos in
-		let obj_v = mk_temp gen "obj" t_dynamic in
+		let obj_v = mk_temp "obj" t_dynamic in
 		let check_null = {eexpr = TBinop(Ast.OpNotEq, e, null e.etype e.epos); etype = basic.tbool; epos = e.epos} in
 		let block = [
 			{
@@ -605,7 +606,7 @@ let add_cast_handler gen =
 				epos = e.epos
 			};
 			{
-				eexpr = TVar(i, Some( ExprBuilder.make_int gen.gcon (-1) e.epos ));
+				eexpr = TVar(i, Some( make_int gen.gcon.basic (-1) e.epos ));
 				etype = basic.tvoid;
 				epos = e.epos
 			};
@@ -668,7 +669,8 @@ let add_cast_handler gen =
 		}
 	in
 
-	Hashtbl.add gen.gtparam_cast (["cs"], "NativeArray") gtparam_cast_native_array
+	Hashtbl.add gen.gtparam_cast (["cs"], "NativeArray") gtparam_cast_native_array;
+	Hashtbl.add gen.gtparam_cast (["haxe";"lang"], "Null") (fun e to_t -> mk_cast to_t e)
 	(* end set gtparam_cast *)
 
 let connecting_string = "?" (* ? see list here http://www.fileformat.info/info/unicode/category/index.htm and here for C# http://msdn.microsoft.com/en-us/library/aa664670.aspx *)
@@ -685,7 +687,7 @@ let reserved = let res = Hashtbl.create 120 in
 		"stackalloc"; "static"; "string"; "struct"; "switch"; "this"; "throw"; "true"; "try"; "typeof"; "uint"; "ulong";
 		"unchecked"; "unsafe"; "ushort"; "using"; "virtual"; "volatile"; "void"; "while"; "add"; "ascending"; "by"; "descending";
 		"dynamic"; "equals"; "from"; "get"; "global"; "group"; "into"; "join"; "let"; "on"; "orderby"; "partial";
-		"remove"; "select"; "set"; "value"; "var"; "where"; "yield"];
+		"remove"; "select"; "set"; "value"; "var"; "where"; "yield"; "await"];
 	res
 
 let dynamic_anon = TAnon( { a_fields = PMap.empty; a_status = ref Closed } )
@@ -698,13 +700,13 @@ let rec get_class_modifiers meta cl_type cl_access cl_modifiers =
 		| (Meta.Internal,[],_) :: meta -> get_class_modifiers meta cl_type "internal" cl_modifiers
 		(* no abstract for now | (":abstract",[],_) :: meta -> get_class_modifiers meta cl_type cl_access ("abstract" :: cl_modifiers)
 		| (":static",[],_) :: meta -> get_class_modifiers meta cl_type cl_access ("static" :: cl_modifiers) TODO: support those types *)
-		| (Meta.Final,[],_) :: meta -> get_class_modifiers meta cl_type cl_access ("sealed" :: cl_modifiers)
 		| (Meta.Unsafe,[],_) :: meta -> get_class_modifiers meta cl_type cl_access ("unsafe" :: cl_modifiers)
 		| _ :: meta -> get_class_modifiers meta cl_type cl_access cl_modifiers
 
 let rec get_fun_modifiers meta access modifiers =
 	match meta with
 		| [] -> access,modifiers
+		| (Meta.Private,[],_) :: meta -> get_fun_modifiers meta "private" modifiers
 		| (Meta.Protected,[],_) :: meta -> get_fun_modifiers meta "protected" modifiers
 		| (Meta.Internal,[],_) :: meta -> get_fun_modifiers meta "internal" modifiers
 		| (Meta.ReadOnly,[],_) :: meta -> get_fun_modifiers meta access ("readonly" :: modifiers)
@@ -713,3828 +715,2733 @@ let rec get_fun_modifiers meta access modifiers =
 		| (Meta.Custom ("?prop_impl" | ":cs_event_impl"),[],_) :: meta -> get_fun_modifiers meta "private" modifiers
 		| _ :: meta -> get_fun_modifiers meta access modifiers
 
-(* this was the way I found to pass the generator context to be accessible across all functions here *)
-(* so 'configure' is almost 'top-level' and will have all functions needed to make this work *)
-let configure gen =
-	let native_arr_cl = get_cl ( get_type gen (["cs"], "NativeArray") ) in
-	gen.gclasses.nativearray <- (fun t -> TInst(native_arr_cl,[t]));
-	gen.gclasses.nativearray_type <- (function TInst(_,[t]) -> t | _ -> assert false);
-	gen.gclasses.nativearray_len <- (fun e p -> mk_field_access gen e "Length" p);
+let generate con =
+	(try
+		let gen = new_ctx con in
+		let basic = con.basic in
 
-	let basic = gen.gcon.basic in
+		if Common.defined_value con Define.Dce = "no" then begin
+			let m = { null_module with m_id = alloc_mid(); m_path = ["haxe";"lang"],"DceNo" } in
+			let cl = mk_class m (["haxe";"lang"],"DceNo") null_pos in
+			gen.gtypes_list <- (TClassDecl cl) :: gen.gtypes_list;
+			Hashtbl.add gen.gtypes cl.cl_path (TClassDecl cl)
+		end;
 
-	let erase_generics = Common.defined gen.gcon Define.EraseGenerics in
-	let fn_cl = get_cl (get_type gen (["haxe";"lang"],"Function")) in
-	let null_t = if erase_generics then null_class else (get_cl (get_type gen (["haxe";"lang"],"Null")) ) in
-	let runtime_cl = get_cl (get_type gen (["haxe";"lang"],"Runtime")) in
-	let no_root = Common.defined gen.gcon Define.NoRoot in
-	let change_id name = try
-			Hashtbl.find reserved name
-		with | Not_found ->
-			let ret = String.concat "." (String.nsplit name "#") in
-			List.hd (String.nsplit ret "`")
-	in
+		(* make the basic functions in C# *)
+		let type_cl = get_cl ( get_type gen (["System"], "Type")) in
+		let basic_fns =
+		[
+			mk_class_field "Equals" (TFun(["obj",false,t_dynamic], basic.tbool)) true null_pos (Method MethNormal) [];
+			mk_class_field "ToString" (TFun([], basic.tstring)) true null_pos (Method MethNormal) [];
+			mk_class_field "GetHashCode" (TFun([], basic.tint)) true null_pos (Method MethNormal) [];
+			mk_class_field "GetType" (TFun([], TInst(type_cl, []))) true null_pos (Method MethNormal) [];
+		] in
+		List.iter (fun cf -> gen.gbase_class_fields <- PMap.add cf.cf_name cf gen.gbase_class_fields) basic_fns;
 
-	let change_clname n = change_id n in
-
-	let change_ns_params_root md ns params =
-		let ns,params = List.fold_left (fun (ns,params) nspart -> try
-			let part, nparams = String.split nspart "`" in
-			let nparams = int_of_string nparams in
-			let rec loop i needed params =
-				if i = nparams then
-					(List.rev needed,params)
-				else
-					loop (i+1) (List.hd params :: needed) (List.tl params)
+		let native_arr_cl = get_cl ( get_type gen (["cs"], "NativeArray") ) in
+		gen.gclasses.nativearray <- (fun t -> TInst(native_arr_cl,[t]));
+		gen.gclasses.nativearray_type <- (function TInst(_,[t]) -> t | _ -> assert false);
+		gen.gclasses.nativearray_len <- (fun e p -> mk_field_access gen e "Length" p);
+
+		let erase_generics = Common.defined gen.gcon Define.EraseGenerics in
+		let fn_cl = get_cl (get_type gen (["haxe";"lang"],"Function")) in
+		let null_t = if erase_generics then null_class else (get_cl (get_type gen (["haxe";"lang"],"Null")) ) in
+		let runtime_cl = get_cl (get_type gen (["haxe";"lang"],"Runtime")) in
+		let no_root = Common.defined gen.gcon Define.NoRoot in
+		let change_id name = try
+				Hashtbl.find reserved name
+			with | Not_found ->
+				let ret = String.concat "." (String.nsplit name "#") in
+				List.hd (String.nsplit ret "`")
+		in
+
+		let change_clname n = change_id n in
+
+		let change_ns_params_root md ns params =
+			let ns,params = List.fold_left (fun (ns,params) nspart -> try
+				let part, nparams = String.split nspart "`" in
+				let nparams = int_of_string nparams in
+				let rec loop i needed params =
+					if i = nparams then
+						(List.rev needed,params)
+					else
+						loop (i+1) (List.hd params :: needed) (List.tl params)
+				in
+				let needed,params = loop 0 [] params in
+				let part = change_id part in
+				(part ^ "<" ^ (String.concat ", " needed) ^ ">")::ns, params
+			with _ -> (* Invalid_string / int_of_string *)
+				(change_id nspart)::ns, params
+			) ([],params) ns
 			in
-			let needed,params = loop 0 [] params in
-			let part = change_id part in
-			(part ^ "<" ^ (String.concat ", " needed) ^ ">")::ns, params
-		with _ -> (* Invalid_string / int_of_string *)
-			(change_id nspart)::ns, params
-		) ([],params) ns
+			List.rev ns,params
 		in
-		List.rev ns,params
-	in
 
-	let change_ns_params md params ns = if no_root then match ns with
-			| [] when is_hxgen md -> ["haxe";"root"], params
-			| [s] when (t_infos md).mt_private && is_hxgen md -> ["haxe";"root";s], params
-			| [] -> (match md with
-				| TClassDecl { cl_path = ([],"Std" | [],"Math") } -> ["haxe";"root"], params
-				| TClassDecl { cl_meta = m } when Meta.has Meta.Enum m -> ["haxe";"root"], params
-				| _ -> [], params)
-			| ns when params = [] -> List.map change_id ns, params
-			| ns ->
+		let change_ns_params md params ns = if no_root then (
+			let needs_root md = is_hxgen md || match md with
+				| TClassDecl cl when (Meta.has Meta.Enum cl.cl_meta) && (Meta.has Meta.CompilerGenerated cl.cl_meta) ->
+					(* this will match our compiler-generated enum constructor classes *)
+					true
+				| _ ->
+					false
+			in
+			match ns with
+				| [] when needs_root md -> ["haxe";"root"], params
+				| [s] when (t_infos md).mt_private && needs_root md -> ["haxe";"root";s], params
+				| [] -> (match md with
+					| TClassDecl { cl_path = ([],"Std" | [],"Math") } -> ["haxe";"root"], params
+					| TClassDecl { cl_meta = m } when Meta.has Meta.Enum m -> ["haxe";"root"], params
+					| _ -> [], params)
+				| ns when params = [] -> List.map change_id ns, params
+				| ns ->
+					change_ns_params_root md ns params)
+			else if params = [] then
+				List.map change_id ns, params
+			else
 				change_ns_params_root md ns params
-		else if params = [] then
-			List.map change_id ns, params
-		else
-			change_ns_params_root md ns params
-	in
+		in
 
-	let change_ns md ns =
-		let ns, _ = change_ns_params md [] ns in
-		ns
-	in
+		let change_ns md ns =
+			let ns, _ = change_ns_params md [] ns in
+			ns
+		in
 
-	let change_field = change_id in
-	let write_id w name = write w (change_id name) in
-	let write_field w name = write w (change_field name) in
+		let change_class_field cl name =
+			let change_ctor name = if name = "new" then snd cl.cl_path else name in
+			let rec gen name =
+				let name = name ^ "_" ^ name in
+				if PMap.mem name cl.cl_fields || PMap.mem name cl.cl_statics then gen name
+				else name
+			in
+			change_id (if name = snd cl.cl_path then gen name else (change_ctor name))
+		in
+		let change_enum_field enum name =
+			let rec gen name =
+				let name = name ^ "_" ^ name in
+				if PMap.mem name enum.e_constrs then gen name
+				else name
+			in
+			change_id (if name = snd enum.e_path then gen name else name)
+		in
+		let change_field = change_id in
+		let write_id w name = write w (change_id name) in
+		let write_class_field cl w name = write w (change_class_field cl name) in
+		let write_enum_field enum w name = write w (change_enum_field enum name) in
+		let write_field w name = write w (change_field name) in
+		let get_write_field field_access =
+			match field_access with
+			| FInstance (cl,_,f) | FStatic (cl,f) | FClosure (Some (cl,_),f) -> write_class_field cl
+			| FEnum (enum,f) -> write_enum_field enum
+			| _ -> write_field
+		in
 
-	let ptr =
-		if Common.defined gen.gcon Define.Unsafe then
-			get_abstract (get_type gen (["cs"],"Pointer"))
-		else
-			null_abstract
-	in
+		let ptr =
+			if Common.defined gen.gcon Define.Unsafe then
+				get_abstract (get_type gen (["cs"],"Pointer"))
+			else
+				null_abstract
+		in
 
-	let is_hxgeneric md =
-		TypeParams.RealTypeParams.is_hxgeneric md
-	in
+		let is_hxgeneric md =
+			RealTypeParams.is_hxgeneric md
+		in
 
-	let rec field_is_hxgeneric e = match e.eexpr with
-		| TParenthesis e | TMeta(_,e) -> field_is_hxgeneric e
-		| TField(_, (FStatic(cl,_) | FInstance(cl,_,_)) ) ->
-			(* print_endline ("is_hxgeneric " ^ s_type_path cl.cl_path ^ " : " ^ string_of_bool (is_hxgeneric (TClassDecl cl))); *)
-			is_hxgeneric (TClassDecl cl)
-		| _ -> true
-	in
+		let rec field_is_hxgeneric e = match e.eexpr with
+			| TParenthesis e | TMeta(_,e) -> field_is_hxgeneric e
+			| TField(_, (FStatic(cl,_) | FInstance(cl,_,_)) ) ->
+				(* print_endline ("is_hxgeneric " ^ s_type_path cl.cl_path ^ " : " ^ string_of_bool (is_hxgeneric (TClassDecl cl))); *)
+				is_hxgeneric (TClassDecl cl)
+			| _ -> true
+		in
 
-	gen.gfollow#add ~name:"follow_basic" (fun t -> match t with
-			| TAbstract ({ a_path = ([], "Bool") },[])
-			| TAbstract ({ a_path = ([], "Void") },[])
-			| TAbstract ({ a_path = ([],"Float") },[])
-			| TAbstract ({ a_path = ([],"Int") },[])
-			| TAbstract ({ a_path = [],"UInt" },[])
-			| TType ({ t_path = ["cs"], "Int64" },[])
-			| TAbstract ({ a_path = ["cs"], "Int64" },[])
-			| TType ({ t_path = ["cs"],"UInt64" },[])
-			| TAbstract ({ a_path = ["cs"],"UInt64" },[])
-			| TType ({ t_path = ["cs"],"UInt8" },[])
-			| TAbstract ({ a_path = ["cs"],"UInt8" },[])
-			| TType ({ t_path = ["cs"],"Int8" },[])
-			| TAbstract ({ a_path = ["cs"],"Int8" },[])
-			| TType ({ t_path = ["cs"],"Int16" },[])
-			| TAbstract ({ a_path = ["cs"],"Int16" },[])
-			| TType ({ t_path = ["cs"],"UInt16" },[])
-			| TAbstract ({ a_path = ["cs"],"UInt16" },[])
-			| TType ({ t_path = ["cs"],"Char16" },[])
-			| TAbstract ({ a_path = ["cs"],"Char16" },[])
-			| TType ({ t_path = ["cs"],"Ref" },_)
-			| TAbstract ({ a_path = ["cs"],"Ref" },_)
-			| TType ({ t_path = ["cs"],"Out" },_)
-			| TAbstract ({ a_path = ["cs"],"Out" },_)
-			| TType ({ t_path = [],"Single" },[])
-			| TAbstract ({ a_path = [],"Single" },[]) -> Some t
-			| TType (({ t_path = [],"Null" } as tdef),[t2]) ->
-					Some (TType(tdef,[follow (gen.gfollow#run_f t2)]))
-			| TAbstract({ a_path = ["cs"],"PointerAccess" },[t]) ->
-					Some (TAbstract(ptr,[t]))
-			| TAbstract (a, pl) when not (Meta.has Meta.CoreType a.a_meta) ->
-					Some (gen.gfollow#run_f ( Abstract.get_underlying_type a pl) )
-			| TAbstract( { a_path = ([], "EnumValue") }, _	)
-			| TInst( { cl_path = ([], "EnumValue") }, _  ) -> Some t_dynamic
-			| _ -> None);
-
-	let module_s_params md params =
-		let md = change_md md in
-		let path = (t_infos md).mt_path in
-		match path with
-			| ([], "String") -> "string", params
-			| ([], "Null") -> s_type_path (change_ns md ["haxe"; "lang"], change_clname "Null"), params
-			| (ns,clname) ->
-				let ns, params = change_ns_params md params ns in
-				s_type_path (ns, change_clname clname), params
-	in
+		gen.gfollow#add "follow_basic" PZero (fun t -> match t with
+				| TAbstract ({ a_path = ([], "Bool") },[])
+				| TAbstract ({ a_path = ([], "Void") },[])
+				| TAbstract ({ a_path = ([],"Float") },[])
+				| TAbstract ({ a_path = ([],"Int") },[])
+				| TAbstract ({ a_path = [],"UInt" },[])
+				| TType ({ t_path = ["cs"], "Int64" },[])
+				| TAbstract ({ a_path = ["cs"], "Int64" },[])
+				| TType ({ t_path = ["cs"],"UInt64" },[])
+				| TAbstract ({ a_path = ["cs"],"UInt64" },[])
+				| TType ({ t_path = ["cs"],"UInt8" },[])
+				| TAbstract ({ a_path = ["cs"],"UInt8" },[])
+				| TType ({ t_path = ["cs"],"Int8" },[])
+				| TAbstract ({ a_path = ["cs"],"Int8" },[])
+				| TType ({ t_path = ["cs"],"Int16" },[])
+				| TAbstract ({ a_path = ["cs"],"Int16" },[])
+				| TType ({ t_path = ["cs"],"UInt16" },[])
+				| TAbstract ({ a_path = ["cs"],"UInt16" },[])
+				| TType ({ t_path = ["cs"],"Char16" },[])
+				| TAbstract ({ a_path = ["cs"],"Char16" },[])
+				| TType ({ t_path = ["cs"],"Ref" },_)
+				| TAbstract ({ a_path = ["cs"],"Ref" },_)
+				| TType ({ t_path = ["cs"],"Out" },_)
+				| TAbstract ({ a_path = ["cs"],"Out" },_)
+				| TType ({ t_path = [],"Single" },[])
+				| TAbstract ({ a_path = [],"Single" },[]) -> Some t
+				| TAbstract (({ a_path = [],"Null" } as tab),[t2]) ->
+						Some (TAbstract(tab,[follow (gen.gfollow#run_f t2)]))
+				| TAbstract({ a_path = ["cs"],"PointerAccess" },[t]) ->
+						Some (TAbstract(ptr,[t]))
+				| TAbstract (a, pl) when not (Meta.has Meta.CoreType a.a_meta) ->
+						Some (gen.gfollow#run_f ( Abstract.get_underlying_type a pl) )
+				| TAbstract( { a_path = ([], "EnumValue") }, _	)
+				| TInst( { cl_path = ([], "EnumValue") }, _  ) -> Some t_dynamic
+				| _ -> None);
+
+		let module_s_params md params =
+			let md = change_md md in
+			let path = (t_infos md).mt_path in
+			match path with
+				| ([], "String") -> "string", params
+				| ([], "Null") -> s_type_path (change_ns md ["haxe"; "lang"], change_clname "Null"), params
+				| (ns,clname) ->
+					let ns, params = change_ns_params md params ns in
+					s_type_path (ns, change_clname clname), params
+		in
 
-	let module_s md =
-		fst (module_s_params md [])
-	in
+		let module_s md =
+			fst (module_s_params md [])
+		in
 
-	let ifaces = Hashtbl.create 1 in
+		let ifaces = Hashtbl.create 1 in
 
-	let ti64 = match ( get_type gen (["cs"], "Int64") ) with | TTypeDecl t -> TType(t,[]) | TAbstractDecl a -> TAbstract(a,[]) | _ -> assert false in
+		let ti64 = match ( get_type gen (["cs"], "Int64") ) with | TTypeDecl t -> TType(t,[]) | TAbstractDecl a -> TAbstract(a,[]) | _ -> assert false in
 
-	let ttype = get_cl ( get_type gen (["System"], "Type") ) in
+		let ttype = get_cl ( get_type gen (["System"], "Type") ) in
 
-	let has_tdyn tl =
-		List.exists (fun t -> match follow t with
-		| TDynamic _ | TMono _ -> true
-		| _ -> false
-	) tl
-	in
+		let has_tdyn tl =
+			List.exists (fun t -> match follow t with
+			| TDynamic _ | TMono _ -> true
+			| _ -> false
+		) tl
+		in
 
-	let rec real_type t =
-		let t = gen.gfollow#run_f t in
-		let ret = match t with
-			| TAbstract (a, pl) when not (Meta.has Meta.CoreType a.a_meta) ->
-				real_type (Abstract.get_underlying_type a pl)
-			| TAbstract ({ a_path = (["cs";"_Flags"], "EnumUnderlying") }, [t]) ->
-				real_type t
-			| TInst( { cl_path = (["cs";"system"], "String") }, [] ) ->
-				gen.gcon.basic.tstring;
-			| TInst( { cl_path = (["haxe"], "Int32") }, [] ) -> gen.gcon.basic.tint
-			| TInst( { cl_path = (["haxe"], "Int64") }, [] ) -> ti64
-			| TAbstract( { a_path = [],"Class" }, _ )
-			| TAbstract( { a_path = [],"Enum" }, _ )
-			| TAbstract( { a_path = ["haxe";"extern"],"Rest" }, _ )
-			| TInst( { cl_path = ([], "Class") }, _ )
-			| TInst( { cl_path = ([], "Enum") }, _ ) -> TInst(ttype,[])
-			| TInst( ({ cl_kind = KTypeParameter _ } as cl), _ ) when erase_generics && not (Meta.has Meta.NativeGeneric cl.cl_meta) ->
+		let rec real_type stack t =
+			let t = gen.gfollow#run_f t in
+			if List.exists (fast_eq t) stack then
 				t_dynamic
-			| TInst({ cl_kind = KExpr _ }, _) -> t_dynamic
-			| TEnum(_, [])
-			| TInst(_, []) -> t
-			| TInst(cl, params) when
-				has_tdyn params &&
-				Hashtbl.mem ifaces cl.cl_path ->
-					TInst(Hashtbl.find ifaces cl.cl_path, [])
-			| TEnum(e, params) ->
-				TEnum(e, List.map (fun _ -> t_dynamic) params)
-			| TInst(cl, params) when Meta.has Meta.Enum cl.cl_meta ->
-				TInst(cl, List.map (fun _ -> t_dynamic) params)
-			| TInst(cl, params) -> TInst(cl, change_param_type (TClassDecl cl) params)
-			| TType({ t_path = ([], "Null") }, [t]) ->
+			else begin
+				let stack = t :: stack in
+				let ret = match t with
+					| TAbstract({ a_path = ([], "Null") }, [t]) ->
+						(*
+							Null<> handling is a little tricky.
+							It will only change to haxe.lang.Null<> when the actual type is non-nullable or a type parameter
+							It works on cases such as Hash<T> returning Null<T> since cast_detect will invoke real_type at the original type,
+							Null<T>, which will then return the type haxe.lang.Null<>
+						*)
+						if erase_generics then
+							if is_cs_basic_type t then
+								t_dynamic
+							else
+								real_type stack t
+						else
+							(match real_type stack t with
+								| TInst( { cl_kind = KTypeParameter _ }, _ ) -> TInst(null_t, [t])
+								| t when is_cs_basic_type t -> TInst(null_t, [t])
+								| _ -> real_type stack t)
+					| TAbstract (a, pl) when not (Meta.has Meta.CoreType a.a_meta) ->
+						real_type stack (Abstract.get_underlying_type a pl)
+					| TAbstract ({ a_path = (["cs";"_Flags"], "EnumUnderlying") }, [t]) ->
+						real_type stack t
+					| TInst( { cl_path = (["cs";"system"], "String") }, [] ) ->
+						gen.gcon.basic.tstring;
+					| TInst( { cl_path = (["haxe"], "Int32") }, [] ) -> gen.gcon.basic.tint
+					| TInst( { cl_path = (["haxe"], "Int64") }, [] ) -> ti64
+					| TAbstract( { a_path = [],"Class" }, _ )
+					| TAbstract( { a_path = [],"Enum" }, _ )
+					| TAbstract( { a_path = ["haxe";"extern"],"Rest" }, _ )
+					| TInst( { cl_path = ([], "Class") }, _ )
+					| TInst( { cl_path = ([], "Enum") }, _ ) -> TInst(ttype,[])
+					| TInst( ({ cl_kind = KTypeParameter _ } as cl), _ ) when erase_generics && not (Meta.has Meta.NativeGeneric cl.cl_meta) ->
+						t_dynamic
+					| TInst({ cl_kind = KExpr _ }, _) -> t_dynamic
+					| TEnum(_, [])
+					| TInst(_, []) -> t
+					| TInst(cl, params) when
+						has_tdyn params &&
+						Hashtbl.mem ifaces cl.cl_path ->
+							TInst(Hashtbl.find ifaces cl.cl_path, [])
+					| TEnum(e, params) ->
+						TEnum(e, List.map (fun _ -> t_dynamic) params)
+					| TInst(cl, params) when Meta.has Meta.Enum cl.cl_meta ->
+						TInst(cl, List.map (fun _ -> t_dynamic) params)
+					| TInst(cl, params) -> TInst(cl, change_param_type stack (TClassDecl cl) params)
+					| TAbstract _
+					| TType _ -> t
+					| TAnon (anon) when (match !(anon.a_status) with | Statics _ | EnumStatics _ | AbstractStatics _ -> true | _ -> false) -> t
+					| TFun _ -> TInst(fn_cl,[])
+					| _ -> t_dynamic
+				in
+				ret
+			end
+		and
+
+		(*
+			On hxcs, the only type parameters allowed to be declared are the basic c# types.
+			That's made like this to avoid casting problems when type parameters in this case
+			add nothing to performance, since the memory layout is always the same.
+
+			To avoid confusion between Generic<Dynamic> (which has a different meaning in hxcs AST),
+			all those references are using dynamic_anon, which means Generic<{}>
+		*)
+		change_param_type stack md tl =
+			let types = match md with
+				| TClassDecl c -> c.cl_params
+				| TEnumDecl e -> []
+				| TAbstractDecl a -> a.a_params
+				| TTypeDecl t -> t.t_params
+			in
+			let is_hxgeneric = if types = [] then is_hxgen md else (RealTypeParams.is_hxgeneric md) in
+			let ret t =
+				let t_changed = real_type stack t in
+				match is_hxgeneric, t_changed with
 				(*
-					Null<> handling is a little tricky.
-					It will only change to haxe.lang.Null<> when the actual type is non-nullable or a type parameter
-					It works on cases such as Hash<T> returning Null<T> since cast_detect will invoke real_type at the original type,
-					Null<T>, which will then return the type haxe.lang.Null<>
+					Because Null<> types need a special compiler treatment for many operations (e.g. boxing/unboxing),
+					Null<> type parameters will be transformed into Dynamic.
 				*)
-				if erase_generics then
-					if is_cs_basic_type t then
-						t_dynamic
-					else
-						real_type t
-				else
-					(match real_type t with
-						| TInst( { cl_kind = KTypeParameter _ }, _ ) -> TInst(null_t, [t])
-						| t when is_cs_basic_type t -> TInst(null_t, [t])
-						| _ -> real_type t)
-			| TAbstract _
-			| TType _ -> t
-			| TAnon (anon) when (match !(anon.a_status) with | Statics _ | EnumStatics _ | AbstractStatics _ -> true | _ -> false) -> t
-			| TFun _ -> TInst(fn_cl,[])
-			| _ -> t_dynamic
+				| _, TInst ( { cl_path = (["haxe";"lang"], "Null") }, _ ) -> dynamic_anon
+				| false, _ -> t
+				| true, TInst ( { cl_path = ([], "String") }, _ ) -> t
+				| true, TInst ( { cl_kind = KTypeParameter _ }, _ ) -> t
+				| true, TInst _
+				| true, TEnum _
+				| true, TAbstract _ when is_cs_basic_type t_changed -> t
+				| true, TDynamic _ -> t
+				| true, x ->
+					dynamic_anon
+			in
+			if is_hxgeneric && (erase_generics || List.exists (fun t -> match follow t with | TDynamic _ -> true | _ -> false) tl) then
+				List.map (fun _ -> t_dynamic) tl
+			else
+				List.map ret tl
 		in
-		ret
-	and
 
-	(*
-		On hxcs, the only type parameters allowed to be declared are the basic c# types.
-		That's made like this to avoid casting problems when type parameters in this case
-		add nothing to performance, since the memory layout is always the same.
+		let real_type = real_type []
+		and change_param_type = change_param_type [] in
 
-		To avoid confusion between Generic<Dynamic> (which has a different meaning in hxcs AST),
-		all those references are using dynamic_anon, which means Generic<{}>
-	*)
-	change_param_type md tl =
-		let types = match md with
-			| TClassDecl c -> c.cl_params
-			| TEnumDecl e -> []
-			| TAbstractDecl a -> a.a_params
-			| TTypeDecl t -> t.t_params
-		in
-		let is_hxgeneric = if types = [] then is_hxgen md else (TypeParams.RealTypeParams.is_hxgeneric md) in
-		let ret t =
-			let t_changed = real_type t in
-			match is_hxgeneric, t_changed with
-			| false, _ -> t
-			(*
-				Because Null<> types need a special compiler treatment for many operations (e.g. boxing/unboxing),
-				Null<> type parameters will be transformed into Dynamic.
-			*)
-			| true, TInst ( { cl_path = (["haxe";"lang"], "Null") }, _ ) -> dynamic_anon
-			| true, TInst ( { cl_kind = KTypeParameter _ }, _ ) -> t
-			| true, TInst _
-			| true, TEnum _
-			| true, TAbstract _ when is_cs_basic_type t_changed -> t
-			| true, TDynamic _ -> t
-			| true, x ->
-				dynamic_anon
+		let is_dynamic t = match real_type t with
+			| TMono _ | TDynamic _
+			| TInst({ cl_kind = KTypeParameter _ }, _) -> true
+			| TAnon anon ->
+				(match !(anon.a_status) with
+					| EnumStatics _ | Statics _ -> false
+					| _ -> true
+				)
+			| _ -> false
 		in
-		if is_hxgeneric && (erase_generics || List.exists (fun t -> match follow t with | TDynamic _ -> true | _ -> false) tl) then
-			List.map (fun _ -> t_dynamic) tl
-		else
-			List.map ret tl
-	in
-
-	let is_dynamic t = match real_type t with
-		| TMono _ | TDynamic _
-		| TInst({ cl_kind = KTypeParameter _ }, _) -> true
-		| TAnon anon ->
-			(match !(anon.a_status) with
-				| EnumStatics _ | Statics _ -> false
-				| _ -> true
-			)
-		| _ -> false
-	in
 
-	let rec t_s t =
-		match real_type t with
-			(* basic types *)
-			| TAbstract ({ a_path = ([], "Bool") },[]) -> "bool"
-			| TAbstract ({ a_path = ([], "Void") },[]) -> "object"
-			| TAbstract ({ a_path = ([],"Float") },[]) -> "double"
-			| TAbstract ({ a_path = ([],"Int") },[]) -> "int"
-			| TAbstract ({ a_path = [],"UInt" },[]) -> "uint"
-			| TType ({ t_path = ["cs"], "Int64" },[])
-			| TAbstract ({ a_path = ["cs"], "Int64" },[]) -> "long"
-			| TType ({ t_path = ["cs"],"UInt64" },[])
-			| TAbstract ({ a_path = ["cs"],"UInt64" },[]) -> "ulong"
-			| TType ({ t_path = ["cs"],"UInt8" },[])
-			| TAbstract ({ a_path = ["cs"],"UInt8" },[]) -> "byte"
-			| TType ({ t_path = ["cs"],"Int8" },[])
-			| TAbstract ({ a_path = ["cs"],"Int8" },[]) -> "sbyte"
-			| TType ({ t_path = ["cs"],"Int16" },[])
-			| TAbstract ({ a_path = ["cs"],"Int16" },[]) -> "short"
-			| TType ({ t_path = ["cs"],"UInt16" },[])
-			| TAbstract ({ a_path = ["cs"],"UInt16" },[]) -> "ushort"
-			| TType ({ t_path = ["cs"],"Char16" },[])
-			| TAbstract ({ a_path = ["cs"],"Char16" },[]) -> "char"
-			| TType ({ t_path = [],"Single" },[])
-			| TAbstract ({ a_path = [],"Single" },[]) -> "float"
-			| TInst ({ cl_path = ["haxe"],"Int32" },[])
-			| TAbstract ({ a_path = ["haxe"],"Int32" },[]) -> "int"
-			| TInst ({ cl_path = ["haxe"],"Int64" },[])
-			| TAbstract ({ a_path = ["haxe"],"Int64" },[]) -> "long"
-			| TInst ({ cl_path = ([], "Dynamic") },_)
-			| TAbstract ({ a_path = ([], "Dynamic") },_) -> "object"
-			| TType ({ t_path = ["cs"],"Out" },[t])
-			| TAbstract ({ a_path = ["cs"],"Out" },[t])
-			| TType ({ t_path = ["cs"],"Ref" },[t])
-			| TAbstract ({ a_path = ["cs"],"Ref" },[t]) -> t_s t
-			| TInst({ cl_path = (["cs"], "NativeArray") }, [param]) ->
-				let rec check_t_s t =
-					match real_type t with
-						| TInst({ cl_path = (["cs"], "NativeArray") }, [param]) ->
-							(check_t_s param) ^ "[]"
-						| _ -> t_s (run_follow gen t)
-				in
-				(check_t_s param) ^ "[]"
-			| TInst({ cl_path = (["cs"], "Pointer") },[t])
-			| TAbstract({ a_path = (["cs"], "Pointer") },[t])->
-				let ret = t_s t in
-				(if ret = "object" then "void" else ret) ^ "*"
-			(* end of basic types *)
-			| TInst ({ cl_kind = KTypeParameter _; cl_path=p }, []) -> snd p
-			| TMono r -> (match !r with | None -> "object" | Some t -> t_s (run_follow gen t))
-			| TInst ({ cl_path = [], "String" }, []) -> "string"
-			| TEnum (e, params) -> ("global::" ^ (module_s (TEnumDecl e)))
-			| TInst (cl, _ :: _) when Meta.has Meta.Enum cl.cl_meta ->
-				"global::" ^ module_s (TClassDecl cl)
-			| TInst (({ cl_path = p } as cl), params) -> (path_param_s (TClassDecl cl) p params)
-			| TType (({ t_path = p } as t), params) -> (path_param_s (TTypeDecl t) p params)
-			| TAnon (anon) ->
-				(match !(anon.a_status) with
-					| Statics _ | EnumStatics _ -> "System.Type"
-					| _ -> "object")
-			| TDynamic _ -> "object"
-			| TAbstract(a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
-				t_s (Abstract.get_underlying_type a pl)
-			(* No Lazy type nor Function type made. That's because function types will be at this point be converted into other types *)
-			| _ -> if !strict_mode then begin trace ("[ !TypeError " ^ (Type.s_type (Type.print_context()) t) ^ " ]"); assert false end else "[ !TypeError " ^ (Type.s_type (Type.print_context()) t) ^ " ]"
-
-	and path_param_s md path params =
-			match params with
-				| [] -> "global::" ^ module_s md
-				| _ when erase_generics && is_hxgeneric md ->
-					"global::" ^ module_s md
-				| _ ->
-					let params = (List.map (fun t -> t_s t) (change_param_type md params)) in
-					let str,params = module_s_params md params in
-					if params = [] then
-						"global::" ^ str
-					else
-						sprintf "global::%s<%s>" str (String.concat ", " params)
-	in
+		let rec t_s t =
+			match real_type t with
+				(* basic types *)
+				| TAbstract ({ a_path = ([], "Bool") },[]) -> "bool"
+				| TAbstract ({ a_path = ([], "Void") },[]) -> "object"
+				| TAbstract ({ a_path = ([],"Float") },[]) -> "double"
+				| TAbstract ({ a_path = ([],"Int") },[]) -> "int"
+				| TAbstract ({ a_path = [],"UInt" },[]) -> "uint"
+				| TType ({ t_path = ["cs"], "Int64" },[])
+				| TAbstract ({ a_path = ["cs"], "Int64" },[]) -> "long"
+				| TType ({ t_path = ["cs"],"UInt64" },[])
+				| TAbstract ({ a_path = ["cs"],"UInt64" },[]) -> "ulong"
+				| TType ({ t_path = ["cs"],"UInt8" },[])
+				| TAbstract ({ a_path = ["cs"],"UInt8" },[]) -> "byte"
+				| TType ({ t_path = ["cs"],"Int8" },[])
+				| TAbstract ({ a_path = ["cs"],"Int8" },[]) -> "sbyte"
+				| TType ({ t_path = ["cs"],"Int16" },[])
+				| TAbstract ({ a_path = ["cs"],"Int16" },[]) -> "short"
+				| TType ({ t_path = ["cs"],"UInt16" },[])
+				| TAbstract ({ a_path = ["cs"],"UInt16" },[]) -> "ushort"
+				| TType ({ t_path = ["cs"],"Char16" },[])
+				| TAbstract ({ a_path = ["cs"],"Char16" },[]) -> "char"
+				| TType ({ t_path = [],"Single" },[])
+				| TAbstract ({ a_path = [],"Single" },[]) -> "float"
+				| TInst ({ cl_path = ["haxe"],"Int32" },[])
+				| TAbstract ({ a_path = ["haxe"],"Int32" },[]) -> "int"
+				| TInst ({ cl_path = ["haxe"],"Int64" },[])
+				| TAbstract ({ a_path = ["haxe"],"Int64" },[]) -> "long"
+				| TInst ({ cl_path = ([], "Dynamic") },_)
+				| TAbstract ({ a_path = ([], "Dynamic") },_) -> "object"
+				| TType ({ t_path = ["cs"],"Out" },[t])
+				| TAbstract ({ a_path = ["cs"],"Out" },[t])
+				| TType ({ t_path = ["cs"],"Ref" },[t])
+				| TAbstract ({ a_path = ["cs"],"Ref" },[t]) -> t_s t
+				| TInst({ cl_path = (["cs"], "NativeArray") }, [param]) ->
+					let rec check_t_s t =
+						match real_type t with
+							| TInst({ cl_path = (["cs"], "NativeArray") }, [param]) ->
+								(check_t_s param) ^ "[]"
+							| _ -> t_s (run_follow gen t)
+					in
+					(check_t_s param) ^ "[]"
+				| TInst({ cl_path = (["cs"], "Pointer") },[t])
+				| TAbstract({ a_path = (["cs"], "Pointer") },[t])->
+					let ret = t_s t in
+					(if ret = "object" then "void" else ret) ^ "*"
+				(* end of basic types *)
+				| TInst ({ cl_kind = KTypeParameter _; cl_path=p }, []) -> snd p
+				| TMono r -> (match !r with | None -> "object" | Some t -> t_s (run_follow gen t))
+				| TInst ({ cl_path = [], "String" }, []) -> "string"
+				| TEnum (e, params) -> ("global::" ^ (module_s (TEnumDecl e)))
+				| TInst (cl, _ :: _) when Meta.has Meta.Enum cl.cl_meta ->
+					"global::" ^ module_s (TClassDecl cl)
+				| TInst (({ cl_path = p } as cl), params) -> (path_param_s (TClassDecl cl) p params)
+				| TType (({ t_path = p } as t), params) -> (path_param_s (TTypeDecl t) p params)
+				| TAnon (anon) ->
+					(match !(anon.a_status) with
+						| Statics _ | EnumStatics _ -> "System.Type"
+						| _ -> "object")
+				| TDynamic _ -> "object"
+				| TAbstract(a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
+					t_s (Abstract.get_underlying_type a pl)
+				(* No Lazy type nor Function type made. That's because function types will be at this point be converted into other types *)
+				| _ -> if !strict_mode then begin trace ("[ !TypeError " ^ (Type.s_type (Type.print_context()) t) ^ " ]"); assert false end else "[ !TypeError " ^ (Type.s_type (Type.print_context()) t) ^ " ]"
+
+		and path_param_s md path params =
+				match params with
+					| [] -> "global::" ^ module_s md
+					| _ when erase_generics && is_hxgeneric md ->
+						"global::" ^ module_s md
+					| _ ->
+						let params = (List.map (fun t -> t_s t) (change_param_type md params)) in
+						let str,params = module_s_params md params in
+						if params = [] then
+							"global::" ^ str
+						else
+							sprintf "global::%s<%s>" str (String.concat ", " params)
+		in
 
-	let rett_s t =
-		match t with
-			| TAbstract ({ a_path = ([], "Void") },[]) -> "void"
-			| _ -> t_s t
-	in
+		let rett_s t =
+			match t with
+				| TAbstract ({ a_path = ([], "Void") },[]) -> "void"
+				| _ -> t_s t
+		in
 
-	let escape ichar b =
-		match ichar with
-			| 92 (* \ *) -> Buffer.add_string b "\\\\"
-			| 39 (* ' *) -> Buffer.add_string b "\\\'"
-			| 34 -> Buffer.add_string b "\\\""
-			| 13 (* \r *) -> Buffer.add_string b "\\r"
-			| 10 (* \n *) -> Buffer.add_string b "\\n"
-			| 9 (* \t *) -> Buffer.add_string b "\\t"
-			| c when c < 32 || (c >= 127 && c <= 0xFFFF) -> Buffer.add_string b (Printf.sprintf "\\u%.4x" c)
-			| c when c > 0xFFFF -> Buffer.add_string b (Printf.sprintf "\\U%.8x" c)
-			| c -> Buffer.add_char b (Char.chr c)
-	in
+		let escape ichar b =
+			match ichar with
+				| 92 (* \ *) -> Buffer.add_string b "\\\\"
+				| 39 (* ' *) -> Buffer.add_string b "\\\'"
+				| 34 -> Buffer.add_string b "\\\""
+				| 13 (* \r *) -> Buffer.add_string b "\\r"
+				| 10 (* \n *) -> Buffer.add_string b "\\n"
+				| 9 (* \t *) -> Buffer.add_string b "\\t"
+				| c when c < 32 || (c >= 127 && c <= 0xFFFF) -> Buffer.add_string b (Printf.sprintf "\\u%.4x" c)
+				| c when c > 0xFFFF -> Buffer.add_string b (Printf.sprintf "\\U%.8x" c)
+				| c -> Buffer.add_char b (Char.chr c)
+		in
 
-	let escape s =
-		let b = Buffer.create 0 in
-		(try
-			UTF8.validate s;
-			UTF8.iter (fun c -> escape (UChar.code c) b) s
-		with
-			UTF8.Malformed_code ->
-				String.iter (fun c -> escape (Char.code c) b) s
-		);
-		Buffer.contents b
-	in
+		let escape s =
+			let b = Buffer.create 0 in
+			(try
+				UTF8.validate s;
+				UTF8.iter (fun c -> escape (UCharExt.code c) b) s
+			with
+				UTF8.Malformed_code ->
+					String.iter (fun c -> escape (Char.code c) b) s
+			);
+			Buffer.contents b
+		in
 
-	let has_semicolon e =
-		match e.eexpr with
-			| TBlock _ | TFor _ | TSwitch _ | TTry _ | TIf _ -> false
-			| TWhile (_,_,flag) when flag = Ast.NormalWhile -> false
-			| _ -> true
-	in
+		let has_semicolon e =
+			match e.eexpr with
+				| TBlock _ | TFor _ | TSwitch _ | TTry _ | TIf _ -> false
+				| TWhile (_,_,flag) when flag = Ast.NormalWhile -> false
+				| _ -> true
+		in
 
-	let in_value = ref false in
-
-	let rec md_s md =
-		let md = follow_module (gen.gfollow#run_f) md in
-		match md with
-			| TClassDecl ({ cl_params = [] } as cl) ->
-				t_s (TInst(cl,[]))
-			| TClassDecl (cl) when not (is_hxgen md) ->
-				t_s (TInst(cl,List.map (fun t -> t_dynamic) cl.cl_params))
-			| TEnumDecl ({ e_params = [] } as e) ->
-				t_s (TEnum(e,[]))
-			| TEnumDecl (e) when not (is_hxgen md) ->
-				t_s (TEnum(e,List.map (fun t -> t_dynamic) e.e_params))
-			| TClassDecl cl ->
-				t_s (TInst(cl,[]))
-			| TEnumDecl e ->
-				t_s (TEnum(e,[]))
-			| TTypeDecl t ->
-				t_s (TType(t, List.map (fun t -> t_dynamic) t.t_params))
-			| TAbstractDecl a ->
-				t_s (TAbstract(a, List.map(fun t -> t_dynamic) a.a_params))
-	in
+		let in_value = ref false in
+
+		let rec md_s md =
+			let md = follow_module (gen.gfollow#run_f) md in
+			match md with
+				| TClassDecl ({ cl_params = [] } as cl) ->
+					t_s (TInst(cl,[]))
+				| TClassDecl (cl) when not (is_hxgen md) ->
+					t_s (TInst(cl,List.map (fun t -> t_dynamic) cl.cl_params))
+				| TEnumDecl ({ e_params = [] } as e) ->
+					t_s (TEnum(e,[]))
+				| TEnumDecl (e) when not (is_hxgen md) ->
+					t_s (TEnum(e,List.map (fun t -> t_dynamic) e.e_params))
+				| TClassDecl cl ->
+					t_s (TInst(cl,[]))
+				| TEnumDecl e ->
+					t_s (TEnum(e,[]))
+				| TTypeDecl t ->
+					t_s (TType(t, List.map (fun t -> t_dynamic) t.t_params))
+				| TAbstractDecl a ->
+					t_s (TAbstract(a, List.map(fun t -> t_dynamic) a.a_params))
+		in
 
-	let rec ensure_local e explain =
-		match e.eexpr with
-			| TLocal _ -> e
-			| TCast(e,_)
-			| TParenthesis e | TMeta(_,e) -> ensure_local e explain
-			| _ -> gen.gcon.error ("This function argument " ^ explain ^ " must be a local variable.") e.epos; e
-	in
+		let rec ensure_local e explain =
+			match e.eexpr with
+				| TLocal _ -> e
+				| TCast(e,_)
+				| TParenthesis e | TMeta(_,e) -> ensure_local e explain
+				| _ -> gen.gcon.error ("This function argument " ^ explain ^ " must be a local variable.") e.epos; e
+		in
 
-	let rec ensure_refout e explain =
-		match e.eexpr with
-			| TField _ | TLocal _ -> e
-			| TCast(e,_)
-			| TParenthesis e | TMeta(_,e) -> ensure_refout e explain
-			| _ -> gen.gcon.error ("This function argument " ^ explain ^ " must be a local variable.") e.epos; e
-	in
+		let rec ensure_refout e explain =
+			match e.eexpr with
+				| TField _ | TLocal _ -> e
+				| TCast(e,_)
+				| TParenthesis e | TMeta(_,e) -> ensure_refout e explain
+				| _ -> gen.gcon.error ("This function argument " ^ explain ^ " must be a local variable.") e.epos; e
+		in
 
-	let last_line = ref (-1) in
-	let begin_block w = write w "{"; push_indent w; newline w; last_line := -1 in
-	let end_block w = pop_indent w; (if w.sw_has_content then newline w); write w "}"; newline w; last_line := -1 in
-	let skip_line_directives = (not gen.gcon.debug && not (Common.defined gen.gcon Define.NoCompilation)) || Common.defined gen.gcon Define.RealPosition in
-	let line_directive =
-		if skip_line_directives then
-			fun w p -> ()
-		else fun w p ->
-			if p.pfile <> null_pos.pfile then (* Compiler Error CS1560 https://msdn.microsoft.com/en-us/library/z3t5e5sw(v=vs.90).aspx *)
-			let cur_line = Lexer.get_error_line p in
-			let file = Path.get_full_path p.pfile in
-			if cur_line <> ((!last_line)+1) then
-				let line = Ast.s_escape file in
-				if String.length line <= 256 then
-					begin print w "#line %d \"%s\"" cur_line line; newline w end
-				else (* Compiler Error CS1560 https://msdn.microsoft.com/en-us/library/z3t5e5sw(v=vs.90).aspx *)
-					begin print w "//line %d \"%s\"" cur_line line; newline w end;
-			last_line := cur_line
-	in
-	let line_reset_directive =
-		if skip_line_directives then
-			fun w -> ()
-		else fun w ->
-			print w "#line default"
-	in
+		let last_line = ref (-1) in
+		let begin_block w = write w "{"; push_indent w; newline w; last_line := -1 in
+		let end_block w = pop_indent w; (if w.sw_has_content then newline w); write w "}"; newline w; last_line := -1 in
+		let skip_line_directives = (not gen.gcon.debug && not (Common.defined gen.gcon Define.NoCompilation)) || Common.defined gen.gcon Define.RealPosition in
+		let line_directive =
+			if skip_line_directives then
+				fun w p -> ()
+			else fun w p ->
+				if p.pfile <> null_pos.pfile then (* Compiler Error CS1560 https://msdn.microsoft.com/en-us/library/z3t5e5sw(v=vs.90).aspx *)
+				let cur_line = Lexer.get_error_line p in
+				let file = Path.get_full_path p.pfile in
+				if cur_line <> ((!last_line)+1) then
+					let line = StringHelper.s_escape file in
+					if String.length line <= 256 then
+						begin print w "#line %d \"%s\"" cur_line line; newline w end
+					else (* Compiler Error CS1560 https://msdn.microsoft.com/en-us/library/z3t5e5sw(v=vs.90).aspx *)
+						begin print w "//line %d \"%s\"" cur_line line; newline w end;
+				last_line := cur_line
+		in
+		let line_reset_directive =
+			if skip_line_directives then
+				fun w -> ()
+			else fun w ->
+				print w "#line default"
+		in
 
-	let rec extract_tparams params el =
-		match el with
-			| ({ eexpr = TLocal({ v_name = "$type_param" }) } as tp) :: tl ->
-				extract_tparams (tp.etype :: params) tl
-			| _ -> (params, el)
-	in
+		let rec extract_tparams params el =
+			match el with
+				| ({ eexpr = TIdent "$type_param" } as tp) :: tl ->
+					extract_tparams (tp.etype :: params) tl
+				| _ -> (params, el)
+		in
 
-	let is_extern_prop t name = match follow (run_follow gen t), field_access gen t name with
-		| TInst({ cl_interface = true; cl_extern = true } as cl, _), FNotFound ->
-			not (is_hxgen (TClassDecl cl))
-		| _, FClassField(_,_,decl,v,_,t,_) ->
-			Type.is_extern_field v && (Meta.has Meta.Property v.cf_meta || (decl.cl_extern && not (is_hxgen (TClassDecl decl))))
-		| _ -> false
-	in
+		let is_extern_prop t name = match follow (run_follow gen t), field_access gen t name with
+			| TInst({ cl_interface = true; cl_extern = true } as cl, _), FNotFound ->
+				not (is_hxgen (TClassDecl cl))
+			| _, FClassField(_,_,decl,v,_,t,_) ->
+				not (Type.is_physical_field v) && (Meta.has Meta.Property v.cf_meta || (decl.cl_extern && not (is_hxgen (TClassDecl decl))))
+			| _ -> false
+		in
 
-	let is_event t name = match follow (run_follow gen t), field_access gen t name with
-		| TInst({ cl_interface = true; cl_extern = true } as cl, _), FNotFound ->
-			not (is_hxgen (TClassDecl cl))
-		| _, FClassField(_,_,decl,v,_,_,_) ->
-			Meta.has Meta.Event v.cf_meta
-		| _ -> false
-	in
+		let is_event t name = match follow (run_follow gen t), field_access gen t name with
+			| TInst({ cl_interface = true; cl_extern = true } as cl, _), FNotFound ->
+				not (is_hxgen (TClassDecl cl))
+			| _, FClassField(_,_,decl,v,_,_,_) ->
+				Meta.has Meta.Event v.cf_meta
+			| _ -> false
+		in
 
-	let extract_statements expr =
-		let ret = ref [] in
-		let rec loop expr = match expr.eexpr with
-			| TCall ({ eexpr = TLocal {
-					v_name = "__is__" | "__typeof__" | "__array__" | "__sizeof__" | "__delegate__"
-				} }, el) ->
-				List.iter loop el
-			| TNew ({ cl_path = (["cs"], "NativeArray") }, params, [ size ]) ->
-				()
-			| TUnop (Ast.Increment, _, _)
-			| TUnop (Ast.Decrement, _, _)
-			| TBinop (Ast.OpAssign, _, _)
-			| TBinop (Ast.OpAssignOp _, _, _)
-			| TLocal { v_name = "__fallback__" }
-			| TLocal { v_name = "__sbreak__" } ->
-				ret := expr :: !ret
-			| TConst _
-			| TLocal _
-			| TArray _
-			| TBinop _
-			| TField _
-			| TEnumParameter _
-			| TTypeExpr _
-			| TObjectDecl _
-			| TArrayDecl _
-			| TCast _
-			| TMeta _
-			| TParenthesis _
-			| TUnop _ ->
-				Type.iter loop expr
-			| TFunction _ -> () (* do not extract parameters from inside of it *)
-			| _ ->
-				ret := expr :: !ret
+		let extract_statements expr =
+			let ret = ref [] in
+			let rec loop expr = match expr.eexpr with
+				| TCall ({ eexpr = TIdent ("__is__" | "__typeof__" | "__array__" | "__sizeof__" | "__delegate__")}, el) ->
+					List.iter loop el
+				| TNew ({ cl_path = (["cs"], "NativeArray") }, params, [ size ]) ->
+					()
+				| TUnop (Ast.Increment, _, _)
+				| TUnop (Ast.Decrement, _, _)
+				| TBinop (Ast.OpAssign, _, _)
+				| TBinop (Ast.OpAssignOp _, _, _)
+				| TIdent "__fallback__"
+				| TIdent "__sbreak__" ->
+					ret := expr :: !ret
+				| TConst _
+				| TLocal _
+				| TArray _
+				| TBinop _
+				| TField _
+				| TEnumParameter _
+				| TTypeExpr _
+				| TObjectDecl _
+				| TArrayDecl _
+				| TCast _
+				| TParenthesis _
+				| TUnop _ ->
+					Type.iter loop expr
+				| TFunction _ -> () (* do not extract parameters from inside of it *)
+				| _ ->
+					ret := expr :: !ret
+			in
+			loop expr;
+			(* [expr] *)
+			List.rev !ret
 		in
-		loop expr;
-		(* [expr] *)
-		List.rev !ret
-	in
 
-	let expr_s w e =
-		last_line := -1;
-		in_value := false;
-		let rec expr_s w e =
-			let was_in_value = !in_value in
-			in_value := true;
-			(match e.eexpr with
-				| TCall({ eexpr = TField(ef,f) }, (_ :: _ as args) ) when (field_name f) = "get_Item" ->
-					expr_s w ef;
-					write w "[";
-					let first = ref true in
-					List.iter (fun f ->
-						if !first then first := false else write w ", ";
-						expr_s w f
-					) args;
-					write w "]"
-				| TCall({ eexpr = TField(ef,f) }, (_ :: _ :: _ as args) ) when (field_name f) = "set_Item" ->
-					expr_s w ef;
-					write w "[";
-					let args, value = match List.rev args with
-						| v :: args -> List.rev args, v
-						| _ -> assert false
-					in
-					let first = ref true in
-					List.iter (fun f ->
-						if !first then first := false else write w ", ";
-						expr_s w f
-					) args;
-					write w "] = ";
-					expr_s w value
-				| TCall( ({ eexpr = TField(ef,f) } as e), [ev] ) when String.starts_with (field_name f) "add_" ->
-					let name = field_name f in
-					let propname = String.sub name 4 (String.length name - 4) in
-					if is_event (gen.greal_type ef.etype) propname then begin
-						expr_s w ef;
-						write w ".";
-						write_field w propname;
-						write w " += ";
-						expr_s w ev
-					end else
-						do_call w e [ev]
-				| TCall( ({ eexpr = TField(ef,f) } as e), [ev] ) when String.starts_with (field_name f) "remove_" ->
-					let name = field_name f in
-					let propname = String.sub name 7 (String.length name - 7) in
-					if is_event (gen.greal_type ef.etype) propname then begin
-						expr_s w ef;
-						write w ".";
-						write_field w propname;
-						write w " -= ";
-						expr_s w ev
-					end else
-						do_call w e [ev]
-				| TCall( ({ eexpr = TField(ef,f) } as e), [] ) when String.starts_with (field_name f) "get_" ->
-					let name = field_name f in
-					let propname = String.sub name 4 (String.length name - 4) in
-					if is_extern_prop (gen.greal_type ef.etype) propname then begin
+		let expr_s is_in_value w e =
+			last_line := -1;
+			in_value := is_in_value;
+			let rec expr_s w e =
+				let was_in_value = !in_value in
+				in_value := true;
+				(match e.eexpr with
+					| TCall({ eexpr = TField(ef,f) }, (_ :: _ as args) ) when (field_name f) = "get_Item" ->
 						expr_s w ef;
-						write w ".";
-						write_field w propname
-					end else
-						do_call w e []
-				| TCall( ({ eexpr = TField(ef,f) } as e), [v] ) when String.starts_with (field_name f) "set_" ->
-					let name = field_name f in
-					let propname = String.sub name 4 (String.length name - 4) in
-					if is_extern_prop (gen.greal_type ef.etype) propname then begin
+						write w "[";
+						let first = ref true in
+						List.iter (fun f ->
+							if !first then first := false else write w ", ";
+							expr_s w f
+						) args;
+						write w "]"
+					| TCall({ eexpr = TField(ef,f) }, (_ :: _ :: _ as args) ) when (field_name f) = "set_Item" ->
 						expr_s w ef;
+						write w "[";
+						let args, value = match List.rev args with
+							| v :: args -> List.rev args, v
+							| _ -> assert false
+						in
+						let first = ref true in
+						List.iter (fun f ->
+							if !first then first := false else write w ", ";
+							expr_s w f
+						) args;
+						write w "] = ";
+						expr_s w value
+					| TCall( ({ eexpr = TField(ef,f) } as e), [ev] ) when String.starts_with (field_name f) "add_" ->
+						let name = field_name f in
+						let propname = String.sub name 4 (String.length name - 4) in
+						if is_event (gen.greal_type ef.etype) propname then begin
+							expr_s w ef;
+							write w ".";
+							(get_write_field f) w propname;
+							write w " += ";
+							expr_s w ev
+						end else
+							do_call w e [ev]
+					| TCall( ({ eexpr = TField(ef,f) } as e), [ev] ) when String.starts_with (field_name f) "remove_" ->
+						let name = field_name f in
+						let propname = String.sub name 7 (String.length name - 7) in
+						if is_event (gen.greal_type ef.etype) propname then begin
+							expr_s w ef;
+							write w ".";
+							(get_write_field f) w propname;
+							write w " -= ";
+							expr_s w ev
+						end else
+							do_call w e [ev]
+					| TCall( ({ eexpr = TField(ef,f) } as e), [] ) when String.starts_with (field_name f) "get_" ->
+						let name = field_name f in
+						let propname = String.sub name 4 (String.length name - 4) in
+						if is_extern_prop (gen.greal_type ef.etype) propname then
+							if not was_in_value then
+								write w "{}"
+							else begin
+								expr_s w ef;
+								write w ".";
+								(get_write_field f) w propname
+							end
+						else
+							do_call w e []
+					| TCall( ({ eexpr = TField(ef,f) } as e), [v] ) when String.starts_with (field_name f) "set_" ->
+						let name = field_name f in
+						let propname = String.sub name 4 (String.length name - 4) in
+						if is_extern_prop (gen.greal_type ef.etype) propname then begin
+							expr_s w ef;
+							write w ".";
+							(get_write_field f) w propname;
+							write w " = ";
+							expr_s w v
+						end else
+							do_call w e [v]
+					| TField (e, ((FStatic(_, cf) | FInstance(_, _, cf)) as f)) when Meta.has Meta.Native cf.cf_meta ->
+						let rec loop meta = match meta with
+							| (Meta.Native, [EConst (String(s,_)), _],_) :: _ ->
+								expr_s w e; write w "."; (get_write_field f) w s
+							| _ :: tl -> loop tl
+							| [] -> expr_s w e; write w "."; (get_write_field f) w (cf.cf_name)
+						in
+						loop cf.cf_meta
+					| TConst c ->
+						(match c with
+							| TInt i32 ->
+								write w (Int32.to_string i32);
+								(* these suffixes won't work because of the cast detector which will set each constant to its expected type *)
+								(*match real_type e.etype with
+									| TType( { t_path = (["haxe";"_Int64"], "NativeInt64") }, [] ) -> write w "L";
+									| _ -> ()
+								*)
+							| TFloat s ->
+								write w s;
+								(if String.get s (String.length s - 1) = '.' then write w "0");
+								(*match real_type e.etype with
+									| TType( { t_path = ([], "Single") }, [] ) -> write w "f"
+									| _ -> ()
+								*)
+							| TString s ->
+								write w "\"";
+								write w (escape s);
+								write w "\""
+							| TBool b -> write w (if b then "true" else "false")
+							| TNull when is_cs_basic_type e.etype || is_tparam e.etype ->
+								write w "default(";
+								write w (t_s e.etype);
+								write w ")"
+							| TNull -> write w "null"
+							| TThis -> write w "this"
+							| TSuper -> write w "base")
+					| TCast({ eexpr = TConst(TNull) }, _) ->
+								write w "default(";
+								write w (t_s e.etype);
+								write w ")"
+					| TIdent "__sbreak__" -> write w "break"
+					| TIdent "__undefined__" ->
+						write w (t_s (TInst(runtime_cl, List.map (fun _ -> t_dynamic) runtime_cl.cl_params)));
+						write w ".undefined";
+					| TIdent "__typeof__" -> write w "typeof"
+					| TIdent "__sizeof__" -> write w "sizeof"
+					| TLocal var ->
+						write_id w var.v_name
+					| TField (_, (FEnum(e, ef) as f)) ->
+						let s = ef.ef_name in
+						print w "%s." ("global::" ^ module_s (TEnumDecl e)); (get_write_field f) w s
+					| TArray (e1, e2) ->
+						expr_s w e1; write w "["; expr_s w e2; write w "]"
+					| TBinop ((Ast.OpAssign as op), e1, e2)
+					| TBinop ((Ast.OpAssignOp _ as op), e1, e2) ->
+						expr_s w e1; write w ( " " ^ (Ast.s_binop op) ^ " " ); expr_s w e2
+					(* hack to dodge #7034 *)
+					| TBinop (OpMod,_,e2) when (match (Texpr.skip e2).eexpr with TConst (TInt i32) -> i32 = Int32.zero | _ -> false) ->
+						write w ("System.Double.NaN")
+					| TBinop (op, e1, e2) ->
+						write w "( ";
+						expr_s w e1; write w ( " " ^ (Ast.s_binop op) ^ " " ); expr_s w e2;
+						write w " )"
+					| TField ({ eexpr = TTypeExpr mt }, s) ->
+						(match mt with
+							| TClassDecl { cl_path = (["haxe"], "Int64") } -> write w ("global::" ^ module_s mt)
+							| TClassDecl { cl_path = (["haxe"], "Int32") } -> write w ("global::" ^ module_s mt)
+							| TClassDecl { cl_interface = true } ->
+									write w ("global::" ^ module_s mt);
+									write w "__Statics_";
+							| TClassDecl cl -> write w (t_s (TInst(cl, List.map (fun _ -> t_empty) cl.cl_params)))
+							| TEnumDecl en -> write w (t_s (TEnum(en, List.map (fun _ -> t_empty) en.e_params)))
+							| TTypeDecl td -> write w (t_s (gen.gfollow#run_f (TType(td, List.map (fun _ -> t_empty) td.t_params))))
+							| TAbstractDecl a -> write w (t_s (TAbstract(a, List.map (fun _ -> t_empty) a.a_params)))
+						);
 						write w ".";
-						write_field w propname;
-						write w " = ";
-						expr_s w v
-					end else
-						do_call w e [v]
-				| TField (e, (FStatic(_, cf) | FInstance(_, _, cf))) when Meta.has Meta.Native cf.cf_meta ->
-					let rec loop meta = match meta with
-						| (Meta.Native, [EConst (String s), _],_) :: _ ->
-							expr_s w e; write w "."; write_field w s
-						| _ :: tl -> loop tl
-						| [] -> expr_s w e; write w "."; write_field w (cf.cf_name)
-					in
-					loop cf.cf_meta
-				| TConst c ->
-					(match c with
-						| TInt i32 ->
-							write w (Int32.to_string i32);
-							(* these suffixes won't work because of the cast detector which will set each constant to its expected type *)
-							(*match real_type e.etype with
-								| TType( { t_path = (["haxe";"_Int64"], "NativeInt64") }, [] ) -> write w "L";
-								| _ -> ()
-							*)
-						| TFloat s ->
-							write w s;
-							(if String.get s (String.length s - 1) = '.' then write w "0");
-							(*match real_type e.etype with
-								| TType( { t_path = ([], "Single") }, [] ) -> write w "f"
-								| _ -> ()
-							*)
-						| TString s ->
-							write w "\"";
-							write w (escape s);
-							write w "\""
-						| TBool b -> write w (if b then "true" else "false")
-						| TNull when is_cs_basic_type e.etype || is_tparam e.etype ->
-							write w "default(";
-							write w (t_s e.etype);
-							write w ")"
-						| TNull -> write w "null"
-						| TThis -> write w "this"
-						| TSuper -> write w "base")
-				| TCast({ eexpr = TConst(TNull) }, _) ->
-							write w "default(";
-							write w (t_s e.etype);
-							write w ")"
-				| TLocal { v_name = "__sbreak__" } -> write w "break"
-				| TLocal { v_name = "__undefined__" } ->
-					write w (t_s (TInst(runtime_cl, List.map (fun _ -> t_dynamic) runtime_cl.cl_params)));
-					write w ".undefined";
-				| TLocal { v_name = "__typeof__" } -> write w "typeof"
-				| TLocal { v_name = "__sizeof__" } -> write w "sizeof"
-				| TLocal var ->
-					write_id w var.v_name
-				| TField (_, FEnum(e, ef)) ->
-					let s = ef.ef_name in
-					print w "%s." ("global::" ^ module_s (TEnumDecl e)); write_field w s
-				| TArray (e1, e2) ->
-					expr_s w e1; write w "["; expr_s w e2; write w "]"
-				| TBinop ((Ast.OpAssign as op), e1, e2)
-				| TBinop ((Ast.OpAssignOp _ as op), e1, e2) ->
-					expr_s w e1; write w ( " " ^ (Ast.s_binop op) ^ " " ); expr_s w e2
-				| TBinop (op, e1, e2) ->
-					write w "( ";
-					expr_s w e1; write w ( " " ^ (Ast.s_binop op) ^ " " ); expr_s w e2;
-					write w " )"
-				| TField ({ eexpr = TTypeExpr mt }, s) ->
-					(match mt with
-						| TClassDecl { cl_path = (["haxe"], "Int64") } -> write w ("global::" ^ module_s mt)
-						| TClassDecl { cl_path = (["haxe"], "Int32") } -> write w ("global::" ^ module_s mt)
-						| TClassDecl { cl_interface = true } ->
-								write w ("global::" ^ module_s mt);
-								write w "__Statics_";
-						| TClassDecl cl -> write w (t_s (TInst(cl, List.map (fun _ -> t_empty) cl.cl_params)))
-						| TEnumDecl en -> write w (t_s (TEnum(en, List.map (fun _ -> t_empty) en.e_params)))
-						| TTypeDecl td -> write w (t_s (gen.gfollow#run_f (TType(td, List.map (fun _ -> t_empty) td.t_params))))
-						| TAbstractDecl a -> write w (t_s (TAbstract(a, List.map (fun _ -> t_empty) a.a_params)))
-					);
-					write w ".";
-					write_field w (field_name s)
-				| TField (e, s) when is_pointer gen e.etype ->
-					(* take off the extra cast if possible *)
-					let e = match e.eexpr with
-						| TCast(e1,_) when CastDetect.type_iseq gen e.etype e1.etype ->
-							e1
-						| _ -> e
-					in
-					expr_s w e; write w "->"; write_field w (field_name s)
-				| TField (e, s) ->
-					expr_s w e; write w "."; write_field w (field_name s)
-				| TTypeExpr mt ->
-					(match change_md mt with
-						| TClassDecl { cl_path = (["haxe"], "Int64") } -> write w ("global::" ^ module_s mt)
-						| TClassDecl { cl_path = (["haxe"], "Int32") } -> write w ("global::" ^ module_s mt)
-						| TClassDecl cl -> write w (t_s (TInst(cl, List.map (fun _ -> t_empty) cl.cl_params)));
-						| TEnumDecl en -> write w (t_s (TEnum(en, List.map (fun _ -> t_empty) en.e_params)))
-						| TTypeDecl td -> write w (t_s (gen.gfollow#run_f (TType(td, List.map (fun _ -> t_empty) td.t_params))))
-						| TAbstractDecl a -> write w (t_s (TAbstract(a, List.map (fun _ -> t_empty) a.a_params)))
-					)
-				| TParenthesis e ->
-					write w "("; expr_s w e; write w ")"
-				| TMeta (_,e) ->
-						expr_s w e
-				| TArrayDecl el
-				| TCall ({ eexpr = TLocal { v_name = "__array__" } }, el)
-				| TCall ({ eexpr = TField(_, FStatic({ cl_path = (["cs"],"NativeArray") }, { cf_name = "make" })) }, el) ->
-					let _, el = extract_tparams [] el in
-					print w "new %s" (t_s e.etype);
-					write w "{";
-					ignore (List.fold_left (fun acc e ->
-						(if acc <> 0 then write w ", ");
+						(get_write_field s) w (field_name s)
+					| TField (e, s) when is_pointer gen e.etype ->
+						(* take off the extra cast if possible *)
+						let e = match e.eexpr with
+							| TCast(e1,_) when CastDetect.type_iseq gen e.etype e1.etype ->
+								e1
+							| _ -> e
+						in
+						expr_s w e; write w "->"; (get_write_field s) w (field_name s)
+					| TField (e, s) ->
+						expr_s w e; write w "."; (get_write_field s) w (field_name s)
+					| TTypeExpr mt ->
+						(match change_md mt with
+							| TClassDecl { cl_path = (["haxe"], "Int64") } -> write w ("global::" ^ module_s mt)
+							| TClassDecl { cl_path = (["haxe"], "Int32") } -> write w ("global::" ^ module_s mt)
+							| TClassDecl cl -> write w (t_s (TInst(cl, List.map (fun _ -> t_empty) cl.cl_params)));
+							| TEnumDecl en -> write w (t_s (TEnum(en, List.map (fun _ -> t_empty) en.e_params)))
+							| TTypeDecl td -> write w (t_s (gen.gfollow#run_f (TType(td, List.map (fun _ -> t_empty) td.t_params))))
+							| TAbstractDecl a -> write w (t_s (TAbstract(a, List.map (fun _ -> t_empty) a.a_params)))
+						)
+					| TParenthesis e ->
+						write w "("; expr_s w e; write w ")"
+					| TMeta ((Meta.LoopLabel,[(EConst(Int n),_)],_), e) ->
+						(match e.eexpr with
+						| TFor _ | TWhile _ ->
+							expr_s w e;
+							print w "label%s: {}" n
+						| TBreak -> print w "goto label%s" n
+						| _ -> assert false)
+					| TMeta (_,e) ->
+								expr_s w e
+					| TArrayDecl el
+					| TCall ({ eexpr = TIdent "__array__" }, el)
+					| TCall ({ eexpr = TField(_, FStatic({ cl_path = (["cs"],"NativeArray") }, { cf_name = "make" })) }, el) ->
+						let _, el = extract_tparams [] el in
+						print w "new %s" (t_s e.etype);
+						write w "{";
+						ignore (List.fold_left (fun acc e ->
+							(if acc <> 0 then write w ", ");
+							expr_s w e;
+							acc + 1
+						) 0 el);
+						write w "}"
+					| TCall ({ eexpr = TIdent "__delegate__" }, [del]) ->
+						expr_s w del
+					| TCall ({ eexpr = TIdent "__is__" }, [ expr; { eexpr = TTypeExpr(md) } ] ) ->
+						write w "( ";
+						expr_s w expr;
+						write w " is ";
+						write w (md_s md);
+						write w " )"
+					| TCall ({ eexpr = TIdent "__as__" }, [ expr; { eexpr = TTypeExpr(md) } ] ) ->
+						write w "( ";
+						expr_s w expr;
+						write w " as ";
+						write w (md_s md);
+						write w " )"
+					| TCall ({ eexpr = TIdent "__as__" }, expr :: _ ) ->
+						write w "( ";
+						expr_s w expr;
+						write w " as ";
+						write w (t_s e.etype);
+						write w " )";
+					| TCall ({ eexpr = TIdent "__cs__" }, [ { eexpr = TConst(TString(s)) } ] ) ->
+						write w s
+					| TCall ({ eexpr = TIdent "__cs__" }, { eexpr = TConst(TString(s)) } :: tl ) ->
+						Codegen.interpolate_code gen.gcon s tl (write w) (expr_s w) e.epos
+					| TCall ({ eexpr = TIdent "__stackalloc__" }, [ e ] ) ->
+						write w "stackalloc byte[";
 						expr_s w e;
-						acc + 1
-					) 0 el);
-					write w "}"
-				| TCall ({ eexpr = TLocal { v_name = "__delegate__" } }, [del]) ->
-					expr_s w del
-				| TCall ({ eexpr = TLocal( { v_name = "__is__" } ) }, [ expr; { eexpr = TTypeExpr(md) } ] ) ->
-					write w "( ";
-					expr_s w expr;
-					write w " is ";
-					write w (md_s md);
-					write w " )"
-				| TCall ({ eexpr = TLocal( { v_name = "__as__" } ) }, [ expr; { eexpr = TTypeExpr(md) } ] ) ->
-					write w "( ";
-					expr_s w expr;
-					write w " as ";
-					write w (md_s md);
-					write w " )"
-				| TCall ({ eexpr = TLocal( { v_name = "__as__" } ) }, expr :: _ ) ->
-					write w "( ";
-					expr_s w expr;
-					write w " as ";
-					write w (t_s e.etype);
-					write w " )";
-				| TCall ({ eexpr = TLocal( { v_name = "__cs__" } ) }, [ { eexpr = TConst(TString(s)) } ] ) ->
-					write w s
-				| TCall ({ eexpr = TLocal( { v_name = "__cs__" } ) }, { eexpr = TConst(TString(s)) } :: tl ) ->
-					Codegen.interpolate_code gen.gcon s tl (write w) (expr_s w) e.epos
-				| TCall ({ eexpr = TLocal( { v_name = "__stackalloc__" } ) }, [ e ] ) ->
-					write w "stackalloc byte[";
-					expr_s w e;
-					write w "]"
-				| TCall ({ eexpr = TLocal( { v_name = "__unsafe__" } ) }, [ e ] ) ->
-					write w "unsafe";
-					expr_s w (mk_block e)
-				| TCall ({ eexpr = TLocal( { v_name = "__checked__" } ) }, [ e ] ) ->
-					write w "checked";
-					expr_s w (mk_block e)
-				| TCall ({ eexpr = TLocal( { v_name = "__lock__" } ) }, [ eobj; eblock ] ) ->
-					write w "lock(";
-					expr_s w eobj;
-					write w ")";
-					expr_s w (mk_block eblock)
-				| TCall ({ eexpr = TLocal( { v_name = "__fixed__" } ) }, [ e ] ) ->
-					let fixeds = ref [] in
-					let rec loop = function
-						| ({ eexpr = TVar(v, Some(e) ) } as expr) :: tl when is_pointer gen v.v_type ->
-							let e = match get_ptr e with
-								| None -> e
-								| Some e -> e
-							in
-							fixeds := (v,e,expr) :: !fixeds;
-							loop tl;
-						| el when !fixeds <> [] ->
-							let rec loop fx acc = match fx with
-								| (v,e,expr) :: tl ->
-									write w "fixed(";
-									let vf = mk_temp gen "fixed" v.v_type in
-									expr_s w { expr with eexpr = TVar(vf, Some e) };
-									write w ") ";
-									begin_block w;
-									expr_s w { expr with eexpr = TVar(v, Some (mk_local vf expr.epos)) };
-									write w ";";
-									newline w;
-									loop tl (acc + 1)
-								| [] -> acc
-							in
-							let nblocks = loop (List.rev !fixeds) 0 in
-							in_value := false;
-							expr_s w { e with eexpr = TBlock el };
-							for i = 1 to nblocks do
-								end_block w
-							done
-						| _ ->
-							trace (debug_expr e);
-							gen.gcon.error "Invalid 'fixed' keyword format" e.epos
-					in
-					(match e.eexpr with
-						| TBlock bl -> loop bl
-						| _ ->
-							trace "not block";
-							trace (debug_expr e);
-							gen.gcon.error "Invalid 'fixed' keyword format" e.epos
-					)
-				| TCall ({ eexpr = TLocal( { v_name = "__addressOf__" } ) }, [ e ] ) ->
-					let e = ensure_local e "for addressOf" in
-					write w "&";
-					expr_s w e
-				| TCall ({ eexpr = TLocal( { v_name = "__valueOf__" } ) }, [ e ] ) ->
-					write w "*(";
-					expr_s w e;
-					write w ")"
-				| TCall ({ eexpr = TLocal( { v_name = "__goto__" } ) }, [ { eexpr = TConst(TInt v) } ] ) ->
-					print w "goto label%ld" v
-				| TCall ({ eexpr = TLocal( { v_name = "__label__" } ) }, [ { eexpr = TConst(TInt v) } ] ) ->
-					print w "label%ld: {}" v
-				| TCall ({ eexpr = TLocal( { v_name = "__rethrow__" } ) }, _) ->
-					write w "throw"
-				(* operator overloading handling *)
-				| TCall({ eexpr = TField(ef, FInstance(cl,_,{ cf_name = "__get" })) }, [idx]) when not (is_hxgen (TClassDecl cl)) ->
-					expr_s w { e with eexpr = TArray(ef, idx) }
-				| TCall({ eexpr = TField(ef, FInstance(cl,_,{ cf_name = "__set" })) }, [idx; v]) when not (is_hxgen (TClassDecl cl)) ->
-					expr_s w { e with eexpr = TBinop(Ast.OpAssign, { e with eexpr = TArray(ef, idx) }, v) }
-				| TCall({ eexpr = TField(ef, FStatic(_,cf)) }, el) when PMap.mem cf.cf_name binops_names ->
-					let _, elr = extract_tparams [] el in
-					(match elr with
-					| [e1;e2] ->
-						expr_s w { e with eexpr = TBinop(PMap.find cf.cf_name binops_names, e1, e2) }
-					| _ -> do_call w e el)
-				| TCall({ eexpr = TField(ef, FStatic(_,cf)) }, el) when PMap.mem cf.cf_name unops_names ->
-					(match extract_tparams [] el with
-					| _, [e1] ->
-						expr_s w { e with eexpr = TUnop(PMap.find cf.cf_name unops_names, Ast.Prefix,e1) }
-					| _ -> do_call w e el)
-				| TCall (e, el) ->
-					do_call w e el
-				| TNew (({ cl_path = (["cs"], "NativeArray") } as cl), params, [ size ]) ->
-					let rec check_t_s t times =
-						match real_type t with
-							| TInst({ cl_path = (["cs"], "NativeArray") }, [param]) ->
-								(check_t_s param (times+1))
-							| _ ->
-								print w "new %s[" (t_s (run_follow gen t));
-								expr_s w size;
-								print w "]";
-								let rec loop i =
-									if i <= 0 then () else (write w "[]"; loop (i-1))
+						write w "]"
+					| TCall ({ eexpr = TIdent "__unsafe__" }, [ e ] ) ->
+						write w "unsafe ";
+						begin_block w;
+						expr_s w (mk_block e);
+						write w ";";
+						end_block w
+					| TCall ({ eexpr = TIdent "__checked__" }, [ e ] ) ->
+						write w "checked";
+						expr_s w (mk_block e)
+					| TCall ({ eexpr = TIdent "__lock__" }, [ eobj; eblock ] ) ->
+						write w "lock(";
+						expr_s w eobj;
+						write w ")";
+						expr_s w (mk_block eblock)
+					| TCall ({ eexpr = TIdent "__fixed__" }, [ e ] ) ->
+						let fixeds = ref [] in
+						let rec loop = function
+							| ({ eexpr = TVar(v, Some(e) ) } as expr) :: tl when is_pointer gen v.v_type ->
+								let e = match get_ptr e with
+									| None -> e
+									| Some e -> e
 								in
-								loop (times - 1)
-					in
-					check_t_s (TInst(cl, params)) 0
-				| TNew ({ cl_path = ([], "String") } as cl, [], el) ->
-					write w "new ";
-					write w (t_s (TInst(cl, [])));
-					write w "(";
-					ignore (List.fold_left (fun acc e ->
-						(if acc <> 0 then write w ", ");
-						expr_s w e;
-						acc + 1
-					) 0 el);
-					write w ")"
-				| TNew ({ cl_kind = KTypeParameter _ } as cl, params, el) ->
-					print w "default(%s) /* This code should never be reached. It was produced by the use of @:generic on a new type parameter instance: %s */" (t_s (TInst(cl,params))) (path_param_s (TClassDecl cl) cl.cl_path params)
-				| TNew (cl, params, el) ->
-					write w "new ";
-					write w (path_param_s (TClassDecl cl) cl.cl_path params);
-					write w "(";
-					ignore (List.fold_left (fun acc e ->
-						(if acc <> 0 then write w ", ");
+								fixeds := (v,e,expr) :: !fixeds;
+								loop tl;
+							| el when !fixeds <> [] ->
+								let rec loop fx acc = match fx with
+									| (v,e,expr) :: tl ->
+										write w "fixed(";
+										let vf = mk_temp "fixed" v.v_type in
+										expr_s w { expr with eexpr = TVar(vf, Some e) };
+										write w ") ";
+										begin_block w;
+										expr_s w { expr with eexpr = TVar(v, Some (mk_local vf expr.epos)) };
+										write w ";";
+										newline w;
+										loop tl (acc + 1)
+									| [] -> acc
+								in
+								let nblocks = loop (List.rev !fixeds) 0 in
+								in_value := false;
+								expr_s w { e with eexpr = TBlock el };
+								for i = 1 to nblocks do
+									end_block w
+								done
+							| _ ->
+								trace (debug_expr e);
+								gen.gcon.error "Invalid 'fixed' keyword format" e.epos
+						in
+						(match e.eexpr with
+							| TBlock bl -> loop bl
+							| _ ->
+								trace "not block";
+								trace (debug_expr e);
+								gen.gcon.error "Invalid 'fixed' keyword format" e.epos
+						)
+					| TCall ({ eexpr = TIdent "__addressOf__" }, [ e ] ) ->
+						let e = ensure_local e "for addressOf" in
+						write w "&";
+						expr_s w e
+					| TCall ({ eexpr = TIdent "__valueOf__" }, [ e ] ) ->
+						write w "*(";
 						expr_s w e;
-						acc + 1
-					) 0 el);
-					write w ")"
-				| TUnop ((Ast.Increment as op), flag, e)
-				| TUnop ((Ast.Decrement as op), flag, e) ->
-					(match flag with
-						| Ast.Prefix -> write w ( " " ^ (Ast.s_unop op) ^ " " ); expr_s w e
-						| Ast.Postfix -> expr_s w e; write w (Ast.s_unop op))
-				| TUnop (op, flag, e) ->
-					(match flag with
-						| Ast.Prefix -> write w ( " " ^ (Ast.s_unop op) ^ " (" ); expr_s w e; write w ") "
-						| Ast.Postfix -> write w "("; expr_s w e; write w (") " ^ Ast.s_unop op))
-				| TVar (var, eopt) ->
-					print w "%s " (t_s var.v_type);
-					write_id w var.v_name;
-					(match eopt with
-						| None ->
-							write w " = ";
-							expr_s w (null var.v_type e.epos)
-						| Some e ->
-							write w " = ";
-							expr_s w e
-					)
-				| TBlock [e] when was_in_value ->
-					expr_s w e
-				| TBlock el ->
-					begin_block w;
-					List.iter (fun e ->
+						write w ")"
+					(* operator overloading handling *)
+					| TCall({ eexpr = TField(ef, FInstance(cl,_,{ cf_name = "__get" })) }, [idx]) when not (is_hxgen (TClassDecl cl)) ->
+						expr_s w { e with eexpr = TArray(ef, idx) }
+					| TCall({ eexpr = TField(ef, FInstance(cl,_,{ cf_name = "__set" })) }, [idx; v]) when not (is_hxgen (TClassDecl cl)) ->
+						expr_s w { e with eexpr = TBinop(Ast.OpAssign, { e with eexpr = TArray(ef, idx) }, v) }
+					| TCall({ eexpr = TField(ef, FStatic(_,cf)) }, el) when PMap.mem cf.cf_name binops_names ->
+						let _, elr = extract_tparams [] el in
+						(match elr with
+						| [e1;e2] ->
+							expr_s w { e with eexpr = TBinop(PMap.find cf.cf_name binops_names, e1, e2) }
+						| _ -> do_call w e el)
+					| TCall({ eexpr = TField(ef, FStatic(_,cf)) }, el) when PMap.mem cf.cf_name unops_names ->
+						(match extract_tparams [] el with
+						| _, [e1] ->
+							expr_s w { e with eexpr = TUnop(PMap.find cf.cf_name unops_names, Ast.Prefix,e1) }
+						| _ -> do_call w e el)
+					| TCall (e, el) ->
+						do_call w e el
+					| TNew (({ cl_path = (["cs"], "NativeArray") } as cl), params, [ size ]) ->
+						let rec check_t_s t times =
+							match real_type t with
+								| TInst({ cl_path = (["cs"], "NativeArray") }, [param]) ->
+									(check_t_s param (times+1))
+								| _ ->
+									print w "new %s[" (t_s (run_follow gen t));
+									expr_s w size;
+									print w "]";
+									let rec loop i =
+										if i <= 0 then () else (write w "[]"; loop (i-1))
+									in
+									loop (times - 1)
+						in
+						check_t_s (TInst(cl, params)) 0
+					| TNew ({ cl_path = ([], "String") } as cl, [], el) ->
+						write w "new ";
+						write w (t_s (TInst(cl, [])));
+						write w "(";
+						ignore (List.fold_left (fun acc e ->
+							(if acc <> 0 then write w ", ");
+							expr_s w e;
+							acc + 1
+						) 0 el);
+						write w ")"
+					| TNew ({ cl_kind = KTypeParameter _ } as cl, params, el) ->
+						print w "default(%s) /* This code should never be reached. It was produced by the use of @:generic on a new type parameter instance: %s */" (t_s (TInst(cl,params))) (path_param_s (TClassDecl cl) cl.cl_path params)
+					| TNew (cl, params, el) ->
+						write w "new ";
+						write w (path_param_s (TClassDecl cl) cl.cl_path params);
+						write w "(";
+						ignore (List.fold_left (fun acc e ->
+							(if acc <> 0 then write w ", ");
+							expr_s w e;
+							acc + 1
+						) 0 el);
+						write w ")"
+					| TUnop ((Ast.Increment as op), flag, e)
+					| TUnop ((Ast.Decrement as op), flag, e) ->
+						(match flag with
+							| Ast.Prefix -> write w ( " " ^ (Ast.s_unop op) ^ " " ); expr_s w e
+							| Ast.Postfix -> expr_s w e; write w (Ast.s_unop op))
+					| TUnop (op, flag, e) ->
+						(match flag with
+							| Ast.Prefix -> write w ( " " ^ (Ast.s_unop op) ^ " (" ); expr_s w e; write w ") "
+							| Ast.Postfix -> write w "("; expr_s w e; write w (") " ^ Ast.s_unop op))
+					| TVar (var, eopt) ->
+						print w "%s " (t_s var.v_type);
+						write_id w var.v_name;
+						(match eopt with
+							| None ->
+								write w " = ";
+								expr_s w (null var.v_type e.epos)
+							| Some e ->
+								write w " = ";
+								expr_s w e
+						)
+					| TBlock [e] when was_in_value ->
+						expr_s w e
+					| TBlock el ->
+						begin_block w;
 						List.iter (fun e ->
-							line_directive w e.epos;
+							List.iter (fun e ->
+								line_directive w e.epos;
+								in_value := false;
+								expr_s w e;
+								(if has_semicolon e then write w ";");
+								newline w
+							) (extract_statements e)
+						) el;
+						end_block w
+					| TIf (econd, e1, Some(eelse)) when was_in_value ->
+						let base = t_s e.etype in
+						write w "( ";
+						expr_s w (mk_paren econd);
+						write w " ? ";
+						if t_s e1.etype <> base then
+							expr_s w (mk_cast e.etype e1)
+						else
+							expr_s w (mk_paren e1);
+
+						write w " : ";
+						if t_s eelse.etype <> base then
+							expr_s w (mk_cast e.etype eelse)
+						else
+							expr_s w (mk_paren eelse);
+						write w " )";
+					| TIf (econd, e1, eelse) ->
+						write w "if ";
+						expr_s w (mk_paren econd);
+						write w " ";
+						in_value := false;
+						expr_s w (mk_block e1);
+						(match eelse with
+							| None -> ()
+							| Some e ->
+								write w "else ";
+								in_value := false;
+								let e = match e.eexpr with
+									| TIf _ -> e
+									| TBlock [{eexpr = TIf _} as e] -> e
+									| _ -> mk_block e
+								in
+								expr_s w e
+						)
+					| TWhile (econd, eblock, flag) ->
+						(match flag with
+							| Ast.NormalWhile ->
+								write w "while ";
+								expr_s w (mk_paren econd);
+								write w " ";
+								in_value := false;
+								expr_s w (mk_block eblock)
+							| Ast.DoWhile ->
+								write w "do ";
+								in_value := false;
+								expr_s w (mk_block eblock);
+								write w "while ";
+								in_value := true;
+								expr_s w (mk_paren econd);
+						)
+					| TSwitch (econd, ele_l, default) ->
+						write w "switch ";
+						expr_s w (mk_paren econd);
+						write w " ";
+						begin_block w;
+						List.iter (fun (el, e) ->
+							List.iter (fun e ->
+								write w "case ";
+								in_value := true;
+								expr_s w e;
+								write w ":";
+								newline w;
+							) el;
 							in_value := false;
-							expr_s w e;
-							(if has_semicolon e then write w ";");
+							expr_s w (mk_block e);
+							newline w;
 							newline w
-						) (extract_statements e)
-					) el;
-					end_block w
-				| TIf (econd, e1, Some(eelse)) when was_in_value ->
-					let base = t_s e.etype in
-					write w "( ";
-					expr_s w (mk_paren econd);
-					write w " ? ";
-					if t_s e1.etype <> base then
-						expr_s w (mk_cast e.etype e1)
-					else
-						expr_s w (mk_paren e1);
-
-					write w " : ";
-					if t_s eelse.etype <> base then
-						expr_s w (mk_cast e.etype eelse)
-					else
-						expr_s w (mk_paren eelse);
-					write w " )";
-				| TIf (econd, e1, eelse) ->
-					write w "if ";
-					expr_s w (mk_paren econd);
-					write w " ";
-					in_value := false;
-					expr_s w (mk_block e1);
-					(match eelse with
-						| None -> ()
-						| Some e ->
-							write w "else ";
-							in_value := false;
-							let e = match e.eexpr with
-								| TIf _ -> e
-								| TBlock [{eexpr = TIf _} as e] -> e
-								| _ -> mk_block e
-							in
-							expr_s w e
-					)
-				| TWhile (econd, eblock, flag) ->
-					(match flag with
-						| Ast.NormalWhile ->
-							write w "while ";
-							expr_s w (mk_paren econd);
-							write w " ";
-							in_value := false;
-							expr_s w (mk_block eblock)
-						| Ast.DoWhile ->
-							write w "do ";
+						) ele_l;
+						if is_some default then begin
+							write w "default:";
+							newline w;
 							in_value := false;
-							expr_s w (mk_block eblock);
-							write w "while ";
-							in_value := true;
-							expr_s w (mk_paren econd);
-					)
-				| TSwitch (econd, ele_l, default) ->
-					write w "switch ";
-					expr_s w (mk_paren econd);
-					write w " ";
-					begin_block w;
-					List.iter (fun (el, e) ->
-						List.iter (fun e ->
-							write w "case ";
-							in_value := true;
-							expr_s w e;
-							write w ":";
+							expr_s w (get default);
 							newline w;
-						) el;
-						in_value := false;
-						expr_s w (mk_block e);
-						newline w;
-						newline w
-					) ele_l;
-					if is_some default then begin
-						write w "default:";
-						newline w;
+						end;
+						end_block w
+					| TTry (tryexpr, ve_l) ->
+						write w "try ";
 						in_value := false;
-						expr_s w (get default);
-						newline w;
-					end;
-					end_block w
-				| TTry (tryexpr, ve_l) ->
-					write w "try ";
-					in_value := false;
-					expr_s w (mk_block tryexpr);
-					List.iter (fun (var, e) ->
-						print w "catch (%s %s)" (t_s var.v_type) (var.v_name);
-						in_value := false;
-						expr_s w (mk_block e);
-						newline w
-					) ve_l
-				| TReturn eopt ->
-					write w "return";
-					if is_some eopt then (write w " "; expr_s w (get eopt))
-				| TBreak -> write w "break"
-				| TContinue -> write w "continue"
-				| TThrow e ->
-					write w "throw ";
-					expr_s w e
-				| TCast (e1,md_t) ->
-					((*match gen.gfollow#run_f e.etype with
-						| TType({ t_path = ([], "UInt") }, []) ->
-							write w "( unchecked ((uint) ";
-							expr_s w e1;
-							write w ") )"
-						| _ ->*)
-							(* FIXME I'm ignoring module type *)
-							print w "((%s) (" (t_s e.etype);
-							expr_s w e1;
-							write w ") )"
-					)
-				| TFor (_,_,content) ->
-					write w "[ for not supported ";
-					expr_s w content;
-					write w " ]";
-					if !strict_mode then assert false
-				| TObjectDecl _ -> write w "[ obj decl not supported ]"; if !strict_mode then assert false
-				| TFunction _ -> write w "[ func decl not supported ]"; if !strict_mode then assert false
-				| TEnumParameter _ -> write w "[ enum parameter not supported ]"; if !strict_mode then assert false
-		)
-		and do_call w e el =
-			let params, el = extract_tparams [] el in
-			let params = List.rev params in
-
-			expr_s w e;
-
-			(match params with
-				| _ :: _ when not (erase_generics && field_is_hxgeneric e) ->
-					let md = match e.eexpr with
-						| TField(ef, _) ->
-							t_to_md (run_follow gen ef.etype)
-						| _ -> assert false
-					in
-					write w "<";
-					ignore (List.fold_left (fun acc t ->
-						(if acc <> 0 then write w ", ");
-						write w (t_s t);
-						acc + 1
-					) 0 (change_param_type md params));
-					write w ">"
-				| _ -> ()
-			);
-
-			let rec loop acc elist tlist =
-				match elist, tlist with
-					| e :: etl, (_,_,t) :: ttl ->
-						(if acc <> 0 then write w ", ");
-						(match real_type t with
-							| TType({ t_path = (["cs"], "Ref") }, _)
-							| TAbstract ({ a_path = (["cs"], "Ref") },_) ->
-								let e = ensure_refout e "of type cs.Ref" in
-								write w "ref ";
-								expr_s w e
-							| TType({ t_path = (["cs"], "Out") }, _)
-							| TAbstract ({ a_path = (["cs"], "Out") },_) ->
-								let e = ensure_refout e "of type cs.Out" in
-								write w "out ";
-								expr_s w e
-							| _ ->
-								expr_s w e
-						);
-						loop (acc + 1) etl ttl
-					| e :: etl, [] ->
-						(if acc <> 0 then write w ", ");
-						expr_s w e;
-						loop (acc + 1) etl []
+						expr_s w (mk_block tryexpr);
+						List.iter (fun (var, e) ->
+							print w "catch (%s %s)" (t_s var.v_type) (var.v_name);
+							in_value := false;
+							expr_s w (mk_block e);
+							newline w
+						) ve_l
+					| TReturn eopt ->
+						write w "return";
+						if is_some eopt then (write w " "; expr_s w (get eopt))
+					| TBreak -> write w "break"
+					| TContinue -> write w "continue"
+					| TThrow { eexpr = TIdent "__rethrow__" } ->
+						write w "throw"
+					| TThrow e ->
+						write w "throw ";
+						expr_s w e
+					| TCast (e1,md_t) ->
+						((*match gen.gfollow#run_f e.etype with
+							| TType({ t_path = ([], "UInt") }, []) ->
+								write w "( unchecked ((uint) ";
+								expr_s w e1;
+								write w ") )"
+							| _ ->*)
+								(* FIXME I'm ignoring module type *)
+								print w "((%s) (" (t_s e.etype);
+								expr_s w e1;
+								write w ") )"
+						)
+					| TFor (_,_,content) ->
+						write w "[ for not supported ";
+						expr_s w content;
+						write w " ]";
+						if !strict_mode then assert false
+					| TObjectDecl _ -> write w "[ obj decl not supported ]"; if !strict_mode then assert false
+					| TFunction _ -> write w "[ func decl not supported ]"; if !strict_mode then assert false
+					| TEnumParameter _ -> write w "[ enum parameter not supported ]"; if !strict_mode then assert false
+					| TEnumIndex _ -> write w "[ enum index not supported ]"; if !strict_mode then assert false
+					| TIdent s -> write w "[ ident not supported ]"; if !strict_mode then assert false
+			)
+			and do_call w e el =
+				let params, el = extract_tparams [] el in
+				let params = List.rev params in
+
+				expr_s w e;
+
+				(match params with
+					| _ :: _ when not (erase_generics && field_is_hxgeneric e) ->
+						let md = match e.eexpr with
+							| TField(ef, _) ->
+								t_to_md (run_follow gen ef.etype)
+							| _ -> assert false
+						in
+						write w "<";
+						ignore (List.fold_left (fun acc t ->
+							(if acc <> 0 then write w ", ");
+							write w (t_s t);
+							acc + 1
+						) 0 (change_param_type md params));
+						write w ">"
 					| _ -> ()
-			in
-			write w "(";
-			let ft = match follow e.etype with
-				| TFun(args,_) -> args
-				| _ -> []
-			in
+				);
+
+				let rec loop acc elist tlist =
+					match elist, tlist with
+						| e :: etl, (_,_,t) :: ttl ->
+							(if acc <> 0 then write w ", ");
+							(match real_type t with
+								| TType({ t_path = (["cs"], "Ref") }, _)
+								| TAbstract ({ a_path = (["cs"], "Ref") },_) ->
+									let e = ensure_refout e "of type cs.Ref" in
+									write w "ref ";
+									expr_s w e
+								| TType({ t_path = (["cs"], "Out") }, _)
+								| TAbstract ({ a_path = (["cs"], "Out") },_) ->
+									let e = ensure_refout e "of type cs.Out" in
+									write w "out ";
+									expr_s w e
+								| _ ->
+									expr_s w e
+							);
+							loop (acc + 1) etl ttl
+						| e :: etl, [] ->
+							(if acc <> 0 then write w ", ");
+							expr_s w e;
+							loop (acc + 1) etl []
+						| _ -> ()
+				in
+				write w "(";
+				let ft = match follow e.etype with
+					| TFun(args,_) -> args
+					| _ -> []
+				in
 
-			loop 0 el ft;
+				loop 0 el ft;
 
-			write w ")"
+				write w ")"
+			in
+			expr_s w e
 		in
-		expr_s w e
-	in
 
-	let rec gen_fpart_attrib w = function
-		| EConst( Ident i ), _ ->
-			write w i
-		| EField( ef, f ), _ ->
-			gen_fpart_attrib w ef;
-			write w ".";
-			write w f
-		| _, p ->
-			gen.gcon.error "Invalid expression inside @:meta metadata" p
-	in
-
-	let rec gen_spart w = function
-		| EConst c, p -> (match c with
-			| Int s | Float s | Ident s ->
-				write w s
-			| String s ->
-				write w "\"";
-				write w (escape s);
-				write w "\""
-			| _ -> gen.gcon.error "Invalid expression inside @:meta metadata" p)
-		| EField( ef, f ), _ ->
-			gen_spart w ef;
-			write w ".";
-			write w f
-		| EBinop( Ast.OpAssign, (EConst (Ident s), _), e2 ), _ ->
-			write w s;
-			write w " = ";
-			gen_spart w e2
-		| EArrayDecl( el ), _ ->
-			write w "new[] {";
-			let fst = ref true in
-			List.iter (fun e ->
-				if !fst then fst := false else write w ", ";
-				gen_spart w e
-			) el;
-			write w "}"
-		| ECall(fpart,args), _ ->
-			gen_fpart_attrib w fpart;
-			write w "(";
-			let fst = ref true in
-			List.iter (fun e ->
-				if !fst then fst := false else write w ", ";
-				gen_spart w e
-			) args;
-			write w ")"
-		| _, p ->
-			gen.gcon.error "Invalid expression inside @:meta metadata" p
-	in
+		let rec gen_fpart_attrib w = function
+			| EConst( Ident i ), _ ->
+				write w i
+			| EField( ef, f ), _ ->
+				gen_fpart_attrib w ef;
+				write w ".";
+				write w f
+			| _, p ->
+				gen.gcon.error "Invalid expression inside @:meta metadata" p
+		in
 
-	let gen_attributes w metadata =
-		List.iter (function
-			| Meta.Meta, [EConst(String s), _], _ ->
-				write w "[";
+		let rec gen_spart w = function
+			| EConst c, p -> (match c with
+				| Int s | Float s | Ident s ->
+					write w s
+				| String(s,_) ->
+					write w "\"";
+					write w (escape s);
+					write w "\""
+				| _ -> gen.gcon.error "Invalid expression inside @:meta metadata" p)
+			| EField( ef, f ), _ ->
+				gen_spart w ef;
+				write w ".";
+				write w f
+			| EBinop( Ast.OpAssign, (EConst (Ident s), _), e2 ), _ ->
 				write w s;
-				write w "]";
-				newline w
-			| Meta.Meta, [meta], _ ->
-				write w "[";
-				gen_spart w meta;
-				write w "]";
-				newline w
-			| _ -> ()
-		) metadata
-	in
-
-	let gen_nocompletion w metadata =
-		if Meta.has Meta.NoCompletion metadata then begin
-			write w "[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]";
-			newline w
-		end;
-	in
+				write w " = ";
+				gen_spart w e2
+			| EArrayDecl( el ), _ ->
+				write w "new[] {";
+				let fst = ref true in
+				List.iter (fun e ->
+					if !fst then fst := false else write w ", ";
+					gen_spart w e
+				) el;
+				write w "}"
+			| ECall(fpart,args), _ ->
+				gen_fpart_attrib w fpart;
+				write w "(";
+				let fst = ref true in
+				List.iter (fun e ->
+					if !fst then fst := false else write w ", ";
+					gen_spart w e
+				) args;
+				write w ")"
+			| _, p ->
+				gen.gcon.error "Invalid expression inside @:meta metadata" p
+		in
 
-	let argt_s t =
-		let w = new_source_writer () in
-		let rec run t =
-			match t with
-				| TType (tdef,p) ->
-					gen_attributes w tdef.t_meta;
-					run (follow_once t)
-				| TMono r ->
-					(match !r with
-					| Some t -> run t
-					| _ -> () (* avoid infinite loop / should be the same in this context *))
-				| TLazy f ->
-					run (!f())
+		let gen_attributes w metadata =
+			List.iter (function
+				| Meta.Meta, [EConst(String(s,_)), _], _ ->
+					write w "[";
+					write w s;
+					write w "]";
+					newline w
+				| Meta.Meta, [meta], _ ->
+					write w "[";
+					gen_spart w meta;
+					write w "]";
+					newline w
 				| _ -> ()
+			) metadata
 		in
-		run t;
-		let ret = match run_follow gen t with
-			| TType ({ t_path = (["cs"], "Ref") }, [t])
-			| TAbstract ({ a_path = (["cs"], "Ref") },[t]) -> "ref " ^ t_s t
-			| TType ({ t_path = (["cs"], "Out") }, [t])
-			| TAbstract ({ a_path = (["cs"], "Out") },[t]) -> "out " ^ t_s t
-			| t -> t_s t
-		in
-		let c = contents w in
-		if c <> "" then
-			c ^ " " ^ ret
-		else
-			ret
-	in
-
-	let get_string_params cl cl_params =
-		let hxgen = is_hxgen (TClassDecl cl) in
-		match cl_params with
-			| (_ :: _) when not (erase_generics && is_hxgeneric (TClassDecl cl)) ->
-				let get_param_name t = match follow t with TInst(cl, _) -> snd cl.cl_path | _ -> assert false in
-				let params = sprintf "<%s>" (String.concat ", " (List.map (fun (_, tcl) -> get_param_name tcl) cl_params)) in
-				let params_extends =
-					if hxgen
-					(* this is temprorary, see https://github.com/HaxeFoundation/haxe/issues/3526 *)
-					|| not (Meta.has (Meta.Custom ":nativeTypeConstraints") cl.cl_meta)
-					then
-						[""]
-					else
-						List.fold_left (fun acc (name, t) ->
-							match run_follow gen t with
-								| TInst({cl_kind = KTypeParameter constraints}, _) when constraints <> [] ->
-									(* base class should come before interface constraints *)
-									let base_class_constraints = ref [] in
-									let other_constraints = List.fold_left (fun acc t ->
-										match follow t with
-											(* string is implicitly sealed, maybe haxe should have it final as well *)
-											| TInst ({ cl_path=[],"String" }, []) ->
-												acc
-
-											(* non-sealed class *)
-											| TInst ({ cl_interface = false; cl_meta = meta},_) when not (Meta.has Meta.Final meta) ->
-												base_class_constraints := (t_s t) :: !base_class_constraints;
-												acc;
-
-											(* interface *)
-											| TInst ({ cl_interface = true}, _) ->
-												(t_s t) :: acc
-
-											(* skip anything other *)
-											| _ ->
-												acc
-									) [] constraints in
-
-									let s_constraints = (!base_class_constraints @ other_constraints) in
-									if s_constraints <> [] then
-										(sprintf " where %s : %s" (get_param_name t) (String.concat ", " s_constraints) :: acc)
-									else
-										acc;
-								| _ -> acc
-						) [] cl_params in
-				(params, String.concat " " params_extends)
-			| _ -> ("","")
-	in
-
-	let gen_field_decl w visibility v_n modifiers t n =
-		let parts = ref [] in
-		if visibility <> "" then parts := visibility :: !parts;
-		if v_n <> "" then parts := v_n :: !parts;
-		if modifiers <> [] then parts := modifiers @ !parts;
-		if t <> "" then parts := t :: !parts;
-		parts := n :: !parts;
-		write w (String.concat " " (List.rev !parts));
-	in
-
-	let rec gen_event w is_static cl (event,t,custom,add,remove) =
-		let is_interface = cl.cl_interface in
-		let visibility = if is_interface then "" else "public" in
-		let visibility, modifiers = get_fun_modifiers event.cf_meta visibility ["event"] in
-		let v_n = if is_static then "static" else "" in
-		gen_field_decl w visibility v_n modifiers (t_s (run_follow gen t)) (change_field event.cf_name);
-		if custom && not is_interface then begin
-			write w " ";
-			begin_block w;
-			print w "add { _add_%s(value); }" event.cf_name;
-			newline w;
-			print w "remove { _remove_%s(value); }" event.cf_name;
-			newline w;
-			end_block w;
-			newline w;
-		end else
-			write w ";\n";
-		newline w;
-	in
 
-	let rec gen_prop w is_static cl is_final (prop,t,get,set) =
-		gen_attributes w prop.cf_meta;
-		let is_interface = cl.cl_interface in
-		let fn_is_final = function
-			| None -> true
-			| Some ({ cf_kind = Method mkind } as m) ->
-				(match mkind with | MethInline -> true | _ -> false) || Meta.has Meta.Final m.cf_meta
-			| _ -> assert false
+		let gen_nocompletion w metadata =
+			if Meta.has Meta.NoCompletion metadata then begin
+				write w "[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]";
+				newline w
+			end;
 		in
-		let is_virtual = not (is_interface || is_final || Meta.has Meta.Final prop.cf_meta || fn_is_final get || fn_is_final set) in
 
-		let fn_is_override = function
-			| Some cf -> List.memq cf cl.cl_overrides
-			| None -> false
-		in
-		let is_override = fn_is_override get || fn_is_override set in
-		let visibility = if is_interface then "" else "public" in
-		let visibility, modifiers = get_fun_modifiers prop.cf_meta visibility [] in
-		let v_n = if is_static then "static" else if is_override && not is_interface then "override" else if is_virtual then "virtual" else "" in
-		gen_nocompletion w prop.cf_meta;
-
-		gen_field_decl w visibility v_n modifiers (t_s (run_follow gen t)) (change_field prop.cf_name);
-
-		let check cf = match cf with
-			| Some ({ cf_overloads = o :: _ } as cf) ->
-					gen.gcon.error "Property functions with more than one overload is currently unsupported" cf.cf_pos;
-					gen.gcon.error "Property functions with more than one overload is currently unsupported" o.cf_pos
-			| _ -> ()
+		let argt_s t =
+			let w = new_source_writer () in
+			let rec run t =
+				match t with
+					| TType (tdef,p) ->
+						gen_attributes w tdef.t_meta;
+						run (follow_once t)
+					| TMono r ->
+						(match !r with
+						| Some t -> run t
+						| _ -> () (* avoid infinite loop / should be the same in this context *))
+					| TLazy f ->
+						run (lazy_type f)
+					| _ -> ()
+			in
+			run t;
+			let ret = match run_follow gen t with
+				| TType ({ t_path = (["cs"], "Ref") }, [t])
+				| TAbstract ({ a_path = (["cs"], "Ref") },[t]) -> "ref " ^ t_s t
+				| TType ({ t_path = (["cs"], "Out") }, [t])
+				| TAbstract ({ a_path = (["cs"], "Out") },[t]) -> "out " ^ t_s t
+				| t -> t_s t
+			in
+			let c = contents w in
+			if c <> "" then
+				c ^ " " ^ ret
+			else
+				ret
 		in
-		check get;
-		check set;
-
-		write w " ";
-		if is_interface then begin
-			write w "{ ";
-			let s = ref "" in
-			(match prop.cf_kind with Var { v_read = AccCall } -> write w "get;"; s := " "; | _ -> ());
-			(match prop.cf_kind with Var { v_write = AccCall } -> print w "%sset;" !s | _ -> ());
-			write w " }";
-			newline w;
-		end else begin
-			begin_block w;
-			(match get with
-				| Some cf ->
-					print w "get { return _get_%s(); }" prop.cf_name;
-					newline w;
-					cf.cf_meta <- (Meta.Custom "?prop_impl", [], null_pos) :: cf.cf_meta;
-				| None -> ());
-			(match set with
-				| Some cf ->
-					print w "set { _set_%s(value); }" prop.cf_name;
-					newline w;
-					cf.cf_meta <- (Meta.Custom "?prop_impl", [], null_pos) :: cf.cf_meta;
-				| None -> ());
-			end_block w;
-			newline w;
-			newline w;
-		end;
-	in
-
-	let needs_unchecked e =
-		let rec loop e = match e.eexpr with
-		(* a non-zero integer constant means that we want unchecked context *)
-		| TConst (TInt i) when i <> Int32.zero ->
-			raise Exit
-
-		(* don't recurse into explicit checked blocks *)
-		| TCall ({ eexpr = TLocal({ v_name = "__checked__" }) }, _) ->
-			()
-
-		(* skip reflection field hashes as they are safe *)
-		| TNew ({ cl_path = (["haxe"; "lang"],"DynamicObject") }, [], [_; e1; _; e2]) ->
-			loop e1;
-			loop e2
-		| TNew ({ cl_path = (["haxe"; "lang"],"Closure") }, [], [eo; _; _]) ->
-			loop eo
-		| TCall ({ eexpr = TField (_, FStatic ({ cl_path = ["haxe"; "lang"],"Runtime" },
-				 { cf_name = "getField" | "setField" | "getField_f" | "setField_f" | "callField" })) },
-				 eo :: _ :: _ :: rest) ->
-			loop eo;
-			List.iter loop rest
 
-		| _ ->
-			Type.iter loop e
+		let get_string_params cl cl_params =
+			let hxgen = is_hxgen (TClassDecl cl) in
+			match cl_params with
+				| (_ :: _) when not (erase_generics && is_hxgeneric (TClassDecl cl)) ->
+					let get_param_name t = match follow t with TInst(cl, _) -> snd cl.cl_path | _ -> assert false in
+					let combination_error c1 c2 =
+						gen.gcon.error ("The " ^ (get_constraint c1) ^ " constraint cannot be combined with the " ^ (get_constraint c2) ^ " constraint.") cl.cl_pos in
+
+					let params = sprintf "<%s>" (String.concat ", " (List.map (fun (_, tcl) -> get_param_name tcl) cl_params)) in
+					let params_extends =
+						if hxgen || not (Meta.has (Meta.NativeGen) cl.cl_meta) then
+							[""]
+						else
+							List.fold_left (fun acc (name, t) ->
+								match run_follow gen t with
+									| TInst({cl_kind = KTypeParameter constraints}, _) when constraints <> [] ->
+										(* base class should come before interface constraints *)
+										let base_class_constraints = ref [] in
+										let other_constraints = List.fold_left (fun acc t ->
+											match follow t with
+												(* string is implicitly sealed, maybe haxe should have it final as well *)
+												| TInst ({ cl_path=[],"String" }, []) ->
+													acc
+
+												(* non-sealed class *)
+												| TInst ({ cl_interface = false; cl_final = false},_) ->
+													base_class_constraints := (CsConstraint (t_s t)) :: !base_class_constraints;
+													acc;
+
+												(* interface *)
+												| TInst ({ cl_interface = true}, _) ->
+													(CsConstraint (t_s t)) :: acc
+
+												(* cs constraints *)
+												(* See https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/generics/constraints-on-type-parameters *)
+												| TAbstract({ a_path = (_, c); a_module = { m_path = ([pack],"Constraints") } }, params) ->
+													(match pack, c with
+														| "haxe", "Constructible" ->
+															(match params with
+																(* Only for parameterless constructors *)
+																| [TFun ([],TAbstract({a_path=[],"Void"},_))] ->
+																	if (List.memq CsStruct acc) then combination_error CsConstructible CsStruct;
+																	if (List.memq CsUnmanaged acc) then combination_error CsUnmanaged CsConstructible;
+																	CsConstructible :: acc;
+																| _ -> acc;
+															)
+														| "cs", "CsStruct" ->
+															if (List.memq CsClass acc) then combination_error CsClass CsStruct;
+															if (List.memq CsConstructible acc) then combination_error CsConstructible CsStruct;
+															if (List.memq CsUnmanaged acc) then combination_error CsUnmanaged CsStruct;
+															CsStruct :: acc;
+														| "cs", "CsUnmanaged" ->
+															if (List.memq CsStruct acc) then combination_error CsUnmanaged CsStruct;
+															if (List.memq CsConstructible acc) then combination_error CsUnmanaged CsConstructible;
+															CsUnmanaged :: acc;
+														| "cs", "CsClass" ->
+															if (List.memq CsStruct acc) then combination_error CsClass CsStruct;
+															CsClass :: acc;
+														| _, _ -> acc;
+													)
+
+												(* skip anything other *)
+												| _ ->
+													acc
+										) [] constraints in
+
+										let s_constraints = (List.sort
+											(* C# expects some ordering for built-in constraints: *)
+											(fun c1 c2 -> match c1, c2 with
+												| a, b when a == b -> 0
+												(* - "new()" type constraint should be last *)
+												| CsConstructible, _ -> 1
+												| _, CsConstructible -> -1
+												(* - "class", "struct" and "unmanaged" should be first *)
+												| CsClass, _ | CsStruct, _ | CsUnmanaged, _ -> -1
+												| _, CsClass | _, CsStruct | _, CsUnmanaged -> 1
+												| _, _ -> 0
+										) (!base_class_constraints @ other_constraints)) in
+
+										if s_constraints <> [] then
+											(sprintf " where %s : %s" (get_param_name t) (String.concat ", " (List.map get_constraint s_constraints)) :: acc)
+										else
+											acc;
+									| _ -> acc
+							) [] cl_params in
+					(params, String.concat " " params_extends)
+				| _ -> ("","")
 		in
-		try (loop e; false) with Exit -> true
-	in
 
-	let rec gen_class_field w ?(is_overload=false) is_static cl is_final cf =
-		gen_attributes w cf.cf_meta;
-		let is_interface = cl.cl_interface in
-		let name, is_new, is_explicit_iface = match cf.cf_name with
-			| "new" -> snd cl.cl_path, true, false
-			| name when String.contains name '.' ->
-				let fn_name, path = parse_explicit_iface name in
-				(s_type_path path) ^ "." ^ fn_name, false, true
-			| name -> try
-				let binop = PMap.find name binops_names in
-				"operator " ^ s_binop binop, false, false
-			with | Not_found -> try
-				let unop = PMap.find name unops_names in
-				"operator " ^ s_unop unop, false, false
-			with | Not_found ->
-				if Meta.has (Meta.Custom "?prop_impl") cf.cf_meta || Meta.has (Meta.Custom ":cs_event_impl") cf.cf_meta then
-					"_" ^ name, false, false
-				else
-					name, false, false
+		let gen_field_decl w visibility v_n modifiers t n =
+			let parts = ref [] in
+			if visibility <> "" then parts := visibility :: !parts;
+			if v_n <> "" then parts := v_n :: !parts;
+			if modifiers <> [] then parts := modifiers @ !parts;
+			if t <> "" then parts := t :: !parts;
+			parts := n :: !parts;
+			write w (String.concat " " (List.rev !parts));
 		in
-		let rec loop_static cl =
-			match is_static, cl.cl_super with
-				| false, _ -> []
-				| true, None -> []
-				| true, Some(cl,_) ->
-					 (try
-							let cf2 = PMap.find cf.cf_name cl.cl_statics in
-							CastDetect.type_eq gen EqStrict cf.cf_type cf2.cf_type;
-							["new"]
-						with
-							| Not_found | Unify_error _ ->
-									loop_static cl
-						)
-		in
-		let modf = loop_static cl in
-
-		(match cf.cf_kind with
-			| Var _
-			| Method (MethDynamic) when not (Type.is_extern_field cf) ->
-				(if is_overload || List.exists (fun cf -> cf.cf_expr <> None) cf.cf_overloads then
-					gen.gcon.error "Only normal (non-dynamic) methods can be overloaded" cf.cf_pos);
-				if not is_interface then begin
-					let access, modifiers = get_fun_modifiers cf.cf_meta "public" [] in
-					let modifiers = modifiers @ modf in
-					gen_nocompletion w cf.cf_meta;
-					gen_field_decl w access (if is_static then "static" else "") modifiers (t_s (run_follow gen cf.cf_type)) (change_field name);
-					(match cf.cf_expr with
-						| Some e ->
-							write w " = ";
-							expr_s w e;
-						| None -> ()
-					);
-					write w ";"
-				end (* TODO see how (get,set) variable handle when they are interfaces *)
-			| Method _ when Type.is_extern_field cf || (match cl.cl_kind, cf.cf_expr with | KAbstractImpl _, None -> true | _ -> false) ->
-				List.iter (fun cf -> if cl.cl_interface || cf.cf_expr <> None then
-					gen_class_field w ~is_overload:true is_static cl (Meta.has Meta.Final cf.cf_meta) cf
-				) cf.cf_overloads
-			| Var _ | Method MethDynamic -> ()
-			| Method mkind ->
-				List.iter (fun cf ->
-					if cl.cl_interface || cf.cf_expr <> None then
-						gen_class_field w ~is_overload:true is_static cl (Meta.has Meta.Final cf.cf_meta) cf
-				) cf.cf_overloads;
-				let is_virtual = not is_final && match mkind with | MethInline -> false | _ when not is_new -> true | _ -> false in
-				let is_virtual = if not is_virtual || Meta.has Meta.Final cf.cf_meta then false else is_virtual in
-				let is_override = List.memq cf cl.cl_overrides in
-				let is_override = is_override || match cf.cf_name, follow cf.cf_type with
-					| "Equals", TFun([_,_,targ], tret) ->
-						(match follow targ, follow tret with
-							| TDynamic _, TAbstract({ a_path = ([], "Bool") }, []) -> true
-							| _ -> false)
-					| "GetHashCode", TFun([],_) -> true
-					| _ -> false
-				in
-				let is_override = if Meta.has (Meta.Custom "?prop_impl") cf.cf_meta then false else is_override in
-
-				let is_virtual = is_virtual && not (Meta.has Meta.Final cl.cl_meta) && not (is_interface) in
-				let visibility = if is_interface then "" else "public" in
-
-				let visibility, modifiers = get_fun_modifiers cf.cf_meta visibility [] in
-				let modifiers = modifiers @ modf in
-				let visibility, is_virtual = if is_explicit_iface then "",false else if visibility = "private" then "private",false else visibility, is_virtual in
-				let v_n = if is_static then "static" else if is_override && not is_interface then "override" else if is_virtual then "virtual" else "" in
-				let cf_type = if is_override && not is_overload && not (Meta.has Meta.Overload cf.cf_meta) then match field_access gen (TInst(cl, List.map snd cl.cl_params)) cf.cf_name with | FClassField(_,_,_,_,_,actual_t,_) -> actual_t | _ -> assert false else cf.cf_type in
-				let ret_type, args = match follow cf_type with | TFun (strbtl, t) -> (t, strbtl) | _ -> assert false in
-				gen_nocompletion w cf.cf_meta;
-
-				(* public static void funcName *)
-				gen_field_decl w visibility v_n modifiers (if not is_new then (rett_s (run_follow gen ret_type)) else "") (change_field name);
-
-				let params, params_ext = get_string_params cl cf.cf_params in
-				(* <T>(string arg1, object arg2) with T : object *)
-				(match cf.cf_expr with
-				| Some { eexpr = TFunction tf } ->
-						print w "%s(%s)%s" (params) (String.concat ", " (List.map2 (fun (var, _) (_,_,t) -> sprintf "%s %s" (argt_s t) (change_id var.v_name)) tf.tf_args args)) (params_ext)
-				| _ ->
-						print w "%s(%s)%s" (params) (String.concat ", " (List.map (fun (name, _, t) -> sprintf "%s %s" (argt_s t) (change_id name)) args)) (params_ext)
-				);
-				if is_interface then
-					write w ";"
-				else begin
-					write w " ";
-					let rec loop meta =
-						match meta with
-							| [] ->
-								let expr = match cf.cf_expr with
-									| None -> mk (TBlock([])) t_dynamic null_pos
-									| Some s ->
-										match s.eexpr with
-											| TFunction tf ->
-												mk_block (tf.tf_expr)
-											| _ -> assert false (* FIXME *)
-								in
 
-								let write_method_expr e =
-									match e.eexpr with
-									| TBlock [] ->
-										begin_block w;
-										end_block w
-									| TBlock _ ->
-										let unchecked = needs_unchecked e in
-										if unchecked then (begin_block w; write w "unchecked ");
-										let t = Common.timer ["expression to string"] in
-										expr_s w e;
-										t();
-										line_reset_directive w;
-										if unchecked then end_block w
-									| _ ->
-										assert false
-								in
+		let rec gen_event w is_static cl (event,t,custom,add,remove) =
+			let is_interface = cl.cl_interface in
+			let visibility = if is_interface then "" else "public" in
+			let visibility, modifiers = get_fun_modifiers event.cf_meta visibility ["event"] in
+			let v_n = if is_static then "static" else "" in
+			gen_field_decl w visibility v_n modifiers (t_s (run_follow gen t)) (change_class_field cl event.cf_name);
+			if custom && not is_interface then begin
+				write w " ";
+				begin_block w;
+				print w "add { _add_%s(value); }" event.cf_name;
+				newline w;
+				print w "remove { _remove_%s(value); }" event.cf_name;
+				newline w;
+				end_block w;
+				newline w;
+			end else
+				write w ";\n";
+			newline w;
+		in
 
-								(if is_new then begin
-									let rec get_super_call el =
-										match el with
-											| ( { eexpr = TCall( { eexpr = TConst(TSuper) }, _) } as call) :: rest ->
-												Some call, rest
-											| ( { eexpr = TBlock(bl) } as block ) :: rest ->
-												let ret, mapped = get_super_call bl in
-												ret, ( { block with eexpr = TBlock(mapped) } :: rest )
-											| _ ->
-												None, el
-									in
-									match expr.eexpr with
-										| TBlock(bl) ->
-											let super_call, rest = get_super_call bl in
-											(match super_call with
-												| None -> ()
-												| Some sc ->
-													write w ": ";
-													let t = Common.timer ["expression to string"] in
-													expr_s w sc;
-													write w " ";
-													t()
-											);
-											write_method_expr { expr with eexpr = TBlock(rest) }
-										| _ -> assert false
-								end else
-									write_method_expr expr
-								)
-							| (Meta.FunctionCode, [Ast.EConst (Ast.String contents),_],_) :: tl ->
-								begin_block w;
-								write w contents;
-								end_block w
-							| _ :: tl -> loop tl
-					in
-					loop cf.cf_meta
+		let rec gen_prop w is_static cl is_final (prop,t,get,set) =
+			gen_attributes w prop.cf_meta;
+			let is_interface = cl.cl_interface in
+			let fn_is_final = function
+				| None -> true
+				| Some ({ cf_kind = Method mkind } as m) ->
+					(match mkind with | MethInline -> true | _ -> false) || (has_class_field_flag m CfFinal)
+				| _ -> assert false
+			in
+			let is_virtual = not (is_interface || is_final || (has_class_field_flag prop CfFinal) || fn_is_final get || fn_is_final set) in
 
-				end);
-			newline w;
-			newline w;
-	in
+			let fn_is_override = function
+				| Some cf -> List.memq cf cl.cl_overrides
+				| None -> false
+			in
+			let is_override = fn_is_override get || fn_is_override set in
+			let visibility = if is_interface then "" else "public" in
+			let visibility, modifiers = get_fun_modifiers prop.cf_meta visibility [] in
+			let v_n = if is_static then "static" else if is_override && not is_interface then "override" else if is_virtual then "virtual" else "" in
+			gen_nocompletion w prop.cf_meta;
+
+			gen_field_decl w visibility v_n modifiers (t_s (run_follow gen t)) (change_class_field cl prop.cf_name);
+
+			let check cf = match cf with
+				| Some ({ cf_overloads = o :: _ } as cf) ->
+						gen.gcon.error "Property functions with more than one overload is currently unsupported" cf.cf_pos;
+						gen.gcon.error "Property functions with more than one overload is currently unsupported" o.cf_pos
+				| _ -> ()
+			in
+			check get;
+			check set;
 
-	let check_special_behaviors w cl = match cl.cl_kind with
-	| KAbstractImpl _ -> ()
-	| _ ->
-		(* get/set pairs *)
-		let pairs = ref PMap.empty in
-		(try
-			let get = PMap.find "__get" cl.cl_fields in
-			List.iter (fun cf ->
-				let args,ret = get_fun cf.cf_type in
-				match args with
-				| [_,_,idx] -> pairs := PMap.add (t_s idx) ( t_s ret, Some cf, None ) !pairs
-				| _ -> gen.gcon.warning "The __get function must have exactly one argument (the index)" cf.cf_pos
-			) (get :: get.cf_overloads)
-		with | Not_found -> ());
-		(try
-			let set = PMap.find "__set" cl.cl_fields in
-			List.iter (fun cf ->
-				let args, ret = get_fun cf.cf_type in
-				match args with
-				| [_,_,idx; _,_,v] -> (try
-					let vt, g, _ = PMap.find (t_s idx) !pairs in
-					let tvt = t_s v in
-					if vt <> tvt then gen.gcon.warning "The __get function of same index has a different type from this __set function" cf.cf_pos;
-					pairs := PMap.add (t_s idx) (vt, g, Some cf) !pairs
-				with | Not_found ->
-					pairs := PMap.add (t_s idx) (t_s v, None, Some cf) !pairs)
-				| _ ->
-					gen.gcon.warning "The __set function must have exactly two arguments (index, value)" cf.cf_pos
-			) (set :: set.cf_overloads)
-		with | Not_found -> ());
-		PMap.iter (fun idx (v, get, set) ->
-			print w "public %s this[%s index]" v idx;
+			write w " ";
+			if is_interface then begin
+				write w "{ ";
+				let s = ref "" in
+				(match prop.cf_kind with Var { v_read = AccCall } -> write w "get;"; s := " "; | _ -> ());
+				(match prop.cf_kind with Var { v_write = AccCall } -> print w "%sset;" !s | _ -> ());
+				write w " }";
+				newline w;
+			end else begin
 				begin_block w;
 				(match get with
-				| None -> ()
-				| Some _ ->
-					write w "get";
-					begin_block w;
-					write w "return this.__get(index);";
-					end_block w);
+					| Some cf ->
+						print w "get { return _get_%s(); }" prop.cf_name;
+						newline w;
+						cf.cf_meta <- (Meta.Custom "?prop_impl", [], null_pos) :: cf.cf_meta;
+					| None -> ());
 				(match set with
-				| None -> ()
-				| Some _ ->
-					write w "set";
-					begin_block w;
-					write w "this.__set(index,value);";
-					end_block w);
-				end_block w) !pairs;
-		(if not (PMap.is_empty !pairs) then try
-			let get = PMap.find "__get" cl.cl_fields in
-			let idx_t, v_t = match follow get.cf_type with
-				| TFun([_,_,arg_t],ret_t) ->
-					t_s (run_follow gen arg_t), t_s (run_follow gen ret_t)
-				| _ -> gen.gcon.error "The __get function must be a function with one argument. " get.cf_pos; assert false
-			in
-			List.iter (fun (cl,args) ->
-				match cl.cl_array_access with
-					| None -> ()
-					| Some t ->
-						let changed_t = apply_params cl.cl_params (List.map (fun _ -> t_dynamic) cl.cl_params) t in
-						let t_as_s = t_s (run_follow gen changed_t) in
-						print w "%s %s.this[int key]" t_as_s (t_s (TInst(cl, args)));
-							begin_block w;
-							write w "get";
-							begin_block w;
-								print w "return ((%s) this.__get(key));" t_as_s;
-							end_block w;
-							write w "set";
-							begin_block w;
-								print w "this.__set(key, (%s) value);" v_t;
-							end_block w;
-						end_block w;
+					| Some cf ->
+						print w "set { _set_%s(value); }" prop.cf_name;
 						newline w;
-						newline w
-			) cl.cl_implements
-		with | Not_found -> ());
-		if cl.cl_interface && is_hxgen (TClassDecl cl) && is_some cl.cl_array_access then begin
-			let changed_t = apply_params cl.cl_params (List.map (fun _ -> t_dynamic) cl.cl_params) (get cl.cl_array_access) in
-			print w "%s this[int key]" (t_s (run_follow gen changed_t));
-			begin_block w;
-				write w "get;";
+						cf.cf_meta <- (Meta.Custom "?prop_impl", [], null_pos) :: cf.cf_meta;
+					| None -> ());
+				end_block w;
 				newline w;
-				write w "set;";
 				newline w;
-			end_block w;
-			newline w;
-			newline w
-		end;
-		(try
-			if cl.cl_interface then raise Not_found;
-			let cf = PMap.find "toString" cl.cl_fields in
-			(if List.exists (fun c -> c.cf_name = "toString") cl.cl_overrides then raise Not_found);
-			(match cf.cf_type with
-				| TFun([], ret) ->
-					(match real_type ret with
-						| TInst( { cl_path = ([], "String") }, []) ->
-							write w "public override string ToString()";
-							begin_block w;
-							write w "return this.toString();";
-							end_block w;
-							newline w;
-							newline w
-						| _ ->
-							gen.gcon.error "A toString() function should return a String!" cf.cf_pos
-					)
-				| _ -> ()
-			)
-		with | Not_found -> ());
-		(try
-			if cl.cl_interface then raise Not_found;
-			let cf = PMap.find "finalize" cl.cl_fields in
-			(if List.exists (fun c -> c.cf_name = "finalize") cl.cl_overrides then raise Not_found);
-			(match cf.cf_type with
-				| TFun([], ret) ->
-					(match real_type ret with
-						| TAbstract( { a_path = ([], "Void") }, []) ->
-							write w "~";
-							write w (snd cl.cl_path);
-							write w "()";
-							begin_block w;
-							write w "this.finalize();";
-							end_block w;
-							newline w;
-							newline w
-						| _ ->
-							gen.gcon.error "A finalize() function should be Void->Void!" cf.cf_pos
-					)
-				| _ -> ()
-			)
-		with | Not_found -> ());
-		(* properties *)
-		let handle_prop static f =
-			match f.cf_kind with
-			| Method _ -> ()
-			| Var v when not (Type.is_extern_field f) -> ()
-			| Var v ->
-				let prop acc = match acc with
-					| AccNo | AccNever | AccCall -> true
-					| _ -> false
-				in
-				if prop v.v_read && prop v.v_write && (v.v_read = AccCall || v.v_write = AccCall) then begin
-					let this = if static then
-						ExprBuilder.make_static_this cl f.cf_pos
-					else
-						{ eexpr = TConst TThis; etype = TInst(cl,List.map snd cl.cl_params); epos = f.cf_pos }
-					in
-					print w "public %s%s %s" (if static then "static " else "") (t_s f.cf_type) (netname_to_hx f.cf_name);
-					begin_block w;
-					(match v.v_read with
-					| AccCall ->
-						write w "get";
-						begin_block w;
-						write w "return ";
-						expr_s w this;
-						print w ".get_%s();" f.cf_name;
-						end_block w
-					| _ -> ());
-					(match v.v_write with
-					| AccCall ->
-						write w "set";
-						begin_block w;
-						expr_s w this;
-						print w ".set_%s(value);" f.cf_name;
-						end_block w
-					| _ -> ());
-					end_block w;
-				end
+			end;
 		in
-		if Meta.has Meta.BridgeProperties cl.cl_meta then begin
-			List.iter (handle_prop true) cl.cl_ordered_statics;
-			List.iter (handle_prop false) cl.cl_ordered_fields;
-		end
-	in
 
-	let gen_class w cl =
-		write w "#pragma warning disable 109, 114, 219, 429, 168, 162";
-		newline w;
-		let should_close = match change_ns (TClassDecl cl) (fst (cl.cl_path)) with
-			| [] -> false
-			| ns ->
-				print w "namespace %s " (String.concat "." ns);
-				begin_block w;
-				true
-		in
+		let needs_unchecked e =
+			let rec loop e = match e.eexpr with
+			(* a non-zero integer constant means that we want unchecked context *)
+			| TConst (TInt i) when i <> Int32.zero ->
+				raise Exit
 
-		(try
-			let _,m,_ = Meta.get (Meta.Custom "generic_iface") cl.cl_meta in
-			let rec loop i acc =
-				if i == 0 then
-					acc
-				else
-					"object" :: (loop (pred i) acc)
+			(* don't recurse into explicit checked blocks *)
+			| TCall ({ eexpr = TIdent "__checked__" }, _) ->
+				()
+
+			(* skip reflection field hashes as they are safe *)
+			| TNew ({ cl_path = (["haxe"; "lang"],"DynamicObject") }, [], [_; e1; _; e2]) ->
+				loop e1;
+				loop e2
+			| TNew ({ cl_path = (["haxe"; "lang"],"Closure") }, [], [eo; _; _]) ->
+				loop eo
+			| TCall ({ eexpr = TField (_, FStatic ({ cl_path = ["haxe"; "lang"],"Runtime" },
+					{ cf_name = "getField" | "setField" | "getField_f" | "setField_f" | "callField" })) },
+					eo :: _ :: _ :: rest) ->
+				loop eo;
+				List.iter loop rest
+
+			| _ ->
+				Type.iter loop e
 			in
-			let tparams = loop (match m with [(EConst(Int s),_)] -> int_of_string s | _ -> assert false) [] in
-			cl.cl_meta <- (Meta.Meta, [
-				EConst(String("global::haxe.lang.GenericInterface(typeof(global::" ^ module_s (TClassDecl cl) ^ "<" ^ String.concat ", " tparams ^ ">))") ), cl.cl_pos
-			], cl.cl_pos) :: cl.cl_meta
-		with Not_found ->
-			());
-
-		gen_attributes w cl.cl_meta;
-
-		let is_main =
-			match gen.gcon.main_class with
-				| Some ( (_,"Main") as path) when path = cl.cl_path && not cl.cl_interface ->
-					(*
-						for cases where the main class is called Main, there will be a problem with creating the entry point there.
-						In this special case, a special entry point class will be created
-					*)
-					write w "public class EntryPoint__Main ";
-					begin_block w;
-					write w "public static void Main() ";
-					begin_block w;
-					(if Hashtbl.mem gen.gtypes (["cs"], "Boot") then write w "global::cs.Boot.init();"; newline w);
-					(match gen.gcon.main with
-						| None ->
-							expr_s w { eexpr = TTypeExpr(TClassDecl cl); etype = t_dynamic; epos = null_pos };
-							write w ".main();"
-						| Some expr ->
-							expr_s w (mk_block expr));
-					end_block w;
-					end_block w;
-					newline w;
-					false
-				| Some path when path = cl.cl_path && not cl.cl_interface -> true
-				| _ -> false
+			try (loop e; false) with Exit -> true
 		in
 
-		let clt, access, modifiers = get_class_modifiers cl.cl_meta (if cl.cl_interface then "interface" else "class") "public" [] in
-		let is_final = clt = "struct" || Meta.has Meta.Final cl.cl_meta in
-
-		let modifiers = [access] @ modifiers in
-		print w "%s %s %s" (String.concat " " modifiers) clt (change_clname (snd cl.cl_path));
-		(* type parameters *)
-		let params, params_ext = get_string_params cl cl.cl_params in
-		let extends_implements = (match cl.cl_super with | None -> [] | Some (cl,p) -> [path_param_s (TClassDecl cl) cl.cl_path p]) @ (List.map (fun (cl,p) -> path_param_s (TClassDecl cl) cl.cl_path p) cl.cl_implements) in
-		(match extends_implements with
-			| [] -> print w "%s%s " params params_ext
-			| _ -> print w "%s : %s%s " params (String.concat ", " extends_implements) params_ext);
-		(* class head ok: *)
-		(* public class Test<A> : X, Y, Z where A : Y *)
-		begin_block w;
-		newline w;
-		(* our constructor is expected to be a normal "new" function *
-		if !strict_mode && is_some cl.cl_constructor then assert false;*)
-
-		let rec loop meta =
-			match meta with
-				| [] -> ()
-				| (Meta.ClassCode, [Ast.EConst (Ast.String contents),_],_) :: tl ->
-					write w contents
-				| _ :: tl -> loop tl
-		in
-		loop cl.cl_meta;
+		let rec gen_class_field w ?(is_overload=false) is_static cl is_final cf =
+			gen_attributes w cf.cf_meta;
+			let is_interface = cl.cl_interface in
+			let name, is_new, is_explicit_iface = match cf.cf_name with
+				| "new" -> cf.cf_name, true, false
+				| name when String.contains name '.' ->
+					let fn_name, path = parse_explicit_iface name in
+					(s_type_path path) ^ "." ^ fn_name, false, true
+				| name -> try
+					let binop = PMap.find name binops_names in
+					"operator " ^ s_binop binop, false, false
+				with | Not_found -> try
+					let unop = PMap.find name unops_names in
+					"operator " ^ s_unop unop, false, false
+				with | Not_found ->
+					if Meta.has (Meta.Custom "?prop_impl") cf.cf_meta || Meta.has (Meta.Custom ":cs_event_impl") cf.cf_meta then
+						"_" ^ name, false, false
+					else
+						name, false, false
+			in
+			let rec loop_static cl =
+				match is_static, cl.cl_super with
+					| false, _ -> []
+					| true, None -> []
+					| true, Some(cl,_) ->
+						(try
+								let cf2 = PMap.find cf.cf_name cl.cl_statics in
+								CastDetect.type_eq gen EqStrict cf.cf_type cf2.cf_type;
+								["new"]
+							with
+								| Not_found | Unify_error _ ->
+										loop_static cl
+							)
+			in
+			let modf = loop_static cl in
+
+			(match cf.cf_kind with
+				| Var _
+				| Method (MethDynamic) when Type.is_physical_field cf ->
+					(if is_overload || List.exists (fun cf -> cf.cf_expr <> None) cf.cf_overloads then
+						gen.gcon.error "Only normal (non-dynamic) methods can be overloaded" cf.cf_pos);
+					if not is_interface then begin
+						let access, modifiers = get_fun_modifiers cf.cf_meta "public" [] in
+						let modifiers = modifiers @ modf in
+						gen_nocompletion w cf.cf_meta;
+						gen_field_decl w access (if is_static then "static" else "") modifiers (t_s (run_follow gen cf.cf_type)) (change_class_field cl name);
+						(match cf.cf_expr with
+							| Some e ->
+								write w " = ";
+								expr_s true w e;
+							| None -> ()
+						);
+						write w ";"
+					end (* TODO see how (get,set) variable handle when they are interfaces *)
+				| Method _ when not (Type.is_physical_field cf) || (match cl.cl_kind, cf.cf_expr with | KAbstractImpl _, None -> true | _ -> false) ->
+					List.iter (fun cf -> if cl.cl_interface || cf.cf_expr <> None then
+						gen_class_field w ~is_overload:true is_static cl (has_class_field_flag cf CfFinal) cf
+					) cf.cf_overloads
+				| Var _ | Method MethDynamic -> ()
+				| Method _ when is_new && Meta.has Meta.Struct cl.cl_meta && fst (get_fun cf.cf_type) = [] ->
+						(* make sure that the method is empty *)
+						let rec check_empty expr = match expr.eexpr with
+							| TBlock(bl) -> bl = [] || List.for_all check_empty bl
+							| TMeta(_,e) -> check_empty e
+							| TParenthesis(e) -> check_empty e
+							| TConst(TNull) -> true
+							| TFunction(tf) -> check_empty tf.tf_expr
+							| _ -> false
+						in
+						(match cf.cf_expr with
+							| Some e ->
+								if not (check_empty e) then
+									gen.gcon.error "The body of a zero argument constructor of a struct should be empty" e.epos
+							| _ -> ());
+						List.iter (fun cf ->
+							if cl.cl_interface || cf.cf_expr <> None then
+								gen_class_field w ~is_overload:true is_static cl (has_class_field_flag cf CfFinal) cf
+						) cf.cf_overloads;
+				| Method mkind ->
+					let overloads =
+						match cf.cf_overloads with
+						| [] when is_overload -> []
+						| [] when has_meta Meta.NativeGen cl.cl_meta ->
+							get_overloads_for_optional_args gen cl cf is_static
+						| overloads -> overloads
+					in
+					List.iter (fun cf ->
+						if cl.cl_interface || cf.cf_expr <> None then
+							gen_class_field w ~is_overload:true is_static cl (has_class_field_flag cf CfFinal) cf
+					) overloads;
+					let is_virtual = not is_final && match mkind with | MethInline -> false | _ when not is_new -> true | _ -> false in
+					let is_virtual = if not is_virtual || (has_class_field_flag cf CfFinal) then false else is_virtual in
+					let is_override = List.memq cf cl.cl_overrides in
+					let is_override = is_override || match cf.cf_name, follow cf.cf_type with
+						| "Equals", TFun([_,_,targ], tret) ->
+							(match follow targ, follow tret with
+								| TDynamic _, TAbstract({ a_path = ([], "Bool") }, []) -> true
+								| _ -> false)
+						| "GetHashCode", TFun([],_) -> true
+						| _ -> false
+					in
+					let is_override = if Meta.has (Meta.Custom "?prop_impl") cf.cf_meta then false else is_override in
 
-		if is_main then begin
-			write w "public static void Main()";
-			begin_block w;
-			(if Hashtbl.mem gen.gtypes (["cs"], "Boot") then write w "global::cs.Boot.init();"; newline w);
-			(match gen.gcon.main with
-				| None ->
-					write w "main();";
-				| Some expr ->
-						expr_s w (mk_block expr));
-			end_block w
-		end;
+					let is_virtual = is_virtual && not cl.cl_final && not (is_interface) in
+					let visibility = if is_interface then "" else "public" in
 
-		(match cl.cl_init with
-			| None -> ()
-			| Some init ->
-				print w "static %s() " (snd cl.cl_path);
-				if needs_unchecked init then begin
-					begin_block w;
-					write w "unchecked ";
-					expr_s w (mk_block init);
-					end_block w;
-				end else
-					expr_s w (mk_block init);
-				line_reset_directive w;
-				newline w;
-				newline w
-		);
+					let visibility, modifiers = get_fun_modifiers cf.cf_meta visibility [] in
+					let modifiers = modifiers @ modf in
+					let visibility, is_virtual = if is_explicit_iface then "",false else if visibility = "private" then "private",false else visibility, is_virtual in
+					let v_n = if is_static then "static" else if is_override && not is_interface then "override" else if is_virtual then "virtual" else "" in
+					let cf_type = if is_override && not is_overload && not (Meta.has Meta.Overload cf.cf_meta) then match field_access gen (TInst(cl, List.map snd cl.cl_params)) cf.cf_name with | FClassField(_,_,_,_,_,actual_t,_) -> actual_t | _ -> assert false else cf.cf_type in
+					let ret_type, args = match follow cf_type with | TFun (strbtl, t) -> (t, strbtl) | _ -> assert false in
+					gen_nocompletion w cf.cf_meta;
 
-		(* collect properties and events *)
-		let partition cf cflist =
-			let events, props, nonprops = ref [], ref [], ref [] in
+					(* public static void funcName *)
+					gen_field_decl w visibility v_n modifiers (if not is_new then (rett_s (run_follow gen ret_type)) else "") (change_class_field cl name);
 
-			List.iter (fun v -> match v.cf_kind with
-				| Var { v_read = AccCall } | Var { v_write = AccCall } when Type.is_extern_field v && Meta.has Meta.Property v.cf_meta ->
-					props := (v.cf_name, ref (v, v.cf_type, None, None)) :: !props;
-				| Var { v_read = AccNormal; v_write = AccNormal } when Meta.has Meta.Event v.cf_meta ->
-					events := (v.cf_name, ref (v, v.cf_type, false, None, None)) :: !events;
-				| _ ->
-					nonprops := v :: !nonprops;
-			) cflist;
-
-			let events, nonprops = !events, !nonprops in
-
-			let t = TInst(cl, List.map snd cl.cl_params) in
-			let find_prop name = try
-					List.assoc name !props
-				with | Not_found -> match field_access gen t name with
-					| FClassField (_,_,decl,v,_,t,_) when is_extern_prop (TInst(cl,List.map snd cl.cl_params)) name ->
-						let ret = ref (v,t,None,None) in
-						props := (name, ret) :: !props;
-						ret
-					| _ -> raise Not_found
-			in
+					let params, params_ext = get_string_params cl cf.cf_params in
+					(* <T>(string arg1, object arg2) with T : object *)
+					(match cf.cf_expr with
+					| Some { eexpr = TFunction tf } ->
+							print w "%s(%s)%s" (params) (String.concat ", " (List.map2 (fun (var, _) (_,_,t) -> sprintf "%s %s" (argt_s t) (change_id var.v_name)) tf.tf_args args)) (params_ext)
+					| _ ->
+							print w "%s(%s)%s" (params) (String.concat ", " (List.map (fun (name, _, t) -> sprintf "%s %s" (argt_s t) (change_id name)) args)) (params_ext)
+					);
+					if is_interface then
+						write w ";"
+					else begin
+						write w " ";
+						let rec loop meta =
+							match meta with
+								| [] ->
+									let expr = match cf.cf_expr with
+										| None -> mk (TBlock([])) t_dynamic null_pos
+										| Some s ->
+											match s.eexpr with
+												| TFunction tf ->
+													mk_block (tf.tf_expr)
+												| _ -> assert false (* FIXME *)
+									in
 
-			let find_event name = List.assoc name events in
+									let write_method_expr e =
+										match e.eexpr with
+										| TBlock [] ->
+											begin_block w;
+											end_block w
+										| TBlock _ ->
+											let unchecked = needs_unchecked e in
+											if unchecked then (begin_block w; write w "unchecked ");
+											let t = Timer.timer ["expression to string"] in
+											expr_s false w e;
+											t();
+											line_reset_directive w;
+											if unchecked then end_block w
+										| _ ->
+											assert false
+									in
 
-			let is_empty_function cf = match cf.cf_expr with
-				| Some {eexpr = TFunction { tf_expr = {eexpr = TBlock []}}} -> true
-				| _ -> false
-			in
+									(if is_new then begin
+										let rec get_super_call el =
+											match el with
+												| ( { eexpr = TCall( { eexpr = TConst(TSuper) }, _) } as call) :: rest ->
+													Some call, rest
+												| ( { eexpr = TBlock(bl) } as block ) :: rest ->
+													let ret, mapped = get_super_call bl in
+													ret, ( { block with eexpr = TBlock(mapped) } :: rest )
+												| _ ->
+													None, el
+										in
+										match expr.eexpr with
+											(* auto-generated ctor overloading for optional args (see get_overloads_for_optional_args) *)
+											| TBlock([{ eexpr = TCall ({ eexpr = TConst TThis }, args) } as this_call]) ->
+												write w ": ";
+												let t = Timer.timer ["expression to string"] in
+												expr_s false w this_call;
+												write w " ";
+												t();
+												write w "{}"
+											| TBlock(bl) ->
+												let super_call, rest = get_super_call bl in
+												(match super_call with
+													| None -> ()
+													| Some sc ->
+														write w ": ";
+														let t = Timer.timer ["expression to string"] in
+														expr_s false w sc;
+														write w " ";
+														t()
+												);
+												write_method_expr { expr with eexpr = TBlock(rest) }
+											| _ -> assert false
+									end else
+										write_method_expr expr
+									)
+								| (Meta.FunctionCode, [Ast.EConst (Ast.String(contents,_)),_],_) :: tl ->
+									begin_block w;
+									write w contents;
+									end_block w
+								| _ :: tl -> loop tl
+						in
+						loop cf.cf_meta
 
-			let interf = cl.cl_interface in
-			(* get all functions that are getters/setters *)
-			let nonprops = List.filter (function
-				| cf when String.starts_with cf.cf_name "get_" -> (try
-					(* find the property *)
-					let prop = find_prop (String.sub cf.cf_name 4 (String.length cf.cf_name - 4)) in
-					let v, t, get, set = !prop in
-					assert (get = None);
-					prop := (v,t,Some cf,set);
-					not interf
-				with | Not_found -> true)
-				| cf when String.starts_with cf.cf_name "set_" -> (try
-					(* find the property *)
-					let prop = find_prop (String.sub cf.cf_name 4 (String.length cf.cf_name - 4)) in
-					let v, t, get, set = !prop in
-					assert (set = None);
-					prop := (v,t,get,Some cf);
-					not interf
-				with | Not_found -> true)
-				| cf when String.starts_with cf.cf_name "add_" -> (try
-					let event = find_event (String.sub cf.cf_name 4 (String.length cf.cf_name - 4)) in
-					let v, t, _, add, remove = !event in
-					assert (add = None);
-					let custom = not (is_empty_function cf) in
-					event := (v, t, custom, Some cf, remove);
-					false
-				with | Not_found -> true)
-				| cf when String.starts_with cf.cf_name "remove_" -> (try
-					let event = find_event (String.sub cf.cf_name 7 (String.length cf.cf_name - 7)) in
-					let v, t, _, add, remove = !event in
-					assert (remove = None);
-					let custom = not (is_empty_function cf) in
-					event := (v, t, custom, add, Some cf);
-					false
-				with | Not_found -> true)
-				| _ -> true
-			) nonprops in
-
-			let nonprops = ref nonprops in
-			List.iter (fun (n,r) ->
-				let ev, t, custom, add, remove = !r in
-				match add, remove with
-				| Some add, Some remove ->
-					if custom && not cl.cl_interface then
-						nonprops := add :: remove :: !nonprops
-				| _ -> assert false (* shouldn't happen because Filters.check_cs_events makes sure methods are present *)
-			) events;
-
-			let evts = List.map (fun(_,v) -> !v) events in
-			let ret = List.map (fun (_,v) -> !v) !props in
-			let ret = List.filter (function | (_,_,None,None) -> false | _ -> true) ret in
-			evts, ret, List.rev !nonprops
+					end);
+				newline w;
+				newline w;
 		in
 
-		let fevents, fprops, fnonprops = partition cl cl.cl_ordered_fields in
-		let sevents, sprops, snonprops = partition cl cl.cl_ordered_statics in
-		(if is_some cl.cl_constructor then gen_class_field w false cl is_final (get cl.cl_constructor));
-		if not cl.cl_interface then begin
-			(* we don't want to generate properties for abstract implementation classes, because they don't have object to work with *)
-			List.iter (gen_event w true cl) sevents;
-			if (match cl.cl_kind with KAbstractImpl _ -> false | _ -> true) then List.iter (gen_prop w true cl is_final) sprops;
-			List.iter (gen_class_field w true cl is_final) snonprops
-		end;
-		List.iter (gen_event w false cl) fevents;
-		List.iter (gen_prop w false cl is_final) fprops;
-		List.iter (gen_class_field w false cl is_final) fnonprops;
-		check_special_behaviors w cl;
-		end_block w;
-		if cl.cl_interface && cl.cl_ordered_statics <> [] then begin
-			print w "public class %s__Statics_" (snd cl.cl_path);
-			begin_block w;
-			List.iter (gen_class_field w true { cl with cl_interface = false } is_final) cl.cl_ordered_statics;
-			end_block w
-		end;
-		if should_close then end_block w
-	in
-
-
-	let gen_enum w e =
-		let should_close = match change_ns (TEnumDecl e) (fst e.e_path) with
-			| [] -> false
-			| ns ->
-				print w "namespace %s" (String.concat "." ns);
+		let check_special_behaviors w cl = match cl.cl_kind with
+		| KAbstractImpl _ -> ()
+		| _ ->
+			(* get/set pairs *)
+			let pairs = ref PMap.empty in
+			(try
+				let get = PMap.find "__get" cl.cl_fields in
+				List.iter (fun cf ->
+					let args,ret = get_fun cf.cf_type in
+					match args with
+					| [_,_,idx] -> pairs := PMap.add (t_s idx) ( t_s ret, Some cf, None ) !pairs
+					| _ -> gen.gcon.warning "The __get function must have exactly one argument (the index)" cf.cf_pos
+				) (get :: get.cf_overloads)
+			with | Not_found -> ());
+			(try
+				let set = PMap.find "__set" cl.cl_fields in
+				List.iter (fun cf ->
+					let args, ret = get_fun cf.cf_type in
+					match args with
+					| [_,_,idx; _,_,v] -> (try
+						let vt, g, _ = PMap.find (t_s idx) !pairs in
+						let tvt = t_s v in
+						if vt <> tvt then gen.gcon.warning "The __get function of same index has a different type from this __set function" cf.cf_pos;
+						pairs := PMap.add (t_s idx) (vt, g, Some cf) !pairs
+					with | Not_found ->
+						pairs := PMap.add (t_s idx) (t_s v, None, Some cf) !pairs)
+					| _ ->
+						gen.gcon.warning "The __set function must have exactly two arguments (index, value)" cf.cf_pos
+				) (set :: set.cf_overloads)
+			with | Not_found -> ());
+			PMap.iter (fun idx (v, get, set) ->
+				print w "public %s this[%s index]" v idx;
+					begin_block w;
+					(match get with
+					| None -> ()
+					| Some _ ->
+						write w "get";
+						begin_block w;
+						write w "return this.__get(index);";
+						end_block w);
+					(match set with
+					| None -> ()
+					| Some _ ->
+						write w "set";
+						begin_block w;
+						write w "this.__set(index,value);";
+						end_block w);
+					end_block w) !pairs;
+			(if not (PMap.is_empty !pairs) then try
+				let get = PMap.find "__get" cl.cl_fields in
+				let idx_t, v_t = match follow get.cf_type with
+					| TFun([_,_,arg_t],ret_t) ->
+						t_s (run_follow gen arg_t), t_s (run_follow gen ret_t)
+					| _ -> gen.gcon.error "The __get function must be a function with one argument. " get.cf_pos; assert false
+				in
+				List.iter (fun (cl,args) ->
+					match cl.cl_array_access with
+						| None -> ()
+						| Some t ->
+							let changed_t = apply_params cl.cl_params (List.map (fun _ -> t_dynamic) cl.cl_params) t in
+							let t_as_s = t_s (run_follow gen changed_t) in
+							print w "%s %s.this[int key]" t_as_s (t_s (TInst(cl, args)));
+								begin_block w;
+								write w "get";
+								begin_block w;
+									print w "return ((%s) this.__get(key));" t_as_s;
+								end_block w;
+								write w "set";
+								begin_block w;
+									print w "this.__set(key, (%s) value);" v_t;
+								end_block w;
+							end_block w;
+							newline w;
+							newline w
+				) cl.cl_implements
+			with | Not_found -> ());
+			if cl.cl_interface && is_hxgen (TClassDecl cl) && is_some cl.cl_array_access then begin
+				let changed_t = apply_params cl.cl_params (List.map (fun _ -> t_dynamic) cl.cl_params) (get cl.cl_array_access) in
+				print w "%s this[int key]" (t_s (run_follow gen changed_t));
 				begin_block w;
-				true
-		in
-		gen_attributes w e.e_meta;
-
-		print w "public enum %s" (change_clname (snd e.e_path));
-		begin_block w;
-		write w (String.concat ", " (List.map (change_id) e.e_names));
-		end_block w;
-
-		if should_close then end_block w
-	in
-
-	let module_type_gen w md_tp =
-		let file_start = len w = 0 in
-		let requires_root = no_root && file_start in
-		if file_start then
-			Codegen.map_source_header gen.gcon (fun s -> print w "// %s\n" s);
-		reset_temps();
-		match md_tp with
-			| TClassDecl cl ->
-				if not cl.cl_extern then begin
-					(if requires_root then write w "using haxe.root;\n"; newline w;);
-					gen_class w cl;
+					write w "get;";
 					newline w;
-					newline w
-				end;
-				(not cl.cl_extern)
-			| TEnumDecl e ->
-				if not e.e_extern && not (Meta.has Meta.Class e.e_meta) then begin
-					(if requires_root then write w "using haxe.root;\n"; newline w;);
-					gen_enum w e;
+					write w "set;";
 					newline w;
-					newline w
-				end;
-				(not e.e_extern)
-			| TAbstractDecl _
-			| TTypeDecl _ ->
-				false
-	in
-
-	(* generate source code *)
-	init_ctx gen;
-
-	Hashtbl.add gen.gspecial_vars "__rethrow__" true;
-	Hashtbl.add gen.gspecial_vars "__typeof__" true;
-	Hashtbl.add gen.gspecial_vars "__label__" true;
-	Hashtbl.add gen.gspecial_vars "__goto__" true;
-	Hashtbl.add gen.gspecial_vars "__is__" true;
-	Hashtbl.add gen.gspecial_vars "__as__" true;
-	Hashtbl.add gen.gspecial_vars "__cs__" true;
-
-	Hashtbl.add gen.gspecial_vars "__checked__" true;
-	Hashtbl.add gen.gspecial_vars "__lock__" true;
-	Hashtbl.add gen.gspecial_vars "__fixed__" true;
-	Hashtbl.add gen.gspecial_vars "__unsafe__" true;
-	Hashtbl.add gen.gspecial_vars "__addressOf__" true;
-	Hashtbl.add gen.gspecial_vars "__valueOf__" true;
-	Hashtbl.add gen.gspecial_vars "__sizeof__" true;
-	Hashtbl.add gen.gspecial_vars "__stackalloc__" true;
-
-	Hashtbl.add gen.gspecial_vars "__delegate__" true;
-	Hashtbl.add gen.gspecial_vars "__array__" true;
-	Hashtbl.add gen.gspecial_vars "__ptr__" true;
-
-	Hashtbl.add gen.gsupported_conversions (["haxe"; "lang"], "Null") (fun t1 t2 -> true);
-	let last_needs_box = gen.gneeds_box in
-	gen.gneeds_box <- (fun t -> match (gen.greal_type t) with
-		| TAbstract( ( { a_path = ["cs"], "Pointer" }, _ ) )
-		| TInst( { cl_path = ["cs"], "Pointer" }, _ )
-		| TInst( { cl_path = (["haxe"; "lang"], "Null") }, _ ) -> true
-		| _ -> last_needs_box t);
-
-	gen.greal_type <- real_type;
-	gen.greal_type_param <- change_param_type;
-
-	SetHXGen.run_filter gen;
-
-	(* before running the filters, follow all possible types *)
-	(* this is needed so our module transformations don't break some core features *)
-	(* like multitype selection *)
-	let run_follow_gen = run_follow gen in
-	let rec type_map e = Type.map_expr_type (fun e->type_map e) (run_follow_gen)	(fun tvar-> tvar.v_type <- (run_follow_gen tvar.v_type); tvar) e in
-	let super_map (cl,tl) = (cl, List.map run_follow_gen tl) in
-	List.iter (function
-		| TClassDecl cl ->
-				let all_fields = (Option.map_default (fun cf -> [cf]) [] cl.cl_constructor) @ cl.cl_ordered_fields @ cl.cl_ordered_statics in
-				List.iter (fun cf ->
-					cf.cf_type <- run_follow_gen cf.cf_type;
-					cf.cf_expr <- Option.map type_map cf.cf_expr;
-
-					(* add @:skipReflection to @:event vars *)
-					match cf.cf_kind with
-					| Var _ when (Meta.has Meta.Event cf.cf_meta) && not (Meta.has Meta.SkipReflection cf.cf_meta) ->
-						cf.cf_meta <- (Meta.SkipReflection, [], null_pos) :: cf.cf_meta;
+				end_block w;
+				newline w;
+				newline w
+			end;
+			(try
+				if cl.cl_interface then raise Not_found;
+				let cf = PMap.find "toString" cl.cl_fields in
+				(if List.exists (fun c -> c.cf_name = "toString") cl.cl_overrides then raise Not_found);
+				(match cf.cf_type with
+					| TFun([], ret) ->
+						(match real_type ret with
+							| TInst( { cl_path = ([], "String") }, []) ->
+								write w "public override string ToString()";
+								begin_block w;
+								write w "return this.toString();";
+								end_block w;
+								newline w;
+								newline w
+							| _ ->
+								gen.gcon.error "A toString() function should return a String!" cf.cf_pos
+						)
 					| _ -> ()
+				)
+			with | Not_found -> ());
+			(try
+				if cl.cl_interface then raise Not_found;
+				let cf = PMap.find "finalize" cl.cl_fields in
+				(if List.exists (fun c -> c.cf_name = "finalize") cl.cl_overrides then raise Not_found);
+				(match cf.cf_type with
+					| TFun([], ret) ->
+						(match real_type ret with
+							| TAbstract( { a_path = ([], "Void") }, []) ->
+								write w "~";
+								write w (snd cl.cl_path);
+								write w "()";
+								begin_block w;
+								write w "this.finalize();";
+								end_block w;
+								newline w;
+								newline w
+							| _ ->
+								gen.gcon.error "A finalize() function should be Void->Void!" cf.cf_pos
+						)
+					| _ -> ()
+				)
+			with | Not_found -> ());
+			(* properties *)
+			let handle_prop static f =
+				match f.cf_kind with
+				| Method _ -> ()
+				| Var v when Type.is_physical_field f -> ()
+				| Var v ->
+					let prop acc = match acc with
+						| AccNo | AccNever | AccCall -> true
+						| _ -> false
+					in
+					if prop v.v_read && prop v.v_write && (v.v_read = AccCall || v.v_write = AccCall) then begin
+						let this = if static then
+							make_static_this cl f.cf_pos
+						else
+							{ eexpr = TConst TThis; etype = TInst(cl,List.map snd cl.cl_params); epos = f.cf_pos }
+						in
+						print w "public %s%s %s" (if static then "static " else "") (t_s f.cf_type) (Dotnet.netname_to_hx f.cf_name);
+						begin_block w;
+						(match v.v_read with
+						| AccCall ->
+							write w "get";
+							begin_block w;
+							write w "return ";
+							expr_s true w this;
+							print w ".get_%s();" f.cf_name;
+							end_block w
+						| _ -> ());
+						(match v.v_write with
+						| AccCall ->
+							write w "set";
+							begin_block w;
+							expr_s false w this;
+							print w ".set_%s(value);" f.cf_name;
+							end_block w
+						| _ -> ());
+						end_block w;
+					end
+			in
+			if Meta.has Meta.BridgeProperties cl.cl_meta then begin
+				List.iter (handle_prop true) cl.cl_ordered_statics;
+				List.iter (handle_prop false) cl.cl_ordered_fields;
+			end
+		in
 
-				) all_fields;
-			 cl.cl_dynamic <- Option.map run_follow_gen cl.cl_dynamic;
-			 cl.cl_array_access <- Option.map run_follow_gen cl.cl_array_access;
-			 cl.cl_init <- Option.map type_map cl.cl_init;
-			 cl.cl_super <- Option.map super_map cl.cl_super;
-			 cl.cl_implements <- List.map super_map cl.cl_implements
-		| _ -> ()
-		) gen.gtypes_list;
-
-	let tp_v = alloc_var "$type_param" t_dynamic in
-	let mk_tp t pos = { eexpr = TLocal(tp_v); etype = t; epos = pos } in
-	gen.gparam_func_call <- (fun ecall efield params elist ->
-		match efield.eexpr with
-		| TField(_, FEnum _) ->
-			{ ecall with eexpr = TCall(efield, elist) }
-		| _ ->
-			{ ecall with eexpr = TCall(efield, (List.map (fun t -> mk_tp t ecall.epos) params) @ elist) }
-	);
-
-	if not erase_generics then HardNullableSynf.configure gen
-		(fun e ->
-			match e.eexpr, real_type e.etype with
-				| TConst TThis, _ when gen.gcurrent_path = (["haxe";"lang"], "Null") ->
-					e
-				| _, TInst({ cl_path = (["haxe";"lang"], "Null") }, [t]) ->
-					let e = { e with eexpr = TParenthesis(e) } in
-					{ (mk_field_access gen e "value" e.epos) with etype = t }
-				| _ ->
-					trace (debug_type e.etype); gen.gcon.error "This expression is not a Nullable expression" e.epos; assert false
-		)
-		(fun v t has_value ->
-			match has_value, real_type v.etype with
-				| true, TDynamic _ | true, TAnon _ | true, TMono _ ->
-					{
-						eexpr = TCall(mk_static_field_access_infer null_t "ofDynamic" v.epos [t], [mk_tp t v.epos; v]);
-						etype = TInst(null_t, [t]);
-						epos = v.epos
-					}
-				| _ ->
-					{ eexpr = TNew(null_t, [t], [gen.ghandle_cast t v.etype v; { eexpr = TConst(TBool has_value); etype = gen.gcon.basic.tbool; epos = v.epos } ]); etype = TInst(null_t, [t]); epos = v.epos }
-		)
-		(fun e ->
-			{
-				eexpr = TCall(
-					{ (mk_field_access gen { (mk_paren e) with etype = real_type e.etype } "toDynamic" e.epos) with etype = TFun([], t_dynamic) },
-					[]);
-				etype = t_dynamic;
-				epos = e.epos
-			}
-		)
-		(fun e ->
-			mk_field_access gen { e with etype = real_type e.etype } "hasValue" e.epos
-		)
-		(fun e1 e2 ->
-			mk (TCall(mk_field_access gen e1 "Equals" e1.epos, [e2])) basic.tbool e1.epos
-		);
-
+		let gen_class w cl =
+			write w "#pragma warning disable 109, 114, 219, 429, 168, 162";
+			newline w;
+			let should_close = match change_ns (TClassDecl cl) (fst (cl.cl_path)) with
+				| [] -> false
+				| ns ->
+					print w "namespace %s " (String.concat "." ns);
+					begin_block w;
+					true
+			in
 
-	let explicit_fn_name c tl fname =
-		path_param_s (TClassDecl c) c.cl_path tl ^ "." ^ fname
-	in
+			(try
+				let _,m,_ = Meta.get (Meta.Custom "generic_iface") cl.cl_meta in
+				let rec loop i acc =
+					if i == 0 then
+						acc
+					else
+						"object" :: (loop (pred i) acc)
+				in
+				let tparams = loop (match m with [(EConst(Int s),_)] -> int_of_string s | _ -> assert false) [] in
+				cl.cl_meta <- (Meta.Meta, [
+					EConst(String("global::haxe.lang.GenericInterface(typeof(global::" ^ module_s (TClassDecl cl) ^ "<" ^ String.concat ", " tparams ^ ">))",SDoubleQuotes) ), cl.cl_pos
+				], cl.cl_pos) :: cl.cl_meta
+			with Not_found ->
+				());
+
+			gen_attributes w cl.cl_meta;
+
+			let is_main =
+				match gen.gcon.main_class with
+					| Some ( (_,"Main") as path) when path = cl.cl_path && not cl.cl_interface ->
+						(*
+							for cases where the main class is called Main, there will be a problem with creating the entry point there.
+							In this special case, a special entry point class will be created
+						*)
+						write w "public class EntryPoint__Main ";
+						begin_block w;
+						write w "public static void Main() ";
+						begin_block w;
+						(if Hashtbl.mem gen.gtypes (["cs"], "Boot") then write w "global::cs.Boot.init();"; newline w);
+						(match gen.gcon.main with
+							| None ->
+								expr_s true w { eexpr = TTypeExpr(TClassDecl cl); etype = t_dynamic; epos = null_pos };
+								write w ".main();"
+							| Some expr ->
+								expr_s false w (mk_block expr));
+						end_block w;
+						end_block w;
+						newline w;
+						false
+					| Some path when path = cl.cl_path && not cl.cl_interface -> true
+					| _ -> false
+			in
 
-	FixOverrides.configure ~explicit_fn_name:explicit_fn_name ~get_vmtype:real_type gen;
-	Normalize.configure gen ~metas:(Hashtbl.create 0);
+			let clt, access, modifiers = get_class_modifiers cl.cl_meta (if cl.cl_interface then "interface" else "class") "public" [] in
+			let modifiers = if cl.cl_final then "sealed" :: modifiers else modifiers in
+			let is_final = clt = "struct" || cl.cl_final in
+
+			let modifiers = [access] @ modifiers in
+			print w "%s %s %s" (String.concat " " modifiers) clt (change_clname (snd cl.cl_path));
+			(* type parameters *)
+			let params, params_ext = get_string_params cl cl.cl_params in
+			let extends_implements = (match cl.cl_super with | None -> [] | Some (cl,p) -> [path_param_s (TClassDecl cl) cl.cl_path p]) @ (List.map (fun (cl,p) -> path_param_s (TClassDecl cl) cl.cl_path p) cl.cl_implements) in
+			(match extends_implements with
+				| [] -> print w "%s%s " params params_ext
+				| _ -> print w "%s : %s%s " params (String.concat ", " extends_implements) params_ext);
+			(* class head ok: *)
+			(* public class Test<A> : X, Y, Z where A : Y *)
+			begin_block w;
+			newline w;
+			(* our constructor is expected to be a normal "new" function *
+			if !strict_mode && is_some cl.cl_constructor then assert false;*)
+
+			let rec loop meta =
+				match meta with
+					| [] -> ()
+					| (Meta.ClassCode, [Ast.EConst (Ast.String(contents,_)),_],_) :: tl ->
+						write w contents
+					| _ :: tl -> loop tl
+			in
+			loop cl.cl_meta;
 
-	AbstractImplementationFix.configure gen;
+			if is_main then begin
+				write w "public static void Main()";
+				begin_block w;
+				(if Hashtbl.mem gen.gtypes (["cs"], "Boot") then write w "global::cs.Boot.init();"; newline w);
+				(match gen.gcon.main with
+					| None ->
+						write w "main();";
+					| Some expr ->
+							expr_s false w (mk_block expr));
+				end_block w
+			end;
 
-	IteratorsInterface.configure gen;
+			(match cl.cl_init with
+				| None -> ()
+				| Some init ->
+					let needs_block,write_expr =
+						let unchecked = needs_unchecked init in
+						if cl.cl_params = [] then
+							unchecked, (fun() ->
+								if unchecked then write w "unchecked";
+								expr_s false w (mk_block init)
+							)
+						else begin
+							write w "static bool __hx_init_called = false;";
+							newline w;
+							true, (fun() ->
+								let flag = (t_s (TInst(cl, List.map (fun _ -> t_empty) cl.cl_params))) ^ ".__hx_init_called" in
+								write w ("if(" ^ flag ^ ") return;");
+								newline w;
+								write w (flag ^ " = true;");
+								newline w;
+								if unchecked then write w "unchecked";
+								expr_s false w (mk_block init);
+								newline w
+							)
+						end
+					in
+					print w "static %s() " (snd cl.cl_path);
+					if needs_block then begin
+						begin_block w;
+						write_expr();
+						end_block w;
+					end else
+						write_expr();
+					line_reset_directive w;
+					newline w;
+					newline w
+			);
 
-	let closure_t = ClosuresToClass.DoubleAndDynamicClosureImpl.get_ctx gen (get_cl (get_type gen (["haxe";"lang"],"Function"))) 6 in
-	ClosuresToClass.configure gen closure_t;
+			(* collect properties and events *)
+			let partition cf cflist =
+				let events, props, nonprops = ref [], ref [], ref [] in
 
-	let enum_base = (get_cl (get_type gen (["haxe";"lang"],"Enum")) ) in
-	let param_enum_base = (get_cl (get_type gen (["haxe";"lang"],"ParamEnum")) ) in
-	EnumToClass.configure gen (Some (fun e -> mk_cast gen.gcon.basic.tint e)) true true enum_base param_enum_base;
+				List.iter (fun v -> match v.cf_kind with
+					| Var { v_read = AccCall } | Var { v_write = AccCall } when not (Type.is_physical_field v) && Meta.has Meta.Property v.cf_meta ->
+						props := (v.cf_name, ref (v, v.cf_type, None, None)) :: !props;
+					| Var { v_read = AccNormal; v_write = AccNormal } when Meta.has Meta.Event v.cf_meta ->
+						events := (v.cf_name, ref (v, v.cf_type, false, None, None)) :: !events;
+					| _ ->
+						nonprops := v :: !nonprops;
+				) cflist;
+
+				let events, nonprops = !events, !nonprops in
+
+				let t = TInst(cl, List.map snd cl.cl_params) in
+				let find_prop name = try
+						List.assoc name !props
+					with | Not_found -> match field_access gen t name with
+						| FClassField (_,_,decl,v,_,t,_) when is_extern_prop (TInst(cl,List.map snd cl.cl_params)) name ->
+							let ret = ref (v,t,None,None) in
+							props := (name, ret) :: !props;
+							ret
+						| _ -> raise Not_found
+				in
 
-	InterfaceVarsDeleteModf.configure gen;
-	InterfaceProps.configure gen;
+				let find_event name = List.assoc name events in
 
-	let dynamic_object = (get_cl (get_type gen (["haxe";"lang"],"DynamicObject")) ) in
+				let is_empty_function cf = match cf.cf_expr with
+					| Some {eexpr = TFunction { tf_expr = {eexpr = TBlock []}}} -> true
+					| _ -> false
+				in
 
-	let object_iface = get_cl (get_type gen (["haxe";"lang"],"IHxObject")) in
+				let interf = cl.cl_interface in
+				(* get all functions that are getters/setters *)
+				let nonprops = List.filter (function
+					| cf when String.starts_with cf.cf_name "get_" -> (try
+						(* find the property *)
+						let prop = find_prop (String.sub cf.cf_name 4 (String.length cf.cf_name - 4)) in
+						let v, t, get, set = !prop in
+						assert (get = None);
+						prop := (v,t,Some cf,set);
+						not interf
+					with | Not_found -> true)
+					| cf when String.starts_with cf.cf_name "set_" -> (try
+						(* find the property *)
+						let prop = find_prop (String.sub cf.cf_name 4 (String.length cf.cf_name - 4)) in
+						let v, t, get, set = !prop in
+						assert (set = None);
+						prop := (v,t,get,Some cf);
+						not interf
+					with | Not_found -> true)
+					| cf when String.starts_with cf.cf_name "add_" -> (try
+						let event = find_event (String.sub cf.cf_name 4 (String.length cf.cf_name - 4)) in
+						let v, t, _, add, remove = !event in
+						assert (add = None);
+						let custom = not (is_empty_function cf) in
+						event := (v, t, custom, Some cf, remove);
+						false
+					with | Not_found -> true)
+					| cf when String.starts_with cf.cf_name "remove_" -> (try
+						let event = find_event (String.sub cf.cf_name 7 (String.length cf.cf_name - 7)) in
+						let v, t, _, add, remove = !event in
+						assert (remove = None);
+						let custom = not (is_empty_function cf) in
+						event := (v, t, custom, add, Some cf);
+						false
+					with | Not_found -> true)
+					| _ -> true
+				) nonprops in
+
+				let nonprops = ref nonprops in
+				List.iter (fun (n,r) ->
+					let ev, t, custom, add, remove = !r in
+					match add, remove with
+					| Some add, Some remove ->
+						if custom && not cl.cl_interface then
+							nonprops := add :: remove :: !nonprops
+					| _ -> assert false (* shouldn't happen because Filters.check_cs_events makes sure methods are present *)
+				) events;
+
+				let evts = List.map (fun(_,v) -> !v) events in
+				let ret = List.map (fun (_,v) -> !v) !props in
+				let ret = List.filter (function | (_,_,None,None) -> false | _ -> true) ret in
+				evts, ret, List.rev !nonprops
+			in
 
-	let empty_en = match get_type gen (["haxe";"lang"], "EmptyObject") with TEnumDecl e -> e | _ -> assert false in
-	let empty_ctor_type = TEnum(empty_en, []) in
-	let empty_en_expr = mk (TTypeExpr (TEnumDecl empty_en)) (TAnon { a_fields = PMap.empty; a_status = ref (EnumStatics empty_en) }) null_pos in
-	let empty_ctor_expr = mk (TField (empty_en_expr, FEnum(empty_en, PMap.find "EMPTY" empty_en.e_constrs))) empty_ctor_type null_pos in
-	OverloadingConstructor.configure ~empty_ctor_type:empty_ctor_type ~empty_ctor_expr:empty_ctor_expr gen;
+			let fevents, fprops, fnonprops = partition cl cl.cl_ordered_fields in
+			let sevents, sprops, snonprops = partition cl cl.cl_ordered_statics in
+			(if is_some cl.cl_constructor then gen_class_field w false cl is_final (get cl.cl_constructor));
+			if not cl.cl_interface then begin
+				(* we don't want to generate properties for abstract implementation classes, because they don't have object to work with *)
+				List.iter (gen_event w true cl) sevents;
+				if (match cl.cl_kind with KAbstractImpl _ -> false | _ -> true) then List.iter (gen_prop w true cl is_final) sprops;
+				List.iter (gen_class_field w true cl is_final) snonprops
+			end;
+			List.iter (gen_event w false cl) fevents;
+			List.iter (gen_prop w false cl is_final) fprops;
+			List.iter (gen_class_field w false cl is_final) fnonprops;
+			check_special_behaviors w cl;
+			end_block w;
+			if cl.cl_interface && cl.cl_ordered_statics <> [] then begin
+				print w "public class %s__Statics_" (snd cl.cl_path);
+				begin_block w;
+				List.iter (gen_class_field w true { cl with cl_interface = false } is_final) cl.cl_ordered_statics;
+				end_block w
+			end;
+			if should_close then end_block w
+		in
 
-	let rcf_static_find = mk_static_field_access_infer (get_cl (get_type gen (["haxe";"lang"], "FieldLookup"))) "findHash" null_pos [] in
-	let rcf_static_lookup = mk_static_field_access_infer (get_cl (get_type gen (["haxe";"lang"], "FieldLookup"))) "lookupHash" null_pos [] in
 
-	let rcf_static_insert, rcf_static_remove =
-		if erase_generics then begin
-			let get_specialized_postfix t = match t with
-				| TAbstract({a_path = [],("Float" | "Int" as name)}, _) -> name
-				| TAnon _ | TDynamic _ -> "Dynamic"
-				| _ -> print_endline (debug_type t); assert false
+		let gen_enum w e =
+			let should_close = match change_ns (TEnumDecl e) (fst e.e_path) with
+				| [] -> false
+				| ns ->
+					print w "namespace %s" (String.concat "." ns);
+					begin_block w;
+					true
 			in
-			(fun t -> mk_static_field_access_infer (get_cl (get_type gen (["haxe";"lang"], "FieldLookup"))) ("insert" ^ get_specialized_postfix t) null_pos []),
-			(fun t -> mk_static_field_access_infer (get_cl (get_type gen (["haxe";"lang"], "FieldLookup"))) ("remove" ^ get_specialized_postfix t) null_pos [])
-		end else
-			(fun t -> mk_static_field_access_infer (get_cl (get_type gen (["haxe";"lang"], "FieldLookup"))) "insert" null_pos [t]),
-			(fun t -> mk_static_field_access_infer (get_cl (get_type gen (["haxe";"lang"], "FieldLookup"))) "remove" null_pos [t])
-	in
-
-	let can_be_float = like_float in
-
-	let rcf_on_getset_field main_expr field_expr field may_hash may_set is_unsafe =
-		let is_float = can_be_float (real_type main_expr.etype) in
-		let fn_name = if is_some may_set then "setField" else "getField" in
-		let fn_name = if is_float then fn_name ^ "_f" else fn_name in
-		let pos = field_expr.epos in
+			gen_attributes w e.e_meta;
 
-		let is_unsafe = { eexpr = TConst(TBool is_unsafe); etype = basic.tbool; epos = pos } in
+			print w "public enum %s" (change_clname (snd e.e_path));
+			begin_block w;
+			write w (String.concat ", " (List.map (change_id) e.e_names));
+			end_block w;
 
-		let should_cast = match main_expr.etype with | TAbstract({ a_path = ([], "Float") }, []) -> false | _ -> true in
-		let infer = mk_static_field_access_infer runtime_cl fn_name field_expr.epos [] in
-		let first_args =
-			[ field_expr; { eexpr = TConst(TString field); etype = basic.tstring; epos = pos } ]
-			@ if is_some may_hash then [ { eexpr = TConst(TInt (get may_hash)); etype = basic.tint; epos = pos } ] else []
+			if should_close then end_block w
 		in
-		let args = first_args @ match is_float, may_set with
-			| true, Some(set) ->
-				[ if should_cast then mk_cast basic.tfloat set else set ]
-			| false, Some(set) ->
-				[ set ]
-			| _ ->
-				[ is_unsafe ]
+
+		let module_type_gen w md_tp =
+			let file_start = len w = 0 in
+			let requires_root = no_root && file_start in
+			if file_start then
+				Codegen.map_source_header gen.gcon (fun s -> print w "// %s\n" s);
+			reset_temps();
+			match md_tp with
+				| TClassDecl cl ->
+					if not cl.cl_extern then begin
+						(if requires_root then write w "using haxe.root;\n"; newline w;);
+						gen_class w cl;
+						newline w;
+						newline w
+					end;
+					(not cl.cl_extern)
+				| TEnumDecl e ->
+					if not e.e_extern && not (Meta.has Meta.Class e.e_meta) then begin
+						(if requires_root then write w "using haxe.root;\n"; newline w;);
+						gen_enum w e;
+						newline w;
+						newline w
+					end;
+					(not e.e_extern)
+				| TAbstractDecl _
+				| TTypeDecl _ ->
+					false
 		in
 
-		let call = { main_expr with eexpr = TCall(infer,args) } in
-		let call = if is_float && should_cast then mk_cast main_expr.etype call else call in
-		call
-	in
+		(* generate source code *)
+		init_ctx gen;
+
+		Hashtbl.add gen.gspecial_vars "__rethrow__" true;
+		Hashtbl.add gen.gspecial_vars "__typeof__" true;
+		Hashtbl.add gen.gspecial_vars "__is__" true;
+		Hashtbl.add gen.gspecial_vars "__as__" true;
+		Hashtbl.add gen.gspecial_vars "__cs__" true;
+
+		Hashtbl.add gen.gspecial_vars "__checked__" true;
+		Hashtbl.add gen.gspecial_vars "__lock__" true;
+		Hashtbl.add gen.gspecial_vars "__fixed__" true;
+		Hashtbl.add gen.gspecial_vars "__unsafe__" true;
+		Hashtbl.add gen.gspecial_vars "__addressOf__" true;
+		Hashtbl.add gen.gspecial_vars "__valueOf__" true;
+		Hashtbl.add gen.gspecial_vars "__sizeof__" true;
+		Hashtbl.add gen.gspecial_vars "__stackalloc__" true;
+
+		Hashtbl.add gen.gspecial_vars "__delegate__" true;
+		Hashtbl.add gen.gspecial_vars "__array__" true;
+		Hashtbl.add gen.gspecial_vars "__ptr__" true;
+
+		Hashtbl.add gen.gsupported_conversions (["haxe"; "lang"], "Null") (fun t1 t2 -> true);
+		let last_needs_box = gen.gneeds_box in
+		gen.gneeds_box <- (fun t -> match (gen.greal_type t) with
+			| TAbstract( ( { a_path = ["cs"], "Pointer" }, _ ) )
+			| TInst( { cl_path = ["cs"], "Pointer" }, _ )
+			| TInst( { cl_path = (["haxe"; "lang"], "Null") }, _ ) -> true
+			| _ -> last_needs_box t);
+
+		gen.greal_type <- real_type;
+		gen.greal_type_param <- change_param_type;
+
+		(* before running the filters, follow all possible types *)
+		(* this is needed so our module transformations don't break some core features *)
+		(* like multitype selection *)
+		let run_follow_gen = run_follow gen in
+		let rec type_map e = Type.map_expr_type (fun e->type_map e) (run_follow_gen)	(fun tvar-> tvar.v_type <- (run_follow_gen tvar.v_type); tvar) e in
+		let super_map (cl,tl) = (cl, List.map run_follow_gen tl) in
+		List.iter (function
+			| TClassDecl cl ->
+					let all_fields = (Option.map_default (fun cf -> [cf]) [] cl.cl_constructor) @ cl.cl_ordered_fields @ cl.cl_ordered_statics in
+					List.iter (fun cf ->
+						cf.cf_type <- run_follow_gen cf.cf_type;
+						cf.cf_expr <- Option.map type_map cf.cf_expr;
+
+						(* add @:skipReflection to @:event vars *)
+						match cf.cf_kind with
+						| Var _ when (Meta.has Meta.Event cf.cf_meta) && not (Meta.has Meta.SkipReflection cf.cf_meta) ->
+							cf.cf_meta <- (Meta.SkipReflection, [], null_pos) :: cf.cf_meta;
+						| _ -> ()
+
+					) all_fields;
+				cl.cl_dynamic <- Option.map run_follow_gen cl.cl_dynamic;
+				cl.cl_array_access <- Option.map run_follow_gen cl.cl_array_access;
+				cl.cl_init <- Option.map type_map cl.cl_init;
+				cl.cl_super <- Option.map super_map cl.cl_super;
+				cl.cl_implements <- List.map super_map cl.cl_implements
+			| _ -> ()
+			) gen.gtypes_list;
 
-	let rcf_on_call_field ecall field_expr field may_hash args =
-		let infer = mk_static_field_access_infer runtime_cl "callField" field_expr.epos [] in
+		let mk_tp t pos = { eexpr = TIdent "$type_param"; etype = t; epos = pos } in
+		gen.gparam_func_call <- (fun ecall efield params elist ->
+			match efield.eexpr with
+			| TField(_, FEnum _) ->
+				{ ecall with eexpr = TCall(efield, elist) }
+			| _ ->
+				{ ecall with eexpr = TCall(efield, (List.map (fun t -> mk_tp t ecall.epos) params) @ elist) }
+		);
 
-		let hash_arg = match may_hash with
-			| None -> []
-			| Some h -> [ { eexpr = TConst(TInt h); etype = basic.tint; epos = field_expr.epos } ]
-		in
+		if not erase_generics then HardNullableSynf.configure gen
+			(fun e ->
+				match e.eexpr, real_type e.etype with
+					| TConst TThis, _ when gen.gcurrent_path = (["haxe";"lang"], "Null") ->
+						e
+					| TConst (TInt _ | TFloat _ | TBool _), _ ->
+						e
+					| _, TInst({ cl_path = (["haxe";"lang"], "Null") }, [t]) ->
+						let e = { e with eexpr = TParenthesis(e) } in
+						{ (mk_field_access gen e "value" e.epos) with etype = t }
+					| _ ->
+						trace (debug_type e.etype); gen.gcon.error "This expression is not a Nullable expression" e.epos; assert false
+			)
+			(fun v t has_value ->
+				match has_value, real_type v.etype with
+					| true, TDynamic _ | true, TAnon _ | true, TMono _ ->
+						{
+							eexpr = TCall(mk_static_field_access_infer null_t "ofDynamic" v.epos [t], [mk_tp t v.epos; v]);
+							etype = TInst(null_t, [t]);
+							epos = v.epos
+						}
+					| _ ->
+						{ eexpr = TNew(null_t, [t], [gen.ghandle_cast t v.etype v; { eexpr = TConst(TBool has_value); etype = gen.gcon.basic.tbool; epos = v.epos } ]); etype = TInst(null_t, [t]); epos = v.epos }
+			)
+			(fun e ->
+				{
+					eexpr = TCall(
+						{ (mk_field_access gen { (mk_paren e) with etype = real_type e.etype } "toDynamic" e.epos) with etype = TFun([], t_dynamic) },
+						[]);
+					etype = t_dynamic;
+					epos = e.epos
+				}
+			)
+			(fun e ->
+				mk_field_access gen { e with etype = real_type e.etype } "hasValue" e.epos
+			)
+			(fun e1 e2 ->
+				mk (TCall(mk_field_access gen e1 "Equals" e1.epos, [e2])) basic.tbool e1.epos
+			);
 
-		let arr_call = if args <> [] then
-			{ eexpr = TArrayDecl args; etype = basic.tarray t_dynamic; epos = ecall.epos }
-		else
-			null (basic.tarray t_dynamic) ecall.epos
-		in
 
-		let call_args =
-			[field_expr; { field_expr with eexpr = TConst(TString field); etype = basic.tstring } ]
-				@ hash_arg
-				@ [ arr_call ]
+		let explicit_fn_name c tl fname =
+			path_param_s (TClassDecl c) c.cl_path tl ^ "." ^ fname
 		in
 
-		mk_cast ecall.etype { ecall with eexpr = TCall(infer, call_args) }
-	in
+		FixOverrides.configure ~explicit_fn_name:explicit_fn_name ~get_vmtype:real_type gen;
 
-	add_cast_handler gen;
-	if not erase_generics then
-		TypeParams.RealTypeParams.configure gen (fun e t -> gen.gcon.warning ("Cannot cast to " ^ (debug_type t)) e.epos; mk_cast t e) ifaces (get_cl (get_type gen (["haxe";"lang"], "IGenericObject")))
-	else
-		TypeParams.RealTypeParams.RealTypeParamsModf.configure gen (TypeParams.RealTypeParams.RealTypeParamsModf.set_only_hxgeneric gen);
+		let allowed_meta = Hashtbl.create 1 in
+		Hashtbl.add allowed_meta Meta.LoopLabel true;
+		Normalize.configure gen ~allowed_metas:allowed_meta;
 
-	let flookup_cl = get_cl (get_type gen (["haxe";"lang"], "FieldLookup")) in
+		AbstractImplementationFix.configure gen;
 
-	let rcf_ctx =
-		ReflectionCFs.new_ctx
-			gen
-			closure_t
-			object_iface
-			true
-			rcf_on_getset_field
-			rcf_on_call_field
-			(fun hash hash_array length -> { hash with eexpr = TCall(rcf_static_find, [hash; hash_array; length]); etype=basic.tint })
-			(fun hash -> { hash with eexpr = TCall(rcf_static_lookup, [hash]); etype = gen.gcon.basic.tstring })
-			(fun hash_array length pos value ->
-				let ecall = mk (TCall(rcf_static_insert value.etype, [hash_array; length; pos; value])) (if erase_generics then hash_array.etype else basic.tvoid) hash_array.epos in
-				if erase_generics then { ecall with eexpr = TBinop(OpAssign, hash_array, ecall) } else ecall
-			)
-			(fun hash_array length pos ->
-				let t = gen.gclasses.nativearray_type hash_array.etype in
-				{ hash_array with eexpr = TCall(rcf_static_remove t, [hash_array; length; pos]); etype = gen.gcon.basic.tvoid }
-			)
-			(
-				let delete = mk_static_field_access_infer flookup_cl "deleteHashConflict" null_pos [] in
-				let get = mk_static_field_access_infer flookup_cl "getHashConflict" null_pos [] in
-				let set = mk_static_field_access_infer flookup_cl "setHashConflict" null_pos [] in
-				let add = mk_static_field_access_infer flookup_cl "addHashConflictNames" null_pos [] in
-				let conflict_t = TInst (get_cl (get_type gen (["haxe"; "lang"], "FieldHashConflict")), []) in
-				Some {
-					t = conflict_t;
-					get_conflict = (fun ehead ehash ename -> mk (TCall (get, [ehead; ehash; ename])) conflict_t ehead.epos);
-					set = (fun ehead ehash ename evalue -> mk (TCall (set, [ehead; ehash; ename; evalue])) basic.tvoid ehead.epos);
-					delete = (fun ehead ehash ename -> mk (TCall (delete, [ehead; ehash; ename])) basic.tbool ehead.epos);
-					add_names = (fun ehead earr -> mk (TCall (add, [ehead; earr])) basic.tvoid ehead.epos);
-				}
-			)
-	in
+		let cl_arg_exc = get_cl (get_type gen (["System"],"ArgumentException")) in
+		let cl_arg_exc_t = TInst (cl_arg_exc, []) in
+		let mk_arg_exception msg pos = mk (TNew (cl_arg_exc, [], [make_string gen.gcon.basic msg pos])) cl_arg_exc_t pos in
+		let closure_t = ClosuresToClass.DoubleAndDynamicClosureImpl.get_ctx gen (get_cl (get_type gen (["haxe";"lang"],"Function"))) 6 mk_arg_exception in
+		ClosuresToClass.configure gen closure_t;
 
-	ReflectionCFs.UniversalBaseClass.configure gen (get_cl (get_type gen (["haxe";"lang"],"HxObject")) ) object_iface dynamic_object;
-
-	ReflectionCFs.configure_dynamic_field_access rcf_ctx;
-
-	let closure_cl = get_cl (get_type gen (["haxe";"lang"],"Closure")) in
-	let varargs_cl = get_cl (get_type gen (["haxe";"lang"],"VarArgsFunction")) in
-	let dynamic_name = gen.gmk_internal_name "hx" "invokeDynamic" in
-
-	List.iter (fun cl ->
-		List.iter (fun cf ->
-			if cf.cf_name = dynamic_name then cl.cl_overrides <- cf :: cl.cl_overrides
-		) cl.cl_ordered_fields
-	) [closure_cl; varargs_cl];
-
-	ReflectionCFs.implement_varargs_cl rcf_ctx ( get_cl (get_type gen (["haxe";"lang"], "VarArgsBase")) );
-
-	let slow_invoke = mk_static_field_access_infer (runtime_cl) "slowCallField" null_pos [] in
-	ReflectionCFs.configure rcf_ctx ~slow_invoke:(fun ethis efield eargs -> {
-		eexpr = TCall(slow_invoke, [ethis; efield; eargs]);
-		etype = t_dynamic;
-		epos = ethis.epos;
-	} ) object_iface;
-
-	ObjectDeclMap.configure gen (ReflectionCFs.implement_dynamic_object_ctor rcf_ctx dynamic_object);
-
-	InitFunction.configure gen;
-	TArrayTransform.configure gen (
-	fun e binop ->
-		match e.eexpr with
-			| TArray(e1, e2) ->
-				(match follow e1.etype with
-					| TDynamic _ | TAnon _ | TMono _ -> true
-					| TInst({ cl_kind = KTypeParameter _ }, _) -> true
-					| TInst(c,p) when erase_generics && is_hxgeneric (TClassDecl c) && is_hxgen (TClassDecl c) -> (match c.cl_path with
-						| [],"String"
-						| ["cs"],"NativeArray" -> false
-						| _ ->
-							true)
-					| _ -> match binop, change_param_type (t_to_md e1.etype) [e.etype] with
-						| Some(Ast.OpAssignOp _), ([TDynamic _] | [TAnon _]) ->
-							true
-						| _ -> false)
-			| _ -> assert false
-	) "__get" "__set";
+		let enum_base = (get_cl (get_type gen (["haxe";"lang"],"Enum")) ) in
+		let type_enumindex = mk_static_field_access_infer gen.gclasses.cl_type "enumIndex" null_pos [] in
+		let mk_enum_index_call e p =
+			mk (TCall (type_enumindex, [e])) gen.gcon.basic.tint p
+		in
+		EnumToClass2.configure gen enum_base mk_enum_index_call;
 
-	let field_is_dynamic t field =
-		match field_access_esp gen (gen.greal_type t) field with
-			| FEnumField _ -> false
-			| FClassField (cl,p,_,_,_,t,_) ->
-				if not erase_generics then
-					false
-				else
-					let p = change_param_type (TClassDecl cl) p in
-					is_dynamic (apply_params cl.cl_params p t)
-			| _ -> true
-	in
+		InterfaceVarsDeleteModf.configure gen;
 
-	let is_dynamic_expr e = is_dynamic e.etype || match e.eexpr with
-		| TField(tf, f) -> field_is_dynamic tf.etype (f)
-		| _ -> false
-	in
+		let dynamic_object = (get_cl (get_type gen (["haxe";"lang"],"DynamicObject")) ) in
 
-	let may_nullable t = match gen.gfollow#run_f t with
-		| TType({ t_path = ([], "Null") }, [t]) ->
-			(match follow t with
-				| TInst({ cl_path = ([], "String") }, [])
-				| TAbstract ({ a_path = ([], "Float") },[])
-				| TInst({ cl_path = (["haxe"], "Int32")}, [] )
-				| TInst({ cl_path = (["haxe"], "Int64")}, [] )
-				| TAbstract ({ a_path = ([], "Int") },[])
-				| TAbstract ({ a_path = ([], "Bool") },[]) -> Some t
-				| TAbstract _ when like_float t -> Some t
-				| t when is_cs_basic_type t -> Some t
-				| _ -> None )
-		| _ -> None
-	in
+		let object_iface = get_cl (get_type gen (["haxe";"lang"],"IHxObject")) in
 
-	let is_double t = like_float t && not (like_int t) in
-	let is_int t = like_int t in
+		let empty_en = match get_type gen (["haxe";"lang"], "EmptyObject") with TEnumDecl e -> e | _ -> assert false in
+		let empty_ctor_type = TEnum(empty_en, []) in
+		let empty_en_expr = mk (TTypeExpr (TEnumDecl empty_en)) (TAnon { a_fields = PMap.empty; a_status = ref (EnumStatics empty_en) }) null_pos in
+		let empty_ctor_expr = mk (TField (empty_en_expr, FEnum(empty_en, PMap.find "EMPTY" empty_en.e_constrs))) empty_ctor_type null_pos in
+		OverloadingConstructor.configure ~empty_ctor_type:empty_ctor_type ~empty_ctor_expr:empty_ctor_expr gen;
 
-	let is_null t = match real_type t with
-		| TInst( { cl_path = (["haxe";"lang"], "Null") }, _ ) -> true
-		| _ -> false
-	in
+		let rcf_static_find = mk_static_field_access_infer (get_cl (get_type gen (["haxe";"lang"], "FieldLookup"))) "findHash" null_pos [] in
+		let rcf_static_lookup = mk_static_field_access_infer (get_cl (get_type gen (["haxe";"lang"], "FieldLookup"))) "lookupHash" null_pos [] in
 
-	let is_null_expr e = is_null e.etype || match e.eexpr with
-		| TField(tf, f) -> (match field_access_esp gen (real_type tf.etype) (f) with
-			| FClassField(_,_,_,_,_,actual_t,_) -> is_null actual_t
-			| _ -> false)
-		| _ -> false
-	in
+		let rcf_static_insert, rcf_static_remove =
+			let get_specialized_postfix t = match t with
+				| TAbstract({a_path = [],("Float" | "Int" as name)}, _) -> name
+				| TAnon _ | TDynamic _ -> "Dynamic"
+				| _ -> print_endline (debug_type t); assert false
+			in
+			(fun t -> mk_static_field_access_infer (get_cl (get_type gen (["haxe";"lang"], "FieldLookup"))) ("insert" ^ get_specialized_postfix t) null_pos []),
+			(fun t -> mk_static_field_access_infer (get_cl (get_type gen (["haxe";"lang"], "FieldLookup"))) ("remove" ^ get_specialized_postfix t) null_pos [])
+		in
 
-	let should_handle_opeq t =
-		match real_type t with
-			| TDynamic _ | TAnon _ | TMono _
-			| TInst( { cl_kind = KTypeParameter _ }, _ )
-			| TInst( { cl_path = (["haxe";"lang"], "Null") }, _ ) -> true
-			| _ -> false
-	in
+		let can_be_float = like_float in
 
-	let string_cl = match gen.gcon.basic.tstring with
-		| TInst(c,[]) -> c
-		| _ -> assert false
-	in
+		let rcf_on_getset_field main_expr field_expr field may_hash may_set is_unsafe =
+			let is_float = can_be_float (real_type main_expr.etype) in
+			let fn_name = if is_some may_set then "setField" else "getField" in
+			let fn_name = if is_float then fn_name ^ "_f" else fn_name in
+			let pos = field_expr.epos in
 
-	let is_undefined e = match e.eexpr with
-		| TLocal { v_name = "__undefined__" } | TField(_,FStatic({cl_path=["haxe";"lang"],"Runtime"},{cf_name="undefined"})) -> true
-		| _ -> false
-	in
+			let is_unsafe = { eexpr = TConst(TBool is_unsafe); etype = basic.tbool; epos = pos } in
 
-	DynamicOperators.configure gen
-		(fun e -> match e.eexpr with
-			| TBinop (Ast.OpEq, e1, e2)
-			| TBinop (Ast.OpNotEq, e1, e2) ->
-				(
-					(* dont touch (v == null) and (null == v) comparisons because they are handled by HardNullableSynf later *)
-					match e1.eexpr, e2.eexpr with
-					| TConst(TNull), _ when (not (is_tparam e2.etype) && is_dynamic e2.etype) || is_null_expr e2 ->
-						false
-					| _, TConst(TNull) when (not (is_tparam e1.etype) && is_dynamic e1.etype) || is_null_expr e1 ->
-						false
-					| _ when is_undefined e1 || is_undefined e2 ->
-						false
-					| _ ->
-						should_handle_opeq e1.etype || should_handle_opeq e2.etype
-				)
-			| TBinop (Ast.OpAssignOp Ast.OpAdd, e1, e2) ->
-				is_dynamic_expr e1 || is_null_expr e1 || is_string e.etype
-			| TBinop (Ast.OpAdd, e1, e2) -> is_dynamic e1.etype || is_dynamic e2.etype || is_tparam e1.etype || is_tparam e2.etype || is_string e1.etype || is_string e2.etype || is_string e.etype
-			| TBinop (Ast.OpLt, e1, e2)
-			| TBinop (Ast.OpLte, e1, e2)
-			| TBinop (Ast.OpGte, e1, e2)
-			| TBinop (Ast.OpGt, e1, e2) -> is_dynamic e.etype || is_dynamic_expr e1 || is_dynamic_expr e2 || is_string e1.etype || is_string e2.etype
-			| TBinop (_, e1, e2) -> is_dynamic e.etype || is_dynamic_expr e1 || is_dynamic_expr e2
-			| TUnop (_, _, e1) -> is_dynamic_expr e1 || is_null_expr e1 (* we will see if the expression is Null<T> also, as the unwrap from Unop will be the same *)
-			| _ -> false)
-		(fun e1 e2 ->
-			let is_basic = is_cs_basic_type (follow e1.etype) || is_cs_basic_type (follow e2.etype) in
-			let is_ref = if is_basic then false else match follow e1.etype, follow e2.etype with
-				| TDynamic _, _
-				| _, TDynamic _
-				| TInst( { cl_path = ([], "String") }, [] ), _
-				| _, TInst( { cl_path = ([], "String") }, [] )
-				| TInst( { cl_kind = KTypeParameter _ }, [] ), _
-				| _, TInst( { cl_kind = KTypeParameter _ }, [] ) -> false
-				| _, _ -> true
+			let should_cast = match main_expr.etype with | TAbstract({ a_path = ([], "Float") }, []) -> false | _ -> true in
+			let infer = mk_static_field_access_infer runtime_cl fn_name field_expr.epos [] in
+			let first_args =
+				[ field_expr; { eexpr = TConst(TString field); etype = basic.tstring; epos = pos } ]
+				@ if is_some may_hash then [ { eexpr = TConst(TInt (get may_hash)); etype = basic.tint; epos = pos } ] else []
 			in
-
-			let static = mk_static_field_access_infer (runtime_cl) (if is_ref then "refEq" else "eq") e1.epos [] in
-			{ eexpr = TCall(static, [e1; e2]); etype = gen.gcon.basic.tbool; epos=e1.epos }
-		)
-		(fun e e1 e2 ->
-			match may_nullable e1.etype, may_nullable e2.etype with
-				| Some t1, Some t2 ->
-					let t1, t2 = if is_string t1 || is_string t2 then
-						basic.tstring, basic.tstring
-					else if is_double t1 || is_double t2 then
-						basic.tfloat, basic.tfloat
-					else if is_int t1 || is_int t2 then
-						basic.tint, basic.tint
-					else t1, t2 in
-					{ eexpr = TBinop(Ast.OpAdd, mk_cast t1 e1, mk_cast t2 e2); etype = e.etype; epos = e1.epos }
-				| _ when is_string e.etype || is_string e1.etype || is_string e2.etype ->
-					{
-						eexpr = TCall(
-							mk_static_field_access_infer runtime_cl "concat" e.epos [],
-							[ e1; e2 ]
-						);
-						etype = basic.tstring;
-						epos = e.epos
-					}
+			let args = first_args @ match is_float, may_set with
+				| true, Some(set) ->
+					[ if should_cast then mk_cast basic.tfloat set else set ]
+				| false, Some(set) ->
+					[ set ]
 				| _ ->
-					let static = mk_static_field_access_infer (runtime_cl) "plus"  e1.epos [] in
-					mk_cast e.etype { eexpr = TCall(static, [e1; e2]); etype = t_dynamic; epos=e1.epos })
-		(fun e1 e2 ->
-			if is_string e1.etype then begin
-				{ e1 with eexpr = TCall(mk_static_field_access_infer string_cl "Compare" e1.epos [], [ e1; e2 ]); etype = gen.gcon.basic.tint }
-			end else begin
-				let static = mk_static_field_access_infer (runtime_cl) "compare" e1.epos [] in
-				{ eexpr = TCall(static, [e1; e2]); etype = gen.gcon.basic.tint; epos=e1.epos }
-			end)
-		~handle_strings:false;
+					[ is_unsafe ]
+			in
 
-	FilterClosures.configure gen (fun e1 s -> true) (ReflectionCFs.get_closure_func rcf_ctx closure_cl);
+			let call = { main_expr with eexpr = TCall(infer,args) } in
+			let call = if is_float && should_cast then mk_cast main_expr.etype call else call in
+			call
+		in
 
-	let base_exception = get_cl (get_type gen (["System"], "Exception")) in
-	let base_exception_t = TInst(base_exception, []) in
+		let rcf_on_call_field ecall field_expr field may_hash args =
+			let infer = mk_static_field_access_infer runtime_cl "callField" field_expr.epos [] in
 
-	let hx_exception = get_cl (get_type gen (["haxe";"lang"], "HaxeException")) in
-	let hx_exception_t = TInst(hx_exception, []) in
+			let hash_arg = match may_hash with
+				| None -> []
+				| Some h -> [ { eexpr = TConst(TInt h); etype = basic.tint; epos = field_expr.epos } ]
+			in
 
-	let rec is_exception t =
-		match follow t with
-			| TInst(cl,_) ->
-				if cl == base_exception then
-					true
-				else
-					(match cl.cl_super with | None -> false | Some (cl,arg) -> is_exception (TInst(cl,arg)))
-			| _ -> false
-	in
+			let arr_call = if args <> [] then
+				mk_nativearray_decl gen t_dynamic args ecall.epos
+			else
+				null (gen.gclasses.nativearray t_dynamic) ecall.epos
+			in
 
-	TryCatchWrapper.configure gen
-		(fun t -> not (is_exception (real_type t)))
-		(fun throwexpr expr ->
-			let wrap_static = mk_static_field_access (hx_exception) "wrap" (TFun([("obj",false,t_dynamic)], base_exception_t)) expr.epos in
-			{ throwexpr with eexpr = TThrow { expr with eexpr = TCall(wrap_static, [expr]); etype = hx_exception_t }; etype = gen.gcon.basic.tvoid }
-		)
-		(fun v_to_unwrap pos ->
-			let local = mk_cast hx_exception_t { eexpr = TLocal(v_to_unwrap); etype = v_to_unwrap.v_type; epos = pos } in
-			mk_field_access gen local "obj" pos
-		)
-		(fun rethrow ->
-			{ rethrow with eexpr = TCall(mk_local (alloc_var "__rethrow__" t_dynamic) rethrow.epos, [rethrow]); etype = gen.gcon.basic.tvoid }
-		)
-		(base_exception_t)
-		(hx_exception_t)
-		(fun v e ->
+			let call_args =
+				[field_expr; { field_expr with eexpr = TConst(TString field); etype = basic.tstring } ]
+					@ hash_arg
+					@ [ arr_call ]
+			in
 
-			let exc_cl = get_cl (get_type gen (["haxe";"lang"],"Exceptions")) in
-			let exc_field = mk_static_field_access_infer exc_cl "exception" e.epos [] in
-			let esetstack = mk (TBinop(Ast.OpAssign, exc_field, mk_local v e.epos)) v.v_type e.epos in
+			mk_cast ecall.etype { ecall with eexpr = TCall(infer, call_args) }
+		in
 
-			Type.concat esetstack e;
-		);
+		add_cast_handler gen;
+		if not erase_generics then
+			RealTypeParams.configure gen (fun e t -> gen.gcon.warning ("Cannot cast to " ^ (debug_type t)) e.epos; mk_cast t e) ifaces (get_cl (get_type gen (["haxe";"lang"], "IGenericObject")))
+		else
+			RealTypeParams.RealTypeParamsModf.configure gen (RealTypeParams.RealTypeParamsModf.set_only_hxgeneric gen);
 
-	ClassInstance.configure gen (fun e _ -> { e with eexpr = TCall({ eexpr = TLocal(alloc_var "__typeof__" t_dynamic); etype = t_dynamic; epos = e.epos }, [e]) });
+		let flookup_cl = get_cl (get_type gen (["haxe";"lang"], "FieldLookup")) in
 
-	CastDetect.configure gen (Some empty_ctor_type) (not erase_generics) ~overloads_cast_to_base:true;
+		let cl_field_exc = get_cl (get_type gen (["System"],"MemberAccessException")) in
+		let cl_field_exc_t = TInst (cl_field_exc, []) in
+		let mk_field_exception msg pos = mk (TNew (cl_field_exc, [], [make_string gen.gcon.basic msg pos])) cl_field_exc_t pos in
 
-	SwitchToIf.configure gen (fun e ->
-		match e.eexpr with
-			| TSwitch(cond, cases, def) ->
-				(match gen.gfollow#run_f cond.etype with
-					| TAbstract ({ a_path = ([], "Int") },[])
-					| TInst({ cl_path = ([], "String") },[]) ->
-						(List.exists (fun (c,_) ->
-							List.exists (fun expr -> match expr.eexpr with | TConst _ -> false | _ -> true ) c
-						) cases)
-					| _ -> true
+		let rcf_ctx =
+			ReflectionCFs.new_ctx
+				gen
+				closure_t
+				object_iface
+				true
+				rcf_on_getset_field
+				rcf_on_call_field
+				(fun hash hash_array length -> { hash with eexpr = TCall(rcf_static_find, [hash; hash_array; length]); etype=basic.tint })
+				(fun hash -> { hash with eexpr = TCall(rcf_static_lookup, [hash]); etype = gen.gcon.basic.tstring })
+				(fun hash_array length pos value ->
+					let ecall = mk (TCall(rcf_static_insert value.etype, [hash_array; length; pos; value])) (if erase_generics then hash_array.etype else basic.tvoid) hash_array.epos in
+					if erase_generics then { ecall with eexpr = TBinop(OpAssign, hash_array, ecall) } else ecall
 				)
-			| _ -> assert false
-	);
+				(fun hash_array length pos ->
+					let t = gen.gclasses.nativearray_type hash_array.etype in
+					{ hash_array with eexpr = TCall(rcf_static_remove t, [hash_array; length; pos]); etype = gen.gcon.basic.tvoid }
+				)
+				(
+					let delete = mk_static_field_access_infer flookup_cl "deleteHashConflict" null_pos [] in
+					let get = mk_static_field_access_infer flookup_cl "getHashConflict" null_pos [] in
+					let set = mk_static_field_access_infer flookup_cl "setHashConflict" null_pos [] in
+					let add = mk_static_field_access_infer flookup_cl "addHashConflictNames" null_pos [] in
+					let conflict_t = TInst (get_cl (get_type gen (["haxe"; "lang"], "FieldHashConflict")), []) in
+					Some {
+						t = conflict_t;
+						get_conflict = (fun ehead ehash ename -> mk (TCall (get, [ehead; ehash; ename])) conflict_t ehead.epos);
+						set = (fun ehead ehash ename evalue -> mk (TCall (set, [ehead; ehash; ename; evalue])) basic.tvoid ehead.epos);
+						delete = (fun ehead ehash ename -> mk (TCall (delete, [ehead; ehash; ename])) basic.tbool ehead.epos);
+						add_names = (fun ehead earr -> mk (TCall (add, [ehead; earr])) basic.tvoid ehead.epos);
+					}
+				)
+				mk_field_exception
+		in
 
-	ExpressionUnwrap.configure gen (fun e -> Some { eexpr = TVar(mk_temp gen "expr" e.etype, Some e); etype = gen.gcon.basic.tvoid; epos = e.epos });
+		ReflectionCFs.UniversalBaseClass.configure gen (get_cl (get_type gen (["haxe";"lang"],"HxObject")) ) object_iface dynamic_object;
 
-	UnnecessaryCastsRemoval.configure gen;
+		ReflectionCFs.configure_dynamic_field_access rcf_ctx;
 
-	IntDivisionSynf.configure gen;
+		let closure_cl = get_cl (get_type gen (["haxe";"lang"],"Closure")) in
+		let varargs_cl = get_cl (get_type gen (["haxe";"lang"],"VarArgsFunction")) in
+		let dynamic_name = mk_internal_name "hx" "invokeDynamic" in
 
-	UnreachableCodeEliminationSynf.configure gen false;
+		List.iter (fun cl ->
+			List.iter (fun cf ->
+				if cf.cf_name = dynamic_name then cl.cl_overrides <- cf :: cl.cl_overrides
+			) cl.cl_ordered_fields
+		) [closure_cl; varargs_cl];
 
-	ArrayDeclSynf.configure gen native_arr_cl;
+		ReflectionCFs.implement_varargs_cl rcf_ctx ( get_cl (get_type gen (["haxe";"lang"], "VarArgsBase")) );
 
-	let goto_special = alloc_var "__goto__" t_dynamic in
-	let label_special = alloc_var "__label__" t_dynamic in
-	SwitchBreakSynf.configure gen
-		(fun e_loop n api ->
-			api ({ eexpr = TCall( mk_local label_special e_loop.epos, [ ExprBuilder.make_int gen.gcon n e_loop.epos ] ); etype = t_dynamic; epos = e_loop.epos }) false;
-			e_loop
-		)
-		(fun e_break n api ->
-			{ eexpr = TCall( mk_local goto_special e_break.epos, [ ExprBuilder.make_int gen.gcon n e_break.epos ] ); etype = t_dynamic; epos = e_break.epos }
-		);
+		let slow_invoke_field = mk_static_field_access_infer runtime_cl "slowCallField" null_pos [] in
+		let slow_invoke ethis efield eargs =
+			mk (TCall (slow_invoke_field, [ethis; efield; eargs])) t_dynamic ethis.epos
+		in
+		ReflectionCFs.configure rcf_ctx object_iface ~slow_invoke:slow_invoke;
 
-	DefaultArguments.configure gen;
-	InterfaceMetas.configure gen;
+		ObjectDeclMap.configure gen (ReflectionCFs.implement_dynamic_object_ctor rcf_ctx dynamic_object);
 
-	CSharpSpecificSynf.configure gen runtime_cl;
-	CSharpSpecificESynf.configure gen runtime_cl;
+		InitFunction.configure gen;
+		TArrayTransform.configure gen (
+		fun e binop ->
+			match e.eexpr with
+				| TArray(e1, e2) ->
+					(match follow e1.etype with
+						| TDynamic _ | TAnon _ | TMono _ -> true
+						| TInst({ cl_kind = KTypeParameter _ }, _) -> true
+						| TInst(c,p) when erase_generics && is_hxgeneric (TClassDecl c) && is_hxgen (TClassDecl c) -> (match c.cl_path with
+							| [],"String"
+							| ["cs"],"NativeArray" -> false
+							| _ ->
+								true)
+						| _ -> match binop, change_param_type (t_to_md e1.etype) [e.etype] with
+							| Some(Ast.OpAssignOp _), ([TDynamic _] | [TAnon _]) ->
+								true
+							| _ -> false)
+				| _ -> assert false
+		) "__get" "__set";
 
-	let out_files = ref [] in
+		let field_is_dynamic t field =
+			match field_access_esp gen (gen.greal_type t) field with
+				| FEnumField _ -> false
+				| FClassField (cl,p,_,_,_,t,_) ->
+					if not erase_generics then
+						false
+					else
+						let p = change_param_type (TClassDecl cl) p in
+						is_dynamic (apply_params cl.cl_params p t)
+				| _ -> true
+		in
 
-	(* copy resource files *)
-	if Hashtbl.length gen.gcon.resources > 0 then begin
-		let src =
-				gen.gcon.file ^ "/src/Resources"
+		let is_dynamic_expr e = is_dynamic e.etype || match e.eexpr with
+			| TField(tf, f) -> field_is_dynamic tf.etype (f)
+			| _ -> false
 		in
-		Hashtbl.iter (fun name v ->
-			let name = Codegen.escape_res_name name true in
-			let full_path = src ^ "/" ^ name in
-			mkdir_from_path full_path;
-
-			let f = open_out_bin full_path in
-			output_string f v;
-			close_out f;
-
-			out_files := (Path.unique_full_path full_path) :: !out_files
-		) gen.gcon.resources;
-	end;
-	(* add resources array *)
-	(try
-		let res = get_cl (Hashtbl.find gen.gtypes (["haxe"], "Resource")) in
-		let cf = PMap.find "content" res.cl_statics in
-		let res = ref [] in
-		Hashtbl.iter (fun name v ->
-			res := { eexpr = TConst(TString name); etype = gen.gcon.basic.tstring; epos = null_pos } :: !res;
-		) gen.gcon.resources;
-		cf.cf_expr <- Some ({ eexpr = TArrayDecl(!res); etype = gen.gcon.basic.tarray gen.gcon.basic.tstring; epos = null_pos })
-	with | Not_found -> ());
-
-	run_filters gen;
-	(* after the filters have been run, add all hashed fields to FieldLookup *)
-
-	let normalize_i i =
-		let i = Int32.of_int (i) in
-		if i < Int32.zero then
-			Int32.logor (Int32.logand i (Int32.of_int 0x3FFFFFFF)) (Int32.shift_left Int32.one 30)
-		else i
-	in
 
-	let nhash = ref 0 in
-	let hashes = Hashtbl.fold (fun i s acc -> incr nhash; (normalize_i i,s) :: acc) rcf_ctx.rcf_hash_fields [] in
-	let hashes = List.sort (fun (i,s) (i2,s2) -> compare i i2) hashes in
+		let may_nullable t = match gen.gfollow#run_f t with
+			| TAbstract({ a_path = ([], "Null") }, [t]) ->
+				(match follow t with
+					| TInst({ cl_path = ([], "String") }, [])
+					| TAbstract ({ a_path = ([], "Float") },[])
+					| TInst({ cl_path = (["haxe"], "Int32")}, [] )
+					| TInst({ cl_path = (["haxe"], "Int64")}, [] )
+					| TAbstract ({ a_path = ([], "Int") },[])
+					| TAbstract ({ a_path = ([], "Bool") },[]) -> Some t
+					| TAbstract _ when like_float t -> Some t
+					| t when is_cs_basic_type t -> Some t
+					| _ -> None )
+			| _ -> None
+		in
 
-	let haxe_libs = List.filter (function (_,_,_,lookup) -> is_some (lookup (["haxe";"lang"], "DceNo"))) gen.gcon.net_libs in
-	(try
-		(* first let's see if we're adding a -net-lib that has already a haxe.lang.FieldLookup *)
-		let name,_,_,_ = List.find (function (_,_,_,lookup) -> is_some (lookup (["haxe";"lang"], "FieldLookup"))) gen.gcon.net_libs in
-		if not (Common.defined gen.gcon Define.DllImport) then begin
-			gen.gcon.warning ("The -net-lib with path " ^ name ^ " contains a Haxe-generated assembly. Please define `-D dll_import` to handle Haxe-generated dll import correctly") null_pos;
-			raise Not_found
-		end;
-		if not (List.exists (function (n,_,_,_) -> n = name) haxe_libs) then
-			gen.gcon.warning ("The -net-lib with path " ^ name ^ " contains a Haxe-generated assembly, however it wasn't compiled with `-dce no`. Recompilation with `-dce no` is recommended") null_pos;
-		(* it has; in this case, we need to add the used fields on each __init__ *)
-		flookup_cl.cl_extern <- true;
-		let hashs_by_path = Hashtbl.create !nhash in
-		Hashtbl.iter (fun (path,i) s -> Hashtbl.add hashs_by_path path (i,s)) rcf_ctx.rcf_hash_paths;
-		Hashtbl.iter (fun _ md -> match md with
-			| TClassDecl ({ cl_extern = false; cl_interface = false } as c) -> (try
-				let all = Hashtbl.find_all hashs_by_path c.cl_path in
-				let all = List.map (fun (i,s) -> normalize_i i, s) all in
-				let all = List.sort (fun (i,s) (i2,s2) -> compare i i2) all in
-
-				if all <> [] then begin
-					let add = mk_static_field_access_infer flookup_cl "addFields" c.cl_pos [] in
-					let expr = { eexpr = TCall(add, [
-						mk_nativearray_decl gen basic.tint (List.map (fun (i,s) -> { eexpr = TConst(TInt (i)); etype = basic.tint; epos = c.cl_pos }) all) c.cl_pos;
-						mk_nativearray_decl gen basic.tstring (List.map (fun (i,s) -> { eexpr = TConst(TString (s)); etype = basic.tstring; epos = c.cl_pos }) all) c.cl_pos;
-					]); etype = basic.tvoid; epos = c.cl_pos } in
-					match c.cl_init with
-						| None -> c.cl_init <- Some expr
-						| Some e ->
-							c.cl_init <- Some { eexpr = TBlock([expr;e]); etype = basic.tvoid; epos = e.epos }
-				end
-			with | Not_found -> ())
-			| _ -> ()) gen.gtypes;
+		let is_double t = like_float t && not (like_int t) in
+		let is_int t = like_int t in
 
-	with | Not_found -> try
-		let basic = gen.gcon.basic in
-		let cl = flookup_cl in
-		let field_ids = PMap.find "fieldIds" cl.cl_statics in
-		let fields = PMap.find "fields" cl.cl_statics in
-
-		field_ids.cf_expr <- Some (mk_nativearray_decl gen basic.tint (List.map (fun (i,s) -> { eexpr = TConst(TInt (i)); etype = basic.tint; epos = field_ids.cf_pos }) hashes) field_ids.cf_pos);
-		fields.cf_expr <- Some (mk_nativearray_decl gen basic.tstring (List.map (fun (i,s) -> { eexpr = TConst(TString s); etype = basic.tstring; epos = fields.cf_pos }) hashes) fields.cf_pos);
-
-	with | Not_found ->
-		gen.gcon.error "Fields 'fieldIds' and 'fields' were not found in class haxe.lang.FieldLookup" flookup_cl.cl_pos
-	);
-
-	if Common.defined gen.gcon Define.DllImport then begin
-		Hashtbl.iter (fun _ md -> match md with
-			| TClassDecl ({ cl_extern = false } as c) -> (try
-				let extra = match c.cl_params with
-					| _ :: _ when not erase_generics -> "_" ^ string_of_int (List.length c.cl_params)
-					| _ -> ""
-				in
-				let pack = match c.cl_path with
-					| ([], _) when no_root && is_hxgen (TClassDecl c) ->
-						["haxe";"root"]
-					| (p,_) -> p
-				in
-				let path = (pack, snd c.cl_path ^ extra) in
-				ignore (List.find (function (_,_,_,lookup) ->
-					is_some (lookup path)) haxe_libs);
-				c.cl_extern <- true;
-			with | Not_found -> ())
-			| _ -> ()) gen.gtypes
-	end;
-
-	TypeParams.RenameTypeParameters.run gen;
-
-	let parts = Str.split_delim (Str.regexp "[\\/]+") gen.gcon.file in
-	mkdir_from_path gen.gcon.file;
-
-	List.iter (fun md_def ->
-		let source_dir = gen.gcon.file ^ "/src/" ^ (String.concat "/" (fst (path_of_md_def md_def))) in
-		let w = SourceWriter.new_source_writer() in
-		let should_write = List.fold_left (fun should md -> module_type_gen w md || should) false md_def.m_types in
-		if should_write then begin
-			let path = path_of_md_def md_def in
-			write_file gen w source_dir path "cs" out_files
-		end
-	) gen.gmodules;
+		let is_null t = match real_type t with
+			| TInst( { cl_path = (["haxe";"lang"], "Null") }, _ ) -> true
+			| _ -> false
+		in
 
-	if not (Common.defined gen.gcon Define.KeepOldOutput) then
-		clean_files (gen.gcon.file ^ "/src") !out_files gen.gcon.verbose;
+		let is_null_expr e = is_null e.etype || match e.eexpr with
+			| TField(tf, f) -> (match field_access_esp gen (real_type tf.etype) (f) with
+				| FClassField(_,_,_,_,_,actual_t,_) -> is_null actual_t
+				| _ -> false)
+			| _ -> false
+		in
 
-	dump_descriptor gen ("hxcs_build.txt") s_type_path module_s;
-	if ( not (Common.defined gen.gcon Define.NoCompilation) ) then begin
-		let old_dir = Sys.getcwd() in
-		Sys.chdir gen.gcon.file;
-		let cmd = "haxelib run hxcs hxcs_build.txt --haxe-version " ^ (string_of_int gen.gcon.version) ^ " --feature-level 1" in
-		print_endline cmd;
-		if gen.gcon.run_command cmd <> 0 then failwith "Build failed";
-		Sys.chdir old_dir;
-	end
+		let should_handle_opeq t =
+			match real_type t with
+				| TDynamic _ | TAnon _ | TMono _
+				| TInst( { cl_kind = KTypeParameter _ }, _ )
+				| TInst( { cl_path = (["haxe";"lang"], "Null") }, _ ) -> true
+				| _ -> false
+		in
 
-(* end of configure function *)
+		let string_cl = match gen.gcon.basic.tstring with
+			| TInst(c,[]) -> c
+			| _ -> assert false
+		in
 
-let generate con =
-	(try
+		let is_undefined e = match e.eexpr with
+			| TIdent "__undefined__" | TField(_,FStatic({cl_path=["haxe";"lang"],"Runtime"},{cf_name="undefined"})) -> true
+			| _ -> false
+		in
 
-		let gen = new_ctx con in
-		let basic = con.basic in
+		let nullable_basic t = match gen.gfollow#run_f t with
+			| TType({ t_path = ([],"Null") }, [t])
+			| TAbstract({ a_path = ([],"Null") }, [t]) when is_cs_basic_type t ->
+				Some(t)
+			| _ ->
+				None
+		in
 
-		if Common.defined_value con Define.Dce = "no" then begin
-			let m = { null_module with m_id = alloc_mid(); m_path = ["haxe";"lang"],"DceNo" } in
-			let cl = mk_class m (["haxe";"lang"],"DceNo") null_pos in
-			gen.gtypes_list <- (TClassDecl cl) :: gen.gtypes_list;
-			Hashtbl.add gen.gtypes cl.cl_path (TClassDecl cl)
-		end;
+		DynamicOperators.configure gen
+			~handle_strings:false
+			(fun e -> match e.eexpr with
+				| TBinop (Ast.OpEq, e1, e2)
+				| TBinop (Ast.OpNotEq, e1, e2) ->
+					(
+						(* dont touch (v == null) and (null == v) comparisons because they are handled by HardNullableSynf later *)
+						match e1.eexpr, e2.eexpr with
+						| TConst(TNull), _ when (not (is_tparam e2.etype) && is_dynamic e2.etype) || is_null_expr e2 ->
+							false
+						| _, TConst(TNull) when (not (is_tparam e1.etype) && is_dynamic e1.etype) || is_null_expr e1 ->
+							false
+						| _ when is_undefined e1 || is_undefined e2 ->
+							false
+						| _ ->
+							should_handle_opeq e1.etype || should_handle_opeq e2.etype
+					)
+				| TBinop (Ast.OpAssignOp Ast.OpAdd, e1, e2) ->
+					is_dynamic_expr e1 || is_null_expr e1 || is_string e.etype
+				| TBinop (Ast.OpAdd, e1, e2) -> is_dynamic e1.etype || is_dynamic e2.etype || is_tparam e1.etype || is_tparam e2.etype || is_string e1.etype || is_string e2.etype || is_string e.etype
+				| TBinop (Ast.OpLt, e1, e2)
+				| TBinop (Ast.OpLte, e1, e2)
+				| TBinop (Ast.OpGte, e1, e2)
+				| TBinop (Ast.OpGt, e1, e2) -> is_dynamic e.etype || is_dynamic e1.etype || is_dynamic e2.etype || is_string e1.etype || is_string e2.etype
+				| TBinop (_, e1, e2) -> is_dynamic e.etype || is_dynamic_expr e1 || is_dynamic_expr e2
+				| TUnop (_, _, e1) -> is_dynamic_expr e1 || is_null_expr e1 (* we will see if the expression is Null<T> also, as the unwrap from Unop will be the same *)
+				| _ -> false)
+			(fun e1 e2 ->
+				let is_basic = is_cs_basic_type (follow e1.etype) || is_cs_basic_type (follow e2.etype) in
+				let is_ref = if is_basic then false else match follow e1.etype, follow e2.etype with
+					| TDynamic _, _
+					| _, TDynamic _
+					| TInst( { cl_path = ([], "String") }, [] ), _
+					| _, TInst( { cl_path = ([], "String") }, [] )
+					| TInst( { cl_kind = KTypeParameter _ }, [] ), _
+					| _, TInst( { cl_kind = KTypeParameter _ }, [] ) -> false
+					| _, _ -> true
+				in
 
-		(* make the basic functions in C# *)
-		let type_cl = get_cl ( get_type gen (["System"], "Type")) in
-		let basic_fns =
-		[
-			mk_class_field "Equals" (TFun(["obj",false,t_dynamic], basic.tbool)) true null_pos (Method MethNormal) [];
-			mk_class_field "ToString" (TFun([], basic.tstring)) true null_pos (Method MethNormal) [];
-			mk_class_field "GetHashCode" (TFun([], basic.tint)) true null_pos (Method MethNormal) [];
-			mk_class_field "GetType" (TFun([], TInst(type_cl, []))) true null_pos (Method MethNormal) [];
-		] in
-		List.iter (fun cf -> gen.gbase_class_fields <- PMap.add cf.cf_name cf gen.gbase_class_fields) basic_fns;
-		configure gen
-	with | TypeNotFound path ->
-		con.error ("Error. Module '" ^ (s_type_path path) ^ "' is required and was not included in build.")	null_pos);
-	debug_mode := false
+				let static = mk_static_field_access_infer (runtime_cl) (if is_ref then "refEq" else "eq") e1.epos [] in
+				{ eexpr = TCall(static, [e1; e2]); etype = gen.gcon.basic.tbool; epos=e1.epos }
+			)
+			(fun e e1 e2 ->
+				match may_nullable e1.etype, may_nullable e2.etype with
+					| Some t1, Some t2 ->
+						let t1, t2 = if is_string t1 || is_string t2 then
+							basic.tstring, basic.tstring
+						else if is_double t1 || is_double t2 then
+							basic.tfloat, basic.tfloat
+						else if is_int t1 || is_int t2 then
+							basic.tint, basic.tint
+						else t1, t2 in
+						{ eexpr = TBinop(Ast.OpAdd, mk_cast t1 e1, mk_cast t2 e2); etype = e.etype; epos = e1.epos }
+					| _ when is_string e.etype || is_string e1.etype || is_string e2.etype ->
+						{
+							eexpr = TCall(
+								mk_static_field_access_infer runtime_cl "concat" e.epos [],
+								[ e1; e2 ]
+							);
+							etype = basic.tstring;
+							epos = e.epos
+						}
+					| _ ->
+						let static = mk_static_field_access_infer (runtime_cl) "plus"  e1.epos [] in
+						mk_cast e.etype { eexpr = TCall(static, [e1; e2]); etype = t_dynamic; epos=e1.epos })
+		(fun op e e1 e2 ->
+				match nullable_basic e1.etype, nullable_basic e2.etype with
+					| Some(t1), None when is_cs_basic_type e2.etype ->
+						{ e with eexpr = TBinop(op, mk_cast t1 e1, e2) }
+					| None, Some(t2) when is_cs_basic_type e1.etype ->
+						{ e with eexpr = TBinop(op, e1, mk_cast t2 e2) }
+					| _ ->
+							let handler = if is_string e1.etype then begin
+									{ e1 with eexpr = TCall(mk_static_field_access_infer string_cl "CompareOrdinal" e1.epos [], [ e1; e2 ]); etype = gen.gcon.basic.tint }
+								end else begin
+									let static = mk_static_field_access_infer (runtime_cl) "compare" e1.epos [] in
+									{ eexpr = TCall(static, [e1; e2]); etype = gen.gcon.basic.tint; epos=e1.epos }
+								end
+							in
+							let zero = make_int gen.gcon.basic 0 e.epos in
+							{ e with eexpr = TBinop(op, handler, zero) }
+		);
 
-(* -net-lib implementation *)
-open IlData
-open IlMeta
+		FilterClosures.configure gen (fun e1 s -> true) (ReflectionCFs.get_closure_func rcf_ctx closure_cl);
 
-type net_lib_ctx = {
-	nstd : bool;
-	ncom : Common.context;
-	nil : IlData.ilctx;
-}
+		ClassInstance.configure gen;
 
-let is_haxe_keyword = function
-	| "callback" | "cast" | "extern" | "function" | "in" | "typedef" | "using" | "var" | "untyped" | "inline" -> true
-	| _ -> false
+		CastDetect.configure gen (Some empty_ctor_type) (not erase_generics) ~overloads_cast_to_base:true;
 
-let hxpath_to_net ctx path =
-	try
-		Hashtbl.find ctx.ncom.net_path_map path
-	with
-	 | Not_found ->
-			[],[],"Not_found"
-
-let add_cs = function
-	| "haxe" :: ns -> "haxe" :: ns
-	| "std" :: ns -> "std" :: ns
-	| "cs" :: ns -> "cs" :: ns
-	| "system" :: ns -> "cs" :: "system" :: ns
-	| ns -> ns
-
-let escape_chars =
-	String.replace_chars (fun chr ->
-		if (chr >= 'a' && chr <= 'z') || (chr >= 'A' && chr <= 'Z') || (chr >= '0' && chr <= '9') || chr = '_' then
-			Char.escaped chr
-		else
-			"_x" ^ (string_of_int (Char.code chr)) ^ "_")
+		SwitchToIf.configure gen (fun e ->
+			match e.eexpr with
+				| TSwitch(cond, cases, def) ->
+					(match gen.gfollow#run_f cond.etype with
+						| TAbstract ({ a_path = ([], "Int") },[])
+						| TInst({ cl_path = ([], "String") },[]) ->
+							(List.exists (fun (c,_) ->
+								List.exists (fun expr -> match expr.eexpr with | TConst _ -> false | _ -> true ) c
+							) cases)
+						| _ -> true
+					)
+				| _ -> assert false
+		);
 
-let netcl_to_hx cl =
-	let cl = if String.length cl > 0 && String.get cl 0 >= 'a' && String.get cl 0 <= 'z' then
-			Char.escaped (Char.uppercase (String.get cl 0)) ^ (String.sub cl 1 (String.length cl - 1))
-		else
-			cl
-	in
-	try
-		let cl, nargs = String.split cl "`" in
-		(escape_chars cl) ^ "_" ^ nargs
-	with | Invalid_string ->
-		escape_chars cl
-
-let netpath_to_hx std = function
-	| [],[], cl -> [], netcl_to_hx cl
-	| ns,[], cl ->
-		let ns = (List.map (fun s -> String.lowercase (escape_chars s)) ns) in
-		add_cs ns, netcl_to_hx cl
-	| ns,(nhd :: ntl as nested), cl ->
-		let nested = List.map (netcl_to_hx) nested in
-		let ns = (List.map (fun s -> String.lowercase (escape_chars s)) ns) @ [nhd] in
-		add_cs ns, String.concat "_" nested ^ "_" ^ netcl_to_hx cl
-
-let lookup_ilclass std com ilpath =
-	let path = netpath_to_hx std ilpath in
-	List.fold_right (fun (_,_,_,get_raw_class) acc ->
-		match acc with
-		| None -> get_raw_class path
-		| Some p -> acc
-	) com.net_libs None
-
-let discard_nested = function
-	| (ns,_),cl -> (ns,[]),cl
-
-let mk_type_path ctx path params =
-	let pack, sub, name = match path with
-		| ns,[], cl ->
-			ns, None, netcl_to_hx cl
-		| ns, (nhd :: ntl as nested), cl ->
-			let nhd = netcl_to_hx nhd in
-			let nested = List.map (netcl_to_hx) nested in
-			ns, Some (String.concat "_" nested ^ "_" ^ netcl_to_hx cl), nhd
-	in
-	CTPath {
-		tpackage = fst (netpath_to_hx ctx.nstd (pack,[],""));
-		Ast.tname = name;
-		tparams = params;
-		tsub = sub;
-	}
-
-let raw_type_path ctx path params =
-	{
-		tpackage = fst path;
-		Ast.tname = snd path;
-		tparams = params;
-		tsub = None;
-	}
-
-let rec convert_signature ctx p = function
-	| LVoid ->
-		mk_type_path ctx ([],[],"Void") []
-	| LBool ->
-		mk_type_path ctx ([],[],"Bool") []
-	| LChar ->
-		mk_type_path ctx (["cs";"types"],[],"Char16") []
-	| LInt8 ->
-		mk_type_path ctx (["cs";"types"],[],"Int8") []
-	| LUInt8 ->
-		mk_type_path ctx (["cs";"types"],[],"UInt8") []
-	| LInt16 ->
-		mk_type_path ctx (["cs";"types"],[],"Int16") []
-	| LUInt16 ->
-		mk_type_path ctx (["cs";"types"],[],"UInt16") []
-	| LInt32 ->
-		mk_type_path ctx ([],[],"Int") []
-	| LUInt32 ->
-		mk_type_path ctx ([],[],"UInt") []
-	| LInt64 ->
-		mk_type_path ctx (["haxe"],[],"Int64") []
-	| LUInt64 ->
-		mk_type_path ctx (["cs";"types"],[],"UInt64") []
-	| LFloat32 ->
-		mk_type_path ctx ([],[],"Single") []
-	| LFloat64 ->
-		mk_type_path ctx ([],[],"Float") []
-	| LString ->
-		mk_type_path ctx (["std"],[],"String") []
-	| LObject ->
-		mk_type_path ctx ([],[],"Dynamic") []
-	| LPointer s | LManagedPointer s ->
-		mk_type_path ctx (["cs"],[],"Pointer") [ TPType (convert_signature ctx p s,null_pos) ]
-	| LTypedReference ->
-		mk_type_path ctx (["cs";"system"],[],"TypedReference") []
-	| LIntPtr ->
-		mk_type_path ctx (["cs";"system"],[],"IntPtr") []
-	| LUIntPtr ->
-		mk_type_path ctx (["cs";"system"],[],"UIntPtr") []
-	| LValueType (s,args) | LClass (s,args) ->
-		mk_type_path ctx s (List.map (fun s -> TPType (convert_signature ctx p s,null_pos)) args)
-	| LTypeParam i ->
-		mk_type_path ctx ([],[],"T" ^ string_of_int i) []
-	| LMethodTypeParam i ->
-		mk_type_path ctx ([],[],"M" ^ string_of_int i) []
-	| LVector s ->
-		mk_type_path ctx (["cs"],[],"NativeArray") [TPType (convert_signature ctx p s,null_pos)]
-	(* | LArray of ilsig_norm * (int option * int option) array *)
-	| LMethod (_,ret,args) ->
-		CTFunction (List.map (fun v -> convert_signature ctx p v,null_pos) args, (convert_signature ctx p ret,null_pos))
-	| _ -> mk_type_path ctx ([],[], "Dynamic") []
-
-let ilpath_s = function
-	| ns,[], name -> s_type_path (ns,name)
-	| [],nested,name -> String.concat "." nested ^ "." ^ name
-	| ns, nested, name -> String.concat "." ns ^ "." ^ String.concat "." nested ^ "." ^ name
-
-let get_cls = function
-	| _,_,c -> c
-
-(* TODO: When possible on Haxe, use this to detect flag enums, and make an abstract with @:op() *)
-(* that behaves like an enum, and with an enum as its underlying type *)
-let enum_is_flag ilcls =
-	let check_flag name ns = name = "FlagsAttribute" && ns = ["System"] in
-	List.exists (fun a ->
-		match a.ca_type with
-			| TypeRef r ->
-				check_flag r.tr_name r.tr_namespace
-			| TypeDef d ->
-				check_flag d.td_name d.td_namespace
-			| Method m ->
-				(match m.m_declaring with
-					| Some d ->
-						check_flag d.td_name d.td_namespace
-					| _ -> false)
-			| MemberRef r ->
-				(match r.memr_class with
-					| TypeRef r ->
-						check_flag r.tr_name r.tr_namespace
-					| TypeDef d ->
-						check_flag d.td_name d.td_namespace
-					| _ -> false)
-			| _ ->
-				false
-	) ilcls.cattrs
-
-let convert_ilenum ctx p ?(is_flag=false) ilcls =
-	let meta = ref [
-		Meta.Native, [EConst (String (ilpath_s ilcls.cpath) ), p], p;
-		Meta.CsNative, [], p;
-	] in
-
-	let data = ref [] in
-	List.iter (fun f -> match f.fname with
-		| "value__" -> ()
-		| _ when not (List.mem CStatic f.fflags.ff_contract) -> ()
-		| _ ->
-			let meta, const = match f.fconstant with
-				| Some IChar i
-				| Some IByte i
-				| Some IShort i ->
-					[Meta.CsNative, [EConst (Int (string_of_int i) ), p], p ], Int64.of_int i
-				| Some IInt i ->
-					[Meta.CsNative, [EConst (Int (Int32.to_string i) ), p], p ], Int64.of_int32 i
-				| Some IFloat32 f | Some IFloat64 f ->
-					[], Int64.of_float f
-				| Some IInt64 i ->
-					[], i
-				| _ ->
-					[], Int64.zero
-			in
-			data := ( { ec_name = f.fname,null_pos; ec_doc = None; ec_meta = meta; ec_args = []; ec_pos = p; ec_params = []; ec_type = None; }, const) :: !data;
-	) ilcls.cfields;
-	let data = List.stable_sort (fun (_,i1) (_,i2) -> Int64.compare i1 i2) (List.rev !data) in
-
-	let _, c = netpath_to_hx ctx.nstd ilcls.cpath in
-	let name = netname_to_hx c in
-	EEnum {
-		d_name = (if is_flag then name ^ "_FlagsEnum" else name),null_pos;
-		d_doc = None;
-		d_params = []; (* enums never have type parameters *)
-		d_meta = !meta;
-		d_flags = [EExtern];
-		d_data = List.map fst data;
-	}
-
-let rec has_unmanaged = function
-	| LPointer _ -> true
-	| LManagedPointer s -> has_unmanaged s
-	| LValueType (p,pl) -> List.exists (has_unmanaged) pl
-	| LClass (p,pl) -> List.exists (has_unmanaged) pl
-	| LVector s -> has_unmanaged s
-	| LArray (s,a) -> has_unmanaged s
-	| LMethod (c,r,args) -> has_unmanaged r || List.exists (has_unmanaged) args
-	| _ -> false
+		ExpressionUnwrap.configure gen;
 
-let convert_ilfield ctx p field =
-	if not (Common.defined ctx.ncom Define.Unsafe) && has_unmanaged field.fsig.snorm then raise Exit;
-	let p = { p with pfile =	p.pfile ^" (" ^field.fname ^")" } in
-	let cff_doc = None in
-	let cff_pos = p in
-	let cff_meta = ref [] in
-	let cff_name = match field.fname with
-		| name when String.length name > 5 ->
-				(match String.sub name 0 5 with
-				| "__hx_" -> raise Exit
-				| _ -> name)
-		| name -> name
-	in
-	let cff_access = match field.fflags.ff_access with
-		| FAFamily | FAFamOrAssem -> APrivate
-		| FAPublic -> APublic
-		| _ -> raise Exit (* private instances aren't useful on externs *)
-	in
-	let readonly, acc = List.fold_left (fun (readonly,acc) -> function
-		| CStatic -> readonly, AStatic :: acc
-		| CInitOnly | CLiteral -> true, acc
-		| _ -> readonly,acc
-	) (false,[cff_access]) field.fflags.ff_contract in
-	if PMap.mem "net_loader_debug" ctx.ncom.defines then
-		Printf.printf "\t%sfield %s : %s\n" (if List.mem AStatic acc then "static " else "") cff_name (IlMetaDebug.ilsig_s field.fsig.ssig);
-	let kind = match readonly with
-		| true ->
-			cff_meta := (Meta.ReadOnly, [], cff_pos) :: !cff_meta;
-			FProp (("default",null_pos), ("never",null_pos), Some (convert_signature ctx p field.fsig.snorm,null_pos), None)
-		| false ->
-			FVar (Some (convert_signature ctx p field.fsig.snorm,null_pos), None)
-	in
-	let cff_name, cff_meta =
-		if String.get cff_name 0 = '%' then
-			let name = (String.sub cff_name 1 (String.length cff_name - 1)) in
-			"_" ^ name,
-			(Meta.Native, [EConst (String (name) ), cff_pos], cff_pos) :: !cff_meta
-		else
-			cff_name, !cff_meta
-	in
-	{
-		cff_name = cff_name,null_pos;
-		cff_doc = cff_doc;
-		cff_pos = cff_pos;
-		cff_meta = cff_meta;
-		cff_access = acc;
-		cff_kind = kind;
-	}
-
-let convert_ilevent ctx p ev =
-	let p = { p with pfile =	p.pfile ^" (" ^ev.ename ^")" } in
-	let name = ev.ename in
-	let kind = FVar (Some (convert_signature ctx p ev.esig.snorm,null_pos), None) in
-	let meta = [Meta.Event, [], p; Meta.Keep,[],p; Meta.SkipReflection,[],p] in
-	let acc = [APrivate] in
-	let add_m acc m = match m with
-		| None -> acc
-		| Some (name,flags) ->
-			if List.mem (CMStatic) flags.mf_contract then
-				AStatic :: acc
-			else
-				acc
-	in
-	if PMap.mem "net_loader_debug" ctx.ncom.defines then
-		Printf.printf "\tevent %s : %s\n" name (IlMetaDebug.ilsig_s ev.esig.ssig);
-	let acc = add_m acc ev.eadd in
-	let acc = add_m acc ev.eremove in
-	let acc = add_m acc ev.eraise in
-	{
-		cff_name = name,null_pos;
-		cff_doc = None;
-		cff_pos = p;
-		cff_meta = meta;
-		cff_access = acc;
-		cff_kind = kind;
-	}
-
-let convert_ilmethod ctx p m is_explicit_impl =
-	if not (Common.defined ctx.ncom Define.Unsafe) && has_unmanaged m.msig.snorm then raise Exit;
-	let force_check = Common.defined ctx.ncom Define.ForceLibCheck in
-	let p = { p with pfile =	p.pfile ^" (" ^m.mname ^")" } in
-	let cff_doc = None in
-	let cff_pos = p in
-	let cff_name = match m.mname with
-		| ".ctor" -> "new"
-		| ".cctor"-> raise Exit (* __init__ field *)
-		| "Equals" | "GetHashCode" -> raise Exit
-		| name when String.length name > 5 ->
-				(match String.sub name 0 5 with
-				| "__hx_" -> raise Exit
-				| _ -> name)
-		| name -> name
-	in
-	let acc = match m.mflags.mf_access with
-		| FAFamily | FAFamOrAssem -> APrivate
-		(* | FAPrivate -> APrivate *)
-		| FAPublic when List.mem SGetter m.msemantics || List.mem SSetter m.msemantics ->
-			APrivate
-		| FAPublic -> APublic
-		| _ ->
-			if PMap.mem "net_loader_debug" ctx.ncom.defines then
-				Printf.printf "\tmethod %s (skipped) : %s\n" cff_name (IlMetaDebug.ilsig_s m.msig.ssig);
-			raise Exit
-	in
-	let is_static = ref false in
-	let acc, is_final = List.fold_left (fun (acc,is_final) -> function
-		| CMStatic when cff_name <> "new" -> is_static := true; AStatic :: acc, is_final
-		| CMVirtual when is_final = None -> acc, Some false
-		| CMFinal -> acc, Some true
-		| _ -> acc, is_final
-	) ([acc],None) m.mflags.mf_contract in
-	if PMap.mem "net_loader_debug" ctx.ncom.defines then
-		Printf.printf "\t%smethod %s : %s\n" (if !is_static then "static " else "") cff_name (IlMetaDebug.ilsig_s m.msig.ssig);
-
-	let meta = [Meta.Overload, [], p] in
-	let meta = match is_final with
-		| None | Some true when not force_check ->
-			(Meta.Final,[],p) :: meta
-		| _ ->
-			meta
-	in
-	let meta = if is_explicit_impl then
-			(Meta.NoCompletion,[],p) :: (Meta.SkipReflection,[],p) :: meta
-		else
-			meta
-	in
-	(* let meta = if List.mem OSynchronized m.mflags.mf_interop then *)
-	(*	(Meta.Synchronized,[],p) :: meta *)
-	(* else *)
-	(*	meta *)
-	(* in *)
-
-	let rec change_sig = function
-		| LManagedPointer s -> LManagedPointer (change_sig s)
-		| LPointer s -> LPointer (change_sig s)
-		| LValueType (p,pl) -> LValueType(p, List.map change_sig pl)
-		| LClass (p,pl) -> LClass(p, List.map change_sig pl)
-		| LTypeParam i -> LObject
-		| LVector s -> LVector (change_sig s)
-		| LArray (s,a) -> LArray (change_sig s, a)
-		| LMethod (c,r,args) -> LMethod (c, change_sig r, List.map change_sig args)
-		| p -> p
-	in
-	let change_sig = if !is_static then change_sig else (fun s -> s) in
-
-	let ret =
-		if String.length cff_name > 4 && String.sub cff_name 0 4 = "set_" then
-			match m.mret.snorm, m.margs with
-			| LVoid, [_,_,s] ->
-				s.snorm
-			| _ -> m.mret.snorm
-		else
-			m.mret.snorm
-	in
+		(* UnnecessaryCastsRemoval.configure gen; *)
 
-	let kind =
-		let args = List.map (fun (name,flag,s) ->
-			let t = match s.snorm with
-				| LManagedPointer s ->
-					let is_out = List.mem POut flag.pf_io && not (List.mem PIn flag.pf_io) in
-					let name = if is_out then "Out" else "Ref" in
-					mk_type_path ctx (["cs"],[],name) [ TPType (convert_signature ctx p s,null_pos) ]
-				| _ ->
-					convert_signature ctx p (change_sig s.snorm)
-			in
-			(name,null_pos),false,[],Some (t,null_pos),None) m.margs
-		in
-		let ret = convert_signature ctx p (change_sig ret) in
-		let types = List.map (fun t ->
-			{
-				tp_name = "M" ^ string_of_int t.tnumber,null_pos;
-				tp_params = [];
-				tp_constraints = [];
-				tp_meta = [];
-			}
-		) m.mtypes in
-		FFun {
-			f_params = types;
-			f_args = args;
-			f_type = Some (ret,null_pos);
-			f_expr = None;
-		}
-	in
-	let cff_name, cff_meta =
-		if String.get cff_name 0 = '%' then
-			let name = (String.sub cff_name 1 (String.length cff_name - 1)) in
-			"_" ^ name,
-			(Meta.Native, [EConst (String (name) ), cff_pos], cff_pos) :: meta
-		else
-			cff_name, meta
-	in
-	let acc = match m.moverride with
-		| None -> acc
-		| _ when cff_name = "new" -> acc
-		| Some (path,s) -> match lookup_ilclass ctx.nstd ctx.ncom path with
-			| Some ilcls when not (List.mem SInterface ilcls.cflags.tdf_semantics) ->
-				AOverride :: acc
-			| None when ctx.ncom.verbose ->
-				prerr_endline ("(net-lib) A referenced assembly for path " ^ ilpath_s path ^ " was not found");
-				acc
-			| _ -> acc
-	in
-	{
-		cff_name = cff_name,null_pos;
-		cff_doc = cff_doc;
-		cff_pos = cff_pos;
-		cff_meta = cff_meta;
-		cff_access = acc;
-		cff_kind = kind;
-	}
-
-let convert_ilprop ctx p prop is_explicit_impl =
-	if not (Common.defined ctx.ncom Define.Unsafe) && has_unmanaged prop.psig.snorm then raise Exit;
-	let p = { p with pfile =	p.pfile ^" (" ^prop.pname ^")" } in
-	let pmflags = match prop.pget, prop.pset with
-		| Some(_,fl1), _ -> Some fl1
-		| _, Some(_,fl2) -> Some fl2
-		| _ -> None
-	in
-	let cff_access = match pmflags with
-		| Some { mf_access = FAFamily | FAFamOrAssem } -> APrivate
-		| Some { mf_access = FAPublic } -> APublic
-		| _ -> raise Exit (* non-public / protected fields don't interest us *)
-	in
-	let access acc = acc.mf_access in
-	let cff_access = match pmflags with
-		| Some m when List.mem CMStatic m.mf_contract ->
-			[AStatic;cff_access]
-		| _ -> [cff_access]
-	in
-	let get = match prop.pget with
-		| None -> "never"
-		| Some(s,_) when String.length s <= 4 || String.sub s 0 4 <> "get_" ->
-			raise Exit (* special (?) getter; not used *)
-		| Some(_,m) when access m <> FAPublic -> (match access m with
-			| FAFamily
-			| FAFamOrAssem -> "null"
-			| _ -> "never")
-		| Some _ -> "get"
-	in
-	let set = match prop.pset with
-		| None -> "never"
-		| Some(s,_) when String.length s <= 4 || String.sub s 0 4 <> "set_" ->
-			raise Exit (* special (?) getter; not used *)
-		| Some(_,m) when access m <> FAPublic -> (match access m with
-			| FAFamily
-			| FAFamOrAssem -> "never"
-			| _ -> "never");
-		| Some _ -> "set"
-	in
-	if PMap.mem "net_loader_debug" ctx.ncom.defines then
-		Printf.printf "\tproperty %s (%s,%s) : %s\n" prop.pname get set (IlMetaDebug.ilsig_s prop.psig.ssig);
-	let ilsig = match prop.psig.snorm with
-		| LMethod (_,ret,[]) -> ret
-		| s -> raise Exit
-	in
+		IntDivisionSynf.configure gen;
 
-	let meta = if is_explicit_impl then
-			[ Meta.NoCompletion,[],p; Meta.SkipReflection,[],p ]
-		else
-			[]
-	in
+		UnreachableCodeEliminationSynf.configure gen false;
 
-	let kind =
-		FProp ((get,null_pos), (set,null_pos), Some(convert_signature ctx p ilsig,null_pos), None)
-	in
-	{
-		cff_name = prop.pname,null_pos;
-		cff_doc = None;
-		cff_pos = p;
-		cff_meta = meta;
-		cff_access = cff_access;
-		cff_kind = kind;
-	}
-
-let get_type_path ctx ct = match ct with | CTPath p -> p | _ -> assert false
-
-let is_explicit ctx ilcls i =
-	let s = match i with
-		| LClass(path,_) | LValueType(path,_) -> ilpath_s path
-		| _ -> assert false
-	in
-	let len = String.length s in
-	List.exists (fun m ->
-		String.length m.mname > len && String.sub m.mname 0 len = s
-	) ilcls.cmethods
-
-let mke e p = (e,p)
-
-let mk_special_call name p args =
-	mke (ECast( mke (EUntyped( mke (ECall( mke (EConst(Ident name)) p, args )) p )) p , None)) p
-
-let mk_this_call name p args =
-	mke (ECall( mke (EField(mke (EConst(Ident "this")) p ,name)) p, args )) p
-
-let mk_metas metas p =
-	List.map (fun m -> m,[],p) metas
-
-let mk_abstract_fun name p kind metas acc =
-	let metas = mk_metas metas p in
-	{
-		cff_name = name,null_pos;
-		cff_doc = None;
-		cff_pos = p;
-		cff_meta = metas;
-		cff_access = acc;
-		cff_kind = kind;
-	}
-
-let convert_fun_arg ctx p = function
-	| LManagedPointer s ->
-		mk_type_path ctx (["cs"],[],"Ref") [ TPType (convert_signature ctx p s,null_pos) ],p
-	| s ->
-		convert_signature ctx p s,p
-
-let convert_fun ctx p ret args =
-	let args = List.map (convert_fun_arg ctx p) args in
-	CTFunction(args, (convert_signature ctx p ret,null_pos))
-
-let get_clsname ctx cpath =
-	match netpath_to_hx ctx.nstd cpath with
-		| (_,n) -> n
-
-let convert_delegate ctx p ilcls =
-	let p = { p with pfile =	p.pfile ^" (abstract delegate)" } in
-	(* will have the following methods: *)
-	(* - new (haxeType:Func) *)
-	(* - FromHaxeFunction(haxeType) *)
-	(* - Invoke() *)
-	(* - AsDelegate():Super *)
-	(* - @:op(A+B) Add(d:absType) *)
-	(* - @:op(A-B) Remove(d:absType) *)
-	let abs_type = mk_type_path ctx (ilcls.cpath) (List.map (fun t -> TPType (mk_type_path ctx ([],[],"T" ^ string_of_int t.tnumber) [],null_pos)) ilcls.ctypes) in
-	let invoke = List.find (fun m -> m.mname = "Invoke") ilcls.cmethods in
-	let ret = invoke.mret.snorm in
-	let args = List.map (fun (_,_,s) -> s.snorm) invoke.margs in
-	let haxe_type = convert_fun ctx p ret args in
-	let types = List.map (fun t ->
-		{
-			tp_name = ("T" ^ string_of_int t.tnumber),null_pos;
-			tp_params = [];
-			tp_constraints = [];
-			tp_meta = [];
-		}
-	) ilcls.ctypes in
-	let mk_op_fn op name p =
-		let fn_name = List.assoc op cs_binops in
-		let clsname = match ilcls.cpath with
-			| (ns,inner,n) -> get_clsname ctx (ns,inner,"Delegate_"^n)
-		in
-		let expr = (ECall( (EField( (EConst(Ident (clsname)),p), fn_name ),p), [(EConst(Ident"arg1"),p);(EConst(Ident"arg2"),p)]),p) in
-		FFun {
-			f_params = types;
-			f_args = [("arg1",null_pos),false,[],Some (abs_type,null_pos),None;("arg2",null_pos),false,[],Some (abs_type,null_pos),None];
-			f_type = Some (abs_type,null_pos);
-			f_expr = Some ( (EReturn (Some expr), p) );
-		}
-	in
-	let mk_op op name =
-		let p = { p with pfile = p.pfile ^" (op " ^ name ^ ")" } in
-		{
-			cff_name = name,null_pos;
-			cff_doc = None;
-			cff_pos = p;
-			cff_meta = [ Meta.Extern,[],p ; Meta.Op, [ (EBinop(op, (EConst(Ident"A"),p), (EConst(Ident"B"),p)),p) ], p ];
-			cff_access = [APublic;AInline;AStatic];
-			cff_kind = mk_op_fn op name p;
-		}
-	in
-	let params = (List.map (fun s ->
-		TPType (mk_type_path ctx ([],[],fst s.tp_name) [],null_pos)
-	) types) in
-	let underlying_type = match ilcls.cpath with
-		| ns,inner,name ->
-			mk_type_path ctx (ns,inner,"Delegate_" ^ name) params
-	in
+		ArraySpliceOptimization.configure gen;
 
-	let fn_new = FFun {
-		f_params = [];
-		f_args = [("hxfunc",null_pos),false,[],Some (haxe_type,null_pos),None];
-		f_type = None;
-		f_expr = Some ( EBinop(Ast.OpAssign, (EConst(Ident "this"),p), (mk_special_call "__delegate__" p [EConst(Ident "hxfunc"),p]) ), p );
-	} in
-	let fn_from_hx = FFun {
-		f_params = types;
-		f_args = [("hxfunc",null_pos),false,[],Some (haxe_type,null_pos),None];
-		f_type = Some( mk_type_path ctx ilcls.cpath params,null_pos );
-		f_expr = Some( EReturn( Some (mk_special_call "__delegate__" p [EConst(Ident "hxfunc"),p] )), p);
-	} in
-	let fn_asdel = FFun {
-		f_params = [];
-		f_args = [];
-		f_type = None;
-		f_expr = Some(
-			EReturn( Some ( EConst(Ident "this"), p ) ), p
-		);
-	} in
-	let fn_new = mk_abstract_fun "new" p fn_new [Meta.Extern] [APublic;AInline] in
-	let fn_from_hx = mk_abstract_fun "FromHaxeFunction" p fn_from_hx [Meta.Extern;Meta.From] [APublic;AInline;AStatic] in
-	let fn_asdel = mk_abstract_fun "AsDelegate" p fn_asdel [Meta.Extern] [APublic;AInline] in
-	let _, c = netpath_to_hx ctx.nstd ilcls.cpath in
-	EAbstract {
-		d_name = netname_to_hx c,null_pos;
-		d_doc = None;
-		d_params = types;
-		d_meta = mk_metas [Meta.Delegate; Meta.Forward] p;
-		d_flags = [AIsType (underlying_type,null_pos)];
-		d_data = [fn_new;fn_from_hx;fn_asdel;mk_op Ast.OpAdd "Add";mk_op Ast.OpSub "Remove"];
-	}
-
-let convert_ilclass ctx p ?(delegate=false) ilcls = match ilcls.csuper with
-	| Some { snorm = LClass ((["System"],[],"Enum"),[]) } ->
-		convert_ilenum ctx p ilcls
-	| _ ->
-		let flags = ref [HExtern] in
-		(* todo: instead of CsNative, use more specific definitions *)
-		if PMap.mem "net_loader_debug" ctx.ncom.defines then begin
-			let sup = match ilcls.csuper with | None -> [] | Some c -> [IlMetaDebug.ilsig_s c.ssig] in
-			let sup = sup @ List.map (fun i -> IlMetaDebug.ilsig_s i.ssig) ilcls.cimplements in
-			print_endline ("converting " ^ ilpath_s ilcls.cpath ^ " : " ^ (String.concat ", " sup))
-		end;
-		let meta = ref [Meta.CsNative, [], p; Meta.Native, [EConst (String (ilpath_s ilcls.cpath) ), p], p] in
-		let force_check = Common.defined ctx.ncom Define.ForceLibCheck in
-		if not force_check then
-			meta := (Meta.LibType,[],p) :: !meta;
-
-		let is_interface = ref false in
-		List.iter (fun f -> match f with
-			| SSealed -> meta := (Meta.Final, [], p) :: !meta
-			| SInterface ->
-				is_interface := true;
-				flags := HInterface :: !flags
-			| SAbstract -> meta := (Meta.Abstract, [], p) :: !meta
-			| _ -> ()
-		) ilcls.cflags.tdf_semantics;
-
-		(* (match ilcls.cflags.tdf_vis with *)
-		(*	| VPublic | VNestedFamOrAssem | VNestedFamily -> () *)
-		(*	| _ -> raise Exit); *)
-		(match ilcls.csuper with
-			| Some { snorm = LClass ( (["System"],[],"Object"), [] ) } -> ()
-			| Some ({ snorm = LClass ( (["System"],[],"ValueType"), [] ) } as s) ->
-				flags := HExtends (get_type_path ctx (convert_signature ctx p s.snorm),null_pos) :: !flags;
-				meta := (Meta.Struct,[],p) :: !meta
-			| Some { snorm = LClass ( (["haxe";"lang"],[],"HxObject"), [] ) } ->
-				meta := (Meta.HxGen,[],p) :: !meta
-			| Some s ->
-				flags := HExtends (get_type_path ctx (convert_signature ctx p s.snorm),null_pos) :: !flags
-			| _ -> ());
-
-			let has_explicit_ifaces = ref false in
-			List.iter (fun i ->
-				match i.snorm with
-				| LClass ( (["haxe";"lang"],[], "IHxObject"), _ ) ->
-					meta := (Meta.HxGen,[],p) :: !meta
-				(* | i when is_explicit ctx ilcls i -> () *)
-				| i ->
-					if is_explicit ctx ilcls i then has_explicit_ifaces := true;
-					flags := if !is_interface then
-						HExtends (get_type_path ctx (convert_signature ctx p i),null_pos) :: !flags
-					else
-						HImplements (get_type_path ctx (convert_signature ctx p i),null_pos) :: !flags
-			) ilcls.cimplements;
-			(* this is needed because of explicit interfaces. see http://msdn.microsoft.com/en-us/library/aa288461(v=vs.71).aspx *)
-			(* explicit interfaces can't be mapped into Haxe in any way - since their fields can't be accessed directly, but they still implement that interface *)
-			if !has_explicit_ifaces && force_check then (* do not check on this specific case *)
-				meta := (Meta.LibType,[],p) :: !meta;
-
-			(* ArrayAccess *)
-			ignore (List.exists (function
-			| { psig = { snorm = LMethod(_,ret,[v]) } } ->
-				flags := if !is_interface then
-					(HExtends( raw_type_path ctx ([],"ArrayAccess") [ TPType (convert_signature ctx p ret,null_pos) ],null_pos) :: !flags)
-				else
-					(HImplements( raw_type_path ctx ([],"ArrayAccess") [ TPType (convert_signature ctx p ret,null_pos) ],null_pos) :: !flags);
-				true
-			| _ -> false) ilcls.cprops);
-
-			let fields = ref [] in
-			let run_fields fn f =
-				List.iter (fun f ->
-					try
-						fields := fn f :: !fields
-					with
-						| Exit -> ()
-				) f
-			in
-			let meths = if !is_interface then
-					List.filter (fun m -> m.moverride = None) ilcls.cmethods
-				else
-					ilcls.cmethods
-			in
-			run_fields (fun m ->
-				convert_ilmethod ctx p m (List.exists (fun m2 -> m != m2 && String.get m2.mname 0 <> '.' && String.ends_with m2.mname ("." ^ m.mname)) meths)
-			) meths;
-			run_fields (convert_ilfield ctx p) ilcls.cfields;
-			run_fields (fun prop ->
-				convert_ilprop ctx p prop (List.exists (fun p2 -> prop != p2 && String.get p2.pname 0 <> '.' && String.ends_with p2.pname ("." ^ prop.pname)) ilcls.cprops)
-			) ilcls.cprops;
-			run_fields (convert_ilevent ctx p) ilcls.cevents;
-
-			let params = List.map (fun p ->
-				{
-					tp_name = "T" ^ string_of_int p.tnumber,null_pos;
-					tp_params = [];
-					tp_constraints = [];
-					tp_meta = [];
-				}) ilcls.ctypes
-			in
+		ArrayDeclSynf.configure gen native_arr_cl change_param_type;
 
-			if delegate then begin
-				(* add op_Addition and op_Subtraction *)
-				let path = ilcls.cpath in
-				let thist = mk_type_path ctx path (List.map (fun t -> TPType (mk_type_path ctx ([],[],"T" ^ string_of_int t.tnumber) [],null_pos)) ilcls.ctypes) in
-				let op name =
-					{
-						cff_name = name,null_pos;
-						cff_doc = None;
-						cff_pos = p;
-						cff_meta = [];
-						cff_access = [APublic;AStatic];
-						cff_kind = FFun {
-							f_params = params;
-							f_args = [("arg1",null_pos),false,[],Some (thist,null_pos),None;("arg2",null_pos),false,[],Some (thist,null_pos),None];
-							f_type = Some (thist,null_pos);
-							f_expr = None;
-						};
-					}
-				in
-				fields := op "op_Addition" :: op "op_Subtraction" :: !fields;
-			end;
-			let path = match ilcls.cpath with
-				| ns,inner,name when delegate ->
-					ns,inner,"Delegate_"^name
-				| _ -> ilcls.cpath
-			in
-			let _, c = netpath_to_hx ctx.nstd path in
-			EClass {
-				d_name = netname_to_hx c,null_pos;
-				d_doc = None;
-				d_params = params;
-				d_meta = !meta;
-				d_flags = !flags;
-				d_data = !fields;
-			}
-
-type il_any_field =
-	| IlField of ilfield
-	| IlMethod of ilmethod
-	| IlProp of ilprop
-
-let get_fname = function
-	| IlField f -> f.fname
-	| IlMethod m -> m.mname
-	| IlProp p -> p.pname
-
-let is_static = function
-	| IlField f ->
-		List.mem CStatic f.fflags.ff_contract
-	| IlMethod m ->
-		List.mem CMStatic m.mflags.mf_contract
-	| IlProp p ->
-		List.exists (function
-		 | None -> false
-		 | Some (_,m) -> List.mem CMStatic m.mf_contract
-		) [p.pget;p.pset]
-	(* | _ -> false *)
-
-let change_name name = function
-	| IlField f -> IlField { f with fname = name }
-	| IlMethod m -> IlMethod { m with mname = name }
-	| IlProp p -> IlProp { p with pname = name }
-
-let compatible_methods m1 m2 = match m1,m2 with
-	| IlMethod { msig = { snorm = LMethod(_,ret1,args1) } }, IlMethod { msig = { snorm = LMethod(_,ret2,args2) } } ->
-		ret1 = ret2 && args1 = args2
-	| _ -> false
+		CSharpSpecificSynf.configure gen runtime_cl;
+		CSharpSpecificESynf.configure gen runtime_cl;
 
-let ilcls_from_ilsig ctx ilsig =
-	let path, params = match ilsig with
-		| LClass(path, params) | LValueType(path, params) ->
-			path, params
-		| LObject ->
-			(["System"],[],"Object"),[]
-		| _ -> raise Not_found (* all other types won't appear as superclass *)
-	in
-	match lookup_ilclass ctx.nstd ctx.ncom path with
-	| None -> raise Not_found
-	| Some c ->
-		c, params
-
-let rec ilapply_params params = function
-	| LManagedPointer s -> LManagedPointer (ilapply_params params s)
-	| LPointer s -> LPointer (ilapply_params params s)
-	| LValueType (p,pl) -> LValueType(p, List.map (ilapply_params params) pl)
-	| LClass (p,pl) -> LClass(p, List.map (ilapply_params params) pl)
-	| LTypeParam i ->
-		List.nth params i (* TODO: maybe i - 1? *)
-	| LVector s -> LVector (ilapply_params params s)
-	| LArray (s,a) -> LArray (ilapply_params params s, a)
-	| LMethod (c,r,args) -> LMethod (c, ilapply_params params r, List.map (ilapply_params params) args)
-	| p -> p
-
-let ilcls_with_params ctx cls params =
-	match cls.ctypes with
-	| [] -> cls
-	| _ ->
-		{ cls with
-			cfields = List.map (fun f -> { f with fsig = { f.fsig with snorm = ilapply_params params f.fsig.snorm } }) cls.cfields;
-			cmethods = List.map (fun m -> { m with
-				msig = { m.msig with snorm = ilapply_params params m.msig.snorm };
-				margs = List.map (fun (n,f,s) -> (n,f,{ s with snorm = ilapply_params params s.snorm })) m.margs;
-				mret = { m.mret with snorm = ilapply_params params m.mret.snorm };
-			}) cls.cmethods;
-			cprops = List.map (fun p -> { p with psig = { p.psig with snorm = ilapply_params params p.psig.snorm } }) cls.cprops;
-			csuper = Option.map (fun s -> { s with snorm = ilapply_params params s.snorm } ) cls.csuper;
-			cimplements = List.map (fun s -> { s with snorm = ilapply_params params s.snorm } ) cls.cimplements;
-		}
+		let out_files = ref [] in
 
-let rec compatible_params t1 t2 = match t1,t2 with
-	| LManagedPointer(s1), LManagedPointer(s2) -> compatible_params s1 s2
-	| LManagedPointer(s1), s2 | s1, LManagedPointer(s2) ->
-		compatible_params s1 s2
-	| _ -> t1 = t2
-
-let compatible_methods m1 m2 = match m1, m2 with
-	| LMethod(_,r1,a1), LMethod(_,r2,a2) -> (try
-		List.for_all2 (fun a1 a2 -> compatible_params a1 a2) a1 a2
-	with | Invalid_argument _ ->
-		false)
-	| _ -> false
+		(* copy resource files *)
+		if Hashtbl.length gen.gcon.resources > 0 then begin
+			let src =
+					gen.gcon.file ^ "/src/Resources"
+			in
+			Hashtbl.iter (fun name v ->
+				let name = Codegen.escape_res_name name true in
+				let full_path = src ^ "/" ^ name in
+				Path.mkdir_from_path full_path;
 
-let compatible_field f1 f2 = match f1, f2 with
-	| IlMethod { msig = { snorm = LMethod(_,_,a1) } },
-		IlMethod { msig = { snorm = LMethod(_,_,a2) } } ->
-			a1 = a2
-	| IlProp p1, IlProp p2 ->
-			(* p1.psig.snorm = p2.psig.snorm *)
-			true
-	| IlField f1, IlField f2 ->
-			(* f1.fsig.snorm = f2.fsig.snorm *)
-			true
-	| _ -> false
+				let f = open_out_bin full_path in
+				output_string f v;
+				close_out f;
 
-let get_all_fields cls =
-	let all_fields = List.map (fun f -> IlField f, cls.cpath, f.fname, List.mem CStatic f.fflags.ff_contract) cls.cfields in
-	let all_fields = all_fields @ List.map (fun m -> IlMethod m, cls.cpath, m.mname, List.mem CMStatic m.mflags.mf_contract) cls.cmethods in
-	let all_fields = all_fields @ List.map (fun p -> IlProp p, cls.cpath, p.pname, is_static (IlProp p)) cls.cprops in
-	all_fields
-
-let normalize_ilcls ctx cls =
-	let force_check = Common.defined ctx.ncom Define.ForceLibCheck in
-	(* first filter out overloaded fields of same signature *)
-	let rec loop acc = function
-		| [] -> acc
-		| m :: cmeths ->
-			let static = List.mem CMStatic m.mflags.mf_contract in
-			if List.exists (fun m2 -> m.mname = m2.mname && List.mem CMStatic m2.mflags.mf_contract = static && compatible_methods m.msig.snorm m2.msig.snorm) cmeths then
-				loop acc cmeths
-			else
-				loop (m :: acc) cmeths
-	in
-	let meths = loop [] cls.cmethods in
-	(* fix overrides *)
-	(* get only the methods that aren't declared as override, but may be *)
-	let meths = List.map (fun v -> ref v) meths in
-	let no_overrides = List.filter (fun m ->
-		let m = !m in
-		not (List.mem CMStatic m.mflags.mf_contract)
-	) meths in
-	let no_overrides = ref no_overrides in
-
-	let all_fields = ref [] in
-	let all_events_name = Hashtbl.create 0 in
-	(* avoid naming collision between events and functions *)
-	let add_cls_events_collision cls =
-		List.iter (fun m -> if not (List.mem CMStatic m.mflags.mf_contract) then Hashtbl.replace all_events_name m.mname true) cls.cmethods;
-		List.iter (fun p -> if not (is_static (IlProp p)) then Hashtbl.replace all_events_name p.pname true) cls.cprops;
-	in
+				out_files := (Path.unique_full_path full_path) :: !out_files
+			) gen.gcon.resources;
+		end;
+		(* add resources array *)
+		(try
+			let res = get_cl (Hashtbl.find gen.gtypes (["haxe"], "Resource")) in
+			let cf = PMap.find "content" res.cl_statics in
+			let res = ref [] in
+			Hashtbl.iter (fun name v ->
+				res := { eexpr = TConst(TString name); etype = gen.gcon.basic.tstring; epos = null_pos } :: !res;
+			) gen.gcon.resources;
+			cf.cf_expr <- Some ({ eexpr = TArrayDecl(!res); etype = gen.gcon.basic.tarray gen.gcon.basic.tstring; epos = null_pos })
+		with | Not_found -> ());
 
-	let rec loop cls = try
-		match cls.csuper with
-		| Some { snorm = LClass((["System"],[],"Object"),_) }
-		| Some { snorm = LObject } | None -> ()
-		| Some s ->
-			let cls, params = ilcls_from_ilsig ctx s.snorm in
-			let cls = ilcls_with_params ctx cls params in
-			if force_check then no_overrides := List.filter (fun v ->
-				let m = !v in
-				let is_override_here = List.exists (fun m2 ->
-					m2.mname = m.mname && not (List.mem CMStatic m2.mflags.mf_contract) && compatible_methods m.msig.snorm m2.msig.snorm
-				) cls.cmethods in
-				if is_override_here then v := { m with moverride = Some(cls.cpath, m.mname) };
-				not is_override_here
-			) !no_overrides;
-			all_fields := get_all_fields cls @ !all_fields;
-
-			add_cls_events_collision cls;
-			List.iter (fun ev -> Hashtbl.replace all_events_name ev.ename true) cls.cevents;
-
-			loop cls
-		with | Not_found -> ()
-	in
-	loop cls;
-
-	add_cls_events_collision cls;
-	if force_check then List.iter (fun v -> v := { !v with moverride = None }) !no_overrides;
-	let added = ref [] in
-
-	let current_all = ref (get_all_fields cls @ !all_fields) in
-	(* look for interfaces and add missing implementations (some methods' implementation is optional) *)
-	let rec loop_interface cls iface = try
-		match iface.snorm with
-		| LClass((["System"],[],"Object"),_) | LObject -> ()
-		| LClass(path,_) when path = cls.cpath -> ()
-		| s ->
-			let cif, params = ilcls_from_ilsig ctx s in
-			let cif = ilcls_with_params ctx cif params in
-			List.iter (function
-				| (f,_,name,false) as ff ->
-					(* look for compatible fields *)
-					if not (List.exists (function
-						| (f2,_,name2,false) when (name = name2 || String.ends_with name2 ("." ^ name)) -> (* consider explicit implementations as implementations *)
-							compatible_field f f2
-						| _ -> false
-					) !current_all) then begin
-						current_all := ff :: !current_all;
-						added := ff :: !added
-					end else
-						(* ensure it's public *)
-						List.iter (fun mref -> match !mref with
-							| m when m.mname = name && compatible_field f (IlMethod m) ->
-								mref := { m with mflags = { m.mflags with mf_access = FAPublic } }
-							| _ -> ()
-						) meths
-				| _ -> ()
-			) (get_all_fields cif);
-			List.iter (loop_interface cif) cif.cimplements
-		with | Not_found -> ()
-	in
-	List.iter (loop_interface cls) cls.cimplements;
-	let added = List.map (function
-		| (IlMethod m,a,name,b) when m.mflags.mf_access <> FAPublic ->
-			(IlMethod { m with mflags = { m.mflags with mf_access = FAPublic } },a,name,b)
-		| (IlField f,a,name,b) when f.fflags.ff_access <> FAPublic ->
-			(IlField { f with fflags = { f.fflags with ff_access = FAPublic } },a,name,b)
-		| s -> s
-	) !added in
-
-	(* filter out properties that were already declared *)
-	let props = if force_check then List.filter (function
-			| p ->
-				let static = is_static (IlProp p) in
-				let name = p.pname in
-				not (List.exists (function (IlProp _,_,n,s) -> s = static && name = n | _ -> false) !all_fields)
-			(* | _ -> false *)
-		) cls.cprops
-		else
-			cls.cprops
-	in
-	let cls = { cls with cmethods = List.map (fun v -> !v) meths; cprops = props } in
-
-	let clsfields = (get_all_fields cls) @ added in
-	let super_fields = !all_fields in
-	all_fields := clsfields @ !all_fields;
-	let refclsfields = (List.map (fun v -> ref v) clsfields) in
-	(* search static / non-static name clash *)
-	(* change field name to not collide with haxe keywords *)
-	let fold_field acc v =
-		let f, p, name, is_static = !v in
-		let change, copy = match name with
-		| _ when is_haxe_keyword name ->
-			true, false
-		| _ ->
-			((is_static && List.exists (function | (f,_,n,false) -> name = n | _ -> false) !all_fields) ||
-			(not is_static && match f with (* filter methods that have the same name as fields *)
-			| IlMethod _ ->
-				List.exists (function | ( (IlProp _ | IlField _),_,n,false) -> name = n | _ -> false) super_fields ||
-				List.exists (function | ( (IlProp _ | IlField _),_,n,s) -> name = n | _ -> false) clsfields
-			| _ -> false)), true
+		run_filters gen;
+		(* after the filters have been run, add all hashed fields to FieldLookup *)
+
+		let normalize_i i =
+			let i = Int32.of_int (i) in
+			if i < Int32.zero then
+				Int32.logor (Int32.logand i (Int32.of_int 0x3FFFFFFF)) (Int32.shift_left Int32.one 30)
+			else i
 		in
-		if change then begin
-			let name = "%" ^ name in
-			let changed = change_name name f, p, name, is_static in
-			if not copy then
-				v := changed;
-			if copy then
-				v :: ref changed :: acc
-			else
-				v :: acc
-		end else
-			v :: acc
-	in
-	let refclsfields = List.fold_left fold_field [] refclsfields in
 
-	let rec fold (fields,methods,props) f = match !f with
-		| IlField f,_,_,_ -> f :: fields,methods,props
-		| IlMethod m,_,_,_ -> fields,m :: methods,props
-		| IlProp p,_,_,_ -> fields,methods,p :: props
-	in
-	let fields, methods, props = List.fold_left fold ([],[],[]) refclsfields in
-	{ cls with
-		cfields = fields;
-		cprops = props;
-		cmethods = methods;
-		cevents = List.filter (fun ev -> not (Hashtbl.mem all_events_name ev.ename)) cls.cevents;
-	}
-
-let add_net_std com file =
-	com.net_std <- file :: com.net_std
-
-let add_net_lib com file std =
-	let ilctx = ref None in
-	let netpath_to_hx = netpath_to_hx std in
-	let real_file = ref file in
-	let get_ctx () =
-		match !ilctx with
-		| Some c ->
-			c
-		| None ->
-			let file = if Sys.file_exists file then
-				file
-			else try Common.find_file com file with
-				| Not_found -> try Common.find_file com (file ^ ".dll") with
-				| Not_found ->
-					failwith (".NET lib " ^ file ^ " not found")
-			in
-			real_file := file;
-			let r = PeReader.create_r (open_in_bin file) com.defines in
-			let ctx = PeReader.read r in
-			let clr_header = PeReader.read_clr_header ctx in
-			let cache = IlMetaReader.create_cache () in
-			let meta = IlMetaReader.read_meta_tables ctx clr_header cache in
-			close_in (r.PeReader.ch);
-			if PMap.mem "net_loader_debug" com.defines then
-				print_endline ("for lib " ^ file);
-			let il_typedefs = Hashtbl.copy meta.il_typedefs in
-			Hashtbl.clear meta.il_typedefs;
-
-			Hashtbl.iter (fun _ td ->
-				let path = IlMetaTools.get_path (TypeDef td) in
-				if PMap.mem "net_loader_debug" com.defines then
-					Printf.printf "found %s\n" (s_type_path (netpath_to_hx path));
-				Hashtbl.replace com.net_path_map (netpath_to_hx path) path;
-				Hashtbl.replace meta.il_typedefs path td
-			) il_typedefs;
-			let meta = { nstd = std; ncom = com; nil = meta } in
-			ilctx := Some meta;
-			meta
-	in
+		let nhash = ref 0 in
+		let hashes = Hashtbl.fold (fun i s acc -> incr nhash; (normalize_i i,s) :: acc) rcf_ctx.rcf_hash_fields [] in
+		let hashes = List.sort (fun (i,s) (i2,s2) -> compare i i2) hashes in
 
-	let cache = Hashtbl.create 0 in
-	let lookup path =
-		try
-			Hashtbl.find cache path
-		with | Not_found -> try
-			let ctx = get_ctx() in
-			let ns, n, cl = hxpath_to_net ctx path in
-			let cls = IlMetaTools.convert_class ctx.nil (ns,n,cl) in
-			let cls = normalize_ilcls ctx cls in
-			Hashtbl.add cache path (Some cls);
-			Some cls
-		with | Not_found ->
-			Hashtbl.add cache path None;
-			None
-	in
+		let haxe_libs = List.filter (function net_lib -> is_some (net_lib#lookup (["haxe";"lang"], "DceNo"))) gen.gcon.native_libs.net_libs in
+		(try
+			(* first let's see if we're adding a -net-lib that has already a haxe.lang.FieldLookup *)
+			let net_lib = List.find (function net_lib -> is_some (net_lib#lookup (["haxe";"lang"], "FieldLookup"))) gen.gcon.native_libs.net_libs in
+			let name = net_lib#get_name in
+			if not (Common.defined gen.gcon Define.DllImport) then begin
+				gen.gcon.warning ("The -net-lib with path " ^ name ^ " contains a Haxe-generated assembly. Please define `-D dll_import` to handle Haxe-generated dll import correctly") null_pos;
+				raise Not_found
+			end;
+			if not (List.exists (function net_lib -> net_lib#get_name = name) haxe_libs) then
+				gen.gcon.warning ("The -net-lib with path " ^ name ^ " contains a Haxe-generated assembly, however it wasn't compiled with `-dce no`. Recompilation with `-dce no` is recommended") null_pos;
+			(* it has; in this case, we need to add the used fields on each __init__ *)
+			flookup_cl.cl_extern <- true;
+			let hashs_by_path = Hashtbl.create !nhash in
+			Hashtbl.iter (fun (path,i) s -> Hashtbl.add hashs_by_path path (i,s)) rcf_ctx.rcf_hash_paths;
+			Hashtbl.iter (fun _ md -> match md with
+				| TClassDecl ({ cl_extern = false; cl_interface = false } as c) -> (try
+					let all = Hashtbl.find_all hashs_by_path c.cl_path in
+					let all = List.map (fun (i,s) -> normalize_i i, s) all in
+					let all = List.sort (fun (i,s) (i2,s2) -> compare i i2) all in
+
+					if all <> [] then begin
+						let add = mk_static_field_access_infer flookup_cl "addFields" c.cl_pos [] in
+						let expr = { eexpr = TCall(add, [
+							mk_nativearray_decl gen basic.tint (List.map (fun (i,s) -> { eexpr = TConst(TInt (i)); etype = basic.tint; epos = c.cl_pos }) all) c.cl_pos;
+							mk_nativearray_decl gen basic.tstring (List.map (fun (i,s) -> { eexpr = TConst(TString (s)); etype = basic.tstring; epos = c.cl_pos }) all) c.cl_pos;
+						]); etype = basic.tvoid; epos = c.cl_pos } in
+						match c.cl_init with
+							| None -> c.cl_init <- Some expr
+							| Some e ->
+								c.cl_init <- Some { eexpr = TBlock([expr;e]); etype = basic.tvoid; epos = e.epos }
+					end
+				with | Not_found -> ())
+				| _ -> ()) gen.gtypes;
 
-	let all_files () =
-		Hashtbl.fold (fun path _ acc -> match path with
-			| _,_ :: _, _ -> acc
-			| _ -> netpath_to_hx path :: acc) (get_ctx()).nil.il_typedefs []
-	in
+		with | Not_found -> try
+			let basic = gen.gcon.basic in
+			let cl = flookup_cl in
+			let field_ids = PMap.find "fieldIds" cl.cl_statics in
+			let fields = PMap.find "fields" cl.cl_statics in
 
-	let build path =
-		let p = { pfile = !real_file ^ " @ " ^ s_type_path path; pmin = 0; pmax = 0; } in
-		let pack = match fst path with | ["haxe";"root"] -> [] | p -> p in
-		let cp = ref [] in
-		let rec build path = try
-			if PMap.mem "net_loader_debug" com.defines then
-				Printf.printf "looking up %s\n" (s_type_path path);
-			match lookup path with
-			| Some({csuper = Some{snorm = LClass( (["System"],[],("Delegate"|"MulticastDelegate")),_)}} as cls)
-				when List.mem SSealed cls.cflags.tdf_semantics ->
-				let ctx = get_ctx() in
-				let hxcls = convert_ilclass ctx p ~delegate:true cls in
-				let delegate = convert_delegate ctx p cls in
-				cp := (hxcls,p) :: (delegate,p) :: !cp;
-				List.iter (fun ilpath ->
-					let path = netpath_to_hx ilpath in
-					build path
-				) cls.cnested
-			| Some cls ->
-				let ctx = get_ctx() in
-				let hxcls = convert_ilclass ctx p cls in
-				cp := (hxcls,p) :: !cp;
-				List.iter (fun ilpath ->
-					let path = netpath_to_hx ilpath in
-					build path
-				) cls.cnested
-			| _ -> ()
-		with | Not_found | Exit ->
-			()
-		in
-		build path;
-		match !cp with
-			| [] -> None
-			| cp -> Some (!real_file, (pack,cp))
-	in
-	let build path p =
-		build path
-	in
-	com.load_extern_type <- com.load_extern_type @ [build];
-	com.net_libs <- (file, std, all_files, lookup) :: com.net_libs
+			field_ids.cf_expr <- Some (mk_nativearray_decl gen basic.tint (List.map (fun (i,s) -> { eexpr = TConst(TInt (i)); etype = basic.tint; epos = field_ids.cf_pos }) hashes) field_ids.cf_pos);
+			fields.cf_expr <- Some (mk_nativearray_decl gen basic.tstring (List.map (fun (i,s) -> { eexpr = TConst(TString s); etype = basic.tstring; epos = fields.cf_pos }) hashes) fields.cf_pos);
 
-let before_generate com =
-	(* net version *)
-	let net_ver = try
-			int_of_string (PMap.find "net_ver" com.defines)
 		with | Not_found ->
-			Common.define_value com Define.NetVer "20";
-			20
-	in
-	if net_ver < 20 then
-		failwith (
-			".NET version is defined to target .NET "
-			^ string_of_int net_ver
-			^ ", but the compiler can only output code to versions equal or superior to .NET 2.0 (defined as 20)"
+			gen.gcon.error "Fields 'fieldIds' and 'fields' were not found in class haxe.lang.FieldLookup" flookup_cl.cl_pos
 		);
-	let rec loop = function
-		| v :: acc when v <= net_ver ->
-			Common.raw_define com ("NET_" ^ string_of_int v);
-			loop acc
-		| _ -> ()
-	in
-	loop [20;21;30;35;40;45];
 
-	(* net target *)
-	let net_target = try
-			String.lowercase (PMap.find "net_target" com.defines)
-		with | Not_found ->
-			"net"
-	in
-	Common.define_value com Define.NetTarget net_target;
-	Common.raw_define com net_target;
+		if Common.defined gen.gcon Define.DllImport then begin
+			Hashtbl.iter (fun _ md -> match md with
+				| TClassDecl ({ cl_extern = false } as c) -> (try
+					let extra = match c.cl_params with
+						| _ :: _ when not erase_generics -> "_" ^ string_of_int (List.length c.cl_params)
+						| _ -> ""
+					in
+					let pack = match c.cl_path with
+						| ([], _) when no_root && is_hxgen (TClassDecl c) ->
+							["haxe";"root"]
+						| (p,_) -> p
+					in
+					let path = (pack, snd c.cl_path ^ extra) in
+					ignore (List.find (function net_lib ->
+						is_some (net_lib#lookup path)) haxe_libs);
+					c.cl_extern <- true;
+				with | Not_found -> ())
+				| _ -> ()) gen.gtypes
+		end;
 
-	(* std dirs *)
-	let stds = match com.net_std with
-		| [] -> ["netlib"]
-		| s -> s
-	in
-	(* look for all dirs that have the digraph NET_TARGET-NET_VER *)
-	let digraph = net_target ^ "-" ^ string_of_int net_ver in
-	let matched = ref [] in
-	List.iter (fun f -> try
-		let f = Common.find_file com (f ^ "/" ^ digraph) in
-		matched := (f, Unix.opendir f) :: !matched
-	with | _ -> ()) stds;
-
-	if !matched = [] then failwith (
-		"No .NET std lib directory with the pattern '" ^ digraph ^ "' was found in the -net-std search path. " ^
-		"Try updating the hxcs lib to the latest version, or specifying another -net-std path.");
-	List.iter (fun (path,f) ->
-		let rec loop () =
-			try
-				let f = Unix.readdir f in
-				let finsens = String.lowercase f in
-				if String.ends_with finsens ".dll" then
-					add_net_lib com (path ^ "/" ^ f) true;
-				loop()
-			with | End_of_file ->
-				Unix.closedir f
-		in
-		loop()
-	) !matched;
+		RenameTypeParameters.run gen.gtypes_list;
+
+		Path.mkdir_from_path gen.gcon.file;
+
+		List.iter (fun md_def ->
+			let source_dir = gen.gcon.file ^ "/src/" ^ (String.concat "/" (fst (path_of_md_def md_def))) in
+			let w = SourceWriter.new_source_writer() in
+			let should_write = List.fold_left (fun should md -> module_type_gen w md || should) false md_def.m_types in
+			if should_write then begin
+				let path = path_of_md_def md_def in
+				write_file gen w source_dir path "cs" out_files
+			end
+		) gen.gmodules;
+
+		if not (Common.defined gen.gcon Define.KeepOldOutput) then
+			clean_files (gen.gcon.file ^ "/src") !out_files gen.gcon.verbose;
+
+		dump_descriptor gen ("hxcs_build.txt") s_type_path module_s;
+		if ( not (Common.defined gen.gcon Define.NoCompilation) ) then begin
+			let old_dir = Sys.getcwd() in
+			Sys.chdir gen.gcon.file;
+			let cmd = "haxelib run hxcs hxcs_build.txt --haxe-version " ^ (string_of_int gen.gcon.version) ^ " --feature-level 1" in
+			print_endline cmd;
+			if gen.gcon.run_command cmd <> 0 then failwith "Build failed";
+			Sys.chdir old_dir;
+		end
 
-	(* now force all libraries to initialize *)
-	List.iter (function (_,_,_,lookup) -> ignore (lookup ([],""))) com.net_libs
+	with TypeNotFound path ->
+		con.error ("Error. Module '" ^ (s_type_path path) ^ "' is required and was not included in build.") null_pos);
+	debug_mode := false
diff --git a/src/generators/genhl.ml b/src/generators/genhl.ml
index 47dd21180c7dd36843fb4768a5f4fe6450257d8f..dfc235b0bbcab8b5214669e4ae5137cb670713ca 100644
--- a/src/generators/genhl.ml
+++ b/src/generators/genhl.ml
@@ -46,7 +46,7 @@ type allocator = {
 	mutable a_hold : int list;
 }
 
-type lassign = (string index * int * int)
+type lassign = (string index * int)
 
 type method_context = {
 	mid : int;
@@ -79,23 +79,28 @@ type array_impl = {
 	af64 : tclass;
 }
 
+type constval =
+	| CString of string
+
 type context = {
 	com : Common.context;
 	cglobals : (string, ttype) lookup;
 	cstrings : (string, string) lookup;
+	cbytes : (bytes, bytes) lookup;
 	cfloats : (float, float) lookup;
 	cints : (int32, int32) lookup;
-	cnatives : (string, (string index * string index * ttype * functable index)) lookup;
+	cnatives : (string * int, (string index * string index * ttype * functable index)) lookup;
 	cfids : (string * path, unit) lookup;
 	cfunctions : fundecl DynArray.t;
+	cconstants : (constval, (global * int array)) lookup;
 	optimize : bool;
 	overrides : (string * path, bool) Hashtbl.t;
 	defined_funs : (int,unit) Hashtbl.t;
 	is_macro : bool;
 	mutable dump_out : (unit IO.output) option;
-	mutable cached_types : (path, ttype) PMap.t;
+	mutable cached_types : (string list, ttype) PMap.t;
 	mutable m : method_context;
-	mutable anons_cache : (tanon * ttype) list;
+	mutable anons_cache : (tanon, ttype) PMap.t;
 	mutable method_wrappers : ((ttype * ttype), int) PMap.t;
 	mutable rec_cache : (Type.t * ttype option ref) list;
 	mutable cached_tuples : (ttype list, ttype) PMap.t;
@@ -108,8 +113,8 @@ type context = {
 	core_enum : tclass;
 	ref_abstract : tabstract;
 	cdebug_files : (string, string) lookup;
-	cdebug_locals : (string, string ) lookup;
-	cdebug_assigns : (lassign array) DynArray.t;
+	mutable ct_delayed : (unit -> unit) list;
+	mutable ct_depth : int;
 }
 
 (* --- *)
@@ -135,7 +140,7 @@ let is_to_string t =
 	| _ -> false
 
 let is_extern_field f =
-	Type.is_extern_field f || (match f.cf_kind with Method MethNormal -> List.exists (fun (m,_,_) -> m = Meta.Custom ":hlNative") f.cf_meta | _ -> false) || Meta.has Meta.Extern f.cf_meta
+	not (Type.is_physical_field f) || (match f.cf_kind with Method MethNormal -> List.exists (fun (m,_,_) -> m = Meta.HlNative) f.cf_meta | _ -> false) || has_class_field_flag f CfExtern
 
 let is_array_class name =
 	match name with
@@ -147,6 +152,10 @@ let is_array_type t =
 	| HObj p -> is_array_class p.pname
 	| _ -> false
 
+let max_pos e =
+	let p = e.epos in
+	{ p with pmin = p.pmax }
+
 let to_utf8 str p =
 	let u8 = try
 		UTF8.validate str;
@@ -155,15 +164,15 @@ let to_utf8 str p =
 		UTF8.Malformed_code ->
 			(* ISO to utf8 *)
 			let b = UTF8.Buf.create 0 in
-			String.iter (fun c -> UTF8.Buf.add_char b (UChar.of_char c)) str;
+			String.iter (fun c -> UTF8.Buf.add_char b (UCharExt.of_char c)) str;
 			UTF8.Buf.contents b
 	in
 	let ccount = ref 0 in
 	UTF8.iter (fun c ->
-		let c = UChar.code c in
+		let c = UCharExt.code c in
 		if (c >= 0xD800 && c <= 0xDFFF) || c >= 0x110000 then abort "Invalid unicode char" p;
 		incr ccount;
-		if c > 0x10000 then incr ccount;
+		if c >= 0x10000 then incr ccount;
 	) u8;
 	u8, !ccount
 
@@ -184,7 +193,7 @@ let type_size_bits = function
 	| HUI8 | HBool -> 0
 	| HUI16 -> 1
 	| HI32 | HF32 -> 2
-	| HF64 -> 3
+	| HI64 | HF64 -> 3
 	| _ -> assert false
 
 let new_lookup() =
@@ -246,7 +255,7 @@ let efield_name e f =
 let global_type ctx g =
 	DynArray.get ctx.cglobals.arr g
 
-let is_overriden ctx c f =
+let is_overridden ctx c f =
 	ctx.is_macro || Hashtbl.mem ctx.overrides (f.cf_name,c.cl_path)
 
 let alloc_float ctx f =
@@ -258,6 +267,9 @@ let alloc_i32 ctx i =
 let alloc_string ctx s =
 	lookup ctx.cstrings s (fun() -> s)
 
+let alloc_bytes ctx s =
+	lookup ctx.cbytes s (fun() -> s)
+
 let array_class ctx t =
 	match t with
 	| HI32 ->
@@ -334,6 +346,24 @@ let make_debug ctx arr =
 	done;
 	out
 
+let fake_tnull =
+	{null_abstract with
+		a_path = [],"Null";
+		a_params = ["T",t_dynamic];
+	}
+
+let get_rec_cache ctx t none_callback not_found_callback =
+	try
+		match !(List.assq t ctx.rec_cache) with
+		| None -> none_callback()
+		| Some t -> t
+	with Not_found ->
+		let tref = ref None in
+		ctx.rec_cache <- (t,tref) :: ctx.rec_cache;
+		let t = not_found_callback tref in
+		ctx.rec_cache <- List.tl ctx.rec_cache;
+		t
+
 let rec to_type ?tref ctx t =
 	match t with
 	| TMono r ->
@@ -341,23 +371,16 @@ let rec to_type ?tref ctx t =
 		| None -> HDyn
 		| Some t -> to_type ?tref ctx t)
 	| TType (td,tl) ->
-		let t = (try
-			match !(List.assq t ctx.rec_cache) with
-			| None -> abort "Unsupported recursive type" td.t_pos
-			| Some t -> t
-		with Not_found ->
-			let tref = ref None in
-			ctx.rec_cache <- (t,tref) :: ctx.rec_cache;
-			let t = to_type ~tref ctx (apply_params td.t_params tl td.t_type) in
-			ctx.rec_cache <- List.tl ctx.rec_cache;
-			t
-		) in
+		let t =
+			get_rec_cache ctx t
+				(fun() -> abort "Unsupported recursive type" td.t_pos)
+				(fun tref -> to_type ~tref ctx (apply_params td.t_params tl td.t_type))
+		in
 		(match td.t_path with
-		| [], "Null" when not (is_nullable t) -> HNull t
 		| ["haxe";"macro"], name -> Hashtbl.replace ctx.macro_typedefs name t; t
 		| _ -> t)
 	| TLazy f ->
-		to_type ?tref ctx (!f())
+		to_type ?tref ctx (lazy_type f)
 	| TFun (args, ret) ->
 		HFun (List.map (fun (_,o,t) ->
 			let pt = to_type ctx t in
@@ -371,10 +394,11 @@ let rec to_type ?tref ctx t =
 			enum_class ctx e
 		| _ -> assert false)
 	| TAnon a ->
+		if PMap.is_empty a.a_fields then HDyn else
 		(try
 			(* can't use physical comparison in PMap since addresses might change in GC compact,
 				maybe add an uid to tanon if too slow ? *)
-			List.assq a ctx.anons_cache
+			PMap.find a ctx.anons_cache
 		with Not_found ->
 			let vp = {
 				vfields = [||];
@@ -384,34 +408,18 @@ let rec to_type ?tref ctx t =
 			(match tref with
 			| None -> ()
 			| Some r -> r := Some t);
-			ctx.anons_cache <- (a,t) :: ctx.anons_cache;
-			let fields = PMap.fold (fun cf acc ->
-				match cf.cf_kind with
-				| Var _ when (match follow cf.cf_type with TAnon _ | TFun _ -> true | _ -> false) ->
-					(*
-						if it's another virtual or a method, it might not match our own (might be larger, or class)
-					*)
-					acc
-				| Method _ ->
-					acc
-				| _ ->
-					(cf.cf_name,alloc_string ctx cf.cf_name,to_type ctx cf.cf_type) :: acc
-			) a.a_fields [] in
-			if fields = [] then
-				let t = HDyn in
-				ctx.anons_cache <- (a,t) :: List.tl ctx.anons_cache;
-				t
-			else
-				let fields = List.sort (fun (n1,_,_) (n2,_,_) -> compare n1 n2) fields in
-				vp.vfields <- Array.of_list fields;
-				Array.iteri (fun i (n,_,_) -> vp.vindex <- PMap.add n i vp.vindex) vp.vfields;
-				t
+			ctx.anons_cache <- PMap.add a t ctx.anons_cache;
+			let fields = PMap.fold (fun cf acc -> cfield_type ctx cf :: acc) a.a_fields [] in
+			let fields = List.sort (fun (n1,_,_) (n2,_,_) -> compare n1 n2) fields in
+			vp.vfields <- Array.of_list fields;
+			Array.iteri (fun i (n,_,_) -> vp.vindex <- PMap.add n i vp.vindex) vp.vfields;
+			t
 		)
 	| TDynamic _ ->
 		HDyn
 	| TEnum (e,_) ->
 		enum_type ~tref ctx e
-	| TInst ({ cl_path = ["hl"],"Abstract" },[TInst({ cl_kind = KExpr (EConst (String name),_) },_)]) ->
+	| TInst ({ cl_path = ["hl"],"Abstract" },[TInst({ cl_kind = KExpr (EConst (String(name,_)),_) },_)]) ->
 		HAbstract (name, alloc_string ctx name)
 	| TInst (c,pl) ->
 		(match c.cl_kind with
@@ -425,6 +433,9 @@ let rec to_type ?tref ctx t =
 			in
 			loop tl
 		| _ -> class_type ~tref ctx c pl false)
+	| TAbstract ({a_path = [],"Null"},[t1]) ->
+		let t = to_type ?tref ctx t1 in
+		if not (is_nullable t) && t <> HVoid then HNull t else t
 	| TAbstract (a,pl) ->
 		if Meta.has Meta.CoreType a.a_meta then
 			(match a.a_path with
@@ -444,11 +455,14 @@ let rec to_type ?tref ctx t =
 			| ["hl"], "Type" -> HType
 			| ["hl"], "UI16" -> HUI16
 			| ["hl"], "UI8" -> HUI8
+			| ["hl"], "I64" -> HI64
 			| ["hl"], "NativeArray" -> HArray
 			| ["haxe";"macro"], "Position" -> HAbstract ("macro_pos", alloc_string ctx "macro_pos")
 			| _ -> failwith ("Unknown core type " ^ s_type_path a.a_path))
 		else
-			to_type ?tref ctx (Abstract.get_underlying_type a pl)
+			get_rec_cache ctx t
+				(fun() -> HDyn)
+				(fun tref -> to_type ~tref ctx (Abstract.get_underlying_type a pl))
 
 and resolve_class ctx c pl statics =
 	let not_supported() =
@@ -464,6 +478,14 @@ and resolve_class ctx c pl statics =
 	| _ ->
 		c
 
+and cfield_type ctx cf =
+	let t = to_type ctx cf.cf_type in
+	let t = (match cf.cf_kind, t with
+		| Method (MethNormal|MethInline), HFun (args,ret) -> HMethod (args,ret)
+		| _ -> t
+	) in
+	(cf.cf_name,alloc_string ctx cf.cf_name,t)
+
 and field_type ctx f p =
 	match f with
 	| FInstance (c,pl,f) | FClosure (Some (c,pl),f) ->
@@ -486,24 +508,43 @@ and real_type ctx e =
 		match e.eexpr with
 		| TField (_,f) ->
 			let ft = field_type ctx f e.epos in
-			(*
-				Handle function variance:
-				If we have type parameters which are function types, we need to keep the functions
-				because we might need to insert a cast to coerce Void->Bool to Void->Dynamic for instance.
-			*)
 			(match ft, e.etype with
 			| TFun (args,ret), TFun (args2,_) ->
-				TFun (List.map2 (fun ((_,_,t) as a) ((_,_,t2) as a2) -> match t, t2 with TInst ({cl_kind=KTypeParameter _},_), TFun _ -> a2 | _ -> a) args args2, ret)
+				TFun (List.map2 (fun ((name,opt,t) as a) ((_,_,t2) as a2) ->
+					match t, t2 with
+					(*
+						Handle function variance:
+						If we have type parameters which are function types, we need to keep the functions
+						because we might need to insert a cast to coerce Void->Bool to Void->Dynamic for instance.
+					*)
+					| TInst ({cl_kind=KTypeParameter _},_), TFun _ -> a2
+					(*
+						If we have a number, it is more accurate to cast it to the type parameter before wrapping it as dynamic
+						Ignore dynamic method (#7166)
+					*)
+					| TInst ({cl_kind=KTypeParameter _},_), t when is_number (to_type ctx t) && (match f with FInstance (_,_,{ cf_kind = Var _ | Method MethDynamic }) -> false | _ -> true) ->
+						(name, opt, TAbstract (fake_tnull,[t]))
+					| _ ->
+						a
+				) args args2, ret)
 			| _ -> ft)
 		| TLocal v -> v.v_type
 		| TParenthesis e -> loop e
+		| TArray (arr,_) ->
+			let rec loop t =
+				match follow t with
+				| TInst({ cl_path = [],"Array" },[t]) -> t
+				| TAbstract (a,pl) -> loop (Abstract.get_underlying_type a pl)
+				| _ -> t_dynamic
+			in
+			loop arr.etype
 		| _ -> e.etype
 	in
 	to_type ctx (loop e)
 
 and class_type ?(tref=None) ctx c pl statics =
 	let c = if c.cl_extern then resolve_class ctx c pl statics else c in
-	let key_path = (if statics then fst c.cl_path, "$" ^ snd c.cl_path else c.cl_path) in
+	let key_path = (if statics then "$" ^ snd c.cl_path else snd c.cl_path) :: fst c.cl_path in
 	try
 		PMap.find key_path ctx.cached_types
 	with Not_found when c.cl_interface && not statics ->
@@ -512,17 +553,17 @@ and class_type ?(tref=None) ctx c pl statics =
 			vindex = PMap.empty;
 		} in
 		let t = HVirtual vp in
-		ctx.cached_types <- PMap.add c.cl_path t ctx.cached_types;
+		ctx.cached_types <- PMap.add key_path t ctx.cached_types;
 		let rec loop c =
 			let fields = List.fold_left (fun acc (i,_) -> loop i @ acc) [] c.cl_implements in
-			PMap.fold (fun cf acc -> (cf.cf_name,alloc_string ctx cf.cf_name,to_type ctx cf.cf_type) :: acc) c.cl_fields fields
+			PMap.fold (fun cf acc -> cfield_type ctx cf :: acc) c.cl_fields fields
 		in
 		let fields = loop c in
 		vp.vfields <- Array.of_list fields;
 		Array.iteri (fun i (n,_,_) -> vp.vindex <- PMap.add n i vp.vindex) vp.vfields;
 		t
 	| Not_found ->
-		let pname = s_type_path key_path in
+		let pname = s_type_path (List.tl key_path, List.hd key_path) in
 		let p = {
 			pname = pname;
 			pid = alloc_string ctx pname;
@@ -537,10 +578,11 @@ and class_type ?(tref=None) ctx c pl statics =
 			pinterfaces = PMap.empty;
 			pbindings = [];
 		} in
-		let t = HObj p in
+		let t = (if Meta.has Meta.Struct c.cl_meta && not statics then HStruct p else HObj p) in
 		(match tref with
 		| None -> ()
 		| Some r -> r := Some t);
+		ctx.ct_depth <- ctx.ct_depth + 1;
 		ctx.cached_types <- PMap.add key_path t ctx.cached_types;
 		if c.cl_path = ([],"Array") then assert false;
 		if c == ctx.base_class then begin
@@ -553,16 +595,26 @@ and class_type ?(tref=None) ctx c pl statics =
 		) in
 		let start_field, virtuals = (match tsup with
 			| None -> 0, [||]
-			| Some (HObj psup) ->
+			| Some ((HObj psup | HStruct psup) as pt) ->
+				if is_struct t <> is_struct pt then abort (if is_struct t then "Struct cannot extend a not struct class" else "Class cannot extend a struct") c.cl_pos;
 				if psup.pnfields < 0 then assert false;
 				p.psuper <- Some psup;
-				p.pfunctions <- psup.pfunctions;
-				p.pinterfaces <- psup.pinterfaces;
 				psup.pnfields, psup.pvirtuals
 			| _ -> assert false
 		) in
 		let fa = DynArray.create() and pa = DynArray.create() and virtuals = DynArray.of_array virtuals in
-		let todo = ref [] in
+		let add_field name get_t =
+			let fid = DynArray.length fa + start_field in
+			let str = if name = "" then 0 else alloc_string ctx name in
+			p.pindex <- PMap.add name (fid, HVoid) p.pindex;
+			DynArray.add fa (name, str, HVoid);
+			ctx.ct_delayed <- (fun() ->
+				let t = get_t() in
+				p.pindex <- PMap.add name (fid, t) p.pindex;
+				Array.set p.pfields (fid - start_field) (name, str, t);
+			) :: ctx.ct_delayed;
+			fid
+		in
 		List.iter (fun f ->
 			if is_extern_field f || (statics && f.cf_name = "__meta__") then () else
 			let fid = (match f.cf_kind with
@@ -573,7 +625,7 @@ and class_type ?(tref=None) ctx c pl statics =
 					let vid = (try -(fst (get_index f.cf_name p))-1 with Not_found -> assert false) in
 					DynArray.set virtuals vid g;
 					Some vid
-				else if is_overriden ctx c f then begin
+				else if is_overridden ctx c f then begin
 					let vid = DynArray.length virtuals in
 					DynArray.add virtuals g;
 					p.pindex <- PMap.add f.cf_name (-vid-1,HVoid) p.pindex;
@@ -586,15 +638,8 @@ and class_type ?(tref=None) ctx c pl statics =
 			| Method MethDynamic when List.exists (fun ff -> ff.cf_name = f.cf_name) c.cl_overrides ->
 				Some (try fst (get_index f.cf_name p) with Not_found -> assert false)
 			| _ ->
-				let fid = DynArray.length fa in
-				p.pindex <- PMap.add f.cf_name (fid + start_field, t) p.pindex;
-				DynArray.add fa (f.cf_name, alloc_string ctx f.cf_name, HVoid);
-				todo := (fun() ->
-					let t = to_type ctx f.cf_type in
-					p.pindex <- PMap.add f.cf_name (fid + start_field, t) p.pindex;
-					Array.set p.pfields fid (f.cf_name, alloc_string ctx f.cf_name, t)
-				) :: !todo;
-				Some (fid + start_field)
+				let fid = add_field f.cf_name (fun() -> to_type ctx f.cf_type) in
+				Some fid
 			) in
 			match f.cf_kind, fid with
 			| Method _, Some fid -> p.pbindings <- (fid, alloc_fun_path ctx c.cl_path f.cf_name) :: p.pbindings
@@ -603,10 +648,12 @@ and class_type ?(tref=None) ctx c pl statics =
 		if not statics then begin
 			(* add interfaces *)
 			List.iter (fun (i,pl) ->
-				let fid = DynArray.length fa in
-				let t = to_type ctx (TInst (i,pl)) in
-				p.pinterfaces <- PMap.add t (fid + start_field) p.pinterfaces;
-				DynArray.add fa ("", 0, t);
+				let rid = ref (-1) in
+				rid := add_field "" (fun() ->
+					let t = to_type ctx (TInst (i,pl)) in
+					p.pinterfaces <- PMap.add t !rid p.pinterfaces;
+					t
+				);
 			) c.cl_implements;
 			(* check toString *)
 			(try
@@ -625,13 +672,19 @@ and class_type ?(tref=None) ctx c pl statics =
 		p.pfields <- DynArray.to_array fa;
 		p.pproto <- DynArray.to_array pa;
 		p.pvirtuals <- DynArray.to_array virtuals;
-		List.iter (fun f -> f()) !todo;
+		ctx.ct_depth <- ctx.ct_depth - 1;
+		if ctx.ct_depth = 0 then begin
+			let todo = ctx.ct_delayed in
+			ctx.ct_delayed <- [];
+			List.iter (fun f -> f()) todo;
+		end;
 		if not statics && c != ctx.core_type && c != ctx.core_enum then p.pclassglobal <- Some (fst (class_global ctx (if statics then ctx.base_class else c)));
 		t
 
 and enum_type ?(tref=None) ctx e =
+	let key_path = snd e.e_path :: fst e.e_path in
 	try
-		PMap.find e.e_path ctx.cached_types
+		PMap.find key_path ctx.cached_types
 	with Not_found ->
 		let ename = s_type_path e.e_path in
 		let et = {
@@ -644,7 +697,7 @@ and enum_type ?(tref=None) ctx e =
 		(match tref with
 		| None -> ()
 		| Some r -> r := Some t);
-		ctx.cached_types <- PMap.add e.e_path t ctx.cached_types;
+		ctx.cached_types <- PMap.add key_path t ctx.cached_types;
 		et.efields <- Array.of_list (List.map (fun f ->
 			let f = PMap.find f e.e_constrs in
 			let args = (match f.ef_type with
@@ -658,11 +711,11 @@ and enum_type ?(tref=None) ctx e =
 		t
 
 and enum_class ctx e =
-	let cpath = (fst e.e_path,"$" ^ snd e.e_path) in
+	let key_path = ("$" ^ snd e.e_path) :: fst e.e_path in
 	try
-		PMap.find cpath ctx.cached_types
+		PMap.find key_path ctx.cached_types
 	with Not_found ->
-		let pname = s_type_path cpath in
+		let pname = s_type_path (List.tl key_path, List.hd key_path) in
 		let p = {
 			pname = pname;
 			pid = alloc_string ctx pname;
@@ -678,7 +731,7 @@ and enum_class ctx e =
 			pbindings = [];
 		} in
 		let t = HObj p in
-		ctx.cached_types <- PMap.add cpath t ctx.cached_types;
+		ctx.cached_types <- PMap.add key_path t ctx.cached_types;
 		p.psuper <- Some (match class_type ctx ctx.base_enum [] false with HObj o -> o | _ -> assert false);
 		t
 
@@ -715,7 +768,7 @@ let resolve_type ctx path =
 let alloc_std ctx name args ret =
 	let lib = "std" in
 	(* different from :hlNative to prevent mismatch *)
-	let nid = lookup ctx.cnatives ("$" ^ name ^ "@" ^ lib) (fun() ->
+	let nid = lookup ctx.cnatives ("$" ^ name ^ "@" ^ lib, -1) (fun() ->
 		let fid = alloc_fun_path ctx ([],"std") name in
 		Hashtbl.add ctx.defined_funs fid ();
 		(alloc_string ctx lib, alloc_string ctx name,HFun (args,ret),fid)
@@ -753,7 +806,7 @@ let rtype ctx r =
 	DynArray.get ctx.m.mregs.arr r
 
 let hold ctx r =
-	if not ctx.optimize || Hashtbl.mem ctx.m.mvars r then () else
+	if not ctx.optimize then () else
 	let t = rtype ctx r in
 	let a = PMap.find t ctx.m.mallocs in
 	let rec loop l =
@@ -766,7 +819,7 @@ let hold ctx r =
 	a.a_hold <- r :: a.a_hold
 
 let free ctx r =
-	if not ctx.optimize || Hashtbl.mem ctx.m.mvars r then () else
+	if not ctx.optimize then () else
 	let t = rtype ctx r in
 	let a = PMap.find t ctx.m.mallocs in
 	let last = ref true in
@@ -801,17 +854,25 @@ let alloc_var ctx v new_var =
 		Hashtbl.add ctx.m.mvars v.v_id r;
 		r
 
+
+let push_op ctx o =
+	DynArray.add ctx.m.mdebug ctx.m.mcurpos;
+	DynArray.add ctx.m.mops o
+
 let op ctx o =
 	match o with
-	| OMov (a,b) when a = b -> ()
+	| OMov (a,b) when a = b ->
+		()
 	| _ ->
-		DynArray.add ctx.m.mdebug ctx.m.mcurpos;
-		DynArray.add ctx.m.mops o
+		push_op ctx o
+
+let set_op ctx pos o =
+	DynArray.set ctx.m.mops pos o
 
 let jump ctx f =
 	let pos = current_pos ctx in
 	op ctx (OJAlways (-1)); (* loop *)
-	(fun() -> DynArray.set ctx.m.mops pos (f (current_pos ctx - pos - 1)))
+	(fun() -> set_op ctx pos (f (current_pos ctx - pos - 1)))
 
 let jump_back ctx =
 	let pos = current_pos ctx in
@@ -837,7 +898,7 @@ let shl ctx idx v =
 
 let set_default ctx r =
 	match rtype ctx r with
-	| HUI8 | HUI16 | HI32 ->
+	| HUI8 | HUI16 | HI32 | HI64 ->
 		op ctx (OInt (r,alloc_i32 ctx 0l))
 	| HF32 | HF64 ->
 		op ctx (OFloat (r,alloc_float ctx 0.))
@@ -854,12 +915,8 @@ let read_mem ctx rdst bytes index t =
 		op ctx (OGetUI8 (rdst,bytes,index))
 	| HUI16 ->
 		op ctx (OGetUI16 (rdst,bytes,index))
-	| HI32 ->
-		op ctx (OGetI32 (rdst,bytes,index))
-	| HF32 ->
-		op ctx (OGetF32 (rdst,bytes,index))
-	| HF64 ->
-		op ctx (OGetF64 (rdst,bytes,index))
+	| HI32 | HI64 | HF32 | HF64 ->
+		op ctx (OGetMem (rdst,bytes,index))
 	| _ ->
 		assert false
 
@@ -869,12 +926,8 @@ let write_mem ctx bytes index t r =
 		op ctx (OSetUI8 (bytes,index,r))
 	| HUI16 ->
 		op ctx (OSetUI16 (bytes,index,r))
-	| HI32 ->
-		op ctx (OSetI32 (bytes,index,r))
-	| HF32 ->
-		op ctx (OSetF32 (bytes,index,r))
-	| HF64 ->
-		op ctx (OSetF64 (bytes,index,r))
+	| HI32 | HI64 | HF32 | HF64 ->
+		op ctx (OSetMem (bytes,index,r))
 	| _ ->
 		assert false
 
@@ -884,23 +937,24 @@ let common_type ctx e1 e2 for_eq p =
 	let rec loop t1 t2 =
 		if t1 == t2 then t1 else
 		match t1, t2 with
-		| HUI8, (HUI16 | HI32 | HF32 | HF64) -> t2
-		| HUI16, (HI32 | HF32 | HF64) -> t2
-		| HI32, HF32 -> t2 (* possible loss of precision *)
-		| (HI32 | HF32), HF64 -> t2
-		| (HUI8|HUI16|HI32|HF32|HF64), (HUI8|HUI16|HI32|HF32|HF64) -> t1
-		| (HUI8|HUI16|HI32|HF32|HF64), (HNull t2) -> if for_eq then HNull (loop t1 t2) else loop t1 t2
-		| (HNull t1), (HUI8|HUI16|HI32|HF32|HF64) -> if for_eq then HNull (loop t1 t2) else loop t1 t2
+		| HUI8, (HUI16 | HI32 | HI64 | HF32 | HF64) -> t2
+		| HUI16, (HI32 | HI64 | HF32 | HF64) -> t2
+		| (HI32 | HI64), HF32 -> t2 (* possible loss of precision *)
+		| (HI32 | HI64 | HF32), HF64 -> t2
+		| (HUI8|HUI16|HI32|HI64|HF32|HF64), (HUI8|HUI16|HI32|HI64|HF32|HF64) -> t1
+		| (HUI8|HUI16|HI32|HI64|HF32|HF64), (HNull t2) -> if for_eq then HNull (loop t1 t2) else loop t1 t2
+		| (HNull t1), (HUI8|HUI16|HI32|HI64|HF32|HF64) -> if for_eq then HNull (loop t1 t2) else loop t1 t2
 		| (HNull t1), (HNull t2) -> if for_eq then HNull (loop t1 t2) else loop t1 t2
-		| HDyn, (HUI8|HUI16|HI32|HF32|HF64) -> HF64
-		| (HUI8|HUI16|HI32|HF32|HF64), HDyn -> HF64
+		| HDyn, (HUI8|HUI16|HI32|HI64|HF32|HF64) -> HF64
+		| (HUI8|HUI16|HI32|HI64|HF32|HF64), HDyn -> HF64
 		| HDyn, _ -> HDyn
 		| _, HDyn -> HDyn
 		| _ when for_eq && safe_cast t1 t2 -> t2
 		| _ when for_eq && safe_cast t2 t1 -> t1
 		| HBool, HNull HBool when for_eq -> t2
 		| HNull HBool, HBool when for_eq -> t1
-		| HObj _, HVirtual _ | HVirtual _, HObj _ -> HDyn
+		| HObj _, HVirtual _ | HVirtual _, HObj _ | HVirtual _ , HVirtual _ -> HDyn
+		| HFun _, HFun _ -> HDyn
 		| _ ->
 			abort ("Don't know how to compare " ^ tstr t1 ^ " and " ^ tstr t2) p
 	in
@@ -912,19 +966,26 @@ let captured_index ctx v =
 let real_name v =
 	let rec loop = function
 		| [] -> v.v_name
-		| (Meta.RealPath,[EConst (String name),_],_) :: _ -> name
+		| (Meta.RealPath,[EConst (String(name,_)),_],_) :: _ -> name
 		| _ :: l -> loop l
 	in
-	loop v.v_meta
+	match loop v.v_meta with
+	| "_gthis" -> "this"
+	| name -> name
+
+let is_gen_local ctx v = match v.v_kind with
+	| VUser _ -> false
+	| _ -> true
 
-let add_assign ctx v r =
+let add_assign ctx v =
+	if is_gen_local ctx v then () else
 	let name = real_name v in
-	ctx.m.massign <- (lookup ctx.cdebug_locals name (fun() -> name), DynArray.length ctx.m.mops, r) :: ctx.m.massign
+	ctx.m.massign <- (alloc_string ctx name, current_pos ctx - 1) :: ctx.m.massign
 
 let add_capture ctx r =
 	Array.iter (fun v ->
 		let name = real_name v in
-		ctx.m.massign <- (lookup ctx.cdebug_locals name (fun() -> name), -1, r) :: ctx.m.massign
+		ctx.m.massign <- (alloc_string ctx name, -(r+2)) :: ctx.m.massign
 	) ctx.m.mcaptured.c_vars
 
 let before_return ctx =
@@ -972,8 +1033,26 @@ let type_value ctx t p =
 		assert false
 
 let rec eval_to ctx e (t:ttype) =
-	let r = eval_expr ctx e in
-	cast_to ctx r t e.epos
+	match e.eexpr, t with
+	| TConst (TInt i), HF64 ->
+		let r = alloc_tmp ctx t in
+		op ctx (OFloat (r,alloc_float ctx (Int32.to_float i)));
+		r
+	(* this causes a bug with NG, to be reviewed later
+	| TConst (TInt i), HF32 ->
+		let r = alloc_tmp ctx t in
+		let bits = Int32.bits_of_float (Int32.to_float i) in
+		op ctx (OFloat (r,alloc_float ctx (Int64.float_of_bits (Int64.of_int32 bits))));
+		r
+	| TConst (TFloat f), HF32 ->
+		let r = alloc_tmp ctx t in
+		let bits = Int32.bits_of_float (float_of_string f) in
+		op ctx (OFloat (r,alloc_float ctx (Int64.float_of_bits (Int64.of_int32 bits))));
+		r
+	*)
+	| _ ->
+		let r = eval_expr ctx e in
+		cast_to ctx r t e.epos
 
 and cast_to ?(force=false) ctx (r:reg) (t:ttype) p =
 	let rt = rtype ctx r in
@@ -985,11 +1064,11 @@ and cast_to ?(force=false) ctx (r:reg) (t:ttype) p =
 		let tmp = alloc_tmp ctx HDyn in
 		op ctx (OMov (tmp,r));
 		cast_to ctx tmp t p
-	| (HUI8 | HUI16 | HI32 | HF32 | HF64), (HF32 | HF64) ->
+	| (HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64), (HF32 | HF64) ->
 		let tmp = alloc_tmp ctx t in
 		op ctx (OToSFloat (tmp, r));
 		tmp
-	| (HUI8 | HUI16 | HI32 | HF32 | HF64), (HUI8 | HUI16 | HI32) ->
+	| (HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64), (HUI8 | HUI16 | HI32 | HI64) ->
 		let tmp = alloc_tmp ctx t in
 		op ctx (OToInt (tmp, r));
 		tmp
@@ -1024,7 +1103,15 @@ and cast_to ?(force=false) ctx (r:reg) (t:ttype) p =
 	| HObj o, HVirtual _ ->
 		let out = alloc_tmp ctx t in
 		(try
-			let fid = PMap.find t o.pinterfaces in
+			let rec lookup_intf o =
+				try
+					PMap.find t o.pinterfaces
+				with Not_found ->
+					match o.psuper with
+					| None -> raise Not_found
+					| Some o -> lookup_intf o
+			in
+			let fid = lookup_intf o in
 			(* memoisation *)
 			let need_null_check r =
 				not (r = 0 && ctx.m.mhasthis)
@@ -1081,25 +1168,34 @@ and cast_to ?(force=false) ctx (r:reg) (t:ttype) p =
 		j();
 		op ctx (ONull out);
 		out
-	| (HUI8 | HUI16 | HI32 | HF32 | HF64), HNull ((HF32 | HF64) as t) ->
+	| HRef t1, HNull t2 ->
+		let j = jump ctx (fun n -> OJNull (r,n)) in
+		let rtmp = alloc_tmp ctx t1 in
+		op ctx (OUnref (rtmp,r));
+		let out = cast_to ctx rtmp t p in
+		op ctx (OJAlways 1);
+		j();
+		op ctx (ONull out);
+		out
+	| (HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64), HNull ((HF32 | HF64) as t) ->
 		let tmp = alloc_tmp ctx t in
 		op ctx (OToSFloat (tmp, r));
 		let r = alloc_tmp ctx (HNull t) in
 		op ctx (OToDyn (r,tmp));
 		r
-	| (HUI8 | HUI16 | HI32 | HF32 | HF64), HNull ((HUI8 | HUI16 | HI32) as t) ->
+	| (HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64), HNull ((HUI8 | HUI16 | HI32) as t) ->
 		let tmp = alloc_tmp ctx t in
 		op ctx (OToInt (tmp, r));
 		let r = alloc_tmp ctx (HNull t) in
 		op ctx (OToDyn (r,tmp));
 		r
-	| HNull ((HUI8 | HUI16 | HI32) as it), (HF32 | HF64) ->
+	| HNull ((HUI8 | HUI16 | HI32 | HI64) as it), (HF32 | HF64) ->
 		let i = alloc_tmp ctx it in
 		op ctx (OSafeCast (i,r));
 		let tmp = alloc_tmp ctx t in
 		op ctx (OToSFloat (tmp, i));
 		tmp
-	| HNull ((HF32 | HF64) as it), (HUI8 | HUI16 | HI32) ->
+	| HNull ((HF32 | HF64) as it), (HUI8 | HUI16 | HI32 | HI64) ->
 		let i = alloc_tmp ctx it in
 		op ctx (OSafeCast (i,r));
 		let tmp = alloc_tmp ctx t in
@@ -1117,6 +1213,18 @@ and cast_to ?(force=false) ctx (r:reg) (t:ttype) p =
 		let out = alloc_tmp ctx t in
 		op ctx (OSafeCast (out, r));
 		out
+	| HNull _, HRef t2 ->
+		let out = alloc_tmp ctx t in
+		op ctx (OJNotNull (r,2));
+		op ctx (ONull out);
+		let j = jump ctx (fun n -> OJAlways n) in
+		let r = cast_to ctx r t2 p in
+		let r2 = alloc_tmp ctx t2 in
+		op ctx (OMov (r2, r));
+		hold ctx r2; (* retain *)
+		op ctx (ORef (out,r2));
+		j();
+		out
 	| _, HRef t2 ->
 		let r = cast_to ctx r t2 p in
 		let r2 = alloc_tmp ctx t2 in
@@ -1133,7 +1241,7 @@ and cast_to ?(force=false) ctx (r:reg) (t:ttype) p =
 		else
 			abort ("Don't know how to cast " ^ tstr rt ^ " to " ^ tstr t) p
 
-and unsafe_cast_to ctx (r:reg) (t:ttype) p =
+and unsafe_cast_to ?(debugchk=true) ctx (r:reg) (t:ttype) p =
 	let rt = rtype ctx r in
 	if safe_cast rt t then
 		r
@@ -1153,13 +1261,21 @@ and unsafe_cast_to ctx (r:reg) (t:ttype) p =
 		if is_dynamic (rtype ctx r) && is_dynamic t then
 			let r2 = alloc_tmp ctx t in
 			op ctx (OUnsafeCast (r2,r));
+			if ctx.com.debug && debugchk then begin
+				hold ctx r2;
+				let r3 = cast_to ~force:true ctx r t p in
+				let j = jump ctx (fun n -> OJEq (r2,r3,n)) in
+				op ctx (OAssert 0);
+				j();
+				free ctx r2;
+			end;
 			r2
 		else
 			cast_to ~force:true ctx r t p
 
 and object_access ctx eobj t f =
 	match t with
-	| HObj p ->
+	| HObj p | HStruct p ->
 		(try
 			let fid = fst (get_index f.cf_name p) in
 			if f.cf_kind = Method MethNormal then
@@ -1189,7 +1305,7 @@ and direct_method_call ctx c f ethis =
 		false
 	else if (match c.cl_kind with KTypeParameter _ ->  true | _ -> false) then
 		false
-	else if is_overriden ctx c f && ethis.eexpr <> TConst(TSuper) then
+	else if is_overridden ctx c f && ethis.eexpr <> TConst(TSuper) then
 		false
 	else
 		true
@@ -1314,10 +1430,20 @@ and jump_expr ctx e jcond =
 		jump_expr ctx e (not jcond)
 	| TBinop (OpEq,{ eexpr = TConst(TNull) },e) | TBinop (OpEq,e,{ eexpr = TConst(TNull) }) ->
 		let r = eval_expr ctx e in
-		jump ctx (fun i -> if jcond then OJNull (r,i) else OJNotNull (r,i))
+		if is_nullable(rtype ctx r) then
+			jump ctx (fun i -> if jcond then OJNull (r,i) else OJNotNull (r,i))
+		else if not jcond then
+			jump ctx (fun i -> OJAlways i)
+		else
+			(fun i -> ())
 	| TBinop (OpNotEq,{ eexpr = TConst(TNull) },e) | TBinop (OpNotEq,e,{ eexpr = TConst(TNull) }) ->
 		let r = eval_expr ctx e in
-		jump ctx (fun i -> if jcond then OJNotNull (r,i) else OJNull (r,i))
+		if is_nullable(rtype ctx r) then
+			jump ctx (fun i -> if jcond then OJNotNull (r,i) else OJNull (r,i))
+		else if jcond then
+			jump ctx (fun i -> OJAlways i)
+		else
+			(fun i -> ())
 	| TBinop (OpEq | OpNotEq | OpGt | OpGte | OpLt | OpLte as jop, e1, e2) ->
 		let t = common_type ctx e1 e2 (match jop with OpEq | OpNotEq -> true | _ -> false) e.epos in
 		let r1 = eval_to ctx e1 t in
@@ -1326,8 +1452,8 @@ and jump_expr ctx e jcond =
 		free ctx r1;
 		let unsigned = unsigned_op e1 e2 in
 		jump ctx (fun i ->
-			let lt a b = if unsigned then OJULt (a,b,i) else OJSLt (a,b,i) in
-			let gte a b = if unsigned then OJUGte (a,b,i) else OJSGte (a,b,i) in
+			let lt a b = if unsigned then OJULt (a,b,i) else if not jcond && is_float t then OJNotGte (a,b,i) else OJSLt (a,b,i) in
+			let gte a b = if unsigned then OJUGte (a,b,i) else if not jcond && is_float t then OJNotLt (a,b,i) else OJSGte (a,b,i) in
 			match jop with
 			| OpEq -> if jcond then OJEq (r1,r2,i) else OJNotEq (r1,r2,i)
 			| OpNotEq -> if jcond then OJNotEq (r1,r2,i) else OJEq (r1,r2,i)
@@ -1375,15 +1501,30 @@ and eval_null_check ctx e =
 	| _ -> op ctx (ONullCheck r));
 	r
 
+and make_const ctx c p =
+	let cidx = lookup ctx.cconstants c (fun() ->
+		let fields, t = (match c with
+		| CString s ->
+			let str, len = to_utf8 s p in
+			[alloc_string ctx str; alloc_i32 ctx (Int32.of_int len)], to_type ctx ctx.com.basic.tstring
+		) in
+		let g = lookup_alloc ctx.cglobals t in
+		g, Array.of_list fields
+	) in
+	let g, _ = DynArray.get ctx.cconstants.arr cidx in
+	g
+
 and make_string ctx s p =
-	let str, len = to_utf8 s p in
-	let r = alloc_tmp ctx HBytes in
-	let s = alloc_tmp ctx (to_type ctx ctx.com.basic.tstring) in
-	op ctx (ONew s);
-	op ctx (OString (r,alloc_string ctx str));
-	op ctx (OSetField (s,0,r));
-	op ctx (OSetField (s,1,reg_int ctx len));
-	s
+	let r = alloc_tmp ctx (to_type ctx ctx.com.basic.tstring) in
+	op ctx (OGetGlobal (r, make_const ctx (CString s) p));
+	r
+
+and get_enum_index ctx v =
+	let r = alloc_tmp ctx HI32 in
+	let re = eval_expr ctx v in
+	op ctx (ONullCheck re);
+	op ctx (OEnumIndex (r,re));
+	r
 
 and eval_var ctx v =
 	match captured_index ctx v with
@@ -1427,8 +1568,8 @@ and eval_expr ctx e =
 			match captured_index ctx v with
 			| None ->
 				let r = alloc_var ctx v true in
-				op ctx (OMov (r,ri));
-				add_assign ctx v r;
+				push_op ctx (OMov (r,ri));
+				add_assign ctx v;
 			| Some idx ->
 				op ctx (OSetEnumField (ctx.m.mcaptreg, idx, ri));
 		);
@@ -1489,9 +1630,9 @@ and eval_expr ctx e =
 				r
 			)
 		| _ -> assert false);
-	| TCall ({ eexpr = TLocal v }, el) when v.v_name.[0] = '$' ->
+	| TCall ({ eexpr = TIdent s }, el) when s.[0] = '$' ->
 		let invalid() = abort "Invalid native call" e.epos in
-		(match v.v_name, el with
+		(match s, el with
 		| "$new", [{ eexpr = TTypeExpr (TClassDecl _) }] ->
 			(match follow e.etype with
 			| TInst (c,pl) ->
@@ -1540,7 +1681,17 @@ and eval_expr ctx e =
 			let r = eval_to ctx v HI32 in
 			free ctx pos;
 			free ctx b;
-			op ctx (OSetI32 (b, pos, r));
+			op ctx (OSetMem (b, pos, r));
+			r
+		| "$bseti64", [b;pos;v] ->
+			let b = eval_to ctx b HBytes in
+			hold ctx b;
+			let pos = eval_to ctx pos HI32 in
+			hold ctx pos;
+			let r = eval_to ctx v HI64 in
+			free ctx pos;
+			free ctx b;
+			op ctx (OSetMem (b, pos, r));
 			r
 		| "$bsetf32", [b;pos;v] ->
 			let b = eval_to ctx b HBytes in
@@ -1550,7 +1701,7 @@ and eval_expr ctx e =
 			let r = eval_to ctx v HF32 in
 			free ctx pos;
 			free ctx b;
-			op ctx (OSetF32 (b, pos, r));
+			op ctx (OSetMem (b, pos, r));
 			r
 		| "$bsetf64", [b;pos;v] ->
 			let b = eval_to ctx b HBytes in
@@ -1560,7 +1711,7 @@ and eval_expr ctx e =
 			let r = eval_to ctx v HF64 in
 			free ctx pos;
 			free ctx b;
-			op ctx (OSetF64 (b, pos, r));
+			op ctx (OSetMem (b, pos, r));
 			r
 		| "$bytes_sizebits", [eb] ->
 			(match follow eb.etype with
@@ -1568,9 +1719,8 @@ and eval_expr ctx e =
 				reg_int ctx (match to_type ctx t with
 				| HUI8 -> 0
 				| HUI16 -> 1
-				| HI32 -> 2
-				| HF32 -> 2
-				| HF64 -> 3
+				| HI32 | HF32 -> 2
+				| HI64 | HF64 -> 3
 				| t -> abort ("Unsupported basic type " ^ tstr t) e.epos)
 			| _ ->
 				abort "Invalid BytesAccess" eb.epos);
@@ -1580,7 +1730,7 @@ and eval_expr ctx e =
 				let t = to_type ctx t in
 				let r = alloc_tmp ctx t in
 				(match t with
-				| HUI8 | HUI16 | HI32 ->
+				| HUI8 | HUI16 | HI32 | HI64 ->
 					op ctx (OInt (r,alloc_i32 ctx 0l))
 				| HF32 | HF64 ->
 					op ctx (OFloat (r, alloc_float ctx 0.))
@@ -1608,15 +1758,19 @@ and eval_expr ctx e =
 					r
 				| HI32 ->
 					let r = alloc_tmp ctx HI32 in
-					op ctx (OGetI32 (r, b, shl ctx pos 2));
+					op ctx (OGetMem (r, b, shl ctx pos 2));
+					r
+				| HI64 ->
+					let r = alloc_tmp ctx HI64 in
+					op ctx (OGetMem (r, b, shl ctx pos 3));
 					r
 				| HF32 ->
 					let r = alloc_tmp ctx HF32 in
-					op ctx (OGetF32 (r, b, shl ctx pos 2));
+					op ctx (OGetMem (r, b, shl ctx pos 2));
 					r
 				| HF64 ->
 					let r = alloc_tmp ctx HF64 in
-					op ctx (OGetF64 (r, b, shl ctx pos 3));
+					op ctx (OGetMem (r, b, shl ctx pos 3));
 					r
 				| _ ->
 					abort ("Unsupported basic type " ^ tstr t) e.epos)
@@ -1644,19 +1798,25 @@ and eval_expr ctx e =
 				| HI32 ->
 					let v = eval_to ctx value HI32 in
 					hold ctx v;
-					op ctx (OSetI32 (b, shl ctx pos 2, v));
+					op ctx (OSetMem (b, shl ctx pos 2, v));
+					free ctx v;
+					v
+				| HI64 ->
+					let v = eval_to ctx value HI64 in
+					hold ctx v;
+					op ctx (OSetMem (b, shl ctx pos 3, v));
 					free ctx v;
 					v
 				| HF32 ->
 					let v = eval_to ctx value HF32 in
 					hold ctx v;
-					op ctx (OSetF32 (b, shl ctx pos 2, v));
+					op ctx (OSetMem (b, shl ctx pos 2, v));
 					free ctx v;
 					v
 				| HF64 ->
 					let v = eval_to ctx value HF64 in
 					hold ctx v;
-					op ctx (OSetF64 (b, shl ctx pos 3, v));
+					op ctx (OSetMem (b, shl ctx pos 3, v));
 					free ctx v;
 					v
 				| _ ->
@@ -1689,7 +1849,15 @@ and eval_expr ctx e =
 			let pos = eval_to ctx pos HI32 in
 			free ctx b;
 			let r = alloc_tmp ctx HI32 in
-			op ctx (OGetI32 (r, b, pos));
+			op ctx (OGetMem (r, b, pos));
+			r
+		| "$bgeti64", [b;pos] ->
+			let b = eval_to ctx b HBytes in
+			hold ctx b;
+			let pos = eval_to ctx pos HI32 in
+			free ctx b;
+			let r = alloc_tmp ctx HI64 in
+			op ctx (OGetMem (r, b, pos));
 			r
 		| "$bgetf32", [b;pos] ->
 			let b = eval_to ctx b HBytes in
@@ -1697,7 +1865,7 @@ and eval_expr ctx e =
 			let pos = eval_to ctx pos HI32 in
 			free ctx b;
 			let r = alloc_tmp ctx HF32 in
-			op ctx (OGetF32 (r, b, pos));
+			op ctx (OGetMem (r, b, pos));
 			r
 		| "$bgetf64", [b;pos] ->
 			let b = eval_to ctx b HBytes in
@@ -1705,7 +1873,7 @@ and eval_expr ctx e =
 			let pos = eval_to ctx pos HI32 in
 			free ctx b;
 			let r = alloc_tmp ctx HF64 in
-			op ctx (OGetF64 (r, b, pos));
+			op ctx (OGetMem (r, b, pos));
 			r
 		| "$asize", [e] ->
 			let r = alloc_tmp ctx HI32 in
@@ -1734,8 +1902,12 @@ and eval_expr ctx e =
 		| "$aset", [a; pos; value] ->
 			let et = (match follow a.etype with TAbstract ({ a_path = ["hl"],"NativeArray" },[t]) -> to_type ctx t | _ -> invalid()) in
 			let arr = eval_to ctx a HArray in
+			hold ctx arr;
 			let pos = eval_to ctx pos HI32 in
+			hold ctx pos;
 			let r = eval_to ctx value et in
+			free ctx pos;
+			free ctx arr;
 			op ctx (OSetArray (arr, pos, r));
 			r
 		| "$abytes", [a] ->
@@ -1780,6 +1952,17 @@ and eval_expr ctx e =
 			let out = alloc_tmp ctx (match rtype ctx r with HRef t -> t | _ -> invalid()) in
 			op ctx (OUnref (out,r));
 			out
+		| "$refdata", [e1] ->
+			let v = eval_expr ctx e1 in
+			let r = alloc_tmp ctx (match to_type ctx e.etype with HRef _ as t -> t | _ -> invalid()) in
+			op ctx (ORefData (r,v));
+			r
+		| "$refoffset", [r;e1] ->
+			let r = eval_expr ctx r in
+			let e = eval_to ctx e1 HI32 in
+			let r2 = alloc_tmp ctx (match rtype ctx r with HRef _ as t -> t | _ -> invalid()) in
+			op ctx (ORefOffset (r2,r,e));
+			r2
 		| "$ttype", [v] ->
 			let r = alloc_tmp ctx HType in
 			op ctx (OType (r,to_type ctx v.etype));
@@ -1810,7 +1993,9 @@ and eval_expr ctx e =
 				op ctx (ONew ro);
 				op ctx (OString (rb,alloc_string ctx k));
 				op ctx (OSetField (ro,0,rb));
-				op ctx (OBytes (rb,alloc_string ctx (v ^ "\x00"))); (* add a \x00 to prevent clashing with existing string *)
+				(* fix for Resource.getString *)
+				let str = try ignore(String.index v '\x00'); v with Not_found -> v ^ "\x00" in
+				op ctx (OBytes (rb,alloc_bytes ctx (Bytes.of_string str)));
 				op ctx (OSetField (ro,1,rb));
 				if has_len then op ctx (OSetField (ro,2,reg_int ctx (String.length v)));
 				op ctx (OSetArray (arr,ridx,ro));
@@ -1838,17 +2023,13 @@ and eval_expr ctx e =
 				r
 			| _ -> abort "Constant string required" v.epos)
 		| "$enumIndex", [v] ->
-			let r = alloc_tmp ctx HI32 in
-			let re = eval_expr ctx v in
-			op ctx (ONullCheck re);
-			op ctx (OEnumIndex (r,re));
-			r
+			get_enum_index ctx v
 		| "$__mk_pos__", [{ eexpr = TConst (TString file) };min;max] ->
 			(* macros only - generated by reification *)
 			let rt = HAbstract ("macro_pos",alloc_string ctx "macro_pos") in
 			let r = alloc_tmp ctx rt in
 			let rfile = alloc_tmp ctx HBytes in
-			op ctx (OBytes (rfile, alloc_string ctx file));
+			op ctx (OBytes (rfile, alloc_bytes ctx (Bytes.of_string file)));
 			hold ctx rfile;
 			let min = eval_expr ctx min in hold ctx min;
 			let max = eval_expr ctx max in
@@ -1857,7 +2038,31 @@ and eval_expr ctx e =
 			free ctx min;
 			r
 		| _ ->
-			abort ("Unknown native call " ^ v.v_name) e.epos)
+			abort ("Unknown native call " ^ s) e.epos)
+	| TEnumIndex v ->
+		get_enum_index ctx v
+	| TCall ({ eexpr = TField (_,FStatic ({ cl_path = [],"Type" },{ cf_name = "enumIndex" })) },[{ eexpr = TCast(v,_) }]) when (match follow v.etype with TEnum _ -> true | _ -> false) ->
+		get_enum_index ctx v
+	| TCall ({ eexpr = TField (_,FStatic ({ cl_path = [],"Type" },{ cf_name = "enumIndex" })) },[v]) when (match follow v.etype with TEnum _ -> true | _ -> false) ->
+		get_enum_index ctx v
+	| TCall ({ eexpr = TField (_,FStatic ({ cl_path = [],"Std" },{ cf_name = "instance" })) },[v;vt])
+	| TCall ({ eexpr = TField (_,FStatic ({ cl_path = [],"Std" },{ cf_name = "downcast" })) },[v;vt]) ->
+		let r = eval_expr ctx v in
+		hold ctx r;
+		let c = eval_to ctx vt (class_type ctx ctx.base_type [] false) in
+		hold ctx c;
+		let rv = alloc_tmp ctx (to_type ctx e.etype) in
+		let rb = alloc_tmp ctx HBool in
+		op ctx (OCall2 (rb, alloc_fun_path ctx (["hl"],"BaseType") "check",c,r));
+		let jnext = jump ctx (fun n -> OJFalse (rb,n)) in
+		op ctx (OMov (rv, unsafe_cast_to ~debugchk:false ctx r (to_type ctx e.etype) e.epos));
+		let jend = jump ctx (fun n -> OJAlways n) in
+		jnext();
+		op ctx (ONull rv);
+		jend();
+		free ctx r;
+		free ctx c;
+		rv
 	| TCall (ec,args) ->
 		let tfun = real_type ctx ec in
 		let el() = eval_args ctx args tfun e.epos in
@@ -1910,7 +2115,28 @@ and eval_expr ctx e =
 			op ctx (OCallClosure (ret, r, el)); (* if it's a value, it's a closure *)
 			def_ret := Some (cast_to ~force:true ctx ret (to_type ctx e.etype) e.epos);
 		);
-		(match !def_ret with None -> cast_to ~force:true ctx ret (to_type ctx e.etype) e.epos | Some r -> r)
+		(match !def_ret with
+		| None ->
+			let rt = to_type ctx e.etype in
+			let is_valid_method t =
+				match follow t with
+				| TFun (_,rt) ->
+					(match follow rt with
+					| TInst({ cl_kind = KTypeParameter tl },_) ->
+						(* don't allow if we have a constraint virtual, see hxbit.Serializer.getRef *)
+						not (List.exists (fun t -> match to_type ctx t with HVirtual _ -> true | _ -> false) tl)
+					| _ -> false)
+				| _ ->
+					false
+			in
+			(match ec.eexpr with
+			| TField (_, FInstance(_,_,{ cf_kind = Method (MethNormal|MethInline); cf_type = t })) when is_valid_method t ->
+				(* let's trust the compiler when it comes to casting the return value from a type parameter *)
+				unsafe_cast_to ctx ret rt e.epos
+			| _ ->
+				cast_to ~force:true ctx ret rt e.epos)
+		| Some r ->
+			r)
 	| TField (ec,FInstance({ cl_path = [],"Array" },[t],{ cf_name = "length" })) when to_type ctx t = HDyn ->
 		let r = alloc_tmp ctx HI32 in
 		op ctx (OCall1 (r,alloc_fun_path ctx (["hl";"types"],"ArrayDyn") "get_length", eval_null_check ctx ec));
@@ -1933,7 +2159,14 @@ and eval_expr ctx e =
 			op ctx (match ethis.eexpr with TConst TThis -> OGetThis (r,fid) | _ -> OField (r,robj,fid));
 		| AInstanceProto (ethis,fid) | AVirtualMethod (ethis, fid) ->
 			let robj = eval_null_check ctx ethis in
-			op ctx (OVirtualClosure (r,robj,fid));
+			(match rtype ctx robj with
+			| HObj _ ->
+				op ctx (OVirtualClosure (r,robj,fid))
+			| HVirtual vp ->
+				let _, sid, _ = vp.vfields.(fid) in
+				op ctx (ODynGet (r,robj, sid))
+			| _ ->
+				assert false)
 		| ADynamic (ethis, f) ->
 			let robj = eval_null_check ctx ethis in
 			op ctx (ODynGet (r,robj,f))
@@ -1946,7 +2179,7 @@ and eval_expr ctx e =
 				let eargs, et = (match follow ef.ef_type with TFun (args,ret) -> args, ret | _ -> assert false) in
 				let ct = ctx.com.basic in
 				let p = ef.ef_pos in
-				let eargs = List.map (fun (n,o,t) -> Type.alloc_var n t en.e_pos, if o then Some TNull else None) eargs in
+				let eargs = List.map (fun (n,o,t) -> Type.alloc_var VGenerated n t en.e_pos, if o then Some (mk (TConst TNull) t_dynamic null_pos) else None) eargs in
 				let ecall = mk (TCall (e,List.map (fun (v,_) -> mk (TLocal v) v.v_type p) eargs)) et p in
 				let f = {
 					tf_args = eargs;
@@ -1958,14 +2191,17 @@ and eval_expr ctx e =
 			op ctx (OStaticClosure (r,fid));
 		| ANone | ALocal _ | AArray _ | ACaptured _ ->
 			abort "Invalid access" e.epos);
-		unsafe_cast_to ctx r (to_type ctx e.etype) e.epos
+		let to_t = to_type ctx e.etype in
+		(match to_t with
+		| HFun _ -> cast_to ctx r to_t e.epos
+		| _ -> unsafe_cast_to ctx r to_t e.epos)
 	| TObjectDecl fl ->
 		(match to_type ctx e.etype with
-		| HVirtual vp as t when Array.length vp.vfields = List.length fl && not (List.exists (fun (s,e) -> s = "toString" && is_to_string e.etype) fl)  ->
+		| HVirtual vp as t when Array.length vp.vfields = List.length fl && not (List.exists (fun ((s,_,_),e) -> s = "toString" && is_to_string e.etype) fl)  ->
 			let r = alloc_tmp ctx t in
 			op ctx (ONew r);
 			hold ctx r;
-			List.iter (fun (s,ev) ->
+			List.iter (fun ((s,_,_),ev) ->
 				let fidx = (try PMap.find s vp.vindex with Not_found -> assert false) in
 				let _, _, ft = vp.vfields.(fidx) in
 				let v = eval_to ctx ev ft in
@@ -1978,7 +2214,7 @@ and eval_expr ctx e =
 			op ctx (ONew r);
 			hold ctx r;
 			let a = (match follow e.etype with TAnon a -> Some a | t -> if t == t_dynamic then None else assert false) in
-			List.iter (fun (s,ev) ->
+			List.iter (fun ((s,_,_),ev) ->
 				let ft = (try (match a with None -> raise Not_found | Some a -> PMap.find s a.a_fields).cf_type with Not_found -> ev.etype) in
 				let v = eval_to ctx ev (to_type ctx ft) in
 				op ctx (ODynSet (r,alloc_string ctx s,v));
@@ -2015,7 +2251,9 @@ and eval_expr ctx e =
 		let t = to_type ctx e.etype in
 		let out = alloc_tmp ctx t in
 		let j = jump_expr ctx cond false in
-		if t = HVoid then ignore(eval_expr ctx eif) else op ctx (OMov (out,eval_to ctx eif t));
+		let rif = if t = HVoid then eval_expr ctx eif else eval_to ctx eif t in
+		set_curpos ctx (max_pos eif);
+		if t <> HVoid then op ctx (OMov (out,rif));
 		(match eelse with
 		| None -> j()
 		| Some e ->
@@ -2044,7 +2282,7 @@ and eval_expr ctx e =
 				| OpNotEq -> boolop r (fun d -> OJNotEq (a,b,d))
 				| OpAdd ->
 					(match rtype ctx r with
-					| HUI8 | HUI16 | HI32 | HF32 | HF64 ->
+					| HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64 ->
 						op ctx (OAdd (r,a,b))
 					| HObj { pname = "String" } ->
 						op ctx (OCall2 (r,alloc_fun_path ctx ([],"String") "__add__",a,b))
@@ -2054,18 +2292,20 @@ and eval_expr ctx e =
 						abort ("Cannot add " ^ tstr t) e.epos)
 				| OpSub | OpMult | OpMod | OpDiv ->
 					(match rtype ctx r with
-					| HUI8 | HUI16 | HI32 | HF32 | HF64 ->
+					| HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64 ->
 						(match bop with
 						| OpSub -> op ctx (OSub (r,a,b))
 						| OpMult -> op ctx (OMul (r,a,b))
 						| OpMod -> op ctx (if unsigned e1.etype then OUMod (r,a,b) else OSMod (r,a,b))
 						| OpDiv -> op ctx (OSDiv (r,a,b)) (* don't use UDiv since both operands are float already *)
 						| _ -> assert false)
+					| HDyn ->
+						op ctx (OCall3 (r, alloc_std ctx "dyn_op" [HI32;HDyn;HDyn] HDyn, reg_int ctx (match bop with OpSub -> 1 | OpMult -> 2 | OpMod -> 3 | OpDiv -> 4 | _ -> assert false), a, b))
 					| _ ->
 						assert false)
 				| OpShl | OpShr | OpUShr | OpAnd | OpOr | OpXor ->
 					(match rtype ctx r with
-					| HUI8 | HUI16 | HI32 ->
+					| HUI8 | HUI16 | HI32 | HI64 ->
 						(match bop with
 						| OpShl -> op ctx (OShl (r,a,b))
 						| OpShr -> op ctx (if unsigned e1.etype then OUShr (r,a,b) else OSShr (r,a,b))
@@ -2074,6 +2314,8 @@ and eval_expr ctx e =
 						| OpOr -> op ctx (OOr (r,a,b))
 						| OpXor -> op ctx (OXor (r,a,b))
 						| _ -> ())
+					| HDyn ->
+						op ctx (OCall3 (r, alloc_std ctx "dyn_op" [HI32;HDyn;HDyn] HDyn, reg_int ctx (match bop with OpShl -> 5 | OpShr -> 6 | OpUShr -> 7 | OpAnd -> 8 | OpOr -> 9 | OpXor -> 10 | _ -> assert false), a, b))
 					| _ ->
 						assert false)
 				| OpAssignOp bop ->
@@ -2139,8 +2381,8 @@ and eval_expr ctx e =
 				r
 			| ALocal (v,l) ->
 				let r = value() in
-				op ctx (OMov (l, r));
-				add_assign ctx v l;
+				push_op ctx (OMov (l, r));
+				add_assign ctx v;
 				r
 			| AArray (ra,(at,vt),ridx) ->
 				hold ctx ra;
@@ -2211,8 +2453,8 @@ and eval_expr ctx e =
 			(match get_access ctx e1 with
 			| ALocal (v,l) ->
 				let r = eval_to ctx { e with eexpr = TBinop (bop,e1,e2) } (to_type ctx e1.etype) in
-				op ctx (OMov (l, r));
-				add_assign ctx v l;
+				push_op ctx (OMov (l, r));
+				add_assign ctx v;
 				r
 			| acc ->
 				gen_assign_op ctx acc e1 (fun r ->
@@ -2221,7 +2463,7 @@ and eval_expr ctx e =
 					free ctx r;
 					binop r r b;
 					r))
-		| OpInterval | OpArrow ->
+		| OpInterval | OpArrow | OpIn ->
 			assert false)
 	| TUnop (Not,_,v) ->
 		let tmp = alloc_tmp ctx HBool in
@@ -2253,7 +2495,7 @@ and eval_expr ctx e =
 	| TUnop (Increment|Decrement as uop,fix,v) ->
 		let rec unop r =
 			match rtype ctx r with
-			| HUI8 | HUI16 | HI32 ->
+			| HUI8 | HUI16 | HI32 | HI64 ->
 				if uop = Increment then op ctx (OIncr r) else op ctx (ODecr r)
 			| HF32 | HF64 as t ->
 				hold ctx r;
@@ -2261,26 +2503,41 @@ and eval_expr ctx e =
 				free ctx r;
 				op ctx (OFloat (tmp,alloc_float ctx 1.));
 				if uop = Increment then op ctx (OAdd (r,r,tmp)) else op ctx (OSub (r,r,tmp))
-			| HNull (HUI8 | HUI16 | HI32 | HF32 | HF64 as t) ->
+			| HNull (HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64 as t) ->
 				hold ctx r;
 				let tmp = alloc_tmp ctx t in
 				free ctx r;
 				op ctx (OSafeCast (tmp,r));
 				unop tmp;
 				op ctx (OToDyn (r,tmp));
+			| HDyn when uop = Increment ->
+				hold ctx r;
+				let tmp = alloc_tmp ctx HDyn in
+				free ctx r;
+				op ctx (OToDyn (tmp, reg_int ctx 1));
+				op ctx (OCall2 (r,alloc_fun_path ctx ([],"Std") "__add__",r,tmp))
+			| HDyn when uop = Decrement ->
+				let r2 = alloc_tmp ctx HF64 in
+				hold ctx r2;
+				let tmp = alloc_tmp ctx HF64 in
+				free ctx r2;
+				op ctx (OSafeCast (r2, r));
+				op ctx (OFloat (tmp, alloc_float ctx 1.));
+				op ctx (OSub (r2, r2, tmp));
+				op ctx (OSafeCast (r, r2));
 			| _ ->
 				assert false
 		in
 		(match get_access ctx v, fix with
 		| ALocal (v,r), Prefix ->
 			unop r;
-			add_assign ctx v r;
 			r
 		| ALocal (v,r), Postfix ->
 			let r2 = alloc_tmp ctx (rtype ctx r) in
+			hold ctx r2;
 			op ctx (OMov (r2,r));
 			unop r;
-			add_assign ctx v r;
+			free ctx r2;
 			r2
 		| acc, _ ->
 			let ret = ref 0 in
@@ -2331,6 +2588,7 @@ and eval_expr ctx e =
 		let ret = jump_back ctx in
 		let j = jump_expr ctx cond false in
 		ignore(eval_expr ctx eloop);
+		set_curpos ctx (max_pos e);
 		ret();
 		j();
 		List.iter (fun f -> f (current_pos ctx)) ctx.m.mbreaks;
@@ -2350,6 +2608,7 @@ and eval_expr ctx e =
 		let j = jump_expr ctx cond false in
 		start();
 		ignore(eval_expr ctx eloop);
+		set_curpos ctx (max_pos e);
 		ret();
 		j();
 		List.iter (fun f -> f (current_pos ctx)) ctx.m.mbreaks;
@@ -2358,6 +2617,9 @@ and eval_expr ctx e =
 		ctx.m.mcontinues <- oldc;
 		ctx.m.mloop_trys <- oldtrys;
 		alloc_tmp ctx HVoid
+	| TCast ({ eexpr = TCast (v,None) },None) when not (is_number (to_type ctx e.etype)) ->
+        (* coalesce double casts into a single runtime check - temp fix for Map accesses *)
+        eval_expr ctx { e with eexpr = TCast(v,None) }
 	| TCast (v,None) ->
 		let t = to_type ctx e.etype in
 		let rv = eval_expr ctx v in
@@ -2396,13 +2658,13 @@ and eval_expr ctx e =
 		in
 		(match et with
 		| HI32 ->
-			array_bytes 2 HI32 "I32" (fun b i r -> OSetI32 (b,i,r))
+			array_bytes 2 HI32 "I32" (fun b i r -> OSetMem (b,i,r))
 		| HUI16 ->
 			array_bytes 1 HI32 "UI16" (fun b i r -> OSetUI16 (b,i,r))
 		| HF32 ->
-			array_bytes 2 HF32 "F32" (fun b i r -> OSetF32 (b,i,r))
+			array_bytes 2 HF32 "F32" (fun b i r -> OSetMem (b,i,r))
 		| HF64 ->
-			array_bytes 3 HF64 "F64" (fun b i r -> OSetF64 (b,i,r))
+			array_bytes 3 HF64 "F64" (fun b i r -> OSetMem (b,i,r))
 		| _ ->
 			let at = if is_dynamic et then et else HDyn in
 			let a = alloc_tmp ctx HArray in
@@ -2436,7 +2698,7 @@ and eval_expr ctx e =
 	| TMeta (_,e) ->
 		eval_expr ctx e
 	| TFor (v,it,loop) ->
-		eval_expr ctx (Codegen.for_remap ctx.com v it loop e.epos)
+		eval_expr ctx (Texpr.for_remap ctx.com.basic v it loop e.epos)
 	| TSwitch (en,cases,def) ->
 		let rt = to_type ctx e.etype in
 		let r = alloc_tmp ctx rt in
@@ -2478,18 +2740,53 @@ and eval_expr ctx e =
 				if rt <> HVoid then op ctx (OMov (r,re));
 				jends := jump ctx (fun i -> OJAlways i) :: !jends
 			) cases;
-			DynArray.set ctx.m.mops (switch_pos - 1) (OSwitch (ridx,indexes,current_pos ctx - switch_pos));
+			set_op ctx (switch_pos - 1) (OSwitch (ridx,indexes,current_pos ctx - switch_pos));
 			List.iter (fun j -> j()) (!jends);
 		with Exit ->
 			let jends = ref [] in
 			let rvalue = eval_expr ctx en in
 			let loop (cases,e) =
+				hold ctx rvalue;
 				let ok = List.map (fun c ->
-					hold ctx rvalue;
-					let r = eval_to ctx c (common_type ctx en c true c.epos) in
-					free ctx rvalue;
-					jump ctx (fun n -> OJEq (r,rvalue,n))
+					let ct = common_type ctx en c true c.epos in
+					match c.eexpr, ct with
+					| TConst (TString str), HObj { pname = "String" } ->
+						let jnull = jump ctx (fun n -> OJNull (rvalue,n)) in
+
+						(* compare len *)
+						let rlen = alloc_tmp ctx HI32 in
+						op ctx (OField (rlen, rvalue, 1));
+						hold ctx rlen;
+						let str, len = to_utf8 str c.epos in
+						let rlen2 = reg_int ctx len in
+						let jdiff = jump ctx (fun n -> OJNotEq (rlen, rlen2, n)) in
+						free ctx rlen;
+
+						(* compare data *)
+						let rbytes = alloc_tmp ctx HBytes in
+						op ctx (OField (rbytes, rvalue, 0));
+						hold ctx rbytes;
+						let rbytes2 = alloc_tmp ctx HBytes in
+						op ctx (OString (rbytes2,alloc_string ctx str));
+						let result = alloc_tmp ctx HI32 in
+						op ctx (OCall3 (result, alloc_std ctx "string_compare" [HBytes;HBytes;HI32] HI32,rbytes,rbytes2,rlen));
+						free ctx rbytes;
+
+						hold ctx result;
+						let zero = reg_int ctx 0 in
+						let jok = jump ctx (fun n -> OJEq (result, zero, n)) in
+						free ctx result;
+
+						jnull();
+						jdiff();
+						jok
+
+
+					| _ ->
+						let r = eval_to ctx c ct in
+						jump ctx (fun n -> OJEq (r,rvalue,n))
 				) cases in
+				free ctx rvalue;
 				(fun() ->
 					List.iter (fun f -> f()) ok;
 					let re = eval_to ctx e rt in
@@ -2509,20 +2806,28 @@ and eval_expr ctx e =
 		);
 		r
 	| TEnumParameter (ec,f,index) ->
-		let r = alloc_tmp ctx (match to_type ctx ec.etype with HEnum e -> let _,_,args = e.efields.(f.ef_index) in args.(index) | _ -> assert false) in
-		op ctx (OEnumField (r,eval_expr ctx ec,f.ef_index,index));
+		let pt, is_single = (match to_type ctx ec.etype with
+			| HEnum e ->
+				let _,_,args = e.efields.(f.ef_index) in
+				args.(index), Array.length e.efields = 1
+			| _ -> assert false
+		) in
+		let er = eval_expr ctx ec in
+		if is_single then op ctx (ONullCheck er); (* #7560 *)
+		let r = alloc_tmp ctx pt in
+		op ctx (OEnumField (r,er,f.ef_index,index));
 		cast_to ctx r (to_type ctx e.etype) e.epos
 	| TContinue ->
 		before_break_continue ctx;
 		let pos = current_pos ctx in
 		op ctx (OJAlways (-1)); (* loop *)
-		ctx.m.mcontinues <- (fun target -> DynArray.set ctx.m.mops pos (OJAlways (target - (pos + 1)))) :: ctx.m.mcontinues;
+		ctx.m.mcontinues <- (fun target -> set_op ctx pos (OJAlways (target - (pos + 1)))) :: ctx.m.mcontinues;
 		alloc_tmp ctx HVoid
 	| TBreak ->
 		before_break_continue ctx;
 		let pos = current_pos ctx in
 		op ctx (OJAlways (-1)); (* loop *)
-		ctx.m.mbreaks <- (fun target -> DynArray.set ctx.m.mops pos (OJAlways (target - (pos + 1)))) :: ctx.m.mbreaks;
+		ctx.m.mbreaks <- (fun target -> set_op ctx pos (OJAlways (target - (pos + 1)))) :: ctx.m.mbreaks;
 		alloc_tmp ctx HVoid
 	| TTry (etry,catches) ->
 		let pos = current_pos ctx in
@@ -2536,7 +2841,7 @@ and eval_expr ctx e =
 		ctx.m.mtrys <- ctx.m.mtrys - 1;
 		op ctx (OEndTrap true);
 		let j = jump ctx (fun n -> OJAlways n) in
-		DynArray.set ctx.m.mops pos (OTrap (rtrap, current_pos ctx - (pos + 1)));
+		set_op ctx pos (OTrap (rtrap, current_pos ctx - (pos + 1)));
 		let rec loop l =
 			match l with
 			| [] ->
@@ -2544,7 +2849,7 @@ and eval_expr ctx e =
 				[]
 			| (v,ec) :: next ->
 				let rv = alloc_var ctx v true in
-				let jnext = if v.v_type == t_dynamic then begin
+				let jnext = if follow v.v_type == t_dynamic then begin
 					op ctx (OMov (rv, rtrap));
 					(fun() -> ())
 				end else
@@ -2560,12 +2865,12 @@ and eval_expr ctx e =
 					let rb = alloc_tmp ctx HBool in
 					op ctx (OCall2 (rb, alloc_fun_path ctx (["hl"],"BaseType") "check",r,rtrap));
 					let jnext = jump ctx (fun n -> OJFalse (rb,n)) in
-					op ctx (OMov (rv, unsafe_cast_to ctx rtrap (to_type ctx v.v_type) ec.epos));
+					op ctx (OMov (rv, unsafe_cast_to ~debugchk:false ctx rtrap (to_type ctx v.v_type) ec.epos));
 					jnext
 				in
 				let r = eval_expr ctx ec in
 				if tret <> HVoid then op ctx (OMov (result,cast_to ctx r tret ec.epos));
-				if v.v_type == t_dynamic then [] else
+				if follow v.v_type == t_dynamic then [] else
 				let jend = jump ctx (fun n -> OJAlways n) in
 				jnext();
 				jend :: loop next
@@ -2578,12 +2883,29 @@ and eval_expr ctx e =
 	| TCast (ev,Some _) ->
 		let t = to_type ctx e.etype in
 		let re = eval_expr ctx ev in
-		let r = alloc_tmp ctx t in
+		let rt = alloc_tmp ctx t in
 		if safe_cast (rtype ctx re) t then
-			op ctx (OMov (r,re))
-		else
-			op ctx (OSafeCast (r,re));
-		r
+			op ctx (OMov (rt,re))
+		else (match Abstract.follow_with_abstracts e.etype with
+		| TInst({ cl_interface = true } as c,_) ->
+			hold ctx re;
+			let c = eval_to ctx { eexpr = TTypeExpr(TClassDecl c); epos = e.epos; etype = t_dynamic } (class_type ctx ctx.base_type [] false) in
+			hold ctx c;
+			let rb = alloc_tmp ctx HBool in
+			op ctx (OCall2 (rb, alloc_fun_path ctx (["hl"],"BaseType") "check",c,re));
+			let jnext = jump ctx (fun n -> OJTrue (rb,n)) in
+			let jnext2 = jump ctx (fun n -> OJNull (re,n)) in
+			op ctx (OThrow (make_string ctx "Cast error" e.epos));
+			jnext();
+			jnext2();
+			op ctx (OMov (rt, unsafe_cast_to ~debugchk:false ctx re (to_type ctx e.etype) e.epos));
+			free ctx c;
+			free ctx re;
+		| _ ->
+			op ctx (OSafeCast (rt,re)));
+		rt
+	| TIdent s ->
+		abort ("Unbound identifier " ^ s) e.epos
 
 and gen_assign_op ctx acc e1 f =
 	let f r =
@@ -2680,14 +3002,15 @@ and gen_assign_op ctx acc e1 f =
 		r
 	| ADynamic (eobj, fid) ->
 		let robj = eval_null_check ctx eobj in
+		hold ctx robj;
 		let t = real_type ctx e1 in
 		let r = alloc_tmp ctx t in
 		op ctx (ODynGet (r,robj,fid));
-		hold ctx robj;
 		let r = cast_to ctx r (to_type ctx e1.etype) e1.epos in
 		let r = f r in
+		let r = cast_to ctx r t e1.epos in
 		free ctx robj;
-		op ctx (ODynSet (robj,fid,cast_to ctx r t e1.epos));
+		op ctx (ODynSet (robj,fid,r));
 		r
 	| ANone | ALocal _ | AStaticFun _ | AInstanceFun _ | AInstanceProto _ | AVirtualMethod _ | AEnum _ ->
 		assert false
@@ -2755,7 +3078,7 @@ and gen_method_wrapper ctx rt t p =
 			hold ctx r;
 			r
 		) targs in
-		let casts = List.map2 (fun r t -> let r2 = cast_to ctx r t p in hold ctx r2; free ctx r; r2) rargs iargs in
+		let casts = List.map2 (fun r t -> let r2 = cast_to ~force:true ctx r t p in hold ctx r2; free ctx r; r2) rargs iargs in
 		List.iter (free ctx) casts;
 		let rret = alloc_tmp ctx iret in
 		op ctx (OCallClosure (rret,rfun,casts));
@@ -2767,10 +3090,10 @@ and gen_method_wrapper ctx rt t p =
 			regs = DynArray.to_array ctx.m.mregs.arr;
 			code = DynArray.to_array ctx.m.mops;
 			debug = make_debug ctx ctx.m.mdebug;
+			assigns = Array.of_list (List.rev ctx.m.massign);
 		} in
 		ctx.m <- old;
 		DynArray.add ctx.cfunctions f;
-		DynArray.add ctx.cdebug_assigns [||];
 		fid
 
 and make_fun ?gen_content ctx name fidx f cthis cparent =
@@ -2808,7 +3131,7 @@ and make_fun ?gen_content ctx name fidx f cthis cparent =
 	let args = List.map (fun (v,o) ->
 		let t = to_type ctx v.v_type in
 		let r = alloc_var ctx (if o = None then v else { v with v_type = if not (is_nullable t) then TAbstract(ctx.ref_abstract,[v.v_type]) else v.v_type }) true in
-		add_assign ctx v r;
+		add_assign ctx v; (* record var name *)
 		rtype ctx r
 	) f.tf_args in
 
@@ -2831,65 +3154,66 @@ and make_fun ?gen_content ctx name fidx f cthis cparent =
 		let vt = to_type ctx v.v_type in
 		let capt = captured_index ctx v in
 		(match o with
-		| None | Some TNull -> ()
+		| None | Some {eexpr = TConst TNull} -> ()
 		| Some c when not (is_nullable vt) ->
 			(* if optional but not null, turn into a not nullable here *)
 			let j = jump ctx (fun n -> OJNotNull (r,n)) in
 			let t = alloc_tmp ctx vt in
 			(match vt with
-			| HUI8 | HUI16 | HI32 ->
-				(match c with
-				| TInt i -> op ctx (OInt (t,alloc_i32 ctx i))
-				| TFloat s -> op ctx (OInt (t,alloc_i32 ctx  (Int32.of_float (float_of_string s))))
+			| HUI8 | HUI16 | HI32 | HI64 ->
+				(match c.eexpr with
+				| TConst (TInt i) -> op ctx (OInt (t,alloc_i32 ctx i))
+				| TConst (TFloat s) -> op ctx (OInt (t,alloc_i32 ctx  (Int32.of_float (float_of_string s))))
 				| _ -> assert false)
 			| HF32 | HF64 ->
-				(match c with
-				| TInt i -> op ctx (OFloat (t,alloc_float ctx (Int32.to_float i)))
-				| TFloat s -> op ctx (OFloat (t,alloc_float ctx  (float_of_string s)))
+				(match c.eexpr with
+				| TConst (TInt i) -> op ctx (OFloat (t,alloc_float ctx (Int32.to_float i)))
+				| TConst (TFloat s) -> op ctx (OFloat (t,alloc_float ctx  (float_of_string s)))
 				| _ -> assert false)
 			| HBool ->
-				(match c with
-				| TBool b -> op ctx (OBool (t,b))
+				(match c.eexpr with
+				| TConst (TBool b) -> op ctx (OBool (t,b))
 				| _ -> assert false)
 			| _ ->
 				assert false);
-			if capt = None then add_assign ctx v t;
+			if capt = None then add_assign ctx v;
 			let jend = jump ctx (fun n -> OJAlways n) in
 			j();
 			op ctx (OUnref (t,r));
-			if capt = None then add_assign ctx v t;
+			if capt = None then add_assign ctx v;
 			jend();
 			Hashtbl.replace ctx.m.mvars v.v_id t;
 			free ctx r;
 			hold ctx t
 		| Some c ->
 			let j = jump ctx (fun n -> OJNotNull (r,n)) in
-			(match c with
-			| TNull | TThis | TSuper -> assert false
-			| TInt i when (match to_type ctx (follow v.v_type) with HUI8 | HUI16 | HI32 | HDyn -> true | _ -> false) ->
+			(match c.eexpr with
+			| TConst (TNull | TThis | TSuper) -> assert false
+			| TConst (TInt i) when (match to_type ctx (Abstract.follow_with_abstracts v.v_type) with HUI8 | HUI16 | HI32 | HI64 | HDyn -> true | _ -> false) ->
 				let tmp = alloc_tmp ctx HI32 in
 				op ctx (OInt (tmp, alloc_i32 ctx i));
 				op ctx (OToDyn (r, tmp));
-			| TFloat s when (match to_type ctx (follow v.v_type) with HUI8 | HUI16 | HI32 -> true | _ -> false) ->
+			| TConst (TFloat s) when (match to_type ctx (Abstract.follow_with_abstracts v.v_type) with HUI8 | HUI16 | HI32 | HI64 -> true | _ -> false) ->
 				let tmp = alloc_tmp ctx HI32 in
 				op ctx (OInt (tmp, alloc_i32 ctx (Int32.of_float (float_of_string s))));
 				op ctx (OToDyn (r, tmp));
-			| TInt i ->
+			| TConst (TInt i) ->
 				let tmp = alloc_tmp ctx HF64 in
 				op ctx (OFloat (tmp, alloc_float ctx (Int32.to_float i)));
 				op ctx (OToDyn (r, tmp));
-			| TFloat s ->
+			| TConst (TFloat s) ->
 				let tmp = alloc_tmp ctx HF64 in
 				op ctx (OFloat (tmp, alloc_float ctx (float_of_string s)));
 				op ctx (OToDyn (r, tmp));
-			| TBool b ->
+			| TConst (TBool b) ->
 				let tmp = alloc_tmp ctx HBool in
 				op ctx (OBool (tmp, b));
 				op ctx (OToDyn (r, tmp));
-			| TString s ->
+			| TConst (TString s) ->
 				op ctx (OMov (r, make_string ctx s f.tf_expr.epos))
+			| _ ->
+				op ctx (OMov (r, eval_to ctx c vt))
 			);
-			if capt = None then add_assign ctx v r;
 			j();
 		);
 		(match capt with
@@ -2912,56 +3236,72 @@ and make_fun ?gen_content ctx name fidx f cthis cparent =
 		| TReturn _ -> false
 		| _ -> true
 	in
+	set_curpos ctx (max_pos f.tf_expr);
 	if tret = HVoid then
 		op ctx (ORet (alloc_tmp ctx HVoid))
 	else if has_final_jump f.tf_expr then begin
 		let r = alloc_tmp ctx tret in
 		(match tret with
-		| HI32 | HUI8 | HUI16 -> op ctx (OInt (r,alloc_i32 ctx 0l))
+		| HI32 | HUI8 | HUI16 | HI64 -> op ctx (OInt (r,alloc_i32 ctx 0l))
 		| HF32 | HF64 -> op ctx (OFloat (r,alloc_float ctx 0.))
 		| HBool -> op ctx (OBool (r,false))
 		| _ -> op ctx (ONull r));
 		op ctx (ORet r)
 	end;
 	let fargs = (match tthis with None -> [] | Some t -> [t]) @ (match rcapt with None -> [] | Some r -> [rtype ctx r]) @ args in
-	let f = {
+	let hlf = {
 		fpath = name;
 		findex = fidx;
 		ftype = HFun (fargs, tret);
 		regs = DynArray.to_array ctx.m.mregs.arr;
 		code = DynArray.to_array ctx.m.mops;
 		debug = make_debug ctx ctx.m.mdebug;
+		assigns = Array.of_list (List.rev ctx.m.massign);
 	} in
-	let assigns = Array.of_list (List.rev ctx.m.massign) in
 	ctx.m <- old;
 	Hashtbl.add ctx.defined_funs fidx ();
-	let f = if ctx.optimize then Hlopt.optimize ctx.dump_out f else f in
+	let f = if ctx.optimize && (gen_content = None || name <> ("","")) then begin
+		let t = Timer.timer ["generate";"hl";"opt"] in
+		let f = Hlopt.optimize ctx.dump_out (DynArray.get ctx.cstrings.arr) hlf f in
+		t();
+		f
+	end else
+		hlf
+	in
 	DynArray.add ctx.cfunctions f;
-	DynArray.add ctx.cdebug_assigns assigns;
 	capt
 
 let generate_static ctx c f =
 	match f.cf_kind with
 	| Var _ ->
 		()
-	| Method _ when Meta.has Meta.Extern f.cf_meta ->
+	| Method _ when has_class_field_flag f CfExtern ->
 		()
 	| Method m ->
 		let add_native lib name =
-			ignore(lookup ctx.cnatives (name ^ "@" ^ lib) (fun() ->
-				let fid = alloc_fid ctx c f in
+			let fid = alloc_fid ctx c f in
+			ignore(lookup ctx.cnatives (name ^ "@" ^ lib,fid) (fun() ->
 				Hashtbl.add ctx.defined_funs fid ();
 				(alloc_string ctx lib, alloc_string ctx name,to_type ctx f.cf_type,fid)
 			));
 		in
 		let rec loop = function
-			| (Meta.Custom ":hlNative",[(EConst(String(lib)),_);(EConst(String(name)),_)] ,_ ) :: _ ->
+			| (Meta.HlNative,[(EConst(String(lib,_)),_);(EConst(String(name,_)),_)] ,_ ) :: _ ->
 				add_native lib name
-			| (Meta.Custom ":hlNative",[(EConst(String(lib)),_)] ,_ ) :: _ ->
+			| (Meta.HlNative,[(EConst(String(lib,_)),_)] ,_ ) :: _ ->
 				add_native lib f.cf_name
-			| (Meta.Custom ":hlNative",[] ,_ ) :: _ ->
+			| (Meta.HlNative,[(EConst(Float(ver)),_)] ,_ ) :: _ ->
+				let cur_ver = (try Common.raw_defined_value ctx.com "hl-ver" with Not_found -> "") in
+				if cur_ver < ver then
+					let gen_content() =
+						op ctx (OThrow (make_string ctx ("Requires compiling with -D hl-ver=" ^ ver ^ ".0 or higher") null_pos));
+					in
+					ignore(make_fun ctx ~gen_content (s_type_path c.cl_path,f.cf_name) (alloc_fid ctx c f) (match f.cf_expr with Some { eexpr = TFunction f } -> f | _ -> abort "Missing function body" f.cf_pos) None None)
+				else
 				add_native "std" f.cf_name
-			| (Meta.Custom ":hlNative",_ ,p) :: _ ->
+			| (Meta.HlNative,[] ,_ ) :: _ ->
+				add_native "std" f.cf_name
+			| (Meta.HlNative,_ ,p) :: _ ->
 				abort "Invalid @:hlNative decl" p
 			| [] ->
 				ignore(make_fun ctx (s_type_path c.cl_path,f.cf_name) (alloc_fid ctx c f) (match f.cf_expr with Some { eexpr = TFunction f } -> f | _ -> abort "Missing function body" f.cf_pos) None None)
@@ -2979,7 +3319,7 @@ let rec generate_member ctx c f =
 		let gen_content = if f.cf_name <> "new" then None else Some (fun() ->
 
 			let o = (match class_type ctx c (List.map snd c.cl_params) false with
-				| HObj o -> o
+				| HObj o | HStruct o -> o
 				| _ -> assert false
 			) in
 
@@ -3017,7 +3357,7 @@ let generate_type ctx t =
 		List.iter (fun f ->
 			List.iter (fun (name,args,pos) ->
 				match name with
-				| Meta.Custom ":hlNative" -> generate_static ctx c f
+				| Meta.HlNative -> generate_static ctx c f
 				| _ -> ()
 			) f.cf_meta
 		) c.cl_ordered_statics
@@ -3025,7 +3365,22 @@ let generate_type ctx t =
 		List.iter (generate_static ctx c) c.cl_ordered_statics;
 		(match c.cl_constructor with
 		| None -> ()
-		| Some f -> generate_member ctx c f);
+		| Some f ->
+			let merge_inits e =
+				match e with
+				| Some ({ eexpr = TFunction ({ tf_expr = { eexpr = TBlock el } as ef } as f) } as e) ->
+					let merge ei =
+						let rec loop ei =
+							let ei = Type.map_expr loop ei in
+							{ ei with epos = e.epos }
+						in
+						if ei.epos.pmin < e.epos.pmin || ei.epos.pmax > e.epos.pmax then loop ei else ei
+					in
+					Some { e with eexpr = TFunction({ f with tf_expr = { ef with eexpr = TBlock (List.map merge el) }}) }
+				| _ ->
+					e
+ 			in
+			generate_member ctx c { f with cf_expr = merge_inits f.cf_expr });
 		List.iter (generate_member ctx c) c.cl_ordered_fields;
 	| TEnumDecl _ | TTypeDecl _ | TAbstractDecl _ ->
 		()
@@ -3125,7 +3480,7 @@ let generate_static_init ctx types main =
 					op ctx (OSetGlobal (g, rt));
 				end;
 
-				(match Codegen.build_metadata ctx.com (TClassDecl c) with
+				(match Texpr.build_metadata ctx.com.basic (TClassDecl c) with
 				| None -> ()
 				| Some e ->
 					let r = eval_to ctx e HDyn in
@@ -3171,7 +3526,7 @@ let generate_static_init ctx types main =
 						op ctx (OSetGlobal (g,r));
 				) e.e_names;
 
-				(match Codegen.build_metadata ctx.com (TEnumDecl e) with
+				(match Texpr.build_metadata ctx.com.basic (TEnumDecl e) with
 				| None -> ()
 				| Some e -> op ctx (OSetField (r,index "__meta__",eval_to ctx e HDyn)));
 
@@ -3210,10 +3565,11 @@ let generate_static_init ctx types main =
 		) types;
 	in
 	(* init class statics *)
+	let init_exprs = ref [] in
 	List.iter (fun t ->
+		(match t with TClassDecl { cl_init = Some e } -> init_exprs := e :: !init_exprs | _ -> ());
 		match t with
 		| TClassDecl c when not c.cl_extern ->
-			(match c.cl_init with None -> () | Some e -> exprs := e :: !exprs);
 			List.iter (fun f ->
 				match f.cf_kind, f.cf_expr with
 				| Var _, Some e ->
@@ -3230,7 +3586,8 @@ let generate_static_init ctx types main =
 	| None -> ()
 	| Some e -> exprs := e :: !exprs);
 	let fid = lookup_alloc ctx.cfids () in
-	ignore(make_fun ~gen_content ctx ("","") fid { tf_expr = mk (TBlock (List.rev !exprs)) t_void null_pos; tf_args = []; tf_type = t_void } None None);
+	let exprs = List.rev !init_exprs @ List.rev !exprs in
+	ignore(make_fun ~gen_content ctx ("","") fid { tf_expr = mk (TBlock exprs) t_void null_pos; tf_args = []; tf_type = t_void } None None);
 	fid
 
 (* --------------------------------------------------------------------------------------------------------------------- *)
@@ -3282,7 +3639,7 @@ let write_code ch code debug =
 		let oid = Obj.tag o in
 
 		match op with
-		| OLabel _ | ONop _ ->
+		| OLabel _ | ONop _ | OAssert _ ->
 			byte oid
 		| OCall2 (r,g,a,b) ->
 			byte oid;
@@ -3354,7 +3711,7 @@ let write_code ch code debug =
 				assert false
 	in
 
-	IO.nwrite ch "HLB";
+	IO.nwrite_string ch "HLB";
 	byte code.version;
 
 	let flags = ref 0 in
@@ -3364,10 +3721,12 @@ let write_code ch code debug =
 	write_index (Array.length code.ints);
 	write_index (Array.length code.floats);
 	write_index (Array.length code.strings);
+	if code.version >= 5 then write_index (Array.length code.bytes);
 	write_index (Array.length all_types);
 	write_index (Array.length code.globals);
 	write_index (Array.length code.natives);
 	write_index (Array.length code.functions);
+	write_index (Array.length code.constants);
 	write_index code.entrypoint;
 
 	Array.iter (IO.write_real_i32 ch) code.ints;
@@ -3382,6 +3741,19 @@ let write_code ch code debug =
 	in
 	write_strings code.strings;
 
+	let write_bytes bytes =
+		let bytes_length = ref 0 in
+		Array.iter (fun b -> bytes_length := !bytes_length + Bytes.length b) bytes;
+		IO.write_i32 ch !bytes_length;
+		Array.iter (IO.nwrite ch) bytes;
+		let bytes_pos = ref 0 in
+		Array.iter (fun b ->
+			write_index (!bytes_pos);
+			bytes_pos := !bytes_pos + Bytes.length b
+		) bytes;
+	in
+	if code.version >= 5 then write_bytes code.bytes;
+
 	if debug then begin
 		write_index (Array.length code.debugfiles);
 		write_strings code.debugfiles;
@@ -3393,20 +3765,21 @@ let write_code ch code debug =
 		| HUI8 -> byte 1
 		| HUI16 -> byte 2
 		| HI32 -> byte 3
-		| HF32 -> byte 4
-		| HF64 -> byte 5
-		| HBool -> byte 6
-		| HBytes -> byte 7
-		| HDyn -> byte 8
-		| HFun (args,ret) ->
+		| HI64 -> byte 4
+		| HF32 -> byte 5
+		| HF64 -> byte 6
+		| HBool -> byte 7
+		| HBytes -> byte 8
+		| HDyn -> byte 9
+		| HFun (args,ret) | HMethod (args,ret) ->
 			let n = List.length args in
 			if n > 0xFF then assert false;
-			byte 9;
+			byte (match t with HFun _ -> 10 | _ -> 20);
 			byte n;
 			List.iter write_type args;
 			write_type ret
-		| HObj p ->
-			byte 10;
+		| HObj p | HStruct p ->
+			byte (if is_struct t then 21 else 11);
 			write_index p.pid;
 			(match p.psuper with
 			| None -> write_index (-1)
@@ -3421,23 +3794,23 @@ let write_code ch code debug =
 			Array.iter (fun f -> write_index f.fid; write_index f.fmethod; write_index (match f.fvirtual with None -> -1 | Some i -> i)) p.pproto;
 			List.iter (fun (fid,fidx) -> write_index fid; write_index fidx) p.pbindings;
 		| HArray ->
-			byte 11
-		| HType ->
 			byte 12
+		| HType ->
+			byte 13
 		| HRef t ->
-			byte 13;
+			byte 14;
 			write_type t
 		| HVirtual v ->
-			byte 14;
+			byte 15;
 			write_index (Array.length v.vfields);
 			Array.iter (fun (_,sid,t) -> write_index sid; write_type t) v.vfields
 		| HDynObj ->
-			byte 15
+			byte 16
 		| HAbstract (_,i) ->
-			byte 16;
+			byte 17;
 			write_index i
 		| HEnum e ->
-			byte 17;
+			byte 18;
 			write_index e.eid;
 			(match e.eglobal with
 			| None -> write_index 0
@@ -3450,7 +3823,7 @@ let write_code ch code debug =
 				Array.iter write_type tl;
 			) e.efields
 		| HNull t ->
-			byte 18;
+			byte 19;
 			write_type t
 	) all_types;
 
@@ -3511,8 +3884,20 @@ let write_code ch code debug =
 		write_index (Array.length f.code);
 		Array.iter write_type f.regs;
 		Array.iter write_op f.code;
-		if debug then write_debug_infos f.debug;
-	) code.functions
+		if debug then begin
+			write_debug_infos f.debug;
+			write_index (Array.length f.assigns);
+			Array.iter (fun (i,p) ->
+				write_index i;
+				write_index (p + 1);
+			) f.assigns;
+		end;
+	) code.functions;
+	Array.iter (fun (g,fields) ->
+		write_index g;
+		write_index (Array.length fields);
+		Array.iter write_index fields;
+	) code.constants
 
 (* --------------------------------------------------------------------------------------------------------------------- *)
 
@@ -3543,9 +3928,11 @@ let create_context com is_macro dump =
 		m = method_context 0 HVoid null_capture false;
 		cints = new_lookup();
 		cstrings = new_lookup();
+		cbytes = new_lookup();
 		cfloats = new_lookup();
 		cglobals = new_lookup();
 		cnatives = new_lookup();
+		cconstants = new_lookup();
 		cfunctions = DynArray.create();
 		overrides = Hashtbl.create 0;
 		cached_types = PMap.empty;
@@ -3568,13 +3955,13 @@ let create_context com is_macro dump =
 		core_type = get_class "CoreType";
 		core_enum = get_class "CoreEnum";
 		ref_abstract = get_abstract "Ref";
-		anons_cache = [];
+		anons_cache = PMap.empty;
 		rec_cache = [];
 		method_wrappers = PMap.empty;
 		cdebug_files = new_lookup();
 		macro_typedefs = Hashtbl.create 0;
-		cdebug_locals = new_lookup();
-		cdebug_assigns = DynArray.create();
+		ct_delayed = [];
+		ct_depth = 0;
 	} in
 	ignore(alloc_string ctx "");
 	ignore(class_type ctx ctx.base_class [] false);
@@ -3596,20 +3983,20 @@ let add_types ctx types =
 			in
 			if not ctx.is_macro then List.iter (fun f -> ignore(loop c.cl_super f)) c.cl_overrides;
 			List.iter (fun (m,args,p) ->
-				if m = Meta.Custom ":hlNative" then
+				if m = Meta.HlNative then
 					let lib, prefix = (match args with
-					| [(EConst (String lib),_)] -> lib, ""
-					| [(EConst (String lib),_);(EConst (String p),_)] -> lib, p
+					| [(EConst (String(lib,_)),_)] -> lib, ""
+					| [(EConst (String(lib,_)),_);(EConst (String(p,_)),_)] -> lib, p
 					| _ -> abort "hlNative on class requires library name" p
 					) in
 					(* adds :hlNative for all empty methods *)
 					List.iter (fun f ->
 						match f.cf_kind with
-						| Method MethNormal when not (List.exists (fun (m,_,_) -> m = Meta.Custom ":hlNative") f.cf_meta) ->
+						| Method MethNormal when not (List.exists (fun (m,_,_) -> m = Meta.HlNative) f.cf_meta) ->
 							(match f.cf_expr with
 							| Some { eexpr = TFunction { tf_expr = { eexpr = TBlock ([] | [{ eexpr = TReturn (Some { eexpr = TConst _ })}]) } } } | None ->
 								let name = prefix ^ String.lowercase (Str.global_replace (Str.regexp "[A-Z]+") "_\\0" f.cf_name) in
-								f.cf_meta <- (Meta.Custom ":hlNative", [(EConst (String lib),p);(EConst (String name),p)], p) :: f.cf_meta;
+								f.cf_meta <- (Meta.HlNative, [(EConst (String(lib,SDoubleQuotes)),p);(EConst (String(name,SDoubleQuotes)),p)], p) :: f.cf_meta;
 							| _ -> ())
 						| _ -> ()
 					) c.cl_ordered_statics
@@ -3620,16 +4007,19 @@ let add_types ctx types =
 
 let build_code ctx types main =
 	let ep = generate_static_init ctx types main in
+	let bytes = DynArray.to_array ctx.cbytes.arr in
 	{
-		version = 1;
+		version = if Array.length bytes = 0 then 4 else 5;
 		entrypoint = ep;
 		strings = DynArray.to_array ctx.cstrings.arr;
+		bytes = bytes;
 		ints = DynArray.to_array ctx.cints.arr;
 		floats = DynArray.to_array ctx.cfloats.arr;
 		globals = DynArray.to_array ctx.cglobals.arr;
 		natives = DynArray.to_array ctx.cnatives.arr;
 		functions = DynArray.to_array ctx.cfunctions;
 		debugfiles = DynArray.to_array ctx.cdebug_files.arr;
+		constants = DynArray.to_array ctx.cconstants.arr;
 	}
 
 let check ctx =
@@ -3649,7 +4039,7 @@ let generate com =
 		Hlcode.dump (fun s -> output_string ch (s ^ "\n")) code;
 		close_out ch;
 	end;
-	if Common.raw_defined com "hl-dump-spec" then begin
+	(*if Common.raw_defined com "hl-dump-spec" then begin
 		let ch = open_out_bin "dump/hlspec.txt" in
 		let write s = output_string ch (s ^ "\n") in
 		Array.iter (fun f ->
@@ -3659,12 +4049,12 @@ let generate com =
 			write "";
 		) code.functions;
 		close_out ch;
-	end;
+	end;*)
 	if Common.raw_defined com "hl-check" then begin
 		check ctx;
 		Hlinterp.check code false;
 	end;
-	let t = Common.timer ["write";"hl"] in
+	let t = Timer.timer ["generate";"hl";"write"] in
 
 	let escape_command s =
 		let b = Buffer.create 0 in
@@ -3673,47 +4063,30 @@ let generate com =
 	in
 
 	if file_extension com.file = "c" then begin
-		Hl2c.write_c com com.file code;
-		let t = Common.timer ["nativecompile";"hl"] in
+		let gnames = Array.create (Array.length code.globals) "" in
+		PMap.iter (fun n i -> gnames.(i) <- n) ctx.cglobals.map;
+		Hl2c.write_c com com.file code gnames;
+		let t = Timer.timer ["nativecompile";"hl"] in
 		if not (Common.defined com Define.NoCompilation) && com.run_command ("haxelib run hashlink build " ^ escape_command com.file) <> 0 then failwith "Build failed";
 		t();
 	end else begin
 		let ch = IO.output_string() in
-		write_code ch code true;
+		write_code ch code (not (Common.raw_defined com "hl-no-debug"));
 		let str = IO.close_out ch in
 		let ch = open_out_bin com.file in
 		output_string ch str;
 		close_out ch;
-(*
-		let ch = IO.output_string() in
-		let byte = IO.write_byte ch in
-		let write_index = write_index_gen byte in
-		write_index (DynArray.length ctx.cdebug_locals.arr);
-		DynArray.iter (fun s ->
-			write_index (String.length s);
-			IO.write_string ch s;
-		) ctx.cdebug_locals.arr;
-		write_index (DynArray.length ctx.cdebug_assigns);
-		DynArray.iter (fun a ->
-			write_index (Array.length a);
-			Array.iter (fun (i,p,r) ->
-				write_index i;
-				write_index p;
-				write_index r;
-			) a;
-		) ctx.cdebug_assigns;
-		let str = IO.close_out ch in
-		let dbg = open_out_bin (com.file ^ "d") in
-		output_string dbg str;
-		close_out dbg; *)
 	end;
+	Hlopt.clean_cache();
 	t();
 	if Common.raw_defined com "run" then begin
 		if com.run_command ("haxelib run hashlink run " ^ escape_command com.file) <> 0 then failwith "Failed to run HL";
 	end;
 	if Common.defined com Define.Interp then
 		try
+			let t = Timer.timer ["generate";"hl";"interp"] in
 			let ctx = Hlinterp.create true in
 			Hlinterp.add_code ctx code;
+			t();
 		with
 			Failure msg -> abort msg null_pos
diff --git a/src/generators/genhxold.ml b/src/generators/genhxold.ml
new file mode 100644
index 0000000000000000000000000000000000000000..9a32668200c186d6cbe8d4527ed9dfc86db3abdf
--- /dev/null
+++ b/src/generators/genhxold.ml
@@ -0,0 +1,303 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open Ast
+open Type
+open Common
+open ExtString
+
+let rec create_dir acc = function
+	| [] -> ()
+	| d :: l ->
+		let path = acc ^ "/" ^ d in
+		(try Unix.mkdir path 0o777 with _ -> ());
+		create_dir path l
+
+
+let conv_path p =
+	match List.rev (fst p) with
+	| x :: l when starts_with x '_' -> List.rev (("priv" ^ x) :: l), snd p
+	| _ -> p
+
+let get_real_path meta path =
+	try
+		let real_path = match Meta.get Meta.RealPath meta with
+			| (_,[(EConst(String(s,_)),_)],_) ->
+				s
+			| _ -> raise Not_found
+		in
+		match List.rev (String.nsplit real_path ".") with
+			| name :: pack ->
+				(List.rev pack), name
+			| _ -> raise Not_found
+	with | Not_found ->
+		path
+
+let generate_type com t =
+	let base_path = "hxclasses" in
+	match t with TClassDecl { cl_kind = KAbstractImpl _ } -> () | _ ->
+	let pack, name =
+		let info = t_infos t in
+		get_real_path info.mt_meta info.mt_path
+	in
+	create_dir "." (base_path :: pack);
+	match pack, name with
+	| ["flash";"net"], "NetStreamPlayTransitions"
+	| ["flash";"filters"], "BitmapFilterQuality"
+	| ["flash";"display"], ("BitmapDataChannel" | "GraphicsPathCommand")  -> ()
+	| _ ->
+	let f = open_out_bin (base_path ^ "/" ^ (match pack with [] -> "" | l -> String.concat "/" l ^ "/") ^ name ^ ".hx") in
+	let ch = IO.output_channel f in
+	let p fmt = IO.printf ch fmt in
+	if pack <> [] then IO.printf ch "package %s;\n\n" (String.concat "." pack);
+	let rec notnull t =
+		match t with
+		| TMono r ->
+			(match !r with
+			| None -> t
+			| Some t -> notnull t)
+		| TLazy f ->
+			notnull (lazy_type f)
+		| TAbstract ({ a_path = [],"Null" },[t]) ->
+			t
+		| _ ->
+			t
+	in
+	let rec path meta p tl =
+		let p = conv_path (get_real_path meta p) in
+		(if fst p = pack then snd p else s_type_path p) ^ (match tl with [] -> "" | _ -> "<" ^ String.concat "," (List.map stype tl) ^ ">")
+	and stype t =
+		match t with
+		| TMono r ->
+			(match !r with
+			| None -> "Unknown"
+			| Some t -> stype t)
+		| TInst ({ cl_kind = KTypeParameter _ } as c,tl) ->
+			path [] ([],snd c.cl_path) tl
+		| TInst (c,tl) ->
+			path c.cl_meta c.cl_path tl
+		| TEnum (e,tl) ->
+			path e.e_meta e.e_path tl
+		| TType (t,tl) ->
+			path t.t_meta t.t_path tl
+		| TAbstract (a,tl) ->
+			path a.a_meta a.a_path tl
+		| TAnon a ->
+			let fields = PMap.fold (fun f acc -> (f.cf_name ^ " : " ^ stype f.cf_type) :: acc) a.a_fields [] in
+			"{" ^ String.concat ", " fields ^ "}"
+		| TLazy f ->
+			stype (lazy_type f)
+		| TDynamic t2 ->
+			if t == t2 then "Dynamic" else "Dynamic<" ^ stype t2 ^ ">"
+		| TFun ([],ret) ->
+			"Void -> " ^ ftype ret
+		| TFun (args,ret) ->
+			String.concat " -> " (List.map (fun (_,_,t) -> ftype t) args) ^ " -> " ^ ftype ret
+	and ftype t =
+		match t with
+		| TMono r ->
+			(match !r with
+			| None -> stype t
+			| Some t -> ftype t)
+		| TLazy f ->
+			ftype (lazy_type f)
+		| TFun _ ->
+			"(" ^ stype t ^ ")"
+		| _ ->
+			stype t
+	in
+	let sparam (n,v,t) =
+		match v with
+		| None ->
+			n ^ " : " ^ stype t
+		| Some (Ident "null") ->
+			if is_nullable (notnull t) then
+				"?" ^ n ^ " : " ^ stype (notnull t)
+			else
+				(* we have not found a default value stored in metadata, let's generate it *)
+				n ^ " : " ^ stype t ^ " = " ^ (match follow t with
+					| TAbstract ({ a_path = [],("Int"|"Float"|"UInt") },_) -> "0"
+					| TAbstract ({ a_path = [],"Bool" },_) -> "false"
+					| _ -> "null")
+		| Some v ->
+			n ^ " : " ^ stype t ^ " = " ^ (match s_constant v with "nan" -> "0./*NaN*/" | v -> v)
+	in
+	let print_meta ml =
+		List.iter (fun (m,pl,_) ->
+			match m with
+			| Meta.DefParam | Meta.CoreApi | Meta.Used | Meta.MaybeUsed | Meta.FlatEnum | Meta.Value | Meta.DirectlyUsed | Meta.Enum | Meta.Impl -> ()
+			| _ ->
+			match pl with
+			| [] -> p "@%s " (Meta.to_string m)
+			| l -> p "@%s(%s) " (Meta.to_string m) (String.concat "," (List.map Ast.Printer.s_expr pl))
+		) ml
+	in
+	let access is_read a = s_access is_read a in
+	let rec print_field stat f =
+		p "\t";
+		print_meta f.cf_meta;
+		if not (has_class_field_flag f CfPublic) then p "private ";
+		if stat then p "static ";
+		let name = try (match Meta.get Meta.RealPath f.cf_meta with
+				| (Meta.RealPath, [EConst( String(s,_) ), _], _) ->
+					s
+				| _ ->
+					raise Not_found)
+			with Not_found ->
+				f.cf_name
+		in
+		(match f.cf_kind with
+		| Var v ->
+			if has_class_field_flag f CfFinal then
+				p "final %s" name
+			else begin
+				p "var %s" name;
+				if v.v_read <> AccNormal || v.v_write <> AccNormal then p "(%s,%s)" (access true v.v_read) (access false v.v_write);
+			end;
+			p " : %s" (stype f.cf_type);
+		| Method m ->
+			let params, ret = (match follow f.cf_type with
+				| TFun (args,ret) ->
+					List.map (fun (a,o,t) ->
+						let rec loop = function
+							| [] -> Ident "null"
+							| (Meta.DefParam,[(EConst (String(p,_)),_);(EConst v,_)],_) :: _ when p = a ->
+								(match v with
+								| Float "1.#QNAN" -> Float "0./*NaN*/"
+								| Float "4294967295." -> Int "0xFFFFFFFF"
+								| Int "16777215" -> Int "0xFFFFFF"
+								| Float x ->
+									(try
+										let f = float_of_string x in
+										let s = string_of_int (int_of_float f) in
+										if s ^ "." = x then Int s else v
+									with _ ->
+										v)
+								| _ -> v)
+							| _ :: l -> loop l
+						in
+						a,(if o then Some (loop f.cf_meta) else None ),t
+					) args, ret
+				| _ ->
+					assert false
+			) in
+			let tparams = (match f.cf_params with [] -> "" | l -> "<" ^ String.concat "," (List.map fst l) ^ ">") in
+			p "function %s%s(%s) : %s" name tparams (String.concat ", " (List.map sparam params)) (stype ret);
+		);
+		p ";\n";
+		if Meta.has Meta.Overload f.cf_meta then List.iter (fun f -> print_field stat f) f.cf_overloads
+	in
+	(match t with
+	| TClassDecl c ->
+		print_meta c.cl_meta;
+		let finalmod = if c.cl_final then "final " else "" in
+		p "extern %s%s %s" finalmod (if c.cl_interface then "interface" else "class") (stype (TInst (c,List.map snd c.cl_params)));
+		let ext = (match c.cl_super with
+		| None -> []
+		| Some (c,pl) -> [" extends " ^ stype (TInst (c,pl))]
+		) in
+		let ext = List.fold_left (fun acc (i,pl) -> ((if c.cl_interface then " extends " else " implements ") ^ stype (TInst (i,pl))) :: acc) ext c.cl_implements in
+		let ext = (match c.cl_dynamic with
+			| None -> ext
+			| Some t ->
+				(match c.cl_path with
+				| ["flash";"errors"], _ -> ext
+				| _ when t == t_dynamic -> " implements Dynamic" :: ext
+				| _ -> (" implements Dynamic<" ^ stype t ^ ">") :: ext)
+		) in
+		let ext = (match c.cl_path with
+			| ["flash";"utils"], "ByteArray" -> " implements ArrayAccess<Int>" :: ext
+			| ["flash";"utils"], "Dictionary" -> [" implements ArrayAccess<Dynamic>"]
+			| ["flash";"xml"], "XML" -> [" implements Dynamic<XMLList>"]
+			| ["flash";"xml"], "XMLList" -> [" implements ArrayAccess<XML>"]
+			| ["flash";"display"],"MovieClip" -> [" extends Sprite #if !flash_strict implements Dynamic #end"]
+			| ["flash";"errors"], "Error" -> [" #if !flash_strict implements Dynamic #end"]
+			| _ -> ext
+		) in
+		p "%s" (String.concat "" (List.rev ext));
+		p " {\n";
+		let sort l =
+			let a = Array.of_list (List.filter (fun f -> not (List.memq f c.cl_overrides)) l) in
+			let name = function "new" -> "" | n -> n in
+			Array.sort (fun f1 f2 ->
+				match f1.cf_kind, f2.cf_kind with
+				| Var _, Var _ | Method _ , Method _ -> compare (name f1.cf_name) (name f2.cf_name)
+				| Var _, _ -> -1
+				| _ -> 1
+			) a;
+			Array.to_list a
+		in
+		List.iter (print_field false) (sort (match c.cl_constructor with None -> c.cl_ordered_fields | Some f -> f :: c.cl_ordered_fields));
+		List.iter (print_field true) (sort c.cl_ordered_statics);
+		p "}\n";
+	| TEnumDecl e ->
+		print_meta e.e_meta;
+		p "extern enum %s {\n" (stype (TEnum(e,List.map snd e.e_params)));
+		List.iter (fun n ->
+			let c = PMap.find n e.e_constrs in
+			p "\t%s" c.ef_name;
+			(match follow c.ef_type with
+			| TFun (args,_) -> p "(%s)" (String.concat ", " (List.map sparam (List.map (fun (a,o,t) -> a,(if o then Some (Ident "null") else None),t) args)))
+			| _ -> ());
+			p ";\n";
+		) e.e_names;
+		p "}\n"
+	| TTypeDecl t ->
+		print_meta t.t_meta;
+		p "typedef %s = " (stype (TType (t,List.map snd t.t_params)));
+		p "%s" (stype t.t_type);
+		p "\n";
+	| TAbstractDecl a ->
+		print_meta a.a_meta;
+		Option.may (fun c -> try print_meta [Meta.get Meta.Require c.cl_meta] with Not_found -> ()) a.a_impl;
+		p "extern ";
+		let is_enum = Meta.has Meta.Enum a.a_meta in
+		if is_enum then p "enum ";
+		p "abstract %s" (stype (TAbstract (a,List.map snd a.a_params)));
+		if not (Meta.has Meta.CoreType a.a_meta) then p "(%s)" (stype a.a_this);
+		p " {\n";
+		Option.may (fun c ->
+			let fields = c.cl_ordered_statics in
+			let fields =
+				if is_enum then
+					let sort l =
+						let a = Array.of_list l in
+						Array.sort (fun a b -> compare a.cf_name b.cf_name) a;
+						Array.to_list a
+					in
+					sort fields
+				else
+					fields
+			in
+
+			List.iter (fun f ->
+				let static = not (Meta.has Meta.Impl f.cf_meta) in
+				if not static && is_enum && Meta.has Meta.Enum f.cf_meta then begin
+					p "\tvar %s;\n" f.cf_name;
+				end else
+					print_field static f
+			) fields
+		) a.a_impl;
+		p "}\n";
+	);
+	IO.close_out ch
+
+let generate com =
+	List.iter (generate_type com) com.types
diff --git a/src/generators/genjava.ml b/src/generators/genjava.ml
index 17477c53f078c8dfccd683a8acfe31171e49fe7e..4989bb83510b66df372407d79596f14f1bd8eca6 100644
--- a/src/generators/genjava.ml
+++ b/src/generators/genjava.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -23,14 +23,13 @@ open Unix
 open Ast
 open Common
 open Type
+open Codegen
 open Gencommon
 open Gencommon.SourceWriter
 open Printf
 open Option
 open ExtString
 
-module SS = Set.Make(String)
-
 let is_boxed_type t = match follow t with
 	| TInst ({ cl_path = (["java";"lang"], "Boolean") }, [])
 	| TInst ({ cl_path = (["java";"lang"], "Double") }, [])
@@ -38,32 +37,72 @@ let is_boxed_type t = match follow t with
 	| TInst ({ cl_path = (["java";"lang"], "Byte") }, [])
 	| TInst ({ cl_path = (["java";"lang"], "Short") }, [])
 	| TInst ({ cl_path = (["java";"lang"], "Character") }, [])
-	| TInst ({ cl_path = (["java";"lang"], "Float") }, []) -> true
-	| TAbstract ({ a_path = (["java";"lang"], "Boolean") }, [])
-	| TAbstract ({ a_path = (["java";"lang"], "Double") }, [])
-	| TAbstract ({ a_path = (["java";"lang"], "Integer") }, [])
-	| TAbstract ({ a_path = (["java";"lang"], "Byte") }, [])
-	| TAbstract ({ a_path = (["java";"lang"], "Short") }, [])
-	| TAbstract ({ a_path = (["java";"lang"], "Character") }, [])
-	| TAbstract ({ a_path = (["java";"lang"], "Float") }, []) -> true
+	| TInst ({ cl_path = (["java";"lang"], "Float") }, [])
+	| TInst ({ cl_path = (["java";"lang"], "Long") }, []) -> true
+	| _ -> false
+
+let is_boxed_of_t boxed_t orig_t = match follow boxed_t, follow orig_t with
+	| TInst ({ cl_path = (["java";"lang"], "Boolean") }, []),
+	  TAbstract({ a_path = ([],"Bool") }, [])
+	| TInst ({ cl_path = (["java";"lang"], "Double") }, []),
+	  TAbstract({ a_path = ([],"Float") }, [])
+	| TInst ({ cl_path = (["java";"lang"], "Integer") }, []),
+	  TAbstract({ a_path = ([],"Int") }, [])
+	| TInst ({ cl_path = (["java";"lang"], "Byte") }, []),
+	  TAbstract({ a_path = (["java"],"Int8") }, [])
+	| TInst ({ cl_path = (["java";"lang"], "Short") }, []),
+	  TAbstract({ a_path = (["java"],"Int16") }, [])
+	| TInst ({ cl_path = (["java";"lang"], "Character") }, []),
+	  TAbstract({ a_path = (["java"],"Char16") }, [])
+	| TInst ({ cl_path = (["java";"lang"], "Float") }, []),
+	  TAbstract({ a_path = ([],"Single") }, [])
+	| TInst ({ cl_path = (["java";"lang"], "Long") }, []),
+	  TAbstract({ a_path = (["java"],"Int64") }, []) ->
+		true
+	| _ -> false
+
+let is_boxed_int_type boxed_t = match follow boxed_t with
+	| TInst ({ cl_path = (["java";"lang"], ("Integer"|"Byte"|"Short"|"Long")) }, []) ->
+		true
+	| _ -> false
+
+let is_int64_type t = match follow t with
+	| TAbstract ({ a_path = (["java"], ("Int64")) }, []) ->
+		true
+	| _ -> false
+
+let is_boxed_int64_type t = match follow t with
+	| TInst ({ cl_path = (["java";"lang"], ("Long")) }, []) ->
+		true
+	| _ -> false
+
+let is_int_type t = match follow t with
+	| TAbstract ({ a_path = ([], ("Int")) }, [])
+	| TAbstract ({ a_path = (["java"], ("Int8" | "Int16" | "Int64")) }, []) ->
+		true
+	| _ -> false
+
+let is_boxed_float_type boxed_t = match follow boxed_t with
+	| TInst ({ cl_path = (["java";"lang"], ("Double"|"Float")) }, []) ->
+		true
+	| _ -> false
+
+let is_float_type t = match follow t with
+	| TAbstract ({ a_path = ([], ("Float"|"Single")) }, []) ->
+		true
 	| _ -> false
 
-let unboxed_type gen t tbyte tshort tchar tfloat = match follow t with
-	| TInst ({ cl_path = (["java";"lang"], "Boolean") }, []) -> gen.gcon.basic.tbool
-	| TInst ({ cl_path = (["java";"lang"], "Double") }, []) -> gen.gcon.basic.tfloat
-	| TInst ({ cl_path = (["java";"lang"], "Integer") }, []) -> gen.gcon.basic.tint
-	| TInst ({ cl_path = (["java";"lang"], "Byte") }, []) -> tbyte
-	| TInst ({ cl_path = (["java";"lang"], "Short") }, []) -> tshort
-	| TInst ({ cl_path = (["java";"lang"], "Character") }, []) -> tchar
-	| TInst ({ cl_path = (["java";"lang"], "Float") }, []) -> tfloat
-	| TAbstract ({ a_path = (["java";"lang"], "Boolean") }, []) -> gen.gcon.basic.tbool
-	| TAbstract ({ a_path = (["java";"lang"], "Double") }, []) -> gen.gcon.basic.tfloat
-	| TAbstract ({ a_path = (["java";"lang"], "Integer") }, []) -> gen.gcon.basic.tint
-	| TAbstract ({ a_path = (["java";"lang"], "Byte") }, []) -> tbyte
-	| TAbstract ({ a_path = (["java";"lang"], "Short") }, []) -> tshort
-	| TAbstract ({ a_path = (["java";"lang"], "Character") }, []) -> tchar
-	| TAbstract ({ a_path = (["java";"lang"], "Float") }, []) -> tfloat
-	| _ -> assert false
+let is_boxed_number t = match follow t with
+	| TInst ({ cl_path = (["java";"lang"], ("Float"|"Double"|"Integer"|"Byte"|"Short"|"Long")) }, []) ->
+		true
+	| _ ->
+		false
+
+let is_unboxed_number t = match follow t with
+	| TAbstract ({ a_path = ([], ("Float"|"Single"|"Int")) }, [])
+	| TAbstract ({ a_path = (["java"], ("Int8" | "Int16" | "Int64")) }, []) ->
+		true
+	| _ -> false
 
 let rec t_has_type_param t = match follow t with
 	| TInst({ cl_kind = KTypeParameter _ }, []) -> true
@@ -97,15 +136,17 @@ let rec replace_type_param t = match follow t with
 	| TInst(cl, params) -> TInst(cl, List.map replace_type_param params)
 	| _ -> t
 
+let in_runtime_class gen =
+	match gen.gcurrent_class with
+	| Some { cl_path = ["haxe";"lang"],"Runtime"} -> true
+	| _ -> false
+
 let is_java_basic_type t =
 	match follow t with
 		| TInst( { cl_path = (["haxe"], "Int32") }, [] )
 		| TInst( { cl_path = (["haxe"], "Int64") }, [] )
-		| TAbstract( { a_path = ([], "Single") }, [] )
 		| TAbstract( { a_path = (["java"], ("Int8" | "Int16" | "Char16" | "Int64")) }, [] )
-		| TAbstract( { a_path =	([], "Int") }, [] )
-		| TAbstract( { a_path =	([], "Float") }, [] )
-		| TAbstract( { a_path =	([], "Bool") }, [] ) ->
+		| TAbstract( { a_path =	([], ("Int"|"Float"|"Bool"|"Single")) }, [] ) ->
 			true
 		| _ -> false
 
@@ -145,17 +186,17 @@ let parse_explicit_iface =
 		get_iface split []
 	in parse_explicit_iface
 
-let is_string t =
-	match follow t with
-		| TInst( { cl_path = ([], "String") }, [] ) -> true
-		| _ -> false
-
 let is_cl t = match follow t with
 	| TInst({ cl_path = ["java";"lang"],"Class" },_)
 	| TAbstract({ a_path = [], ("Class"|"Enum") },_) -> true
 	| TAnon(a) when is_some (anon_class t) -> true
 	| _ -> false
 
+let mk_cast_if_needed t_to e =
+	if type_iseq t_to e.etype then
+		e
+	else
+		mk_cast t_to e
 
 (* ******************************************* *)
 (* JavaSpecificESynf *)
@@ -172,7 +213,7 @@ let is_cl t = match follow t with
 module JavaSpecificESynf =
 struct
 	let name = "java_specific_e"
-	let priority = solve_deps name [ DBefore ExpressionUnwrap.priority; DBefore ClassInstance.priority; DAfter CastDetect.priority; DAfter TryCatchWrapper.priority ]
+	let priority = solve_deps name [ DBefore ExpressionUnwrap.priority; DBefore ClassInstance.priority; DAfter CastDetect.priority]
 
 	let get_cl_from_t t =
 		match follow t with
@@ -189,8 +230,6 @@ struct
 		let f_md	= ( get_type gen (["java";"lang"], "Float")) in
 		let bool_md = get_type gen (["java";"lang"], "Boolean") in
 
-		let is_var = alloc_var "__is__" t_dynamic in
-
 		let rec run e =
 			match e.eexpr with
 				(* Math changes *)
@@ -220,7 +259,7 @@ struct
 					) ->
 					let mk_is is_basic obj md =
 						let obj = if is_basic then mk_cast t_dynamic obj else obj in
-						{ e with eexpr = TCall( { eexpr = TLocal is_var; etype = t_dynamic; epos = e.epos }, [
+						{ e with eexpr = TCall( { eexpr = TIdent "__is__"; etype = t_dynamic; epos = e.epos }, [
 							run obj;
 							{ eexpr = TTypeExpr md; etype = t_dynamic (* this is after all a syntax filter *); epos = e.epos }
 						] ) }
@@ -259,19 +298,23 @@ struct
 						| TClassDecl{ cl_path = (["haxe"], "Int64") } ->
 							mk_is true obj i64_md
 						| TAbstractDecl{ a_path = ([], "Dynamic") }
-						| TClassDecl{ cl_path = ([], "Dynamic") } ->
+						| TClassDecl{ cl_path = ([], "Dynamic") } when not (is_nullable obj.etype) ->
 							(match obj.eexpr with
 								| TLocal _ | TConst _ -> { e with eexpr = TConst(TBool true) }
 								| _ -> { e with eexpr = TBlock([run obj; { e with eexpr = TConst(TBool true) }]) }
 							)
 						| _ ->
-							mk_is false obj md
+							if not (is_java_basic_type obj.etype) then
+								try
+									Type.unify obj.etype (type_of_module_type md);
+									mk_is false obj md
+								with Unify_error _ -> e
+							else e
 					)
 				(* end Std.is() *)
 				| _ -> Type.map_expr run e
 		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gsyntax_filters#add name (PCustom priority) run
 
 end;;
 
@@ -298,7 +341,7 @@ struct
 		(try
 			UTF8.validate s;
 			UTF8.iter (fun c ->
-				let c = (UChar.code c) in
+				let c = (UCharExt.code c) in
 				if c > 0xFFFF then
 					(h := Int32.add (Int32.mul thirtyone !h)
 						(Int32.of_int (high_surrogate c));
@@ -321,8 +364,8 @@ struct
 			| TReturn _
 			| TThrow _ -> true
 			(* this is hack to not use 'break' on switch cases *)
-			| TLocal { v_name = "__fallback__" } when is_switch -> true
-			| TCall( { eexpr = TLocal { v_name = "__goto__" } }, _ ) -> true
+			| TIdent "__fallback__" when is_switch -> true
+			| TMeta ((Meta.LoopLabel,_,_), { eexpr = TBreak }) -> true
 			| TParenthesis p | TMeta (_,p) -> is_final_return_expr p
 			| TBlock bl -> is_final_return_block is_switch bl
 			| TSwitch (_, el_e_l, edef) ->
@@ -345,7 +388,11 @@ struct
 			| final :: [] -> is_final_return_expr is_switch final
 			| hd :: tl -> is_final_return_block is_switch tl
 
-	let is_null e = match e.eexpr with | TConst(TNull) -> true | _ -> false
+	let rec is_null e = match e.eexpr with
+		| TConst(TNull) -> true
+		| TParenthesis(e)
+		| TMeta(_,e) -> is_null e
+		| _ -> false
 
 	let rec is_equatable gen t =
 		match follow t with
@@ -369,7 +416,7 @@ struct
 		and modify it to:
 		{
 			var execute_def = true;
-			switch(str.hashCode())
+			switch(str == null ? 0 : str.hashCode())
 			{
 				case (hashcode of a):
 					if (str == "a")
@@ -399,13 +446,13 @@ struct
 		let local = match e1.eexpr with
 			| TLocal _ -> e1
 			| _ ->
-				let var = mk_temp gen "svar" e1.etype in
+				let var = mk_temp "svar" e1.etype in
 				let added = { e1 with eexpr = TVar(var, Some(e1)); etype = basic.tvoid } in
 				let local = mk_local var e1.epos in
 				block := added :: !block;
 				local
 		in
-		let execute_def_var = mk_temp gen "executeDef" gen.gcon.basic.tbool in
+		let execute_def_var = mk_temp "executeDef" gen.gcon.basic.tbool in
 		let execute_def = mk_local execute_def_var e1.epos in
 		let execute_def_set = { eexpr = TBinop(Ast.OpAssign, execute_def, { eexpr = TConst(TBool false); etype = basic.tbool; epos = e1.epos }); etype = basic.tbool; epos = e1.epos } in
 
@@ -423,7 +470,7 @@ struct
 			match !hash_cache with
 				| Some c -> c
 				| None ->
-					let var = mk_temp gen "hash" basic.tint in
+					let var = mk_temp "hash" basic.tint in
 					let cond = !local_hashcode in
 					block := { eexpr = TVar(var, Some cond); etype = basic.tvoid; epos = local.epos } :: !block;
 					let local = mk_local var local.epos in
@@ -527,12 +574,14 @@ struct
 				epos = e.epos
 			} in
 
-			let e = if has_fallback then { e with eexpr = TBlock([ e; mk_local (alloc_var "__fallback__" t_dynamic) e.epos]) } else e in
+			let e = if has_fallback then { e with eexpr = TBlock([ e; mk (TIdent "__fallback__") t_dynamic e.epos]) } else e in
 
 			(el, e)
 		in
 
-		let switch = { eswitch with
+		let is_not_null_check = mk (TBinop (OpNotEq, local, { local with eexpr = TConst TNull })) basic.tbool local.epos in
+		let if_not_null e = { e with eexpr = TIf (is_not_null_check, e, None) } in
+		let switch = if_not_null { eswitch with
 			eexpr = TSwitch(!local_hashcode, List.map change_case (reorder_cases ecases []), None);
 		} in
 		(if !has_case then begin
@@ -556,17 +605,103 @@ struct
 		| _ -> assert false
 
 	let configure gen runtime_cl =
+		let cl_boolean = get_cl (get_type gen (["java";"lang"],"Boolean")) in
+		let cl_number = get_cl (get_type gen (["java";"lang"],"Number")) in
+
 		(if java_hash "Testing string hashCode implementation from haXe" <> (Int32.of_int 545883604) then assert false);
 		let basic = gen.gcon.basic in
-		(* let tchar = mt_to_t_dyn ( get_type gen (["java"], "Char16") ) in *)
-		(* let tbyte = mt_to_t_dyn ( get_type gen (["java"], "Int8") ) in *)
-		(* let tshort = mt_to_t_dyn ( get_type gen (["java"], "Int16") ) in *)
-		(* let tsingle = mt_to_t_dyn ( get_type gen ([], "Single") ) in *)
+		let tbyte = mt_to_t_dyn ( get_type gen (["java"], "Int8") ) in
+		let tshort = mt_to_t_dyn ( get_type gen (["java"], "Int16") ) in
+		let tsingle = mt_to_t_dyn ( get_type gen ([], "Single") ) in
 		let ti64 = mt_to_t_dyn ( get_type gen (["java"], "Int64") ) in
 		let string_ext = get_cl ( get_type gen (["haxe";"lang"], "StringExt")) in
 		let fast_cast = Common.defined gen.gcon Define.FastCast in
 
-		let is_string t = match follow t with | TInst({ cl_path = ([], "String") }, []) -> true | _ -> false in
+		let get_unboxed_from_boxed boxed_t =
+			match boxed_t with
+				| TInst( ({ cl_path = (["java";"lang"],name) } as cl), [] ) -> (match name with
+					| "Double" ->
+						cl, basic.tfloat
+					| "Integer" ->
+						cl, basic.tint
+					| "Byte" ->
+						cl, tbyte
+					| "Short" ->
+						cl, tshort
+					| "Float" ->
+						cl, tsingle
+					| "Long" ->
+						cl, ti64
+					| _ ->
+						assert false)
+				| _ -> assert false
+		in
+
+		let mk_valueof_call boxed_t expr =
+			let box_cl, unboxed_t = get_unboxed_from_boxed boxed_t in
+			let fn = TFun(["param1",false,unboxed_t],boxed_t) in
+			{
+				eexpr = TCall(mk_static_field_access box_cl "valueOf" fn expr.epos, [mk_cast_if_needed unboxed_t expr]);
+				etype = boxed_t;
+				epos = expr.epos;
+			}
+		in
+
+		let mk_unbox unboxed_t boxed_e =
+			if is_int64_type unboxed_t then
+				{
+					eexpr = TCall(
+						mk_static_field_access_infer runtime_cl "getInt64FromNumber" boxed_e.epos [],
+						[ boxed_e ]
+					);
+					etype = ti64;
+					epos = boxed_e.epos
+				}
+			else if is_int_type unboxed_t then
+				mk_cast_if_needed unboxed_t {
+					eexpr = TCall(
+						mk_static_field_access_infer runtime_cl "getIntFromNumber" boxed_e.epos [],
+						[ boxed_e ]
+					);
+					etype = basic.tint;
+					epos = boxed_e.epos
+				}
+			else
+				mk_cast_if_needed unboxed_t {
+					eexpr = TCall(
+						mk_static_field_access_infer runtime_cl "getFloatFromNumber" boxed_e.epos [],
+						[ boxed_e ]
+					);
+					etype = basic.tfloat;
+					epos = boxed_e.epos
+				}
+		in
+
+		let mk_dyn_box boxed_t expr =
+			let name = match boxed_t with
+				| TInst({ cl_path = (["java";"lang"],"Integer") },[]) ->
+					"numToInteger"
+				| TInst({ cl_path = (["java";"lang"],"Double") },[]) ->
+					"numToDouble"
+				| TInst({ cl_path = (["java";"lang"],"Float") },[]) ->
+					"numToFloat"
+				| TInst({ cl_path = (["java";"lang"],"Byte") },[]) ->
+					"numToByte"
+				| TInst({ cl_path = (["java";"lang"],"Long") },[]) ->
+					"numToLong"
+				| TInst({ cl_path = (["java";"lang"],"Short") },[]) ->
+					"numToShort"
+				| _ -> gen.gcon.error ("Invalid boxed type " ^ (debug_type boxed_t)) expr.epos; assert false
+			in
+			{
+				eexpr = TCall(
+					mk_static_field_access_infer runtime_cl name expr.epos [],
+					[ mk_cast (TInst(cl_number,[])) expr ]
+				);
+				etype = boxed_t;
+				epos = expr.epos
+			}
+		in
 
 		let rec run e =
 			match e.eexpr with
@@ -598,18 +733,40 @@ struct
 						| _ ->
 							{ e with eexpr = TCall(run efield, List.map run args) }
 					)
-(*				 | TCall( { eexpr = TField(ef, FInstance({ cl_path = [], "String" }, { cf_name = ("toString") })) }, [] ) ->
-					run ef *)
 
-				(* | TCast(expr, m) when is_boxed_type e.etype -> *)
-				(* 	(* let unboxed_type gen t tbyte tshort tchar tfloat = match follow t with *) *)
-				(* 	run { e with etype = unboxed_type gen e.etype tbyte tshort tchar tsingle } *)
+				| TCast(expr, _) when is_boxed_number (gen.greal_type expr.etype) && is_unboxed_number (gen.greal_type e.etype) ->
+					let to_t = gen.greal_type e.etype in
+					mk_unbox to_t (run expr)
+
+				| TCast(expr, md) when is_boxed_number (gen.greal_type e.etype) ->
+					let to_t = gen.greal_type e.etype in
+					let from_t = gen.greal_type expr.etype in
+					let ret = if is_unboxed_number from_t then
+							mk_valueof_call to_t (run expr)
+						else if is_boxed_number from_t then
+							if type_iseq from_t to_t then begin
+								(* special case for when the expression is null, as we sometimes need to give *)
+								(* a little help to Java's typer *)
+								if is_null expr then
+									{ e with eexpr = TCast(run expr, md) }
+								else
+									run expr
+							end else
+								mk_dyn_box (gen.greal_type e.etype) (run expr)
+						else begin
+							if in_runtime_class gen then
+								mk_cast e.etype (run expr)
+							else
+								mk_dyn_box (gen.greal_type e.etype) (run expr)
+						end
+					in
+					ret
 
-				| TCast(expr, _) when is_bool e.etype && is_dynamic gen expr.etype ->
+				| TCast(expr, _) when is_bool e.etype ->
 					{
 						eexpr = TCall(
 							mk_static_field_access_infer runtime_cl "toBool" expr.epos [],
-							[ run expr ]
+							[ mk_cast_if_needed (TInst(cl_boolean,[])) (run expr) ]
 						);
 						etype = basic.tbool;
 						epos = e.epos
@@ -634,14 +791,6 @@ struct
 
 					if needs_cast then mk_cast e.etype ret else ret
 
-				(*| TCast(expr, c) when is_int_float gen e.etype ->
-					(* cases when float x = (float) (java.lang.Double val); *)
-					(* FIXME: this fix is broken since it will fail on cases where float x = (float) (java.lang.Float val) or similar. FIX THIS *)
-					let need_second_cast = match gen.gfollow#run_f e.etype with
-						| TInst _ -> false
-						| _ -> true
-					in
-					if need_second_cast then { e with eexpr = TCast(mk_cast (follow e.etype) (run expr), c) }  else Type.map_expr run e*)
 				| TCast(expr, _) when like_i64 e.etype && is_dynamic gen expr.etype ->
 					{
 						eexpr = TCall(
@@ -685,9 +834,7 @@ struct
 					{ e with eexpr = TBinop(op, mk_cast t_empty (run e1), mk_cast t_empty (run e2)) }
 				| _ -> Type.map_expr run e
 		in
-		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
-
+		gen.gsyntax_filters#add name (PCustom priority) run
 end;;
 
 
@@ -714,7 +861,7 @@ let rec handle_throws gen cf =
 	match cf.cf_expr with
 	| Some ({ eexpr = TFunction(tf) } as e)  ->
 		let rec collect_throws acc = function
-			| (Meta.Throws, [Ast.EConst (Ast.String path), _],_) :: meta -> (try
+			| (Meta.Throws, [Ast.EConst (Ast.String(path,_)), _],_) :: meta -> (try
 				collect_throws (get_cl ( get_type gen (parse_path path)) :: acc) meta
 			with | Not_found | TypeNotFound _ ->
 				collect_throws acc meta)
@@ -799,7 +946,6 @@ let rec get_class_modifiers meta cl_type cl_access cl_modifiers =
 		| (Meta.Internal,[],_) :: meta -> get_class_modifiers meta cl_type "" cl_modifiers
 		(* no abstract for now | (":abstract",[],_) :: meta -> get_class_modifiers meta cl_type cl_access ("abstract" :: cl_modifiers)
 		| (Meta.Static,[],_) :: meta -> get_class_modifiers meta cl_type cl_access ("static" :: cl_modifiers) TODO: support those types *)
-		| (Meta.Final,[],_) :: meta -> get_class_modifiers meta cl_type cl_access ("final" :: cl_modifiers)
 		| _ :: meta -> get_class_modifiers meta cl_type cl_access cl_modifiers
 
 let rec get_fun_modifiers meta access modifiers =
@@ -814,20 +960,44 @@ let rec get_fun_modifiers meta access modifiers =
 		| (Meta.Native,[],_) :: meta -> get_fun_modifiers meta access ("native" :: modifiers)
 		| _ :: meta -> get_fun_modifiers meta access modifiers
 
-(* this was the way I found to pass the generator context to be accessible across all functions here *)
-(* so 'configure' is almost 'top-level' and will have all functions needed to make this work *)
-let configure gen =
+let generate con =
+	let exists = ref false in
+	List.iter (fun java_lib ->
+		if String.ends_with java_lib#get_file_path "hxjava-std.jar" then begin
+			exists := true;
+			java_lib#add_flag NativeLibraries.FlagIsStd;
+		end;
+	) con.native_libs.java_libs;
+	if not !exists then
+		failwith "Your version of hxjava is outdated. Please update it by running: `haxelib update hxjava`";
+	let gen = new_ctx con in
+	gen.gallow_tp_dynamic_conversion <- true;
+
+	let basic = con.basic in
+	(* make the basic functions in java *)
+	let cl_cl = get_cl (get_type gen (["java";"lang"],"Class")) in
+	let basic_fns =
+	[
+		mk_class_field "equals" (TFun(["obj",false,t_dynamic], basic.tbool)) true null_pos (Method MethNormal) [];
+		mk_class_field "toString" (TFun([], basic.tstring)) true null_pos (Method MethNormal) [];
+		mk_class_field "hashCode" (TFun([], basic.tint)) true null_pos (Method MethNormal) [];
+		mk_class_field "getClass" (TFun([], (TInst(cl_cl,[t_dynamic])))) true null_pos (Method MethNormal) [];
+		mk_class_field "wait" (TFun([], basic.tvoid)) true null_pos (Method MethNormal) [];
+		mk_class_field "notify" (TFun([], basic.tvoid)) true null_pos (Method MethNormal) [];
+		mk_class_field "notifyAll" (TFun([], basic.tvoid)) true null_pos (Method MethNormal) [];
+	] in
+	List.iter (fun cf -> gen.gbase_class_fields <- PMap.add cf.cf_name cf gen.gbase_class_fields) basic_fns;
+
+	(try
 	let native_arr_cl = get_cl ( get_type gen (["java"], "NativeArray") ) in
 	gen.gclasses.nativearray <- (fun t -> TInst(native_arr_cl,[t]));
 	gen.gclasses.nativearray_type <- (function TInst(_,[t]) -> t | _ -> assert false);
 	gen.gclasses.nativearray_len <- (fun e p -> mk_field_access gen e "length" p);
 
-	let basic = gen.gcon.basic in
-
 	let fn_cl = get_cl (get_type gen (["haxe";"lang"],"Function")) in
 
 	let runtime_cl = get_cl (get_type gen (["haxe";"lang"],"Runtime")) in
-	let nulltdef = get_tdef (get_type gen ([],"Null")) in
+	let nulltabstract = get_abstract (get_type gen ([],"Null")) in
 
 	(*let string_ref = get_cl ( get_type gen (["haxe";"lang"], "StringRefl")) in*)
 
@@ -868,8 +1038,8 @@ let configure gen =
 									| TAbstract ({ a_path = ["java"],"Char16" },[])
 									| TType ({ t_path = [],"Single" },[])
 									| TAbstract ({ a_path = [],"Single" },[]) ->
-										TType(nulltdef, [f_t])
-									(*| TType ({ t_path = [], "Null"*)
+										TAbstract(nulltabstract, [f_t])
+									(*| TAbstract ({ a_path = [], "Null"*)
 									| TInst (cl, ((_ :: _) as p)) when cl.cl_path <> (["java"],"NativeArray") ->
 										(* TInst(cl, List.map (fun _ -> t_dynamic) p) *)
 										TInst(cl,p)
@@ -893,7 +1063,7 @@ let configure gen =
 
 	let write_field w name = write w (change_field name) in
 
-	gen.gfollow#add ~name:"follow_basic" (fun t -> match t with
+	gen.gfollow#add "follow_basic" PZero (fun t -> match t with
 			| TAbstract ({ a_path = ([], "Bool") },[])
 			| TAbstract ({ a_path = ([], "Void") },[])
 			| TAbstract ({ a_path = ([],"Float") },[])
@@ -911,8 +1081,8 @@ let configure gen =
 			| TType ({ t_path = [],"Single" },[])
 			| TAbstract ({ a_path = [],"Single" },[]) ->
 					Some t
-			| TType (({ t_path = [],"Null" } as tdef),[t2]) ->
-					Some (TType(tdef,[gen.gfollow#run_f t2]))
+			| TAbstract (({ a_path = [],"Null" } as tab),[t2]) ->
+					Some (TAbstract(tab,[gen.gfollow#run_f t2]))
 			| TAbstract (a, pl) when not (Meta.has Meta.CoreType a.a_meta) ->
 					Some (gen.gfollow#run_f ( Abstract.get_underlying_type a pl) )
 			| TAbstract( { a_path = ([], "EnumValue") }, _ )
@@ -923,7 +1093,7 @@ let configure gen =
 
 	let path_s path meta = try
 		match Meta.get Meta.JavaCanonical meta with
-			| (Meta.JavaCanonical, [EConst(String pack), _; EConst(String name), _], _) ->
+			| (Meta.JavaCanonical, [EConst(String(pack,_)), _; EConst(String(name,_)), _], _) ->
 				if pack = "" then
 					name
 				else
@@ -935,9 +1105,44 @@ let configure gen =
 
 	let cl_cl = get_cl (get_type gen (["java";"lang"],"Class")) in
 
+	let cl_boolean = get_cl (get_type gen (["java";"lang"],"Boolean")) in
+	let cl_double = get_cl (get_type gen (["java";"lang"],"Double")) in
+	let cl_integer = get_cl (get_type gen (["java";"lang"],"Integer")) in
+	let cl_byte = get_cl (get_type gen (["java";"lang"],"Byte")) in
+	let cl_short = get_cl (get_type gen (["java";"lang"],"Short")) in
+	let cl_character = get_cl (get_type gen (["java";"lang"],"Character")) in
+	let cl_float = get_cl (get_type gen (["java";"lang"],"Float")) in
+	let cl_long = get_cl (get_type gen (["java";"lang"],"Long")) in
+
 	let rec real_type t =
 		let t = gen.gfollow#run_f t in
 		match t with
+			| TAbstract({ a_path = ([], "Null") }, [t]) when is_java_basic_type (gen.gfollow#run_f t) -> t_dynamic
+			| TAbstract({ a_path = ([], "Null") }, [t]) -> (
+				match gen.gfollow#run_f t with
+				| TAbstract( { a_path = ([], "Bool") }, [] ) ->
+					TInst(cl_boolean, [])
+				| TAbstract( { a_path = ([], "Float") }, [] ) ->
+					TInst(cl_double, [])
+				| TAbstract( { a_path = ([], "Int") }, [] ) ->
+					TInst(cl_integer, [])
+				| TAbstract( { a_path = (["java"], "Int8") }, [] ) ->
+					TInst(cl_byte, [])
+				| TAbstract( { a_path = (["java"], "Int16") }, [] ) ->
+					TInst(cl_short, [])
+				| TAbstract( { a_path = (["java"], "Char16") }, [] ) ->
+					TInst(cl_character, [])
+				| TAbstract( { a_path = ([], "Single") }, [] ) ->
+					TInst(cl_float, [])
+				| TAbstract( { a_path = (["java"], "Int64") }, [] )
+				| TAbstract( { a_path = (["haxe"], "Int64") }, [] ) ->
+					TInst(cl_long, [])
+				| _ -> (match follow t with
+					| TInst( { cl_kind = KTypeParameter _ }, []) ->
+							t_dynamic
+					| _ -> real_type t
+				)
+			)
 			| TAbstract (a, pl) when not (Meta.has Meta.CoreType a.a_meta) ->
 				real_type (Abstract.get_underlying_type a pl)
 			| TInst( { cl_path = (["haxe"], "Int32") }, [] ) -> gen.gcon.basic.tint
@@ -951,14 +1156,6 @@ let configure gen =
 				TInst(c, List.map (fun _ -> t_dynamic) params)
 			| TInst({ cl_kind = KExpr _ }, _) -> t_dynamic
 			| TInst _ -> t
-			| TType({ t_path = ([], "Null") }, [t]) when is_java_basic_type (gen.gfollow#run_f t) -> t_dynamic
-			| TType({ t_path = ([], "Null") }, [t]) ->
-				(match follow t with
-					| TInst( { cl_kind = KTypeParameter _ }, []) ->
-							t_dynamic
-							(* real_type t *)
-					| _ -> real_type t
-				)
 			| TType _ | TAbstract _ -> t
 			| TAnon (anon) -> (match !(anon.a_status) with
 				| Statics _ | EnumStatics _ | AbstractStatics _ -> t
@@ -1018,68 +1215,72 @@ let configure gen =
 		| _ -> false
 	in
 
-	let rec t_s pos t =
-		match real_type t with
-			(* basic types *)
-			| TAbstract ({ a_path = ([], "Bool") },[]) -> "boolean"
-			| TAbstract ({ a_path = ([], "Void") },[]) ->
-					path_s_import pos (["java";"lang"], "Object") []
-			| TAbstract ({ a_path = ([],"Float") },[]) -> "double"
-			| TAbstract ({ a_path = ([],"Int") },[]) -> "int"
-			| TType ({ t_path = ["java"], "Int64" },[])
-			| TAbstract ({ a_path = ["java"], "Int64" },[]) -> "long"
-			| TType ({ t_path = ["java"],"Int8" },[])
-			| TAbstract ({ a_path = ["java"],"Int8" },[]) -> "byte"
-			| TType ({ t_path = ["java"],"Int16" },[])
-			| TAbstract ({ a_path = ["java"],"Int16" },[]) -> "short"
-			| TType ({ t_path = ["java"],"Char16" },[])
-			| TAbstract ({ a_path = ["java"],"Char16" },[]) -> "char"
-			| TType ({ t_path = [],"Single" },[])
-			| TAbstract ({ a_path = [],"Single" },[]) -> "float"
-			| TInst ({ cl_path = ["haxe"],"Int32" },[])
-			| TAbstract ({ a_path = ["haxe"],"Int32" },[]) -> "int"
-			| TInst ({ cl_path = ["haxe"],"Int64" },[])
-			| TAbstract ({ a_path = ["haxe"],"Int64" },[]) -> "long"
-			| TInst({ cl_path = (["java"], "NativeArray") }, [param]) ->
-				let rec check_t_s t =
-					match real_type t with
-						| TInst({ cl_path = (["java"], "NativeArray") }, [param]) ->
-							(check_t_s param) ^ "[]"
-						| _ -> t_s pos (run_follow gen t)
-				in
-				(check_t_s param) ^ "[]"
-
-			(* end of basic types *)
-			| TInst ({ cl_kind = KTypeParameter _; cl_path=p }, []) -> snd p
-			| TAbstract ({ a_path = [], "Dynamic" },[]) ->
-					path_s_import pos (["java";"lang"], "Object") []
-			| TMono r -> (match !r with | None -> "java.lang.Object" | Some t -> t_s pos (run_follow gen t))
-			| TInst ({ cl_path = [], "String" }, []) ->
-					path_s_import pos (["java";"lang"], "String") []
-			| TAbstract ({ a_path = [], "Class" }, [p]) | TAbstract ({ a_path = [], "Enum" }, [p])
-			| TInst ({ cl_path = [], "Class" }, [p]) | TInst ({ cl_path = [], "Enum" }, [p]) ->
-					path_param_s pos (TClassDecl cl_cl) (["java";"lang"], "Class") [p] []
-			| TAbstract ({ a_path = [], "Class" }, _) | TAbstract ({ a_path = [], "Enum" }, _)
-			| TInst ({ cl_path = [], "Class" }, _) | TInst ({ cl_path = [], "Enum" }, _) ->
-					path_s_import pos (["java";"lang"], "Class") []
-			| TEnum ({e_path = p; e_meta = meta}, _) ->
-					path_s_import pos p meta
-			| TInst (({cl_path = p; cl_meta = meta} as cl), _) when Meta.has Meta.Enum cl.cl_meta ->
-					path_s_import pos p meta
-			| TInst (({cl_path = p; cl_meta = meta} as cl), params) -> (path_param_s pos (TClassDecl cl) p params meta)
-			| TType (({t_path = p; t_meta = meta} as t), params) -> (path_param_s pos (TTypeDecl t) p params meta)
-			| TAnon (anon) ->
-				(match !(anon.a_status) with
-					| Statics _ | EnumStatics _ | AbstractStatics _ ->
-							path_s_import pos (["java";"lang"], "Class") []
-					| _ ->
-							path_s_import pos (["java";"lang"], "Object") [])
-				| TDynamic _ ->
+	let rec t_s stack pos t =
+		if List.exists (fast_eq t) stack then
+			path_s_import pos (["java";"lang"], "Object") []
+		else begin
+			let stack = t :: stack in
+			match real_type t with
+				(* basic types *)
+				| TAbstract ({ a_path = ([], "Bool") },[]) -> "boolean"
+				| TAbstract ({ a_path = ([], "Void") },[]) ->
 						path_s_import pos (["java";"lang"], "Object") []
-			(* No Lazy type nor Function type made. That's because function types will be at this point be converted into other types *)
-			| _ -> if !strict_mode then begin trace ("[ !TypeError " ^ (Type.s_type (Type.print_context()) t) ^ " ]"); assert false end else "[ !TypeError " ^ (Type.s_type (Type.print_context()) t) ^ " ]"
+				| TAbstract ({ a_path = ([],"Float") },[]) -> "double"
+				| TAbstract ({ a_path = ([],"Int") },[]) -> "int"
+				| TType ({ t_path = ["java"], "Int64" },[])
+				| TAbstract ({ a_path = ["java"], "Int64" },[]) -> "long"
+				| TType ({ t_path = ["java"],"Int8" },[])
+				| TAbstract ({ a_path = ["java"],"Int8" },[]) -> "byte"
+				| TType ({ t_path = ["java"],"Int16" },[])
+				| TAbstract ({ a_path = ["java"],"Int16" },[]) -> "short"
+				| TType ({ t_path = ["java"],"Char16" },[])
+				| TAbstract ({ a_path = ["java"],"Char16" },[]) -> "char"
+				| TType ({ t_path = [],"Single" },[])
+				| TAbstract ({ a_path = [],"Single" },[]) -> "float"
+				| TInst ({ cl_path = ["haxe"],"Int32" },[])
+				| TAbstract ({ a_path = ["haxe"],"Int32" },[]) -> "int"
+				| TInst ({ cl_path = ["haxe"],"Int64" },[])
+				| TAbstract ({ a_path = ["haxe"],"Int64" },[]) -> "long"
+				| TInst({ cl_path = (["java"], "NativeArray") }, [param]) ->
+					let rec check_t_s t =
+						match real_type t with
+							| TInst({ cl_path = (["java"], "NativeArray") }, [param]) ->
+								(check_t_s param) ^ "[]"
+							| _ -> t_s stack pos (run_follow gen t)
+					in
+					(check_t_s param) ^ "[]"
 
-	and param_t_s pos t =
+				(* end of basic types *)
+				| TInst ({ cl_kind = KTypeParameter _; cl_path=p }, []) -> snd p
+				| TAbstract ({ a_path = [], "Dynamic" },[]) ->
+						path_s_import pos (["java";"lang"], "Object") []
+				| TMono r -> (match !r with | None -> "java.lang.Object" | Some t -> t_s stack pos (run_follow gen t))
+				| TInst ({ cl_path = [], "String" }, []) ->
+						path_s_import pos (["java";"lang"], "String") []
+				| TAbstract ({ a_path = [], "Class" }, [p]) | TAbstract ({ a_path = [], "Enum" }, [p])
+				| TInst ({ cl_path = [], "Class" }, [p]) | TInst ({ cl_path = [], "Enum" }, [p]) ->
+						path_param_s stack pos (TClassDecl cl_cl) (["java";"lang"], "Class") [p] []
+				| TAbstract ({ a_path = [], "Class" }, _) | TAbstract ({ a_path = [], "Enum" }, _)
+				| TInst ({ cl_path = [], "Class" }, _) | TInst ({ cl_path = [], "Enum" }, _) ->
+						path_s_import pos (["java";"lang"], "Class") []
+				| TEnum ({e_path = p; e_meta = meta}, _) ->
+						path_s_import pos p meta
+				| TInst (({cl_path = p; cl_meta = meta} as cl), _) when Meta.has Meta.Enum cl.cl_meta ->
+						path_s_import pos p meta
+				| TInst (({cl_path = p; cl_meta = meta} as cl), params) -> (path_param_s stack pos (TClassDecl cl) p params meta)
+				| TType (({t_path = p; t_meta = meta} as t), params) -> (path_param_s stack pos (TTypeDecl t) p params meta)
+				| TAnon (anon) ->
+					(match !(anon.a_status) with
+						| Statics _ | EnumStatics _ | AbstractStatics _ ->
+								path_s_import pos (["java";"lang"], "Class") []
+						| _ ->
+								path_s_import pos (["java";"lang"], "Object") [])
+					| TDynamic _ ->
+							path_s_import pos (["java";"lang"], "Object") []
+				(* No Lazy type nor Function type made. That's because function types will be at this point be converted into other types *)
+				| _ -> if !strict_mode then begin trace ("[ !TypeError " ^ (Type.s_type (Type.print_context()) t) ^ " ]"); assert false end else "[ !TypeError " ^ (Type.s_type (Type.print_context()) t) ^ " ]"
+		end
+	and param_t_s stack pos t =
 		match run_follow gen t with
 			| TAbstract ({ a_path = ([], "Bool") },[]) ->
 					path_s_import pos (["java";"lang"], "Boolean") []
@@ -1109,18 +1310,22 @@ let configure gen =
 			| TAbstract ({ a_path = [],"Single" },[]) ->
 					path_s_import pos (["java";"lang"], "Float") []
 			| TDynamic _ -> "?"
-			| TInst (cl, params) -> t_s pos (TInst(cl, change_param_type (TClassDecl cl) params))
-			| TType (cl, params) -> t_s pos (TType(cl, change_param_type (TTypeDecl cl) params))
-			| TEnum (e, params) -> t_s pos (TEnum(e, change_param_type (TEnumDecl e) params))
-			| _ -> t_s pos t
+			| TInst (cl, params) -> t_s stack pos (TInst(cl, change_param_type (TClassDecl cl) params))
+			| TType (cl, params) -> t_s stack pos (TType(cl, change_param_type (TTypeDecl cl) params))
+			| TEnum (e, params) -> t_s stack pos (TEnum(e, change_param_type (TEnumDecl e) params))
+			| _ -> t_s stack pos t
 
-	and path_param_s pos md path params meta =
+	and path_param_s stack pos md path params meta =
 			match params with
 				| [] -> path_s_import pos path meta
 				| _ when has_tdynamic (change_param_type md params) -> path_s_import pos path meta
-				| _ -> sprintf "%s<%s>" (path_s_import pos path meta) (String.concat ", " (List.map (fun t -> param_t_s pos t) (change_param_type md params)))
+				| _ -> sprintf "%s<%s>" (path_s_import pos path meta) (String.concat ", " (List.map (fun t -> param_t_s stack pos t) (change_param_type md params)))
 	in
 
+	let t_s = t_s []
+	and param_t_s = param_t_s []
+	and path_param_s = path_param_s [] in
+
 	let rett_s pos t =
 		match t with
 			| TAbstract ({ a_path = ([], "Void") },[]) -> "void"
@@ -1147,7 +1352,7 @@ let configure gen =
 		let b = Buffer.create 0 in
 		(try
 			UTF8.validate s;
-			UTF8.iter (fun c -> escape (UChar.code c) b) s
+			UTF8.iter (fun c -> escape (UCharExt.code c) b) s
 		with
 			UTF8.Malformed_code ->
 				String.iter (fun c -> escape (Char.code c) b) s
@@ -1157,9 +1362,8 @@ let configure gen =
 
 	let has_semicolon e =
 		match e.eexpr with
-			| TLocal { v_name = "__fallback__" }
-			| TCall ({ eexpr = TLocal( { v_name = "__label__" } ) }, [ { eexpr = TConst(TInt _) } ] ) -> false
-			| TCall ({ eexpr = TLocal( { v_name = "__lock__" } ) }, _ ) -> false
+			| TIdent "__fallback__"
+			| TCall ({ eexpr = TIdent "__lock__" }, _ ) -> false
 			| TBlock _ | TFor _ | TSwitch _ | TTry _ | TIf _ -> false
 			| TWhile (_,_,flag) when flag = Ast.NormalWhile -> false
 			| _ -> true
@@ -1195,7 +1399,7 @@ let configure gen =
 
 	let rec extract_tparams params el =
 		match el with
-			| ({ eexpr = TLocal({ v_name = "$type_param" }) } as tp) :: tl ->
+			| ({ eexpr = TIdent "$type_param" } as tp) :: tl ->
 				extract_tparams (tp.etype :: params) tl
 			| _ -> (params, el)
 	in
@@ -1206,15 +1410,13 @@ let configure gen =
 		else fun w p ->
 			let cur_line = Lexer.get_error_line p in
 			let file = Path.get_full_path p.pfile in
-			print w "//line %d \"%s\"" cur_line (Ast.s_escape file); newline w
+			print w "//line %d \"%s\"" cur_line (StringHelper.s_escape file); newline w
 	in
 
 	let extract_statements expr =
 		let ret = ref [] in
 		let rec loop expr = match expr.eexpr with
-			| TCall ({ eexpr = TLocal {
-					v_name = "__is__" | "__typeof__" | "__array__"
-				} }, el) ->
+			| TCall ({ eexpr = TIdent ("__is__" | "__typeof__" | "__array__")}, el) ->
 				List.iter loop el
 			| TNew ({ cl_path = (["java"], "NativeArray") }, params, [ size ]) ->
 				()
@@ -1222,11 +1424,12 @@ let configure gen =
 			| TUnop (Ast.Decrement, _, _)
 			| TBinop (Ast.OpAssign, _, _)
 			| TBinop (Ast.OpAssignOp _, _, _)
-			| TLocal { v_name = "__fallback__" }
-			| TLocal { v_name = "__sbreak__" } ->
+			| TIdent "__fallback__"
+			| TIdent "__sbreak__" ->
 				ret := expr :: !ret
 			| TConst _
 			| TLocal _
+			| TIdent _
 			| TArray _
 			| TBinop _
 			| TField _
@@ -1235,7 +1438,6 @@ let configure gen =
 			| TObjectDecl _
 			| TArrayDecl _
 			| TCast _
-			| TMeta _
 			| TParenthesis _
 			| TUnop _ ->
 				Type.iter loop expr
@@ -1279,13 +1481,15 @@ let configure gen =
 								| t -> write w ("null") )
 						| TThis -> write w "this"
 						| TSuper -> write w "super")
-				| TLocal { v_name = "__fallback__" } -> ()
-				| TLocal { v_name = "__sbreak__" } -> write w "break"
-				| TLocal { v_name = "__undefined__" } ->
+				| TIdent "__fallback__" -> ()
+				| TIdent "__sbreak__" -> write w "break"
+				| TIdent "__undefined__" ->
 					write w (t_s e.epos (TInst(runtime_cl, List.map (fun _ -> t_dynamic) runtime_cl.cl_params)));
 					write w ".undefined";
 				| TLocal var ->
 					write_id w var.v_name
+				| TIdent s ->
+					write_id w s
 				| TField(_, FEnum(en,ef)) ->
 					let s = ef.ef_name in
 					print w "%s." (path_s_import e.epos en.e_path en.e_meta); write_field w s
@@ -1300,7 +1504,7 @@ let configure gen =
 					write w " )"
 				| TField (e, FStatic(_, cf)) when Meta.has Meta.Native cf.cf_meta ->
 					let rec loop meta = match meta with
-						| (Meta.Native, [EConst (String s), _],_) :: _ ->
+						| (Meta.Native, [EConst (String(s,_)), _],_) :: _ ->
 							expr_s w e; write w "."; write_field w s
 						| _ :: tl -> loop tl
 						| [] -> expr_s w e; write w "."; write_field w (cf.cf_name)
@@ -1315,9 +1519,17 @@ let configure gen =
 				| TTypeExpr mt -> write w (md_s e.epos mt)
 				| TParenthesis e ->
 					write w "("; expr_s w e; write w ")"
+				| TMeta ((Meta.LoopLabel,[(EConst(Int n),_)],_), e) ->
+					(match e.eexpr with
+					| TFor _ | TWhile _ ->
+						print w "label%s:" n;
+						newline w;
+						expr_s w e;
+					| TBreak -> print w "break label%s" n
+					| _ -> assert false)
 				| TMeta (_,e) ->
 					expr_s w e
-				| TCall ({ eexpr = TLocal { v_name = "__array__" } }, el)
+				| TCall ({ eexpr = TIdent "__array__" }, el)
 				| TCall ({ eexpr = TField(_, FStatic({ cl_path = (["java"],"NativeArray") }, { cf_name = "make" })) }, el)
 				| TArrayDecl el when t_has_type_param e.etype ->
 					let _, el = extract_tparams [] el in
@@ -1329,7 +1541,7 @@ let configure gen =
 						acc + 1
 					) 0 el);
 					write w "}) )"
-				| TCall ({ eexpr = TLocal { v_name = "__array__" } }, el)
+				| TCall ({ eexpr = TIdent "__array__" }, el)
 				| TCall ({ eexpr = TField(_, FStatic({ cl_path = (["java"],"NativeArray") }, { cf_name = "make" })) }, el)
 				| TArrayDecl el ->
 					let _, el = extract_tparams [] el in
@@ -1350,20 +1562,20 @@ let configure gen =
 					) 0 el);
 					write w "}"
 				| TCall( ( { eexpr = TField(_, FStatic({ cl_path = ([], "String") }, { cf_name = "fromCharCode" })) } ), [cc] ) ->
-						write w "Character.toString((char) ";
+						write w "new java.lang.String( java.lang.Character.toChars((int) ";
 						expr_s w cc;
-						write w ")"
-				| TCall ({ eexpr = TLocal( { v_name = "__is__" } ) }, [ expr; { eexpr = TTypeExpr(md) } ] ) ->
+						write w ") )"
+				| TCall ({ eexpr = TIdent "__is__" }, [ expr; { eexpr = TTypeExpr(md) } ] ) ->
 					write w "( ";
 					expr_s w expr;
 					write w " instanceof ";
 					write w (md_s e.epos md);
 					write w " )"
-				| TCall ({ eexpr = TLocal( { v_name = "__java__" } ) }, [ { eexpr = TConst(TString(s)) } ] ) ->
+				| TCall ({ eexpr = TIdent "__java__" }, [ { eexpr = TConst(TString(s)) } ] ) ->
 					write w s
-				| TCall ({ eexpr = TLocal( { v_name = "__java__" } ) }, { eexpr = TConst(TString(s)) } :: tl ) ->
+				| TCall ({ eexpr = TIdent "__java__" }, { eexpr = TConst(TString(s)) } :: tl ) ->
 					Codegen.interpolate_code gen.gcon s tl (write w) (expr_s w) e.epos
-				| TCall ({ eexpr = TLocal( { v_name = "__lock__" } ) }, [ eobj; eblock ] ) ->
+				| TCall ({ eexpr = TIdent "__lock__" }, [ eobj; eblock ] ) ->
 					write w "synchronized(";
 					let rec loop eobj = match eobj.eexpr with
 						| TTypeExpr md ->
@@ -1385,11 +1597,7 @@ let configure gen =
 						if has_semicolon eblock then write w ";";
 						end_block w;
 					)
-				| TCall ({ eexpr = TLocal( { v_name = "__goto__" } ) }, [ { eexpr = TConst(TInt v) } ] ) ->
-					print w "break label%ld" v
-				| TCall ({ eexpr = TLocal( { v_name = "__label__" } ) }, [ { eexpr = TConst(TInt v) } ] ) ->
-					print w "label%ld:" v
-				| TCall ({ eexpr = TLocal( { v_name = "__typeof__" } ) }, [ { eexpr = TTypeExpr md } as expr ] ) ->
+				| TCall ({ eexpr = TIdent "__typeof__" }, [ { eexpr = TTypeExpr md } as expr ] ) ->
 					expr_s w expr;
 					write w ".class"
 				| TCall (e, el) ->
@@ -1597,6 +1805,7 @@ let configure gen =
 				| TObjectDecl _ -> write w "[ obj decl not supported ]"; if !strict_mode then assert false
 				| TFunction _ -> write w "[ func decl not supported ]"; if !strict_mode then assert false
 				| TEnumParameter _ -> write w "[ enum parameter not supported ]"; if !strict_mode then assert false
+				| TEnumIndex _ -> write w "[ enum index not supported ]"; if !strict_mode then assert false
 		in
 		expr_s w e
 	in
@@ -1616,7 +1825,7 @@ let configure gen =
 		| EConst c, p -> (match c with
 			| Int s | Float s | Ident s ->
 				write w s
-			| String s ->
+			| String(s,_) ->
 				write w "\"";
 				write w (escape s);
 				write w "\""
@@ -1672,7 +1881,7 @@ let configure gen =
 					| Some t -> run t
 					| _ -> () (* avoid infinite loop / should be the same in this context *))
 				| TLazy f ->
-					run (!f())
+					run (lazy_type f)
 				| _ -> ()
 		in
 		run t;
@@ -1718,7 +1927,7 @@ let configure gen =
 		in
 		(match cf.cf_kind with
 			| Var _
-			| Method (MethDynamic) when not (Type.is_extern_field cf) ->
+			| Method (MethDynamic) when Type.is_physical_field cf ->
 				(if is_overload || List.exists (fun cf -> cf.cf_expr <> None) cf.cf_overloads then
 					gen.gcon.error "Only normal (non-dynamic) methods can be overloaded" cf.cf_pos);
 				if not is_interface then begin
@@ -1732,15 +1941,15 @@ let configure gen =
 						| None -> write w ";"
 					)
 				end (* TODO see how (get,set) variable handle when they are interfaces *)
-			| Method _ when Type.is_extern_field cf || (match cl.cl_kind, cf.cf_expr with | KAbstractImpl _, None -> true | _ -> false) ->
+			| Method _ when not (Type.is_physical_field cf) || (match cl.cl_kind, cf.cf_expr with | KAbstractImpl _, None -> true | _ -> false) ->
 				List.iter (fun cf -> if cl.cl_interface || cf.cf_expr <> None then
-					gen_class_field w ~is_overload:true is_static cl (Meta.has Meta.Final cf.cf_meta) cf
+					gen_class_field w ~is_overload:true is_static cl (has_class_field_flag cf CfFinal) cf
 				) cf.cf_overloads
 			| Var _ | Method MethDynamic -> ()
 			| Method mkind ->
 				List.iter (fun cf ->
 					if cl.cl_interface || cf.cf_expr <> None then
-						gen_class_field w ~is_overload:true is_static cl (Meta.has Meta.Final cf.cf_meta) cf
+						gen_class_field w ~is_overload:true is_static cl (has_class_field_flag cf CfFinal) cf
 				) cf.cf_overloads;
 				let is_virtual = is_new || (not is_final && match mkind with | MethInline -> false | _ when not is_new -> true | _ -> false) in
 				let is_override = match cf.cf_name with
@@ -1831,10 +2040,10 @@ let configure gen =
 								end else begin
 									expr_s w expr;
 								end)
-							| (Meta.Throws, [Ast.EConst (Ast.String t), _], _) :: tl ->
+							| (Meta.Throws, [Ast.EConst (Ast.String(t,_)), _], _) :: tl ->
 								print w " throws %s" t;
 								loop tl
-							| (Meta.FunctionCode, [Ast.EConst (Ast.String contents),_],_) :: tl ->
+							| (Meta.FunctionCode, [Ast.EConst (Ast.String(contents,_)),_],_) :: tl ->
 								begin_block w;
 								write w contents;
 								end_block w
@@ -1862,7 +2071,7 @@ let configure gen =
 
 		let rec loop_meta meta acc =
 			match meta with
-				| (Meta.SuppressWarnings, [Ast.EConst (Ast.String w),_],_) :: meta -> loop_meta meta (w :: acc)
+				| (Meta.SuppressWarnings, [Ast.EConst (Ast.String(w,_)),_],_) :: meta -> loop_meta meta (w :: acc)
 				| _ :: meta -> loop_meta meta acc
 				| _ -> acc
 		in
@@ -1898,7 +2107,8 @@ let configure gen =
 		gen_annotations w cl.cl_meta;
 
 		let clt, access, modifiers = get_class_modifiers cl.cl_meta (if cl.cl_interface then "interface" else "class") "public" [] in
-		let is_final = Meta.has Meta.Final cl.cl_meta in
+		let modifiers = if cl.cl_final then "final" :: modifiers else modifiers in
+		let is_final = cl.cl_final in
 
 		write_parts w (access :: modifiers @ [clt; (change_clname (snd cl.cl_path))]);
 
@@ -1935,7 +2145,7 @@ let configure gen =
 		let rec loop meta =
 			match meta with
 				| [] -> ()
-				| (Meta.ClassCode, [Ast.EConst (Ast.String contents),_],_) :: tl ->
+				| (Meta.ClassCode, [Ast.EConst (Ast.String(contents,_)),_],_) :: tl ->
 					write w contents
 				| _ :: tl -> loop tl
 		in
@@ -1953,6 +2163,8 @@ let configure gen =
 								| _ -> ()
 				with | Not_found -> ()
 				);
+				write w "haxe.java.Init.init();";
+				newline w;
 				(match gen.gcon.main with
 					| Some(expr) ->
 						expr_s w (mk_block expr)
@@ -2035,8 +2247,6 @@ let configure gen =
 	(* generate source code *)
 	init_ctx gen;
 
-	Hashtbl.add gen.gspecial_vars "__label__" true;
-	Hashtbl.add gen.gspecial_vars "__goto__" true;
 	Hashtbl.add gen.gspecial_vars "__is__" true;
 	Hashtbl.add gen.gspecial_vars "__typeof__" true;
 	Hashtbl.add gen.gspecial_vars "__java__" true;
@@ -2045,8 +2255,14 @@ let configure gen =
 
 	gen.greal_type <- real_type;
 	gen.greal_type_param <- change_param_type;
-
-	SetHXGen.run_filter gen;
+	gen.gspecial_needs_cast <- (fun to_t from_t ->
+		is_boxed_of_t to_t from_t ||
+		is_boxed_of_t from_t to_t ||
+		( (is_boxed_int_type from_t || is_boxed_float_type from_t ) &&
+		  (is_boxed_int_type to_t || is_boxed_float_type to_t || is_int_type to_t || is_float_type to_t) ) ||
+		( (is_boxed_int_type to_t || is_boxed_float_type to_t ) &&
+			(is_boxed_int_type from_t || is_boxed_float_type from_t || is_int_type from_t || is_float_type from_t) )
+	);
 
 	(* before running the filters, follow all possible types *)
 	(* this is needed so our module transformations don't break some core features *)
@@ -2079,17 +2295,26 @@ let configure gen =
 	in
 
 	FixOverrides.configure ~get_vmtype gen;
-	Normalize.configure gen ~metas:(Hashtbl.create 0);
-	AbstractImplementationFix.configure gen;
 
-	IteratorsInterface.configure gen;
+	let allowed_meta = Hashtbl.create 1 in
+	Hashtbl.add allowed_meta Meta.LoopLabel true;
+	Normalize.configure gen ~allowed_metas:allowed_meta;
+
+	AbstractImplementationFix.configure gen;
 
-	let closure_t = ClosuresToClass.DoubleAndDynamicClosureImpl.get_ctx gen (get_cl (get_type gen (["haxe";"lang"],"Function"))) 6 in
+	let cl_arg_exc = get_cl (get_type gen (["java";"lang"],"IllegalArgumentException")) in
+	let cl_arg_exc_t = TInst (cl_arg_exc, []) in
+	let mk_arg_exception msg pos = mk (TNew (cl_arg_exc, [], [Texpr.Builder.make_string gen.gcon.basic msg pos])) cl_arg_exc_t pos in
+	let closure_t = ClosuresToClass.DoubleAndDynamicClosureImpl.get_ctx gen (get_cl (get_type gen (["haxe";"lang"],"Function"))) 6 mk_arg_exception in
 	ClosuresToClass.configure gen closure_t;
 
 	let enum_base = (get_cl (get_type gen (["haxe";"lang"],"Enum")) ) in
 	let param_enum_base = (get_cl (get_type gen (["haxe";"lang"],"ParamEnum")) ) in
-	EnumToClass.configure gen (None) false true enum_base param_enum_base;
+	let type_enumindex = mk_static_field_access_infer gen.gclasses.cl_type "enumIndex" null_pos [] in
+	let mk_enum_index_call e p =
+		mk (TCall (type_enumindex, [e])) gen.gcon.basic.tint p
+	in
+	EnumToClass.configure gen false true enum_base param_enum_base mk_enum_index_call;
 
 	InterfaceVarsDeleteModf.configure gen;
 
@@ -2153,9 +2378,9 @@ let configure gen =
 		in
 
 		let arr_call = if args <> [] then
-			{ eexpr = TArrayDecl args; etype = basic.tarray t_dynamic; epos = ecall.epos }
+			mk_nativearray_decl gen t_dynamic args ecall.epos
 		else
-			null (basic.tarray t_dynamic) ecall.epos
+			null (gen.gclasses.nativearray t_dynamic) ecall.epos
 		in
 
 
@@ -2168,6 +2393,10 @@ let configure gen =
 		mk_cast ecall.etype { ecall with eexpr = TCall(infer, call_args); etype = t_dynamic }
 	in
 
+	let cl_field_exc = get_cl (get_type gen (["java";"lang"],"RuntimeException")) in
+	let cl_field_exc_t = TInst (cl_field_exc, []) in
+	let mk_field_exception msg pos = mk (TNew (cl_field_exc, [], [Texpr.Builder.make_string gen.gcon.basic msg pos])) cl_field_exc_t pos in
+
 	let rcf_ctx =
 		ReflectionCFs.new_ctx
 			gen
@@ -2189,6 +2418,7 @@ let configure gen =
 				{ hash_array with eexpr = TCall(rcf_static_remove t, [hash_array; length; pos]); etype = gen.gcon.basic.tvoid }
 			)
 			None
+			mk_field_exception
 		in
 
 	ReflectionCFs.UniversalBaseClass.configure gen (get_cl (get_type gen (["haxe";"lang"],"HxObject")) ) object_iface dynamic_object;
@@ -2197,12 +2427,11 @@ let configure gen =
 
 	ReflectionCFs.implement_varargs_cl rcf_ctx ( get_cl (get_type gen (["haxe";"lang"], "VarArgsBase")) );
 
-	let slow_invoke = mk_static_field_access_infer (runtime_cl) "slowCallField" null_pos [] in
-	ReflectionCFs.configure rcf_ctx ~slow_invoke:(fun ethis efield eargs -> {
-		eexpr = TCall(slow_invoke, [ethis; efield; eargs]);
-		etype = t_dynamic;
-		epos = ethis.epos;
-	} ) object_iface;
+	let slow_invoke_field = mk_static_field_access_infer runtime_cl "slowCallField" null_pos [] in
+	let slow_invoke ethis efield eargs =
+		mk (TCall (slow_invoke_field, [ethis; efield; eargs])) t_dynamic ethis.epos
+	in
+	ReflectionCFs.configure rcf_ctx ~slow_invoke:slow_invoke object_iface;
 
 	ObjectDeclMap.configure gen (ReflectionCFs.implement_dynamic_object_ctor rcf_ctx dynamic_object);
 
@@ -2219,7 +2448,7 @@ let configure gen =
 			| _ -> assert false
 	) "__get" "__set";
 
-	let field_is_dynamic t field =
+	let field_is_dynamic is_dynamic t field =
 		match field_access_esp gen (gen.greal_type t) field with
 			| FClassField (cl,p,_,_,_,t,_) ->
 				let p = change_param_type (TClassDecl cl) p in
@@ -2233,16 +2462,20 @@ let configure gen =
 		| _ -> false
 	in
 
-	let is_dynamic_expr e =
+	let is_dynamic_expr is_dynamic e =
 		is_dynamic e.etype || match e.eexpr with
 		| TField(tf, f) ->
-			field_is_dynamic tf.etype f
+			field_is_dynamic is_dynamic tf.etype f
 		| _ ->
 			false
 	in
 
+	let is_dynamic_op t =
+		is_dynamic t || is_boxed_type (gen.greal_type t)
+	in
+
 	let may_nullable t = match gen.gfollow#run_f t with
-		| TType({ t_path = ([], "Null") }, [t]) ->
+		| TAbstract({ a_path = ([], "Null") }, [t]) ->
 			(match follow t with
 				| TInst({ cl_path = ([], "String") }, [])
 				| TAbstract ({ a_path = ([], "Float") },[])
@@ -2258,27 +2491,37 @@ let configure gen =
 	let is_double t = like_float t && not (like_int t) in
 	let is_int t = like_int t in
 
+	let nullable_basic t = match gen.gfollow#run_f t with
+		| TAbstract({ a_path = ([],"Null") }, [t])
+		| TType({ t_path = ([],"Null") }, [t]) when is_java_basic_type t ->
+			Some(t)
+		| _ ->
+			None
+	in
+
 	DynamicOperators.configure gen
+		~handle_strings:true
 		(fun e -> match e.eexpr with
 			| TBinop (Ast.OpEq, e1, e2) ->
-				is_dynamic e1.etype || is_dynamic e2.etype || is_type_param e1.etype || is_type_param e2.etype
+				is_dynamic_op e1.etype || is_dynamic_op e2.etype || is_type_param e1.etype || is_type_param e2.etype
 			| TBinop (Ast.OpAdd, e1, e2)
-			| TBinop (Ast.OpNotEq, e1, e2) -> is_dynamic e1.etype || is_dynamic e2.etype || is_type_param e1.etype || is_type_param e2.etype
+			| TBinop (Ast.OpNotEq, e1, e2) -> is_dynamic_op e1.etype || is_dynamic_op e2.etype || is_type_param e1.etype || is_type_param e2.etype
 			| TBinop (Ast.OpLt, e1, e2)
 			| TBinop (Ast.OpLte, e1, e2)
 			| TBinop (Ast.OpGte, e1, e2)
-			| TBinop (Ast.OpGt, e1, e2) -> is_dynamic e.etype || is_dynamic_expr e1 || is_dynamic_expr e2 || is_string e1.etype || is_string e2.etype
-			| TBinop (_, e1, e2) -> is_dynamic e.etype || is_dynamic_expr e1 || is_dynamic_expr e2
+			| TBinop (Ast.OpGt, e1, e2) ->
+				is_dynamic_op e.etype || is_dynamic_op e1.etype || is_dynamic_op e2.etype || is_string e1.etype || is_string e2.etype
+			| TBinop (_, e1, e2) -> is_dynamic_op e.etype || is_dynamic_expr is_dynamic_op e1 || is_dynamic_expr is_dynamic_op e2
 			| TUnop (_, _, e1) ->
-				is_dynamic_expr e1
+				is_dynamic_expr is_dynamic_op e1
 			| _ -> false)
 		(fun e1 e2 ->
-			let is_null e = match e.eexpr with | TConst(TNull) | TLocal({ v_name = "__undefined__" }) -> true | _ -> false in
+			let is_null e = match e.eexpr with | TConst(TNull) | TIdent "__undefined__" -> true | _ -> false in
 
 			match e1.eexpr, e2.eexpr with
 				| TConst c1, TConst c2 when is_null e1 || is_null e2 ->
 					{ e1 with eexpr = TConst(TBool (c1 = c2)); etype = basic.tbool }
-				| _ when is_null e1 || is_null e2 && not (is_java_basic_type e1.etype || is_java_basic_type e2.etype) ->
+				| _ when (is_null e1 || is_null e2) && not (is_java_basic_type e1.etype || is_java_basic_type e2.etype) ->
 					{ e1 with eexpr = TBinop(Ast.OpEq, e1, e2); etype = basic.tbool }
 				| _ ->
 				let is_ref = match follow e1.etype, follow e2.etype with
@@ -2316,59 +2559,28 @@ let configure gen =
 				| _ ->
 					let static = mk_static_field_access_infer (runtime_cl) "plus"  e1.epos [] in
 					mk_cast e.etype { eexpr = TCall(static, [e1; e2]); etype = t_dynamic; epos=e1.epos })
-		(fun e1 e2 ->
-			if is_string e1.etype then begin
-				{ e1 with eexpr = TCall(mk_field_access gen e1 "compareTo" e1.epos, [ e2 ]); etype = gen.gcon.basic.tint }
-			end else begin
-				let static = mk_static_field_access_infer (runtime_cl) "compare" e1.epos [] in
-				{ eexpr = TCall(static, [e1; e2]); etype = gen.gcon.basic.tint; epos=e1.epos }
-			end);
+		(fun op e e1 e2 ->
+				match nullable_basic e1.etype, nullable_basic e2.etype with
+					| Some(t1), None when is_java_basic_type e2.etype ->
+						{ e with eexpr = TBinop(op, mk_cast t1 e1, e2) }
+					| None, Some(t2) when is_java_basic_type e1.etype ->
+						{ e with eexpr = TBinop(op, e1, mk_cast t2 e2) }
+					| _ ->
+							let handler = if is_string e1.etype then begin
+									{ e1 with eexpr = TCall(mk_field_access gen e1 "compareTo" e1.epos, [ e2 ]); etype = gen.gcon.basic.tint }
+								end else begin
+									let static = mk_static_field_access_infer (runtime_cl) "compare" e1.epos [] in
+									{ eexpr = TCall(static, [e1; e2]); etype = gen.gcon.basic.tint; epos=e1.epos }
+								end
+							in
+							let zero = Texpr.Builder.make_int gen.gcon.basic 0 e.epos in
+							{ e with eexpr = TBinop(op, handler, zero) }
+			);
 
 	let closure_cl = get_cl (get_type gen (["haxe";"lang"],"Closure")) in
 	FilterClosures.configure gen (fun e1 s -> true) (ReflectionCFs.get_closure_func rcf_ctx closure_cl);
 
-	let base_exception = get_cl (get_type gen (["java"; "lang"], "Throwable")) in
-	let base_exception_t = TInst(base_exception, []) in
-
-	let hx_exception = get_cl (get_type gen (["haxe";"lang"], "HaxeException")) in
-	let hx_exception_t = TInst(hx_exception, []) in
-
-	let rec is_exception t =
-		match follow t with
-			| TInst(cl,_) ->
-				if cl == base_exception then
-					true
-				else
-					(match cl.cl_super with | None -> false | Some (cl,arg) -> is_exception (TInst(cl,arg)))
-			| _ -> false
-	in
-
-	TryCatchWrapper.configure gen
-		(fun t -> not (is_exception (real_type t)))
-		(fun throwexpr expr ->
-			let wrap_static = mk_static_field_access (hx_exception) "wrap" (TFun([("obj",false,t_dynamic)], hx_exception_t)) expr.epos in
-			{ throwexpr with eexpr = TThrow { expr with eexpr = TCall(wrap_static, [expr]); etype = hx_exception_t }; etype = gen.gcon.basic.tvoid }
-		)
-		(fun v_to_unwrap pos ->
-			let local = mk_cast hx_exception_t { eexpr = TLocal(v_to_unwrap); etype = v_to_unwrap.v_type; epos = pos } in
-			mk_field_access gen local "obj" pos
-		)
-		(fun rethrow ->
-			let wrap_static = mk_static_field_access (hx_exception) "wrap" (TFun([("obj",false,t_dynamic)], hx_exception_t)) rethrow.epos in
-			{ rethrow with eexpr = TThrow { rethrow with eexpr = TCall(wrap_static, [rethrow]); etype = hx_exception_t }; }
-		)
-		(base_exception_t)
-		(hx_exception_t)
-		(fun v e ->
-
-			let exc_cl = get_cl (get_type gen (["haxe";"lang"],"Exceptions")) in
-			let exc_field = mk_static_field_access_infer exc_cl "setException" e.epos [] in
-			let esetstack = { eexpr = TCall(exc_field,[mk_local v e.epos]); etype = gen.gcon.basic.tvoid; epos = e.epos } in
-
-			Type.concat esetstack e;
-		);
-
-	ClassInstance.configure gen (fun e _ -> { e with eexpr = TCall({ eexpr = TLocal(alloc_var "__typeof__" t_dynamic); etype = t_dynamic; epos = e.epos }, [e]) });
+	ClassInstance.configure gen;
 
 	CastDetect.configure gen (Some empty_ctor_type) false;
 
@@ -2387,28 +2599,17 @@ let configure gen =
 			| _ -> assert false
 	);
 
-	ExpressionUnwrap.configure gen (fun e -> Some { eexpr = TVar(mk_temp gen "expr" e.etype, Some e); etype = gen.gcon.basic.tvoid; epos = e.epos });
+	ExpressionUnwrap.configure gen;
 
-	UnnecessaryCastsRemoval.configure gen;
+	(* UnnecessaryCastsRemoval.configure gen; *)
 
 	IntDivisionSynf.configure gen;
 
 	UnreachableCodeEliminationSynf.configure gen true;
 
-	ArrayDeclSynf.configure gen native_arr_cl;
-
-	let goto_special = alloc_var "__goto__" t_dynamic in
-	let label_special = alloc_var "__label__" t_dynamic in
-	SwitchBreakSynf.configure gen
-		(fun e_loop n api ->
-			{ e_loop with eexpr = TBlock( { eexpr = TCall( mk_local label_special e_loop.epos, [ Codegen.ExprBuilder.make_int gen.gcon n e_loop.epos ] ); etype = t_dynamic; epos = e_loop.epos } :: [e_loop] ) };
-		)
-		(fun e_break n api ->
-			{ eexpr = TCall( mk_local goto_special e_break.epos, [  Codegen.ExprBuilder.make_int gen.gcon n e_break.epos ] ); etype = t_dynamic; epos = e_break.epos }
-		);
+	ArraySpliceOptimization.configure gen;
 
-	DefaultArguments.configure gen;
-	InterfaceMetas.configure gen;
+	ArrayDeclSynf.configure gen native_arr_cl change_param_type;
 
 	JavaSpecificSynf.configure gen runtime_cl;
 	JavaSpecificESynf.configure gen runtime_cl;
@@ -2417,7 +2618,7 @@ let configure gen =
 	let str_cl = match gen.gcon.basic.tstring with | TInst(cl,_) -> cl | _ -> assert false in
 	str_cl.cl_super <- Some (get_cl (get_type gen (["haxe";"lang"], "NativeString")), []);
 
-	mkdir_from_path (gen.gcon.file ^ "/src");
+	Path.mkdir_from_path (gen.gcon.file ^ "/src");
 
 	let out_files = ref [] in
 
@@ -2427,7 +2628,7 @@ let configure gen =
 		res := { eexpr = TConst(TString name); etype = gen.gcon.basic.tstring; epos = null_pos } :: !res;
 		let name = Codegen.escape_res_name name true in
 		let full_path = gen.gcon.file ^ "/src/" ^ name in
-		mkdir_from_path full_path;
+		Path.mkdir_from_path full_path;
 
 		let f = open_out_bin full_path in
 		output_string f v;
@@ -2443,10 +2644,10 @@ let configure gen =
 
 	run_filters gen;
 
-	TypeParams.RenameTypeParameters.run gen;
+	RenameTypeParameters.run gen.gtypes_list;
 
 	let parts = Str.split_delim (Str.regexp "[\\/]+") gen.gcon.file in
-	mkdir_recursive "" parts;
+	Path.mkdir_recursive "" parts;
 
 	let source_dir = gen.gcon.file ^ "/src" in
 	List.iter (fun md ->
@@ -2472,1169 +2673,5 @@ let configure gen =
 		Sys.chdir old_dir;
 	end
 
-(* end of configure function *)
-
-let before_generate con =
-	let java_ver = try
-			int_of_string (PMap.find "java_ver" con.defines)
-		with | Not_found ->
-			Common.define_value con Define.JavaVer "7";
-			7
-	in
- if java_ver < 5 then failwith ("Java version is defined to target Java " ^ string_of_int java_ver ^ ", but the compiler can only output code to versions equal or superior to Java 5");
-	let rec loop i =
-		Common.raw_define con ("java" ^ (string_of_int i));
-		if i > 0 then loop (i - 1)
-	in
-	loop java_ver;
-	()
-
-let generate con =
-	let exists = ref false in
-	con.java_libs <- List.map (fun (file,std,close,la,gr) ->
-		if String.ends_with file "hxjava-std.jar" then begin
-			exists := true;
-			(file,true,close,la,gr)
-		end else
-			(file,std,close,la,gr)) con.java_libs;
-	if not !exists then
-		failwith "Your version of hxjava is outdated. Please update it by running: `haxelib update hxjava`";
-	let gen = new_ctx con in
-	gen.gallow_tp_dynamic_conversion <- true;
-
-	let basic = con.basic in
-	(* make the basic functions in java *)
-	let cl_cl = get_cl (get_type gen (["java";"lang"],"Class")) in
-	let basic_fns =
-	[
-		mk_class_field "equals" (TFun(["obj",false,t_dynamic], basic.tbool)) true null_pos (Method MethNormal) [];
-		mk_class_field "toString" (TFun([], basic.tstring)) true null_pos (Method MethNormal) [];
-		mk_class_field "hashCode" (TFun([], basic.tint)) true null_pos (Method MethNormal) [];
-		mk_class_field "getClass" (TFun([], (TInst(cl_cl,[t_dynamic])))) true null_pos (Method MethNormal) [];
-		mk_class_field "wait" (TFun([], basic.tvoid)) true null_pos (Method MethNormal) [];
-		mk_class_field "notify" (TFun([], basic.tvoid)) true null_pos (Method MethNormal) [];
-		mk_class_field "notifyAll" (TFun([], basic.tvoid)) true null_pos (Method MethNormal) [];
-	] in
-	List.iter (fun cf -> gen.gbase_class_fields <- PMap.add cf.cf_name cf gen.gbase_class_fields) basic_fns;
-
-	(try
-		configure gen
-	with | TypeNotFound path -> con.error ("Error. Module '" ^ (s_type_path path) ^ "' is required and was not included in build.")	null_pos);
+	with TypeNotFound path -> con.error ("Error. Module '" ^ (s_type_path path) ^ "' is required and was not included in build.") null_pos);
 	debug_mode := false
-
-(** Java lib *)
-
-open JData
-
-type java_lib_ctx = {
-	jcom : Common.context;
-	(* current tparams context *)
-	mutable jtparams : jtypes list;
-}
-
-exception ConversionError of string * pos
-
-let error s p = raise (ConversionError (s, p))
-
-let is_haxe_keyword = function
-	| "callback" | "cast" | "extern" | "function" | "in" | "typedef" | "using" | "var" | "untyped" | "inline" -> true
-	| _ -> false
-
-let jname_to_hx name =
-	let name =
-		if name <> "" && (String.get name 0 < 'A' || String.get name 0 > 'Z') then
-			Char.escaped (Char.uppercase (String.get name 0)) ^ String.sub name 1 (String.length name - 1)
-		else
-			name
-	in
-	let name = String.concat "__" (String.nsplit name "_") in
-	String.map (function | '$' -> '_' | c -> c) name
-
-let normalize_pack pack =
-	List.map (function
-		| "" -> ""
-		| str when String.get str 0 >= 'A' && String.get str 0 <= 'Z' ->
-			String.lowercase str
-		| str -> str
-	) pack
-
-let jpath_to_hx (pack,name) = match pack, name with
-	| ["haxe";"root"], name -> [], name
-	| "com" :: ("oracle" | "sun") :: _, _
-	| "javax" :: _, _
-	| "org" :: ("ietf" | "jcp" | "omg" | "w3c" | "xml") :: _, _
-	| "sun" :: _, _
-	| "sunw" :: _, _ -> "java" :: normalize_pack pack, jname_to_hx name
-	| pack, name -> normalize_pack pack, jname_to_hx name
-
-let real_java_path ctx (pack,name) =
-	s_type_path (pack, name)
-
-let lookup_jclass com path =
-	let path = jpath_to_hx path in
-	List.fold_right (fun (_,_,_,_,get_raw_class) acc ->
-		match acc with
-		| None -> get_raw_class path
-		| Some p -> Some p
-	) com.java_libs None
-
-let mk_type_path ctx path params =
-	let name, sub = try
-		let p, _ = String.split (snd path) "$" in
-		jname_to_hx p, Some (jname_to_hx (snd path))
-		with | Invalid_string ->
-			jname_to_hx (snd path), None
-	in
-	let pack = fst (jpath_to_hx path) in
-	let pack, sub, name = match path with
-		| [], ("Float" as c)
-		| [], ("Int" as c)
-		| [], ("Single" as c)
-		| [], ("Bool" as c)
-		| [], ("Dynamic" as c)
-		| [], ("Iterator" as c)
-		| [], ("ArrayAccess" as c)
-		| [], ("Iterable" as c) ->
-			[], Some c, "StdTypes"
-		| [], ("String" as c) ->
-			["std"], None, c
-		| _ ->
-			pack, sub, name
-	in
-	CTPath {
-		tpackage = pack;
-		tname = name;
-		tparams = params;
-		tsub = sub;
-	}
-
-let has_tparam name params = List.exists(fun (n,_,_) -> n = name) params
-
-let rec convert_arg ctx p arg =
-	match arg with
-	| TAny | TType (WSuper, _) -> TPType (mk_type_path ctx ([], "Dynamic") [],null_pos)
-	| TType (_, jsig) -> TPType (convert_signature ctx p jsig,null_pos)
-
-and convert_signature ctx p jsig =
-	match jsig with
-	| TByte -> mk_type_path ctx (["java"; "types"], "Int8") []
-	| TChar -> mk_type_path ctx (["java"; "types"], "Char16") []
-	| TDouble -> mk_type_path ctx ([], "Float") []
-	| TFloat -> mk_type_path ctx ([], "Single") []
-	| TInt -> mk_type_path ctx ([], "Int") []
-	| TLong -> mk_type_path ctx (["haxe"], "Int64") []
-	| TShort -> mk_type_path ctx (["java"; "types"], "Int16") []
-	| TBool -> mk_type_path ctx ([], "Bool") []
-	| TObject ( (["haxe";"root"], name), args ) -> mk_type_path ctx ([], name) (List.map (convert_arg ctx p) args)
-	(** nullable types *)
-	(* replaced from Null<Type> to the actual abstract type to fix #2738 *)
-	(* | TObject ( (["java";"lang"], "Integer"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx ([], "Int") []) ] *)
-	(* | TObject ( (["java";"lang"], "Double"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx ([], "Float") []) ] *)
-	(* | TObject ( (["java";"lang"], "Float"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx ([], "Single") []) ] *)
-	(* | TObject ( (["java";"lang"], "Boolean"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx ([], "Bool") []) ] *)
-	(* | TObject ( (["java";"lang"], "Byte"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx (["java";"types"], "Int8") []) ] *)
-	(* | TObject ( (["java";"lang"], "Character"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx (["java";"types"], "Char16") []) ] *)
-	(* | TObject ( (["java";"lang"], "Short"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx (["java";"types"], "Int16") []) ] *)
-	(* | TObject ( (["java";"lang"], "Long"), [] ) -> mk_type_path ctx ([], "Null") [ TPType (mk_type_path ctx (["haxe"], "Int64") []) ] *)
-	(** other std types *)
-	| TObject ( (["java";"lang"], "Object"), [] ) -> mk_type_path ctx ([], "Dynamic") []
-	| TObject ( (["java";"lang"], "String"), [] ) -> mk_type_path ctx ([], "String") []
-	| TObject ( (["java";"lang"], "Enum"), [_] ) -> mk_type_path ctx ([], "EnumValue") []
-	(** other types *)
-	| TObject ( path, [] ) ->
-		(match lookup_jclass ctx.jcom path with
-		| Some (jcl, _, _) -> mk_type_path ctx path (List.map (fun _ -> convert_arg ctx p TAny) jcl.ctypes)
-		| None -> mk_type_path ctx path [])
-	| TObject ( path, args ) -> mk_type_path ctx path (List.map (convert_arg ctx p) args)
-	| TObjectInner (pack, (name, params) :: inners) ->
-			let actual_param = match List.rev inners with
-			| (_, p) :: _ -> p
-			| _ -> assert false in
-			mk_type_path ctx (pack, name ^ "$" ^ String.concat "$" (List.map fst inners)) (List.map (fun param -> convert_arg ctx p param) actual_param)
-	| TObjectInner (pack, inners) -> assert false
-	| TArray (jsig, _) -> mk_type_path ctx (["java"], "NativeArray") [ TPType (convert_signature ctx p jsig,null_pos) ]
-	| TMethod _ -> JReader.error "TMethod cannot be converted directly into Complex Type"
-	| TTypeParameter s -> (match ctx.jtparams with
-		| cur :: others ->
-			if has_tparam s cur then
-				mk_type_path ctx ([], s) []
-			else begin
-				if ctx.jcom.verbose && not(List.exists (has_tparam s) others) then print_endline ("Type parameter " ^ s ^ " was not found while building type!");
-				mk_type_path ctx ([], "Dynamic") []
-			end
-		| _ ->
-			if ctx.jcom.verbose then print_endline ("Empty type parameter stack!");
-			mk_type_path ctx ([], "Dynamic") [])
-
-let convert_constant ctx p const =
-	Option.map_default (function
-		| ConstString s -> Some (EConst (String s), p)
-		| ConstInt i -> Some (EConst (Int (Printf.sprintf "%ld" i)), p)
-		| ConstFloat f | ConstDouble f -> Some (EConst (Float (Printf.sprintf "%E" f)), p)
-		| _ -> None) None const
-
-let rec same_sig parent jsig =
-	match jsig with
-	| TObject (p,targs) -> parent = p || List.exists (function | TType (_,s) -> same_sig parent s | _ -> false) targs
-	| TObjectInner(p, ntargs) ->
-			parent = (p, String.concat "$" (List.map fst ntargs)) ||
-			List.exists (fun (_,targs) -> List.exists (function | TType(_,s) -> same_sig parent s | _ -> false) targs) ntargs
-	| TArray(s,_) -> same_sig parent s
-	| _ -> false
-
-let convert_param ctx p parent param =
-	let name, constraints = match param with
-		| (name, Some extends_sig, implem_sig) ->
-			name, extends_sig :: implem_sig
-		| (name, None, implemem_sig) ->
-			name, implemem_sig
-		in
-		let constraints = List.map (fun s -> if same_sig parent s then (TObject( (["java";"lang"], "Object"), [])) else s) constraints in
-		{
-			tp_name = name,null_pos;
-			tp_params = [];
-			tp_constraints = List.map (fun t -> convert_signature ctx p t,null_pos) constraints;
-			tp_meta = [];
-		}
-
-let get_type_path ctx ct = match ct with | CTPath p -> p | _ -> assert false
-
-let is_override field =
-	List.exists (function | AttrVisibleAnnotations [{ ann_type = TObject( (["java";"lang"], "Override"), _ ) }] -> true | _ -> false) field.jf_attributes
-
-let mk_override field =
-	{ field with jf_attributes = ((AttrVisibleAnnotations [{ ann_type = TObject( (["java";"lang"], "Override"), [] ); ann_elements = [] }]) :: field.jf_attributes) }
-
-let del_override field =
-	{ field with jf_attributes = List.filter (fun a -> not (is_override_attrib a)) field.jf_attributes }
-
-let get_canonical ctx p pack name =
-	(Meta.JavaCanonical, [EConst (String (String.concat "." pack)), p; EConst (String name), p], p)
-
-let convert_java_enum ctx p pe =
-	let meta = ref (get_canonical ctx p (fst pe.cpath) (snd pe.cpath) :: [Meta.Native, [EConst (String (real_java_path ctx pe.cpath) ), p], p ]) in
-	let data = ref [] in
-	List.iter (fun f ->
-		(* if List.mem JEnum f.jf_flags then *)
-		match f.jf_vmsignature with
-		| TObject( path, [] ) when path = pe.cpath && List.mem JStatic f.jf_flags && List.mem JFinal f.jf_flags ->
-			data := { ec_name = f.jf_name,null_pos; ec_doc = None; ec_meta = []; ec_args = []; ec_pos = p; ec_params = []; ec_type = None; } :: !data;
-		| _ -> ()
-	) pe.cfields;
-
-	EEnum {
-		d_name = jname_to_hx (snd pe.cpath),null_pos;
-		d_doc = None;
-		d_params = []; (* enums never have type parameters *)
-		d_meta = !meta;
-		d_flags = [EExtern];
-		d_data = List.rev !data;
-	}
-
-	let convert_java_field ctx p jc field =
-		let p = { p with pfile =	p.pfile ^" (" ^field.jf_name ^")" } in
-		let cff_doc = None in
-		let cff_pos = p in
-		let cff_meta = ref [] in
-		let cff_access = ref [] in
-		let cff_name = match field.jf_name with
-			| "<init>" -> "new"
-			| "<clinit>"-> raise Exit (* __init__ field *)
-			| name when String.length name > 5 ->
-					(match String.sub name 0 5 with
-					| "__hx_" | "this$" -> raise Exit
-					| _ -> name)
-			| name -> name
-		in
-		let jf_constant = ref field.jf_constant in
-		let readonly = ref false in
-
-		List.iter (function
-			| JPublic -> cff_access := APublic :: !cff_access
-			| JPrivate -> raise Exit (* private instances aren't useful on externs *)
-			| JProtected -> cff_access := APrivate :: !cff_access
-			| JStatic -> cff_access := AStatic :: !cff_access
-			| JFinal ->
-				cff_meta := (Meta.Final, [], p) :: !cff_meta;
-				(match field.jf_kind, field.jf_vmsignature, field.jf_constant with
-				| JKField, TObject _, _ ->
-					jf_constant := None
-				| JKField, _, Some _ ->
-					readonly := true;
-					jf_constant := None;
-				| _ -> jf_constant := None)
-			(* | JSynchronized -> cff_meta := (Meta.Synchronized, [], p) :: !cff_meta *)
-			| JVolatile -> cff_meta := (Meta.Volatile, [], p) :: !cff_meta
-			| JTransient -> cff_meta := (Meta.Transient, [], p) :: !cff_meta
-			(* | JVarArgs -> cff_meta := (Meta.VarArgs, [], p) :: !cff_meta *)
-			| _ -> ()
-		) field.jf_flags;
-
-		List.iter (function
-			| AttrDeprecated when jc.cpath <> (["java";"util"],"Date") -> cff_meta := (Meta.Deprecated, [], p) :: !cff_meta
-			(* TODO: pass anotations as @:meta *)
-			| AttrVisibleAnnotations ann ->
-				List.iter (function
-					| { ann_type = TObject( (["java";"lang"], "Override"), [] ) } ->
-						cff_access := AOverride :: !cff_access
-					| _ -> ()
-				) ann
-			| _ -> ()
-		) field.jf_attributes;
-
-		List.iter (fun jsig ->
-			match convert_signature ctx p jsig with
-				| CTPath path ->
-					cff_meta := (Meta.Throws, [Ast.EConst (Ast.String (s_type_path (path.tpackage,path.tname))), p],p) :: !cff_meta
-				| _ -> ()
-		) field.jf_throws;
-
-		let kind = match field.jf_kind with
-			| JKField when !readonly ->
-				FProp (("default",null_pos), ("null",null_pos), Some (convert_signature ctx p field.jf_signature,null_pos), None)
-			| JKField ->
-				FVar (Some (convert_signature ctx p field.jf_signature,null_pos), None)
-			| JKMethod ->
-				match field.jf_signature with
-				| TMethod (args, ret) ->
-					let old_types = ctx.jtparams in
-					(match ctx.jtparams with
-					| c :: others -> ctx.jtparams <- (c @ field.jf_types) :: others
-					| [] -> ctx.jtparams <- field.jf_types :: []);
-					let i = ref 0 in
-					let args = List.map (fun s ->
-						incr i;
-						("param" ^ string_of_int !i,null_pos), false, [], Some(convert_signature ctx p s,null_pos), None
-					) args in
-					let t = Option.map_default (convert_signature ctx p) (mk_type_path ctx ([], "Void") []) ret in
-					cff_meta := (Meta.Overload, [], p) :: !cff_meta;
-
-					let types = List.map (function
-						| (name, Some ext, impl) ->
-							{
-								tp_name = name,null_pos;
-								tp_params = [];
-								tp_constraints = List.map (fun t -> convert_signature ctx p t,null_pos) (ext :: impl);
-								tp_meta = [];
-							}
-						| (name, None, impl) ->
-							{
-								tp_name = name,null_pos;
-								tp_params = [];
-								tp_constraints = List.map (fun t -> convert_signature ctx p t,null_pos) (impl);
-								tp_meta = [];
-							}
-					) field.jf_types in
-					ctx.jtparams <- old_types;
-
-					FFun ({
-						f_params = types;
-						f_args = args;
-						f_type = Some (t,null_pos);
-						f_expr = None
-					})
-				| _ -> error "Method signature was expected" p
-		in
-		let cff_name, cff_meta =
-			match String.get cff_name 0 with
-				| '%' ->
-					let name = (String.sub cff_name 1 (String.length cff_name - 1)) in
-					if not (is_haxe_keyword name) then
-						cff_meta := (Meta.Deprecated, [EConst(String(
-							"This static field `_" ^ name ^ "` is deprecated and will be removed in later versions. Please use `" ^ name ^ "` instead")
-						),p], p) :: !cff_meta;
-					"_" ^ name,
-					(Meta.Native, [EConst (String (name) ), cff_pos], cff_pos) :: !cff_meta
-				| _ ->
-					match String.nsplit cff_name "$" with
-						| [ no_dollar ] ->
-							cff_name, !cff_meta
-						| parts ->
-							String.concat "_" parts,
-							(Meta.Native, [EConst (String (cff_name) ), cff_pos], cff_pos) :: !cff_meta
-		in
-		if PMap.mem "java_loader_debug" ctx.jcom.defines then
-			Printf.printf "\t%s%sfield %s : %s\n" (if List.mem AStatic !cff_access then "static " else "") (if List.mem AOverride !cff_access then "override " else "") cff_name (s_sig field.jf_signature);
-
-		{
-			cff_name = cff_name,null_pos;
-			cff_doc = cff_doc;
-			cff_pos = cff_pos;
-			cff_meta = cff_meta;
-			cff_access = !cff_access;
-			cff_kind = kind
-		}
-
-	let rec japply_params params jsig = match params with
-	| [] -> jsig
-	| _ -> match jsig with
-		| TTypeParameter s -> (try
-			List.assoc s params
-		with | Not_found -> jsig)
-		| TObject(p,tl) ->
-			TObject(p, args params tl)
-		| TObjectInner(sl, stll) ->
-			TObjectInner(sl, List.map (fun (s,tl) -> (s, args params tl)) stll)
-		| TArray(s,io) ->
-			TArray(japply_params params s, io)
-		| TMethod(sl, sopt) ->
-			TMethod(List.map (japply_params params) sl, Option.map (japply_params params) sopt)
-		| _ -> jsig
-
-	and args params tl = match params with
-	| [] -> tl
-	| _ -> List.map (function
-		| TAny -> TAny
-		| TType(w,s) -> TType(w,japply_params params s)) tl
-
-	let mk_params jtypes = List.map (fun (s,_,_) -> (s,TTypeParameter s)) jtypes
-
-	let convert_java_class ctx p jc =
-		match List.mem JEnum jc.cflags with
-		| true -> (* is enum *)
-				[convert_java_enum ctx p jc]
-		| false ->
-			let flags = ref [HExtern] in
-			if PMap.mem "java_loader_debug" ctx.jcom.defines then begin
-				let sup = jc.csuper :: jc.cinterfaces in
-				print_endline ("converting " ^ (if List.mem JAbstract jc.cflags then "abstract " else "") ^ JData.path_s jc.cpath ^ " : " ^ (String.concat ", " (List.map s_sig sup)));
-			end;
-			(* todo: instead of JavaNative, use more specific definitions *)
-			let meta = ref [Meta.JavaNative, [], p; Meta.Native, [EConst (String (real_java_path ctx jc.cpath) ), p], p; get_canonical ctx p (fst jc.cpath) (snd jc.cpath)] in
-			let force_check = Common.defined ctx.jcom Define.ForceLibCheck in
-			if not force_check then
-				meta := (Meta.LibType,[],p) :: !meta;
-
-			let is_interface = ref false in
-			List.iter (fun f -> match f with
-				| JFinal -> meta := (Meta.Final, [], p) :: !meta
-				| JInterface ->
-						is_interface := true;
-						flags := HInterface :: !flags
-				| JAbstract -> meta := (Meta.Abstract, [], p) :: !meta
-				| JAnnotation -> meta := (Meta.Annotation, [], p) :: !meta
-				| _ -> ()
-			) jc.cflags;
-
-			(match jc.csuper with
-				| TObject( (["java";"lang"], "Object"), _ ) -> ()
-				| TObject( (["haxe";"lang"], "HxObject"), _ ) -> meta := (Meta.HxGen,[],p) :: !meta
-				| _ -> flags := HExtends (get_type_path ctx (convert_signature ctx p jc.csuper),null_pos) :: !flags
-			);
-
-			List.iter (fun i ->
-				match i with
-				| TObject ( (["haxe";"lang"], "IHxObject"), _ ) -> meta := (Meta.HxGen,[],p) :: !meta
-				| _ -> flags :=
-					if !is_interface then
-						HExtends (get_type_path ctx (convert_signature ctx p i),null_pos) :: !flags
-					else
-						HImplements (get_type_path ctx (convert_signature ctx p i),null_pos) :: !flags
-			) jc.cinterfaces;
-
-			let fields = ref [] in
-			let jfields = ref [] in
-
-			if jc.cpath <> (["java";"lang"], "CharSequence") then
-				List.iter (fun f ->
-					try
-						if !is_interface && List.mem JStatic f.jf_flags then
-							()
-						else begin
-							fields := convert_java_field ctx p jc f :: !fields;
-							jfields := f :: !jfields
-						end
-					with
-						| Exit -> ()
-				) (jc.cfields @ jc.cmethods);
-
-			(* make sure the throws types are imported correctly *)
-			let imports = List.concat (List.map (fun f ->
-				List.map (fun jsig ->
-					match convert_signature ctx p jsig with
-						| CTPath path ->
-							let pos = { p with pfile = p.pfile ^ " (" ^ f.jf_name ^" @:throws)" } in
-							EImport( List.map (fun s -> s,pos) (path.tpackage @ [path.tname]), INormal )
-						| _ -> assert false
-				) f.jf_throws
-			) jc.cmethods) in
-
-			(EClass {
-				d_name = jname_to_hx (snd jc.cpath),null_pos;
-				d_doc = None;
-				d_params = List.map (convert_param ctx p jc.cpath) jc.ctypes;
-				d_meta = !meta;
-				d_flags = !flags;
-				d_data = !fields;
-			}) :: imports
-
-	let create_ctx com =
-		{
-			jcom = com;
-			jtparams = [];
-		}
-
-	let rec has_type_param = function
-		| TTypeParameter _ -> true
-		| TMethod (lst, opt) -> List.exists has_type_param lst || Option.map_default has_type_param false opt
-		| TArray (s,_) -> has_type_param s
-		| TObjectInner (_, stpl) -> List.exists (fun (_,sigs) -> List.exists has_type_param_arg sigs) stpl
-		| TObject(_, pl) -> List.exists has_type_param_arg pl
-		| _ -> false
-
-	and has_type_param_arg = function | TType(_,s) -> has_type_param s | _ -> false
-
-let rec japply_params jparams jsig = match jparams with
-	| [] -> jsig
-	| _ ->
-		match jsig with
-		| TObject(path,p) ->
-			TObject(path, List.map (japply_params_tp jparams ) p)
-		| TObjectInner(sl,stargl) ->
-			TObjectInner(sl,List.map (fun (s,targ) -> (s, List.map (japply_params_tp jparams) targ)) stargl)
-		| TArray(jsig,io) ->
-			TArray(japply_params jparams jsig,io)
-		| TMethod(args,ret) ->
-			TMethod(List.map (japply_params jparams ) args, Option.map (japply_params jparams ) ret)
-		| TTypeParameter s -> (try
-			List.assoc s jparams
-		with | Not_found -> jsig)
-		| _ -> jsig
-
-
-and japply_params_tp jparams jtype_argument = match jtype_argument with
-	| TAny -> TAny
-	| TType(w,jsig) -> TType(w,japply_params jparams jsig)
-
-let mk_jparams jtypes params = match jtypes, params with
-	| [], [] -> []
-	| _, [] -> List.map (fun (s,_,_) -> s, TObject( (["java";"lang"], "Object"), [] ) ) jtypes
-	| _ -> List.map2 (fun (s,_,_) jt -> match jt with
-		| TAny -> s, TObject((["java";"lang"],"Object"),[])
-		| TType(_,jsig) -> s, jsig) jtypes params
-
-let rec compatible_signature_arg ?arg_test f1 f2 =
-	let arg_test = match arg_test with
-		| None -> (fun _ _ -> true)
-		| Some a -> a
-	in
-	if f1 = f2 then
-		true
-	else match f1, f2 with
-	| TObject(p,a), TObject(p2,a2) -> p = p2 && arg_test a a2
-	| TObjectInner(sl, stal), TObjectInner(sl2, stal2) -> sl = sl2 && List.map fst stal = List.map fst stal2
-	| TArray(s,_) , TArray(s2,_) -> compatible_signature_arg s s2
-	| TTypeParameter t1 , TTypeParameter t2 -> t1 = t2
-	| _ -> false
-
-let rec compatible_param p1 p2 = match p1, p2 with
-	| TType (_,s1), TType(_,s2) -> compatible_signature_arg ~arg_test:compatible_tparams s1 s2
-	| TAny, TType(_, TObject( (["java";"lang"],"Object"), _ )) -> true
-	| TType(_, TObject( (["java";"lang"],"Object"), _ )), TAny -> true
-	| _ -> false
-
-and compatible_tparams p1 p2 = try match p1, p2 with
-	| [], [] -> true
-	| _, [] ->
-		let p2 = List.map (fun _ -> TAny) p1 in
-		List.for_all2 compatible_param p1 p2
-	| [], _ ->
-		let p1 = List.map (fun _ -> TAny) p2 in
-		List.for_all2 compatible_param p1 p2
-	| _, _ ->
-		List.for_all2 compatible_param p1 p2
-	with | Invalid_argument("List.for_all2") -> false
-
-let get_adapted_sig f f2 = match f.jf_types with
-	| [] ->
-		f.jf_signature
-	| _ ->
-		let jparams = mk_jparams f.jf_types (List.map (fun (s,_,_) -> TType(WNone, TTypeParameter s)) f2.jf_types) in
-		japply_params jparams f.jf_signature
-
-let compatible_methods f1 f2 =
-	if List.length f1.jf_types <> List.length f2.jf_types then
-		false
-	else match (get_adapted_sig f1 f2), f2.jf_signature with
-	| TMethod(a1,_), TMethod(a2,_) when List.length a1 = List.length a2 ->
-		List.for_all2 compatible_signature_arg a1 a2
-	| _ -> false
-
-let jcl_from_jsig com jsig =
-	let path, params = match jsig with
-	| TObject(path, params) ->
-		path,params
-	| TObjectInner(sl, stll) ->
-		let last_params = ref [] in
-		let real_path = sl, String.concat "$" (List.map (fun (s,p) -> last_params := p; s) stll) in
-		real_path, !last_params
-	| _ -> raise Not_found
-	in
-	match lookup_jclass com path with
-	| None -> raise Not_found
-	| Some(c,_,_) -> c,params
-
-let jclass_with_params com cls params = try
-	match cls.ctypes with
-	| [] -> cls
-	| _ ->
-		let jparams = mk_jparams cls.ctypes params in
-		{ cls with
-			cfields = List.map (fun f -> { f with jf_signature = japply_params jparams f.jf_signature }) cls.cfields;
-			cmethods = List.map (fun f -> { f with jf_signature = japply_params jparams f.jf_signature }) cls.cmethods;
-			csuper = japply_params jparams cls.csuper;
-			cinterfaces = List.map (japply_params jparams) cls.cinterfaces;
-		}
-	with Invalid_argument("List.map2") ->
-		if com.verbose then prerr_endline ("Differing parameters for class: " ^ s_type_path cls.cpath);
-		cls
-
-let is_object = function | TObject( (["java";"lang"], "Object"), [] ) -> true | _ -> false
-
-let is_tobject = function | TObject _ | TObjectInner _ -> true | _ -> false
-
-let simplify_args args =
-	if List.for_all (function | TAny -> true | _ -> false) args then [] else args
-
-let compare_type com s1 s2 =
-	if s1 = s2 then
-		0
-	else if not (is_tobject s1) then
-		if is_tobject s2 then (* Dynamic *)
-			1
-		else if compatible_signature_arg s1 s2 then
-			0
-		else
-			raise Exit
-	else if not (is_tobject s2) then
-		-1
-	else begin
-		let rec loop ?(first_error=true) s1 s2 : bool =
-			if is_object s1 then
-				s1 = s2
-			else if compatible_signature_arg s1 s2 then begin
-				let p1, p2 = match s1, s2 with
-				| TObject(_, p1), TObject(_,p2) ->
-					p1, p2
-				| TObjectInner(_, npl1), TObjectInner(_, npl2) ->
-					snd (List.hd (List.rev npl1)), snd (List.hd (List.rev npl2))
-				| _ -> assert false (* not tobject *)
-				in
-				let p1, p2 = simplify_args p1, simplify_args p2 in
-				let lp1 = List.length p1 in
-				let lp2 = List.length p2 in
-				if lp1 > lp2 then
-					true
-				else if lp2 > lp1 then
-					false
-				else begin
-					(* if compatible tparams, it's fine *)
-					if not (compatible_tparams p1 p2) then
-						raise Exit; (* meaning: found, but incompatible type parameters *)
-					true
-				end
-			end else try
-				let c, p = jcl_from_jsig com s1 in
-				let jparams = mk_jparams c.ctypes p in
-				let super = japply_params jparams c.csuper in
-				let implements = List.map (japply_params jparams) c.cinterfaces in
-				loop ~first_error:first_error super s2 || List.exists (fun super -> loop ~first_error:first_error super s2) implements
-			with | Not_found ->
-				prerr_endline ("-java-lib: The type " ^ (s_sig s1) ^ " is referred but was not found. Compilation may not occur correctly.");
-				prerr_endline "Did you forget to include a needed lib?";
-				if first_error then
-					not (loop ~first_error:false s2 s1)
-				else
-					false
-		in
-		if loop s1 s2 then
-			if loop s2 s1 then
-				0
-			else
-				1
-		else
-			if loop s2 s1 then
-				-1
-			else
-				-2
-	end
-
-(* given a list of same overload functions, choose the best (or none) *)
-let select_best com flist =
-	let rec loop cur_best = function
-		| [] ->
-			Some cur_best
-		| f :: flist -> match get_adapted_sig f cur_best, cur_best.jf_signature with
-			| TMethod(_,Some r), TMethod(_, Some r2) -> (try
-				match compare_type com r r2 with
-				| 0 -> (* same type - select any of them *)
-					loop cur_best flist
-				| 1 ->
-					loop f flist
-				| -1 ->
-					loop cur_best flist
-				| -2 -> (* error - no type is compatible *)
-					if com.verbose then prerr_endline (f.jf_name ^ ": The types " ^ (s_sig r) ^ " and " ^ (s_sig r2) ^ " are incompatible");
-					(* bet that the current best has "beaten" other types *)
-					loop cur_best flist
-				| _ -> assert false
-			with | Exit -> (* incompatible type parameters *)
-				(* error mode *)
-				if com.verbose then prerr_endline (f.jf_name ^ ": Incompatible argument return signatures: " ^ (s_sig r) ^ " and " ^ (s_sig r2));
-				None)
-			| TMethod _, _ -> (* select the method *)
-				loop f flist
-			| _ ->
-				loop cur_best flist
-	in
-	match loop (List.hd flist) (List.tl flist) with
-	| Some f ->
-		Some f
-	| None -> match List.filter (fun f -> not (is_override f)) flist with
-		(* error mode; take off all override methods *)
-		| [] -> None
-		| f :: [] -> Some f
-		| f :: flist -> Some f (* pick one *)
-
-(**** begin normalize_jclass helpers ****)
-
-let fix_overrides_jclass com cls =
-	let force_check = Common.defined com Define.ForceLibCheck in
-	let methods = if force_check then List.map (fun f -> del_override f) cls.cmethods else cls.cmethods in
-	let cmethods = methods in
-	let super_fields = [] in
-	let super_methods = [] in
-	let nonstatics = List.filter (fun f -> not (List.mem JStatic f.jf_flags)) (cls.cfields @ cls.cmethods) in
-
-	let is_pub = fun f -> List.exists (function | JPublic | JProtected -> true | _ -> false) f.jf_flags in
-	let cmethods, super_fields = if not (List.mem JInterface cls.cflags) then
-		List.filter is_pub cmethods,
-		List.filter is_pub super_fields
-	else
-		cmethods,super_fields
-	in
-
-	let rec loop cls super_methods super_fields cmethods nonstatics = try
-		match cls.csuper with
-		| TObject((["java";"lang"],"Object"),_) ->
-				super_methods,super_fields,cmethods,nonstatics
-		| _ ->
-			let cls, params = jcl_from_jsig com cls.csuper in
-			let cls = jclass_with_params com cls params in
-			let nonstatics = (List.filter (fun f -> (List.mem JStatic f.jf_flags)) (cls.cfields @ cls.cmethods)) @ nonstatics in
-			let super_methods = cls.cmethods @ super_methods in
-			let super_fields = cls.cfields @ super_fields in
-			let cmethods = if force_check then begin
-				let overriden = ref [] in
-				let cmethods = List.map (fun jm ->
-					(* TODO rewrite/standardize empty spaces *)
-					if not (is_override jm) && not (List.mem JStatic jm.jf_flags) && List.exists (fun msup ->
-						let ret = msup.jf_name = jm.jf_name && not(List.mem JStatic msup.jf_flags) && compatible_methods msup jm in
-						if ret then begin
-							let f = mk_override msup in
-							overriden := { f with jf_flags = jm.jf_flags } :: !overriden
-						end;
-						ret
-					) cls.cmethods then
-						mk_override jm
-					else
-						jm
-				) cmethods in
-				!overriden @ cmethods
-			end else
-				cmethods
-			in
-			loop cls super_methods super_fields cmethods nonstatics
-		with | Not_found ->
-			super_methods,super_fields,cmethods,nonstatics
-	in
-	loop cls super_methods super_fields cmethods nonstatics
-
-let normalize_jclass com cls =
-	(* after adding the noCheck metadata, this option will annotate what changes were needed *)
-	(* and that are now deprecated *)
-	let force_check = Common.defined com Define.ForceLibCheck in
-	(* fix overrides *)
-	let super_methods, super_fields, cmethods, nonstatics = fix_overrides_jclass com cls in
-	let all_methods = cmethods @ super_methods in
-
-	(* look for interfaces and add missing implementations (may happen on abstracts or by vmsig differences *)
-	(* (libType): even with libType enabled, we need to add these missing fields - otherwise we won't be able to use them from Haxe *)
-	let added_interface_fields = ref [] in
-	let rec loop_interface abstract cls iface = try
-		match iface with
-			| TObject ((["java";"lang"],"Object"), _) -> ()
-			| TObject (path,_) when path = cls.cpath -> ()
-			| _ ->
-				let cif, params = jcl_from_jsig com iface in
-				let cif = jclass_with_params com cif params in
-				List.iter (fun jf ->
-					if not(List.mem JStatic jf.jf_flags) && not (List.exists (fun jf2 -> jf.jf_name = jf2.jf_name && not (List.mem JStatic jf2.jf_flags) && jf.jf_signature = jf2.jf_signature) all_methods) then begin
-						let jf = if abstract && force_check then del_override jf else jf in
-						let jf = { jf with jf_flags = JPublic :: jf.jf_flags } in (* interfaces implementations are always public *)
-
-						added_interface_fields := jf :: !added_interface_fields;
-					end
-				) cif.cmethods;
-				(* we don't need to loop again in the interface unless we are in an abstract class, since these interfaces are already normalized *)
-				if abstract then List.iter (loop_interface abstract cif) cif.cinterfaces;
-		with Not_found -> ()
-	in
-	List.iter (loop_interface (List.mem JAbstract cls.cflags) cls) cls.cinterfaces;
-	let nonstatics = !added_interface_fields @ nonstatics in
-	let cmethods = !added_interface_fields @ cmethods in
-
-	(* for each added field in the interface, lookup in super_methods possible methods to include *)
-	(* so we can choose the better method still *)
-	let cmethods = if not force_check then
-		cmethods
-	else
-		List.fold_left (fun cmethods im ->
-			(* see if any of the added_interface_fields need to be declared as override *)
-			let f = List.find_all (fun jf -> jf.jf_name = im.jf_name && compatible_methods jf im) super_methods in
-			let f = List.map mk_override f in
-			f @ cmethods
-		) cmethods !added_interface_fields;
-	in
-
-	(* take off equals, hashCode and toString from interface *)
-	let cmethods = if List.mem JInterface cls.cflags then List.filter (fun jf -> match jf.jf_name, jf.jf_vmsignature with
-			| "equals", TMethod([TObject( (["java";"lang"],"Object"), _)],_)
-			| "hashCode", TMethod([], _)
-			| "toString", TMethod([], _) -> false
-			| _ -> true
-	) cmethods
-	else
-		cmethods
-	in
-
-	(* change field name to not collide with haxe keywords and with static/non-static members *)
-	let fold_field acc f =
-		let change, both = match f.jf_name with
-		| _ when List.mem JStatic f.jf_flags && List.exists (fun f2 -> f.jf_name = f2.jf_name) nonstatics -> true, true
-		| _ -> is_haxe_keyword f.jf_name, false
-		in
-		let f2 = if change then
-				{ f with jf_name = "%" ^ f.jf_name }
-			else
-				f
-		in
-		if both then f :: f2 :: acc else f2 :: acc
-	in
-
-	(* change static fields that have the same name as methods *)
-	let cfields = List.fold_left fold_field [] cls.cfields in
-	let cmethods = List.fold_left fold_field [] cmethods in
-	(* take off variable fields that have the same name as methods *)
-	(* and take off variables that already have been declared *)
-	let filter_field f f2 = f != f2 && (List.mem JStatic f.jf_flags = List.mem JStatic f2.jf_flags) && f.jf_name = f2.jf_name && f2.jf_kind <> f.jf_kind in
-	let cfields = List.filter (fun f ->
-		if List.mem JStatic f.jf_flags then
-			not (List.exists (filter_field f) cmethods)
-		else
-			not (List.exists (filter_field f) nonstatics) && not (List.exists (fun f2 -> f != f2 && f.jf_name = f2.jf_name && not (List.mem JStatic f2.jf_flags)) super_fields) ) cfields
-	in
-	(* now filter any method that clashes with a field - on a superclass *)
-	let cmethods = if force_check then List.filter (fun f ->
-		if List.mem JStatic f.jf_flags then
-			true
-		else
-			not (List.exists (filter_field f) super_fields) ) cmethods
-	else
-		cmethods
-	in
-	(* removing duplicate fields. They are there because of return type covariance in Java *)
-	(* Also, if a method overrides a previous definition, and changes a type parameters' variance, *)
-	(* we will take it off *)
-	(* this means that some rare codes will never compile on Haxe, but unless Haxe adds variance support *)
-	(* I can't see how this can be any different *)
-	let rec loop acc = function
-		| [] -> acc
-		| f :: cmeths ->
-			match List.partition (fun f2 -> f.jf_name = f2.jf_name && compatible_methods f f2) cmeths with
-			| [], cmeths ->
-				loop (f :: acc) cmeths
-			| flist, cmeths -> match select_best com (f :: flist) with
-				| None ->
-					loop acc cmeths
-				| Some f ->
-					loop (f :: acc) cmeths
-	in
-	(* last pass: take off all cfields that are internal / private (they won't be accessible anyway) *)
-	let cfields = List.filter(fun f -> List.exists (fun f -> f = JPublic || f = JProtected) f.jf_flags) cfields in
-	let cmethods = loop [] cmethods in
-	{ cls with cfields = cfields; cmethods = cmethods }
-
-(**** end normalize_jclass helpers ****)
-
-let get_classes_zip zip =
-	let ret = ref [] in
-	List.iter (function
-		| { Zip.is_directory = false; Zip.filename = f } when (String.sub (String.uncapitalize f) (String.length f - 6) 6) = ".class" && not (String.exists f "$") ->
-				(match List.rev (String.nsplit f "/") with
-				| clsname :: pack ->
-					if not (String.contains clsname '$') then begin
-						let path = jpath_to_hx (List.rev pack, String.sub clsname 0 (String.length clsname - 6)) in
-						ret := path :: !ret
-					end
-				| _ ->
-						ret := ([], jname_to_hx f) :: !ret)
-		| _ -> ()
-	) (Zip.entries zip);
-	!ret
-
-let add_java_lib com file std =
-	let file = if Sys.file_exists file then
-		file
-	else try Common.find_file com file with
-		| Not_found -> try Common.find_file com (file ^ ".jar") with
-		| Not_found ->
-			failwith ("Java lib " ^ file ^ " not found")
-	in
-	let hxpack_to_jpack = Hashtbl.create 16 in
-	let get_raw_class, close, list_all_files =
-		(* check if it is a directory or jar file *)
-		match (Unix.stat file).st_kind with
-		| S_DIR -> (* open classes directly from directory *)
-			let all = ref [] in
-			let rec iter_files pack dir path = try
-				let file = Unix.readdir dir in
-				let filepath = path ^ "/" ^ file in
-				(if String.ends_with file ".class" && not (String.exists file "$") then
-					let file = String.sub file 0 (String.length file - 6) in
-					let path = jpath_to_hx (pack,file) in
-					all := path :: !all;
-					Hashtbl.add hxpack_to_jpack path (pack,file)
-				else if (Unix.stat filepath).st_kind = S_DIR && file <> "." && file <> ".." then
-					let pack = pack @ [file] in
-					iter_files (pack) (Unix.opendir filepath) filepath);
-				iter_files pack dir path
-			with | End_of_file | Unix.Unix_error _ ->
-				Unix.closedir dir
-			in
-			iter_files [] (Unix.opendir file) file;
-			let all = !all in
-
-			(fun (pack, name) ->
-				let real_path = file ^ "/" ^ (String.concat "/" pack) ^ "/" ^ (name ^ ".class") in
-				try
-					let data = Std.input_file ~bin:true real_path in
-					Some(JReader.parse_class (IO.input_string data), real_path, real_path)
-				with
-					| _ -> None), (fun () -> ()), (fun () -> all)
-		| _ -> (* open zip file *)
-			let closed = ref false in
-			let zip = ref (Zip.open_in file) in
-			let check_open () =
-				if !closed then begin
-					prerr_endline ("JAR file " ^ file ^ " already closed"); (* if this happens, find when *)
-					zip := Zip.open_in file;
-					closed := false
-				end
-			in
-			List.iter (function
-				| { Zip.is_directory = false; Zip.filename = filename } when String.ends_with filename ".class" ->
-					let pack = String.nsplit filename "/" in
-					(match List.rev pack with
-						| [] -> ()
-						| name :: pack ->
-							let name = String.sub name 0 (String.length name - 6) in
-							let pack = List.rev pack in
-							Hashtbl.add hxpack_to_jpack (jpath_to_hx (pack,name)) (pack,name))
-				| _ -> ()
-			) (Zip.entries !zip);
-			(fun (pack, name) ->
-				check_open();
-				try
-					let location = (String.concat "/" (pack @ [name]) ^ ".class") in
-					let entry = Zip.find_entry !zip location in
-					let data = Zip.read_entry !zip entry in
-					Some(JReader.parse_class (IO.input_string data), file, file ^ "@" ^ location)
-				with
-					| Not_found ->
-						None),
-			(fun () -> if not !closed then begin closed := true; Zip.close_in !zip end),
-			(fun () -> check_open(); get_classes_zip !zip)
-	in
-	let cached_types = Hashtbl.create 12 in
-	let get_raw_class path =
-		try
-			Hashtbl.find cached_types path
-		with | Not_found -> try
-			let pack, name = Hashtbl.find hxpack_to_jpack path in
-			let try_file (pack,name) =
-				match get_raw_class (pack,name) with
-				| None ->
-						Hashtbl.add cached_types path None;
-						None
-				| Some (i, p1, p2) ->
-						Hashtbl.add cached_types path (Some(i,p1,p2)); (* type loop normalization *)
-						let ret = Some (normalize_jclass com i, p1, p2) in
-						Hashtbl.replace cached_types path ret;
-						ret
-			in
-			try_file (pack,name)
-		with Not_found ->
-			None
-	in
-	let replace_canonical_name p pack name_original name_replace decl =
-		let mk_meta name = (Meta.JavaCanonical, [EConst (String (String.concat "." pack)), p; EConst(String name), p], p) in
-		let add_meta name metas =
-			if Meta.has Meta.JavaCanonical metas then
-				List.map (function
-					| (Meta.JavaCanonical,[EConst (String cpack), _; EConst(String cname), _],_) ->
-						let did_replace,name = String.replace cname name_original name_replace in
-						if not did_replace then print_endline (cname ^ " -> " ^ name_original ^ " -> " ^ name_replace);
-						mk_meta name
-					| m -> m
-				) metas
-			else
-				mk_meta name :: metas
-		in
-		match decl with
-			| EClass c ->
-				EClass { c with d_meta = add_meta (fst c.d_name) c.d_meta }
-			| EEnum e ->
-				EEnum { e with d_meta = add_meta (fst e.d_name) e.d_meta }
-			| EAbstract a ->
-				EAbstract { a with d_meta = add_meta (fst a.d_name) a.d_meta }
-			| d -> d
-	in
-	let rec build ctx path p types =
-		try
-			if List.mem path !types then
-				None
-			else begin
-				let first = match !types with
-					| [ ["java";"lang"], "String" ] | [] -> true
-					| p :: _ ->
-						false
-				in
-				types := path :: !types;
-				match get_raw_class path, path with
-				| None, ([], c) -> build ctx (["haxe";"root"], c) p types
-				| None, _ -> None
-				| Some (cls, real_path, pos_path), _ ->
-						let is_disallowed_inner = first && String.exists (snd cls.cpath) "$" in
-						let is_disallowed_inner = if is_disallowed_inner then begin
-								let outer, inner = String.split (snd cls.cpath) "$" in
-								match get_raw_class (fst path, outer) with
-									| None -> false
-									| _ -> true
-							end else
-								false
-						in
-						if is_disallowed_inner then
-							None
-						else begin
-							if com.verbose then print_endline ("Parsed Java class " ^ (s_type_path cls.cpath));
-							let old_types = ctx.jtparams in
-							ctx.jtparams <- cls.ctypes :: ctx.jtparams;
-
-							let pos = { pfile = pos_path; pmin = 0; pmax = 0; } in
-
-							let pack = match fst path with | ["haxe";"root"] -> [] | p -> p in
-
-							let ppath = Hashtbl.find hxpack_to_jpack path in
-							let inner = List.fold_left (fun acc (path,out,_,_) ->
-								let path = jpath_to_hx path in
-								(if out <> Some ppath then
-									acc
-								else match build ctx path p types with
-									| Some(_,(_, classes)) ->
-										let base = snd ppath ^ "$" in
-										(List.map (fun (def,p) ->
-											replace_canonical_name p (fst ppath) base (snd ppath ^ ".") def, p) classes) @ acc
-									| _ -> acc);
-							) [] cls.cinner_types in
-
-							(* add _Statics class *)
-							let inner = try
-								if not (List.mem JInterface cls.cflags) then raise Not_found;
-								let smethods = List.filter (fun f -> List.mem JStatic f.jf_flags) cls.cmethods in
-								let sfields = List.filter (fun f -> List.mem JStatic f.jf_flags) cls.cfields in
-								if not (smethods <> [] || sfields <> []) then raise Not_found;
-								let obj = TObject( (["java";"lang"],"Object"), []) in
-								let ncls = convert_java_class ctx pos { cls with cmethods = smethods; cfields = sfields; cflags = []; csuper = obj; cinterfaces = []; cinner_types = []; ctypes = [] } in
-								match ncls with
-								| EClass c :: imports ->
-									(EClass { c with d_name = (fst c.d_name ^ "_Statics"),snd c.d_name }, pos) :: inner @ List.map (fun i -> i,pos) imports
-								| _ -> assert false
-							with | Not_found ->
-								inner
-							in
-							let inner_alias = ref SS.empty in
-							List.iter (fun x ->
-								match fst x with
-								| EClass c ->
-									inner_alias := SS.add (fst c.d_name) !inner_alias;
-								| _ -> ()
-							) inner;
-							let alias_list = ref [] in
-							List.iter (fun x ->
-								match x with
-								| (EClass c, pos) -> begin
-									let parts = String.nsplit (fst c.d_name) "_24" in
-									match parts with
-										| _ :: _ ->
-											let alias_name = String.concat "_" parts in
-											if (not (SS.mem alias_name !inner_alias)) && (not (String.exists (snd path) "_24")) then begin
-												let alias_def = ETypedef {
-													d_name = alias_name,null_pos;
-													d_doc = None;
-													d_params = c.d_params;
-													d_meta = [];
-													d_flags = [];
-													d_data = CTPath {
-														tpackage = pack;
-														tname = snd path;
-														tparams = List.map (fun tp ->
-															TPType (CTPath {
-																tpackage = [];
-																tname = fst tp.tp_name;
-																tparams = [];
-																tsub = None;
-															},null_pos)
-														) c.d_params;
-														tsub = Some(fst c.d_name);
-													},null_pos;
-												} in
-												inner_alias := SS.add alias_name !inner_alias;
-												alias_list := (alias_def, pos) :: !alias_list;
-											end
-										| _ -> ()
-								end
-								| _ -> ()
-							) inner;
-							let inner = List.concat [!alias_list ; inner] in
-							let classes = List.map (fun t -> t,pos) (convert_java_class ctx pos cls) in
-							let imports, defs = List.partition (function | (EImport(_),_) -> true | _ -> false) (classes @ inner) in
-							let ret = Some ( real_path, (pack, imports @ defs) ) in
-							ctx.jtparams <- old_types;
-							ret
-						end
-			end
-		with
-		| JReader.Error_message msg ->
-			prerr_endline ("Class reader failed: " ^ msg);
-			None
-		| e ->
-			if com.verbose then begin
-				(* prerr_endline (Printexc.get_backtrace ()); requires ocaml 3.11 *)
-				prerr_endline (Printexc.to_string e)
-			end;
-			None
-	in
-	let build path p = build (create_ctx com) path p (ref [["java";"lang"], "String"]) in
-	let cached_files = ref None in
-	let list_all_files () = match !cached_files with
-		| None ->
-				let ret = list_all_files () in
-				cached_files := Some ret;
-				ret
-		| Some r -> r
-	in
-
-	(* TODO: add_dependency m mdep *)
-	com.load_extern_type <- com.load_extern_type @ [build];
-	com.java_libs <- (file, std, close, list_all_files, get_raw_class) :: com.java_libs
diff --git a/src/generators/genjs.ml b/src/generators/genjs.ml
index 8ea57fecfa1b574f81c863fbe308b972bfb124f3..6a28d7bf8b01d9ff2b724f580a3139faa45f3493 100644
--- a/src/generators/genjs.ml
+++ b/src/generators/genjs.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -27,13 +27,17 @@ type sourcemap = {
 	sources_hash : (string, int) Hashtbl.t;
 	mappings : Rbuffer.t;
 
-	mutable source_last_line : int;
-	mutable source_last_col : int;
-	mutable source_last_file : int;
+	mutable source_last_pos : sourcemap_pos;
 	mutable print_comma : bool;
 	mutable output_last_col : int;
 	mutable output_current_col : int;
-	mutable current_expr : texpr option;
+	mutable current_expr : sourcemap_pos option;
+}
+
+and sourcemap_pos = {
+	file : int;
+	line : int;
+	col : int;
 }
 
 type ctx = {
@@ -44,15 +48,15 @@ type ctx = {
 	smap : sourcemap option;
 	js_modern : bool;
 	js_flatten : bool;
+	has_resolveClass : bool;
+	has_interface_check : bool;
 	es_version : int;
-	store_exception_stack : bool;
 	mutable current : tclass;
-	mutable statics : (tclass * string * texpr) list;
+	mutable statics : (tclass * tclass_field * texpr) list;
 	mutable inits : texpr list;
 	mutable tabs : string;
 	mutable in_value : tvar option;
 	mutable in_loop : bool;
-	mutable handle_break : bool;
 	mutable id_counter : int;
 	mutable type_accessor : module_type -> string;
 	mutable separator : bool;
@@ -68,34 +72,40 @@ let get_exposed ctx path meta =
 	try
 		let (_, args, pos) = Meta.get Meta.Expose meta in
 		(match args with
-			| [ EConst (String s), _ ] -> [s]
+			| [ EConst (String(s,_)), _ ] -> [s]
 			| [] -> [path]
 			| _ -> abort "Invalid @:expose parameters" pos)
 	with Not_found -> []
 
 let dot_path = s_type_path
 
-let flat_path (p,s) =
-	(* Replace _ with _$ in paths to prevent name collisions. *)
-	let escape str = String.concat "_$" (ExtString.String.nsplit str "_") in
-
-	match p with
-	| [] -> escape s
-	| _ -> String.concat "_" (List.map escape p) ^ "_" ^ (escape s)
-
-let s_path ctx = if ctx.js_flatten then flat_path else dot_path
-
-let kwds =
-	let h = Hashtbl.create 0 in
-	List.iter (fun s -> Hashtbl.add h s ()) [
-		"abstract"; "as"; "boolean"; "break"; "byte"; "case"; "catch"; "char"; "class"; "continue"; "const";
-		"debugger"; "default"; "delete"; "do"; "double"; "else"; "enum"; "export"; "extends"; "false"; "final";
-		"finally"; "float"; "for"; "function"; "goto"; "if"; "implements"; "import"; "in"; "instanceof"; "int";
-		"interface"; "is"; "let"; "long"; "namespace"; "native"; "new"; "null"; "package"; "private"; "protected";
-		"public"; "return"; "short"; "static"; "super"; "switch"; "synchronized"; "this"; "throw"; "throws";
-		"transient"; "true"; "try"; "typeof"; "use"; "var"; "void"; "volatile"; "while"; "with"; "yield"
-	];
-	h
+let s_path ctx = if ctx.js_flatten then Path.flat_path else dot_path
+
+let kwds = Hashtbl.create 0
+
+let es3kwds = [
+	"abstract"; "boolean"; "break"; "byte"; "case"; "catch"; "char"; "class"; "const"; "continue";
+	"debugger"; "default"; "delete"; "do"; "double"; "else"; "enum"; "export"; "extends"; "false"; "final";
+	"finally"; "float"; "for"; "function"; "goto"; "if"; "implements"; "import"; "in"; "instanceof"; "int";
+	"interface"; "long"; "native"; "new"; "null"; "package"; "private"; "protected";
+	"public"; "return"; "short"; "static"; "super"; "switch"; "synchronized"; "this"; "throw"; "throws";
+	"transient"; "true"; "try"; "typeof"; "var"; "void"; "volatile"; "while"; "with"
+]
+
+let es5kwds = [
+	"arguments"; "break"; "case"; "catch"; "class"; "const"; "continue";
+	"debugger"; "default"; "delete"; "do"; "else"; "enum"; "eval"; "export"; "extends"; "false";
+	"finally"; "for"; "function"; "if"; "implements"; "import"; "in"; "instanceof";
+	"interface"; "let"; "new"; "null"; "package"; "private"; "protected";
+	"public"; "return"; "static"; "super"; "switch"; "this"; "throw";
+	"true"; "try"; "typeof"; "var"; "void"; "while"; "with"; "yield"
+]
+
+let setup_kwds com =
+	Hashtbl.reset kwds;
+	let es_version = get_es_version com in
+	let lst = if es_version >= 5 then es5kwds else es3kwds in
+	List.iter (fun s -> Hashtbl.add kwds s ()) lst
 
 (* Identifiers Haxe reserves to make the JS output cleaner. These can still be used in untyped code (TLocal),
    but are escaped upon declaration. *)
@@ -122,25 +132,81 @@ let valid_js_ident s =
 	with Exit ->
 		false
 
-let field s = if Hashtbl.mem kwds s || not (valid_js_ident s) then "[\"" ^ s ^ "\"]" else "." ^ s
+let field s = if not (valid_js_ident s) then "[\"" ^ s ^ "\"]" else "." ^ s
 let ident s = if Hashtbl.mem kwds s then "$" ^ s else s
 let check_var_declaration v = if Hashtbl.mem kwds2 v.v_name then v.v_name <- "$" ^ v.v_name
 
 let anon_field s = if Hashtbl.mem kwds s || not (valid_js_ident s) then "'" ^ s ^ "'" else s
-let static_field c s =
-	match s with
-	| "length" | "name" when not c.cl_extern || Meta.has Meta.HxGen c.cl_meta-> ".$" ^ s
-	| s -> field s
+let static_field ctx c s =
+		match s with
+		| "length" | "name" when not c.cl_extern || Meta.has Meta.HxGen c.cl_meta->
+			let with_dollar = ".$" ^ s in
+			if get_es_version ctx.com >= 6 then
+				try
+					let f = PMap.find s c.cl_statics in
+					match f.cf_kind with
+					| Method _ -> "." ^ s
+					| _ -> with_dollar
+				with Not_found ->
+					with_dollar
+			else
+				with_dollar
+		| s -> field s
 
 let has_feature ctx = Common.has_feature ctx.com
 let add_feature ctx = Common.add_feature ctx.com
 
 let unsupported p = abort "This expression cannot be compiled to Javascript" p
 
+let encode_mapping smap pos =
+	if smap.print_comma then
+		Rbuffer.add_char smap.mappings ','
+	else
+		smap.print_comma <- true;
+
+	let base64_vlq number =
+		let encode_digit digit =
+			let chars = [|
+				'A';'B';'C';'D';'E';'F';'G';'H';'I';'J';'K';'L';'M';'N';'O';'P';
+				'Q';'R';'S';'T';'U';'V';'W';'X';'Y';'Z';'a';'b';'c';'d';'e';'f';
+				'g';'h';'i';'j';'k';'l';'m';'n';'o';'p';'q';'r';'s';'t';'u';'v';
+				'w';'x';'y';'z';'0';'1';'2';'3';'4';'5';'6';'7';'8';'9';'+';'/'
+			|] in
+			Array.unsafe_get chars digit
+		in
+		let to_vlq number =
+			if number < 0 then
+				((-number) lsl 1) + 1
+			else
+				number lsl 1
+		in
+		let rec loop vlq =
+			let shift = 5 in
+			let base = 1 lsl shift in
+			let mask = base - 1 in
+			let continuation_bit = base in
+			let digit = vlq land mask in
+			let next = vlq asr shift in
+			Rbuffer.add_char smap.mappings (encode_digit (
+				if next > 0 then digit lor continuation_bit else digit));
+			if next > 0 then loop next else ()
+		in
+		loop (to_vlq number)
+	in
+
+	base64_vlq (smap.output_current_col - smap.output_last_col);
+	base64_vlq (pos.file - smap.source_last_pos.file);
+	base64_vlq (pos.line - smap.source_last_pos.line);
+	base64_vlq (pos.col - smap.source_last_pos.col);
+
+	smap.source_last_pos <- pos;
+	smap.output_last_col <- smap.output_current_col
+
+let noop () = ()
+
+let add_mapping smap pos =
+	if pos.pmin < 0 then noop else
 
-let add_mapping smap force e =
-	if e.epos.pmin < 0 then () else
-	let pos = e.epos in
 	let file = try
 		Hashtbl.find smap.sources_hash pos.pfile
 	with Not_found ->
@@ -149,55 +215,23 @@ let add_mapping smap force e =
 		DynArray.add smap.sources pos.pfile;
 		length
 	in
-	let line, col = Lexer.find_pos pos in
-	let line = line - 1 in
-	if force || smap.source_last_file != file || smap.source_last_line != line || smap.source_last_col != col then begin
-		smap.current_expr <- Some e;
-		if smap.print_comma then
-			Rbuffer.add_char smap.mappings ','
-		else
-			smap.print_comma <- true;
-
-		let base64_vlq number =
-			let encode_digit digit =
-				let chars = [|
-					'A';'B';'C';'D';'E';'F';'G';'H';'I';'J';'K';'L';'M';'N';'O';'P';
-					'Q';'R';'S';'T';'U';'V';'W';'X';'Y';'Z';'a';'b';'c';'d';'e';'f';
-					'g';'h';'i';'j';'k';'l';'m';'n';'o';'p';'q';'r';'s';'t';'u';'v';
-					'w';'x';'y';'z';'0';'1';'2';'3';'4';'5';'6';'7';'8';'9';'+';'/'
-				|] in
-				Array.unsafe_get chars digit
-			in
-			let to_vlq number =
-				if number < 0 then
-					((-number) lsl 1) + 1
-				else
-					number lsl 1
-			in
-			let rec loop vlq =
-				let shift = 5 in
-				let base = 1 lsl shift in
-				let mask = base - 1 in
-				let continuation_bit = base in
-				let digit = vlq land mask in
-				let next = vlq asr shift in
-				Rbuffer.add_char smap.mappings (encode_digit (
-					if next > 0 then digit lor continuation_bit else digit));
-				if next > 0 then loop next else ()
-			in
-			loop (to_vlq number)
-		in
 
-		base64_vlq (smap.output_current_col - smap.output_last_col);
-		base64_vlq (file - smap.source_last_file);
-		base64_vlq (line - smap.source_last_line);
-		base64_vlq (col - smap.source_last_col);
+	let pos =
+		let line, col = Lexer.find_pos pos in
+		let line = line - 1 in
+		{ file = file; line = line; col = col }
+	in
 
-		smap.source_last_file <- file;
-		smap.source_last_line <- line;
-		smap.source_last_col <- col;
-		smap.output_last_col <- smap.output_current_col
-	end
+	if smap.source_last_pos <> pos then begin
+		let old_current_expr = smap.current_expr in
+		smap.current_expr <- Some pos;
+		encode_mapping smap pos;
+		(fun () -> smap.current_expr <- old_current_expr)
+	end else
+		noop
+
+let add_mapping ctx e =
+	Option.map_default (fun smap -> add_mapping smap e.epos) noop ctx.smap
 
 let handle_newlines ctx str =
 	Option.may (fun smap ->
@@ -208,7 +242,7 @@ let handle_newlines ctx str =
 				smap.output_last_col <- 0;
 				smap.output_current_col <- 0;
 				smap.print_comma <- false;
-				Option.may (fun e -> add_mapping smap true e) smap.current_expr;
+				Option.may (encode_mapping smap) smap.current_expr;
 				loop next
 			end with Not_found ->
 				smap.output_current_col <- smap.output_current_col + (String.length str - from);
@@ -234,7 +268,7 @@ let print ctx =
 
 let write_mappings ctx smap =
 	let basefile = Filename.basename ctx.com.file in
-	print ctx "\n//# sourceMappingURL=%s.map" basefile;
+	print ctx "\n//# sourceMappingURL=%s.map" (url_encode_s basefile);
 	let channel = open_out_bin (ctx.com.file ^ ".map") in
 	let sources = DynArray.to_list smap.sources in
 	let to_url file =
@@ -249,7 +283,7 @@ let write_mappings ctx smap =
 		"],\n");
 	if Common.defined ctx.com Define.SourceMapContent then begin
 		output_string channel ("\"sourcesContent\":[" ^
-			(String.concat "," (List.map (fun s -> try "\"" ^ Ast.s_escape (Std.input_file ~bin:true s) ^ "\"" with _ -> "null") sources)) ^
+			(String.concat "," (List.map (fun s -> try "\"" ^ StringHelper.s_escape (Std.input_file ~bin:true s) ^ "\"" with _ -> "null") sources)) ^
 			"],\n");
 	end;
 	output_string channel "\"names\":[],\n";
@@ -285,8 +319,8 @@ let rec concat ctx s f = function
 let fun_block ctx f p =
 	let e = List.fold_left (fun e (a,c) ->
 		match c with
-		| None | Some TNull -> e
-		| Some c -> Type.concat (Codegen.set_default ctx.com a c p) e
+		| None | Some {eexpr = TConst TNull} -> e
+		| Some c -> Type.concat (Texpr.set_default ctx.com.basic a c p) e
 	) f.tf_expr f.tf_args in
 	e
 
@@ -295,43 +329,13 @@ let open_block ctx =
 	ctx.tabs <- "\t" ^ ctx.tabs;
 	(fun() -> ctx.tabs <- oldt)
 
-let rec has_return e =
-	match e.eexpr with
-	| TBlock [] -> false
-	| TBlock el -> has_return (List.hd (List.rev el))
-	| TReturn _ -> true
-	| _ -> false
-
-let rec iter_switch_break in_switch e =
+let rec needs_switch_break e =
 	match e.eexpr with
-	| TFunction _ | TWhile _ | TFor _ -> ()
-	| TSwitch _ when not in_switch -> iter_switch_break true e
-	| TBreak when in_switch -> raise Exit
-	| _ -> iter (iter_switch_break in_switch) e
-
-let handle_break ctx e =
-	let old = ctx.in_loop, ctx.handle_break in
-	ctx.in_loop <- true;
-	try
-		iter_switch_break false e;
-		ctx.handle_break <- false;
-		(fun() ->
-			ctx.in_loop <- fst old;
-			ctx.handle_break <- snd old;
-		)
-	with
-		Exit ->
-			spr ctx "try {";
-			let b = open_block ctx in
-			newline ctx;
-			ctx.handle_break <- true;
-			(fun() ->
-				b();
-				ctx.in_loop <- fst old;
-				ctx.handle_break <- snd old;
-				newline ctx;
-				spr ctx "} catch( e ) { if( e != \"__break__\" ) throw e; }";
-			)
+	| TBlock [] -> true
+	| TBlock el -> needs_switch_break (List.hd (List.rev el))
+	| TMeta ((Meta.LoopLabel,_,_), {eexpr = TBreak})
+	| TContinue | TReturn _ | TThrow _ -> false
+	| _ -> true
 
 let this ctx = match ctx.in_value with None -> "this" | Some _ -> "$this"
 
@@ -358,15 +362,18 @@ let is_dynamic_iterator ctx e =
 let gen_constant ctx p = function
 	| TInt i -> print ctx "%ld" i
 	| TFloat s -> spr ctx s
-	| TString s -> print ctx "\"%s\"" (Ast.s_escape s)
+	| TString s -> print ctx "\"%s\"" (StringHelper.s_escape s)
 	| TBool b -> spr ctx (if b then "true" else "false")
 	| TNull -> spr ctx "null"
 	| TThis -> spr ctx (this ctx)
-	| TSuper -> assert false
+	| TSuper -> assert (ctx.es_version >= 6); spr ctx "super"
+
+let print_deprecation_message com msg p =
+	com.warning msg p
 
 let rec gen_call ctx e el in_value =
 	match e.eexpr , el with
-	| TConst TSuper , params ->
+	| TConst TSuper , params when ctx.es_version < 6 ->
 		(match ctx.current.cl_super with
 		| None -> abort "Missing api.setCurrentClass" e.epos
 		| Some (c,_) ->
@@ -374,7 +381,7 @@ let rec gen_call ctx e el in_value =
 			List.iter (fun p -> print ctx ","; gen_value ctx p) params;
 			spr ctx ")";
 		);
-	| TField ({ eexpr = TConst TSuper },f) , params ->
+	| TField ({ eexpr = TConst TSuper },f) , params when ctx.es_version < 6 ->
 		(match ctx.current.cl_super with
 		| None -> abort "Missing api.setCurrentClass" e.epos
 		| Some (c,_) ->
@@ -383,64 +390,42 @@ let rec gen_call ctx e el in_value =
 			List.iter (fun p -> print ctx ","; gen_value ctx p) params;
 			spr ctx ")";
 		);
-	| TCall (x,_) , el when (match x.eexpr with TLocal { v_name = "__js__" } -> false | _ -> true) ->
+	| TCall (x,_) , el when (match x.eexpr with TIdent "__js__" -> false | _ -> true) ->
 		spr ctx "(";
 		gen_value ctx e;
 		spr ctx ")";
 		spr ctx "(";
 		concat ctx "," (gen_value ctx) el;
 		spr ctx ")";
-	| TLocal { v_name = "__new__" }, { eexpr = TConst (TString cl) } :: params ->
-		print ctx "new %s(" cl;
-		concat ctx "," (gen_value ctx) params;
-		spr ctx ")";
-	| TLocal { v_name = "__new__" }, e :: params ->
-		spr ctx "new ";
-		gen_value ctx e;
-		spr ctx "(";
-		concat ctx "," (gen_value ctx) params;
-		spr ctx ")";
-	| TLocal { v_name = "__js__" }, [{ eexpr = TConst (TString "this") }] ->
-		spr ctx (this ctx)
-	| TLocal { v_name = "__js__" }, [{ eexpr = TConst (TString code) }] ->
-		spr ctx (String.concat "\n" (ExtString.String.nsplit code "\r\n"))
-	| TLocal { v_name = "__js__" }, { eexpr = TConst (TString code); epos = p } :: tl ->
-		Codegen.interpolate_code ctx.com code tl (spr ctx) (gen_expr ctx) p
-	| TLocal { v_name = "__instanceof__" },  [o;t] ->
-		spr ctx "(";
-		gen_value ctx o;
-		print ctx " instanceof ";
-		gen_value ctx t;
-		spr ctx ")";
-	| TLocal { v_name = "__typeof__" },  [o] ->
-		spr ctx "typeof(";
-		gen_value ctx o;
-		spr ctx ")";
-	| TLocal { v_name = "__strict_eq__" } , [x;y] ->
-		(* add extra parenthesis here because of operator precedence *)
-		spr ctx "((";
-		gen_value ctx x;
-		spr ctx ") === ";
-		gen_value ctx y;
-		spr ctx ")";
-	| TLocal { v_name = "__strict_neq__" } , [x;y] ->
-		(* add extra parenthesis here because of operator precedence *)
-		spr ctx "((";
-		gen_value ctx x;
-		spr ctx ") !== ";
-		gen_value ctx y;
-		spr ctx ")";
-	| TLocal ({v_name = "__define_feature__"}), [_;e] ->
+	| TField (_, FStatic ({ cl_path = ["js"],"Syntax" }, { cf_name = meth })), args ->
+		gen_syntax ctx meth args e.epos
+	| TIdent "__new__", args ->
+		print_deprecation_message ctx.com "__new__ is deprecated, use js.Syntax.construct instead" e.epos;
+		gen_syntax ctx "construct" args e.epos
+	| TIdent "__js__", args ->
+		(* TODO: add deprecation warning when we figure out what to do with purity here *)
+		gen_syntax ctx "code" args e.epos
+	| TIdent "__instanceof__",  args ->
+		print_deprecation_message ctx.com "__instanceof__ is deprecated, use js.Syntax.instanceof instead" e.epos;
+		gen_syntax ctx "instanceof" args e.epos
+	| TIdent "__typeof__",  args ->
+		print_deprecation_message ctx.com "__typeof__ is deprecated, use js.Syntax.typeof instead" e.epos;
+		gen_syntax ctx "typeof" args e.epos
+	| TIdent "__strict_eq__" , args ->
+		print_deprecation_message ctx.com "__strict_eq__ is deprecated, use js.Syntax.strictEq instead" e.epos;
+		gen_syntax ctx "strictEq" args e.epos
+	| TIdent "__strict_neq__" , args ->
+		print_deprecation_message ctx.com "__strict_neq__ is deprecated, use js.Syntax.strictNeq instead" e.epos;
+		gen_syntax ctx "strictNeq" args e.epos
+	| TIdent "__define_feature__", [_;e] ->
 		gen_expr ctx e
-	| TLocal { v_name = "__feature__" }, { eexpr = TConst (TString f) } :: eif :: eelse ->
+	| TIdent "__feature__", { eexpr = TConst (TString f) } :: eif :: eelse ->
 		(if has_feature ctx f then
 			gen_value ctx eif
 		else match eelse with
 			| [] -> ()
 			| e :: _ -> gen_value ctx e)
-	| TLocal { v_name = "__rethrow__" }, [] ->
-		spr ctx "throw $hx_rethrow";
-	| TLocal { v_name = "__resources__" }, [] ->
+	| TIdent "__resources__", [] ->
 		spr ctx "[";
 		concat ctx "," (fun (name,data) ->
 			spr ctx "{ ";
@@ -451,7 +436,7 @@ let rec gen_call ctx e el in_value =
 			spr ctx "}"
 		) (Hashtbl.fold (fun name data acc -> (name,data) :: acc) ctx.com.resources []);
 		spr ctx "]";
-	| TLocal { v_name = "`trace" }, [e;infos] ->
+	| TIdent "`trace", [e;infos] ->
 		if has_feature ctx "haxe.Log.trace" then begin
 			let t = (try List.find (fun t -> t_path t = (["haxe"],"Log")) ctx.com.types with _ -> assert false) in
 			spr ctx (ctx.type_accessor t);
@@ -462,9 +447,21 @@ let rec gen_call ctx e el in_value =
 			spr ctx ")";
 		end else begin
 			spr ctx "console.log(";
+			(match infos.eexpr with
+			| TObjectDecl (
+				(("fileName",_,_) , { eexpr = (TConst (TString file)) }) ::
+				(("lineNumber",_,_) , { eexpr = (TConst (TInt line)) }) :: _) ->
+					print ctx "\"%s:%i:\"," file (Int32.to_int line)
+			| _ ->
+				());
 			gen_value ctx e;
 			spr ctx ")";
 		end
+	| TField (x,f), [] when field_name f = "iterator" && is_dynamic_iterator ctx e ->
+		add_feature ctx "use.$getIterator";
+		print ctx "$getIterator(";
+		gen_value ctx x;
+		print ctx ")";
 	| _ ->
 		gen_value ctx e;
 		spr ctx "(";
@@ -485,7 +482,7 @@ and add_objectdecl_parens e =
 	loop e
 
 and gen_expr ctx e =
-	Option.may (fun smap -> add_mapping smap false e) ctx.smap;
+	let clear_mapping = add_mapping ctx e in
 	(match e.eexpr with
 	| TConst c -> gen_constant ctx e.epos c
 	| TLocal v -> spr ctx (ident v.v_name)
@@ -542,9 +539,21 @@ and gen_expr ctx e =
 			print ctx "($_=";
 			gen_value ctx x;
 			print ctx ",$bind($_,$_%s))" (if Meta.has Meta.SelfCall f.cf_meta then "" else (field f.cf_name)))
-	| TEnumParameter (x,_,i) ->
+	| TEnumIndex x ->
 		gen_value ctx x;
-		print ctx "[%i]" (i + 2)
+		if not (Common.defined ctx.com Define.JsEnumsAsArrays) then
+		print ctx "._hx_index"
+		else
+		print ctx "[1]"
+	| TEnumParameter (x,f,i) ->
+		gen_value ctx x;
+		if not (Common.defined ctx.com Define.JsEnumsAsArrays) then
+			let fname = (match f.ef_type with TFun((args,_)) -> let fname,_,_ = List.nth args i in  fname | _ -> assert false ) in
+			print ctx ".%s" (ident fname)
+		else
+			print ctx "[%i]" (i + 2)
+	| TField (_, FStatic ({cl_path = [],""},f)) ->
+		spr ctx f.cf_name;
 	| TField (x, (FInstance(_,_,f) | FStatic(_,f) | FAnon(f))) when Meta.has Meta.SelfCall f.cf_meta ->
 		gen_value ctx x;
 	| TField (x,f) ->
@@ -556,13 +565,21 @@ and gen_expr ctx e =
 		let x = skip x in
 		gen_value ctx x;
 		let name = field_name f in
-		spr ctx (match f with FStatic(c,_) -> static_field c name | FEnum _ | FInstance _ | FAnon _ | FDynamic _ | FClosure _ -> field name)
+		spr ctx (match f with FStatic(c,_) -> static_field ctx c name | FEnum _ | FInstance _ | FAnon _ | FDynamic _ | FClosure _ -> field name)
 	| TTypeExpr t ->
 		spr ctx (ctx.type_accessor t)
 	| TParenthesis e ->
 		spr ctx "(";
 		gen_value ctx e;
 		spr ctx ")";
+	| TMeta ((Meta.LoopLabel,[(EConst(Int n),_)],_), e) ->
+		(match e.eexpr with
+		| TWhile _ | TFor _ ->
+			print ctx "_hx_loop%s: " n;
+			gen_expr ctx e
+		| TBreak ->
+			print ctx "break _hx_loop%s" n;
+		| _ -> assert false)
 	| TMeta (_,e) ->
 		gen_expr ctx e
 	| TReturn eo ->
@@ -575,7 +592,7 @@ and gen_expr ctx e =
 			gen_value ctx e);
 	| TBreak ->
 		if not ctx.in_loop then unsupported e.epos;
-		if ctx.handle_break then spr ctx "throw \"__break__\"" else spr ctx "break"
+		spr ctx "break"
 	| TContinue ->
 		if not ctx.in_loop then unsupported e.epos;
 		spr ctx "continue"
@@ -587,14 +604,7 @@ and gen_expr ctx e =
 		newline ctx;
 		print ctx "}";
 	| TFunction f ->
-		let old = ctx.in_value, ctx.in_loop in
-		ctx.in_value <- None;
-		ctx.in_loop <- false;
-		print ctx "function(%s) " (String.concat "," (List.map ident (List.map arg_name f.tf_args)));
-		gen_expr ctx (fun_block ctx f e.epos);
-		ctx.in_value <- fst old;
-		ctx.in_loop <- snd old;
-		ctx.separator <- true
+		gen_function ctx f e.epos
 	| TCall (e,el) ->
 		gen_call ctx e el false
 	| TArrayDecl el ->
@@ -644,32 +654,35 @@ and gen_expr ctx e =
 		gen_value ctx e;
 		spr ctx (Ast.s_unop op)
 	| TWhile (cond,e,Ast.NormalWhile) ->
-		let handle_break = handle_break ctx e in
+		let old_in_loop = ctx.in_loop in
+		ctx.in_loop <- true;
 		spr ctx "while";
 		gen_value ctx cond;
 		spr ctx " ";
 		gen_expr ctx e;
-		handle_break();
+		ctx.in_loop <- old_in_loop
 	| TWhile (cond,e,Ast.DoWhile) ->
-		let handle_break = handle_break ctx e in
+		let old_in_loop = ctx.in_loop in
+		ctx.in_loop <- true;
 		spr ctx "do ";
 		gen_expr ctx e;
 		semicolon ctx;
 		spr ctx " while";
 		gen_value ctx cond;
-		handle_break();
+		ctx.in_loop <- old_in_loop
 	| TObjectDecl fields ->
 		spr ctx "{ ";
-		concat ctx ", " (fun (f,e) -> (match e.eexpr with
-			| TMeta((Meta.QuotedField,_,_),e) -> print ctx "\"%s\" : " (Ast.s_escape f);
-			| _ -> print ctx "%s : " (anon_field f));
+		concat ctx ", " (fun ((f,_,qs),e) -> (match qs with
+			| DoubleQuotes -> print ctx "\"%s\" : " (StringHelper.s_escape f);
+			| NoQuotes -> print ctx "%s : " (anon_field f));
 			gen_value ctx e
 		) fields;
 		spr ctx "}";
 		ctx.separator <- true
 	| TFor (v,it,e) ->
 		check_var_declaration v;
-		let handle_break = handle_break ctx e in
+		let old_in_loop = ctx.in_loop in
+		ctx.in_loop <- true;
 		let it = ident (match it.eexpr with
 			| TLocal v -> v.v_name
 			| _ ->
@@ -689,111 +702,15 @@ and gen_expr ctx e =
 		bend();
 		newline ctx;
 		spr ctx "}";
-		handle_break();
-	| TTry (e,catchs) ->
+		ctx.in_loop <- old_in_loop
+	| TTry (etry,[(v,ecatch)]) ->
 		spr ctx "try ";
-		gen_expr ctx e;
-		let vname = (match catchs with [(v,_)] -> check_var_declaration v; v.v_name | _ ->
-			let id = ctx.id_counter in
-			ctx.id_counter <- ctx.id_counter + 1;
-			"$e" ^ string_of_int id
-		) in
-		print ctx " catch( %s ) {" vname;
-		let bend = open_block ctx in
-		let last = ref false in
-		let else_block = ref false in
-
-		if ctx.store_exception_stack then begin
-			newline ctx;
-			print ctx "%s.lastException = %s" (ctx.type_accessor (TClassDecl { null_class with cl_path = ["haxe"],"CallStack" })) vname
-		end;
-
-		if (has_feature ctx "js.Lib.rethrow") then begin
-			let has_rethrow (_,e) =
-				let rec loop e = match e.eexpr with
-				| TCall({eexpr = TLocal {v_name = "__rethrow__"}}, []) -> raise Exit
-				| _ -> Type.iter loop e
-				in
-				try (loop e; false) with Exit -> true
-			in
-			if List.exists has_rethrow catchs then begin
-				newline ctx;
-				print ctx "var $hx_rethrow = %s" vname;
-			end
-		end;
-
-		if (has_feature ctx "js.Boot.HaxeError") then begin
-			let catch_var_used =
-				try
-					List.iter (fun (v,e) ->
-						match follow v.v_type with
-						| TDynamic _ -> (* Dynamic catch - unrap if the catch value is used *)
-							let rec loop e = match e.eexpr with
-							| TLocal v2 when v2 == v -> raise Exit
-							| _ -> Type.iter loop e
-							in
-							loop e
-						| _ -> (* not a Dynamic catch - we need to unwrap the error for type-checking *)
-							raise Exit
-					) catchs;
-					false
-				with Exit ->
-					true
-			in
-			if catch_var_used then begin
-				newline ctx;
-				print ctx "if (%s instanceof %s) %s = %s.val" vname (ctx.type_accessor (TClassDecl { null_class with cl_path = ["js";"_Boot"],"HaxeError" })) vname vname;
-			end;
-		end;
-
-		List.iter (fun (v,e) ->
-			if !last then () else
-			let t = (match follow v.v_type with
-			| TEnum (e,_) -> Some (TEnumDecl e)
-			| TInst (c,_) -> Some (TClassDecl c)
-			| TAbstract (a,_) -> Some (TAbstractDecl a)
-			| TFun _
-			| TLazy _
-			| TType _
-			| TAnon _ ->
-				assert false
-			| TMono _
-			| TDynamic _ ->
-				None
-			) in
-			match t with
-			| None ->
-				last := true;
-				if !else_block then print ctx "{";
-				if vname <> v.v_name then begin
-					newline ctx;
-					print ctx "var %s = %s" v.v_name vname;
-				end;
-				gen_block_element ctx e;
-				if !else_block then begin
-					newline ctx;
-					print ctx "}";
-				end
-			| Some t ->
-				if not !else_block then newline ctx;
-				print ctx "if( %s.__instanceof(%s," (ctx.type_accessor (TClassDecl { null_class with cl_path = ["js"],"Boot" })) vname;
-				gen_value ctx (mk (TTypeExpr t) (mk_mono()) e.epos);
-				spr ctx ") ) {";
-				let bend = open_block ctx in
-				if vname <> v.v_name then begin
-					newline ctx;
-					print ctx "var %s = %s" v.v_name vname;
-				end;
-				gen_block_element ctx e;
-				bend();
-				newline ctx;
-				spr ctx "} else ";
-				else_block := true
-		) catchs;
-		if not !last then print ctx "throw(%s)" vname;
-		bend();
-		newline ctx;
-		spr ctx "}";
+		gen_expr ctx etry;
+		check_var_declaration v;
+		print ctx " catch( %s ) " v.v_name;
+		gen_expr ctx ecatch
+	| TTry _ ->
+		abort "Unhandled try/catch, please report" e.epos
 	| TSwitch (e,cases,def) ->
 		spr ctx "switch";
 		gen_value ctx e;
@@ -811,7 +728,7 @@ and gen_expr ctx e =
 			) el;
 			let bend = open_block ctx in
 			gen_block_element ctx e2;
-			if not (has_return e2) then begin
+			if needs_switch_break e2 then begin
 				newline ctx;
 				print ctx "break";
 			end;
@@ -832,18 +749,34 @@ and gen_expr ctx e =
 		gen_expr ctx e
 	| TCast (e1,Some t) ->
 		print ctx "%s.__cast(" (ctx.type_accessor (TClassDecl { null_class with cl_path = ["js"],"Boot" }));
-		gen_expr ctx e1;
+		gen_value ctx e1;
 		spr ctx " , ";
 		spr ctx (ctx.type_accessor t);
-		spr ctx ")");
-	Option.may (fun smap -> smap.current_expr <- None) ctx.smap
+		spr ctx ")"
+	| TIdent s ->
+		spr ctx s
+	);
+	clear_mapping ()
 
+and gen_function ?(keyword="function") ctx f pos =
+	let old = ctx.in_value, ctx.in_loop in
+	ctx.in_value <- None;
+	ctx.in_loop <- false;
+	let args = List.map (fun (v,_) ->
+		check_var_declaration v;
+		ident v.v_name
+	) f.tf_args in
+	print ctx "%s(%s) " keyword (String.concat "," args);
+	gen_expr ctx (fun_block ctx f pos);
+	ctx.in_value <- fst old;
+	ctx.in_loop <- snd old;
+	ctx.separator <- true
 
 and gen_block_element ?(after=false) ctx e =
 	match e.eexpr with
 	| TBlock el ->
 		List.iter (gen_block_element ~after ctx) el
-	| TCall ({ eexpr = TLocal { v_name = "__feature__" } }, { eexpr = TConst (TString f) } :: eif :: eelse) ->
+	| TCall ({ eexpr = TIdent "__feature__" }, { eexpr = TConst (TString f) } :: eif :: eelse) ->
 		if has_feature ctx f then
 			gen_block_element ~after ctx eif
 		else (match eelse with
@@ -860,7 +793,7 @@ and gen_block_element ?(after=false) ctx e =
 		if after then newline ctx
 
 and gen_value ctx e =
-	Option.may (fun smap -> add_mapping smap false e) ctx.smap;
+	let clear_mapping = add_mapping ctx e in
 	let assign e =
 		mk (TBinop (Ast.OpAssign,
 			mk (TLocal (match ctx.in_value with None -> assert false | Some v -> v)) t_dynamic e.epos,
@@ -869,7 +802,7 @@ and gen_value ctx e =
 	in
 	let value() =
 		let old = ctx.in_value, ctx.in_loop in
-		let r = alloc_var "$r" t_dynamic e.epos in
+		let r = alloc_var VGenerated "$r" t_dynamic e.epos in
 		ctx.in_value <- Some r;
 		ctx.in_loop <- false;
 		spr ctx "(function($this) ";
@@ -896,13 +829,15 @@ and gen_value ctx e =
 	| TBinop _
 	| TField _
 	| TEnumParameter _
+	| TEnumIndex _
 	| TTypeExpr _
 	| TParenthesis _
 	| TObjectDecl _
 	| TArrayDecl _
 	| TNew _
 	| TUnop _
-	| TFunction _ ->
+	| TFunction _
+	| TIdent _ ->
 		gen_expr ctx e
 	| TMeta (_,e1) ->
 		gen_value ctx e1
@@ -972,8 +907,82 @@ and gen_value ctx e =
 			List.map (fun (v,e) -> v, block (assign e)) catchs
 		)) e.etype e.epos);
 		v());
-	Option.may (fun smap -> smap.current_expr <- None) ctx.smap
+	clear_mapping ()
 
+and gen_syntax ctx meth args pos =
+	match meth, args with
+	| "construct", cl :: params ->
+		spr ctx "new ";
+		begin
+			match cl.eexpr with
+			| TConst (TString cl) ->
+				spr ctx cl
+			| _ ->
+				gen_value ctx cl
+		end;
+		spr ctx "(";
+		concat ctx "," (gen_value ctx) params;
+		spr ctx ")"
+	| "instanceof", [o;t] ->
+		spr ctx "((";
+		gen_value ctx o;
+		print ctx ") instanceof ";
+		gen_value ctx t;
+		spr ctx ")"
+	| "typeof", [o] ->
+		spr ctx "typeof(";
+		gen_value ctx o;
+		spr ctx ")"
+	| "strictEq" , [x;y] ->
+		(* add extra parenthesis here because of operator precedence *)
+		spr ctx "((";
+		gen_value ctx x;
+		spr ctx ") === ";
+		gen_value ctx y;
+		spr ctx ")";
+	| "strictNeq" , [x;y] ->
+		(* add extra parenthesis here because of operator precedence *)
+		spr ctx "((";
+		gen_value ctx x;
+		spr ctx ") !== ";
+		gen_value ctx y;
+		spr ctx ")";
+	| "delete" , [o;f] ->
+		spr ctx "delete(";
+		gen_value ctx o;
+		spr ctx "[";
+		gen_value ctx f;
+		spr ctx "]";
+		spr ctx ")";
+	| "code", code :: args ->
+		let code, code_pos =
+			match code.eexpr with
+			| TConst (TString s) -> s, code.epos
+			| _ -> abort "The `code` argument for js.Syntax must be a string constant" code.epos
+		in
+		begin
+			match args with
+			| [] ->
+				if code = "this" then
+					spr ctx (this ctx)
+				else
+					spr ctx (String.concat "\n" (ExtString.String.nsplit code "\r\n"))
+			| _ ->
+				Codegen.interpolate_code ctx.com code args (spr ctx) (gen_value ctx) code_pos
+		end
+	| "field" , [eobj;efield] ->
+		gen_value ctx eobj;
+		(match Texpr.skip efield with
+		| { eexpr = TConst(TString(s)) } when valid_js_ident s ->
+			spr ctx ".";
+			spr ctx s;
+		| _ ->
+			spr ctx "[";
+			gen_value ctx efield;
+			spr ctx "]";
+		)
+	| _ ->
+		abort (Printf.sprintf "Unknown js.Syntax method `%s` with %d arguments" meth (List.length args)) pos
 
 let generate_package_create ctx (p,_) =
 	let rec loop acc = function
@@ -1017,29 +1026,29 @@ let gen_class_static_field ctx c f =
 	match f.cf_expr with
 	| None | Some { eexpr = TConst TNull } when not (has_feature ctx "Type.getClassFields") ->
 		()
-	| None when is_extern_field f ->
+	| None when not (is_physical_field f) ->
 		()
 	| None ->
-		print ctx "%s%s = null" (s_path ctx c.cl_path) (static_field c f.cf_name);
+		print ctx "%s%s = null" (s_path ctx c.cl_path) (static_field ctx c f.cf_name);
 		newline ctx
 	| Some e ->
 		match e.eexpr with
 		| TFunction _ ->
-			let path = (s_path ctx c.cl_path) ^ (static_field c f.cf_name) in
-			let dot_path = (dot_path c.cl_path) ^ (static_field c f.cf_name) in
+			let path = (s_path ctx c.cl_path) ^ (static_field ctx c f.cf_name) in
+			let dot_path = (dot_path c.cl_path) ^ (static_field ctx c f.cf_name) in
 			ctx.id_counter <- 0;
 			print ctx "%s = " path;
 			(match (get_exposed ctx dot_path f.cf_meta) with [s] -> print ctx "$hx_exports%s = " (path_to_brackets s) | _ -> ());
 			gen_value ctx e;
 			newline ctx;
 		| _ ->
-			ctx.statics <- (c,f.cf_name,e) :: ctx.statics
+			ctx.statics <- (c,f,e) :: ctx.statics
 
 let can_gen_class_field ctx = function
 	| { cf_expr = (None | Some { eexpr = TConst TNull }) } when not (has_feature ctx "Type.getInstanceFields") ->
 		false
 	| f ->
-		not (is_extern_field f)
+		is_physical_field f
 
 let gen_class_field ctx c f =
 	check_field_name c f;
@@ -1059,26 +1068,30 @@ let generate_class___name__ ctx c =
 	if has_feature ctx "js.Boot.isClass" then begin
 		let p = s_path ctx c.cl_path in
 		print ctx "%s.__name__ = " p;
-		if has_feature ctx "Type.getClassName" then
-			print ctx "[%s]" (String.concat "," (List.map (fun s -> Printf.sprintf "\"%s\"" (Ast.s_escape s)) (fst c.cl_path @ [snd c.cl_path])))
-		else
-			print ctx "true";
+		(match has_feature ctx "Type.getClassName", c.cl_path with
+			| true, _
+			| _, ([], ("Array" | "String")) ->
+				print ctx "\"%s\"" (dot_path c.cl_path)
+			| _ ->
+				print ctx "true"
+		);
 		newline ctx;
 	end
 
-let generate_class ctx c =
-	ctx.current <- c;
-	ctx.id_counter <- 0;
-	(match c.cl_path with
-	| [],"Function" -> abort "This class redefine a native one" c.cl_pos
-	| _ -> ());
+let generate_class___isInterface__ ctx c =
+	if c.cl_interface && has_feature ctx "js.Boot.isInterface" then begin
+		let p = s_path ctx c.cl_path in
+		print ctx "%s.__isInterface__ = true" p;
+		newline ctx;
+	end
+
+let generate_class_es3 ctx c =
 	let p = s_path ctx c.cl_path in
-	let hxClasses = has_feature ctx "Type.resolveClass" in
 	if ctx.js_flatten then
 		print ctx "var "
 	else
 		generate_package_create ctx c.cl_path;
-	if ctx.js_modern || not hxClasses then
+	if ctx.js_modern || not ctx.has_resolveClass then
 		print ctx "%s = " p
 	else
 		print ctx "%s = $hxClasses[\"%s\"] = " p (dot_path c.cl_path);
@@ -1093,17 +1106,20 @@ let generate_class ctx c =
 			| _ -> (print ctx "function() { }"); ctx.separator <- true)
 	);
 	newline ctx;
-	if ctx.js_modern && hxClasses then begin
+	if ctx.js_modern && ctx.has_resolveClass then begin
 		print ctx "$hxClasses[\"%s\"] = %s" (dot_path c.cl_path) p;
 		newline ctx;
 	end;
 	generate_class___name__ ctx c;
-	(match c.cl_implements with
-	| [] -> ()
-	| l ->
-		print ctx "%s.__interfaces__ = [%s]" p (String.concat "," (List.map (fun (i,_) -> ctx.type_accessor (TClassDecl i)) l));
-		newline ctx;
-	);
+	generate_class___isInterface__ ctx c;
+
+	if ctx.has_interface_check then
+		(match c.cl_implements with
+		| [] -> ()
+		| l ->
+			print ctx "%s.__interfaces__ = [%s]" p (String.concat "," (List.map (fun (i,_) -> ctx.type_accessor (TClassDecl i)) l));
+			newline ctx;
+		);
 
 	let gen_props props =
 		String.concat "," (List.map (fun (p,v) -> p ^":\""^v^"\"") props) in
@@ -1160,42 +1176,256 @@ let generate_class ctx c =
 	end;
 	flush ctx
 
+let generate_class_es6 ctx c =
+	let p = s_path ctx c.cl_path in
+
+	let cls_name =
+		if not ctx.js_flatten && (fst c.cl_path) <> [] then begin
+			generate_package_create ctx c.cl_path;
+			print ctx "%s = " p;
+			Path.flat_path c.cl_path
+		end else
+			p
+	in
+	print ctx "class %s" cls_name;
+
+	Option.may (fun (csup,_) ->
+		let psup = ctx.type_accessor (TClassDecl csup) in
+		print ctx " extends %s" psup
+	) c.cl_super;
+
+	spr ctx " {";
+	let close_block = open_block ctx in
+
+	(match c.cl_constructor with
+	| Some { cf_expr = Some ({ eexpr = TFunction f; epos = p }) } ->
+		newline ctx;
+		gen_function ~keyword:"constructor" ctx f p;
+		ctx.separator <- false
+	| _ -> ());
+
+	let method_def_name cf =
+		if valid_js_ident cf.cf_name then cf.cf_name else "\"" ^ cf.cf_name ^ "\""
+	in
+
+	let nonmethod_fields =
+		List.filter (fun cf ->
+			match cf.cf_kind, cf.cf_expr with
+			| Method _, Some { eexpr = TFunction f; epos = pos } ->
+				check_field_name c cf;
+				newline ctx;
+				gen_function ~keyword:(method_def_name cf) ctx f pos;
+				ctx.separator <- false;
+				false
+			| _ ->
+				true
+		) c.cl_ordered_fields
+	in
+
+	let exposed_static_methods = ref [] in
+	let nonmethod_statics =
+		List.filter (fun cf ->
+			match cf.cf_kind, cf.cf_expr with
+			| Method _, Some { eexpr = TFunction f; epos = pos } ->
+				check_field_name c cf;
+				newline ctx;
+				gen_function ~keyword:("static " ^ (method_def_name cf)) ctx f pos;
+				ctx.separator <- false;
+
+				(match get_exposed ctx ((dot_path c.cl_path) ^ (static_field ctx c cf.cf_name)) cf.cf_meta with
+				| [s] -> exposed_static_methods := (s,cf.cf_name) :: !exposed_static_methods;
+				| _ -> ());
+
+				false
+			| _ -> true
+		) c.cl_ordered_statics
+	in
+
+	close_block ();
+	newline ctx;
+	spr ctx "}";
+	newline ctx;
+
+	List.iter (fun (path,name) ->
+		print ctx "$hx_exports%s = %s.%s;" (path_to_brackets path) p name;
+		newline ctx
+	) !exposed_static_methods;
+
+	List.iter (gen_class_static_field ctx c) nonmethod_statics;
+
+	let expose = (match get_exposed ctx (dot_path c.cl_path) c.cl_meta with [s] -> "$hx_exports" ^ (path_to_brackets s) | _ -> "") in
+	if expose <> "" || ctx.has_resolveClass then begin
+		if ctx.has_resolveClass then begin
+			print ctx "$hxClasses[\"%s\"] = " (dot_path c.cl_path)
+		end;
+		if expose <> "" then begin
+			print ctx "%s = " expose
+		end;
+		spr ctx p;
+		newline ctx;
+	end;
+
+	generate_class___name__ ctx c;
+	generate_class___isInterface__ ctx c;
+
+	if ctx.has_interface_check then
+		(match c.cl_implements with
+		| [] -> ()
+		| l ->
+			print ctx "%s.__interfaces__ = [%s]" p (String.concat "," (List.map (fun (i,_) -> ctx.type_accessor (TClassDecl i)) l));
+			newline ctx;
+		);
+
+	let has_property_reflection =
+		(has_feature ctx "Reflect.getProperty") || (has_feature ctx "Reflect.setProperty")
+	in
+	let gen_props props =
+		String.concat "," (List.map (fun (p,v) -> p ^": \""^v^"\"") props)
+	in
+
+	if has_property_reflection then begin
+		(match Codegen.get_properties nonmethod_statics with
+		| [] -> ()
+		| props ->
+			print ctx "%s.__properties__ = {%s}" p (gen_props props);
+			ctx.separator <- true;
+			newline ctx);
+	end;
+
+	(match c.cl_super with
+	| Some (csup,_) ->
+		if ctx.has_interface_check || has_feature ctx "Type.getSuperClass" then begin
+			let psup = ctx.type_accessor (TClassDecl csup) in
+			print ctx "%s.__super__ = %s" p psup;
+			newline ctx
+		end
+	| None -> ());
+
+	let has_class = has_feature ctx "js.Boot.getClass" && (c.cl_super <> None || c.cl_ordered_fields <> [] || c.cl_constructor <> None) in
+	let props_to_generate = if has_property_reflection then Codegen.get_properties c.cl_ordered_fields else [] in
+	let fields_to_generate =
+		if has_feature ctx "Type.getInstanceFields" then
+			if c.cl_interface then
+				List.filter is_physical_field c.cl_ordered_fields
+			else
+				List.filter is_physical_var_field nonmethod_fields
+		else
+			[]
+	in
+
+	if has_class || props_to_generate <> [] || fields_to_generate <> [] then begin
+		print ctx "Object.assign(%s.prototype, {" p;
+		let bend = open_block ctx in
+
+		if has_class then begin
+			newprop ctx;
+			print ctx "__class__: %s" p
+		end;
+
+		if fields_to_generate <> [] then begin
+			List.iter (gen_class_field ctx c) fields_to_generate;
+		end;
+
+		if props_to_generate <> [] then begin
+			newprop ctx;
+			match c.cl_super with
+			| Some (csup, _) when Codegen.has_properties csup ->
+				let psup = ctx.type_accessor (TClassDecl csup) in
+				print ctx "__properties__: Object.assign({}, %s.prototype.__properties__, {%s})" psup (gen_props props_to_generate)
+			| _ ->
+				print ctx "__properties__: {%s}" (gen_props props_to_generate)
+		end;
+
+		bend();
+		print ctx "\n})";
+		newline ctx
+	end;
+
+	flush ctx
+
+let generate_class ctx c =
+	ctx.current <- c;
+	ctx.id_counter <- 0;
+	(match c.cl_path with
+	| [],"Function" -> abort "This class redefine a native one" c.cl_pos
+	| _ -> ());
+	if ctx.es_version >= 6 then
+		generate_class_es6 ctx c
+	else
+		generate_class_es3 ctx c
+
 let generate_enum ctx e =
 	let p = s_path ctx e.e_path in
-	let ename = List.map (fun s -> Printf.sprintf "\"%s\"" (Ast.s_escape s)) (fst e.e_path @ [snd e.e_path]) in
+	let dotp = dot_path e.e_path in
+	let has_enum_feature = has_feature ctx "has_enum" in
 	if ctx.js_flatten then
 		print ctx "var "
 	else
 		generate_package_create ctx e.e_path;
 	print ctx "%s = " p;
-	if has_feature ctx "Type.resolveEnum" then print ctx "$hxClasses[\"%s\"] = " (dot_path e.e_path);
-	print ctx "{";
-	if has_feature ctx "js.Boot.isEnum" then print ctx " __ename__ : %s," (if has_feature ctx "Type.getEnumName" then "[" ^ String.concat "," ename ^ "]" else "true");
-	print ctx " __constructs__ : [%s] }" (String.concat "," (List.map (fun s -> Printf.sprintf "\"%s\"" s) e.e_names));
-	ctx.separator <- true;
-	newline ctx;
+	let as_objects = not (Common.defined ctx.com Define.JsEnumsAsArrays) in
+	(if as_objects then
+		print ctx "$hxEnums[\"%s\"] = " dotp
+	else if has_feature ctx "Type.resolveEnum" then
+		print ctx "$hxClasses[\"%s\"] = " (dot_path e.e_path));
+	spr ctx "{";
+	if has_feature ctx "js.Boot.isEnum" then print ctx " __ename__ : %s," (if has_feature ctx "Type.getEnumName" then "\"" ^ dotp ^ "\"" else "true");
+	print ctx " __constructs__ : [%s]" (String.concat "," (List.map (fun s -> Printf.sprintf "\"%s\"" s) e.e_names));
+	let bend =
+		if not as_objects then begin
+			spr ctx " }";
+			ctx.separator <- true;
+			newline ctx;
+			fun () -> ()
+		end else begin
+			open_block ctx
+		end;
+	in
 	List.iter (fun n ->
 		let f = PMap.find n e.e_constrs in
-		print ctx "%s%s = " p (field f.ef_name);
+		if as_objects then begin
+			newprop ctx;
+			print ctx "%s: " (anon_field f.ef_name)
+		end else
+			print ctx "%s%s = " p (field f.ef_name);
 		(match f.ef_type with
 		| TFun (args,_) ->
-			let sargs = String.concat "," (List.map (fun (n,_,_) -> ident n) args) in
-			print ctx "function(%s) { var $x = [\"%s\",%d,%s]; $x.__enum__ = %s;" sargs f.ef_name f.ef_index sargs p;
-			if has_feature ctx "has_enum" then
-				spr ctx " $x.toString = $estr;";
-			spr ctx " return $x; }";
-			ctx.separator <- true;
+			let sargs = String.concat "," (List.map (fun (n,_,_) -> ident n) args) in begin
+			if as_objects then begin
+				let sfields = String.concat "," (List.map (fun (n,_,_) -> (ident n) ^ ":" ^ (ident n) ) args) in
+				let sparams = String.concat "," (List.map (fun (n,_,_) -> "\"" ^ (ident n) ^ "\"" ) args) in
+				print ctx "($_=function(%s) { return {_hx_index:%d,%s,__enum__:\"%s\"" sargs f.ef_index sfields dotp;
+				if has_enum_feature then
+					spr ctx ",toString:$estr";
+				print ctx "}; },$_.__params__ = [%s],$_)" sparams
+			end else begin
+				print ctx "function(%s) { var $x = [\"%s\",%d,%s]; $x.__enum__ = %s;" sargs f.ef_name f.ef_index sargs p;
+				if has_enum_feature then
+					spr ctx " $x.toString = $estr;";
+				spr ctx " return $x; }";
+			end end;
 		| _ ->
-			print ctx "[\"%s\",%d]" f.ef_name f.ef_index;
-			newline ctx;
-			if has_feature ctx "has_enum" then begin
-				print ctx "%s%s.toString = $estr" p (field f.ef_name);
+			if as_objects then
+				print ctx "{_hx_index:%d,__enum__:\"%s\"%s}" f.ef_index dotp (if has_enum_feature then ",toString:$estr" else "")
+			else begin
+				print ctx "[\"%s\",%d]" f.ef_name f.ef_index;
 				newline ctx;
-			end;
-			print ctx "%s%s.__enum__ = %s" p (field f.ef_name) p;
+				if has_feature ctx "has_enum" then begin
+					print ctx "%s%s.toString = $estr" p (field f.ef_name);
+					newline ctx;
+				end;
+				print ctx "%s%s.__enum__ = %s" p (field f.ef_name) p;
+			end
 		);
-		newline ctx
+		if not as_objects then
+			newline ctx
 	) e.e_names;
+	bend();
+	if as_objects then begin
+		spr ctx "\n}";
+		ctx.separator <- true;
+		newline ctx;
+	end;
 	if has_feature ctx "Type.allEnums" then begin
 		let ctors_without_args = List.filter (fun s ->
 			let ef = PMap.find s e.e_constrs in
@@ -1206,7 +1436,7 @@ let generate_enum ctx e =
 		print ctx "%s.__empty_constructs__ = [%s]" p (String.concat "," (List.map (fun s -> Printf.sprintf "%s.%s" p s) ctors_without_args));
 		newline ctx
 	end;
-	begin match Codegen.build_metadata ctx.com (TEnumDecl e) with
+	begin match Texpr.build_metadata ctx.com.basic (TEnumDecl e) with
 	| None -> ()
 	| Some e ->
 		print ctx "%s.__meta__ = " p;
@@ -1216,7 +1446,9 @@ let generate_enum ctx e =
 	flush ctx
 
 let generate_static ctx (c,f,e) =
-	print ctx "%s%s = " (s_path ctx c.cl_path) (static_field c f);
+	let dot_path = (dot_path c.cl_path) ^ (static_field ctx c f.cf_name) in
+	(match (get_exposed ctx dot_path f.cf_meta) with [s] -> print ctx "$hx_exports%s = " (path_to_brackets s) | _ -> ());
+	print ctx "%s%s = " (s_path ctx c.cl_path) (static_field ctx c f.cf_name);
 	gen_value ctx e;
 	newline ctx
 
@@ -1230,15 +1462,20 @@ let generate_require ctx path meta =
 		generate_package_create ctx path;
 
 	(match args with
-	| [(EConst(String(module_name)),_)] ->
+	| [(EConst(String(module_name,_)),_)] ->
 		print ctx "%s = require(\"%s\")" p module_name
-	| [(EConst(String(module_name)),_) ; (EConst(String(object_path)),_)] ->
+	| [(EConst(String(module_name,_)),_) ; (EConst(String(object_path,_)),_)] ->
 		print ctx "%s = require(\"%s\").%s" p module_name object_path
 	| _ ->
 		abort "Unsupported @:jsRequire format" mp);
 
 	newline ctx
 
+let need_to_generate_interface ctx cl_iface =
+	ctx.has_resolveClass (* generate so we can resolve it for whatever reason *)
+	|| ctx.has_interface_check (* generate because we need __interfaces__ for run-time type checks *)
+	|| is_directly_used ctx.com cl_iface.cl_meta (* generate because it's just directly accessed in code *)
+
 let generate_type ctx = function
 	| TClassDecl c ->
 		(match c.cl_init with
@@ -1251,9 +1488,10 @@ let generate_type ctx = function
 		(* Another special case for Std because we do not want to generate it if it's empty. *)
 		if p = "Std" && c.cl_ordered_statics = [] then
 			()
-		else if not c.cl_extern then
-			generate_class ctx c
-		else if Meta.has Meta.JsRequire c.cl_meta && is_directly_used ctx.com c.cl_meta then
+		else if not c.cl_extern then begin
+			if (not c.cl_interface) || (need_to_generate_interface ctx c) then
+				generate_class ctx c
+		end else if Meta.has Meta.JsRequire c.cl_meta && is_directly_used ctx.com c.cl_meta then
 			generate_require ctx c.cl_path c.cl_meta
 		else if not ctx.js_flatten && Meta.has Meta.InitPackage c.cl_meta then
 			(match c.cl_path with
@@ -1268,13 +1506,11 @@ let generate_type ctx = function
 let set_current_class ctx c =
 	ctx.current <- c
 
-let alloc_ctx com =
+let alloc_ctx com es_version =
 	let smap =
-		if com.debug || Common.defined com Define.JsSourceMap then
+		if com.debug || Common.defined com Define.JsSourceMap || Common.defined com Define.SourceMap then
 			Some {
-				source_last_line = 0;
-				source_last_col = 0;
-				source_last_file = 0;
+				source_last_pos = { file = 0; line = 0; col = 0};
 				print_comma = false;
 				output_last_col = 0;
 				output_current_col = 0;
@@ -1294,15 +1530,15 @@ let alloc_ctx com =
 		smap = smap;
 		js_modern = not (Common.defined com Define.JsClassic);
 		js_flatten = not (Common.defined com Define.JsUnflatten);
-		es_version = (try int_of_string (Common.defined_value com Define.JsEs) with _ -> 0);
-		store_exception_stack = if Common.has_dce com then (Common.has_feature com "haxe.CallStack.exceptionStack") else List.exists (function TClassDecl { cl_path=["haxe"],"CallStack" } -> true | _ -> false) com.types;
+		has_resolveClass = Common.has_feature com "Type.resolveClass";
+		has_interface_check = Common.has_feature com "js.Boot.__interfLoop";
+		es_version = es_version;
 		statics = [];
 		inits = [];
 		current = null_class;
 		tabs = "";
 		in_value = None;
 		in_loop = false;
-		handle_break = false;
 		id_counter = 0;
 		type_accessor = (fun _ -> assert false);
 		separator = false;
@@ -1329,20 +1565,28 @@ let generate com =
 	(match com.js_gen with
 	| Some g -> g()
 	| None ->
-	let ctx = alloc_ctx com in
+
+	let es_version = get_es_version com in
+
+	if es_version >= 6 then
+		ES6Ctors.rewrite_ctors com;
+
+	let ctx = alloc_ctx com es_version in
 	Codegen.map_source_header com (fun s -> print ctx "// %s\n" s);
 	if has_feature ctx "Class" || has_feature ctx "Type.getClassName" then add_feature ctx "js.Boot.isClass";
 	if has_feature ctx "Enum" || has_feature ctx "Type.getEnumName" then add_feature ctx "js.Boot.isEnum";
 
 	let nodejs = Common.raw_defined com "nodejs" in
 
+	setup_kwds com;
+
 	let exposed = List.concat (List.map (fun t ->
 		match t with
 			| TClassDecl c ->
 				let path = dot_path c.cl_path in
 				let class_exposed = get_exposed ctx path c.cl_meta in
 				let static_exposed = List.map (fun f ->
-					get_exposed ctx (path ^ static_field c f.cf_name) f.cf_meta
+					get_exposed ctx (path ^ static_field ctx c f.cf_name) f.cf_meta
 				) c.cl_ordered_statics in
 				List.concat (class_exposed :: static_exposed)
 			| _ -> []
@@ -1375,7 +1619,7 @@ let generate com =
 		match file with
 		| path, "top" ->
 			let file_content = Std.input_file ~bin:true (fst file) in
-			print ctx "%s\n" file_content;
+			print ctx "%s\n;" file_content;
 			()
 		| _ -> ()
 	) include_files;
@@ -1395,12 +1639,7 @@ let generate com =
 		"typeof window != \"undefined\" ? window : typeof global != \"undefined\" ? global : typeof self != \"undefined\" ? self : this"
 	) in
 
-	let closureArgs = [] in
-	let closureArgs = if has_feature ctx "js.Lib.global" then
-		var_global :: closureArgs
-	else
-		closureArgs
-	in
+	let closureArgs = [var_global] in
 	let closureArgs = if (anyExposed && not (Common.defined com Define.ShallowExpose)) then
 		var_exports :: closureArgs
 	else
@@ -1424,9 +1663,6 @@ let generate com =
 	);
 
 	if ctx.js_modern then begin
-		(* Additional ES5 strict mode keywords. *)
-		List.iter (fun s -> Hashtbl.replace kwds s ()) [ "arguments"; "eval" ];
-
 		(* Wrap output in a closure *)
 		print ctx "(function (%s) { \"use strict\"" (String.concat ", " (List.map fst closureArgs));
 		newline ctx;
@@ -1446,7 +1682,7 @@ let generate com =
 		match file with
 		| path, "closure" ->
 			let file_content = Std.input_file ~bin:true (fst file) in
-			print ctx "%s\n" file_content;
+			print ctx "%s\n;" file_content;
 			()
 		| _ -> ()
 	) include_files;
@@ -1455,18 +1691,27 @@ let generate com =
 	if (not ctx.js_modern) && (ctx.es_version < 5) then
 		add_feature ctx "js.Lib.global"; (* console polyfill will check console from $global *)
 
-	if (not ctx.js_modern) && (has_feature ctx "js.Lib.global") then
+	if (not ctx.js_modern) then
 		print ctx "var %s = %s;\n" (fst var_global) (snd var_global);
 
 	if (not ctx.js_modern) && (ctx.es_version < 5) then
 		spr ctx "var console = $global.console || {log:function(){}};\n";
 
+	let enums_as_objects = not (Common.defined com Define.JsEnumsAsArrays) in
+
 	(* TODO: fix $estr *)
 	let vars = [] in
-	let vars = (if has_feature ctx "Type.resolveClass" || has_feature ctx "Type.resolveEnum" then ("$hxClasses = " ^ (if ctx.js_modern then "{}" else "$hxClasses || {}")) :: vars else vars) in
+	let vars = (if ctx.has_resolveClass || (not enums_as_objects && has_feature ctx "Type.resolveEnum") then ("$hxClasses = " ^ (if ctx.js_modern then "{}" else "$hxClasses || {}")) :: vars else vars) in
 	let vars = if has_feature ctx "has_enum"
 		then ("$estr = function() { return " ^ (ctx.type_accessor (TClassDecl { null_class with cl_path = ["js"],"Boot" })) ^ ".__string_rec(this,''); }") :: vars
 		else vars in
+	let vars = if (enums_as_objects && (has_feature ctx "has_enum" || has_feature ctx "Type.resolveEnum")) then "$hxEnums = $hxEnums || {}" :: vars else vars in
+	let vars,has_dollar_underscore =
+		if List.exists (function TEnumDecl { e_extern = false } -> true | _ -> false) com.types then
+			"$_" :: vars,true
+		else
+			vars,false
+	in
 	(match List.rev vars with
 	| [] -> ()
 	| vl ->
@@ -1474,14 +1719,21 @@ let generate com =
 		ctx.separator <- true;
 		newline ctx
 	);
-	if List.exists (function TClassDecl { cl_extern = false; cl_super = Some _ } -> true | _ -> false) com.types then begin
-		print ctx "function $extend(from, fields) {
-	function Inherit() {} Inherit.prototype = from; var proto = new Inherit();
-	for (var name in fields) proto[name] = fields[name];
-	if( fields.toString !== Object.prototype.toString ) proto.toString = fields.toString;
-	return proto;
-}
-";
+	if ctx.es_version < 6 && List.exists (function TClassDecl { cl_extern = false; cl_super = Some _ } -> true | _ -> false) com.types then begin
+		let extend_code =
+			"function $extend(from, fields) {\n" ^
+			(
+				if ctx.es_version < 5 then
+					"	function Inherit() {} Inherit.prototype = from; var proto = new Inherit();\n"
+				else
+					"	var proto = Object.create(from);\n"
+			) ^
+			"	for (var name in fields) proto[name] = fields[name];\n" ^
+			"	if( fields.toString !== Object.prototype.toString ) proto.toString = fields.toString;\n" ^
+			"	return proto;\n" ^
+			"}\n"
+		in
+		spr ctx extend_code
 	end;
 	List.iter (generate_type ctx) com.types;
 	let rec chk_features e =
@@ -1489,6 +1741,8 @@ let generate com =
 		match e.eexpr with
 		| TField (_,FClosure _) ->
 			add_feature ctx "use.$bind"
+		| TCall ({ eexpr = TField (_,f) } as ef, []) when field_name f = "iterator" && is_dynamic_iterator ctx ef ->
+			add_feature ctx "use.$getIterator";
 		| _ ->
 			Type.iter chk_features e
 	in
@@ -1499,22 +1753,48 @@ let generate com =
 		print ctx "function $iterator(o) { if( o instanceof Array ) return function() { return HxOverrides.iter(o); }; return typeof(o.iterator) == 'function' ? $bind(o,o.iterator) : o.iterator; }";
 		newline ctx;
 	end;
-	if has_feature ctx "use.$bind" then begin
-		print ctx "var $_, $fid = 0";
+	if has_feature ctx "use.$getIterator" then begin
+		print ctx "function $getIterator(o) { if( o instanceof Array ) return HxOverrides.iter(o); else return o.iterator(); }";
 		newline ctx;
-		print ctx "function $bind(o,m) { if( m == null ) return null; if( m.__id__ == null ) m.__id__ = $fid++; var f; if( o.hx__closures__ == null ) o.hx__closures__ = {}; else f = o.hx__closures__[m.__id__]; if( f == null ) { f = function(){ return f.method.apply(f.scope, arguments); }; f.scope = o; f.method = m; o.hx__closures__[m.__id__] = f; } return f; }";
+	end;
+	if has_feature ctx "use.$bind" then begin
+		add_feature ctx "$global.$haxeUID";
+		if not has_dollar_underscore then begin
+			print ctx "var $_";
+			newline ctx;
+		end;
+		(if ctx.es_version < 5 then
+			print ctx "function $bind(o,m) { if( m == null ) return null; if( m.__id__ == null ) m.__id__ = $global.$haxeUID++; var f; if( o.hx__closures__ == null ) o.hx__closures__ = {}; else f = o.hx__closures__[m.__id__]; if( f == null ) { f = function(){ return f.method.apply(f.scope, arguments); }; f.scope = o; f.method = m; o.hx__closures__[m.__id__] = f; } return f; }"
+		else
+			print ctx "function $bind(o,m) { if( m == null ) return null; if( m.__id__ == null ) m.__id__ = $global.$haxeUID++; var f; if( o.hx__closures__ == null ) o.hx__closures__ = {}; else f = o.hx__closures__[m.__id__]; if( f == null ) { f = m.bind(o); o.hx__closures__[m.__id__] = f; } return f; }"
+		);
 		newline ctx;
 	end;
 	if has_feature ctx "use.$arrayPush" then begin
 		print ctx "function $arrayPush(x) { this.push(x); }";
 		newline ctx
 	end;
+	if has_feature ctx "$global.$haxeUID" then begin
+		add_feature ctx "js.Lib.global";
+		print ctx "$global.$haxeUID |= 0;\n";
+	end;
 	List.iter (gen_block_element ~after:true ctx) (List.rev ctx.inits);
 	List.iter (generate_static ctx) (List.rev ctx.statics);
 	(match com.main with
 	| None -> ()
 	| Some e -> gen_expr ctx e; newline ctx);
 	if ctx.js_modern then begin
+		let closureArgs =
+			if has_feature ctx "js.Lib.global" then
+				closureArgs
+			else
+				(* no need for `typeof window != "undefined" ? window : typeof global != "undefined" ? <...>` *)
+				match List.rev closureArgs with
+					| (global_name,global_value) :: rest ->
+						List.rev ((global_name,"{}") :: rest)
+					| _ ->
+						closureArgs
+		in
 		print ctx "})(%s)" (String.concat ", " (List.map snd closureArgs));
 		newline ctx;
 	end;
diff --git a/src/generators/genjvm.ml b/src/generators/genjvm.ml
new file mode 100644
index 0000000000000000000000000000000000000000..af3474e61eb2106d711bc03e556305c0dc31e8e0
--- /dev/null
+++ b/src/generators/genjvm.ml
@@ -0,0 +1,3094 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open Ast
+open Common
+open Type
+open Path
+open JvmGlobals
+open MethodAccessFlags
+open FieldAccessFlags
+open JvmData
+open JvmAttribute
+open JvmSignature
+open JvmMethod
+open JvmBuilder
+
+(* Note: This module is the bridge between Haxe structures and JVM structures. No module in generators/jvm should reference any
+   Haxe-specific type. *)
+
+(* hacks *)
+
+let rec pow a b = match b with
+	| 0 -> Int32.one
+	| 1 -> a
+	| _ -> Int32.mul a (pow a (b - 1))
+
+let java_hash s =
+	let h = ref Int32.zero in
+	let l = UTF8.length s in
+	let i31 = Int32.of_int 31 in
+	let i = ref 0 in
+	UTF8.iter (fun char ->
+		let char = Int32.of_int (UCharExt.uint_code char) in
+		h := Int32.add !h (Int32.mul char (pow i31 (l - (!i + 1))));
+		incr i;
+	) s;
+	!h
+
+let find_overload map_type c cf el =
+	let matches = ref [] in
+	let rec loop cfl = match cfl with
+		| cf :: cfl ->
+			begin match follow (monomorphs cf.cf_params (map_type cf.cf_type)) with
+				| TFun(tl'',_) as tf ->
+					let rec loop2 acc el tl = match el,tl with
+						| e :: el,(n,o,t) :: tl ->
+							begin try
+								Type.unify e.etype t;
+								loop2 ((e,o) :: acc) el tl
+							with _ ->
+								loop cfl
+							end
+						| [],[] ->
+							matches := ((List.rev acc),tf,(c,cf)) :: !matches;
+							loop cfl
+						| _ ->
+							loop cfl
+					in
+					loop2 [] el tl''
+				| t ->
+					loop cfl
+			end;
+		| [] ->
+			List.rev !matches
+	in
+	loop (cf :: cf.cf_overloads)
+
+let find_overload_rec' is_ctor map_type c name el =
+	let candidates = ref [] in
+	let has_function t1 (_,t2,_) =
+		begin match follow t1,t2 with
+		| TFun(tl1,_),TFun(tl2,_) -> type_iseq (TFun(tl1,t_dynamic)) (TFun(tl2,t_dynamic))
+		| _ -> false
+		end
+	in
+	let rec loop map_type c =
+		begin try
+			let cf = if is_ctor then
+				(match c.cl_constructor with Some cf -> cf | None -> raise Not_found)
+			else
+				PMap.find name c.cl_fields
+			in
+			begin match find_overload map_type c cf el with
+			| [] -> raise Not_found
+			| l ->
+				List.iter (fun ((_,t,_) as ca) ->
+					if not (List.exists (has_function t) !candidates) then candidates := ca :: !candidates
+				) l
+			end;
+			if Meta.has Meta.Overload cf.cf_meta || cf.cf_overloads <> [] then raise Not_found
+		with Not_found ->
+			if c.cl_interface then
+				List.iter (fun (c,tl) -> loop (fun t -> apply_params c.cl_params (List.map map_type tl) t) c) c.cl_implements
+			else match c.cl_super with
+			| None -> ()
+			| Some(c,tl) -> loop (fun t -> apply_params c.cl_params (List.map map_type tl) t) c
+		end;
+	in
+	loop map_type c;
+	match Overloads.Resolution.reduce_compatible (List.rev !candidates) with
+	| [_,_,(c,cf)] -> Some(c,cf)
+	| [] -> None
+	| ((_,_,(c,cf)) :: _) (* as resolved *) ->
+		(* let st = s_type (print_context()) in
+		print_endline (Printf.sprintf "Ambiguous overload for %s(%s)" name (String.concat ", " (List.map (fun e -> st e.etype) el)));
+		List.iter (fun (_,t,(c,cf)) ->
+			print_endline (Printf.sprintf "\tCandidate: %s.%s(%s)" (s_type_path c.cl_path) cf.cf_name (st t));
+		) resolved; *)
+		Some(c,cf)
+
+let find_overload_rec is_ctor map_type c cf el =
+	if Meta.has Meta.Overload cf.cf_meta || cf.cf_overloads <> [] then
+		find_overload_rec' is_ctor map_type c cf.cf_name el
+	else
+		Some(c,cf)
+
+let get_construction_mode c cf =
+	if Meta.has Meta.HxGen cf.cf_meta then ConstructInitPlusNew
+	else ConstructInit
+
+(* Haxe *)
+
+exception HarderFailure of string
+
+type field_generation_info = {
+	mutable has_this_before_super : bool;
+	(* This is an ordered list of fields that are targets of super() calls which is determined during
+	   pre-processing. The generator can pop from this list assuming that it processes the expression
+	   in the same order (which it should). *)
+	mutable super_call_fields : (tclass * tclass_field) list;
+}
+
+type generation_context = {
+	com : Common.context;
+	jar : Zip.out_file;
+	t_exception : Type.t;
+	t_throwable : Type.t;
+	anon_lut : ((string * jsignature) list,jpath) Hashtbl.t;
+	anon_path_lut : (path,jpath) Hashtbl.t;
+	field_infos : field_generation_info DynArray.t;
+	implicit_ctors : (path,(path * jsignature,tclass * tclass_field) PMap.t) Hashtbl.t;
+	default_export_config : export_config;
+	mutable current_field_info : field_generation_info option;
+	mutable anon_num : int;
+}
+
+type ret =
+	| RValue of jsignature option
+	| RVoid
+	| RReturn
+
+type method_type =
+	| MStatic
+	| MInstance
+	| MConstructor
+
+type access_kind =
+	| AKPost
+	| AKPre
+	| AKNone
+
+type compare_kind =
+	| CmpNormal of jcmp * jsignature
+	| CmpSpecial of (unit -> jbranchoffset ref)
+
+type block_exit =
+	| ExitExecute of (unit -> unit)
+	| ExitLoop
+
+open NativeSignatures
+
+let rec jsignature_of_type stack t =
+	if List.exists (fast_eq t) stack then object_sig else
+	let jsignature_of_type = jsignature_of_type (t :: stack) in
+	let jtype_argument_of_type t = jtype_argument_of_type stack t in
+	match t with
+	| TAbstract(a,tl) ->
+		begin match a.a_path with
+			| [],"Bool" -> TBool
+			| ["java"],"Int8" -> TByte
+			| ["java"],"Int16" -> TShort
+			| [],"Int" -> TInt
+			| ["haxe"],"Int32" -> TInt
+			| ["haxe"],"Int64" -> TLong
+			| ["java"],"Int64" -> TLong
+			| ["java"],"Char16" -> TChar
+			| [],"Single" -> TFloat
+			| [],"Float" -> TDouble
+			| [],"Null" ->
+				begin match tl with
+				| [t] -> get_boxed_type (jsignature_of_type t)
+				| _ -> assert false
+				end
+			| (["haxe";"ds"],"Vector") | (["haxe";"extern"],"Rest") ->
+				begin match tl with
+				| [t] -> TArray(jsignature_of_type t,None)
+				| _ -> assert false
+				end
+			| [],"Dynamic" ->
+				object_sig
+			| [],("Class" | "Enum") ->
+				java_class_sig
+			| [],"EnumValue" ->
+				java_enum_sig object_sig
+			| _ ->
+				if Meta.has Meta.CoreType a.a_meta then
+					TObject(a.a_path,List.map jtype_argument_of_type tl)
+				else
+					jsignature_of_type (Abstract.get_underlying_type a tl)
+		end
+	| TDynamic _ -> object_sig
+	| TMono r ->
+		begin match !r with
+		| Some t -> jsignature_of_type t
+		| None -> object_sig
+		end
+	| TInst({cl_path = (["haxe";"root"],"String")},[]) -> string_sig
+	| TInst({cl_path = (["haxe";"root"],"Array")},[t]) ->
+		let t = get_boxed_type (jsignature_of_type t) in
+		TObject((["haxe";"root"],"Array"),[TType(WNone,t)])
+	| TInst({cl_path = (["java"],"NativeArray")},[t]) ->
+		TArray(jsignature_of_type t,None)
+	| TInst({cl_kind = KTypeParameter [t]},_) -> jsignature_of_type t
+	| TInst({cl_kind = KTypeParameter _; cl_path = (_,name)},_) -> TTypeParameter name
+	| TInst({cl_path = ["_Class"],"Class_Impl_"},_) -> java_class_sig
+	| TInst({cl_path = ["_Enum"],"Enum_Impl_"},_) -> java_class_sig
+	| TInst(c,tl) -> TObject(c.cl_path,List.map jtype_argument_of_type tl)
+	| TEnum(en,tl) -> TObject(en.e_path,List.map jtype_argument_of_type tl)
+	| TFun(tl,tr) -> method_sig (List.map (fun (_,o,t) ->
+		let jsig = jsignature_of_type t in
+		let jsig = if o then get_boxed_type jsig else jsig in
+		jsig
+	) tl) (if ExtType.is_void (follow tr) then None else Some (jsignature_of_type tr))
+	| TAnon an -> object_sig
+	| TType(td,tl) -> jsignature_of_type (apply_params td.t_params tl td.t_type)
+	| TLazy f -> jsignature_of_type (lazy_type f)
+
+and jtype_argument_of_type stack t =
+	TType(WNone,jsignature_of_type stack t)
+
+let jsignature_of_type t =
+	jsignature_of_type [] t
+
+module TAnonIdentifiaction = struct
+	let convert_fields fields =
+		let l = PMap.fold (fun cf acc -> cf :: acc) fields [] in
+		let l = List.sort (fun cf1 cf2 -> compare cf1.cf_name cf2.cf_name) l in
+		List.map (fun cf -> cf.cf_name,jsignature_of_type cf.cf_type) l
+
+	let identify gctx fields =
+		if PMap.is_empty fields then
+			haxe_dynamic_object_path,[]
+		else begin
+			let l = convert_fields fields in
+			try
+				Hashtbl.find gctx.anon_lut l,l
+			with Not_found ->
+				let id = gctx.anon_num in
+				gctx.anon_num <- gctx.anon_num + 1;
+				let path = (["haxe";"generated"],Printf.sprintf "Anon%i" id) in
+				Hashtbl.add gctx.anon_lut l path;
+				path,l
+		end
+
+	let identify_as gctx path fields =
+		if not (PMap.is_empty fields) && not (Hashtbl.mem gctx.anon_path_lut path) then begin
+			let fields = convert_fields fields in
+			Hashtbl.add gctx.anon_lut fields path;
+			Hashtbl.add gctx.anon_path_lut path path;
+		end
+
+end
+
+module AnnotationHandler = struct
+	let generate_annotations builder meta =
+		let parse_path e =
+			let sl = try string_list_of_expr_path_raise e with Exit -> Error.error "Field expression expected" (pos e) in
+			let path = match sl with
+				| s :: sl -> List.rev sl,s
+				| _ -> Error.error "Field expression expected" (pos e)
+			in
+			path
+		in
+		let rec parse_value e = match fst e with
+			| EConst (Int s) -> AInt (Int32.of_string s)
+			| EConst (Float s) -> ADouble (float_of_string s)
+			| EConst (String(s,_)) -> AString s
+			| EConst (Ident "true") -> ABool true
+			| EConst (Ident "false") -> ABool false
+			| EArrayDecl el -> AArray (List.map parse_value el)
+			| EField(e1,s) ->
+				let path = parse_path e1 in
+				AEnum(object_path_sig path,s)
+			| _ -> Error.error "Expected value expression" (pos e)
+		in
+		let parse_value_pair e = match fst e with
+			| EBinop(OpAssign,(EConst(Ident s),_),e1) ->
+				s,parse_value e1
+			| _ ->
+				Error.error "Assignment expression expected" (pos e)
+		in
+		let parse_expr e = match fst e with
+			| ECall(e1,el) ->
+				let path = parse_path e1 in
+				let _,name = ExtString.String.replace (snd path) "." "$" in
+				let path = (fst path,name) in
+				let values = List.map parse_value_pair el in
+				path,values
+			| _ ->
+				Error.error "Call expression expected" (pos e)
+		in
+		List.iter (fun (m,el,_) -> match m,el with
+			| Meta.Meta,[e] ->
+				let path,annotation = parse_expr e in
+				builder#add_annotation path annotation;
+			| _ ->
+				()
+		) meta
+end
+
+let enum_ctor_sig =
+	let ta = TArray(object_sig,None) in
+	method_sig [TInt;ta] None
+
+let convert_cmp_op = function
+	| OpEq -> CmpEq
+	| OpNotEq -> CmpNe
+	| OpLt -> CmpLt
+	| OpLte -> CmpLe
+	| OpGt -> CmpGt
+	| OpGte -> CmpGe
+	| _ -> assert false
+
+let flip_cmp_op = function
+	| CmpEq -> CmpNe
+	| CmpNe -> CmpEq
+	| CmpLt -> CmpGe
+	| CmpLe -> CmpGt
+	| CmpGt -> CmpLe
+	| CmpGe -> CmpLt
+
+let resolve_class com path =
+	let rec loop types = match types with
+		| (TClassDecl c) :: types when c.cl_path = path ->
+			c
+		| _ :: types ->
+			loop types
+		| [] ->
+			jerror ("No such type: " ^ s_type_path path)
+	in
+	loop com.types
+
+let write_class jar path jc =
+	let dir = match path with
+		| ([],s) -> s
+		| (sl,s) -> String.concat "/" sl ^ "/" ^ s
+	in
+	let path = dir ^ ".class" in
+	let t = Timer.timer ["jvm";"write"] in
+	let ch = IO.output_bytes() in
+	JvmWriter.write_jvm_class ch jc;
+	Zip.add_entry (Bytes.unsafe_to_string (IO.close_out ch)) jar path;
+	t()
+
+let is_const_int_pattern (el,_) =
+	List.for_all (fun e -> match e.eexpr with
+		| TConst (TInt _) -> true
+		| _ -> false
+	) el
+
+let is_const_string_pattern (el,_) =
+	List.for_all (fun e -> match e.eexpr with
+		| TConst (TString _) -> true
+		| _ -> false
+	) el
+
+let is_interface_var_access c cf =
+	c.cl_interface && match cf.cf_kind with
+		| Var _ | Method MethDynamic -> true
+		| _ -> false
+
+let type_unifies a b =
+	try Type.unify a b; true with _ -> false
+
+let get_field_info gctx ml =
+	let rec loop ml = match ml with
+	| (Meta.Custom ":jvm.fieldInfo",[(EConst (Int s),_)],_) :: _ ->
+		Some (DynArray.get gctx.field_infos (int_of_string s))
+	| _ :: ml ->
+		loop ml
+	| [] ->
+		None
+	in
+	loop ml
+
+let follow = Abstract.follow_with_abstracts
+
+class haxe_exception gctx (t : Type.t) = object(self)
+	val native_exception =
+		if follow t == t_dynamic then
+			throwable_sig,false
+		else if type_unifies t gctx.t_exception then
+			jsignature_of_type t,true
+		else
+			haxe_exception_sig,false
+
+	val mutable native_exception_path = None
+
+	method is_assignable_to (exc2 : haxe_exception) =
+		match self#is_native_exception,exc2#is_native_exception with
+		| true, true ->
+			(* Native exceptions are assignable if they unify *)
+			type_unifies t exc2#get_type
+		| false,false ->
+			(* Haxe exceptions are always assignable to each other *)
+			true
+		| false,true ->
+			(* Haxe exception is assignable to native only if caught type is java.lang.Exception/Throwable *)
+			let exc2_native_exception_type = exc2#get_native_exception_type in
+			exc2_native_exception_type = throwable_sig || exc2_native_exception_type = exception_sig
+		| _ ->
+			(* Native to Haxe is never assignable *)
+			false
+
+	method is_native_exception = snd native_exception
+	method get_native_exception_type = fst native_exception
+
+	method get_native_exception_path =
+		match native_exception_path with
+		| None ->
+			let path = (match (fst native_exception) with TObject(path,_) -> path | _ -> assert false) in
+			native_exception_path <- Some path;
+			path
+		| Some path ->
+			path
+
+	method get_type = t
+end
+
+class closure_context (jsig : jsignature) = object(self)
+	val lut = Hashtbl.create 0
+	val sigs = DynArray.create()
+
+	method add (var_id : int) (var_name : string) (var_sig : jsignature) =
+		DynArray.add sigs ((var_id,var_name),var_sig);
+		Hashtbl.add lut var_id (var_sig,var_name)
+
+	method get (code : JvmCode.builder) (var_id : int) =
+		let var_sig,var_name = Hashtbl.find lut var_id in
+		if DynArray.length sigs > 1 then begin
+			(-1),
+			(fun () ->
+				code#aload jsig 0;
+				let offset = code#get_pool#add_field self#get_path var_name var_sig FKField in
+				code#getfield offset jsig var_sig
+			),
+			(fun () ->
+				code#aload jsig 0;
+				let offset = code#get_pool#add_field self#get_path var_name var_sig FKField in
+				code#putfield offset jsig var_sig
+			)
+		end else begin
+			(-1),
+			(fun () ->
+				code#aload jsig 0;
+			),
+			(fun () ->
+				code#aload jsig 0;
+			)
+		end
+
+	method get_constructor_sig =
+		method_sig (List.map snd (DynArray.to_list sigs)) None
+
+	method get_jsig = jsig
+	method get_path = match jsig with TObject(path,_) -> path | _ -> assert false
+
+	method get_args = DynArray.to_list sigs
+end
+
+let create_context_class gctx jc jm name vl = match vl with
+	| [(vid,vname,vsig)] ->
+		let jsig = get_boxed_type vsig in
+		let ctx_class = new closure_context jsig in
+		ctx_class#add vid vname jsig;
+		ctx_class
+	| _ ->
+		let jc = jc#spawn_inner_class (Some jm) object_path None in
+		let path = jc#get_this_path in
+		let ctx_class = new closure_context (object_path_sig path) in
+		let jsigs = List.map (fun (_,_,vsig) -> vsig) vl in
+		let jm_ctor = jc#spawn_method "<init>" (method_sig jsigs None) [MPublic] in
+		jm_ctor#load_this;
+		jm_ctor#call_super_ctor ConstructInit (method_sig [] None);
+		List.iter2 (fun (vid,vname,vtype) jsig ->
+			jm_ctor#add_argument_and_field vname jsig;
+			ctx_class#add vid vname jsig;
+		) vl jsigs;
+		jm_ctor#get_code#return_void;
+		write_class gctx.jar path (jc#export_class gctx.default_export_config);
+		ctx_class
+
+let rvalue_any = RValue None
+let rvalue_sig jsig = RValue (Some jsig)
+let rvalue_type t = RValue (Some (jsignature_of_type t))
+
+class texpr_to_jvm gctx (jc : JvmClass.builder) (jm : JvmMethod.builder) (return_type : Type.t) = object(self)
+	val com = gctx.com
+	val code = jm#get_code
+	val pool : JvmConstantPool.constant_pool = jc#get_pool
+
+	val mutable local_lookup = Hashtbl.create 0;
+	val mutable last_line = 0
+
+	val mutable breaks = []
+	val mutable continue = 0
+	val mutable caught_exceptions = []
+	val mutable block_exits = []
+	val mutable env = None
+
+	method vtype t =
+		jsignature_of_type t
+
+	method mknull t = com.basic.tnull (follow t)
+
+	(* locals *)
+
+	method add_named_local (name : string) (jsig : jsignature) =
+		jm#add_local name jsig VarArgument
+
+	method add_local v init_state : (int * (unit -> unit) * (unit -> unit)) =
+		let t = self#vtype v.v_type in
+		let slot,load,store = jm#add_local v.v_name t init_state in
+		Hashtbl.add local_lookup v.v_id (slot,load,store);
+		slot,load,store
+
+	method get_local_by_id (vid,vname) =
+		if vid = 0 then
+			(0,(fun () -> jm#load_this),(fun () -> assert false))
+		else try
+			Hashtbl.find local_lookup vid
+		with Not_found -> try
+			begin match env with
+			| Some env ->
+				env#get code vid
+			| None ->
+				raise Not_found
+			end
+		with Not_found ->
+			failwith ("Unbound local: " ^ vname)
+
+	method get_local v =
+		self#get_local_by_id (v.v_id,v.v_name)
+
+	method set_context (ctx : closure_context) =
+		env <- Some ctx
+
+	(* casting *)
+
+	method expect_reference_type = jm#expect_reference_type
+
+	method cast t =
+		if follow t != t_dynamic then begin
+			let vt = self#vtype t in
+			jm#cast vt
+		end else
+			self#expect_reference_type
+
+	method cast_expect ret t = match ret with
+		| RValue (Some jsig) -> jm#cast jsig
+		| _ -> self#cast t
+
+	method tfunction e tf =
+		let name = jc#get_next_closure_name in
+		let outside = match Texpr.collect_captured_vars e with
+			| [],false ->
+				None
+			| vl,accesses_this ->
+				let vl = List.map (fun v -> v.v_id,v.v_name,jsignature_of_type v.v_type) vl in
+				let vl = if accesses_this then (0,"this",jc#get_jsig) :: vl else vl in
+				let ctx_class = create_context_class gctx jc jm name vl in
+				Some ctx_class
+		in
+		let jsig =
+			let args = List.map (fun (v,cto) ->
+				if cto <> None then v.v_type <- self#mknull v.v_type;
+				self#vtype v.v_type
+			) tf.tf_args in
+			let args = match outside with
+				| None -> args
+				| Some ctx_class -> ctx_class#get_jsig :: args
+			in
+			method_sig args (if ExtType.is_void (follow tf.tf_type) then None else Some (self#vtype tf.tf_type))
+		in
+		begin
+			let jm = jc#spawn_method name jsig [MPublic;MStatic] in
+			let handler = new texpr_to_jvm gctx jc jm tf.tf_type in
+			begin match outside with
+			| None -> ()
+			| Some ctx_class ->
+				handler#set_context ctx_class;
+				let name = match ctx_class#get_args with
+					| [(_,name),_] -> name
+					| _ -> "_hx_ctx"
+				in
+				ignore(handler#add_named_local name ctx_class#get_jsig)
+			end;
+			let inits = List.map (fun (v,cto) ->
+				let _,load,save = handler#add_local v VarArgument in
+				match cto with
+				| Some e when (match e.eexpr with TConst TNull -> false | _ -> true) ->
+					let f () =
+						load();
+						let jsig = self#vtype v.v_type in
+						jm#if_then
+							(fun () -> jm#get_code#if_nonnull_ref jsig)
+							(fun () ->
+								handler#texpr (rvalue_sig jsig) e;
+								jm#cast jsig;
+								save();
+							)
+					in
+					Some f
+				| _ ->
+					None
+			) tf.tf_args in
+			jm#finalize_arguments;
+			List.iter (function
+				| None -> ()
+				| Some f -> f()
+			) inits;
+			handler#texpr RReturn tf.tf_expr;
+		end;
+		jm#read_closure true jc#get_this_path name jsig;
+		outside
+
+	(* access *)
+
+	method read_native_array vta vte =
+		NativeArray.read code vta vte
+
+	method write_native_array vta vte =
+		NativeArray.write code vta vte
+
+	method read cast e1 fa =
+		match fa with
+		| FStatic({cl_path = (["java";"lang"],"Math")},({cf_name = "NaN" | "POSITIVE_INFINITY" | "NEGATIVE_INFINITY"} as cf)) ->
+			jm#getstatic double_path cf.cf_name TDouble
+		| FStatic({cl_path = (["java";"lang"],"Math")},({cf_name = "isNaN" | "isFinite"} as cf)) ->
+			jm#read_closure true double_path cf.cf_name (jsignature_of_type cf.cf_type);
+		| FStatic({cl_path = (["java";"lang"],"String")},({cf_name = "fromCharCode"} as cf)) ->
+			jm#read_closure true (["haxe";"jvm"],"StringExt") cf.cf_name (jsignature_of_type cf.cf_type);
+		| FStatic(c,({cf_kind = Method (MethNormal | MethInline)} as cf)) ->
+			jm#read_closure true c.cl_path cf.cf_name (jsignature_of_type cf.cf_type);
+		| FStatic(c,cf) ->
+			jm#getstatic c.cl_path cf.cf_name (self#vtype cf.cf_type);
+			cast();
+		| FInstance({cl_path = (["java";"lang"],"String")},_,{cf_name = "length"}) ->
+			self#texpr rvalue_any e1;
+			jm#invokevirtual string_path "length" (method_sig [] (Some TInt))
+		| FInstance({cl_path = (["java"],"NativeArray")},_,{cf_name = "length"}) ->
+			self#texpr rvalue_any e1;
+			let vtobj = self#vtype e1.etype in
+			code#arraylength vtobj;
+		| FInstance(c,tl,cf) | FClosure(Some(c,tl),({cf_kind = Method MethDynamic} as cf)) when not (is_interface_var_access c cf) ->
+			self#texpr rvalue_any e1;
+			jm#getfield c.cl_path cf.cf_name (self#vtype cf.cf_type);
+			cast();
+		| FEnum(en,ef) when not (match follow ef.ef_type with TFun _ -> true | _ -> false) ->
+			let jsig = self#vtype ef.ef_type in
+			let offset = pool#add_field en.e_path ef.ef_name jsig FKField in
+			code#getstatic offset jsig;
+			cast();
+		| FAnon ({cf_name = s} as cf) ->
+			self#texpr rvalue_any e1;
+			let default () =
+				jm#string s;
+				jm#invokestatic haxe_jvm_path "readField" (method_sig [object_sig;string_sig] (Some object_sig));
+				cast();
+			in
+			begin match follow e1.etype with
+			| TAnon an ->
+				let path,_ = TAnonIdentifiaction.identify gctx an.a_fields in
+				code#dup;
+				code#instanceof path;
+				jm#if_then_else
+					(fun () -> code#if_ref CmpEq)
+					(fun () ->
+						jm#cast (object_path_sig path);
+						jm#getfield path s (self#vtype cf.cf_type);
+						cast();
+					)
+					(fun () -> default());
+			| _ ->
+				default();
+			end
+		| FDynamic s | FInstance(_,_,{cf_name = s}) | FEnum(_,{ef_name = s}) | FClosure(Some({cl_interface = true},_),{cf_name = s}) | FClosure(None,{cf_name = s}) ->
+			self#texpr rvalue_any e1;
+			jm#string s;
+			jm#invokestatic haxe_jvm_path "readField" (method_sig [object_sig;string_sig] (Some object_sig));
+			cast();
+		| FClosure((Some(c,_)),cf) ->
+			let jsig = self#vtype cf.cf_type in
+			jm#read_closure false c.cl_path cf.cf_name jsig;
+			self#texpr rvalue_any e1;
+			jm#invokevirtual method_handle_path "bindTo" (method_sig [object_sig] (Some method_handle_sig));
+
+	method read_write ret ak e (f : unit -> unit) =
+		let apply dup =
+			if ret <> RVoid && ak = AKPost then dup();
+			f();
+			if ret <> RVoid && ak <> AKPost then dup();
+		in
+		match (Texpr.skip e).eexpr with
+		| TLocal v ->
+			let _,load,store = self#get_local v in
+			if ak <> AKNone then load();
+			apply (fun () -> code#dup);
+			store();
+		| TField(_,FStatic(c,cf)) ->
+			let jsig_cf = self#vtype cf.cf_type in
+			if ak <> AKNone then jm#getstatic c.cl_path cf.cf_name jsig_cf;
+			apply (fun () -> code#dup);
+			jm#putstatic c.cl_path cf.cf_name jsig_cf;
+		| TField(e1,FInstance(c,tl,cf)) when not (is_interface_var_access c cf) ->
+			self#texpr rvalue_any e1;
+			let jsig_cf = self#vtype cf.cf_type in
+			if ak <> AKNone then begin
+				code#dup;
+				jm#getfield c.cl_path cf.cf_name jsig_cf
+			end;
+			apply (fun () -> code#dup_x1);
+			self#cast cf.cf_type;
+			jm#putfield c.cl_path cf.cf_name jsig_cf
+		| TField(e1,(FDynamic s | FAnon {cf_name = s} | FInstance(_,_,{cf_name = s}))) ->
+			self#texpr rvalue_any e1;
+			if ak <> AKNone then code#dup;
+			jm#string s;
+			if ak <> AKNone then begin
+				code#dup_x1;
+				jm#invokestatic haxe_jvm_path "readField" (method_sig [object_sig;string_sig] (Some object_sig));
+				self#cast_expect ret e.etype;
+			end;
+			apply (fun () -> code#dup_x2);
+			self#cast (self#mknull e.etype);
+			jm#invokestatic haxe_jvm_path "writeField" (method_sig [object_sig;string_sig;object_sig] None)
+		| TArray(e1,e2) ->
+			begin match follow e1.etype with
+				| TInst({cl_path = (["haxe";"root"],"Array")} as c,[t]) ->
+					let t = self#mknull t in
+					self#texpr rvalue_any e1;
+					if ak <> AKNone then code#dup;
+					self#texpr rvalue_any e2;
+					jm#cast TInt;
+					if ak <> AKNone then begin
+						code#dup_x1;
+						jm#invokevirtual c.cl_path "__get" (method_sig [TInt] (Some object_sig));
+						self#cast_expect ret e.etype;
+					end;
+					apply (fun () -> code#dup_x2;);
+					self#cast t;
+					jm#invokevirtual c.cl_path "__set" (method_sig [TInt;object_sig] None);
+				| TInst({cl_path = (["java"],"NativeArray")},[t]) ->
+					let vte = self#vtype t in
+					let vta = self#vtype e1.etype in
+					self#texpr rvalue_any e1;
+					if ak <> AKNone then code#dup;
+					self#texpr rvalue_any e2;
+					if ak <> AKNone then begin
+						code#dup_x1;
+						self#read_native_array vta vte
+					end;
+					apply (fun () -> code#dup_x2);
+					self#cast t;
+					self#write_native_array vta vte
+				| _ ->
+					self#texpr rvalue_any e1;
+					if ak <> AKNone then code#dup;
+					self#texpr rvalue_any e2;
+					jm#cast TInt;
+					if ak <> AKNone then begin
+						code#dup_x1;
+						jm#invokestatic haxe_jvm_path "arrayRead" (method_sig [object_sig;TInt] (Some object_sig));
+					end;
+					apply (fun () -> code#dup_x2;);
+					self#cast e.etype;
+					self#expect_reference_type;
+					jm#invokestatic haxe_jvm_path "arrayWrite" (method_sig [object_sig;TInt;object_sig] None);
+				end
+		| _ ->
+			print_endline (s_expr_ast false "" (s_type (print_context())) e);
+			assert false
+
+	(* branching *)
+
+	method apply_cmp = function
+		| CmpNormal(op,_) -> (fun () -> code#if_ref op)
+		| CmpSpecial f -> f
+
+	method if_null t =
+		(fun () -> code#if_null_ref t)
+
+	method if_not_null t =
+		(fun () -> code#if_nonnull_ref t)
+
+	method condition e = match (Texpr.skip e).eexpr with
+		| TBinop((OpEq | OpNotEq | OpLt | OpGt | OpLte | OpGte) as op,e1,e2) ->
+			let op = convert_cmp_op op in
+			self#binop_compare op e1 e2
+		| _ ->
+			self#texpr rvalue_any e;
+			jm#cast TBool;
+			CmpNormal(CmpEq,TBool)
+
+	method switch ret e1 cases def =
+		(* TODO: hack because something loses the exhaustiveness marker before we get here *)
+		let is_exhaustive = OptimizerTexpr.is_exhaustive e1 || (ExtType.is_bool (follow e1.etype) && List.length cases > 1) in
+		if cases = [] then
+			self#texpr ret e1
+		else if List.for_all is_const_int_pattern cases then begin
+			let cases = List.map (fun (el,e) ->
+				let il = List.map (fun e -> match e.eexpr with
+					| TConst (TInt i32) -> i32
+					| _ -> assert false
+				) el in
+				(il,(fun () -> self#texpr ret e))
+			) cases in
+			let def = match def with
+				| None -> None
+				| Some e -> Some (fun () -> self#texpr ret e)
+			in
+			self#texpr rvalue_any e1;
+			jm#cast TInt;
+			ignore(jm#int_switch is_exhaustive cases def);
+		end else if List.for_all is_const_string_pattern cases then begin
+			let cases = List.map (fun (el,e) ->
+				let il = List.map (fun e -> match e.eexpr with
+					| TConst (TString s) -> java_hash s
+					| _ -> assert false
+				) el in
+				(il,(fun () -> self#texpr ret e))
+			) cases in
+			let def = match def with
+				| None -> None
+				| Some e -> Some (fun () -> self#texpr ret e)
+			in
+			self#texpr rvalue_any e1;
+			jm#cast string_sig;
+			let r = ref 0 in
+			(* all strings can be null and we're not supposed to cause NPEs here... *)
+			code#dup;
+			jm#if_then
+				(fun () -> jm#get_code#if_nonnull_ref string_sig)
+				(fun () ->
+					code#pop;
+					r := code#get_fp;
+					code#goto r
+				);
+			jm#invokevirtual string_path "hashCode" (method_sig [] (Some TInt));
+			let r_default = jm#int_switch is_exhaustive cases def in
+			r := r_default - !r;
+		end else begin
+			(* TODO: rewriting this is stupid *)
+			let pop_scope = jm#push_scope in
+			self#texpr rvalue_any e1;
+			let v = alloc_var VGenerated "tmp" e1.etype null_pos in
+			let _,_,store = self#add_local v VarWillInit in
+			self#cast v.v_type;
+			store();
+			let ev = mk (TLocal v) v.v_type null_pos in
+			let el = List.rev_map (fun (el,e) ->
+				let f e' = mk (TBinop(OpEq,ev,e')) com.basic.tbool e'.epos in
+				let e_cond = match el with
+					| [] -> assert false
+					| [e] -> f e
+					| e :: el ->
+						List.fold_left (fun eacc e ->
+							mk (TBinop(OpBoolOr,eacc,f e)) com.basic.tbool e.epos
+						) (f e) el
+				in
+				(e_cond,e)
+			) cases in
+			(* If we rewrite an exhaustive switch that has no default value, treat the last case as the default case to satisfy control flow. *)
+			let cases,def = if is_exhaustive && def = None then (match List.rev cases with (_,e) :: cases -> List.rev cases,Some e | _ -> assert false) else cases,def in
+			let e = List.fold_left (fun e_else (e_cond,e_then) -> Some (mk (TIf(e_cond,e_then,e_else)) e_then.etype e_then.epos)) def el in
+			self#texpr ret (Option.get e);
+			pop_scope()
+		end
+
+	(* binops *)
+
+	method binop_exprs cast_type f1 f2 =
+		f1();
+		jm#cast ~allow_to_string:true cast_type;
+		f2();
+		jm#cast ~allow_to_string:true cast_type;
+
+	method get_binop_type_sig jsig1 jsig2 = match jsig1,jsig2 with
+		| TObject((["java";"lang"],"String"),_),_
+		| _,TObject((["java";"lang"],"String"),_) ->
+			string_sig
+		| TLong,_ | _,TLong -> TLong
+		| TDouble,_ | _,TDouble -> TDouble
+		| TFloat,_ | _,TFloat -> TFloat
+		| TInt,_ | _,TInt -> TInt
+		| TShort,_ | _,TShort -> TShort
+		| TChar,_ | _,TChar -> TChar
+		| TByte,_ | _,TByte -> TByte
+		| TBool,_ | _,TBool -> TBool
+		| jsig1,jsig2 ->
+			if jsig1 = string_sig || jsig2 = string_sig then
+				string_sig
+			else
+				object_sig
+
+	method get_binop_type t1 t2 = self#get_binop_type_sig (jsignature_of_type t1) (jsignature_of_type t2)
+
+	method do_compare op =
+		match code#get_stack#get_stack_items 2 with
+		| [TInt | TByte | TChar | TBool;TInt | TByte | TChar | TBool] ->
+			let op = flip_cmp_op op in
+			CmpSpecial (fun () -> code#if_icmp_ref op)
+		| [TObject((["java";"lang"],"String"),[]);TObject((["java";"lang"],"String"),[])] ->
+			jm#invokestatic haxe_jvm_path "stringCompare" (method_sig [string_sig;string_sig] (Some TInt));
+			let op = flip_cmp_op op in
+			CmpNormal(op,TBool)
+		| [TObject((["java";"lang"],"Object"),[]) | TTypeParameter _;_]
+		| [_;TObject((["java";"lang"],"Object"),[]) | TTypeParameter _] ->
+			jm#invokestatic haxe_jvm_path "compare" (method_sig [object_sig;object_sig] (Some TInt));
+			let op = flip_cmp_op op in
+			CmpNormal(op,TBool)
+		| [(TObject _ | TArray _ | TMethod _) as t1;(TObject _ | TArray _ | TMethod _) as t2] ->
+			CmpSpecial (fun () -> (if op = CmpEq then code#if_acmp_ne_ref else code#if_acmp_eq_ref) t1 t2)
+		| [TDouble;TDouble] ->
+			let op = flip_cmp_op op in
+			begin match op with
+			| CmpGe | CmpGt -> code#dcmpg;
+			| _ -> code#dcmpl;
+			end;
+			CmpNormal(op,TDouble)
+		| [TFloat;TFloat] ->
+			let op = flip_cmp_op op in
+			begin match op with
+			| CmpGe | CmpGt -> code#fcmpg;
+			| _ -> code#fcmpl;
+			end;
+			CmpNormal(op,TFloat)
+		| [TLong;TLong] ->
+			let op = flip_cmp_op op in
+			code#lcmpl;
+			CmpNormal(op,TLong)
+		| [t1;t2] ->
+			jerror (Printf.sprintf "Can't compare %s and %s" (generate_signature false t1) (generate_signature false t2))
+		| tl ->
+			jerror (Printf.sprintf "Bad stack: %s" (String.concat ", " (List.map (generate_signature false) tl)));
+
+	method binop_compare op e1 e2 =
+		let sig1 = jsignature_of_type e1.etype in
+		let sig2 = jsignature_of_type e2.etype in
+		match (Texpr.skip e1),(Texpr.skip e2) with
+		| {eexpr = TConst TNull},_ when not (is_unboxed sig2) ->
+			self#texpr rvalue_any e2;
+			CmpSpecial ((if op = CmpEq then self#if_not_null else self#if_null) sig2)
+		| _,{eexpr = TConst TNull} when not (is_unboxed sig1) ->
+			self#texpr rvalue_any e1;
+			CmpSpecial ((if op = CmpEq then self#if_not_null else self#if_null) sig1)
+		| {eexpr = TConst (TInt i32);etype = t2},e1 when Int32.to_int i32 = 0 && sig2 = TInt ->
+			let op = match op with
+				| CmpGt -> CmpGe
+				| CmpLt -> CmpLe
+				| CmpLe -> CmpLt
+				| CmpGe -> CmpGt
+				| CmpEq -> CmpNe
+				| CmpNe -> CmpEq
+			in
+			self#texpr rvalue_any e1;
+			self#cast t2;
+			CmpNormal(op,TInt)
+		| e1,{eexpr = TConst (TInt i32); etype = t2;} when Int32.to_int i32 = 0 && sig1 = TInt->
+			let op = flip_cmp_op op in
+			self#texpr rvalue_any e1;
+			self#cast t2;
+			CmpNormal(op,TInt)
+		| _ ->
+			match is_unboxed sig1,is_unboxed sig2 with
+			| true,true ->
+				let f e () = self#texpr rvalue_any e in
+				self#binop_exprs (self#get_binop_type e1.etype e2.etype) (f e1) (f e2);
+				self#do_compare op
+			| false,false ->
+				let sig_unboxed1 = get_unboxed_type sig1 in
+				let sig_unboxed2 = get_unboxed_type sig2 in
+				if sig1 = sig_unboxed1 && sig2 = sig_unboxed2 then begin
+					(* No basic types involved, do normal comparison *)
+					self#texpr rvalue_any e1;
+					self#texpr rvalue_any e2;
+					self#do_compare op
+				end else begin
+					(* At least one of the types is a wrapped numeric one *)
+					let cast_type = self#get_binop_type_sig sig_unboxed1 sig_unboxed2 in
+					self#texpr rvalue_any e1;
+					jm#get_code#dup;
+					jm#if_then_else
+						(self#if_not_null sig1)
+						(fun () ->
+							jm#get_code#pop;
+							self#texpr rvalue_any e2;
+							self#boolop (CmpSpecial (self#if_not_null sig2))
+						)
+						(fun () ->
+							jm#cast ~not_null:true cast_type;
+							self#texpr rvalue_any e2;
+							jm#get_code#dup;
+							jm#if_then_else
+								(self#if_not_null sig2)
+								(fun () ->
+									jm#get_code#pop;
+									jm#get_code#pop;
+									jm#get_code#bconst (op = CmpNe);
+								)
+								(fun () ->
+									jm#cast ~not_null:true cast_type;
+									self#boolop (self#do_compare op);
+								)
+						);
+					CmpNormal(CmpEq,TBool)
+				end
+			| false,true ->
+				self#texpr rvalue_any e1;
+				jm#get_code#dup;
+				jm#if_then_else
+					(self#if_not_null sig1)
+					(fun () ->
+						jm#get_code#pop;
+						jm#get_code#bconst (op = CmpNe)
+					)
+					(fun () ->
+						(match (get_unboxed_type sig1), sig2 with
+						| (TFloat | TDouble as unboxed_sig1), TInt ->
+							jm#cast ~not_null:true unboxed_sig1;
+							self#texpr rvalue_any e2;
+							jm#cast ~not_null:true unboxed_sig1
+						| _ ->
+							jm#cast ~not_null:true sig2;
+							self#texpr rvalue_any e2
+						);
+						self#boolop (self#do_compare op)
+					);
+				CmpNormal(CmpEq,TBool)
+			| true,false ->
+				self#texpr rvalue_any e1;
+				let cast =
+					match sig1, (get_unboxed_type sig2) with
+					| TInt, (TFloat | TDouble as unboxed_sig2) ->
+						jm#cast ~not_null:true unboxed_sig2;
+						self#texpr rvalue_any e2;
+						(fun() -> jm#cast ~not_null:true unboxed_sig2)
+					| _ ->
+						self#texpr rvalue_any e2;
+						(fun() -> jm#cast ~not_null:true sig1)
+				in
+				jm#get_code#dup;
+				jm#if_then_else
+					(self#if_not_null sig2)
+					(fun () ->
+						jm#get_code#pop;
+						jm#get_code#pop;
+						jm#get_code#bconst (op = CmpNe);
+					)
+					(fun () ->
+						cast();
+						self#boolop (self#do_compare op)
+					);
+				CmpNormal(CmpEq,TBool)
+
+	method binop_basic ret op cast_type f1 f2 =
+		let emit_exprs () = self#binop_exprs cast_type f1 f2 in
+		let method_name () = match op with
+			| OpAdd -> "opAdd"
+			| OpSub -> "opSub"
+			| OpMult -> "opMul"
+			| OpDiv -> "opDiv"
+			| OpMod -> "opMod"
+			| OpAnd -> "opAnd"
+			| OpOr -> "opOr"
+			| OpXor -> "opXor"
+			| OpShl -> "opShl"
+			| OpShr -> "opShr"
+			| OpUShr -> "opUshr"
+			| _ -> assert false
+		in
+		begin match cast_type with
+			| TByte | TShort | TInt ->
+				begin match op with
+				| OpAdd ->
+					emit_exprs();
+					code#iadd
+				| OpSub ->
+					emit_exprs();
+					code#isub
+				| OpMult ->
+					emit_exprs();
+					code#imul
+				| OpDiv ->
+					f1();
+					jm#cast TDouble;
+					f2();
+					jm#cast TDouble;
+					code#ddiv;
+				| OpAnd ->
+					emit_exprs();
+					code#iand
+				| OpOr ->
+					emit_exprs();
+					code#ior
+				| OpXor ->
+					emit_exprs();
+					code#ixor
+				| OpShl ->
+					emit_exprs();
+					code#ishl
+				| OpShr ->
+					emit_exprs();
+					code#ishr
+				| OpUShr ->
+					emit_exprs();
+					code#iushr
+				| OpMod ->
+					emit_exprs();
+					code#irem
+				| _ -> jerror (Printf.sprintf "Unsupported binop on TInt: %s" (s_binop op))
+				end
+			| TFloat ->
+				emit_exprs();
+				begin match op with
+				| OpAdd -> code#fadd
+				| OpSub -> code#fsub
+				| OpMult -> code#fmul
+				| OpDiv -> code#fdiv
+				| OpMod -> code#frem
+				| _ -> jerror (Printf.sprintf "Unsupported binop on TFloat: %s" (s_binop op))
+				end
+			| TDouble ->
+				emit_exprs();
+				begin match op with
+				| OpAdd -> code#dadd
+				| OpSub -> code#dsub
+				| OpMult -> code#dmul
+				| OpDiv -> code#ddiv
+				| OpMod -> code#drem
+				| _ -> jerror (Printf.sprintf "Unsupported binop on TDouble: %s" (s_binop op))
+				end
+			| TLong ->
+				begin match op with
+				| OpAdd ->
+					emit_exprs();
+					code#ladd
+				| OpSub ->
+					emit_exprs();
+					code#lsub
+				| OpMult ->
+					emit_exprs();
+					code#lmul
+				| OpDiv ->
+					emit_exprs();
+					code#ldiv
+				| OpAnd ->
+					emit_exprs();
+					code#land_
+				| OpOr ->
+					emit_exprs();
+					code#lor_
+				| OpXor ->
+					emit_exprs();
+					code#lxor_
+				| OpShl ->
+					f1();
+					jm#cast TLong;
+					f2();
+					jm#cast TInt;
+					code#lshl;
+				| OpShr ->
+					f1();
+					jm#cast TLong;
+					f2();
+					jm#cast TInt;
+					code#lshr;
+				| OpUShr ->
+					f1();
+					jm#cast TLong;
+					f2();
+					jm#cast TInt;
+					code#lushr;
+				| OpMod ->
+					emit_exprs();
+					code#lrem
+				| _ -> jerror (Printf.sprintf "Unsupported binop on TInt: %s" (s_binop op))
+				end
+			| TBool | TObject((["java";"lang"],"Object"),_) | TTypeParameter _ ->
+				begin match op with
+				| OpBoolAnd ->
+					let operand f =
+						f();
+						jm#cast TBool;
+					in
+					operand f1;
+					jm#if_then_else
+						(fun () -> code#if_ref CmpEq)
+						(fun () -> operand f2)
+						(fun () -> code#bconst false)
+				| OpBoolOr ->
+					let operand f =
+						f();
+						jm#cast TBool;
+					in
+					operand f1;
+					jm#if_then_else
+						(fun () -> code#if_ref CmpEq)
+						(fun () -> code#bconst true)
+						(fun () -> operand f2)
+				| _ ->
+					emit_exprs();
+					let name = method_name () in
+					jm#invokestatic haxe_jvm_path name (method_sig [object_sig;object_sig] (Some object_sig))
+				end
+			| TObject(path,_) ->
+				emit_exprs();
+				if path = string_path then
+					jm#invokestatic haxe_jvm_path "stringConcat" (method_sig [object_sig;object_sig] (Some string_sig))
+				else begin
+					let name = method_name () in
+					jm#invokestatic haxe_jvm_path name (method_sig [object_sig;object_sig] (Some object_sig))
+				end
+			| _ ->
+				jerror (Printf.sprintf "Unsupported operation %s on %s" (s_binop op) (generate_signature false cast_type))
+		end;
+
+	method boolop cmp =
+		jm#if_then_else
+			(self#apply_cmp cmp)
+			(fun () -> code#bconst true)
+			(fun () -> code#bconst false)
+
+	method var_slot_is_in_int8_range v =
+		let slot,_,_ = self#get_local v in
+		in_range true Int8Range slot
+
+	method binop ret op e1 e2 = match op with
+		| OpEq | OpNotEq | OpLt | OpGt | OpLte | OpGte ->
+			let op = convert_cmp_op op in
+			self#boolop (self#binop_compare op e1 e2)
+		| OpAssign ->
+			let f () =
+				self#texpr (rvalue_type e1.etype) e2;
+				self#cast e1.etype;
+			in
+			self#read_write ret AKNone e1 f
+		| OpAssignOp op ->
+			let jsig1 = jsignature_of_type e1.etype in
+			begin match op,(Texpr.skip e1).eexpr,(Texpr.skip e2).eexpr with
+			| OpAdd,TLocal v,TConst (TInt i32) when ExtType.is_int v.v_type && in_range false Int8Range (Int32.to_int i32) && self#var_slot_is_in_int8_range v->
+				let slot,load,_ = self#get_local v in
+				let i = Int32.to_int i32 in
+				code#iinc slot i;
+				if ret <> RVoid then load();
+			| OpSub,TLocal v,TConst (TInt i32) when ExtType.is_int v.v_type && in_range false Int8Range (-Int32.to_int i32) && self#var_slot_is_in_int8_range v ->
+				let slot,load,_ = self#get_local v in
+				let i = -Int32.to_int i32 in
+				code#iinc slot i;
+				if ret <> RVoid then load();
+			| _ ->
+				let f () =
+					self#binop_basic ret op (self#get_binop_type e1.etype e2.etype) (fun () -> ()) (fun () -> self#texpr rvalue_any e2);
+					jm#cast jsig1;
+				in
+				self#read_write ret AKPre e1 f
+			end
+		| _ ->
+			let f e () = self#texpr rvalue_any e in
+			self#binop_basic ret op (self#get_binop_type e1.etype e2.etype) (f e1) (f e2)
+
+	method unop ret op flag e =
+		match op,(Texpr.skip e).eexpr with
+		| (Increment | Decrement),TLocal v when ExtType.is_int v.v_type && self#var_slot_is_in_int8_range v ->
+			let slot,load,_ = self#get_local v in
+			if flag = Postfix && ret <> RVoid then load();
+			code#iinc slot (if op = Increment then 1 else -1);
+			if flag = Prefix && ret <> RVoid then load();
+		| (Increment | Decrement),_ ->
+			let is_null = is_null e.etype in
+			let f () =
+				begin match jm#get_code#get_stack#top with
+				| TLong ->
+					code#lconst Int64.one;
+					if op = Increment then code#ladd else code#lsub
+				| TDouble ->
+					code#dconst 1.;
+					if op = Increment then code#dadd else code#dsub
+				| TByte | TShort | TInt ->
+					code#iconst Int32.one;
+					if op = Increment then code#iadd else code#isub;
+					if is_null then self#expect_reference_type;
+				| _ ->
+					jm#invokestatic haxe_jvm_path (if op = Increment then "opIncrement" else "opDecrement") (method_sig [object_sig] (Some object_sig))
+				end
+			in
+			self#read_write ret (if flag = Prefix then AKPre else AKPost) e f;
+		| Neg,_ ->
+			self#texpr rvalue_any e;
+			let jsig = jsignature_of_type (follow e.etype) in
+			jm#cast jsig;
+			begin match jsig with
+			| TLong -> code#lneg;
+			| TDouble -> code#dneg;
+			| TByte | TShort | TInt -> code#ineg;
+			| _ -> jm#invokestatic haxe_jvm_path "opNeg" (method_sig [object_sig] (Some object_sig))
+			end;
+			self#cast e.etype;
+		| Not,_ ->
+			jm#if_then_else
+				(self#apply_cmp (self#condition e))
+				(fun () -> code#bconst false)
+				(fun () -> code#bconst true)
+		| NegBits,_ ->
+			let jsig = jsignature_of_type (follow e.etype) in
+			self#texpr rvalue_any e;
+			jm#cast jsig;
+			begin match jsig with
+			| TByte | TShort | TInt ->
+				code#iconst Int32.minus_one;
+				code#ixor;
+			| TLong ->
+				code#lconst Int64.minus_one;
+				code#lxor_;
+			| _ ->
+				jm#invokestatic haxe_jvm_path "opNegBits" (method_sig [object_sig] (Some object_sig))
+			end;
+			self#cast e.etype;
+
+	(* calls *)
+
+	method get_argument_signatures t el =
+		match jsignature_of_type t with
+		| TMethod(jsigs,r) -> jsigs,r
+		| _ -> List.map (fun _ -> object_sig) el,(Some object_sig)
+
+	method call_arguments t el =
+		let tl,tr = self#get_argument_signatures t el in
+		let varargs_type = match follow t with
+			| TFun(tl,_) ->
+				begin match List.rev tl with
+				| (_,_,(TAbstract({a_path = ["haxe";"extern"],"Rest"},[t]))) :: _ -> Some (jsignature_of_type t)
+				| _ -> None
+				end
+			| _ ->
+				None
+		in
+		let rec loop acc tl el = match tl,el with
+			| jsig :: tl,e :: el ->
+				begin match tl,varargs_type with
+				| [],Some jsig' ->
+					self#new_native_array jsig' (e :: el);
+					List.rev (jsig :: acc)
+				| _ ->
+					self#texpr (rvalue_sig jsig) e;
+					jm#cast jsig;
+					loop (jsig :: acc) tl el
+				end
+			| _,[] -> List.rev acc
+			| [],e :: el ->
+				(* TODO: this sucks *)
+				self#texpr rvalue_any e;
+				loop (self#vtype e.etype :: acc) [] el
+		in
+		let tl = loop [] tl el in
+		tl,tr
+
+	method call ret tr e1 el =
+		let retype tr = match tr with None -> [] | Some t -> [t] in
+		let tro = match (Texpr.skip e1).eexpr with
+		| TField(_,FStatic({cl_path = ["haxe";"jvm"],"Jvm"},({cf_name = "referenceEquals"} as cf))) ->
+			let tl,tr = self#call_arguments cf.cf_type el in
+			begin match tl with
+				| [t1;t2] -> self#boolop (CmpSpecial (fun () -> code#if_acmp_ne_ref t1 t2))
+				| _ -> assert false
+			end;
+			tr
+		| TField(_,FStatic({cl_path = ["haxe";"jvm"],"Jvm"},({cf_name = "instanceof"}))) ->
+			begin match el with
+				| [e1;{eexpr = TTypeExpr mt;epos = pe}] ->
+					self#texpr rvalue_any e1;
+					self#expect_reference_type;
+					let path = match jsignature_of_type (type_of_module_type mt) with
+						| TObject(path,_) -> path
+						| _ -> Error.error "Class expected" pe
+					in
+					code#instanceof path;
+					Some TBool
+				| _ -> Error.error "Type expression expected" e1.epos
+			end;
+		| TField(_,FStatic({cl_path = ["haxe";"jvm"],"Jvm"},({cf_name = "invokedynamic"}))) ->
+			begin match el with
+				| e_bsm :: {eexpr = TConst (TString name)} :: {eexpr = TArrayDecl el_static_args} :: el ->
+					let t = tfun (List.map (fun e -> e.etype) el) tr in
+					let tl,tr = self#call_arguments t el in
+					let path,mname = match e_bsm.eexpr with
+						| TField(_,FStatic(c,cf)) -> c.cl_path,cf.cf_name
+						| _ -> Error.error "Reference to bootstrap method expected" e_bsm.epos
+					in
+					let rec loop consts jsigs static_args = match static_args with
+						| e :: static_args ->
+							let const,jsig =  match e.eexpr with
+							| TConst (TString s) -> pool#add_const_string s,string_sig
+							| TConst (TInt i) -> pool#add (ConstInt i),TInt
+							| TConst (TFloat f) -> pool#add (ConstDouble (float_of_string f)),TDouble
+							| TField(_,FStatic(c,cf)) ->
+								let offset = pool#add_field c.cl_path cf.cf_name (self#vtype cf.cf_type) FKMethod in
+								pool#add (ConstMethodHandle(6, offset)),method_handle_sig
+							| _ -> Error.error "Invalid static argument" e.epos
+							in
+							loop (const :: consts) (jsig :: jsigs) static_args
+						| [] ->
+							List.rev consts,List.rev jsigs
+					in
+					let consts,jsigs = loop [] [] el_static_args in
+					let mtl = method_lookup_sig :: string_sig :: method_type_sig :: jsigs in
+					let index = jc#get_bootstrap_method path mname (method_sig mtl (Some call_site_sig)) consts in
+					let jsig_method = method_sig tl tr in
+					let offset_info = pool#add_name_and_type name jsig_method FKMethod in
+					let offset = pool#add (ConstInvokeDynamic(index,offset_info)) in
+					code#invokedynamic offset tl (retype tr);
+					tr
+				| _ ->
+					Error.error "Bad invokedynamic call" e1.epos
+			end
+		| TField(_,FStatic({cl_path = (["java";"lang"],"Math")},{cf_name = ("isNaN" | "isFinite") as name})) ->
+			begin match el with
+			| [e1] ->
+				self#texpr rvalue_any e1;
+				jm#cast TDouble;
+				jm#invokestatic (["java";"lang"],"Double") name (method_sig [TDouble] (Some TBool));
+				Some TBool
+			| _ ->
+				assert false
+			end;
+		| TField(_,FStatic({cl_path = (["java";"lang"],"Math")},{cf_name = ("floor" | "ceil" | "round") as name})) ->
+			begin match el with
+			| [e1] ->
+				self#texpr rvalue_any e1;
+				jm#cast TDouble;
+				let rsig = if name = "round" then TLong else TDouble in
+				jm#invokestatic (["java";"lang"],"Math") name (method_sig [TDouble] (Some rsig));
+				jm#cast TInt;
+				Some TInt
+			| _ ->
+				assert false
+			end;
+		| TField(_,FStatic({cl_path = (["java";"lang"],"Math")} as c,({cf_name = ("ffloor" | "fceil")} as cf))) ->
+			let tl,tr = self#call_arguments cf.cf_type el in
+			jm#invokestatic c.cl_path (String.sub cf.cf_name 1 (String.length cf.cf_name - 1)) (method_sig tl tr);
+			tr
+		| TField(_,FStatic({cl_path = (["haxe";"_Int64"],"Int64_Impl_")},{cf_name = "make"})) ->
+			begin match el with
+			| [{eexpr = TConst (TInt i1)};{eexpr = TConst (TInt i2)}] ->
+				let high = Int64.of_int32 i1 in
+				let high = Int64.shift_left high 32 in
+				let low = Int64.of_int32 i2 in
+				let low = Int64.logand low (Int64.of_string "0xFFFFFFFF") in
+				let i = Int64.logor high low in
+				jm#get_code#lconst i;
+				Some TLong
+			| [e1;e2] ->
+				self#texpr (rvalue_sig TLong) e1;
+				jm#cast TLong;
+				jm#get_code#iconst (Int32.of_int 32);
+				jm#get_code#lshl;
+				self#texpr (rvalue_sig TLong) e2;
+				jm#cast TLong;
+				jm#get_code#lconst (Int64.of_string "0xFFFFFFFF");
+				jm#get_code#land_;
+				jm#get_code#lor_;
+				Some TLong
+			| _ ->
+				assert false
+			end
+		| TIdent "__array__" | TField(_,FStatic({cl_path = (["java"],"NativeArray")},{cf_name = "make"})) ->
+			begin match follow tr with
+			| TInst({cl_path = (["java"],"NativeArray")},[t]) ->
+				let jsig = self#vtype t in
+				self#new_native_array jsig el;
+				Some (array_sig jsig)
+			| _ ->
+				Error.error (Printf.sprintf "Bad __array__ type: %s" (s_type (print_context()) tr)) e1.epos;
+			end
+		| TField(e1,FStatic(c,({cf_kind = Method (MethNormal | MethInline)} as cf))) ->
+			let tl,tr = self#call_arguments cf.cf_type el in
+			jm#invokestatic c.cl_path cf.cf_name (method_sig tl tr);
+			tr
+		| TField(e1,FInstance(c,tl,({cf_kind = Method (MethNormal | MethInline)} as cf))) ->
+			let is_super = match e1.eexpr with
+			| TConst TSuper ->
+				code#aload jc#get_jsig 0;
+				true
+			| _ ->
+				self#texpr rvalue_any e1;
+				false
+			in
+			begin match find_overload_rec false (apply_params c.cl_params tl) c cf el with
+			| None -> Error.error "Could not find overload" e1.epos
+			| Some(c,cf) ->
+				let tl,tr = self#call_arguments cf.cf_type el in
+				(if is_super then jm#invokespecial else if c.cl_interface then jm#invokeinterface else jm#invokevirtual) c.cl_path cf.cf_name (self#vtype cf.cf_type);
+				tr
+			end
+		| TField(_,FEnum(en,ef)) ->
+			let tl,_ = self#call_arguments ef.ef_type el in
+			let tr = self#vtype tr in
+			jm#invokestatic en.e_path ef.ef_name (method_sig tl (Some tr));
+			Some tr
+		| TConst TSuper ->
+			let c,cf = match gctx.current_field_info with
+				| Some ({super_call_fields = hd :: tl} as info) ->
+					info.super_call_fields <- tl;
+					hd
+				| _ ->
+					Error.error "Something went wrong" e1.epos
+			in
+			let kind = get_construction_mode c cf in
+			begin match kind with
+				| ConstructInitPlusNew when jm#get_name = "<init>" ->
+					jm#load_this;
+					jm#get_code#aconst_null haxe_empty_constructor_sig;
+					jm#call_super_ctor ConstructInit (method_sig [haxe_empty_constructor_sig] None);
+				| _ ->
+					()
+			end;
+			jm#load_this;
+			let tl,_ = self#call_arguments cf.cf_type el in
+			jm#call_super_ctor kind (method_sig tl None);
+			None
+		| TIdent "__lock__" ->
+			begin match el with
+				| [e1;e2] ->
+					self#texpr rvalue_any e1;
+					jm#get_code#dup;
+					let _,load,save = jm#add_local "tmp" (self#vtype e1.etype) VarWillInit in
+					save();
+					jm#get_code#monitorenter;
+					let f_exit () =
+						load();
+						jm#get_code#monitorexit;
+					in
+					block_exits <- (ExitExecute f_exit) :: block_exits;
+					let fp_from = jm#get_code#get_fp in
+					self#texpr RVoid e2;
+					let term_try = jm#is_terminated in
+					if not jm#is_terminated then f_exit();
+					let fp_to = jm#get_code#get_fp in
+					let r_try = jm#maybe_make_jump in
+					let fp_target = jm#get_code#get_fp in
+					let pop_scope = jm#push_scope in
+					code#get_stack#push throwable_sig;
+					jm#add_stack_frame;
+					jm#add_exception {
+						exc_start_pc = fp_from;
+						exc_end_pc = fp_to;
+						exc_handler_pc = fp_target;
+						exc_catch_type = None;
+					};
+					begin
+						let _,load,save = jm#add_local "tmp" throwable_sig VarWillInit in
+						save();
+						f_exit();
+						jm#add_exception {
+							exc_start_pc = fp_target;
+							exc_end_pc = jm#get_code#get_fp;
+							exc_handler_pc = fp_target;
+							exc_catch_type = None;
+						};
+						load();
+						jm#get_code#athrow;
+					end;
+					pop_scope();
+					block_exits <- List.tl block_exits;
+					if not term_try then jm#add_stack_frame;
+					jm#close_jumps true ([term_try,r_try]);
+					None
+				| _ -> assert false
+			end
+		| _ ->
+			let rec has_unknown_args jsig =
+				is_dynamic_at_runtime jsig || match jsig with
+					| TMethod(jsigs,_) -> List.exists has_unknown_args jsigs
+					| _ -> false
+			in
+			if has_unknown_args (jsignature_of_type e1.etype) then begin
+				self#texpr rvalue_any e1;
+				jm#cast method_handle_sig;
+				self#new_native_array object_sig el;
+				jm#invokestatic haxe_jvm_path "call" (method_sig [method_handle_sig;array_sig object_sig] (Some object_sig));
+				Some object_sig
+			end else begin
+				self#texpr rvalue_any e1;
+				jm#cast method_handle_sig;
+				let tl,tr = self#call_arguments e1.etype el in
+				jm#invokevirtual method_handle_path "invoke" (method_sig tl tr);
+				tr
+			end
+		in
+		match ret = RVoid,tro with
+		| true,Some _ -> code#pop
+		| true,None -> ()
+		| false,Some _ -> self#cast tr;
+		| false,None -> assert false
+
+	(* exceptions *)
+
+	method throw vt =
+		jm#expect_reference_type;
+		jm#invokestatic (["haxe";"jvm"],"Exception") "wrap" (method_sig [object_sig] (Some exception_sig));
+		code#athrow;
+		jm#set_terminated true
+
+	method try_catch ret e1 catches =
+		let restore = jm#start_branch in
+		let fp_from = code#get_fp in
+		let old_exceptions = caught_exceptions in
+		let excl = List.map (fun (v,e) ->
+			let exc = new haxe_exception gctx v.v_type in
+			caught_exceptions <- exc :: caught_exceptions;
+			exc,v,e
+		) catches in
+		self#texpr ret e1;
+		caught_exceptions <- old_exceptions;
+		let term_try = jm#is_terminated in
+		let r_try = jm#maybe_make_jump in
+		let fp_to = code#get_fp in
+		let unwrap () =
+			code#dup;
+			code#instanceof haxe_exception_path;
+			jm#if_then_else
+				(fun () -> code#if_ref CmpEq)
+				(fun () ->
+					jm#cast haxe_exception_sig;
+					jm#getfield (["haxe";"jvm"],"Exception") "value" object_sig;
+				)
+				(fun () -> jm#cast object_sig);
+		in
+		let start_exception_block path jsig =
+			restore();
+			let fp_target = code#get_fp in
+			let offset = pool#add_path path in
+			jm#add_exception {
+				exc_start_pc = fp_from;
+				exc_end_pc = fp_to;
+				exc_handler_pc = fp_target;
+				exc_catch_type = Some offset;
+			};
+			code#get_stack#push jsig;
+			jm#add_stack_frame;
+			jm#get_code#dup;
+			jm#invokestatic haxe_exception_path "setException" (method_sig [throwable_sig] None);
+		in
+		let run_catch_expr v e =
+			let pop_scope = jm#push_scope in
+			let _,_,store = self#add_local v VarWillInit in
+			store();
+			self#texpr ret e;
+			pop_scope();
+			jm#is_terminated
+		in
+		let add_catch (exc,v,e) =
+			start_exception_block exc#get_native_exception_path exc#get_native_exception_type;
+			if not exc#is_native_exception then begin
+				unwrap();
+				self#cast v.v_type
+			end;
+			let term = run_catch_expr v e in
+			let r = jm#maybe_make_jump in
+			term,r
+		in
+		let commit_instanceof_checks excl =
+			start_exception_block throwable_path throwable_sig;
+			let pop_scope = jm#push_scope in
+			let _,load,save = jm#add_local "exc" throwable_sig VarWillInit in
+			code#dup;
+			save();
+			unwrap();
+			let restore = jm#start_branch in
+			let rl = ref [] in
+			let rec loop excl = match excl with
+				| [] ->
+					code#pop;
+					load();
+					code#athrow;
+					jm#set_terminated true
+				| (_,v,e) :: excl ->
+					code#dup;
+					let path = match self#vtype (self#mknull v.v_type) with TObject(path,_) -> path | _ -> assert false in
+					if path = object_path then begin
+						code#pop;
+						restore();
+						let term = run_catch_expr v e in
+						rl := (term,ref 0) :: !rl;
+					end else begin
+						code#instanceof path;
+						jm#if_then_else
+							(fun () -> code#if_ref CmpEq)
+							(fun () ->
+								restore();
+								self#cast v.v_type;
+								let term = run_catch_expr v e in
+								rl := (term,ref 0) :: !rl;
+							)
+							(fun () -> loop excl)
+					end
+			in
+			loop excl;
+			pop_scope();
+			!rl
+		in
+		let rec loop acc excl = match excl with
+			| (exc,v,e) :: excl ->
+				if List.exists (fun (exc',_,_) -> exc'#is_assignable_to exc) excl || excl = [] && not exc#is_native_exception then begin
+					let res = commit_instanceof_checks ((exc,v,e) :: excl) in
+					acc @ res
+				end else begin
+					let res = add_catch (exc,v,e) in
+					loop (res :: acc) excl
+				end
+			| [] ->
+				acc
+		in
+		let rl = loop [] excl in
+		jm#close_jumps true ((term_try,r_try) :: rl)
+
+	method emit_block_exits is_loop_exit =
+		let rec loop stack = match stack with
+			| [] ->
+				()
+			| ExitLoop :: stack ->
+				if not is_loop_exit then loop stack
+			| ExitExecute f :: stack ->
+				f();
+				loop stack
+		in
+		loop block_exits
+
+	(* texpr *)
+
+	method const ret t ct = match ct with
+		| Type.TInt i32 -> code#iconst i32
+		| TFloat f ->
+			begin match ret with
+			| RValue (Some (TFloat | TObject((["java";"lang"],"Float"),_))) -> code#fconst (float_of_string f)
+			| _ -> code#dconst (float_of_string f)
+			end
+		| TBool true -> code#bconst true
+		| TBool false -> code#bconst false
+		| TNull -> code#aconst_null (self#vtype t)
+		| TThis ->
+			let _,load,_ = self#get_local_by_id (0,"this") in
+			load()
+		| TString s -> jm#string s
+		| TSuper -> failwith "Invalid super access"
+
+	method new_native_array jsig el =
+		jm#new_native_array jsig (List.map (fun e -> fun () -> self#texpr (rvalue_sig jsig) e) el)
+
+	method basic_type_path name =
+		let offset = pool#add_field (["java";"lang"],name) "TYPE" java_class_sig FKField in
+		code#getstatic offset java_class_sig
+
+	method type_expr = function
+		| TByte -> self#basic_type_path "Byte"
+		| TChar -> self#basic_type_path "Character"
+		| TDouble -> self#basic_type_path "Double"
+		| TFloat -> self#basic_type_path "Float"
+		| TInt -> self#basic_type_path "Integer"
+		| TLong -> self#basic_type_path "Long"
+		| TShort -> self#basic_type_path "Short"
+		| TBool -> self#basic_type_path "Boolean"
+		| TObject(path,_) ->
+			let offset = pool#add_path path in
+			let t = object_path_sig path in
+			code#ldc offset (TObject(java_class_path,[TType(WNone,t)]))
+		| TMethod _ ->
+			let offset = pool#add_path method_handle_path in
+			code#ldc offset (TObject(java_class_path,[TType(WNone,method_handle_sig)]))
+		| TTypeParameter _ ->
+			let offset = pool#add_path object_path in
+			code#ldc offset (TObject(java_class_path,[TType(WNone,object_sig)]))
+		| TArray _ as t ->
+			(* TODO: this seems hacky *)
+			let offset = pool#add_path ([],generate_signature false t) in
+			code#ldc offset (TObject(java_class_path,[TType(WNone,object_sig)]))
+		| jsig ->
+			print_endline (generate_signature false jsig);
+			assert false
+
+	method texpr ret e =
+		try
+			if not jm#is_terminated then self#texpr' ret e
+		with Failure s ->
+			raise (HarderFailure (Printf.sprintf "Expr %s\n%s" (s_expr_pretty false "" false (s_type (print_context())) e) s))
+
+	method texpr' ret e =
+		code#set_line (Lexer.get_error_line e.epos);
+		match e.eexpr with
+		| TVar(v,Some e1) ->
+			self#texpr (rvalue_type v.v_type) e1;
+			self#cast v.v_type;
+			let _,_,store = self#add_local v VarWillInit in
+			store()
+		| TVar(v,None) ->
+			ignore(self#add_local v VarNeedDefault);
+		| TLocal _ | TConst _  | TTypeExpr _ when ret = RVoid ->
+			()
+		| TLocal v ->
+			let _,load,_ = self#get_local v in
+			load()
+		| TTypeExpr mt ->
+			self#type_expr (jsignature_of_type (type_of_module_type mt))
+		| TUnop(op,flag,e1) ->
+			begin match op with
+			| Not | Neg | NegBits when ret = RVoid -> self#texpr ret e1
+			| _ -> self#unop ret op flag e1
+			end
+		| TBinop(OpAdd,e1,e2) when ExtType.is_string (follow e.etype) ->
+			let string_builder_path = (["java";"lang"],"StringBuilder") in
+			let string_builder_sig = object_path_sig string_builder_path in
+			jm#construct ConstructInit string_builder_path (fun () -> []);
+			let rec loop e = match e.eexpr with
+				| TBinop(OpAdd,e1,e2) when ExtType.is_string (follow e.etype) ->
+					loop e1;
+					loop e2;
+				| _ ->
+					self#texpr rvalue_any e;
+					let jsig = jm#get_code#get_stack#top in
+					let jsig = match jsig with
+						| TByte | TBool | TChar | TShort | TInt | TLong ->
+							jsig
+						| TFloat | TDouble ->
+							(* Haxe mandates 2.0 be printed as 2, so we have to wrap here... *)
+							jm#expect_reference_type;
+							jm#invokestatic haxe_jvm_path "toString" (method_sig [object_sig] (Some string_sig));
+							string_sig
+						| _ ->
+							object_sig
+					in
+					jm#invokevirtual string_builder_path "append" (method_sig [jsig] (Some string_builder_sig));
+			in
+			loop e1;
+			loop e2;
+			jm#invokevirtual string_builder_path "toString" (method_sig [] (Some string_sig));
+		| TBinop(op,e1,e2) ->
+			begin match op with
+			| OpAssign | OpAssignOp _ -> self#binop ret op e1 e2
+			| _ when ret = RVoid ->
+				self#texpr ret e1;
+				self#texpr ret e2;
+			| _ ->
+				self#binop ret op e1 e2
+			end
+		| TConst ct ->
+			self#const ret e.etype ct
+		| TIf(e1,e2,None) ->
+			jm#if_then
+				(self#apply_cmp (self#condition e1))
+				(fun () -> self#texpr RVoid (mk_block e2))
+		| TIf(e1,e2,Some e3) ->
+			jm#if_then_else
+				(self#apply_cmp (self#condition e1))
+				(fun () ->
+					self#texpr ret (mk_block e2);
+					if ret <> RVoid then self#cast e.etype
+				)
+				(fun () ->
+					self#texpr ret (mk_block e3);
+					if ret <> RVoid then self#cast e.etype;
+				)
+		| TSwitch(e1,cases,def) ->
+			self#switch ret e1 cases def
+		| TWhile(e1,e2,flag) -> (* TODO: do-while *)
+			(* TODO: could optimize a bit *)
+			block_exits <- ExitLoop :: block_exits;
+			let is_true_loop = match (Texpr.skip e1).eexpr with TConst (TBool true) -> true | _ -> false in
+			jm#add_stack_frame;
+			let fp = code#get_fp in
+			let old_continue = continue in
+			continue <- fp;
+			let old_breaks = breaks in
+			breaks <- [];
+			let restore = jm#start_branch in
+			let jump_then = if not is_true_loop then self#apply_cmp (self#condition e1) () else ref 0 in
+			let pop_scope = jm#push_scope in
+			self#texpr RVoid e2;
+			if not jm#is_terminated then code#goto (ref (fp - code#get_fp));
+			pop_scope();
+			restore();
+			if not is_true_loop || breaks <> [] then begin
+				jump_then := code#get_fp - !jump_then;
+				let fp' = code#get_fp in
+				List.iter (fun r -> r := fp' - !r) breaks;
+				jm#add_stack_frame
+			end else
+				jm#set_terminated true;
+			continue <- old_continue;
+			breaks <- old_breaks;
+			block_exits <- List.tl block_exits;
+		| TBreak ->
+			self#emit_block_exits true;
+			let r = ref (code#get_fp) in
+			code#goto r;
+			breaks <- r :: breaks;
+			jm#set_terminated true;
+		| TContinue ->
+			self#emit_block_exits true;
+			code#goto (ref (continue - code#get_fp));
+			jm#set_terminated true;
+		| TTry(e1,catches) ->
+			self#try_catch ret e1 catches
+		| TField(e1,fa) ->
+			if ret = RVoid then self#texpr ret e1
+			else self#read (fun () -> self#cast_expect ret e.etype) e1 fa;
+		| TCall(e1,el) ->
+			self#call ret e.etype e1 el
+		| TNew({cl_path = (["java"],"NativeArray")},[t],[e1]) ->
+			self#texpr (match ret with RVoid -> RVoid | _ -> rvalue_any) e1;
+			(* Technically this could throw... but whatever *)
+			if ret <> RVoid then ignore(NativeArray.create jm#get_code jc#get_pool (jsignature_of_type t))
+		| TNew(c,tl,el) ->
+			begin match get_constructor (fun cf -> cf.cf_type) c with
+			|_,cf ->
+				begin match find_overload_rec true (apply_params c.cl_params tl) c cf el with
+				| None -> Error.error "Could not find overload" e.epos
+				| Some (c',cf) ->
+					let f () =
+						let tl,_ = self#call_arguments  cf.cf_type el in
+						tl
+					in
+					jm#construct ~no_value:(if ret = RVoid then true else false) (get_construction_mode c' cf) c.cl_path f
+				end
+			end
+		| TReturn None ->
+			self#emit_block_exits false;
+			code#return_void;
+			jm#set_terminated true;
+		| TReturn (Some e1) ->
+			self#texpr rvalue_any e1;
+			self#cast return_type;
+			let vt = self#vtype return_type in
+			self#emit_block_exits false;
+			code#return_value vt;
+			jm#set_terminated true;
+		| TFunction tf ->
+			begin match self#tfunction e tf with
+			| None ->
+				()
+			| Some ctx_class ->
+				begin match ctx_class#get_args with
+				| [(arg,jsig)] ->
+					let _,load,_ = self#get_local_by_id arg in
+					load();
+					self#expect_reference_type;
+					jm#invokevirtual method_handle_path "bindTo" (method_sig [object_sig] (Some method_handle_sig));
+				| args ->
+					let f () =
+						let tl = List.map (fun (arg,jsig) ->
+							let _,load,_ = self#get_local_by_id arg in
+							load();
+							jm#cast jsig;
+							jsig
+						) args in
+						tl
+					in
+					jm#construct ConstructInit ctx_class#get_path f;
+					jm#invokevirtual method_handle_path "bindTo" (method_sig [object_sig] (Some method_handle_sig));
+				end
+			end
+		| TArrayDecl el when ret = RVoid ->
+			List.iter (self#texpr ret) el
+		| TArrayDecl el ->
+			begin match follow e.etype with
+			| TInst({cl_path = (["haxe";"root"],"Array")},[t]) ->
+				self#new_native_array (jsignature_of_type (self#mknull t)) el;
+				jm#invokestatic (["haxe";"root"],"Array") "ofNative" (method_sig [array_sig object_sig] (Some (object_path_sig (["haxe";"root"],"Array"))));
+				self#cast e.etype
+			| _ ->
+				assert false
+			end
+		| TArray(e1,e2) when ret = RVoid ->
+			(* Array access never throws so this should be fine... *)
+			self#texpr ret e1;
+			self#texpr ret e2;
+		| TArray(e1,e2) ->
+			begin match follow e1.etype with
+			| TInst({cl_path = (["haxe";"root"],"Array")} as c,[t]) ->
+				self#texpr rvalue_any e1;
+				self#texpr (rvalue_sig TInt) e2;
+				jm#cast TInt;
+				jm#invokevirtual c.cl_path "__get" (method_sig [TInt] (Some object_sig));
+				self#cast e.etype
+			| TInst({cl_path = (["java"],"NativeArray")},[t]) ->
+				self#texpr rvalue_any e1;
+				let vt = self#vtype e1.etype in
+				let vte = self#vtype t in
+				self#texpr rvalue_any e2;
+				self#read_native_array vt vte
+			| t ->
+				self#texpr rvalue_any e1;
+				self#texpr rvalue_any e2;
+				jm#cast TInt;
+				jm#invokestatic (["haxe";"jvm"],"Jvm") "arrayRead" (method_sig [object_sig;TInt] (Some object_sig));
+				self#cast e.etype;
+			end
+		| TBlock [] ->
+			if ret = RReturn && not jm#is_terminated then code#return_void;
+		| TBlock el ->
+			let rec loop el = match el with
+				| [] -> assert false
+				| [e1] ->
+					self#texpr (if ret = RReturn then RVoid else ret) e1;
+					if ret = RReturn && not jm#is_terminated then code#return_void;
+				| e1 :: el ->
+					self#texpr RVoid e1;
+					loop el
+			in
+			let pop_scope = jm#push_scope in
+			loop el;
+			pop_scope();
+		| TCast(e1,None) ->
+			self#texpr ret e1;
+			if ret <> RVoid then self#cast e.etype
+		| TCast(e1,Some mt) ->
+			self#texpr rvalue_any e1;
+			let jsig = jsignature_of_type (type_of_module_type mt) in
+			if is_unboxed jsig || is_unboxed jm#get_code#get_stack#top then jm#cast jsig
+			else code#checkcast (t_infos mt).mt_path;
+			if ret = RVoid then code#pop;
+		| TParenthesis e1 | TMeta(_,e1) ->
+			self#texpr ret e1
+		| TFor(v,e1,e2) ->
+			self#texpr ret (Texpr.for_remap com.basic v e1 e2 e.epos)
+		| TEnumIndex e1 ->
+			self#texpr rvalue_any e1;
+			jm#invokevirtual java_enum_path "ordinal" (method_sig [] (Some TInt))
+		| TEnumParameter(e1,ef,i) ->
+			self#texpr rvalue_any e1;
+			let path,name,jsig_arg = match follow ef.ef_type with
+				| TFun(tl,TEnum(en,_)) ->
+					let n,_,t = List.nth tl i in
+					en.e_path,n,self#vtype t
+				| _ -> assert false
+			in
+			let cpath = ((fst path),Printf.sprintf "%s$%s" (snd path) ef.ef_name) in
+			let jsig = (object_path_sig cpath) in
+			jm#cast jsig;
+			jm#getfield cpath name jsig_arg;
+			self#cast e.etype;
+		| TThrow e1 ->
+			self#texpr rvalue_any e1;
+			let exc = new haxe_exception gctx e1.etype in
+			if not (List.exists (fun exc' -> exc#is_assignable_to exc') caught_exceptions) then jm#add_thrown_exception exc#get_native_exception_path;
+			if not exc#is_native_exception then begin
+				let vt = self#vtype (self#mknull e1.etype) in
+				self#throw vt
+			end else begin
+				code#athrow;
+				jm#set_terminated true
+			end
+		| TObjectDecl fl ->
+			begin match follow e.etype with
+			(* The guard is here because in the case of quoted fields like `"a-b"`, the field is not part of the
+			   type. In this case we have to do full dynamic construction. *)
+			| TAnon an when List.for_all (fun ((name,_,_),_) -> PMap.mem name an.a_fields) fl ->
+				let path,fl' = TAnonIdentifiaction.identify gctx an.a_fields in
+				jm#construct ConstructInit path (fun () ->
+					(* We have to respect declaration order, so let's temp var where necessary *)
+					let rec loop fl fl' ok acc = match fl,fl' with
+						| ((name,_,_),e) :: fl,(name',jsig) :: fl' ->
+							if ok && name = name' then begin
+								self#texpr rvalue_any e;
+								jm#cast jsig;
+								loop fl fl' ok acc
+							end else begin
+								let load = match (Texpr.skip e).eexpr with
+								| TConst _ | TTypeExpr _ | TFunction _ ->
+									(fun () -> self#texpr rvalue_any e)
+								| _ ->
+									let _,load,save = jm#add_local (Printf.sprintf "_hx_tmp_%s" name) (self#vtype e.etype) VarWillInit in
+									self#texpr rvalue_any e;
+									save();
+									load
+								in
+								loop fl fl' false ((name,load) :: acc)
+							end
+						| [],[] ->
+							acc
+						| (_,e) :: fl,[] ->
+							self#texpr RVoid e;
+							loop fl fl' ok acc
+						| [],(_,jsig) :: fl' ->
+							jm#load_default_value jsig;
+							loop [] fl' ok acc
+					in
+					let vars = loop fl fl' true [] in
+					let vars = List.sort (fun (name1,_) (name2,_) -> compare name1 name2) vars in
+					List.iter (fun (_,load) ->
+						load();
+					) vars;
+					List.map snd fl';
+				)
+			| _ ->
+				jm#construct ConstructInit haxe_dynamic_object_path (fun () -> []);
+				List.iter (fun ((name,_,_),e) ->
+					code#dup;
+					jm#string name;
+					self#texpr rvalue_any e;
+					self#expect_reference_type;
+					jm#invokevirtual haxe_dynamic_object_path "_hx_setField" (method_sig [string_sig;object_sig] None);
+				) fl;
+			end
+		| TIdent _ ->
+			Error.error (s_expr_ast false "" (s_type (print_context())) e) e.epos;
+
+	(* api *)
+
+	method object_constructor =
+		let path = jc#get_super_path in
+		let offset = pool#add_field path "<init>" (method_sig [] None) FKMethod in
+		jm#load_this;
+		code#invokespecial offset jc#get_jsig [] [];
+		jm#set_this_initialized
+end
+
+type super_ctor_mode =
+	| SCNone
+	| SCJava
+	| SCHaxe
+
+let failsafe p f =
+	try
+		f ()
+	with Failure s | HarderFailure s ->
+		Error.error s p
+
+let generate_dynamic_access gctx (jc : JvmClass.builder) fields is_anon =
+	begin match fields with
+	| [] ->
+		()
+	| _ ->
+		let jsig = method_sig [string_sig] (Some object_sig) in
+		let jm = jc#spawn_method "_hx_getField" jsig [MPublic;MSynthetic] in
+		let _,load,_ = jm#add_local "name" string_sig VarArgument in
+		jm#finalize_arguments;
+		load();
+		jm#invokevirtual string_path "hashCode" (method_sig [] (Some TInt));
+		let cases = List.map (fun (name,jsig,kind) ->
+			let hash = java_hash name in
+			[hash],(fun () ->
+				begin match kind with
+					| Method (MethNormal | MethInline) ->
+						jm#read_closure false jc#get_this_path name jsig;
+						jm#load_this;
+						jm#invokevirtual method_handle_path "bindTo" (method_sig [object_sig] (Some method_handle_sig));
+					| _ ->
+						jm#load_this;
+						jm#getfield jc#get_this_path name jsig;
+						jm#expect_reference_type;
+				end;
+				ignore(jm#get_code#get_stack#pop);
+				jm#get_code#get_stack#push object_sig;
+			)
+		) fields in
+		let def = (fun () ->
+			jm#load_this;
+			load();
+			jm#invokespecial jc#get_super_path "_hx_getField" jsig;
+		) in
+		ignore(jm#int_switch false cases (Some def));
+		jm#return
+	end;
+	let fields = List.filter (fun (_,_,kind) -> match kind with
+		| Method (MethNormal | MethInline) -> false
+		| Var {v_write = AccNever} -> false
+		| _ -> true
+	) fields in
+	begin match fields with
+	| [] ->
+		()
+	| _ ->
+		let jsig = method_sig [string_sig;object_sig] None in
+		let jm = jc#spawn_method "_hx_setField" jsig [MPublic;MSynthetic] in
+		let _,load1,_ = jm#add_local "name" string_sig VarArgument in
+		let _,load2,_ = jm#add_local "value" object_sig VarArgument in
+		jm#finalize_arguments;
+		load1();
+		jm#invokevirtual string_path "hashCode" (method_sig [] (Some TInt));
+		let def = (fun () ->
+			jm#load_this;
+			load1();
+			load2();
+			jm#invokespecial jc#get_super_path "_hx_setField" jsig;
+		) in
+		let cases = List.map (fun (name,jsig,_) ->
+			let hash = java_hash name in
+			[hash],(fun () ->
+				jm#load_this;
+				load2();
+				jm#cast jsig;
+				jm#putfield jc#get_this_path name jsig;
+				(* Have to deal with Reflect.deleteField crap here... *)
+				if is_anon then begin
+					jm#load_this;
+					jm#getfield jc#get_this_path "_hx_deletedAField" boolean_sig;
+					jm#if_then
+						(fun () -> jm#get_code#if_null_ref boolean_sig)
+						(fun () ->
+							def();
+						)
+				end;
+			)
+		) fields in
+		ignore(jm#int_switch false cases (Some def));
+		jm#return
+	end
+
+class tclass_to_jvm gctx c = object(self)
+	val is_annotation = Meta.has Meta.Annotation c.cl_meta
+	val field_inits = DynArray.create ()
+	val delayed_field_inits = DynArray.create ()
+
+	val jc = new JvmClass.builder c.cl_path (match c.cl_super with
+		| Some(c,_) -> c.cl_path
+		| None ->
+			if c.cl_interface || Meta.has Meta.NativeGen c.cl_meta then object_path else haxe_object_path
+		)
+
+	method private set_access_flags =
+		jc#add_access_flag 1; (* public *)
+		if c.cl_final then jc#add_access_flag 0x10;
+		if c.cl_interface then begin
+			jc#add_access_flag 0x200;
+			jc#add_access_flag 0x400;
+		end;
+		if is_annotation then begin
+			jc#add_access_flag 0x2000;
+			jc#add_interface (["java";"lang";"annotation"],"Annotation");
+			(* TODO: this should be done via Haxe metadata instead of hardcoding it here *)
+			jc#add_annotation retention_path ["value",(AEnum(retention_policy_sig,"RUNTIME"))];
+		end;
+		if c.cl_path = (["haxe";"jvm"],"Enum") then jc#add_access_flag 0x4000; (* enum *)
+
+	method private handle_relation_type_params =
+		let map_type_params t =
+			let has_type_param = ref false in
+			let rec loop t = match follow t with
+				| TInst({cl_kind = KTypeParameter tl},_) ->
+					has_type_param := true;
+					begin match tl with
+					| [t] -> t
+					| _ -> t_dynamic
+					end
+				| _ -> Type.map loop t
+			in
+			let t = match follow t with
+				| TFun(tl,tr) ->
+					let tl = List.map (fun (n,o,t) -> n,o,loop t) tl in
+					let tr = loop tr in
+					TFun(tl,tr)
+				| _ ->
+					assert false
+			in
+			if !has_type_param then Some t else None
+		in
+		let make_bridge cf_impl t =
+			let jsig = jsignature_of_type t in
+			if not (jc#has_method cf_impl.cf_name jsig) then begin
+				begin match follow t with
+				| TFun(tl,tr) ->
+					let jm = jc#spawn_method cf_impl.cf_name jsig [MPublic;MSynthetic;MBridge] in
+					jm#load_this;
+					let jsig_impl = jsignature_of_type cf_impl.cf_type in
+					let jsigs,_ = match jsig_impl with TMethod(jsigs,jsig) -> jsigs,jsig | _ -> assert false in
+					List.iter2 (fun (n,_,t) jsig ->
+						let _,load,_ = jm#add_local n (jsignature_of_type t) VarArgument in
+						load();
+						jm#cast jsig;
+					) tl jsigs;
+					jm#invokevirtual c.cl_path cf_impl.cf_name jsig_impl;
+					if not (ExtType.is_void (follow tr)) then jm#cast (jsignature_of_type tr);
+					jm#return;
+				| _ ->
+					()
+				end
+			end
+		in
+		let check is_interface cf cf_impl =
+			match map_type_params cf.cf_type with
+			| Some t ->
+				make_bridge cf_impl t
+			| None ->
+				(* If we implement an interface with variance, we need a bridge method too (#8528). *)
+				if is_interface && not (type_iseq cf.cf_type cf_impl.cf_type) then make_bridge cf_impl cf.cf_type
+		in
+		let check is_interface cf cf_impl =
+			check is_interface cf cf_impl;
+			(* TODO: I think this is incorrect... have to investigate though *)
+			(* List.iter (fun cf -> check is_interface cf cf_impl) cf.cf_overloads *)
+		in
+		let rec loop map_type c_int =
+			List.iter (fun (c_int,tl) ->
+				let map_type t = apply_params c_int.cl_params tl (map_type t) in
+				List.iter (fun cf ->
+					match cf.cf_kind,raw_class_field (fun cf -> map_type cf.cf_type) c (List.map snd c.cl_params) cf.cf_name with
+					| (Method (MethNormal | MethInline)),(Some(c',_),_,cf_impl) when c' == c ->
+						let tl = match follow (map_type cf.cf_type) with
+							| TFun(tl,_) -> tl
+							| _ -> assert false
+						in
+						begin match find_overload_rec' false map_type c cf.cf_name (List.map (fun (_,_,t) -> Texpr.Builder.make_null t null_pos) tl) with
+							| Some(_,cf_impl) -> check true cf cf_impl
+							| None -> ()
+						end;
+					| _ ->
+						()
+				) c_int.cl_ordered_fields;
+				loop map_type c_int
+			) c_int.cl_implements
+		in
+		loop (fun t -> t) c;
+		begin match c.cl_overrides,c.cl_super with
+		| [],_ ->
+			()
+		| fields,Some(c_sup,tl) ->
+			List.iter (fun cf_impl ->
+				match cf_impl.cf_kind,raw_class_field (fun cf -> apply_params c_sup.cl_params tl cf.cf_type) c_sup tl cf_impl.cf_name with
+				| (Method (MethNormal | MethInline)),(Some(c,tl),_,cf) -> check false cf cf_impl
+				| _ -> ()
+			) fields
+		| _ ->
+			assert false
+		end
+
+	method private set_interfaces =
+		List.iter (fun (c_int,tl) ->
+			if is_annotation && c_int.cl_path = (["java";"lang";"annotation"],"Annotation") then
+				()
+			else begin
+				jc#add_interface c_int.cl_path
+			end
+		) c.cl_implements
+
+	method private generate_empty_ctor =
+		let jsig_empty = method_sig [haxe_empty_constructor_sig] None in
+		let jm_empty_ctor = jc#spawn_method "<init>" jsig_empty [MPublic] in
+		let _,load,_ = jm_empty_ctor#add_local "_" haxe_empty_constructor_sig VarArgument in
+		jm_empty_ctor#load_this;
+		if c.cl_constructor = None then begin
+			let handler = new texpr_to_jvm gctx jc jm_empty_ctor gctx.com.basic.tvoid in
+			DynArray.iter (fun e ->
+				handler#texpr RVoid e;
+			) field_inits;
+		end;
+		begin match c.cl_super with
+		| None ->
+			(* Haxe type with no parent class, call Object.<init>() *)
+			jm_empty_ctor#call_super_ctor ConstructInit (method_sig [] None)
+		| _ ->
+			(* Parent class exists, call SuperClass.<init>(EmptyConstructor) *)
+			load();
+			jm_empty_ctor#call_super_ctor ConstructInit jsig_empty
+		end;
+		if c.cl_constructor = None then begin
+			let handler = new texpr_to_jvm gctx jc jm_empty_ctor gctx.com.basic.tvoid in
+			DynArray.iter (fun e ->
+				handler#texpr RVoid e;
+			) delayed_field_inits;
+		end;
+		jm_empty_ctor#get_code#return_void;
+
+	method private generate_implicit_ctors =
+		try
+			let sm = Hashtbl.find gctx.implicit_ctors c.cl_path in
+			PMap.iter (fun _ (c,cf) ->
+				let cmode = get_construction_mode c cf in
+				let jm = jc#spawn_method (if cmode = ConstructInit then "<init>" else "new") (jsignature_of_type cf.cf_type) [MPublic] in
+				let handler = new texpr_to_jvm gctx jc jm gctx.com.basic.tvoid in
+				jm#load_this;
+				DynArray.iter (fun e ->
+					handler#texpr RVoid e;
+				) field_inits;
+				let tl = match follow cf.cf_type with TFun(tl,_) -> tl | _ -> assert false in
+				List.iter (fun (n,_,t) ->
+					let _,load,_ = jm#add_local n (jsignature_of_type t) VarArgument in
+					load();
+				) tl;
+				jm#call_super_ctor cmode jm#get_jsig;
+				DynArray.iter (fun e ->
+					handler#texpr RVoid e;
+				) delayed_field_inits;
+				jm#return
+			) sm
+		with Not_found ->
+			()
+
+	method generate_expr gctx jc jm e is_method scmode mtype =
+		let e,args,tr = match e.eexpr with
+			| TFunction tf when is_method ->
+				tf.tf_expr,tf.tf_args,tf.tf_type
+			| _ ->
+				e,[],t_dynamic
+		in
+		let handler = new texpr_to_jvm gctx jc jm tr in
+		List.iter (fun (v,_) ->
+			ignore(handler#add_local v VarArgument);
+		) args;
+		jm#finalize_arguments;
+		begin match mtype with
+		| MConstructor ->
+			DynArray.iter (fun e ->
+				handler#texpr RVoid e;
+			) field_inits;
+			begin match scmode with
+			| SCJava ->
+				handler#object_constructor
+			| SCHaxe ->
+				jm#load_this;
+				jm#get_code#aconst_null jc#get_jsig;
+				jm#call_super_ctor ConstructInit (method_sig [haxe_empty_constructor_sig] None);
+			| SCNone ->
+				()
+			end;
+			DynArray.iter (fun e ->
+				handler#texpr RVoid e;
+			) delayed_field_inits;
+		| _ ->
+			()
+		end;
+			handler#texpr RReturn e
+
+	method generate_method gctx jc c mtype cf =
+		gctx.current_field_info <- get_field_info gctx cf.cf_meta;
+		let jsig = jsignature_of_type cf.cf_type in
+		let flags = [MPublic] in
+		let flags = if c.cl_interface then MAbstract :: flags else flags in
+		let flags = if mtype = MStatic then MethodAccessFlags.MStatic :: flags else flags in
+		let flags = if has_class_field_flag cf CfFinal then MFinal :: flags else flags in
+		let name,scmode,flags = match mtype with
+			| MConstructor ->
+				let rec has_super_ctor c = match c.cl_super with
+					| None -> false
+					| Some(c,_) -> c.cl_constructor <> None || has_super_ctor c
+				in
+				let get_scmode () = if c.cl_super = None then SCJava else if not (has_super_ctor c) then SCHaxe else SCNone in
+				if get_construction_mode c cf = ConstructInit then "<init>",get_scmode(),flags
+				else cf.cf_name,SCNone,flags
+			| _ -> cf.cf_name,SCNone,flags
+		in
+		let jm = jc#spawn_method name jsig flags in
+		begin match cf.cf_expr with
+		| None -> ()
+		| Some e ->
+			self#generate_expr gctx jc jm e true scmode mtype;
+		end;
+		begin match cf.cf_params with
+			| [] when c.cl_params = [] ->
+				()
+			| _ ->
+				let stl = String.concat "" (List.map (fun (n,_) ->
+					Printf.sprintf "%s:Ljava/lang/Object;" n
+				) cf.cf_params) in
+				let ssig = generate_method_signature true (jsignature_of_type cf.cf_type) in
+				let s = if cf.cf_params = [] then ssig else Printf.sprintf "<%s>%s" stl ssig in
+				let offset = jc#get_pool#add_string s in
+				jm#add_attribute (AttributeSignature offset);
+		end;
+		AnnotationHandler.generate_annotations (jm :> JvmBuilder.base_builder) cf.cf_meta;
+
+	method generate_field gctx (jc : JvmClass.builder) c mtype cf =
+		let jsig = jsignature_of_type cf.cf_type in
+		let flags = [FdPublic] in
+		let flags = if mtype = MStatic then FdStatic :: flags else flags in
+		let jm = jc#spawn_field cf.cf_name jsig flags in
+		let default e =
+			let p = null_pos in
+			let efield = Texpr.Builder.make_static_field c cf p in
+			let eop = mk (TBinop(OpAssign,efield,e)) cf.cf_type p in
+			begin match c.cl_init with
+			| None -> c.cl_init <- Some eop
+			| Some e -> c.cl_init <- Some (concat e eop)
+			end
+		in
+		begin match cf.cf_expr with
+			| None ->
+				if c.cl_path = (["haxe"],"Resource") && cf.cf_name = "content" then begin
+					let el = Hashtbl.fold (fun name _ acc ->
+						Texpr.Builder.make_string gctx.com.basic name null_pos :: acc
+					) gctx.com.resources [] in
+					let e = mk (TArrayDecl el) (gctx.com.basic.tarray gctx.com.basic.tstring) null_pos in
+					default e;
+				end;
+			| Some e when mtype <> MStatic ->
+				let tl = List.map snd c.cl_params in
+				let ethis = mk (TConst TThis) (TInst(c,tl)) null_pos in
+				let efield = mk (TField(ethis,FInstance(c,tl,cf))) cf.cf_type null_pos in
+				let eop = mk (TBinop(OpAssign,efield,e)) cf.cf_type null_pos in
+				DynArray.add (match cf.cf_kind with Method MethDynamic -> delayed_field_inits | _ -> field_inits) eop;
+			| Some e ->
+				match e.eexpr with
+				| TConst ct ->
+					begin match ct with
+					| TInt i32 when not (is_nullable cf.cf_type) ->
+						let offset = jc#get_pool#add (ConstInt i32) in
+						jm#add_attribute (AttributeConstantValue offset);
+					| TString s ->
+						let offset = jc#get_pool#add_const_string s in
+						jm#add_attribute (AttributeConstantValue offset);
+					| _ ->
+						default e;
+					end
+				| _ ->
+					default e;
+		end;
+		let ssig = generate_signature true (jsignature_of_type cf.cf_type) in
+		let offset = jc#get_pool#add_string ssig in
+		jm#add_attribute (AttributeSignature offset)
+
+		method generate_main =
+			let jsig = method_sig [array_sig string_sig] None in
+			let jm = jc#spawn_method "main" jsig [MPublic;MStatic] in
+			let _,load,_ = jm#add_local "args" (TArray(string_sig,None)) VarArgument in
+			if has_feature gctx.com "haxe.root.Sys.args" then begin
+				load();
+				jm#putstatic (["haxe";"root"],"Sys") "_args" (TArray(string_sig,None))
+			end;
+			jm#invokestatic (["haxe"; "java"], "Init") "init" (method_sig [] None);
+			jm#invokestatic jc#get_this_path "main" (method_sig [] None);
+			jm#return
+
+		method private generate_fields =
+			let field mtype cf = match cf.cf_kind with
+				| Method (MethNormal | MethInline) ->
+					List.iter (fun cf ->
+						failsafe cf.cf_pos (fun () -> self#generate_method gctx jc c mtype cf);
+						if cf.cf_name = "main" then self#generate_main;
+					) (cf :: List.filter (fun cf -> Meta.has Meta.Overload cf.cf_meta) cf.cf_overloads)
+				| _ ->
+					if not c.cl_interface && is_physical_field cf then failsafe cf.cf_pos (fun () -> self#generate_field gctx jc c mtype cf)
+			in
+			List.iter (field MStatic) c.cl_ordered_statics;
+			List.iter (field MInstance) c.cl_ordered_fields;
+			begin match c.cl_constructor,c.cl_super with
+				| Some cf,Some _ -> field MConstructor cf
+				| Some cf,None -> field MConstructor cf
+				| None,_ -> ()
+			end;
+			begin match c.cl_init with
+				| None ->
+					()
+				| Some e ->
+					let cf = mk_field "<clinit>" (tfun [] gctx.com.basic.tvoid) null_pos null_pos in
+					cf.cf_kind <- Method MethNormal;
+					let tf = {
+						tf_args = [];
+						tf_type = gctx.com.basic.tvoid;
+						tf_expr = mk_block e;
+					} in
+					let e = mk (TFunction tf) cf.cf_type null_pos in
+					cf.cf_expr <- Some e;
+					field MStatic cf
+			end
+
+	method private generate_signature =
+			let stl = match c.cl_params with
+				| [] -> ""
+				| params ->
+					let stl = String.concat "" (List.map (fun (n,_) ->
+						Printf.sprintf "%s:Ljava/lang/Object;" n
+					) c.cl_params) in
+					Printf.sprintf "<%s>" stl
+			in
+			let ssuper = match c.cl_super with
+				| Some(c,tl) -> generate_method_signature true (jsignature_of_type (TInst(c,tl)))
+				| None -> generate_method_signature true object_sig
+			in
+			let sinterfaces = String.concat "" (List.map (fun(c,tl) ->
+				generate_method_signature true (jsignature_of_type (TInst(c,tl)))
+			) c.cl_implements) in
+			let s = Printf.sprintf "%s%s%s" stl ssuper sinterfaces in
+			let offset = jc#get_pool#add_string s in
+			jc#add_attribute (AttributeSignature offset)
+
+	method generate_annotations =
+		AnnotationHandler.generate_annotations (jc :> JvmBuilder.base_builder) c.cl_meta;
+		jc#add_annotation (["haxe";"jvm";"annotation"],"ClassReflectionInformation") (["hasSuperClass",(ABool (c.cl_super <> None))])
+
+	method generate =
+		self#set_access_flags;
+		self#generate_fields;
+		self#set_interfaces;
+		if not c.cl_interface then begin
+			self#generate_empty_ctor;
+			self#generate_implicit_ctors;
+			self#handle_relation_type_params;
+		end;
+		self#generate_signature;
+		if not (Meta.has Meta.NativeGen c.cl_meta) then
+			generate_dynamic_access gctx jc (List.map (fun cf -> cf.cf_name,jsignature_of_type cf.cf_type,cf.cf_kind) c.cl_ordered_fields) false;
+		self#generate_annotations;
+		jc#add_attribute (AttributeSourceFile (jc#get_pool#add_string c.cl_pos.pfile));
+		let jc = jc#export_class gctx.default_export_config in
+		write_class gctx.jar c.cl_path jc
+end
+
+let generate_class gctx c =
+	let conv = new tclass_to_jvm gctx c in
+	conv#generate
+
+let generate_enum gctx en =
+	let jc_enum = new JvmClass.builder en.e_path haxe_enum_path in
+	jc_enum#add_access_flag 0x1; (* public *)
+	jc_enum#add_access_flag 0x400; (* abstract *)
+	jc_enum#add_access_flag 0x4000; (* enum *)
+	begin
+		let jsig = haxe_enum_sig (object_path_sig en.e_path) in
+		let s = generate_signature true jsig in
+		let offset = jc_enum#get_pool#add_string s in
+		jc_enum#add_attribute (AttributeSignature offset)
+	end;
+	let jsig_enum_ctor = method_sig [TInt;string_sig] None in
+	(* Create base constructor *)
+	 begin
+		let jm_ctor = jc_enum#spawn_method "<init>" jsig_enum_ctor [MProtected] in
+		jm_ctor#load_this;
+		let _,load1,_ = jm_ctor#add_local "index" TInt VarArgument in
+		let _,load2,_ = jm_ctor#add_local "name" string_sig VarArgument in
+		load1();
+		load2();
+		jm_ctor#call_super_ctor ConstructInit jsig_enum_ctor;
+		jm_ctor#get_code#return_void;
+	end;
+	let inits = DynArray.create () in
+	let names = List.map (fun name ->
+		let ef = PMap.find name en.e_constrs in
+		let args = match follow ef.ef_type with
+			| TFun(tl,_) -> List.map (fun (n,_,t) -> n,jsignature_of_type t) tl
+			| _ -> []
+		in
+		let jsigs = List.map snd args in
+		(* Create class for constructor *)
+		let jc_ctor = begin
+			let jc_ctor = jc_enum#spawn_inner_class None jc_enum#get_this_path (Some ef.ef_name) in
+			jc_ctor#add_access_flag 0x10; (* final *)
+			jc_ctor#add_access_flag 0x4000; (* enum *)
+			let jsig_method = method_sig jsigs None in
+			let jm_ctor = jc_ctor#spawn_method "<init>" jsig_method [MPublic] in
+			jm_ctor#load_this;
+			jm_ctor#get_code#iconst (Int32.of_int ef.ef_index);
+			jm_ctor#string ef.ef_name;
+			jm_ctor#call_super_ctor ConstructInit jsig_enum_ctor;
+			List.iter (fun (n,jsig) ->
+				jm_ctor#add_argument_and_field n jsig
+			) args;
+			jm_ctor#get_code#return_void;
+			jc_ctor#add_annotation (["haxe";"jvm";"annotation"],"EnumValueReflectionInformation") (["argumentNames",AArray (List.map (fun (name,_) -> AString name) args)]);
+			if args <> [] then begin
+				let jm_params = jc_ctor#spawn_method "_hx_getParameters" (method_sig [] (Some (array_sig object_sig))) [MPublic] in
+				let fl = List.map (fun (n,jsig) ->
+					(fun () ->
+						jm_params#load_this;
+						jm_params#getfield jc_ctor#get_this_path n jsig;
+						jm_params#cast object_sig;
+					)
+				) args in
+				jm_params#new_native_array object_sig fl;
+				jm_params#return
+			end;
+			jc_ctor
+		end in
+		write_class gctx.jar jc_ctor#get_this_path (jc_ctor#export_class gctx.default_export_config);
+		begin match args with
+			| [] ->
+				(* Create static field for ctor without args *)
+				let jm_static = jc_enum#spawn_field ef.ef_name jc_enum#get_jsig [FdPublic;FdStatic;FdFinal;FdEnum] in
+				DynArray.add inits (jm_static,jc_ctor);
+			| _ ->
+				(* Create static function for ctor with args *)
+				let jsig_static = method_sig jsigs (Some jc_enum#get_jsig) in
+				let jm_static = jc_enum#spawn_method ef.ef_name jsig_static [MPublic;MStatic] in
+				jm_static#construct ConstructInit jc_ctor#get_this_path (fun () ->
+					List.iter (fun (n,jsig) ->
+						let _,load,_ = jm_static#add_local n jsig VarArgument in
+						load();
+					) args;
+					jsigs;
+				);
+				jm_static#get_code#return_value jc_enum#get_jsig;
+		end;
+		AString name
+	) en.e_names in
+	if DynArray.length inits > 0 then begin
+		(* Assign static fields for ctors without args *)
+		let jm_clinit = jc_enum#spawn_method "<clinit>" (method_sig [] None) [MStatic] in
+		let jm_values = jc_enum#spawn_method "values" (method_sig [] (Some (array_sig (object_path_sig jc_enum#get_this_path)))) [MPublic;MStatic] in
+		let inits = DynArray.to_list inits in
+		let fl = List.map (fun (jm_static,jc_ctor) ->
+			jm_clinit#construct ConstructInit jc_ctor#get_this_path (fun () -> []);
+			jm_clinit#putstatic jc_enum#get_this_path jm_static#get_name jm_static#get_jsig;
+			(fun () ->
+				jm_values#getstatic jc_enum#get_this_path jm_static#get_name jm_static#get_jsig;
+			)
+		) inits in
+		jm_values#new_native_array (object_path_sig jc_enum#get_this_path) fl;
+		jm_values#return;
+		(* Add __meta__ TODO: do this via annotations instead? *)
+		begin match Texpr.build_metadata gctx.com.basic (TEnumDecl en) with
+		| None ->
+			()
+		| Some e ->
+			ignore(jc_enum#spawn_field "__meta__" object_sig [FdStatic;FdPublic]);
+			let handler = new texpr_to_jvm gctx jc_enum jm_clinit (gctx.com.basic.tvoid) in
+			handler#texpr rvalue_any e;
+			jm_clinit#putstatic jc_enum#get_this_path "__meta__" object_sig
+		end;
+		jm_clinit#get_code#return_void;
+	end;
+	AnnotationHandler.generate_annotations (jc_enum :> JvmBuilder.base_builder) en.e_meta;
+	jc_enum#add_annotation (["haxe";"jvm";"annotation"],"EnumReflectionInformation") (["constructorNames",AArray names]);
+	write_class gctx.jar en.e_path (jc_enum#export_class gctx.default_export_config)
+
+let generate_abstract gctx a =
+	let super_path = object_path in
+	let jc = new JvmClass.builder a.a_path super_path in
+	jc#add_access_flag 1; (* public *)
+	let jc = jc#export_class gctx.default_export_config in
+	write_class gctx.jar a.a_path jc
+
+let debug_path path = match path with
+	(* | ([],"Main") | (["haxe";"jvm"],_) -> true *)
+	| (["haxe";"lang"],_) -> false (* Old Haxe/Java stuff that's weird *)
+	| _ -> true
+
+let is_extern_abstract a = match a.a_impl with
+	| Some {cl_extern = true} -> true
+	| _ -> false
+
+let generate_module_type ctx mt =
+	failsafe (t_infos mt).mt_pos (fun () ->
+		match mt with
+		| TClassDecl c when not c.cl_extern && debug_path c.cl_path -> generate_class ctx c
+		| TEnumDecl en when not en.e_extern -> generate_enum ctx en
+		| TAbstractDecl a when not (is_extern_abstract a) && Meta.has Meta.CoreType a.a_meta -> generate_abstract ctx a
+		| _ -> ()
+	)
+
+module Preprocessor = struct
+
+	let is_normal_anon an = match !(an.a_status) with
+		| Closed | Const | Opened -> true
+		| _ -> false
+
+	let check_anon gctx e = match e.etype,follow e.etype with
+		| TType(td,_),TAnon an when is_normal_anon an ->
+			ignore(TAnonIdentifiaction.identify_as gctx td.t_path an.a_fields)
+		| _ ->
+			()
+
+	let add_implicit_ctor gctx c c' cf =
+		let jsig = jsignature_of_type cf.cf_type in
+		try
+			let sm = Hashtbl.find gctx.implicit_ctors c.cl_path in
+			Hashtbl.replace gctx.implicit_ctors c.cl_path (PMap.add (c'.cl_path,jsig) (c',cf) sm);
+		with Not_found ->
+			Hashtbl.add gctx.implicit_ctors c.cl_path (PMap.add (c'.cl_path,jsig) (c',cf) PMap.empty)
+
+	let make_native cf =
+		cf.cf_meta <- (Meta.NativeGen,[],null_pos) :: cf.cf_meta
+
+	let make_haxe cf =
+		cf.cf_meta <- (Meta.HxGen,[],null_pos) :: cf.cf_meta
+
+	let preprocess_constructor_expr gctx c cf e =
+		let used_this = ref false in
+		let this_before_super = ref false in
+		let super_call_fields = DynArray.create () in
+		let is_on_current_class cf = PMap.mem cf.cf_name c.cl_fields in
+		let find_super_ctor el =
+			let csup,map_type = match c.cl_super with
+				| Some(c,tl) -> c,apply_params c.cl_params tl
+				| _ -> assert false
+			in
+			match find_overload_rec' true map_type csup "new" el with
+			| Some(c,cf) ->
+				let rec loop csup =
+					if c != csup then begin
+						match csup.cl_super with
+						| Some(c',_) ->
+							add_implicit_ctor gctx csup c' cf;
+							loop c'
+						| None -> assert false
+					end
+				in
+				loop csup;
+				(c,cf)
+			| None -> Error.error "Could not find overload constructor" e.epos
+		in
+		let rec promote_this_before_super c cf = match get_field_info gctx cf.cf_meta with
+			| None -> jerror "Something went wrong"
+			| Some info ->
+				if not info.has_this_before_super then begin
+					make_haxe cf;
+					(* print_endline (Printf.sprintf "promoted this_before_super to %s.new : %s" (s_type_path c.cl_path) (s_type (print_context()) cf.cf_type)); *)
+					info.has_this_before_super <- true;
+					List.iter (fun (c,cf) -> promote_this_before_super c cf) info.super_call_fields
+				end
+		in
+		let rec loop e =
+			check_anon gctx e;
+			begin match e.eexpr with
+			| TBinop(OpAssign,{eexpr = TField({eexpr = TConst TThis},FInstance(_,_,cf))},e2) when is_on_current_class cf->
+				(* Assigning this.field = value is fine if field is declared on our current class *)
+				loop e2;
+			| TConst TThis ->
+				used_this := true
+			| TCall({eexpr = TConst TSuper},el) ->
+				List.iter loop el;
+				if !used_this then begin
+					this_before_super := true;
+					make_haxe cf;
+					(* print_endline (Printf.sprintf "inferred this_before_super on %s.new : %s" (s_type_path c.cl_path) (s_type (print_context()) cf.cf_type)); *)
+				end;
+				let c,cf = find_super_ctor el in
+				if !this_before_super then promote_this_before_super c cf;
+				DynArray.add super_call_fields (c,cf);
+			| _ ->
+				Type.iter loop e
+			end;
+		in
+		loop e;
+		{
+			has_this_before_super = !this_before_super;
+			super_call_fields = DynArray.to_list super_call_fields;
+		}
+
+	let preprocess_expr gctx e =
+		let rec loop e =
+			check_anon gctx e;
+			Type.iter loop e
+		in
+		loop e
+
+	let check_overrides c = match c.cl_overrides with
+		| []->
+			()
+		| fields ->
+			let csup,map_type = match c.cl_super with
+				| Some(c,tl) -> c,apply_params c.cl_params tl
+				| None -> assert false
+			in
+			let fix_covariant_return cf =
+				let tl = match follow cf.cf_type with
+					| TFun(tl,_) -> tl
+					| _ -> assert false
+				in
+				match find_overload_rec' false map_type csup cf.cf_name (List.map (fun (_,_,t) -> Texpr.Builder.make_null t null_pos) tl) with
+				| Some(_,cf') ->
+					let tr = match follow cf'.cf_type with
+						| TFun(_,tr) -> tr
+						| _ -> assert false
+					in
+					cf.cf_type <- TFun(tl,tr);
+					cf.cf_expr <- begin match cf.cf_expr with
+						| Some ({eexpr = TFunction tf} as e) ->
+							Some {e with eexpr = TFunction {tf with tf_type = tr}}
+						| e ->
+							e
+					end;
+				| None ->
+					()
+					(* TODO: this should never happen if we get the unification right *)
+					(* Error.error "Could not find overload" cf.cf_pos *)
+			in
+			List.iter (fun cf ->
+				fix_covariant_return cf;
+				List.iter fix_covariant_return cf.cf_overloads
+			) fields
+
+	let rec get_constructor c =
+		match c.cl_constructor, c.cl_super with
+		| Some cf, _ -> c,cf
+		| None, None -> raise Not_found
+		| None, Some (csup,cparams) -> get_constructor csup
+
+	let preprocess_class gctx c =
+		let field cf = match cf.cf_expr with
+			| None ->
+				()
+			| Some e ->
+				preprocess_expr gctx e
+		in
+		let has_dynamic_instance_method = ref false in
+		let has_field_init = ref false in
+		let field mtype cf =
+			List.iter field (cf :: cf.cf_overloads);
+			match mtype with
+			| MConstructor ->
+				()
+			| MInstance ->
+				begin match cf.cf_kind with
+					| Method MethDynamic -> has_dynamic_instance_method := true
+					| Var _ when cf.cf_expr <> None && not !has_field_init && c.cl_constructor = None && c.cl_super = None ->
+						has_field_init := true;
+						add_implicit_ctor gctx c c (mk_field "new" (tfun [] gctx.com.basic.tvoid) null_pos null_pos)
+					| _ -> ()
+				end;
+			| MStatic ->
+				()
+		in
+		check_overrides c;
+		List.iter (field MStatic) c.cl_ordered_statics;
+		List.iter (field MInstance) c.cl_ordered_fields;
+		match c.cl_constructor with
+		| None ->
+			begin try
+				let csup,cf = get_constructor c in
+				List.iter (fun cf -> add_implicit_ctor gctx c csup cf) (cf :: cf.cf_overloads)
+			with Not_found ->
+				()
+			end;
+		| Some cf ->
+			let field cf =
+				if !has_dynamic_instance_method then make_haxe cf;
+				begin match cf.cf_expr with
+				| None ->
+					()
+				| Some e ->
+					let info = preprocess_constructor_expr gctx c cf e in
+					let index = DynArray.length gctx.field_infos in
+					DynArray.add gctx.field_infos info;
+					cf.cf_meta <- (Meta.Custom ":jvm.fieldInfo",[(EConst (Int (string_of_int index)),null_pos)],null_pos) :: cf.cf_meta;
+					if not (Meta.has Meta.HxGen cf.cf_meta) then begin
+						let rec loop next c =
+							if c.cl_extern then make_native cf
+							else match c.cl_constructor with
+								| Some cf' when Meta.has Meta.HxGen cf'.cf_meta -> make_haxe cf
+								| Some cf' when Meta.has Meta.NativeGen cf'.cf_meta -> make_native cf
+								| _ -> next c
+						in
+						let rec up c = match c.cl_super with
+							| None -> ()
+							| Some(c,_) -> loop up c
+						in
+						let rec down c = List.iter (fun c -> loop down c) c.cl_descendants in
+						loop up c;
+						loop down c
+					end;
+				end
+			in
+			List.iter field (cf :: cf.cf_overloads)
+
+	let make_root path =
+		["haxe";"root"],snd path
+
+	let preprocess gctx =
+		List.iter (fun mt ->
+			match mt with
+			| TClassDecl c ->
+				if fst c.cl_path = [] then c.cl_path <- make_root c.cl_path;
+				if debug_path c.cl_path && not c.cl_interface then preprocess_class gctx c
+			| TEnumDecl en ->
+				if fst en.e_path = [] then en.e_path <- make_root en.e_path;
+			| _ -> ()
+		) gctx.com.types
+end
+
+let file_name_and_extension file =
+	match List.rev (ExtString.String.nsplit file "/") with
+	| e1 :: _ -> e1
+	| _ -> assert false
+
+let generate com =
+	mkdir_from_path com.file;
+	let jar_name,manifest_suffix = match com.main_class with
+		| Some path ->
+			let pack = match fst path with
+				| [] -> ["haxe";"root"]
+				| pack -> pack
+			in
+			let name = snd path in
+			name,"\nMain-Class: " ^ (s_type_path (pack,name))
+		| None -> "jar",""
+	in
+	let jar_name = if com.debug then jar_name ^ "-Debug" else jar_name in
+	let jar_dir = add_trailing_slash com.file in
+	let jar_path = Printf.sprintf "%s%s.jar" jar_dir jar_name in
+	let gctx = {
+		com = com;
+		jar = Zip.open_out jar_path;
+		t_exception = TInst(resolve_class com (["java";"lang"],"Exception"),[]);
+		t_throwable = TInst(resolve_class com (["java";"lang"],"Throwable"),[]);
+		anon_lut = Hashtbl.create 0;
+		anon_path_lut = Hashtbl.create 0;
+		anon_num = 0;
+		implicit_ctors = Hashtbl.create 0;
+		field_infos = DynArray.create();
+		current_field_info = None;
+		default_export_config = {
+			export_debug = com.debug;
+		}
+	} in
+	Std.finally (Timer.timer ["generate";"java";"preprocess"]) Preprocessor.preprocess gctx;
+	let class_paths = ExtList.List.filter_map (fun java_lib ->
+		if java_lib#has_flag NativeLibraries.FlagIsStd then None
+		else begin
+			let dir = Printf.sprintf "%slib/" jar_dir in
+			Path.mkdir_from_path dir;
+			let name = file_name_and_extension java_lib#get_file_path in
+			let ch_in = open_in_bin java_lib#get_file_path in
+			let ch_out = open_out_bin (Printf.sprintf "%s%s" dir name) in
+			let b = IO.read_all (IO.input_channel ch_in) in
+			output_string ch_out b;
+			close_in ch_in;
+			close_out ch_out;
+			Some (Printf.sprintf "lib/%s" name)
+		end
+	) com.native_libs.java_libs in
+	let manifest_content =
+		"Manifest-Version: 1.0\n" ^
+		(match class_paths with [] -> "" | _ -> "Class-Path: " ^ (String.concat " " class_paths ^ "\n")) ^
+		"Created-By: Haxe (Haxe Foundation)" ^
+		manifest_suffix ^
+		"\n\n"
+	in
+	Zip.add_entry manifest_content gctx.jar "META-INF/MANIFEST.MF";
+	Hashtbl.iter (fun name v ->
+		let filename = Codegen.escape_res_name name true in
+		Zip.add_entry v gctx.jar filename;
+	) com.resources;
+	List.iter (generate_module_type gctx) com.types;
+	Hashtbl.iter (fun fields path ->
+		let jc = new JvmClass.builder path haxe_dynamic_object_path in
+		jc#add_access_flag 0x1;
+		begin
+			let jm_ctor = jc#spawn_method "<init>" (method_sig (List.map snd fields) None) [MPublic] in
+			jm_ctor#load_this;
+			jm_ctor#get_code#aconst_null haxe_empty_constructor_sig;
+			jm_ctor#call_super_ctor ConstructInit (method_sig [haxe_empty_constructor_sig] None);
+			List.iter (fun (name,jsig) ->
+				jm_ctor#add_argument_and_field name jsig;
+			) fields;
+			jm_ctor#get_code#return_void;
+		end;
+		begin
+			let string_map_path = (["haxe";"ds"],"StringMap") in
+			let string_map_sig = object_path_sig string_map_path in
+			let jm_fields = jc#spawn_method "_hx_getKnownFields" (method_sig [] (Some string_map_sig)) [MProtected] in
+			let _,load,save = jm_fields#add_local "tmp" string_map_sig VarWillInit in
+			jm_fields#construct ConstructInit string_map_path (fun () -> []);
+			save();
+			List.iter (fun (name,jsig) ->
+				load();
+				let offset = jc#get_pool#add_const_string name in
+				jm_fields#get_code#sconst (string_sig) offset;
+				jm_fields#load_this;
+				jm_fields#getfield jc#get_this_path name jsig;
+				jm_fields#expect_reference_type;
+				jm_fields#invokevirtual string_map_path "set" (method_sig [string_sig;object_sig] None);
+			) fields;
+			load();
+			jm_fields#get_code#return_value string_map_sig
+		end;
+		generate_dynamic_access gctx jc (List.map (fun (name,jsig) -> name,jsig,Var {v_write = AccNormal;v_read = AccNormal}) fields) true;
+		write_class gctx.jar path (jc#export_class gctx.default_export_config)
+	) gctx.anon_lut;
+	Zip.close_out gctx.jar
\ No newline at end of file
diff --git a/src/generators/genlua.ml b/src/generators/genlua.ml
index 1b6f1b6da23b97ddd07a099490a4b2104d92e2dc..e15bddd7edad421e17f377b446fb1329325932ad 100644
--- a/src/generators/genlua.ml
+++ b/src/generators/genlua.ml
@@ -24,34 +24,36 @@ open Ast
 open Type
 open Common
 open ExtList
+open Error
 
 type pos = Globals.pos
 
 type ctx = {
-	com : Common.context;
-	buf : Buffer.t;
-	packages : (string list,unit) Hashtbl.t;
-	mutable current : tclass;
-	mutable statics : (tclass * string * texpr) list;
-	mutable inits : texpr list;
-	mutable tabs : string;
-	mutable in_value : tvar option;
-	mutable in_loop : bool;
-	mutable iife_assign : bool;
-	mutable handle_break : bool;
-	mutable break_depth : int;
-	mutable handle_continue : bool;
-	mutable id_counter : int;
-	mutable type_accessor : module_type -> string;
-	mutable separator : bool;
-	mutable found_expose : bool;
-	mutable lua_jit : bool;
-	mutable lua_ver : float;
+    com : Common.context;
+    buf : Buffer.t;
+    packages : (string list,unit) Hashtbl.t;
+    mutable current : tclass;
+    mutable statics : (tclass * tclass_field * texpr) list;
+    mutable inits : texpr list;
+    mutable tabs : string;
+    mutable in_value : tvar option;
+    mutable in_loop : bool;
+    mutable in_loop_try : bool;
+    mutable iife_assign : bool;
+    mutable break_depth : int;
+    mutable handle_continue : bool;
+    mutable id_counter : int;
+    mutable type_accessor : module_type -> string;
+    mutable separator : bool;
+    mutable found_expose : bool;
+    mutable lua_jit : bool;
+    mutable lua_vanilla : bool;
+    mutable lua_ver : float;
 }
 
 type object_store = {
-	os_name : string;
-	mutable os_fields : object_store list;
+    os_name : string;
+    mutable os_fields : object_store list;
 }
 
 
@@ -61,266 +63,246 @@ let debug_expression expression  =
 let debug_type t  =
     " --[[ " ^ Type.s_type_kind t  ^ " --]] ";;
 
+let flat_path (p,s) =
+    (* Replace _ with __ in paths to prevent name collisions. *)
+    let escape str = String.concat "_" (ExtString.String.nsplit str "_") in
+
+    match p with
+    | [] -> escape s
+    | _ -> "__" ^ String.concat "_" (List.map escape p) ^ "_" ^ (escape s)
+
 let get_exposed ctx path meta = try
-		let (_, args, pos) = Meta.get Meta.Expose meta in
-		(match args with
-			| [ EConst (String s), _ ] -> [s]
-			| [] -> [path]
-			| _ -> abort "Invalid @:expose parameters" pos)
-	with Not_found -> []
+        let (_, args, pos) = Meta.get Meta.Expose meta in
+        (match args with
+         | [ EConst (String(s,_)), _ ] -> [s]
+         | [] -> [path]
+         | _ -> error "Invalid @:expose parameters" pos)
+    with Not_found -> []
 
 let dot_path = Globals.s_type_path
 
-let s_path ctx = dot_path
+let s_path ctx = flat_path
 
 (* Lua requires decimal encoding for characters, rather than the hex *)
-(* provided by Ast.s_escape *)
+(* provided by StringHelper.s_escape *)
 let s_escape_lua ?(dec=true) s =
-	let b = Buffer.create (String.length s) in
-	for i = 0 to (String.length s) - 1 do
-		match s.[i] with
-		| '\n' -> Buffer.add_string b "\\n"
-		| '\t' -> Buffer.add_string b "\\t"
-		| '\r' -> Buffer.add_string b "\\r"
-		| '"' -> Buffer.add_string b "\\\""
-		| '\\' -> Buffer.add_string b "\\\\"
-		| c when int_of_char c < 32 && dec ->
-			Buffer.add_string b (Printf.sprintf "\\%.3d" (int_of_char c))
-		| c -> Buffer.add_char b c
-	done;
-	Buffer.contents b
+    let b = Buffer.create (String.length s) in
+    for i = 0 to (String.length s) - 1 do
+        match s.[i] with
+        | '\n' -> Buffer.add_string b "\\n"
+        | '\t' -> Buffer.add_string b "\\t"
+        | '\r' -> Buffer.add_string b "\\r"
+        | '"' -> Buffer.add_string b "\\\""
+        | '\\' -> Buffer.add_string b "\\\\"
+        | c when int_of_char c < 32 && dec ->
+            Buffer.add_string b (Printf.sprintf "\\%.3d" (int_of_char c))
+        | c -> Buffer.add_char b c
+    done;
+    Buffer.contents b
 
 (* TODO: are all these kwds necessary for field quotes *and* id escapes? *)
 let kwds =
-	let h = Hashtbl.create 0 in
-	List.iter (fun s -> Hashtbl.add h s ()) [
-	    "_G"; ""; "and"; "break"; "do"; "else"; "elseif";
-	    "end"; "false"; "for"; "function"; "if";
-	    "in"; "local"; "nil"; "not"; "or"; "repeat";
-	    "return"; "then"; "true"; "until"; "while";
-	    "goto"; "self";
-	];
-	h
+    let h = Hashtbl.create 0 in
+    List.iter (fun s -> Hashtbl.add h s ()) [
+        "_G"; ""; "and"; "break"; "do"; "else"; "elseif";
+        "end"; "false"; "for"; "function"; "if";
+        "in"; "local"; "nil"; "not"; "or"; "repeat";
+        "return"; "then"; "true"; "until"; "while";
+        "goto"; "self";
+    ];
+    h
 
 let valid_lua_ident s =
-	try
-		for i = 0 to String.length s - 1 do
-		    match String.unsafe_get s i with
-		    | 'a'..'z' | 'A'..'Z' | '_' -> ()
-		    | '0'..'9' when i > 0 -> ()
-		    | _ -> raise Exit
-		done;
-		true
-	with Exit ->
-		false
+    try
+        for i = 0 to String.length s - 1 do
+            match String.unsafe_get s i with
+            | 'a'..'z' | 'A'..'Z' | '_' -> ()
+            | '0'..'9' when i > 0 -> ()
+            | _ -> raise Exit
+        done;
+        true
+    with Exit ->
+        false
 
 let field s = if Hashtbl.mem kwds s || not (valid_lua_ident s) then "[\"" ^ s ^ "\"]" else "." ^ s
 let ident s = if Hashtbl.mem kwds s then "_" ^ s else s
 
 let anon_field s = if Hashtbl.mem kwds s || not (valid_lua_ident s) then "['" ^ (s_escape_lua s) ^ "']" else s
 let static_field c s =
-	match s with
-	| "length" | "name" when not c.cl_extern || Meta.has Meta.HxGen c.cl_meta-> "._hx" ^ s
-	| s -> field s
+    match s with
+    | "length" | "name" when not c.cl_extern || Meta.has Meta.HxGen c.cl_meta-> "._hx" ^ s
+    | s -> field s
 
 let has_feature ctx = Common.has_feature ctx.com
 let add_feature ctx = Common.add_feature ctx.com
 
 let temp ctx =
-	ctx.id_counter <- ctx.id_counter + 1;
-	"_hx_" ^ string_of_int (ctx.id_counter)
+    ctx.id_counter <- ctx.id_counter + 1;
+    "_hx_" ^ string_of_int (ctx.id_counter)
 
 let spr ctx s =
-	ctx.separator <- false;
-	Buffer.add_string ctx.buf s
+    ctx.separator <- false;
+    Buffer.add_string ctx.buf s
 
 let print ctx =
-	ctx.separator <- false;
-	Printf.kprintf (fun s -> begin
-		Buffer.add_string ctx.buf s
-	end)
+    ctx.separator <- false;
+    Printf.kprintf (fun s -> begin
+            Buffer.add_string ctx.buf s
+        end)
 
 let newline ctx = print ctx "\n%s" ctx.tabs
 
 (* print with newline *)
 let println ctx =
-	ctx.separator <- false;
-	Printf.kprintf (fun s -> begin
-		Buffer.add_string ctx.buf s;
-		newline ctx
-	end)
+    ctx.separator <- false;
+    Printf.kprintf (fun s -> begin
+            Buffer.add_string ctx.buf s;
+            newline ctx
+        end)
 
-let unsupported p = abort "This expression cannot be compiled to Lua" p
+let unsupported p = error "This expression cannot be compiled to Lua" p
 
 let basename path =
-	try
-		let idx = String.rindex path '/' in
-		String.sub path (idx + 1) (String.length path - idx - 1)
-	with Not_found -> path
+    try
+        let idx = String.rindex path '/' in
+        String.sub path (idx + 1) (String.length path - idx - 1)
+    with Not_found -> path
 
 (* TODO : is this necessary any more?*)
 let newprop ctx =
-	match Buffer.nth ctx.buf (Buffer.length ctx.buf - 1) with
-	| '{' -> print ctx "\n%s" ctx.tabs
-	| _ -> print ctx "\n%s" ctx.tabs
+    match Buffer.nth ctx.buf (Buffer.length ctx.buf - 1) with
+    | '{' -> print ctx "\n%s" ctx.tabs
+    | _ -> print ctx "\n%s" ctx.tabs
 
 let semicolon ctx =
-	match Buffer.nth ctx.buf (Buffer.length ctx.buf - 1) with
-	| '}' when not ctx.separator -> ()
-	| _ -> spr ctx ";"
+    match Buffer.nth ctx.buf (Buffer.length ctx.buf - 1) with
+    | '}' when not ctx.separator -> ()
+    | _ -> spr ctx ";"
 
 let rec concat ctx s f = function
-	| [] -> ()
-	| [x] -> f x
-	| x :: l ->
-		f x;
-		spr ctx s;
-		concat ctx s f l
+    | [] -> ()
+    | [x] -> f x
+    | x :: l ->
+        f x;
+        spr ctx s;
+        concat ctx s f l
 
 let fun_block ctx f p =
-	let e = List.fold_left (fun e (a,c) ->
-		match c with
-		| None | Some TNull -> e
-		| Some c -> Type.concat (Codegen.set_default ctx.com a c p) e
-	) f.tf_expr f.tf_args in
-	e
+    let e = List.fold_left (fun e (a,c) ->
+        match c with
+        | None | Some {eexpr = TConst TNull} -> e
+        | Some c -> Type.concat (Texpr.set_default ctx.com.basic a c p) e
+    ) f.tf_expr f.tf_args in
+    e
 
 let open_block ctx =
-	let oldt = ctx.tabs in
-	ctx.tabs <- "  " ^ ctx.tabs;
-	(fun() -> ctx.tabs <- oldt)
-
-let rec iter_switch_break in_switch e =
-	match e.eexpr with
-	| TFunction _ | TWhile _ | TFor _ -> ()
-	| TSwitch _ when not in_switch -> iter_switch_break true e
-	| TBreak when in_switch -> raise Exit
-	| _ -> iter (iter_switch_break in_switch) e
-
-let handle_break ctx e =
-    (* TODO: This got messy. Find a way to unify the implementation with a try/catch helper at least *)
-	let old = ctx.in_loop, ctx.handle_break in
-	ctx.in_loop <- true;
-	try
-		iter_switch_break false e;
-		ctx.handle_break <- false;
-		(fun() ->
-			ctx.in_loop <- fst old;
-			ctx.handle_break <- snd old;
-		)
-	with
-		Exit ->
-			println ctx "local _hx_expected_result = {}";
-			println ctx "local _hx_status, _hx_result = pcall(function() ";
-			let b = open_block ctx in
-			newline ctx;
-			ctx.handle_break <- true;
-			(fun() ->
-				b();
-				ctx.in_loop <- fst old;
-				ctx.handle_break <- snd old;
-				newline ctx;
-				println ctx "end";
-				println ctx " return _hx_expected_result end)";
-				spr ctx " if not _hx_status then ";
-				newline ctx;
-				println ctx " elseif _hx_result ~= _hx_expected_result then return _hx_result";
-			)
+    let oldt = ctx.tabs in
+    ctx.tabs <- "  " ^ ctx.tabs;
+    (fun() -> ctx.tabs <- oldt)
 
 let this ctx = match ctx.in_value with None -> "self" | Some _ -> "self"
 
-let is_dynamic_iterator ctx e =
-	let check x =
-		has_feature ctx "HxOverrides.iter" && (match follow x.etype with
-			| TInst ({ cl_path = [],"Array" },_)
-			| TInst ({ cl_kind = KTypeParameter _}, _)
-			| TAnon _
-			| TDynamic _
-			| TMono _ ->
-				true
-			| _ -> false
-		)
-	in
-	match e.eexpr with
-	| TField (x,f) when field_name f = "iterator" -> check x
-	| _ ->
-		false
+let is_dot_access e cf =
+    match follow(e.etype), cf with
+    | TInst (c,_), FInstance(_,_,icf)  when (Meta.has Meta.LuaDotMethod c.cl_meta || Meta.has Meta.LuaDotMethod icf.cf_meta)->
+        true;
+    | _ ->
+        false
 
 (*
 	return index of a first element in the list for which `f` returns true
 	TODO: is there some standard function to do that?
  *)
 let index_of f l =
-	let rec find lst idx =
-		match lst with
-		| [] -> raise Not_found
-		| el :: rest ->
-			if f el then
-				idx
-			else
-				find rest (idx + 1)
-	in
-	find l 0
+    let rec find lst idx =
+        match lst with
+        | [] -> raise Not_found
+        | el :: rest ->
+            if f el then
+                idx
+            else
+                find rest (idx + 1)
+    in
+    find l 0
 
 (* create a __lua__ call *)
 let mk_lua_code com code args t pos =
-	let lua_local = Codegen.ExprBuilder.make_local (alloc_var "__lua__" t_dynamic pos) pos in
-	let code_const = Codegen.ExprBuilder.make_string com code pos in
-	mk (TCall (lua_local, code_const :: args)) t pos
+    let lua_local = mk (TIdent "__lua__") t_dynamic pos in
+    let code_const = Texpr.Builder.make_string com code pos in
+    mk (TCall (lua_local, code_const :: args)) t pos
 
 (* create a multi-return boxing call for given expr *)
 let mk_mr_box ctx e =
-	let s_fields =
-		match follow e.etype with
-		| TInst (c,_) ->
-			String.concat ", " (List.map (fun f -> "\"" ^ f.cf_name ^ "\"") c.cl_ordered_fields)
-		| _ -> assert false
-	in
-	add_feature ctx "use._hx_box_mr";
-	add_feature ctx "use._hx_table";
-	let code = Printf.sprintf "_hx_box_mr(_hx_table.pack({0}), {%s})" s_fields in
-	mk_lua_code ctx.com code [e] e.etype e.epos
+    let s_fields =
+        match follow e.etype with
+        | TInst (c,_) ->
+            String.concat ", " (List.map (fun f -> "\"" ^ f.cf_name ^ "\"") c.cl_ordered_fields)
+        | _ -> assert false
+    in
+    add_feature ctx "use._hx_box_mr";
+    add_feature ctx "use._hx_table";
+    let code = Printf.sprintf "_hx_box_mr(_hx_table.pack({0}), {%s})" s_fields in
+    mk_lua_code ctx.com.basic code [e] e.etype e.epos
 
 (* create a multi-return select call for given expr and field name *)
-let mk_mr_select com e name =
-	let i =
-		match follow e.etype with
-		| TInst (c,_) ->
-			index_of (fun f -> f.cf_name = name) c.cl_ordered_fields
-		| _ ->
-			assert false
-	in
-	if i == 0 then
-	    e
-	else
-	    let code = Printf.sprintf "_G.select(%i, {0})" (i + 1) in
-	    mk_lua_code com code [e] e.etype e.epos
+let mk_mr_select com e ecall name =
+    let i =
+        match follow ecall.etype with
+        | TInst (c,_) ->
+            index_of (fun f -> f.cf_name = name) c.cl_ordered_fields
+        | _ ->
+            assert false
+    in
+    if i == 0 then
+        mk_lua_code com "{0}" [ecall] e.etype e.epos
+    else
+        let code = Printf.sprintf "_G.select(%i, {0})" (i + 1) in
+        mk_lua_code com code [ecall] e.etype e.epos
 
 (* from genphp *)
 let rec is_string_type t =
-	match follow t with
-	| TInst ({cl_path = ([], "String")}, _) -> true
-	| TAnon a ->
-	   (match !(a.a_status) with
-	   | Statics ({cl_path = ([], "String")}) -> true
-	   | _ -> false)
-	| TAbstract (a,pl) -> is_string_type (Abstract.get_underlying_type a pl)
-	| _ -> false
+    match follow t with
+    | TInst ({cl_path = ([], "String")}, _) -> true
+    | TAnon a ->
+        (match !(a.a_status) with
+         | Statics ({cl_path = ([], "String")}) -> true
+         | _ -> false)
+    | TAbstract (a,pl) -> is_string_type (Abstract.get_underlying_type a pl)
+    | _ -> false
 
 let is_string_expr e = is_string_type e.etype
 (* /from genphp *)
 
+let is_dynamic t = match follow t with
+    | TMono _ | TDynamic _
+    | TInst({ cl_kind = KTypeParameter _ }, _) -> true
+    | TAnon anon ->
+        (match !(anon.a_status) with
+         | EnumStatics _ | Statics _ -> false
+         | _ -> true
+        )
+    | _ -> false
+
+let is_dynamic_expr e = is_dynamic e.etype
+
+let is_structural_type t =
+    match follow t with
+    | TDynamic _ -> true
+    | TAnon a -> true
+    | TType ({t_type = TAnon _},_) -> true
+    | _ -> false
+
 let rec is_int_type ctx t =
     match follow t with
-	| TInst ({cl_path = ([], "Int")}, _) -> true
-	| TAnon a ->
-		(match !(a.a_status) with
-	    | Statics ({cl_path = ([], "Int")}) -> true
-	    | _ -> false)
-		| TAbstract ({a_path = ([],"Float")}, pl) -> false
-	| TAbstract ({a_path = ([],"Int")}, pl) -> true
-	| TAbstract (a,pl) -> is_int_type ctx (Abstract.get_underlying_type a pl)
-	| _ -> false
+    | TInst ({cl_path = ([], "Int")}, _) -> true
+    | TAnon a ->
+        (match !(a.a_status) with
+         | Statics ({cl_path = ([], "Int")}) -> true
+         | _ -> false)
+    | TAbstract ({a_path = ([],"Float")}, pl) -> false
+    | TAbstract ({a_path = ([],"Int")}, pl) -> true
+    | TAbstract (a,pl) -> is_int_type ctx (Abstract.get_underlying_type a pl)
+    | _ -> false
 
 let rec extract_expr e = match e.eexpr with
     | TParenthesis e
@@ -329,1018 +311,1142 @@ let rec extract_expr e = match e.eexpr with
     | _ -> e
 
 let gen_constant ctx p = function
-	| TInt i -> print ctx "%ld" i
-	| TFloat s -> spr ctx s
-	| TString s -> begin
-	    add_feature ctx "use.string";
-	    print ctx "\"%s\"" (s_escape_lua s)
-	end
-	| TBool b -> spr ctx (if b then "true" else "false")
-	| TNull -> spr ctx "nil"
-	| TThis -> spr ctx (this ctx)
-	| TSuper -> assert false
-
-let rec gen_call ctx e el in_value =
-	ctx.iife_assign <- true;
-	(match e.eexpr , el with
-	| TConst TSuper , params ->
-		(match ctx.current.cl_super with
-		| None -> abort "Missing api.setCurrentClass" e.epos
-		| Some (c,_) ->
-			print ctx "%s.super(%s" (ctx.type_accessor (TClassDecl c)) (this ctx);
-			List.iter (fun p -> print ctx ","; gen_value ctx p) params;
-			spr ctx ")";
-		);
-	| TField ({ eexpr = TConst TSuper },f) , params ->
-		(match ctx.current.cl_super with
-		| None -> abort "Missing api.setCurrentClass" e.epos
-		| Some (c,_) ->
-			let name = field_name f in
-			print ctx "%s.prototype%s(%s" (ctx.type_accessor (TClassDecl c)) (field name) (this ctx);
-			List.iter (fun p -> print ctx ","; gen_value ctx p) params;
-			spr ctx ")";
-		);
-	| TCall (x,_) , el when (match x.eexpr with TLocal { v_name = "__lua__" } -> false | _ -> true) ->
-		spr ctx "(";
-		gen_value ctx e;
-		spr ctx ")";
-		spr ctx "(";
-		concat ctx "," (gen_value ctx) el;
-		spr ctx ")";
-	| TLocal { v_name = "__new__" }, { eexpr = TConst (TString cl) } :: params ->
-		print ctx "%s.new(" cl;
-		concat ctx "," (gen_value ctx) params;
-		spr ctx ")";
-	| TLocal { v_name = "__new__" }, e :: params ->
-		gen_value ctx e;
-		spr ctx ".new(";
-		concat ctx "," (gen_value ctx) params;
-		spr ctx ")";
-	| TLocal { v_name = "__callself__" }, { eexpr = TConst (TString head) } :: { eexpr = TConst (TString tail) } :: el ->
-		print ctx "%s:%s" head tail;
-		spr ctx "(";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")";
-	| TLocal { v_name = "__call__" }, { eexpr = TConst (TString code) } :: el ->
-		spr ctx code;
-		spr ctx "(";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")";
-	| TLocal { v_name = "__lua_length__" }, [e]->
-		spr ctx "#"; gen_value ctx e;
-	| TLocal { v_name = "__lua_table__" }, el ->
-		let count = ref 0 in
-		spr ctx "({";
-		List.iter (fun e ->
-		    (match e with
-		    | { eexpr = TArrayDecl arr } ->
-			    if (!count > 0 && List.length(arr) > 0) then spr ctx ",";
-			    concat ctx "," (gen_value ctx) arr;
-			    if List.length(arr) > 0 then incr count;
-		    | { eexpr = TObjectDecl fields } ->
-			    if (!count > 0 && List.length(fields) > 0) then spr ctx ",";
-			    concat ctx ", " (fun (f,e) ->
-				print ctx "%s = " (anon_field f);
-				gen_value ctx e
-			    ) fields;
-			    if List.length(fields) > 0 then incr count;
-		    | { eexpr = TConst(TNull)} -> ()
-		    | _ ->
-			    abort "__lua_table__ only accepts array or anonymous object arguments" e.epos;
-		)) el;
-		spr ctx "})";
-	| TLocal { v_name = "__lua__" }, [{ eexpr = TConst (TString code) }] ->
-		spr ctx (String.concat "\n" (ExtString.String.nsplit code "\r\n"))
-	| TLocal { v_name = "__lua__" }, { eexpr = TConst (TString code); epos = p } :: tl ->
-		Codegen.interpolate_code ctx.com code tl (spr ctx) (gen_expr ctx) p
-	| TLocal { v_name = "__type__" },  [o] ->
-		spr ctx "type(";
-		gen_value ctx o;
-		spr ctx ")";
-	| TLocal ({v_name = "__define_feature__"}), [_;e] ->
-		gen_expr ctx e
-	| TLocal { v_name = "__feature__" }, { eexpr = TConst (TString f) } :: eif :: eelse ->
-		(if has_feature ctx f then
-			gen_value ctx eif
-		else match eelse with
-			| [] -> ()
-			| e :: _ -> gen_value ctx e)
-	| TLocal { v_name = "__resources__" }, [] ->
-		(* TODO: Array declaration helper *)
-		spr ctx "_hx_tab_array({";
-		let count = ref 0 in
-		concat ctx "," (fun (name,data) ->
-			if (!count == 0) then spr ctx "[0]=";
-			spr ctx "{ ";
-			spr ctx "name = ";
-			gen_constant ctx e.epos (TString name);
-			spr ctx ", data = ";
-			gen_constant ctx e.epos (TString (Codegen.bytes_serialize data));
-			spr ctx "}";
-			incr count
-		) (Hashtbl.fold (fun name data acc -> (name,data) :: acc) ctx.com.resources []);
-		print ctx "}, %i)" !count;
-	| TLocal { v_name = "`trace" }, [e;infos] ->
-		if has_feature ctx "haxe.Log.trace" then begin
-			let t = (try List.find (fun t -> t_path t = (["haxe"],"Log")) ctx.com.types with _ -> assert false) in
-			spr ctx (ctx.type_accessor t);
-			spr ctx ".trace(";
-			gen_value ctx e;
-			spr ctx ",";
-			gen_value ctx infos;
-			spr ctx ")";
-		end else begin
-			spr ctx "_hx_print(";
-			gen_value ctx e;
-			spr ctx ")";
-		end
-	| TField ( { eexpr = TConst(TInt _ | TFloat _| TString _| TBool _) } as e , ((FInstance _ | FAnon _) as ef)), el ->
-		spr ctx ("(");
-		gen_value ctx e;
-		print ctx ("):%s(") (field_name ef);
-		concat ctx "," (gen_value ctx) el;
-		spr ctx ")";
-	| TField (e, ((FInstance _ | FAnon _ | FDynamic _) as ef)), el ->
-		let s = (field_name ef) in
-		if Hashtbl.mem kwds s || not (valid_lua_ident s) then begin
-		    add_feature ctx "use._hx_apply_self";
-		    spr ctx "_hx_apply_self(";
-		    gen_value ctx e;
-		    print ctx ",\"%s\"" (field_name ef);
-		    if List.length(el) > 0 then spr ctx ",";
-		    concat ctx "," (gen_value ctx) el;
-		    spr ctx ")";
-		end else begin
-		    gen_value ctx e;
-		    print ctx ":%s(" (field_name ef);
-		    concat ctx "," (gen_value ctx) el;
-		    spr ctx ")"
-		end;
-	| _ ->
-		gen_value ctx e;
-		spr ctx "(";
-		concat ctx "," (gen_value ctx) el;
-		spr ctx ")");
-	ctx.iife_assign <- false;
+    | TInt i -> print ctx "%ld" i
+    | TFloat s -> spr ctx s
+    | TString s -> begin
+            add_feature ctx "use.string";
+            print ctx "\"%s\"" (s_escape_lua s)
+        end
+    | TBool b -> spr ctx (if b then "true" else "false")
+    | TNull -> spr ctx "nil"
+    | TThis -> spr ctx (this ctx)
+    | TSuper -> assert false
+
+
+
+let rec is_function_type t =
+    match follow(t) with
+    | TFun _ -> true
+    | TAbstract({a_path=["haxe"],"Function" },_) -> true
+    | _ -> false
+
+and gen_argument ?(reflect=false) ctx e = begin
+    match e.eexpr with
+    | TField (x,((FInstance (_,_,f)| FAnon(f) | FClosure(_,f))))  when (is_function_type e.etype) ->
+            (
+            if reflect then (
+              add_feature ctx "use._hx_funcToField";
+              spr ctx "_hx_funcToField(";
+            );
+
+            add_feature ctx "use._hx_bind";
+            print ctx "_hx_bind(";
+            gen_value ctx x;
+            print ctx ",";
+            gen_value ctx x;
+            print ctx "%s)" (if Meta.has Meta.SelfCall f.cf_meta then "" else (field f.cf_name));
+
+            if reflect then
+                print ctx ")";
+            );
+    | _ ->
+        gen_value ctx e;
+end
+
+and gen_paren_arguments ctx el = begin
+    spr ctx "(";
+    concat ctx ", " (gen_argument ctx) el;
+    spr ctx ")";
+end
+
+and gen_call ctx e el =
+    ctx.iife_assign <- true;
+    (match e.eexpr , el with
+     | TConst TSuper , params ->
+         (match ctx.current.cl_super with
+          | None -> error "Missing api.setCurrentClass" e.epos
+          | Some (c,_) ->
+              print ctx "%s.super(%s" (ctx.type_accessor (TClassDecl c)) (this ctx);
+              List.iter (fun p -> print ctx ","; gen_argument ctx p) params;
+              spr ctx ")";
+         );
+     | TField ({ eexpr = TConst TSuper },f) , params ->
+         (match ctx.current.cl_super with
+          | None -> error "Missing api.setCurrentClass" e.epos
+          | Some (c,_) ->
+              let name = field_name f in
+              print ctx "%s.prototype%s(%s" (ctx.type_accessor (TClassDecl c)) (field name) (this ctx);
+              List.iter (fun p -> print ctx ","; gen_argument ctx p) params;
+              spr ctx ")";
+         );
+     | TField (_, FStatic( { cl_path = ([],"Reflect") }, { cf_name = "callMethod" })), (obj :: fld :: args :: rest) ->
+         gen_expr ctx e;
+         spr ctx "(";
+         gen_argument ctx obj;
+         spr ctx ",";
+         gen_argument ~reflect:true ctx fld;
+         spr ctx ",";
+         gen_argument ctx args;
+         spr ctx ")";
+     | TCall (x,_) , el when (match x.eexpr with TIdent "__lua__" -> false | _ -> true) ->
+         gen_paren ctx [e];
+         gen_paren_arguments ctx el;
+     | TIdent "__new__", { eexpr = TConst (TString cl) } :: params ->
+         print ctx "%s.new" cl;
+         gen_paren_arguments ctx params;
+     | TIdent "__new__", e :: params ->
+         gen_value ctx e;
+         spr ctx ".new";
+         gen_paren_arguments ctx params;
+     | TIdent "__callself__", { eexpr = TConst (TString head) } :: { eexpr = TConst (TString tail) } :: el ->
+         print ctx "%s:%s" head tail;
+         gen_paren_arguments ctx el;
+     | TIdent "__call__", { eexpr = TConst (TString code) } :: el ->
+         spr ctx code;
+         gen_paren_arguments ctx el;
+     | TIdent "__lua_length__", [e]->
+         spr ctx "#"; gen_value ctx e;
+     | TField (_, FStatic ({ cl_path = (["_G"],"table")}, { cf_name = "create" })), el
+     | TIdent "__lua_table__", el ->
+         let count = ref 0 in
+         spr ctx "({";
+         List.iter (fun e ->
+             (match Texpr.skip e with
+              | { eexpr = TArrayDecl arr } ->
+                  if (!count > 0 && List.length(arr) > 0) then spr ctx ",";
+                  concat ctx "," (gen_value ctx) arr;
+                  if List.length(arr) > 0 then incr count;
+              | { eexpr = TObjectDecl fields } ->
+                  if (!count > 0 && List.length(fields) > 0) then spr ctx ",";
+                  concat ctx ", " (fun ((f,_,_),e) ->
+                      print ctx "%s = " (anon_field f);
+                      gen_value ctx e
+                  ) fields;
+                  if List.length(fields) > 0 then incr count;
+              | { eexpr = TConst(TNull)} -> ()
+              | _ ->
+                  error "__lua_table__ only accepts array or anonymous object arguments" e.epos;
+             )) el;
+         spr ctx "})";
+     | TIdent "__lua__", [{ eexpr = TConst (TString code) }] ->
+         spr ctx (String.concat "\n" (ExtString.String.nsplit code "\r\n"))
+     | TIdent "__lua__", { eexpr = TConst (TString code); epos = p } :: tl ->
+         Codegen.interpolate_code ctx.com code tl (spr ctx) (gen_expr ctx) p
+     | TIdent "__type__",  [o] ->
+         spr ctx "type";
+         gen_paren ctx [o];
+     | TIdent "__define_feature__", [_;e] ->
+         gen_expr ctx e
+     | TIdent "__feature__", { eexpr = TConst (TString f) } :: eif :: eelse ->
+         (if has_feature ctx f then
+              gen_value ctx eif
+          else match eelse with
+              | [] -> ()
+              | e :: _ -> gen_value ctx e)
+     | TIdent "__resources__", [] ->
+         (* TODO: Array declaration helper *)
+         spr ctx "_hx_tab_array({";
+         let count = ref 0 in
+         concat ctx "," (fun (name,data) ->
+             if (!count == 0) then spr ctx "[0]=";
+             spr ctx "{ ";
+             spr ctx "name = ";
+             gen_constant ctx e.epos (TString name);
+             spr ctx ", data = ";
+             gen_constant ctx e.epos (TString (Codegen.bytes_serialize data));
+             spr ctx "}";
+             incr count
+         ) (Hashtbl.fold (fun name data acc -> (name,data) :: acc) ctx.com.resources []);
+         print ctx "}, %i)" !count;
+     | TIdent "`trace", [e;infos] ->
+         if has_feature ctx "haxe.Log.trace" then begin
+             let t = (try List.find (fun t -> t_path t = (["haxe"],"Log")) ctx.com.types with _ -> assert false) in
+             spr ctx (ctx.type_accessor t);
+             spr ctx ".trace(";
+             gen_value ctx e;
+             spr ctx ",";
+             gen_value ctx infos;
+             spr ctx ")";
+         end else begin
+             spr ctx "_hx_print(";
+             gen_value ctx e;
+             spr ctx ")";
+         end
+     | TField ( { eexpr = TConst(TInt _ | TFloat _| TString _| TBool _) } as e , ((FInstance _ | FAnon _) as ef)), el ->
+         gen_paren ctx [e];
+         print ctx (":%s(") (field_name ef);
+         concat ctx "," (gen_value ctx) el;
+         spr ctx ")";
+     | TField (_, FStatic( { cl_path = ([],"Std") }, { cf_name = "string" })),[{eexpr = TCall({eexpr=TField (_, FStatic( { cl_path = ([],"Std") }, { cf_name = "string" }))}, _)} as el] ->
+         (* unwrap recursive Std.string(Std.string(...)) declarations to Std.string(...) *)
+         gen_value ctx el;
+     | TField ({eexpr = TLocal _} as e, ef), el when is_possible_string_field e (field_name ef)  ->
+         add_feature ctx "use._hx_wrap_if_string_field";
+         add_feature ctx "use.string";
+         spr ctx "_hx_wrap_if_string_field(";
+         gen_value ctx e;
+         print ctx ",'%s'" (field_name ef);
+         spr ctx ")(";
+         concat ctx "," (gen_argument ctx) (e::el);
+         spr ctx ")";
+     | TField (field_owner, ((FInstance _ | FAnon _ | FDynamic _) as ef)), el ->
+         let s = (field_name ef) in
+         if Hashtbl.mem kwds s || not (valid_lua_ident s) then begin
+             add_feature ctx "use._hx_apply_self";
+             spr ctx "_hx_apply_self(";
+             gen_value ctx field_owner;
+             print ctx ",\"%s\"" (field_name ef);
+             if List.length(el) > 0 then spr ctx ",";
+             concat ctx "," (gen_argument ctx) el;
+             spr ctx ")";
+         end else begin
+             let el =
+                if (match ef with FAnon _ | FDynamic _ -> true | _ -> false) && is_possible_string_field field_owner s then
+                    begin
+                        gen_expr ctx e;
+                        field_owner :: el
+                    end
+                else
+                    begin
+                        gen_value ctx field_owner;
+                        if is_dot_access field_owner ef then
+                            print ctx ".%s" (field_name ef)
+                        else
+                            print ctx ":%s" (field_name ef);
+                        el
+                    end
+             in
+             gen_paren_arguments ctx el;
+         end;
+     | _ ->
+         gen_value ctx e;
+         gen_paren_arguments ctx el);
+    ctx.iife_assign <- false;
+
+and has_continue e =
+    let rec loop e = match e.eexpr with
+        | TContinue -> raise Exit
+        | TWhile(e1,_,_) | TFor(_,e1,_) -> loop e1 (* in theory there could be a continue there. Note that we don't want to recurse into the loop body because we do not care about inner continue expressions *)
+        | _ -> Type.iter loop e
+    in
+    try
+        loop e;
+        false;
+    with Exit ->
+        true
+
+and gen_paren ctx el =
+    spr ctx "(";
+    concat ctx ", " (gen_value ctx) el;
+    spr ctx ")";
+
+and gen_cond ctx cond =
+    ctx.iife_assign <- true;
+    gen_value ctx cond;
+    ctx.iife_assign <- false
+
+and gen_loop ctx label cond e =
+    let old_in_loop = ctx.in_loop in
+    ctx.in_loop <- true;
+    let old_handle_continue = ctx.handle_continue in
+    let will_continue = has_continue e in
+    ctx.handle_continue <- has_continue e;
+    ctx.break_depth <- ctx.break_depth + 1;
+    if will_continue then begin
+        println ctx "local _hx_continue_%i = false;" ctx.break_depth;
+    end;
+    let b = open_block ctx in
+    print ctx "%s " label;
+    gen_cond ctx cond;
+    print ctx " do ";
+    if will_continue then print ctx "repeat ";
+    gen_block_element ctx e;
+    if will_continue then begin
+        if will_continue then begin
+            println ctx "until true";
+        end;
+        println ctx "if _hx_continue_%i then " ctx.break_depth;
+        println ctx "_hx_continue_%i = false;" ctx.break_depth;
+        if ctx.in_loop_try then
+            println ctx "_G.error(\"_hx_pcall_break\");"
+        else
+            println ctx "break;";
+        println ctx "end;";
+    end;
+    b();
+    newline ctx;
+    print ctx "end";
+    ctx.in_loop <- old_in_loop;
+    ctx.break_depth <- ctx.break_depth-1;
+    ctx.handle_continue <- old_handle_continue;
+
+
+and is_possible_string_field e field_name=
+    (* Special case for String fields *)
+    let structural_type = is_structural_type e.etype in
+    if not structural_type then
+        false
+    else match field_name with
+        | "length"
+        | "toUpperCase"
+        | "toLowerCase"
+        | "charAt"
+        | "indexOf"
+        | "lastIndexOf"
+        | "split"
+        | "toString"
+        | "substring"
+        | "substr"
+        | "charCodeAt" ->
+            true
+        | _ ->
+            false
+
+
+and ttype_multireturn t = match t with
+    | TInst (c,_) ->
+            Meta.has Meta.MultiReturn c.cl_meta
+    | TType (c,_) ->
+            Meta.has Meta.MultiReturn c.t_meta
+    | _ ->
+            false
+and check_multireturn_param ctx t pos =
+   match t with
+         TAbstract(_,p) | TInst(_,p) ->
+            if List.exists ttype_multireturn p then
+                error "MultiReturns must not be type parameters" pos
+            else
+                ()
+        | _ ->
+                ();
 
 and gen_expr ?(local=true) ctx e = begin
-	match e.eexpr with
-	 TConst c ->
-		gen_constant ctx e.epos c;
-	| TLocal v when v.v_name = "this" ->
-		spr ctx "self";
-	| TLocal v -> spr ctx (ident v.v_name)
-	| TArray (e1,{ eexpr = TConst (TString s) }) when valid_lua_ident s && (match e1.eexpr with TConst (TInt _|TFloat _) -> false | _ -> true) ->
-		gen_value ctx e1;
-		spr ctx (field s)
-	| TArray (e1,e2) ->
-		gen_value ctx e1;
-		spr ctx "[";
-		gen_value ctx e2;
-		spr ctx "]";
-	| TBinop (op,e1,e2) ->
-		gen_tbinop ctx op e1 e2;
-	| TField (x,f) when field_name f = "iterator" && is_dynamic_iterator ctx e ->
-		add_feature ctx "use._iterator";
-		print ctx "_iterator(";
-		gen_value ctx x;
-		print ctx ")";
-	| TField (x,FClosure (_,f)) ->
-		add_feature ctx "use._hx_bind";
-		(match x.eexpr with
-		| TConst _ | TLocal _ ->
-			print ctx "_hx_bind(";
-			gen_value ctx x;
-			print ctx ",";
-			gen_value ctx x;
-			print ctx "%s)" (if Meta.has Meta.SelfCall f.cf_meta then "" else (field f.cf_name))
-		| _ ->
-			print ctx "(function() local __=";
-			gen_value ctx x;
-			print ctx "; return _hx_bind(__,__%s) end)()" (if Meta.has Meta.SelfCall f.cf_meta then "" else (field f.cf_name)))
-	| TEnumParameter (x,_,i) ->
-		gen_value ctx x;
-		print ctx "[%i]" (i + 2)
-	| TField (x, (FInstance(_,_,f) | FStatic(_,f) | FAnon(f))) when Meta.has Meta.SelfCall f.cf_meta ->
-		gen_value ctx x;
-	| TField ({ eexpr = TConst(TInt _ | TFloat _| TString _| TBool _) } as e , ((FInstance _ | FAnon _) as ef)) ->
-		spr ctx ("(");
-		gen_value ctx e;
-		print ctx (").%s") (field_name ef);
-	| TField ({ eexpr = TConst (TInt _ | TFloat _) } as x,f) ->
-		gen_expr ctx { e with eexpr = TField(mk (TParenthesis x) x.etype x.epos,f) }
-	| TField ({ eexpr = TObjectDecl fields }, ef ) ->
-		spr ctx "(function(x) return x.";
-		print ctx "%s" (field_name ef);
-		spr ctx " end )({";
-		concat ctx ", " (fun (f,e) -> print ctx "%s = " (anon_field f); gen_value ctx e) fields;
-		spr ctx "})";
-	| TField ({eexpr = TLocal v}, f) when Meta.has Meta.MultiReturn v.v_meta ->
-		(* field of a multireturn local var is actually just a local var *)
-		let (_, args, pos) =  Meta.get (Meta.Custom ":lua_mr_id") v.v_meta  in
-		(match args with
-		| [(EConst(String(id)), _)] ->
-				spr ctx (id ^ "_" ^ (ident v.v_name) ^ "_" ^ (field_name f));
-		| _ ->
-				assert false);
-	| TField (x,f) ->
-		gen_value ctx x;
-		let name = field_name f in
-		spr ctx (match f with FStatic _ | FEnum _ | FInstance _ | FAnon _ | FDynamic _ | FClosure _ -> field name)
-	| TTypeExpr t ->
-		spr ctx (ctx.type_accessor t)
-	| TParenthesis e ->
-		spr ctx "(";
-		gen_value ctx e;
-		spr ctx ")";
-	| TMeta (_,e) ->
-		gen_expr ctx e
-	| TReturn eo -> gen_return ctx e eo;
-	| TBreak ->
-		if not ctx.in_loop then unsupported e.epos;
-		if ctx.handle_break then
-		    spr ctx "_G.error(\"_hx__break__\")"
-		else if ctx.handle_continue then
-		    print ctx "_hx_break_%i = true; break" ctx.break_depth
-		else
-		    spr ctx "break" (*todo*)
-	| TContinue ->
-		if not ctx.in_loop then unsupported e.epos;
-		spr ctx "break";
-	| TBlock el ->
-		let bend = open_block ctx in
-		List.iter (gen_block_element ctx) el;
-		bend();
-		newline ctx;
-	| TFunction f ->
-		let old = ctx.in_value, ctx.in_loop in
-		ctx.in_value <- None;
-		ctx.in_loop <- false;
-		print ctx "function(%s) " (String.concat "," (List.map ident (List.map arg_name f.tf_args)));
-		let fblock = fun_block ctx f e.epos in
-		(match fblock.eexpr with
-		| TBlock el ->
-		    let bend = open_block ctx in
-		    List.iter (gen_block_element ctx) el;
-		    bend();
-		    newline ctx;
-		|_ -> ());
-		spr ctx "end";
-		ctx.in_value <- fst old;
-		ctx.in_loop <- snd old;
-		ctx.separator <- true
-	| TCall (e,el) ->
-		    gen_call ctx e el false;
-	| TArrayDecl el ->
-		spr ctx "_hx_tab_array({";
-		let count = ref 0 in
-		List.iteri (fun i e ->
-		    incr count;
-		    if (i == 0) then spr ctx "[0]="
-		    else spr ctx ", ";
-		    gen_value ctx e) el;
-		print ctx " }, %i)" !count;
-	| TThrow e ->
-		spr ctx "_G.error(";
-		gen_value ctx e;
-		spr ctx ",0)";
-	| TVar (v,eo) ->
-		begin match eo with
-			| None ->
-				if local then
-				    spr ctx "local ";
-				spr ctx (ident v.v_name);
-			| Some e ->
-				match e.eexpr with
-				| TBinop(OpAssign, e1, e2) ->
-				    gen_tbinop ctx OpAssign e1 e2;
-				    if local then
-					spr ctx " local ";
-				    spr ctx (ident v.v_name);
-				    spr ctx " = ";
-				    gen_value ctx e1;
-
-				| _ when Meta.has Meta.MultiReturn v.v_meta ->
-					(* multi-return var is generated as several vars for unpacking *)
-				    let id = temp ctx in
-				    let temp_expr = (EConst(String(id)), Globals.null_pos) in
-				    v.v_meta <- (Meta.Custom ":lua_mr_id", [temp_expr], v.v_pos) :: v.v_meta;
-				    let name = ident v.v_name in
-				    let names =
-						    match follow v.v_type with
-						    | TInst (c, _) ->
-										    List.map (fun f -> id ^ "_" ^name ^ "_" ^ f.cf_name) c.cl_ordered_fields
-						    | _ ->
-								    assert false
-				    in
-				    spr ctx "local ";
-				    spr ctx (String.concat ", " names);
-				    spr ctx " = ";
-				    gen_value ctx e;
-
-				| _ ->
-				    if local then
-						spr ctx "local ";
-				    spr ctx (ident v.v_name);
-				    spr ctx " = ";
-
-					(*
-						if it was a multi-return var but it was used as a value itself,
-						we have to box it in an object conforming to a multi-return extern class
-					*)
-					let is_boxed_multireturn = Meta.has (Meta.Custom ":lua_mr_box") v.v_meta in
-					let e = if is_boxed_multireturn then mk_mr_box ctx e else e in
-				    gen_value ctx e;
-		end
-	| TNew (c,_,el) ->
-		(match c.cl_constructor with
-		| Some cf when Meta.has Meta.SelfCall cf.cf_meta ->
-			print ctx "%s" (ctx.type_accessor (TClassDecl c));
-		| Some cf when Meta.has Meta.Native cf.cf_meta ->
-			let _, args, mp = Meta.get Meta.Native cf.cf_meta in
-			(match args with
-			| [( EConst(String s),_)] ->
-				print ctx "%s.%s" (ctx.type_accessor (TClassDecl c)) s;
-			| _ ->
-				print ctx "%s.new" (ctx.type_accessor (TClassDecl c)));
-		| _ -> print ctx "%s.new" (ctx.type_accessor (TClassDecl c)));
-		spr ctx "(";
-		concat ctx "," (gen_value ctx) el;
-		spr ctx ")"
-	| TIf (cond,e,eelse) ->
-		ctx.iife_assign <- true;
-		spr ctx "if ";
-		gen_cond ctx cond;
-		spr ctx " then ";
-		let bend = open_block ctx in
-		gen_block_element ctx e;
-		bend();
-		newline ctx;
-		(match eelse with
-		| None -> ();
-		| Some e2 ->
-			(match e.eexpr with
-			| TObjectDecl _ -> ctx.separator <- false
-			| _ ->());
-			spr ctx "else";
-			let bend = open_block ctx in
-			gen_block_element ctx e2;
-			bend();
-			newline ctx);
-		spr ctx "end";
-		ctx.iife_assign <- false;
-	| TUnop ((Increment|Decrement) as op,unop_flag, e) ->
-		(* TODO: Refactor this mess *)
-		println ctx "(function() ";
-		(match e.eexpr, unop_flag with
-		    | TArray(e1,e2), _ ->
-			spr ctx "local _hx_idx = "; gen_value ctx e2; semicolon ctx; newline ctx;
-			spr ctx "local _hx_arr ="; gen_value ctx e1; semicolon ctx; newline ctx;
-			(match unop_flag with
-			    | Ast.Postfix ->
-				    spr ctx "local _ = _hx_arr[_hx_idx]"; semicolon ctx; newline ctx;
-			    | _ -> ());
-			spr ctx "_hx_arr[_hx_idx] = _hx_arr[_hx_idx]";
-		    | TField(e1,e2), _ ->
-			spr ctx "local _hx_obj = "; gen_value ctx e1; semicolon ctx; newline ctx;
-			spr ctx "local _hx_fld = ";
-			(match e2 with
-			| FInstance(_,_,fld)
-			| FStatic(_,fld)
-			| FAnon fld
-			| FClosure(_,fld) ->
-				print ctx "'%s'" fld.cf_name;
-			| FDynamic name ->
-				print ctx "'%s'" name;
-			| FEnum(_,efld) ->
-				print ctx "'%s'" efld.ef_name);
-			semicolon ctx; newline ctx;
-			(match unop_flag with
-			    | Ast.Postfix ->
-				    spr ctx "local _ = _hx_obj[_hx_fld]"; semicolon ctx; newline ctx;
-			    | _ -> ());
-			spr ctx "_hx_obj[_hx_fld] = _hx_obj[_hx_fld] ";
-		    | _, Ast.Prefix ->
-			gen_value ctx e;
-			spr ctx " = ";
-			gen_value ctx e;
-		    | _, Ast.Postfix ->
-			spr ctx "local _ = ";
-			gen_value ctx e; semicolon ctx;
-			gen_value ctx e;
-			spr ctx " = ";
-			gen_value ctx e);
-		(match op with
-		    |Increment -> spr ctx " + 1;"
-		    |Decrement -> spr ctx " - 1;"
-		    |_-> print ctx " %s 1;" (Ast.s_unop op));
-		newline ctx;
-		spr ctx " return ";
-		(match unop_flag, e.eexpr with
-		    | Ast.Postfix, _ ->
-			    spr ctx "_";
-		    | _, TArray(e1,e2) ->
-			    spr ctx "_hx_arr[_hx_idx]";
-		    | _, TField(e1,e2) ->
-			    spr ctx "_hx_obj[_hx_fld]";
-		    | _, _ ->
-			    gen_value ctx e;
-		    );
-		semicolon ctx; newline ctx;
-		spr ctx " end)()";
-	| TUnop (Not,unop_flag,e) ->
-		spr ctx "not ";
-		gen_value ctx e;
-	| TUnop (NegBits,unop_flag,e) ->
-		add_feature ctx "use._bitop";
-		spr ctx "_hx_bit.bnot(";
-		gen_value ctx e;
-		spr ctx ")";
-	| TUnop (op,Ast.Prefix,e) ->
-		spr ctx (Ast.s_unop op);
-		gen_value ctx e
-	| TUnop (op,Ast.Postfix,e) ->
-		gen_value ctx e;
-		spr ctx (Ast.s_unop op)
-	| TWhile (cond,e,Ast.NormalWhile) ->
-		let handle_break = handle_break ctx e in
-		let has_continue = has_continue e in
-		let old_ctx_continue = ctx.handle_continue in
-		ctx.handle_continue <- has_continue;
-		if has_continue then
-		  println ctx "local _hx_break_%i = false;" ctx.break_depth;
-		spr ctx "while ";
-		gen_cond ctx cond;
-		let b = open_block ctx in
-		print ctx " do ";
-		if has_continue then begin
-		    newline ctx;
-		    (open_block ctx)();
-		    spr ctx "repeat "
-		end;
-		ctx.break_depth <- ctx.break_depth + 1;
-		gen_block_element ctx e;
-		newline ctx;
-		handle_break();
-		if has_continue then begin
-		    b();
-		    newline ctx;
-		    println ctx "until true";
-		    println ctx "if _hx_break_%i then _hx_break_%i = false; break; end" ctx.break_depth ctx.break_depth;
-		end;
-		b();
-		spr ctx "end";
-		ctx.break_depth <- ctx.break_depth-1;
-		ctx.handle_continue <- old_ctx_continue;
-	| TWhile (cond,e,Ast.DoWhile) ->
-		let handle_break = handle_break ctx e in
-		let has_continue = has_continue e in
-		let old_ctx_continue = ctx.handle_continue in
-		ctx.handle_continue <- has_continue;
-		println ctx "while true do ";
-		gen_block_element ctx e;
-		newline ctx;
-		if has_continue then
-		  println ctx "local _hx_break_%i = false;" ctx.break_depth;
-		spr ctx " while ";
-		gen_cond ctx cond;
-		let b = open_block ctx in
-		println ctx " do ";
-		let b2 = open_block ctx in
-		if has_continue then begin
-		    newline ctx;
-		    (open_block ctx)();
-		    spr ctx "repeat "
-		end;
-		ctx.break_depth <- ctx.break_depth + 1;
-		gen_block_element ctx e;
-		handle_break();
-		if has_continue then begin
-		    b2();
-		    newline ctx;
-		    println ctx "until true";
-		    println ctx "if _hx_break_%i then _hx_break_%i = false; break; end" ctx.break_depth ctx.break_depth;
-		end;
-		b();
-		spr ctx "end";
-		ctx.break_depth <- ctx.break_depth-1;
-		ctx.handle_continue <- old_ctx_continue;
-	| TObjectDecl [] ->
-		spr ctx "_hx_e()";
-		ctx.separator <- true
-	| TObjectDecl fields ->
-		spr ctx "_hx_o({__fields__={";
-		concat ctx "," (fun (f,e) -> print ctx "%s=" (anon_field f); spr ctx "true") fields;
-		spr ctx "},";
-		concat ctx "," (fun (f,e) -> print ctx "%s=" (anon_field f); gen_anon_value ctx e) fields;
-		spr ctx "})";
-		ctx.separator <- true
-	| TFor (v,it,e) ->
-		let handle_break = handle_break ctx e in
-		let it = ident (match it.eexpr with
-			| TLocal v -> v.v_name
-			| _ ->
-				let name = temp ctx in
-				print ctx "local %s = " name;
-				gen_value ctx it;
-				newline ctx;
-				name
-		) in
-		print ctx "while( %s:hasNext() ) do" it;
-		let bend = open_block ctx in
-		newline ctx;
-		print ctx "local %s = %s:next();" (ident v.v_name) it;
-		gen_block_element ctx e;
-		bend();
-		newline ctx;
-		spr ctx "end";
-		handle_break();
-		newline ctx;
-	| TTry (e,catchs) ->
-		(* TODO: add temp variables *)
-		println ctx "local _hx_expected_result = {}";
-		println ctx "local _hx_status, _hx_result = pcall(function() ";
-		let b = open_block ctx in
-		gen_expr ctx e;
-		let vname = temp ctx in
-		b();
-		println ctx " return _hx_expected_result end)";
-		spr ctx " if not _hx_status then ";
-		let bend = open_block ctx in
-		newline ctx;
-		print ctx "local %s = _hx_result" vname;
-		let last = ref false in
-		let else_block = ref false in
-		List.iter (fun (v,e) ->
-			if !last then () else
-			let t = (match follow v.v_type with
-			| TEnum (e,_) -> Some (TEnumDecl e)
-			| TInst (c,_) -> Some (TClassDecl c)
-			| TAbstract (a,_) -> Some (TAbstractDecl a)
-			| TFun _
-			| TLazy _
-			| TType _
-			| TAnon _ ->
-				assert false
-			| TMono _
-			| TDynamic _ ->
-				None
-			) in
-			match t with
-			| None ->
-				last := true;
-				if !else_block then print ctx "";
-				if vname <> v.v_name then begin
-					newline ctx;
-					print ctx "local %s = %s" v.v_name vname;
-				end;
-				gen_block_element ctx e;
-				if !else_block then begin
-					newline ctx;
-					print ctx " end ";
-				end
-			| Some t ->
-				if not !else_block then newline ctx;
-				print ctx "if( %s.__instanceof(%s," (ctx.type_accessor (TClassDecl { null_class with cl_path = ["lua"],"Boot" })) vname;
-				gen_value ctx (mk (TTypeExpr t) (mk_mono()) e.epos);
-				spr ctx ") ) then ";
-				let bend = open_block ctx in
-				if vname <> v.v_name then begin
-					newline ctx;
-					print ctx "local %s = %s" v.v_name vname;
-				end;
-				gen_block_element ctx e;
-				bend();
-				newline ctx;
-				spr ctx "else";
-				else_block := true
-		) catchs;
-		if not !last then begin
-		    println ctx " _G.error(%s)" vname;
-		    spr ctx "end";
-		end;
-		bend();
-		newline ctx;
-		print ctx " elseif _hx_result ~= _hx_expected_result then return _hx_result end";
-	| TSwitch (e,cases,def) ->
-		List.iteri (fun cnt (el,e2) ->
-		    if cnt == 0 then spr ctx "if "
-		    else (newline ctx; spr ctx "elseif ");
-		    List.iteri (fun ccnt e3 ->
-			if ccnt > 0 then spr ctx " or ";
-			gen_value ctx e;
-			spr ctx " == ";
-			gen_value ctx e3;
-		    ) el;
-		    print ctx " then ";
-		    let bend = open_block ctx in
-		    gen_block_element ctx e2;
-		    bend();
-		) cases;
-		(match def with
-		| None -> spr ctx " end"
-		| Some e ->
-			begin
-			if (List.length(cases) > 0) then
-			    spr ctx "else";
-			let bend = open_block ctx in
-			bend();
-			gen_block_element ctx e;
-			if (List.length(cases) > 0) then
-			    spr ctx " end";
-			end;);
-	| TCast (e1,Some t) ->
-		print ctx "%s.__cast(" (ctx.type_accessor (TClassDecl { null_class with cl_path = ["lua"],"Boot" }));
-		gen_expr ctx e1;
-		spr ctx " , ";
-		spr ctx (ctx.type_accessor t);
-		spr ctx ")"
-	| TCast (e1,None) ->
-		gen_value ctx e1;
+    match e.eexpr with
+      TConst c ->
+        gen_constant ctx e.epos c;
+    | TLocal v when v.v_name = "this" ->
+        spr ctx "self";
+    | TLocal v -> spr ctx (ident v.v_name)
+    | TArray (e1,{ eexpr = TConst (TString s) }) when valid_lua_ident s && (match e1.eexpr with TConst (TInt _|TFloat _) -> false | _ -> true) ->
+        gen_value ctx e1;
+        spr ctx (field s)
+    | TArray (e1,e2) ->
+        gen_value ctx e1;
+        spr ctx "[";
+        gen_value ctx e2;
+        spr ctx "]";
+    | TBinop (op,e1,e2) ->
+        gen_tbinop ctx op e1 e2;
+    | TField (x,FClosure (_,f)) ->
+        add_feature ctx "use._hx_bind";
+        (match x.eexpr with
+         | TConst _ | TLocal _ ->
+             print ctx "_hx_bind(";
+             gen_value ctx x;
+             print ctx ",";
+             gen_value ctx x;
+             print ctx "%s)" (if Meta.has Meta.SelfCall f.cf_meta then "" else (field f.cf_name))
+         | _ ->
+             print ctx "(function() local __=";
+             gen_value ctx x;
+             print ctx "; return _hx_bind(__,__%s) end)()" (if Meta.has Meta.SelfCall f.cf_meta then "" else (field f.cf_name)))
+    | TEnumParameter (x,_,i) ->
+        gen_value ctx x;
+        print ctx "[%i]" (i + 2)
+    | TEnumIndex x ->
+        gen_value ctx x;
+        print ctx "[1]"
+    | TField (e, ef) when is_string_expr e && field_name ef = "length" ->
+        if ctx.lua_vanilla then (
+            spr ctx "#";
+            gen_value ctx e;
+        ) else (
+            spr ctx "__lua_lib_luautf8_Utf8.len(";
+            gen_value ctx e;
+            spr ctx ")";
+        )
+    | TField (e, ef) when is_possible_string_field e (field_name ef)  ->
+        add_feature ctx "use._hx_wrap_if_string_field";
+        add_feature ctx "use.string";
+        spr ctx "_hx_wrap_if_string_field(";
+        gen_value ctx e;
+        print ctx ",'%s')" (field_name ef)
+    | TField (x, (FInstance(_,_,f) | FStatic(_,f) | FAnon(f))) when Meta.has Meta.SelfCall f.cf_meta ->
+        gen_value ctx x;
+    | TField ({ eexpr = TConst(TInt _ | TFloat _| TString _| TBool _) } as e , ((FInstance _ | FAnon _) as ef)) ->
+        gen_paren ctx [e];
+        print ctx (".%s") (field_name ef);
+    | TField ({ eexpr = TConst (TInt _ | TFloat _) } as x,f) ->
+        gen_expr ctx { e with eexpr = TField(mk (TParenthesis x) x.etype x.epos,f) }
+    | TField ({ eexpr = TObjectDecl fields }, ef ) ->
+        spr ctx "(function(x) return x.";
+        print ctx "%s" (field_name ef);
+        spr ctx " end )({";
+        concat ctx ", " (fun ((f,_,_),e) -> print ctx "%s = " (anon_field f); gen_value ctx e) fields;
+        spr ctx "})";
+    | TField ({eexpr = TLocal v}, f) when Meta.has Meta.MultiReturn v.v_meta ->
+        (* field of a multireturn local var is actually just a local var *)
+        let (_, args, pos) =  Meta.get (Meta.Custom ":lua_mr_id") v.v_meta  in
+        (match args with
+         | [(EConst(String(id,_)), _)] ->
+             spr ctx (id ^ "_" ^ (ident v.v_name) ^ "_" ^ (field_name f));
+         | _ ->
+             assert false);
+    | TField (x,f) ->
+        gen_value ctx x;
+        let name = field_name f in
+        spr ctx (match f with FStatic _ | FEnum _ | FInstance _ | FAnon _ | FDynamic _ | FClosure _ -> field name)
+    | TTypeExpr t ->
+        spr ctx (ctx.type_accessor t)
+    | TParenthesis e ->
+        gen_paren ctx [e];
+    | TMeta (_,e) ->
+        gen_expr ctx e
+    | TReturn eo -> gen_return ctx e eo;
+    | TBreak ->
+        if not ctx.in_loop then unsupported e.epos;
+        if ctx.handle_continue then
+            print ctx "_hx_continue_%i = true;" ctx.break_depth;
+        if ctx.in_loop_try then
+            print ctx "_G.error(\"_hx_pcall_break\", 0)"
+        else
+            spr ctx "break"
+    | TContinue ->
+        if not ctx.in_loop then unsupported e.epos;
+        if ctx.in_loop_try then
+            print ctx "_G.error(\"_hx_pcall_break\", 0)"
+        else
+            spr ctx "break" (*todo*)
+    | TBlock el ->
+        let bend = open_block ctx in
+        List.iter (gen_block_element ctx) el;
+        bend();
+        newline ctx;
+    | TFunction f ->
+        let old = ctx.in_value, ctx.in_loop in
+        ctx.in_value <- None;
+        ctx.in_loop <- false;
+        print ctx "function(%s) " (String.concat "," (List.map ident (List.map arg_name f.tf_args)));
+        let fblock = fun_block ctx f e.epos in
+        (match fblock.eexpr with
+         | TBlock el ->
+             let bend = open_block ctx in
+             List.iter (gen_block_element ctx) el;
+             bend();
+             newline ctx;
+         |_ -> ());
+        spr ctx "end";
+        ctx.in_value <- fst old;
+        ctx.in_loop <- snd old;
+        ctx.separator <- true
+    | TCall (e,el) ->
+        gen_call ctx e el;
+    | TArrayDecl el ->
+        spr ctx "_hx_tab_array({";
+        let count = ref 0 in
+        List.iteri (fun i e ->
+            incr count;
+            if (i == 0) then spr ctx "[0]="
+            else spr ctx ", ";
+            gen_value ctx e) el;
+        print ctx "}, %i)" !count;
+    | TThrow e ->
+        spr ctx "_G.error(";
+        gen_value ctx e;
+        spr ctx ",0)";
+    | TVar (v,eo) ->
+        begin match eo with
+            | None ->
+                if local then
+                    spr ctx "local ";
+                spr ctx (ident v.v_name);
+            | Some e ->
+                match e.eexpr with
+                | TBinop(OpAssign, e1, e2) ->
+                    gen_tbinop ctx OpAssign e1 e2;
+                    if local then
+                        spr ctx " local ";
+                    spr ctx (ident v.v_name);
+                    spr ctx " = ";
+                    gen_value ctx e1;
+
+                | _ when Meta.has Meta.MultiReturn v.v_meta ->
+                    (* multi-return var is generated as several vars for unpacking *)
+                    let id = temp ctx in
+                    let temp_expr = (EConst(String(id,SDoubleQuotes)), Globals.null_pos) in
+                    v.v_meta <- (Meta.Custom ":lua_mr_id", [temp_expr], v.v_pos) :: v.v_meta;
+                    let name = ident v.v_name in
+                    let names =
+                        match follow v.v_type with
+                        | TInst (c, _) ->
+                            List.map (fun f -> id ^ "_" ^name ^ "_" ^ f.cf_name) c.cl_ordered_fields
+                        | _ ->
+                            assert false
+                    in
+                    spr ctx "local ";
+                    spr ctx (String.concat ", " names);
+                    spr ctx " = ";
+                    gen_value ctx e;
+
+                | _ ->
+                    if local then
+                        spr ctx "local ";
+                    spr ctx (ident v.v_name);
+                    spr ctx " = ";
+
+                    (* if it was a multi-return var but it was used as a value itself, *)
+                    (* we have to box it in an object conforming to a multi-return extern class *)
+                    let is_boxed_multireturn = Meta.has (Meta.Custom ":lua_mr_box") v.v_meta in
+                    let e = if is_boxed_multireturn then mk_mr_box ctx e else e in
+                    (match e.eexpr with
+                    | TCast ({ eexpr = TTypeExpr mt } as e1, None) when (match mt with TClassDecl {cl_path = ([],"Array")} -> false | _ -> true) ->
+                        add_feature ctx "use._hx_staticToInstance";
+                        spr ctx "_hx_staticToInstance(";
+                        gen_expr ctx e1;
+                        spr ctx ")";
+                    | _ -> gen_value ctx e);
+        end
+    | TNew (c,_,el) ->
+        (match c.cl_constructor with
+         | Some cf when Meta.has Meta.SelfCall cf.cf_meta ->
+             print ctx "%s" (ctx.type_accessor (TClassDecl c));
+         | Some cf when Meta.has Meta.Native cf.cf_meta ->
+             let _, args, mp = Meta.get Meta.Native cf.cf_meta in
+             (match args with
+              | [( EConst(String(s,_)),_)] ->
+                  print ctx "%s.%s" (ctx.type_accessor (TClassDecl c)) s;
+              | _ ->
+                  print ctx "%s.new" (ctx.type_accessor (TClassDecl c)));
+         | _ -> print ctx "%s.new" (ctx.type_accessor (TClassDecl c)));
+        gen_paren ctx el;
+    | TIf (cond,e,eelse) ->
+        ctx.iife_assign <- true;
+        spr ctx "if ";
+        gen_cond ctx cond;
+        spr ctx " then ";
+        let bend = open_block ctx in
+        gen_block_element ctx e;
+        bend();
+        newline ctx;
+        (match eelse with
+         | None -> ();
+         | Some e2 ->
+             (match e.eexpr with
+              | TObjectDecl _ -> ctx.separator <- false
+              | _ ->());
+             spr ctx "else";
+             let bend = open_block ctx in
+             gen_block_element ctx e2;
+             bend();
+             newline ctx);
+        spr ctx "end";
+        ctx.iife_assign <- false;
+    | TUnop ((Increment|Decrement) as op,unop_flag, e) ->
+        (* TODO: Refactor this mess *)
+        println ctx "(function() ";
+        (match e.eexpr, unop_flag with
+         | TArray(e1,e2), _ ->
+             spr ctx "local _hx_idx = "; gen_value ctx e2; semicolon ctx; newline ctx;
+             spr ctx "local _hx_arr ="; gen_value ctx e1; semicolon ctx; newline ctx;
+             (match unop_flag with
+              | Ast.Postfix ->
+                  spr ctx "local _ = _hx_arr[_hx_idx]"; semicolon ctx; newline ctx;
+              | _ -> ());
+             spr ctx "_hx_arr[_hx_idx] = _hx_arr[_hx_idx]";
+         | TField(e1,e2), _ ->
+             spr ctx "local _hx_obj = "; gen_value ctx e1; semicolon ctx; newline ctx;
+             spr ctx "local _hx_fld = ";
+             (match e2 with
+              | FInstance(_,_,fld)
+              | FStatic(_,fld)
+              | FAnon fld
+              | FClosure(_,fld) ->
+                  print ctx "'%s'" fld.cf_name;
+              | FDynamic name ->
+                  print ctx "'%s'" name;
+              | FEnum(_,efld) ->
+                  print ctx "'%s'" efld.ef_name);
+             semicolon ctx; newline ctx;
+             (match unop_flag with
+              | Ast.Postfix ->
+                  spr ctx "local _ = _hx_obj[_hx_fld]"; semicolon ctx; newline ctx;
+              | _ -> ());
+             spr ctx "_hx_obj[_hx_fld] = _hx_obj[_hx_fld] ";
+         | _, Ast.Prefix ->
+             gen_value ctx e;
+             spr ctx " = ";
+             gen_value ctx e;
+         | _, Ast.Postfix ->
+             spr ctx "local _ = ";
+             gen_value ctx e; semicolon ctx;
+             gen_value ctx e;
+             spr ctx " = ";
+             gen_value ctx e);
+        (match op with
+         |Increment -> spr ctx " + 1;"
+         |Decrement -> spr ctx " - 1;"
+         |_-> print ctx " %s 1;" (Ast.s_unop op));
+        newline ctx;
+        spr ctx " return ";
+        (match unop_flag, e.eexpr with
+         | Ast.Postfix, _ ->
+             spr ctx "_";
+         | _, TArray(e1,e2) ->
+             spr ctx "_hx_arr[_hx_idx]";
+         | _, TField(e1,e2) ->
+             spr ctx "_hx_obj[_hx_fld]";
+         | _, _ ->
+             gen_value ctx e;
+        );
+        semicolon ctx; newline ctx;
+        spr ctx " end)()";
+    | TUnop (Not,unop_flag,e) ->
+        spr ctx "not ";
+        gen_value ctx e;
+    | TUnop (NegBits,unop_flag,e) ->
+        add_feature ctx "use._bitop";
+        spr ctx "_hx_bit.bnot(";
+        gen_value ctx e;
+        spr ctx ")";
+    | TUnop (op,Ast.Prefix,e) ->
+        spr ctx (Ast.s_unop op);
+        gen_value ctx e
+    | TUnop (op,Ast.Postfix,e) ->
+        gen_value ctx e;
+        spr ctx (Ast.s_unop op)
+    | TWhile (cond,e,Ast.NormalWhile) ->
+        gen_loop ctx "while" cond e
+    | TWhile (cond,e,Ast.DoWhile) ->
+        println ctx "while true do ";
+        gen_block_element ctx e;
+        gen_loop ctx "while" cond e
+    | TObjectDecl [] ->
+        spr ctx "_hx_e()";
+        ctx.separator <- true
+    | TObjectDecl fields ->
+        spr ctx "_hx_o({__fields__={";
+        concat ctx "," (fun ((f,_,_),e) -> print ctx "%s=" (anon_field f); spr ctx "true") fields;
+        spr ctx "},";
+        concat ctx "," (fun ((f,_,_),e) -> print ctx "%s=" (anon_field f); gen_anon_value ctx e) fields;
+        spr ctx "})";
+        ctx.separator <- true
+    | TFor (v,it,e2) ->
+        unsupported e.epos;
+    | TTry (e,catchs) ->
+        (* TODO: add temp variables *)
+        let old_in_loop_try = ctx.in_loop_try in
+        if ctx.in_loop then
+            ctx.in_loop_try <- true;
+        println ctx "local _hx_status, _hx_result = pcall(function() ";
+        let b = open_block ctx in
+        gen_expr ctx e;
+        let vname = temp ctx in
+        b();
+        println ctx "return _hx_pcall_default";
+        println ctx "end)";
+        ctx.in_loop_try <- old_in_loop_try;
+        println ctx "if not _hx_status and _hx_result == \"_hx_pcall_break\" then";
+        if ctx.in_loop then
+            if old_in_loop_try then
+                println ctx "  _G.error(_hx_result,0);"
+            else
+                println ctx "  break";
+        println ctx "elseif not _hx_status then ";
+        let bend = open_block ctx in
+        newline ctx;
+        print ctx "local %s = _hx_result" vname;
+        let last = ref false in
+        let else_block = ref false in
+        List.iter (fun (v,e) ->
+            if !last then () else
+                let t = (match follow v.v_type with
+                    | TEnum (e,_) -> Some (TEnumDecl e)
+                    | TInst (c,_) -> Some (TClassDecl c)
+                    | TAbstract (a,_) -> Some (TAbstractDecl a)
+                    | TFun _
+                    | TLazy _
+                    | TType _
+                    | TAnon _ ->
+                        assert false
+                    | TMono _
+                    | TDynamic _ ->
+                        None
+                ) in
+                match t with
+                | None ->
+                    last := true;
+                    if !else_block then print ctx "";
+                    if vname <> v.v_name then begin
+                        newline ctx;
+                        print ctx "local %s = %s" v.v_name vname;
+                    end;
+                    gen_block_element ctx e;
+                    if !else_block then begin
+                        newline ctx;
+                        print ctx " end ";
+                    end
+                | Some t ->
+                    if not !else_block then newline ctx;
+                    print ctx "if( %s.__instanceof(%s," (ctx.type_accessor (TClassDecl { null_class with cl_path = ["lua"],"Boot" })) vname;
+                    gen_value ctx (mk (TTypeExpr t) (mk_mono()) e.epos);
+                    spr ctx ") ) then ";
+                    let bend = open_block ctx in
+                    if vname <> v.v_name then begin
+                        newline ctx;
+                        print ctx "local %s = %s" v.v_name vname;
+                    end;
+                    gen_block_element ctx e;
+                    bend();
+                    newline ctx;
+                    spr ctx "else";
+                    else_block := true
+        ) catchs;
+        if not !last then begin
+            println ctx " _G.error(%s)" vname;
+            spr ctx "end";
+        end;
+        bend();
+        newline ctx;
+        println ctx "elseif _hx_result ~= _hx_pcall_default then";
+        println ctx "  return _hx_result";
+        print ctx "end";
+    | TSwitch (e,cases,def) ->
+        List.iteri (fun cnt (el,e2) ->
+            if cnt == 0 then spr ctx "if "
+            else (newline ctx; spr ctx "elseif ");
+            List.iteri (fun ccnt e3 ->
+                if ccnt > 0 then spr ctx " or ";
+                gen_value ctx e;
+                spr ctx " == ";
+                gen_value ctx e3;
+            ) el;
+            print ctx " then ";
+            let bend = open_block ctx in
+            gen_block_element ctx e2;
+            bend();
+        ) cases;
+        (match def with
+         | None -> spr ctx " end"
+         | Some e ->
+             begin
+                 if (List.length(cases) > 0) then
+                     spr ctx "else";
+                 let bend = open_block ctx in
+                 bend();
+                 gen_block_element ctx e;
+                 if (List.length(cases) > 0) then
+                     spr ctx " end";
+             end;);
+    | TCast (e1,Some t) ->
+        print ctx "%s.__cast(" (ctx.type_accessor (TClassDecl { null_class with cl_path = ["lua"],"Boot" }));
+        gen_expr ctx e1;
+        spr ctx " , ";
+        spr ctx (ctx.type_accessor t);
+        spr ctx ")"
+    | TCast (e1,None) ->
+        gen_value ctx e1;
+    | TIdent s ->
+        spr ctx s
 end;
 
-(* gen_block_element handles expressions that map to "statements" in lua. *)
-(* It handles no-op situations, and ensures that expressions are formatted with newlines *)
+    (* gen_block_element handles expressions that map to "statements" in lua. *)
+    (* It handles no-op situations, and ensures that expressions are formatted with newlines *)
 and gen_block_element ctx e  =
     ctx.iife_assign <- false;
     begin match e.eexpr with
-	| TTypeExpr _ | TConst _ | TLocal _ | TFunction _ ->
-		()
-	| TCast (e',_) | TParenthesis e' | TMeta (_,e') ->
-		gen_block_element ctx e'
-	| TArray (e1,e2) ->
-		gen_block_element ctx e1;
-		gen_block_element ctx e2;
-	| TArrayDecl el | TBlock el ->
-		List.iter (gen_block_element ctx) el;
-	(* For plain lua table instantiations, just capture argument operations *)
-	| TCall({ eexpr = TLocal { v_name = "__lua_table__" }} , el) ->
-		List.iter(fun x -> gen_block_element ctx x) el
-	(* make a no-op __define_feature__ expression possible *)
-	| TCall({eexpr = TLocal ({v_name = "__define_feature__"})}, [_;e]) ->
-		gen_block_element ctx e
-	| TObjectDecl fl ->
-		List.iter (fun (_,e) -> gen_block_element ctx e) fl
-	| TBinop (op,e1,e2) when op <> Ast.OpAssign ->
-		newline ctx;
-		let f () = gen_tbinop ctx op e1 e2 in
-		gen_iife_assign ctx f;
-	| TUnop ((Increment|Decrement) as op,_,e) ->
-		newline ctx;
-		gen_expr ctx e;
-		print ctx " = ";
-		gen_expr ctx e;
-		(match op with
-			| Increment -> print ctx " + 1;"
-			| _ -> print ctx " - 1;"
-		)
-	| TSwitch (e,[],def) ->
-		(match def with
-		| None -> ()
-		| Some e -> gen_block_element ctx e)
-	| TField _ ->
-		newline ctx;
-		let f () = gen_expr ctx e in
-		gen_iife_assign ctx f;
-		semicolon ctx;
-	| TCall ({ eexpr = TLocal { v_name = "__feature__" } }, { eexpr = TConst (TString f) } :: eif :: eelse) ->
-		if has_feature ctx f then
-			gen_block_element ctx eif
-		else (match eelse with
-			| [] -> ()
-			| [e] -> gen_block_element ctx e
-			| _ -> assert false)
-	| _ ->
-		newline ctx;
-		gen_expr ctx e;
-		semicolon ctx;
-	end;
-
-(* values generated in anon structures can get modified.  Functions are bind-ed *)
-(* and include a dummy "self" leading variable so they can be called like normal *)
-(* instance methods *)
+        | TTypeExpr _ | TConst _ | TLocal _ | TFunction _ ->
+            ()
+        | TCast (e1, Some t)->
+            print ctx "%s.__cast(" (ctx.type_accessor (TClassDecl { null_class with cl_path = ["lua"],"Boot" }));
+            gen_expr ctx e1;
+            spr ctx " , ";
+            spr ctx (ctx.type_accessor t);
+            spr ctx ")"
+        | TCast (e', None) | TParenthesis e' | TMeta (_,e') ->
+            gen_block_element ctx e'
+        | TArray (e1,e2) ->
+            gen_block_element ctx e1;
+            gen_block_element ctx e2;
+        | TArrayDecl el | TBlock el ->
+            List.iter (gen_block_element ctx) el;
+            (* For plain lua table instantiations, just capture argument operations *)
+        | TCall({ eexpr = TIdent "__lua_table__"} , el) ->
+            List.iter(fun x -> gen_block_element ctx x) el
+        (* make a no-op __define_feature__ expression possible *)
+        | TCall({eexpr = TIdent "__define_feature__"}, [_;e]) ->
+            gen_block_element ctx e
+        | TObjectDecl fl ->
+            List.iter (fun (_,e) -> gen_block_element ctx e) fl
+        | TBinop (op,e1,e2) when op <> Ast.OpAssign ->
+            newline ctx;
+            let f () = gen_tbinop ctx op e1 e2 in
+            gen_iife_assign ctx f;
+        | TUnop ((Increment|Decrement) as op,_,e) ->
+            newline ctx;
+            gen_expr ctx e;
+            print ctx " = ";
+            gen_expr ctx e;
+            (match op with
+             | Increment -> print ctx " + 1;"
+             | _ -> print ctx " - 1;"
+            )
+        | TSwitch (e,[],def) ->
+            (match def with
+             | None -> ()
+             | Some e -> gen_block_element ctx e)
+        | TField _ ->
+            newline ctx;
+            let f () = gen_expr ctx e in
+            gen_iife_assign ctx f;
+            semicolon ctx;
+        | TCall ({ eexpr = TIdent "__feature__" }, { eexpr = TConst (TString f) } :: eif :: eelse) ->
+            if has_feature ctx f then
+                gen_block_element ctx eif
+            else (match eelse with
+                | [] -> ()
+                | [e] -> gen_block_element ctx e
+                | _ -> assert false)
+        | _ ->
+            newline ctx;
+            gen_expr ctx e;
+            semicolon ctx;
+    end;
+
+and is_const_null e =
+    match e.eexpr with
+    | TConst TNull ->
+        true
+    | _ ->
+        false
+
+    (* values generated in anon structures can get modified.  Functions are bind-ed *)
+    (* and include a dummy "self" leading variable so they can be called like normal *)
+    (* instance methods *)
 and gen_anon_value ctx e =
     match e with
     | { eexpr = TFunction f} ->
-	let old = ctx.in_value, ctx.in_loop in
-	ctx.in_value <- None;
-	ctx.in_loop <- false;
-	print ctx "function(%s) " (String.concat "," ("self" :: (List.map ident (List.map arg_name f.tf_args))));
-	let fblock = fun_block ctx f e.epos in
-	(match fblock.eexpr with
-	| TBlock el ->
-		let bend = open_block ctx in
-		List.iter (gen_block_element ctx) el;
-	    bend();
-	    newline ctx;
-	|_ -> ());
-	spr ctx "end";
-	ctx.in_value <- fst old;
-	ctx.in_loop <- snd old;
-	ctx.separator <- true
-    | { etype = TFun (args, ret)}  ->
-	spr ctx "function(_,...) return ";
-	gen_value ctx e;
-	spr ctx "(...) end";
+        let old = ctx.in_value, ctx.in_loop in
+        ctx.in_value <- None;
+        ctx.in_loop <- false;
+        print ctx "function(%s) " (String.concat "," ("self" :: (List.map ident (List.map arg_name f.tf_args))));
+        let fblock = fun_block ctx f e.epos in
+        (match fblock.eexpr with
+         | TBlock el ->
+             let bend = open_block ctx in
+             List.iter (gen_block_element ctx) el;
+             bend();
+             newline ctx;
+         |_ -> ());
+        spr ctx "end";
+        ctx.in_value <- fst old;
+        ctx.in_loop <- snd old;
+        ctx.separator <- true
+    | _ when (is_function_type e.etype) && not (is_const_null e) ->
+        spr ctx "function(_,...) return ";
+        gen_value ctx e;
+        spr ctx "(...) end";
     | _->
-	gen_value ctx e
+        gen_value ctx e
 
 and gen_value ctx e =
-	let assign e =
-		mk (TBinop (Ast.OpAssign,
-			mk (TLocal (match ctx.in_value with None -> assert false | Some v -> v)) t_dynamic e.epos,
-			e
-		)) e.etype e.epos
-	in
-	let value() =
-		let old = ctx.in_value, ctx.in_loop in
-		let r_id = temp ctx in
-		let r = alloc_var r_id t_dynamic e.epos in
-		ctx.in_value <- Some r;
-		ctx.in_loop <- false;
-		spr ctx "(function() ";
-		let b = open_block ctx in
-		newline ctx;
-		println ctx "local %s" r_id;
-		(fun() ->
-			newline ctx;
-			spr ctx ("return " ^ r_id);
-			b();
-			newline ctx;
-			ctx.in_value <- fst old;
-			ctx.in_loop <- snd old;
-			spr ctx "end )()"
-		)
-	in
-	match e.eexpr with
-	| TBinop (OpAssign, e1, e2) ->
-		spr ctx "(function() ";
-		gen_block_element ctx e;
-		spr ctx " return ";
-		gen_value ctx e1;
-		spr ctx " end)()";
-	| TConst _
-	| TLocal _
-	| TArray _
-	| TBinop _
-	| TField _
-	| TEnumParameter _
-	| TTypeExpr _
-	| TParenthesis _
-	| TObjectDecl _
-	| TArrayDecl _
-	| TNew _
-	| TUnop _
-	| TFunction _ ->
-		gen_expr ctx e
-	| TMeta (_,e1) ->
-		gen_value ctx e1
-	| TCall (e,el) ->
-		gen_call ctx e el true
-	| TReturn _
-	| TBreak
-	| TContinue ->
-		unsupported e.epos
-	(* TODO: this is just a hack because this specific case is a TestReflect unit test. I don't know how to address this properly
-	   at the moment. - Simon *)
-	| TCast ({ eexpr = TTypeExpr mt } as e1, None) when (match mt with TClassDecl {cl_path = ([],"Array")} -> false | _ -> true) ->
-	    add_feature ctx "use._hx_staticToInstance";
-	    spr ctx "_hx_staticToInstance(";
-	    gen_expr ctx e1;
-	    spr ctx ")";
-	| TCast (e1, Some t) ->
-		print ctx "%s.__cast(" (ctx.type_accessor (TClassDecl { null_class with cl_path = ["lua"],"Boot" }));
-		gen_value ctx e1;
-		spr ctx " , ";
-		spr ctx (ctx.type_accessor t);
-		spr ctx ")"
-	| TCast (e1, _) ->
-		gen_value ctx e1
-	| TVar _
-	| TFor _
-	| TWhile _
-	| TThrow _ ->
-		(* value is discarded anyway *)
-		let v = value() in
-		gen_expr ctx e;
-		v()
-	| TBlock [e] ->
-		gen_value ctx e
-	| TBlock el ->
-		let v = value() in
-		let rec loop = function
-			| [] ->
-				spr ctx "return nil";
-			| [e] ->
-				gen_block_element ctx (assign e);
-			| e :: l ->
-				gen_block_element ctx e;
-				newline ctx;
-				loop l
-		in
-		loop el;
-		v();
-	| TIf (cond,e,eo) ->
-		let v = value() in
-		spr ctx "if ";
-		gen_cond ctx cond;
-		spr ctx " then ";
-		gen_block_element ctx (assign e);
-		let rec gen_elseif ctx e =
-		(match e with
-		| None->();
-		| Some e2->
-		    (match e2.eexpr with
-		    | TIf(cond3, e3, eo3) ->
-			spr ctx " elseif ";
-			gen_cond ctx cond3;
-			spr ctx " then ";
-			gen_block_element ctx (assign e3);
-			gen_elseif ctx eo3;
-		    | _ ->
-			spr ctx " else ";
-			gen_block_element ctx (assign e2);
-		    ));
-		in
-		gen_elseif ctx eo;
-		spr ctx " end";
-		v()
-	| TSwitch (cond,cases,def) ->
-		let v = value() in
-		gen_expr ctx (mk (TSwitch (cond,
-			List.map (fun (e1,e2) -> (e1,assign e2)) cases,
-			match def with None -> None | Some e -> Some (assign e)
-		)) e.etype e.epos);
-		v()
-	| TTry (b,catchs) ->
-		let v = value() in
-		let block e = mk (TBlock [e]) e.etype e.epos in
-		gen_block_element ctx (mk (TTry (block (assign b),
-			List.map (fun (v,e) -> v, block (assign e)) catchs
-		)) e.etype e.epos);
-		v()
-
-and is_function_type ctx t =
-    match t with
-    | TFun _ -> true
-    | TMono r -> (match !r with | Some (TFun _) -> true | _ -> false)
-    | _ -> false;
+    let assign e =
+        mk (TBinop (Ast.OpAssign,
+                    mk (TLocal (match ctx.in_value with None -> assert false | Some v -> v)) t_dynamic e.epos,
+                    e
+                   )) e.etype e.epos
+    in
+    let value() =
+        let old = ctx.in_value, ctx.in_loop in
+        let r_id = temp ctx in
+        let r = alloc_var VGenerated r_id t_dynamic e.epos in
+        ctx.in_value <- Some r;
+        ctx.in_loop <- false;
+        spr ctx "(function() ";
+        let b = open_block ctx in
+        newline ctx;
+        println ctx "local %s" r_id;
+        (fun() ->
+             newline ctx;
+             spr ctx ("return " ^ r_id);
+             b();
+             newline ctx;
+             ctx.in_value <- fst old;
+             ctx.in_loop <- snd old;
+             spr ctx "end )()"
+        )
+    in
+    match e.eexpr with
+    | TBinop (OpAssign, e1, e2) ->
+        spr ctx "(function() ";
+        gen_block_element ctx e;
+        spr ctx " return ";
+        gen_value ctx e1;
+        spr ctx " end)()";
+    | TConst _
+    | TLocal _
+    | TArray _
+    | TBinop _
+    | TField _
+    | TEnumParameter _
+    | TEnumIndex _
+    | TTypeExpr _
+    | TParenthesis _
+    | TObjectDecl _
+    | TArrayDecl _
+    | TNew _
+    | TUnop _
+    | TFunction _
+    | TIdent _ ->
+        gen_expr ctx e
+    | TMeta (_,e1) ->
+        gen_value ctx e1
+    | TCall (e,el) ->
+        gen_call ctx e el
+    | TReturn _
+    | TBreak
+    | TContinue ->
+        unsupported e.epos
+    | TCast (e1, Some t) ->
+        print ctx "%s.__cast(" (ctx.type_accessor (TClassDecl { null_class with cl_path = ["lua"],"Boot" }));
+        gen_value ctx e1;
+        spr ctx " , ";
+        spr ctx (ctx.type_accessor t);
+        spr ctx ")"
+    | TCast (e1, _) ->
+        gen_value ctx e1
+    | TVar _
+    | TFor _
+    | TWhile _
+    | TThrow _ ->
+        (* value is discarded anyway *)
+        let v = value() in
+        gen_expr ctx e;
+        v()
+    | TBlock [e] ->
+        gen_value ctx e
+    | TBlock el ->
+        let v = value() in
+        let rec loop = function
+            | [] ->
+                spr ctx "return nil";
+            | [e] ->
+                gen_block_element ctx (assign e);
+            | e :: l ->
+                gen_block_element ctx e;
+                newline ctx;
+                loop l
+        in
+        loop el;
+        v();
+    | TIf (cond,e,eo) ->
+        let v = value() in
+        spr ctx "if ";
+        gen_cond ctx cond;
+        spr ctx " then ";
+        gen_block_element ctx (assign e);
+        let rec gen_elseif ctx e =
+            (match e with
+             | None->();
+             | Some e2->
+                 (match e2.eexpr with
+                  | TIf(cond3, e3, eo3) ->
+                      spr ctx " elseif ";
+                      gen_cond ctx cond3;
+                      spr ctx " then ";
+                      gen_block_element ctx (assign e3);
+                      gen_elseif ctx eo3;
+                  | _ ->
+                      spr ctx " else ";
+                      gen_block_element ctx (assign e2);
+                 ));
+        in
+        gen_elseif ctx eo;
+        spr ctx " end";
+        v()
+    | TSwitch (cond,cases,def) ->
+        let v = value() in
+        gen_expr ctx (mk (TSwitch (cond,
+                                   List.map (fun (e1,e2) -> (e1,assign e2)) cases,
+                                   match def with None -> None | Some e -> Some (assign e)
+                                  )) e.etype e.epos);
+        v()
+    | TTry (b,catchs) ->
+        let v = value() in
+        let block e = mk (TBlock [e]) e.etype e.epos in
+        gen_block_element ctx (mk (TTry (block (assign b),
+                                         List.map (fun (v,e) -> v, block (assign e)) catchs
+                                        )) e.etype e.epos);
+        v()
 
 and gen_tbinop ctx op e1 e2 =
     (match op, e1.eexpr, e2.eexpr with
-    | Ast.OpAssign, TField(e3, FInstance _), TFunction f ->
-	    gen_expr ctx e1;
-	    spr ctx " = " ;
-	    print ctx "function(%s) " (String.concat "," ("self" :: List.map ident (List.map arg_name f.tf_args)));
-	    let fblock = fun_block ctx f e1.epos in
-	    (match fblock.eexpr with
-	    | TBlock el ->
-		    let rec loop ctx el = (match el with
-		    | [hd] -> (match hd.eexpr with
-			    | TReturn eo -> begin
-				    newline ctx;
-				    gen_return ctx e1 eo;
-				end;
-			    | _ -> gen_block_element ctx hd);
-		    | hd :: tl ->
-			    gen_block_element ctx hd;
-			    loop ctx tl
-		    |[] ->()
-		    ) in
-		    let bend = open_block ctx in
-		    loop ctx el;
-		    bend();
-		    newline ctx;
-	    | _ -> gen_value ctx e2);
-	    spr ctx " end"
-    | Ast.OpAssign, _, _ ->
-	    let iife_assign = ctx.iife_assign in
-	    if iife_assign then spr ctx "(function() ";
-	    (match e1.eexpr, e2.eexpr with
-	    | _, TBinop(OpAssign as op, e3, e4) ->
-		gen_tbinop ctx op e3 e4;
-		newline ctx;
-		gen_value ctx e1;
-		spr ctx " = ";
-		gen_value ctx e3;
-	    | TField(e3, FInstance _ ), TField(e4, FClosure _ )  ->
-		gen_value ctx e1;
-		print ctx " %s " (Ast.s_binop op);
-		add_feature ctx "use._hx_funcToField";
-		spr ctx "_hx_funcToField(";
-		gen_value ctx e2;
-		spr ctx ")";
-	    | TField(_, FInstance _ ), TLocal t  when (is_function_type ctx t.v_type)   ->
-		gen_value ctx e1;
-		print ctx " %s " (Ast.s_binop op);
-		add_feature ctx "use._hx_funcToField";
-		spr ctx "_hx_funcToField(";
-		gen_value ctx e2;
-		spr ctx ")";
-	    | _ ->
-		gen_value ctx e1;
-		print ctx " %s " (Ast.s_binop op);
-		gen_value ctx e2);
-	    if iife_assign then begin
-		spr ctx " return ";
-		gen_value ctx e1;
-		spr ctx " end)()";
-	    end;
-    | Ast.OpAssignOp(op2), TArray(e3,e4), _ ->
-	    (* TODO: Figure out how to rewrite this expression more cleanly *)
-	    println ctx "(function() ";
-	    let idx = alloc_var "idx" e4.etype e4.epos in
-	    let idx_var =  mk (TVar( idx , Some(e4))) e4.etype e4.epos in
-	    gen_expr ctx idx_var;
-	    let arr = alloc_var "arr" e3.etype e3.epos in
-	    let arr_var = mk (TVar(arr, Some(e3))) e3.etype e3.epos in
-	    gen_expr ctx arr_var;
-	    newline ctx;
-	    let arr_expr = (mk (TArray(
-	    	(mk ( TLocal(arr)) e3.etype e3.epos),
-	    	(mk ( TLocal(idx)) e4.etype e4.epos)
-	    	)) e3.etype e3.epos) in
-	    spr ctx "arr[idx] = ";
-	    gen_tbinop ctx op2 arr_expr e2; semicolon ctx; newline ctx;
-	    spr ctx "return arr[idx]";
-	    spr ctx " end)()";
-    | Ast.OpAssignOp(op2), TField(e3,e4), _ ->
-	    (* TODO: Figure out how to rewrite this expression more cleanly *)
-	    println ctx "(function() ";
-	    let obj = alloc_var "obj" e3.etype e3.epos in
-	    spr ctx "local fld = ";
-	    (match e4 with
-	    | FInstance(_,_,fld)
-	    | FStatic(_,fld)
-	    | FAnon fld
-	    | FClosure(_,fld) ->
-		    print ctx "'%s'" fld.cf_name;
-	    | FDynamic name ->
-		    print ctx "'%s'" name;
-	    | FEnum(_,efld) ->
-		    print ctx "'%s'" efld.ef_name);
-	    semicolon ctx; newline ctx;
-	    let obj_var = mk (TVar(obj, Some(e3))) e3.etype e3.epos in
-	    gen_expr ctx obj_var;
-	    newline ctx;
-	    let obj_expr = (mk (TField(
-	    	(mk ( TLocal(obj)) e3.etype e3.epos),
-		e4
-	    	)) e3.etype e3.epos) in
-	    spr ctx "obj[fld] = ";
-	    gen_tbinop ctx op2 obj_expr e2; semicolon ctx; newline ctx;
-	    spr ctx "return obj[fld]";
-	    spr ctx " end)()";
-    | Ast.OpAssignOp(op2),_,_ ->
-	    (* TODO: Rewrite expression *)
-	    spr ctx "(function() "; gen_value ctx e1;
-	    spr ctx " = "; gen_tbinop ctx op2 e1 e2;
-	    spr ctx " return "; gen_value ctx e1;
-	    spr ctx " end)()";
-    | Ast.OpXor,_,_ | Ast.OpAnd,_,_  | Ast.OpShl,_,_ | Ast.OpShr,_,_ | Ast.OpUShr,_,_ | Ast.OpOr,_,_ ->
-	    gen_bitop ctx op e1 e2;
-    | Ast.OpMod,_,_ ->
-	    spr ctx "_G.math.fmod(";
-	    gen_expr ctx e1;
-	    spr ctx ", ";
-	    gen_expr ctx e2;
-	    spr ctx ")";
-    | Ast.OpAdd,_,_ when (is_string_expr e1 || is_string_expr e2) ->
-	    gen_value ctx e1;
-	    print ctx " .. ";
-	    gen_value ctx e2;
-    | _ -> begin
-	    (* wrap expressions used in comparisons for lua *)
-	    gen_paren_tbinop ctx e1;
-	    (match op with
-		| Ast.OpNotEq -> print ctx " ~= ";
-		| Ast.OpBoolAnd -> print ctx " and ";
-		| Ast.OpBoolOr -> print ctx " or ";
-		| _ -> print ctx " %s " (Ast.s_binop op));
-	    gen_paren_tbinop ctx e2;
-	    end;
+     | Ast.OpAssign, TField(e3, FInstance _), TFunction f ->
+         gen_expr ctx e1;
+         spr ctx " = " ;
+         print ctx "function(%s) " (String.concat "," ("self" :: List.map ident (List.map arg_name f.tf_args)));
+         let fblock = fun_block ctx f e1.epos in
+         (match fblock.eexpr with
+          | TBlock el ->
+              let rec loop ctx el = (match el with
+                  | [hd] -> (match hd.eexpr with
+                      | TReturn eo -> begin
+                              newline ctx;
+                              gen_return ctx e1 eo;
+                          end;
+                      | _ -> gen_block_element ctx hd);
+                  | hd :: tl ->
+                      gen_block_element ctx hd;
+                      loop ctx tl
+                  |[] ->()
+              ) in
+              let bend = open_block ctx in
+              loop ctx el;
+              bend();
+              newline ctx;
+          | _ -> gen_value ctx e2);
+         spr ctx " end"
+     | Ast.OpAssign, _, _ ->
+         let iife_assign = ctx.iife_assign in
+         if iife_assign then spr ctx "(function() ";
+         (match e1.eexpr, e2.eexpr with
+          | _, TBinop(OpAssign as op, e3, e4) ->
+              gen_tbinop ctx op e3 e4;
+              newline ctx;
+              gen_value ctx e1;
+              spr ctx " = ";
+              gen_value ctx e3;
+          | TField(e3, (FInstance _| FClosure _ | FAnon _ ) ), TField(e4, (FClosure _| FStatic _ | FAnon _) )  ->
+              gen_value ctx e1;
+              print ctx " %s " (Ast.s_binop op);
+              add_feature ctx "use._hx_funcToField";
+              spr ctx "_hx_funcToField(";
+              gen_value ctx e2;
+              spr ctx ")";
+          | TField(_, FInstance _ ), TLocal t  when (is_function_type t.v_type)   ->
+              gen_value ctx e1;
+              print ctx " %s " (Ast.s_binop op);
+              add_feature ctx "use._hx_funcToField";
+              spr ctx "_hx_funcToField(";
+              gen_value ctx e2;
+              spr ctx ")";
+          | _, TCast ({ eexpr = TTypeExpr mt } as e1, None) when (match mt with TClassDecl {cl_path = ([],"Array")} -> false | _ -> true) ->
+              add_feature ctx "use._hx_staticToInstance";
+              gen_value ctx e1;
+              print ctx " %s " (Ast.s_binop op);
+              spr ctx "_hx_staticToInstance(";
+              gen_expr ctx e2;
+              spr ctx ")";
+          | _ ->
+              gen_value ctx e1;
+              print ctx " %s " (Ast.s_binop op);
+              gen_value ctx e2);
+         if iife_assign then begin
+             spr ctx " return ";
+             gen_value ctx e1;
+             spr ctx " end)()";
+         end;
+     | Ast.OpAssignOp(op2), TArray(e3,e4), _ ->
+         (* TODO: Figure out how to rewrite this expression more cleanly *)
+         println ctx "(function() ";
+         let idx = alloc_var VGenerated "idx" e4.etype e4.epos in
+         let idx_var =  mk (TVar( idx , Some(e4))) e4.etype e4.epos in
+         gen_expr ctx idx_var;
+         let arr = alloc_var VGenerated "arr" e3.etype e3.epos in
+         let arr_var = mk (TVar(arr, Some(e3))) e3.etype e3.epos in
+         gen_expr ctx arr_var;
+         newline ctx;
+         let arr_expr = (mk (TArray(
+             (mk ( TLocal(arr)) e3.etype e3.epos),
+             (mk ( TLocal(idx)) e4.etype e4.epos)
+         )) e3.etype e3.epos) in
+         spr ctx "arr[idx] = ";
+         gen_tbinop ctx op2 arr_expr e2; semicolon ctx; newline ctx;
+         spr ctx "return arr[idx]";
+         spr ctx " end)()";
+     | Ast.OpAssignOp(op2), TField(e3,e4), _ ->
+         (* TODO: Figure out how to rewrite this expression more cleanly *)
+         println ctx "(function() ";
+         let obj = alloc_var VGenerated "obj" e3.etype e3.epos in
+         spr ctx "local fld = ";
+         (match e4 with
+          | FInstance(_,_,fld)
+          | FStatic(_,fld)
+          | FAnon fld
+          | FClosure(_,fld) ->
+              print ctx "'%s'" fld.cf_name;
+          | FDynamic name ->
+              print ctx "'%s'" name;
+          | FEnum(_,efld) ->
+              print ctx "'%s'" efld.ef_name);
+         semicolon ctx; newline ctx;
+         let obj_var = mk (TVar(obj, Some(e3))) e3.etype e3.epos in
+         gen_expr ctx obj_var;
+         newline ctx;
+         let obj_expr = (mk (TField(
+             (mk ( TLocal(obj)) e3.etype e3.epos),
+             e4
+         )) e3.etype e3.epos) in
+         spr ctx "obj[fld] = ";
+         gen_tbinop ctx op2 obj_expr e2; semicolon ctx; newline ctx;
+         spr ctx "return obj[fld]";
+         spr ctx " end)()";
+     | Ast.OpAssignOp(op2),_,_ ->
+         (* TODO: Rewrite expression *)
+         spr ctx "(function() "; gen_value ctx e1;
+         spr ctx " = "; gen_tbinop ctx op2 e1 e2;
+         spr ctx " return "; gen_value ctx e1;
+         spr ctx " end)()";
+     | Ast.OpXor,_,_ | Ast.OpAnd,_,_  | Ast.OpShl,_,_ | Ast.OpShr,_,_ | Ast.OpUShr,_,_ | Ast.OpOr,_,_ ->
+         gen_bitop ctx op e1 e2;
+     | Ast.OpMod,_,_ ->
+         spr ctx "_G.math.fmod(";
+         gen_expr ctx e1;
+         spr ctx ", ";
+         gen_expr ctx e2;
+         spr ctx ")";
+     | Ast.OpAdd, _, _ when (is_dynamic_expr e1 && is_dynamic_expr e2) ->
+         add_feature ctx "use._hx_dyn_add";
+         spr ctx "_hx_dyn_add(";
+         gen_value ctx e1;
+         spr ctx ",";
+         gen_value ctx e2;
+         spr ctx ")";
+     | Ast.OpAdd,_,_ when (is_string_expr e1 || is_string_expr e2) ->
+         spr ctx "Std.string(";
+         gen_value ctx e1;
+         spr ctx ") .. Std.string(";
+         gen_value ctx e2;
+         spr ctx ")";
+     | _ -> begin
+             (* wrap expressions used in comparisons for lua *)
+             gen_paren_tbinop ctx e1;
+             (match op with
+              | Ast.OpNotEq -> print ctx " ~= ";
+              | Ast.OpBoolAnd -> print ctx " and ";
+              | Ast.OpBoolOr -> print ctx " or ";
+              | _ -> print ctx " %s " (Ast.s_binop op));
+             gen_paren_tbinop ctx e2;
+         end;
     );
 
 and gen_paren_tbinop ctx e =
     let ee = extract_expr e in
     match ee.eexpr with
     | TBinop _  ->
-	    spr ctx "(";
-	    gen_value ctx ee;
-	    spr ctx ")";
+        gen_paren ctx [ee];
     | _ ->
-	    gen_value ctx ee
+        gen_value ctx ee
 
 and gen_bitop ctx op e1 e2 =
     add_feature ctx "use._bitop";
     print ctx "_hx_bit.%s(" (match op with
-	| Ast.OpXor  ->  "bxor"
-	| Ast.OpAnd  ->  "band"
-	| Ast.OpShl  ->  "lshift"
-	| Ast.OpShr  ->  "arshift"
-	| Ast.OpUShr ->  "rshift"
-	| Ast.OpOr   ->  "bor"
-	| _ -> "");
+        | Ast.OpXor  ->  "bxor"
+        | Ast.OpAnd  ->  "band"
+        | Ast.OpShl  ->  "lshift"
+        | Ast.OpShr  ->  "arshift"
+        | Ast.OpUShr ->  "rshift"
+        | Ast.OpOr   ->  "bor"
+        | _ -> "");
     gen_value ctx e1;
     spr ctx ",";
     gen_value ctx e2;
@@ -1349,30 +1455,35 @@ and gen_bitop ctx op e1 e2 =
 and gen_return ctx e eo =
     if ctx.in_value <> None then unsupported e.epos;
     (match eo with
-    | None ->
-	    spr ctx "do return end"
-    | Some e ->
-	    (match e.eexpr with
-	    | TBinop(OpAssign, e1, e2) ->
-		gen_expr ctx e;
-		spr ctx " do return ";
-		gen_value ctx e1;
-		spr ctx " end";
-	    | _ ->
-		spr ctx "do return ";
-		gen_value ctx e;
-		spr ctx " end");
-	)
+     | None ->
+         spr ctx "do return end"
+     | Some e ->
+         (match e.eexpr with
+          | TField (e2, ((FClosure (_, tcf) | FAnon tcf |FInstance (_,_,tcf)))) when (is_function_type tcf.cf_type) ->
+              (* See issue #6259 *)
+              add_feature ctx "use._hx_bind";
+              spr ctx "do return ";
+              print ctx "_hx_bind(";
+              gen_value ctx e2;
+              spr ctx ",";
+              gen_value ctx e;
+              spr ctx ") end";
+          | TBinop(OpAssign, e1, e2) ->
+              gen_expr ctx e;
+              spr ctx " do return ";
+              gen_value ctx e1;
+              spr ctx " end";
+          | _ ->
+              spr ctx "do return ";
+              gen_value ctx e;
+              spr ctx " end");
+    )
 
 and gen_iife_assign ctx f =
     spr ctx "(function() return ";
     f();
     spr ctx " end)()";
 
-and gen_cond ctx cond =
-    ctx.iife_assign <- true;
-    gen_value ctx cond;
-    ctx.iife_assign <- false;
 
 and has_class ctx c =
     has_feature ctx "lua.Boot.getClass" && (c.cl_super <> None || c.cl_ordered_fields <> [] || c.cl_constructor <> None)
@@ -1381,738 +1492,647 @@ and has_prototype ctx c =
     c.cl_super <> None || (has_class ctx c) || List.exists (can_gen_class_field ctx) c.cl_ordered_fields
 
 and can_gen_class_field ctx = function
-	| { cf_expr = (None | Some { eexpr = TConst TNull }) } when not (has_feature ctx "Type.getInstanceFields") ->
-		false
-	| f ->
-		not (is_extern_field f)
+    | { cf_expr = (None | Some { eexpr = TConst TNull }) } when not (has_feature ctx "Type.getInstanceFields") ->
+        false
+    | f ->
+        is_physical_field f
 
-and has_continue e =
-    let rec loop e = match e.eexpr with
-	| TContinue -> raise Exit
-	| TWhile(e1,_,_) | TFor(_,e1,_) -> loop e1 (* in theory there could be a continue there. Note that we don't want to recurse into the loop body because we do not care about inner continue expressions *)
-	| _ -> Type.iter loop e
-    in
-    try
-	loop e;
-	false;
-    with Exit ->
-	true
 
 let check_multireturn ctx c =
     match c with
     | _ when Meta.has Meta.MultiReturn c.cl_meta ->
-	    if not c.cl_extern then
-		abort "MultiReturns must be externs" c.cl_pos
-	    else if List.length c.cl_ordered_statics > 0 then
-		abort "MultiReturns must not contain static fields" c.cl_pos
-		else if (List.exists (fun cf -> match cf.cf_kind with Method _ -> true | _-> false) c.cl_ordered_fields) then
-		    abort "MultiReturns must not contain methods" c.cl_pos;
+        if not c.cl_extern then
+            error "MultiReturns must be externs" c.cl_pos
+        else if List.length c.cl_ordered_statics > 0 then
+            error "MultiReturns must not contain static fields" c.cl_pos
+        else if (List.exists (fun cf -> match cf.cf_kind with Method _ -> true | _-> false) c.cl_ordered_fields) then
+            error "MultiReturns must not contain methods" c.cl_pos;
     | {cl_super = Some(csup,_)} when Meta.has Meta.MultiReturn csup.cl_meta ->
-	    abort "Cannot extend a MultiReturn" c.cl_pos
+        error "Cannot extend a MultiReturn" c.cl_pos
     | _ -> ()
 
 
-let generate_package_create ctx (p,_) =
-	let rec loop acc = function
-		| [] -> ()
-		| p :: l when Hashtbl.mem ctx.packages (p :: acc) -> loop (p :: acc) l
-		| p :: l ->
-			Hashtbl.add ctx.packages (p :: acc) ();
-			(match acc with
-			| [] -> print ctx "local %s = {}" p
-			| _ ->
-				let p = String.concat "." (List.rev acc) ^ (field p) in
-				print ctx "%s = {}" p
-			);
-			ctx.separator <- true;
-			newline ctx;
-			loop (p :: acc) l
-	in
-	match p with
-	| [] -> print ctx "local "
-	| _ -> loop [] p
-
 let check_field_name c f =
-	match f.cf_name with
-	| "prototype" | "__proto__" | "constructor" ->
-		abort ("The field name '" ^ f.cf_name ^ "'  is not allowed in Lua") (match f.cf_expr with None -> c.cl_pos | Some e -> e.epos);
-	| _ -> ()
+    match f.cf_name with
+    | "prototype" | "__proto__" | "constructor" ->
+        error ("The field name '" ^ f.cf_name ^ "'  is not allowed in Lua") (match f.cf_expr with None -> c.cl_pos | Some e -> e.epos);
+    | _ -> ()
 
 (* convert a.b.c to ["a"]["b"]["c"] *)
 let path_to_brackets path =
-	let parts = ExtString.String.nsplit path "." in
-	"[\"" ^ (String.concat "\"][\"" parts) ^ "\"]"
+    let parts = ExtString.String.nsplit path "." in
+    "[\"" ^ (String.concat "\"][\"" parts) ^ "\"]"
 
 let gen_class_static_field ctx c f =
-	match f.cf_expr with
-	| None | Some { eexpr = TConst TNull } when not (has_feature ctx "Type.getClassFields") ->
-		()
-	| None when is_extern_field f ->
-		()
-	| None ->
-		println ctx "%s%s = nil" (s_path ctx c.cl_path) (field f.cf_name);
-	| Some e ->
-		match e.eexpr with
-		| TFunction _ ->
-			let path = (s_path ctx c.cl_path) ^ (field f.cf_name) in
-			let dot_path = (dot_path c.cl_path) ^ (static_field c f.cf_name) in
-			ctx.id_counter <- 0;
-			print ctx "%s = " path;
-			gen_value ctx e;
-			newline ctx;
-			(match (get_exposed ctx dot_path f.cf_meta) with [s] -> (print ctx "_hx_exports%s = %s" (path_to_brackets s) path; newline ctx) | _ -> ());
-		| _ ->
-			ctx.statics <- (c,f.cf_name,e) :: ctx.statics
-
-let gen_class_field ctx c f predelimit =
-	check_field_name c f;
-	if predelimit then println ctx ",";
-	match f.cf_expr with
-	| None ->
-		print ctx "'%s', nil" f.cf_name;
-	| Some e ->
-		ctx.id_counter <- 0;
-		(match e.eexpr with
-		| TFunction f2 ->
-		    let old = ctx.in_value, ctx.in_loop in
-		    ctx.in_value <- None;
-		    ctx.in_loop <- false;
-		    print ctx "'%s', function" f.cf_name;
-		    print ctx "(%s) " (String.concat "," ("self" :: List.map ident (List.map arg_name f2.tf_args)));
-		    let fblock = fun_block ctx f2 e.epos in
-		    (match fblock.eexpr with
-		    | TBlock el ->
-			let rec loop ctx el = (match el with
-			    | [hd] -> (match hd.eexpr with
-				    | TReturn eo -> begin
-					    newline ctx;
-					    gen_return ctx e eo;
-					end;
-				    | _ -> gen_block_element ctx hd);
-			    | hd :: tl ->
-				    gen_block_element ctx hd;
-				    loop ctx tl
-			    |[] ->()
-			    ) in
-			let bend = open_block ctx in
-			loop ctx el;
-			bend();
-			newline ctx;
-		    |_ -> ());
-		    spr ctx "end";
-		    ctx.in_value <- fst old;
-		    ctx.in_loop <- snd old;
-		    ctx.separator <- true;
-		| _ -> gen_value ctx e)
+    match f.cf_expr with
+    | None | Some { eexpr = TConst TNull } when not (has_feature ctx "Type.getClassFields") ->
+        ()
+    | None when not (is_physical_field f) ->
+        ()
+    | None ->
+        println ctx "%s%s = nil" (s_path ctx c.cl_path) (field f.cf_name);
+    | Some e ->
+        match e.eexpr with
+        | TFunction _ ->
+            let path = (s_path ctx c.cl_path) ^ (field f.cf_name) in
+            let dot_path = (dot_path c.cl_path) ^ (static_field c f.cf_name) in
+            ctx.id_counter <- 0;
+            print ctx "%s = " path;
+            gen_value ctx e;
+            newline ctx;
+            (match (get_exposed ctx dot_path f.cf_meta) with [s] -> (print ctx "_hx_exports%s = %s" (path_to_brackets s) path; newline ctx) | _ -> ());
+        | _ ->
+            ctx.statics <- (c,f,e) :: ctx.statics
+
+let gen_class_field ctx c f =
+    let p = s_path ctx c.cl_path in
+    check_field_name c f;
+    print ctx "%s.prototype%s" p (field f.cf_name);
+    match f.cf_expr with
+    | None ->
+        println ctx "= nil;"
+    | Some e ->
+        ctx.id_counter <- 0;
+        (match e.eexpr with
+         | TFunction f2 ->
+             let old = ctx.in_value, ctx.in_loop in
+             ctx.in_value <- None;
+             ctx.in_loop <- false;
+             print ctx " = function";
+             print ctx "(%s) " (String.concat "," ("self" :: List.map ident (List.map arg_name f2.tf_args)));
+             let fblock = fun_block ctx f2 e.epos in
+             (match fblock.eexpr with
+              | TBlock el ->
+                  let rec loop ctx el = (match el with
+                      | [hd] -> (match hd.eexpr with
+                          | TReturn eo -> begin
+                                  newline ctx;
+                                  gen_return ctx e eo;
+                              end;
+                          | _ -> gen_block_element ctx hd);
+                      | hd :: tl ->
+                          gen_block_element ctx hd;
+                          loop ctx tl
+                      |[] ->()
+                  ) in
+                  let bend = open_block ctx in
+                  loop ctx el;
+                  bend();
+                  newline ctx;
+              |_ -> ());
+             println ctx "end";
+             ctx.in_value <- fst old;
+             ctx.in_loop <- snd old;
+             ctx.separator <- true;
+         | _ ->
+             gen_value ctx e;
+             newline ctx;
+        )
 
 let generate_class___name__ ctx c =
-	if has_feature ctx "lua.Boot.isClass" then begin
-		let p = s_path ctx c.cl_path in
-		print ctx "%s.__name__ = " p;
-		if has_feature ctx "Type.getClassName" then
-			println ctx "{%s}" (String.concat "," (List.map (fun s -> Printf.sprintf "\"%s\"" (s_escape_lua s)) (fst c.cl_path @ [snd c.cl_path])))
-		else
-			println ctx "true";
-	end
+    if has_feature ctx "lua.Boot.isClass" then begin
+        let p = s_path ctx c.cl_path in
+        print ctx "%s.__name__ = " p;
+        if has_feature ctx "Type.getClassName" then
+            println ctx "\"%s\"" (String.concat "." (List.map s_escape_lua (fst c.cl_path @ [snd c.cl_path])))
+        else
+            println ctx "true";
+    end
 
 let generate_class ctx c =
-	ctx.current <- c;
-	ctx.id_counter <- 0;
-	(match c.cl_path with
-	| [],"Function" -> abort "This class redefines a native one" c.cl_pos
-	| _ -> ());
-	let p = s_path ctx c.cl_path in
-	let hxClasses = has_feature ctx "Type.resolveClass" in
-	newline ctx;
-	print ctx "%s.new = " p;
-	(match c.cl_kind with
-		| KAbstractImpl _ ->
-			(* abstract implementations only contain static members and don't need to have constructor functions *)
-			print ctx "{}"; ctx.separator <- true
-		| _ ->
-			(match c.cl_constructor with
-			| Some { cf_expr = Some e } ->
-				(match e.eexpr with
-				| TFunction f ->
-				    let old = ctx.in_value, ctx.in_loop in
-				    ctx.in_value <- None;
-				    ctx.in_loop <- false;
-				    print ctx "function(%s) " (String.concat "," (List.map ident (List.map arg_name f.tf_args)));
-				    let fblock = fun_block ctx f e.epos in
-				    (match fblock.eexpr with
-				    | TBlock el ->
-					let bend = open_block ctx in
-					newline ctx;
-					if not (has_prototype ctx c) then println ctx "local self = _hx_new()" else
-					println ctx "local self = _hx_new(%s.prototype)" p;
-					println ctx "%s.super(%s)" p (String.concat "," ("self" :: (List.map ident (List.map arg_name f.tf_args))));
-					if p = "String" then println ctx "self = string";
-					spr ctx "return self";
-					bend(); newline ctx;
-					spr ctx "end"; newline ctx;
-					let bend = open_block ctx in
-					print ctx "%s.super = function(%s) " p (String.concat "," ("self" :: (List.map ident (List.map arg_name f.tf_args))));
-					List.iter (gen_block_element ctx) el;
-					bend();
-					newline ctx;
-					spr ctx "end";
-				    |_ -> ());
-				    ctx.in_value <- fst old;
-				    ctx.in_loop <- snd old;
-				    ctx.separator <- true
-				| _ -> gen_expr ctx e);
-			| _ -> (print ctx "{}"); ctx.separator <- true)
-	);
-	newline ctx;
-
-	(match (get_exposed ctx (dot_path c.cl_path) c.cl_meta) with [s] -> (print ctx "_hx_exports%s = %s" (path_to_brackets s) p; newline ctx) | _ -> ());
-
-	if hxClasses then println ctx "_hxClasses[\"%s\"] = %s" (dot_path c.cl_path) p;
-	generate_class___name__ ctx c;
-	(match c.cl_implements with
-	| [] -> ()
-	| l ->
-		println ctx "%s.__interfaces__ = {%s}" p (String.concat "," (List.map (fun (i,_) -> ctx.type_accessor (TClassDecl i)) l));
-	);
-
-	let gen_props props =
-		String.concat "," (List.map (fun (p,v) -> p ^"=\""^v^"\"") props) in
-	let has_property_reflection =
-		(has_feature ctx "Reflect.getProperty") || (has_feature ctx "Reflect.setProperty") in
-
-	if has_property_reflection then begin
-		(match Codegen.get_properties c.cl_ordered_statics with
-		| [] -> ()
-		| props -> println ctx "%s.__properties__ = {%s}" p (gen_props props);
-		);
-	end;
-
-	List.iter (gen_class_static_field ctx c) c.cl_ordered_statics;
-
-	if (has_prototype ctx c) then begin
-		print ctx "%s.prototype = _hx_a(" p;
-		let bend = open_block ctx in
-		newline ctx;
-		let count = ref 0 in
-		List.iter (fun f -> if can_gen_class_field ctx f then (gen_class_field ctx c f (!count > 0); incr count;) ) c.cl_ordered_fields;
-		if (has_class ctx c) then begin
-			newprop ctx;
-			if !count > 0 then spr ctx ",";
-			print ctx "'__class__',  %s" p;
-			incr count;
-		end;
-
-		if has_property_reflection then begin
-			let props = Codegen.get_properties c.cl_ordered_fields in
-			(match c.cl_super with
-			| _ when props = [] -> ()
-			| _ ->
-				if !count > 0 then spr ctx ",";
-				newprop ctx;
-				print ctx "'__properties__',  {%s}" (gen_props props));
-		end;
-
-		bend(); newline ctx;
-		println ctx ")";
-		(match c.cl_super with
-		| None -> ()
-		| Some (csup,_) ->
-			let psup = ctx.type_accessor (TClassDecl csup) in
-			println ctx "%s.__super__ = %s" p psup;
-			println ctx "setmetatable(%s.prototype,{__index=%s.prototype})" p psup;
-			(* Also use the __properties__  from the super class as the __index metatable *)
-			if has_property_reflection && Codegen.has_properties csup then
-			    println ctx "setmetatable(%s.prototype.__properties__,{__index=%s.prototype.__properties__})" p psup;
-		);
-	end
+    ctx.current <- c;
+    ctx.id_counter <- 0;
+    (match c.cl_path with
+     | [],"Function" -> error "This class redefines a native one" c.cl_pos
+     | _ -> ());
+    let p = s_path ctx c.cl_path in
+    let hxClasses = has_feature ctx "Type.resolveClass" in
+    newline ctx;
+    print ctx "%s.new = " p;
+    (match c.cl_kind with
+     | KAbstractImpl _ ->
+         (* abstract implementations only contain static members and don't need to have constructor functions *)
+         print ctx "{}"; ctx.separator <- true
+     | _ ->
+         (match c.cl_constructor with
+          | Some { cf_expr = Some e } ->
+              (match e.eexpr with
+               | TFunction f ->
+                   let old = ctx.in_value, ctx.in_loop in
+                   ctx.in_value <- None;
+                   ctx.in_loop <- false;
+                   print ctx "function(%s) " (String.concat "," (List.map ident (List.map arg_name f.tf_args)));
+                   let fblock = fun_block ctx f e.epos in
+                   (match fblock.eexpr with
+                    | TBlock el ->
+                        let bend = open_block ctx in
+                        newline ctx;
+                        if not (has_prototype ctx c) then println ctx "local self = _hx_new()" else
+                            println ctx "local self = _hx_new(%s.prototype)" p;
+                        println ctx "%s.super(%s)" p (String.concat "," ("self" :: (List.map ident (List.map arg_name f.tf_args))));
+                        if p = "String" then println ctx "self = string";
+                        spr ctx "return self";
+                        bend(); newline ctx;
+                        spr ctx "end"; newline ctx;
+                        let bend = open_block ctx in
+                        print ctx "%s.super = function(%s) " p (String.concat "," ("self" :: (List.map ident (List.map arg_name f.tf_args))));
+                        List.iter (gen_block_element ctx) el;
+                        bend();
+                        newline ctx;
+                        spr ctx "end";
+                    |_ -> ());
+                   ctx.in_value <- fst old;
+                   ctx.in_loop <- snd old;
+                   ctx.separator <- true
+               | _ -> gen_expr ctx e);
+          | _ -> (print ctx "{}"); ctx.separator <- true)
+    );
+    newline ctx;
+
+    (match (get_exposed ctx (dot_path c.cl_path) c.cl_meta) with [s] -> (print ctx "_hx_exports%s = %s" (path_to_brackets s) p; newline ctx) | _ -> ());
+
+    if hxClasses then println ctx "_hxClasses[\"%s\"] = %s" (dot_path c.cl_path) p;
+    generate_class___name__ ctx c;
+    (match c.cl_implements with
+     | [] -> ()
+     | l ->
+         println ctx "%s.__interfaces__ = {%s}" p (String.concat "," (List.map (fun (i,_) -> ctx.type_accessor (TClassDecl i)) l));
+    );
+
+    let gen_props props =
+        String.concat "," (List.map (fun (p,v) -> p ^"=\""^v^"\"") props) in
+    let has_property_reflection =
+        (has_feature ctx "Reflect.getProperty") || (has_feature ctx "Reflect.setProperty") in
+
+    if has_property_reflection then begin
+        (match Codegen.get_properties c.cl_ordered_statics with
+         | [] -> ()
+         | props -> println ctx "%s.__properties__ = {%s}" p (gen_props props);
+        );
+    end;
+
+    List.iter (gen_class_static_field ctx c) c.cl_ordered_statics;
+
+    if (has_prototype ctx c) then begin
+        println ctx "%s.prototype = _hx_a();" p;
+        let count = ref 0 in
+        List.iter (fun f -> if can_gen_class_field ctx f then (gen_class_field ctx c f) ) c.cl_ordered_fields;
+        if (has_class ctx c) then begin
+            newprop ctx;
+            println ctx "%s.prototype.__class__ =  %s" p p;
+            incr count;
+        end;
+
+        if has_property_reflection then begin
+            let props = Codegen.get_properties c.cl_ordered_fields in
+            (match c.cl_super with
+             | _ when props = [] -> ()
+             | _ ->
+                 newprop ctx;
+                 println ctx "%s.prototype.__properties__ =  {%s}" p (gen_props props));
+        end;
+        (match c.cl_super with
+         | None -> ()
+         | Some (csup,_) ->
+             let psup = ctx.type_accessor (TClassDecl csup) in
+             println ctx "%s.__super__ = %s" p psup;
+             println ctx "setmetatable(%s.prototype,{__index=%s.prototype})" p psup;
+             (* Also use the __properties__  from the super class as the __index metatable *)
+             if has_property_reflection && Codegen.has_properties csup then
+                 println ctx "setmetatable(%s.prototype.__properties__,{__index=%s.prototype.__properties__})" p psup;
+        );
+    end
 
 let generate_enum ctx e =
-	let p = s_path ctx e.e_path in
-	let ename = List.map (fun s -> Printf.sprintf "\"%s\"" (s_escape_lua s)) (fst e.e_path @ [snd e.e_path]) in
-
-	(* TODO: Unify the _hxClasses declaration *)
-	if has_feature ctx "Type.resolveEnum" then begin
-	    print ctx "_hxClasses[\"%s\"] = %s" (dot_path e.e_path) p; semicolon ctx; newline ctx;
-	end;
-	if has_feature ctx "lua.Boot.isEnum" then begin
-	    print ctx "_hxClasses[\"%s\"] = {" (dot_path e.e_path);
-	    if has_feature ctx "lua.Boot.isEnum" then  begin
-		print ctx " __ename__ = %s," (if has_feature ctx "Type.getEnumName" then "{" ^ String.concat "," ename ^ "}" else "true");
-	    end;
-	    (* TODO :  Come up with a helper function for _hx_tab_array declarations *)
-	    spr ctx " __constructs__ = _hx_tab_array({";
-	    if ((List.length e.e_names) > 0) then begin
-		    spr ctx "[0]=";
-		    spr ctx (String.concat "," (List.map (fun s -> Printf.sprintf "\"%s\"" s) e.e_names));
-	    end;
-	    print ctx "},%i)}" (List.length e.e_names);
-	    ctx.separator <- true;
-	    newline ctx;
-	end;
-
-	if has_feature ctx "Type.resolveEnum" || has_feature ctx "lua.Boot.isEnum" then
-	    print ctx "%s = _hxClasses[\"%s\"];" p (dot_path e.e_path);
-
-	newline ctx;
-	List.iter (fun n ->
-		let f = PMap.find n e.e_constrs in
-		print ctx "%s%s = " p (field f.ef_name);
-		(match f.ef_type with
-		| TFun (args,_) ->
-			let count = List.length args in
-			let sargs = String.concat "," (List.map (fun (n,_,_) -> ident n) args) in
-			print ctx "function(%s) local _x = _hx_tab_array({[0]=\"%s\",%d,%s,__enum__=%s}, %i);" sargs f.ef_name f.ef_index sargs p (count + 2);
-			if has_feature ctx "may_print_enum" then
-				(* TODO: better namespacing for _estr *)
-				spr ctx " rawset(_x, 'toString', _estr);";
-			spr ctx " return _x; end ";
-			ctx.separator <- true;
-		| _ ->
-			println ctx "_hx_tab_array({[0]=\"%s\",%d,__enum__ = %s},2)" f.ef_name f.ef_index p;
-			if has_feature ctx "may_print_enum" then begin
-				println ctx "rawset(%s%s, 'toString', _estr)" p (field f.ef_name);
-			end;
-		);
-		newline ctx
-	) e.e_names;
-	if has_feature ctx "Type.allEnums" then begin
-		let ctors_without_args = List.filter (fun s ->
-			let ef = PMap.find s e.e_constrs in
-			match follow ef.ef_type with
-				| TFun _ -> false
-				| _ -> true
-		) e.e_names in
-		print ctx "%s.__empty_constructs__ = " p;
-		spr ctx "_hx_tab_array({";
-		if (List.length ctors_without_args)  > 0 then
-		    begin
-			spr ctx "[0] = ";
-			print ctx "%s" (String.concat "," (List.map (fun s -> Printf.sprintf "%s.%s" p s) ctors_without_args));
-		    end;
-		println ctx "}, %i)"  (List.length ctors_without_args);
-	end
+    let p = s_path ctx e.e_path in
+    let ename = List.map s_escape_lua (fst e.e_path @ [snd e.e_path]) in
+
+    (* TODO: Unify the _hxClasses declaration *)
+    if has_feature ctx "Type.resolveEnum" then begin
+        print ctx "_hxClasses[\"%s\"] = %s" (dot_path e.e_path) p; semicolon ctx; newline ctx;
+    end;
+    if has_feature ctx "lua.Boot.isEnum" then begin
+        print ctx "_hxClasses[\"%s\"] = {" (dot_path e.e_path);
+        if has_feature ctx "lua.Boot.isEnum" then  begin
+            print ctx " __ename__ = %s," (if has_feature ctx "Type.getEnumName" then "\"" ^ String.concat "." ename ^ "\"" else "true");
+        end;
+        (* TODO :  Come up with a helper function for _hx_tab_array declarations *)
+        spr ctx " __constructs__ = _hx_tab_array({";
+        if ((List.length e.e_names) > 0) then begin
+            spr ctx "[0]=";
+            spr ctx (String.concat "," (List.map (fun s -> Printf.sprintf "\"%s\"" s) e.e_names));
+        end;
+        print ctx "},%i)}" (List.length e.e_names);
+        ctx.separator <- true;
+        newline ctx;
+    end;
+
+    if has_feature ctx "Type.resolveEnum" || has_feature ctx "lua.Boot.isEnum" then
+        print ctx "%s = _hxClasses[\"%s\"];" p (dot_path e.e_path);
+
+    newline ctx;
+    List.iter (fun n ->
+        let f = PMap.find n e.e_constrs in
+        print ctx "%s%s = " p (field f.ef_name);
+        (match f.ef_type with
+         | TFun (args,_) ->
+             let count = List.length args in
+             let sargs = String.concat "," (List.map (fun (n,_,_) -> ident n) args) in
+             print ctx "function(%s) local _x = _hx_tab_array({[0]=\"%s\",%d,%s,__enum__=%s}, %i);" sargs f.ef_name f.ef_index sargs p (count + 2);
+             if has_feature ctx "may_print_enum" then
+                 (* TODO: better namespacing for _estr *)
+                 spr ctx " rawset(_x, 'toString', _estr);";
+             spr ctx " return _x; end ";
+             ctx.separator <- true;
+         | _ ->
+             println ctx "_hx_tab_array({[0]=\"%s\",%d,__enum__ = %s},2)" f.ef_name f.ef_index p;
+             if has_feature ctx "may_print_enum" then begin
+                 println ctx "rawset(%s%s, 'toString', _estr)" p (field f.ef_name);
+             end;
+        );
+        newline ctx
+    ) e.e_names;
+    if has_feature ctx "Type.allEnums" then begin
+        let ctors_without_args = List.filter (fun s ->
+            let ef = PMap.find s e.e_constrs in
+            match follow ef.ef_type with
+            | TFun _ -> false
+            | _ -> true
+        ) e.e_names in
+        print ctx "%s.__empty_constructs__ = " p;
+        spr ctx "_hx_tab_array({";
+        if (List.length ctors_without_args)  > 0 then
+            begin
+                spr ctx "[0] = ";
+                print ctx "%s" (String.concat "," (List.map (fun s -> Printf.sprintf "%s.%s" p s) ctors_without_args));
+            end;
+        println ctx "}, %i)"  (List.length ctors_without_args);
+    end
 
 let generate_static ctx (c,f,e) =
-	print ctx "%s%s = " (s_path ctx c.cl_path) (field f);
-	gen_value ctx e;
-	newline ctx
+    let dot_path = (dot_path c.cl_path) ^ (static_field c f.cf_name)
+    and path = (s_path ctx c.cl_path) ^ (field f.cf_name) in
+    print ctx "%s = " path;
+    gen_value ctx e;
+    semicolon ctx;
+    newline ctx;
+    (match (get_exposed ctx dot_path f.cf_meta) with [s] -> (print ctx "_hx_exports%s = %s" (path_to_brackets s) path; semicolon ctx) | _ -> ());
+    newline ctx
 
 let generate_enumMeta_fields ctx = function
     | TEnumDecl e -> begin
-	    let p = s_path ctx e.e_path in
-	    match Codegen.build_metadata ctx.com (TEnumDecl e) with
-	| None -> ()
-	| Some e ->
-		print ctx "%s.__meta__ = " p;
-		gen_expr ctx e;
-		newline ctx
-	end
+            let p = s_path ctx e.e_path in
+            match Texpr.build_metadata ctx.com.basic (TEnumDecl e) with
+            | None -> ()
+            | Some e ->
+                print ctx "%s.__meta__ = " p;
+                gen_expr ctx e;
+                newline ctx
+        end
     | _ -> ()
 
 let generate_require ctx path meta =
-	let _, args, mp = Meta.get Meta.LuaRequire meta in
-	let p = (s_path ctx path) in
+    let _, args, mp = Meta.get Meta.LuaRequire meta in
+    let p = (s_path ctx path) in
 
-	generate_package_create ctx path;
+    (match args with
+     | [(EConst(String(module_name,_)),_)] ->
+         print ctx "%s = _G.require(\"%s\")" p module_name
+     | [(EConst(String(module_name,_)),_) ; (EConst(String(object_path,_)),_)] ->
+         print ctx "%s = _G.require(\"%s\").%s" p module_name object_path
+     | _ ->
+         error "Unsupported @:luaRequire format" mp);
 
-	(match args with
-	| [(EConst(String(module_name)),_)] ->
-		print ctx "%s = _G.require(\"%s\")" p module_name
-	| [(EConst(String(module_name)),_) ; (EConst(String(object_path)),_)] ->
-		print ctx "%s = _G.require(\"%s\").%s" p module_name object_path
-	| _ ->
-		abort "Unsupported @:luaRequire format" mp);
-
-	newline ctx
+    newline ctx
 
 let generate_type ctx = function
-	| TClassDecl c ->
-		(match c.cl_init with
-		| None -> ()
-		| Some e ->
-			ctx.inits <- e :: ctx.inits);
-		let p = s_path ctx c.cl_path in
-		(* A special case for Std because we do not want to generate it if it's empty. *)
-		if p = "Std" && c.cl_ordered_statics = [] then
-			()
-		else if not c.cl_extern then
-			generate_class ctx c
-		else if Meta.has Meta.InitPackage c.cl_meta then
-			(match c.cl_path with
-			| ([],_) -> ()
-			| _ -> generate_package_create ctx c.cl_path);
-		check_multireturn ctx c;
-	| TEnumDecl e ->
-		if not e.e_extern then generate_enum ctx e
-		else ();
-	| TTypeDecl _ | TAbstractDecl _ | _ -> ()
+    | TClassDecl c ->
+        (match c.cl_init with
+         | None -> ()
+         | Some e ->
+             ctx.inits <- e :: ctx.inits);
+        let p = s_path ctx c.cl_path in
+        (* A special case for Std because we do not want to generate it if it's empty. *)
+        if p = "Std" && c.cl_ordered_statics = [] then
+            ()
+        else if (not c.cl_extern) && Meta.has Meta.LuaDotMethod c.cl_meta then
+            error "LuaDotMethod is valid for externs only" c.cl_pos
+        else if not c.cl_extern then
+            generate_class ctx c;
+        check_multireturn ctx c;
+    | TEnumDecl e ->
+        if not e.e_extern then generate_enum ctx e
+        else ();
+    | TTypeDecl _ | TAbstractDecl _ -> ()
 
 let generate_type_forward ctx = function
-	| TClassDecl c ->
-		if not c.cl_extern then
-		    begin
-			generate_package_create ctx c.cl_path;
-			let p = s_path ctx c.cl_path in
-			println ctx "%s = _hx_e()" p
-		    end
-		else if Meta.has Meta.LuaRequire c.cl_meta && is_directly_used ctx.com c.cl_meta then
-		    generate_require ctx c.cl_path c.cl_meta
-	| TEnumDecl e when e.e_extern ->
-		if Meta.has Meta.LuaRequire e.e_meta && is_directly_used ctx.com e.e_meta then
-		    generate_require ctx e.e_path e.e_meta;
-	| TEnumDecl e ->
-		generate_package_create ctx e.e_path;
-		let p = s_path ctx e.e_path in
-		println ctx "%s = _hx_e()" p;
-	| TTypeDecl _ | TAbstractDecl _ -> ()
+    | TClassDecl c ->
+        if not c.cl_extern then
+            begin
+                let p = s_path ctx c.cl_path in
+                let l,c = c.cl_path in
+                if List.length(l) == 0 then spr ctx "local ";
+                println ctx "%s = _hx_e()" p
+            end
+        else if Meta.has Meta.LuaRequire c.cl_meta && is_directly_used ctx.com c.cl_meta then
+            generate_require ctx c.cl_path c.cl_meta
+    | TEnumDecl e when e.e_extern ->
+        if Meta.has Meta.LuaRequire e.e_meta && is_directly_used ctx.com e.e_meta then
+            generate_require ctx e.e_path e.e_meta;
+    | TEnumDecl e ->
+        let p = s_path ctx e.e_path in
+        let l,c = e.e_path in
+        if List.length(l) == 0 then spr ctx "local ";
+        println ctx "%s = _hx_e()" p;
+    | TTypeDecl _ | TAbstractDecl _ -> ()
 
 let alloc_ctx com =
-	let ctx = {
-		com = com;
-		buf = Buffer.create 16000;
-		packages = Hashtbl.create 0;
-		statics = [];
-		inits = [];
-		current = null_class;
-		tabs = "";
-		in_value = None;
-		iife_assign = false;
-		in_loop = false;
-		handle_break = false;
-		break_depth = 0;
-		handle_continue = false;
-		id_counter = 0;
-		type_accessor = (fun _ -> assert false);
-		separator = false;
-		found_expose = false;
-		lua_jit = Common.defined com Define.LuaJit;
-		lua_ver = try
-			float_of_string (PMap.find "lua_ver" com.defines)
-		    with | Not_found -> 5.2;
-	} in
-	ctx.type_accessor <- (fun t ->
-		let p = t_path t in
-		match t with
-		| TClassDecl ({ cl_extern = true } as c) when not (Meta.has Meta.LuaRequire c.cl_meta)
-			-> dot_path p
-		| TEnumDecl { e_extern = true }
-			-> dot_path p
-		| _ -> s_path ctx p);
-	ctx
+    let ctx = {
+        com = com;
+        buf = Buffer.create 16000;
+        packages = Hashtbl.create 0;
+        statics = [];
+        inits = [];
+        current = null_class;
+        tabs = "";
+        in_value = None;
+        iife_assign = false;
+        in_loop = false;
+        in_loop_try = false;
+        break_depth = 0;
+        handle_continue = false;
+        id_counter = 0;
+        type_accessor = (fun _ -> assert false);
+        separator = false;
+        found_expose = false;
+        lua_jit = Common.defined com Define.LuaJit;
+        lua_vanilla = Common.defined com Define.LuaVanilla;
+        lua_ver = try
+                float_of_string (PMap.find "lua_ver" com.defines.Define.values)
+            with | Not_found -> 5.2;
+    } in
+    ctx.type_accessor <- (fun t ->
+        let p = t_path t in
+        match t with
+        | TClassDecl ({ cl_extern = true } as c) when not (Meta.has Meta.LuaRequire c.cl_meta)
+            -> dot_path p
+        | TEnumDecl { e_extern = true }
+            -> s_path ctx p
+        | _ -> s_path ctx p);
+    ctx
 
 
 let transform_multireturn ctx = function
-	| TClassDecl c ->
-		let transform_field f =
-			match f.cf_expr with
-			| Some e ->
-				let rec loop e =
-					let is_multireturn t =
-						match follow t with
-						| TInst (c, _) when Meta.has Meta.MultiReturn c.cl_meta -> true
-						| _ -> false
-					in
-					match e.eexpr with
-					(*
-						if we found a var declaration initialized by a multi-return call, mark it with @:multiReturn meta,
-						so it will later be generated as multiple locals unpacking the value
-					*)
-					| TVar (v, Some ({ eexpr = TCall _ } as ecall)) when is_multireturn v.v_type ->
-						v.v_meta <- (Meta.MultiReturn,[],v.v_pos) :: v.v_meta;
-						let ecall = Type.map_expr loop ecall in
-						{ e with eexpr = TVar (v, Some ecall) }
-
-					(* if we found a field access for the multi-return call, generate select call *)
-					| TField ({ eexpr = TCall _ } as ecall, f) when is_multireturn ecall.etype ->
-						let ecall = Type.map_expr loop ecall in
-						mk_mr_select ctx.com ecall (field_name f)
-
-					(* if we found a multi-return call used as a value, box it *)
-					| TCall _ when is_multireturn e.etype ->
-						let e = Type.map_expr loop e in
-						mk_mr_box ctx e
-
-					(* Don't bother wrapping multireturn function results if we don't use the return values *)
-					| TBlock el ->
-						let el2 = List.map (fun x ->
-						    match x.eexpr with
-						    | TCall (e2, el) when is_multireturn x.etype ->
-							    mk (TCall (e2, List.map(fun x-> Type.map_expr loop x) el)) x.etype x.epos
-						    | _ -> loop x) el in
-						mk (TBlock el2) e.etype e.epos;
-
-
-					(* if we found a field access for a multi-return local - that's fine, because it'll be generated as a local var *)
-					| TField ({ eexpr = TLocal v}, _) when Meta.has Meta.MultiReturn v.v_meta ->
-						e
-					| TReturn Some(e2) ->
-					    if is_multireturn e2.etype then
-						failwith "You cannot return a multireturn type from a haxe function"
-					    else
-						Type.map_expr loop e;
-					(*
+    | TClassDecl c ->
+        let transform_field f =
+            check_multireturn_param ctx f.cf_type f.cf_pos;
+            match f.cf_expr with
+            | Some e ->
+                let is_multireturn t =
+                    match follow t with
+                    | TInst (c, _) when Meta.has Meta.MultiReturn c.cl_meta -> true
+                    | _ -> false
+                in
+                let rec loop e =
+                    match e.eexpr with
+                    (*
+                        if we found a var declaration initialized by a multi-return call, mark it with @:multiReturn meta,
+                        so it will later be generated as multiple locals unpacking the value
+                    *)
+                    | TVar (v, Some ({ eexpr = TCall _ } as ecall)) when is_multireturn v.v_type ->
+                        v.v_meta <- (Meta.MultiReturn,[],v.v_pos) :: v.v_meta;
+                        let ecall = Type.map_expr loop ecall in
+                        { e with eexpr = TVar (v, Some ecall) }
+
+                    (* if we found a field access for the multi-return call, generate select call *)
+                    | TField ({ eexpr = TCall _ } as ecall, f) when is_multireturn ecall.etype ->
+                        let ecall = Type.map_expr loop ecall in
+                        mk_mr_select ctx.com.basic e ecall (field_name f)
+
+                    (* if we found a multi-return call used as a value, box it *)
+                    | TCall _ when is_multireturn e.etype ->
+                        let e = Type.map_expr loop e in
+                        mk_mr_box ctx e
+
+                    (* Don't bother wrapping multireturn function results if we don't use the return values *)
+                    | TBlock el ->
+                        let el2 = List.map (fun x ->
+                            match x.eexpr with
+                            | TCall (e2, el) when is_multireturn x.etype ->
+                                mk (TCall (e2, List.map(fun x-> Type.map_expr loop x) el)) x.etype x.epos
+                            | _ -> loop x) el in
+                        mk (TBlock el2) e.etype e.epos;
+
+
+                        (* if we found a field access for a multi-return local - that's fine, because it'll be generated as a local var *)
+                    | TField ({ eexpr = TLocal v}, _) when Meta.has Meta.MultiReturn v.v_meta ->
+                        e
+                    | TReturn Some(e2) ->
+                        if is_multireturn e2.etype then
+                            error "You cannot return a multireturn type from a haxe function" e2.epos
+                        else
+                            Type.map_expr loop e;
+     (*
 						if we found usage of local var we previously marked with @:multiReturn as a value itself,
 						remove the @:multiReturn meta and add "box me" meta so it'll be boxed on var initialization
 					*)
-					| TLocal v when Meta.has Meta.MultiReturn v.v_meta ->
-						v.v_meta <- List.filter (fun (m,_,_) -> m <> Meta.MultiReturn) v.v_meta;
-						v.v_meta <- (Meta.Custom ":lua_mr_box", [], v.v_pos) :: v.v_meta;
-						e
-
-					| _ ->
-						Type.map_expr loop e
-				in
-				f.cf_expr <- Some (loop e);
-			| _ -> ()
-		in
-		List.iter transform_field c.cl_ordered_fields;
-		List.iter transform_field c.cl_ordered_statics;
-		Option.may transform_field c.cl_constructor;
-	| _ -> ()
+                    | TLocal v when Meta.has Meta.MultiReturn v.v_meta ->
+                        v.v_meta <- List.filter (fun (m,_,_) -> m <> Meta.MultiReturn) v.v_meta;
+                        v.v_meta <- (Meta.Custom ":lua_mr_box", [], v.v_pos) :: v.v_meta;
+                        e
+
+                    | _ ->
+                        Type.map_expr loop e
+                in
+                f.cf_expr <- Some (loop e);
+            | _ -> ()
+        in
+        List.iter transform_field c.cl_ordered_fields;
+        List.iter transform_field c.cl_ordered_statics;
+        Option.may transform_field c.cl_constructor;
+    | _ -> ()
 
 let generate com =
-	let ctx = alloc_ctx com in
-
-	Codegen.map_source_header com (fun s -> print ctx "-- %s\n" s);
-
-	if has_feature ctx "Class" || has_feature ctx "Type.getClassName" then add_feature ctx "lua.Boot.isClass";
-	if has_feature ctx "Enum" || has_feature ctx "Type.getEnumName" then add_feature ctx "lua.Boot.isEnum";
-
-	let include_files = List.rev com.include_files in
-	List.iter (fun file ->
-		match file with
-		| path, "top" ->
-			let file_content = Std.input_file ~bin:true (fst file) in
-			print ctx "%s\n" file_content;
-			()
-		| _ -> ()
-	) include_files;
-
-	let var_exports = (
-		"_hx_exports",
-		"_hx_exports or {}"
-	) in
-
-	let exposed = List.concat (List.map (fun t ->
-		match t with
-			| TClassDecl c ->
-				let path = dot_path c.cl_path in
-				let class_exposed = get_exposed ctx path c.cl_meta in
-				let static_exposed = List.map (fun f ->
-					get_exposed ctx (path ^ static_field c f.cf_name) f.cf_meta
-				) c.cl_ordered_statics in
-				List.concat (class_exposed :: static_exposed)
-			| _ -> []
-		) com.types) in
-	let anyExposed = exposed <> [] in
-	let exportMap = ref (PMap.create String.compare) in
-	let exposedObject = { os_name = ""; os_fields = [] } in
-	let toplevelExposed = ref [] in
-	List.iter (fun path -> (
-		let parts = ExtString.String.nsplit path "." in
-		let rec loop p pre = match p with
-			| f :: g :: ls ->
-				let path = match pre with "" -> f | pre -> (pre ^ "." ^ f) in
-				if not (PMap.exists path !exportMap) then (
-					let elts = { os_name = f; os_fields = [] } in
-					exportMap := PMap.add path elts !exportMap;
-					let cobject = match pre with "" -> exposedObject | pre -> PMap.find pre !exportMap in
-					cobject.os_fields <- elts :: cobject.os_fields
-				);
-				loop (g :: ls) path;
-			| f :: [] when pre = "" ->
-				toplevelExposed := f :: !toplevelExposed;
-			| _ -> ()
-		in loop parts "";
-	)) exposed;
-
-
-	if (anyExposed) then (
-		print ctx "local %s = %s" (fst var_exports) (snd var_exports);
-		ctx.separator <- true;
-		newline ctx
-	);
-
-	let rec print_obj f root = (
-		let path = root ^ (path_to_brackets f.os_name) in
-		print ctx "%s = %s or _hx_e()" path path;
-		ctx.separator <- true;
-		newline ctx;
-		concat ctx ";" (fun g -> print_obj g path) f.os_fields
-	)
-	in
-	List.iter (fun f -> print_obj f "_hx_exports") exposedObject.os_fields;
-
-
-	let vars = [] in
-	(* let vars = (if has_feature ctx "Type.resolveClass" || has_feature ctx "Type.resolveEnum" then ("_hxClasses = " ^ "{}") :: vars else vars) in *)
-	let vars = if has_feature ctx "may_print_enum"
-		then ("_estr = function(self) return " ^ (ctx.type_accessor (TClassDecl { null_class with cl_path = ["lua"],"Boot" })) ^ ".__string_rec(self,''); end") :: vars
-		else vars in
-	(match List.rev vars with
-	| [] -> ()
-	| vl ->
-		print ctx "local %s" (String.concat ";" vl);
-		ctx.separator <- true;
-		newline ctx
-	);
-
-	List.iter (generate_type_forward ctx) com.types; newline ctx;
-
-	(* Generate some dummy placeholders for utility libs that may be required*)
-	println ctx "local _hx_bind, _hx_bit, _hx_staticToInstance, _hx_funcToField, _hx_maxn, _hx_print, _hx_apply_self, _hx_box_mr, _hx_bit_clamp, _hx_table, _hx_bit_raw";
-
-	List.iter (transform_multireturn ctx) com.types;
-	List.iter (generate_type ctx) com.types;
-
-	if has_feature ctx "use._bitop" || has_feature ctx "lua.Boot.clamp" then begin
-	    println ctx "_hx_bit_clamp = function(v) ";
-	    println ctx "  if v <= 2147483647 and v >= -2147483648 then";
-	    println ctx "    if v > 0 then return _G.math.floor(v)";
-	    println ctx "    else return _G.math.ceil(v)";
-	    println ctx "    end";
-	    println ctx "  end";
-	    println ctx "  if v > 2251798999999999 then v = v*2 end;";
-	    println ctx "  if (v ~= v or math.abs(v) == _G.math.huge) then return nil end";
-	    println ctx "  return _hx_bit.band(v, 2147483647 ) - math.abs(_hx_bit.band(v, 2147483648))";
-	    println ctx "end";
-	    println ctx "pcall(require, 'bit')"; (* require this for lua 5.1 *)
-	    println ctx "if bit then";
-	    println ctx "  _hx_bit = bit";
-	    println ctx "elseif bit32 then";
-	    println ctx "  local _hx_bit_raw = bit32";
-	    println ctx "  _hx_bit = setmetatable({}, { __index = _hx_bit_raw });";
-	    println ctx "  _hx_bit.bnot = function(...) return _hx_bit_clamp(_hx_bit_raw.bnot(...)) end;"; (* lua 5.2  weirdness *)
-	    println ctx "  _hx_bit.bxor = function(...) return _hx_bit_clamp(_hx_bit_raw.bxor(...)) end;"; (* lua 5.2  weirdness *)
-	    println ctx "end";
-	end;
-
-	(* If we use haxe Strings, patch Lua's string *)
-	if has_feature ctx "use.string" then begin
-	    println ctx "local _hx_string_mt = _G.getmetatable('');";
-	    println ctx "String.__oldindex = _hx_string_mt.__index;";
-	    println ctx "_hx_string_mt.__index = String.__index;";
-	    println ctx "_hx_string_mt.__add = function(a,b) return Std.string(a)..Std.string(b) end;";
-	    println ctx "_hx_string_mt.__concat = _hx_string_mt.__add";
-	end;
-
-	(* Array is required, always patch it *)
-	println ctx "_hx_array_mt.__index = Array.prototype";
-	newline ctx;
-
-	let b = open_block ctx in
-	println ctx "local _hx_static_init = function()";
-	(* Generate statics *)
-	List.iter (generate_static ctx) (List.rev ctx.statics);
-	(* Localize init variables inside a do-block *)
-	(* Note: __init__ logic can modify static variables. *)
-	(* Generate statics *)
-	List.iter (gen_block_element ctx) (List.rev ctx.inits);
-	b();
-	newline ctx;
-	println ctx "end";
-	newline ctx;
-
-	if has_feature ctx "use._iterator" then begin
-		add_feature ctx "use._hx_bind";
-		println ctx "function _hx_iterator(o)  if ( lua.Boot.__instanceof(o, Array) ) then return function() return HxOverrides.iter(o) end elseif (typeof(o.iterator) == 'function') then return  _hx_bind(o,o.iterator) else return  o.iterator end end";
-	end;
-
-	if has_feature ctx "use._hx_bind" then begin
-	    println ctx "_hx_bind = function(o,m)";
-	    println ctx "  if m == nil then return nil end;";
-	    println ctx "  local f;";
-	    println ctx "  if o._hx__closures == nil then";
-	    println ctx "    _G.rawset(o, '_hx__closures', {});";
-	    println ctx "  else ";
-	    println ctx "    f = o._hx__closures[m];";
-	    println ctx "  end";
-	    println ctx "  if (f == nil) then";
-	    println ctx "    f = function(...) return m(o, ...) end;";
-	    println ctx "    o._hx__closures[m] = f;";
-	    println ctx "  end";
-	    println ctx "  return f;";
-	    println ctx "end";
-	end;
-
-	if has_feature ctx "use._hx_staticToInstance" then begin
-	    println ctx "_hx_staticToInstance = function (tab)";
-	    println ctx "  return setmetatable({}, {";
-	    println ctx "    __index = function(t,k)";
-	    println ctx "      if type(rawget(tab,k)) == 'function' then ";
-	    println ctx "	return function(self,...)";
-	    println ctx "	  return rawget(tab,k)(...)";
-	    println ctx "	end";
-	    println ctx "      else";
-	    println ctx "	return rawget(tab,k)";
-	    println ctx "      end";
-	    println ctx "    end";
-	    println ctx "  })";
-	    println ctx "end";
-	end;
-
-	if has_feature ctx "use._hx_funcToField" then begin
-	    println ctx "_hx_funcToField = function(f)";
-	    println ctx "  if type(f) == 'function' then ";
-	    println ctx "    return function(self,...) ";
-	    println ctx "      return f(...) ";
-	    println ctx "    end";
-	    println ctx "  else ";
-	    println ctx "    return f";
-	    println ctx "  end";
-	    println ctx "end";
-	end;
-
-	if has_feature ctx "Math.random" then begin
-	    println ctx "_G.math.randomseed(_G.os.time());"
-	end;
-
-	if has_feature ctx "use._hx_print" then
-	    println ctx "_hx_print = print or (function() end)";
-
-	if has_feature ctx "use._hx_apply_self" then begin
-	    println ctx "_hx_apply_self = function(self, f, ...)";
-	    println ctx "  return self[f](self,...)";
-	    println ctx "end";
-	end;
-
-	if has_feature ctx "use._hx_box_mr" then begin
-	    println ctx "_hx_box_mr = function(x,nt)";
-	    println ctx "   res = _hx_o({__fields__={}})";
-	    println ctx "   for i,v in ipairs(nt) do";
-	    println ctx "     res[v] = x[i]";
-	    println ctx "   end";
-	    println ctx "   return res";
-	    println ctx "end";
-	end;
-
-	if has_feature ctx "use._hx_table" then begin
-	    println ctx "_hx_table = {}";
-	    println ctx "_hx_table.pack = _G.table.pack or function(...)";
-	    println ctx "    return {...}";
-	    println ctx "end";
-	    println ctx "_hx_table.unpack = _G.table.unpack or _G.unpack";
-	    println ctx "_hx_table.maxn = _G.table.maxn or function(t)";
-	    println ctx "  local maxn=0;";
-	    println ctx "  for i in pairs(t) do";
-	    println ctx "    maxn=type(i)=='number'and i>maxn and i or maxn";
-	    println ctx "  end";
-	    println ctx "  return maxn";
-	    println ctx "end;";
-	end;
-
-	println ctx "_hx_static_init();";
-
-	List.iter (generate_enumMeta_fields ctx) com.types;
-
-	(match com.main with
-	| None -> ()
-	| Some e -> gen_expr ctx e; newline ctx);
-
-	println ctx "return _hx_exports";
-
-	let ch = open_out_bin com.file in
-	output_string ch (Buffer.contents ctx.buf);
-	close_out ch
+    let ctx = alloc_ctx com in
+
+    Codegen.map_source_header com (fun s -> print ctx "-- %s\n" s);
+
+    if has_feature ctx "Class" || has_feature ctx "Type.getClassName" then add_feature ctx "lua.Boot.isClass";
+    if has_feature ctx "Enum" || has_feature ctx "Type.getEnumName" then add_feature ctx "lua.Boot.isEnum";
+
+    let print_file path =
+        let file_content = Std.input_file ~bin:true path in
+        print ctx "%s\n" file_content;
+    in
+
+    (* table-to-array helper *)
+    print_file (Common.find_file com "lua/_lua/_hx_tab_array.lua");
+
+    (* lua workarounds for basic anonymous object functionality *)
+    print_file (Common.find_file com "lua/_lua/_hx_anon.lua");
+
+    (* class reflection metadata *)
+    print_file (Common.find_file com "lua/_lua/_hx_classes.lua");
+
+    let include_files = List.rev com.include_files in
+    List.iter (fun file ->
+        match file with
+        | path, "top" -> print_file path
+        | _ -> ()
+    ) include_files;
+
+    let var_exports = (
+        "_hx_exports",
+        "_hx_exports or {}"
+    ) in
+
+    let exposed = List.concat (List.map (fun t ->
+        match t with
+        | TClassDecl c ->
+            let path = dot_path c.cl_path in
+            let class_exposed = get_exposed ctx path c.cl_meta in
+            let static_exposed = List.map (fun f ->
+                get_exposed ctx (path ^ static_field c f.cf_name) f.cf_meta
+            ) c.cl_ordered_statics in
+            List.concat (class_exposed :: static_exposed)
+        | _ -> []
+    ) com.types) in
+    let anyExposed = exposed <> [] in
+    let exportMap = ref (PMap.create String.compare) in
+    let exposedObject = { os_name = ""; os_fields = [] } in
+    let toplevelExposed = ref [] in
+    List.iter (fun path -> (
+            let parts = ExtString.String.nsplit path "." in
+            let rec loop p pre = match p with
+                | f :: g :: ls ->
+                    let path = match pre with "" -> f | pre -> (pre ^ "." ^ f) in
+                    if not (PMap.exists path !exportMap) then (
+                        let elts = { os_name = f; os_fields = [] } in
+                        exportMap := PMap.add path elts !exportMap;
+                        let cobject = match pre with "" -> exposedObject | pre -> PMap.find pre !exportMap in
+                        cobject.os_fields <- elts :: cobject.os_fields
+                    );
+                    loop (g :: ls) path;
+                | f :: [] when pre = "" ->
+                    toplevelExposed := f :: !toplevelExposed;
+                | _ -> ()
+            in loop parts "";
+        )) exposed;
+
+
+    if (anyExposed) then (
+        print ctx "local %s = %s" (fst var_exports) (snd var_exports);
+        ctx.separator <- true;
+        newline ctx
+    );
+
+    let rec print_obj f root = (
+        let path = root ^ (path_to_brackets f.os_name) in
+        print ctx "%s = %s or _hx_e()" path path;
+        ctx.separator <- true;
+        newline ctx;
+        concat ctx ";" (fun g -> print_obj g path) f.os_fields
+    )
+    in
+    List.iter (fun f -> print_obj f "_hx_exports") exposedObject.os_fields;
+
+
+    let vars = [] in
+    (* let vars = (if has_feature ctx "Type.resolveClass" || has_feature ctx "Type.resolveEnum" then ("_hxClasses = " ^ "{}") :: vars else vars) in *)
+    let vars = if has_feature ctx "may_print_enum"
+        then ("_estr = function(self) return " ^ (ctx.type_accessor (TClassDecl { null_class with cl_path = ["lua"],"Boot" })) ^ ".__string_rec(self,''); end") :: vars
+        else vars in
+    (match List.rev vars with
+     | [] -> ()
+     | vl ->
+         print ctx "local %s" (String.concat ";" vl);
+         ctx.separator <- true;
+         newline ctx
+    );
+
+    List.iter (generate_type_forward ctx) com.types; newline ctx;
+
+    (* Generate some dummy placeholders for utility libs that may be required*)
+    println ctx "local _hx_bind, _hx_bit, _hx_staticToInstance, _hx_funcToField, _hx_maxn, _hx_print, _hx_apply_self, _hx_box_mr, _hx_bit_clamp, _hx_table, _hx_bit_raw";
+    println ctx "local _hx_pcall_default = {};";
+    println ctx "local _hx_pcall_break = {};";
+
+    List.iter (transform_multireturn ctx) com.types;
+    List.iter (generate_type ctx) com.types;
+
+    if has_feature ctx "use._bitop" || has_feature ctx "lua.Boot.clamp" then begin
+        print_file (Common.find_file com "lua/_lua/_hx_bit_clamp.lua");
+        print_file (Common.find_file com "lua/_lua/_hx_bit.lua");
+    end;
+
+    (* Array is required, always patch it *)
+    println ctx "_hx_array_mt.__index = Array.prototype";
+    newline ctx;
+
+    let b = open_block ctx in
+    println ctx "local _hx_static_init = function()";
+    (* Generate statics *)
+    List.iter (generate_static ctx) (List.rev ctx.statics);
+    (* Localize init variables inside a do-block *)
+    (* Note: __init__ logic can modify static variables. *)
+    (* Generate static inits *)
+    List.iter (gen_block_element ctx) (List.rev ctx.inits);
+    b();
+    newline ctx;
+    println ctx "end";
+    newline ctx;
+
+    if has_feature ctx "use._hx_bind" then begin
+        print_file (Common.find_file com "lua/_lua/_hx_bind.lua");
+    end;
+
+    if has_feature ctx "use._hx_staticToInstance" then begin
+        print_file (Common.find_file com "lua/_lua/_hx_static_to_instance.lua");
+    end;
+
+    if has_feature ctx "use._hx_funcToField" then begin
+        print_file (Common.find_file com "lua/_lua/_hx_func_to_field.lua");
+    end;
+
+    if has_feature ctx "Math.random" then begin
+        print_file (Common.find_file com "lua/_lua/_hx_random_init.lua");
+    end;
+
+    if has_feature ctx "use._hx_print" then
+        print_file (Common.find_file com "lua/_lua/_hx_print.lua");
+
+    if has_feature ctx "use._hx_apply_self" then begin
+        print_file (Common.find_file com "lua/_lua/_hx_apply_self.lua");
+    end;
+
+    if has_feature ctx "use._hx_box_mr" then begin
+        print_file (Common.find_file com "lua/_lua/_hx_box_mr.lua");
+    end;
+
+    if has_feature ctx "use._hx_table" then begin
+        print_file (Common.find_file com "lua/_lua/_hx_table.lua");
+    end;
+
+    if has_feature ctx "use._hx_wrap_if_string_field" then begin
+        print_file (Common.find_file com "lua/_lua/_hx_wrap_if_string_field.lua");
+    end;
+
+    if has_feature ctx "use._hx_dyn_add" then begin
+        print_file (Common.find_file com "lua/_lua/_hx_dyn_add.lua");
+    end;
+
+    println ctx "_hx_static_init();";
+
+    List.iter (generate_enumMeta_fields ctx) com.types;
+
+    (match com.main with
+     | None -> ()
+     | Some e -> gen_expr ctx e; newline ctx);
+
+    if anyExposed then
+        println ctx "return _hx_exports";
 
+    let ch = open_out_bin com.file in
+    output_string ch (Buffer.contents ctx.buf);
+    close_out ch
 
diff --git a/src/generators/genneko.ml b/src/generators/genneko.ml
index 326a328056c10289febd8c71cd0a3ad5c8b651be..713e2cbf9b329572b0ff3f17767044406fc91c26 100644
--- a/src/generators/genneko.ml
+++ b/src/generators/genneko.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -199,7 +199,7 @@ and gen_call ctx p e el =
 			this p;
 			array p (List.map (gen_expr ctx) el)
 		]
-	| TLocal { v_name = "__resources__" }, [] ->
+	| TIdent "__resources__", [] ->
 		call p (builtin p "array") (Hashtbl.fold (fun name data acc ->
 			(EObject [("name",gen_constant ctx e.epos (TString name));("data",gen_big_string ctx p data)],p) :: acc
 		) ctx.com.resources [])
@@ -219,8 +219,8 @@ and gen_expr ctx e =
 	match e.eexpr with
 	| TConst c ->
 		gen_constant ctx e.epos c
-	| TLocal v when v.v_name.[0] = '$' ->
-		(EConst (Builtin (String.sub v.v_name 1 (String.length v.v_name - 1))),p)
+	| TIdent s when s.[0] = '$' ->
+		(EConst (Builtin (String.sub s 1 (String.length s - 1))),p)
 	| TLocal v ->
 		if v.v_capture then
 			(EArray (ident p v.v_name,int p 0),p)
@@ -248,6 +248,8 @@ and gen_expr ctx e =
 		| _ -> assert false)
 	| TEnumParameter (e,_,i) ->
 		EArray (field p (gen_expr ctx e) "args",int p i),p
+	| TEnumIndex e ->
+		field p (gen_expr ctx e) "index"
 	| TField (e,f) ->
 		field p (gen_expr ctx e) (field_name f)
 	| TTypeExpr t ->
@@ -258,7 +260,7 @@ and gen_expr ctx e =
 		gen_expr ctx e
 	| TObjectDecl fl ->
 		let hasToString = ref false in
-		let fl = List.map (fun (f,e) -> if f = "toString" then hasToString := (match follow e.etype with TFun ([],_) -> true | _ -> false); f , gen_expr ctx e) fl in
+		let fl = List.map (fun ((f,_,_),e) -> if f = "toString" then hasToString := (match follow e.etype with TFun ([],_) -> true | _ -> false); f , gen_expr ctx e) fl in
 		(EObject (if !hasToString then ("__string",ident p "@default__string") :: fl else fl),p)
 	| TArrayDecl el ->
 		call p (field p (ident p "Array") "new1") [array p (List.map (gen_expr ctx) el); int p (List.length el)]
@@ -293,8 +295,8 @@ and gen_expr ctx e =
 				acc
 			in
 			match c with
-			| None | Some TNull -> acc
-			| Some c ->	gen_expr ctx (Codegen.set_default ctx.com a c e.epos) :: acc
+			| None | Some {eexpr = TConst TNull} -> acc
+			| Some c ->	gen_expr ctx (Texpr.set_default ctx.com.basic a c e.epos) :: acc
 		) [] f.tf_args in
 		let e = gen_expr ctx f.tf_expr in
 		let e = (match inits with [] -> e | _ -> EBlock (List.rev (e :: inits)),p) in
@@ -368,6 +370,8 @@ and gen_expr ctx e =
 		gen_expr ctx e
 	| TCast (e1,Some t) ->
 		gen_expr ctx (Codegen.default_cast ~vtmp:"@tmp" ctx.com e1 t e.etype e.epos)
+	| TIdent s ->
+		ident p s
 	| TSwitch (e,cases,eo) ->
 		let e = gen_expr ctx e in
 		let eo = (match eo with None -> None | Some e -> Some (gen_expr ctx e)) in
@@ -399,7 +403,7 @@ and gen_expr ctx e =
 
 let gen_method ctx p c acc =
 	ctx.curmethod <- c.cf_name;
-	if is_extern_field c then acc else
+	if not (is_physical_field c) then acc else
 	match c.cf_expr with
 	| None ->
 		((c.cf_name, null p) :: acc)
@@ -626,7 +630,7 @@ let gen_name ctx acc t =
 		let setname = (EBinop ("=",field p path "__ename__",arr),p) in
 		let arr = call p (field p (ident p "Array") "new1") [array p (List.map (fun n -> gen_constant ctx e.e_pos (TString n)) e.e_names); int p (List.length e.e_names)] in
 		let setconstrs = (EBinop ("=", field p path "__constructs__", arr),p) in
-		let meta = (match Codegen.build_metadata ctx.com (TEnumDecl e) with
+		let meta = (match Texpr.build_metadata ctx.com.basic (TEnumDecl e) with
 			| None -> []
 			| Some e -> [EBinop ("=",field p path "__meta__", gen_expr ctx e),p]
 		) in
@@ -790,7 +794,7 @@ let generate com =
 	let use_nekoc = Common.defined com Define.UseNekoc in
 	if not use_nekoc then begin
 		try
-			mkdir_from_path com.file;
+			Path.mkdir_from_path com.file;
 			let ch = IO.output_channel (open_out_bin com.file) in
 			Nbytecode.write ch (Ncompile.compile ctx.version e);
 			IO.close_out ch;
diff --git a/src/generators/genphp.ml b/src/generators/genphp.ml
deleted file mode 100644
index c6fa2bc205a9e815ce9c7d51e34b30068dc4f7f1..0000000000000000000000000000000000000000
--- a/src/generators/genphp.ml
+++ /dev/null
@@ -1,2434 +0,0 @@
-(*
-	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *)
-
-open Ast
-open Type
-open Common
-open Codegen
-
-type method_name = {
-	mutable mpath : path;
-	mutable mname : string;
-}
-
-type inline_method = {
-	iname       : string;
-	iindex      : int;
-	iexpr       : texpr;
-	ihasthis    : bool;
-	iin_block   : bool;
-	iarguments  : string list;
-	ilocals     : (string,string) PMap.t;
-	iinv_locals : (string,string) PMap.t;
-}
-
-type context = {
-	com : Common.context;
-	ch : out_channel;
-	buf : Buffer.t;
-	path : path;
-	stack : Codegen.stack_context;
-	mutable nested_loops : int;
-	mutable inline_index : int;
-	mutable curclass : tclass;
-	mutable curmethod : string;
-	mutable tabs : string;
-	mutable in_value : string option;
-	mutable in_loop : bool;
-	mutable in_block : bool;
-	mutable in_instance_method : bool;
-	mutable imports : (string,string list list) Hashtbl.t;
-	mutable extern_required_paths : (string list * string) list;
-	mutable extern_classes_with_init : path list;
-	mutable locals : (string,string) PMap.t;
-	mutable inv_locals : (string,string) PMap.t;
-	mutable local_types : t list;
-	mutable inits : texpr list;
-	mutable constructor_block : bool;
-	mutable all_dynamic_methods: method_name list;
-	mutable dynamic_methods: tclass_field list;
-	mutable is_call : bool;
-	mutable cwd : string;
-	mutable inline_methods : inline_method list;
-	mutable lib_path : string;
-}
-
-let follow = Abstract.follow_with_abstracts
-
-(**
-	Check if specified expression is of `Float` type
-*)
-let is_float expr = match follow expr.etype with TAbstract ({ a_path = ([], "Float") }, _) -> true | _ -> false
-
-(**
-	If `expr` is a TCast or TMeta, then returns underlying expression (recursively bypassing nested casts).
-	Otherwise returns `expr` as is.
-*)
-let rec reveal_expr expr =
-	match expr.eexpr with
-		| TCast (e, _) -> reveal_expr e
-		| TMeta (_, e) -> reveal_expr e
-		| _ -> expr
-
-let join_class_path path separator =
-	let result = match fst path, snd path with
-	| [], s -> s
-	| el, s -> String.concat separator el ^ separator ^ s in
-	if (String.contains result '+') then begin
-		let idx = String.index result '+' in
-		(String.sub result 0 idx) ^ (String.sub result (idx+1) ((String.length result) - idx -1 ) )
-	end else
-		result;;
-
-(*  Get a string to represent a type.
-	 The "suffix" will be nothing or "_obj", depending if we want the name of the
-	 pointer class or the pointee (_obj class *)
-let rec class_string klass suffix params =
-	(match klass.cl_path with
-	(* Array class *)
-	|  ([],"Array") -> (snd klass.cl_path) ^ suffix ^ "<" ^ (String.concat ","
-					 (List.map type_string  params) ) ^ " >"
-	| _ when (match klass.cl_kind with KTypeParameter _ -> true | _ -> false) -> "Dynamic"
-	|  ([],"#Int") -> "/* # */int"
-	|  (["haxe";"io"],"Unsigned_char__") -> "unsigned char"
-	|  ([],"Class") -> "Class"
-	|  ([],"Null") -> (match params with
-			| [t] ->
-				(match follow t with
-				| TInst ({ cl_path = [],"Int" },_)
-				| TInst ({ cl_path = [],"Float" },_)
-				| TEnum ({ e_path = [],"Bool" },_) -> "Dynamic"
-				| _ -> "/*NULL*/" ^ (type_string t) )
-			| _ -> assert false);
-	(* Normal class *)
-	| _ -> (join_class_path klass.cl_path "::") ^ suffix
-	)
-and type_string_suff suffix haxe_type =
-	(match haxe_type with
-	| TMono r -> (match !r with None -> "Dynamic" | Some t -> type_string_suff suffix t)
-	| TAbstract ({ a_path = [],"Int" },[]) -> "int"
-	| TAbstract ({ a_path = [],"Float" },[]) -> "double"
-	| TAbstract ({ a_path = [],"Bool" },[]) -> "bool"
-	| TAbstract ({ a_path = [],"Void" },[]) -> "Void"
-	| TEnum (enum,params) ->  (join_class_path enum.e_path "::") ^ suffix
-	| TInst (klass,params) ->  (class_string klass suffix params)
-	| TAbstract (abs,params) ->  (join_class_path abs.a_path "::") ^ suffix
-	| TType (type_def,params) ->
-		(match type_def.t_path with
-		| [] , "Null" ->
-			(match params with
-			| [t] ->
-				(match follow t with
-				| TInst ({ cl_path = [],"Int" },_)
-				| TInst ({ cl_path = [],"Float" },_)
-				| TEnum ({ e_path = [],"Bool" },_) -> "Dynamic"
-				| _ -> type_string_suff suffix t)
-			| _ -> assert false);
-		| [] , "Array" ->
-			(match params with
-			| [t] -> "Array<" ^ (type_string (follow t) ) ^ " >"
-			| _ -> assert false)
-		| _ ->  type_string_suff suffix (apply_params type_def.t_params params type_def.t_type)
-		)
-	| TFun (args,haxe_type) -> "Dynamic"
-	| TAnon anon -> "Dynamic"
-	| TDynamic haxe_type -> "Dynamic"
-	| TLazy func -> type_string_suff suffix ((!func)())
-	)
-and type_string haxe_type =
-	type_string_suff "" haxe_type;;
-
-let debug_expression expression type_too =
-	"/* " ^ Type.s_expr_kind expression ^ (if (type_too) then " = " ^ (type_string (follow expression.etype)) else "") ^ " */";;
-
-let rec register_extern_required_path ctx path =
-	if (List.exists(fun p -> p = path) ctx.extern_classes_with_init) && not (List.exists(fun p -> p = path) ctx.extern_required_paths) then
-		ctx.extern_required_paths <- path :: ctx.extern_required_paths
-
-let s_expr_expr = Type.s_expr_kind
-
-let s_expr_name e =
-	s_type (print_context()) (follow e.etype)
-
-let s_type_name t =
-	s_type (print_context()) t
-
-
-
-and start_with s test =
-	let len = String.length test in
-	(String.length s > len && String.sub s 0 len = test)
-
-let rec is_uncertain_type t =
-	match follow t with
-	| TInst (c, _) -> c.cl_interface
-	| TMono _ -> true
-	| TAnon a ->
-	  (match !(a.a_status) with
-	  | Statics _
-	  | EnumStatics _ -> false
-	  | _ -> true)
-	| TDynamic _ -> true
-	| _ -> false
-
-let is_uncertain_expr e =
-	is_uncertain_type e.etype
-
-let rec is_anonym_type t =
-	match follow t with
-	| TAnon a ->
-	  (match !(a.a_status) with
-	  | Statics _
-	  | EnumStatics _ -> false
-	  | _ -> true)
-	| TDynamic _ -> true
-	| _ -> false
-
-let is_anonym_expr e = is_anonym_type e.etype
-
-let rec is_unknown_type t =
-	match follow t with
-	| TMono r ->
-		(match !r with
-		| None -> true
-		| Some t -> is_unknown_type t)
-	| _ -> false
-
-let is_unknown_expr e =	is_unknown_type e.etype
-
-let rec is_string_type t =
-	match follow t with
-	| TInst ({cl_path = ([], "String")}, _) -> true
-	| TAnon a ->
-	   (match !(a.a_status) with
-	   | Statics ({cl_path = ([], "String")}) -> true
-	   | _ -> false)
-	| TAbstract (a,pl) -> is_string_type (Abstract.get_underlying_type a pl)
-	| _ -> false
-
-let is_string_expr e = is_string_type e.etype
-
-let to_string ctx e =
-	let v = alloc_var "__call__" t_dynamic e.epos in
-	let f = mk (TLocal v) t_dynamic e.epos in
-	mk (TCall (f, [ ExprBuilder.make_string ctx.com "_hx_string_rec" e.epos; e; ExprBuilder.make_string ctx.com "" e.epos])) ctx.com.basic.tstring e.epos
-
-let as_string_expr ctx e =
-	match e.eexpr with
-	| TConst (TNull) ->
-		to_string ctx e
-	| _ when not (is_string_expr e) ->
-		to_string ctx e
-	| _ -> e
-(* for known String type that could have null value *)
-let to_string_null ctx e =
-	let v = alloc_var "__call__" t_dynamic e.epos in
-	let f = mk (TLocal v) t_dynamic e.epos in
-	mk (TCall (f, [ ExprBuilder.make_string ctx.com "_hx_string_or_null" e.epos; e])) ctx.com.basic.tstring e.epos
-
-
-let as_string_expr ctx e =	match e.eexpr with
-	| TConst (TNull) ->  to_string ctx e
-	| TConst (TString s) -> e
-	| TBinop (op,_,_) when (is_string_expr e)-> e
-	| TCall ({eexpr = TField({eexpr = TTypeExpr(TClassDecl {cl_path = ([],"Std")})},FStatic(c,f) )}, [_]) when (f.cf_name="string") -> e
-	| TCall ({eexpr = TLocal _}, [{eexpr = TConst (TString ("_hx_string_rec" | "_hx_str_or_null"))}]) -> e
-	| _ when not (is_string_expr e) -> to_string ctx e
-	| _ -> to_string_null ctx e
-
-let spr ctx s = Buffer.add_string ctx.buf s
-let print ctx = Printf.kprintf (fun s -> Buffer.add_string ctx.buf s)
-
-(*--php-prefix - added by skial bainn*)
-let prefix_class com name =
-	match com.php_prefix with
-	| Some prefix_class (* when not (String.length name <= 2 || String.sub name 0 2 = "__") *) ->
-		prefix_class ^ name
-	| _ ->
-		name
-
-let prefix_init_replace com code =
-	let r = Str.regexp "php_Boot" in
-	Str.global_replace r ("php_" ^ (prefix_class com "Boot")) code
-
-let s_path ctx path isextern p =
-	if isextern then begin
-		register_extern_required_path ctx path;
-		snd path
-	end else begin
-		(match path with
-		(*--php-prefix*)
-		| ([],"List")			-> (prefix_class ctx.com "HList")
-		(*--php-prefix*)
-		| ([],name)				-> (prefix_class ctx.com name)
-		| (pack,name) ->
-			(try
-				(match Hashtbl.find ctx.imports name with
-				| [p] when p = pack ->
-					()
-				| packs ->
-					if not (List.mem pack packs) then Hashtbl.replace ctx.imports name (pack :: packs))
-			with Not_found ->
-				Hashtbl.add ctx.imports name [pack]);
-			(*--php-prefix*)
-			String.concat "_" pack ^ "_" ^ (prefix_class ctx.com name))
-	end
-
-let s_path_haxe path =
-	match fst path, snd path with
-	| [], s -> s
-	| el, s -> String.concat "." el ^ "." ^ s
-
-let escape_bin s =
-	let b = Buffer.create 0 in
-	for i = 0 to String.length s - 1 do
-		match Char.code (String.unsafe_get s i) with
-		| c when c = Char.code('\\') || c = Char.code('"') || c = Char.code('$') ->
-			Buffer.add_string b "\\";
-			Buffer.add_char b (Char.chr c)
-		| c when c < 32 ->
-			Buffer.add_string b (Printf.sprintf "\\x%.2X" c)
-		| c ->
-			Buffer.add_char b (Char.chr c)
-	done;
-	Buffer.contents b
-
-(*
-haxe reserved words that match php ones: break, case, class, continue, default, do, else, extends, for, function, if, new, return, static, switch, var, while, interface, implements, public, private, try, catch, throw
- *)
-(* PHP only (for future use): cfunction, old_function *)
-let is_keyword n =
-	match String.lowercase n with
-	| "and" | "or" | "xor" | "__file__" | "exception" | "__line__" | "array"
-	| "as" | "const" | "declare" | "die" | "echo"| "elseif" | "empty"
-	| "enddeclare" | "endfor" | "endforeach" | "endif" | "endswitch"
-	| "endwhile" | "eval" | "exit" | "foreach"| "global" | "include"
-	| "include_once" | "isset" | "list" | "namespace" | "print" | "require" | "require_once"
-	| "unset" | "use" | "__function__" | "__class__" | "__method__" | "final"
-	| "php_user_filter" | "protected" | "abstract" | "__set" | "__get" | "__call"
-	| "clone" | "instanceof" | "break" | "case" | "class" | "continue" | "default"
-	| "do" | "else" | "extends" | "for" | "function" | "if" | "new" | "return"
-	| "static" | "switch" | "var" | "while" | "interface" | "implements" | "public"
-	| "private" | "try" | "catch" | "throw" | "goto" | "yield"
-		-> true
-	| _ -> false
-
-let s_ident n =
-	let suf = "h" in
-	if (is_keyword n) then (suf ^ n) else n
-
-let s_ident_field n =
-	if (is_keyword n) then ("{\"" ^ (escape_bin n) ^ "\"}") else n
-
-let s_ident_local n =
-	let suf = "h" in
-	match String.lowercase n with
-	| "globals" | "_server" | "_get" | "_post" | "_cookie" | "_files"
-	| "_env" | "_request" | "_session" -> suf ^ n
-	| _ -> n
-
-let create_directory com ldir =
- 	let atm_path = ref (String.create 0) in
- 	atm_path := com.file;
- 	if not (Sys.file_exists com.file) then (Unix.mkdir com.file 0o755);
- 	(List.iter (fun p -> atm_path := !atm_path ^ "/" ^ p; if not (Sys.file_exists !atm_path) then (Unix.mkdir !atm_path 0o755);) ldir)
-
-let write_resource dir name data =
-	let rdir = dir ^ "/res" in
-	if not (Sys.file_exists dir) then Unix.mkdir dir 0o755;
-	if not (Sys.file_exists rdir) then Unix.mkdir rdir 0o755;
-	let name = Codegen.escape_res_name name false in
-	let ch = open_out_bin (rdir ^ "/" ^ name) in
-	output_string ch data;
-	close_out ch
-
-let stack_init com use_add =
-	Codegen.stack_context_init com "GLOBALS['%s']" "GLOBALS['%e']" "__hx__spos" "tmp" use_add Globals.null_pos
-
-let init com cwd path def_type =
-	let rec create acc = function
-		| [] -> ()
-		| d :: l ->
-			let pdir = String.concat "/" (List.rev (d :: acc)) in
-			if not (Sys.file_exists pdir) then Unix.mkdir pdir 0o755;
-			create (d :: acc) l
-	in
-	let dir = if cwd <> "" then com.file :: (cwd :: fst path) else com.file :: fst path; in
-	create [] dir;
-	let filename path =
-		prefix_class com (match path with
-		| [], "List" -> "HList";
-		| _, s -> s) in
-	(*--php-prefix*)
-	let ch = open_out (String.concat "/" dir ^ "/" ^ (filename path) ^ (if def_type = 0 then ".class" else if def_type = 1 then ".enum"  else if def_type = 2 then ".interface" else ".extern") ^ ".php") in
-	let imports = Hashtbl.create 0 in
-	Hashtbl.add imports (snd path) [fst path];
-	let ctx = {
-		com = com;
-		stack = stack_init com false;
-		tabs = "";
-		ch = ch;
-		path = path;
-		buf = Buffer.create (1 lsl 14);
-		in_value = None;
-		in_loop = false;
-		in_instance_method = false;
-		imports = imports;
-		extern_required_paths = [];
-		extern_classes_with_init = [];
-		curclass = null_class;
-		curmethod = "";
-		locals = PMap.empty;
-		inv_locals = PMap.empty;
-		local_types = [];
-		inits = [];
-		constructor_block = false;
-		dynamic_methods = [];
-		all_dynamic_methods = [];
-		is_call = false;
-		cwd = cwd;
-		inline_methods = [];
-		nested_loops = 0;
-		inline_index = 0;
-		in_block = false;
-		lib_path = match com.php_lib with None -> "lib" | Some s -> s;
-	} in
-	Codegen.map_source_header com (fun s -> print ctx "// %s\n" s);
-	ctx
-
-let unsupported msg p = abort ("This expression cannot be generated to PHP: " ^ msg) p
-
-let newline ctx =
-	match Buffer.nth ctx.buf (Buffer.length ctx.buf - 1) with
-	| '{' | ':' | ' '
-	| '}' when Buffer.nth ctx.buf (Buffer.length ctx.buf - 2) != '"' ->
-		print ctx "\n%s" ctx.tabs
-	| _ ->
-		print ctx ";\n%s" ctx.tabs
-
-let rec concat ctx s f = function
-	| [] -> ()
-	| [x] -> f x
-	| x :: l ->
-		f x;
-		spr ctx s;
-		concat ctx s f l
-
-let open_block ctx =
-	let oldt = ctx.tabs in
-	ctx.tabs <- "\t" ^ ctx.tabs;
-	(fun() -> ctx.tabs <- oldt)
-
-let parent e =
-	match e.eexpr with
-	| TParenthesis _ -> e
-	| _ -> mk (TParenthesis e) e.etype e.epos
-
-let inc_extern_path ctx path =
-	let rec slashes n =
-		if n = 0 then "" else ("../" ^ slashes (n-1))
-	in
-	let pre = if ctx.cwd = "" then ctx.lib_path ^ "/" else "" in
-	match path with
-		| ([],name) ->
-		pre ^ (slashes (List.length (fst ctx.path))) ^ (prefix_class ctx.com name) ^ ".extern.php"
-		| (pack,name) ->
-		pre ^ (slashes (List.length (fst ctx.path))) ^ String.concat "/" pack ^ "/" ^ (prefix_class ctx.com name) ^ ".extern.php"
-
-let close ctx =
-	output_string ctx.ch "<?php\n";
-	List.iter (fun path ->
-		if path <> ctx.path then output_string ctx.ch ("require_once dirname(__FILE__).'/" ^ (inc_extern_path ctx path) ^ "';\n");
-	) (List.rev ctx.extern_required_paths);
-	output_string ctx.ch "\n";
-	output_string ctx.ch (Buffer.contents ctx.buf);
-	close_out ctx.ch
-
-let save_locals ctx =
-	let old = ctx.locals in
-	let old_inv = ctx.inv_locals in
-	(fun() -> ctx.locals <- old; ctx.inv_locals <- old_inv)
-
-let define_local ctx l =
-	let rec loop n =
-	let name = (if n = 1 then s_ident_local l else s_ident_local (l ^ string_of_int n)) in
-	if PMap.mem name ctx.inv_locals then
-		loop (n+1)
-	else begin
-		ctx.locals <- PMap.add l name ctx.locals;
-		ctx.inv_locals <- PMap.add name l ctx.inv_locals;
-		name
-	end
-	in
-	loop 1
-
-let this ctx =
-	if ctx.in_value <> None then "$__hx__this" else "$this"
-
-let gen_constant ctx p = function
-	| TInt i -> print ctx "%ld" i
-	| TFloat s -> spr ctx s
-	| TString s ->
-		print ctx "\"%s\"" (escape_bin s)
-	| TBool b -> spr ctx (if b then "true" else "false")
-	| TNull -> spr ctx "null"
-	| TThis -> spr ctx (this ctx)
-	| TSuper -> spr ctx "ERROR /* unexpected call to super in gen_constant */"
-
-let arg_is_opt c =
-	match c with
-	| Some _ -> true
-	| None -> false
-
-let s_funarg ctx arg t p o =
-	let byref = if (String.length arg > 7 && String.sub arg 0 7 = "byref__") then "&" else "" in
-	print ctx "%s$%s" byref (s_ident_local arg);
-	if o then spr ctx " = null"
-(*
-	match c with
-	| _, Some _ -> spr ctx " = null"
-	| _, None -> ()
-*)
-let is_in_dynamic_methods ctx e s =
-	List.exists (fun dm ->
-		(* TODO: I agree, this is a mess ... but after hours of trials and errors I gave up; maybe in a calmer day *)
-		((String.concat "." ((fst dm.mpath) @ ["#" ^ (snd dm.mpath)])) ^ "." ^ dm.mname) = (s_type_name e.etype ^ "." ^ s)
-	) ctx.all_dynamic_methods
-
-let is_dynamic_method f =
-	(match f.cf_kind with
-		| Var _ -> true
-		| Method MethDynamic -> true
-		| _ -> false)
-
-let fun_block ctx f p =
-	let e = (match f.tf_expr with { eexpr = TBlock [{ eexpr = TBlock _ } as e] } -> e | e -> e) in
-	let e = List.fold_left (fun e (v,c) ->
-		match c with
-		| None | Some TNull -> e
-		| Some c -> Type.concat (Codegen.set_default ctx.com v c p) e
-	) e f.tf_args in
-	if ctx.com.debug then begin
-		Codegen.stack_block ctx.stack ctx.curclass ctx.curmethod e
-	end else
-		mk_block e
-
-let rec gen_array_args ctx lst =
-	match lst with
-	| [] -> ()
-	| h :: t ->
-		spr ctx "[";
-		gen_value ctx h;
-		spr ctx "]";
-		gen_array_args ctx t
-
-and gen_call ctx e el =
-	let rec genargs lst =
-		(match lst with
-		| [] -> ()
-		| h :: [] ->
-			spr ctx " = ";
-			gen_value ctx h;
-		| h :: t ->
-			spr ctx "[";
-			gen_value ctx h;
-			spr ctx "]";
-			genargs t)
-	in
-	match (reveal_expr e).eexpr , el with
-	| TConst TSuper , params ->
-		(match ctx.curclass.cl_super with
-		| None -> assert false
-		| Some (c,_) ->
-			spr ctx "parent::__construct(";
-			concat ctx "," (gen_value ctx) params;
-			spr ctx ")";
-		);
-	| TField ({ eexpr = TConst TSuper },f) , params ->
-		(match ctx.curclass.cl_super with
-		| None -> assert false
-		| Some (c,_) ->
-			print ctx "parent::%s(" (s_ident (field_name f));
-			concat ctx "," (gen_value ctx) params;
-			spr ctx ")";
-		);
-	| TField ({ eexpr = TTypeExpr _ }, FStatic (_, {cf_type = TDynamic _; cf_kind = Var _})) , params ->
-		spr ctx "call_user_func(";
-		ctx.is_call <- true;
-		gen_value ctx e;
-		ctx.is_call <- false;
-		spr ctx ", ";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")";
-	| TLocal { v_name = "__set__" }, { eexpr = TConst (TString code) } :: el ->
-		print ctx "$%s" code;
-		genargs el;
-	| TLocal { v_name = "__set__" }, e :: el ->
-		gen_value ctx e;
-		genargs el;
-	| TLocal { v_name = "__setfield__" }, e :: (f :: el) ->
-		gen_value ctx e;
-		spr ctx "->{";
-		gen_value ctx f;
-		spr ctx "}";
-		genargs el;
-	| TLocal { v_name = "__field__" }, e :: ({ eexpr = TConst (TString code) } :: el) ->
-		gen_value ctx e;
-		spr ctx "->";
-		spr ctx code;
-		gen_array_args ctx el;
-	| TLocal { v_name = "__field__" }, e :: (f :: el) ->
-		gen_value ctx e;
-		spr ctx "->";
-		gen_value ctx f;
-		gen_array_args ctx el;
-	| TLocal { v_name = "__prefix__" }, [] ->
-		(match ctx.com.php_prefix with
-		| Some prefix ->
-			print ctx "\"%s\"" prefix
-		| None ->
-			spr ctx "null")
-	| TLocal { v_name = "__var__" }, { eexpr = TConst (TString code) } :: el ->
-		print ctx "$%s" code;
-		gen_array_args ctx el;
-	| TLocal { v_name = "__var__" }, e :: el ->
-		gen_value ctx e;
-		gen_array_args ctx el;
-	| TLocal { v_name = "__call__" }, { eexpr = TConst (TString code) } :: el ->
-		spr ctx code;
-		spr ctx "(";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")";
-	| TLocal { v_name = "__php__" }, [{ eexpr = TConst (TString code) }] ->
-		(*--php-prefix*)
-		spr ctx (prefix_init_replace ctx.com code)
-	| TLocal { v_name = "__php__" }, { eexpr = TConst (TString code); epos = p } :: tl ->
-		Codegen.interpolate_code ctx.com code tl (spr ctx) (gen_expr ctx) p
-	| TLocal { v_name = "__instanceof__" },  [e1;{ eexpr = TConst (TString t) }] ->
-		gen_value ctx e1;
-		print ctx " instanceof %s" t;
-	| TLocal { v_name = "__physeq__" },  [e1;e2] ->
-		spr ctx "(";
-		gen_value ctx e1;
-		spr ctx " === ";
-		gen_value ctx e2;
-		spr ctx ")"
-	| TLocal _, []
-	| TFunction _, []
-	| TCall _, []
-	| TParenthesis _, []
-	| TMeta _, []
-	| TBlock _, [] ->
-		ctx.is_call <- true;
-		spr ctx "call_user_func(";
-		gen_value ctx e;
-		ctx.is_call <- false;
-		spr ctx ")";
-	| TLocal _, el
-	| TFunction _, el
-	| TCall _, el
-	| TParenthesis _, el
-	| TMeta _, el
-	| TBlock _, el ->
-		ctx.is_call <- true;
-		spr ctx "call_user_func_array(";
-		gen_value ctx e;
-		ctx.is_call <- false;
-		spr ctx ", array(";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx "))"
-(*
-	| TCall (x,_), el when (match x.eexpr with | TLocal _ -> false | _ -> true) ->
-		ctx.is_call <- true;
-		spr ctx "call_user_func_array(";
-		gen_value ctx e;
-		ctx.is_call <- false;
-		spr ctx ", array(";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx "))"
-*)
-	| _ ->
-		ctx.is_call <- true;
-		gen_value ctx e;
-		ctx.is_call <- false;
-		spr ctx "(";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")";
-
-and could_be_string_var s =
-	s = "length"
-
-and gen_uncertain_string_var ctx s e =
-	match s with
-	| "length" ->
-		spr ctx "_hx_len(";
-		gen_value ctx e;
-		spr ctx ")"
-	| _ ->
-		gen_field_access ctx true e s;
-
-and gen_string_var ctx s e =
-	match s with
-	| "length" ->
-		spr ctx "strlen(";
-		gen_value ctx e;
-		spr ctx ")"
-	| _ ->
-		unsupported "gen_string_var " e.epos;
-
-and gen_string_static_call ctx s e el =
-	match s with
-	| "fromCharCode" ->
-		spr ctx "chr(";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")";
-	| _ -> unsupported "gen_string_static_call " e.epos;
-
-and could_be_string_call s =
-	s = "substr" || s = "substring" || s = "charAt" || s = "charCodeAt" || s = "indexOf" ||
-	s = "lastIndexOf" || s = "split" || s = "toLowerCase" || s = "toString" || s = "toUpperCase"
-
-and gen_string_call ctx s e el =
-	match s with
-	| "substr" ->
-		spr ctx "_hx_substr(";
-		gen_value ctx e;
-		spr ctx ", ";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")"
-	| "substring" ->
-		spr ctx "_hx_substring(";
-		gen_value ctx e;
-		spr ctx ", ";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")"
-	| "charAt" ->
-		spr ctx "_hx_char_at(";
-		gen_value ctx e;
-		spr ctx ", ";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")"
-	| "cca" ->
-		spr ctx "ord(substr(";
-		gen_value ctx e;
-		spr ctx ",";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ",1))"
-	| "charCodeAt" ->
-		spr ctx "_hx_char_code_at(";
-		gen_value ctx e;
-		spr ctx ", ";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")"
-	| "indexOf" ->
-		spr ctx "_hx_index_of(";
-		gen_value ctx e;
-		spr ctx ", ";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")"
-	| "lastIndexOf" ->
-		spr ctx "_hx_last_index_of(";
-		gen_value ctx e;
-		spr ctx ", ";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")"
-	| "split" ->
-		spr ctx "_hx_explode(";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ", ";
-		gen_value ctx e;
-		spr ctx ")"
-	| "toLowerCase" ->
-		spr ctx "strtolower(";
-		gen_value ctx e;
-		spr ctx ")"
-	| "toUpperCase" ->
-		spr ctx "strtoupper(";
-		gen_value ctx e;
-		spr ctx ")"
-	| "toString" ->
-		gen_value ctx e;
-	| _ ->
-		unsupported "gen_string_call" e.epos;
-
-and gen_uncertain_string_call ctx s e el =
-	spr ctx "_hx_string_call(";
-	gen_value ctx e;
-	print ctx ", \"%s\", array(" s;
-	concat ctx ", " (gen_value ctx) el;
-	spr ctx "))"
-
-and gen_field_op ctx e =
-	match e.eexpr with
-	| TField (f,s) ->
-		(match follow e.etype with
-		| TFun _ ->
-			gen_field_access ctx true f (field_name s)
-		| _ ->
-			gen_value_op ctx e)
-	| _ ->
-		gen_value_op ctx e
-
-and gen_value_op ctx e =
-	match e.eexpr with
-	| TBinop (op,_,_) when op = Ast.OpAnd || op = Ast.OpOr || op = Ast.OpXor ->
-		gen_value ctx e;
-	| _ ->
-		gen_value ctx e
-
-and is_static t =
-	match follow t with
-	| TAnon a -> (match !(a.a_status) with
-		| Statics c -> true
-		| _ -> false)
-	| _ -> false
-
-and get_constant_prefix meta =
-	let (_, args, pos) = Meta.get Meta.PhpConstants meta in
-	(match args with
-		| [EConst(String prefix), _] -> prefix
-		| [] -> ""
-		| _ -> abort "Invalid @:phpConstant parameters" pos)
-
-and gen_member_access ctx isvar e s =
-	match follow e.etype with
-	| TAnon a ->
-		(match !(a.a_status) with
-		| EnumStatics _ ->
-			let (isvar, access_operator) =
-				match e.eexpr with
-					| TField _ -> (false, "->")
-					| _ -> (isvar, "::")
-			in
-			print ctx "%s%s" (access_operator ^ (if isvar then "$" else "")) (s_ident s)
-		| Statics sta ->
-			let (sep, no_dollar) = if Meta.has Meta.PhpGlobal sta.cl_meta then
-					("", false)
-				else
-					match e.eexpr with
-						| TField _ -> ("->", true)
-						| _ -> ("::", false)
-			in
-			let isconst = Meta.has Meta.PhpConstants sta.cl_meta in
-			let cprefix = if isconst then get_constant_prefix sta.cl_meta else "" in
-			print ctx "%s%s%s" sep (if isvar && not isconst && not no_dollar then "$" else cprefix)
-			(if sta.cl_extern && sep = "" then s else s_ident s)
-		| _ -> print ctx "->%s" (if isvar then s_ident_field s else s_ident s))
-	| _ -> print ctx "->%s" (if isvar then s_ident_field s else s_ident s)
-
-and gen_field_access ctx isvar e s =
-	match (reveal_expr e).eexpr with
-	| TTypeExpr t ->
-		let isglobal = match t with
-		| TClassDecl(c) -> Meta.has Meta.PhpGlobal c.cl_meta && c.cl_extern
-		| _ -> false in
-		spr ctx (if isglobal then "" else (s_path ctx (t_path t) false e.epos));
-		gen_member_access ctx isvar e s
-	| TLocal _ ->
-		gen_expr ctx e;
-		print ctx "->%s" (if isvar then s_ident_field s else s_ident s)
-	| TArray (e1,e2) ->
-		spr ctx "_hx_array_get(";
-		gen_value ctx e1;
-		spr ctx ", ";
-		gen_value ctx e2;
-		spr ctx ")";
-		gen_member_access ctx isvar e s
-	| TBlock _
-	| TParenthesis _
-	| TMeta _
-	| TObjectDecl _
-	| TArrayDecl _
-	| TNew _ ->
-		spr ctx "_hx_deref(";
-		ctx.is_call <- false;
-		gen_value ctx e;
-		spr ctx ")";
-		gen_member_access ctx isvar e s
-	| TCast (ec, _) when (match ec.eexpr with | TNew _ | TArrayDecl _ | TConst TNull -> true | _ -> false) ->
-		spr ctx "_hx_deref(";
-		ctx.is_call <- false;
-		gen_value ctx e;
-		spr ctx ")";
-		gen_member_access ctx isvar e s
-	| TConst TNull ->
-		spr ctx "_hx_deref(null)";
-		gen_member_access ctx isvar e s
-	| _ ->
-		gen_expr ctx e;
-		gen_member_access ctx isvar e s
-
-and gen_dynamic_function ctx isstatic name f params p =
-	let old = ctx.in_value in
-	let old_l = ctx.locals in
-	let old_li = ctx.inv_locals in
-	let old_t = ctx.local_types in
-	ctx.in_value <- None;
-	ctx.local_types <- List.map snd params @ ctx.local_types;
-	let byref = if (String.length name > 9 && String.sub name 0 9 = "__byref__") then "&" else "" in
-	print ctx "function %s%s(" byref name;
-	concat ctx ", " (fun (v,c) ->
-		let arg = define_local ctx v.v_name in
-		s_funarg ctx arg v.v_type p (arg_is_opt c);
-	) f.tf_args;
-	spr ctx ") {";
-
-	if (List.length f.tf_args) > 0 then begin
-		if isstatic then
-			print ctx " return call_user_func_array(self::$%s, array("  name
-		else
-			print ctx " return call_user_func_array($this->%s, array("  name;
-		concat ctx ", " (fun (v,_) ->
-			spr ctx ("$" ^ v.v_name)
-		) f.tf_args;
-		print ctx ")); }";
-	end else if isstatic then
-		print ctx " return call_user_func(self::$%s); }"  name
-	else
-		print ctx " return call_user_func($this->%s); }"  name;
-
-	newline ctx;
-	if isstatic then
-		print ctx "public static $%s = null" name
-	else
-		print ctx "public $%s = null" name;
-	ctx.in_value <- old;
-	ctx.locals <- old_l;
-	ctx.inv_locals <- old_li;
-	ctx.local_types <- old_t
-
-and gen_function ctx name f params p =
-	let old = ctx.in_value in
-	let old_l = ctx.locals in
-	let old_li = ctx.inv_locals in
-	let old_t = ctx.local_types in
-	ctx.in_value <- None;
-	ctx.local_types <- List.map snd params @ ctx.local_types;
-	let byref = if (String.length name > 9 && String.sub name 0 9 = "__byref__") then "&" else "" in
-	print ctx "function %s%s(" byref name;
-	concat ctx ", " (fun (v,o) ->
-		let arg = define_local ctx v.v_name in
-		s_funarg ctx arg v.v_type p (arg_is_opt o);
-	) f.tf_args;
-	print ctx ") ";
-	gen_expr ctx (fun_block ctx f p);
-	ctx.in_value <- old;
-	ctx.locals <- old_l;
-	ctx.inv_locals <- old_li;
-	ctx.local_types <- old_t
-
-
-and gen_inline_function ctx f hasthis p =
-	ctx.nested_loops <- ctx.nested_loops - 1;
-	let old = ctx.in_value in
-	let old_l = ctx.locals in
-	let old_li = ctx.inv_locals in
-	let old_t = ctx.local_types in
-	ctx.in_value <- Some "closure";
-
-	let args a = List.map (fun (v,_) -> v.v_name) a in
-
-	let used_locals = ref PMap.empty in
-
-	let rec loop e = match e.eexpr with
-		| TLocal v when not (start_with v.v_name "__hx__") && PMap.mem v.v_name old_l ->
-			used_locals := PMap.add v.v_name v.v_name !used_locals
-		| _ ->
-			Type.iter loop e
-	in
-	loop f.tf_expr;
-
-	spr ctx "array(new _hx_lambda(array(";
-
-	let c = ref 0 in
-
-	let print_arg a =
-		if !c > 0 then spr ctx ", ";
-		incr c;
-		print ctx "&$%s" a;
-	in
-	if hasthis then print_arg "this";
-	PMap.iter (fun _ a -> print_arg a) !used_locals;
-
-	spr ctx "), \"";
-
-	spr ctx (inline_function ctx (args f.tf_args) hasthis !used_locals (fun_block ctx f p));
-	print ctx "\"), 'execute')";
-
-	ctx.in_value <- old;
-	ctx.locals <- old_l;
-	ctx.inv_locals <- old_li;
-	ctx.local_types <- old_t;
-	ctx.nested_loops <- ctx.nested_loops + 1;
-
-and unset_locals ctx old_l =
-	let lst = ref [] in
-	PMap.iter (fun n _ ->
-		if not (PMap.exists n old_l) then
-			lst := ["$" ^  n] @ !lst;
-	) ctx.inv_locals;
-	if (List.length !lst) > 0 then begin
-		newline ctx;
-		spr ctx "unset(";
-		concat ctx "," (fun (s) -> spr ctx s; ) !lst;
-		spr ctx ")"
-	end
-
-and gen_while_expr ctx e =
-	let old_loop = ctx.in_loop in
-	ctx.in_loop <- true;
-	let old_nested_loops = ctx.nested_loops in
-	ctx.nested_loops <- 1;
-	let old_l = ctx.inv_locals in
-	let b = save_locals ctx in
-	(match e.eexpr with
-	| TBlock (el) ->
-		List.iter (fun e -> newline ctx; gen_expr ctx e) el;
-	| _ ->
-		newline ctx;
-		gen_expr ctx e);
-	unset_locals ctx old_l;
-	b();
-	ctx.nested_loops <- old_nested_loops;
-	ctx.in_loop <- old_loop
-
-and gen_tfield ctx e e1 s =
-	let name = (field_name s) in
-	match follow e.etype with
-	| TFun (args, _) ->
-		(if ctx.is_call then begin
-			gen_field_access ctx false e1 name
-	  	end else if is_in_dynamic_methods ctx e1 name then begin
-	  		gen_field_access ctx true e1 name;
-	  	end else begin
-			let ob ex =
-				(match ex with
-				| TTypeExpr t ->
-					print ctx "\"";
-					spr ctx (s_path ctx (t_path t) false e1.epos);
-					print ctx "\""
-				| _ ->
-					gen_expr ctx e1) in
-
-			spr ctx "(property_exists(";
-			ob e1.eexpr;
-			print ctx ", \"%s\") ? " (s_ident name);
-			gen_field_access ctx true e1 name;
-			spr ctx ": array(";
-			ob e1.eexpr;
-			print ctx ", \"%s\"))" (s_ident name);
-
-		end)
-	| TMono _ ->
-		if ctx.is_call then
-			gen_field_access ctx false e1 name
-		else
-			gen_uncertain_string_var ctx name e1
-	| TDynamic _ when not ctx.is_call && (match s with FDynamic _ -> true | _ -> false) ->
-		spr ctx "_hx_field(";
-		gen_value ctx e1;
-		print ctx ", \"%s\")" name
-	| _ ->
-		if is_string_expr e1 then
-			gen_string_var ctx name e1
-		else if is_uncertain_expr e1 then
-			gen_uncertain_string_var ctx name e1
-		else
-			gen_field_access ctx true e1 name
-
-and gen_expr ctx e =
-	let in_block = ctx.in_block in
-	ctx.in_block <- false;
-	let restore_in_block ctx inb =
-		if inb then ctx.in_block <- true
-	in
-	match e.eexpr with
-	| TConst c ->
-		gen_constant ctx e.epos c
-	| TLocal v ->
-		spr ctx ("$" ^ (try PMap.find v.v_name ctx.locals with Not_found -> (s_ident_local v.v_name)))
-	| TArray (e1,e2) ->
-		(match e1.eexpr with
-		| TCall _
-		| TBlock _
-		| TParenthesis _
-		| TMeta _
-		| TArrayDecl _ ->
-			spr ctx "_hx_array_get(";
-			gen_value ctx e1;
-			spr ctx ", ";
-			gen_value ctx e2;
-			spr ctx ")";
-		| TCast (ec, _) when (match ec.eexpr with | TArrayDecl _  | TBlock _ -> true | _ -> false) ->
-			spr ctx "_hx_array_get(";
-			gen_value ctx e1;
-			spr ctx ", ";
-			gen_value ctx e2;
-			spr ctx ")";
-		| _ ->
-			gen_value ctx e1;
-			spr ctx "[";
-			gen_value ctx e2;
-			spr ctx "]");
-	| TBinop (op,e1,e2) ->
-		(* these operators are non-assoc in php, let let's make sure to separate them with parenthesises *)
-		let non_assoc = function
-			| (Ast.OpEq | Ast.OpNotEq | Ast.OpGt | Ast.OpGte | Ast.OpLt | Ast.OpLte) -> true
-			| _ -> false
-		in
-		(match e1.eexpr with
-		| TBinop (op2,_,_) when non_assoc op && non_assoc op2 ->
-			gen_expr ctx { e with eexpr = TBinop (op,mk (TParenthesis e1) e1.etype e1.epos,e2) }
-		| _ ->
-		let leftside e =
-			(match e.eexpr with
-			| TArray(te1, te2) ->
-				gen_value ctx te1;
-				spr ctx "->a[";
-				gen_value ctx te2;
-				spr ctx "]";
-			| _ ->
-				gen_field_op ctx e1;) in
-		let leftsidec e =
-			(match e.eexpr with
-			| TArray(te1, te2) ->
-				gen_value ctx te1;
-				spr ctx "->a[";
-				gen_value ctx te2;
-				spr ctx "]";
-			| TField (e1,s) ->
-				gen_field_access ctx true e1 (field_name s)
-			| _ ->
-				gen_field_op ctx e1;) in
-		let leftsidef e =
-			(match e.eexpr with
-			| TField (e1,s) ->
-				gen_field_access ctx true e1 (field_name s)
-			| _ ->
-				gen_field_op ctx e1;
-				) in
-		(match op with
-		| Ast.OpMod ->
-			spr ctx "_hx_mod(";
-			gen_value_op ctx e1;
-			spr ctx ", ";
-			gen_value_op ctx e2;
-			spr ctx ")";
-		| Ast.OpAssign ->
-			(match e1.eexpr with
-			| TArray(te1, te2) when (match te1.eexpr with | TCall _ | TParenthesis _ -> true | _ -> false) ->
-				spr ctx "_hx_array_assign(";
-				gen_value ctx te1;
-				spr ctx ", ";
-				gen_value ctx te2;
-				spr ctx ", ";
-				gen_value_op ctx e2;
-				spr ctx ")";
-			| _ ->
-				leftsidef e1;
-				spr ctx " = ";
-				gen_value_op ctx e2;
-			)
-		| Ast.OpAssignOp(Ast.OpAdd) when (is_uncertain_expr e1 && is_uncertain_expr e2) ->
-			(match e1.eexpr with
-			| TArray(te1, te2) ->
-				let t1 = define_local ctx "__hx__t1" in
-				let t2 = define_local ctx "__hx__t2" in
-
-				print ctx "_hx_array_assign($%s = " t1;
-				gen_value ctx te1;
-				print ctx ", $%s = " t2;
-				gen_value ctx te2;
-				print ctx ", $%s->a[$%s] + " t1 t2;
-				gen_value_op ctx e2;
-				spr ctx ")";
-			| _ ->
-				leftside e1;
-				spr ctx " = ";
-				spr ctx "_hx_add(";
-				gen_value_op ctx e1;
-				spr ctx ", ";
-				gen_value_op ctx e2;
-				spr ctx ")";
-			)
-		| Ast.OpAssignOp(Ast.OpAdd) when (is_string_expr e1 || is_string_expr e2) ->
-			leftside e1;
-			spr ctx " .= ";
-			gen_value_op ctx (as_string_expr ctx e2);
-		| Ast.OpAssignOp(Ast.OpShl) ->
-			leftside e1;
-			spr ctx " <<= ";
-			gen_value_op ctx e2;
-		| Ast.OpAssignOp(Ast.OpUShr) ->
-			leftside e1;
-			spr ctx " = ";
-			spr ctx "_hx_shift_right(";
-			gen_value_op ctx e1;
-			spr ctx ", ";
-			gen_value_op ctx e2;
-			spr ctx ")";
-		| Ast.OpAssignOp(Ast.OpMod) ->
-			leftside e1;
-			spr ctx " = ";
-			spr ctx "_hx_mod(";
-			gen_value_op ctx e1;
-			spr ctx ", ";
-			gen_value_op ctx e2;
-			spr ctx ")";
-		| Ast.OpAssignOp(_) ->
-			leftsidec e1;
-			print ctx " %s " (Ast.s_binop op);
-			gen_value_op ctx e2;
-		| Ast.OpAdd when (is_uncertain_expr e1 && is_uncertain_expr e2) ->
-			spr ctx "_hx_add(";
-			gen_value_op ctx e1;
-			spr ctx ", ";
-			gen_value_op ctx e2;
-			spr ctx ")";
-		| Ast.OpAdd when (is_string_expr e1 || is_string_expr e2) ->
-			gen_value_op ctx (as_string_expr ctx e1);
-			spr ctx " . ";
-			gen_value_op ctx (as_string_expr ctx e2);
-		| Ast.OpShl ->
-			gen_value_op ctx e1;
-			spr ctx " << ";
-			gen_value_op ctx e2;
-		| Ast.OpUShr ->
-			spr ctx "_hx_shift_right(";
-			gen_value_op ctx e1;
-			spr ctx ", ";
-			gen_value_op ctx e2;
-			spr ctx ")";
-		| Ast.OpNotEq
-		| Ast.OpEq ->
-			let s_op = if op = Ast.OpNotEq then " != " else " == " in
-			let s_phop = if op = Ast.OpNotEq then " !== " else " === " in
-			let se1 = s_expr_name e1 in
-			let se2 = s_expr_name e2 in
-			if
-				   e1.eexpr = TConst (TNull)
-				|| e2.eexpr = TConst (TNull)
-			then begin
-				(match e1.eexpr with
-				| TField (f, s) when is_anonym_expr e1 || is_unknown_expr e1 ->
-					spr ctx "_hx_field(";
-					gen_value ctx f;
-					print ctx ", \"%s\")" (field_name s);
-				| _ ->
-					gen_field_op ctx e1;
-				);
-				spr ctx s_phop;
-
-				(match e2.eexpr with
-				| TField (f, s) when is_anonym_expr e2 || is_unknown_expr e2 ->
-					spr ctx "_hx_field(";
-					gen_value ctx f;
-					print ctx ", \"%s\")" (field_name s);
-				| _ ->
-					gen_field_op ctx e2);
-			end else if
-				   ((se1 = "Int" || se1 = "Null<Int>") && (se2 = "Int" || se2 = "Null<Int>"))
-				|| ((se1 = "Float" || se1 = "Null<Float>") && (se2 = "Float" || se2 = "Null<Float>"))
-				&& not (is_float e1 && is_float e2)
-			then begin
-				gen_field_op ctx e1;
-				spr ctx s_phop;
-				gen_field_op ctx e2;
-			end else if
-				   ((se1 = "Int" || se1 = "Float" || se1 = "Null<Int>" || se1 = "Null<Float>")
-				&& (se1 = "Int" || se1 = "Float" || se1 = "Null<Int>" || se1 = "Null<Float>"))
-				|| (is_unknown_expr e1 && is_unknown_expr e2)
-				|| is_anonym_expr e1
-				|| is_anonym_expr e2
-			then begin
-				if op = Ast.OpNotEq then spr ctx "!";
-				spr ctx "_hx_equal(";
-				gen_field_op ctx e1;
-				spr ctx ", ";
-				gen_field_op ctx e2;
-				spr ctx ")";
-			end else if
-				(
-					   se1 == se2
-					|| (match e1.eexpr with | TConst _ | TLocal _ | TArray _  | TNew _ -> true | _ -> false)
-					|| (match e2.eexpr with | TConst _ | TLocal _ | TArray _  | TNew _ -> true | _ -> false)
-					|| is_string_expr e1
-					|| is_string_expr e2
-					|| is_anonym_expr e1
-					|| is_anonym_expr e2
-					|| is_unknown_expr e1
-					|| is_unknown_expr e2
-				)
-				&& (type_string (follow e1.etype)) <> "Dynamic"
-				&& (type_string (follow e2.etype)) <> "Dynamic"
-			then begin
-				gen_field_op ctx e1;
-				spr ctx s_phop;
-				gen_field_op ctx e2;
-			end else begin
-				let tmp = define_local ctx "_t" in
-				print ctx "(is_object($%s = " tmp;
-				gen_field_op ctx e1;
-				print ctx ") && ($%s instanceof Enum) ? $%s%s" tmp tmp s_op;
-				gen_field_op ctx e2;
-				print ctx " : ";
-				if op = Ast.OpNotEq then spr ctx "!";
-				print ctx "_hx_equal($%s, " tmp;
-				gen_field_op ctx e2;
-				spr ctx "))";
-			end
-		| Ast.OpGt | Ast.OpGte | Ast.OpLt | Ast.OpLte when is_string_expr e1 ->
-			spr ctx "(strcmp(";
-			gen_field_op ctx e1;
-			spr ctx ", ";
-			gen_field_op ctx e2;
-			spr ctx ")";
-			let op_str = match op with
-				| Ast.OpGt -> ">"
-				| Ast.OpGte -> ">="
-				| Ast.OpLt -> "<"
-				| Ast.OpLte -> "<="
-				| _ -> assert false
-			in
-			print ctx "%s 0)" op_str
-		| _ ->
-			leftside e1;
-			print ctx " %s " (Ast.s_binop op);
-			gen_value_op ctx e2;
-		));
-	| TEnumParameter(e1,_,i) ->
-		spr ctx "_hx_deref(";
-		gen_value ctx e1;
-		spr ctx ")";
-		print ctx "->params[%d]" i;
-	| TField (e1,s) ->
-		gen_tfield ctx e e1 s
-	| TTypeExpr t ->
-		print ctx "_hx_qtype(\"%s\")" (s_path_haxe (t_path t))
-	| TParenthesis e ->
-		(match e.eexpr with
-		| TParenthesis _
-		| TReturn _ ->
-			gen_value ctx e;
-		| _ ->
-			spr ctx "(";
-			gen_value ctx e;
-			spr ctx ")"
-		);
-	| TMeta (_,e) ->
-		gen_expr ctx e
-	| TReturn eo ->
-		(match eo with
-		| None ->
-			spr ctx "return"
-		| Some e when (match follow e.etype with TEnum({ e_path = [],"Void" },[]) | TAbstract ({ a_path = [],"Void" },[]) -> true | _ -> false) ->
-			gen_value ctx e;
-			newline ctx;
-			spr ctx "return"
-		| Some e ->
-			(match e.eexpr with
-			| TThrow _ -> ()
-			| _ -> spr ctx "return ");
-			gen_value ctx e;
-			);
-	| TBreak ->
-		if ctx.in_loop then spr ctx "break" else print ctx "break %d" ctx.nested_loops
-	| TContinue ->
-		if ctx.in_loop then spr ctx "continue" else print ctx "continue %d" ctx.nested_loops
-	| TBlock [] when List.length ctx.dynamic_methods = 0 ->
-		spr ctx "{}"
-	| TBlock el ->
-		let old_l = ctx.inv_locals in
-		let b = save_locals ctx in
-		print ctx "{";
-		let bend = open_block ctx in
-		let cb = (
-			if not ctx.constructor_block then
-				(fun () -> ())
-			else begin
-				ctx.constructor_block <- false;
-				if List.length ctx.dynamic_methods > 0 then newline ctx else spr ctx " ";
-				List.iter (fun (f) ->
-					let name = f.cf_name in
-					match f.cf_expr with
-					| Some { eexpr = TFunction fd } ->
-						print ctx "if(!isset($this->%s)) $this->%s = " name name;
-						gen_inline_function ctx fd true e.epos;
-						newline ctx;
-					| _ -> ()
-				) ctx.dynamic_methods;
-				if Codegen.constructor_side_effects e then begin
-					print ctx "if(!%s::$skip_constructor) {" (s_path ctx (["php"],"Boot") false e.epos);
-					(fun() -> print ctx "}")
-				end else
-					(fun() -> ());
-			end) in
-		let remaining = ref (List.length el) in
-		let build e =
-			newline ctx;
-			if (in_block && !remaining = 1) then begin
-				(match e.eexpr with
-				| TIf _
-				| TSwitch _
-				| TThrow _
-				| TWhile _
-				| TFor _
-				| TTry _
-				| TBreak
-				| TBlock _ ->
-					restore_in_block ctx in_block;
-					gen_expr ctx e;
-					unset_locals ctx old_l;
-				| TReturn (Some e1) ->
-					(match e1.eexpr with
-					| TIf _
-					| TSwitch _
-					| TThrow _
-					| TWhile _
-					| TFor _
-					| TTry _
-					| TBlock _ -> ()
-					| _ ->
-						spr ctx "return "
-					);
-					gen_expr ctx e1;
-				| _ ->
-					spr ctx "return ";
-					gen_value ctx e;
-				)
-			end else begin
-				gen_expr ctx e;
-			end;
-			decr remaining;
-		in
-		List.iter build el;
-
-		if ctx.in_loop then begin
-			unset_locals ctx old_l;
-		end;
-		bend();
-		newline ctx;
-
-		cb();
-		print ctx "}";
-		b();
-	| TFunction f ->
-		let old = ctx.in_value, ctx.in_loop in
-		let old_meth = ctx.curmethod in
-		ctx.in_value <- None;
-		ctx.in_loop <- false;
-		ctx.curmethod <- ctx.curmethod ^ "@" ^ string_of_int (Lexer.get_error_line e.epos);
-		gen_inline_function ctx f false e.epos;
-		ctx.curmethod <- old_meth;
-		ctx.in_value <- fst old;
-		ctx.in_loop <- snd old;
-	| TCall (ec,el) ->
-		(match ec.eexpr with
-		| TArray _ ->
-			spr ctx "call_user_func_array(";
-			gen_value ctx ec;
-			spr ctx ", array(";
-			concat ctx ", " (gen_value ctx) el;
-			spr ctx "))";
-		| TField (ef,s) when is_static ef.etype && is_string_expr ef ->
-			gen_string_static_call ctx (field_name s) ef el
-		| TField (ef,s) when is_string_expr ef ->
-			gen_string_call ctx (field_name s) ef el
-		| TField (ef,s) when is_anonym_expr ef && could_be_string_call (field_name s) ->
-			gen_uncertain_string_call ctx (field_name s) ef el
-		| _ ->
-			gen_call ctx ec el);
-	| TArrayDecl el ->
-		spr ctx "(new _hx_array(array(";
-		concat ctx ", " (gen_value ctx) el;
-		spr ctx ")))";
-	| TThrow e ->
-		spr ctx "throw new HException(";
-		gen_value ctx e;
-		spr ctx ")";
-	| TVar (v,eo) ->
-		spr ctx "$";
-		let restore = save_locals ctx in
-		let n = define_local ctx v.v_name in
-		let restore2 = save_locals ctx in
-		restore();
-		(match eo with
-		| None ->
-			print ctx "%s = null" (s_ident_local n)
-		| Some e ->
-			print ctx "%s = " (s_ident_local n);
-			gen_value ctx e);
-		restore2()
-	| TNew (c,_,el) ->
-		(match c.cl_path, el with
-		| ([], "String"), _ ->
-			concat ctx "" (gen_value ctx) el
-		| ([], "Array"), el ->
-			spr ctx "new _hx_array(array(";
-			concat ctx ", " (gen_value ctx) el;
-			spr ctx "))"
-		| (_, _), _ ->
-			print ctx "new %s(" (s_path ctx c.cl_path c.cl_extern e.epos);
-			let count = ref (-1) in
-			concat ctx ", " (fun e ->
-				incr count;
-				match c.cl_constructor with
-				| Some f ->
-					gen_value ctx e;
-				| _ -> ();
-			) el;
-			spr ctx ")")
-	| TIf (cond,e,eelse) ->
-		spr ctx "if";
-		gen_value ctx (parent cond);
-		spr ctx " ";
-		restore_in_block ctx in_block;
-		gen_expr ctx (mk_block e);
-		(match eelse with
-		| None -> ()
-		| Some e when e.eexpr = TConst(TNull) -> ()
-		| Some e ->
-			spr ctx " else ";
-			restore_in_block ctx in_block;
-			gen_expr ctx (mk_block e));
-	| TUnop (op,Ast.Prefix,e) ->
-		(match e.eexpr with
-		| TArray(te1, te2) ->
-			(match op with
-			| Increment ->
-				spr ctx "_hx_array_increment(";
-				gen_value ctx te1;
-				spr ctx ",";
-				gen_value ctx te2;
-				spr ctx ")";
-			| Decrement ->
-				spr ctx "_hx_array_decrement(";
-				gen_value ctx te1;
-				spr ctx ",";
-				gen_value ctx te2;
-				spr ctx ")";
-			| _ ->
-				spr ctx (Ast.s_unop op);
-				gen_value ctx te1;
-				spr ctx "[";
-				gen_value ctx te2;
-				spr ctx "]";
-			);
-		| TField (e1,s) ->
-			spr ctx (Ast.s_unop op);
-			gen_tfield ctx e e1 s
-		| _ ->
-			spr ctx (Ast.s_unop op);
-			gen_value ctx e)
-	| TUnop (op,Ast.Postfix,e) ->
-		(match e.eexpr with
-		| TArray(te1, te2) ->
-			gen_value ctx te1;
-			spr ctx "->a[";
-			gen_value ctx te2;
-			spr ctx "]";
-		| TField (e1,s) ->
-			gen_field_access ctx true e1 (field_name s)
-		| _ ->
-			gen_value ctx e);
-		spr ctx (Ast.s_unop op)
-	| TWhile (cond,e,Ast.NormalWhile) ->
-		let old = save_locals ctx in
-		spr ctx "while";
-		gen_value ctx (parent cond);
-		spr ctx " {";
-		let bend = open_block ctx in
-		gen_while_expr ctx e;
-		bend();
-		newline ctx;
-		spr ctx "}";
-		old()
-	| TWhile (cond,e,Ast.DoWhile) ->
-		let old = save_locals ctx in
-		spr ctx "do {";
-		let bend = open_block ctx in
-		gen_while_expr ctx e;
-		bend();
-		newline ctx;
-		spr ctx "} while";
-		gen_value ctx (parent cond);
-		old()
-	| TObjectDecl fields ->
-		spr ctx "_hx_anonymous(array(";
-		concat ctx ", " (fun (f,e) -> print ctx "\"%s\" => " (escape_bin f); gen_value ctx e) fields;
-		spr ctx "))"
-	| TFor (v,it,e) ->
-		let b = save_locals ctx in
-		let tmp = define_local ctx "__hx__it" in
-		let v = define_local ctx v.v_name in
-		(match it.eexpr with
-		| TCall (e,_) ->
-			(match e.eexpr with
-			| TField (e,f) ->
-				spr ctx "if(null == ";
-				gen_value ctx e;
-				spr ctx ") throw new HException('null iterable')";
-				newline ctx;
-			| _ ->
-				());
-		| _ -> ()
-		);
-		print ctx "$%s = " tmp;
-		gen_value ctx it;
-		newline ctx;
-		print ctx "while($%s->hasNext()) {" tmp;
-		let bend = open_block ctx in
-		newline ctx;
-		(* unset loop variable (issue #2900) *)
-		print ctx "unset($%s)" v;
-		newline ctx;
-		print ctx "$%s = $%s->next()" v tmp;
-		gen_while_expr ctx e;
-		bend();
-		newline ctx;
-		spr ctx "}";
-		b();
-	| TTry (e,catchs) ->
-		spr ctx "try ";
-		restore_in_block ctx in_block;
-		gen_expr ctx (mk_block e);
-		let old = save_locals ctx in
-		let ex = define_local ctx "__hx__e" in
-		print ctx "catch(Exception $%s) {" ex;
-		let bend = open_block ctx in
-		let first = ref true in
-		let catchall = ref false in
-		let evar = define_local ctx "_ex_" in
-		newline ctx;
-		print ctx "$%s = ($%s instanceof HException) && $%s->getCode() == null ? $%s->e : $%s" evar ex ex ex ex;
-		old();
-		List.iter (fun (v,e) ->
-			let ev = define_local ctx v.v_name in
-			newline ctx;
-
-			let b = save_locals ctx in
-			if not !first then spr ctx "else ";
-			(match follow v.v_type with
-			| TEnum (te,_) -> (match te.e_path with
-				| [], "Bool"   -> print ctx "if(is_bool($%s = $%s))" ev evar
-				| _ -> print ctx "if(($%s = $%s) instanceof %s)" ev evar (s_path ctx te.e_path te.e_extern e.epos));
-				restore_in_block ctx in_block;
-				gen_expr ctx (mk_block e);
-			| TInst (tc,_) -> (match tc.cl_path with
-				| [], "Int"	-> print ctx "if(is_int($%s = $%s))"		ev evar
-				| [], "Float"  -> print ctx "if(is_numeric($%s = $%s))"	ev evar
-				| [], "String" -> print ctx "if(is_string($%s = $%s))"	ev evar
-				| [], "Array"  -> print ctx "if(($%s = $%s) instanceof _hx_array)"	ev evar
-				| _ -> print ctx "if(($%s = $%s) instanceof %s)"    ev evar (s_path ctx tc.cl_path tc.cl_extern e.epos));
-				restore_in_block ctx in_block;
-				gen_expr ctx (mk_block e);
-			| TAbstract (ta,_) -> (match ta.a_path with
-				| [], "Int"	-> print ctx "if(is_int($%s = $%s))"		ev evar
-				| [], "Float"  -> print ctx "if(is_numeric($%s = $%s))"	ev evar
-				| [], "Bool"   -> print ctx "if(is_bool($%s = $%s))" ev evar
-				| _ -> print ctx "if(($%s = $%s) instanceof %s)"    ev evar (s_path ctx ta.a_path false e.epos));
-				restore_in_block ctx in_block;
-				gen_expr ctx (mk_block e);
-			| TFun _
-			| TLazy _
-			| TType _
-			| TAnon _ ->
-				assert false
-			| TMono _
-			| TDynamic _ ->
-				catchall := true;
-				if not !first then spr ctx "{ ";
-				print ctx "$%s = $%s" ev evar;
-				newline ctx;
-				restore_in_block ctx in_block;
-				gen_expr ctx (mk_block e);
-				if not !first then spr ctx "}"
-			);
-			b();
-			first := false;
-		) catchs;
-		if not !catchall then
-			print ctx " else throw $%s;" ex;
-		bend();
-		newline ctx;
-		spr ctx "}"
-	| TSwitch (e,cases,def) ->
-		let old_loop = ctx.in_loop in
-		ctx.in_loop <- false;
-		ctx.nested_loops <- ctx.nested_loops + 1;
-		let old = save_locals ctx in
-		spr ctx "switch";
-		gen_value ctx (parent e);
-		spr ctx " {";
-		newline ctx;
-		List.iter (fun (el,e2) ->
-			List.iter (fun e ->
-				spr ctx "case ";
-				gen_value ctx e;
-				spr ctx ":";
-			) el;
-			restore_in_block ctx in_block;
-			gen_expr ctx (mk_block e2);
-			print ctx "break";
-			newline ctx;
-		) cases;
-		(match def with
-		| None -> ()
-		| Some e ->
-			spr ctx "default:";
-			restore_in_block ctx in_block;
-			gen_expr ctx (mk_block e);
-			print ctx "break";
-			newline ctx;
-		);
-		spr ctx "}";
-		ctx.nested_loops <- ctx.nested_loops - 1;
-		ctx.in_loop <- old_loop;
-		old()
-	| TCast (e,None) ->
-		gen_expr ctx e
-	| TCast (e1,Some t) ->
-		let mk_texpr = function
-			| TClassDecl c -> TAnon { a_fields = PMap.empty; a_status = ref (Statics c) }
-			| TEnumDecl e -> TAnon { a_fields = PMap.empty; a_status = ref (EnumStatics e) }
-			| TAbstractDecl a -> TAnon { a_fields = PMap.empty; a_status = ref (AbstractStatics a) }
-			| TTypeDecl _ -> assert false
-		in
-		spr ctx "_hx_cast(";
-		gen_expr ctx e1;
-		spr ctx ", ";
-		gen_expr ctx (mk (TTypeExpr t) (mk_texpr t) e1.epos);
-		spr ctx ")"
-
-and argument_list_from_locals include_this in_var l =
-	let lst = ref [] in
-	if (include_this && in_var) then lst := "__hx__this" :: !lst
-	else if include_this then lst := "this" :: !lst;
-	PMap.iter (fun n _ ->
-		lst := !lst @ [n];
-	) l;
-	!lst
-
-and remove_internals args =
-	List.filter (fun a -> a = "__hx__this" || not (start_with a "__hx__")) args;
-
-and inline_block ctx e =
-		let index = ctx.inline_index in
-		ctx.inline_index <- ctx.inline_index + 1;
-		let block = {
-			iname = (s_path ctx ctx.curclass.cl_path ctx.curclass.cl_extern ctx.curclass.cl_pos) ^ "_" ^ string_of_int index;
-			iindex = index;
-			ihasthis = ctx.in_instance_method; (* param this *)
-			iarguments = [];
-			iexpr = e;
-			ilocals = ctx.locals;
-			iin_block = true;
-			iinv_locals = ctx.inv_locals;
-		} in
-
-		print ctx "%s(" block.iname;
-		let in_value = (match ctx.in_value with Some _ -> true | _ -> false) in
-		(match remove_internals (argument_list_from_locals ctx.in_instance_method in_value ctx.locals) with
-		| [] -> ()
-		| l -> print ctx "$%s" (String.concat ", $" l)
-		);
-		spr ctx ")";
-
-		ctx.inline_methods <- ctx.inline_methods @ [block]
-
-and inline_function ctx args hasthis used_args e =
-		let index = ctx.inline_index in
-		ctx.inline_index <- ctx.inline_index + 1;
-		let block = {
-			iname = (s_path ctx ctx.curclass.cl_path ctx.curclass.cl_extern ctx.curclass.cl_pos) ^ "_" ^ string_of_int index;
-			iindex = index;
-			ihasthis = hasthis; (* param this *)
-			iarguments = args;
-			iexpr = e;
-			ilocals = used_args;
-			iin_block = false;
-			iinv_locals = used_args;
-		} in
-
-		ctx.inline_methods <- ctx.inline_methods @ [block];
-		block.iname
-
-and canbe_ternary_param e =
-	match e.eexpr with
-	| TTypeExpr _
-	| TConst _
-	| TLocal _
-	| TField (_,FEnum _)
-	| TParenthesis _
-	| TMeta _
-	| TObjectDecl _
-	| TArrayDecl _
-	| TCall _
-	| TUnop _
-	| TNew _
-	| TCast (_, _)
-	| TBlock [_] ->
-		true
-	| TIf (_,e,eelse) ->
-		cangen_ternary e eelse
-	| _ ->
-		false
-
-and cangen_ternary e eelse =
-	match eelse with
-	| Some other ->
-		(canbe_ternary_param e) && (canbe_ternary_param other)
-	| _ ->
-		false
-
-and gen_value ctx e =
-	match e.eexpr with
-	| TTypeExpr _
-	| TConst _
-	| TLocal _
-	| TArray _
-	| TBinop _
-	| TEnumParameter _
-	| TField _
-	| TParenthesis _
-	| TObjectDecl _
-	| TArrayDecl _
-	| TCall _
-	| TUnop _
-	| TNew _
-	| TFunction _ ->
-		gen_expr ctx e
-	| TMeta (_,e1) ->
-		gen_value ctx e1
-	| TBlock [] ->
-		()
-	| TCast (_, Some _) ->
-		gen_expr ctx e
-	| TCast (e, None)
-	| TBlock [e] ->
-		gen_value ctx e
-	| TIf (cond,e,eelse) when (cangen_ternary e eelse) ->
-		spr ctx "(";
-		gen_value ctx cond;
-		spr ctx " ? ";
-		gen_value ctx e;
-
-		(match eelse with
-		| Some e ->
-			spr ctx " : ";
-			gen_value ctx e
-		| _ ->());
-		spr ctx ")";
-
-(*
-	| TIf (cond,e,eelse) ->
-		spr ctx "if";
-		gen_value ctx (parent cond);
-		spr ctx " ";
-		restore_in_block ctx in_block;
-		gen_expr ctx (mk_block e);
-		(match eelse with
-		| None -> ()
-		| Some e when e.eexpr = TConst(TNull) -> ()
-		| Some e ->
-			spr ctx " else ";
-			restore_in_block ctx in_block;
-			gen_expr ctx (mk_block e));
-*)
-	| TBlock _
-	| TBreak
-	| TContinue
-	| TVar _
-	| TReturn _
-	| TWhile _
-	| TThrow _
-	| TSwitch _
-	| TFor _
-	| TIf _
-	| TTry _ ->
-		inline_block ctx e
-
-let rec is_instance_method_defined cls m =
-	if PMap.exists m cls.cl_fields then
-		true
-	else
-		match cls.cl_super with
-		| Some (scls, _) ->
-			is_instance_method_defined scls m
-		| None ->
-			false
-
-let is_method_defined ctx m static =
-	if static then
-		PMap.exists m ctx.curclass.cl_statics
-	else
-		is_instance_method_defined ctx.curclass m
-
-let generate_self_method ctx rights m static setter =
-	if setter then (
-		if static then
-			print ctx "%s function %s($v) { return call_user_func(self::$%s, $v); }" rights (s_ident m) (s_ident m)
-		else
-			print ctx "%s function %s($v) { return call_user_func($this->%s, $v); }" rights (s_ident m) (s_ident m)
-	) else (
-		if static then
-			print ctx "%s function %s() { return call_user_func(self::$%s); }" rights (s_ident m) (s_ident m)
-		else
-			print ctx "%s function %s() { return call_user_func($this->%s); }" rights (s_ident m) (s_ident m)
-	);
-	newline ctx
-
-let gen_assigned_value ctx eo =	match eo with
-	| Some ({eexpr = TConst _} as e) ->
-		print ctx " = ";
-		gen_value ctx e
-	| _ ->
-		()
-
-let generate_field ctx static f =
-	if not (is_extern_field f) then
-		newline ctx;
-	ctx.locals <- PMap.empty;
-	ctx.inv_locals <- PMap.empty;
-	ctx.in_instance_method <- not static;
-	let rights = if static then "static" else "public" in
-	let p = ctx.curclass.cl_pos in
-	match f.cf_expr with
-	| Some { eexpr = TFunction fd } ->
-		if f.cf_name = "__construct" then
-			ctx.curmethod <- "new"
-		else
-			ctx.curmethod <- f.cf_name;
-		spr ctx (rights ^ " ");
-		if is_dynamic_method f then
-			gen_dynamic_function ctx static (s_ident f.cf_name) fd f.cf_params p
-		else
-			gen_function ctx (s_ident f.cf_name) fd f.cf_params p
-	| _ ->
-		if (is_extern_field f) then
-			()
-		else if ctx.curclass.cl_interface then
-			match follow f.cf_type, f.cf_kind with
-			| TFun (args,r), Method _ ->
-				print ctx "function %s(" (s_ident f.cf_name);
-				concat ctx ", " (fun (arg,o,t) ->
-					s_funarg ctx arg t p o;
-				) args;
-				print ctx ")";
-			| _ -> spr ctx "//"; ()
-		else if
-			(match f.cf_kind with
-			| Var v ->
-				(match v.v_read, v.v_write with
-				| AccCall, AccCall ->
-					let m1 = "get_" ^ f.cf_name in
-					let m2 = "set_" ^ f.cf_name in
-					if not (is_method_defined ctx m1 static) then (
-						generate_self_method ctx rights m1 static false;
-						print ctx "%s $%s" rights (s_ident m1);
-						if not (is_method_defined ctx m2 static) then
-							newline ctx);
-					if not (is_method_defined ctx m2 static) then (
-						generate_self_method ctx rights m2 static true;
-						print ctx "%s $%s" rights (s_ident m2);
-						newline ctx);
-					false
-				| AccCall, _ ->
-					let m = "get_" ^ f.cf_name in
-					if not (is_method_defined ctx m static) then generate_self_method ctx rights m static false;
-					print ctx "%s $%s" rights (s_ident f.cf_name);
-					gen_assigned_value ctx f.cf_expr;
-					true
-				| _, AccCall ->
-					let m = "set_" ^ f.cf_name in
-					if not (is_method_defined ctx m static) then generate_self_method ctx rights m static true;
-					print ctx "%s $%s" rights (s_ident f.cf_name);
-					gen_assigned_value ctx f.cf_expr;
-					true
-				| _ ->
-					false)
-			| _ -> false) then
-				()
-		else begin
-			let name = if static then s_ident f.cf_name else f.cf_name in
-			if static then
-				(match f.cf_kind with
-				| Var _ ->
-					(match follow f.cf_type with
-					| TFun _
-					| TDynamic _ ->
-						print ctx "static function %s() { $args = func_get_args(); return call_user_func_array(self::$%s, $args); }" name name;
-						newline ctx;
-					| _ ->
-						()
-					)
-				| _ ->
-					()
-				);
-			print ctx "%s $%s" rights name;
-			gen_assigned_value ctx f.cf_expr
-		end
-
-let generate_static_field_assign ctx path f =
-	let p = ctx.curclass.cl_pos in
-	if not ctx.curclass.cl_interface then
-		(match f.cf_expr with
-		| None -> ()
-		| Some e ->
-			match e.eexpr with
-			| TConst _ -> ()
-			| TFunction fd ->
-				(match f.cf_kind with
-				| Var _ when
-						(match follow f.cf_type with
-						| TFun _
-						| TDynamic _ ->
-							true;
-						| _ ->
-							false) ->
-					newline ctx;
-					print ctx "%s::$%s = " (s_path ctx path false p) (s_ident f.cf_name);
-					gen_value ctx e
-				| Method MethDynamic ->
-					newline ctx;
-					print ctx "%s::$%s = " (s_path ctx path false p) (s_ident f.cf_name);
-					gen_value ctx e
-				| _ -> ())
-			| _ when is_extern_field f ->
-				()
-			| _ ->
-				newline ctx;
-				print ctx "%s::$%s = " (s_path ctx path false p) (s_ident f.cf_name);
-				gen_value ctx e)
-
-let rec super_has_dynamic c =
-	match c.cl_super with
-	| None -> false
-	| Some (csup, _) -> (match csup.cl_dynamic with
-		| Some _ -> true
-		| _ -> super_has_dynamic csup)
-
-let generate_inline_method ctx c m =
-	(match ctx.inline_methods with
-	| [] -> ()
-	| h :: t -> ctx.inline_methods <- t
-	);
-	ctx.curclass <- c;
-
-	let old = save_locals ctx in
-	ctx.in_value <- Some m.iname;
-	ctx.in_block <- m.iin_block;
-	ctx.in_loop <- false;
-	ctx.locals <- m.ilocals;
-	ctx.inv_locals <- m.iinv_locals;
-
-	newline ctx;
-	print ctx "function %s(" m.iname;
-	(* arguments *)
-	let in_value = (match ctx.in_value with Some _ -> true | _ -> false) in
-	let arguments = remove_internals (argument_list_from_locals m.ihasthis in_value ctx.locals) in
-	let arguments = match arguments with
-	| [h] when h = "this" -> ["__hx__this"]
-	| h :: t when h = "this" -> "__hx__this" :: t
-	| _ -> arguments
-	in
-
-	let marguments = List.map (define_local ctx) m.iarguments in
-	let arguments =  (List.map (fun a -> "&$" ^ a) arguments) @ (List.map (fun a -> "$" ^ a) marguments) in
-
-	(match arguments with
-	| [] -> ()
-	| l  -> spr ctx (String.concat ", " arguments)
-	);
-	spr ctx ") {";
-	ctx.nested_loops <- ctx.nested_loops - 1;
-	let block = open_block ctx in
-	newline ctx;
-
-	gen_expr ctx m.iexpr;
-	block();
-	old();
-	ctx.nested_loops <- ctx.nested_loops + 1;
-	newline ctx;
-	spr ctx "}"
-
-let generate_class ctx c =
-	let requires_constructor = ref true in
-	ctx.curclass <- c;
-	ctx.local_types <- List.map snd c.cl_params;
-
-	print ctx "%s %s " (if c.cl_interface then "interface" else "class") (s_path ctx c.cl_path c.cl_extern c.cl_pos);
-	(match c.cl_super with
-	| None -> ()
-	| Some (csup,_) ->
-		requires_constructor := false;
-		print ctx "extends %s " (s_path ctx csup.cl_path csup.cl_extern c.cl_pos));
-	(* Do not add interfaces which are implemented through other interfaces inheritance *)
-	let unique = List.filter
-		(fun (iface, _) ->
-			not (List.exists
-				(fun (probably_descendant, _) ->
-					if probably_descendant == iface then
-						false
-					else
-						is_parent iface probably_descendant
-				)
-				c.cl_implements
-			)
-		)
-		c.cl_implements
-	in
-	let implements = ExtList.List.unique ~cmp:(fun a b -> (fst a).cl_path = (fst b).cl_path) unique in
-	(match implements with
-	| [] -> ()
-	| l ->
-		spr ctx (if c.cl_interface then "extends " else "implements ");
-		concat ctx ", " (fun (i,_) ->
-		print ctx "%s" (s_path ctx i.cl_path i.cl_extern c.cl_pos)) l);
-	spr ctx "{";
-
-	let get_dynamic_methods = List.filter is_dynamic_method c.cl_ordered_fields in
-
-	if not ctx.curclass.cl_interface then ctx.dynamic_methods <- get_dynamic_methods;
-
-	let cl = open_block ctx in
-	(match c.cl_constructor with
-	| None ->
-		if !requires_constructor && not c.cl_interface then begin
-			newline ctx;
-			spr ctx "public function __construct(){}"
-		end;
-	| Some f ->
-		let f = { f with
-			cf_name = "__construct";
-			cf_public = true;
-		} in
-		ctx.constructor_block <- true;
-		generate_field ctx false f;
-		ctx.constructor_block <- false;
-	);
-
-	List.iter (generate_field ctx false) c.cl_ordered_fields;
-
-	(match c.cl_dynamic with
-		| Some _ when not c.cl_interface && not (super_has_dynamic c) ->
-			newline ctx;
-			spr ctx "public $__dynamics = array();\n\tpublic function __get($n) {\n\t\tif(isset($this->__dynamics[$n]))\n\t\t\treturn $this->__dynamics[$n];\n\t}\n\tpublic function __set($n, $v) {\n\t\t$this->__dynamics[$n] = $v;\n\t}\n\tpublic function __call($n, $a) {\n\t\tif(isset($this->__dynamics[$n]) && is_callable($this->__dynamics[$n]))\n\t\t\treturn call_user_func_array($this->__dynamics[$n], $a);\n\t\tif('toString' == $n)\n\t\t\treturn $this->__toString();\n\t\tthrow new HException(\"Unable to call <\".$n.\">\");\n\t}"
-		| Some _
-		| _ ->
-			if List.length ctx.dynamic_methods > 0 then begin
-				newline ctx;
-				spr ctx "public function __call($m, $a) {\n\t\tif(isset($this->$m) && is_callable($this->$m))\n\t\t\treturn call_user_func_array($this->$m, $a);\n\t\telse if(isset($this->__dynamics[$m]) && is_callable($this->__dynamics[$m]))\n\t\t\treturn call_user_func_array($this->__dynamics[$m], $a);\n\t\telse if('toString' == $m)\n\t\t\treturn $this->__toString();\n\t\telse\n\t\t\tthrow new HException('Unable to call <'.$m.'>');\n\t}";
-			end;
-	);
-
-	List.iter (generate_field ctx true) c.cl_ordered_statics;
-
-	let gen_props props =
-		String.concat "," (List.map (fun (p,v) -> "\"" ^ p ^ "\" => \"" ^ v ^ "\"") props)
-	in
-
-	let rec fields c =
-		let list = Codegen.get_properties (c.cl_ordered_statics @ c.cl_ordered_fields) in
-		match c.cl_super with
-		| Some (csup, _) ->
-			list @ fields csup
-		| None ->
-			list
-	in
-
-	if not c.cl_interface then (match fields c with
-		| [] ->
-			()
-		| props ->
-			newline ctx;
-			print ctx "static $__properties__ = array(%s)" (gen_props props);
-		);
-
-
-	cl();
-	newline ctx;
-
-	if PMap.exists "__toString" c.cl_fields then
-		()
-	else if PMap.exists "toString" c.cl_fields && (not c.cl_interface) && (not c.cl_extern) then begin
-		print ctx "\tfunction __toString() { return $this->toString(); }";
-		newline ctx
-	end else if (not c.cl_interface) && (not c.cl_extern) then begin
-		print ctx "\tfunction __toString() { return '%s'; }" (s_path_haxe c.cl_path) ;
-		newline ctx
-	end;
-
-	print ctx "}"
-
-
-let createmain com e =
-	let filename = match com.php_front with None -> "index.php" | Some n -> n in
-	let ctx = {
-		com = com;
-		stack = stack_init com false;
-		tabs = "";
-		ch = open_out (com.file ^ "/" ^ filename);
-		path = ([], "");
-		buf = Buffer.create (1 lsl 14);
-		in_value = None;
-		in_loop = false;
-		in_instance_method = false;
-		imports = Hashtbl.create 0;
-		extern_required_paths = [];
-		extern_classes_with_init = [];
-		curclass = null_class;
-		curmethod = "";
-		locals = PMap.empty;
-		inv_locals = PMap.empty;
-		local_types = [];
-		inits = [];
-		constructor_block = false;
-		dynamic_methods = [];
-		all_dynamic_methods = [];
-		is_call = false;
-		cwd = "";
-		inline_methods = [];
-		nested_loops = 0;
-		inline_index = 0;
-		in_block = false;
-		lib_path = match com.php_lib with None -> "lib" | Some s -> s;
-	} in
-
-	spr ctx "if(version_compare(PHP_VERSION, '5.1.0', '<')) {
-    exit('Your current PHP version is: ' . PHP_VERSION . '. Haxe/PHP generates code for version 5.1.0 or later');
-} else if(version_compare(PHP_VERSION, '5.4.0', '<')) {
-	trigger_error('Your current PHP version is: ' . PHP_VERSION . '. Code generated by Haxe/PHP might not work for versions < 5.4.0', E_USER_WARNING);
-}";
-	newline ctx;
-	newline ctx;
-	spr ctx ("require_once dirname(__FILE__).'/" ^ ctx.lib_path ^ "/php/" ^ (prefix_class com "Boot.class.php';\n\n"));
-	gen_expr ctx e;
-	newline ctx;
-	spr ctx "\n?>";
-	close ctx
-
-let generate_main ctx c =
-	(match c.cl_ordered_statics with
-	| [{ cf_expr = Some e }] ->
-		gen_value ctx e;
-	| _ -> assert false);
-		newline ctx
-
-let generate_enum ctx e =
-	ctx.local_types <- List.map snd e.e_params;
-	let pack = open_block ctx in
-	let ename = s_path ctx e.e_path e.e_extern e.e_pos in
-
-	print ctx "class %s extends Enum {" ename;
-	PMap.iter (fun _ c ->
-		newline ctx;
-		match c.ef_type with
-		| TFun (args,_) ->
-			print ctx "public static function %s($" (s_ident c.ef_name);
-			concat ctx ", $" (fun (a,o,t) ->
-				spr ctx a;
-				if o then spr ctx " = null";
-			) args;
-			spr ctx ") {";
-			print ctx " return new %s(\"%s\", %d, array($" ename (s_ident c.ef_name) c.ef_index;
-			concat ctx ", $" (fun (a,_,_) -> spr ctx a) args;
-			print ctx ")); }";
-		| _ ->
-			print ctx "public static $%s" (s_ident c.ef_name);
-	) e.e_constrs;
-	newline ctx;
-
-	spr ctx "public static $__constructors = array(";
-
-	let first = ref true in
-	PMap.iter (fun _ c ->
-		if not !first then spr ctx ", ";
-		print ctx "%d => '%s'" c.ef_index (s_ident c.ef_name);
-		first := false;
-	) e.e_constrs;
-
-	spr ctx ")";
-
-	newline ctx;
-
-	(match Codegen.build_metadata ctx.com (TEnumDecl e) with
-	| None -> ()
-	| Some _ ->
-		spr ctx "public static $__meta__";
-		newline ctx);
-
-	pack();
-
-	print ctx "}";
-
-	PMap.iter (fun _ c ->
-		match c.ef_type with
-		| TFun (args,_) ->
-			();
-		| _ ->
-			newline ctx;
-			print ctx "%s::$%s = new %s(\"%s\", %d)" ename (s_ident c.ef_name) ename c.ef_name c.ef_index;
-	) e.e_constrs;
-
-	newline ctx;
-
-	match Codegen.build_metadata ctx.com (TEnumDecl e) with
-	| None -> ()
-	| Some e ->
-		print ctx "%s::$__meta__ = " ename;
-		gen_expr ctx e;
-		newline ctx
-
-let generate com =
-	let all_dynamic_methods = ref [] in
-	let extern_classes_with_init = ref [] in
-	let php_lib_path = (match com.php_lib with None -> "lib" | Some n -> n) in
- 	create_directory com (Str.split (Str.regexp "/")  php_lib_path);
-	(* check for methods with the same name but different case *)
-	let check_class_fields c =
-		let lc_names = ref [] in
-		let special_cases = ["toString"] in
-		let loop c lst static =
-			let in_special_cases name =
-				(List.exists (fun n -> String.lowercase n = name) (special_cases @ List.map (fun f -> f.cf_name) c.cl_overrides))
-			in
-			List.iter(fun cf ->
-				let name = String.lowercase cf.cf_name in
-				let prefixed_name s = (if s then "s_" else "i_") ^ name in
-				match cf.cf_kind, cf.cf_expr with
-				| (Method _, Some e) when not (in_special_cases name) ->
-					(try
-						let lc = List.find (fun n ->
-							let n = snd n in
-							if static then
-								(n = (prefixed_name false))
-							else
-								((n = (prefixed_name false)) || (n = (prefixed_name true)))
-						) !lc_names in
-						unsupported ("method '" ^ (Globals.s_type_path c.cl_path) ^ "." ^ cf.cf_name ^ "' already exists here '" ^ (fst lc) ^ "' (different case?)") c.cl_pos
-					with Not_found ->
-						lc_names := ((Globals.s_type_path c.cl_path) ^ "." ^ cf.cf_name, prefixed_name static) :: !lc_names)
-				| _ ->
-					()
-			) lst
-		in
-		let rec _check_class_fields cl =
-			(match cl.cl_super with
-			| Some (s,_) -> _check_class_fields s
-			| _ -> ());
-			loop cl cl.cl_ordered_statics true;
-			loop cl cl.cl_ordered_fields false
-		in
-		_check_class_fields c
-	in
-	List.iter (fun t ->
-		(match t with
-		| TClassDecl c ->
-			check_class_fields c
-		| TEnumDecl e ->
-			let e_names = ref [] in
-			List.iter(fun en -> (
-				if List.exists (fun n -> n = String.lowercase en) !e_names then
-					unsupported ("'" ^ en ^ "' constructor exists with different case") e.e_pos
-				else
-					e_names := (String.lowercase en) :: !e_names
-			)) (e.e_names)
-		| _ -> ())
-	) com.types;
-	List.iter (fun t ->
-		(match t with
-		| TClassDecl c ->
-			let dynamic_methods_names lst =
-				List.map (fun fd -> {
-					mpath = c.cl_path;
-					mname = fd.cf_name;
-				}) (List.filter is_dynamic_method lst)
-			in
-			all_dynamic_methods := dynamic_methods_names c.cl_ordered_fields @ !all_dynamic_methods;
-
-			if c.cl_extern then
-				(match c.cl_init with
-				| Some _ ->
-					extern_classes_with_init := c.cl_path :: !extern_classes_with_init;
-				| _ ->
-					())
-			else
-				all_dynamic_methods := dynamic_methods_names c.cl_ordered_statics @ !all_dynamic_methods;
-		| _ -> ())
-	) com.types;
-	List.iter (Codegen.fix_abstract_inheritance com) com.types;
-	List.iter (fun t ->
-		(match t with
-		| TClassDecl c ->
-			if c.cl_extern then begin
-				(match c.cl_init with
-				| None -> ()
-				| Some e ->
-					let ctx = init com php_lib_path c.cl_path 3 in
-					gen_expr ctx e;
-					newline ctx;
-					close ctx;
-					);
-			end else
-				let ctx = init com php_lib_path c.cl_path (if c.cl_interface then 2 else 0) in
-				ctx.extern_classes_with_init <- !extern_classes_with_init;
-				ctx.all_dynamic_methods <- !all_dynamic_methods;
-
-				generate_class ctx c;
-
-				(match c.cl_init with
-				| None -> ()
-				| Some e ->
-					newline ctx;
-					gen_expr ctx e);
-				List.iter (generate_static_field_assign ctx c.cl_path) c.cl_ordered_statics;
-				if c.cl_path = (["php"], "Boot") && com.debug then begin
-					newline ctx;
-					print ctx "$%s = new _hx_array(array())" ctx.stack.Codegen.stack_var;
-					newline ctx;
-					print ctx "$%s = new _hx_array(array())" ctx.stack.Codegen.stack_exc_var;
-				end;
-
-				let rec loop l =
-					match l with
-					| [] -> ()
-					| h :: _ ->
-						generate_inline_method ctx c h;
-						loop ctx.inline_methods
-				in
-				loop ctx.inline_methods;
-				newline ctx;
-				close ctx
-		| TEnumDecl e ->
-			if e.e_extern then
-				()
-			else
-				let ctx = init com php_lib_path e.e_path 1 in
-			generate_enum ctx e;
-			close ctx
-		| TTypeDecl _ | TAbstractDecl _ ->
-			());
-	) com.types;
-	(match com.main with
-	| None -> ()
-	| Some e -> createmain com e);
-	Hashtbl.iter (fun name data ->
-		write_resource com.file name data
-	) com.resources;
diff --git a/src/generators/genphp7.ml b/src/generators/genphp7.ml
index 66a00204fe9c89d815a69ad88aad0c34b9427128..f96c7053832f627a8056a0962fbc00f02694a8a0 100644
--- a/src/generators/genphp7.ml
+++ b/src/generators/genphp7.ml
@@ -1,5 +1,5 @@
 (**
-	Compatible with PHP 7+
+	Compatible with PHP 7.0+
 *)
 
 open Ast
@@ -9,12 +9,6 @@ open Meta
 open Globals
 open Sourcemaps
 
-let debug = ref false
-(**
-	Do not add comments with Haxe positions before each line of generated php code
-*)
-let skip_line_directives = ref false
-
 (**
 	Escape string for constant strings generation.
 	Copy-pasted from genphp.
@@ -46,6 +40,41 @@ let write_resource dir name data =
 	output_string ch data;
 	close_out ch
 
+(**
+	Copy file from `src` to `dst`.
+	If `dst` exists it will be overwritten.
+*)
+let copy_file src dst =
+	let buffer_size = 8192 in
+	let buffer = String.create buffer_size in
+	let fd_in = Unix.openfile src [O_RDONLY] 0 in
+	let fd_out = Unix.openfile dst [O_WRONLY; O_CREAT; O_TRUNC] 0o644 in
+	let rec copy_loop () =
+		match Unix.read fd_in buffer 0 buffer_size with
+			|  0 -> ()
+			| r -> ignore (Unix.write fd_out buffer 0 r); copy_loop ()
+	in
+	copy_loop ();
+	Unix.close fd_in;
+	Unix.close fd_out
+
+type used_type = {
+	ut_alias : string;
+	ut_type_path : (string list * string)
+}
+
+type php_generator_context = {
+	pgc_common : Common.context;
+	(** Do not add comments with Haxe positions before each line of generated php code *)
+	pgc_skip_line_directives : bool;
+	(** The value of `-D php-prefix=value` split by dots *)
+	pgc_prefix : string list;
+	(** php.Boot *)
+	pgc_boot : tclass;
+	(** see type_name_used_in_namespace *)
+	pgc_namespaces_types_cache : (string list, string) Hashtbl.t
+}
+
 (**
 	Get list of keys in Hashtbl
 *)
@@ -123,26 +152,31 @@ let bool_type_path = ([], "Bool")
 let std_type_path = ([], "Std")
 
 (**
-	Stub to use when you need a `Ast.pos` instance, but don't have one
+	The name of a file with polyfills for some functions which are not available in PHP 7.0
 *)
-let dummy_pos = { pfile = ""; pmin = 0; pmax = 0 }
+let polyfills_file = "_polyfills.php"
+
+let php_keywords_list =
+	["__halt_compiler"; "abstract"; "and"; "array"; "as"; "break"; "callable"; "case"; "catch"; "class";
+	"clone"; "const"; "continue"; "declare"; "default"; "die"; "do"; "echo"; "else"; "elseif"; "empty";
+	"enddeclare"; "endfor"; "endforeach"; "endif"; "endswitch"; "endwhile"; "eval"; "exit"; "extends"; "final";
+	"finally"; "for"; "foreach"; "function"; "global"; "goto"; "if"; "implements"; "include"; "include_once";
+	"instanceof"; "insteadof"; "interface"; "isset"; "list"; "namespace"; "new"; "or"; "print"; "private";
+	"protected"; "public"; "require"; "require_once"; "return"; "static"; "switch"; "throw"; "trait"; "try";
+	"unset"; "use"; "var"; "while"; "xor"; "yield"; "__class__"; "__dir__"; "__file__"; "__function__"; "__line__";
+	"__method__"; "__trait__"; "__namespace__"; "int"; "float"; "bool"; "string"; "true"; "false"; "null"; "parent";
+	"void"; "iterable"; "object"; "fn"]
+
+let php_keywords_tbl = begin
+	let tbl = Hashtbl.create 100 in
+	List.iter (fun kwd -> Hashtbl.add tbl kwd ()) php_keywords_list;
+	tbl
+end
 
 (**
 	Check if specified string is a reserved word in PHP
 *)
-let is_keyword str =
-	match String.lowercase str with
-		| "__halt_compiler" | "abstract" | "and" | "array" | "as" | "break" | "callable" | "case" | "catch" | "class"
-		| "clone" | "const" | "continue" | "declare" | "default" | "die" | "do" | "echo" | "else" | "elseif" | "empty"
-		| "enddeclare" | "endfor" | "endforeach" | "endif" | "endswitch" | "endwhile" | "eval" | "exit" | "extends"
-		| "final" | "finally" | "for" | "foreach" | "function" | "global" | "goto" | "if" | "implements" | "include"
-		| "include_once" | "instanceof" | "insteadof" | "interface" | "isset" | "list" | "namespace" | "new" | "or"
-		| "print" | "private" | "protected" | "public" | "require" | "require_once" | "return" | "static" | "switch"
-		| "throw" | "trait" | "try" | "unset" | "use" | "var" | "while" | "xor" | "yield" | "__class__" | "__dir__"
-		| "__file__" | "__function__" | "__line__" | "__method__" | "__trait__" | "__namespace__" | "int" | "float"
-		| "bool" | "string" | "true" | "false" | "null" | "parent" | "void" | "iterable" | "object"
-			-> true
-		| _ -> false
+let is_keyword str = Hashtbl.mem php_keywords_tbl (String.lowercase str)
 
 (**
 	Check if specified type is Void
@@ -175,34 +209,14 @@ let get_real_path path = List.map get_real_name path
 *)
 let rec follow = Abstract.follow_with_abstracts
 
-let prefix = ref None
 (**
-	Returns value of `--php-prefix` compiler flag
-*)
-let get_php_prefix ctx =
-	match !prefix with
-		| Some prefix -> prefix
-		| None ->
-			let lst =
-				match ctx.php_prefix with
-					| None -> []
-					| Some str ->
-						if String.length str = 0 then
-							[]
-						else
-							Str.split (Str.regexp "\\.") str
-			in
-			prefix := Some lst;
-			lst
-
-(**
-	Adds packages specified by `--php-prefix` to `type_path`.
-	E.g. if `--php-prefix some.sub` and `type_path` is `(["pack"], "MyClass")`, then this function
+	Adds packages specified by `-D php-prefix` to `type_path`.
+	E.g. if `-D php-prefix=some.sub` and `type_path` is `(["pack"], "MyClass")`, then this function
 	will return `(["some", "sub", "pack"], "MyClass")`
 *)
 let add_php_prefix ctx type_path =
 	match type_path with
-		| (pack, name) -> ((get_php_prefix ctx) @ pack, name)
+		| (pack, name) -> (ctx.pgc_prefix @ pack, name)
 
 (**
 	If `expr` is a TCast or TMeta, then returns underlying expression (recursively bypassing nested casts).
@@ -238,20 +252,21 @@ let error_message pos message = (stringify_pos pos) ^ ": " ^ message
 (**
 	Terminates compiler process and prints user-friendly instructions about filing an issue in compiler repo.
 *)
-let fail hxpos mlpos =
+let fail ?msg hxpos mlpos =
+	let msg =
+		error_message
+			hxpos
+			(
+				(match msg with Some msg -> msg | _ -> "")
+				^ " Unexpected expression. Please submit an issue with expression example and following information:"
+			)
+	in
 	match mlpos with
-		| (file, line, _) ->
-			Printf.printf "%s\n" (error_message hxpos "Unexpected expression. Please submit an issue with expression example and following information:");
-			Printf.printf "%s:%d\n" file line;
+		| (file, line, _, _) ->
+			Printf.eprintf "%s\n" msg;
+			Printf.eprintf "%s:%d\n" file line;
 			assert false
 
-(**
-	Print compilation error message and abort compilation process.
-*)
-let error_and_exit pos message =
-	Printf.printf "%s" (error_message pos message);
-	exit 1
-
 (**
 	Check if `target` is a `Dynamic` type
 *)
@@ -295,10 +310,20 @@ let is_string_type t = match follow t with TInst ({ cl_path = ([], "String") },
 *)
 let is_string expr = is_string_type expr.etype
 
+(**
+	Check if specified type is Array
+*)
+let is_array_type t = match follow t with TInst ({ cl_path = ([], "Array") }, _) -> true | _ -> false
+
+(**
+	Check if specified type represents a function
+*)
+let is_function_type t = match follow t with TFun _ -> true | _ -> false
+
 (**
 	Check if `expr` is an access to a method of special `php.PHP` class
 *)
-let is_lang_extern expr =
+let is_syntax_extern expr =
 	match expr.eexpr with
 		| TField ({ eexpr = TTypeExpr (TClassDecl { cl_path = path }) }, _) when path = syntax_type_path -> true
 		| _ -> false
@@ -316,42 +341,6 @@ let is_generic_parameter (target:Type.t) =
 *)
 let is_unknown_type (target:Type.t) = is_dynamic_type target || is_generic_parameter target
 
-(**
-	@return `Type.t` instance for `Void`
-*)
-let void = ref None
-let get_void ctx : Type.t =
-	match !void with
-		| Some value -> value
-		| None ->
-			let find com_type =
-				match com_type with
-					| TAbstractDecl ({ a_path = ([], "Void") } as abstr) -> void := Some (TAbstract (abstr, []));
-					| _ -> ()
-			in
-			List.iter find ctx.types;
-			match !void with
-				| Some value -> value
-				| None -> fail dummy_pos (try assert false with Assert_failure mlpos -> mlpos)
-
-(**
-	@return `tclass` instance for `php.Boot`
-*)
-let boot = ref None
-let get_boot ctx : tclass =
-	match !boot with
-		| Some value -> value
-		| None ->
-			let find com_type =
-				match com_type with
-					| TClassDecl ({ cl_path = path } as cls) when path = boot_type_path -> boot := Some cls;
-					| _ -> ()
-			in
-			List.iter find ctx.types;
-			match !boot with
-				| Some value -> value
-				| None -> fail dummy_pos (try assert false with Assert_failure mlpos -> mlpos)
-
 (**
 	@return `expr` wrapped in parenthesis
 *)
@@ -393,7 +382,8 @@ let needs_dereferencing for_assignment expr =
 			(* some of `php.Syntax` methods *)
 			| TCall ({ eexpr = TField (_, FStatic ({ cl_path = syntax_type_path }, { cf_name = name })) }, _) ->
 				(match name with
-					| "binop" | "object" | "array" -> for_assignment
+					| "codeDeref" -> for_assignment
+					| "coalesce" -> for_assignment
 					| _ -> false
 				)
 			| _ -> false
@@ -409,7 +399,7 @@ let needs_dereferencing for_assignment expr =
 let get_function_signature (field:tclass_field) : (string * bool * Type.t) list * Type.t =
 	match follow field.cf_type with
 		| TFun (args, return_type) -> (args, return_type)
-		| _ -> fail field.cf_pos (try assert false with Assert_failure mlpos -> mlpos)
+		| _ -> fail field.cf_pos __POS__
 
 (**
 	Check if `target` is 100% guaranteed to be a scalar type in PHP.
@@ -519,20 +509,27 @@ let create_dir_recursive (path:string list) =
 (**
 	@return String representation of specified type path. E.g. returns "\example\Test" for (["example"], "Test")
 *)
-let get_full_type_name ?escape ?omit_first_slash (type_path:path) =
+let get_full_type_name ?(escape=false) ?(omit_first_slash=false) (type_path:path) =
 	let name =
 		match type_path with
+			| ([], type_name) ->
+				if omit_first_slash then
+					type_name
+				else
+					"\\" ^ type_name
 			| (module_path, type_name) ->
 				let parts =
-					match omit_first_slash with
-						| Some true -> get_real_path module_path
-						| _ -> "" :: get_real_path module_path
+					if omit_first_slash then
+						get_real_path module_path
+					else
+						"" :: get_real_path module_path
 				in
 				(String.concat "\\" parts) ^ "\\" ^ type_name
 	in
-	match escape with
-		| Some true -> String.escaped name
-		| _ -> name
+	if escape then
+		String.escaped name
+	else
+		name
 
 (**
 	Check if `target` is or implements native PHP `Throwable` interface
@@ -612,15 +609,15 @@ let is_inline_var (field:tclass_field) =
 (**
 	@return New TBlock expression which is composed of setting default values for optional arguments and function body.
 *)
-let inject_defaults (ctx:Common.context) (func:tfunc) =
+let inject_defaults (ctx:php_generator_context) (func:tfunc) =
 	let rec inject args body_exprs =
 		match args with
 			| [] -> body_exprs
 			| (_, None) :: rest -> inject rest body_exprs
-			| (_, Some TNull) :: rest -> inject rest body_exprs
+			| (_, Some {eexpr = TConst TNull}) :: rest -> inject rest body_exprs
 			| (var, Some const) :: rest ->
-				let expr = Codegen.set_default ctx var const func.tf_expr.epos in
-			 	expr :: (inject rest body_exprs)
+				let expr = Texpr.set_default ctx.pgc_common.basic var const func.tf_expr.epos in
+				expr :: (inject rest body_exprs)
 	in
 	let exprs =
 		match func.tf_expr.eexpr with
@@ -701,7 +698,7 @@ let is_access expr =
 *)
 let is_magic expr =
 	match expr.eexpr with
-	| TCall ({ eexpr = TLocal { v_name = name }}, _) ->
+	| TCall ({ eexpr = TIdent name}, _) ->
 		(match name with
 			| "__php__" -> true
 			| "__call__" -> true
@@ -718,24 +715,35 @@ let need_boot_equal expr1 expr2 =
 	if is_constant_null expr1 || is_constant_null expr2 then
 		false
 	else
-		(is_int expr1 && (is_float expr2 || is_unknown_type expr2.etype))
-		|| (is_float expr1 && (is_float expr2 || is_int expr2 || is_unknown_type expr2.etype))
-		|| (is_unknown_type expr1.etype && (is_int expr2 || is_float expr2))
-		|| (is_unknown_type expr1.etype && is_unknown_type expr2.etype)
+		let unknown1 = is_unknown_type expr1.etype
+		and unknown2 = is_unknown_type expr2.etype in
+		if unknown1 && unknown2 then
+			true
+		else if is_function_type expr1.etype || is_function_type expr2.etype then
+			true
+		else
+			let int1 = is_int expr1
+			and int2 = is_int expr2
+			and float1 = is_float expr1
+			and float2 = is_float expr2 in
+			(int1 && float2)
+			|| (float1 && (float2 || int2))
+			|| (unknown1 && (int2 || float2))
+			|| ((int1 || float1) && unknown2)
 
 (**
 	Adds `return` expression to block if it does not have one already
 *)
 let ensure_return_in_block block_expr =
 	match block_expr.eexpr with
-		| TBlock [] -> fail block_expr.epos (try assert false with Assert_failure mlpos -> mlpos)
+		| TBlock [] -> fail block_expr.epos __POS__
 		| TBlock exprs ->
 			let reversed = List.rev exprs in
 			let last_expr = List.hd reversed in
 			let return_expr = { last_expr with eexpr = TReturn (Some last_expr) } in
 			let reversed = return_expr::(List.tl reversed) in
 			{ block_expr with eexpr = TBlock (List.rev reversed) }
-		| _ -> fail block_expr.epos (try assert false with Assert_failure mlpos -> mlpos)
+		| _ -> fail block_expr.epos __POS__
 
 (**
 	If `expr` is a block, then return list of expressions in that block.
@@ -754,14 +762,14 @@ let unpack_block expr =
 let unpack_single_expr_block expr =
 		match expr.eexpr with
 			| TBlock [ e ] -> e
-			| TBlock _ -> fail expr.epos (try assert false with Assert_failure mlpos -> mlpos)
+			| TBlock _ -> fail expr.epos __POS__
 			| _ -> expr
 
 (**
 	Check if specified type has rtti meta
 *)
 let has_rtti_meta ctx mtype =
-	match Codegen.build_metadata ctx mtype with
+	match Texpr.build_metadata ctx.basic mtype with
 		| None -> false
 		| Some _ -> true
 
@@ -818,11 +826,16 @@ let is_object_declaration expr =
 	Check if `subject_arg` and `type_arg` can be generated as `$subject instanceof Type` expression.
 *)
 let instanceof_compatible (subject_arg:texpr) (type_arg:texpr) : bool =
+	let is_real_class path =
+		match path with
+			| ([], "String") | ([], "Class") | (["php";"_NativeArray"], "NativeArray_Impl_") -> false
+			| _ -> true
+	in
 	match (reveal_expr_with_parenthesis type_arg).eexpr with
-		| TTypeExpr (TClassDecl { cl_path = path }) when path <> ([], "String") && path <> ([], "Class") ->
+		| TTypeExpr (TClassDecl { cl_path = path }) when is_real_class path ->
 			let subject_arg = reveal_expr_with_parenthesis subject_arg in
 			(match subject_arg.eexpr with
-				| TLocal _ | TField _ | TCall _ | TArray _ -> not (is_magic subject_arg)
+				| TLocal _ | TField _ | TCall _ | TArray _ | TConst TThis -> not (is_magic subject_arg)
 				| _ -> false
 			)
 		| _ -> false
@@ -898,20 +911,18 @@ class class_wrapper (cls) =
 				match cls.cl_init with
 					| Some _ -> true
 					| None ->
-						let needs = ref false in
-						PMap.iter
-							(fun _ field ->
+						List.exists
+							(fun field ->
 								(* Skip `inline var` fields *)
-								if not (is_inline_var field) then begin
-									if not !needs then needs := is_var_with_nonconstant_expr field;
-									(* Check static vars with non-constant expressions *)
-									if not !needs then needs := is_var_with_nonconstant_expr field;
-									(* Check static dynamic functions *)
-									if not !needs then needs := is_dynamic_method field
-								end
+								not (is_inline_var field)
+								&& match field.cf_kind, field.cf_expr with
+									| Var _, Some { eexpr = TConst (TInt value) } -> value = Int32.min_int
+									| Var _, Some { eexpr = TConst _ } -> false
+									| Var _, Some _ -> true
+									| Method MethDynamic, _ -> true
+									| _ -> false
 							)
-							cls.cl_statics;
-						!needs
+							cls.cl_ordered_statics
 		(**
 			Returns expression of a user-defined static __init__ method
 			@see http://old.haxe.org/doc/advanced/magic#initialization-magic
@@ -937,7 +948,7 @@ class class_wrapper (cls) =
 					| Some body ->
 						let path =
 							match cls.cl_path with
-								| (pack, name) -> (pack @ ["_" ^ name], ("_extern_" ^ name))
+								| (pack, name) -> (pack, ("_extern_" ^ name))
 						in
 						let additional_cls = {
 							cls with
@@ -1097,21 +1108,21 @@ let clear_wrappers () =
 (**
 	Check if specified type name is used in specified namespace
 *)
-let namespaces_types_cache = Hashtbl.create 512
-let type_name_used_in_namespace ctx name namespace =
-	let types = Hashtbl.find_all namespaces_types_cache namespace in
-	match types with
-		| [] ->
-			List.iter
-				(fun ctx_type ->
-					let wrapper = get_wrapper ctx_type in
-					Hashtbl.add namespaces_types_cache wrapper#get_namespace wrapper#get_name
-				)
-				ctx.types;
-			let types = Hashtbl.find_all namespaces_types_cache namespace in
-			List.mem name types
-		| _ ->
-			List.mem name types
+let type_name_used_in_namespace ctx type_path as_name namespace =
+	let types =
+		match Hashtbl.find_all ctx.pgc_namespaces_types_cache namespace with
+			| [] ->
+				List.iter
+					(fun ctx_type ->
+						let wrapper = get_wrapper ctx_type in
+						Hashtbl.add ctx.pgc_namespaces_types_cache wrapper#get_namespace wrapper#get_name
+					)
+					ctx.pgc_common.types;
+				Hashtbl.find_all ctx.pgc_namespaces_types_cache namespace
+			| types -> types
+	in
+	List.mem as_name types
+	&& (namespace, as_name) <> type_path
 
 (**
 	Simple list intersection implementation.
@@ -1212,7 +1223,7 @@ class local_vars =
 (**
 	Consumes expressions and generates php code to output buffer.
 *)
-class code_writer (ctx:Common.context) hx_type_path php_name =
+class code_writer (ctx:php_generator_context) hx_type_path php_name =
 	object (self)
 		(** Namespace path. E.g. ["some"; "pack"] for "some.pack.MyType" *)
 		val namespace = get_module_path hx_type_path
@@ -1230,6 +1241,8 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 		val mutable sourcemap : sourcemap_builder option = None
 		(** Indicates if `super()` expressions should be generated if spotted. *)
 		val mutable has_super_constructor = true
+		(** The latest string written to the output buffer via `self#write_pos` method *)
+		val mutable last_written_pos = ""
 		(**
 			Get php name of current type
 		*)
@@ -1292,7 +1305,8 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 		method use ?prefix (type_path:path) =
 			if type_path = hx_type_path then
 				php_name
-			else
+			else begin
+				let orig_type_path = type_path in
 				let type_path = match type_path with (pack, name) -> (pack, get_real_name name) in
 				let type_path =
 					match prefix with
@@ -1306,34 +1320,40 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 						let alias_source = ref (List.rev module_path) in
 						let get_alias_next_part () =
 							match !alias_source with
-								| [] ->  failwith ("Failed to find already used type: " ^ get_full_type_name type_path)
+								| [] ->  fail ~msg:("Failed to find already used type: " ^ get_full_type_name type_path) self#pos __POS__
 								| name :: rest ->
 									alias_source := (match rest with
 										| [] -> [name]
 										| _ -> rest
 									);
-									String.capitalize name
+									StringHelper.capitalize name
 						and added = ref false
 						and alias = ref (get_type_name type_path) in
-						if !alias = php_name then
-							alias := get_alias_next_part () ^ !alias;
+						let alias_upper = ref (StringHelper.uppercase !alias) in
+						let prepend_alias prefix =
+							alias := prefix ^ !alias;
+							alias_upper := StringHelper.uppercase !alias
+						in
+						if !alias_upper = (StringHelper.uppercase php_name) then
+							prepend_alias (get_alias_next_part ());
 						while not !added do
 							try
-								if (get_module_path type_path) <> namespace && type_name_used_in_namespace ctx !alias namespace then
-									alias := get_alias_next_part () ^ !alias
+								if (get_module_path type_path) <> namespace && type_name_used_in_namespace ctx orig_type_path !alias namespace then
+									prepend_alias (get_alias_next_part ())
 								else
-									let used_type = Hashtbl.find use_table !alias in
-									if used_type = type_path then
+									let used_type = Hashtbl.find use_table !alias_upper in
+									if used_type.ut_type_path = type_path then
 										added := true
 									else
-										alias := get_alias_next_part () ^ !alias;
+										prepend_alias (get_alias_next_part ());
 							with
 								| Not_found ->
-									Hashtbl.add use_table !alias type_path;
+									Hashtbl.add use_table !alias_upper { ut_alias = !alias; ut_type_path = type_path; };
 									added := true
-								| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+								| _ -> fail self#pos __POS__
 						done;
 						!alias
+			end
 		(**
 			Extracts type path from Type.t value and execute self#use on it
 			@return Unique alias for specified type.
@@ -1353,13 +1373,13 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 				| TFun _ -> self#use ~prefix:false ([], "Closure")
 				| TAnon _ -> "object"
 				| TDynamic _ -> "mixed"
-				| TLazy _ -> failwith "TLazy not implemented"
+				| TLazy _ -> fail ~msg:"TLazy not implemented" self#pos __POS__
 				| TMono mono ->
 					(match !mono with
 						| None -> "mixed"
 						| Some t -> self#use_t t
 					)
-				| TType _ -> failwith "TType not implemented"
+				| TType _ -> fail ~msg:"TType not implemented" self#pos __POS__
 				| TAbstract (abstr, _) ->
 					match abstr.a_path with
 						| ([],"Int") -> "int"
@@ -1376,7 +1396,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 		method pos =
 			match expr_hierarchy with
 				| { epos = pos } :: _ -> pos
-				| _ -> dummy_pos
+				| _ -> null_pos
 		(**
 			Indicates whether current expression nesting level is a top level of a block
 		*)
@@ -1456,8 +1476,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			```
 		*)
 		method dereference expr =
-			let boot_cls = get_boot ctx in
-			let deref_field = PMap.find "deref" boot_cls.cl_statics in
+			let deref_field = PMap.find "deref" ctx.pgc_boot.cl_statics in
 			match expr.eexpr with
 				| TField (target_expr, access) ->
 					{
@@ -1467,9 +1486,9 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 									{
 										target_expr with eexpr = TField (
 											{
-												target_expr with eexpr = TTypeExpr (TClassDecl boot_cls)
+												target_expr with eexpr = TTypeExpr (TClassDecl ctx.pgc_boot)
 											},
-											FStatic (boot_cls, deref_field)
+											FStatic (ctx.pgc_boot, deref_field)
 										)
 									},
 									[ target_expr ]
@@ -1486,9 +1505,9 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 									{
 										target_expr with eexpr = TField (
 											{
-												target_expr with eexpr = TTypeExpr (TClassDecl boot_cls)
+												target_expr with eexpr = TTypeExpr (TClassDecl ctx.pgc_boot)
 											},
-											FStatic (boot_cls, deref_field)
+											FStatic (ctx.pgc_boot, deref_field)
 										)
 									},
 									[ target_expr ]
@@ -1497,7 +1516,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 							access_expr
 						)
 					}
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes specified string to output buffer
 		*)
@@ -1518,12 +1537,18 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			Writes fixed amount of empty lines (E.g. between methods)
 		*)
 		method write_empty_lines =
-			self#write "\n\n"
+			self#write "\n"
 		(**
 			Writes current indentation to output buffer
 		*)
 		method write_indentation =
 			self#write indentation
+		(**
+			Writes current indentation followed by `str` to output buffer
+		*)
+		method write_with_indentation str =
+			self#write indentation;
+			self#write str
 		(**
 			Writes specified line to output buffer and appends \n
 		*)
@@ -1539,28 +1564,39 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 		*)
 		method write_use =
 			self#indent 0;
-			let write alias type_path =
-				if (get_module_path type_path) <> namespace then
-					if get_type_name type_path = alias then
-						self#write_statement ("use " ^ (get_full_type_name type_path))
+			let write _ used_type =
+				let namespace =
+					if hx_type_path = ([],"") then namespace (* ([],"") is for index.php *)
+					else ctx.pgc_prefix @ namespace
+				in
+				if (get_module_path used_type.ut_type_path) <> namespace then
+					if get_type_name used_type.ut_type_path = used_type.ut_alias then
+						self#write_statement ("use " ^ (get_full_type_name used_type.ut_type_path))
 					else
-						let full_name = get_full_type_name type_path in
-						self#write_statement ("use " ^ full_name ^ " as " ^ alias)
+						let full_name = get_full_type_name used_type.ut_type_path in
+						self#write_statement ("use " ^ full_name ^ " as " ^ used_type.ut_alias)
 			in
 			Hashtbl.iter write use_table
 		(**
 			Writes array item declaration to output buffer and appends ",\n"
+			Adds indentation and ",\n" if `separate_line` is `true`.
 		*)
-		method write_array_item ?key value_expr =
+		method write_array_item ?separate_line ?key value_expr =
+			let separate_line = match separate_line with Some true -> true | _ -> false in
+			if separate_line then self#write_indentation;
 			(match key with
 				| None ->
-					self#write_indentation;
 					self#write_expr value_expr;
 				| Some key_str ->
-					self#write (indentation  ^ "\"" ^ (String.escaped key_str) ^ "\" => ");
+					let key_str =
+						Str.global_replace (Str.regexp "\\$")
+						"\\$"
+						(String.escaped key_str)
+					in
+					self#write ("\"" ^ key_str ^ "\" => ");
 					self#write_expr value_expr
 			);
-			self#write ",\n"
+			if separate_line then self#write ",\n"
 		(**
 			Writes expression to output buffer
 		*)
@@ -1573,6 +1609,8 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 					vars#used var.v_name;
 					self#write ("$" ^ var.v_name)
 				| TArray (target, index) -> self#write_expr_array_access target index
+				| TBinop (OpAssign, { eexpr = TArray (target, index) }, value) when is_array_type target.etype ->
+					self#write_expr_set_array_item target index value
 				| TBinop (operation, expr1, expr2) when needs_dereferencing (is_assignment_binop operation) expr1 ->
 					self#write_expr { expr with eexpr = TBinop (operation, self#dereference expr1, expr2) }
 				| TBinop (operation, expr1, expr2) -> self#write_expr_binop operation expr1 expr2
@@ -1587,11 +1625,14 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 					self#write ")"
 				| TObjectDecl fields -> self#write_expr_object_declaration fields
 				| TArrayDecl exprs -> self#write_expr_array_decl exprs
-				| TCall (target, [arg1; arg2]) when is_std_is target && instanceof_compatible arg1 arg2 -> self#write_expr_lang_instanceof [arg1; arg2]
-				| TCall (_, [arg]) when is_native_struct_array_cast expr && is_object_declaration arg -> self#write_assoc_array_decl arg
-				| TCall ({ eexpr = TLocal { v_name = name }}, args) when is_magic expr -> self#write_expr_magic name args
+				| TCall (target, [arg1; arg2]) when is_std_is target && instanceof_compatible arg1 arg2 -> self#write_expr_syntax_instanceof [arg1; arg2]
+				| TCall (_, [arg]) when is_native_struct_array_cast expr && is_object_declaration arg ->
+					(match (reveal_expr arg).eexpr with TObjectDecl fields -> self#write_assoc_array_decl fields | _ -> fail self#pos __POS__)
+				| TCall ({ eexpr = TIdent name}, args) when is_magic expr ->
+					ctx.pgc_common.warning ("untyped " ^ name ^ " is deprecated. Use php.Syntax instead.") self#pos;
+					self#write_expr_magic name args
 				| TCall ({ eexpr = TField (expr, access) }, args) when is_string expr -> self#write_expr_call_string expr access args
-				| TCall (expr, args) when is_lang_extern expr -> self#write_expr_call_lang_extern expr args
+				| TCall (expr, args) when is_syntax_extern expr -> self#write_expr_call_syntax_extern expr args
 				| TCall (target, args) when is_sure_var_field_access target -> self#write_expr_call (parenthesis target) args
 				| TCall (target, args) -> self#write_expr_call target args
 				| TNew (_, _, args) when is_string expr -> write_args self#write self#write_expr args
@@ -1602,37 +1643,28 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 				| TFunction fn -> self#write_expr_function fn
 				| TVar (var, expr) -> self#write_expr_var var expr
 				| TBlock exprs -> self#write_expr_block expr
-				| TFor (var, iterator, body) -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| TFor (var, iterator, body) -> fail self#pos __POS__
 				| TIf (condition, if_expr, else_expr) -> self#write_expr_if condition if_expr else_expr
-				| TWhile (condition, expr, do_while) -> self#write_expr_while condition expr do_while
+				| TWhile (condition, expr, do_while) ->
+					(match (reveal_expr_with_parenthesis condition).eexpr with
+						| TField (_, FStatic ({ cl_path = path }, { cf_name = "foreachCondition" })) when path = syntax_type_path  ->
+							self#write_expr_syntax_foreach expr
+						| _ ->
+							self#write_expr_while condition expr do_while
+					)
 				| TSwitch (switch, cases, default ) -> self#write_expr_switch switch cases default
 				| TTry (try_expr, catches) -> self#write_expr_try_catch try_expr catches
 				| TReturn expr -> self#write_expr_return expr
-				| TBreak -> self#write_expr_loop_flow "break"
-				| TContinue -> self#write_expr_loop_flow "continue"
+				| TBreak -> self#write "break"
+				| TContinue -> self#write "continue"
 				| TThrow expr -> self#write_expr_throw expr
 				| TCast (expr, mtype) -> self#write_expr_cast expr mtype
 				| TMeta (_, expr) -> self#write_expr expr
 				| TEnumParameter (expr, constructor, index) -> self#write_expr_enum_parameter expr constructor index
+				| TEnumIndex expr -> self#write_expr_enum_index expr
+				| TIdent s -> self#write s
 			);
 			expr_hierarchy <- List.tl expr_hierarchy
-		(**
-			Writes `continue N` or `break N` with required N depending on nearest parent loop and amount of `switch` between loop and
-			`continue/break`
-		*)
-		method write_expr_loop_flow word =
-			let rec count_N parent_exprs count =
-				match parent_exprs with
-					| [] -> count
-					| { eexpr = TWhile _ } :: _ -> count
-					| { eexpr = TSwitch _ } :: rest -> count_N rest (count + 1)
-					| _ :: rest -> count_N rest count
-			in
-			let count = count_N expr_hierarchy 1 in
-			if count > 1 then
-				self#write (word ^ " " ^ (string_of_int count))
-			else
-				self#write word
 		(**
 			Writes TConst to output buffer
 		*)
@@ -1673,35 +1705,34 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 				| _ ->
 					self#write ((self#use array_type_path) ^ "::wrap([\n");
 					self#indent_more;
-					List.iter (fun expr -> self#write_array_item expr) exprs;
+					List.iter (fun expr -> self#write_array_item ~separate_line:true expr) exprs;
 					self#indent_less;
-					self#write_indentation;
-					self#write "])"
+					self#write_with_indentation "])"
 		(**
-			Write associative array declaration (used for NativeStructArray)
+			Write associative array declaration
 		*)
-		method write_assoc_array_decl object_decl =
-			match (reveal_expr object_decl).eexpr with
-				| TObjectDecl fields ->
-					if List.length fields = 0 then
-						self#write "[]"
-					else begin
-						self#write "[\n";
-						self#indent_more;
-						List.iter
-							(fun (name, field) ->
-								self#write_indentation;
-								self#write_const_string name;
-								self#write " => ";
-								self#write_expr field;
-								self#write ",\n"
-							)
-							fields;
-						self#indent_less;
-						self#write_indentation;
-						self#write "]";
-					end
-				| _ -> fail object_decl.epos (try assert false with Assert_failure mlpos -> mlpos)
+		method write_assoc_array_decl fields =
+			match fields with
+				| [] -> self#write "[]"
+				| [((key, _, _), value)] ->
+					self#write "[";
+					self#write_array_item ~key:key value;
+					self#write "]"
+				| _ ->
+					self#write "[\n";
+					self#indent_more;
+					let write_field ((key,_,_), value) = self#write_array_item ~separate_line:true ~key:key value in
+					List.iter write_field fields;
+					self#indent_less;
+					self#write_with_indentation "]"
+		(**
+			Writes `target[index] = value` assuming `target` is of `Array` type
+		*)
+		method write_expr_set_array_item target index value =
+			self#write_expr target;
+			self#write "->offsetSet(";
+			write_args self#write self#write_expr [index; value];
+			self#write ")"
 		(**
 			Writes TArray to output buffer
 		*)
@@ -1808,16 +1839,26 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			Emulates TBlock for parent expression and writes `expr` as inlined block
 		*)
 		method write_fake_block expr =
-			self#write_indentation;
-			let fake_block = { expr with eexpr = TBlock [expr] } in
-			expr_hierarchy <- fake_block :: expr_hierarchy;
-			self#write_as_block ~inline:true expr;
-			expr_hierarchy <- List.tl expr_hierarchy
+			match expr.eexpr with
+				| TBlock [] -> ()
+				| _ ->
+					self#write_indentation;
+					let fake_block = { expr with eexpr = TBlock [expr] } in
+					expr_hierarchy <- fake_block :: expr_hierarchy;
+					self#write_as_block ~inline:true expr;
+					expr_hierarchy <- List.tl expr_hierarchy
 		(**
 			Write position of specified expression to output buffer
 		*)
 		method write_pos expr =
-			self#write ("#" ^ (stringify_pos expr.epos) ^ "\n");
+			let pos = ("#" ^ (stringify_pos expr.epos) ^ "\n") in
+			if pos = last_written_pos then
+				false
+			else begin
+				last_written_pos <- pos;
+				self#write pos;
+				true
+			end
 		(**
 			Writes "{ <expressions> }" to output buffer
 		*)
@@ -1826,10 +1867,8 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			and exprs = match expr.eexpr with TBlock exprs -> exprs | _ -> [expr] in
 			let write_body () =
 				let write_expr expr =
-					if not !skip_line_directives && not (is_block expr) then begin
-						self#write_pos expr;
-						self#write_indentation
-					end;
+					if not ctx.pgc_skip_line_directives && not (is_block expr) then
+						if self#write_pos expr then self#write_indentation;
 					self#write_expr expr;
 					match expr.eexpr with
 						| TBlock _ | TIf _ | TTry _ | TSwitch _ | TWhile (_, _, NormalWhile) -> self#write "\n"
@@ -1879,8 +1918,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 							write_body ()
 					);
 					self#indent_less;
-					self#write_indentation;
-					self#write "}"
+					self#write_with_indentation "}"
 		(**
 			Writes TReturn to output buffer
 		*)
@@ -1942,8 +1980,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 						self#write_indentation;
 						self#write_as_block ~inline:true expr;
 						self#indent_less;
-						self#write_indentation;
-						self#write "}";
+						self#write_with_indentation "}";
 					end;
 				if not !dynamic then self#write " else ";
 				first_catch := false;
@@ -1952,7 +1989,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			self#write_as_block try_expr;
 			self#write " catch (\\Throwable $__hx__caught_e) {\n";
 			self#indent_more;
-			if has_feature ctx "haxe.CallStack.exceptionStack"  then
+			if has_feature ctx.pgc_common "haxe.CallStack.exceptionStack"  then
 				self#write_statement ((self#use (["haxe"], "CallStack")) ^ "::saveExceptionTrace($__hx__caught_e)");
 			self#write_statement ("$__hx__real_e = ($__hx__caught_e instanceof " ^ haxe_exception ^ " ? $__hx__caught_e->e : $__hx__caught_e)");
 			self#write_indentation;
@@ -1962,8 +1999,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			else
 				(match catches with [_] -> () | _ -> self#write "\n");
 			self#indent_less;
-			self#write_indentation;
-			self#write "}"
+			self#write_with_indentation "}"
 		(**
 			Writes TCast to output buffer
 		*)
@@ -1981,16 +2017,16 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			@see http://old.haxe.org/doc/advanced/magic#php-magic
 		*)
 		method write_expr_magic name args =
-			let error = error_message self#pos ("Invalid arguments for " ^ name ^ " magic call") in
+			let error = ("Invalid arguments for " ^ name ^ " magic call") in
 			match args with
-				| [] -> failwith error
+				| [] -> fail ~msg:error self#pos __POS__
 				| { eexpr = TConst (TString code) } as expr :: args ->
 					(match name with
 						| "__php__" ->
 							(match expr.eexpr with
 								| TConst (TString php) ->
-									Codegen.interpolate_code ctx php args self#write self#write_expr self#pos
-								| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+									Codegen.interpolate_code ctx.pgc_common php args self#write self#write_expr self#pos
+								| _ -> fail self#pos __POS__
 							)
 						| "__call__" ->
 							self#write (code ^ "(");
@@ -1999,7 +2035,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 						| "__physeq__" ->
 							(match args with
 								| [expr2] -> self#write_expr_binop OpEq expr expr2
-								| _ -> failwith error
+								| _ -> fail ~msg:error self#pos __POS__
 							)
 						| "__var__" ->
 							(match args with
@@ -2009,20 +2045,20 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 									self#write ("$" ^ code ^ "[");
 									self#write_expr expr2;
 									self#write "]"
-								| _ -> failwith error
+								| _ -> fail ~msg:error self#pos __POS__
 							)
-						| _ -> failwith error
+						| _ -> fail ~msg:error self#pos __POS__
 					)
 				| [expr1; expr2] ->
 					(match name with
 						| "__physeq__" ->
 							(match args with
 								| [expr1; expr2] -> self#write_expr_binop OpEq expr1 expr2
-								| _ -> failwith error
+								| _ -> fail ~msg:error self#pos __POS__
 							)
-						| _ -> failwith error
+						| _ -> fail ~msg:error self#pos __POS__
 					)
-				| _ -> failwith error
+				| _ -> fail ~msg:error self#pos __POS__
 		(**
 			Writes TTypeExpr to output buffer
 		*)
@@ -2059,7 +2095,11 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 				self#write ")"
 			in
 			let write_for_concat expr =
-				if ((is_constant expr) && not (is_constant_null expr)) || (is_concatenation expr) then
+				if ((is_constant expr) && not (is_constant_null expr))
+					|| (is_concatenation expr)
+					|| is_php_global expr
+					|| is_php_class_const expr
+				then
 					self#write_expr expr
 				else begin
 					self#write "(";
@@ -2097,10 +2137,6 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 						write_method ((self#use boot_type_path) ^ "::addOrConcat")
 					else
 						write_binop " + "
-				| OpMult -> write_binop " * "
-				| OpDiv -> write_binop " / "
-				| OpSub -> write_binop " - "
-				| OpAssign -> write_binop " = "
 				| OpEq ->
 					if need_boot_equal expr1 expr2 then
 						write_method ((self#use boot_type_path) ^ "::equal")
@@ -2114,17 +2150,6 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 						end
 					else
 						write_binop " !== "
-				| OpGt -> compare " > "
-				| OpGte -> compare " >= "
-				| OpLt -> compare " < "
-				| OpLte -> compare " <= "
-				| OpAnd -> write_binop " & "
-				| OpOr -> write_binop " | "
-				| OpXor -> write_binop " ^ "
-				| OpBoolAnd -> write_binop " && "
-				| OpBoolOr -> write_binop " || "
-				| OpShl  -> write_binop " << "
-				| OpShr -> write_binop " >> "
 				| OpMod ->
 					if is_int expr1 && is_int expr2 then
 						write_binop " % "
@@ -2146,43 +2171,33 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 						end
 					else
 						write_binop " += "
-				| OpAssignOp OpMult -> write_binop " *= "
-				| OpAssignOp OpDiv -> write_binop " /= "
-				| OpAssignOp OpSub -> write_binop " -= "
-				| OpAssignOp OpAnd -> write_binop " &= "
-				| OpAssignOp OpOr -> write_binop " |= "
-				| OpAssignOp OpXor -> write_binop " ^= "
-				| OpAssignOp OpShl  -> write_binop " <<= "
-				| OpAssignOp OpShr -> write_binop " >>= "
 				| OpAssignOp OpMod ->
 					if is_int expr1 && is_int expr2 then
 						write_binop " %= "
-					else
+					else begin
+						self#write_expr expr1;
+						self#write " = ";
 						write_method "fmod"
+					end
 				| OpAssignOp OpUShr ->
 					self#write_expr expr1;
 					self#write " = ";
 					write_method ((self#use boot_type_path) ^ "::shiftRightUnsigned")
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| OpGt | OpGte | OpLt | OpLte ->
+					compare (" " ^ (Ast.s_binop operation) ^ " ")
+				| _ ->
+					write_binop (" " ^ (Ast.s_binop operation) ^ " ")
 		(**
 			Writes TUnOp to output buffer
 		*)
 		method write_expr_unop operation flag expr =
-			let write_unop operation =
-				match operation with
-					| Increment -> self#write "++"
-					| Decrement -> self#write "--"
-					| Not -> self#write "!"
-					| Neg -> self#write "-"
-					| NegBits -> self#write "~"
-			in
 			match flag with
 				| Prefix ->
-					write_unop operation;
+					self#write (Ast.s_unop operation);
 					self#write_expr expr
 				| Postfix ->
 					self#write_expr expr;
-					write_unop operation
+					self#write (Ast.s_unop operation)
 		method private write_expr_for_field_access expr access_str field_str =
 			let access_str = ref access_str in
 			(match (reveal_expr expr).eexpr with
@@ -2201,7 +2216,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 		method write_expr_field expr access =
 			match access with
 				| FInstance ({ cl_path = [], "String"}, _, { cf_name = "length"; cf_kind = Var _ }) ->
-					self#write "strlen(";
+					self#write "mb_strlen(";
 					self#write_expr expr;
 					self#write ")"
 				| FInstance (_, _, field) -> self#write_expr_for_field_access expr "->" (field_name field)
@@ -2254,7 +2269,9 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 					self#write "()"
 				end
 		(**
-			Writes field access on Dynamic expression to output buffer
+			Writes field access on Dynamic expression to output buffer.
+			Returns `true` if requested field is most likely belongs to String (and field resolution will be handled at runtime).
+			Otherwise returns `false`
 		*)
 		method write_expr_field_if_string expr field_name =
 			(* Special case for String fields *)
@@ -2285,7 +2302,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 					self#write ((self#use hxstring_type_path) ^ "::" ^ (field_name field) ^ "(");
 					write_args self#write self#write_expr (expr :: args);
 					self#write ")"
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes FStatic field access for methods to output buffer
 		*)
@@ -2310,7 +2327,8 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 		*)
 		method write_static_method_closure expr field_name =
 			let expr = reveal_expr expr in
-			self#write ("new " ^ (self#use hxclosure_type_path) ^ "(");
+			self#write ((self#use boot_type_path) ^ "::getStaticClosure(");
+			(* self#write ("new " ^ (self#use hxclosure_type_path) ^ "("); *)
 			(match (reveal_expr expr).eexpr with
 				| TTypeExpr (TClassDecl { cl_path = ([], "String") }) ->
 					self#write ((self#use hxstring_type_path) ^ "::class")
@@ -2335,22 +2353,23 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 						self#write_expr expr;
 						self#write ("->" ^ (field_name field))
 			else
-				let new_closure = "new " ^ (self#use hxclosure_type_path) in
+				(* let new_closure = "new " ^ (self#use hxclosure_type_path) in *)
+				let new_closure = ((self#use boot_type_path) ^ "::getInstanceClosure") in
 				match expr.eexpr with
 					| TTypeExpr mtype ->
 						let class_name = self#use_t (type_of_module_type mtype) in
 						self#write (new_closure ^ "(" ^ class_name ^ "::class, '" ^ (field_name field) ^ "')");
 					| _ ->
-						self#write (new_closure ^ "(");
 						(match follow expr.etype with
 							| TInst ({ cl_path = ([], "String") }, []) ->
-								self#write ((self#use hxdynamicstr_type_path) ^ "::wrap(");
+								self#write ("(new " ^ (self#use hxdynamicstr_type_path) ^ "(");
 								self#write_expr expr;
-								self#write ")"
+								self#write ("))->" ^ (field_name field))
 							| _ ->
-								self#write_expr expr
+								self#write (new_closure ^ "(");
+								self#write_expr expr;
+								self#write (", '" ^ (field_name field) ^ "')")
 						);
-						self#write (", '" ^ (field_name field) ^ "')")
 		(**
 			Write anonymous object declaration to output buffer
 		*)
@@ -2358,13 +2377,9 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			match fields with
 				| [] ->  self#write ("new " ^ (self#use hxanon_type_path) ^ "()")
 				| _ ->
-					self#write ("new " ^ (self#use hxanon_type_path)  ^ "([\n");
-					self#indent_more;
-					let write_field (key, value) = self#write_array_item ~key:key value in
-					List.iter write_field fields;
-					self#indent_less;
-					self#write_indentation;
-					self#write "])"
+					self#write ("new " ^ (self#use hxanon_type_path)  ^ "(");
+					self#write_assoc_array_decl fields;
+					self#write ")"
 		(**
 			Writes specified type to output buffer depending on type of expression.
 		*)
@@ -2383,59 +2398,73 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 		(**
 			Write language specific expression declared in `php.Syntax` extern
 		*)
-		method write_expr_call_lang_extern expr args =
+		method write_expr_call_syntax_extern expr args =
 			let name = match expr.eexpr with
 				| TField (_, FStatic (_, field)) -> field_name field
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 			in
 			match name with
-				| "int" | "float"
-				| "string" | "bool"
-				| "object" | "array" -> self#write_expr_lang_cast name args
-				| "binop" -> self#write_expr_lang_binop args
-				| "instanceof" -> self#write_expr_lang_instanceof args
-				| "foreach" -> self#write_expr_lang_foreach args
-				| "construct" -> self#write_expr_lang_construct args
-				| "getField" -> self#write_expr_lang_get_field args
-				| "setField" -> self#write_expr_lang_set_field args
-				| "getStaticField" -> self#write_expr_lang_get_static_field args
-				| "setStaticField" -> self#write_expr_lang_set_static_field args
-				| "call" -> self#write_expr_lang_call args
-				| "staticCall" -> self#write_expr_lang_static_call args
-				| "arrayDecl" -> self#write_expr_lang_array_decl args
-				| "splat" -> self#write_expr_lang_splat args
-				| "suppress" -> self#write_expr_lang_suppress args
+				| "code" | "codeDeref" -> self#write_expr_syntax_code args
+				| "coalesce" -> self#write_expr_syntax_coalesce args
+				| "instanceof" -> self#write_expr_syntax_instanceof args
+				| "nativeClassName" -> self#write_expr_syntax_native_class_name args
+				| "construct" -> self#write_expr_syntax_construct args
+				| "field" | "getField" -> self#write_expr_syntax_get_field args
+				| "setField" -> self#write_expr_syntax_set_field args
+				| "getStaticField" -> self#write_expr_syntax_get_static_field args
+				| "setStaticField" -> self#write_expr_syntax_set_static_field args
+				| "call" -> self#write_expr_syntax_call args
+				| "staticCall" -> self#write_expr_syntax_static_call args
+				| "arrayDecl" -> self#write_expr_syntax_array_decl args
+				| "assocDecl" -> self#write_expr_syntax_assoc_decl args
+				| "suppress" -> self#write_expr_syntax_suppress args
 				| "keepVar" -> ()
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> ctx.pgc_common.error ("php.Syntax." ^ name ^ "() is not supported.") self#pos
 		(**
-			Writes splat operator (for `php.Syntax.splat()`)
+			Writes plain php code (for `php.Syntax.code()`)
 		*)
-		method write_expr_lang_splat args =
+		method write_expr_syntax_code args =
 			match args with
-				| [ args_expr ] ->
-					self#write "...";
-					self#write_expr args_expr
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| [] -> fail self#pos __POS__
+				| { eexpr = TConst (TString php) } :: args ->
+					let args = List.map
+						(fun arg ->
+							match (reveal_expr arg).eexpr with
+								| TBinop _ | TUnop _ -> parenthesis arg
+								| _ -> arg
+						)
+						args
+					in
+					Codegen.interpolate_code ctx.pgc_common php args self#write self#write_expr self#pos
+				| _ -> ctx.pgc_common.error "First argument of php.Syntax.code() must be a constant string." self#pos
 		(**
 			Writes error suppression operator (for `php.Syntax.suppress()`)
 		*)
-		method write_expr_lang_suppress args =
+		method write_expr_syntax_suppress args =
 			match args with
 				| [ args_expr ] ->
 					self#write "@";
 					self#write_expr args_expr
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes native array declaration (for `php.Syntax.arrayDecl()`)
 		*)
-		method write_expr_lang_array_decl args =
+		method write_expr_syntax_array_decl args =
 			self#write "[";
 			write_args self#write (fun e -> self#write_expr e) args;
 			self#write "]"
+		(**
+			Writes native array declaration (for `php.Syntax.arrayDecl()`)
+		*)
+		method write_expr_syntax_assoc_decl args =
+			match args with
+				| [] -> self#write_assoc_array_decl []
+				| { eexpr = TObjectDecl fields } :: [] -> self#write_assoc_array_decl fields
+				| _ -> ctx.pgc_common.error "php.Syntax.assocDecl() accepts object declaration only." self#pos
 		(**
 			Writes a call to instance method (for `php.Syntax.call()`)
 		*)
-		method write_expr_lang_call args =
+		method write_expr_syntax_call args =
 			match args with
 				| obj_expr :: method_expr :: args ->
 					self#write_expr obj_expr;
@@ -2444,11 +2473,11 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 					self#write "}(";
 					write_args self#write (fun e -> self#write_expr e) args;
 					self#write ")"
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes a call to a static method (for `php.Syntax.staticCall()`)
 		*)
-		method write_expr_lang_static_call args =
+		method write_expr_syntax_static_call args =
 			match args with
 				| type_expr :: method_expr :: args ->
 					self#write_type type_expr;
@@ -2457,22 +2486,22 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 					self#write "}(";
 					write_args self#write (fun e -> self#write_expr e) args;
 					self#write ")"
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes field access for reading (for `php.Syntax.getField()`)
 		*)
-		method write_expr_lang_get_field args =
+		method write_expr_syntax_get_field args =
 			match args with
 				| obj_expr :: field_expr :: [] ->
 					self#write_expr obj_expr;
 					self#write "->{";
 					self#write_expr field_expr;
 					self#write "}"
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes field access for writing (for `php.Syntax.setField()`)
 		*)
-		method write_expr_lang_set_field args =
+		method write_expr_syntax_set_field args =
 			match args with
 				| obj_expr :: field_expr :: value_expr :: [] ->
 					self#write_expr obj_expr;
@@ -2481,22 +2510,22 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 					self#write "}";
 					self#write " = ";
 					self#write_expr value_expr
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes static field access for reading (for `php.Syntax.getStaticField()`)
 		*)
-		method write_expr_lang_get_static_field args =
+		method write_expr_syntax_get_static_field args =
 			match args with
 				| type_expr :: field_expr :: [] ->
 					self#write_type type_expr;
 					self#write "::${";
 					self#write_expr field_expr;
 					self#write "}"
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes static field access for writing (for `php.Syntax.setField()`)
 		*)
-		method write_expr_lang_set_static_field args =
+		method write_expr_syntax_set_static_field args =
 			match args with
 				| type_expr :: field_expr :: value_expr :: [] ->
 					self#write_expr type_expr;
@@ -2505,56 +2534,40 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 					self#write "}";
 					self#write " = ";
 					self#write_expr value_expr
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes `new` expression with class name taken local variable (for `php.Syntax.construct()`)
 		*)
-		method write_expr_lang_construct args =
+		method write_expr_syntax_construct args =
 			let (class_expr, args) = match args with
 				| class_expr :: args -> (class_expr, args)
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 			in
 			self#write "new ";
 			self#write_expr class_expr;
+			(match follow class_expr.etype with
+				| TInst ({ cl_path = ([], "String") }, _) -> ()
+				| _ -> self#write "->phpClassName"
+			);
 			self#write "(";
 			write_args self#write (fun e -> self#write_expr e) args;
 			self#write ")"
 		(**
-			Writes native php type conversion to output buffer (e.g. `php.Syntax.int()`)
+			Writes `$left ?? $right` expression to output buffer (for `php.Syntax.coalesce()`)
 		*)
-		method write_expr_lang_cast type_name args =
+		method write_expr_syntax_coalesce args =
 			match args with
-				| expr :: [] ->
-					let add_parentheses = match self#parent_expr with Some e -> is_access e | None -> false
-					and expr = match expr.eexpr with
-						| TLocal e -> expr
-						| _ -> parenthesis expr
-					in
-					if add_parentheses then self#write "(";
-					self#write ("(" ^ type_name ^")");
-					self#write_expr expr;
-					if add_parentheses then self#write ")"
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
-		(**
-			Generates binary operation to output buffer (for `php.Syntax.binop()`)
-		*)
-		method write_expr_lang_binop args =
-			match args with
-				| val_expr1 :: operator_expr :: val_expr2 :: [] ->
-					let operator = match operator_expr.eexpr with
-						| TConst (TString operator) -> operator
-						| _ -> error_and_exit self#pos "Second argument for php.Syntax.binop() must be a constant string"
-					in
+				| left :: right :: [] ->
 					self#write "(";
-					self#write_expr val_expr1;
-					self#write (" " ^ operator ^ " ");
-					self#write_expr val_expr2;
-					self#write ")"
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+					self#write_expr left;
+					self#write " ?? ";
+					self#write_expr right;
+					self#write ")";
+				| _ -> fail self#pos __POS__
 		(**
 			Writes `instanceof` expression to output buffer (for `php.Syntax.instanceof()`)
 		*)
-		method write_expr_lang_instanceof args =
+		method write_expr_syntax_instanceof args =
 			match args with
 				| val_expr :: type_expr :: [] ->
 					self#write "(";
@@ -2568,29 +2581,42 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 							if not (is_string type_expr) then self#write "->phpClassName"
 					);
 					self#write ")"
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
-			Writes `foreach` expression to output buffer (for `php.Syntax.foreach()`)
+			Writes either a "Cls::class" expression (if class is passed directly) or a `$cls->phpClassName` expression
+			(if class is passed as a variable) to output buffer (for `php.Syntax.nativeClassName()`)
 		*)
-		method write_expr_lang_foreach args =
+		method write_expr_syntax_native_class_name args =
 			match args with
-				| collection_expr :: { eexpr = TFunction fn } :: [] ->
-					let (key_name, value_name) = match fn.tf_args with
-						| ({ v_name = key_name }, _) :: ({ v_name = value_name }, _) :: [] -> (key_name, value_name)
-						| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
-					and add_parentheses =
-						match collection_expr.eexpr with
-							| TLocal _ -> false
+				| cls_expr :: [] ->
+					(match (reveal_expr cls_expr).eexpr with
+						| TTypeExpr mtype ->
+							self#write (self#use_t (type_of_module_type mtype));
+							self#write "::class"
+						| _ ->
+							self#write_expr cls_expr;
+							self#write "->phpClassName"
+					);
+				| _ -> fail self#pos __POS__
+		(**
+			Writes `foreach` expression to output buffer (for `php.Syntax.foreach()`)
+		*)
+		method write_expr_syntax_foreach body =
+			match body.eexpr with
+				| TBlock ({ eexpr = TCall (_, [collection]) } :: { eexpr = TVar (key, _) } :: { eexpr = TVar (value, _) } :: _ :: body_exprs) ->
+					let add_parentheses =
+						match collection.eexpr with
+							| TLocal _ | TField _ | TArray _ -> false
 							| _ -> true
 					in
 					self#write "foreach (";
 					if add_parentheses then self#write "(";
-					self#write_expr collection_expr;
+					self#write_expr collection;
 					if add_parentheses then self#write ")";
-					self#write (" as $" ^ key_name ^ " => $" ^ value_name ^ ") ");
-					self#write_as_block fn.tf_expr
+					self#write (" as $" ^ key.v_name ^ " => $" ^ value.v_name ^ ") ");
+					self#write_as_block ~unset_locals:true { body with eexpr = TBlock body_exprs };
 				| _ ->
-					error_and_exit self#pos "PHP.foreach() only accepts anonymous function declaration for second argument."
+					fail self#pos __POS__
 		(**
 			Writes TCall to output buffer
 		*)
@@ -2616,7 +2642,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 		method write_expr_php_global target_expr =
 			match target_expr.eexpr with
 				| TField (_, FStatic (_, field)) -> self#write (field_name field)
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes access to PHP class constant
 		*)
@@ -2624,7 +2650,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			match target_expr.eexpr with
 				| TField (_, FStatic (ecls, field)) ->
 					self#write ((self#use_t (TInst (ecls, []))) ^ "::" ^ (field_name field))
-				| _ -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail self#pos __POS__
 		(**
 			Writes TNew to output buffer
 		*)
@@ -2665,7 +2691,7 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			in
 			if is_ternary then
 				match else_expr with
-					| None -> fail self#pos (try assert false with Assert_failure mlpos -> mlpos)
+					| None -> fail self#pos __POS__
 					| Some expr ->
 						self#write_expr_ternary condition if_expr expr self#pos
 			else begin
@@ -2701,39 +2727,63 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 			Writes TSwitch to output buffer
 		*)
 		method write_expr_switch switch cases default =
-			let write_case (conditions, expr) =
-				List.iter
-					(fun condition ->
+			let write_switch =
+				match switch.eexpr with
+					| TLocal _ ->
+						(fun () -> self#write_expr switch)
+					| TParenthesis ({ eexpr = TLocal _ } as e) ->
+						(fun () -> self#write_expr e)
+					| _ ->
+						self#write "$__hx__switch = ";
+						self#write_expr switch;
+						self#write ";\n";
 						self#write_indentation;
-						self#write "case ";
-						self#write_expr condition;
-						self#write ":\n";
-					)
-					conditions;
-				self#indent_more;
-				self#write_indentation;
-				self#write_as_block ~inline:true expr;
-				self#write_statement "break";
-				self#indent_less
+						(fun () -> self#write "$__hx__switch")
 			in
-			self#write "switch ";
-			self#write_expr switch;
-			self#write " {\n";
-			self#indent_more;
-			List.iter write_case cases;
-			(match default with
+			let rec write_conditions conditions =
+				match conditions with
+					| [] -> ()
+					| condition :: rest ->
+						if need_boot_equal switch condition then
+							begin
+								self#write ((self#use boot_type_path) ^ "::equal(");
+								write_switch ();
+								self#write ", ";
+								self#write_expr condition;
+								self#write ")"
+							end
+						else
+							begin
+								write_switch ();
+								self#write " === ";
+								self#write_expr condition;
+							end;
+						match rest with
+							| [] -> ()
+							| _ ->
+								self#write " || ";
+								write_conditions rest
+			in
+			let rec write_cases cases =
+				match cases with
+					| [] -> ()
+					| (conditions, expr) :: rest ->
+						self#write "if (";
+						write_conditions conditions;
+						self#write ") ";
+						self#write_as_block expr;
+						match rest with
+							| [] -> ()
+							| _ ->
+								self#write " else ";
+								write_cases rest
+			in
+			write_cases cases;
+			match default with
 				| None -> ()
 				| Some expr ->
-					self#write_line "default:";
-					self#indent_more;
-					self#write_indentation;
-					self#write_as_block ~inline:true expr;
-					self#write_statement "break";
-					self#indent_less
-			);
-			self#indent_less;
-			self#write_indentation;
-			self#write "}"
+					self#write " else ";
+					self#write_as_block expr;
 		(**
 			Write TEnumParameter expression to output buffer
 		*)
@@ -2743,6 +2793,15 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 				| _ -> self#write_expr expr
 			);
 			self#write ("->params[" ^ (string_of_int index) ^ "]")
+		(**
+			Write TEnumIndex expression to output buffer
+		*)
+		method write_expr_enum_index expr =
+			(match expr.eexpr with
+				| TConst TNull -> self#write "(null)"
+				| _ -> self#write_expr expr
+			);
+			self#write "->index"
 		(**
 			Writes argument for function declarations or calls
 		*)
@@ -2759,9 +2818,11 @@ class code_writer (ctx:Common.context) hx_type_path php_name =
 					self#write ("$" ^ arg_name);
 					match default_value with
 						| None -> ()
-						| Some const ->
+						| Some expr ->
 							self#write " = ";
-							self#write_expr_const const
+							match expr.eexpr with
+								| TConst _ -> self#write_expr expr
+								| _ -> self#write "null"
 		(**
 			Write an access to a field of dynamic value
 		*)
@@ -2804,7 +2865,7 @@ class virtual type_builder ctx (wrapper:type_wrapper) =
 			Get PHP namespace path
 		*)
 		method get_namespace =
-			match get_php_prefix ctx with
+			match ctx.pgc_prefix with
 				| [] -> get_real_path wrapper#get_namespace
 				| prefix -> get_real_path (prefix @ wrapper#get_namespace)
 		(**
@@ -2870,8 +2931,10 @@ class virtual type_builder ctx (wrapper:type_wrapper) =
 				writer#write_empty_lines;
 				let boot_class = writer#use boot_type_path in
 				(* Boot initialization *)
-				if boot_type_path = self#get_type_path then
-					writer#write_statement (boot_class ^ "::__hx__init()");
+				if boot_type_path = self#get_type_path then begin
+					writer#write_statement ("require_once __DIR__.'/" ^ polyfills_file ^ "'");
+					writer#write_statement (boot_class ^ "::__hx__init()")
+				end;
 				let haxe_class = match wrapper#get_type_path with (path, name) -> String.concat "." (path @ [name]) in
 				writer#write_statement (boot_class ^ "::registerClass(" ^ (self#get_name) ^ "::class, '" ^ haxe_class ^ "')");
 				self#write_rtti_meta;
@@ -2900,8 +2963,8 @@ class virtual type_builder ctx (wrapper:type_wrapper) =
 			writer#indent 0;
 			writer#write_line "<?php";
 			writer#write_line "/**";
-			Codegen.map_source_header ctx (fun s -> writer#write_line (" * " ^ s));
-			if ctx.debug then writer#write_line (" * Haxe source file: " ^ self#get_source_file);
+			Codegen.map_source_header ctx.pgc_common (fun s -> writer#write_line (" * " ^ s));
+			if ctx.pgc_common.debug then writer#write_line (" * Haxe source file: " ^ self#get_source_file);
 			writer#write_line " */";
 			writer#write "\n";
 			let namespace = self#get_namespace in
@@ -2970,7 +3033,7 @@ class virtual type_builder ctx (wrapper:type_wrapper) =
 			Writes rtti meta to output buffer
 		*)
 		method write_rtti_meta =
-			match Codegen.build_metadata ctx wrapper#get_module_type with
+			match Texpr.build_metadata ctx.pgc_common.basic wrapper#get_module_type with
 				| None -> ()
 				| Some meta_expr ->
 					let boot_class = writer#use boot_type_path in
@@ -2995,12 +3058,14 @@ class virtual type_builder ctx (wrapper:type_wrapper) =
 			writer#write_statement "$called = true";
 			writer#write "\n";
 			writer#reset;
+			writer#indent 2;
 			(match wrapper#get_magic_init with
 				| None -> ()
 				| Some expr -> writer#write_fake_block expr
 			);
 			writer#write "\n";
 			writer#reset;
+			writer#indent 2;
 			self#write_hx_init_body;
 			writer#indent 1;
 			writer#write_line "}"
@@ -3022,13 +3087,9 @@ class virtual type_builder ctx (wrapper:type_wrapper) =
 			writer#indent_more;
 			self#write_instance_initialization;
 			let func = inject_defaults ctx func in
-			begin match func.eexpr with
-				| TBlock [] -> ()
-				| _ -> writer#write_fake_block func;
-			end;
+			writer#write_fake_block func;
 			writer#indent_less;
-			writer#write_indentation;
-			writer#write "}"
+			writer#write_with_indentation "}"
 		(**
 			Writes method declaration (except visibility and `static` keywords) to output buffer
 		*)
@@ -3037,7 +3098,49 @@ class virtual type_builder ctx (wrapper:type_wrapper) =
 			writer#write ("function " ^ by_ref ^ name ^ " (");
 			write_args writer#write writer#write_function_arg func.tf_args;
 			writer#write ") ";
-			writer#write_expr (inject_defaults ctx func)
+			if not (self#write_body_if_special_method name) then
+				writer#write_expr (inject_defaults ctx func)
+		(**
+			Writes a body for a special method if `field` represents one.
+			Returns `true` if `field` is such a method.
+		*)
+		method private write_body_if_special_method name =
+			(* php.Boot.isPhpKeyword(str:String) *)
+			if self#get_type_path = boot_type_path && name = "isPhpKeyword" then
+				begin
+					writer#write "{\n";
+					writer#indent_more;
+					writer#write_line "switch(strtolower($str)) {";
+					writer#indent_more;
+					writer#write_indentation;
+					let cnt = ref 0 in
+					List.iter
+						(fun kwd ->
+							if !cnt <= 5 then incr cnt
+							else begin
+								cnt := 0;
+								writer#write "\n";
+								writer#write_indentation
+							end;
+							writer#write ("case '" ^ kwd ^ "': ")
+						)
+						php_keywords_list;
+					writer#write "\n";
+					writer#indent_more;
+					writer#write_statement "return true";
+					writer#indent_less;
+					writer#write_line "default:";
+					writer#indent_more;
+					writer#write_statement "return false";
+					writer#indent_less;
+					writer#indent_less;
+					writer#write_line "}";
+					writer#indent_less;
+					writer#write_with_indentation "}";
+					true
+				end
+			else
+				false
 		(**
 			Set sourcemap generator
 		*)
@@ -3085,26 +3188,33 @@ class enum_builder ctx (enm:tenum) =
 				match follow field.ef_type with
 					| TFun (args, _) -> args
 					| TEnum _ -> []
-					| _ -> fail field.ef_pos (try assert false with Assert_failure mlpos -> mlpos)
+					| _ -> fail field.ef_pos __POS__
 			in
 			writer#indent 1;
 			self#write_doc (DocMethod (args, TEnum (enm, []), field.ef_doc));
-			writer#write_indentation;
-			writer#write ("static public function " ^ name ^ " (");
+			writer#write_with_indentation ("static public function " ^ name ^ " (");
 			write_args writer#write (writer#write_arg true) args;
 			writer#write ") {\n";
 			writer#indent_more;
-			writer#write_indentation;
-			writer#write "return ";
 			let index_str = string_of_int field.ef_index in
+			let write_construction args =
+				writer#write ("new " ^ self#get_name ^ "('" ^ name ^ "', " ^ index_str ^", [");
+				write_args writer#write (fun (name, _, _) -> writer#write ("$" ^ name)) args;
+				writer#write "])"
+			in
 			(match args with
-				| [] -> writer#write ((writer#use hxenum_type_path) ^ "::singleton(static::class, '" ^ name ^ "', " ^ index_str ^")")
+				| [] ->
+					(* writer#write ((writer#use hxenum_type_path) ^ "::singleton(static::class, '" ^ name ^ "', " ^ index_str ^")") *)
+					writer#write_line "static $inst = null;";
+					writer#write_with_indentation "if (!$inst) $inst = ";
+					write_construction [];
+					writer#write ";\n";
+					writer#write_line "return $inst;"
 				| args ->
-					writer#write ("new " ^ self#get_name ^ "('" ^ name ^ "', " ^ index_str ^", [");
-					write_args writer#write (fun (name, _, _) -> writer#write ("$" ^ name)) args;
-					writer#write "])"
+					writer#write_with_indentation "return ";
+					write_construction args;
+					writer#write ";\n";
 			);
-			writer#write ";\n";
 			writer#indent_less;
 			writer#write_line "}"
 		(**
@@ -3149,7 +3259,7 @@ class enum_builder ctx (enm:tenum) =
 					let count = match follow field.ef_type with
 						| TFun (params, _) -> List.length params
 						| TEnum _ -> 0
-						| _ -> fail field.ef_pos (try assert false with Assert_failure mlpos -> mlpos)
+						| _ -> fail field.ef_pos __POS__
 					in
 					writer#write_line ("'" ^ name ^ "' => " ^ (string_of_int count) ^ ",")
 				)
@@ -3178,11 +3288,16 @@ class enum_builder ctx (enm:tenum) =
 class class_builder ctx (cls:tclass) =
 	object (self)
 		inherit type_builder ctx (get_wrapper (TClassDecl cls)) as super
+		(**
+			List of methods names uppercased.
+			Used to check for methods with similar names because PHP function names are case-insensitive.
+		*)
+		val mutable used_method_names = []
 		(**
 			Indicates if type should be declared as `final`
 		*)
 		method is_final =
-			if not (Meta.has Meta.Final cls.cl_meta) then
+			if not cls.cl_final then
 				false
 			else begin
 				let hacked = ref false in
@@ -3194,17 +3309,17 @@ class class_builder ctx (cls:tclass) =
 									if self#extended_by tcls then hacked := Meta.has Meta.Hack tcls.cl_meta
 								| _ -> ()
 					)
-					ctx.types;
+					ctx.pgc_common.types;
 				not !hacked
 			end
 		(**
 			Indicates if `field` should be declared as `final`
 		*)
 		method is_final_field (field:tclass_field) : bool =
-			Meta.has Meta.Final field.cf_meta
+			has_class_field_flag field CfFinal
 		(**
 			Check if there is no native php constructor in inheritance chain of this class.
-			E.g. `StsClass` does have a constructor while still can be called with `new StdClass()`.
+			E.g. `StdClass` does have a constructor while still can be called with `new StdClass()`.
 			So this method will return true for `MyClass` if `MyClass extends StdClass`.
 		*)
 		method private extends_no_constructor =
@@ -3242,8 +3357,8 @@ class class_builder ctx (cls:tclass) =
 			E.g. "class SomeClass extends Another implements IFace"
 		*)
 		method private write_declaration =
-			if self#is_final then writer#write "final ";
 			self#write_doc (DocClass cls.cl_doc);
+			if self#is_final then writer#write "final ";
 			writer#write (if cls.cl_interface then "interface " else "class ");
 			writer#write self#get_name;
 			(
@@ -3288,26 +3403,17 @@ class class_builder ctx (cls:tclass) =
 						None
 					else
 						Some {
-							cf_name = "new";
-							cf_type = TFun ([], get_void ctx);
-							cf_public = true;
-							cf_pos = cls.cl_pos;
-							cf_name_pos = cls.cl_pos;
-							cf_doc = None;
-							cf_meta = [];
+							(mk_field "new" (TFun ([], ctx.pgc_common.basic.tvoid)) cls.cl_pos cls.cl_pos) with
 							cf_kind = Method MethNormal;
-							cf_params = [];
 							cf_expr = Some {
 								eexpr = TFunction {
 									tf_args = [];
-									tf_type = get_void ctx;
-									tf_expr = { eexpr = TBlock []; epos = cls.cl_pos; etype = get_void ctx; };
+									tf_type = ctx.pgc_common.basic.tvoid;
+									tf_expr = { eexpr = TBlock []; epos = cls.cl_pos; etype = ctx.pgc_common.basic.tvoid; };
 								};
 								epos = cls.cl_pos;
-								etype = get_void ctx;
+								etype = ctx.pgc_common.basic.tvoid;
 							};
-							cf_expr_unoptimized = None;
-							cf_overloads = [];
 						}
 		(**
 			Writes type body to output buffer.
@@ -3384,7 +3490,7 @@ class class_builder ctx (cls:tclass) =
 			Check if this class requires constructor to be generated even if there is no user-defined one
 		*)
 		method private constructor_is_required =
-			if List.length self#get_namespace > 0 then
+			if cls.cl_interface || List.length self#get_namespace > 0 then
 				false
 			else begin
 				let required = ref false in
@@ -3397,10 +3503,10 @@ class class_builder ctx (cls:tclass) =
 				!required
 			end
 		(**
-			Writes `--php-prefix` value as class constant PHP_PREFIX
+			Writes `-D php-prefix` value as class constant PHP_PREFIX
 		*)
 		method private write_php_prefix () =
-			let prefix = String.concat "\\" (get_php_prefix ctx) in
+			let prefix = String.concat "\\" ctx.pgc_prefix in
 			let indentation = writer#get_indentation in
 			writer#indent 1;
 			writer#write_statement ("const PHP_PREFIX = \"" ^ (String.escaped prefix) ^ "\"");
@@ -3412,34 +3518,32 @@ class class_builder ctx (cls:tclass) =
 			(* `static dynamic function` initialization *)
 			let write_dynamic_method_initialization field =
 				let field_access = "self::$" ^ (field_name field) in
-				writer#write_indentation;
-				writer#write (field_access ^ " = ");
+				writer#write_with_indentation (field_access ^ " = ");
 				(match field.cf_expr with
 					| Some expr -> writer#write_expr expr
-					| None -> fail field.cf_pos (try assert false with Assert_failure mlpos -> mlpos)
+					| None -> fail field.cf_pos __POS__
 				);
 				writer#write ";\n"
 			in
-			PMap.iter
-				(fun _ field ->
+			List.iter
+				(fun field ->
 					match field.cf_kind with
 						| Method MethDynamic -> write_dynamic_method_initialization field
 						| _ -> ()
 				)
-				cls.cl_statics;
+				cls.cl_ordered_statics;
 			(* `static var` initialization *)
 			let write_var_initialization field =
 				let write_assign expr =
-					writer#write_indentation;
-					writer#write ("self::$" ^ (field_name field) ^ " = ");
+					writer#write_with_indentation ("self::$" ^ (field_name field) ^ " = ");
 					writer#write_expr expr
 				in
 				(*
 					Do not generate fields for RTTI meta, because this generator uses another way to store it.
 					Also skip initialization for `inline var` fields as those are generated as PHP class constants.
 				*)
-				let is_auto_meta_var = field.cf_name = "__meta__" && (has_rtti_meta ctx wrapper#get_module_type) in
-				if (is_var_with_nonconstant_expr field) && (not is_auto_meta_var) && (not (is_inline_var field)) then begin
+				let is_auto_meta_var() = field.cf_name = "__meta__" && (has_rtti_meta ctx.pgc_common wrapper#get_module_type) in
+				if (is_var_with_nonconstant_expr field) && (not (is_auto_meta_var())) && (not (is_inline_var field)) then begin
 					(match field.cf_expr with
 						| None -> ()
 						(* There can be not-inlined blocks when compiling with `-debug` *)
@@ -3459,6 +3563,11 @@ class class_builder ctx (cls:tclass) =
 					);
 					writer#write ";\n"
 				end
+				else match field.cf_expr with
+					| Some ({ eexpr = TConst (TInt value) } as expr) when value = Int32.min_int ->
+						write_assign expr;
+						writer#write ";\n"
+					| _ -> ()
 			in
 			List.iter write_var_initialization cls.cl_ordered_statics
 		(**
@@ -3467,9 +3576,9 @@ class class_builder ctx (cls:tclass) =
 		method private write_field is_static field =
 			match field.cf_kind with
 				| Var { v_read = AccInline; v_write = AccNever } -> self#write_const field
-				| Var _ when not (is_extern_field field) ->
+				| Var _ when is_physical_field field ->
 					(* Do not generate fields for RTTI meta, because this generator uses another way to store it *)
-					let is_auto_meta_var = is_static && field.cf_name = "__meta__" && (has_rtti_meta ctx wrapper#get_module_type) in
+					let is_auto_meta_var = is_static && field.cf_name = "__meta__" && (has_rtti_meta ctx.pgc_common wrapper#get_module_type) in
 					if not is_auto_meta_var then self#write_var field is_static;
 				| Var _ -> ()
 				| Method MethMacro -> ()
@@ -3487,7 +3596,10 @@ class class_builder ctx (cls:tclass) =
 			let visibility = get_visibility field.cf_meta in
 			writer#write (visibility ^ " $" ^ (field_name field));
 			match field.cf_expr with
-				| None -> writer#write ";\n"
+				| None ->
+					writer#write ";\n"
+				| Some { eexpr = TConst (TInt value) } when value = Int32.min_int ->
+					writer#write ";\n"
 				| Some expr ->
 					match expr.eexpr with
 						| TConst _ ->
@@ -3500,20 +3612,20 @@ class class_builder ctx (cls:tclass) =
 		*)
 		method private write_const field =
 			match field.cf_expr with
-				| None -> fail writer#pos (try assert false with Assert_failure mlpos -> mlpos)
+				| None -> fail writer#pos __POS__
 				(* Do not generate a PHP constant of `inline var` field if expression is not compatible with PHP const *)
 				| Some expr when not (is_constant expr) -> ()
 				| Some expr ->
 					writer#indent 1;
 					self#write_doc (DocVar (writer#use_t field.cf_type, field.cf_doc));
-					writer#write_indentation;
-					writer#write ("const " ^ (field_name field) ^ " = ");
+					writer#write_with_indentation ("const " ^ (field_name field) ^ " = ");
 					writer#write_expr expr;
 					writer#write ";\n"
 		(**
 			Writes method to output buffer
 		*)
 		method private write_class_method field is_static =
+			self#validate_method_name field;
 			writer#reset;
 			writer#indent 1;
 			let (args, return_type) = get_function_signature field in
@@ -3533,19 +3645,19 @@ class class_builder ctx (cls:tclass) =
 					let name = if field.cf_name = "new" then "__construct" else (field_name field) in
 					self#write_method name fn;
 					writer#write "\n"
-				| _ -> fail field.cf_pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail field.cf_pos __POS__
 		(**
 			Writes dynamic method to output buffer.
 			Only for non-static methods. Static methods are created as static vars in `__hx__init`.
 		*)
 		method private write_dynamic_method field =
+			self#validate_method_name field;
 			writer#reset;
 			writer#indent 1;
 			let (args, return_type) = get_function_signature field in
 			List.iter (fun (arg_name, _, _) -> writer#declared_local_var arg_name) args;
 			self#write_doc (DocMethod (args, return_type, field.cf_doc));
-			writer#write_indentation;
-			writer#write ((get_visibility field.cf_meta) ^ " function " ^ (field_name field));
+			writer#write_with_indentation ((get_visibility field.cf_meta) ^ " function " ^ (field_name field));
 			(match field.cf_expr with
 				| None -> (* interface *)
 					writer#write " (";
@@ -3566,8 +3678,17 @@ class class_builder ctx (cls:tclass) =
 					writer#write_line "}";
 					(* Don't forget to create a field for default value *)
 					writer#write_statement ("protected $__hx__default__" ^ (field_name field))
-				| _ -> fail field.cf_pos (try assert false with Assert_failure mlpos -> mlpos)
+				| _ -> fail field.cf_pos __POS__
 			);
+		(**
+			Since PHP function names are case-insensitive we must check for method names clashes.
+		*)
+		method private validate_method_name field =
+			let uppercased_name = StringHelper.uppercase field.cf_name in
+			if List.exists (fun n -> n = uppercased_name) used_method_names then
+				ctx.pgc_common.error ("Methods names are case-insensitive in PHP runtime. Cannot redeclare \"" ^ field.cf_name ^ "\".") field.cf_name_pos
+			else
+				used_method_names <- uppercased_name :: used_method_names
 		(**
 			Writes initialization code for instances of this class
 		*)
@@ -3626,12 +3747,14 @@ class class_builder ctx (cls:tclass) =
 (**
 	Handles generation process
 *)
-class generator (ctx:context) =
+class generator (ctx:php_generator_context) =
 	object (self)
 		val mutable build_dir = ""
-		val root_dir = ctx.file
+		val root_dir = ctx.pgc_common.file
 		val mutable init_types = []
 		val mutable boot : (type_builder * string) option  = None
+		val mutable polyfills_source_path : string option = None
+		val mutable polyfills_dest_path : string option = None
 		(**
 			Perform required actions before actual php files generation
 		*)
@@ -3645,16 +3768,22 @@ class generator (ctx:context) =
 			and name = builder#get_name in
 			let filename = (create_dir_recursive (build_dir :: namespace)) ^ "/" ^ name ^ ".php" in
 			let channel = open_out filename in
-			if Common.defined ctx Define.SourceMap then
+			if Common.defined ctx.pgc_common Define.SourceMap then
 				builder#set_sourcemap_generator (new sourcemap_builder filename);
 			output_string channel builder#get_contents;
 			close_out channel;
 			(match builder#get_sourcemap_generator with
-				| Some smap -> smap#generate ctx
+				| Some smap -> smap#generate ctx.pgc_common
 				| None -> ()
 			);
 			if builder#get_type_path = boot_type_path then
-				boot <- Some (builder, filename)
+				begin
+					boot <- Some (builder, filename);
+					let source_dir = Filename.dirname builder#get_source_file in
+					polyfills_source_path <- Some (Filename.concat source_dir polyfills_file);
+					let dest_dir = Filename.dirname filename in
+					polyfills_dest_path <- Some (Filename.concat dest_dir polyfills_file)
+				end
 			else if builder#has_magic_init then
 				init_types <- (get_full_type_name (namespace, name)) :: init_types
 		(**
@@ -3663,6 +3792,9 @@ class generator (ctx:context) =
 		method finalize : unit =
 			self#generate_magic_init;
 			self#generate_entry_point;
+			match polyfills_source_path, polyfills_dest_path with
+				| Some src, Some dst -> copy_file src dst
+				| _ -> fail null_pos __POS__
 		(**
 			Generates calls to static __init__ methods in Boot.php
 		*)
@@ -3671,7 +3803,7 @@ class generator (ctx:context) =
 				| [] -> ()
 				| _ ->
 					match boot with
-						| None -> fail dummy_pos (try assert false with Assert_failure mlpos -> mlpos)
+						| None -> fail null_pos __POS__
 						| Some (_, filename) ->
 							let channel = open_out_gen [Open_creat; Open_text; Open_append] 0o644 filename in
 							List.iter
@@ -3685,11 +3817,12 @@ class generator (ctx:context) =
 			match self#get_entry_point with
 				| None -> ()
 				| Some (uses, entry_point) ->
-					let filename = match ctx.php_front with None -> "index.php" | Some n -> n in
+					let filename = Common.defined_value_safe ~default:"index.php" ctx.pgc_common Define.PhpFront in
 					let channel = open_out (root_dir ^ "/" ^ filename) in
 					output_string channel "<?php\n";
 					output_string channel uses;
-					output_string channel ("set_include_path(__DIR__.'/" ^ (String.concat "/" self#get_lib_path) ^ "');\n");
+					output_string channel "\n";
+					output_string channel ("set_include_path(get_include_path().PATH_SEPARATOR.__DIR__.'/" ^ (String.concat "/" self#get_lib_path) ^ "');\n");
 					output_string channel "spl_autoload_register(\n";
 					output_string channel "	function($class){\n";
 					output_string channel "		$file = stream_resolve_include_path(str_replace('\\\\', '/', $class) .'.php');\n";
@@ -3699,7 +3832,7 @@ class generator (ctx:context) =
 					output_string channel "	}\n";
 					output_string channel ");\n";
 					(match boot with
-						| None -> fail dummy_pos (try assert false with Assert_failure mlpos -> mlpos)
+						| None -> fail null_pos __POS__
 						| Some (builder, filename) ->
 							let boot_class = get_full_type_name (add_php_prefix ctx builder#get_type_path) in
 							output_string channel (boot_class ^ "::__hx__init();\n")
@@ -3716,14 +3849,13 @@ class generator (ctx:context) =
 			Returns path from `index.php` to directory which will contain all generated classes
 		*)
 		method private get_lib_path : string list =
-			match ctx.php_lib with
-				| None -> ["lib"];
-				| Some path -> (Str.split (Str.regexp "/")  path)
+			let path = Common.defined_value_safe ~default:"lib" ctx.pgc_common Define.PhpLib in
+			(Str.split (Str.regexp "/")  path)
 		(**
 			Returns PHP code for entry point
 		*)
 		method private get_entry_point : (string * string) option =
-			match ctx.main with
+			match ctx.pgc_common.main with
 				| None -> None
 				| Some expr ->
 					let writer = new code_writer ctx ([], "") "" in
@@ -3735,19 +3867,43 @@ class generator (ctx:context) =
 					Some (uses, code)
 	end
 
+(**
+	@return `tclass` instance for `php.Boot`
+*)
+let get_boot com : tclass =
+	let find com_type =
+		match com_type with
+			| TClassDecl { cl_path = path } -> path = boot_type_path
+			| _ -> false
+	in
+	try
+		match List.find find com.types with
+			| TClassDecl cls -> cls
+			| _ -> raise Not_found
+	with
+		| Not_found -> fail ~msg:"php.Boot not found" null_pos __POS__
+
 (**
 	Entry point to Genphp7
 *)
 let generate (com:context) =
-	skip_line_directives := Common.defined com Define.RealPosition;
-	let gen = new generator com in
+	let ctx =
+		{
+			pgc_common = com;
+			pgc_skip_line_directives = Common.defined com Define.RealPosition;
+			pgc_prefix = Str.split (Str.regexp "\\.") (Common.defined_value_safe com Define.PhpPrefix);
+			pgc_boot = get_boot com;
+			pgc_namespaces_types_cache = Hashtbl.create 512
+		}
+	in
+	let gen = new generator ctx in
 	gen#initialize;
 	let rec generate com_type =
 		let wrapper = get_wrapper com_type in
 		if wrapper#needs_generation then
 			(match com_type with
-				| TClassDecl cls -> gen#generate (new class_builder com cls);
-				| TEnumDecl enm -> gen#generate (new enum_builder com enm);
+				| TClassDecl cls -> gen#generate (new class_builder ctx cls);
+				| TEnumDecl enm -> gen#generate (new enum_builder ctx enm);
 				| TTypeDecl typedef -> ();
 				| TAbstractDecl abstr -> ()
 			);
diff --git a/src/generators/genpy.ml b/src/generators/genpy.ml
index ca3b2960a363e22e93f6a7ec02a5f9ae389681ed..e52c4d22349c75e64589775c781345b5b7e28e15 100644
--- a/src/generators/genpy.ml
+++ b/src/generators/genpy.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -21,13 +21,13 @@ open Globals
 open Ast
 open Type
 open Common
-open Codegen.ExprBuilder
+open Texpr.Builder
 
 module Utils = struct
 	let class_of_module_type mt = match mt with
 		| TClassDecl c -> c
 		| _ -> failwith ("Not a class: " ^ (s_type_path (t_infos mt).mt_path))
-	
+
 	let find_type com path =
 		try
 			List.find (fun mt -> match mt with
@@ -68,7 +68,7 @@ module KeywordHandler = struct
 	let kwds =
 		let h = Hashtbl.create 0 in
 		List.iter (fun s -> Hashtbl.add h s ()) [
-			"and"; "as"; "assert"; "break"; "class"; "continue"; "def"; "del"; "elif"; "else"; "except"; "exec"; "finally"; "for";
+			"and"; "as"; "assert"; "async"; "await"; "break"; "class"; "continue"; "def"; "del"; "elif"; "else"; "except"; "exec"; "finally"; "for";
 			"from"; "global"; "if"; "import"; "in"; "is"; "lambda"; "not"; "or"; "pass"; " raise"; "return"; "try"; "while";
 			"with"; "yield"; "None"; "True"; "False";
 		];
@@ -174,6 +174,8 @@ module Transformer = struct
 	let lift_expr1 is_value next_id blocks e =
 		lift_expr ~is_value:is_value ~next_id:(Some next_id) ~blocks:blocks e
 
+	let alloc_var = Type.alloc_var VGenerated
+
 	let to_tvar ?(capture = false) n t p =
 		alloc_var n t p
 		(* { v_name = n; v_type = t; v_id = 0; v_capture = capture; v_extra = None; v_meta = [] } *)
@@ -217,6 +219,39 @@ module Transformer = struct
 			e_set_field;
 		]) e_set_field.etype e_set_field.epos
 
+	let dynamic_field_inc_dec next_id e1 s unop unop_flag t p =
+		let is_post_fix = match unop_flag with
+		| Postfix -> true
+		| Prefix -> false
+		in
+		let op = match unop with
+		| Increment -> OpAdd
+		| Decrement -> OpSub
+		| _ -> assert false
+		in
+		let one = mk (TConst(TInt(Int32.of_int(1)))) t p in
+
+		let temp_var = to_tvar (next_id()) e1.etype e1.epos in
+		let temp_var_def = mk (TVar(temp_var,Some e1)) e1.etype e1.epos in
+		let temp_local = mk (TLocal temp_var) e1.etype e1.epos in
+
+		let e_field = dynamic_field_read temp_local s t in
+
+		let prior_val_var = to_tvar (next_id()) t p in
+		let prior_val_var_def = mk (TVar(prior_val_var, Some e_field )) t p in
+		let prior_val_local = mk (TLocal prior_val_var) t p in
+
+		let e_value = mk (TBinop(op, prior_val_local, one)) t e1.epos in
+		let e_ret = if is_post_fix then prior_val_local else e_value in
+
+		let e_set_field = dynamic_field_write temp_local s e_value in
+		mk (TBlock [
+			temp_var_def;
+			prior_val_var_def;
+			e_set_field;
+			e_ret;
+		]) e_set_field.etype e_set_field.epos
+
 	let add_non_locals_to_func e = match e.eexpr with
 		| TFunction tf ->
 			let cur = ref PMap.empty in
@@ -277,13 +312,13 @@ module Transformer = struct
 		let assigns = List.fold_left (fun acc (v,value) ->
 			KeywordHandler.check_var_declaration v;
 			match value with
-				| None | Some TNull ->
+				| None | Some {eexpr = TConst TNull} ->
 					acc
 				| Some ct ->
 					let a_local = mk (TLocal v) v.v_type p in
 					let a_null = mk (TConst TNull) v.v_type p in
 					let a_cmp = mk (TBinop(OpEq,a_local,a_null)) !t_bool p in
-					let a_value = mk (TConst(ct)) v.v_type p in
+					let a_value = ct in
 					let a_assign = mk (TBinop(OpAssign,a_local,a_value)) v.v_type p in
 					let a_if = mk (TIf(a_cmp,a_assign,None)) !t_void p in
 					a_if :: acc
@@ -430,7 +465,7 @@ module Transformer = struct
 			let mk_or e1 e2 = mk (TBinop(OpOr,e1,e2)) !t_bool (punion e1.epos e2.epos) in
 			let mk_if (el,e) eo =
 				let eif = List.fold_left (fun eacc e -> mk_or eacc (mk_eq e1 e)) (mk_eq e1 (List.hd el)) (List.tl el) in
-				mk (TIf(Codegen.mk_parent eif,e,eo)) e.etype e.epos
+				mk (TIf(mk_parent eif,e,eo)) e.etype e.epos
 			in
 			let cases = Hashtbl.fold (fun i el acc ->
 				let eint = mk (TConst (TInt (Int32.of_int i))) !t_int e1.epos in
@@ -713,6 +748,10 @@ module Transformer = struct
 			let e1 = trans true [] e1 in
 			let p = { ae.a_expr with eexpr = TEnumParameter(e1.a_expr,ef,i)} in
 			lift true e1.a_blocks p
+		| (_, TEnumIndex e1) ->
+			let e1 = trans true [] e1 in
+			let p = { ae.a_expr with eexpr = TEnumIndex e1.a_expr } in
+			lift true e1.a_blocks p
 		| (true, TIf(econd, eif, eelse)) ->
 			(let econd1 = trans true [] econd in
 			let eif1 = trans true [] eif in
@@ -810,15 +849,13 @@ module Transformer = struct
 		| (is_value, TBinop(OpAssignOp op,{eexpr = TField(e1,FAnon cf); etype = t},e2)) when Meta.has Meta.Optional cf.cf_meta ->
 			let e = dynamic_field_read_write ae.a_next_id e1 cf.cf_name op e2 t in
 			transform_expr ~is_value:is_value e
-		(* TODO we need to deal with Increment, Decrement too!
-
-		| (_, TUnop( (Increment | Decrement) as unop, op,{eexpr = TField(e1,FAnon cf)})) when Meta.has Meta.Optional cf.cf_meta  ->
-			let  = dynamic_field_read e cf.cf_name in
 
-			let e = dynamic_field_read_write_unop ae.a_next_id e1 cf.cf_name unop op in
-			Printf.printf "dyn read write\n";
-			transform_expr e
-		*)
+		| (is_value, TUnop( (Increment | Decrement) as unop, unop_flag,{eexpr = TField(e1, FAnon cf); etype = t; epos = p})) when Meta.has Meta.Optional cf.cf_meta  ->
+			let e = dynamic_field_inc_dec ae.a_next_id e1 cf.cf_name unop unop_flag t p in
+			transform_expr ~is_value:is_value e
+		| (is_value, TUnop( (Increment | Decrement) as unop, unop_flag,{eexpr = TField(e1, FDynamic field_name); etype = t; epos = p})) ->
+			let e = dynamic_field_inc_dec ae.a_next_id e1 field_name unop unop_flag t p in
+			transform_expr ~is_value:is_value e
 		(*
 			anon field access with non optional members like iterator, length, split must be handled too, we need to Reflect on them too when it's a runtime method
 		*)
@@ -846,13 +883,6 @@ module Transformer = struct
 		| (is_value, TBinop(OpAssignOp op,{eexpr = TField(e1,FDynamic s); etype = t},e2)) ->
 			let e = dynamic_field_read_write ae.a_next_id e1 s op e2 t in
 			transform_expr ~is_value:is_value e
-		(*
-		| (is_value, TField(e1, FClosure(Some ({cl_path = [],("str")},_),cf))) ->
-
-		| (is_value, TField(e1, FClosure(Some ({cl_path = [],("list")},_),cf))) ->
-			let e = dynamic_field_read e1 cf.cf_name ae.a_expr.etype in
-			transform_expr ~is_value:is_value e
-		*)
 		| (is_value, TBinop(OpAssign, left, right))->
 			(let left = trans true [] left in
 			let right = trans true [] right in
@@ -954,7 +984,7 @@ module Transformer = struct
 			let f = exprs_to_func (new_expr.a_blocks @ [new_expr.a_expr]) (ae.a_next_id()) ae in
 			lift_expr ~is_value:true ~blocks:f.a_blocks f.a_expr
 
-		| ( _, TBreak ) | ( _, TContinue ) ->
+		| ( _, TBreak ) | ( _, TContinue ) | ( _, TIdent _) ->
 			lift_expr a_expr
 
 	and transform e =
@@ -1056,10 +1086,10 @@ module Printer = struct
 		| OpShr -> ">>"
 		| OpUShr -> ">>"
 		| OpMod -> "%"
-		| OpInterval | OpArrow | OpAssignOp _ -> assert false
+		| OpInterval | OpArrow | OpIn | OpAssignOp _ -> assert false
 
 	let print_string s =
-		Printf.sprintf "\"%s\"" (Ast.s_escape s)
+		Printf.sprintf "\"%s\"" (StringHelper.s_escape s)
 
 	let print_constant = function
 		| TThis -> "self"
@@ -1074,7 +1104,7 @@ module Printer = struct
 	let print_base_type tp =
 		try
 			begin match Meta.get Meta.Native tp.mt_meta with
-				| _,[EConst(String s),_],_ -> s
+				| _,[EConst(String(s,_)),_],_ -> s
 				| _ -> raise Not_found
 			end
 		with Not_found ->
@@ -1092,7 +1122,7 @@ module Printer = struct
 		| TMeta(_,e) -> remove_outer_parens e
 		| _ -> e
 
-	let print_args args p =
+	let rec print_args pctx args p =
 		let had_value = ref false in
 		let had_var_args = ref false in
 		let had_kw_args = ref false in
@@ -1115,11 +1145,11 @@ module Printer = struct
 						| None -> ""
 						| Some ct ->
 							had_value := true;
-							Printf.sprintf " = %s" (print_constant ct)
+							" = None"
 		) args in
 		String.concat "," sl
 
-	let rec print_op_assign_right pctx e =
+	and print_op_assign_right pctx e =
 		match e.eexpr with
 			| TIf({eexpr = TParenthesis econd},eif,Some eelse)
 			| TIf(econd,eif,Some eelse) ->
@@ -1143,7 +1173,7 @@ module Printer = struct
 			| None -> pctx.pc_next_anon_func()
 			| Some s -> handle_keywords s
 		in
-		let s_args = print_args tf.tf_args p in
+		let s_args = print_args pctx tf.tf_args p in
 		let s_expr = print_expr {pctx with pc_indent = "    " ^ pctx.pc_indent} tf.tf_expr in
 		Printf.sprintf "def %s(%s):\n%s    %s" s_name s_args pctx.pc_indent s_expr
 
@@ -1196,6 +1226,8 @@ module Printer = struct
 				handle_keywords v.v_name
 			| TEnumParameter(e1,_,index) ->
 				Printf.sprintf "%s.params[%i]" (print_expr pctx e1) index
+			| TEnumIndex e1 ->
+				Printf.sprintf "%s.index" (print_expr pctx e1)
 			| TArray(e1,e2) when (is_type1 "" "list")(e1.etype) || is_underlying_array e1.etype ->
 				print_tarray_list pctx e1 e2
 			| TArray({etype = t} as e1,e2) when is_anon_or_dynamic t ->
@@ -1214,7 +1246,7 @@ module Printer = struct
 				Printf.sprintf "%s = %s" (print_expr pctx e1) (print_expr pctx (remove_outer_parens e2))
 			| TBinop(op,e1,({eexpr = TBinop(_,_,_)} as e2)) ->
 				print_expr pctx { e with eexpr = TBinop(op, e1, { e2 with eexpr = TParenthesis(e2) })}
-			| TBinop(OpEq,{eexpr = TCall({eexpr = TLocal {v_name = "__typeof__"}},[e1])},e2) ->
+			| TBinop(OpEq,{eexpr = TCall({eexpr = TIdent "__typeof__"},[e1])},e2) ->
 				begin match e2.eexpr with
 					| TConst(TString s) ->
 						begin match s with
@@ -1262,14 +1294,20 @@ module Printer = struct
 					Printf.sprintf "(%s %s %s)" (print_expr pctx e1) (fst ops) (print_expr pctx e2)
 				| x, _ when is_underlying_array x ->
 					Printf.sprintf "(%s %s %s)" (print_expr pctx e1) (fst ops) (print_expr pctx e2)
+				| TInst({ cl_kind = KTypeParameter(_) }, _), _ ->
+					Printf.sprintf "%s(%s,%s)" (third ops) (print_expr pctx e1) (print_expr pctx e2)
+				| _, TInst({ cl_kind = KTypeParameter(_) }, _) ->
+					Printf.sprintf "%s(%s,%s)" (third ops) (print_expr pctx e1) (print_expr pctx e2)
 				| TDynamic _, TDynamic _ ->
 					Printf.sprintf "%s(%s,%s)" (third ops) (print_expr pctx e1) (print_expr pctx e2)
-				| TDynamic _, x | x, TDynamic _ when is_list_or_anon x ->
+				| TDynamic _, x when is_list_or_anon x ->
+					Printf.sprintf "%s(%s,%s)" (third ops) (print_expr pctx e1) (print_expr pctx e2)
+				| x, TDynamic _ when is_list_or_anon x ->
 					Printf.sprintf "%s(%s,%s)" (third ops) (print_expr pctx e1) (print_expr pctx e2)
 				| _,_ -> Printf.sprintf "(%s %s %s)" (print_expr pctx e1) (snd ops) (print_expr pctx e2))
 			| TBinop(OpMod,e1,e2) when (is_type1 "" "Int")(e1.etype) && (is_type1 "" "Int")(e2.etype) ->
-				(match e1.eexpr with
-				| TConst(TInt(x)) when (Int32.to_int x) >= 0 ->
+				(match e1.eexpr, e2.eexpr with
+				| TConst(TInt(x1)), TConst(TInt(x2)) when (Int32.to_int x1) >= 0 && (Int32.to_int x2) >= 0 ->
 					(* constant optimization *)
 					Printf.sprintf "%s %% %s" (print_expr pctx e1) (print_expr pctx e2)
 				| _ ->
@@ -1313,7 +1351,7 @@ module Printer = struct
 				begin match follow e.etype with
 					| TAnon an ->
 						PMap.iter (fun s cf ->
-							if not (List.mem_assoc s fl) then fl2 := (s,null cf.cf_type cf.cf_pos) :: !fl2
+							if not (Expr.field_mem_assoc s fl) then fl2 := ((s,null_pos,NoQuotes),null cf.cf_type cf.cf_pos) :: !fl2
 						) an.a_fields
 					| _ ->
 						()
@@ -1380,6 +1418,8 @@ module Printer = struct
 				Printf.sprintf "(%s if %s else %s)" (print_expr pctx eif) (print_expr pctx econd) (print_expr pctx eelse)
 			| TMeta(_,e1) ->
 				print_expr pctx e1
+			| TIdent s ->
+				s
 			| TSwitch _ | TCast(_, Some _) | TFor _ | TUnop(_,Postfix,_) ->
 				assert false
 
@@ -1423,18 +1463,20 @@ module Printer = struct
 				Printf.sprintf "len(%s)" (print_expr pctx e1)
 			| FInstance(c,_,{cf_name = "length"}) when (is_type "" "str")(TClassDecl c) ->
 				Printf.sprintf "len(%s)" (print_expr pctx e1)
+			| FAnon({cf_name = "length"}) | FDynamic ("length") ->
+				Printf.sprintf "HxOverrides.length(%s)" (print_expr pctx e1)
 			| FStatic(c,{cf_name = "fromCharCode"}) when (is_type "" "str")(TClassDecl c) ->
 				Printf.sprintf "HxString.fromCharCode"
 			| FStatic({cl_path = ["python";"internal"],"UBuiltins"},{cf_name = s}) ->
 				s
-			| FClosure (Some(c,cf),_)  when call_override(name) && ((is_type "" "list")(TClassDecl c)) ->
-				Printf.sprintf "_hx_partial(python_internal_ArrayImpl.%s, %s)" name obj
-			| FInstance (c,_,cf) when call_override(name) && ((is_type "" "list")(TClassDecl c)) ->
-				Printf.sprintf "_hx_partial(python_internal_ArrayImpl.%s, %s)" name obj
-			| FClosure (Some(c,cf),_)  when call_override(name) && ((is_type "" "str")(TClassDecl c)) ->
-				Printf.sprintf "_hx_partial(HxString.%s, %s)" name obj
-			| FInstance (c,_,cf) when call_override(name) && ((is_type "" "str")(TClassDecl c)) ->
-				Printf.sprintf "_hx_partial(HxString.%s, %s)" name obj
+			| FClosure (Some(c,cf),_) when ((is_type "" "list")(TClassDecl c)) ->
+				Printf.sprintf "python_Boot.createClosure(%s, python_internal_ArrayImpl.%s)" obj name
+			| FClosure (Some(c,cf),_) when ((is_type "" "str")(TClassDecl c)) ->
+				Printf.sprintf "python_Boot.createClosure(%s, HxString.%s)" obj name
+			| FInstance (c,_,cf) when ((is_type "" "list")(TClassDecl c)) ->
+				Printf.sprintf "python_Boot.createClosure(%s, python_internal_ArrayImpl.%s)" obj name
+			| FInstance (c,_,cf) when ((is_type "" "str")(TClassDecl c)) ->
+				Printf.sprintf "python_Boot.createClosure(%s, HxString.%s)" obj name
 			| FInstance _ | FStatic _ ->
 				do_default ()
 			| FAnon cf when is_assign && call_override(name) ->
@@ -1448,7 +1490,7 @@ module Printer = struct
 				do_default()
 
 	and print_try pctx e1 catches =
-		let has_catch_all = List.exists (fun (v,_) -> match v.v_type with
+		let has_catch_all = List.exists (fun (v,_) -> match follow v.v_type with
 			| TDynamic _ -> true
 			| _ -> false
 		) catches in
@@ -1466,13 +1508,16 @@ module Printer = struct
 			let assign = if is_empty_expr then "" else Printf.sprintf "%s = _hx_e1\n%s" v.v_name indent in
 			let handle_base_type bt =
 				let t = print_base_type bt in
+				let print_custom_check t_str =
+					Printf.sprintf "if %s:\n%s    %s    %s" t_str indent assign (print_expr {pctx with pc_indent = "    " ^ pctx.pc_indent} e)
+				in
 				let print_type_check t_str =
-					Printf.sprintf "if isinstance(_hx_e1, %s):\n%s    %s    %s" t_str indent assign (print_expr {pctx with pc_indent = "    " ^ pctx.pc_indent} e)
+					print_custom_check ("isinstance(_hx_e1, " ^ t_str ^ ")")
 				in
 				let res = match t with
 				| "str" -> print_type_check "str"
 				| "Bool" -> print_type_check "bool"
-				| "Int" -> print_type_check "int"
+				| "Int" -> print_custom_check "(isinstance(_hx_e1, int) and not isinstance(_hx_e1, bool))" (* for historic reasons bool extends int *)
 				| "Float" -> print_type_check "float"
 				| t -> print_type_check t
 				in
@@ -1518,38 +1563,24 @@ module Printer = struct
 			| "super",_ ->
 				let s_el = (print_call_args pctx e1 el) in
 				Printf.sprintf "super().__init__(%s)" s_el
-			| ("python_Syntax._pythonCode"),[({ eexpr = TConst (TString code) } as ecode); {eexpr = TArrayDecl tl}] ->
-				let exprs = Array.of_list tl in
-				let i = ref 0 in
-				let err msg =
-					let pos = { ecode.epos with pmin = ecode.epos.pmin + !i } in
-					abort msg pos
-				in
-				let regex = Str.regexp "[{}]" in
-				let rec loop m = match m with
-					| [] -> ""
-					| Str.Text txt :: tl ->
-						i := !i + String.length txt;
-						txt ^ (loop tl)
-					| Str.Delim a :: Str.Delim b :: tl when a = b ->
-						i := !i + 2;
-						a ^ (loop tl)
-					| Str.Delim "{" :: Str.Text n :: Str.Delim "}" :: tl ->
-						(try
-						let expr = Array.get exprs (int_of_string n) in
-						let txt = print_expr pctx expr in
-						i := !i + 2 + String.length n;
-						txt ^ (loop tl)
-					with | Failure "int_of_string" ->
-						err ("Index expected. Got " ^ n)
-					| Invalid_argument _ ->
-						err ("Out-of-bounds pythonCode special parameter: " ^ n))
-					| Str.Delim x :: _ ->
-						err ("Unexpected " ^ x)
+			| ("python_Syntax._pythonCode"),[({ eexpr = TConst (TString code) } as ecode); {eexpr = TArrayDecl tl}]
+			| ("python_Syntax.code"),({ eexpr = TConst (TString code) } as ecode) :: tl ->
+				let buf = Buffer.create 0 in
+				let interpolate () =
+					Codegen.interpolate_code pctx.pc_com code tl (Buffer.add_string buf) (fun e -> Buffer.add_string buf (print_expr pctx e)) ecode.epos
 				in
-				loop (Str.full_split regex code)
+				let old = pctx.pc_com.error in
+				pctx.pc_com.error <- abort;
+				Std.finally (fun() -> pctx.pc_com.error <- old) interpolate ();
+				Buffer.contents buf
 			| ("python_Syntax._pythonCode"), [e] ->
 				print_expr pctx e
+			| ("python_Syntax.code"), [e] ->
+				(match e.eexpr with
+					| TConst (TString py) -> ()
+					| _ -> pctx.pc_com.error "First argument of python.Syntax.code() must be a constant string." e1.epos
+				);
+				print_expr pctx e
 			| "python_Syntax._callNamedUntyped",el ->
 				let res,fields = match List.rev el with
 					| {eexpr = TObjectDecl fields} :: el ->
@@ -1593,8 +1624,14 @@ module Printer = struct
 				Printf.sprintf "%s = %s" (print_expr pctx e0) (print_expr pctx e1)
 			| "python_Syntax.arraySet",[e1;e2;e3] ->
 				Printf.sprintf "%s[%s] = %s" (print_expr pctx e1) (print_expr pctx e2) (print_expr pctx e3)
-			| "python_Syntax._newInstance", e1 :: [{eexpr = TArrayDecl el}] ->
-				Printf.sprintf "%s(%s)" (print_expr pctx e1) (print_exprs pctx ", " el)
+			| "python_Syntax._newInstance", e1 :: [{eexpr = TArrayDecl el}]
+			| "python_Syntax.construct", e1 :: el ->
+				let cls =
+					match e1.eexpr with
+						| TConst (TString class_name) -> class_name
+						| _ -> print_expr pctx e1
+				in
+				Printf.sprintf "%s(%s)" cls (print_exprs pctx ", " el)
 			| "python_Syntax.opPow", [e1;e2] ->
 				Printf.sprintf "(%s ** %s)" (print_expr pctx e1) (print_expr pctx e2)
  			| "python_Syntax._foreach",[e1;e2;e3] ->
@@ -1611,7 +1648,7 @@ module Printer = struct
 					if Meta.has Meta.Native cf.cf_meta then begin
 						let _, args, mp = Meta.get Meta.Native cf.cf_meta in
 						match args with
-						| [( EConst(String s),_)] -> PMap.add f s acc
+						| [( EConst(String(s,_)),_)] -> PMap.add f s acc
 						| _ -> acc
 					end else acc
 				in
@@ -1627,14 +1664,14 @@ module Printer = struct
 			PMap.foldi fold_dict native_fields ""
 		in
 		match e1.eexpr, el with
-			| TLocal { v_name = "`trace" }, [e;infos] ->
+			| TIdent "`trace", [e;infos] ->
 				if has_feature pctx "haxe.Log.trace" then begin
 					"haxe_Log.trace(" ^ (print_expr pctx e) ^ "," ^ (print_expr pctx infos) ^ ")"
 				end else if is_safe_string pctx e then
 					"print(" ^ (print_expr pctx e) ^ ")"
 				else
 					"print(str(" ^ (print_expr pctx e) ^ "))"
-			| TField(e1,((FAnon {cf_name = (("join" | "push" | "map" | "filter") as s)}) | FDynamic (("join" | "push" | "map" | "filter") as s))), [x] ->
+			| TField(e1,((FAnon {cf_name = (("split" | "join" | "push" | "map" | "filter") as s)}) | FDynamic (("split" | "join" | "push" | "map" | "filter") as s))), [x] ->
 				Printf.sprintf "HxOverrides.%s(%s, %s)" s (print_expr pctx e1) (print_expr pctx x)
 			| TField(e1,((FAnon {cf_name = (("iterator" | "toUpperCase" | "toLowerCase" | "pop" | "shift") as s)}) | FDynamic (("iterator" | "toUpperCase" | "toLowerCase" | "pop" | "shift") as s))), [] ->
 				Printf.sprintf "HxOverrides.%s(%s)" s (print_expr pctx e1)
@@ -1701,10 +1738,10 @@ module Printer = struct
 			print_exprs pctx sep el
 
 	and print_exprs_named pctx sep fl =
-		let args = String.concat sep (List.map (fun (s,e) -> Printf.sprintf "'%s': %s" (Ast.s_escape (handle_keywords s)) (print_expr pctx e)) fl) in
+		let args = String.concat sep (List.map (fun ((s,_,_),e) -> Printf.sprintf "'%s': %s" (StringHelper.s_escape (handle_keywords s)) (print_expr pctx e)) fl) in
 		Printf.sprintf "{%s}" args
 	and print_params_named pctx sep fl =
-		let args = String.concat sep (List.map (fun (s,e) -> Printf.sprintf "%s= %s" (handle_keywords s) (print_expr pctx e)) fl) in
+		let args = String.concat sep (List.map (fun ((s,_,_),e) -> Printf.sprintf "%s= %s" (handle_keywords s) (print_expr pctx e)) fl) in
 		Printf.sprintf "%s" args
 	let handle_keywords s =
 		KeywordHandler.handle_keywords s
@@ -1784,7 +1821,7 @@ module Generator = struct
 			match cf.cf_kind with
 				| Var({v_read = AccResolve}) ->
 					()
-				| Var _ when is_extern_field cf ->
+				| Var _ when not (is_physical_field cf) ->
 					()
 				| Var({v_read = AccCall}) ->
 					if Meta.has Meta.IsVar cf.cf_meta then
@@ -1805,7 +1842,7 @@ module Generator = struct
 	let collect_class_statics_data cfl =
 		let fields = DynArray.create () in
 		List.iter (fun cf ->
-			if not (is_extern_field cf) then
+			if is_physical_field cf then
 				DynArray.add fields cf.cf_name
 		) cfl;
 		DynArray.to_list fields
@@ -1815,7 +1852,7 @@ module Generator = struct
 
 	let get_members_with_init_expr c =
 		List.filter (fun cf -> match cf.cf_kind with
-			| Var _ when is_extern_field cf -> false
+			| Var _ when not (is_physical_field cf) -> false
 			| Var _ when cf.cf_expr = None -> true
 			| _ -> false
 		) c.cl_ordered_fields
@@ -1843,7 +1880,7 @@ module Generator = struct
 	let gen_py_metas ctx metas indent =
 		List.iter (fun (n,el,_) ->
 			match el with
-				| [EConst(String s),_] ->
+				| [EConst(String(s,_)),_] ->
 					print ctx "%s@%s\n" indent s
 				| _ ->
 					assert false
@@ -1865,7 +1902,7 @@ module Generator = struct
 					| e_last :: el ->
 						let new_last = {e_last with eexpr = TReturn (Some e_last)} in
 						let new_block = {expr2 with eexpr = TBlock (List.rev (new_last :: el))} in
-						let v_name = alloc_var name (tfun [] e_last.etype) e_last.epos in
+						let v_name = alloc_var VGenerated name (tfun [] e_last.etype) e_last.epos in
 						let f_name = mk (TLocal v_name) v_name.v_type e_last.epos in
 						let call_f = mk (TCall(f_name,[])) e_last.etype e_last.epos in
 						Some new_block,call_f
@@ -1886,7 +1923,7 @@ module Generator = struct
 			| None,e2 ->
 				let expr_string_2 = texpr_str e2 pctx in
 				if field = "" then
-					spr ctx expr_string_2
+					print ctx "%s%s" indent expr_string_2
 				else
 					print ctx "%s%s = %s" indent field expr_string_2
 
@@ -1895,7 +1932,7 @@ module Generator = struct
 		let e = match e.eexpr with
 			| TFunction(f) ->
 				let args = if add_self then
-					let v = alloc_var "self" t_dynamic p in
+					let v = alloc_var VGenerated "self" t_dynamic p in
 					v.v_meta <- (Meta.This,[],p) :: v.v_meta;
 					(v,None) :: f.tf_args
 				else
@@ -2090,6 +2127,10 @@ module Generator = struct
 					use_pass := false;
 					print ctx "\n    _hx_class_name = \"%s\"" p_name
 				end;
+				if has_feature ctx "python._hx_is_interface" then begin
+					let value = if c.cl_interface then "True" else "False" in
+					print ctx "\n    _hx_is_interface = \"%s\"" value
+				end;
 
 				let print_field names field quote =
 					if has_feature ctx ("python." ^ field) then try
@@ -2110,12 +2151,11 @@ module Generator = struct
 					let real_fields =
 						List.filter (fun f -> match f.cf_kind with
 							| Method MethDynamic -> raise Exit (* if a class has dynamic method, we can't use __slots__ because python will complain *)
-							| Var _ -> not (is_extern_field f)
+							| Var _ -> is_physical_field f
 							| _ -> false
 						) c.cl_ordered_fields
 					in
 					let field_names = List.map (fun f -> handle_keywords f.cf_name) real_fields in
-					let field_names = match c.cl_dynamic with Some _ -> "__dict__" :: field_names | None -> field_names in
 					use_pass := false;
 					print ctx "\n    __slots__ = (";
 					(match field_names with
@@ -2171,7 +2211,7 @@ module Generator = struct
 		gen_class_init ctx c
 
 	let gen_enum_metadata ctx en p =
-		let meta = Codegen.build_metadata ctx.com (TEnumDecl en) in
+		let meta = Texpr.build_metadata ctx.com.basic (TEnumDecl en) in
 		match meta with
 			| None ->
 				()
@@ -2211,10 +2251,14 @@ module Generator = struct
 		List.iter (fun ef ->
 			match follow ef.ef_type with
 			| TFun(args, _) ->
+				let arg_name hx_name =
+					let name = handle_keywords hx_name in
+					if name = p_name then p_name ^ "_" ^ name
+					else name
+				in
 				let print_args args =
 					let had_optional = ref false in
 					let sl = List.map (fun (n,o,_) ->
-						let name = handle_keywords n in
 						let arg_value = if !had_optional then
 							"= None"
 						else if o then begin
@@ -2223,17 +2267,21 @@ module Generator = struct
 						end else
 							""
 						in
-						Printf.sprintf "%s%s" name arg_value
+						Printf.sprintf "%s%s" (arg_name n) arg_value
 					) args in
 					String.concat "," sl
 				in
 				let f = handle_keywords ef.ef_name in
 				let param_str = print_args args in
-				let args_str = String.concat "," (List.map (fun (n,_,_) -> handle_keywords n) args) in
+				let args_str =
+					match args with
+					| [(n,_,_)] -> (arg_name n) ^ ","
+					| args -> String.concat "," (List.map (fun (n,_,_) -> arg_name n) args)
+				in
 				newline ctx;
 				newline ctx;
 				print ctx "    @staticmethod\n    def %s(%s):\n" f param_str;
-				print ctx "        return %s(\"%s\", %i, [%s])" p ef.ef_name ef.ef_index args_str;
+				print ctx "        return %s(\"%s\", %i, (%s))" p ef.ef_name ef.ef_index args_str;
 			| _ -> assert false
 		) param_constructors;
 
@@ -2241,7 +2289,7 @@ module Generator = struct
 			(* TODO: haxe source has api.quoteString for ef.ef_name *)
 			let f = handle_keywords ef.ef_name in
 			newline ctx;
-			print ctx "%s.%s = %s(\"%s\", %i, list())" p f p ef.ef_name ef.ef_index
+			print ctx "%s.%s = %s(\"%s\", %i, ())" p f p ef.ef_name ef.ef_index
 		) const_constructors;
 
 		if has_feature ctx "python._hx_class" then print ctx "\n%s._hx_class = %s" p p;
@@ -2255,32 +2303,7 @@ module Generator = struct
 		newline ctx;
 		let mt = (t_infos (TAbstractDecl a)) in
 		let p = get_path mt in
-		let p_name = get_full_name mt in
-		print ctx "class %s:" p;
-
-		let use_pass = ref true in
-
-		if has_feature ctx "python._hx_class_name" then begin
-			use_pass := false;
-			print ctx "\n    _hx_class_name = \"%s\"" p_name
-		end;
-
-		(match a.a_impl with
-		| Some c ->
-			List.iter (fun cf ->
-				use_pass := false;
-				if cf.cf_name = "_new" then
-					gen_class_constructor ctx c cf
-				else
-					gen_class_field ctx c p cf
-			) c.cl_ordered_statics
-		| None -> ());
-
-		if !use_pass then spr ctx "\n    pass";
-
-		if has_feature ctx "python._hx_class" then print ctx "\n%s._hx_class = %s" p p;
-		if has_feature ctx "python._hx_classes" then print ctx "\n_hx_classes[\"%s\"] = %s" p_name p
-
+		print ctx "class %s: pass" p
 
 	let gen_type ctx mt = match mt with
 		| TClassDecl c -> gen_class ctx c
@@ -2295,7 +2318,7 @@ module Generator = struct
 		| TAbstractDecl {a_path = [],"Dynamic"} when not (has_feature ctx "Dynamic.*") -> ()
 		| TAbstractDecl {a_path = [],"Bool"} when not (has_feature ctx "Bool.*") -> ()
 
-		| TAbstractDecl a when Meta.has Meta.CoreType a.a_meta -> gen_abstract ctx a
+		| TAbstractDecl a when Meta.has Meta.RuntimeValue a.a_meta -> gen_abstract ctx a
 		| _ -> ()
 
 	(* Generator parts *)
@@ -2326,7 +2349,7 @@ module Generator = struct
 					","
 				in
 				let k_enc = Codegen.escape_res_name k false in
-				print ctx "%s\"%s\": open('%%s.%%s'%%(_file,'%s'),'rb').read()" prefix (Ast.s_escape k) k_enc;
+				print ctx "%s\"%s\": open('%%s.%%s'%%(_file,'%s'),'rb').read()" prefix (StringHelper.s_escape k) k_enc;
 
 				let f = open_out_bin (ctx.com.file ^ "." ^ k_enc) in
 				output_string f v;
@@ -2346,18 +2369,18 @@ module Generator = struct
 				in
 
 				let import_type,ignore_error = match args with
-					| [(EConst(String(module_name)), _)]
-					| [(EConst(String(module_name)), _); (EBinop(OpAssign, (EConst(Ident("ignoreError")),_), (EConst(Ident("false")),_)),_)] ->
+					| [(EConst(String(module_name,_)), _)]
+					| [(EConst(String(module_name,_)), _); (EBinop(OpAssign, (EConst(Ident("ignoreError")),_), (EConst(Ident("false")),_)),_)] ->
 						IModule module_name, false
 
-					| [(EConst(String(module_name)), _); (EBinop(OpAssign, (EConst(Ident("ignoreError")),_), (EConst(Ident("true")),_)),_)] ->
+					| [(EConst(String(module_name,_)), _); (EBinop(OpAssign, (EConst(Ident("ignoreError")),_), (EConst(Ident("true")),_)),_)] ->
 						IModule module_name,true
 
-					| [(EConst(String(module_name)), _); (EConst(String(object_name)), _)]
-					| [(EConst(String(module_name)), _); (EConst(String(object_name)), _); (EBinop(OpAssign, (EConst(Ident("ignoreError")),_), (EConst(Ident("false")),_)),_)] ->
+					| [(EConst(String(module_name,_)), _); (EConst(String(object_name,_)), _)]
+					| [(EConst(String(module_name,_)), _); (EConst(String(object_name,_)), _); (EBinop(OpAssign, (EConst(Ident("ignoreError")),_), (EConst(Ident("false")),_)),_)] ->
 						IObject (module_name,object_name), false
 
-					| [(EConst(String(module_name)), _); (EConst(String(object_name)), _); (EBinop(OpAssign, (EConst(Ident("ignoreError")),_), (EConst(Ident("true")),_)),_)] ->
+					| [(EConst(String(module_name,_)), _); (EConst(String(object_name,_)), _); (EBinop(OpAssign, (EConst(Ident("ignoreError")),_), (EConst(Ident("true")),_)),_)] ->
 						IObject (module_name,object_name), true
 					| _ ->
 						abort "Unsupported @:pythonImport format" mp
@@ -2412,8 +2435,25 @@ module Generator = struct
 			newline ctx;
 			spr ctx "class _hx_AnonObject:\n";
 			if with_body then begin
+				spr ctx "    _hx_disable_getattr = False\n";
 				spr ctx "    def __init__(self, fields):\n";
-				spr ctx "        self.__dict__ = fields"
+				spr ctx "        self.__dict__ = fields\n";
+				spr ctx "    def __repr__(self):\n";
+				spr ctx "        return repr(self.__dict__)\n";
+				spr ctx "    def __getattr__(self, name):\n";
+				spr ctx "        if (self._hx_disable_getattr):\n";
+				spr ctx "            raise AttributeError('field does not exist')\n";
+				spr ctx "        else:\n";
+				spr ctx "            return None\n";
+				spr ctx "    def _hx_hasattr(self,field):\n";
+				spr ctx "        self._hx_disable_getattr = True\n";
+				spr ctx "        try:\n";
+				spr ctx "            getattr(self, field)\n";
+				spr ctx "            self._hx_disable_getattr = False\n";
+				spr ctx "            return True\n";
+				spr ctx "        except AttributeError:\n";
+				spr ctx "            self._hx_disable_getattr = False\n";
+				spr ctx "            return False\n"
 			end else
 				spr ctx "    pass";
 			Hashtbl.add used_paths ([],"_hx_AnonObject") true;
@@ -2454,7 +2494,7 @@ module Generator = struct
 				| TBlock el ->
 					List.iter (fun e -> gen_expr ctx e "" ""; newline ctx) el
 				| _ ->
-					gen_expr ctx e "" ""
+					gen_expr ctx e "" ""; newline ctx
 
 	(* Entry point *)
 
@@ -2463,7 +2503,17 @@ module Generator = struct
 		let ctx = mk_context com in
 		Codegen.map_source_header com (fun s -> print ctx "# %s\n# coding: utf-8\n" s);
 		if has_feature ctx "closure_Array" || has_feature ctx "closure_String" then
-			spr ctx "from functools import partial as _hx_partial";
+			spr ctx "from functools import partial as _hx_partial\n";
+		spr ctx "import sys\n";
+		if defined com Define.StdEncodingUtf8 then begin
+			spr ctx "try:\n";
+			spr ctx "    if sys.stdout.encoding != 'utf-8':\n";
+			spr ctx "        sys.stdout = open(sys.stdout.fileno(), mode='w', encoding='utf8', buffering=1)\n";
+			spr ctx "    if sys.stderr.encoding != 'utf-8':\n";
+			spr ctx "        sys.stderr = open(sys.stderr.fileno(), mode='w', encoding='utf8', buffering=1)\n";
+			spr ctx "except:\n";
+			spr ctx "    pass\n";
+		end;
 		gen_imports ctx;
 		gen_resources ctx;
 		gen_types ctx;
@@ -2471,7 +2521,7 @@ module Generator = struct
 		gen_static_inits ctx;
 		gen_main ctx;
 
-		mkdir_from_path com.file;
+		Path.mkdir_from_path com.file;
 		let ch = open_out_bin com.file in
 		output_string ch (Buffer.contents ctx.buf);
 		close_out ch
diff --git a/src/generators/genswf.ml b/src/generators/genswf.ml
index cea1267bddf55ab7e2da4431c4327ec163e4ce0d..cfd8f4b9c5ecbdce13a23aa8b22d45868ef49836 100644
--- a/src/generators/genswf.ml
+++ b/src/generators/genswf.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -15,508 +15,16 @@
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *)
-
+*)
 open Swf
-open As3
 open As3hl
 open Genswf9
+open ExtString
 open Type
 open Common
 open Ast
 open Globals
-
-let rec make_tpath = function
-	| HMPath (pack,name) ->
-		let pdyn = ref false in
-		let pack, name = match pack, name with
-			| [], "void" -> [], "Void"
-			| [], "int" -> [], "Int"
-			| [], "uint" -> [], "UInt"
-			| [], "Number" -> [], "Float"
-			| [], "Boolean" -> [], "Bool"
-			| [], "Object" -> ["flash";"utils"], "Object"
-			| [], "Function" -> ["flash";"utils"], "Function"
-			| [], "Class" | [],"Array" -> pdyn := true; pack, name
-			| [], "Error" -> ["flash";"errors"], "Error"
-			| [] , "XML" -> ["flash";"xml"], "XML"
-			| [] , "XMLList" -> ["flash";"xml"], "XMLList"
-			| [] , "QName" -> ["flash";"utils"], "QName"
-			| [] , "Namespace" -> ["flash";"utils"], "Namespace"
-			| [] , "RegExp" -> ["flash";"utils"], "RegExp"
-			| ["__AS3__";"vec"] , "Vector" -> ["flash"], "Vector"
-			| _ -> pack, name
-		in
-		{
-			tpackage = pack;
-			tname = name;
-			tparams = if !pdyn then [TPType (CTPath { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None; },null_pos)] else[];
-			tsub = None;
-		}
-	| HMName (id,ns) ->
-		{
-			tpackage = (match ns with
-				| HNInternal (Some ns) -> ExtString.String.nsplit ns "."
-				| HNPrivate (Some ns) ->
-					(try
-						let file, line = ExtString.String.split ns ".as$" in
-						[file ^ "_" ^ line]
-					with _ ->
-						[])
-				| _ -> []);
-			tname = id;
-			tparams = [];
-			tsub = None;
-		}
-	| HMNSAny (id) ->
-		{
-			tpackage = [];
-			tname = id;
-			tparams = [];
-			tsub = None;
-		}
-	| HMMultiName _ ->
-		assert false
-	| HMRuntimeName _ ->
-		assert false
-	| HMRuntimeNameLate ->
-		assert false
-	| HMMultiNameLate _ ->
-		assert false
-	| HMAttrib _ ->
-		assert false
-	| HMAny ->
-		assert false
-	| HMParams (t,params) ->
-		let params = List.map (fun t -> TPType (CTPath (make_tpath t),null_pos)) params in
-		{ (make_tpath t) with tparams = params }
-
-let make_param cl p =
-	{ tpackage = fst cl; tname = snd cl; tparams = [TPType (CTPath { tpackage = fst p; tname = snd p; tparams = []; tsub = None },null_pos)]; tsub = None }
-
-let make_topt = function
-	| None -> { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None }
-	| Some t -> make_tpath t
-
-let make_type t = CTPath (make_topt t)
-
-let make_dyn_type t =
-	match make_topt t with
-	| { tpackage = ["flash";"utils"]; tname = ("Object"|"Function") } -> make_type None
-	| o -> CTPath o
-
-let is_valid_path com pack name =
-	let rec loop = function
-		| [] ->
-			false
-		| load :: l ->
-			match load (pack,name) null_pos with
-			| None -> loop l
-			| Some (file,(_,a)) -> true
-	in
-	let file = Printf.sprintf "%s/%s.hx" (String.concat "/" pack) name in
-	loop com.load_extern_type || (try ignore(Common.find_file com file); true with Not_found -> false)
-
-let build_class com c file =
-	let path = make_tpath c.hlc_name in
-	let pos = { pfile = file ^ "@" ^ s_type_path (path.tpackage,path.tname); pmin = 0; pmax = 0 } in
-	match path with
-	| { tpackage = ["flash";"utils"]; tname = ("Object"|"Function") } ->
-		let inf = {
-			d_name = path.tname,null_pos;
-			d_doc = None;
-			d_params = [];
-			d_meta = [];
-			d_flags = [];
-			d_data = CTPath { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None; },null_pos;
-		} in
-		(path.tpackage, [(ETypedef inf,pos)])
-	| _ ->
-	(* make flags *)
-	let flags = [HExtern] in
-	let flags = if c.hlc_interface then HInterface :: flags else flags in
-	let flags = (match c.hlc_super with
-		| None | Some (HMPath ([],"Object")) -> flags
-		| Some (HMPath ([],"Function")) -> flags (* found in AIR SDK *)
-		| Some s -> HExtends (make_tpath s,null_pos) :: flags
-	) in
-	let flags = List.map (fun i ->
-		let i = (match i with
-			| HMMultiName (Some id,ns) ->
-				let rec loop = function
-					| [] -> HMPath ([],id)
-					| HNPublic (Some ns) :: _ when is_valid_path com (ExtString.String.nsplit ns ".") id -> HMPath (ExtString.String.nsplit ns ".",id)
-					| _ :: l -> loop l
-				in
-				loop ns
-			| HMPath _ -> i
-			| _ -> assert false
-		) in
-		if c.hlc_interface then HExtends (make_tpath i,null_pos) else HImplements (make_tpath i,null_pos)
-	) (Array.to_list c.hlc_implements) @ flags in
-	let flags = if c.hlc_sealed || Common.defined com Define.FlashStrict then flags else HImplements (make_tpath (HMPath ([],"Dynamic")),null_pos) :: flags in
-	(* make fields *)
-	let getters = Hashtbl.create 0 in
-	let setters = Hashtbl.create 0 in
-	let override = Hashtbl.create 0 in
-	let is_xml = (match path.tpackage, path.tname with
-		| ["flash";"xml"], ("XML" | "XMLList") -> true
-		| _ -> false
-	) in
-	let make_field stat acc f =
-		let meta = ref [] in
-		let flags = (match f.hlf_name with
-			| HMPath _ -> [APublic]
-			| HMName (_,ns) ->
-				(match ns with
-				| HNPrivate _ | HNNamespace "http://www.adobe.com/2006/flex/mx/internal" -> []
-				| HNNamespace ns ->
-					if not (c.hlc_interface || is_xml) then meta := (Meta.Ns,[String ns]) :: !meta;
-					[APublic]
-				| HNExplicit _ | HNInternal _ | HNPublic _ ->
-					[APublic]
-				| HNStaticProtected _ | HNProtected _ ->
-					meta := (Meta.Protected,[]) :: !meta;
-					[APrivate])
-			| _ -> []
-		) in
-		if flags = [] then acc else
-		let flags = if stat then AStatic :: flags else flags in
-		let name = (make_tpath f.hlf_name).tname in
-		let mk_meta() =
-			List.map (fun (s,cl) -> s, List.map (fun c -> EConst c,pos) cl, pos) (!meta)
-		in
-		let cf = {
-			cff_name = name,null_pos;
-			cff_doc = None;
-			cff_pos = pos;
-			cff_meta = mk_meta();
-			cff_access = flags;
-			cff_kind = FVar (None,None);
-		} in
-		match f.hlf_kind with
-		| HFVar v ->
-			if v.hlv_const then
-				cf.cff_kind <- FProp (("default",null_pos),("never",null_pos),Some (make_type v.hlv_type,null_pos),None)
-			else
-				cf.cff_kind <- FVar (Some (make_dyn_type v.hlv_type,null_pos),None);
-			cf :: acc
-		| HFMethod m when m.hlm_override ->
-			Hashtbl.add override (name,stat) ();
-			acc
-		| HFMethod m ->
-			(match m.hlm_kind with
-			| MK3Normal ->
-				let t = m.hlm_type in
-				let p = ref 0 and pn = ref 0 in
-				let make_type = if stat || name = "new" then make_dyn_type else make_type in
-				let args = List.map (fun at ->
-					let aname = (match t.hlmt_pnames with
-						| None -> incr pn; "p" ^ string_of_int !pn
-						| Some l ->
-							match List.nth l !p with
-							| None -> incr pn; "p" ^ string_of_int !pn
-							| Some i -> i
-					) in
-					let opt_val = (match t.hlmt_dparams with
-						| None -> None
-						| Some l ->
-							try
-								Some (List.nth l (!p - List.length t.hlmt_args + List.length l))
-							with
-								_ -> None
-					) in
-					incr p;
-					let t = make_type at in
-					let is_opt = ref false in
-					let def_val = match opt_val with
-						| None -> None
-						| Some v ->
-							let v = (match v with
-							| HVNone | HVNull | HVNamespace _ | HVString _ ->
-								is_opt := true;
-								None
-							| HVBool b ->
-								Some (Ident (if b then "true" else "false"))
-							| HVInt i | HVUInt i ->
-								Some (Int (Int32.to_string i))
-							| HVFloat f ->
-								Some (Float (float_repres f))
-							) in
-							match v with
-							| None -> None
-							| Some v ->
-								(* add for --gen-hx-classes generation *)
-								meta := (Meta.DefParam,[String aname;v]) :: !meta;
-								Some (EConst v,pos)
-					in
-					((aname,null_pos),!is_opt,[],Some (t,null_pos),def_val)
-				) t.hlmt_args in
-				let args = if t.hlmt_var_args then
-					args @ List.map (fun _ -> incr pn; (("p" ^ string_of_int !pn,null_pos),true,[],Some (make_type None,null_pos),None)) [1;2;3;4;5]
-				else args in
-				let f = {
-					f_params = [];
-					f_args = args;
-					f_type = Some (make_type t.hlmt_ret,null_pos);
-					f_expr = None;
-				} in
-				cf.cff_meta <- mk_meta();
-				cf.cff_kind <- FFun f;
-				cf :: acc
-			| MK3Getter ->
-				Hashtbl.add getters (name,stat) m.hlm_type.hlmt_ret;
-				acc
-			| MK3Setter ->
-				Hashtbl.add setters (name,stat) (match m.hlm_type.hlmt_args with [t] -> t | _ -> assert false);
-				acc
-			)
-		| _ -> acc
-	in
-	let fields = if c.hlc_interface then [] else make_field false [] {
-		hlf_name = HMPath ([],"new");
-		hlf_slot = 0;
-		hlf_metas = None;
-		hlf_kind = HFMethod {
-			hlm_type = { c.hlc_construct with hlmt_ret = Some (HMPath ([],"void")) };
-			hlm_final = false;
-			hlm_override = false;
-			hlm_kind = MK3Normal
-		}
-	} in
-	let fields = Array.fold_left (make_field false) fields c.hlc_fields in
-	let fields = Array.fold_left (make_field true) fields c.hlc_static_fields in
-	let make_get_set name stat tget tset =
-		let get, set, t = (match tget, tset with
-			| None, None -> assert false
-			| Some t, None -> true, false, t
-			| None, Some t -> false, true, t
-			| Some t1, Some t2 -> true, true, (if t1 <> t2 then None else t1)
-		) in
-		let t = if name = "endian" then Some (HMPath (["flash";"utils"],"Endian")) else t in
-		let flags = [APublic] in
-		let flags = if stat then AStatic :: flags else flags in
-		{
-			cff_name = name,null_pos;
-			cff_pos = pos;
-			cff_doc = None;
-			cff_access = flags;
-			cff_meta = [];
-			cff_kind = if get && set then FVar (Some (make_dyn_type t,null_pos), None) else FProp (((if get then "default" else "never"),null_pos),((if set then "default" else "never"),null_pos),Some (make_dyn_type t,null_pos),None);
-		}
-	in
-	let fields = Hashtbl.fold (fun (name,stat) t acc ->
-		if Hashtbl.mem override (name,stat) then acc else
-		make_get_set name stat (Some t) (try Some (Hashtbl.find setters (name,stat)) with Not_found -> None) :: acc
-	) getters fields in
-	let fields = Hashtbl.fold (fun (name,stat) t acc ->
-		if Hashtbl.mem getters (name,stat) || Hashtbl.mem override (name,stat) then
-			acc
-		else
-			make_get_set name stat None (Some t) :: acc
-	) setters fields in
-	try
-		(*
-			If the class only contains static String constants, make it an enum
-		*)
-		let real_type = ref "" in
-		let rec loop = function
-			| [] -> []
-			| f :: l ->
-				match f.cff_kind with
-				| FVar (Some (CTPath { tpackage = []; tname = ("String" | "Int" | "UInt") as tname },null_pos),None)
-				| FProp (("default",_),("never",_),Some (CTPath { tpackage = []; tname = ("String" | "Int" | "UInt") as tname },null_pos),None) when List.mem AStatic f.cff_access ->
-					if !real_type = "" then real_type := tname else if !real_type <> tname then raise Exit;
-					{
-						ec_name = f.cff_name;
-						ec_pos = pos;
-						ec_args = [];
-						ec_params = [];
-						ec_meta = [];
-						ec_doc = None;
-						ec_type = None;
-					} :: loop l
-				| FFun { f_args = [] } when fst f.cff_name = "new" -> loop l
-				| _ -> raise Exit
-		in
-		List.iter (function HExtends _ | HImplements _ -> raise Exit | _ -> ()) flags;
-		let constr = loop fields in
-		let name = "fakeEnum:" ^ String.concat "." (path.tpackage @ [path.tname]) in
-		if not (Common.raw_defined com name) then raise Exit;
-		let enum_data = {
-			d_name = path.tname,null_pos;
-			d_doc = None;
-			d_params = [];
-			d_meta = [(Meta.FakeEnum,[EConst (Ident !real_type),pos],pos)];
-			d_flags = [EExtern];
-			d_data = constr;
-		} in
-		(path.tpackage, [(EEnum enum_data,pos)])
-	with Exit ->
-	let class_data = {
-		d_name = path.tname,null_pos;
-		d_doc = None;
-		d_params = [];
-		d_meta = if c.hlc_final && List.exists (fun f -> fst f.cff_name <> "new" && not (List.mem AStatic f.cff_access)) fields then [Meta.Final,[],pos] else [];
-		d_flags = flags;
-		d_data = fields;
-	} in
-	(path.tpackage, [(EClass class_data,pos)])
-
-let extract_data (_,tags) =
-	let t = Common.timer ["read";"swf"] in
-	let h = Hashtbl.create 0 in
-	let rec loop_field f =
-		match f.hlf_kind with
-		| HFClass c ->
-			let path = make_tpath f.hlf_name in
-			(match path with
-			| { tpackage = []; tname = "Float" | "Bool" | "Int" | "UInt" | "Dynamic" } -> ()
-			| { tpackage = _; tname = "MethodClosure" } -> ()
-			| _ -> Hashtbl.add h (path.tpackage,path.tname) c)
-		| _ -> ()
-	in
-	List.iter (fun t ->
-		match t.tdata with
-		| TActionScript3 (_,as3) ->
-			List.iter (fun i -> Array.iter loop_field i.hls_fields) (As3hlparse.parse as3)
-		| _ -> ()
-	) tags;
-	t();
-	h
-
-let remove_debug_infos as3 =
-	let hl = As3hlparse.parse as3 in
-	let methods = Hashtbl.create 0 in
-	let rec loop_field f =
-		{ f with hlf_kind = (match f.hlf_kind with
-			| HFMethod m -> HFMethod { m with hlm_type = loop_method m.hlm_type }
-			| HFFunction f -> HFFunction (loop_method f)
-			| HFVar v -> HFVar v
-			| HFClass c -> HFClass (loop_class c))
-		}
-	and loop_class c =
-		(* mutate in order to preserve sharing *)
-		c.hlc_construct <- loop_method c.hlc_construct;
-		c.hlc_fields <- Array.map loop_field c.hlc_fields;
-		c.hlc_static_construct <- loop_method c.hlc_static_construct;
-		c.hlc_static_fields <- Array.map loop_field c.hlc_static_fields;
-		c
-	and loop_static s =
-		{
-			hls_method = loop_method s.hls_method;
-			hls_fields = Array.map loop_field s.hls_fields;
-		}
-	and loop_method m =
-		try
-			Hashtbl.find methods m.hlmt_index
-		with Not_found ->
-			let m2 = { m with hlmt_debug_name = None; hlmt_pnames = None } in
-			Hashtbl.add methods m.hlmt_index m2;
-			m2.hlmt_function <- (match m.hlmt_function with None -> None | Some f -> Some (loop_function f));
-			m2
-	and loop_function f =
-		let cur = ref 0 in
-		let positions = MultiArray.map (fun op ->
-			let p = !cur in
-			(match op with
-			| HDebugReg _ | HDebugLine _ | HDebugFile _ | HBreakPointLine _ | HTimestamp -> ()
-			| _ -> incr cur);
-			p
-		) f.hlf_code in
-		MultiArray.add positions (!cur);
-		let code = MultiArray.create() in
-		MultiArray.iteri (fun pos op ->
-			match op with
-			| HDebugReg _ | HDebugLine _ | HDebugFile _ | HBreakPointLine _ | HTimestamp -> ()
-			| _ ->
-				let p delta =
-					MultiArray.get positions (pos + delta) - MultiArray.length code
-				in
-				let op = (match op with
-				| HJump (j,delta) -> HJump (j, p delta)
-				| HSwitch (d,deltas) -> HSwitch (p d,List.map p deltas)
-				| HFunction m -> HFunction (loop_method m)
-				| HCallStatic (m,args) -> HCallStatic (loop_method m,args)
-				| HClassDef c -> HClassDef c (* mutated *)
-				| _ -> op) in
-				MultiArray.add code op
-		) f.hlf_code;
-		f.hlf_code <- code;
-		f.hlf_trys <- Array.map (fun t ->
-			{
-				t with
-				hltc_start = MultiArray.get positions t.hltc_start;
-				hltc_end = MultiArray.get positions t.hltc_end;
-				hltc_handle = MultiArray.get positions t.hltc_handle;
-			}
-		) f.hlf_trys;
-		f
-	in
-	As3hlparse.flatten (List.map loop_static hl)
-
-let parse_swf com file =
-	let t = Common.timer ["read";"swf"] in
-	let is_swc = file_extension file = "swc" || file_extension file = "ane" in
-	let file = (try Common.find_file com file with Not_found -> failwith ((if is_swc then "SWC" else "SWF") ^ " Library not found : " ^ file)) in
-	let ch = if is_swc then begin
-		let zip = Zip.open_in file in
-		try
-			let entry = Zip.find_entry zip "library.swf" in
-			let ch = IO.input_string (Zip.read_entry zip entry) in
-			Zip.close_in zip;
-			ch
-		with _ ->
-			Zip.close_in zip;
-			failwith ("The input swc " ^ file ^ " is corrupted")
-	end else
-		IO.input_channel (open_in_bin file)
-	in
-	let h, tags = try
-		Swf.parse ch
-	with Out_of_memory ->
-		failwith ("Out of memory while parsing " ^ file)
-	| _ ->
-		failwith ("The input swf " ^ file ^ " is corrupted")
-	in
-	IO.close_in ch;
-	List.iter (fun t ->
-		match t.tdata with
-		| TActionScript3 (id,as3) when not com.debug && not com.display.DisplayMode.dms_display ->
-			t.tdata <- TActionScript3 (id,remove_debug_infos as3)
-		| _ -> ()
-	) tags;
-	t();
-	(h,tags)
-
-let add_swf_lib com file extern =
-	let swf_data = ref None in
-	let swf_classes = ref None in
-	let getSWF = (fun() ->
-		match !swf_data with
-		| None ->
-			let d = parse_swf com file in
-			swf_data := Some d;
-			d
-		| Some d -> d
-	) in
-	let extract = (fun() ->
-		match !swf_classes with
-		| None ->
-			let d = extract_data (getSWF()) in
-			swf_classes := Some d;
-			d
-		| Some d -> d
-	) in
-	let build cl p =
-		match (try Some (Hashtbl.find (extract()) cl) with Not_found -> None) with
-		| None -> None
-		| Some c -> Some (file, build_class com c file)
-	in
-	com.load_extern_type <- com.load_extern_type @ [build];
-	if not extern then com.swf_libs <- (file,getSWF,extract) :: com.swf_libs
-
-(* ------------------------------- *)
+open NativeLibraries
 
 let tag ?(ext=false) d = {
 	tid = 0;
@@ -567,7 +75,7 @@ let build_dependencies t =
 			(match c.cl_kind with KTypeParameter _ -> () | _ -> add_path c.cl_path DKType);
 			List.iter (add_type_rec (t::l)) pl;
 		| TAbstract (a,pl) ->
-			if Meta.has Meta.CoreType a.a_meta then
+			if a.a_path <> ([],"Null") && Meta.has Meta.CoreType a.a_meta then
 				add_path a.a_path DKType;
 			List.iter (add_type_rec (t::l)) pl;
 		| TFun (pl,t2) ->
@@ -578,7 +86,7 @@ let build_dependencies t =
 		| TDynamic t2 ->
 			add_type_rec (t::l) t2;
 		| TLazy f ->
-			add_type_rec l ((!f)())
+			add_type_rec l (lazy_type f)
 		| TMono r ->
 			(match !r with
 			| None -> ()
@@ -609,6 +117,9 @@ let build_dependencies t =
 				| None -> ()
 				| Some e -> add_expr e
 			end
+		| TArray ({ eexpr = TIdent "__global__" },{ eexpr = TConst (TString s) }) ->
+			let path = parse_path s in
+			add_path path DKExpr;
 		| _ ->
 			Type.iter add_expr e
 	and add_field f =
@@ -695,40 +206,6 @@ let build_swc_catalog com types =
 	] in
 	"<?xml version=\"1.0\" encoding =\"utf-8\"?>\n" ^ Xml.to_string_fmt x
 
-let remove_classes toremove lib hcl =
-	let lib = lib() in
-	match !toremove with
-	| [] -> lib
-	| _ ->
-		let hcl = hcl() in
-		match List.filter (fun c -> Hashtbl.mem hcl c) (!toremove) with
-		| [] -> lib
-		| classes ->
-			let rec tags = function
-				| [] -> []
-				| t :: l ->
-					match t.tdata with
-					| TActionScript3 (h,data) ->
-						let data = As3hlparse.parse data in
-						let rec loop f =
-							match f.hlf_kind with
-							| HFClass _ ->
-								let path = make_tpath f.hlf_name in
-								not (List.mem (path.tpackage,path.tname) classes)
-							| _ -> true
-						in
-						let data = List.map (fun s -> { s with hls_fields = Array.of_list (List.filter loop (Array.to_list s.hls_fields)) }) data in
-						let data = List.filter (fun s -> Array.length s.hls_fields > 0) data in
-						(if data = [] then
-							tags l
-						else
-							{ t with tdata = TActionScript3 (h,As3hlparse.flatten data) } :: tags l)
-					| _ ->
-						t :: tags l
-			in
-			toremove := List.filter (fun p -> not (List.mem p classes)) !toremove;
-			fst lib, tags (snd lib)
-
 type file_format =
 	| BJPG
 	| BPNG
@@ -773,7 +250,7 @@ let build_swf9 com file swc =
 				hls_fields = [|f|];
 			}
 		) code in
-		[tag (TActionScript3 ((if Common.defined com Define.SwfUseDoAbc then Some(1,boot_name) else None), As3hlparse.flatten inits))]
+		[tag (TActionScript3 ((Some (1,boot_name)), As3hlparse.flatten inits))]
 	) in
 	let cid = ref 0 in
 	let classes = ref [{ f9_cid = None; f9_classname = boot_name }] in
@@ -787,36 +264,49 @@ let build_swf9 com file swc =
 		if String.length file > 5 && String.sub file 0 5 = "data:" then
 			String.sub file 5 (String.length file - 5)
 		else
-			(try Std.input_file ~bin:true file with Invalid_argument("String.create") -> abort "File is too big (max 16MB allowed)" p | _  -> abort "File not found" p)
+			(try Std.input_file ~bin:true file with Invalid_argument _ -> abort "File is too big (max 16MB allowed)" p | _  -> abort "File not found" p)
 	in
 	let bmp = List.fold_left (fun acc t ->
 		match t with
 		| TClassDecl c ->
 			let rec loop = function
 				| [] -> acc
-				| (Meta.Font,(EConst (String file),p) :: args,_) :: l ->
+				| (Meta.Font,(EConst (String(file,_)),p) :: args,_) :: l ->
 					let file = try Common.find_file com file with Not_found -> file in
 					let ch = try open_in_bin file with _ -> abort "File not found" p in
 					let ttf = try TTFParser.parse ch with e -> abort ("Error while parsing font " ^ file ^ " : " ^ Printexc.to_string e) p in
 					close_in ch;
 					let get_string e = match fst e with
-						| EConst (String s) -> Some s
+						| EConst (String(s,_)) -> s
 						| _ -> raise Not_found
 					in
 					let ttf_config = {
 						ttfc_range_str = "";
 						ttfc_font_name = None;
+						ttfc_font_weight = TFWRegular;
+						ttfc_font_posture = TFPNormal;
 					} in
 					begin match args with
-						| (EConst (String str),_) :: _ -> ttf_config.ttfc_range_str <- str;
+						| (EConst (String(str,_)),_) :: _ -> ttf_config.ttfc_range_str <- str;
 						| _ -> ()
 					end;
 					begin match args with
 						| _ :: [e] ->
 							begin match fst e with
 								| EObjectDecl fl ->
-									begin try ttf_config.ttfc_font_name <- get_string (Expr.field_assoc "fontName" fl)
-									with Not_found -> () end
+									(try ttf_config.ttfc_font_name <- Some(get_string (Expr.field_assoc "fontName" fl)) with Not_found -> ());
+									(try ttf_config.ttfc_font_weight <- (
+										match get_string (Expr.field_assoc "fontWeight" fl) with
+										| "regular" -> TFWRegular
+										| "bold" -> TFWBold
+										| _ -> abort "Invalid fontWeight value. Must be `regular` or `bold`." p
+									) with Not_found -> ());
+									(try ttf_config.ttfc_font_posture <- (
+										match get_string (Expr.field_assoc "fontStyle" fl) with
+										| "normal" -> TFPNormal
+										| "italic" -> TFPItalic
+										| _ -> abort "Invalid fontStyle value. Must be `normal` or `italic`." p
+									) with Not_found -> ());
 								| _ ->
 									()
 							end
@@ -834,7 +324,7 @@ let build_swf9 com file swc =
 						cd_id = !cid;
 						cd_data = data;
 					}) :: loop l
-				| (Meta.Bitmap,[EConst (String file),p],_) :: l ->
+				| (Meta.Bitmap,[EConst (String(file,_)),p],_) :: l ->
 					let data = load_file_data file p in
 					incr cid;
 					classes := { f9_cid = Some !cid; f9_classname = s_type_path c.cl_path } :: !classes;
@@ -870,7 +360,7 @@ let build_swf9 com file swc =
 						| _ -> raw()
 					) in
 					t :: loop l
-				| (Meta.Bitmap,[EConst (String dfile),p1;EConst (String afile),p2],_) :: l ->
+				| (Meta.Bitmap,[EConst (String(dfile,_)),p1;EConst (String(afile,_)),p2],_) :: l ->
 					let ddata = load_file_data dfile p1 in
 					let adata = load_file_data afile p2 in
 					(match detect_format ddata p1 with
@@ -885,22 +375,22 @@ let build_swf9 com file swc =
 						| Png.ClTrueColor (Png.TBits8,Png.HaveAlpha) ->
 							let data = Extc.unzip (Png.data png) in
 							let raw_data = Png.filter png data in
-							let alpha = String.make (h.Png.png_width * h.Png.png_height) '\000' in
-							for i = 0 to String.length alpha do
-								String.unsafe_set alpha i (String.unsafe_get raw_data (i lsl 2));
+							let alpha = Bytes.make (h.Png.png_width * h.Png.png_height) '\000' in
+							for i = 0 to Bytes.length alpha do
+								Bytes.unsafe_set alpha i (String.unsafe_get raw_data (i lsl 2));
 							done;
-							Extc.zip alpha
+							Extc.zip (Bytes.unsafe_to_string alpha)
 						| _ -> abort "PNG file must contain 8 bit alpha channel" p2
 					) in
 					incr cid;
 					classes := { f9_cid = Some !cid; f9_classname = s_type_path c.cl_path } :: !classes;
 					tag (TBitsJPEG3 { bd_id = !cid; bd_data = ddata; bd_table = None; bd_alpha = Some amask; bd_deblock = Some 0 }) :: loop l
-				| (Meta.File,[EConst (String file),p],_) :: l ->
+				| (Meta.File,[EConst (String(file,_)),p],_) :: l ->
 					let data = load_file_data file p in
 					incr cid;
 					classes := { f9_cid = Some !cid; f9_classname = s_type_path c.cl_path } :: !classes;
 					tag (TBinaryData (!cid,data)) :: loop l
-				| (Meta.Sound,[EConst (String file),p],_) :: l ->
+				| (Meta.Sound,[EConst (String(file,_)),p],_) :: l ->
 					let data = load_file_data file p in
 					let make_flags fmt mono freq bits =
 						let fbits = (match freq with 5512 when fmt <> 2 -> 0 | 11025 -> 1 | 22050 -> 2 | 44100 -> 3 | _ -> failwith ("Unsupported frequency " ^ string_of_int freq)) in
@@ -911,9 +401,9 @@ let build_swf9 com file swc =
 						| SWAV ->
 							(try
 								let i = IO.input_string data in
-								if IO.nread i 4 <> "RIFF" then raise Exit;
+								if IO.nread_string i 4 <> "RIFF" then raise Exit;
 								ignore(IO.nread i 4); (* size *)
-								if IO.nread i 4 <> "WAVE" || IO.nread i 4 <> "fmt " then raise Exit;
+								if IO.nread_string i 4 <> "WAVE" || IO.nread_string i 4 <> "fmt " then raise Exit;
 								let chunk_size = IO.read_i32 i in
 								if not (chunk_size = 0x10 || chunk_size = 0x12 || chunk_size = 0x40) then failwith ("Unsupported chunk size " ^ string_of_int chunk_size);
 								if IO.read_ui16 i <> 1 then failwith "Not a PCM file";
@@ -924,9 +414,9 @@ let build_swf9 com file swc =
 								ignore(IO.read_i16 i);
 								let bits = IO.read_ui16 i in
 								if chunk_size <> 0x10 then ignore(IO.nread i (chunk_size - 0x10));
-								if IO.nread i 4 <> "data" then raise Exit;
+								if IO.nread_string i 4 <> "data" then raise Exit;
 								let data_size = IO.read_i32 i in
-								let data = IO.nread i data_size in
+								let data = IO.nread_string i data_size in
 								make_flags 0 (chan = 1) freq bits, (data_size * 8 / (chan * bits)), data
 							with Exit | IO.No_more_input | IO.Overflow _ ->
 								abort "Invalid WAV file" p
@@ -945,7 +435,7 @@ let build_swf9 com file swc =
 										()
 									| 0x49 ->
 										(* ID3 *)
-										if IO.nread i 2 <> "D3" then raise Exit;
+										if IO.nread_string i 2 <> "D3" then raise Exit;
 										ignore(IO.read_ui16 i); (* version *)
 										ignore(IO.read_byte i); (* flags *)
 										let size = IO.read_byte i land 0x7F in
@@ -956,7 +446,7 @@ let build_swf9 com file swc =
 										read_frame()
 									| 0x54 ->
 										(* TAG and TAG+ *)
-										if IO.nread i 3 = "AG+" then ignore(IO.nread i 223) else ignore(IO.nread i 124);
+										if IO.nread_string i 3 = "AG+" then ignore(IO.nread i 223) else ignore(IO.nread i 124);
 										read_frame()
 									| 0xFF ->
 										let infos = IO.read_byte i in
@@ -1081,8 +571,8 @@ let generate swf_header com =
 	(* list exports *)
 	let exports = Hashtbl.create 0 in
 	let toremove = ref [] in
-	List.iter (fun (file,lib,_) ->
-		let _, tags = lib() in
+	List.iter (fun swf_lib ->
+		let _, tags = swf_lib#get_data in
 		List.iter (fun t ->
 			match t.tdata with
 			| TExport l -> List.iter (fun e -> Hashtbl.add exports e.exp_name ()) l
@@ -1108,7 +598,7 @@ let generate swf_header com =
 				) el
 			| _ -> ()
 		) tags;
-	) com.swf_libs;
+	) com.native_libs.swf_libs;
 	(* build haxe swf *)
 	let tags = build_swf9 com file swc in
 	let header, bg = (match swf_header with None -> default_header com | Some h -> convert_header com h) in
@@ -1149,11 +639,11 @@ let generate swf_header com =
 	let swf = header, fattr @ meta_data @ bg :: scene :: debug @ swf_script_limits @ tags @ [tag TShowFrame] in
 	(* merge swf libraries *)
 	let priority = ref (swf_header = None) in
-	let swf = List.fold_left (fun swf (file,lib,cl) ->
-		let swf = merge com file !priority swf (remove_classes toremove lib cl) in
+	let swf = List.fold_left (fun swf swf_lib ->
+		let swf = merge com file !priority swf (SwfLoader.remove_classes toremove swf_lib#get_data swf_lib#list_modules) in
 		priority := false;
 		swf
-	) swf com.swf_libs in
+	) swf com.native_libs.swf_libs in
 	let swf = match swf with
 	| header,tags when Common.defined com Define.SwfPreloaderFrame ->
 		let rec loop l =
@@ -1165,7 +655,7 @@ let generate swf_header com =
 		{header with h_frame_count = header.h_frame_count + 1},loop tags
 	| _ -> swf in
 	(* write swf/swc *)
-	let t = Common.timer ["write";"swf"] in
+	let t = Timer.timer ["write";"swf"] in
 	let level = (try int_of_string (Common.defined_value com Define.SwfCompressLevel) with Not_found -> 9) in
 	SwfParser.init Extc.input_zip (Extc.output_zip ~level);
 	(match swc with
diff --git a/src/generators/genswf9.ml b/src/generators/genswf9.ml
index f66447d7014da5ce30bbb94eb843391c682b0857..3abdf001a64f33d07ca6939581d694b710f00246 100644
--- a/src/generators/genswf9.ml
+++ b/src/generators/genswf9.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -23,6 +23,7 @@ open Type
 open As3
 open As3hl
 open Common
+open FlashProps
 
 type read = Read
 type write = Unused__ | Write
@@ -188,8 +189,8 @@ let rec follow_basic t =
 		| Some t -> follow_basic t
 		| _ -> t)
 	| TLazy f ->
-		follow_basic (!f())
-	| TType ({ t_path = [],"Null" },[tp]) ->
+		follow_basic (lazy_type f)
+	| TAbstract ({ a_path = [],"Null" },[tp]) ->
 		(match follow_basic tp with
 		| TMono _
 		| TFun _
@@ -199,7 +200,6 @@ let rec follow_basic t =
 		| TAbstract ({ a_path = ([],"Bool") },[])
 		| TInst ({ cl_path = (["haxe"],"Int32") },[]) -> t
 		| t -> t)
-	| TType ({ t_path = ["flash";"utils"],"Object" },[])
 	| TType ({ t_path = ["flash";"utils"],"Function" },[])
 	| TType ({ t_path = [],"UInt" },[]) ->
 		t
@@ -228,7 +228,11 @@ let rec type_id ctx t =
 			| _ -> type_path ctx ([],"Object"))
 		| _ ->
 			type_path ctx c.cl_path)
-	| TAbstract (a,_) ->
+	| TAbstract ({ a_path = [],"Null"},_) ->
+		HMPath ([],"Object")
+	| TAbstract ({ a_path = ["flash"],"AnyType"},_) ->
+		HMAny
+	| TAbstract (a,_) when Meta.has Meta.CoreType a.a_meta ->
 		type_path ctx a.a_path
 	| TFun _ | TType ({ t_path = ["flash";"utils"],"Function" },[]) ->
 		type_path ctx ([],"Function")
@@ -237,12 +241,7 @@ let rec type_id ctx t =
 	| TEnum ({ e_path = ["flash"],"XmlType"; e_extern = true },_) ->
 		HMPath ([],"String")
 	| TEnum (e,_) ->
-		let rec loop = function
-			| [] -> type_path ctx e.e_path
-			| (Meta.FakeEnum,[Ast.EConst (Ast.Ident n),_],_) :: _ -> type_path ctx ([],n)
-			| _ :: l -> loop l
-		in
-		loop e.e_meta
+		type_path ctx e.e_path
 	| _ ->
 		HMPath ([],"Object")
 
@@ -266,20 +265,12 @@ let classify ctx t =
 		KBool
 	| TAbstract ({ a_path = [],"Void" },_) | TEnum ({ e_path = [],"Void" },_) ->
 		KDynamic
+	| TAbstract ({ a_path = ["flash"],"AnyType" },_) ->
+		KDynamic
 	| TEnum ({ e_path = ["flash"],"XmlType"; e_extern = true },_) ->
 		KType (HMPath ([],"String"))
 	| TEnum (e,_) ->
-		let rec loop = function
-			| [] -> KType (type_id ctx t)
-			| (Meta.FakeEnum,[Ast.EConst (Ident n),_],_) :: _ ->
-				(match n with
-				| "Int" -> KInt
-				| "UInt" -> KUInt
-				| "String" -> KType (HMPath ([],"String"))
-				| _ -> assert false)
-			| _ :: l -> loop l
-		in
-		loop e.e_meta
+		KType (type_id ctx t)
 	| TAbstract ({ a_path = [],"UInt" },_) | TType ({ t_path = [],"UInt" },_) ->
 		KUInt
 	| TFun _ | TType ({ t_path = ["flash";"utils"],"Function" },[]) ->
@@ -288,7 +279,7 @@ let classify ctx t =
 		(match !(a.a_status) with
 		| Statics _ -> KNone
 		| _ -> KDynamic)
-	| TType ({ t_path = ["flash";"utils"],"Object" },[]) ->
+	| TAbstract ({ a_path = ["flash";"utils"],"Object" },[]) ->
 		KType (HMPath ([],"Object"))
 	| TInst _ | TAbstract _ ->
 		KType (type_id ctx t)
@@ -311,13 +302,40 @@ let ident i =
 let as3 p =
 	HMName (p,HNNamespace "http://adobe.com/AS3/2006/builtin")
 
-let property ctx p t =
+let make_class_ns c =
+	match c.cl_path with
+	| [], n -> n
+	| p, n -> String.concat "." p ^ ":" ^ n
+
+let is_cf_protected cf = Meta.has Meta.Protected cf.cf_meta
+
+let ns_access cf =
+	try
+		let (_,params,_) = Meta.get Meta.Ns cf.cf_meta in
+		match params with
+		| [(EConst (String(ns,_)),_)] ->
+			Some (HMName (cf.cf_name, HNNamespace ns))
+		| [(EConst (String(ns,_)),_); (EConst (Ident "internal"),_)] ->
+			Some (HMName (cf.cf_name, HNInternal (Some ns)))
+		| _ -> assert false
+	with Not_found ->
+		None
+
+let property ctx fa t =
+	match Option.map_default ns_access None (extract_field fa) with
+	| Some n -> n, None, false
+	| None ->
+	match fa with
+	| FStatic (c, cf) when is_cf_protected cf ->
+		HMName (reserved cf.cf_name, HNStaticProtected (Some (make_class_ns c))), None, false
+	| _ ->
+	let p = field_name fa in
 	match follow t with
 	| TInst ({ cl_path = [],"Array" },_) ->
 		(match p with
 		| "length" -> ident p, Some KInt, false (* UInt in the spec *)
 		| "map" | "filter" when Common.defined ctx.com Define.NoFlashOverride -> ident (p ^ "HX"), None, true
-		| "copy" | "insert" | "remove" | "iterator" | "toString" | "map" | "filter" -> ident p , None, true
+		| "copy" | "insert" | "remove" | "iterator" | "toString" | "map" | "filter" | "resize" -> ident p , None, true
 		| _ -> as3 p, None, false);
 	| TInst ({ cl_path = ["flash"],"Vector" },_) ->
 		(match p with
@@ -362,7 +380,7 @@ let property ctx p t =
 		in
 		(try
 			let c = loop c in
-			let ns = HMName (reserved p, HNNamespace (match c.cl_path with [],n -> n | l,n -> String.concat "." l ^ ":" ^ n)) in
+			let ns = HMName (reserved p, HNNamespace (make_class_ns c)) in
 			ns, None, false
 		with Not_found | Exit ->
 			ident p, None, false)
@@ -370,6 +388,19 @@ let property ctx p t =
 	| _ ->
 		ident p, None, false
 
+let this_property fa =
+	match fa with
+	| FInstance (c,_,cf) | FClosure (Some (c,_),cf) ->
+		if is_cf_protected cf then
+			HMName (reserved cf.cf_name, HNProtected (make_class_ns c))
+		else begin
+			match ns_access cf with
+			| Some n -> n
+			| None -> ident (field_name fa)
+		end
+	| _ ->
+		ident (field_name fa)
+
 let default_infos() =
 	{
 		ipos = 0;
@@ -509,7 +540,7 @@ let rec setvar ctx (acc : write access) kret =
 			set_reg_dup ctx r
 		else
 			set_reg ctx r;
-	| VGlobal _ | VId _ | VCast _ | VArray | VScope _ when kret <> None ->
+	| VGlobal _ | VId _ | VCast _ | VArray | VScope _ | VSuper _ when kret <> None ->
 		let r = alloc_reg ctx (match kret with None -> assert false | Some k -> k) in
 		set_reg_dup ctx r;
 		setvar ctx acc None;
@@ -626,7 +657,7 @@ let to_utf8 str =
 	with
 		UTF8.Malformed_code ->
 			let b = UTF8.Buf.create 0 in
-			String.iter (fun c -> UTF8.Buf.add_char b (UChar.of_char c)) str;
+			String.iter (fun c -> UTF8.Buf.add_char b (UCharExt.of_char c)) str;
 			UTF8.Buf.contents b
 
 let gen_constant ctx c t p =
@@ -670,6 +701,9 @@ let end_fun ctx args dparams tret =
 		hlmt_function = None;
 	}
 
+let gen_expr_ref = ref (fun _ _ _ -> assert false)
+let gen_expr ctx e retval = (!gen_expr_ref) ctx e retval
+
 let begin_fun ctx args tret el stat p =
 	let old_locals = ctx.locals in
 	let old_code = ctx.code in
@@ -706,18 +740,18 @@ let begin_fun ctx args tret el stat p =
 		let v = (match classify ctx t, c with
 		| _, None -> HVNone
 		| (KInt | KFloat | KUInt | KBool) as kind, Some c ->
-			(match c with
-			| TInt i -> if kind = KUInt then HVUInt i else HVInt i
-			| TFloat s -> HVFloat (float_of_string s)
-			| TBool b -> HVBool b
-			| TNull -> abort ("In Flash9, null can't be used as basic type " ^ s_type (print_context()) t) p
+			(match c.eexpr with
+			| TConst (TInt i) -> if kind = KUInt then HVUInt i else HVInt i
+			| TConst (TFloat s) -> HVFloat (float_of_string s)
+			| TConst (TBool b) -> HVBool b
+			| TConst TNull -> abort ("In Flash9, null can't be used as basic type " ^ s_type (print_context()) t) p
 			| _ -> assert false)
-		| _, Some TNull -> HVNone
+		| _, Some {eexpr = TConst TNull} -> HVNone
 		| k, Some c ->
 			write ctx (HReg r.rid);
 			write ctx HNull;
 			let j = jump ctx J3Neq in
-			gen_constant ctx c t p;
+			gen_expr ctx true c;
 			coerce ctx k;
 			write ctx (HSetReg r.rid);
 			j();
@@ -865,31 +899,33 @@ let pop_value ctx retval =
 	   branch value *)
 	if retval then ctx.infos.istack <- ctx.infos.istack - 1
 
-let gen_expr_ref = ref (fun _ _ _ -> assert false)
-let gen_expr ctx e retval = (!gen_expr_ref) ctx e retval
-
 let rec gen_access ctx e (forset : 'a) : 'a access =
 	match e.eexpr with
 	| TLocal v ->
 		gen_local_access ctx v e.epos forset
-	| TField ({ eexpr = TConst TSuper } as e1,f) ->
-		let f = field_name f in
-		let id, _, _ = property ctx f e1.etype in
+	| TField ({ eexpr = TConst TSuper },f) ->
 		write ctx HThis;
-		VSuper id
+		VSuper (this_property f)
 	| TEnumParameter (e1,_,i) ->
 		gen_expr ctx true e1;
 		write ctx (HGetProp (ident "params"));
 		write ctx (HSmallInt i);
 		VArray
+	| TEnumIndex e1 ->
+		gen_expr ctx true e1;
+		VId (ident "index")
 	| TField (e1,fa) ->
-		let f = field_name fa in
-		let id, k, closure = property ctx f e1.etype in
+		let id, k, closure =
+			match e1.eexpr with
+			| TConst (TThis | TSuper) when not ctx.in_static ->
+				let id = this_property fa in
+				write ctx (HFindProp id);
+				id, None, false
+			| _ ->
+				gen_expr ctx true e1;
+				property ctx fa e1.etype
+		in
 		if closure && not ctx.for_call then abort "In Flash9, this method cannot be accessed this way : please define a local function" e1.epos;
-		(match e1.eexpr with
-		| TConst (TThis|TSuper) when not ctx.in_static ->
-			write ctx (HFindProp id)
-		| _ -> gen_expr ctx true e1);
 		(match k with
 		| Some t -> VCast (id,t)
 		| None ->
@@ -897,14 +933,17 @@ let rec gen_access ctx e (forset : 'a) : 'a access =
 		| _ , TFun _ when not ctx.for_call -> VCast(id,classify ctx e.etype)
 		| TEnum _, _ -> VId id
 		| TInst (_,tl), et ->
-			let is_type_parameter_field = match fa with
+			let requires_cast = match fa with
+				| FInstance({cl_interface=true},_,{cf_kind = Var _}) ->
+					(* we have to cast var access on interfaces *)
+					true
 				| FInstance(_,_,cf) ->
+					(* if the return type is one of the type-parameters, then we need to cast it *)
 					(match follow cf.cf_type with TInst({cl_kind = KTypeParameter _},_) -> true | _ -> false)
 				| _ ->
 					List.exists (fun t -> follow t == et) tl
 			in
-			(* if the return type is one of the type-parameters, then we need to cast it *)
-			if is_type_parameter_field then
+			if requires_cast then
 				VCast (id, classify ctx e.etype)
 			else if Codegen.is_volatile e.etype then
 				VVolatile (id,None)
@@ -921,7 +960,7 @@ let rec gen_access ctx e (forset : 'a) : 'a access =
 			else
 				VCast (id,classify ctx e.etype)
 		)
-	| TArray ({ eexpr = TLocal { v_name = "__global__" } },{ eexpr = TConst (TString s) }) ->
+	| TArray ({ eexpr = TIdent "__global__" },{ eexpr = TConst (TString s) }) ->
 		let path = parse_path s in
 		let id = type_path ctx path in
 		if is_set forset then write ctx HGetGlobalScope;
@@ -998,6 +1037,8 @@ let rec gen_type ctx t =
 		write ctx (HGetLex t);
 		List.iter (gen_type ctx) tl;
 		write ctx (HApplyType (List.length tl));
+	| HMAny ->
+		write ctx (HNull)
 	| _ ->
 		write ctx (HGetLex t)
 
@@ -1020,7 +1061,7 @@ let rec gen_expr_content ctx retval e =
 	| TParenthesis e | TMeta (_,e) ->
 		gen_expr ctx retval e
 	| TObjectDecl fl ->
-		List.iter (fun (name,e) ->
+		List.iter (fun ((name,_,_),e) ->
 			write ctx (HString (reserved name));
 			gen_expr ctx true e
 		) fl;
@@ -1060,6 +1101,7 @@ let rec gen_expr_content ctx retval e =
 		no_value ctx retval
 	| TField _
 	| TLocal _
+	| TEnumIndex _
 	| TTypeExpr _ ->
 		getvar ctx (gen_access ctx e Read)
 	(* both accesses return dynamic so let's cast them to the real type *)
@@ -1307,6 +1349,15 @@ let rec gen_expr_content ctx retval e =
 		);
 		List.iter (fun j -> j()) jend;
 		branch());
+	| TCast (e1,Some t) when not retval ->
+		let p = e.epos in
+		let e2 = mk (TTypeExpr t) t_dynamic p in
+		let eis = mk (TIdent "__is__") t_dynamic p in
+		let ecall = mk (TCall(eis,[e1;e2])) ctx.com.basic.tbool p in
+		let enot = {ecall with eexpr = TUnop(Not,Prefix,ecall)} in
+		let exc = mk (TThrow (mk (TConst (TString "Class cast error")) ctx.com.basic.tstring p)) ctx.com.basic.tvoid p in
+		let eif = mk (TIf(enot,exc,None)) ctx.com.basic.tvoid p in
+		gen_expr ctx retval eif
 	| TCast (e1,t) ->
 		gen_expr ctx retval e1;
 		if retval then begin
@@ -1345,10 +1396,12 @@ let rec gen_expr_content ctx retval e =
 					j();
 					write ctx (HCast tid)
 		end
+	| TIdent s ->
+		abort ("Unbound variable " ^ s) e.epos
 
 and gen_call ctx retval e el r =
 	match e.eexpr , el with
-	| TLocal { v_name = "__is__" }, [e;t] ->
+	| TIdent "__is__", [e;t] ->
 		gen_expr ctx true e;
 		gen_expr ctx true t;
 		write ctx (HOp A3OIs)
@@ -1357,31 +1410,31 @@ and gen_call ctx retval e el r =
 		gen_expr ctx true e;
 		gen_expr ctx true t;
 		write ctx (HOp A3OIs)
-	| TLocal { v_name = "__as__" }, [e;t] ->
+	| TIdent "__as__", [e;t] ->
 		gen_expr ctx true e;
 		gen_expr ctx true t;
 		write ctx (HOp A3OAs)
-	| TLocal { v_name = "__int__" }, [e] ->
+	| TIdent "__int__", [e] ->
 		gen_expr ctx true e;
 		write ctx HToInt
-	| TLocal { v_name = "__float__" }, [e] ->
+	| TIdent "__float__", [e] ->
 		gen_expr ctx true e;
 		write ctx HToNumber
-	| TLocal { v_name = "__foreach__" }, [obj;counter] ->
+	| TIdent "__foreach__", [obj;counter] ->
 		gen_expr ctx true obj;
 		gen_expr ctx true counter;
 		write ctx HForEach
-	| TLocal { v_name = "__forin__" }, [obj;counter] ->
+	| TIdent "__forin__", [obj;counter] ->
 		gen_expr ctx true obj;
 		gen_expr ctx true counter;
 		write ctx HForIn
-	| TLocal { v_name = "__has_next__" }, [obj;counter] ->
+	| TIdent "__has_next__", [obj;counter] ->
 		let oreg = match gen_access ctx obj Read with VReg r -> r | _ -> abort "Must be a local variable" obj.epos in
 		let creg = match gen_access ctx counter Read with VReg r -> r | _ -> abort "Must be a local variable" obj.epos in
 		write ctx (HNext (oreg.rid,creg.rid))
-	| TLocal { v_name = "__hkeys__" }, [e2]
-	| TLocal { v_name = "__foreach__" }, [e2]
-	| TLocal { v_name = "__keys__" }, [e2] ->
+	| TIdent "__hkeys__", [e2]
+	| TIdent "__foreach__", [e2]
+	| TIdent "__keys__", [e2] ->
 		let racc = alloc_reg ctx (KType (type_path ctx ([],"Array"))) in
 		let rcounter = alloc_reg ctx KInt in
 		let rtmp = alloc_reg ctx KDynamic in
@@ -1397,9 +1450,9 @@ and gen_call ctx retval e el r =
 		write ctx (HReg rtmp.rid);
 		write ctx (HReg rcounter.rid);
 		(match e.eexpr with
-		| TLocal { v_name = "__foreach__" } ->
+		| TIdent "__foreach__" ->
 			write ctx HForEach
-		| TLocal { v_name = "__hkeys__" } ->
+		| TIdent "__hkeys__" ->
 			write ctx HForIn;
 			write ctx (HSmallInt 1);
 			write ctx (HCallProperty (as3 "substr",1));
@@ -1413,26 +1466,26 @@ and gen_call ctx retval e el r =
 		free_reg ctx rtmp;
 		free_reg ctx rcounter;
 		free_reg ctx racc;
-	| TLocal { v_name = "__new__" }, e :: el ->
+	| TIdent "__new__", e :: el ->
 		gen_expr ctx true e;
 		List.iter (gen_expr ctx true) el;
 		write ctx (HConstruct (List.length el))
-	| TLocal { v_name = "__delete__" }, [o;f] ->
+	| TIdent "__delete__", [o;f] ->
 		gen_expr ctx true o;
 		gen_expr ctx true f;
 		write ctx (HDeleteProp dynamic_prop);
-	| TLocal { v_name = "__unprotect__" }, [e] ->
+	| TIdent "__unprotect__", [e] ->
 		write ctx (HGetLex (type_path ctx (["flash"],"Boot")));
 		gen_expr ctx true e;
 		write ctx (HCallProperty (ident "__unprotect__",1));
-	| TLocal { v_name = "__typeof__" }, [e] ->
+	| TIdent "__typeof__", [e] ->
 		gen_expr ctx true e;
 		write ctx HTypeof
-	| TLocal { v_name = "__in__" }, [e; f] ->
+	| TIdent "__in__", [e; f] ->
 		gen_expr ctx true e;
 		gen_expr ctx true f;
 		write ctx (HOp A3OIn)
-	| TLocal { v_name = "__resources__" }, [] ->
+	| TIdent "__resources__", [] ->
 		let count = ref 0 in
 		Hashtbl.iter (fun name data ->
 			incr count;
@@ -1441,7 +1494,7 @@ and gen_call ctx retval e el r =
 			write ctx (HObject 1);
 		) ctx.com.resources;
 		write ctx (HArray !count)
-	| TLocal { v_name = "__vmem_set__" }, [{ eexpr = TConst (TInt code) };e1;e2] ->
+	| TIdent "__vmem_set__", [{ eexpr = TConst (TInt code) };e1;e2] ->
 		gen_expr ctx true e2;
 		gen_expr ctx true e1;
 		write ctx (HOp (match code with
@@ -1452,7 +1505,7 @@ and gen_call ctx retval e el r =
 			| 4l -> A3OMemSetDouble
 			| _ -> assert false
 		))
-	| TLocal { v_name = "__vmem_get__" }, [{ eexpr = TConst (TInt code) };e] ->
+	| TIdent "__vmem_get__", [{ eexpr = TConst (TInt code) };e] ->
 		gen_expr ctx true e;
 		write ctx (HOp (match code with
 			| 0l -> A3OMemGet8
@@ -1462,7 +1515,7 @@ and gen_call ctx retval e el r =
 			| 4l -> A3OMemGetDouble
 			| _ -> assert false
 		))
-	| TLocal { v_name = "__vmem_sign__" }, [{ eexpr = TConst (TInt code) };e] ->
+	| TIdent "__vmem_sign__", [{ eexpr = TConst (TInt code) };e] ->
 		gen_expr ctx true e;
 		write ctx (HOp (match code with
 			| 0l -> A3OSign1
@@ -1470,12 +1523,15 @@ and gen_call ctx retval e el r =
 			| 2l -> A3OSign16
 			| _ -> assert false
 		))
-	| TLocal { v_name = "__vector__" }, [ep] ->
+	| TIdent "__vector__", [] ->
+		let t = match r with TAbstract ({a_path = [],"Class"}, [vt]) -> vt | _ -> assert false in
+		gen_type ctx (type_id ctx t)
+	| TIdent "__vector__", [ep] ->
 		gen_type ctx (type_id ctx r);
 		write ctx HGetGlobalScope;
 		gen_expr ctx true ep;
 		write ctx (HCallStack 1)
-	| TArray ({ eexpr = TLocal { v_name = "__global__" } },{ eexpr = TConst (TString s) }), _ ->
+	| TArray ({ eexpr = TIdent "__global__" },{ eexpr = TConst (TString s) }), _ ->
 		(match gen_access ctx e Read with
 		| VGlobal id ->
 			write ctx (HFindPropStrict id);
@@ -1486,26 +1542,79 @@ and gen_call ctx retval e el r =
 		write ctx HThis;
 		List.iter (gen_expr ctx true) el;
 		write ctx (HConstructSuper (List.length el));
-	| TField ({ eexpr = TConst TSuper },f) , _ ->
-		let id = ident (field_name f) in
+	| TField (e1,f) , _ ->
+		begin
+			let default () = gen_field_call ctx retval e1 f el r in
+			let mk_prop_acccess prop_cl prop_tl prop_cf = mk (TField (e1, FInstance (prop_cl, prop_tl, prop_cf))) prop_cf.cf_type e.epos in
+			let mk_static_acccess cl prop_cf = mk (TField (e1, FStatic (cl, prop_cf))) prop_cf.cf_type e.epos in
+			match f, el with
+			| FInstance (cl, tl, cf), [] ->
+				(match is_extern_instance_accessor ~isget:true cl tl cf with
+				| Some (prop_cl, prop_tl, prop_cf) ->
+					let efield = mk_prop_acccess prop_cl prop_tl prop_cf in
+					getvar ctx (gen_access ctx efield Read)
+				| None ->
+					default ())
+
+			| FInstance (cl, tl, cf), [evalue] ->
+				(match is_extern_instance_accessor ~isget:false cl tl cf with
+				| Some (prop_cl, prop_tl, prop_cf) ->
+					let efield = mk_prop_acccess prop_cl prop_tl prop_cf in
+					gen_assign ctx efield evalue retval
+				| None ->
+					default ())
+
+			| FStatic (cl, cf), [] ->
+				(match is_extern_static_accessor ~isget:true cl cf with
+				| Some prop_cf ->
+					let efield = mk_static_acccess cl prop_cf in
+					getvar ctx (gen_access ctx efield Read)
+				| None ->
+					default ())
+
+			| FStatic (cl, cf), [evalue] ->
+				(match is_extern_static_accessor ~isget:false cl cf with
+				| Some prop_cf ->
+					let efield = mk_static_acccess cl prop_cf in
+					gen_assign ctx efield evalue retval
+				| None ->
+					default ())
+
+			| _ ->
+				default ()
+		end
+	| _ ->
+		gen_expr ctx true e;
+		write ctx HGetGlobalScope;
+		List.iter (gen_expr ctx true) el;
+		write ctx (HCallStack (List.length el));
+		coerce ctx (classify ctx r)
+
+and gen_field_call ctx retval eobj f el r =
+	match eobj with
+	| { eexpr = TConst TSuper } ->
+		let id = this_property f in
 		write ctx (HFindPropStrict id);
 		List.iter (gen_expr ctx true) el;
-		write ctx (HCallSuper (id,List.length el));
-		coerce ctx (classify ctx r);
-	| TField ({ eexpr = TConst TThis },f) , _ when not ctx.in_static ->
-		let id = ident (field_name f) in
-		write ctx (HFindProp id);
+		if retval then begin
+			write ctx (HCallSuper (id,List.length el));
+			coerce ctx (classify ctx r);
+		end else
+			write ctx (HCallSuperVoid (id,List.length el))
+	| { eexpr = TConst TThis } when not ctx.in_static ->
+		let id = this_property f in
+		write ctx (HFindProp id); (* not sure why we don't use HFindPropStrict here too *)
 		List.iter (gen_expr ctx true) el;
 		if retval then begin
 			write ctx (HCallProperty (id,List.length el));
 			coerce ctx (classify ctx r);
 		end else
 			write ctx (HCallPropVoid (id,List.length el))
-	| TField (e1,f) , _ ->
+	| _ ->
 		let old = ctx.for_call in
 		ctx.for_call <- true;
-		gen_expr ctx true e1;
-		let id , _, _ = property ctx (field_name f) e1.etype in
+		gen_expr ctx true eobj;
+		let id , _, _ = property ctx f eobj.etype in
 		ctx.for_call <- old;
 		List.iter (gen_expr ctx true) el;
 		if retval then begin
@@ -1513,12 +1622,6 @@ and gen_call ctx retval e el r =
 			coerce ctx (classify ctx r);
 		end else
 			write ctx (HCallPropVoid (id,List.length el))
-	| _ ->
-		gen_expr ctx true e;
-		write ctx HGetGlobalScope;
-		List.iter (gen_expr ctx true) el;
-		write ctx (HCallStack (List.length el));
-		coerce ctx (classify ctx r)
 
 and gen_unop ctx retval op flag e =
 	let k = classify ctx e.etype in
@@ -1570,6 +1673,11 @@ and check_binop ctx e1 e2 =
 	| _ -> false) in
 	if invalid then abort "Comparison of Int and UInt might lead to unexpected results" (punion e1.epos e2.epos);
 
+and gen_assign ctx lhs rhs retval =
+	let acc = gen_access ctx lhs Write in
+	gen_expr ctx true rhs;
+	setvar ctx acc (if retval then Some (classify ctx lhs.etype) else None)
+
 and gen_binop ctx retval op e1 e2 t p =
 	let write_op op =
 		let iop = (match op with
@@ -1625,9 +1733,7 @@ and gen_binop ctx retval op e1 e2 t p =
 	in
 	match op with
 	| OpAssign ->
-		let acc = gen_access ctx e1 Write in
-		gen_expr ctx true e2;
-		setvar ctx acc (if retval then Some (classify ctx e1.etype) else None)
+		gen_assign ctx e1 e2 retval
 	| OpBoolAnd ->
 		write ctx HFalse;
 		let j = jump_expr ctx e1 false in
@@ -1674,7 +1780,7 @@ and gen_binop ctx retval op e1 e2 t p =
 		gen_op A3OLt
 	| OpLte ->
 		gen_op A3OLte
-	| OpInterval | OpArrow ->
+	| OpInterval | OpArrow | OpIn ->
 		assert false
 
 and gen_expr ctx retval e =
@@ -1760,10 +1866,10 @@ let generate_construct ctx fdata c =
 	let cargs = if not ctx.need_ctor_skip then fdata.tf_args else List.map (fun (v,c) ->
 		let c = (match c with Some _ -> c | None ->
 			Some (match classify ctx v.v_type with
-			| KInt | KUInt -> TInt 0l
-			| KFloat -> TFloat "0"
-			| KBool -> TBool false
-			| KType _ | KDynamic | KNone -> TNull)
+			| KInt | KUInt -> mk (TConst (TInt 0l)) ctx.com.basic.tint v.v_pos
+			| KFloat -> mk (TConst (TFloat "0")) ctx.com.basic.tfloat v.v_pos
+			| KBool -> mk (TConst (TBool false)) ctx.com.basic.tbool v.v_pos
+			| KType _ | KDynamic | KNone -> mk (TConst TNull) t_dynamic v.v_pos)
 		) in
 		v,c
 	) fdata.tf_args in
@@ -1771,7 +1877,7 @@ let generate_construct ctx fdata c =
 	(* if skip_constructor, then returns immediatly *)
 	if ctx.need_ctor_skip then (match c.cl_kind with
 	| KGenericInstance _ -> ()
-	| _ when not (Codegen.constructor_side_effects fdata.tf_expr) -> ()
+	| _ when not (Texpr.constructor_side_effects fdata.tf_expr) -> ()
 	| _ ->
 		let id = ident "skip_constructor" in
 		getvar ctx (VGlobal (type_path ctx (["flash"],"Boot")));
@@ -1930,8 +2036,8 @@ let extract_meta meta =
 		| (Meta.Meta,[ECall ((EConst (Ident n),_),args),_],_) :: l ->
 			let mk_arg (a,p) =
 				match a with
-				| EConst (String s) -> (None, s)
-				| EBinop (OpAssign,(EConst (Ident n),_),(EConst (String s),_)) -> (Some n, s)
+				| EConst (String(s,_)) -> (None, s)
+				| EBinop (OpAssign,(EConst (Ident n),_),(EConst (String(s,_)),_)) -> (Some n, s)
 				| _ -> abort "Invalid meta definition" p
 			in
 			{ hlmeta_name = n; hlmeta_data = Array.of_list (List.map mk_arg args) } :: loop l
@@ -1951,7 +2057,7 @@ let generate_field_kind ctx f c stat =
 		in
 		loop f.cf_meta
 	in
-	if is_extern_field f then None else
+	if not (is_physical_field f) then None else
 	match f.cf_expr with
 	| Some { eexpr = TFunction fdata } ->
 		let rec loop c name =
@@ -1972,10 +2078,14 @@ let generate_field_kind ctx f c stat =
 		| _ ->
 			let name, kind = method_kind() in
 			let m = generate_method ctx fdata stat f.cf_meta in
+			let is_override = not stat && (
+				if kind = MK3Normal then List.memq f c.cl_overrides
+				else (loop c name || loop c f.cf_name)
+			) in
 			Some (HFMethod {
 				hlm_type = m;
-				hlm_final = stat || (Meta.has Meta.Final f.cf_meta);
-				hlm_override = not stat && (loop c name || loop c f.cf_name);
+				hlm_final = stat || (has_class_field_flag f CfFinal);
+				hlm_override = is_override;
 				hlm_kind = kind;
 			})
 		);
@@ -1990,7 +2100,7 @@ let generate_field_kind ctx f c stat =
 			) args;
 			let dparams = (match !dparams with None -> None | Some l -> Some (List.rev l)) in
 			Some (HFMethod {
-				hlm_type = end_fun ctx (List.map (fun (a,opt,t) -> alloc_var a t f.cf_pos, (if opt then Some TNull else None)) args) dparams tret;
+				hlm_type = end_fun ctx (List.map (fun (a,opt,t) -> alloc_var (VUser TVOArgument) a t f.cf_pos, (if opt then Some TNull else None)) args) dparams tret;
 				hlm_final = false;
 				hlm_override = false;
 				hlm_kind = snd (method_kind());
@@ -2030,6 +2140,267 @@ let check_constructor ctx c f =
 	with Exit ->
 		()
 
+let has_protected_meta = Meta.Custom ":has_protected"
+let mark_has_protected c = c.cl_meta <- (has_protected_meta,[],null_pos) :: c.cl_meta
+
+let find_first_nonextern_accessor_implementor cl name =
+	let rec loop cl cl_found =
+		match cl.cl_super with
+		| Some ({ cl_extern = true }, _) | None -> cl_found
+		| Some (cl_super, _) ->
+			let has_field = PMap.exists name cl_super.cl_fields in
+			let cl_found = if has_field then cl_super else cl_found in
+			loop cl_super cl_found
+	in
+	loop cl cl
+
+let maybe_gen_instance_accessor ctx cl tl accessor_cf acc alloc_slot kind f_impl f_iface =
+	match find_property_for_accessor ~isget:(kind = MK3Getter) cl tl accessor_cf.cf_name with
+	| Some (_, _, prop_cf) ->
+		let accessor_cl = find_first_nonextern_accessor_implementor cl accessor_cf.cf_name in
+		if accessor_cl == cl then begin
+			let was_override = ref false in
+			cl.cl_overrides <- List.filter (fun f2 ->
+				if f2 == accessor_cf then
+					(was_override := true; false)
+				else
+					true
+			) cl.cl_overrides;
+
+			let name, mtype =
+				if cl.cl_interface then begin
+					let (args,tret) = f_iface prop_cf in
+					let mtype = end_fun ctx args None tret in
+					HMName (reserved prop_cf.cf_name, HNNamespace (make_class_ns cl)), mtype
+				end else begin
+					let func = f_impl prop_cf in
+					let mtype = generate_method ctx func false accessor_cf.cf_meta in
+					ident prop_cf.cf_name, mtype
+				end
+			in
+
+			let getter = {
+				hlf_name = name;
+				hlf_slot = alloc_slot ();
+				hlf_kind = HFMethod {
+					hlm_type = mtype;
+					hlm_final = has_class_field_flag accessor_cf CfFinal;
+					hlm_override = !was_override;
+					hlm_kind = kind;
+				};
+				hlf_metas = None;
+			} in
+			getter :: acc
+		end else
+			acc
+	| None ->
+		acc
+
+let mk_instance_getter_func c tl accessor_cl accessor_tl accessor_cf prop_cf =
+	{
+		tf_args = [];
+		tf_type = prop_cf.cf_type;
+		tf_expr = begin
+			let ethis = mk (TConst TThis) (TInst (c, tl)) null_pos in
+			let efield = mk (TField (ethis, FInstance (accessor_cl, accessor_tl, accessor_cf))) accessor_cf.cf_type null_pos in
+			let ecall = mk (TCall (efield, [])) prop_cf.cf_type null_pos in
+			mk (TReturn (Some ecall)) t_dynamic null_pos;
+		end
+	}
+
+let maybe_gen_instance_getter ctx c f acc alloc_slot =
+	let tl = List.map snd c.cl_params in
+	maybe_gen_instance_accessor ctx c tl f acc alloc_slot MK3Getter
+		(mk_instance_getter_func c tl c tl f)
+		(fun prop_cf -> ([],prop_cf.cf_type))
+
+let mk_varg t = alloc_var (VUser TVOArgument) "value" t null_pos
+
+let mk_instance_setter_func com c tl accessor_cl accessor_tl accessor_cf prop_cf =
+	let varg = mk_varg prop_cf.cf_type in
+	{
+		tf_args = [(varg,None)];
+		tf_type = com.basic.tvoid;
+		tf_expr = begin
+			let ethis = mk (TConst TThis) (TInst (c, tl)) null_pos in
+			let efield = mk (TField (ethis, FInstance (accessor_cl, accessor_tl, accessor_cf))) accessor_cf.cf_type null_pos in
+			let earg = mk (TLocal varg) prop_cf.cf_type null_pos in
+			mk (TCall (efield, [earg])) prop_cf.cf_type null_pos
+		end
+	}
+
+let maybe_gen_instance_setter ctx c f acc alloc_slot =
+	let tl = List.map snd c.cl_params in
+	maybe_gen_instance_accessor ctx c tl f acc alloc_slot MK3Setter
+		(mk_instance_setter_func ctx.com c tl c tl f)
+		(fun prop_cf -> ([(mk_varg prop_cf.cf_type,None)],ctx.com.basic.tvoid))
+
+
+let maybe_gen_static_accessor ctx cl accessor_cf acc alloc_slot kind f_impl =
+	match find_static_property_for_accessor ~isget:(kind = MK3Getter) cl accessor_cf.cf_name with
+	| Some prop_cf ->
+		let func = f_impl prop_cf in
+		let getter = {
+			hlf_name = ident prop_cf.cf_name;
+			hlf_slot = alloc_slot ();
+			hlf_kind = HFMethod {
+				hlm_type = generate_method ctx func true accessor_cf.cf_meta;
+				hlm_final = true;
+				hlm_override = false;
+				hlm_kind = kind;
+			};
+			hlf_metas = None;
+		} in
+		getter :: acc
+	| None ->
+		acc
+
+let maybe_gen_static_getter ctx c f acc alloc_slot =
+	maybe_gen_static_accessor ctx c f acc alloc_slot MK3Getter (fun prop_cf -> {
+		tf_args = [];
+		tf_type = prop_cf.cf_type;
+		tf_expr = begin
+			let ethis = Texpr.Builder.make_static_this c null_pos in
+			let efield = mk (TField (ethis, FStatic (c, f))) f.cf_type null_pos in
+			let ecall = mk (TCall (efield, [])) prop_cf.cf_type null_pos in
+			mk (TReturn (Some ecall)) t_dynamic null_pos;
+		end
+	})
+
+let maybe_gen_static_setter ctx c f acc alloc_slot =
+	maybe_gen_static_accessor ctx c f acc alloc_slot MK3Setter (fun prop_cf ->
+		let varg = alloc_var (VUser TVOArgument) "value" prop_cf.cf_type null_pos in
+		{
+			tf_args = [(varg,None)];
+			tf_type = ctx.com.basic.tvoid;
+			tf_expr = begin
+				let ethis = Texpr.Builder.make_static_this c null_pos in
+				let efield = mk (TField (ethis, FStatic (c, f))) f.cf_type null_pos in
+				let earg = mk (TLocal varg) prop_cf.cf_type null_pos in
+				mk (TCall (efield, [earg])) prop_cf.cf_type null_pos
+			end
+		}
+	)
+
+let realize_required_accessors ctx cl =
+	let is_implemented_by_super ci =
+		Option.map_default (fun (csup,_) ->
+			(* heavily stripped-down version from Type.unify *)
+			let rec loop c  =
+				c == ci
+				||
+				Option.map_default (fun (cs,_) -> loop cs) false c.cl_super
+				||
+				List.exists (fun (cs,_) -> loop cs) c.cl_implements
+			in
+			loop csup
+		) false cl.cl_super
+	in
+	let interface_props =
+		begin
+		let h = Hashtbl.create 0 in
+		let rec collect cl =
+			let loop (ci,_) =
+				if not (is_implemented_by_super ci) then begin
+					List.iter (fun cf ->
+						match cf.cf_kind with
+						| Var { v_read = (AccCall | AccNever) as read; v_write = (AccCall | AccNever) as write } ->
+							begin try
+								let read', write', native = Hashtbl.find h cf.cf_name in
+								let read = if read = AccNever then read' else true in
+								let write = if write = AccNever then write' else true in
+								Hashtbl.replace h cf.cf_name (read, write, native)
+							with Not_found ->
+								Hashtbl.add h cf.cf_name (read = AccCall, write = AccCall, if is_flash_property cf then Some ci else None)
+							end
+						| _ -> ()
+					) ci.cl_ordered_fields;
+					collect ci;
+				end
+			in
+			List.iter loop cl.cl_implements;
+		in
+		collect cl;
+		h
+		end
+	in
+
+	let rec has_nonextern_field cl name =
+		if PMap.exists name cl.cl_fields then true
+		else match cl.cl_super with
+		| Some ({ cl_extern = false } as csup, _) -> has_nonextern_field csup name
+		| _ -> false
+	in
+
+	let tl = List.map snd cl.cl_params in
+	let fields = ref [] in
+	Hashtbl.iter (fun name (read, write, native) ->
+		match Type.class_field cl tl name with
+		| Some (actual_cl, actual_tl), _, cf ->
+			Option.may (fun iface ->
+				if not (is_flash_property cf) then
+					abort (Printf.sprintf "Interface %s requires property %s to be marked with @:flash.property" (s_type_path iface.cl_path) cf.cf_name) cf.cf_pos
+			) native;
+			if actual_cl.cl_extern then begin
+				let mk_field_access () =
+					let ethis = mk (TConst TThis) (TInst (cl,tl)) null_pos in
+					mk (TField (ethis, FInstance (actual_cl, actual_tl, cf))) cf.cf_type null_pos
+				in
+				if read then begin
+					let getter_name = "get_" ^ name in
+					if not (has_nonextern_field cl getter_name) then begin
+						let getter_func = {
+							tf_args = [];
+							tf_type = cf.cf_type;
+							tf_expr = mk (TReturn (Some (mk_field_access ()))) t_dynamic null_pos;
+						} in
+						let getter = {
+							hlf_name = ident getter_name;
+							hlf_slot = 0;
+							hlf_kind = HFMethod {
+								hlm_type = generate_method ctx getter_func false [];
+								hlm_final = false;
+								hlm_override = false;
+								hlm_kind = MK3Normal;
+							};
+							hlf_metas = None;
+						} in
+						fields := getter :: !fields;
+					end
+				end;
+				if write then begin
+					let setter_name = "set_" ^ name in
+					if not (has_nonextern_field cl setter_name) then begin
+						let varg = alloc_var (VUser TVOArgument) "value" cf.cf_type null_pos in
+						let setter_func = {
+							tf_args = [(varg,None)];
+							tf_type = cf.cf_type;
+							tf_expr = begin
+								let efield = mk_field_access () in
+								let earg = mk (TLocal varg) varg.v_type null_pos in
+								let eassign = mk (TBinop (OpAssign, efield, earg)) cf.cf_type null_pos in
+								mk (TReturn (Some eassign)) t_dynamic null_pos;
+							end;
+						} in
+						let setter = {
+							hlf_name = ident setter_name;
+							hlf_slot = 0;
+							hlf_kind = HFMethod {
+								hlm_type = generate_method ctx setter_func false [];
+								hlm_final = false;
+								hlm_override = false;
+								hlm_kind = MK3Normal;
+							};
+							hlf_metas = None;
+						} in
+						fields := setter :: !fields;
+					end
+				end;
+			end
+		| _ -> assert false
+	) interface_props;
+	!fields
+
 let generate_class ctx c =
 	let name = type_path ctx c.cl_path in
 	ctx.cur_class <- c;
@@ -2071,38 +2442,96 @@ let generate_class ctx c =
 				| Some (c,_) -> find_meta c
 		in
 		let protect() =
-			let p = (match c.cl_path with [], n -> n | p, n -> String.concat "." p ^ ":" ^ n) in
+			let p = make_class_ns c in
 			has_protected := Some p;
 			HMName (f.cf_name,HNProtected p)
 		in
 		let rec loop_meta = function
 			| [] ->
-				if not f.cf_public && ctx.swf_protected then
+				if not (has_class_field_flag f CfPublic) && ctx.swf_protected then
 					protect()
 				else
 					ident f.cf_name
 			| x :: l ->
 				match x with
 				| ((Meta.Getter | Meta.Setter),[EConst (Ident f),_],_) -> ident f
-				| (Meta.Ns,[EConst (String ns),_],_) -> HMName (f.cf_name,HNNamespace ns)
+				| (Meta.Ns,[EConst (String(ns,_)),_],_) -> HMName (f.cf_name,HNNamespace ns)
 				| (Meta.Protected,[],_) -> protect()
 				| _ -> loop_meta l
 		in
 		if c.cl_interface then
-			HMName (reserved f.cf_name, HNNamespace (match c.cl_path with [],n -> n | l,n -> String.concat "." l ^ ":" ^ n))
+			HMName (reserved f.cf_name, HNNamespace (make_class_ns c))
 		else
 			loop_meta (find_meta c)
 	in
-	let generate_prop f acc alloc_slot =
+	let generate_prop stat f acc alloc_slot =
 		match f.cf_kind with
-		| Method _ -> acc
-		| Var v ->
-			(* let p = f.cf_pos in *)
-			(* let ethis = mk (TConst TThis) (TInst (c,[])) p in *)
-			acc
+		| Method _ when is_getter_name f.cf_name ->
+			if not stat then
+				maybe_gen_instance_getter ctx c f acc alloc_slot
+			else
+				maybe_gen_static_getter ctx c f acc alloc_slot
+		| Method _ when is_setter_name f.cf_name ->
+			if not stat then
+				maybe_gen_instance_setter ctx c f acc alloc_slot
+			else
+				maybe_gen_static_setter ctx c f acc alloc_slot
+		| Var { v_read = (AccCall | AccNever) as read; v_write = (AccCall | AccNever) as write } when not c.cl_interface && not (Meta.has Meta.IsVar f.cf_meta) ->
+			(* if the accessor methods were defined in super classes, we still need to generate native getter/setter *)
+			let acc =
+				if read = AccCall then begin
+					try
+						begin
+						let tl = List.map snd c.cl_params in
+						match Type.class_field c tl ("get_" ^ f.cf_name) with
+						| Some (actual_cl, actual_tl), _, getter_cf when actual_cl != c ->
+							let func = mk_instance_getter_func c tl actual_cl actual_tl getter_cf f in
+							{
+								hlf_name = ident f.cf_name;
+								hlf_slot = alloc_slot ();
+								hlf_kind = HFMethod {
+									hlm_type = generate_method ctx func false [];
+									hlm_final = false;
+									hlm_override = false;
+									hlm_kind = MK3Getter;
+								};
+								hlf_metas = None;
+							} :: acc
+						| _ ->
+							acc
+						end
+					with Not_found ->
+						acc
+				end else acc
+			in
+			if write = AccCall then begin
+				try
+					begin
+					let tl = List.map snd c.cl_params in
+					match Type.class_field c tl ("set_" ^ f.cf_name) with
+					| Some (actual_cl, actual_tl), _, setter_cf when actual_cl != c ->
+						let func = mk_instance_setter_func ctx.com c tl actual_cl actual_tl setter_cf f in
+						{
+							hlf_name = ident f.cf_name;
+							hlf_slot = alloc_slot ();
+							hlf_kind = HFMethod {
+								hlm_type = generate_method ctx func false [];
+								hlm_final = false;
+								hlm_override = false;
+								hlm_kind = MK3Setter;
+							};
+							hlf_metas = None;
+						} :: acc
+					| _ ->
+						acc
+					end
+				with Not_found ->
+					acc
+			end else acc
+		| Method _ | Var _ -> acc
 	in
 	let fields = PMap.fold (fun f acc ->
-		let acc = generate_prop f acc (fun() -> 0) in
+		let acc = generate_prop false f acc (fun() -> 0) in
 		match generate_field_kind ctx f c false with
 		| None -> acc
 		| Some k ->
@@ -2114,21 +2543,12 @@ let generate_class ctx c =
 			} :: acc
 	) c.cl_fields [] in
 	let fields = if c.cl_path <> ctx.boot then fields else begin
+		let cf = {
+			(mk_field "init" ~public:(ctx.swc && ctx.swf_protected) (TFun ([],t_dynamic)) c.cl_pos null_pos) with
+			cf_kind = Method MethNormal;
+		} in
 		{
-			hlf_name = make_name {
-				cf_name = "init";
-				cf_public = ctx.swc && ctx.swf_protected;
-				cf_meta = [];
-				cf_doc = None;
-				cf_pos = c.cl_pos;
-				cf_name_pos = null_pos;
-				cf_type = TFun ([],t_dynamic);
-				cf_params = [];
-				cf_expr = None;
-				cf_expr_unoptimized = None;
-				cf_kind = Method MethNormal;
-				cf_overloads = [];
-			} false;
+			hlf_name = make_name cf false;
 			hlf_slot = 0;
 			hlf_kind = (HFMethod {
 				hlm_type = generate_inits ctx;
@@ -2139,10 +2559,11 @@ let generate_class ctx c =
 			hlf_metas = None;
 		} :: fields
 	end in
+	let fields = if not c.cl_interface then fields @ realize_required_accessors ctx c else fields in
 	let st_field_count = ref 0 in
 	let st_meth_count = ref 0 in
 	let statics = List.rev (List.fold_left (fun acc f ->
-		let acc = generate_prop f acc (fun() -> incr st_meth_count; !st_meth_count) in
+		let acc = generate_prop true f acc (fun() -> incr st_meth_count; !st_meth_count) in
 		match generate_field_kind ctx f c true with
 		| None -> acc
 		| Some k ->
@@ -2164,17 +2585,35 @@ let generate_class ctx c =
 		} :: statics
 	in
 	let rec is_dynamic c =
-		if c.cl_dynamic <> None || c.cl_array_access <> None then true
+		if c.cl_array_access <> None then true
 		else match c.cl_super with
 		| None -> false
 		| Some (c,_) -> is_dynamic c
 	in
+	if !has_protected <> None then
+		mark_has_protected c (* class has its own protected methods - add meta for the child classes *)
+	else Option.may (fun (csup,_) -> (* child has no own protected methods, check whether parent was marked with the meta *)
+		if Meta.has has_protected_meta csup.cl_meta then begin
+			has_protected := Some (make_class_ns c);
+			mark_has_protected c (* also mark this class with the meta for further child classes *)
+		end else if csup.cl_extern then begin
+			let rec loop csup =
+				if List.exists is_cf_protected csup.cl_ordered_fields then begin
+					has_protected := Some (make_class_ns c);
+					mark_has_protected c; (* also mark this class with the meta for further child classes *)
+					mark_has_protected csup; (* ALSO mark the extern class for faster future checks *)
+				end else
+					Option.may (fun (csup,_) -> loop csup) csup.cl_super;
+			in
+			loop csup
+		end
+	) c.cl_super;
 	{
 		hlc_index = 0;
 		hlc_name = name;
 		hlc_super = (if c.cl_interface then None else Some (type_path ctx (match c.cl_super with None -> [],"Object" | Some (c,_) -> c.cl_path)));
 		hlc_sealed = not (is_dynamic c);
-		hlc_final = Meta.has Meta.Final c.cl_meta;
+		hlc_final = c.cl_final;
 		hlc_interface = c.cl_interface;
 		hlc_namespace = (match !has_protected with None -> None | Some p -> Some (HNProtected p));
 		hlc_implements = Array.of_list (List.map (fun (c,_) ->
@@ -2191,7 +2630,7 @@ let generate_class ctx c =
 let generate_enum ctx e meta =
 	let name_id = type_path ctx e.e_path in
 	let api = ctx.com.basic in
-	let f = begin_fun ctx [alloc_var "tag" api.tstring e.e_pos, None;alloc_var "index" api.tint e.e_pos, None;alloc_var "params" (api.tarray (mk_mono())) e.e_pos, None] api.tvoid [ethis] false e.e_pos in
+	let f = begin_fun ctx [alloc_var VGenerated "tag" api.tstring e.e_pos, None;alloc_var VGenerated "index" api.tint e.e_pos, None;alloc_var VGenerated "params" (api.tarray (mk_mono())) e.e_pos, None] api.tvoid [ethis] false e.e_pos in
 	let tag_id = ident "tag" in
 	let index_id = ident "index" in
 	let params_id = ident "params" in
@@ -2222,7 +2661,7 @@ let generate_enum ctx e meta =
 			hlf_slot = !st_count;
 			hlf_kind = (match f.ef_type with
 				| TFun (args,_) ->
-					let fdata = begin_fun ctx (List.map (fun (a,opt,t) -> alloc_var a t e.e_pos, (if opt then Some TNull else None)) args) (TEnum (e,[])) [] true f.ef_pos in
+					let fdata = begin_fun ctx (List.map (fun (a,opt,t) -> alloc_var VGenerated a t e.e_pos, (if opt then Some (mk (TConst TNull) t_dynamic null_pos) else None)) args) (TEnum (e,[])) [] true f.ef_pos in
 					write ctx (HFindPropStrict name_id);
 					write ctx (HString f.ef_name);
 					write ctx (HInt f.ef_index);
@@ -2319,7 +2758,7 @@ let rec generate_type ctx t =
 		if e.e_extern then
 			None
 		else
-			let meta = Codegen.build_metadata ctx.com t in
+			let meta = Texpr.build_metadata ctx.com.basic t in
 			let hlc = generate_enum ctx e meta in
 			let init = begin_fun ctx [] ctx.com.basic.tvoid [ethis] false e.e_pos in
 			generate_enum_init ctx e hlc meta;
diff --git a/src/generators/hl2c.ml b/src/generators/hl2c.ml
index 00b541b4cb7745895e6a5d8925aacfe739696481..128b144467256ec2e91f8b8e3a6e0c27bc5f8276 100644
--- a/src/generators/hl2c.ml
+++ b/src/generators/hl2c.ml
@@ -1,5 +1,5 @@
 (*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,12 +37,23 @@ type output_options =
 	| OODecreaseIndent
 	| OOBeginBlock
 	| OOEndBlock
+	| OOBreak
 
-type function_entry = {
+type code_module = {
+	m_name : string;
+	mutable m_functions : function_entry list;
+	mutable m_types : ttype list;
+}
+
+and function_entry = {
+	fe_index : int;
 	mutable fe_name : string;
 	mutable fe_decl : fundecl option;
 	mutable fe_args : ttype list;
 	mutable fe_ret : ttype;
+	mutable fe_module : code_module option;
+	mutable fe_called_by : function_entry list;
+	mutable fe_calling : function_entry list;
 }
 
 type context = {
@@ -50,12 +61,23 @@ type context = {
 	out : Buffer.t;
 	mutable tabs : string;
 	hash_cache : (int, int32) Hashtbl.t;
+	hash_mem : (int32, bool) Hashtbl.t;
+	mutable hash_cache_list : int list;
 	hlcode : code;
 	dir : string;
 	mutable curfile : string;
 	mutable cfiles : string list;
 	ftable : function_entry array;
-	htypes : (ttype, int) PMap.t;
+	htypes : (ttype, string) PMap.t;
+	gnames : string array;
+	bytes_names : string array;
+	mutable defines : string list;
+	defined_funs : (int, unit) Hashtbl.t;
+	hdefines : (string, unit) Hashtbl.t;
+	mutable defined_types : (ttype, unit) PMap.t;
+	mutable file_prefix : string;
+	mutable fun_index : int;
+	mutable type_module : (ttype, code_module) PMap.t;
 }
 
 let sprintf = Printf.sprintf
@@ -70,6 +92,8 @@ let keywords =
 	"thread2";"__declspec";"__finally";"__int64";"__try";"dllexport2";"__inline";"__leave";"asm";
 	(* reserved by HLC *)
 	"t";
+	(* GCC *)
+	"typeof";
 	(* C11 *)
 	"_Alignas";"_Alignof";"_Atomic";"_Bool";"_Complex";"_Generic";"_Imaginary";"_Noreturn";"_Static_assert";"_Thread_local";"_Pragma";
 	"inline";"restrict"
@@ -91,18 +115,18 @@ let s_comp = function
 let core_types =
 	let vp = { vfields = [||]; vindex = PMap.empty } in
 	let ep = { ename = ""; eid = 0; eglobal = None; efields = [||] } in
-	[HVoid;HUI8;HUI16;HI32;HF32;HF64;HBool;HBytes;HDyn;HFun ([],HVoid);HObj null_proto;HArray;HType;HRef HVoid;HVirtual vp;HDynObj;HAbstract ("",0);HEnum ep;HNull HVoid]
+	[HVoid;HUI8;HUI16;HI32;HI64;HF32;HF64;HBool;HBytes;HDyn;HFun ([],HVoid);HObj null_proto;HArray;HType;HRef HVoid;HVirtual vp;HDynObj;HAbstract ("",0);HEnum ep;HNull HVoid;HMethod ([],HVoid);HStruct null_proto]
 
 let tname str =
 	let n = String.concat "__" (ExtString.String.nsplit str ".") in
 	if Hashtbl.mem keywords ("_" ^ n) then "__" ^ n else n
 
 let is_gc_ptr = function
-	| HVoid | HUI8 | HUI16 | HI32 | HF32 | HF64 | HBool | HType | HRef _ -> false
-	| HBytes | HDyn | HFun _ | HObj _ | HArray | HVirtual _ | HDynObj | HAbstract _ | HEnum _ | HNull _ -> true
+	| HVoid | HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64 | HBool | HType | HRef _ | HMethod _ -> false
+	| HBytes | HDyn | HFun _ | HObj _ | HArray | HVirtual _ | HDynObj | HAbstract _ | HEnum _ | HNull _ | HStruct _ -> true
 
 let is_ptr = function
-	| HVoid | HUI8 | HUI16 | HI32 | HF32 | HF64 | HBool -> false
+	| HVoid | HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64 | HBool -> false
 	| _ -> true
 
 let rec ctype_no_ptr = function
@@ -110,13 +134,14 @@ let rec ctype_no_ptr = function
 	| HUI8 -> "unsigned char",0
 	| HUI16 -> "unsigned short",0
 	| HI32 -> "int",0
+	| HI64 -> "int64",0
 	| HF32 -> "float",0
 	| HF64 -> "double",0
 	| HBool -> "bool",0
 	| HBytes -> "vbyte",1
 	| HDyn -> "vdynamic",1
 	| HFun _ -> "vclosure",1
-	| HObj p -> tname p.pname,0
+	| HObj p | HStruct p -> tname p.pname,0
 	| HArray -> "varray",1
 	| HType -> "hl_type",1
 	| HRef t -> let s,i = ctype_no_ptr t in s,i + 1
@@ -125,19 +150,24 @@ let rec ctype_no_ptr = function
 	| HAbstract (name,_) -> name,1
 	| HEnum _ -> "venum",1
 	| HNull _ -> "vdynamic",1
+	| HMethod _ -> "void",1
 
 let ctype t =
 	let t, nptr = ctype_no_ptr t in
 	if nptr = 0 then t else t ^ String.make nptr '*'
 
+let args_repr args =
+	if args = [] then "void" else String.concat "," (List.map ctype args)
+
 let cast_fun s args t =
-	sprintf "((%s (*)(%s))%s)" (ctype t) (String.concat "," (List.map ctype args)) s
+	sprintf "((%s (*)(%s))%s)" (ctype t) (args_repr args) s
 
 let dyn_value_field t =
 	"->v." ^ match t with
 	| HUI8 -> "ui8"
 	| HUI16 -> "ui16"
 	| HI32 -> "i"
+	| HI64 -> "i64"
 	| HF32 -> "f"
 	| HF64 -> "d"
 	| HBool -> "b"
@@ -149,6 +179,7 @@ let type_id t =
 	| HUI8 -> "HUI8"
 	| HUI16 -> "HUI16"
 	| HI32 -> "HI32"
+	| HI64 -> "HI64"
 	| HF32 -> "HF32"
 	| HF64 -> "HF64"
 	| HBool -> "HBOOL"
@@ -164,6 +195,8 @@ let type_id t =
 	| HAbstract _ -> "HABSTRACT"
 	| HEnum _ -> "HENUM"
 	| HNull _ -> "HNULL"
+	| HMethod _ -> "HMETHOD"
+	| HStruct _  -> "HSTRUCT"
 
 let var_type n t =
 	ctype t ^ " " ^ ident n
@@ -178,22 +211,55 @@ let hash ctx sid =
 	try
 		Hashtbl.find ctx.hash_cache sid
 	with Not_found ->
-		let h = hl_hash ctx.hlcode.strings.(sid) in
+		let rec loop h =
+			if Hashtbl.mem ctx.hash_mem h then loop (Int32.add h Int32.one) else h
+		in
+		let h = loop (hl_hash ctx.hlcode.strings.(sid)) in
 		Hashtbl.add ctx.hash_cache sid h;
+		Hashtbl.add ctx.hash_mem h true;
+		ctx.hash_cache_list <- sid :: ctx.hash_cache_list;
 		h
 
+let type_name ctx t =
+	try PMap.find t ctx.htypes with Not_found -> assert false
+
+let define ctx s =
+	if not (Hashtbl.mem ctx.hdefines s) then begin
+		ctx.defines <- s :: ctx.defines;
+		Hashtbl.add ctx.hdefines s ();
+	end
+
+let rec define_type ctx t =
+	match t with
+	| HVoid | HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64 | HBool | HBytes | HDyn | HArray | HType | HDynObj | HNull _ | HRef _ -> ()
+	| HAbstract _ ->
+		define ctx "#include <hl/natives.h>";
+	| HFun (args,ret) | HMethod (args,ret) ->
+		List.iter (define_type ctx) args;
+		define_type ctx ret
+	| HEnum _ | HObj _ | HStruct _ when not (PMap.exists t ctx.defined_types) ->
+		ctx.defined_types <- PMap.add t () ctx.defined_types;
+		define ctx (sprintf "#include <%s.h>" (try PMap.find t ctx.type_module with Not_found -> assert false).m_name)
+	| HVirtual vp when not (PMap.exists t ctx.defined_types) ->
+		ctx.defined_types <- PMap.add t () ctx.defined_types;
+		Array.iter (fun (_,_,t) -> define_type ctx t) vp.vfields
+	| HEnum _ | HObj _ | HStruct _ | HVirtual _ ->
+		()
+
 let type_value ctx t =
-	let index = (try PMap.find t ctx.htypes with Not_found -> assert false) in
-	"&type$" ^ string_of_int index
+	let n = type_name ctx t in
+	define ctx (sprintf "extern hl_type %s;" n);
+	"&" ^ n
 
 let enum_constr_type ctx e i =
+	define_type ctx (HEnum e);
 	let cname,_, tl = e.efields.(i) in
 	if Array.length tl = 0 then
 		"venum"
 	else
 	let name = if e.eid = 0 then
-		let index = (try PMap.find (HEnum e) ctx.htypes with Not_found -> assert false) in
-		"Enum$" ^ string_of_int index
+		let name = (try PMap.find (HEnum e) ctx.htypes with Not_found -> assert false) in
+		"Enum" ^ name
 	else
 		String.concat "_" (ExtString.String.nsplit e.ename ".")
 	in
@@ -218,41 +284,76 @@ let expr ctx str =
 	output ctx str;
 	output ctx ";\n"
 
-let unamed_field fid = "$_f" ^ string_of_int fid
+let unamed_field fid = "f$" ^ string_of_int fid
 
 let obj_field fid name =
 	if name = "" then unamed_field fid else ident name
 
 let close_file ctx =
 	let str = Buffer.contents ctx.out in
+	let defines = List.rev ctx.defines in
+	let str = (match defines with [] -> str | l -> String.concat "\n" l ^ "\n\n" ^ str) in
+	ctx.defines <- [];
+	ctx.defined_types <- PMap.empty;
+	Hashtbl.clear ctx.hdefines;
+	Hashtbl.clear ctx.defined_funs;
 	Buffer.reset ctx.out;
 	let fpath = ctx.dir ^ "/" ^ ctx.curfile in
 	if String.sub ctx.curfile (String.length ctx.curfile - 2) 2 = ".c" then ctx.cfiles <- ctx.curfile :: ctx.cfiles;
 	ctx.curfile <- "";
 	let fcontent = (try Std.input_file ~bin:true fpath with _ -> "") in
 	if fcontent <> str then begin
-		Common.mkdir_recursive "" (ExtString.String.nsplit (Filename.dirname fpath) "/");
+		Path.mkdir_recursive "" (ExtString.String.nsplit (Filename.dirname fpath) "/");
 		let ch = open_out_bin fpath in
 		output_string ch str;
 		close_out ch;
 	end
 
+let bom = "\xEF\xBB\xBF"
+
+let define_global ctx g =
+	let t = ctx.hlcode.globals.(g) in
+	define_type ctx t;
+	define ctx (sprintf "extern %s;" (var_type ctx.gnames.(g) t))
+
+let define_function ctx fid =
+	let ft = ctx.ftable.(fid) in
+	let fid = if ft.fe_decl = None then -1 else fid in
+	if not (Hashtbl.mem ctx.defined_funs fid) then begin
+		Hashtbl.add ctx.defined_funs fid ();
+		(match ft.fe_decl with
+		| None ->
+			define ctx "#include <hl/natives.h>"
+		| Some f ->
+			define_type ctx f.ftype;
+			ctx.defines <- sprintf "%s %s(%s);" (ctype ft.fe_ret) ft.fe_name (args_repr ft.fe_args) :: ctx.defines);
+	end;
+	ft.fe_name
+
+let short_digest str =
+	String.sub (Digest.to_hex (Digest.string str)) 0 7
+
 let open_file ctx file =
 	if ctx.curfile <> "" then close_file ctx;
 	let version_major = ctx.version / 1000 in
 	let version_minor = (ctx.version mod 1000) / 100 in
 	let version_revision = (ctx.version mod 100) in
-	if file <> "hlc.json" then line ctx (sprintf "// Generated by HLC %d.%d.%d (HL v%d)" version_major version_minor version_revision ctx.hlcode.version);
-	ctx.curfile <- file
+	if file <> "hlc.json" then define ctx (sprintf "%s// Generated by HLC %d.%d.%d (HL v%d)" bom version_major version_minor version_revision ctx.hlcode.version);
+	ctx.curfile <- file;
+	ctx.fun_index <- 0;
+	ctx.file_prefix <- (short_digest file) ^ "_"
 
 let string_data_limit = 64
 
 let string ctx sid =
 	let s = ctx.hlcode.strings.(sid) in
 	if String.length s < string_data_limit then
-		sprintf "USTR(\"%s\")" (Ast.s_escape ~hex:false s)
-	else
-		sprintf "string$%d" sid
+		sprintf "USTR(\"%s\")" (StringHelper.s_escape s)
+	else begin
+		let id = short_digest s in
+		define ctx (sprintf "extern vbyte string$%s[];" id);
+		sprintf "string$%s" id
+	end
 
 let generate_reflection ctx =
 	let line = line ctx and expr = expr ctx in
@@ -261,9 +362,9 @@ let generate_reflection ctx =
 	let funByArgs = Hashtbl.create 0 in
 	let type_kind t =
 		match t with
-		| HVoid | HF32 | HF64 -> t
+		| HVoid | HF32 | HF64 | HI64 -> t
 		| HBool | HUI8 | HUI16 | HI32 -> HI32
-		| HBytes | HDyn | HFun _ | HObj _ | HArray | HType | HRef _ | HVirtual _ | HDynObj | HAbstract _ | HEnum _ | HNull _ -> HDyn
+		| _ -> HDyn
 	in
 	let type_kind_id t =
 		match t with
@@ -271,7 +372,8 @@ let generate_reflection ctx =
 		| HBool | HUI8 | HUI16 | HI32 -> 1 (* same int representation *)
 		| HF32 -> 2
 		| HF64 -> 3
-		| _ -> 4
+		| HI64 -> 4
+		| _ -> 5
 	in
 	let add_fun args t =
 		let nargs = List.length args in
@@ -348,6 +450,7 @@ let generate_reflection ctx =
 		| HUI8 | HUI16 | HBool | HI32 -> "i"
 		| HF32 -> "f"
 		| HF64 -> "d"
+		| HI64 -> "i64"
 		| _ -> "p"
 	in
 	let make_wrap_name args t =
@@ -410,18 +513,24 @@ let generate_reflection ctx =
 let generate_function ctx f =
 	let line = line ctx and expr = expr ctx in
 	let sline fmt = Printf.ksprintf line fmt and sexpr fmt = Printf.ksprintf expr fmt in
+	let define fmt = Printf.ksprintf (define ctx) fmt in
 	let block() = block ctx and unblock() = unblock ctx in
 	let type_value = type_value ctx in
 	let code = ctx.hlcode in
 
 	let rid = ref (-1) in
+	let cl_id = ref 0 in
 	let reg id = "r" ^ string_of_int id in
 
-	let label id = "label$" ^ string_of_int f.findex ^ "$" ^ string_of_int id in
+	let label p = sprintf "label$%s%d_%d" ctx.file_prefix ctx.fun_index p in
+	ctx.fun_index <- ctx.fun_index + 1;
+	Hashtbl.add ctx.defined_funs f.findex ();
+	Array.iter (define_type ctx) f.regs;
+	define_type ctx f.ftype;
 
 	let rtype r = f.regs.(r) in
 
-	let funname fid = ctx.ftable.(fid).fe_name in
+	let funname fid = define_function ctx fid in
 
 	let rcast r t =
 		if tsame (rtype r) t then (reg r)
@@ -444,7 +553,7 @@ let generate_function ctx f =
 	let ocall r fid args =
 		let ft = ctx.ftable.(fid) in
 		let rstr = rassign r ft.fe_ret in
-		sexpr "%s%s(%s)" rstr ft.fe_name (String.concat "," (List.map2 rcast args ft.fe_args))
+		sexpr "%s%s(%s)" rstr (funname fid) (String.concat "," (List.map2 rcast args ft.fe_args))
 	in
 
 
@@ -452,6 +561,7 @@ let generate_function ctx f =
 		| HUI8 | HUI16 | HI32 | HBool -> "i"
 		| HF32 -> "f"
 		| HF64 -> "d"
+		| HI64 -> "i64"
 		| _ -> "p"
 	in
 
@@ -484,7 +594,7 @@ let generate_function ctx f =
 		| [] -> assert false
 		| o :: args ->
 			match rtype o with
-			| HObj _ ->
+			| HObj _ | HStruct _ ->
 				let vfun = cast_fun (sprintf "%s->$type->vobj_proto[%d]" (reg o) fid) (rtype o :: List.map rtype args) (rtype r) in
 				sexpr "%s%s(%s)" (rassign r (rtype r)) vfun (String.concat "," (List.map reg (o::args)))
 			| HVirtual vp ->
@@ -513,30 +623,26 @@ let generate_function ctx f =
 
 	let set_field obj fid v =
 		match rtype obj with
-		| HObj o ->
+		| HObj o | HStruct o ->
 			let name, t = resolve_field o fid in
 			sexpr "%s->%s = %s" (reg obj) (obj_field fid name) (rcast v t)
 		| HVirtual vp ->
 			let name, nid, t = vp.vfields.(fid) in
 			let dset = sprintf "hl_dyn_set%s(%s->value,%ld/*%s*/%s,%s)" (dyn_prefix t) (reg obj) (hash ctx nid) name (type_value_opt (rtype v)) (reg v) in
-			(match t with
-			| HFun _ -> expr dset
-			| _ -> sexpr "if( hl_vfields(%s)[%d] ) *(%s*)(hl_vfields(%s)[%d]) = (%s)%s; else %s" (reg obj) fid (ctype t) (reg obj) fid (ctype t) (reg v) dset)
+			sexpr "if( hl_vfields(%s)[%d] ) *(%s*)(hl_vfields(%s)[%d]) = (%s)%s; else %s" (reg obj) fid (ctype t) (reg obj) fid (ctype t) (reg v) dset
 		| _ ->
 			assert false
 	in
 
 	let get_field r obj fid =
 		match rtype obj with
-		| HObj o ->
+		| HObj o | HStruct o ->
 			let name, t = resolve_field o fid in
 			sexpr "%s%s->%s" (rassign r t) (reg obj) (obj_field fid name)
 		| HVirtual v ->
 			let name, nid, t = v.vfields.(fid) in
 			let dget = sprintf "(%s)hl_dyn_get%s(%s->value,%ld/*%s*/%s)" (ctype t) (dyn_prefix t) (reg obj) (hash ctx nid) name (type_value_opt t) in
-			(match t with
-			| HFun _ -> sexpr "%s%s" (rassign r t) dget
-			| _ -> sexpr "%shl_vfields(%s)[%d] ? (*(%s*)(hl_vfields(%s)[%d])) : %s" (rassign r t) (reg obj) fid (ctype t) (reg obj) fid dget)
+			sexpr "%shl_vfields(%s)[%d] ? (*(%s*)(hl_vfields(%s)[%d])) : %s" (rassign r t) (reg obj) fid (ctype t) (reg obj) fid dget
 		| _ ->
 			assert false
 	in
@@ -575,12 +681,17 @@ let generate_function ctx f =
 			if !trap_depth > !max_trap_depth then max_trap_depth := !trap_depth
 		| OEndTrap true ->
 			decr trap_depth
+		| OStaticClosure (_, fid) ->
+			let ft = ctx.ftable.(fid) in
+			sexpr "static vclosure cl$%d = { %s, %s, 0 }" (!cl_id) (type_value (HFun (ft.fe_args,ft.fe_ret))) (funname fid);
+			incr cl_id;
 		| _ ->
 			()
 	) f.code;
 	for i = 0 to !max_trap_depth - 1 do
 		sexpr "hl_trap_ctx trap$%d" i;
 	done;
+	cl_id := 0;
 
 	let flush_options i =
 		match output_options.(i) with
@@ -593,6 +704,7 @@ let generate_function ctx f =
 				| OOLabel -> sline "%s:" (label i)
 				| OOCase i -> sline "case %i:" i
 				| OODefault -> line "default:"
+				| OOBreak -> line "break;";
 				| OOIncreaseIndent -> block()
 				| OODecreaseIndent -> unblock()
 				| OOBeginBlock ->  line "{"
@@ -634,20 +746,22 @@ let generate_function ctx f =
 					sexpr "if( %s != %s && (!%s || !%s || %s) ) goto %s" (reg a) (reg b) (reg a) (reg b) pcompare (label d)
 				else
 					sexpr "if( %s && %s && %s ) goto %s" (reg a) (reg b) pcompare (label d)
-			| HDyn , _ | _, HDyn ->
+			| (HDyn | HFun _), _ | _, (HDyn | HFun _) ->
 				let inv = if op = CGt || op = CGte then "&& i != hl_invalid_comparison " else "" in
 				sexpr "{ int i = hl_dyn_compare((vdynamic*)%s,(vdynamic*)%s); if( i %s 0 %s) goto %s; }" (reg a) (reg b) (s_comp op) inv (label d)
 			| HObj oa, HObj _ ->
 				(try
 					let fid = PMap.find "__compare" oa.pfunctions in
 					if op = CEq then
-						sexpr "if( %s == %s || (%s && %s && %s(%s,%s) == 0) ) goto %s" (reg a) (reg b) (reg a) (reg b) (funname fid) (reg a) (reg b) (label d)
+						sexpr "if( %s == %s || (%s && %s && %s(%s,(vdynamic*)%s) == 0) ) goto %s" (reg a) (reg b) (reg a) (reg b) (funname fid) (reg a) (reg b) (label d)
 					else if op = CNeq then
-						sexpr "if( %s != %s && (!%s || !%s || %s(%s,%s) != 0) ) goto %s" (reg a) (reg b) (reg a) (reg b) (funname fid) (reg a) (reg b) (label d)
+						sexpr "if( %s != %s && (!%s || !%s || %s(%s,(vdynamic*)%s) != 0) ) goto %s" (reg a) (reg b) (reg a) (reg b) (funname fid) (reg a) (reg b) (label d)
 					else
-						sexpr "if( %s && %s && %s(%s,%s) %s 0 ) goto %s" (reg a) (reg b) (funname fid) (reg a) (reg b) (s_comp op) (label d)
+						sexpr "if( %s && %s && %s(%s,(vdynamic*)%s) %s 0 ) goto %s" (reg a) (reg b) (funname fid) (reg a) (reg b) (s_comp op) (label d)
 				with Not_found ->
 					phys_compare())
+			| HStruct _, HStruct _ ->
+				phys_compare()
 			| HVirtual _, HVirtual _ ->
 				if op = CEq then
 					sexpr "if( %s == %s || (%s && %s && %s->value && %s->value && %s->value == %s->value) ) goto %s" (reg a) (reg b) (reg a) (reg b) (reg a) (reg b) (reg a) (reg b) (label d)
@@ -655,7 +769,7 @@ let generate_function ctx f =
 					sexpr "if( %s != %s && (!%s || !%s || !%s->value || !%s->value || %s->value != %s->value) ) goto %s" (reg a) (reg b) (reg a) (reg b) (reg a) (reg b) (reg a) (reg b) (label d)
 				else
 					assert false
-			| HEnum _, HEnum _ | HDynObj, HDynObj ->
+			| HEnum _, HEnum _ | HDynObj, HDynObj | HAbstract _, HAbstract _ ->
 				phys_compare()
 			| HVirtual _, HObj _->
 				if op = CEq then
@@ -666,8 +780,6 @@ let generate_function ctx f =
 					assert false
 			| HObj _, HVirtual _ ->
 				compare_op op b a d
-			| HFun _, HFun _ ->
-				phys_compare()
 			| ta, tb ->
 				failwith ("Don't know how to compare " ^ tstr ta ^ " and " ^ tstr tb ^ " (hlc)")
 		in
@@ -680,11 +792,13 @@ let generate_function ctx f =
 			else
 				sexpr "%s = %ld" (reg r) code.ints.(idx)
 		| OFloat (r,idx) ->
-			sexpr "%s = %.19g" (reg r) code.floats.(idx)
+			let fstr = sprintf "%.19g" code.floats.(idx) in
+			sexpr "%s = %s" (reg r) (if String.contains fstr '.' || String.contains fstr 'e' then fstr else fstr ^ ".")
 		| OBool (r,b) ->
 			sexpr "%s = %s" (reg r) (if b then "true" else "false")
 		| OBytes (r,idx) ->
-			sexpr "%s = bytes$%d" (reg r) idx
+			define "extern vbyte %s[];" ctx.bytes_names.(idx);
+			sexpr "%s = %s" (reg r) ctx.bytes_names.(idx)
 		| OString (r,idx) ->
 			sexpr "%s = (vbyte*)%s" (reg r) (string ctx idx)
 		| ONull r ->
@@ -761,7 +875,8 @@ let generate_function ctx f =
 			| _ ->
 				assert false)
 		| OStaticClosure (r,fid) ->
-			sexpr "%s = &cl$%d" (reg r) fid
+			sexpr "%s = &cl$%d" (reg r) (!cl_id);
+			incr cl_id
 		| OInstanceClosure (r,fid,ptr) ->
 			let ft = ctx.ftable.(fid) in
 			sexpr "%s = hl_alloc_closure_ptr(%s,%s,%s)" (reg r) (type_value (HFun (ft.fe_args,ft.fe_ret))) (funname fid) (reg ptr)
@@ -774,9 +889,11 @@ let generate_function ctx f =
 			| _ ->
 				todo())
 		| OGetGlobal (r,g) ->
-			sexpr "%s = (%s)global$%d" (reg r) (ctype (rtype r)) g
+			define_global ctx g;
+			sexpr "%s = (%s)%s" (reg r) (ctype (rtype r)) ctx.gnames.(g)
 		| OSetGlobal (g,r) ->
-			sexpr "global$%d = (%s)%s" g (ctype code.globals.(g)) (reg r)
+			define_global ctx g;
+			sexpr "%s = (%s)%s" ctx.gnames.(g) (ctype code.globals.(g)) (reg r)
 		| ORet r ->
 			if rtype r = HVoid then expr "return" else sexpr "return %s" (rcast r fret)
 		| OJTrue (r,d) | OJNotNull (r,d) ->
@@ -795,6 +912,10 @@ let generate_function ctx f =
 			sexpr "if( ((unsigned)%s) < ((unsigned)%s) ) goto %s" (reg a) (reg b) (label d)
 		| OJUGte (a,b,d) ->
 			sexpr "if( ((unsigned)%s) >= ((unsigned)%s) ) goto %s" (reg a) (reg b) (label d)
+		| OJNotLt (a,b,d) ->
+			sexpr "if( !(%s < %s) ) goto %s" (reg a) (reg b) (label d)
+		| OJNotGte (a,b,d) ->
+			sexpr "if( !(%s >= %s) ) goto %s" (reg a) (reg b) (label d)
 		| OJEq (a,b,d) ->
 			compare_op CEq a b d
 		| OJNotEq (a,b,d) ->
@@ -803,6 +924,8 @@ let generate_function ctx f =
 			sexpr "goto %s" (label d)
 		| OLabel _ ->
 			if not (has_label i) then sline "%s:" (label (-1))
+		| OToDyn (r,v) when rtype v = HBool ->
+			sexpr "%s = hl_alloc_dynbool(%s)" (reg r) (reg v)
 		| OToDyn (r,v) ->
 			if is_ptr (rtype v) then begin
 				sline "if( %s == NULL ) %s = NULL; else {" (reg v) (reg r);
@@ -812,6 +935,8 @@ let generate_function ctx f =
 			(match rtype v with
 			| HUI8 | HUI16 | HI32 | HBool ->
 				sexpr "%s->v.i = %s" (reg r) (reg v)
+			| HI64 ->
+				sexpr "%s->v.i64 = %s" (reg r) (reg v)
 			| HF32 ->
 				sexpr "%s->v.f = %s" (reg r) (reg v)
 			| HF64 ->
@@ -830,7 +955,7 @@ let generate_function ctx f =
 			sexpr "%s = (int)%s" (reg r) (reg v)
 		| ONew r ->
 			(match rtype r with
-			| HObj o -> sexpr "%s = (%s)hl_alloc_obj(%s)" (reg r) (tname o.pname) (tname o.pname ^ "__val")
+			| HObj o | HStruct o -> sexpr "%s = (%s)hl_alloc_obj(%s)" (reg r) (tname o.pname) (type_value (rtype r))
 			| HDynObj -> sexpr "%s = hl_alloc_dynobj()" (reg r)
 			| HVirtual _ as t -> sexpr "%s = hl_alloc_virtual(%s)" (reg r) (type_value t)
 			| _ -> assert false)
@@ -850,24 +975,16 @@ let generate_function ctx f =
 			sexpr "%s = *(unsigned char*)(%s + %s)" (reg r) (reg b) (reg idx)
 		| OGetUI16 (r,b,idx) ->
 			sexpr "%s = *(unsigned short*)(%s + %s)" (reg r) (reg b) (reg idx)
-		| OGetI32 (r,b,idx) ->
-			sexpr "%s = *(int*)(%s + %s)" (reg r) (reg b) (reg idx)
-		| OGetF32 (r,b,idx) ->
-			sexpr "%s = *(float*)(%s + %s)" (reg r) (reg b) (reg idx)
-		| OGetF64 (r,b,idx) ->
-			sexpr "%s = *(double*)(%s + %s)" (reg r) (reg b) (reg idx)
+		| OGetMem (r,b,idx) ->
+			sexpr "%s = *(%s*)(%s + %s)" (reg r) (ctype (rtype r)) (reg b) (reg idx)
 		| OGetArray (r, arr, idx) ->
 			sexpr "%s = ((%s*)(%s + 1))[%s]" (reg r) (ctype (rtype r)) (reg arr) (reg idx)
 		| OSetUI8 (b,idx,r) ->
 			sexpr "*(unsigned char*)(%s + %s) = (unsigned char)%s" (reg b) (reg idx) (reg r)
 		| OSetUI16 (b,idx,r) ->
 			sexpr "*(unsigned short*)(%s + %s) = (unsigned short)%s" (reg b) (reg idx) (reg r)
-		| OSetI32 (b,idx,r) ->
-			sexpr "*(int*)(%s + %s) = %s" (reg b) (reg idx) (reg r)
-		| OSetF32 (b,idx,r) ->
-			sexpr "*(float*)(%s + %s) = (float)%s" (reg b) (reg idx) (reg r)
-		| OSetF64 (b,idx,r) ->
-			sexpr "*(double*)(%s + %s) = %s" (reg b) (reg idx) (reg r)
+		| OSetMem (b,idx,r) ->
+			sexpr "*(%s*)(%s + %s) = %s" (ctype (rtype r)) (reg b) (reg idx) (reg r)
 		| OSetArray (arr,idx,v) ->
 			sexpr "((%s*)(%s + 1))[%s] = %s" (ctype (rtype v)) (reg arr) (reg idx) (reg v)
 		| OSafeCast (r,v) ->
@@ -904,33 +1021,21 @@ let generate_function ctx f =
 			sexpr "hl_dyn_set%s((vdynamic*)%s,%ld/*%s*/%s,%s)" (dyn_prefix (rtype v)) (reg o) h code.strings.(sid) (type_value_opt (rtype v)) (reg v)
 		| OMakeEnum (r,cid,rl) ->
 			let e, et = (match rtype r with HEnum e -> e, enum_constr_type ctx e cid | _ -> assert false) in
-			let has_ptr = List.exists (fun r -> is_gc_ptr (rtype r)) rl in
 			let need_tmp = List.mem r rl in
 			let tmp = if not need_tmp then reg r else begin
 				sexpr "{ venum *tmp";
 				"tmp"
 			end in
-			sexpr "%s = (venum*)hl_gc_alloc%s(sizeof(%s))" tmp (if has_ptr then "" else "_noptr") et;
-			sexpr "%s->index = %d" tmp cid;
+			sexpr "%s = hl_alloc_enum(%s,%d)" tmp (type_value (rtype r)) cid;
 			let _,_,tl = e.efields.(cid) in
 			list_iteri (fun i v ->
 				sexpr "((%s*)%s)->p%d = %s" et tmp i (rcast v tl.(i))
 			) rl;
 			if need_tmp then sexpr "%s = tmp; }" (reg r)
 		| OEnumAlloc (r,cid) ->
-			let et, (_,_,tl) = (match rtype r with HEnum e -> enum_constr_type ctx e cid, e.efields.(cid) | _ -> assert false) in
-			let has_ptr = List.exists is_gc_ptr (Array.to_list tl) in
-			sexpr "%s = (venum*)hl_gc_alloc%s(sizeof(%s))" (reg r) (if has_ptr then "" else "_noptr") et;
-			sexpr "memset(%s,0,sizeof(%s))" (reg r) et;
-			if cid <> 0 then sexpr "%s->index = %d" (reg r) cid
+			sexpr "%s = hl_alloc_enum(%s,%d)" (reg r) (type_value (rtype r)) cid
 		| OEnumIndex (r,v) ->
-			(match rtype v with
-			| HEnum _ ->
-				sexpr "%s = %s->index" (reg r) (reg v)
-			| HDyn ->
-				sexpr "%s = ((venum*)%s->v.ptr)->index" (reg r) (reg v)
-			| _ ->
-				assert false)
+			sexpr "%s = HL__ENUM_INDEX__(%s)" (reg r) (reg v)
 		| OEnumField (r,e,cid,pid) ->
 			let tname,(_,_,tl) = (match rtype e with HEnum e -> enum_constr_type ctx e cid, e.efields.(cid) | _ -> assert false) in
 			sexpr "%s((%s*)%s)->p%d" (rassign r tl.(pid)) tname (reg e) pid
@@ -940,12 +1045,17 @@ let generate_function ctx f =
 		| OSwitch (r,idx,eend) ->
 			sline "switch(%s) {" (reg r);
 			block();
-			output_at2 (i + 1) [OODefault;OOIncreaseIndent];
-			Array.iteri (fun k delta -> output_at2 (delta + i + 1) [OODecreaseIndent;OOCase k;OOIncreaseIndent]) idx;
 			let pend = i+1+eend in
 			(* insert at end if we have another switch case here *)
 			let old = output_options.(pend) in
 			output_options.(pend) <- [];
+			(* insert cases *)
+			output_at2 (i + 1) [OODefault;OOIncreaseIndent];
+			Array.iteri (fun k delta ->
+				output_at2 (delta + i + 1) [OODecreaseIndent;OOCase k;OOIncreaseIndent];
+				if delta = eend then output_at pend OOBreak;
+			) idx;
+			(* insert end switch *)
 			output_at2 pend ([OODecreaseIndent;OODecreaseIndent;OOEndBlock] @ List.rev old);
 		| ONullCheck r ->
 			sexpr "if( %s == NULL ) hl_null_access()" (reg r)
@@ -955,6 +1065,16 @@ let generate_function ctx f =
 		| OEndTrap b ->
 			sexpr "hl_endtrap(trap$%d)" (!trap_depth - 1);
 			if b then decr trap_depth;
+		| OAssert _ ->
+			sexpr "hl_assert()"
+		| ORefData (r,d) ->
+			(match rtype d with
+			| HArray ->
+				sexpr "%s = (%s)hl_aptr(%s,void*)" (reg r) (ctype (rtype r)) (reg d)
+			| _ ->
+				assert false)
+		| ORefOffset (r,r2,off) ->
+			sexpr "%s = %s + %s" (reg r) (reg r2) (reg off)
 		| ONop _ ->
 			()
 	) f.code;
@@ -963,90 +1083,300 @@ let generate_function ctx f =
 	line "}";
 	line ""
 
-let write_c com file (code:code) =
+type type_desc =
+	| DSimple of ttype
+	| DFun of type_desc list * type_desc * bool
+	| DNamed of string
+	| DVirtual of (string * type_desc) array
+	| DContext of type_desc array
 
-	let all_types, htypes = gather_types code in
-
-	let ctx = {
-		version = com.Common.version;
-		out = Buffer.create 1024;
-		tabs = "";
-		hlcode = code;
-		hash_cache = Hashtbl.create 0;
-		dir = (match Filename.dirname file with "" -> "." | dir -> String.concat "/" (ExtString.String.nsplit dir "\\"));
-		curfile = "";
-		cfiles = [];
-		ftable = Array.init (Array.length code.functions + Array.length code.natives) (fun _ -> { fe_args = []; fe_ret = HVoid; fe_name = ""; fe_decl = None; });
-		htypes = htypes;
-	} in
-
-	let line = line ctx and expr = expr ctx in
-	let sline fmt = Printf.ksprintf line fmt and sexpr fmt = Printf.ksprintf expr fmt in
+let valid_ident =
+	let e = Str.regexp "[^A-Za-z0-9_]+" in
+	(fun str -> Str.global_replace e "_" str)
 
-	open_file ctx "hl/code.h";
-	line "#ifndef HL_CODE_H";
-	line "#define HL_CODE_H";
-	line "";
-	line "#define HLC_BOOT";
-	line "#include <hlc.h>";
-	line "#include \"typedefs.h\"";
-	line "#include \"types.h\"";
-	line "#include \"functions.h\"";
-	line "#include \"globals.h\"";
-	line "#include \"natives.h\"";
-	line "";
-	line "#endif";
-
-	let used_closures = Hashtbl.create 0 in
-	let bytes_strings = Hashtbl.create 0 in
+let make_types_idents htypes =
+	let types_descs = ref PMap.empty in
+	let rec make_desc t =
+		match t with
+		| HVoid | HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64 | HBool | HBytes | HDyn | HArray | HType | HRef _ | HDynObj | HNull _ ->
+			DSimple t
+		| HFun (tl,t) ->
+			DFun (List.map make_desc tl, make_desc t, true)
+		| HMethod (tl, t) ->
+			DFun (List.map make_desc tl, make_desc t, false)
+		| HObj p | HStruct p ->
+			DNamed p.pname
+		| HAbstract (n,_) ->
+			DNamed n
+		| HEnum e when e.ename = "" ->
+			let _,_,tl = e.efields.(0) in
+			DContext (Array.map make_desc tl)
+		| HEnum e ->
+			DNamed e.ename
+		| HVirtual vp ->
+			try
+				PMap.find vp (!types_descs)
+			with Not_found ->
+				let arr = Array.create (Array.length vp.vfields) ("",DSimple HVoid) in
+				let td = DVirtual arr in
+				types_descs := PMap.add vp td (!types_descs);
+				Array.iteri (fun i (f,_,t) -> arr.(i) <- (f,make_desc t)) vp.vfields;
+				td
+	in
+	let make_sign d =
+		String.sub (Digest.to_hex (Digest.bytes (Marshal.to_bytes d [Marshal.Compat_32]))) 0 7
+	in
+	let rec desc_string d =
+		match d with
+		| DSimple (HNull t) ->
+			"t$nul_" ^ tstr t
+		| DSimple (HRef t) ->
+			"t$ref_" ^ (match make_desc t with DSimple _ -> tstr t | d -> desc_string d)
+		| DSimple t ->
+			"t$_" ^ tstr t
+		| DFun _ ->
+			"t$fun_" ^ make_sign d
+		| DNamed n ->
+			"t$" ^ (String.concat "_" (ExtString.String.nsplit n "."))
+		| DVirtual _ ->
+			"t$vrt_" ^ (make_sign d)
+		| DContext _ ->
+			"t$ctx_" ^ (make_sign d)
+	in
+	PMap.mapi (fun t _ -> desc_string (make_desc t)) htypes
+
+let make_global_names code gnames =
+	let hstrings = Hashtbl.create 0 in
+	let is_cstr = Hashtbl.create 0 in
+	Array.iter (fun (g,vl) ->
+		match code.globals.(g) with
+		| HObj { pname = "String" } ->
+			let str = code.strings.(vl.(0)) in
+			let v = valid_ident str in
+			Hashtbl.replace hstrings v (Hashtbl.mem hstrings v);
+			Hashtbl.add is_cstr g ();
+			gnames.(g) <- str
+		| _ -> ()
+	) code.constants;
+	let gids = Array.mapi (fun i n -> (n,i)) gnames in
+	Array.sort (fun (n1,g1) (n2,g2) -> let d = compare n1 n2 in if d = 0 then compare g1 g2 else d) gids;
+	let gnames_used = Hashtbl.create 0 in
+	let gnames = Hashtbl.create 0 in
+	Array.iter (fun (str,g) ->
+		let id = (if Hashtbl.mem is_cstr g then "s$" else "g$") ^ (if String.length str > 32 then short_digest str else let i = valid_ident str in if i = "_" || (try Hashtbl.find hstrings i with Not_found -> false) then short_digest str else i) in
+		let rec loop id k =
+			let rid = if k = 0 then id else id ^ "_" ^ string_of_int k in
+			if Hashtbl.mem gnames_used rid then loop id (k+1) else rid
+		in
+		let id = loop id 0 in
+		Hashtbl.add gnames_used id ();
+		Hashtbl.add gnames g id;
+	) gids;
+	Array.init (Array.length code.globals) (fun i -> Hashtbl.find gnames i)
+
+let make_function_table code =
+	let new_entry i = { fe_index = i; fe_args = []; fe_ret = HVoid; fe_name = ""; fe_module = None; fe_calling = []; fe_called_by = []; fe_decl = None; } in
+	let ftable = Array.init (Array.length code.functions + Array.length code.natives) new_entry in
+	Array.iter (fun (lib,name,t,idx) ->
+		let fname =
+			let lib = code.strings.(lib) in
+			let lib = if lib = "std" then "hl" else lib in
+			lib ^ "_" ^ code.strings.(name)
+		in
+		match t with
+		| HFun (args, t) ->
+			let ft = ftable.(idx) in
+			ft.fe_name <- fname;
+			ft.fe_args <- args;
+			ft.fe_ret <- t
+		| _ ->
+			assert false
+	) code.natives;
 	Array.iter (fun f ->
-		Array.iteri (fun i op ->
+		let fname = String.concat "_" (ExtString.String.nsplit (fundecl_name f) ".") in
+		let ft = ftable.(f.findex) in
+		ft.fe_name <- fname;
+		(match f.ftype with
+		| HFun (args,t) ->
+			ft.fe_args <- args;
+			ft.fe_ret <- t;
+		| _ ->
+			assert false);
+		ft.fe_decl <- Some f;
+		Array.iter (fun op ->
 			match op with
-			| OStaticClosure (_,fid) ->
-				Hashtbl.replace used_closures fid ()
-			| OBytes (_,sid) ->
-				Hashtbl.replace bytes_strings sid ()
+			| OCall0 (_,fid)
+			| OCall1 (_,fid,_)
+			| OCall2 (_,fid,_,_)
+			| OCall3 (_,fid,_,_,_)
+			| OCall4 (_,fid,_,_,_,_)
+			| OCallN (_,fid,_)
+			| OStaticClosure (_,fid)
+			| OInstanceClosure (_,fid,_) ->
+				let ft2 = ftable.(fid) in
+				if not (List.memq ft ft2.fe_called_by) then begin
+					ft2.fe_called_by <- ft :: ft2.fe_called_by;
+					ft.fe_calling <- ft2 :: ft.fe_calling;
+				end;
 			| _ ->
 				()
-		) f.code
+		) f.code;
 	) code.functions;
-
-	open_file ctx "hl/typedefs.h";
-	line "// Types definitions";
+	ftable
+
+let make_modules ctx all_types =
+	let modules = Hashtbl.create 0 in
+	let all_modules = ref [] in
+	let get_module name =
+		try
+			Hashtbl.find modules name
+		with Not_found ->
+			let m = {
+				m_name = name;
+				m_functions = [];
+				m_types = [];
+			} in
+			Hashtbl.add modules name m;
+			all_modules := m :: !all_modules;
+			m
+	in
+	let add m fid =
+		let f = ctx.ftable.(fid) in
+		if f.fe_module <> None then assert false;
+		f.fe_module <- Some m;
+		m.m_functions <- f :: m.m_functions;
+	in
+	let add_type m t =
+		m.m_types <- t :: m.m_types;
+		ctx.type_module <- PMap.add t m ctx.type_module;
+	in
+	let mk_name path =
+		let base_name, path = match List.rev (ExtString.String.nsplit path ".") with
+			| [] -> "enums", ["hl"]
+			| name :: acc -> (if name.[0] = '$' then String.sub name 1 (String.length name - 1) else name), List.rev acc
+		in
+		let path = path @ [base_name] in
+		let path = List.map (fun n -> if String.length n > 128 then Digest.to_hex (Digest.string n) else n) path in
+		let path = (match path with [name] -> ["_std";name] | _ -> path) in
+		String.concat "/" path
+	in
+	let all_contexts = ref [] in
 	Array.iter (fun t ->
 		match t with
-		| HObj o ->
-			let name = tname o.pname in
-			expr ("typedef struct _" ^ name ^ " *" ^ name);
-		| HAbstract (name,_) ->
-			expr ("typedef struct _" ^ name ^ " "  ^ name);
+		| HObj o | HStruct o ->
+			let m = get_module (mk_name o.pname) in
+			Array.iter (fun p -> add m p.fmethod) o.pproto;
+			List.iter (fun (_,mid) -> add m mid) o.pbindings;
+			add_type m t
+		| HEnum e when e.ename = "" ->
+			all_contexts := t :: !all_contexts
+		| HEnum e ->
+			let m = get_module (mk_name e.ename) in
+			add_type m t
 		| _ ->
 			()
 	) all_types;
-
-	line "";
-	line "// Types implementation";
-
-	Array.iter (fun t ->
+	let ep = ctx.hlcode.entrypoint in
+	if ep >= 0 then begin
+		let m = get_module "hl/init" in
+		add m ep;
+		ctx.ftable.(ep).fe_name <- "fun$init";
+	end;
+	List.iter (fun m ->
+		let rec get_deps acc = function
+			| [] -> acc
+			| fm :: fl ->
+				let counter = ref 1 in
+				let rec loop acc = function
+					| [] -> acc
+					| f :: l when f.fe_module = None && List.length f.fe_called_by = 1 && f.fe_decl <> None ->
+						f.fe_name <- fm.fe_name ^ "__$" ^ (string_of_int !counter);
+						incr counter;
+						f.fe_module <- Some m;
+						loop (append f acc) l
+					| _ :: l ->
+						loop acc l
+				and append f acc =
+					loop (f :: acc) (List.rev f.fe_calling)
+				in
+				get_deps (append fm acc) fl
+		in
+		m.m_functions <- get_deps [] m.m_functions
+	) !all_modules;
+	let contexts = ref PMap.empty in
+	Array.iter (fun f ->
+		if f.fe_module = None && ExtString.String.starts_with f.fe_name "fun$" then f.fe_name <- "wrap" ^ type_name ctx (match f.fe_decl with None -> assert false | Some f -> f.ftype);
+		(* assign context to function module *)
+		match f.fe_args with
+		| (HEnum e) as t :: _ when e.ename = "" ->
+			(try
+				let r = PMap.find t !contexts in
+				(match r with
+				| None -> ()
+				| Some m when (match f.fe_module with Some m2 -> m == m2 | _ -> false) -> ()
+				| _ -> contexts := PMap.add t None !contexts) (* multiple contexts *)
+			with Not_found ->
+				contexts := PMap.add t f.fe_module !contexts)
+		| _ -> ()
+	) ctx.ftable;
+	List.iter (fun t ->
+		let m = (try PMap.find t !contexts with Not_found -> None) in
+		let m = (match m with
+			| None ->
+				let tname = PMap.find t ctx.htypes in
+				get_module ("hl/ctx/" ^ String.sub tname 8 (String.length tname - 8))
+			| Some m ->
+				m
+		) in
+		add_type m t
+	) (List.rev !all_contexts);
+	!all_modules
+
+let generate_module_types ctx m =
+	let def_name = "INC_" ^ String.concat "__" (ExtString.String.nsplit m.m_name "/") in
+	let line = line ctx and expr = expr ctx and sexpr fmt = Printf.ksprintf (expr ctx) fmt in
+	let type_name t =
 		match t with
-		| HObj o ->
+		| HObj o | HStruct o -> o.pname
+		| HEnum e -> e.ename
+		| _ -> ""
+	in
+	let types = List.sort (fun t1 t2 -> compare (type_name t1) (type_name t2)) m.m_types in
+	define ctx (sprintf "#ifndef %s" def_name);
+	define ctx (sprintf "#define %s" def_name);
+	List.iter (fun t ->
+		match t with
+		| HObj o | HStruct o ->
 			let name = tname o.pname in
+			ctx.defined_types <- PMap.add t () ctx.defined_types;
+			define ctx (sprintf "typedef struct _%s *%s;" name name);
+		| _ -> ()
+	) types;
+	line "";
+	List.iter (fun t ->
+		match t with
+		| HObj op | HStruct op ->
+			let name = tname op.pname in
 			line ("struct _" ^ name ^ " {");
 			block ctx;
 			let rec loop o =
 				(match o.psuper with
-				| None -> expr ("hl_type *$type");
-				| Some c -> loop c);
+				| None ->
+					if not (is_struct t) then expr ("hl_type *$type");
+				| Some c ->
+					define_type ctx (if is_struct t then HStruct c else HObj c);
+					loop c);
 				Array.iteri (fun i (n,_,t) ->
 					let rec abs_index p v =
 						match p with
 						| None -> v
 						| Some o -> abs_index o.psuper (Array.length o.pfields + v)
 					in
+					define_type ctx t;
 					expr (var_type (if n = "" then unamed_field (abs_index o.psuper i) else n) t)
 				) o.pfields;
 			in
-			loop o;
+			loop op;
 			unblock ctx;
 			expr "}";
 		| HEnum e ->
@@ -1054,8 +1384,9 @@ let write_c com file (code:code) =
 				if Array.length pl <> 0 then begin
 					line ("typedef struct {");
 					block ctx;
-					expr "int index";
+					line "HL__ENUM_CONSTRUCT__";
 					Array.iteri (fun i t ->
+						define_type ctx t;
 						expr (var_type ("p" ^ string_of_int i) t)
 					) pl;
 					unblock ctx;
@@ -1064,148 +1395,189 @@ let write_c com file (code:code) =
 			) e.efields
 		| _ ->
 			()
-	) all_types;
-
-	open_file ctx "hl/types.h";
-	line "// Types values declaration";
-	Array.iteri (fun i t ->
-		sexpr "extern hl_type type$%d" i;
-		match t with
-		| HObj o ->
-			sline "#define %s__val &type$%d" (tname o.pname) i
-		| _ ->
-			()
-	) all_types;
-	line "";
-	sexpr "void hl_init_types( hl_module_context *ctx )";
+	) types;
+	line "#endif";
+	line ""
 
-	open_file ctx "hl/natives.h";
-	line "// Natives functions";
-	let native_libs = Hashtbl.create 0 in
-	Array.iter (fun (lib,name,t,idx) ->
-		match t with
-		| HFun (args,t) ->
-			let fname =
-				let lib = code.strings.(lib) in
-				Hashtbl.replace native_libs lib ();
-				let lib = if lib = "std" then "hl" else lib in
-				lib ^ "_" ^ code.strings.(name)
-			in
-			sexpr "HL_API %s %s(%s)" (ctype t) fname (String.concat "," (List.map ctype args));
-			let ft = ctx.ftable.(idx) in
-			ft.fe_name <- fname;
-			ft.fe_args <- args;
-			ft.fe_ret <- t;
-		| _ ->
-			assert false
-	) code.natives;
-
-	open_file ctx "hl/functions.h";
-	line "// Functions declaration";
-	Array.iter (fun f ->
-		match f.ftype with
-		| HFun (args,t) ->
-			let fname = String.concat "_" (ExtString.String.nsplit (fundecl_name f) ".") in
-			sexpr "%s %s(%s)" (ctype t) fname (String.concat "," (List.map ctype args));
-			let ft = ctx.ftable.(f.findex) in
-			ft.fe_name <- fname;
-			ft.fe_args <- args;
-			ft.fe_ret <- t;
-			ft.fe_decl <- Some f;
-		| _ ->
-			assert false
-	) code.functions;
-	line "";
-	sexpr "extern void *hl_functions_ptrs[]";
-	sexpr "extern hl_type *hl_functions_types[]";
+let write_c com file (code:code) gnames =
 
+	let all_types, htypes = gather_types code in
+	let types_ids = make_types_idents htypes in
+	let gnames = make_global_names code gnames in
+	let bnames = Array.map (fun b -> "bytes$" ^ short_digest (Digest.to_hex (Digest.bytes b))) code.bytes in
 
-	open_file ctx "hl/globals.h";
-	line "// Globals";
-	Array.iteri (fun i t ->
-		let name = "global$" ^ string_of_int i in
-		sexpr "extern %s" (var_type name t)
-	) code.globals;
+	let ctx = {
+		version = com.Common.version;
+		out = Buffer.create 1024;
+		tabs = "";
+		hlcode = code;
+		hash_cache = Hashtbl.create 0;
+		hash_mem = Hashtbl.create 0;
+		hash_cache_list = [];
+		dir = (match Filename.dirname file with "" -> "." | dir -> String.concat "/" (ExtString.String.nsplit dir "\\"));
+		curfile = "";
+		cfiles = [];
+		ftable = make_function_table code;
+		htypes = types_ids;
+		gnames = gnames;
+		bytes_names = bnames;
+		defines = [];
+		hdefines = Hashtbl.create 0;
+		defined_funs = Hashtbl.create 0;
+		defined_types = PMap.empty;
+		file_prefix = "";
+		fun_index = 0;
+		type_module = PMap.empty;
+	} in
+	let modules = make_modules ctx all_types in
 
-	Array.iteri (fun i str ->
-		if Hashtbl.mem bytes_strings i then
-			sexpr "extern vbyte bytes$%d[]" i
-		else if String.length str >= string_data_limit then
-			sexpr "vbyte string$%d[]" i
-	) code.strings;
+	let line = line ctx and expr = expr ctx in
+	let sline fmt = Printf.ksprintf line fmt and sexpr fmt = Printf.ksprintf expr fmt in
 
-	Hashtbl.iter (fun fid _ -> sexpr "extern vclosure cl$%d" fid) used_closures;
+	open_file ctx "hl/natives.h";
+	define ctx "#ifndef HL_NATIVES_H";
+	define ctx "#define HL_NATIVES_H";
+	define ctx "// Abstract decls";
+	let rec get_abstracts = function
+		| [] -> []
+		| HAbstract (name,_) :: l -> name :: get_abstracts l
+		| _ :: l -> get_abstracts l
+	in
+	let abstracts = List.sort compare (get_abstracts (Array.to_list all_types)) in
+	List.iter (fun name -> define ctx (sprintf "typedef struct _%s %s;" name name)) abstracts;
+	define ctx "";
+	line "// Natives functions";
+	let native_libs = Hashtbl.create 0 in
+	let sorted_natives = Array.copy code.natives in
+	Array.sort (fun n1 n2 -> let mk (lib,name,_,_) = code.strings.(lib), code.strings.(name) in compare (mk n1) (mk n2)) sorted_natives;
+	Array.iter (fun (lib,_,_,idx) ->
+		Hashtbl.replace native_libs code.strings.(lib) ();
+		let ft = ctx.ftable.(idx) in
+		define_type ctx (HFun (ft.fe_args,ft.fe_ret));
+		sexpr "HL_API %s %s(%s)" (ctype ft.fe_ret) ft.fe_name (args_repr ft.fe_args);
+	) sorted_natives;
+	line "#endif";
 	line "";
-	sexpr "void hl_init_roots()";
 
 	open_file ctx "hl/globals.c";
-	line "#include <hl/code.h>";
+	define ctx "#define HLC_BOOT";
+	define ctx "#include <hlc.h>";
 	line "// Globals";
 	Array.iteri (fun i t ->
-		let name = "global$" ^ string_of_int i in
+		let name = gnames.(i) in
+		define_type ctx t;
 		sexpr "%s = 0" (var_type name t)
 	) code.globals;
+	Array.iter (fun (g,fields) ->
+		let t = code.globals.(g) in
+		let name = "const_" ^ gnames.(g) in
+		let field_value t idx =
+			match t with
+			| HI32 ->
+				Int32.to_string code.ints.(idx)
+			| HBytes ->
+				"(vbyte*)" ^ string ctx idx
+			| _ ->
+				assert false
+		in
+		let fields = match t with
+			| HObj o | HStruct o ->
+				let fields = List.map2 field_value (List.map (fun (_,_,t) -> t) (Array.to_list o.pfields)) (Array.to_list fields) in
+				if is_struct t then fields else type_value ctx t :: fields
+			| _ ->
+				assert false
+		in
+		sexpr "static struct _%s %s = {%s}" (ctype t) name (String.concat "," fields);
+	) code.constants;
 	line "";
 	line "void hl_init_roots() {";
 	block ctx;
+	let is_const = Hashtbl.create 0 in
+	Array.iter (fun (g,fields) ->
+		sexpr "%s = &const_%s" gnames.(g) gnames.(g);
+		Hashtbl.add is_const g true;
+	) code.constants;
 	Array.iteri (fun i t ->
-		if is_ptr t then sexpr "hl_add_root((void**)&global$%d)" i;
+		if is_ptr t && not (Hashtbl.mem is_const i) then sexpr "hl_add_root((void**)&%s)" gnames.(i);
 	) code.globals;
 	unblock ctx;
 	line "}";
 
+	let output_bytes f str =
+		for i = 0 to String.length str - 1 do
+			if (i+1) mod 0x80 = 0 then f "\\\n\t";
+			if i > 0 then f ",";
+			f (string_of_int (int_of_char str.[i]));
+		done
+	in
 	Array.iteri (fun i str ->
-		let rec loop s i =
-			if i = String.length s then [] else
-			let c = String.get s i in
-			string_of_int (int_of_char c) :: loop s (i+1)
-		in
-		if Hashtbl.mem bytes_strings i then
-			sexpr "vbyte bytes$%d[] = {%s}" i (String.concat "," (loop str 0))
-		else if String.length str >= string_data_limit then
-			let s = utf8_to_utf16 str in
+		if String.length str >= string_data_limit then begin
+			let s = Common.utf8_to_utf16 str true in
 			sline "// %s..." (String.escaped (String.sub str 0 (string_data_limit-4)));
-			sexpr "vbyte string$%d[] = {%s}" i (String.concat "," (loop s 0))
+			output ctx (Printf.sprintf "vbyte string$%s[] = {" (short_digest str));
+			output_bytes (output ctx) s;
+			sexpr "}";
+		end
 	) code.strings;
-
-	Hashtbl.iter (fun fid _ ->
-		let ft = ctx.ftable.(fid) in
-		sexpr "vclosure cl$%d = { %s, %s, 0 }" fid (type_value ctx (HFun (ft.fe_args,ft.fe_ret))) ft.fe_name
-	) used_closures;
-
+	Array.iteri (fun i bytes ->
+		if Bytes.length bytes > 1000 then begin
+			let bytes_file = "hl/bytes_" ^ (Digest.to_hex (Digest.bytes bytes)) ^ ".h" in
+			let abs_file = ctx.dir ^ "/" ^ bytes_file in
+			if not (Sys.file_exists abs_file) then begin
+				let ch = open_out_bin abs_file in
+				output_bytes (output_string ch) (Bytes.to_string bytes);
+				close_out ch;
+			end;
+			sline "vbyte %s[] = {" ctx.bytes_names.(i);
+			output ctx (Printf.sprintf "#%s  include \"%s\"\n" ctx.tabs bytes_file);
+			sexpr "}";
+		end else begin
+			output ctx (Printf.sprintf "vbyte %s[] = {" ctx.bytes_names.(i));
+			output_bytes (output ctx) (Bytes.to_string bytes);
+			sexpr "}";
+		end
+	) code.bytes;
+
+	let type_value ctx t = "&" ^ type_name ctx t in (* no auto import *)
 	open_file ctx "hl/types.c";
-	line "#include <hl/code.h>";
+	define ctx "#define HLC_BOOT";
+	define ctx "#include <hlc.h>";
 	line "// Types values";
 	Array.iteri (fun i t ->
-		sexpr "hl_type type$%d = { %s } /* %s */" i (type_id t) (tstr t);
+		match t with
+		| HMethod _ | HFun _ | HVirtual _ ->
+			sexpr "hl_type %s = { %s } /* %s */" (type_name ctx t) (type_id t) (tstr t);
+		| _ ->
+			sexpr "hl_type %s = { %s }" (type_name ctx t) (type_id t);
 	) all_types;
 
 	line "";
 	line "// Types values data";
-	Array.iteri (fun i t ->
+	Array.iter (fun t ->
 		let field_value (_,name_id,t) =
 			sprintf "{(const uchar*)%s, %s, %ld}" (string ctx name_id) (type_value ctx t) (hash ctx name_id)
 		in
 		match t with
-		| HObj o ->
+		| HObj o | HStruct o ->
+			let name = type_name ctx t in
 			let proto_value p =
 				sprintf "{(const uchar*)%s, %d, %d, %ld}" (string ctx p.fid) p.fmethod (match p.fvirtual with None -> -1 | Some i -> i) (hash ctx p.fid)
 			in
 			let fields =
 				if Array.length o.pfields = 0 then "NULL" else
-				let name = sprintf "fields$%d" i in
+				let name = sprintf "fields%s" name in
 				sexpr "static hl_obj_field %s[] = {%s}" name (String.concat "," (List.map field_value (Array.to_list o.pfields)));
 				name
 			in
 			let proto =
 				if Array.length o.pproto = 0 then "NULL" else
-				let name = sprintf "proto$%d" i in
+				let name = sprintf "proto%s" name in
 				sexpr "static hl_obj_proto %s[] = {%s}" name (String.concat "," (List.map proto_value (Array.to_list o.pproto)));
 				name
 			in
 			let bindings =
 				if o.pbindings = [] then "NULL" else
-				let name = sprintf "bindings$%d" i in
+				let name = sprintf "bindings%s" name in
 				sexpr "static int %s[] = {%s}" name (String.concat "," (List.map (fun (fid,fidx) -> string_of_int fid ^ "," ^ string_of_int fidx) o.pbindings));
 				name
 			in
@@ -1214,40 +1586,45 @@ let write_c com file (code:code) =
 				string_of_int (Array.length o.pproto);
 				string_of_int (List.length o.pbindings);
 				sprintf "(const uchar*)%s" (string ctx o.pid);
-				(match o.psuper with None -> "NULL" | Some c -> sprintf "%s__val" (tname c.pname));
+				(match o.psuper with None -> "NULL" | Some c -> type_value ctx (HObj c));
 				fields;
 				proto;
 				bindings
 			] in
-			sexpr "static hl_type_obj obj$%d = {%s}" i (String.concat "," ofields);
+			sexpr "static hl_type_obj obj%s = {%s}" name (String.concat "," ofields);
 		| HEnum e ->
-			let constr_name = sprintf "econstructs$%d" i in
+			let ename = type_name ctx t in
 			let constr_value cid (name,nid,tl) =
 				let tval = if Array.length tl = 0 then "NULL" else
-					let name = sprintf "econstruct$%d_%d" i cid in
+					let name = sprintf "econstruct%s_%d" ename cid in
 					sexpr "static hl_type *%s[] = {%s}" name (String.concat "," (List.map (type_value ctx) (Array.to_list tl)));
 					name
 				in
 				let size = if Array.length tl = 0 then "0" else sprintf "sizeof(%s)" (enum_constr_type ctx e cid) in
 				let offsets = if Array.length tl = 0 then "NULL" else
-					let name = sprintf "eoffsets$%d_%d" i cid in
+					let name = sprintf "eoffsets%s_%d" ename cid in
 					sexpr "static int %s[] = {%s}" name (String.concat "," (List.map (fun _ -> "0") (Array.to_list tl)));
 					name
 				in
 				let has_ptr = List.exists is_gc_ptr (Array.to_list tl) in
 				sprintf "{(const uchar*)%s, %d, %s, %s, %s, %s}" (string ctx nid) (Array.length tl) tval size (if has_ptr then "true" else "false") offsets
 			in
-			sexpr "static hl_enum_construct %s[] = {%s}" constr_name (String.concat "," (Array.to_list (Array.mapi constr_value e.efields)));
+			let constr_name = if Array.length e.efields = 0 then "NULL" else begin
+				let name = sprintf "econstruct%s" ename in
+				sexpr "static hl_enum_construct %s[] = {%s}" name (String.concat "," (Array.to_list (Array.mapi constr_value e.efields)));
+				name;
+			end in
 			let efields = [
 				if e.eid = 0 then "NULL" else sprintf "(const uchar*)%s" (string ctx e.eid);
 				string_of_int (Array.length e.efields);
 				constr_name
 			] in
-			sexpr "static hl_type_enum enum$%d = {%s}" i (String.concat "," efields);
+			sexpr "static hl_type_enum enum%s = {%s}" ename (String.concat "," efields);
 		| HVirtual v ->
+			let vname = type_name ctx t in
 			let fields_name =
 				if Array.length v.vfields = 0 then "NULL" else
-				let name = sprintf "vfields$%d" i in
+				let name = sprintf "vfields%s" vname in
 				sexpr "static hl_obj_field %s[] = {%s}" name (String.concat "," (List.map field_value (Array.to_list v.vfields)));
 				name
 			in
@@ -1255,14 +1632,15 @@ let write_c com file (code:code) =
 				fields_name;
 				string_of_int (Array.length v.vfields)
 			] in
-			sexpr "static hl_type_virtual virt$%d = {%s}" i (String.concat "," vfields);
-		| HFun (args,t) ->
+			sexpr "static hl_type_virtual virt%s = {%s}" vname (String.concat "," vfields);
+		| HFun (args,ret) | HMethod(args,ret) ->
+			let fname = type_name ctx t in
 			let aname = if args = [] then "NULL" else
-				let name = sprintf "fargs$%d" i in
+				let name = sprintf "fargs%s" fname in
 				sexpr "static hl_type *%s[] = {%s}" name (String.concat "," (List.map (type_value ctx) args));
 				name
 			in
-			sexpr "static hl_type_fun tfun$%d = {%s,%s,%d}" i aname (type_value ctx t) (List.length args)
+			sexpr "static hl_type_fun tfun%s = {%s,%s,%d}" fname aname (type_value ctx ret) (List.length args)
 		| _ ->
 			()
 	) all_types;
@@ -1270,23 +1648,35 @@ let write_c com file (code:code) =
 	line "";
 	line "void hl_init_types( hl_module_context *ctx ) {";
 	block ctx;
-	Array.iteri (fun i t ->
+	Array.iter (fun t ->
 		match t with
-		| HObj o ->
-			sexpr "obj$%d.m = ctx" i;
-			(match o.pclassglobal with None -> () | Some g -> sexpr "obj$%d.global_value = (void**)&global$%d" i g);
-			sexpr "type$%d.obj = &obj$%d" i i
-		| HNull t | HRef t ->
-			sexpr "type$%d.tparam = %s" i (type_value ctx t)
+		| HObj o | HStruct o ->
+			let name = type_name ctx t in
+			sexpr "obj%s.m = ctx" name;
+			(match o.pclassglobal with
+			| None -> ()
+			| Some g ->
+				define_global ctx g;
+				sexpr "obj%s.global_value = (void**)&%s" name gnames.(g));
+			sexpr "%s.obj = &obj%s" name name
+		| HNull r | HRef r ->
+			sexpr "%s.tparam = %s" (type_name ctx t) (type_value ctx r)
 		| HEnum e ->
-			sexpr "type$%d.tenum = &enum$%d" i i;
-			(match e.eglobal with None -> () | Some g -> sexpr "enum$%d.global_value = (void**)&global$%d" i g);
-			sexpr "hl_init_enum(&type$%d)" i;
+			let name = type_name ctx t in
+			sexpr "%s.tenum = &enum%s" name name;
+			(match e.eglobal with
+			| None -> ()
+			| Some g ->
+				define_global ctx g;
+				sexpr "enum%s.global_value = (void**)&%s" name gnames.(g));
+			sexpr "hl_init_enum(&%s,ctx)" name;
 		| HVirtual _ ->
-			sexpr "type$%d.virt = &virt$%d" i i;
-			sexpr "hl_init_virtual(&type$%d,ctx)" i;
-		| HFun _ ->
-			sexpr "type$%d.fun = &tfun$%d" i i
+			let name = type_name ctx t in
+			sexpr "%s.virt = &virt%s" name name;
+			sexpr "hl_init_virtual(&%s,ctx)" name;
+		| HFun _ | HMethod _ ->
+			let name = type_name ctx t in
+			sexpr "%s.fun = &tfun%s" name name
 		| _ ->
 			()
 	) all_types;
@@ -1294,84 +1684,67 @@ let write_c com file (code:code) =
 	line "}";
 
 	open_file ctx "hl/reflect.c";
-	line "#include <hl/code.h>";
+	define ctx "#define HLC_BOOT";
+	define ctx "#include <hlc.h>";
 	line "// Reflection helpers";
 	generate_reflection ctx;
 
-	let gen_functions = Hashtbl.create 0 in
-	let all_protos = Hashtbl.create 0 in
-	Array.iter (fun t ->
-		match t with
-		| HObj o ->
-			Hashtbl.add all_protos o.pname o
-		| _ -> ()
-	) all_types;
-
-	Array.iter (fun t ->
-		match t with
-		| HObj o when Hashtbl.mem all_protos o.pname ->
-			let file = ref false in
-			let base_name, path = match List.rev (ExtString.String.nsplit o.pname ".") with
-				| [] -> assert false
-				| name :: acc -> (if name.[0] = '$' then String.sub name 1 (String.length name - 1) else name), List.rev acc
-			in
-			let generate fid =
-				match ctx.ftable.(fid).fe_decl with
-				| None -> ()
-				| Some f ->
-					if not !file then begin
-						file := true;
-						let path = path @ [base_name] in
-						let path = List.map (fun n -> if String.length n > 128 then Digest.to_hex (Digest.string n) else n) path in
-						let path = (match path with [name] -> ["_std";name] | _ -> path) in
-						open_file ctx (String.concat "/" path ^ ".c");
-						line "#include <hl/code.h>";
-						line "";
-					end;
-					Hashtbl.replace gen_functions f.findex ();
-					generate_function ctx f
-			in
-			let gen_proto name =
-				try
-					let full_name = String.concat "." (path @ [name]) in
-					let o = Hashtbl.find all_protos full_name in
-					Array.iter (fun p -> generate p.fmethod) o.pproto;
-					List.iter (fun (_,mid) -> generate mid) o.pbindings;
-					Hashtbl.remove all_protos full_name;
-				with Not_found ->
-					()
+	List.iter (fun m ->
+		let defined_types = ref PMap.empty in
+		if m.m_types <> [] then begin
+			open_file ctx (m.m_name ^ ".h");
+			generate_module_types ctx m;
+			defined_types := ctx.defined_types;
+		end;
+		if m.m_functions <> [] then begin
+			open_file ctx (m.m_name ^ ".c");
+			ctx.defined_types <- !defined_types;
+			define ctx "#define HLC_BOOT";
+			define ctx "#include <hlc.h>";
+			if m.m_types <> [] then define ctx (sprintf "#include <%s.h>" m.m_name);
+			let file_pos f =
+				match f.fe_decl with
+				| Some f when Array.length f.debug > 0 ->
+					let fid, p = f.debug.(Array.length f.debug - 1) in
+					(code.strings.(fid), p)
+				| _ ->
+					("",0)
 			in
-			gen_proto base_name;
-			gen_proto ("$" ^ base_name);
-		| _ -> ()
-	) all_types;
+			let funcs = List.sort (fun f1 f2 -> compare (file_pos f1) (file_pos f2)) m.m_functions in
+			List.iter (fun fe -> match fe.fe_decl with None -> () | Some f -> generate_function ctx f) funcs;
+		end;
+	) modules;
 
 	open_file ctx "hl/functions.c";
-	line "#include <hl/code.h>";
-	line "";
-	sexpr "void *hl_functions_ptrs[] = {%s}" (String.concat "," (List.map (fun f -> f.fe_name) (Array.to_list ctx.ftable)));
+	define ctx "#define HLC_BOOT";
+	define ctx "#include <hlc.h>";
+	sexpr "void *hl_functions_ptrs[] = {%s}" (String.concat "," (List.map (fun f -> define_function ctx f.fe_index) (Array.to_list ctx.ftable)));
 	let rec loop i =
 		if i = Array.length ctx.ftable then [] else
 		let ft = ctx.ftable.(i) in
-		(type_value ctx (HFun (ft.fe_args,ft.fe_ret))) :: loop (i + 1)
+		let n = type_name ctx (HFun (ft.fe_args,ft.fe_ret)) in
+		define ctx (sprintf "extern hl_type %s;" n);
+		("&" ^ n) :: loop (i + 1)
 	in
 	sexpr "hl_type *hl_functions_types[] = {%s}" (String.concat "," (loop 0));
 	line "";
 	Array.iter (fun f ->
-		if not (Hashtbl.mem gen_functions f.findex) then generate_function ctx f;
-	) code.functions;
+		if f.fe_module = None then (match f.fe_decl with None -> () | Some f -> generate_function ctx f);
+	) ctx.ftable;
 
 	open_file ctx "hl/hashes.c";
-	line "#include <hl/code.h>";
+	define ctx "#define HLC_BOOT";
+	define ctx "#include <hlc.h>";
 	line "";
 	line "void hl_init_hashes() {";
 	block ctx;
-	Hashtbl.iter (fun i _ -> sexpr "hl_hash((vbyte*)%s)" (string ctx i)) ctx.hash_cache;
+	List.iter (fun i -> sexpr "hl_hash((vbyte*)%s)" (string ctx i)) (List.rev ctx.hash_cache_list);
 	unblock ctx;
 	line "}";
 
 	open_file ctx (Filename.basename file);
-	line "#include <hl/code.h>";
+	define ctx "#define HLC_BOOT";
+	define ctx "#include <hlc.h>";
 	line "#include <hlc_main.c>";
 	line "";
 	line "#ifndef HL_MAKE";
@@ -1379,6 +1752,10 @@ let write_c com file (code:code) =
 	line "#endif";
 	line "";
 	expr "void hl_init_hashes()";
+	expr "void hl_init_roots()";
+	expr "void hl_init_types( hl_module_context *ctx )";
+	expr "extern void *hl_functions_ptrs[]";
+	expr "extern hl_type *hl_functions_types[]";
 	line "";
 	line "// Entry point";
 	line "void hl_entry_point() {";
@@ -1390,7 +1767,7 @@ let write_c com file (code:code) =
 	expr "hl_init_types(&ctx)";
 	expr "hl_init_hashes()";
 	expr "hl_init_roots()";
-	sexpr "%s()" ctx.ftable.(code.entrypoint).fe_name;
+	if code.entrypoint >= 0 then sexpr "%s()" (define_function ctx code.entrypoint);
 	unblock ctx;
 	line "}";
 	line "";
@@ -1401,7 +1778,7 @@ let write_c com file (code:code) =
 	block ctx;
 	sline "\"version\" : %d," ctx.version;
 	sline "\"libs\" : [%s]," (String.concat "," (Hashtbl.fold (fun k _ acc -> sprintf "\"%s\"" k :: acc) native_libs []));
-	sline "\"defines\" : {%s\n\t}," (String.concat "," (PMap.foldi (fun k v acc -> sprintf "\n\t\t\"%s\" : \"%s\"" k v :: acc) com.Common.defines []));
+	sline "\"defines\" : {%s\n\t}," (String.concat "," (PMap.foldi (fun k v acc -> sprintf "\n\t\t\"%s\" : \"%s\"" (String.escaped k) (String.escaped v) :: acc) com.Common.defines.Define.values []));
 	sline "\"files\" : [%s\n\t]" (String.concat "," (List.map (sprintf "\n\t\t\"%s\"") ctx.cfiles));
 	unblock ctx;
 	line "}";
diff --git a/src/generators/hlcode.ml b/src/generators/hlcode.ml
index 00a689c2b62aa19f0853e52d1dbae5dac4f93019..b9cc7a6b184c6c835678a60b57312ef48f7c6bd7 100644
--- a/src/generators/hlcode.ml
+++ b/src/generators/hlcode.ml
@@ -1,5 +1,5 @@
 (*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,6 +30,7 @@ type ttype =
 	| HUI8
 	| HUI16
 	| HI32
+	| HI64
 	| HF32
 	| HF64
 	| HBool
@@ -45,6 +46,8 @@ type ttype =
 	| HAbstract of string * string index
 	| HEnum of enum_proto
 	| HNull of ttype
+	| HMethod of ttype list * ttype
+	| HStruct of class_proto
 
 and class_proto = {
 	pname : string;
@@ -145,6 +148,8 @@ type opcode =
 	| OJSLte of reg * reg * int
 	| OJULt of reg * reg * int
 	| OJUGte of reg * reg * int
+	| OJNotLt of reg * reg * int
+	| OJNotGte of reg * reg * int
 	| OJEq of reg * reg * int
 	| OJNotEq of reg * reg * int
 	| OJAlways of int
@@ -168,15 +173,11 @@ type opcode =
 	(* memory access *)
 	| OGetUI8 of reg * reg * reg
 	| OGetUI16 of reg * reg * reg
-	| OGetI32 of reg * reg * reg
-	| OGetF32 of reg * reg * reg
-	| OGetF64 of reg * reg * reg
+	| OGetMem of reg * reg * reg
 	| OGetArray of reg * reg * reg
 	| OSetUI8 of reg * reg * reg
 	| OSetUI16 of reg * reg * reg
-	| OSetI32 of reg * reg * reg
-	| OSetF32 of reg * reg * reg
-	| OSetF64 of reg * reg * reg
+	| OSetMem of reg * reg * reg
 	| OSetArray of reg * reg * reg
 	(* type operations *)
 	| ONew of reg
@@ -195,6 +196,9 @@ type opcode =
 	| OEnumField of reg * reg * field index * int
 	| OSetEnumField of reg * int * reg
 	(* misc *)
+	| OAssert of unused
+	| ORefData of reg * reg
+	| ORefOffset of reg * reg * reg
 	| ONop of string
 
 type fundecl = {
@@ -204,6 +208,7 @@ type fundecl = {
 	regs : ttype array;
 	code : opcode array;
 	debug : (int * int) array;
+	assigns : (string index * int) array;
 }
 
 type code = {
@@ -212,11 +217,13 @@ type code = {
 	strings : string array;
 	ints : int32 array;
 	floats : float array;
+	bytes : bytes array;
 	(* types : ttype array // only in bytecode, rebuilt on save() *)
 	globals : ttype array;
 	natives : (string index * string index * ttype * functable index) array;
 	functions : fundecl array;
 	debugfiles : string array;
+	constants : (global * int array) array;
 }
 
 let null_proto =
@@ -248,12 +255,15 @@ let list_mapi f l =
 *)
 let is_nullable t =
 	match t with
-	| HBytes | HDyn | HFun _ | HObj _ | HArray | HVirtual _ | HDynObj | HAbstract _ | HEnum _ | HNull _ | HRef _ -> true
-	| HUI8 | HUI16 | HI32 | HF32 | HF64 | HBool | HVoid | HType -> false
+	| HBytes | HDyn | HFun _ | HObj _ | HArray | HVirtual _ | HDynObj | HAbstract _ | HEnum _ | HNull _ | HRef _ | HType | HMethod _ | HStruct _ -> true
+	| HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64 | HBool | HVoid -> false
 
+let is_struct = function
+	| HStruct _ -> true
+	| _ -> false
 
 let is_int = function
-	| HUI8 | HUI16 | HI32 -> true
+	| HUI8 | HUI16 | HI32 | HI64 -> true
 	| _ -> false
 
 let is_float = function
@@ -261,7 +271,7 @@ let is_float = function
 	| _ -> false
 
 let is_number = function
-	| HUI8 | HUI16 | HI32 | HF32 | HF64 -> true
+	| HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64 -> true
 	| _ -> false
 
 (*
@@ -269,15 +279,17 @@ let is_number = function
 *)
 let is_dynamic t =
 	match t with
-	| HDyn | HFun _ | HObj _ | HArray | HVirtual _ | HDynObj | HNull _ -> true
+	| HDyn | HFun _ | HObj _ | HArray | HVirtual _ | HDynObj | HNull _ | HEnum _ -> true
 	| _ -> false
 
 let rec tsame t1 t2 =
 	if t1 == t2 then true else
 	match t1, t2 with
 	| HFun (args1,ret1), HFun (args2,ret2) when List.length args1 = List.length args2 -> List.for_all2 tsame args1 args2 && tsame ret2 ret1
+	| HMethod (args1,ret1), HMethod (args2,ret2) when List.length args1 = List.length args2 -> List.for_all2 tsame args1 args2 && tsame ret2 ret1
 	| HObj p1, HObj p2 -> p1 == p2
 	| HEnum e1, HEnum e2 -> e1 == e2
+	| HStruct p1, HStruct p2 -> p1 == p2
 	| HAbstract (_,a1), HAbstract (_,a2) -> a1 == a2
 	| HVirtual v1, HVirtual v2 ->
 		if v1 == v2 then true else
@@ -314,6 +326,12 @@ let rec safe_cast t1 t2 =
 			p.pname = p2.pname || (match p.psuper with None -> false | Some p -> loop p)
 		in
 		loop p1
+	| HStruct p1, HStruct p2 ->
+		(* allow subtyping *)
+		let rec loop p =
+			p.pname = p2.pname || (match p.psuper with None -> false | Some p -> loop p)
+		in
+		loop p1
 	| HFun (args1,t1), HFun (args2,t2) when List.length args1 = List.length args2 ->
 		List.for_all2 (fun t1 t2 -> safe_cast t2 t1 || (t1 = HDyn && is_dynamic t2)) args1 args2 && safe_cast t1 t2
 	| _ ->
@@ -331,27 +349,6 @@ let hl_hash b =
 	in
 	loop 0
 
-let utf16_add buf c =
-	let add c =
-		Buffer.add_char buf (char_of_int (c land 0xFF));
-		Buffer.add_char buf (char_of_int (c lsr 8));
-	in
-	if c >= 0 && c < 0x10000 then begin
-		if c >= 0xD800 && c <= 0xDFFF then failwith ("Invalid unicode char " ^ string_of_int c);
-		add c;
-	end else if c < 0x110000 then begin
-		let c = c - 0x10000 in
-		add ((c asr 10) + 0xD800);
-		add ((c land 1023) + 0xDC00);
-	end else
-		failwith ("Invalid unicode char " ^ string_of_int c)
-
-let utf8_to_utf16 str =
-	let b = Buffer.create (String.length str * 2) in
-	(try UTF8.iter (fun c -> utf16_add b (UChar.code c)) str with Invalid_argument _ | UChar.Out_of_range -> ()); (* if malformed *)
-	utf16_add b 0;
-	Buffer.contents b
-
 let rec get_index name p =
 	try
 		PMap.find name p.pindex
@@ -391,10 +388,10 @@ let gather_types (code:code) =
 		DynArray.add arr t;
 		types := PMap.add t index !types;
 		match t with
-		| HFun (args, ret) ->
+		| HFun (args, ret) | HMethod (args, ret) ->
 			List.iter get_type args;
 			get_type ret
-		| HObj p ->
+		| HObj p | HStruct p ->
 			Array.iter (fun (_,n,t) -> get_type t) p.pfields
 		| HNull t | HRef t ->
 			get_type t
@@ -405,7 +402,7 @@ let gather_types (code:code) =
 		| _ ->
 			()
 	in
-	List.iter (fun t -> get_type t) [HVoid; HUI8; HUI16; HI32; HF32; HF64; HBool; HType; HDyn]; (* make sure all basic types get lower indexes *)
+	List.iter (fun t -> get_type t) [HVoid; HUI8; HUI16; HI32; HI64; HF32; HF64; HBool; HType; HDyn]; (* make sure all basic types get lower indexes *)
 	Array.iter (fun g -> get_type g) code.globals;
 	Array.iter (fun (_,_,t,_) -> get_type t) code.natives;
 	Array.iter (fun f ->
@@ -430,17 +427,21 @@ let rec tstr ?(stack=[]) ?(detailed=false) t =
 	| HUI8 -> "ui8"
 	| HUI16 -> "ui16"
 	| HI32 -> "i32"
+	| HI64 -> "i64"
 	| HF32 -> "f32"
 	| HF64 -> "f64"
 	| HBool -> "bool"
 	| HBytes -> "bytes"
 	| HDyn  -> "dyn"
 	| HFun (args,ret) -> "(" ^ String.concat "," (List.map (tstr ~stack ~detailed) args) ^ "):" ^ tstr ~stack ~detailed ret
-	| HObj o when not detailed -> "#" ^ o.pname
-	| HObj o ->
+	| HMethod (args,ret) -> "method:(" ^ String.concat "," (List.map (tstr ~stack ~detailed) args) ^ "):" ^ tstr ~stack ~detailed ret
+	| HObj o when not detailed -> o.pname
+	| HStruct s when not detailed -> "@" ^ s.pname
+	| HObj o | HStruct o ->
 		let fields = "{" ^ String.concat "," (List.map (fun(s,_,t) -> s ^ " : " ^ tstr ~detailed:false t) (Array.to_list o.pfields)) ^ "}" in
 		let proto = "{"  ^ String.concat "," (List.map (fun p -> (match p.fvirtual with None -> "" | Some _ -> "virtual ") ^ p.fname ^ "@" ^  string_of_int p.fmethod) (Array.to_list o.pproto)) ^ "}" in
-		"#" ^ o.pname ^ "[" ^ (match o.psuper with None -> "" | Some p -> ">" ^ p.pname ^ " ") ^ "fields=" ^ fields ^ " proto=" ^ proto ^ "]"
+		let str = o.pname ^ "[" ^ (match o.psuper with None -> "" | Some p -> ">" ^ p.pname ^ " ") ^ "fields=" ^ fields ^ " proto=" ^ proto ^ "]" in
+		(match t with HObj o -> str | _ -> "@" ^ str)
 	| HArray ->
 		"array"
 	| HType ->
@@ -513,6 +514,8 @@ let ostr fstr o =
 	| OJSLte (r,a,b) -> Printf.sprintf "jslte %d,%d,%d" r a b
 	| OJULt (a,b,i) -> Printf.sprintf "jult %d,%d,%d" a b i
 	| OJUGte (a,b,i) -> Printf.sprintf "jugte %d,%d,%d" a b i
+	| OJNotLt (a,b,i) -> Printf.sprintf "jnotlt %d,%d,%d" a b i
+	| OJNotGte (a,b,i) -> Printf.sprintf "jnotgte %d,%d,%d" a b i
 	| OJEq (a,b,i) -> Printf.sprintf "jeq %d,%d,%d" a b i
 	| OJNotEq (a,b,i) -> Printf.sprintf "jnoteq %d,%d,%d" a b i
 	| OJAlways d -> Printf.sprintf "jalways %d" d
@@ -531,15 +534,11 @@ let ostr fstr o =
 	| ORethrow r -> Printf.sprintf "rethrow %d" r
 	| OGetUI8 (r,b,p) -> Printf.sprintf "getui8 %d,%d[%d]" r b p
 	| OGetUI16 (r,b,p) -> Printf.sprintf "getui16 %d,%d[%d]" r b p
-	| OGetI32 (r,b,p) -> Printf.sprintf "geti32 %d,%d[%d]" r b p
-	| OGetF32 (r,b,p) -> Printf.sprintf "getf32 %d,%d[%d]" r b p
-	| OGetF64 (r,b,p) -> Printf.sprintf "getf64 %d,%d[%d]" r b p
+	| OGetMem (r,b,p) -> Printf.sprintf "getmem %d,%d[%d]" r b p
 	| OGetArray (r,a,i) -> Printf.sprintf "getarray %d,%d[%d]" r a i
 	| OSetUI8 (r,p,v) -> Printf.sprintf "setui8 %d,%d,%d" r p v
 	| OSetUI16 (r,p,v) -> Printf.sprintf "setui16 %d,%d,%d" r p v
-	| OSetI32 (r,p,v) -> Printf.sprintf "seti32 %d,%d,%d" r p v
-	| OSetF32 (r,p,v) -> Printf.sprintf "setf32 %d,%d,%d" r p v
-	| OSetF64 (r,p,v) -> Printf.sprintf "setf64 %d,%d,%d" r p v
+	| OSetMem (r,p,v) -> Printf.sprintf "setmem %d,%d,%d" r p v
 	| OSetArray (a,i,v) -> Printf.sprintf "setarray %d[%d],%d" a i v
 	| OSafeCast (r,v) -> Printf.sprintf "safecast %d,%d" r v
 	| OUnsafeCast (r,v) -> Printf.sprintf "unsafecast %d,%d" r v
@@ -562,6 +561,9 @@ let ostr fstr o =
 	| ONullCheck r -> Printf.sprintf "nullcheck %d" r
 	| OTrap (r,i) -> Printf.sprintf "trap %d, %d" r i
 	| OEndTrap b -> Printf.sprintf "endtrap %b" b
+	| OAssert _ -> "assert"
+	| ORefData (r,d) -> Printf.sprintf "refdata %d, %d" r d
+	| ORefOffset (r,r2,off) -> Printf.sprintf "refoffset %d, %d, %d" r r2 off
 	| ONop s -> if s = "" then "nop" else "nop " ^ s
 
 let fundecl_name f = if snd f.fpath = "" then "fun$" ^ (string_of_int f.findex) else (fst f.fpath) ^ "." ^ (snd f.fpath)
@@ -596,6 +598,10 @@ let dump pr code =
 	Array.iteri (fun i s ->
 		pr ("	@" ^ string_of_int i ^ " : " ^ String.escaped s);
 	) code.strings;
+	pr (string_of_int (Array.length code.bytes) ^ " bytes");
+	Array.iteri (fun i s ->
+		pr ("	@" ^ string_of_int i ^ " : " ^ string_of_int (Bytes.length s));
+	) code.bytes;
 	pr (string_of_int (Array.length code.ints) ^ " ints");
 	Array.iteri (fun i v ->
 		pr ("	@" ^ string_of_int i ^ " : " ^ Int32.to_string v);
@@ -656,4 +662,8 @@ let dump pr code =
 		List.iter (fun (i,fidx) ->
 			pr ("		  @" ^ string_of_int i ^ " fun@" ^ string_of_int fidx)
 		) p.pbindings;
-	) protos
+	) protos;
+	pr (string_of_int (Array.length code.constants) ^ " constant values");
+	Array.iter (fun (g,fields) ->
+		pr (Printf.sprintf "    @%d %s [%s]" g (tstr code.globals.(g)) (String.concat "," (List.map string_of_int (Array.to_list fields))));
+	) code.constants
diff --git a/src/generators/hlinterp.ml b/src/generators/hlinterp.ml
index bbd65f1dd0e5b97216dd327f429fee0e8d23103b..b17d2b8e9f7de57c8284414c542da3caab7be400 100644
--- a/src/generators/hlinterp.ml
+++ b/src/generators/hlinterp.ml
@@ -1,5 +1,5 @@
 (*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,7 @@ open Hlcode
 type value =
 	| VNull
 	| VInt of int32
+	| VInt64 of int64
 	| VFloat of float
 	| VBool of bool
 	| VDyn of value * ttype
@@ -37,13 +38,15 @@ type value =
 	| VRef of ref_value * ttype
 	| VVirtual of vvirtual
 	| VDynObj of vdynobj
-	| VEnum of int * value array
+	| VEnum of enum_proto * int * value array
 	| VAbstract of vabstract
 	| VVarArgs of vfunction * value option
+	| VStruct of vobject
 
 and ref_value =
 	| RStack of int
 	| RValue of value ref
+	| RArray of value array * int
 
 and vabstract =
 	| AHashBytes of (string, value) Hashtbl.t
@@ -119,6 +122,7 @@ type context = {
 let default t =
 	match t with
 	| HUI8 | HUI16 | HI32 -> VInt Int32.zero
+	| HI64 -> VInt64 Int64.zero
 	| HF32 | HF64 -> VFloat 0.
 	| HBool -> VBool false
 	| _ -> if is_nullable t then VNull else VUndef
@@ -132,15 +136,17 @@ let get_type = function
 	| VClosure (f,None) -> Some (match f with FFun f -> f.ftype | FNativeFun (_,_,t) -> t)
 	| VClosure (f,Some _) -> Some (match f with FFun { ftype = HFun(_::args,ret) } | FNativeFun (_,_,HFun(_::args,ret)) -> HFun (args,ret) | _ -> assert false)
 	| VVarArgs _ -> Some (HFun ([],HDyn))
+	| VEnum (e,_,_) -> Some (HEnum e)
 	| _ -> None
 
 let v_dynamic = function
-	| VNull	| VDyn _ | VObj _ | VClosure _ | VArray _ | VVirtual _ | VDynObj _ | VVarArgs _ -> true
+	| VNull	| VDyn _ | VObj _ | VClosure _ | VArray _ | VVirtual _ | VDynObj _ | VVarArgs _ | VEnum _ -> true
 	| _ -> false
 
 let rec is_compatible v t =
 	match v, t with
 	| VInt _, (HUI8 | HUI16 | HI32) -> true
+	| VInt64 _, HI64 -> true
 	| VFloat _, (HF32 | HF64) -> true
 	| VBool _, HBool -> true
 	| _, HVoid -> true
@@ -158,6 +164,7 @@ let rec is_compatible v t =
 	| VRef (_,t1), HRef t2 -> tsame t1 t2
 	| VAbstract _, HAbstract _ -> true
 	| VEnum _, HEnum _ -> true
+	| VStruct v, HStruct _ -> safe_cast (HStruct v.oproto.pclass) t
 	| _ -> false
 
 type cast =
@@ -199,6 +206,10 @@ let alloc_obj ctx t =
 		let obj = VObj { oproto = p; ofields = ftable } in
 		List.iter (fun (fid,mk) -> ftable.(fid) <- mk obj) bindings;
 		obj
+	| HStruct p ->
+		let p, fields, bindings = get_proto ctx p in
+		let ftable = Array.map default fields in
+		VStruct { oproto = p; ofields = ftable }
 	| HVirtual v ->
 		let o = {
 			dfields = Hashtbl.create 0;
@@ -237,13 +248,17 @@ let get_to_string ctx p =
 
 let set_i32 b p v =
 	try
-		String.set b p (char_of_int ((Int32.to_int v) land 0xFF));
-		String.set b (p+1) (char_of_int ((Int32.to_int (Int32.shift_right_logical v 8)) land 0xFF));
-		String.set b (p+2) (char_of_int ((Int32.to_int (Int32.shift_right_logical v 16)) land 0xFF));
-		String.set b (p+3) (char_of_int (Int32.to_int (Int32.shift_right_logical v 24)));
+		Bytes.set (Bytes.unsafe_of_string b) p (char_of_int ((Int32.to_int v) land 0xFF));
+		Bytes.set (Bytes.unsafe_of_string b) (p+1) (char_of_int ((Int32.to_int (Int32.shift_right_logical v 8)) land 0xFF));
+		Bytes.set (Bytes.unsafe_of_string b) (p+2) (char_of_int ((Int32.to_int (Int32.shift_right_logical v 16)) land 0xFF));
+		Bytes.set (Bytes.unsafe_of_string b) (p+3) (char_of_int (Int32.to_int (Int32.shift_right_logical v 24)));
 	with _ ->
 		error "Set outside of bytes bounds"
 
+let set_i64 b p v =
+	set_i32 b p (Int64.to_int32 v);
+	set_i32 b (p + 4) (Int64.to_int32 (Int64.shift_right_logical v 32))
+
 let get_i32 b p =
 	let i = int_of_char (String.get b p) in
 	let j = int_of_char (String.get b (p + 1)) in
@@ -251,6 +266,11 @@ let get_i32 b p =
 	let l = int_of_char (String.get b (p + 3)) in
 	Int32.logor (Int32.of_int (i lor (j lsl 8) lor (k lsl 16))) (Int32.shift_left (Int32.of_int l) 24)
 
+let get_i64 b p =
+	let low = get_i32 b p in
+	let high = get_i32 b (p + 4) in
+	Int64.logor (Int64.logand (Int64.of_int32 low) 0xFFFFFFFFL) (Int64.shift_left (Int64.of_int32 high) 32)
+
 let make_dyn v t =
 	if v = VNull || is_dynamic t then
 		v
@@ -260,17 +280,19 @@ let make_dyn v t =
 let get_ref ctx = function
 	| RStack i -> ctx.stack.(i)
 	| RValue r -> !r
+	| RArray (a,i) -> a.(i)
 
 let set_ref ctx r v =
 	match r with
 	| RStack i -> ctx.stack.(i) <- v
 	| RValue r -> r := v
+	| RArray (a,i) -> a.(i) <- v
 
 let fstr = function
 	| FFun f -> "function@" ^ string_of_int f.findex
 	| FNativeFun (s,_,_) -> "native[" ^ s ^ "]"
 
-let caml_to_hl str = utf8_to_utf16 str
+let caml_to_hl str = Common.utf8_to_utf16 str true
 
 let hash ctx str =
 	let h = hl_hash str in
@@ -295,7 +317,7 @@ let utf16_iter f s =
 	loop 0
 
 let utf16_char buf c =
-	utf16_add buf (int_of_char c)
+	Common.utf16_add buf (int_of_char c)
 
 let hl_to_caml str =
 	let utf16_eof s =
@@ -307,7 +329,7 @@ let hl_to_caml str =
 		loop 0
 	in
 	let b = UTF8.Buf.create (String.length str / 2) in
-	utf16_iter (fun c -> UTF8.Buf.add_char b (UChar.chr c)) (utf16_eof str);
+	utf16_iter (fun c -> UTF8.Buf.add_char b (UCharExt.chr c)) (utf16_eof str);
 	UTF8.Buf.contents b
 
 let null_access() =
@@ -325,11 +347,12 @@ let rec vstr_d ctx v =
 	match v with
 	| VNull -> "null"
 	| VInt i -> Int32.to_string i ^ "i"
+	| VInt64 i -> Int64.to_string i ^ "l"
 	| VFloat f -> string_of_float f ^ "f"
 	| VBool b -> if b then "true" else "false"
 	| VDyn (v,t) -> "dyn(" ^ vstr_d v ^ ":" ^ tstr t ^ ")"
 	| VObj o ->
-		let p = "#" ^ o.oproto.pclass.pname in
+		let p = o.oproto.pclass.pname in
 		(match get_to_string ctx o.oproto.pclass with
 		| Some f -> p ^ ":" ^ vstr_d (ctx.fcall f [v])
 		| None -> p)
@@ -344,9 +367,10 @@ let rec vstr_d ctx v =
 	| VRef (r,_) -> "ref(" ^ vstr_d (get_ref ctx r) ^ ")"
 	| VVirtual v -> "virtual(" ^ vstr_d v.vvalue ^ ")"
 	| VDynObj d -> "dynobj(" ^ String.concat "," (Hashtbl.fold (fun f i acc -> (f^":"^vstr_d d.dvalues.(i)) :: acc) d.dfields []) ^ ")"
-	| VEnum (i,vals) -> "enum#" ^ string_of_int i  ^ "(" ^ String.concat "," (Array.to_list (Array.map vstr_d vals)) ^ ")"
+	| VEnum (e,i,vals) -> let n, _, _ = e.efields.(i) in if Array.length vals = 0 then n else n ^ "(" ^ String.concat "," (Array.to_list (Array.map vstr_d vals)) ^ ")"
 	| VAbstract _ -> "abstract"
 	| VVarArgs _ -> "varargs"
+	| VStruct v -> "@" ^ v.oproto.pclass.pname
 
 let rec to_virtual ctx v vp =
 	match v with
@@ -546,7 +570,7 @@ let rec dyn_get_field ctx obj field rt =
 			get_with d.dvalues.(idx) d.dtypes.(idx)
 		with Not_found ->
 			default rt)
-	| VObj o ->
+	| VObj o | VDyn (VStruct o, HStruct _) ->
 		let default rt =
 			match get_method o.oproto.pclass "__get_field" with
 			| None -> default rt
@@ -648,6 +672,14 @@ let stack_frame ctx (f,pos) =
 	let file, line = make_stack ctx (f,pos) in
 	Printf.sprintf "%s:%d: Called from fun@%d @x%X" file line f.findex (!pos - 1)
 
+let cached_string ctx idx =
+	try
+		Hashtbl.find ctx.cached_strings idx
+	with Not_found ->
+		let s = caml_to_hl ctx.code.strings.(idx) in
+		Hashtbl.add ctx.cached_strings idx s;
+		s
+
 let virt_make_val v =
 	let hfields = Hashtbl.create 0 in
 	let ftypes = DynArray.create() in
@@ -673,13 +705,14 @@ let rec vstr ctx v t =
 	match v with
 	| VNull -> "null"
 	| VInt i -> Int32.to_string i
+	| VInt64 i -> Int64.to_string i
 	| VFloat f -> float_to_string f
 	| VBool b -> if b then "true" else "false"
 	| VDyn (v,t) ->
 		vstr v t
 	| VObj o ->
 		(match get_to_string ctx o.oproto.pclass with
-		| None -> "#" ^ o.oproto.pclass.pname
+		| None -> o.oproto.pclass.pname
 		| Some f -> vstr (ctx.fcall f [v]) HBytes)
 	| VBytes b -> (try hl_to_caml b with _ -> "?" ^ String.escaped b)
 	| VClosure (f,_) -> fstr f
@@ -701,21 +734,18 @@ let rec vstr ctx v t =
 		with Not_found ->
 			"{" ^ String.concat ", " (Hashtbl.fold (fun f i acc -> (f^":"^vstr d.dvalues.(i) d.dtypes.(i)) :: acc) d.dfields []) ^ "}")
 	| VAbstract _ -> "abstract"
-	| VEnum (i,vals) ->
-		(match t with
-		| HEnum e ->
-			let n, _, pl = e.efields.(i) in
-			if Array.length pl = 0 then
-				n
-			else
-				let rec loop i =
-					if i = Array.length pl then []
-					else let v = vals.(i) in vstr v pl.(i) :: loop (i + 1)
-				in
-				n ^ "(" ^ String.concat "," (loop 0) ^ ")"
-		| _ ->
-			assert false)
+	| VEnum (e,i,vals) ->
+		let n, _, pl = e.efields.(i) in
+		if Array.length pl = 0 then
+			n
+		else
+			let rec loop i =
+				if i = Array.length pl then []
+				else let v = vals.(i) in vstr v pl.(i) :: loop (i + 1)
+			in
+			n ^ "(" ^ String.concat "," (loop 0) ^ ")"
 	| VVarArgs _ -> "varargs"
+	| VStruct s -> "@" ^ s.oproto.pclass.pname
 
 let interp ctx f args =
 	let func = get_function ctx in
@@ -742,14 +772,6 @@ let interp ctx f args =
 	let check v t id =
 		if ctx.checked && not (is_compatible v t) then error (Printf.sprintf "Can't set %s(%s) with %s" (id()) (tstr t) (vstr_d ctx v))
 	in
-	let cached_string idx =
-		try
-			Hashtbl.find ctx.cached_strings idx
-		with Not_found ->
-			let s = caml_to_hl ctx.code.strings.(idx) in
-			Hashtbl.add ctx.cached_strings idx s;
-			s
-	in
 	let check_obj v o fid =
 		if ctx.checked then match o with
 		| VObj o ->
@@ -826,8 +848,8 @@ let interp ctx f args =
 		| OMov (a,b) -> set a (get b)
 		| OInt (r,i) -> set r (VInt ctx.code.ints.(i))
 		| OFloat (r,i) -> set r (VFloat (Array.unsafe_get ctx.code.floats i))
-		| OString (r,s) -> set r (VBytes (cached_string s))
-		| OBytes (r,s) -> set r (VBytes (ctx.code.strings.(s) ^ "\x00"))
+		| OString (r,s) -> set r (VBytes (cached_string ctx s))
+		| OBytes (r,s) -> set r (VBytes (Bytes.to_string ctx.code.bytes.(s)))
 		| OBool (r,b) -> set r (VBool b)
 		| ONull r -> set r VNull
 		| OAdd (r,a,b) -> set r (numop Int32.add ( +. ) a b)
@@ -869,19 +891,21 @@ let interp ctx f args =
 		| OJSLte (a,b,i) -> if vcompare a b (<=) then pos := !pos + i
 		| OJULt (a,b,i) -> if ucompare (get a) (get b) < 0 then pos := !pos + i
 		| OJUGte (a,b,i) -> if ucompare (get a) (get b) >= 0 then pos := !pos + i
+		| OJNotLt (a,b,i) -> if not (vcompare a b (<)) then pos := !pos + i
+		| OJNotGte (a,b,i) -> if not (vcompare a b (>=)) then pos := !pos + i
 		| OJEq (a,b,i) -> if vcompare a b (=) then pos := !pos + i
 		| OJNotEq (a,b,i) -> if not (vcompare a b (=)) then pos := !pos + i
 		| OJAlways i -> pos := !pos + i
 		| OToDyn (r,a) -> set r (make_dyn (get a) f.regs.(a))
 		| OToSFloat (r,a) -> set r (match get a with VInt v -> VFloat (Int32.to_float v) | VFloat _ as v -> v | _ -> assert false)
 		| OToUFloat (r,a) -> set r (match get a with VInt v -> VFloat (ufloat v) | VFloat _ as v -> v | _ -> assert false)
-		| OToInt (r,a) -> set r (match get a with VFloat v -> VInt (Int32.of_float v) | VInt _ as v -> v | _ -> assert false)
+		| OToInt (r,a) -> set r (match get a with VFloat v -> VInt (Int32.of_float v) | VInt i when rtype r = HI64 -> VInt64 (Int64.of_int32 i) | VInt _ as v -> v | _ -> assert false)
 		| OLabel _ -> ()
 		| ONew r ->
 			set r (alloc_obj ctx (rtype r))
 		| OField (r,o,fid) ->
 			set r (match get o with
-				| VObj v -> v.ofields.(fid)
+				| VObj v | VStruct v -> v.ofields.(fid)
 				| VVirtual v as obj ->
 					(match v.vindexes.(fid) with
 					| VFNone -> dyn_get_field ctx obj (let n,_,_ = v.vtype.vfields.(fid) in n) (rtype r)
@@ -892,7 +916,7 @@ let interp ctx f args =
 			let rv = get r in
 			let o = get o in
 			(match o with
-			| VObj v ->
+			| VObj v | VStruct v ->
 				check_obj rv o fid;
 				v.ofields.(fid) <- rv
 			| VVirtual v ->
@@ -905,10 +929,10 @@ let interp ctx f args =
 			| VNull -> null_access()
 			| _ -> assert false)
 		| OGetThis (r, fid) ->
-			set r (match get 0 with VObj v -> v.ofields.(fid) | _ -> assert false)
+			set r (match get 0 with VObj v | VStruct v -> v.ofields.(fid) | _ -> assert false)
 		| OSetThis (fid, r) ->
 			(match get 0 with
-			| VObj v as o ->
+			| (VObj v | VStruct v) as o ->
 				let rv = get r in
 				check_obj rv o fid;
 				v.ofields.(fid) <- rv
@@ -953,16 +977,6 @@ let interp ctx f args =
 			let m = (match get o with
 			| VObj v as obj -> VClosure (v.oproto.pmethods.(m), Some obj)
 			| VNull -> null_access()
-			| VVirtual v ->
-				let name, _, _ = v.vtype.vfields.(m) in
-				(match v.vvalue with
-				| VObj o as obj ->
-					(try
-						let m = PMap.find name o.oproto.pclass.pfunctions in
-						VClosure (get_function ctx m, Some obj)
-					with Not_found ->
-						VNull)
-				| _ -> assert false)
 			| _ -> assert false
 			) in
 			set r (if m = VNull then m else dyn_cast ctx m (match get_type m with None -> assert false | Some v -> v) (rtype r))
@@ -982,56 +996,51 @@ let interp ctx f args =
 				let b = int_of_char (String.get b (Int32.to_int p + 1)) in
 				set r (VInt (Int32.of_int (a lor (b lsl 8))))
 			| _ -> assert false)
-		| OGetI32 (r,b,p) ->
-			(match get b, get p with
-			| VBytes b, VInt p -> set r (VInt (get_i32 b (Int32.to_int p)))
-			| _ -> assert false)
-		| OGetF32 (r,b,p) ->
-			(match get b, get p with
-			| VBytes b, VInt p -> set r (VFloat (Int32.float_of_bits (get_i32 b (Int32.to_int p))))
-			| _ -> assert false)
-		| OGetF64 (r,b,p) ->
+		| OGetMem (r,b,p) ->
 			(match get b, get p with
 			| VBytes b, VInt p ->
 				let p = Int32.to_int p in
-				let i64 = Int64.logor (Int64.logand (Int64.of_int32 (get_i32 b p)) 0xFFFFFFFFL) (Int64.shift_left (Int64.of_int32 (get_i32 b (p + 4))) 32) in
-				set r (VFloat (Int64.float_of_bits i64))
-			| _ -> assert false)
+				set r (match rtype r with
+				| HI32 -> VInt (get_i32 b p)
+				| HI64 -> VInt64 (get_i64 b p)
+				| HF32 -> VFloat (Int32.float_of_bits (get_i32 b p))
+				| HF64 -> VFloat (Int64.float_of_bits (get_i64 b p))
+				| _ -> assert false)
+			| _ ->
+				assert false)
 		| OGetArray (r,a,i) ->
 			(match get a, get i with
 			| VArray (a,_), VInt i -> set r a.(Int32.to_int i)
 			| _ -> assert false);
 		| OSetUI8 (r,p,v) ->
 			(match get r, get p, get v with
-			| VBytes b, VInt p, VInt v -> String.set b (Int32.to_int p) (char_of_int ((Int32.to_int v) land 0xFF))
+			| VBytes b, VInt p, VInt v -> Bytes.set (Bytes.unsafe_of_string b) (Int32.to_int p) (char_of_int ((Int32.to_int v) land 0xFF))
 			| _ -> assert false)
 		| OSetUI16 (r,p,v) ->
 			(match get r, get p, get v with
 			| VBytes b, VInt p, VInt v ->
-				String.set b (Int32.to_int p) (char_of_int ((Int32.to_int v) land 0xFF));
-				String.set b (Int32.to_int p + 1) (char_of_int (((Int32.to_int v) lsr 8) land 0xFF))
-			| _ -> assert false)
-		| OSetI32 (r,p,v) ->
-			(match get r, get p, get v with
-			| VBytes b, VInt p, VInt v -> set_i32 b (Int32.to_int p) v
+				Bytes.set (Bytes.unsafe_of_string b) (Int32.to_int p) (char_of_int ((Int32.to_int v) land 0xFF));
+				Bytes.set (Bytes.unsafe_of_string b) (Int32.to_int p + 1) (char_of_int (((Int32.to_int v) lsr 8) land 0xFF))
 			| _ -> assert false)
-		| OSetF32 (r,p,v) ->
-			(match get r, get p, get v with
-			| VBytes b, VInt p, VFloat v -> set_i32 b (Int32.to_int p) (Int32.bits_of_float v)
-			| _ -> assert false)
-		| OSetF64 (r,p,v) ->
-			(match get r, get p, get v with
-			| VBytes b, VInt p, VFloat v ->
+		| OSetMem (r,p,v) ->
+			(match get r, get p with
+			| VBytes b, VInt p ->
 				let p = Int32.to_int p in
-				let v64 = Int64.bits_of_float v in
-				set_i32 b p (Int64.to_int32 v64);
-				set_i32 b (p + 4) (Int64.to_int32 (Int64.shift_right_logical v64 32));
-			| _ -> assert false)
+				(match rtype v, get v with
+				| HI32, VInt v -> set_i32 b p v
+				| HI64, VInt64 v -> set_i64 b p v
+				| HF32, VFloat f -> set_i32 b p (Int32.bits_of_float f)
+				| HF64, VFloat f -> set_i64 b p (Int64.bits_of_float f)
+				| _ -> assert false)
+			| _ ->
+				assert false)
 		| OSetArray (a,i,v) ->
 			(match get a, get i with
 			| VArray (a,t), VInt i ->
 				let v = get v in
 				check v t (fun() -> "array");
+				let idx = Int32.to_int i in
+				if ctx.checked && (idx < 0 || idx >= Array.length a) then error (Printf.sprintf "Can't set array index %d with %s" idx (vstr_d ctx v));
 				a.(Int32.to_int i) <- v
 			| _ -> assert false);
 		| OSafeCast (r, v) ->
@@ -1056,21 +1065,24 @@ let interp ctx f args =
 					| HUI8 -> 1
 					| HUI16 -> 2
 					| HI32 -> 3
-					| HF32 -> 4
-					| HF64 -> 5
-					| HBool -> 6
-					| HBytes -> 7
-					| HDyn -> 8
-					| HFun _ -> 9
-					| HObj _ -> 10
-					| HArray -> 11
-					| HType -> 12
-					| HRef _ -> 13
-					| HVirtual _ -> 14
-					| HDynObj -> 15
-					| HAbstract _ -> 16
-					| HEnum _ -> 17
-					| HNull _ -> 18)))
+					| HI64 -> 4
+					| HF32 -> 5
+					| HF64 -> 6
+					| HBool -> 7
+					| HBytes -> 8
+					| HDyn -> 9
+					| HFun _ -> 10
+					| HObj _ -> 11
+					| HArray -> 12
+					| HType -> 13
+					| HRef _ -> 14
+					| HVirtual _ -> 15
+					| HDynObj -> 16
+					| HAbstract _ -> 17
+					| HEnum _ -> 18
+					| HNull _ -> 19
+					| HMethod _ -> 20
+					| HStruct _ -> 21)))
 				| _ -> assert false);
 		| ORef (r,v) ->
 			set r (VRef (RStack (v + spos),rtype v))
@@ -1092,26 +1104,26 @@ let interp ctx f args =
 		| ODynSet (o,fid,vr) ->
 			dyn_set_field ctx (get o) ctx.code.strings.(fid) (get vr) (rtype vr)
 		| OMakeEnum (r,e,pl) ->
-			set r (VEnum (e,Array.map get (Array.of_list pl)))
+			set r (VEnum ((match rtype r with HEnum e -> e | _ -> assert false),e,Array.map get (Array.of_list pl)))
 		| OEnumAlloc (r,f) ->
 			(match rtype r with
 			| HEnum e ->
 				let _, _, fl = e.efields.(f) in
 				let vl = Array.create (Array.length fl) VUndef in
-				set r (VEnum (f, vl))
+				set r (VEnum (e, f, vl))
 			| _ -> assert false
 			)
 		| OEnumIndex (r,v) ->
 			(match get v with
-			| VEnum (i,_) | VDyn (VEnum (i,_),_) -> set r (VInt (Int32.of_int i))
+			| VEnum (_,i,_) -> set r (VInt (Int32.of_int i))
 			| _ -> assert false)
 		| OEnumField (r, v, _, i) ->
 			(match get v with
-			| VEnum (_,vl) -> set r vl.(i)
+			| VEnum (_,_,vl) -> set r vl.(i)
 			| _ -> assert false)
 		| OSetEnumField (v, i, r) ->
 			(match get v, rtype v with
-			| VEnum (id,vl), HEnum e ->
+			| VEnum (_,id,vl), HEnum e ->
 				let rv = get r in
 				let _, _, fields = e.efields.(id) in
 				check rv fields.(i) (fun() -> "enumfield");
@@ -1130,6 +1142,16 @@ let interp ctx f args =
 			traps := (r,target) :: !traps
 		| OEndTrap _ ->
 			traps := List.tl !traps
+		| OAssert _ ->
+			throw_msg ctx "Assert"
+		| ORefData (r,d) ->
+			(match get d with
+			| VArray (a,t) -> set r (VRef (RArray (a,0),t))
+			| _ -> assert false)
+		| ORefOffset (r,r2,off) ->
+			(match get r2, get off with
+			| VRef (RArray (a,pos),t), VInt i -> set r (VRef (RArray (a,pos + Int32.to_int i),t))
+			| _ -> assert false)
 		| ONop _ ->
 			()
 		);
@@ -1172,8 +1194,11 @@ let call_fun ctx f args =
 			raise (InterpThrow v)
 		| Failure msg ->
 			throw_msg ctx msg
-		| e ->
+		| Sys_exit _ as exc ->
+			raise exc
+(*		| e ->
 			throw_msg ctx (Printexc.to_string e)
+*)
 
 let call_wrap ?(final=(fun()->())) ctx f args =
 	let old_st = ctx.call_stack in
@@ -1226,7 +1251,7 @@ let load_native ctx lib name t =
 		(match name with
 		| "alloc_bytes" ->
 			(function
-			| [VInt i] -> VBytes (String.create (int i))
+			| [VInt i] -> VBytes (Bytes.unsafe_to_string (Bytes.create (int i)))
 			| _ -> assert false)
 		| "alloc_array" ->
 			(function
@@ -1236,7 +1261,7 @@ let load_native ctx lib name t =
 			(function
 			| [VType t] -> alloc_obj ctx t
 			| _ -> assert false)
-		| "alloc_enum" ->
+		| "alloc_enum_dyn" ->
 			(function
 			| [VType (HEnum e); VInt idx; VArray (vl,vt); VInt len] ->
 				let idx = int idx in
@@ -1245,7 +1270,7 @@ let load_native ctx lib name t =
 				if Array.length args <> len then
 					VNull
 				else
-					VDyn (VEnum (idx,Array.mapi (fun i v -> dyn_cast ctx v vt args.(i)) (Array.sub vl 0 len)),HEnum e)
+					VEnum (e,idx,Array.mapi (fun i v -> dyn_cast ctx v vt args.(i)) (Array.sub vl 0 len))
 			| vl ->
 				assert false)
 		| "array_blit" ->
@@ -1257,7 +1282,7 @@ let load_native ctx lib name t =
 		| "bytes_blit" ->
 			(function
 			| [VBytes dst; VInt dp; VBytes src; VInt sp; VInt len] ->
-				String.blit src (int sp) dst (int dp) (int len);
+				String.blit src (int sp) (Bytes.unsafe_of_string dst) (int dp) (int len);
 				VUndef
 			| [(VBytes _ | VNull); VInt _; (VBytes _ | VNull); VInt _; VInt len] ->
 				if len = 0l then VUndef else error "bytes_blit to NULL bytes";
@@ -1327,18 +1352,13 @@ let load_native ctx lib name t =
 			(function
 			| [VBytes str; VInt pos; VInt len] ->
 				(try
-					let i = (match Interp.parse_int (hl_to_caml_sub str (int pos) (int len)) with
-						| Interp.VInt v -> Int32.of_int v
-						| Interp.VInt32 v -> v
-						| _ -> assert false
-					) in
-					VDyn (VInt i,HI32)
+					VDyn (VInt (Numeric.parse_int (hl_to_caml_sub str (int pos) (int len))),HI32)
 				with _ ->
 					VNull)
 			| l -> assert false)
 		| "parse_float" ->
 			(function
-			| [VBytes str; VInt pos; VInt len] -> (try VFloat (Interp.parse_float (hl_to_caml_sub str (int pos) (int len))) with _ -> VFloat nan)
+			| [VBytes str; VInt pos; VInt len] -> (try VFloat (Numeric.parse_float (hl_to_caml_sub str (int pos) (int len))) with _ -> VFloat nan)
 			| _ -> assert false)
 		| "dyn_compare" ->
 			(function
@@ -1595,7 +1615,7 @@ let load_native ctx lib name t =
 			| _ -> assert false)
 		| "enum_parameters" ->
 			(function
-			| [VDyn (VEnum (idx,pl),HEnum e)] ->
+			| [VEnum (e,idx,pl)] ->
 				let _,_, ptypes = e.efields.(idx) in
 				VArray (Array.mapi (fun i v -> make_dyn v ptypes.(i)) pl,HDyn)
 			| _ ->
@@ -1628,18 +1648,18 @@ let load_native ctx lib name t =
 			| _ -> assert false)
 		| "type_enum_values" ->
 			(function
-			| [VType (HEnum e as t)] ->
-				VArray (Array.mapi (fun i (_,_,args) -> if Array.length args <> 0 then VNull else VDyn (VEnum (i,[||]),t)) e.efields,HDyn)
+			| [VType (HEnum e)] ->
+				VArray (Array.mapi (fun i (_,_,args) -> if Array.length args <> 0 then VNull else VEnum (e,i,[||])) e.efields,HDyn)
 			| _ -> assert false)
 		| "type_enum_eq" ->
 			(function
-			| [VDyn (VEnum _, HEnum _); VNull] | [VNull; VDyn (VEnum _, HEnum _)] -> VBool false
+			| [VEnum _; VNull] | [VNull; VEnum _] -> VBool false
 			| [VNull; VNull] -> VBool true
-			| [VDyn (VEnum _ as v1, HEnum e1); VDyn (VEnum _ as v2, HEnum e2)] ->
+			| [VEnum (e1,_,_) as v1; VEnum (e2,_,_) as v2] ->
 				let rec loop v1 v2 e =
 					match v1, v2 with
-					| VEnum (t1,_), VEnum (t2,_) when t1 <> t2 -> false
-					| VEnum (t,vl1), VEnum (_,vl2) ->
+					| VEnum (_,t1,_), VEnum (_,t2,_) when t1 <> t2 -> false
+					| VEnum (_,t,vl1), VEnum (_,_,vl2) ->
 						let _, _, pl = e.efields.(t) in
 						let rec chk i =
 							if i = Array.length pl then true
@@ -1753,9 +1773,9 @@ let load_native ctx lib name t =
 						if c >= int_of_char 'a' && c <= int_of_char 'z' then c + int_of_char 'A' - int_of_char 'a'
 						else c
 					in
-					utf16_add buf c
+					Common.utf16_add buf c
 				) (String.sub s (int pos) ((int len) lsl 1));
-				utf16_add buf 0;
+				Common.utf16_add buf 0;
 				VBytes (Buffer.contents buf)
 			| _ -> assert false)
 		| "ucs2_lower" ->
@@ -1767,9 +1787,9 @@ let load_native ctx lib name t =
 						if c >= int_of_char 'A' && c <= int_of_char 'Z' then c + int_of_char 'a' - int_of_char 'A'
 						else c
 					in
-					utf16_add buf c
+					Common.utf16_add buf c
 				) (String.sub s (int pos) ((int len) lsl 1));
-				utf16_add buf 0;
+				Common.utf16_add buf 0;
 				VBytes (Buffer.contents buf)
 			| _ -> assert false)
 		| "url_encode" ->
@@ -1777,18 +1797,8 @@ let load_native ctx lib name t =
 			| [VBytes s; VRef (r, HI32)] ->
 				let s = hl_to_caml s in
 				let buf = Buffer.create 0 in
-				let hex = "0123456789ABCDEF" in
-				for i = 0 to String.length s - 1 do
-					let c = String.unsafe_get s i in
-					match c with
-					| 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '-' | '.' ->
-						utf16_char buf c
-					| _ ->
-						utf16_char buf '%';
-						utf16_char buf (String.unsafe_get hex (int_of_char c lsr 4));
-						utf16_char buf (String.unsafe_get hex (int_of_char c land 0xF));
-				done;
-				utf16_add buf 0;
+				Common.url_encode s (utf16_char buf);
+				Common.utf16_add buf 0;
 				let str = Buffer.contents buf in
 				set_ref r (to_int (String.length str lsr 1 - 1));
 				VBytes str
@@ -1857,10 +1867,14 @@ let load_native ctx lib name t =
 			(function
 			| [VBytes a; VInt apos; VBytes b; VInt bpos; VInt len] -> to_int (String.compare (String.sub a (int apos) (int len)) (String.sub b (int bpos) (int len)))
 			| _ -> assert false)
+		| "string_compare" ->
+			(function
+			| [VBytes a; VBytes b; VInt len] -> to_int (String.compare (String.sub a 0 ((int len) * 2)) (String.sub b 0 ((int len)*2)))
+			| _ -> assert false)
 		| "bytes_fill" ->
 			(function
 			| [VBytes a; VInt pos; VInt len; VInt v] ->
-				String.fill a (int pos) (int len) (char_of_int ((int v) land 0xFF));
+				Bytes.fill (Bytes.unsafe_of_string a) (int pos) (int len) (char_of_int ((int v) land 0xFF));
 				VUndef
 			| _ -> assert false)
 		| "exception_stack" ->
@@ -2026,6 +2040,54 @@ let load_native ctx lib name t =
 			| [VBytes file;VInt min;VInt max] ->
 				VAbstract (APos { Globals.pfile = String.sub file 0 (String.length file - 1); pmin = Int32.to_int min; pmax = Int32.to_int max })
 			| _ -> assert false)
+		| "dyn_op" ->
+			let op_names = [|"+";"-";"*";"%";"/";"<<";">>";">>>";"&";"|";"^"|] in
+			(function
+			| [VInt op; a; b] ->
+				let op = Int32.to_int op in
+				let is_number v =
+					match v with
+					| VNull -> true
+					| VDyn (_,t) -> is_number t
+					| _ -> false
+				in
+				let error() =
+					failwith ("Can't perform dyn op " ^ vstr ctx a HDyn ^ " " ^ op_names.(op) ^ " " ^ vstr ctx b HDyn)
+				in
+				let fop op =
+					if is_number a && is_number b then begin
+						let a = dyn_cast ctx a HDyn HF64 in
+						let b = dyn_cast ctx b HDyn HF64 in
+						match a, b with
+						| VFloat a, VFloat b -> VDyn (VFloat (op a b),HF64)
+						| _ -> assert false
+					end else
+						error();
+				in
+				let iop op =
+					if is_number a && is_number b then begin
+						let a = dyn_cast ctx a HDyn HI32 in
+						let b = dyn_cast ctx b HDyn HI32 in
+						match a, b with
+						| VInt a, VInt b -> VDyn (VInt (op a b),HI32)
+						| _ -> assert false
+					end else
+						error();
+				in
+				(match op with
+				| 0 -> fop ( +. )
+				| 1 -> fop ( -. )
+				| 2 -> fop ( *. )
+				| 3 -> fop mod_float
+				| 4 -> fop ( /. )
+				| 5 -> iop (fun a b -> Int32.shift_left a (Int32.to_int b))
+				| 6 -> iop (fun a b -> Int32.shift_right a (Int32.to_int b))
+				| 7 -> iop (fun a b -> Int32.shift_right_logical a (Int32.to_int b))
+				| 8 -> iop Int32.logand
+				| 9 -> iop Int32.logor
+				| 10 -> iop Int32.logxor
+				| _ -> assert false)
+			| _ -> assert false)
 		| _ ->
 			unresolved())
 	| "macro" ->
@@ -2053,11 +2115,13 @@ let create checked =
 			globals = [||];
 			natives = [||];
 			strings = [||];
+			bytes = [||];
 			ints = [||];
 			debugfiles = [||];
 			floats = [||];
 			entrypoint = 0;
 			version = 0;
+			constants = [||];
 		};
 		checked = checked;
 		fcall = (fun _ _ -> assert false);
@@ -2096,9 +2160,29 @@ let add_code ctx code =
 		functions.(fd.findex) <- FFun fd;
 		loop (i + 1)
 	in
-	loop  (Array.length ctx.code.functions);
+	loop (Array.length ctx.code.functions);
 	ctx.t_functions <- functions;
 	ctx.code <- code;
+	Array.iter (fun (g,fields) ->
+		let t = code.globals.(g) in
+		let get_const_val t idx =
+			match t with
+			| HI32 -> VInt code.ints.(idx)
+			| HBytes -> VBytes (cached_string ctx idx)
+			| _ -> assert false
+		in
+		let v = (match t with
+		| HObj o ->
+			if Array.length o.pfields <> Array.length fields then assert false;
+			let proto,_,_ = get_proto ctx o in
+			VObj {
+				oproto = proto;
+				ofields = Array.mapi (fun i (_,_,t) -> get_const_val t fields.(i)) o.pfields;
+			}
+		| _ -> assert false
+		) in
+		ctx.t_globals.(g) <- v;
+	) code.constants;
 	(* call entrypoint *)
 	ignore(call_wrap ctx functions.(code.entrypoint) [])
 
@@ -2138,12 +2222,12 @@ let check code macros =
 		in
 		let numeric r =
 			match rtype r with
-			| HUI8 | HUI16 | HI32 | HF32 | HF64 -> ()
+			| HUI8 | HUI16 | HI32 | HI64 | HF32 | HF64 -> ()
 			| _ -> error (reg_inf r ^ " should be numeric")
 		in
 		let int r =
 			match rtype r with
-			| HUI8 | HUI16 | HI32 -> ()
+			| HUI8 | HUI16 | HI32 | HI64 -> ()
 			| _ -> error (reg_inf r ^ " should be integral")
 		in
 		let float r =
@@ -2176,11 +2260,16 @@ let check code macros =
 		let is_dyn r =
 			if not (is_dynamic (rtype r)) then error (reg_inf r ^ " should be castable to dynamic")
 		in
+		let get_field r p fid =
+			try snd (resolve_field p fid) with Not_found -> error (reg_inf r ^ " does not have field " ^ string_of_int fid)
+		in
 		let tfield o fid proto =
 			if fid < 0 then error (reg_inf o ^ " does not have " ^ (if proto then "proto " else "") ^ "field " ^ string_of_int fid);
 			match rtype o with
 			| HObj p ->
-				if proto then ftypes.(p.pvirtuals.(fid)) else (try snd (resolve_field p fid) with Not_found -> error (reg_inf o ^ " does not have field " ^ string_of_int fid))
+				if proto then ftypes.(p.pvirtuals.(fid)) else get_field o p fid
+			| HStruct p when not proto ->
+				get_field o p fid
 			| HVirtual v when not proto ->
 				let _,_, t = v.vfields.(fid) in
 				t
@@ -2202,9 +2291,12 @@ let check code macros =
 				if i < 0 || i >= Array.length code.floats then error "float outside range";
 			| OBool (r,_) ->
 				reg r HBool
-			| OString (r,i) | OBytes (r,i) ->
+			| OString (r,i) ->
 				reg r HBytes;
 				if i < 0 || i >= Array.length code.strings then error "string outside range";
+			| OBytes (r,i) ->
+				reg r HBytes;
+				if i < 0 || i >= Array.length code.bytes then error "bytes outside range";
 			| ONull r ->
 				let t = rtype r in
 				if not (is_nullable t) then error (tstr t ^ " is not nullable")
@@ -2246,16 +2338,24 @@ let check code macros =
 				(match rl with
 				| [] -> assert false
 				| obj :: rl2 ->
-					let t, rl = (match rtype obj with
-						| HVirtual v ->
-							let _, _, t = v.vfields.(m) in
-							t, rl2
-						| _ ->
-							tfield obj m true, rl
-					) in
-					match t with
-					| HFun (targs, tret) when List.length targs = List.length rl -> List.iter2 reg rl targs; check tret (rtype r)
-					| t -> check t (HFun (List.map rtype rl, rtype r)))
+					let check_args targs tret rl =
+						if List.length targs <> List.length rl then false else begin
+							List.iter2 reg rl targs;
+							check tret (rtype r);
+							true;
+						end
+					in
+					match rtype obj with
+					| HVirtual v ->
+						let _, _, t = v.vfields.(m) in
+						(match t with
+						| HMethod (args,ret) when check_args args ret rl2 -> ()
+						| _ -> check t (HMethod (List.map rtype rl, rtype r)))
+					| _ ->
+						let t = tfield obj m true in
+						match t with
+						| HFun (args, ret) when check_args args ret rl -> ()
+						| _ -> check t (HFun (List.map rtype rl, rtype r)))
 			| OCallClosure (r,f,rl) ->
 				(match rtype f with
 				| HFun (targs,tret) when List.length targs = List.length rl -> List.iter2 reg rl targs; check tret (rtype r)
@@ -2271,14 +2371,15 @@ let check code macros =
 				reg r HBool;
 				can_jump delta
 			| OJNull (r,delta) | OJNotNull (r,delta) ->
-				ignore(rtype r);
+				if not (is_nullable (rtype r)) then reg r HDyn;
 				can_jump delta
-			| OJUGte (a,b,delta) | OJULt (a,b,delta) | OJSGte (a,b,delta) | OJSLt (a,b,delta) | OJSGt (a,b,delta) | OJSLte (a,b,delta) ->
+			| OJUGte (a,b,delta) | OJULt (a,b,delta) | OJSGte (a,b,delta) | OJSLt (a,b,delta) | OJSGt (a,b,delta) | OJSLte (a,b,delta) | OJNotLt (a,b,delta) | OJNotGte (a,b,delta) ->
 				if not (safe_cast (rtype a) (rtype b)) then reg b (rtype a);
 				can_jump delta
 			| OJEq (a,b,delta) | OJNotEq (a,b,delta) ->
 				(match rtype a, rtype b with
 				| (HObj _ | HVirtual _), (HObj _ | HVirtual _) -> ()
+				| (HDyn | HFun _), (HDyn | HFun _) -> ()
 				| ta, tb when safe_cast tb ta -> ()
 				| _ -> reg a (rtype b));
 				can_jump delta
@@ -2298,7 +2399,7 @@ let check code macros =
 				()
 			| ONew r ->
 				(match rtype r with
-				| HDynObj | HVirtual _ -> ()
+				| HDynObj | HVirtual _ | HStruct _ -> ()
 				| _ -> is_obj r)
 			| OField (r,o,fid) ->
 				check (tfield o fid false) (rtype r)
@@ -2319,9 +2420,6 @@ let check code macros =
 						reg r (HFun (tl,tret));
 					| _ ->
 						assert false)
-				| HVirtual v ->
-					let _,_, t = v.vfields.(fid) in
-					reg r t;
 				| _ ->
 					is_obj o)
 			| OInstanceClosure (r,f,arg) ->
@@ -2339,30 +2437,22 @@ let check code macros =
 				reg a HArray;
 				reg i HI32;
 				ignore(rtype v);
-			| OGetUI8 (r,b,p) | OGetI32 (r,b,p) | OGetUI16(r,b,p) ->
+			| OGetUI8 (r,b,p) | OGetUI16(r,b,p) ->
 				reg r HI32;
 				reg b HBytes;
 				reg p HI32;
-			| OGetF32 (r,b,p) ->
-				reg r HF32;
-				reg b HBytes;
-				reg p HI32;
-			| OGetF64 (r,b,p) ->
-				reg r HF64;
+			| OGetMem (r,b,p) ->
+				(match rtype r with HI32 | HI64 | HF32 | HF64 -> () | _ -> error (reg_inf r ^ " should be numeric"));
 				reg b HBytes;
 				reg p HI32;
-			| OSetUI8 (r,p,v) | OSetI32 (r,p,v) | OSetUI16 (r,p,v) ->
+			| OSetUI8 (r,p,v) | OSetUI16 (r,p,v) ->
 				reg r HBytes;
 				reg p HI32;
 				reg v HI32;
-			| OSetF32 (r,p,v) ->
+			| OSetMem (r,p,v) ->
 				reg r HBytes;
 				reg p HI32;
-				reg v HF32;
-			| OSetF64 (r,p,v) ->
-				reg r HBytes;
-				reg p HI32;
-				reg v HF64;
+				(match rtype v with HI32 | HI64 | HF32 | HF64 -> () | _ -> error (reg_inf r ^ " should be numeric"));
 			| OSetArray (a,i,v) ->
 				reg a HArray;
 				reg i HI32;
@@ -2444,6 +2534,15 @@ let check code macros =
 				can_jump idx
 			| OEndTrap _ ->
 				()
+			| OAssert _ ->
+				()
+			| ORefData (r,d) ->
+				reg d HArray;
+				(match rtype r with HRef _ -> () | _ -> reg r (HRef HDyn))
+			| ORefOffset (r,r2,off) ->
+				(match rtype r2 with HRef _ -> () | _ -> reg r2 (HRef HDyn));
+				reg r (rtype r2);
+				reg off HI32;
 			| ONop _ ->
 				()
 		) f.code
@@ -2464,6 +2563,7 @@ let check code macros =
 	Array.iter check_fun code.functions
 
 (* ------------------------------- SPEC ---------------------------------------------- *)
+(*
 
 open Hlopt
 
@@ -2473,6 +2573,7 @@ type svalue =
 	| SInt of int32
 	| SFloat of float
 	| SString of string
+	| SBytes of int
 	| SBool of bool
 	| SNull
 	| SType of ttype
@@ -2528,6 +2629,7 @@ let rec svalue_string v =
 	| SInt i -> Int32.to_string i
 	| SFloat f -> string_of_float f
 	| SString s -> "\"" ^ s ^ "\""
+	| SBytes i -> "bytes$" ^ string_of_int i
 	| SBool b -> if b then "true" else "false"
 	| SNull -> "null"
 	| SRef _ -> "ref"
@@ -2553,7 +2655,7 @@ let rec svalue_string v =
 	| SDelayed (str,_) -> str
 
 let svalue_iter f = function
-	| SUndef | SArg _ | SInt _ | SFloat _ | SString _ | SBool _ | SNull | SType _ | SResult _
+	| SUndef | SArg _ | SInt _ | SFloat _ | SBytes _ | SString _ | SBool _ | SNull | SType _ | SResult _
 	| SFun (_,None) | SGlobal _ | SRef _ | SRefResult _ | SUnreach | SExc | SDelayed _ ->
 		()
 	| SOp (_,a,b) | SMem (a,b,_) -> f a; f b
@@ -2734,7 +2836,8 @@ let make_spec (code:code) (f:fundecl) =
 			| OInt (d,i) -> args.(d) <- SInt code.ints.(i)
 			| OFloat (d,f) -> args.(d) <- SFloat code.floats.(f)
 			| OBool (d,b) -> args.(d) <- SBool b
-			| OBytes (d,s) | OString (d,s) -> args.(d) <- SString code.strings.(s)
+			| OString (d,s) -> args.(d) <- SString code.strings.(s)
+			| OBytes (d,s) -> args.(d) <- SBytes s
 			| ONull d -> args.(d) <- SNull
 			| OAdd (d,a,b) -> args.(d) <- SOp ("+",args.(a),args.(b))
 			| OSub (d,a,b) -> args.(d) <- SOp ("-",args.(a),args.(b))
@@ -2781,8 +2884,10 @@ let make_spec (code:code) (f:fundecl) =
 			| OJSGte (a,b,_) -> semit (SJComp (">=",args.(a),args.(b)))
 			| OJSGt (a,b,_) -> semit (SJComp (">",args.(a),args.(b)))
 			| OJSLte (a,b,_) -> semit (SJComp ("<=",args.(a),args.(b)))
-			| OJULt (a,b,_) -> semit (SJComp ("<!",args.(a),args.(b)))
-			| OJUGte (a,b,_) -> semit (SJComp (">=!",args.(a),args.(b)))
+			| OJULt (a,b,_) -> semit (SJComp ("<U",args.(a),args.(b)))
+			| OJUGte (a,b,_) -> semit (SJComp (">=U",args.(a),args.(b)))
+			| OJNotLt (a,b,_) -> semit (SJComp ("not<",args.(a),args.(b)))
+			| OJNotGte (a,b,_) -> semit (SJComp ("not>=",args.(a),args.(b)))
 			| OJEq (a,b,_) -> semit (SJComp ("==",args.(a),args.(b)))
 			| OJNotEq (a,b,_) -> semit (SJComp ("!=",args.(a),args.(b)))
 			| OJAlways _ -> semit SJump
@@ -2805,15 +2910,11 @@ let make_spec (code:code) (f:fundecl) =
 			| OTrap _ | OEndTrap _ -> ()
 			| OGetUI8 (d,b,i) -> args.(d) <- SMem (args.(b),args.(i),HUI8)
 			| OGetUI16 (d,b,i) -> args.(d) <- SMem (args.(b),args.(i),HUI16)
-			| OGetI32 (d,b,i) -> args.(d) <- SMem (args.(b),args.(i),HI32)
-			| OGetF32 (d,b,i) -> args.(d) <- SMem (args.(b),args.(i),HF32)
-			| OGetF64 (d,b,i) -> args.(d) <- SMem (args.(b),args.(i),HF64)
+			| OGetMem (d,b,i) -> args.(d) <- SMem (args.(b),args.(i),f.regs.(d))
 			| OGetArray (d,b,i) -> args.(d) <- SMem (args.(b),args.(i),HArray)
 			| OSetUI8 (b,i,v) -> semit (SWriteMem (args.(b),args.(i),args.(v),HUI8))
 			| OSetUI16 (b,i,v) -> semit (SWriteMem (args.(b),args.(i),args.(v),HUI16))
-			| OSetI32 (b,i,v) -> semit (SWriteMem (args.(b),args.(i),args.(v),HI32))
-			| OSetF32 (b,i,v) -> semit (SWriteMem (args.(b),args.(i),args.(v),HF32))
-			| OSetF64 (b,i,v) -> semit (SWriteMem (args.(b),args.(i),args.(v),HF64))
+			| OSetMem (b,i,v) -> semit (SWriteMem (args.(b),args.(i),args.(v),f.regs.(v)))
 			| OSetArray (b,i,v) -> semit (SWriteMem (args.(b),args.(i),args.(v),HArray))
 			| ONew d ->
 				incr alloc_count;
@@ -2837,6 +2938,7 @@ let make_spec (code:code) (f:fundecl) =
 			| OEnumIndex (d,r) -> args.(d) <- SConv ("index",args.(r))
 			| OEnumField (d,r,fid,cid) -> args.(d) <- SEnumField (args.(r),fid,cid)
 			| OSetEnumField (e,fid,r) -> semit (SSetEnumField (args.(e),fid,args.(r)))
+			| OAssert _  -> ()
 			| ONop _ -> ()
 		done;
 		Hashtbl.add block_args b.bstart args
@@ -2851,3 +2953,4 @@ let make_spec (code:code) (f:fundecl) =
 	in
 	loop 0;
 	List.rev !out_spec
+*)
diff --git a/src/generators/hlopt.ml b/src/generators/hlopt.ml
index 66ee3f78428ba458542ac8332c97d759de18cefb..7e18cf384e49514db14503fca95dbf2241a6b3bb 100644
--- a/src/generators/hlopt.ml
+++ b/src/generators/hlopt.ml
@@ -1,5 +1,5 @@
 (*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 open Hlcode
 
 module ISet = Set.Make(struct
-	let compare = Pervasives.compare
+	let compare a b = b - a
 	type t = int
 end)
 
@@ -61,7 +61,7 @@ type control =
 
 let control = function
 	| OJTrue (_,d) | OJFalse (_,d) | OJNull (_,d) | OJNotNull (_,d)
-	| OJSLt (_,_,d) | OJSGte (_,_,d) | OJSGt (_,_,d) | OJSLte (_,_,d) | OJULt (_,_,d) | OJUGte (_,_,d) | OJEq (_,_,d) | OJNotEq (_,_,d) ->
+	| OJSLt (_,_,d) | OJSGte (_,_,d) | OJSGt (_,_,d) | OJSLte (_,_,d) | OJULt (_,_,d) | OJUGte (_,_,d) | OJEq (_,_,d) | OJNotEq (_,_,d) | OJNotLt (_,_,d) | OJNotGte (_,_,d) ->
 		CJCond d
 	| OJAlways d ->
 		CJAlways d
@@ -121,7 +121,7 @@ let opcode_fx frw op =
 		read a
 	| OJTrue (r,_) | OJFalse (r,_) | OJNull (r,_) | OJNotNull (r,_) ->
 		read r
-	| OJSLt (a,b,_) | OJSGte (a,b,_) | OJSGt (a,b,_) | OJSLte (a,b,_) | OJULt (a,b,_) | OJUGte (a,b,_) | OJEq (a,b,_) | OJNotEq (a,b,_) ->
+	| OJSLt (a,b,_) | OJSGte (a,b,_) | OJSGt (a,b,_) | OJSLte (a,b,_) | OJULt (a,b,_) | OJUGte (a,b,_) | OJNotLt (a,b,_) | OJNotGte (a,b,_) | OJEq (a,b,_) | OJNotEq (a,b,_) ->
 		read a; read b;
 	| OJAlways _ | OLabel _ ->
 		()
@@ -133,15 +133,19 @@ let opcode_fx frw op =
 		write r
 	| OEndTrap _ ->
 		() (* ??? *)
-	| OGetUI8 (d,a,b) | OGetUI16 (d,a,b) | OGetI32 (d,a,b) | OGetF32 (d,a,b) | OGetF64 (d,a,b) | OGetArray (d,a,b) ->
+	| OGetUI8 (d,a,b) | OGetUI16 (d,a,b) | OGetMem (d,a,b) | OGetArray (d,a,b) ->
 		read a; read b; write d
-	| OSetUI8 (a,b,c) | OSetUI16 (a,b,c) | OSetI32 (a,b,c) | OSetF32 (a,b,c) | OSetF64 (a,b,c) | OSetArray (a,b,c) ->
+	| OSetUI8 (a,b,c) | OSetUI16 (a,b,c) | OSetMem (a,b,c) | OSetArray (a,b,c) ->
 		read a; read b; read c
 	| ONew d ->
 		write d
-	| OArraySize (d, a)	| OGetType (d,a) | OGetTID (d,a) | ORef (d, a) | OUnref (d,a) | OSetref (d, a) | OEnumIndex (d, a) | OEnumField (d,a,_,_) ->
+	| OArraySize (d, a)	| OGetType (d,a) | OGetTID (d,a) | OUnref (d,a) | OSetref (d, a) | OEnumIndex (d, a) | OEnumField (d,a,_,_) ->
 		read a;
 		write d
+	| ORef (d, a) ->
+		read a;
+		write a; (* prevent issue with 'a' being reused later - this is not exact as it can be set everytime we pass it to a function *)
+		write d;
 	| OType (d,_) | OEnumAlloc (d,_) ->
 		write d
 	| OMakeEnum (d,_,rl) ->
@@ -149,7 +153,16 @@ let opcode_fx frw op =
 		write d
 	| OSetEnumField (a,_,b) ->
 		read a; read b
-	| ONop _ ->
+	| OAssert _ ->
+		()
+	| ORefData (r,d) ->
+		read d;
+		write r;
+	| ORefOffset (r,r2,off) ->
+		read r2;
+		read off;
+		write r;
+	| ONop _  ->
 		()
 
 let opcode_eq a b =
@@ -304,6 +317,10 @@ let opcode_map read write op =
 		OJULt (read a, read b, d)
 	| OJUGte (a,b,d) ->
 		OJUGte (read a, read b, d)
+	| OJNotLt (a,b,d) ->
+		OJNotLt (read a, read b, d)
+	| OJNotGte (a,b,d) ->
+		OJNotGte (read a, read b, d)
 	| OJEq (a,b,d) ->
 		OJEq (read a, read b, d)
 	| OJNotEq (a,b,d) ->
@@ -351,15 +368,9 @@ let opcode_map read write op =
 	| OGetUI16 (d,a,b) ->
 		let a = read a and b = read b in
 		OGetUI16 (write d, a, b)
-	| OGetI32 (d,a,b) ->
+	| OGetMem (d,a,b) ->
 		let a = read a and b = read b in
-		OGetI32 (write d, a, b)
-	| OGetF32 (d,a,b) ->
-		let a = read a and b = read b in
-		OGetF32 (write d, a, b)
-	| OGetF64 (d,a,b) ->
-		let a = read a and b = read b in
-		OGetF64 (write d, a, b)
+		OGetMem (write d, a, b)
 	| OGetArray (d,a,b) ->
 		let a = read a and b = read b in
 		OGetArray (write d, a, b)
@@ -369,15 +380,9 @@ let opcode_map read write op =
 	| OSetUI16 (a,b,c) ->
 		let a = read a and b = read b and c = read c in
 		OSetUI16 (a, b, c)
-	| OSetI32 (a,b,c) ->
-		let a = read a and b = read b and c = read c in
-		OSetI32 (a, b, c)
-	| OSetF32 (a,b,c) ->
+	| OSetMem (a,b,c) ->
 		let a = read a and b = read b and c = read c in
-		OSetF32 (a, b, c)
-	| OSetF64 (a,b,c) ->
-		let a = read a and b = read b and c = read c in
-		OSetF64 (a, b, c)
+		OSetMem (a, b, c)
 	| OSetArray (a,b,c) ->
 		let a = read a and b = read b and c = read c in
 		OSetArray (a, b, c)
@@ -416,6 +421,15 @@ let opcode_map read write op =
 		OMakeEnum (write d, e, rl)
 	| OSetEnumField (a,f,b) ->
 		OSetEnumField (read a, f, read b)
+	| OAssert _ ->
+		op
+	| ORefData (r,d) ->
+		let d = read d in
+		ORefData(write r,d);
+	| ORefOffset (r,r2,off) ->
+		let r2 = read r2 in
+		let off = read off in
+		ORefOffset (write r,r2,off);
 	| ONop _ ->
 		op
 
@@ -478,14 +492,221 @@ let code_graph (f:fundecl) =
 	in
 	blocks_pos, make_block 0
 
-let optimize dump (f:fundecl) =
+type rctx = {
+	r_root : block;
+	r_used_regs : int;
+	r_nop_count : int;
+	r_blocks_pos : (int, block) Hashtbl.t;
+	r_reg_moved : (int, (int * int)) Hashtbl.t;
+	r_live_bits : int array;
+	r_reg_map : int array;
+}
+
+let remap_fun ctx f dump get_str old_code =
+	let op index = Array.unsafe_get f.code index in
+	let nregs = Array.length f.regs in
+	let reg_remap = ctx.r_used_regs <> nregs in
+	let assigns = ref f.assigns in
+	let write str = match dump with None -> () | Some ch -> IO.nwrite ch (Bytes.unsafe_of_string (str ^ "\n")) in
+	let nargs = (match f.ftype with HFun (args,_) -> List.length args | _ -> assert false) in
+
+	let live_bits = ctx.r_live_bits in
+	let reg_map = ctx.r_reg_map in
+
+	let bit_regs = 30 in
+	let stride = (nregs + bit_regs - 1) / bit_regs in
+	let is_live r i =
+		let offset = r / bit_regs in
+		let mask = 1 lsl (r - offset * bit_regs) in
+		Array.unsafe_get live_bits (i * stride + offset) land mask <> 0
+	in
+
+	(* remap assigns *)
+	if ctx.r_nop_count > 0 then begin
+		let rec resolve_block p =
+			try Hashtbl.find ctx.r_blocks_pos p with Not_found -> resolve_block (p - 1)
+		in
+
+		let new_assigns = List.fold_left (fun acc (i,p) ->
+			let gmap = Hashtbl.create 0 in
+			(*
+				For a given assign at position p, that's been optimized out,
+				let's try to find where the last assign that maps to the same value
+				is, and remap the variable name to it
+			*)
+			let rec loop p =
+				if p < 0 || (match op p with ONop _ -> false | _ -> true) then [(i,p)] else
+				let reg, last_w = try Hashtbl.find ctx.r_reg_moved p with Not_found -> (-1,-1) in
+				if reg < 0 then [] (* ? *) else
+				if reg < nargs then [(i,-reg-1)] else
+				let b = resolve_block p in
+				if last_w >= b.bstart && last_w < b.bend && last_w < p then loop last_w else
+				let wp = try PMap.find reg b.bwrite with Not_found -> -1 in
+				let rec gather b =
+					if Hashtbl.mem gmap b.bstart then [] else begin
+						Hashtbl.add gmap b.bstart ();
+						(* lookup in all parent blocks, recursively, to fetch all last writes *)
+						List.fold_left (fun acc bp ->
+							if bp.bstart > b.bstart then acc else
+							try
+								let wp = PMap.find reg bp.bwrite in
+								if wp > p then assert false;
+								loop wp @ acc
+							with Not_found ->
+								gather bp @ acc
+						) [] b.bprev;
+					end
+				in
+				if wp < 0 then
+					gather b
+				else if wp < p then
+					loop wp
+				else
+					(* lookup in writes between p-1 and block bstart *)
+					let rec find_w p =
+						if p < b.bstart then
+							gather b
+						else
+							let found = ref false in
+							opcode_fx (fun r read -> if r = reg && not read then found := true) (Array.unsafe_get old_code p);
+							if !found then loop p else find_w (p - 1)
+					in
+					find_w (p - 1)
+			in
+			loop p @ acc
+		) [] (Array.to_list !assigns) in
+		let new_assigns = List.sort (fun (_,p1) (_,p2) -> p1 - p2) (List.rev new_assigns) in
+		assigns := Array.of_list new_assigns;
+	end;
+
+	(* done *)
+	if dump <> None then begin
+		let old_assigns = Hashtbl.create 0 in
+		let new_assigns = Hashtbl.create 0 in
+		Array.iter (fun (var,pos) -> if pos >= 0 then Hashtbl.replace old_assigns pos var) f.assigns;
+		Array.iter (fun (var,pos) ->
+			if pos >= 0 then begin
+				let f = try Hashtbl.find new_assigns pos with Not_found -> let v = ref [] in Hashtbl.add new_assigns pos v; v in
+				f := var :: !f;
+			end
+		) !assigns;
+		let rec loop i block =
+			if i = Array.length f.code then () else
+			let block = try
+				let b = Hashtbl.find ctx.r_blocks_pos i in
+				write (Printf.sprintf "\t----- [%s] (%X)"
+					(String.concat "," (List.map (fun b -> Printf.sprintf "%X" b.bstart) b.bnext))
+					b.bend
+				);
+				let need = String.concat "," (List.map string_of_int (ISet.elements b.bneed)) in
+				let wr = String.concat " " (List.rev (PMap.foldi (fun r p acc -> Printf.sprintf "%d@%X" r p :: acc) b.bwrite [])) in
+				write ("\t" ^ (if b.bloop then "LOOP " else "") ^ "NEED=" ^ need ^ "\tWRITE=" ^ wr);
+				b
+			with Not_found ->
+				block
+			in
+			let old = Array.unsafe_get old_code i in
+			let op = op i in
+			let rec live_loop r l =
+				if r = nregs then List.rev l else
+				live_loop (r + 1) (if is_live r i then r :: l else l)
+			in
+			let live = "LIVE=" ^ String.concat "," (List.map string_of_int (live_loop 0 [])) in
+			let var_set = (try let v = Hashtbl.find old_assigns i in "set " ^ get_str v with Not_found -> "") in
+			let nvar_set = (try let v = Hashtbl.find new_assigns i in "set " ^ String.concat "," (List.map get_str !v) with Not_found -> "") in
+			write (Printf.sprintf "\t@%-3X %-20s %-20s %-20s %-20s %s" i (ostr string_of_int old) (if opcode_eq old op then "" else ostr string_of_int op) var_set nvar_set live);
+			loop (i + 1) block
+		in
+		write (Printf.sprintf "%s@%d" (fundecl_name f) f.findex);
+		let rec loop_arg = function
+			| [] -> []
+			| (_,p) :: _ when p >= 0 -> []
+			| (str,p) :: l -> (get_str str ^ ":" ^ string_of_int p) :: loop_arg l
+		in
+		write (Printf.sprintf "ARGS = %s\n" (String.concat ", " (loop_arg (Array.to_list f.assigns))));
+		if reg_remap then begin
+			for i=0 to nregs-1 do
+				write (Printf.sprintf "\tr%-2d %-10s%s" i (tstr f.regs.(i)) (if ctx.r_reg_map.(i) < 0 then " unused" else if ctx.r_reg_map.(i) = i then "" else Printf.sprintf " r%-2d" ctx.r_reg_map.(i)))
+			done;
+		end;
+		loop 0 ctx.r_root;
+		write "";
+		write "";
+		(match dump with None -> () | Some ch -> IO.flush ch);
+	end;
+
+	let code = ref f.code in
+	let regs = ref f.regs in
+	let debug = ref f.debug in
+
+	if ctx.r_nop_count > 0 || reg_remap then begin
+		let new_pos = Array.make (Array.length f.code) 0 in
+		let jumps = ref [] in
+		let out_pos = ref 0 in
+		let out_code = Array.make (Array.length f.code - ctx.r_nop_count) (ONop "") in
+		let new_debug = Array.make (Array.length f.code - ctx.r_nop_count) (0,0) in
+		Array.iteri (fun i op ->
+			Array.unsafe_set new_pos i !out_pos;
+			match op with
+			| ONop _ -> ()
+			| _ ->
+				(match op with
+				| OJTrue _ | OJFalse _ | OJNull _ | OJNotNull _  | OJSLt _ | OJSGte _ | OJSGt _ | OJSLte _ | OJNotLt _ | OJNotGte _ | OJULt _ | OJUGte _ | OJEq _ | OJNotEq _ | OJAlways _ | OSwitch _  | OTrap _ ->
+					jumps := i :: !jumps
+				| _ -> ());
+				let op = if reg_remap then opcode_map (fun r -> Array.unsafe_get reg_map r) (fun r -> Array.unsafe_get reg_map r) op else op in
+				Array.unsafe_set out_code (!out_pos) op;
+				Array.unsafe_set new_debug (!out_pos) (Array.unsafe_get f.debug i);
+				incr out_pos
+		) f.code;
+		List.iter (fun j ->
+			let pos d =
+				Array.unsafe_get new_pos (j + 1 + d) - Array.unsafe_get new_pos (j + 1)
+			in
+			let p = new_pos.(j) in
+			Array.unsafe_set out_code p (match Array.unsafe_get out_code p with
+			| OJTrue (r,d) -> OJTrue (r,pos d)
+			| OJFalse (r,d) -> OJFalse (r,pos d)
+			| OJNull (r,d) -> OJNull (r, pos d)
+			| OJNotNull (r,d) -> OJNotNull (r, pos d)
+			| OJSLt (a,b,d) -> OJSLt (a,b,pos d)
+			| OJSGte (a,b,d) -> OJSGte (a,b,pos d)
+			| OJSLte (a,b,d) -> OJSLte (a,b,pos d)
+			| OJSGt (a,b,d) -> OJSGt (a,b,pos d)
+			| OJULt (a,b,d) -> OJULt (a,b,pos d)
+			| OJUGte (a,b,d) -> OJUGte (a,b,pos d)
+			| OJNotLt (a,b,d) -> OJNotLt (a,b,pos d)
+			| OJNotGte (a,b,d) -> OJNotGte (a,b,pos d)
+			| OJEq (a,b,d) -> OJEq (a,b,pos d)
+			| OJNotEq (a,b,d) -> OJNotEq (a,b,pos d)
+			| OJAlways d -> OJAlways (pos d)
+			| OSwitch (r,cases,send) -> OSwitch (r, Array.map pos cases, pos send)
+			| OTrap (r,d) -> OTrap (r,pos d)
+			| _ -> assert false)
+		) !jumps;
+
+		let assigns = !assigns in
+		Array.iteri (fun idx (i,p) -> if p >= 0 then Array.unsafe_set assigns idx (i, Array.unsafe_get new_pos p)) assigns;
+
+		code := out_code;
+		debug := new_debug;
+		if reg_remap then begin
+			let new_regs = Array.make ctx.r_used_regs HVoid in
+			for i=0 to nregs-1 do
+				let p = Array.unsafe_get reg_map i in
+				if p >= 0 then Array.unsafe_set new_regs p  (Array.unsafe_get f.regs i)
+			done;
+			regs := new_regs;
+		end;
+	end;
+	{ f with code = !code; regs = !regs; debug = !debug; assigns = !assigns }
+
+let _optimize (f:fundecl) =
 	let nregs = Array.length f.regs in
-	let old_code = match dump with None -> f.code | Some _ -> Array.copy f.code in
 	let op index = f.code.(index) in
 	let set_op index op = f.code.(index) <- op in
 	let nop_count = ref 0 in
 	let set_nop index r = f.code.(index) <- (ONop r); incr nop_count in
-	let write str = match dump with None -> () | Some ch -> IO.nwrite ch (str ^ "\n") in
 
 	let blocks_pos, root = code_graph f in
 
@@ -497,6 +718,11 @@ let optimize dump (f:fundecl) =
 	let stride = (nregs + bit_regs - 1) / bit_regs in
 	let live_bits = Array.make (Array.length f.code * stride) 0 in
 
+	let reg_moved = Hashtbl.create 0 in
+	let add_reg_moved p w r =
+		Hashtbl.add reg_moved p (r,last_write.(r))
+	in
+
 	let set_live r min max =
 		let offset = r / bit_regs in
 		let mask = 1 lsl (r - offset * bit_regs) in
@@ -520,7 +746,7 @@ let optimize dump (f:fundecl) =
 		r.ralias <- r;
 		r
 	) in
-
+(*
 	let print_state i s =
 		let state_str s =
 			if s.ralias == s && s.rbind == [] then "" else
@@ -528,8 +754,7 @@ let optimize dump (f:fundecl) =
 		in
 		write (Printf.sprintf "@%X %s" i (String.concat " " (Array.to_list (Array.map state_str s))))
 	in
-
-	let dstate = false in
+*)
 
 	let rec propagate b =
 		let state = if b.bloop then
@@ -595,7 +820,7 @@ let optimize dump (f:fundecl) =
 			in
 			if i > b.bend then () else
 			let op = op i in
-			if dstate then print_state i state;
+			(* print_state i state; (* debug *) *)
 			(match op with
 			| OIncr r | ODecr r | ORef (_,r) -> unalias state.(r)
 			| OCallClosure (_,r,_) when f.regs.(r) = HDyn && (match f.regs.(state.(r).ralias.rindex) with HFun (_,rt) -> not (is_dynamic rt) | HDyn -> false | _ -> true) -> unalias state.(r) (* Issue3218.hx *)
@@ -606,7 +831,8 @@ let optimize dump (f:fundecl) =
 			) (fun w ->	w) op in
 			set_op i op;
 			(match op with
-			| OMov (d, v) when d = v ->
+			| OMov (d, v) | OToInt (d, v) | OToSFloat (d,v) when d = v ->
+				add_reg_moved i d v;
 				set_nop i "mov"
 			| OMov (d, v) ->
 				let sv = state.(v) in
@@ -622,6 +848,14 @@ let optimize dump (f:fundecl) =
 			| ONullCheck r ->
 				let s = state.(r) in
 				if s.rnullcheck then set_nop i "nullcheck" else begin do_read r; s.rnullcheck <- true; end;
+			| ONew r ->
+				let s = state.(r) in
+				do_write r;
+				s.rnullcheck <- true;
+			| OToVirtual (v,o) ->
+				do_read o;
+				do_write v;
+				state.(v).rnullcheck <- state.(o).rnullcheck
 			| _ ->
 				opcode_fx (fun r read ->
 					if read then do_read r else do_write r
@@ -713,7 +947,16 @@ let optimize dump (f:fundecl) =
 			let n = read_counts.(r) - 1 in
 			read_counts.(r) <- n;
 			write_counts.(d) <- write_counts.(d) - 1;
+			add_reg_moved i d r;
 			set_nop i "unused"
+		| OJAlways d when d >= 0 ->
+			let rec loop k =
+				if k = d then set_nop i "nojmp" else
+				match f.code.(i + k + 1) with
+				| ONop _ -> loop (k + 1)
+				| _ -> ()
+			in
+			loop 0
 		| _ -> ());
 	done;
 
@@ -729,106 +972,86 @@ let optimize dump (f:fundecl) =
 		end else
 			reg_map.(i) <- -1;
 	done;
-	let reg_remap = !used_regs <> nregs in
-
-	(* done *)
-	if dump <> None then begin
-		let rec loop i block =
-			if i = Array.length f.code then () else
-			let block = try
-				let b = Hashtbl.find blocks_pos i in
-				write (Printf.sprintf "\t----- [%s] (%X)"
-					(String.concat "," (List.map (fun b -> Printf.sprintf "%X" b.bstart) b.bnext))
-					b.bend
-				);
-				let need = String.concat "," (List.map string_of_int (ISet.elements b.bneed)) in
-				let wr = String.concat " " (List.rev (PMap.foldi (fun r p acc -> Printf.sprintf "r%d:%X" r p :: acc) b.bwrite [])) in
-				write ("\t" ^ (if b.bloop then "LOOP " else "") ^ "NEED=" ^ need ^ "\tWRITE=" ^ wr);
-				b
-			with Not_found ->
-				block
-			in
-			let old = old_code.(i) in
-			let op = op i in
-			let rec live_loop r l =
-				if r = nregs then List.rev l else
-				live_loop (r + 1) (if is_live r i then r :: l else l)
-			in
-			let live = "LIVE=" ^ String.concat "," (List.map string_of_int (live_loop 0 [])) in
-			write (Printf.sprintf "\t@%-3X %-20s %-20s%s" i (ostr string_of_int old) (if opcode_eq old op then "" else ostr string_of_int op) live);
-			loop (i + 1) block
-		in
-		write (Printf.sprintf "%s@%d" (fundecl_name f) f.findex);
-		if reg_remap then begin
-			for i=0 to nregs-1 do
-				write (Printf.sprintf "\tr%-2d %-10s%s" i (tstr f.regs.(i)) (if reg_map.(i) < 0 then " unused" else if reg_map.(i) = i then "" else Printf.sprintf " r%-2d" reg_map.(i)))
-			done;
-		end;
-		loop 0 root;
-		write "";
-		write "";
-		(match dump with None -> () | Some ch -> IO.flush ch);
-	end;
+	{
+		r_root = root;
+		r_blocks_pos = blocks_pos;
+		r_nop_count = !nop_count;
+		r_used_regs = !used_regs;
+		r_live_bits = live_bits;
+		r_reg_map = reg_map;
+		r_reg_moved = reg_moved;
+	}
 
-	(* remap *)
+type cache_elt = {
+	c_code : opcode array;
+	c_rctx : rctx;
+	c_remap_indexes : int array;
+	mutable c_last_used : int;
+}
 
-	let code = ref f.code in
-	let regs = ref f.regs in
-	let debug = ref f.debug in
+let opt_cache = ref PMap.empty
+let used_mark = ref 0
 
-	if !nop_count > 0 || reg_remap then begin
-		let new_pos = Array.make (Array.length f.code) 0 in
-		let jumps = ref [] in
-		let out_pos = ref 0 in
-		let out_code = Array.make (Array.length f.code - !nop_count) (ONop "") in
-		let new_debug = Array.make (Array.length f.code - !nop_count) (0,0) in
+let optimize dump get_str (f:fundecl) (hxf:Type.tfunc) =
+	let old_code = match dump with None -> f.code | Some _ -> Array.copy f.code in
+	try
+		let c = PMap.find hxf (!opt_cache) in
+		c.c_last_used <- !used_mark;
+		if Array.length f.code <> Array.length c.c_code then assert false;
+		let code = c.c_code in
+		Array.iter (fun i ->
+			let op = (match Array.unsafe_get code i, Array.unsafe_get f.code i with
+			| OInt (r,_), OInt (_,idx) -> OInt (r,idx)
+			| OFloat (r,_), OFloat (_,idx) -> OFloat (r,idx)
+			| OBytes (r,_), OBytes (_,idx) -> OBytes (r,idx)
+			| OString (r,_), OString (_,idx) -> OString (r,idx)
+			| OCall0 (r,_), OCall0 (_,idx) -> OCall0 (r,idx)
+			| OCall1 (r,_,a), OCall1 (_,idx,_) -> OCall1 (r,idx,a)
+			| OCall2 (r,_,a,b), OCall2 (_,idx,_,_) -> OCall2 (r,idx,a,b)
+			| OCall3 (r,_,a,b,c), OCall3 (_,idx,_,_,_) -> OCall3 (r,idx,a,b,c)
+			| OCall4 (r,_,a,b,c,d), OCall4 (_,idx,_,_,_,_) -> OCall4 (r,idx,a,b,c,d)
+			| OCallN (r,_,pl), OCallN (_,idx,_) -> OCallN (r,idx,pl)
+			| OStaticClosure (r,_), OStaticClosure (_,idx) -> OStaticClosure (r,idx)
+			| OInstanceClosure (r,_,v), OInstanceClosure (_,idx,_) -> OInstanceClosure (r,idx,v)
+			| OGetGlobal (r,_), OGetGlobal (_,g) -> OGetGlobal (r,g)
+			| OSetGlobal (_,v), OSetGlobal (g,_) -> OSetGlobal (g,v)
+			| ODynGet (r,o,_), ODynGet (_,_,idx) -> ODynGet (r,o,idx)
+			| ODynSet (o,_,v), ODynSet (_,idx,_) -> ODynSet (o,idx,v)
+			| OType (r,_), OType (_,t) -> OType (r,t)
+			| _ -> assert false) in
+			Array.unsafe_set code i op
+		) c.c_remap_indexes;
+		remap_fun c.c_rctx { f with code = code } dump get_str old_code
+	with Not_found ->
+		let rctx = _optimize f in
+		let old_ops = f.code in
+		let fopt = remap_fun rctx f dump get_str old_code in
+		Hashtbl.iter (fun _ b ->
+			b.bstate <- None;
+			if dump = None then begin
+				b.bneed <- ISet.empty;
+				b.bneed_all <- None;
+			end;
+		) rctx.r_blocks_pos;
+		let idxs = DynArray.create() in
 		Array.iteri (fun i op ->
-			Array.unsafe_set new_pos i !out_pos;
 			match op with
-			| ONop _ -> ()
-			| _ ->
-				(match op with
-				| OJTrue _ | OJFalse _ | OJNull _ | OJNotNull _  | OJSLt _ | OJSGte _ | OJSGt _ | OJSLte _ | OJULt _ | OJUGte _ | OJEq _ | OJNotEq _ | OJAlways _ | OSwitch _  | OTrap _ ->
-					jumps := i :: !jumps
-				| _ -> ());
-				let op = if reg_remap then opcode_map (fun r -> reg_map.(r)) (fun r -> reg_map.(r)) op else op in
-				out_code.(!out_pos) <- op;
-				new_debug.(!out_pos) <- f.debug.(i);
-				incr out_pos
-		) f.code;
-		List.iter (fun j ->
-			let pos d =
-				new_pos.(j + 1 + d) - new_pos.(j + 1)
-			in
-			let p = new_pos.(j) in
-			out_code.(p) <- (match out_code.(p) with
-			| OJTrue (r,d) -> OJTrue (r,pos d)
-			| OJFalse (r,d) -> OJFalse (r,pos d)
-			| OJNull (r,d) -> OJNull (r, pos d)
-			| OJNotNull (r,d) -> OJNotNull (r, pos d)
-			| OJSLt (a,b,d) -> OJSLt (a,b,pos d)
-			| OJSGte (a,b,d) -> OJSGte (a,b,pos d)
-			| OJSLte (a,b,d) -> OJSLte (a,b,pos d)
-			| OJSGt (a,b,d) -> OJSGt (a,b,pos d)
-			| OJULt (a,b,d) -> OJULt (a,b,pos d)
-			| OJUGte (a,b,d) -> OJUGte (a,b,pos d)
-			| OJEq (a,b,d) -> OJEq (a,b,pos d)
-			| OJNotEq (a,b,d) -> OJNotEq (a,b,pos d)
-			| OJAlways d -> OJAlways (pos d)
-			| OSwitch (r,cases,send) -> OSwitch (r, Array.map pos cases, pos send)
-			| OTrap (r,d) -> OTrap (r,pos d)
-			| _ -> assert false)
-		) !jumps;
-		code := out_code;
-		debug := new_debug;
-		if reg_remap then begin
-			let new_regs = Array.make !used_regs HVoid in
-			for i=0 to nregs-1 do
-				let p = reg_map.(i) in
-				if p >= 0 then new_regs.(p) <- f.regs.(i)
-			done;
-			regs := new_regs;
-		end;
-	end;
+			| OInt _ | OFloat _ | OBytes _ | OString _
+			| OCall0 _ | OCall1 _ | OCall2 _ | OCall3 _ | OCall4 _ | OCallN _ | OStaticClosure _
+			| OInstanceClosure _ | OGetGlobal _	| OSetGlobal _ | ODynGet _ | ODynSet _	| OType _ ->
+				DynArray.add idxs i
+			| _ -> ()
+		) old_ops;
+		(*opt_cache := PMap.add hxf {
+			c_code = old_ops;
+			c_rctx = rctx;
+			c_last_used = !used_mark;
+			c_remap_indexes = DynArray.to_array idxs;
+		} (!opt_cache);*)
+		fopt
 
-	{ f with code = !code; regs = !regs; debug = !debug }
\ No newline at end of file
+let clean_cache() =
+	PMap.iter (fun k c ->
+		if !used_mark - c.c_last_used > 3 then opt_cache := PMap.remove k !opt_cache;
+	) (!opt_cache);
+	incr used_mark
diff --git a/src/generators/jvm/jvmAttribute.ml b/src/generators/jvm/jvmAttribute.ml
new file mode 100644
index 0000000000000000000000000000000000000000..be6e512a005ae4e994869f4d7b6e9953ae22c722
--- /dev/null
+++ b/src/generators/jvm/jvmAttribute.ml
@@ -0,0 +1,248 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open JvmGlobals
+open JvmData
+open JvmVerificationTypeInfo
+open JvmWriter
+
+type j_annotation = {
+	ann_type : int;
+	ann_elements : (jvm_constant_pool_index * j_annotation_element_value) array;
+}
+
+and j_annotation_element_value = char * j_annotation_value
+
+and j_annotation_value =
+	| ValConst of int (* B, C, D, E, F, I, J, S, Z, s *)
+	| ValEnum of int * int (* e *)
+	| ValClass of int (* c *) (* V -> Void *)
+	| ValAnnotation of j_annotation (* @ *)
+	| ValArray of j_annotation_element_value array (* [ *)
+
+(* https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.4 *)
+type j_stack_map_frame =
+	| StackSame of int
+	| Stack1StackItem of int * JvmVerificationTypeInfo.t
+	| Stack1StackItemExtended of int * JvmVerificationTypeInfo.t
+	| StackChop1 of int
+	| StackChop2 of int
+	| StackChop3 of int
+	| StackSameExtended of int
+	| StackAppend1 of int * JvmVerificationTypeInfo.t
+	| StackAppend2 of int * JvmVerificationTypeInfo.t * JvmVerificationTypeInfo.t
+	| StackAppend3 of int * JvmVerificationTypeInfo.t * JvmVerificationTypeInfo.t * JvmVerificationTypeInfo.t
+	| StackFull of int * JvmVerificationTypeInfo.t array * JvmVerificationTypeInfo.t array
+
+(* https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.13 *)
+type jvm_local_debug = {
+	ld_start_pc : int;
+	ld_length : int;
+	ld_name_index : jvm_constant_pool_index;
+	ld_descriptor_index : jvm_constant_pool_index;
+	ld_index : int;
+}
+
+type jvm_inner_class = {
+	ic_inner_class_info_index : int;
+	ic_outer_class_info_index : int;
+	ic_inner_name_index : int;
+	ic_inner_class_access_flags : int;
+}
+
+type j_bootstrap_method = {
+	bm_method_ref : jvm_constant_pool_index;
+	bm_arguments : jvm_constant_pool_index array;
+}
+
+(* https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7 *)
+type j_attribute =
+	| AttributeConstantValue of jvm_constant_pool_index
+	| AttributeCode of jvm_code
+	| AttributeStackMapTable of j_stack_map_frame array
+	| AttributeExceptions of jvm_constant_pool_index array
+	| AttributeSourceFile of jvm_constant_pool_index
+	| AttributeLineNumberTable of (int * int) array
+	| AttributeSignature of jvm_constant_pool_index
+	| AttributeLocalVariableTable of jvm_local_debug array
+	| AttributeLocalVariableTypeTable of jvm_local_debug array
+	| AttributeInnerClasses of jvm_inner_class array
+	| AttributeEnclosingMethod of jvm_constant_pool_index * jvm_constant_pool_index
+	| AttributeRuntimeVisibleAnnotations of j_annotation array
+	| AttributeBootstrapMethods of j_bootstrap_method array
+
+let write_verification_type ch = function
+	| VTop -> write_byte ch 0
+	| VInteger -> write_byte ch 1
+	| VFloat -> write_byte ch 2
+	| VDouble -> write_byte ch 3
+	| VLong -> write_byte ch 4
+	| VNull -> write_byte ch 5
+	| VUninitializedThis -> write_byte ch 6
+	| VObject i ->
+		write_byte ch 7;
+		write_ui16 ch i;
+	| VUninitialized i ->
+		write_byte ch 8;
+		write_ui16 ch i
+
+let write_stack_map_frame ch = function
+	| StackSame i ->
+		assert (i < 64);
+		write_byte ch i
+	| Stack1StackItem(i,t) ->
+		assert (i < 64);
+		write_byte ch (i + 64);
+		write_verification_type ch t;
+	| Stack1StackItemExtended(i,t) ->
+		write_byte ch 247;
+		write_ui16 ch i;
+		write_verification_type ch t;
+	| StackChop1 i1 ->
+		write_byte ch 250;
+		write_ui16 ch i1;
+	| StackChop2 i1 ->
+		write_byte ch 249;
+		write_ui16 ch i1;
+	| StackChop3 i1 ->
+		write_byte ch 248;
+		write_ui16 ch i1;
+	| StackSameExtended i ->
+		write_byte ch 251;
+		write_ui16 ch i
+	| StackAppend1(i1,t1) ->
+		write_byte ch 252;
+		write_ui16 ch i1;
+		write_verification_type ch t1;
+	| StackAppend2(i1,t1,t2) ->
+		write_byte ch 253;
+		write_ui16 ch i1;
+		write_verification_type ch t1;
+		write_verification_type ch t2;
+	| StackAppend3(i1,t1,t2,t3) ->
+		write_byte ch 254;
+		write_ui16 ch i1;
+		write_verification_type ch t1;
+		write_verification_type ch t2;
+		write_verification_type ch t3;
+	| StackFull(i1,tl1,tl2) ->
+		write_byte ch 255;
+		write_ui16 ch i1;
+		write_array16 ch write_verification_type tl1;
+		write_array16 ch write_verification_type tl2
+
+let write_constant pool ch const =
+	let offset = pool#add const in
+	write_ui16 ch offset
+
+let rec write_annotation ch ann =
+	write_ui16 ch ann.ann_type;
+	write_array16 ch (fun _ (i,v) ->
+		write_ui16 ch i;
+		let rec loop _ (c,v) =
+			write_byte ch (Char.code c);
+			match v with
+			| ValConst i ->
+				write_ui16 ch i
+			| ValEnum(i1,i2) ->
+				write_ui16 ch i1;
+				write_ui16 ch i2;
+			| ValClass i ->
+				write_ui16 ch i
+			| ValAnnotation a ->
+				write_annotation ch ann
+			| ValArray annl ->
+				write_array16 ch loop annl
+		in
+		loop ch v
+	) ann.ann_elements
+
+let write_attribute pool jvma =
+	let ch = IO.output_bytes () in
+	let write_local_table table =
+		write_array16 ch (fun _ d ->
+			write_ui16 ch d.ld_start_pc;
+			write_ui16 ch d.ld_length;
+			write_ui16 ch d.ld_name_index;
+			write_ui16 ch d.ld_descriptor_index;
+			write_ui16 ch d.ld_index;
+		) table
+	in
+	let name = match jvma with
+	| AttributeConstantValue const ->
+		write_ui16 ch const;
+		"ConstantValue";
+	| AttributeCode code ->
+		write_ui16 ch code.code_max_stack;
+		write_ui16 ch code.code_max_locals;
+		write_ui32 ch (Bytes.length code.code_code);
+		write_bytes ch code.code_code;
+		write_array16 ch write_exception code.code_exceptions;
+		write_jvm_attributes ch code.code_attributes;
+		"Code";
+	| AttributeStackMapTable stack_map ->
+		write_array16 ch write_stack_map_frame stack_map;
+		"StackMapTable"
+	| AttributeExceptions a ->
+		write_array16 ch (fun _ offset -> write_ui16 ch offset) a;
+		"Exceptions"
+	| AttributeInnerClasses icl ->
+		write_array16 ch (fun ch ic ->
+			write_ui16 ch ic.ic_inner_class_info_index;
+			write_ui16 ch ic.ic_outer_class_info_index;
+			write_ui16 ch ic.ic_inner_name_index;
+			write_ui16 ch ic.ic_inner_class_access_flags;
+		) icl;
+		"InnerClasses"
+	| AttributeEnclosingMethod(i1,i2) ->
+		write_ui16 ch i1;
+		write_ui16 ch i2;
+		"EnclosingMethod"
+	| AttributeSourceFile offset ->
+		write_ui16 ch offset;
+		"SourceFile";
+	| AttributeLineNumberTable a ->
+		write_array16 ch (fun _ (i1,i2) ->
+			write_ui16 ch i1;
+			write_ui16 ch i2
+		) a;
+		"LineNumberTable"
+	| AttributeSignature offset ->
+		write_ui16 ch offset;
+		"Signature"
+	| AttributeLocalVariableTable table ->
+		write_local_table table;
+		"LocalVariableTable"
+	| AttributeLocalVariableTypeTable table ->
+		write_local_table table;
+		"LocalVariableTypeTable"
+	| AttributeRuntimeVisibleAnnotations al ->
+		write_array16 ch write_annotation al;
+		"RuntimeVisibleAnnotations"
+	| AttributeBootstrapMethods a ->
+		write_array16 ch (fun _ bm ->
+			write_ui16 ch bm.bm_method_ref;
+			write_array16 ch (fun _ i -> write_ui16 ch i) bm.bm_arguments;
+		) a;
+		"BootstrapMethods"
+	in
+	{
+		attr_index = pool#add (ConstUtf8 name);
+		attr_data = IO.close_out ch
+	}
\ No newline at end of file
diff --git a/src/generators/jvm/jvmBuilder.ml b/src/generators/jvm/jvmBuilder.ml
new file mode 100644
index 0000000000000000000000000000000000000000..0e414bc054d8a1aafbf5e3e589f9c3f32167d4f3
--- /dev/null
+++ b/src/generators/jvm/jvmBuilder.ml
@@ -0,0 +1,89 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open JvmGlobals
+open JvmData
+open JvmSignature
+open JvmAttribute
+
+type annotation_kind =
+	| AInt of Int32.t
+	| ADouble of float
+	| AString of string
+	| ABool of bool
+	| AEnum of jsignature * string
+	| AArray of annotation_kind list
+
+and annotation = (string * annotation_kind) list
+
+type export_config = {
+	export_debug : bool;
+}
+
+class base_builder = object(self)
+	val mutable access_flags = 0
+	val attributes = DynArray.create ()
+	val annotations = DynArray.create ()
+	val mutable was_exported = false
+
+	method add_access_flag i =
+		access_flags <- i lor access_flags
+
+	method add_attribute (a : j_attribute) =
+		DynArray.add attributes a
+
+	method add_annotation (path : jpath) (a : annotation) =
+		DynArray.add annotations ((TObject(path,[])),a)
+
+	method private commit_annotations pool =
+		if DynArray.length annotations > 0 then begin
+			let open JvmAttribute in
+			let a = DynArray.to_array annotations in
+			let a = Array.map (fun (jsig,l) ->
+				let offset = pool#add_string (generate_signature false jsig) in
+				let l = List.map (fun (name,ak) ->
+					let offset = pool#add_string name in
+					let rec loop ak = match ak with
+						| AInt i32 ->
+							'I',ValConst(pool#add (ConstInt i32))
+						| ADouble f ->
+							'D',ValConst(pool#add (ConstDouble f))
+						| AString s ->
+							's',ValConst(pool#add_string s)
+						| ABool b ->
+							'Z',ValConst(pool#add (ConstInt (if b then Int32.one else Int32.zero)))
+						| AEnum(jsig,name) ->
+							'e',ValEnum(pool#add_string (generate_signature false jsig),pool#add_string name)
+						| AArray l ->
+							let l = List.map (fun ak -> loop ak) l in
+							'[',ValArray(Array.of_list l)
+					in
+					offset,loop ak
+				) l in
+				{
+					ann_type = offset;
+					ann_elements = Array.of_list l;
+				}
+			) a in
+			self#add_attribute (AttributeRuntimeVisibleAnnotations a)
+		end
+
+	method export_attributes (pool : JvmConstantPool.constant_pool) =
+		DynArray.to_array (DynArray.map (write_attribute pool) attributes)
+end
\ No newline at end of file
diff --git a/src/generators/jvm/jvmClass.ml b/src/generators/jvm/jvmClass.ml
new file mode 100644
index 0000000000000000000000000000000000000000..f8acdb41abc1f955a01bb71cb0c649b3a8952437
--- /dev/null
+++ b/src/generators/jvm/jvmClass.ml
@@ -0,0 +1,188 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open JvmGlobals
+open JvmData
+open JvmSignature
+open NativeSignatures
+open JvmAttribute
+open JvmBuilder
+
+(* High-level class builder. *)
+
+class builder path_this path_super = object(self)
+	inherit base_builder
+	val pool = new JvmConstantPool.constant_pool
+	val jsig = TObject(path_this,[])
+	val mutable offset_this = 0
+	val mutable offset_super = 0
+	val mutable interface_offsets = []
+	val fields = DynArray.create ()
+	val methods = DynArray.create ()
+	val method_sigs = Hashtbl.create 0
+	val inner_classes = Hashtbl.create 0
+	val mutable closure_count = 0
+	val mutable bootstrap_methods = []
+	val mutable num_bootstrap_methods = 0
+	val mutable spawned_methods = []
+	val mutable field_init_method = None
+
+	method add_interface path =
+		interface_offsets <- (pool#add_path path) :: interface_offsets
+
+	method add_field (f : jvm_field) =
+		DynArray.add fields f
+
+	method get_bootstrap_method path name jsig (consts : jvm_constant_pool_index list) =
+		try
+			fst (List.assoc (path,name,consts) bootstrap_methods)
+		with Not_found ->
+			let offset = pool#add_field path name jsig FKMethod in
+			let offset = pool#add (ConstMethodHandle(6, offset)) in
+			let bm = {
+				bm_method_ref = offset;
+				bm_arguments = Array.of_list consts;
+			} in
+			bootstrap_methods <- ((path,name,consts),(offset,bm)) :: bootstrap_methods;
+			num_bootstrap_methods <- num_bootstrap_methods + 1;
+			num_bootstrap_methods - 1
+
+	method get_pool = pool
+
+	method get_this_path = path_this
+	method get_super_path = path_super
+	method get_jsig = jsig
+	method get_offset_this = offset_this
+	method get_access_flags = access_flags
+
+	method get_next_closure_name =
+		let name = Printf.sprintf "hx_closure$%i" closure_count in
+		closure_count <- closure_count + 1;
+		name
+
+	method has_method (name : string) (jsig : jsignature) =
+		Hashtbl.mem method_sigs (name,generate_method_signature false jsig)
+
+	method spawn_inner_class (jm : JvmMethod.builder option) (path_super : jpath) (name : string option) =
+		let path = match name with
+			| None -> (fst path_this,Printf.sprintf "%s$%i" (snd path_this) (Hashtbl.length inner_classes))
+			| Some name -> (fst path_this,Printf.sprintf "%s$%s" (snd path_this) name)
+		in
+		let jc = new builder path path_super in
+		jc#add_access_flag 0x01;
+		begin match jm with
+		| None ->
+			()
+		| Some jm ->
+			let pool = jc#get_pool in
+			let offset_class = pool#add_path path_this in
+			let offset_name = pool#add_string jm#get_name in
+			let offset_desc = pool#add_string (generate_signature false jm#get_jsig) in
+			let offset_info = pool#add (ConstNameAndType(offset_name,offset_desc)) in
+			jc#add_attribute (JvmAttribute.AttributeEnclosingMethod(offset_class,offset_info));
+		end;
+		let offset = pool#add_path path in
+		Hashtbl.add inner_classes offset jc;
+		jc
+
+	method spawn_method (name : string) (jsig_method : jsignature) (flags : MethodAccessFlags.t list) =
+		let jm = new JvmMethod.builder self name jsig_method in
+		let ssig_method = generate_method_signature false jsig_method in
+		if Hashtbl.mem method_sigs (name,ssig_method) then
+			jerror (Printf.sprintf "Duplicate field on class %s: %s %s" (Globals.s_type_path path_this) name ssig_method);
+		Hashtbl.add method_sigs (name,ssig_method) jm;
+		List.iter (fun flag ->
+			jm#add_access_flag (MethodAccessFlags.to_int flag)
+		) flags;
+		let pop_scope = jm#push_scope in
+		if not (jm#has_method_flag MStatic) then ignore(jm#add_local "this" (if jm#get_name = "<init>" then (TUninitialized None) else jsig) VarArgument);
+		spawned_methods <- (jm,Some pop_scope) :: spawned_methods;
+		jm
+
+	method spawn_field (name : string) (jsig_method : jsignature) (flags : FieldAccessFlags.t list) =
+		let jm = new JvmMethod.builder self name jsig_method in
+		List.iter (fun flag ->
+			jm#add_access_flag (FieldAccessFlags.to_int flag)
+		) flags;
+		spawned_methods <- (jm,None) :: spawned_methods;
+		jm
+
+	method private commit_inner_classes =
+		if Hashtbl.length pool#get_inner_classes > 0 then begin
+			let open JvmAttribute in
+			let l = Hashtbl.fold (fun (path,name) offset_class acc ->
+				(path,name,offset_class) :: acc
+			) pool#get_inner_classes [] in
+			let l = List.map (fun (path,name,offset_class) ->
+				let offset_name = pool#add_string name in
+				let flags = try (Hashtbl.find inner_classes offset_class)#get_access_flags with Not_found -> 9 in
+				let offset_outer = pool#add_path path in
+				{
+					ic_inner_class_info_index = offset_class;
+					ic_outer_class_info_index = offset_outer;
+					ic_inner_name_index = offset_name;
+					ic_inner_class_access_flags = flags;
+				}
+			) l in
+			let a = Array.of_list l in
+			self#add_attribute (AttributeInnerClasses a)
+		end
+
+	method private commit_bootstrap_methods =
+		match bootstrap_methods with
+		| [] ->
+			()
+		| _ ->
+			let l = List.fold_left (fun acc (_,(_,bm)) -> bm :: acc) [] bootstrap_methods in
+			self#add_attribute (AttributeBootstrapMethods (Array.of_list l))
+
+	method export_class (config : export_config) =
+		assert (not was_exported);
+		was_exported <- true;
+		List.iter (fun (jm,pop_scope) ->
+			begin match pop_scope with
+			| Some pop_scope ->
+				pop_scope();
+				DynArray.add methods (jm#export_method config);
+			| None ->
+				self#add_field jm#export_field
+			end;
+		) (List.rev spawned_methods);
+		self#commit_bootstrap_methods;
+		self#commit_inner_classes;
+		self#commit_annotations pool;
+		let attributes = self#export_attributes pool in
+		let pool = pool#close in
+		{
+			class_minor_version = 0;
+			class_major_version = 0x34;
+			class_constant_pool = pool;
+			class_access_flags = access_flags;
+			class_this_class = offset_this;
+			class_super_class = offset_super;
+			class_interfaces = Array.of_list interface_offsets;
+			class_fields = DynArray.to_array fields;
+			class_methods = DynArray.to_array methods;
+			class_attributes = attributes;
+		}
+
+	initializer
+		offset_this <- pool#add_path path_this;
+		offset_super <- pool#add_path path_super;
+end
\ No newline at end of file
diff --git a/src/generators/jvm/jvmCode.ml b/src/generators/jvm/jvmCode.ml
new file mode 100644
index 0000000000000000000000000000000000000000..73c15a20575e590190fff5dd58ebff27a70607f8
--- /dev/null
+++ b/src/generators/jvm/jvmCode.ml
@@ -0,0 +1,566 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open JvmGlobals
+open JvmData
+open JvmSignature
+
+(* Opcode builder with stack management *)
+
+exception EmptyStack
+
+class jvm_stack = object(self)
+	val mutable stack = [];
+	val mutable stack_size = 0;
+	val mutable max_stack_size = 0;
+
+	method push js =
+		stack <- js :: stack;
+		stack_size <- stack_size + (signature_size js);
+		if stack_size > max_stack_size then max_stack_size <- stack_size
+
+	method pop = match stack with
+		| js :: l ->
+			stack <- l;
+			stack_size <- stack_size - (signature_size js);
+			js
+		| [] ->
+			raise EmptyStack
+
+	method to_string =
+		Printf.sprintf "[%s]" (String.concat ", " (List.map (generate_signature false) stack))
+
+	method save =
+		(stack,stack_size)
+
+	method top = match stack with
+		| hd :: _ -> hd
+		| [] -> raise EmptyStack
+
+	method restore ((stack',stack_size') : (jsignature list * int)) =
+		stack <- stack';
+		stack_size <- stack_size'
+
+	method get_max_stack_size = max_stack_size
+	method set_max_stack_size value = max_stack_size <- value
+
+	method get_stack = stack
+
+	method get_stack_items i =
+		let rec loop acc i l =
+			if i = 0 then List.rev acc
+			else match l with
+			| x :: l ->
+				loop (x :: acc) (i - 1) l
+			| [] ->
+				raise EmptyStack
+		in
+		loop [] i stack
+end
+
+let s_vt = generate_method_signature true
+
+let s_vtl l = Printf.sprintf "[%s]" (String.concat ", " (List.map s_vt l))
+
+class builder pool = object(self)
+	val stack = new jvm_stack;
+	val lines = DynArray.create()
+	val mutable last_line = -1
+	val mutable current_line = -1
+
+	(* ops *)
+	val ops = DynArray.create();
+	val stack_debug = DynArray.create()
+	val mutable fp = 0
+
+	method debug_stack =
+		let l = DynArray.to_list stack_debug in
+		let opmax = ref 0 in
+		let l = List.map (fun (op,_,after,line) ->
+			let sop = JvmDebug.s_jcode pool op in
+			if String.length sop > !opmax then opmax := String.length sop;
+			let safter = s_vtl after in
+			(line,sop,safter)
+		) l in
+		let s_ops = String.concat "\n\t\t" (List.map (fun (line,sop,safter) ->
+			Printf.sprintf "%4i %*s %s" line !opmax sop safter
+		) l) in
+		s_ops
+
+	method stack_error opcode expected actual =
+		let s_ops = self#debug_stack in
+		jerror
+			(Printf.sprintf "Stack error\n\tops      :\n\t\t%s\n\t     line: %i\n\toperation: %s\n\texpected : %s\n\tactual   : %s"
+				s_ops
+				current_line
+				(JvmDebug.s_jcode pool opcode)
+				(s_vtl expected)
+				(s_vtl actual)
+			)
+
+	method op opcode length expect return =
+		if last_line <> current_line then begin
+			last_line <- current_line;
+			DynArray.add lines (fp,current_line)
+		end;
+		DynArray.add ops opcode;
+		fp <- fp + length;
+		let cur = stack#get_stack in
+		List.iter (fun js ->
+			let js' = try
+				stack#pop
+			with EmptyStack ->
+				self#stack_error opcode expect cur;
+				assert false
+			in
+			(* TODO: some unification or something? *)
+			match js,js' with
+			| (TObject _ | TTypeParameter _),(TObject _ | TTypeParameter _ | TArray _) -> () (* TODO ??? *)
+			| TMethod _,TMethod _ -> ()
+			| TMethod _,TObject((["java";"lang";"invoke"],"MethodHandle"),[]) -> ()
+			| TTypeParameter _,TMethod _ -> ()
+			| TObject _,TMethod _ -> ()
+			| TMethod _,TObject _ -> ()
+			| TArray _,TArray _ -> ()
+			| TBool,TInt -> ()
+			| TInt,TBool -> ()
+			| TDouble,TInt -> ()
+			| TInt,(TChar | TShort | TByte) -> ()
+			| (TObject _ | TTypeParameter _),TUninitialized _ -> ()
+			| _ ->
+				if js <> js' then self#stack_error opcode expect cur
+		) expect;
+		List.iter stack#push (List.rev return);
+		DynArray.add stack_debug (opcode,cur,stack#get_stack,current_line);
+
+	method op_maybe_wide op opw i tl tr = match get_numeric_range_unsigned i with
+		| Int8Range -> self#op op 2 tl tr
+		| Int16Range -> self#op (OpWide opw) 4 tl tr
+		| Int32Range -> assert false
+
+	(* variables *)
+
+	method iload ?(jsig=TInt) i = match i with
+		| 0 -> self#op OpIload_0 1 [] [jsig]
+		| 1 -> self#op OpIload_1 1 [] [jsig]
+		| 2 -> self#op OpIload_2 1 [] [jsig]
+		| 3 -> self#op OpIload_3 1 [] [jsig]
+		| i -> self#op_maybe_wide (OpIload i) (OpWIload i) i [] [jsig]
+
+	method lload i = match i with
+		| 0 -> self#op OpLload_0 1 [] [TLong]
+		| 1 -> self#op OpLload_1 1 [] [TLong]
+		| 2 -> self#op OpLload_2 1 [] [TLong]
+		| 3 -> self#op OpLload_3 1 [] [TLong]
+		| i -> self#op_maybe_wide (OpLload i) (OpWLload i) i [] [TLong]
+
+	method fload i = match i with
+		| 0 -> self#op OpFload_0 1 [] [TFloat]
+		| 1 -> self#op OpFload_1 1 [] [TFloat]
+		| 2 -> self#op OpFload_2 1 [] [TFloat]
+		| 3 -> self#op OpFload_3 1 [] [TFloat]
+		| i -> self#op_maybe_wide (OpFload i) (OpWFload i) i [] [TFloat]
+
+	method dload i = match i with
+		| 0 -> self#op OpDload_0 1 [] [TDouble]
+		| 1 -> self#op OpDload_1 1 [] [TDouble]
+		| 2 -> self#op OpDload_2 1 [] [TDouble]
+		| 3 -> self#op OpDload_3 1 [] [TDouble]
+		| i -> self#op_maybe_wide (OpDload i) (OpWDload i) i [] [TDouble]
+
+	method aload vtt i = match i with
+		| 0 -> self#op OpAload_0 1 [] [vtt]
+		| 1 -> self#op OpAload_1 1 [] [vtt]
+		| 2 -> self#op OpAload_2 1 [] [vtt]
+		| 3 -> self#op OpAload_3 1 [] [vtt]
+		| i -> self#op_maybe_wide (OpAload i) (OpWAload i) i [] [vtt]
+
+	method istore i = match i with
+		| 0 -> self#op OpIstore_0 1 [TInt] []
+		| 1 -> self#op OpIstore_1 1 [TInt] []
+		| 2 -> self#op OpIstore_2 1 [TInt] []
+		| 3 -> self#op OpIstore_3 1 [TInt] []
+		| i -> self#op_maybe_wide (OpIstore i) (OpWIstore i) i [TInt] []
+
+	method lstore i = match i with
+		| 0 -> self#op OpLstore_0 1 [TLong] []
+		| 1 -> self#op OpLstore_1 1 [TLong] []
+		| 2 -> self#op OpLstore_2 1 [TLong] []
+		| 3 -> self#op OpLstore_3 1 [TLong] []
+		| i -> self#op_maybe_wide (OpLstore i) (OpWLstore i) i [TLong] []
+
+	method fstore i = match i with
+		| 0 -> self#op OpFstore_0 1 [TFloat] []
+		| 1 -> self#op OpFstore_1 1 [TFloat] []
+		| 2 -> self#op OpFstore_2 1 [TFloat] []
+		| 3 -> self#op OpFstore_3 1 [TFloat] []
+		| i -> self#op_maybe_wide (OpFstore i) (OpWFstore i) i [TFloat] []
+
+	method dstore i = match i with
+		| 0 -> self#op OpDstore_0 1 [TDouble] []
+		| 1 -> self#op OpDstore_1 1 [TDouble] []
+		| 2 -> self#op OpDstore_2 1 [TDouble] []
+		| 3 -> self#op OpDstore_3 1 [TDouble] []
+		| i -> self#op_maybe_wide (OpDstore i) (OpWDstore i) i [TDouble] []
+
+	method astore vtt i = match i with
+		| 0 -> self#op OpAstore_0 1 [vtt] []
+		| 1 -> self#op OpAstore_1 1 [vtt] []
+		| 2 -> self#op OpAstore_2 1 [vtt] []
+		| 3 -> self#op OpAstore_3 1 [vtt] []
+		| i -> self#op_maybe_wide (OpAstore i) (OpWAstore i) i [vtt] []
+
+	method iinc index i = match get_numeric_range_unsigned index,get_numeric_range i with
+		| Int8Range,Int8Range ->
+			self#op (OpIinc(index,i)) 3 [] []
+		| (Int8Range | Int16Range),(Int8Range | Int16Range) ->
+			self#op (OpWide (OpWIinc(index,i))) 6 [] []
+		| _ ->
+			assert false
+
+	(* conversions *)
+
+	method d2f = self#op OpD2f 1 [TDouble] [TFloat]
+	method d2i = self#op OpD2i 1 [TDouble] [TInt]
+	method d2l = self#op OpD2l 1 [TDouble] [TLong]
+
+	method f2d = self#op OpF2d 1 [TFloat] [TDouble]
+	method f2i = self#op OpF2i 1 [TFloat] [TInt]
+	method f2l = self#op OpF2l 1 [TFloat] [TLong]
+
+	method i2b jsig = self#op OpI2b 1 [TInt] [jsig]
+	method i2c = self#op OpI2c 1 [TInt] [TChar]
+	method i2d = self#op OpI2d 1 [TInt] [TDouble]
+	method i2f = self#op OpI2f 1 [TInt] [TFloat]
+	method i2l = self#op OpI2l 1 [TInt] [TLong]
+	method i2s = self#op OpI2s 1 [TInt] [TShort]
+
+	method l2d = self#op OpL2d 1 [TLong] [TDouble]
+	method l2f = self#op OpL2f 1 [TLong] [TFloat]
+	method l2i = self#op OpL2i 1 [TLong] [TInt]
+
+	(* arrays *)
+
+	method newarray ta t = self#op (OpNewarray t) 2 [TInt] [ta]
+	method anewarray ta offset = self#op (OpAnewarray offset) 3 [TInt] [ta]
+
+	method arraylength ta = self#op OpArraylength 1 [ta] [TInt]
+
+	method aastore ta te = self#op OpAastore 1 [te;TInt;ta] []
+	method aaload ta te = self#op OpAaload 1 [TInt;ta] [te]
+
+	method castore ta = self#op OpCastore 1 [TChar;TInt;ta] []
+	method caload ta = self#op OpCaload 1 [TInt;ta] [TChar]
+
+	method fastore ta = self#op OpFastore 1 [TFloat;TInt;ta] []
+	method faload ta = self#op OpFaload 1 [TInt;ta] [TFloat]
+
+	method lastore ta = self#op OpLastore 1 [TLong;TInt;ta] []
+	method laload ta = self#op OpLaload 1 [TInt;ta] [TLong]
+
+	method sastore ta = self#op OpSastore 1 [TShort;TInt;ta] []
+	method saload ta = self#op OpSaload 1 [TInt;ta] [TShort]
+
+	method iastore ta = self#op OpIastore 1 [TInt;TInt;ta] []
+	method iaload ta = self#op OpIaload 1 [TInt;ta] [TInt]
+
+	method dastore ta = self#op OpDastore 1 [TDouble;TInt;ta] []
+	method daload ta = self#op OpDaload 1 [TInt;ta] [TDouble]
+
+	method bastore jsig ta = self#op OpBastore 1 [jsig;TInt;ta] []
+	method baload jsig ta = self#op OpBaload 1 [TInt;ta] [jsig]
+
+	(* fields *)
+
+	method getstatic offset t =
+		self#op (OpGetstatic offset) 3 [] [t]
+
+	method putstatic offset t =
+		self#op (OpPutstatic offset) 3 [t] []
+
+	method getfield offset tobj t =
+		self#op (OpGetfield offset) 3 [tobj] [t]
+
+	method putfield offset tobj t =
+		self#op (OpPutfield offset) 3 [t;tobj] []
+
+	(* calls *)
+
+	method invokestatic offset tl tr =
+		self#op (OpInvokestatic offset) 3 (List.rev tl) tr
+
+	method invokevirtual offset t1 tl tr =
+		self#op (OpInvokevirtual offset) 3 (List.rev (t1 :: tl)) tr
+
+	method invokeinterface offset t1 tl tr =
+		let count = List.fold_left (fun count jsig -> count + signature_size jsig) 1 tl in
+		self#op (OpInvokeinterface(offset,count)) 5 (List.rev (t1 :: tl)) tr
+
+	method invokespecial offset t1 tl tr =
+		self#op (OpInvokespecial offset) 3 (List.rev (t1 :: tl)) tr
+
+	method invokedynamic offset tl tr =
+		self#op (OpInvokedynamic(offset)) 5 (List.rev tl) tr
+
+	method new_ offset =
+		self#op (OpNew offset) 3 [] [TUninitialized (Some fp)]
+
+	(* return *)
+
+	method return_void =
+		self#op OpReturn 1 [] []
+
+	method return_value t =
+		let op = match t with
+		| TInt | TBool | TByte | TChar | TShort -> OpIreturn
+		| TLong -> OpLreturn
+		| TFloat -> OpFreturn
+		| TDouble -> OpDreturn
+		| _ -> OpAreturn
+		in
+		self#op op 1 [t] []
+
+	method athrow =
+		self#op OpAthrow 1 [stack#top] []
+
+	(* control flow *)
+
+	method if_ cmp r = self#op (OpIf(cmp,r)) 3 [TBool] []
+	method if_ref cmp = let r = ref fp in self#if_ cmp r; r
+
+	method if_icmp cmp r = self#op (OpIf_icmp(cmp,r)) 3 [TInt;TInt] []
+	method if_icmp_ref cmp = let r = ref fp in self#if_icmp cmp r; r
+
+	method if_acmp_eq t1 t2 r = self#op (OpIf_acmpeq r) 3 [t1;t2] []
+	method if_acmp_eq_ref t1 t2 = let r = ref fp in self#if_acmp_eq t1 t2 r; r
+
+	method if_acmp_ne t1 t2 r = self#op (OpIf_acmpne r) 3 [t1;t2] []
+	method if_acmp_ne_ref t1 t2 = let r = ref fp in self#if_acmp_ne t1 t2 r; r
+
+	method if_null t r = self#op (OpIfnull r) 3 [t] []
+	method if_null_ref t = let r = ref fp in self#if_null t r; r
+
+	method if_nonnull t r = self#op (OpIfnonnull r) 3 [t] []
+	method if_nonnull_ref t = let r = ref fp in self#if_nonnull t r; r
+
+	method goto r = self#op (OpGoto r) 3 [] []
+
+	method lookupswitch offset_def offsets =
+		let pad = (fp + 1) mod 4 in
+		let pad = if pad = 0 then pad else 4 - pad in
+		self#op (OpLookupswitch(pad,offset_def,offsets)) (9 + pad + (Array.length offsets * 8)) [TInt] []
+
+	method tableswitch offset_def low high offsets =
+		let pad = (fp + 1) mod 4 in
+		let pad = if pad = 0 then pad else 4 - pad in
+		self#op (OpTableswitch(pad,offset_def,low,high,offsets)) (13 + pad + (Array.length offsets * 4)) [TInt] []
+
+	(* compare *)
+
+	method dcmpg = self#op OpDcmpg 1 [TDouble;TDouble] [TInt]
+	method dcmpl = self#op OpDcmpl 1 [TDouble;TDouble] [TInt]
+
+	method fcmpg = self#op OpFcmpg 1 [TFloat;TFloat] [TInt]
+	method fcmpl = self#op OpFcmpl 1 [TFloat;TFloat] [TInt]
+
+	method lcmpl = self#op OpLcmp 1 [TLong;TLong] [TInt]
+
+	(* ops *)
+
+	method iadd = self#op OpIadd 1 [TInt;TInt] [TInt]
+	method isub = self#op OpIsub 1 [TInt;TInt] [TInt]
+	method imul = self#op OpImul 1 [TInt;TInt] [TInt]
+	method iand = self#op OpIand 1 [TInt;TInt] [TInt]
+	method ior = self#op OpIor 1 [TInt;TInt] [TInt]
+	method ixor = self#op OpIxor 1 [TInt;TInt] [TInt]
+	method ishl = self#op OpIshl 1 [TInt;TInt] [TInt]
+	method ishr = self#op OpIshr 1 [TInt;TInt] [TInt]
+	method iushr = self#op OpIushr 1 [TInt;TInt] [TInt]
+	method irem = self#op OpIrem 1 [TInt;TInt] [TInt]
+	method ineg = self#op OpIneg 1 [TInt] [TInt]
+
+	method ladd = self#op OpLadd 1 [TLong;TLong] [TLong]
+	method lsub = self#op OpLsub 1 [TLong;TLong] [TLong]
+	method lmul = self#op OpLmul 1 [TLong;TLong] [TLong]
+	method ldiv = self#op OpLdiv 1 [TLong;TLong] [TLong]
+	method land_ = self#op OpLand 1 [TLong;TLong] [TLong]
+	method lor_ = self#op OpLor 1 [TLong;TLong] [TLong]
+	method lxor_ = self#op OpLxor 1 [TLong;TLong] [TLong]
+	method lshl = self#op OpLshl 1 [TInt;TLong] [TLong]
+	method lshr = self#op OpLshr 1 [TInt;TLong] [TLong]
+	method lushr = self#op OpLushr 1 [TInt;TLong] [TLong]
+	method lrem = self#op OpLrem 1 [TLong;TLong] [TLong]
+	method lneg = self#op OpLneg 1 [TLong] [TLong]
+
+	method fadd = self#op OpFadd 1 [TFloat;TFloat] [TFloat]
+	method fsub = self#op OpFsub 1 [TFloat;TFloat] [TFloat]
+	method fmul = self#op OpFmul 1 [TFloat;TFloat] [TFloat]
+	method fdiv = self#op OpFdiv 1 [TFloat;TFloat] [TFloat]
+	method frem = self#op OpFrem 1 [TFloat;TFloat] [TFloat]
+	method fneg = self#op OpFneg 1 [TFloat] [TFloat]
+
+	method dadd = self#op OpDadd 1 [TDouble;TDouble] [TDouble]
+	method dsub = self#op OpDsub 1 [TDouble;TDouble] [TDouble]
+	method dmul = self#op OpDmul 1 [TDouble;TDouble] [TDouble]
+	method ddiv = self#op OpDdiv 1 [TDouble;TDouble] [TDouble]
+	method drem = self#op OpDrem 1 [TDouble;TDouble] [TDouble]
+	method dneg = self#op OpDneg 1 [TDouble] [TDouble]
+
+	(* stack *)
+
+	method pop =
+		let top = stack#top in
+		self#op (if signature_size top = 1 then OpPop else OpPop2) 1 [top] []
+
+	method dup = match stack#top with
+		| TLong | TDouble -> self#op OpDup2 1 [] [stack#top]
+		| _ -> self#op OpDup 1 [] [stack#top]
+
+	method dup_x1 =
+		let tl = stack#get_stack_items 2 in
+		let tl2 = (List.hd tl :: (List.rev tl)) in
+		match tl with
+		| (TLong | TDouble) :: _ -> self#op OpDup2_x1 1 tl tl2
+		| _ ->  self#op OpDup_x1 1 tl tl2
+
+	method dup_x2 =
+		let tl = stack#get_stack_items 3 in
+		let sizes = List.map signature_size tl in
+		match sizes,tl with
+		| 2 :: 2 :: _,vt1 :: vt2 :: _ -> self#op OpDup2_x2 1 [vt1;vt2] [vt1;vt2;vt1]
+		| 1 :: 2 :: _,vt1 :: vt2 :: _ -> self#op OpDup_x2 1 [vt1;vt2] [vt1;vt2;vt1]
+		| 1 :: 1 :: 1 :: _,vt1 :: vt2 :: vt3 :: _ -> self#op OpDup_x2 1 tl [vt1;vt2;vt3;vt1]
+		| 2 :: 1 :: 1 :: _,vt1 :: vt2 :: vt3 :: _ -> self#op OpDup2_x2 1 tl [vt1;vt2;vt3;vt1]
+		| _ -> jerror "???"
+
+	method swap =
+		let tl = stack#get_stack_items 2 in
+		self#op OpSwap 1 tl (List.rev tl)
+
+	method checkcast_sig jsig =
+		let offset = pool#add_type (generate_signature false jsig) in
+		self#op (OpCheckcast offset) 3 [stack#top] [jsig]
+
+	method checkcast path =
+		let offset = pool#add_path path in
+		let jsig = match path with
+			| [],"Int" -> TInt
+			| ["haxe" | "java"],"Int64" -> TLong
+			| _ -> TObject(path,[])
+		in
+		self#op (OpCheckcast offset) 3 [stack#top] [jsig]
+
+	method instanceof path =
+		let offset = pool#add_path path in
+		self#op (OpInstanceof offset) 3 [stack#top] [TInt]
+
+	(* monitor *)
+
+	method monitorenter =
+		self#op OpMonitorenter 1 [stack#top] []
+
+	method monitorexit =
+		self#op OpMonitorexit 1 [stack#top] []
+
+	(* constants *)
+
+	method aconst_null t = self#op OpAconst_null 1 [] [t]
+
+	method ldc offset vt =
+		if offset < 0xFF then
+			self#op (OpLdc offset) 2 [] [vt]
+		else
+			self#op (OpLdc_w offset) 3 [] [vt]
+
+	method bconst b =
+		self#op (if b then OpIconst_1 else OpIconst_0) 1 [] [TBool]
+
+	method iconst i32 =
+		let instr,count = match Int32.to_int i32 with
+			| -1 -> OpIconst_m1,1
+			| 0 -> OpIconst_0,1
+			| 1 -> OpIconst_1,1
+			| 2 -> OpIconst_2,1
+			| 3 -> OpIconst_3,1
+			| 4 -> OpIconst_4,1
+			| 5 -> OpIconst_5,1
+			| i ->
+				match get_numeric_range i with
+				| Int8Range ->
+					OpBipush i,2
+				| Int16Range ->
+					OpSipush i,3
+				| Int32Range ->
+					let offset = pool#add (ConstInt i32) in
+					if offset < 0xFF then
+						OpLdc offset,2
+					else
+						OpLdc_w offset,3
+		in
+		self#op instr count [] [TInt]
+
+	method dconst f =
+		let instr,count = match f with
+			| 0.0 -> OpDconst_0,1
+			| 1.0 -> OpDconst_1,1
+			| _ ->
+				let offset = pool#add (ConstDouble f) in
+				OpLdc2_w offset,3
+		in
+		self#op instr count [] [TDouble]
+
+	method lconst d =
+		let instr,count = if d = Int64.zero then
+			OpLconst_0,1
+		else if d = Int64.one then
+			OpLconst_1,1
+		else begin
+			let offset = pool#add (ConstLong d) in
+			OpLdc2_w offset,3
+		end in
+		self#op instr count [] [TLong]
+
+	method fconst f =
+		let instr,count = match f with
+			| 0.0 -> OpFconst_0,1
+			| 1.0 -> OpFconst_1,1
+			| 2.0 -> OpFconst_2,1
+			| _ ->
+				let offset = pool#add (ConstFloat f) in
+				OpLdc_w offset,3
+		in
+		self#op instr count [] [TFloat]
+
+	method sconst t offset =
+		self#ldc offset t
+
+	method get_pool : JvmConstantPool.constant_pool = pool
+	method get_fp = fp
+	method get_ops = ops
+	method get_stack = stack
+	method get_max_stack_size = stack#get_max_stack_size
+
+	method get_lines = lines
+	method set_line line = current_line <- line
+
+	method export_code =
+		let ch = IO.output_bytes () in
+		DynArray.iter (JvmWriter.write_opcode ch) ops;
+		IO.close_out ch
+end
\ No newline at end of file
diff --git a/src/generators/jvm/jvmConstantPool.ml b/src/generators/jvm/jvmConstantPool.ml
new file mode 100644
index 0000000000000000000000000000000000000000..6438bddbd94b6b4d6bbd27fc91b1cd50fb9039ea
--- /dev/null
+++ b/src/generators/jvm/jvmConstantPool.ml
@@ -0,0 +1,192 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open IO
+open IO.BigEndian
+open JvmGlobals
+open JvmSignature
+
+(* High-level constant pool *)
+
+let utf8jvm (input : string) : bytes =
+	let channel = IO.output_bytes () in
+	UTF8.iter (fun c ->
+		let code = UCharExt.code c in
+		match code with
+			| b when (b > 0 && b <= 0x7F) ->
+			IO.write_byte channel b
+			(* includes null byte: *)
+			| b when (b <= 0x7FF) ->
+			IO.write_byte channel (0xC0 lor ((b lsr  6)          ));
+			IO.write_byte channel (0x80 lor ((b       ) land 0x3F))
+			| b when (b <= 0xFFFF) ->
+			IO.write_byte channel (0xE0 lor ((b lsr 12)          ));
+			IO.write_byte channel (0x80 lor ((b lsr  6) land 0x3F));
+			IO.write_byte channel (0x80 lor ((b       ) land 0x3F))
+			| b ->
+			IO.write_byte channel 0xED;
+			IO.write_byte channel (0xA0 lor ((b lsr 16) - 1      ));
+			IO.write_byte channel (0x80 lor ((b lsr 10) land 0x3F));
+			IO.write_byte channel 0xED;
+			IO.write_byte channel (0xB0 lor ((b lsr  6) land 0x0F));
+			IO.write_byte channel (0x80 lor ((b       ) land 0x3F))
+	) input;
+	IO.close_out channel
+;;
+
+class constant_pool = object(self)
+	val pool = DynArray.create ();
+	val lut = Hashtbl.create 0;
+	val luti = Hashtbl.create 0;
+	val mutable next_index = 1;
+	val mutable closed = false
+	val inner_classes = Hashtbl.create 0
+
+	method add const =
+		try
+			Hashtbl.find lut const
+		with Not_found ->
+			assert (not closed);
+			let i = next_index in
+			next_index <- next_index + 1;
+			DynArray.add pool const;
+			Hashtbl.add lut const i;
+			Hashtbl.add luti i (DynArray.length pool - 1);
+			match const with
+			| ConstDouble _ | ConstLong _ ->
+				next_index <- next_index + 1;
+				i
+			| _ ->
+				i
+
+	method get i =
+		DynArray.get pool (Hashtbl.find luti i)
+
+	method private s_type_path (p,s) = match p with [] -> s | _ -> String.concat "/" p ^ "/" ^ s
+
+	method add_type s =
+		let offset = self#add (ConstUtf8 s) in
+		self#add (ConstClass offset);
+
+	method add_path path =
+		let s = self#s_type_path path in
+		let offset = self#add_type s in
+		if String.contains (snd path) '$' then begin
+			let name1,name2 = ExtString.String.split (snd path) "$" in
+			Hashtbl.replace inner_classes ((fst path,name1),name2) offset;
+		end;
+		offset
+
+	method add_string s =
+		self#add (ConstUtf8 s)
+
+	method add_const_string s =
+		let offset = self#add_string s in
+		self#add (ConstString offset)
+
+	method add_name_and_type name jsig field_kind =
+		let offset_name = self#add_string name in
+		let offset_desc = self#add_string ((if field_kind = FKField then generate_signature else generate_method_signature) false jsig) in
+		self#add (ConstNameAndType(offset_name,offset_desc))
+
+	method add_field path name jsig field_kind =
+		let offset_class = self#add_path path in
+		let offset_info = self#add_name_and_type name jsig field_kind in
+		let const = match field_kind with
+			| FKField -> ConstFieldref(offset_class,offset_info)
+			| FKMethod -> ConstMethodref(offset_class,offset_info)
+			| FKInterfaceMethod -> ConstInterfaceMethodref(offset_class,offset_info)
+		in
+		self#add const
+
+	method get_inner_classes = inner_classes
+
+	method private write_i64 ch i64 =
+		write_real_i32 ch (Int64.to_int32 i64);
+		write_real_i32 ch (Int64.to_int32 (Int64.shift_right_logical i64 32))
+
+	method private write ch =
+		write_ui16 ch next_index;
+		DynArray.iter (function
+			| ConstUtf8 s ->
+				write_byte ch 1;
+				let b = utf8jvm s in
+				write_ui16 ch (Bytes.length b);
+				nwrite ch b
+			| ConstInt i32 ->
+				write_byte ch 3;
+				write_real_i32 ch i32;
+			| ConstFloat f ->
+				write_byte ch 4;
+				(match classify_float f with
+				| FP_normal | FP_subnormal | FP_zero ->
+					write_real_i32 ch (Int32.bits_of_float f)
+				| FP_infinite when f > 0.0 ->
+					write_real_i32 ch 0x7f800000l
+				| FP_infinite ->
+					write_real_i32 ch 0xff800000l
+				| FP_nan ->
+					write_real_i32 ch 0x7f800001l)
+			| ConstLong i64 ->
+				write_byte ch 5;
+				write_i64 ch i64;
+			| ConstDouble d ->
+				write_byte ch 6;
+				write_double ch d
+			| ConstClass offset ->
+				write_byte ch 7;
+				write_ui16 ch offset;
+			| ConstString offset ->
+				write_byte ch 8;
+				write_ui16 ch offset;
+			| ConstFieldref (offset1,offset2) ->
+				write_byte ch 9;
+				write_ui16 ch offset1;
+				write_ui16 ch offset2;
+			| ConstMethodref (offset1,offset2) ->
+				write_byte ch 10;
+				write_ui16 ch offset1;
+				write_ui16 ch offset2;
+			| ConstInterfaceMethodref (offset1,offset2) ->
+				write_byte ch 11;
+				write_ui16 ch offset1;
+				write_ui16 ch offset2;
+			| ConstNameAndType (offset1,offset2) ->
+				write_byte ch 12;
+				write_ui16 ch offset1;
+				write_ui16 ch offset2;
+			| ConstMethodHandle (i,offset) ->
+				write_byte ch 15;
+				write_byte ch i;
+				write_ui16 ch offset;
+			| ConstMethodType offset ->
+				write_byte ch 16;
+				write_ui16 ch offset;
+			| ConstInvokeDynamic (offset1,offset2) ->
+				write_byte ch 18;
+				write_ui16 ch offset1;
+				write_ui16 ch offset2;
+		) pool
+
+	method close =
+		closed <- true;
+		let ch = IO.output_bytes () in
+		self#write ch;
+		IO.close_out ch
+end
\ No newline at end of file
diff --git a/src/generators/jvm/jvmData.ml b/src/generators/jvm/jvmData.ml
new file mode 100644
index 0000000000000000000000000000000000000000..acf0d36e7901a353371c3c718b7ec14df75f9e04
--- /dev/null
+++ b/src/generators/jvm/jvmData.ml
@@ -0,0 +1,294 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open JvmGlobals
+
+(* Low-level data that is written out. *)
+
+type jvm_attribute = {
+	attr_index : jvm_constant_pool_index;
+	attr_data  : bytes;
+}
+
+type jvm_field = {
+	field_access_flags     : int;
+	field_name_index       : int;
+	field_descriptor_index : int;
+	field_attributes       : jvm_attribute array;
+}
+
+type jvm_class = {
+	class_minor_version : int;
+	class_major_version : int;
+	class_constant_pool : bytes;
+	class_access_flags  : int;
+	class_this_class    : int;
+	class_super_class   : int;
+	class_interfaces    : int array;
+	class_fields        : jvm_field array;
+	class_methods       : jvm_field array;
+	class_attributes    : jvm_attribute array;
+}
+
+type jvm_exception = {
+	exc_start_pc   : int;
+	exc_end_pc     : int;
+	exc_handler_pc : int;
+	exc_catch_type : jvm_constant_pool_index option;
+}
+
+type jvm_code = {
+	code_max_stack  : int;
+	code_max_locals : int;
+	code_code       : bytes;
+	code_exceptions : jvm_exception array;
+	code_attributes : jvm_attribute array;
+}
+
+(* Opcodes *)
+
+type jbyte = int
+type jshort = int
+type jbranchoffset = int
+
+type jcmp =
+	| CmpEq
+	| CmpNe
+	| CmpLt
+	| CmpGe
+	| CmpGt
+	| CmpLe
+
+type opwide =
+	| OpWIinc of jshort * jshort
+	| OpWIload of jshort
+	| OpWFload of jshort
+	| OpWAload of jshort
+	| OpWLload of jshort
+	| OpWDload of jshort
+	| OpWIstore of jshort
+	| OpWFstore of jshort
+	| OpWAstore of jshort
+	| OpWLstore of jshort
+	| OpWDstore of jshort
+
+and jopcode =
+	(* double *)
+	| OpD2f
+	| OpD2i
+	| OpD2l
+	| OpDadd
+	| OpDaload
+	| OpDastore
+	| OpDcmpg
+	| OpDcmpl
+	| OpDdiv
+	| OpDconst_0
+	| OpDconst_1
+	| OpDload_0
+	| OpDload_1
+	| OpDload_2
+	| OpDload_3
+	| OpDload of jbyte
+	| OpDmul
+	| OpDneg
+	| OpDrem
+	| OpDreturn
+	| OpDstore_0
+	| OpDstore_1
+	| OpDstore_2
+	| OpDstore_3
+	| OpDstore of jbyte
+	| OpDsub
+	(* float *)
+	| OpF2d
+	| OpF2i
+	| OpF2l
+	| OpFadd
+	| OpFaload
+	| OpFastore
+	| OpFcmpg
+	| OpFcmpl
+	| OpFdiv
+	| OpFconst_0
+	| OpFconst_1
+	| OpFconst_2
+	| OpFload_0
+	| OpFload_1
+	| OpFload_2
+	| OpFload_3
+	| OpFload of jbyte
+	| OpFmul
+	| OpFneg
+	| OpFrem
+	| OpFreturn
+	| OpFstore_0
+	| OpFstore_1
+	| OpFstore_2
+	| OpFstore_3
+	| OpFstore of jbyte
+	| OpFsub
+	(* int *)
+	| OpI2b
+	| OpI2c
+	| OpI2d
+	| OpI2f
+	| OpI2l
+	| OpI2s
+	| OpIadd
+	| OpIaload
+	| OpIand
+	| OpIastore
+	| OpIconst_m1
+	| OpIconst_0
+	| OpIconst_1
+	| OpIconst_2
+	| OpIconst_3
+	| OpIconst_4
+	| OpIconst_5
+	| OpIdiv
+	| OpIload_0
+	| OpIload_1
+	| OpIload_2
+	| OpIload_3
+	| OpIload of jbyte
+	| OpImul
+	| OpIneg
+	| OpIor
+	| OpIrem
+	| OpIreturn
+	| OpIshl
+	| OpIshr
+	| OpIstore_0
+	| OpIstore_1
+	| OpIstore_2
+	| OpIstore_3
+	| OpIstore of jbyte
+	| OpIsub
+	| OpIushr
+	| OpIxor
+	(* long *)
+	| OpL2d
+	| OpL2f
+	| OpL2i
+	| OpLadd
+	| OpLaload
+	| OpLand
+	| OpLastore
+	| OpLconst_0
+	| OpLconst_1
+	| OpLcmp
+	| OpLdiv
+	| OpLload_0
+	| OpLload_1
+	| OpLload_2
+	| OpLload_3
+	| OpLload of jbyte
+	| OpLmul
+	| OpLneg
+	| OpLor
+	| OpLrem
+	| OpLreturn
+	| OpLshl
+	| OpLshr
+	| OpLstore_0
+	| OpLstore_1
+	| OpLstore_2
+	| OpLstore_3
+	| OpLstore of jbyte
+	| OpLsub
+	| OpLushr
+	| OpLxor
+	(* short *)
+	| OpSaload
+	| OpSastore
+	| OpSipush of jshort
+	(* array *)
+	| OpAaload
+	| OpAastore
+	| OpAnewarray of jvm_constant_pool_index
+	| OpArraylength
+	| OpBaload
+	| OpBastore
+	| OpBipush of jbyte
+	| OpCaload
+	| OpCastore
+	| OpMultianewarray of jvm_constant_pool_index * jbyte
+	| OpNewarray of jbyte
+	(* reference *)
+	| OpAload_0
+	| OpAload_1
+	| OpAload_2
+	| OpAload_3
+	| OpAload of jbyte
+	| OpAreturn
+	| OpAstore_0
+	| OpAstore_1
+	| OpAstore_2
+	| OpAstore_3
+	| OpAstore of jbyte
+	(* object *)
+	| OpNew of jvm_constant_pool_index
+	| OpInstanceof of jvm_constant_pool_index
+	| OpCheckcast of jvm_constant_pool_index
+	| OpInvokedynamic of jvm_constant_pool_index
+	| OpInvokeinterface of jvm_constant_pool_index * jbyte
+	| OpInvokespecial of jvm_constant_pool_index
+	| OpInvokestatic of jvm_constant_pool_index
+	| OpInvokevirtual of jvm_constant_pool_index
+	| OpGetfield of jvm_constant_pool_index
+	| OpGetstatic of jvm_constant_pool_index
+	| OpPutfield of jvm_constant_pool_index
+	| OpPutstatic of jvm_constant_pool_index
+	(* branching *)
+	| OpIf_acmpeq of jbranchoffset ref
+	| OpIf_acmpne of jbranchoffset ref
+	| OpIf_icmp of jcmp * jbranchoffset ref
+	| OpIf of jcmp * jbranchoffset ref
+	| OpIfnonnull of jbranchoffset ref
+	| OpIfnull of jbranchoffset ref
+	| OpGoto of jbranchoffset ref
+	| OpGoto_w of jbranchoffset ref
+	| OpJsr of jbranchoffset ref
+	| OpJsr_w of jbranchoffset ref
+	(* stack *)
+	| OpAconst_null
+	| OpDup
+	| OpDup_x1
+	| OpDup_x2
+	| OpDup2
+	| OpDup2_x1
+	| OpDup2_x2
+	| OpLdc of jbyte
+	| OpLdc_w of jvm_constant_pool_index
+	| OpLdc2_w of jvm_constant_pool_index
+	| OpNop
+	| OpPop
+	| OpPop2
+	| OpSwap
+	(* other *)
+	| OpAthrow
+	| OpIinc of jbyte * jbyte
+	| OpLookupswitch of int (* num pad bytes *) * jbranchoffset ref (* default *) * (Int32.t * jbranchoffset ref) array
+	| OpTableswitch of int (* num pad bytes *) * jbranchoffset ref (* default *) * Int32.t (* low *) * Int32.t (* high *) * jbranchoffset ref array
+	| OpMonitorenter
+	| OpMonitorexit
+	| OpRet of jbyte
+	| OpReturn
+	| OpWide of opwide
\ No newline at end of file
diff --git a/src/generators/jvm/jvmDebug.ml b/src/generators/jvm/jvmDebug.ml
new file mode 100644
index 0000000000000000000000000000000000000000..17c5d2e98ad2a4a6d54058c5d96ea4024677c966
--- /dev/null
+++ b/src/generators/jvm/jvmDebug.ml
@@ -0,0 +1,281 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open JvmGlobals
+open JvmData
+
+(* Printing debug functions *)
+
+let s_const pool const =
+	let rec loop depth const =
+		if depth = 3 then
+			"..."
+		else begin
+			let rec_find i = loop (depth + 1) (pool#get i) in
+			match const with
+			| ConstUtf8 s -> Printf.sprintf "Utf8 \"%s\"" s
+			| ConstInt i32 -> Printf.sprintf "Int %i" (Int32.to_int i32)
+			| ConstFloat f -> Printf.sprintf "Float %f" f
+			| ConstLong i64 -> Printf.sprintf "Int %i" (Int64.to_int i64)
+			| ConstDouble f -> Printf.sprintf "Double %f" f
+			| ConstClass i -> Printf.sprintf "Class(%s)" (rec_find i)
+			| ConstString i -> Printf.sprintf "String(%s)" (rec_find i)
+			| ConstFieldref(i1,i2) -> Printf.sprintf "Fieldref(%s, %s)" (rec_find i1) (rec_find i2)
+			| ConstMethodref(i1,i2) -> Printf.sprintf "Methodref(%s, %s)" (rec_find i1) (rec_find i2)
+			| ConstInterfaceMethodref(i1,i2) -> Printf.sprintf "InterfaceMethodref(%s, %s)" (rec_find i1) (rec_find i2)
+			| ConstNameAndType(i1,i2) -> Printf.sprintf "NameAndType(%s, %s)" (rec_find i1) (rec_find i2)
+			| ConstMethodHandle(i1,i2) -> Printf.sprintf "MethodHandle(%i, %s)" i1 (rec_find i2)
+			| ConstMethodType i -> Printf.sprintf "MethodType(%s)" (rec_find i)
+			| ConstInvokeDynamic(i1,i2) -> Printf.sprintf "InvokeDynamic(%i, %s)" i1 (rec_find i2)
+		end
+	in
+	loop 0 const
+
+let s_const_nice pool const =
+	let rec loop depth const =
+		if depth = 3 then
+			"..."
+		else begin
+			let rec_find i = loop (depth + 1) (pool#get i) in
+			match const with
+			| ConstUtf8 s -> Printf.sprintf "%s" s
+			| ConstInt i32 -> Printf.sprintf "%i" (Int32.to_int i32)
+			| ConstFloat f -> Printf.sprintf "%f" f
+			| ConstLong i64 -> Printf.sprintf "%i" (Int64.to_int i64)
+			| ConstDouble f -> Printf.sprintf "%f" f
+			| ConstClass i -> Printf.sprintf "%s" (rec_find i)
+			| ConstString i -> Printf.sprintf "%s" (rec_find i)
+			| ConstFieldref(i1,i2) -> Printf.sprintf "%s.%s" (rec_find i1) (rec_find i2)
+			| ConstMethodref(i1,i2) -> Printf.sprintf "%s.%s" (rec_find i1) (rec_find i2)
+			| ConstInterfaceMethodref(i1,i2) -> Printf.sprintf "%s.%s" (rec_find i1) (rec_find i2)
+			| ConstNameAndType(i1,i2) -> Printf.sprintf "%s:%s" (rec_find i1) (rec_find i2)
+			| ConstMethodHandle(i1,i2) -> Printf.sprintf "MethodHandle(%i, %s)" i1 (rec_find i2)
+			| ConstMethodType i -> Printf.sprintf "MethodType(%s)" (rec_find i)
+			| ConstInvokeDynamic(i1,i2) -> Printf.sprintf "InvokeDynamic(%i, %s)" i1 (rec_find i2)
+		end
+	in
+	loop 0 const
+
+let s_jcode pool code =
+  let wi s i = Printf.sprintf "%s %i" s i in
+  let sc i = s_const_nice pool (pool#get i) in
+  match code with
+  (* double *)
+  | OpD2f -> "d2f"
+  | OpD2i -> "d2i"
+  | OpD2l -> "d2l"
+  | OpDadd -> "dadd"
+  | OpDaload -> "daload"
+  | OpDastore -> "dastore"
+  | OpDcmpg -> "dcmpg"
+  | OpDcmpl -> "dcmpl"
+  | OpDdiv -> "ddiv"
+  | OpDconst_0 -> "dconst_0"
+  | OpDconst_1 -> "dconst_1"
+  | OpDload_0 -> "dload_0"
+  | OpDload_1 -> "dload_1"
+  | OpDload_2 -> "dload_2"
+  | OpDload_3 -> "dload_3"
+  | OpDload i -> wi "dload" i
+  | OpDmul -> "dmul"
+  | OpDneg -> "dneg"
+  | OpDrem -> "drem"
+  | OpDreturn -> "dreturn"
+  | OpDstore_0 -> "dstore_0"
+  | OpDstore_1 -> "dstore_1"
+  | OpDstore_2 -> "dstore_2"
+  | OpDstore_3 -> "dstore_3"
+  | OpDstore i -> wi "dstore" i
+  | OpDsub -> "dsub"
+  (* float *)
+  | OpF2d -> "f2d"
+  | OpF2i -> "f2i"
+  | OpF2l -> "f2l"
+  | OpFadd -> "fadd"
+  | OpFaload -> "faload"
+  | OpFastore -> "fastore"
+  | OpFcmpg -> "fcmpg"
+  | OpFcmpl -> "fcmpl"
+  | OpFdiv -> "fdiv"
+  | OpFconst_0 -> "fconst_0"
+  | OpFconst_1 -> "fconst_1"
+  | OpFconst_2 -> "fconst_2"
+  | OpFload_0 -> "fload_0"
+  | OpFload_1 -> "fload_1"
+  | OpFload_2 -> "fload_2"
+  | OpFload_3 -> "fload_3"
+  | OpFload i -> wi "fload" i
+  | OpFmul -> "fmul"
+  | OpFneg -> "fneg"
+  | OpFrem -> "frem"
+  | OpFreturn -> "freturn"
+  | OpFstore_0 -> "fstore_0"
+  | OpFstore_1 -> "fstore_1"
+  | OpFstore_2 -> "fstore_2"
+  | OpFstore_3 -> "fstore_3"
+  | OpFstore i -> wi "fstore" i
+  | OpFsub -> "fsub"
+  (* int *)
+  | OpI2b -> "i2b"
+  | OpI2c -> "i2c"
+  | OpI2d -> "i2d"
+  | OpI2f -> "i2f"
+  | OpI2l -> "i2l"
+  | OpI2s -> "i2s"
+  | OpIadd -> "iadd"
+  | OpIaload -> "iaload"
+  | OpIand -> "iand"
+  | OpIastore -> "iastore"
+  | OpIconst_m1 -> "iconst_m1"
+  | OpIconst_0 -> "iconst_0"
+  | OpIconst_1 -> "iconst_1"
+  | OpIconst_2 -> "iconst_2"
+  | OpIconst_3 -> "iconst_3"
+  | OpIconst_4 -> "iconst_4"
+  | OpIconst_5 -> "iconst_5"
+  | OpIdiv -> "idiv"
+  | OpIload_0 -> "iload_0"
+  | OpIload_1 -> "iload_1"
+  | OpIload_2 -> "iload_2"
+  | OpIload_3 -> "iload_3"
+  | OpIload i -> wi "iload" i
+  | OpImul -> "imul"
+  | OpIneg -> "ineg"
+  | OpIor -> "ior"
+  | OpIrem -> "irem"
+  | OpIreturn -> "ireturn"
+  | OpIshl -> "ishl"
+  | OpIshr -> "ishr"
+  | OpIstore_0 -> "istore_0"
+  | OpIstore_1 -> "istore_1"
+  | OpIstore_2 -> "istore_2"
+  | OpIstore_3 -> "istore_3"
+  | OpIstore i -> wi "istore" i
+  | OpIsub -> "isub"
+  | OpIushr -> "iushr"
+  | OpIxor -> "ixor"
+  (* long *)
+  | OpL2d -> "l2d"
+  | OpL2f -> "l2f"
+  | OpL2i -> "l2i"
+  | OpLadd -> "ladd"
+  | OpLaload -> "laload"
+  | OpLand -> "land"
+  | OpLastore -> "lastore"
+  | OpLconst_0 -> "lconst_0"
+  | OpLconst_1 -> "lconst_1"
+  | OpLcmp -> "lcmp"
+  | OpLdiv -> "ldiv"
+  | OpLload_0 -> "lload_0"
+  | OpLload_1 -> "lload_1"
+  | OpLload_2 -> "lload_2"
+  | OpLload_3 -> "lload_3"
+  | OpLload i -> wi "lload" i
+  | OpLmul -> "lmul"
+  | OpLneg -> "lneg"
+  | OpLor -> "lor"
+  | OpLrem -> "lrem"
+  | OpLreturn -> "lreturn"
+  | OpLshl -> "lshl"
+  | OpLshr -> "lshr"
+  | OpLstore_0 -> "lstore_0"
+  | OpLstore_1 -> "lstore_1"
+  | OpLstore_2 -> "lstore_2"
+  | OpLstore_3 -> "lstore_3"
+  | OpLstore i -> wi "lstore" i
+  | OpLsub -> "lsub"
+  | OpLushr -> "lushr"
+  | OpLxor -> "lxor"
+  (* short *)
+  | OpSaload -> "saload"
+  | OpSastore -> "sastore"
+  | OpSipush i -> wi "sipush" i
+  (* array *)
+  | OpAaload -> "aaload"
+  | OpAastore -> "aastore"
+  | OpAnewarray offset -> wi "anewarray" offset
+  | OpArraylength -> "arraylength"
+  | OpBaload -> "baload"
+  | OpBastore -> "bastore"
+  | OpBipush i -> wi "bipush" i
+  | OpCaload -> "caload"
+  | OpCastore -> "castore"
+  | OpMultianewarray(path,i) -> "multinewarray" (* TODO *)
+  | OpNewarray(jsig) -> "newarray" (* TODO *)
+  (* reference *)
+  | OpAload_0 -> "aload_0"
+  | OpAload_1 -> "aload_1"
+  | OpAload_2 -> "aload_2"
+  | OpAload_3 -> "aload_3"
+  | OpAload i -> wi "aload" i
+  | OpAreturn -> "areturn"
+  | OpAstore_0 -> "astore_0"
+  | OpAstore_1 -> "astore_1"
+  | OpAstore_2 -> "astore_2"
+  | OpAstore_3 -> "astore_3"
+  | OpAstore i -> wi "astore" i
+  (* object *)
+  | OpNew offset -> wi "new" offset
+  | OpInstanceof offset -> wi "instanceof" offset
+  | OpCheckcast offset -> wi "checkcast" offset
+  | OpInvokedynamic arg -> "invokedynamic"
+  | OpInvokeinterface(arg1,arg2) -> "invokeinterface"
+  | OpInvokespecial arg1 -> Printf.sprintf "invokespecial %s" (sc arg1)
+  | OpInvokestatic arg1 -> Printf.sprintf "invokestatic %s" (sc arg1)
+  | OpInvokevirtual arg1 -> Printf.sprintf "invokevirtual %s" (sc arg1)
+  | OpGetfield arg1 -> Printf.sprintf "getfield %s" (sc arg1)
+  | OpGetstatic arg1 -> Printf.sprintf "getstatic %s" (sc arg1)
+  | OpPutfield arg1 -> Printf.sprintf "putfield %s" (sc arg1)
+  | OpPutstatic arg1 -> Printf.sprintf "putstatic %s" (sc arg1)
+  (* branching *)
+  | OpIf_acmpeq i -> wi "acmpeq" !i
+  | OpIf_acmpne i -> wi "acmpne" !i
+  | OpIf_icmp(cmp,i) -> wi "if_icmp" !i (* TODO *)
+  | OpIf(cmp,i) -> wi "if" !i (* TODO *)
+  | OpIfnonnull i -> wi "ifnotnull" !i
+  | OpIfnull i -> wi "ifnull" !i
+  | OpGoto i -> wi "goto" !i
+  | OpGoto_w i -> wi "goto_w" !i
+  | OpJsr i -> wi "jsr" !i
+  | OpJsr_w i -> wi "jsr_w" !i
+  (* stack *)
+  | OpAconst_null -> "aconst_null"
+  | OpDup -> "dup"
+  | OpDup_x1 -> "dup_x1"
+  | OpDup_x2 -> "dup_x2"
+  | OpDup2 -> "dup2"
+  | OpDup2_x1 -> "dup2_x1"
+  | OpDup2_x2 -> "dup2_x2"
+  | OpLdc i -> wi "ldc" i
+  | OpLdc_w i -> wi "ldc_w" i
+  | OpLdc2_w i -> wi "ldc2_w" i
+  | OpNop -> "nop"
+  | OpPop -> "pop"
+  | OpPop2 -> "pop2"
+  | OpSwap -> "swap"
+  (* other *)
+  | OpAthrow -> "athrow"
+  | OpIinc(i1,i2) -> wi "iinc" i1 (* TODO *)
+  | OpLookupswitch _ -> "lookupswitch"
+  | OpMonitorenter -> "monitorenter"
+  | OpMonitorexit -> "monitorexit"
+  | OpRet i -> wi "ret" i
+  | OpReturn -> "return"
+  | OpTableswitch _ -> "tableswitch"
+  | OpWide _ -> "wide"
\ No newline at end of file
diff --git a/src/generators/jvm/jvmGlobals.ml b/src/generators/jvm/jvmGlobals.ml
new file mode 100644
index 0000000000000000000000000000000000000000..5f5a5d4715eb225428eb0641393b8c35ed67d89d
--- /dev/null
+++ b/src/generators/jvm/jvmGlobals.ml
@@ -0,0 +1,166 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+type jvm_constant_pool_index = int
+
+(* Constants *)
+
+type jvm_bootstrap_method_index = int
+
+type jvm_constant =
+	| ConstUtf8 of string
+	| ConstInt of int32
+	| ConstFloat of float
+	| ConstLong of int64
+	| ConstDouble of float
+	| ConstClass of jvm_constant_pool_index
+	| ConstString of jvm_constant_pool_index
+	| ConstFieldref of jvm_constant_pool_index * jvm_constant_pool_index
+	| ConstMethodref of jvm_constant_pool_index * jvm_constant_pool_index
+	| ConstInterfaceMethodref of jvm_constant_pool_index * jvm_constant_pool_index
+	| ConstNameAndType of jvm_constant_pool_index * jvm_constant_pool_index
+	| ConstMethodHandle of int * jvm_constant_pool_index
+	| ConstMethodType of jvm_constant_pool_index
+	| ConstInvokeDynamic of jvm_bootstrap_method_index * jvm_constant_pool_index
+
+type field_kind =
+	| FKField
+	| FKMethod
+	| FKInterfaceMethod
+
+type numeric_range =
+	| Int8Range
+	| Int16Range
+	| Int32Range
+
+let i320xFF = Int32.of_int 0xFF
+
+let get_numeric_range i =
+	if i >= -128 && i <= 127 then Int8Range
+	else if i >= -32768 && i <= 32767 then Int16Range
+	else Int32Range
+
+let get_numeric_range_unsigned i =
+	if i <= 0xFF then Int8Range
+	else if i <= 0xFFFF then Int16Range
+	else Int32Range
+
+let in_range unsigned range i = match (if unsigned then get_numeric_range_unsigned else get_numeric_range) i,range with
+	| Int8Range,(Int8Range | Int16Range | Int32Range) -> true
+	| Int16Range,(Int16Range | Int32Range) -> true
+	| Int32Range,Int32Range -> true
+	| _ -> false
+
+let jerror s =
+	failwith s
+
+module ClassAccessFlags = struct
+	type t =
+		| CPublic
+		| CFinal
+		| CSuper
+		| CInterface
+		| CAbstract
+		| CSynthetic
+		| CAnnotation
+		| CEnum
+
+	let to_int = function
+		| CPublic -> 0x1
+		| CFinal -> 0x10
+		| CSuper -> 0x20
+		| CInterface -> 0x200
+		| CAbstract -> 0x400
+		| CSynthetic -> 0x1000
+		| CAnnotation -> 0x2000
+		| CEnum -> 0x4000
+
+	let has_flag b flag =
+		b land (to_int flag) <> 0
+end
+
+module MethodAccessFlags = struct
+	type t =
+		| MPublic
+		| MPrivate
+		| MProtected
+		| MStatic
+		| MFinal
+		| MSynchronized
+		| MBridge
+		| MVarargs
+		| MNative
+		| MAbstract
+		| MStrict
+		| MSynthetic
+
+	let to_int = function
+		| MPublic -> 0x1
+		| MPrivate -> 0x2
+		| MProtected -> 0x4
+		| MStatic -> 0x8
+		| MFinal -> 0x10
+		| MSynchronized -> 0x20
+		| MBridge -> 0x40
+		| MVarargs -> 0x80
+		| MNative -> 0x100
+		| MAbstract -> 0x400
+		| MStrict -> 0x800
+		| MSynthetic -> 0x1000
+
+	let has_flag b flag =
+		b land (to_int flag) <> 0
+end
+
+module FieldAccessFlags = struct
+	type t =
+		| FdPublic
+		| FdPrivate
+		| FdProtected
+		| FdStatic
+		| FdFinal
+		| FdVolatile
+		| FdTransient
+		| FdSynthetic
+		| FdEnum
+
+	let to_int = function
+		| FdPublic -> 0x1
+		| FdPrivate -> 0x2
+		| FdProtected -> 0x4
+		| FdStatic -> 0x8
+		| FdFinal -> 0x10
+		| FdVolatile -> 0x40
+		| FdTransient -> 0x80
+		| FdSynthetic -> 0x1000
+		| FdEnum -> 0x4000
+
+	let has_flag b flag =
+		b land (to_int flag) <> 0
+end
+
+let write_byte ch i = IO.write_byte ch i
+let write_bytes ch b = IO.nwrite ch b
+let write_ui16 ch i = IO.BigEndian.write_ui16 ch i
+let write_ui32 ch i = IO.BigEndian.write_real_i32 ch (Int32.of_int i)
+let write_string ch s = IO.nwrite_string ch s
+
+let write_array16 ch f a =
+	write_ui16 ch (Array.length a);
+	Array.iter (f ch) a
\ No newline at end of file
diff --git a/src/generators/jvm/jvmMethod.ml b/src/generators/jvm/jvmMethod.ml
new file mode 100644
index 0000000000000000000000000000000000000000..03d7b520c6ffab4e763217b230f7f8423d74bc22
--- /dev/null
+++ b/src/generators/jvm/jvmMethod.ml
@@ -0,0 +1,844 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open JvmGlobals
+open JvmData
+open JvmAttribute
+open JvmSignature
+open JvmSignature.NativeSignatures
+open JvmBuilder
+
+(* High-level method builder. *)
+
+type var_init_state =
+	| VarArgument
+	| VarWillInit
+	| VarNeedDefault
+
+type construction_kind =
+	| ConstructInitPlusNew
+	| ConstructInit
+
+module NativeArray = struct
+	let read code ja je = match je with
+		| TBool -> code#baload TBool ja
+		| TByte -> code#baload TByte ja
+		| TChar -> code#caload ja
+		| TDouble -> code#daload ja
+		| TFloat -> code#faload ja
+		| TInt -> code#iaload ja
+		| TLong -> code#laload ja
+		| TShort -> code#saload ja
+		| _ -> code#aaload ja je
+
+	let write code ja je = match je with
+		| TBool -> code#bastore TBool ja
+		| TByte -> code#bastore TByte ja
+		| TChar -> code#castore ja
+		| TDouble -> code#dastore ja
+		| TFloat -> code#fastore ja
+		| TInt -> code#iastore ja
+		| TLong -> code#lastore ja
+		| TShort -> code#sastore ja
+		| _ -> code#aastore ja je
+
+	let create code pool je =
+		let ja = (TArray(je,None)) in
+		let primitive i =
+			code#newarray ja i
+		in
+		let reference path =
+			let offset = pool#add_path path in
+			code#anewarray ja offset;
+		in
+		begin match je with
+		| TBool -> primitive 4
+		| TChar -> primitive 5
+		| TFloat -> primitive 6
+		| TDouble -> primitive 7
+		| TByte -> primitive 8
+		| TShort -> primitive 9
+		| TInt -> primitive 10
+		| TLong -> primitive 11
+		| TObject(path,_) -> reference path
+		| TMethod _ -> reference NativeSignatures.method_handle_path
+		| TTypeParameter _ -> reference NativeSignatures.object_path
+		| TArray _ ->
+			let offset = pool#add_type (generate_signature false je) in
+			code#anewarray ja offset
+		| TObjectInner _ | TUninitialized _ -> assert false
+		end;
+		ja
+end
+
+class builder jc name jsig = object(self)
+	inherit base_builder
+	val code = new JvmCode.builder jc#get_pool
+
+	val mutable max_num_locals = 0
+	val mutable debug_locals = []
+	val mutable stack_frames = []
+	val mutable exceptions = []
+	val mutable argument_locals = []
+	val mutable thrown_exceptions = Hashtbl.create 0
+
+	(* per-branch *)
+	val mutable terminated = false
+
+	(* per-frame *)
+	val mutable locals = []
+	val mutable local_offset = 0
+
+	method has_method_flag flag =
+		MethodAccessFlags.has_flag access_flags flag
+
+	(** Pushes a new scope onto the stack. Returns a function which when called reverts to the previous state. **)
+	method push_scope =
+		let old_locals = locals in
+		let old_offset = local_offset in
+		(fun () ->
+			let delta = local_offset - old_offset in
+			let fp_end = code#get_fp in
+			let rec loop i l =
+				if i = 0 then
+					()
+				else begin match l with
+					| (fpo,name,t) :: l ->
+						let fp = match !fpo with
+							| None -> failwith ("Uninitialized local " ^ name);
+							| Some fp -> fp
+						in
+						let ld = {
+							ld_start_pc = fp;
+							ld_length = fp_end - fp;
+							ld_name_index = jc#get_pool#add_string name;
+							ld_descriptor_index = jc#get_pool#add_string (generate_signature false t);
+							ld_index = old_offset + i - 1;
+						} in
+						debug_locals <- ld :: debug_locals;
+						loop (i - (signature_size t)) l
+					| [] ->
+						assert false
+				end
+			in
+			loop delta locals;
+			locals <- old_locals;
+			local_offset <- old_offset;
+		)
+
+	method private get_locals_for_stack_frame locals =
+		List.map (fun (init,_,t) ->
+			match !init with
+			| None -> JvmVerificationTypeInfo.VTop
+			| _ -> JvmVerificationTypeInfo.of_signature jc#get_pool t
+		) locals
+
+	(** Adds the current state of locals and stack as a stack frame. This has to be called on every branch target. **)
+	method add_stack_frame =
+		let locals = self#get_locals_for_stack_frame locals in
+		let astack = List.map (JvmVerificationTypeInfo.of_signature jc#get_pool) (code#get_stack#get_stack) in
+		let r = code#get_fp in
+		let ff = (r,locals,astack) in
+		(* If we already have a frame at the same position, overwrite it. This can happen in the case of nested branches. *)
+		stack_frames <- (match stack_frames with
+			| (r',_,_) :: stack_frames when r' = r -> ff :: stack_frames
+			| _ -> ff :: stack_frames)
+
+	(** Adds [exc] as an exception. This will be added to the Code attribute. **)
+	method add_exception (exc : jvm_exception) =
+		exceptions <- exc :: exceptions
+
+	(** Adds [path] as a thrown exception for this method. Deals with duplicates. **)
+	method add_thrown_exception (path : jpath) =
+		Hashtbl.replace thrown_exceptions (jc#get_pool#add_path path) true
+
+	(* Convenience *)
+
+	(** Adds [s] as a string constant to the constant pool and emits an instruction to load it. **)
+	method string s =
+		let offset = jc#get_pool#add_const_string s in
+		code#sconst (string_sig) offset
+
+	(** Emits an invokevirtual instruction to invoke method [name] on [path] with signature [jsigm]. **)
+	method invokevirtual (path : jpath) (name : string) (jsigm : jsignature) = match jsigm with
+		| TMethod(tl,tr) ->
+			let offset = code#get_pool#add_field path name jsigm FKMethod in
+			code#invokevirtual offset (object_path_sig path) tl (match tr with None -> [] | Some tr -> [tr])
+		| _ -> assert false
+
+	(** Emits an invokeinterface instruction to invoke method [name] on [path] with signature [jsigm]. **)
+	method invokeinterface (path : jpath) (name : string) (jsigm : jsignature) = match jsigm with
+		| TMethod(tl,tr) ->
+			let offset = code#get_pool#add_field path name jsigm FKInterfaceMethod in
+			code#invokeinterface offset (object_path_sig path) tl (match tr with None -> [] | Some tr -> [tr])
+		| _ -> assert false
+
+	(** Emits an invokespecial instruction to invoke method [name] on [path] with signature [jsigm]. **)
+	method invokespecial (path : jpath) (name : string) (jsigm : jsignature) = match jsigm with
+		| TMethod(tl,tr) ->
+			let offset = code#get_pool#add_field path name jsigm FKMethod in
+			code#invokespecial offset (object_path_sig path) tl (match tr with None -> [] | Some tr -> [tr])
+		| _ -> assert false
+
+	(** Emits an invokestatic instruction to invoke method [name] on [path] with signature [jsigm]. **)
+	method invokestatic (path : jpath) (name : string) (jsigm : jsignature) = match jsigm with
+		| TMethod(tl,tr) ->
+			let offset = code#get_pool#add_field path name jsigm FKMethod in
+			code#invokestatic offset tl (match tr with None -> [] | Some tr -> [tr])
+		| _ -> assert false
+
+	(** Emits a getfield instruction to get the value of field [name] on object [path] with signature [jsigf]. **)
+	method getfield (path : jpath) (name : string) (jsigf : jsignature) =
+		let offset = code#get_pool#add_field path name jsigf FKField in
+		code#getfield offset (object_path_sig path) jsigf
+
+	(** Emits a putfield instruction to set the value of field [name] on object [path] with signature [jsigf]. **)
+	method putfield (path : jpath) (name : string) (jsigf : jsignature) =
+		let offset = code#get_pool#add_field path name jsigf FKField in
+		code#putfield offset (object_path_sig path) jsigf
+
+	(** Emits a getstatic instruction to get the value of field [name] on Class [path] with signature [jsigf]. **)
+	method getstatic (path : jpath) (name : string) (jsigf : jsignature) =
+		let offset = code#get_pool#add_field path name jsigf FKField in
+		code#getstatic offset jsigf
+
+	(** Emits a putstatic instruction to set the value of field [name] on Class [path] with signature [jsigf]. **)
+	method putstatic (path : jpath) (name : string) (jsigf : jsignature) =
+		let offset = code#get_pool#add_field path name jsigf FKField in
+		code#putstatic offset jsigf
+
+	(** Loads `this` **)
+	method load_this =
+		code#aload self#get_this_sig 0
+
+	(** Calls the parent constructor with signature [jsig_method] using the specified construction_kind [kind]. **)
+	method call_super_ctor (kind : construction_kind) (jsig_method : jsignature) =
+		assert (not (self#has_method_flag MStatic));
+		match kind with
+		| ConstructInitPlusNew ->
+			self#invokespecial jc#get_super_path "new" jsig_method;
+		| ConstructInit ->
+			self#invokespecial jc#get_super_path "<init>" jsig_method;
+			self#set_this_initialized
+
+	(** Adds a field named [name] with signature [jsig_field] to the enclosing class, and adds an argument with the same name
+	    to this method. The argument value is loaded and stored into the field immediately. **)
+	method add_argument_and_field (name : string) (jsig_field : jsignature) =
+		assert (not (self#has_method_flag MStatic));
+		let jf = new builder jc name jsig_field in
+		jf#add_access_flag 1;
+		jc#add_field jf#export_field;
+		let _,load,_ = self#add_local name jsig_field VarArgument in
+		self#load_this;
+		load();
+		self#putfield jc#get_this_path name jsig_field;
+
+	(** Constructs a [path] object using the specified construction_kind [kind].
+
+	    The function [f] is invokved to handle the call arguments. Its returned jsignature list is then used as the
+		method type of the constructor to invoke.
+
+	    If [no_value] is true, this function ensures that the stack is neutral. Otherwise, the created object is pushed
+		onto the stack.
+	**)
+	method construct ?(no_value=false) (kind : construction_kind) (path : jpath) (f : unit -> jsignature list) =
+		let pool = code#get_pool in
+		let offset = pool#add_path path in
+		code#new_ offset;
+		match kind with
+		| ConstructInitPlusNew ->
+			code#dup;
+			code#aconst_null haxe_empty_constructor_sig;
+			self#invokespecial path "<init>" (method_sig [haxe_empty_constructor_sig] None);
+			if not no_value then self#set_top_initialized (object_path_sig path);
+			if not no_value then code#dup;
+			let jsigs = f () in
+			self#invokevirtual path "new" (method_sig jsigs None);
+		| ConstructInit ->
+			if not no_value then code#dup;
+			let jsigs = f () in
+			self#invokespecial path "<init>" (method_sig jsigs None);
+			if not no_value then self#set_top_initialized (object_path_sig path)
+
+	(** Loads the default value corresponding to a given signature. **)
+	method load_default_value = function
+		| TByte | TBool | TChar | TShort | TInt ->
+			code#iconst Int32.zero;
+		| TFloat -> code#fconst 0.
+		| TDouble -> code#dconst 0.
+		| TLong -> code#lconst Int64.zero
+		| jsig -> code#aconst_null jsig
+
+	(** Constructs a new native array with element type [jsig].
+
+	    Iterates over [fl] and invokes the functions to handle the array elements.
+	**)
+	method new_native_array (jsig : jsignature) (fl : (unit -> unit) list) =
+		code#iconst (Int32.of_int (List.length fl));
+		let jasig = NativeArray.create code jc#get_pool jsig in
+		List.iteri (fun i f ->
+			code#dup;
+			code#iconst (Int32.of_int i);
+			f();
+			self#cast jsig;
+			NativeArray.write code jasig jsig
+		) fl
+
+	(** Adds a closure to method [name] ob [path] with signature [jsig_method] to the constant pool.
+
+	    Also emits an instruction to load the closure.
+	**)
+	method read_closure is_static path name jsig_method =
+		let offset = code#get_pool#add_field path name jsig_method FKMethod in
+		let offset = code#get_pool#add (ConstMethodHandle((if is_static then 6 else 5), offset)) in
+		code#ldc offset jsig_method
+
+	(**
+		Emits a return instruction.
+	**)
+	method return = match jsig with
+		| TMethod(_,tr) ->
+			begin match tr with
+			| None ->
+				code#return_void
+			| Some jsig ->
+				code#return_value jsig
+			end
+		| _ ->
+			assert false
+
+	(* casting *)
+
+	(** Checks if the stack top is a basic type and wraps accordingly. **)
+	method expect_reference_type =
+		let wrap_null jsig name =
+			let path = (["java";"lang"],name) in
+			self#invokestatic path "valueOf" (method_sig [jsig] (Some (object_path_sig path)))
+		in
+		match code#get_stack#top with
+		| TByte as t -> wrap_null t "Byte"
+		| TChar as t -> wrap_null t "Character"
+		| TDouble as t -> wrap_null t "Double"
+		| TFloat as t -> wrap_null t "Float"
+		| TInt as t -> wrap_null t "Integer"
+		| TLong as t -> wrap_null t "Long"
+		| TShort as t -> wrap_null t "Short"
+		| TBool as t -> wrap_null t "Boolean"
+		| _ -> ()
+
+	method private expect_basic_type ?(not_null=false) jsig =
+		if not_null then begin
+			let unwrap_null tname name =
+				let path = (["java";"lang"],tname) in
+				self#cast (get_boxed_type jsig);
+				self#invokevirtual path name (method_sig [] (Some jsig))
+			in
+			match jsig with
+			| TByte -> unwrap_null "Number" "byteValue"
+			| TChar -> unwrap_null "Character" "charValue"
+			| TDouble -> unwrap_null "Number" "doubleValue"
+			| TFloat -> unwrap_null "Number" "floatValue"
+			| TInt -> unwrap_null "Number" "intValue"
+			| TLong -> unwrap_null "Number" "longValue"
+			| TShort -> unwrap_null "Number" "shortValue"
+			| TBool -> unwrap_null "Boolean" "booleanValue"
+			| _ -> ()
+		end else begin
+			let unwrap_null tname name =
+				self#invokestatic (["haxe";"jvm"],"Jvm") name (method_sig [object_sig] (Some jsig))
+			in
+			match jsig with
+			| TByte -> unwrap_null "Byte" "toByte"
+			| TChar -> unwrap_null "Character" "toChar"
+			| TDouble -> unwrap_null "Double" "toDouble"
+			| TFloat -> unwrap_null "Float" "toFloat"
+			| TInt -> unwrap_null "Integer" "toInt"
+			| TLong -> unwrap_null "Long" "toLong"
+			| TShort -> unwrap_null "Short" "toShort"
+			| TBool -> unwrap_null "Boolean" "toBoolean"
+			| _ -> ()
+		end
+
+	method adapt_method jsig =
+		()
+		(* let offset = code#get_pool#add_string (generate_method_signature false jsig) in
+		let offset = code#get_pool#add (ConstMethodType offset) in
+		self#get_code#dup;
+		self#if_then
+			(fun () -> self#get_code#if_null_ref jsig)
+			(fun () ->
+				code#ldc offset method_type_sig;
+				self#invokevirtual method_handle_path "asType" (method_sig [method_type_sig] (Some method_handle_sig))
+			);
+		ignore(code#get_stack#pop);
+		code#get_stack#push jsig; *)
+
+	(** Casts the top of the stack to [jsig]. If [allow_to_string] is true, Jvm.toString is called. **)
+	method cast ?(not_null=false) ?(allow_to_string=false) jsig =
+		let jsig' = code#get_stack#top in
+		begin match jsig,jsig' with
+		| TObject((["java";"lang"],"Double"),_),TInt ->
+			code#i2d;
+			self#expect_reference_type;
+		| TObject((["java";"lang"],"Double"),_),TObject((["java";"lang"],"Integer"),_) ->
+			self#invokestatic (["haxe";"jvm"],"Jvm") "nullIntToNullFloat" (method_sig [integer_sig] (Some double_sig))
+		| TObject((["java";"lang"],"Double"),_),TObject((["java";"lang"],"Object"),_) ->
+			self#invokestatic (["haxe";"jvm"],"Jvm") "dynamicToNullFloat" (method_sig [object_sig] (Some double_sig))
+		(* from double *)
+		| TFloat,TDouble ->
+			code#d2f
+		| TInt,TDouble ->
+			code#d2i;
+		| TLong,TDouble ->
+			code#d2l;
+		(* from float *)
+		| TDouble,TFloat ->
+			code#f2d
+		| TInt,TFloat ->
+			code#f2i;
+		| TLong,TFloat ->
+			code#f2l;
+		(* from int *)
+		| TBool,TInt ->
+			ignore(code#get_stack#pop);
+			code#get_stack#push TBool;
+		| TByte,TInt ->
+			code#i2b TByte
+		| TChar,TInt ->
+			code#i2c
+		| TDouble,TInt ->
+			code#i2d;
+		| TFloat,TInt ->
+			code#i2f
+		| TLong,TInt ->
+			code#i2l;
+		| TShort,TInt ->
+			code#i2s
+		(* from long *)
+		| TDouble,TLong ->
+			code#l2d;
+		| TFloat,TLong ->
+			code#l2f
+		| TInt,TLong ->
+			code#l2i;
+		(* widening *)
+		| TInt,(TByte | TShort | TChar) ->
+			(* No cast, but rewrite stack top *)
+			ignore(code#get_stack#pop);
+			code#get_stack#push jsig;
+		| TObject(path1,_),TObject(path2,_) when path1 = path2 ->
+			()
+		| TObject((["java";"lang"],"String"),_),_ when allow_to_string ->
+			self#expect_reference_type;
+			self#invokestatic (["haxe";"jvm"],"Jvm") "toString" (method_sig [object_sig] (Some string_sig))
+		| TObject(path1,_),TObject(path2,_) ->
+			if path1 = object_path then begin
+				(* We should never need a checkcast to Object, but we should adjust the stack so stack maps are wide enough *)
+				ignore(code#get_stack#pop);
+				code#get_stack#push object_sig
+			end else
+				code#checkcast path1;
+		| TObject(path,_),TTypeParameter _ ->
+			code#checkcast path
+		| TMethod _,TMethod _ ->
+			if jsig <> jsig' then self#adapt_method jsig;
+		| TMethod _,TObject((["java";"lang";"invoke"],"MethodHandle"),_) ->
+			self#adapt_method jsig;
+		| TObject((["java";"lang";"invoke"],"MethodHandle"),_),TMethod _ ->
+			()
+		| TMethod _,_ ->
+			code#checkcast (["java";"lang";"invoke"],"MethodHandle");
+		| TArray(jsig1,_),TArray(jsig2,_) when jsig1 = jsig2 ->
+			()
+		| TArray _,_ ->
+			code#checkcast_sig jsig
+		| t1,t2 ->
+			match is_unboxed t1,is_unboxed t2 with
+			| true,false -> self#expect_basic_type ~not_null t1
+			| false,true -> self#expect_reference_type
+			| _ -> ()
+		end
+
+	(* branches *)
+
+	(** Starts a branch. Returns a restore function which reverts the stack and termination status back
+	    to the previous state. The restore function can be called multiple times for multiple branches.
+
+		This function has no effect on locals. Use [push_scope] for them.
+	**)
+	method start_branch =
+		let save = code#get_stack#save in
+		let old_terminated = terminated in
+		(fun () ->
+			code#get_stack#restore save;
+			terminated <- old_terminated;
+		)
+
+	(** Generates code which executes [f_if()] and then branches into [f_then()] and [f_else()]. **)
+	method if_then_else (f_if : unit -> jbranchoffset ref) (f_then : unit -> unit) (f_else : unit -> unit) =
+		let jump_then = f_if () in
+		let restore = self#start_branch in
+		let pop = self#push_scope in
+		f_then();
+		pop();
+		let r_then = ref code#get_fp in
+		let term_then = self#is_terminated in
+		if not term_then then code#goto r_then;
+		jump_then := code#get_fp - !jump_then;
+		restore();
+		self#add_stack_frame;
+		let pop = self#push_scope in
+		f_else();
+		pop();
+		self#set_terminated (term_then && self#is_terminated);
+		r_then := code#get_fp - !r_then;
+		if not self#is_terminated then self#add_stack_frame
+
+	(** Generates code which executes [f_if()] and then branches into [f_then()], if the condition holds. **)
+	method if_then (f_if : unit -> jbranchoffset ref) (f_then : unit -> unit) =
+		let jump_then = f_if () in
+		let restore = self#start_branch in
+		let pop = self#push_scope in
+		f_then();
+		pop();
+		restore();
+		jump_then := code#get_fp - !jump_then;
+		self#add_stack_frame
+
+	(**
+		Returns an instruction offset and emits a goto instruction to it if this method isn't terminated.
+	**)
+	method maybe_make_jump =
+		let r = ref code#get_fp in
+		if not self#is_terminated then code#goto r;
+		r
+
+	(**
+		Closes the list of instruction offsets [rl], effectively making them jump to the current fp.
+
+		Also generates a stack map frame unless [is_exhaustive] is true and all branches terminated.
+	**)
+	method close_jumps is_exhaustive rl =
+		let fp' = code#get_fp in
+		let term = List.fold_left (fun term (term',r) ->
+			r := fp' - !r;
+			term && term'
+		) true rl in
+		let term = is_exhaustive && term in
+		self#set_terminated term;
+		if not term then self#add_stack_frame;
+
+
+	(**
+		Emits a tableswitch or lookupswitch instruction, depending on which one makes more sense.
+
+		The switch subject is expected to be on the stack before calling this function.
+
+		If [is_exhaustive] is true and [def] is None, the first case is used as the default case.
+	**)
+	method int_switch (is_exhaustive : bool) (cases : (Int32.t list * (unit -> unit)) list) (def : (unit -> unit) option) =
+		let def,cases = match def,cases with
+			| None,(_,ec) :: cases when is_exhaustive ->
+				Some ec,cases
+			| _ ->
+				def,cases
+		in
+		let flat_cases = DynArray.create () in
+		let case_lut = ref Int32Map.empty in
+		let fp = code#get_fp in
+		let imin = ref Int32.min_int in
+		let imax = ref Int32.max_int in
+		let cases = List.map (fun (il,f) ->
+			let rl = List.map (fun i32 ->
+				let r = ref fp in
+				if i32 < !imin then imin := i32;
+				if i32 > !imax then imax := i32;
+				DynArray.add flat_cases (i32,r);
+				case_lut := Int32Map.add i32 r !case_lut;
+				r
+			) il in
+			(rl,f)
+		) cases in
+		let offset_def = ref fp in
+		(* No idea what's a good heuristic here... *)
+		let diff = Int32.sub !imax !imin in
+		let use_tableswitch = diff < (Int32.of_int (DynArray.length flat_cases + 10)) && diff >= Int32.zero (* #8388 *) in
+		if use_tableswitch then begin
+			let offsets = Array.init (Int32.to_int (Int32.sub !imax !imin) + 1) (fun i ->
+				try Int32Map.find (Int32.add (Int32.of_int i) !imin) !case_lut
+				with Not_found -> offset_def
+			) in
+			code#tableswitch offset_def !imin !imax offsets
+		end else begin
+			let a = DynArray.to_array flat_cases in
+			Array.sort (fun (i1,_) (i2,_) -> compare i1 i2) a;
+			code#lookupswitch offset_def a;
+		end;
+		let restore = self#start_branch in
+		let offset_exit = ref code#get_fp in
+		let def_term,r_def = match def with
+			| None ->
+				true,ref 0
+			| Some f ->
+				offset_def := code#get_fp - !offset_def;
+				self#add_stack_frame;
+				let pop_scope = self#push_scope in
+				f();
+				pop_scope();
+				self#is_terminated,self#maybe_make_jump
+		in
+		let rec loop acc cases = match cases with
+		| (rl,f) :: cases ->
+			restore();
+			self#add_stack_frame;
+			List.iter (fun r -> r := code#get_fp - !r) rl;
+			let pop_scope = self#push_scope in
+			f();
+			pop_scope();
+			let r = if cases = [] then ref 0 else self#maybe_make_jump in
+			loop ((self#is_terminated,r) :: acc) cases
+		| [] ->
+			List.rev acc
+		in
+		let rl = loop [] cases in
+		self#close_jumps (def <> None) ((def_term,if def = None then offset_def else r_def) :: rl);
+		if def = None then code#get_fp else !offset_exit
+
+	(** Adds a local with a given [name], signature [jsig] and an [init_state].
+	    This function returns a tuple consisting of:
+
+		  * The slot of the local
+		  * The function to load the value
+		  * The function to store a value
+
+		If [init_state = VarNeedDefault], the local is initialized to a default value matching [jsig].
+		If [init_state = VarArgument], the local is considered initialized.
+		If [init_state = VarWillInit], this function assumes that the returned [store] function will be called appropriately.
+	**)
+	method add_local (name : string) (jsig : jsignature) (init_state : var_init_state) =
+		let slot = local_offset in
+		let load,store,d = match jsig with
+			| TInt | TBool | TByte | TShort | TChar ->
+				if init_state = VarNeedDefault then begin
+					code#iconst Int32.zero;
+					code#istore slot
+				end;
+				(fun () -> code#iload ~jsig slot),(fun () -> code#istore slot),1
+			| TLong ->
+				if init_state = VarNeedDefault then begin
+					code#lconst Int64.zero;
+					code#lstore slot
+				end;
+				(fun () -> code#lload slot),(fun () -> code#lstore slot),2
+			| TFloat ->
+				if init_state = VarNeedDefault then begin
+					code#fconst 0.;
+					code#fstore slot
+				end;
+				(fun () -> code#fload slot),(fun () -> code#fstore slot),1
+			| TDouble ->
+				if init_state = VarNeedDefault then begin
+					code#dconst 0.;
+					code#dstore slot
+				end;
+				(fun () -> code#dload slot),(fun () -> code#dstore slot),2
+			| _ ->
+				if init_state = VarNeedDefault then begin
+					code#aconst_null jsig;
+					code#astore jsig slot
+				end;
+				(fun () -> code#aload jsig slot),(fun () -> code#astore jsig slot),1
+		in
+		let init = ref None in
+		locals <- (init,name,jsig) :: locals;
+		local_offset <- local_offset + d;
+		if local_offset > max_num_locals then max_num_locals <- local_offset;
+		let check_store =
+			let did_store = ref false in
+			(fun () ->
+				if not !did_store then begin
+					did_store := true;
+					init := Some (code#get_fp)
+				end
+			)
+		in
+		begin match init_state with
+		| VarArgument | VarNeedDefault -> check_store();
+		| _ -> ()
+		end;
+		slot,
+		load,
+		(fun () ->
+			store();
+			check_store();
+		)
+
+	method get_this_sig =
+		let rec loop locals = match locals with
+			| [(_,_,jsig)] -> jsig
+			| _ :: locals -> loop locals
+			| [] -> assert false
+		in
+		loop locals
+
+	method set_this_initialized =
+		let rec loop acc locals = match locals with
+			| [(init,name,_)] -> List.rev ((init,name,jc#get_jsig) :: acc)
+			| [] -> assert false
+			| l :: locals -> loop (l :: acc) locals
+		in
+		locals <- loop [] locals
+
+	method set_top_initialized jsig =
+		ignore(code#get_stack#pop);
+		code#get_stack#push jsig
+
+	(** This function has to be called once all arguments are declared. *)
+	method finalize_arguments =
+		argument_locals <- locals
+
+	method private get_stack_map_table =
+		let argument_locals = self#get_locals_for_stack_frame argument_locals in
+		let stack_map = List.fold_left (fun ((last_offset,last_locals,last_locals_length),acc) (offset,locals,stack) ->
+			let cur = offset - last_offset - 1 in
+			let a_locals = Array.of_list (List.rev locals) in
+			let locals_length = Array.length a_locals in
+			let default () =
+				StackFull(cur,a_locals,Array.of_list (List.rev stack))
+			in
+			let entry = match stack,locals_length - last_locals_length with
+			| [],0 ->
+				if last_locals = locals then begin
+					if cur < 64 then StackSame cur
+					else StackSameExtended cur
+				end else
+					default()
+			| [vt],0 ->
+				if last_locals = locals then begin
+					if cur < 64 then Stack1StackItem(cur,vt)
+					else Stack1StackItemExtended(cur,vt)
+				end else
+					default()
+			| [],1 ->
+				begin match locals with
+				| vt1 :: locals when locals = last_locals -> StackAppend1(cur,vt1)
+				| _ -> default()
+				end
+			| [],2 ->
+				begin match locals with
+				| vt1 :: vt2 :: locals when locals = last_locals -> StackAppend2(cur,vt2,vt1)
+				| _ -> default()
+				end
+			| [],3 ->
+				begin match locals with
+				| vt1 :: vt2 :: vt3 :: locals when locals = last_locals -> StackAppend3(cur,vt3,vt2,vt1)
+				| _ -> default()
+				end
+			| [],-1 ->
+				begin match last_locals with
+				| _ :: last_locals when locals = last_locals -> StackChop1 cur
+				| _ -> default()
+				end
+			| [],-2 ->
+				begin match last_locals with
+				| _ :: _ :: last_locals when locals = last_locals -> StackChop2 cur
+				| _ -> default()
+				end
+			| [],-3 ->
+				begin match last_locals with
+				| _ :: _ :: _ :: last_locals when locals = last_locals -> StackChop3 cur
+				| _ -> default()
+				end
+			| _ ->
+				default()
+			in
+			((offset,locals,locals_length),entry :: acc)
+		) ((-1,argument_locals,List.length argument_locals),[]) (List.rev stack_frames) in
+		Array.of_list (List.rev (snd stack_map))
+
+	method get_code = code
+	method is_terminated = terminated
+	method get_name = name
+	method get_jsig = jsig
+	method set_terminated b = terminated <- b
+
+	method private get_jcode (config : export_config) =
+		let attributes = DynArray.create () in
+		let lines = code#get_lines in
+		if config.export_debug && DynArray.length lines > 0 then
+			DynArray.add attributes (AttributeLineNumberTable (DynArray.to_array lines));
+		let stack_map_table = self#get_stack_map_table in
+		if Array.length stack_map_table > 0 then
+			DynArray.add attributes (AttributeStackMapTable stack_map_table);
+		let exceptions = Array.of_list (List.rev exceptions) in
+		let attributes = List.map (JvmAttribute.write_attribute jc#get_pool) (DynArray.to_list attributes) in
+		{
+			code_max_stack = code#get_max_stack_size;
+			code_max_locals = max_num_locals;
+			code_code = code#export_code;
+			code_exceptions = exceptions;
+			code_attributes = Array.of_list attributes;
+		}
+
+	(** Exports the method as a [jvm_field]. No other functions should be called on this object afterwards. *)
+	method export_method (config : export_config) =
+		assert (not was_exported);
+		was_exported <- true;
+		self#commit_annotations jc#get_pool;
+		if code#get_fp > 0 then begin
+			let code = self#get_jcode config in
+			self#add_attribute (AttributeCode code);
+		end;
+		if Hashtbl.length thrown_exceptions > 0 then
+			self#add_attribute (AttributeExceptions (Array.of_list (Hashtbl.fold (fun k _ c -> k :: c) thrown_exceptions [])));
+		if config.export_debug then begin match debug_locals with
+		| [] ->
+			()
+		| _ ->
+			let a = Array.of_list debug_locals in
+			self#add_attribute (AttributeLocalVariableTable a);
+		end;
+		let attributes = self#export_attributes jc#get_pool in
+		let offset_name = jc#get_pool#add_string name in
+		let jsig = generate_method_signature false jsig in
+		let offset_desc = jc#get_pool#add_string jsig in
+		{
+			field_access_flags = access_flags;
+			field_name_index = offset_name;
+			field_descriptor_index = offset_desc;
+			field_attributes = attributes;
+		}
+
+	(** Exports the method as a [jvm_field]. No other functions should be called on this object afterwards. *)
+	method export_field =
+		assert (code#get_fp = 0);
+		assert (not was_exported);
+		was_exported <- true;
+		let attributes = self#export_attributes jc#get_pool in
+		let offset_name = jc#get_pool#add_string name in
+		let jsig = generate_signature false jsig in
+		let offset_desc = jc#get_pool#add_string jsig in
+		{
+			field_access_flags = access_flags;
+			field_name_index = offset_name;
+			field_descriptor_index = offset_desc;
+			field_attributes = attributes;
+		}
+end
\ No newline at end of file
diff --git a/src/generators/jvm/jvmSignature.ml b/src/generators/jvm/jvmSignature.ml
new file mode 100644
index 0000000000000000000000000000000000000000..62c776e8f12dc098f838c61bec6c3de097f59cc6
--- /dev/null
+++ b/src/generators/jvm/jvmSignature.ml
@@ -0,0 +1,294 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open JvmGlobals
+
+type jpath = (string list) * string
+
+type jwildcard =
+	| WExtends (* + *)
+	| WSuper (* -  *)
+	| WNone
+
+type jtype_argument =
+	| TType of jwildcard * jsignature
+	| TAny (* * *)
+
+and jsignature =
+	| TByte (* B *)
+	| TChar (* C *)
+	| TDouble (* D *)
+	| TFloat (* F *)
+	| TInt (* I *)
+	| TLong (* J *)
+	| TShort (* S *)
+	| TBool (* Z *)
+	| TObject of jpath * jtype_argument list (* L Classname *)
+	| TObjectInner of (string list) * (string * jtype_argument list) list (* L Classname ClassTypeSignatureSuffix *)
+	| TArray of jsignature * int option (* [ *)
+	| TMethod of jmethod_signature (* ( *)
+	| TTypeParameter of string (* T *)
+	| TUninitialized of int option
+
+(* ( jsignature list ) ReturnDescriptor (| V | jsignature) *)
+and jmethod_signature = jsignature list * jsignature option
+
+let s_wildcard = function
+	| WExtends -> "WExtends"
+	| WSuper -> "WSuper"
+	| WNone -> "WNone"
+
+let rec s_signature_kind = function
+	| TByte -> "TByte"
+	| TChar -> "TChar"
+	| TDouble -> "TDouble"
+	| TFloat -> "TFloat"
+	| TInt -> "TInt"
+	| TLong -> "TLong"
+	| TShort -> "TShort"
+	| TBool -> "TBool"
+	| TObject(path,params) -> Printf.sprintf "TObject(%s,[%s])" (Globals.s_type_path path) (String.concat "," (List.map s_signature_param_kind params))
+	| TObjectInner _ -> "TObjectInner"
+	| TArray(jsig,io) -> Printf.sprintf "TArray(%s,%s)" (s_signature_kind jsig) (Option.map_default string_of_int "None" io)
+	| TMethod(jsigs,jsig) -> Printf.sprintf "TMethod([%s],%s)" (String.concat "," (List.map s_signature_kind jsigs)) (Option.map_default s_signature_kind "None" jsig)
+	| TTypeParameter name -> Printf.sprintf "TTypeParameter(%s)" name
+	| TUninitialized io -> Printf.sprintf "TUninitilaized(%s)" (Option.map_default string_of_int "None" io)
+
+and s_signature_param_kind = function
+	| TAny -> "TAny"
+	| TType(wc,jsig) -> Printf.sprintf "TType(%s,%s)" (s_wildcard wc) (s_signature_kind jsig)
+
+let encode_path (pack,name) =
+	String.concat "/" (pack @ [name])
+
+let rec write_param full ch param = match param with
+	| TAny -> write_byte ch (Char.code '*')
+	| TType(w, s) ->
+		begin match w with
+			| WExtends -> write_byte ch (Char.code '+')
+			| WSuper -> write_byte ch (Char.code '-')
+			| WNone -> ()
+		end;
+		write_signature full ch s
+
+and write_signature full ch jsig = match jsig with
+	| TByte -> write_byte ch (Char.code 'B')
+	| TChar -> write_byte ch (Char.code 'C')
+	| TDouble -> write_byte ch (Char.code 'D')
+	| TFloat -> write_byte ch (Char.code 'F')
+	| TInt -> write_byte ch (Char.code 'I')
+	| TLong -> write_byte ch (Char.code 'J')
+	| TShort -> write_byte ch (Char.code 'S')
+	| TBool -> write_byte ch (Char.code 'Z')
+	| TObject(path, params) ->
+		write_byte ch (Char.code 'L');
+		write_string ch (encode_path path);
+		if params <> [] && full then begin
+			write_byte ch (Char.code '<');
+			List.iter (write_param full ch) params;
+			write_byte ch (Char.code '>')
+		end;
+		write_byte ch (Char.code ';')
+	| TObjectInner(pack, inners) ->
+		write_byte ch (Char.code 'L');
+		List.iter (fun p ->
+			write_string ch p;
+			write_byte ch (Char.code '/')
+		) pack;
+		let first = ref true in
+		List.iter (fun (name,params) ->
+			(if !first then first := false else write_byte ch (Char.code '.'));
+			write_string ch name;
+			if params <> [] then begin
+				write_byte ch (Char.code '<');
+				List.iter (write_param full ch) params;
+				write_byte ch (Char.code '>')
+			end;
+		) inners;
+		write_byte ch (Char.code ';')
+	| TArray(s,size) ->
+		write_byte ch (Char.code '[');
+		begin match size with
+			| Some size ->
+				write_string ch (string_of_int size);
+			| None -> ()
+		end;
+		write_signature full ch s
+	| TMethod _ ->
+		write_signature full ch (TObject((["java";"lang";"invoke"],"MethodHandle"),[]))
+	| TTypeParameter name ->
+		if full then begin
+			write_byte ch (Char.code 'T');
+			write_string ch name;
+			write_byte ch (Char.code ';')
+		end else
+			write_string ch "Ljava/lang/Object;"
+	| TUninitialized _ ->
+		()
+
+let generate_signature full jsig =
+	let ch = IO.output_bytes () in
+	write_signature full ch jsig;
+	Bytes.unsafe_to_string (IO.close_out ch)
+
+let generate_method_signature full jsig =
+	let ch = IO.output_bytes () in
+	begin match jsig with
+	| TMethod(args, ret) ->
+		write_byte ch (Char.code '(');
+		List.iter (write_signature full ch) args;
+		write_byte ch (Char.code ')');
+		begin match ret with
+			| None -> write_byte ch (Char.code 'V')
+			| Some jsig -> write_signature full ch jsig
+		end
+	| _ ->
+		write_signature full ch jsig;
+	end;
+	Bytes.unsafe_to_string (IO.close_out ch)
+
+let signature_size = function
+	| TDouble | TLong -> 2
+	| _ -> 1
+
+module NativeSignatures = struct
+	let object_path = ["java";"lang"],"Object"
+	let object_sig = TObject(object_path,[])
+
+	let string_path = ["java";"lang"],"String"
+	let string_sig = TObject(string_path,[])
+
+	let boolean_path = ["java";"lang"],"Boolean"
+	let boolean_sig = TObject(boolean_path,[])
+
+	let character_path = ["java";"lang"],"Character"
+	let character_sig = TObject(character_path,[])
+
+	let method_handle_path = (["java";"lang";"invoke"],"MethodHandle")
+	let method_handle_sig = TObject(method_handle_path,[])
+
+	let method_type_path = (["java";"lang";"invoke"],"MethodType")
+	let method_type_sig = TObject(method_type_path,[])
+
+	let method_lookup_path = (["java";"lang";"invoke"],"MethodHandles$Lookup")
+	let method_lookup_sig = TObject(method_lookup_path,[])
+
+	let call_site_path = (["java";"lang";"invoke"],"CallSite")
+	let call_site_sig = TObject(call_site_path,[])
+
+	let java_class_path = ["java";"lang"],"Class"
+	let java_class_sig = TObject(java_class_path,[TType(WNone,object_sig)])
+
+	let haxe_jvm_path = ["haxe";"jvm"],"Jvm"
+
+	let haxe_dynamic_object_path = ["haxe";"jvm"],"DynamicObject"
+	let haxe_dynamic_object_sig = TObject(haxe_dynamic_object_path,[])
+
+	let haxe_exception_path = ["haxe";"jvm"],"Exception"
+	let haxe_exception_sig = TObject(haxe_exception_path,[])
+
+	let haxe_object_path = ["haxe";"jvm"],"Object"
+	let haxe_object_sig = TObject(haxe_object_path,[])
+
+	let throwable_path = (["java";"lang"],"Throwable")
+	let throwable_sig = TObject(throwable_path,[])
+
+	let exception_path = (["java";"lang"],"Exception")
+	let exception_sig = TObject(exception_path,[])
+
+	let retention_path = (["java";"lang";"annotation"],"Retention")
+	let retention_sig = TObject(retention_path,[])
+
+	let retention_policy_path = (["java";"lang";"annotation"],"RetentionPolicy")
+	let retention_policy_sig = TObject(retention_policy_path,[])
+
+	let java_enum_path = (["java";"lang"],"Enum")
+	let java_enum_sig jsig = TObject(java_enum_path,[TType(WNone,jsig)])
+
+	let haxe_enum_path = (["haxe";"jvm"],"Enum")
+	let haxe_enum_sig jsig = TObject(haxe_enum_path,[TType(WNone,jsig)])
+
+	let haxe_empty_constructor_path = (["haxe";"jvm"],"EmptyConstructor")
+	let haxe_empty_constructor_sig = TObject(haxe_empty_constructor_path,[])
+
+	(* numeric *)
+
+	let byte_path = ["java";"lang"],"Byte"
+	let byte_sig = TObject(byte_path,[])
+
+	let short_path = ["java";"lang"],"Short"
+	let short_sig = TObject(short_path,[])
+
+	let integer_path = ["java";"lang"],"Integer"
+	let integer_sig = TObject(integer_path,[])
+
+	let long_path = ["java";"lang"],"Long"
+	let long_sig = TObject(long_path,[])
+
+	let float_path = ["java";"lang"],"Float"
+	let float_sig = TObject(float_path,[])
+
+	let double_path = ["java";"lang"],"Double"
+	let double_sig = TObject(double_path,[])
+
+	(* compound *)
+
+	let array_sig jsig = TArray(jsig,None)
+
+	let method_sig jsigs jsig = TMethod(jsigs,jsig)
+
+	let object_path_sig path = TObject(path,[])
+
+	let get_boxed_type jsig = match jsig with
+		| TBool -> boolean_sig
+		| TChar -> character_sig
+		| TByte -> byte_sig
+		| TShort -> short_sig
+		| TInt -> integer_sig
+		| TLong -> long_sig
+		| TFloat -> float_sig
+		| TDouble -> double_sig
+		| _ -> jsig
+
+	let get_unboxed_type jsig = match jsig with
+		| TObject((["java";"lang"],"Boolean"),_) -> TBool
+		| TObject((["java";"lang"],"Charcter"),_) -> TChar
+		| TObject((["java";"lang"],"Byte"),_) -> TByte
+		| TObject((["java";"lang"],"Short"),_) -> TShort
+		| TObject((["java";"lang"],"Integer"),_) -> TInt
+		| TObject((["java";"lang"],"Long"),_) -> TLong
+		| TObject((["java";"lang"],"Float"),_) -> TFloat
+		| TObject((["java";"lang"],"Double"),_) -> TDouble
+		| _ -> jsig
+
+	let is_unboxed jsig = match jsig with
+		| TBool | TChar
+		| TByte | TShort | TInt | TLong
+		| TFloat | TDouble ->
+			true
+		| _ ->
+			false
+
+	let is_dynamic_at_runtime = function
+		| TObject((["java";"lang"],"Object"),_)
+		| TTypeParameter _ ->
+			true
+		| _ ->
+			false
+end
\ No newline at end of file
diff --git a/src/generators/jvm/jvmVerificationTypeInfo.ml b/src/generators/jvm/jvmVerificationTypeInfo.ml
new file mode 100644
index 0000000000000000000000000000000000000000..bfd756db748dbb2b52a990787291d6f160fa9c3a
--- /dev/null
+++ b/src/generators/jvm/jvmVerificationTypeInfo.ml
@@ -0,0 +1,56 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open JvmGlobals
+open JvmSignature
+
+type t =
+	| VTop
+	| VInteger
+	| VFloat
+	| VDouble
+	| VLong
+	| VNull
+	| VUninitializedThis
+	| VObject of jvm_constant_pool_index
+	| VUninitialized of int
+
+let of_signature pool jsig = match jsig with
+    | TByte | TChar | TBool | TShort | TInt -> VInteger
+    | TFloat -> VFloat
+    | TLong -> VLong
+    | TDouble -> VDouble
+    | TObject(path,_) -> VObject (pool#add_path path)
+	| TMethod _ -> VObject (pool#add_path (["java";"lang";"invoke"],"MethodHandle"))
+	| TArray _ -> VObject (pool#add_path ([],generate_signature false jsig))
+	| TTypeParameter _ -> VObject (pool#add_path (["java";"lang"],"Object"))
+	| TUninitialized (Some i) -> VUninitialized i
+	| TUninitialized None -> VUninitializedThis
+    | _ -> assert false
+
+let to_string vtt = match vtt with
+	| VTop -> "top"
+	| VInteger -> "integer"
+	| VFloat -> "float"
+	| VLong -> "long"
+	| VDouble -> "double"
+	| VNull -> "null"
+	| VUninitializedThis -> "uninitializedThis"
+	| VObject i -> "object " ^ (string_of_int i)
+	| VUninitialized i -> "uninitializedVariable " ^ (string_of_int i)
\ No newline at end of file
diff --git a/src/generators/jvm/jvmWriter.ml b/src/generators/jvm/jvmWriter.ml
new file mode 100644
index 0000000000000000000000000000000000000000..954d65b7d907fffe0c32d16aa6428cf6a80a06c5
--- /dev/null
+++ b/src/generators/jvm/jvmWriter.ml
@@ -0,0 +1,341 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open JvmGlobals
+open JvmData
+
+(* Low-level writing corresponding to jvmData. *)
+
+let write_jvm_attribute ch jvma =
+	write_ui16 ch jvma.attr_index;
+	write_ui32 ch (Bytes.length jvma.attr_data);
+	write_bytes ch jvma.attr_data
+
+let write_jvm_attributes ch jvmal =
+	write_array16 ch write_jvm_attribute jvmal
+
+let write_jvm_field ch jvmf =
+	write_ui16 ch jvmf.field_access_flags;
+	write_ui16 ch jvmf.field_name_index;
+	write_ui16 ch jvmf.field_descriptor_index;
+	write_jvm_attributes ch jvmf.field_attributes
+
+let write_jvm_class ch jvmc =
+	write_byte ch 0xCA;
+	write_byte ch 0xFE;
+	write_byte ch 0xBA;
+	write_byte ch 0xBE;
+	write_ui16 ch jvmc.class_minor_version;
+	write_ui16 ch jvmc.class_major_version;
+	write_bytes ch jvmc.class_constant_pool;
+	write_ui16 ch jvmc.class_access_flags;
+	write_ui16 ch jvmc.class_this_class;
+	write_ui16 ch jvmc.class_super_class;
+	write_ui16 ch (Array.length jvmc.class_interfaces);
+	Array.iter (write_ui16 ch) jvmc.class_interfaces;
+	write_ui16 ch (Array.length jvmc.class_fields);
+	Array.iter (write_jvm_field ch) jvmc.class_fields;
+	write_ui16 ch (Array.length jvmc.class_methods);
+	Array.iter (write_jvm_field ch) jvmc.class_methods;
+	write_jvm_attributes ch jvmc.class_attributes
+
+(* Level 2: Targeting JVM structures *)
+
+let write_exception ch jvme =
+	write_ui16 ch jvme.exc_start_pc;
+	write_ui16 ch jvme.exc_end_pc;
+	write_ui16 ch jvme.exc_handler_pc;
+	match jvme.exc_catch_type with
+	| None -> write_ui16 ch 0
+	| Some t -> write_ui16 ch t
+
+let write_opcode ch code =
+  let w = write_byte ch in
+  let wr i32 = write_byte ch (Int32.to_int i32) in
+  (* TODO: probably don't need these *)
+  let bp i =
+    w ((i lsr 8) land 0xFF);
+    w (i land 0xFF);
+  in
+  let b4 i =
+    w ((i lsr 24) land 0xFF);
+    w ((i lsr 16) land 0xFF);
+    w ((i lsr 8) land 0xFF);
+    w (i land 0xFF);
+  in
+  let b4r i32 =
+    wr (Int32.logand (Int32.shift_right_logical i32 24) i320xFF);
+    wr (Int32.logand (Int32.shift_right_logical i32 16) i320xFF);
+    wr (Int32.logand (Int32.shift_right_logical i32 8) i320xFF);
+    wr (Int32.logand i32 i320xFF);
+  in
+  let rec loop code = match code with
+    (* double *)
+    | OpD2f -> w 0x90
+    | OpD2i -> w 0x8e
+    | OpD2l -> w 0x8f
+    | OpDadd -> w 0x63
+    | OpDaload -> w 0x31
+    | OpDastore -> w 0x52
+    | OpDcmpg -> w 0x98
+    | OpDcmpl -> w 0x97
+    | OpDdiv -> w 0x6f
+    | OpDconst_0 -> w 0xe
+    | OpDconst_1 -> w 0xf
+    | OpDload_0 -> w 0x26
+    | OpDload_1 -> w 0x27
+    | OpDload_2 -> w 0x28
+    | OpDload_3 -> w 0x29
+    | OpDload i -> w 0x18; w i
+    | OpDmul -> w 0x6b
+    | OpDneg -> w 0x77
+    | OpDrem -> w 0x73
+    | OpDreturn -> w 0xaf
+    | OpDstore_0 -> w 0x47
+    | OpDstore_1 -> w 0x48
+    | OpDstore_2 -> w 0x49
+    | OpDstore_3 -> w 0x4a
+    | OpDstore i -> w 0x39; w i
+    | OpDsub -> w 0x67
+    (* float *)
+    | OpF2d -> w 0x8d
+    | OpF2i -> w 0x8b
+    | OpF2l -> w 0x8c
+    | OpFadd -> w 0x62
+    | OpFaload -> w 0x30
+    | OpFastore -> w 0x51
+    | OpFcmpg -> w 0x96
+    | OpFcmpl -> w 0x95
+    | OpFdiv -> w 0x6e
+    | OpFconst_0 -> w 0xb
+    | OpFconst_1 -> w 0xc
+    | OpFconst_2 -> w 0xd
+    | OpFload_0 -> w 0x22
+    | OpFload_1 -> w 0x23
+    | OpFload_2 -> w 0x24
+    | OpFload_3 -> w 0x25
+    | OpFload i -> w 0x17; w i
+    | OpFmul -> w 0x6a
+    | OpFneg -> w 0x76
+    | OpFrem -> w 0x72
+    | OpFreturn -> w 0xae
+    | OpFstore_0 -> w 0x43
+    | OpFstore_1 -> w 0x44
+    | OpFstore_2 -> w 0x45
+    | OpFstore_3 -> w 0x46
+    | OpFstore i -> w 0x38; w i
+    | OpFsub -> w 0x66
+    (* int *)
+    | OpI2b -> w 0x91
+    | OpI2c -> w 0x92
+    | OpI2d -> w 0x87
+    | OpI2f -> w 0x86
+    | OpI2l -> w 0x85
+    | OpI2s -> w 0x93
+    | OpIadd -> w 0x60
+    | OpIaload -> w 0x2e
+    | OpIand -> w 0x7e
+    | OpIastore -> w 0x4f
+    | OpIconst_m1 -> w 0x2
+    | OpIconst_0 -> w 0x3
+    | OpIconst_1 -> w 0x4
+    | OpIconst_2 -> w 0x5
+    | OpIconst_3 -> w 0x6
+    | OpIconst_4 -> w 0x7
+    | OpIconst_5 -> w 0x8
+    | OpIdiv -> w 0x6c
+    | OpIload_0 -> w 0x1a
+    | OpIload_1 -> w 0x1b
+    | OpIload_2 -> w 0x1c
+    | OpIload_3 -> w 0x1d
+    | OpIload i -> w 0x15; w i
+    | OpImul -> w 0x68
+    | OpIneg -> w 0x74
+    | OpIor -> w 0x80
+    | OpIrem -> w 0x70
+    | OpIreturn -> w 0xac
+    | OpIshl -> w 0x78
+    | OpIshr -> w 0x7a
+    | OpIstore_0 -> w 0x3b
+    | OpIstore_1 -> w 0x3c
+    | OpIstore_2 -> w 0x3d
+    | OpIstore_3 -> w 0x3e
+    | OpIstore i -> w 0x36; w i
+    | OpIsub -> w 0x64
+    | OpIushr -> w 0x7c
+    | OpIxor -> w 0x82
+    (* long *)
+    | OpL2d -> w 0x8a
+    | OpL2f -> w 0x89
+    | OpL2i -> w 0x88
+    | OpLadd -> w 0x61
+    | OpLaload -> w 0x2f
+    | OpLand -> w 0x7f
+    | OpLastore -> w 0x50
+	| OpLconst_0 -> w 0x9
+	| OpLconst_1 -> w 0xa
+    | OpLcmp -> w 0x94
+    | OpLdiv -> w 0x6d
+    | OpLload_0 -> w 0x1e
+    | OpLload_1 -> w 0x1f
+    | OpLload_2 -> w 0x20
+    | OpLload_3 -> w 0x21
+    | OpLload i ->  w 0x16; w i
+    | OpLmul -> w 0x69
+    | OpLneg -> w 0x75
+    | OpLor -> w 0x81
+    | OpLrem -> w 0x71
+    | OpLreturn -> w 0xad
+    | OpLshl -> w 0x79
+    | OpLshr -> w 0x7b
+    | OpLstore_0 -> w 0x3f
+    | OpLstore_1 -> w 0x40
+    | OpLstore_2 -> w 0x41
+    | OpLstore_3 -> w 0x42
+    | OpLstore i -> w 0x37; w i
+    | OpLsub -> w 0x65
+    | OpLushr -> w 0x7d
+    | OpLxor -> w 0x83
+    (* short *)
+    | OpSaload -> w 0x35
+    | OpSastore -> w 0x56
+    | OpSipush i -> w 0x11; bp i
+    (* array *)
+    | OpAaload -> w 0x32
+    | OpAastore -> w 0x53
+    | OpAnewarray offset -> w 0xbd; bp offset
+    | OpArraylength -> w 0xbe
+    | OpBaload -> w 0x33
+    | OpBastore -> w 0x54
+    | OpBipush i -> w 0x10; w i
+    | OpCaload -> w 0x34
+    | OpCastore -> w 0x55
+    | OpMultianewarray(offset,d) -> w 0xc5; bp offset; w d
+    | OpNewarray t -> w 0xbc; w t
+    (* reference *)
+    | OpAload_0 -> w 0x2a
+    | OpAload_1 -> w 0x2b
+    | OpAload_2 -> w 0x2c
+    | OpAload_3 -> w 0x2d
+    | OpAload i -> w 0x19; w i
+    | OpAreturn -> w 0xb0
+    | OpAstore_0 -> w 0x4b
+    | OpAstore_1 -> w 0x4c
+    | OpAstore_2 -> w 0x4d
+    | OpAstore_3 -> w 0x4e
+    | OpAstore i -> w 0x3a; w i
+    (* object *)
+    | OpNew offset -> w 0xbb; bp offset
+    | OpInstanceof offset -> w 0xc1; bp offset
+    | OpCheckcast offset -> w 0xc0; bp offset
+    | OpInvokedynamic offset -> w 0xba; bp offset; w 0; w 0 (* ??? *)
+    | OpInvokeinterface(offset,c) -> w 0xb9; bp offset; w c; w 0
+    | OpInvokespecial offset -> w 0xb7; bp offset
+    | OpInvokestatic offset -> w 0xb8; bp offset
+    | OpInvokevirtual offset -> w 0xb6; bp offset
+    | OpGetfield offset -> w 0xb4; bp offset
+    | OpGetstatic offset -> w 0xb2; bp offset
+    | OpPutfield offset -> w 0xb5; bp offset
+    | OpPutstatic offset -> w 0xb3; bp offset
+    (* branching *)
+    | OpIf_acmpeq i -> w 0xa5; bp !i
+    | OpIf_acmpne i -> w 0xa6; bp !i
+    | OpIf_icmp(cmp,i) ->
+      begin match cmp with
+        | CmpEq -> w 0x9f
+        | CmpNe -> w 0xa0
+        | CmpLt -> w 0xa1
+        | CmpGe -> w 0xa2
+        | CmpGt -> w 0xa3
+        | CmpLe -> w 0xa4
+      end;
+      bp !i
+    | OpIf(cmp,i) ->
+      begin match cmp with
+        | CmpEq -> w 0x99
+        | CmpNe -> w 0x9a
+        | CmpLt -> w 0x9b
+        | CmpGe -> w 0x9c
+        | CmpGt -> w 0x9d
+        | CmpLe -> w 0x9e
+      end;
+      bp !i
+    | OpIfnonnull i -> w 0xc7; bp !i
+    | OpIfnull i -> w 0xc6; bp !i
+    | OpGoto i -> w 0xa7; bp !i
+    | OpGoto_w i -> w 0xc8; b4 !i
+    | OpJsr i -> w 0xa8; bp !i
+    | OpJsr_w i -> w 0xc9; b4 !i
+    (* stack *)
+    | OpAconst_null -> w 0x1
+    | OpDup -> w 0x59
+    | OpDup_x1 -> w 0x5a
+    | OpDup_x2 -> w 0x5b
+    | OpDup2 -> w 0x5c
+    | OpDup2_x1 -> w 0x5d
+    | OpDup2_x2 -> w 0x5e
+    | OpLdc i -> w 0x12; w i
+    | OpLdc_w i -> w 0x13; bp i
+    | OpLdc2_w i -> w 0x14; bp i
+    | OpNop -> w 0x0
+    | OpPop -> w 0x57
+    | OpPop2 -> w 0x58
+    | OpSwap -> w 0x5f
+    (* other *)
+    | OpAthrow -> w 0xbf
+    | OpIinc(i,c) -> w 0x84; w i; w c (* TODO: signed? *)
+    | OpLookupswitch(pad,def,pairs) ->
+		w 0xab;
+		if pad > 0 then for i = 0 to pad -1 do w 0 done;
+		b4 !def;
+		b4 (Array.length pairs);
+		Array.iter (fun (i,offset) ->
+			b4r i;
+			b4 !offset
+		) pairs;
+    | OpTableswitch(pad,def,low,high,offsets) ->
+		w 0xaa;
+		if pad > 0 then for i = 0 to pad -1 do w 0 done;
+		b4 !def;
+		b4r low;
+		b4r high;
+		Array.iter (fun offset ->
+			b4 !offset
+		) offsets;
+    | OpMonitorenter -> w 0xc2
+    | OpMonitorexit -> w 0xc3
+    | OpRet i -> w 0xa9; w i
+    | OpReturn -> w 0xb1
+	| OpWide op ->
+		w 0xc4;
+		begin match op with
+			| OpWIinc(i1,i2) -> w 0x84; bp i1; bp i2;
+			| OpWIload i -> w 0x15; bp i
+			| OpWFload i -> w 0x17; bp i
+			| OpWAload i -> w 0x19; bp i
+			| OpWLload i -> w 0x16; bp i
+			| OpWDload i -> w 0x18; bp i
+			| OpWIstore i -> w 0x36; bp i
+			| OpWFstore i -> w 0x38; bp i
+			| OpWAstore i -> w 0x3a; bp i
+			| OpWLstore i -> w 0x37; bp i
+			| OpWDstore i -> w 0x39; bp i
+		end
+  in
+  loop code
\ No newline at end of file
diff --git a/src/json.ml b/src/json.ml
deleted file mode 100644
index 550d9b08bb44c017255f3db3d9027eedbbc04866..0000000000000000000000000000000000000000
--- a/src/json.ml
+++ /dev/null
@@ -1,104 +0,0 @@
-(*
-	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *)
-
-type t =
-	| JString of string
-	| JFloat of float
-	| JInt of int
-	| JObject of (string * t) list
-	| JArray of t list
-	| JBool of bool
-	| JNull
-
-let write_iter f_el f_sep l =
-	let rec rest = function
-		| [] -> ()
-		| v :: l ->
-			f_sep();
-			f_el v;
-			rest l
-	in
-	match l with
-	| [] -> ()
-	| v :: l ->
-		f_el v;
-		rest l
-
-let write_sep w =
-	w ","
-
-let rec write_json w v =
-	match v with
-	| JNull -> write_null w
-	| JBool b -> write_bool w b
-	| JString s -> write_string w s
-	| JFloat f -> write_float w f
-	| JInt i -> write_int w i
-	| JObject o -> write_object w o
-	| JArray a -> write_array w a
-
-and write_null w =
-	w "null"
-
-and write_bool w b =
-	w (if b then "true" else "false")
-
-and write_string w s =
-	w "\"";
-	let b = Buffer.create (String.length s) in
-	for i = 0 to String.length s - 1 do
-		match String.unsafe_get s i with
-		| '"' -> Buffer.add_string b "\\\""
-		| '\t' -> Buffer.add_string b "\\t"
-		| '\r' -> Buffer.add_string b "\\r"
-		| '\b' -> Buffer.add_string b "\\b"
-		| '\n' -> Buffer.add_string b "\\n"
-		| '\012' -> Buffer.add_string b "\\f"
-		| '\\' -> Buffer.add_string b "\\\\"
-		| '\x00'..'\x1F' | '\x7F' as c -> Buffer.add_string b (Printf.sprintf "\\u%04X" (int_of_char c))
-		| c -> Buffer.add_char b c
-	done;
-	w (Buffer.contents b);
-	w "\""
-
-and write_int w i =
-	w (string_of_int i)
-
-and write_float w f =
-	match classify_float f with
-	| FP_nan | FP_infinite -> failwith "NaN and infinity floats are unsupported in JSON"
-	| _ ->
-		let s = Printf.sprintf "%.16g" f in
-		let s = if float_of_string s = f then s else Printf.sprintf "%.17g" f in
-		w s
-
-and write_array w a =
-	w "[";
-	write_iter (write_json w) (fun() -> write_sep w) a;
-	w "]"
-
-and write_object w o =
-	let write_el (k, v) =
-		write_string w k;
-		w ":";
-		write_json w v
-	in
-	w "{";
-	write_iter write_el (fun() -> write_sep w) o;
-	w "}"
diff --git a/src/macro/eval/bytes/evalBytesLower.ml b/src/macro/eval/bytes/evalBytesLower.ml
new file mode 100644
index 0000000000000000000000000000000000000000..4bef53089f9d6f1c82b1b77d2cf861629860eb54
--- /dev/null
+++ b/src/macro/eval/bytes/evalBytesLower.ml
@@ -0,0 +1,23 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open EvalBytes_E_L79
+open EvalBytes_L1020
+
+let _LOWER = Array.of_list [_E;_L1;_E;_L3;_L4;_L5;_L6;_L7;_L8;_L9;_E;_E;_E;_L13;_L14;_L15;_L16;_L17;_L18;_L19;_L20;_L21;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_L66;_L67;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_L78;_L79;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_L120;_L121;_L122;_L123;_L124;_L125;_L126;_L127;_E;_E;_E;_E;_L132;_L133;_L134;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_L146;_L147;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_L176;_L177;_L178;_L179;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_L665;_L666;_E;_L668;_L669;_L670;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_L1020]
\ No newline at end of file
diff --git a/src/macro/eval/bytes/evalBytesUpper.ml b/src/macro/eval/bytes/evalBytesUpper.ml
new file mode 100644
index 0000000000000000000000000000000000000000..d826e2c274352323c50113baa14cea4363249402
--- /dev/null
+++ b/src/macro/eval/bytes/evalBytesUpper.ml
@@ -0,0 +1,24 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open EvalBytes_E_L79
+open EvalBytes_U79
+open EvalBytes_U1021
+
+let _UPPER = Array.of_list [_E;_U1;_U2;_U3;_U4;_U5;_U6;_U7;_U8;_U9;_U10;_E;_E;_U13;_U14;_U15;_U16;_U17;_U18;_U19;_U20;_U21;_U22;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_U79;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_U117;_E;_E;_U120;_U121;_U122;_U123;_U124;_U125;_U126;_U127;_E;_E;_E;_E;_E;_U133;_U134;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_U147;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_U176;_U177;_U178;_U179;_U180;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_U665;_U666;_E;_U668;_U669;_U670;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_U685;_U686;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_E;_U1021]
\ No newline at end of file
diff --git a/src/macro/eval/bytes/evalBytes_E_L79.ml b/src/macro/eval/bytes/evalBytes_E_L79.ml
new file mode 100644
index 0000000000000000000000000000000000000000..90ee3fc9a92febac293e108450178282cf7c51ae
--- /dev/null
+++ b/src/macro/eval/bytes/evalBytes_E_L79.ml
@@ -0,0 +1,41 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+let _E = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L1 = Array.of_list [0;97;98;99;100;101;102;103;104;105;106;107;108;109;110;111;112;113;114;115;116;117;118;119;120;121;122;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L3 = Array.of_list [224;225;226;227;228;229;230;231;232;233;234;235;236;237;238;239;240;241;242;243;244;245;246;0;248;249;250;251;252;253;254;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L4 = Array.of_list [257;0;259;0;261;0;263;0;265;0;267;0;269;0;271;0;273;0;275;0;277;0;279;0;281;0;283;0;285;0;287;0;289;0;291;0;293;0;295;0;297;0;299;0;301;0;303;0;105;0;307;0;309;0;311;0;0;314;0;316;0;318;0;320]
+let _L5 = Array.of_list [0;322;0;324;0;326;0;328;0;0;331;0;333;0;335;0;337;0;339;0;341;0;343;0;345;0;347;0;349;0;351;0;353;0;355;0;357;0;359;0;361;0;363;0;365;0;367;0;369;0;371;0;373;0;375;0;255;378;0;380;0;382;0;0]
+let _L6 = Array.of_list [0;595;387;0;389;0;596;392;0;598;599;396;0;0;477;601;603;402;0;608;611;0;617;616;409;0;0;0;623;626;0;629;417;0;419;0;421;0;640;424;0;643;0;0;429;0;648;432;0;650;651;436;0;438;0;658;441;0;0;0;445;0;0;0]
+let _L7 = Array.of_list [0;0;0;0;454;454;0;457;457;0;460;460;0;462;0;464;0;466;0;468;0;470;0;472;0;474;0;476;0;0;479;0;481;0;483;0;485;0;487;0;489;0;491;0;493;0;495;0;0;499;499;0;501;0;405;447;505;0;507;0;509;0;511;0]
+let _L8 = Array.of_list [513;0;515;0;517;0;519;0;521;0;523;0;525;0;527;0;529;0;531;0;533;0;535;0;537;0;539;0;541;0;543;0;414;0;547;0;549;0;551;0;553;0;555;0;557;0;559;0;561;0;563;0;0;0;0;0;0;0;11365;572;0;410;11366;0]
+let _L9 = Array.of_list [0;578;0;384;649;652;583;0;585;0;587;0;589;0;591;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L13 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;881;0;883;0;0;0;887;0;0;0;0;0;0;0;0;1011]
+let _L14 = Array.of_list [0;0;0;0;0;0;940;0;941;942;943;0;972;0;973;974;0;945;946;947;948;949;950;951;952;953;954;955;956;957;958;959;960;961;0;963;964;965;966;967;968;969;970;971;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L15 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;983;0;0;0;0;0;0;0;0;985;0;987;0;989;0;991;0;993;0;995;0;997;0;999;0;1001;0;1003;0;1005;0;1007;0;0;0;0;0;952;0;0;1016;0;1010;1019;0;0;891;892;893]
+let _L16 = Array.of_list [1104;1105;1106;1107;1108;1109;1110;1111;1112;1113;1114;1115;1116;1117;1118;1119;1072;1073;1074;1075;1076;1077;1078;1079;1080;1081;1082;1083;1084;1085;1086;1087;1088;1089;1090;1091;1092;1093;1094;1095;1096;1097;1098;1099;1100;1101;1102;1103;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L17 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;1121;0;1123;0;1125;0;1127;0;1129;0;1131;0;1133;0;1135;0;1137;0;1139;0;1141;0;1143;0;1145;0;1147;0;1149;0;1151;0]
+let _L18 = Array.of_list [1153;0;0;0;0;0;0;0;0;0;1163;0;1165;0;1167;0;1169;0;1171;0;1173;0;1175;0;1177;0;1179;0;1181;0;1183;0;1185;0;1187;0;1189;0;1191;0;1193;0;1195;0;1197;0;1199;0;1201;0;1203;0;1205;0;1207;0;1209;0;1211;0;1213;0;1215;0]
+let _L19 = Array.of_list [1231;1218;0;1220;0;1222;0;1224;0;1226;0;1228;0;1230;0;0;1233;0;1235;0;1237;0;1239;0;1241;0;1243;0;1245;0;1247;0;1249;0;1251;0;1253;0;1255;0;1257;0;1259;0;1261;0;1263;0;1265;0;1267;0;1269;0;1271;0;1273;0;1275;0;1277;0;1279;0]
+let _L20 = Array.of_list [1281;0;1283;0;1285;0;1287;0;1289;0;1291;0;1293;0;1295;0;1297;0;1299;0;1301;0;1303;0;1305;0;1307;0;1309;0;1311;0;1313;0;1315;0;1317;0;1319;0;1321;0;1323;0;1325;0;1327;0;0;1377;1378;1379;1380;1381;1382;1383;1384;1385;1386;1387;1388;1389;1390;1391]
+let _L21 = Array.of_list [1392;1393;1394;1395;1396;1397;1398;1399;1400;1401;1402;1403;1404;1405;1406;1407;1408;1409;1410;1411;1412;1413;1414;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L66 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;11520;11521;11522;11523;11524;11525;11526;11527;11528;11529;11530;11531;11532;11533;11534;11535;11536;11537;11538;11539;11540;11541;11542;11543;11544;11545;11546;11547;11548;11549;11550;11551]
+let _L67 = Array.of_list [11552;11553;11554;11555;11556;11557;0;11559;0;0;0;0;0;11565;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L78 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;43888;43889;43890;43891;43892;43893;43894;43895;43896;43897;43898;43899;43900;43901;43902;43903;43904;43905;43906;43907;43908;43909;43910;43911;43912;43913;43914;43915;43916;43917;43918;43919]
+let _L79 = Array.of_list [43920;43921;43922;43923;43924;43925;43926;43927;43928;43929;43930;43931;43932;43933;43934;43935;43936;43937;43938;43939;43940;43941;43942;43943;43944;43945;43946;43947;43948;43949;43950;43951;43952;43953;43954;43955;43956;43957;43958;43959;43960;43961;43962;43963;43964;43965;43966;43967;5112;5113;5114;5115;5116;5117;0;0;0;0;0;0;0;0;0;0]
\ No newline at end of file
diff --git a/src/macro/eval/bytes/evalBytes_L1020.ml b/src/macro/eval/bytes/evalBytes_L1020.ml
new file mode 100644
index 0000000000000000000000000000000000000000..3a76185154d8d0a2d0bd01708b39895a9757bc44
--- /dev/null
+++ b/src/macro/eval/bytes/evalBytes_L1020.ml
@@ -0,0 +1,42 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+let _L120 = Array.of_list [7681;0;7683;0;7685;0;7687;0;7689;0;7691;0;7693;0;7695;0;7697;0;7699;0;7701;0;7703;0;7705;0;7707;0;7709;0;7711;0;7713;0;7715;0;7717;0;7719;0;7721;0;7723;0;7725;0;7727;0;7729;0;7731;0;7733;0;7735;0;7737;0;7739;0;7741;0;7743;0]
+let _L121 = Array.of_list [7745;0;7747;0;7749;0;7751;0;7753;0;7755;0;7757;0;7759;0;7761;0;7763;0;7765;0;7767;0;7769;0;7771;0;7773;0;7775;0;7777;0;7779;0;7781;0;7783;0;7785;0;7787;0;7789;0;7791;0;7793;0;7795;0;7797;0;7799;0;7801;0;7803;0;7805;0;7807;0]
+let _L122 = Array.of_list [7809;0;7811;0;7813;0;7815;0;7817;0;7819;0;7821;0;7823;0;7825;0;7827;0;7829;0;0;0;0;0;0;0;0;0;223;0;7841;0;7843;0;7845;0;7847;0;7849;0;7851;0;7853;0;7855;0;7857;0;7859;0;7861;0;7863;0;7865;0;7867;0;7869;0;7871;0]
+let _L123 = Array.of_list [7873;0;7875;0;7877;0;7879;0;7881;0;7883;0;7885;0;7887;0;7889;0;7891;0;7893;0;7895;0;7897;0;7899;0;7901;0;7903;0;7905;0;7907;0;7909;0;7911;0;7913;0;7915;0;7917;0;7919;0;7921;0;7923;0;7925;0;7927;0;7929;0;7931;0;7933;0;7935;0]
+let _L124 = Array.of_list [0;0;0;0;0;0;0;0;7936;7937;7938;7939;7940;7941;7942;7943;0;0;0;0;0;0;0;0;7952;7953;7954;7955;7956;7957;0;0;0;0;0;0;0;0;0;0;7968;7969;7970;7971;7972;7973;7974;7975;0;0;0;0;0;0;0;0;7984;7985;7986;7987;7988;7989;7990;7991]
+let _L125 = Array.of_list [0;0;0;0;0;0;0;0;8000;8001;8002;8003;8004;8005;0;0;0;0;0;0;0;0;0;0;0;8017;0;8019;0;8021;0;8023;0;0;0;0;0;0;0;0;8032;8033;8034;8035;8036;8037;8038;8039;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L126 = Array.of_list [0;0;0;0;0;0;0;0;8064;8065;8066;8067;8068;8069;8070;8071;0;0;0;0;0;0;0;0;8080;8081;8082;8083;8084;8085;8086;8087;0;0;0;0;0;0;0;0;8096;8097;8098;8099;8100;8101;8102;8103;0;0;0;0;0;0;0;0;8112;8113;8048;8049;8115;0;0;0]
+let _L127 = Array.of_list [0;0;0;0;0;0;0;0;8050;8051;8052;8053;8131;0;0;0;0;0;0;0;0;0;0;0;8144;8145;8054;8055;0;0;0;0;0;0;0;0;0;0;0;0;8160;8161;8058;8059;8165;0;0;0;0;0;0;0;0;0;0;0;8056;8057;8060;8061;8179;0;0;0]
+let _L132 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;969;0;0;0;107;229;0;0;0;0;0;0;8526;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L133 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;8560;8561;8562;8563;8564;8565;8566;8567;8568;8569;8570;8571;8572;8573;8574;8575;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L134 = Array.of_list [0;0;0;8580;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L146 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;9424;9425;9426;9427;9428;9429;9430;9431;9432;9433]
+let _L147 = Array.of_list [9434;9435;9436;9437;9438;9439;9440;9441;9442;9443;9444;9445;9446;9447;9448;9449;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L176 = Array.of_list [11312;11313;11314;11315;11316;11317;11318;11319;11320;11321;11322;11323;11324;11325;11326;11327;11328;11329;11330;11331;11332;11333;11334;11335;11336;11337;11338;11339;11340;11341;11342;11343;11344;11345;11346;11347;11348;11349;11350;11351;11352;11353;11354;11355;11356;11357;11358;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L177 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;11361;0;619;7549;637;0;0;11368;0;11370;0;11372;0;593;625;592;594;0;11379;0;0;11382;0;0;0;0;0;0;0;0;575;576]
+let _L178 = Array.of_list [11393;0;11395;0;11397;0;11399;0;11401;0;11403;0;11405;0;11407;0;11409;0;11411;0;11413;0;11415;0;11417;0;11419;0;11421;0;11423;0;11425;0;11427;0;11429;0;11431;0;11433;0;11435;0;11437;0;11439;0;11441;0;11443;0;11445;0;11447;0;11449;0;11451;0;11453;0;11455;0]
+let _L179 = Array.of_list [11457;0;11459;0;11461;0;11463;0;11465;0;11467;0;11469;0;11471;0;11473;0;11475;0;11477;0;11479;0;11481;0;11483;0;11485;0;11487;0;11489;0;11491;0;0;0;0;0;0;0;0;11500;0;11502;0;0;0;0;11507;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L665 = Array.of_list [42561;0;42563;0;42565;0;42567;0;42569;0;42571;0;42573;0;42575;0;42577;0;42579;0;42581;0;42583;0;42585;0;42587;0;42589;0;42591;0;42593;0;42595;0;42597;0;42599;0;42601;0;42603;0;42605;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L666 = Array.of_list [42625;0;42627;0;42629;0;42631;0;42633;0;42635;0;42637;0;42639;0;42641;0;42643;0;42645;0;42647;0;42649;0;42651;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _L668 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;42787;0;42789;0;42791;0;42793;0;42795;0;42797;0;42799;0;0;0;42803;0;42805;0;42807;0;42809;0;42811;0;42813;0;42815;0]
+let _L669 = Array.of_list [42817;0;42819;0;42821;0;42823;0;42825;0;42827;0;42829;0;42831;0;42833;0;42835;0;42837;0;42839;0;42841;0;42843;0;42845;0;42847;0;42849;0;42851;0;42853;0;42855;0;42857;0;42859;0;42861;0;42863;0;0;0;0;0;0;0;0;0;0;42874;0;42876;0;7545;42879;0]
+let _L670 = Array.of_list [42881;0;42883;0;42885;0;42887;0;0;0;0;42892;0;613;0;0;42897;0;42899;0;0;0;42903;0;42905;0;42907;0;42909;0;42911;0;42913;0;42915;0;42917;0;42919;0;42921;0;614;604;609;620;0;0;670;647;669;43859;42933;0;42935;0;0;0;0;0;0;0;0;0]
+let _L1020 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;65345;65346;65347;65348;65349;65350;65351;65352;65353;65354;65355;65356;65357;65358;65359;65360;65361;65362;65363;65364;65365;65366;65367;65368;65369;65370;0;0;0;0;0]
diff --git a/src/macro/eval/bytes/evalBytes_U1021.ml b/src/macro/eval/bytes/evalBytes_U1021.ml
new file mode 100644
index 0000000000000000000000000000000000000000..f45db92b879c480551f0883855cd6fac6fca06e5
--- /dev/null
+++ b/src/macro/eval/bytes/evalBytes_U1021.ml
@@ -0,0 +1,44 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+let _U117 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;42877;0;0;0;11363;0;0]
+let _U120 = Array.of_list [0;7680;0;7682;0;7684;0;7686;0;7688;0;7690;0;7692;0;7694;0;7696;0;7698;0;7700;0;7702;0;7704;0;7706;0;7708;0;7710;0;7712;0;7714;0;7716;0;7718;0;7720;0;7722;0;7724;0;7726;0;7728;0;7730;0;7732;0;7734;0;7736;0;7738;0;7740;0;7742]
+let _U121 = Array.of_list [0;7744;0;7746;0;7748;0;7750;0;7752;0;7754;0;7756;0;7758;0;7760;0;7762;0;7764;0;7766;0;7768;0;7770;0;7772;0;7774;0;7776;0;7778;0;7780;0;7782;0;7784;0;7786;0;7788;0;7790;0;7792;0;7794;0;7796;0;7798;0;7800;0;7802;0;7804;0;7806]
+let _U122 = Array.of_list [0;7808;0;7810;0;7812;0;7814;0;7816;0;7818;0;7820;0;7822;0;7824;0;7826;0;7828;0;0;0;0;0;7776;0;0;0;0;0;7840;0;7842;0;7844;0;7846;0;7848;0;7850;0;7852;0;7854;0;7856;0;7858;0;7860;0;7862;0;7864;0;7866;0;7868;0;7870]
+let _U123 = Array.of_list [0;7872;0;7874;0;7876;0;7878;0;7880;0;7882;0;7884;0;7886;0;7888;0;7890;0;7892;0;7894;0;7896;0;7898;0;7900;0;7902;0;7904;0;7906;0;7908;0;7910;0;7912;0;7914;0;7916;0;7918;0;7920;0;7922;0;7924;0;7926;0;7928;0;7930;0;7932;0;7934]
+let _U124 = Array.of_list [7944;7945;7946;7947;7948;7949;7950;7951;0;0;0;0;0;0;0;0;7960;7961;7962;7963;7964;7965;0;0;0;0;0;0;0;0;0;0;7976;7977;7978;7979;7980;7981;7982;7983;0;0;0;0;0;0;0;0;7992;7993;7994;7995;7996;7997;7998;7999;0;0;0;0;0;0;0;0]
+let _U125 = Array.of_list [8008;8009;8010;8011;8012;8013;0;0;0;0;0;0;0;0;0;0;0;8025;0;8027;0;8029;0;8031;0;0;0;0;0;0;0;0;8040;8041;8042;8043;8044;8045;8046;8047;0;0;0;0;0;0;0;0;8122;8123;8136;8137;8138;8139;8154;8155;8184;8185;8170;8171;8186;8187;0;0]
+let _U126 = Array.of_list [8072;8073;8074;8075;8076;8077;8078;8079;0;0;0;0;0;0;0;0;8088;8089;8090;8091;8092;8093;8094;8095;0;0;0;0;0;0;0;0;8104;8105;8106;8107;8108;8109;8110;8111;0;0;0;0;0;0;0;0;8120;8121;0;8124;0;0;0;0;0;0;0;0;0;0;921;0]
+let _U127 = Array.of_list [0;0;0;8140;0;0;0;0;0;0;0;0;0;0;0;0;8152;8153;0;0;0;0;0;0;0;0;0;0;0;0;0;0;8168;8169;0;0;0;8172;0;0;0;0;0;0;0;0;0;0;0;0;0;8188;0;0;0;0;0;0;0;0;0;0;0;0]
+let _U133 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;8498;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;8544;8545;8546;8547;8548;8549;8550;8551;8552;8553;8554;8555;8556;8557;8558;8559]
+let _U134 = Array.of_list [0;0;0;0;8579;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _U147 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;9398;9399;9400;9401;9402;9403;9404;9405;9406;9407;9408;9409;9410;9411;9412;9413;9414;9415;9416;9417;9418;9419;9420;9421;9422;9423;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _U176 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;11264;11265;11266;11267;11268;11269;11270;11271;11272;11273;11274;11275;11276;11277;11278;11279]
+let _U177 = Array.of_list [11280;11281;11282;11283;11284;11285;11286;11287;11288;11289;11290;11291;11292;11293;11294;11295;11296;11297;11298;11299;11300;11301;11302;11303;11304;11305;11306;11307;11308;11309;11310;0;0;11360;0;0;0;570;574;0;11367;0;11369;0;11371;0;0;0;0;0;0;11378;0;0;11381;0;0;0;0;0;0;0;0;0]
+let _U178 = Array.of_list [0;11392;0;11394;0;11396;0;11398;0;11400;0;11402;0;11404;0;11406;0;11408;0;11410;0;11412;0;11414;0;11416;0;11418;0;11420;0;11422;0;11424;0;11426;0;11428;0;11430;0;11432;0;11434;0;11436;0;11438;0;11440;0;11442;0;11444;0;11446;0;11448;0;11450;0;11452;0;11454]
+let _U179 = Array.of_list [0;11456;0;11458;0;11460;0;11462;0;11464;0;11466;0;11468;0;11470;0;11472;0;11474;0;11476;0;11478;0;11480;0;11482;0;11484;0;11486;0;11488;0;11490;0;0;0;0;0;0;0;0;11499;0;11501;0;0;0;0;11506;0;0;0;0;0;0;0;0;0;0;0;0]
+let _U180 = Array.of_list [4256;4257;4258;4259;4260;4261;4262;4263;4264;4265;4266;4267;4268;4269;4270;4271;4272;4273;4274;4275;4276;4277;4278;4279;4280;4281;4282;4283;4284;4285;4286;4287;4288;4289;4290;4291;4292;4293;0;4295;0;0;0;0;0;4301;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _U665 = Array.of_list [0;42560;0;42562;0;42564;0;42566;0;42568;0;42570;0;42572;0;42574;0;42576;0;42578;0;42580;0;42582;0;42584;0;42586;0;42588;0;42590;0;42592;0;42594;0;42596;0;42598;0;42600;0;42602;0;42604;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _U666 = Array.of_list [0;42624;0;42626;0;42628;0;42630;0;42632;0;42634;0;42636;0;42638;0;42640;0;42642;0;42644;0;42646;0;42648;0;42650;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _U668 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;42786;0;42788;0;42790;0;42792;0;42794;0;42796;0;42798;0;0;0;42802;0;42804;0;42806;0;42808;0;42810;0;42812;0;42814]
+let _U669 = Array.of_list [0;42816;0;42818;0;42820;0;42822;0;42824;0;42826;0;42828;0;42830;0;42832;0;42834;0;42836;0;42838;0;42840;0;42842;0;42844;0;42846;0;42848;0;42850;0;42852;0;42854;0;42856;0;42858;0;42860;0;42862;0;0;0;0;0;0;0;0;0;0;42873;0;42875;0;0;42878]
+let _U670 = Array.of_list [0;42880;0;42882;0;42884;0;42886;0;0;0;0;42891;0;0;0;0;42896;0;42898;0;0;0;42902;0;42904;0;42906;0;42908;0;42910;0;42912;0;42914;0;42916;0;42918;0;42920;0;0;0;0;0;0;0;0;0;0;0;42932;0;42934;0;0;0;0;0;0;0;0]
+let _U685 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;42931;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;5024;5025;5026;5027;5028;5029;5030;5031;5032;5033;5034;5035;5036;5037;5038;5039]
+let _U686 = Array.of_list [5040;5041;5042;5043;5044;5045;5046;5047;5048;5049;5050;5051;5052;5053;5054;5055;5056;5057;5058;5059;5060;5061;5062;5063;5064;5065;5066;5067;5068;5069;5070;5071;5072;5073;5074;5075;5076;5077;5078;5079;5080;5081;5082;5083;5084;5085;5086;5087;5088;5089;5090;5091;5092;5093;5094;5095;5096;5097;5098;5099;5100;5101;5102;5103]
+let _U1021 = Array.of_list [0;65313;65314;65315;65316;65317;65318;65319;65320;65321;65322;65323;65324;65325;65326;65327;65328;65329;65330;65331;65332;65333;65334;65335;65336;65337;65338;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
\ No newline at end of file
diff --git a/src/macro/eval/bytes/evalBytes_U79.ml b/src/macro/eval/bytes/evalBytes_U79.ml
new file mode 100644
index 0000000000000000000000000000000000000000..89f8241f273d14e1cd17e9550f25fb8bc176b721
--- /dev/null
+++ b/src/macro/eval/bytes/evalBytes_U79.ml
@@ -0,0 +1,40 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+let _U1 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;65;66;67;68;69;70;71;72;73;74;75;76;77;78;79;80;81;82;83;84;85;86;87;88;89;90;0;0;0;0;0]
+let _U2 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;924;0;0;0;0;0;0;0;0;0;0]
+let _U3 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;192;193;194;195;196;197;198;199;200;201;202;203;204;205;206;207;208;209;210;211;212;213;214;0;216;217;218;219;220;221;222;376]
+let _U4 = Array.of_list [0;256;0;258;0;260;0;262;0;264;0;266;0;268;0;270;0;272;0;274;0;276;0;278;0;280;0;282;0;284;0;286;0;288;0;290;0;292;0;294;0;296;0;298;0;300;0;302;0;73;0;306;0;308;0;310;0;0;313;0;315;0;317;0]
+let _U5 = Array.of_list [319;0;321;0;323;0;325;0;327;0;0;330;0;332;0;334;0;336;0;338;0;340;0;342;0;344;0;346;0;348;0;350;0;352;0;354;0;356;0;358;0;360;0;362;0;364;0;366;0;368;0;370;0;372;0;374;0;0;377;0;379;0;381;83]
+let _U6 = Array.of_list [579;0;0;386;0;388;0;0;391;0;0;0;395;0;0;0;0;0;401;0;0;502;0;0;0;408;573;0;0;0;544;0;0;416;0;418;0;420;0;0;423;0;0;0;0;428;0;0;431;0;0;0;435;0;437;0;0;440;0;0;0;444;0;503]
+let _U7 = Array.of_list [0;0;0;0;453;453;453;456;456;456;459;459;459;0;461;0;463;0;465;0;467;0;469;0;471;0;473;0;475;398;0;478;0;480;0;482;0;484;0;486;0;488;0;490;0;492;0;494;0;498;498;498;0;500;0;0;0;504;0;506;0;508;0;510]
+let _U8 = Array.of_list [0;512;0;514;0;516;0;518;0;520;0;522;0;524;0;526;0;528;0;530;0;532;0;534;0;536;0;538;0;540;0;542;0;0;0;546;0;548;0;550;0;552;0;554;0;556;0;558;0;560;0;562;0;0;0;0;0;0;0;0;571;0;0;11390]
+let _U9 = Array.of_list [11391;0;577;0;0;0;0;582;0;584;0;586;0;588;0;590;11375;11373;11376;385;390;0;393;394;0;399;0;400;42923;0;0;0;403;42924;0;404;0;42893;42922;0;407;406;0;11362;42925;0;0;412;0;11374;413;0;0;415;0;0;0;0;0;0;0;11364;0;0]
+let _U10 = Array.of_list [422;0;0;425;0;0;0;42929;430;580;433;434;581;0;0;0;0;0;439;0;0;0;0;0;0;0;0;0;0;42930;42928;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _U13 = Array.of_list [0;0;0;0;0;921;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;880;0;882;0;0;0;886;0;0;0;1021;1022;1023;0;0]
+let _U14 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;902;904;905;906;0;913;914;915;916;917;918;919;920;921;922;923;924;925;926;927]
+let _U15 = Array.of_list [928;929;931;931;932;933;934;935;936;937;938;939;908;910;911;0;914;920;0;0;0;934;928;975;0;984;0;986;0;988;0;990;0;992;0;994;0;996;0;998;0;1000;0;1002;0;1004;0;1006;922;929;1017;895;0;917;0;0;1015;0;0;1018;0;0;0;0]
+let _U16 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;1040;1041;1042;1043;1044;1045;1046;1047;1048;1049;1050;1051;1052;1053;1054;1055]
+let _U17 = Array.of_list [1056;1057;1058;1059;1060;1061;1062;1063;1064;1065;1066;1067;1068;1069;1070;1071;1024;1025;1026;1027;1028;1029;1030;1031;1032;1033;1034;1035;1036;1037;1038;1039;0;1120;0;1122;0;1124;0;1126;0;1128;0;1130;0;1132;0;1134;0;1136;0;1138;0;1140;0;1142;0;1144;0;1146;0;1148;0;1150]
+let _U18 = Array.of_list [0;1152;0;0;0;0;0;0;0;0;0;1162;0;1164;0;1166;0;1168;0;1170;0;1172;0;1174;0;1176;0;1178;0;1180;0;1182;0;1184;0;1186;0;1188;0;1190;0;1192;0;1194;0;1196;0;1198;0;1200;0;1202;0;1204;0;1206;0;1208;0;1210;0;1212;0;1214]
+let _U19 = Array.of_list [0;0;1217;0;1219;0;1221;0;1223;0;1225;0;1227;0;1229;1216;0;1232;0;1234;0;1236;0;1238;0;1240;0;1242;0;1244;0;1246;0;1248;0;1250;0;1252;0;1254;0;1256;0;1258;0;1260;0;1262;0;1264;0;1266;0;1268;0;1270;0;1272;0;1274;0;1276;0;1278]
+let _U20 = Array.of_list [0;1280;0;1282;0;1284;0;1286;0;1288;0;1290;0;1292;0;1294;0;1296;0;1298;0;1300;0;1302;0;1304;0;1306;0;1308;0;1310;0;1312;0;1314;0;1316;0;1318;0;1320;0;1322;0;1324;0;1326;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _U21 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;1329;1330;1331;1332;1333;1334;1335;1336;1337;1338;1339;1340;1341;1342;1343;1344;1345;1346;1347;1348;1349;1350;1351;1352;1353;1354;1355;1356;1357;1358;1359]
+let _U22 = Array.of_list [1360;1361;1362;1363;1364;1365;1366;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0]
+let _U79 = Array.of_list [0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;5104;5105;5106;5107;5108;5109;0;0]
diff --git a/src/macro/eval/evalArray.ml b/src/macro/eval/evalArray.ml
new file mode 100644
index 0000000000000000000000000000000000000000..6e2166286894b8b2a7625293886fe601358f088d
--- /dev/null
+++ b/src/macro/eval/evalArray.ml
@@ -0,0 +1,202 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open EvalValue
+
+let create values = {
+	avalues = values;
+	alength = Array.length values;
+}
+
+let array_join a f sep =
+	let l = Array.map f a in
+	let l = Array.to_list l in
+	EvalString.join sep l
+
+let to_list a = Array.to_list (Array.sub a.avalues 0 a.alength)
+
+let make len =
+	try Array.make len vnull with _ -> EvalContext.error_message "Array allocation is too large"
+
+let set_length a l =
+	a.alength <- l;
+	if a.alength > Array.length a.avalues then begin
+		let values' = make (a.alength * 2) in
+		Array.blit a.avalues 0 values' 0 (Array.length a.avalues);
+		a.avalues <- values'
+	end
+
+let unsafe_get a i = a.avalues.(i)
+let unsafe_set a i v = a.avalues.(i) <- v
+
+let concat a a2 =
+	let values' = make (a.alength + a2.alength) in
+	Array.blit a.avalues 0 values' 0 a.alength;
+	let values2 = (Obj.magic a2.avalues) in
+	Array.blit values2 0 values' a.alength a2.alength;
+	create values'
+
+let copy a =
+	create (Array.sub a.avalues 0 a.alength)
+
+let filter a f =
+	create (ExtArray.Array.filter f (Array.sub a.avalues 0 a.alength))
+
+let get a i =
+	if i < 0 || i >= a.alength then vnull
+	else Array.unsafe_get a.avalues i
+
+let rec indexOf a equals x fromIndex =
+	if fromIndex >= a.alength then -1
+	else if equals x (Array.get a.avalues fromIndex) then fromIndex
+	else indexOf a equals x (fromIndex + 1)
+
+let insert a pos x =
+	if a.alength + 1 >= Array.length a.avalues then begin
+		let values' = make (Array.length a.avalues * 2 + 5) in
+		Array.blit a.avalues 0 values' 0 a.alength;
+		a.avalues <- values'
+	end;
+	Array.blit a.avalues pos a.avalues (pos + 1) (a.alength - pos);
+	Array.set a.avalues pos x;
+	a.alength <- a.alength + 1
+
+let iterator a =
+	let i = ref 0 in
+	let a = Array.sub a.avalues 0 a.alength in
+	let length = Array.length a in
+	(fun () ->
+		!i < length
+	),
+	(fun () ->
+		if !i >= length then
+			vnull
+		else begin
+			let v = a.(!i) in
+			incr i;
+			v
+		end
+	)
+
+let join a f sep =
+	array_join (Array.sub a.avalues 0 a.alength) f sep
+
+let lastIndexOf a equals x fromIndex =
+	let rec loop i =
+		if i < 0 then -1
+		else if equals x (Array.get a.avalues i) then i
+		else loop (i - 1)
+	in
+	if a.alength = 0 then -1 else loop fromIndex
+
+let map a f =
+	create (Array.map f (Array.sub a.avalues 0 a.alength))
+
+let pop a =
+	if a.alength = 0 then
+		vnull
+	else begin
+		let v = get a (a.alength - 1) in
+		unsafe_set a (a.alength - 1) vnull;
+		a.alength <- a.alength - 1;
+		v
+	end
+
+let push a v =
+	if a.alength + 1 >= Array.length a.avalues then begin
+		let values' = make (Array.length a.avalues * 2 + 5) in
+		Array.blit a.avalues 0 values' 0 a.alength;
+		Array.set values' a.alength v;
+		a.avalues <- values'
+	end else begin
+		Array.set a.avalues a.alength v;
+	end;
+	a.alength <- a.alength + 1;
+	a.alength
+
+let remove a equals x =
+	let i = indexOf a equals x 0 in
+	if i < 0 then
+		false
+	else begin
+		Array.blit a.avalues (i + 1) a.avalues i (a.alength - i - 1);
+		a.alength <- a.alength - 1;
+		true
+	end
+
+let reverse a =
+	a.avalues <- ExtArray.Array.rev (Array.sub a.avalues 0 a.alength)
+
+let set a i v =
+	if i >= a.alength then begin
+		if i >= Array.length a.avalues then begin
+			let values' = make (max (i + 5) (Array.length a.avalues * 2 + 5)) in
+			Array.blit a.avalues 0 values' 0 a.alength;
+			a.avalues <- values';
+		end;
+		a.alength <- i + 1;
+	end;
+	Array.unsafe_set a.avalues i v
+
+let shift a =
+	if a.alength = 0 then
+		vnull
+	else begin
+		let v = get a 0 in
+		a.alength <- a.alength - 1;
+		Array.blit a.avalues 1 a.avalues 0 a.alength;
+		v
+	end
+
+let slice a pos end' =
+	if pos > a.alength || pos >= end' then
+		create [||]
+	else
+		create (Array.sub a.avalues pos (end' - pos))
+
+let sort a f =
+	a.avalues <- Array.sub a.avalues 0 a.alength;
+	Array.sort f a.avalues
+
+let splice a pos len end' =
+	let values' = Array.init len (fun i -> Array.get a.avalues (pos + i)) in
+	Array.blit a.avalues (pos + len) a.avalues pos (a.alength - end');
+	a.alength <- a.alength - len;
+	create values'
+
+let unshift a v =
+	if a.alength + 1 >= Array.length a.avalues then begin
+		let values' = make (Array.length a.avalues * 2 + 5) in
+		Array.blit a.avalues 0 values' 1 a.alength;
+		a.avalues <- values'
+	end else begin
+		Array.blit a.avalues 0 a.avalues 1 a.alength;
+	end;
+	Array.set a.avalues 0 v;
+	a.alength <- a.alength + 1
+
+let resize a l =
+	if a.alength < l then begin
+		set a (l - 1) vnull;
+		()
+	end else if a.alength > l then begin
+		ignore(splice a l (a.alength - l) a.alength);
+		()
+	end else ()
diff --git a/src/macro/eval/evalBytes.ml b/src/macro/eval/evalBytes.ml
new file mode 100644
index 0000000000000000000000000000000000000000..ed1d5b84eca63a264d58fce69b90adea04d7308f
--- /dev/null
+++ b/src/macro/eval/evalBytes.ml
@@ -0,0 +1,160 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+let read_byte this i = int_of_char (Bytes.get this i)
+
+let read_ui16 this i =
+	let ch1 = read_byte this i in
+	let ch2 = read_byte this (i + 1) in
+	ch1 lor (ch2 lsl 8)
+
+let read_i32 this i =
+	let ch1 = read_byte this i in
+	let ch2 = read_byte this (i + 1) in
+	let ch3 = read_byte this (i + 2) in
+	let base = Int32.of_int (ch1 lor (ch2 lsl 8) lor (ch3 lsl 16)) in
+	let big = Int32.shift_left (Int32.of_int (read_byte this (i + 3))) 24 in
+	Int32.logor base big
+
+let read_i64 this i =
+	let ch1 = read_byte this i in
+	let ch2 = read_byte this (i + 1) in
+	let ch3 = read_byte this (i + 2) in
+	let ch4 = read_byte this (i + 3) in
+	let base = Int64.of_int (ch1 lor (ch2 lsl 8) lor (ch3 lsl 16)) in
+	let small = Int64.logor base (Int64.shift_left (Int64.of_int ch4) 24) in
+	let big = Int64.of_int32 (read_i32 this (i + 4)) in
+	Int64.logor (Int64.shift_left big 32) small
+
+let write_byte this i v =
+	Bytes.set this i (Char.unsafe_chr v)
+
+let write_ui16 this i v =
+	write_byte this i v;
+	write_byte this (i + 1) (v lsr 8)
+
+let write_i32 this i v =
+	let base = Int32.to_int v in
+	let big = Int32.to_int (Int32.shift_right_logical v 24) in
+	write_byte this i base;
+	write_byte this (i + 1) (base lsr 8);
+	write_byte this (i + 2) (base lsr 16);
+	write_byte this (i + 3) big
+
+let write_i64 this i v =
+	write_i32 this i (Int64.to_int32 v);
+	write_i32 this (i + 4) (Int64.to_int32 (Int64.shift_right_logical v 32))
+
+
+module Unicase = struct
+	let _E = EvalBytes_E_L79._E
+	let _L1 = EvalBytes_E_L79._L1
+	let _L3 = EvalBytes_E_L79._L3
+	let _L4 = EvalBytes_E_L79._L4
+	let _L5 = EvalBytes_E_L79._L5
+	let _L6 = EvalBytes_E_L79._L6
+	let _L7 = EvalBytes_E_L79._L7
+	let _L8 = EvalBytes_E_L79._L8
+	let _L9 = EvalBytes_E_L79._L9
+	let _L13 = EvalBytes_E_L79._L13
+	let _L14 = EvalBytes_E_L79._L14
+	let _L15 = EvalBytes_E_L79._L15
+	let _L16 = EvalBytes_E_L79._L16
+	let _L17 = EvalBytes_E_L79._L17
+	let _L18 = EvalBytes_E_L79._L18
+	let _L19 = EvalBytes_E_L79._L19
+	let _L20 = EvalBytes_E_L79._L20
+	let _L21 = EvalBytes_E_L79._L21
+	let _L66 = EvalBytes_E_L79._L66
+	let _L67 = EvalBytes_E_L79._L67
+	let _L78 = EvalBytes_E_L79._L78
+	let _L79 = EvalBytes_E_L79._L79
+	let _L120 = EvalBytes_L1020._L120
+	let _L121 = EvalBytes_L1020._L121
+	let _L122 = EvalBytes_L1020._L122
+	let _L123 = EvalBytes_L1020._L123
+	let _L124 = EvalBytes_L1020._L124
+	let _L125 = EvalBytes_L1020._L125
+	let _L126 = EvalBytes_L1020._L126
+	let _L127 = EvalBytes_L1020._L127
+	let _L132 = EvalBytes_L1020._L132
+	let _L133 = EvalBytes_L1020._L133
+	let _L134 = EvalBytes_L1020._L134
+	let _L146 = EvalBytes_L1020._L146
+	let _L147 = EvalBytes_L1020._L147
+	let _L176 = EvalBytes_L1020._L176
+	let _L177 = EvalBytes_L1020._L177
+	let _L178 = EvalBytes_L1020._L178
+	let _L179 = EvalBytes_L1020._L179
+	let _L665 = EvalBytes_L1020._L665
+	let _L666 = EvalBytes_L1020._L666
+	let _L668 = EvalBytes_L1020._L668
+	let _L669 = EvalBytes_L1020._L669
+	let _L670 = EvalBytes_L1020._L670
+	let _L1020 = EvalBytes_L1020._L1020
+	let _U1 = EvalBytes_U79._U1
+	let _U2 = EvalBytes_U79._U2
+	let _U3 = EvalBytes_U79._U3
+	let _U4 = EvalBytes_U79._U4
+	let _U5 = EvalBytes_U79._U5
+	let _U6 = EvalBytes_U79._U6
+	let _U7 = EvalBytes_U79._U7
+	let _U8 = EvalBytes_U79._U8
+	let _U9 = EvalBytes_U79._U9
+	let _U10 = EvalBytes_U79._U10
+	let _U13 = EvalBytes_U79._U13
+	let _U14 = EvalBytes_U79._U14
+	let _U15 = EvalBytes_U79._U15
+	let _U16 = EvalBytes_U79._U16
+	let _U17 = EvalBytes_U79._U17
+	let _U18 = EvalBytes_U79._U18
+	let _U19 = EvalBytes_U79._U19
+	let _U20 = EvalBytes_U79._U20
+	let _U21 = EvalBytes_U79._U21
+	let _U22 = EvalBytes_U79._U22
+	let _U79 = EvalBytes_U79._U79
+	let _U117 = EvalBytes_U1021._U117
+	let _U120 = EvalBytes_U1021._U120
+	let _U121 = EvalBytes_U1021._U121
+	let _U122 = EvalBytes_U1021._U122
+	let _U123 = EvalBytes_U1021._U123
+	let _U124 = EvalBytes_U1021._U124
+	let _U125 = EvalBytes_U1021._U125
+	let _U126 = EvalBytes_U1021._U126
+	let _U127 = EvalBytes_U1021._U127
+	let _U133 = EvalBytes_U1021._U133
+	let _U134 = EvalBytes_U1021._U134
+	let _U147 = EvalBytes_U1021._U147
+	let _U176 = EvalBytes_U1021._U176
+	let _U177 = EvalBytes_U1021._U177
+	let _U178 = EvalBytes_U1021._U178
+	let _U179 = EvalBytes_U1021._U179
+	let _U180 = EvalBytes_U1021._U180
+	let _U665 = EvalBytes_U1021._U665
+	let _U666 = EvalBytes_U1021._U666
+	let _U668 = EvalBytes_U1021._U668
+	let _U669 = EvalBytes_U1021._U669
+	let _U670 = EvalBytes_U1021._U670
+	let _U685 = EvalBytes_U1021._U685
+	let _U686 = EvalBytes_U1021._U686
+	let _U1021 = EvalBytes_U1021._U1021
+
+	let _LOWER = EvalBytesLower._LOWER
+	let _UPPER = EvalBytesUpper._UPPER
+end
\ No newline at end of file
diff --git a/src/macro/eval/evalContext.ml b/src/macro/eval/evalContext.ml
new file mode 100644
index 0000000000000000000000000000000000000000..97a5d633806c6b18cb4e473a2842d5d3fd003607
--- /dev/null
+++ b/src/macro/eval/evalContext.ml
@@ -0,0 +1,519 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open EvalValue
+open EvalHash
+open EvalString
+
+type var_info = {
+	vi_name : string;
+	vi_pos : pos;
+	vi_generated : bool;
+}
+
+type scope = {
+	(* The position of the current scope. *)
+	pos : pos;
+	(* The local start offset of the current scope. *)
+	local_offset : int;
+	(* The locals declared in the current scope. Maps variable IDs to local slots. *)
+	locals : (int,int) Hashtbl.t;
+	(* The name of local variables. Maps local slots to variable names. Only filled in debug mode. *)
+	local_infos : (int,var_info) Hashtbl.t;
+	(* The IDs of local variables. Maps variable names to variable IDs. *)
+	local_ids : (string,int) Hashtbl.t;
+}
+
+type env_kind =
+	| EKLocalFunction of int
+	| EKMethod of int * int
+	| EKEntrypoint
+
+(* Compile-time information for environments. This information is static for all
+   environments of the same kind, e.g. all environments of a specific method. *)
+type env_info = {
+	(* If false, the environment has a this-context. *)
+	static : bool;
+	(* Hash of the source file of this environment. *)
+	pfile : int;
+	(* Hash of the unique source file of this environment. *)
+	pfile_unique : int;
+	(* The environment kind. *)
+	kind : env_kind;
+	(* The name of capture variables. Maps local slots to variable names. Only filled in debug mode. *)
+	capture_infos : (int,var_info) Hashtbl.t;
+}
+
+(* Per-environment debug information. These values are only modified while debugging. *)
+type env_debug = {
+	(* The timer function to execute when the environment finishes executing *)
+	timer : unit -> unit;
+	(* The current scope stack. *)
+	mutable scopes : scope list;
+	(* The current line being executed. This in conjunction with `env_info.pfile` is used to find breakpoints. *)
+	mutable line : int;
+	(* The current expression being executed *)
+	mutable debug_expr : string;
+	(* The current expression position being executed *)
+	mutable debug_pos : pos;
+}
+
+(* An environment in which code is executed. Environments are created whenever a function is called and when
+   evaluating static inits. *)
+type env = {
+	(* The compile-time information for the current environment *)
+	env_info : env_info;
+	(* The debug information for the current environment *)
+	env_debug : env_debug;
+	(* The position at which the current environment was left, e.g. by a call. *)
+	mutable env_leave_pmin : int;
+	(* The position at which the current environment was left, e.g. by a call. *)
+	mutable env_leave_pmax : int;
+	(* The environment's local variables. Indices are determined during compile-time, or can be obtained
+	   through `scope.locals` when debugging. *)
+	env_locals : value array;
+	(* The reference to the environment's captured local variables. Indices are determined during compile-time,
+	   or can be obtained through `env_info.capture_infos`. *)
+	env_captures : value array;
+	(* Map of extra variables added while debugging. Keys are hashed variable names. *)
+	mutable env_extra_locals : value IntMap.t;
+	(* The parent of the current environment, if exists. *)
+	env_parent : env option;
+	(** Exeucution stack depth *)
+	env_stack_depth : int;
+	env_eval : eval;
+}
+
+and eval = {
+	mutable env : env option;
+	thread : vthread;
+	(* The threads current debug state *)
+	mutable debug_state : debug_state;
+	(* The currently active breakpoint. Set to a dummy value initially. *)
+	mutable breakpoint : breakpoint;
+	(* Map of all types that are currently being caught. Updated by `emit_try`. *)
+	caught_types : (int,bool) Hashtbl.t;
+	(* The most recently caught exception. Used by `debug_loop` to avoid getting stuck. *)
+	mutable caught_exception : value;
+	(* The value which was last returned. *)
+	mutable last_return : value option;
+	(* The debug channel used to synchronize with the debugger. *)
+	debug_channel : unit Event.channel;
+}
+
+and debug_state =
+	| DbgRunning
+	| DbgWaiting
+	| DbgStep
+	| DbgNext of env * pos
+	| DbgFinish of env (* parent env *)
+
+and breakpoint_state =
+	| BPEnabled
+	| BPDisabled
+	| BPHit
+
+and breakpoint_column =
+	| BPAny
+	| BPColumn of int
+
+and breakpoint = {
+	bpid : int;
+	bpfile : int;
+	bpline : int;
+	bpcolumn : breakpoint_column;
+	bpcondition : Ast.expr option;
+	mutable bpstate : breakpoint_state;
+}
+
+type function_breakpoint = {
+	fbpid : int;
+	mutable fbpstate : breakpoint_state;
+}
+
+type builtins = {
+	mutable instance_builtins : (int * value) list IntMap.t;
+	mutable static_builtins : (int * value) list IntMap.t;
+	constructor_builtins : (int,value list -> value) Hashtbl.t;
+	empty_constructor_builtins : (int,unit -> value) Hashtbl.t;
+}
+
+type debug_scope_info = {
+	ds_expr : string;
+	ds_return : value option;
+}
+
+type context_reference =
+	| StackFrame of env
+	| Scope of scope * env
+	| CaptureScope of (int,var_info) Hashtbl.t * env
+	| DebugScope of debug_scope_info * env
+	| Value of value * env
+	| Toplevel
+	| NoSuchReference
+
+class eval_debug_context = object(self)
+	val lut =
+		let d = DynArray.create() in
+		DynArray.add d Toplevel;
+		d
+
+	val mutex = Mutex.create()
+
+	method private add reference =
+		Mutex.lock mutex;
+		DynArray.add lut reference;
+		let i = DynArray.length lut - 1 in
+		Mutex.unlock mutex;
+		i
+
+	method add_stack_frame env =
+		self#add (StackFrame env)
+
+	method add_scope scope env =
+		self#add (Scope(scope,env))
+
+	method add_capture_scope h env =
+		self#add (CaptureScope(h,env))
+
+	method add_value v env =
+		self#add (Value(v,env))
+
+	method add_debug_scope scope env =
+		self#add (DebugScope(scope,env))
+
+	method get id =
+		try DynArray.get lut id with _ -> NoSuchReference
+
+end
+
+class static_prototypes = object(self)
+	val mutable prototypes : vprototype IntMap.t = IntMap.empty
+	val mutable inits : (vprototype * (vprototype -> unit) list) IntMap.t = IntMap.empty
+
+	method add proto =
+		prototypes <- IntMap.add proto.ppath proto prototypes
+
+	method remove path =
+		inits <- IntMap.remove path inits;
+		prototypes <- IntMap.remove path prototypes
+
+	method reset =
+		IntMap.iter (fun _ (proto, delays) -> List.iter (fun f -> f proto) delays) inits
+
+	method add_init proto delays =
+		inits <- IntMap.add proto.ppath (proto, delays) inits
+
+	method get path =
+		IntMap.find path prototypes
+end
+
+type exception_mode =
+	| CatchAll
+	| CatchUncaught
+	| CatchNone
+
+type debug_connection = {
+	bp_stop : debug -> unit;
+	exc_stop : debug -> value -> pos -> unit;
+	send_thread_event : int -> string -> unit;
+}
+
+and debug_socket = {
+	socket : Socket.t;
+	connection : debug_connection;
+}
+
+(* Per-context debug information *)
+and debug = {
+	(* The registered breakpoints *)
+	breakpoints : (int,(int,breakpoint) Hashtbl.t) Hashtbl.t;
+	(* The registered function breakpoints *)
+	function_breakpoints : ((int * int),function_breakpoint) Hashtbl.t;
+	(* Whether or not debugging is supported. Has various effects on the amount of
+	   data being retained at run-time. *)
+	mutable support_debugger : bool;
+	(* The debugger socket *)
+	mutable debug_socket : debug_socket option;
+	(* The current exception mode *)
+	mutable exception_mode : exception_mode;
+	(* The debug context which manages scopes and variables. *)
+	mutable debug_context : eval_debug_context;
+}
+
+and context = {
+	ctx_id : int;
+	is_macro : bool;
+	detail_times : bool;
+	builtins : builtins;
+	debug : debug;
+	mutable had_error : bool;
+	mutable curapi : value MacroApi.compiler_api;
+	mutable type_cache : Type.module_type IntMap.t;
+	overrides : (Globals.path * string,bool) Hashtbl.t;
+	(* prototypes *)
+	mutable array_prototype : vprototype;
+	mutable string_prototype : vprototype;
+	mutable vector_prototype : vprototype;
+	mutable instance_prototypes : vprototype IntMap.t;
+	mutable static_prototypes : static_prototypes;
+	mutable constructors : value Lazy.t IntMap.t;
+	get_object_prototype : 'a . context -> (int * 'a) list -> vprototype * (int * 'a) list;
+	(* eval *)
+	toplevel : value;
+	eval : eval;
+	mutable evals : eval IntMap.t;
+	mutable exception_stack : (pos * env_kind) list;
+	max_stack_depth : int;
+}
+
+module GlobalState = struct
+	let get_ctx_ref : (unit -> context) ref = ref (fun() -> assert false)
+
+	let sid : int ref = ref (-1)
+
+	let debug : debug option ref = ref None
+	let debugger_initialized : bool ref = ref false
+
+	let stdlib : builtins option ref = ref None
+	let macro_lib : (string,value) Hashtbl.t = Hashtbl.create 0
+
+	let cleanup ctx =
+		(* curapi holds a reference to the typing context which we don't want to persist. Let's unset it so the
+		   context can be collected. *)
+		ctx.curapi <- Obj.magic ""
+end
+
+let get_ctx () = (!GlobalState.get_ctx_ref)()
+let select ctx = GlobalState.get_ctx_ref := (fun() -> ctx)
+
+let s_debug_state = function
+	| DbgRunning -> "DbgRunning"
+	| DbgWaiting -> "DbgWaiting"
+	| DbgStep -> "DbgStep"
+	| DbgNext _ -> "DbgNext"
+	| DbgFinish _ -> "DbgFinish"
+
+(* Misc *)
+
+let get_eval ctx =
+    let id = Thread.id (Thread.self()) in
+    if id = 0 then ctx.eval else IntMap.find id ctx.evals
+
+let rec kind_name eval kind =
+	let rec loop kind env = match kind with
+		| EKMethod(i1,i2) ->
+			Printf.sprintf "%s.%s" (rev_hash i1) (rev_hash i2)
+		| EKLocalFunction i ->
+			begin match env with
+			| None -> Printf.sprintf "localFunction%i" i
+			| Some env -> Printf.sprintf "%s.localFunction%i" (loop env.env_info.kind env.env_parent) i
+			end
+		| EKEntrypoint ->
+			begin match env with
+			| None -> "entrypoint"
+			| Some env -> rev_hash env.env_info.pfile
+			end
+	in
+	match eval.env with
+	| None -> "toplevel"
+	| Some env -> loop kind (Some env)
+
+let call_function f vl = f vl
+
+let object_fields o =
+	IntMap.fold (fun key index acc ->
+		(key,(o.ofields.(index))) :: acc
+	) o.oproto.pinstance_names []
+
+let instance_fields i =
+	IntMap.fold (fun name key acc ->
+		(name,i.ifields.(key)) :: acc
+	) i.iproto.pinstance_names []
+
+let proto_fields proto =
+	IntMap.fold (fun name key acc ->
+		(name,proto.pfields.(key)) :: acc
+	) proto.pnames []
+
+(* Exceptions *)
+
+exception RunTimeException of value * env list * pos
+
+let call_stack eval =
+	let rec loop acc env =
+		let acc = env :: acc in
+		match env.env_parent with
+		| Some env -> loop acc env
+		| _ -> List.rev acc
+	in
+	match eval.env with
+	| None -> []
+	| Some env -> loop [] env
+
+let throw v p =
+	let ctx = get_ctx() in
+	let eval = get_eval ctx in
+	match eval.env with
+	| Some env ->
+		if p <> null_pos then begin
+			env.env_leave_pmin <- p.pmin;
+			env.env_leave_pmax <- p.pmax;
+		end;
+		raise_notrace (RunTimeException(v,call_stack eval,p))
+	| None ->
+		raise_notrace (RunTimeException(v,[],p))
+
+let exc v = throw v null_pos
+
+let exc_string str = exc (vstring (EvalString.create_ascii str))
+
+let error_message = exc_string
+
+let flush_core_context f =
+	let ctx = get_ctx() in
+	ctx.curapi.MacroApi.flush_context f
+
+(* Environment handling *)
+
+let no_timer = fun () -> ()
+let empty_array = [||]
+let no_expr = ""
+
+let no_debug = {
+	timer = no_timer;
+	scopes = [];
+	line = 0;
+	debug_expr = no_expr;
+	debug_pos = null_pos;
+}
+
+let create_env_info static pfile kind capture_infos =
+	let info = {
+		static = static;
+		kind = kind;
+		pfile = hash pfile;
+		pfile_unique = hash (Path.unique_full_path pfile);
+		capture_infos = capture_infos;
+	} in
+	info
+
+let push_environment ctx info num_locals num_captures =
+	let eval = get_eval ctx in
+	let timer = if ctx.detail_times then
+		Timer.timer ["macro";"execution";kind_name eval info.kind]
+	else
+		no_timer
+	in
+	let debug = if ctx.debug.support_debugger || ctx.detail_times then
+		{ no_debug with timer = timer }
+	else
+		no_debug
+	in
+	let locals = if num_locals = 0 then
+		empty_array
+	else
+		Array.make num_locals vnull
+	in
+	let captures = if num_captures = 0 then
+		empty_array
+	else
+		Array.make num_captures vnull
+	in
+	let stack_depth = match eval.env with
+		| None -> 1;
+		| Some env -> env.env_stack_depth + 1
+	in
+	let env = {
+		env_info = info;
+		env_leave_pmin = 0;
+		env_leave_pmax = 0;
+		env_debug = debug;
+		env_locals = locals;
+		env_captures = captures;
+		env_extra_locals = IntMap.empty;
+		env_parent = eval.env;
+		env_eval = eval;
+		env_stack_depth = stack_depth;
+	} in
+	eval.env <- Some env;
+	begin match ctx.debug.debug_socket,env.env_info.kind with
+		| Some socket,EKMethod(key_type,key_field) ->
+			begin try
+				let bp = Hashtbl.find ctx.debug.function_breakpoints (key_type,key_field) in
+				if bp.fbpstate <> BPEnabled then raise Not_found;
+				socket.connection.bp_stop ctx.debug;
+				eval.debug_state <- DbgWaiting;
+			with Not_found ->
+				()
+			end
+		| _ ->
+			()
+	end;
+	env
+
+let pop_environment ctx env =
+	let eval = env.env_eval in
+	eval.env <- env.env_parent;
+	env.env_debug.timer();
+	()
+
+(* Prototypes *)
+
+let get_static_prototype_raise ctx path =
+	ctx.static_prototypes#get path
+
+let get_static_prototype ctx path p =
+	try get_static_prototype_raise ctx path
+	with Not_found -> Error.error (Printf.sprintf "[%i] Type not found: %s" ctx.ctx_id (rev_hash path)) p
+
+let get_static_prototype_as_value ctx path p =
+	(get_static_prototype ctx path p).pvalue
+
+let get_instance_prototype_raise ctx path =
+	IntMap.find path ctx.instance_prototypes
+
+let get_instance_prototype ctx path p =
+	try get_instance_prototype_raise ctx path
+	with Not_found -> Error.error (Printf.sprintf "[%i] Instance prototype not found: %s" ctx.ctx_id (rev_hash path)) p
+
+let get_instance_constructor_raise ctx path =
+	IntMap.find path ctx.constructors
+
+let get_instance_constructor ctx path p =
+	try get_instance_constructor_raise ctx path
+	with Not_found -> Error.error (Printf.sprintf "[%i] Instance constructor not found: %s" ctx.ctx_id (rev_hash path)) p
+
+let get_special_instance_constructor_raise ctx path =
+	Hashtbl.find (get_ctx()).builtins.constructor_builtins path
+
+let get_proto_field_index_raise proto name =
+	IntMap.find name proto.pnames
+
+let get_proto_field_index proto name =
+	try get_proto_field_index_raise proto name
+	with Not_found -> Error.error (Printf.sprintf "Field index for %s not found on prototype %s" (rev_hash name) (rev_hash proto.ppath)) null_pos
+
+let get_instance_field_index_raise proto name =
+	IntMap.find name proto.pinstance_names
+
+let get_instance_field_index proto name p =
+	try get_instance_field_index_raise proto name
+	with Not_found -> Error.error (Printf.sprintf "Field index for %s not found on prototype %s" (rev_hash name) (rev_hash proto.ppath)) p
diff --git a/src/macro/eval/evalDebug.ml b/src/macro/eval/evalDebug.ml
new file mode 100644
index 0000000000000000000000000000000000000000..408b8762f9e3c2b1ceb2e713d3eda6204d15f325
--- /dev/null
+++ b/src/macro/eval/evalDebug.ml
@@ -0,0 +1,123 @@
+open Gc
+open Globals
+open Ast
+open Type
+open EvalJitContext
+open EvalContext
+open EvalValue
+open EvalExceptions
+open EvalPrinting
+open EvalHash
+open EvalEncode
+open EvalMisc
+open EvalDebugMisc
+open MacroApi
+
+let is_caught eval v =
+	try
+		Hashtbl.iter (fun path _ -> if is v path then raise Exit) eval.caught_types;
+		false
+	with Exit ->
+		true
+
+(* Checks debug state and calls what's needed. *)
+let rec run_loop run env : value =
+	let eval = env.env_eval in
+	let check_breakpoint () =
+		if eval.breakpoint.bpstate = BPHit && env.env_debug.line <> eval.breakpoint.bpline then eval.breakpoint.bpstate <- BPEnabled
+	in
+	match eval.debug_state with
+		| DbgRunning ->
+			check_breakpoint();
+			run env
+		| DbgNext(env',p) ->
+			let b = DisplayPosition.encloses_position (env.env_debug.debug_pos) p in
+			let rec is_on_stack env =
+				match env.env_parent with
+				| Some env -> env == env' || is_on_stack env
+				| None -> false
+			in
+			if is_on_stack env || b then
+				run env
+			else begin
+				eval.debug_state <- DbgWaiting;
+				run_loop run env
+			end;
+		| DbgFinish env' ->
+			if env' != env then
+				run env
+			else begin
+				eval.debug_state <- DbgWaiting;
+				run_loop run env
+			end
+		| DbgStep ->
+			eval.debug_state <- DbgWaiting;
+			run env
+		| DbgWaiting ->
+			ignore(Event.sync(Event.receive eval.debug_channel));
+			run_loop run env
+
+let debug_loop jit conn e f =
+	let ctx = jit.ctx in
+	let scopes = jit.scopes in
+	let line,col1,_,_ = Lexer.get_pos_coords e.epos in
+	let column_matches breakpoint = match breakpoint.bpcolumn with
+		| BPAny -> true
+		| BPColumn i -> i = col1
+	in
+	let condition_holds env breakpoint = match breakpoint.bpcondition with
+		| None -> true
+		| Some e -> match safe_call env.env_eval (expr_to_value_safe ctx env) e with
+			| VTrue -> true
+			| _ -> false
+	in
+	let debugger_catches eval v = match ctx.debug.exception_mode with
+		| CatchAll -> true
+		| CatchUncaught -> not (is_caught eval v)
+		| CatchNone -> false
+	in
+	(* Checks if we hit a breakpoint, runs the code if not. *)
+	let rec run_check_breakpoint env =
+		let eval = env.env_eval in
+		try
+			let h = Hashtbl.find ctx.debug.breakpoints env.env_info.pfile_unique in
+			let breakpoint = Hashtbl.find h env.env_debug.line in
+			begin match breakpoint.bpstate with
+				| BPEnabled when column_matches breakpoint && condition_holds env breakpoint ->
+					breakpoint.bpstate <- BPHit;
+					eval.breakpoint <- breakpoint; (* TODO: per-thread... *)
+					conn.bp_stop ctx.debug;
+					eval.debug_state <- DbgWaiting;
+					run_loop run_check_breakpoint env
+				| _ ->
+					raise Not_found
+			end
+		with Not_found -> try
+			f env
+		with
+		| RunTimeException(v,_,_) when debugger_catches env.env_eval v && eval.caught_exception != v ->
+			eval.caught_exception <- v;
+			conn.exc_stop ctx.debug v e.epos;
+			eval.debug_state <- DbgWaiting;
+			run_loop run_check_breakpoint env
+		| BreakHere ->
+			conn.bp_stop ctx.debug;
+			eval.debug_state <- DbgWaiting;
+			run_loop (fun _ -> vnull) env
+		| Return v as exc ->
+			eval.last_return <- Some v;
+			raise exc
+		(* | Return _ | Break | Continue | Sys_exit _ | RunTimeException _ as exc ->
+			raise exc
+		| exc ->
+			throw (EvalString.vstring (EvalString.create_ascii (Printexc.to_string exc))) e.epos; *)
+	in
+	(* Sets the environmental debug data, then executes the debug loop. *)
+	let run_set env =
+		env.env_debug.scopes <- scopes;
+		env.env_debug.line <- line;
+		env.env_debug.debug_pos <- e.epos;
+		env.env_debug.debug_expr <- s_expr_pretty e;
+		run_loop run_check_breakpoint env;
+	in
+	run_set
\ No newline at end of file
diff --git a/src/macro/eval/evalDebugMisc.ml b/src/macro/eval/evalDebugMisc.ml
new file mode 100644
index 0000000000000000000000000000000000000000..73d9277ea849413a77207676ca3c79cef6a218b4
--- /dev/null
+++ b/src/macro/eval/evalDebugMisc.ml
@@ -0,0 +1,416 @@
+open Ast
+open Globals
+open MacroApi
+open EvalContext
+open EvalHash
+open EvalValue
+open EvalEncode
+open EvalMisc
+open EvalExceptions
+
+exception BreakHere
+
+let createInstance_ref : value ref = Obj.magic ()
+
+let declared_before vi p =
+	vi.vi_pos.pmin < p.pmin
+
+(* Breakpoints *)
+
+let breakpoint_id = ref (-1)
+
+let make_breakpoint file line state column condition =
+	incr breakpoint_id;
+	{
+		bpid = !breakpoint_id;
+		bpfile = file;
+		bpline = line;
+		bpstate = state;
+		bpcolumn = column;
+		bpcondition = condition
+	}
+
+let make_function_breakpoint state =
+	incr breakpoint_id;
+	{
+		fbpid = !breakpoint_id;
+		fbpstate = state;
+	}
+
+let iter_breakpoints ctx f =
+	Hashtbl.iter (fun _ breakpoints ->
+		Hashtbl.iter (fun _ breakpoint -> f breakpoint) breakpoints
+	) ctx.debug.breakpoints
+
+let add_breakpoint ctx file line column condition =
+	let hash = hash (Path.unique_full_path (Common.find_file (ctx.curapi.get_com()) file)) in
+	let h = try
+		Hashtbl.find ctx.debug.breakpoints hash
+	with Not_found ->
+		let h = Hashtbl.create 0 in
+		Hashtbl.add ctx.debug.breakpoints hash h;
+		h
+	in
+	let breakpoint = make_breakpoint hash line BPEnabled column condition in
+	Hashtbl.replace h line breakpoint;
+	breakpoint
+
+let delete_breakpoint ctx file line =
+	let hash = hash (Path.unique_full_path (Common.find_file (ctx.curapi.get_com()) file)) in
+	let h = Hashtbl.find ctx.debug.breakpoints hash in
+	Hashtbl.remove h line
+
+let find_breakpoint ctx sid =
+	let found = ref None in
+	let id = try int_of_string sid with _ -> raise Not_found in
+	try
+		iter_breakpoints ctx (fun breakpoint ->
+			if breakpoint.bpid = id then begin
+				found := Some breakpoint;
+				raise Exit
+			end
+		);
+		raise Not_found
+	with Exit ->
+		match !found with None -> assert false | Some breakpoint -> breakpoint
+
+(* Helper *)
+
+exception Parse_expr_error of string
+
+let parse_expr ctx s p =
+	let error s = raise (Parse_expr_error s) in
+	match ParserEntry.parse_expr_string (ctx.curapi.get_com()).Common.defines s p error true with
+	| ParseSuccess data | ParseDisplayFile(data,_) -> data
+	| ParseError(_,(msg,_),_) -> error (Parser.error_msg msg)
+
+(* Vars *)
+
+let get_var_slot_by_name env is_read scopes name =
+	let rec loop scopes = match scopes with
+		| scope :: scopes ->
+			begin try
+				let id = Hashtbl.find scope.local_ids name in
+				let slot = Hashtbl.find scope.locals id in
+				let vi = Hashtbl.find scope.local_infos slot in
+				if is_read && not (declared_before vi env.env_debug.debug_pos) then raise Not_found;
+				slot + scope.local_offset
+			with Not_found ->
+				loop scopes
+			end
+		| [] ->
+			raise Not_found
+	in
+	loop scopes
+
+let get_capture_slot_by_name capture_infos name =
+	let ret = ref None in
+	try
+		Hashtbl.iter (fun slot vi ->
+			if name = vi.vi_name then begin
+				ret := (Some slot);
+				raise Exit
+			end
+		) capture_infos;
+		raise Not_found
+	with Exit ->
+		match !ret with None -> assert false | Some name -> name
+
+let get_variable env capture_infos scopes name env =
+	try
+		let slot = get_var_slot_by_name env true scopes name in
+		let value = env.env_locals.(slot) in
+		value
+	with Not_found ->
+		let slot = get_capture_slot_by_name capture_infos name in
+		let value = try env.env_captures.(slot) with _ -> raise Not_found in
+		value
+
+(* Expr to value *)
+
+let resolve_ident ctx env s =
+	let key = hash s in
+	try
+		(* 0. Extra locals *)
+		IntMap.find key env.env_extra_locals
+	with Not_found -> try
+		(* 1. Variable *)
+		get_variable ctx env.env_info.capture_infos env.env_debug.scopes s env
+	with Not_found -> try
+		(* 2. Instance *)
+		if env.env_info.static then raise Not_found;
+		let rec loop env = match env.env_info.kind with
+			| EKLocalFunction _ ->
+				begin match env.env_parent with
+					| None -> assert false
+					| Some env -> loop env
+				end
+			| EKMethod _ -> env
+			| EKEntrypoint ->
+				(* This can happen due to threads. Have to check what we can do here... *)
+				raise Not_found
+		in
+		let env = loop env in
+		let v = env.env_locals.(0) in
+		EvalField.field_raise v key
+	with Not_found -> try
+		(* 3. Static *)
+		begin match env.env_info.kind with
+			| EKMethod(i1,_) ->
+				let proto = get_static_prototype_raise ctx i1 in
+				EvalField.proto_field_raise proto key
+			| _ ->
+				raise Not_found
+		end
+	with Not_found -> try
+		(* 4. Type *)
+		VPrototype (get_static_prototype_raise ctx key)
+	with Not_found -> try
+		(* 5. Toplevel *)
+		EvalField.field_raise ctx.toplevel key
+	with Not_found ->
+		vnull
+
+let find_enum_field_by_name ve name =
+	match (get_static_prototype_raise (get_ctx()) ve.epath).pkind with
+	| PEnum names ->
+		let fields = snd (List.nth names ve.eindex) in
+		let rec loop i fields = match fields with
+			| field :: fields ->
+				if field = name then i
+				else loop (i + 1) fields
+			| [] ->
+				raise Not_found
+		in
+		loop 0 fields
+	| _ ->
+		raise Not_found
+
+let safe_call eval f a =
+	let old = eval.debug_state in
+	eval.debug_state <- DbgRunning;
+	try
+		let r = f a in
+		eval.debug_state <- old;
+		r
+	with exc ->
+		eval.debug_state <- old;
+		raise exc
+
+let rec expr_to_value ctx env e =
+	let rec loop e = match fst e with
+		| EConst cst ->
+			begin match cst with
+				| String(s,_) -> EvalString.create_unknown s
+				| Int s -> VInt32 (Int32.of_string s)
+				| Float s -> VFloat (float_of_string s)
+				| Ident "true" -> VTrue
+				| Ident "false" -> VFalse
+				| Ident "null" -> VNull
+				| Ident s ->
+					let value = resolve_ident ctx env s in
+					value
+				| _ -> raise Exit
+			end
+		| EArray(e1,eidx) ->
+			let v1 = loop e1 in
+			let vidx = loop eidx in
+			let idx = match vidx with VInt32 i -> Int32.to_int i | _ -> raise Exit in
+			begin match v1 with
+				| VArray va -> EvalArray.get va idx
+				| VVector vv -> Array.get vv idx
+				| VEnumValue ev -> Array.get ev.eargs idx
+				| _ -> raise Exit
+			end
+		| EField(e1,s) ->
+			let v1 = loop e1 in
+			let s' = hash s in
+			begin match v1 with
+			| VEnumValue ve ->
+				begin try
+					let i = find_enum_field_by_name ve s' in
+					ve.eargs.(i)
+				with Not_found ->
+					vnull
+				end
+			| _ ->
+				let v = try
+					EvalField.field_raise v1 s'
+				with Not_found -> try
+					(* Maybe we have a getter? (#8599) *)
+					let vf = EvalField.field v1 (hash ("get_" ^ s)) in
+					safe_call env.env_eval (EvalPrinting.call_value_on v1 vf) []
+				with _ ->
+					vnull
+				in
+				v
+			end
+		| EArrayDecl el ->
+			let vl = List.map loop el in
+			encode_array vl
+		| EObjectDecl fl ->
+			let fl = List.map (fun ((s,_,_),e) -> s,loop e) fl in
+			encode_obj_s fl
+		| EBinop(op,e1,e2) ->
+			begin match op with
+			| OpAssign ->
+				let v2 = loop e2 in
+				write_expr ctx env e1 v2;
+			| OpAssignOp op ->
+				raise Exit (* Nobody does that, right? *)
+			| OpBoolAnd ->
+				if is_true (loop e1) then loop e2
+				else VFalse
+			| OpBoolOr ->
+				if is_true (loop e1) then VTrue
+				else loop e2
+			| _ ->
+				let v1 = loop e1 in
+				let v2 = loop e2 in
+				let p = pos e in
+				(try get_binop_fun op p with _ -> raise Exit) v1 v2
+			end
+		| EUnop(op,flag,e1) ->
+			begin match op with
+			| Not ->
+				begin match loop e1 with
+				| VNull | VFalse -> VTrue
+				| _ -> VFalse
+				end
+			| Neg ->
+				begin match loop e1 with
+				| VFloat f -> VFloat (-.f)
+				| VInt32 i -> vint32 (Int32.neg i)
+				| _ -> raise Exit
+				end
+			| NegBits ->
+				op_sub (pos e) (vint32 (Int32.minus_one)) (loop e1)
+			| Increment | Decrement ->
+				raise Exit
+			end
+		| ECall(e1,el) ->
+			begin match fst e1 with
+			| EField(ethis,s) ->
+				let vthis = loop ethis in
+				let v1 = EvalField.field vthis (hash s) in
+				let vl = List.map loop el in
+				safe_call env.env_eval (EvalPrinting.call_value_on vthis v1) vl
+			| _ ->
+				let v1 = loop e1 in
+				let vl = List.map loop el in
+				safe_call env.env_eval (call_value v1) vl
+			end
+		| EBlock el ->
+			let rec loop2 el = match el with
+				| [] -> VNull
+				| [e1] -> loop e1
+				| e1 :: el ->
+					ignore(loop e1);
+					loop2 el
+			in
+			loop2 el
+		| EIf(e1,e2,eo) ->
+			let v1 = loop e1 in
+			if is_true v1 then loop e2
+			else Option.map_default loop VNull eo
+		| ETernary(e1,e2,e3) ->
+			let v1 = loop e1 in
+			if is_true v1 then loop e2 else loop e3
+		| EParenthesis e1 | EMeta(_,e1) | EUntyped e1 | ECast(e1,None) | ECheckType(e1,_) ->
+			loop e1
+		| EReturn e1 ->
+			let v1 = Option.map_default loop vnull e1 in
+			raise (Return v1)
+		| EContinue ->
+			raise Continue
+		| EBreak ->
+			raise Break
+		| EThrow e1 ->
+			let v1 = loop e1 in
+			throw v1 (pos e)
+		| EVars vl ->
+			List.iter (fun ((n,_),_,_,eo) ->
+				match eo with
+				| Some e ->
+					env.env_extra_locals <- IntMap.add (hash n) (loop e) env.env_extra_locals
+				| _ ->
+					()
+			) vl;
+			vnull
+		| EWhile(e1,e2,flag) ->
+			let rec loop2 () =
+				if is_true (loop e1) then begin
+					ignore(loop e2);
+					loop2()
+				end
+			in
+			if flag = DoWhile then ignore(loop e2);
+			loop2();
+			vnull
+		| ENew((tp,_),el) ->
+			let rec loop2 v sl = match sl with
+				| [] -> v
+				| s :: sl ->
+					loop2 (EvalField.field v (hash s)) sl
+			in
+			let v1 = loop2 ctx.toplevel tp.tpackage in
+			let v1 = loop2 v1 [match tp.tsub with None -> tp.tname | Some s -> s] in
+			let vl = List.map loop el in
+			let vc = loop2 ctx.toplevel ["Type";"createInstance"] in
+			safe_call env.env_eval (call_value vc) [v1;encode_array vl]
+		| ETry _ | ESwitch _ | EFunction _ | EFor _ | EDisplay _
+		| EDisplayNew _ | ECast(_,Some _) ->
+			raise Exit
+	in
+	loop e
+
+and write_expr ctx env expr value =
+	begin match fst expr with
+		| EField(e1,s) ->
+			let s' = hash s in
+			let v1 = expr_to_value ctx env e1 in
+			begin match v1 with
+			| VEnumValue ve ->
+				begin try
+					let i = find_enum_field_by_name ve s' in
+					ve.eargs.(i) <- value;
+					value
+				with Not_found ->
+					value
+				end
+			| _ ->
+				try
+					set_field v1 s' value;
+					value;
+				with Not_found -> try
+					let vf = EvalField.field v1 (hash ("set_" ^ s)) in
+					safe_call env.env_eval (EvalPrinting.call_value_on v1 vf) [value]
+				with _ ->
+					value
+			end
+		| EConst (Ident s) ->
+			begin try
+				let slot = get_var_slot_by_name env false env.env_debug.scopes s in
+				env.env_locals.(slot) <- value;
+				value
+			with Not_found ->
+				raise Exit
+			end
+		| EArray(e1,e2) ->
+			let v1 = expr_to_value ctx env e1 in
+			let vidx = expr_to_value ctx env e2 in
+			let idx = match vidx with VInt32 i -> Int32.to_int i | _ -> raise Exit in
+			begin match v1 with
+				| VArray va -> EvalArray.set va idx value
+				| VVector vv -> Array.set vv idx value
+				| VEnumValue ev -> Array.set ev.eargs idx value
+				| _ -> raise Exit
+			end;
+			value
+		| _ ->
+			raise Exit
+	end
+
+let expr_to_value_safe ctx env e =
+	try expr_to_value ctx env e
+	with Exit -> VNull
\ No newline at end of file
diff --git a/src/macro/eval/evalDebugSocket.ml b/src/macro/eval/evalDebugSocket.ml
new file mode 100644
index 0000000000000000000000000000000000000000..a459dbcfcc498d154d015486071253a76308fa4c
--- /dev/null
+++ b/src/macro/eval/evalDebugSocket.ml
@@ -0,0 +1,796 @@
+open Gc
+open Ast
+open Type
+open Globals
+open MacroApi
+open JsonRpcSocket
+open Json
+open EvalContext
+open EvalValue
+open EvalHash
+open EvalPrinting
+open EvalMisc
+open EvalDebugMisc
+
+(* Printing *)
+
+let var_to_json name value vio env =
+	let jv t v num_children =
+		let id = if num_children = 0 then 0 else (get_ctx()).debug.debug_context#add_value value env in
+		let fields = [
+			"id",JInt id;
+			"name",JString name;
+			"type",JString t;
+			"value",JString v;
+			"numChildren",JInt num_children;
+		] in
+		let fields = match vio with
+			| Some vi ->
+				let line,col1,_,_ = Lexer.get_pos_coords vi.vi_pos in
+				("generated",JBool vi.vi_generated) ::
+				("line",JInt line) ::
+				("column",JInt col1) ::
+				fields
+			| None ->
+				fields
+		in
+		JObject fields
+	in
+	let string_repr s = "\"" ^ (StringHelper.s_escape s.sstring) ^ "\"" in
+	let rec level2_value_repr = function
+		| VNull -> "null"
+		| VTrue -> "true"
+		| VFalse -> "false"
+		| VInt32 i -> Int32.to_string i
+		| VFloat f -> string_of_float f
+		| VEnumValue ve ->
+			let name = EvalPrinting.s_enum_ctor_name ve in
+			begin match ve.eargs with
+				| [||] -> name
+				| vl -> name ^ "(...)"
+			end
+		| VObject o -> "{...}"
+		| VString s -> string_repr s
+		| VArray _ | VVector _ -> "[...]"
+		| VInstance vi -> (rev_hash vi.iproto.ppath) ^ " {...}"
+		| VPrototype proto -> (s_proto_kind proto).sstring
+		| VFunction _ | VFieldClosure _ -> "<fun>"
+		| VLazy f -> level2_value_repr (!f())
+	in
+	let fields_string fields =
+		let l = List.map (fun (name, value) -> Printf.sprintf "%s: %s" (rev_hash name) (level2_value_repr value)) fields in
+		Printf.sprintf "{%s}" (String.concat ", " l)
+	in
+	let array_elems l =
+		let l = List.map level2_value_repr l in
+		Printf.sprintf "[%s]" (String.concat ", " l)
+	in
+	let rec value_string v = match v with
+		| VNull -> jv "NULL" "null" 0
+		| VTrue -> jv "Bool" "true" 0
+		| VFalse -> jv "Bool" "false" 0
+		| VInt32 i -> jv "Int" (Int32.to_string i) 0
+		| VFloat f -> jv "Float" (string_of_float f) 0
+		| VEnumValue ve ->
+			let type_s = rev_hash ve.epath in
+			let name = EvalPrinting.s_enum_ctor_name ve in
+			let value_s = match ve.eargs with
+				| [||] -> name
+				| vl ->
+					let l = Array.to_list (Array.map level2_value_repr vl) in
+					let s = Printf.sprintf "%s(%s)" name (String.concat ", " l) in
+					s
+			in
+			jv type_s value_s (Array.length ve.eargs)
+		| VObject o ->
+			begin try
+				let e = (get_ctx()).curapi.MacroApi.decode_expr v in
+				jv "Expr" (Ast.Printer.s_expr e) 2
+			with _ ->
+				let fields = object_fields o in
+				jv "Anonymous" (fields_string fields) (List.length fields)
+			end
+		| VString s ->
+			jv "String" (string_repr s) 2
+		| VArray va -> jv "Array" (array_elems (EvalArray.to_list va)) va.alength
+		| VVector vv -> jv "Vector" (array_elems (Array.to_list vv)) (Array.length vv)
+		| VInstance vi ->
+			let class_name () = EvalDebugMisc.safe_call env.env_eval EvalPrinting.value_string v in
+			let num_children,class_name = match vi.ikind with
+			| IMutex _ -> 1,class_name()
+			| IThread _ -> 1,class_name()
+			| IBytes bytes ->
+				let max = 40 in
+				let s = Bytes.to_string bytes in
+				let s = (try String.sub s 0 max ^ "..." with Invalid_argument _ -> s) in
+				List.length (instance_fields vi),s
+			| _ -> List.length (instance_fields vi),class_name()
+			in
+			let num_children = match vi.ikind with
+			| IMutex _ -> 1
+			| IThread _ -> 1
+			| _ -> List.length (instance_fields vi)
+			in
+			jv class_name (class_name) num_children
+		| VPrototype proto ->
+			let fields = proto_fields proto in
+			jv "Anonymous" (s_proto_kind proto).sstring (List.length fields)
+		| VFunction _ | VFieldClosure _ -> jv "Function" "<fun>" 0
+		| VLazy f -> value_string (!f())
+	in
+	value_string value
+
+let get_call_stack_envs eval p =
+	let envs = call_stack eval in
+	let rec loop delta envs = match envs with
+		| _ :: envs when delta < 0 -> loop (delta + 1) envs
+		| _ -> envs
+	in
+	loop 0 envs
+
+let output_call_stack ctx eval p =
+	let envs = get_call_stack_envs eval p in
+	let stack_item env p =
+		let id = ctx.debug.debug_context#add_stack_frame env in
+		let kind = env.env_info.kind in
+		let line1,col1,line2,col2 = Lexer.get_pos_coords p in
+		let path = Path.get_real_path p.pfile in
+		let artificial,name = match kind with
+			| EKMethod _ | EKLocalFunction _ -> false,kind_name eval kind
+			| EKEntrypoint -> true,p.pfile
+		in
+		let source = if Sys.file_exists path then JString path else JNull in
+		JObject [
+			"id",JInt id;
+			"name",JString name;
+			"source",source;
+			"line",JInt line1;
+			"column",JInt col1;
+			"endLine",JInt line2;
+			"endColumn",JInt col2;
+			"artificial",JBool artificial;
+		]
+	in
+	let _,stack = List.fold_left (fun (first,acc) env ->
+		let p = if first then p else {pmin = env.env_leave_pmin; pmax = env.env_leave_pmax; pfile = rev_hash env.env_info.pfile} in
+		false,((stack_item env p) :: acc)
+	) (true,[]) envs in
+	JArray (List.rev stack)
+
+let output_threads ctx =
+	let fold id eval acc =
+		(JObject [
+			"id",JInt id;
+			"name",JString (Printf.sprintf "Thread %i" (Thread.id eval.thread.tthread));
+		]) :: acc
+	in
+	let threads = IntMap.fold fold ctx.evals [] in
+	JArray threads
+
+let is_simn = false
+
+let output_scopes ctx env =
+	let capture_infos = env.env_info.capture_infos in
+	let scopes = env.env_debug.scopes in
+	let mk_scope id name pos =
+		let fl = ["id",JInt id; "name",JString name] in
+		let fl =
+			if pos <> null_pos then
+				let line1,col1,line2,col2 = Lexer.get_pos_coords pos in
+				("pos",JObject [
+					"source",JString (Path.get_real_path pos.pfile);
+					"line",JInt line1;
+					"column",JInt col1;
+					"endLine",JInt line2;
+					"endColumn",JInt col2;
+				]) :: fl
+			else
+				fl
+		in
+		JObject fl
+	in
+	let scopes = List.fold_left (fun acc scope ->
+		if Hashtbl.length scope.local_infos <> 0 then
+			(mk_scope (ctx.debug.debug_context#add_scope scope env) "Locals" scope.pos) :: acc
+		else
+			acc
+	) [] scopes in
+	let scopes = if not is_simn then
+		scopes
+	else begin
+		let dbg = {
+			ds_expr = env.env_debug.debug_expr;
+			ds_return = env.env_eval.last_return;
+		} in
+		(mk_scope (ctx.debug.debug_context#add_debug_scope dbg env) "Eval" null_pos) :: scopes
+	end in
+	let scopes = List.rev scopes in
+	let scopes = if Hashtbl.length capture_infos = 0 then scopes else (mk_scope (ctx.debug.debug_context#add_capture_scope capture_infos env) "Captures" null_pos) :: scopes in
+	JArray scopes
+
+let output_capture_vars infos env =
+	let vars = Hashtbl.fold (fun slot vi acc ->
+		let value = (env.env_captures.(slot)) in
+		(var_to_json vi.vi_name value (Some vi) env) :: acc
+	) infos [] in
+	JArray vars
+
+let output_debug_scope dbg env =
+	let ja = [
+		var_to_json "expr" (VString (EvalString.create_ascii env.env_debug.debug_expr)) None env;
+		var_to_json "last return" (match dbg.ds_return with None -> vnull | Some v -> v) None env;
+	] in
+	JArray ja
+
+let output_scope_vars env scope =
+	let p = env.env_debug.debug_pos in
+	let vars = Hashtbl.fold (fun local_slot vi acc ->
+		if declared_before vi p then begin
+			let slot = local_slot + scope.local_offset in
+			let value = env.env_locals.(slot) in
+			(var_to_json vi.vi_name value (Some vi) env) :: acc
+		end else
+			acc
+	) scope.local_infos [] in
+	JArray vars
+
+let output_inner_vars v env =
+	let rec loop v = match v with
+		| VNull | VTrue | VFalse | VInt32 _ | VFloat _ | VFunction _ | VFieldClosure _ -> []
+		| VEnumValue ve ->
+			begin match (get_static_prototype_raise (get_ctx()) ve.epath).pkind with
+				| PEnum names ->
+					let fields = snd (List.nth names ve.eindex) in
+					List.mapi (fun i n ->
+						let n = rev_hash n in
+						let v = ve.eargs.(i) in
+						n, v
+					) fields
+				| _ -> []
+			end
+		| VObject o ->
+			let fields = object_fields o in
+			List.map (fun (n,v) ->
+				let n = rev_hash n in
+				n, v
+			) fields
+		| VString s ->
+			let _,l = List.fold_left (fun (i,acc) (cr_index,br_offset) ->
+				(i + 1),(Printf.sprintf "index%i" i,vint !cr_index) ::
+				(Printf.sprintf "offset%i" i,vint !br_offset) ::
+				acc
+			) (0,[]) (List.rev s.soffsets) in
+			("length",vint s.slength) ::
+			("byteLength",vint (String.length s.sstring)) ::
+			l
+		| VArray va ->
+			let l = EvalArray.to_list va in
+			List.mapi (fun i v ->
+				let n = Printf.sprintf "[%d]" i in
+				n, v
+			) l
+		| VVector vv ->
+			let l = Array.to_list vv in
+			List.mapi (fun i v ->
+				let n = Printf.sprintf "[%d]" i in
+				n, v
+			) l
+		| VInstance {ikind = IStringMap h} ->
+			StringHashtbl.fold (fun s (_,v) acc ->
+				(s,v) :: acc
+			) h []
+		| VInstance {ikind = IMutex mutex} ->
+			["owner",match mutex.mowner with None -> vnull | Some id -> vint id]
+		| VInstance {ikind = IThread thread} ->
+			["id",vint (Thread.id thread.tthread)]
+		| VInstance vi ->
+			let fields = instance_fields vi in
+			List.map (fun (n,v) ->
+				let n = rev_hash n in
+				n, v
+			) fields
+		| VPrototype proto ->
+			let fields = proto_fields proto in
+			List.map (fun (n,v) ->
+				let n = rev_hash n in
+				n, v
+			) fields
+		| VLazy f -> loop (!f())
+	in
+	let children = loop v in
+	let vars = List.map (fun (n,v) -> var_to_json n v None env) children in
+	JArray vars
+
+let handle_in_temp_thread ctx env f =
+	let channel = Event.new_channel () in
+	let _ = EvalThread.spawn ctx (fun () ->
+		let eval = get_eval ctx in
+		eval.env <- Some env;
+		let v = try
+			f()
+		with
+		| RunTimeException(v,stack,p) ->
+			prerr_endline (EvalExceptions.get_exc_error_message ctx v stack p);
+			vnull
+		| exc ->
+			prerr_endline (Printexc.to_string exc);
+			vnull
+		in
+		Event.poll (Event.send channel v)
+	) in
+	Event.sync (Event.receive channel)
+
+module ValueCompletion = struct
+	let prototype_instance_fields proto =
+		let rec loop acc proto =
+			let acc = match proto.pparent with
+				| None -> acc
+				| Some  proto -> loop acc proto
+			in
+			let acc = IntMap.fold (fun name _ acc -> IntMap.add name (name,"field",None) acc) proto.pinstance_names acc in
+			IntMap.fold (fun name _ acc -> IntMap.add name (name,"method",None) acc) proto.pnames acc
+		in
+		loop IntMap.empty proto
+
+	let prototype_static_fields proto =
+		IntMap.fold (fun name _ acc -> IntMap.add name (name,"field",None) acc) proto.pnames IntMap.empty
+
+
+	let to_json l =
+		JArray (List.map (fun (n,k,column) ->
+			let fields = ["label",JString (rev_hash n);"kind",JString k] in
+			let fields = match column with None -> fields | Some column -> ("start",JInt column) :: fields in
+			JObject fields
+		) l)
+
+	let collect_idents ctx env =
+		let acc = Hashtbl.create 0 in
+		let add key =
+			if not (Hashtbl.mem acc key) then
+				Hashtbl.add acc key (key,"value",None)
+		in
+		(* 0. Extra locals *)
+		IntMap.iter (fun key _ -> add key) env.env_extra_locals;
+		(* 1. Variables *)
+		let rec loop scopes = match scopes with
+			| scope :: scopes ->
+				Hashtbl.iter (fun key _ -> add (hash key)) scope.local_ids;
+				loop scopes
+			| [] ->
+				()
+		in
+		loop env.env_debug.scopes;
+		(* 2. Captures *)
+		Hashtbl.iter (fun slot vi ->
+			add (hash vi.vi_name)
+		) env.env_info.capture_infos;
+		(* 3. Instance *)
+		if not env.env_info.static then begin
+			let v = env.env_locals.(0) in
+			begin match v with
+			| VInstance vi ->
+				let fields = prototype_instance_fields vi.iproto in
+				IntMap.iter (fun key _ -> add key) fields
+			| _ ->
+				()
+			end
+		end;
+		(* 4. Static *)
+		begin match env.env_info.kind with
+			| EKMethod(i1,_) ->
+				let proto = get_static_prototype_raise ctx i1 in
+				let fields = prototype_static_fields proto in
+				IntMap.iter (fun key _ -> add key) fields
+			| _ ->
+				raise Not_found
+		end;
+		(* 5. Toplevel *)
+		begin match ctx.toplevel with
+		| VObject o ->
+			let fields = object_fields o in
+			List.iter (fun (n,_) -> add n) fields
+		| _ ->
+			()
+		end;
+		to_json (Hashtbl.fold (fun _ v acc -> v :: acc) acc [])
+
+	let output_completion ctx column v =
+		let field_value_kind v = match v with
+			| VFunction _ | VFieldClosure _ -> "function"
+			| _ -> "field"
+		in
+		let rec loop v = match v with
+			| VNull | VTrue | VFalse | VInt32 _ | VFloat _ | VFunction _ | VFieldClosure _ ->
+				[]
+			| VObject o ->
+				let fields = object_fields o in
+				List.map (fun (n,v) ->
+					n,(field_value_kind v),None
+				) fields
+			| VInstance vi ->
+				let fields = prototype_instance_fields vi.iproto in
+				IntMap.fold (fun _ v acc -> v :: acc) fields []
+			| VString _ ->
+				let fields = prototype_instance_fields ctx.string_prototype in
+				IntMap.fold (fun _ v acc -> v :: acc) fields [key_length,"field",None]
+			| VArray _ ->
+				let fields = prototype_instance_fields ctx.array_prototype in
+				IntMap.fold (fun _ v acc -> v :: acc) fields [key_length,"field",None]
+			| VVector _ ->
+				let fields = prototype_instance_fields ctx.vector_prototype in
+				IntMap.fold (fun _ v acc -> v :: acc) fields [key_length,"field",None]
+			| VPrototype proto ->
+				let fields = prototype_static_fields proto in
+				IntMap.fold (fun _ v acc -> v :: acc) fields []
+			| VLazy f ->
+				loop (!f())
+			| VEnumValue ve ->
+				begin match (get_static_prototype_raise (get_ctx()) ve.epath).pkind with
+					| PEnum names ->
+						let fields = snd (List.nth names ve.eindex) in
+						List.map (fun n -> n,"value",None) fields
+					| _ -> []
+				end
+		in
+		let l = loop v in
+		to_json l
+
+	exception JsonException of Json.t
+
+	let get_completion ctx text column env =
+		let p = { pmin = 0; pmax = 0; pfile = "" } in
+		let save =
+			let old = !Parser.display_mode,DisplayPosition.display_position#get in
+			(fun () ->
+				Parser.display_mode := fst old;
+				DisplayPosition.display_position#set (snd old);
+			)
+		in
+		Parser.display_mode := DMDefault;
+		let offset = column + (String.length "class X{static function main() ") - 1 (* this is retarded *) in
+		DisplayPosition.display_position#set {p with pmin = offset; pmax = offset};
+		begin try
+			let e = parse_expr ctx text p in
+			let e = Display.ExprPreprocessing.find_before_pos DMDefault e in
+			save();
+			let rec loop e = match fst e with
+			| EDisplay(e1,DKDot) ->
+				let v = handle_in_temp_thread ctx env (fun () -> expr_to_value ctx env e1) in
+				let json = output_completion ctx column v in
+				raise (JsonException json)
+			| EArray(e1,(EDisplay((EConst (Ident "null"),_),DKMarked),_)) ->
+				let v = handle_in_temp_thread ctx env (fun () -> expr_to_value ctx env e1) in
+				begin match v with
+				| VArray va ->
+					let l = EvalArray.to_list va in
+					let l = List.mapi (fun i v ->
+						let n = Printf.sprintf "%d" i in
+						(hash n),"value",Some column
+					) l in
+					raise (JsonException (to_json l))
+				| _ ->
+					raise Exit
+				end
+			| EDisplay(e1,DKMarked) ->
+				let json = collect_idents ctx env in
+				raise (JsonException json)
+			| _ ->
+				Ast.iter_expr loop e
+			in
+			begin try
+				loop e;
+				raise Exit
+			with
+			| JsonException json ->
+				json
+			end
+		with _ ->
+			save();
+			raise Exit
+		end;
+
+end
+
+type handler_context = {
+	ctx : context;
+	jsonrpc : Jsonrpc_handler.jsonrpc_handler;
+	send_error : 'a . string -> 'a;
+}
+
+let expect_env hctx env = match env with
+	| Some env -> env
+	| None -> hctx.send_error "No frame found"
+
+let handler =
+	let parse_breakpoint hctx jo =
+		let j = hctx.jsonrpc in
+		let obj = j#get_object "breakpoint" jo in
+		let line = j#get_int_field "line" "line" obj in
+		let column = j#get_opt_param (fun () -> BPColumn (j#get_int_field "column" "column" obj)) BPAny in
+		let condition = j#get_opt_param (fun () ->
+			let s = j#get_string_field "condition" "condition" obj in
+			Some (parse_expr hctx.ctx s null_pos)
+		) None in
+		(line,column,condition)
+	in
+	let select_frame hctx =
+		let frame_id = hctx.jsonrpc#get_int_param "frameId" in
+		let env = match hctx.ctx.debug.debug_context#get frame_id with
+			| StackFrame env -> env
+			| _ -> hctx.send_error (Printf.sprintf "Bad frame ID: %i" frame_id);
+		in
+		env
+	in
+	let select_thread hctx =
+		let id = hctx.jsonrpc#get_opt_param (fun () -> hctx.jsonrpc#get_int_param "threadId") 0 in
+		let eval = try IntMap.find id hctx.ctx.evals with Not_found -> hctx.send_error "Invalid thread id" in
+		eval
+	in
+	let h = Hashtbl.create 0 in
+	let l = [
+		"pause",(fun hctx ->
+			let eval = select_thread hctx in
+			eval.debug_state <- DbgWaiting;
+			JNull
+		);
+		"continue",(fun hctx ->
+			let eval = select_thread hctx in
+			eval.debug_state <- DbgRunning;
+			ignore(Event.poll (Event.send eval.debug_channel ()));
+			JNull
+		);
+		"stepIn",(fun hctx ->
+			let eval = select_thread hctx in
+			eval.debug_state <- DbgStep;
+			ignore(Event.poll (Event.send eval.debug_channel ()));
+			JNull
+		);
+		"next",(fun hctx ->
+			let eval = select_thread hctx in
+			let env = expect_env hctx eval.env in
+			eval.debug_state <- DbgNext(env,env.env_debug.debug_pos);
+			ignore(Event.poll (Event.send eval.debug_channel ()));
+			JNull
+		);
+		"stepOut",(fun hctx ->
+			let eval = select_thread hctx in
+			let env = expect_env hctx eval.env in
+			let penv = expect_env hctx env.env_parent in
+			eval.debug_state <- DbgFinish penv;
+			ignore(Event.poll (Event.send eval.debug_channel ()));
+			JNull
+		);
+		"getThreads",(fun hctx ->
+			output_threads hctx.ctx
+		);
+		"stackTrace",(fun hctx ->
+			let eval = select_thread hctx in
+			let env = expect_env hctx eval.env in
+			output_call_stack hctx.ctx eval env.env_debug.debug_pos
+		);
+		"getScopes",(fun hctx ->
+			let env = select_frame hctx in
+			output_scopes hctx.ctx env
+		);
+		"getVariables",(fun hctx ->
+			let sid = hctx.jsonrpc#get_int_param "id" in
+			begin
+				let vars =
+					try
+						begin
+							let scope = hctx.ctx.debug.debug_context#get sid in
+							match scope with
+							| Scope(scope,env) ->
+								output_scope_vars env scope
+							| CaptureScope(infos,env) ->
+								output_capture_vars infos env
+							| DebugScope(dbg,env) ->
+								output_debug_scope dbg env
+							| Value(value,env) ->
+								output_inner_vars value env
+							| Toplevel | StackFrame _ | NoSuchReference ->
+								hctx.send_error (Printf.sprintf "Bad ID: %i" sid);
+						end
+					with Exit ->
+						hctx.send_error "Invalid scope id"
+				in
+				vars
+			end
+		);
+		"setBreakpoints",(fun hctx ->
+			let file = hctx.jsonrpc#get_string_param "file" in
+			let bps = hctx.jsonrpc#get_array_param "breakpoints" in
+			let bps = List.map (parse_breakpoint hctx) bps in
+			let hash = hash (Path.unique_full_path (Common.find_file (hctx.ctx.curapi.get_com()) file)) in
+			let h =
+				try
+					let h = Hashtbl.find hctx.ctx.debug.breakpoints hash in
+					Hashtbl.clear h;
+					h
+				with Not_found ->
+					let h = Hashtbl.create (List.length bps) in
+					Hashtbl.add hctx.ctx.debug.breakpoints hash h;
+					h
+			in
+			let bps = List.map (fun (line,column,condition) ->
+				let bp = make_breakpoint hash line BPEnabled column condition in
+				Hashtbl.add h line bp;
+				JObject ["id",JInt bp.bpid]
+			) bps in
+			JArray bps
+		);
+		"setBreakpoint",(fun hctx ->
+			let line,column,condition = parse_breakpoint hctx (hctx.jsonrpc#get_params) in
+			let file = hctx.jsonrpc#get_string_param "file" in
+			let breakpoint = add_breakpoint hctx.ctx file line column condition in
+			JObject ["id",JInt breakpoint.bpid]
+		);
+		"setFunctionBreakpoints",(fun hctx ->
+			Hashtbl.clear hctx.ctx.debug.function_breakpoints;
+			let j = hctx.jsonrpc in
+			let bps = j#get_array "param" (j#get_params) in
+			let bps = List.map (fun jo ->
+				let obj = j#get_object "breakpoint" jo in
+				let name = j#get_string_field "name" "name" obj in
+				let i = String.rindex name '.' in
+				if i < 0 then hctx.send_error "Invalid format, expected Type.field";
+				let key_type = String.sub name 0 i in
+				let key_field = String.sub name (i + 1) (String.length name - i - 1) in
+				let bp = make_function_breakpoint BPEnabled in
+				Hashtbl.add hctx.ctx.debug.function_breakpoints (hash key_type,hash key_field) bp;
+				JObject ["id",JInt bp.fbpid]
+			) bps in
+			JArray bps
+		);
+		"removeBreakpoint",(fun hctx ->
+			let id = hctx.jsonrpc#get_int_param "id" in
+			begin try
+				Hashtbl.iter (fun _ h ->
+					let to_delete = ref [] in
+					Hashtbl.iter (fun k breakpoint -> if breakpoint.bpid = id then to_delete := k :: !to_delete) h;
+					List.iter (fun k -> Hashtbl.remove h k) !to_delete;
+				) hctx.ctx.debug.breakpoints;
+			with Not_found ->
+				hctx.send_error (Printf.sprintf "Unknown breakpoint: %d" id)
+			end;
+			JNull
+		);
+		"setVariable",(fun hctx ->
+			let id = hctx.jsonrpc#get_int_param "id" in
+			let name = hctx.jsonrpc#get_string_param "name" in
+			let value = hctx.jsonrpc#get_string_param "value" in
+			let get_value env = try
+				let e = parse_expr hctx.ctx value env.env_debug.debug_pos in
+				expr_to_value hctx.ctx env e
+			with Parse_expr_error e ->
+				hctx.send_error e
+			in
+			begin match hctx.ctx.debug.debug_context#get id with
+			| Toplevel | NoSuchReference ->
+				hctx.send_error (Printf.sprintf "Bad ID: %i" id);
+			| Value(v,env) ->
+				let value = get_value env in
+				let name_as_index () = try
+					(* The name is [1] so we have to extract the number. This is quite stupid but not really our fault... *)
+					int_of_string (String.sub name 1 (String.length name - 2))
+				with _ ->
+					hctx.send_error "integer expected"
+				in
+				begin match v with
+				| VArray va -> EvalArray.set va (name_as_index()) value
+				| VVector vv -> Array.set vv (name_as_index()) value
+				| _ ->
+					set_field v (hash name) value;
+				end;
+				var_to_json "" value None env
+			| Scope(scope,env) ->
+				let value = get_value env in
+				let id = Hashtbl.find scope.local_ids name in
+				let slot = Hashtbl.find scope.locals id in
+				env.env_locals.(slot + scope.local_offset) <- value;
+				var_to_json "" value None env
+			| CaptureScope(infos,env) ->
+				let value = get_value env in
+				let slot = get_capture_slot_by_name infos name in
+				env.env_captures.(slot) <- value;
+				var_to_json "" value None env
+			| DebugScope _ | StackFrame _ ->
+				JNull
+			end
+		);
+		"setExceptionOptions",(fun hctx ->
+			let sl = hctx.jsonrpc#get_array "" hctx.jsonrpc#get_params in
+			let sl = List.map (hctx.jsonrpc#get_string "") sl in
+			hctx.ctx.debug.exception_mode <- if List.mem "all" sl then CatchAll
+				else if List.mem "uncaught" sl then CatchUncaught
+				else CatchNone;
+			JNull
+		);
+		"evaluate",(fun hctx ->
+			let ctx = hctx.ctx in
+			let env = try select_frame hctx with _ -> expect_env hctx ctx.eval.env in
+			let s = hctx.jsonrpc#get_string_param "expr" in
+			begin try
+				let e = parse_expr ctx s env.env_debug.debug_pos in
+				let v = handle_in_temp_thread ctx env (fun () -> expr_to_value ctx env e) in
+				var_to_json "" v None env
+			with
+			| Parse_expr_error e ->
+				hctx.send_error e
+			| Exit ->
+				hctx.send_error "Don't know how to handle this expression"
+			end
+		);
+		"getCompletion",(fun hctx ->
+			let env = expect_env hctx hctx.ctx.eval.env in
+			let text = hctx.jsonrpc#get_string_param "text" in
+			let column = hctx.jsonrpc#get_int_param "column" in
+			try
+				ValueCompletion.get_completion hctx.ctx text column env
+			with Exit ->
+				hctx.send_error "No completion point found";
+		);
+	] in
+	List.iter (fun (s,f) -> Hashtbl.add h s f) l;
+	h
+
+let make_connection socket =
+	let output_thread_event thread_id reason =
+		send_event socket "threadEvent" (Some (JObject ["threadId",JInt thread_id;"reason",JString reason]))
+	in
+	let output_breakpoint_stop debug =
+		(* TODO: this isn't thread-safe. We should only creates these anew if all threads continued *)
+		debug.debug_context <- new eval_debug_context;
+		send_event socket "breakpointStop" (Some (JObject ["threadId",JInt (Thread.id (Thread.self()))]))
+	in
+	let output_exception_stop debug v _ =
+		debug.debug_context <- new eval_debug_context;
+		send_event socket "exceptionStop" (Some (JObject ["threadId",JInt (Thread.id (Thread.self()));"text",JString (value_string v)]))
+	in
+	let rec wait () : unit =
+		let rec process_outcome id outcome =
+			let output j = send_json socket (JsonRpc.result id j) in
+			output outcome;
+			loop ()
+		and send_output_and_continue json =
+			send_json socket json;
+			loop ()
+		and send_output_and_exit json =
+			send_json socket json;
+			raise Exit
+		and loop () =
+			let input = Socket.read_string socket in
+			let input =
+				JsonRpc.handle_jsonrpc_error (fun () -> JsonRpc.parse_request input) send_output_and_exit
+			in
+			let jsonrpc = new Jsonrpc_handler.jsonrpc_handler input in
+			let error msg =
+				let open JsonRpc in
+				raise (JsonRpc_error (Custom (jsonrpc#get_id, 1, msg)))
+			in
+			let hctx = {
+				ctx = get_ctx();
+				jsonrpc = jsonrpc;
+				send_error = error;
+			} in
+			JsonRpc.handle_jsonrpc_error (fun () ->
+				let method_name = jsonrpc#get_method_name in
+				let f = try
+					Hashtbl.find handler method_name
+				with Not_found ->
+					JsonRpc.raise_method_not_found jsonrpc#get_id method_name
+				in
+				process_outcome jsonrpc#get_id (f hctx)
+			) send_output_and_continue
+		in
+		try
+			loop ()
+		with Exit ->
+			loop ()
+	in
+	ignore(Thread.create wait ());
+	{
+		bp_stop = output_breakpoint_stop;
+		exc_stop = output_exception_stop;
+		send_thread_event = output_thread_event;
+	}
diff --git a/src/macro/eval/evalDecode.ml b/src/macro/eval/evalDecode.ml
new file mode 100644
index 0000000000000000000000000000000000000000..c2caf823de52db4eadd7dbacee75085a69aff216
--- /dev/null
+++ b/src/macro/eval/evalDecode.ml
@@ -0,0 +1,112 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open EvalValue
+open EvalExceptions
+
+let decode_object v = match vresolve v with
+	| VObject o -> o
+	| _ -> unexpected_value v "object"
+
+let decode_enum v = match v with
+	| VEnumValue ev -> ev.eindex,Array.to_list ev.eargs
+	| _ -> unexpected_value v "enum"
+
+let decode_enum_with_pos v = match v with
+	| VEnumValue ev -> (ev.eindex,Array.to_list ev.eargs),(match ev.enpos with None -> null_pos | Some p -> p)
+	| _ -> unexpected_value v "enum"
+
+let decode_instance v = match v with
+	| VInstance vi -> vi
+	| _ -> unexpected_value v "instance"
+
+let decode_array v = match v with
+	| VArray va -> EvalArray.to_list va
+	| _ -> unexpected_value v "array"
+
+let decode_vector v = match v with
+	| VVector vv -> vv
+	| _ -> unexpected_value v "vector"
+
+let decode_varray v = match v with
+	| VArray va -> va
+	| _ -> unexpected_value v "array"
+
+let decode_string v = match v with
+	| VString s -> s.sstring
+	| _ -> unexpected_value v "string"
+
+let decode_vstring v = match v with
+	| VString s -> s
+	| _ -> unexpected_value v "string"
+
+let decode_bytes v = match v with
+	| VInstance {ikind=IBytes s} -> s
+	| _ -> unexpected_value v "string"
+
+let decode_i32 v = match v with
+	| VInt32 i -> i
+	| VFloat f -> (Int32.of_float f)
+	| _ -> unexpected_value v "int"
+
+let decode_int v = match v with
+	| VInt32 i -> Int32.to_int i
+	| VFloat f -> int_of_float f
+	| _ -> unexpected_value v "int"
+
+let decode_float v = match v with
+	| VFloat f -> f
+	| _ -> unexpected_value v "float"
+
+let decode_bool v = match v with
+	| VTrue -> true
+	| VFalse -> false
+	| _ -> unexpected_value v "bool"
+
+let default_int v vd = match v with
+	| VNull -> vd
+	| VInt32 i -> Int32.to_int i
+	| VFloat f -> int_of_float f
+	| _ -> unexpected_value v "int"
+
+let decode_unsafe v = match v with
+	| VInstance {ikind = IRef o} -> o
+	| _ -> unexpected_value v "unsafe"
+
+let decode_lazytype v = match v with
+	| VInstance {ikind=ILazyType(t,_)} -> t
+	| _ -> unexpected_value v "lazy type"
+
+let decode_tdecl v = match v with
+	| VInstance {ikind=ITypeDecl t} -> t
+	| _ -> unexpected_value v "type declaration"
+
+let decode_pos v = match v with
+	| VInstance {ikind=IPos p} -> p
+	| _ -> raise MacroApi.Invalid_expr (* maybe_decode_pos relies on this being raised *)
+
+let rec decode_ref v : 'a = match v with
+	| VInstance {ikind=IRef r} -> Obj.obj r
+	| _ -> unexpected_value v "unsafe"
+
+let num = function
+	| VInt32 i -> Int32.to_float i
+	| VFloat f -> f
+	| v -> unexpected_value v "number"
\ No newline at end of file
diff --git a/src/macro/eval/evalEmitter.ml b/src/macro/eval/evalEmitter.ml
new file mode 100644
index 0000000000000000000000000000000000000000..241f4e7a60257cd9799c8232943b2cfda405b201
--- /dev/null
+++ b/src/macro/eval/evalEmitter.ml
@@ -0,0 +1,783 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open EvalHash
+open EvalValue
+open EvalEncode
+open EvalDecode
+open EvalContext
+open EvalPrinting
+open EvalExceptions
+open EvalField
+open EvalMisc
+
+(* Helper *)
+
+let unexpected_value_p v s p =
+	let str = match v with
+		| VNull -> "Null Access"
+		| _ -> Printf.sprintf "Unexpected value %s, expected %s" (value_string v) s
+	in
+	throw_string str p
+
+let as_array p = function
+	| VArray va -> va
+	| v -> unexpected_value_p v "Array" p
+
+let as_bytes p = function
+	| VInstance {ikind = IBytes s} -> s
+	| v -> unexpected_value_p v "Bytes" p
+
+let as_enum_value p = function
+	| VEnumValue ve -> ve
+	| v -> unexpected_value_p v "enum value" p
+
+let as_int p = function
+	| VInt32 i -> Int32.to_int i
+	| VFloat f -> int_of_float f
+	| v -> unexpected_value_p v "int" p
+
+let as_vector p = function
+	| VVector vv -> vv
+	| v -> unexpected_value_p v "Vector" p
+
+let cannot_call v p =
+	throw (EvalString.create_unknown ("Cannot call " ^ (value_string v))) p
+
+let decode_int_p v p = match v with
+	| VInt32 i -> Int32.to_int i
+	| VFloat f -> int_of_float f
+	| _ -> unexpected_value_p v "int" p
+
+let check_stack_depth env =
+	if env.env_stack_depth > (get_ctx()).max_stack_depth then
+		exc_string "Stack overflow"
+
+(* Emitter *)
+
+let apply env exec =
+	exec env
+
+(* Objects and values *)
+
+let emit_null _ = vnull
+
+let emit_local_declaration i exec env =
+	env.env_locals.(i) <- exec env;
+	vnull
+
+let emit_capture_declaration i exec env =
+	env.env_captures.(i) <- exec env;
+	vnull
+
+let emit_const v _ = v
+
+let emit_new_array env =
+	encode_array_instance (EvalArray.create [||])
+
+let emit_new_vector_int i env =
+	encode_vector_instance (Array.make i vnull)
+
+let emit_new_vector exec p env =
+	encode_vector_instance (Array.make (decode_int_p (exec env) p) vnull)
+
+let emit_special_instance f execs env =
+	let vl = List.map (apply env) execs in
+	f vl
+
+let emit_object_declaration proto fa env =
+	let a = Array.make (Array.length fa) vnull in
+	Array.iter (fun (i,exec) -> a.(i) <- exec env) fa;
+	vobject {
+		ofields = a;
+		oproto = proto;
+	}
+
+let emit_array_declaration execs env =
+	let vl = Array.map (apply env) execs in
+	encode_array_instance (EvalArray.create vl)
+
+let emit_type_expr proto env = proto
+
+let emit_mk_pos exec1 exec2 exec3 env =
+	let file = exec1 env in
+	let min = exec2 env in
+	let max = exec3 env in
+	encode_pos { pfile = decode_string file; pmin = decode_int min; pmax = decode_int max }
+
+let emit_enum_construction key i execs p env =
+	encode_enum_value key i (Array.map (apply env) execs) p
+
+(* Branching *)
+
+let emit_if exec_cond exec_then exec_else env =
+	match exec_cond env with
+	| VTrue -> exec_then env
+	| _ -> exec_else env
+
+let emit_switch exec execs patterns exec_def env =
+	let v1 = exec env in
+	let rec loop v1 i =
+		if i >= Array.length patterns then exec_def env
+		else if List.exists (fun exec -> equals v1 (exec env)) patterns.(i) then
+			execs.(i) env
+		else
+			loop v1 (i + 1)
+	in
+	loop v1 0
+
+let emit_int_switch_map exec cases exec_def p env = match exec env with
+	| VInt32 i32 ->
+		let i = Int32.to_int i32 in
+		begin try
+			(IntMap.find i cases) env
+		with Not_found ->
+			exec_def env
+		end
+	| VNull ->
+		exec_def env
+	| v ->
+		unexpected_value_p v "int" p
+
+let emit_string_switch_map exec cases exec_def p env = match exec env with
+	| VString s ->
+		begin try
+			(PMap.find s.sstring cases) env
+		with Not_found ->
+			exec_def env
+		end
+	| VNull ->
+		exec_def env
+	| v ->
+		unexpected_value_p v "string" p
+
+let emit_int_switch_array shift exec cases exec_def p env = match exec env with
+	| VInt32 i32 ->
+		let i = Int32.to_int i32 + shift in
+		if i >= Array.length cases || i < 0 then exec_def env
+		else (Array.unsafe_get cases i) env
+	| VNull ->
+		exec_def env
+	| v ->
+		unexpected_value_p v "int" p
+
+let rec run_while_continue exec_cond exec_body env =
+	try
+		while is_true (exec_cond env) do exec_body env done;
+	with Continue ->
+		run_while_continue exec_cond exec_body env
+
+let rec run_while exec_cond exec_body env =
+	while is_true (exec_cond env) do exec_body env done
+
+let emit_while_break exec_cond exec_body env =
+	(try run_while_continue exec_cond exec_body env with Break -> ());
+	vnull
+
+let emit_while_break_continue exec_cond exec_body env =
+	(try run_while_continue exec_cond exec_body env with Break -> ());
+	vnull
+
+let emit_do_while_break_continue exec_cond exec_body env =
+	begin try
+		ignore(exec_body env); run_while_continue exec_cond exec_body env
+	with
+		| Break -> ()
+		| Continue -> try run_while_continue exec_cond exec_body env with Break -> ()
+	end;
+	vnull
+
+let emit_try exec catches env =
+	let ctx = get_ctx() in
+	let eval = env.env_eval in
+	if ctx.debug.support_debugger then begin
+		List.iter (fun (_,path,_) -> Hashtbl.add eval.caught_types path true) catches
+	end;
+	let restore () =
+		List.iter (fun (_,path,_) -> Hashtbl.remove eval.caught_types path) catches
+	in
+	let v = try
+		let v = handle_stack_overflow eval (fun() -> exec env) in
+		restore();
+		v
+	with RunTimeException(v,_,_) as exc ->
+		eval.caught_exception <- vnull;
+		restore();
+		build_exception_stack ctx env;
+		let rec loop () = match eval.env with
+			| Some env' when env' != env ->
+				pop_environment ctx env';
+				loop();
+			| _ ->
+				()
+		in
+		loop();
+		let exec,_,varacc =
+			try
+				List.find (fun (_,path,i) -> path = key_Dynamic || is v path) catches
+			with Not_found ->
+				raise_notrace exc
+		in
+		varacc (fun _ -> v) env;
+		exec env
+	in
+	v
+
+(* Control flow *)
+
+let emit_value exec env =
+	exec env
+
+let emit_seq2 exec1 exec2 env =
+	ignore(exec1 env);
+	exec2 env
+
+let emit_seq4 exec1 exec2 exec3 exec4 env =
+	ignore (exec1 env);
+	ignore (exec2 env);
+	ignore (exec3 env);
+	exec4 env
+
+let emit_seq8 exec1 exec2 exec3 exec4 exec5 exec6 exec7 exec8 env =
+	ignore (exec1 env);
+	ignore (exec2 env);
+	ignore (exec3 env);
+	ignore (exec4 env);
+	ignore (exec5 env);
+	ignore (exec6 env);
+	ignore (exec7 env);
+	exec8 env
+
+let emit_return_null _ = raise_notrace (Return vnull)
+
+let emit_return_value exec env = raise_notrace (Return (exec env))
+
+let emit_break env = raise_notrace Break
+
+let emit_continue env = raise_notrace Continue
+
+let emit_throw exec p env = throw (exec env) p
+
+let emit_safe_cast exec t p env =
+	let v1 = exec env in
+	match vresolve v1 with
+	| VNull -> v1
+	| _ -> if not (is v1 t) then throw_string "Class cast error" p else v1
+
+(* Calls *)
+
+(* super.call() - immediate *)
+
+let emit_super_field_call slot proto i execs p env =
+	check_stack_depth env;
+	let vthis = env.env_locals.(slot) in
+	let vf = proto.pfields.(i) in
+	let vl = List.map (apply env) execs in
+	call_value_on vthis vf vl
+
+(* Type.call() - immediate *)
+
+let emit_proto_field_call v execs p env =
+	check_stack_depth env;
+	let f = Lazy.force v in
+	let vl = List.map (apply env) execs in
+	env.env_leave_pmin <- p.pmin;
+	env.env_leave_pmax <- p.pmax;
+	f vl
+
+(* instance.call() where call is overridden - dynamic dispatch *)
+
+let get_prototype v p = match vresolve v with
+	| VInstance {iproto = proto} | VPrototype proto -> proto
+	| VString _ -> (get_ctx()).string_prototype
+	| VArray _ -> (get_ctx()).array_prototype
+	| VVector _ -> (get_ctx()).vector_prototype
+	| _ -> unexpected_value_p v "instance" p
+
+let emit_method_call exec name execs p env =
+	check_stack_depth env;
+	let vthis = exec env in
+	let proto = get_prototype vthis p in
+	let vf = try proto_field_raise proto name with Not_found -> throw_string (Printf.sprintf "Field %s not found on prototype %s" (rev_hash name) (rev_hash proto.ppath)) p in
+	let vl = List.map (apply env) execs in
+	env.env_leave_pmin <- p.pmin;
+	env.env_leave_pmax <- p.pmax;
+	call_value_on vthis vf vl
+
+(* instance.call() where call is not a method - lookup + this-binding *)
+
+let emit_field_call exec name execs p env =
+	check_stack_depth env;
+	let vthis = exec env in
+	let vf = field vthis name in
+	env.env_leave_pmin <- p.pmin;
+	env.env_leave_pmax <- p.pmax;
+	call_value_on vthis vf (List.map (apply env) execs)
+
+(* new() - immediate + this-binding *)
+
+let emit_constructor_call proto v execs p env =
+	check_stack_depth env;
+	let f = Lazy.force v in
+	let vthis = create_instance_direct proto INormal in
+	let vl = List.map (apply env) execs in
+	env.env_leave_pmin <- p.pmin;
+	env.env_leave_pmax <- p.pmax;
+	ignore(f (vthis :: vl));
+	vthis
+
+(* super() - immediate + this-binding *)
+
+let emit_special_super_call fnew execs env =
+	check_stack_depth env;
+	let vl = List.map (apply env) execs in
+	let vi' = fnew vl in
+	let vthis = env.env_locals.(0) in
+	(* This isn't very elegant, but it's probably a rare case to extend these types. *)
+	begin match vthis,vi' with
+		| VInstance vi,VInstance vi' -> vi.ikind <- vi'.ikind
+		| _ -> assert false
+	end;
+	vnull
+
+let emit_super_call v execs p env =
+	check_stack_depth env;
+	let f = Lazy.force v in
+	let vthis = env.env_locals.(0) in
+	let vl = List.map (apply env) execs in
+	env.env_leave_pmin <- p.pmin;
+	env.env_leave_pmax <- p.pmax;
+	ignore(f (vthis :: vl));
+	vthis
+
+(* unknown call - full lookup *)
+
+let emit_call exec execs p env =
+	check_stack_depth env;
+	let v1 = exec env in
+	env.env_leave_pmin <- p.pmin;
+	env.env_leave_pmax <- p.pmax;
+	call_value v1 (List.map (apply env) execs)
+
+(* Read *)
+
+let emit_local_read i env = env.env_locals.(i)
+
+let emit_capture_read i env = env.env_captures.(i)
+
+let emit_array_length_read exec p env = vint (as_array p (exec env)).alength
+
+let emit_vector_length_read exec p env = vint (Array.length (as_vector p (exec env)))
+
+let emit_bytes_length_read exec p env = vint (Bytes.length (as_bytes p (exec env)))
+
+let emit_proto_field_read proto i env =
+	proto.pfields.(i)
+
+let emit_instance_field_read exec p i env = match exec env with
+	| VInstance vi -> vi.ifields.(i)
+	| VString s -> vint (s.slength)
+	| VNull -> throw_string "field access on null" p
+	| v -> unexpected_value_p v "instance" p
+
+let emit_this_field_read iv i env = match env.env_locals.(iv) with
+	| VInstance vi -> vi.ifields.(i)
+	| v -> unexpected_value v "instance"
+
+let emit_field_closure exec name env =
+	let v = exec env in
+	dynamic_field v name
+
+let emit_anon_field_read exec proto i name p env =
+	match vresolve (exec env) with
+	| VObject o ->
+		if proto == o.oproto then o.ofields.(i)
+		else object_field o name
+	| VNull -> throw_string "field access on null" p
+	| v -> field v name
+
+let emit_field_read exec name p env = match exec env with
+	| VNull -> throw_string "field access on null" p
+	| v -> field v name
+
+let emit_array_read exec1 p1 exec2 p2 env =
+	let a = as_array p1 (exec1 env) in
+	let i = as_int p2 (exec2 env) in
+	if i < 0 then vnull
+	else EvalArray.get a i
+
+let emit_vector_read exec1 p1 exec2 p2 env =
+	let v = as_vector p1 (exec1 env) in
+	let i = as_int p2 (exec2 env) in
+	if i < 0 then vnull
+	else Array.unsafe_get v i
+
+let emit_enum_index exec p env = vint (as_enum_value p (exec env)).eindex
+
+let emit_enum_parameter_read exec i env = match exec env with
+	| VEnumValue ev -> (try ev.eargs.(i) with Not_found -> vnull)
+	| v1 -> unexpected_value v1 "enum value"
+
+let emit_string_cca exec1 exec2 p env =
+	let s = decode_vstring (exec1 env) in
+	let index = decode_int_p (exec2 env) p in
+	if index < 0 || index >= s.slength then vnull
+	else vint (EvalString.char_at s index)
+
+(* Write *)
+
+let emit_bytes_length_write exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	set_bytes_length_field v1 v2;
+	v2
+
+let emit_local_write slot exec env =
+	let v = exec env in
+	env.env_locals.(slot) <- v;
+	v
+
+let emit_capture_write slot exec env =
+	let v = exec env in
+	env.env_captures.(slot) <- v;
+	v
+
+let emit_proto_field_write proto i exec2 env =
+	let v = exec2 env in
+	proto.pfields.(i) <- v;
+	v
+
+let emit_instance_field_write exec1 p i exec2 env = match exec1 env with
+	| VInstance vi ->
+		let v = exec2 env in
+		vi.ifields.(i) <- v;
+		v
+	| v -> unexpected_value_p v "instance" p
+
+let emit_anon_field_write exec1 p proto i name exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	begin match vresolve v1 with
+		| VObject o ->
+			if proto == o.oproto then begin
+				o.ofields.(i) <- v2;
+			end else set_object_field o name v2
+		| VNull -> throw_string "field access on null" p
+		| _ ->
+			set_field v1 name v2;
+	end;
+	v2
+
+let emit_field_write exec1 p1 name exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	(try set_field v1 name v2 with RunTimeException(v,stack,_) -> raise_notrace (RunTimeException(v,stack,p1)));
+	v2
+
+let emit_array_write exec1 p1 exec2 p2 exec3 p env =
+	let a = as_array p1 (exec1 env) in
+	let i = as_int p2 (exec2 env) in
+	let v3 = exec3 env in
+	if i < 0 then throw_string (Printf.sprintf "Negative array index: %i" i) p;
+	EvalArray.set a i v3;
+	v3
+
+let emit_vector_write exec1 p1 exec2 p2 exec3 p env =
+	let vv = as_vector p1 (exec1 env) in
+	let i = as_int p2 (exec2 env) in
+	let v3 = exec3 env in
+	if i < 0 then throw_string (Printf.sprintf "Negative vector index: %i" i) p;
+	Array.unsafe_set vv i v3;
+	v3
+
+(* Read + write *)
+
+let do_incr v p = match v with
+	| VInt32 i32 -> vint32 (Int32.add i32 Int32.one)
+	| VFloat f -> vfloat (f +. 1.)
+	| v -> unexpected_value_p v "number" p
+
+let emit_local_incr_prefix slot p env =
+	let v0 = env.env_locals.(slot) in
+	let v = do_incr v0 p in
+	env.env_locals.(slot) <- v;
+	v
+
+let emit_local_incr_postfix slot p env =
+	let v0 = env.env_locals.(slot) in
+	let v = do_incr v0 p in
+	env.env_locals.(slot) <- v;
+	v0
+
+let emit_local_read_write slot exec fop prefix env =
+	let v1 = env.env_locals.(slot) in
+	let v2 = exec env in
+	let v = fop v1 v2 in
+	env.env_locals.(slot) <- v;
+	if prefix then v else v1
+
+let emit_capture_read_write slot exec fop prefix env =
+	let v1 = (env.env_captures.(slot)) in
+	let v2 = exec env in
+	let v = fop v1 v2 in
+	env.env_captures.(slot) <- v;
+	if prefix then v else v1
+
+let emit_proto_field_read_write proto i exec2 fop prefix env =
+	let vf = proto.pfields.(i) in
+	let v2 = exec2 env in
+	let v = fop vf v2 in
+	proto.pfields.(i) <- v;
+	if prefix then v else vf
+
+let instance_field_read_write vi i exec2 fop prefix env =
+	let vf = vi.ifields.(i) in
+	let v2 = exec2 env in
+	let v = fop vf v2 in
+	vi.ifields.(i) <- v;
+	if prefix then v else vf
+
+let emit_instance_field_read_write exec1 p1 i exec2 fop prefix env = match exec1 env with
+	| VInstance vi -> instance_field_read_write vi i exec2 fop prefix env
+	| v -> unexpected_value_p v "instance" p1
+
+let emit_field_read_write exec1 p1 name exec2 fop prefix env =
+	let v1 = exec1 env in
+	match vresolve v1 with
+	| VObject o ->
+		let vf = object_field o name in
+		let v2 = exec2 env in
+		let v = fop vf v2 in
+		set_object_field o name v;
+		if prefix then v else vf
+	| VInstance vi ->
+		let i = get_instance_field_index vi.iproto name null_pos in
+		instance_field_read_write vi i exec2 fop prefix env
+	| VPrototype proto ->
+		let i = get_proto_field_index proto name in
+		emit_proto_field_read_write proto i exec2 fop prefix env
+	| _ ->
+		let vf = field v1 name in
+		let v2 = exec2 env in
+		let v = fop vf v2 in
+		(try set_field v1 name v with RunTimeException(v,stack,_) -> raise_notrace (RunTimeException(v,stack,p1)));
+		if prefix then v else vf
+
+let emit_array_read_write exec1 p1 exec2 p2 exec3 fop prefix env =
+	let va = as_array p1 (exec1 env) in
+	let i = as_int p2 (exec2 env) in
+	if i < 0 then throw_string (Printf.sprintf "Negative array index: %i" i) p2;
+	let v = EvalArray.get va i in
+	let v2 = exec3 env in
+	let v3 = fop v v2 in
+	EvalArray.set va i v3;
+	if prefix then v3 else v
+
+let emit_vector_read_write exec1 p1 exec2 p2 exec3 fop prefix env =
+	let va = as_vector p1 (exec1 env) in
+	let i = as_int p2 (exec2 env) in
+	if i < 0 then throw_string (Printf.sprintf "Negative vector index: %i" i) p2;
+	let v = Array.unsafe_get va i in
+	let v2 = exec3 env in
+	let v3 = fop v v2 in
+	Array.unsafe_set va i v3;
+	if prefix then v3 else v
+
+(* Ops *)
+
+let emit_eq_null exec env = match exec env with
+	| VNull -> VTrue
+	| _ -> VFalse
+
+let emit_not_eq_null exec env = match exec env with
+	| VNull -> VFalse
+	| _ -> VTrue
+
+let emit_op_add p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_add p v1 v2
+
+let emit_op_mult p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_mult p v1 v2
+
+let emit_op_div p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_div p v1 v2
+
+let emit_op_sub p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_sub p v1 v2
+
+let emit_op_eq exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	vbool (equals v1 v2)
+
+let emit_op_not_eq exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	vbool  (not (equals v1 v2))
+
+let emit_op_gt exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	vbool (compare v1 v2 = CSup)
+
+let emit_op_gte exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	vbool (match compare v1 v2 with CSup | CEq -> true | _ -> false)
+
+let emit_op_lt exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	vbool (compare v1 v2 = CInf)
+
+let emit_op_lte exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	vbool (match compare v1 v2 with CInf | CEq -> true | _ -> false)
+
+let emit_op_and p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_and p v1 v2
+
+let emit_op_or p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_or p v1 v2
+
+let emit_op_xor p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_xor p v1 v2
+
+let emit_op_shl p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_shl p v1 v2
+
+let emit_op_shr p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_shr p v1 v2
+
+let emit_op_ushr p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_ushr p v1 v2
+
+let emit_op_mod p exec1 exec2 env =
+	let v1 = exec1 env in
+	let v2 = exec2 env in
+	op_mod p v1 v2
+
+let emit_not exec env = match exec env with
+	| VNull | VFalse -> VTrue
+	| _ -> VFalse
+
+let emit_bool_and exec1 exec2 env =
+	if is_true (exec1 env) then exec2 env
+	else VFalse
+
+let emit_bool_or exec1 exec2 env =
+	if is_true (exec1 env) then VTrue
+	else exec2 env
+
+let emit_neg exec p env = match exec env with
+	| VFloat f -> vfloat (-.f)
+	| VInt32 i -> vint32 (Int32.neg i)
+	| _ -> throw_string "Invalid operation" p
+
+(* Function *)
+
+type env_creation = {
+	ec_info : env_info;
+	ec_num_locals : int;
+	ec_num_captures : int;
+}
+
+let execute_set_local i env v =
+	env.env_locals.(i) <- v
+
+let execute_set_capture i env v =
+	env.env_captures.(i) <- v
+
+let process_arguments fl vl env =
+	let rec loop fl vl = match fl,vl with
+		| f :: fl,v :: vl ->
+			f env v;
+			loop fl vl
+		| f :: fl,[] ->
+			f env vnull;
+			loop fl []
+		| [],[] ->
+			()
+		| _ ->
+			exc_string "Something went wrong"
+	in
+	loop fl vl
+[@@inline]
+
+let create_function_noret ctx eci exec fl vl =
+	let env = push_environment ctx eci.ec_info eci.ec_num_locals eci.ec_num_captures in
+	process_arguments fl vl env;
+	let v = exec env in
+	pop_environment ctx env;
+	v
+
+let create_function ctx eci exec fl vl =
+	let env = push_environment ctx eci.ec_info eci.ec_num_locals eci.ec_num_captures in
+	process_arguments fl vl env;
+	let v = try exec env with Return v -> v in
+	pop_environment ctx env;
+	v
+
+let create_closure_noret ctx eci refs exec fl vl =
+	let env = push_environment ctx eci.ec_info eci.ec_num_locals eci.ec_num_captures in
+	Array.iter (fun (i,vr) -> env.env_captures.(i) <- vr) refs;
+	process_arguments fl vl env;
+	let v = exec env in
+	pop_environment ctx env;
+	v
+
+let create_closure refs ctx eci exec fl vl =
+	let env = push_environment ctx eci.ec_info eci.ec_num_locals eci.ec_num_captures in
+	Array.iter (fun (i,vr) -> env.env_captures.(i) <- vr) refs;
+	process_arguments fl vl env;
+	let v = try exec env with Return v -> v in
+	pop_environment ctx env;
+	v
+
+let emit_closure ctx mapping eci hasret exec fl env =
+	let refs = Array.map (fun (i,slot) -> i,emit_capture_read slot env) mapping in
+	let create = match hasret,eci.ec_num_captures with
+		| true,0 -> create_function
+		| false,0 -> create_function_noret
+		| _ -> create_closure refs
+	in
+	let f = create ctx eci exec fl in
+	vstatic_function f
\ No newline at end of file
diff --git a/src/macro/eval/evalEncode.ml b/src/macro/eval/evalEncode.ml
new file mode 100644
index 0000000000000000000000000000000000000000..4d63062627a680f16b6e086fd5088b66365ce64c
--- /dev/null
+++ b/src/macro/eval/evalEncode.ml
@@ -0,0 +1,292 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open EvalValue
+open EvalExceptions
+open EvalContext
+open EvalHash
+open EvalString
+
+(* Functions *)
+
+let vifun0 f = vfunction (fun vl -> match vl with
+	| [] -> f vnull
+	| [v0] -> f v0
+	| _ -> invalid_call_arg_number 1 (List.length  vl
+))
+
+let vifun1 f = vfunction (fun vl -> match vl with
+	| [] -> f vnull vnull
+	| [v0] -> f v0 vnull
+	| [v0;v1] -> f v0 v1
+	| _ -> invalid_call_arg_number 2 (List.length  vl
+))
+
+let vifun2 f = vfunction (fun vl -> match vl with
+	| [] -> f vnull vnull vnull
+	| [v0] -> f v0 vnull vnull
+	| [v0;v1] -> f v0 v1 vnull
+	| [v0;v1;v2] -> f v0 v1 v2
+	| _ -> invalid_call_arg_number 3 (List.length  vl
+))
+
+let vifun3 f = vfunction (fun vl -> match vl with
+	| [] -> f vnull vnull vnull vnull
+	| [v0] -> f v0 vnull vnull vnull
+	| [v0;v1] -> f v0 v1 vnull vnull
+	| [v0;v1;v2] -> f v0 v1 v2 vnull
+	| [v0;v1;v2;v3] -> f v0 v1 v2 v3
+	| _ -> invalid_call_arg_number 4 (List.length  vl
+))
+
+let vifun4 f = vfunction (fun vl -> match vl with
+	| [] -> f vnull vnull vnull vnull vnull
+	| [v0] -> f v0 vnull vnull vnull vnull
+	| [v0;v1] -> f v0 v1 vnull vnull vnull
+	| [v0;v1;v2] -> f v0 v1 v2 vnull vnull
+	| [v0;v1;v2;v3] -> f v0 v1 v2 v3 vnull
+	| [v0;v1;v2;v3;v4] -> f v0 v1 v2 v3 v4
+	| _ -> invalid_call_arg_number 4 (List.length  vl
+))
+
+let vfun0 f = vstatic_function (fun vl -> match vl with
+	| [] -> f ()
+	| _ -> invalid_call_arg_number 1 (List.length  vl
+))
+
+let vfun1 f = vstatic_function (fun vl -> match vl with
+	| [] -> f vnull
+	| [v0] -> f v0
+	| _ -> invalid_call_arg_number 1 (List.length  vl
+))
+
+let vfun2 f = vstatic_function (fun vl -> match vl with
+	| [] -> f vnull vnull
+	| [v0] -> f v0 vnull
+	| [v0;v1] -> f v0 v1
+	| _ -> invalid_call_arg_number 2 (List.length  vl
+))
+
+let vfun3 f = vstatic_function (fun vl -> match vl with
+	| [] -> f vnull vnull vnull
+	| [v0] -> f v0 vnull vnull
+	| [v0;v1] -> f v0 v1 vnull
+	| [v0;v1;v2] -> f v0 v1 v2
+	| _ -> invalid_call_arg_number 3 (List.length  vl
+))
+
+let vfun4 f = vstatic_function (fun vl -> match vl with
+	| [] -> f vnull vnull vnull vnull
+	| [v0] -> f v0 vnull vnull vnull
+	| [v0;v1] -> f v0 v1 vnull vnull
+	| [v0;v1;v2] -> f v0 v1 v2 vnull
+	| [v0;v1;v2;v3] -> f v0 v1 v2 v3
+	| _ -> invalid_call_arg_number 4 (List.length  vl
+))
+
+let vfun5 f = vstatic_function (fun vl -> match vl with
+	| [] -> f vnull vnull vnull vnull vnull
+	| [v0] -> f v0 vnull vnull vnull vnull
+	| [v0;v1] -> f v0 v1 vnull vnull vnull
+	| [v0;v1;v2] -> f v0 v1 v2 vnull vnull
+	| [v0;v1;v2;v3] -> f v0 v1 v2 v3 vnull
+	| [v0;v1;v2;v3;v4] -> f v0 v1 v2 v3 v4
+	| _ -> invalid_call_arg_number 4 (List.length  vl
+))
+
+(* Objects *)
+
+let encode_obj l =
+	let ctx = get_ctx() in
+	let proto,sorted = ctx.get_object_prototype ctx l in
+	vobject {
+		ofields = Array.of_list (List.map snd sorted);
+		oproto = proto;
+	}
+
+let encode_obj_s l =
+	encode_obj (List.map (fun (s,v) -> (hash s),v) l)
+
+(* Enum values *)
+
+let encode_enum_value path i vl pos =
+	venum_value {
+		eindex = i;
+		eargs = vl;
+		epath = path;
+		enpos = pos;
+	}
+
+let encode_enum i pos index pl =
+	let open MacroApi in
+	let key = match i with
+		| IExpr -> key_haxe_macro_ExprDef
+		| IBinop -> key_haxe_macro_Binop
+		| IUnop -> key_haxe_macro_Unop
+		| IConst -> key_haxe_macro_Constant
+		| ITParam -> key_haxe_macro_TypeParam
+		| ICType -> key_haxe_macro_ComplexType
+		| IField -> key_haxe_macro_FieldType
+		| IType -> key_haxe_macro_Type
+		| IFieldKind -> key_haxe_macro_FieldKind
+		| IMethodKind -> key_haxe_macro_MethodKind
+		| IVarAccess -> key_haxe_macro_VarAccess
+		| IAccess -> key_haxe_macro_Access
+		| IClassKind -> key_haxe_macro_ClassKind
+		| ITypedExpr -> key_haxe_macro_TypedExprDef
+		| ITConstant -> key_haxe_macro_TConstant
+		| IModuleType -> key_haxe_macro_ModuleType
+		| IFieldAccess -> key_haxe_macro_FieldAccess
+		| IAnonStatus -> key_haxe_macro_AnonStatus
+		| IImportMode -> key_haxe_macro_ImportMode
+		| IQuoteStatus -> key_haxe_macro_QuoteStatus
+		| IDisplayKind -> key_haxe_macro_DisplayKind
+		| IMessage -> key_haxe_macro_Message
+		| IFunctionKind -> key_haxe_macro_FunctionKind
+		| IStringLiteralKind -> key_haxe_macro_StringLiteralKind
+	in
+	encode_enum_value key index (Array.of_list pl) pos
+
+(* Instances *)
+
+let create_instance_direct proto kind =
+	vinstance {
+		ifields = if Array.length proto.pinstance_fields = 0 then proto.pinstance_fields else Array.copy proto.pinstance_fields;
+		iproto = proto;
+		ikind = kind;
+	}
+
+let create_instance ?(kind=INormal) path =
+	let proto = get_instance_prototype (get_ctx()) path null_pos in
+	{
+		ifields = if Array.length proto.pinstance_fields = 0 then proto.pinstance_fields else Array.copy proto.pinstance_fields;
+		iproto = proto;
+		ikind = kind;
+	}
+
+let encode_instance ?(kind=INormal) path =
+	vinstance (create_instance ~kind path)
+
+let encode_array_instance a =
+	VArray a
+
+let encode_vector_instance v =
+	VVector v
+
+let encode_array l =
+	encode_array_instance (EvalArray.create (Array.of_list l))
+
+let encode_string s =
+	create_unknown s
+
+(* Should only be used for std types that aren't expected to change while the compilation server is running *)
+let create_cached_instance path fkind =
+	let proto = lazy (get_instance_prototype (get_ctx()) path null_pos) in
+	(fun v ->
+		create_instance_direct (Lazy.force proto) (fkind v)
+	)
+
+let encode_bytes =
+	create_cached_instance key_haxe_io_Bytes (fun s -> IBytes s)
+
+let encode_int_map_direct =
+	create_cached_instance key_haxe_ds_IntMap (fun s -> IIntMap s)
+
+let encode_string_map_direct =
+	create_cached_instance key_haxe_ds_StringMap (fun s -> IStringMap s)
+
+let encode_object_map_direct =
+	create_cached_instance key_haxe_ds_ObjectMap (fun (s : value ValueHashtbl.t) -> IObjectMap (Obj.magic s))
+
+let encode_string_map convert m =
+	let h = StringHashtbl.create () in
+	PMap.iter (fun key value -> StringHashtbl.add h (create_ascii key) (convert value)) m;
+	encode_string_map_direct h
+
+let fake_proto path =
+	let proto = {
+		ppath = path;
+		pfields = [||];
+		pnames = IntMap.empty;
+		pinstance_names = IntMap.empty;
+		pinstance_fields = [||];
+		pparent = None;
+		pkind = PInstance;
+		pvalue = vnull;
+	} in
+	proto.pvalue <- vprototype proto;
+	proto
+
+let encode_unsafe o =
+	vinstance {
+		ifields = [||];
+		iproto = fake_proto key_haxe_macro_Unsafe;
+		ikind = IRef (Obj.repr o);
+	}
+
+let encode_pos p =
+	vinstance {
+		ifields = [||];
+		iproto = fake_proto key_haxe_macro_Position;
+		ikind = IPos p;
+	}
+
+let encode_lazytype t f =
+	vinstance {
+		ifields = [||];
+		iproto = fake_proto key_haxe_macro_LazyType;
+		ikind = ILazyType(t,f);
+	}
+
+let encode_tdecl t =
+	vinstance {
+		ifields = [||];
+		iproto = fake_proto key_haxe_macro_TypeDecl;
+		ikind = ITypeDecl t;
+	}
+
+let ref_proto =
+	let proto = {
+		ppath = key_haxe_macro_Ref;
+		pfields = [||];
+		pnames = IntMap.empty;
+		pinstance_names = IntMap.add key_get 0 (IntMap.singleton key_toString 1);
+		pinstance_fields = [|vnull;vnull|];
+		pparent = None;
+		pkind = PInstance;
+		pvalue = vnull;
+	} in
+	proto.pvalue <- vprototype proto;
+	proto
+
+let encode_ref v convert tostr =
+	vinstance {
+		ifields = [|vifun0 (fun _ -> convert v);vifun0 (fun _ -> encode_string (tostr()))|];
+		iproto = ref_proto;
+		ikind = IRef (Obj.repr v);
+	}
+
+let encode_lazy f =
+	let rec r = ref (fun () ->
+		let v = f() in
+		r := (fun () -> v);
+		v
+	) in
+	VLazy r
diff --git a/src/macro/eval/evalExceptions.ml b/src/macro/eval/evalExceptions.ml
new file mode 100644
index 0000000000000000000000000000000000000000..90b20f37143d22dad2a7454be7bf81d5be64e022
--- /dev/null
+++ b/src/macro/eval/evalExceptions.ml
@@ -0,0 +1,174 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open EvalContext
+open EvalValue
+open EvalPrinting
+open EvalHash
+open EvalField
+
+exception Break
+exception Continue
+exception Return of value
+exception Sys_exit of int
+
+let is v path =
+	if path = key_Dynamic then
+		v <> vnull
+	else match v with
+	| VInt32 _ -> path = key_Int || path = key_Float
+	| VFloat f -> path = key_Float || (path = key_Int && f = (float_of_int (int_of_float f)) && f <= 2147483647. && f >= -2147483648.)
+	| VTrue | VFalse -> path = key_Bool
+	| VPrototype {pkind = PClass _} -> path = key_Class
+	| VPrototype {pkind = PEnum _} -> path = key_Enum
+	| VEnumValue ve -> path = key_EnumValue || path = ve.epath
+	| VString _ -> path = key_String
+	| VArray _ -> path = key_Array
+	| VVector _ -> path = key_eval_Vector
+	| VInstance vi ->
+		let has_interface path' =
+			try begin match (get_static_prototype_raise (get_ctx()) path').pkind with
+				| PClass interfaces -> List.mem path interfaces
+				| _ -> false
+			end with Not_found ->
+				false
+		in
+		let rec loop proto =
+			if path = proto.ppath || has_interface proto.ppath then true
+			else begin match proto.pparent with
+				| Some proto -> loop proto
+				| None -> false
+			end
+		in
+		loop vi.iproto
+	| _ -> false
+
+let s_value_kind = function
+	| VNull -> "VNull"
+	| VTrue -> "VTrue"
+	| VFalse -> "VFalse"
+	| VInt32 _ -> "VInt32"
+	| VFloat _ -> "VFloat"
+	| VEnumValue _ -> "VEnumValue"
+	| VObject _ -> "VObject"
+	| VString _ -> "VString"
+	| VArray _ -> "VArray"
+	| VVector _ -> "VVector"
+	| VInstance _ -> "VInstance"
+	| VPrototype _ -> "VPrototype"
+	| VFunction _ -> "VFunction"
+	| VFieldClosure _ -> "VFieldClosure"
+	| VLazy _ -> "VLazy"
+
+let unexpected_value : 'a . value -> string -> 'a = fun v s ->
+	let str = match v with
+		| VNull -> "Null Access"
+		| _ -> Printf.sprintf "Unexpected value %s(%s), expected %s" (s_value_kind v) (value_string v) s
+	in
+	exc_string str
+
+let invalid_call_arg_number i i2 =
+	exc_string (Printf.sprintf "Invalid number of call arguments: Expected %i, got %i" i i2)
+
+let format_pos p =
+	let error_printer file line = Printf.sprintf "%s:%d:" file line in
+	Lexer.get_error_pos error_printer p
+
+let uncaught_exception_string v p extra =
+	(Printf.sprintf "%s : Uncaught exception %s%s" (format_pos p) (value_string v) extra)
+
+let get_exc_error_message ctx v stack p =
+	let pl = List.map (fun env -> {pfile = rev_hash env.env_info.pfile;pmin = env.env_leave_pmin; pmax = env.env_leave_pmax}) stack in
+	let pl = List.filter (fun p -> p <> null_pos) pl in
+	match pl with
+	| [] ->
+		uncaught_exception_string v p ""
+	| _ ->
+		let sstack = String.concat "\n" (List.map (fun p -> Printf.sprintf "%s : Called from here" (format_pos p)) pl) in
+		Printf.sprintf "%sUncaught exception %s\n%s" (if p = null_pos then "" else format_pos p ^ " : ") (value_string v) sstack
+
+let build_exception_stack ctx env =
+	let eval = env.env_eval in
+	let rec loop acc env' =
+		let acc = env' :: acc in
+		if env == env' then
+			List.rev acc
+		else match env'.env_parent with
+			| Some env -> loop acc env
+			| None -> assert false
+	in
+	let d = match eval.env with
+	| Some env -> loop [] env
+	| None -> []
+	in
+	ctx.exception_stack <- List.map (fun env ->
+		{pfile = rev_hash env.env_info.pfile;pmin = env.env_leave_pmin; pmax = env.env_leave_pmax},env.env_info.kind
+	) d
+
+let handle_stack_overflow eval f =
+	try f()
+	with Stack_overflow -> exc_string "Stack overflow"
+
+let catch_exceptions ctx ?(final=(fun() -> ())) f p =
+	let prev = !GlobalState.get_ctx_ref in
+	select ctx;
+	let eval = get_eval ctx in
+	let env = eval.env in
+	let r = try
+		let v = handle_stack_overflow eval f in
+		GlobalState.get_ctx_ref := prev;
+		final();
+		Some v
+	with
+	| RunTimeException(v,stack,p') ->
+		eval.caught_exception <- vnull;
+		Option.may (build_exception_stack ctx) env;
+		eval.env <- env;
+		if is v key_haxe_macro_Error then begin
+			let v1 = field v key_message in
+			let v2 = field v key_pos in
+			GlobalState.get_ctx_ref := prev;
+			final();
+			match v1,v2 with
+				| VString s,VInstance {ikind = IPos p} ->
+					raise (Error.Error (Error.Custom s.sstring,p))
+				| _ ->
+					Error.error "Something went wrong" null_pos
+		end else begin
+			(* Careful: We have to get the message before resetting the context because toString() might access it. *)
+			let stack = match stack with
+				| [] -> []
+				| l when p' = null_pos -> l (* If the exception position is null_pos, we're "probably" in a built-in function. *)
+				| _ :: l -> l (* Otherwise, ignore topmost frame position. *)
+			in
+			let msg = get_exc_error_message ctx v stack (if p' = null_pos then p else p') in
+			GlobalState.get_ctx_ref := prev;
+			final();
+			Error.error msg null_pos
+		end
+	| MacroApi.Abort ->
+		final();
+		None
+	| exc ->
+		GlobalState.get_ctx_ref := prev;
+		final();
+		raise exc
+	in
+	r
diff --git a/src/macro/eval/evalField.ml b/src/macro/eval/evalField.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b78dbd4578b1c563663c42ead81acb736ea2bfaa
--- /dev/null
+++ b/src/macro/eval/evalField.ml
@@ -0,0 +1,68 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open EvalValue
+open EvalContext
+open EvalHash
+
+let no_field =
+	vnull
+
+let proto_field_direct proto name =
+	proto.pfields.(get_proto_field_index_raise proto name)
+
+let rec proto_field_raise proto name =
+	try proto_field_direct proto name
+	with Not_found -> match proto.pparent with
+		| Some proto -> proto_field_raise proto name
+		| _ -> raise Not_found
+
+let instance_field vi name =
+	vi.ifields.(get_instance_field_index_raise vi.iproto name)
+
+let object_field_raise o name =
+	o.ofields.(get_instance_field_index_raise o.oproto name)
+
+let object_field o name =
+	try object_field_raise o name with Not_found -> vnull
+
+let field_raise v f =
+	match vresolve v with
+	| VObject o -> object_field_raise o f
+	| VInstance {ikind = IBytes s} when f = key_length -> vint (Bytes.length s)
+	| VPrototype proto -> proto_field_raise proto f
+	| VArray va ->
+		if f = key_length then vint (va.alength)
+		else proto_field_direct (get_ctx()).array_prototype f
+	| VVector vv ->
+		if f = key_length then vint (Array.length vv)
+		else proto_field_direct (get_ctx()).vector_prototype f
+	| VString s ->
+		if f = key_length then vint (s.slength)
+		else proto_field_direct (get_ctx()).string_prototype f
+	| VInstance vi -> (try instance_field vi f with Not_found -> proto_field_raise vi.iproto f)
+	| _ -> raise Not_found
+
+let field v f =
+	try field_raise v f with Not_found -> no_field
+
+let dynamic_field v name = match field v name with
+	| VFunction(f,false) -> vfield_closure v f
+	| v -> v
\ No newline at end of file
diff --git a/src/macro/eval/evalHash.ml b/src/macro/eval/evalHash.ml
new file mode 100644
index 0000000000000000000000000000000000000000..3d4981a494a7163b262f896f0a49f8c4a8e5dc0c
--- /dev/null
+++ b/src/macro/eval/evalHash.ml
@@ -0,0 +1,132 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+let reverse_map = Hashtbl.create 0
+
+let rev_hash i = Hashtbl.find reverse_map i
+
+let hash f =
+	let i = Hashtbl.hash f in
+	Hashtbl.replace reverse_map i f;
+	i
+
+let path_hash path = hash (Globals.s_type_path path)
+
+let key_length = hash "length"
+let key_toString = hash "toString"
+let key_OutsideBounds = hash "OutsideBounds"
+let key_low = hash "low"
+let key_high = hash "high"
+let key_next = hash "next"
+let key_hasNext = hash "hasNext"
+let key___meta__ = hash "__meta__"
+let key_get = hash "get"
+let key_pos = hash "pos"
+let key_len = hash "len"
+let key_message = hash "message"
+let key_Array = hash "Array"
+let key_eval_Vector = hash "eval.Vector"
+let key_String = hash "String"
+let key_haxe_ds_StringMap = hash "haxe.ds.StringMap"
+let key_haxe_ds_IntMap = hash "haxe.ds.IntMap"
+let key_haxe_ds_ObjectMap = hash "haxe.ds.ObjectMap"
+let key_haxe_macro_Position = hash "haxe.macro.Position"
+let key_haxe_macro_LazyType = hash "haxe.macro.LazyType"
+let key_haxe_macro_TypeDecl = hash "haxe.macro.TypeDecl"
+let key_haxe_Utf8 = hash "haxe.Utf8"
+let key_haxe_macro_Ref = hash "haxe.macro.Ref"
+let key_haxe_io_Error = hash "haxe.io.Error"
+let key_haxe_io_Bytes = hash "haxe.io.Bytes"
+let key_Date = hash "Date"
+let key_Dynamic = hash "Dynamic"
+let key_ValueType = hash "ValueType"
+let key_EReg = hash "EReg"
+let key_haxe_io_BytesBuffer = hash "haxe.io.BytesBuffer"
+let key_StringBuf = hash "StringBuf"
+let key_haxe_macro_Error = hash "haxe.macro.Error"
+let key_Int = hash "Int"
+let key_Float = hash "Float"
+let key_Bool = hash "Bool"
+let key_Class = hash "Class"
+let key_Enum = hash "Enum"
+let key_EnumValue = hash "EnumValue"
+let key_gid = hash "gid"
+let key_uid = hash "uid"
+let key_atime = hash "atime"
+let key_mtime = hash "mtime"
+let key_ctime = hash "ctime"
+let key_dev = hash "dev"
+let key_ino = hash "ino"
+let key_nlink = hash "nlink"
+let key_rdev = hash "rdev"
+let key_size = hash "size"
+let key_mode = hash "mode"
+let key_haxe__Int64____Int64 = hash "haxe._Int64.___Int64"
+let key_haxe_macro_Unsafe = hash "haxe.macro.Unsafe"
+let key_sys_io__Process_NativeProcess = hash "sys.io._Process.NativeProcess"
+let key_sys_io_FileOutput = hash "sys.io.FileOutput"
+let key_sys_io_FileInput = hash "sys.io.FileInput"
+let key_haxe_io_Eof = hash "haxe.io.Eof"
+let key_haxe_macro_ExprDef = hash "haxe.macro.ExprDef"
+let key_haxe_macro_Binop = hash "haxe.macro.Binop"
+let key_haxe_macro_Unop = hash "haxe.macro.Unop"
+let key_haxe_macro_Constant = hash "haxe.macro.Constant"
+let key_haxe_macro_TypeParam = hash "haxe.macro.TypeParam"
+let key_haxe_macro_ComplexType = hash "haxe.macro.ComplexType"
+let key_haxe_macro_FieldType = hash "haxe.macro.FieldType"
+let key_haxe_macro_Type = hash "haxe.macro.Type"
+let key_haxe_macro_FieldKind = hash "haxe.macro.FieldKind"
+let key_haxe_macro_MethodKind = hash "haxe.macro.MethodKind"
+let key_haxe_macro_VarAccess = hash "haxe.macro.VarAccess"
+let key_haxe_macro_Access = hash "haxe.macro.Access"
+let key_haxe_macro_ClassKind = hash "haxe.macro.ClassKind"
+let key_haxe_macro_TypedExprDef = hash "haxe.macro.TypedExprDef"
+let key_haxe_macro_TConstant = hash "haxe.macro.TConstant"
+let key_haxe_macro_ModuleType = hash "haxe.macro.ModuleType"
+let key_haxe_macro_FieldAccess = hash "haxe.macro.FieldAccess"
+let key_haxe_macro_AnonStatus = hash "haxe.macro.AnonStatus"
+let key_haxe_macro_ImportMode = hash "haxe.macro.ImportMode"
+let key_haxe_macro_QuoteStatus = hash "haxe.macro.QuoteStatus"
+let key_haxe_macro_DisplayKind = hash "haxe.macro.DisplayKind"
+let key_haxe_macro_Message = hash "haxe.macro.Message"
+let key_haxe_macro_FunctionKind = hash "haxe.macro.FunctionKind"
+let key_haxe_macro_StringLiteralKind = hash "haxe.macro.StringLiteralKind"
+let key_haxe_CallStack = hash "haxe.CallStack"
+let key___init__ = hash "__init__"
+let key_new = hash "new"
+let key_questionmark = hash "?"
+let key_haxe_StackItem = hash "haxe.StackItem"
+let key_sys_net__Socket_NativeSocket = hash "sys.net._Socket.NativeSocket"
+let key_ip = hash "ip"
+let key_port = hash "port"
+let key_sys_net_Socket = hash "sys.net.Socket"
+let key_socket = hash "socket"
+let key_read = hash "read"
+let key_write = hash "write"
+let key_others = hash "others"
+let key_eval_vm_Thread = hash "eval.vm.NativeThread"
+let key_haxe_zip_Compress = hash "haxe.zip.Compress"
+let key_haxe_zip_Uncompress = hash "haxe.zip.Uncompress"
+let key_done = hash "done"
+let key_eval_toplevel = hash "eval-toplevel"
+let key_haxe_iterators_map_key_value_iterator = hash "haxe.iterators.MapKeyValueIterator"
+let key_sys_net_Mutex = hash "sys.thread.Mutex"
+let key_sys_net_Lock = hash "sys.thread.Lock"
+let key_sys_net_Tls = hash "sys.thread.Tls"
+let key_sys_net_Deque = hash "sys.thread.Deque"
diff --git a/src/macro/eval/evalJit.ml b/src/macro/eval/evalJit.ml
new file mode 100644
index 0000000000000000000000000000000000000000..d91818bc4cc5e7ee3fa2f0a9bff051040b2d723f
--- /dev/null
+++ b/src/macro/eval/evalJit.ml
@@ -0,0 +1,712 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open Ast
+open Type
+open EvalValue
+open EvalContext
+open EvalHash
+open EvalEmitter
+open EvalMisc
+
+(* Helper *)
+
+let rope_path t = match follow t with
+	| TInst({cl_path=path},_) | TEnum({e_path=path},_) | TAbstract({a_path=path},_) -> s_type_path path
+	| TDynamic _ -> "Dynamic"
+	| TFun _ | TAnon _ | TMono _ | TType _ | TLazy _ -> assert false
+
+let eone = mk (TConst(TInt (Int32.one))) t_dynamic null_pos
+
+let eval_const = function
+	| TString s -> EvalString.create_unknown s
+	| TInt i32 -> vint32 i32
+	| TFloat f -> vfloat (float_of_string f)
+	| TBool b -> vbool b
+	| TNull -> vnull
+	| TThis | TSuper -> assert false
+
+let is_int t = match follow t with
+	| TAbstract({a_path=[],"Int"},_) -> true
+	| _ -> false
+
+let is_string t = match follow t with
+	| TInst({cl_path=[],"String"},_) -> true
+	| _ -> false
+
+let is_const_int_pattern (el,_) =
+	List.for_all (fun e -> match e.eexpr with
+		| TConst (TInt _) -> true
+		| _ -> false
+	) el
+
+open EvalJitContext
+
+let rec op_assign ctx jit e1 e2 = match e1.eexpr with
+	| TLocal var ->
+		let exec = jit_expr jit false e2 in
+		if var.v_capture then emit_capture_write (get_capture_slot jit var) exec
+		else emit_local_write (get_slot jit var.v_id e1.epos) exec
+	| TField(ef,fa) ->
+		let name = hash (field_name fa) in
+		let exec1 = jit_expr jit false ef in
+		let exec2 = jit_expr jit false e2 in
+		begin match fa with
+			| FInstance({cl_path=(["haxe";"io"],"Bytes")},_,{cf_name="length"}) ->
+				emit_bytes_length_write exec1 exec2
+			| FStatic({cl_path=path},_) | FEnum({e_path=path},_) ->
+				let proto = get_static_prototype jit.ctx (path_hash path) ef.epos in
+				emit_proto_field_write proto (get_proto_field_index proto name) exec2
+			| FInstance(c,_,_) when not c.cl_interface ->
+				let proto = get_instance_prototype jit.ctx (path_hash c.cl_path) ef.epos in
+				let i = get_instance_field_index proto name ef.epos in
+				emit_instance_field_write exec1 ef.epos i exec2
+			| FAnon cf ->
+				begin match follow ef.etype with
+					| TAnon an ->
+						let l = PMap.foldi (fun k _ acc -> (hash k,()) :: acc) an.a_fields [] in
+						let proto,_ = ctx.get_object_prototype ctx l in
+						let i = get_instance_field_index proto name ef.epos in
+						emit_anon_field_write exec1 ef.epos proto i name exec2
+					| _ ->
+						emit_field_write exec1 e1.epos name exec2
+				end
+			| _ ->
+				emit_field_write exec1 e1.epos name exec2
+		end
+	| TArray(ea1,ea2) ->
+		begin match (follow ea1.etype) with
+			| TInst({cl_path=(["eval"],"Vector")}, _) ->
+				let exec1 = jit_expr jit false ea1 in
+				let exec2 = jit_expr jit false ea2 in
+				let exec3 = jit_expr jit false e2 in
+				emit_vector_write exec1 ea1.epos exec2 ea2.epos exec3 ea2.epos
+			| _ ->
+				let exec1 = jit_expr jit false ea1 in
+				let exec2 = jit_expr jit false ea2 in
+				let exec3 = jit_expr jit false e2 in
+				emit_array_write exec1 ea1.epos exec2 ea2.epos exec3 ea2.epos
+		end
+
+	| _ ->
+		assert false
+
+and op_assign_op jit op e1 e2 prefix = match e1.eexpr with
+	| TLocal var ->
+		let exec = jit_expr jit false e2 in
+		if var.v_capture then emit_capture_read_write (get_capture_slot jit var) exec op prefix
+		else emit_local_read_write (get_slot jit var.v_id e1.epos) exec op prefix
+	| TField(ef,fa) ->
+		let name = hash (field_name fa) in
+		let exec1 = jit_expr jit false ef in
+		let exec2 = jit_expr jit false e2 in
+		begin match fa with
+			| FStatic({cl_path=path},_) ->
+				let proto = get_static_prototype jit.ctx (path_hash path) ef.epos in
+				emit_proto_field_read_write proto (get_proto_field_index proto name) exec2 op prefix
+			| FInstance(c,_,_) when not c.cl_interface ->
+				let proto = get_instance_prototype jit.ctx (path_hash c.cl_path) ef.epos in
+				let i = get_instance_field_index proto name ef.epos in
+				emit_instance_field_read_write exec1 ef.epos i exec2 op prefix
+			| _ ->
+				emit_field_read_write exec1 e1.epos name exec2 op prefix
+		end
+	| TArray(ea1,ea2) ->
+		begin match (follow ea1.etype) with
+			| TInst({cl_path=(["eval"],"Vector")}, _) ->
+				let exec1 = jit_expr jit false ea1 in
+				let exec2 = jit_expr jit false ea2 in
+				let exec3 = jit_expr jit false e2 in
+				emit_vector_read_write exec1 ea1.epos exec2 ea2.epos exec3 op prefix
+			| _ ->
+				let exec1 = jit_expr jit false ea1 in
+				let exec2 = jit_expr jit false ea2 in
+				let exec3 = jit_expr jit false e2 in
+				emit_array_read_write exec1 ea1.epos exec2 ea2.epos exec3 op prefix
+		end
+	| _ ->
+		assert false
+
+and op_incr jit e1 prefix p =
+	op_assign_op jit (get_binop_fun OpAdd p) e1 eone prefix
+
+and op_decr jit e1 prefix p =
+	op_assign_op jit (get_binop_fun OpSub p) e1 eone prefix
+
+and unop jit op flag e1 p =
+	match op with
+	| Not ->
+		let exec = jit_expr jit false e1 in
+		emit_not exec
+	| Neg ->
+		let exec = jit_expr jit false e1 in
+		emit_neg exec p
+	| NegBits ->
+		let exec = jit_expr jit false e1 in
+		emit_op_sub p (fun _ -> vint32 (Int32.minus_one)) exec
+	| Increment ->
+		begin match Texpr.skip e1 with
+		| {eexpr = TLocal v} when not v.v_capture ->
+			let slot = get_slot jit v.v_id e1.epos in
+			if flag = Prefix then emit_local_incr_prefix slot e1.epos
+			else emit_local_incr_postfix slot e1.epos
+		| _ ->
+			op_incr jit e1 (flag = Prefix) p
+		end
+	| Decrement ->
+		op_decr jit e1 (flag = Prefix) p
+
+and jit_default jit return def =
+	match def with
+	| None ->
+		emit_null
+	| Some e ->
+		push_scope jit e.epos;
+		let exec = jit_expr jit return e in
+		pop_scope jit;
+		exec
+
+(*
+	This is the main jit function. It turns expression [e] into a function, which can be
+	executed int an environment of type [EvalContext.env].
+*)
+and jit_expr jit return e =
+	let ctx = jit.ctx in
+	let rec loop e = match e.eexpr with
+	(* objects and values *)
+	| TVar(var,eo) ->
+		let varacc = declare_local jit var in
+		let exec = match eo with
+			| None -> emit_null
+			| Some e -> jit_expr jit false e
+		in
+		begin match varacc with
+			| Local slot -> emit_local_declaration slot exec
+			| Env slot -> emit_capture_declaration slot exec
+		end
+	| TConst TThis ->
+		emit_local_read (get_slot jit 0 e.epos)
+	| TConst ct ->
+		emit_const (eval_const ct)
+	| TObjectDecl fl ->
+		let fl = List.map (fun ((s,_,_),e) -> hash s,jit_expr jit false e) fl in
+		let proto,_ = ctx.get_object_prototype ctx fl in
+		let fl = List.map (fun (s,exec) -> get_instance_field_index proto s e.epos,exec) fl in
+		let fa = Array.of_list fl in
+		emit_object_declaration proto fa
+	| TArrayDecl el ->
+		let execs = List.map (jit_expr jit false) el in
+		let execs = Array.of_list execs in
+		emit_array_declaration execs
+	| TTypeExpr mt ->
+		let key = path_hash (t_infos mt).mt_path in
+		let proto = get_static_prototype_as_value jit.ctx key e.epos in
+		emit_type_expr proto
+	| TFunction tf ->
+		let jit_closure = EvalJitContext.create ctx in
+		jit.num_closures <- jit.num_closures + 1;
+		let fl,exec = jit_tfunction jit_closure true e.epos tf in
+		let hasret = jit_closure.has_nonfinal_return in
+		let eci = get_env_creation jit_closure false tf.tf_expr.epos.pfile (EKLocalFunction jit.num_closures) in
+		let captures = Hashtbl.fold (fun vid (i,declared) acc -> (i,vid,declared) :: acc) jit_closure.captures [] in
+		let captures = List.sort (fun (i1,_,_) (i2,_,_) -> Pervasives.compare i1 i2) captures in
+		(* Check if the out-of-scope var is in the outer scope because otherwise we have to promote outwards. *)
+		List.iter (fun var -> ignore(get_capture_slot jit var)) jit_closure.captures_outside_scope;
+		let captures = ExtList.List.filter_map (fun (i,vid,declared) ->
+			if declared then None
+			else Some (i,fst (try Hashtbl.find jit.captures vid with Not_found -> Error.error "Something went wrong" e.epos))
+		) captures in
+		let mapping = Array.of_list captures in
+		emit_closure ctx mapping eci hasret exec fl
+	(* branching *)
+	| TIf(e1,e2,eo) ->
+		let exec_cond = jit_expr jit false e1 in
+		let exec_then = jit_expr jit return e2 in
+		let exec_else = match eo with
+			| None -> emit_null
+			| Some e -> jit_expr jit return e
+		in
+		emit_if exec_cond exec_then exec_else
+	| TSwitch(e1,cases,def) when is_int e1.etype && List.for_all is_const_int_pattern cases ->
+		let exec = jit_expr jit false e1 in
+		let h = ref IntMap.empty in
+		let max = ref 0 in
+		let min = ref max_int in
+		List.iter (fun (el,e) ->
+			push_scope jit e.epos;
+			let exec = jit_expr jit return e in
+			List.iter (fun e -> match e.eexpr with
+				| TConst (TInt i32) ->
+					let i = Int32.to_int i32 in
+					h := IntMap.add i exec !h;
+					if i > !max then max := i;
+					if i < !min then min := i;
+				| _ -> assert false
+			) el;
+			pop_scope jit;
+		) cases;
+		let exec_def = jit_default jit return def in
+		let l = !max - !min + 1 in
+		if l > 0 && l < 256 then begin
+			let cases = Array.init l (fun i -> try IntMap.find (i + !min) !h with Not_found -> exec_def) in
+			emit_int_switch_array (- !min) exec cases exec_def e1.epos
+		end else
+			emit_int_switch_map exec !h exec_def e1.epos
+	(* | TSwitch(e1,cases,def) when is_string e1.etype ->
+		let exec = jit_expr jit false e1 in
+		let h = ref PMap.empty in
+		List.iter (fun (el,e) ->
+			push_scope jit e.epos;
+			let exec = jit_expr jit return e in
+			List.iter (fun e -> match e.eexpr with
+				| TConst (TString s) -> h := PMap.add s exec !h;
+				| _ -> assert false
+			) el;
+			pop_scope jit;
+		) cases;
+		let exec_def = jit_default jit return def in
+		emit_string_switch_map exec !h exec_def e1.epos *)
+	| TSwitch(e1,cases,def) ->
+		let exec = jit_expr jit false e1 in
+		let execs = DynArray.create () in
+		let patterns = List.map (fun (el,e) ->
+			push_scope jit e.epos;
+			let el = List.map (jit_expr jit false) el in
+			DynArray.add execs (jit_expr jit return e);
+			pop_scope jit;
+			el
+		) cases in
+		let exec_def = jit_default jit return def in
+		emit_switch exec (DynArray.to_array execs) (Array.of_list patterns) exec_def
+	| TWhile({eexpr = TParenthesis e1},e2,flag) ->
+		loop {e with eexpr = TWhile(e1,e2,flag)}
+	| TWhile(e1,e2,flag) ->
+		let rec has_continue e = match e.eexpr with
+			| TContinue -> true
+			| TWhile _ | TFor _ | TFunction _ -> false
+			| _ -> check_expr has_continue e
+		in
+		let exec_cond = jit_expr jit false e1 in
+		let exec_body = jit_expr jit false e2 in
+		begin match flag with
+			| NormalWhile ->
+				if has_continue e2 then emit_while_break_continue exec_cond exec_body
+				else emit_while_break exec_cond exec_body
+			| DoWhile -> emit_do_while_break_continue exec_cond exec_body
+		end
+	| TTry(e1,catches) ->
+		let exec = jit_expr jit return e1 in
+		let catches = List.map (fun (var,e) ->
+			push_scope jit e.epos;
+			let varacc = declare_local jit var in
+			let exec = jit_expr jit return e in
+			pop_scope jit;
+			let key = hash (rope_path var.v_type) in
+			let f = match varacc with
+				| Local slot -> emit_local_write slot
+				| Env slot -> emit_capture_write slot
+			in
+			exec,key,f
+		) catches in
+		emit_try exec catches
+	(* control flow *)
+	| TBlock [] ->
+		emit_null
+	| TBlock [e1] ->
+		push_scope jit e.epos;
+		let exec = jit_expr jit return e1 in
+		pop_scope jit;
+		exec
+	| TBlock el ->
+		push_scope jit e.epos;
+		let rec loop acc el = match el with
+			| [e] ->
+				List.rev ((jit_expr jit return e) :: acc)
+			| e :: el ->
+				loop (jit_expr jit false e :: acc) el
+			| [] ->
+				assert false
+		in
+		let el = loop [] el in
+		pop_scope jit;
+		let rec step el =
+			let a = Array.of_list el in
+			let rec loop i acc =
+				if i >= 7 then begin
+					let f8 = emit_seq8 a.(i - 7) a.(i - 6) a.(i - 5) a.(i - 4) a.(i - 3) a.(i - 2) a.(i - 1) a.(i) in
+					loop (i - 8) (f8 :: acc)
+				end else if i >= 3 then begin
+					let f4 = emit_seq4 a.(i - 3) a.(i - 2) a.(i - 1) a.(i) in
+					loop (i - 4) (f4 :: acc)
+				end else if i >= 1 then begin
+					let f2 = emit_seq2 a.(i - 1) a.(i) in
+					loop (i - 2) (f2 :: acc)
+				end else if i = 0 then
+					((a.(i)) :: acc)
+				else
+					acc
+			in
+			let length = Array.length a in
+			match loop (length - 1) [] with
+			| [] -> assert false
+			| [f] -> f
+			| fl -> step fl
+		in
+		step el
+	| TReturn None ->
+		if return && not jit.ctx.debug.support_debugger then
+			emit_null
+		else begin
+			jit.has_nonfinal_return <- true;
+			emit_return_null
+		end
+	| TReturn (Some e1) ->
+		let exec = jit_expr jit false e1 in
+		if return && not jit.ctx.debug.support_debugger then
+			emit_value exec
+		else begin
+			jit.has_nonfinal_return <- true;
+			emit_return_value exec
+		end
+	| TBreak ->
+		emit_break
+	| TContinue ->
+		emit_continue
+	| TThrow e1 ->
+		let exec = jit_expr jit false e1 in
+		emit_throw exec e.epos
+	| TCast(e1,Some mt) ->
+		let exec = jit_expr jit false e1 in
+		let t = type_of_module_type mt in
+		emit_safe_cast exec (hash (rope_path t)) e.epos
+	(* calls *)
+	| TCall(e1,el) ->
+		begin match e1.eexpr with
+		| TField({eexpr = TConst TSuper;epos=pv},FInstance(c,_,cf)) ->
+			let proto = get_instance_prototype ctx (path_hash c.cl_path) e1.epos in
+			let name = hash cf.cf_name in
+			let i = get_proto_field_index proto name in
+			let slot = get_slot jit 0 pv in
+			let execs = List.map (jit_expr jit false) el in
+			emit_super_field_call slot proto i execs e.epos
+		| TField(ef,fa) ->
+			let name = hash (field_name fa) in
+			let execs = List.map (jit_expr jit false) el in
+			let is_final c cf =
+				c.cl_final || (has_class_field_flag cf CfFinal) ||
+				(* In interp mode we can assume that a field is final if it is not overridden.
+				   We cannot do that in macro mode because overriding fields might be added
+				   after jitting this call. *)
+				(not ctx.is_macro && not (Hashtbl.mem ctx.overrides (c.cl_path,cf.cf_name)))
+			in
+			let is_proper_method cf = match cf.cf_kind with
+				| Method MethDynamic -> false
+				| Method _ -> true
+				| Var _ -> false
+			in
+			let lazy_proto_field proto =
+				let i = get_proto_field_index proto name in
+				lazy (match proto.pfields.(i) with VFunction (f,_) -> f | v -> cannot_call v e.epos)
+			in
+			let instance_call c =
+				let exec = jit_expr jit false ef in
+				let proto = get_instance_prototype ctx (path_hash c.cl_path) ef.epos in
+				let v = lazy_proto_field proto in
+				emit_proto_field_call v (exec :: execs) e.epos
+			in
+			let default () =
+				let exec = jit_expr jit false ef in
+				emit_method_call exec name execs e.epos
+			in
+			begin match fa with
+				| FStatic({cl_path=[],"StringTools"},{cf_name="fastCodeAt"}) ->
+					begin match execs with
+						| [exec1;exec2] -> emit_string_cca exec1 exec2 e.epos
+						| _ -> assert false
+					end
+				| FEnum({e_path=path},ef) ->
+					let key = path_hash path in
+					let pos = Some e.epos in
+					emit_enum_construction key ef.ef_index (Array.of_list execs) pos
+				| FStatic({cl_path=path},cf) when is_proper_method cf ->
+					let proto = get_static_prototype ctx (path_hash path) ef.epos in
+					let v = lazy_proto_field proto in
+					emit_proto_field_call v execs e.epos
+				| FInstance(c,_,cf) when is_proper_method cf ->
+					if not (is_final c cf) then
+						default()
+					else if not c.cl_interface then
+						instance_call c
+					(* If we have exactly one implementer, use it instead of the super class/interface. *)
+					else if not ctx.is_macro && c.cl_implements = [] && c.cl_super = None then begin match c.cl_descendants with
+						| [c'] when not c'.cl_interface && is_final c' cf ->
+							instance_call c'
+						| _ ->
+							default()
+					end else
+						default()
+				| _ ->
+					let exec = jit_expr jit false ef in
+					emit_field_call exec name execs e.epos
+			end
+		| TConst TSuper ->
+			begin match follow e1.etype with
+			| TInst(c,_) ->
+				let key = (path_hash c.cl_path) in
+				let execs = List.map (jit_expr jit false) el in
+				begin try
+					let f = get_special_instance_constructor_raise ctx key in
+					emit_special_super_call f execs
+				with Not_found ->
+					let fnew = get_instance_constructor jit.ctx key e1.epos in
+					let v = lazy (match Lazy.force fnew with VFunction (f,_) -> f | v -> cannot_call v e.epos) in
+					emit_super_call v execs e.epos
+				end
+			| _ -> assert false
+			end
+		| _ ->
+			match e1.eexpr,el with
+			| TIdent "$__mk_pos__",[file;min;max] ->
+				let exec1 = jit_expr jit false file in
+				let exec2 = jit_expr jit false min in
+				let exec3 = jit_expr jit false max in
+				emit_mk_pos exec1 exec2 exec3
+			| _ ->
+				let exec = jit_expr jit false e1 in
+				let execs = List.map (jit_expr jit false) el in
+				emit_call exec execs e.epos
+		end
+	| TNew({cl_path=[],"Array"},_,_) ->
+		emit_new_array
+	| TNew({cl_path=["eval"],"Vector"},_,[e1]) ->
+		begin match e1.eexpr with
+			| TConst (TInt i32) ->
+				emit_new_vector_int (Int32.to_int i32)
+			| _ ->
+				let exec1 = jit_expr jit false e1 in
+				emit_new_vector exec1 e1.epos
+		end
+	| TNew(c,_,el) ->
+		let execs = List.map (jit_expr jit false) el in
+		let key = path_hash c.cl_path in
+		begin try
+			let f = get_special_instance_constructor_raise ctx key in
+			emit_special_instance f execs
+		with Not_found ->
+			let fnew = get_instance_constructor jit.ctx key e.epos in
+			let proto = get_instance_prototype jit.ctx key e.epos in
+			let v = lazy (match Lazy.force fnew with VFunction (f,_) -> f | v -> cannot_call v e.epos) in
+			emit_constructor_call proto v execs e.epos
+		end
+	(* read *)
+	| TLocal var ->
+		if var.v_capture then emit_capture_read (get_capture_slot jit var)
+		else emit_local_read (get_slot jit var.v_id e.epos)
+	| TField(e1,fa) ->
+		let name = hash (field_name fa) in
+		begin match fa with
+			| FInstance({cl_path=([],"Array")},_,{cf_name="length"}) -> emit_array_length_read (jit_expr jit false e1) e1.epos
+			| FInstance({cl_path=(["eval"],"Vector")},_,{cf_name="length"}) -> emit_vector_length_read (jit_expr jit false e1) e1.epos
+			| FInstance({cl_path=(["haxe";"io"],"Bytes")},_,{cf_name="length"}) -> emit_bytes_length_read (jit_expr jit false e1) e1.epos
+			| FStatic({cl_path=path},_) | FEnum({e_path=path},_)
+			| FInstance({cl_path=path},_,{cf_kind = Method (MethNormal | MethInline)}) ->
+				let proto = get_static_prototype ctx (path_hash path) e1.epos in
+				emit_proto_field_read proto (get_proto_field_index proto name)
+			| FInstance(c,_,_) when not c.cl_interface ->
+				let proto = get_instance_prototype ctx (path_hash c.cl_path) e1.epos in
+				let i = get_instance_field_index proto name e1.epos in
+				begin match e1.eexpr with
+					| TConst TThis -> emit_this_field_read (get_slot jit 0 e.epos) i
+					| _ -> emit_instance_field_read (jit_expr jit false e1) e1.epos i
+				end
+			| FAnon _ ->
+				begin match follow e1.etype with
+					| TAnon an ->
+						let l = PMap.foldi (fun k _ acc -> (hash k,()) :: acc) an.a_fields [] in
+						let proto,_ = ctx.get_object_prototype ctx l in
+						let i = get_instance_field_index proto name e1.epos in
+						emit_anon_field_read (jit_expr jit false e1) proto i name e1.epos
+					| _ ->
+						emit_field_read (jit_expr jit false e1) name e1.epos
+				end
+			| FClosure _ | FDynamic _ ->
+				let exec = jit_expr jit false e1 in
+				emit_field_closure exec name
+			| _ ->
+				let exec = jit_expr jit false e1 in
+				emit_field_read exec name e1.epos
+		end
+	| TArray(e1,e2) ->
+		begin match (follow e1.etype) with
+			| TInst({cl_path=(["eval"],"Vector")}, _) ->
+				let exec1 = jit_expr jit false e1 in
+				let exec2 = jit_expr jit false e2 in
+				emit_vector_read exec1 e1.epos exec2 e2.epos
+			| _ ->
+				let exec1 = jit_expr jit false e1 in
+				let exec2 = jit_expr jit false e2 in
+				emit_array_read exec1 e1.epos exec2 e2.epos
+		end
+	| TEnumParameter(e1,_,i) ->
+		let exec = jit_expr jit false e1 in
+		emit_enum_parameter_read exec i
+	| TEnumIndex e1 ->
+		let exec = jit_expr jit false e1 in
+		emit_enum_index exec e1.epos
+	(* ops *)
+	| TBinop(OpEq,e1,{eexpr = TConst TNull}) | TBinop(OpEq,{eexpr = TConst TNull},e1) ->
+		let exec = jit_expr jit false e1 in
+		emit_eq_null exec
+	| TBinop(OpNotEq,e1,{eexpr = TConst TNull}) | TBinop(OpNotEq,{eexpr = TConst TNull},e1) ->
+		let exec = jit_expr jit false e1 in
+		emit_not_eq_null exec
+	| TBinop(op,e1,e2) ->
+		begin match op with
+		| OpAssign ->
+			op_assign ctx jit e1 e2
+		| OpAssignOp op ->
+			let f = get_binop_fun op e.epos in
+			op_assign_op jit f e1 e2 true
+		| OpBoolAnd ->
+			let exec1 = jit_expr jit false e1 in
+			let exec2 = jit_expr jit false e2 in
+			emit_bool_and exec1 exec2
+		| OpBoolOr ->
+			let exec1 = jit_expr jit false e1 in
+			let exec2 = jit_expr jit false e2 in
+			emit_bool_or exec1 exec2
+		| _ ->
+			let exec1 = jit_expr jit false e1 in
+			let exec2 = jit_expr jit false e2 in
+			begin match op with
+				| OpAdd -> emit_op_add e.epos exec1 exec2
+				| OpMult -> emit_op_mult e.epos exec1 exec2
+				| OpDiv -> emit_op_div e.epos exec1 exec2
+				| OpSub -> emit_op_sub e.epos exec1 exec2
+				| OpEq -> emit_op_eq exec1 exec2
+				| OpNotEq -> emit_op_not_eq exec1 exec2
+				| OpGt -> emit_op_gt exec1 exec2
+				| OpGte -> emit_op_gte exec1 exec2
+				| OpLt -> emit_op_lt exec1 exec2
+				| OpLte -> emit_op_lte exec1 exec2
+				| OpAnd -> emit_op_and e.epos exec1 exec2
+				| OpOr -> emit_op_or e.epos exec1 exec2
+				| OpXor -> emit_op_xor e.epos exec1 exec2
+				| OpShl -> emit_op_shl e.epos exec1 exec2
+				| OpShr -> emit_op_shr e.epos exec1 exec2
+				| OpUShr -> emit_op_ushr e.epos exec1 exec2
+				| OpMod -> emit_op_mod e.epos exec1 exec2
+				| _ -> assert false
+			end
+		end
+	| TUnop(op,flag,v1) ->
+		unop jit op flag v1 e.epos
+	(* rewrites/skips *)
+	| TFor(v,e1,e2) ->
+		loop (Texpr.for_remap (ctx.curapi.MacroApi.get_com()).Common.basic v e1 e2 e.epos)
+	| TParenthesis e1 | TMeta(_,e1) | TCast(e1,None) ->
+		loop e1
+	| TIdent s ->
+		Error.error ("Unknown identifier: " ^ s) e.epos
+	in
+	let f = loop e in
+	begin match ctx.debug.debug_socket with
+		| None ->
+			f
+		| Some socket ->
+			let wrap () =
+				EvalDebug.debug_loop jit socket.connection e f
+			in
+			begin match e.eexpr with
+			| TCall _ | TNew _
+			| TVar({v_kind = VUser _},_)
+			| TFor _ | TIf _ | TWhile _ | TSwitch _ | TTry _
+			| TReturn _ | TBreak | TContinue | TThrow _ | TCast(_,Some _) ->
+				wrap()
+			| TUnop((Increment | Decrement),_,e1) | TBinop((OpAssign | OpAssignOp _),e1,_) ->
+				begin match (Texpr.skip e1).eexpr with
+				| TLocal {v_kind = VGenerated | VInlined | VInlinedConstructorVariable | VExtractorVariable} ->
+					f
+				| _ ->
+					wrap()
+				end
+			| _ ->
+				f
+		end
+	end
+
+and jit_tfunction jit static pos tf =
+	let ctx = jit.ctx in
+	push_scope jit pos;
+	(* Declare `this` (if not static) and function arguments as local variables. *)
+	if not static then ignore(declare_local_this jit);
+	let fl = List.map (fun (var,_) ->
+		let varacc = declare_local jit var in
+		match varacc with
+		| Env slot -> execute_set_capture slot
+		| Local slot -> execute_set_local slot
+	) tf.tf_args in
+	let fl = if static then fl else (execute_set_local 0) :: fl in
+	(* Add conditionals for default values. *)
+	let e = List.fold_left (fun e (v,cto) -> match cto with
+		| None -> e
+		| Some ct -> concat (Texpr.set_default (ctx.curapi.MacroApi.get_com()).Common.basic v ct e.epos) e
+	) tf.tf_expr tf.tf_args in
+	let has_final_return el = match List.rev el with
+		| {eexpr = TReturn _} :: _ -> true
+		| _ -> false
+	in
+	let e = match e.eexpr with
+		| TBlock el when ctx.debug.support_debugger && (ExtType.is_void (follow tf.tf_type)) && not (has_final_return el) ->
+			{e with eexpr = TBlock (el @ [mk (TReturn None) t_dynamic {pos with pmin = pos.pmax}])}
+		| _ ->
+			e
+	in
+	(* Jit the function expression. *)
+	let exec = jit_expr jit true e in
+	pop_scope jit;
+	fl,exec
+
+and get_env_creation jit static file info = {
+	ec_info = create_env_info static file info jit.capture_infos;
+	ec_num_locals = jit.max_num_locals;
+	ec_num_captures = Hashtbl.length jit.captures;
+}
+
+(* Creates a [EvalValue.vfunc] of function [tf], which can be [static] or not. *)
+let jit_tfunction ctx key_type key_field tf static pos =
+	let t = Timer.timer [(if ctx.is_macro then "macro" else "interp");"jit"] in
+	(* Create a new JitContext with an initial scope *)
+	let jit = EvalJitContext.create ctx in
+	let fl,exec = jit_tfunction jit static pos tf in
+	(* Create the [vfunc] instance depending on the number of arguments. *)
+	let hasret = jit.has_nonfinal_return in
+	let eci = get_env_creation jit static tf.tf_expr.epos.pfile (EKMethod(key_type,key_field)) in
+	let f = if hasret then create_function ctx eci exec fl else create_function_noret ctx eci exec fl in
+	t();
+	f
+
+(* JITs expression [e] to a function. This is used for expressions that are not in a method. *)
+let jit_expr ctx e =
+	let t = Timer.timer [(if ctx.is_macro then "macro" else "interp");"jit"] in
+	let jit = EvalJitContext.create ctx in
+	let f = jit_expr jit false (mk_block e) in
+	t();
+	jit,f
\ No newline at end of file
diff --git a/src/macro/eval/evalJitContext.ml b/src/macro/eval/evalJitContext.ml
new file mode 100644
index 0000000000000000000000000000000000000000..c6870c776765b33cfcac1832b0d8425de4b4270f
--- /dev/null
+++ b/src/macro/eval/evalJitContext.ml
@@ -0,0 +1,161 @@
+open Type
+open EvalContext
+
+type varacc =
+	| Local of int
+	| Env of int
+
+(*
+	JitContext keeps track of allocated local variables and closures. Scopes can be pushed
+	and popped and influence the "slots" of variables. It also manages the maximum number
+	of locals allocated at the same time, which the run-time can use to allocate a fixed
+	array.
+*)
+
+type t = {
+	ctx : context;
+	(* The scope stack. *)
+	mutable scopes : scope list;
+	(* The captured variables declared in this context. Maps variable IDs to capture slots. *)
+	mutable captures : (int,int * bool) Hashtbl.t;
+	(* The current number of locals. *)
+	mutable num_locals : int;
+	(* The maximum number of locals. *)
+	mutable max_num_locals : int;
+	(* The number of closures in this context.*)
+	mutable num_closures : int;
+	(* Whether or not this function has a return that's not at the end of control flow. *)
+	mutable has_nonfinal_return : bool;
+	(* The name of capture variables. Maps local slots to variable names. Only filled in debug mode. *)
+	mutable capture_infos : (int,var_info) Hashtbl.t;
+	(* Variables which are accessed but not declared in this scope. *)
+	mutable captures_outside_scope : tvar list;
+}
+
+let var_info_of_var var =
+	{
+		vi_name = var.v_name;
+		vi_pos = var.v_pos;
+		vi_generated = (match var.v_kind with VUser _ -> false | _ -> true)
+	}
+
+(* Creates a new context *)
+let create ctx = {
+	ctx = ctx;
+	scopes = [];
+	captures = Hashtbl.create 0;
+	num_locals = 0;
+	max_num_locals = 0;
+	num_closures = 0;
+	has_nonfinal_return = false;
+	capture_infos = Hashtbl.create 0;
+	captures_outside_scope = []
+}
+
+(* Returns the number of locals in [scope]. *)
+let num_locals scope =
+	Hashtbl.length scope.locals
+
+(* Pushes a new scope onto context [jit]. *)
+let push_scope jit pos =
+	let scope = {
+		local_offset = jit.num_locals;
+		locals = Hashtbl.create 0;
+		local_infos = Hashtbl.create 0;
+		local_ids = Hashtbl.create 0;
+		pos = pos;
+	} in
+	jit.scopes <- scope :: jit.scopes
+
+(* Pops the top scope from context [jit] .*)
+let pop_scope jit = match jit.scopes with
+	| scope :: tl ->
+		jit.scopes <- tl;
+		jit.num_locals <- jit.num_locals - (num_locals scope);
+	| [] ->
+		assert false
+
+(* Increases number of locals and updates maximum number of locals if necessary *)
+let increase_num_locals jit =
+	jit.num_locals <- jit.num_locals + 1;
+	if jit.num_locals > jit.max_num_locals then jit.max_num_locals <- jit.num_locals
+
+(* Adds capture variable [var] to context [jit]. *)
+let add_capture jit var declared =
+	let i = Hashtbl.length jit.captures in
+	Hashtbl.add jit.captures var.v_id (i,declared);
+	if jit.ctx.debug.support_debugger then begin
+		Hashtbl.replace jit.capture_infos i (var_info_of_var var)
+	end;
+	i
+
+(* Adds variable [var] to the current top scope of context [jit]. *)
+let add_local jit var = match jit.scopes with
+	| [] -> assert false
+	| scope :: _ ->
+		let i = Hashtbl.length scope.locals in
+		Hashtbl.add scope.locals var.v_id i;
+		increase_num_locals jit;
+		let slot = scope.local_offset + i in
+		if jit.ctx.debug.support_debugger then begin
+			if Typecore.is_gen_local var then var.v_name <- "_g" ^ String.sub var.v_name 1 (String.length var.v_name - 1);
+			Hashtbl.replace scope.local_ids var.v_name var.v_id;
+			Hashtbl.replace scope.local_infos i (var_info_of_var var)
+		end;
+		slot
+
+(*
+	Declares variable [var] in context [jit]. If the variable is captured, it is added to
+	the capture hash table. Otherwise it is added to the local hash table of the top scope.
+
+	Returns either [Env slot] if the variable is captured or [Local slot] otherwise.
+*)
+let declare_local jit var =
+	if var.v_capture then Env (add_capture jit var true)
+	else Local (add_local jit var)
+
+(*
+	Declares function argument [var] in context [jit].
+
+	All function arguments are added as local variables. If the variable is captured, it
+	is also added as a capture variable. This is handled by [EvalEmitter.handle_capture_arguments].
+*)
+let declare_arg jit var =
+	let varacc = add_local jit var in
+	if var.v_capture then add_capture jit var true,Some varacc else varacc,None
+
+(* Declares a variable for `this` in context [jit]. *)
+let declare_local_this jit = match jit.scopes with
+	| [] -> assert false
+	| scope :: _ ->
+		let i = Hashtbl.length scope.locals in
+		Hashtbl.add scope.locals 0 i;
+		increase_num_locals jit;
+		if jit.ctx.debug.support_debugger then begin
+			Hashtbl.replace scope.local_ids "this" 0;
+			Hashtbl.replace scope.local_infos 0 { vi_name = "this"; vi_pos = Globals.null_pos; vi_generated = false }
+		end;
+		Local i
+
+(* Gets the slot of variable id [vid] in context [jit]. *)
+let get_slot_raise jit vid =
+	let rec loop scopes = match scopes with
+		| [] -> raise Not_found
+		| scope :: scopes ->
+			try
+				scope.local_offset + Hashtbl.find scope.locals vid
+			with Not_found ->
+				loop scopes
+	in
+	loop jit.scopes
+
+let get_slot jit vid p =
+	try get_slot_raise jit vid
+	with Not_found -> EvalMisc.throw_string "Unbound variable" p
+
+(* Gets the slot of captured variable id [vid] in context [jit]. *)
+let get_capture_slot jit var =
+	try fst (Hashtbl.find jit.captures var.v_id)
+	with Not_found ->
+		jit.captures_outside_scope <- var :: jit.captures_outside_scope;
+		add_capture jit var false
\ No newline at end of file
diff --git a/src/macro/eval/evalMain.ml b/src/macro/eval/evalMain.ml
new file mode 100644
index 0000000000000000000000000000000000000000..1a61082a6e1ce416099fa8af104b4bf31fe692d1
--- /dev/null
+++ b/src/macro/eval/evalMain.ml
@@ -0,0 +1,558 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open Ast
+open Type
+open Common
+open EvalValue
+open EvalContext
+open EvalPrototype
+open EvalExceptions
+open EvalJit
+open EvalJitContext
+open EvalPrinting
+open EvalMisc
+open EvalHash
+open EvalEncode
+open EvalField
+open MacroApi
+
+(* Create *)
+
+let create com api is_macro =
+	let t = Timer.timer [(if is_macro then "macro" else "interp");"create"] in
+	incr GlobalState.sid;
+	let builtins = match !GlobalState.stdlib with
+		| None ->
+			let builtins = {
+				static_builtins = IntMap.empty;
+				instance_builtins = IntMap.empty;
+				constructor_builtins = Hashtbl.create 0;
+				empty_constructor_builtins = Hashtbl.create 0;
+			} in
+			EvalStdLib.init_standard_library builtins;
+			GlobalState.stdlib := Some builtins;
+			builtins
+		| Some (builtins) ->
+			builtins
+	in
+	let debug = match !GlobalState.debug with
+		| None ->
+			let support_debugger = Common.defined com Define.EvalDebugger in
+			let socket =
+				try
+					if not support_debugger then raise Exit;
+					let fail msg =
+						print_endline msg;
+						raise Exit
+					in
+					let s = Common.defined_value com Define.EvalDebugger in
+					let host,port = try ExtString.String.split s ":" with _ -> fail "Invalid host format, expected host:port" in
+					let port = try int_of_string port with _ -> fail "Invalid port, expected int" in
+					Some (try
+						let socket = Socket.create host port in
+						{
+							socket = socket;
+							connection = EvalDebugSocket.make_connection socket;
+						};
+					with exc ->
+						fail (Printexc.to_string exc)
+					)
+				with _ ->
+					None
+			in
+			let debug' = {
+				breakpoints = Hashtbl.create 0;
+				function_breakpoints = Hashtbl.create 0;
+				support_debugger = support_debugger;
+				debug_socket = socket;
+				exception_mode = CatchUncaught;
+				debug_context = new eval_debug_context;
+			} in
+			GlobalState.debug := Some debug';
+			debug'
+		| Some debug ->
+			debug
+	in
+	let detail_times = Common.defined com Define.EvalTimes in
+	let thread = {
+		tthread = Thread.self();
+		tstorage = IntMap.empty;
+		tdeque = EvalThread.Deque.create();
+	} in
+	let eval = EvalThread.create_eval thread in
+	let evals = IntMap.singleton 0 eval in
+	let rec ctx = {
+		ctx_id = !GlobalState.sid;
+		is_macro = is_macro;
+		debug = debug;
+		detail_times = detail_times;
+		curapi = api;
+		builtins = builtins;
+		type_cache = IntMap.empty;
+		overrides = Hashtbl.create 0;
+		had_error = false;
+		(* prototypes *)
+		string_prototype = fake_proto key_String;
+		array_prototype = fake_proto key_Array;
+		vector_prototype = fake_proto key_eval_Vector;
+		static_prototypes = new static_prototypes;
+		instance_prototypes = IntMap.empty;
+		constructors = IntMap.empty;
+		get_object_prototype = get_object_prototype;
+		(* eval *)
+		toplevel = 	vobject {
+			ofields = [||];
+			oproto = fake_proto key_eval_toplevel;
+		};
+		eval = eval;
+		evals = evals;
+		exception_stack = [];
+		max_stack_depth = int_of_string (Common.defined_value_safe ~default:"1000" com Define.EvalCallStackDepth);
+	} in
+	if debug.support_debugger && not !GlobalState.debugger_initialized then begin
+		(* Let's wait till the debugger says we're good to continue. This allows it to finish configuration.
+		   Note that configuration is shared between macro and interpreter contexts, which is why the check
+		   is governed by a global variable. *)
+		GlobalState.debugger_initialized := true;
+		 (* There's select_ctx in the json-rpc handling, so let's select this one. It's fine because it's the
+		    first context anyway. *)
+		select ctx;
+		ignore(Event.sync(Event.receive eval.debug_channel));
+	end;
+	t();
+	ctx
+
+(* API for macroContext.ml *)
+
+let call_path ctx path f vl api =
+	if ctx.had_error then
+		None
+	else begin
+		let old = ctx.curapi in
+		ctx.curapi <- api;
+		let path = match List.rev path with
+			| [] -> assert false
+			| name :: path -> List.rev path,name
+		in
+		catch_exceptions ctx ~final:(fun () -> ctx.curapi <- old) (fun () ->
+			let vtype = get_static_prototype_as_value ctx (path_hash path) api.pos in
+			let vfield = field vtype (hash f) in
+			let p = api.pos in
+			let info = create_env_info true p.pfile EKEntrypoint (Hashtbl.create 0) in
+			let env = push_environment ctx info 0 0 in
+			env.env_leave_pmin <- p.pmin;
+			env.env_leave_pmax <- p.pmax;
+			let v = call_value_on vtype vfield vl in
+			pop_environment ctx env;
+			v
+		) api.pos
+	end
+
+let value_signature v =
+	let buf = Buffer.create 0 in
+	let add s = Buffer.add_string buf s in
+	let addc c = Buffer.add_char buf c in
+	let scache = Hashtbl.create 0 in
+	let adds s =
+		try
+			let i = Hashtbl.find scache s in
+			addc 'R';
+			add (string_of_int i)
+		with Not_found ->
+			Hashtbl.add scache s (Hashtbl.length scache);
+			addc 'y';
+			let s = EvalStdLib.StdStringTools.url_encode s in
+			add (string_of_int (String.length s));
+			addc ':';
+			add s
+	in
+	let cache = ValueHashtbl.create 0 in
+	let cache_length = ref 0 in
+	let cache v f =
+		try
+			let i = ValueHashtbl.find cache v in
+			addc 'r';
+			add (string_of_int i)
+		with Not_found ->
+			let i = !cache_length in
+			ValueHashtbl.add cache v i;
+			incr cache_length;
+			f()
+	in
+	let function_count = ref 0 in
+	let rec loop v = match v with
+		| VNull -> addc 'n'
+		| VTrue -> addc 't'
+		| VFalse -> addc 'f'
+		| VInt32 i when i = Int32.zero -> addc 'z'
+		| VInt32 i ->
+			addc 'i';
+			add (Int32.to_string i)
+		| VFloat f ->
+			if f = neg_infinity then addc 'm'
+			else if f = infinity then addc 'p'
+			else if f <> f then addc 'k'
+			else begin
+				addc 'd';
+				add (string_of_float f)
+			end
+		| VEnumValue ve ->
+			cache v (fun () ->
+				addc 'j';
+				adds (rev_hash ve.epath);
+				addc ':';
+				add (string_of_int ve.eindex);
+				addc ':';
+				add (string_of_int (Array.length ve.eargs));
+				Array.iter loop ve.eargs;
+			)
+		| VObject o ->
+			cache v (fun () ->
+				addc 'o';
+				let fields = object_fields o in
+				loop_fields fields;
+				addc 'g'
+			)
+		| VInstance {ikind = IDate f} ->
+			cache v (fun () ->
+				addc 'v';
+				add ((s_date f).sstring)
+			)
+		| VInstance {ikind = IStringMap map} ->
+			cache v (fun() ->
+				addc 'b';
+				StringHashtbl.iter (fun s (_,value) ->
+					adds s;
+					loop value
+				) map;
+				addc 'h'
+			)
+		| VInstance {ikind = IIntMap map} ->
+			cache v (fun () ->
+				addc 'q';
+				IntHashtbl.iter (fun i value ->
+					addc ':';
+					add (string_of_int i);
+					loop value
+				) map;
+				addc 'h'
+			)
+		| VInstance {ikind = IObjectMap map} ->
+			cache v (fun() ->
+				addc 'M';
+				ValueHashtbl.iter (fun key value ->
+					loop key;
+					loop value
+				) (Obj.magic map);
+				addc 'h'
+			)
+		| VInstance {ikind = IBytes b} ->
+			cache v (fun () ->
+				addc 's';
+				let base64_chars = [|
+					'A';'B';'C';'D';'E';'F';'G';'H';'I';'J';'K';'L';'M';'N';'O';'P';
+					'Q';'R';'S';'T';'U';'V';'W';'X';'Y';'Z';'a';'b';'c';'d';'e';'f';
+					'g';'h';'i';'j';'k';'l';'m';'n';'o';'p';'q';'r';'s';'t';'u';'v';
+					'w';'x';'y';'z';'0';'1';'2';'3';'4';'5';'6';'7';'8';'9';'%';':'
+				|] in
+				let s = Bytes.unsafe_to_string (Base64.str_encode ~tbl:(base64_chars) (Bytes.unsafe_to_string b)) in
+				add (string_of_int (String.length s));
+				addc ':';
+				add s
+			)
+		| VInstance i ->
+			cache v (fun () ->
+				addc 'c';
+				adds (rev_hash i.iproto.ppath);
+				let fields = instance_fields i in
+				loop_fields fields;
+				addc 'g';
+			)
+		| VString s ->
+			adds s.sstring
+		| VArray {avalues = a} | VVector a ->
+			cache v (fun () ->
+				addc 'a';
+				let nulls null_count =
+					if null_count > 0 then begin
+						addc 'u';
+						add (string_of_int null_count);
+					end
+				in
+				let rec loop2 null_count vl = match vl with
+					| VNull :: vl -> loop2 (null_count + 1) vl
+					| v :: vl ->
+						nulls null_count;
+						loop v;
+						loop2 0 vl
+					| [] ->
+						nulls null_count
+				in
+				loop2 0 (Array.to_list a);
+				addc 'h'
+			)
+		| VPrototype {pkind = PClass _; ppath = path} ->
+			addc 'A';
+			adds (rev_hash path)
+		| VPrototype {pkind = PEnum _; ppath = path} ->
+			addc 'B';
+			adds (rev_hash path)
+		| VPrototype _ ->
+			assert false
+		| VFunction _ | VFieldClosure _ ->
+			(* Custom format: enumerate functions as F0, F1 etc. *)
+			cache v (fun () ->
+				addc 'F';
+				add (string_of_int !function_count);
+				incr function_count
+			)
+		| VLazy f ->
+			loop (!f())
+	and loop_fields fields =
+		List.iter (fun (name,v) ->
+			adds (rev_hash name);
+			loop v;
+		) fields
+	in
+	loop v;
+	Digest.string (Buffer.contents buf)
+
+let prepare_callback v n =
+	match v with
+	| VFunction _ | VFieldClosure _ ->
+		let ctx = get_ctx() in
+		(fun args -> match catch_exceptions ctx (fun() -> call_value v args) null_pos with
+			| Some v -> v
+			| None -> vnull)
+	| _ ->
+		raise Invalid_expr
+
+let init ctx = ()
+
+let setup get_api =
+	let api = get_api (fun() -> (get_ctx()).curapi.get_com()) (fun() -> (get_ctx()).curapi) in
+	List.iter (fun (n,v) -> match v with
+		| VFunction(f,b) ->
+			let f vl = try
+				f vl
+			with
+			| Sys_error msg | Failure msg | Invalid_argument msg ->
+				exc_string msg
+			| MacroApi.Invalid_expr ->
+				exc_string "Invalid expression"
+			in
+			let v = VFunction (f,b) in
+			Hashtbl.replace GlobalState.macro_lib n v
+		| _ -> assert false
+	) api;
+	Globals.macro_platform := Globals.Eval
+
+let do_reuse ctx api =
+	ctx.curapi <- api;
+	ctx.static_prototypes#reset
+
+let set_error ctx b =
+	(* TODO: Have to reset this somewhere if running compilation server. But where... *)
+	ctx.had_error <- b
+
+let add_types ctx types ready =
+	if not ctx.had_error then ignore(catch_exceptions ctx (fun () -> ignore(add_types ctx types ready)) null_pos)
+
+let compiler_error msg pos =
+	let vi = encode_instance key_haxe_macro_Error in
+	match vi with
+	| VInstance i ->
+		set_instance_field i key_message (EvalString.create_unknown msg);
+		set_instance_field i key_pos (encode_pos pos);
+		exc vi
+	| _ ->
+		assert false
+
+let rec value_to_expr v p =
+	let path i =
+		let mt = IntMap.find i (get_ctx()).type_cache in
+		let make_path t =
+			let rec loop = function
+				| [] -> assert false
+				| [name] -> (EConst (Ident name),p)
+				| name :: l -> (EField (loop l,name),p)
+			in
+			let t = t_infos t in
+			loop (List.rev (if t.mt_module.m_path = t.mt_path then fst t.mt_path @ [snd t.mt_path] else fst t.mt_module.m_path @ [snd t.mt_module.m_path;snd t.mt_path]))
+		in
+		make_path mt
+	in
+	match vresolve v with
+	| VNull -> (EConst (Ident "null"),p)
+	| VTrue -> (EConst (Ident "true"),p)
+	| VFalse -> (EConst (Ident "false"),p)
+	| VInt32 i -> (EConst (Int (Int32.to_string i)),p)
+	| VFloat f -> haxe_float f p
+	| VString s -> (EConst (String(s.sstring,SDoubleQuotes)),p)
+	| VArray va -> (EArrayDecl (List.map (fun v -> value_to_expr v p) (EvalArray.to_list va)),p)
+	| VObject o -> (EObjectDecl (ExtList.List.filter_map (fun (k,v) ->
+			let n = rev_hash k in
+			(* Workaround for #8261: Ignore generated pos fields *)
+			begin match v with
+			| VInstance {ikind = IPos _} when n = "pos" -> None
+			| _ -> Some ((n,p,(if Lexer.is_valid_identifier n then NoQuotes else DoubleQuotes)),(value_to_expr v p))
+			end
+		) (object_fields o)),p)
+	| VEnumValue e ->
+		let epath =
+			let proto = get_static_prototype_raise (get_ctx()) e.epath in
+			let expr = path e.epath in
+			let name = match proto.pkind with
+				| PEnum names -> fst (List.nth names e.eindex)
+				| _ -> assert false
+			in
+			(EField (expr, name), p)
+		in
+		begin
+			match e.eargs with
+			| [||] -> epath
+			| _ ->
+				let args = List.map (fun v -> value_to_expr v p) (Array.to_list e.eargs) in
+				(ECall (epath, args), p)
+		end
+	| _ -> exc_string ("Cannot convert " ^ (value_string v) ^ " to expr")
+
+let encode_obj = encode_obj_s
+
+let field v f = field v (EvalHash.hash f)
+
+let value_string = value_string
+
+let exc_string = exc_string
+
+let eval_expr ctx e = if ctx.had_error then None else eval_expr ctx EKEntrypoint e
+
+let handle_decoding_error f v t =
+	let line = ref 1 in
+	let errors = ref [] in
+	let error msg v =
+		errors := (msg,!line) :: !errors;
+		f (Printf.sprintf "%s <- %s" (value_string v) msg)
+	in
+	let rec loop tabs t v =
+		match t with
+		| TAnon an ->
+			f "{";
+			PMap.iter (fun _ cf ->
+				incr line;
+				f (Printf.sprintf "\n%s%s: " (tabs ^ "\t") cf.cf_name);
+				try
+					let vf = field_raise v (EvalHash.hash cf.cf_name) in
+					begin match vf with
+					| VNull when not (is_explicit_null cf.cf_type) -> error "expected value" vf
+					| _ -> loop (tabs ^ "\t") cf.cf_type vf
+					end
+				with Not_found ->
+					if not (is_explicit_null cf.cf_type) then error "expected value" VNull
+					else f "null"
+			) an.a_fields;
+			incr line;
+			f (Printf.sprintf "\n%s}" tabs)
+		| TInst({cl_path=[],"Array"},[t1]) ->
+			begin match v with
+				| VArray va ->
+					f "[";
+					let _ = List.fold_left (fun first v ->
+						if not first then f ", ";
+						loop tabs t1 v;
+						false
+					) true (EvalArray.to_list va) in
+					f "]"
+				| _ -> error "expected Array" v
+			end
+		| TInst({cl_path=[],"String"},_) ->
+			begin match v with
+				| VString _ -> f (value_string v)
+				| _ -> error "expected String" v
+			end
+		| TAbstract({a_path=[],"Null"},[t1]) ->
+			if v = VNull then f "null" else loop tabs t1 v
+		| TAbstract({a_path=[],"Bool"},_) ->
+			begin match v with
+				| VTrue -> f "true"
+				| VFalse -> f "false"
+				| _ -> error "expected Bool" v
+			end
+		| TAbstract({a_path=[],("Int" | "Float")},_) ->
+			begin match v with
+				| VInt32 _ | VFloat _ -> f (value_string v)
+				| _ -> error "expected Bool" v
+			end
+		| TType(t,tl) ->
+			loop tabs (apply_params t.t_params tl t.t_type) v
+		| TAbstract({a_path=["haxe";"macro"],"Position"},_) ->
+			begin match v with
+				| VInstance {ikind=IPos _} -> f "#pos"
+				| _ -> error "expected Position" v
+			end
+		| TEnum(en,_) ->
+			begin match v with
+				| VEnumValue ev ->
+					let ef = PMap.find (List.nth en.e_names ev.eindex) en.e_constrs in
+					f ef.ef_name;
+					let rec loop2 first tl vl = match tl,vl with
+						| _,[] -> ()
+						| [],_ -> ()
+						| (_,_,t) :: tl,v :: vl ->
+							if not first then f ", ";
+							loop tabs t v;
+							loop2 false tl vl
+					in
+					begin match follow ef.ef_type,Array.to_list ev.eargs with
+						| _,[] ->
+							()
+						| TFun(tl,_),vl ->
+							 f "(";
+							loop2 true tl vl;
+							f ")"
+						| _ -> ()
+					end
+				| _ -> error "expected enum value" v
+			end
+		| TInst _ | TAbstract _ | TFun _ ->
+			(* TODO: might need some more of these, not sure *)
+			assert false
+		| TMono r ->
+			begin match !r with
+				| None -> ()
+				| Some t -> loop tabs t v
+			end
+		| TLazy r ->
+			loop tabs (lazy_type r) v
+		| TDynamic _ ->
+			()
+	in
+	loop "" t v;
+	!errors
+
+let get_api_call_pos () =
+	let eval = get_eval (get_ctx()) in
+	let env = Option.get eval.env in
+	let env = match env.env_parent with
+		| None -> env
+		| Some env -> env
+	in
+	{ pfile = rev_hash env.env_info.pfile; pmin = env.env_leave_pmin; pmax = env.env_leave_pmax }
\ No newline at end of file
diff --git a/src/macro/eval/evalMisc.ml b/src/macro/eval/evalMisc.ml
new file mode 100644
index 0000000000000000000000000000000000000000..86dbf27af84dd774f640fdaae8ac0bebcb6a17ed
--- /dev/null
+++ b/src/macro/eval/evalMisc.ml
@@ -0,0 +1,256 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open Ast
+open Type
+open EvalValue
+open EvalContext
+open EvalEncode
+open EvalDecode
+open EvalExceptions
+open EvalPrinting
+open EvalHash
+open EvalString
+
+let throw_string s p =
+	throw (create_unknown s) p
+
+let invalid_binop op v1 v2 p =
+	throw_string (Printf.sprintf "Invalid operation: %s %s %s" (value_string v1) (s_binop op) (value_string v2)) p
+
+let update_object_prototype o fields =
+	let ctx = get_ctx() in
+	let proto,fields = ctx.get_object_prototype (get_ctx()) fields in
+	o.ofields <- Array.of_list (List.map snd fields);
+	o.oproto <- proto
+
+(* Calls *)
+
+let call_value v vl =
+	match v with
+	| VFunction(f,_) ->	 call_function f vl
+	| VFieldClosure(v1,f) -> call_function f (v1 :: vl)
+	| VInstance {ikind = ILazyType(_,get)} -> get()
+	| _ -> exc_string ("Cannot call " ^ (value_string v))
+
+(* Field setters *)
+
+let set_proto_field proto name v2 =
+	proto.pfields.(get_proto_field_index_raise proto name) <- v2
+
+let set_instance_field vi name v2 =
+	vi.ifields.(get_instance_field_index_raise vi.iproto name) <- v2
+
+let set_object_field o name v2 =
+	try
+		o.ofields.(get_instance_field_index_raise o.oproto name) <- v2;
+	with Not_found ->
+		let fields = IntMap.fold (fun name i acc -> (name,o.ofields.(i)) :: acc) o.oproto.pinstance_names [] in
+		let fields = (name,v2) :: fields in
+		update_object_prototype o fields
+
+let set_bytes_length_field v1 v2 =
+	match v1 with
+	| VInstance ({ikind=IBytes b} as vi) ->
+		let i = decode_int v2 in
+		let b' = Bytes.create i in
+		Bytes.blit b 0 b' 0 (if i > Bytes.length b then Bytes.length b else i);
+		vi.ikind <- IBytes b'
+	| _ -> unexpected_value v1 "bytes"
+
+let set_field v1 name v2 = match vresolve v1 with
+	| VObject o -> set_object_field o name v2
+	| VPrototype proto -> set_proto_field proto name v2
+	| VArray va ->
+		(* Vector.new does this *)
+		if name = key_length then begin
+			EvalArray.set_length va (decode_int v2);
+		end else
+			unexpected_value v1 "object"
+	| VInstance {ikind = IBytes _} -> set_bytes_length_field v1 v2
+	| VInstance vi -> set_instance_field vi name v2
+	| _ -> unexpected_value v1 "object"
+
+(* Equality/compare *)
+
+let fcmp (a:float) b = if a = b then CEq else if a < b then CInf else if a > b then CSup else CUndef
+
+let icmp (a:int32) b = let l = Int32.compare a b in if l = 0 then CEq else if l < 0 then CInf else CSup
+
+let rec compare a b =
+	match a, b with
+	| VNull,VNull -> CEq
+	| VInt32 a,VInt32 b -> icmp a b
+	| VFloat a,VFloat b -> fcmp a b
+	| VFloat a,VInt32 b -> fcmp a (Int32.to_float b)
+	| VInt32 a,VFloat b -> fcmp (Int32.to_float a) b
+	| VTrue,VTrue | VFalse,VFalse -> CEq
+	| VFalse,VTrue -> CInf
+	| VTrue,VFalse -> CSup
+	| VString s1,VString s2 ->
+		let s1' = s1.sstring in
+		let s2' = s2.sstring in
+		let r = String.compare s1' s2' in
+		if r = 0 then CEq else if r < 0 then CInf else CSup
+	| VFunction(a,_), VFunction(b,_) -> if a == b then CEq else CUndef
+	| VArray va1,VArray va2 -> if va1 == va2 then CEq else CUndef
+	| VVector vv1,VVector vv2 -> if vv1 == vv2 then CEq else CUndef
+	| VObject a,VObject b -> if a == b then CEq else CUndef
+	| VInstance a,VInstance b -> if a == b then CEq else CUndef
+	| VPrototype a,VPrototype b -> if a == b then CEq else CUndef
+	| VEnumValue a,VEnumValue b ->
+		if a == b then CEq
+		else if a.eindex < b.eindex then CInf
+		else if a.eindex > b.eindex then CSup
+		else if a.epath <> b.epath then CUndef
+		else if Array.length a.eargs = 0 && Array.length b.eargs = 0 then CEq
+		else CUndef
+	| VFieldClosure(v1,f1),VFieldClosure(v2,f2) ->
+		if f1 != f2 then CUndef
+		else compare v1 v2
+	| VLazy f1,_ ->
+		compare (!f1()) b
+	| _,VLazy f2 ->
+		compare a (!f2())
+	| _ -> CUndef
+
+let rec arrays_equal cmp a1 a2 =
+	if Array.length a1 <> Array.length a2 then
+		false
+	else begin
+		let rec loop i =
+			if i = Array.length a1 then true
+			else if not (cmp a1.(i) a2.(i)) then false
+			else loop (i + 1)
+		in
+		loop 0
+	end
+
+and equals_structurally a b =
+	match a,b with
+	| VInt32 a,VInt32 b -> Int32.compare a b = 0
+	| VFloat a,VFloat b -> a = b
+	| VFloat a,VInt32 b -> a = (Int32.to_float b)
+	| VInt32 a,VFloat b -> (Int32.to_float a) = b
+	| VString s1,VString s2 -> s1.sstring = s2.sstring (* STODO *)
+	| VArray a,VArray b -> a == b || arrays_equal equals_structurally a.avalues b.avalues
+	| VVector a,VVector b -> a == b || arrays_equal equals_structurally a b
+	| VObject a,VObject b -> a == b || arrays_equal equals_structurally a.ofields b.ofields
+	| VEnumValue a,VEnumValue b -> a == b || a.eindex = b.eindex && arrays_equal equals_structurally a.eargs b.eargs && a.epath = b.epath
+	| VPrototype proto1,VPrototype proto2 -> proto1.ppath = proto2.ppath
+	| VLazy f1,_ -> equals_structurally (!f1()) b
+	| _,VLazy f2 -> equals_structurally a (!f2())
+	| _ -> a == b
+
+let is_true v = match v with
+	| VTrue -> true
+	| _ -> false
+
+let op_add p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> vint32 (Int32.add i1 i2)
+	| VFloat f1,VFloat f2 -> vfloat (f1 +. f2)
+	| VInt32 i,VFloat f | VFloat f,VInt32 i -> vfloat ((Int32.to_float i) +. f)
+	| VString s1,VString s2 -> vstring (concat s1 s2)
+	| VString s1,v2 -> vstring (concat s1 (s_value 0 v2))
+	| v1,VString s2 -> vstring (concat (s_value 0 v1) s2)
+	| v1,v2 -> invalid_binop OpAdd v1 v2 p
+
+let op_mult p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> vint32 (Int32.mul i1 i2)
+	| VFloat f1,VFloat f2 -> vfloat (f1 *. f2)
+	| VInt32 i,VFloat f | VFloat f,VInt32 i -> vfloat ((Int32.to_float i) *. f)
+	| _ -> invalid_binop OpMult v1 v2 p
+
+let op_div p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> vfloat ((Int32.to_float i1) /. (Int32.to_float i2))
+	| VFloat f1,VFloat f2 -> vfloat (f1 /. f2)
+	| VInt32 i1,VFloat f2 -> vfloat ((Int32.to_float i1) /. f2)
+	| VFloat f1,VInt32 i2 -> vfloat (f1 /. (Int32.to_float i2))
+	| _ -> invalid_binop OpDiv v1 v2 p
+
+let op_sub p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> vint32 (Int32.sub i1 i2)
+	| VFloat f1,VFloat f2 -> vfloat (f1 -. f2)
+	| VInt32 i1,VFloat f2 -> vfloat ((Int32.to_float i1) -. f2)
+	| VFloat f1,VInt32 i2 -> vfloat (f1 -. (Int32.to_float i2))
+	| _ -> invalid_binop OpSub v1 v2 p
+
+let op_eq v1 v2 = vbool (equals v1 v2)
+
+let op_not_eq v1 v2 = vbool (not (equals v1 v2))
+
+let op_gt v1 v2 = vbool (compare v1 v2 = CSup)
+
+let op_gte v1 v2 = vbool (match compare v1 v2 with CSup | CEq -> true | _ -> false)
+
+let op_lt v1 v2 = vbool (compare v1 v2 = CInf)
+
+let op_lte v1 v2 = vbool (match compare v1 v2 with CInf | CEq -> true | _ -> false)
+
+let op_and p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> vint32 (Int32.logand i1 i2)
+	| _ -> invalid_binop OpAnd v1 v2 p
+
+let op_or p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> vint32 (Int32.logor i1 i2)
+	| _ -> invalid_binop OpOr v1 v2 p
+
+let op_xor p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> vint32 (Int32.logxor i1 i2)
+	| _ -> invalid_binop OpXor v1 v2 p
+
+let op_shl p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> vint32 (Int32.shift_left i1 (Int32.to_int i2))
+	| _ -> invalid_binop OpShl v1 v2 p
+
+let op_shr p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> vint32 (Int32.shift_right i1 (Int32.to_int i2))
+	| _ -> invalid_binop OpShr v1 v2 p
+
+let op_ushr p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> vint32 (Int32.shift_right_logical i1 (Int32.to_int i2))
+	| _ -> invalid_binop OpUShr v1 v2 p
+
+let op_mod p v1 v2 = match v1,v2 with
+	| VInt32 i1,VInt32 i2 -> (try vint32 (Int32.rem i1 i2) with Division_by_zero -> vfloat nan)
+	| VFloat f1,VFloat f2 -> vfloat (mod_float f1 f2)
+	| VInt32 i1,VFloat f2 -> vfloat (mod_float (Int32.to_float i1) f2)
+	| VFloat f1,VInt32 i2 -> vfloat (mod_float f1 (Int32.to_float i2))
+	| _ -> invalid_binop OpMod v1 v2 p
+
+let get_binop_fun op p = match op with
+	| OpAdd -> op_add p
+	| OpMult -> op_mult p
+	| OpDiv -> op_div p
+	| OpSub -> op_sub p
+	| OpEq -> op_eq
+	| OpNotEq -> op_not_eq
+	| OpGt -> op_gt
+	| OpGte -> op_gte
+	| OpLt -> op_lt
+	| OpLte -> op_lte
+	| OpAnd -> op_and p
+	| OpOr -> op_or p
+	| OpXor -> op_xor p
+	| OpShl -> op_shl p
+	| OpShr -> op_shr p
+	| OpUShr -> op_ushr p
+	| OpMod -> op_mod p
+	| OpAssign | OpBoolAnd | OpBoolOr | OpAssignOp _ | OpInterval | OpArrow | OpIn -> assert false
diff --git a/src/macro/eval/evalPrinting.ml b/src/macro/eval/evalPrinting.ml
new file mode 100644
index 0000000000000000000000000000000000000000..3c0ce3cda6538a968a4b7608df3df25313eb08db
--- /dev/null
+++ b/src/macro/eval/evalPrinting.ml
@@ -0,0 +1,147 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open Type
+open EvalValue
+open EvalContext
+open EvalField
+open EvalHash
+open EvalString
+
+let rempty = create_ascii ""
+let rbropen = create_ascii "{"
+let rbrclose = create_ascii "}"
+let rbkopen = create_ascii "["
+let rbkclose = create_ascii "]"
+let rpopen = create_ascii "("
+let rpclose = create_ascii ")"
+let rcolon = create_ascii ":"
+let rgt = create_ascii ">"
+let rstop = create_ascii "<...>"
+let rnull = create_ascii "null"
+let rcomma = create_ascii ","
+let rtrue = create_ascii "true"
+let rfalse = create_ascii "false"
+let rfun = create_ascii "#fun"
+let rclosure = create_ascii "#closure"
+
+let s_date d =
+	let open Unix in
+	let t = localtime d in
+	create_ascii (Printf.sprintf "%.4d-%.2d-%.2d %.2d:%.2d:%.2d" (t.tm_year + 1900) (t.tm_mon + 1) t.tm_mday t.tm_hour t.tm_min t.tm_sec)
+
+let s_hash key = create_ascii (EvalHash.rev_hash key)
+
+let rec s_object depth o =
+	let fields = object_fields o in
+	let buf = Buffer.create 0 in
+	Buffer.add_string buf "{";
+	List.iteri (fun i (k,v) ->
+		if i > 0 then Buffer.add_string buf ", ";
+		Buffer.add_string buf (rev_hash k);
+		Buffer.add_string buf ": ";
+		Buffer.add_string buf (s_value depth v).sstring;
+	) fields;
+	Buffer.add_string buf "}";
+	let s = Buffer.contents buf in
+	create_with_length s (try UTF8.length s with _ -> String.length s)
+
+and s_array depth va =
+	join rempty [
+		rbkopen;
+		EvalArray.join va (s_value depth) rcomma;
+		rbkclose;
+	]
+
+and s_vector depth vv =
+	join rempty [
+		rbkopen;
+		EvalArray.join (EvalArray.create vv) (s_value depth) rcomma;
+		rbkclose;
+	]
+
+and s_enum_ctor_name ve =
+	try
+		begin match (get_static_prototype_raise (get_ctx()) ve.epath).pkind with
+			| PEnum names -> (try fst (List.nth names ve.eindex) with _ -> "#unknown")
+			| _ -> raise Not_found
+		end
+	with Not_found -> "#unknown"
+
+and s_enum_value depth ve =
+	let name = s_enum_ctor_name ve in
+	match ve.eargs with
+	| [||] -> create_ascii name
+	| vl ->
+		join rempty [
+			create_ascii name;
+			rpopen;
+			join rcomma (Array.to_list (Array.map (s_value (depth + 1)) vl));
+			rpclose;
+		]
+
+and s_proto_kind proto = match proto.pkind with
+	| PClass _ -> join rempty [create_ascii "Class<"; s_hash proto.ppath; rgt]
+	| PEnum _ -> join rempty [create_ascii "Enum<"; s_hash proto.ppath; rgt]
+	| PInstance | PObject -> assert false
+
+and s_value depth v =
+	let call_to_string () =
+		let vf = field_raise v EvalHash.key_toString in
+		s_value (depth + 1) (call_value_on v vf [])
+	in
+	if depth > 5 then rstop
+	else match v with
+	| VNull -> rnull
+	| VInt32 i32 -> create_ascii(Int32.to_string i32)
+	| VTrue -> rtrue
+	| VFalse -> rfalse
+	| VFloat f ->
+		let s = Numeric.float_repres f in
+		let len = String.length s in
+		create_ascii (if String.unsafe_get s (len - 1) = '.' then String.sub s 0 (len - 1) else s)
+	| VFunction (f,_) -> rfun
+	| VFieldClosure _ -> rclosure
+	| VEnumValue ve -> s_enum_value depth ve
+	| VString s -> s
+	| VArray va -> s_array (depth + 1) va
+	| VVector vv -> s_vector (depth + 1) vv
+	| VInstance {ikind=IDate d} -> s_date d
+	| VInstance {ikind=IPos p} -> create_ascii ("#pos(" ^ Lexer.get_error_pos (Printf.sprintf "%s:%d:") p ^ ")") (* STODO: not ascii? *)
+	| VInstance {ikind=IRegex r} -> r.r_rex_string
+	| VInstance i -> (try call_to_string () with Not_found -> s_hash i.iproto.ppath)
+	| VObject o -> (try call_to_string () with Not_found -> s_object (depth + 1) o)
+	| VLazy f -> s_value depth (!f())
+	| VPrototype proto ->
+		try
+			call_to_string()
+		with Not_found ->
+			s_proto_kind proto
+
+and call_value_on vthis v vl =
+	match v with
+	| VFunction(f,b) ->
+		let vl = if not b then vthis :: vl else vl in
+		call_function f vl
+	| VFieldClosure(v1,f) -> call_function f (v1 :: vl)
+	| _ -> exc_string ("Cannot call " ^ (value_string v))
+
+and value_string v =
+	(s_value 0 v).sstring
diff --git a/src/macro/eval/evalPrototype.ml b/src/macro/eval/evalPrototype.ml
new file mode 100644
index 0000000000000000000000000000000000000000..a22c12f7858b5a7f4fac6a272129d052b0886bcc
--- /dev/null
+++ b/src/macro/eval/evalPrototype.ml
@@ -0,0 +1,362 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open Type
+open EvalValue
+open EvalContext
+open EvalEncode
+open EvalHash
+open EvalJit
+open EvalJitContext
+open EvalExceptions
+open EvalMisc
+
+(* JITs expression [e] and executes the result immediately. *)
+let eval_expr ctx kind e =
+	catch_exceptions ctx (fun () ->
+		let jit,f = jit_expr ctx e in
+		let num_captures = Hashtbl.length jit.captures in
+		let info = create_env_info true e.epos.pfile kind jit.capture_infos in
+		let env = push_environment ctx info jit.max_num_locals num_captures in
+		Std.finally (fun _ -> pop_environment ctx env) f env
+	) e.Type.epos
+
+(* Creates constructor function for class [c], if it has a constructor. *)
+let create_constructor ctx c =
+	match c.cl_constructor with
+	| Some {cf_expr = Some {eexpr = TFunction tf; epos = pos}} when not c.cl_extern ->
+		let key = path_hash c.cl_path in
+		let v = lazy (vfunction (jit_tfunction ctx key key_new tf false pos)) in
+		ctx.constructors <- IntMap.add key v ctx.constructors;
+	| _ ->
+		()
+
+(*
+	PrototypeBuilder manages the intermediate state of prototypes. Due to mutual dependencies,
+	prototypes have to be created in multiple steps similar to how types have to be loaded.
+
+	The procedure is as follows:
+
+	1. Create an instance of [prototype_context] using [create].
+	2. Add fields to it and call [finalize].
+	3. Invoke the function returned by [finalize] to initialize fields.
+*)
+module PrototypeBuilder = struct
+	type prototype_context = {
+		ctx : context;
+		(* The hashed path of the prototype. *)
+		key : int;
+		(* The parent prototype, if exists. *)
+		parent : vprototype option;
+		(* The kind of the prototype. *)
+		kind : vprototype_kind;
+		(* The fields of the prototype. A field here is a pair of its hashed name and its (lazyfied) value. *)
+		fields : (int * value Lazy.t) DynArray.t;
+		(* The instance fields of the prototype. See above. *)
+		instance_fields : (int * value Lazy.t) DynArray.t;
+		(* The metadata expression, if exists. *)
+		meta : texpr option;
+		(* Whether or not the prototype is static. *)
+		is_static : bool;
+	}
+
+	(* Creates a new prototype context using the provided information. *)
+	let create ctx key parent kind meta =
+		let is_static = match kind with PClass _ | PEnum _ -> true | PInstance | PObject -> false in
+		{
+			ctx = ctx;
+			key = key;
+			parent = parent;
+			kind = kind;
+			fields = DynArray.create ();
+			instance_fields = DynArray.create ();
+			meta = meta;
+			is_static = is_static;
+		}
+
+	(* Adds a prototype (static) field. *)
+	let add_proto_field pctx name v =
+		DynArray.add pctx.fields (name,v)
+
+	(* Adds an instance (non-static) field. *)
+	let add_instance_field pctx name v =
+		DynArray.add pctx.instance_fields (name,v)
+
+	(* Forces the lazy field values and assigns them to the prototype. *)
+	let initialize_fields pctx proto =
+		DynArray.iteri (fun i (_,v) -> proto.pfields.(i) <- Lazy.force v) pctx.fields
+
+	(* Processes the field information and returns an initialization function. *)
+	let finalize pctx =
+		let ctx = pctx.ctx in
+		(* Add builtins (from EvalStdLib). *)
+		let builtins = try IntMap.find pctx.key (if pctx.is_static then ctx.builtins.static_builtins else ctx.builtins.instance_builtins) with Not_found -> [] in
+		List.iter (fun (s,v) ->
+			try
+				let i = DynArray.index_of (fun (name',_) -> name' = s) pctx.fields in
+				DynArray.set pctx.fields i (s,(lazy v))
+			with Not_found ->
+				add_proto_field pctx s (lazy v)
+		) builtins;
+		(* Add metadata field *)
+		begin match pctx.meta with
+			| None -> ()
+			| Some e -> DynArray.add pctx.fields (key___meta__,lazy (match eval_expr ctx (EKMethod(pctx.key,key___meta__)) e with Some e -> e | None -> vnull))
+		end;
+		(* Create the mapping from hashed name to field offset for prototype fields. *)
+		let _,pnames = DynArray.fold_left (fun (i,acc) (name,_) -> i + 1,IntMap.add name i acc) (0,IntMap.empty) pctx.fields in
+		let pinstance_names,pinstance_fields,f = if not pctx.is_static then begin
+			(* Combines parent instance fields with current instance fields. *)
+			let names,fields = match pctx.parent with
+				| Some proto -> proto.pinstance_names,proto.pinstance_fields
+				| None -> IntMap.empty,[||]
+			in
+			let offset = Array.length fields in
+			let a = Array.make (offset + DynArray.length pctx.instance_fields) vnull in
+			Array.blit fields 0 a 0 (offset);
+			(* Create the mapping from hashed name to field offset for instance fields. *)
+			let names,_ = DynArray.fold_left (fun (fields,count) (name,v) ->
+				IntMap.add name count fields,count + 1
+			) (names,offset) pctx.instance_fields in
+			names,a,(fun proto ->
+				Array.iteri (fun i v -> a.(i) <- v) fields;
+				DynArray.iteri (fun i (_,v) -> a.(i + offset) <- Lazy.force v) pctx.instance_fields;
+				initialize_fields pctx proto;
+			)
+		end else
+			IntMap.empty,[||],(fun proto ->
+				initialize_fields pctx proto;
+			)
+		in
+		(* Create the prototype. *)
+		let proto = {
+			ppath = pctx.key;
+			pfields = Array.make (DynArray.length pctx.fields) vnull;
+			pnames = pnames;
+			pinstance_fields = pinstance_fields;
+			pinstance_names = pinstance_names;
+			pparent = pctx.parent;
+			pkind = pctx.kind;
+			pvalue = vnull;
+		} in
+		proto.pvalue <- vprototype proto;
+		(* Register the prototype. *)
+		if pctx.is_static then
+			ctx.static_prototypes#add proto
+		else begin
+			ctx.instance_prototypes <- IntMap.add pctx.key proto ctx.instance_prototypes;
+			if pctx.key = key_String then ctx.string_prototype <- proto
+			else if pctx.key = key_Array then ctx.array_prototype <- proto
+			else if pctx.key = key_eval_Vector then ctx.vector_prototype <- proto
+		end;
+		proto,f
+end
+
+let is_removable_field cf =
+	has_class_field_flag cf CfExtern || Meta.has Meta.Generic cf.cf_meta
+
+let is_persistent cf =
+	Meta.has Meta.Persistent cf.cf_meta
+
+let create_static_prototype ctx mt =
+	let path = (t_infos mt).mt_path in
+	let key = path_hash path in
+	let com = ctx.curapi.MacroApi.get_com() in
+	let meta = Texpr.build_metadata com.Common.basic mt in
+	let o = match mt with
+	| TClassDecl c ->
+		let pparent = match c.cl_super with
+			| None -> None
+			| Some(csup,_) -> Some (get_static_prototype ctx (path_hash csup.cl_path) c.cl_pos)
+		in
+		let rec collect_interfaces acc (c,_) =
+			let acc = List.fold_left (fun acc c -> collect_interfaces acc c) acc c.cl_implements in
+			path_hash c.cl_path :: acc
+		in
+		let interfaces = collect_interfaces [] (c,[]) in
+		let pctx = PrototypeBuilder.create ctx key pparent (PClass interfaces) meta in
+		let fields = List.filter (fun cf -> not (is_removable_field cf)) c.cl_ordered_statics in
+		let delays = DynArray.create() in
+		if not c.cl_extern then List.iter (fun cf -> match cf.cf_kind,cf.cf_expr with
+			| Method _,Some {eexpr = TFunction tf; epos = pos} ->
+				let name = hash cf.cf_name in
+				PrototypeBuilder.add_proto_field pctx name (lazy (vstatic_function (jit_tfunction ctx key name tf true pos)));
+			| Var _,Some e ->
+				let name = hash cf.cf_name in
+				PrototypeBuilder.add_proto_field pctx name (lazy vnull);
+				let i = DynArray.length pctx.PrototypeBuilder.fields - 1 in
+				let persistent = is_persistent cf in
+				DynArray.add delays (persistent,(fun proto ->
+					proto.pfields.(i) <- (match eval_expr ctx (EKMethod(key,name)) e with Some e -> e | None -> vnull)
+				))
+			| _,None when is_physical_field cf ->
+				PrototypeBuilder.add_proto_field pctx (hash cf.cf_name) (lazy vnull);
+			|  _ ->
+				()
+		) fields;
+		begin match c.cl_init with
+			| None -> ()
+			| Some e -> DynArray.add delays (false,(fun _ -> ignore(eval_expr ctx (EKMethod(key,key___init__)) e)))
+		end;
+		PrototypeBuilder.finalize pctx,(DynArray.to_list delays)
+	| TEnumDecl en ->
+		let names = List.map (fun name ->
+			let ef = PMap.find name en.e_constrs in
+			let args = match follow ef.ef_type with
+				| TFun(args,_) ->
+					List.map (fun (n,_,_) -> hash n) args
+				| _ ->
+					[]
+			in
+			name,args
+		) en.e_names in
+		let pctx = PrototypeBuilder.create ctx key None (PEnum names) meta in
+		let enum_field_value ef = match follow ef.ef_type with
+			| TFun(args,_) ->
+				let f = (fun vl -> encode_enum_value key ef.ef_index (Array.of_list vl) (Some ef.ef_pos)) in
+				vstatic_function f
+			| _ -> encode_enum_value key ef.ef_index [||] (Some ef.ef_pos)
+		in
+		PMap.iter (fun name ef -> PrototypeBuilder.add_proto_field pctx (hash name ) (lazy (enum_field_value ef))) en.e_constrs;
+		PrototypeBuilder.finalize pctx,[];
+	| TAbstractDecl a ->
+		let pctx = PrototypeBuilder.create ctx key None (PClass []) meta in
+		PrototypeBuilder.finalize pctx,[];
+	| _ ->
+		assert false
+	in
+	let rec loop v name path = match path with
+		| [] ->
+			set_field v (hash name) (vprototype (fst (fst o)))
+		| s :: sl ->
+			let key = hash s in
+			let v2 = EvalField.field v key in
+			let v2 = match v2 with
+				| VNull -> encode_obj []
+				| _ -> v2
+			in
+			set_field v key v2;
+			loop v2 name sl;
+	in
+	if ctx.debug.support_debugger then
+		loop ctx.toplevel (snd path) (fst path);
+	o
+
+let create_instance_prototype ctx c =
+	let pparent = match c.cl_super with
+		| None -> None
+		| Some(c,_) -> Some (get_instance_prototype ctx (path_hash c.cl_path) c.cl_pos)
+	in
+	let key = path_hash c.cl_path in
+	let pctx = PrototypeBuilder.create ctx key pparent PInstance None in
+	let fields = List.filter (fun cf -> not (is_removable_field cf)) c.cl_ordered_fields in
+	if c.cl_extern && c.cl_path <> ([],"String") then
+		()
+	else List.iter (fun cf -> match cf.cf_kind,cf.cf_expr with
+		| Method meth,Some {eexpr = TFunction tf; epos = pos} ->
+			let name = hash cf.cf_name in
+			let v = lazy (vfunction (jit_tfunction ctx key name tf false pos)) in
+			if meth = MethDynamic then PrototypeBuilder.add_instance_field pctx name v;
+			PrototypeBuilder.add_proto_field pctx name v
+		| Var _,_ when is_physical_field cf ->
+			let name = hash cf.cf_name in
+			PrototypeBuilder.add_instance_field pctx name (lazy vnull);
+		|  _ ->
+			()
+	) fields;
+	PrototypeBuilder.finalize pctx
+
+let get_object_prototype ctx l =
+	let l = List.sort (fun (i1,_) (i2,_) -> if i1 = i2 then 0 else if i1 < i2 then -1 else 1) l in
+	let sfields = String.concat "," (List.map (fun (i,_) -> (Printf.sprintf ":%s" (rev_hash i))) l) in
+	let name = hash (Printf.sprintf "eval.object.Object[%s]" sfields) in
+	try
+		IntMap.find name ctx.instance_prototypes,l
+	with Not_found ->
+		let pctx = PrototypeBuilder.create ctx name None PObject None in
+		List.iter (fun (name,_) -> PrototypeBuilder.add_instance_field pctx name (lazy vnull)) l;
+		let proto = fst (PrototypeBuilder.finalize pctx) in
+		ctx.instance_prototypes <- IntMap.add name proto ctx.instance_prototypes;
+		proto,l
+
+let add_types ctx types ready =
+	let t = Timer.timer [(if ctx.is_macro then "macro" else "interp");"add_types"] in
+	let new_types = List.filter (fun mt ->
+		let inf = Type.t_infos mt in
+		let key = path_hash inf.mt_path in
+		try
+			let inf' = t_infos (IntMap.find key ctx.type_cache) in
+			if inf'.mt_module.m_id <> inf.mt_module.m_id then raise Not_found;
+			false
+		with Not_found ->
+			ctx.instance_prototypes <- IntMap.remove key ctx.instance_prototypes;
+			ctx.static_prototypes#remove key;
+			ctx.constructors <- IntMap.remove key ctx.constructors;
+			ready mt;
+			ctx.type_cache <- IntMap.add key mt ctx.type_cache;
+			if ctx.debug.support_debugger then begin
+				let file_key = hash inf.mt_module.m_extra.m_file in
+				if not (Hashtbl.mem ctx.debug.breakpoints file_key) then begin
+					Hashtbl.add ctx.debug.breakpoints file_key (Hashtbl.create 0)
+				end
+			end;
+			true
+	) types in
+	(* 1. Create prototypes and register them. *)
+	let fl_instance = DynArray.create () in
+	let fl_static = DynArray.create () in
+	List.iter (fun mt ->
+		match mt with
+		| TClassDecl c ->
+			let rec loop p f =
+				match p with
+				| Some (p,_) when PMap.mem f.cf_name p.cl_fields || loop p.cl_super f ->
+					Hashtbl.add ctx.overrides (p.cl_path,f.cf_name) true;
+					true
+				| _ ->
+					false
+			in
+			List.iter (fun f -> ignore(loop c.cl_super f)) c.cl_overrides;
+			create_constructor ctx c;
+			DynArray.add fl_instance (create_instance_prototype ctx c);
+			DynArray.add fl_static (create_static_prototype ctx mt);
+		| TEnumDecl en ->
+			DynArray.add fl_static (create_static_prototype ctx mt);
+		| TAbstractDecl a ->
+			DynArray.add fl_static (create_static_prototype ctx mt);
+		| _ ->
+			()
+	) new_types;
+	(* 2. Create instance fields. *)
+	DynArray.iter (fun (proto,f) -> ignore(f proto)) fl_instance;
+	(* 3. Create static fields. *)
+	let fl_static_init = DynArray.create () in
+	DynArray.iter (fun ((proto,f),delays) ->
+		f proto;
+		match delays with
+		| [] -> ()
+		| _ ->
+			DynArray.add fl_static_init (proto,delays);
+			let non_persistent_delays = ExtList.List.filter_map (fun (persistent,f) -> if not persistent then Some f else None) delays in
+			ctx.static_prototypes#add_init proto non_persistent_delays;
+	) fl_static;
+	(* 4. Initialize static fields. *)
+	DynArray.iter (fun (proto,delays) -> List.iter (fun (_,f) -> f proto) delays) fl_static_init;
+	t()
\ No newline at end of file
diff --git a/src/macro/eval/evalStdLib.ml b/src/macro/eval/evalStdLib.ml
new file mode 100644
index 0000000000000000000000000000000000000000..093406ae07d45fd03a26a2070524eafb9512b9e5
--- /dev/null
+++ b/src/macro/eval/evalStdLib.ml
@@ -0,0 +1,3663 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open EvalValue
+open EvalEncode
+open EvalDecode
+open EvalContext
+open EvalExceptions
+open EvalPrinting
+open EvalMisc
+open EvalField
+open EvalHash
+open EvalString
+open EvalThread
+
+let catch_unix_error f arg =
+	try
+		f arg
+	with Unix.Unix_error(err,cmd,args) ->
+		exc_string (Printf.sprintf "%s(%s, %s)" (Unix.error_message err) cmd args)
+
+let ptmap_keys h =
+	IntMap.fold (fun k _ acc -> k :: acc) h []
+
+let hashtbl_keys h =
+	Hashtbl.fold (fun k _ acc -> k :: acc) h []
+
+let encode_i64 low high =
+	let vi = create_instance key_haxe__Int64____Int64 in
+	set_instance_field vi key_high (vint32 high);
+	set_instance_field vi key_low (vint32 low);
+	vinstance vi
+
+let encode_i64_direct i64 =
+	let low = Int64.to_int32 i64 in
+	let high = Int64.to_int32 (Int64.shift_right_logical i64 32) in
+	encode_i64 low high
+
+module StdEvalVector = struct
+	let this this = match this with
+		| VVector vv -> vv
+		| v -> unexpected_value v "vector"
+
+	let blit = vifun4 (fun vthis srcPos dest destPos len ->
+		Array.blit (this vthis) (decode_int srcPos) (decode_vector dest) (decode_int destPos) (decode_int len);
+		vnull
+	)
+
+	let toArray = vifun0 (fun vthis ->
+		let copy = Array.copy (this vthis) in
+		encode_array_instance (EvalArray.create copy)
+	)
+
+	let fromArrayCopy = vfun1 (fun arr ->
+		let a = decode_varray arr in
+		encode_vector_instance (Array.sub a.avalues 0 a.alength)
+	)
+
+	let copy = vifun0 (fun vthis ->
+		encode_vector_instance (Array.copy (this vthis))
+	)
+
+	let join = vifun1 (fun vthis sep ->
+		let this = this vthis in
+		let sep = decode_vstring sep in
+		vstring ((EvalArray.array_join this (s_value 0) sep))
+	)
+
+	let map = vifun1 (fun vthis f ->
+		let this = this vthis in
+		let a = match f with
+			| VFunction(f,_) ->
+				Array.map (fun v -> f [v]) this
+			| VFieldClosure(v1,f) ->
+				Array.map (fun v -> f (v1 :: [v])) this
+			| _ -> exc_string ("Cannot call " ^ (value_string f))
+		in
+		encode_vector_instance a
+	)
+end
+
+module StdArray = struct
+	let this this = match this with
+		| VArray va -> va
+		| v -> unexpected_value v "array"
+
+	let concat = vifun1 (fun vthis a2 ->
+		let a2 = decode_varray a2 in
+		encode_array_instance (EvalArray.concat (this vthis) a2)
+	)
+
+	let copy = vifun0 (fun vthis ->
+		encode_array_instance (EvalArray.copy (this vthis))
+	)
+
+	let filter = vifun1 (fun vthis f ->
+		let this = this vthis in
+		let a = EvalArray.filter this (fun v -> is_true (call_value_on vthis f [v])) in
+		encode_array_instance a
+	)
+
+	let indexOf = vifun2 (fun vthis x fromIndex ->
+		let this = this vthis in
+		let fromIndex = default_int fromIndex 0 in
+		let fromIndex = if fromIndex < 0 then this.alength + fromIndex else fromIndex in
+		let fromIndex = if fromIndex < 0 then 0 else fromIndex in
+		vint (EvalArray.indexOf this equals x fromIndex)
+	)
+
+	let insert = vifun2 (fun vthis pos x ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		if pos >= this.alength then begin
+			ignore(EvalArray.push this x);
+		end else begin
+			let pos = if pos < 0 then this.alength + pos else pos in
+			let pos = if pos < 0 then 0 else pos in
+			EvalArray.insert this pos x
+		end;
+		vnull
+	)
+
+	let iterator = vifun0 (fun vthis ->
+		let this = this vthis in
+		let f_has_next,f_next = EvalArray.iterator this in
+		encode_obj [
+			key_hasNext,vifun0 (fun _ -> vbool (f_has_next()));
+			key_next,vifun0 (fun _ -> f_next())
+		]
+	)
+
+	let join = vifun1 (fun vthis sep ->
+		let sep = decode_vstring sep in
+		let s = EvalArray.join (this vthis) (s_value 0) sep in
+		vstring s
+	)
+
+	let lastIndexOf = vifun2 (fun vthis x fromIndex ->
+		let this = this vthis in
+		let last = this.alength - 1 in
+		let fromIndex = default_int fromIndex last in
+		let fromIndex = if fromIndex < 0 then this.alength + fromIndex else fromIndex in
+		let fromIndex = if fromIndex < 0 then 0 else if fromIndex > last then last else fromIndex in
+		vint (EvalArray.lastIndexOf this equals x fromIndex)
+	)
+
+	let map = vifun1 (fun vthis f ->
+		let this = this vthis in
+		let a = match f with
+			| VFunction(f,_) ->
+				EvalArray.map this (fun v -> f [v])
+			| VFieldClosure(v1,f) ->
+				EvalArray.map this (fun v -> f (v1 :: [v]))
+			| _ -> exc_string ("Cannot call " ^ (value_string f))
+		in
+		encode_array_instance a
+	)
+
+	let pop = vifun0 (fun vthis ->
+		let this = this vthis in
+		EvalArray.pop this
+	)
+
+	let push = vifun1 (fun vthis v ->
+		let this = this vthis in
+		vint32 (Int32.of_int (EvalArray.push this v))
+	)
+
+	let remove = vifun1 (fun vthis x ->
+		let this = this vthis in
+		vbool (EvalArray.remove this equals x)
+	)
+
+	let reverse = vifun0 (fun vthis ->
+		let this = this vthis in
+		EvalArray.reverse this;
+		vnull
+	)
+
+	let shift = vifun0 (fun vthis ->
+		let this = this vthis in
+		EvalArray.shift this
+	)
+
+	let slice = vifun2 (fun vthis pos end' ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		let length = this.alength in
+		let end' = default_int end' length in
+		let end' = if end' > length then length else end' in
+		let pos = if pos < 0 then length + pos else pos in
+		let end' = if end' < 0 then length + end' else end' in
+		let pos = if pos < 0 then 0 else pos in
+		let end' = if end' < 0 then 0 else end' in
+		encode_array_instance (EvalArray.slice this pos end')
+	)
+
+	let sort = vifun1 (fun vthis f ->
+		let this = this vthis in
+		EvalArray.sort this (fun a b -> decode_int (call_value_on vthis f [a;b]));
+		vnull
+	)
+
+	let splice = vifun2 (fun vthis pos len ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		let len = decode_int len in
+		let length = this.alength in
+		if len < 0 || pos > length then
+			encode_array []
+		else begin
+			let pos = if pos < 0 then length + pos else pos in
+			let pos = if pos < 0 then 0 else pos in
+			let delta = length - pos in
+			let len = if len > delta then delta else len in
+			let end' = pos + len in
+			encode_array_instance (EvalArray.splice this pos len end')
+		end
+	)
+
+	let toString = vifun0 (fun vthis ->
+		vstring (s_array 0 (this vthis))
+	)
+
+	let unshift = vifun1 (fun vthis v ->
+		let this = this vthis in
+		EvalArray.unshift this v;
+		vnull
+	)
+
+	let resize = vifun1 (fun vthis len ->
+		let this = this vthis in
+		let len = decode_int len in
+		EvalArray.resize this len;
+		vnull
+	)
+end
+
+let outside_bounds () =
+	let haxe_io_Error = get_static_prototype (get_ctx()) key_haxe_io_Error null_pos in
+	exc (proto_field_direct haxe_io_Error key_OutsideBounds)
+
+module StdBytes = struct
+	open EvalBytes
+
+	let this vthis = match vthis with
+		| VInstance {ikind = IBytes o} -> o
+		| v -> unexpected_value v "bytes"
+
+	let alloc = vfun1 (fun length ->
+		let length = decode_int length in
+		encode_bytes (Bytes.make length (Char.chr 0))
+	)
+
+	let encode_native v = match v with
+		| VEnumValue {eindex = 1} -> true (* haxe.io.Encoding.RawNative *)
+		| _ -> false
+
+	let blit = vifun4 (fun vthis pos src srcpos len ->
+		let s = this vthis in
+		let pos = decode_int pos in
+		let src = decode_bytes src in
+		let srcpos = decode_int srcpos in
+		let len = decode_int len in
+		(try Bytes.blit src srcpos s pos len with _ -> outside_bounds());
+		vnull
+	)
+
+	let compare = vifun1 (fun vthis other ->
+		let this = this vthis in
+		let other = decode_bytes other in
+		vint (Pervasives.compare this other)
+	)
+
+	let fastGet = vfun2 (fun b pos ->
+		let b = decode_bytes b in
+		let pos = decode_int pos in
+		try vint (int_of_char (Bytes.unsafe_get b pos)) with _ -> vnull
+	)
+
+	let fill = vifun3 (fun vthis pos len value ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		let len = decode_int len in
+		let value = decode_int value in
+		(try Bytes.fill this pos len (char_of_int value) with _ -> outside_bounds());
+		vnull
+	)
+
+	let get = vifun1 (fun vthis pos ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		try vint (read_byte this pos) with _ -> vnull
+	)
+
+	let getData = vifun0 (fun vthis -> vthis)
+
+	let getDouble = vifun1 (fun vthis pos ->
+		try vfloat (Int64.float_of_bits (read_i64 (this vthis) (decode_int pos))) with _ -> outside_bounds()
+	)
+
+	let getFloat = vifun1 (fun vthis pos ->
+		try vfloat (Int32.float_of_bits (read_i32 (this vthis) (decode_int pos))) with _ -> outside_bounds()
+	)
+
+	let getInt32 = vifun1 (fun vthis pos ->
+		try vint32 (read_i32 (this vthis) (decode_int pos)) with exc -> outside_bounds()
+	)
+
+	let getInt64 = vifun1 (fun vthis pos ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		try
+			let low = read_i32 this pos in
+			let high = read_i32 this (pos + 4) in
+			encode_i64 low high;
+		with _ ->
+			outside_bounds()
+	)
+
+	let getString = vifun3 (fun vthis pos len encoding ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		let len = decode_int len in
+		let s = try Bytes.sub this pos len with _ -> outside_bounds() in
+		create_unknown (Bytes.unsafe_to_string s)
+	)
+
+	let getUInt16 = vifun1 (fun vthis pos ->
+		try vint (read_ui16 (this vthis) (decode_int pos)) with _ -> outside_bounds()
+	)
+
+	let ofData = vfun1 (fun v -> v)
+
+	let ofString = vfun2 (fun v encoding ->
+		let s = decode_vstring v in
+		encode_bytes (Bytes.of_string s.sstring)
+	)
+
+	let ofHex = vfun1 (fun v ->
+		let s = decode_string v in
+		let len = String.length s in
+		if (len land 1) <> 0 then exc_string "Not a hex string (odd number of digits)";
+		let ret = (Bytes.make (len lsr 1) (Char.chr 0)) in
+		for i = 0 to Bytes.length ret - 1 do
+			let high = int_of_char s.[i * 2] in
+			let low = int_of_char s.[i * 2 + 1] in
+			let high = (high land 0xF) + ((high land 0x40) lsr 6) * 9 in
+			let low = (low land 0xF) + ((low land 0x40) lsr 6) * 9 in
+			Bytes.set ret i (char_of_int (((high lsl 4) lor low) land 0xFF));
+		done;
+		encode_bytes ret
+	)
+
+	let set = vifun2 (fun vthis pos v ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		let v = decode_int v in
+		(try write_byte this pos v with _ -> ());
+		vnull;
+	)
+
+	let setDouble = vifun2 (fun vthis pos v ->
+		(try write_i64 (this vthis) (decode_int pos) (Int64.bits_of_float (num v)) with _ -> outside_bounds());
+		vnull
+	)
+
+	let setFloat = vifun2 (fun vthis pos v ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		let v = num v in
+		write_i32 this pos (Int32.bits_of_float v);
+		vnull
+	)
+
+	let setInt32 = vifun2 (fun vthis pos v ->
+		(try write_i32 (this vthis) (decode_int pos) (decode_i32 v) with _ -> outside_bounds());
+		vnull;
+	)
+
+	let setInt64 = vifun2 (fun vthis pos v ->
+		let v = decode_instance v in
+		let pos = decode_int pos in
+		let high = decode_i32 (instance_field v key_high) in
+		let low = decode_i32 (instance_field v key_low) in
+		let this = this vthis in
+		try
+			write_i32 this pos low;
+			write_i32 this (pos + 4) high;
+			vnull
+		with _ ->
+			outside_bounds()
+	)
+
+	let setUInt16 = vifun2 (fun vthis pos v ->
+		(try write_ui16 (this vthis) (decode_int pos) (decode_int v land 0xFFFF) with _ -> outside_bounds());
+		vnull
+	)
+
+	let sub = vifun2 (fun vthis pos len ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		let len = decode_int len in
+		let s = try Bytes.sub this pos len with _ -> outside_bounds() in
+		encode_bytes s
+	)
+
+	let toHex = vifun0 (fun vthis ->
+		let this = this vthis in
+		let chars = [|"0";"1";"2";"3";"4";"5";"6";"7";"8";"9";"a";"b";"c";"d";"e";"f"|] in
+		let l = Bytes.length this in
+		let rec loop acc i =
+			if i >= l then List.rev acc
+			else begin
+				let c = int_of_char (Bytes.get this i) in
+				loop ((chars.(c land 15)) :: ((chars.(c lsr 4))) :: acc) (i + 1)
+			end
+		in
+		encode_string (String.concat "" (loop [] 0))
+	)
+
+	let toString = vifun0 (fun vthis ->
+		(create_unknown (Bytes.to_string (this vthis)))
+	)
+end
+
+module StdBytesBuffer = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = IOutput o} -> o
+		| v -> unexpected_value v "output"
+
+	let get_length = vifun0 (fun vthis ->
+		let this = this vthis in
+		vint (Buffer.length this)
+	)
+
+	let add_char this i =
+		Buffer.add_char this (Char.unsafe_chr i)
+
+	let add_i32 this v =
+		let base = Int32.to_int v in
+		let big = Int32.to_int (Int32.shift_right_logical v 24) in
+		add_char this base;
+		add_char this (base lsr 8);
+		add_char this (base lsr 16);
+		add_char this big
+
+	let addByte = vifun1 (fun vthis byte ->
+		let this = this vthis in
+		let byte = decode_int byte in
+		add_char this byte;
+		vnull;
+	)
+
+	let add = vifun1 (fun vthis src ->
+		let this = this vthis in
+		let src = decode_bytes src in
+		Buffer.add_bytes this src;
+		vnull
+	)
+
+	let addString = vifun2 (fun vthis src encoding ->
+		let this = this vthis in
+		let src = decode_vstring src in
+		Buffer.add_string this src.sstring;
+		vnull
+	)
+
+	let addInt32 = vifun1 (fun vthis v ->
+		let this = this vthis in
+		let v = decode_i32 v in
+		add_i32 this v;
+		vnull
+	)
+
+	let addInt64 = vifun1 (fun vthis v ->
+		let this = this vthis in
+		let v = decode_instance v in
+		let high = decode_i32 (instance_field v key_high) in
+		let low = decode_i32 (instance_field v key_low) in
+		add_i32 this low;
+		add_i32 this high;
+		vnull;
+	)
+
+	let addFloat = vifun1 (fun vthis v ->
+		let this = this vthis in
+		let v = num v in
+		add_i32 this (Int32.bits_of_float v);
+		vnull
+	)
+
+	let addDouble = vifun1 (fun vthis v ->
+		let this = this vthis in
+		let v = num v in
+		let v = Int64.bits_of_float v in
+		add_i32 this (Int64.to_int32 v);
+		add_i32 this (Int64.to_int32 (Int64.shift_right_logical v 32));
+		vnull
+	)
+
+	let addBytes = vifun3 (fun vthis src pos len ->
+		let this = this vthis in
+		let src = decode_bytes src in
+		let pos = decode_int pos in
+		let len = decode_int len in
+		if pos < 0 || len < 0 || pos + len > Bytes.length src then outside_bounds();
+		Buffer.add_subbytes this src pos len;
+		vnull
+	)
+
+	let getBytes = vifun0 (fun vthis ->
+		let this = this vthis in
+		encode_bytes (Bytes.unsafe_of_string (Buffer.contents this))
+	)
+end
+
+module StdCallStack = struct
+	let make_stack envs =
+		let l = DynArray.create () in
+		List.iter (fun (pos,kind) ->
+			let file_pos s =
+				let line1,col1,_,_ = Lexer.get_pos_coords pos in
+				encode_enum_value key_haxe_StackItem 2 [|s;create_unknown pos.pfile;vint line1;vint col1|] None
+			in
+			match kind with
+			| EKLocalFunction i ->
+				let local_function = encode_enum_value key_haxe_StackItem 4 [|vint i|] None in
+				DynArray.add l (file_pos local_function);
+			| EKMethod(st,sf) ->
+				let local_function = encode_enum_value key_haxe_StackItem 3 [|create_unknown (rev_hash st); create_unknown (rev_hash sf)|] None in
+				DynArray.add l (file_pos local_function);
+			| EKEntrypoint ->
+				()
+		) envs;
+		encode_array (DynArray.to_list l)
+
+	let getCallStack = vfun0 (fun () ->
+		let ctx = get_ctx() in
+		let envs = call_stack (get_eval ctx) in
+		let envs = match envs with
+			| _ :: _ :: envs -> envs (* Skip calls to callStack() and getCallStack() *)
+			| _ -> envs
+		in
+		make_stack (List.map (fun env -> {pfile = rev_hash env.env_info.pfile;pmin = env.env_leave_pmin; pmax = env.env_leave_pmax},env.env_info.kind) envs)
+	)
+
+	let getExceptionStack = vfun0 (fun () ->
+		let ctx = get_ctx() in
+		let envs = ctx.exception_stack in
+		make_stack (List.rev envs)
+	)
+end
+
+module StdCompress = struct
+	open Extc
+
+	type zfun = zstream -> src:string -> spos:int -> slen:int -> dst:bytes -> dpos:int -> dlen:int -> zflush -> zresult
+
+	let this vthis = match vthis with
+		| VInstance {ikind = IZip zip} -> zip
+		| _ -> unexpected_value vthis "Compress"
+
+	let exec (f : zfun) vthis src srcPos dst dstPos =
+		let this = this vthis in
+		let src = decode_bytes src in
+		let srcPos = decode_int srcPos in
+		let dst = decode_bytes dst in
+		let dstPos = decode_int dstPos in
+		let r = try f this.z (Bytes.unsafe_to_string src) srcPos (Bytes.length src - srcPos) dst dstPos (Bytes.length dst - dstPos) this.z_flush with _ -> exc_string "oops" in
+		encode_obj [
+			key_done,vbool r.z_finish;
+			key_read,vint r.z_read;
+			key_write,vint r.z_wrote
+		]
+
+	let close = vifun0 (fun vthis ->
+		zlib_deflate_end (this vthis).z;
+		vnull
+	)
+
+	let execute = vifun4 (fun vthis src srcPos dst dstPos ->
+		exec zlib_deflate vthis src srcPos dst dstPos
+	)
+
+	let run = vfun2 (fun s level ->
+		let s = decode_bytes s in
+		let level = decode_int level in
+		let zip = zlib_deflate_init level in
+		let d = Bytes.make (zlib_deflate_bound zip (Bytes.length s)) (char_of_int 0) in
+		let r = zlib_deflate zip (Bytes.unsafe_to_string s) 0 (Bytes.length s) d 0 (Bytes.length d) Z_FINISH in
+		zlib_deflate_end zip;
+		if not r.z_finish || r.z_read <> (Bytes.length s) then exc_string "Compression failed";
+		encode_bytes (Bytes.sub d 0 r.z_wrote)
+	)
+
+	let setFlushMode = vifun1 (fun vthis f ->
+		let mode = match fst (decode_enum f) with
+			| 0 -> Z_NO_FLUSH
+			| 1 -> Z_SYNC_FLUSH
+			| 2 -> Z_FULL_FLUSH
+			| 3 -> Z_FINISH
+			| 4 -> Z_PARTIAL_FLUSH
+			| _ -> assert false
+		in
+		(this vthis).z_flush <- mode;
+		vnull
+	)
+end
+
+module StdContext = struct
+	let addBreakpoint = vfun2 (fun file line ->
+		let file = decode_string file in
+		let line = decode_int line in
+		begin try
+			ignore(EvalDebugMisc.add_breakpoint (get_ctx()) file line BPAny None);
+		with Not_found ->
+			exc_string ("Could not find file " ^ file)
+		end;
+		vnull
+	)
+
+	let breakHere = vfun0 (fun () ->
+		if not ((get_ctx()).debug.support_debugger) then vnull
+		else raise (EvalDebugMisc.BreakHere)
+	)
+
+	let callMacroApi = vfun1 (fun f ->
+		let f = decode_string f in
+		Hashtbl.find GlobalState.macro_lib f
+	)
+
+	let plugin_data = ref None
+
+	let register data = plugin_data := Some data
+
+	let loadPlugin = vfun1 (fun filePath ->
+		let filePath = decode_string filePath in
+		let filePath = Dynlink.adapt_filename filePath in
+		(try Dynlink.loadfile filePath with Dynlink.Error error -> exc_string (Dynlink.error_message error));
+		match !plugin_data with
+			| None ->
+				vnull
+			| Some l ->
+				encode_obj_s l
+	)
+end
+
+module StdCrc32 = struct
+	let make = vfun1 (fun data ->
+		let data = decode_bytes data in
+		let crc32 = Extc.zlib_crc32 data (Bytes.length data) in
+		vint32 crc32
+	)
+end
+
+module StdDate = struct
+	open Unix
+
+	let encode_date d = encode_instance key_Date ~kind:(IDate d)
+
+	let this vthis = match vthis with
+		| VInstance {ikind = IDate d} -> d
+		| v -> unexpected_value v "date"
+
+	let fromTime = vfun1 (fun f -> encode_date ((num f) /. 1000.))
+
+	let fromString = vfun1 (fun s ->
+		let s = decode_string s in
+		match String.length s with
+		| 19 ->
+			let r = Str.regexp "^\\([0-9][0-9][0-9][0-9]\\)-\\([0-9][0-9]\\)-\\([0-9][0-9]\\) \\([0-9][0-9]\\):\\([0-9][0-9]\\):\\([0-9][0-9]\\)$" in
+			if not (Str.string_match r s 0) then exc_string ("Invalid date format : " ^ s);
+			let t = {
+				tm_year = int_of_string (Str.matched_group 1 s) - 1900;
+				tm_mon = int_of_string (Str.matched_group 2 s) - 1;
+				tm_mday = int_of_string (Str.matched_group 3 s);
+				tm_hour = int_of_string (Str.matched_group 4 s);
+				tm_min = int_of_string (Str.matched_group 5 s);
+				tm_sec = int_of_string (Str.matched_group 6 s);
+				tm_wday = 0;
+				tm_yday = 0;
+				tm_isdst = false;
+			} in
+			encode_date (fst (catch_unix_error mktime t))
+		| 10 ->
+			let r = Str.regexp "^\\([0-9][0-9][0-9][0-9]\\)-\\([0-9][0-9]\\)-\\([0-9][0-9]\\)$" in
+			if not (Str.string_match r s 0) then exc_string ("Invalid date format : " ^ s);
+			let t = {
+				tm_year = int_of_string (Str.matched_group 1 s) - 1900;
+				tm_mon = int_of_string (Str.matched_group 2 s) - 1;
+				tm_mday = int_of_string (Str.matched_group 3 s);
+				tm_hour = 0;
+				tm_min = 0;
+				tm_sec = 0;
+				tm_wday = 0;
+				tm_yday = 0;
+				tm_isdst = false;
+			} in
+			encode_date (fst (catch_unix_error mktime t))
+		| 8 ->
+			let r = Str.regexp "^\\([0-9][0-9]\\):\\([0-9][0-9]\\):\\([0-9][0-9]\\)$" in
+			if not (Str.string_match r s 0) then exc_string ("Invalid date format : " ^ s);
+			let h = int_of_string (Str.matched_group 1 s) in
+			let m = int_of_string (Str.matched_group 2 s) in
+			let s = int_of_string (Str.matched_group 3 s) in
+			let t = h * 60 * 60 + m * 60 + s in
+			encode_date (float_of_int t)
+		| _ ->
+			exc_string ("Invalid date format : " ^ s)
+	)
+
+	let getDate = vifun0 (fun vthis -> vint (catch_unix_error localtime (this vthis)).tm_mday)
+	let getDay = vifun0 (fun vthis -> vint (catch_unix_error localtime (this vthis)).tm_wday)
+	let getFullYear = vifun0 (fun vthis -> vint (((catch_unix_error localtime (this vthis)).tm_year) + 1900))
+	let getHours = vifun0 (fun vthis -> vint (catch_unix_error localtime (this vthis)).tm_hour)
+	let getMinutes = vifun0 (fun vthis -> vint (catch_unix_error localtime (this vthis)).tm_min)
+	let getMonth = vifun0 (fun vthis -> vint (catch_unix_error localtime (this vthis)).tm_mon)
+	let getSeconds = vifun0 (fun vthis -> vint (catch_unix_error localtime (this vthis)).tm_sec)
+	let getUTCDate = vifun0 (fun vthis -> vint (catch_unix_error gmtime (this vthis)).tm_mday)
+	let getUTCDay = vifun0 (fun vthis -> vint (catch_unix_error gmtime (this vthis)).tm_wday)
+	let getUTCFullYear = vifun0 (fun vthis -> vint (((catch_unix_error gmtime (this vthis)).tm_year) + 1900))
+	let getUTCHours = vifun0 (fun vthis -> vint (catch_unix_error gmtime (this vthis)).tm_hour)
+	let getUTCMinutes = vifun0 (fun vthis -> vint (catch_unix_error gmtime (this vthis)).tm_min)
+	let getUTCMonth = vifun0 (fun vthis -> vint (catch_unix_error gmtime (this vthis)).tm_mon)
+	let getUTCSeconds = vifun0 (fun vthis -> vint (catch_unix_error gmtime (this vthis)).tm_sec)
+	let getTime = vifun0 (fun vthis -> vfloat ((this vthis) *. 1000.))
+	let getTimezoneOffset = vifun0 (fun vthis ->
+		let tmLocal = catch_unix_error localtime (this vthis) in
+		let tmUTC = catch_unix_error gmtime (this vthis) in
+		let tsLocal = fst (catch_unix_error mktime tmLocal) in
+		let tsUTC = fst (catch_unix_error mktime tmUTC) in
+		vint (int_of_float ((tsUTC -. tsLocal) /. 60.))
+	)
+	let now = vfun0 (fun () -> encode_date (catch_unix_error time()))
+	let toString = vifun0 (fun vthis -> vstring (s_date (this vthis)))
+end
+
+module StdDeque = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = IDeque d} -> d
+		| _ -> unexpected_value vthis "Deque"
+
+	let add = vifun1 (fun vthis i ->
+		let this = this vthis in
+		Deque.add this i;
+		vnull
+	)
+
+	let pop = vifun1 (fun vthis blocking ->
+		let this = this vthis in
+		let blocking = decode_bool blocking in
+		match Deque.pop this blocking with
+		| None -> vnull
+		| Some v -> v
+	)
+
+	let push = vifun1 (fun vthis i ->
+		let this = this vthis in
+		Deque.push this i;
+		vnull
+	)
+end
+
+module StdEReg = struct
+	open Pcre
+
+	let create r opt =
+		let open Pcre in
+		let string_of_pcre_error = function
+			| BadPattern(s,i) -> Printf.sprintf "at %i: %s" i s
+			| Partial -> "Partial"
+			| BadPartial -> "BadPartial"
+			| BadUTF8 -> "BadUTF8"
+			| BadUTF8Offset -> "BadUTF8Offset"
+			| MatchLimit -> "MatchLimit"
+			| RecursionLimit -> "RecursionLimit"
+			| InternalError s -> "InternalError: " ^ s
+		in
+		let global = ref false in
+		let flags = ExtList.List.filter_map (function
+			| 'i' -> Some `CASELESS
+			| 's' -> Some `DOTALL
+			| 'm' -> Some `MULTILINE
+			| 'u' -> None
+			| 'g' -> global := true; None
+			| c -> failwith ("Unsupported regexp option '" ^ String.make 1 c ^ "'")
+		) (ExtString.String.explode opt) in
+		let flags = `UTF8 :: `UCP :: flags in
+		let rex = try regexp ~flags r with Error error -> failwith (string_of_pcre_error error) in
+		let pcre = {
+			r = rex;
+			r_rex_string = create_ascii (Printf.sprintf "~/%s/%s" r opt);
+			r_global = !global;
+			r_string = "";
+			r_groups = [||]
+		} in
+		IRegex pcre
+
+	let maybe_run rex n f =
+		let substrings = if Array.length rex.r_groups = 0 then exc_string "Invalid regex operation because no match was made" else rex.r_groups.(0) in
+		if n < 0 || n >= num_of_subs substrings then exc_string "Invalid group"
+		else try f (get_substring_ofs substrings n)
+		with Not_found -> vnull
+
+	let this this = match this with
+		| VInstance {ikind = IRegex rex} -> rex
+		| v -> unexpected_value v "EReg"
+
+	let escape = vfun1 (fun s ->
+		let s = decode_string s in
+		create_unknown (Str.quote s)
+	)
+
+	let map = vifun2 (fun vthis s f ->
+		let this = this vthis in
+		let s = decode_string s in
+		let l = String.length s in
+		let buf = Buffer.create 0 in
+		let rec loop pos =
+			if pos >= l then
+				()
+			else begin try
+				let a = exec ~rex:this.r ~pos s in
+				this.r_groups <- [|a|];
+				let (first,last) = get_substring_ofs a 0 in
+				Buffer.add_substring buf s pos (first - pos);
+				Buffer.add_string buf (decode_string (call_value_on vthis f [vthis]));
+				if last = first then begin
+					if last >= l then
+						()
+					else begin
+						if this.r_global then begin
+							Buffer.add_substring buf s first 1;
+							loop (first + 1)
+						end else
+							Buffer.add_substring buf s first (l - first)
+					end
+				end else if this.r_global then
+					loop last
+				else
+					Buffer.add_substring buf s last (l - last)
+			with Not_found ->
+				Buffer.add_substring buf s pos (l - pos)
+			end
+		in
+		this.r_string <- s;
+		loop 0;
+		this.r_string <- "";
+		this.r_groups <- [||];
+		create_unknown (Buffer.contents buf)
+	)
+
+	let match' = vifun1 (fun vthis s ->
+		let this = this vthis in
+		let open Pcre in
+		let s = decode_string s in
+		this.r_string <- s;
+		try
+			let a = exec_all ~iflags:0x2000 ~rex:this.r s in
+			this.r_groups <- a;
+			vtrue
+		with Not_found ->
+			this.r_groups <- [||];
+			vfalse
+		| Pcre.Error _ ->
+			exc_string "PCRE Error (invalid unicode string?)"
+	)
+
+	let matched = vifun1 (fun vthis n ->
+		let this = this vthis in
+		let n = decode_int n in
+		maybe_run this n (fun (first,last) ->
+			create_unknown (ExtString.String.slice ~first ~last this.r_string)
+		)
+	)
+
+	let matchedLeft = vifun0 (fun vthis ->
+		let this = this vthis in
+		maybe_run this 0 (fun (first,_) ->
+			create_unknown (ExtString.String.slice ~last:first this.r_string)
+		)
+	)
+
+	let matchedPos = vifun0 (fun vthis ->
+		let this = this vthis in
+		let rec byte_offset_to_char_offset_lol s i k o =
+			if i = 0 then
+				k
+			else begin
+				let n = UTF8.next s o in
+				let d = n - o in
+				byte_offset_to_char_offset_lol s (i - d) (k + 1) n
+			end
+		in
+		maybe_run this 0 (fun (first,last) ->
+			let first = byte_offset_to_char_offset_lol this.r_string first 0 0 in
+			let last = byte_offset_to_char_offset_lol this.r_string last 0 0 in
+			encode_obj [key_pos,vint first;key_len,vint (last - first)]
+		)
+	)
+
+	let matchedRight = vifun0 (fun vthis ->
+		let this = this vthis in
+		maybe_run this 0 (fun (_,last) ->
+			create_unknown (ExtString.String.slice ~first:last this.r_string)
+		)
+	)
+
+	let matchSub = vifun3 (fun vthis s pos len ->
+		let this = this vthis in
+		let s = decode_string s in
+		let pos = decode_int pos in
+		let len = default_int len (String.length s - pos) in
+		begin try
+			if pos + len > String.length s then raise Not_found;
+			let str = String.sub s 0 (pos + len) in
+			let a = Pcre.exec_all ~iflags:0x2000 ~rex:this.r ~pos str in
+			this.r_string <- s;
+			this.r_groups <- a;
+			vtrue
+		with Not_found ->
+			vfalse
+		end
+	)
+
+	let replace = vifun2 (fun vthis s by ->
+		let this = this vthis in
+		let s = decode_string s in
+		let by = decode_string by in
+		let s = (if this.r_global then Pcre.replace else Pcre.replace_first) ~iflags:0x2000 ~rex:this.r ~templ:by s in
+		create_unknown s
+	)
+
+	let split = vifun1 (fun vthis s ->
+		let this = this vthis in
+		let s = decode_string s in
+		if String.length s = 0 then encode_array [encode_string ""]
+		else begin
+			let max = if this.r_global then -1 else 2 in
+			let l = Pcre.full_split ~iflags:0x2000 ~max ~rex:this.r s in
+			let rec loop split cur acc l = match l with
+				| Text s :: l ->
+					loop split (cur ^ s) acc l
+				| Delim s :: l ->
+					if split then
+						loop this.r_global "" ((create_unknown cur) :: acc) l
+					else
+						loop false (cur ^ s) acc l
+				| _ :: l ->
+					loop split cur acc l
+				| [] ->
+					List.rev ((create_unknown cur) :: acc)
+			in
+			let l = loop true "" [] l in
+			encode_array l
+		end
+	)
+end
+
+module StdFile = struct
+	let create_out path binary flags =
+		let path = decode_string path in
+		let binary = match binary with
+			| VTrue | VNull -> true
+			| _ -> false
+		in
+		let perms = 0o666 in
+		let l = Open_creat :: flags in
+		let l = if binary then Open_binary :: l else l in
+		let ch =
+			try open_out_gen l perms path
+			with Sys_error msg -> exc_string msg
+		in
+		encode_instance key_sys_io_FileOutput ~kind:(IOutChannel ch)
+
+	let write_out path content =
+		try
+			let ch = open_out_bin path in
+			output_string ch content;
+			close_out ch;
+			vnull
+		with Sys_error s ->
+			exc_string s
+
+	let append = vfun2 (fun path binary ->
+		create_out path binary [Open_append]
+	)
+
+	let update = vfun2 (fun path binary ->
+		create_out path binary [Open_rdonly; Open_wronly]
+	)
+
+	let getBytes = vfun1 (fun path ->
+		let path = decode_string path in
+		try encode_bytes (Bytes.unsafe_of_string (Std.input_file ~bin:true path)) with Sys_error _ -> exc_string ("Could not read file " ^ path)
+	)
+
+	let getContent = vfun1 (fun path ->
+		let path = decode_string path in
+		try ((create_unknown (Std.input_file ~bin:true path))) with Sys_error _ -> exc_string ("Could not read file " ^ path)
+	)
+
+	let read = vfun2 (fun path binary ->
+		let path = decode_string path in
+		let binary = match binary with
+			| VTrue | VNull -> true
+			| _ -> false
+		in
+		let ch =
+			try open_in_gen (Open_rdonly :: (if binary then [Open_binary] else [])) 0 path
+			with Sys_error msg -> exc_string msg
+		in
+		encode_instance key_sys_io_FileInput ~kind:(IInChannel(ch,ref false))
+	)
+
+	let saveBytes = vfun2 (fun path bytes ->
+		let path = decode_string path in
+		let bytes = decode_bytes bytes in
+		write_out path (Bytes.unsafe_to_string bytes)
+	)
+
+	let saveContent = vfun2 (fun path content ->
+		let path = decode_string path in
+		let content = decode_string content in
+		write_out path content
+	)
+
+	let write = vfun2 (fun path binary ->
+		create_out path binary [Open_wronly;Open_trunc]
+	)
+end
+
+module StdFileInput = struct
+	let raise_eof () =
+		let v = encode_instance key_haxe_io_Eof in
+		exc v
+
+	let this vthis = match vthis with
+		| VInstance {ikind = IInChannel(ch,eof)} -> ch,eof
+		| _ -> unexpected_value vthis "FileInput"
+
+	let close = vifun0 (fun vthis ->
+		close_in (fst (this vthis));
+		vnull
+	)
+
+	let eof = vifun0 (fun vthis ->
+		vbool !(snd (this vthis))
+	)
+
+	let seek = vifun2 (fun vthis pos mode ->
+		let ch,r = this vthis in
+		r := false;
+		let pos = decode_int pos in
+		let mode,_ = decode_enum mode in
+		seek_in ch (match mode with 0 -> pos | 1 -> pos_in ch + pos | 2 -> in_channel_length ch + pos | _ -> assert false);
+		vnull
+	)
+
+	let tell = vifun0 (fun vthis ->
+		vint (pos_in (fst (this vthis)))
+	)
+
+	let readByte = vifun0 (fun vthis ->
+		let ch,r = this vthis in
+		let i = try
+			input_char ch
+		with _ ->
+			r := true;
+			raise_eof()
+		in
+		vint (int_of_char i)
+	)
+
+	let readBytes = vifun3 (fun vthis bytes pos len ->
+		let ch,r = this vthis in
+		let bytes = decode_bytes bytes in
+		let pos = decode_int pos in
+		let len = decode_int len in
+		let i = input ch bytes pos len in
+		if i = 0 then begin
+			r := true;
+			raise_eof()
+		end;
+		vint i
+	)
+end
+
+module StdFileOutput = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = IOutChannel ch} -> ch
+		| _ -> unexpected_value vthis "FileOutput"
+
+	let close = vifun0 (fun vthis ->
+		close_out (this vthis);
+		vnull
+	)
+
+	let flush = vifun0 (fun vthis ->
+		flush (this vthis);
+		vnull
+	)
+
+	let seek = vifun2 (fun vthis pos mode ->
+		let this = this vthis in
+		let pos = decode_int pos in
+		let mode,_ = decode_enum mode in
+		seek_out this (match mode with 0 -> pos | 1 -> pos_out this + pos | 2 -> out_channel_length this + pos | _ -> assert false);
+		vnull
+	)
+
+	let tell = vifun0 (fun vthis ->
+		vint (pos_out (this vthis))
+	)
+
+	let writeByte = vifun1 (fun vthis c ->
+		output_char (this vthis) (char_of_int (decode_int c));
+		vnull
+	)
+
+	let writeBytes = vifun3 (fun vthis bytes pos len ->
+		let this = this vthis in
+		let bytes = decode_bytes bytes in
+		let pos = decode_int pos in
+		let len = decode_int len in
+		output this bytes pos len;
+		vint len
+	)
+end
+
+module StdFPHelper = struct
+	let doubleToI64 = vfun1 (fun v ->
+		let f = num v in
+		let i64 = Int64.bits_of_float f in
+		encode_i64_direct i64
+	)
+
+	let floatToI32 = vfun1 (fun f ->
+		let f = num f in
+		let i32 = Int32.bits_of_float f in
+		vint32 i32
+	)
+
+	let i32ToFloat = vfun1 (fun i ->
+		let i32 = decode_i32 i in
+		let f = Int32.float_of_bits i32 in
+		vfloat f
+	)
+
+	let i64ToDouble = vfun2 (fun low high ->
+		let low = decode_i32 low in
+		let high = decode_i32 high in
+		let b = Bytes.make 8 '0' in
+		EvalBytes.write_i32 b 0 low;
+		EvalBytes.write_i32 b 4 high;
+		let i64 = EvalBytes.read_i64 b 0 in
+		vfloat (Int64.float_of_bits i64)
+	)
+end
+
+module StdFileSystem = struct
+	let rec remove_trailing_slash p =
+		let l = String.length p in
+		if l = 0 then
+			"" (* don't be retarded *)
+		else match p.[l-1] with
+			| '\\' | '/' -> remove_trailing_slash (String.sub p 0 (l - 1))
+			| _ -> p
+
+	let patch_path s =
+		if String.length s > 1 && String.length s <= 3 && s.[1] = ':' then Path.add_trailing_slash s
+		else if s = "/" then "/"
+		else remove_trailing_slash s
+
+	let createDirectory = vfun1 (fun path ->
+		catch_unix_error Path.mkdir_from_path (Path.add_trailing_slash (decode_string path));
+		vnull
+	)
+
+	let deleteDirectory = vfun1 (fun path ->
+		catch_unix_error Unix.rmdir (decode_string path);
+		vnull
+	)
+
+	let deleteFile = vfun1 (fun path ->
+		(try Sys.remove (decode_string path) with Sys_error s -> exc_string s);
+		vnull
+	)
+
+	let exists = vfun1 (fun path ->
+		let b = try Sys.file_exists (patch_path (decode_string path)) with Sys_error _ -> false in
+		vbool b
+	)
+
+	let fullPath = vfun1 (fun relPath ->
+		try create_unknown (Extc.get_full_path (decode_string relPath)) with exc -> exc_string (Printexc.to_string exc)
+	)
+
+	let isDirectory = vfun1 (fun dir ->
+		let b = try Sys.is_directory (patch_path(decode_string dir)) with Sys_error _ -> false in
+		vbool b
+	)
+
+	let readDirectory = vfun1 (fun dir ->
+		let dir = decode_string dir in
+		let d = try
+			if not (Sys.is_directory (patch_path dir)) then exc_string "No such directory";
+			Sys.readdir dir
+		with Sys_error s ->
+			exc_string s
+		in
+		encode_array (Array.to_list (Array.map (fun s -> create_unknown s) d))
+	)
+
+	let rename = vfun2 (fun path newPath ->
+		(try Sys.rename (decode_string path) (decode_string newPath) with Sys_error s -> exc_string s);
+		vnull
+	)
+
+	let stat = vfun1 (fun path ->
+		let s = catch_unix_error Unix.stat (patch_path (decode_string path)) in
+		encode_obj [
+			key_gid,vint s.st_gid;
+			key_uid,vint s.st_uid;
+			key_atime,StdDate.encode_date s.st_atime;
+			key_mtime,StdDate.encode_date s.st_mtime;
+			key_ctime,StdDate.encode_date s.st_ctime;
+			key_dev,vint s.st_dev;
+			key_ino,vint s.st_ino;
+			key_nlink,vint s.st_nlink;
+			key_rdev,vint s.st_rdev;
+			key_size,vint s.st_size;
+			key_mode,vint s.st_perm;
+		]
+	)
+end
+
+module StdGc = struct
+	open Gc
+	let key_minor_heap_size = hash "minor_heap_size"
+	let key_major_heap_increment = hash "major_heap_increment"
+	let key_space_overhead = hash "space_overhead"
+	let key_verbose = hash "verbose"
+	let key_max_overhead = hash "max_overhead"
+	let key_stack_limit = hash "stack_limit"
+	let key_allocation_policy = hash "allocation_policy"
+	let key_minor_words = hash "minor_words"
+	let key_minor_words = hash "minor_words"
+	let key_promoted_words = hash "promoted_words"
+	let key_major_words = hash "major_words"
+	let key_minor_collections = hash "minor_collections"
+	let key_major_collections = hash "major_collections"
+	let key_heap_words = hash "heap_words"
+	let key_heap_chunks = hash "heap_chunks"
+	let key_live_words = hash "live_words"
+	let key_live_blocks = hash "live_blocks"
+	let key_free_words = hash "free_words"
+	let key_free_blocks = hash "free_blocks"
+	let key_largest_free = hash "largest_free"
+	let key_fragments = hash "fragments"
+	let key_compactions = hash "compactions"
+	let key_top_heap_words = hash "top_heap_words"
+	let key_stack_size = hash "stack_size"
+
+	let encode_stats stats =
+		encode_obj [
+			key_minor_words,vfloat stats.minor_words;
+			key_promoted_words,vfloat stats.promoted_words;
+			key_major_words,vfloat stats.major_words;
+			key_minor_collections,vint stats.minor_collections;
+			key_major_collections,vint stats.major_collections;
+			key_heap_words,vint stats.heap_words;
+			key_heap_chunks,vint stats.heap_chunks;
+			key_live_words,vint stats.live_words;
+			key_live_blocks,vint stats.live_blocks;
+			key_free_words,vint stats.free_words;
+			key_free_blocks,vint stats.free_blocks;
+			key_largest_free,vint stats.largest_free;
+			key_fragments,vint stats.fragments;
+			key_compactions,vint stats.compactions;
+			key_top_heap_words,vint stats.top_heap_words;
+			key_stack_size,vint stats.stack_size;
+		]
+
+	let allocated_bytes = vfun0 (fun () -> vfloat (Gc.allocated_bytes()))
+
+	let compact = vfun0 (fun () -> Gc.compact(); vnull )
+
+	let counters = vfun0 (fun () ->
+		let (minor_words,promoted_words,major_words) = Gc.counters() in
+		encode_obj [
+			key_minor_words,vfloat minor_words;
+			key_promoted_words,vfloat promoted_words;
+			key_major_words,vfloat major_words;
+		]
+	)
+
+	let finalise = vfun2 (fun f v ->
+		let f = fun v ->
+			ignore(call_value f [v])
+		in
+		Gc.finalise f v;
+		vnull
+	)
+
+	let finalise_release = vfun0 (fun () ->
+		Gc.finalise_release();
+		vnull
+	)
+
+	let full_major = vfun0 (fun () -> Gc.full_major(); vnull )
+
+	let get = vfun0 (fun () ->
+		let control = Gc.get() in
+		encode_obj [
+			key_minor_heap_size,vint control.minor_heap_size;
+			key_major_heap_increment,vint control.major_heap_increment;
+			key_space_overhead,vint control.space_overhead;
+			key_verbose,vint control.verbose;
+			key_max_overhead,vint control.max_overhead;
+			key_stack_limit,vint control.stack_limit;
+			key_allocation_policy,vint control.allocation_policy;
+		]
+	)
+
+	let major = vfun0 (fun () -> Gc.major(); vnull )
+
+	let major_slice = vfun1 (fun n -> vint (Gc.major_slice (decode_int n)))
+
+	let minor = vfun0 (fun () -> Gc.minor(); vnull )
+
+	let print_stat = vfun1 (fun out_channel ->
+		let out_channel = match out_channel with
+			| VInstance {ikind = IOutChannel ch} -> ch
+			| _ -> unexpected_value out_channel "Output"
+		in
+		Gc.print_stat out_channel;
+		vnull
+	)
+
+	let quick_stat = vfun0 (fun () -> encode_stats (Gc.quick_stat()))
+
+	let set = vfun1 (fun r ->
+		let r = decode_object r in
+		let field key = decode_int (object_field r key) in
+		let control = { (Gc.get()) with
+			minor_heap_size = field key_minor_heap_size;
+			major_heap_increment = field key_major_heap_increment;
+			space_overhead = field key_space_overhead;
+			verbose = field key_verbose;
+			max_overhead = field key_max_overhead;
+			stack_limit = field key_stack_limit;
+		} in
+		(* Awkward hack to avoid warning. *)
+		let control = {control with allocation_policy = field key_allocation_policy} in
+		Gc.set control;
+		vnull
+	)
+
+	let stat = vfun0 (fun () -> encode_stats (Gc.stat()))
+end
+
+module StdHost = struct
+	let int32_addr h =
+		let base = Int32.to_int (Int32.logand h 0xFFFFFFl) in
+		let str = Printf.sprintf "%ld.%d.%d.%d" (Int32.shift_right_logical h 24) (base lsr 16) ((base lsr 8) land 0xFF) (base land 0xFF) in
+		catch_unix_error Unix.inet_addr_of_string str
+
+	let localhost = vfun0 (fun () ->
+		create_unknown (catch_unix_error Unix.gethostname())
+	)
+
+	let hostReverse = vfun1 (fun ip ->
+		let ip = decode_i32 ip in
+		try create_unknown (catch_unix_error Unix.gethostbyaddr (int32_addr ip)).h_name with Not_found -> exc_string "Could not reverse host"
+	)
+
+	let hostToString = vfun1 (fun ip ->
+		let ip = decode_i32 ip in
+		create_unknown (catch_unix_error Unix.string_of_inet_addr (int32_addr ip))
+	)
+
+	let resolve = vfun1 (fun name ->
+		let name = decode_string name in
+		let h = catch_unix_error Unix.gethostbyname name in
+		let addr = catch_unix_error Unix.string_of_inet_addr h.h_addr_list.(0) in
+		let a, b, c, d = Scanf.sscanf addr "%d.%d.%d.%d" (fun a b c d -> a,b,c,d) in
+		vint32 (Int32.logor (Int32.shift_left (Int32.of_int a) 24) (Int32.of_int (d lor (c lsl 8) lor (b lsl 16))))
+	)
+end
+
+module StdLock = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = ILock lock} -> lock
+		| v -> unexpected_value v "Lock"
+
+	let release = vifun0 (fun vthis ->
+		let this = this vthis in
+		Deque.push this.ldeque vnull;
+		vnull
+	)
+
+	let wait = vifun1 (fun vthis timeout ->
+		let lock = this vthis in
+		let rec loop target_time =
+			match Deque.pop lock.ldeque false with
+			| None ->
+				if Sys.time() >= target_time then
+					vfalse
+				else begin
+					Thread.yield();
+					loop target_time
+				end
+			| Some _ ->
+				vtrue
+		in
+		match Deque.pop lock.ldeque false with
+		| None ->
+			begin match timeout with
+				| VNull ->
+					ignore(Deque.pop lock.ldeque true);
+					vtrue
+				| _ ->
+					let target_time = (Sys.time()) +. num timeout in
+					loop target_time
+			end
+		| Some _ ->
+			vtrue
+	)
+end
+
+let lineEnd = match Sys.os_type with
+	| "Win32" | "Cygwin" -> "\r\n"
+	| _ -> "\n"
+
+module StdLog = struct
+	let key_fileName = hash "fileName"
+	let key_lineNumber = hash "lineNumber"
+	let key_customParams = hash "customParams"
+
+	let trace = vfun2 (fun v infos ->
+		let s = value_string v in
+		let s = match infos with
+			| VNull -> (Printf.sprintf "%s" s) ^ lineEnd
+			| _ ->  let infos = decode_object infos in
+				let file_name = decode_string (object_field infos key_fileName) in
+				let line_number = decode_int (object_field infos key_lineNumber) in
+				let l = match object_field infos key_customParams with
+					| VArray va -> s :: (List.map value_string (EvalArray.to_list va))
+					| _ -> [s]
+				in
+				(Printf.sprintf "%s:%i: %s" file_name line_number (String.concat "," l)) ^ lineEnd in
+		((get_ctx()).curapi.MacroApi.get_com()).Common.print s;
+		vnull
+	)
+end
+
+let encode_list_iterator l =
+	let l = ref l in
+	encode_obj [
+		key_hasNext,vifun0 (fun _ ->
+			match !l with [] -> vfalse | _ -> vtrue
+		);
+		key_next,vifun0 (fun _ -> match !l with
+			| [] -> vnull
+			| v :: l' -> l := l'; v
+		)
+	]
+
+let map_key_value_iterator path = vifun0 (fun vthis ->
+	let ctx = get_ctx() in
+	let vit = encode_instance path in
+	let fnew = get_instance_constructor ctx path null_pos in
+	ignore(call_value_on vit (Lazy.force fnew) [vthis]);
+	vit
+)
+
+module StdIntMap = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = IIntMap h} -> h
+		| v -> unexpected_value v "int map"
+
+	let copy = vifun0 (fun vthis ->
+		let copied = IntHashtbl.copy (this vthis) in
+		encode_int_map_direct copied
+	)
+
+	let exists = vifun1 (fun vthis vkey ->
+		vbool (IntHashtbl.mem (this vthis) (decode_int vkey))
+	)
+
+	let get = vifun1 (fun vthis vkey ->
+		try IntHashtbl.find (this vthis) (decode_int vkey)
+		with Not_found -> vnull
+	)
+
+	let iterator = vifun0 (fun vthis ->
+		let keys = IntHashtbl.fold (fun _ v acc -> v :: acc) (this vthis) [] in
+		encode_list_iterator keys
+	)
+
+	let keys = vifun0 (fun vthis ->
+		let keys = IntHashtbl.fold (fun k _ acc -> vint k :: acc) (this vthis) [] in
+		encode_list_iterator keys
+	)
+
+	let keyValueIterator = map_key_value_iterator key_haxe_iterators_map_key_value_iterator
+
+	let remove = vifun1 (fun vthis vkey ->
+		let this = this vthis in
+		let key = decode_int vkey in
+		let b = IntHashtbl.mem this key in
+		IntHashtbl.remove this key;
+		vbool b
+	)
+
+	let set = vifun2 (fun vthis vkey vvalue ->
+		IntHashtbl.add (this vthis) (decode_int vkey) vvalue;
+		vnull
+	)
+
+	let toString = vifun0 (fun vthis ->
+		let this = this vthis in
+		let l = IntHashtbl.fold (fun key vvalue acc ->
+			(join rempty [create_ascii (string_of_int key); create_ascii " => "; s_value 0 vvalue]) :: acc) this [] in
+		let s = join rcomma l in
+		let s = join rempty [rbropen;s;rbrclose] in
+		vstring s
+	)
+
+	let clear = vifun0 (fun vthis ->
+		IntHashtbl.clear (this vthis);
+		vnull
+	)
+end
+
+module StdStringMap = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = IStringMap h} -> h
+		| v -> unexpected_value v "string map"
+
+	let copy = vifun0 (fun vthis ->
+		let copied = StringHashtbl.copy (this vthis) in
+		encode_string_map_direct copied
+	)
+
+	let exists = vifun1 (fun vthis vkey ->
+		vbool (StringHashtbl.mem (this vthis) (decode_vstring vkey))
+	)
+
+	let get = vifun1 (fun vthis vkey ->
+		try snd (StringHashtbl.find (this vthis) (decode_vstring vkey))
+		with Not_found -> vnull
+	)
+
+	let iterator = vifun0 (fun vthis ->
+		let keys = StringHashtbl.fold (fun _ (_,v) acc -> v :: acc) (this vthis) [] in
+		encode_list_iterator keys
+	)
+
+	let keys = vifun0 (fun vthis ->
+		let keys = StringHashtbl.fold (fun _ (k,_) acc -> vstring k :: acc) (this vthis) [] in
+		encode_list_iterator keys
+	)
+
+	let keyValueIterator = map_key_value_iterator key_haxe_iterators_map_key_value_iterator
+
+	let remove = vifun1 (fun vthis vkey ->
+		let this = this vthis in
+		let key = decode_vstring vkey in
+		let b = StringHashtbl.mem this key in
+		StringHashtbl.remove this key;
+		vbool b
+	)
+
+	let set = vifun2 (fun vthis vkey vvalue ->
+		StringHashtbl.add (this vthis) (decode_vstring vkey) vvalue;
+		vnull
+	)
+
+	let toString = vifun0 (fun vthis ->
+		let this = this vthis in
+		let l = StringHashtbl.fold (fun _ (key,vvalue) acc ->
+			(join rempty [key; create_ascii " => "; s_value 0 vvalue]) :: acc) this [] in
+		let s = join rcomma l in
+		let s = join rempty [rbropen;s;rbrclose] in
+		vstring s
+	)
+
+	let clear = vifun0 (fun vthis ->
+		StringHashtbl.clear (this vthis);
+		vnull
+	)
+end
+
+module StdObjectMap = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = IObjectMap h} -> Obj.magic h
+		| v -> unexpected_value v "int map"
+
+	let copy = vifun0 (fun vthis ->
+		let copied = ValueHashtbl.copy (this vthis) in
+		encode_object_map_direct copied
+	)
+
+	let exists = vifun1 (fun vthis vkey ->
+		vbool (ValueHashtbl.mem (this vthis) vkey)
+	)
+
+	let get = vifun1 (fun vthis vkey ->
+		try ValueHashtbl.find (this vthis) vkey
+		with Not_found -> vnull
+	)
+
+	let iterator = vifun0 (fun vthis ->
+		let keys = ValueHashtbl.fold (fun _ v acc -> v :: acc) (this vthis) [] in
+		encode_list_iterator keys
+	)
+
+	let keys = vifun0 (fun vthis ->
+		let keys = ValueHashtbl.fold (fun k _ acc -> k :: acc) (this vthis) [] in
+		encode_list_iterator keys
+	)
+
+	let keyValueIterator = map_key_value_iterator key_haxe_iterators_map_key_value_iterator
+
+	let remove = vifun1 (fun vthis vkey ->
+		let this = this vthis in
+		let b = ValueHashtbl.mem this vkey in
+		ValueHashtbl.remove this vkey;
+		vbool b
+	)
+
+	let set = vifun2 (fun vthis vkey vvalue ->
+		ValueHashtbl.replace (this vthis) vkey vvalue;
+		vnull
+	)
+
+	let toString = vifun0 (fun vthis ->
+		let this = this vthis in
+		let l = ValueHashtbl.fold (fun key vvalue acc ->
+			(join rempty [s_value 0 key; create_ascii " => "; s_value 0 vvalue]) :: acc) this [] in
+		let s = join rcomma l in
+		let s = join rempty [rbropen;s;rbrclose] in
+		vstring s
+	)
+
+	let clear = vifun0 (fun vthis ->
+		ValueHashtbl.reset (this vthis);
+		vnull
+	)
+end
+
+let random = Random.State.make_self_init()
+
+module StdMath = struct
+	let to_int f = Int32.of_float (mod_float f 2147483648.0)
+
+	let nan = vfloat nan
+	let negative_infinity = vfloat neg_infinity
+	let pi = vfloat (4.0 *. atan 1.0)
+	let positive_infinity = vfloat infinity
+
+	let abs = vfun1 (fun v ->
+		match v with
+		| VInt32 i -> vint32 (Int32.abs i)
+		| VFloat f -> vfloat (abs_float f)
+		| _ -> unexpected_value v "number"
+	)
+
+	let acos = vfun1 (fun v -> vfloat (acos (num v)))
+	let asin = vfun1 (fun v -> vfloat (asin (num v)))
+	let atan = vfun1 (fun v -> vfloat (atan (num v)))
+	let atan2 = vfun2 (fun a b -> vfloat (atan2 (num a) (num b)))
+	let ceil = vfun1 (fun v -> match v with VInt32 _ -> v | _ -> vint32 (to_int (ceil (num v))))
+	let cos = vfun1 (fun v -> vfloat (cos (num v)))
+	let exp = vfun1 (fun v -> vfloat (exp (num v)))
+	let fceil = vfun1 (fun v -> vfloat (Pervasives.ceil (num v)))
+	let ffloor = vfun1 (fun v -> vfloat (Pervasives.floor (num v)))
+	let floor = vfun1 (fun v -> match v with VInt32 _ -> v | _ -> vint32 (to_int (floor (num v))))
+	let fround = vfun1 (fun v -> vfloat (Pervasives.floor (num v +. 0.5)))
+	let isFinite = vfun1 (fun v -> vbool (match v with VFloat f -> f <> infinity && f <> neg_infinity && f = f | _ -> true))
+	let isNaN = vfun1 (fun v -> vbool (match v with VFloat f -> f <> f | VInt32 _ -> false | _ -> true))
+	let log = vfun1 (fun v -> vfloat (Pervasives.log (num v)))
+
+	let max = vfun2 (fun a b ->
+		let a = num a in
+		let b = num b in
+		vfloat (if a < b then b else if b <> b then b else a);
+	)
+
+	let min = vfun2 (fun a b ->
+		let a = num a in
+		let b = num b in
+		vfloat (if a < b then a else if a <> a then a else b);
+	)
+
+	let pow = vfun2 (fun a b -> vfloat ((num a) ** (num b)))
+	let random = vfun0 (fun () -> vfloat (Random.State.float random 1.))
+	let round = vfun1 (fun v -> match v with VInt32 _ -> v | _ -> vint32 (to_int (Pervasives.floor (num v +. 0.5))))
+	let sin = vfun1 (fun v -> vfloat (sin (num v)))
+
+	let sqrt = vfun1 (fun v ->
+		let v = num v in
+		if v < 0. then nan else vfloat (sqrt v)
+	)
+
+	let tan = vfun1 (fun v -> vfloat (tan (num v)))
+end
+
+module StdMd5 = struct
+	let encode = vfun1 (fun s ->
+		let s = decode_string s in
+		encode_string (Digest.to_hex (Digest.string s))
+	)
+
+	let make = vfun1 (fun b ->
+		let b = decode_bytes b in
+		encode_bytes (Bytes.unsafe_of_string (Digest.string (Bytes.unsafe_to_string b)))
+	)
+end
+
+module StdMutex = struct
+	let this vthis = match vthis with
+		| VInstance {ikind=IMutex mutex} -> mutex
+		| _ -> unexpected_value vthis "Mutex"
+
+	let acquire = vifun0 (fun vthis ->
+		let mutex = this vthis in
+		Mutex.lock mutex.mmutex;
+		mutex.mowner <- Some (Thread.id (Thread.self()));
+		vnull
+	)
+
+	let release = vifun0 (fun vthis ->
+		let mutex = this vthis in
+		mutex.mowner <- None;
+		Mutex.unlock mutex.mmutex;
+		vnull
+	)
+
+	let tryAcquire = vifun0 (fun vthis ->
+		let mutex = this vthis in
+		if Mutex.try_lock mutex.mmutex then begin
+			mutex.mowner <- Some (Thread.id (Thread.self()));
+			vtrue
+		end else
+			vfalse
+	)
+end
+
+module StdNativeProcess = struct
+
+	let this vthis = match vthis with
+		| VInstance {ikind=IProcess proc} -> proc
+		| _ -> unexpected_value vthis "NativeProcess"
+
+	let call f vthis bytes pos len =
+		let this = this vthis in
+		let bytes = decode_bytes bytes in
+		let pos = decode_int pos in
+		let len = decode_int len in
+		f this (Bytes.unsafe_to_string bytes) pos len
+
+	let process_catch f vthis =
+		try f (this vthis)
+		with Failure msg -> exc_string msg
+
+	let close = vifun0 (fun vthis ->
+		process_catch Process.close vthis;
+		vnull
+	)
+
+	let exitCode = vifun0 (fun vthis ->
+		vint (process_catch Process.exit vthis)
+	)
+
+	let getPid = vifun0 (fun vthis ->
+		vint (process_catch Process.pid vthis)
+	)
+
+	let kill = vifun0 (fun vthis ->
+		process_catch Process.kill vthis;
+		vnull
+	)
+
+	let readStderr = vifun3 (fun vthis bytes pos len ->
+		try vint (call Process.read_stderr vthis bytes pos len) with _ -> exc_string "Could not read stderr"
+	)
+
+	let readStdout = vifun3 (fun vthis bytes pos len ->
+		try vint (call Process.read_stdout vthis bytes pos len) with _ -> exc_string "Could not read stdout"
+	)
+
+	let closeStdin = vifun0 (fun vthis ->
+		process_catch Process.close_stdin vthis;
+		vnull
+	)
+
+	let writeStdin = vifun3 (fun vthis bytes pos len ->
+		vint (call Process.write_stdin vthis bytes pos len)
+	)
+end
+
+module StdReflect = struct
+
+	let r_get_ = create_ascii "get_"
+	let r_set_ = create_ascii "set_"
+
+	let callMethod = vfun3 (fun o f args ->
+		call_value_on o f (decode_array args)
+	)
+
+	let compare = vfun2 (fun a b ->
+		vint (match compare a b with
+		| CEq -> 0
+		| CInf -> -1
+		| CSup -> 1
+		| CUndef -> -1)
+	)
+
+	let compareMethods = vfun2 (fun a b ->
+		let rec loop a b = a == b || match a,b with
+			| VFunction(f1,_),VFunction(f2,_) -> f1 == f2
+			| VFieldClosure(v1,f1),VFieldClosure(v2,f2) -> f1 == f2 && EvalMisc.compare v1 v2 = CEq
+			| _ -> false
+		in
+		vbool (loop a b)
+	)
+
+	let copy = vfun1 (fun o -> match vresolve o with
+		| VNull -> VNull
+		| VObject o -> VObject { o with ofields = Array.copy o.ofields }
+		| VInstance vi -> vinstance {
+			ifields = Array.copy vi.ifields;
+			iproto = vi.iproto;
+			ikind = vi.ikind;
+		}
+		| VString _ -> o
+		| VArray va -> VArray { va with avalues = Array.copy va.avalues }
+		| VVector vv -> VVector (Array.copy vv)
+		| _ -> unexpected_value o "object"
+	)
+
+	let deleteField = vfun2 (fun o name ->
+		let name = hash (decode_vstring name).sstring in
+		match vresolve o with
+		| VObject o ->
+			let found = ref false in
+			let fields = IntMap.fold (fun name' i acc ->
+				if name = name' then begin
+					found := true;
+					acc
+				end else
+					(name',o.ofields.(i)) :: acc
+			) o.oproto.pinstance_names [] in
+			if !found then begin
+				update_object_prototype o fields;
+				vtrue
+			end else
+				vfalse
+		| _ ->
+			vfalse
+	)
+
+	let field' = vfun2 (fun o name ->
+		if o = vnull then vnull else dynamic_field o (hash (decode_vstring name).sstring)
+	)
+
+	let fields = vfun1 (fun o ->
+		let proto_fields proto = IntMap.fold (fun name _ acc -> name :: acc) proto.pnames [] in
+		let fields = match vresolve o with
+			| VObject o -> List.map fst (object_fields o)
+			| VInstance vi -> IntMap.fold (fun name _ acc -> name :: acc) vi.iproto.pinstance_names []
+			| VPrototype proto -> proto_fields proto
+			| VNull -> []
+			| VString _ | VArray _ | VVector _ -> [key_length]
+			| _ -> unexpected_value o "object"
+		in
+		encode_array (List.map (fun i -> encode_string (rev_hash i)) fields)
+	)
+
+	let getProperty = vfun2 (fun o name ->
+		if o = VNull then
+			vnull
+		else begin
+			let name = decode_vstring name in
+			let name_get = hash (concat r_get_ name).sstring in
+			let vget = field o name_get in
+			if vget <> VNull then call_value_on o vget []
+			else dynamic_field o (hash name.sstring)
+		end
+	)
+
+	let hasField = vfun2 (fun o field ->
+		let name = hash (decode_vstring field).sstring in
+		let b = match vresolve o with
+			| VObject o -> IntMap.mem name o.oproto.pinstance_names
+			| VInstance vi -> IntMap.mem name vi.iproto.pinstance_names || IntMap.mem name vi.iproto.pnames
+			| VPrototype proto -> IntMap.mem name proto.pnames
+			| _ -> unexpected_value o "object"
+		in
+		vbool b
+	)
+
+	let isEnumValue = vfun1 (fun v -> match v with
+		| VEnumValue _ -> vtrue
+		| _ -> vfalse
+	)
+
+	let isFunction = vfun1 (fun f ->
+		match f with
+		| VFunction _ | VFieldClosure _ -> vtrue
+		| _ -> vfalse
+	)
+
+	let isObject = vfun1 (fun v -> match vresolve v with
+		| VObject _ | VString _ | VArray _ | VVector _ | VInstance _ | VPrototype _ -> vtrue
+		| _ -> vfalse
+	)
+
+	let makeVarArgs = vfun1 (fun f ->
+		vstatic_function ((fun vl -> call_value f [encode_array vl]))
+	)
+
+	let setField = vfun3 (fun o name v ->
+		(try set_field o (hash (decode_vstring name).sstring) v with Not_found -> ()); vnull
+	)
+
+	let setProperty = vfun3 (fun o name v ->
+		let name = decode_vstring name in
+		let name_set = hash (concat r_set_ name).sstring in
+		let vset = field o name_set in
+		if vset <> VNull then call_value_on o vset [v]
+		else begin
+			(try set_field o (hash name.sstring) v with Not_found -> ());
+			vnull
+		end
+	)
+end
+
+module StdResource = struct
+	open Common
+
+	let listNames = vfun0 (fun () ->
+		encode_array (List.map create_unknown (hashtbl_keys ((get_ctx()).curapi.MacroApi.get_com()).resources))
+	)
+
+	let getString = vfun1 (fun name ->
+		try ((create_unknown (Hashtbl.find ((get_ctx()).curapi.MacroApi.get_com()).resources (decode_string name)))) with Not_found -> vnull
+	)
+
+	let getBytes = vfun1 (fun name ->
+		try encode_bytes (Bytes.unsafe_of_string (Hashtbl.find ((get_ctx()).curapi.MacroApi.get_com()).resources (decode_string name))) with Not_found -> vnull
+	)
+end
+
+module StdSha1 = struct
+	let encode = vfun1 (fun s ->
+		let s = decode_string s in
+		encode_string (Sha1.to_hex (Sha1.string s))
+	)
+
+	let make = vfun1 (fun b ->
+		let b = decode_bytes b in
+		encode_bytes (Bytes.unsafe_of_string (Sha1.to_bin (Sha1.string (Bytes.unsafe_to_string b))))
+	)
+end
+
+module StdSocket = struct
+	let inet_addr_to_int32 addr =
+		let s = catch_unix_error Unix.string_of_inet_addr addr in
+		match List.map Int32.of_string (ExtString.String.nsplit s ".") with
+			| [a;b;c;d] -> Int32.add (Int32.add (Int32.add (Int32.shift_left a 24) (Int32.shift_left b 16)) (Int32.shift_left c 8)) d
+			| _ -> assert false
+
+	let this vthis = match vthis with
+		| VInstance {ikind = ISocket sock} -> sock
+		| _ -> unexpected_value vthis "NativeSocket"
+
+	let accept = vifun0 (fun vthis ->
+		let this = this vthis in
+		let socket,_ = catch_unix_error Unix.accept this in
+		encode_instance key_sys_net__Socket_NativeSocket ~kind:(ISocket socket)
+	)
+
+	let bind = vifun2 (fun vthis host port ->
+		let this = this vthis in
+		let host = decode_i32 host in
+		let port = decode_int port in
+		catch_unix_error Unix.bind this (ADDR_INET (StdHost.int32_addr host,port));
+		vnull
+	)
+
+	let close = vifun0 (fun vthis ->
+		catch_unix_error Unix.close (this vthis);
+		vnull
+	)
+
+	let connect = vifun2 (fun vthis host port ->
+		let this = this vthis in
+		let host = decode_i32 host in
+		let port = decode_int port in
+		catch_unix_error (Unix.connect this) (ADDR_INET (StdHost.int32_addr host,port));
+		vnull
+	)
+
+	let host = vifun0 (fun vthis ->
+		match catch_unix_error Unix.getsockname (this vthis) with
+		| ADDR_INET (addr,port) ->
+			encode_obj [
+				key_ip,vint32 (inet_addr_to_int32 addr);
+				key_port,vint port;
+			]
+		| _ -> assert false
+	)
+
+	let listen = vifun1 (fun vthis connections ->
+		let this = this vthis in
+		let connections = decode_int connections in
+		catch_unix_error Unix.listen this connections;
+		vnull
+	)
+
+	let peer = vifun0 (fun vthis ->
+		match catch_unix_error Unix.getpeername (this vthis) with
+		| ADDR_INET (addr,port) ->
+			encode_obj [
+				key_ip,vint32 (inet_addr_to_int32 addr);
+				key_port,vint port;
+			]
+		| _ -> assert false
+	)
+
+	let receive = vifun3 (fun vthis buf pos len ->
+		let this = this vthis in
+		let buf = decode_bytes buf in
+		let pos = decode_int pos in
+		let len = decode_int len in
+		vint (catch_unix_error Unix.recv this buf pos len [])
+	)
+
+	let receiveChar = vifun0 (fun vthis ->
+		let buf = Bytes.make 1 '\000' in
+		ignore(catch_unix_error Unix.recv (this vthis) buf 0 1 []);
+		vint (int_of_char (Bytes.unsafe_get buf 0))
+	)
+
+	let select = vfun4 (fun read write others timeout ->
+		let proto = get_instance_prototype (get_ctx()) key_sys_net_Socket null_pos in
+		let i = get_instance_field_index proto key_socket null_pos in
+		let pair = function
+			| VInstance vi as v -> this vi.ifields.(i),v
+			| v -> unexpected_value v "NativeSocket"
+		in
+		let decode_optional_array = function
+			| VNull -> []
+			| VArray va -> EvalArray.to_list va
+			| v -> unexpected_value v "array"
+		in
+		let read = List.map pair (decode_optional_array read) in
+		let write = List.map pair (decode_optional_array write) in
+		let others = List.map pair (decode_optional_array others) in
+		let timeout = match timeout with VNull -> 0. | VInt32 i -> Int32.to_float i | VFloat f -> f | _ -> unexpected_value timeout "number" in
+		let read',write',others' = catch_unix_error Unix.select (List.map fst read) (List.map fst write) (List.map fst others) timeout in
+		let read = List.map (fun sock -> List.assq sock read) read' in
+		let write = List.map (fun sock -> List.assq sock write) write' in
+		let others = List.map (fun sock -> List.assq sock others) others' in
+		encode_obj [
+			key_read,encode_array read;
+			key_write,encode_array write;
+			key_others,encode_array others;
+		]
+	)
+
+	let send = vifun3 (fun vthis buf pos len ->
+		let this = this vthis in
+		let buf = decode_bytes buf in
+		let pos = decode_int pos in
+		let len = decode_int len in
+		vint (catch_unix_error Unix.send this buf pos len [])
+	)
+
+	let sendChar = vifun1 (fun vthis char ->
+		let this = this vthis in
+		let char = decode_int char in
+		ignore(catch_unix_error Unix.send this (Bytes.make 1 (char_of_int char)) 0 1 []);
+		VNull
+	)
+
+	let setFastSend = vifun1 (fun vthis b ->
+		let this = this vthis in
+		let b = decode_bool b in
+		catch_unix_error Unix.setsockopt this TCP_NODELAY b;
+		vnull
+	)
+
+	let setBroadcast = vifun1 (fun vthis b ->
+		let this = this vthis in
+		let b = decode_bool b in
+		catch_unix_error Unix.setsockopt this SO_BROADCAST b;
+		vnull
+	)
+
+	let setTimeout = vifun1 (fun vthis timeout ->
+		let this = this vthis in
+		let timeout = match timeout with VNull -> 0. | VInt32 i -> Int32.to_float i | VFloat f -> f | _ -> unexpected_value timeout "number" in
+		let timeout = timeout *. 1000. in
+		catch_unix_error (fun () ->
+			Unix.setsockopt_float this SO_RCVTIMEO timeout;
+			Unix.setsockopt_float this SO_SNDTIMEO timeout;
+		) ();
+		vnull
+	)
+
+	let shutdown = vifun2 (fun vthis read write ->
+		let this = this vthis in
+		let mode = match read,write with
+			| VTrue,VTrue -> Unix.SHUTDOWN_ALL
+			| VTrue,_ -> SHUTDOWN_RECEIVE
+			| _,VTrue -> SHUTDOWN_SEND
+			| _ -> exc_string "Nothing to shut down"
+		in
+		catch_unix_error Unix.shutdown this mode;
+		vnull
+	)
+end
+
+module StdStd = struct
+	let is' = vfun2 (fun v t -> match t with
+		| VNull -> vfalse
+		| VPrototype proto -> vbool (is v proto.ppath)
+		| _ -> vfalse
+	)
+
+	let downcast = vfun2 (fun v t -> match t with
+		| VPrototype proto ->
+			if is v proto.ppath then v else vnull
+		| _ -> vfalse
+	)
+
+	let instance = downcast
+
+	let string = vfun1 (fun v -> match v with
+		| VString _ -> v
+		| _ -> vstring (s_value 0 v)
+	)
+
+	let int = vfun1 (fun v ->
+		try vint (int_of_float (num v)) with _ -> vnull
+	)
+
+	let parseInt = vfun1 (fun v ->
+		try vint32 (Numeric.parse_int (decode_string v)) with _ -> vnull
+	)
+
+	let parseFloat = vfun1 (fun v ->
+		try vfloat (Numeric.parse_float (decode_string v)) with _ -> vnull
+	)
+
+	let random = vfun1 (fun v ->
+		let v = decode_int v in
+		vint (Random.State.int random (if v <= 0 then 1 else v))
+	);
+end
+
+module StdString = struct
+	let this vthis = match vthis with
+		| VString s -> s
+		| v -> unexpected_value v "string"
+
+	let charAt = vifun1 (fun vthis index ->
+		let this = this vthis in
+		let i = decode_int index in
+		if i < 0 || i >= this.slength then encode_string ""
+		else vstring (from_char_code (char_at this i))
+	)
+
+	let charCodeAt = vifun1 (fun vthis index ->
+		let this = this vthis in
+		let i = decode_int index in
+		if i < 0 || i >= this.slength then vnull
+		else vint (char_at this i)
+	)
+
+	let fromCharCode = vfun1 (fun i ->
+		let i = decode_int i in
+		try
+			vstring (from_char_code i)
+		with
+		| Not_found ->
+			vnull
+	)
+
+	let indexOf = vifun2 (fun vthis str startIndex ->
+		let str = this str in
+		let this = this vthis in
+		let i = default_int startIndex 0 in
+		try
+			if str.slength = 0 then
+				vint (max 0 (min i this.slength))
+			else begin
+				let i =
+					if i >= this.slength then raise Not_found
+					else if i < 0 then max (this.slength + i) 0
+					else i
+				in
+				let b = get_offset this i in
+				let offset,_,_ = find_substring this str false i b in
+				vint offset
+			end
+		with Not_found ->
+			vint (-1)
+	)
+
+	let lastIndexOf = vifun2 (fun vthis str startIndex ->
+		let str = this str in
+		let this = this vthis in
+		try
+			if str.slength = 0 then begin
+				let i = default_int startIndex this.slength in
+				vint (max 0 (min i this.slength))
+			end else begin
+				let i = default_int startIndex (this.slength - str.slength) in
+				let i = if i < 0 then raise Not_found else if i >= this.slength - str.slength then this.slength - str.slength else i in
+				let b = get_offset this i in
+				let offset,_,_ = find_substring this str true i b in
+				vint offset
+			end
+		with Not_found ->
+			vint (-1)
+	)
+
+	let split = vifun1 (fun vthis delimiter ->
+		let this = this vthis in
+		let s = this.sstring in
+		let delimiter = decode_vstring delimiter in
+		let bl_delimiter = String.length delimiter.sstring in
+		let bl_this = String.length s in
+		let encode_range pos length clength =
+			let s = String.sub s pos length in
+			vstring (create_with_length s clength)
+		in
+		if bl_delimiter = 0 then begin
+			let acc = DynArray.create () in
+			UTF8.iter (fun uc ->
+				DynArray.add acc (vstring (create_with_length (UTF8.init 1 (fun _ -> uc)) 1));
+			) s;
+			encode_array (DynArray.to_list acc)
+		end else if bl_delimiter > bl_this then
+			encode_array [encode_range 0 bl_this this.slength]
+		else begin
+			let acc = DynArray.create () in
+			let f = find_substring this delimiter false in
+			let rec loop c_index b_index =
+				try
+					let c_offset,b_offset,next = f c_index b_index in
+					DynArray.add acc (encode_range b_index (b_offset - b_index) (c_offset - c_index));
+					loop (c_offset + delimiter.slength) next;
+				with Not_found ->
+					DynArray.add acc (encode_range b_index (bl_this - b_index) (this.slength - c_index))
+			in
+			loop 0 0;
+			encode_array_instance (EvalArray.create (DynArray.to_array acc))
+		end
+	)
+
+	let substr = vifun2 (fun vthis pos len ->
+		let this = this vthis in
+		let cl_this = this.slength in
+		let c_pos = decode_int pos in
+		if c_pos >= cl_this then
+			encode_string ""
+		else begin
+			let c_pos = if c_pos < 0 then begin
+				let c_pos = this.slength + c_pos in
+				if c_pos < 0 then 0 else c_pos
+			end else c_pos in
+			begin
+				let c_len = match len with
+					| VNull -> (cl_this - c_pos)
+					| VInt32 i -> Int32.to_int i
+					| _ -> unexpected_value len "int"
+				in
+				let c_len =
+					if c_len < 0 then cl_this + c_len - c_pos
+					else if c_len > cl_this - c_pos then cl_this - c_pos
+					else c_len
+				in
+				vstring (substr this c_pos c_len);
+			end
+		end
+	)
+
+	let substring = vifun2 (fun vthis startIndex endIndex ->
+		let this = this vthis in
+		let c_first = decode_int startIndex in
+		let cl_this = this.slength in
+		let c_last = default_int endIndex cl_this in
+		let c_first = if c_first < 0 then 0 else c_first in
+		let c_last = if c_last < 0 then 0 else c_last in
+		let c_first,c_last = if c_first > c_last then c_last,c_first else c_first,c_last in
+		let c_last = if c_last > cl_this then cl_this else c_last in
+		if c_first > cl_this || c_first = c_last then
+			encode_string ""
+		else begin
+			begin
+				let b_offset1 = get_offset this c_first in
+				let c_len = c_last - c_first in
+				let b_len =
+					if c_last = cl_this then String.length this.sstring - b_offset1
+					else (UTF8.move this.sstring b_offset1 c_len) - b_offset1
+				in
+				vstring (create_with_length (String.sub this.sstring b_offset1 b_len) c_len)
+			end
+		end
+	)
+
+	let toLowerCase = vifun0 (fun vthis ->
+		let this = this vthis in
+		vstring (case_map this false)
+	)
+
+	let toString = vifun0 (fun vthis -> vthis)
+
+	let toUpperCase = vifun0 (fun vthis ->
+		let this = this vthis in
+		vstring (case_map this true)
+	)
+
+	let cca = charCodeAt
+end
+
+module StdStringBuf = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = IBuffer sb} -> sb
+		| v -> unexpected_value v "string"
+
+	let add = vifun1 (fun vthis x ->
+		let this = this vthis in
+		let s = match x with
+			| VString s -> s
+			| _ -> create_ascii (value_string x)
+		in
+		VStringBuffer.add_string this s;
+		vnull;
+	)
+
+	let addChar = vifun1 (fun vthis c ->
+		let this = this vthis in
+		let i = decode_int c in
+		Buffer.add_string this.bbuffer (string_of_char_code i);
+		this.blength <- this.blength + 1;
+		vnull
+	)
+
+	let addSub = vifun3 (fun vthis s pos len ->
+		let this = this vthis in
+		let s = decode_vstring s in
+		let c_pos = decode_int pos in
+		let c_len = match len with
+			| VNull -> String.length s.sstring - c_pos
+			| VInt32 i -> Int32.to_int i
+			| _ -> unexpected_value len "int"
+		in
+		if c_len > 0 then begin
+			let b_offset1 = get_offset s c_pos in
+			let b_offset2 = UTF8.move s.sstring b_offset1 c_len in
+			VStringBuffer.add_substring this s b_offset1 (b_offset2 - b_offset1) c_len;
+		end;
+		vnull
+	)
+
+	let get_length = vifun0 (fun vthis ->
+		let this = this vthis in
+		vint this.blength
+	)
+
+	let toString = vifun0 (fun vthis ->
+		let this = this vthis in
+		let s = VStringBuffer.contents this in
+		vstring s
+	)
+end
+
+module StdStringTools = struct
+	let url_encode s =
+		let b = Buffer.create 0 in
+		Common.url_encode s (Buffer.add_char b);
+		Buffer.contents b
+
+	let fastCodeAt = StdString.charCodeAt
+
+	let replace = vfun3 (fun s sub by ->
+		let by = decode_vstring by in
+		let sub = decode_vstring sub in
+		let s' = decode_vstring s in
+		let bl_s = String.length s'.sstring in
+		let buf = UTF8.Buf.create bl_s in
+		let replace_count = ref 0 in
+		let create () =
+			vstring (create_with_length (UTF8.Buf.contents buf) (s'.slength + by.slength * !replace_count - sub.slength * !replace_count))
+		in
+		if sub.slength = 0 then begin
+			if by.slength = 0 then
+				s
+			else begin
+				UTF8.iter (fun uc ->
+					UTF8.Buf.add_char buf uc;
+					(* don't add for the final char *)
+					if !replace_count <> s'.slength - 1 then begin
+						UTF8.Buf.add_string buf by.sstring;
+						incr replace_count;
+					end
+				) s'.sstring;
+				create ();
+			end
+		end else begin
+			let f = find_substring s' sub false in
+			let rec loop c_index b_index =
+				try
+					let c_offset,b_offset,next = f c_index b_index in
+					UTF8.Buf.add_string buf (String.sub s'.sstring b_index (b_offset - b_index));
+					UTF8.Buf.add_string buf by.sstring;
+					incr replace_count;
+					loop (c_offset + sub.slength) next;
+				with Not_found ->
+					UTF8.Buf.add_string buf (String.sub s'.sstring b_index (bl_s - b_index));
+			in
+			loop 0 0;
+			create()
+		end
+	)
+
+	let urlEncode = vfun1 (fun s ->
+		let s = decode_string s in
+		encode_string (url_encode s)
+	)
+
+	let urlDecode = vfun1 (fun s ->
+		let s = decode_string s in
+		let b = VStringBuffer.create () in
+		let add s =
+			VStringBuffer.add_string b s
+		in
+		let len = String.length s in
+		let decode c =
+			match c with
+			| '0'..'9' -> Some (int_of_char c - int_of_char '0')
+			| 'a'..'f' -> Some (int_of_char c - int_of_char 'a' + 10)
+			| 'A'..'F' -> Some (int_of_char c - int_of_char 'A' + 10)
+			| _ -> None
+		in
+		let decode_hex i =
+			let p1 = (try decode (String.get s i) with _ -> None) in
+			let p2 = (try decode (String.get s (i + 1)) with _ -> None) in
+			match p1, p2 with
+			| Some c1, Some c2 ->
+				Some (((c1 lsl 4) lor c2))
+			| _ ->
+				None
+		in
+		let expect_hex i =
+			match String.unsafe_get s i with
+			| '%' ->
+				begin match decode_hex (i + 1) with
+				| None -> exc_string "Malformed"
+				| Some c -> c
+				end
+			| _ -> exc_string "Malformed"
+		in
+		let rec loop i =
+			if i = len then () else
+			let c = String.unsafe_get s i in
+			match c with
+			| '%' ->
+				begin match decode_hex (i + 1) with
+				| Some c ->
+					if c < 0x80 then begin
+						add (create_ascii (String.make 1 (char_of_int c)));
+						loop (i + 3)
+					end else if c < 0xE0 then begin
+						let c2 = expect_hex (i + 3) in
+						add (from_char_code (((c land 0x3F) lsl 6) lor (c2 land 0x7F)));
+						loop (i + 6)
+					end else if c < 0xF0 then begin
+						let c2 = expect_hex (i + 3) in
+						let c3 = expect_hex (i + 6) in
+						add (from_char_code (((c land 0x1F) lsl 12) lor ((c2 land 0x7F) lsl 6) lor (c3 land 0x7F)));
+						loop (i + 9)
+					end else
+						let c2 = expect_hex (i + 3) in
+						let c3 = expect_hex (i + 6) in
+						let c4 = expect_hex (i + 9) in
+						let k = ((c land 0x0F) lsl 18) lor ((c2 land 0x7F) lsl 12) lor ((c3 land 0x7F) lsl 6) lor (c4 land 0x7F) in
+						add (from_char_code k);
+						loop (i + 12)
+				| None ->
+					loop (i + 1)
+				end;
+			| '+' ->
+				add (create_ascii (String.make 1 ' '));
+				loop (i + 1)
+			| c ->
+				add (create_ascii (String.make 1 c));
+				loop (i + 1)
+		in
+		loop 0;
+		vstring (VStringBuffer.contents b)
+	)
+end
+
+module StdSys = struct
+	open MacroApi
+	open Common
+
+	let args = vfun0 (fun () ->
+		encode_array (List.map create_unknown ((get_ctx()).curapi.MacroApi.get_com()).sys_args)
+	)
+
+	let _command = vfun1 (fun cmd ->
+		let cmd = decode_string cmd in
+		vint (((get_ctx()).curapi.get_com()).run_command cmd)
+	)
+
+	let cpuTime = vfun0 (fun () -> vfloat (Sys.time()))
+
+	let environment = vfun0 (fun () ->
+		let env = catch_unix_error Unix.environment() in
+		let h = StringHashtbl.create () in
+		Array.iter(fun s ->
+			let k, v = ExtString.String.split s "=" in
+			StringHashtbl.add h (create_ascii k) (create_unknown v)
+		) env;
+		encode_string_map_direct h
+	)
+
+	let exit = vfun1 (fun code ->
+		(* TODO: Borrowed from interp.ml *)
+		if (get_ctx()).curapi.use_cache() then raise (Error.Fatal_error ("",Globals.null_pos));
+		raise (Sys_exit(decode_int code));
+	)
+
+	let getChar = vfun1 (fun echo ->
+		let echo = decode_bool echo in
+		vint (Extc.getch echo)
+	)
+
+	let getCwd = vfun0 (fun () ->
+		let dir = catch_unix_error Unix.getcwd() in
+		let l = String.length dir in
+		if l = 0 then
+			encode_string "./"
+		else match dir.[l - 1] with
+		| '/' | '\\' ->
+			create_unknown dir
+		| _ ->
+			create_unknown (dir ^ "/")
+	)
+
+	let getEnv = vfun1 (fun s ->
+		let s = decode_string s in
+		try create_unknown (catch_unix_error Unix.getenv s) with _ -> vnull
+	)
+
+	let print = vfun1 (fun v ->
+		let ctx = get_ctx() in
+		let com = ctx.curapi.get_com() in
+		com.print (value_string v);
+		vnull
+	)
+
+	let println = vfun1 (fun v ->
+		let ctx = get_ctx() in
+		let com = ctx.curapi.get_com() in
+		com.print (value_string v ^ lineEnd);
+		vnull
+	)
+
+	let programPath = vfun0 (fun () ->
+		let ctx = get_ctx() in
+		let com = ctx.curapi.get_com() in
+		match com.main_class with
+		| None -> vnull
+		| Some p ->
+			match ctx.curapi.get_type (s_type_path p) with
+			| Some(Type.TInst (c, _)) -> create_unknown (Extc.get_full_path c.Type.cl_pos.Globals.pfile)
+			| _ -> vnull
+	)
+
+	let putEnv = vfun2 (fun s v ->
+		let s = decode_string s in
+		let v = decode_string v in
+		catch_unix_error Unix.putenv s v;
+		vnull
+	)
+
+	let setCwd = vfun1 (fun s ->
+		catch_unix_error Unix.chdir (decode_string s);
+		vnull
+	)
+
+	let setTimeLocale = vfun1 (fun _ -> vfalse)
+
+	let sleep = vfun1 (fun f ->
+		let time = Sys.time() in
+		Thread.yield();
+		let diff = Sys.time() -. time in
+		Thread.delay ((num f) -. diff);
+		vnull
+	)
+
+	let stderr = vfun0 (fun () ->
+		encode_instance key_sys_io_FileOutput ~kind:(IOutChannel stderr)
+	)
+
+	let stdin = vfun0 (fun () ->
+		encode_instance key_sys_io_FileInput ~kind:(IInChannel(stdin,ref false))
+	)
+
+	let stdout = vfun0 (fun () ->
+		encode_instance key_sys_io_FileOutput ~kind:(IOutChannel stdout)
+	)
+
+	let systemName =
+		let cached_sys_name = ref None in
+		vfun0 (fun () ->
+			let s = match Sys.os_type with
+				| "Unix" ->
+					(match !cached_sys_name with
+					| Some n -> n
+					| None ->
+						let ic = catch_unix_error Unix.open_process_in "uname" in
+						let uname = (match input_line ic with
+							| "Darwin" -> "Mac"
+							| n -> n
+						) in
+						close_in ic;
+						cached_sys_name := Some uname;
+						uname)
+				| "Win32" | "Cygwin" -> "Windows"
+				| s -> s
+			in
+			encode_string s
+		)
+
+	let time = vfun0 (fun () -> vfloat (catch_unix_error Unix.gettimeofday()))
+end
+
+module StdThread = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = IThread thread} -> thread
+		| _ -> unexpected_value vthis "Thread"
+
+	let delay = vfun1 (fun f ->
+		Thread.delay (num f);
+		vnull
+	)
+
+	let exit = vfun0 (fun () ->
+		Thread.exit();
+		vnull
+	)
+
+	let id = vifun0 (fun vthis ->
+		vint (Thread.id (this vthis).tthread)
+	)
+
+	let join = vfun1 (fun thread ->
+		Thread.join (this thread).tthread;
+		vnull
+	)
+
+	let kill = vifun0 (fun vthis ->
+		Thread.kill (this vthis).tthread;
+		vnull
+	)
+
+	let self = vfun0 (fun () ->
+		let eval = get_eval (get_ctx()) in
+		encode_instance key_eval_vm_Thread ~kind:(IThread eval.thread)
+	)
+
+	let readMessage = vfun1 (fun blocking ->
+		let eval = get_eval (get_ctx()) in
+		let blocking = decode_bool blocking in
+		Option.get (Deque.pop eval.thread.tdeque blocking)
+	)
+
+	let sendMessage = vifun1 (fun vthis msg ->
+		let this = this vthis in
+		Deque.push this.tdeque msg;
+		vnull
+	)
+
+	let yield = vfun0 (fun () ->
+		Thread.yield();
+		vnull
+	)
+end
+
+module StdTls = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = ITls i} -> i
+		| _ -> unexpected_value vthis "Thread"
+
+	let get_value = vifun0 (fun vthis ->
+		let this = this vthis in
+		try
+			let id = Thread.id (Thread.self()) in
+			let eval = IntMap.find id (get_ctx()).evals in
+			IntMap.find this eval.thread.tstorage
+		with Not_found ->
+			vnull
+	)
+
+	let set_value = vifun1 (fun vthis v ->
+		let this = this vthis in
+		let eval = get_eval (get_ctx()) in
+		eval.thread.tstorage <- IntMap.add this v eval.thread.tstorage;
+		v
+	)
+end
+
+module StdType = struct
+	open Ast
+
+	let create_enum v constr params =
+		let vf = field v constr in
+		match vf,params with
+			| VEnumValue _,VNull -> vf
+			| VEnumValue _,VArray va when va.alength = 0 -> vf
+			| VFunction _,VArray va -> call_value vf (EvalArray.to_list va)
+			| _ -> unexpected_value params "array"
+
+	let allEnums = vfun1 (fun v ->
+		match v with
+		| VPrototype ({pkind = PEnum names} as proto) ->
+			begin try
+				let l = ExtList.List.filter_map (fun (s,_) ->
+					try
+						begin match proto_field_direct proto (hash s) with
+							| VEnumValue _ as v -> Some v
+							| _ -> None
+						end
+					with Not_found ->
+						None
+				) names in
+				encode_array l
+			with Not_found ->
+				vnull
+			end
+		| _ ->
+			vnull
+	)
+
+	let createEmptyInstance = vfun1 (fun v ->
+		match v with
+		| VPrototype {pkind = PClass _; ppath = path} ->
+			begin try
+				(Hashtbl.find (get_ctx()).builtins.empty_constructor_builtins path) ()
+			with Not_found ->
+				encode_instance path
+			end
+		| _ -> vnull
+	)
+
+	let createEnum = vfun3 (fun e constr params ->
+		let constr = hash (decode_vstring constr).sstring in
+		create_enum e constr params
+	)
+
+	let createEnumIndex = vfun3 (fun e index params ->
+		let index = decode_int index in
+		match e with
+		| VPrototype {pkind = PEnum names} ->
+			begin try
+				create_enum e (hash (fst (List.nth names index))) params
+			with Not_found ->
+				vnull
+			end
+		| _ ->
+			vnull
+	)
+
+	let createInstance = vfun2 (fun v vl ->
+		match v with
+		| VPrototype {pkind = PClass _; ppath = path} ->
+			let ctx = get_ctx() in
+			begin try
+				let f = get_special_instance_constructor_raise ctx path in
+				f (decode_array vl)
+			with Not_found ->
+				let vthis = encode_instance path in
+				let fnew = get_instance_constructor ctx path null_pos in
+				ignore(call_value_on vthis (Lazy.force fnew) (decode_array vl));
+				vthis
+			end
+		| _ ->
+			unexpected_value v "Class"
+	)
+
+	let enumConstructor = vfun1 (fun v -> match v with
+		| VEnumValue ve ->
+			begin try
+				begin match (get_static_prototype_raise (get_ctx()) ve.epath).pkind with
+					| PEnum names -> encode_string (fst (List.nth names ve.eindex))
+					| _ -> raise Not_found
+				end
+			with Not_found ->
+				vnull
+			end
+		| v -> unexpected_value v "enum value"
+	)
+
+	let enumEq = vfun2 (fun a b ->
+		let rec weird_eq a b = match a,b with
+			| VEnumValue a,VEnumValue b -> a == b || a.eindex = b.eindex && arrays_equal weird_eq a.eargs b.eargs && a.epath = b.epath
+			| _ -> equals a b
+		in
+		vbool (weird_eq a b)
+	)
+
+	let enumIndex = vfun1 (fun v -> match v with
+		| VEnumValue ev -> (try vint32 (Int32.of_int ev.eindex) with Not_found -> vnull)
+		| v -> unexpected_value v "enum value"
+	)
+
+	let enumParameters = vfun1 (fun v -> match v with
+		| VEnumValue ev ->
+			let va = EvalArray.create ev.eargs in
+			VArray va
+		| v -> unexpected_value v "enum value"
+	)
+
+	let getClass = vfun1 (fun v ->
+		match v with
+		| VInstance ({iproto = {pkind = PInstance}} as vi) -> get_static_prototype_as_value (get_ctx()) vi.iproto.ppath null_pos
+		| VString _ -> get_static_prototype_as_value (get_ctx()) key_String null_pos
+		| VArray _ -> get_static_prototype_as_value (get_ctx()) key_Array null_pos
+		| VVector _ -> get_static_prototype_as_value (get_ctx()) key_eval_Vector null_pos
+		| _ -> vnull
+	)
+
+	let getClassFields = vfun1 (fun v ->
+		match v with
+		| VPrototype {pkind = PClass _;pnames = names} ->
+			encode_array (IntMap.fold (fun name _ acc -> (encode_string (rev_hash name)) :: acc) names []);
+		| _ ->
+			vnull
+	)
+
+	let getClassName = vfun1 (fun v ->
+		match v with
+		| VPrototype {pkind = PClass _; ppath = path} -> encode_string (rev_hash path)
+		| _ -> vnull
+	)
+
+	let getEnum = vfun1 (fun v ->
+		match v with
+		| VEnumValue ve -> get_static_prototype_as_value (get_ctx()) ve.epath null_pos
+		| _ -> vnull
+	)
+
+	let getEnumConstructs = vfun1 (fun v ->
+		match v with
+		| VPrototype {pkind = PEnum names} ->
+			begin try
+				encode_array (List.map (fun (n,_) -> encode_string n) names)
+			with Not_found ->
+				vnull
+			end
+		| _ ->
+			vnull
+	)
+
+	let getEnumName = vfun1 (fun v ->
+		match v with
+		| VPrototype {pkind = PEnum _; ppath = path} -> encode_string (rev_hash path)
+		| _ -> vnull
+	)
+
+	let getInstanceFields = vfun1 (fun v ->
+		match v with
+		| VPrototype proto ->
+			begin try
+				let rec loop acc proto =
+					let acc = match proto.pparent with
+						| None -> acc
+						| Some proto -> loop acc proto
+					in
+					let acc = IntMap.fold (fun name _ acc -> IntMap.add name 0 acc) proto.pinstance_names acc in
+					IntMap.fold (fun name _ acc -> IntMap.add name 0 acc) proto.pnames acc
+				in
+				let proto = get_instance_prototype (get_ctx()) proto.ppath null_pos in
+				encode_array (List.map (fun i -> encode_string (rev_hash i)) (ptmap_keys (loop IntMap.empty proto)))
+			with Not_found ->
+				vnull
+			end
+		| _ ->
+			vnull
+	)
+
+	let getSuperClass = vfun1 (fun v ->
+		match v with
+		| VPrototype {pkind = PClass _; pparent = Some proto} -> proto.pvalue
+		| _ -> vnull
+	)
+
+	let resolveClass = vfun1 (fun v ->
+		let name = (decode_vstring v).sstring in
+		try (get_static_prototype_raise (get_ctx()) (hash name)).pvalue with Not_found -> vnull
+	)
+
+	let resolveEnum = vfun1 (fun v ->
+		let name = (decode_vstring v).sstring in
+		try
+			let proto = get_static_prototype_raise (get_ctx()) (hash name) in
+			begin match proto.pkind with
+				| PEnum _ -> proto.pvalue
+				| _ -> vnull
+			end
+		with Not_found ->
+			vnull
+	)
+
+	let typeof = vfun1 (fun v ->
+		let ctx = (get_ctx()) in
+		let rec loop v = match v with
+			| VNull -> 0,[||]
+			| VInt32 _ -> 1,[||]
+			| VFloat _ -> 2,[||]
+			| VTrue | VFalse -> 3,[||]
+			| VInstance vi -> 6,[|get_static_prototype_as_value ctx vi.iproto.ppath null_pos|]
+			| VString _ -> 6,[|get_static_prototype_as_value ctx key_String null_pos|]
+			| VArray _ -> 6,[|get_static_prototype_as_value ctx key_Array null_pos|]
+			| VVector _ -> 6,[|get_static_prototype_as_value ctx key_eval_Vector null_pos|]
+			| VObject _ | VPrototype _ ->
+				4,[||]
+			| VFunction _
+			| VFieldClosure _ ->
+				5,[||]
+			| VEnumValue ve ->
+				7,[|get_static_prototype_as_value ctx ve.epath null_pos|]
+			| VLazy f ->
+				loop (!f())
+		in
+		let i,vl = loop v in
+		encode_enum_value key_ValueType i vl None
+	)
+end
+
+module StdUncompress = struct
+	open Extc
+
+	let this vthis = match vthis with
+		| VInstance {ikind = IZip zip} -> zip
+		| _ -> unexpected_value vthis "Uncompress"
+
+	let close = vifun0 (fun vthis ->
+		zlib_inflate_end (this vthis).z;
+		vnull
+	)
+
+	let execute = vifun4 (fun vthis src srcPos dst dstPos ->
+		StdCompress.exec zlib_inflate vthis src srcPos dst dstPos
+	)
+
+	let run = vfun2 (fun src bufsize ->
+		let src = decode_bytes src in
+		let bufsize = default_int bufsize (1 lsl 16) in
+		let zip = zlib_inflate_init () in
+		let buf = Buffer.create 0 in
+		let tmp = Bytes.make bufsize (char_of_int 0) in
+		let rec loop pos =
+			let r = zlib_inflate zip (Bytes.unsafe_to_string src) pos (Bytes.length src - pos) tmp 0 bufsize Z_SYNC_FLUSH in
+			Buffer.add_subbytes buf tmp 0 r.z_wrote;
+			if not r.z_finish then loop (pos + r.z_read)
+		in
+		loop 0;
+		encode_bytes (Bytes.unsafe_of_string (Buffer.contents buf))
+	)
+
+	let setFlushMode = StdCompress.setFlushMode
+end
+
+module StdUtf8 = struct
+	let this vthis = match vthis with
+		| VInstance {ikind = IUtf8 buf} -> buf
+		| v -> unexpected_value v "string"
+
+	let addChar = vifun1 (fun vthis c ->
+		UTF8.Buf.add_char (this vthis) (UCharExt.uchar_of_int (decode_int c));
+		vnull
+	)
+
+	let charCodeAt = StdString.charCodeAt
+
+	let compare = vfun2 (fun a b ->
+		let a = decode_string a in
+		let b = decode_string b in
+		vint (Pervasives.compare a b)
+	)
+
+	let decode = vfun1 (fun s ->
+		let s = decode_string s in
+		let buf = Bytes.create (UTF8.length s) in
+		let i = ref 0 in
+		UTF8.iter (fun uc ->
+			Bytes.unsafe_set buf !i (UCharExt.char_of uc);
+			incr i
+		) s;
+		let s = Bytes.unsafe_to_string buf in
+		create_unknown s
+	)
+
+	let encode = vfun1 (fun s ->
+		let s = decode_string s in
+		create_unknown (UTF8.init (String.length s) (fun i -> UCharExt.of_char s.[i]))
+	)
+
+	let iter = vfun2 (fun s f ->
+		let s = decode_string s in
+		UTF8.iter (fun uc -> ignore(call_value f [vint (UCharExt.int_of_uchar uc)])) s;
+		vnull
+	)
+
+	let length = vfun1 (fun s ->
+		let s = decode_vstring s in
+		vint (s.slength)
+	)
+
+	let sub = StdString.substr
+
+	let toString = vifun0 (fun vthis ->
+		let this = this vthis in
+		vstring (create_ascii ((UTF8.Buf.contents this)))
+	)
+
+	let validate = vfun1 (fun s ->
+		let s = decode_string s in
+		try
+			UTF8.validate s;
+			vtrue
+		with UTF8.Malformed_code ->
+			vfalse
+	)
+end
+
+let init_fields builtins path static_fields instance_fields =
+	let map (name,v) = (hash name,v) in
+	let path = path_hash path in
+	builtins.static_builtins <- IntMap.add path (List.map map static_fields) builtins.static_builtins;
+	builtins.instance_builtins <- IntMap.add path (List.map map instance_fields) builtins.instance_builtins
+
+let init_maps builtins =
+	init_fields builtins (["haxe";"ds"],"IntMap") [] [
+		"copy",StdIntMap.copy;
+		"exists",StdIntMap.exists;
+		"get",StdIntMap.get;
+		"iterator",StdIntMap.iterator;
+		"keys",StdIntMap.keys;
+		"keyValueIterator",StdIntMap.keyValueIterator;
+		"remove",StdIntMap.remove;
+		"set",StdIntMap.set;
+		"toString",StdIntMap.toString;
+		"clear",StdIntMap.clear;
+	];
+	init_fields builtins (["haxe";"ds"],"ObjectMap") [] [
+		"copy",StdObjectMap.copy;
+		"exists",StdObjectMap.exists;
+		"get",StdObjectMap.get;
+		"iterator",StdObjectMap.iterator;
+		"keys",StdObjectMap.keys;
+		"keyValueIterator",StdObjectMap.keyValueIterator;
+		"remove",StdObjectMap.remove;
+		"set",StdObjectMap.set;
+		"toString",StdObjectMap.toString;
+		"clear",StdObjectMap.clear;
+	];
+	init_fields builtins (["haxe";"ds"],"StringMap") [] [
+		"copy",StdStringMap.copy;
+		"exists",StdStringMap.exists;
+		"get",StdStringMap.get;
+		"iterator",StdStringMap.iterator;
+		"keys",StdStringMap.keys;
+		"keyValueIterator",StdStringMap.keyValueIterator;
+		"remove",StdStringMap.remove;
+		"set",StdStringMap.set;
+		"toString",StdStringMap.toString;
+		"clear",StdStringMap.clear;
+	]
+
+let init_constructors builtins =
+	let add = Hashtbl.add builtins.constructor_builtins in
+	add key_Array (fun _ -> encode_array_instance (EvalArray.create [||]));
+	add key_eval_Vector
+		(fun vl ->
+			match vl with
+			| [size] ->
+				encode_vector_instance (Array.make (decode_int size) vnull)
+			| _ -> assert false
+		);
+	add key_Date
+		(fun vl ->
+			begin match List.map decode_int vl with
+			| [y;m;d;h;mi;s] ->
+				let f = catch_unix_error (fun () ->
+					let t = Unix.localtime 0. in
+					Unix.mktime {t with tm_sec=s;tm_min=mi;tm_hour=h;tm_mday=d;tm_mon=m;tm_year=y - 1900}
+				) () in
+				encode_instance key_Date ~kind:(IDate (fst f))
+			| _ -> assert false
+			end
+		);
+	add key_EReg
+		(fun vl -> match vl with
+			| [r;opt] -> encode_instance key_EReg ~kind:(StdEReg.create (decode_string r) (decode_string opt))
+			| _ -> assert false
+		);
+	add key_String
+		(fun vl -> match vl with
+			| [s] -> s
+			| _ -> assert false
+		);
+	add key_StringBuf (fun _ -> encode_instance key_StringBuf ~kind:(IBuffer (VStringBuffer.create())));
+	add key_haxe_Utf8
+		(fun vl -> match vl with
+			| [size] -> encode_instance key_haxe_Utf8 ~kind:(IUtf8 (UTF8.Buf.create (default_int size 0)))
+			| _ -> assert false
+		);
+	add key_haxe_ds_StringMap (fun _ -> encode_string_map_direct (StringHashtbl.create ()));
+	add key_haxe_ds_IntMap (fun _ -> encode_int_map_direct (IntHashtbl.create ()));
+	add key_haxe_ds_ObjectMap (fun _ -> encode_object_map_direct (Obj.magic (ValueHashtbl.create 0)));
+	add key_haxe_io_BytesBuffer (fun _ -> encode_instance key_haxe_io_BytesBuffer ~kind:(IOutput (Buffer.create 0)));
+	add key_haxe_io_Bytes
+		(fun vl -> match vl with
+			| [length;b] ->
+				let length = decode_int length in
+				let b = decode_bytes b in
+				let blit_length = if length > Bytes.length b then Bytes.length b else length in
+				let b' = Bytes.create length in
+				Bytes.blit b 0 b' 0 blit_length;
+				encode_bytes b'
+			| _ ->
+				assert false
+		);
+	add key_sys_io__Process_NativeProcess
+		(fun vl -> match vl with
+			| [cmd;args] ->
+				let cmd = decode_string cmd in
+				let args = match args with
+					| VNull -> None
+					| VArray va -> Some (Array.map decode_string (Array.sub va.avalues 0 va.alength))
+					| _ -> unexpected_value args "array"
+				in
+				encode_instance key_sys_io__Process_NativeProcess ~kind:(IProcess (try Process.run cmd args with Failure msg -> exc_string msg))
+			| _ -> assert false
+		);
+	add key_sys_net__Socket_NativeSocket
+		(fun _ ->
+			encode_instance key_sys_net__Socket_NativeSocket ~kind:(ISocket ((catch_unix_error Unix.socket Unix.PF_INET Unix.SOCK_STREAM) 0))
+		);
+	add key_haxe_zip_Compress
+		(fun vl -> match vl with
+			| [level] ->
+				let level = decode_int level in
+				let z = Extc.zlib_deflate_init level in
+				encode_instance key_haxe_zip_Compress ~kind:(IZip { z = z; z_flush = Extc.Z_NO_FLUSH })
+			| _ -> assert false
+		);
+	add key_haxe_zip_Uncompress
+		(fun vl -> match vl with
+			| [windowBits] ->
+				let windowBits = default_int windowBits 15 in
+				let z = Extc.zlib_inflate_init2 windowBits in
+				encode_instance key_haxe_zip_Uncompress ~kind:(IZip { z = z; z_flush = Extc.Z_NO_FLUSH })
+			| _ -> assert false
+		);
+	add key_eval_vm_Thread
+		(fun vl -> match vl with
+			| [f] ->
+				let ctx = get_ctx() in
+				if ctx.is_macro then exc_string "Creating threads in macros is not supported";
+				let thread = EvalThread.spawn ctx (fun () -> call_value f []) in
+				encode_instance key_eval_vm_Thread ~kind:(IThread thread)
+			| _ -> assert false
+		);
+	add key_sys_net_Mutex
+		(fun _ ->
+			let mutex = {
+				mmutex = Mutex.create();
+				mowner = None;
+			} in
+			encode_instance key_sys_net_Mutex ~kind:(IMutex mutex)
+		);
+	add key_sys_net_Lock
+		(fun _ ->
+			let lock = {
+				ldeque = Deque.create();
+			} in
+			encode_instance key_sys_net_Lock ~kind:(ILock lock)
+		);
+	let tls_counter = ref (-1) in
+	add key_sys_net_Tls
+		(fun _ ->
+			incr tls_counter;
+			encode_instance key_sys_net_Tls ~kind:(ITls !tls_counter)
+		);
+	add key_sys_net_Deque
+		(fun _ ->
+			encode_instance key_sys_net_Deque ~kind:(IDeque (Deque.create()))
+		)
+
+let init_empty_constructors builtins =
+	let h = builtins.empty_constructor_builtins in
+	Hashtbl.add h key_Array (fun () -> encode_array_instance (EvalArray.create [||]));
+	Hashtbl.add h key_eval_Vector (fun () -> encode_vector_instance (Array.make 0 vnull));
+	Hashtbl.add h key_Date (fun () -> encode_instance key_Date ~kind:(IDate 0.));
+	Hashtbl.add h key_EReg (fun () -> encode_instance key_EReg ~kind:(IRegex {r = Pcre.regexp ""; r_rex_string = create_ascii "~//"; r_global = false; r_string = ""; r_groups = [||]}));
+	Hashtbl.add h key_String (fun () -> encode_string "");
+	Hashtbl.add h key_haxe_ds_StringMap (fun () -> encode_instance key_haxe_ds_StringMap ~kind:(IStringMap (StringHashtbl.create ())));
+	Hashtbl.add h key_haxe_ds_IntMap (fun () -> encode_instance key_haxe_ds_IntMap ~kind:(IIntMap (IntHashtbl.create ())));
+	Hashtbl.add h key_haxe_ds_ObjectMap (fun () -> encode_instance key_haxe_ds_ObjectMap ~kind:(IObjectMap (Obj.magic (ValueHashtbl.create 0))));
+	Hashtbl.add h key_haxe_io_BytesBuffer (fun () -> encode_instance key_haxe_io_BytesBuffer ~kind:(IOutput (Buffer.create 0)))
+
+let init_standard_library builtins =
+	init_constructors builtins;
+	init_empty_constructors builtins;
+	init_maps builtins;
+	init_fields builtins ([],"Array") [] [
+		"concat",StdArray.concat;
+		"copy",StdArray.copy;
+		"filter",StdArray.filter;
+		"indexOf",StdArray.indexOf;
+		"insert",StdArray.insert;
+		"iterator",StdArray.iterator;
+		"join",StdArray.join;
+		"lastIndexOf",StdArray.lastIndexOf;
+		"map",StdArray.map;
+		"pop",StdArray.pop;
+		"push",StdArray.push;
+		"remove",StdArray.remove;
+		"resize",StdArray.resize;
+		"reverse",StdArray.reverse;
+		"shift",StdArray.shift;
+		"slice",StdArray.slice;
+		"sort",StdArray.sort;
+		"splice",StdArray.splice;
+		"toString",StdArray.toString;
+		"unshift",StdArray.unshift;
+	];
+	init_fields builtins (["eval"],"Vector") [
+		"fromArrayCopy",StdEvalVector.fromArrayCopy;
+	] [
+		"blit",StdEvalVector.blit;
+		"toArray",StdEvalVector.toArray;
+		"copy",StdEvalVector.copy;
+		"join",StdEvalVector.join;
+		"map",StdEvalVector.map;
+	];
+	init_fields builtins (["haxe";"io"],"Bytes") [
+		"alloc",StdBytes.alloc;
+		"fastGet",StdBytes.fastGet;
+		"ofData",StdBytes.ofData;
+		"ofString",StdBytes.ofString;
+		"ofHex",StdBytes.ofHex;
+	] [
+		"blit",StdBytes.blit;
+		"compare",StdBytes.compare;
+		"fill",StdBytes.fill;
+		"get",StdBytes.get;
+		"getData",StdBytes.getData;
+		"getDouble",StdBytes.getDouble;
+		"getFloat",StdBytes.getFloat;
+		"getInt32",StdBytes.getInt32;
+		"getInt64",StdBytes.getInt64;
+		"getString",StdBytes.getString;
+		"getUInt16",StdBytes.getUInt16;
+		"set",StdBytes.set;
+		"setDouble",StdBytes.setDouble;
+		"setFloat",StdBytes.setFloat;
+		"setInt32",StdBytes.setInt32;
+		"setInt64",StdBytes.setInt64;
+		"setUInt16",StdBytes.setUInt16;
+		"sub",StdBytes.sub;
+		"toHex",StdBytes.toHex;
+		"toString",StdBytes.toString;
+	];
+	init_fields builtins (["haxe";"io"],"BytesBuffer") [] [
+		"get_length",StdBytesBuffer.get_length;
+		"addByte",StdBytesBuffer.addByte;
+		"add",StdBytesBuffer.add;
+		"addString",StdBytesBuffer.addString;
+		"addInt32",StdBytesBuffer.addInt32;
+		"addInt64",StdBytesBuffer.addInt64;
+		"addFloat",StdBytesBuffer.addFloat;
+		"addDouble",StdBytesBuffer.addDouble;
+		"addBytes",StdBytesBuffer.addBytes;
+		"getBytes",StdBytesBuffer.getBytes;
+	];
+	init_fields builtins (["haxe"],"CallStack") [
+		"getCallStack",StdCallStack.getCallStack;
+		"getExceptionStack",StdCallStack.getExceptionStack;
+	] [];
+	init_fields builtins (["haxe";"zip"],"Compress") [
+		"run",StdCompress.run;
+	] [
+		"close",StdCompress.close;
+		"execute",StdCompress.execute;
+		"setFlushMode",StdCompress.setFlushMode;
+	];
+	init_fields builtins (["eval";"vm"],"Context") [
+		"addBreakpoint",StdContext.addBreakpoint;
+		"breakHere",StdContext.breakHere;
+		"callMacroApi",StdContext.callMacroApi;
+		"loadPlugin",StdContext.loadPlugin;
+	] [];
+	init_fields builtins (["haxe";"crypto"],"Crc32") [
+		"make",StdCrc32.make;
+	] [];
+	init_fields builtins ([],"Date") [
+		"fromString",StdDate.fromString;
+		"fromTime",StdDate.fromTime;
+		"now",StdDate.now;
+	] [
+		"getDate",StdDate.getDate;
+		"getDay",StdDate.getDay;
+		"getFullYear",StdDate.getFullYear;
+		"getHours",StdDate.getHours;
+		"getMinutes",StdDate.getMinutes;
+		"getMonth",StdDate.getMonth;
+		"getSeconds",StdDate.getSeconds;
+		"getUTCDate",StdDate.getUTCDate;
+		"getUTCDay",StdDate.getUTCDay;
+		"getUTCFullYear",StdDate.getUTCFullYear;
+		"getUTCHours",StdDate.getUTCHours;
+		"getUTCMinutes",StdDate.getUTCMinutes;
+		"getUTCMonth",StdDate.getUTCMonth;
+		"getUTCSeconds",StdDate.getUTCSeconds;
+		"getTime",StdDate.getTime;
+		"getTimezoneOffset",StdDate.getTimezoneOffset;
+		"toString",StdDate.toString;
+	];
+	init_fields builtins (["sys";"thread"],"Deque") [] [
+		"add",StdDeque.add;
+		"push",StdDeque.push;
+		"pop",StdDeque.pop;
+	];
+	init_fields builtins ([],"EReg") [
+		"escape",StdEReg.escape;
+	] [
+		"map",StdEReg.map;
+		"match",StdEReg.match';
+		"matched",StdEReg.matched;
+		"matchedLeft",StdEReg.matchedLeft;
+		"matchedPos",StdEReg.matchedPos;
+		"matchedRight",StdEReg.matchedRight;
+		"matchSub",StdEReg.matchSub;
+		"replace",StdEReg.replace;
+		"split",StdEReg.split;
+	];
+	init_fields builtins (["sys";"io"],"File") [
+		"append",StdFile.append;
+		"getBytes",StdFile.getBytes;
+		"getContent",StdFile.getContent;
+		"read",StdFile.read;
+		"saveBytes",StdFile.saveBytes;
+		"saveContent",StdFile.saveContent;
+		"update",StdFile.update;
+		"write",StdFile.write;
+	] [];
+	init_fields builtins (["sys";"io"],"FileInput") [] [
+		"close",StdFileInput.close;
+		"eof",StdFileInput.eof;
+		"seek",StdFileInput.seek;
+		"tell",StdFileInput.tell;
+		"readByte",StdFileInput.readByte;
+		"readBytes",StdFileInput.readBytes;
+	];
+	init_fields builtins (["sys";"io"],"FileOutput") [] [
+		"close",StdFileOutput.close;
+		"flush",StdFileOutput.flush;
+		"seek",StdFileOutput.seek;
+		"tell",StdFileOutput.tell;
+		"writeByte",StdFileOutput.writeByte;
+		"writeBytes",StdFileOutput.writeBytes;
+	];
+	init_fields builtins (["haxe";"io"],"FPHelper") [
+		"doubleToI64",StdFPHelper.doubleToI64;
+		"floatToI32",StdFPHelper.floatToI32;
+		"i32ToFloat",StdFPHelper.i32ToFloat;
+		"i64ToDouble",StdFPHelper.i64ToDouble;
+	] [];
+	init_fields builtins (["sys"],"FileSystem") [
+		"createDirectory",StdFileSystem.createDirectory;
+		"deleteFile",StdFileSystem.deleteFile;
+		"deleteDirectory",StdFileSystem.deleteDirectory;
+		"exists",StdFileSystem.exists;
+		"fullPath",StdFileSystem.fullPath;
+		"isDirectory",StdFileSystem.isDirectory;
+		"rename",StdFileSystem.rename;
+		"readDirectory",StdFileSystem.readDirectory;
+		"stat",StdFileSystem.stat;
+	] [];
+	init_fields builtins (["eval";"vm"],"Gc") [
+		"allocated_bytes",StdGc.allocated_bytes;
+		"compact",StdGc.compact;
+		"counters",StdGc.counters;
+		"finalise",StdGc.finalise;
+		"finalise_release",StdGc.finalise_release;
+		"full_major",StdGc.full_major;
+		"get",StdGc.get;
+		"major",StdGc.major;
+		"major_slice",StdGc.major_slice;
+		"minor",StdGc.minor;
+		"print_stat",StdGc.print_stat;
+		"quick_stat",StdGc.quick_stat;
+		"set",StdGc.set;
+		"stat",StdGc.stat;
+	] [];
+	init_fields builtins (["sys";"net"],"Host") [
+		"localhost",StdHost.localhost;
+		"hostReverse",StdHost.hostReverse;
+		"hostToString",StdHost.hostToString;
+		"resolve",StdHost.resolve;
+	] [];
+	init_fields builtins (["sys";"thread"],"Lock") [] [
+		"release",StdLock.release;
+		"wait",StdLock.wait;
+	];
+	init_fields builtins (["haxe"],"Log") [
+		"trace",StdLog.trace;
+	] [];
+	init_fields builtins ([],"Math") [
+		"NaN",StdMath.nan;
+		"NEGATIVE_INFINITY",StdMath.negative_infinity;
+		"PI",StdMath.pi;
+		"POSITIVE_INFINITY",StdMath.positive_infinity;
+		"abs",StdMath.abs;
+		"acos",StdMath.acos;
+		"asin",StdMath.asin;
+		"atan",StdMath.atan;
+		"atan2",StdMath.atan2;
+		"ceil",StdMath.ceil;
+		"cos",StdMath.cos;
+		"exp",StdMath.exp;
+		"fceil",StdMath.fceil;
+		"ffloor",StdMath.ffloor;
+		"floor",StdMath.floor;
+		"fround",StdMath.fround;
+		"isFinite",StdMath.isFinite;
+		"isNaN",StdMath.isNaN;
+		"log",StdMath.log;
+		"max",StdMath.max;
+		"min",StdMath.min;
+		"pow",StdMath.pow;
+		"random",StdMath.random;
+		"round",StdMath.round;
+		"sin",StdMath.sin;
+		"sqrt",StdMath.sqrt;
+		"tan",StdMath.tan;
+	] [];
+	init_fields builtins (["haxe";"crypto"],"Md5") [
+		"encode",StdMd5.encode;
+		"make",StdMd5.make;
+	] [];
+	init_fields builtins (["sys";"thread"],"Mutex") [] [
+		"acquire",StdMutex.acquire;
+		"tryAcquire",StdMutex.tryAcquire;
+		"release",StdMutex.release;
+	];
+	init_fields builtins (["sys";"io";"_Process"],"NativeProcess") [ ] [
+		"close",StdNativeProcess.close;
+		"exitCode",StdNativeProcess.exitCode;
+		"getPid",StdNativeProcess.getPid;
+		"kill",StdNativeProcess.kill;
+		"readStderr",StdNativeProcess.readStderr;
+		"readStdout",StdNativeProcess.readStdout;
+		"closeStdin",StdNativeProcess.closeStdin;
+		"writeStdin",StdNativeProcess.writeStdin;
+	];
+	init_fields builtins ([],"Reflect") [
+		"callMethod",StdReflect.callMethod;
+		"compare",StdReflect.compare;
+		"compareMethods",StdReflect.compareMethods;
+		"copy",StdReflect.copy;
+		"deleteField",StdReflect.deleteField;
+		"field",StdReflect.field';
+		"fields",StdReflect.fields;
+		"getProperty",StdReflect.getProperty;
+		"hasField",StdReflect.hasField;
+		"isEnumValue",StdReflect.isEnumValue;
+		"isFunction",StdReflect.isFunction;
+		"isObject",StdReflect.isObject;
+		"makeVarArgs",StdReflect.makeVarArgs;
+		"setField",StdReflect.setField;
+		"setProperty",StdReflect.setProperty;
+	] [];
+	init_fields builtins (["haxe"],"Resource") [
+		"listNames",StdResource.listNames;
+		"getString",StdResource.getString;
+		"getBytes",StdResource.getBytes;
+	] [];
+	init_fields builtins (["haxe";"crypto"],"Sha1") [
+		"encode",StdSha1.encode;
+		"make",StdSha1.make;
+	] [];
+	init_fields builtins (["sys";"net";"_Socket"],"NativeSocket") [
+		"select",StdSocket.select;
+	] [
+		"accept",StdSocket.accept;
+		"bind",StdSocket.bind;
+		"close",StdSocket.close;
+		"connect",StdSocket.connect;
+		"host",StdSocket.host;
+		"listen",StdSocket.listen;
+		"peer",StdSocket.peer;
+		"receive",StdSocket.receive;
+		"receiveChar",StdSocket.receiveChar;
+		"send",StdSocket.send;
+		"sendChar",StdSocket.sendChar;
+		"setFastSend",StdSocket.setFastSend;
+		"setBroadcast", StdSocket.setBroadcast;
+		"setTimeout",StdSocket.setTimeout;
+		"shutdown",StdSocket.shutdown;
+	];
+	init_fields builtins ([],"Std") [
+		"downcast",StdStd.downcast;
+		"instance",StdStd.instance;
+		"int",StdStd.int;
+		"is",StdStd.is';
+		"parseFloat",StdStd.parseFloat;
+		"parseInt",StdStd.parseInt;
+		"string",StdStd.string;
+		"random",StdStd.random;
+	] [];
+	init_fields builtins ([],"String") [
+		"fromCharCode",StdString.fromCharCode;
+	] [
+		"charAt",StdString.charAt;
+		"charCodeAt",StdString.charCodeAt;
+		"indexOf",StdString.indexOf;
+		"lastIndexOf",StdString.lastIndexOf;
+		"split",StdString.split;
+		"substr",StdString.substr;
+		"substring",StdString.substring;
+		"toLowerCase",StdString.toLowerCase;
+		"toString",StdString.toString;
+		"toUpperCase",StdString.toUpperCase;
+		"cca",StdString.cca;
+	];
+	init_fields builtins ([],"StringBuf") [] [
+		"add",StdStringBuf.add;
+		"addChar",StdStringBuf.addChar;
+		"addSub",StdStringBuf.addSub;
+		"get_length",StdStringBuf.get_length;
+		"toString",StdStringBuf.toString;
+	];
+	init_fields builtins ([],"StringTools") [
+		"fastCodeAt",StdStringTools.fastCodeAt;
+		"replace",StdStringTools.replace;
+		"urlEncode",StdStringTools.urlEncode;
+		"urlDecode",StdStringTools.urlDecode;
+	] [];
+	init_fields builtins ([],"Sys") [
+		"args",StdSys.args;
+		"_command",StdSys._command;
+		"cpuTime",StdSys.cpuTime;
+		"environment",StdSys.environment;
+		"exit",StdSys.exit;
+		"getChar",StdSys.getChar;
+		"getCwd",StdSys.getCwd;
+		"getEnv",StdSys.getEnv;
+		"print",StdSys.print;
+		"println",StdSys.println;
+		"programPath",StdSys.programPath;
+		"putEnv",StdSys.putEnv;
+		"setCwd",StdSys.setCwd;
+		"setTimeLocale",StdSys.setTimeLocale;
+		"sleep",StdSys.sleep;
+		"stderr",StdSys.stderr;
+		"stdin",StdSys.stdin;
+		"stdout",StdSys.stdout;
+		"systemName",StdSys.systemName;
+		"time",StdSys.time;
+	] [];
+	init_fields builtins (["eval";"vm"],"NativeThread") [
+		"delay",StdThread.delay;
+		"exit",StdThread.exit;
+		"join",StdThread.join;
+		"readMessage",StdThread.readMessage;
+		"self",StdThread.self;
+		"yield",StdThread.yield;
+	] [
+		"id",StdThread.id;
+		"kill",StdThread.kill;
+		"sendMessage",StdThread.sendMessage;
+	];
+	init_fields builtins (["sys";"thread"],"Tls") [] [
+		"get_value",StdTls.get_value;
+		"set_value",StdTls.set_value;
+	];
+	init_fields builtins ([],"Type") [
+		"allEnums",StdType.allEnums;
+		"createEmptyInstance",StdType.createEmptyInstance;
+		"createEnum",StdType.createEnum;
+		"createEnumIndex",StdType.createEnumIndex;
+		"createInstance",StdType.createInstance;
+		"enumConstructor",StdType.enumConstructor;
+		"enumEq",StdType.enumEq;
+		"enumIndex",StdType.enumIndex;
+		"enumParameters",StdType.enumParameters;
+		"getClass",StdType.getClass;
+		"getClassFields",StdType.getClassFields;
+		"getClassName",StdType.getClassName;
+		"getEnum",StdType.getEnum;
+		"getEnumConstructs",StdType.getEnumConstructs;
+		"getEnumName",StdType.getEnumName;
+		"getInstanceFields",StdType.getInstanceFields;
+		"getSuperClass",StdType.getSuperClass;
+		"resolveClass",StdType.resolveClass;
+		"resolveEnum",StdType.resolveEnum;
+		"typeof",StdType.typeof;
+	] [];
+	init_fields builtins (["haxe";"zip"],"Uncompress") [
+		"run",StdUncompress.run;
+	] [
+		"close",StdUncompress.close;
+		"execute",StdUncompress.execute;
+		"setFlushMode",StdUncompress.setFlushMode;
+	];
+	init_fields builtins (["haxe"],"Utf8") [
+		"charCodeAt",StdUtf8.charCodeAt;
+		"compare",StdUtf8.compare;
+		"decode",StdUtf8.decode;
+		"encode",StdUtf8.encode;
+		"iter",StdUtf8.iter;
+		"length",StdUtf8.length;
+		"sub",StdUtf8.sub;
+		"validate",StdUtf8.validate;
+	] [
+		"addChar",StdUtf8.addChar;
+		"toString",StdUtf8.toString;
+	]
diff --git a/src/macro/eval/evalString.ml b/src/macro/eval/evalString.ml
new file mode 100644
index 0000000000000000000000000000000000000000..5522ad8ba58449c85700e4b617ac4223c961d2b4
--- /dev/null
+++ b/src/macro/eval/evalString.ml
@@ -0,0 +1,282 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open EvalValue
+
+let vstring s = VString s
+
+let create_ascii s =
+	{
+		sstring = s;
+		slength = String.length s;
+		soffsets = [];
+	}
+
+let create_with_length s length = {
+	sstring = s;
+	slength = length;
+	soffsets = [];
+}
+
+let create_unknown s =
+	vstring (create_with_length s (try UTF8.length s with _ -> String.length s))
+
+let concat s1 s2 =
+	create_with_length (s1.sstring ^ s2.sstring) (s1.slength + s2.slength)
+
+let join sep sl =
+	let l_sep = sep.slength in
+	let buf = Buffer.create 0 in
+	let _,length = List.fold_left (fun (first,length) s ->
+		let length = if first then 0 else length + l_sep in
+		let length = length + s.slength in
+		if not first then Buffer.add_string buf sep.sstring;
+		Buffer.add_string buf s.sstring;
+		(false,length)
+	) (true,0) sl in
+	create_with_length (Buffer.contents buf) length
+
+let get_offset' s c_index =
+	let rec get_b_offset c_len b_offset =
+		if c_len = 0 then b_offset else
+		get_b_offset (c_len - 1) (UTF8.next s.sstring b_offset)
+	in
+	let rec rget_b_offset c_len b_offset =
+		if c_len = 0 then b_offset else
+		rget_b_offset (c_len + 1) (UTF8.prev s.sstring b_offset)
+	in
+	match s.soffsets with
+	| [] ->
+		let b_offset = get_b_offset c_index 0 in
+		let r = (ref c_index,ref b_offset) in
+		s.soffsets <- r :: s.soffsets;
+		b_offset,r
+	| [(cr_index1,br_offset1) as r1] ->
+		let c_index1 = !cr_index1 in
+		let b_offset1 = !br_offset1 in
+		let diff = c_index - c_index1 in
+		let b_offset = match diff with
+			| 0 -> b_offset1
+			| 1 -> UTF8.next s.sstring b_offset1
+			| -1 -> UTF8.prev s.sstring b_offset1
+			| _ ->
+				if diff > 0 then
+					get_b_offset diff b_offset1
+				else if c_index + diff < 0 then
+					(* big step backwards, better to start over *)
+					get_b_offset c_index 0
+				else
+					rget_b_offset diff b_offset1
+		in
+		(* If our jump is larger than the scientifically determined value 20, upgrade
+		   to two offset pointers. *)
+		let r = if diff > 20 || diff < -20 then begin
+			let r2 = (ref c_index,ref b_offset) in
+			s.soffsets <- r2 :: s.soffsets;
+			r2
+		end else
+			r1
+		in
+		b_offset,r
+	| [(cr_index1,br_offset1) as r1;(cr_index2,br_offset2) as r2] ->
+		let (c_index1,b_offset1) = !cr_index1,!br_offset1 in
+		let (c_index2,b_offset2) = !cr_index2,!br_offset2 in
+		let diff1 = c_index - c_index1 in
+		let diff2 = c_index - c_index2 in
+		let r,b_offset = match diff1,diff2 with
+			| 0,_ -> r1,b_offset1
+			| _,0 -> r2,b_offset2
+			| 1,_ -> r1,UTF8.next s.sstring b_offset1
+			| _,1 -> r2,UTF8.next s.sstring b_offset2
+			| -1,_ -> r1,UTF8.prev s.sstring b_offset1
+			| _,-1 -> r2,UTF8.prev s.sstring b_offset2
+			| _ ->
+				let r,diff,b_offset' = if abs diff1 > abs diff2 then
+					r2,diff2,b_offset2
+				else
+					r1,diff1,b_offset1
+				in
+				let b_offset = if diff > 0 then
+					get_b_offset diff b_offset'
+				else if c_index + diff < 0 then
+					(* big step backwards, better to start over *)
+					get_b_offset c_index 0
+				else
+					rget_b_offset diff b_offset'
+				in
+				r,b_offset
+		in
+		b_offset,r
+	| _ ->
+		assert false
+
+let get_offset s c_index =
+	let b_offset,(cr_index,br_offset) = get_offset' s c_index in
+	cr_index := c_index;
+	br_offset := b_offset;
+	b_offset
+
+let char_at s c_index =
+	let b_offset,(cr_index,br_offset) = get_offset' s c_index in
+	let i = b_offset in
+	let s = s.sstring in
+    let n = Char.code s.[i] in
+    let char,diff =
+		if n < 0x80 then n,1
+		else if n <= 0xdf then
+		(n - 0xc0) lsl 6 lor (0x7f land (Char.code s.[i + 1])),2
+		else if n <= 0xef then
+		let n' = n - 0xe0 in
+		let m0 = Char.code s.[i + 2] in
+		let m = Char.code (String.unsafe_get s (i + 1)) in
+		let n' = n' lsl 6 lor (0x7f land m) in
+		n' lsl 6 lor (0x7f land m0),3
+		else if n <= 0xf7 then
+		let n' = n - 0xf0 in
+		let m0 = Char.code s.[i + 3] in
+		let m = Char.code (String.unsafe_get s (i + 1)) in
+		let n' = n' lsl 6 lor (0x7f land m) in
+		let m = Char.code (String.unsafe_get s (i + 2)) in
+		let n' = n' lsl 6 lor (0x7f land m) in
+		n' lsl 6 lor (0x7f land m0),4
+		else if n <= 0xfb then
+		let n' = n - 0xf8 in
+		let m0 = Char.code s.[i + 4] in
+		let m = Char.code (String.unsafe_get s (i + 1)) in
+		let n' = n' lsl 6 lor (0x7f land m) in
+		let m = Char.code (String.unsafe_get s (i + 2)) in
+		let n' = n' lsl 6 lor (0x7f land m) in
+		let m = Char.code (String.unsafe_get s (i + 3)) in
+		let n' = n' lsl 6 lor (0x7f land m) in
+		n' lsl 6 lor (0x7f land m0),5
+		else if n <= 0xfd then
+		let n' = n - 0xfc in
+		let m0 = Char.code s.[i + 5] in
+		let m = Char.code (String.unsafe_get s (i + 1)) in
+		let n' = n' lsl 6 lor (0x7f land m) in
+		let m = Char.code (String.unsafe_get s (i + 2)) in
+		let n' = n' lsl 6 lor (0x7f land m) in
+		let m = Char.code (String.unsafe_get s (i + 3)) in
+		let n' = n' lsl 6 lor (0x7f land m) in
+		let m = Char.code (String.unsafe_get s (i + 4)) in
+		let n' = n' lsl 6 lor (0x7f land m) in
+		n' lsl 6 lor (0x7f land m0),6
+		else invalid_arg "UTF8.look"
+	in
+	cr_index := c_index + 1;
+	br_offset := b_offset + diff;
+	char
+
+let string_of_char_code i =
+	UTF8.init 1 (fun _ ->  UCharExt.uchar_of_int i)
+
+let from_char_code i =
+	create_with_length (string_of_char_code i) 1
+
+type scan_result =
+	| ScanHit
+	| ScanAscii
+	| ScanOther
+
+let find_substring this sub reverse =
+	let cl_this = this.slength in
+	let cl_sub = sub.slength in
+	let bl_this = String.length this.sstring in
+	let bl_sub = String.length sub.sstring in
+	let s_this = this.sstring in
+	let s_sub = sub.sstring in
+	let rec scan b_index b_len =
+		let c = String.unsafe_get s_this (b_index + b_len) in
+		if c = String.unsafe_get s_sub b_len then begin
+			if b_len + 1 = bl_sub then ScanHit
+			else scan b_index (b_len + 1)
+		end else if c <= '\127' then
+			ScanAscii
+		else
+			ScanOther
+	in
+	if not reverse then begin
+		let rec loop c_index b_index =
+			if c_index > cl_this - cl_sub || b_index >= bl_this then raise Not_found;
+			match scan b_index 0 with
+			| ScanHit ->
+				c_index,b_index,b_index + bl_sub
+			| ScanAscii ->
+				loop (c_index + 1) (b_index + 1)
+			| ScanOther ->
+				loop (c_index + 1) (UTF8.next s_this b_index)
+		in
+		loop
+	end else begin
+		let rec loop c_index b_index =
+			if c_index > cl_this - cl_sub || b_index < 0 then raise Not_found;
+			match scan b_index 0 with
+			| ScanHit ->
+				c_index,b_index,b_index + bl_sub
+			| _ ->
+				loop (c_index - 1) (UTF8.prev s_this b_index)
+		in
+		loop
+	end
+
+let case_map this upper =
+	let buf = UTF8.Buf.create 0 in
+	let a,m = if upper then EvalBytes.Unicase._UPPER,1022 else EvalBytes.Unicase._LOWER,1021 in
+	UTF8.iter (fun uc ->
+		let c = UCharExt.int_of_uchar uc in
+		let up = c lsr 6 in
+		let uc = if up < m then begin
+			let c = a.(up).(c land ((1 lsl 6) - 1)) in
+			if c <> 0 then UCharExt.uchar_of_int c
+			else uc
+		end else
+			uc
+		in
+		UTF8.Buf.add_char buf uc
+	) this.sstring;
+	create_with_length (UTF8.Buf.contents buf) this.slength
+
+let substr this c_index c_length =
+	if c_length < 0 then
+		create_with_length "" 0
+	else begin
+		let b_offset1 = get_offset this c_index in
+		let b_offset2 = UTF8.move this.sstring b_offset1 c_length in
+		create_with_length (String.sub this.sstring b_offset1 (b_offset2 - b_offset1)) c_length
+	end
+
+module VStringBuffer = struct
+	type t = vstring_buffer
+
+	let create () = {
+		bbuffer = Buffer.create 0;
+		blength = 0;
+	}
+
+	let add_string this s =
+		Buffer.add_string this.bbuffer s.sstring;
+		this.blength <- this.blength + s.slength
+
+	let add_substring this s b_pos b_len c_len =
+		Buffer.add_substring this.bbuffer s.sstring b_pos b_len;
+		this.blength <- this.blength + c_len
+
+	let contents this =
+		create_with_length (Buffer.contents this.bbuffer) this.blength
+end
\ No newline at end of file
diff --git a/src/macro/eval/evalThread.ml b/src/macro/eval/evalThread.ml
new file mode 100644
index 0000000000000000000000000000000000000000..0d948c12a8075660f145652d296d605bc9e0b562
--- /dev/null
+++ b/src/macro/eval/evalThread.ml
@@ -0,0 +1,92 @@
+open Globals
+open EvalContext
+open EvalDebugMisc
+open EvalExceptions
+open EvalValue
+
+module Deque = struct
+	let create () = {
+		dvalues = [];
+		dmutex = Mutex.create();
+	}
+
+	let add this i =
+		Mutex.lock this.dmutex;
+		this.dvalues <- this.dvalues @ [i];
+		Mutex.unlock this.dmutex
+
+	let pop this blocking =
+		let rec loop () =
+			Mutex.lock this.dmutex;
+			match this.dvalues with
+			| v :: vl ->
+				this.dvalues <- vl;
+				Mutex.unlock this.dmutex;
+				Some v
+			| [] ->
+				if not blocking then begin
+					Mutex.unlock this.dmutex;
+					None
+				end else begin
+					Mutex.unlock this.dmutex;
+					Thread.yield();
+					loop()
+				end
+		in
+		loop()
+
+	let push this i =
+		Mutex.lock this.dmutex;
+		this.dvalues <- i :: this.dvalues;
+		Mutex.unlock this.dmutex
+end
+
+let create_eval thread = {
+	env = None;
+	thread = thread;
+	debug_channel = Event.new_channel ();
+	debug_state = DbgRunning;
+	breakpoint = make_breakpoint 0 0 BPDisabled BPAny None;
+	caught_types = Hashtbl.create 0;
+	last_return = None;
+	caught_exception = vnull;
+}
+
+let spawn ctx f =
+	let f thread =
+		let id = Thread.id (Thread.self()) in
+		let maybe_send_thread_event reason = match ctx.debug.debug_socket with
+			| Some socket ->
+				socket.connection.send_thread_event id reason
+			| None ->
+				()
+		in
+		let new_eval = create_eval thread in
+		ctx.evals <- IntMap.add id new_eval ctx.evals;
+		let close () =
+			ctx.evals <- IntMap.remove id ctx.evals;
+			maybe_send_thread_event "exited";
+		in
+		try
+			maybe_send_thread_event "started";
+			ignore(f ());
+			close();
+		with
+		| RunTimeException(v,stack,p) ->
+			let msg = get_exc_error_message ctx v stack p in
+			prerr_endline msg;
+			close();
+		| Sys_exit i ->
+			close();
+			exit i;
+		| exc ->
+			close();
+			raise exc
+	in
+	let thread = {
+		tthread = Obj.magic ();
+		tstorage = IntMap.empty;
+		tdeque = Deque.create();
+	} in
+	thread.tthread <- Thread.create f thread;
+	thread
\ No newline at end of file
diff --git a/src/macro/eval/evalValue.ml b/src/macro/eval/evalValue.ml
new file mode 100644
index 0000000000000000000000000000000000000000..f3ed7cd107d0f36bbc68d7277ebde5299b525cbf
--- /dev/null
+++ b/src/macro/eval/evalValue.ml
@@ -0,0 +1,263 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Globals
+open EvalHash
+
+type cmp =
+	| CEq
+	| CSup
+	| CInf
+	| CUndef
+
+type vstring = {
+	(* The bytes representation of the string. This is only evaluated if we
+	   need it for something like random access. *)
+	sstring : UTF8.t;
+	(* The length of the string. *)
+	slength : int;
+	(* The current (character * byte) offsets. *)
+	mutable soffsets : (int ref * int ref) list;
+}
+
+type vstring_buffer = {
+	        bbuffer : Buffer.t;
+	mutable blength : int;
+}
+
+let vstring_equal s1 s2 =
+	s1 == s2 || s1.sstring = s2.sstring
+
+module StringHashtbl = struct
+	type 'value t = (vstring * 'value) StringMap.t ref
+
+	let add this key v = this := StringMap.add key.sstring (key,v) !this
+	let copy this = ref !this
+	let create () = ref StringMap.empty
+	let find this key = StringMap.find key.sstring !this
+	let fold f this acc = StringMap.fold f !this acc
+	let is_empty this = StringMap.is_empty !this
+	let iter f this = StringMap.iter f !this
+	let mem this key = StringMap.mem key.sstring !this
+	let remove this key = this := StringMap.remove key.sstring !this
+	let clear this = this := StringMap.empty
+end
+
+module IntHashtbl = struct
+	type 'value t = 'value IntMap.t ref
+
+	let add this key v = this := IntMap.add key v !this
+	let copy this = ref !this
+	let create () = ref IntMap.empty
+	let find this key = IntMap.find key !this
+	let fold f this acc = IntMap.fold f !this acc
+	let is_empty this = IntMap.is_empty !this
+	let iter f this = IntMap.iter f !this
+	let mem this key = IntMap.mem key !this
+	let remove this key = this := IntMap.remove key !this
+	let clear this = this := IntMap.empty
+end
+
+type vregex = {
+	r : Pcre.regexp;
+	r_rex_string : vstring;
+	r_global : bool;
+	mutable r_string : string;
+	mutable r_groups : Pcre.substrings array;
+}
+
+type vzlib = {
+	z : Extc.zstream;
+	mutable z_flush : Extc.zflush;
+}
+
+type vprototype_kind =
+	| PClass of int list
+	| PEnum of (string * int list) list
+	| PInstance
+	| PObject
+
+type value =
+	| VNull
+	| VTrue
+	| VFalse
+	| VInt32 of int32
+	| VFloat of float
+	| VEnumValue of venum_value
+	| VObject of vobject
+	| VInstance of vinstance
+	| VString of vstring
+	| VArray of varray
+	| VVector of vvector
+	| VPrototype of vprototype
+	| VFunction of vfunc * bool
+	| VFieldClosure of value * vfunc
+	| VLazy of (unit -> value) ref
+
+and vfunc = value list -> value
+
+and vobject = {
+	(* The fields of the object known when it is created. *)
+	mutable ofields : value array;
+	(* The prototype of the object. *)
+	mutable oproto : vprototype;
+}
+
+and vprototype = {
+	(* The path of the prototype. Using rev_hash on this gives the original dot path. *)
+	ppath : int;
+	(* The fields of the prototype itself (static fields). *)
+	pfields : value array;
+	(* Map from hashed name to field offset (in pfields). *)
+	pnames : int IntMap.t;
+	(* The fields of instances of this prototype (non-static fields). *)
+	pinstance_fields : value array;
+	(* Map from hashed name to field offset (in pinstance_fields). *)
+	pinstance_names : int IntMap.t;
+	(*
+		The parent prototype in case of inheritance. Static inheritance is reflected here
+		as well because that information is requires for Type.getSuperClass.
+	*)
+	pparent : vprototype option;
+	(* The [vprototype_kind]. *)
+	pkind : vprototype_kind;
+	(* The value of this prototype, i.e. VPrototype self. *)
+	mutable pvalue : value;
+}
+
+and vinstance_kind =
+	| IBytes of bytes
+	| IRegex of vregex
+	| IDate of float
+	| IStringMap of value StringHashtbl.t
+	| IIntMap of value IntHashtbl.t
+	| IObjectMap of (value,value) Hashtbl.t
+	| IOutput of Buffer.t (* BytesBuffer *)
+	| IBuffer of vstring_buffer(* StringBuf *)
+	| IPos of pos
+	| IUtf8 of UTF8.Buf.buf
+	| IProcess of Process.process
+	| IInChannel of in_channel * bool ref (* FileInput *)
+	| IOutChannel of out_channel (* FileOutput *)
+	| ISocket of Unix.file_descr
+	| IThread of vthread
+	| IMutex of vmutex
+	| ILock of vlock
+	| ITls of int
+	| IDeque of vdeque
+	| IZip of vzlib (* Compress/Uncompress *)
+	| ITypeDecl of Type.module_type
+	| ILazyType of (Type.tlazy ref) * (unit -> value)
+	| IRef of Obj.t
+	| INormal
+
+and vinstance = {
+	(* The fields of this instance. *)
+	ifields : value array;
+	(*
+		The prototype of this instance. Field offsets for ifields can be found using
+		iproto.pinstance_names.
+	*)
+	iproto : vprototype;
+	(* The [vinstance_kind]. *)
+	mutable ikind : vinstance_kind;
+}
+
+and varray = {
+	mutable avalues : value array;
+	mutable alength : int
+}
+
+and vvector = value array
+
+and venum_value = {
+	eindex : int;
+	eargs : value array;
+	epath : int;
+	enpos : pos option;
+}
+
+and vthread = {
+	mutable tthread : Thread.t;
+	tdeque : vdeque;
+	mutable tstorage : value IntMap.t;
+}
+
+and vdeque = {
+	mutable dvalues : value list;
+	dmutex : Mutex.t;
+}
+
+and vmutex = {
+	mmutex : Mutex.t;
+	mutable mowner : int option; (* thread ID *)
+}
+
+and vlock = {
+	ldeque : vdeque;
+}
+
+let rec equals a b = match a,b with
+	| VTrue,VTrue
+	| VFalse,VFalse
+	| VNull,VNull -> true
+	| VInt32 a,VInt32 b -> a = b
+	| VFloat a,VFloat b -> a = b
+	| VFloat a,VInt32 b -> a = (Int32.to_float b)
+	| VInt32 a,VFloat b -> (Int32.to_float a) = b
+	| VEnumValue a,VEnumValue b -> a == b || a.eindex = b.eindex && Array.length a.eargs = 0 && Array.length b.eargs = 0 && a.epath = b.epath
+	| VObject vo1,VObject vo2 -> vo1 == vo2
+	| VInstance vi1,VInstance vi2 -> vi1 == vi2
+	| VString s1,VString s2 -> vstring_equal s1 s2
+	| VArray va1,VArray va2 -> va1 == va2
+	| VVector vv1,VVector vv2 -> vv1 == vv2
+	| VFunction(vf1,_),VFunction(vf2,_) -> vf1 == vf2
+	| VPrototype proto1,VPrototype proto2 -> proto1.ppath = proto2.ppath
+	| VLazy f1,_ -> equals (!f1()) b
+	| _,VLazy f2 -> equals a (!f2())
+	| _ -> a == b
+
+module ValueHashtbl = Hashtbl.Make(struct
+	type t = value
+
+	let equal = equals
+
+	let hash _ = 0
+end)
+
+let vnull = VNull
+let vtrue = VTrue
+let vfalse = VFalse
+let vbool b = if b then VTrue else VFalse
+let vprototype proto = VPrototype proto
+let vinstance i = VInstance i
+let vfunction f = VFunction(f,false)
+let vstatic_function f = VFunction(f,true)
+let vfield_closure v f = VFieldClosure(v,f)
+let vobject o = VObject o
+let vint i = VInt32 (Int32.of_int i)
+let vint32 i = VInt32 i
+let vfloat f = VFloat f
+let venum_value e = VEnumValue e
+
+let s_expr_pretty e = (Type.s_expr_pretty false "" false (Type.s_type (Type.print_context())) e)
+
+let rec vresolve v = match v with
+	| VLazy f -> vresolve (!f())
+	| _ -> v
\ No newline at end of file
diff --git a/src/macro/hlmacro.ml b/src/macro/hlmacro.ml
deleted file mode 100644
index ddd4b8a53ddef3f44c392e13a5ff3f036321b229..0000000000000000000000000000000000000000
--- a/src/macro/hlmacro.ml
+++ /dev/null
@@ -1,554 +0,0 @@
-(*
-	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *)
-open Globals
-open Type
-open Ast
-open Hlcode
-open Hlinterp
-open MacroApi
-
-type value = Hlinterp.value
-
-type context = {
-	com : Common.context; (* macro one *)
-	mutable gen : Genhl.context option;
-	interp : Hlinterp.context;
-	types : (Type.path,int) Hashtbl.t;
-	cached_protos : (obj_type, (virtual_proto * vfield array)) Hashtbl.t;
-	cached_enums : (enum_type, ttype) Hashtbl.t;
-	mutable curapi : value MacroApi.compiler_api;
-	mutable has_error : bool;
-}
-
-exception Error of string * Globals.pos list
-
-let debug = true (* TODO !!! set to false for speed++ ! *)
-
-let get_ctx_ref = ref (fun() -> assert false)
-let get_ctx() : context = (!get_ctx_ref)()
-let macro_lib = Hashtbl.create 0
-let interp() = (get_ctx()).interp
-
-let setup get_api =
-	let api = get_api (fun() -> (get_ctx()).curapi.get_com()) (fun() -> (get_ctx()).curapi) in
-	List.iter (fun (n,v) -> Hashtbl.replace macro_lib n (match v with VClosure (FNativeFun (_,v,_),None) -> v | _ -> assert false)) api;
-	Globals.macro_platform := Globals.Hl
-
-let select ctx =
-	get_ctx_ref := (fun() -> ctx)
-
-let error_handler ctx v stack =
-	let make_pos st =
-		let file, line = Hlinterp.make_stack ctx.interp st in
-		let low = line land 0xFFFFF in
-		{
-			Globals.pfile = file;
-			Globals.pmin = low;
-			Globals.pmax = low + (line lsr 20);
-		}
-	in
-	(*let rec loop o =
-		if o == ctx.error_proto then true else match o.oproto with None -> false | Some p -> loop p
-	in
-	(match v with
-	| VObject o when loop o ->
-		(match get_field o (hash "message"), get_field o (hash "pos") with
-		| VObject msg, VAbstract (APos pos) ->
-			(match get_field msg h_s with
-			| VString msg -> raise (Error.Error (Error.Custom msg,pos))
-			| _ -> ());
-		| _ -> ());
-	| _ -> ());*)
-	raise (Error (Hlinterp.vstr ctx.interp v Hlcode.HDyn,List.map make_pos stack))
-
-let create com api =
-	let ctx = {
-		com = com;
-		gen = None;
-		interp = Hlinterp.create debug;
-		curapi = api;
-		types = Hashtbl.create 0;
-		has_error = false;
-		cached_protos = Hashtbl.create 0;
-		cached_enums = Hashtbl.create 0;
-	} in
-	select ctx;
-	Hlinterp.set_error_handler ctx.interp (error_handler ctx);
-	Hlinterp.set_macro_api ctx.interp (fun name -> try Some (Hashtbl.find macro_lib name) with Not_found -> None);
-	ctx
-
-let init ctx =
-	if ctx.gen = None then ctx.gen <- Some (Genhl.create_context ctx.com true false)
-
-let set_error ctx e =
-	ctx.has_error <- e
-
-let add_types ctx types ready =
-	let types = List.filter (fun t -> match t with
-		| TAbstractDecl a when not (Meta.has Meta.CoreType a.a_meta) ->
-			(* A @:native on an abstract causes the implementation class and the abstract
-			   to have the same path. Let's skip all abstracts so this doesn't matter. *)
-			false
-		| _ ->
-			let path = Type.t_path t in
-			if Hashtbl.mem ctx.types path then false else begin
-				Hashtbl.add ctx.types path (Type.t_infos t).mt_module.m_id;
-				true;
-			end
-	) types in
-	List.iter ready types;
-	if ctx.gen = None then init ctx;
-	match ctx.gen with
-	| None -> assert false
-	| Some gen ->
-		Genhl.add_types gen types;
-		if debug then Genhl.check gen;
-		let code = Genhl.build_code gen types None in
-		if debug then begin
-			try
-				Hlinterp.check code true
-			with Failure _ | Common.Abort _ as exn ->
-				let ch = open_out_bin "hlcode.txt" in
-				Hlcode.dump (fun s -> output_string ch (s ^ "\n")) code;
-				close_out ch;
-				raise exn
-		end;
-		Hlinterp.add_code ctx.interp code
-
-let do_reuse ctx api =
-	ctx.curapi <- api
-
-let can_reuse ctx types =
-	let has_old_version t =
-		let inf = Type.t_infos t in
-		try
-			Hashtbl.find ctx.types inf.mt_path <> inf.mt_module.m_id
-		with Not_found ->
-			false
-	in
-	not (List.exists has_old_version types)
-
-let catch_errors ctx ?(final=(fun() -> ())) f =
-	let prev = get_ctx() in (* switch context in case we have an older one, see #5676 *)
-	select ctx;
-	try
-		let v = f() in
-		final();
-		select prev;
-		Some v
-	with Error _ as e ->
-		final();
-		select prev;
-		raise e
-	|  Abort ->
-		final();
-		select prev;
-		None
-
-let call_path ctx cpath (f:string) args api =
-	if ctx.has_error then
-		None
-	else let old = ctx.curapi in
-	ctx.curapi <- api;
-	let gid = Genhl.resolve_class_global (match ctx.gen with None -> assert false | Some ctx -> ctx) (String.concat "." cpath) in
-	let gval = ctx.interp.Hlinterp.t_globals.(gid) in
-	let fval = Hlinterp.dyn_get_field ctx.interp gval f Hlcode.HDyn in
-	match fval with
-	| Hlinterp.VClosure (f,None) ->
-		catch_errors ~final:(fun() -> ctx.curapi <- old) ctx (fun() -> call_wrap ctx.interp f args)
-	| _ ->
-		prerr_endline (Hlinterp.vstr_d ctx.interp gval);
-		assert false
-
-let vnull = VNull
-let vbool b = VBool b
-let vint i = VInt (Int32.of_int i)
-let vint32 i = VInt i
-let vfloat f = VFloat f
-
-let vfun0 f =
-	let callb args = match args with [] -> f() | _ -> assert false in
-	VClosure(FNativeFun ("fun0",callb,HVoid), None)
-
-let vfun1 f =
-	let callb args = match args with [a] -> f a | _ -> assert false in
-	VClosure(FNativeFun ("fun1",callb,HVoid), None)
-
-let vfun2 f =
-	let callb args = match args with [a;b] -> f a b | _ -> assert false in
-	VClosure(FNativeFun ("fun2",callb,HVoid), None)
-
-let vfun3 f =
-	let callb args = match args with [a;b;c] -> f a b c | _ -> assert false in
-	VClosure(FNativeFun ("fun3",callb,HVoid), None)
-
-let vfun4 f =
-	let callb args = match args with [a;b;c;d] -> f a b c d | _ -> assert false in
-	VClosure(FNativeFun ("fun4",callb,HVoid), None)
-
-let vfun5 f =
-	let callb args = match args with [a;b;c;d;e] -> f a b c d e | _ -> assert false in
-	VClosure(FNativeFun ("fun5",callb,HVoid), None)
-
-let exc_string msg =
-	Hlinterp.throw_msg (interp()) msg
-
-let compiler_error msg pos =
-	assert false (* TODO : raise haxe.macro.Error(msg,pos) *)
-
-let eval_expr ctx (e:texpr) =
-	assert false
-
-let eval_delayed _ _ =
-	assert false (* macro - in - macro *)
-
-let prepare_callback f n =
-	assert false
-
-let encode_pos p = VAbstract (APos p)
-
-let decode_pos = function
-	| VAbstract (APos p) -> p
-	| _ -> raise Invalid_expr
-
-let last_enum_type = ref IExpr
-
-let encode_enum t pos tag pl =
-	last_enum_type := t;
-	match pos with
-	| None -> VEnum (tag,Array.of_list pl)
-	| Some p -> VEnum (tag,Array.of_list (List.rev (encode_pos p :: List.rev pl)))
-
-let decode_enum = function
-	| VEnum (tag,arr) -> tag, Array.to_list arr
-	| _ -> raise Invalid_expr
-
-let decode_enum_with_pos = function
-	| VEnum (tag,arr) when Array.length arr > 0 && (match arr.(Array.length arr - 1) with VAbstract (APos _) -> true | _ -> false) ->
-		let rec loop i =
-			if i = Array.length arr - 1 then [] else arr.(i) :: loop (i + 1)
-		in
-		(tag, loop 0), decode_pos arr.(Array.length arr - 1)
-	| e ->
-		decode_enum e, Globals.null_pos
-
-
-let encode_tdecl t = VAbstract (ATDecl t)
-let encode_unsafe o = VAbstract (AUnsafe o)
-
-let decode_unsafe = function
-	| VAbstract (AUnsafe v) -> v
-	| _ -> raise Invalid_expr
-
-let decode_tdecl = function
-	| VAbstract (ATDecl t) -> t
-	| _ -> raise Invalid_expr
-
-let dec_int = function
-	| VInt i -> Int32.to_int i
-	| _ -> raise Invalid_expr
-
-let dec_i32 = function
-	| VInt i -> i
-	| _ -> raise Invalid_expr
-
-let dec_bool = function
-	| VBool b -> b
-	| _ -> raise Invalid_expr
-
-let field o n =
-	match o with
-	| VDynObj _ | VVirtual _ | VObj _ -> Hlinterp.dyn_get_field (interp()) o n HDyn
-	| _ -> raise Invalid_expr
-
-let dec_string = function
-	| VObj { ofields = [|VBytes s;VInt _|] } -> Hlinterp.hl_to_caml s
-	| _ -> raise Invalid_expr
-
-let dec_array = function
-	| VObj { ofields = [|VInt len;VArray (arr,_)|] } ->
-		let len = Int32.to_int len in
-		let rec loop i =
-			if i = len then [] else arr.(i) :: loop (i+1)
-		in
-		loop 0
-	| v ->
-		raise Invalid_expr
-
-let encode_lazytype f t = VAbstract (ALazyType (f,t))
-
-let decode_lazytype = function
-	| VAbstract (ALazyType (t,_)) -> t
-	| _ -> raise Invalid_expr
-
-let enc_obj t fields =
-	match t with
-	| OMetaAccess ->
-		let h = Hashtbl.create 0 in
-		let rec loop i = function
-			| [] -> ()
-			| (n,_) :: l ->
-				Hashtbl.add h n i;
-				loop (i + 1) l
-		in
-		loop 0 fields;
-		let values = Array.of_list (List.map snd fields) in
-		VDynObj {
-			dfields = h;
-			dvalues = values;
-			dtypes = Array.make (Array.length values) HDyn;
-			dvirtuals = [];
-		}
-	| _ ->
-	let ctx = get_ctx() in
-	let to_str (name,f) =
-		match f with
-		| None -> name
-		| Some f -> name ^ "." ^ f
-	in
-	let vp, idx = try
-		Hashtbl.find ctx.cached_protos t
-	with Not_found ->
-		let name, field = proto_name t in
-		let gen = (match ctx.gen with None -> assert false | Some gen -> gen) in
-		let vt = (try
-			let t = Hashtbl.find gen.Genhl.macro_typedefs name in
-			(match t, field with
-			| _, None -> t
-			| HVirtual v, Some f ->
-				let idx = (try PMap.find f v.vindex with Not_found -> failwith (name ^ " has no field definition " ^ f)) in
-				let _,_, t = v.vfields.(idx) in
-				(match t with
-				| HVirtual _ -> t
-				| _ -> failwith ("Unexpected type " ^ tstr t ^ " for definition " ^ to_str (name,field)))
-			| _ ->
-				assert false
-			)
-		with Not_found -> try
-			let t = PMap.find (["haxe";"macro"],name) gen.Genhl.cached_types in
-			(match t, field with
-			| HEnum e, Some f ->
-				let rec loop i =
-					if i = Array.length e.efields then raise Not_found;
-					let n, _, tl = e.efields.(i) in
-					if n = f then
-						tl.(0)
-					else
-						loop (i + 1)
-				in
-				loop 0
-			| _ ->
-				failwith ("Unexpected type " ^ tstr t ^ " for definition " ^ to_str (name,field)))
-		with Not_found ->
-			failwith ("Macro definition missing " ^ to_str (name,field))
-		) in
-		match vt with
-		| HVirtual vp ->
-			let vindexes = Array.map (fun (n,_,_) ->
-				let rec loop i = function
-					| [] -> VFNone
-					| (n2,_) :: _ when n = n2 -> VFIndex i
-					| _ :: l -> loop (i + 1) l
-				in
-				loop 0 fields
-			) vp.vfields in
-			Hashtbl.replace ctx.cached_protos t (vp, vindexes);
-			vp, vindexes
-		| _ ->
-			failwith (to_str (name,field) ^ " returned invalid type " ^ tstr vt)
-	in
-	if debug then begin
-		let farr = Array.of_list fields in
-		Array.iteri (fun i idx ->
-			let name, _ ,_ = vp.vfields.(i) in
-			match idx with
-			| VFNone ->
-				if List.mem_assoc name fields then failwith ("Field " ^ name ^ " is present in "  ^ to_str (proto_name t))
-			| VFIndex i when i >= Array.length farr ->
-				failwith ("Missing field " ^ name ^ " of "  ^ to_str (proto_name t))
-			| VFIndex i when fst farr.(i) <> name ->
-				failwith ("Field " ^ name ^ " of "  ^ to_str (proto_name t) ^ " is wrongly mapped on " ^ fst farr.(i))
-			| _ ->
-				()
-		) idx;
-		List.iter (fun (n,_) ->
-			if n <> "name_pos" && not (PMap.mem n vp.vindex) then failwith ("Field " ^ n ^ " has data but is not part of type " ^ to_str (proto_name t));
-		) fields;
-	end;
-	VVirtual {
-		vtype = vp;
-		vindexes = idx;
-		vtable = Array.map snd (Array.of_list fields);
-		vvalue = VNull;
-	}
-
-let enc_inst path fields =
-	let ctx = get_ctx() in
-	let t = (match ctx.gen with None -> assert false | Some gen -> try Genhl.resolve_type gen path with Not_found -> assert false) in
-	match t with
-	| HObj o ->
-		let proto, _, _ = Hlinterp.get_proto ctx.interp o in
-		VObj { oproto = proto; ofields = fields }
-	| _ ->
-		assert false
-
-let enc_string s =
-	enc_inst ([],"String") [|VBytes (caml_to_hl s);VInt (Int32.of_int (String.length s))|]
-
-let enc_array vl =
-	let arr = Array.of_list (List.map (fun v ->
-		match v with
-		| VNull | VObj _ | VVirtual _ -> v
-		| VEnum _ ->
-			let ctx = get_ctx() in
-			let et = !last_enum_type in
-			let t = try
-				Hashtbl.find ctx.cached_enums et
-			with Not_found ->
-				let name = enum_name et in
-				let t = (match ctx.gen with
-				| None -> assert false
-				| Some gen -> try PMap.find (["haxe";"macro"],name) gen.Genhl.cached_types with Not_found -> failwith ("Missing enum type " ^ name)
-				) in
-				Hashtbl.replace ctx.cached_enums et t;
-				t
-			in
-			VDyn (v,t)
-		| _ -> failwith "Invalid array value"
-	) vl) in
-	enc_inst (["hl";"types"],"ArrayObj") [|VInt (Int32.of_int (Array.length arr));VArray (arr,HDyn)|]
-
-let encode_bytes s =
-	enc_inst (["haxe";"io"],"Bytes") [|VInt (Int32.of_int (String.length s)); VBytes s|]
-
-let encode_string_map convert pmap =
-	let h = Hashtbl.create 0 in
-	PMap.iter (fun k v -> Hashtbl.add h k (convert v)) pmap;
-	enc_inst (["haxe";"ds"],"StringMap") [|VAbstract (AHashBytes h)|]
-
-let decode_bytes = function
-	| VObj { ofields = [|VInt _;VBytes s|] } -> s
-	| _ -> raise Invalid_expr
-
-let encode_ref v convert tostr =
-	let h = Hashtbl.create 0 in
-	Hashtbl.add h "get" 0;
-	Hashtbl.add h "__string" 1;
-	Hashtbl.add h "toString" 2;
-	Hashtbl.add h "$" 3;
-	VDynObj {
-		dfields = h;
-		dvalues = [|
-			vfun0 (fun() -> convert v);
-			vfun0 (fun() -> VBytes (caml_to_hl (tostr())));
-			vfun0 (fun() -> enc_string (tostr()));
-			VAbstract (AUnsafe (Obj.repr v))
-		|];
-		dtypes = [|
-			HFun ([],HDyn);
-			HFun ([],HBytes);
-			HFun ([],HDyn);
-			HDyn;
-		|];
-		dvirtuals = [];
-	}
-
-let decode_ref v : 'a =
-	match field v "$" with
-	| VAbstract (AUnsafe t) -> Obj.obj t
-	| _ -> raise Invalid_expr
-
-let value_string v =
-	Hlinterp.vstr (get_ctx()).interp v HDyn
-
-let value_signature v =
-	failwith "signature() not supported in HL macros"
-
-let value_to_expr v p =
-	let ctx = get_ctx() in
-	let error v = failwith ("Unsupported value " ^ vstr ctx.interp v Hlcode.HDyn) in
-	(*
-	let h_enum = hash "__enum__" and h_et = hash "__et__" and h_ct = hash "__ct__" in
-	let h_tag = hash "tag" and h_args = hash "args" in
-	let h_length = hash "length" in
-	let make_path t =
-		let rec loop = function
-			| [] -> assert false
-			| [name] -> (Ast.EConst (Ast.Ident name),p)
-			| name :: l -> (Ast.EField (loop l,name),p)
-		in
-		let t = t_infos t in
-		loop (List.rev (if t.mt_module.m_path = t.mt_path then fst t.mt_path @ [snd t.mt_path] else fst t.mt_module.m_path @ [snd t.mt_module.m_path;snd t.mt_path]))
-	in*)
-	let rec loop = function
-		| VNull -> (Ast.EConst (Ast.Ident "null"),p)
-		| VBool b -> (Ast.EConst (Ast.Ident (if b then "true" else "false")),p)
-		| VInt i -> (Ast.EConst (Ast.Int (Int32.to_string i)),p)
-		| VFloat f ->
-			let std = (Ast.EConst (Ast.Ident "std"), p) in
-			let math = (Ast.EField (std, "Math"), p) in
-			if (f = infinity) then
-				(Ast.EField (math, "POSITIVE_INFINITY"), p)
-			else if (f = neg_infinity) then
-				(Ast.EField (math, "NEGATIVE_INFINITY"), p)
-			else if (f <> f) then
-				(Ast.EField (math, "NaN"), p)
-			else
-				(Ast.EConst (Ast.Float (Common.float_repres f)), p)
-		| VAbstract (APos p) ->
-			(Ast.EObjectDecl (
-				(("fileName",Globals.null_pos) , (Ast.EConst (Ast.String p.Globals.pfile) , p)) ::
-				(("lineNumber",Globals.null_pos) , (Ast.EConst (Ast.Int (string_of_int (Lexer.get_error_line p))),p)) ::
-				(("className",Globals.null_pos) , (Ast.EConst (Ast.String ("")),p)) ::
-				[]
-			), p)
-		| VObj { oproto = { pclass = { pname = "String" } }; ofields = [|VBytes content;VInt _|] } ->
-			(Ast.EConst (Ast.String (hl_to_caml content)),p)
-		| v ->
-			error v
-		(*
-		| VObject o as v ->
-			match o.oproto with
-			| None ->
-				(match get_field_opt o h_ct with
-				| Some (VAbstract (ATDecl t)) ->
-					make_path t
-				| _ ->
-					let fields = List.fold_left (fun acc (fid,v) -> ((field_name ctx fid,Globals.null_pos), loop v) :: acc) [] (Array.to_list o.ofields) in
-					(Ast.EObjectDecl fields, p))
-			| Some proto ->
-				match get_field_opt proto h_enum, get_field_opt o h_a, get_field_opt o h_s, get_field_opt o h_length with
-				| _, Some (VArray a), _, Some (VInt len) ->
-					(Ast.EArrayDecl (List.map loop (Array.to_list (Array.sub a 0 len))),p)
-				| Some (VObject en), _, _, _ ->
-					(match get_field en h_et, get_field o h_tag with
-					| VAbstract (ATDecl t), VString tag ->
-						let e = (Ast.EField (make_path t,tag),p) in
-						(match get_field_opt o h_args with
-						| Some (VArray args) ->
-							let args = List.map loop (Array.to_list args) in
-							(Ast.ECall (e,args),p)
-						| _ -> e)
-					| _ ->
-						error v)
-				| _ ->
-					error v
-			*)
-	in
-	loop v
diff --git a/src/macro/interp.ml b/src/macro/interp.ml
deleted file mode 100644
index eb7b7e37d0791dbdec06678d1335ccf55034d224..0000000000000000000000000000000000000000
--- a/src/macro/interp.ml
+++ /dev/null
@@ -1,3103 +0,0 @@
-(*
-	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *)
-
-open Globals
-open Common
-open Nast
-open Unix
-open Type
-open MacroApi
-
-(* ---------------------------------------------------------------------- *)
-(* TYPES *)
-
-type value =
-	| VNull
-	| VBool of bool
-	| VInt of int
-	| VFloat of float
-	| VString of string
-	| VObject of vobject
-	| VArray of value array
-	| VAbstract of vabstract
-	| VFunction of vfunction
-	| VClosure of value list * (value list -> value list -> value)
-	| VInt32 of int32
-
-and vobject = {
-	mutable ofields : (int * value) array;
-	mutable oproto : vobject option;
-}
-
-and vabstract =
-	| ADeallocated of int ref
-	| AKind of vabstract
-	| AHash of (value, value) Hashtbl.t
-	| ARandom of Random.State.t ref
-	| ABuffer of Buffer.t
-	| APos of Globals.pos
-	| AFRead of (in_channel * bool ref)
-	| AFWrite of out_channel
-	| AReg of regexp
-	| AZipI of zlib
-	| AZipD of zlib
-	| AUtf8 of UTF8.Buf.buf
-	| ASocket of Unix.file_descr
-	| ATDecl of module_type
-	| AUnsafe of Obj.t
-	| ALazyType of ((unit -> Type.t) ref) * (unit -> value)
-	| ANekoAbstract of Extc.value
-	| ANekoBuffer of value
-	| ACacheRef of value
-	| AInt32Kind
-	| ATls of value ref
-	| AProcess of Process.process
-
-and vfunction =
-	| Fun0 of (unit -> value)
-	| Fun1 of (value -> value)
-	| Fun2 of (value -> value -> value)
-	| Fun3 of (value -> value -> value -> value)
-	| Fun4 of (value -> value -> value -> value -> value)
-	| Fun5 of (value -> value -> value -> value -> value -> value)
-	| FunVar of (value list -> value)
-
-and regexp = {
-	r : Pcre.regexp;
-	mutable r_string : string;
-	mutable r_groups : int array;
-}
-
-and zlib = {
-	z : Extc.zstream;
-	mutable z_flush : Extc.zflush;
-}
-
-type cmp =
-	| CEq
-	| CSup
-	| CInf
-	| CUndef
-
-type callstack = {
-	cpos : pos;
-	cthis : value;
-	cstack : int;
-	cenv : value array;
-}
-
-type context = {
-	gen : Genneko.context;
-	types : (Type.path,int) Hashtbl.t;
-	prototypes : (string list, vobject) Hashtbl.t;
-	fields_cache : (int,string) Hashtbl.t;
-	mutable error : bool;
-	mutable error_proto : vobject;
-	mutable enums : (value * string) array array;
-	mutable do_call : value -> value -> value list -> pos -> value;
-	mutable do_string : value -> string;
-	mutable do_loadprim : value -> value -> value;
-	mutable do_compare : value -> value -> cmp;
-	mutable loader : value;
-	mutable exports : value;
-	(* runtime *)
-	mutable stack : value DynArray.t;
-	mutable callstack : callstack list;
-	mutable callsize : int;
-	mutable exc : pos list;
-	mutable vthis : value;
-	mutable venv : value array;
-	(* context *)
-	mutable curapi : value MacroApi.compiler_api;
-	(* eval *)
-	mutable locals_map : (string, int) PMap.t;
-	mutable locals_count : int;
-	mutable locals_barrier : int;
-	mutable locals_env : string DynArray.t;
-	mutable globals : (string, value ref) PMap.t;
-}
-
-type access =
-	| AccThis
-	| AccLocal of int
-	| AccGlobal of value ref
-	| AccEnv of int
-	| AccField of (unit -> value) * string
-	| AccArray of (unit -> value) * (unit -> value)
-
-exception Runtime of value
-exception Builtin_error
-
-exception Error of string * Globals.pos list
-
-exception Continue
-exception Break of value
-exception Return of value
-exception Sys_exit of int
-
-(* ---------------------------------------------------------------------- *)
-(* UTILS *)
-
-let get_ctx_ref = ref (fun() -> assert false)
-let get_ctx() = (!get_ctx_ref)()
-
-let to_int f = Int32.of_float (mod_float f 2147483648.0)
-let need_32_bits i = Int32.compare (Int32.logand (Int32.add i 0x40000000l) 0x80000000l) Int32.zero <> 0
-let best_int i = if need_32_bits i then VInt32 i else VInt (Int32.to_int i)
-
-let macro_lib = Hashtbl.create 0
-
-let setup get_api =
-	let api = get_api (fun() -> (get_ctx()).curapi.get_com()) (fun() -> (get_ctx()).curapi) in
-	List.iter (fun (n,v) -> Hashtbl.replace macro_lib n (match v with VFunction v -> v | _ -> assert false)) api
-
-let make_pos p =
-	let low = p.pline land 0xFFFFF in
-	{
-		Globals.pfile = p.psource;
-		Globals.pmin = low;
-		Globals.pmax = low + (p.pline lsr 20);
-	}
-
-let warn ctx msg p =
-	(ctx.curapi.get_com()).Common.warning msg (make_pos p)
-
-let rec pop ctx n =
-	if n > 0 then begin
-		DynArray.delete_last ctx.stack;
-		pop ctx (n - 1);
-	end
-
-let pop_ret ctx f n =
-	let v = f() in
-	pop ctx n;
-	v
-
-let push ctx v =
-	DynArray.add ctx.stack v
-
-let hash f =
-	let h = ref 0 in
-	for i = 0 to String.length f - 1 do
-		h := !h * 223 + int_of_char (String.unsafe_get f i);
-	done;
-	if Sys.word_size = 64 then Int32.to_int (Int32.shift_right (Int32.shift_left (Int32.of_int !h) 1) 1) else !h
-
-let constants =
-	let h = Hashtbl.create 0 in
-	List.iter (fun f -> Hashtbl.add h (hash f) f)
-	["done";"read";"write";"min";"max";"file";"args";"loadprim";"loadmodule";"__a";"__s";"h";
-	"tag";"index";"length";"message";"pack";"name";"params";"sub";"doc";"kind";"meta";"access";
-	"constraints";"opt";"type";"value";"ret";"expr";"field";"values";"get";"__string";"toString";
-	"$";"add";"remove";"has";"__t";"module";"isPrivate";"isPublic";"isExtern";"isInterface";"exclude";
-	"constructs";"names";"superClass";"interfaces";"fields";"statics";"constructor";"init";"t";
-	"gid";"uid";"atime";"mtime";"ctime";"dev";"ino";"nlink";"rdev";"size";"mode";"pos";"len";
-	"binops";"unops";"from";"to";"array";"op";"isPostfix";"impl";"resolve";
-	"id";"capture";"extra";"v";"ids";"vars";"en";"overrides";"status";"overloads";"path";"namePos"];
-	h
-
-let h_get = hash "__get" and h_set = hash "__set"
-and h_add = hash "__add" and h_radd = hash "__radd"
-and h_sub = hash "__sub" and h_rsub = hash "__rsub"
-and h_mult = hash "__mult" and h_rmult = hash "__rmult"
-and h_div = hash "__div" and h_rdiv = hash "__rdiv"
-and h_mod = hash "__mod" and h_rmod = hash "__rmod"
-and h_string = hash "__string" and h_compare = hash "__compare"
-
-and h_constructs = hash "__constructs__" and h_a = hash "__a" and h_s = hash "__s"
-and h_class = hash "__class__"
-
-let exc v =
-	raise (Runtime v)
-
-let exc_string str =
-	exc (VString str)
-
-let select ctx =
-	get_ctx_ref := (fun() -> ctx)
-
-let s_value_kind = function
-	| VNull -> "VNull"
-	| VBool _ -> "VBool"
-	| VInt _ -> "VInt"
-	| VFloat _ -> "VFloat"
-	| VString _ -> "VString"
-	| VObject _ -> "VObject"
-	| VArray _ -> "VArray"
-	| VAbstract _ -> "VAbstract"
-	| VFunction _ -> "VFunction"
-	| VClosure _ -> "VClosure"
-	| VInt32 _ -> "VInt32"
-
-let hash_field ctx f =
-	let h = hash f in
-	(try
-		let f2 = Hashtbl.find ctx.fields_cache h in
-		if f <> f2 then exc (VString ("Field conflict between " ^ f ^ " and " ^ f2));
-	with Not_found ->
-		Hashtbl.add ctx.fields_cache h f);
-	h
-
-let field_name ctx fid =
-	try
-		Hashtbl.find ctx.fields_cache fid
-	with Not_found ->
-		"???"
-
-let obj hash fields =
-	let fields = Array.of_list (List.map (fun (k,v) -> hash k, v) fields) in
-	Array.sort (fun (k1,_) (k2,_) -> compare k1 k2) fields;
-	{
-		ofields = fields;
-		oproto = None;
-	}
-
-let parse_int s =
-	let rec loop_hex i =
-		if i = String.length s then s else
-		match String.unsafe_get s i with
-		| '0'..'9' | 'a'..'f' | 'A'..'F' -> loop_hex (i + 1)
-		| _ -> String.sub s 0 i
-	in
-	let rec loop sp i =
-		if i = String.length s then (if sp = 0 then s else String.sub s sp (i - sp)) else
-		match String.unsafe_get s i with
-		| '0'..'9' -> loop sp (i + 1)
-		| ' ' when sp = i -> loop (sp + 1) (i + 1)
-		| '-' when i = 0 -> loop sp (i + 1)
-		| ('x' | 'X') when i = 1 && String.get s 0 = '0' -> loop_hex (i + 1)
-		| _ -> String.sub s sp (i - sp)
-	in
-	best_int (Int32.of_string (loop 0 0))
-
-let parse_float s =
-	let rec loop sp i =
-		if i = String.length s then (if sp = 0 then s else String.sub s sp (i - sp)) else
-		match String.unsafe_get s i with
-		| ' ' when sp = i -> loop (sp + 1) (i + 1)
-		| '0'..'9' | '-' | '+' | 'e' | 'E' | '.' -> loop sp (i + 1)
-		| _ -> String.sub s sp (i - sp)
-	in
-	float_of_string (loop 0 0)
-
-let find_sub str sub start =
-	let sublen = String.length sub in
-	if sublen = 0 then
-		0
-	else
-		let found = ref 0 in
-		let len = String.length str in
-		try
-			for i = start to len - sublen do
-				let j = ref 0 in
-				while String.unsafe_get str (i + !j) = String.unsafe_get sub !j do
-					incr j;
-					if !j = sublen then begin found := i; raise Exit; end;
-				done;
-			done;
-			raise Not_found
-		with
-			Exit -> !found
-
-let nargs = function
-	| Fun0 _ -> 0
-	| Fun1 _ -> 1
-	| Fun2 _ -> 2
-	| Fun3 _ -> 3
-	| Fun4 _ -> 4
-	| Fun5 _ -> 5
-	| FunVar _ -> -1
-
-let rec get_field o fid =
-	let rec loop min max =
-		if min < max then begin
-			let mid = (min + max) lsr 1 in
-			let cid, v = Array.unsafe_get o.ofields mid in
-			if cid < fid then
-				loop (mid + 1) max
-			else if cid > fid then
-				loop min mid
-			else
-				v
-		end else
-			match o.oproto with
-			| None -> VNull
-			| Some p -> get_field p fid
-	in
-	loop 0 (Array.length o.ofields)
-
-let set_field o fid v =
-	let rec loop min max =
-		let mid = (min + max) lsr 1 in
-		if min < max then begin
-			let cid, _ = Array.unsafe_get o.ofields mid in
-			if cid < fid then
-				loop (mid + 1) max
-			else if cid > fid then
-				loop min mid
-			else
-				Array.unsafe_set o.ofields mid (cid,v)
-		end else
-			let fields = Array.make (Array.length o.ofields + 1) (fid,v) in
-			Array.blit o.ofields 0 fields 0 mid;
-			Array.blit o.ofields mid fields (mid + 1) (Array.length o.ofields - mid);
-			o.ofields <- fields
-	in
-	loop 0 (Array.length o.ofields)
-
-let rec remove_field o fid =
-	let rec loop min max =
-		let mid = (min + max) lsr 1 in
-		if min < max then begin
-			let cid, v = Array.unsafe_get o.ofields mid in
-			if cid < fid then
-				loop (mid + 1) max
-			else if cid > fid then
-				loop min mid
-			else begin
-				let fields = Array.make (Array.length o.ofields - 1) (fid,VNull) in
-				Array.blit o.ofields 0 fields 0 mid;
-				Array.blit o.ofields (mid + 1) fields mid (Array.length o.ofields - mid - 1);
-				o.ofields <- fields;
-				true
-			end
-		end else
-			false
-	in
-	loop 0 (Array.length o.ofields)
-
-let rec get_field_opt o fid =
-	let rec loop min max =
-		if min < max then begin
-			let mid = (min + max) lsr 1 in
-			let cid, v = Array.unsafe_get o.ofields mid in
-			if cid < fid then
-				loop (mid + 1) max
-			else if cid > fid then
-				loop min mid
-			else
-				Some v
-		end else
-			match o.oproto with
-			| None -> None
-			| Some p -> get_field_opt p fid
-	in
-	loop 0 (Array.length o.ofields)
-
-let catch_errors ctx ?(final=(fun() -> ())) f =
-	let n = DynArray.length ctx.stack in
-	let prev = get_ctx() in (* switch context in case we have an older one, see #5676 *)
-	select ctx;
-	try
-		let v = f() in
-		final();
-		select prev;
-		Some v
-	with Runtime v ->
-		pop ctx (DynArray.length ctx.stack - n);
-		final();
-		select prev;
-		let rec loop o =
-			if o == ctx.error_proto then true else match o.oproto with None -> false | Some p -> loop p
-		in
-		(match v with
-		| VObject o when loop o ->
-			(match get_field o (hash "message"), get_field o (hash "pos") with
-			| VObject msg, VAbstract (APos pos) ->
-				(match get_field msg h_s with
-				| VString msg -> raise (Error.Error (Error.Custom msg,pos))
-				| _ -> ());
-			| _ -> ());
-		| _ -> ());
-		raise (Error (ctx.do_string v,List.map (fun s -> make_pos s.cpos) ctx.callstack))
-	| Abort ->
-		pop ctx (DynArray.length ctx.stack - n);
-		final();
-		select prev;
-		None
-
-let make_library fl =
-	let h = Hashtbl.create 0 in
-	List.iter (fun (n,f) -> Hashtbl.add h n f) fl;
-	h
-
-(* ---------------------------------------------------------------------- *)
-(* NEKO INTEROP *)
-
-type primitive = (string * Extc.value * int)
-
-type neko_context = {
-	load : string -> int -> primitive;
-	call : primitive -> value list -> value;
-}
-
-(* try to load dl in order *)
-let rec dlopen dls =
-	let null = Extc.dlint 0 in
-	match dls with
-	| dl_path :: dls ->
-		let dl = Extc.dlopen dl_path in
-		if (Obj.magic dl) == null then
-			dlopen dls
-		else
-			Some dl;
-	| _ ->
-		None
-
-(* ---------------------------------------------------------------------- *)
-(* BUILTINS *)
-
-let builtins =
-	let p = { psource = "<builtin>"; pline = 0 } in
-	let error() =
-		raise Builtin_error
-	in
-	let vint = function
-		| VInt n -> n
-		| _ -> error()
-	in
-	let varray = function
-		| VArray a -> a
-		| _ -> error()
-	in
-	let vstring = function
-		| VString s -> s
-		| _ -> error()
-	in
-	let vobj = function
-		| VObject o -> o
-		| _ -> error()
-	in
-	let vfun = function
-		| VFunction f -> f
-		| VClosure (cl,f) -> FunVar (f cl)
-		| _ -> error()
-	in
-	let vhash = function
-		| VAbstract (AHash h) -> h
-		| _ -> error()
-	in
-	let build_stack sl =
-		let make p =
-			let p = make_pos p in
-			VArray [|VString p.Globals.pfile;VInt (Lexer.get_error_line p)|]
-		in
-		VArray (Array.of_list (List.map make sl))
-	in
-	let do_closure args args2 =
-		match args with
-		| f :: obj :: args ->
-			(get_ctx()).do_call obj f (args @ args2) p
-		| _ ->
-			assert false
-	in
-	let funcs = [
-	(* array *)
-		"array", FunVar (fun vl -> VArray (Array.of_list vl));
-		"amake", Fun1 (fun v -> VArray (Array.create (vint v) VNull));
-		"acopy", Fun1 (fun a -> VArray (Array.copy (varray a)));
-		"asize", Fun1 (fun a -> VInt (Array.length (varray a)));
-		"asub", Fun3 (fun a p l -> VArray (Array.sub (varray a) (vint p) (vint l)));
-		"ablit", Fun5 (fun dst dstp src p l ->
-			Array.blit (varray src) (vint p) (varray dst) (vint dstp) (vint l);
-			VNull
-		);
-		"aconcat", Fun1 (fun arr ->
-			let arr = Array.map varray (varray arr) in
-			VArray (Array.concat (Array.to_list arr))
-		);
-	(* string *)
-		"string", Fun1 (fun v -> VString ((get_ctx()).do_string v));
-		"smake", Fun1 (fun l -> VString (String.make (vint l) '\000'));
-		"ssize", Fun1 (fun s -> VInt (String.length (vstring s)));
-		"scopy", Fun1 (fun s -> VString (String.copy (vstring s)));
-		"ssub", Fun3 (fun s p l -> VString (String.sub (vstring s) (vint p) (vint l)));
-		"sget", Fun2 (fun s p ->
-			try VInt (int_of_char (String.get (vstring s) (vint p))) with Invalid_argument _ -> VNull
-		);
-		"sset", Fun3 (fun s p c ->
-			let c = char_of_int ((vint c) land 0xFF) in
-			try
-				String.set (vstring s) (vint p) c;
-				VInt (int_of_char c)
-			with Invalid_argument _ -> VNull);
-		"sblit", Fun5 (fun dst dstp src p l ->
-			String.blit (vstring src) (vint p) (vstring dst) (vint dstp) (vint l);
-			VNull
-		);
-		"sfind", Fun3 (fun src pos pat ->
-			try VInt (find_sub (vstring src) (vstring pat) (vint pos)) with Not_found -> VNull
-		);
-	(* object *)
-		"new", Fun1 (fun o ->
-			match o with
-			| VNull -> VObject { ofields = [||]; oproto = None }
-			| VObject o -> VObject { ofields = Array.copy o.ofields; oproto = o.oproto }
-			| _ -> error()
-		);
-		"objget", Fun2 (fun o f ->
-			match o with
-			| VObject o -> get_field o (vint f)
-			| _ -> VNull
-		);
-		"objset", Fun3 (fun o f v ->
-			match o with
-			| VObject o -> set_field o (vint f) v; v
-			| _ -> VNull
-		);
-		"objcall", Fun3 (fun o f pl ->
-			match o with
-			| VObject oo ->
-				(get_ctx()).do_call o (get_field oo (vint f)) (Array.to_list (varray pl)) p
-			| _ -> VNull
-		);
-		"objfield", Fun2 (fun o f ->
-			match o with
-			| VObject o ->
-				let p = o.oproto in
-				o.oproto <- None;
-				let v = get_field_opt o (vint f) in
-				o.oproto <- p;
-				VBool (v <> None)
-			| _ -> VBool false
-		);
-		"objremove", Fun2 (fun o f ->
-			VBool (remove_field (vobj o) (vint f))
-		);
-		"objfields", Fun1 (fun o ->
-			VArray (Array.map (fun (fid,_) -> VInt fid) (vobj o).ofields)
-		);
-		"hash", Fun1 (fun v -> VInt (hash_field (get_ctx()) (vstring v)));
-		"fasthash", Fun1 (fun v -> VInt (hash (vstring v)));
-		"field", Fun1 (fun v ->
-			try VString (Hashtbl.find (get_ctx()).fields_cache (vint v)) with Not_found -> VNull
-		);
-		"objsetproto", Fun2 (fun o p ->
-			let o = vobj o in
-			(match p with
-			| VNull -> o.oproto <- None
-			| VObject p -> o.oproto <- Some p
-			| _ -> error());
-			VNull;
-		);
-		"objgetproto", Fun1 (fun o ->
-			match (vobj o).oproto with
-			| None -> VNull
-			| Some p -> VObject p
-		);
-	(* function *)
-		"nargs", Fun1 (fun f ->
-			VInt (nargs (vfun f))
-		);
-		"call", Fun3 (fun f o args ->
-			(get_ctx()).do_call o f (Array.to_list (varray args)) p
-		);
-		"closure", FunVar (fun vl ->
-			match vl with
-			| VFunction f :: _ :: _ ->
-				VClosure (vl, do_closure)
-			| _ -> exc (VString "Can't create closure : value is not a function")
-		);
-		"apply", FunVar (fun vl ->
-			match vl with
-			| f :: args ->
-				let f = vfun f in
-				VFunction (FunVar (fun args2 -> (get_ctx()).do_call VNull (VFunction f) (args @ args2) p))
-			| _ -> exc (VString "Invalid closure arguments number")
-		);
-		"varargs", Fun1 (fun f ->
-			match f with
-			| VFunction (FunVar _) | VFunction (Fun1 _) | VClosure _ ->
-				VFunction (FunVar (fun vl -> (get_ctx()).do_call VNull f [VArray (Array.of_list vl)] p))
-			| _ ->
-				error()
-		);
-	(* numbers *)
-		(* skip iadd, isub, idiv, imult *)
-		"isnan", Fun1 (fun f ->
-			match f with
-			| VFloat f -> VBool (f <> f)
-			| _ -> VBool false
-		);
-		"isinfinite", Fun1 (fun f ->
-			match f with
-			| VFloat f -> VBool (f = infinity || f = neg_infinity)
-			| _ -> VBool false
-		);
-		"int", Fun1 (fun v ->
-			match v with
-			| VInt _ | VInt32 _ -> v
-			| VFloat f -> best_int (to_int f)
-			| VString s -> (try parse_int s with _ -> VNull)
-			| _ -> VNull
-		);
-		"float", Fun1 (fun v ->
-			match v with
-			| VInt i -> VFloat (float_of_int i)
-			| VInt32 i -> VFloat (Int32.to_float i)
-			| VFloat _ -> v
-			| VString s -> (try VFloat (parse_float s) with _ -> VNull)
-			| _ -> VNull
-		);
-	(* abstract *)
-		"getkind", Fun1 (fun v ->
-			match v with
-			| VAbstract a -> VAbstract (AKind a)
-			| VInt32 _ -> VAbstract (AKind AInt32Kind)
-			| _ -> error()
-		);
-		"iskind", Fun2 (fun v k ->
-			match v, k with
-			| VAbstract a, VAbstract (AKind k) -> VBool (Obj.tag (Obj.repr a) = Obj.tag (Obj.repr k))
-			| VInt32 _, VAbstract (AKind AInt32Kind) -> VBool true
-			| _, VAbstract (AKind _) -> VBool false
-			| _ -> error()
-		);
-	(* hash *)
-		"hkey", Fun1 (fun v -> VInt (Hashtbl.hash v));
-		"hnew", Fun1 (fun v ->
-			VAbstract (AHash (match v with
-			| VNull -> Hashtbl.create 0
-			| VInt n -> Hashtbl.create n
-			| _ -> error()))
-		);
-		"hresize", Fun1 (fun v -> VNull);
-		"hget", Fun3 (fun h k cmp ->
-			if cmp <> VNull then assert false;
-			(try Hashtbl.find (vhash h) k with Not_found -> VNull)
-		);
-		"hmem", Fun3 (fun h k cmp ->
-			if cmp <> VNull then assert false;
-			VBool (Hashtbl.mem (vhash h) k)
-		);
-		"hremove", Fun3 (fun h k cmp ->
-			if cmp <> VNull then assert false;
-			let h = vhash h in
-			let old = Hashtbl.mem h k in
-			if old then Hashtbl.remove h k;
-			VBool old
-		);
-		"hset", Fun4 (fun h k v cmp ->
-			if cmp <> VNull then assert false;
-			let h = vhash h in
-			let old = Hashtbl.mem h k in
-			Hashtbl.replace h k v;
-			VBool (not old);
-		);
-		"hadd", Fun3 (fun h k v ->
-			let h = vhash h in
-			let old = Hashtbl.mem h k in
-			Hashtbl.add h k v;
-			VBool (not old);
-		);
-		"hiter", Fun2 (fun h f -> Hashtbl.iter (fun k v -> ignore ((get_ctx()).do_call VNull f [k;v] p)) (vhash h); VNull);
-		"hcount", Fun1 (fun h -> VInt (Hashtbl.length (vhash h)));
-		"hsize", Fun1 (fun h -> VInt (Hashtbl.length (vhash h)));
-	(* misc *)
-		"print", FunVar (fun vl -> List.iter (fun v ->
-			let ctx = get_ctx() in
-			let com = ctx.curapi.get_com() in
-			com.print (ctx.do_string v)
-		) vl; VNull);
-		"throw", Fun1 (fun v -> exc v);
-		"rethrow", Fun1 (fun v ->
-			let ctx = get_ctx() in
-			ctx.callstack <- List.rev (List.map (fun p -> { cpos = p; cthis = ctx.vthis; cstack = DynArray.length ctx.stack; cenv = ctx.venv }) ctx.exc) @ ctx.callstack;
-			exc v
-		);
-		"istrue", Fun1 (fun v ->
-			match v with
-			| VNull | VInt 0 | VBool false | VInt32 0l -> VBool false
-			| _ -> VBool true
-		);
-		"not", Fun1 (fun v ->
-			match v with
-			| VNull | VInt 0 | VBool false | VInt32 0l -> VBool true
-			| _ -> VBool false
-		);
-		"typeof", Fun1 (fun v ->
-			VInt (match v with
-			| VNull -> 0
-			| VInt _ | VInt32 _ -> 1
-			| VFloat _ -> 2
-			| VBool _ -> 3
-			| VString _ -> 4
-			| VObject _ -> 5
-			| VArray _ -> 6
-			| VFunction _ | VClosure _ -> 7
-			| VAbstract _ -> 8)
-		);
-		"compare", Fun2 (fun a b ->
-			match (get_ctx()).do_compare a b with
-			| CUndef -> VNull
-			| CEq -> VInt 0
-			| CSup -> VInt 1
-			| CInf -> VInt (-1)
-		);
-		"pcompare", Fun2 (fun a b ->
-			assert false
-		);
-		"excstack", Fun0 (fun() ->
-			build_stack (get_ctx()).exc
-		);
-		"callstack", Fun0 (fun() ->
-			build_stack (List.map (fun s -> s.cpos) (get_ctx()).callstack)
-		);
-		"version", Fun0 (fun() ->
-			VInt 200
-		);
-	(* extra *)
-		"use_neko_dll", Fun0 (fun() ->
-			VBool false
-		);
-	] in
-	let vals = [
-		"tnull", VInt 0;
-		"tint", VInt 1;
-		"tfloat", VInt 2;
-		"tbool", VInt 3;
-		"tstring", VInt 4;
-		"tobject", VInt 5;
-		"tarray", VInt 6;
-		"tfunction", VInt 7;
-		"tabstract", VInt 8;
-	] in
-	let h = Hashtbl.create 0 in
-	List.iter (fun (n,f) -> Hashtbl.add h n (VFunction f)) funcs;
-	List.iter (fun (n,v) -> Hashtbl.add h n v) vals;
-	h
-
-(* ---------------------------------------------------------------------- *)
-(* STD LIBRARY *)
-
-let free_abstract a =
-	match a with
-	| VAbstract vp -> Obj.set_tag (Obj.repr vp) 0 (* this will mute it as Deallocated *)
-	| _ -> assert false
-
-let std_lib =
-	let p = { psource = "<stdlib>"; pline = 0 } in
-	let error() =
-		raise Builtin_error
-	in
-	let make_list l =
-		let rec loop acc = function
-			| [] -> acc
-			| x :: l -> loop (VArray [|x;acc|]) l
-		in
-		loop VNull (List.rev l)
-	in
-	let num = function
-		| VInt i -> float_of_int i
-		| VInt32 i -> Int32.to_float i
-		| VFloat f -> f
-		| _ -> error()
-	in
-	let make_date f =
-		VInt32 (Int32.of_float f)
-	in
-	let date = function
-		| VInt32 i -> Int32.to_float i
-		| VInt i -> float_of_int i
-		| _ -> error()
-	in
-	let make_i32 i =
-		VInt32 i
-	in
-	let int32 = function
-		| VInt i -> Int32.of_int i
-		| VInt32 i -> i
-		| _ -> error()
-	in
-	let vint = function
-		| VInt n -> n
-		| _ -> error()
-	in
-	let vstring = function
-		| VString s -> s
-		| _ -> error()
-	in
-	let int32_addr h =
-		let base = Int32.to_int (Int32.logand h 0xFFFFFFl) in
-		let str = Printf.sprintf "%ld.%d.%d.%d" (Int32.shift_right_logical h 24) (base lsr 16) ((base lsr 8) land 0xFF) (base land 0xFF) in
-		Unix.inet_addr_of_string str
-	in
-	let int32_op op = Fun2 (fun a b -> make_i32 (op (int32 a) (int32 b))) in
-	make_library ([
-	(* math *)
-		"math_atan2", Fun2 (fun a b -> VFloat (atan2 (num a) (num b)));
-		"math_pow", Fun2 (fun a b -> VFloat ((num a) ** (num b)));
-		"math_abs", Fun1 (fun v ->
-			match v with
-			| VInt i -> VInt (abs i)
-			| VInt32 i -> VInt32 (Int32.abs i)
-			| VFloat f -> VFloat (abs_float f)
-			| _ -> error()
-		);
-		"math_ceil", Fun1 (fun v -> match v with VInt _ | VInt32 _ -> v | _ -> best_int (to_int (ceil (num v))));
-		"math_floor", Fun1 (fun v -> match v with VInt _ | VInt32 _ -> v | _ -> best_int (to_int (floor (num v))));
-		"math_round", Fun1 (fun v -> match v with VInt _ | VInt32 _ -> v | _ -> best_int (to_int (floor (num v +. 0.5))));
-		"math_pi", Fun0 (fun() -> VFloat (4.0 *. atan 1.0));
-		"math_sqrt", Fun1 (fun v -> let v = num v in VFloat (if v < 0. then nan else sqrt v));
-		"math_atan", Fun1 (fun v -> VFloat (atan (num v)));
-		"math_cos", Fun1 (fun v -> VFloat (cos (num v)));
-		"math_sin", Fun1 (fun v -> VFloat (sin (num v)));
-		"math_tan", Fun1 (fun v -> VFloat (tan (num v)));
-		"math_log", Fun1 (fun v -> VFloat (Pervasives.log (num v)));
-		"math_exp", Fun1 (fun v -> VFloat (exp (num v)));
-		"math_acos", Fun1 (fun v -> VFloat (acos (num v)));
-		"math_asin", Fun1 (fun v -> VFloat (asin (num v)));
-		"math_fceil", Fun1 (fun v -> VFloat (ceil (num v)));
-		"math_ffloor", Fun1 (fun v -> VFloat (floor (num v)));
-		"math_fround", Fun1 (fun v -> VFloat (floor (num v +. 0.5)));
-		"math_int", Fun1 (fun v ->
-			match v with
-			| VInt _ | VInt32 _ -> v
-			| VFloat f -> best_int (to_int (if f < 0. then ceil f else floor f))
-			| _ -> error()
-		);
-	(* buffer *)
-		"buffer_new", Fun0 (fun() ->
-			VAbstract (ABuffer (Buffer.create 0))
-		);
-		"buffer_add", Fun2 (fun b v ->
-			match b with
-			| VAbstract (ABuffer b) -> Buffer.add_string b ((get_ctx()).do_string v); VNull
-			| _ -> error()
-		);
-		"buffer_add_char", Fun2 (fun b v ->
-			match b, v with
-			| VAbstract (ABuffer b), VInt n when n >= 0 && n < 256 -> Buffer.add_char b (char_of_int n); VNull
-			| _ -> error()
-		);
-		"buffer_add_sub", Fun4 (fun b s p l ->
-			match b, s, p, l with
-			| VAbstract (ABuffer b), VString s, VInt p, VInt l -> (try Buffer.add_substring b s p l; VNull with _ -> error())
-			| _ -> error()
-		);
-		"buffer_string", Fun1 (fun b ->
-			match b with
-			| VAbstract (ABuffer b) -> VString (Buffer.contents b)
-			| _ -> error()
-		);
-		"buffer_reset", Fun1 (fun b ->
-			match b with
-			| VAbstract (ABuffer b) -> Buffer.reset b; VNull;
-			| _ -> error()
-		);
-		"buffer_get_length", Fun1 (fun b ->
-			match b with
-			| VAbstract (ABuffer b) -> VInt (Buffer.length b)
-			| _ -> error()
-		);
-	(* date *)
-		"date_now", Fun0 (fun () ->
-			make_date (Unix.time())
-		);
-		"date_new", Fun1 (fun v ->
-			make_date (match v with
-			| VNull -> Unix.time()
-			| VString s ->
-				(match String.length s with
-				| 19 ->
-					let r = Str.regexp "^\\([0-9][0-9][0-9][0-9]\\)-\\([0-9][0-9]\\)-\\([0-9][0-9]\\) \\([0-9][0-9]\\):\\([0-9][0-9]\\):\\([0-9][0-9]\\)$" in
-					if not (Str.string_match r s 0) then exc (VString ("Invalid date format : " ^ s));
-					let t = Unix.localtime (Unix.time()) in
-					let t = { t with
-						tm_year = int_of_string (Str.matched_group 1 s) - 1900;
-						tm_mon = int_of_string (Str.matched_group 2 s) - 1;
-						tm_mday = int_of_string (Str.matched_group 3 s);
-						tm_hour = int_of_string (Str.matched_group 4 s);
-						tm_min = int_of_string (Str.matched_group 5 s);
-						tm_sec = int_of_string (Str.matched_group 6 s);
-					} in
-					fst (Unix.mktime t)
-				| 10 ->
-					assert false
-				| 8 ->
-					assert false
-				| _ ->
-					exc (VString ("Invalid date format : " ^ s)));
-			| _ -> error())
-		);
-		"date_set_hour", Fun4 (fun d h m s ->
-			let d = date d in
-			let t = Unix.localtime d in
-			make_date (fst (Unix.mktime { t with tm_hour = vint h; tm_min = vint m; tm_sec = vint s }))
-		);
-		"date_set_day", Fun4 (fun d y m da ->
-			let d = date d in
-			let t = Unix.localtime d in
-			make_date (fst (Unix.mktime { t with tm_year = vint y - 1900; tm_mon = vint m - 1; tm_mday = vint da }))
-		);
-		"date_format", Fun2 (fun d fmt ->
-			match fmt with
-			| VNull ->
-				let t = Unix.localtime (date d) in
-				VString (Printf.sprintf "%.4d-%.2d-%.2d %.2d:%.2d:%.2d" (t.tm_year + 1900) (t.tm_mon + 1) t.tm_mday t.tm_hour t.tm_min t.tm_sec)
-			| VString "%w" ->
-				(* week day *)
-				let t = Unix.localtime (date d) in
-				VString (string_of_int t.tm_wday)
-			| VString _ ->
-				exc (VString "Custom date format is not supported") (* use native Haxe implementation *)
-			| _ ->
-				error()
-		);
-		"date_get_hour", Fun1 (fun d ->
-			let t = Unix.localtime (date d) in
-			let o = obj (hash_field (get_ctx())) [
-				"h", VInt t.tm_hour;
-				"m", VInt t.tm_min;
-				"s", VInt t.tm_sec;
-			] in
-			VObject o
-		);
-		"date_get_day", Fun1 (fun d ->
-			let t = Unix.localtime (date d) in
-			let o = obj (hash_field (get_ctx())) [
-				"d", VInt t.tm_mday;
-				"m", VInt (t.tm_mon + 1);
-				"y", VInt (t.tm_year + 1900);
-			] in
-			VObject o
-		);
-	(* string *)
-		"string_split", Fun2 (fun s d ->
-			make_list (match s, d with
-			| VString "", VString _ -> [VString ""]
-			| VString s, VString "" -> Array.to_list (Array.init (String.length s) (fun i -> VString (String.make 1 (String.get s i))))
-			| VString s, VString d -> List.map (fun s -> VString s) (ExtString.String.nsplit s d)
-			| _ -> error())
-		);
-		"url_encode", Fun1 (fun s ->
-			let s = vstring s in
-			let b = Buffer.create 0 in
-			let hex = "0123456789ABCDEF" in
-			for i = 0 to String.length s - 1 do
-				let c = String.unsafe_get s i in
-				match c with
-				| 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '-' | '.' ->
-					Buffer.add_char b c
-				| _ ->
-					Buffer.add_char b '%';
-					Buffer.add_char b (String.unsafe_get hex (int_of_char c lsr 4));
-					Buffer.add_char b (String.unsafe_get hex (int_of_char c land 0xF));
-			done;
-			VString (Buffer.contents b)
-		);
-		"url_decode", Fun1 (fun s ->
-			let s = vstring s in
-			let b = Buffer.create 0 in
-			let len = String.length s in
-			let decode c =
-				match c with
-				| '0'..'9' -> Some (int_of_char c - int_of_char '0')
-				| 'a'..'f' -> Some (int_of_char c - int_of_char 'a' + 10)
-				| 'A'..'F' -> Some (int_of_char c - int_of_char 'A' + 10)
-				| _ -> None
-			in
-			let rec loop i =
-				if i = len then () else
-				let c = String.unsafe_get s i in
-				match c with
-				| '%' ->
-					let p1 = (try decode (String.get s (i + 1)) with _ -> None) in
-					let p2 = (try decode (String.get s (i + 2)) with _ -> None) in
-					(match p1, p2 with
-					| Some c1, Some c2 ->
-						Buffer.add_char b (char_of_int ((c1 lsl 4) lor c2));
-						loop (i + 3)
-					| _ ->
-						loop (i + 1));
-				| '+' ->
-					Buffer.add_char b ' ';
-					loop (i + 1)
-				| c ->
-					Buffer.add_char b c;
-					loop (i + 1)
-			in
-			loop 0;
-			VString (Buffer.contents b)
-		);
-		"base_encode", Fun2 (fun s b ->
-			match s, b with
-			| VString s, VString "0123456789abcdef" when String.length s = 16 ->
-				VString (Digest.to_hex s)
-			| VString s, VString b ->
-				if String.length b <> 64 then assert false;
-				let tbl = Array.init 64 (String.unsafe_get b) in
-				VString (Base64.str_encode ~tbl s)
-			| _ -> error()
-		);
-		"base_decode", Fun2 (fun s b ->
-			let s = vstring s in
-			let b = vstring b in
-			if String.length b <> 64 then assert false;
-			let tbl = Array.init 64 (String.unsafe_get b) in
-			VString (Base64.str_decode ~tbl:(Base64.make_decoding_table tbl) s)
-		);
-		"make_md5", Fun1 (fun s ->
-			VString (Digest.string (vstring s))
-		);
-		(* sprintf *)
-	(* int32 *)
-		"int32_new", Fun1 (fun v ->
-			match v with
-			| VInt32 _ -> v
-			| VInt i -> make_i32 (Int32.of_int i)
-			| VFloat f -> make_i32 (Int32.of_float f)
-			| _ -> error()
-		);
-		"int32_to_int", Fun1 (fun v ->
-			let v = int32 v in
-			let i = Int32.to_int v in
-			if Int32.compare (Int32.of_int i) v <> 0 then error();
-			VInt i
-		);
-		"int32_to_float", Fun1 (fun v ->
-			VFloat (Int32.to_float (int32 v))
-		);
-		"int32_compare", Fun2 (fun a b ->
-			VInt (Int32.compare (int32 a) (int32 b))
-		);
-		"int32_add", int32_op Int32.add;
-		"int32_sub", int32_op Int32.sub;
-		"int32_mul", int32_op Int32.mul;
-		"int32_div", int32_op Int32.div;
-		"int32_shl", int32_op (fun a b -> Int32.shift_left a (Int32.to_int b));
-		"int32_shr", int32_op (fun a b -> Int32.shift_right a (Int32.to_int b));
-		"int32_ushr", int32_op (fun a b -> Int32.shift_right_logical a (Int32.to_int b));
-		"int32_mod", int32_op Int32.rem;
-		"int32_or", int32_op Int32.logor;
-		"int32_and", int32_op Int32.logand;
-		"int32_xor", int32_op Int32.logxor;
-		"int32_neg", Fun1 (fun v -> make_i32 (Int32.neg (int32 v)));
-		"int32_complement", Fun1 (fun v -> make_i32 (Int32.lognot (int32 v)));
-	(* misc *)
-		"same_closure", Fun2 (fun a b ->
-			VBool (match a, b with
-			| VClosure (la,fa), VClosure (lb,fb) ->
-				fa == fb && List.length la = List.length lb && List.for_all2 (fun a b -> (get_ctx()).do_compare a b = CEq) la lb
-			| VFunction a, VFunction b -> a == b
-			| _ -> false)
-		);
-		"double_bytes", Fun2 (fun f big ->
-			let f = (match f with VFloat f -> f | VInt i -> float_of_int i | _ -> error()) in
-			match big with
-			| VBool big ->
-				let ch = IO.output_string() in
-				if big then IO.BigEndian.write_double ch f else IO.write_double ch f;
-				VString (IO.close_out ch)
-			| _ ->
-				error()
-		);
-		"float_bytes", Fun2 (fun f big ->
-			let f = (match f with VFloat f -> f | VInt i -> float_of_int i | _ -> error()) in
-			match big with
-			| VBool big ->
-				let ch = IO.output_string() in
-				let i = Int32.bits_of_float f in
-				if big then IO.BigEndian.write_real_i32 ch i else IO.write_real_i32 ch i;
-				VString (IO.close_out ch)
-			| _ ->
-				error()
-		);
-		"double_of_bytes", Fun2 (fun s big ->
-			match s, big with
-			| VString s, VBool big when String.length s = 8 ->
-				let ch = IO.input_string s in
-				VFloat (if big then IO.BigEndian.read_double ch else IO.read_double ch)
-			| _ ->
-				error()
-		);
-		"float_of_bytes", Fun2 (fun s big ->
-			match s, big with
-			| VString s, VBool big when String.length s = 4 ->
-				let ch = IO.input_string s in
-				VFloat (Int32.float_of_bits (if big then IO.BigEndian.read_real_i32 ch else IO.read_real_i32 ch))
-			| _ ->
-				error()
-		);
-	(* random *)
-		"random_new", Fun0 (fun() -> VAbstract (ARandom (ref (Random.State.make_self_init()))));
-		"random_set_seed", Fun2 (fun r s ->
-			match r, s with
-			| VAbstract (ARandom r), VInt seed -> r := Random.State.make [|seed|]; VNull
-			| VAbstract (ARandom r), VInt32 seed -> r := Random.State.make [|Int32.to_int seed|]; VNull
-			| _ -> error()
-		);
-		"random_int", Fun2 (fun r s ->
-			match r, s with
-			| VAbstract (ARandom r), VInt max -> VInt (Random.State.int (!r) (if max <= 0 then 1 else max))
-			| _ -> error()
-		);
-		"random_float", Fun1 (fun r ->
-			match r with
-			| VAbstract (ARandom r) -> VFloat (Random.State.float (!r) 1.0)
-			| _ -> error()
-		);
-	(* file *)
-		"file_open", Fun2 (fun f r ->
-			match f, r with
-			| VString f, VString r ->
-				let perms = 0o666 in
-				VAbstract (match r with
-					| "r" -> AFRead (open_in_gen [Open_rdonly] 0 f,ref false)
-					| "rb" -> AFRead (open_in_gen [Open_rdonly;Open_binary] 0 f,ref false)
-					| "w" -> AFWrite (open_out_gen [Open_wronly;Open_creat;Open_trunc] perms f)
-					| "wb" -> AFWrite (open_out_gen [Open_wronly;Open_creat;Open_trunc;Open_binary] perms f)
-					| "a" -> AFWrite (open_out_gen [Open_append;Open_creat] perms f)
-					| "ab" -> AFWrite (open_out_gen [Open_append;Open_creat;Open_binary] perms f)
-					| _ -> error())
-			| _ -> error()
-		);
-		"file_close", Fun1 (fun vf ->
-			(match vf with
-			| VAbstract (AFRead (f,_)) -> close_in f; free_abstract vf;
-			| VAbstract (AFWrite f) -> close_out f; free_abstract vf;
-			| _ -> error());
-			VNull
-		);
-		(* file_name *)
-		"file_write", Fun4 (fun f s p l ->
-			match f, s, p, l with
-			| VAbstract (AFWrite f), VString s, VInt p, VInt l -> output f s p l; VInt l
-			| _ -> error()
-		);
-		"file_read", Fun4 (fun f s p l ->
-			match f, s, p, l with
-			| VAbstract (AFRead (f,r)), VString s, VInt p, VInt l ->
-				let n = input f s p l in
-				if n = 0 then begin
-					r := true;
-					exc (VArray [|VString "file_read"|]);
-				end;
-				VInt n
-			| _ -> error()
-		);
-		"file_write_char", Fun2 (fun f c ->
-			match f, c with
-			| VAbstract (AFWrite f), VInt c -> output_char f (char_of_int c); VNull
-			| _ -> error()
-		);
-		"file_read_char", Fun1 (fun f ->
-			match f with
-			| VAbstract (AFRead (f,r)) -> VInt (int_of_char (try input_char f with _ -> r := true; exc (VArray [|VString "file_read_char"|])))
-			| _ -> error()
-		);
-		"file_seek", Fun3 (fun f pos mode ->
-			match f, pos, mode with
-			| VAbstract (AFRead (f,r)), VInt pos, VInt mode ->
-				r := false;
-				seek_in f (match mode with 0 -> pos | 1 -> pos_in f + pos | 2 -> in_channel_length f + pos | _ -> error());
-				VNull;
-			| VAbstract (AFWrite f), VInt pos, VInt mode ->
-				seek_out f (match mode with 0 -> pos | 1 -> pos_out f + pos | 2 -> out_channel_length f + pos | _ -> error());
-				VNull;
-			| _ -> error()
-		);
-		"file_tell", Fun1 (fun f ->
-			match f with
-			| VAbstract (AFRead (f,_)) -> VInt (pos_in f)
-			| VAbstract (AFWrite f) -> VInt (pos_out f)
-			| _ -> error()
-		);
-		"file_eof", Fun1 (fun f ->
-			match f with
-			| VAbstract (AFRead (f,r)) ->
-				VBool !r
-			| _ -> error()
-		);
-		"file_flush", Fun1 (fun f ->
-			(match f with
-			| VAbstract (AFWrite f) -> flush f
-			| _ -> error());
-			VNull
-		);
-		"file_contents", Fun1 (fun f ->
-			match f with
-			| VString f -> VString (Std.input_file ~bin:true f)
-			| _ -> error()
-		);
-		"file_stdin", Fun0 (fun() -> VAbstract (AFRead (Pervasives.stdin, ref false)));
-		"file_stdout", Fun0 (fun() -> VAbstract (AFWrite Pervasives.stdout));
-		"file_stderr", Fun0 (fun() -> VAbstract (AFWrite Pervasives.stderr));
-	(* serialize *)
-		(* TODO *)
-	(* socket *)
-		"socket_init", Fun0 (fun() -> VNull);
-		"socket_new", Fun1 (fun v ->
-			match v with
-			| VBool b -> VAbstract (ASocket (Unix.socket PF_INET (if b then SOCK_DGRAM else SOCK_STREAM) 0));
-			| _ -> error()
-		);
-		"socket_close", Fun1 (fun vs ->
-			match vs with
-			| VAbstract (ASocket s) -> Unix.close s; free_abstract vs; VNull
-			| _ -> error()
-		);
-		"socket_send_char", Fun2 (fun s c ->
-			match s, c with
-			| VAbstract (ASocket s), VInt c when c >= 0 && c <= 255 ->
-				ignore(Unix.send s (String.make 1 (char_of_int c)) 0 1 []);
-				VNull
-			| _ -> error()
-		);
-		"socket_send", Fun4 (fun s buf pos len ->
-			match s, buf, pos, len with
-			| VAbstract (ASocket s), VString buf, VInt pos, VInt len -> VInt (Unix.send s buf pos len [])
-			| _ -> error()
-		);
-		"socket_recv", Fun4 (fun s buf pos len ->
-			match s, buf, pos, len with
-			| VAbstract (ASocket s), VString buf, VInt pos, VInt len -> VInt (Unix.recv s buf pos len [])
-			| _ -> error()
-		);
-		"socket_recv_char", Fun1 (fun s ->
-			match s with
-			| VAbstract (ASocket s) ->
-				let buf = String.make 1 '\000' in
-				ignore(Unix.recv s buf 0 1 []);
-				VInt (int_of_char (String.unsafe_get buf 0))
-			| _ -> error()
-		);
-		"socket_write", Fun2 (fun s str ->
-			match s, str with
-			| VAbstract (ASocket s), VString str ->
-				let pos = ref 0 in
-				let len = ref (String.length str) in
-				while !len > 0 do
-					let k = Unix.send s str (!pos) (!len) [] in
-					pos := !pos + k;
-					len := !len - k;
-				done;
-				VNull
-			| _ -> error()
-		);
-		"socket_read", Fun1 (fun s ->
-			match s with
-			| VAbstract (ASocket s) ->
-				let tmp = String.make 1024 '\000' in
-				let buf = Buffer.create 0 in
-				let rec loop() =
-					let k = (try Unix.recv s tmp 0 1024 [] with Unix_error _ -> 0) in
-					if k > 0 then begin
-						Buffer.add_substring buf tmp 0 k;
-						loop();
-					end
-				in
-				loop();
-				VString (Buffer.contents buf)
-			| _ -> error()
-		);
-		"host_resolve", Fun1 (fun s ->
-			let h = (try Unix.gethostbyname (vstring s) with Not_found -> error()) in
-			let addr = Unix.string_of_inet_addr h.h_addr_list.(0) in
-			let a, b, c, d = Scanf.sscanf addr "%d.%d.%d.%d" (fun a b c d -> a,b,c,d) in
-			VInt32 (Int32.logor (Int32.shift_left (Int32.of_int a) 24) (Int32.of_int (d lor (c lsl 8) lor (b lsl 16))))
-		);
-		"host_to_string", Fun1 (fun h ->
-			match h with
-			| VInt32 h -> VString (Unix.string_of_inet_addr (int32_addr h));
-			| _ -> error()
-		);
-		"host_reverse", Fun1 (fun h ->
-			match h with
-			| VInt32 h -> VString (gethostbyaddr (int32_addr h)).h_name
-			| _ -> error()
-		);
-		"host_local", Fun0 (fun() ->
-			VString (Unix.gethostname())
-		);
-		"socket_connect", Fun3 (fun s h p ->
-			match s, h, p with
-			| VAbstract (ASocket s), VInt32 h, VInt p ->
-				Unix.connect s (ADDR_INET (int32_addr h,p));
-				VNull
-			| _ -> error()
-		);
-		"socket_listen", Fun2 (fun s l ->
-			match s, l with
-			| VAbstract (ASocket s), VInt l ->
-				Unix.listen s l;
-				VNull
-			| _ -> error()
-		);
-		"socket_set_timeout", Fun2 (fun s t ->
-			match s with
-			| VAbstract (ASocket s) ->
-				let t = (match t with VNull -> 0. | VInt t -> float_of_int t | VFloat f -> f | _ -> error()) in
-				Unix.setsockopt_float s SO_RCVTIMEO t;
-				Unix.setsockopt_float s SO_SNDTIMEO t;
-				VNull
-			| _ -> error()
-		);
-		"socket_shutdown", Fun3 (fun s r w ->
-			match s, r, w with
-			| VAbstract (ASocket s), VBool r, VBool w ->
-				Unix.shutdown s (match r, w with true, true -> SHUTDOWN_ALL | true, false -> SHUTDOWN_RECEIVE | false, true -> SHUTDOWN_SEND | _ -> error());
-				VNull
-			| _ -> error()
-		);
-		(* TODO : select, bind, accept, peer, host *)
-		(* poll_alloc, poll : not planned *)
-	(* system *)
-		"get_env", Fun1 (fun v ->
-			try VString (Unix.getenv (vstring v)) with _ -> VNull
-		);
-		"put_env", Fun2 (fun e v ->
-			Unix.putenv (vstring e) (vstring v);
-			VNull
-		);
-		"sys_sleep", Fun1 (fun f ->
-			match f with
-			| VFloat f -> ignore(Unix.select [] [] [] f); VNull
-			| _ -> error()
-		);
-		"set_time_locale", Fun1 (fun l ->
-			match l with
-			| VString s -> VBool false (* always fail *)
-			| _ -> error()
-		);
-		"get_cwd", Fun0 (fun() ->
-			let dir = Unix.getcwd() in
-			let l = String.length dir in
-			VString (if l = 0 then "./" else match dir.[l - 1] with '/' | '\\' -> dir | _ -> dir ^ "/")
-		);
-		"set_cwd", Fun1 (fun s ->
-			Unix.chdir (vstring s);
-			VNull;
-		);
-		"sys_string", (
-			let cached_sys_name = ref None in
-			Fun0 (fun() ->
-				VString (match Sys.os_type with
-				| "Unix" ->
-					(match !cached_sys_name with
-					| Some n -> n
-					| None ->
-						let ic = Unix.open_process_in "uname" in
-						let uname = (match input_line ic with
-							| "Darwin" -> "Mac"
-							| n -> n
-						) in
-						close_in ic;
-						cached_sys_name := Some uname;
-						uname)
-				| "Win32" | "Cygwin" -> "Windows"
-				| s -> s)
-			)
-		);
-		"sys_is64", Fun0 (fun() ->
-			VBool (Sys.word_size = 64)
-		);
-		"sys_command", Fun1 (fun cmd ->
-			VInt (((get_ctx()).curapi.get_com()).run_command (vstring cmd))
-		);
-		"sys_exit", Fun1 (fun code ->
-			if (get_ctx()).curapi.use_cache() then raise (Error.Fatal_error ("",Globals.null_pos));
-			raise (Sys_exit(vint code));
-		);
-		"sys_exists", Fun1 (fun file ->
-			VBool (Sys.file_exists (vstring file))
-		);
-		"file_delete", Fun1 (fun file ->
-			Sys.remove (vstring file);
-			VNull;
-		);
-		"sys_rename", Fun2 (fun file target ->
-			Sys.rename (vstring file) (vstring target);
-			VNull;
-		);
-		"sys_stat", Fun1 (fun file ->
-			let s = Unix.stat (vstring file) in
-			VObject (obj (hash_field (get_ctx())) [
-				"gid", VInt s.st_gid;
-				"uid", VInt s.st_uid;
-				"atime", VInt32 (Int32.of_float s.st_atime);
-				"mtime", VInt32 (Int32.of_float s.st_mtime);
-				"ctime", VInt32 (Int32.of_float s.st_ctime);
-				"dev", VInt s.st_dev;
-				"ino", VInt s.st_ino;
-				"nlink", VInt s.st_nlink;
-				"rdev", VInt s.st_rdev;
-				"size", VInt s.st_size;
-				"mode", VInt s.st_perm;
-			])
-		);
-		"sys_file_type", Fun1 (fun file ->
-			VString (match (Unix.stat (vstring file)).st_kind with
-			| S_REG -> "file"
-			| S_DIR -> "dir"
-			| S_CHR -> "char"
-			| S_BLK -> "block"
-			| S_LNK -> "symlink"
-			| S_FIFO -> "fifo"
-			| S_SOCK -> "sock")
-		);
-		"sys_create_dir", Fun2 (fun dir mode ->
-			Unix.mkdir (vstring dir) (vint mode);
-			VNull
-		);
-		"sys_remove_dir", Fun1 (fun dir ->
-			Unix.rmdir (vstring dir);
-			VNull;
-		);
-		"sys_time", Fun0 (fun() ->
-			VFloat (Unix.gettimeofday())
-		);
-		"sys_cpu_time", Fun0 (fun() ->
-			VFloat (Sys.time())
-		);
-		"sys_read_dir", Fun1 (fun dir ->
-			let d = Sys.readdir (vstring dir) in
-			let rec loop acc i =
-				if i < 0 then
-					acc
-				else
-					loop (VArray [|VString d.(i);acc|]) (i - 1)
-			in
-			loop VNull (Array.length d - 1)
-		);
-		"file_full_path", Fun1 (fun file ->
-			VString (try Extc.get_full_path (vstring file) with _ -> error())
-		);
-		"sys_exe_path", Fun0 (fun() ->
-			VString (Sys.argv.(0))
-		);
-		"sys_program_path", Fun0 (fun() ->
-			let ctx = get_ctx() in
-			let com = ctx.curapi.get_com() in
-			match com.main_class with
-			| None -> error()
-			| Some p ->
-				match ctx.curapi.get_type (s_type_path p) with
-				| Some(TInst (c, _)) ->
-					VString (Extc.get_full_path c.cl_pos.Globals.pfile)
-				| _ -> error();
-		);
-		"sys_env", Fun0 (fun() ->
-			let env = Unix.environment() in
-			let rec loop acc i =
-				if i < 0 then
-					acc
-				else
-					let e, v = ExtString.String.split env.(i) "=" in
-					loop (VArray [|VString e;VString v;acc|]) (i - 1)
-			in
-			loop VNull (Array.length env - 1)
-		);
-		"sys_getch", Fun1 (fun echo ->
-			match echo with
-			| VBool b -> VInt (Extc.getch b)
-			| _ -> error()
-		);
-		"sys_get_pid", Fun0 (fun() ->
-			VInt (Unix.getpid())
-		);
-	(* utf8 *)
-		"utf8_buf_alloc", Fun1 (fun v ->
-			VAbstract (AUtf8 (UTF8.Buf.create (vint v)))
-		);
-		"utf8_buf_add", Fun2 (fun b c ->
-			match b with
-			| VAbstract (AUtf8 buf) -> UTF8.Buf.add_char buf (UChar.chr_of_uint (vint c)); VNull
-			| _ -> error()
-		);
-		"utf8_buf_content", Fun1 (fun b ->
-			match b with
-			| VAbstract (AUtf8 buf) -> VString (UTF8.Buf.contents buf);
-			| _ -> error()
-		);
-		"utf8_buf_length", Fun1 (fun b ->
-			match b with
-			| VAbstract (AUtf8 buf) -> VInt (UTF8.length (UTF8.Buf.contents buf));
-			| _ -> error()
-		);
-		"utf8_buf_size", Fun1 (fun b ->
-			match b with
-			| VAbstract (AUtf8 buf) -> VInt (String.length (UTF8.Buf.contents buf));
-			| _ -> error()
-		);
-		"utf8_validate", Fun1 (fun s ->
-			VBool (try UTF8.validate (vstring s); true with UTF8.Malformed_code -> false)
-		);
-		"utf8_length", Fun1 (fun s ->
-			VInt (UTF8.length (vstring s))
-		);
-		"utf8_sub", Fun3 (fun s p l ->
-			let buf = UTF8.Buf.create 0 in
-			let pos = ref (-1) in
-			let p = vint p and l = vint l in
-			UTF8.iter (fun c ->
-				incr pos;
-				if !pos >= p && !pos < p + l then UTF8.Buf.add_char buf c;
-			) (vstring s);
-			VString (UTF8.Buf.contents buf)
-		);
-		"utf8_get", Fun2 (fun s p ->
-			VInt (UChar.uint_code (try UTF8.get (vstring s) (vint p) with _ -> error()))
-		);
-		"utf8_iter", Fun2 (fun s f ->
-			let ctx = get_ctx() in
-			UTF8.iter (fun c ->
-				ignore(ctx.do_call VNull f [VInt (UChar.uint_code c)] p);
-			) (vstring s);
-			VNull;
-		);
-		"utf8_compare", Fun2 (fun s1 s2 ->
-			VInt (UTF8.compare (vstring s1) (vstring s2))
-		);
-	(* thread *)
-		"thread_create", Fun2 (fun f p ->
-			exc (VString "Can't create thread from within a macro");
-		);
-		"tls_create", Fun0 (fun() ->
-			VAbstract (ATls (ref VNull))
-		);
-		"tls_get", Fun1 (fun t ->
-			match t with
-			| VAbstract (ATls r) -> !r
-			| _ -> error();
-		);
-		"tls_set", Fun2 (fun t v ->
-			match t with
-			| VAbstract (ATls r) -> r := v; VNull
-			| _ -> error();
-		);
-		(* lock, mutex, deque : not implemented *)
-	(* process *)
-		"process_run", (Fun2 (fun p args ->
-			match p, args with
-			| VString p, VArray args -> VAbstract (AProcess (Process.run p (Some (Array.map vstring args))))
-			| VString p, _ -> VAbstract (AProcess (Process.run p None))
-			| _ -> error()
-		));
-		"process_stdout_read", (Fun4 (fun p str pos len ->
-			match p, str, pos, len with
-			| VAbstract (AProcess p), VString str, VInt pos, VInt len -> VInt (Process.read_stdout p str pos len)
-			| _ -> error()
-		));
-		"process_stderr_read", (Fun4 (fun p str pos len ->
-			match p, str, pos, len with
-			| VAbstract (AProcess p), VString str, VInt pos, VInt len -> VInt (Process.read_stderr p str pos len)
-			| _ -> error()
-		));
-		"process_stdin_write", (Fun4 (fun p str pos len ->
-			match p, str, pos, len with
-			| VAbstract (AProcess p), VString str, VInt pos, VInt len -> VInt (Process.write_stdin p str pos len)
-			| _ -> error()
-		));
-		"process_stdin_close", (Fun1 (fun p ->
-			match p with
-			| VAbstract (AProcess p) -> Process.close_stdin p; VNull
-			| _ -> error()
-		));
-		"process_exit", (Fun1 (fun p ->
-			match p with
-			| VAbstract (AProcess p) -> VInt (Process.exit p)
-			| _ -> error()
-		));
-		"process_pid", (Fun1 (fun p ->
-			match p with
-			| VAbstract (AProcess p) -> VInt (Process.pid p)
-			| _ -> error()
-		));
-		"process_close", (Fun1 (fun vp ->
-			match vp with
-			| VAbstract (AProcess p) -> Process.close p; free_abstract vp; VNull
-			| _ -> error()
-		));
-		"process_kill", (Fun1 (fun vp ->
-			match vp with
-			| VAbstract (AProcess p) -> Process.kill p; free_abstract vp; VNull
-			| _ -> error()
-		));
-	(* xml *)
-		"parse_xml",
-			(Fun2 (fun str o ->
-			match str, o with
-			| VString str, VObject events ->
-				let ctx = get_ctx() in
-				let p = { psource = "parse_xml"; pline = 0 } in
-				let xml = get_field events (hash "xml") in
-				let don = get_field events (hash "done") in
-				let pcdata = get_field events (hash "pcdata") in
-				(*
-
-				Since we use the Xml parser, we don't have support for
-				- CDATA
-				- comments, prolog, doctype (allowed but skipped)
-
-				let cdata = get_field events (hash "cdata") in
-				let comment = get_field events (hash "comment") in
-				*)
-				let rec loop = function
-					| Xml.Element (node, attribs, children) ->
-						ignore(ctx.do_call o xml [VString node;VObject (obj (hash_field ctx) (List.map (fun (a,v) -> a, VString v) attribs))] p);
-						List.iter loop children;
-						ignore(ctx.do_call o don [] p);
-					| Xml.PCData s ->
-						ignore(ctx.do_call o pcdata [VString s] p);
-				in
-				let x = XmlParser.make() in
-				XmlParser.check_eof x false;
-				loop (try
-					XmlParser.parse x (XmlParser.SString str)
-				with Xml.Error e -> failwith ("Parser failure (" ^ Xml.error e ^ ")")
-				| e -> failwith ("Parser failure (" ^ Printexc.to_string e ^ ")"));
-				VNull
-			| _ -> error())
-		);
-	(* memory, module : not planned *)
-	])
-
-(* ---------------------------------------------------------------------- *)
-(* REGEXP LIBRARY *)
-
-let reg_lib =
-	let error() =
-		raise Builtin_error
-	in
-	let open Pcre in
-	let string_of_pcre_error = function
-		| BadPattern(s,i) -> Printf.sprintf "at %i: %s" i s
-		| Partial -> "Partial"
-		| BadPartial -> "BadPartial"
-		| BadUTF8 -> "BadUTF8"
-		| BadUTF8Offset -> "BadUTF8Offset"
-		| MatchLimit -> "MatchLimit"
-		| RecursionLimit -> "RecursionLimit"
-		| InternalError s -> "InternalError: " ^ s
-	in
-	make_library [
-		"regexp_new_options", Fun2 (fun str opt ->
-			match str,opt with
-			| VString str,VString opt ->
-				let flags = List.map (function
-					| 'i' -> `CASELESS
-					| 's' -> `DOTALL
-					| 'm' -> `MULTILINE
-					| 'u' -> `UTF8
-					| 'g' -> `UNGREEDY
-					| c -> failwith ("Unsupported regexp option '" ^ String.make 1 c ^ "'")
-				) (ExtString.String.explode opt) in
-				let r = try regexp ~flags str with Error error -> failwith (string_of_pcre_error error) in
-				let pcre = {
-					r = r;
-					r_string = "";
-					r_groups = [||]
-				} in
-				VAbstract (AReg pcre)
-			| _ -> error()
-		);
-		"regexp_match", Fun4 (fun rex str pos len -> match rex, str, pos, len with
-			| VAbstract (AReg rex),VString str,VInt pos,VInt len ->
-				begin try
-					(* A bit awkward, but the PCRE bindings don't seem to expose the len argument... *)
-					if pos + len > String.length str then raise Not_found;
-					let str = String.sub str 0 (pos + len) in
-					let a = pcre_exec ~rex:rex.r ~pos str in
-					rex.r_string <- str;
-					rex.r_groups <- a;
-					VBool true
-				with Not_found ->
-					VBool false
-				end
-			| _ -> error()
-		);
-		"regexp_matched", Fun2 (fun r n -> match r, n with
-			| VAbstract (AReg r),VInt n ->
-				let pos = r.r_groups.(n * 2) in
-				let len = r.r_groups.(n * 2 + 1) - pos in
-				if pos = -1 then VNull
-				else VString (String.sub r.r_string pos len)
-			| _ -> error()
-		);
-		"regexp_matched_pos", Fun2 (fun r n -> match r, n with
-			| VAbstract (AReg r),VInt n ->
-				let pos = r.r_groups.(n * 2) in
-				let len = r.r_groups.(n * 2 + 1) - pos in
-				VObject (obj (hash_field (get_ctx())) ["pos",VInt pos;"len",VInt len])
-			| _ -> error()
-		);
-	]
-
-(* ---------------------------------------------------------------------- *)
-(* ZLIB LIBRARY *)
-
-let z_lib =
-	let error() =
-		raise Builtin_error
-	in
-	make_library [
-		"inflate_init", Fun1 (fun f ->
-			let z = Extc.zlib_inflate_init2 (match f with VNull -> 15 | VInt i -> i | _ -> error()) in
-			VAbstract (AZipI { z = z; z_flush = Extc.Z_NO_FLUSH })
-		);
-		"deflate_init", Fun1 (fun f ->
-			let z = Extc.zlib_deflate_init (match f with VInt i -> i | _ -> error()) in
-			VAbstract (AZipD { z = z; z_flush = Extc.Z_NO_FLUSH })
-		);
-		"deflate_end", Fun1 (fun vz ->
-			match vz with
-			| VAbstract (AZipD z) -> Extc.zlib_deflate_end z.z; free_abstract vz; VNull;
-			| _ -> error()
-		);
-		"inflate_end", Fun1 (fun vz ->
-			match vz with
-			| VAbstract (AZipI z) -> Extc.zlib_inflate_end z.z; free_abstract vz; VNull;
-			| _ -> error()
-		);
-		"set_flush_mode", Fun2 (fun z f ->
-			match z, f with
-			| VAbstract (AZipI z | AZipD z), VString s ->
-				z.z_flush <- (match s with
-					| "NO" -> Extc.Z_NO_FLUSH
-					| "SYNC" -> Extc.Z_SYNC_FLUSH
-					| "FULL" -> Extc.Z_FULL_FLUSH
-					| "FINISH" -> Extc.Z_FINISH
-					| "BLOCK" -> Extc.Z_PARTIAL_FLUSH
-					| _ -> error());
-				VNull;
-			| _ -> error()
-		);
-		"inflate_buffer", Fun5 (fun z src pos dst dpos ->
-			match z, src, pos, dst, dpos with
-			| VAbstract (AZipI z), VString src, VInt pos, VString dst, VInt dpos ->
-				let r = Extc.zlib_inflate z.z src pos (String.length src - pos) dst dpos (String.length dst - dpos) z.z_flush in
-				VObject (obj (hash_field (get_ctx())) [
-					"done", VBool r.Extc.z_finish;
-					"read", VInt r.Extc.z_read;
-					"write", VInt r.Extc.z_wrote;
-				])
-			| _ -> error()
-		);
-		"deflate_buffer", Fun5 (fun z src pos dst dpos ->
-			match z, src, pos, dst, dpos with
-			| VAbstract (AZipD z), VString src, VInt pos, VString dst, VInt dpos ->
-				let r = Extc.zlib_deflate z.z src pos (String.length src - pos) dst dpos (String.length dst - dpos) z.z_flush in
-				VObject (obj (hash_field (get_ctx())) [
-					"done", VBool r.Extc.z_finish;
-					"read", VInt r.Extc.z_read;
-					"write", VInt r.Extc.z_wrote;
-				])
-			| _ -> error()
-		);
-		"deflate_bound", Fun2 (fun z size ->
-			match z, size with
-			| VAbstract (AZipD z), VInt size -> VInt (size + 1024)
-			| _ -> error()
-		);
-	]
-
-(* ---------------------------------------------------------------------- *)
-(* EVAL *)
-
-let throw ctx p msg =
-	ctx.callstack <- { cpos = p; cthis = ctx.vthis; cstack = DynArray.length ctx.stack; cenv = ctx.venv } :: ctx.callstack;
-	exc (VString msg)
-
-let declare ctx var =
-	ctx.locals_map <- PMap.add var ctx.locals_count ctx.locals_map;
-	ctx.locals_count <- ctx.locals_count + 1
-
-let save_locals ctx =
-	let old, oldcount = ctx.locals_map, ctx.locals_count in
-	(fun() ->
-		let n = ctx.locals_count - oldcount in
-		ctx.locals_count <- oldcount;
-		ctx.locals_map <- old;
-		n;
-	)
-
-let get_ident ctx s =
-	try
-		let index = PMap.find s ctx.locals_map in
-		if index >= ctx.locals_barrier then
-			AccLocal (ctx.locals_count - index)
-		else (try
-			AccEnv (DynArray.index_of (fun s2 -> s = s2) ctx.locals_env)
-		with Not_found ->
-			let index = DynArray.length ctx.locals_env in
-			DynArray.add ctx.locals_env s;
-			AccEnv index
-		)
-	with Not_found -> try
-		AccGlobal (PMap.find s ctx.globals)
-	with Not_found ->
-		let g = ref VNull in
-		ctx.globals <- PMap.add s g ctx.globals;
-		AccGlobal g
-
-let no_env = [||]
-
-let rec eval_expr ctx e =
-	let e = Genneko.gen_expr ctx.gen e in
-	catch_errors ctx (fun() -> (eval ctx e)())
-
-and eval ctx (e,p) =
-	match e with
-	| EConst c ->
-		(match c with
-		| True -> (fun() -> VBool true)
-		| False -> (fun() -> VBool false)
-		| Null -> (fun() -> VNull)
-		| This -> (fun() -> ctx.vthis)
-		| Int i -> (fun() -> VInt i)
-		| Int32 i -> (fun() -> VInt32 i)
-		| Float f ->
-			let f = float_of_string f in
-			(fun() -> VFloat f)
-		| String s -> (fun() -> VString s)
-		| Builtin "loader" ->
-			(fun() -> ctx.loader)
-		| Builtin "exports" ->
-			(fun() -> ctx.exports)
-		| Builtin s ->
-			let b = (try Hashtbl.find builtins s with Not_found -> throw ctx p ("Builtin not found '" ^ s ^ "'")) in
-			(fun() -> b)
-		| Ident s ->
-			acc_get ctx p (get_ident ctx s))
-	| EBlock el ->
-		let old = save_locals ctx in
-		let el = List.map (eval ctx) el in
-		let n = old() in
-		let rec loop = function
-			| [] -> VNull
-			| [e] -> e()
-			| e :: l ->
-				ignore(e());
-				loop l
-		in
-		(fun() ->
-			let v = loop el in
-			pop ctx n;
-			v)
-	| EParenthesis e ->
-		eval ctx e
-	| EField (e,f) ->
-		let e = eval ctx e in
-		let h = hash_field ctx f in
-		(fun() ->
-			match e() with
-			| VObject o -> get_field o h
-			| _ -> throw ctx p ("Invalid field access : " ^ f)
-		)
-	| ECall ((EConst (Builtin "__mk_pos__"),_),[(ECall (_,[EConst (String file),_]),_);(EConst (Int min),_);(EConst (Int max),_)]) ->
-		let pos = VAbstract (APos { Globals.pfile = file; Globals.pmin = min; Globals.pmax = max }) in
-		(fun() -> pos)
-	| ECall ((EConst (Builtin "typewrap"),_),[t]) ->
-		(fun() -> VAbstract (ATDecl (Obj.magic t)))
-	| ECall ((EConst (Builtin "__delayed_call__"),_),[EConst (Int index),_]) ->
-		let f = ctx.curapi.delayed_macro index in
-		let fbuild = ref None in
-		let old = { ctx with gen = ctx.gen } in
-		let compile_delayed_call() =
-			let oldl, oldc, oldb, olde = ctx.locals_map, ctx.locals_count, ctx.locals_barrier, ctx.locals_env in
-			ctx.locals_map <- old.locals_map;
-			ctx.locals_count <- old.locals_count;
-			ctx.locals_barrier <- old.locals_barrier;
-			ctx.locals_env <- DynArray.copy old.locals_env;
-			let save = save_locals ctx in
-			let e = f() in
-			let n = save() in
-			let e = if DynArray.length ctx.locals_env = DynArray.length old.locals_env then
-				e
-			else
-				let n = DynArray.get ctx.locals_env (DynArray.length ctx.locals_env - 1) in
-				(fun() -> exc (VString ("Macro-in-macro call can't access to closure variable '" ^ n ^ "'")))
-			in
-			ctx.locals_map <- oldl;
-			ctx.locals_count <- oldc;
-			ctx.locals_barrier <- oldb;
-			ctx.locals_env <- olde;
-			(fun() ->
-				let v = e() in
-				pop ctx n;
-				v
-			)
-		in
-		(fun() ->
-			let e = (match !fbuild with
-			| Some e -> e
-			| None ->
-				let e = compile_delayed_call() in
-				fbuild := Some e;
-				e
-			) in
-			e())
-	| ECall (e,el) ->
-		let el = List.map (eval ctx) el in
-		(match fst e with
-		| EField (e,f) ->
-			let e = eval ctx e in
-			let h = hash_field ctx f in
-			(fun() ->
-				let pl = List.map (fun f -> f()) el in
-				let o = e() in
-				let f = (match o with
-				| VObject o -> get_field o h
-				| _ -> throw ctx p ("Invalid field access : " ^ f)
-				) in
-				call ctx o f pl p
-			)
-		| _ ->
-			let e = eval ctx e in
-			(fun() ->
-				let pl = List.map (fun f -> f()) el in
-				call ctx ctx.vthis (e()) pl p
-			))
-	| EArray (e1,e2) ->
-		let e1 = eval ctx e1 in
-		let e2 = eval ctx e2 in
-		let acc = AccArray (e1,e2) in
-		acc_get ctx p acc
-	| EVars vl ->
-		let vl = List.map (fun (v,eo) ->
-			let eo = (match eo with None -> (fun() -> VNull) | Some e -> eval ctx e) in
-			declare ctx v;
-			eo
-		) vl in
-		(fun() ->
-			List.iter (fun e -> push ctx (e())) vl;
-			VNull
-		)
-	| EWhile (econd,e,NormalWhile) ->
-		let econd = eval ctx econd in
-		let e = eval ctx e in
-		let rec loop st =
-			match econd() with
-			| VBool true ->
-				let v = (try
-					ignore(e()); None
-				with
-					| Continue -> pop ctx (DynArray.length ctx.stack - st); None
-					| Break v -> pop ctx (DynArray.length ctx.stack - st); Some v
-				) in
-				(match v with
-				| None -> loop st
-				| Some v -> v)
-			| _ ->
-				VNull
-		in
-		(fun() -> try loop (DynArray.length ctx.stack) with Sys.Break -> throw ctx p "Ctrl+C")
-	| EWhile (econd,e,DoWhile) ->
-		let e = eval ctx e in
-		let econd = eval ctx econd in
-		let rec loop st =
-			let v = (try
-				ignore(e()); None
-			with
-				| Continue -> pop ctx (DynArray.length ctx.stack - st); None
-				| Break v -> pop ctx (DynArray.length ctx.stack - st); Some v
-			) in
-			match v with
-			| Some v -> v
-			| None ->
-				match econd() with
-				| VBool true -> loop st
-				| _ -> VNull
-		in
-		(fun() -> loop (DynArray.length ctx.stack))
-	| EIf (econd,eif,eelse) ->
-		let econd = eval ctx econd in
-		let eif = eval ctx eif in
-		let eelse = (match eelse with None -> (fun() -> VNull) | Some e -> eval ctx e) in
-		(fun() ->
-			match econd() with
-			| VBool true -> eif()
-			| _ -> eelse()
-		)
-	| ETry (e,exc,ecatch) ->
-		let old = save_locals ctx in
-		let e = eval ctx e in
-		let n1 = old() in
-		declare ctx exc;
-		let ecatch = eval ctx ecatch in
-		let n2 = old() in
-		(fun() ->
-			let vthis = ctx.vthis in
-			let venv = ctx.venv in
-			let stack = ctx.callstack in
-			let csize = ctx.callsize in
-			let size = DynArray.length ctx.stack in
-			try
-				pop_ret ctx e n1
-			with Runtime v ->
-				let rec loop n l =
-					if n = 0 then List.map (fun s -> s.cpos) l else
-					match l with
-					| [] -> []
-					| _ :: l -> loop (n - 1) l
-				in
-				ctx.exc <- loop (List.length stack) (List.rev ctx.callstack);
-				ctx.callstack <- stack;
-				ctx.callsize <- csize;
-				ctx.vthis <- vthis;
-				ctx.venv <- venv;
-				pop ctx (DynArray.length ctx.stack - size);
-				push ctx v;
-				pop_ret ctx ecatch n2
-			)
-	| EFunction (pl,e) ->
-		let old = save_locals ctx in
-		let oldb, oldenv = ctx.locals_barrier, ctx.locals_env in
-		ctx.locals_barrier <- ctx.locals_count;
-		ctx.locals_env <- DynArray.create();
-		List.iter (declare ctx) pl;
-		let e = eval ctx e in
-		ignore(old());
-		let env = ctx.locals_env in
-		ctx.locals_barrier <- oldb;
-		ctx.locals_env <- oldenv;
-		let env = DynArray.to_array (DynArray.map (fun s ->
-			acc_get ctx p (get_ident ctx s)) env
-		) in
-		let init_env = if Array.length env = 0 then
-			(fun() -> no_env)
-		else
-			(fun() -> Array.map (fun e -> e()) env)
-		in
-		(match pl with
-		| [] ->
-			(fun() ->
-				let env = init_env() in
-				VFunction (Fun0 (fun() ->
-					ctx.venv <- env;
-					e())))
-		| [a] ->
-			(fun() ->
-				let env = init_env() in
-				VFunction (Fun1 (fun v ->
-					ctx.venv <- env;
-					push ctx v;
-					e();
-				)))
-		| [a;b] ->
-			(fun() ->
-				let env = init_env() in
-				VFunction (Fun2 (fun va vb ->
-					ctx.venv <- env;
-					push ctx va;
-					push ctx vb;
-					e();
-				)))
-		| [a;b;c] ->
-			(fun() ->
-				let env = init_env() in
-				VFunction (Fun3 (fun va vb vc ->
-					ctx.venv <- env;
-					push ctx va;
-					push ctx vb;
-					push ctx vc;
-					e();
-				)))
-		| [a;b;c;d] ->
-			(fun() ->
-				let env = init_env() in
-				VFunction (Fun4 (fun va vb vc vd ->
-					ctx.venv <- env;
-					push ctx va;
-					push ctx vb;
-					push ctx vc;
-					push ctx vd;
-					e();
-				)))
-		| [a;b;c;d;pe] ->
-			(fun() ->
-				let env = init_env() in
-				VFunction (Fun5 (fun va vb vc vd ve ->
-					ctx.venv <- env;
-					push ctx va;
-					push ctx vb;
-					push ctx vc;
-					push ctx vd;
-					push ctx ve;
-					e();
-				)))
-		| _ ->
-			(fun() ->
-				let env = init_env() in
-				VFunction (FunVar (fun vl ->
-					if List.length vl != List.length pl then exc (VString "Invalid call");
-					ctx.venv <- env;
-					List.iter (push ctx) vl;
-					e();
-				)))
-		)
-	| EBinop (op,e1,e2) ->
-		eval_op ctx op e1 e2 p
-	| EReturn None ->
-		(fun() -> raise (Return VNull))
-	| EReturn (Some e) ->
-		let e = eval ctx e in
-		(fun() -> raise (Return (e())))
-	| EBreak None ->
-		(fun() -> raise (Break VNull))
-	| EBreak (Some e) ->
-		let e = eval ctx e in
-		(fun() -> raise (Break (e())))
-	| EContinue ->
-		(fun() -> raise Continue)
-	| ENext (e1,e2) ->
-		let e1 = eval ctx e1 in
-		let e2 = eval ctx e2 in
-		(fun() -> ignore(e1()); e2())
-	| EObject fl ->
-		let fl = List.map (fun (f,e) -> hash_field ctx f, eval ctx e) fl in
-		let fields = Array.of_list (List.map (fun (f,_) -> f,VNull) fl) in
-		Array.sort (fun (f1,_) (f2,_) -> compare f1 f2) fields;
-		(fun() ->
-			let o = {
-				ofields = Array.copy fields;
-				oproto = None;
-			} in
-			List.iter (fun (f,e) -> set_field o f (e())) fl;
-			VObject o
-		)
-	| ELabel l ->
-		assert false
-	| ESwitch (e1,el,eo) ->
-		let e1 = eval ctx e1 in
-		let el = List.map (fun (cond,e) -> cond, eval ctx cond, eval ctx e) el in
-		let eo = (match eo with None -> (fun() -> VNull) | Some e -> eval ctx e) in
-		let cases = (try
-			let max = ref (-1) in
-			let ints = List.map (fun (cond,_,e) ->
-				match fst cond with
-				| EConst (Int i) -> if i < 0 then raise Exit; if i > !max then max := i; i, e
-				| _ -> raise Exit
-			) el in
-			let a = Array.create (!max + 1) eo in
-			List.iter (fun (i,e) -> a.(i) <- e) (List.rev ints);
-			Some a;
-		with
-			Exit -> None
-		) in
-		let def v =
-			let rec loop = function
-				| [] -> eo()
-				| (_,c,e) :: l ->
-					if ctx.do_compare v (c()) = CEq then e() else loop l
-			in
-			loop el
-		in
-		(match cases with
-		| None -> (fun() -> def (e1()))
-		| Some t ->
-			(fun() ->
-				match e1() with
-				| VInt i -> if i >= 0 && i < Array.length t then t.(i)() else eo()
-				| v -> def v
-			))
-	| ENeko _ ->
-		throw ctx p "Inline neko code unsupported"
-
-and eval_oop ctx p o field (params:value list) =
-	match get_field_opt o field with
-	| None -> None
-	| Some f -> Some (call ctx (VObject o) f params p)
-
-and eval_access ctx (e,p) =
-	match e with
-	| EField (e,f) ->
-		let v = eval ctx e in
-		AccField (v,f)
-	| EArray (e,eindex) ->
-		let v = eval ctx e in
-		let idx = eval ctx eindex in
-		AccArray (v,idx)
-	| EConst (Ident s) ->
-		get_ident ctx s
-	| EConst This ->
-		AccThis
-	| _ ->
-		throw ctx p "Invalid assign"
-
-and eval_access_get_set ctx (e,p) =
-	match e with
-	| EField (e,f) ->
-		let v = eval ctx e in
-		let cache = ref VNull in
-		AccField ((fun() -> cache := v(); !cache),f), AccField((fun() -> !cache), f)
-	| EArray (e,eindex) ->
-		let v = eval ctx e in
-		let idx = eval ctx eindex in
-		let vcache = ref VNull and icache = ref VNull in
-		AccArray ((fun() -> vcache := v(); !vcache),(fun() -> icache := idx(); !icache)), AccArray ((fun() -> !vcache),(fun() -> !icache))
-	| EConst (Ident s) ->
-		let acc = get_ident ctx s in
-		acc, acc
-	| EConst This ->
-		AccThis, AccThis
-	| _ ->
-		throw ctx p "Invalid assign"
-
-and acc_get ctx p = function
-	| AccField (v,f) ->
-		let h = hash_field ctx f in
-		(fun() ->
-			match v() with
-			| VObject o -> get_field o h
-			| _ -> throw ctx p ("Invalid field access : " ^ f))
-	| AccArray (e,index) ->
-		(fun() ->
-			let e = e() in
-			let index = index() in
-			(match index, e with
-			| VInt i, VArray a -> (try Array.get a i with _ -> VNull)
-			| VInt32 _, VArray _ -> VNull
-			| _, VObject o ->
-				(match eval_oop ctx p o h_get [index] with
-				| None -> throw ctx p "Invalid array access"
-				| Some v -> v)
-			| _ -> throw ctx p "Invalid array access"))
-	| AccLocal i ->
-		(fun() -> DynArray.get ctx.stack (DynArray.length ctx.stack - i))
-	| AccGlobal g ->
-		(fun() -> !g)
-	| AccThis ->
-		(fun() -> ctx.vthis)
-	| AccEnv i ->
-		(fun() -> ctx.venv.(i))
-
-and acc_set ctx p acc value =
-	match acc with
-	| AccField (v,f) ->
-		let h = hash_field ctx f in
-		(fun() ->
-			let v = v() in
-			let value = value() in
-			match v with
-			| VObject o -> set_field o h value; value
-			| _ -> throw ctx p ("Invalid field access : " ^ f))
-	| AccArray (e,index) ->
-		(fun() ->
-			let e = e() in
-			let index = index() in
-			let value = value() in
-			(match index, e with
-			| VInt i, VArray a -> (try Array.set a i value; value with _ -> value)
-			| VInt32 _, VArray _ -> value
-			| _, VObject o ->
-				(match eval_oop ctx p o h_set [index;value] with
-				| None -> throw ctx p "Invalid array access"
-				| Some _ -> value);
-			| _ -> throw ctx p "Invalid array access"))
-	| AccLocal i ->
-		(fun() ->
-			let value = value() in
-			DynArray.set ctx.stack (DynArray.length ctx.stack - i) value;
-			value)
-	| AccGlobal g ->
-		(fun() ->
-			let value = value() in
-			g := value;
-			value)
-	| AccThis ->
-		(fun() ->
-			let value = value() in
-			ctx.vthis <- value;
-			value)
-	| AccEnv i ->
-		(fun() ->
-			let value = value() in
-			ctx.venv.(i) <- value;
-			value)
-
-and number_op ctx p sop iop fop oop rop v1 v2 =
-	(fun() ->
-		let v1 = v1() in
-		let v2 = v2() in
-		exc_number_op ctx p sop iop fop oop rop v1 v2)
-
-and exc_number_op ctx p sop iop fop oop rop v1 v2 =
-	match v1, v2 with
-	| VInt a, VInt b -> best_int (iop (Int32.of_int a) (Int32.of_int b))
-	| VInt32 a, VInt b -> best_int (iop a (Int32.of_int b))
-	| VInt a, VInt32 b -> best_int (iop (Int32.of_int a) b)
-	| VFloat a, VInt b -> VFloat (fop a (float_of_int b))
-	| VFloat a, VInt32 b -> VFloat (fop a (Int32.to_float b))
-	| VInt a, VFloat b -> VFloat (fop (float_of_int a) b)
-	| VInt32 a, VFloat b -> VFloat (fop (Int32.to_float a) b)
-	| VFloat a, VFloat b -> VFloat (fop a b)
-	| VInt32 a, VInt32 b -> best_int (iop a b)
-	| VObject o, _ ->
-		(match eval_oop ctx p o oop [v2] with
-		| Some v -> v
-		| None ->
-			match v2 with
-			| VObject o ->
-				(match eval_oop ctx p o rop [v1] with
-				| Some v -> v
-				| None -> throw ctx p sop)
-			| _ ->
-				throw ctx p sop)
-	| _ , VObject o ->
-		(match eval_oop ctx p o rop [v1] with
-		| Some v -> v
-		| None -> throw ctx p sop)
-	| _ ->
-		throw ctx p sop
-
-and int_op ctx p op iop v1 v2 =
-	(fun() ->
-		let v1 = v1() in
-		let v2 = v2() in
-		match v1, v2 with
-		| VInt a, VInt b -> best_int (iop (Int32.of_int a) (Int32.of_int b))
-		| VInt32 a, VInt b -> best_int (iop a (Int32.of_int b))
-		| VInt a, VInt32 b -> best_int (iop (Int32.of_int a) b)
-		| VInt32 a, VInt32 b -> best_int (iop a b)
-		| _ -> throw ctx p op)
-
-and base_op ctx op v1 v2 p =
-	match op with
-	| "+" ->
-		(fun() ->
-			let v1 = v1() in
-			let v2 = v2() in
-			match v1, v2 with
-			| (VInt _ | VInt32 _), (VInt _ | VInt32 _) | (VInt _ | VInt32 _), VFloat _ | VFloat _ , (VInt _ | VInt32 _) | VFloat _ , VFloat _ | VObject _ , _ | _ , VObject _ -> exc_number_op ctx p op Int32.add (+.) h_add h_radd v1 v2
-			| VString a, _ -> VString (a ^ ctx.do_string v2)
-			| _, VString b -> VString (ctx.do_string v1 ^ b)
-			| _ -> throw ctx p op)
-	| "-" ->
-		number_op ctx p op Int32.sub (-.) h_sub h_rsub v1 v2
-	| "*" ->
-		number_op ctx p op Int32.mul ( *. ) h_mult h_rmult v1 v2
-	| "/" ->
-		(fun() ->
-			let v1 = v1() in
-			let v2 = v2() in
-			match v1, v2 with
-			| VInt i, VInt j -> VFloat ((float_of_int i) /. (float_of_int j))
-			| VInt i, VInt32 j -> VFloat ((float_of_int i) /. (Int32.to_float j))
-			| VInt32 i, VInt j -> VFloat ((Int32.to_float i) /. (float_of_int j))
-			| VInt32 i, VInt32 j -> VFloat ((Int32.to_float i) /. (Int32.to_float j))
-			| _ -> exc_number_op ctx p op Int32.div (/.) h_div h_rdiv v1 v2)
-	| "%" ->
-		number_op ctx p op (fun x y -> if y = 0l then throw ctx p op; Int32.rem x y) mod_float h_mod h_rmod v1 v2
-	| "&" ->
-		int_op ctx p op Int32.logand v1 v2
-	| "|" ->
-		int_op ctx p op Int32.logor v1 v2
-	| "^" ->
-		int_op ctx p op Int32.logxor v1 v2
-	| "<<" ->
-		int_op ctx p op (fun x y -> Int32.shift_left x (Int32.to_int y)) v1 v2
-	| ">>" ->
-		int_op ctx p op (fun x y -> Int32.shift_right x (Int32.to_int y)) v1 v2
-	| ">>>" ->
-		int_op ctx p op (fun x y -> Int32.shift_right_logical x (Int32.to_int y)) v1 v2
-	| _ ->
-		throw ctx p op
-
-and eval_op ctx op e1 e2 p =
-	match op with
-	| "=" ->
-		let acc = eval_access ctx e1 in
-		let v = eval ctx e2 in
-		acc_set ctx p acc v
-	| "==" ->
-		let v1 = eval ctx e1 in
-		let v2 = eval ctx e2 in
-		(fun() ->
-			let v1 = v1() in
-			let v2 = v2() in
-			match ctx.do_compare v1 v2 with
-			| CEq -> VBool true
-			| _ -> VBool false)
-	| "!=" ->
-		let v1 = eval ctx e1 in
-		let v2 = eval ctx e2 in
-		(fun() ->
-			let v1 = v1() in
-			let v2 = v2() in
-			match ctx.do_compare v1 v2 with
-			| CEq -> VBool false
-			| _ -> VBool true)
-	| ">" ->
-		let v1 = eval ctx e1 in
-		let v2 = eval ctx e2 in
-		(fun() ->
-			let v1 = v1() in
-			let v2 = v2() in
-			match ctx.do_compare v1 v2 with
-			| CSup -> VBool true
-			| _ -> VBool false)
-	| ">=" ->
-		let v1 = eval ctx e1 in
-		let v2 = eval ctx e2 in
-		(fun() ->
-			let v1 = v1() in
-			let v2 = v2() in
-			match ctx.do_compare v1 v2 with
-			| CSup | CEq -> VBool true
-			| _ -> VBool false)
-	| "<" ->
-		let v1 = eval ctx e1 in
-		let v2 = eval ctx e2 in
-		(fun() ->
-			let v1 = v1() in
-			let v2 = v2() in
-			match ctx.do_compare v1 v2 with
-			| CInf -> VBool true
-			| _ -> VBool false)
-	| "<=" ->
-		let v1 = eval ctx e1 in
-		let v2 = eval ctx e2 in
-		(fun() ->
-			let v1 = v1() in
-			let v2 = v2() in
-			match ctx.do_compare v1 v2 with
-			| CInf | CEq -> VBool true
-			| _ -> VBool false)
-	| "+" | "-" | "*" | "/" | "%" | "|" | "&" | "^" | "<<" | ">>" | ">>>" ->
-		let v1 = eval ctx e1 in
-		let v2 = eval ctx e2 in
-		base_op ctx op v1 v2 p
-	| "+=" | "-=" | "*=" | "/=" | "%=" | "<<=" | ">>=" | ">>>=" | "|=" | "&=" | "^=" ->
-		let aset, aget = eval_access_get_set ctx e1 in
-		let v1 = acc_get ctx p aget in
-		let v2 = eval ctx e2 in
-		let v = base_op ctx (String.sub op 0 (String.length op - 1)) v1 v2 p in
-		acc_set ctx p aset v
-	| "&&" ->
-		let e1 = eval ctx e1 in
-		let e2 = eval ctx e2 in
-		(fun() ->
-			match e1() with
-			| VBool true -> e2()
-			| _ -> VBool false)
-	| "||" ->
-		let e1 = eval ctx e1 in
-		let e2 = eval ctx e2 in
-		(fun() ->
-			match e1() with
-			| VBool true as v -> v
-			| _ -> e2())
-	| "++=" | "--=" ->
-		let aset, aget = eval_access_get_set ctx e1 in
-		let v1 = acc_get ctx p aget in
-		let v2 = eval ctx e2 in
-		let vcache = ref VNull in
-		let v = base_op ctx (String.sub op 0 1) (fun() -> vcache := v1(); !vcache) v2 p in
-		let set = acc_set ctx p aset v in
-		(fun() -> ignore(set()); !vcache)
-	| _ ->
-		throw ctx p ("Unsupported " ^ op)
-
-and call ctx vthis vfun pl p =
-	let oldthis = ctx.vthis in
-	let stackpos = DynArray.length ctx.stack in
-	let oldstack = ctx.callstack in
-	let oldsize = ctx.callsize in
-	let oldenv = ctx.venv in
-	ctx.vthis <- vthis;
-	ctx.callstack <- { cpos = p; cthis = oldthis; cstack = stackpos; cenv = oldenv } :: ctx.callstack;
-	ctx.callsize <- oldsize + 1;
-	if oldsize > 600 then exc (VString "Stack overflow");
-	let ret = (try
-		(match vfun with
-		| VClosure (vl,f) ->
-			f vl pl
-		| VFunction f ->
-			(match pl, f with
-			| [], Fun0 f -> f()
-			| [a], Fun1 f -> f a
-			| [a;b], Fun2 f -> f a b
-			| [a;b;c], Fun3 f -> f a b c
-			| [a;b;c;d], Fun4 f -> f a b c d
-			| [a;b;c;d;e], Fun5 f -> f a b c d e
-			| _, FunVar f -> f pl
-			| _ -> exc (VString (Printf.sprintf "Invalid call (%d args instead of %d)" (List.length pl) (nargs f))))
-		| VAbstract (ALazyType (f,get)) ->
-			get()
-		| _ ->
-			exc (VString "Invalid call"))
-	with Return v -> v
-		| Stack_overflow -> exc (VString "Compiler Stack overflow")
-		| Sys_error msg | Failure msg -> exc (VString msg)
-		| Unix.Unix_error (_,cmd,msg) -> exc (VString ("Error " ^ cmd ^ " " ^ msg))
-		| Invalid_expr -> exc (VString "Invalid input value")
-		| Builtin_error | Invalid_argument _ -> exc (VString "Invalid call")) in
-	ctx.vthis <- oldthis;
-	ctx.venv <- oldenv;
-	ctx.callstack <- oldstack;
-	ctx.callsize <- oldsize;
-	pop ctx (DynArray.length ctx.stack - stackpos);
-	ret
-
-let eval_delayed ctx e =
-	eval ctx (Genneko.gen_expr ctx.gen e)
-
-(* ---------------------------------------------------------------------- *)
-(* OTHERS *)
-
-let rec to_string ctx n v =
-	if n > 5 then
-		"<...>"
-	else let n = n + 1 in
-	match v with
-	| VNull -> "null"
-	| VBool true -> "true"
-	| VBool false -> "false"
-	| VInt i -> string_of_int i
-	| VInt32 i -> Int32.to_string i
-	| VFloat f ->
-		let s = float_repres f in
-		let len = String.length s in
-		if String.unsafe_get s (len - 1) = '.' then String.sub s 0 (len - 1) else s
-	| VString s -> s
-	| VArray vl -> "[" ^ String.concat "," (Array.to_list (Array.map (to_string ctx n) vl)) ^ "]"
-	| VAbstract a ->
-		(match a with
-		| APos p -> "#pos(" ^ Lexer.get_error_pos (Printf.sprintf "%s:%d:") p ^ ")"
-		| _ -> "#abstract")
-	| VFunction f -> "#function:"  ^ string_of_int (nargs f)
-	| VClosure _ -> "#function:-1"
-	| VObject o ->
-		match eval_oop ctx null_pos o h_string [] with
-		| Some (VString s) -> s
-		| _ ->
-			let b = Buffer.create 0 in
-			let first = ref true in
-			Buffer.add_char b '{';
-			Array.iter (fun (f,v) ->
-				if !first then begin
-					Buffer.add_char b ' ';
-					first := false;
-				end else
-					Buffer.add_string b ", ";
-				Buffer.add_string b (field_name ctx f);
-				Buffer.add_string b " => ";
-				Buffer.add_string b (to_string ctx n v);
-			) o.ofields;
-			Buffer.add_string b (if !first then "}" else " }");
-			Buffer.contents b
-
-let rec compare ctx a b =
-	let fcmp (a:float) b = if a = b then CEq else if a < b then CInf else if a > b then CSup else CUndef in
-	let scmp (a:string) b = if a = b then CEq else if a < b then CInf else CSup in
-	let icmp (a:int32) b = let l = Int32.compare a b in if l = 0 then CEq else if l < 0 then CInf else CSup in
-	match a, b with
-	| VNull, VNull -> CEq
-	| VInt a, VInt b -> if a = b then CEq else if a < b then CInf else CSup
-	| VInt32 a, VInt32 b -> icmp a b
-	| VInt a, VInt32 b -> icmp (Int32.of_int a) b
-	| VInt32 a, VInt b -> icmp a (Int32.of_int b)
-	| VFloat a, VFloat b -> fcmp a b
-	| VFloat a, VInt b -> fcmp a (float_of_int b)
-	| VFloat a, VInt32 b -> fcmp a (Int32.to_float b)
-	| VInt a, VFloat b -> fcmp (float_of_int a) b
-	| VInt32 a, VFloat b -> fcmp (Int32.to_float a) b
-	| VBool a, VBool b -> if a = b then CEq else if a then CSup else CInf
-	| VString a, VString b -> scmp a b
-	| VInt _ , VString s
-	| VInt32 _, VString s
-	| VFloat _ , VString s
-	| VBool _ , VString s -> scmp (to_string ctx 0 a) s
-	| VString s, VInt _
-	| VString s, VInt32 _
-	| VString s, VFloat _
-	| VString s, VBool _ -> scmp s (to_string ctx 0 b)
-	| VObject oa, VObject ob ->
-		if oa == ob then CEq else
-			(match eval_oop ctx null_pos oa h_compare [b] with
-			| Some (VInt i) -> if i = 0 then CEq else if i < 0 then CInf else CSup
-			| _ -> CUndef)
-	| VAbstract a, VAbstract b ->
-		if a == b then CEq else CUndef
-	| VArray a, VArray b ->
-		if a == b then CEq else CUndef
-	| VFunction a, VFunction b ->
-		if a == b then CEq else CUndef
-	| VClosure (la,fa), VClosure (lb,fb) ->
-		if la == lb && fa == fb then CEq else CUndef
-	| _ ->
-		CUndef
-
-let value_match_failure s expected actual =
-	let sl = String.concat ", " in
-	let slv l = sl (List.map s_value_kind l) in
-	Printf.sprintf "%s (expected [%s], got [%s])" s (sl expected) (slv actual)
-
-let load_prim ctx f n =
-	match f, n with
-	| VString f, VInt n ->
-		let lib, fname = (try ExtString.String.split f "@" with _ -> "", f) in
-		(try
-			let f = (match lib with
-			| "std" -> Hashtbl.find std_lib fname
-			| "macro" -> Hashtbl.find macro_lib fname
-			| "regexp" -> Hashtbl.find reg_lib fname
-			| "zlib" -> Hashtbl.find z_lib fname
-			| _ -> failwith ("You cannot use the library '" ^ lib ^ "' inside a macro");
-			) in
-			if nargs f <> n then raise Not_found;
-			VFunction f
-		with Not_found ->
-			VFunction (FunVar (fun _ -> exc (VString ("Primitive not found " ^ f ^ ":" ^ string_of_int n)))))
-	| _ ->
-		exc (VString (value_match_failure "Invalid call" ["VString";"VInt"] [f;n]))
-
-let create com api =
-	let loader = obj hash [
-		"args",VArray (Array.of_list (List.map (fun s -> VString s) com.sys_args));
-		"loadprim",VFunction (Fun2 (fun a b -> (get_ctx()).do_loadprim a b));
-		"loadmodule",VFunction (Fun2 (fun a b -> assert false));
-	] in
-	let ctx = {
-		gen = Genneko.new_context com 2 true;
-		types = Hashtbl.create 0;
-		error = false;
-		error_proto = { ofields = [||]; oproto = None };
-		prototypes = Hashtbl.create 0;
-		enums = [||];
-		(* eval *)
-		locals_map = PMap.empty;
-		locals_count = 0;
-		locals_barrier = 0;
-		locals_env = DynArray.create();
-		globals = PMap.empty;
-		(* runtime *)
-		callstack = [];
-		callsize = 0;
-		stack = DynArray.create();
-		exc = [];
-		vthis = VNull;
-		venv = [||];
-		fields_cache = Hashtbl.copy constants;
-		(* api *)
-		do_call = Obj.magic();
-		do_string = Obj.magic();
-		do_loadprim = Obj.magic();
-		do_compare = Obj.magic();
-		(* context *)
-		curapi = api;
-		loader = VObject loader;
-		exports = VObject { ofields = [||]; oproto = None };
-	} in
-	ctx.do_call <- call ctx;
-	ctx.do_string <- to_string ctx 0;
-	ctx.do_loadprim <- load_prim ctx;
-	ctx.do_compare <- compare ctx;
-	select ctx;
-	List.iter (fun e -> ignore((eval ctx e)())) (Genneko.header());
-	ctx
-
-let do_reuse ctx api =
-	ctx.curapi <- api
-
-let can_reuse ctx types =
-	let has_old_version t =
-		let inf = Type.t_infos t in
-		try
-			Hashtbl.find ctx.types inf.mt_path <> inf.mt_module.m_id
-		with Not_found ->
-			false
-	in
-	not (List.exists has_old_version types)
-
-let add_types ctx types ready =
-	let types = List.filter (fun t -> match t with
-		| TAbstractDecl a when not (Meta.has Meta.CoreType a.a_meta) ->
-			(* A @:native on an abstract causes the implementation class and the abstract
-			   to have the same path. Let's skip all abstracts so this doesn't matter. *)
-			false
-		| _ ->
-			let path = Type.t_path t in
-			if Hashtbl.mem ctx.types path then false else begin
-				Hashtbl.add ctx.types path (Type.t_infos t).mt_module.m_id;
-				true;
-			end
-	) types in
-	List.iter ready types;
-	let e = (EBlock (Genneko.build ctx.gen types), null_pos) in
-	ignore(catch_errors ctx (fun() -> ignore((eval ctx e)())))
-
-let get_path ctx path p =
-	let rec loop = function
-		| [] -> assert false
-		| [x] -> (EConst (Ident x),p)
-		| x :: l -> (EField (loop l,x),p)
-	in
-	(eval ctx (loop (List.rev path)))()
-
-let set_error ctx e =
-	ctx.error <- e
-
-let call_path ctx path f vl api =
-	if ctx.error then
-		None
-	else let old = ctx.curapi in
-	ctx.curapi <- api;
-	let p = Genneko.pos ctx.gen api.pos in
-	catch_errors ctx ~final:(fun() -> ctx.curapi <- old) (fun() ->
-		match get_path ctx path p with
-		| VObject o ->
-			let f = get_field o (hash f) in
-			call ctx (VObject o) f vl p
-		| v ->
-			print_endline (value_match_failure ("Unexpected value for " ^ (String.concat "." path)) ["VObject"] [v]);
-			assert false
-	)
-
-let init ctx =
-	let get_enum_proto e =
-		match get_path ctx ["haxe";"macro";enum_name e] null_pos with
-		| VObject e ->
-			(match get_field e h_constructs with
-			| VObject cst ->
-				(match get_field cst h_a with
-				| VArray a ->
-					Array.map (fun s ->
-						match s with
-						| VObject s -> (match get_field s h_s with VString s -> get_field e (hash s),s | _ -> assert false)
-						| _ -> assert false
-					) a
-				| _ -> assert false)
-			| _ -> assert false)
-		| _ -> failwith ("haxe.macro." ^ enum_name e ^ " does not exists")
-	in
-	ctx.enums <- Array.of_list (List.map get_enum_proto MacroApi.all_enums);
-	ctx.error_proto <- (match get_path ctx ["haxe";"macro";"Error";"prototype"] null_pos with VObject p -> p | _ -> failwith ("haxe.macro.Error does not exists"))
-
-(* ---------------------------------------------------------------------- *)
-(* MACRO API IMPL *)
-
-let vnull = VNull
-
-let vint i = VInt i
-let vint32 i = VInt32 i
-let vfun0 f = VFunction (Fun0 f)
-let vfun1 f = VFunction (Fun1 f)
-let vfun2 f = VFunction (Fun2 f)
-let vfun3 f = VFunction (Fun3 f)
-let vfun4 f = VFunction (Fun4 f)
-let vfun5 f = VFunction (Fun5 f)
-let vbool b = VBool b
-let vfloat f = VFloat f
-
-let encode_unsafe o = VAbstract (AUnsafe o)
-
-let value_string v = to_string (get_ctx()) 0 v
-
-let field v f =
-	match v with
-	| VObject o -> get_field o (hash f)
-	| _ -> raise Invalid_expr
-
-let dec_string v =
-	match field v "__s" with
-	| VString s -> s
-	| _ -> raise Invalid_expr
-
-let decode_bytes v =
-	match field v "b" with
-	| VString s -> s
-	| _ -> raise Invalid_expr
-
-let dec_array v =
-	match field v "__a", field v "length" with
-	| VArray a, VInt l -> Array.to_list (if Array.length a = l then a else Array.sub a 0 l)
-	| _ -> raise Invalid_expr
-
-let decode_lazytype = function
-	| VAbstract (ALazyType (t,_)) -> t
-	| _ -> raise Invalid_expr
-
-let encode_lazytype t f = VAbstract (ALazyType (t,f))
-let encode_tdecl t = VAbstract (ATDecl t)
-
-let decode_tdecl = function
-	| VAbstract (ATDecl t) -> t
-	| _ -> raise Invalid_expr
-
-let dec_int = function
-	| VInt i -> i
-	| VInt32 i -> Int32.to_int i
-	| _ -> raise Invalid_expr
-
-let dec_i32 = function
-	| VInt i -> Int32.of_int i
-	| VInt32 i -> i
-	| _ -> raise Invalid_expr
-
-let dec_bytes = function
-	| VString s -> s
-	| _ -> raise Invalid_expr
-
-let encode_pos p =
-	VAbstract (APos p)
-
-let enc_inst path fields =
-	let ctx = get_ctx() in
-	let p = (try Hashtbl.find ctx.prototypes path with Not_found -> try
-		(match get_path ctx (path@["prototype"]) Nast.null_pos with
-		| VObject o -> Hashtbl.add ctx.prototypes path o; o
-		| _ -> raise (Runtime VNull))
-	with Runtime _ ->
-		failwith ("Prototype not found " ^ String.concat "." path)
-	) in
-	let o = obj hash fields in
-	o.oproto <- Some p;
-	VObject o
-
-let enc_array l =
-	let a = Array.of_list l in
-	enc_inst ["Array"] [
-		"__a", VArray a;
-		"length", VInt (Array.length a);
-	]
-
-let enc_string s =
-	enc_inst ["String"] [
-		"__s", VString s;
-		"length", VInt (String.length s)
-	]
-
-let encode_bytes s =
-	enc_inst ["haxe";"io";"Bytes"] [
-		"b", VString s;
-		"length", VInt (String.length s)
-	]
-
-let enc_hash h =
-	enc_inst ["haxe";"ds";"StringMap"] [
-		"h", VAbstract (AHash h);
-	]
-
-let enc_obj _ l = VObject (obj hash l)
-
-let encode_enum (i:enum_type) pos index pl =
-	let eindex : int = Obj.magic i in
-	let edef = (get_ctx()).enums.(eindex) in
-	if pl = [] then
-		fst edef.(index)
-	else
-		enc_inst ["haxe";"macro";enum_name i] (
-			("tag", VString (snd edef.(index))) ::
-			("index", VInt index) ::
-			("args", VArray (Array.of_list pl)) ::
-			(match pos with None -> [] | Some p -> ["pos", encode_pos p])
-		)
-
-let encode_ref v convert tostr =
-	enc_obj O__Const [
-		"get", VFunction (Fun0 (fun() -> convert v));
-		"__string", VFunction (Fun0 (fun() -> VString (tostr())));
-		"toString", VFunction (Fun0 (fun() -> enc_string (tostr())));
-		"$", VAbstract (AUnsafe (Obj.repr v));
-	]
-
-let decode_ref v : 'a =
-	match field v "$" with
-	| VAbstract (AUnsafe t) -> Obj.obj t
-	| _ -> raise Invalid_expr
-
-let encode_string_map convert m =
-	let h = Hashtbl.create 0 in
-	PMap.iter (fun k v -> Hashtbl.add h (VString k) (convert v)) m;
-	enc_hash h
-
-let decode_pos = function
-	| VAbstract (APos p) -> p
-	| _ -> raise Invalid_expr
-
-let decode_enum v =
-	match field v "index", field v "args" with
-	| VInt i, VNull -> i, []
-	| VInt i, VArray a -> i, Array.to_list a
-	| _ -> raise Invalid_expr
-
-let decode_enum_with_pos v =
-	(match field v "index", field v "args" with
-	| VInt i, VNull -> i, []
-	| VInt i, VArray a -> i, Array.to_list a
-	| _ -> raise Invalid_expr),(match field v "pos" with
-		| VAbstract(APos p) -> p
-		| _ -> Globals.null_pos) (* Can happen from reification and other sources. *)
-
-let dec_bool = function
-	| VBool b -> b
-	| _ -> raise Invalid_expr
-
-let decode_unsafe = function
-	| VAbstract (AUnsafe o) -> o
-	| _ -> raise Invalid_expr
-
-let compiler_error msg pos =
-	exc (enc_inst ["haxe";"macro";"Error"] [("message",enc_string msg);("pos",encode_pos pos)])
-
-let value_to_expr v p =
-	let h_enum = hash "__enum__" and h_et = hash "__et__" and h_ct = hash "__ct__" in
-	let h_tag = hash "tag" and h_args = hash "args" in
-	let h_length = hash "length" in
-	let ctx = get_ctx() in
-	let error v = failwith ("Unsupported value " ^ ctx.do_string v) in
-	let make_path t =
-		let rec loop = function
-			| [] -> assert false
-			| [name] -> (Ast.EConst (Ast.Ident name),p)
-			| name :: l -> (Ast.EField (loop l,name),p)
-		in
-		let t = t_infos t in
-		loop (List.rev (if t.mt_module.m_path = t.mt_path then fst t.mt_path @ [snd t.mt_path] else fst t.mt_module.m_path @ [snd t.mt_module.m_path;snd t.mt_path]))
-	in
-	let rec loop = function
-		| VNull -> (Ast.EConst (Ast.Ident "null"),p)
-		| VBool b -> (Ast.EConst (Ast.Ident (if b then "true" else "false")),p)
-		| VInt i -> (Ast.EConst (Ast.Int (string_of_int i)),p)
-		| VInt32 i -> (Ast.EConst (Ast.Int (Int32.to_string i)),p)
-		| VFloat f -> haxe_float f p
-		| VAbstract (APos p) ->
-			(Ast.EObjectDecl (
-				(("fileName",Globals.null_pos) , (Ast.EConst (Ast.String p.Globals.pfile) , p)) ::
-				(("lineNumber",Globals.null_pos) , (Ast.EConst (Ast.Int (string_of_int (Lexer.get_error_line p))),p)) ::
-				(("className",Globals.null_pos) , (Ast.EConst (Ast.String ("")),p)) ::
-				[]
-			), p)
-		| VString _ | VArray _ | VAbstract _ | VFunction _ | VClosure _ as v -> error v
-		| VObject o as v ->
-			match o.oproto with
-			| None ->
-				(match get_field_opt o h_ct with
-				| Some (VAbstract (ATDecl t)) ->
-					make_path t
-				| _ ->
-					let fields = List.fold_left (fun acc (fid,v) -> ((field_name ctx fid,Globals.null_pos), loop v) :: acc) [] (Array.to_list o.ofields) in
-					(Ast.EObjectDecl fields, p))
-			| Some proto ->
-				match get_field_opt proto h_enum, get_field_opt o h_a, get_field_opt o h_s, get_field_opt o h_length with
-				| _, Some (VArray a), _, Some (VInt len) ->
-					(Ast.EArrayDecl (List.map loop (Array.to_list (Array.sub a 0 len))),p)
-				| _, _, Some (VString s), _ ->
-					(Ast.EConst (Ast.String s),p)
-				| Some (VObject en), _, _, _ ->
-					(match get_field en h_et, get_field o h_tag with
-					| VAbstract (ATDecl t), VString tag ->
-						let e = (Ast.EField (make_path t,tag),p) in
-						(match get_field_opt o h_args with
-						| Some (VArray args) ->
-							let args = List.map loop (Array.to_list args) in
-							(Ast.ECall (e,args),p)
-						| _ -> e)
-					| _ ->
-						error v)
-				| _ ->
-					error v
-	in
-	loop v
-
-let value_signature v =
-	let cache = ref [] in
-	let cache_count = ref 0 in
-	let hfiles = Hashtbl.create 0 in
-	let get_file f =
-		try
-			Hashtbl.find hfiles f
-		with Not_found ->
-			let ff = Path.unique_full_path f in
-			Hashtbl.add hfiles f ff;
-			ff
-	in
-	let do_cache (v:value) (v2:value) =
-		(*
-			tricky : we need to have a quick not-linear cache based on objects address
-			but we can't use address since the GC might be triggered here.
-			Instead let's mutate the object temporary.
-		*)
-		let vt = Obj.repr v in
-		let old = Obj.tag vt in
-		let old_val = Obj.field vt 0 in
-		let abstract_tag = 7 in
-		Obj.set_tag vt abstract_tag;
-		Obj.set_field vt 0 (Obj.repr (ACacheRef v2));
-		cache := (vt,old,old_val) :: !cache;
-		incr cache_count
-	in
-	let rec loop v =
-		match v with
-		| VNull | VBool _ | VInt _ | VFloat _ | VString _ | VInt32 _ -> v
-		| VObject o ->
-			let o2 = { ofields = [||]; oproto = None } in
-			let v2 = VObject o2 in
-			do_cache v v2;
-			Array.iter (fun (f,v) -> if f <> h_class then set_field o2 f (loop v)) o.ofields;
-			(match o.oproto with
-			| None -> ()
-			| Some p -> (match loop (VObject p) with VObject p2 -> o2.oproto <- Some p2 | _ -> assert false));
-			v2
-		| VArray a ->
-			let a2 = Array.create (Array.length a) VNull in
-			let v2 = VArray a2 in
-			do_cache v v2;
-			for i = 0 to Array.length a - 1 do
-				a2.(i) <- loop a.(i);
-			done;
-			v2
-		| VFunction f ->
-			let v2 = VFunction (Obj.magic !cache_count) in
-			do_cache v v2;
-			v2
-		| VClosure (vl,f) ->
-			let rl = ref [] in
-			let v2 = VClosure (Obj.magic rl, Obj.magic !cache_count) in
-			(* in ocaml 4.0+ it was reported some stack overflow, related to vl being GC'ed or mutated in do_cache.
-			   let's make sure to have a real pointer to it first. The fix will trigger an alloc which might have simply moved the problem away *)
-			let vl = VNull :: vl in
-			do_cache v v2;
-			rl := List.map loop vl;
-			v2
-		| VAbstract (APos p) -> VAbstract (APos { p with Globals.pfile = get_file p.Globals.pfile })
-		| VAbstract (ACacheRef v) -> v
-		| VAbstract (AHash h) ->
-			let h2 = Hashtbl.create 0 in
-			let v2 = VAbstract (AHash h2) in
-			do_cache v v2;
-			Hashtbl.iter (fun k v -> Hashtbl.add h2 k (loop v)) h2;
-			v2
-		| VAbstract _ ->
-			let v2 = VAbstract (Obj.magic !cache_count) in
-			do_cache v v2;
-			v2
-	in
-	let v = loop v in
-	(* restore *)
-	List.iter (fun (vt,tag,field) ->
-		Obj.set_tag vt tag;
-		Obj.set_field vt 0 field;
-	) !cache;
-	Digest.string (Marshal.to_string v [Marshal.Closures])
-
-let prepare_callback v n =
-	match v with
-	| VFunction _ | VClosure _ ->
-		let ctx = get_ctx() in
-		(fun args ->
-			match catch_errors ctx (fun() -> ctx.do_call VNull v args null_pos) with
-			| None -> VNull
-			| Some v -> v
-		)
-	| _ ->
-		raise Invalid_expr
diff --git a/src/macro/macroApi.ml b/src/macro/macroApi.ml
index d8ec11be5c2ae6dd57dfd8c5a06a09da939b6756..7065d9b3b368bf1250ba9b40cb8b11c32e02719e 100644
--- a/src/macro/macroApi.ml
+++ b/src/macro/macroApi.ml
@@ -15,7 +15,7 @@ type 'value compiler_api = {
 	get_type : string -> Type.t option;
 	get_module : string -> Type.t list;
 	after_typing : (module_type list -> unit) -> unit;
-	on_generate : (Type.t list -> unit) -> unit;
+	on_generate : (Type.t list -> unit) -> bool -> unit;
 	after_generate : (unit -> unit) -> unit;
 	on_type_not_found : (string -> 'value) -> unit;
 	parse_string : string -> Globals.pos -> bool -> Ast.expr;
@@ -25,7 +25,7 @@ type 'value compiler_api = {
 	store_typed_expr : Type.texpr -> Ast.expr;
 	allow_package : string -> unit;
 	type_patch : string -> string -> bool -> string option -> unit;
-	meta_patch : string -> string -> string option -> bool -> unit;
+	meta_patch : string -> string -> string option -> bool -> pos -> unit;
 	set_js_generator : (Genjs.ctx -> unit) -> unit;
 	get_local_type : unit -> t option;
 	get_expected_type : unit -> t option;
@@ -35,19 +35,21 @@ type 'value compiler_api = {
 	get_local_using : unit -> tclass list;
 	get_local_vars : unit -> (string, Type.tvar) PMap.t;
 	get_build_fields : unit -> 'value;
-	get_pattern_locals : Ast.expr -> Type.t -> (string,Type.tvar * Globals.pos) PMap.t;
-	define_type : 'value -> unit;
+	define_type : 'value -> string option -> unit;
 	define_module : string -> 'value list -> ((string * Globals.pos) list * Ast.import_mode) list -> Ast.type_path list -> unit;
-	module_dependency : string -> string -> bool -> unit;
+	module_dependency : string -> string -> unit;
 	current_module : unit -> module_def;
-	on_reuse : (unit -> bool) -> unit;
 	mutable current_macro_module : unit -> module_def;
-	delayed_macro : int -> (unit -> (unit -> 'value));
 	use_cache : unit -> bool;
 	format_string : string -> Globals.pos -> Ast.expr;
-	cast_or_unify : Type.t -> texpr -> Globals.pos -> Type.texpr;
-	add_global_metadata : string -> string -> (bool * bool * bool) -> unit;
+	cast_or_unify : Type.t -> texpr -> Globals.pos -> bool;
+	add_global_metadata : string -> string -> (bool * bool * bool) -> pos -> unit;
 	add_module_check_policy : string list -> int list -> bool -> int -> unit;
+	decode_expr : 'value -> Ast.expr;
+	encode_expr : Ast.expr -> 'value;
+	encode_ctype : Ast.type_hint -> 'value;
+	decode_type : 'value -> t;
+	flush_context : (unit -> t) -> t;
 }
 
 
@@ -70,56 +72,12 @@ type enum_type =
 	| IModuleType
 	| IFieldAccess
 	| IAnonStatus
+	| IQuoteStatus
 	| IImportMode
-
-type obj_type =
-	(* make_const *)
-	| O__Const
-	(* Expr *)
-	| OImportExpr
-	| OImportExpr_path
-	| OTypePath
-	| OMetadataEntry
-	| OField
-	| OTypeParamDecl
-	| OFunction
-	| OFunctionArg
-	| OExprDef_fields
-	| OVar
-	| OCase
-	| OCatch
-	| OExpr
-	(* Type *)
-	| OMetaAccess
-	| OTypeParameter
-	| OClassType
-	| OAbstractType
-	| OAnonType
-	| ODefType
-	| OEnumType
-	| OClassField
-	| OAbstractType_binops
-	| OAbstractType_unops
-	| OAbstractType_from
-	| OAbstractType_to
-	| OEnumField
-	| OClassType_superClass
-	| OClassType_interfaces
-	| OType_args
-	| OTVar
-	| OTVar_extra
-	| OTFunc
-	| OTFunc_args
-	| OFieldAccess_c
-	| OTypedExprDef
-	| OTypedExprDef_fields
-	| OTypedExprDef_cases
-	| OTypedExprDef_catches
-	| OJSGenApi
-	| OContext_getPosInfos
-	| OCompiler_getDisplayPos
-	| ORef
-(* ---- ^^^^^ please exactly match the name of the typedef or use TypeName_field if it's a anonymous *)
+	| IDisplayKind
+	| IMessage
+	| IFunctionKind
+	| IStringLiteralKind
 
 (**
 	Our access to the interpreter from the macro api
@@ -134,9 +92,10 @@ module type InterpApi = sig
 	val vint32 : int32 -> value
 	val vbool : bool -> value
 
-	val enc_array : value list -> value
-	val enc_string  : string -> value
-	val enc_obj : obj_type -> (string * value) list -> value
+	val encode_array : value list -> value
+	val encode_string  : string -> value
+	val encode_obj : (string * value) list -> value
+	val encode_lazy : (unit -> value) -> value
 
 	val vfun0 : (unit -> value) -> value
 	val vfun1 : (value -> value) -> value
@@ -150,21 +109,21 @@ module type InterpApi = sig
 	val encode_string_map : ('a -> value) -> (string, 'a) PMap.t -> value
 
 	val encode_tdecl : Type.module_type -> value
-	val encode_lazytype : (unit -> Type.t) ref -> (unit -> value) -> value
+	val encode_lazytype : tlazy ref -> (unit -> value) -> value
 	val encode_unsafe : Obj.t -> value
 
 	val field : value -> string -> value
 
-	val dec_bool : value -> bool
-	val dec_int : value -> int
-	val dec_i32 : value -> int32
-	val dec_string : value -> string
-	val dec_array : value -> value list
+	val decode_bool : value -> bool
+	val decode_int : value -> int
+	val decode_i32 : value -> int32
+	val decode_string : value -> string
+	val decode_array : value -> value list
 
 	val decode_pos : value -> Globals.pos
 	val decode_enum : value -> int * value list
 	val decode_tdecl : value -> Type.module_type
-	val decode_lazytype : value -> (unit -> Type.t) ref
+	val decode_lazytype : value -> tlazy ref
 	val decode_unsafe : value -> Obj.t
 
 	val decode_enum_with_pos : value -> (int * value list) * Globals.pos
@@ -173,16 +132,22 @@ module type InterpApi = sig
 	val decode_ref : value -> 'a
 
 	val compiler_error : string -> Globals.pos -> 'a
+	val error_message : string -> 'a
 	val value_to_expr : value -> Globals.pos -> Ast.expr
 	val value_signature : value -> string
 
-	val encode_bytes : string -> value
-	val decode_bytes : value -> string (* haxe.io.Bytes *)
+	val encode_bytes : bytes -> value
+	val decode_bytes : value -> bytes (* haxe.io.Bytes *)
 
 	val prepare_callback : value -> int -> (value list -> value)
 
 	val value_string : value -> string
 
+	val flush_core_context : (unit -> t) -> t
+
+	val handle_decoding_error : (string -> unit) -> value -> Type.t -> (string * int) list
+
+	val get_api_call_pos : unit -> pos
 end
 
 let enum_name = function
@@ -205,51 +170,11 @@ let enum_name = function
 	| IFieldAccess -> "FieldAccess"
 	| IAnonStatus -> "AnonStatus"
 	| IImportMode -> "ImportMode"
-
-let proto_name = function
-	| O__Const -> assert false
-	| OImportExpr -> "ImportExpr", None
-	| OImportExpr_path -> "ImportExpr", Some "path"
-	| OTypePath -> "TypePath", None
-	| OMetadataEntry -> "MetadataEntry", None
-	| OField -> "Field", None
-	| OTypeParamDecl -> "TypeParamDecl", None
-	| OFunction -> "Function", None
-	| OFunctionArg -> "FunctionArg", None
-	| OExprDef_fields -> "ExprDef", Some "fields"
-	| OVar -> "Var", None
-	| OCase -> "Case", None
-	| OCatch -> "Catch", None
-	| OExpr -> "Expr", None
-	| OMetaAccess -> "MetaAccess", None
-	| OTypeParameter -> "TypeParameter", None
-	| OClassType -> "ClassType", None
-	| OAbstractType -> "AbstracType", None
-	| OAnonType -> "AnonType", None
-	| ODefType -> "DefType", None
-	| OEnumType -> "EnumType", None
-	| OClassField -> "ClassField", None
-	| OAbstractType_binops -> "AbstractType", Some "binops"
-	| OAbstractType_unops -> "AbstractType", Some "unops"
-	| OAbstractType_from -> "AbstractType", Some "from"
-	| OAbstractType_to -> "AbstractType", Some "to"
-	| OEnumField -> "EnumField", None
-	| OClassType_superClass -> "ClassType", Some "superClass"
-	| OClassType_interfaces -> "ClassType", Some "interfaces"
-	| OType_args -> "Type", Some "args"
-	| OTVar -> "TVar", None
-	| OTVar_extra -> "TVar", Some "extra"
-	| OTFunc -> "TFunc", None
-	| OTFunc_args -> "TFunc", Some "args"
-	| OFieldAccess_c -> "FieldAccess", Some "c"
-	| OTypedExprDef -> "TypedExprDef", None
-	| OTypedExprDef_fields -> "TypedExprDef", Some "fields"
-	| OTypedExprDef_cases -> "TypedExprDef", Some "cases"
-	| OTypedExprDef_catches -> "TypedExprDef", Some "catches"
-	| OJSGenApi -> "JSGenApi", None
-	| OContext_getPosInfos -> "Context", Some "getPosInfos"
-	| OCompiler_getDisplayPos -> "Compiler", Some "getDisplayPos"
-	| ORef -> "Ref", None
+	| IQuoteStatus -> "QuoteStatus"
+	| IDisplayKind -> "DisplayKind"
+	| IMessage -> "Message"
+	| IFunctionKind -> "FunctionKind"
+	| IStringLiteralKind -> "StringLiteralKind"
 
 let all_enums =
 	let last = IImportMode in
@@ -273,7 +198,7 @@ let haxe_float f p =
 	else if (f <> f) then
 		(Ast.EField (math, "NaN"), p)
 	else
-		(Ast.EConst (Ast.Float (float_repres f)), p)
+		(Ast.EConst (Ast.Float (Numeric.float_repres f)), p)
 
 (* ------------------------------------------------------------------------------------------------------------- *)
 (* Our macro api functor *)
@@ -292,13 +217,20 @@ let null f = function
 
 let encode_enum ?(pos=None) k tag vl = encode_enum k pos tag vl
 
+let encode_string_literal_kind qs =
+	let tag = match qs with
+		| SDoubleQuotes -> 0
+		| SSingleQuotes -> 1
+	in
+	encode_enum IStringLiteralKind tag []
+
 let encode_const c =
 	let tag, pl = match c with
-	| Int s -> 0, [enc_string s]
-	| Float s -> 1, [enc_string s]
-	| String s -> 2, [enc_string s]
-	| Ident s -> 3, [enc_string s]
-	| Regexp (s,opt) -> 4, [enc_string s;enc_string opt]
+	| Int s -> 0, [encode_string s]
+	| Float s -> 1, [encode_string s]
+	| String(s,qs) -> 2, [encode_string s;encode_string_literal_kind qs]
+	| Ident s -> 3, [encode_string s]
+	| Regexp (s,opt) -> 4, [encode_string s;encode_string opt]
 	in
 	encode_enum IConst tag pl
 
@@ -327,6 +259,7 @@ let rec encode_binop op =
 	| OpAssignOp op -> 20, [encode_binop op]
 	| OpInterval -> 21, []
 	| OpArrow -> 22, []
+	| OpIn -> 23, []
 	in
 	encode_enum IBinop tag pl
 
@@ -343,34 +276,35 @@ let encode_unop op =
 let encode_import (path,mode) =
 	let tag,pl = match mode with
 		| INormal -> 0, []
-		| IAsName s -> 1, [enc_string s]
+		| IAsName(s,_) -> 1, [encode_string s]
 		| IAll -> 2,[]
 	in
 	let mode = encode_enum IImportMode tag pl in
-	enc_obj OImportExpr [
-		"path", enc_array (List.map (fun (name,p) -> enc_obj OImportExpr_path [ "pos", encode_pos p; "name", enc_string name]) path);
+	encode_obj [
+		"path", encode_array (List.map (fun (name,p) -> encode_obj [ "pos", encode_pos p; "name", encode_string name]) path);
 		"mode", mode
 	]
 
 let encode_placed_name (s,p) =
-	enc_string s
+	encode_string s
 
-let rec encode_path (t,_) =
+let rec encode_path (t,p) =
 	let fields = [
-		"pack", enc_array (List.map enc_string t.tpackage);
-		"name", enc_string t.tname;
-		"params", enc_array (List.map encode_tparam t.tparams);
+		"pack", encode_array (List.map encode_string t.tpackage);
+		"name", encode_string t.tname;
+		"params", encode_array (List.map encode_tparam t.tparams);
+		"pos", encode_pos p;
 	] in
-	enc_obj OTypePath (match t.tsub with
+	encode_obj (match t.tsub with
 		| None -> fields
-		| Some s -> ("sub", enc_string s) :: fields)
+		| Some s -> ("sub", encode_string s) :: fields)
 
 and encode_tparam = function
 	| TPType t -> encode_enum ITParam 0 [encode_ctype t]
 	| TPExpr e -> encode_enum ITParam 1 [encode_expr e]
 
 and encode_access a =
-	let tag = match a with
+	let tag = match fst a with
 		| APublic -> 0
 		| APrivate -> 1
 		| AStatic -> 2
@@ -378,18 +312,20 @@ and encode_access a =
 		| ADynamic -> 4
 		| AInline -> 5
 		| AMacro -> 6
+		| AFinal -> 7
+		| AExtern -> 8
 	in
-	encode_enum IAccess tag []
+	encode_enum ~pos:(Some (pos a)) IAccess tag []
 
 and encode_meta_entry (m,ml,p) =
-	enc_obj OMetadataEntry [
-		"name", enc_string (Meta.to_string m);
-		"params", enc_array (List.map encode_expr ml);
+	encode_obj [
+		"name", encode_string (Meta.to_string m);
+		"params", encode_array (List.map encode_expr ml);
 		"pos", encode_pos p;
 	]
 
 and encode_meta_content m =
-	enc_array (List.map encode_meta_entry m)
+	encode_array (List.map encode_meta_entry m)
 
 and encode_field (f:class_field) =
 	let tag, pl = match f.cff_kind with
@@ -397,14 +333,14 @@ and encode_field (f:class_field) =
 		| FFun f -> 1, [encode_fun f]
 		| FProp (get,set, t, e) -> 2, [encode_placed_name get; encode_placed_name set; null encode_ctype t; null encode_expr e]
 	in
-	enc_obj OField [
+	encode_obj [
 		"name",encode_placed_name f.cff_name;
 		"name_pos", encode_pos (pos f.cff_name);
-		"doc", null enc_string f.cff_doc;
+		"doc", null encode_string f.cff_doc;
 		"pos", encode_pos f.cff_pos;
 		"kind", encode_enum IField tag pl;
 		"meta", encode_meta_content f.cff_meta;
-		"access", enc_array (List.map encode_access f.cff_access);
+		"access", encode_array (List.map encode_access f.cff_access);
 	]
 
 and encode_ctype t =
@@ -412,32 +348,38 @@ and encode_ctype t =
 	| CTPath p ->
 		0, [encode_path (p,Globals.null_pos)]
 	| CTFunction (pl,r) ->
-		1, [enc_array (List.map encode_ctype pl);encode_ctype r]
+		1, [encode_array (List.map encode_ctype pl);encode_ctype r]
 	| CTAnonymous fl ->
-		2, [enc_array (List.map encode_field fl)]
+		2, [encode_array (List.map encode_field fl)]
 	| CTParent t ->
 		3, [encode_ctype t]
 	| CTExtend (tl,fields) ->
-		4, [enc_array (List.map encode_path tl); enc_array (List.map encode_field fields)]
+		4, [encode_array (List.map encode_path tl); encode_array (List.map encode_field fields)]
 	| CTOptional t ->
 		5, [encode_ctype t]
+	| CTNamed (n,t) ->
+		6, [encode_placed_name n; encode_ctype t]
+	| CTIntersection tl ->
+		7, [(encode_array (List.map encode_ctype tl))]
 	in
 	encode_enum ~pos:(Some (pos t)) ICType tag pl
 
 and encode_tparam_decl tp =
-	enc_obj OTypeParamDecl [
+	encode_obj [
 		"name", encode_placed_name tp.tp_name;
 		"name_pos", encode_pos (pos tp.tp_name);
-		"params", enc_array (List.map encode_tparam_decl tp.tp_params);
-		"constraints", enc_array (List.map encode_ctype tp.tp_constraints);
+		"params", encode_array (List.map encode_tparam_decl tp.tp_params);
+		"constraints", (match tp.tp_constraints with
+			| None -> encode_array []
+			| Some th -> encode_array [encode_ctype th]);
 		"meta", encode_meta_content tp.tp_meta;
 	]
 
 and encode_fun f =
-	enc_obj OFunction [
-		"params", enc_array (List.map encode_tparam_decl f.f_params);
-		"args", enc_array (List.map (fun (n,opt,m,t,e) ->
-			enc_obj OFunctionArg [
+	encode_obj [
+		"params", encode_array (List.map encode_tparam_decl f.f_params);
+		"args", encode_array (List.map (fun (n,opt,m,t,e) ->
+			encode_obj [
 				"name", encode_placed_name n;
 				"name_pos", encode_pos (pos n);
 				"opt", vbool opt;
@@ -450,6 +392,24 @@ and encode_fun f =
 		"expr", null encode_expr f.f_expr
 	]
 
+and encode_display_kind dk =
+	let tag, pl = match dk with
+	| DKCall -> 0, []
+	| DKDot -> 1, []
+	| DKStructure -> 2, []
+	| DKMarked -> 3, []
+	| DKPattern outermost -> 4, [vbool outermost]
+	in
+	encode_enum ~pos:None IDisplayKind tag pl
+
+and encode_message msg =
+	let tag, pl = match msg with
+		| CMInfo(msg,p) -> 0, [(encode_string msg); (encode_pos p)]
+		| CMWarning(msg,p) -> 1, [(encode_string msg); (encode_pos p)]
+		| CMError(_,_) -> assert false
+	in
+	encode_enum ~pos:None IMessage tag pl
+
 and encode_expr e =
 	let rec loop (e,p) =
 		let tag, pl = match e with
@@ -460,56 +420,56 @@ and encode_expr e =
 			| EBinop (op,e1,e2) ->
 				2, [encode_binop op;loop e1;loop e2]
 			| EField (e,f) ->
-				3, [loop e;enc_string f]
+				3, [loop e;encode_string f]
 			| EParenthesis e ->
 				4, [loop e]
 			| EObjectDecl fl ->
-				5, [enc_array (List.map (fun ((f,p),e) -> enc_obj OExprDef_fields [
-					"field",enc_string f;
+				5, [encode_array (List.map (fun ((f,p,qs),e) -> encode_obj [
+					"field",encode_string f;
 					"name_pos",encode_pos p;
+					"quotes",encode_enum IQuoteStatus (match qs with NoQuotes -> 0 | DoubleQuotes -> 1) [];
 					"expr",loop e;
 				]) fl)]
 			| EArrayDecl el ->
-				6, [enc_array (List.map loop el)]
+				6, [encode_array (List.map loop el)]
 			| ECall (e,el) ->
-				7, [loop e;enc_array (List.map loop el)]
+				7, [loop e;encode_array (List.map loop el)]
 			| ENew (p,el) ->
-				8, [encode_path p; enc_array (List.map loop el)]
+				8, [encode_path p; encode_array (List.map loop el)]
 			| EUnop (op,flag,e) ->
 				9, [encode_unop op; vbool (match flag with Prefix -> false | Postfix -> true); loop e]
 			| EVars vl ->
-				10, [enc_array (List.map (fun (v,t,eo) ->
-					enc_obj OVar [
+				10, [encode_array (List.map (fun (v,final,t,eo) ->
+					encode_obj [
 						"name",encode_placed_name v;
 						"name_pos",encode_pos (pos v);
+						"isFinal",vbool final;
 						"type",null encode_ctype t;
 						"expr",null loop eo;
 					]
 				) vl)]
-			| EFunction (name,f) ->
-				11, [null enc_string name; encode_fun f]
+			| EFunction (kind,f) ->
+				11, [encode_function_kind kind; encode_fun f]
 			| EBlock el ->
-				12, [enc_array (List.map loop el)]
+				12, [encode_array (List.map loop el)]
 			| EFor (e,eloop) ->
 				13, [loop e;loop eloop]
-			| EIn (e1,e2) ->
-				14, [loop e1;loop e2]
 			| EIf (econd,e,eelse) ->
-				15, [loop econd;loop e;null loop eelse]
+				14, [loop econd;loop e;null loop eelse]
 			| EWhile (econd,e,flag) ->
-				16, [loop econd;loop e;vbool (match flag with NormalWhile -> true | DoWhile -> false)]
+				15, [loop econd;loop e;vbool (match flag with NormalWhile -> true | DoWhile -> false)]
 			| ESwitch (e,cases,eopt) ->
-				17, [loop e;enc_array (List.map (fun (ecl,eg,e,p) ->
-					enc_obj OCase [
-						"values",enc_array (List.map loop ecl);
+				16, [loop e;encode_array (List.map (fun (ecl,eg,e,p) ->
+					encode_obj [
+						"values",encode_array (List.map loop ecl);
 						"guard",null loop eg;
 						"expr",null loop e;
 						"pos",encode_pos p;
 					]
 				) cases);null (fun (e,_) -> encode_null_expr e) eopt]
 			| ETry (e,catches) ->
-				18, [loop e;enc_array (List.map (fun (v,t,e,p) ->
-					enc_obj OCatch [
+				17, [loop e;encode_array (List.map (fun (v,t,e,p) ->
+					encode_obj [
 						"name",encode_placed_name v;
 						"name_pos",encode_pos (pos v);
 						"type",encode_ctype t;
@@ -518,42 +478,51 @@ and encode_expr e =
 					]
 				) catches)]
 			| EReturn eo ->
-				19, [null loop eo]
+				18, [null loop eo]
 			| EBreak ->
-				20, []
+				19, []
 			| EContinue ->
-				21, []
+				20, []
 			| EUntyped e ->
-				22, [loop e]
+				21, [loop e]
 			| EThrow e ->
-				23, [loop e]
+				22, [loop e]
 			| ECast (e,t) ->
-				24, [loop e; null encode_ctype t]
-			| EDisplay (e,flag) ->
-				25, [loop e; vbool flag]
+				23, [loop e; null encode_ctype t]
+			| EDisplay (e,dk) ->
+				24, [loop e; encode_display_kind dk]
 			| EDisplayNew t ->
-				26, [encode_path t]
+				25, [encode_path t]
 			| ETernary (econd,e1,e2) ->
-				27, [loop econd;loop e1;loop e2]
+				26, [loop econd;loop e1;loop e2]
 			| ECheckType (e,t) ->
-				28, [loop e; encode_ctype t]
+				27, [loop e; encode_ctype t]
 			| EMeta (m,e) ->
-				29, [encode_meta_entry m;loop e]
+				28, [encode_meta_entry m;loop e]
 		in
-		enc_obj OExpr [
+		encode_obj [
 			"pos", encode_pos p;
 			"expr", encode_enum IExpr tag pl;
 		]
 	in
-	loop e
+	encode_lazy (fun () -> loop e)
 
 and encode_null_expr e =
 	match e with
 	| None ->
-		enc_obj OExpr ["pos", vnull;"expr",vnull]
+		encode_obj ["pos", vnull;"expr",vnull]
 	| Some e ->
 		encode_expr e
 
+and encode_function_kind kind =
+	match kind with
+	| FKAnonymous ->
+		encode_enum IFunctionKind 0 []
+	| FKNamed (name,inline) ->
+		encode_enum IFunctionKind 1 [encode_placed_name name; vbool inline]
+	| FKArrow ->
+		encode_enum IFunctionKind 2 []
+
 (* ---------------------------------------------------------------------- *)
 (* EXPR DECODING *)
 
@@ -563,17 +532,23 @@ let opt f v =
 let opt_list f v =
 	if v = vnull then [] else f v
 
-let dec_opt_bool v =
-	if v = vnull then false else dec_bool v
+let decode_opt_bool v =
+	if v = vnull then false else decode_bool v
+
+let decode_string_literal_kind v =
+	if v = vnull then SDoubleQuotes else match decode_enum v with
+	| 0,[] -> SDoubleQuotes
+	| 1,[] -> SSingleQuotes
+	| _ -> raise Invalid_expr
 
 let decode_const c =
 	match decode_enum c with
-	| 0, [s] -> Int (dec_string s)
-	| 1, [s] -> Float (dec_string s)
-	| 2, [s] -> String (dec_string s)
-	| 3, [s] -> Ident (dec_string s)
-	| 4, [s;opt] -> Regexp (dec_string s, dec_string opt)
-	| 5, [s] -> Ident (dec_string s) (** deprecated CType, keep until 3.0 release **)
+	| 0, [s] -> Int (decode_string s)
+	| 1, [s] -> Float (decode_string s)
+	| 2, [s;qs] -> String (decode_string s,decode_string_literal_kind qs)
+	| 3, [s] -> Ident (decode_string s)
+	| 4, [s;opt] -> Regexp (decode_string s, decode_string opt)
+	| 5, [s] -> Ident (decode_string s) (** deprecated CType, keep until 3.0 release **)
 	| _ -> raise Invalid_expr
 
 let rec decode_op op =
@@ -601,6 +576,7 @@ let rec decode_op op =
 	| 20, [op] -> OpAssignOp (decode_op op)
 	| 21, [] -> OpInterval
 	| 22,[] -> OpArrow
+	| 23,[] -> OpIn
 	| _ -> raise Invalid_expr
 
 let decode_unop op =
@@ -615,27 +591,30 @@ let decode_unop op =
 let decode_import_mode t =
 	match decode_enum t with
 	| 0, [] -> INormal
-	| 1, [alias] -> IAsName (dec_string alias)
+	| 1, [alias] -> IAsName (decode_string alias,Globals.null_pos) (* TODO: is it okay to lose the pos here? *)
 	| 2, [] -> IAll
 	| _ -> raise Invalid_expr
 
-let decode_import t = (List.map (fun o -> ((dec_string (field o "name")), (decode_pos (field o "pos")))) (dec_array (field t "path")), decode_import_mode (field t "mode"))
+let decode_import t = (List.map (fun o -> ((decode_string (field o "name")), (decode_pos (field o "pos")))) (decode_array (field t "path")), decode_import_mode (field t "mode"))
 
 let maybe_decode_pos p = try decode_pos p with Invalid_expr -> Globals.null_pos
 
+let decode_pos_default p pd = try decode_pos p with Invalid_expr -> pd
+
 let decode_placed_name vp v =
-	dec_string v,maybe_decode_pos vp
+	decode_string v,maybe_decode_pos vp
 
-let dec_opt_array f v =
-	if v = vnull then [] else List.map f (dec_array v)
+let decode_opt_array f v =
+	if v = vnull then [] else List.map f (decode_array v)
 
 let rec decode_path t =
+	let p = field t "pos" in
 	{
-		tpackage = List.map dec_string (dec_array (field t "pack"));
-		tname = dec_string (field t "name");
-		tparams = dec_opt_array decode_tparam (field t "params");
-		tsub = opt dec_string (field t "sub");
-	},Globals.null_pos
+		tpackage = List.map decode_string (decode_array (field t "pack"));
+		tname = decode_string (field t "name");
+		tparams = decode_opt_array decode_tparam (field t "params");
+		tsub = opt decode_string (field t "sub");
+	},if p = vnull then Globals.null_pos else decode_pos p
 
 and decode_tparam v =
 	match decode_enum v with
@@ -644,12 +623,17 @@ and decode_tparam v =
 	| _ -> raise Invalid_expr
 
 and decode_tparams v =
-	dec_opt_array decode_tparam_decl v
+	decode_opt_array decode_tparam_decl v
 
 and decode_tparam_decl v =
+	let vconstraints = field v "constraints" in
 	{
 		tp_name = decode_placed_name (field v "name_pos") (field v "name");
-		tp_constraints = dec_opt_array decode_ctype (field v "constraints");
+		tp_constraints = if vconstraints = vnull then None else (match decode_array vconstraints with
+			| [] -> None
+			| [t] -> Some (decode_ctype t)
+			| tl -> Some (CTIntersection (List.map decode_ctype tl),Globals.null_pos)
+		);
 		tp_params = decode_tparams (field v "params");
 		tp_meta = decode_meta_content (field v "meta");
 	}
@@ -659,30 +643,35 @@ and decode_fun v =
 		f_params = decode_tparams (field v "params");
 		f_args = List.map (fun o ->
 			decode_placed_name (field o "name_pos") (field o "name"),
-			dec_opt_bool (field o "opt"),
+			decode_opt_bool (field o "opt"),
 			decode_meta_content (field o "meta"),
 			opt decode_ctype (field o "type"),
 			opt decode_expr (field o "value")
-		) (dec_array (field v "args"));
+		) (decode_array (field v "args"));
 		f_type = opt decode_ctype (field v "ret");
 		f_expr = opt decode_expr (field v "expr");
 	}
 
 and decode_access v =
-	match decode_enum v with
-	| 0, [] -> APublic
-	| 1, [] -> APrivate
-	| 2, [] -> AStatic
-	| 3, [] -> AOverride
-	| 4, [] -> ADynamic
-	| 5, [] -> AInline
-	| 6, [] -> AMacro
+	let (i,_),p = decode_enum_with_pos v in
+	let a = match i with
+	| 0 -> APublic
+	| 1 -> APrivate
+	| 2 -> AStatic
+	| 3 -> AOverride
+	| 4 -> ADynamic
+	| 5 -> AInline
+	| 6 -> AMacro
+	| 7 -> AFinal
+	| 8 -> AExtern
 	| _ -> raise Invalid_expr
+	in
+	a,p
 
 and decode_meta_entry v =
-	Meta.from_string (dec_string (field v "name")), dec_opt_array decode_expr (field v "params"), decode_pos (field v "pos")
+	Meta.from_string (decode_string (field v "name")), decode_opt_array decode_expr (field v "params"), decode_pos (field v "pos")
 
-and decode_meta_content m = dec_opt_array decode_meta_entry m
+and decode_meta_content m = decode_opt_array decode_meta_entry m
 
 and decode_field v =
 	let fkind = match decode_enum (field v "kind") with
@@ -695,12 +684,13 @@ and decode_field v =
 		| _ ->
 			raise Invalid_expr
 	in
+	let pos = decode_pos (field v "pos") in
 	{
-		cff_name = decode_placed_name (field v "name_pos") (field v "name");
-		cff_doc = opt dec_string (field v "doc");
-		cff_pos = decode_pos (field v "pos");
+		cff_name = (decode_string (field v "name"),decode_pos_default (field v "name_pos") pos);
+		cff_doc = opt decode_string (field v "doc");
+		cff_pos = pos;
 		cff_kind = fkind;
-		cff_access = List.map decode_access (opt_list dec_array (field v "access"));
+		cff_access = List.map decode_access (opt_list decode_array (field v "access"));
 		cff_meta = opt_list decode_meta_content (field v "meta");
 	}
 
@@ -710,18 +700,36 @@ and decode_ctype t =
 	| 0, [p] ->
 		CTPath (fst (decode_path p))
 	| 1, [a;r] ->
-		CTFunction (List.map decode_ctype (dec_array a), decode_ctype r)
+		CTFunction (List.map decode_ctype (decode_array a), decode_ctype r)
 	| 2, [fl] ->
-		CTAnonymous (List.map decode_field (dec_array fl))
+		CTAnonymous (List.map decode_field (decode_array fl))
 	| 3, [t] ->
 		CTParent (decode_ctype t)
 	| 4, [tl;fl] ->
-		CTExtend (List.map decode_path (dec_array tl), List.map decode_field (dec_array fl))
+		CTExtend (List.map decode_path (decode_array tl), List.map decode_field (decode_array fl))
 	| 5, [t] ->
 		CTOptional (decode_ctype t)
+	| 6, [n;t] ->
+		CTNamed ((decode_string n,p), decode_ctype t)
+	| 7, [tl] ->
+		CTIntersection (List.map decode_ctype (decode_array tl))
 	| _ ->
 		raise Invalid_expr),p
 
+and decode_display_kind v = match (decode_enum v) with
+	| 0, [] -> DKCall
+	| 1, [] -> DKDot
+	| 2, [] -> DKStructure
+	| 3, [] -> DKMarked
+	| 4, [outermost] -> DKPattern (decode_bool outermost)
+	| _ -> raise Invalid_expr
+
+and decode_function_kind kind = if kind = vnull then FKAnonymous else match decode_enum kind with
+	| 0, [] -> FKAnonymous
+	| 1, [name;inline] -> FKNamed ((decode_string name,Globals.null_pos), decode_opt_bool inline)
+	| 2, [] -> FKArrow
+	| _ -> raise Invalid_expr
+
 and decode_expr v =
 	let rec loop v =
 		let p = decode_pos (field v "pos") in
@@ -735,71 +743,79 @@ and decode_expr v =
 		| 2, [op;e1;e2] ->
 			EBinop (decode_op op, loop e1, loop e2)
 		| 3, [e;f] ->
-			EField (loop e, dec_string f)
+			EField (loop e, decode_string f)
 		| 4, [e] ->
 			EParenthesis (loop e)
 		| 5, [a] ->
 			EObjectDecl (List.map (fun o ->
-				(decode_placed_name (field o "name_pos") (field o "field")),loop (field o "expr")
-			) (dec_array a))
+				let name,p = decode_placed_name (field o "name_pos") (field o "field") in
+				let vquotes = field o "quotes" in
+				let quotes = if vquotes = vnull then NoQuotes
+				else match decode_enum vquotes with
+					| 0,[] -> NoQuotes
+					| 1,[] -> DoubleQuotes
+					| _ -> raise Invalid_expr
+				in
+				(name,p,quotes),loop (field o "expr")
+			) (decode_array a))
 		| 6, [a] ->
-			EArrayDecl (List.map loop (dec_array a))
+			EArrayDecl (List.map loop (decode_array a))
 		| 7, [e;el] ->
-			ECall (loop e,List.map loop (dec_array el))
+			ECall (loop e,List.map loop (decode_array el))
 		| 8, [t;el] ->
-			ENew (decode_path t,List.map loop (dec_array el))
+			ENew (decode_path t,List.map loop (decode_array el))
 		| 9, [op;f;e] ->
-			EUnop (decode_unop op,(if dec_bool f then Postfix else Prefix),loop e)
+			EUnop (decode_unop op,(if decode_bool f then Postfix else Prefix),loop e)
 		| 10, [vl] ->
 			EVars (List.map (fun v ->
-				((decode_placed_name (field v "name_pos") (field v "name")),opt decode_ctype (field v "type"),opt loop (field v "expr"))
-			) (dec_array vl))
-		| 11, [fname;f] ->
-			EFunction (opt dec_string fname,decode_fun f)
+				let vfinal = field v "isFinal" in
+				let final = if vfinal == vnull then false else decode_bool vfinal in
+				((decode_placed_name (field v "name_pos") (field v "name")),final,opt decode_ctype (field v "type"),opt loop (field v "expr"))
+			) (decode_array vl))
+		| 11, [kind;f] ->
+			EFunction (decode_function_kind kind,decode_fun f)
 		| 12, [el] ->
-			EBlock (List.map loop (dec_array el))
+			EBlock (List.map loop (decode_array el))
 		| 13, [e1;e2] ->
 			EFor (loop e1, loop e2)
-		| 14, [e1;e2] ->
-			EIn (loop e1, loop e2)
-		| 15, [e1;e2;e3] ->
+		| 14, [e1;e2;e3] ->
 			EIf (loop e1, loop e2, opt loop e3)
-		| 16, [e1;e2;flag] ->
-			EWhile (loop e1,loop e2,if dec_bool flag then NormalWhile else DoWhile)
-		| 17, [e;cases;eo] ->
+		| 15, [e1;e2;flag] ->
+			EWhile (loop e1,loop e2,if decode_bool flag then NormalWhile else DoWhile)
+		| 16, [e;cases;eo] ->
 			let cases = List.map (fun c ->
-				(List.map loop (dec_array (field c "values")),opt loop (field c "guard"),opt loop (field c "expr"),maybe_decode_pos (field c "pos"))
-			) (dec_array cases) in
+				(List.map loop (decode_array (field c "values")),opt loop (field c "guard"),opt loop (field c "expr"),maybe_decode_pos (field c "pos"))
+			) (decode_array cases) in
 			ESwitch (loop e,cases,opt (fun v -> (if field v "expr" = vnull then None else Some (decode_expr v)),Globals.null_pos) eo)
-		| 18, [e;catches] ->
+		| 17, [e;catches] ->
 			let catches = List.map (fun c ->
 				((decode_placed_name (field c "name_pos") (field c "name")),(decode_ctype (field c "type")),loop (field c "expr"),maybe_decode_pos (field c "pos"))
-			) (dec_array catches) in
+			) (decode_array catches) in
 			ETry (loop e, catches)
-		| 19, [e] ->
+		| 18, [e] ->
 			EReturn (opt loop e)
-		| 20, [] ->
+		| 19, [] ->
 			EBreak
-		| 21, [] ->
+		| 20, [] ->
 			EContinue
-		| 22, [e] ->
+		| 21, [e] ->
 			EUntyped (loop e)
-		| 23, [e] ->
+		| 22, [e] ->
 			EThrow (loop e)
-		| 24, [e;t] ->
+		| 23, [e;t] ->
 			ECast (loop e,opt decode_ctype t)
-		| 25, [e;f] ->
-			EDisplay (loop e,dec_bool f)
-		| 26, [t] ->
+		| 24, [e;dk] ->
+			EDisplay (loop e,decode_display_kind dk)
+		| 25, [t] ->
 			EDisplayNew (decode_path t)
-		| 27, [e1;e2;e3] ->
+		| 26, [e1;e2;e3] ->
 			ETernary (loop e1,loop e2,loop e3)
-		| 28, [e;t] ->
+		| 27, [e;t] ->
 			ECheckType (loop e, (decode_ctype t))
-		| 29, [m;e] ->
+		| 28, [m;e] ->
 			EMeta (decode_meta_entry m,loop e)
-		| 30, [e;f] ->
-			EField (loop e, dec_string f) (*** deprecated EType, keep until haxe 3 **)
+		| 29, [e;f] ->
+			EField (loop e, decode_string f) (*** deprecated EType, keep until haxe 3 **)
 		| _ ->
 			raise Invalid_expr
 	in
@@ -814,10 +830,10 @@ and decode_expr v =
 let encode_pmap_array convert m =
 	let l = ref [] in
 	PMap.iter (fun _ v -> l := !l @ [(convert v)]) m;
-	enc_array !l
+	encode_array !l
 
-let encode_array convert l =
-	enc_array (List.map convert l)
+let encode_and_map_array convert l =
+	encode_array (List.map convert l)
 
 let vopt f v = match v with
 	| None -> vnull
@@ -825,97 +841,103 @@ let vopt f v = match v with
 
 let encode_meta m set =
 	let meta = ref m in
-	enc_obj OMetaAccess [
+	encode_obj [
 		"get", vfun0 (fun() ->
 			encode_meta_content (!meta)
 		);
 		"add", vfun3 (fun k vl p ->
 			(try
-				let el = List.map decode_expr (dec_array vl) in
-				meta := (Meta.from_string (dec_string k), el, decode_pos p) :: !meta;
+				let el = List.map decode_expr (decode_array vl) in
+				meta := (Meta.from_string (decode_string k), el, decode_pos p) :: !meta;
 				set (!meta)
 			with Invalid_expr ->
 				failwith "Invalid expression");
 			vnull
 		);
 		"extract", vfun1 (fun k ->
-			let k = Meta.from_string (dec_string k) in
-			encode_array encode_meta_entry (List.filter (fun (m,_,_) -> m = k) (!meta))
+			let k = Meta.from_string (decode_string k) in
+			encode_and_map_array encode_meta_entry (List.filter (fun (m,_,_) -> m = k) (!meta))
 		);
 		"remove", vfun1 (fun k ->
-			let k = Meta.from_string (dec_string k) in
+			let k = Meta.from_string (decode_string k) in
 			meta := List.filter (fun (m,_,_) -> m <> k) (!meta);
 			set (!meta);
 			vnull
 		);
 		"has", vfun1 (fun k ->
-			let k = Meta.from_string (dec_string k) in
+			let k = Meta.from_string (decode_string k) in
 			vbool (List.exists (fun (m,_,_) -> m = k) (!meta));
 		);
 	]
 
-let rec encode_mtype ot t fields =
+let rec encode_mtype t fields =
 	let i = t_infos t in
-	enc_obj ot ([
+	encode_obj ([
 		"__t", 	encode_tdecl t;
-		"pack", enc_array (List.map enc_string (fst i.mt_path));
-		"name", enc_string (snd i.mt_path);
+		"pack", encode_array (List.map encode_string (fst i.mt_path));
+		"name", encode_string (snd i.mt_path);
 		"pos", encode_pos i.mt_pos;
-		"module", enc_string (s_type_path i.mt_module.m_path);
+		"module", encode_string (s_type_path i.mt_module.m_path);
 		"isPrivate", vbool i.mt_private;
 		"meta", encode_meta i.mt_meta (fun m -> i.mt_meta <- m);
-		"doc", null enc_string i.mt_doc;
+		"doc", null encode_string i.mt_doc;
 		"params", encode_type_params i.mt_params;
 	] @ fields)
 
 and encode_type_params tl =
-	enc_array (List.map (fun (n,t) -> enc_obj OTypeParameter ["name",enc_string n;"t",encode_type t]) tl)
+	encode_array (List.map (fun (n,t) -> encode_obj ["name",encode_string n;"t",encode_type t]) tl)
 
 and encode_tenum e =
-	encode_mtype OEnumType (TEnumDecl e) [
+	encode_mtype (TEnumDecl e) [
 		"isExtern", vbool e.e_extern;
 		"exclude", vfun0 (fun() -> e.e_extern <- true; vnull);
 		"constructs", encode_string_map encode_efield e.e_constrs;
-		"names", enc_array (List.map enc_string e.e_names);
+		"names", encode_array (List.map encode_string e.e_names);
 	]
 
 and encode_tabstract a =
-	encode_mtype OAbstractType (TAbstractDecl a) [
+	encode_mtype (TAbstractDecl a) [
 		"type", encode_type a.a_this;
 		"impl", (match a.a_impl with None -> vnull | Some c -> encode_clref c);
-		"binops", enc_array (List.map (fun (op,cf) -> enc_obj OAbstractType_binops [ "op",encode_binop op; "field",encode_cfield cf]) a.a_ops);
-		"unops", enc_array (List.map (fun (op,postfix,cf) -> enc_obj OAbstractType_unops [ "op",encode_unop op; "isPostfix",vbool (match postfix with Postfix -> true | Prefix -> false); "field",encode_cfield cf]) a.a_unops);
-		"from", enc_array ((List.map (fun t -> enc_obj OAbstractType_from [ "t",encode_type t; "field",vnull]) a.a_from) @ (List.map (fun (t,cf) -> enc_obj OAbstractType_from [ "t",encode_type t; "field",encode_cfield cf]) a.a_from_field));
-		"to", enc_array ((List.map (fun t -> enc_obj OAbstractType_to [ "t",encode_type t; "field",vnull]) a.a_to) @ (List.map (fun (t,cf) -> enc_obj OAbstractType_to [ "t",encode_type t; "field",encode_cfield cf]) a.a_to_field));
-		"array", enc_array (List.map encode_cfield a.a_array);
-		"resolve", (match a.a_resolve with None -> vnull | Some cf -> encode_cfref cf)
+		"binops", encode_array (List.map (fun (op,cf) -> encode_obj [ "op",encode_binop op; "field",encode_cfield cf]) a.a_ops);
+		"unops", encode_array (List.map (fun (op,postfix,cf) -> encode_obj [ "op",encode_unop op; "isPostfix",vbool (match postfix with Postfix -> true | Prefix -> false); "field",encode_cfield cf]) a.a_unops);
+		"from", encode_array ((List.map (fun t -> encode_obj [ "t",encode_type t; "field",vnull]) a.a_from) @ (List.map (fun (t,cf) -> encode_obj [ "t",encode_type t; "field",encode_cfield cf]) a.a_from_field));
+		"to", encode_array ((List.map (fun t -> encode_obj [ "t",encode_type t; "field",vnull]) a.a_to) @ (List.map (fun (t,cf) -> encode_obj [ "t",encode_type t; "field",encode_cfield cf]) a.a_to_field));
+		"array", encode_array (List.map encode_cfield a.a_array);
+		"resolve", (match a.a_read with None -> vnull | Some cf -> encode_cfref cf);
+		"resolveWrite", (match a.a_write with None -> vnull | Some cf -> encode_cfref cf)
 	]
 
 and encode_efield f =
-	enc_obj OEnumField [
-		"name", enc_string f.ef_name;
+	encode_obj [
+		"name", encode_string f.ef_name;
 		"type", encode_type f.ef_type;
 		"pos", encode_pos f.ef_pos;
 		"namePos", encode_pos f.ef_name_pos;
 		"index", vint f.ef_index;
 		"meta", encode_meta f.ef_meta (fun m -> f.ef_meta <- m);
-		"doc", null enc_string f.ef_doc;
+		"doc", null encode_string f.ef_doc;
 		"params", encode_type_params f.ef_params;
 	]
 
 and encode_cfield f =
-	enc_obj OClassField [
-		"name", enc_string f.cf_name;
-		"type", (match f.cf_kind with Method _ -> encode_lazy_type f.cf_type | _ -> encode_type f.cf_type);
-		"isPublic", vbool f.cf_public;
+	encode_obj [
+		"name", encode_string f.cf_name;
+		"type", encode_lazy_type f.cf_type;
+		"isPublic", vbool (has_class_field_flag f CfPublic);
 		"params", encode_type_params f.cf_params;
 		"meta", encode_meta f.cf_meta (fun m -> f.cf_meta <- m);
-		"expr", vfun0 (fun() -> ignore(follow f.cf_type); (match f.cf_expr with None -> vnull | Some e -> encode_texpr e));
+		"expr", vfun0 (fun() ->
+			ignore (flush_core_context (fun() -> follow f.cf_type));
+			(match f.cf_expr with None -> vnull | Some e -> encode_texpr e)
+		);
 		"kind", encode_field_kind f.cf_kind;
 		"pos", encode_pos f.cf_pos;
 		"namePos",encode_pos f.cf_name_pos;
-		"doc", null enc_string f.cf_doc;
-		"overloads", encode_ref f.cf_overloads (encode_array encode_cfield) (fun() -> "overloads");
+		"doc", null encode_string f.cf_doc;
+		"overloads", encode_ref f.cf_overloads (encode_and_map_array encode_cfield) (fun() -> "overloads");
+		"isExtern", vbool (has_class_field_flag f CfExtern);
+		"isFinal", vbool (has_class_field_flag f CfFinal);
 	]
 
 and encode_field_kind k =
@@ -933,7 +955,8 @@ and encode_var_access a =
 		| AccResolve -> 3, []
 		| AccCall -> 4, []
 		| AccInline	-> 5, []
-		| AccRequire (s,msg) -> 6, [enc_string s; null enc_string msg]
+		| AccRequire (s,msg) -> 6, [encode_string s; null encode_string msg]
+		| AccCtor -> 7, []
 	) in
 	encode_enum IVarAccess tag pl
 
@@ -962,32 +985,33 @@ and encode_class_kind k =
 
 and encode_tclass c =
 	ignore(c.cl_build());
-	encode_mtype OClassType (TClassDecl c) [
+	encode_mtype (TClassDecl c) [
 		"kind", encode_class_kind c.cl_kind;
 		"isExtern", vbool c.cl_extern;
 		"exclude", vfun0 (fun() -> c.cl_extern <- true; c.cl_init <- None; vnull);
 		"isInterface", vbool c.cl_interface;
+		"isFinal", vbool c.cl_final;
 		"superClass", (match c.cl_super with
 			| None -> vnull
-			| Some (c,pl) -> enc_obj OClassType_superClass ["t",encode_clref c;"params",encode_tparams pl]
+			| Some (c,pl) -> encode_obj ["t",encode_clref c;"params",encode_tparams pl]
 		);
-		"interfaces", enc_array (List.map (fun (c,pl) -> enc_obj OClassType_interfaces ["t",encode_clref c;"params",encode_tparams pl]) c.cl_implements);
-		"fields", encode_ref c.cl_ordered_fields (encode_array encode_cfield) (fun() -> "class fields");
-		"statics", encode_ref c.cl_ordered_statics (encode_array encode_cfield) (fun() -> "class fields");
+		"interfaces", encode_array (List.map (fun (c,pl) -> encode_obj ["t",encode_clref c;"params",encode_tparams pl]) c.cl_implements);
+		"fields", encode_ref c.cl_ordered_fields (encode_and_map_array encode_cfield) (fun() -> "class fields");
+		"statics", encode_ref c.cl_ordered_statics (encode_and_map_array encode_cfield) (fun() -> "class fields");
 		"constructor", (match c.cl_constructor with None -> vnull | Some cf -> encode_cfref cf);
 		"init", (match c.cl_init with None -> vnull | Some e -> encode_texpr e);
-		"overrides", (enc_array (List.map encode_cfref c.cl_overrides))
+		"overrides", (encode_array (List.map encode_cfref c.cl_overrides))
 	]
 
 and encode_ttype t =
-	encode_mtype ODefType (TTypeDecl t) [
+	encode_mtype (TTypeDecl t) [
 		"isExtern", vbool false;
 		"exclude", vfun0 (fun() -> vnull);
 		"type", encode_type t.t_type;
 	]
 
 and encode_tanon a =
-	enc_obj OAnonType [
+	encode_obj [
 		"fields", encode_pmap_array encode_cfield a.a_fields;
 		"status", encode_anon_status !(a.a_status);
 	]
@@ -997,7 +1021,7 @@ and encode_anon_status s =
 		| Closed -> 0, []
 		| Opened -> 1, []
 		| Type.Const -> 2, []
-		| Extend tl -> 3, [encode_ref tl (fun tl -> enc_array (List.map encode_type tl)) (fun() -> "<extended types>")]
+		| Extend tl -> 3, [encode_ref tl (fun tl -> encode_array (List.map encode_type tl)) (fun() -> "<extended types>")]
 		| Statics cl -> 4, [encode_clref cl]
 		| EnumStatics en -> 5, [encode_enref en]
 		| AbstractStatics ab -> 6, [encode_abref ab]
@@ -1006,7 +1030,7 @@ and encode_anon_status s =
 	encode_enum IAnonStatus tag pl
 
 and encode_tparams pl =
-	enc_array (List.map encode_type pl)
+	encode_array (List.map encode_type pl)
 
 and encode_clref c =
 	encode_ref c encode_tclass (fun() -> s_type_path c.cl_path)
@@ -1034,13 +1058,13 @@ and encode_type t =
 			3 , [encode_ref t encode_ttype (fun() -> s_type_path t.t_path); encode_tparams pl]
 		| TFun (pl,ret) ->
 			let pl = List.map (fun (n,o,t) ->
-				enc_obj OType_args [
-					"name",enc_string n;
+				encode_obj [
+					"name",encode_string n;
 					"opt",vbool o;
 					"t",encode_type t
 				]
 			) pl in
-			4 , [enc_array pl; encode_type ret]
+			4 , [encode_array pl; encode_type ret]
 		| TAnon a ->
 			5, [encode_ref a encode_tanon (fun() -> "<anonymous>")]
 		| TDynamic tsub as t ->
@@ -1049,7 +1073,7 @@ and encode_type t =
 			else
 				6, [encode_type tsub]
 		| TLazy f ->
-			loop (!f())
+			loop (lazy_type f)
 		| TAbstract (a, pl) ->
 			8, [encode_abref a; encode_tparams pl]
 	in
@@ -1063,7 +1087,21 @@ and encode_lazy_type t =
 			| Some t -> loop t
 			| _ -> encode_type t)
 		| TLazy f ->
-			encode_enum IType 7 [encode_lazytype f (fun() -> encode_type (!f()))]
+			(match !f with
+			| LAvailable t ->
+				encode_type t
+			| _ ->
+				encode_enum IType 7 [encode_lazytype f (fun() ->
+					(match !f with
+					| LAvailable t ->
+						encode_type t
+					| LWait _ ->
+						(* we are doing some typing here, let's flush our context if it's not already *)
+						encode_type (flush_core_context (fun() -> lazy_type f))
+					| LProcessing _ ->
+						(* our type in on the processing stack, error instead of returning most likely an unbound mono *)
+						error_message "Accessing a type while it's being typed");
+				)])
 		| _ ->
 			encode_type t
 	in
@@ -1072,14 +1110,14 @@ and encode_lazy_type t =
 and decode_type t =
 	match decode_enum t with
 	| 0, [r] -> TMono (decode_ref r)
-	| 1, [e; pl] -> TEnum (decode_ref e, List.map decode_type (dec_array pl))
-	| 2, [c; pl] -> TInst (decode_ref c, List.map decode_type (dec_array pl))
-	| 3, [t; pl] -> TType (decode_ref t, List.map decode_type (dec_array pl))
-	| 4, [pl; r] -> TFun (List.map (fun p -> dec_string (field p "name"), dec_bool (field p "opt"), decode_type (field p "t")) (dec_array pl), decode_type r)
+	| 1, [e; pl] -> TEnum (decode_ref e, List.map decode_type (decode_array pl))
+	| 2, [c; pl] -> TInst (decode_ref c, List.map decode_type (decode_array pl))
+	| 3, [t; pl] -> TType (decode_ref t, List.map decode_type (decode_array pl))
+	| 4, [pl; r] -> TFun (List.map (fun p -> decode_string (field p "name"), decode_bool (field p "opt"), decode_type (field p "t")) (decode_array pl), decode_type r)
 	| 5, [a] -> TAnon (decode_ref a)
 	| 6, [t] -> if t = vnull then t_dynamic else TDynamic (decode_type t)
 	| 7, [f] -> TLazy (decode_lazytype f)
-	| 8, [a; pl] -> TAbstract (decode_ref a, List.map decode_type (dec_array pl))
+	| 8, [a; pl] -> TAbstract (decode_ref a, List.map decode_type (decode_array pl))
 	| _ -> raise Invalid_expr
 
 and decode_type_decl t =
@@ -1091,8 +1129,8 @@ and decode_type_decl t =
 and encode_tconst c =
 	let tag, pl = match c with
 		| TInt i -> 0,[vint32 i]
-		| TFloat f -> 1,[enc_string f]
-		| TString s -> 2,[enc_string s]
+		| TFloat f -> 1,[encode_string f]
+		| TString s -> 2,[encode_string s]
 		| TBool b -> 3,[vbool b]
 		| TNull -> 4,[]
 		| TThis -> 5,[]
@@ -1102,14 +1140,14 @@ and encode_tconst c =
 
 and encode_tvar v =
 	let f_extra (pl,e) =
-		enc_obj OTVar_extra [
+		encode_obj [
 			"params",encode_type_params pl;
 			"expr",vopt encode_texpr e
 		]
 	in
-	enc_obj OTVar [
+	encode_obj [
 		"id", vint v.v_id;
-		"name", enc_string v.v_name;
+		"name", encode_string v.v_name;
 		"t", encode_type v.v_type;
 		"capture", vbool v.v_capture;
 		"extra", vopt f_extra v.v_extra;
@@ -1127,11 +1165,11 @@ and encode_module_type mt =
 	encode_enum IModuleType tag pl
 
 and encode_tfunc func =
-	enc_obj OTFunc [
-		"args",enc_array (List.map (fun (v,c) ->
-			enc_obj OTFunc_args [
+	encode_obj [
+		"args",encode_array (List.map (fun (v,c) ->
+			encode_obj [
 				"v",encode_tvar v;
-				"value",match c with None -> vnull | Some c -> encode_tconst c
+				"value",match c with None -> vnull | Some c -> encode_texpr c
 			]
 		) func.tf_args);
 		"t",encode_type func.tf_type;
@@ -1140,7 +1178,7 @@ and encode_tfunc func =
 
 and encode_field_access fa =
 	let encode_instance c tl =
-		enc_obj OFieldAccess_c [
+		encode_obj [
 			"c",encode_clref c;
 			"params",encode_tparams tl
 		]
@@ -1149,7 +1187,7 @@ and encode_field_access fa =
 		| FInstance(c,tl,cf) -> 0,[encode_clref c;encode_tparams tl;encode_cfref cf]
 		| FStatic(c,cf) -> 1,[encode_clref c;encode_cfref cf]
 		| FAnon(cf) -> 2,[encode_cfref cf]
-		| FDynamic(s) -> 3,[enc_string s]
+		| FDynamic(s) -> 3,[encode_string s]
 		| FClosure(co,cf) -> 4,[(match co with Some (c,tl) -> encode_instance c tl | None -> vnull);encode_cfref cf]
 		| FEnum(en,ef) -> 5,[encode_enref en;encode_efield ef]
 	in
@@ -1165,9 +1203,9 @@ and encode_texpr e =
 			| TField(e1,fa) -> 4,[loop e1;encode_field_access fa]
 			| TTypeExpr mt -> 5,[encode_module_type mt]
 			| TParenthesis e1 -> 6,[loop e1]
-			| TObjectDecl fl -> 7, [enc_array (List.map (fun (f,e) ->
-				enc_obj OTypedExprDef_fields [
-					"name",enc_string f;
+			| TObjectDecl fl -> 7, [encode_array (List.map (fun ((f,_,_),e) ->
+				encode_obj [
+					"name",encode_string f;
 					"expr",loop e;
 				]) fl)]
 			| TArrayDecl el -> 8,[encode_texpr_list el]
@@ -1182,13 +1220,13 @@ and encode_texpr e =
 			| TWhile(econd,e1,flag) -> 17,[loop econd;loop e1;vbool (flag = NormalWhile)]
 			| TSwitch(e1,cases,edef) -> 18,[
 				loop e1;
-				enc_array (List.map (fun (el,e) -> enc_obj OTypedExprDef_cases ["values",encode_texpr_list el;"expr",loop e]) cases);
+				encode_array (List.map (fun (el,e) -> encode_obj ["values",encode_texpr_list el;"expr",loop e]) cases);
 				vopt encode_texpr edef
 				]
 			| TTry(e1,catches) -> 19,[
 				loop e1;
-				enc_array (List.map (fun (v,e) ->
-					enc_obj OTypedExprDef_catches [
+				encode_array (List.map (fun (v,e) ->
+					encode_obj [
 						"v",encode_tvar v;
 						"expr",loop e
 					]) catches
@@ -1200,8 +1238,10 @@ and encode_texpr e =
 			| TCast(e1,mt) -> 24,[loop e1;match mt with None -> vnull | Some mt -> encode_module_type mt]
 			| TMeta(m,e1) -> 25,[encode_meta_entry m;loop e1]
 			| TEnumParameter(e1,ef,i) -> 26,[loop e1;encode_efield ef;vint i]
+			| TEnumIndex e1 -> 27,[loop e1]
+			| TIdent s -> 28,[encode_string s]
 		in
-		enc_obj OTypedExprDef [
+		encode_obj [
 			"pos", encode_pos e.epos;
 			"expr", encode_enum ITypedExpr tag pl;
 			"t", encode_type e.etype
@@ -1210,24 +1250,24 @@ and encode_texpr e =
 	loop e
 
 and encode_texpr_list el =
-	enc_array (List.map encode_texpr el)
+	encode_array (List.map encode_texpr el)
 
 (* ---------------------------------------------------------------------- *)
 (* TEXPR Decoding *)
 
 let decode_tconst c =
 	match decode_enum c with
-	| 0, [s] -> TInt (dec_i32 s)
-	| 1, [s] -> TFloat (dec_string s)
-	| 2, [s] -> TString (dec_string s)
-	| 3, [s] -> TBool (dec_bool s)
+	| 0, [s] -> TInt (decode_i32 s)
+	| 1, [s] -> TFloat (decode_string s)
+	| 2, [s] -> TString (decode_string s)
+	| 3, [s] -> TBool (decode_bool s)
 	| 4, [] -> TNull
 	| 5, [] -> TThis
 	| 6, [] -> TSuper
 	| _ -> raise Invalid_expr
 
 let decode_type_params v =
-	List.map (fun v -> dec_string (field v "name"),decode_type (field v "t")) (dec_array v)
+	List.map (fun v -> decode_string (field v "name"),decode_type (field v "t")) (decode_array v)
 
 let decode_tvar v =
 	(Obj.obj (decode_unsafe (field v "$")) : tvar)
@@ -1240,7 +1280,8 @@ let decode_var_access v =
 	| 3, [] -> AccResolve
 	| 4, [] -> AccCall
 	| 5, [] -> AccInline
-	| 6, [s1;s2] -> AccRequire(dec_string s1, opt dec_string s2)
+	| 6, [s1;s2] -> AccRequire(decode_string s1, opt decode_string s2)
+	| 7, [] -> AccCtor
 	| _ -> raise Invalid_expr
 
 let decode_method_kind v =
@@ -1258,30 +1299,37 @@ let decode_field_kind v =
 	| _ -> raise Invalid_expr
 
 let decode_cfield v =
-	{
-		cf_name = dec_string (field v "name");
+	let public = decode_bool (field v "isPublic") in
+	let extern = decode_bool (field v "isExtern") in
+	let final = decode_bool (field v "isFinal") in
+	let cf = {
+		cf_name = decode_string (field v "name");
 		cf_type = decode_type (field v "type");
-		cf_public = dec_bool (field v "isPublic");
 		cf_pos = decode_pos (field v "pos");
 		cf_name_pos = decode_pos (field v "namePos");
-		cf_doc = opt dec_string (field v "doc");
+		cf_doc = opt decode_string (field v "doc");
 		cf_meta = []; (* TODO *)
 		cf_kind = decode_field_kind (field v "kind");
 		cf_params = decode_type_params (field v "params");
 		cf_expr = None;
 		cf_expr_unoptimized = None;
 		cf_overloads = decode_ref (field v "overloads");
-	}
+		cf_flags = 0;
+	} in
+	if public then add_class_field_flag cf CfPublic;
+	if extern then add_class_field_flag cf CfExtern;
+	if final then add_class_field_flag cf CfFinal;
+	cf
 
 let decode_efield v =
 	{
-		ef_name = dec_string (field v "name");
+		ef_name = decode_string (field v "name");
 		ef_type = decode_type (field v "type");
 		ef_pos = decode_pos (field v "pos");
 		ef_name_pos = decode_pos (field v "namePos");
-		ef_index = dec_int (field v "index");
+		ef_index = decode_int (field v "index");
 		ef_meta = []; (* TODO *)
-		ef_doc = opt dec_string (field v "doc");
+		ef_doc = opt decode_string (field v "doc");
 		ef_params = decode_type_params (field v "params")
 	}
 
@@ -1289,12 +1337,12 @@ let decode_field_access v =
 	match decode_enum v with
 	| 0, [c;tl;cf] ->
 		let c = decode_ref c in
-		FInstance(c,List.map decode_type (dec_array tl),decode_ref cf)
+		FInstance(c,List.map decode_type (decode_array tl),decode_ref cf)
 	| 1, [c;cf] -> FStatic(decode_ref c,decode_ref cf)
 	| 2, [cf] -> FAnon(decode_ref cf)
-	| 3, [s] -> FDynamic(dec_string s)
+	| 3, [s] -> FDynamic(decode_string s)
 	| 4, [co;cf] ->
-		let co = if co = vnull then None else Some (decode_ref (field co "c"),List.map decode_type (dec_array (field co "params"))) in
+		let co = if co = vnull then None else Some (decode_ref (field co "c"),List.map decode_type (decode_array (field co "params"))) in
 		FClosure(co,decode_ref cf)
 	| 5, [e;ef] -> FEnum(decode_ref e,decode_efield ef)
 	| _ -> raise Invalid_expr
@@ -1309,7 +1357,7 @@ let decode_module_type v =
 
 let rec decode_tfunc v =
 	{
-		tf_args = List.map (fun v -> decode_tvar (field v "v"),opt decode_tconst (field v "value")) (dec_array (field v "args"));
+		tf_args = List.map (fun v -> decode_tvar (field v "v"),opt decode_texpr (field v "value")) (decode_array (field v "args"));
 		tf_type = decode_type (field v "t");
 		tf_expr = decode_texpr (field v "expr")
 	}
@@ -1326,26 +1374,28 @@ and decode_texpr v =
 		| 4, [v1;fa] -> TField(loop v1,decode_field_access fa)
 		| 5, [mt] -> TTypeExpr(decode_module_type mt)
 		| 6, [v1] -> TParenthesis(loop v1)
-		| 7, [v] -> TObjectDecl(List.map (fun v -> dec_string (field v "name"),loop (field v "expr")) (dec_array v))
-		| 8, [vl] -> TArrayDecl(List.map loop (dec_array vl))
-		| 9, [v1;vl] -> TCall(loop v1,List.map loop (dec_array vl))
-		| 10, [c;tl;vl] -> TNew(decode_ref c,List.map decode_type (dec_array tl),List.map loop (dec_array vl))
-		| 11, [op;pf;v1] -> TUnop(decode_unop op,(if dec_bool pf then Postfix else Prefix),loop v1)
+		| 7, [v] -> TObjectDecl(List.map (fun v -> (decode_string (field v "name"),Globals.null_pos,NoQuotes),loop (field v "expr")) (decode_array v))
+		| 8, [vl] -> TArrayDecl(List.map loop (decode_array vl))
+		| 9, [v1;vl] -> TCall(loop v1,List.map loop (decode_array vl))
+		| 10, [c;tl;vl] -> TNew(decode_ref c,List.map decode_type (decode_array tl),List.map loop (decode_array vl))
+		| 11, [op;pf;v1] -> TUnop(decode_unop op,(if decode_bool pf then Postfix else Prefix),loop v1)
 		| 12, [f] -> TFunction(decode_tfunc f)
 		| 13, [v;eo] -> TVar(decode_tvar v,opt loop eo)
-		| 14, [vl] -> TBlock(List.map loop (dec_array vl))
+		| 14, [vl] -> TBlock(List.map loop (decode_array vl))
 		| 15, [v;v1;v2] -> TFor(decode_tvar v,loop v1,loop v2)
 		| 16, [vif;vthen;velse] -> TIf(loop vif,loop vthen,opt loop velse)
-		| 17, [vcond;v1;b] -> TWhile(loop vcond,loop v1,if dec_bool b then NormalWhile else DoWhile)
-		| 18, [v1;cl;vdef] -> TSwitch(loop v1,List.map (fun v -> List.map loop (dec_array (field v "values")),loop (field v "expr")) (dec_array cl),opt loop vdef)
-		| 19, [v1;cl] -> TTry(loop v1,List.map (fun v -> decode_tvar (field v "v"),loop (field v "expr")) (dec_array cl))
+		| 17, [vcond;v1;b] -> TWhile(loop vcond,loop v1,if decode_bool b then NormalWhile else DoWhile)
+		| 18, [v1;cl;vdef] -> TSwitch(loop v1,List.map (fun v -> List.map loop (decode_array (field v "values")),loop (field v "expr")) (decode_array cl),opt loop vdef)
+		| 19, [v1;cl] -> TTry(loop v1,List.map (fun v -> decode_tvar (field v "v"),loop (field v "expr")) (decode_array cl))
 		| 20, [vo] -> TReturn(opt loop vo)
 		| 21, [] -> TBreak
 		| 22, [] -> TContinue
 		| 23, [v1] -> TThrow(loop v1)
 		| 24, [v1;mto] -> TCast(loop v1,opt decode_module_type mto)
 		| 25, [m;v1] -> TMeta(decode_meta_entry m,loop v1)
-		| 26, [v1;ef;i] -> TEnumParameter(loop v1,decode_efield ef,dec_int i)
+		| 26, [v1;ef;i] -> TEnumParameter(loop v1,decode_efield ef,decode_int i)
+		| 27, [v1] -> TEnumIndex(loop v1)
+		| 28, [v1] -> TIdent(decode_string v1)
 		| i,el -> Printf.printf "%i %i\n" i (List.length el); raise Invalid_expr
 	in
 	try
@@ -1357,16 +1407,17 @@ and decode_texpr v =
 (* TYPE DEFINITION *)
 
 let decode_type_def v =
-	let pack = List.map dec_string (dec_array (field v "pack")) in
+	let pack = List.map decode_string (decode_array (field v "pack")) in
 	let name = decode_placed_name (field v "name_pos") (field v "name") in
 	let meta = decode_meta_content (field v "meta") in
 	let pos = decode_pos (field v "pos") in
-	let isExtern = dec_opt_bool (field v "isExtern") in
-	let fields = List.map decode_field (dec_array (field v "fields")) in
+	let isExtern = decode_opt_bool (field v "isExtern") in
+	let fields = List.map decode_field (decode_array (field v "fields")) in
+	let doc = opt decode_string (field v "doc") in
 	let mk fl dl =
 		{
 			d_name = name;
-			d_doc = None;
+			d_doc = doc;
 			d_params = decode_tparams (field v "params");
 			d_meta = meta;
 			d_flags = fl;
@@ -1399,10 +1450,11 @@ let decode_type_def v =
 		EEnum (mk (if isExtern then [EExtern] else []) (List.map conv fields))
 	| 1, [] ->
 		ETypedef (mk (if isExtern then [EExtern] else []) (CTAnonymous fields,Globals.null_pos))
-	| 2, [ext;impl;interf] ->
+	| 2, [ext;impl;interf;final] ->
 		let flags = if isExtern then [HExtern] else [] in
-		let is_interface = dec_opt_bool interf in
-		let interfaces = (match opt (fun v -> List.map decode_path (dec_array v)) impl with Some l -> l | _ -> [] ) in
+		let is_interface = decode_opt_bool interf in
+		let is_final = decode_opt_bool final in
+		let interfaces = (match opt (fun v -> List.map decode_path (decode_array v)) impl with Some l -> l | _ -> [] ) in
 		let flags = (match opt decode_path ext with None -> flags | Some t -> HExtends t :: flags) in
 		let flags = if is_interface then begin
 				let flags = HInterface :: flags in
@@ -1411,20 +1463,21 @@ let decode_type_def v =
 				List.map (fun t -> HImplements t) interfaces @ flags
 			end
 		in
+		let flags = if is_final then HFinal :: flags else flags in
 		EClass (mk flags fields)
 	| 3, [t] ->
 		ETypedef (mk (if isExtern then [EExtern] else []) (decode_ctype t))
 	| 4, [tthis;tfrom;tto] ->
-		let flags = match opt dec_array tfrom with None -> [] | Some ta -> List.map (fun t -> AFromType (decode_ctype t)) ta in
-		let flags = match opt dec_array tto with None -> flags | Some ta -> (List.map (fun t -> AToType (decode_ctype t)) ta) @ flags in
-		let flags = match opt decode_ctype tthis with None -> flags | Some t -> (AIsType t) :: flags in
+		let flags = match opt decode_array tfrom with None -> [] | Some ta -> List.map (fun t -> AbFrom (decode_ctype t)) ta in
+		let flags = match opt decode_array tto with None -> flags | Some ta -> (List.map (fun t -> AbTo (decode_ctype t)) ta) @ flags in
+		let flags = match opt decode_ctype tthis with None -> flags | Some t -> (AbOver t) :: flags in
 		EAbstract(mk flags fields)
 	| _ ->
 		raise Invalid_expr
 	) in
 	(* if our package ends with an uppercase letter, then it's the module name *)
 	let pack,name = (match List.rev pack with
-		| last :: l when not (is_lower_ident last) -> List.rev l, last
+		| last :: l when String.length last > 0 && StringHelper.starts_uppercase_identifier last -> List.rev l, last
 		| _ -> pack, fst name
 	) in
 	(pack, name), tdef, pos
@@ -1438,16 +1491,16 @@ let rec make_const e =
 		(match c with
 		| TInt i -> vint32 i
 		| TFloat s -> vfloat (float_of_string s)
-		| TString s -> enc_string s
+		| TString s -> encode_string s
 		| TBool b -> vbool b
 		| TNull -> vnull
 		| TThis | TSuper -> raise Exit)
 	| TParenthesis e | TMeta(_,e) | TCast(e,None) ->
 		make_const e
 	| TObjectDecl el ->
-		enc_obj O__Const (List.map (fun (f,e) -> f, make_const e) el)
+		encode_obj (List.map (fun ((f,_,_),e) -> f, make_const e) el)
 	| TArrayDecl al ->
-		enc_array (List.map make_const al)
+		encode_array (List.map make_const al)
 	| _ ->
 		raise Exit
 
@@ -1468,60 +1521,82 @@ let macro_api ccom get_api =
 			encode_pos (get_api()).pos
 		);
 		"error", vfun2 (fun msg p ->
-			let msg = dec_string msg in
+			let msg = decode_string msg in
 			let p = decode_pos p in
 			(ccom()).error msg p;
 			raise Abort
 		);
 		"fatal_error", vfun2 (fun msg p ->
-			let msg = dec_string msg in
+			let msg = decode_string msg in
 			let p = decode_pos p in
 			raise (Error.Fatal_error (msg,p))
 		);
 		"warning", vfun2 (fun msg p ->
-			let msg = dec_string msg in
+			let msg = decode_string msg in
 			let p = decode_pos p in
 			(ccom()).warning msg p;
 			vnull
 		);
+		"info", vfun2 (fun msg p ->
+			let msg = decode_string msg in
+			let p = decode_pos p in
+			(ccom()).info msg p;
+			vnull
+		);
+		"get_messages", vfun0 (fun() ->
+			encode_array (List.map (fun msg -> encode_message msg) ((ccom()).get_messages()));
+		);
+		"filter_messages", vfun1 (fun predicate ->
+			let predicate = prepare_callback predicate 2 in
+			(ccom()).filter_messages (fun msg -> (
+				decode_bool (predicate [encode_message msg])
+			));
+			vnull
+		);
 		"class_path", vfun0 (fun() ->
-			enc_array (List.map enc_string (ccom()).class_path);
+			encode_array (List.map encode_string (ccom()).class_path);
 		);
 		"resolve_path", vfun1 (fun file ->
-			let file = dec_string file in
-			enc_string (try Common.find_file (ccom()) file with Not_found -> failwith ("File not found '" ^ file ^ "'"))
+			let file = decode_string file in
+			encode_string (try Common.find_file (ccom()) file with Not_found -> failwith ("File not found '" ^ file ^ "'"))
 		);
 		"define", vfun2 (fun s v ->
-			let v = if v = vnull then "" else "=" ^ (dec_string v) in
-			Common.raw_define (ccom()) ((dec_string s) ^ v);
+			let s = decode_string s in
+			let com = ccom() in
+			if com.stage <> CInitMacrosStart then begin
+				let v = if v = vnull then "" else ", " ^ (decode_string v) in
+				com.warning ("Should be used in initialization macros only: haxe.macro.Compiler.define(" ^ s ^ v ^ ")") Globals.null_pos;
+			end;
+			let v = if v = vnull then "" else "=" ^ (decode_string v) in
+			Common.raw_define com (s ^ v);
 			vnull
 		);
 		"defined", vfun1 (fun s ->
-			vbool (Common.raw_defined (ccom()) (dec_string s))
+			vbool (Common.raw_defined (ccom()) (decode_string s))
 		);
 		"defined_value", vfun1 (fun s ->
-			try enc_string (Common.raw_defined_value (ccom()) (dec_string s)) with Not_found -> vnull
+			try encode_string (Common.raw_defined_value (ccom()) (decode_string s)) with Not_found -> vnull
 		);
 		"get_defines", vfun0 (fun() ->
-			encode_string_map enc_string (ccom()).defines
+			encode_string_map encode_string (ccom()).defines.Define.values
 		);
 		"get_type", vfun1 (fun s ->
-			let tname = dec_string s in
+			let tname = decode_string s in
 			match (get_api()).get_type tname with
 			| None -> failwith ("Type not found '" ^ tname ^ "'")
 			| Some t -> encode_type t
 		);
 		"get_module", vfun1 (fun s ->
-			enc_array (List.map encode_type ((get_api()).get_module (dec_string s)))
+			encode_array (List.map encode_type ((get_api()).get_module (decode_string s)))
 		);
 		"on_after_typing", vfun1 (fun f ->
 			let f = prepare_callback f 1 in
-			(get_api()).after_typing (fun tl -> ignore(f [enc_array (List.map encode_module_type tl)]));
+			(get_api()).after_typing (fun tl -> ignore(f [encode_array (List.map encode_module_type tl)]));
 			vnull
 		);
-		"on_generate", vfun1 (fun f ->
+		"on_generate", vfun2 (fun f b ->
 			let f = prepare_callback f 1 in
-			(get_api()).on_generate (fun tl -> ignore(f [enc_array (List.map encode_type tl)]));
+			(get_api()).on_generate (fun tl -> ignore(f [encode_array (List.map encode_type tl)])) (decode_bool b);
 			vnull
 		);
 		"on_after_generate", vfun1 (fun f ->
@@ -1531,19 +1606,19 @@ let macro_api ccom get_api =
 		);
 		"on_type_not_found", vfun1 (fun f ->
 			let f = prepare_callback f 1 in
-			(get_api()).on_type_not_found (fun path -> f [enc_string path]);
+			(get_api()).on_type_not_found (fun path -> f [encode_string path]);
 			vnull
 		);
 		"do_parse", vfun3 (fun s p b ->
-			let s = dec_string s in
+			let s = decode_string s in
 			if s = "" then raise Invalid_expr;
-			encode_expr ((get_api()).parse_string s (decode_pos p) (dec_bool b))
+			encode_expr ((get_api()).parse_string s (decode_pos p) (decode_bool b))
 		);
 		"make_expr", vfun2 (fun v p ->
 			encode_expr (value_to_expr v (decode_pos p))
 		);
 		"signature", vfun1 (fun v ->
-			enc_string (Digest.to_hex (value_signature v))
+			encode_string (Digest.to_hex (value_signature v))
 		);
 		"to_complex_type", vfun1 (fun v ->
 			try	encode_ctype (TExprToExpr.convert_type' (decode_type v))
@@ -1551,8 +1626,7 @@ let macro_api ccom get_api =
 		);
 		"unify", vfun2 (fun t1 t2 ->
 			let e1 = mk (TObjectDecl []) (decode_type t1) Globals.null_pos in
-			try ignore(((get_api()).cast_or_unify) (decode_type t2) e1 Globals.null_pos); vbool true
-			with Error.Error (Error.Unify _,_) -> vbool false
+			vbool (((get_api()).cast_or_unify) (decode_type t2) e1 Globals.null_pos)
 		);
 		"typeof", vfun1 (fun v ->
 			encode_type ((get_api()).type_expr (decode_expr v)).etype
@@ -1564,74 +1638,75 @@ let macro_api ccom get_api =
 			encode_type ((get_api()).resolve_type (fst (decode_ctype t)) (decode_pos p));
 		);
 		"s_type", vfun1 (fun v ->
-			enc_string (Type.s_type (print_context()) (decode_type v))
+			encode_string (Type.s_type (print_context()) (decode_type v))
 		);
 		"s_expr", vfun2 (fun v b ->
-			let f = if dec_opt_bool b then Type.s_expr_pretty false "" false else Type.s_expr_ast true "" in
-			enc_string (f (Type.s_type (print_context())) (decode_texpr v))
+			let f = if decode_opt_bool b then Type.s_expr_pretty false "" false else Type.s_expr_ast true "" in
+			encode_string (f (Type.s_type (print_context())) (decode_texpr v))
 		);
 		"is_fmt_string", vfun1 (fun p ->
 			vbool (Lexer.is_fmt_string (decode_pos p))
 		);
 		"format_string", vfun2 (fun s p ->
-			encode_expr ((get_api()).format_string (dec_string s) (decode_pos p))
+			encode_expr ((get_api()).format_string (decode_string s) (decode_pos p))
 		);
 		"allow_package", vfun1 (fun s ->
-			(get_api()).allow_package (dec_string s);
+			(get_api()).allow_package (decode_string s);
 			vnull
 		);
 		"type_patch", vfun4 (fun t f s v ->
-			(get_api()).type_patch (dec_string t) (dec_string f) (dec_bool s) (opt dec_string v);
+			(get_api()).type_patch (decode_string t) (decode_string f) (decode_bool s) (opt decode_string v);
 			vnull
 		);
 		"meta_patch", vfun4 (fun m t f s ->
-			(get_api()).meta_patch (dec_string m) (dec_string t) (opt dec_string f) (dec_bool s);
+			(get_api()).meta_patch (decode_string m) (decode_string t) (opt decode_string f) (decode_bool s) (get_api_call_pos ());
 			vnull
 		);
 		"add_global_metadata_impl", vfun5 (fun s1 s2 b1 b2 b3 ->
-			(get_api()).add_global_metadata (dec_string s1) (dec_string s2) (dec_bool b1,dec_bool b2,dec_bool b3);
+			(get_api()).add_global_metadata (decode_string s1) (decode_string s2) (decode_bool b1,decode_bool b2,decode_bool b3) (get_api_call_pos());
 			vnull
 		);
 		"set_custom_js_generator", vfun1 (fun f ->
 			let f = prepare_callback f 1 in
 			(get_api()).set_js_generator (fun js_ctx ->
 				let com = ccom() in
-				let api = enc_obj OJSGenApi [
-					"outputFile", enc_string com.file;
-					"types", enc_array (List.map (fun t -> encode_type (type_of_module_type t)) com.types);
+				Genjs.setup_kwds com;
+				let api = encode_obj [
+					"outputFile", encode_string com.file;
+					"types", encode_array (List.map (fun t -> encode_type (type_of_module_type t)) com.types);
 					"main", (match com.main with None -> vnull | Some e -> encode_texpr e);
 					"generateValue", vfun1 (fun v ->
 						let e = decode_texpr v in
 						let str = Genjs.gen_single_expr js_ctx e false in
-						enc_string str
+						encode_string str
 					);
 					"isKeyword", vfun1 (fun v ->
-						vbool (Hashtbl.mem Genjs.kwds (dec_string v))
+						vbool (Hashtbl.mem Genjs.kwds (decode_string v))
 					);
 					"hasFeature", vfun1 (fun v ->
-						vbool (Common.has_feature com (dec_string v))
+						vbool (Common.has_feature com (decode_string v))
 					);
 					"addFeature", vfun1 (fun v ->
-						Common.add_feature com (dec_string v);
+						Common.add_feature com (decode_string v);
 						vnull
 					);
 					"quoteString", vfun1 (fun v ->
-						enc_string ("\"" ^ Ast.s_escape (dec_string v) ^ "\"")
+						encode_string ("\"" ^ StringHelper.s_escape (decode_string v) ^ "\"")
 					);
 					"buildMetaData", vfun1 (fun t ->
-						match Codegen.build_metadata com (decode_type_decl t) with
+						match Texpr.build_metadata com.basic (decode_type_decl t) with
 						| None -> vnull
 						| Some e -> encode_texpr e
 					);
 					"generateStatement", vfun1 (fun v ->
 						let e = decode_texpr v in
 						let str = Genjs.gen_single_expr js_ctx e true in
-						enc_string str
+						encode_string str
 					);
 					"setTypeAccessor", vfun1 (fun callb ->
 						let callb = prepare_callback callb 1 in
 						js_ctx.Genjs.type_accessor <- (fun t ->
-							dec_string (callb [encode_type (type_of_module_type t)])
+							decode_string (callb [encode_type (type_of_module_type t)])
 						);
 						vnull
 					);
@@ -1644,28 +1719,35 @@ let macro_api ccom get_api =
 			);
 			vnull
 		);
+		"flush_disk_cache", vfun0 (fun () ->
+			let com = (get_api()).get_com() in
+			Hashtbl.clear com.file_lookup_cache;
+			Hashtbl.clear com.readdir_cache;
+			vnull
+		);
 		"get_pos_infos", vfun1 (fun p ->
 			let p = decode_pos p in
-			enc_obj OContext_getPosInfos ["min",vint p.Globals.pmin;"max",vint p.Globals.pmax;"file",enc_string p.Globals.pfile]
+			encode_obj ["min",vint p.Globals.pmin;"max",vint p.Globals.pmax;"file",encode_string p.Globals.pfile]
 		);
 		"make_position", vfun3 (fun min max file ->
-			encode_pos { Globals.pmin = dec_int min; Globals.pmax = dec_int max; Globals.pfile = dec_string file }
+			encode_pos { Globals.pmin = decode_int min; Globals.pmax = decode_int max; Globals.pfile = decode_string file }
 		);
 		"add_resource", vfun2 (fun name data ->
-			let name = dec_string name in
+			let name = decode_string name in
 			let data = decode_bytes data in
+			let data = Bytes.unsafe_to_string data in
 			if name = "" then failwith "Empty resource name";
 			Hashtbl.replace (ccom()).resources name data;
-			let m = if name.[0] = '$' then (get_api()).current_macro_module() else (get_api()).current_module() in
+			let m = if Globals.starts_with name '$' then (get_api()).current_macro_module() else (get_api()).current_module() in
 			m.m_extra.m_binded_res <- PMap.add name data m.m_extra.m_binded_res;
 			vnull
 		);
 		"get_resources", vfun0 (fun() ->
-			encode_string_map encode_bytes (Hashtbl.fold (fun k v acc -> PMap.add k v acc) (ccom()).resources PMap.empty)
+			encode_string_map encode_string (Hashtbl.fold (fun k v acc -> PMap.add k v acc) (ccom()).resources PMap.empty)
 		);
 		"get_local_module", vfun0 (fun() ->
 			let m = (get_api()).current_module() in
-			enc_string (s_type_path m.m_path);
+			encode_string (s_type_path m.m_path);
 		);
 		"get_local_type", vfun0 (fun() ->
 			match (get_api()).get_local_type() with
@@ -1680,19 +1762,19 @@ let macro_api ccom get_api =
 		"get_call_arguments", vfun0 (fun() ->
 			match (get_api()).get_call_arguments() with
 			| None -> vnull
-			| Some el -> enc_array (List.map encode_expr el)
+			| Some el -> encode_array (List.map encode_expr el)
 		);
 		"get_local_method", vfun0 (fun() ->
-			enc_string ((get_api()).get_local_method())
+			encode_string ((get_api()).get_local_method())
 		);
 		"get_local_using", vfun0 (fun() ->
-			enc_array (List.map encode_clref ((get_api()).get_local_using()))
+			encode_array (List.map encode_clref ((get_api()).get_local_using()))
 		);
 		"get_local_imports", vfun0 (fun() ->
-			enc_array (List.map encode_import ((get_api()).get_local_imports()))
+			encode_array (List.map encode_import ((get_api()).get_local_imports()))
 		);
 		"local_vars", vfun1 (fun as_var ->
-			let as_var = dec_opt_bool as_var in
+			let as_var = decode_opt_bool as_var in
 			let vars = (get_api()).get_local_vars() in
 			encode_string_map (if as_var then encode_tvar else (fun v -> encode_type v.v_type)) vars
 		);
@@ -1711,9 +1793,9 @@ let macro_api ccom get_api =
 				| TType (t,tl) ->
 					apply_params t.t_params tl t.t_type
 				| TLazy f ->
-					(!f)()
+					lazy_type f
 			in
-			encode_type (if dec_opt_bool once then follow_once t else Abstract.follow_with_abstracts t)
+			encode_type (if decode_opt_bool once then follow_once t else Abstract.follow_with_abstracts t)
 		);
 		"follow", vfun2 (fun v once ->
 			let t = decode_type v in
@@ -1728,24 +1810,26 @@ let macro_api ccom get_api =
 				| TType (t,tl) ->
 					apply_params t.t_params tl t.t_type
 				| TLazy f ->
-					(!f)()
+					lazy_type f
 			in
-			encode_type (if dec_opt_bool once then follow_once t else follow t)
+			encode_type (if decode_opt_bool once then follow_once t else follow t)
 		);
 		"get_build_fields", vfun0 (fun() ->
 			(get_api()).get_build_fields()
 		);
-		"define_type", vfun1 (fun v ->
-			(get_api()).define_type v;
+		"define_type", vfun2 (fun v m ->
+			(get_api()).define_type v (opt decode_string m);
 			vnull
 		);
 		"define_module", vfun4 (fun path vl ui ul ->
-			(get_api()).define_module (dec_string path) (dec_array vl) (List.map decode_import (dec_array ui)) (List.map fst (List.map decode_path (dec_array ul)));
+			(get_api()).define_module (decode_string path) (decode_array vl) (List.map decode_import (decode_array ui)) (List.map fst (List.map decode_path (decode_array ul)));
 			vnull
 		);
 		"add_class_path", vfun1 (fun cp ->
 			let com = ccom() in
-			let cp = dec_string cp in
+			let cp = decode_string cp in
+			if com.stage <> CInitMacrosStart then
+				com.warning ("Should be used in initialization macros only: haxe.macro.Compiler.addClassPath(" ^ cp ^ ")") Globals.null_pos;
 			let cp = Path.add_trailing_slash cp in
 			com.class_path <- cp :: com.class_path;
 			(match com.get_macros() with
@@ -1754,28 +1838,19 @@ let macro_api ccom get_api =
 			| None ->
 				());
 			Hashtbl.clear com.file_lookup_cache;
+			Hashtbl.clear com.readdir_cache;
 			vnull
 		);
 		"add_native_lib", vfun1 (fun file ->
-			let file = dec_string file in
+			let file = decode_string file in
 			let com = ccom() in
-			(match com.platform with
-			| Globals.Flash -> Genswf.add_swf_lib com file false
-			| Globals.Java -> Genjava.add_java_lib com file false
-			| Globals.Cs ->
-				let file, is_std = match ExtString.String.nsplit file "@" with
-					| [file] ->
-						file,false
-					| [file;"std"] ->
-						file,true
-					| _ -> failwith ("unsupported file@`std` format: " ^ file)
-				in
-				Gencs.add_net_lib com file is_std
-			| _ -> failwith "Unsupported platform");
+			if com.stage <> CInitMacrosStart then
+				com.warning ("Should be used in initialization macros only: haxe.macro.Compiler.addNativeLib(" ^ file ^ ")") Globals.null_pos;
+			NativeLibraryHandler.add_native_lib com file false ();
 			vnull
 		);
 		"add_native_arg", vfun1 (fun arg ->
-			let arg = dec_string arg in
+			let arg = decode_string arg in
 			let com = ccom() in
 			(match com.platform with
 			| Globals.Java | Globals.Cs | Globals.Cpp ->
@@ -1784,47 +1859,39 @@ let macro_api ccom get_api =
 			vnull
 		);
 		"register_module_dependency", vfun2 (fun m file ->
-			(get_api()).module_dependency (dec_string m) (dec_string file) false;
-			vnull
-		);
-		"register_module_reuse_call", vfun2 (fun m mcall ->
-			(get_api()).module_dependency (dec_string m) (dec_string mcall) true;
+			(get_api()).module_dependency (decode_string m) (decode_string file);
 			vnull
 		);
 		"get_typed_expr", vfun1 (fun e ->
 			let e = decode_texpr e in
 			encode_expr (TExprToExpr.convert_expr e)
 		);
+		"store_expr", vfun1 (fun e ->
+			let api = get_api() in
+			let te = (api.type_expr (decode_expr e)) in
+			encode_expr (api.store_typed_expr te)
+		);
 		"store_typed_expr", vfun1 (fun e ->
 			let e = decode_texpr e in
 			encode_expr ((get_api()).store_typed_expr e)
 		);
 		"get_output", vfun0 (fun() ->
-			enc_string (ccom()).file
+			encode_string (ccom()).file
 		);
 		"set_output", vfun1 (fun s ->
-			(ccom()).file <- dec_string s;
+			(ccom()).file <- decode_string s;
 			vnull
 		);
 		"get_display_pos", vfun0 (fun() ->
-			let p = !Parser.resume_display in
+			let p = DisplayPosition.display_position#get in
 			if p = Globals.null_pos then
 				vnull
 			else
-				enc_obj OCompiler_getDisplayPos ["file",enc_string p.Globals.pfile;"pos",vint p.Globals.pmin]
-		);
-		"pattern_locals", vfun2 (fun e t ->
-			let loc = (get_api()).get_pattern_locals (decode_expr e) (decode_type t) in
-			encode_string_map (fun (v,_) -> encode_type v.v_type) loc
-		);
-		"on_macro_context_reused", vfun1 (fun c ->
-			let c = prepare_callback c 0 in
-			(get_api()).on_reuse (fun() -> dec_bool (c []));
-			vnull
+				encode_obj ["file",encode_string p.Globals.pfile;"pos",vint p.Globals.pmin]
 		);
 		"apply_params", vfun3 (fun tpl tl t ->
-			let tl = List.map decode_type (dec_array tl) in
-			let tpl = List.map (fun v -> dec_string (field v "name"), decode_type (field v "t")) (dec_array tpl) in
+			let tl = List.map decode_type (decode_array tl) in
+			let tpl = List.map (fun v -> decode_string (field v "name"), decode_type (field v "t")) (decode_array tpl) in
 			let rec map t = match t with
 				| TInst({cl_kind = KTypeParameter _},_) ->
 					begin try
@@ -1838,8 +1905,8 @@ let macro_api ccom get_api =
 			encode_type (apply_params tpl tl (map (decode_type t)))
 		);
 		"include_file", vfun2 (fun file position ->
-			let file = dec_string file in
-			let position = dec_string position in
+			let file = decode_string file in
+			let position = decode_string position in
 			let file = if Sys.file_exists file then
 				file
 			else try Common.find_file (ccom()) file with
@@ -1851,19 +1918,50 @@ let macro_api ccom get_api =
 		);
 		(* Compilation server *)
 		"server_add_module_check_policy", vfun4 (fun filter policy recursive context_options ->
-			let filter = List.map dec_string (dec_array filter) in
-			let policy = List.map dec_int (dec_array policy) in
-			(get_api()).add_module_check_policy filter policy (dec_bool recursive) (dec_int context_options);
+			let filter = List.map decode_string (decode_array filter) in
+			let policy = List.map decode_int (decode_array policy) in
+			(get_api()).add_module_check_policy filter policy (decode_bool recursive) (decode_int context_options);
 			vnull
 		);
 		"server_invalidate_files", vfun1 (fun a ->
 			let cs = match CompilationServer.get() with Some cs -> cs | None -> failwith "compilation server not running" in
 			List.iter (fun v ->
-				let s = dec_string v in
+				let s = decode_string v in
 				let s = Path.unique_full_path s in
-				CompilationServer.taint_modules cs s;
-				CompilationServer.remove_files cs s;
-			) (dec_array a);
+				cs#taint_modules s;
+				cs#remove_files s;
+			) (decode_array a);
+			vnull
+		);
+		"position_to_range", vfun1 (fun p ->
+			let p = decode_pos p in
+			let l1,c1,l2,c2 = Lexer.get_pos_coords p in
+			let make_pos line character =
+				encode_obj [
+					"line",vint line;
+					"character",vint character;
+				]
+			in
+			let pos_start = make_pos l1 c1 in
+			let pos_end = make_pos l2 c2 in
+			let range = encode_obj [
+				"start",pos_start;
+				"end",pos_end;
+			] in
+			let location = encode_obj [
+				"file",encode_string p.Globals.pfile;
+				"range",range
+			] in
+			location
+		);
+		"on_null_safety_report", vfun1 (fun f ->
+			let f = prepare_callback f 1 in
+			(ccom()).callbacks#add_null_safety_report (fun (errors:(string*pos) list) ->
+				let encode_item (msg,pos) =
+					encode_obj [("msg", encode_string msg); ("pos", encode_pos pos)]
+				in
+				ignore(f [encode_array (List.map encode_item errors)])
+			);
 			vnull
 		);
 	]
diff --git a/src/main.ml b/src/main.ml
deleted file mode 100644
index c3e3f3018c404eb6da91ab51f565d590713bcc4f..0000000000000000000000000000000000000000
--- a/src/main.ml
+++ /dev/null
@@ -1,966 +0,0 @@
-(*
-	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *)
-
-(*
-	Conventions:
-	- e: expression (typed or untyped)
-	- c: class
-	- en: enum
-	- td: typedef (tdef)
-	- a: abstract
-	- an: anon
-	- tf: tfunc
-	- cf: class_field
-	- ef: enum_field
-	- t: type (t)
-	- ct: complex_type
-	- v: local variable (tvar)
-	- m: module (module_def)
-	- mt: module_type
-	- p: pos
-
-	"param" refers to type parameters
-	"arg" refers to function arguments
-	leading s_ means function returns string
-	trailing l means list (but we also use natural plurals such as "metas")
-	semantic suffixes may be used freely (e.g. e1, e_if, e')
-*)
-
-open Printf
-open Genswf
-open Common
-open Common.DisplayMode
-open Type
-open Server
-open Globals
-open Filename
-
-exception Abort
-
-let executable_path() =
-	Extc.executable_path()
-
-let format msg p =
-	if p = null_pos then
-		msg
-	else begin
-		let error_printer file line = sprintf "%s:%d:" file line in
-		let epos = Lexer.get_error_pos error_printer p in
-		let msg = String.concat ("\n" ^ epos ^ " : ") (ExtString.String.nsplit msg "\n") in
-		sprintf "%s : %s" epos msg
-	end
-
-let message ctx msg p =
-	ctx.messages <- format msg p :: ctx.messages
-
-let deprecated = []
-
-let limit_string s offset =
-	let rest = 80 - offset in
-	let words = ExtString.String.nsplit s " " in
-	let rec loop i words = match words with
-		| word :: words ->
-			if String.length word + i + 1 > rest then (Printf.sprintf "\n%*s" offset "") :: word :: loop (String.length word) words
-			else (if i = 0 then "" else " ") :: word :: loop (i + 1 + String.length word) words
-		| [] ->
-			[]
-	in
-	String.concat "" (loop 0 words)
-
-let error ctx msg p =
-	let msg = try List.assoc msg deprecated with Not_found -> msg in
-	message ctx msg p;
-	ctx.has_error <- true
-
-let reserved_flags = [
-	"cross";"js";"lua";"neko";"flash";"php";"cpp";"cs";"java";"python";
-	"as3";"swc";"macro";"sys"
-	]
-
-let delete_file f = try Sys.remove f with _ -> ()
-
-let expand_env ?(h=None) path  =
-	let r = Str.regexp "%\\([A-Za-z0-9_]+\\)%" in
-	Str.global_substitute r (fun s ->
-		let key = Str.matched_group 1 s in
-		try
-			Sys.getenv key
-		with Not_found -> try
-			match h with
-			| None -> raise Not_found
-			| Some h -> Hashtbl.find h key
-		with Not_found ->
-			"%" ^ key ^ "%"
-	) path
-
-let add_libs com libs =
-	let call_haxelib() =
-		let t = Common.timer ["haxelib"] in
-		let cmd = "haxelib path " ^ String.concat " " libs in
-		let pin, pout, perr = Unix.open_process_full cmd (Unix.environment()) in
-		let lines = Std.input_list pin in
-		let err = Std.input_list perr in
-		let ret = Unix.close_process_full (pin,pout,perr) in
-		if ret <> Unix.WEXITED 0 then failwith (match lines, err with
-			| [], [] -> "Failed to call haxelib (command not found ?)"
-			| [], [s] when ExtString.String.ends_with (ExtString.String.strip s) "Module not found : path" -> "The haxelib command has been strip'ed, please install it again"
-			| _ -> String.concat "\n" (lines@err));
-		t();
-		lines
-	in
-	match libs with
-	| [] -> []
-	| _ ->
-		let lines = match CompilationServer.get() with
-			| Some cs ->
-				(try
-					(* if we are compiling, really call haxelib since library path might have changed *)
-					if not com.display.dms_display then raise Not_found;
-					CompilationServer.find_haxelib cs libs
-				with Not_found ->
-					let lines = call_haxelib() in
-					CompilationServer.cache_haxelib cs libs lines;
-					lines)
-			| _ -> call_haxelib()
-		in
-		let extra_args = ref [] in
-		let lines = List.fold_left (fun acc l ->
-			let l = ExtString.String.strip l in
-			if l = "" then acc else
-			if l.[0] <> '-' then l :: acc else
-			match (try ExtString.String.split l " " with _ -> l, "") with
-			| ("-L",dir) ->
-				com.neko_libs <- String.sub l 3 (String.length l - 3) :: com.neko_libs;
-				acc
-			| param, value ->
-				extra_args := param :: !extra_args;
-				if value <> "" then extra_args := value :: !extra_args;
-				acc
-		) [] lines in
-		com.class_path <- lines @ com.class_path;
-		List.rev !extra_args
-
-let run_command ctx cmd =
-	let h = Hashtbl.create 0 in
-	Hashtbl.add h "__file__" ctx.com.file;
-	Hashtbl.add h "__platform__" (platform_name ctx.com.platform);
-	let t = Common.timer ["command"] in
-	let cmd = expand_env ~h:(Some h) cmd in
-	let len = String.length cmd in
-	if len > 3 && String.sub cmd 0 3 = "cd " then begin
-		Sys.chdir (String.sub cmd 3 (len - 3));
-		0
-	end else
-	let binary_string s =
-		if not Globals.is_windows then s else String.concat "\n" (Str.split (Str.regexp "\r\n") s)
-	in
-	let pout, pin, perr = Unix.open_process_full cmd (Unix.environment()) in
-	let iout = Unix.descr_of_in_channel pout in
-	let ierr = Unix.descr_of_in_channel perr in
-	let berr = Buffer.create 0 in
-	let bout = Buffer.create 0 in
-	let tmp = String.create 1024 in
-	let result = ref None in
-	(*
-		we need to read available content on process out/err if we want to prevent
-		the process from blocking when the pipe is full
-	*)
-	let is_process_running() =
-		let pid, r = Unix.waitpid [Unix.WNOHANG] (-1) in
-		if pid = 0 then
-			true
-		else begin
-			result := Some r;
-			false;
-		end
-	in
-	let rec loop ins =
-		let (ch,_,_), timeout = (try Unix.select ins [] [] 0.02, true with _ -> ([],[],[]),false) in
-		match ch with
-		| [] ->
-			(* make sure we read all *)
-			if timeout && is_process_running() then
-				loop ins
-			else begin
-				Buffer.add_string berr (IO.read_all (IO.input_channel perr));
-				Buffer.add_string bout (IO.read_all (IO.input_channel pout));
-			end
-		| s :: _ ->
-			let n = Unix.read s tmp 0 (String.length tmp) in
-			if s == iout && n > 0 then
-				ctx.com.print (String.sub tmp 0 n)
-			else
-				Buffer.add_substring (if s == iout then bout else berr) tmp 0 n;
-			loop (if n = 0 then List.filter ((!=) s) ins else ins)
-	in
-	(try loop [iout;ierr] with Unix.Unix_error _ -> ());
-	let serr = binary_string (Buffer.contents berr) in
-	let sout = binary_string (Buffer.contents bout) in
-	if serr <> "" then ctx.messages <- (if serr.[String.length serr - 1] = '\n' then String.sub serr 0 (String.length serr - 1) else serr) :: ctx.messages;
-	if sout <> "" then ctx.com.print sout;
-	let r = (match (try Unix.close_process_full (pout,pin,perr) with Unix.Unix_error (Unix.ECHILD,_,_) -> (match !result with None -> assert false | Some r -> r)) with
-		| Unix.WEXITED e -> e
-		| Unix.WSIGNALED s | Unix.WSTOPPED s -> if s = 0 then -1 else s
-	) in
-	t();
-	r
-
-module Initialize = struct
-	let set_platform com pf file =
-		if com.platform <> Cross then failwith "Multiple targets";
-		Common.init_platform com pf;
-		com.file <- file;
-		if (pf = Flash) && file_extension file = "swc" then Common.define com Define.Swc
-
-	let initialize_target ctx com classes =
-		let add_std dir =
-			com.class_path <- List.filter (fun s -> not (List.mem s com.std_path)) com.class_path @ List.map (fun p -> p ^ dir ^ "/_std/") com.std_path @ com.std_path
-		in
-		match com.platform with
-			| Cross ->
-				(* no platform selected *)
-				set_platform com Cross "";
-				"?"
-			| Flash ->
-				let rec loop = function
-					| [] -> ()
-					| (v,_) :: _ when v > com.flash_version -> ()
-					| (v,def) :: l ->
-						Common.raw_define com ("flash" ^ def);
-						loop l
-				in
-				loop Common.flash_versions;
-				Common.raw_define com "flash";
-				com.package_rules <- PMap.remove "flash" com.package_rules;
-				add_std "flash";
-				"swf"
-			| Neko ->
-				add_std "neko";
-				"n"
-			| Js ->
-				if not (PMap.exists (fst (Define.infos Define.JqueryVer)) com.defines) then
-					Common.define_value com Define.JqueryVer "11204";
-
-				let es_version =
-					try
-						int_of_string (Common.defined_value com Define.JsEs)
-					with
-					| Not_found ->
-						(Common.define_value com Define.JsEs "5"; 5)
-					| _ ->
-						0
-				in
-
-				if es_version < 3 || es_version = 4 then (* we don't support ancient and there's no 4th *)
-					failwith "Invalid -D js-es value";
-
-				if es_version >= 5 then Common.raw_define com "js-es5"; (* backward-compatibility *)
-
-				add_std "js";
-				"js"
-			| Lua ->
-				add_std "lua";
-				"lua"
-			| Php ->
-				if Common.is_php7 com then
-					begin
-						com.package_rules <- PMap.add "php" (Directory "php7") com.package_rules;
-						com.package_rules <- PMap.add "php7" Forbidden com.package_rules;
-						add_std "php7"
-					end
-				else
-					add_std "php";
-				"php"
-			| Cpp ->
-				Common.define_value com Define.HxcppApiLevel "331";
-				add_std "cpp";
-				if Common.defined com Define.Cppia then
-					classes := (Path.parse_path "cpp.cppia.HostClasses" ) :: !classes;
-				"cpp"
-			| Cs ->
-				let old_flush = ctx.flush in
-				ctx.flush <- (fun () ->
-					com.net_libs <- [];
-					old_flush()
-				);
-				Gencs.before_generate com;
-				add_std "cs"; "cs"
-			| Java ->
-				let old_flush = ctx.flush in
-				ctx.flush <- (fun () ->
-					List.iter (fun (_,_,close,_,_) -> close()) com.java_libs;
-					com.java_libs <- [];
-					old_flush()
-				);
-				Genjava.before_generate com;
-				add_std "java"; "java"
-			| Python ->
-				add_std "python";
-				"python"
-			| Hl ->
-				add_std "hl";
-				"hl"
-end
-
-let generate tctx ext xml_out interp swf_header =
-	let com = tctx.Typecore.com in
-	(* check file extension. In case of wrong commandline, we don't want
-		to accidentaly delete a source file. *)
-	if file_extension com.file = ext then delete_file com.file;
-	if com.platform = Flash || com.platform = Cpp || com.platform = Hl then List.iter (Codegen.fix_overrides com) com.types;
-	if Common.defined com Define.Dump then Codegen.Dump.dump_types com;
-	if Common.defined com Define.DumpDependencies then begin
-		Codegen.Dump.dump_dependencies com;
-		if not tctx.Typecore.in_macro then match tctx.Typecore.g.Typecore.macros with
-			| None -> ()
-			| Some(_,ctx) -> print_endline "generate"; Codegen.Dump.dump_dependencies ~target_override:(Some "macro") ctx.Typecore.com
-	end;
-	begin match com.platform with
-		| Neko | Hl when interp -> ()
-		| Cpp when Common.defined com Define.Cppia -> ()
-		| Cpp | Cs | Java | Php -> Common.mkdir_from_path (com.file ^ "/.")
-		| _ -> Common.mkdir_from_path com.file
-	end;
-	if interp then
-		MacroContext.interpret tctx
-	else if com.platform = Cross then
-		()
-	else begin
-		let generate,name = match com.platform with
-		| Flash when Common.defined com Define.As3 ->
-			Genas3.generate,"AS3"
-		| Flash ->
-			Genswf.generate swf_header,"swf"
-		| Neko ->
-			Genneko.generate,"neko"
-		| Js ->
-			Genjs.generate,"js"
-		| Lua ->
-			Genlua.generate,"lua"
-		| Php ->
-			if Common.is_php7 com then
-				Genphp7.generate,"php"
-			else
-				Genphp.generate,"php"
-		| Cpp ->
-			Gencpp.generate,"cpp"
-		| Cs ->
-			Gencs.generate,"cs"
-		| Java ->
-			Genjava.generate,"java"
-		| Python ->
-			Genpy.generate,"python"
-		| Hl ->
-			Genhl.generate,"hl"
-		| Cross ->
-			assert false
-		in
-		Common.log com ("Generating " ^ name ^ ": " ^ com.file);
-		let t = Common.timer ["generate";name] in
-		generate com;
-		t()
-	end
-
-let get_std_class_paths () =
-	try
-		let p = Sys.getenv "HAXE_STD_PATH" in
-		let rec loop = function
-			| drive :: path :: l ->
-				if String.length drive = 1 && ((drive.[0] >= 'a' && drive.[0] <= 'z') || (drive.[0] >= 'A' && drive.[0] <= 'Z')) then
-					(drive ^ ":" ^ path) :: loop l
-				else
-					drive :: loop (path :: l)
-			| l ->
-				l
-		in
-		let parts = Str.split_delim (Str.regexp "[;:]") p in
-		"" :: List.map Path.add_trailing_slash (loop parts)
-	with Not_found ->
-		let base_path = Path.get_real_path (try executable_path() with _ -> "./") in
-		if Sys.os_type = "Unix" then
-			let prefix_path = Filename.dirname base_path in
-			let lib_path = Filename.concat prefix_path "lib" in
-			let share_path = Filename.concat prefix_path "share" in
-			[
-				Path.add_trailing_slash (Filename.concat lib_path "haxe/std");
-				Path.add_trailing_slash (Filename.concat lib_path "haxe/extraLibs");
-				Path.add_trailing_slash (Filename.concat share_path "haxe/std");
-				Path.add_trailing_slash (Filename.concat share_path "haxe/extraLibs");
-				""
-			]
-		else
-			[
-				Path.add_trailing_slash (Filename.concat base_path "std");
-				Path.add_trailing_slash (Filename.concat base_path "extraLibs");
-				""
-			]
-
-let rec process_params create pl =
-	let each_params = ref [] in
-	let rec loop acc = function
-		| [] ->
-			let ctx = create (!each_params @ (List.rev acc)) in
-			init ctx;
-			ctx.flush()
-		| "--next" :: l when acc = [] -> (* skip empty --next *)
-			loop [] l
-		| "--next" :: l ->
-			let ctx = create (!each_params @ (List.rev acc)) in
-			ctx.has_next <- true;
-			init ctx;
-			ctx.flush();
-			loop [] l
-		| "--each" :: l ->
-			each_params := List.rev acc;
-			loop [] l
-		| "--cwd" :: dir :: l ->
-			(* we need to change it immediately since it will affect hxml loading *)
-			(try Unix.chdir dir with _ -> raise (Arg.Bad ("Invalid directory: " ^ dir)));
-			loop acc l
-		| "--connect" :: hp :: l ->
-			(match CompilationServer.get() with
-			| None ->
-				let host, port = (try ExtString.String.split hp ":" with _ -> "127.0.0.1", hp) in
-				do_connect host (try int_of_string port with _ -> raise (Arg.Bad "Invalid port")) ((List.rev acc) @ l)
-			| Some _ ->
-				(* already connected : skip *)
-				loop acc l)
-		| "--run" :: cl :: args ->
-			let acc = cl :: "-main" :: "--interp" :: acc in
-			let ctx = create (!each_params @ (List.rev acc)) in
-			ctx.com.sys_args <- args;
-			init ctx;
-			ctx.flush()
-		| arg :: l ->
-			match List.rev (ExtString.String.nsplit arg ".") with
-			| "hxml" :: _ when (match acc with "-cmd" :: _ -> false | _ -> true) ->
-				let acc, l = (try acc, parse_hxml arg @ l with Not_found -> (arg ^ " (file not found)") :: acc, l) in
-				loop acc l
-			| _ -> loop (arg :: acc) l
-	in
-	(* put --display in front if it was last parameter *)
-	let pl = (match List.rev pl with
-		| file :: "--display" :: pl when file <> "memory" -> "--display" :: file :: List.rev pl
-		| "use_rtti_doc" :: "-D" :: file :: "--display" :: pl -> "--display" :: file :: List.rev pl
-		| _ -> pl
-	) in
-	loop [] pl
-
-and init ctx =
-	let usage = Printf.sprintf
-		"Haxe Compiler %s - (C)2005-2017 Haxe Foundation\n Usage : haxe%s -main <class> [-swf|-js|-neko|-php|-cpp|-cppia|-as3|-cs|-java|-python|-hl|-lua] <output> [options]\n Options :"
-		Globals.s_version (if Sys.os_type = "Win32" then ".exe" else "")
-	in
-	let com = ctx.com in
-	let classes = ref [([],"Std")] in
-try
-	let xml_out = ref None in
-	let swf_header = ref None in
-	let cmds = ref [] in
-	let config_macros = ref [] in
-	let cp_libs = ref [] in
-	let added_libs = Hashtbl.create 0 in
-	let no_output = ref false in
-	let did_something = ref false in
-	let force_typing = ref false in
-	let pre_compilation = ref [] in
-	let interp = ref false in
-	let swf_version = ref false in
-	let evals = ref [] in
-	Common.define_value com Define.HaxeVer (float_repres (float_of_int Globals.version /. 1000.));
-	Common.raw_define com "haxe3";
-	Common.define_value com Define.Dce "std";
-	com.warning <- (fun msg p -> message ctx ("Warning : " ^ msg) p);
-	com.error <- error ctx;
-	if CompilationServer.runs() then com.run_command <- run_command ctx;
-	Parser.display_error := (fun e p -> com.error (Parser.error_msg e) p);
-	Parser.use_doc := !Common.display_default <> DMNone || (CompilationServer.runs());
-	com.class_path <- get_std_class_paths ();
-	com.std_path <- List.filter (fun p -> ExtString.String.ends_with p "std/" || ExtString.String.ends_with p "std\\") com.class_path;
-	let define f = Arg.Unit (fun () -> Common.define com f) in
-	let process_ref = ref (fun args -> ()) in
-	let process_libs() =
-		let libs = List.filter (fun l -> not (Hashtbl.mem added_libs l)) (List.rev !cp_libs) in
-		cp_libs := [];
-		List.iter (fun l -> Hashtbl.add added_libs l ()) libs;
-		(* immediately process the arguments to insert them at the place -lib was defined *)
-		match add_libs com libs with
-		| [] -> ()
-		| args -> (!process_ref) args
-	in
-	let arg_delays = ref [] in
-	let basic_args_spec = [
-		("-cp",Arg.String (fun path ->
-			process_libs();
-			com.class_path <- Path.add_trailing_slash path :: com.class_path
-		),"<path> : add a directory to find source files");
-		("-js",Arg.String (Initialize.set_platform com Js),"<file> : compile code to JavaScript file");
-		("-lua",Arg.String (Initialize.set_platform com Lua),"<file> : compile code to Lua file");
-		("-swf",Arg.String (Initialize.set_platform com Flash),"<file> : compile code to Flash SWF file");
-		("-as3",Arg.String (fun dir ->
-			Initialize.set_platform com Flash dir;
-			Common.define com Define.As3;
-			Common.define com Define.NoInline;
-		),"<directory> : generate AS3 code into target directory");
-		("-neko",Arg.String (Initialize.set_platform com Neko),"<file> : compile code to Neko Binary");
-		("-php",Arg.String (fun dir ->
-			classes := (["php"],"Boot") :: !classes;
-			Initialize.set_platform com Php dir;
-		),"<directory> : generate PHP code into target directory");
-		("-cpp",Arg.String (fun dir ->
-			Initialize.set_platform com Cpp dir;
-		),"<directory> : generate C++ code into target directory");
-		("-cppia",Arg.String (fun file ->
-			Initialize.set_platform com Cpp file;
-			Common.define com Define.Cppia;
-		),"<file> : generate Cppia code into target file");
-		("-cs",Arg.String (fun dir ->
-			cp_libs := "hxcs" :: !cp_libs;
-			Initialize.set_platform com Cs dir;
-		),"<directory> : generate C# code into target directory");
-		("-java",Arg.String (fun dir ->
-			cp_libs := "hxjava" :: !cp_libs;
-			Initialize.set_platform com Java dir;
-		),"<directory> : generate Java code into target directory");
-		("-python",Arg.String (fun dir ->
-			Initialize.set_platform com Python dir;
-		),"<file> : generate Python code as target file");
-		("-hl",Arg.String (fun file ->
-			Initialize.set_platform com Hl file;
-		),"<file> : compile HL code as target file");
-		("-xml",Arg.String (fun file ->
-			Parser.use_doc := true;
-			xml_out := Some file
-		),"<file> : generate XML types description");
-		("-main",Arg.String (fun cl ->
-			if com.main_class <> None then raise (Arg.Bad "Multiple -main");
-			let cpath = Path.parse_type_path cl in
-			com.main_class <- Some cpath;
-			classes := cpath :: !classes
-		),"<class> : select startup class");
-		("-lib",Arg.String (fun l ->
-			cp_libs := l :: !cp_libs;
-			Common.raw_define com l;
-		),"<library[:version]> : use a haxelib library");
-		("-D",Arg.String (fun var ->
-			begin match var with
-				| "no_copt" | "no-copt" -> com.foptimize <- false;
-				| "use_rtti_doc" | "use-rtti-doc" -> Parser.use_doc := true;
-				| _ -> 	if List.mem var reserved_flags then raise (Arg.Bad (var ^ " is a reserved compiler flag and cannot be defined from command line"));
-			end;
-			Common.raw_define com var;
-		),"<var[=value]> : define a conditional compilation flag");
-		("-v",Arg.Unit (fun () ->
-			com.verbose <- true
-		),": turn on verbose mode");
-		("-debug", Arg.Unit (fun() ->
-			Common.define com Define.Debug;
-			com.debug <- true;
-		), ": add debug information to the compiled code");
-	] in
-	let adv_args_spec = [
-		("-dce", Arg.String (fun mode ->
-			(match mode with
-			| "std" | "full" | "no" -> ()
-			| _ -> raise (Arg.Bad "Invalid DCE mode, expected std | full | no"));
-			Common.define_value com Define.Dce mode
-		),"[std|full|no] : set the dead code elimination mode (default std)");
-		("-swf-version",Arg.Float (fun v ->
-			if not !swf_version || com.flash_version < v then com.flash_version <- v;
-			swf_version := true;
-		),"<version> : change the SWF version");
-		("-swf-header",Arg.String (fun h ->
-			try
-				swf_header := Some (match ExtString.String.nsplit h ":" with
-				| [width; height; fps] ->
-					(int_of_string width,int_of_string height,float_of_string fps,0xFFFFFF)
-				| [width; height; fps; color] ->
-					let color = if ExtString.String.starts_with color "0x" then color else "0x" ^ color in
-					(int_of_string width, int_of_string height, float_of_string fps, int_of_string color)
-				| _ -> raise Exit)
-			with
-				_ -> raise (Arg.Bad "Invalid SWF header format, expected width:height:fps[:color]")
-		),"<header> : define SWF header (width:height:fps:color)");
-		("-swf-lib",Arg.String (fun file ->
-			process_libs(); (* linked swf order matters, and lib might reference swf as well *)
-			Genswf.add_swf_lib com file false
-		),"<file> : add the SWF library to the compiled SWF");
-		("-swf-lib-extern",Arg.String (fun file ->
-			Genswf.add_swf_lib com file true
-		),"<file> : use the SWF library for type checking");
-		("-java-lib",Arg.String (fun file ->
-			let std = file = "lib/hxjava-std.jar" in
-			arg_delays := (fun () -> Genjava.add_java_lib com file std) :: !arg_delays;
-		),"<file> : add an external JAR or class directory library");
-		("-net-lib",Arg.String (fun file ->
-			let file, is_std = match ExtString.String.nsplit file "@" with
-				| [file] ->
-					file,false
-				| [file;"std"] ->
-					file,true
-				| _ -> raise Exit
-			in
-			arg_delays := (fun () -> Gencs.add_net_lib com file is_std) :: !arg_delays;
-		),"<file>[@std] : add an external .NET DLL file");
-		("-net-std",Arg.String (fun file ->
-			Gencs.add_net_std com file
-		),"<file> : add a root std .NET DLL search path");
-		("-c-arg",Arg.String (fun arg ->
-			com.c_args <- arg :: com.c_args
-		),"<arg> : pass option <arg> to the native Java/C# compiler");
-		("-x", Arg.String (fun file ->
-			let neko_file = file ^ ".n" in
-			Initialize.set_platform com Neko neko_file;
-			if com.main_class = None then begin
-				let cpath = Path.parse_type_path file in
-				com.main_class <- Some cpath;
-				classes := cpath :: !classes
-			end;
-			cmds := ("neko " ^ neko_file) :: !cmds;
-		),"<file> : shortcut for compiling and executing a neko file");
-		("-resource",Arg.String (fun res ->
-			let file, name = (match ExtString.String.nsplit res "@" with
-				| [file; name] -> file, name
-				| [file] -> file, file
-				| _ -> raise (Arg.Bad "Invalid Resource format, expected file@name")
-			) in
-			let file = (try Common.find_file com file with Not_found -> file) in
-			let data = (try
-				let s = Std.input_file ~bin:true file in
-				if String.length s > 12000000 then raise Exit;
-				s;
-			with
-				| Sys_error _ -> failwith ("Resource file not found : " ^ file)
-				| _ -> failwith ("Resource '" ^ file ^ "' excess the maximum size of 12MB")
-			) in
-			if Hashtbl.mem com.resources name then failwith ("Duplicate resource name " ^ name);
-			Hashtbl.add com.resources name data
-		),"<file>[@name] : add a named resource file");
-		("-prompt", Arg.Unit (fun() -> prompt := true),": prompt on error");
-		("-cmd", Arg.String (fun cmd ->
-			cmds := DisplayOutput.unquote cmd :: !cmds
-		),": run the specified command after successful compilation");
-		("--flash-strict", define Define.FlashStrict, ": more type strict flash API");
-		("--no-traces", define Define.NoTraces, ": don't compile trace calls in the program");
-		("--gen-hx-classes", Arg.Unit (fun() ->
-			force_typing := true;
-			pre_compilation := (fun() ->
-				List.iter (fun (_,_,extract) ->
-					Hashtbl.iter (fun n _ -> classes := n :: !classes) (extract())
-				) com.swf_libs;
-				List.iter (fun (_,std,_,all_files,_) ->
-					if not std then
-						List.iter (fun path -> if path <> (["java";"lang"],"String") then classes := path :: !classes) (all_files())
-				) com.java_libs;
-				List.iter (fun (_,std,all_files,_) ->
-					if not std then
-						List.iter (fun path -> classes := path :: !classes) (all_files())
-				) com.net_libs;
-			) :: !pre_compilation;
-			xml_out := Some "hx"
-		),": generate hx headers for all input classes");
-		("--next", Arg.Unit (fun() -> assert false), ": separate several haxe compilations");
-		("--each", Arg.Unit (fun() -> assert false), ": append preceding parameters to all haxe compilations separated by --next");
-		("--display", Arg.String (fun file_pos ->
-			DisplayOutput.handle_display_argument com file_pos pre_compilation did_something;
-		),": display code tips");
-		("--no-output", Arg.Unit (fun() -> no_output := true),": compiles but does not generate any file");
-		("--times", Arg.Unit (fun() -> measure_times := true),": measure compilation times");
-		("--no-inline", define Define.NoInline, ": disable inlining");
-		("--no-opt", Arg.Unit (fun() ->
-			com.foptimize <- false;
-			Common.define com Define.NoOpt;
-		), ": disable code optimizations");
-		("--php-front",Arg.String (fun f ->
-			if com.php_front <> None then raise (Arg.Bad "Multiple --php-front");
-			com.php_front <- Some f;
-		),"<filename> : select the name for the php front file");
-		("--php-lib",Arg.String (fun f ->
-			if com.php_lib <> None then raise (Arg.Bad "Multiple --php-lib");
-			com.php_lib <- Some f;
-		),"<filename> : select the name for the php lib folder");
-		("--php-prefix", Arg.String (fun f ->
-			if com.php_prefix <> None then raise (Arg.Bad "Multiple --php-prefix");
-			com.php_prefix <- Some f;
-			Common.define com Define.PhpPrefix;
-		),"<name> : prefix all classes with given name");
-		("--remap", Arg.String (fun s ->
-			let pack, target = (try ExtString.String.split s ":" with _ -> raise (Arg.Bad "Invalid remap format, expected source:target")) in
-			com.package_rules <- PMap.add pack (Remap target) com.package_rules;
-		),"<package:target> : remap a package to another one");
-		("--interp", Arg.Unit (fun() ->
-			Common.define com Define.Interp;
-			Initialize.set_platform com (!Globals.macro_platform) "";
-			interp := true;
-		),": interpret the program using internal macro system");
-		("--macro", Arg.String (fun e ->
-			force_typing := true;
-			config_macros := e :: !config_macros
-		)," : call the given macro before typing anything else");
-		("--eval", Arg.String (fun s ->
-			force_typing := true;
-			evals := s :: !evals;
-		), " : evaluates argument as Haxe module code");
-		("--wait", Arg.String (fun hp ->
-			let accept = match hp with
-				| "stdio" ->
-					Server.init_wait_stdio()
-				| _ ->
-					let host, port = (try ExtString.String.split hp ":" with _ -> "127.0.0.1", hp) in
-					let port = try int_of_string port with _ -> raise (Arg.Bad "Invalid port") in
-					init_wait_socket com.verbose host port
-			in
-			wait_loop process_params com.verbose accept
-		),"<[host:]port> : wait on the given port for commands to run)");
-		("--connect",Arg.String (fun _ ->
-			assert false
-		),"<[host:]port> : connect on the given port and run commands there)");
-		("--cwd", Arg.String (fun dir ->
-			assert false
-		),"<dir> : set current working directory");
-		("-version",Arg.Unit (fun() ->
-			message ctx Globals.s_version null_pos;
-			did_something := true;
-		),": print version and exit");
-		("--help-defines", Arg.Unit (fun() ->
-			let m = ref 0 in
-			let rec loop i =
-				let d = Obj.magic i in
-				if d <> Define.Last then begin
-					let t, doc = Define.infos d in
-					if String.length t > !m then m := String.length t;
-					((String.concat "-" (ExtString.String.nsplit t "_")),doc) :: (loop (i + 1))
-				end else
-					[]
-			in
-			let all = List.sort (fun (s1,_) (s2,_) -> String.compare s1 s2) (loop 0) in
-			let all = List.map (fun (n,doc) -> Printf.sprintf " %-*s: %s" !m n (limit_string doc (!m + 3))) all in
-			List.iter (fun msg -> ctx.com.print (msg ^ "\n")) all;
-			did_something := true
-		),": print help for all compiler specific defines");
-		("--help-metas", Arg.Unit (fun() ->
-			let all,max_length = Meta.get_documentation_list() in
-			let all = List.map (fun (n,doc) -> Printf.sprintf " %-*s: %s" max_length n (limit_string doc (max_length + 3))) all in
-			List.iter (fun msg -> ctx.com.print (msg ^ "\n")) all;
-			did_something := true
-		),": print help for all compiler metadatas");
-	] in
-	let args_callback cl =
-		let path,name = Path.parse_path cl in
-		if Path.starts_uppercase name then
-			classes := (path,name) :: !classes
-		else begin
-			force_typing := true;
-			config_macros := (Printf.sprintf "include('%s', true, null, null, true)" cl) :: !config_macros;
-		end
-	in
-	let all_args_spec = basic_args_spec @ adv_args_spec in
-	let process args =
-		let current = ref 0 in
-		(try
-			Arg.parse_argv ~current (Array.of_list ("" :: List.map expand_env args)) all_args_spec args_callback usage;
-			List.iter (fun fn -> fn()) !arg_delays
-		with (Arg.Bad msg) as exc ->
-			let r = Str.regexp "unknown option `\\([-A-Za-z]+\\)'" in
-			try
-				ignore(Str.search_forward r msg 0);
-				let s = Str.matched_group 1 msg in
-				let sl = List.map (fun (s,_,_) -> s) all_args_spec in
-				let msg = StringError.string_error_raise s sl (Printf.sprintf "Invalid command: %s" s) in
-				raise (Arg.Bad msg)
-			with Not_found ->
-				raise exc);
-		arg_delays := []
-	in
-	process_ref := process;
-	process ctx.com.args;
-	process_libs();
-	if com.display.dms_display then begin
-		com.warning <- if com.display.dms_error_policy = EPCollect then (fun s p -> add_diagnostics_message com s p DisplayTypes.DiagnosticsSeverity.Warning) else message ctx;
-		com.error <- error ctx;
-	end;
-	DisplayOutput.process_display_file com classes;
-	let ext = Initialize.initialize_target ctx com classes in
-	(* if we are at the last compilation step, allow all packages accesses - in case of macros or opening another project file *)
-	if com.display.dms_display then begin
-		if not ctx.has_next then com.package_rules <- PMap.foldi (fun p r acc -> match r with Forbidden -> acc | _ -> PMap.add p r acc) com.package_rules PMap.empty;
-	end;
-	com.config <- get_config com; (* make sure to adapt all flags changes defined after platform *)
-	List.iter (fun f -> f()) (List.rev (!pre_compilation));
-	if !classes = [([],"Std")] && not !force_typing then begin
-		let help_spec = basic_args_spec @ [
-			("-help", Arg.Unit (fun () -> ()),": show extended help information");
-			("--help", Arg.Unit (fun () -> ()),": show extended help information");
-			("--help-defines", Arg.Unit (fun () -> ()),": print help for all compiler specific defines");
-			("--help-metas", Arg.Unit (fun () -> ()),": print help for all compiler metadatas");
-			("<dot-path>", Arg.Unit (fun () -> ()),": compile the module specified by dot-path");
-		] in
-		if !cmds = [] && not !did_something then Arg.usage help_spec usage;
-	end else begin
-		ctx.setup();
-		Common.log com ("Classpath : " ^ (String.concat ";" com.class_path));
-		Common.log com ("Defines : " ^ (String.concat ";" (PMap.foldi (fun k v acc -> (match v with "1" -> k | _ -> k ^ "=" ^ v) :: acc) com.defines [])));
-		let t = Common.timer ["typing"] in
-		Typecore.type_expr_ref := (fun ctx e with_type -> Typer.type_expr ctx e with_type);
-		let tctx = Typer.create com in
-		List.iter (MacroContext.call_init_macro tctx) (List.rev !config_macros);
-		List.iter (Typer.eval tctx) !evals;
-		List.iter (fun cpath -> ignore(tctx.Typecore.g.Typecore.do_load_module tctx cpath null_pos)) (List.rev !classes);
-		Typer.finalize tctx;
-		t();
-		if not ctx.com.display.dms_display && ctx.has_error then raise Abort;
-		if ctx.com.display.dms_exit_during_typing then begin
-			if ctx.has_next || ctx.has_error then raise Abort;
-			failwith "No completion point was found";
-		end;
-		let t = Common.timer ["filters"] in
-		let main, types, modules = Typer.generate tctx in
-		com.main <- main;
-		com.types <- types;
-		com.modules <- modules;
-		DisplayOutput.process_global_display_mode com tctx;
-		if not (Common.defined com Define.NoDeprecationWarnings) then
-			Display.DeprecationCheck.run com;
-		Filters.run com tctx main;
-		t();
-		if ctx.has_error then raise Abort;
-		(match !xml_out with
-		| None -> ()
-		| Some "hx" ->
-			Genxml.generate_hx com
-		| Some file ->
-			Common.log com ("Generating xml : " ^ file);
-			Common.mkdir_from_path file;
-			Genxml.generate com file);
-		if not !no_output then generate tctx ext !xml_out !interp !swf_header;
-	end;
-	Sys.catch_break false;
-	List.iter (fun f -> f()) (List.rev com.callbacks.after_generation);
-	if not !no_output then begin
-		List.iter (fun c ->
-			let r = run_command ctx c in
-			if r <> 0 then failwith ("Command failed with error " ^ string_of_int r)
-		) (List.rev !cmds)
-	end
-with
-	| Abort ->
-		()
-	| Error.Fatal_error (m,p) ->
-		error ctx m p
-	| Common.Abort (m,p) ->
-		error ctx m p
-	| Lexer.Error (m,p) ->
-		error ctx (Lexer.error_msg m) p
-	| Parser.Error (m,p) ->
-		error ctx (Parser.error_msg m) p
-	| Typecore.Forbid_package ((pack,m,p),pl,pf)  ->
-		if !Common.display_default <> DMNone && ctx.has_next then begin
-			ctx.has_error <- false;
-			ctx.messages <- [];
-		end else begin
-			error ctx (Printf.sprintf "You cannot access the %s package while %s (for %s)" pack (if pf = "macro" then "in a macro" else "targeting " ^ pf) (s_type_path m) ) p;
-			List.iter (error ctx "    referenced here") (List.rev pl);
-		end
-	| Error.Error (m,p) ->
-		error ctx (Error.error_msg m) p
-	| Interp.Error (msg,p :: l) | Hlmacro.Error (msg,p :: l) ->
-		message ctx msg p;
-		List.iter (message ctx "Called from") l;
-		error ctx "Aborted" null_pos;
-	| Typeload.Generic_Exception(m,p) ->
-		error ctx m p
-	| Arg.Bad msg ->
-		error ctx ("Error: " ^ msg) null_pos
-	| Failure msg when not (is_debug_run()) ->
-		error ctx ("Error: " ^ msg) null_pos
-	| Arg.Help msg ->
-		message ctx msg null_pos
-	| Display.DisplayPackage pack ->
-		raise (DisplayOutput.Completion (String.concat "." pack))
-	| Display.DisplayFields fields ->
-		let fields = List.map (
-			fun (name,kind,doc) -> name, kind, (Option.default "" doc)
-		) fields in
-		let fields =
-			if !measure_times then begin
-				close_times();
-				(List.map (fun (name,value) -> ("@TIME " ^ name, Display.FKTimer value, "")) (DisplayOutput.get_timer_fields !start_time)) @ fields
-			end else
-				fields
-		in
-		raise (DisplayOutput.Completion (DisplayOutput.print_fields fields))
-	| Display.DisplayType (t,p,doc) ->
-		let doc = match doc with Some _ -> doc | None -> DisplayOutput.find_doc t in
-		raise (DisplayOutput.Completion (DisplayOutput.print_type t p doc))
-	| Display.DisplaySignatures(signatures,display_arg) ->
-		if ctx.com.display.dms_kind = DMSignature then
-			raise (DisplayOutput.Completion (DisplayOutput.print_signature signatures display_arg))
-		else
-			raise (DisplayOutput.Completion (DisplayOutput.print_signatures signatures))
-	| Display.DisplayPosition pl ->
-		raise (DisplayOutput.Completion (DisplayOutput.print_positions pl))
-	| Display.DisplayToplevel il ->
-		let il =
-			if !measure_times then begin
-				close_times();
-				(List.map (fun (name,value) -> IdentifierType.ITTimer ("@TIME " ^ name ^ ": " ^ value)) (DisplayOutput.get_timer_fields !start_time)) @ il
-			end else
-				il
-		in
-		raise (DisplayOutput.Completion (DisplayOutput.print_toplevel il))
-	| Parser.TypePath (p,c,is_import) ->
-		let fields =
-			try begin match c with
-				| None ->
-					DisplayOutput.TypePathHandler.complete_type_path com p
-				| Some (c,cur_package) ->
-					DisplayOutput.TypePathHandler.complete_type_path_inner com p c cur_package is_import
-			end with Common.Abort(msg,p) ->
-				error ctx msg p;
-				None
-		in
-		Option.may (fun fields -> raise (DisplayOutput.Completion (DisplayOutput.print_fields fields))) fields
-	| Display.ModuleSymbols s | Display.Diagnostics s | Display.Statistics s | Display.Metadata s ->
-		raise (DisplayOutput.Completion s)
-	| Interp.Sys_exit i | Hlinterp.Sys_exit i ->
-		ctx.flush();
-		exit i
-	| e when (try Sys.getenv "OCAMLRUNPARAM" <> "b" || CompilationServer.runs() with _ -> true) && not (is_debug_run()) ->
-		error ctx (Printexc.to_string e) null_pos
-
-;;
-let other = Common.timer ["other"] in
-Sys.catch_break true;
-MacroContext.setup();
-let args = List.tl (Array.to_list Sys.argv) in
-(try
-	let server = Sys.getenv "HAXE_COMPILATION_SERVER" in
-	let host, port = (try ExtString.String.split server ":" with _ -> "127.0.0.1", server) in
-	do_connect host (try int_of_string port with _ -> failwith "Invalid HAXE_COMPILATION_SERVER port") args
-with Not_found -> try
-	process_params create_context args
-with DisplayOutput.Completion c ->
-	prerr_endline c;
-	exit 0
-| Arg.Bad msg ->
-	prerr_endline ("Error: " ^ msg);
-	exit 1
-);
-other();
-if !measure_times then report_times prerr_endline
diff --git a/src/optimization/analyzer.ml b/src/optimization/analyzer.ml
index a6952a5891ba5e742cf435208da9d8b897d2c79d..52f01d1062ad4867d777f9f8a251ce2f50b1487f 100644
--- a/src/optimization/analyzer.ml
+++ b/src/optimization/analyzer.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -17,6 +17,7 @@
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *)
 
+open StringHelper
 open Ast
 open Type
 open Common
@@ -141,7 +142,7 @@ module Ssa = struct
 	let rec rename_in_block ctx bb =
 		let write_var v is_phi i =
 			update_reaching_def ctx v bb;
-			let v' = alloc_var (v.v_name) v.v_type v.v_pos in
+			let v' = alloc_var v.v_kind v.v_name v.v_type v.v_pos in
 			declare_var ctx.graph v' bb;
 			v'.v_meta <- v.v_meta;
 			v'.v_capture <- v.v_capture;
@@ -153,15 +154,15 @@ module Ssa = struct
 			v'
 		in
 		let rec loop is_phi i e = match e.eexpr with
-			| TLocal v when not (is_unbound v) ->
+			| TLocal v ->
 				let v' = local ctx e v bb in
 				add_ssa_edge ctx.graph v' bb is_phi i;
 				{e with eexpr = TLocal v'}
-			| TVar(v,Some e1) when not (is_unbound v) ->
+			| TVar(v,Some e1) ->
 				let e1 = (loop is_phi i) e1 in
 				let v' = write_var v is_phi i in
 				{e with eexpr = TVar(v',Some e1)}
-			| TBinop(OpAssign,({eexpr = TLocal v} as e1),e2) when not (is_unbound v) ->
+			| TBinop(OpAssign,({eexpr = TLocal v} as e1),e2) ->
 				let e2 = (loop is_phi i) e2 in
 				let v' = write_var v is_phi i in
 				{e with eexpr = TBinop(OpAssign,{e1 with eexpr = TLocal v'},e2)};
@@ -348,8 +349,10 @@ module ConstPropagation = DataFlow(struct
 	type t =
 		| Top
 		| Bottom
+		| Null of Type.t
 		| Const of tconstant
 		| EnumValue of int * t list
+		| ModuleType of module_type * Type.t
 
 	let conditional = true
 	let flag = FlagExecutable
@@ -365,13 +368,16 @@ module ConstPropagation = DataFlow(struct
 	let equals lat1 lat2 = match lat1,lat2 with
 		| Top,Top | Bottom,Bottom -> true
 		| Const ct1,Const ct2 -> ct1 = ct2
+		| Null t1,Null t2 -> t1 == t2
 		| EnumValue(i1,_),EnumValue(i2,_) -> i1 = i2
+		| ModuleType(mt1,_),ModuleType (mt2,_) -> mt1 == mt2
 		| _ -> false
 
 	let transfer ctx bb e =
 		let rec eval bb e =
 			let wrap = function
 				| Const ct -> mk (TConst ct) t_dynamic null_pos
+				| Null t -> mk (TConst TNull) t e.epos
 				| _ -> raise Exit
 			in
 			let unwrap e = match e.eexpr with
@@ -379,12 +385,16 @@ module ConstPropagation = DataFlow(struct
 				| _ -> raise Exit
 			in
 			match e.eexpr with
-			| TConst (TSuper | TThis | TNull) ->
+			| TConst (TSuper | TThis) ->
 				Bottom
+			| TConst TNull ->
+				Null e.etype
 			| TConst ct ->
 				Const ct
+			| TTypeExpr mt ->
+				ModuleType(mt,e.etype)
 			| TLocal v ->
-				if is_unbound v || (follow v.v_type) == t_dynamic || v.v_capture then
+				if (follow v.v_type) == t_dynamic || v.v_capture then
 					Bottom
 				else
 					get_cell v.v_id
@@ -420,10 +430,24 @@ module ConstPropagation = DataFlow(struct
 					| EnumValue(_,el) -> (try List.nth el i with Failure _ -> raise Exit)
 					| _ -> raise Exit
 				end;
+			| TEnumIndex e1 ->
+				begin match eval bb e1 with
+					| EnumValue(i,_) -> Const (TInt (Int32.of_int i))
+					| _ -> raise Exit
+				end;
+			| TCall ({ eexpr = TField (_,FStatic({cl_path=[],"Type"} as c,({cf_name="enumIndex"} as cf)))},[e1]) when ctx.com.platform = Eval ->
+				begin match follow e1.etype,eval bb e1 with
+					| TEnum _,EnumValue(i,_) -> Const (TInt (Int32.of_int i))
+					| _,e1 ->
+						begin match Inline.api_inline2 ctx.com c cf.cf_name [wrap e1] e.epos with
+							| None -> raise Exit
+							| Some e -> eval bb e
+						end
+				end
 			| TCall ({ eexpr = TField (_,FStatic(c,cf))},el) ->
 				let el = List.map (eval bb) el in
 				let el = List.map wrap el in
-				begin match Optimizer.api_inline2 ctx.com c cf.cf_name el e.epos with
+				begin match Inline.api_inline2 ctx.com c cf.cf_name el e.epos with
 					| None -> raise Exit
 					| Some e -> eval bb e
 				end
@@ -431,7 +455,8 @@ module ConstPropagation = DataFlow(struct
 				eval bb e1
 			| _ ->
 				let e1 = match ctx.com.platform,e.eexpr with
-					| Js,TArray(e1,{eexpr = TConst(TInt i)}) when Int32.to_int i = 1 -> e1
+					| Js,TArray(e1,{eexpr = TConst(TInt i)}) when Int32.to_int i = 1 && Define.defined ctx.com.defines Define.JsEnumsAsArrays -> e1
+					| Js,TField(e1,FDynamic "_hx_index") when not (Define.defined ctx.com.defines Define.JsEnumsAsArrays) -> e1
 					| Cpp,TCall({eexpr = TField(e1,FDynamic "__Index")},[]) -> e1
 					| Neko,TField(e1,FDynamic "index") -> e1
 					| _ -> raise Exit
@@ -451,14 +476,17 @@ module ConstPropagation = DataFlow(struct
 
 	let commit ctx =
 		let inline e i = match get_cell i with
-			| Top | Bottom | EnumValue _ ->
+			| Top | Bottom | EnumValue _ | Null _ ->
 				raise Not_found
 			| Const ct ->
-				let e' = Codegen.type_constant ctx.com (tconst_to_const ct) e.epos in
+				let e' = Texpr.type_constant ctx.com.basic (tconst_to_const ct) e.epos in
 				if not (type_change_ok ctx.com e'.etype e.etype) then raise Not_found;
 				e'
+			| ModuleType(mt,t) ->
+				if not (type_change_ok ctx.com t e.etype) then raise Not_found;
+				mk (TTypeExpr mt) t e.epos
 		in
-		let is_special_var v = v.v_capture || is_asvar_type v.v_type in
+		let is_special_var v = v.v_capture || ExtType.has_variable_semantics v.v_type in
 		let rec commit e = match e.eexpr with
 			| TLocal v when not (is_special_var v) ->
 				begin try
@@ -589,15 +617,16 @@ module LocalDce = struct
 	let rec has_side_effect e =
 		let rec loop e =
 			match e.eexpr with
-			| TConst _ | TLocal _ | TTypeExpr _ | TFunction _ -> ()
+			| TConst _ | TLocal _ | TTypeExpr _ | TFunction _ | TIdent _ -> ()
 			| TCall ({ eexpr = TField(_,FStatic({ cl_path = ([],"Std") },{ cf_name = "string" })) },args) -> Type.iter loop e
 			| TCall ({eexpr = TField(_,FEnum _)},_) -> Type.iter loop e
 			| TCall ({eexpr = TConst (TString ("phi" | "fun"))},_) -> ()
 			| TCall({eexpr = TField(e1,fa)},el) when PurityState.is_pure_field_access fa -> loop e1; List.iter loop el
+			| TField(_,fa) when PurityState.is_explicitly_impure fa -> raise Exit
 			| TNew _ | TCall _ | TBinop ((OpAssignOp _ | OpAssign),_,_) | TUnop ((Increment|Decrement),_,_) -> raise Exit
 			| TReturn _ | TBreak | TContinue | TThrow _ | TCast (_,Some _) -> raise Exit
 			| TFor _ -> raise Exit
-			| TArray _ | TEnumParameter _ | TCast (_,None) | TBinop _ | TUnop _ | TParenthesis _ | TMeta _ | TWhile _
+			| TArray _ | TEnumParameter _ | TEnumIndex _ | TCast (_,None) | TBinop _ | TUnop _ | TParenthesis _ | TMeta _ | TWhile _
 			| TField _ | TIf _ | TTry _ | TSwitch _ | TArrayDecl _ | TBlock _ | TObjectDecl _ | TVar _ -> Type.iter loop e
 		in
 		try
@@ -611,7 +640,7 @@ module LocalDce = struct
 			Meta.has Meta.Used v.v_meta
 		in
 		let keep v =
-			is_used v || (not (Meta.has Meta.CompilerGenerated v.v_meta) && not ctx.config.local_dce) || is_ref_type v.v_type || v.v_capture || Meta.has Meta.This v.v_meta
+			is_used v || ((match v.v_kind with VUser _ | VInlined -> true | _ -> false) && not ctx.config.local_dce) || ExtType.has_reference_semantics v.v_type || v.v_capture || Meta.has Meta.This v.v_meta
 		in
 		let rec use v =
 			if not (is_used v) then begin
@@ -623,9 +652,9 @@ module LocalDce = struct
 				end
 			end
 		and expr e = match e.eexpr with
-			| TLocal v when not (is_unbound v) ->
+			| TLocal v ->
 				use v;
-			| TBinop(OpAssign,{eexpr = TLocal v},e1) | TVar(v,Some e1) when not (is_unbound v) ->
+			| TBinop(OpAssign,{eexpr = TLocal v},e1) | TVar(v,Some e1) ->
 				if has_side_effect e1 || keep v then expr e1
 				else ()
 			| _ ->
@@ -740,8 +769,6 @@ module Debug = struct
 			edge bb_try "try";
 			List.iter (fun (_,bb_catch) -> edge bb_catch "catch") bbl;
 			edge bb_next "next";
-		| SEEnd ->
-			()
 		| SENone ->
 			()
 
@@ -782,12 +809,12 @@ module Debug = struct
 		) g.g_var_infos
 
 	let get_dump_path ctx c cf =
-		"dump" :: [platform_name ctx.com.platform] @ (fst c.cl_path) @ [Printf.sprintf "%s.%s" (snd c.cl_path) cf.cf_name]
+		(dump_path ctx.com) :: [platform_name_macro ctx.com] @ (fst c.cl_path) @ [Printf.sprintf "%s.%s" (snd c.cl_path) cf.cf_name]
 
 	let dot_debug ctx c cf =
 		let g = ctx.graph in
 		let start_graph ?(graph_config=[]) suffix =
-			let ch = Codegen.Dump.create_file suffix [] (get_dump_path ctx c cf) in
+			let ch = Path.create_file false suffix [] (get_dump_path ctx c cf) in
 			Printf.fprintf ch "digraph graphname {\n";
 			List.iter (fun s -> Printf.fprintf ch "%s;\n" s) graph_config;
 			ch,(fun () ->
@@ -879,7 +906,7 @@ module Run = struct
 	open Graph
 
 	let with_timer detailed s f =
-		let timer = timer (if detailed then "analyzer" :: s else ["analyzer"]) in
+		let timer = Timer.timer (if detailed then "analyzer" :: s else ["analyzer"]) in
 		let r = f() in
 		timer();
 		r
@@ -907,8 +934,6 @@ module Run = struct
 
 	let there actx e =
 		if actx.com.debug then add_debug_expr actx "initial" e;
-		let e = with_timer actx.config.detail_times ["->";"var-lazifier"] (fun () -> VarLazifier.apply actx.com e) in
-		if actx.com.debug then add_debug_expr actx "after var-lazifier" e;
 		let e = with_timer actx.config.detail_times ["->";"filter-apply"] (fun () -> TexprFilter.apply actx.com e) in
 		if actx.com.debug then add_debug_expr actx "after filter-apply" e;
 		let tf,t,is_real_function = match e.eexpr with
@@ -916,9 +941,10 @@ module Run = struct
 				tf,e.etype,true
 			| _ ->
 				(* Wrap expression in a function so we don't have to treat it as a special case throughout. *)
+				let t = e.etype in
 				let e = mk (TReturn (Some e)) t_dynamic e.epos in
-				let tf = { tf_args = []; tf_type = e.etype; tf_expr = e; } in
-				tf,tfun [] e.etype,false
+				let tf = { tf_args = []; tf_type = t; tf_expr = e; } in
+				tf,tfun [] t,false
 		in
 		with_timer actx.config.detail_times ["->";"from-texpr"] (fun () -> AnalyzerTexprTransformer.from_tfunction actx tf t e.epos);
 		is_real_function
@@ -937,20 +963,49 @@ module Run = struct
 			e
 		else begin
 			(* Get rid of the wrapping function and its return expressions. *)
-			let rec loop first e = match e.eexpr with
-				| TReturn (Some e) -> e
-				| TFunction tf when first ->
-					begin match loop false tf.tf_expr with
-						| {eexpr = TBlock _ | TIf _ | TSwitch _ | TTry _} when actx.com.platform = Cpp || actx.com.platform = Hl ->
-							mk (TCall(e,[])) tf.tf_type e.epos
-						| e ->
+			match e.eexpr with
+			| TFunction tf ->
+				let get_t t = if ExtType.is_void t then tf.tf_type else t in
+				let rec loop e = match e.eexpr with
+					| TBlock [e1] ->
+						loop e1
+					(* If there's a complex expression, keep the function and generate a call to it. *)
+					| TBlock _ | TIf _ | TSwitch _ | TTry _ when actx.com.platform = Cpp || actx.com.platform = Hl ->
+						raise Exit
+					(* Remove generated return *)
+					| TReturn (Some e) ->
+						e
+					| TBlock el ->
+						begin match List.rev el with
+						| e1 :: el ->
+							let e1 = loop e1 in
+							let e = {e with eexpr = TBlock (List.rev (e1 :: el))} in
 							e
-					end
-				| TBlock [e] -> loop first e
-				| TFunction _ -> e
-				| _ -> Type.map_expr (loop first) e
-			in
-			loop true e
+						| [] ->
+							e
+						end
+					| TIf(e1,e2,Some e3) ->
+						let e2 = loop e2 in
+						let e3 = loop e3 in
+						{e with eexpr = TIf(e1,e2,Some e3); etype = get_t e.etype}
+					| TSwitch(e1,cases,edef) ->
+						let cases = List.map (fun (el,e) -> el,loop e) cases in
+						let edef = Option.map loop edef in
+						{e with eexpr = TSwitch(e1,cases,edef); etype = get_t e.etype}
+					| TTry(e1,catches) ->
+						let e1 = loop e1 in
+						let catches = List.map (fun (v,e) -> v,loop e) catches in
+						{e with eexpr = TTry(e1,catches); etype = get_t e.etype}
+					| TMeta(m,e1) ->
+						{e with eexpr = TMeta(m,loop e1)}
+					| TParenthesis e1 ->
+						{e with eexpr = TParenthesis (loop e1)}
+					| _ ->
+						e
+				in
+				(try loop tf.tf_expr with Exit -> mk (TCall(e,[])) tf.tf_type e.epos)
+			| _ ->
+				assert false
 		end in
 		e
 
@@ -975,7 +1030,6 @@ module Run = struct
 	let run_on_field ctx config c cf = match cf.cf_expr with
 		| Some e when not (is_ignored cf.cf_meta) && not (Typecore.is_removable_field ctx cf) ->
 			let config = update_config_from_meta ctx.Typecore.com config cf.cf_meta in
-			(match e.eexpr with TFunction tf -> cf.cf_expr_unoptimized <- Some tf | _ -> ());
 			let actx = create_analyzer_context ctx.Typecore.com config e in
 			let debug() =
 				print_endline (Printf.sprintf "While analyzing %s.%s" (s_type_path c.cl_path) cf.cf_name);
@@ -990,7 +1044,7 @@ module Run = struct
 			let e = try
 				run_on_expr actx e
 			with
-			| Error.Error _ | Abort _ as exc ->
+			| Error.Error _ | Abort _ | Sys.Break as exc ->
 				raise exc
 			| exc ->
 				debug();
diff --git a/src/optimization/analyzerConfig.ml b/src/optimization/analyzerConfig.ml
index d93cad09f4e8533f038eff3a682aa2e56445a27b..1c11aeee5c58852c59d310e62f70485c85bf5464 100644
--- a/src/optimization/analyzerConfig.ml
+++ b/src/optimization/analyzerConfig.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -57,25 +57,7 @@ let all_flags =
 	) [] [flag_optimize;flag_const_propagation;flag_copy_propagation;flag_local_dce;flag_fusion;flag_ignore;flag_dot_debug;flag_user_var_fusion]
 
 let has_analyzer_option meta s =
-	try
-		let rec loop ml = match ml with
-			| (Meta.Analyzer,el,_) :: ml ->
-				if List.exists (fun (e,p) ->
-					match e with
-						| EConst(Ident s2) when s = s2 -> true
-						| _ -> false
-				) el then
-					true
-				else
-					loop ml
-			| _ :: ml ->
-				loop ml
-			| [] ->
-				false
-		in
-		loop meta
-	with Not_found ->
-		false
+	Ast.has_meta_option meta Meta.Analyzer s
 
 let is_ignored meta =
 	has_analyzer_option meta flag_ignore
@@ -121,7 +103,7 @@ let update_config_from_meta com config meta =
 							config
 					end
 				| _ ->
-					let s = Ast.s_expr e in
+					let s = Ast.Printer.s_expr e in
 					com.warning (StringError.string_error s all_flags ("Unrecognized analyzer option: " ^ s)) (pos e);
 					config
 			) config el
diff --git a/src/optimization/analyzerTexpr.ml b/src/optimization/analyzerTexpr.ml
index ab60790565f50e7053bd7c8a0e8e5374d2cd397f..db634382c9fb2d49c55292609afe1a2024a2dc88 100644
--- a/src/optimization/analyzerTexpr.ml
+++ b/src/optimization/analyzerTexpr.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -105,10 +105,9 @@ let target_handles_unops com = match com.platform with
 	| Lua | Python -> false
 	| _ -> true
 
-let target_handles_assign_ops com = match com.platform with
-	(* Technically PHP can handle assign ops, but unfortunately x += y is not always
-	   equivalent to x = x + y in case y has side-effects. *)
-	| Lua | Php -> false
+let target_handles_assign_ops com e2 = match com.platform with
+	| Php -> not (has_side_effect e2)
+	| Lua -> false
 	| Cpp when not (Common.defined com Define.Cppia) -> false
 	| _ -> true
 
@@ -125,7 +124,6 @@ let rec can_be_used_as_value com e =
 		(* | TCall _ | TNew _ when (match com.platform with Cpp | Php -> true | _ -> false) -> raise Exit *)
 		| TReturn _ | TThrow _ | TBreak | TContinue -> raise Exit
 		| TUnop((Increment | Decrement),_,_) when not (target_handles_unops com) -> raise Exit
-		| TNew _ when com.platform = Php && not (Common.is_php7 com) -> raise Exit
 		| TFunction _ -> ()
 		| _ -> Type.iter loop e
 	in
@@ -142,39 +140,15 @@ let rec can_be_used_as_value com e =
 let wrap_meta s e =
 	mk (TMeta((Meta.Custom s,[],e.epos),e)) e.etype e.epos
 
-let is_really_unbound v = match v.v_name with
+let is_really_unbound s = match s with
 	| "`trace" | "__int__" -> false
-	| _ -> is_unbound v
+	| _ -> true
 
 let r = Str.regexp "^\\([A-Za-z0-9_]\\)+$"
-let is_unbound_call_that_might_have_side_effects v el = match v.v_name,el with
+let is_unbound_call_that_might_have_side_effects s el = match s,el with
 	| "__js__",[{eexpr = TConst (TString s)}] when Str.string_match r s 0 -> false
 	| _ -> true
 
-let is_ref_type = function
-	| TType({t_path = ["cs"],("Ref" | "Out")},_) -> true
-	| TType({t_path = path},_) when path = Genphp7.ref_type_path -> true
-	| TType({t_path = ["cpp"],("Reference")},_) -> true
-	| TAbstract({a_path=["hl";"types"],"Ref"},_) -> true
-	| _ -> false
-
-let rec is_asvar_type t =
-	let check meta =
-		AnalyzerConfig.has_analyzer_option meta "as_var"
-	in
-	match t with
-	| TInst(c,_) -> check c.cl_meta
-	| TEnum(en,_) -> check en.e_meta
-	| TType(t,tl) -> check t.t_meta || (is_asvar_type (apply_params t.t_params tl t.t_type))
-	| TAbstract(a,_) -> check a.a_meta
-	| TLazy f -> is_asvar_type (!f())
-	| TMono r ->
-		(match !r with
-		| Some t -> is_asvar_type t
-		| _ -> false)
-	| _ ->
-		false
-
 let type_change_ok com t1 t2 =
 	if t1 == t2 then
 		true
@@ -188,10 +162,10 @@ let type_change_ok com t1 t2 =
 		let rec is_nullable_or_whatever = function
 			| TMono r ->
 				(match !r with None -> false | Some t -> is_nullable_or_whatever t)
-			| TType ({ t_path = ([],"Null") },[_]) ->
+			| TAbstract ({ a_path = ([],"Null") },[_]) ->
 				true
 			| TLazy f ->
-				is_nullable_or_whatever (!f())
+				is_nullable_or_whatever (lazy_type f)
 			| TType (t,tl) ->
 				is_nullable_or_whatever (apply_params t.t_params tl t.t_type)
 			| TFun _ ->
@@ -219,6 +193,122 @@ let dynarray_map f d =
 let dynarray_mapi f d =
 	DynArray.iteri (fun i e -> DynArray.unsafe_set d i (f i e)) d
 
+module TexprKindMapper = struct
+	type kind =
+		| KRead         (* Expression is read. *)
+		| KAccess       (* Structure of expression is accessed. *)
+		| KWrite        (* Expression is lhs of =. *)
+		| KReadWrite    (* Expression is lhs of += .*)
+		| KStore        (* Expression is stored (via =, += or in array/object declaration). *)
+		| KEq           (* Expression is lhs or rhs of == or != *)
+		| KEqNull       (* Expression is lhs or rhs of == null or != null *)
+		| KCalled       (* Expression is being called. *)
+		| KCallArgument (* Expression is call argument (leaves context). *)
+		| KReturn       (* Expression is returned (leaves context). *)
+		| KThrow        (* Expression is thrown (leaves context). *)
+
+	let rec map kind f e = match e.eexpr with
+		| TConst _
+		| TLocal _
+		| TBreak
+		| TContinue
+		| TTypeExpr _
+		| TIdent _ ->
+			e
+		| TArray(e1,e2) ->
+			let e1 = f KAccess e1 in
+			let e2 = f KRead e2 in
+			{ e with eexpr = TArray (e1,e2) }
+		| TBinop(OpAssign,e1,e2) ->
+			let e1 = f KWrite e1 in
+			let e2 = f KStore e2 in
+			{ e with eexpr = TBinop(OpAssign,e1,e2) }
+		| TBinop(OpAssignOp op,e1,e2) ->
+			let e1 = f KReadWrite e1 in
+			let e2 = f KStore e2 in
+			{ e with eexpr = TBinop(OpAssignOp op,e1,e2) }
+		| TBinop((OpEq | OpNotEq) as op,e1,e2) ->
+			let e1,e2 = match (Texpr.skip e1).eexpr,(Texpr.skip e2).eexpr with
+				| TConst TNull,TConst TNull ->
+					let e1 = f KRead e1 in
+					let e2 = f KRead e2 in
+					e1,e2
+				| TConst TNull,_ ->
+					let e1 = f KRead e1 in
+					let e2 = f KEqNull e2 in
+					e1,e2
+				| _,TConst TNull ->
+					let e1 = f KEqNull e1 in
+					let e2 = f KRead e2 in
+					e1,e2
+				| _ ->
+					let e1 = f KEq e1 in
+					let e2 = f KEq e2 in
+					e1,e2
+			in
+			{e with eexpr = TBinop(op,e1,e2)}
+		| TBinop(op,e1,e2) ->
+			let e1 = f KRead e1 in
+			let e2 = f KRead e2 in
+			{ e with eexpr = TBinop(op,e1,e2) }
+		| TFor (v,e1,e2) ->
+			let e1 = f KRead e1 in
+			{ e with eexpr = TFor (v,e1,f KRead e2) }
+		| TWhile (e1,e2,flag) ->
+			let e1 = f KRead e1 in
+			{ e with eexpr = TWhile (e1,f KRead e2,flag) }
+		| TThrow e1 ->
+			{ e with eexpr = TThrow (f KThrow e1) }
+		| TEnumParameter (e1,ef,i) ->
+			{ e with eexpr = TEnumParameter(f KAccess e1,ef,i) }
+		| TEnumIndex e1 ->
+			{ e with eexpr = TEnumIndex (f KAccess e1) }
+		| TField (e1,v) ->
+			{ e with eexpr = TField (f KAccess e1,v) }
+		| TParenthesis e1 ->
+			{ e with eexpr = TParenthesis (f kind e1) }
+		| TUnop (op,pre,e1) ->
+			{ e with eexpr = TUnop (op,pre,f KRead e1) }
+		| TArrayDecl el ->
+			{ e with eexpr = TArrayDecl (List.map (f KStore) el) }
+		| TNew (t,pl,el) ->
+			{ e with eexpr = TNew (t,pl,List.map (f KCallArgument) el) }
+		| TBlock el ->
+			let rec loop acc el = match el with
+				| [e] -> f kind e :: acc
+				| e1 :: el -> loop (f KRead e1 :: acc) el
+				| [] -> []
+			in
+			let el = List.rev (loop [] el) in
+			{ e with eexpr = TBlock el }
+		| TObjectDecl el ->
+			{ e with eexpr = TObjectDecl (List.map (fun (v,e) -> v, f KStore e) el) }
+		| TCall (e1,el) ->
+			let e1 = f KCalled e1 in
+			{ e with eexpr = TCall (e1, List.map (f KCallArgument) el) }
+		| TVar (v,eo) ->
+			{ e with eexpr = TVar (v, match eo with None -> None | Some e -> Some (f KStore e)) }
+		| TFunction fu ->
+			{ e with eexpr = TFunction { fu with tf_expr = f KRead fu.tf_expr } }
+		| TIf (ec,e1,e2) ->
+			let ec = f KRead ec in
+			let e1 = f kind e1 in
+			{ e with eexpr = TIf (ec,e1,match e2 with None -> None | Some e -> Some (f kind e)) }
+		| TSwitch (e1,cases,def) ->
+			let e1 = f KRead e1 in
+			let cases = List.map (fun (el,e2) -> List.map (f KRead) el, f kind e2) cases in
+			{ e with eexpr = TSwitch (e1, cases, match def with None -> None | Some e -> Some (f kind e)) }
+		| TTry (e1,catches) ->
+			let e1 = f kind e1 in
+			{ e with eexpr = TTry (e1, List.map (fun (v,e) -> v, f kind e) catches) }
+		| TReturn eo ->
+			{ e with eexpr = TReturn (match eo with None -> None | Some e -> Some (f KReturn e)) }
+		| TCast (e1,t) ->
+			{ e with eexpr = TCast (f kind e1,t) }
+		| TMeta (m,e1) ->
+			{e with eexpr = TMeta(m,f kind e1)}
+end
+
 (*
 	This module rewrites some expressions to reduce the amount of special cases for subsequent analysis. After analysis
 	it restores some of these expressions back to their original form.
@@ -263,7 +353,7 @@ module TexprFilter = struct
 		| TWhile(e1,e2,flag) when not (is_true_expr e1) ->
 			let p = e.epos in
 			let e_break = mk TBreak t_dynamic p in
-			let e_not = mk (TUnop(Not,Prefix,Codegen.mk_parent e1)) e1.etype e1.epos in
+			let e_not = mk (TUnop(Not,Prefix,Texpr.Builder.mk_parent e1)) e1.etype e1.epos in
 			let e_if eo = mk (TIf(e_not,e_break,eo)) com.basic.tvoid p in
 			let rec map_continue e = match e.eexpr with
 				| TContinue ->
@@ -277,10 +367,10 @@ module TexprFilter = struct
 			let e_if = e_if None in
 			let e_block = if flag = NormalWhile then Type.concat e_if e2 else Type.concat e2 e_if in
 			let e_true = mk (TConst (TBool true)) com.basic.tbool p in
-			let e = mk (TWhile(Codegen.mk_parent e_true,e_block,NormalWhile)) e.etype p in
+			let e = mk (TWhile(Texpr.Builder.mk_parent e_true,e_block,NormalWhile)) e.etype p in
 			loop e
 		| TFor(v,e1,e2) ->
-			let e = Codegen.for_remap com v e1 e2 e.epos in
+			let e = Texpr.for_remap com.basic v e1 e2 e.epos in
 			loop e
 		| _ ->
 			Type.map_expr loop e
@@ -288,41 +378,6 @@ module TexprFilter = struct
 		loop e
 end
 
-module VarLazifier = struct
-	let apply com e =
-		let rec loop var_inits e = match e.eexpr with
-			| TVar(v,Some e1) when (Meta.has (Meta.Custom ":extractorVariable") v.v_meta) ->
-				let var_inits,e1 = loop var_inits e1 in
-				let var_inits = PMap.add v.v_id e1 var_inits in
-				var_inits,{e with eexpr = TVar(v,None)}
-			| TLocal v ->
-				begin try
-					let e_init = PMap.find v.v_id var_inits in
-					let e = {e with eexpr = TBinop(OpAssign,e,e_init)} in
-					let e = {e with eexpr = TParenthesis e} in
-					let var_inits = PMap.remove v.v_id var_inits in
-					var_inits,e
-				with Not_found ->
-					var_inits,e
-				end
-			| TIf(e1,e2,eo) ->
-				let var_inits,e1 = loop var_inits e1 in
-				let _,e2 = loop var_inits e2 in
-				let eo = match eo with None -> None | Some e -> Some (snd (loop var_inits e)) in
-				var_inits,{e with eexpr = TIf(e1,e2,eo)}
-			| TSwitch(e1,cases,edef) ->
-				let var_inits,e1 = loop var_inits e1 in
-				let cases = List.map (fun (el,e) ->
-					let _,e = loop var_inits e in
-					el,e
-				) cases in
-				let edef = match edef with None -> None | Some e -> Some (snd (loop var_inits e)) in
-				var_inits,{e with eexpr = TSwitch(e1,cases,edef)}
-			| _ ->
-				Texpr.foldmap loop var_inits e
-		in
-		snd (loop PMap.empty e)
-end
 
 (*
 	An InterferenceReport represents in which way a given code may be influenced and
@@ -331,40 +386,40 @@ end
 *)
 module InterferenceReport = struct
 	type interference_report = {
-		ir_var_reads : (int,bool) Hashtbl.t;
-		ir_var_writes : (int,bool) Hashtbl.t;
-		ir_field_reads : (string,bool) Hashtbl.t;
-		ir_field_writes : (string,bool) Hashtbl.t;
+		mutable ir_var_reads : bool IntMap.t;
+		mutable ir_var_writes : bool IntMap.t;
+		mutable ir_field_reads : bool StringMap.t;
+		mutable ir_field_writes : bool StringMap.t;
 		mutable ir_state_read : bool;
 		mutable ir_state_write : bool;
 	}
 
 	let create () = {
-		ir_var_reads = Hashtbl.create 0;
-		ir_var_writes = Hashtbl.create 0;
-		ir_field_reads = Hashtbl.create 0;
-		ir_field_writes = Hashtbl.create 0;
+		ir_var_reads = IntMap.empty;
+		ir_var_writes = IntMap.empty;
+		ir_field_reads = StringMap.empty;
+		ir_field_writes = StringMap.empty;
 		ir_state_read = false;
 		ir_state_write = false;
 	}
 
-	let set_var_read ir v = Hashtbl.replace ir.ir_var_reads v.v_id true
-	let set_var_write ir v = Hashtbl.replace ir.ir_var_writes v.v_id true
-	let set_field_read ir s = Hashtbl.replace ir.ir_field_reads s true
-	let set_field_write ir s = Hashtbl.replace ir.ir_field_writes s true
+	let set_var_read ir v = ir.ir_var_reads <- IntMap.add v.v_id true ir.ir_var_reads
+	let set_var_write ir v = ir.ir_var_writes <- IntMap.add v.v_id true ir.ir_var_writes
+	let set_field_read ir s = ir.ir_field_reads <- StringMap.add s true ir.ir_field_reads
+	let set_field_write ir s = ir.ir_field_writes <- StringMap.add s true ir.ir_field_writes
 	let set_state_read ir = ir.ir_state_read <- true
 	let set_state_write ir = ir.ir_state_write <- true
 
-	let has_var_read ir v = Hashtbl.mem ir.ir_var_reads v.v_id
-	let has_var_write ir v = Hashtbl.mem ir.ir_var_writes v.v_id
-	let has_field_read ir s = Hashtbl.mem ir.ir_field_reads s
-	let has_field_write ir s = Hashtbl.mem ir.ir_field_writes s
+	let has_var_read ir v = IntMap.mem v.v_id ir.ir_var_reads
+	let has_var_write ir v = IntMap.mem v.v_id ir.ir_var_writes
+	let has_field_read ir s = StringMap.mem s ir.ir_field_reads
+	let has_field_write ir s = StringMap.mem s ir.ir_field_writes
 	let has_state_read ir = ir.ir_state_read
 	let has_state_write ir = ir.ir_state_write
-	let has_any_field_read ir = Hashtbl.length ir.ir_field_reads > 0
-	let has_any_field_write ir = Hashtbl.length ir.ir_field_writes > 0
-	let has_any_var_read ir = Hashtbl.length ir.ir_var_reads > 0
-	let has_any_var_write ir = Hashtbl.length ir.ir_var_writes > 0
+	let has_any_field_read ir = not (StringMap.is_empty ir.ir_field_reads)
+	let has_any_field_write ir = not (StringMap.is_empty ir.ir_field_writes)
+	let has_any_var_read ir = not (IntMap.is_empty ir.ir_var_reads)
+	let has_any_var_write ir = not (IntMap.is_empty ir.ir_var_writes)
 
 	let from_texpr e =
 		let ir = create () in
@@ -429,7 +484,7 @@ module InterferenceReport = struct
 				loop e1;
 				loop e2;
 			(* state *)
-			| TCall({eexpr = TLocal v},el) when not (is_unbound_call_that_might_have_side_effects v el) ->
+			| TCall({eexpr = TIdent s},el) when not (is_unbound_call_that_might_have_side_effects s el) ->
 				List.iter loop el
 			| TNew(c,_,el) when (match c.cl_constructor with Some cf when PurityState.is_pure c cf -> true | _ -> false) ->
 				set_state_read ir;
@@ -470,14 +525,17 @@ module InterferenceReport = struct
 		ir
 
 	let to_string ir =
-		let s_hashtbl f h =
-			String.concat ", " (Hashtbl.fold (fun k _ acc -> (f k) :: acc) h [])
+		let s_intmap f h =
+			String.concat ", " (IntMap.fold (fun k _ acc -> (f k) :: acc) h [])
 		in
-		Type.Printer.s_record_fields "\t" [
-			"ir_var_reads",s_hashtbl string_of_int ir.ir_var_reads;
-			"ir_var_writes",s_hashtbl string_of_int ir.ir_var_writes;
-			"ir_field_reads",s_hashtbl (fun x -> x) ir.ir_field_reads;
-			"ir_field_writes",s_hashtbl (fun x -> x) ir.ir_field_writes;
+		let s_stringmap f h =
+			String.concat ", " (StringMap.fold (fun k _ acc -> (f k) :: acc) h [])
+		in
+		Type.Printer.s_record_fields "" [
+			"ir_var_reads",s_intmap string_of_int ir.ir_var_reads;
+			"ir_var_writes",s_intmap string_of_int ir.ir_var_writes;
+			"ir_field_reads",s_stringmap (fun x -> x) ir.ir_field_reads;
+			"ir_field_writes",s_stringmap (fun x -> x) ir.ir_field_writes;
 			"ir_state_read",string_of_bool ir.ir_state_read;
 			"ir_state_write",string_of_bool ir.ir_state_write;
 		]
@@ -561,11 +619,18 @@ module Fusion = struct
 		| OpBoolOr
 		| OpAssignOp _
 		| OpInterval
+		| OpIn
 		| OpArrow ->
 			false
 
-	let use_assign_op com op e1 e2 =
-		is_assign_op op && target_handles_assign_ops com && Texpr.equal e1 e2 && not (has_side_effect e1) && match com.platform with
+	let use_assign_op com op e1 e2 e3 =
+		let skip e = match com.platform with
+			| Eval -> Texpr.skip e
+			| _ -> e
+		in
+		let e1 = skip e1 in
+		let e2 = skip e2 in
+		is_assign_op op && target_handles_assign_ops com e3 && Texpr.equal e1 e2 && not (has_side_effect e1) && match com.platform with
 			| Cs when is_null e1.etype || is_null e2.etype -> false (* C# hates OpAssignOp on Null<T> *)
 			| _ -> true
 
@@ -582,8 +647,10 @@ module Fusion = struct
 			| {eexpr = TLocal v} :: el ->
 				state#dec_reads v;
 				block_element acc el
+			| {eexpr = TField (_,fa)} as e1 :: el when PurityState.is_explicitly_impure fa ->
+				block_element (e1 :: acc) el
 			(* no-side-effect *)
-			| {eexpr = TEnumParameter _ | TFunction _ | TConst _ | TTypeExpr _} :: el ->
+			| {eexpr = TEnumParameter _ | TEnumIndex _ | TFunction _ | TConst _ | TTypeExpr _} :: el ->
 				block_element acc el
 			| {eexpr = TMeta((Meta.Pure,_,_),_)} :: el ->
 				block_element acc el
@@ -591,6 +658,15 @@ module Fusion = struct
 				block_element acc (e1 :: el1 @ el2)
 			| {eexpr = TNew(c,tl,el1)} :: el2 when (match c.cl_constructor with Some cf when PurityState.is_pure c cf -> true | _ -> false) && config.local_dce ->
 				block_element acc (el1 @ el2)
+			| {eexpr = TIf ({ eexpr = TConst (TBool t) },e1,e2)} :: el ->
+				if t then
+					block_element acc (e1 :: el)
+				else begin match e2 with
+					| None ->
+						block_element acc el
+					| Some e ->
+						block_element acc (e :: el)
+				end
 			(* no-side-effect composites *)
 			| {eexpr = TParenthesis e1 | TMeta(_,e1) | TCast(e1,None) | TField(e1,_) | TUnop(_,_,e1)} :: el ->
 				block_element acc (e1 :: el)
@@ -600,7 +676,9 @@ module Fusion = struct
 				block_element acc (el1 @ el2)
 			| {eexpr = TObjectDecl fl} :: el ->
 				block_element acc ((List.map snd fl) @ el)
-			| {eexpr = TIf(e1,{eexpr = TBlock []},(Some {eexpr = TBlock []} | None))} :: el ->
+			| {eexpr = TIf(e1,e2,None)} :: el when not (has_side_effect e2) ->
+				block_element acc (e1 :: el)
+			| {eexpr = TIf(e1,e2,Some e3)} :: el when not (has_side_effect e2) && not (has_side_effect e3) ->
 				block_element acc (e1 :: el)
 			| {eexpr = TBlock [e1]} :: el ->
 				block_element acc (e1 :: el)
@@ -615,18 +693,18 @@ module Fusion = struct
 			let num_uses = state#get_reads v in
 			let num_writes = state#get_writes v in
 			let can_be_used_as_value = can_be_used_as_value com e in
-			let is_compiler_generated = Meta.has Meta.CompilerGenerated v.v_meta in
+			let is_compiler_generated = match v.v_kind with VUser _ | VInlined -> false | _ -> true in
 			let has_type_params = match v.v_extra with Some (tl,_) when tl <> [] -> true | _ -> false in
 			let b = num_uses <= 1 &&
 			        num_writes = 0 &&
 			        can_be_used_as_value &&
-					not (is_asvar_type v.v_type) &&
+					not (ExtType.has_variable_semantics v.v_type) &&
 			        (is_compiler_generated || config.optimize && config.fusion && config.user_var_fusion && not has_type_params)
 			in
 			if config.fusion_debug then begin
-				print_endline (Printf.sprintf "FUSION\n\tvar %s<%i> = %s" v.v_name v.v_id (s_expr_pretty e));
-				print_endline (Printf.sprintf "\tcan_be_fused:%b: num_uses:%i <= 1 && num_writes:%i = 0 && can_be_used_as_value:%b && (is_compiler_generated:%b || config.optimize:%b && config.fusion:%b && config.user_var_fusion:%b)"
-					b num_uses num_writes can_be_used_as_value is_compiler_generated config.optimize config.fusion config.user_var_fusion)
+				print_endline (Printf.sprintf "\nFUSION: %s\n\tvar %s<%i> = %s" (if b then "true" else "false") v.v_name v.v_id (s_expr_pretty e));
+				print_endline (Printf.sprintf "CONDITION:\n\tnum_uses:%i <= 1 && num_writes:%i = 0 && can_be_used_as_value:%b && (is_compiler_generated:%b || config.optimize:%b && config.fusion:%b && config.user_var_fusion:%b)"
+					num_uses num_writes can_be_used_as_value is_compiler_generated config.optimize config.fusion config.user_var_fusion)
 			end;
 			b
 		in
@@ -636,37 +714,78 @@ module Fusion = struct
 				let e1 = {e1 with eexpr = TVar(v1,Some e2)} in
 				state#dec_writes v1;
 				fuse (e1 :: acc) el
-			| ({eexpr = TVar(v1,None)} as e1) :: ({eexpr = TIf(eif,_,Some _)} as e2) :: el
-				when
-					can_be_used_as_value com e2 &&
-					not (ExtType.is_void e2.etype) &&
-					(match com.platform with
-						| Php when not (Common.is_php7 com) -> false
-						| Cpp when not (Common.defined com Define.Cppia) -> false
-						| _ -> true)
+			| ({eexpr = TIf(eif,ethen,Some eelse)} as e1) :: el when
+				can_be_used_as_value com e1 &&
+				not (ExtType.is_void e1.etype) &&
+				(match com.platform with
+					| Cpp when not (Common.defined com Define.Cppia) -> false
+					| _ -> true)
 				->
 				begin try
 					let i = ref 0 in
-					let check_assign e = match e.eexpr with
-						| TBinop(OpAssign,{eexpr = TLocal v2},e2) when v1 == v2 -> incr i; e2
+					let e' = ref None in
+					let check e1 f1 e2 = match !e' with
+						| None ->
+							e' := Some (e1,f1);
+							e2
+						| Some (e',_) ->
+							if Texpr.equal e' e1 then e2 else raise Exit
+					in
+					let check_assign e =
+						match e.eexpr with
+						| TBinop(OpAssign,e1,e2) -> incr i; check e1 (fun e' -> {e with eexpr = TBinop(OpAssign,e1,e')}) e2
 						| _ -> raise Exit
 					in
-					let e,_ = map_values ~allow_control_flow:false check_assign e2 in
-					let e1 = {e1 with eexpr = TVar(v1,Some e)} in
+					let e,_ = map_values check_assign e1 in
+					let e = match !e' with
+						| None -> assert false
+						| Some(e1,f) ->
+							begin match e1.eexpr with
+								| TLocal v -> state#change_writes v (- !i + 1)
+								| _ -> ()
+							end;
+							f e
+					in
 					state#changed;
-					state#change_writes v1 (- !i);
-					fuse (e1 :: acc) el
+					fuse (e :: acc) el
 				with Exit ->
-					fuse (e1 :: acc) (e2 :: el)
+					fuse (e1 :: acc) el
 				end
 			| {eexpr = TVar(v1,Some e1)} :: el when config.optimize && config.local_dce && state#get_reads v1 = 0 && state#get_writes v1 = 0 ->
 				fuse acc (e1 :: el)
+			| ({eexpr = TVar(v1,None)} as ev) :: el when not v1.v_capture ->
+				let found = ref false in
+				let rec replace deep e = match e.eexpr with
+					| TBinop(OpAssign,{eexpr = TLocal v2},e2) when v1 == v2 ->
+						if deep then raise Exit;
+						found := true;
+						{ev with eexpr = TVar(v1,Some e2)}
+					| TLocal v2 when v1 == v2 -> raise Exit
+					| _ -> Type.map_expr (replace true) e
+				in
+				begin try
+					let rec loop acc el = match el with
+						| e :: el ->
+							let e = replace false e in
+							if !found then (List.rev (e :: acc)) @ el
+							else loop (e :: acc) el
+						| [] ->
+							List.rev acc
+					in
+					let el = loop [] el in
+					if not !found then raise Exit;
+					state#changed;
+					state#dec_writes v1;
+					fuse acc el
+				with Exit ->
+					fuse (ev :: acc) el
+				end
 			| ({eexpr = TVar(v1,Some e1)} as ev) :: el when can_be_fused v1 e1 ->
 				let found = ref false in
 				let blocked = ref false in
 				let ir = InterferenceReport.from_texpr e1 in
-				if config.fusion_debug then print_endline (Printf.sprintf "\tInterferenceReport: %s\n\t%s"
-					 (InterferenceReport.to_string ir) (Type.s_expr_pretty true "\t" false (s_type (print_context())) (mk (TBlock el) t_dynamic null_pos)));
+				if config.fusion_debug then print_endline (Printf.sprintf "INTERFERENCE: %s\nINTO: %s"
+					 (InterferenceReport.to_string ir) (Type.s_expr_pretty true "" false (s_type (print_context())) (mk (TBlock el) t_dynamic null_pos)));
 				(* This function walks the AST in order of evaluation and tries to find an occurrence of v1. If successful, that occurrence is
 				   replaced with e1. If there's an interference "on the way" the replacement is canceled. *)
 				let rec replace e =
@@ -677,7 +796,7 @@ module Fusion = struct
 						blocked := old;
 						e
 					in
-					let handle_el el =
+					let handle_el' el =
 						(* This mess deals with the fact that the order of evaluation is undefined for call
 							arguments on these targets. Even if we find a replacement, we pretend that we
 							didn't in order to find possible interferences in later call arguments. *)
@@ -692,24 +811,15 @@ module Fusion = struct
 						found := !really_found;
 						el
 					in
-					let handle_el = if not (target_handles_side_effect_order com) then handle_el else List.map replace in
+					let handle_el = if not (target_handles_side_effect_order com) then handle_el' else List.map replace in
 					let handle_call e2 el = match com.platform with
 						| Neko ->
 							(* Neko has this reversed at the moment (issue #4787) *)
 							let el = List.map replace el in
 							let e2 = replace e2 in
 							e2,el
-						| Php | Cpp  when not (Common.defined com Define.Cppia) && not (Common.is_php7 com) ->
-							let is_php_safe e1 =
-								let rec loop e = match e.eexpr with
-									| TCall _ -> raise Exit
-									| TCast(e1,_) | TParenthesis e1 | TMeta(_,e1) -> loop e1
-									| _ -> ()
-								in
-								try loop e1; true with Exit -> false
-							in
-							(* PHP5 doesn't like call()() expressions. *)
-							let e2 = if com.platform = Php && not (is_php_safe e1) then explore e2 else replace e2 in
+						| Cpp ->
+							let e2 = replace e2 in
 							let el = handle_el el in
 							e2,el
 						| _ ->
@@ -740,12 +850,15 @@ module Fusion = struct
 							found := true;
 							if type_change_ok com v1.v_type e1.etype then e1 else mk (TCast(e1,None)) v1.v_type e.epos
 						| TLocal v ->
-							if has_var_write ir v || ((v.v_capture || is_ref_type v.v_type) && (has_state_write ir)) then raise Exit;
+							if has_var_write ir v || ((v.v_capture || ExtType.has_reference_semantics v.v_type) && (has_state_write ir)) then raise Exit;
 							e
 						| TBinop(OpAssign,({eexpr = TLocal v} as e1),e2) ->
 							let e2 = replace e2 in
 							if not !found && has_var_read ir v then raise Exit;
 							{e with eexpr = TBinop(OpAssign,e1,e2)}
+						(* Never fuse into write-positions (issue #7298) *)
+						| TBinop(OpAssignOp _,{eexpr = TLocal v2},_) | TUnop((Increment | Decrement),_,{eexpr = TLocal v2}) when v1 == v2 ->
+							raise Exit
 						| TBinop(OpAssignOp _ as op,({eexpr = TLocal v} as e1),e2) ->
 							let e2 = replace e2 in
 							if not !found && (has_var_read ir v || has_var_write ir v) then raise Exit;
@@ -772,8 +885,29 @@ module Fusion = struct
 						| TUnop((Increment | Decrement),_,{eexpr = TField(e1,fa)}) when has_field_read ir (field_name fa) || has_state_read ir
 							|| has_field_write ir (field_name fa) || has_state_write ir ->
 							raise Exit
+						(* array *)
+						| TArray(e1,e2) ->
+							let e1 = replace e1 in
+							let e2 = replace e2 in
+							if not !found && has_state_write ir then raise Exit;
+							{e with eexpr = TArray(e1,e2)}
+						| TBinop(OpAssign,({eexpr = TArray(e1,e2)} as ef),e3) ->
+							let e1 = replace e1 in
+							let e2 = replace e2 in
+							let e3 = replace e3 in
+							if not !found && (has_state_read ir) then raise Exit;
+							{e with eexpr = TBinop(OpAssign,{ef with eexpr = TArray(e1,e2)},e3)}
+						| TBinop(OpAssignOp _ as op,({eexpr = TArray(e1,e2)} as ef),e3) ->
+							let e1 = replace e1 in
+							let e2 = replace e2 in
+							if not !found && has_state_write ir then raise Exit;
+							let e3 = replace e3 in
+							if not !found && has_state_read ir then raise Exit;
+							{e with eexpr = TBinop(op,{ef with eexpr = TArray(e1,e2)},e3)}
+						| TUnop((Increment | Decrement),_,{eexpr = TArray _}) when has_state_read ir || has_state_write ir ->
+							raise Exit
 						(* state *)
-						| TCall({eexpr = TLocal v},el) when not (is_unbound_call_that_might_have_side_effects v el) ->
+						| TCall({eexpr = TIdent s},el) when not (is_unbound_call_that_might_have_side_effects s el) ->
 							e
 						| TNew(c,tl,el) when (match c.cl_constructor with Some cf when PurityState.is_pure c cf -> true | _ -> false) ->
 							let el = handle_el el in
@@ -792,37 +926,27 @@ module Fusion = struct
 							{e with eexpr = TCall(ef,el)}
 						| TCall(e1,el) ->
 							let e1,el = match e1.eexpr with
-								| TLocal v when is_really_unbound v -> e1,el
+								| TIdent s when s <> "`trace" && s <> "__int__" -> e1,el
 								| _ -> handle_call e1 el
 							in
 							if not !found && (((has_state_read ir || has_any_field_read ir)) || has_state_write ir || has_any_field_write ir) then raise Exit;
 							{e with eexpr = TCall(e1,el)}
 						| TObjectDecl fl ->
-							let el = handle_el (List.map snd fl) in
+							(* The C# generator has trouble with evaluation order in structures (#7531). *)
+							let el = (match com.platform with Cs -> handle_el' | _ -> handle_el) (List.map snd fl) in
 							if not !found && (has_state_write ir || has_any_field_write ir) then raise Exit;
 							{e with eexpr = TObjectDecl (List.map2 (fun (s,_) e -> s,e) fl el)}
 						| TArrayDecl el ->
 							let el = handle_el el in
 							(*if not !found && (has_state_write ir || has_any_field_write ir) then raise Exit;*)
 							{e with eexpr = TArrayDecl el}
-						| TBinop(OpAssign,({eexpr = TArray(e1,e2)} as ea),e3) ->
-							let e1 = replace e1 in
-							let e2 = replace e2 in
-							let e3 = replace e3 in
-							if not !found && has_state_read ir then raise Exit;
-							{e with eexpr = TBinop(OpAssign,{ea with eexpr = TArray(e1,e2)},e3)}
-						| TBinop(op,e1,e2) when (match com.platform with Cpp | Php when not (Common.is_php7 com) -> true | _ -> false) ->
+						| TBinop(op,e1,e2) when (match com.platform with Cpp -> true | _ -> false) ->
 							let e1 = replace e1 in
 							let temp_found = !found in
 							found := false;
 							let e2 = replace e2 in
 							found := !found || temp_found;
 							{e with eexpr = TBinop(op,e1,e2)}
-						| TArray(e1,e2) ->
-							let e1 = replace e1 in
-							let e2 = replace e2 in
-							if not !found && has_state_write ir then raise Exit;
-							{e with eexpr = TArray(e1,e2)}
 						| _ ->
 							Type.map_expr replace e
 				in
@@ -843,13 +967,37 @@ module Fusion = struct
 					fuse acc el
 				with Exit ->
 					if config.fusion_debug then print_endline (Printf.sprintf "NO: %s" (Printexc.get_backtrace()));
-					fuse (ev :: acc) el
+					begin match el with
+					| ({eexpr = TUnop((Increment | Decrement) as op,Prefix,{eexpr = TLocal v1})} as e2) :: el ->
+						let found = ref false in
+						let rec replace e = match e.eexpr with
+							| TLocal v2 when v1 == v2 ->
+								if !found then raise Exit;
+								found := true;
+								{e with eexpr = TUnop(op,Postfix,e)}
+							| TIf _ | TSwitch _ | TTry _ | TWhile _ | TFor _ ->
+								raise Exit
+							| _ ->
+								Type.map_expr replace e
+						in
+						begin try
+							let ev = replace ev in
+							if not !found then raise Exit;
+							state#changed;
+							fuse acc (ev :: el)
+						with Exit ->
+							fuse (ev :: acc) (e2 :: el)
+						end
+					| _ ->
+						fuse (ev :: acc) el
+					end
 				end
 			| {eexpr = TUnop((Increment | Decrement as op,Prefix,({eexpr = TLocal v} as ev)))} as e1 :: e2 :: el ->
 				begin try
 					let e2,f = match e2.eexpr with
 						| TReturn (Some e2) -> e2,(fun e -> {e2 with eexpr = TReturn (Some e)})
-						| TBinop(OpAssign,e21,e22) -> e22,(fun e -> {e2 with eexpr = TBinop(OpAssign,e21,e)})
+						(* This is not sound if e21 contains the variable (issue #7704) *)
+						(* | TBinop(OpAssign,e21,e22) -> e22,(fun e -> {e2 with eexpr = TBinop(OpAssign,e21,e)}) *)
 						| TVar(v,Some e2) -> e2,(fun e -> {e2 with eexpr = TVar(v,Some e)})
 						| _ -> raise Exit
 					in
@@ -877,7 +1025,7 @@ module Fusion = struct
 				with Exit ->
 					fuse (e1 :: acc) (e2 :: el)
 				end
-			| {eexpr = TBinop(OpAssign,e1,{eexpr = TBinop(op,e2,e3)})} as e :: el when use_assign_op com op e1 e2 ->
+			| {eexpr = TBinop(OpAssign,e1,{eexpr = TBinop(op,e2,e3)})} as e :: el when use_assign_op com op e1 e2 e3 ->
 				let rec loop e = match e.eexpr with
 					| TLocal v -> state#dec_reads v;
 					| _ -> Type.iter loop e
@@ -908,7 +1056,7 @@ module Fusion = struct
 				in
 				let el = fuse_loop el in
 				{e with eexpr = TBlock el}
-			| TCall({eexpr = TLocal v},_) when is_really_unbound v ->
+			| TCall({eexpr = TIdent s},_) when is_really_unbound s ->
 				e
 			| _ ->
 				Type.map_expr loop e
@@ -917,6 +1065,8 @@ module Fusion = struct
 end
 
 module Cleanup = struct
+	open TexprKindMapper
+
 	let apply com e =
 		let if_or_op e e1 e2 e3 = match (Texpr.skip e1).eexpr,(Texpr.skip e3).eexpr with
 			| TUnop(Not,Prefix,e1),TConst (TBool true) -> optimize_binop {e with eexpr = TBinop(OpBoolOr,e1,e2)} OpBoolOr e1 e2
@@ -938,7 +1088,7 @@ module Cleanup = struct
 				if_or_op e e1 e2 e3;
 			| TUnop((Increment | Decrement),_,e1) when (match (Texpr.skip e1).eexpr with TConst _ -> true | _ -> false) ->
 				loop e1
-			| TCall({eexpr = TLocal v},_) when is_really_unbound v ->
+			| TCall({eexpr = TIdent s},_) when is_really_unbound s ->
 				e
 			| TBlock el ->
 				let el = List.map (fun e ->
@@ -977,12 +1127,21 @@ module Cleanup = struct
 			| TField({eexpr = TTypeExpr _},_) ->
 				e
 			| TTypeExpr (TClassDecl c) ->
-				List.iter (fun cf -> if not (Meta.has Meta.MaybeUsed cf.cf_meta) then cf.cf_meta <- (Meta.MaybeUsed,[],cf.cf_pos) :: cf.cf_meta;) c.cl_ordered_statics;
 				e
+			| TMeta((Meta.Ast,_,_),e1) when (match e1.eexpr with TSwitch _ -> false | _ -> true) ->
+				loop e1
 			| _ ->
 				Type.map_expr loop e
 		in
-		loop e
+		let e = loop e in
+		let rec loop kind e = match kind,e.eexpr with
+			| KEqNull,TField(e1,FClosure(Some(c,tl),cf)) ->
+				let e1 = loop KAccess e1 in
+				{e with eexpr = TField(e1,FInstance(c,tl,cf))}
+			| _ ->
+				TexprKindMapper.map kind loop e
+		in
+		TexprKindMapper.map KRead loop e
 end
 
 module Purity = struct
@@ -1049,7 +1208,7 @@ module Purity = struct
 		let rec check_write e1 =
 			begin match e1.eexpr with
 				| TLocal v ->
-					if is_ref_type v.v_type then taint_raise node; (* Writing to a ref type means impurity. *)
+					if ExtType.has_reference_semantics v.v_type then taint_raise node; (* Writing to a ref type means impurity. *)
 					() (* Writing to locals does not violate purity. *)
 				| TField({eexpr = TConst TThis},_) when is_ctor ->
 					() (* A constructor can write to its own fields without violating purity. *)
@@ -1083,7 +1242,7 @@ module Purity = struct
 					| _ ->
 						taint_raise node (* Can that even happen? *)
 				end
-			| TCall({eexpr = TLocal v},el) when not (is_unbound_call_that_might_have_side_effects v el) ->
+			| TCall({eexpr = TIdent s},el) when not (is_unbound_call_that_might_have_side_effects s el) ->
 				List.iter loop el;
 			| TCall _ ->
 				taint_raise node
@@ -1098,7 +1257,7 @@ module Purity = struct
 				| None ->
 					if not (is_pure c cf) then taint node
 				(* TODO: The function code check shouldn't be here I guess. *)
-				| Some _ when (Meta.has Meta.Extern cf.cf_meta || Meta.has Meta.FunctionCode cf.cf_meta || Meta.has (Meta.Custom ":hlNative") cf.cf_meta || Meta.has (Meta.Custom ":hlNative") c.cl_meta) ->
+				| Some _ when (has_class_field_flag cf CfExtern || Meta.has Meta.FunctionCode cf.cf_meta || Meta.has (Meta.HlNative) cf.cf_meta || Meta.has (Meta.HlNative) c.cl_meta) ->
 					if not (is_pure c cf) then taint node
 				| Some e ->
 					try
diff --git a/src/optimization/analyzerTexprTransformer.ml b/src/optimization/analyzerTexprTransformer.ml
index a1e381044902ae61fca41b10a42a3a4dc16771b9..b8a67f048b5210f914fdd2304d1422e795831353 100644
--- a/src/optimization/analyzerTexprTransformer.ml
+++ b/src/optimization/analyzerTexprTransformer.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -81,12 +81,12 @@ let rec func ctx bb tf t p =
 		close_node g bb;
 		g.g_unreachable
 	in
-	let check_unbound_call v el =
-		if v.v_name = "$ref" then begin match el with
+	let check_unbound_call s el =
+		if s = "$ref" then begin match el with
 			| [{eexpr = TLocal v}] -> v.v_capture <- true
 			| _ -> ()
 		end;
-		if is_unbound_call_that_might_have_side_effects v el then ctx.has_unbound <- true;
+		if is_unbound_call_that_might_have_side_effects s el then ctx.has_unbound <- true;
 	in
 	let no_void t p =
 		if ExtType.is_void (follow t) then Error.error "Cannot use Void as value" p
@@ -96,7 +96,7 @@ let rec func ctx bb tf t p =
 		(fun () -> ctx.name_stack <- List.tl ctx.name_stack)
 	in
 	let rec value' bb e = match e.eexpr with
-		| TLocal v ->
+		| TLocal _ | TIdent _ ->
 			bb,e
 		| TBinop(OpAssign,({eexpr = TLocal v} as e1),e2) ->
 			block_element bb e,e1
@@ -104,8 +104,8 @@ let rec func ctx bb tf t p =
 			value bb e1
 		| TBlock _ | TIf _ | TSwitch _ | TTry _ ->
 			bind_to_temp bb false e
-		| TCall({eexpr = TLocal v},el) when is_really_unbound v ->
-			check_unbound_call v el;
+		| TCall({eexpr = TIdent s},el) when is_really_unbound s ->
+			check_unbound_call s el;
 			bb,e
 		| TCall(e1,el) ->
 			call bb e e1 el
@@ -159,6 +159,9 @@ let rec func ctx bb tf t p =
 		| TEnumParameter(e1,ef,ei) ->
 			let bb,e1 = value bb e1 in
 			bb,{e with eexpr = TEnumParameter(e1,ef,ei)}
+		| TEnumIndex e1 ->
+			let bb,e1 = value bb e1 in
+			bb,{e with eexpr = TEnumIndex e1}
 		| TFunction tf ->
 			let bb_func,bb_func_end = func ctx bb tf e.etype e.epos in
 			let e_fun = mk (TConst (TString "fun")) t_dynamic p in
@@ -170,8 +173,6 @@ let rec func ctx bb tf t p =
 			close_node g bb;
 			add_cfg_edge bb_func_end bb_next CFGGoto;
 			bb_next,ec
-		(*| TTypeExpr(TClassDecl {cl_kind = KAbstractImpl a}) when not (Meta.has Meta.RuntimeValue a.a_meta) ->
-			error "Cannot use abstract as value" e.epos*)
 		| TConst _ | TTypeExpr _ ->
 			bb,e
 		| TThrow _ | TReturn _ | TBreak | TContinue ->
@@ -236,11 +237,7 @@ let rec func ctx bb tf t p =
 				| s :: _ -> s
 				| [] -> ctx.temp_var_name
 		in
-		let v = match v with Some v -> v | None -> alloc_var (loop e) e.etype e.epos in
-		begin match ctx.com.platform with
-			| Globals.Cpp when sequential && not (Common.defined ctx.com Define.Cppia) -> ()
-			| _ -> v.v_meta <- [Meta.CompilerGenerated,[],e.epos];
-		end;
+		let v = match v with Some v -> v | None -> alloc_var VGenerated (loop e) e.etype e.epos in
 		let bb = declare_var_and_assign bb v e e.epos in
 		let e = {e with eexpr = TLocal v} in
 		let e = List.fold_left (fun e f -> f e) e fl in
@@ -306,12 +303,12 @@ let rec func ctx bb tf t p =
 	and call bb e e1 el =
 		let bb = ref bb in
 		let check e t = match e.eexpr with
-			| TLocal v when is_ref_type t ->
+			| TLocal v when ExtType.has_reference_semantics t ->
 				v.v_capture <- true;
 				e
 			| _ ->
-				if is_asvar_type t then begin
-					let v = alloc_var "tmp" t e.epos in
+				if ExtType.has_variable_semantics t then begin
+					let v = alloc_var VGenerated "tmp" t e.epos in
 					let bb',e = bind_to_temp ~v:(Some v) !bb false e in
 					bb := bb';
 					e
@@ -385,39 +382,47 @@ let rec func ctx bb tf t p =
 			end
 		| TIf(e1,e2,None) ->
 			let bb,e1 = bind_to_temp bb false e1 in
-			let bb_then = create_node BKConditional e2.etype e2.epos in
-			add_texpr bb (wrap_meta ":cond-branch" e1);
-			add_cfg_edge bb bb_then (CFGCondBranch (mk (TConst (TBool true)) ctx.com.basic.tbool e2.epos));
-			let bb_then_next = block bb_then e2 in
-			let bb_next = create_node BKNormal bb.bb_type bb.bb_pos in
-			set_syntax_edge bb (SEIfThen(bb_then,bb_next,e.epos));
-			add_cfg_edge bb bb_next CFGCondElse;
-			close_node g bb;
-			add_cfg_edge bb_then_next bb_next CFGGoto;
-			close_node g bb_then_next;
-			bb_next
-		| TIf(e1,e2,Some e3) ->
-			let bb,e1 = bind_to_temp bb false e1 in
-			let bb_then = create_node BKConditional e2.etype e2.epos in
-			let bb_else = create_node BKConditional e3.etype e3.epos in
-			add_texpr bb (wrap_meta ":cond-branch" e1);
-			add_cfg_edge bb bb_then (CFGCondBranch (mk (TConst (TBool true)) ctx.com.basic.tbool e2.epos));
-			add_cfg_edge bb bb_else CFGCondElse;
-			close_node g bb;
-			let bb_then_next = block bb_then e2 in
-			let bb_else_next = block bb_else e3 in
-			if bb_then_next == g.g_unreachable && bb_else_next == g.g_unreachable then begin
-				set_syntax_edge bb (SEIfThenElse(bb_then,bb_else,g.g_unreachable,e.etype,e.epos));
-				g.g_unreachable
-			end else begin
+			if bb == g.g_unreachable then
+				bb
+			else begin
+				let bb_then = create_node BKConditional e2.etype e2.epos in
+				add_texpr bb (wrap_meta ":cond-branch" e1);
+				add_cfg_edge bb bb_then (CFGCondBranch (mk (TConst (TBool true)) ctx.com.basic.tbool e2.epos));
+				let bb_then_next = block bb_then e2 in
 				let bb_next = create_node BKNormal bb.bb_type bb.bb_pos in
-				set_syntax_edge bb (SEIfThenElse(bb_then,bb_else,bb_next,e.etype,e.epos));
+				set_syntax_edge bb (SEIfThen(bb_then,bb_next,e.epos));
+				add_cfg_edge bb bb_next CFGCondElse;
+				close_node g bb;
 				add_cfg_edge bb_then_next bb_next CFGGoto;
-				add_cfg_edge bb_else_next bb_next CFGGoto;
 				close_node g bb_then_next;
-				close_node g bb_else_next;
 				bb_next
 			end
+		| TIf(e1,e2,Some e3) ->
+			let bb,e1 = bind_to_temp bb false e1 in
+			if bb == g.g_unreachable then
+				bb
+			else begin
+				let bb_then = create_node BKConditional e2.etype e2.epos in
+				let bb_else = create_node BKConditional e3.etype e3.epos in
+				add_texpr bb (wrap_meta ":cond-branch" e1);
+				add_cfg_edge bb bb_then (CFGCondBranch (mk (TConst (TBool true)) ctx.com.basic.tbool e2.epos));
+				add_cfg_edge bb bb_else CFGCondElse;
+				close_node g bb;
+				let bb_then_next = block bb_then e2 in
+				let bb_else_next = block bb_else e3 in
+				if bb_then_next == g.g_unreachable && bb_else_next == g.g_unreachable then begin
+					set_syntax_edge bb (SEIfThenElse(bb_then,bb_else,g.g_unreachable,e.etype,e.epos));
+					g.g_unreachable
+				end else begin
+					let bb_next = create_node BKNormal bb.bb_type bb.bb_pos in
+					set_syntax_edge bb (SEIfThenElse(bb_then,bb_else,bb_next,e.etype,e.epos));
+					add_cfg_edge bb_then_next bb_next CFGGoto;
+					add_cfg_edge bb_else_next bb_next CFGGoto;
+					close_node g bb_then_next;
+					close_node g bb_else_next;
+					bb_next
+				end
+			end
 		| TSwitch(e1,cases,edef) ->
 			let is_exhaustive = edef <> None || is_exhaustive e1 in
 			let bb,e1 = bind_to_temp bb false e1 in
@@ -510,8 +515,8 @@ let rec func ctx bb tf t p =
 			set_syntax_edge bb (SETry(bb_try,bb_exc,catches,bb_next,e.epos));
 			if bb_try_next != g.g_unreachable then add_cfg_edge bb_try_next bb_next CFGGoto;
 			close_node g bb_try_next;
-            close_node g bb_exc;
-            close_node g bb;
+			close_node g bb_exc;
+			close_node g bb;
 			bb_next
 		(* control flow *)
 		| TReturn None ->
@@ -553,8 +558,8 @@ let rec func ctx bb tf t p =
 				add_terminator bb {e with eexpr = TThrow e1};
 			end
 		(* side_effects *)
-		| TCall({eexpr = TLocal v},el) when is_really_unbound v ->
-			check_unbound_call v el;
+		| TCall({eexpr = TIdent s},el) when is_really_unbound s ->
+			check_unbound_call s el;
 			add_texpr bb e;
 			bb
 		| TCall(e1,el) ->
@@ -566,7 +571,7 @@ let rec func ctx bb tf t p =
 			add_texpr bb {e with eexpr = TNew(c,tl,el)};
 			bb
 		| TCast(e1,Some mt) ->
-			let b,e1 = value bb e1 in
+			let bb,e1 = value bb e1 in
 			add_texpr bb {e with eexpr = TCast(e1,Some mt)};
 			bb
 		| TBinop(OpAssignOp op,({eexpr = TArray(e1,e2)} as ea),e3) ->
@@ -594,8 +599,12 @@ let rec func ctx bb tf t p =
 		| TLocal _ when not ctx.config.AnalyzerConfig.local_dce ->
 			add_texpr bb e;
 			bb
+		| TField (e1,fa) when has_side_effect e ->
+			let bb,e1 = value bb e1 in
+			add_texpr bb {e with eexpr = TField(e1,fa)};
+			bb
 		(* no-side-effect *)
-		| TEnumParameter _ | TFunction _ | TConst _ | TTypeExpr _ | TLocal _ ->
+		| TEnumParameter _ | TEnumIndex _ | TFunction _ | TConst _ | TTypeExpr _ | TLocal _ | TIdent _ ->
 			bb
 		(* no-side-effect composites *)
 		| TParenthesis e1 | TMeta(_,e1) | TCast(e1,None) | TField(e1,_) | TUnop(_,_,e1) ->
@@ -654,8 +663,7 @@ let from_tfunction ctx tf t p =
 	let bb_func,bb_exit = func ctx g.g_root tf t p in
 	ctx.entry <- bb_func;
 	close_node g g.g_root;
-	g.g_exit <- bb_exit;
-	set_syntax_edge bb_exit SEEnd
+	g.g_exit <- bb_exit
 
 let rec block_to_texpr_el ctx bb =
 	if bb.bb_dominator == ctx.graph.g_unreachable then
@@ -669,7 +677,7 @@ let rec block_to_texpr_el ctx bb =
 				Some bb_next,(block bb_sub) :: el
 			| el,SEMerge bb_next ->
 				Some bb_next,el
-			| el,(SEEnd | SENone) ->
+			| el,SENone ->
 				None,el
 			| {eexpr = TWhile(e1,_,flag)} as e :: el,(SEWhile(_,bb_body,bb_next)) ->
 				let e2 = block bb_body in
@@ -706,13 +714,13 @@ and func ctx i =
 	let bb,t,p,tf = Hashtbl.find ctx.graph.g_functions i in
 	let e = block_to_texpr ctx bb in
 	let rec loop e = match e.eexpr with
-		| TLocal v when not (is_unbound v) ->
+		| TLocal v ->
 			{e with eexpr = TLocal (get_var_origin ctx.graph v)}
-		| TVar(v,eo) when not (is_unbound v) ->
+		| TVar(v,eo) ->
 			let eo = Option.map loop eo in
 			let v' = get_var_origin ctx.graph v in
 			{e with eexpr = TVar(v',eo)}
-		| TBinop(OpAssign,e1,({eexpr = TBinop(op,e2,e3)} as e4)) when target_handles_assign_ops ctx.com ->
+		| TBinop(OpAssign,e1,({eexpr = TBinop(op,e2,e3)} as e4)) when target_handles_assign_ops ctx.com e3 ->
 			let e1 = loop e1 in
 			let e2 = loop e2 in
 			let e3 = loop e3 in
@@ -720,15 +728,20 @@ and func ctx i =
 				| OpAdd | OpMult | OpDiv | OpSub | OpAnd
 				| OpOr | OpXor | OpShl | OpShr | OpUShr | OpMod ->
 					true
-				| OpAssignOp _ | OpInterval | OpArrow | OpAssign | OpEq
+				| OpAssignOp _ | OpInterval | OpArrow | OpIn | OpAssign | OpEq
 				| OpNotEq | OpGt | OpGte | OpLt | OpLte | OpBoolAnd | OpBoolOr ->
 					false
 			in
 			begin match e1.eexpr,e2.eexpr with
 				| TLocal v1,TLocal v2 when v1 == v2 && not v1.v_capture && is_valid_assign_op op ->
 					begin match op,e3.eexpr with
-						| OpAdd,TConst (TInt i32) when Int32.to_int i32 = 1 && target_handles_assign_ops ctx.com -> {e with eexpr = TUnop(Increment,Prefix,e1)}
-						| OpSub,TConst (TInt i32) when Int32.to_int i32 = 1 && target_handles_assign_ops ctx.com -> {e with eexpr = TUnop(Decrement,Prefix,e1)}
+						| (OpAdd|OpSub) as op,TConst (TInt i32) when Int32.to_int i32 = 1 && ExtType.is_numeric (Abstract.follow_with_abstracts v1.v_type) ->
+							let op = match op with
+								| OpAdd -> Increment
+								| OpSub -> Decrement
+								| _ -> assert false
+							in
+							{e with eexpr = TUnop(op,Prefix,e1)}
 						| _ -> {e with eexpr = TBinop(OpAssignOp op,e1,e3)}
 					end
 				| _ ->
@@ -736,7 +749,7 @@ and func ctx i =
 			end
 		| TCall({eexpr = TConst (TString "fun")},[{eexpr = TConst (TInt i32)}]) ->
 			func ctx (Int32.to_int i32)
-		| TCall({eexpr = TLocal v},_) when is_really_unbound v ->
+		| TCall({eexpr = TIdent s},_) when is_really_unbound s ->
 			e
 		| _ ->
 			Type.map_expr loop e
diff --git a/src/optimization/analyzerTypes.ml b/src/optimization/analyzerTypes.ml
index e3cb2153b85c8e79fd15a683298097b15b83c435..7028e59f74dc8f694830411ecb810ef77725a0ba 100644
--- a/src/optimization/analyzerTypes.ml
+++ b/src/optimization/analyzerTypes.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -70,7 +70,6 @@ module BasicBlock = struct
 		| SEWhile of t * t * t                                   (* `while` with "head", "body" and "next" *)
 		| SESubBlock of t * t                                    (* "sub" with "next" *)
 		| SEMerge of t                                           (* Merge to same block *)
-		| SEEnd                                                  (* End of syntax *)
 		| SENone                                                 (* No syntax exit *)
 
 	and t = {
@@ -458,10 +457,10 @@ module Graph = struct
 					()
 			end;
 			DynArray.iter (fun e -> match e.eexpr with
-				| TVar(v,eo) when not (is_unbound v) ->
+				| TVar(v,eo) ->
 					declare_var g v bb;
 					if eo <> None then add_var_def g bb v;
-				| TBinop(OpAssign,{eexpr = TLocal v},_) when not (is_unbound v) ->
+				| TBinop(OpAssign,{eexpr = TLocal v},_) ->
 					add_var_def g bb v
 				| _ ->
 					()
@@ -506,7 +505,7 @@ module Graph = struct
 					loop scopes bb_next
 				| SEMerge bb ->
 					loop scopes bb
-				| SEEnd | SENone ->
+				| SENone ->
 					()
 			end
 		in
@@ -524,4 +523,4 @@ type analyzer_context = {
 	mutable loop_stack : int list;
 	mutable debug_exprs : (string * texpr) list;
 	mutable name_stack : string list;
-}
\ No newline at end of file
+}
diff --git a/src/optimization/dce.ml b/src/optimization/dce.ml
index 00bdec8a9e50c8c794cab44e6f93e97001ac2762..d1d8374dfdb67b674f93ff6d7d387c28c0d8a72b 100644
--- a/src/optimization/dce.ml
+++ b/src/optimization/dce.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -22,6 +22,11 @@ open Common
 open Type
 open Globals
 
+type dce_mode =
+	| DceNo
+	| DceStd
+	| DceFull
+
 type dce = {
 	com : context;
 	full : bool;
@@ -38,6 +43,13 @@ type dce = {
 	mutable features : (string,(tclass * tclass_field * bool) list) Hashtbl.t;
 }
 
+let push_class dce c =
+	let old = dce.curclass in
+	dce.curclass <- c;
+	(fun () ->
+		dce.curclass <- old
+	)
+
 (* checking *)
 
 (* check for @:keepSub metadata, which forces @:keep on child classes *)
@@ -46,17 +58,35 @@ let rec super_forces_keep c =
 	| Some (csup,_) -> super_forces_keep csup
 	| _ -> false
 
+let overrides_extern_field cf c =
+	let is_extern c cf = c.cl_extern && cf.cf_expr = None in
+	let rec loop c cf =
+		match c.cl_super with
+		| None -> false
+		| Some (c,_) ->
+			try
+				let cf = PMap.find cf.cf_name c.cl_fields in
+				if is_extern c cf then
+					true
+				else
+					loop c cf
+			with Not_found ->
+				false
+	in
+	loop c cf
+
 let is_std_file dce file =
 	List.exists (ExtString.String.starts_with file) dce.std_dirs
 
+let keep_metas = [Meta.Keep;Meta.Expose]
+
 (* check if a class is kept entirely *)
 let keep_whole_class dce c =
-	Meta.has Meta.Keep c.cl_meta
+	Meta.has_one_of keep_metas c.cl_meta
 	|| not (dce.full || is_std_file dce c.cl_module.m_extra.m_file || has_meta Meta.Dce c.cl_meta)
 	|| super_forces_keep c
 	|| (match c with
 		| { cl_path = ([],("Math"|"Array"))} when dce.com.platform = Js -> false
-		| { cl_path = ([],("Math"|"Array"|"String"))} when dce.com.platform = Lua -> false
 		| { cl_extern = true }
 		| { cl_path = ["flash";"_Boot"],"RealBoot" } -> true
 		| { cl_path = [],"String" }
@@ -64,7 +94,7 @@ let keep_whole_class dce c =
 		| _ -> false)
 
 let keep_whole_enum dce en =
-	Meta.has Meta.Keep en.e_meta
+	Meta.has_one_of keep_metas en.e_meta
 	|| not (dce.full || is_std_file dce en.e_module.m_extra.m_file || has_meta Meta.Dce en.e_meta)
 
 (*
@@ -72,17 +102,30 @@ let keep_whole_enum dce en =
 	`keep_field` is checked to determine the DCE entry points, i.e. all fields that have `@:keep` or kept for other reasons.
 	And then it is used at the end to check which fields can be filtered from their classes.
 *)
-let rec keep_field dce cf c =
-	Meta.has Meta.Keep cf.cf_meta
-	|| Meta.has Meta.Used cf.cf_meta
+let rec keep_field dce cf c is_static =
+	Meta.has_one_of (Meta.Used :: keep_metas) cf.cf_meta
 	|| cf.cf_name = "__init__"
-	|| is_extern_field cf
+	|| not (is_physical_field cf)
+	|| (not is_static && overrides_extern_field cf c)
 	|| (
 		cf.cf_name = "new"
 		&& match c.cl_super with (* parent class kept constructor *)
-			| Some ({ cl_constructor = Some ctor } as csup, _) -> keep_field dce ctor csup
+			| Some ({ cl_constructor = Some ctor } as csup, _) -> keep_field dce ctor csup false
 			| _ -> false
 	)
+	|| begin
+		let check_accessor prefix =
+			try
+				let fields = if is_static then c.cl_statics else c.cl_fields in
+				let accessor = PMap.find (prefix ^ cf.cf_name) fields in
+				keep_field dce accessor c is_static
+			with Not_found -> false
+		in
+		match cf.cf_kind with
+		| Var { v_read = AccCall } -> check_accessor "get_"
+		| Var { v_write = AccCall } -> check_accessor "set_"
+		| _ -> false
+	end
 
 (* marking *)
 
@@ -98,6 +141,7 @@ let rec check_feature dce s =
 
 and check_and_add_feature dce s =
 	check_feature dce s;
+	assert (dce.curclass != null_class);
 	Hashtbl.replace dce.curclass.cl_module.m_extra.m_features s true
 
 (* mark a field as kept *)
@@ -135,6 +179,7 @@ and mark_field dce c cf stat =
 	end
 
 let rec update_marked_class_fields dce c =
+	let pop = push_class dce c in
 	(* mark all :?used fields as surely :used now *)
 	List.iter (fun cf ->
 		if Meta.has Meta.MaybeUsed cf.cf_meta then mark_field dce c cf true
@@ -145,7 +190,8 @@ let rec update_marked_class_fields dce c =
 	(* we always have to keep super classes and implemented interfaces *)
 	(match c.cl_init with None -> () | Some init -> dce.follow_expr dce init);
 	List.iter (fun (c,_) -> mark_class dce c) c.cl_implements;
-	(match c.cl_super with None -> () | Some (csup,pl) -> mark_class dce csup)
+	(match c.cl_super with None -> () | Some (csup,pl) -> mark_class dce csup);
+	pop()
 
 (* mark a class as kept. If the class has fields marked as @:?keep, make sure to keep them *)
 and mark_class dce c = if not (Meta.has Meta.Used c.cl_meta) then begin
@@ -156,11 +202,7 @@ end
 
 let rec mark_enum dce e = if not (Meta.has Meta.Used e.e_meta) then begin
 	e.e_meta <- (Meta.Used,[],e.e_pos) :: e.e_meta;
-
-	(* do not generate has_enum feature for @:fakeEnum enums since they are not really enums *)
-	if not (Meta.has Meta.FakeEnum e.e_meta) then
-		check_and_add_feature dce "has_enum";
-
+	check_and_add_feature dce "has_enum";
 	check_feature dce (Printf.sprintf "%s.*" (s_type_path e.e_path));
 	PMap.iter (fun _ ef -> mark_t dce ef.ef_pos ef.ef_type) e.e_constrs;
 end
@@ -192,7 +234,7 @@ and mark_t dce p t =
 			List.iter (mark_t dce p) pl
 		| TAbstract(a,pl) when Meta.has Meta.MultiType a.a_meta ->
 			begin try
-				mark_t dce p (snd (Typecore.AbstractCast.find_multitype_specialization dce.com a pl p))
+				mark_t dce p (snd (AbstractCast.find_multitype_specialization dce.com a pl p))
 			with Error.Error _ ->
 				()
 			end
@@ -237,7 +279,7 @@ let rec mark_dependent_fields dce csup n stat =
 	in
 	let rec loop_inheritance c =
 		loop c;
-		Hashtbl.iter (fun _ d -> loop_inheritance d) c.cl_descendants;
+		List.iter (fun d -> loop_inheritance d) c.cl_descendants;
 	in
 	loop_inheritance csup
 
@@ -263,7 +305,7 @@ let rec to_string dce t = match t with
 		| Some t -> to_string dce t
 		| _ -> ())
 	| TLazy f ->
-		to_string dce (!f())
+		to_string dce (lazy_type f)
 	| TDynamic t ->
 		if t == t_dynamic then
 			()
@@ -307,41 +349,42 @@ and field dce c n stat =
 	with Not_found ->
 		if dce.debug then prerr_endline ("[DCE] Field " ^ n ^ " not found on " ^ (s_type_path c.cl_path)) else ())
 
-and mark_directly_used_class c =
-	if not (Meta.has Meta.DirectlyUsed c.cl_meta) then
+and mark_directly_used_class dce c =
+	(* don't add @:directlyUsed if it's used within the class itself. this can happen with extern inline methods *)
+	if c != dce.curclass && not (Meta.has Meta.DirectlyUsed c.cl_meta) then
 		c.cl_meta <- (Meta.DirectlyUsed,[],c.cl_pos) :: c.cl_meta
 
 and mark_directly_used_enum e =
 	if not (Meta.has Meta.DirectlyUsed e.e_meta) then
 		e.e_meta <- (Meta.DirectlyUsed,[],e.e_pos) :: e.e_meta
 
-and mark_directly_used_mt mt =
+and mark_directly_used_mt dce mt =
 	match mt with
 	| TClassDecl c ->
-		mark_directly_used_class c
+		mark_directly_used_class dce c
 	| TEnumDecl e ->
 		mark_directly_used_enum e
 	| _ ->
 		()
 
-and mark_directly_used_t com p t =
+and mark_directly_used_t dce p t =
 	match follow t with
 	| TInst({cl_kind = KNormal} as c,pl) ->
-		mark_directly_used_class c;
-		List.iter (mark_directly_used_t com p) pl
+		mark_directly_used_class dce c;
+		List.iter (mark_directly_used_t dce p) pl
 	| TEnum(e,pl) ->
 		mark_directly_used_enum e;
-		List.iter (mark_directly_used_t com p) pl
+		List.iter (mark_directly_used_t dce p) pl
 	| TAbstract(a,pl) when Meta.has Meta.MultiType a.a_meta ->
 		begin try (* this is copy-pasted from mark_t *)
-			mark_directly_used_t com p (snd (Typecore.AbstractCast.find_multitype_specialization com a pl p))
+			mark_directly_used_t dce p (snd (AbstractCast.find_multitype_specialization dce.com a pl p))
 		with Error.Error _ ->
 			()
 		end
 	| TAbstract(a,pl) ->
-		List.iter (mark_directly_used_t com p) pl;
+		List.iter (mark_directly_used_t dce p) pl;
 		if not (Meta.has Meta.CoreType a.a_meta) then
-			mark_directly_used_t com p (Abstract.get_underlying_type a pl)
+			mark_directly_used_t dce p (Abstract.get_underlying_type a pl)
 	| _ ->
 		()
 
@@ -395,11 +438,12 @@ and expr_field dce e fa is_call_expr =
 				check_and_add_feature dce "dynamic_read";
 				check_and_add_feature dce ("dynamic_read." ^ n);
 			| _ -> ());
-			begin match follow e.etype with
-				| TInst(c,_) ->
+			begin match follow e.etype, fa with
+				| TInst(c,_), _
+				| _, FClosure (Some (c, _), _) ->
 					mark_class dce c;
 					field dce c n false;
-				| TAnon a ->
+				| TAnon a, _ ->
 					(match !(a.a_status) with
 					| Statics c ->
 						mark_class dce c;
@@ -448,7 +492,7 @@ and expr dce e =
 	match e.eexpr with
 	| TNew(c,pl,el) ->
 		mark_class dce c;
-		mark_directly_used_class c;
+		mark_directly_used_class dce c;
 		field dce c "new" false;
 		List.iter (expr dce) el;
 		List.iter (mark_t dce e.epos) pl;
@@ -458,33 +502,39 @@ and expr dce e =
 	| TCast(e, Some mt) ->
 		check_feature dce "typed_cast";
 		mark_mt dce mt;
-		mark_directly_used_mt mt;
+		mark_directly_used_mt dce mt;
 		expr dce e;
 	| TObjectDecl(vl) ->
 		check_and_add_feature dce "has_anon";
 		List.iter (fun (_,e) -> expr dce e) vl;
 	| TTypeExpr mt ->
 		mark_mt dce mt;
-		mark_directly_used_mt mt;
+		mark_directly_used_mt dce mt;
 	| TTry(e, vl) ->
 		expr dce e;
 		List.iter (fun (v,e) ->
 			if v.v_type != t_dynamic then begin
 				check_feature dce "typed_catch";
-				mark_directly_used_t dce.com v.v_pos v.v_type;
+				mark_directly_used_t dce v.v_pos v.v_type;
 			end;
 			expr dce e;
 			mark_t dce e.epos v.v_type;
 		) vl;
-	| TCall ({eexpr = TLocal ({v_name = "`trace"})},[p;{ eexpr = TObjectDecl(v)}]) ->
+	| TCall ({eexpr = TIdent "`trace"},[p;{ eexpr = TObjectDecl(v)}]) ->
 		check_and_add_feature dce "has_anon_trace";
 		List.iter (fun (_,e) -> expr dce e) v;
 		expr dce p;
-	| TCall ({eexpr = TLocal ({v_name = "__define_feature__"})},[{eexpr = TConst (TString ft)};e]) ->
+	| TCall ({eexpr = TIdent "__define_feature__"},[{eexpr = TConst (TString ft)};e]) ->
 		Hashtbl.replace dce.curclass.cl_module.m_extra.m_features ft true;
 		check_feature dce ft;
 		expr dce e;
 
+	(* keep toString method of T when array<T>.join() is called *)
+	| TCall ({eexpr = TField(_, FInstance({cl_path = ([],"Array")}, pl, {cf_name="join"}))} as ef, args) ->
+		List.iter (fun e -> to_string dce e) pl;
+		expr dce ef;
+		List.iter (expr dce) args;
+
 	(* keep toString method when the class is argument to Std.string or haxe.Log.trace *)
 	| TCall ({eexpr = TField({eexpr = TTypeExpr (TClassDecl ({cl_path = (["haxe"],"Log")} as c))},FStatic (_,{cf_name="trace"}))} as ef, ((e2 :: el) as args))
 	| TCall ({eexpr = TField({eexpr = TTypeExpr (TClassDecl ({cl_path = ([],"Std")} as c))},FStatic (_,{cf_name="string"}))} as ef, ((e2 :: el) as args)) ->
@@ -493,7 +543,7 @@ and expr dce e =
 		begin match el with
 			| [{eexpr = TObjectDecl fl}] ->
 				begin try
-					begin match List.assoc "customParams" fl with
+					begin match Expr.field_assoc "customParams" fl with
 						| {eexpr = TArrayDecl el} ->
 							List.iter (fun e -> to_string dce e.etype) el
 						| _ ->
@@ -514,7 +564,7 @@ and expr dce e =
 		check_and_add_feature dce "array_write";
 		check_and_add_feature dce "array_read";
 		expr dce e1;
-	| TBinop(OpAdd,e1,e2) when is_dynamic e1.etype || is_dynamic e2.etype ->
+	| TBinop((OpAdd | OpAssignOp(OpAdd)),e1,e2) when is_dynamic e1.etype || is_dynamic e2.etype ->
 		check_and_add_feature dce "add_dynamic";
 		expr dce e1;
 		expr dce e2;
@@ -568,7 +618,7 @@ and expr dce e =
 		check_and_add_feature dce "dynamic_binop_==";
 		expr dce e1;
 		expr dce e2;
-	| TBinop(OpEq,({ etype = t1} as e1), ({ etype = t2} as e2) ) when is_dynamic t1 || is_dynamic t2 ->
+	| TBinop(OpNotEq,({ etype = t1} as e1), ({ etype = t2} as e2) ) when is_dynamic t1 || is_dynamic t2 ->
 		check_and_add_feature dce "dynamic_binop_!=";
 		expr dce e1;
 		expr dce e2;
@@ -589,16 +639,11 @@ and expr dce e =
 	| TThrow e ->
 		check_and_add_feature dce "has_throw";
 		expr dce e;
-		(*
-			TODO: Simon, save me! \o
-			This is a hack needed to keep toString field of the actual exception objects
-			that are thrown, but are wrapped into HaxeError before DCE comes into play.
-		*)
-		let e = (match e.eexpr with
-			| TNew({cl_path=(["js";"_Boot"],"HaxeError")}, _, [eoriginal]) -> eoriginal
-			| _ -> e
-		) in
-		to_string dce e.etype
+		let rec loop e =
+			to_string dce e.etype;
+			Type.iter loop e
+		in
+		loop e
 	| _ ->
 		Type.iter (expr dce) e
 
@@ -636,40 +681,15 @@ let fix_accessors com =
 		| _ -> ()
 	) com.types
 
-let run com main full =
-	let dce = {
-		com = com;
-		full = full;
-		dependent_types = Hashtbl.create 0;
-		std_dirs = if full then [] else List.map Path.unique_full_path com.std_path;
-		debug = Common.defined com Define.DceDebug;
-		added_fields = [];
-		follow_expr = expr;
-		marked_fields = [];
-		marked_maybe_fields = [];
-		t_stack = [];
-		ts_stack = [];
-		features = Hashtbl.create 0;
-		curclass = null_class;
-	} in
-	begin match main with
-		| Some {eexpr = TCall({eexpr = TField(e,(FStatic(c,cf)))},_)} | Some {eexpr = TBlock ({ eexpr = TCall({eexpr = TField(e,(FStatic(c,cf)))},_)} :: _)} ->
-			cf.cf_meta <- (Meta.Keep,[],cf.cf_pos) :: cf.cf_meta
-		| _ ->
-			()
-	end;
-	List.iter (fun m ->
-		List.iter (fun (s,v) ->
-			if Hashtbl.mem dce.features s then Hashtbl.replace dce.features s (v :: Hashtbl.find dce.features s)
-			else Hashtbl.add dce.features s [v]
-		) m.m_extra.m_if_feature;
-	) com.modules;
-	(* first step: get all entry points, which is the main method and all class methods which are marked with @:keep *)
-	List.iter (fun t -> match t with
+let collect_entry_points dce com =
+	List.iter (fun t ->
+		let mt = t_infos t in
+		mt.mt_meta <- Meta.remove Meta.Used mt.mt_meta;
+		match t with
 		| TClassDecl c ->
 			let keep_class = keep_whole_class dce c && (not c.cl_extern || c.cl_interface) in
 			let loop stat cf =
-				if keep_class || keep_field dce cf c then mark_field dce c cf stat
+				if keep_class || keep_field dce cf c stat then mark_field dce c cf stat
 			in
 			List.iter (loop true) c.cl_ordered_statics;
 			List.iter (loop false) c.cl_ordered_fields;
@@ -687,7 +707,9 @@ let run com main full =
 					()
 			end;
 		| TEnumDecl en when keep_whole_enum dce en ->
-			mark_enum dce en
+			let pop = push_class dce {null_class with cl_module = en.e_module} in
+			mark_enum dce en;
+			pop()
 		| _ ->
 			()
 	) com.types;
@@ -696,8 +718,9 @@ let run com main full =
 			| None -> ()
 			| Some _ -> print_endline ("[DCE] Entry point: " ^ (s_type_path c.cl_path) ^ "." ^ cf.cf_name)
 		) dce.added_fields;
-	end;
-	(* second step: initiate DCE passes and keep going until no new fields were added *)
+	end
+
+let mark dce =
 	let rec loop () =
 		match dce.added_fields with
 		| [] -> ()
@@ -707,20 +730,24 @@ let run com main full =
 			List.iter (fun (c,cf,stat) -> mark_dependent_fields dce c cf.cf_name stat) cfl;
 			(* mark fields as used *)
 			List.iter (fun (c,cf,stat) ->
-				if not (is_extern_field cf) then mark_class dce c;
+				let pop = push_class dce c in
+				if is_physical_field cf then mark_class dce c;
 				mark_field dce c cf stat;
-				mark_t dce cf.cf_pos cf.cf_type
+				mark_t dce cf.cf_pos cf.cf_type;
+				pop()
 			) cfl;
 			(* follow expressions to new types/fields *)
 			List.iter (fun (c,cf,_) ->
-				dce.curclass <- c;
+				let pop = push_class dce c in
 				opt (expr dce) cf.cf_expr;
-				List.iter (fun cf -> if cf.cf_expr <> None then opt (expr dce) cf.cf_expr) cf.cf_overloads
+				List.iter (fun cf -> if cf.cf_expr <> None then opt (expr dce) cf.cf_expr) cf.cf_overloads;
+				pop();
 			) cfl;
 			loop ()
 	in
-	loop ();
-	(* third step: filter types *)
+	loop ()
+
+let sweep dce com =
 	let rec loop acc types =
 		match types with
 		| (TClassDecl c) as mt :: l when keep_whole_class dce c ->
@@ -754,7 +781,7 @@ let run com main full =
 			(* add :keep so subsequent filter calls do not process class fields again *)
 			c.cl_meta <- (Meta.Keep,[],c.cl_pos) :: c.cl_meta;
  			c.cl_ordered_statics <- List.filter (fun cf ->
-				let b = keep_field dce cf c in
+				let b = keep_field dce cf c true in
 				if not b then begin
 					if dce.debug then print_endline ("[DCE] Removed field " ^ (s_type_path c.cl_path) ^ "." ^ (cf.cf_name));
 					check_property cf true;
@@ -763,7 +790,7 @@ let run com main full =
 				b
 			) c.cl_ordered_statics;
 			c.cl_ordered_fields <- List.filter (fun cf ->
-				let b = keep_field dce cf c in
+				let b = keep_field dce cf c false in
 				if not b then begin
 					if dce.debug then print_endline ("[DCE] Removed field " ^ (s_type_path c.cl_path) ^ "." ^ (cf.cf_name));
 					check_property cf false;
@@ -771,8 +798,8 @@ let run com main full =
 				end;
 				b
 			) c.cl_ordered_fields;
-			(match c.cl_constructor with Some cf when not (keep_field dce cf c) -> c.cl_constructor <- None | _ -> ());
-			let inef cf = not (is_extern_field cf) in
+			(match c.cl_constructor with Some cf when not (keep_field dce cf c false) -> c.cl_constructor <- None | _ -> ());
+			let inef cf = is_physical_field cf in
 			let has_non_extern_fields = List.exists inef c.cl_ordered_fields || List.exists inef c.cl_ordered_statics in
 			(* we keep a class if it was used or has a used field *)
 			if Meta.has Meta.Used c.cl_meta || has_non_extern_fields then loop (mt :: acc) l else begin
@@ -795,7 +822,46 @@ let run com main full =
 		| [] ->
 			acc
 	in
-	com.types <- loop [] (List.rev com.types);
+	com.types <- loop [] (List.rev com.types)
+
+let run com main mode =
+	let full = mode = DceFull in
+	let dce = {
+		com = com;
+		full = full;
+		dependent_types = Hashtbl.create 0;
+		std_dirs = if full then [] else List.map Path.unique_full_path com.std_path;
+		debug = Common.defined com Define.DceDebug;
+		added_fields = [];
+		follow_expr = expr;
+		marked_fields = [];
+		marked_maybe_fields = [];
+		t_stack = [];
+		ts_stack = [];
+		features = Hashtbl.create 0;
+		curclass = null_class;
+	} in
+	begin match main with
+		| Some {eexpr = TCall({eexpr = TField(e,(FStatic(c,cf)))},_)} | Some {eexpr = TBlock ({ eexpr = TCall({eexpr = TField(e,(FStatic(c,cf)))},_)} :: _)} ->
+			cf.cf_meta <- (Meta.Keep,[],cf.cf_pos) :: cf.cf_meta
+		| _ ->
+			()
+	end;
+	List.iter (fun m ->
+		List.iter (fun (s,v) ->
+			if Hashtbl.mem dce.features s then Hashtbl.replace dce.features s (v :: Hashtbl.find dce.features s)
+			else Hashtbl.add dce.features s [v]
+		) m.m_extra.m_if_feature;
+	) com.modules;
+
+	(* first step: get all entry points, which is the main method and all class methods which are marked with @:keep *)
+	collect_entry_points dce com;
+
+	(* second step: initiate DCE passes and keep going until no new fields were added *)
+	mark dce;
+
+	(* third step: filter types *)
+	if mode <> DceNo then sweep dce com;
 
 	(* extra step to adjust properties that had accessors removed (required for Php and Cpp) *)
 	fix_accessors com;
@@ -820,17 +886,12 @@ let run com main full =
 	*)
 	List.iter (function
 		| TClassDecl ({cl_extern = false; cl_super = Some ({cl_extern = true} as csup, _)}) ->
-			mark_directly_used_class csup
+			mark_directly_used_class dce csup
 		| TClassDecl ({cl_extern = false} as c) when c.cl_implements <> [] ->
-			List.iter (fun (iface,_) -> if (iface.cl_extern) then mark_directly_used_class iface) c.cl_implements;
+			List.iter (fun (iface,_) -> if (iface.cl_extern) then mark_directly_used_class dce iface) c.cl_implements;
 		| _ -> ()
 	) com.types;
 
 	(* cleanup added fields metadata - compatibility with compilation server *)
-	let rec remove_meta m = function
-		| [] -> []
-		| (m2,_,_) :: l when m = m2 -> l
-		| x :: l -> x :: remove_meta m l
-	in
-	List.iter (fun cf -> cf.cf_meta <- remove_meta Meta.Used cf.cf_meta) dce.marked_fields;
-	List.iter (fun cf -> cf.cf_meta <- remove_meta Meta.MaybeUsed cf.cf_meta) dce.marked_maybe_fields
+	List.iter (fun cf -> cf.cf_meta <- Meta.remove Meta.Used cf.cf_meta) dce.marked_fields;
+	List.iter (fun cf -> cf.cf_meta <- Meta.remove Meta.MaybeUsed cf.cf_meta) dce.marked_maybe_fields
diff --git a/src/optimization/inline.ml b/src/optimization/inline.ml
new file mode 100644
index 0000000000000000000000000000000000000000..21d157fd3dd3db0d885346d3544727acab794bfe
--- /dev/null
+++ b/src/optimization/inline.ml
@@ -0,0 +1,830 @@
+open Globals
+open Ast
+open Type
+open OptimizerTexpr
+open Common
+open Typecore
+open Error
+
+let mk_untyped_call name p params =
+	{
+		eexpr = TCall({ eexpr = TIdent name; etype = t_dynamic; epos = p }, params);
+		etype = t_dynamic;
+		epos = p;
+	}
+
+let api_inline2 com c field params p =
+	match c.cl_path, field, params with
+	| ([],"Type"),"enumIndex",[{ eexpr = TField (_,FEnum (en,f)) }] -> (match com.platform with
+		| Cs when en.e_extern && not (Meta.has Meta.HxGen en.e_meta) ->
+			(* We don't want to optimize enums from external sources; as they might change unexpectedly *)
+			(* and since native C# enums don't have the concept of index - they have rather a value, *)
+			(* which can't be mapped to a native API - this kind of substitution is dangerous *)
+			None
+		| _ ->
+			Some (mk (TConst (TInt (Int32.of_int f.ef_index))) com.basic.tint p))
+	| ([],"Type"),"enumIndex",[{ eexpr = TCall({ eexpr = TField (_,FEnum (en,f)) },pl) }] when List.for_all (fun e -> not (has_side_effect e)) pl ->
+		(match com.platform with
+			| Cs when en.e_extern && not (Meta.has Meta.HxGen en.e_meta) ->
+				(* see comment above *)
+				None
+			| _ ->
+				Some (mk (TConst (TInt (Int32.of_int f.ef_index))) com.basic.tint p))
+	| ([],"Std"),"int",[{ eexpr = TConst (TInt _) } as e] ->
+		Some { e with epos = p }
+	| ([],"String"),"fromCharCode",[{ eexpr = TConst (TInt i) }] when i > 0l && i < 128l ->
+		Some (mk (TConst (TString (String.make 1 (char_of_int (Int32.to_int i))))) com.basic.tstring p)
+	| ([],"Std"),"string",[{ eexpr = TCast ({ eexpr = TConst c } as e, None)}]
+	| ([],"Std"),"string",[{ eexpr = TConst c } as e] ->
+		(match c with
+		| TString s ->
+			Some { e with epos = p }
+		| TInt i ->
+			Some { eexpr = TConst (TString (Int32.to_string i)); epos = p; etype = com.basic.tstring }
+		| TBool b ->
+			Some { eexpr = TConst (TString (if b then "true" else "false")); epos = p; etype = com.basic.tstring }
+		| _ ->
+			None)
+	| ([],"Std"),"string",[{ eexpr = TIf (_,{ eexpr = TConst (TString _)},Some { eexpr = TConst (TString _) }) } as e] ->
+		Some e
+	| ([],"Std"),"string",[{ eexpr = TLocal v | TField({ eexpr = TLocal v },_) } as ev] when (com.platform = Js || com.platform = Flash) && (match v.v_kind with VUser _ -> true | _ -> false) ->
+		let pos = ev.epos in
+		let stringv() =
+			let to_str = mk (TBinop (Ast.OpAdd, mk (TConst (TString "")) com.basic.tstring pos, ev)) com.basic.tstring pos in
+			if com.platform = Js || is_nullable ev.etype then
+				let chk_null = mk (TBinop (Ast.OpEq, ev, mk (TConst TNull) t_dynamic pos)) com.basic.tbool pos in
+				mk (TIf (chk_null, mk (TConst (TString "null")) com.basic.tstring pos, Some to_str)) com.basic.tstring pos
+			else
+				to_str
+		in
+		(match follow ev.etype with
+		| TInst ({ cl_path = [],"String" }, []) ->
+			Some (stringv())
+		| TAbstract ({ a_path = [],"Float" }, []) ->
+			Some (stringv())
+		| TAbstract ({ a_path = [],"Int" }, []) ->
+			Some (stringv())
+		| TAbstract ({ a_path = [],"UInt" }, []) ->
+			Some (stringv())
+		| TAbstract ({ a_path = [],"Bool" }, []) ->
+			Some (stringv())
+		| _ ->
+			None)
+	| ([],"Std"),"int",[{ eexpr = TConst (TFloat f) }] ->
+		let f = float_of_string f in
+		(match classify_float f with
+		| FP_infinite | FP_nan ->
+			None
+		| _ when f <= Int32.to_float Int32.min_int -. 1. || f >= Int32.to_float Int32.max_int +. 1. ->
+			None (* out range, keep platform-specific behavior *)
+		| _ ->
+			Some { eexpr = TConst (TInt (Int32.of_float f)); etype = com.basic.tint; epos = p })
+	| ([],"Math"),"ceil",[{ eexpr = TConst (TFloat f) }] ->
+		let f = float_of_string f in
+		(match classify_float f with
+		| FP_infinite | FP_nan ->
+			None
+		| _ when f <= Int32.to_float Int32.min_int -. 1. || f >= Int32.to_float Int32.max_int ->
+			None (* out range, keep platform-specific behavior *)
+		| _ ->
+			Some { eexpr = TConst (TInt (Int32.of_float (ceil f))); etype = com.basic.tint; epos = p })
+	| ([],"Math"),"floor",[{ eexpr = TConst (TFloat f) }] ->
+		let f = float_of_string f in
+		(match classify_float f with
+		| FP_infinite | FP_nan ->
+			None
+		| _ when f <= Int32.to_float Int32.min_int || f >= Int32.to_float Int32.max_int +. 1. ->
+			None (* out range, keep platform-specific behavior *)
+		| _ ->
+			Some { eexpr = TConst (TInt (Int32.of_float (floor f))); etype = com.basic.tint; epos = p })
+	| (["cs"],"Lib"),("fixed" | "checked" | "unsafe"),[e] ->
+			Some (mk_untyped_call ("__" ^ field ^ "__") p [e])
+	| (["cs"],"Lib"),("lock"),[obj;block] ->
+			Some (mk_untyped_call ("__lock__") p [obj;mk_block block])
+	| (["java"],"Lib"),("lock"),[obj;block] ->
+			Some (mk_untyped_call ("__lock__") p [obj;mk_block block])
+	| _ ->
+		None
+
+let api_inline ctx c field params p =
+	let mk_typeexpr path =
+		let m = (try Hashtbl.find ctx.g.modules path with Not_found -> assert false) in
+		add_dependency ctx.m.curmod m;
+		ExtList.List.find_map (function
+			| TClassDecl cl when cl.cl_path = path -> Some (make_static_this cl p)
+			| _ -> None
+		) m.m_types
+	in
+
+	let eJsSyntax () = mk_typeexpr (["js"],"Syntax") in
+	let eJsBoot () = mk_typeexpr (["js"],"Boot") in
+
+	let tstring = ctx.com.basic.tstring in
+	let tbool = ctx.com.basic.tbool in
+	let tint = ctx.com.basic.tint in
+
+	match c.cl_path, field, params with
+	| ([],"Std"),"is",[o;t] | (["js"],"Boot"),"__instanceof",[o;t] when ctx.com.platform = Js ->
+		let is_trivial e =
+			match e.eexpr with
+			| TConst _ | TLocal _ -> true
+			| _ -> false
+		in
+
+		let typeof t =
+			let tof = Texpr.Builder.fcall (eJsSyntax()) "typeof" [o] tstring p in
+			mk (TBinop (Ast.OpEq, tof, (mk (TConst (TString t)) tstring p))) tbool p
+		in
+
+		(match t.eexpr with
+		(* generate simple typeof checks for basic types *)
+		| TTypeExpr (TClassDecl ({ cl_path = [],"String" })) -> Some (typeof "string")
+		| TTypeExpr (TAbstractDecl ({ a_path = [],"Bool" })) -> Some (typeof "boolean")
+		| TTypeExpr (TAbstractDecl ({ a_path = [],"Float" })) -> Some (typeof "number")
+		| TTypeExpr (TAbstractDecl ({ a_path = [],"Int" })) when is_trivial o ->
+			(* generate typeof(o) == "number" && (o|0) === o check *)
+			let lhs = mk (TBinop (Ast.OpOr, o, mk (TConst (TInt Int32.zero)) tint p)) tint p in
+			let jscheck = Texpr.Builder.fcall (eJsSyntax()) "strictEq" [lhs;o] tbool p in
+			Some(mk (TBinop (Ast.OpBoolAnd, typeof "number", jscheck)) tbool p)
+		| TTypeExpr (TClassDecl ({ cl_path = [],"Array" })) ->
+			(* generate (o instanceof Array) && o.__enum__ == null check *)
+			let iof = Texpr.Builder.fcall (eJsSyntax()) "instanceof" [o;t] tbool p in
+			if not (Common.defined ctx.com Define.JsEnumsAsArrays) then
+				Some iof
+			else begin
+				let enum = mk (TField (o, FDynamic "__enum__")) (mk_mono()) p in
+				let null = mk (TConst TNull) (mk_mono()) p in
+				let not_enum = mk (TBinop (Ast.OpEq, enum, null)) tbool p in
+				Some (mk (TBinop (Ast.OpBoolAnd, iof, not_enum)) tbool p)
+			end
+		| TTypeExpr (TClassDecl cls) ->
+			if cls.cl_interface then
+				Some (Texpr.Builder.fcall (eJsBoot()) "__implements" [o;t] tbool p)
+			else
+				Some (Texpr.Builder.fcall (eJsSyntax()) "instanceof" [o;t] tbool p)
+		| _ ->
+			None)
+	| (["js"],"Boot"),"__downcastCheck",[o; {eexpr = TTypeExpr (TClassDecl cls) } as t] when ctx.com.platform = Js ->
+		if cls.cl_interface then
+			Some (Texpr.Builder.fcall (make_static_this c p) "__implements" [o;t] tbool p)
+		else
+			Some (Texpr.Builder.fcall (eJsSyntax()) "instanceof" [o;t] tbool p)
+	| (["cs" | "java"],"Lib"),("nativeArray"),[{ eexpr = TArrayDecl args } as edecl; _]
+	| (["haxe";"ds";"_Vector"],"Vector_Impl_"),("fromArrayCopy"),[{ eexpr = TArrayDecl args } as edecl] -> (try
+			let platf = match ctx.com.platform with
+				| Cs -> "cs"
+				| Java -> "java"
+				| _ -> raise Exit
+			in
+			let mpath = if field = "fromArrayCopy" then
+				(["haxe";"ds"],"Vector")
+			else
+				([platf],"NativeArray")
+			in
+
+			let m = ctx.g.do_load_module ctx mpath null_pos in
+			let main = List.find (function | TClassDecl _ | TAbstractDecl _ -> true | _ -> false) m.m_types in
+			let t = match follow edecl.etype, main with
+				| TInst({ cl_path = [],"Array" }, [t]), TClassDecl(cl) ->
+					TInst(cl,[t])
+				| TInst({ cl_path = [],"Array" }, [t]), TAbstractDecl(a) ->
+					TAbstract(a,[t])
+				| _ -> assert false
+			in
+			Some ({ (mk_untyped_call "__array__" p args) with etype = t })
+		with | Exit ->
+			None)
+	| _ ->
+		api_inline2 ctx.com c field params p
+
+type in_local = {
+	i_var : tvar;
+	i_subst : tvar;
+	i_outside : bool;
+	i_abstract_this : bool;
+	mutable i_captured : bool;
+	mutable i_write : bool;
+	mutable i_read : int;
+	mutable i_called : int;
+	mutable i_force_temp : bool;
+	mutable i_default_value : texpr option;
+}
+
+type var_inline_kind =
+	| VIInline
+	| VIInlineIfCalled
+	| VIDoNotInline
+
+let inline_default_config cf t =
+	(* type substitution on both class and function type parameters *)
+	let rec get_params c pl =
+		match c.cl_super with
+		| None -> c.cl_params, pl
+		| Some (csup,spl) ->
+			let spl = (match apply_params c.cl_params pl (TInst (csup,spl)) with
+			| TInst (_,pl) -> pl
+			| _ -> assert false
+			) in
+			let ct, cpl = get_params csup spl in
+			c.cl_params @ ct, pl @ cpl
+	in
+	let rec loop t = match follow t with
+		| TInst({cl_kind = KTypeParameter tl},_) -> List.fold_left (fun (params',tl') (params,tl) -> (params @ params',tl @ tl')) ([],[]) (List.map loop tl)
+		| TInst (c,pl) -> get_params c pl
+		| _ -> ([],[])
+	in
+	let tparams = loop t in
+	let pmonos = List.map (fun _ -> mk_mono()) cf.cf_params in
+	let tmonos = snd tparams @ pmonos in
+	let tparams = fst tparams @ cf.cf_params in
+	tparams <> [], apply_params tparams tmonos
+
+let inline_metadata e meta =
+	let inline_meta e meta = match meta with
+		| (Meta.Deprecated | Meta.Pure),_,_ -> mk (TMeta(meta,e)) e.etype e.epos
+		| _ -> e
+	in
+	List.fold_left inline_meta e meta
+
+class inline_state ctx ethis params cf f p = object(self)
+	val locals = Hashtbl.create 0
+	val checker = create_affection_checker()
+	val mutable _inlined_vars = []
+	val mutable _in_local_fun = false
+	val mutable _had_side_effect = false
+	val mutable _has_return_value = false
+
+	method enter_local_fun =
+		let old = _in_local_fun in
+		_in_local_fun <- true;
+		(fun () -> _in_local_fun <- old)
+
+	method in_local_fun = _in_local_fun
+
+	method inlined_vars = _inlined_vars
+
+	method had_side_effect = _had_side_effect
+	method set_side_effect = _had_side_effect <- true
+
+	method has_return_value = _has_return_value
+	method set_return_value = _has_return_value <- true
+
+	method private collect_modified_locals e = (snd checker) e
+	method might_be_affected e = (fst checker) e
+
+	method declare v =
+		try
+			Hashtbl.find locals v.v_id
+		with Not_found ->
+			let v' = alloc_var (match v.v_kind with VUser _ -> VInlined | k -> k) v.v_name v.v_type v.v_pos in
+			v'.v_extra <- v.v_extra;
+			let i = {
+				i_var = v;
+				i_subst = v';
+				i_outside = false;
+				i_abstract_this = Meta.has Meta.This v.v_meta;
+				i_captured = false;
+				i_write = false;
+				i_called = 0;
+				i_force_temp = false;
+				i_read = 0;
+				i_default_value = None;
+			} in
+			i.i_subst.v_meta <- List.filter (fun (m,_,_) -> m <> Meta.This) v.v_meta;
+			Hashtbl.add locals v.v_id i;
+			Hashtbl.add locals i.i_subst.v_id i;
+			i
+
+	method read v =
+		let l = try
+			Hashtbl.find locals v.v_id
+		with Not_found ->
+			{
+				i_var = v;
+				i_subst = v;
+				i_outside = true;
+				i_abstract_this = Meta.has Meta.This v.v_meta;
+				i_captured = false;
+				i_write = false;
+				i_called = 0;
+				i_force_temp = false;
+				i_read = 0;
+				i_default_value = None;
+			}
+		in
+		if _in_local_fun then l.i_captured <- true;
+		l
+
+	method private get_substitutions p =
+		(*
+			if variables are not written and used with a const value, let's substitute
+			with the actual value, either create a temp var
+		*)
+		let subst = ref PMap.empty in
+		let is_constant e =
+			let rec loop e =
+				match e.eexpr with
+				| TLocal _
+				| TConst TThis (* not really, but should not be move inside a function body *)
+					-> raise Exit
+				| TObjectDecl _ | TArrayDecl _ -> raise Exit
+				| TField (_,FEnum _)
+				| TTypeExpr _
+				| TConst _ -> ()
+				| _ ->
+					Type.iter loop e
+			in
+			try loop e; true with Exit -> false
+		in
+		let rec is_writable e =
+			match e.eexpr with
+			| TField _ | TEnumParameter _ | TLocal _ | TArray _ -> true
+			| TCast(e1,None) -> is_writable e1
+			| _  -> false
+		in
+		let vars = List.fold_left (fun acc (i,e) ->
+			let accept vik =
+				subst := PMap.add i.i_subst.v_id (vik,e) !subst;
+				acc
+			in
+			let reject () =
+				(* mark the replacement local for the analyzer *)
+				if (i.i_read + i.i_called) <= 1 && not i.i_write then
+					i.i_subst.v_kind <- VGenerated;
+				(i.i_subst,Some e) :: acc
+			in
+			if i.i_abstract_this && i.i_write then begin
+				if not (is_writable e) then error "Cannot modify the abstract value, store it into a local first" p;
+				accept VIInline
+			end else if i.i_force_temp || (i.i_captured && not (is_constant e)) then
+				reject()
+			else begin
+				let vik = match e.eexpr with
+					| TLocal _ when i.i_abstract_this -> VIInline
+					| TConst TNull -> VIDoNotInline
+					| TLocal _ | TConst _ ->
+						if not i.i_write then VIInline else VIDoNotInline
+					| TFunction _ ->
+						if i.i_write then error "Cannot modify a closure parameter inside inline method" p;
+						if i.i_read <= 1 then VIInline else VIInlineIfCalled
+					| _ ->
+						if not i.i_write && (i.i_read + i.i_called) <= 1 then VIInline else VIDoNotInline
+				in
+				match vik with
+				| VIInline -> accept vik
+				| VIDoNotInline -> reject()
+				| VIInlineIfCalled ->
+					(* "Accept" it so it is added to the substitutions. *)
+					ignore(accept vik);
+					if i.i_read > 1 then
+						(* If it is read more than once, we still have to reject because we need a local. *)
+						reject()
+					else
+						(* Otherwise we don't! *)
+						acc
+			end
+		) [] _inlined_vars in
+		vars,!subst
+
+	method initialize =
+		(* use default values for null/unset arguments *)
+		let rec loop acc pl al first =
+			match pl, al with
+			| _, [] ->
+				acc
+			| e :: pl, (v, opt) :: al ->
+				let l = self#declare v in
+				(*
+					if we pass a Null<T> var to an inlined method that needs a T.
+					we need to force a local var to be created on some platforms.
+				*)
+				if ctx.com.config.pf_static && not (is_nullable v.v_type) && is_null e.etype then l.i_force_temp <- true;
+				(*
+					if we cast from Dynamic, create a local var as well to do the cast
+					once and allow DCE to perform properly.
+				*)
+				let dynamic_v = follow v.v_type == t_dynamic in
+				let dynamic_e = follow e.etype == t_dynamic in
+				let e = if dynamic_v <> dynamic_e then mk (TCast(e,None)) v.v_type e.epos else e in
+				let e = match e.eexpr, opt with
+					| TConst TNull , Some c -> c
+					| _ , Some c when (match c.eexpr with TConst TNull -> false | _ -> true) && (not ctx.com.config.pf_static || is_nullable v.v_type) ->
+						l.i_force_temp <- true;
+						l.i_default_value <- Some c;
+						e
+					| _ -> e
+				in
+				if has_side_effect e then begin
+					self#collect_modified_locals e;
+					_had_side_effect <- true;
+					l.i_force_temp <- true;
+				end;
+				(* We use a null expression because we only care about the type (for abstract casts). *)
+				if l.i_abstract_this then l.i_subst.v_extra <- Some ([],Some {e with eexpr = TConst TNull});
+				loop ((l,e) :: acc) pl al false
+			| [], (v,opt) :: al ->
+				let l = self#declare v in
+				let e = match opt with
+					| None -> mk (TConst TNull) v.v_type v.v_pos
+					| Some e -> e
+				in
+				loop ((l,e) :: acc) [] al false
+		in
+		(*
+			Build the expr/var subst list
+		*)
+		let set_inlined_vars args1 args2 =
+			let vars = loop [] args1 args2 true in
+			_inlined_vars <- vars; (* Order is reversed due to tail-recursion *)
+		in
+		match ethis.eexpr with
+		| TConst TNull ->
+			set_inlined_vars params f.tf_args;
+			None
+		| _ ->
+			let ethis = (match ethis.eexpr with TConst TSuper -> { ethis with eexpr = TConst TThis } | _ -> ethis) in
+			let vthis = alloc_var VInlined "_this" ethis.etype ethis.epos in
+			let args1 = (ethis :: params) in
+			let args2 = ((vthis,None) :: f.tf_args) in
+			set_inlined_vars args1 args2;
+			Some vthis
+
+	method finalize config e tl tret p =
+		let has_params,map_type = match config with Some config -> config | None -> inline_default_config cf ethis.etype in
+		if self#had_side_effect then List.iter (fun (l,e) ->
+			if self#might_be_affected e && not (ExtType.has_value_semantics e.etype) then l.i_force_temp <- true;
+		) _inlined_vars;
+		let vars,subst = self#get_substitutions p in
+		let rec inline_params in_call in_assignment e =
+			match e.eexpr with
+			| TLocal v ->
+				begin try
+					let vik,e' = PMap.find v.v_id subst in
+					begin match vik with
+						| VIInline ->
+							begin match e'.eexpr with
+								(* If we inline a function expression, we have to duplicate its locals. *)
+								| TFunction _ -> Texpr.duplicate_tvars e'
+								| TCast(e1,None) when in_assignment -> e1
+								| _ -> e'
+							end
+						| VIInlineIfCalled when in_call ->
+							(* We allow inlining function expressions into call-places. However, we have to substitute
+							   their locals to avoid duplicate declarations. *)
+							Texpr.duplicate_tvars e'
+						| _ -> e
+					end
+				with Not_found ->
+					e
+				end
+			| TCall(e1,el) ->
+				let e1 = inline_params true false e1 in
+				let el = List.map (inline_params false false) el in
+				{e with eexpr = TCall(e1,el)}
+			| TBinop((OpAssign | OpAssignOp _ as op),e1,e2) ->
+				let e1 = inline_params false true e1 in
+				let e2 = inline_params false false e2 in
+				{e with eexpr = TBinop(op,e1,e2)}
+			| _ -> Type.map_expr (inline_params false false) e
+		in
+		let e = (if PMap.is_empty subst then e else inline_params false false e) in
+		let init = match vars with [] -> None | l -> Some l in
+		let md = ctx.curclass.cl_module.m_extra.m_display in
+		md.m_inline_calls <- (cf.cf_name_pos,{p with pmax = p.pmin + String.length cf.cf_name}) :: md.m_inline_calls;
+		let wrap e =
+			(* we can't mute the type of the expression because it is not correct to do so *)
+			let etype = if has_params then map_type e.etype else e.etype in
+			(* if the expression is "untyped" and we don't want to unify it accidentally ! *)
+			try (match follow e.etype with
+			| TMono _ | TInst ({cl_kind = KTypeParameter _ },_) ->
+				(match follow tret with
+				| TAbstract ({ a_path = [],"Void" },_) -> e
+				| _ -> raise (Unify_error []))
+			| _ ->
+				type_eq (if ctx.com.config.pf_static then EqDoNotFollowNull else EqStrict) etype tret;
+				e)
+			with Unify_error _ ->
+				mk (TCast (e,None)) tret e.epos
+		in
+		let e = match init with
+			| None when not self#has_return_value ->
+				begin match e.eexpr with
+					| TBlock _ -> {e with etype = tret}
+					| _ -> mk (TBlock [e]) tret e.epos
+				end
+			| None ->
+				begin match e.eexpr with
+					| TBlock [e] -> wrap e
+					| _ -> wrap e
+				end
+			| Some vl ->
+				let el = DynArray.create () in
+				let add = DynArray.add el in
+				List.iter (fun (v,eo) ->
+					add (mk (TVar (v,eo)) ctx.t.tvoid e.epos);
+				) vl;
+				List.iter (fun (l,e) -> match l.i_default_value with
+					| Some e when l.i_read > 0 -> add (Texpr.set_default ctx.com.basic l.i_subst e e.epos)
+					| _ -> ()
+				) _inlined_vars;
+				begin match e.eexpr with
+					| TBlock el -> List.iter add el
+					| _ -> add e
+				end;
+				mk (TBlock (DynArray.to_list el)) tret e.epos
+		in
+		let e = inline_metadata e cf.cf_meta in
+		let e = Diagnostics.secure_generated_code ctx e in
+		if has_params then begin
+			let mt = map_type cf.cf_type in
+			let unify_func () = unify_raise ctx mt (TFun (tl,tret)) p in
+			(match follow ethis.etype with
+			| TAnon a -> (match !(a.a_status) with
+				| Statics {cl_kind = KAbstractImpl a } when Meta.has Meta.Impl cf.cf_meta ->
+					if cf.cf_name <> "_new" then begin
+						(* the first argument must unify with a_this for abstract implementation functions *)
+						let tb = (TFun(("",false,map_type a.a_this) :: (List.tl tl),tret)) in
+						unify_raise ctx mt tb p
+					end
+				| _ -> unify_func())
+			| _ -> unify_func());
+		end;
+		let vars = Hashtbl.create 0 in
+		let rec map_var map_type v =
+			if not (Hashtbl.mem vars v.v_id) then begin
+				Hashtbl.add vars v.v_id ();
+				if not (self#read v).i_outside then begin
+					v.v_type <- map_type v.v_type;
+					match v.v_extra with
+					| Some(tl,Some e) ->
+						v.v_extra <- Some(tl,Some (map_expr_type map_type e));
+					| _ ->
+						()
+				end
+			end;
+			v
+		and map_expr_type map_type e =
+			(*
+				No need to change typing of arguments of inlined call
+				because they were already properly typed prior to inlining.
+			*)
+			let map_type =
+				if List.memq e params then (fun t -> t)
+				else map_type
+			in
+			Type.map_expr_type (map_expr_type map_type) map_type (map_var map_type) e
+		in
+		let e = map_expr_type map_type e in
+		let rec drop_unused_vars e =
+			match e.eexpr with
+			| TVar (v, Some { eexpr = TConst _ }) ->
+				(try
+					let data = Hashtbl.find locals v.v_id in
+					if data.i_read = 0 && not data.i_write then mk (TBlock []) e.etype e.epos
+					else Type.map_expr drop_unused_vars e
+				with Not_found ->
+					Type.map_expr drop_unused_vars e
+				)
+			| _ -> Type.map_expr drop_unused_vars e
+		in
+		drop_unused_vars e
+end
+
+let rec type_inline ctx cf f ethis params tret config p ?(self_calling_closure=false) force =
+	(* perform some specific optimization before we inline the call since it's not possible to detect at final optimization time *)
+	try
+		let cl = (match follow ethis.etype with
+			| TInst (c,_) -> c
+			| TAnon a -> (match !(a.a_status) with Statics c -> c | _ -> raise Exit)
+			| _ -> raise Exit
+		) in
+		(match api_inline ctx cl cf.cf_name params p with
+		| None -> raise Exit
+		| Some e -> Some e)
+	with Exit ->
+	let state = new inline_state ctx ethis params cf f p in
+	let vthis_opt = state#initialize in
+	let opt f = function
+		| None -> None
+		| Some e -> Some (f e)
+	in
+	let in_loop = ref false in
+	let return_type t el =
+		(* If the function return is Dynamic or Void, stick to it. *)
+		if follow f.tf_type == t_dynamic || ExtType.is_void (follow f.tf_type) then f.tf_type
+		(* If the expression is Void, find common type of its branches. *)
+		else if ExtType.is_void t then unify_min ctx el
+		else t
+	in
+	let map_pos =
+		if self_calling_closure || Common.defined ctx.com Define.KeepInlinePositions then (fun e -> e)
+		else (fun e -> { e with epos = p })
+	in
+	let rec map term in_call e =
+		let po = e.epos in
+		let e = map_pos e in
+		match e.eexpr with
+		| TLocal v ->
+			let l = state#read v in
+			let i = if !in_loop then 2 else 1 in
+			if in_call then
+				l.i_called <- l.i_called + i
+			else
+				l.i_read <- l.i_read + i;
+			let e = { e with eexpr = TLocal l.i_subst } in
+			if l.i_abstract_this then mk (TCast(e,None)) v.v_type e.epos else e
+		| TConst TThis ->
+			(match vthis_opt with
+			| Some vthis ->
+				let l = state#read vthis in
+				l.i_read <- l.i_read + (if !in_loop then 2 else 1);
+				{ e with eexpr = TLocal l.i_subst }
+			| None ->
+				error "Could not inline `this` outside of an instance context" po
+			)
+		| TVar (v,eo) ->
+			{ e with eexpr = TVar ((state#declare v).i_subst,opt (map false false) eo)}
+		| TReturn eo when not state#in_local_fun ->
+			if not term then error "Cannot inline a not final return" po;
+			(match eo with
+			| None -> mk (TConst TNull) f.tf_type p
+			| Some e ->
+				state#set_return_value;
+				map term false e)
+		| TFor (v,e1,e2) ->
+			let i = state#declare v in
+			let e1 = map false false e1 in
+			let old = !in_loop in
+			in_loop := true;
+			let e2 = map false false e2 in
+			in_loop := old;
+			{ e with eexpr = TFor (i.i_subst,e1,e2) }
+		| TWhile (cond,eloop,flag) ->
+			let cond = map false false cond in
+			let old = !in_loop in
+			in_loop := true;
+			let eloop = map false false eloop in
+			in_loop := old;
+			{ e with eexpr = TWhile (cond,eloop,flag) }
+		| TSwitch (e1,cases,def) when term ->
+			let term = term && (def <> None || is_exhaustive e1) in
+			let cases = List.map (fun (el,e) ->
+				let el = List.map (map false false) el in
+				el, map term false e
+			) cases in
+			let def = opt (map term false) def in
+			let t = return_type e.etype ((List.map snd cases) @ (match def with None -> [] | Some e -> [e])) in
+			{ e with eexpr = TSwitch (map false false e1,cases,def); etype = t }
+		| TTry (e1,catches) ->
+			let t = if not term then e.etype else return_type e.etype (e1::List.map snd catches) in
+			{ e with eexpr = TTry (map term false e1,List.map (fun (v,e) ->
+				let lv = (state#declare v).i_subst in
+				let e = map term false e in
+				lv,e
+			) catches); etype = t }
+		| TBlock l ->
+			let old = save_locals ctx in
+			let t = ref e.etype in
+			let rec has_term_return e =
+				let rec loop e =
+					let r = match e.eexpr with
+					| TReturn _ -> true
+					| TFunction _ -> false
+					| TIf (_,_,None) | TSwitch (_,_,None) | TFor _ | TWhile (_,_,NormalWhile) -> false (* we might not enter this code at all *)
+					| TTry (a, catches) -> List.for_all has_term_return (a :: List.map snd catches)
+					| TIf (cond,a,Some b) -> has_term_return cond || (has_term_return a && has_term_return b)
+					| TSwitch (cond,cases,Some def) -> has_term_return cond || List.for_all has_term_return (def :: List.map snd cases)
+					| TBinop (OpBoolAnd,a,b) -> has_term_return a && has_term_return b
+					| _ -> Type.iter loop e; false
+					in
+					if r then raise Exit
+				in
+				try loop e; false with Exit -> true
+			in
+			let rec loop = function
+				| [] when term ->
+					t := mk_mono();
+					[mk (TConst TNull) (!t) p]
+				| [] -> []
+				| [e] ->
+					let e = map term false e in
+					if term then t := e.etype;
+					[e]
+				| ({ eexpr = TIf (cond,e1,None) } as e) :: l when term && has_term_return e1 ->
+					loop [{ e with eexpr = TIf (cond,e1,Some (mk (TBlock l) e.etype e.epos)); epos = punion e.epos (match List.rev l with e :: _ -> e.epos | [] -> assert false) }]
+				| e :: l ->
+					let e = map false false e in
+					e :: loop l
+			in
+			let l = loop l in
+			old();
+			{ e with eexpr = TBlock l; etype = !t }
+		| TIf (econd,eif,Some eelse) when term ->
+			let econd = map false false econd in
+			let eif = map term false eif in
+			let eelse = map term false eelse in
+			let t = return_type e.etype [eif;eelse] in
+			{ e with eexpr = TIf(econd,eif,Some eelse); etype = t }
+		| TParenthesis e1 ->
+			let e1 = map term in_call e1 in
+			mk (TParenthesis e1) e1.etype e.epos
+		| TUnop ((Increment|Decrement) as op,flag,({ eexpr = TLocal v } as e1)) ->
+			state#set_side_effect;
+			let l = state#read v in
+			l.i_write <- true;
+			{e with eexpr = TUnop(op,flag,{e1 with eexpr = TLocal l.i_subst})}
+		| TBinop ((OpAssign | OpAssignOp _) as op,({ eexpr = TLocal v } as e1),e2) ->
+			state#set_side_effect;
+			let l = state#read v in
+			l.i_write <- true;
+			let e2 = map false false e2 in
+			{e with eexpr = TBinop(op,{e1 with eexpr = TLocal l.i_subst},e2)}
+		| TObjectDecl fl ->
+			let fl = List.map (fun (s,e) -> s,map false false e) fl in
+			begin match follow e.etype with
+				| TAnon an when (match !(an.a_status) with Const -> true | _ -> false) ->
+					{e with eexpr = TObjectDecl fl; etype = TAnon { an with a_status = ref Closed}}
+				| _ ->
+					{e with eexpr = TObjectDecl fl}
+			end
+		| TFunction f ->
+			let old = save_locals ctx in
+			let args = List.map (function(v,c) -> (state#declare v).i_subst, c) f.tf_args in
+			let restore = state#enter_local_fun in
+			let expr = map false false f.tf_expr in
+			restore();
+			old();
+			{ e with eexpr = TFunction { tf_args = args; tf_expr = expr; tf_type = f.tf_type } }
+		| TCall({eexpr = TConst TSuper; etype = t},el) ->
+			state#set_side_effect;
+			begin match follow t with
+			| TInst({ cl_constructor = Some ({cf_kind = Method MethInline; cf_expr = Some ({eexpr = TFunction tf})} as cf)} as c,_) ->
+				begin match type_inline_ctor ctx c cf tf ethis el po with
+				| Some e -> map term false e
+				| None -> error "Could not inline super constructor call" po
+				end
+			| _ -> error "Cannot inline function containing super" po
+			end
+		| TCall(e1,el) ->
+			state#set_side_effect;
+			let e1 = map false true e1 in
+			let el = List.map (map false false) el in
+			{e with eexpr = TCall(e1,el)}
+		| TConst TSuper ->
+			error "Cannot inline function containing super" po
+		| TMeta((Meta.Ast,_,_) as m,e1) when term ->
+			(* Special case for @:ast-wrapped TSwitch nodes: If the recursion alters the type of the TSwitch node, we also want
+			   to alter the type of the TMeta node. *)
+			let e1 = map term in_call e1 in
+			{e with eexpr = TMeta(m,e1); etype = e1.etype}
+		| TMeta(m,e1) ->
+			let e1 = map term in_call e1 in
+			{e with eexpr = TMeta(m,e1)}
+		| TNew _ | TBinop ((OpAssignOp _ | OpAssign),_,_) | TUnop ((Increment|Decrement),_,_) ->
+			state#set_side_effect;
+			Type.map_expr (map false false) e
+		| _ ->
+			Type.map_expr (map false false) e
+	in
+	let e = map true false f.tf_expr in
+	let rec arg_types params tf_args =
+		match params, tf_args with
+		| e :: rest_params, _ :: rest_args -> ("",false,e.etype) :: arg_types rest_params rest_args
+		| [], (_, Some e) :: rest_args -> ("",true,mk_mono()) :: arg_types params rest_args
+		| _ -> []
+	in
+	let tl = arg_types params f.tf_args in
+	let e = state#finalize config e tl tret p in
+	if Meta.has (Meta.Custom ":inlineDebug") ctx.meta then begin
+		let se t = s_expr_pretty true t true (s_type (print_context())) in
+		print_endline (Printf.sprintf "Inline %s:\n\tArgs: %s\n\tExpr: %s\n\tResult: %s"
+			cf.cf_name
+			(String.concat "" (List.map (fun (i,e) -> Printf.sprintf "\n\t\t%s<%i> = %s" (i.i_subst.v_name) (i.i_subst.v_id) (se "\t\t" e)) state#inlined_vars))
+			(se "\t" f.tf_expr)
+			(se "\t" e)
+		);
+	end;
+	Some e
+
+(* Same as type_inline, but modifies the function body to add field inits *)
+and type_inline_ctor ctx c cf tf ethis el po =
+	let field_inits =
+		let cparams = List.map snd c.cl_params in
+		let ethis = mk (TConst TThis) (TInst (c,cparams)) c.cl_pos in
+		let el = List.fold_left (fun acc cf ->
+			match cf.cf_kind,cf.cf_expr with
+			| Var _,Some e ->
+				let lhs = mk (TField(ethis,FInstance (c,cparams,cf))) cf.cf_type e.epos in
+				let eassign = mk (TBinop(OpAssign,lhs,e)) cf.cf_type e.epos in
+				eassign :: acc
+			| _ -> acc
+		) [] c.cl_ordered_fields in
+		List.rev el
+	in
+	let tf =
+		if field_inits = [] then tf
+		else
+			let bl = match tf.tf_expr with {eexpr = TBlock b } -> b | x -> [x] in
+			{tf with tf_expr = mk (TBlock (field_inits @ bl)) ctx.t.tvoid c.cl_pos}
+	in
+	type_inline ctx cf tf ethis el ctx.t.tvoid None po true
diff --git a/src/optimization/inlineConstructors.ml b/src/optimization/inlineConstructors.ml
new file mode 100644
index 0000000000000000000000000000000000000000..27f73bff100c6193e0888013bb679c96d999fef2
--- /dev/null
+++ b/src/optimization/inlineConstructors.ml
@@ -0,0 +1,530 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Ast
+open Type
+open Common
+open Typecore
+open Error
+open Globals
+
+(* INLINE CONSTRUCTORS *)
+
+(*
+	First pass:
+	Finds all inline objects and variables that alias them.
+	Inline objects reference instances of TNew TObjectDecl and TArrayDecl, identified a number
+	assigned by order of appearance in the expression.
+	When an inline object is assigned to a variable, this variable is considered an alias of it.
+	If an aliasing variable is assigned more than once then inlining will be cancelled for the inline
+	object the variable would have aliased.
+	The algorithm supports unassigned variables to be used as aliases 'var a; a = new Inl();'. For this
+	reason variable declarations without assignment are tracked as IVKUnassigned inline variables.
+	When an unassigned inline variable is assigned an alias it's scope is limited to that in which the
+	assignment happened, after which the variable is set as "closed" and any appearance will cancel inlining.
+	Fields of inline objects behave in the same way as unassigned inline variables, allowing nested object
+	inlining.
+
+	Second pass:
+	Replace variables that alias inline objects with their respective field inline variables.
+	Identify inline objects by order of appearance and replace them with their inlined constructor expressions.
+	Replace field access of aliasing variables with the respective field inline variable.
+	Because some replacements turn a single expression into many, this pass will map texpr into texpr list,
+	which is converted into TBlocks by the caller as needed.
+*)
+
+type inline_object_kind =
+	| IOKCtor of tclass_field * bool * tvar list
+	| IOKStructure
+	| IOKArray of int
+
+and inline_object = {
+	io_kind : inline_object_kind;
+	io_expr : texpr;
+	io_pos : pos;
+	io_has_untyped : bool;
+	mutable io_cancelled : bool;
+	mutable io_declared : bool;
+	mutable io_aliases : inline_var list;
+	mutable io_fields : (string,inline_var) PMap.t;
+	mutable io_id_start : int;
+	mutable io_id_end : int;
+}
+
+and inline_var_kind =
+	| IVKField of inline_object * string * texpr option
+	| IVKLocal
+
+and inline_var_state =
+	| IVSUnassigned
+	| IVSAliasing of inline_object
+	| IVSCancelled
+
+and inline_var = {
+	iv_var : tvar;
+	mutable iv_state : inline_var_state;
+	mutable iv_kind : inline_var_kind;
+	mutable iv_closed : bool
+}
+
+let inline_constructors ctx e =
+	let inline_objs = ref IntMap.empty in
+	let vars = ref IntMap.empty in
+	let scoped_ivs = ref [] in
+	let get_io (ioid:int) : inline_object = IntMap.find ioid !inline_objs in
+	let get_iv (vid:int) : inline_var = IntMap.find (abs vid) !vars in
+	let rec cancel_io (io:inline_object) (p:pos) : unit =
+		if not io.io_cancelled then begin
+			io.io_cancelled <- true;
+			List.iter (fun iv -> cancel_iv iv p) io.io_aliases;
+			PMap.iter (fun _ iv -> cancel_iv iv p) io.io_fields;
+			match io.io_kind with
+			| IOKCtor(_,isextern,vars) ->
+				List.iter (fun v -> if v.v_id < 0 then cancel_v v p) vars;
+				if isextern then begin
+					display_error ctx "Forced inline constructor could not be inlined" io.io_pos;
+					display_error ctx "Cancellation happened here" p;
+				end
+			| _ -> ()
+		end
+	and cancel_iv (iv:inline_var) (p:pos) : unit =
+		if (iv.iv_state <> IVSCancelled) then begin
+			let old = iv.iv_state in
+			iv.iv_state <- IVSCancelled;
+			begin match old with
+			| IVSAliasing(io) -> cancel_io io p
+			| _ -> ()
+			end;
+			let remove = match iv.iv_kind with
+				| IVKField(io,_,_) -> io.io_cancelled
+				| IVKLocal -> true
+			in
+			if remove then begin
+				let v = iv.iv_var in
+				vars := IntMap.remove (abs v.v_id) !vars;
+				v.v_id <- (abs v.v_id);
+			end
+		end
+	and cancel_v (v:tvar) (p:pos) : unit =
+		try let iv = get_iv v.v_id in
+			cancel_iv iv p
+		with Not_found -> ()
+	in
+	let set_iv_alias iv io =
+		if iv.iv_state <> IVSUnassigned || io.io_cancelled then begin
+			cancel_io io io.io_pos;
+			cancel_iv iv io.io_pos
+		end else begin
+			iv.iv_state <- IVSAliasing io;
+			io.io_aliases <- iv :: io.io_aliases;
+		end
+	in
+	let add (v:tvar) (kind:inline_var_kind) : inline_var =
+		let iv = {
+			iv_var = v;
+			iv_state = IVSUnassigned;
+			iv_kind = kind;
+			iv_closed = false
+		} in
+		v.v_id <- -v.v_id;
+		vars := IntMap.add (abs v.v_id) iv !vars;
+		iv
+	in
+	let get_io_field (io:inline_object) (s:string) : inline_var =
+		PMap.find s io.io_fields
+	in
+	let alloc_io_field_full (io:inline_object) (fname:string) (constexpr_option:texpr option) (t:t) (p:pos) : inline_var =
+		let v = alloc_var VInlined fname t p in
+		let iv = add v (IVKField (io,fname,constexpr_option)) in
+		io.io_fields <- PMap.add fname iv io.io_fields;
+		iv
+	in
+	let alloc_const_io_field (io:inline_object) (fname:string) (constexpr:texpr) : inline_var =
+		let iv = alloc_io_field_full io fname (Some constexpr) constexpr.etype constexpr.epos in
+		iv.iv_state <- IVSCancelled;
+		iv
+	in
+	let alloc_io_field (io:inline_object) (fname:string) (t:t) (p:pos) : inline_var = alloc_io_field_full io fname None t p in
+	let int_field_name i =
+		if i < 0 then "n" ^ (string_of_int (-i))
+		else (string_of_int i)
+	in
+	let is_extern_ctor c cf = c.cl_extern || has_class_field_flag cf CfExtern in
+	let make_expr_for_list (el:texpr list) (t:t) (p:pos): texpr = match el with
+		| [] -> mk (TBlock[]) ctx.t.tvoid p
+		| [e] -> e
+		| _ -> mk (TBlock (el)) t p
+	in
+	let make_expr_for_rev_list (el:texpr list) (t:t) (p:pos) : texpr = make_expr_for_list (List.rev el) t p in
+	let current_io_id = ref 0 in
+	let increment_io_id e = match e.eexpr with
+		| TObjectDecl _ | TArrayDecl _ | TNew _ | (TMeta((Meta.Inline,_,_),{eexpr = TNew _})) -> incr current_io_id
+		| _ -> ()
+	in
+	let rec analyze_aliases (seen_ctors:tclass_field list) (captured:bool) (is_lvalue:bool) (e:texpr) : inline_var option =
+		increment_io_id e;
+		let mk_io ?(has_untyped=false) (iok : inline_object_kind) (id:int) (expr:texpr) : inline_object =
+			let io = {
+				io_kind = iok;
+				io_expr = expr;
+				io_pos = e.epos;
+				io_cancelled = false;
+				io_declared = false;
+				io_fields = PMap.empty;
+				io_aliases = [];
+				io_id_start = id;
+				io_id_end = id;
+				io_has_untyped = has_untyped;
+			} in
+			inline_objs := IntMap.add id io !inline_objs;
+			io
+		in
+		let analyze_aliases_in_lvalue e = analyze_aliases seen_ctors captured true e in
+		let analyze_aliases_in_ctor cf captured e = analyze_aliases (cf::seen_ctors) captured false e in
+		let analyze_aliases captured e = analyze_aliases seen_ctors captured false e in
+		let handle_field_case te fname validate_io =
+			begin match analyze_aliases true te with
+			| Some({iv_state = IVSAliasing io} as iv) when validate_io io ->
+				begin try
+					let fiv = get_io_field io fname in
+					if not (type_iseq_strict fiv.iv_var.v_type e.etype) then raise Not_found;
+					let iv_is_const iv = match iv.iv_kind with IVKField(_,_,Some(_)) -> true | _ -> false in
+					if is_lvalue && iv_is_const fiv then raise Not_found;
+					if fiv.iv_closed then raise Not_found;
+					if not captured || (not is_lvalue && fiv.iv_state == IVSUnassigned) then cancel_iv fiv e.epos;
+					Some(fiv)
+				with Not_found ->
+					cancel_iv iv e.epos;
+					None
+				end
+			| Some(iv) ->
+				cancel_iv iv e.epos;
+				None
+			| _ -> None
+			end
+		in
+		match e.eexpr, e.etype with
+		| TNew({ cl_constructor = Some ({cf_kind = Method MethInline; cf_expr = Some ({eexpr = TFunction tf})} as cf)} as c,tl,pl),_
+		| TMeta((Meta.Inline,_,_),{eexpr = TNew({ cl_constructor = Some ({cf_expr = Some ({eexpr = TFunction tf})} as cf)} as c,tl,pl)}),_
+			when captured && not (List.memq cf seen_ctors) ->
+			begin
+				let io_id = !current_io_id in
+				let rec loop (vs, decls, es) el = match el with
+					| e :: el ->
+						begin match e.eexpr with
+						| TConst _ -> loop (vs, decls, e::es) el
+						| _ ->
+							let v = alloc_var VGenerated "arg" e.etype e.epos in
+							let decle = mk (TVar(v, Some e)) ctx.t.tvoid e.epos in
+							let io_id_start = !current_io_id in
+							ignore(analyze_aliases true decle);
+							let mde = (Meta.InlineConstructorArgument (v.v_id, io_id_start)), [], e.epos in
+							let e = mk (TMeta(mde, e)) e.etype e.epos in
+							loop (v::vs, decle::decls, e::es) el
+						end
+					| [] -> vs, (List.rev decls), (List.rev es)
+				in
+				let argvs, argvdecls, pl = loop ([],[],[]) pl in
+				let _, cname = c.cl_path in
+				let v = alloc_var VGenerated ("inl"^cname) e.etype e.epos in
+				match Inline.type_inline_ctor ctx c cf tf (mk (TLocal v) (TInst (c,tl)) e.epos) pl e.epos with
+				| Some inlined_expr ->
+					let has_untyped = (Meta.has Meta.HasUntyped cf.cf_meta) in
+					let forced = is_extern_ctor c cf || (match e.eexpr with TMeta _ -> true | _ -> false) in
+					let io = mk_io (IOKCtor(cf,forced,argvs)) io_id inlined_expr ~has_untyped:has_untyped in
+					let rec loop (c:tclass) (tl:t list) =
+						let apply = apply_params c.cl_params tl in
+						List.iter (fun cf ->
+							match cf.cf_kind,cf.cf_expr with
+							| Var _, _ ->
+								let fieldt = apply cf.cf_type in
+								ignore(alloc_io_field io cf.cf_name fieldt v.v_pos);
+							| _ -> ()
+						) c.cl_ordered_fields;
+						match c.cl_super with
+						| Some (c,tl) -> loop c (List.map apply tl)
+						| None -> ()
+					in loop c tl;
+					let iv = add v IVKLocal in
+					set_iv_alias iv io;
+					io.io_id_start <- !current_io_id;
+					ignore(analyze_aliases_in_ctor cf true io.io_expr);
+					io.io_id_end <- !current_io_id;
+					Some iv
+				| _ ->
+					List.iter (fun v -> cancel_v v v.v_pos) argvs;
+					if is_extern_ctor c cf then display_error ctx "Extern constructor could not be inlined" e.epos;
+					None
+			end
+		| TNew({ cl_constructor = Some ({cf_kind = Method MethInline; cf_expr = Some _} as cf)} as c,_,pl),_ when is_extern_ctor c cf ->
+			error "Extern constructor could not be inlined" e.epos;
+		| TObjectDecl fl, _ when captured && fl <> [] && List.for_all (fun((s,_,_),_) -> Lexer.is_valid_identifier s) fl ->
+			let v = alloc_var VGenerated "inlobj" e.etype e.epos in
+			let ev = mk (TLocal v) v.v_type e.epos in
+			let el = List.map (fun ((s,_,_),e) ->
+				let ef = mk (TField(ev,FDynamic s)) e.etype e.epos in
+				let e = mk (TBinop(OpAssign,ef,e)) e.etype e.epos in
+				e
+			) fl in
+			let io_expr = make_expr_for_list el ctx.t.tvoid e.epos in
+			let io = mk_io (IOKStructure) !current_io_id io_expr in
+			List.iter (fun ((s,_,_),e) -> ignore(alloc_io_field io s e.etype v.v_pos)) fl;
+			let iv = add v IVKLocal in
+			set_iv_alias iv io;
+			List.iter (fun e -> ignore(analyze_aliases true e)) el;
+			io.io_id_end <- !current_io_id;
+			Some iv
+		| TArrayDecl el, TInst(_, [elemtype]) when captured ->
+			let len = List.length el in
+			let v = alloc_var VGenerated "inlarr" e.etype e.epos in
+			let ev = mk (TLocal v) v.v_type e.epos in
+			let el = List.mapi (fun i e ->
+				let ef = mk (TArray(ev,(mk (TConst(TInt (Int32.of_int i))) e.etype e.epos))) elemtype e.epos in
+				mk (TBinop(OpAssign,ef,e)) elemtype e.epos
+			) el in
+			let io_expr = make_expr_for_list el ctx.t.tvoid e.epos in
+			let io = mk_io (IOKArray(len)) !current_io_id io_expr in
+			ignore(alloc_const_io_field io "length" (mk (TConst(TInt (Int32.of_int len))) ctx.t.tint e.epos));
+			for i = 0 to len-1 do ignore(alloc_io_field io (int_field_name i) elemtype v.v_pos) done;
+			let iv = add v IVKLocal in
+			set_iv_alias iv io;
+			List.iter (fun e -> ignore(analyze_aliases true e)) el;
+			io.io_id_end <- !current_io_id;
+			Some iv
+		| TVar(v,None),_ -> ignore(add v IVKLocal); None
+		| TVar(v,Some rve),_ ->
+			begin match analyze_aliases true rve with
+			| Some({iv_state = IVSAliasing(io)}) ->
+				let iv = add v IVKLocal in
+				set_iv_alias iv io;
+			| _ -> ()
+			end;
+			None
+		| TBinop(OpAssign, lve, rve),_ ->
+			begin match analyze_aliases_in_lvalue lve with
+			| Some({iv_state = IVSUnassigned} as iv) ->
+				begin match analyze_aliases true rve with
+				| Some({iv_state = IVSAliasing(io)}) ->
+					scoped_ivs := iv :: !scoped_ivs;
+					set_iv_alias iv io
+				| _ -> cancel_iv iv lve.epos
+				end;
+				Some iv
+			| Some(iv) -> cancel_iv iv e.epos; ignore(analyze_aliases false rve); None
+			| _ -> ignore(analyze_aliases false rve); None
+			end
+		| TField(te, fa),_ ->
+			handle_field_case te (field_name fa) (fun _ -> true)
+		| TArray(te,{eexpr = TConst (TInt i)}),_ ->
+			let i = Int32.to_int i in
+			let validate_io io = match io.io_kind with IOKArray(l) when i >= 0 && i < l -> true | _ -> false in
+			handle_field_case te (int_field_name i) validate_io
+		| TLocal(v),_ when v.v_id < 0 ->
+			let iv = get_iv v.v_id in
+			if iv.iv_closed || not captured then cancel_iv iv e.epos;
+			Some iv
+		| TBlock(el),_ ->
+			let rec loop = function
+				| [e] -> analyze_aliases captured e
+				| e::el -> ignore(analyze_aliases true e); loop (el)
+				| [] -> None
+			in loop el
+		| TMeta((Meta.InlineConstructorArgument (vid,_),_,_),_),_ ->
+			(try
+				let iv = get_iv vid in
+				if iv.iv_closed || not captured then cancel_iv iv e.epos;
+				Some(get_iv vid)
+			with Not_found -> None)
+		| TParenthesis e,_ | TMeta(_,e),_ | TCast(e,None),_ ->
+			analyze_aliases captured e
+		| _,_ ->
+			let old = !scoped_ivs in
+			scoped_ivs := [];
+			let f e = ignore(analyze_aliases false e) in
+			Type.iter f e;
+			List.iter (fun iv -> iv.iv_closed <- true) !scoped_ivs;
+			scoped_ivs := old;
+			None
+	in
+	ignore(analyze_aliases [] false false e);
+	current_io_id := 0;
+	let rec get_iv_var_decls (iv:inline_var) : texpr list =
+		match iv with
+		| {iv_state = IVSAliasing io} -> get_io_var_decls io
+		| {iv_kind = IVKField(_,_,Some _)} -> []
+		| {iv_state = IVSCancelled} ->
+			let v = iv.iv_var in
+			[(mk (TVar(v,None)) ctx.t.tvoid v.v_pos)]
+		| _ -> []
+	and get_io_var_decls (io:inline_object) : texpr list =
+		if io.io_declared then [] else begin
+			io.io_declared <- true;
+			PMap.foldi (fun _ iv acc -> acc@(get_iv_var_decls iv)) io.io_fields []
+		end
+	in
+	let included_untyped = ref false in
+	let rec final_map ?(unwrap_block = false) (e:texpr) : ((texpr list) * (inline_object option)) =
+		increment_io_id e;
+		let default_case e =
+			let f e =
+				let (el,_) = final_map e in
+				make_expr_for_rev_list el e.etype e.epos
+			in
+			([Type.map_expr f e], None)
+		in
+		match e.eexpr with
+		| TObjectDecl _ | TArrayDecl _ | TNew _ | (TMeta((Meta.Inline,_,_),{eexpr = TNew _})) ->
+			begin try
+				let io = get_io !current_io_id in
+				if io.io_cancelled then begin
+					let result = default_case e in
+					current_io_id := io.io_id_end;
+					result
+				end else begin
+					if io.io_has_untyped then included_untyped := true;
+					current_io_id := io.io_id_start;
+					let el,_ = final_map ~unwrap_block:true io.io_expr in
+					let el = el @ get_io_var_decls io in
+					assert (!current_io_id = io.io_id_end);
+					(el,Some io)
+				end
+			with Not_found ->
+				default_case e
+			end
+		| TVar(v, None) when v.v_id < 0 ->
+			(get_iv_var_decls (get_iv v.v_id)), None
+		| TVar(v,Some e) when v.v_id < 0 ->
+			let el = (get_iv_var_decls (get_iv v.v_id)) in
+			let e,_ = (final_map ~unwrap_block:true e) in (e@el, None)
+		| TBinop(OpAssign, lve, rve) ->
+			let (lvel, lvo) = final_map lve in
+			let (rvel, rvo) = final_map ~unwrap_block:true rve in
+			begin match lvo with
+			| Some(io) ->
+				(rvel@lvel), lvo
+			| None ->
+				let rve = make_expr_for_rev_list rvel rve.etype rve.epos in
+				begin match lvel with
+				| [] -> assert false
+				| e::el ->
+					let e = mk (TBinop(OpAssign, e, rve)) e.etype e.epos in
+					(e::el), None
+				end
+			end
+		| TField(te, fa) ->
+			let (tel, thiso) = final_map te in
+			begin match thiso with
+			| Some io ->
+				let fname = field_name fa in
+				begin match get_io_field io fname with
+				| {iv_state = IVSAliasing io} ->
+					tel, Some io
+				| iv ->
+					let newexpr = match iv.iv_kind with
+						| IVKField(_,_,Some constexpr) -> {constexpr with epos = e.epos}
+						| _ -> mk (TLocal iv.iv_var) e.etype e.epos
+					in
+					(newexpr::tel), None
+				end
+			| None ->
+				let te = make_expr_for_rev_list tel te.etype te.epos in
+				[mk (TField(te, fa)) e.etype e.epos], None
+			end
+		| TArray(te, ({eexpr = TConst (TInt i)} as indexexpr)) ->
+			let (tel, thiso) = final_map te in
+			begin match thiso with
+			| Some io ->
+				let i = Int32.to_int i in
+				let fname = int_field_name i in
+				begin match get_io_field io fname with
+				| {iv_state = IVSAliasing io} ->
+					tel, Some io
+				| iv ->
+					let local = (mk (TLocal iv.iv_var) e.etype e.epos) in
+					(local::tel), None
+				end
+			| None ->
+				let te = make_expr_for_rev_list tel te.etype te.epos in
+				[mk (TArray(te, indexexpr)) e.etype e.epos], None
+			end
+		| TLocal v when v.v_id < 0 ->
+			begin match get_iv v.v_id with
+			| {iv_state = IVSAliasing io} ->
+				[], (Some io)
+			| iv ->
+				([mk (TLocal iv.iv_var) e.etype e.epos], None)
+			end
+		| TBlock el ->
+			let rec loop acc el = match el with
+				| [] -> acc, None
+				| [e] ->
+					let el',io = final_map ~unwrap_block:unwrap_block e in
+					(el'@acc), io
+				| e::el ->
+					let el',_ = final_map ~unwrap_block:unwrap_block e in
+					loop (el'@acc) el
+			in
+			let el, io = loop [] el in
+			let el = if unwrap_block || Option.is_some io then el else [mk (TBlock (List.rev el)) e.etype e.epos] in
+			el, io
+		| TMeta((Meta.InlineConstructorArgument (_,io_id_start),_,_),e) ->
+			let old_io_id = !current_io_id in
+			current_io_id := io_id_start;
+			let result = final_map e in
+			current_io_id := old_io_id;
+			result
+		| TParenthesis e' | TCast(e',None) | TMeta(_,e') ->
+			let el, io = final_map e' in
+			begin match io with
+			| Some io ->
+				el, Some io
+			| None ->
+				let e' = make_expr_for_rev_list el e'.etype e'.epos in
+				[Type.map_expr (fun _ -> e') e], None
+			end
+		| _ -> default_case e
+	in
+	if IntMap.for_all (fun _ io -> io.io_cancelled) !inline_objs then begin
+		IntMap.iter (fun _ iv -> let v = iv.iv_var in if v.v_id < 0 then v.v_id <- -v.v_id ) !vars;
+		e
+	end else begin
+		let el,_ = final_map e in
+		let cf = ctx.curfield in
+		if !included_untyped && not (Meta.has Meta.HasUntyped cf.cf_meta) then cf.cf_meta <- (Meta.HasUntyped,[],e.epos) :: cf.cf_meta;
+		let e = make_expr_for_rev_list el e.etype e.epos in
+		let rec get_pretty_name iv = match iv.iv_kind with
+			| IVKField(io,fname,None) ->
+				begin try
+					let is_user_variable iv = match iv.iv_var.v_kind with VUser _ | VInlined -> true | _ -> false in
+					let iv = List.find is_user_variable io.io_aliases in
+					(get_pretty_name iv) ^ "_" ^ fname;
+				with Not_found ->
+					(get_pretty_name (List.hd io.io_aliases)) ^ "_" ^ fname;
+				end
+			| _ -> iv.iv_var.v_name
+		in
+		IntMap.iter (fun _ iv ->
+			let v = iv.iv_var in
+			if v.v_id < 0 then begin
+				v.v_id <- -v.v_id;
+				v.v_name <- get_pretty_name iv
+			end
+		) !vars;
+		e
+	end
\ No newline at end of file
diff --git a/src/optimization/optimizer.ml b/src/optimization/optimizer.ml
index 494e9d39402eed7e5a59dc7de1ac713701e771ef..c7ae725285951abe4557fb350b809a9aecc96236 100644
--- a/src/optimization/optimizer.ml
+++ b/src/optimization/optimizer.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -24,866 +24,7 @@ open Typecore
 open OptimizerTexpr
 open Error
 open Globals
-
-(* ---------------------------------------------------------------------- *)
-(* API OPTIMIZATIONS *)
-
-let mk_untyped_call name p params =
-	{
-		eexpr = TCall({ eexpr = TLocal(alloc_unbound_var name t_dynamic p); etype = t_dynamic; epos = p }, params);
-		etype = t_dynamic;
-		epos = p;
-	}
-
-let api_inline2 com c field params p =
-	match c.cl_path, field, params with
-	| ([],"Type"),"enumIndex",[{ eexpr = TField (_,FEnum (en,f)) }] -> (match com.platform with
-		| Cs when en.e_extern && not (Meta.has Meta.HxGen en.e_meta) ->
-			(* We don't want to optimize enums from external sources; as they might change unexpectedly *)
-			(* and since native C# enums don't have the concept of index - they have rather a value, *)
-			(* which can't be mapped to a native API - this kind of substitution is dangerous *)
-			None
-		| _ ->
-			Some (mk (TConst (TInt (Int32.of_int f.ef_index))) com.basic.tint p))
-	| ([],"Type"),"enumIndex",[{ eexpr = TCall({ eexpr = TField (_,FEnum (en,f)) },pl) }] when List.for_all (fun e -> not (has_side_effect e)) pl ->
-		(match com.platform with
-			| Cs when en.e_extern && not (Meta.has Meta.HxGen en.e_meta) ->
-				(* see comment above *)
-				None
-			| _ ->
-				Some (mk (TConst (TInt (Int32.of_int f.ef_index))) com.basic.tint p))
-	| ([],"Std"),"int",[{ eexpr = TConst (TInt _) } as e] ->
-		Some { e with epos = p }
-	| ([],"String"),"fromCharCode",[{ eexpr = TConst (TInt i) }] when i > 0l && i < 128l ->
-		Some (mk (TConst (TString (String.make 1 (char_of_int (Int32.to_int i))))) com.basic.tstring p)
-	| ([],"Std"),"string",[{ eexpr = TCast ({ eexpr = TConst c } as e, None)}]
-	| ([],"Std"),"string",[{ eexpr = TConst c } as e] ->
-		(match c with
-		| TString s ->
-			Some { e with epos = p }
-		| TInt i ->
-			Some { eexpr = TConst (TString (Int32.to_string i)); epos = p; etype = com.basic.tstring }
-		| TBool b ->
-			Some { eexpr = TConst (TString (if b then "true" else "false")); epos = p; etype = com.basic.tstring }
-		| _ ->
-			None)
-	| ([],"Std"),"string",[{ eexpr = TIf (_,{ eexpr = TConst (TString _)},Some { eexpr = TConst (TString _) }) } as e] ->
-		Some e
-	| ([],"Std"),"string",[{ eexpr = TLocal v | TField({ eexpr = TLocal v },_) } as ev] when (com.platform = Js || com.platform = Flash) && not (Meta.has Meta.CompilerGenerated v.v_meta) ->
-		let pos = ev.epos in
-		let stringv() =
-			let to_str = mk (TBinop (Ast.OpAdd, mk (TConst (TString "")) com.basic.tstring pos, ev)) com.basic.tstring pos in
-			if com.platform = Js || is_nullable ev.etype then
-				let chk_null = mk (TBinop (Ast.OpEq, ev, mk (TConst TNull) t_dynamic pos)) com.basic.tbool pos in
-				mk (TIf (chk_null, mk (TConst (TString "null")) com.basic.tstring pos, Some to_str)) com.basic.tstring pos
-			else
-				to_str
-		in
-		(match follow ev.etype with
-		| TInst ({ cl_path = [],"String" }, []) ->
-			Some (stringv())
-		| TAbstract ({ a_path = [],"Float" }, []) ->
-			Some (stringv())
-		| TAbstract ({ a_path = [],"Int" }, []) ->
-			Some (stringv())
-		| TAbstract ({ a_path = [],"UInt" }, []) ->
-			Some (stringv())
-		| TAbstract ({ a_path = [],"Bool" }, []) ->
-			Some (stringv())
-		| _ ->
-			None)
-	| ([],"Std"),"int",[{ eexpr = TConst (TFloat f) }] ->
-		let f = float_of_string f in
-		(match classify_float f with
-		| FP_infinite | FP_nan ->
-			None
-		| _ when f <= Int32.to_float Int32.min_int -. 1. || f >= Int32.to_float Int32.max_int +. 1. ->
-			None (* out range, keep platform-specific behavior *)
-		| _ ->
-			Some { eexpr = TConst (TInt (Int32.of_float f)); etype = com.basic.tint; epos = p })
-	| ([],"Math"),"ceil",[{ eexpr = TConst (TFloat f) }] ->
-		let f = float_of_string f in
-		(match classify_float f with
-		| FP_infinite | FP_nan ->
-			None
-		| _ when f <= Int32.to_float Int32.min_int -. 1. || f >= Int32.to_float Int32.max_int ->
-			None (* out range, keep platform-specific behavior *)
-		| _ ->
-			Some { eexpr = TConst (TInt (Int32.of_float (ceil f))); etype = com.basic.tint; epos = p })
-	| ([],"Math"),"floor",[{ eexpr = TConst (TFloat f) }] ->
-		let f = float_of_string f in
-		(match classify_float f with
-		| FP_infinite | FP_nan ->
-			None
-		| _ when f <= Int32.to_float Int32.min_int || f >= Int32.to_float Int32.max_int +. 1. ->
-			None (* out range, keep platform-specific behavior *)
-		| _ ->
-			Some { eexpr = TConst (TInt (Int32.of_float (floor f))); etype = com.basic.tint; epos = p })
-	| (["cs"],"Lib"),("fixed" | "checked" | "unsafe"),[e] ->
-			Some (mk_untyped_call ("__" ^ field ^ "__") p [e])
-	| (["cs"],"Lib"),("lock"),[obj;block] ->
-			Some (mk_untyped_call ("__lock__") p [obj;mk_block block])
-	| (["java"],"Lib"),("lock"),[obj;block] ->
-			Some (mk_untyped_call ("__lock__") p [obj;mk_block block])
-	| _ ->
-		None
-
-let api_inline ctx c field params p = match c.cl_path, field, params with
-	| ([],"Std"),"is",[o;t] | (["js"],"Boot"),"__instanceof",[o;t] when ctx.com.platform = Js ->
-		let mk_local ctx n t pos =
-			mk (TLocal (try
-				PMap.find n ctx.locals
-			with _ ->
-				let v = add_local ctx n t p in
-				v.v_meta <- [Meta.Unbound,[],p];
-				v
-			)) t pos in
-
-		let tstring = ctx.com.basic.tstring in
-		let tbool = ctx.com.basic.tbool in
-		let tint = ctx.com.basic.tint in
-
-		let is_trivial e =
-			match e.eexpr with
-			| TConst _ | TLocal _ -> true
-			| _ -> false
-		in
-
-		let typeof t =
-			let tof = mk_local ctx "__typeof__" (tfun [o.etype] tstring) p in
-			let tof = mk (TCall (tof, [o])) tstring p in
-			mk (TBinop (Ast.OpEq, tof, (mk (TConst (TString t)) tstring p))) tbool p
-		in
-
-		(match t.eexpr with
-		(* generate simple typeof checks for basic types *)
-		| TTypeExpr (TClassDecl ({ cl_path = [],"String" })) -> Some (typeof "string")
-		| TTypeExpr (TAbstractDecl ({ a_path = [],"Bool" })) -> Some (typeof "boolean")
-		| TTypeExpr (TAbstractDecl ({ a_path = [],"Float" })) -> Some (typeof "number")
-		| TTypeExpr (TAbstractDecl ({ a_path = [],"Int" })) when is_trivial o ->
-			(* generate typeof(o) == "number" && (o|0) === o check *)
-			let teq = mk_local ctx "__strict_eq__" (tfun [tint; tint] tbool) p in
-			let lhs = mk (TBinop (Ast.OpOr, o, mk (TConst (TInt Int32.zero)) tint p)) tint p in
-			let jscheck = mk (TCall (teq, [lhs; o])) tbool p in
-			Some(mk (TBinop (Ast.OpBoolAnd, typeof "number", jscheck)) tbool p)
-		| TTypeExpr (TClassDecl ({ cl_path = [],"Array" })) ->
-			(* generate (o instanceof Array) && o.__enum__ == null check *)
-			let iof = mk_local ctx "__instanceof__" (tfun [o.etype;t.etype] tbool) p in
-			let iof = mk (TCall (iof, [o; t])) tbool p in
-			let enum = mk (TField (o, FDynamic "__enum__")) (mk_mono()) p in
-			let null = mk (TConst TNull) (mk_mono()) p in
-			let not_enum = mk (TBinop (Ast.OpEq, enum, null)) tbool p in
-			Some (mk (TBinop (Ast.OpBoolAnd, iof, not_enum)) tbool p)
-		| _ ->
-			None)
-	| (["cs" | "java"],"Lib"),("nativeArray"),[{ eexpr = TArrayDecl args } as edecl; _]
-	| (["haxe";"ds";"_Vector"],"Vector_Impl_"),("fromArrayCopy"),[{ eexpr = TArrayDecl args } as edecl] -> (try
-			let platf = match ctx.com.platform with
-				| Cs -> "cs"
-				| Java -> "java"
-				| _ -> raise Exit
-			in
-			let mpath = if field = "fromArrayCopy" then
-				(["haxe";"ds"],"Vector")
-			else
-				([platf],"NativeArray")
-			in
-
-			let m = ctx.g.do_load_module ctx mpath null_pos in
-			let main = List.find (function | TClassDecl _ | TAbstractDecl _ -> true | _ -> false) m.m_types in
-			let t = match follow edecl.etype, main with
-				| TInst({ cl_path = [],"Array" }, [t]), TClassDecl(cl) ->
-					TInst(cl,[t])
-				| TInst({ cl_path = [],"Array" }, [t]), TAbstractDecl(a) ->
-					TAbstract(a,[t])
-				| _ -> assert false
-			in
-			Some ({ (mk_untyped_call "__array__" p args) with etype = t })
-		with | Exit ->
-			None)
-	| _ ->
-		api_inline2 ctx.com c field params p
-
-(* ---------------------------------------------------------------------- *)
-(* INLINING *)
-
-type in_local = {
-	i_var : tvar;
-	i_subst : tvar;
-	i_outside : bool;
-	i_abstract_this : bool;
-	mutable i_captured : bool;
-	mutable i_write : bool;
-	mutable i_read : int;
-	mutable i_force_temp : bool;
-}
-
-let inline_default_config cf t =
-	(* type substitution on both class and function type parameters *)
-	let rec get_params c pl =
-		match c.cl_super with
-		| None -> c.cl_params, pl
-		| Some (csup,spl) ->
-			let spl = (match apply_params c.cl_params pl (TInst (csup,spl)) with
-			| TInst (_,pl) -> pl
-			| _ -> assert false
-			) in
-			let ct, cpl = get_params csup spl in
-			c.cl_params @ ct, pl @ cpl
-	in
-	let tparams = (match follow t with
-		| TInst (c,pl) -> get_params c pl
-		| _ -> ([],[]))
-	in
-	let pmonos = List.map (fun _ -> mk_mono()) cf.cf_params in
-	let tmonos = snd tparams @ pmonos in
-	let tparams = fst tparams @ cf.cf_params in
-	tparams <> [], apply_params tparams tmonos
-
-let rec type_inline ctx cf f ethis params tret config p ?(self_calling_closure=false) force =
-	(* perform some specific optimization before we inline the call since it's not possible to detect at final optimization time *)
-	try
-		let cl = (match follow ethis.etype with
-			| TInst (c,_) -> c
-			| TAnon a -> (match !(a.a_status) with Statics c -> c | _ -> raise Exit)
-			| _ -> raise Exit
-		) in
-		(match api_inline ctx cl cf.cf_name params p with
-		| None -> raise Exit
-		| Some e -> Some e)
-	with Exit ->
-	let has_params,map_type = match config with Some config -> config | None -> inline_default_config cf ethis.etype in
-	(* locals substitution *)
-	let locals = Hashtbl.create 0 in
-	let local v =
-		try
-			Hashtbl.find locals v.v_id
-		with Not_found ->
-			let v' = alloc_var v.v_name v.v_type v.v_pos in
-			if Meta.has Meta.Unbound v.v_meta then v'.v_meta <- [Meta.Unbound,[],p];
-			let i = {
-				i_var = v;
-				i_subst = v';
-				i_outside = false;
-				i_abstract_this = Meta.has Meta.This v.v_meta;
-				i_captured = false;
-				i_write = false;
-				i_force_temp = false;
-				i_read = 0;
-			} in
-			i.i_subst.v_meta <- List.filter (fun (m,_,_) -> m <> Meta.This) v.v_meta;
-			Hashtbl.add locals v.v_id i;
-			Hashtbl.add locals i.i_subst.v_id i;
-			i
-	in
-	let in_local_fun = ref false in
-	let read_local v =
-		let l = try
-			Hashtbl.find locals v.v_id
-		with Not_found ->
-			(* make sure to duplicate unbound inline variable to prevent dependency leak when unifying monomorph *)
-			if has_meta Meta.Unbound v.v_meta then local v else
-			{
-				i_var = v;
-				i_subst = v;
-				i_outside = true;
-				i_abstract_this = Meta.has Meta.This v.v_meta;
-				i_captured = false;
-				i_write = false;
-				i_force_temp = false;
-				i_read = 0;
-			}
-		in
-		if !in_local_fun then l.i_captured <- true;
-		l
-	in
-	(* use default values for null/unset arguments *)
-	let rec loop pl al first =
-		match pl, al with
-		| _, [] -> []
-		| e :: pl, (v, opt) :: al ->
-			(*
-				if we pass a Null<T> var to an inlined method that needs a T.
-				we need to force a local var to be created on some platforms.
-			*)
-			if ctx.com.config.pf_static && not (is_nullable v.v_type) && is_null e.etype then (local v).i_force_temp <- true;
-			(*
-				if we cast from Dynamic, create a local var as well to do the cast
-				once and allow DCE to perform properly.
-			*)
-			let e = if follow v.v_type != t_dynamic && follow e.etype == t_dynamic then mk (TCast(e,None)) v.v_type e.epos else e in
-			(match e.eexpr, opt with
-			| TConst TNull , Some c -> mk (TConst c) v.v_type e.epos
-			(*
-				This is really weird and should be reviewed again. The problem is that we cannot insert a TCast here because
-				the abstract `this` value could be written to, which is not possible if it is wrapped in a cast.
-
-				The original problem here is that we do not generate a temporary variable and thus mute the type of the
-				`this` variable, which leads to unification errors down the line. See issues #2236 and #3713.
-			*)
-			(* | _ when first && (Meta.has Meta.Impl cf.cf_meta) -> {e with etype = v.v_type} *)
-			| _ -> e) :: loop pl al false
-		| [], (v,opt) :: al ->
-			(mk (TConst (match opt with None -> TNull | Some c -> c)) v.v_type p) :: loop [] al false
-	in
-	(*
-		Build the expr/var subst list
-	*)
-	let ethis = (match ethis.eexpr with TConst TSuper -> { ethis with eexpr = TConst TThis } | _ -> ethis) in
-	let vthis = alloc_var "_this" ethis.etype ethis.epos in
-	let might_be_affected,collect_modified_locals = create_affection_checker() in
-	let had_side_effect = ref false in
-	let inlined_vars = List.map2 (fun e (v,_) ->
-		let l = local v in
-		if has_side_effect e then begin
-			collect_modified_locals e;
-			had_side_effect := true;
-			l.i_force_temp <- true;
-		end;
-		if l.i_abstract_this then l.i_subst.v_extra <- Some ([],Some e);
-		l, e
-	) (ethis :: loop params f.tf_args true) ((vthis,None) :: f.tf_args) in
-	List.iter (fun (l,e) ->
-		if might_be_affected e then l.i_force_temp <- true;
-	) inlined_vars;
-	let inlined_vars = List.rev inlined_vars in
-	(*
-		here, we try to eliminate final returns from the expression tree.
-		However, this is not entirely correct since we don't yet correctly propagate
-		the type of returned expressions upwards ("return" expr itself being Dynamic).
-
-		We also substitute variables with fresh ones that might be renamed at later stage.
-	*)
-	let opt f = function
-		| None -> None
-		| Some e -> Some (f e)
-	in
-	let has_vars = ref false in
-	let in_loop = ref false in
-	let cancel_inlining = ref false in
-	let has_return_value = ref false in
-	let ret_val = (match follow f.tf_type with TAbstract ({ a_path = ([],"Void") },[]) -> false | _ -> true) in
-	let map_pos = if self_calling_closure then (fun e -> e) else (fun e -> { e with epos = p }) in
-	let rec map term e =
-		let po = e.epos in
-		let e = map_pos e in
-		match e.eexpr with
-		| TLocal v ->
-			let l = read_local v in
-			l.i_read <- l.i_read + (if !in_loop then 2 else 1);
-			(* never inline a function which contain a delayed macro because its bound
-				to its variables and not the calling method *)
-			if v.v_name = "$__delayed_call__" then cancel_inlining := true;
-			let e = { e with eexpr = TLocal l.i_subst } in
-			if l.i_abstract_this then mk (TCast(e,None)) v.v_type e.epos else e
-		| TConst TThis ->
-			let l = read_local vthis in
-			l.i_read <- l.i_read + (if !in_loop then 2 else 1);
-			{ e with eexpr = TLocal l.i_subst }
-		| TVar (v,eo) ->
-			has_vars := true;
-			{ e with eexpr = TVar ((local v).i_subst,opt (map false) eo)}
-		| TReturn eo when not !in_local_fun ->
-			if not term then error "Cannot inline a not final return" po;
-			(match eo with
-			| None -> mk (TConst TNull) f.tf_type p
-			| Some e ->
-				has_return_value := true;
-				map term e)
-		| TFor (v,e1,e2) ->
-			let i = local v in
-			let e1 = map false e1 in
-			let old = !in_loop in
-			in_loop := true;
-			let e2 = map false e2 in
-			in_loop := old;
-			{ e with eexpr = TFor (i.i_subst,e1,e2) }
-		| TWhile (cond,eloop,flag) ->
-			let cond = map false cond in
-			let old = !in_loop in
-			in_loop := true;
-			let eloop = map false eloop in
-			in_loop := old;
-			{ e with eexpr = TWhile (cond,eloop,flag) }
-		| TSwitch (e1,cases,def) when term ->
-			let term = term && (def <> None || is_exhaustive e1) in
-			let cases = List.map (fun (el,e) ->
-				let el = List.map (map false) el in
-				el, map term e
-			) cases in
-			let def = opt (map term) def in
-			{ e with eexpr = TSwitch (map false e1,cases,def); etype = if ret_val then unify_min ctx ((List.map snd cases) @ (match def with None -> [] | Some e -> [e])) else e.etype }
-		| TTry (e1,catches) ->
-			{ e with eexpr = TTry (map term e1,List.map (fun (v,e) ->
-				let lv = (local v).i_subst in
-				let e = map term e in
-				lv,e
-			) catches); etype = if term && ret_val then unify_min ctx (e1::List.map snd catches) else e.etype }
-		| TBlock l ->
-			let old = save_locals ctx in
-			let t = ref e.etype in
-			let rec has_term_return e =
-				let rec loop e =
-					let r = match e.eexpr with
-					| TReturn _ -> true
-					| TFunction _ -> false
-					| TIf (_,_,None) | TSwitch (_,_,None) | TFor _ | TWhile (_,_,NormalWhile) -> false (* we might not enter this code at all *)
-					| TTry (a, catches) -> List.for_all has_term_return (a :: List.map snd catches)
-					| TIf (cond,a,Some b) -> has_term_return cond || (has_term_return a && has_term_return b)
-					| TSwitch (cond,cases,Some def) -> has_term_return cond || List.for_all has_term_return (def :: List.map snd cases)
-					| TBinop (OpBoolAnd,a,b) -> has_term_return a && has_term_return b
-					| _ -> Type.iter loop e; false
-					in
-					if r then raise Exit
-				in
-				try loop e; false with Exit -> true
-			in
-			let rec loop = function
-				| [] when term ->
-					t := mk_mono();
-					[mk (TConst TNull) (!t) p]
-				| [] -> []
-				| [e] ->
-					let e = map term e in
-					if term then t := e.etype;
-					[e]
-				| ({ eexpr = TIf (cond,e1,None) } as e) :: l when term && has_term_return e1 ->
-					loop [{ e with eexpr = TIf (cond,e1,Some (mk (TBlock l) e.etype e.epos)); epos = punion e.epos (match List.rev l with e :: _ -> e.epos | [] -> assert false) }]
-				| e :: l ->
-					let e = map false e in
-					e :: loop l
-			in
-			let l = loop l in
-			old();
-			{ e with eexpr = TBlock l; etype = !t }
-		| TIf (econd,eif,Some eelse) when term ->
-			let econd = map false econd in
-			let eif = map term eif in
-			let eelse = map term eelse in
-			{ e with eexpr = TIf(econd,eif,Some eelse); etype = if ret_val then unify_min ctx [eif;eelse] else e.etype }
-		| TParenthesis e1 ->
-			let e1 = map term e1 in
-			mk (TParenthesis e1) e1.etype e.epos
-		| TUnop ((Increment|Decrement) as op,flag,({ eexpr = TLocal v } as e1)) ->
-			let l = read_local v in
-			l.i_write <- true;
-			{e with eexpr = TUnop(op,flag,{e1 with eexpr = TLocal l.i_subst})}
-		| TBinop ((OpAssign | OpAssignOp _) as op,({ eexpr = TLocal v } as e1),e2) ->
-			let l = read_local v in
-			l.i_write <- true;
-			let e2 = map false e2 in
-			{e with eexpr = TBinop(op,{e1 with eexpr = TLocal l.i_subst},e2)}
-		| TObjectDecl fl ->
-			let fl = List.map (fun (s,e) -> s,map false e) fl in
-			begin match follow e.etype with
-				| TAnon an when (match !(an.a_status) with Const -> true | _ -> false) ->
-					{e with eexpr = TObjectDecl fl; etype = TAnon { an with a_status = ref Closed}}
-				| _ ->
-					{e with eexpr = TObjectDecl fl}
-			end
-		| TFunction f ->
-			(match f.tf_args with [] -> () | _ -> has_vars := true);
-			let old = save_locals ctx and old_fun = !in_local_fun in
-			let args = List.map (function(v,c) -> (local v).i_subst, c) f.tf_args in
-			in_local_fun := true;
-			let expr = map false f.tf_expr in
-			in_local_fun := old_fun;
-			old();
-			{ e with eexpr = TFunction { tf_args = args; tf_expr = expr; tf_type = f.tf_type } }
-		| TCall({eexpr = TConst TSuper; etype = t},el) ->
-			begin match follow t with
-			| TInst({ cl_constructor = Some ({cf_kind = Method MethInline; cf_expr = Some ({eexpr = TFunction tf})} as cf)} as c,_) ->
-				begin match type_inline_ctor ctx c cf tf ethis el po with
-				| Some e -> map term e
-				| None -> error "Could not inline super constructor call" po
-				end
-			| _ -> error "Cannot inline function containing super" po
-			end
-		| TConst TSuper ->
-			error "Cannot inline function containing super" po
-		| TMeta(m,e1) ->
-			let e1 = map term e1 in
-			{e with eexpr = TMeta(m,e1)}
-		| _ ->
-			Type.map_expr (map false) e
-	in
-	let e = map true f.tf_expr in
-	(*
-		if variables are not written and used with a const value, let's substitute
-		with the actual value, either create a temp var
-	*)
-	let subst = ref PMap.empty in
-	let is_constant e =
-		let rec loop e =
-			match e.eexpr with
-			| TLocal _
-			| TConst TThis (* not really, but should not be move inside a function body *)
-				-> raise Exit
-			| TField (_,FEnum _)
-			| TTypeExpr _
-			| TConst _ -> ()
-			| _ ->
-				Type.iter loop e
-		in
-		try loop e; true with Exit -> false
-	in
-	let is_writable e =
-		match e.eexpr with
-		| TField _ | TEnumParameter _ | TLocal _ | TArray _ -> true
-		| _  -> false
-	in
-	let force = ref force in
-	let vars = List.fold_left (fun acc (i,e) ->
-		let flag = not i.i_force_temp && (match e.eexpr with
-			| TLocal _ when i.i_abstract_this -> true
-			| TLocal _ | TConst _ -> not i.i_write
-			| TFunction _ -> if i.i_write then error "Cannot modify a closure parameter inside inline method" p; true
-			| _ -> not i.i_write && i.i_read <= 1
-		) in
-		let flag = flag && (not i.i_captured || is_constant e) in
-		(* force inlining if we modify 'this' *)
-		if i.i_write && i.i_abstract_this then force := true;
-		(* force inlining of 'this' variable if it is written *)
-		let flag = if not flag && i.i_abstract_this && i.i_write then begin
-			if not (is_writable e) then error "Cannot modify the abstract value, store it into a local first" p;
-			true
-		end else flag in
-		if flag then begin
-			subst := PMap.add i.i_subst.v_id e !subst;
-			acc
-		end else begin
-			(* mark the replacement local for the analyzer *)
-			if i.i_read <= 1 && not i.i_write then
-				i.i_subst.v_meta <- (Meta.CompilerGenerated,[],p) :: i.i_subst.v_meta;
-			(i.i_subst,Some e) :: acc
-		end
-	) [] inlined_vars in
-	let subst = !subst in
-	let rec inline_params e =
-		match e.eexpr with
-		| TLocal v -> (try PMap.find v.v_id subst with Not_found -> e)
-		| _ -> Type.map_expr inline_params e
-	in
-	let e = (if PMap.is_empty subst then e else inline_params e) in
-	let init = match vars with [] -> None | l -> Some l in
-	(*
-		If we have local variables and returning a value, then this will result in
-		unoptimized JS code, so let's instead skip inlining.
-
-		This could be fixed with better post process code cleanup (planed)
-	*)
-	if !cancel_inlining then
-		None
-	else
-		let wrap e =
-			(* we can't mute the type of the expression because it is not correct to do so *)
-			let etype = if has_params then map_type e.etype else e.etype in
-			(* if the expression is "untyped" and we don't want to unify it accidentally ! *)
-			try (match follow e.etype with
-			| TMono _ | TInst ({cl_kind = KTypeParameter _ },_) ->
-				(match follow tret with
-				| TAbstract ({ a_path = [],"Void" },_) -> e
-				| _ -> raise (Unify_error []))
-			| _ ->
-				type_eq (if ctx.com.config.pf_static then EqDoNotFollowNull else EqStrict) etype tret;
-				e)
-			with Unify_error _ ->
-				mk (TCast (e,None)) tret e.epos
-		in
-		let e = (match e.eexpr, init with
-			| _, None when not !has_return_value ->
-				begin match e.eexpr with
-					| TBlock _ -> {e with etype = tret}
-					| _ -> mk (TBlock [e]) tret e.epos
-				end
-			| TBlock [e] , None -> wrap e
-			| _ , None -> wrap e
-			| TBlock l, Some vl ->
-				let el_v = List.map (fun (v,eo) -> mk (TVar (v,eo)) ctx.t.tvoid e.epos) vl in
-				mk (TBlock (el_v @ l)) tret e.epos
-			| _, Some vl ->
-				let el_v = List.map (fun (v,eo) -> mk (TVar (v,eo)) ctx.t.tvoid e.epos) vl in
-				mk (TBlock (el_v @ [e])) tret e.epos
-		) in
-		let inline_meta e meta = match meta with
-			| (Meta.Deprecated | Meta.Pure),_,_ -> mk (TMeta(meta,e)) e.etype e.epos
-			| _ -> e
-		in
-		let e = List.fold_left inline_meta e cf.cf_meta in
-		let e = Display.Diagnostics.secure_generated_code ctx e in
-		if Meta.has (Meta.Custom ":inlineDebug") ctx.meta then begin
-			let se t = s_expr_pretty true t true (s_type (print_context())) in
-			print_endline (Printf.sprintf "Inline %s:\n\tArgs: %s\n\tExpr: %s\n\tResult: %s"
-				cf.cf_name
-				(String.concat "" (List.map (fun (i,e) -> Printf.sprintf "\n\t\t%s<%i> = %s" (i.i_subst.v_name) (i.i_subst.v_id) (se "\t\t" e)) inlined_vars))
-				(se "\t" f.tf_expr)
-				(se "\t" e)
-			);
-		end;
-		(* we need to replace type-parameters that were used in the expression *)
-		if not has_params then
-			Some e
-		else
-			let mt = map_type cf.cf_type in
-			let unify_func () = unify_raise ctx mt (TFun (List.map (fun e -> "",false,e.etype) params,tret)) p in
-			(match follow ethis.etype with
-			| TAnon a -> (match !(a.a_status) with
-				| Statics {cl_kind = KAbstractImpl a } when Meta.has Meta.Impl cf.cf_meta ->
-					if cf.cf_name <> "_new" then begin
-						(* the first argument must unify with a_this for abstract implementation functions *)
-						let tb = (TFun(("",false,map_type a.a_this) :: List.map (fun e -> "",false,e.etype) (List.tl params),tret)) in
-						unify_raise ctx mt tb p
-					end
-				| _ -> unify_func())
-			| _ -> unify_func());
-			(*
-				this is very expensive since we are building the substitution list for
-				every expression, but hopefully in such cases the expression size is small
-			*)
-			let vars = Hashtbl.create 0 in
-			let map_var v =
-				if not (Hashtbl.mem vars v.v_id) then begin
-					Hashtbl.add vars v.v_id ();
-					if not (read_local v).i_outside then v.v_type <- map_type v.v_type;
-				end;
-				v
-			in
-			let rec map_expr_type e = Type.map_expr_type map_expr_type map_type map_var e in
-			Some (map_expr_type e)
-
-(* Same as type_inline, but modifies the function body to add field inits *)
-and type_inline_ctor ctx c cf tf ethis el po =
-	let field_inits = 
-		let cparams = List.map snd c.cl_params in
-		let ethis = mk (TConst TThis) (TInst (c,cparams)) c.cl_pos in
-		let el = List.fold_left (fun acc cf -> 
-			match cf.cf_kind,cf.cf_expr with
-			| Var _,Some e ->
-				let lhs = mk (TField(ethis,FInstance (c,cparams,cf))) cf.cf_type e.epos in
-				let eassign = mk (TBinop(OpAssign,lhs,e)) cf.cf_type e.epos in
-				eassign :: acc
-			| _ -> acc
-		) [] c.cl_ordered_fields in
-		List.rev el
-	in
-	let tf =
-		if field_inits = [] then tf
-		else
-			let bl = match tf.tf_expr with {eexpr = TBlock b } -> b | x -> [x] in
-			{tf with tf_expr = mk (TBlock (field_inits @ bl)) ctx.t.tvoid c.cl_pos}
-	in
-	type_inline ctx cf tf ethis el ctx.t.tvoid None po true
-
-
-(* ---------------------------------------------------------------------- *)
-(* LOOPS *)
-
-let rec optimize_for_loop ctx (i,pi) e1 e2 p =
-	let t_void = ctx.t.tvoid in
-	let t_int = ctx.t.tint in
-	let lblock el = Some (mk (TBlock el) t_void p) in
-	let mk_field e n =
-		TField (e,try quick_field e.etype n with Not_found -> assert false)
-	in
-	let gen_int_iter pt f_get f_length =
-		let i = add_local ctx i pt pi in
-		let index = gen_local ctx t_int pi in
-		let arr, avars = (match e1.eexpr with
-			| TLocal _ -> e1, None
-			| _ ->
-				let atmp = gen_local ctx e1.etype e1.epos in
-				mk (TLocal atmp) e1.etype e1.epos, (Some (atmp,Some e1))
-		) in
-		let iexpr = mk (TLocal index) t_int p in
-		let e2 = type_expr ctx e2 NoValue in
-		let aget = mk (TVar (i,Some (f_get arr iexpr pt p))) t_void pi in
-		let incr = mk (TUnop (Increment,Prefix,iexpr)) t_int p in
-		let block = match e2.eexpr with
-			| TBlock el -> mk (TBlock (aget :: incr :: el)) t_void e2.epos
-			| _ -> mk (TBlock [aget;incr;e2]) t_void p
-		in
-		let ivar = Some (mk (TConst (TInt 0l)) t_int p) in
-		let elength = f_length arr p in
-		let el = [mk (TWhile (
-				mk (TBinop (OpLt, iexpr, elength)) ctx.t.tbool p,
-				block,
-				NormalWhile
-			)) t_void p;
-		] in
-		let el = match avars with None -> el | Some (v,eo) -> (mk (TVar (v,eo)) t_void p) :: el in
-		let el = (mk (TVar (index,ivar)) t_void p) :: el in
-		lblock el
-	in
-	let get_next_array_element arr iexpr pt p =
-		(mk (TArray (arr,iexpr)) pt p)
-	in
-	let get_array_length arr p =
-		mk (mk_field arr "length") ctx.com.basic.tint p
-	in
-	match e1.eexpr, follow e1.etype with
-	| TNew ({ cl_path = ([],"IntIterator") },[],[i1;i2]) , _ ->
-		let max = (match i1.eexpr , i2.eexpr with
-			| TConst (TInt a), TConst (TInt b) when Int32.compare b a < 0 -> error "Range operator can't iterate backwards" p
-			| _, TConst _ -> None
-			| _ -> Some (gen_local ctx t_int e1.epos)
-		) in
-		let tmp = gen_local ctx t_int pi in
-		let i = add_local ctx i t_int pi in
-		let rec check e =
-			match e.eexpr with
-			| TBinop (OpAssign,{ eexpr = TLocal l },_)
-			| TBinop (OpAssignOp _,{ eexpr = TLocal l },_)
-			| TUnop (Increment,_,{ eexpr = TLocal l })
-			| TUnop (Decrement,_,{ eexpr = TLocal l })  when l == i ->
-				error "Loop variable cannot be modified" e.epos
-			| _ ->
-				Type.iter check e
-		in
-		let e2 = type_expr ctx e2 NoValue in
-		check e2;
-		let etmp = mk (TLocal tmp) t_int p in
-		let incr = mk (TUnop (Increment,Postfix,etmp)) t_int p in
-		let init = mk (TVar (i,Some incr)) t_void pi in
-		let block = match e2.eexpr with
-			| TBlock el -> mk (TBlock (init :: el)) t_void e2.epos
-			| _ -> mk (TBlock [init;e2]) t_void p
-		in
-		(*
-			force locals to be of Int type (to prevent Int/UInt issues)
-		*)
-		let i2 = match follow i2.etype with
-			| TAbstract ({ a_path = ([],"Int") }, []) -> i2
-			| _ -> { i2 with eexpr = TCast(i2, None); etype = t_int }
-		in
-		(match max with
-		| None ->
-			lblock [
-				mk (TVar (tmp,Some i1)) t_void p;
-				mk (TWhile (
-					mk (TBinop (OpLt, etmp, i2)) ctx.t.tbool p,
-					block,
-					NormalWhile
-				)) t_void p;
-			]
-		| Some max ->
-			lblock [
-				mk (TVar (tmp,Some i1)) t_void p;
-				mk (TVar (max,Some i2)) t_void p;
-				mk (TWhile (
-					mk (TBinop (OpLt, etmp, mk (TLocal max) t_int p)) ctx.t.tbool p,
-					block,
-					NormalWhile
-				)) t_void p;
-			])
-	| TArrayDecl el, TInst({ cl_path = [],"Array" },[pt]) when false ->
-		begin try
-			let num_expr = ref 0 in
-			let rec loop e = match fst e with
-				| EContinue | EBreak ->
-					raise Exit
-				| _ ->
-					incr num_expr;
-					Ast.map_expr loop e
-			in
-			ignore(loop e2);
-			let v = add_local ctx i pt p in
-			let e2 = type_expr ctx e2 NoValue in
-			let cost = (List.length el) * !num_expr in
-			let max_cost = try
-				int_of_string (Common.defined_value ctx.com Define.LoopUnrollMaxCost)
-			with Not_found ->
-				250
-			in
-			if cost > max_cost then raise Exit;
-			let eloc = mk (TLocal v) v.v_type p in
-			let el = List.map (fun e ->
-				let e_assign = mk (TBinop(OpAssign,eloc,e)) e.etype e.epos in
-				concat e_assign e2
-			) el in
-			let ev = mk (TVar(v, None)) ctx.t.tvoid p in
-			Some (mk (TBlock (ev :: el)) ctx.t.tvoid p)
-		with Exit ->
-			gen_int_iter pt get_next_array_element get_array_length
-		end
-	| _ , TInst({ cl_path = [],"Array" },[pt])
-	| _ , TInst({ cl_path = ["flash"],"Vector" },[pt]) ->
-		gen_int_iter pt get_next_array_element get_array_length
-	| _ , TInst({ cl_array_access = Some pt } as c,pl) when (try match follow (PMap.find "length" c.cl_fields).cf_type with TAbstract ({ a_path = [],"Int" },[]) -> true | _ -> false with Not_found -> false) && not (PMap.mem "iterator" c.cl_fields) ->
-		gen_int_iter (apply_params c.cl_params pl pt) get_next_array_element get_array_length
-	| _, TAbstract({a_impl = Some c} as a,tl) ->
-		begin try
-			let cf_length = PMap.find "get_length" c.cl_statics in
-			let get_length e p =
-				make_static_call ctx c cf_length (apply_params a.a_params tl) [e] ctx.com.basic.tint p
-			in
-			begin match follow cf_length.cf_type with
-				| TFun(_,tr) ->
-					begin match follow tr with
-						| TAbstract({a_path = [],"Int"},_) -> ()
-						| _ -> raise Not_found
-					end
-				| _ ->
-					raise Not_found
-			end;
-			begin try
-				(* first try: do we have an @:arrayAccess getter field? *)
-				let todo = mk (TConst TNull) ctx.t.tint p in
-				let cf,_,r,_,_ = (!find_array_access_raise_ref) ctx a tl todo None p in
-				let get_next e_base e_index t p =
-					make_static_call ctx c cf (apply_params a.a_params tl) [e_base;e_index] r p
-				in
-				gen_int_iter r get_next get_length
-			with Not_found ->
-				(* second try: do we have @:arrayAccess on the abstract itself? *)
-				if not (Meta.has Meta.ArrayAccess a.a_meta) then raise Not_found;
-				(* let's allow this only for core-type abstracts *)
-				if not (Meta.has Meta.CoreType a.a_meta) then raise Not_found;
-				(* in which case we assume that a singular type parameter is the element type *)
-				let t = match tl with [t] -> t | _ -> raise Not_found in
-				gen_int_iter t get_next_array_element get_length
-		end with Not_found ->
-			None
-		end
-	| _ , TInst ({ cl_kind = KGenericInstance ({ cl_path = ["haxe";"ds"],"GenericStack" },[t]) } as c,[]) ->
-		let tcell = (try (PMap.find "head" c.cl_fields).cf_type with Not_found -> assert false) in
-		let i = add_local ctx i t p in
-		let cell = gen_local ctx tcell p in
-		let cexpr = mk (TLocal cell) tcell p in
-		let e2 = type_expr ctx e2 NoValue in
-		let evar = mk (TVar (i,Some (mk (mk_field cexpr "elt") t p))) t_void pi in
-		let enext = mk (TBinop (OpAssign,cexpr,mk (mk_field cexpr "next") tcell p)) tcell p in
-		let block = match e2.eexpr with
-			| TBlock el -> mk (TBlock (evar :: enext :: el)) t_void e2.epos
-			| _ -> mk (TBlock [evar;enext;e2]) t_void p
-		in
-		lblock [
-			mk (TVar (cell,Some (mk (mk_field e1 "head") tcell p))) t_void p;
-			mk (TWhile (
-				mk (TBinop (OpNotEq, cexpr, mk (TConst TNull) tcell p)) ctx.t.tbool p,
-				block,
-				NormalWhile
-			)) t_void p
-		]
-	| _ ->
-		None
-
-let optimize_for_loop_iterator ctx v e1 e2 p =
-	let c,tl = (match follow e1.etype with TInst (c,pl) -> c,pl | _ -> raise Exit) in
-	let _, _, fhasnext = (try raw_class_field (fun cf -> apply_params c.cl_params tl cf.cf_type) c tl "hasNext" with Not_found -> raise Exit) in
-	if fhasnext.cf_kind <> Method MethInline then raise Exit;
-	let tmp = gen_local ctx e1.etype e1.epos in
-	let eit = mk (TLocal tmp) e1.etype p in
-	let ehasnext = make_call ctx (mk (TField (eit,FInstance (c, tl, fhasnext))) (TFun([],ctx.t.tbool)) p) [] ctx.t.tbool p in
-	let enext = mk (TVar (v,Some (make_call ctx (mk (TField (eit,quick_field_dynamic eit.etype "next")) (TFun ([],v.v_type)) p) [] v.v_type p))) ctx.t.tvoid p in
-	let eblock = (match e2.eexpr with
-		| TBlock el -> { e2 with eexpr = TBlock (enext :: el) }
-		| _ -> mk (TBlock [enext;e2]) ctx.t.tvoid p
-	) in
-	mk (TBlock [
-		mk (TVar (tmp,Some e1)) ctx.t.tvoid p;
-		mk (TWhile (ehasnext,eblock,NormalWhile)) ctx.t.tvoid p
-	]) ctx.t.tvoid p
-
+open Inline
 
 (* ---------------------------------------------------------------------- *)
 (* SANITIZE *)
@@ -901,6 +42,7 @@ let optimize_for_loop_iterator ctx v e1 e2 p =
 let standard_precedence op =
 	let left = true and right = false in
 	match op with
+	| OpIn -> 4, right
 	| OpMult | OpDiv | OpMod -> 5, left
 	| OpAdd | OpSub -> 6, left
 	| OpShl | OpShr | OpUShr -> 7, left
@@ -913,12 +55,13 @@ let standard_precedence op =
 	| OpBoolAnd -> 14, left
 	| OpBoolOr -> 15, left
 	| OpArrow -> 16, left
-	| OpAssignOp OpAssign -> 17, right (* mimics ?: *)
-	| OpAssign | OpAssignOp _ -> 18, right
+	| OpAssignOp OpAssign -> 18, right (* mimics ?: *)
+	| OpAssign | OpAssignOp _ -> 19, right
 
 let rec need_parent e =
 	match e.eexpr with
-	| TConst _ | TLocal _ | TArray _ | TField _ | TEnumParameter _ | TParenthesis _ | TCall _ | TNew _ | TTypeExpr _ | TObjectDecl _ | TArrayDecl _ -> false
+	| TConst _ | TLocal _ | TArray _ | TField _ | TEnumParameter _ | TEnumIndex _ | TParenthesis _
+	| TCall _ | TNew _ | TTypeExpr _ | TObjectDecl _ | TArrayDecl _ | TIdent _ -> false
 	| TCast (e,None) | TMeta(_,e) -> need_parent e
 	| TCast _ | TThrow _ | TReturn _ | TTry _ | TSwitch _ | TFor _ | TIf _ | TWhile _ | TBinop _ | TContinue | TBreak
 	| TBlock _ | TVar _ | TFunction _ | TUnop _ -> true
@@ -939,7 +82,7 @@ let sanitize_expr com e =
 		match e.eexpr with
 		| TVar _	(* needs to be put into blocks *)
 		| TFor _	(* a temp var is needed for holding iterator *)
-		| TCall ({ eexpr = TLocal { v_name = "__js__" } },_) (* we never know *)
+		| TCall ({ eexpr = TIdent "__js__" },_) (* we never know *)
 			-> block e
 		| _ -> e
 	in
@@ -975,6 +118,16 @@ let sanitize_expr com e =
 			| TBinop (op2,_,_) -> if left then not (swap op2 op) else swap op op2
 			| TIf _ -> if left then not (swap (OpAssignOp OpAssign) op) else swap op (OpAssignOp OpAssign)
 			| TCast (e,None) | TMeta (_,e) -> loop e left
+			| TConst (TInt i) when not left ->
+				(match op with
+					| OpAdd | OpSub -> (Int32.to_int i) < 0
+					| _ -> false
+				)
+			| TConst (TFloat flt) when not left ->
+				(match op with
+					| OpAdd | OpSub -> String.get flt 0 = '-'
+					| _ -> false
+				)
 			| _ -> false
 		in
 		let e1 = if loop e1 true then parent e1 else e1 in
@@ -983,6 +136,8 @@ let sanitize_expr com e =
 	| TUnop (op,mode,e1) ->
 		let rec loop ee =
 			match ee.eexpr with
+			| TConst (TInt i) when op = Neg && (Int32.to_int i) < 0 -> parent e1
+			| TConst (TFloat flt) when op = Neg && String.get flt 0 = '-' -> parent e1
 			| TBinop _ | TIf _ | TUnop _ -> parent e1
 			| TCast (e,None) | TMeta (_, e) -> loop e
 			| _ -> e1
@@ -1010,6 +165,8 @@ let sanitize_expr com e =
 		if need_parent e2 then { e with eexpr = TCall(parent e2,args) } else e
 	| TEnumParameter (e2,ef,i) ->
 		if need_parent e2 then { e with eexpr = TEnumParameter(parent e2,ef,i) } else e
+	| TEnumIndex e2 ->
+		if need_parent e2 then { e with eexpr = TEnumIndex(parent e2) } else e
 	| TField (e2,f) ->
 		if need_parent e2 then { e with eexpr = TField(parent e2,f) } else e
 	| TArray (e1,e2) ->
@@ -1065,6 +222,12 @@ let rec sanitize com e =
 (* ---------------------------------------------------------------------- *)
 (* REDUCE *)
 
+let check_enum_construction_args el i =
+	let b,_ = List.fold_left (fun (b,i') e ->
+		(b && (i' = i || not (has_side_effect e))),i' + 1
+	) (true,0) el in
+	b
+
 let reduce_control_flow ctx e = match e.eexpr with
 	| TIf ({ eexpr = TConst (TBool t) },e1,e2) ->
 		(if t then e1 else match e2 with None -> { e with eexpr = TBlock [] } | Some e -> e)
@@ -1074,7 +237,7 @@ let reduce_control_flow ctx e = match e.eexpr with
 		| DoWhile -> e) (* we cant remove while since sub can contain continue/break *)
 	| TSwitch (e1,cases,def) ->
 		let e = match Texpr.skip e1 with
-			| {eexpr = TConst ct} as e1 ->
+			| {eexpr = TConst ct} as e1 when (match ct with TSuper | TThis -> false | _ -> true) ->
 				let rec loop cases = match cases with
 					| (el,e) :: cases ->
 						if List.exists (Texpr.equal e1) el then e
@@ -1097,34 +260,63 @@ let reduce_control_flow ctx e = match e.eexpr with
 	| TCall ({ eexpr = TField (o,FClosure (c,cf)) } as f,el) ->
 		let fmode = (match c with None -> FAnon cf | Some (c,tl) -> FInstance (c,tl,cf)) in
 		{ e with eexpr = TCall ({ f with eexpr = TField (o,fmode) },el) }
+	| TEnumParameter({eexpr = TCall({eexpr = TField(_,FEnum(_,ef1))},el)},ef2,i)
+	| TEnumParameter({eexpr = TParenthesis {eexpr = TCall({eexpr = TField(_,FEnum(_,ef1))},el)}},ef2,i)
+		when ef1 == ef2 && check_enum_construction_args el i ->
+		(try List.nth el i with Failure _ -> e)
 	| _ ->
 		e
 
+let inline_stack = new_rec_stack()
+
 let rec reduce_loop ctx e =
 	let e = Type.map_expr (reduce_loop ctx) e in
 	sanitize_expr ctx.com (match e.eexpr with
-	| TCall ({ eexpr = TField ({ eexpr = TTypeExpr (TClassDecl c) },field) },params) ->
-		(match api_inline ctx c (field_name field) params e.epos with
-		| None -> reduce_expr ctx e
-		| Some e -> reduce_loop ctx e)
-	| TCall ({ eexpr = TFunction func } as ef,el) ->
-		let cf = mk_field "" ef.etype e.epos null_pos in
-		let ethis = mk (TConst TThis) t_dynamic e.epos in
-		let rt = (match follow ef.etype with TFun (_,rt) -> rt | _ -> assert false) in
-		let inl = (try type_inline ctx cf func ethis el rt None e.epos ~self_calling_closure:true false with Error (Custom _,_) -> None) in
-		(match inl with
-		| None -> reduce_expr ctx e
-		| Some e -> reduce_loop ctx e)
+	| TCall(e1,el) ->
+		begin match Texpr.skip e1 with
+			| { eexpr = TFunction func } as ef ->
+				let cf = mk_field "" ef.etype e.epos null_pos in
+				let ethis = mk (TConst TThis) t_dynamic e.epos in
+				let rt = (match follow ef.etype with TFun (_,rt) -> rt | _ -> assert false) in
+				let inl = (try type_inline ctx cf func ethis el rt None e.epos ~self_calling_closure:true false with Error (Custom _,_) -> None) in
+				(match inl with
+				| None -> reduce_expr ctx e
+				| Some e -> reduce_loop ctx e)
+			| {eexpr = TField(ef,(FStatic(_,cf) | FInstance(_,_,cf)))} when cf.cf_kind = Method MethInline && not (rec_stack_memq cf inline_stack) ->
+				begin match cf.cf_expr with
+				| Some {eexpr = TFunction tf} ->
+					let rt = (match follow e1.etype with TFun (_,rt) -> rt | _ -> assert false) in
+					let inl = (try type_inline ctx cf tf ef el rt None e.epos false with Error (Custom _,_) -> None) in
+					(match inl with
+					| None -> reduce_expr ctx e
+					| Some e ->
+						rec_stack_default inline_stack cf (fun cf' -> cf' == cf) (fun () -> reduce_loop ctx e) e)
+				| _ ->
+					reduce_expr ctx e
+				end
+			| { eexpr = TField ({ eexpr = TTypeExpr (TClassDecl c) },field) } ->
+				(match api_inline ctx c (field_name field) el e.epos with
+				| None -> reduce_expr ctx e
+				| Some e -> reduce_loop ctx e)
+			| _ ->
+				reduce_expr ctx e
+		end
 	| _ ->
 		reduce_expr ctx (reduce_control_flow ctx e))
 
 let reduce_expression ctx e =
-	if ctx.com.foptimize then reduce_loop ctx e else e
+	if ctx.com.foptimize then
+		(* We go through rec_stack_default here so that the current field is on inline_stack. This prevents self-recursive
+		   inlining (#7569). *)
+		rec_stack_default inline_stack ctx.curfield (fun cf' -> cf' == ctx.curfield) (fun () -> reduce_loop ctx e) e
+	else
+		e
 
 let rec make_constant_expression ctx ?(concat_strings=false) e =
 	let e = reduce_loop ctx e in
 	match e.eexpr with
 	| TConst _ -> Some e
+	| TField({eexpr = TTypeExpr _},FEnum _) -> Some e
 	| TBinop ((OpAdd|OpSub|OpMult|OpDiv|OpMod|OpShl|OpShr|OpUShr|OpOr|OpAnd|OpXor) as op,e1,e2) -> (match make_constant_expression ctx e1,make_constant_expression ctx e2 with
 		| Some ({eexpr = TConst (TString s1)}), Some ({eexpr = TConst (TString s2)}) when concat_strings ->
 			Some (mk (TConst (TString (s1 ^ s2))) ctx.com.basic.tstring (punion e1.epos e2.epos))
@@ -1163,6 +355,7 @@ let rec make_constant_expression ctx ?(concat_strings=false) e =
 
 (* ---------------------------------------------------------------------- *)
 (* INLINE CONSTRUCTORS *)
+(* This version is disabled by default, use -D old-constructor-inline to use this *)
 
 (*
 	First pass :
@@ -1188,23 +381,6 @@ type inline_info = {
 
 let inline_constructors ctx e =
 	let vars = ref IntMap.empty in
-	let is_valid_ident s =
-		try
-			if String.length s = 0 then raise Exit;
-			begin match String.unsafe_get s 0 with
-				| 'a'..'z' | 'A'..'Z' | '_' -> ()
-				| _ -> raise Exit
-			end;
-			for i = 1 to String.length s - 1 do
-				match String.unsafe_get s i with
-				| 'a'..'z' | 'A'..'Z' | '_' -> ()
-				| '0'..'9' when i > 0 -> ()
-				| _ -> raise Exit
-			done;
-			true
-		with Exit ->
-			false
-	in
 	let cancel v p =
 		try
 			let ii = IntMap.find v.v_id !vars in
@@ -1236,8 +412,7 @@ let inline_constructors ctx e =
 	in
 	let add_field_var v s t =
 		let ii = IntMap.find v.v_id !vars in
-		let v' = alloc_var (Printf.sprintf "%s_%s" v.v_name s) t v.v_pos in
-		v'.v_meta <- (Meta.InlineConstructorVariable,[],v.v_pos) :: v'.v_meta;
+		let v' = alloc_var VInlinedConstructorVariable (Printf.sprintf "%s_%s" v.v_name s) t v.v_pos in
 		ii.ii_fields <- PMap.add s v' ii.ii_fields;
 		v'
 	in
@@ -1245,7 +420,7 @@ let inline_constructors ctx e =
 		if i < 0 then "n" ^ (string_of_int (-i))
 		else (string_of_int i)
 	in
-	let is_extern_ctor c cf = c.cl_extern || Meta.has Meta.Extern cf.cf_meta in
+	let is_extern_ctor c cf = c.cl_extern || has_class_field_flag cf CfExtern in
 	let rec find_locals e = match e.eexpr with
 		| TVar(v,Some e1) ->
 			find_locals e1;
@@ -1272,8 +447,8 @@ let inline_constructors ctx e =
 				| TObjectDecl fl when fl <> [] ->
 					begin try
 						let ev = mk (TLocal v) v.v_type e.epos in
-						let el = List.fold_left (fun acc (s,e) ->
-							if not (is_valid_ident s) then raise Exit;
+						let el = List.fold_left (fun acc ((s,_,_),e) ->
+							if not (Lexer.is_valid_identifier s) then raise Exit;
 							let ef = mk (TField(ev,FDynamic s)) e.etype e.epos in
 							let e = mk (TBinop(OpAssign,ef,e)) e.etype e.epos in
 							e :: acc
@@ -1431,7 +606,7 @@ type compl_locals = {
 	mutable r : (string, (complex_type option * (int * Ast.expr * compl_locals) option)) PMap.t;
 }
 
-let optimize_completion_expr e =
+let optimize_completion_expr e args =
 	let iid = ref 0 in
 	let typing_side_effect = ref false in
 	let locals : compl_locals = { r = PMap.empty } in
@@ -1446,6 +621,11 @@ let optimize_completion_expr e =
 		typing_side_effect := true;
 		locals.r <- PMap.add n (t,(match e with Some e when maybe_typed e -> incr iid; Some (!iid,e,{ r = locals.r }) | _ -> None)) locals.r
 	in
+	let rec hunt_idents e = match fst e with
+		| EConst (Ident i) -> decl i None None
+		| _ -> Ast.iter_expr hunt_idents e
+	in
+	let e0 = e in
 	let rec loop e =
 		let p = snd e in
 		match fst e with
@@ -1466,10 +646,10 @@ let optimize_completion_expr e =
 				());
 			map e
 		| EVars vl ->
-			let vl = List.map (fun ((v,pv),t,e) ->
+			let vl = List.map (fun ((v,pv),final,t,e) ->
 				let e = (match e with None -> None | Some e -> Some (loop e)) in
 				decl v (Option.map fst t) e;
-				((v,pv),t,e)
+				((v,pv),final,t,e)
 			) vl in
 			(EVars vl,p)
 		| EBlock el ->
@@ -1478,36 +658,73 @@ let optimize_completion_expr e =
 			let el = List.fold_left (fun acc e ->
 				typing_side_effect := false;
 				let e = loop e in
-				if !typing_side_effect || Display.is_display_position (pos e) then begin told := true; e :: acc end else acc
+				if !typing_side_effect || DisplayPosition.display_position#enclosed_in (pos e) then begin told := true; e :: acc end else acc
 			) [] el in
 			old();
 			typing_side_effect := !told;
 			(EBlock (List.rev el),p)
-		| EFunction (v,f) ->
-			(match v with
-			| None -> ()
-			| Some name ->
-				decl name None (Some e));
+		| EFunction (kind,f) ->
+			(match kind with
+			| FKNamed ((name,_),_) ->
+				decl name None (Some e)
+			| _ -> ());
 			let old = save() in
 			List.iter (fun ((n,_),_,_,t,e) -> decl n (Option.map fst t) e) f.f_args;
 			let e = map e in
 			old();
 			e
-		| EFor ((EIn ((EConst (Ident n),_) as id,it),p),efor) ->
-			let it = loop it in
-			let old = save() in
-			let etmp = (EConst (Ident "$tmp"),p) in
-			decl n None (Some (EBlock [
-				(EVars [("$tmp",null_pos),None,None],p);
-				(EFor ((EIn (id,it),p),(EBinop (OpAssign,etmp,(EConst (Ident n),p)),p)),p);
-				etmp
-			],p));
-			let efor = loop efor in
-			old();
-			(EFor ((EIn (id,it),p),efor),p)
+		| EFor (header,body) ->
+			let idents = ref []
+			and has_in = ref false in
+			let rec collect_idents e =
+				match e with
+					| EConst (Ident name), p ->
+						idents := (name,p) :: !idents;
+						e
+					| EBinop (OpIn, e, it), p ->
+						has_in := true;
+						(EBinop (OpIn, collect_idents e, loop it), p)
+					| _ ->
+						Ast.map_expr collect_idents e
+			in
+			let header = collect_idents header in
+			(match !idents,!has_in with
+				| [],_ | _,false -> map e
+				| idents,true ->
+					let old = save() in
+					List.iter
+						(fun (name, pos) ->
+							let etmp = (EConst (Ident "`tmp"),pos) in
+							decl name None (Some (EBlock [
+								(EVars [("`tmp",null_pos),false,None,None],p);
+								(EFor(header,(EBinop (OpAssign,etmp,(EConst (Ident name),p)),p)), p);
+								etmp
+							],p));
+						)
+						idents;
+					let body = loop body in
+					old();
+					(EFor(header,body),p)
+			)
 		| EReturn _ ->
 			typing_side_effect := true;
 			map e
+		| ESwitch (e1,cases,def) when DisplayPosition.display_position#enclosed_in p ->
+			let e1 = loop e1 in
+			hunt_idents e1;
+			(* Prune all cases that aren't our display case *)
+			let cases = List.filter (fun (_,_,_,p) -> DisplayPosition.display_position#enclosed_in p) cases in
+			(* Don't throw away the switch subject when we optimize in a case expression because we might need it *)
+			let cases = List.map (fun (el,eg,eo,p) ->
+				List.iter hunt_idents el;
+				el,eg,(try Option.map loop eo with Return e -> Some e),p
+			) cases in
+			let def = match def with
+				| None -> None
+				| Some (None,p) -> Some (None,p)
+				| Some (Some e,p) -> Some (Some (loop e),p)
+			in
+			(ESwitch (e1,cases,def),p)
 		| ESwitch (e,cases,def) ->
 			let e = loop e in
 			let cases = List.map (fun (el,eg,eo,p) -> match eo with
@@ -1516,16 +733,7 @@ let optimize_completion_expr e =
 				| Some e ->
 					let el = List.map loop el in
 					let old = save() in
-					List.iter (fun e ->
-						match fst e with
-						| ECall (_,pl) ->
-							List.iter (fun p ->
-								match fst p with
-								| EConst (Ident i) -> decl i None None (* sadly *)
-								| _ -> ()
-							) pl
-						| _ -> ()
-					) el;
+					List.iter hunt_idents el;
 					let e = loop e in
 					old();
 					el, eg, Some e, p
@@ -1546,6 +754,29 @@ let optimize_completion_expr e =
 				(n,pn), (t,pt), e, p
 			) cl in
 			(ETry (et,cl),p)
+		| ECall(e1,el) when DisplayPosition.display_position#enclosed_in p ->
+			let e1 = loop e1 in
+			let el = List.map (fun e ->
+				if DisplayPosition.display_position#enclosed_in (pos e) then
+					(try loop e with Return e -> e)
+				else
+					(EConst (Ident "null"),(pos e))
+			) el in
+			(ECall(e1,el),p)
+		| ECheckType(e1,th) ->
+			typing_side_effect := true;
+			let e1 = loop e1 in
+			(ECheckType(e1,th),p)
+		| EMeta(m,e1) ->
+			begin try
+				let e1 = loop e1 in
+				(EMeta(m,e1),(pos e))
+			with Return e1 ->
+				let e1 = (EMeta(m,e1),(pos e)) in
+				raise (Return e1)
+			end
+		| EDisplay(_,DKStructure) ->
+			raise (Return e0)
 		| EDisplay (s,call) ->
 			typing_side_effect := true;
 			let tmp_locals = ref [] in
@@ -1562,8 +793,8 @@ let optimize_completion_expr e =
 								PMap.find id (!tmp_hlocals)
 							with Not_found ->
 								let e = subst_locals lc e in
-								let name = "$tmp_" ^ string_of_int id in
-								tmp_locals := ((name,null_pos),None,Some e) :: !tmp_locals;
+								let name = "`tmp_" ^ string_of_int id in
+								tmp_locals := ((name,null_pos),false,None,Some e) :: !tmp_locals;
 								tmp_hlocals := PMap.add id name !tmp_hlocals;
 								name
 							) in
@@ -1595,6 +826,7 @@ let optimize_completion_expr e =
 	and map e =
 		Ast.map_expr loop e
 	in
+	List.iter (fun ((n,_),_,_,t,e) -> decl n (Option.map fst t) e) args;
 	(try loop e with Return e -> e)
 
 (* ---------------------------------------------------------------------- *)
diff --git a/src/optimization/optimizerTexpr.ml b/src/optimization/optimizerTexpr.ml
index ae703076f555b3c7ffb8bc8d5b4906f78c3b96b7..96977ff04e29e9bd4e08ccb6652586d0ac626e1d 100644
--- a/src/optimization/optimizerTexpr.ml
+++ b/src/optimization/optimizerTexpr.ml
@@ -3,73 +3,17 @@ open Type
 open Error
 open Globals
 
-(*
-	PurityState represents whether or not something has a side-effect. Unless otherwise stated
-	by using `@:pure` (equivalent to `@:pure(true)`) or `@:pure(false)`, fields are originally
-	supposed to be "maybe pure". Once all types and fields are known, this is refined by
-	AnalyzerTexpr.Purity.
-
-	There's a special case for fields that override a parent class field or implement an
-	interface field: If the overridden/implemented field is explicitly marked as pure,
-	the type loader marks the overriding/implementing as "expected pure". If during purity
-	inference this assumption does not hold, an error is shown.
-*)
-module PurityState = struct
-	type t =
-		| Pure
-		| Impure
-		| MaybePure
-		| ExpectPure of pos
-
-	let get_purity_from_meta meta =
-		try
-			begin match Meta.get Meta.Pure meta with
-			| (_,[EConst(Ident s),p],_) ->
-				begin match s with
-				| "true" -> Pure
-				| "false" -> Impure
-				| "expect" -> ExpectPure p
-				| _ -> error ("Unsupported purity value " ^ s ^ ", expected true or false") p
-				end
-			| (_,[],_) ->
-				Pure
-			| (_,_,p) ->
-				error "Unsupported purity value" p
-			end
-		with Not_found ->
-			MaybePure
-
-	let get_purity c cf = match get_purity_from_meta cf.cf_meta with
-		| Pure -> Pure
-		| Impure -> Impure
-		| ExpectPure p -> ExpectPure p
-		| _ -> get_purity_from_meta c.cl_meta
-
-	let is_pure c cf = get_purity c cf = Pure
-
-	let is_pure_field_access fa = match fa with
-		| FInstance(c,_,cf) | FClosure(Some(c,_),cf) | FStatic(c,cf) -> is_pure c cf
-		| FAnon cf | FClosure(None,cf) -> (get_purity_from_meta cf.cf_meta = Pure)
-		| FEnum _ -> true
-		| FDynamic _ -> false
-
-	let to_string = function
-		| Pure -> "pure"
-		| Impure -> "impure"
-		| MaybePure -> "maybe"
-		| ExpectPure _ -> "expect"
-end
-
 (* tells if an expression causes side effects. This does not account for potential null accesses (fields/arrays/ops) *)
 let has_side_effect e =
 	let rec loop e =
 		match e.eexpr with
-		| TConst _ | TLocal _ | TTypeExpr _ | TFunction _ -> ()
+		| TConst _ | TLocal _ | TTypeExpr _ | TFunction _ | TIdent _ -> ()
 		| TCall({eexpr = TField(e1,fa)},el) when PurityState.is_pure_field_access fa -> loop e1; List.iter loop el
 		| TNew(c,_,el) when (match c.cl_constructor with Some cf when PurityState.is_pure c cf -> true | _ -> false) -> List.iter loop el
+		| TField(_,fa) when PurityState.is_explicitly_impure fa -> raise Exit
 		| TNew _ | TCall _ | TBinop ((OpAssignOp _ | OpAssign),_,_) | TUnop ((Increment|Decrement),_,_) -> raise Exit
 		| TReturn _ | TBreak | TContinue | TThrow _ | TCast (_,Some _) -> raise Exit
-		| TArray _ | TEnumParameter _ | TCast (_,None) | TBinop _ | TUnop _ | TParenthesis _ | TMeta _ | TWhile _ | TFor _
+		| TArray _ | TEnumParameter _ | TEnumIndex _ | TCast (_,None) | TBinop _ | TUnop _ | TParenthesis _ | TMeta _ | TWhile _ | TFor _
 		| TField _ | TIf _ | TTry _ | TSwitch _ | TArrayDecl _ | TBlock _ | TObjectDecl _ | TVar _ -> Type.iter loop e
 	in
 	try
@@ -88,7 +32,7 @@ let is_read_only_field_access e fa = match fa with
 		true
 	| FDynamic _ ->
 		false
-	| FAnon {cf_kind = Var {v_write = AccNo}} when (match e.eexpr with TLocal v when is_unbound v -> true | _ -> false) -> true
+	| FAnon {cf_kind = Var {v_write = AccNo}} when (match e.eexpr with TIdent _ -> true | _ -> false) -> true
 	| FInstance (c,_,cf) | FStatic (c,cf) | FClosure (Some(c,_),cf) ->
 		begin match cf.cf_kind with
 			| Method MethDynamic -> false
@@ -143,7 +87,7 @@ let optimize_binop e op e1 e2 =
 	in
 	let check_float op f1 f2 =
 		let f = op f1 f2 in
-		let fstr = Common.float_repres f in
+		let fstr = Numeric.float_repres f in
 		if (match classify_float f with FP_nan | FP_infinite -> false | _ -> float_of_string fstr = f) then { e with eexpr = TConst (TFloat fstr) } else e
 	in
 	(match e1.eexpr, e2.eexpr with
@@ -266,7 +210,7 @@ let optimize_binop e op e1 e2 =
 		(match op with
 		| OpAssign -> e
 		| _ ->
-			error "You cannot directly compare enums with arguments. Use either 'switch' or 'Type.enumEq'" e.epos)
+			error "You cannot directly compare enums with arguments. Use either `switch`, `match` or `Type.enumEq`" e.epos)
 	| _ ->
 		e)
 
@@ -298,7 +242,7 @@ let optimize_unop e op flag esub =
 		| NegBits, TConst (TInt i) -> { e with eexpr = TConst (TInt (Int32.lognot i)) }
 		| Neg, TConst (TFloat f) ->
 			let v = 0. -. float_of_string f in
-			let vstr = Common.float_repres v in
+			let vstr = Numeric.float_repres v in
 			if float_of_string vstr = v then
 				{ e with eexpr = TConst (TFloat vstr) }
 			else
diff --git a/src/path.ml b/src/path.ml
deleted file mode 100644
index a3b75cfa335ff5c611f8a496dde7c36ca2dc9a5b..0000000000000000000000000000000000000000
--- a/src/path.ml
+++ /dev/null
@@ -1,148 +0,0 @@
-let get_path_parts f =
-	(*
-		this function is quite weird: it tries to determine whether the given
-		argument is a .hx file path with slashes or a dotted module path and
-		based on that it returns path "parts", which are basically a list of
-		either folders or packages (which are folders too) appended by the module name
-
-		TODO: i started doubting my sanity while writing this comment, let's somehow
-		refactor this stuff so it doesn't mix up file and module paths and doesn't introduce
-		the weird "path part" entity.
-	*)
-	let l = String.length f in
-	if l > 3 && (String.sub f (l-3) 3) = ".hx" then
-		let f = String.sub f 0 (l-3) in (* strip the .hx *)
-		ExtString.String.nsplit (String.concat "/" (ExtString.String.nsplit f "\\")) "/" (* TODO: wouldn't it be faster to Str.split here? *)
-	else
-		ExtString.String.nsplit f "."
-
-let parse_path f =
-	let cl = get_path_parts f in
-	let error msg =
-		let msg = "Could not process argument " ^ f ^ "\n" ^ msg in
-		failwith msg
-	in
-	let invalid_char x =
-		for i = 1 to String.length x - 1 do
-			match x.[i] with
-			| 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' -> ()
-			| c -> error ("invalid character: " ^ (String.make 1 c))
-		done
-	in
-	let rec loop = function
-		| [] ->
-			error "empty part"
-		| [x] ->
-			invalid_char x;
-			[],x
-		| x :: l ->
-			if String.length x = 0 then
-				error "empty part"
-			else if x.[0] < 'a' || x.[0] > 'z' then
-				error "Package name must start with a lower case character";
-			invalid_char x;
-			let path,name = loop l in
-			x :: path,name
-	in
-	loop cl
-
-let starts_uppercase x =
-	x.[0] = '_' || (x.[0] >= 'A' && x.[0] <= 'Z')
-
-let check_uppercase x =
-	if String.length x = 0 then
-		failwith "empty part"
-	else if not (starts_uppercase x) then
-		failwith "Class name must start with uppercase character"
-
-let parse_type_path s =
-	let pack,name = parse_path s in
-	check_uppercase name;
-	pack,name
-
-let path_regex = Str.regexp "[/\\]+"
-let normalize_path path =
-	let rec normalize acc m =
-		match m with
-		| [] ->
-			List.rev acc
-		| Str.Text "." :: Str.Delim _ :: tl when acc = [] ->
-			normalize [] tl
-		| Str.Text ".." :: Str.Delim _ :: tl ->
-			(match acc with
-			| [] -> raise Exit
-			| _ :: acc -> normalize acc tl)
-		| Str.Text t :: Str.Delim _ :: tl ->
-			normalize (t :: acc) tl
-		| Str.Delim _ :: tl ->
-			normalize ("" :: acc) tl
-		| Str.Text t :: [] ->
-			List.rev (t :: acc)
-		| Str.Text _ :: Str.Text  _ :: _ ->
-			assert false
-	in
-	String.concat "/" (normalize [] (Str.full_split path_regex path))
-
-let path_sep = if Globals.is_windows then "\\" else "/"
-
-(** Returns absolute path. Doesn't fix path case on Windows. *)
-let get_full_path f = try Extc.get_full_path f with _ -> f
-
-(** Returns absolute path (on Windows ensures proper case with drive letter upper-cased)
-    Use for returning positions from IDE support functions *)
-let get_real_path =
-	if Globals.is_windows then
-		(fun p -> try Extc.get_real_path p with _ -> p)
-	else
-		get_full_path
-
-(** Returns absolute path guaranteed to be the same for different letter case.
-    Use where equality comparison is required, lowercases the path on Windows *)
-let unique_full_path =
-	if Globals.is_windows then
-		(fun f -> String.lowercase (get_full_path f))
-	else
-		get_full_path
-
-let add_trailing_slash p =
-	let l = String.length p in
-	if l = 0 then
-		"./"
-	else match p.[l-1] with
-		| '\\' | '/' -> p
-		| _ -> p ^ "/"
-
-let rec remove_trailing_slash p =
-	let l = String.length p in
-	if l = 0 then
-		"./"
-	else match p.[l-1] with
-		| '\\' | '/' -> remove_trailing_slash (String.sub p 0 (l - 1))
-		| _ -> p
-
-open Globals
-
-let find_directories target recursive paths =
-	let target_dirs = List.map platform_name platforms in
-	let rec loop acc dir =
-		try
-			let entries = Sys.readdir dir in
-			Array.fold_left (fun acc file ->
-				match file with
-					| "." | ".." ->
-						acc
-					| _ when Sys.is_directory (dir ^ file) && file.[0] >= 'a' && file.[0] <= 'z' ->
-						if List.mem file target_dirs && file <> target then
-							acc
-						else begin
-							let full = (dir ^ file) in
-							if recursive then loop (full :: acc) (full ^ "/")
-							else full :: acc
-						end
-					| _ ->
-						acc
-			) acc entries;
-		with Sys_error _ ->
-			acc
-	in
-	List.fold_left (fun acc dir -> loop acc dir) [] paths
\ No newline at end of file
diff --git a/src/prebuild/main.ml b/src/prebuild/main.ml
new file mode 100644
index 0000000000000000000000000000000000000000..39c1c5eb06703e4626ee64f489da9ad7b7e241aa
--- /dev/null
+++ b/src/prebuild/main.ml
@@ -0,0 +1,218 @@
+open Json
+
+exception Prebuild_error of string
+
+let as_string = function
+	| JString s -> Some s
+	| _ -> None
+
+let as_params = function
+	| JArray s -> Some (List.map (function
+			| JString s -> s
+			| _ -> raise (Prebuild_error "parameter description should be a string")
+		) s)
+	| _ -> None
+
+let as_platforms = function
+	| JArray s -> Some (List.map (function
+			| JString "cross" -> "Cross"
+			| JString "js" -> "Js"
+			| JString "lua" -> "Lua"
+			| JString "neko" -> "Neko"
+			| JString "flash" -> "Flash"
+			| JString "php" -> "Php"
+			| JString "cpp" -> "Cpp"
+			| JString "cs" -> "Cs"
+			| JString "java" -> "Java"
+			| JString "python" -> "Python"
+			| JString "hl" -> "Hl"
+			| JString "eval" -> "Eval"
+			| _ -> raise (Prebuild_error "invalid platform")
+		) s)
+	| _ -> None
+
+let as_targets = function
+	| JArray s -> Some (List.map (function
+			| JString "TClass" -> "TClass"
+			| JString "TClassField" -> "TClassField"
+			| JString "TAbstract" -> "TAbstract"
+			| JString "TAbstractField" -> "TAbstractField"
+			| JString "TEnum" -> "TEnum"
+			| JString "TTypedef" -> "TTypedef"
+			| JString "TAnyField" -> "TAnyField"
+			| JString "TExpr" -> "TExpr"
+			| JString "TTypeParameter" -> "TTypeParameter"
+			| _ -> raise (Prebuild_error "invalid metadata target")
+		) s)
+	| _ -> None
+
+let as_bool = function
+	| JBool b -> Some b
+	| _ -> None
+
+let as_links = function
+	| JArray s -> Some (List.map (function
+			| JString s -> s
+			| _ -> raise (Prebuild_error "link should be a string")
+		) s)
+	| _ -> None
+
+let get_optional_field name map default fields =
+	try
+		let field = List.find (fun (n, _) -> n = name) fields in
+		let value = map (snd field) in
+		match value with
+		| None -> raise (Prebuild_error ("field `" ^ name ^ "` has invalid data"))
+		| Some v -> v
+	with Not_found -> default
+
+let get_field name map fields =
+	let field = try List.find (fun (n, _) -> n = name) fields with Not_found -> raise (Prebuild_error ("no `" ^ name ^ "` field")) in
+	let value = map (snd field) in
+	match value with
+	| None -> raise (Prebuild_error ("field `" ^ name ^ "` has invalid data"))
+	| Some v -> v
+
+let parse_define json =
+	let fields = match json with
+		| JObject fl -> fl
+		| _ -> raise (Prebuild_error "not an object")
+	in
+	(* name *) get_field "name" as_string fields,
+	(* define *) get_field "define" as_string fields,
+	(* doc *) get_field "doc" as_string fields,
+	(* params *) get_optional_field "params" as_params [] fields,
+	(* platforms *) get_optional_field "platforms" as_platforms [] fields,
+	(* links *) get_optional_field "links" as_links [] fields
+
+let parse_meta json =
+	let fields = match json with
+		| JObject fl -> fl
+		| _ -> raise (Prebuild_error "not an object")
+	in
+	(* name *) get_field "name" as_string fields,
+	(* metadata *) get_field "metadata" as_string fields,
+	(* doc *) get_field "doc" as_string fields,
+	(* params *) get_optional_field "params" as_params [] fields,
+	(* platforms *) get_optional_field "platforms" as_platforms [] fields,
+	(* targets *) get_optional_field "targets" as_targets [] fields,
+	(* internal *) get_optional_field "internal" as_bool false fields,
+	(* links *) get_optional_field "links" as_links [] fields
+
+let parse_file_array path map =
+	let file = open_in path in
+	let data = Std.input_all file in
+	let open Json.Reader in
+	let lexbuf = Sedlexing.Utf8.from_string data in
+	let json = read_json lexbuf in
+	match json with
+	| JArray s -> List.map map s
+	| _ -> raise (Prebuild_error "not an array")
+
+let gen_platforms = function
+	| [] -> []
+	| platforms -> ["Platforms [" ^ (String.concat ";" platforms) ^ "]"]
+
+let gen_params = List.map (function param -> "HasParam \"" ^ param ^ "\"" )
+
+let gen_links = List.map (function link -> "Link \"" ^ link ^ "\"" )
+
+let gen_define_type defines =
+	String.concat "\n" (List.map (function (name, _, _, _, _, _) -> "\t| " ^ name) defines)
+
+let gen_define_info defines =
+	let define_str = List.map (function
+		(name, define, doc, params, platforms, links) ->
+			let platforms_str = gen_platforms platforms in
+			let params_str = gen_params params in
+			let links_str = gen_links links in
+			"\t| " ^ name ^ " -> \"" ^ define ^ "\",(" ^ (Printf.sprintf "%S" doc) ^ ",[" ^ (String.concat "; " (platforms_str @ params_str @ links_str)) ^ "])"
+	) defines in
+	String.concat "\n" define_str
+
+let gen_meta_type metas =
+	String.concat "\n" (List.map (function
+		| ("InlineConstructorArgument", _, _, _, _, _, _, _) -> "\t| InlineConstructorArgument of int * int"
+		| (name, _, _, _, _, _, _, _) -> "\t| " ^ name
+	) metas)
+
+let gen_meta_info metas =
+	let meta_str = List.map (function
+		(name, metadata, doc, params, platforms, targets, internal, links) ->
+			let platforms_str = gen_platforms platforms in
+			let params_str = gen_params params in
+			let targets_str = (match targets with
+				| [] -> []
+				| targets -> ["UsedOn [" ^ (String.concat ";" targets) ^ "]"]
+			) in
+			let internal_str = if internal then ["UsedInternally"] else [] in
+			let links_str = gen_links links in
+			let name = (match name with
+				(* this is a hacky, I know *)
+				| "InlineConstructorArgument" -> "InlineConstructorArgument _"
+				| _ -> name
+			) in
+			"\t| " ^ name ^ " -> \"" ^ metadata ^ "\",(" ^ (Printf.sprintf "%S" doc) ^ ",[" ^ (String.concat "; " (platforms_str @ params_str @ targets_str @ internal_str @ links_str)) ^ "])"
+	) metas in
+	String.concat "\n" meta_str
+
+let autogen_header = "(* This file is auto-generated using prebuild from files in src-json *)
+(* Do not edit manually! *)
+"
+
+let define_header = autogen_header ^ "
+open Globals
+
+type define_parameter =
+	| HasParam of string
+	| Platforms of platform list
+	| Link of string
+
+"
+
+let meta_header = autogen_header ^ "
+open Globals
+
+type meta_usage =
+	| TClass
+	| TClassField
+	| TAbstract
+	| TAbstractField
+	| TEnum
+	| TTypedef
+	| TAnyField
+	| TExpr
+	| TTypeParameter
+	| TVariable
+
+type meta_parameter =
+	| HasParam of string
+	| Platforms of platform list
+	| UsedOn of meta_usage list
+	| UsedInternally
+	| Link of string
+
+"
+
+;;
+
+match Sys.argv with
+	| [|_; "define"; define_path|] ->
+		let defines = parse_file_array define_path parse_define in
+		Printf.printf "%s" define_header;
+		Printf.printf "type strict_defined =\n";
+		Printf.printf "%s" (gen_define_type defines);
+		Printf.printf "\n\t| Last\n\n"; (* must be last *)
+		Printf.printf "let infos = function\n";
+		Printf.printf "%s" (gen_define_info defines);
+		Printf.printf "\n\t| Last -> assert false\n"
+	| [|_; "meta"; meta_path|] ->
+		let metas = parse_file_array meta_path parse_meta in
+		Printf.printf "%s" meta_header;
+		Printf.printf "type strict_meta =\n";
+		Printf.printf "%s" (gen_meta_type metas);
+		Printf.printf "\n\t| Last\n\t| Dollar of string\n\t| Custom of string\n\n";
+		Printf.printf "let get_info = function\n";
+		Printf.printf "%s" (gen_meta_info metas);
+		Printf.printf "\n\t| Last -> assert false\n\t| Dollar s -> \"$\" ^ s,(\"\",[])\n\t| Custom s -> s,(\"\",[])\n"
+	| _ -> ()
diff --git a/src/server.ml b/src/server.ml
deleted file mode 100644
index 2f9dda4f4d7f1d799491a45919d40d3508769c53..0000000000000000000000000000000000000000
--- a/src/server.ml
+++ /dev/null
@@ -1,637 +0,0 @@
-open Printf
-open Globals
-open Ast
-open Common
-open Common.DisplayMode
-open Type
-open DisplayOutput
-
-exception Dirty of module_def
-
-let measure_times = ref false
-let prompt = ref false
-let start_time = ref (get_time())
-
-let is_debug_run() =
-	try Sys.getenv "HAXEDEBUG" = "1" with _ -> false
-
-type context = {
-	com : Common.context;
-	mutable flush : unit -> unit;
-	mutable setup : unit -> unit;
-	mutable messages : string list;
-	mutable has_next : bool;
-	mutable has_error : bool;
-}
-
-let report_times print =
-	let tot = ref 0. in
-	Hashtbl.iter (fun _ t -> tot := !tot +. t.total) Common.htimers;
-	if !tot > 0. then begin
-		let buckets = Hashtbl.create 0 in
-		let add id time calls =
-			try
-				let time',calls' = Hashtbl.find buckets id in
-				Hashtbl.replace buckets id (time' +. time,calls' + calls)
-			with Not_found ->
-				Hashtbl.add buckets id (time,calls)
-		in
-		Hashtbl.iter (fun _ t ->
-			let rec loop acc ids = match ids with
-				| id :: ids ->
-					add (List.rev (id :: acc)) t.total t.calls;
-					loop (id :: acc) ids
-				| [] ->
-					()
-			in
-			loop [] t.id
-		) Common.htimers;
-		let max_name = ref 0 in
-		let max_calls = ref 0 in
-		let timers = Hashtbl.fold (fun id t acc ->
-			let name,indent = match List.rev id with
-				| [] -> assert false
-				| name :: l -> name,(String.make (List.length l * 2) ' ')
-			in
-			let name,info = try
-				let i = String.rindex name '.' in
-				String.sub name (i + 1) (String.length name - i - 1),String.sub name 0 i
-			with Not_found ->
-				name,""
-			in
-			let name = indent ^ name in
-			if String.length name > !max_name then max_name := String.length name;
-			if snd t > !max_calls then max_calls := snd t;
-			(id,name,info,t) :: acc
-		) buckets [] in
-		let max_calls = String.length (string_of_int !max_calls) in
-		print (Printf.sprintf "%-*s | %7s |   %% | %*s | info" !max_name "name" "time(s)" max_calls "#");
-		let sep = String.make (!max_name + max_calls + 21) '-' in
-		print sep;
-		let timers = List.sort (fun (id1,_,_,_) (id2,_,_,_) -> compare id1 id2) timers in
-		let print_timer id name info (time,calls) =
-			print (Printf.sprintf "%-*s | %7.3f | %3.0f | %*i | %s" !max_name name time (time *. 100. /. !tot) max_calls calls info)
-		in
-		List.iter (fun (id,name,info,t) -> print_timer id name info t) timers;
-		print sep;
-		print_timer ["total"] "total" "" (!tot,0)
-	end
-
-let default_flush ctx =
-	List.iter prerr_endline (List.rev ctx.messages);
-	if ctx.has_error && !prompt then begin
-		print_endline "Press enter to exit...";
-		ignore(read_line());
-	end;
-	if ctx.has_error then exit 1
-
-let create_context params =
-	let ctx = {
-		com = Common.create version s_version params;
-		flush = (fun()->());
-		setup = (fun()->());
-		messages = [];
-		has_next = false;
-		has_error = false;
-	} in
-	ctx.flush <- (fun() -> default_flush ctx);
-	ctx
-
-let parse_hxml_data data =
-	let lines = Str.split (Str.regexp "[\r\n]+") data in
-	List.concat (List.map (fun l ->
-		let l = unquote (ExtString.String.strip l) in
-		if l = "" || l.[0] = '#' then
-			[]
-		else if l.[0] = '-' then
-			try
-				let a, b = ExtString.String.split l " " in
-				[unquote a; unquote (ExtString.String.strip b)]
-			with
-				_ -> [l]
-		else
-			[l]
-	) lines)
-
-let parse_hxml file =
-	let ch = IO.input_channel (try open_in_bin file with _ -> raise Not_found) in
-	let data = IO.read_all ch in
-	IO.close_in ch;
-	parse_hxml_data data
-
-let ssend sock str =
-	let rec loop pos len =
-		if len = 0 then
-			()
-		else
-			let s = Unix.send sock str pos len [] in
-			loop (pos + s) (len - s)
-	in
-	loop 0 (String.length str)
-
-let rec wait_loop process_params verbose accept =
-	Sys.catch_break false;
-	let has_parse_error = ref false in
-	let cs = CompilationServer.create () in
-	let sign_string com =
-		let sign = get_signature com in
-		let	sign_id =
-			try
-				CompilationServer.get_sign cs sign;
-			with Not_found ->
-				let i = CompilationServer.add_sign cs sign in
-				print_endline (Printf.sprintf "Found context %s:\n%s" i (dump_context com));
-				i
-		in
-		Printf.sprintf "%2s,%3s: " sign_id (short_platform_name com.platform)
-	in
-	MacroContext.macro_enable_cache := true;
-	let current_stdin = ref None in
-	Typeload.parse_hook := (fun com2 file p ->
-		let ffile = Path.unique_full_path file in
-		let is_display_file = ffile = (!Parser.resume_display).pfile in
-
-		match is_display_file, !current_stdin with
-		| true, Some stdin when Common.defined com2 Define.DisplayStdin ->
-			Typeload.parse_file_from_string com2 file p stdin
-		| _ ->
-			let sign = get_signature com2 in
-			let ftime = file_time ffile in
-			let fkey = (ffile,sign) in
-			try
-				let time, data = CompilationServer.find_file cs fkey in
-				if time <> ftime then raise Not_found;
-				data
-			with Not_found ->
-				has_parse_error := false;
-				let data = Typeload.parse_file com2 file p in
-				let info,is_unusual = if !has_parse_error then "not cached, has parse error",true
-					else if is_display_file then "not cached, is display file",true
-					else begin try
-						(* We assume that when not in display mode it's okay to cache stuff that has #if display
-						   checks. The reasoning is that non-display mode has more information than display mode. *)
-						if not com2.display.dms_display then raise Not_found;
-						let ident = Hashtbl.find Parser.special_identifier_files ffile in
-						Printf.sprintf "not cached, using \"%s\" define" ident,true
-					with Not_found ->
-						CompilationServer.cache_file cs fkey (ftime,data);
-						"cached",false
-				end in
-				if verbose && is_unusual then print_endline (Printf.sprintf "%sparsed %s (%s)" (sign_string com2) ffile info);
-				data
-	);
-	let check_module_shadowing com paths m =
-		List.iter (fun (path,_) ->
-			let file = (path ^ (snd m.m_path)) ^ ".hx" in
-			if Sys.file_exists file then begin
-				let time = file_time file in
-				if time > m.m_extra.m_time then begin
-					if verbose then print_endline (Printf.sprintf "%smodule path might have changed: %s\n\twas: %2.0f %s\n\tnow: %2.0f %s"
-						(sign_string com) (s_type_path m.m_path) m.m_extra.m_time m.m_extra.m_file time file);
-					raise Not_found
-				end
-			end
-		) paths
-	in
-	let delays = ref [] in
-	let changed_directories = Hashtbl.create 0 in
-	let arguments = Hashtbl.create 0 in
-	let stat dir =
-		(Unix.stat (Path.remove_trailing_slash dir)).Unix.st_mtime
-	in
-	let get_changed_directories (ctx : Typecore.typer) =
-		let t = Common.timer ["server";"module cache";"changed dirs"] in
-		let com = ctx.Typecore.com in
-		let sign = get_signature com in
-		let dirs = try
-			(* First, check if we already have determined changed directories for current compilation. *)
-			Hashtbl.find changed_directories sign
-		with Not_found ->
-			let dirs = try
-				(* Next, get all directories from the cache and filter the ones that haven't changed. *)
-				let all_dirs = CompilationServer.find_directories cs sign in
-				List.fold_left (fun acc (dir,time) ->
-					try
-						let time' = stat dir in
-						if !time < time' then begin
-							time := time';
-							let sub_dirs = Path.find_directories (platform_name com.platform) false [dir] in
-							List.iter (fun dir ->
-								if not (CompilationServer.has_directory cs sign dir) then begin
-									let time = stat dir in
-									if verbose then print_endline (Printf.sprintf "%sadded directory %s" (sign_string com) dir);
-									CompilationServer.add_directory cs sign (dir,ref time)
-								end;
-							) sub_dirs;
-							(dir,time') :: acc
-						end else
-							acc
-					with Unix.Unix_error _ ->
-						CompilationServer.remove_directory cs sign dir;
-						if verbose then print_endline (Printf.sprintf "%sremoved directory %s" (sign_string com) dir);
-						acc
-				) [] all_dirs
-			with Not_found ->
-				(* There were no directories in the cache, so this must be a new context. Let's add
-				   an empty list to make sure no crazy recursion happens. *)
-				CompilationServer.add_directories cs sign [];
-				(* Register the delay that is going to populate the cache dirs. *)
-				delays := (fun () ->
-					let dirs = ref [] in
-					let add_dir path =
-						try
-							let time = stat path in
-							dirs := (path,ref time) :: !dirs
-						with Unix.Unix_error _ ->
-							()
-					in
-					List.iter add_dir com.class_path;
-					List.iter add_dir (Path.find_directories (platform_name com.platform) true com.class_path);
-					if verbose then print_endline (Printf.sprintf "%sfound %i directories" (sign_string com) (List.length !dirs));
-					CompilationServer.add_directories cs sign !dirs
-				) :: !delays;
-				(* Returning [] should be fine here because it's a new context, so we won't do any
-				   shadowing checks anyway. *)
-				[]
-			in
-			Hashtbl.add changed_directories sign dirs;
-			dirs
-		in
-		t();
-		dirs
-	in
-	let compilation_step = ref 0 in
-	let compilation_mark = ref 0 in
-	let mark_loop = ref 0 in
-	Typeload.type_module_hook := (fun (ctx:Typecore.typer) mpath p ->
-		let t = Common.timer ["server";"module cache"] in
-		let com2 = ctx.Typecore.com in
-		let sign = get_signature com2 in
-		let content_changed m file =
-			let ffile = Path.unique_full_path file in
-			let fkey = (ffile,sign) in
-			try
-				let _, old_data = CompilationServer.find_file cs fkey in
-				(* We must use the module path here because the file path is absolute and would cause
-				   positions in the parsed declarations to differ. *)
-				let new_data = Typeload.parse_module ctx m.m_path p in
-				snd old_data <> snd new_data
-			with Not_found ->
-				true
-		in
-		incr mark_loop;
-		let mark = !mark_loop in
-		let start_mark = !compilation_mark in
-		let rec check m =
-			let check_module_path () =
-				let directories = get_changed_directories ctx in
-				match m.m_extra.m_kind with
-				| MFake | MSub | MImport -> () (* don't get classpath *)
-				| MExtern ->
-					(* if we have a file then this will override our extern type *)
-					let has_file = (try check_module_shadowing com2 directories m; true with Not_found -> false) in
-					if has_file then begin
-						if verbose then print_endline ("A file is masking the library file " ^ s_type_path m.m_path);
-						raise Not_found;
-					end;
-					let rec loop = function
-						| [] ->
-							if verbose then print_endline ("No library file was found for " ^ s_type_path m.m_path);
-							raise Not_found (* no extern registration *)
-						| load :: l ->
-							match load m.m_path p with
-							| None -> loop l
-							| Some (file,_) ->
-								if Path.unique_full_path file <> m.m_extra.m_file then begin
-									if verbose then print_endline ("Library file was changed for " ^ s_type_path m.m_path);
-									raise Not_found;
-								end
-					in
-					loop com2.load_extern_type
-				| MCode -> check_module_shadowing com2 directories m
-				| MMacro when ctx.Typecore.in_macro -> check_module_shadowing com2 directories m
-				| MMacro ->
-					let _, mctx = MacroContext.get_macro_context ctx p in
-					check_module_shadowing mctx.Typecore.com (get_changed_directories mctx) m
-			in
-			let has_policy policy = List.mem policy m.m_extra.m_check_policy in
-			let check_file () =
-				if file_time m.m_extra.m_file <> m.m_extra.m_time then begin
-					if has_policy CheckFileContentModification && not (content_changed m m.m_extra.m_file) then begin
-						if verbose then print_endline (Printf.sprintf "%s%s changed time not but content, reusing" (sign_string com2) m.m_extra.m_file)
-					end else begin
-						if verbose then print_endline (Printf.sprintf "%s%s not cached (%s)" (sign_string com2) (s_type_path m.m_path) (if m.m_extra.m_time = -1. then "macro-in-macro" else "modified"));
-						if m.m_extra.m_kind = MFake then Hashtbl.remove Typecore.fake_modules m.m_extra.m_file;
-						raise Not_found;
-					end
-				end
-			in
-			let check_dependencies () =
-				PMap.iter (fun _ m2 -> match check m2 with
-					| None -> ()
-					| Some m -> raise (Dirty m)
-				) m.m_extra.m_deps;
-			in
-			begin match m.m_extra.m_dirty with
-			| Some m ->
-				Some m
-			| None ->
-				if m.m_extra.m_mark = mark then
-					None
-				else try
-					if m.m_extra.m_mark <= start_mark then begin
-						if not (has_policy NoCheckShadowing) then check_module_path();
-						if not (has_policy NoCheckFileTimeModification) then check_file();
-					end;
-					m.m_extra.m_mark <- mark;
-					if not (has_policy NoCheckDependencies) then check_dependencies();
-					None
-				with
-				| Not_found ->
-					m.m_extra.m_dirty <- Some m;
-					Some m
-				| Dirty m' ->
-					m.m_extra.m_dirty <- Some m';
-					Some m'
-				end
-		in
-		let rec add_modules tabs m0 m =
-			if m.m_extra.m_added < !compilation_step then begin
-				(match m0.m_extra.m_kind, m.m_extra.m_kind with
-				| MCode, MMacro | MMacro, MCode ->
-					(* this was just a dependency to check : do not add to the context *)
-					PMap.iter (Hashtbl.replace com2.resources) m.m_extra.m_binded_res;
-				| _ ->
-					(*if verbose then print_endline (Printf.sprintf "%s%sreusing %s" (sign_string com2) tabs (s_type_path m.m_path));*)
-					m.m_extra.m_added <- !compilation_step;
-					List.iter (fun t ->
-						match t with
-						| TClassDecl c -> c.cl_restore()
-						| TEnumDecl e ->
-							let rec loop acc = function
-								| [] -> ()
-								| (Meta.RealPath,[Ast.EConst (Ast.String path),_],_) :: l ->
-									e.e_path <- Ast.parse_path path;
-									e.e_meta <- (List.rev acc) @ l;
-								| x :: l -> loop (x::acc) l
-							in
-							loop [] e.e_meta
-						| TAbstractDecl a ->
-							a.a_meta <- List.filter (fun (m,_,_) -> m <> Meta.ValueUsed) a.a_meta
-						| _ -> ()
-					) m.m_types;
-					if m.m_extra.m_kind <> MSub then Typeload.add_module ctx m p;
-					PMap.iter (Hashtbl.replace com2.resources) m.m_extra.m_binded_res;
-					if ctx.Typecore.in_macro || com2.display.dms_full_typing then
-						PMap.iter (fun _ m2 -> add_modules (tabs ^ "  ") m0 m2) m.m_extra.m_deps;
-					List.iter (MacroContext.call_init_macro ctx) m.m_extra.m_macro_calls
-				)
-			end
-		in
-		try
-			let m = CompilationServer.find_module cs (mpath,sign) in
-			let tcheck = Common.timer ["server";"module cache";"check"] in
-			begin match check m with
-			| None -> ()
-			| Some m' ->
-				if verbose then print_endline (Printf.sprintf "%sskipping %s%s" (sign_string com2) (s_type_path m.m_path) (if m == m' then "" else Printf.sprintf "(%s)" (s_type_path m'.m_path)));
-				tcheck();
-				raise Not_found;
-			end;
-			tcheck();
-			let tadd = Common.timer ["server";"module cache";"add modules"] in
-			add_modules "" m m;
-			tadd();
-			t();
-			Some m
-		with Not_found ->
-			t();
-			None
-	);
-	let run_count = ref 0 in
-	while true do
-		let read, write, close = accept() in
-		let rec cache_context com =
-			let cache_module m =
-				CompilationServer.cache_module cs (m.m_path,m.m_extra.m_sign) m;
-				(*if verbose then print_endline (Printf.sprintf "%scached %s" (sign_string com) (s_type_path m.m_path));*)
-			in
-			if com.display.dms_full_typing then begin
-				List.iter cache_module com.modules;
-				if verbose then print_endline ("Cached " ^ string_of_int (List.length com.modules) ^ " modules");
-			end;
-			match com.get_macros() with
-			| None -> ()
-			| Some com -> cache_context com
-		in
-		let create params =
-			let ctx = create_context params in
-			ctx.flush <- (fun() ->
-				incr compilation_step;
-				compilation_mark := !mark_loop;
-				List.iter (fun s -> write (s ^ "\n"); if verbose then print_endline ("> " ^ s)) (List.rev ctx.messages);
-				if ctx.has_error then begin
-					measure_times := false;
-					write "\x02\n"
-				end else cache_context ctx.com;
-			);
-			ctx.setup <- (fun() ->
-				let sign = get_signature ctx.com in
-				if verbose then begin
-					let defines = PMap.foldi (fun k v acc -> (k ^ "=" ^ v) :: acc) ctx.com.defines [] in
-					print_endline ("Defines " ^ (String.concat "," (List.sort compare defines)));
-					print_endline ("Using signature " ^ Digest.to_hex sign);
-					print_endline ("Display position: " ^ (Printer.s_pos !Parser.resume_display));
-				end;
-				Parser.display_error := (fun e p -> has_parse_error := true; ctx.com.error (Parser.error_msg e) p);
-				if ctx.com.display.dms_display then begin
-					let file = (!Parser.resume_display).pfile in
-					let fkey = (file,sign) in
-					(* force parsing again : if the completion point have been changed *)
-					CompilationServer.remove_file cs fkey;
-					CompilationServer.taint_modules cs file;
-				end;
-				try
-					if (Hashtbl.find arguments sign) <> ctx.com.class_path then begin
-						if verbose then print_endline (Printf.sprintf "%sclass paths changed, resetting directories" (sign_string ctx.com));
-						Hashtbl.replace arguments sign ctx.com.class_path;
-						CompilationServer.clear_directories cs sign;
-					end;
-				with Not_found ->
-					Hashtbl.add arguments sign ctx.com.class_path;
-					()
-			);
-			ctx.com.print <- (fun str -> write ("\x01" ^ String.concat "\x01" (ExtString.String.nsplit str "\n") ^ "\n"));
-			ctx
-		in
-		(try
-			let s = read() in
-			let t0 = get_time() in
-			let hxml =
-				try
-					let idx = String.index s '\001' in
-					current_stdin := Some (String.sub s (idx + 1) ((String.length s) - idx - 1));
-					(String.sub s 0 idx)
-				with Not_found ->
-					s
-			in
-			let data = parse_hxml_data hxml in
-			if verbose then print_endline ("Processing Arguments [" ^ String.concat "," data ^ "]");
-			(try
-				Hashtbl.clear changed_directories;
-				Common.display_default := DMNone;
-				Parser.resume_display := null_pos;
-				Typeload.return_partial_type := false;
-				measure_times := false;
-				close_times();
-				stats.s_files_parsed := 0;
-				stats.s_classes_built := 0;
-				stats.s_methods_typed := 0;
-				stats.s_macros_called := 0;
-				Hashtbl.clear Common.htimers;
-				let _ = Common.timer ["other"] in
-				incr compilation_step;
-				compilation_mark := !mark_loop;
-				start_time := get_time();
-				process_params create data;
-				close_times();
-				if !measure_times then report_times (fun s -> write (s ^ "\n"))
-			with
-			| Completion str ->
-				if verbose then print_endline ("Completion Response =\n" ^ str);
-				write str
-			| Arg.Bad msg ->
-				print_endline ("Error: " ^ msg);
-			);
-			let fl = !delays in
-			delays := [];
-			List.iter (fun f -> f()) fl;
-			if verbose then begin
-				print_endline (Printf.sprintf "Stats = %d files, %d classes, %d methods, %d macros" !(stats.s_files_parsed) !(stats.s_classes_built) !(stats.s_methods_typed) !(stats.s_macros_called));
-				print_endline (Printf.sprintf "Time spent : %.3fs" (get_time() -. t0));
-			end;
-		with Unix.Unix_error _ ->
-			if verbose then print_endline "Connection Aborted"
-		| e ->
-			let estr = Printexc.to_string e in
-			if verbose then print_endline ("Uncaught Error : " ^ estr);
-			(try write estr with _ -> ());
-			if is_debug_run() then print_endline (Printexc.get_backtrace());
-		);
-		close();
-		current_stdin := None;
-		(* prevent too much fragmentation by doing some compactions every X run *)
-		incr run_count;
-		if !run_count mod 10 = 0 then begin
-			let t0 = get_time() in
-			Gc.compact();
-			if verbose then begin
-				let stat = Gc.quick_stat() in
-				let size = (float_of_int stat.Gc.heap_words) *. 4. in
-				print_endline (Printf.sprintf "Compacted memory %.3fs %.1fMB" (get_time() -. t0) (size /. (1024. *. 1024.)));
-			end
-		end else Gc.minor();
-	done
-
-and init_wait_stdio() =
-	set_binary_mode_in stdin true;
-	set_binary_mode_out stderr true;
-
-	let chin = IO.input_channel stdin in
-	let cherr = IO.output_channel stderr in
-
-	let berr = Buffer.create 0 in
-	let read = fun () ->
-		let len = IO.read_i32 chin in
-		IO.really_nread chin len
-	in
-	let write = Buffer.add_string berr in
-	let close = fun() ->
-		IO.write_i32 cherr (Buffer.length berr);
-		IO.nwrite cherr (Buffer.contents berr);
-		IO.flush cherr
-	in
-	fun() ->
-		Buffer.clear berr;
-		read, write, close
-
-and init_wait_socket verbose host port =
-	let sock = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
-	(try Unix.setsockopt sock Unix.SO_REUSEADDR true with _ -> ());
-	(try Unix.bind sock (Unix.ADDR_INET (Unix.inet_addr_of_string host,port)) with _ -> failwith ("Couldn't wait on " ^ host ^ ":" ^ string_of_int port));
-	if verbose then print_endline ("Waiting on " ^ host ^ ":" ^ string_of_int port);
-	Unix.listen sock 10;
-	let bufsize = 1024 in
-	let tmp = String.create bufsize in
-	let accept() = (
-		let sin, _ = Unix.accept sock in
-		Unix.set_nonblock sin;
-		if verbose then print_endline "Client connected";
-		let b = Buffer.create 0 in
-		let rec read_loop count =
-			try
-				let r = Unix.recv sin tmp 0 bufsize [] in
-				if r = 0 then
-					failwith "Incomplete request"
-				else begin
-					if verbose then Printf.printf "Reading %d bytes\n" r;
-					Buffer.add_substring b tmp 0 r;
-					if tmp.[r-1] = '\000' then
-						Buffer.sub b 0 (Buffer.length b - 1)
-					else
-						read_loop 0
-				end
-			with Unix.Unix_error((Unix.EWOULDBLOCK|Unix.EAGAIN),_,_) ->
-				if count = 100 then
-					failwith "Aborting inactive connection"
-				else begin
-					if verbose then print_endline "Waiting for data...";
-					ignore(Unix.select [] [] [] 0.05); (* wait a bit *)
-					read_loop (count + 1);
-				end
-		in
-		let read = fun() -> (let s = read_loop 0 in Unix.clear_nonblock sin; s) in
-		let write = ssend sin in
-		let close() = Unix.close sin in
-		read, write, close
-	) in
-	accept
-
-and do_connect host port args =
-	let sock = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
-	(try Unix.connect sock (Unix.ADDR_INET (Unix.inet_addr_of_string host,port)) with _ -> failwith ("Couldn't connect on " ^ host ^ ":" ^ string_of_int port));
-	let args = ("--cwd " ^ Unix.getcwd()) :: args in
-	ssend sock (String.concat "" (List.map (fun a -> a ^ "\n") args) ^ "\000");
-	let has_error = ref false in
-	let rec print line =
-		match (if line = "" then '\x00' else line.[0]) with
-		| '\x01' ->
-			print_string (String.concat "\n" (List.tl (ExtString.String.nsplit line "\x01")));
-			flush stdout
-		| '\x02' ->
-			has_error := true;
-		| _ ->
-			prerr_endline line;
-	in
-	let buf = Buffer.create 0 in
-	let process() =
-		let lines = ExtString.String.nsplit (Buffer.contents buf) "\n" in
-		(* the last line ends with \n *)
-		let lines = (match List.rev lines with "" :: l -> List.rev l | _ -> lines) in
-		List.iter print lines;
-	in
-	let tmp = String.create 1024 in
-	let rec loop() =
-		let b = Unix.recv sock tmp 0 1024 [] in
-		Buffer.add_substring buf tmp 0 b;
-		if b > 0 then begin
-			if String.get tmp (b - 1) = '\n' then begin
-				process();
-				Buffer.reset buf;
-			end;
-			loop();
-		end
-	in
-	loop();
-	process();
-	if !has_error then exit 1
\ No newline at end of file
diff --git a/src/syntax/grammar.mly b/src/syntax/grammar.mly
new file mode 100644
index 0000000000000000000000000000000000000000..9a5e3b8950003a95aeb462cc61f8ca7519e04b29
--- /dev/null
+++ b/src/syntax/grammar.mly
@@ -0,0 +1,1558 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+open Globals
+open Ast
+open Reification
+open Parser
+open DisplayPosition
+
+let popt f = parser
+	| [< v = f >] -> Some v
+	| [< >] -> None
+
+let rec plist f = parser
+	| [< v = f; l = plist f >] -> v :: l
+	| [< >] -> []
+
+let rec psep_nonempty sep f = parser
+	| [< v = f; s >] ->
+		let rec loop = parser
+			| [< '(sep2,_) when sep2 = sep; v = f; l = loop >] -> v :: l
+			| [< >] -> []
+		in
+		v :: loop s
+
+let rec psep sep f = parser
+	| [< r = psep_nonempty sep f >] -> r
+	| [< >] -> []
+
+let pignore f =
+	try
+		ignore(f())
+	with Stream.Error _ | Stream.Failure ->
+		()
+
+let expect_unless_resume_p t s = match Stream.peek s with
+	| Some (t',p) when t' = t ->
+		Stream.junk s;
+		p
+	| _ ->
+		syntax_error (Expected [s_token t]) s (next_pos s)
+
+let ident = parser
+	| [< '(Const (Ident i),p) >] -> i,p
+
+let dollar_ident = parser
+	| [< '(Const (Ident i),p) >] -> i,p
+	| [< '(Dollar i,p) >] -> ("$" ^ i),p
+
+let dollar_ident_macro pack = parser
+	| [< '(Const (Ident i),p) >] -> i,p
+	| [< '(Dollar i,p) >] -> ("$" ^ i),p
+	| [< '(Kwd Macro,p) when pack <> [] >] -> "macro", p
+	| [< '(Kwd Extern,p) when pack <> [] >] -> "extern", p
+
+let lower_ident_or_macro = parser
+	| [< '(Const (Ident i),p) when is_lower_ident i >] -> i
+	| [< '(Kwd Macro,_) >] -> "macro"
+	| [< '(Kwd Extern,_) >] -> "extern"
+
+let property_ident = parser
+	| [< i,p = ident >] -> i,p
+	| [< '(Kwd Dynamic,p) >] -> "dynamic",p
+	| [< '(Kwd Default,p) >] -> "default",p
+	| [< '(Kwd Null,p) >] -> "null",p
+
+let questionable_dollar_ident s =
+	let po = match s with parser
+		| [< '(Question,p) >] -> Some p
+		| [< >] -> None
+	in
+	let name,p = dollar_ident s in
+	match po with
+		| None ->
+			false,(name,p)
+		| Some p' ->
+			if p.pmin <> p'.pmax then syntax_error (Custom (Printf.sprintf "Invalid usage of ?, use ?%s instead" name)) s ~pos:(Some p') ();
+			true,(name,p)
+
+let question_mark = parser
+	| [< '(Question,p) >] -> p
+
+let semicolon s =
+	if fst (last_token s) = BrClose then
+		match s with parser
+		| [< '(Semicolon,p) >] -> p
+		| [< >] -> snd (last_token s)
+	else
+		match s with parser
+		| [< '(Semicolon,p) >] -> p
+		| [< s >] ->
+			syntax_error Missing_semicolon s (next_pos s)
+
+let parsing_macro_cond = ref false
+
+let rec	parse_file s =
+	last_doc := None;
+	match s with parser
+	| [< '(Kwd Package,_); pack = parse_package; s >] ->
+		begin match s with parser
+		| [< '(Const(Ident _),p) when pack = [] >] -> error (Custom "Package name must start with a lowercase character") p
+		| [< psem = semicolon; l = parse_type_decls TCAfterImport psem.pmax pack []; '(Eof,_) >] -> pack , l
+		end
+	| [< l = parse_type_decls TCBeforePackage (-1) [] []; '(Eof,_) >] -> [] , l
+
+and parse_type_decls mode pmax pack acc s =
+	try
+		check_type_decl_completion mode pmax s;
+		match s with parser
+		| [< (v,p) = parse_type_decl mode >] ->
+			let mode = match v with
+				| EImport _ | EUsing _ -> TCAfterImport
+				| _ -> TCAfterType
+			in
+			parse_type_decls mode p.pmax pack ((v,p) :: acc) s
+		| [< >] -> List.rev acc
+	with
+	| TypePath ([],Some (name,false),b,p) ->
+		(* resolve imports *)
+		List.iter (fun d ->
+			match fst d with
+			| EImport (t,_) ->
+				(match List.rev t with
+				| (n,_) :: path when n = name && List.for_all (fun (i,_) -> is_lower_ident i) path -> raise (TypePath (List.map fst (List.rev path),Some (name,false),b,p))
+				| _ -> ())
+			| _ -> ()
+		) acc;
+		raise (TypePath (pack,Some(name,true),b,p))
+	| Stream.Error msg when !in_display_file ->
+		handle_stream_error msg s;
+		ignore(resume false false s);
+		parse_type_decls mode (last_pos s).pmax pack acc s
+
+and parse_abstract doc meta flags = parser
+	| [< '(Kwd Abstract,p1); name = type_name; tl = parse_constraint_params; st = parse_abstract_subtype; sl = plist parse_abstract_relations; s >] ->
+		let fl,p2 = match s with parser
+			| [< '(BrOpen,_); fl, p2 = parse_class_fields false p1 >] -> fl,p2
+			| [< >] -> syntax_error (Expected ["{"]) s ([],last_pos s)
+		in
+		let flags = List.map decl_flag_to_abstract_flag flags in
+		let flags = (match st with None -> flags | Some t -> AbOver t :: flags) in
+		({
+			d_name = name;
+			d_doc = doc;
+			d_meta = meta;
+			d_params = tl;
+			d_flags = flags @ sl;
+			d_data = fl;
+		},punion p1 p2)
+
+and parse_type_decl mode s =
+	match s with parser
+	| [< '(Kwd Import,p1) >] -> parse_import s p1
+	| [< '(Kwd Using,p1) >] -> parse_using s p1
+	| [< doc = get_doc; meta = parse_meta; c = parse_common_flags; s >] ->
+		match s with parser
+		| [< '(Kwd Enum,p1) >] ->
+			begin match s with parser
+			| [< a,p = parse_abstract doc ((Meta.Enum,[],null_pos) :: meta) c >] ->
+				(EAbstract a,p)
+			| [< name = type_name; tl = parse_constraint_params; '(BrOpen,_); l = plist parse_enum; '(BrClose,p2) >] ->
+				(EEnum {
+					d_name = name;
+					d_doc = doc;
+					d_meta = meta;
+					d_params = tl;
+					d_flags = List.map decl_flag_to_enum_flag c;
+					d_data = l
+				}, punion p1 p2)
+			end
+		| [< n , p1 = parse_class_flags; name = type_name; tl = parse_constraint_params >] ->
+			let rec loop had_display p0 acc =
+				let check_display p1 =
+					if not had_display && !in_display_file && display_position#enclosed_in p1 then
+						syntax_completion (if List.mem HInterface n then SCInterfaceRelation else SCClassRelation) None (display_position#with_pos p1)
+				in
+				match s with parser
+				| [< '(Kwd Extends,p1); t,b = parse_type_path_or_resume p1 >] ->
+					check_display {p1 with pmin = p0.pmax; pmax = p1.pmin};
+					let p0 = pos t in
+					(* If we don't have type parameters, we have to offset by one so to not complete `extends`
+					   and `implements` after the identifier. *)
+					let p0 = {p0 with pmax = p0.pmax + (if (fst t).tparams = [] then 1 else 0)} in
+					loop (had_display || b) p0 ((HExtends t) :: acc)
+				| [< '(Kwd Implements,p1); t,b = parse_type_path_or_resume p1 >] ->
+					check_display {p1 with pmin = p0.pmax; pmax = p1.pmin};
+					let p0 = pos t in
+					let p0 = {p0 with pmax = p0.pmax + (if (fst t).tparams = [] then 1 else 0)} in
+					loop (had_display || b) p0 ((HImplements t) :: acc)
+				| [< '(BrOpen,p1) >] ->
+					check_display {p1 with pmin = p0.pmax; pmax = p1.pmin};
+					List.rev acc
+				| [< >] ->
+					begin match Stream.peek s with
+					| Some((Const(Ident name),p)) when display_position#enclosed_in p ->
+						syntax_completion (if List.mem HInterface n then SCInterfaceRelation else SCClassRelation) (Some name) p
+					| _ ->
+						check_display {p1 with pmin = p0.pmax; pmax = (next_pos s).pmax};
+						syntax_error (Expected ["extends";"implements";"{"]) s (List.rev acc)
+					end
+			in
+			let hl = loop false (last_pos s) [] in
+			let fl, p2 = parse_class_fields false p1 s in
+			(EClass {
+				d_name = name;
+				d_doc = doc;
+				d_meta = meta;
+				d_params = tl;
+				d_flags = List.map decl_flag_to_class_flag c @ n @ hl;
+				d_data = fl;
+			}, punion p1 p2)
+		| [< '(Kwd Typedef,p1); name = type_name; tl = parse_constraint_params; '(Binop OpAssign,p2); t = parse_complex_type_at p2; s >] ->
+			(match s with parser
+			| [< '(Semicolon,_) >] -> ()
+			| [< >] -> ());
+			(ETypedef {
+				d_name = name;
+				d_doc = doc;
+				d_meta = meta;
+				d_params = tl;
+				d_flags = List.map decl_flag_to_enum_flag c;
+				d_data = t;
+			}, punion p1 (pos t))
+		| [< a,p = parse_abstract doc meta c >] ->
+			EAbstract a,p
+		| [< >] ->
+			check_type_decl_flag_completion mode c s
+
+
+and parse_class doc meta cflags need_name s =
+	let opt_name = if need_name then type_name else (fun s -> match popt type_name s with None -> "",null_pos | Some n -> n) in
+	match s with parser
+	| [< n , p1 = parse_class_flags; name = opt_name; tl = parse_constraint_params; hl = plist parse_class_herit; '(BrOpen,_); fl, p2 = parse_class_fields (not need_name) p1 >] ->
+		(EClass {
+			d_name = name;
+			d_doc = doc;
+			d_meta = meta;
+			d_params = tl;
+			d_flags = List.map fst cflags @ n @ hl;
+			d_data = fl;
+		}, punion p1 p2)
+
+and parse_import s p1 =
+	let rec loop pn acc =
+		match s with parser
+		| [< '(Dot,p) >] ->
+			let resume() =
+				type_path (List.map fst acc) true (punion pn p)
+			in
+			check_resume p resume (fun () -> ());
+			begin match s with parser
+			| [< '(Const (Ident k),p) >] ->
+				loop pn ((k,p) :: acc)
+			| [< '(Kwd Macro,p) >] ->
+				loop pn (("macro",p) :: acc)
+			| [< '(Kwd Extern,p) >] ->
+				loop pn (("extern",p) :: acc)
+			| [< '(Binop OpMult,_); '(Semicolon,p2) >] ->
+				p2, List.rev acc, IAll
+			| [< >] ->
+				ignore(popt semicolon s);
+				syntax_error (Expected ["identifier"]) s (p,List.rev acc,INormal)
+			end
+		| [< '(Semicolon,p2) >] ->
+			p2, List.rev acc, INormal
+		| [< '(Kwd In,_); '(Const (Ident name),pname); '(Semicolon,p2) >] ->
+			p2, List.rev acc, IAsName(name,pname)
+		| [< '(Const (Ident "as"),_); '(Const (Ident name),pname); '(Semicolon,p2) >] ->
+			p2, List.rev acc, IAsName(name,pname)
+		| [< >] ->
+			syntax_error (Expected [".";";";"as"]) s ((last_pos s),List.rev acc,INormal)
+	in
+	let p2, path, mode = (match s with parser
+		| [< '(Const (Ident name),p) >] -> loop p [name,p]
+		| [< >] ->
+			if would_skip_display_position p1 true s then
+				(display_position#with_pos p1,[],INormal)
+			else
+				syntax_error (Expected ["identifier"]) s (p1,[],INormal)
+	) in
+	(EImport (path,mode),punion p1 p2)
+
+and parse_using s p1 =
+	let rec loop pn acc =
+		match s with parser
+		| [< '(Dot,p) >] ->
+			check_resume p (fun () -> type_path (List.map fst acc) false (punion pn p)) (fun () -> ());
+			begin match s with parser
+			| [< '(Const (Ident k),p) >] ->
+				loop pn ((k,p) :: acc)
+			| [< '(Kwd Macro,p) >] ->
+				loop pn (("macro",p) :: acc)
+			| [< '(Kwd Extern,p) >] ->
+				loop pn (("extern",p) :: acc)
+			| [< >] ->
+				syntax_error (Expected ["identifier"]) s (p,List.rev acc);
+			end
+		| [< '(Semicolon,p2) >] ->
+			p2,List.rev acc
+		| [< >] ->
+			syntax_error (Expected [".";";"]) s ((last_pos s),List.rev acc)
+	in
+	let p2, path = (match s with parser
+		| [< '(Const (Ident name),p) >] -> loop p [name,p]
+		| [< >] ->
+			if would_skip_display_position p1 true s then
+				(display_position#with_pos p1,[])
+			else
+				syntax_error (Expected ["identifier"]) s (p1,[])
+	) in
+	(EUsing path,punion p1 p2)
+
+and parse_abstract_relations s =
+	let check_display p1 (ct,p2) =
+		if !in_display_file && p1.pmax < (display_position#get).pmin && p2.pmin >= (display_position#get).pmax then
+			(* This means we skipped the display position between the to/from and the type-hint we parsed.
+			   Very weird case, it was probably a {} like in #7137. Let's discard it and use magic. *)
+			((CTPath magic_type_path,display_position#with_pos p2))
+		else
+			(ct,p2)
+	in
+	match s with parser
+	| [< '(Const (Ident "to"),p1); t = parse_complex_type_at p1 >] -> (AbTo (check_display p1 t))
+	| [< '(Const (Ident "from"),p1); t = parse_complex_type_at p1 >] -> AbFrom (check_display p1 t)
+
+and parse_abstract_subtype s =
+	match s with parser
+	| [< '(POpen, _); t = parse_complex_type; '(PClose,_) >] -> Some t
+	| [< >] -> None
+
+and parse_package s = psep Dot lower_ident_or_macro s
+
+and parse_class_fields tdecl p1 s =
+	let l = parse_class_field_resume tdecl s in
+	let p2 = (match s with parser
+		| [< '(BrClose,p2) >] -> p2
+		| [< >] ->
+			(* We don't want to register this as a syntax error because it's part of the logic in display mode *)
+			if !in_display then (pos (last_token s)) else error (Expected ["}"]) (next_pos s)
+	) in
+	l, p2
+
+and resume tdecl fdecl s =
+	(* look for next variable/function or next type declaration *)
+	let rec junk k =
+		if k <= 0 then () else begin
+			Stream.junk s;
+			junk (k - 1);
+		end
+	in
+	(*
+		walk back tokens which are prefixing a type/field declaration
+	*)
+	let rec junk_tokens k =
+		if k = 0 then
+			()
+		else match List.rev_map fst (Stream.npeek k s) with
+		| Kwd Private :: _ -> junk_tokens (k - 1)
+		| (Const (Ident _) | Kwd _) :: DblDot :: At :: l
+		| (Const (Ident _) | Kwd _) :: At :: l ->
+			junk_tokens (List.length l)
+		| PClose :: l ->
+			(* count matching parenthesises for metadata call *)
+			let rec loop n = function
+				| [] -> []
+				| POpen :: l -> if n = 0 then l else loop (n - 1) l
+				| PClose :: l -> loop (n + 1) l
+				| _ :: l -> loop n l
+			in
+			(match loop 0 l with
+			| (Const (Ident _) | Kwd _) :: At :: l
+			| (Const (Ident _) | Kwd _) :: DblDot :: At :: l -> junk_tokens (List.length l)
+			| _ ->
+				junk k)
+		| _ ->
+			junk k
+	in
+	let rec loop k =
+		match List.rev_map fst (Stream.npeek k s) with
+		(* metadata *)
+		| Kwd _ :: At :: _ | Kwd _ :: DblDot :: At :: _ ->
+			loop (k + 1)
+		(* field declaration *)
+		| Const _ :: Kwd Function :: _
+		| Kwd New :: Kwd Function :: _ when fdecl ->
+			junk_tokens (k - 2);
+			true
+		| Kwd Macro :: _ | Kwd Public :: _ | Kwd Static :: _ | Kwd Var :: _ | Kwd Override :: _ | Kwd Dynamic :: _ | Kwd Inline :: _ when fdecl ->
+			junk_tokens (k - 1);
+			true
+		| BrClose :: _ when tdecl ->
+			junk_tokens (k - 1);
+			false
+		(* type declaration *)
+		| Eof :: _ | Kwd Import :: _ | Kwd Using :: _ | Kwd Extern :: _ | Kwd Class :: _ | Kwd Interface :: _ | Kwd Enum :: _ | Kwd Typedef :: _ | Kwd Abstract :: _->
+			junk_tokens (k - 1);
+			false
+		| [] ->
+			false
+		| _ ->
+			loop (k + 1)
+	in
+	loop 1
+
+and parse_class_field_resume tdecl s =
+	if not (!in_display_file) then
+		plist (parse_class_field tdecl) s
+	else try
+		let c = parse_class_field tdecl s in
+		c :: parse_class_field_resume tdecl s
+	with
+	| Stream.Error msg ->
+		handle_stream_error msg s;
+		if resume tdecl true s then parse_class_field_resume tdecl s else []
+	| Stream.Failure ->
+		if resume tdecl true s then parse_class_field_resume tdecl s else []
+
+and parse_common_flags = parser
+	| [< '(Kwd Private,p); l = parse_common_flags >] -> (DPrivate,p) :: l
+	| [< '(Kwd Extern,p); l = parse_common_flags >] -> (DExtern,p) :: l
+	| [< '(Kwd Final,p); l = parse_common_flags >] -> (DFinal,p) :: l
+	| [< >] -> []
+
+and parse_meta_argument_expr s =
+	let e = expr s in
+	begin match fst e with
+	| EDisplay(e1,DKDot) ->
+		begin try
+			type_path (string_list_of_expr_path_raise e1) false (pos e1)
+		with Exit ->
+			e
+		end
+	| _ ->
+		e
+	end
+
+and parse_meta_params pname s = match s with parser
+	| [< '(POpen,p) when p.pmin = pname.pmax; params = psep Comma parse_meta_argument_expr; >] ->
+		ignore(expect_unless_resume_p PClose s);
+		params
+	| [< >] -> []
+
+and parse_meta_entry = parser
+	[< '(At,p1); s >] ->
+		let meta = check_resume p1 (fun () -> Some (Meta.Last,[],p1)) (fun () -> None) in
+		match s with parser
+		| [< name,p = parse_meta_name p1; params = parse_meta_params p; s >] -> (name,params,punion p1 p)
+		| [< >] -> match meta with None -> serror() | Some meta -> meta
+
+and parse_meta = parser
+	| [< entry = parse_meta_entry; s >] ->
+		entry :: parse_meta s
+	| [< >] -> []
+
+and parse_meta_name_2 p1 acc s =
+	let part,p = match s with parser
+		| [< '(Const (Ident i),p) when p.pmin = p1.pmax >] -> i,p
+		| [< '(Kwd k,p) when p.pmin = p1.pmax >] -> s_keyword k,p
+	in
+	let acc = part :: acc in
+	match s with parser
+	| [< '(Dot,p1); part,p2 = parse_meta_name_2 p1 acc >] -> part,punion p p2
+	| [< >] -> acc,punion p1 p
+
+and parse_meta_name p1 = parser
+	| [< '(DblDot,p) when p.pmin = p1.pmax; s >] ->
+		let meta = check_resume p (fun () -> Some (Meta.Last,p)) (fun() -> None) in
+		begin match s with parser
+		| [< name,p2 = parse_meta_name_2 p [] >] -> (Meta.parse (rev_concat "." name)),p2
+		| [< >] -> match meta with None -> raise Stream.Failure | Some meta -> meta
+		end
+	| [< name,p2 = parse_meta_name_2 p1 [] >] -> (Meta.Custom (rev_concat "." name)),p2
+
+and parse_enum_flags = parser
+	| [< '(Kwd Enum,p) >] -> [] , p
+
+and parse_class_flags = parser
+	| [< '(Kwd Class,p) >] -> [] , p
+	| [< '(Kwd Interface,p) >] -> [HInterface] , p
+
+and parse_complex_type_at p = parser
+	| [< t = parse_complex_type >] -> t
+	| [< s >] ->
+		if would_skip_display_position p false s then
+			CTPath magic_type_path,display_position#with_pos p
+		else
+			serror()
+
+and parse_type_hint = parser
+	| [< '(DblDot,p1); s >] ->
+		let f () = parse_complex_type_at p1 s in
+		check_resume_range p1 s
+			(fun p2 ->
+				let ct = CTPath magic_type_path in
+				pignore(f);
+				ct,display_position#with_pos p1
+			)
+			f
+
+and parse_type_opt = parser
+	| [< t = parse_type_hint >] -> Some t
+	| [< >] -> None
+
+and parse_complex_type s = parse_complex_type_maybe_named false s
+
+and parse_complex_type_maybe_named allow_named = parser
+	| [< '(POpen,p1); tl = psep Comma (parse_complex_type_maybe_named true); '(PClose,p2); s >] ->
+		begin match tl with
+		| [] | [(CTNamed _,_)] ->
+			(* it was () or (a:T) - clearly a new function type syntax, proceed with parsing return type *)
+			parse_function_type_next tl p1 s
+		| [t] ->
+			(* it was some single unnamed type in parenthesis - use old function type syntax  *)
+			let t = CTParent t,punion p1 p2 in
+			parse_complex_type_next t s
+		| _ ->
+			(* it was multiple arguments - clearly a new function type syntax, proceed with parsing return type  *)
+			parse_function_type_next tl p1 s
+		end
+	| [< s >] ->
+		let t = parse_complex_type_inner allow_named s in
+		parse_complex_type_next t s
+
+and parse_structural_extension = parser
+	| [< '(Binop OpGt,p1); s >] ->
+		match s with parser
+		| [< t = parse_type_path >] ->
+			begin match s with parser
+				| [< '(Comma,_) >] -> t
+				| [< >] -> syntax_error (Expected [","]) s t
+			end;
+		| [< >] ->
+			if would_skip_display_position p1 false s then begin
+				begin match s with parser
+					| [< '(Comma,_) >] -> ()
+					| [< >] -> ()
+				end;
+				magic_type_path,display_position#with_pos p1
+			end else raise Stream.Failure
+
+and parse_complex_type_inner allow_named = parser
+	| [< '(POpen,p1); t = parse_complex_type; '(PClose,p2) >] -> CTParent t,punion p1 p2
+	| [< '(BrOpen,p1); s >] ->
+		(match s with parser
+		| [< l,p2 = parse_type_anonymous >] -> CTAnonymous l,punion p1 p2
+		| [< t = parse_structural_extension; s>] ->
+			let tl = t :: plist parse_structural_extension s in
+			(match s with parser
+			| [< l,p2 = parse_type_anonymous >] -> CTExtend (tl,l),punion p1 p2
+			| [< l,p2 = parse_class_fields true p1 >] -> CTExtend (tl,l),punion p1 p2)
+		| [< l,p2 = parse_class_fields true p1 >] -> CTAnonymous l,punion p1 p2
+		| [< >] -> serror())
+	| [< '(Question,p1); t,p2 = parse_complex_type_inner allow_named >] ->
+		CTOptional (t,p2),punion p1 p2
+	| [< n = dollar_ident; s >] ->
+		(match s with parser
+		| [< '(DblDot,_) when allow_named; t = parse_complex_type >] ->
+			let p1 = snd n in
+			let p2 = snd t in
+			CTNamed (n,t),punion p1 p2
+		| [< s >] ->
+			let n,p = n in
+			let t,p = parse_type_path2 None [] n p s in
+			CTPath t,p)
+	| [< t,p = parse_type_path >] ->
+		CTPath t,p
+
+and parse_type_path s = parse_type_path1 None [] s
+
+and parse_type_path1 p0 pack = parser
+	| [< name, p1 = dollar_ident_macro pack; s >] ->
+		parse_type_path2 p0 pack name p1 s
+
+and parse_type_path2 p0 pack name p1 s =
+	let check_display f =
+		let p = match p0 with
+			| None -> p1
+			| Some p -> punion p p1
+		in
+		if !in_display_file && display_position#enclosed_in p then begin
+			{
+				tpackage = List.rev pack;
+				tname = name;
+				tsub = None;
+				tparams = [];
+			},p
+		end else
+			f()
+	in
+	if is_lower_ident name then
+		(match s with parser
+		| [< '(Dot,p) >] ->
+			check_resume p
+				(fun () -> raise (TypePath (List.rev (name :: pack),None,false,punion (match p0 with None -> p1 | Some p0 -> p0) p)))
+				(fun () -> parse_type_path1 (match p0 with None -> Some p1 | Some _ -> p0) (name :: pack) s)
+		| [< '(Semicolon,_) >] ->
+			check_display (fun () -> error (Custom "Type name should start with an uppercase letter") p1)
+		| [< >] ->
+			check_display serror)
+	else
+		let sub,p2 = (match s with parser
+			| [< '(Dot,p); s >] ->
+				(check_resume p
+					(fun () -> raise (TypePath (List.rev pack,Some (name,false),false,punion (match p0 with None -> p1 | Some p0 -> p0) p)))
+					(fun () -> match s with parser
+					| [< '(Const (Ident name),p2) when not (is_lower_ident name) >] -> Some name,p2
+					| [< >] -> serror()))
+			| [< >] -> None,p1
+		) in
+		let params,p2 = (match s with parser
+			| [< '(Binop OpLt,plt); l = psep Comma (parse_type_path_or_const plt) >] ->
+				begin match s with parser
+				| [<'(Binop OpGt,p2) >] -> l,p2
+				| [< >] ->
+					syntax_error (Expected [">"]) s (l,pos (last_token s))
+				end
+			| [< >] -> [],p2
+		) in
+		{
+			tpackage = List.rev pack;
+			tname = name;
+			tparams = params;
+			tsub = sub;
+		},punion (match p0 with None -> p1 | Some p -> p) p2
+
+and type_name = parser
+	| [< '(Const (Ident name),p); s >] ->
+		if is_lower_ident name then
+			syntax_error (Custom "Type name should start with an uppercase letter") ~pos:(Some p) s (name,p)
+		else
+			name,p
+	| [< '(Dollar name,p) >] -> "$" ^ name,p
+
+and parse_type_path_or_const plt = parser
+	(* we can't allow (expr) here *)
+	| [< '(BkOpen,p1); e = parse_array_decl p1 >] -> TPExpr (e)
+	| [< t = parse_complex_type >] -> TPType t
+	| [< '(Const c,p) >] -> TPExpr (EConst c,p)
+	| [< '(Kwd True,p) >] -> TPExpr (EConst (Ident "true"),p)
+	| [< '(Kwd False,p) >] -> TPExpr (EConst (Ident "false"),p)
+	| [< e = expr >] -> TPExpr e
+	| [< s >] ->
+		if !in_display_file then begin
+			if would_skip_display_position plt false s then begin
+				let ct = CTPath magic_type_path in
+				TPType (ct,display_position#with_pos plt)
+			end else
+				raise Stream.Failure
+		end else
+			serror()
+
+and parse_complex_type_next (t : type_hint) s =
+	let make_fun t2 p2 = match t2 with
+		| CTFunction (args,r) ->
+			CTFunction (t :: args,r),punion (pos t) p2
+		| _ ->
+			CTFunction ([t] , (t2,p2)),punion (pos t) p2
+	in
+	let make_intersection t2 p2 = match t2 with
+		| CTIntersection tl ->
+			CTIntersection (t :: tl),punion (pos t) p2
+		| _ ->
+			CTIntersection ([t;t2,p2]),punion (pos t) p2
+	in
+	match s with parser
+	| [< '(Arrow,pa); s >] ->
+		begin match s with parser
+		| [< t2,p2 = parse_complex_type >] -> make_fun t2 p2
+		| [< >] ->
+			if would_skip_display_position pa false s then begin
+				let ct = CTPath magic_type_path in
+				make_fun ct (display_position#with_pos pa)
+			end else serror()
+		end
+	| [< '(Binop OpAnd,pa); s >] ->
+		begin match s with parser
+		| [< t2,p2 = parse_complex_type >] -> make_intersection t2 p2
+		| [< >] ->
+			if would_skip_display_position pa false s then begin
+				let ct = CTPath magic_type_path in
+				make_intersection ct (display_position#with_pos pa)
+			end else serror()
+		end
+	| [< >] -> t
+
+and parse_function_type_next tl p1 = parser
+	| [< '(Arrow,pa); s >] ->
+		begin match s with parser
+		| [< tret = parse_complex_type_inner false >] -> CTFunction (tl,tret), punion p1 (snd tret)
+		| [< >] -> if would_skip_display_position pa false s then begin
+				let ct = (CTPath magic_type_path),(display_position#with_pos pa) in
+				CTFunction (tl,ct), punion p1 pa
+			end else serror()
+		end
+	| [< >] -> serror ()
+
+and parse_type_anonymous s =
+	let p0 = popt question_mark s in
+	match s with parser
+	| [< name, p1 = ident; t = parse_type_hint; s >] ->
+		let opt,p1 = match p0 with
+			| Some p -> true,p
+			| None -> false,p1
+		in
+		let p2 = pos (last_token s) in
+		let next acc =
+			{
+				cff_name = name,p1;
+				cff_meta = if opt then [Meta.Optional,[],null_pos] else [];
+				cff_access = [];
+				cff_doc = None;
+				cff_kind = FVar (Some t,None);
+				cff_pos = punion p1 p2;
+			} :: acc
+		in
+		begin match s with parser
+		| [< '(BrClose,p2) >] -> next [],p2
+		| [< '(Comma,p2) >] ->
+			(match s with parser
+			| [< '(BrClose,p2) >] -> next [],p2
+			| [< l,p2 = parse_type_anonymous >] -> next l,punion p1 p2
+			| [< >] -> serror());
+		| [< >] ->
+			syntax_error (Expected [",";"}"]) s (next [],p2)
+		end
+	| [< >] ->
+		if p0 = None then raise Stream.Failure else serror()
+
+and parse_enum s =
+	let doc = get_doc s in
+	let meta = parse_meta s in
+	match s with parser
+	| [< name, p1 = ident; params = parse_constraint_params; s >] ->
+		let args = (match s with parser
+		| [< '(POpen,_); l = psep Comma parse_enum_param; '(PClose,_) >] -> l
+		| [< >] -> []
+		) in
+		let t = popt parse_type_hint s in
+		let p2 = (match s with parser
+			| [< p = semicolon >] -> p
+			| [< >] -> serror()
+		) in
+		{
+			ec_name = name,p1;
+			ec_doc = doc;
+			ec_meta = meta;
+			ec_args = args;
+			ec_params = params;
+			ec_type = t;
+			ec_pos = punion p1 p2;
+		}
+
+and parse_enum_param = parser
+	| [< '(Question,_); name, _ = ident; t = parse_type_hint >] -> (name,true,t)
+	| [< name, _ = ident; t = parse_type_hint >] -> (name,false,t)
+
+and parse_function_field doc meta al = parser
+	| [< '(Kwd Function,p1); name = parse_fun_name; pl = parse_constraint_params; '(POpen,_); args = psep Comma parse_fun_param; '(PClose,_); t = popt parse_type_hint; s >] ->
+		let e, p2 = (match s with parser
+			| [< e = expr; s >] ->
+				ignore(semicolon s);
+				Some e, pos e
+			| [< p = semicolon >] -> None, p
+			| [< >] -> serror()
+		) in
+		let f = {
+			f_params = pl;
+			f_args = args;
+			f_type = t;
+			f_expr = e;
+		} in
+		name,punion p1 p2,FFun f,al,meta
+
+and parse_var_field_assignment = parser
+	| [< '(Binop OpAssign,_); s >] ->
+		begin match s with parser
+		| [< '(Binop OpLt,p1); s >] ->
+			let e = handle_xml_literal p1 in
+			(* accept but don't expect semicolon *)
+			let p2 = match s with parser
+				| [< '(Semicolon,p) >] -> p
+				| [< >] -> pos e
+			in
+			Some e,p2
+		| [< e = expr; p2 = semicolon >] -> Some e , p2
+		| [< >] -> serror()
+		end
+	| [< p2 = semicolon >] -> None , p2
+	| [< >] -> serror()
+
+and parse_class_field tdecl s =
+	let doc = get_doc s in
+	let meta = parse_meta s in
+	match s with parser
+	| [< al = plist parse_cf_rights; s >] ->
+		let check_optional opt name =
+			if opt then begin
+				if not tdecl then syntax_error (Custom "?var syntax is only allowed in structures") ~pos:(Some (pos name)) s ();
+				(Meta.Optional,[],null_pos) :: meta
+			end else
+				meta
+		in
+		let name,pos,k,al,meta = (match s with parser
+		| [< '(Kwd Var,p1); opt,name = questionable_dollar_ident; s >] ->
+			let meta = check_optional opt name in
+			begin match s with parser
+			| [< '(POpen,_); i1 = property_ident; '(Comma,_); i2 = property_ident; '(PClose,_) >] ->
+				let t = popt parse_type_hint s in
+				let e,p2 = parse_var_field_assignment s in
+				name,punion p1 p2,FProp (i1,i2,t,e),al,meta
+			| [< t = popt parse_type_hint; s >] ->
+				let e,p2 = parse_var_field_assignment s in
+				name,punion p1 p2,FVar (t,e),al,meta
+			end
+		| [< '(Kwd Final,p1) >] ->
+			begin match s with parser
+			| [< opt,name = questionable_dollar_ident; t = popt parse_type_hint; e,p2 = parse_var_field_assignment >] ->
+				let meta = check_optional opt name in
+				name,punion p1 p2,FVar(t,e),(al @ [AFinal,p1]),meta
+			| [< al2 = plist parse_cf_rights; f = parse_function_field doc meta (al @ ((AFinal,p1) :: al2)) >] ->
+				f
+			| [< >] ->
+				serror()
+			end
+		| [< f = parse_function_field doc meta al >] ->
+			f
+		| [< >] ->
+			begin match List.rev al with
+				| [] -> raise Stream.Failure
+				| (AOverride,po) :: _ ->
+					begin match check_completion po true s with
+					| None ->
+						serror()
+					| Some(so,p) ->
+						let f = {
+							f_params = [];
+							f_args = [];
+							f_type = None;
+							f_expr = None
+						} in
+						let name = match so with
+							| None -> ""
+							| Some s -> s
+						in
+						(name,p),punion po p,FFun f,al,(Meta.DisplayOverride,[],null_pos) :: meta
+					end
+				| _ -> serror()
+			end
+		) in
+		let pos = match al with
+			| [] -> pos
+			| (_,p) :: _ -> punion p pos
+		in
+		{
+			cff_name = name;
+			cff_doc = doc;
+			cff_meta = meta;
+			cff_access = al;
+			cff_pos = pos;
+			cff_kind = k;
+		}
+
+and parse_cf_rights = parser
+	| [< '(Kwd Static,p) >] -> AStatic,p
+	| [< '(Kwd Macro,p) >] -> AMacro,p
+	| [< '(Kwd Public,p) >] -> APublic,p
+	| [< '(Kwd Private,p) >] -> APrivate,p
+	| [< '(Kwd Override,p) >] -> AOverride,p
+	| [< '(Kwd Dynamic,p) >] -> ADynamic,p
+	| [< '(Kwd Inline,p) >] -> AInline,p
+	| [< '(Kwd Extern,p) >] -> AExtern,p
+
+and parse_fun_name = parser
+	| [< name,p = dollar_ident >] -> name,p
+	| [< '(Kwd New,p) >] -> "new",p
+
+and parse_fun_param s =
+	let meta = parse_meta s in
+	match s with parser
+	| [< '(Question,_); name, pn = dollar_ident; t = popt parse_type_hint; c = parse_fun_param_value >] -> ((name,pn),true,meta,t,c)
+	| [< name, pn = dollar_ident; t = popt parse_type_hint; c = parse_fun_param_value >] -> ((name,pn),false,meta,t,c)
+
+and parse_fun_param_value = parser
+	| [< '(Binop OpAssign,_); e = expr >] -> Some e
+	| [< >] -> None
+
+and parse_fun_param_type = parser
+	| [< '(Question,_); name = ident; t = parse_type_hint >] -> (name,true,t)
+	| [< name = ident; t = parse_type_hint >] -> (name,false,t)
+
+and parse_constraint_params = parser
+	| [< '(Binop OpLt,p); s >] ->
+		begin match s with parser
+		| [< l = psep_nonempty Comma parse_constraint_param; '(Binop OpGt,_) >] -> l
+		| [< >] ->
+			let pos = match s with parser
+			| [< '(Binop OpGt,p) >] -> Some p (* junk > so we don't get weird follow-up errors *)
+			| [< >] -> None
+			in
+			syntax_error (Expected ["type parameter"]) ~pos s [];
+		end
+	| [< >] -> []
+
+and parse_constraint_param s =
+	let meta = parse_meta s in
+	match s with parser
+	| [< name = type_name; s >] ->
+		let params = (match s with parser
+			| [< >] -> []
+		) in
+		let cto = (match s with parser
+			| [< '(DblDot,_); s >] ->
+				(match s with parser
+				| [< '(POpen,p1); t = parse_complex_type; '(PClose,p2) >] -> Some t
+				| [< t = parse_complex_type >] -> Some t
+				| [< >] -> serror())
+			| [< >] -> None
+		) in
+		{
+			tp_name = name;
+			tp_params = params;
+			tp_constraints = cto;
+			tp_meta = meta;
+		}
+	| [< >] ->
+		(* If we have a metadata but no name afterwards, we have to fail hard. *)
+		if meta <> [] then syntax_error (Expected ["type name"]) s ();
+		raise Stream.Failure;
+
+and parse_type_path_or_resume p1 s =
+	let check_resume exc =
+		if would_skip_display_position p1 true s then
+			(magic_type_path,display_position#with_pos p1),true
+		else
+			raise exc
+	in
+	try
+		let t = parse_type_path s in
+		t,false
+	with Stream.Failure | Stream.Error _ as exc -> check_resume exc
+
+and parse_class_herit = parser
+	| [< '(Kwd Extends,p1); t,_ = parse_type_path_or_resume p1 >] -> HExtends t
+	| [< '(Kwd Implements,p1); t,_ = parse_type_path_or_resume p1 >] -> HImplements t
+
+and block1 = parser
+	| [< name,p = dollar_ident; s >] -> block2 (name,p,NoQuotes) (Ident name) p s
+	| [< '(Const (String(name,qs)),p); s >] -> block2 (name,p,DoubleQuotes) (String(name,qs)) p s (* STRINGTODO: qs... hmm *)
+	| [< b = block [] >] -> EBlock b
+
+and block2 name ident p s =
+	match s with parser
+	| [< '(DblDot,_) >] ->
+		let e = secure_expr s in
+		fst (parse_obj_decl name e p s)
+	| [< >] ->
+		let f s =
+			let e = expr_next (EConst ident,p) s in
+			let _ = semicolon s in
+			e
+		in
+		let el,_ = block_with_pos' [] f p s in
+		EBlock el
+
+and block acc s =
+	fst (block_with_pos acc null_pos s)
+
+and block_with_pos' acc f p s =
+	try
+		(* because of inner recursion, we can't put Display handling in errors below *)
+		let e = f s in
+		block_with_pos (e :: acc) (pos e) s
+	with
+		| Stream.Failure ->
+			List.rev acc,p
+		| Stream.Error msg when !in_display_file ->
+			handle_stream_error msg s;
+			(block_with_pos acc (next_pos s) s)
+		| Error (e,p) when !in_display_file ->
+			block_with_pos acc p s
+
+and block_with_pos acc p s =
+	block_with_pos' acc parse_block_elt p s
+
+and parse_block_elt = parser
+	| [< '(Kwd Var,p1); vl = parse_var_decls false p1; p2 = semicolon >] ->
+		(EVars vl,punion p1 p2)
+	| [< '(Kwd Final,p1); vl = parse_var_decls true p1; p2 = semicolon >] ->
+		(EVars vl,punion p1 p2)
+	| [< '(Kwd Inline,p1); s >] ->
+		begin match s with parser
+		| [< '(Kwd Function,_); e = parse_function p1 true; _ = semicolon >] -> e
+		| [< e = secure_expr; _ = semicolon >] -> make_meta Meta.Inline [] e p1
+		| [< >] -> serror()
+		end
+	| [< '(Binop OpLt,p1); s >] ->
+		let e = handle_xml_literal p1 in
+		(* accept but don't expect semicolon *)
+		begin match s with parser
+			| [< '(Semicolon,_) >] -> ()
+			| [< >] -> ()
+		end;
+		e
+	| [< e = expr; _ = semicolon >] -> e
+
+and parse_obj_decl name e p0 s =
+	let make_obj_decl el p1 =
+		EObjectDecl (List.rev el),punion p0 p1
+	in
+	let rec loop p_end acc = match s with parser
+		| [< '(Comma,p1); s >] ->
+			let next_expr key =
+				let e = secure_expr s in
+				loop (pos e) ((key,e) :: acc)
+			in
+			let next key = match s with parser
+				| [< '(DblDot,_) >] ->
+					next_expr key
+				| [< >] ->
+					syntax_error (Expected [":"]) s (next_expr key)
+			in
+			begin match s with parser
+				| [< name,p = ident >] -> next (name,p,NoQuotes)
+				| [< '(Const (String(name,qs)),p) >] -> next (name,p,DoubleQuotes) (* STRINGTODO: use qs? *)
+				| [< >] -> acc,p_end
+			end
+		| [< >] -> acc,p_end
+	in
+	let el,p_end = loop p0 [name,e] in
+	let e = make_obj_decl el p_end in
+	e
+
+and parse_array_decl p1 s =
+	let resume_or_fail p1 =
+		syntax_error (Expected ["expr";"]"]) s (
+			let p = punion_next p1 s in
+			[mk_null_expr p],p
+		)
+	in
+	let el,p2 = match s with parser
+		| [< '(BkClose,p2) >] -> [],p2
+		| [< e0 = secure_expr >] ->
+			let rec loop acc = match s with parser
+				| [< '(Comma,pk) >] ->
+					begin match s with parser
+						| [< '(BkClose,p2) >] -> acc,p2
+						| [< e = secure_expr >] -> loop (e :: acc)
+						| [< >] ->
+							syntax_error (Expected ["expr";"]"]) s (acc,pk)
+					end
+				| [< '(BkClose,p2) >] -> acc,p2
+				| [< >] ->
+					syntax_error (Expected [",";"]"]) s (acc,next_pos s)
+			in
+			loop [e0]
+		| [< >] -> resume_or_fail p1
+	in
+	EArrayDecl (List.rev el),punion p1 p2
+
+and parse_var_decl_head final = parser
+	| [< name, p = dollar_ident; t = popt parse_type_hint >] -> (name,final,t,p)
+
+and parse_var_assignment = parser
+	| [< '(Binop OpAssign,p1); s >] ->
+		Some (secure_expr s)
+	| [< >] -> None
+
+and parse_var_assignment_resume final vl name pn t s =
+	let eo = parse_var_assignment s in
+	((name,pn),final,t,eo)
+
+and parse_var_decls_next final vl = parser
+	| [< '(Comma,p1); name,final,t,pn = parse_var_decl_head final; s >] ->
+		let v_decl = parse_var_assignment_resume final vl name pn t s in
+		parse_var_decls_next final (v_decl :: vl) s
+	| [< >] ->
+		vl
+
+and parse_var_decls final p1 = parser
+	| [< name,final,t,pn = parse_var_decl_head final; s >] ->
+		let v_decl = parse_var_assignment_resume final [] name pn t s in
+		List.rev (parse_var_decls_next final [v_decl] s)
+	| [< s >] -> error (Custom "Missing variable identifier") p1
+
+and parse_var_decl final = parser
+	| [< name,final,t,pn = parse_var_decl_head final; v_decl = parse_var_assignment_resume final [] name pn t >] -> v_decl
+
+and inline_function = parser
+	| [< '(Kwd Inline,_); '(Kwd Function,p1) >] -> true, p1
+	| [< '(Kwd Function,p1) >] -> false, p1
+
+and parse_macro_expr p = parser
+	| [< '(DblDot,_); t = parse_complex_type >] ->
+		let _, to_type, _  = reify !in_macro in
+		let t = to_type t p in
+		(ECheckType (t,(CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = Some "ComplexType"; tparams = [] },null_pos)),p)
+	| [< '(Kwd Var,p1); vl = psep Comma (parse_var_decl false) >] ->
+		reify_expr (EVars vl,p1) !in_macro
+	| [< '(Kwd Final,p1); vl = psep Comma (parse_var_decl true) >] ->
+		reify_expr (EVars vl,p1) !in_macro
+	| [< d = parse_class None [] [] false >] ->
+		let _,_,to_type = reify !in_macro in
+		(ECheckType (to_type d,(CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = Some "TypeDefinition"; tparams = [] },null_pos)),p)
+	| [< e = secure_expr >] ->
+		reify_expr e !in_macro
+
+and parse_function p1 inl = parser
+	| [< name = popt dollar_ident; pl = parse_constraint_params; '(POpen,_); al = psep Comma parse_fun_param; '(PClose,_); t = popt parse_type_hint; s >] ->
+		let make e =
+			let f = {
+				f_params = pl;
+				f_type = t;
+				f_args = al;
+				f_expr = Some e;
+			} in
+			EFunction ((match name with None -> FKAnonymous | Some (name,pn) -> FKNamed ((name,pn),inl)),f), punion p1 (pos e)
+		in
+		make (secure_expr s)
+
+and arrow_expr = parser
+	| [< '(Arrow,_); e = expr >] -> e
+	| [< >] -> serror()
+
+and arrow_function p1 al er s =
+	let make e =
+		let p = pos e in
+		let return = (EMeta((Meta.ImplicitReturn, [], null_pos), (EReturn(Some e), p)), p) in
+		EFunction(FKArrow, { f_params = []; f_type = None; f_args = al; f_expr = Some return;  }), punion p1 p
+	in
+	List.iter (fun (_,_,ml,_,_) ->	match ml with
+		| (_,_,p) :: _ -> syntax_error (Custom "Metadata on arrow function arguments is not allowed") ~pos:(Some p) s ()
+		| [] -> ()
+	) al;
+	make er
+
+and arrow_ident_checktype e = (match e with
+	| EConst(Ident n),p -> (n,p),None
+	| ECheckType((EConst(Ident n),p),(t,pt)),_ -> (n,p),(Some (t,pt))
+	| _ -> serror())
+
+and arrow_first_param e s =
+	(match fst e with
+	| EConst(Ident ("true" | "false" | "null" | "this" | "super")) ->
+		syntax_error (Custom "Invalid argument name") ~pos:(Some (pos e)) s (("",null_pos),false,[],None,None)
+	| EConst(Ident n) ->
+		(n,snd e),false,[],None,None
+	| EBinop(OpAssign,e1,e2)
+	| EParenthesis(EBinop(OpAssign,e1,e2),_) ->
+		let (np,tpt) = arrow_ident_checktype e1 in np,true,[],tpt,(Some e2)
+	| EParenthesis(e) ->
+		let (np,tpt) = arrow_ident_checktype e in np,false,[],tpt,None
+	| _ ->
+		serror())
+
+and expr = parser
+	| [< (name,params,p) = parse_meta_entry; s >] ->
+		begin try
+			make_meta name params (secure_expr s) p
+		with
+		| Stream.Failure | Stream.Error _ when !in_display_file ->
+			let e = EConst (Ident "null"),null_pos in
+			make_meta name params e p
+		end
+	| [< '(Binop OpLt,p1) >] ->
+		handle_xml_literal p1
+	| [< '(BrOpen,p1); s >] ->
+		(match s with parser
+		| [< b = block1; s >] ->
+			let p2 = match s with parser
+				| [< '(BrClose,p2) >] -> p2
+				| [< >] ->
+					(* Ignore missing } if we are resuming and "guess" the last position. *)
+					syntax_error (Expected ["}"]) s (pos (next_token s))
+			in
+			let e = (b,punion p1 p2) in
+			(match b with
+			| EObjectDecl _ -> expr_next e s
+			| _ -> e)
+		| [< >] ->
+			check_resume p1 (fun() -> (EDisplay ((EObjectDecl [],p1),DKStructure),p1)) serror;
+		)
+	| [< '(Kwd k,p) when !parsing_macro_cond; s >] ->
+		expr_next (EConst (Ident (s_keyword k)), p) s
+	| [< '(Kwd Macro,p); s >] ->
+		begin match s with parser
+		| [< '(Dot,pd); e = parse_field (EConst (Ident "macro"),p) pd >] -> e
+		| [< e = parse_macro_expr p >] -> e
+		| [< >] -> serror()
+		end
+	| [< '(Kwd Var,p1); v = parse_var_decl false >] -> (EVars [v],p1)
+	| [< '(Kwd Final,p1); v = parse_var_decl true >] -> (EVars [v],p1)
+	| [< '(Const c,p); s >] -> expr_next (EConst c,p) s
+	| [< '(Kwd This,p); s >] -> expr_next (EConst (Ident "this"),p) s
+	| [< '(Kwd True,p); s >] -> expr_next (EConst (Ident "true"),p) s
+	| [< '(Kwd False,p); s >] -> expr_next (EConst (Ident "false"),p) s
+	| [< '(Kwd Null,p); s >] -> expr_next (EConst (Ident "null"),p) s
+	| [< '(Kwd Cast,p1); s >] ->
+		(match s with parser
+		| [< '(POpen,pp); e = expr; s >] ->
+			(match s with parser
+			| [< '(Comma,pc); t = parse_complex_type; '(PClose,p2); s >] -> expr_next (ECast (e,Some t),punion p1 p2) s
+			| [< t,pt = parse_type_hint; '(PClose,p2); s >] ->
+				let ep = EParenthesis (ECheckType(e,(t,pt)),punion p1 p2), punion p1 p2 in
+				expr_next (ECast (ep,None),punion p1 (pos ep)) s
+			| [< '(Const (Ident "is"),p_is); t = parse_type_path; '(PClose,p2); >] ->
+				let e_is = make_is e t (punion p1 p2) p_is in
+				expr_next (ECast (e_is,None),punion p1 (pos e_is)) s
+			| [< '(PClose,p2); s >] ->
+				let ep = expr_next (EParenthesis(e),punion pp p2) s in
+				expr_next (ECast (ep,None),punion p1 (pos ep)) s
+			| [< >] -> serror())
+		| [< e = secure_expr >] -> expr_next (ECast (e,None),punion p1 (pos e)) s)
+	| [< '(Kwd Throw,p); e = expr >] -> (EThrow e,p)
+	| [< '(Kwd New,p1); t,_ = parse_type_path_or_resume p1; s >] ->
+		begin match s with parser
+		| [< '(POpen,po); e = parse_call_params (fun el p2 -> (ENew(t,el)),punion p1 p2) po >] -> expr_next e s
+		| [< >] ->
+			syntax_error (Expected ["("]) s (ENew(t,[]),punion p1 (pos t))
+		end
+	| [< '(POpen,p1); s >] -> (match s with parser
+		| [< '(PClose,p2); er = arrow_expr; >] ->
+			arrow_function p1 [] er s
+		| [< '(Question,p2); al = psep Comma parse_fun_param; '(PClose,_); er = arrow_expr; >] ->
+			let al = (match al with | (np,_,_,topt,e) :: al -> (np,true,[],topt,e) :: al | _ -> assert false ) in
+			arrow_function p1 al er s
+		| [<  e = expr; s >] -> (match s with parser
+			| [< '(PClose,p2); s >] -> expr_next (EParenthesis e, punion p1 p2) s
+			| [< '(Comma,pc); al = psep Comma parse_fun_param; '(PClose,_); er = arrow_expr; >] ->
+				arrow_function p1 ((arrow_first_param e s) :: al) er s
+			| [< t,pt = parse_type_hint; s >] -> (match s with parser
+				| [< '(PClose,p2); s >] -> expr_next (EParenthesis (ECheckType(e,(t,pt)),punion p1 p2), punion p1 p2) s
+				| [< '(Comma,pc); al = psep Comma parse_fun_param; '(PClose,_); er = arrow_expr; >] ->
+					let (np,_) = arrow_ident_checktype e in
+					arrow_function p1 ((np,false,[],(Some(t,pt)),None) :: al) er s
+				| [< '((Binop OpAssign),p2); ea1 = expr; s >] ->
+					let with_args al er = (match fst e with
+						| EConst(Ident n) ->
+							arrow_function p1 (((n,snd e),true,[],(Some(t,pt)),(Some ea1)) :: al) er s
+						| _ -> serror())
+					in
+					(match s with parser
+					| [< '(PClose,p2); er = arrow_expr; >] ->
+						with_args [] er
+					| [< '(Comma,pc); al = psep Comma parse_fun_param; '(PClose,_); er = arrow_expr; >] ->
+						with_args al er
+					| [< >] -> serror())
+				| [< >] -> serror())
+			| [< '(Const (Ident "is"),p_is); t = parse_type_path; '(PClose,p2); >] -> expr_next (make_is e t (punion p1 p2) p_is) s
+			| [< >] ->
+				syntax_error (Expected [")";",";":";"is"]) s (expr_next (EParenthesis e, punion p1 (pos e)) s))
+		)
+	| [< '(BkOpen,p1); e = parse_array_decl p1; s >] -> expr_next e s
+	| [< '(Kwd Function,p1); e = parse_function p1 false; >] -> e
+	| [< '(Unop op,p1) when is_prefix op; e = expr >] -> make_unop op e p1
+	| [< '(Binop OpSub,p1); e = expr >] ->
+		make_unop Neg e p1
+	(*/* removed unary + : this cause too much syntax errors go unnoticed, such as "a + + 1" (missing 'b')
+						without adding anything to the language
+	| [< '(Binop OpAdd,p1); s >] ->
+		(match s with parser
+		| [< '(Const (Int i),p); e = expr_next (EConst (Int i),p) >] -> e
+		| [< '(Const (Float f),p); e = expr_next (EConst (Float f),p) >] -> e
+		| [< >] -> serror()) */*)
+	| [< '(Kwd For,p); '(POpen,_); it = secure_expr; s >] ->
+		let e = match s with parser
+			| [< '(PClose,_); e = secure_expr >] -> e
+			| [< >] ->
+				syntax_error (Expected [")"]) s (mk_null_expr (pos it))
+		in
+		(EFor (it,e),punion p (pos e))
+	| [< '(Kwd If,p); '(POpen,_); cond = secure_expr; s >] ->
+		let e1 = match s with parser
+			| [< '(PClose,_); e1 = secure_expr >] -> e1
+			| [< >] ->
+				syntax_error (Expected [")"]) s (mk_null_expr (pos cond))
+		in
+		let e2 = (match s with parser
+			| [< '(Kwd Else,_); e2 = secure_expr; s >] -> Some e2
+			| [< >] ->
+				(* We check this in two steps to avoid the lexer missing tokens (#8565). *)
+				match Stream.npeek 1 s with
+				| [(Semicolon,_)] ->
+					begin match Stream.npeek 2 s with
+					| [(Semicolon,_);(Kwd Else,_)] ->
+						Stream.junk s;
+						Stream.junk s;
+						Some (secure_expr s)
+					| _ ->
+						None
+					end
+				| _ ->
+					None
+		) in
+		(EIf (cond,e1,e2), punion p (match e2 with None -> pos e1 | Some e -> pos e))
+	| [< '(Kwd Return,p); s >] ->
+		begin match s with parser
+		| [< e = expr >] -> (EReturn (Some e),punion p (pos e))
+		| [< >] ->
+			if would_skip_display_position p true s then (EReturn (Some (mk_null_expr (punion_next p s))),p)
+			else (EReturn None,p)
+		end
+	| [< '(Kwd Break,p) >] -> (EBreak,p)
+	| [< '(Kwd Continue,p) >] -> (EContinue,p)
+	| [< '(Kwd While,p1); '(POpen,_); cond = secure_expr; s >] ->
+		let e = match s with parser
+			| [< '(PClose,_); e = secure_expr >] -> e
+			| [< >] ->
+				syntax_error (Expected [")"]) s (mk_null_expr (pos cond))
+		in
+		(EWhile (cond,e,NormalWhile),punion p1 (pos e))
+	| [< '(Kwd Do,p1); e = secure_expr; s >] ->
+		begin match s with parser
+			| [< '(Kwd While,_); '(POpen,_); cond = secure_expr; s >] ->
+				let p2 = expect_unless_resume_p PClose s in
+				(EWhile (cond,e,DoWhile),punion p1 p2)
+			| [< >] ->
+				syntax_error (Expected ["while"]) s e (* ignore do *)
+		end
+	| [< '(Kwd Switch,p1); e = secure_expr; s >] ->
+		begin match s with parser
+			| [< '(BrOpen,_); cases , def = parse_switch_cases e [] >] ->
+				let p2 = match s with parser
+					| [< '(BrClose,p2) >] -> p2
+					| [< >] ->
+						(* Ignore missing } if we are resuming and "guess" the last position. *)
+						syntax_error (Expected ["}"]) s (pos (next_token s))
+				in
+				(ESwitch (e,cases,def),punion p1 p2)
+			| [< >] ->
+				syntax_error (Expected ["{"]) s (ESwitch(e,[],None),punion p1 (pos e))
+		end
+	| [< '(Kwd Try,p1); e = secure_expr; cl,p2 = parse_catches e [] (pos e) >] -> (ETry (e,cl),punion p1 p2)
+	| [< '(IntInterval i,p1); e2 = expr >] -> make_binop OpInterval (EConst (Int i),p1) e2
+	| [< '(Kwd Untyped,p1); e = secure_expr >] -> (EUntyped e,punion p1 (pos e))
+	| [< '(Dollar v,p); s >] -> expr_next (EConst (Ident ("$"^v)),p) s
+	| [< '(Kwd Inline,p); e = secure_expr >] -> make_meta Meta.Inline [] e p
+
+and expr_next e1 s =
+	try
+		expr_next' e1 s
+	with Stream.Error msg when !in_display ->
+		handle_stream_error msg s;
+		e1
+
+and expr_next' e1 = parser
+	| [< '(BrOpen,p1) when is_dollar_ident e1; eparam = expr; '(BrClose,p2); s >] ->
+		(match fst e1 with
+		| EConst(Ident n) -> expr_next (EMeta((Meta.from_string n,[],snd e1),eparam), punion p1 p2) s
+		| _ -> assert false)
+	| [< '(Dot,p); e = parse_field e1 p >] -> e
+	| [< '(POpen,p1); e = parse_call_params (fun el p2 -> (ECall(e1,el)),punion (pos e1) p2) p1; s >] -> expr_next e s
+	| [< '(BkOpen,p1); e2 = secure_expr; s >] ->
+		let p2 = expect_unless_resume_p BkClose s in
+		let e2 = check_signature_mark e2 p1 p2 in
+		expr_next (EArray (e1,e2), punion (pos e1) p2) s
+	| [< '(Arrow,pa); s >] ->
+		let er = expr s in
+		arrow_function (snd e1) [arrow_first_param e1 s] er s
+	| [< '(Binop OpGt,p1); s >] ->
+		(match s with parser
+		| [< '(Binop OpGt,p2) when p1.pmax = p2.pmin; s >] ->
+			(match s with parser
+			| [< '(Binop OpGt,p3) when p2.pmax = p3.pmin >] ->
+				(match s with parser
+				| [< '(Binop OpAssign,p4) when p3.pmax = p4.pmin; e2 = expr >] -> make_binop (OpAssignOp OpUShr) e1 e2
+				| [< e2 = secure_expr >] -> make_binop OpUShr e1 e2)
+			| [< '(Binop OpAssign,p3) when p2.pmax = p3.pmin; e2 = expr >] -> make_binop (OpAssignOp OpShr) e1 e2
+			| [< e2 = secure_expr >] -> make_binop OpShr e1 e2)
+		| [< '(Binop OpAssign,p2) when p1.pmax = p2.pmin; s >] ->
+			make_binop OpGte e1 (secure_expr s)
+		| [< e2 = secure_expr >] ->
+			make_binop OpGt e1 e2)
+	| [< '(Binop op,_); e2 = secure_expr >] -> make_binop op e1 e2
+	| [< '(Unop op,p) when is_postfix e1 op; s >] ->
+		expr_next (EUnop (op,Postfix,e1), punion (pos e1) p) s
+	| [< '(Question,_); e2 = expr; s >] ->
+		begin match s with parser
+		| [< '(DblDot,_); e3 = expr >] -> (ETernary (e1,e2,e3),punion (pos e1) (pos e3))
+		| [< >] -> syntax_error (Expected [":"]) s e2
+		end
+	| [< '(Kwd In,_); e2 = expr >] ->
+		make_binop OpIn e1 e2
+	| [< >] -> e1
+
+and parse_field e1 p s =
+	check_resume p (fun () -> (EDisplay (e1,DKDot),p)) (fun () ->
+		begin match s with parser
+		| [< '(Kwd Macro,p2) when p.pmax = p2.pmin; s >] -> expr_next (EField (e1,"macro") , punion (pos e1) p2) s
+		| [< '(Kwd Extern,p2) when p.pmax = p2.pmin; s >] -> expr_next (EField (e1,"extern") , punion (pos e1) p2) s
+		| [< '(Kwd New,p2) when p.pmax = p2.pmin; s >] -> expr_next (EField (e1,"new") , punion (pos e1) p2) s
+		| [< '(Kwd k,p2) when !parsing_macro_cond && p.pmax = p2.pmin; s >] -> expr_next (EField (e1,s_keyword k) , punion (pos e1) p2) s
+		| [< '(Const (Ident f),p2) when p.pmax = p2.pmin; s >] -> expr_next (EField (e1,f) , punion (pos e1) p2) s
+		| [< '(Dollar v,p2); s >] -> expr_next (EField (e1,"$"^v) , punion (pos e1) p2) s
+		| [< >] ->
+			(* turn an integer followed by a dot into a float *)
+			match e1 with
+			| (EConst (Int v),p2) when p2.pmax = p.pmin -> expr_next (EConst (Float (v ^ ".")),punion p p2) s
+			| _ -> serror()
+		end
+	)
+
+and parse_guard = parser
+	| [< '(Kwd If,p1); '(POpen,_); e = expr; '(PClose,_); >] ->
+		e
+
+and expr_or_var = parser
+	| [< '(Kwd Var,p1); name,p2 = dollar_ident; >] -> EVars [(name,p2),false,None,None],punion p1 p2
+	| [< '(Kwd Final,p1); name,p2 = dollar_ident; >] -> EVars [(name,p2),true,None,None],punion p1 p2
+	| [< e = secure_expr >] -> e
+
+and parse_switch_cases eswitch cases = parser
+	| [< '(Kwd Default,p1); '(DblDot,pdot); s >] ->
+		let b,p2 = (block_with_pos [] p1 s) in
+		let b = match b with
+			| [] -> None,pdot
+			| _ -> let p = punion p1 p2 in Some ((EBlock b,p)),p
+		in
+		let l , def = parse_switch_cases eswitch cases s in
+		(match def with None -> () | Some _ -> syntax_error Duplicate_default ~pos:(Some p1) s ());
+		l , Some b
+	| [< '(Kwd Case,p1); el = psep Comma expr_or_var; eg = popt parse_guard; s >] ->
+		let pdot = expect_unless_resume_p DblDot s in
+		if !was_auto_triggered then check_resume pdot (fun () -> ()) (fun () -> ());
+		(match el with
+		| [] -> syntax_error (Custom "case without a pattern is not allowed") ~pos:(Some p1) s ([],None)
+		| _ ->
+			let b,p2 = (block_with_pos [] p1 s) in
+			let b,p = match b with
+				| [] -> None,punion p1 pdot
+				| _ -> let p = punion p1 p2 in Some ((EBlock b,p)),p
+			in
+			parse_switch_cases eswitch ((el,eg,b,p) :: cases) s
+		)
+	| [< >] ->
+		List.rev cases , None
+
+and parse_catch etry = parser
+	| [< '(Kwd Catch,p); '(POpen,_); name, pn = dollar_ident; s >] ->
+		match s with parser
+		| [< t,pt = parse_type_hint; '(PClose,_); e = secure_expr >] -> ((name,pn),(t,pt),e,punion p (pos e)),(pos e)
+		| [< '(_,p) >] -> error Missing_type p
+
+and parse_catches etry catches pmax = parser
+	| [< (catch,pmax) = parse_catch etry; s >] -> parse_catches etry (catch :: catches) pmax s
+	| [< >] -> List.rev catches,pmax
+
+and parse_call_params f p1 s =
+	if not !in_display_file then begin
+		let el = psep Comma expr s in
+		match s with parser
+		| [< '(PClose,p2) >] -> f el p2
+		| [< >] ->
+			let expected = if el = [] then ["expression";")"] else [",";")"] in
+			syntax_error (Expected expected) s (f el (last_pos s))
+	end else begin
+		let rec parse_next_param acc p1 =
+			let e = try
+				expr s
+			with
+			| Stream.Failure ->
+				let expected = "expression" :: (if acc = [] then [")"] else []) in
+				syntax_error (Expected expected) s ();
+				mk_null_expr (punion_next p1 s)
+			| Stream.Error msg ->
+				handle_stream_error msg s;
+				mk_null_expr (punion_next p1 s)
+			in
+			match s with parser
+			| [< '(PClose,p2) >] ->
+				let e = check_signature_mark e p1 p2 in
+				f (List.rev (e :: acc)) p2
+			| [< '(Comma,p2) >] ->
+				let e = check_signature_mark e p1 p2 in
+				parse_next_param (e :: acc) p2
+			| [< >] ->
+				let p2 = next_pos s in
+				syntax_error (Expected [",";")"]) s ();
+				let e = check_signature_mark e p1 p2 in
+				f (List.rev (e :: acc)) p2
+		in
+		match s with parser
+		| [< '(PClose,p2) >] -> f [] p2
+		| [< >] -> parse_next_param [] p1
+	end
+
+(* Tries to parse a toplevel expression and defaults to a null expression when in display mode.
+   This function always accepts in display mode and should only be used for expected expressions,
+   not accepted ones! *)
+and secure_expr = parser
+	| [< e = expr >] -> e
+	| [< s >] ->
+		syntax_error (Expected ["expression"]) s (
+			let last = last_token s in
+			let plast = pos last in
+			let offset = match fst last with
+				| Const _ | Kwd _ | Dollar _ -> 1
+				| _ -> 0
+			in
+			let plast = {plast with pmin = plast.pmax + offset} in
+			mk_null_expr (punion_next plast s)
+		)
+
+let rec validate_macro_cond s e = match fst e with
+	| EConst (Ident _)
+	| EConst (String _)
+	| EConst (Int _)
+	| EConst (Float _)
+		-> e
+	| EUnop (op,p,e1) -> (EUnop (op, p, validate_macro_cond s e1), snd e)
+	| EBinop (op,e1,e2) -> (EBinop(op, (validate_macro_cond s e1), (validate_macro_cond s e2)), snd e)
+	| EParenthesis (e1) -> (EParenthesis (validate_macro_cond s e1), snd e)
+	| EField(e1,name) -> (EField(validate_macro_cond s e1,name), snd e)
+	| ECall ((EConst (Ident _),_) as i, args) -> (ECall (i,List.map (validate_macro_cond s) args),snd e)
+	| _ -> syntax_error (Custom ("Invalid conditional expression")) ~pos:(Some (pos e)) s ((EConst (Ident "false"),(pos e)))
+
+let parse_macro_ident t p s =
+	if t = "display" then Hashtbl.replace special_identifier_files (Path.unique_full_path p.pfile) t;
+	let e = (EConst (Ident t),p) in
+	None, e
+
+let rec parse_macro_cond s =
+	parsing_macro_cond := true;
+	try
+		let cond = (match s with parser
+			| [< '(Const (Ident t),p) >] ->
+				parse_macro_ident t p s
+			| [< '(Const (String(s,qs)),p) >] ->
+				None, (EConst (String(s,qs)),p)
+			| [< '(Const (Int i),p) >] ->
+				None, (EConst (Int i),p)
+			| [< '(Const (Float f),p) >] ->
+				None, (EConst (Float f),p)
+			| [< '(Kwd k,p) >] ->
+				parse_macro_ident (s_keyword k) p s
+			| [< '(Unop op,p); tk, e = parse_macro_cond >] ->
+				tk, make_unop op e p
+			| [< '(POpen,p1); (e,p) = expr; '(PClose,p2) >] ->
+				None, (EParenthesis(validate_macro_cond s (e,p)),punion p1 p2)) in
+		parsing_macro_cond := false;
+		cond
+	with e ->
+		parsing_macro_cond := false;
+		raise e
\ No newline at end of file
diff --git a/src/syntax/lexer.ml b/src/syntax/lexer.ml
new file mode 100644
index 0000000000000000000000000000000000000000..4ceb8bcbb30dfd89e7f99aaffe2e08f1531b00f1
--- /dev/null
+++ b/src/syntax/lexer.ml
@@ -0,0 +1,646 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+open Sedlexing
+open Sedlexing.Utf8
+open Ast
+open Globals
+
+type error_msg =
+	| Invalid_character of int
+	| Unterminated_string
+	| Unterminated_regexp
+	| Unclosed_comment
+	| Unclosed_code
+	| Invalid_escape of char * (string option)
+	| Invalid_option
+	| Unterminated_markup
+
+exception Error of error_msg * pos
+
+type xml_lexing_context = {
+	open_tag : string;
+	close_tag : string;
+	lexbuf : Sedlexing.lexbuf;
+}
+
+let error_msg = function
+	| Invalid_character c when c > 32 && c < 128 -> Printf.sprintf "Invalid character '%c'" (char_of_int c)
+	| Invalid_character c -> Printf.sprintf "Invalid character 0x%.2X" c
+	| Unterminated_string -> "Unterminated string"
+	| Unterminated_regexp -> "Unterminated regular expression"
+	| Unclosed_comment -> "Unclosed comment"
+	| Unclosed_code -> "Unclosed code string"
+	| Invalid_escape (c,None) -> Printf.sprintf "Invalid escape sequence \\%s" (Char.escaped c)
+	| Invalid_escape (c,Some msg) -> Printf.sprintf "Invalid escape sequence \\%s. %s" (Char.escaped c) msg
+	| Invalid_option -> "Invalid regular expression option"
+	| Unterminated_markup -> "Unterminated markup literal"
+
+type lexer_file = {
+	lfile : string;
+	mutable lline : int;
+	mutable lmaxline : int;
+	mutable llines : (int * int) list;
+	mutable lalines : (int * int) array;
+	mutable lstrings : int list;
+	mutable llast : int;
+	mutable llastindex : int;
+}
+
+let make_file file =
+	{
+		lfile = file;
+		lline = 1;
+		lmaxline = 1;
+		llines = [0,1];
+		lalines = [|0,1|];
+		lstrings = [];
+		llast = max_int;
+		llastindex = 0;
+	}
+
+
+let cur = ref (make_file "")
+
+let all_files = Hashtbl.create 0
+
+let buf = Buffer.create 100
+
+let error e pos =
+	raise (Error (e,{ pmin = pos; pmax = pos; pfile = !cur.lfile }))
+
+let keywords =
+	let h = Hashtbl.create 3 in
+	List.iter (fun k -> Hashtbl.add h (s_keyword k) k)
+		[Function;Class;Static;Var;If;Else;While;Do;For;
+		Break;Return;Continue;Extends;Implements;Import;
+		Switch;Case;Default;Public;Private;Try;Untyped;
+		Catch;New;This;Throw;Extern;Enum;In;Interface;
+		Cast;Override;Dynamic;Typedef;Package;
+		Inline;Using;Null;True;False;Abstract;Macro;Final;
+		Operator;Overload];
+	h
+
+let is_valid_identifier s =
+	if String.length s = 0 then
+		false
+	else
+		try
+			for i = 0 to String.length s - 1 do
+				match String.unsafe_get s i with
+				| 'a'..'z' | 'A'..'Z' | '_' -> ()
+				| '0'..'9' when i > 0 -> ()
+				| _ -> raise Exit
+			done;
+			if Hashtbl.mem keywords s then raise Exit;
+			true
+		with Exit ->
+			false
+
+let init file =
+	let f = make_file file in
+	cur := f;
+	Hashtbl.replace all_files file f
+
+let save() =
+	!cur
+
+let restore c =
+	cur := c
+
+let newline lexbuf =
+	let cur = !cur in
+	cur.lline <- cur.lline + 1;
+	cur.llines <- (lexeme_end lexbuf,cur.lline) :: cur.llines
+
+let fmt_pos p =
+	p.pmin + (p.pmax - p.pmin) * 1000000
+
+let add_fmt_string p =
+	let file = (try
+		Hashtbl.find all_files p.pfile
+	with Not_found ->
+		let f = make_file p.pfile in
+		Hashtbl.replace all_files p.pfile f;
+		f
+	) in
+	file.lstrings <- (fmt_pos p) :: file.lstrings
+
+let fast_add_fmt_string p =
+	let cur = !cur in
+	cur.lstrings <- (fmt_pos p) :: cur.lstrings
+
+let is_fmt_string p =
+	try
+		let file = Hashtbl.find all_files p.pfile in
+		List.mem (fmt_pos p) file.lstrings
+	with Not_found ->
+		false
+
+let remove_fmt_string p =
+	try
+		let file = Hashtbl.find all_files p.pfile in
+		file.lstrings <- List.filter ((<>) (fmt_pos p)) file.lstrings
+	with Not_found ->
+		()
+
+let find_line p f =
+	(* rebuild cache if we have a new line *)
+	if f.lmaxline <> f.lline then begin
+		f.lmaxline <- f.lline;
+		f.lalines <- Array.of_list (List.rev f.llines);
+		f.llast <- max_int;
+		f.llastindex <- 0;
+	end;
+	let rec loop min max =
+		let med = (min + max) lsr 1 in
+		let lp, line = Array.unsafe_get f.lalines med in
+		if med = min then begin
+			f.llast <- p;
+			f.llastindex <- med;
+			line, p - lp
+		end else if lp > p then
+			loop min med
+		else
+			loop med max
+	in
+	if p >= f.llast then begin
+		let lp, line = Array.unsafe_get f.lalines f.llastindex in
+		let lp2 = if f.llastindex = Array.length f.lalines - 1 then max_int else fst(Array.unsafe_get f.lalines (f.llastindex + 1)) in
+		if p >= lp && p < lp2 then line, p - lp else loop 0 (Array.length f.lalines)
+	end else
+		loop 0 (Array.length f.lalines)
+
+(* resolve a position within a non-haxe file by counting newlines *)
+let resolve_pos file =
+	let ch = open_in_bin file in
+	let f = make_file file in
+	let rec loop p =
+		let inc i () =
+			f.lline <- f.lline + 1;
+			f.llines <- (p + i,f.lline) :: f.llines;
+			i
+		in
+		let i = match input_char ch with
+			| '\n' -> inc 1
+			| '\r' ->
+				ignore(input_char ch);
+				inc 2
+			| c -> (fun () ->
+				let rec skip n =
+					if n > 0 then begin
+						ignore(input_char ch);
+						skip (n - 1)
+					end
+				in
+				let code = int_of_char c in
+				if code < 0xC0 then ()
+				else if code < 0xE0 then skip 1
+				else if code < 0xF0 then skip 2
+				else skip 3;
+				1
+			)
+		in
+		loop (p + i())
+	in
+	try
+		loop 0
+	with End_of_file ->
+		close_in ch;
+		f
+
+let find_file file =
+	try Hashtbl.find all_files file with Not_found -> try resolve_pos file with Sys_error _ -> make_file file
+
+let find_pos p =
+	find_line p.pmin (find_file p.pfile)
+
+let get_error_line p =
+	let l, _ = find_pos p in
+	l
+
+let old_format = ref false
+
+let get_pos_coords p =
+	let file = find_file p.pfile in
+	let l1, p1 = find_line p.pmin file in
+	let l2, p2 = find_line p.pmax file in
+	if !old_format then
+		l1, p1, l2, p2
+	else
+		l1, p1+1, l2, p2+1
+
+let get_error_pos printer p =
+	if p.pmin = -1 then
+		"(unknown)"
+	else
+		let l1, p1, l2, p2 = get_pos_coords p in
+		if l1 = l2 then begin
+			let s = (if p1 = p2 then Printf.sprintf " %d" p1 else Printf.sprintf "s %d-%d" p1 p2) in
+			Printf.sprintf "%s character%s" (printer p.pfile l1) s
+		end else
+			Printf.sprintf "%s lines %d-%d" (printer p.pfile l1) l1 l2
+
+let reset() = Buffer.reset buf
+let contents() = Buffer.contents buf
+let store lexbuf = Buffer.add_string buf (lexeme lexbuf)
+let add c = Buffer.add_string buf c
+
+let mk_tok t pmin pmax =
+	t , { pfile = !cur.lfile; pmin = pmin; pmax = pmax }
+
+let mk lexbuf t =
+	mk_tok t (lexeme_start lexbuf) (lexeme_end lexbuf)
+
+let mk_ident lexbuf =
+	let s = lexeme lexbuf in
+	mk lexbuf (Const (Ident s))
+
+let mk_keyword lexbuf kwd =
+	mk lexbuf (Kwd kwd)
+
+let invalid_char lexbuf =
+	error (Invalid_character (Uchar.to_int (lexeme_char lexbuf 0))) (lexeme_start lexbuf)
+
+let ident = [%sedlex.regexp?
+	(
+		Star '_',
+		'a'..'z',
+		Star ('_' | 'a'..'z' | 'A'..'Z' | '0'..'9')
+	)
+	|
+	Plus '_'
+	|
+	(
+		Plus '_',
+		'0'..'9',
+		Star ('_' | 'a'..'z' | 'A'..'Z' | '0'..'9')
+	)
+]
+
+let sharp_ident = [%sedlex.regexp?
+	(
+		('a'..'z' | 'A'..'Z' | '_'),
+		Star ('a'..'z' | 'A'..'Z' | '0'..'9' | '_'),
+		Star (
+			'.',
+			('a'..'z' | 'A'..'Z' | '_'),
+			Star ('a'..'z' | 'A'..'Z' | '0'..'9' | '_')
+		)
+	)
+]
+
+let idtype = [%sedlex.regexp? Star '_', 'A'..'Z', Star ('_' | 'a'..'z' | 'A'..'Z' | '0'..'9')]
+
+let integer = [%sedlex.regexp? ('1'..'9', Star ('0'..'9')) | '0']
+
+(* https://www.w3.org/TR/xml/#sec-common-syn plus '$' for JSX *)
+let xml_name_start_char = [%sedlex.regexp? '$' | ':' | 'A'..'Z' | '_' | 'a'..'z' | 0xC0 .. 0xD6 | 0xD8 .. 0xF6 | 0xF8 .. 0x2FF | 0x370 .. 0x37D | 0x37F .. 0x1FFF | 0x200C .. 0x200D | 0x2070 .. 0x218F | 0x2C00 .. 0x2FEF | 0x3001 .. 0xD7FF | 0xF900 .. 0xFDCF | 0xFDF0 .. 0xFFFD | 0x10000 .. 0xEFFFF]
+let xml_name_char = [%sedlex.regexp? xml_name_start_char | '-' | '.' | '0'..'9' | 0xB7 | 0x0300 .. 0x036F | 0x203F .. 0x2040]
+let xml_name = [%sedlex.regexp? Opt(xml_name_start_char, Star xml_name_char)]
+
+let rec skip_header lexbuf =
+	match%sedlex lexbuf with
+	| 0xfeff -> skip_header lexbuf
+	| "#!", Star (Compl ('\n' | '\r')) -> skip_header lexbuf
+	| "" | eof -> ()
+	| _ -> assert false
+
+let rec token lexbuf =
+	match%sedlex lexbuf with
+	| eof -> mk lexbuf Eof
+	| Plus (Chars " \t") -> token lexbuf
+	| "\r\n" -> newline lexbuf; token lexbuf
+	| '\n' | '\r' -> newline lexbuf; token lexbuf
+	| "0x", Plus ('0'..'9'|'a'..'f'|'A'..'F') -> mk lexbuf (Const (Int (lexeme lexbuf)))
+	| integer -> mk lexbuf (Const (Int (lexeme lexbuf)))
+	| integer, '.', Plus '0'..'9' -> mk lexbuf (Const (Float (lexeme lexbuf)))
+	| '.', Plus '0'..'9' -> mk lexbuf (Const (Float (lexeme lexbuf)))
+	| integer, ('e'|'E'), Opt ('+'|'-'), Plus '0'..'9' -> mk lexbuf (Const (Float (lexeme lexbuf)))
+	| integer, '.', Star '0'..'9', ('e'|'E'), Opt ('+'|'-'), Plus '0'..'9' -> mk lexbuf (Const (Float (lexeme lexbuf)))
+	| integer, "..." ->
+		let s = lexeme lexbuf in
+		mk lexbuf (IntInterval (String.sub s 0 (String.length s - 3)))
+	| "//", Star (Compl ('\n' | '\r')) ->
+		let s = lexeme lexbuf in
+		mk lexbuf (CommentLine (String.sub s 2 ((String.length s)-2)))
+	| "++" -> mk lexbuf (Unop Increment)
+	| "--" -> mk lexbuf (Unop Decrement)
+	| "~"  -> mk lexbuf (Unop NegBits)
+	| "%=" -> mk lexbuf (Binop (OpAssignOp OpMod))
+	| "&=" -> mk lexbuf (Binop (OpAssignOp OpAnd))
+	| "|=" -> mk lexbuf (Binop (OpAssignOp OpOr))
+	| "^=" -> mk lexbuf (Binop (OpAssignOp OpXor))
+	| "+=" -> mk lexbuf (Binop (OpAssignOp OpAdd))
+	| "-=" -> mk lexbuf (Binop (OpAssignOp OpSub))
+	| "*=" -> mk lexbuf (Binop (OpAssignOp OpMult))
+	| "/=" -> mk lexbuf (Binop (OpAssignOp OpDiv))
+	| "<<=" -> mk lexbuf (Binop (OpAssignOp OpShl))
+	| "||=" -> mk lexbuf (Binop (OpAssignOp OpBoolOr))
+	| "&&=" -> mk lexbuf (Binop (OpAssignOp OpBoolAnd))
+(*//| ">>=" -> mk lexbuf (Binop (OpAssignOp OpShr)) *)
+(*//| ">>>=" -> mk lexbuf (Binop (OpAssignOp OpUShr)) *)
+	| "==" -> mk lexbuf (Binop OpEq)
+	| "!=" -> mk lexbuf (Binop OpNotEq)
+	| "<=" -> mk lexbuf (Binop OpLte)
+(*//| ">=" -> mk lexbuf (Binop OpGte) *)
+	| "&&" -> mk lexbuf (Binop OpBoolAnd)
+	| "||" -> mk lexbuf (Binop OpBoolOr)
+	| "<<" -> mk lexbuf (Binop OpShl)
+	| "->" -> mk lexbuf Arrow
+	| "..." -> mk lexbuf (Binop OpInterval)
+	| "=>" -> mk lexbuf (Binop OpArrow)
+	| "!" -> mk lexbuf (Unop Not)
+	| "<" -> mk lexbuf (Binop OpLt)
+	| ">" -> mk lexbuf (Binop OpGt)
+	| ";" -> mk lexbuf Semicolon
+	| ":" -> mk lexbuf DblDot
+	| "," -> mk lexbuf Comma
+	| "." -> mk lexbuf Dot
+	| "%" -> mk lexbuf (Binop OpMod)
+	| "&" -> mk lexbuf (Binop OpAnd)
+	| "|" -> mk lexbuf (Binop OpOr)
+	| "^" -> mk lexbuf (Binop OpXor)
+	| "+" -> mk lexbuf (Binop OpAdd)
+	| "*" -> mk lexbuf (Binop OpMult)
+	| "/" -> mk lexbuf (Binop OpDiv)
+	| "-" -> mk lexbuf (Binop OpSub)
+	| "=" -> mk lexbuf (Binop OpAssign)
+	| "[" -> mk lexbuf BkOpen
+	| "]" -> mk lexbuf BkClose
+	| "{" -> mk lexbuf BrOpen
+	| "}" -> mk lexbuf BrClose
+	| "(" -> mk lexbuf POpen
+	| ")" -> mk lexbuf PClose
+	| "?" -> mk lexbuf Question
+	| "@" -> mk lexbuf At
+
+	| "/*" ->
+		reset();
+		let pmin = lexeme_start lexbuf in
+		let pmax = (try comment lexbuf with Exit -> error Unclosed_comment pmin) in
+		mk_tok (Comment (contents())) pmin pmax;
+	| '"' ->
+		reset();
+		let pmin = lexeme_start lexbuf in
+		let pmax = (try string lexbuf with Exit -> error Unterminated_string pmin) in
+		let str = (try unescape (contents()) with Invalid_escape_sequence(c,i,msg) -> error (Invalid_escape (c,msg)) (pmin + i)) in
+		mk_tok (Const (String(str,SDoubleQuotes))) pmin pmax;
+	| "'" ->
+		reset();
+		let pmin = lexeme_start lexbuf in
+		let pmax = (try string2 lexbuf with Exit -> error Unterminated_string pmin) in
+		let str = (try unescape (contents()) with Invalid_escape_sequence(c,i,msg) -> error (Invalid_escape (c,msg)) (pmin + i)) in
+		let t = mk_tok (Const (String(str,SSingleQuotes))) pmin pmax in
+		fast_add_fmt_string (snd t);
+		t
+	| "~/" ->
+		reset();
+		let pmin = lexeme_start lexbuf in
+		let options, pmax = (try regexp lexbuf with Exit -> error Unterminated_regexp pmin) in
+		let str = contents() in
+		mk_tok (Const (Regexp (str,options))) pmin pmax;
+	| '#', ident ->
+		let v = lexeme lexbuf in
+		let v = String.sub v 1 (String.length v - 1) in
+		mk lexbuf (Sharp v)
+	| '$', Star ('_' | 'a'..'z' | 'A'..'Z' | '0'..'9') ->
+		let v = lexeme lexbuf in
+		let v = String.sub v 1 (String.length v - 1) in
+		mk lexbuf (Dollar v)
+	(* type decl *)
+	| "package" -> mk_keyword lexbuf Package
+	| "import" -> mk_keyword lexbuf Import
+	| "using" -> mk_keyword lexbuf Using
+	| "class" -> mk_keyword lexbuf Class
+	| "interface" -> mk_keyword lexbuf Interface
+	| "enum" -> mk_keyword lexbuf Enum
+	| "abstract" -> mk_keyword lexbuf Abstract
+	| "typedef" -> mk_keyword lexbuf Typedef
+	(* relations *)
+	| "extends" -> mk_keyword lexbuf Extends
+	| "implements" -> mk_keyword lexbuf Implements
+	(* modifier *)
+	| "extern" -> mk_keyword lexbuf Extern
+	| "static" -> mk_keyword lexbuf Static
+	| "public" -> mk_keyword lexbuf Public
+	| "private" -> mk_keyword lexbuf Private
+	| "override" -> mk_keyword lexbuf Override
+	| "dynamic" -> mk_keyword lexbuf Dynamic
+	| "inline" -> mk_keyword lexbuf Inline
+	| "macro" -> mk_keyword lexbuf Macro
+	| "final" -> mk_keyword lexbuf Final
+	| "operator" -> mk_keyword lexbuf Operator
+	| "overload" -> mk_keyword lexbuf Overload
+	(* fields *)
+	| "function" -> mk_keyword lexbuf Function
+	| "var" -> mk_keyword lexbuf Var
+	(* values *)
+	| "null" -> mk_keyword lexbuf Null
+	| "true" -> mk_keyword lexbuf True
+	| "false" -> mk_keyword lexbuf False
+	| "this" -> mk_keyword lexbuf This
+	(* expr *)
+	| "if" -> mk_keyword lexbuf If
+	| "else" -> mk_keyword lexbuf Else
+	| "while" -> mk_keyword lexbuf While
+	| "do" -> mk_keyword lexbuf Do
+	| "for" -> mk_keyword lexbuf For
+	| "break" -> mk_keyword lexbuf Break
+	| "continue" -> mk_keyword lexbuf Continue
+	| "return" -> mk_keyword lexbuf Return
+	| "switch" -> mk_keyword lexbuf Switch
+	| "case" -> mk_keyword lexbuf Case
+	| "default" -> mk_keyword lexbuf Default
+	| "throw" -> mk_keyword lexbuf Throw
+	| "try" -> mk_keyword lexbuf Try
+	| "catch" -> mk_keyword lexbuf Catch
+	| "untyped" -> mk_keyword lexbuf Untyped
+	| "new" -> mk_keyword lexbuf New
+	| "in" -> mk_keyword lexbuf In
+	| "cast" -> mk_keyword lexbuf Cast
+	| ident -> mk_ident lexbuf
+	| idtype -> mk lexbuf (Const (Ident (lexeme lexbuf)))
+	| _ -> invalid_char lexbuf
+
+and comment lexbuf =
+	match%sedlex lexbuf with
+	| eof -> raise Exit
+	| '\n' | '\r' | "\r\n" -> newline lexbuf; store lexbuf; comment lexbuf
+	| "*/" -> lexeme_end lexbuf
+	| '*' -> store lexbuf; comment lexbuf
+	| Plus (Compl ('*' | '\n' | '\r')) -> store lexbuf; comment lexbuf
+	| _ -> assert false
+
+and string lexbuf =
+	match%sedlex lexbuf with
+	| eof -> raise Exit
+	| '\n' | '\r' | "\r\n" -> newline lexbuf; store lexbuf; string lexbuf
+	| "\\\"" -> store lexbuf; string lexbuf
+	| "\\\\" -> store lexbuf; string lexbuf
+	| '\\' -> store lexbuf; string lexbuf
+	| '"' -> lexeme_end lexbuf
+	| Plus (Compl ('"' | '\\' | '\r' | '\n')) -> store lexbuf; string lexbuf
+	| _ -> assert false
+
+and string2 lexbuf =
+	match%sedlex lexbuf with
+	| eof -> raise Exit
+	| '\n' | '\r' | "\r\n" -> newline lexbuf; store lexbuf; string2 lexbuf
+	| '\\' -> store lexbuf; string2 lexbuf
+	| "\\\\" -> store lexbuf; string2 lexbuf
+	| "\\'" -> store lexbuf; string2 lexbuf
+	| "'" -> lexeme_end lexbuf
+	| "$$" | "\\$" | '$' -> store lexbuf; string2 lexbuf
+	| "${" ->
+		let pmin = lexeme_start lexbuf in
+		store lexbuf;
+		(try code_string lexbuf 0 with Exit -> error Unclosed_code pmin);
+		string2 lexbuf;
+	| Plus (Compl ('\'' | '\\' | '\r' | '\n' | '$')) -> store lexbuf; string2 lexbuf
+	| _ -> assert false
+
+and code_string lexbuf open_braces =
+	match%sedlex lexbuf with
+	| eof -> raise Exit
+	| '\n' | '\r' | "\r\n" -> newline lexbuf; store lexbuf; code_string lexbuf open_braces
+	| '{' -> store lexbuf; code_string lexbuf (open_braces + 1)
+	| '/' -> store lexbuf; code_string lexbuf open_braces
+	| '}' ->
+		store lexbuf;
+		if open_braces > 0 then code_string lexbuf (open_braces - 1)
+	| '"' ->
+		add "\"";
+		let pmin = lexeme_start lexbuf in
+		(try ignore(string lexbuf) with Exit -> error Unterminated_string pmin);
+		add "\"";
+		code_string lexbuf open_braces
+	| "'" ->
+		add "'";
+		let pmin = lexeme_start lexbuf in
+		let pmax = (try string2 lexbuf with Exit -> error Unterminated_string pmin) in
+		add "'";
+		fast_add_fmt_string { pfile = !cur.lfile; pmin = pmin; pmax = pmax };
+		code_string lexbuf open_braces
+	| "/*" ->
+		let pmin = lexeme_start lexbuf in
+		let save = contents() in
+		reset();
+		(try ignore(comment lexbuf) with Exit -> error Unclosed_comment pmin);
+		reset();
+		Buffer.add_string buf save;
+		code_string lexbuf open_braces
+	| "//", Star (Compl ('\n' | '\r')) -> store lexbuf; code_string lexbuf open_braces
+	| Plus (Compl ('/' | '"' | '\'' | '{' | '}' | '\n' | '\r')) -> store lexbuf; code_string lexbuf open_braces
+	| _ -> assert false
+
+and regexp lexbuf =
+	match%sedlex lexbuf with
+	| eof | '\n' | '\r' -> raise Exit
+	| '\\', '/' -> add "/"; regexp lexbuf
+	| '\\', 'r' -> add "\r"; regexp lexbuf
+	| '\\', 'n' -> add "\n"; regexp lexbuf
+	| '\\', 't' -> add "\t"; regexp lexbuf
+	| '\\', ('\\' | '$' | '.' | '*' | '+' | '^' | '|' | '{' | '}' | '[' | ']' | '(' | ')' | '?' | '-' | '0'..'9') -> add (lexeme lexbuf); regexp lexbuf
+	| '\\', ('w' | 'W' | 'b' | 'B' | 's' | 'S' | 'd' | 'D' | 'x') -> add (lexeme lexbuf); regexp lexbuf
+	| '\\', ('u' | 'U'), ('0'..'9' | 'a'..'f' | 'A'..'F'), ('0'..'9' | 'a'..'f' | 'A'..'F'), ('0'..'9' | 'a'..'f' | 'A'..'F'), ('0'..'9' | 'a'..'f' | 'A'..'F') -> add (lexeme lexbuf); regexp lexbuf
+	| '\\', Compl '\\' -> error (Invalid_character (Uchar.to_int (lexeme_char lexbuf 0))) (lexeme_end lexbuf - 1)
+	| '/' -> regexp_options lexbuf, lexeme_end lexbuf
+	| Plus (Compl ('\\' | '/' | '\r' | '\n')) -> store lexbuf; regexp lexbuf
+	| _ -> assert false
+
+and regexp_options lexbuf =
+	match%sedlex lexbuf with
+	| 'g' | 'i' | 'm' | 's' | 'u' ->
+		let l = lexeme lexbuf in
+		l ^ regexp_options lexbuf
+	| 'a'..'z' -> error Invalid_option (lexeme_start lexbuf)
+	| "" -> ""
+	| _ -> assert false
+
+and not_xml ctx depth in_open =
+	let lexbuf = ctx.lexbuf in
+	match%sedlex lexbuf with
+	| eof ->
+		raise Exit
+	| '\n' | '\r' | "\r\n" ->
+		newline lexbuf;
+		store lexbuf;
+		not_xml ctx depth in_open
+	(* closing tag *)
+	| '<','/',xml_name,'>' ->
+		let s = lexeme lexbuf in
+		Buffer.add_string buf s;
+		(* If it matches our document close tag, finish or decrease depth. *)
+		if s = ctx.close_tag then begin
+			if depth = 0 then lexeme_end lexbuf
+			else not_xml ctx (depth - 1) false
+		end else
+			not_xml ctx depth false
+	(* opening tag *)
+	| '<',xml_name ->
+		let s = lexeme lexbuf in
+		Buffer.add_string buf s;
+		(* If it matches our document open tag, increase depth and set in_open to true. *)
+		let depth,in_open = if s = ctx.open_tag then depth + 1,true else depth,false in
+		not_xml ctx depth in_open
+	(* /> *)
+	| '/','>' ->
+		let s = lexeme lexbuf in
+		Buffer.add_string buf s;
+		(* We only care about this if we are still in the opening tag, i.e. if it wasn't closed yet.
+		   In that case, decrease depth and finish if it's 0. *)
+		let depth = if in_open then depth - 1 else depth in
+		if depth < 0 then lexeme_end lexbuf
+		else not_xml ctx depth false
+	| '<' | '/' | '>' ->
+		store lexbuf;
+		not_xml ctx depth in_open
+	| Plus (Compl ('<' | '/' | '>' | '\n' | '\r')) ->
+		store lexbuf;
+		not_xml ctx depth in_open
+	| _ ->
+		assert false
+
+let rec sharp_token lexbuf =
+	match%sedlex lexbuf with
+	| sharp_ident -> mk_ident lexbuf
+	| Plus (Chars " \t") -> sharp_token lexbuf
+	| "\r\n" -> newline lexbuf; sharp_token lexbuf
+	| '\n' | '\r' -> newline lexbuf; sharp_token lexbuf
+	| _ -> token lexbuf
+
+let lex_xml p lexbuf =
+	let name,pmin = match%sedlex lexbuf with
+	| xml_name -> lexeme lexbuf,lexeme_start lexbuf
+	| _ -> invalid_char lexbuf
+	in
+	if p + 1 <> pmin then invalid_char lexbuf;
+	Buffer.add_string buf ("<" ^ name);
+	let open_tag = "<" ^ name in
+	let close_tag = "</" ^ name ^ ">" in
+	let ctx = {
+		open_tag = open_tag;
+		close_tag = close_tag;
+		lexbuf = lexbuf;
+	} in
+	try
+		not_xml ctx 0 (name <> "") (* don't allow self-closing fragments *)
+	with Exit ->
+		error Unterminated_markup p
\ No newline at end of file
diff --git a/src/syntax/lexer.mll b/src/syntax/lexer.mll
deleted file mode 100644
index c4077c0d822304a3f7ab2b071d4cfc9d559d5080..0000000000000000000000000000000000000000
--- a/src/syntax/lexer.mll
+++ /dev/null
@@ -1,436 +0,0 @@
-(*
-	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *)
-
-{
-open Lexing
-open Ast
-open Globals
-
-type error_msg =
-	| Invalid_character of char
-	| Unterminated_string
-	| Unterminated_regexp
-	| Unclosed_comment
-	| Unclosed_code
-	| Invalid_escape of char
-	| Invalid_option
-
-exception Error of error_msg * pos
-
-let error_msg = function
-	| Invalid_character c when int_of_char c > 32 && int_of_char c < 128 -> Printf.sprintf "Invalid character '%c'" c
-	| Invalid_character c -> Printf.sprintf "Invalid character 0x%.2X" (int_of_char c)
-	| Unterminated_string -> "Unterminated string"
-	| Unterminated_regexp -> "Unterminated regular expression"
-	| Unclosed_comment -> "Unclosed comment"
-	| Unclosed_code -> "Unclosed code string"
-	| Invalid_escape c -> Printf.sprintf "Invalid escape sequence \\%s" (Char.escaped c)
-	| Invalid_option -> "Invalid regular expression option"
-
-type lexer_file = {
-	lfile : string;
-	mutable lline : int;
-	mutable lmaxline : int;
-	mutable llines : (int * int) list;
-	mutable lalines : (int * int) array;
-	mutable lstrings : int list;
-	mutable llast : int;
-	mutable llastindex : int;
-}
-
-let make_file file =
-	{
-		lfile = file;
-		lline = 1;
-		lmaxline = 1;
-		llines = [0,1];
-		lalines = [|0,1|];
-		lstrings = [];
-		llast = max_int;
-		llastindex = 0;
-	}
-
-
-let cur = ref (make_file "")
-
-let all_files = Hashtbl.create 0
-
-let buf = Buffer.create 100
-
-let error e pos =
-	raise (Error (e,{ pmin = pos; pmax = pos; pfile = !cur.lfile }))
-
-let keywords =
-	let h = Hashtbl.create 3 in
-	List.iter (fun k -> Hashtbl.add h (s_keyword k) k)
-		[Function;Class;Static;Var;If;Else;While;Do;For;
-		Break;Return;Continue;Extends;Implements;Import;
-		Switch;Case;Default;Public;Private;Try;Untyped;
-		Catch;New;This;Throw;Extern;Enum;In;Interface;
-		Cast;Override;Dynamic;Typedef;Package;
-		Inline;Using;Null;True;False;Abstract;Macro];
-	h
-
-let init file do_add =
-	let f = make_file file in
-	cur := f;
-	if do_add then Hashtbl.replace all_files file f
-
-let save() =
-	!cur
-
-let restore c =
-	cur := c
-
-let newline lexbuf =
-	let cur = !cur in
-	cur.lline <- cur.lline + 1;
-	cur.llines <- (lexeme_end lexbuf,cur.lline) :: cur.llines
-
-let fmt_pos p =
-	p.pmin + (p.pmax - p.pmin) * 1000000
-
-let add_fmt_string p =
-	let file = (try
-		Hashtbl.find all_files p.pfile
-	with Not_found ->
-		let f = make_file p.pfile in
-		Hashtbl.replace all_files p.pfile f;
-		f
-	) in
-	file.lstrings <- (fmt_pos p) :: file.lstrings
-
-let fast_add_fmt_string p =
-	let cur = !cur in
-	cur.lstrings <- (fmt_pos p) :: cur.lstrings
-
-let is_fmt_string p =
-	try
-		let file = Hashtbl.find all_files p.pfile in
-		List.mem (fmt_pos p) file.lstrings
-	with Not_found ->
-		false
-
-let remove_fmt_string p =
-	try
-		let file = Hashtbl.find all_files p.pfile in
-		file.lstrings <- List.filter ((<>) (fmt_pos p)) file.lstrings
-	with Not_found ->
-		()
-
-let find_line p f =
-	(* rebuild cache if we have a new line *)
-	if f.lmaxline <> f.lline then begin
-		f.lmaxline <- f.lline;
-		f.lalines <- Array.of_list (List.rev f.llines);
-		f.llast <- max_int;
-		f.llastindex <- 0;
-	end;
-	let rec loop min max =
-		let med = (min + max) lsr 1 in
-		let lp, line = Array.unsafe_get f.lalines med in
-		if med = min then begin
-			f.llast <- p;
-			f.llastindex <- med;
-			line, p - lp
-		end else if lp > p then
-			loop min med
-		else
-			loop med max
-	in
-	if p >= f.llast then begin
-		let lp, line = Array.unsafe_get f.lalines f.llastindex in
-		let lp2 = if f.llastindex = Array.length f.lalines - 1 then max_int else fst(Array.unsafe_get f.lalines (f.llastindex + 1)) in
-		if p >= lp && p < lp2 then line, p - lp else loop 0 (Array.length f.lalines)
-	end else
-		loop 0 (Array.length f.lalines)
-
-(* resolve a position within a non-haxe file by counting newlines *)
-let resolve_pos file =
-	let ch = open_in_bin file in
-	let f = make_file file in
-	let rec loop p =
-		let inc i () =
-			f.lline <- f.lline + 1;
-			f.llines <- (p + i,f.lline) :: f.llines;
-			i
-		in
-		let i = match input_char ch with
-			| '\n' -> inc 1
-			| '\r' ->
-				ignore(input_char ch);
-				inc 2
-			| _ -> fun () -> 1
-		in
-		loop (p + i())
-	in
-	try
-		loop 0
-	with End_of_file ->
-		close_in ch;
-		f
-
-let find_file file =
-	try Hashtbl.find all_files file with Not_found -> try resolve_pos file with Sys_error _ -> make_file file
-
-let find_pos p =
-	find_line p.pmin (find_file p.pfile)
-
-let get_error_line p =
-	let l, _ = find_pos p in
-	l
-
-let get_pos_coords p =
-	let file = find_file p.pfile in
-	let l1, p1 = find_line p.pmin file in
-	let l2, p2 = find_line p.pmax file in
-	l1, p1, l2, p2
-
-let get_error_pos printer p =
-	if p.pmin = -1 then
-		"(unknown)"
-	else
-		let l1, p1, l2, p2 = get_pos_coords p in
-		if l1 = l2 then begin
-			let s = (if p1 = p2 then Printf.sprintf " %d" p1 else Printf.sprintf "s %d-%d" p1 p2) in
-			Printf.sprintf "%s character%s" (printer p.pfile l1) s
-		end else
-			Printf.sprintf "%s lines %d-%d" (printer p.pfile l1) l1 l2
-
-let reset() = Buffer.reset buf
-let contents() = Buffer.contents buf
-let store lexbuf = Buffer.add_string buf (lexeme lexbuf)
-let add c = Buffer.add_string buf c
-
-let mk_tok t pmin pmax =
-	t , { pfile = !cur.lfile; pmin = pmin; pmax = pmax }
-
-let mk lexbuf t =
-	mk_tok t (lexeme_start lexbuf) (lexeme_end lexbuf)
-
-let mk_ident lexbuf =
-	let s = lexeme lexbuf in
-	mk lexbuf (try Kwd (Hashtbl.find keywords s) with Not_found -> Const (Ident s))
-
-let invalid_char lexbuf =
-	error (Invalid_character (lexeme_char lexbuf 0)) (lexeme_start lexbuf)
-
-}
-
-let ident = ('_'* ['a'-'z'] ['_' 'a'-'z' 'A'-'Z' '0'-'9']* | '_'+ | '_'+ ['0'-'9'] ['_' 'a'-'z' 'A'-'Z' '0'-'9']* )
-let idtype = '_'* ['A'-'Z'] ['_' 'a'-'z' 'A'-'Z' '0'-'9']*
-let integer = ['1'-'9'] ['0'-'9']* | '0'
-
-rule skip_header = parse
-	| "\239\187\191" { skip_header lexbuf }
-	| "#!" [^'\n' '\r']* { skip_header lexbuf }
-	| "" | eof { }
-
-and token = parse
-	| eof { mk lexbuf Eof }
-	| [' ' '\t']+ { token lexbuf }
-	| "\r\n" { newline lexbuf; token lexbuf }
-	| '\n' | '\r' { newline lexbuf; token lexbuf }
-	| "0x" ['0'-'9' 'a'-'f' 'A'-'F']+ { mk lexbuf (Const (Int (lexeme lexbuf))) }
-	| integer { mk lexbuf (Const (Int (lexeme lexbuf))) }
-	| integer '.' ['0'-'9']+ { mk lexbuf (Const (Float (lexeme lexbuf))) }
-	| '.' ['0'-'9']+ { mk lexbuf (Const (Float (lexeme lexbuf))) }
-	| integer ['e' 'E'] ['+' '-']? ['0'-'9']+ { mk lexbuf (Const (Float (lexeme lexbuf))) }
-	| integer '.' ['0'-'9']* ['e' 'E'] ['+' '-']? ['0'-'9']+ { mk lexbuf (Const (Float (lexeme lexbuf))) }
-	| integer "..." {
-			let s = lexeme lexbuf in
-			mk lexbuf (IntInterval (String.sub s 0 (String.length s - 3)))
-		}
-	| "//" [^'\n' '\r']*  {
-			let s = lexeme lexbuf in
-			mk lexbuf (CommentLine (String.sub s 2 ((String.length s)-2)))
-		}
-	| "++" { mk lexbuf (Unop Increment) }
-	| "--" { mk lexbuf (Unop Decrement) }
-	| "~"  { mk lexbuf (Unop NegBits) }
-	| "%=" { mk lexbuf (Binop (OpAssignOp OpMod)) }
-	| "&=" { mk lexbuf (Binop (OpAssignOp OpAnd)) }
-	| "|=" { mk lexbuf (Binop (OpAssignOp OpOr)) }
-	| "^=" { mk lexbuf (Binop (OpAssignOp OpXor)) }
-	| "+=" { mk lexbuf (Binop (OpAssignOp OpAdd)) }
-	| "-=" { mk lexbuf (Binop (OpAssignOp OpSub)) }
-	| "*=" { mk lexbuf (Binop (OpAssignOp OpMult)) }
-	| "/=" { mk lexbuf (Binop (OpAssignOp OpDiv)) }
-	| "<<=" { mk lexbuf (Binop (OpAssignOp OpShl)) }
-	| "||=" { mk lexbuf (Binop (OpAssignOp OpBoolOr)) }
-	| "&&=" { mk lexbuf (Binop (OpAssignOp OpBoolAnd)) }
-(*//| ">>=" { mk lexbuf (Binop (OpAssignOp OpShr)) } *)
-(*//| ">>>=" { mk lexbuf (Binop (OpAssignOp OpUShr)) } *)
-	| "==" { mk lexbuf (Binop OpEq) }
-	| "!=" { mk lexbuf (Binop OpNotEq) }
-	| "<=" { mk lexbuf (Binop OpLte) }
-(*//| ">=" { mk lexbuf (Binop OpGte) }*)
-	| "&&" { mk lexbuf (Binop OpBoolAnd) }
-	| "||" { mk lexbuf (Binop OpBoolOr) }
-	| "<<" { mk lexbuf (Binop OpShl) }
-	| "->" { mk lexbuf Arrow }
-	| "..." { mk lexbuf (Binop OpInterval) }
-	| "=>" { mk lexbuf (Binop OpArrow)}
-	| "!" { mk lexbuf (Unop Not) }
-	| "<" { mk lexbuf (Binop OpLt) }
-	| ">" { mk lexbuf (Binop OpGt) }
-	| ";" { mk lexbuf Semicolon }
-	| ":" { mk lexbuf DblDot }
-	| "," { mk lexbuf Comma }
-	| "." { mk lexbuf Dot }
-	| "%" { mk lexbuf (Binop OpMod) }
-	| "&" { mk lexbuf (Binop OpAnd) }
-	| "|" { mk lexbuf (Binop OpOr) }
-	| "^" { mk lexbuf (Binop OpXor) }
-	| "+" { mk lexbuf (Binop OpAdd) }
-	| "*" { mk lexbuf (Binop OpMult) }
-	| "/" { mk lexbuf (Binop OpDiv) }
-	| "-" { mk lexbuf (Binop OpSub) }
-	| "=" { mk lexbuf (Binop OpAssign) }
-	| "[" { mk lexbuf BkOpen }
-	| "]" { mk lexbuf BkClose }
-	| "{" { mk lexbuf BrOpen }
-	| "}" { mk lexbuf BrClose }
-	| "(" { mk lexbuf POpen }
-	| ")" { mk lexbuf PClose }
-	| "?" { mk lexbuf Question }
-	| "@" { mk lexbuf At }
-	| "/*" {
-			reset();
-			let pmin = lexeme_start lexbuf in
-			let pmax = (try comment lexbuf with Exit -> error Unclosed_comment pmin) in
-			mk_tok (Comment (contents())) pmin pmax;
-		}
-	| '"' {
-			reset();
-			let pmin = lexeme_start lexbuf in
-			let pmax = (try string lexbuf with Exit -> error Unterminated_string pmin) in
-			let str = (try unescape (contents()) with Invalid_escape_sequence(c,i) -> error (Invalid_escape c) (pmin + i)) in
-			mk_tok (Const (String str)) pmin pmax;
-		}
-	| "'" {
-			reset();
-			let pmin = lexeme_start lexbuf in
-			let pmax = (try string2 lexbuf with Exit -> error Unterminated_string pmin) in
-			let str = (try unescape (contents()) with Invalid_escape_sequence(c,i) -> error (Invalid_escape c) (pmin + i)) in
-			let t = mk_tok (Const (String str)) pmin pmax in
-			fast_add_fmt_string (snd t);
-			t
-		}
-	| "~/" {
-			reset();
-			let pmin = lexeme_start lexbuf in
-			let options, pmax = (try regexp lexbuf with Exit -> error Unterminated_regexp pmin) in
-			let str = contents() in
-			mk_tok (Const (Regexp (str,options))) pmin pmax;
-		}
-	| '#' ident {
-			let v = lexeme lexbuf in
-			let v = String.sub v 1 (String.length v - 1) in
-			mk lexbuf (Sharp v)
-		}
-	| '$' ['_' 'a'-'z' 'A'-'Z' '0'-'9']* {
-			let v = lexeme lexbuf in
-			let v = String.sub v 1 (String.length v - 1) in
-			mk lexbuf (Dollar v)
-		}
-	| ident { mk_ident lexbuf }
-	| idtype { mk lexbuf (Const (Ident (lexeme lexbuf))) }
-	| _ { invalid_char lexbuf }
-
-and comment = parse
-	| eof { raise Exit }
-	| '\n' | '\r' | "\r\n" { newline lexbuf; store lexbuf; comment lexbuf }
-	| "*/" { lexeme_end lexbuf }
-	| '*' { store lexbuf; comment lexbuf }
-	| [^'*' '\n' '\r']+ { store lexbuf; comment lexbuf }
-
-and string = parse
-	| eof { raise Exit }
-	| '\n' | '\r' | "\r\n" { newline lexbuf; store lexbuf; string lexbuf }
-	| "\\\"" { store lexbuf; string lexbuf }
-	| "\\\\" { store lexbuf; string lexbuf }
-	| '\\' { store lexbuf; string lexbuf }
-	| '"' { lexeme_end lexbuf }
-	| [^'"' '\\' '\r' '\n']+ { store lexbuf; string lexbuf }
-
-and string2 = parse
-	| eof { raise Exit }
-	| '\n' | '\r' | "\r\n" { newline lexbuf; store lexbuf; string2 lexbuf }
-	| '\\' { store lexbuf; string2 lexbuf }
-	| "\\\\" { store lexbuf; string2 lexbuf }
-	| "\\'" { store lexbuf; string2 lexbuf }
-	| "'" { lexeme_end lexbuf }
-	| "$$" | "\\$" | '$' { store lexbuf; string2 lexbuf }
-	| "${" {
-		let pmin = lexeme_start lexbuf in
-		store lexbuf;
-		(try code_string lexbuf with Exit -> error Unclosed_code pmin);
-		string2 lexbuf;
-	}
-	| [^'\'' '\\' '\r' '\n' '$']+ { store lexbuf; string2 lexbuf }
-
-and code_string = parse
-	| eof { raise Exit }
-	| '\n' | '\r' | "\r\n" { newline lexbuf; store lexbuf; code_string lexbuf }
-	| '{' | '/' { store lexbuf; code_string lexbuf }
-	| '}' { store lexbuf; (* stop *) }
-	| '"' {
-		add "\"";
-		let pmin = lexeme_start lexbuf in
-		(try ignore(string lexbuf) with Exit -> error Unterminated_string pmin);
-		add "\"";
-		code_string lexbuf;
-	}
-	| "'" {
-		add "'";
-		let pmin = lexeme_start lexbuf in
-		let pmax = (try string2 lexbuf with Exit -> error Unterminated_string pmin) in
-		add "'";
-		fast_add_fmt_string { pfile = !cur.lfile; pmin = pmin; pmax = pmax };
-		code_string lexbuf;
-	}
-	| "/*" {
-		let pmin = lexeme_start lexbuf in
-		(try ignore(comment lexbuf) with Exit -> error Unclosed_comment pmin);
-		code_string lexbuf;
-	}
-	| "//" [^'\n' '\r']* { store lexbuf; code_string lexbuf; }
-	| [^'/' '"' '\'' '{' '}' '\n' '\r']+  { store lexbuf; code_string lexbuf; }
-
-and regexp = parse
-	| eof | '\n' | '\r' { raise Exit }
-	| '\\' '/' { add "/"; regexp lexbuf }
-	| '\\' 'r' { add "\r"; regexp lexbuf }
-	| '\\' 'n' { add "\n"; regexp lexbuf }
-	| '\\' 't' { add "\t"; regexp lexbuf }
-	| '\\' ['\\' '$' '.' '*' '+' '^' '|' '{' '}' '[' ']' '(' ')' '?' '-' '0'-'9'] { add (lexeme lexbuf); regexp lexbuf }
-	| '\\' ['w' 'W' 'b' 'B' 's' 'S' 'd' 'D' 'x'] { add (lexeme lexbuf); regexp lexbuf }
-	| '\\' ['u' 'U'] ['0'-'9' 'a'-'f' 'A'-'F'] ['0'-'9' 'a'-'f' 'A'-'F'] ['0'-'9' 'a'-'f' 'A'-'F'] ['0'-'9' 'a'-'f' 'A'-'F'] { add (lexeme lexbuf); regexp lexbuf }
-	| '\\' [^ '\\'] { error (Invalid_character (lexeme lexbuf).[1]) (lexeme_end lexbuf - 1) }
-	| '/' { regexp_options lexbuf, lexeme_end lexbuf }
-	| [^ '\\' '/' '\r' '\n']+ { store lexbuf; regexp lexbuf }
-
-and regexp_options = parse
-	| 'g' | 'i' | 'm' | 's' | 'u' {
-			let l = lexeme lexbuf in
-			l ^ regexp_options lexbuf
-		}
-	| ['a' - 'z'] { error Invalid_option (lexeme_start lexbuf) }
-	| "" { "" }
diff --git a/src/syntax/parser.ml b/src/syntax/parser.ml
index fd5097a1918d8a7b278dd150d1143e8e8a6c5d3f..ea46c7b32e4b58a30dfdace898dea51e45f2c79e 100644
--- a/src/syntax/parser.ml
+++ b/src/syntax/parser.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -19,108 +19,217 @@
 
 open Ast
 open Globals
+open Reification
+open DisplayTypes.DisplayMode
+open DisplayPosition
 
 type error_msg =
 	| Unexpected of token
 	| Duplicate_default
 	| Missing_semicolon
-	| Unclosed_macro
+	| Unclosed_conditional
 	| Unimplemented
 	| Missing_type
+	| Expected of string list
+	| StreamError of string
 	| Custom of string
 
+type decl_flag =
+	| DPrivate
+	| DExtern
+	| DFinal
+
+type type_decl_completion_mode =
+	| TCBeforePackage
+	| TCAfterImport
+	| TCAfterType
+
+type syntax_completion =
+	| SCComment
+	| SCClassRelation
+	| SCInterfaceRelation
+	| SCTypeDecl of type_decl_completion_mode
+	| SCAfterTypeFlag of decl_flag list
+
 exception Error of error_msg * pos
-exception TypePath of string list * (string * bool) option * bool (* in import *)
-exception Display of expr
+exception TypePath of string list * (string * bool) option * bool (* in import *) * pos
+exception SyntaxCompletion of syntax_completion * DisplayTypes.completion_subject
 
 let error_msg = function
 	| Unexpected t -> "Unexpected "^(s_token t)
 	| Duplicate_default -> "Duplicate default"
 	| Missing_semicolon -> "Missing ;"
-	| Unclosed_macro -> "Unclosed macro"
+	| Unclosed_conditional -> "Unclosed conditional compilation block"
 	| Unimplemented -> "Not implemented for current platform"
 	| Missing_type -> "Missing type declaration"
+	| Expected sl -> "Expected " ^ (String.concat " or " sl)
+	| StreamError s -> s
 	| Custom s -> s
 
-let error m p = raise (Error (m,p))
-let display_error : (error_msg -> pos -> unit) ref = ref (fun _ _ -> assert false)
+type parse_data = string list * (type_def * pos) list
 
-let special_identifier_files = Hashtbl.create 0
+type parse_error = (error_msg * pos)
 
-let quoted_ident_prefix = "@$__hx__"
+type parser_display_information = {
+	pd_errors : parse_error list;
+	pd_dead_blocks : (pos * expr) list;
+	pd_conditions : expr list;
+}
 
-let quote_ident s =
-	quoted_ident_prefix ^ s
+type 'a parse_result =
+	(* Parsed display file. There can be errors. *)
+	| ParseDisplayFile of 'a * parser_display_information
+	(* Parsed non-display-file without errors. *)
+	| ParseSuccess of 'a
+	(* Parsed non-display file with errors *)
+	| ParseError of 'a * parse_error * parse_error list
 
-let unquote_ident f =
-	let pf = quoted_ident_prefix in
-	let pflen = String.length pf in
-	let is_quoted = String.length f >= pflen && String.sub f 0 pflen = pf in
-	let s = if is_quoted then String.sub f pflen (String.length f - pflen) else f in
-	let is_valid = not is_quoted || try
-		for i = 0 to String.length s - 1 do
-			match String.unsafe_get s i with
-			| 'a'..'z' | 'A'..'Z' | '_' -> ()
-			| '0'..'9' when i > 0 -> ()
-			| _ -> raise Exit
-		done;
-		if Hashtbl.mem Lexer.keywords s then raise Exit;
-		true
-	with Exit ->
-		false
-	in
-	s,is_quoted,is_valid
+let syntax_completion kind so p =
+	raise (SyntaxCompletion(kind,DisplayTypes.make_subject so p))
 
-let cache = ref (DynArray.create())
-let last_doc = ref None
-let use_doc = ref false
-let resume_display = ref null_pos
-let in_macro = ref false
+let error m p = raise (Error (m,p))
+
+let special_identifier_files : (string,string) Hashtbl.t = Hashtbl.create 0
+
+let decl_flag_to_class_flag (flag,p) = match flag with
+	| DPrivate -> HPrivate
+	| DExtern -> HExtern
+	| DFinal -> HFinal
+
+let decl_flag_to_enum_flag (flag,p) = match flag with
+	| DPrivate -> EPrivate
+	| DExtern -> EExtern
+	| DFinal -> error (Custom "final on enums is not allowed") p
+
+let decl_flag_to_abstract_flag (flag,p) = match flag with
+	| DPrivate -> AbPrivate
+	| DExtern -> AbExtern
+	| DFinal -> error (Custom "final on abstracts is not allowed") p
+
+module TokenCache = struct
+	let cache = ref (DynArray.create ())
+	let add (token : (token * pos)) = DynArray.add (!cache) token
+	let get index = DynArray.get (!cache) index
+	let clear () =
+		let old_cache = !cache in
+		cache := DynArray.create ();
+		(fun () -> cache := old_cache)
+end
 
 let last_token s =
 	let n = Stream.count s in
-	DynArray.get (!cache) (if n = 0 then 0 else n - 1)
+	TokenCache.get (if n = 0 then 0 else n - 1)
 
-let serror() = raise (Stream.Error "")
+let last_pos s = pos (last_token s)
+
+let next_token s = match Stream.peek s with
+	| Some (Eof,p) ->
+		(Eof,p)
+	| Some tk -> tk
+	| None ->
+		let last_pos = pos (last_token s) in
+		(Eof,last_pos)
+
+let next_pos s = pos (next_token s)
+
+(* Global state *)
+
+let in_display = ref false
+let was_auto_triggered = ref false
+let display_mode = ref DMNone
+let in_macro = ref false
+let had_resume = ref false
+let code_ref = ref (Sedlexing.Utf8.from_string "")
+let delayed_syntax_completion : (syntax_completion * DisplayTypes.completion_subject) option ref = ref None
+
+let reset_state () =
+	in_display := false;
+	was_auto_triggered := false;
+	display_mode := DMNone;
+	display_position#reset;
+	in_macro := false;
+	had_resume := false;
+	code_ref := Sedlexing.Utf8.from_string "";
+	delayed_syntax_completion := None
+
+(* Per-file state *)
+
+let in_display_file = ref false
+let last_doc : (string * int) option ref = ref None
+let syntax_errors = ref []
+
+let syntax_error error_msg ?(pos=None) s v =
+	let p = (match pos with Some p -> p | None -> next_pos s) in
+	let p = if p.pmax = max_int then {p with pmax = p.pmin + 1} else p in
+	if not !in_display then error error_msg p;
+	syntax_errors := (error_msg,p) :: !syntax_errors;
+	v
+
+let handle_stream_error msg s =
+	let err,pos = if msg = "" then begin
+		let tk,pos = next_token s in
+		(Unexpected tk),Some pos
+	end else
+		(StreamError msg),None
+	in
+	syntax_error err ~pos s ()
+
+let get_doc s =
+	(* do the peek first to make sure we fetch the doc *)
+	match Stream.peek s with
+	| None -> None
+	| Some (tk,p) ->
+		match !last_doc with
+		| None -> None
+		| Some (d,pos) ->
+			last_doc := None;
+			if pos = p.pmin then Some d else None
 
-let do_resume() = !resume_display <> null_pos
+let serror() = raise (Stream.Error "")
 
-let display e = raise (Display e)
+let magic_display_field_name = " - display - "
+let magic_type_path = { tpackage = []; tname = ""; tparams = []; tsub = None }
 
-let type_path sl in_import = match sl with
-	| n :: l when n.[0] >= 'A' && n.[0] <= 'Z' -> raise (TypePath (List.rev l,Some (n,false),in_import));
-	| _ -> raise (TypePath (List.rev sl,None,in_import))
+let delay_syntax_completion kind so p =
+	delayed_syntax_completion := Some(kind,DisplayTypes.make_subject so p)
 
-let is_resuming_file file =
-	Path.unique_full_path file = !resume_display.pfile
+let type_path sl in_import p = match sl with
+	| n :: l when n.[0] >= 'A' && n.[0] <= 'Z' -> raise (TypePath (List.rev l,Some (n,false),in_import,p));
+	| _ -> raise (TypePath (List.rev sl,None,in_import,p))
 
-let is_resuming p =
-	let p2 = !resume_display in
-	p.pmax = p2.pmin && is_resuming_file p.pfile
+let would_skip_display_position p1 plus_one s =
+	if !in_display_file then match Stream.npeek 1 s with
+		| [ (_,p2) ] ->
+			let p2 = {p2 with pmin = p1.pmax + (if plus_one then 1 else 0)} in
+			display_position#enclosed_in p2
+		| _ -> false
+	else false
 
-let set_resume p =
-	resume_display := { p with pfile = Path.unique_full_path p.pfile }
+let cut_pos_at_display p = display_position#cut p
 
 let is_dollar_ident e = match fst e with
-	| EConst (Ident n) when n.[0] = '$' ->
+	| EConst (Ident n) when starts_with n '$' ->
 		true
 	| _ ->
 		false
 
+let rev_concat s sl = String.concat s (List.rev sl)
+
 let precedence op =
 	let left = true and right = false in
 	match op with
-	| OpMod -> 0, left
-	| OpMult | OpDiv -> 1, left
-	| OpAdd | OpSub -> 2, left
-	| OpShl | OpShr | OpUShr -> 3, left
-	| OpOr | OpAnd | OpXor -> 4, left
-	| OpEq | OpNotEq | OpGt | OpLt | OpGte | OpLte -> 5, left
-	| OpInterval -> 6, left
-	| OpBoolAnd -> 7, left
-	| OpBoolOr -> 8, left
-	| OpArrow -> 9, right
-	| OpAssign | OpAssignOp _ -> 10, right
+	| OpIn -> 0, right
+	| OpMod -> 1, left
+	| OpMult | OpDiv -> 2, left
+	| OpAdd | OpSub -> 3, left
+	| OpShl | OpShr | OpUShr -> 4, left
+	| OpOr | OpAnd | OpXor -> 5, left
+	| OpEq | OpNotEq | OpGt | OpLt | OpGte | OpLte -> 6, left
+	| OpInterval -> 7, left
+	| OpBoolAnd -> 8, left
+	| OpBoolOr -> 9, left
+	| OpArrow -> 10, right
+	| OpAssign | OpAssignOp _ -> 11, right
 
 let is_not_assign = function
 	| OpAssign | OpAssignOp _ -> false
@@ -165,1613 +274,108 @@ let make_is e (t,p_t) p p_is =
 	let e2 = expr_of_type_path (t.tpackage,t.tname) p_t in
 	ECall(e_is,[e;e2]),p
 
-let reify in_macro =
-	let cur_pos = ref None in
-	let mk_enum ename n vl p =
-		let constr = (EConst (Ident n),p) in
-		match vl with
-		| [] -> constr
-		| _ -> (ECall (constr,vl),p)
-	in
-	let to_const c p =
-		let cst n v = mk_enum "Constant" n [EConst (String v),p] p in
-		match c with
-		| Int i -> cst "CInt" i
-		| String s -> cst "CString" s
-		| Float s -> cst "CFloat" s
-		| Ident s -> cst "CIdent" s
-		| Regexp (r,o) -> mk_enum "Constant" "CRegexp" [(EConst (String r),p);(EConst (String o),p)] p
-	in
-	let rec to_binop o p =
-		let op n = mk_enum "Binop" n [] p in
-		match o with
-		| OpAdd -> op "OpAdd"
-		| OpMult -> op "OpMult"
-		| OpDiv -> op "OpDiv"
-		| OpSub -> op "OpSub"
-		| OpAssign -> op "OpAssign"
-		| OpEq -> op "OpEq"
-		| OpNotEq -> op "OpNotEq"
-		| OpGt -> op "OpGt"
-		| OpGte -> op "OpGte"
-		| OpLt -> op "OpLt"
-		| OpLte -> op "OpLte"
-		| OpAnd -> op "OpAnd"
-		| OpOr -> op "OpOr"
-		| OpXor -> op "OpXor"
-		| OpBoolAnd -> op "OpBoolAnd"
-		| OpBoolOr -> op "OpBoolOr"
-		| OpShl -> op "OpShl"
-		| OpShr -> op "OpShr"
-		| OpUShr -> op "OpUShr"
-		| OpMod -> op "OpMod"
-		| OpAssignOp o -> mk_enum "Binop" "OpAssignOp" [to_binop o p] p
-		| OpInterval -> op "OpInterval"
-		| OpArrow -> op "OpArrow"
-	in
-	let to_string s p =
-		let len = String.length s in
-		if len > 1 && s.[0] = '$' then
-			(EConst (Ident (String.sub s 1 (len - 1))),p)
-		else
-			(EConst (String s),p)
-	in
-	let to_placed_name (s,p) =
-		to_string s p
-	in
-	let to_array f a p =
-		(EArrayDecl (List.map (fun s -> f s p) a),p)
-	in
-	let to_null p =
-		(EConst (Ident "null"),p)
-	in
-	let to_opt f v p =
-		match v with
-		| None -> to_null p
-		| Some v -> f v p
-	in
-	let to_bool o p =
-		(EConst (Ident (if o then "true" else "false")),p)
-	in
-	let to_obj fields p =
-		(EObjectDecl (List.map (fun (s,e) -> (s,null_pos),e) fields),p)
-	in
-	let rec to_tparam t p =
-		let n, v = (match t with
-			| TPType t -> "TPType", to_ctype t p
-			| TPExpr e -> "TPExpr", to_expr e p
-		) in
-		mk_enum "TypeParam" n [v] p
-	and to_tpath (t,_) p =
-		let len = String.length t.tname in
-		if t.tpackage = [] && len > 1 && t.tname.[0] = '$' then begin
-			let name = String.sub t.tname 1 (len - 1) in
-			let ei = (EConst (Ident name),p) in
-			match t.tparams with
-			| [] -> ei
-			| _ ->
-				(* `macro : $TP<Int>` conveys the intent to use TP and overwrite the
-				   type parameters. *)
-				let ea = to_array to_tparam t.tparams p in
-				let fields = [
-					("pack", (EField(ei,"pack"),p));
-					("name", (EField(ei,"name"),p));
-					("sub", (EField(ei,"sub"),p));
-					("params", ea);
-				] in
-				to_obj fields p
-		end else begin
-			let fields = [
-				("pack", to_array to_string t.tpackage p);
-				("name", to_string t.tname p);
-				("params", to_array to_tparam t.tparams p);
-			] in
-			to_obj (match t.tsub with None -> fields | Some s -> fields @ ["sub",to_string s p]) p
-		end
-	and to_ctype t p =
-		let ct n vl = mk_enum "ComplexType" n vl p in
-		match fst t with
-		| CTPath ({ tpackage = []; tparams = []; tsub = None; tname = n }) when n.[0] = '$' ->
-			to_string n p
-		| CTPath t -> ct "TPath" [to_tpath (t,p) p]
-		| CTFunction (args,ret) -> ct "TFunction" [to_array to_type_hint args p; to_type_hint ret p]
-		| CTAnonymous fields -> ct "TAnonymous" [to_array to_cfield fields p]
-		| CTParent t -> ct "TParent" [to_type_hint t p]
-		| CTExtend (tl,fields) -> ct "TExtend" [to_array to_tpath tl p; to_array to_cfield fields p]
-		| CTOptional t -> ct "TOptional" [to_type_hint t p]
-	and to_type_hint (t,p) _ =
-		(* to_obj ["type",to_ctype t p;"pos",to_pos p] p *)
-		to_ctype (t,p) p
-	and to_fun f p =
-		let farg ((n,_),o,_,t,e) p =
-			let fields = [
-				"name", to_string n p;
-				"opt", to_bool o p;
-				"type", to_opt to_type_hint t p;
-			] in
-			to_obj (match e with None -> fields | Some e -> fields @ ["value",to_expr e p]) p
-		in
-		let rec fparam t p =
-			let fields = [
-				"name", to_placed_name t.tp_name;
-				"constraints", to_array to_ctype t.tp_constraints p;
-				"params", to_array fparam t.tp_params p;
-			] in
-			to_obj fields p
-		in
-		let fields = [
-			("args",to_array farg f.f_args p);
-			("ret",to_opt to_type_hint f.f_type p);
-			("expr",to_opt to_expr f.f_expr p);
-			("params",to_array fparam f.f_params p);
-		] in
-		to_obj fields p
-	and to_cfield f p =
-		let p = f.cff_pos in
-		let to_access a p =
-			let n = (match a with
-			| APublic -> "APublic"
-			| APrivate -> "APrivate"
-			| AStatic -> "AStatic"
-			| AOverride -> "AOverride"
-			| ADynamic -> "ADynamic"
-			| AInline -> "AInline"
-			| AMacro -> "AMacro"
-			) in
-			mk_enum "Access" n [] p
-		in
-		let to_kind k =
-			let n, vl = (match k with
-				| FVar (ct,e) -> "FVar", [to_opt to_type_hint ct p;to_opt to_expr e p]
-				| FFun f -> "FFun", [to_fun f p]
-				| FProp (get,set,t,e) -> "FProp", [to_placed_name get; to_placed_name set; to_opt to_type_hint t p; to_opt to_expr e p]
-			) in
-			mk_enum "FieldType" n vl p
-		in
-		let fields = [
-			Some ("name", to_placed_name f.cff_name);
-			(match f.cff_doc with None -> None | Some s -> Some ("doc", to_string s p));
-			(match f.cff_access with [] -> None | l -> Some ("access", to_array to_access l p));
-			Some ("kind", to_kind f.cff_kind);
-			Some ("pos", to_pos f.cff_pos);
-			(match f.cff_meta with [] -> None | l -> Some ("meta", to_meta f.cff_meta p));
-		] in
-		let fields = List.rev (List.fold_left (fun acc v -> match v with None -> acc | Some e -> e :: acc) [] fields) in
-		to_obj fields p
-	and to_meta m p =
-		to_array (fun (m,el,p) _ ->
-			let fields = [
-				"name", to_string (Meta.to_string m) p;
-				"params", to_expr_array el p;
-				"pos", to_pos p;
-			] in
-			to_obj fields p
-		) m p
-	and to_pos p =
-		match !cur_pos with
-		| Some p ->
-			p
-		| None ->
-		let file = (EConst (String p.pfile),p) in
-		let pmin = (EConst (Int (string_of_int p.pmin)),p) in
-		let pmax = (EConst (Int (string_of_int p.pmax)),p) in
-		if in_macro then
-			(EUntyped (ECall ((EConst (Ident "$__mk_pos__"),p),[file;pmin;pmax]),p),p)
+let handle_xml_literal p1 =
+	Lexer.reset();
+	let i = Lexer.lex_xml p1.pmin !code_ref in
+	let xml = Lexer.contents() in
+	let e = EConst (String(xml,SDoubleQuotes)),{p1 with pmax = i} in (* STRINGTODO: distinct kind? *)
+	let e = make_meta Meta.Markup [] e p1 in
+	e
+
+let punion_next p1 s =
+	let _,p2 = next_token s in
+	{
+		pfile = p1.pfile;
+		pmin = p1.pmin;
+		pmax = p2.pmax - 1;
+	}
+
+let mk_null_expr p = (EConst(Ident "null"),p)
+
+let mk_display_expr e dk = (EDisplay(e,dk),(pos e))
+
+let is_completion () =
+	!display_mode = DMDefault
+
+let is_signature_display () =
+	!display_mode = DMSignature
+
+let check_resume p fyes fno =
+	if is_completion () && !in_display_file && p.pmax = (display_position#get).pmin then begin
+		had_resume := true;
+		fyes()
+	end else
+		fno()
+
+let check_resume_range p s fyes fno =
+	if is_completion () && !in_display_file then begin
+		let pnext = next_pos s in
+		if p.pmin < (display_position#get).pmin && pnext.pmin >= (display_position#get).pmax then
+			fyes pnext
 		else
-			to_obj [("file",file);("min",pmin);("max",pmax)] p
-	and to_expr_array a p = match a with
-		| [EMeta ((Meta.Dollar "a",[],_),e1),_] -> (match fst e1 with EArrayDecl el -> to_expr_array el p | _ -> e1)
-		| _ -> to_array to_expr a p
-	and to_expr e _ =
-		let p = snd e in
-		let expr n vl =
-			let e = mk_enum "ExprDef" n vl p in
-			to_obj [("expr",e);("pos",to_pos p)] p
-		in
-		let loop e = to_expr e (snd e) in
-		match fst e with
-		| EConst (Ident n) when n.[0] = '$' && String.length n > 1 && n <> "$__mk_pos__" ->
-			to_string n p
-		| EConst c ->
-			expr "EConst" [to_const c p]
-		| EArray (e1,e2) ->
-			expr "EArray" [loop e1;loop e2]
-		| EBinop (op,e1,e2) ->
-			expr "EBinop" [to_binop op p; loop e1; loop e2]
-		| EField (e,s) ->
-			expr "EField" [loop e; to_string s p]
-		| EParenthesis e ->
-			expr "EParenthesis" [loop e]
-		| EObjectDecl fl ->
-			expr "EObjectDecl" [to_array (fun ((f,_),e) -> to_obj [("field",to_string f p);("expr",loop e)]) fl p]
-		| EArrayDecl el ->
-			expr "EArrayDecl" [to_expr_array el p]
-		| ECall (e,el) ->
-			expr "ECall" [loop e;to_expr_array el p]
-		| ENew (t,el) ->
-			expr "ENew" [to_tpath t p;to_expr_array el p]
-		| EUnop (op,flag,e) ->
-			let op = mk_enum "Unop" (match op with
-				| Increment -> "OpIncrement"
-				| Decrement -> "OpDecrement"
-				| Not -> "OpNot"
-				| Neg -> "OpNeg"
-				| NegBits -> "OpNegBits"
-			) [] p in
-			expr "EUnop" [op;to_bool (flag = Postfix) p;loop e]
-		| EVars vl ->
-			expr "EVars" [to_array (fun ((n,pn),th,e) p ->
-				let fields = [
-					(* "name", to_obj ["name",to_string n pn;"pos",to_pos pn] p; *)
-					"name", to_string n pn;
-					"type", to_opt to_type_hint th p;
-					"expr", to_opt to_expr e p;
-				] in
-				to_obj fields p
-			) vl p]
-		| EFunction (name,f) ->
-			let name = match name with
-				| None ->
-					to_null p
-				| Some name ->
-					if ExtString.String.starts_with name "inline_$" then begin
-						let real_name = (String.sub name 7 (String.length name - 7)) in
-						let e_name = to_string real_name p in
-						let e_inline = to_string "inline_" p in
-						let e_add = (EBinop(OpAdd,e_inline,e_name),p) in
-						e_add
-					end else
-						to_string name p
-			in
-			expr "EFunction" [name; to_fun f p]
-		| EBlock el ->
-			expr "EBlock" [to_expr_array el p]
-		| EFor (e1,e2) ->
-			expr "EFor" [loop e1;loop e2]
-		| EIn (e1,e2) ->
-			expr "EIn" [loop e1;loop e2]
-		| EIf (e1,e2,eelse) ->
-			expr "EIf" [loop e1;loop e2;to_opt to_expr eelse p]
-		| EWhile (e1,e2,flag) ->
-			expr "EWhile" [loop e1;loop e2;to_bool (flag = NormalWhile) p]
-		| ESwitch (e1,cases,def) ->
-			let scase (el,eg,e,_) p =
-				to_obj [("values",to_expr_array el p);"guard",to_opt to_expr eg p;"expr",to_opt to_expr e p] p
-			in
-			expr "ESwitch" [loop e1;to_array scase cases p;to_opt (fun (e,_) -> to_opt to_expr e) def p]
-		| ETry (e1,catches) ->
-			let scatch ((n,_),t,e,_) p =
-				to_obj [("name",to_string n p);("type",to_ctype t p);("expr",loop e)] p
-			in
-			expr "ETry" [loop e1;to_array scatch catches p]
-		| EReturn eo ->
-			expr "EReturn" [to_opt to_expr eo p]
-		| EBreak ->
-			expr "EBreak" []
-		| EContinue ->
-			expr "EContinue" []
-		| EUntyped e ->
-			expr "EUntyped" [loop e]
-		| EThrow e ->
-			expr "EThrow" [loop e]
-		| ECast (e,ct) ->
-			expr "ECast" [loop e; to_opt to_type_hint ct p]
-		| EDisplay (e,flag) ->
-			expr "EDisplay" [loop e; to_bool flag p]
-		| EDisplayNew t ->
-			expr "EDisplayNew" [to_tpath t p]
-		| ETernary (e1,e2,e3) ->
-			expr "ETernary" [loop e1;loop e2;loop e3]
-		| ECheckType (e1,ct) ->
-			expr "ECheckType" [loop e1; to_type_hint ct p]
-		| EMeta ((m,ml,p),e1) ->
-			match m, ml with
-			| Meta.Dollar ("" | "e"), _ ->
-				e1
-			| Meta.Dollar "a", _ ->
-				expr "EArrayDecl" (match fst e1 with EArrayDecl el -> [to_expr_array el p] | _ -> [e1])
-			| Meta.Dollar "b", _ ->
-				expr "EBlock" [e1]
-			(* TODO: can $v and $i be implemented better? *)
-			| Meta.Dollar "v", _ ->
-				begin match fst e1 with
-				| EParenthesis (ECheckType (e2, (CTPath{tname="String";tpackage=[]},_)),_) -> expr "EConst" [mk_enum "Constant" "CString" [e2] (pos e2)]
-				| EParenthesis (ECheckType (e2, (CTPath{tname="Int";tpackage=[]},_)),_) -> expr "EConst" [mk_enum "Constant" "CInt" [e2] (pos e2)]
-				| EParenthesis (ECheckType (e2, (CTPath{tname="Float";tpackage=[]},_)),_) -> expr "EConst" [mk_enum "Constant" "CFloat" [e2] (pos e2)]
-				| _ -> (ECall ((EField ((EField ((EField ((EConst (Ident "haxe"),p),"macro"),p),"Context"),p),"makeExpr"),p),[e; to_pos (pos e)]),p)
-				end
-			| Meta.Dollar "i", _ ->
-				expr "EConst" [mk_enum "Constant" "CIdent" [e1] (pos e1)]
-			| Meta.Dollar "p", _ ->
-				(ECall ((EField ((EField ((EField ((EConst (Ident "haxe"),p),"macro"),p),"MacroStringTools"),p),"toFieldExpr"),p),[e]),p)
-			| Meta.Custom ":pos", [pexpr] ->
-				let old = !cur_pos in
-				cur_pos := Some pexpr;
-				let e = loop e1 in
-				cur_pos := old;
-				e
-			| _ ->
-				expr "EMeta" [to_obj [("name",to_string (Meta.to_string m) p);("params",to_expr_array ml p);("pos",to_pos p)] p;loop e1]
-	and to_tparam_decl p t =
-		to_obj [
-			"name", to_placed_name t.tp_name;
-			"params", (EArrayDecl (List.map (to_tparam_decl p) t.tp_params),p);
-			"constraints", (EArrayDecl (List.map (fun t -> to_ctype t p) t.tp_constraints),p)
-		] p
-	and to_type_def (t,p) =
-		match t with
-		| EClass d ->
-			let ext = ref None and impl = ref [] and interf = ref false in
-			List.iter (function
-				| HExtern | HPrivate -> ()
-				| HInterface -> interf := true;
-				| HExtends t -> ext := (match !ext with
-					| None -> Some (to_tpath t p)
-					| Some _ -> begin
-						impl := (to_tpath t p) :: !impl;
-						!ext
-					  end)
-				| HImplements i-> impl := (to_tpath i p) :: !impl
-			) d.d_flags;
-			to_obj [
-				"pack", (EArrayDecl [],p);
-				"name", to_string (fst d.d_name) (pos d.d_name);
-				"pos", to_pos p;
-				"meta", to_meta d.d_meta p;
-				"params", (EArrayDecl (List.map (to_tparam_decl p) d.d_params),p);
-				"isExtern", to_bool (List.mem HExtern d.d_flags) p;
-				"kind", mk_enum "TypeDefKind" "TDClass" [(match !ext with None -> (EConst (Ident "null"),p) | Some t -> t);(EArrayDecl (List.rev !impl),p);to_bool !interf p] p;
-				"fields", (EArrayDecl (List.map (fun f -> to_cfield f p) d.d_data),p)
-			] p
-		| _ -> assert false
-	in
-	(fun e -> to_expr e (snd e)), to_ctype, to_type_def
-
-let next_token s = match Stream.peek s with
-	| Some tk -> tk
-	| _ -> last_token s
-
-let popt f = parser
-	| [< v = f >] -> Some v
-	| [< >] -> None
-
-let rec plist f = parser
-	| [< v = f; l = plist f >] -> v :: l
-	| [< >] -> []
-
-let rec psep sep f = parser
-	| [< v = f; s >] ->
-		let rec loop = parser
-			| [< '(sep2,_) when sep2 = sep; v = f; l = loop >] -> v :: l
-			| [< >] -> []
-		in
-		v :: loop s
-	| [< >] -> []
+			fno()
+	end else
+		fno()
 
-let ident = parser
-	| [< '(Const (Ident i),p) >] -> i,p
-
-let dollar_ident = parser
-	| [< '(Const (Ident i),p) >] -> i,p
-	| [< '(Dollar i,p) >] -> ("$" ^ i),p
-
-let dollar_ident_macro pack = parser
-	| [< '(Const (Ident i),p) >] -> i,p
-	| [< '(Dollar i,p) >] -> ("$" ^ i),p
-	| [< '(Kwd Macro,p) when pack <> [] >] -> "macro", p
-	| [< '(Kwd Extern,p) when pack <> [] >] -> "extern", p
-
-let lower_ident_or_macro = parser
-	| [< '(Const (Ident i),p) when is_lower_ident i >] -> i
-	| [< '(Kwd Macro,_) >] -> "macro"
-	| [< '(Kwd Extern,_) >] -> "extern"
-
-let property_ident = parser
-	| [< i,p = ident >] -> i,p
-	| [< '(Kwd Dynamic,p) >] -> "dynamic",p
-	| [< '(Kwd Default,p) >] -> "default",p
-	| [< '(Kwd Null,p) >] -> "null",p
-
-let get_doc s =
-	(* do the peek first to make sure we fetch the doc *)
+let check_completion p0 plus_one s =
 	match Stream.peek s with
-	| None -> None
-	| Some (tk,p) ->
-		match !last_doc with
-		| None -> None
-		| Some (d,pos) ->
-			last_doc := None;
-			if pos = p.pmin then Some d else None
-
-let comma = parser
-	| [< '(Comma,_) >] -> ()
-
-let semicolon s =
-	if fst (last_token s) = BrClose then
-		match s with parser
-		| [< '(Semicolon,p) >] -> p
-		| [< >] -> snd (last_token s)
-	else
-		match s with parser
-		| [< '(Semicolon,p) >] -> p
-		| [< s >] ->
-			let pos = snd (last_token s) in
-			if do_resume() then pos else error Missing_semicolon pos
-
-let encloses_resume p =
-	p.pmin <= !resume_display.pmin && p.pmax >= !resume_display.pmax
-
-let would_skip_resume p1 s =
-	match Stream.npeek 1 s with
-	| [ (_,p2) ] ->
-		is_resuming_file p2.pfile && encloses_resume (punion p1 p2)
+	| Some((Const(Ident name),p)) when display_position#enclosed_in p ->
+		Stream.junk s;
+		(Some(Some name,p))
 	| _ ->
-		false
-
-let rec	parse_file s =
-	last_doc := None;
-	match s with parser
-	| [< '(Kwd Package,_); pack = parse_package; s >] ->
-		begin match s with parser
-		| [< '(Const(Ident _),p) when pack = [] >] -> error (Custom "Package name must start with a lowercase character") p
-		| [< _ = semicolon; l = parse_type_decls pack []; '(Eof,_) >] -> pack , l
-		end
-	| [< l = parse_type_decls [] []; '(Eof,_) >] -> [] , l
-
-and parse_type_decls pack acc s =
-	try
-		match s with parser
-		| [< v = parse_type_decl; l = parse_type_decls pack (v :: acc) >] -> l
-		| [< >] -> List.rev acc
-	with TypePath ([],Some (name,false),b) ->
-		(* resolve imports *)
-		List.iter (fun d ->
-			match fst d with
-			| EImport (t,_) ->
-				(match List.rev t with
-				| (n,_) :: path when n = name && List.for_all (fun (i,_) -> is_lower_ident i) path -> raise (TypePath (List.map fst (List.rev path),Some (name,false),b))
-				| _ -> ())
-			| _ -> ()
-		) acc;
-		raise (TypePath (pack,Some(name,true),b))
-
-and parse_type_decl s =
-	match s with parser
-	| [< '(Kwd Import,p1) >] -> parse_import s p1
-	| [< '(Kwd Using,p1) >] -> parse_using s p1
-	| [< doc = get_doc; meta = parse_meta; c = parse_common_flags; s >] ->
-		match s with parser
-		| [< n , p1 = parse_enum_flags; name = type_name; tl = parse_constraint_params; '(BrOpen,_); l = plist parse_enum; '(BrClose,p2) >] ->
-			(EEnum {
-				d_name = name;
-				d_doc = doc;
-				d_meta = meta;
-				d_params = tl;
-				d_flags = List.map snd c @ n;
-				d_data = l
-			}, punion p1 p2)
-		| [< n , p1 = parse_class_flags; name = type_name; tl = parse_constraint_params; hl = plist parse_class_herit; '(BrOpen,_); fl, p2 = parse_class_fields false p1 >] ->
-			(EClass {
-				d_name = name;
-				d_doc = doc;
-				d_meta = meta;
-				d_params = tl;
-				d_flags = List.map fst c @ n @ hl;
-				d_data = fl;
-			}, punion p1 p2)
-		| [< '(Kwd Typedef,p1); name = type_name; tl = parse_constraint_params; '(Binop OpAssign,p2); t = parse_complex_type; s >] ->
-			(match s with parser
-			| [< '(Semicolon,_) >] -> ()
-			| [< >] -> ());
-			(ETypedef {
-				d_name = name;
-				d_doc = doc;
-				d_meta = meta;
-				d_params = tl;
-				d_flags = List.map snd c;
-				d_data = t;
-			}, punion p1 (pos t))
-		| [< '(Kwd Abstract,p1); name = type_name; tl = parse_constraint_params; st = parse_abstract_subtype; sl = plist parse_abstract_relations; '(BrOpen,_); fl, p2 = parse_class_fields false p1 >] ->
-			let flags = List.map (fun (_,c) -> match c with EPrivate -> APrivAbstract | EExtern -> AExtern) c in
-			let flags = (match st with None -> flags | Some t -> AIsType t :: flags) in
-			(EAbstract {
-				d_name = name;
-				d_doc = doc;
-				d_meta = meta;
-				d_params = tl;
-				d_flags = flags @ sl;
-				d_data = fl;
-			},punion p1 p2)
-
-and parse_class doc meta cflags need_name s =
-	let opt_name = if need_name then type_name else (fun s -> match popt type_name s with None -> "",null_pos | Some n -> n) in
-	match s with parser
-	| [< n , p1 = parse_class_flags; name = opt_name; tl = parse_constraint_params; hl = plist parse_class_herit; '(BrOpen,_); fl, p2 = parse_class_fields (not need_name) p1 >] ->
-		(EClass {
-			d_name = name;
-			d_doc = doc;
-			d_meta = meta;
-			d_params = tl;
-			d_flags = List.map fst cflags @ n @ hl;
-			d_data = fl;
-		}, punion p1 p2)
-
-and parse_import s p1 =
-	let rec loop acc =
-		match s with parser
-		| [< '(Dot,p) >] ->
-			let resume() =
-				type_path (List.map fst acc) true
-			in
-			if is_resuming p then resume();
-			(match s with parser
-			| [< '(Const (Ident k),p) >] ->
-				loop ((k,p) :: acc)
-			| [< '(Kwd Macro,p) >] ->
-				loop (("macro",p) :: acc)
-			| [< '(Kwd Extern,p) >] ->
-				loop (("extern",p) :: acc)
-			| [< '(Binop OpMult,_); '(Semicolon,p2) >] ->
-				p2, List.rev acc, IAll
-			| [< '(Binop OpOr,_) when do_resume() >] ->
-				set_resume p;
-				resume()
-			| [< >] ->
-				serror());
-		| [< '(Semicolon,p2) >] ->
-			p2, List.rev acc, INormal
-		| [< '(Kwd In,_); '(Const (Ident name),_); '(Semicolon,p2) >] ->
-			p2, List.rev acc, IAsName name
-		| [< '(Const (Ident "as"),_); '(Const (Ident name),_); '(Semicolon,p2) >] ->
-			p2, List.rev acc, IAsName name
-		| [< >] ->
-			serror()
-	in
-	let p2, path, mode = (match s with parser
-		| [< '(Const (Ident name),p) >] -> loop [name,p]
-		| [< >] -> if would_skip_resume p1 s then p1, [], INormal else serror()
-	) in
-	(EImport (path,mode),punion p1 p2)
-
-and parse_using s p1 =
-	let rec loop acc =
-		match s with parser
-		| [< '(Dot,p) >] ->
-			begin match s with parser
-			| [< '(Const (Ident k),p) >] ->
-				loop ((k,p) :: acc)
-			| [< '(Kwd Macro,p) >] ->
-				loop (("macro",p) :: acc)
-			| [< '(Kwd Extern,p) >] ->
-				loop (("extern",p) :: acc)
-			| [< >] ->
-				if is_resuming p then type_path (List.map fst acc) false;
-				serror()
-			end
-		| [< '(Semicolon,p2) >] ->
-			p2,List.rev acc
+		if would_skip_display_position p0 plus_one s then
+			Some(None,DisplayPosition.display_position#with_pos p0)
+		else
+			None
+
+let check_type_decl_flag_completion mode flags s =
+	if not !in_display_file || not (is_completion()) then raise Stream.Failure;
+	let mode () = match flags with
+		| [] ->
+			SCTypeDecl mode
+		| flags ->
+			let flags = List.map fst flags in
+			SCAfterTypeFlag flags
 	in
-	let p2, path = (match s with parser
-		| [< '(Const (Ident name),p) >] -> loop [name,p]
-		| [< >] -> if would_skip_resume p1 s then p1, [] else serror()
-	) in
-	(EUsing path,punion p1 p2)
-
-and parse_abstract_relations s =
-	match s with parser
-	| [< '(Const (Ident "to"),_); t = parse_complex_type >] -> AToType t
-	| [< '(Const (Ident "from"),_); t = parse_complex_type >] -> AFromType t
-
-and parse_abstract_subtype s =
-	match s with parser
-	| [< '(POpen, _); t = parse_complex_type; '(PClose,_) >] -> Some t
-	| [< >] -> None
-
-and parse_package s = psep Dot lower_ident_or_macro s
-
-and parse_class_fields tdecl p1 s =
-	let l = parse_class_field_resume tdecl s in
-	let p2 = (match s with parser
-		| [< '(BrClose,p2) >] -> p2
-		| [< >] -> if do_resume() then pos (last_token s) else serror()
-	) in
-	l, p2
-
-and parse_class_field_resume tdecl s =
-	if not (do_resume()) then
-		plist parse_class_field s
-	else try
-		let c = parse_class_field s in
-		c :: parse_class_field_resume tdecl s
-	with Stream.Error _ | Stream.Failure ->
-		(* look for next variable/function or next type declaration *)
-		let rec junk k =
-			if k <= 0 then () else begin
-				Stream.junk s;
-				junk (k - 1);
-			end
-		in
-		(*
-			walk back tokens which are prefixing a type/field declaration
-		*)
-		let rec junk_tokens k =
-			if k = 0 then
-				()
-			else match List.rev_map fst (Stream.npeek k s) with
-			| Kwd Private :: _ -> junk_tokens (k - 1)
-			| (Const (Ident _) | Kwd _) :: DblDot :: At :: l
-			| (Const (Ident _) | Kwd _) :: At :: l ->
-				junk_tokens (List.length l)
-			| PClose :: l ->
-				(* count matching parenthesises for metadata call *)
-				let rec loop n = function
-					| [] -> []
-					| POpen :: l -> if n = 0 then l else loop (n - 1) l
-					| PClose :: l -> loop (n + 1) l
-					| _ :: l -> loop n l
-				in
-				(match loop 0 l with
-				| (Const (Ident _) | Kwd _) :: At :: l
-				| (Const (Ident _) | Kwd _) :: DblDot :: At :: l -> junk_tokens (List.length l)
-				| _ ->
-					junk k)
-			| _ ->
-				junk k
-		in
-		let rec loop k =
-			match List.rev_map fst (Stream.npeek k s) with
-			(* metadata *)
-			| Kwd _ :: At :: _ | Kwd _ :: DblDot :: At :: _ ->
-				loop (k + 1)
-			(* field declaration *)
-			| Const _ :: Kwd Function :: _
-			| Kwd New :: Kwd Function :: _ ->
-				junk_tokens (k - 2);
-				parse_class_field_resume tdecl s
-			| Kwd Macro :: _ | Kwd Public :: _ | Kwd Static :: _ | Kwd Var :: _ | Kwd Override :: _ | Kwd Dynamic :: _ | Kwd Inline :: _ ->
-				junk_tokens (k - 1);
-				parse_class_field_resume tdecl s
-			| BrClose :: _ when tdecl ->
-				junk_tokens (k - 1);
-				[]
-			(* type declaration *)
-			| Eof :: _ | Kwd Import :: _ | Kwd Using :: _ | Kwd Extern :: _ | Kwd Class :: _ | Kwd Interface :: _ | Kwd Enum :: _ | Kwd Typedef :: _ | Kwd Abstract :: _->
-				junk_tokens (k - 1);
-				[]
-			| [] ->
-				[]
+	match Stream.peek s with
+		(* If there's an identifier coming up, it's probably an incomplete type
+			declaration. Let's just raise syntax completion in that case because
+			the parser would fail otherwise anyway. *)
+		| Some((Const(Ident name),p)) when display_position#enclosed_in p -> syntax_completion (mode()) (Some name) p
+		| _ -> match flags with
+			| (_,p) :: _ when would_skip_display_position p true s ->
+				let flags = List.map fst flags in
+				syntax_completion (SCAfterTypeFlag flags) None (DisplayPosition.display_position#with_pos p)
 			| _ ->
-				loop (k + 1)
-		in
-		loop 1
-
-and parse_common_flags = parser
-	| [< '(Kwd Private,_); l = parse_common_flags >] -> (HPrivate, EPrivate) :: l
-	| [< '(Kwd Extern,_); l = parse_common_flags >] -> (HExtern, EExtern) :: l
-	| [< >] -> []
-
-and parse_meta_argument_expr s =
-	try
-		expr s
-	with Display e -> match fst e with
-		| EDisplay(e,_) ->
-			begin try
-				type_path (string_list_of_expr_path_raise e) false
-			with Exit ->
-				e
-			end
-		| _ ->
-			e
-
-and parse_meta_params pname s = match s with parser
-	| [< '(POpen,p) when p.pmin = pname.pmax; params = psep Comma parse_meta_argument_expr; '(PClose,_); >] -> params
-	| [< >] -> []
-
-and parse_meta_entry = parser
-	[< '(At,p1); s >] ->
-		match s with parser
-		| [< name,p = meta_name p1; params = parse_meta_params p; s >] -> (name,params,p)
-		| [< >] ->
-			if is_resuming p1 then (Meta.Last,[],p1) else serror()
-
-and parse_meta = parser
-	| [< entry = parse_meta_entry; s >] ->
-		entry :: parse_meta s
-	| [< >] -> []
-
-and meta_name p1 = parser
-	| [< '(Const (Ident i),p) when p.pmin = p1.pmax >] -> (Meta.Custom i), p
-	| [< '(Kwd k,p) when p.pmin = p1.pmax >] -> (Meta.Custom (s_keyword k)),p
-	| [< '(DblDot,p) when p.pmin = p1.pmax; s >] -> match s with parser
-		| [< '(Const (Ident i),p1) when p1.pmin = p.pmax >] -> (Meta.parse i),punion p p1
-		| [< '(Kwd k,p1) when p1.pmin = p.pmax >] -> (Meta.parse (s_keyword k)),punion p p1
-		| [< >] -> if is_resuming p then Meta.Last,p else raise Stream.Failure
-
-and parse_enum_flags = parser
-	| [< '(Kwd Enum,p) >] -> [] , p
-
-and parse_class_flags = parser
-	| [< '(Kwd Class,p) >] -> [] , p
-	| [< '(Kwd Interface,p) >] -> [HInterface] , p
-
-and parse_complex_type_at p = parser
-	| [< t = parse_complex_type >] -> t
-	| [< >] -> if is_resuming p then CTPath { tpackage = []; tname = ""; tparams = []; tsub = None },p else serror()
-
-and parse_type_hint = parser
-	| [< '(DblDot,p1); t = parse_complex_type_at p1 >] -> t
-
-and parse_type_hint_with_pos s = match s with parser
-	| [< '(DblDot,p1); t = parse_complex_type_at p1 >] -> t
-
-and parse_type_opt = parser
-	| [< t = parse_type_hint >] -> Some t
-	| [< >] -> None
-
-and parse_complex_type s =
-	let t = parse_complex_type_inner s in
-	parse_complex_type_next t s
-
-and parse_structural_extension = parser
-	| [< '(Binop OpGt,_); t = parse_type_path; '(Comma,_); s >] ->
-		t
-
-and parse_complex_type_inner = parser
-	| [< '(POpen,p1); t = parse_complex_type; '(PClose,p2) >] -> CTParent t,punion p1 p2
-	| [< '(BrOpen,p1); s >] ->
-		(match s with parser
-		| [< l,p2 = parse_type_anonymous false >] -> CTAnonymous l,punion p1 p2
-		| [< t = parse_structural_extension; s>] ->
-			let tl = t :: plist parse_structural_extension s in
-			(match s with parser
-			| [< l,p2 = parse_type_anonymous false >] -> CTExtend (tl,l),punion p1 p2
-			| [< l,p2 = parse_class_fields true p1 >] -> CTExtend (tl,l),punion p1 p2)
-		| [< l,p2 = parse_class_fields true p1 >] -> CTAnonymous l,punion p1 p2
-		| [< >] -> serror())
-	| [< '(Question,p1); t,p2 = parse_complex_type_inner >] ->
-		CTOptional (t,p2),punion p1 p2
-	| [< t,p = parse_type_path >] ->
-		CTPath t,p
-
-and parse_type_path s = parse_type_path1 None [] s
-
-and parse_type_path1 p0 pack = parser
-	| [< name, p1 = dollar_ident_macro pack; s >] ->
-		if is_lower_ident name then
-			(match s with parser
-			| [< '(Dot,p) >] ->
-				if is_resuming p then
-					raise (TypePath (List.rev (name :: pack),None,false))
-				else
-					parse_type_path1 (match p0 with None -> Some p1 | Some _ -> p0) (name :: pack) s
-			| [< '(Semicolon,_) >] ->
-				error (Custom "Type name should start with an uppercase letter") p1
-			| [< >] -> serror())
-		else
-			let sub,p2 = (match s with parser
-				| [< '(Dot,p); s >] ->
-					(if is_resuming p then
-						raise (TypePath (List.rev pack,Some (name,false),false))
-					else match s with parser
-						| [< '(Const (Ident name),p2) when not (is_lower_ident name) >] -> Some name,p2
-						| [< '(Binop OpOr,_) when do_resume() >] ->
-							set_resume p;
-							raise (TypePath (List.rev pack,Some (name,false),false))
-						| [< >] -> serror())
-				| [< >] -> None,p1
-			) in
-			let params,p2 = (match s with parser
-				| [< '(Binop OpLt,_); l = psep Comma parse_type_path_or_const; '(Binop OpGt,p2) >] -> l,p2
-				| [< >] -> [],p2
-			) in
-			{
-				tpackage = List.rev pack;
-				tname = name;
-				tparams = params;
-				tsub = sub;
-			},punion (match p0 with None -> p1 | Some p -> p) p2
-	| [< '(Binop OpOr,_) when do_resume() >] ->
-		raise (TypePath (List.rev pack,None,false))
-
-and type_name = parser
-	| [< '(Const (Ident name),p) >] ->
-		if is_lower_ident name then
-			error (Custom "Type name should start with an uppercase letter") p
-		else
-			name,p
-	| [< '(Dollar name,p) >] -> "$" ^ name,p
-
-and parse_type_path_or_const = parser
-	(* we can't allow (expr) here *)
-	| [< '(BkOpen,p1); l = parse_array_decl; '(BkClose,p2); s >] -> TPExpr (EArrayDecl l, punion p1 p2)
-	| [< t = parse_complex_type >] -> TPType t
-	| [< '(Const c,p) >] -> TPExpr (EConst c,p)
-	| [< e = expr >] -> TPExpr e
-	| [< >] -> serror()
+				raise Stream.Failure
 
-and parse_complex_type_next (t : type_hint) = parser
-	| [< '(Arrow,_); t2,p2 = parse_complex_type >] ->
-		(match t2 with
-		| CTFunction (args,r) ->
-			CTFunction (t :: args,r),punion (pos t) p2
-		| _ ->
-			CTFunction ([t] , (t2,p2)),punion (pos t) p2)
-	| [< >] -> t
-
-and parse_type_anonymous opt = parser
-	| [< '(Question,_) when not opt; s >] -> parse_type_anonymous true s
-	| [< name, p1 = ident; t = parse_type_hint_with_pos; s >] ->
-		let p2 = pos (last_token s) in
-		let next acc =
-			{
-				cff_name = name,p1;
-				cff_meta = if opt then [Meta.Optional,[],null_pos] else [];
-				cff_access = [];
-				cff_doc = None;
-				cff_kind = FVar (Some t,None);
-				cff_pos = punion p1 p2;
-			} :: acc
+let check_type_decl_completion mode pmax s =
+	if !in_display_file && is_completion() then begin
+		let pmin = match Stream.peek s with
+			| Some (Eof,_) | None -> max_int
+			| Some tk -> (pos tk).pmin
 		in
-		match s with parser
-		| [< '(BrClose,p2) >] -> next [],p2
-		| [< '(Comma,p2) >] ->
-			(match s with parser
-			| [< '(BrClose,p2) >] -> next [],p2
-			| [< l,p2 = parse_type_anonymous false >] -> next l,punion p1 p2
-			| [< >] -> serror());
-		| [< >] -> serror()
-
-and parse_enum s =
-	let doc = get_doc s in
-	let meta = parse_meta s in
-	match s with parser
-	| [< name, p1 = ident; params = parse_constraint_params; s >] ->
-		let args = (match s with parser
-		| [< '(POpen,_); l = psep Comma parse_enum_param; '(PClose,_) >] -> l
-		| [< >] -> []
-		) in
-		let t = popt parse_type_hint_with_pos s in
-		let p2 = (match s with parser
-			| [< p = semicolon >] -> p
-			| [< >] -> serror()
-		) in
-		{
-			ec_name = name,p1;
-			ec_doc = doc;
-			ec_meta = meta;
-			ec_args = args;
-			ec_params = params;
-			ec_type = t;
-			ec_pos = punion p1 p2;
-		}
-
-and parse_enum_param = parser
-	| [< '(Question,_); name, _ = ident; t = parse_type_hint_with_pos >] -> (name,true,t)
-	| [< name, _ = ident; t = parse_type_hint_with_pos >] -> (name,false,t)
-
-and parse_class_field s =
-	let doc = get_doc s in
-	match s with parser
-	| [< meta = parse_meta; al = parse_cf_rights true []; s >] ->
-		let name, pos, k = (match s with parser
-		| [< '(Kwd Var,p1); name = dollar_ident; s >] ->
-			(match s with parser
-			| [< '(POpen,_); i1 = property_ident; '(Comma,_); i2 = property_ident; '(PClose,_) >] ->
-				let t = popt parse_type_hint_with_pos s in
-				let e , p2 = (match s with parser
-				| [< '(Binop OpAssign,_); e = toplevel_expr; p2 = semicolon >] -> Some e , p2
-				| [< p2 = semicolon >] -> None , p2
-				| [< >] -> serror()
-				) in
-				name, punion p1 p2, FProp (i1,i2,t, e)
-			| [< t = popt parse_type_hint_with_pos; s >] ->
-				let e , p2 = (match s with parser
-				| [< '(Binop OpAssign,_); e = toplevel_expr; p2 = semicolon >] -> Some e , p2
-				| [< p2 = semicolon >] -> None , p2
-				| [< >] -> serror()
-				) in
-				name, punion p1 p2, FVar (t,e))
-		| [< '(Kwd Function,p1); name = parse_fun_name; pl = parse_constraint_params; '(POpen,_); al = psep Comma parse_fun_param; '(PClose,_); t = popt parse_type_hint_with_pos; s >] ->
-			let e, p2 = (match s with parser
-				| [< e = toplevel_expr; s >] ->
-					(try ignore(semicolon s) with Error (Missing_semicolon,p) -> !display_error Missing_semicolon p);
-					Some e, pos e
-				| [< p = semicolon >] -> None, p
-				| [< >] -> serror()
-			) in
-			let f = {
-				f_params = pl;
-				f_args = al;
-				f_type = t;
-				f_expr = e;
-			} in
-			name, punion p1 p2, FFun f
-		| [< >] ->
-			if al = [] then raise Stream.Failure else serror()
-		) in
-		{
-			cff_name = name;
-			cff_doc = doc;
-			cff_meta = meta;
-			cff_access = al;
-			cff_pos = pos;
-			cff_kind = k;
-		}
-
-and parse_cf_rights allow_static l = parser
-	| [< '(Kwd Static,_) when allow_static; l = parse_cf_rights false (AStatic :: l) >] -> l
-	| [< '(Kwd Macro,_) when not(List.mem AMacro l); l = parse_cf_rights allow_static (AMacro :: l) >] -> l
-	| [< '(Kwd Public,_) when not(List.mem APublic l || List.mem APrivate l); l = parse_cf_rights allow_static (APublic :: l) >] -> l
-	| [< '(Kwd Private,_) when not(List.mem APublic l || List.mem APrivate l); l = parse_cf_rights allow_static (APrivate :: l) >] -> l
-	| [< '(Kwd Override,_) when not (List.mem AOverride l); l = parse_cf_rights false (AOverride :: l) >] -> l
-	| [< '(Kwd Dynamic,_) when not (List.mem ADynamic l); l = parse_cf_rights allow_static (ADynamic :: l) >] -> l
-	| [< '(Kwd Inline,_); l = parse_cf_rights allow_static (AInline :: l) >] -> l
-	| [< >] -> l
-
-and parse_fun_name = parser
-	| [< name,p = dollar_ident >] -> name,p
-	| [< '(Kwd New,p) >] -> "new",p
-
-and parse_fun_param s =
-	let meta = parse_meta s in
-	match s with parser
-	| [< '(Question,_); name, pn = dollar_ident; t = popt parse_type_hint_with_pos; c = parse_fun_param_value >] -> ((name,pn),true,meta,t,c)
-	| [< name, pn = dollar_ident; t = popt parse_type_hint_with_pos; c = parse_fun_param_value >] -> ((name,pn),false,meta,t,c)
-
-and parse_fun_param_value = parser
-	| [< '(Binop OpAssign,_); e = toplevel_expr >] -> Some e
-	| [< >] -> None
-
-and parse_fun_param_type = parser
-	| [< '(Question,_); name = ident; t = parse_type_hint >] -> (name,true,t)
-	| [< name = ident; t = parse_type_hint >] -> (name,false,t)
-
-and parse_constraint_params = parser
-	| [< '(Binop OpLt,_); l = psep Comma parse_constraint_param; '(Binop OpGt,_) >] -> l
-	| [< >] -> []
-
-and parse_constraint_param = parser
-	| [< meta = parse_meta; name = type_name; s >] ->
-		let params = (match s with parser
-			| [< >] -> []
-		) in
-		let ctl = (match s with parser
-			| [< '(DblDot,_); s >] ->
-				(match s with parser
-				| [< '(POpen,_); l = psep Comma parse_complex_type; '(PClose,_) >] -> l
-				| [< t = parse_complex_type >] -> [t]
-				| [< >] -> serror())
-			| [< >] -> []
-		) in
-		{
-			tp_name = name;
-			tp_params = params;
-			tp_constraints = ctl;
-			tp_meta = meta;
-		}
-
-and parse_type_path_or_resume p1 s = match s with parser
-	| [< t = parse_type_path >] -> t
-	| [< >] -> if would_skip_resume p1 s then { tpackage = []; tname = ""; tparams = []; tsub = None },null_pos else raise Stream.Failure
-
-and parse_class_herit = parser
-	| [< '(Kwd Extends,p1); t = parse_type_path_or_resume p1 >] -> HExtends t
-	| [< '(Kwd Implements,p1); t = parse_type_path_or_resume p1 >] -> HImplements t
-
-and block1 = parser
-	| [< name,p = dollar_ident; s >] -> block2 (name,p) (Ident name) p s
-	| [< '(Const (String name),p); s >] -> block2 (quote_ident name,p) (String name) p s
-	| [< b = block [] >] -> EBlock b
-
-and block2 name ident p s =
-	match s with parser
-	| [< '(DblDot,_); e = expr; l = parse_obj_decl >] -> EObjectDecl ((name,e) :: l)
-	| [< >] ->
-		let e = expr_next (EConst ident,p) s in
-		try
-			let _ = semicolon s in
-			let b = block [e] s in
-			EBlock b
-		with
-			| Error (err,p) ->
-				(!display_error) err p;
-				EBlock (block [e] s)
-
-and block acc s =
-	fst (block_with_pos acc null_pos s)
-
-and block_with_pos acc p s =
-	try
-		(* because of inner recursion, we can't put Display handling in errors below *)
-		let e = try parse_block_elt s with Display e -> display (EBlock (List.rev (e :: acc)),snd e) in
-		block_with_pos (e :: acc) (pos e) s
-	with
-		| Stream.Failure ->
-			List.rev acc,p
-		| Stream.Error _ ->
-			let tk , pos = next_token s in
-			(!display_error) (Unexpected tk) pos;
-			block_with_pos acc pos s
-		| Error (e,p) ->
-			(!display_error) e p;
-			block_with_pos acc p s
-
-and parse_block_elt = parser
-	| [< '(Kwd Var,p1); vl = parse_var_decls p1; p2 = semicolon >] ->
-		(EVars vl,punion p1 p2)
-	| [< '(Kwd Inline,p1); '(Kwd Function,_); e = parse_function p1 true; _ = semicolon >] -> e
-	| [< e = expr; _ = semicolon >] -> e
-
-and parse_obj_decl = parser
-	| [< '(Comma,_); s >] ->
-		(match s with parser
-		| [< name,p = ident; '(DblDot,_); e = expr; l = parse_obj_decl >] -> ((name,p),e) :: l
-		| [< '(Const (String name),p); '(DblDot,_); e = expr; l = parse_obj_decl >] -> ((quote_ident name,p),e) :: l
-		| [< >] -> [])
-	| [< >] -> []
-
-and parse_array_decl = parser
-	| [< e = expr; s >] ->
-		(match s with parser
-		| [< '(Comma,_); l = parse_array_decl >] -> e :: l
-		| [< >] -> [e])
-	| [< >] ->
-		[]
-
-and parse_var_decl_head = parser
-	| [< name, p = dollar_ident; t = popt parse_type_hint_with_pos >] -> (name,t,p)
-
-and parse_var_assignment = parser
-	| [< '(Binop OpAssign,p1); s >] ->
-		begin match s with parser
-		| [< e = expr >] -> Some e
-		| [< >] -> error (Custom "expression expected after =") p1
-		end
-	| [< >] -> None
-
-and parse_var_assignment_resume vl name pn t s =
-	try
-		let eo = parse_var_assignment s in
-		((name,pn),t,eo)
-	with Display e ->
-		let v = ((name,pn),t,Some e) in
-		let e = (EVars(List.rev (v :: vl)),punion pn (pos e)) in
-		display e
-
-and parse_var_decls_next vl = parser
-	| [< '(Comma,p1); name,t,pn = parse_var_decl_head; s >] ->
-		let v_decl = parse_var_assignment_resume vl name pn t s in
-		parse_var_decls_next (v_decl :: vl) s
-	| [< >] ->
-		vl
-
-and parse_var_decls p1 = parser
-	| [< name,t,pn = parse_var_decl_head; s >] ->
-		let v_decl = parse_var_assignment_resume [] name pn t s in
-		List.rev (parse_var_decls_next [v_decl] s)
-	| [< s >] -> error (Custom "Missing variable identifier") p1
-
-and parse_var_decl = parser
-	| [< name,t,pn = parse_var_decl_head; v_decl = parse_var_assignment_resume [] name pn t >] -> v_decl
-
-and inline_function = parser
-	| [< '(Kwd Inline,_); '(Kwd Function,p1) >] -> true, p1
-	| [< '(Kwd Function,p1) >] -> false, p1
-
-and reify_expr e =
-	let to_expr,_,_ = reify !in_macro in
-	let e = to_expr e in
-	(ECheckType (e,(CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = None; tparams = [] },null_pos)),pos e)
-
-and parse_macro_expr p = parser
-	| [< '(DblDot,_); t = parse_complex_type >] ->
-		let _, to_type, _  = reify !in_macro in
-		let t = to_type t p in
-		(ECheckType (t,(CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = Some "ComplexType"; tparams = [] },null_pos)),p)
-	| [< '(Kwd Var,p1); vl = psep Comma parse_var_decl >] ->
-		reify_expr (EVars vl,p1)
-	| [< d = parse_class None [] [] false >] ->
-		let _,_,to_type = reify !in_macro in
-		(ECheckType (to_type d,(CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = Some "TypeDefinition"; tparams = [] },null_pos)),p)
-	| [< e = secure_expr >] ->
-		reify_expr e
-
-and parse_function p1 inl = parser
-	| [< name = popt dollar_ident; pl = parse_constraint_params; '(POpen,_); al = psep Comma parse_fun_param; '(PClose,_); t = popt parse_type_hint_with_pos; s >] ->
-		let make e =
-			let f = {
-				f_params = pl;
-				f_type = t;
-				f_args = al;
-				f_expr = Some e;
-			} in
-			EFunction ((match name with None -> None | Some (name,_) -> Some (if inl then "inline_" ^ name else name)),f), punion p1 (pos e)
-		in
-		(try
-			expr_next (make (secure_expr s)) s
-		with
-			Display e -> display (make e))
-
-and expr = parser
-	| [< (name,params,p) = parse_meta_entry; s >] ->
-		begin try
-			make_meta name params (secure_expr s) p
-		with
-		| Display e ->
-			display (make_meta name params e p)
-		| Stream.Failure | Stream.Error _ when Path.unique_full_path p.pfile = (!resume_display).pfile ->
-			let e = EConst (Ident "null"),p in
-			display (make_meta name params e p)
-		end
-	| [< '(BrOpen,p1); s >] ->
-		if is_resuming p1 then display (EDisplay ((EObjectDecl [],p1),false),p1);
-		(match s with parser
-		| [< '(Binop OpOr,p2) when do_resume() >] ->
-			set_resume p1;
-			display (EDisplay ((EObjectDecl [],p1),false),p1);
-		| [< b = block1; s >] ->
-			let p2 = match s with parser
-				| [< '(BrClose,p2) >] -> p2
-				| [< >] ->
-					(* Ignore missing } if we are resuming and "guess" the last position. *)
-					if do_resume() then pos (next_token s) else serror()
+		let p = display_position#get in
+		(* print_endline (Printf.sprintf "(%i <= %i) (%i >= %i)" pmax p.pmin pmin p.pmax); *)
+		if pmax <= p.pmin && pmin >= p.pmax then begin
+			let so,p = match Stream.peek s with
+			| Some((Const(Ident name),p)) when display_position#enclosed_in p -> (Some name),p
+			| Some(e,p) -> print_endline (s_token e); None,p
+			| _ -> None,p
 			in
-			let e = (b,punion p1 p2) in
-			(match b with
-			| EObjectDecl _ -> expr_next e s
-			| _ -> e))
-	| [< '(Kwd Macro,p); s >] ->
-		parse_macro_expr p s
-	| [< '(Kwd Var,p1); v = parse_var_decl >] -> (EVars [v],p1)
-	| [< '(Const c,p); s >] -> expr_next (EConst c,p) s
-	| [< '(Kwd This,p); s >] -> expr_next (EConst (Ident "this"),p) s
-	| [< '(Kwd True,p); s >] -> expr_next (EConst (Ident "true"),p) s
-	| [< '(Kwd False,p); s >] -> expr_next (EConst (Ident "false"),p) s
-	| [< '(Kwd Null,p); s >] -> expr_next (EConst (Ident "null"),p) s
-	| [< '(Kwd Cast,p1); s >] ->
-		(match s with parser
-		| [< '(POpen,pp); e = expr; s >] ->
-			(match s with parser
-			| [< '(Comma,pc); t = parse_complex_type; '(PClose,p2); s >] -> expr_next (ECast (e,Some t),punion p1 p2) s
-			| [< t,pt = parse_type_hint_with_pos; '(PClose,p2); s >] ->
-				let ep = EParenthesis (ECheckType(e,(t,pt)),punion p1 p2), punion p1 p2 in
-				expr_next (ECast (ep,None),punion p1 (pos ep)) s
-			| [< '(Const (Ident "is"),p_is); t = parse_type_path; '(PClose,p2); >] ->
-				let e_is = make_is e t (punion p1 p2) p_is in
-				expr_next (ECast (e_is,None),punion p1 (pos e_is)) s
-			| [< '(PClose,p2); s >] ->
-				let ep = expr_next (EParenthesis(e),punion pp p2) s in
-				expr_next (ECast (ep,None),punion p1 (pos ep)) s
-			| [< >] -> serror())
-		| [< e = secure_expr >] -> expr_next (ECast (e,None),punion p1 (pos e)) s)
-	| [< '(Kwd Throw,p); e = expr >] -> (EThrow e,p)
-	| [< '(Kwd New,p1); t = parse_type_path; s >] ->
-		begin match s with parser
-		| [< '(POpen,po); e = parse_call_params (fun el p2 -> (ENew(t,el)),punion p1 p2) po >] -> expr_next e s
-		| [< >] ->
-			if do_resume() then (ENew(t,[]),punion p1 (pos t))
-			else serror()
+			delay_syntax_completion (SCTypeDecl mode) so p
 		end
-	| [< '(POpen,p1); e = expr; s >] -> (match s with parser
-		| [< '(PClose,p2); s >] -> expr_next (EParenthesis e, punion p1 p2) s
-		| [< t,pt = parse_type_hint_with_pos; '(PClose,p2); s >] -> expr_next (EParenthesis (ECheckType(e,(t,pt)),punion p1 p2), punion p1 p2) s
-		| [< '(Const (Ident "is"),p_is); t = parse_type_path; '(PClose,p2); >] -> expr_next (make_is e t (punion p1 p2) p_is) s
-		| [< >] -> serror())
-	| [< '(BkOpen,p1); l = parse_array_decl; '(BkClose,p2); s >] -> expr_next (EArrayDecl l, punion p1 p2) s
-	| [< '(Kwd Function,p1); e = parse_function p1 false; >] -> e
-	| [< '(Unop op,p1) when is_prefix op; e = expr >] -> make_unop op e p1
-	| [< '(Binop OpSub,p1); e = expr >] ->
-		make_unop Neg e p1
-	(*/* removed unary + : this cause too much syntax errors go unnoticed, such as "a + + 1" (missing 'b')
-						without adding anything to the language
-	| [< '(Binop OpAdd,p1); s >] ->
-		(match s with parser
-		| [< '(Const (Int i),p); e = expr_next (EConst (Int i),p) >] -> e
-		| [< '(Const (Float f),p); e = expr_next (EConst (Float f),p) >] -> e
-		| [< >] -> serror()) */*)
-	| [< '(Kwd For,p); '(POpen,_); it = expr; '(PClose,_); s >] ->
-		(try
-			let e = secure_expr s in
-			(EFor (it,e),punion p (pos e))
-		with
-			Display e -> display (EFor (it,e),punion p (pos e)))
-	| [< '(Kwd If,p); '(POpen,_); cond = expr; '(PClose,_); e1 = expr; s >] ->
-		let e2 = (match s with parser
-			| [< '(Kwd Else,_); e2 = expr; s >] -> Some e2
-			| [< >] ->
-				match Stream.npeek 2 s with
-				| [(Semicolon,_); (Kwd Else,_)] ->
-					Stream.junk s;
-					Stream.junk s;
-					Some (secure_expr s)
-				| _ ->
-					None
-		) in
-		(EIf (cond,e1,e2), punion p (match e2 with None -> pos e1 | Some e -> pos e))
-	| [< '(Kwd Return,p); e = popt expr >] -> (EReturn e, match e with None -> p | Some e -> punion p (pos e))
-	| [< '(Kwd Break,p) >] -> (EBreak,p)
-	| [< '(Kwd Continue,p) >] -> (EContinue,p)
-	| [< '(Kwd While,p1); '(POpen,_); cond = expr; '(PClose,_); s >] ->
-		(try
-			let e = secure_expr s in
-			(EWhile (cond,e,NormalWhile),punion p1 (pos e))
-		with
-			Display e -> display (EWhile (cond,e,NormalWhile),punion p1 (pos e)))
-	| [< '(Kwd Do,p1); e = expr; '(Kwd While,_); '(POpen,_); cond = expr; '(PClose,_); s >] -> (EWhile (cond,e,DoWhile),punion p1 (pos e))
-	| [< '(Kwd Switch,p1); e = expr; '(BrOpen,_); cases , def = parse_switch_cases e []; '(BrClose,p2); s >] -> (ESwitch (e,cases,def),punion p1 p2)
-	| [< '(Kwd Try,p1); e = expr; cl,p2 = parse_catches e [] (pos e) >] -> (ETry (e,cl),punion p1 p2)
-	| [< '(IntInterval i,p1); e2 = expr >] -> make_binop OpInterval (EConst (Int i),p1) e2
-	| [< '(Kwd Untyped,p1); e = expr >] -> (EUntyped e,punion p1 (pos e))
-	| [< '(Dollar v,p); s >] -> expr_next (EConst (Ident ("$"^v)),p) s
-
-and expr_next e1 = parser
-	| [< '(BrOpen,p1) when is_dollar_ident e1; eparam = expr; '(BrClose,p2); s >] ->
-		(match fst e1 with
-		| EConst(Ident n) -> expr_next (EMeta((Meta.from_string n,[],snd e1),eparam), punion p1 p2) s
-		| _ -> assert false)
-	| [< '(Dot,p); s >] ->
-		if is_resuming p then display (EDisplay (e1,false),p);
-		(match s with parser
-		| [< '(Kwd Macro,p2) when p.pmax = p2.pmin; s >] -> expr_next (EField (e1,"macro") , punion (pos e1) p2) s
-		| [< '(Kwd Extern,p2) when p.pmax = p2.pmin; s >] -> expr_next (EField (e1,"extern") , punion (pos e1) p2) s
-		| [< '(Kwd New,p2) when p.pmax = p2.pmin; s >] -> expr_next (EField (e1,"new") , punion (pos e1) p2) s
-		| [< '(Const (Ident f),p2) when p.pmax = p2.pmin; s >] -> expr_next (EField (e1,f) , punion (pos e1) p2) s
-		| [< '(Dollar v,p2); s >] -> expr_next (EField (e1,"$"^v) , punion (pos e1) p2) s
-		| [< '(Binop OpOr,p2) when do_resume() >] ->
-			set_resume p;
-			display (EDisplay (e1,false),p) (* help for debug display mode *)
-		| [< >] ->
-			(* turn an integer followed by a dot into a float *)
-			match e1 with
-			| (EConst (Int v),p2) when p2.pmax = p.pmin -> expr_next (EConst (Float (v ^ ".")),punion p p2) s
-			| _ -> serror())
-	| [< '(POpen,p1); e = parse_call_params (fun el p2 -> (ECall(e1,el)),punion (pos e1) p2) p1; s >] -> expr_next e s
-	| [< '(BkOpen,_); e2 = expr; '(BkClose,p2); s >] ->
-		expr_next (EArray (e1,e2), punion (pos e1) p2) s
-	| [< '(Binop OpGt,p1); s >] ->
-		(match s with parser
-		| [< '(Binop OpGt,p2) when p1.pmax = p2.pmin; s >] ->
-			(match s with parser
-			| [< '(Binop OpGt,p3) when p2.pmax = p3.pmin >] ->
-				(match s with parser
-				| [< '(Binop OpAssign,p4) when p3.pmax = p4.pmin; e2 = expr >] -> make_binop (OpAssignOp OpUShr) e1 e2
-				| [< e2 = secure_expr >] -> make_binop OpUShr e1 e2)
-			| [< '(Binop OpAssign,p3) when p2.pmax = p3.pmin; e2 = expr >] -> make_binop (OpAssignOp OpShr) e1 e2
-			| [< e2 = secure_expr >] -> make_binop OpShr e1 e2)
-		| [< '(Binop OpAssign,p2) when p1.pmax = p2.pmin; s >] ->
-			make_binop OpGte e1 (secure_expr s)
-		| [< e2 = secure_expr >] ->
-			make_binop OpGt e1 e2)
-	| [< '(Binop op,_); s >] ->
-		(try
-			(match s with parser
-			| [< e2 = expr >] -> make_binop op e1 e2
-			| [< >] -> serror())
-		with Display e2 ->
-			raise (Display (make_binop op e1 e2)))
-	| [< '(Unop op,p) when is_postfix e1 op; s >] ->
-		expr_next (EUnop (op,Postfix,e1), punion (pos e1) p) s
-	| [< '(Question,_); e2 = expr; '(DblDot,_); e3 = expr >] ->
-		(ETernary (e1,e2,e3),punion (pos e1) (pos e3))
-	| [< '(Kwd In,_); e2 = expr >] ->
-		(EIn (e1,e2), punion (pos e1) (pos e2))
-	| [< >] -> e1
-
-and parse_guard = parser
-	| [< '(Kwd If,p1); '(POpen,_); e = expr; '(PClose,_); >] ->
-		e
-
-and parse_switch_cases eswitch cases = parser
-	| [< '(Kwd Default,p1); '(DblDot,_); s >] ->
-		let b,p2 = (try block_with_pos [] p1 s with Display e -> display (ESwitch (eswitch,cases,Some (Some e,punion p1 (pos e))),punion (pos eswitch) (pos e))) in
-		let b = match b with
-			| [] -> None,p1
-			| _ -> let p = punion p1 p2 in Some ((EBlock b,p)),p
-		in
-		let l , def = parse_switch_cases eswitch cases s in
-		(match def with None -> () | Some _ -> error Duplicate_default p1);
-		l , Some b
-	| [< '(Kwd Case,p1); el = psep Comma expr; eg = popt parse_guard; '(DblDot,_); s >] ->
-		(match el with
-		| [] -> error (Custom "case without a pattern is not allowed") p1
-		| _ ->
-			let b,p2 = (try block_with_pos [] p1 s with Display e -> display (ESwitch (eswitch,List.rev ((el,eg,Some e,punion p1 (pos e)) :: cases),None),punion (pos eswitch) (pos e))) in
-			let b,p = match b with
-				| [] ->
-					let p2 = match eg with Some e -> pos e | None -> match List.rev el with (_,p) :: _ -> p | [] -> p1 in
-					None,punion p1 p2
-				| _ -> let p = punion p1 p2 in Some ((EBlock b,p)),p
-			in
-			parse_switch_cases eswitch ((el,eg,b,p) :: cases) s
-		)
-	| [< >] ->
-		List.rev cases , None
-
-and parse_catch etry = parser
-	| [< '(Kwd Catch,p); '(POpen,_); name, pn = dollar_ident; s >] ->
-		match s with parser
-		| [< t,pt = parse_type_hint_with_pos; '(PClose,_); s >] ->
-			(try
-				let e = secure_expr s in
-				((name,pn),(t,pt),e,punion p (pos e)),(pos e)
-			with
-				Display e -> display (ETry (etry,[(name,pn),(t,pt),e,(pos e)]),punion (pos etry) (pos e)))
-		| [< '(_,p) >] -> error Missing_type p
-
-and parse_catches etry catches pmax = parser
-	| [< (catch,pmax) = parse_catch etry; s >] -> parse_catches etry (catch :: catches) pmax s
-	| [< >] -> List.rev catches,pmax
-
-and parse_call_params f p1 s =
-	let make_display_call el p2 =
-		let e = f el p2 in
-		display (EDisplay(e,true),pos e)
-	in
-	if is_resuming p1 then make_display_call [] p1;
-	let rec parse_next_param acc p1 =
-		let e = try
-			expr s
-		with
-		| Stream.Error _ | Stream.Failure as exc ->
-			let p2 = pos (next_token s) in
-			if encloses_resume (punion p1 p2) then make_display_call (List.rev acc) p2
-			else raise exc
-		| Display e ->
-			display (f (List.rev (e :: acc)) (pos e))
-		in
-		match s with parser
-		| [< '(PClose,p2) >] -> f (List.rev (e :: acc)) p2
-		| [< '(Comma,p2) >] -> parse_next_param (e :: acc) p2
-		| [< '(Semicolon,p2) >] -> if encloses_resume (punion p1 p2) then make_display_call (List.rev acc) p2 else serror()
-		| [< >] ->
-			let p2 = pos (next_token s) in
-			if encloses_resume (punion p1 p2) then make_display_call (List.rev (e :: acc)) p2 else serror()
-	in
-	match s with parser
-	| [< '(PClose,p2) >] -> f [] p2
-	| [< '(Binop OpOr,p2) when do_resume() >] ->
-		set_resume p1;
-		make_display_call [] p2
-	| [< >] -> parse_next_param [] p1
-
-and parse_macro_cond allow_op s =
-	match s with parser
-	| [< '(Const (Ident t),p) >] ->
-		parse_macro_ident allow_op t p s
-	| [< '(Const (String s),p) >] ->
-		None, (EConst (String s),p)
-	| [< '(Const (Int i),p) >] ->
-		None, (EConst (Int i),p)
-	| [< '(Const (Float f),p) >] ->
-		None, (EConst (Float f),p)
-	| [< '(Kwd k,p) >] ->
-		parse_macro_ident allow_op (s_keyword k) p s
-	| [< '(POpen, p1); _,e = parse_macro_cond true; '(PClose, p2) >] ->
-		let e = (EParenthesis e,punion p1 p2) in
-		if allow_op then parse_macro_op e s else None, e
-	| [< '(Unop op,p); tk, e = parse_macro_cond allow_op >] ->
-		tk, make_unop op e p
-
-and parse_macro_ident allow_op t p s =
-	if t = "display" then Hashtbl.replace special_identifier_files (Path.unique_full_path p.pfile) t;
-	let e = (EConst (Ident t),p) in
-	if not allow_op then
-		None, e
-	else
-		parse_macro_op e s
-
-and parse_macro_op e s =
-	match Stream.peek s with
-	| Some (Binop op,_) ->
-		Stream.junk s;
-		let op = match Stream.peek s with
-			| Some (Binop OpAssign,_) when op = OpGt ->
-				Stream.junk s;
-				OpGte
-			| _ -> op
-		in
-		let tk, e2 = (try parse_macro_cond true s with Stream.Failure -> serror()) in
-		tk, make_binop op e e2
-	| tk ->
-		tk, e
-
-and toplevel_expr s =
-	try
-		expr s
-	with
-		Display e -> e
-
-and secure_expr s =
-	match s with parser
-	| [< e = expr >] -> e
-	| [< >] -> serror()
-
-(* eval *)
-type small_type =
-	| TNull
-	| TBool of bool
-	| TFloat of float
-	| TString of string
-
-let is_true = function
-	| TBool false | TNull | TFloat 0. | TString "" -> false
-	| _ -> true
-
-let cmp v1 v2 =
-	match v1, v2 with
-	| TNull, TNull -> 0
-	| TFloat a, TFloat b -> compare a b
-	| TString a, TString b -> compare a b
-	| TBool a, TBool b -> compare a b
-	| TString a, TFloat b -> compare (float_of_string a) b
-	| TFloat a, TString b -> compare a (float_of_string b)
-	| _ -> raise Exit (* always false *)
-
-let rec eval ctx (e,p) =
-	match e with
-	| EConst (Ident i) ->
-		(try TString (Common.raw_defined_value ctx i) with Not_found -> TNull)
-	| EConst (String s) -> TString s
-	| EConst (Int i) -> TFloat (float_of_string i)
-	| EConst (Float f) -> TFloat (float_of_string f)
-	| EBinop (OpBoolAnd, e1, e2) -> TBool (is_true (eval ctx e1) && is_true (eval ctx e2))
-	| EBinop (OpBoolOr, e1, e2) -> TBool (is_true (eval ctx e1) || is_true(eval ctx e2))
-	| EUnop (Not, _, e) -> TBool (not (is_true (eval ctx e)))
-	| EParenthesis e -> eval ctx e
-	| EBinop (op, e1, e2) ->
-		let v1 = eval ctx e1 in
-		let v2 = eval ctx e2 in
-		let compare op =
-			TBool (try op (cmp v1 v2) 0 with _ -> false)
-		in
-		(match op with
-		| OpEq -> compare (=)
-		| OpNotEq -> compare (<>)
-		| OpGt -> compare (>)
-		| OpGte -> compare (>=)
-		| OpLt -> compare (<)
-		| OpLte -> compare (<=)
-		| _ -> error (Custom "Unsupported operation") p)
-	| _ ->
-		error (Custom "Invalid condition expression") p
-
-(* parse main *)
-let parse ctx code =
-	let old = Lexer.save() in
-	let old_cache = !cache in
-	let mstack = ref [] in
-	cache := DynArray.create();
-	last_doc := None;
-	in_macro := Common.defined ctx Common.Define.Macro;
-	Lexer.skip_header code;
-
-	let sraw = Stream.from (fun _ -> Some (Lexer.token code)) in
-	let rec next_token() = process_token (Lexer.token code)
-
-	and process_token tk =
-		match fst tk with
-		| Comment s ->
-			let tk = next_token() in
-			if !use_doc then begin
-				let l = String.length s in
-				if l > 0 && s.[0] = '*' then last_doc := Some (String.sub s 1 (l - (if l > 1 && s.[l-1] = '*' then 2 else 1)), (snd tk).pmin);
-			end;
-			tk
-		| CommentLine s ->
-			next_token()
-		| Sharp "end" ->
-			(match !mstack with
-			| [] -> tk
-			| _ :: l ->
-				mstack := l;
-				next_token())
-		| Sharp "else" | Sharp "elseif" ->
-			(match !mstack with
-			| [] -> tk
-			| _ :: l ->
-				mstack := l;
-				process_token (skip_tokens (snd tk) false))
-		| Sharp "if" ->
-			process_token (enter_macro (snd tk))
-		| Sharp "error" ->
-			(match Lexer.token code with
-			| (Const (String s),p) -> error (Custom s) p
-			| _ -> error Unimplemented (snd tk))
-		| Sharp "line" ->
-			let line = (match next_token() with
-				| (Const (Int s),p) -> (try int_of_string s with _ -> error (Custom ("Could not parse ridiculous line number " ^ s)) p)
-				| (t,p) -> error (Unexpected t) p
-			) in
-			!(Lexer.cur).Lexer.lline <- line - 1;
-			next_token();
-		| _ ->
-			tk
-
-	and enter_macro p =
-		let tk, e = parse_macro_cond false sraw in
-		let tk = (match tk with None -> Lexer.token code | Some tk -> tk) in
-		if is_true (eval ctx e) || (match fst e with EConst (Ident "macro") when Path.unique_full_path p.pfile = (!resume_display).pfile -> true | _ -> false) then begin
-			mstack := p :: !mstack;
-			tk
-		end else
-			skip_tokens_loop p true tk
-
-	and skip_tokens_loop p test tk =
-		match fst tk with
-		| Sharp "end" ->
-			Lexer.token code
-		| Sharp "elseif" | Sharp "else" when not test ->
-			skip_tokens p test
-		| Sharp "else" ->
-			mstack := snd tk :: !mstack;
-			Lexer.token code
-		| Sharp "elseif" ->
-			enter_macro (snd tk)
-		| Sharp "if" ->
-			skip_tokens_loop p test (skip_tokens p false)
-		| Eof ->
-			if do_resume() then tk else error Unclosed_macro p
-		| _ ->
-			skip_tokens p test
-
-	and skip_tokens p test = skip_tokens_loop p test (Lexer.token code)
-
-	in
-	let s = Stream.from (fun _ ->
-		let t = next_token() in
-		DynArray.add (!cache) t;
-		Some t
-	) in
-	try
-		let l = parse_file s in
-		(match !mstack with p :: _ when not (do_resume()) -> error Unclosed_macro p | _ -> ());
-		cache := old_cache;
-		Lexer.restore old;
-		l
-	with
-		| Stream.Error _
-		| Stream.Failure ->
-			let last = (match Stream.peek s with None -> last_token s | Some t -> t) in
-			Lexer.restore old;
-			cache := old_cache;
-			error (Unexpected (fst last)) (pos last)
-		| e ->
-			Lexer.restore old;
-			cache := old_cache;
-			raise e
-
-let parse_string com s p error inlined =
-	let old = Lexer.save() in
-	let old_file = (try Some (Hashtbl.find Lexer.all_files p.pfile) with Not_found -> None) in
-	let old_display = !resume_display in
-	let old_de = !display_error in
-	let restore() =
-		(match old_file with
-		| None -> ()
-		| Some f -> Hashtbl.replace Lexer.all_files p.pfile f);
-		if not inlined then resume_display := old_display;
-		Lexer.restore old;
-		display_error := old_de
-	in
-	Lexer.init p.pfile true;
-	display_error := (fun e p -> raise (Error (e,p)));
-	if not inlined then resume_display := null_pos;
-	let pack, decls = try
-		parse com (Lexing.from_string s)
-	with Error (e,pe) ->
-		restore();
-		error (error_msg e) (if inlined then pe else p)
-	| Lexer.Error (e,pe) ->
-		restore();
-		error (Lexer.error_msg e) (if inlined then pe else p)
-	in
-	restore();
-	pack,decls
-
-let parse_expr_string com s p error inl =
-	let head = "class X{static function main() " in
-	let head = (if p.pmin > String.length head then head ^ String.make (p.pmin - String.length head) ' ' else head) in
-	let rec loop e = let e = Ast.map_expr loop e in (fst e,p) in
-	match parse_string com (head ^ s ^ ";}") p error inl with
-	| _,[EClass { d_data = [{ cff_name = "main",null_pos; cff_kind = FFun { f_expr = Some e } }]},_] -> if inl then e else loop e
-	| _ -> raise Exit
+	end
+
+let check_signature_mark e p1 p2 =
+	if not (is_signature_display()) then e
+	else begin
+		let p = punion p1 p2 in
+		if true || not !was_auto_triggered then begin (* TODO: #6383 *)
+			if encloses_position_gt display_position#get p then (mk_display_expr e DKMarked)
+			else e
+		end else begin
+			if (display_position#get).pmin = p1.pmax then (mk_display_expr e DKMarked)
+			else e
+		end
+	end
\ No newline at end of file
diff --git a/src/syntax/parserEntry.ml b/src/syntax/parserEntry.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b1bf0bd86af3f89f5110e86f0252cc3552ab30e8
--- /dev/null
+++ b/src/syntax/parserEntry.ml
@@ -0,0 +1,452 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+open Globals
+open Ast
+open Parser
+open Semver
+open Grammar
+open DisplayPosition
+
+(* eval *)
+type small_type =
+	| TNull
+	| TBool of bool
+	| TFloat of float
+	| TString of string
+	| TVersion of (version * version * version) * (version list option)
+
+let is_true = function
+	| TBool false | TNull | TFloat 0. | TString "" -> false
+	| _ -> true
+
+let s_small_type v =
+	match v with
+	| TNull -> "null"
+	| TBool _ -> "boolean"
+	| TFloat _ -> "float"
+	| TString _ -> "string"
+	| TVersion _ -> "version"
+
+let s_value v =
+	match v with
+	| TNull -> "null"
+	| TBool b -> "boolean " ^ (string_of_bool b)
+	| TFloat f -> "float " ^ (string_of_float f)
+	| TString s -> "string \"" ^ s ^ "\""
+	| TVersion (r,p) -> "version " ^ (Semver.to_string (r,p))
+
+let parse_version s p =
+	try match parse_version s with release,pre -> TVersion (release,pre)
+	with Invalid_argument msg -> error (Custom msg) p
+
+let cmp v1 v2 =
+	match v1, v2 with
+	| TNull, _ | _, TNull -> raise Exit
+	| TFloat a, TFloat b -> compare a b
+	| TString a, TString b -> compare a b
+	| TBool a, TBool b -> compare a b
+	| TVersion (release1,pre1), TVersion (release2,pre2) -> compare_version (release1,pre1) (release2,pre2)
+	| TString _, TFloat _ | TFloat _, TString _
+	| _, TVersion _ | TVersion _, _ ->
+		raise (Invalid_argument ("Cannot compare " ^ (s_value v1) ^ " and " ^ (s_value v2)))
+	| _ -> raise Exit (* always false *)
+
+let rec eval ctx (e,p) =
+	match e with
+	| EConst (Ident i) ->
+		(try TString (Define.raw_defined_value ctx i) with Not_found -> TNull)
+	| EConst (String(s,_)) -> TString s
+	| EConst (Int i) -> TFloat (float_of_string i)
+	| EConst (Float f) -> TFloat (float_of_string f)
+	| ECall ((EConst (Ident "version"),_),[(EConst (String(s,_)), p)]) -> parse_version s p
+	| EBinop (OpBoolAnd, e1, e2) -> TBool (is_true (eval ctx e1) && is_true (eval ctx e2))
+	| EBinop (OpBoolOr, e1, e2) -> TBool (is_true (eval ctx e1) || is_true(eval ctx e2))
+	| EUnop (Not, _, e) -> TBool (not (is_true (eval ctx e)))
+	| EParenthesis e -> eval ctx e
+	| EBinop (op, e1, e2) ->
+		let v1, v2 = eval_binop_exprs ctx e1 e2 in
+		let compare op =
+			try TBool (try op (cmp v1 v2) 0 with Exit -> false)
+			with Invalid_argument msg -> error (Custom msg) p
+		in
+		(match op with
+		| OpEq -> compare (=)
+		| OpNotEq -> compare (<>)
+		| OpGt -> compare (>)
+		| OpGte -> compare (>=)
+		| OpLt -> compare (<)
+		| OpLte -> compare (<=)
+		| _ -> error (Custom "Unsupported operation") p)
+	| EField _ ->
+		begin try
+			let sl = string_list_of_expr_path_raise (e,p) in
+			let i = String.concat "." (List.rev sl) in
+			(try TString (Define.raw_defined_value ctx i) with Not_found -> TNull)
+		with Exit ->
+			error (Custom "Invalid condition expression") p
+		end
+	| _ ->
+		error (Custom "Invalid condition expression") p
+
+(**
+	Attempt to auto-cast operands to a common type
+*)
+and eval_binop_exprs ctx e1 e2 =
+	match eval ctx e1, eval ctx e2 with
+	| (TString s1 as v1), (TFloat _ as v2) ->
+		(try TFloat (float_of_string s1), v2
+		with Failure _ -> v1, v2)
+	| (TFloat _ as v1), (TString s2 as v2) ->
+		(try v1, TFloat (float_of_string s2)
+		with Failure _ -> v1, v2)
+	| (TVersion _ as v1), TString s -> (v1, parse_version s (snd e2))
+	| TString s, (TVersion _ as v2) -> (parse_version s (snd e1), v2)
+	| v1, v2 -> (v1, v2)
+
+class condition_handler_nop = object(self)
+	val null = EConst(Ident "null"),null_pos
+
+	method cond_if (e : expr) =
+		()
+
+	method cond_else =
+		()
+
+	method cond_elseif (e : expr) =
+		()
+
+	method cond_end =
+		()
+
+	method get_current_condition : expr =
+		null
+
+	method get_conditions : expr list =
+		[]
+end
+
+class condition_Handler = object(self)
+	inherit condition_handler_nop
+	val mutable conditional_expressions = []
+	val mutable conditional_stack = []
+	val mutable depths = []
+
+	method private maybe_parent allow_and e = match fst e with
+		| EBinop(op,_,_) ->
+			if op = OpBoolAnd && allow_and then e
+			else (EParenthesis e,pos e)
+		| _ -> e
+
+	method private negate (e : expr) = match fst e with
+		| EUnop(Not,_,e1) -> e1
+		| EBinop(OpBoolAnd,e1,e2) -> (EBinop(OpBoolOr,self#negate e1,self#negate e2),(pos e))
+		| EBinop(OpBoolOr,e1,e2) -> (EBinop(OpBoolAnd,self#negate e1,self#negate e2),(pos e))
+		| _ -> (EUnop(Not,Prefix,e),(pos e))
+
+	method private conjoin (lhs : expr) (rhs : expr) =
+		let lhs = self#maybe_parent true lhs in
+		let rhs = self#maybe_parent true rhs in
+		(EBinop(OpBoolAnd,lhs,rhs),punion (pos lhs) (pos rhs))
+
+	method private cond_if' (e : expr) =
+		conditional_expressions <- e :: conditional_expressions;
+		conditional_stack <- e :: conditional_stack
+
+	method cond_if (e : expr) =
+		self#cond_if' e;
+		depths <- 1 :: depths
+
+	method cond_else = match conditional_stack with
+		| e :: el ->
+			conditional_stack <- (self#negate e) :: el
+		| [] ->
+			assert false
+
+	method cond_elseif (e : expr) =
+		self#cond_else;
+		self#cond_if' e;
+		match depths with
+		| [] -> assert false
+		| depth :: depths' ->
+			depths <- (depth + 1) :: depths'
+
+	method cond_end =
+		let rec loop d el =
+			if d = 0 then el
+			else loop (d - 1) (List.tl el)
+		in
+		match depths with
+			| [] -> assert false
+			| depth :: depths' ->
+				conditional_stack <- loop depth conditional_stack;
+				depths <- depths'
+
+	method get_current_condition = match conditional_stack with
+		| e :: el ->
+			List.fold_left self#conjoin e el
+		| [] ->
+			(EConst (Ident "true"),null_pos)
+
+	method get_conditions =
+		conditional_expressions
+end
+
+class dead_block_collector conds = object(self)
+	val dead_blocks = DynArray.create ()
+	val mutable current_block = []
+
+	method open_dead_block (p : pos) =
+		current_block <- ({p with pmin = p.pmax},conds#get_current_condition) :: current_block
+
+	method close_dead_block (p : pos) = match current_block with
+		| [] ->
+			error (Custom "Internal error: Trying to close dead block that's not open") p;
+		| (p0,cond) :: pl ->
+			current_block <- pl;
+			DynArray.add dead_blocks ({p0 with pmax = p.pmin},cond)
+
+	method get_dead_blocks : (pos * expr) list =
+		assert(current_block = []);
+		DynArray.to_list dead_blocks
+end
+
+let nop_handler = new condition_handler_nop
+
+(* parse main *)
+let parse ctx code file =
+	let old = Lexer.save() in
+	let restore_cache = TokenCache.clear () in
+	let was_display = !in_display in
+	let was_display_file = !in_display_file in
+	let old_code = !code_ref in
+	let old_macro = !in_macro in
+	code_ref := code;
+	in_display := display_position#get <> null_pos;
+	in_display_file := !in_display && Path.unique_full_path file = (display_position#get).pfile;
+	syntax_errors := [];
+	let restore =
+		(fun () ->
+			restore_cache ();
+			in_display := was_display;
+			in_macro := old_macro;
+			in_display_file := was_display_file;
+			code_ref := old_code;
+		)
+	in
+	let mstack = ref [] in
+	last_doc := None;
+	in_macro := Define.defined ctx Define.Macro;
+	Lexer.skip_header code;
+
+	let sharp_error s p =
+		let line = StringError.string_error ("#" ^ s) ["#if";"#elseif";"#else";"#end";"#error";"#line"] "Unknown token" in
+		error (Custom line) p
+	in
+
+	let conds = if !in_display_file then new condition_Handler else nop_handler in
+	let dbc = new dead_block_collector conds in
+	let sraw = Stream.from (fun _ -> Some (Lexer.sharp_token code)) in
+	let rec next_token() = process_token (Lexer.token code)
+
+	and process_token tk =
+		match fst tk with
+		| Comment s ->
+			(* if encloses_resume (pos tk) then syntax_completion SCComment (pos tk); *)
+			let tk = next_token() in
+			let l = String.length s in
+			if l > 0 && s.[0] = '*' then last_doc := Some (String.sub s 1 (l - (if l > 1 && s.[l-1] = '*' then 2 else 1)), (snd tk).pmin);
+			tk
+		| CommentLine s ->
+			if !in_display_file && display_position#enclosed_in (pos tk) then syntax_completion SCComment None (pos tk);
+			next_token()
+		| Sharp "end" ->
+			(match !mstack with
+			| [] -> tk
+			| _ :: l ->
+				conds#cond_end;
+				mstack := l;
+				next_token())
+		| Sharp "elseif" ->
+			(match !mstack with
+			| [] -> tk
+			| _ :: l ->
+				let _,(e,pe) = parse_macro_cond sraw in
+				conds#cond_elseif (e,pe);
+				dbc#open_dead_block pe;
+				mstack := l;
+				let tk = skip_tokens (pos tk) false in
+				process_token tk)
+		| Sharp "else" ->
+			(match !mstack with
+			| [] -> tk
+			| _ :: l ->
+				conds#cond_else;
+				dbc#open_dead_block (pos tk);
+				mstack := l;
+				let tk = skip_tokens (pos tk) false in
+				process_token tk)
+		| Sharp "if" ->
+			process_token (enter_macro true (snd tk))
+		| Sharp "error" ->
+			(match Lexer.token code with
+			| (Const (String(s,_)),p) -> error (Custom s) p
+			| _ -> error Unimplemented (snd tk))
+		| Sharp "line" ->
+			let line = (match next_token() with
+				| (Const (Int s),p) -> (try int_of_string s with _ -> error (Custom ("Could not parse ridiculous line number " ^ s)) p)
+				| (t,p) -> error (Unexpected t) p
+			) in
+			!(Lexer.cur).Lexer.lline <- line - 1;
+			next_token();
+		| Sharp s ->
+			sharp_error s (pos tk)
+		| _ ->
+			tk
+
+	and enter_macro is_if p =
+		let tk, e = parse_macro_cond sraw in
+		(if is_if then conds#cond_if else conds#cond_elseif) e;
+		let tk = (match tk with None -> Lexer.token code | Some tk -> tk) in
+		if is_true (eval ctx e) then begin
+			mstack := p :: !mstack;
+			tk
+		end else begin
+			dbc#open_dead_block (pos e);
+			skip_tokens_loop p true tk
+		end
+
+	and skip_tokens_loop p test tk =
+		match fst tk with
+		| Sharp "end" ->
+			conds#cond_end;
+			dbc#close_dead_block (pos tk);
+			Lexer.token code
+		| Sharp "elseif" when not test ->
+			dbc#close_dead_block (pos tk);
+			let _,(e,pe) = parse_macro_cond sraw in
+			conds#cond_elseif (e,pe);
+			dbc#open_dead_block pe;
+			skip_tokens p test
+		| Sharp "else" when not test ->
+			conds#cond_else;
+			dbc#close_dead_block (pos tk);
+			dbc#open_dead_block (pos tk);
+			skip_tokens p test
+		| Sharp "else" ->
+			conds#cond_else;
+			dbc#close_dead_block (pos tk);
+			mstack := snd tk :: !mstack;
+			Lexer.token code
+		| Sharp "elseif" ->
+			dbc#close_dead_block (pos tk);
+			enter_macro false (snd tk)
+		| Sharp "if" ->
+			let _,e = parse_macro_cond sraw in
+			conds#cond_if e;
+			dbc#open_dead_block (pos e);
+			let tk = skip_tokens p false in
+			skip_tokens_loop p test tk
+		| Sharp ("error" | "line") ->
+			skip_tokens p test
+		| Sharp s ->
+			sharp_error s (pos tk)
+		| Eof ->
+			syntax_error Unclosed_conditional ~pos:(Some p) sraw tk
+		| _ ->
+			skip_tokens p test
+
+	and skip_tokens p test = skip_tokens_loop p test (Lexer.token code)
+
+	in
+	let s = Stream.from (fun _ ->
+		let t = next_token() in
+		TokenCache.add t;
+		Some t
+	) in
+	try
+		let l = parse_file s in
+		(match !mstack with p :: _ -> syntax_error Unclosed_conditional ~pos:(Some p) sraw () | _ -> ());
+		let was_display_file = !in_display_file in
+		restore();
+		Lexer.restore old;
+		if was_display_file then
+			ParseDisplayFile(l,{pd_errors = List.rev !syntax_errors;pd_dead_blocks = dbc#get_dead_blocks;pd_conditions = conds#get_conditions})
+		else begin match List.rev !syntax_errors with
+			| [] -> ParseSuccess l
+			| error :: errors -> ParseError(l,error,errors)
+		end
+	with
+		| Stream.Error _
+		| Stream.Failure ->
+			let last = (match Stream.peek s with None -> last_token s | Some t -> t) in
+			Lexer.restore old;
+			restore();
+			error (Unexpected (fst last)) (pos last)
+		| e ->
+			Lexer.restore old;
+			restore();
+			raise e
+
+let parse_string com s p error inlined =
+	let old = Lexer.save() in
+	let old_file = (try Some (Hashtbl.find Lexer.all_files p.pfile) with Not_found -> None) in
+	let old_display = display_position#get in
+	let old_in_display_file = !in_display_file in
+	let old_syntax_errors = !syntax_errors in
+	syntax_errors := [];
+	let restore() =
+		(match old_file with
+		| None -> ()
+		| Some f -> Hashtbl.replace Lexer.all_files p.pfile f);
+		if not inlined then begin
+			display_position#set old_display;
+			in_display_file := old_in_display_file;
+		end;
+		syntax_errors := old_syntax_errors;
+		Lexer.restore old
+	in
+	Lexer.init p.pfile;
+	if not inlined then begin
+		display_position#reset;
+		in_display_file := false;
+	end;
+	let result = try
+		parse com (Sedlexing.Utf8.from_string s) p.pfile
+	with Error (e,pe) ->
+		restore();
+		error (error_msg e) (if inlined then pe else p)
+	| Lexer.Error (e,pe) ->
+		restore();
+		error (Lexer.error_msg e) (if inlined then pe else p)
+	in
+	restore();
+	result
+
+let parse_expr_string com s p error inl =
+	let head = "class X{static function main() " in
+	let head = (if p.pmin > String.length head then head ^ String.make (p.pmin - String.length head) ' ' else head) in
+	let rec loop e = let e = Ast.map_expr loop e in (fst e,p) in
+	let extract_expr (_,decls) = match decls with
+		| [EClass { d_data = [{ cff_name = "main",null_pos; cff_kind = FFun { f_expr = Some e } }]},_] -> (if inl then e else loop e)
+		| _ -> raise Exit
+	in
+	match parse_string com (head ^ s ^ ";}") p error inl with
+	| ParseSuccess data -> ParseSuccess(extract_expr data)
+	| ParseError(data,error,errors) -> ParseError(extract_expr data,error,errors)
+	| ParseDisplayFile(data,pdi) -> ParseDisplayFile(extract_expr data,pdi)
diff --git a/src/syntax/reification.ml b/src/syntax/reification.ml
new file mode 100644
index 0000000000000000000000000000000000000000..83305aa2c9fefc6cd1feef4e62f0c9fb90e5f283
--- /dev/null
+++ b/src/syntax/reification.ml
@@ -0,0 +1,398 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+open Ast
+open Globals
+
+let reify in_macro =
+	let cur_pos = ref None in
+	let mk_enum ename n vl p =
+		(* We don't want the position of the call expression to span the entire call (#6396). *)
+		let pmin = {p with pmax = p.pmin} in
+		let constr = (EConst (Ident n),pmin) in
+		match vl with
+		| [] -> constr
+		| _ -> (ECall (constr,vl),pmin)
+	in
+	let to_const c p =
+		let cst n v = mk_enum "Constant" n [EConst (String(v,SDoubleQuotes)),p] p in
+		match c with
+		| Int i -> cst "CInt" i
+		| String(s,qs) ->
+			let qs = mk_enum "StringLiteralKind" (match qs with SDoubleQuotes -> "DoubleQuotes" | SSingleQuotes -> "SingleQuotes") [] p in
+			mk_enum "Constant" "CString" [(EConst (String(s,SDoubleQuotes)),p);qs] p
+		| Float s -> cst "CFloat" s
+		| Ident s -> cst "CIdent" s
+		| Regexp (r,o) -> mk_enum "Constant" "CRegexp" [(EConst (String(r,SDoubleQuotes)),p);(EConst (String(o,SDoubleQuotes)),p)] p
+	in
+	let rec to_binop o p =
+		let op n = mk_enum "Binop" n [] p in
+		match o with
+		| OpAdd -> op "OpAdd"
+		| OpMult -> op "OpMult"
+		| OpDiv -> op "OpDiv"
+		| OpSub -> op "OpSub"
+		| OpAssign -> op "OpAssign"
+		| OpEq -> op "OpEq"
+		| OpNotEq -> op "OpNotEq"
+		| OpGt -> op "OpGt"
+		| OpGte -> op "OpGte"
+		| OpLt -> op "OpLt"
+		| OpLte -> op "OpLte"
+		| OpAnd -> op "OpAnd"
+		| OpOr -> op "OpOr"
+		| OpXor -> op "OpXor"
+		| OpBoolAnd -> op "OpBoolAnd"
+		| OpBoolOr -> op "OpBoolOr"
+		| OpShl -> op "OpShl"
+		| OpShr -> op "OpShr"
+		| OpUShr -> op "OpUShr"
+		| OpMod -> op "OpMod"
+		| OpAssignOp o -> mk_enum "Binop" "OpAssignOp" [to_binop o p] p
+		| OpInterval -> op "OpInterval"
+		| OpArrow -> op "OpArrow"
+		| OpIn -> op "OpIn"
+	in
+	let to_string s p =
+		let len = String.length s in
+		if len > 1 && s.[0] = '$' then
+			(EConst (Ident (String.sub s 1 (len - 1))),p)
+		else
+			(EConst (String(s,SDoubleQuotes)),p)
+	in
+	let to_placed_name (s,p) =
+		to_string s p
+	in
+	let to_array f a p =
+		(EArrayDecl (List.map (fun s -> f s p) a),p)
+	in
+	let to_null p =
+		(EConst (Ident "null"),p)
+	in
+	let to_opt f v p =
+		match v with
+		| None -> to_null p
+		| Some v -> f v p
+	in
+	let to_bool o p =
+		(EConst (Ident (if o then "true" else "false")),p)
+	in
+	let to_obj fields p =
+		(EObjectDecl (List.map (fun (s,e) -> (s,null_pos,NoQuotes),e) fields),p)
+	in
+	let rec to_tparam t p =
+		let n, v = (match t with
+			| TPType t -> "TPType", to_ctype t p
+			| TPExpr e -> "TPExpr", to_expr e p
+		) in
+		mk_enum "TypeParam" n [v] p
+	and to_tpath (t,_) p =
+		let len = String.length t.tname in
+		if t.tpackage = [] && len > 1 && t.tname.[0] = '$' then begin
+			let name = String.sub t.tname 1 (len - 1) in
+			let ei = (EConst (Ident name),p) in
+			match t.tparams with
+			| [] -> ei
+			| _ ->
+				(* `macro : $TP<Int>` conveys the intent to use TP and overwrite the
+					 type parameters. *)
+				let ea = to_array to_tparam t.tparams p in
+				let fields = [
+					("pack", (EField(ei,"pack"),p));
+					("name", (EField(ei,"name"),p));
+					("sub", (EField(ei,"sub"),p));
+					("params", ea);
+				] in
+				to_obj fields p
+		end else begin
+			let fields = [
+				("pack", to_array to_string t.tpackage p);
+				("name", to_string t.tname p);
+				("params", to_array to_tparam t.tparams p);
+			] in
+			to_obj (match t.tsub with None -> fields | Some s -> fields @ ["sub",to_string s p]) p
+		end
+	and to_ctype t p =
+		let ct n vl = mk_enum "ComplexType" n vl p in
+		match fst t with
+		| CTPath ({ tpackage = []; tparams = []; tsub = None; tname = n }) when n.[0] = '$' ->
+			to_string n p
+		| CTPath t -> ct "TPath" [to_tpath (t,p) p]
+		| CTFunction (args,ret) -> ct "TFunction" [to_array to_type_hint args p; to_type_hint ret p]
+		| CTAnonymous fields -> ct "TAnonymous" [to_array to_cfield fields p]
+		| CTParent t -> ct "TParent" [to_type_hint t p]
+		| CTExtend (tl,fields) -> ct "TExtend" [to_array to_tpath tl p; to_array to_cfield fields p]
+		| CTOptional t -> ct "TOptional" [to_type_hint t p]
+		| CTNamed (n,t) -> ct "TNamed" [to_placed_name n; to_type_hint t p]
+		| CTIntersection tl -> ct "TIntersection" (List.map (fun t -> to_ctype t p) tl)
+	and to_type_hint (t,p) _ =
+		(* to_obj ["type",to_ctype t p;"pos",to_pos p] p *)
+		to_ctype (t,p) p
+	and to_display_kind dk p = mk_enum "DisplayKind" (s_display_kind dk) [] p
+	and to_fun f p =
+		let p = {p with pmax = p.pmin} in
+		let farg ((n,_),o,_,t,e) p =
+			let fields = [
+				"name", to_string n p;
+				"opt", to_bool o p;
+				"type", to_opt to_type_hint t p;
+			] in
+			to_obj (match e with None -> fields | Some e -> fields @ ["value",to_expr e p]) p
+		in
+		let rec fparam t p =
+			let fields = [
+				"name", to_placed_name t.tp_name;
+				"constraints", (match t.tp_constraints with None -> to_null p | Some ct -> to_array to_ctype [ct] p);
+				"params", to_array fparam t.tp_params p;
+			] in
+			to_obj fields p
+		in
+		let fields = [
+			("args",to_array farg f.f_args p);
+			("ret",to_opt to_type_hint f.f_type p);
+			("expr",to_opt to_expr f.f_expr p);
+			("params",to_array fparam f.f_params p);
+		] in
+		to_obj fields p
+	and to_cfield f p =
+		let p = f.cff_pos in
+		let to_access a p =
+			let n = (match fst a with
+			| APublic -> "APublic"
+			| APrivate -> "APrivate"
+			| AStatic -> "AStatic"
+			| AOverride -> "AOverride"
+			| ADynamic -> "ADynamic"
+			| AInline -> "AInline"
+			| AMacro -> "AMacro"
+			| AFinal -> "AFinal"
+			| AExtern -> "AExtern"
+			) in
+			mk_enum "Access" n [] p
+		in
+		let to_kind k =
+			let n, vl = (match k with
+				| FVar (ct,e) -> "FVar", [to_opt to_type_hint ct p;to_opt to_expr e p]
+				| FFun f -> "FFun", [to_fun f p]
+				| FProp (get,set,t,e) -> "FProp", [to_placed_name get; to_placed_name set; to_opt to_type_hint t p; to_opt to_expr e p]
+			) in
+			mk_enum "FieldType" n vl p
+		in
+		let fields = [
+			Some ("name", to_placed_name f.cff_name);
+			(match f.cff_doc with None -> None | Some s -> Some ("doc", to_string s p));
+			(match f.cff_access with [] -> None | l -> Some ("access", to_array to_access l p));
+			Some ("kind", to_kind f.cff_kind);
+			Some ("pos", to_pos f.cff_pos);
+			(match f.cff_meta with [] -> None | l -> Some ("meta", to_meta f.cff_meta p));
+		] in
+		let fields = List.rev (List.fold_left (fun acc v -> match v with None -> acc | Some e -> e :: acc) [] fields) in
+		to_obj fields p
+	and to_meta m p =
+		to_array (fun (m,el,p) _ ->
+			let fields = [
+				"name", to_string (Meta.to_string m) p;
+				"params", to_expr_array el p;
+				"pos", to_pos p;
+			] in
+			to_obj fields p
+		) m p
+	and to_pos p =
+		match !cur_pos with
+		| Some p ->
+			p
+		| None ->
+		let file = (EConst (String(p.pfile,SDoubleQuotes)),p) in
+		let pmin = (EConst (Int (string_of_int p.pmin)),p) in
+		let pmax = (EConst (Int (string_of_int p.pmax)),p) in
+		if in_macro then
+			(EUntyped (ECall ((EConst (Ident "$__mk_pos__"),p),[file;pmin;pmax]),p),p)
+		else
+			to_obj [("file",file);("min",pmin);("max",pmax)] p
+	and to_expr_array a p = match a with
+		| [EMeta ((Meta.Dollar "a",[],_),e1),_] -> (match fst e1 with EArrayDecl el -> to_expr_array el p | _ -> e1)
+		| _ -> to_array to_expr a p
+	and to_expr e _ =
+		let p = snd e in
+		let expr n vl =
+			let e = mk_enum "ExprDef" n vl p in
+			to_obj [("expr",e);("pos",to_pos p)] p
+		in
+		let loop e = to_expr e (snd e) in
+		match fst e with
+		| EConst (Ident n) when n.[0] = '$' && String.length n > 1 && n <> "$__mk_pos__" ->
+			to_string n p
+		| EConst c ->
+			expr "EConst" [to_const c p]
+		| EArray (e1,e2) ->
+			expr "EArray" [loop e1;loop e2]
+		| EBinop (op,e1,e2) ->
+			expr "EBinop" [to_binop op p; loop e1; loop e2]
+		| EField (e,s) ->
+			let p = {p with pmin = p.pmax - String.length s} in
+			expr "EField" [loop e; to_string s p]
+		| EParenthesis e ->
+			expr "EParenthesis" [loop e]
+		| EObjectDecl fl ->
+			let quote_kind kk p =
+				let n = match kk with
+					| NoQuotes -> "Unquoted"
+					| DoubleQuotes -> "Quoted"
+				in
+				mk_enum "QuoteStatus" n [] p
+			in
+			expr "EObjectDecl" [to_array (fun ((f,pn,kk),e) -> to_obj [("field",to_string f p);("expr",loop e);("quotes",quote_kind kk pn)]) fl p]
+		| EArrayDecl el ->
+			expr "EArrayDecl" [to_expr_array el p]
+		| ECall (e,el) ->
+			expr "ECall" [loop e;to_expr_array el p]
+		| ENew (t,el) ->
+			expr "ENew" [to_tpath t p;to_expr_array el p]
+		| EUnop (op,flag,e) ->
+			let op = mk_enum "Unop" (match op with
+				| Increment -> "OpIncrement"
+				| Decrement -> "OpDecrement"
+				| Not -> "OpNot"
+				| Neg -> "OpNeg"
+				| NegBits -> "OpNegBits"
+			) [] p in
+			expr "EUnop" [op;to_bool (flag = Postfix) p;loop e]
+		| EVars vl ->
+			expr "EVars" [to_array (fun ((n,pn),final,th,e) p ->
+				let fields = [
+					"name", to_string n pn;
+					"type", to_opt to_type_hint th p;
+					"expr", to_opt to_expr e p;
+					"isFinal",to_bool final p;
+				] in
+				to_obj fields p
+			) vl p]
+		| EFunction (kind,f) ->
+			let kind, args = match kind with
+				| FKAnonymous -> "FAnonymous", []
+				| FKArrow -> "FArrow", []
+				| FKNamed ((name,pn),inline) -> "FNamed", [to_string name pn; to_bool inline pn]
+			in
+			let kind = mk_enum "FunctionKind" kind args p in
+			expr "EFunction" [kind; to_fun f p]
+		| EBlock el ->
+			expr "EBlock" [to_expr_array el p]
+		| EFor (e1,e2) ->
+			expr "EFor" [loop e1;loop e2]
+		| EIf (e1,e2,eelse) ->
+			expr "EIf" [loop e1;loop e2;to_opt to_expr eelse p]
+		| EWhile (e1,e2,flag) ->
+			expr "EWhile" [loop e1;loop e2;to_bool (flag = NormalWhile) p]
+		| ESwitch (e1,cases,def) ->
+			let scase (el,eg,e,_) p =
+				to_obj [("values",to_expr_array el p);"guard",to_opt to_expr eg p;"expr",to_opt to_expr e p] p
+			in
+			expr "ESwitch" [loop e1;to_array scase cases p;to_opt (fun (e,_) -> to_opt to_expr e) def p]
+		| ETry (e1,catches) ->
+			let scatch ((n,_),t,e,_) p =
+				to_obj [("name",to_string n p);("type",to_ctype t p);("expr",loop e)] p
+			in
+			expr "ETry" [loop e1;to_array scatch catches p]
+		| EReturn eo ->
+			expr "EReturn" [to_opt to_expr eo p]
+		| EBreak ->
+			expr "EBreak" []
+		| EContinue ->
+			expr "EContinue" []
+		| EUntyped e ->
+			expr "EUntyped" [loop e]
+		| EThrow e ->
+			expr "EThrow" [loop e]
+		| ECast (e,ct) ->
+			expr "ECast" [loop e; to_opt to_type_hint ct p]
+		| EDisplay (e,dk) ->
+			expr "EDisplay" [loop e; to_display_kind dk p]
+		| EDisplayNew t ->
+			expr "EDisplayNew" [to_tpath t p]
+		| ETernary (e1,e2,e3) ->
+			expr "ETernary" [loop e1;loop e2;loop e3]
+		| ECheckType (e1,ct) ->
+			expr "ECheckType" [loop e1; to_type_hint ct p]
+		| EMeta ((m,ml,p),e1) ->
+			match m, ml with
+			| Meta.Dollar ("" | "e"), _ ->
+				e1
+			| Meta.Dollar "a", _ ->
+				expr "EArrayDecl" (match fst e1 with EArrayDecl el -> [to_expr_array el p] | _ -> [e1])
+			| Meta.Dollar "b", _ ->
+				expr "EBlock" [e1]
+			(* TODO: can $v and $i be implemented better? *)
+			| Meta.Dollar "v", _ ->
+				begin match fst e1 with
+				| EParenthesis (ECheckType (e2, (CTPath{tname="String";tpackage=[]},_)),_) -> expr "EConst" [mk_enum "Constant" "CString" [e2] (pos e2)]
+				| EParenthesis (ECheckType (e2, (CTPath{tname="Int";tpackage=[]},_)),_) -> expr "EConst" [mk_enum "Constant" "CInt" [e2] (pos e2)]
+				| EParenthesis (ECheckType (e2, (CTPath{tname="Float";tpackage=[]},_)),_) -> expr "EConst" [mk_enum "Constant" "CFloat" [e2] (pos e2)]
+				| _ -> (ECall ((EField ((EField ((EField ((EConst (Ident "haxe"),p),"macro"),p),"Context"),p),"makeExpr"),p),[e; to_pos (pos e)]),p)
+				end
+			| Meta.Dollar "i", _ ->
+				expr "EConst" [mk_enum "Constant" "CIdent" [e1] (pos e1)]
+			| Meta.Dollar "p", _ ->
+				(ECall ((EField ((EField ((EField ((EConst (Ident "haxe"),p),"macro"),p),"MacroStringTools"),p),"toFieldExpr"),p),[e]),p)
+			| Meta.Pos, [pexpr] ->
+				let old = !cur_pos in
+				cur_pos := Some pexpr;
+				let e = loop e1 in
+				cur_pos := old;
+				e
+			| _ ->
+				expr "EMeta" [to_obj [("name",to_string (Meta.to_string m) p);("params",to_expr_array ml p);("pos",to_pos p)] p;loop e1]
+	and to_tparam_decl p t =
+		to_obj [
+			"name", to_placed_name t.tp_name;
+			"params", (EArrayDecl (List.map (to_tparam_decl p) t.tp_params),p);
+			"constraints", (EArrayDecl (match t.tp_constraints with None -> [] | Some th -> [to_ctype th p]),p)
+		] p
+	and to_type_def (t,p) =
+		match t with
+		| EClass d ->
+			let ext = ref None and impl = ref [] and interf = ref false and final = ref false in
+			List.iter (function
+				| HExtern | HPrivate -> ()
+				| HInterface -> interf := true;
+				| HExtends t -> ext := (match !ext with
+					| None -> Some (to_tpath t p)
+					| Some _ -> begin
+						impl := (to_tpath t p) :: !impl;
+						!ext
+						end)
+				| HImplements i-> impl := (to_tpath i p) :: !impl
+				| HFinal -> final := true
+			) d.d_flags;
+			to_obj [
+				"pack", (EArrayDecl [],p);
+				"name", to_string (fst d.d_name) (pos d.d_name);
+				"pos", to_pos p;
+				"meta", to_meta d.d_meta p;
+				"params", (EArrayDecl (List.map (to_tparam_decl p) d.d_params),p);
+				"isExtern", to_bool (List.mem HExtern d.d_flags) p;
+				"kind", mk_enum "TypeDefKind" "TDClass" [(match !ext with None -> (EConst (Ident "null"),p) | Some t -> t);(EArrayDecl (List.rev !impl),p);to_bool !interf p;to_bool !final p] p;
+				"fields", (EArrayDecl (List.map (fun f -> to_cfield f p) d.d_data),p)
+			] p
+		| _ -> assert false
+	in
+	(fun e -> to_expr e (snd e)), to_ctype, to_type_def
+
+let reify_expr e in_macro =
+	let to_expr,_,_ = reify in_macro in
+	let e = to_expr e in
+	(ECheckType (e,(CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = None; tparams = [] },null_pos)),pos e)
diff --git a/src/syntax/semver.ml b/src/syntax/semver.ml
new file mode 100644
index 0000000000000000000000000000000000000000..1756c815d5986b6e5f86cdc61deb466c62a75e5f
--- /dev/null
+++ b/src/syntax/semver.ml
@@ -0,0 +1,114 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+(**
+	A single version within semver string (e.g major or minor or patch)
+*)
+type version =
+	| SVNum of int
+	| SVStr of string	(* `alpha`, `pre`, `rc` etc. *)
+
+let s_version = function
+	| SVNum n -> "SVNum " ^ (string_of_int n)
+	| SVStr s -> "SVStr " ^ s
+
+let to_string ((major,minor,patch),pre) =
+	let str v =
+		match v with
+			| SVNum n -> string_of_int n
+			| SVStr s -> s
+	in
+	(String.concat "." (List.map str [major;minor;patch]))
+	^ match pre with
+		| None -> ""
+		| Some pre -> "-" ^ (String.concat "." (List.map str pre))
+
+
+(**
+	Parse SemVer string
+*)
+let parse_version s =
+	let error () =
+		raise (Invalid_argument ("Invalid version string \"" ^ s ^ "\". Should follow SemVer."))
+	in
+	let parse dotted_str =
+		List.map
+			(fun s ->
+				try SVNum (int_of_string s)
+				with _ -> SVStr s
+			)
+			(ExtString.String.nsplit dotted_str ".")
+	in
+	let parse_release dotted_str =
+		match parse dotted_str with
+			| [SVNum _ as major; SVNum _ as minor; SVNum _ as patch] -> (major, minor, patch)
+			| _ -> error()
+	in
+	let index = try Some (String.index s '-') with Not_found -> None in
+	match index with
+		(* 1.2.3 *)
+		| None -> (parse_release s), None
+		(* 1.2.3- *)
+		| Some index when index + 1 = String.length s -> error()
+		(* 1.2.3-alpha.1+23 *)
+		| Some index ->
+			let release = parse_release (String.sub s 0 index)
+			and pre =
+				let pre_str = String.sub s (index + 1) (String.length s - (index + 1)) in
+				(* remove build meta *)
+				let pre_str =
+					try String.sub pre_str 0 (String.index pre_str '+')
+					with Not_found -> pre_str
+				in
+				parse pre_str
+			in
+			release, Some pre
+
+(**
+	@see https://semver.org/#spec-item-11
+*)
+let compare_version a b =
+	let compare_v v1 v2 =
+		match v1,v2 with
+			| SVNum n1, SVNum n2 -> compare n1 n2
+			| SVStr s1, SVStr s2 -> compare s1 s2
+			| SVStr _, SVNum _ -> 1
+			| SVNum _, SVStr _ -> -1
+	in
+	let rec compare_lists version_list1 version_list2 =
+		match version_list1, version_list2 with
+			| [], [] -> 0
+			| [], _ -> -1
+			| _, [] -> 1
+			| v1 :: rest1, v2 :: rest2 ->
+				let diff = compare_v v1 v2 in
+				if diff <> 0 then diff
+				else compare_lists rest1 rest2
+	in
+	match a, b with
+		| ((major1,minor1,patch1), pre1), ((major2,minor2,patch2), pre2) ->
+			let diff = compare_lists [major1;minor1;patch1] [major2;minor2;patch2] in
+			if diff <> 0 then
+				diff
+			else
+				match pre1, pre2 with
+				| None, None -> 0
+				| None, _ -> 1
+				| _, None -> -1
+				| Some pre1, Some pre2 -> compare_lists pre1 pre2
\ No newline at end of file
diff --git a/src/typing/abstract.ml b/src/typing/abstract.ml
deleted file mode 100644
index 63eb912abd28e5d3f23eee4c55d0a230dd7796ae..0000000000000000000000000000000000000000
--- a/src/typing/abstract.ml
+++ /dev/null
@@ -1,67 +0,0 @@
-open Meta
-open Type
-open Error
-
-let find_to ab pl b =
-	if follow b == t_dynamic then
-		List.find (fun (t,_) -> follow t == t_dynamic) ab.a_to_field
-	else if List.exists (unify_to ab pl ~allow_transitive_cast:false b) ab.a_to then
-		raise Not_found (* legacy compatibility *)
-	else
-		List.find (unify_to_field ab pl b) ab.a_to_field
-
-let find_from ab pl a b =
-	if follow a == t_dynamic then
-		List.find (fun (t,_) -> follow t == t_dynamic) ab.a_from_field
-	else if List.exists (unify_from ab pl a ~allow_transitive_cast:false b) ab.a_from then
-		raise Not_found (* legacy compatibility *)
-	else
-		List.find (unify_from_field ab pl a b) ab.a_from_field
-
-let underlying_type_stack = ref []
-
-let rec get_underlying_type a pl =
-	let maybe_recurse t =
-		underlying_type_stack := (TAbstract(a,pl)) :: !underlying_type_stack;
-		let rec loop t = match t with
-			| TMono r ->
-				(match !r with
-				| Some t -> loop t
-				| _ -> t)
-			| TLazy f ->
-				loop (!f())
-			| TType({t_path=([],"Null")} as tn,[t1]) ->
-				TType(tn,[loop t1])
-			| TType (t,tl) ->
-				loop (apply_params t.t_params tl t.t_type)
-			| TAbstract(a,tl) when not (Meta.has Meta.CoreType a.a_meta) ->
-				if List.exists (fast_eq t) !underlying_type_stack then begin
-					let pctx = print_context() in
-					let s = String.concat " -> " (List.map (fun t -> s_type pctx t) (List.rev (t :: !underlying_type_stack))) in
-					underlying_type_stack := [];
-					error ("Abstract chain detected: " ^ s) a.a_pos
-				end;
-				get_underlying_type a tl
-			| _ ->
-				t
-		in
-		let t = loop t in
-		underlying_type_stack := List.tl !underlying_type_stack;
-		t
-	in
-	try
-		if not (Meta.has Meta.MultiType a.a_meta) then raise Not_found;
-		let m = mk_mono() in
-		let _ = find_to a pl m in
-		maybe_recurse (follow m)
-	with Not_found ->
-		if Meta.has Meta.CoreType a.a_meta then
-			t_dynamic
-		else
-			maybe_recurse (apply_params a.a_params pl a.a_this)
-
-let rec follow_with_abstracts t = match follow t with
-	| TAbstract(a,tl) when not (Meta.has Meta.CoreType a.a_meta) ->
-		follow_with_abstracts (get_underlying_type a tl)
-	| t ->
-		t
\ No newline at end of file
diff --git a/src/typing/calls.ml b/src/typing/calls.ml
new file mode 100644
index 0000000000000000000000000000000000000000..6822979169f6eb431456b7199348f852c07f2652
--- /dev/null
+++ b/src/typing/calls.ml
@@ -0,0 +1,825 @@
+open Globals
+open DisplayTypes.DisplayMode
+open Common
+open Ast
+open Type
+open Typecore
+open TyperBase
+open Fields
+open Error
+
+let is_forced_inline c cf =
+	match c with
+	| Some { cl_extern = true } -> true
+	| Some { cl_kind = KAbstractImpl _ } -> true
+	| _ when has_class_field_flag cf CfExtern -> true
+	| _ -> false
+
+let make_call ctx e params t ?(force_inline=false) p =
+	try
+		let ethis,cl,f = match e.eexpr with
+			| TField (ethis,fa) ->
+				let co,cf = match fa with
+					| FInstance(c,_,cf) | FStatic(c,cf) -> Some c,cf
+					| FAnon cf -> None,cf
+					| _ -> raise Exit
+				in
+				ethis,co,cf
+			| _ ->
+				raise Exit
+		in
+		if not force_inline then begin
+			if f.cf_kind <> Method MethInline then raise Exit;
+		end else begin
+			match cl with
+			| None ->
+				()
+			| Some c ->
+				(* Delay this to filters because that's when cl_descendants is set. *)
+				ctx.com.callbacks#add_before_save (fun () ->
+					let rec has_override c =
+						List.exists (fun cf -> cf.cf_name = f.cf_name) c.cl_overrides
+						|| List.exists has_override c.cl_descendants
+					in
+					if List.exists has_override c.cl_descendants then error (Printf.sprintf "Cannot force inline-call to %s because it is overridden" f.cf_name) p
+				)
+		end;
+		let config = match cl with
+			| Some ({cl_kind = KAbstractImpl _}) when Meta.has Meta.Impl f.cf_meta ->
+				let t = if f.cf_name = "_new" then
+					t
+				else if params = [] then
+					error "Invalid abstract implementation function" f.cf_pos
+				else
+					follow (List.hd params).etype
+				in
+				begin match t with
+					| TAbstract(a,pl) ->
+						let has_params = a.a_params <> [] || f.cf_params <> [] in
+						let monos = List.map (fun _ -> mk_mono()) f.cf_params in
+						let map_type = fun t -> apply_params a.a_params pl (apply_params f.cf_params monos t) in
+						Some (has_params,map_type)
+					| _ ->
+						None
+				end
+			| _ ->
+				None
+		in
+		ignore(follow f.cf_type); (* force evaluation *)
+		(match cl, ctx.curclass.cl_kind, params with
+			| Some c, KAbstractImpl _, { eexpr = TLocal { v_meta = v_meta } } :: _ when c == ctx.curclass ->
+				if
+					f.cf_name <> "_new"
+					&& has_meta Meta.This v_meta
+					&& not (assign_to_this_is_allowed ctx)
+					&& has_class_field_flag f CfModifiesThis
+				then
+					error ("Abstract 'this' value can only be modified inside an inline function. '" ^ f.cf_name ^ "' modifies 'this'") p;
+			| _ -> ()
+		);
+		let params = List.map (ctx.g.do_optimize ctx) params in
+		let force_inline = is_forced_inline cl f in
+		(match f.cf_expr_unoptimized,f.cf_expr with
+		| Some fd,_
+		| None,Some { eexpr = TFunction fd } ->
+			(match Inline.type_inline ctx f fd ethis params t config p force_inline with
+			| None ->
+				if force_inline then error "Inline could not be done" p;
+				raise Exit;
+			| Some e -> e)
+		| _ ->
+			(*
+				we can't inline because there is most likely a loop in the typing.
+				this can be caused by mutually recursive vars/functions, some of them
+				being inlined or not. In that case simply ignore inlining.
+			*)
+			raise Exit)
+	with Exit ->
+		mk (TCall (e,params)) t p
+
+let mk_array_get_call ctx (cf,tf,r,e1,e2o) c ebase p = match cf.cf_expr with
+	| None ->
+		if not (Meta.has Meta.NoExpr cf.cf_meta) then display_error ctx "Recursive array get method" p;
+		mk (TArray(ebase,e1)) r p
+	| Some _ ->
+		let et = type_module_type ctx (TClassDecl c) None p in
+		let ef = mk (TField(et,(FStatic(c,cf)))) tf p in
+		make_call ctx ef [ebase;e1] r p
+
+let mk_array_set_call ctx (cf,tf,r,e1,e2o) c ebase p =
+	let evalue = match e2o with None -> assert false | Some e -> e in
+	match cf.cf_expr with
+		| None ->
+			if not (Meta.has Meta.NoExpr cf.cf_meta) then display_error ctx "Recursive array set method" p;
+			let ea = mk (TArray(ebase,e1)) r p in
+			mk (TBinop(OpAssign,ea,evalue)) r p
+		| Some _ ->
+			let et = type_module_type ctx (TClassDecl c) None p in
+			let ef = mk (TField(et,(FStatic(c,cf)))) tf p in
+			make_call ctx ef [ebase;e1;evalue] r p
+
+let call_to_string ctx ?(resume=false) e =
+	(* Ignore visibility of the toString field. *)
+	ctx.meta <- (Meta.PrivateAccess,[],e.epos) :: ctx.meta;
+	let acc = type_field (TypeFieldConfig.create resume) ctx e "toString" e.epos MCall in
+	ctx.meta <- List.tl ctx.meta;
+	!build_call_ref ctx acc [] (WithType.with_type ctx.t.tstring) e.epos
+
+let rec unify_call_args' ctx el args r callp inline force_inline =
+	let in_call_args = ctx.in_call_args in
+	ctx.in_call_args <- true;
+	let call_error err p =
+		raise (Error (Call_error err,p))
+	in
+	let arg_error ul name opt p =
+		let err = Stack (ul,Custom ("For " ^ (if opt then "optional " else "") ^ "function argument '" ^ name ^ "'")) in
+		call_error (Could_not_unify err) p
+	in
+	let mk_pos_infos t =
+		let infos = mk_infos ctx callp [] in
+		type_expr ctx infos (WithType.with_type t)
+	in
+	let rec default_value name t =
+		if is_pos_infos t then
+			mk_pos_infos t
+		else
+			null (ctx.t.tnull t) callp
+	in
+	let skipped = ref [] in
+	let invalid_skips = ref [] in
+	let skip name ul t p =
+		if not ctx.com.config.pf_can_skip_non_nullable_argument && not (is_nullable t) then
+			invalid_skips := name :: !invalid_skips;
+		skipped := (name,ul,p) :: !skipped;
+		default_value name t
+	in
+	(* let force_inline, is_extern = match cf with Some(TInst(c,_),f) -> is_forced_inline (Some c) f, c.cl_extern | _ -> false, false in *)
+	let type_against name t e =
+		try
+			let e = type_expr ctx e (WithType.with_argument t name) in
+			AbstractCast.cast_or_unify_raise ctx t e e.epos
+		with Error(l,p) when (match l with Call_error _ | Module_not_found _ -> false | _ -> true) ->
+			raise (WithTypeError (l,p))
+	in
+	let rec loop el args = match el,args with
+		| [],[] ->
+			begin match List.rev !invalid_skips with
+				| [] -> ()
+				| name :: _ -> call_error (Cannot_skip_non_nullable name) callp;
+			end;
+			[]
+		| _,[name,false,t] when (match follow t with TAbstract({a_path = ["haxe";"extern"],"Rest"},_) -> true | _ -> false) ->
+			begin match follow t with
+				| TAbstract({a_path=(["haxe";"extern"],"Rest")},[t]) ->
+					(try List.map (fun e -> type_against name t e,false) el with WithTypeError(ul,p) -> arg_error ul name false p)
+				| _ ->
+					assert false
+			end
+		| [],(_,false,_) :: _ ->
+			call_error (Not_enough_arguments args) callp
+		| [],(name,true,t) :: args ->
+			begin match loop [] args with
+				| [] when not (inline && (ctx.g.doinline || force_inline)) && not ctx.com.config.pf_pad_nulls ->
+					if is_pos_infos t then [mk_pos_infos t,true]
+					else []
+				| args ->
+					let e_def = default_value name t in
+					(e_def,true) :: args
+			end
+		| (e,p) :: el, [] ->
+			begin match List.rev !skipped with
+				| [] ->
+					if ctx.in_display then begin
+						let e = type_expr ctx (e,p) WithType.value in
+						(e,false) :: loop el []
+					end	else call_error Too_many_arguments p
+				| (s,ul,p) :: _ -> arg_error ul s true p
+			end
+		| e :: el,(name,opt,t) :: args ->
+			begin try
+				let e = type_against name t e in
+				(e,opt) :: loop el args
+			with
+				WithTypeError (ul,p)->
+					if opt && List.length el < List.length args then
+						let e_def = skip name ul t p in
+						(e_def,true) :: loop (e :: el) args
+					else
+						match List.rev !skipped with
+						| [] -> arg_error ul name opt p
+						| (s,ul,p) :: _ -> arg_error ul s true p
+			end
+	in
+	let el = try loop el args with exc -> ctx.in_call_args <- in_call_args; raise exc; in
+	ctx.in_call_args <- in_call_args;
+	el,TFun(args,r)
+
+let unify_call_args ctx el args r p inline force_inline =
+	let el,tf = unify_call_args' ctx el args r p inline force_inline in
+	List.map fst el,tf
+
+let unify_field_call ctx fa el args ret p inline =
+	let map_cf cf0 map cf =
+		let t = map (monomorphs cf.cf_params cf.cf_type) in
+		begin match cf.cf_expr,cf.cf_kind with
+		| None,Method MethInline when not ctx.com.config.pf_overload ->
+			(* This is really awkward and shouldn't be here. We'll keep it for
+			   3.2 in order to not break code that relied on the quirky behavior
+			   in 3.1.3, but it should really be reviewed afterwards.
+			   Related issue: https://github.com/HaxeFoundation/haxe/issues/3846
+			*)
+			cf.cf_expr <- cf0.cf_expr;
+			cf.cf_kind <- cf0.cf_kind;
+		| _ ->
+			()
+		end;
+		t,cf
+	in
+	let expand_overloads map cf =
+		(TFun(args,ret),cf) :: (List.map (map_cf cf map) cf.cf_overloads)
+	in
+	let candidates,co,cf,mk_fa = match fa with
+		| FStatic(c,cf) ->
+			expand_overloads (fun t -> t) cf,Some c,cf,(fun cf -> FStatic(c,cf))
+		| FAnon cf ->
+			expand_overloads (fun t -> t) cf,None,cf,(fun cf -> FAnon cf)
+		| FInstance(c,tl,cf) ->
+			let map = apply_params c.cl_params tl in
+			let cfl = if cf.cf_name = "new" || not (Meta.has Meta.Overload cf.cf_meta && ctx.com.config.pf_overload) then
+				List.map (map_cf cf map) cf.cf_overloads
+			else
+				List.map (fun (t,cf) -> map (monomorphs cf.cf_params t),cf) (Overloads.get_overloads c cf.cf_name)
+			in
+			(TFun(args,ret),cf) :: cfl,Some c,cf,(fun cf -> FInstance(c,tl,cf))
+		| FClosure(co,cf) ->
+			let c = match co with None -> None | Some (c,_) -> Some c in
+			expand_overloads (fun t -> t) cf,c,cf,(fun cf -> match co with None -> FAnon cf | Some (c,tl) -> FInstance(c,tl,cf))
+		| _ ->
+			error "Invalid field call" p
+	in
+	let is_forced_inline = is_forced_inline co cf in
+	let is_overload = Meta.has Meta.Overload cf.cf_meta in
+	let attempt_call t cf = match follow t with
+		| TFun(args,ret) ->
+			let el,tf = unify_call_args' ctx el args ret p inline is_forced_inline in
+			let mk_call ethis p_field inline =
+				let ef = mk (TField(ethis,mk_fa cf)) t p_field in
+				make_call ctx ef (List.map fst el) ret ~force_inline:inline p
+			in
+			el,tf,mk_call
+		| _ ->
+			assert false
+	in
+	let maybe_raise_unknown_ident cerr p =
+		let rec loop err =
+			match err with
+			| Unknown_ident _ -> error (error_msg err) p
+			| Stack (e1,e2) -> (loop e1; loop e2)
+			| _ -> ()
+		in
+		match cerr with Could_not_unify err -> loop err | _ -> ()
+	in
+	let rec loop candidates = match candidates with
+		| [] -> [],[]
+		| (t,cf) :: candidates ->
+			begin try
+				let candidate = attempt_call t cf in
+				if ctx.com.config.pf_overload && is_overload then begin
+					let candidates,failures = loop candidates in
+					candidate :: candidates,failures
+				end else
+					[candidate],[]
+			with Error ((Call_error cerr as err),p) ->
+				maybe_raise_unknown_ident cerr p;
+				let candidates,failures = loop candidates in
+				candidates,(cf,err,p) :: failures
+			end
+	in
+	let fail_fun () =
+		let tf = TFun(args,ret) in
+		[],tf,(fun ethis p_field _ ->
+			let e1 = mk (TField(ethis,mk_fa cf)) tf p_field in
+			mk (TCall(e1,[])) ret p)
+	in
+	match candidates with
+	| [t,cf] ->
+		begin try
+			let el,tf,mk_call = attempt_call t cf in
+			List.map fst el,tf,mk_call
+		with Error _ when ctx.com.display.dms_error_policy = EPIgnore ->
+			fail_fun();
+		end
+	| _ ->
+		let candidates,failures = loop candidates in
+		let fail () =
+			let failures = List.map (fun (cf,err,p) -> cf,error_msg err,p) failures in
+			let failures = remove_duplicates (fun (_,msg1,_) (_,msg2,_) -> msg1 <> msg2) failures in
+			begin match failures with
+			| [_,msg,p] ->
+				error msg p
+			| _ ->
+				display_error ctx "Could not find a suitable overload, reasons follow" p;
+				List.iter (fun (cf,msg,p2) ->
+					display_error ctx ("Overload resolution failed for " ^ (s_type (print_context()) cf.cf_type)) p;
+					display_error ctx msg p2;
+				) failures;
+				error "End of overload failure reasons" p
+			end
+		in
+		if is_overload && ctx.com.config.pf_overload then begin match Overloads.Resolution.reduce_compatible candidates with
+			| [] -> fail()
+			| [el,tf,mk_call] -> List.map fst el,tf,mk_call
+			| _ -> error "Ambiguous overload" p
+		end else begin match List.rev candidates with
+			| [] -> fail()
+			| (el,tf,mk_call) :: _ -> List.map fst el,tf,mk_call
+		end
+
+let type_generic_function ctx (e,fa) el ?(using_param=None) with_type p =
+	let c,tl,cf,stat = match fa with
+		| FInstance(c,tl,cf) -> c,tl,cf,false
+		| FStatic(c,cf) -> c,[],cf,true
+		| _ -> assert false
+	in
+	if cf.cf_params = [] then error "Function has no type parameters and cannot be generic" p;
+	let monos = List.map (fun _ -> mk_mono()) cf.cf_params in
+	let map_monos t = apply_params cf.cf_params monos t in
+	let map t = if stat then map_monos t else apply_params c.cl_params tl (map_monos t) in
+	let t = map cf.cf_type in
+	let args,ret = match t,using_param with
+		| TFun((_,_,ta) :: args,ret),Some e ->
+			let ta = if not (Meta.has Meta.Impl cf.cf_meta) then ta
+			else match follow ta with TAbstract(a,tl) -> Abstract.get_underlying_type a tl | _ -> assert false
+			in
+			(* manually unify first argument *)
+			unify ctx e.etype ta p;
+			args,ret
+		| TFun(args,ret),None -> args,ret
+		| _ ->  error "Invalid field type for generic call" p
+	in
+	begin match with_type with
+		| WithType.WithType(t,_) -> unify ctx ret t p
+		| _ -> ()
+	end;
+	let el,_ = unify_call_args ctx el args ret p false false in
+	begin try
+		check_constraints ctx cf.cf_name cf.cf_params monos map false p
+	with Unify_error l ->
+		display_error ctx (error_msg (Unify l)) p
+	end;
+	let el = match using_param with None -> el | Some e -> e :: el in
+	(try
+		let gctx = Generic.make_generic ctx cf.cf_params monos p in
+		let name = cf.cf_name ^ "_" ^ gctx.Generic.name in
+		let unify_existing_field tcf pcf = try
+			unify_raise ctx tcf t p
+		with Error(Unify _,_) as err ->
+			display_error ctx ("Cannot create field " ^ name ^ " due to type mismatch") p;
+			display_error ctx "Conflicting field was defined here" pcf;
+			raise err
+		in
+		let cf2 = try
+			let cf2 = if stat then
+				let cf2 = PMap.find name c.cl_statics in
+				unify_existing_field cf2.cf_type cf2.cf_pos;
+				cf2
+			else
+				let cf2 = PMap.find name c.cl_fields in
+				unify_existing_field cf2.cf_type cf2.cf_pos;
+				cf2
+			in
+			cf2
+			(*
+				java.Lib.array() relies on the ability to shadow @:generic function for certain types
+				see https://github.com/HaxeFoundation/haxe/issues/8393#issuecomment-508685760
+			*)
+			(* if cf.cf_name_pos = cf2.cf_name_pos then
+				cf2
+			else
+				error ("Cannot specialize @:generic because the generated function name is already used: " ^ name) p *)
+		with Not_found ->
+			let cf2 = mk_field name (map_monos cf.cf_type) cf.cf_pos cf.cf_name_pos in
+			if stat then begin
+				c.cl_statics <- PMap.add name cf2 c.cl_statics;
+				c.cl_ordered_statics <- cf2 :: c.cl_ordered_statics
+			end else begin
+				if List.memq cf c.cl_overrides then c.cl_overrides <- cf2 :: c.cl_overrides;
+				c.cl_fields <- PMap.add name cf2 c.cl_fields;
+				c.cl_ordered_fields <- cf2 :: c.cl_ordered_fields
+			end;
+			ignore(follow cf.cf_type);
+			let rec check e = match e.eexpr with
+				| TNew({cl_kind = KTypeParameter _} as c,_,_) when not (TypeloadCheck.is_generic_parameter ctx c) ->
+					display_error ctx "Only generic type parameters can be constructed" e.epos;
+					display_error ctx "While specializing this call" p;
+				| _ ->
+					Type.iter check e
+			in
+			cf2.cf_expr <- (match cf.cf_expr with
+				| None ->
+					display_error ctx "Recursive @:generic function" p; None;
+				| Some e ->
+					let e = Generic.generic_substitute_expr gctx e in
+					check e;
+					Some e
+			);
+			cf2.cf_kind <- cf.cf_kind;
+			if not (has_class_field_flag cf CfPublic) then remove_class_field_flag cf2 CfPublic;
+			let metadata = List.filter (fun (m,_,_) -> match m with
+				| Meta.Generic -> false
+				| _ -> true
+			) cf.cf_meta in
+			cf2.cf_meta <- (Meta.NoCompletion,[],p) :: (Meta.NoUsing,[],p) :: (Meta.GenericInstance,[],p) :: metadata;
+			cf2
+		in
+		let e = match c.cl_kind with
+			| KAbstractImpl(a) ->
+				type_type ctx a.a_path p
+			| _ -> e
+		in
+		let fa = if stat then FStatic (c,cf2) else FInstance (c,tl,cf2) in
+		let e = mk (TField(e,fa)) cf2.cf_type p in
+		make_call ctx e el ret p
+	with Generic.Generic_Exception (msg,p) ->
+		error msg p)
+
+let rec acc_get ctx g p =
+	match g with
+	| AKNo f -> error ("Field " ^ f ^ " cannot be accessed for reading") p
+	| AKExpr e -> e
+	| AKSet _ | AKAccess _ | AKFieldSet _ -> assert false
+	| AKUsing (et,c,cf,e,_) when ctx.in_display ->
+		(* Generate a TField node so we can easily match it for position/usage completion (issue #1968) *)
+		let ec = type_module_type ctx (TClassDecl c) None p in
+		let ec = {ec with eexpr = (TMeta((Meta.StaticExtension,[],null_pos),ec))} in
+		let t = match follow et.etype with
+			| TFun (_ :: args,ret) -> TFun(args,ret)
+			| _ -> et.etype
+		in
+		mk (TField(ec,FStatic(c,cf))) t et.epos
+	| AKUsing (et,_,cf,e,_) ->
+		(* build a closure with first parameter applied *)
+		(match follow et.etype with
+		| TFun (_ :: args,ret) ->
+			let tcallb = TFun (args,ret) in
+			let twrap = TFun ([("_e",false,e.etype)],tcallb) in
+			(* arguments might not have names in case of variable fields of function types, so we generate one (issue #2495) *)
+			let args = List.map (fun (n,o,t) ->
+				let t = if o then ctx.t.tnull t else t in
+				o,if n = "" then gen_local ctx t e.epos else alloc_var VGenerated n t e.epos (* TODO: var pos *)
+			) args in
+			let ve = alloc_var VGenerated "_e" e.etype e.epos in
+			let ecall = make_call ctx et (List.map (fun v -> mk (TLocal v) v.v_type p) (ve :: List.map snd args)) ret p in
+			let ecallb = mk (TFunction {
+				tf_args = List.map (fun (o,v) -> v,if o then Some (Texpr.Builder.make_null v.v_type v.v_pos) else None) args;
+				tf_type = ret;
+				tf_expr = (match follow ret with | TAbstract ({a_path = [],"Void"},_) -> ecall | _ -> mk (TReturn (Some ecall)) t_dynamic p);
+			}) tcallb p in
+			let ewrap = mk (TFunction {
+				tf_args = [ve,None];
+				tf_type = tcallb;
+				tf_expr = mk (TReturn (Some ecallb)) t_dynamic p;
+			}) twrap p in
+			make_call ctx ewrap [e] tcallb p
+		| _ -> assert false)
+	| AKInline (e,f,fmode,t) ->
+		(* do not create a closure for static calls *)
+		let cmode,apply_params = match fmode with
+			| FStatic(c,_) ->
+				let f = match c.cl_kind with
+					| KAbstractImpl a when Meta.has Meta.Enum a.a_meta ->
+						(* Enum abstracts have to apply their type parameters because they are basically statics with type params (#8700). *)
+						let monos = List.map (fun _ -> mk_mono()) a.a_params in
+						apply_params a.a_params monos;
+					| _ -> (fun t -> t)
+				in
+				fmode,f
+			| FInstance (c,tl,f) ->
+				(FClosure (Some (c,tl),f),(fun t -> t))
+			| _ ->
+				assert false
+		in
+		ignore(follow f.cf_type); (* force computing *)
+		begin match f.cf_kind,f.cf_expr with
+		| _ when not (ctx.com.display.dms_inline) ->
+			mk (TField (e,cmode)) t p
+		| Method _,_->
+			let chk_class c = (c.cl_extern || has_class_field_flag f CfExtern) && not (Meta.has Meta.Runtime f.cf_meta) in
+			let wrap_extern c =
+				let c2 =
+					let m = c.cl_module in
+					let mpath = (fst m.m_path @ ["_" ^ snd m.m_path],(snd m.m_path) ^ "_Impl_") in
+					try
+						let rec loop mtl = match mtl with
+							| (TClassDecl c) :: _ when c.cl_path = mpath -> c
+							| _ :: mtl -> loop mtl
+							| [] -> raise Not_found
+						in
+						loop c.cl_module.m_types
+					with Not_found ->
+						let c2 = mk_class c.cl_module mpath c.cl_pos null_pos in
+						c.cl_module.m_types <- (TClassDecl c2) :: c.cl_module.m_types;
+						c2
+				in
+				let cf = try
+					PMap.find f.cf_name c2.cl_statics
+				with Not_found ->
+					let cf = {f with cf_kind = Method MethNormal} in
+					c2.cl_statics <- PMap.add cf.cf_name cf c2.cl_statics;
+					c2.cl_ordered_statics <- cf :: c2.cl_ordered_statics;
+					cf
+				in
+				let e_t = type_module_type ctx (TClassDecl c2) None p in
+				mk (TField(e_t,FStatic(c2,cf))) t p
+			in
+			let e_def = mk (TField (e,cmode)) t p in
+			begin match follow e.etype with
+				| TInst (c,_) when chk_class c ->
+					display_error ctx "Can't create closure on an extern inline member method" p;
+					e_def
+				| TAnon a ->
+					begin match !(a.a_status) with
+						| Statics {cl_extern = false} when has_class_field_flag f CfExtern ->
+							display_error ctx "Cannot create closure on @:extern inline method" p;
+							e_def
+						| Statics c when chk_class c -> wrap_extern c
+						| _ -> e_def
+					end
+				| _ -> e_def
+			end
+		| Var _,Some e ->
+			let rec loop e = Type.map_expr loop { e with epos = p; etype = apply_params e.etype } in
+			let e = loop e in
+			let e = Inline.inline_metadata e f.cf_meta in
+			let tf = apply_params f.cf_type in
+			if not (type_iseq tf e.etype) then mk (TCast(e,None)) tf e.epos
+			else e
+		| Var _,None when ctx.com.display.dms_display ->
+			 mk (TField (e,cmode)) t p
+		| Var _,None ->
+			error "Recursive inline is not supported" p
+		end
+	| AKMacro(e,cf) ->
+		(* If we are in display mode, we're probably hovering a macro call subject. Just generate a normal field. *)
+		if ctx.in_display then begin match e.eexpr with
+			| TTypeExpr (TClassDecl c) ->
+				mk (TField(e,FStatic(c,cf))) cf.cf_type e.epos
+			| _ ->
+				error "Invalid macro access" p
+		end else
+			error "Invalid macro access" p
+
+let rec build_call ?(mode=MGet) ctx acc el (with_type:WithType.t) p =
+	let check_assign () = if mode = MSet then invalid_assign p in
+	match acc with
+	| AKInline (ethis,f,fmode,t) when Meta.has Meta.Generic f.cf_meta ->
+		check_assign();
+		type_generic_function ctx (ethis,fmode) el with_type p
+	| AKInline (ethis,f,fmode,t) ->
+		check_assign();
+		(match follow t with
+			| TFun (args,r) ->
+				let _,_,mk_call = unify_field_call ctx fmode el args r p true in
+				mk_call ethis p true
+			| _ ->
+				error (s_type (print_context()) t ^ " cannot be called") p
+		)
+	| AKUsing (et,cl,ef,eparam,forced_inline (* TOOD? *)) when Meta.has Meta.Generic ef.cf_meta ->
+		check_assign();
+		(match et.eexpr with
+		| TField(ec,fa) ->
+			type_generic_function ctx (ec,fa) el ~using_param:(Some eparam) with_type p
+		| _ -> assert false)
+	| AKUsing (et,cl,ef,eparam,force_inline) ->
+		begin match ef.cf_kind with
+		| Method MethMacro ->
+			let ethis = type_module_type ctx (TClassDecl cl) None p in
+			let eparam,f = push_this ctx eparam in
+			let e = build_call ~mode ctx (AKMacro (ethis,ef)) (eparam :: el) with_type p in
+			f();
+			e
+		| _ ->
+			check_assign();
+			let t = follow (field_type ctx cl [] ef p) in
+			(* for abstracts we have to apply their parameters to the static function *)
+			let t,tthis = match follow eparam.etype with
+				| TAbstract(a,tl) when Meta.has Meta.Impl ef.cf_meta -> apply_params a.a_params tl t,apply_params a.a_params tl a.a_this
+				| te -> t,te
+			in
+			let params,args,r,eparam = match t with
+				| TFun ((_,_,t1) :: args,r) ->
+					unify ctx tthis t1 eparam.epos;
+					let ef = prepare_using_field ef in
+					begin match unify_call_args ctx el args r p (ef.cf_kind = Method MethInline) (is_forced_inline (Some cl) ef) with
+					| el,TFun(args,r) -> el,args,r,eparam
+					| _ -> assert false
+					end
+				| _ -> assert false
+			in
+			make_call ctx ~force_inline et (eparam :: params) r p
+		end
+	| AKMacro (ethis,cf) ->
+		if ctx.macro_depth > 300 then error "Stack overflow" p;
+		ctx.macro_depth <- ctx.macro_depth + 1;
+		ctx.with_type_stack <- with_type :: ctx.with_type_stack;
+		let ethis_f = ref (fun () -> ()) in
+		let f = (match ethis.eexpr with
+		| TTypeExpr (TClassDecl c) ->
+			(match ctx.g.do_macro ctx MExpr c.cl_path cf.cf_name el p with
+			| None -> (fun() -> type_expr ~mode ctx (EConst (Ident "null"),p) WithType.value)
+			| Some (EMeta((Meta.MergeBlock,_,_),(EBlock el,_)),_) -> (fun () -> let e = (!type_block_ref) ctx el with_type p in mk (TMeta((Meta.MergeBlock,[],p), e)) e.etype e.epos)
+			| Some e -> (fun() -> type_expr ~mode ctx e with_type))
+		| _ ->
+			(* member-macro call : since we will make a static call, let's find the actual class and not its subclass *)
+			(match follow ethis.etype with
+			| TInst (c,_) ->
+				let rec loop c =
+					if PMap.mem cf.cf_name c.cl_fields then
+						let eparam,f = push_this ctx ethis in
+						ethis_f := f;
+						let e = match ctx.g.do_macro ctx MExpr c.cl_path cf.cf_name (eparam :: el) p with
+							| None -> (fun() -> type_expr ~mode ctx (EConst (Ident "null"),p) WithType.value)
+							| Some e -> (fun() -> type_expr ~mode ctx e WithType.value)
+						in
+						e
+					else
+						match c.cl_super with
+						| None -> assert false
+						| Some (csup,_) -> loop csup
+				in
+				loop c
+			| _ -> assert false))
+		in
+		ctx.macro_depth <- ctx.macro_depth - 1;
+		ctx.with_type_stack <- List.tl ctx.with_type_stack;
+		let old = ctx.on_error in
+		ctx.on_error <- (fun ctx msg ep ->
+			(* display additional info in the case the error is not part of our original call *)
+			if ep.pfile <> p.pfile || ep.pmax < p.pmin || ep.pmin > p.pmax then begin
+				TypeloadFields.locate_macro_error := false;
+				old ctx msg ep;
+				TypeloadFields.locate_macro_error := true;
+				ctx.com.error "Called from macro here" p;
+			end else
+				old ctx msg ep;
+		);
+		let e = try
+			f()
+		with exc ->
+			ctx.on_error <- old;
+			!ethis_f();
+			raise exc
+		in
+		let e = Diagnostics.secure_generated_code ctx e in
+		ctx.on_error <- old;
+		!ethis_f();
+		e
+	| AKNo _ | AKSet _ | AKAccess _ | AKFieldSet _ ->
+		ignore(acc_get ctx acc p);
+		assert false
+	| AKExpr e ->
+		let rec loop t = match follow t with
+		| TFun (args,r) ->
+			begin match e.eexpr with
+				| TField(e1,fa) when not (match fa with FEnum _ | FDynamic _ -> true | _ -> false) ->
+					begin match fa with
+						| FInstance(_,_,cf) | FStatic(_,cf) when Meta.has Meta.Generic cf.cf_meta ->
+							type_generic_function ctx (e1,fa) el with_type p
+						| _ ->
+							let _,_,mk_call = unify_field_call ctx fa el args r p false in
+							mk_call e1 e.epos false
+					end
+				| _ ->
+					let el, tfunc = unify_call_args ctx el args r p false false in
+					let r = match tfunc with TFun(_,r) -> r | _ -> assert false in
+					mk (TCall (e,el)) r p
+			end
+		| TAbstract(a,tl) when Meta.has Meta.Callable a.a_meta ->
+			loop (Abstract.get_underlying_type a tl)
+		| TMono _ ->
+			let t = mk_mono() in
+			let el = List.map (fun e -> type_expr ctx e WithType.value) el in
+			unify ctx (tfun (List.map (fun e -> e.etype) el) t) e.etype e.epos;
+			mk (TCall (e,el)) t p
+		| t ->
+			let el = List.map (fun e -> type_expr ctx e WithType.value) el in
+			let t = if t == t_dynamic then
+				t_dynamic
+			else if ctx.untyped then
+				mk_mono()
+			else
+				error (s_type (print_context()) e.etype ^ " cannot be called") e.epos
+			in
+			mk (TCall (e,el)) t p
+		in
+		loop e.etype
+
+let type_bind ctx (e : texpr) (args,ret) params p =
+	let vexpr v = mk (TLocal v) v.v_type p in
+	let acount = ref 0 in
+	let alloc_name n =
+		if n = "" && not ctx.is_display_file then begin
+			incr acount;
+			"a" ^ string_of_int !acount;
+		end else
+			n
+	in
+	let rec loop args params given_args missing_args ordered_args = match args, params with
+		| [], [] -> given_args,missing_args,ordered_args
+		| [], _ -> error "Too many callback arguments" p
+		| (n,o,t) :: args , [] when o ->
+			let a = if is_pos_infos t then
+					let infos = mk_infos ctx p [] in
+					ordered_args @ [type_expr ctx infos (WithType.with_argument t n)]
+				else if ctx.com.config.pf_pad_nulls then
+					(ordered_args @ [(mk (TConst TNull) t_dynamic p)])
+				else
+					ordered_args
+			in
+			loop args [] given_args missing_args a
+		| (n,o,t) :: _ , (EConst(Ident "_"),p) :: _ when not ctx.com.config.pf_can_skip_non_nullable_argument && o && not (is_nullable t) ->
+			error "Usage of _ is not supported for optional non-nullable arguments" p
+		| (n,o,t) :: args , ([] as params)
+		| (n,o,t) :: args , (EConst(Ident "_"),_) :: params ->
+			let v = alloc_var VGenerated (alloc_name n) (if o then ctx.t.tnull t else t) p in
+			loop args params given_args (missing_args @ [v,o]) (ordered_args @ [vexpr v])
+		| (n,o,t) :: args , param :: params ->
+			let e = type_expr ctx param (WithType.with_argument t n) in
+			let e = AbstractCast.cast_or_unify ctx t e p in
+			let v = alloc_var VGenerated (alloc_name n) t (pos param) in
+			loop args params (given_args @ [v,o,Some e]) missing_args (ordered_args @ [vexpr v])
+	in
+	let given_args,missing_args,ordered_args = loop args params [] [] [] in
+	let rec gen_loc_name n =
+		let name = if n = 0 then "f" else "f" ^ (string_of_int n) in
+		if List.exists (fun (n,_,_) -> name = n) args then gen_loc_name (n + 1) else name
+	in
+	let loc = alloc_var VGenerated (gen_loc_name 0) e.etype e.epos in
+	let given_args = (loc,false,Some e) :: given_args in
+	let inner_fun_args l = List.map (fun (v,o) -> v.v_name, o, v.v_type) l in
+	let t_inner = TFun(inner_fun_args missing_args, ret) in
+	let call = make_call ctx (vexpr loc) ordered_args ret p in
+	let e_ret = match follow ret with
+		| TAbstract ({a_path = [],"Void"},_) ->
+			call
+		| TMono _ ->
+			mk (TReturn (Some call)) t_dynamic p;
+		| _ ->
+			mk (TReturn (Some call)) t_dynamic p;
+	in
+	let func = mk (TFunction {
+		tf_args = List.map (fun (v,o) -> v, if o then Some (Texpr.Builder.make_null v.v_type null_pos) else None) missing_args;
+		tf_type = ret;
+		tf_expr = e_ret;
+	}) t_inner p in
+	let outer_fun_args l = List.map (fun (v,o,_) -> v.v_name, o, v.v_type) l in
+	let func = mk (TFunction {
+		tf_args = List.map (fun (v,_,_) -> v,None) given_args;
+		tf_type = t_inner;
+		tf_expr = mk (TReturn (Some func)) t_inner p;
+	}) (TFun(outer_fun_args given_args, t_inner)) p in
+	make_call ctx func (List.map (fun (_,_,e) -> (match e with Some e -> e | None -> assert false)) given_args) t_inner p
+
+let array_access ctx e1 e2 mode p =
+	let has_abstract_array_access = ref false in
+	try
+		(match follow e1.etype with
+		| TAbstract ({a_impl = Some c} as a,pl) when a.a_array <> [] ->
+			begin match mode with
+			| MSet ->
+				(* resolve later *)
+				AKAccess (a,pl,c,e1,e2)
+			| _ ->
+				has_abstract_array_access := true;
+				let e = mk_array_get_call ctx (AbstractCast.find_array_access ctx a pl e2 None p) c e1 p in
+				AKExpr e
+			end
+		| _ -> raise Not_found)
+	with Not_found ->
+		unify ctx e2.etype ctx.t.tint e2.epos;
+		let rec loop ?(skip_abstract=false) et =
+			match skip_abstract,follow et with
+			| _, TInst ({ cl_array_access = Some t; cl_params = pl },tl) ->
+				apply_params pl tl t
+			| _, TInst ({ cl_super = Some (c,stl); cl_params = pl },tl) ->
+				apply_params pl tl (loop (TInst (c,stl)))
+			| _, TInst ({ cl_path = [],"ArrayAccess" },[t]) ->
+				t
+			| _, TInst ({ cl_path = [],"Array"},[t]) when t == t_dynamic ->
+				t_dynamic
+			| false, TAbstract(a,tl) when Meta.has Meta.ArrayAccess a.a_meta ->
+				let at = apply_params a.a_params tl a.a_this in
+				let skip_abstract = fast_eq et at in
+				loop ~skip_abstract at
+			| _, _ ->
+				let pt = mk_mono() in
+				let t = ctx.t.tarray pt in
+				(try unify_raise ctx et t p
+				with Error(Unify _,_) -> if not ctx.untyped then begin
+					if !has_abstract_array_access then error ("No @:arrayAccess function accepts an argument of " ^ (s_type (print_context()) e2.etype)) e1.epos
+					else error ("Array access is not allowed on " ^ (s_type (print_context()) e1.etype)) e1.epos
+				end);
+				pt
+		in
+		let pt = loop e1.etype in
+		AKExpr (mk (TArray (e1,e2)) pt p)
\ No newline at end of file
diff --git a/src/typing/error.ml b/src/typing/error.ml
deleted file mode 100644
index 8e8447d21d26b5536cce3bcac306413968716a0b..0000000000000000000000000000000000000000
--- a/src/typing/error.ml
+++ /dev/null
@@ -1,94 +0,0 @@
-open Globals
-open Type
-
-type call_error =
-	| Not_enough_arguments of (string * bool * t) list
-	| Too_many_arguments
-	| Could_not_unify of error_msg
-	| Cannot_skip_non_nullable of string
-
-and error_msg =
-	| Module_not_found of path
-	| Type_not_found of path * string
-	| Unify of unify_error list
-	| Custom of string
-	| Unknown_ident of string
-	| Stack of error_msg * error_msg
-	| Call_error of call_error
-	| No_constructor of module_type
-
-exception Fatal_error of string * Globals.pos
-exception Error of error_msg * Globals.pos
-
-let string_source t = match follow t with
-	| TInst(c,_) -> List.map (fun cf -> cf.cf_name) c.cl_ordered_fields
-	| TAnon a -> PMap.fold (fun cf acc -> cf.cf_name :: acc) a.a_fields []
-	| TAbstract({a_impl = Some c},_) -> List.map (fun cf -> cf.cf_name) c.cl_ordered_statics
-	| _ -> []
-
-let short_type ctx t =
-	let tstr = s_type ctx t in
-	if String.length tstr > 150 then String.sub tstr 0 147 ^ "..." else tstr
-
-let unify_error_msg ctx = function
-	| Cannot_unify (t1,t2) ->
-		s_type ctx t1 ^ " should be " ^ s_type ctx t2
-	| Invalid_field_type s ->
-		"Invalid type for field " ^ s ^ " :"
-	| Has_no_field (t,n) ->
-		StringError.string_error n (string_source t) (short_type ctx t ^ " has no field " ^ n)
-	| Has_no_runtime_field (t,n) ->
-		s_type ctx t ^ "." ^ n ^ " is not accessible at runtime"
-	| Has_extra_field (t,n) ->
-		short_type ctx t ^ " has extra field " ^ n
-	| Invalid_kind (f,a,b) ->
-		(match a, b with
-		| Var va, Var vb ->
-			let name, stra, strb = if va.v_read = vb.v_read then
-				"setter", s_access false va.v_write, s_access false vb.v_write
-			else if va.v_write = vb.v_write then
-				"getter", s_access true va.v_read, s_access true vb.v_read
-			else
-				"access", "(" ^ s_access true va.v_read ^ "," ^ s_access false va.v_write ^ ")", "(" ^ s_access true vb.v_read ^ "," ^ s_access false vb.v_write ^ ")"
-			in
-			"Inconsistent " ^ name ^ " for field " ^ f ^ " : " ^ stra ^ " should be " ^ strb
-		| _ ->
-			"Field " ^ f ^ " is " ^ s_kind a ^ " but should be " ^ s_kind b)
-	| Invalid_visibility n ->
-		"The field " ^ n ^ " is not public"
-	| Not_matching_optional n ->
-		"Optional attribute of parameter " ^ n ^ " differs"
-	| Cant_force_optional ->
-		"Optional parameters can't be forced"
-	| Invariant_parameter _ ->
-		"Type parameters are invariant"
-	| Constraint_failure name ->
-		"Constraint check failure for " ^ name
-	| Missing_overload (cf, t) ->
-		cf.cf_name ^ " has no overload for " ^ s_type ctx t
-	| Unify_custom msg ->
-		msg
-
-let rec error_msg = function
-	| Module_not_found m -> "Type not found : " ^ s_type_path m
-	| Type_not_found (m,t) -> "Module " ^ s_type_path m ^ " does not define type " ^ t
-	| Unify l ->
-		let ctx = print_context() in
-		String.concat "\n" (List.map (unify_error_msg ctx) l)
-	| Unknown_ident s -> "Unknown identifier : " ^ s
-	| Custom s -> s
-	| Stack (m1,m2) -> error_msg m1 ^ "\n" ^ error_msg m2
-	| Call_error err -> s_call_error err
-	| No_constructor mt -> (s_type_path (t_infos mt).mt_path ^ " does not have a constructor")
-
-and s_call_error = function
-	| Not_enough_arguments tl ->
-		let pctx = print_context() in
-		"Not enough arguments, expected " ^ (String.concat ", " (List.map (fun (n,_,t) -> n ^ ":" ^ (short_type pctx t)) tl))
-	| Too_many_arguments -> "Too many arguments"
-	| Could_not_unify err -> error_msg err
-	| Cannot_skip_non_nullable s -> "Cannot skip non-nullable argument " ^ s
-
-let error msg p = raise (Error (Custom msg,p))
-
-let raise_error err p = raise (Error(err,p))
\ No newline at end of file
diff --git a/src/typing/fields.ml b/src/typing/fields.ml
new file mode 100644
index 0000000000000000000000000000000000000000..dc6a84377c65ae9aaf0543d0398407e86c0c62d5
--- /dev/null
+++ b/src/typing/fields.ml
@@ -0,0 +1,623 @@
+open Globals
+open Common
+open Ast
+open Type
+open TyperBase
+open Error
+open Typecore
+
+module TypeFieldConfig = struct
+	type t = {
+		allow_resolve : bool;
+		do_resume : bool;
+	}
+
+	let allow_resolve cfg = cfg.allow_resolve
+
+	let do_resume cfg = cfg.do_resume
+
+	let default = {
+		allow_resolve = true;
+		do_resume = false;
+	}
+
+	let create resume = {
+		allow_resolve = true;
+		do_resume = resume;
+	}
+
+	let with_resume cfg = {cfg with do_resume = true}
+end
+
+(*
+	temporally remove the constant flag from structures to allow larger unification
+*)
+let remove_constant_flag t callb =
+	let tmp = ref [] in
+	let rec loop t =
+		match follow t with
+		| TAnon a ->
+			if !(a.a_status) = Const then begin
+				a.a_status := Closed;
+				tmp := a :: !tmp;
+			end;
+			PMap.iter (fun _ f -> loop f.cf_type) a.a_fields;
+		|  _ ->
+			()
+	in
+	let restore() =
+		List.iter (fun a -> a.a_status := Const) (!tmp)
+	in
+	try
+		loop t;
+		let ret = callb (!tmp <> []) in
+		restore();
+		ret
+	with e ->
+		restore();
+		raise e
+
+let check_constraints ctx tname tpl tl map delayed p =
+	List.iter2 (fun m (name,t) ->
+		match follow t with
+		| TInst ({ cl_kind = KTypeParameter constr },_) when constr <> [] ->
+			let f = (fun() ->
+				List.iter (fun ct ->
+					try
+						Type.unify (map m) (map ct)
+					with Unify_error l ->
+						let l = Constraint_failure (tname ^ "." ^ name) :: l in
+						raise (Unify_error l)
+				) constr
+			) in
+			if delayed then
+				delay ctx PCheckConstraint (fun () -> try f() with Unify_error l -> display_error ctx (error_msg (Unify l)) p)
+			else
+				f()
+		| _ ->
+			()
+	) tl tpl
+
+let enum_field_type ctx en ef tl_en tl_ef p =
+	let map t = apply_params en.e_params tl_en (apply_params ef.ef_params tl_ef t) in
+	begin try
+		check_constraints ctx (s_type_path en.e_path) en.e_params tl_en map true p;
+		check_constraints ctx ef.ef_name ef.ef_params tl_ef map true p;
+	with Unify_error l ->
+		display_error ctx (error_msg (Unify l)) p
+	end;
+	map ef.ef_type
+
+let add_constraint_checks ctx ctypes pl f tl p =
+	List.iter2 (fun m (name,t) ->
+		match follow t with
+		| TInst ({ cl_kind = KTypeParameter constr },_) when constr <> [] ->
+			let constr = List.map (fun t ->
+				let t = apply_params f.cf_params tl t in
+				(* only apply params if not static : in that case no param is passed *)
+				let t = (if pl = [] then t else apply_params ctypes pl t) in
+				t
+			) constr in
+			delay ctx PCheckConstraint (fun() ->
+				List.iter (fun ct ->
+					try
+						(* if has_mono m then raise (Unify_error [Unify_custom "Could not resolve full type for constraint checks"; Unify_custom ("Type was " ^ (s_type (print_context()) m))]); *)
+						Type.unify m ct
+					with Unify_error l ->
+						display_error ctx (error_msg (Unify (Constraint_failure (f.cf_name ^ "." ^ name) :: l))) p;
+				) constr
+			);
+		| _ -> ()
+	) tl f.cf_params
+
+let field_type ctx c pl f p =
+	match f.cf_params with
+	| [] -> f.cf_type
+	| l ->
+		let monos = List.map (fun _ -> mk_mono()) l in
+		if not (Meta.has Meta.Generic f.cf_meta) then add_constraint_checks ctx c.cl_params pl f monos p;
+		apply_params l monos f.cf_type
+
+let fast_enum_field e ef p =
+	let et = mk (TTypeExpr (TEnumDecl e)) (TAnon { a_fields = PMap.empty; a_status = ref (EnumStatics e) }) p in
+	TField (et,FEnum (e,ef))
+
+let get_constructor ctx c params p =
+	match c.cl_kind with
+	| KAbstractImpl a ->
+		let f = (try PMap.find "_new" c.cl_statics with Not_found -> raise_error (No_constructor (TAbstractDecl a)) p) in
+		let ct = field_type ctx c params f p in
+		apply_params a.a_params params ct, f
+	| _ ->
+		let ct, f = (try Type.get_constructor (fun f -> field_type ctx c params f p) c with Not_found -> raise_error (No_constructor (TClassDecl c)) p) in
+		apply_params c.cl_params params ct, f
+
+let check_constructor_access ctx c f p =
+	if (Meta.has Meta.CompilerGenerated f.cf_meta) then display_error ctx (error_msg (No_constructor (TClassDecl c))) p;
+	if not (can_access ctx c f true || is_parent c ctx.curclass) && not ctx.untyped then display_error ctx (Printf.sprintf "Cannot access private constructor of %s" (s_class_path c)) p
+
+let check_no_closure_meta ctx fa mode p =
+	if mode <> MCall && not (DisplayPosition.display_position#enclosed_in p) then begin
+		let check_field f cl_meta =
+			match f.cf_kind with
+			| Method _ ->
+				if
+					Meta.has Meta.NoClosure cl_meta
+					|| Meta.has Meta.NoClosure f.cf_meta
+				then
+					error ("Method " ^ f.cf_name ^ " cannot be used as a value") p
+			| _ -> ()
+		in
+		match fa with
+		| FStatic (c, ({ cf_kind = Method _} as f)) -> check_field f c.cl_meta
+		| FInstance (c, _, ({ cf_kind = Method _} as f)) -> check_field f c.cl_meta
+		| FClosure (Some (c, _), ({ cf_kind = Method _} as f)) -> check_field f c.cl_meta
+		| FClosure (None, ({ cf_kind = Method _} as f)) -> check_field f []
+		| FAnon ({ cf_kind = Method _} as f) -> check_field f []
+		| _ -> ()
+	end
+
+let field_access ctx mode f fmode t e p =
+	check_no_closure_meta ctx fmode mode p;
+	let bypass_accessor = if ctx.bypass_accessor > 0 then (ctx.bypass_accessor <- ctx.bypass_accessor - 1; true) else false in
+	let fnormal() = AKExpr (mk (TField (e,fmode)) t p) in
+	let normal() =
+		match follow e.etype with
+		| TAnon a ->
+			(match !(a.a_status) with
+			| EnumStatics en ->
+				let c = (try PMap.find f.cf_name en.e_constrs with Not_found -> assert false) in
+				let fmode = FEnum (en,c) in
+				AKExpr (mk (TField (e,fmode)) t p)
+			| _ -> fnormal())
+		| _ -> fnormal()
+	in
+	match f.cf_kind with
+	| Method m ->
+		if mode = MSet && m <> MethDynamic && not ctx.untyped then error "Cannot rebind this method : please use 'dynamic' before method declaration" p;
+		begin match ctx.curfun,e.eexpr with
+		| (FunMemberAbstract | FunMemberAbstractLocal),TTypeExpr(TClassDecl ({cl_kind = KAbstractImpl a} as c)) when c == ctx.curclass && Meta.has Meta.Impl f.cf_meta ->
+			let e = mk (TField(e,fmode)) t p in
+			let ethis = get_this ctx p in
+			let ethis = {ethis with etype = TAbstract(a,List.map snd a.a_params)} in
+			AKUsing(e,ctx.curclass,f,ethis,false)
+		| _ ->
+			(match m, mode with
+			| MethInline, _ -> AKInline (e,f,fmode,t)
+			| MethMacro, MGet -> display_error ctx "Macro functions must be called immediately" p; normal()
+			| MethMacro, MCall -> AKMacro (e,f)
+			| _ , MGet ->
+				let cmode = (match fmode with
+					| FInstance(_, _, cf) | FStatic(_, cf) when Meta.has Meta.Generic cf.cf_meta -> display_error ctx "Cannot create closure on generic function" p; fmode
+					| FInstance (c,tl,cf) -> FClosure (Some (c,tl),cf)
+					| FStatic _ | FEnum _ -> fmode
+					| FAnon f -> FClosure (None, f)
+					| FDynamic _ | FClosure _ -> assert false
+				) in
+				AKExpr (mk (TField (e,cmode)) t p)
+			| _ -> normal())
+		end
+	| Var v ->
+		match (match mode with MGet | MCall -> v.v_read | MSet -> v.v_write) with
+		| AccNo when not (Meta.has Meta.PrivateAccess ctx.meta) ->
+			(match follow e.etype with
+			| TInst (c,_) when is_parent c ctx.curclass || can_access ctx c { f with cf_flags = unset_flag f.cf_flags (int_of_class_field_flag CfPublic) } false -> normal()
+			| TAnon a ->
+				(match !(a.a_status) with
+				| Opened when mode = MSet ->
+					f.cf_kind <- Var { v with v_write = AccNormal };
+					normal()
+				| Statics c2 when ctx.curclass == c2 || can_access ctx c2 { f with cf_flags = unset_flag f.cf_flags (int_of_class_field_flag CfPublic) } true -> normal()
+				| _ -> if ctx.untyped then normal() else AKNo f.cf_name)
+			| _ ->
+				if ctx.untyped then normal() else AKNo f.cf_name)
+		| AccNormal | AccNo ->
+			(*
+				if we are reading from a read-only variable on an anonymous object, it might actually be a method, so make sure to create a closure
+			*)
+			let is_maybe_method() =
+				match v.v_write, follow t, follow e.etype with
+				| (AccNo | AccNever), TFun _, TAnon a ->
+					(match !(a.a_status) with
+					| Statics _ | EnumStatics _ -> false
+					| _ -> true)
+				| _ -> false
+			in
+			if mode = MGet && is_maybe_method() then
+				AKExpr (mk (TField (e,FClosure (None,f))) t p)
+			else
+				normal()
+		| AccCall | AccInline when ctx.in_display ->
+			normal()
+		| AccCall ->
+			let m = (match mode with MSet -> "set_" | _ -> "get_") ^ f.cf_name in
+			let is_abstract_this_access () = match e.eexpr,ctx.curfun with
+				| TTypeExpr (TClassDecl ({cl_kind = KAbstractImpl _} as c)),(FunMemberAbstract | FunMemberAbstractLocal) ->
+					c == ctx.curclass
+				| _ ->
+					false
+			in
+			let bypass_accessor =
+				bypass_accessor
+				||
+				(
+					m = ctx.curfield.cf_name
+					&&
+					match e.eexpr with
+					| TConst TThis -> true
+					| TLocal v -> Option.map_default (fun vthis -> v == vthis) false ctx.vthis
+					| TTypeExpr (TClassDecl c) when c == ctx.curclass -> true
+					| _ -> false
+				)
+			in
+			if bypass_accessor then
+				let prefix = (match ctx.com.platform with Flash when Common.defined ctx.com Define.As3 -> "$" | _ -> "") in
+				(match e.eexpr with TLocal _ when Common.defined ctx.com Define.Haxe3Compat -> ctx.com.warning "Field set has changed here in Haxe 4: call setter explicitly to keep Haxe 3.x behaviour" p | _ -> ());
+				if not (is_physical_field f) then begin
+					display_error ctx "This field cannot be accessed because it is not a real variable" p;
+					display_error ctx "Add @:isVar here to enable it" f.cf_pos;
+				end;
+				AKExpr (mk (TField (e,if prefix = "" then fmode else FDynamic (prefix ^ f.cf_name))) t p)
+			else if is_abstract_this_access() then begin
+				let this = get_this ctx p in
+				if mode = MSet then begin
+					let c,a = match ctx.curclass with {cl_kind = KAbstractImpl a} as c -> c,a | _ -> assert false in
+					let f = PMap.find m c.cl_statics in
+					(* we don't have access to the type parameters here, right? *)
+					(* let t = apply_params a.a_params pl (field_type ctx c [] f p) in *)
+					let t = (field_type ctx c [] f p) in
+					let ef = mk (TField (e,FStatic (c,f))) t p in
+					AKUsing (ef,c,f,this,false)
+				end else
+					AKExpr (make_call ctx (mk (TField (e,quick_field_dynamic e.etype m)) (tfun [this.etype] t) p) [this] t p)
+			end else if mode = MSet then
+				AKSet (e,t,f)
+			else
+				AKExpr (make_call ctx (mk (TField (e,quick_field_dynamic e.etype m)) (tfun [] t) p) [] t p)
+		| AccResolve ->
+			let fstring = mk (TConst (TString f.cf_name)) ctx.t.tstring p in
+			let tresolve = tfun [ctx.t.tstring] t in
+			AKExpr (make_call ctx (mk (TField (e,FDynamic "resolve")) tresolve p) [fstring] t p)
+		| AccNever ->
+			if ctx.untyped then normal() else AKNo f.cf_name
+		| AccInline ->
+			AKInline (e,f,fmode,t)
+		| AccCtor ->
+			if ctx.curfun = FunConstructor then normal() else AKNo f.cf_name
+		| AccRequire (r,msg) ->
+			match msg with
+			| None -> error_require r p
+			| Some msg -> error msg p
+
+let class_field ctx c tl name p =
+	raw_class_field (fun f -> field_type ctx c tl f p) c tl name
+
+let rec using_field ctx mode e i p =
+	if mode = MSet then raise Not_found;
+	(* do not try to find using fields if the type is a monomorph, which could lead to side-effects *)
+	let is_dynamic = match follow e.etype with
+		| TMono _ -> raise Not_found
+		| t -> t == t_dynamic
+	in
+	let check_constant_struct = ref false in
+	let rec loop = function
+	| [] ->
+		raise Not_found
+	| (c,pc) :: l ->
+		try
+			let cf = PMap.find i c.cl_statics in
+			if Meta.has Meta.NoUsing cf.cf_meta || not (can_access ctx c cf true) || (Meta.has Meta.Impl cf.cf_meta) then raise Not_found;
+			let monos = List.map (fun _ -> mk_mono()) cf.cf_params in
+			let map = apply_params cf.cf_params monos in
+			let t = map cf.cf_type in
+			begin match follow t with
+				| TFun((_,_,(TType({t_path = ["haxe";"macro"],"ExprOf"},[t0]) | t0)) :: args,r) ->
+					if is_dynamic && follow t0 != t_dynamic then raise Not_found;
+					let e = unify_static_extension ctx e t0 p in
+					(* early constraints check is possible because e.etype has no monomorphs *)
+					List.iter2 (fun m (name,t) -> match follow t with
+						| TInst ({ cl_kind = KTypeParameter constr },_) when constr <> [] && not (has_mono m) ->
+							List.iter (fun tc -> Type.unify m (map tc)) constr
+						| _ -> ()
+					) monos cf.cf_params;
+					let et = type_module_type ctx (TClassDecl c) None p in
+					ImportHandling.maybe_mark_import_position ctx pc;
+					AKUsing (mk (TField (et,FStatic (c,cf))) t p,c,cf,e,false)
+				| _ ->
+					raise Not_found
+			end
+		with Not_found ->
+			loop l
+		| Unify_error el | Error (Unify el,_) ->
+			if List.exists (function Has_extra_field _ -> true | _ -> false) el then check_constant_struct := true;
+			loop l
+	in
+	try
+		(* module using from `using Path` *)
+		loop ctx.m.module_using
+	with Not_found -> try
+		(* type using from `@:using(Path)` *)
+		let mt = module_type_of_type e.etype in
+		loop (t_infos mt).mt_using
+	with Not_found | Exit -> try
+		(* global using *)
+		let acc = loop ctx.g.global_using in
+		(match acc with
+		| AKUsing (_,c,_,_,_) -> add_dependency ctx.m.curmod c.cl_module
+		| _ -> assert false);
+		acc
+	with Not_found ->
+		if not !check_constant_struct then raise Not_found;
+		remove_constant_flag e.etype (fun ok -> if ok then using_field ctx mode e i p else raise Not_found)
+
+(* Resolves field [i] on typed expression [e] using the given [mode]. *)
+let rec type_field cfg ctx e i p mode =
+	let pfield = if (e.epos = p) then p else {p with pmin = p.pmax - (String.length i)} in
+	let no_field() =
+		if TypeFieldConfig.do_resume cfg then raise Not_found;
+		let t = match follow e.etype with
+			| TAnon a -> (match !(a.a_status) with
+				| Statics {cl_kind = KAbstractImpl a} -> TAbstract(a,[])
+				| _ -> e.etype)
+			| TInst({cl_kind = KAbstractImpl a},_) -> TAbstract(a,[])
+			| _ -> e.etype
+		in
+		let has_special_field a =
+			List.exists (fun (_,cf) -> cf.cf_name = i) a.a_ops
+			|| List.exists (fun (_,_,cf) -> cf.cf_name = i) a.a_unops
+			|| List.exists (fun cf -> cf.cf_name = i) a.a_array
+		in
+		if not ctx.untyped then begin
+			match t with
+			| TAbstract(a,_) when has_special_field a ->
+				(* the abstract field is not part of the field list, which is only true when it has no expression (issue #2344) *)
+				display_error ctx ("Field " ^ i ^ " cannot be called directly because it has no expression") pfield;
+			| _ ->
+				display_error ctx (StringError.string_error i (string_source t) (s_type (print_context()) t ^ " has no field " ^ i)) pfield;
+		end;
+		AKExpr (mk (TField (e,FDynamic i)) (mk_mono()) p)
+	in
+	let does_forward a stat =
+		try
+			let _,el,_ = Meta.get (if stat then Meta.ForwardStatics else Meta.Forward) a.a_meta in
+			match el with
+				| [] ->
+					true
+				| _ ->
+					List.exists (fun e -> match fst e with
+						| EConst(Ident s | String(s,_)) -> s = i
+						| _ -> error "Identifier or string expected as argument to @:forward" (pos e)
+					) el
+		with Not_found ->
+			false
+	in
+	match follow e.etype with
+	| TInst (c,params) ->
+		let rec loop_dyn c params =
+			match c.cl_dynamic with
+			| Some t ->
+				let t = apply_params c.cl_params params t in
+				if (mode = MGet || mode = MCall) && PMap.mem "resolve" c.cl_fields then begin
+					let f = PMap.find "resolve" c.cl_fields in
+					begin match f.cf_kind with
+						| Method MethMacro -> display_error ctx "The macro accessor is not allowed for field resolve" f.cf_pos
+						| _ -> ()
+					end;
+					let texpect = tfun [ctx.t.tstring] t in
+					let tfield = apply_params c.cl_params params (monomorphs f.cf_params f.cf_type) in
+					(try Type.unify tfield texpect
+					with Unify_error l ->
+						display_error ctx "Field resolve has an invalid type" f.cf_pos;
+						display_error ctx (error_msg (Unify [Cannot_unify(tfield,texpect)])) f.cf_pos);
+					AKExpr (make_call ctx (mk (TField (e,FInstance (c,params,f))) tfield p) [Texpr.type_constant ctx.com.basic (String(i,SDoubleQuotes)) p] t p)
+				end else
+					AKExpr (mk (TField (e,FDynamic i)) t p)
+			| None ->
+				match c.cl_super with
+				| None -> raise Not_found
+				| Some (c,params) -> loop_dyn c params
+		in
+		(try
+			let c2, t , f = class_field ctx c params i p in
+			if e.eexpr = TConst TSuper then (match mode,f.cf_kind with
+				| MGet,Var {v_read = AccCall }
+				| MSet,Var {v_write = AccCall }
+				| MCall,Var {v_read = AccCall } ->
+					()
+				| MCall, Var _ ->
+					display_error ctx "Cannot access superclass variable for calling: needs to be a proper method" pfield
+				| MCall, _ ->
+					()
+				| MGet,Var _
+				| MSet,Var _ when ctx.com.platform = Flash && (match c2 with Some ({ cl_extern = true }, _) -> true | _ -> false) ->
+					()
+				| _, Method _ ->
+					display_error ctx "Cannot create closure on super method" p
+				| _ ->
+					display_error ctx "Normal variables cannot be accessed with 'super', use 'this' instead" pfield);
+			if not (can_access ctx c f false) && not ctx.untyped then display_error ctx ("Cannot access private field " ^ i) pfield;
+			field_access ctx mode f (match c2 with None -> FAnon f | Some (c,tl) -> FInstance (c,tl,f)) (apply_params c.cl_params params t) e p
+		with Not_found -> try
+			begin match e.eexpr with
+				| TConst TSuper -> raise Not_found
+				| _ -> using_field ctx mode e i p
+			end
+		with Not_found -> try
+			loop_dyn c params
+		with Not_found -> try
+			(* if we have an abstract constraint we have to check its static fields and recurse (issue #2343) *)
+			begin match c.cl_kind with
+				| KTypeParameter tl ->
+					let rec loop tl = match tl with
+						| t :: tl ->
+							begin match follow t with
+								| TAbstract({a_impl = Some c},tl) when PMap.mem i c.cl_statics ->
+									let e = mk_cast e t p in
+									type_field cfg ctx e i p mode;
+								| _ ->
+									loop tl
+							end
+						| [] ->
+							raise Not_found
+					in
+					loop tl
+				| _ ->
+					raise Not_found
+			end
+		with Not_found ->
+			if PMap.mem i c.cl_statics then error ("Cannot access static field " ^ i ^ " from a class instance") pfield;
+			no_field())
+	| TDynamic t ->
+		(try
+			using_field ctx mode e i p
+		with Not_found ->
+			AKExpr (mk (TField (e,FDynamic i)) t p))
+	| TAnon a ->
+		(try
+			let f = PMap.find i a.a_fields in
+			if Meta.has Meta.Impl f.cf_meta && not (Meta.has Meta.Enum f.cf_meta) then display_error ctx "Cannot access non-static abstract field statically" pfield;
+			if not (has_class_field_flag f CfPublic) && not ctx.untyped then begin
+				match !(a.a_status) with
+				| Closed | Extend _ -> () (* always allow anon private fields access *)
+				| Statics c when can_access ctx c f true -> ()
+				| _ -> display_error ctx ("Cannot access private field " ^ i) pfield
+			end;
+			let fmode, ft = (match !(a.a_status) with
+				| Statics c -> FStatic (c,f), field_type ctx c [] f p
+				| EnumStatics e -> FEnum (e,try PMap.find f.cf_name e.e_constrs with Not_found -> assert false), Type.field_type f
+				| _ ->
+					match f.cf_params with
+					| [] ->
+						FAnon f, Type.field_type f
+					| l ->
+						(* handle possible constraints *)
+						let monos = List.map (fun _ -> mk_mono()) l in
+						let t = apply_params f.cf_params monos f.cf_type in
+						add_constraint_checks ctx [] [] f monos p;
+						FAnon f, t
+			) in
+			field_access ctx mode f fmode ft e p
+		with Not_found -> try
+				match !(a.a_status) with
+				| Statics {cl_kind = KAbstractImpl a} when does_forward a true ->
+					let mt = try module_type_of_type a.a_this with Exit -> raise Not_found in
+					let et = type_module_type ctx mt None p in
+					type_field cfg ctx et i p mode;
+				| _ ->
+					raise Not_found
+			with Not_found ->
+				if is_closed a then try
+					using_field ctx mode e i p
+				with Not_found ->
+					no_field()
+				else
+				let f = {
+					(mk_field i (mk_mono()) p null_pos) with
+					cf_kind = Var { v_read = AccNormal; v_write = (match mode with MSet -> AccNormal | MGet | MCall -> AccNo) };
+				} in
+				a.a_fields <- PMap.add i f a.a_fields;
+				field_access ctx mode f (FAnon f) (Type.field_type f) e p
+		)
+	| TMono r ->
+		let f = {
+			(mk_field i (mk_mono()) p null_pos) with
+			cf_kind = Var { v_read = AccNormal; v_write = (match mode with MSet -> AccNormal | MGet | MCall -> AccNo) };
+		} in
+		let x = ref Opened in
+		let t = TAnon { a_fields = PMap.add i f PMap.empty; a_status = x } in
+		ctx.opened <- x :: ctx.opened;
+		r := Some t;
+		field_access ctx mode f (FAnon f) (Type.field_type f) e p
+	| TAbstract (a,pl) ->
+		let static_abstract_access_through_instance = ref false in
+		(try
+			let c = (match a.a_impl with None -> raise Not_found | Some c -> c) in
+			let f = PMap.find i c.cl_statics in
+			if not (can_access ctx c f true) && not ctx.untyped then display_error ctx ("Cannot access private field " ^ i) pfield;
+			let field_type f =
+				if not (Meta.has Meta.Impl f.cf_meta) then begin
+					static_abstract_access_through_instance := true;
+					raise Not_found;
+				end;
+				let t = field_type ctx c [] f p in
+				apply_params a.a_params pl t
+			in
+			let et = type_module_type ctx (TClassDecl c) None p in
+			let field_expr f t = mk (TField (et,FStatic (c,f))) t p in
+			(match mode, f.cf_kind with
+			| (MGet | MCall), Var {v_read = AccCall } ->
+				(* getter call *)
+				let getter = PMap.find ("get_" ^ f.cf_name) c.cl_statics in
+				let t = field_type getter in
+				let r = match follow t with TFun(_,_) -> field_type f | _ -> raise Not_found in
+				let ef = field_expr getter t in
+				AKExpr(make_call ctx ef [e] r p)
+			| MSet, Var {v_write = AccCall } ->
+				let f = PMap.find ("set_" ^ f.cf_name) c.cl_statics in
+				let t = field_type f in
+				let ef = field_expr f t in
+				AKUsing (ef,c,f,e,false)
+			| (MGet | MCall), Var {v_read = AccNever} ->
+				AKNo f.cf_name
+			| (MGet | MCall), _ ->
+				let rec loop cfl = match cfl with
+					| [] -> error (Printf.sprintf "Field %s cannot be called on %s" f.cf_name (s_type (print_context()) e.etype)) pfield
+					| cf :: cfl ->
+						match follow (apply_params a.a_params pl (monomorphs cf.cf_params cf.cf_type)) with
+							| TFun((_,_,t1) :: _,_) when type_iseq t1 (Abstract.get_underlying_type a pl) ->
+								cf
+							| _ ->
+								loop cfl
+				in
+				let f = match f.cf_overloads with
+					| [] -> f
+					| cfl -> loop (f :: cfl)
+				in
+				let t = field_type f in
+				begin match follow t with
+					| TFun((_,_,t1) :: _,_) -> ()
+					| _ -> error ("Invalid call to static function " ^ i ^ " through abstract instance") pfield
+				end;
+				let ef = field_expr f t in
+				AKUsing (ef,c,f,e,false)
+			| MSet, _ ->
+				error "This operation is unsupported" p)
+		with Not_found -> try
+			if does_forward a false then
+				let underlying_type = Abstract.get_underlying_type ~return_first:true a pl in
+				type_field (TypeFieldConfig.with_resume cfg) ctx {e with etype = underlying_type} i p mode
+			else
+				raise Not_found
+		with Not_found -> try
+			using_field ctx mode e i p
+		with Not_found -> try
+			(match ctx.curfun, e.eexpr with
+			| FunMemberAbstract, TConst (TThis) -> type_field cfg ctx {e with etype = apply_params a.a_params pl a.a_this} i p mode;
+			| _ -> raise Not_found)
+		with Not_found -> try
+			let get_resolve is_write =
+				let c,cf = match a.a_impl,(if is_write then a.a_write else a.a_read) with
+					| Some c,Some cf -> c,cf
+					| _ -> raise Not_found
+				in
+				let et = type_module_type ctx (TClassDecl c) None p in
+				let t = apply_params a.a_params pl (field_type ctx c [] cf p) in
+				let ef = mk (TField (et,FStatic (c,cf))) t p in
+				let r = match follow t with
+					| TFun(_,r) -> r
+					| _ -> assert false
+				in
+				if is_write then
+					AKFieldSet(e,ef,i,r)
+				else
+					AKExpr ((!build_call_ref) ctx (AKUsing(ef,c,cf,e,false)) [EConst (String(i,SDoubleQuotes)),p] NoValue p)
+			in
+			if not (TypeFieldConfig.allow_resolve cfg) then raise Not_found;
+			get_resolve (mode = MSet)
+		with Not_found ->
+			if !static_abstract_access_through_instance then error ("Invalid call to static function " ^ i ^ " through abstract instance") pfield
+			else no_field())
+	| _ ->
+		try using_field ctx mode e i p with Not_found -> no_field()
+
+let type_field_default_cfg = type_field TypeFieldConfig.default
diff --git a/src/typing/finalization.ml b/src/typing/finalization.ml
new file mode 100644
index 0000000000000000000000000000000000000000..98af5a36a6afbb826514961d8bdc3b9a1b11b5cb
--- /dev/null
+++ b/src/typing/finalization.ml
@@ -0,0 +1,166 @@
+open Globals
+open Ast
+open Common
+open Type
+open Error
+open TyperBase
+open Typecore
+
+(* ---------------------------------------------------------------------- *)
+(* FINALIZATION *)
+
+let get_main ctx types =
+	match ctx.com.main_class with
+	| None -> None
+	| Some cl ->
+		let t = Typeload.load_type_def ctx null_pos { tpackage = fst cl; tname = snd cl; tparams = []; tsub = None } in
+		let fmode, ft, r = (match t with
+		| TEnumDecl _ | TTypeDecl _ | TAbstractDecl _ ->
+			error ("Invalid -main : " ^ s_type_path cl ^ " is not a class") null_pos
+		| TClassDecl c ->
+			try
+				let f = PMap.find "main" c.cl_statics in
+				let t = Type.field_type f in
+				(match follow t with
+				| TFun ([],r) -> FStatic (c,f), t, r
+				| _ -> error ("Invalid -main : " ^ s_type_path cl ^ " has invalid main function") c.cl_pos);
+			with
+				Not_found -> error ("Invalid -main : " ^ s_type_path cl ^ " does not have static function main") c.cl_pos
+		) in
+		let emain = type_type ctx cl null_pos in
+		let main = mk (TCall (mk (TField (emain,fmode)) ft null_pos,[])) r null_pos in
+		(* add haxe.EntryPoint.run() call *)
+		let main = (try
+			let et = List.find (fun t -> t_path t = (["haxe"],"EntryPoint")) types in
+			let ec = (match et with TClassDecl c -> c | _ -> assert false) in
+			let ef = PMap.find "run" ec.cl_statics in
+			let p = null_pos in
+			let et = mk (TTypeExpr et) (TAnon { a_fields = PMap.empty; a_status = ref (Statics ec) }) p in
+			let call = mk (TCall (mk (TField (et,FStatic (ec,ef))) ef.cf_type p,[])) ctx.t.tvoid p in
+			mk (TBlock [main;call]) ctx.t.tvoid p
+		with Not_found ->
+			main
+		) in
+		Some main
+
+let finalize ctx =
+	flush_pass ctx PFinal "final";
+	match ctx.com.callbacks#get_after_typing with
+		| [] ->
+			()
+		| fl ->
+			let rec loop handled_types =
+				let all_types = Hashtbl.fold (fun _ m acc -> m.m_types @ acc) ctx.g.modules [] in
+				match (List.filter (fun mt -> not (List.memq mt handled_types)) all_types) with
+				| [] ->
+					()
+				| new_types ->
+					List.iter (fun f -> f new_types) fl;
+					flush_pass ctx PFinal "final";
+					loop all_types
+			in
+			loop []
+
+type state =
+	| Generating
+	| Done
+	| NotYet
+
+let sort_types com modules =
+	let types = ref [] in
+	let states = Hashtbl.create 0 in
+	let state p = try Hashtbl.find states p with Not_found -> NotYet in
+	let statics = ref PMap.empty in
+
+	let rec loop t =
+		let p = t_path t in
+		match state p with
+		| Done -> ()
+		| Generating ->
+			com.warning ("Warning : maybe loop in static generation of " ^ s_type_path p) (t_infos t).mt_pos;
+		| NotYet ->
+			Hashtbl.add states p Generating;
+			let t = (match t with
+			| TClassDecl c ->
+				walk_class p c;
+				t
+			| TEnumDecl _ | TTypeDecl _ | TAbstractDecl _ ->
+				t
+			) in
+			Hashtbl.replace states p Done;
+			types := t :: !types
+
+	and loop_class p c =
+		if c.cl_path <> p then loop (TClassDecl c)
+
+	and loop_enum p e =
+		if e.e_path <> p then loop (TEnumDecl e)
+
+	and loop_abstract p a =
+		if a.a_path <> p then loop (TAbstractDecl a)
+
+	and walk_static_field p c cf =
+		match cf.cf_expr with
+		| None -> ()
+		| Some e ->
+			if PMap.mem (c.cl_path,cf.cf_name) (!statics) then
+				()
+			else begin
+				statics := PMap.add (c.cl_path,cf.cf_name) () (!statics);
+				walk_expr p e;
+			end
+
+	and walk_expr p e =
+		match e.eexpr with
+		| TTypeExpr t ->
+			(match t with
+			| TClassDecl c -> loop_class p c
+			| TEnumDecl e -> loop_enum p e
+			| TAbstractDecl a -> loop_abstract p a
+			| TTypeDecl _ -> assert false)
+		| TNew (c,_,_) ->
+			iter (walk_expr p) e;
+			loop_class p c;
+			let rec loop c =
+				if PMap.mem (c.cl_path,"new") (!statics) then
+					()
+				else begin
+					statics := PMap.add (c.cl_path,"new") () !statics;
+					(match c.cl_constructor with
+					| Some { cf_expr = Some e } -> walk_expr p e
+					| _ -> ());
+					match c.cl_super with
+					| None -> ()
+					| Some (csup,_) -> loop csup
+				end
+			in
+			loop c
+		| TField(e1,FStatic(c,cf)) ->
+			walk_expr p e1;
+			walk_static_field p c cf;
+		| _ ->
+			iter (walk_expr p) e
+
+	and walk_class p c =
+		(match c.cl_super with None -> () | Some (c,_) -> loop_class p c);
+		List.iter (fun (c,_) -> loop_class p c) c.cl_implements;
+		(match c.cl_init with
+		| None -> ()
+		| Some e -> walk_expr p e);
+		PMap.iter (fun _ f ->
+			match f.cf_expr with
+			| None -> ()
+			| Some e ->
+				match e.eexpr with
+				| TFunction _ -> ()
+				| _ -> walk_expr p e
+		) c.cl_statics
+
+	in
+	let sorted_modules = List.sort (fun m1 m2 -> compare m1.m_path m2.m_path) (Hashtbl.fold (fun _ m acc -> m :: acc) modules []) in
+	List.iter (fun m -> List.iter loop m.m_types) sorted_modules;
+	List.rev !types, sorted_modules
+
+let generate ctx =
+	let types,modules = sort_types ctx.com ctx.g.modules in
+	get_main ctx types,types,modules
diff --git a/src/typing/forLoop.ml b/src/typing/forLoop.ml
new file mode 100644
index 0000000000000000000000000000000000000000..e84b9722f8800c19c948ed5d0f0a96b4d9185067
--- /dev/null
+++ b/src/typing/forLoop.ml
@@ -0,0 +1,506 @@
+open Globals
+open Ast
+open Type
+open Common
+open Typecore
+open TyperBase
+open Fields
+open Error
+open Texpr.Builder
+
+let optimize_for_loop_iterator ctx v e1 e2 p =
+	let c,tl = (match follow e1.etype with TInst (c,pl) -> c,pl | _ -> raise Exit) in
+	let _, _, fhasnext = (try raw_class_field (fun cf -> apply_params c.cl_params tl cf.cf_type) c tl "hasNext" with Not_found -> raise Exit) in
+	if fhasnext.cf_kind <> Method MethInline then raise Exit;
+	let tmp = gen_local ctx e1.etype e1.epos in
+	let eit = mk (TLocal tmp) e1.etype p in
+	let ehasnext = make_call ctx (mk (TField (eit,FInstance (c, tl, fhasnext))) (TFun([],ctx.t.tbool)) p) [] ctx.t.tbool p in
+	let enext = mk (TVar (v,Some (make_call ctx (mk (TField (eit,quick_field_dynamic eit.etype "next")) (TFun ([],v.v_type)) p) [] v.v_type p))) ctx.t.tvoid p in
+	let eblock = (match e2.eexpr with
+		| TBlock el -> { e2 with eexpr = TBlock (enext :: el) }
+		| _ -> mk (TBlock [enext;e2]) ctx.t.tvoid p
+	) in
+	mk (TBlock [
+		mk (TVar (tmp,Some e1)) ctx.t.tvoid p;
+		mk (TWhile (ehasnext,eblock,NormalWhile)) ctx.t.tvoid p
+	]) ctx.t.tvoid p
+
+module IterationKind = struct
+	type t_kind =
+		| IteratorIntConst of texpr * texpr * bool (* ascending? *)
+		| IteratorIntUnroll of int * int * bool
+		| IteratorInt of texpr * texpr
+		| IteratorArrayDecl of texpr list
+		| IteratorArray
+		| IteratorArrayAccess
+		| IteratorGenericStack of tclass
+		| IteratorIterator
+		| IteratorCustom of (texpr -> texpr -> Type.t -> pos -> texpr) * (texpr -> pos -> texpr)
+		| IteratorAbstract of tvar * texpr * texpr
+		| IteratorDynamic
+
+	type t = {
+		it_kind : t_kind;
+		it_type : Type.t;
+		it_expr : texpr;
+	}
+
+	let type_field_config = {
+		Fields.TypeFieldConfig.do_resume = true;
+		allow_resolve = false;
+	}
+
+	let get_next_array_element arr iexpr pt p =
+		(mk (TArray (arr,iexpr)) pt p)
+
+	let check_iterator ?(resume=false) ?last_resort ctx s e p =
+		let t,pt = Typeload.t_iterator ctx in
+		let dynamic_iterator = ref None in
+		let e1 = try
+			let e = AbstractCast.cast_or_unify_raise ctx t e p in
+			match Abstract.follow_with_abstracts e.etype with
+			| TDynamic _ | TMono _ ->
+				(* try to find something better than a dynamic value to iterate on *)
+				dynamic_iterator := Some e;
+				raise (Error (Unify [Unify_custom "Avoid iterating on a dynamic value"], p))
+			| _ -> e
+		with Error (Unify _,_) ->
+			let try_last_resort after =
+				try
+					match last_resort with
+					| Some fn -> fn()
+					| None -> raise Not_found
+				with Not_found ->
+					after()
+			in
+			let try_acc acc =
+				let acc_expr = !build_call_ref ctx acc [] WithType.value e.epos in
+				try
+					unify_raise ctx acc_expr.etype t acc_expr.epos;
+					acc_expr
+				with Error (Unify(l),p) ->
+					try_last_resort (fun () ->
+						match !dynamic_iterator with
+						| Some e -> e
+						| None ->
+							if resume then raise Not_found;
+							display_error ctx "Field iterator has an invalid type" acc_expr.epos;
+							display_error ctx (error_msg (Unify l)) p;
+							mk (TConst TNull) t_dynamic p
+					)
+			in
+			try
+				let acc = type_field ({do_resume = true;allow_resolve = false}) ctx e s e.epos MCall in
+				try_acc acc;
+			with Not_found ->
+				try_last_resort (fun () ->
+					match !dynamic_iterator with
+					| Some e -> e
+					| None ->
+						let acc = type_field ({do_resume = resume;allow_resolve = false}) ctx e s e.epos MCall in
+						try_acc acc
+				)
+		in
+		e1,pt
+
+	let of_texpr_by_array_access ctx e p =
+		match follow e.etype with
+		| TInst({ cl_array_access = Some pt } as c,pl) when (try match follow (PMap.find "length" c.cl_fields).cf_type with TAbstract ({ a_path = [],"Int" },[]) -> true | _ -> false with Not_found -> false) && not (PMap.mem "iterator" c.cl_fields) ->
+			IteratorArrayAccess,e,apply_params c.cl_params pl pt
+		| TAbstract({a_impl = Some c} as a,tl) ->
+			let cf_length = PMap.find "get_length" c.cl_statics in
+			let get_length e p =
+				make_static_call ctx c cf_length (apply_params a.a_params tl) [e] ctx.com.basic.tint p
+			in
+			(match follow cf_length.cf_type with
+				| TFun(_,tr) ->
+					(match follow tr with
+						| TAbstract({a_path = [],"Int"},_) -> ()
+						| _ -> raise Not_found
+					)
+				| _ ->
+					raise Not_found
+			);
+			(try
+				(* first try: do we have an @:arrayAccess getter field? *)
+				let todo = mk (TConst TNull) ctx.t.tint p in
+				let cf,_,r,_,_ = AbstractCast.find_array_access_raise ctx a tl todo None p in
+				let get_next e_base e_index t p =
+					make_static_call ctx c cf (apply_params a.a_params tl) [e_base;e_index] r p
+				in
+				IteratorCustom(get_next,get_length),e,r
+			with Not_found ->
+				(* second try: do we have @:arrayAccess on the abstract itself? *)
+				if not (Meta.has Meta.ArrayAccess a.a_meta) then raise Not_found;
+				(* let's allow this only for core-type abstracts *)
+				if not (Meta.has Meta.CoreType a.a_meta) then raise Not_found;
+				(* in which case we assume that a singular type parameter is the element type *)
+				let t = match tl with [t] -> t | _ -> raise Not_found in
+				IteratorCustom(get_next_array_element,get_length),e,t
+			)
+	 	| _ -> raise Not_found
+
+	let of_texpr ?(resume=false) ctx e unroll p =
+		let dynamic_iterator e =
+			display_error ctx "You can't iterate on a Dynamic value, please specify Iterator or Iterable" e.epos;
+			IteratorDynamic,e,t_dynamic
+		in
+		let check_iterator () =
+			let array_access_result = ref None in
+			let last_resort () =
+				array_access_result := Some (of_texpr_by_array_access ctx e p);
+				mk (TConst TNull) t_dynamic p
+			in
+			let e1,pt = check_iterator ~resume ~last_resort ctx "iterator" e p in
+			match !array_access_result with
+			| Some result -> result
+			| None ->
+				match Abstract.follow_with_abstracts e1.etype with
+					| (TMono _ | TDynamic _) -> dynamic_iterator e1;
+					| _ -> (IteratorIterator,e1,pt)
+		in
+		let try_forward_array_iterator () =
+			match follow e.etype with
+			| TAbstract ({ a_this = (TInst ({ cl_path = [],"Array" }, [_]) as array_type)} as abstr, params) ->
+				let forwards_iterator =
+					match Meta.get Meta.Forward abstr.a_meta with
+					| (_, [], _) -> true
+					| (_, args, _) ->
+						List.exists (fun (arg,_) -> match arg with EConst (Ident"iterator") -> true | _ -> false ) args
+				in
+				if forwards_iterator then
+					match apply_params abstr.a_params params array_type with
+					| TInst({ cl_path = [],"Array" },[pt]) as t -> IteratorArray,(mk_cast e t e.epos),pt
+					| _ -> raise Not_found
+				else
+					raise Not_found
+			| _ -> raise Not_found
+		in
+		let it,e1,pt = match e.eexpr,follow e.etype with
+		| TNew ({ cl_path = ([],"IntIterator") },[],[efrom;eto]),_ ->
+			let it = match efrom.eexpr,eto.eexpr with
+				| TConst (TInt a),TConst (TInt b) ->
+					let diff = Int32.to_int (Int32.sub a b) in
+					let unroll = unroll (abs diff) in
+					if unroll then IteratorIntUnroll(Int32.to_int a,abs(diff),diff <= 0)
+					else IteratorIntConst(efrom,eto,diff <= 0)
+				| _ ->
+					let eto = match follow eto.etype with
+						| TAbstract ({ a_path = ([],"Int") }, []) -> eto
+						| _ -> { eto with eexpr = TCast(eto, None); etype = ctx.t.tint }
+					in
+					IteratorInt(efrom,eto)
+			in
+			it,e,ctx.t.tint
+		| TArrayDecl el,TInst({ cl_path = [],"Array" },[pt]) ->
+			let it = if unroll (List.length el) then IteratorArrayDecl el
+			else IteratorArray in
+			(it,e,pt)
+		| _,TInst({ cl_path = [],"Array" },[pt])
+		| _,TInst({ cl_path = ["flash"],"Vector" },[pt]) ->
+			IteratorArray,e,pt
+		| _,TAbstract({ a_impl = Some c },_) ->
+			(try
+				let v_tmp = gen_local ctx e.etype e.epos in
+				let e_tmp = make_local v_tmp v_tmp.v_pos in
+				let acc_next = type_field type_field_config ctx e_tmp "next" p MCall in
+				let acc_hasNext = type_field type_field_config ctx e_tmp "hasNext" p MCall in
+				(match acc_next, acc_hasNext with
+					| AKExpr({ eexpr = TField(_, FDynamic _)}), _
+					| _, AKExpr({ eexpr = TField(_, FDynamic _)}) -> raise Not_found
+					| _ -> ()
+				);
+				let e_next = !build_call_ref ctx acc_next [] WithType.value e.epos in
+				let e_hasNext = !build_call_ref ctx acc_hasNext [] WithType.value e.epos in
+				IteratorAbstract(v_tmp,e_next,e_hasNext),e,e_next.etype
+			with Not_found ->
+				(try try_forward_array_iterator ()
+				with Not_found -> check_iterator ())
+			)
+		| _, TAbstract _ ->
+			(try try_forward_array_iterator ()
+			with Not_found -> check_iterator ())
+		| _,TInst ({ cl_kind = KGenericInstance ({ cl_path = ["haxe";"ds"],"GenericStack" },[pt]) } as c,[]) ->
+			IteratorGenericStack c,e,pt
+		| _,(TMono _ | TDynamic _) ->
+			dynamic_iterator e
+		| _ ->
+			check_iterator ()
+		in
+		{
+			it_kind = it;
+			it_type = pt;
+			it_expr = e1;
+		}
+
+	let to_texpr ctx v iterator e2 p =
+		let e1,pt = iterator.it_expr,iterator.it_type in
+		let t_void = ctx.t.tvoid in
+		let t_int = ctx.t.tint in
+		let mk_field e n =
+			TField (e,try quick_field e.etype n with Not_found -> assert false)
+		in
+		let get_array_length arr p =
+			mk (mk_field arr "length") ctx.com.basic.tint p
+		in
+		let check_loop_var_modification vl e =
+			let rec loop e =
+				match e.eexpr with
+				| TBinop (OpAssign,{ eexpr = TLocal l },_)
+				| TBinop (OpAssignOp _,{ eexpr = TLocal l },_)
+				| TUnop (Increment,_,{ eexpr = TLocal l })
+				| TUnop (Decrement,_,{ eexpr = TLocal l })  when List.memq l vl ->
+					error "Loop variable cannot be modified" e.epos
+				| _ ->
+					Type.iter loop e
+			in
+			loop e
+		in
+		let gen_int_iter e1 pt f_get f_length =
+			let index = gen_local ctx t_int v.v_pos in
+			index.v_meta <- (Meta.ForLoopVariable,[],null_pos) :: index.v_meta;
+			let arr, avars = (match e1.eexpr with
+				| TLocal _ -> e1, None
+				| _ ->
+					let atmp = gen_local ctx e1.etype e1.epos in
+					mk (TLocal atmp) e1.etype e1.epos, (Some (atmp,Some e1))
+			) in
+			let iexpr = mk (TLocal index) t_int p in
+			let aget = mk (TVar (v,Some (f_get arr iexpr pt p))) t_void v.v_pos in
+			let incr = mk (TUnop (Increment,Prefix,iexpr)) t_int p in
+			let block = match e2.eexpr with
+				| TBlock el -> mk (TBlock (aget :: incr :: el)) t_void e2.epos
+				| _ -> mk (TBlock [aget;incr;e2]) t_void p
+			in
+			let ivar = Some (mk (TConst (TInt 0l)) t_int p) in
+			let elength = f_length arr p in
+			let el = [mk (TWhile (
+					mk (TBinop (OpLt, iexpr, elength)) ctx.t.tbool p,
+					block,
+					NormalWhile
+				)) t_void p;
+			] in
+			let el = match avars with None -> el | Some (v,eo) -> (mk (TVar (v,eo)) t_void p) :: el in
+			let el = (mk (TVar (index,ivar)) t_void p) :: el in
+			mk (TBlock el) t_void p
+		in
+		match iterator.it_kind with
+		| IteratorIntUnroll(offset,length,ascending) ->
+			check_loop_var_modification [v] e2;
+			if not ascending then error "Cannot iterate backwards" p;
+			let el = ExtList.List.init length (fun i ->
+				let ei = make_int ctx.t (if ascending then i + offset else offset - i) p in
+				let rec loop e = match e.eexpr with
+					| TLocal v' when v == v' -> {ei with epos = e.epos}
+					| _ -> map_expr loop e
+				in
+				let e2 = loop e2 in
+				Texpr.duplicate_tvars e2
+			) in
+			mk (TBlock el) t_void p
+		| IteratorIntConst(a,b,ascending) ->
+			check_loop_var_modification [v] e2;
+			if not ascending then error "Cannot iterate backwards" p;
+			let v_index = gen_local ctx t_int p in
+			let evar_index = mk (TVar(v_index,Some a)) t_void p in
+			let ev_index = make_local v_index p in
+			let op1,op2 = if ascending then (OpLt,Increment) else (OpGt,Decrement) in
+			let econd = binop op1 ev_index b ctx.t.tbool p in
+			let ev_incr = mk (TUnop(op2,Postfix,ev_index)) t_int p in
+			let evar = mk (TVar(v,Some ev_incr)) t_void p in
+			let e2 = concat evar e2 in
+			let ewhile = mk (TWhile(econd,e2,NormalWhile)) t_void p in
+			mk (TBlock [
+				evar_index;
+				ewhile;
+			]) t_void p
+		| IteratorInt(a,b) ->
+			check_loop_var_modification [v] e2;
+			let v_index = gen_local ctx t_int p in
+			let evar_index = mk (TVar(v_index,Some a)) t_void p in
+			let ev_index = make_local v_index p in
+			let v_b = gen_local ctx b.etype b.epos in
+			let evar_b = mk (TVar (v_b,Some b)) t_void p in
+			let ev_b = make_local v_b b.epos in
+			let econd = binop OpLt ev_index ev_b ctx.t.tbool p in
+			let ev_incr = mk (TUnop(Increment,Postfix,ev_index)) t_int p in
+			let evar = mk (TVar(v,Some ev_incr)) t_void p in
+			let e2 = concat evar e2 in
+			let ewhile = mk (TWhile(econd,e2,NormalWhile)) t_void p in
+			mk (TBlock [
+				evar_index;
+				evar_b;
+				ewhile;
+			]) t_void p
+		| IteratorArrayDecl el ->
+			let el = List.map (fun e ->
+				let ev = mk (TVar(v,Some e)) t_void e.epos in
+				let e = concat ev e2 in
+				Texpr.duplicate_tvars e
+			) el in
+			mk (TBlock el) t_void p
+		| IteratorArray | IteratorArrayAccess ->
+			gen_int_iter e1 pt get_next_array_element get_array_length
+		| IteratorCustom(f_next,f_length) ->
+			gen_int_iter e1 pt f_next f_length
+		| IteratorIterator ->
+			begin try optimize_for_loop_iterator ctx v e1 e2 p
+			with Exit -> mk (TFor(v,e1,e2)) t_void p end
+		| IteratorGenericStack c ->
+			let tcell = (try (PMap.find "head" c.cl_fields).cf_type with Not_found -> assert false) in
+			let cell = gen_local ctx tcell p in
+			let cexpr = mk (TLocal cell) tcell p in
+			let evar = mk (TVar (v,Some (mk (mk_field cexpr "elt") pt p))) t_void v.v_pos in
+			let enext = mk (TBinop (OpAssign,cexpr,mk (mk_field cexpr "next") tcell p)) tcell p in
+			let block = match e2.eexpr with
+				| TBlock el -> mk (TBlock (evar :: enext :: el)) t_void e2.epos
+				| _ -> mk (TBlock [evar;enext;e2]) t_void p
+			in
+			mk (TBlock [
+				mk (TVar (cell,Some (mk (mk_field e1 "head") tcell p))) t_void p;
+				mk (TWhile (
+					mk (TBinop (OpNotEq, cexpr, mk (TConst TNull) tcell p)) ctx.t.tbool p,
+					block,
+					NormalWhile
+				)) t_void p
+			]) t_void p
+		| IteratorAbstract(v_tmp,e_next,e_hasNext) ->
+			let evar = mk (TVar(v,Some e_next)) t_void p in
+			let e2 = concat evar e2 in
+			let ewhile = mk (TWhile(e_hasNext,e2,NormalWhile)) t_void p in
+			mk (TBlock [
+				mk (TVar(v_tmp,Some e1)) t_void p;
+				ewhile;
+			]) t_void p
+		| IteratorDynamic ->
+			mk (TFor(v,e1,e2)) t_void p
+end
+
+let is_cheap_enough ctx e2 i =
+	let num_expr = ref 0 in
+	let rec loop e = match fst e with
+		| EContinue | EBreak ->
+			raise Exit
+		| _ ->
+			incr num_expr;
+			Ast.map_expr loop e
+	in
+	try
+		if ctx.com.display.dms_kind <> DMNone then raise Exit;
+		ignore(loop e2);
+		let cost = i * !num_expr in
+		let max_cost = try
+			int_of_string (Common.defined_value ctx.com Define.LoopUnrollMaxCost)
+		with Not_found ->
+			250
+		in
+		cost <= max_cost
+	with Exit ->
+		false
+
+let is_cheap_enough_t ctx e2 i =
+	let num_expr = ref 0 in
+	let rec loop e = match e.eexpr with
+		| TContinue | TBreak ->
+			raise Exit
+		| _ ->
+			incr num_expr;
+			Type.map_expr loop e
+	in
+	try
+		if ctx.com.display.dms_kind <> DMNone then raise Exit;
+		ignore(loop e2);
+		let cost = i * !num_expr in
+		let max_cost = try
+			int_of_string (Common.defined_value ctx.com Define.LoopUnrollMaxCost)
+		with Not_found ->
+			250
+		in
+		cost <= max_cost
+	with Exit ->
+		false
+
+type iteration_ident = string * pos * display_kind option
+
+type iteration_kind =
+	| IKNormal of iteration_ident
+	| IKKeyValue of iteration_ident * iteration_ident
+
+let type_for_loop ctx handle_display it e2 p =
+	let rec loop_ident dko e1 = match e1 with
+		| EConst(Ident i),p -> i,p,dko
+		| EDisplay(e1,dk),_ -> loop_ident (Some dk) e1
+		| _ -> error "Identifier expected" (pos e1)
+	in
+	let rec loop dko e1 = match fst e1 with
+		| EBinop(OpIn,e1,e2) ->
+			begin match fst e1 with
+			| EBinop(OpArrow,ei1,ei2) -> IKKeyValue(loop_ident None ei1,loop_ident None ei2),e2
+			| _ -> IKNormal (loop_ident dko e1),e2
+			end
+		| EDisplay(e1,dk) -> loop (Some dk) e1
+		| EBinop(OpArrow,ei1,(EBinop(OpIn,ei2,e2),_)) -> IKKeyValue(loop_ident None ei1,loop_ident None ei2),e2
+		| _ ->
+			begin match dko with
+			| Some dk -> ignore(handle_display ctx e1 dk WithType.value);
+			| None -> ()
+			end;
+			error "For expression should be 'v in expr'" (snd it)
+	in
+	let ik,e1 = loop None it in
+	let e1 = type_expr ctx e1 WithType.value in
+	let old_loop = ctx.in_loop in
+	let old_locals = save_locals ctx in
+	ctx.in_loop <- true;
+	let e2 = Expr.ensure_block e2 in
+	let check_display (i,pi,dko) = match dko with
+		| None -> ()
+		| Some dk -> ignore(handle_display ctx (EConst(Ident i.v_name),i.v_pos) dk (WithType.with_type i.v_type))
+	in
+	match ik with
+	| IKNormal(i,pi,dko) ->
+		let iterator = IterationKind.of_texpr ctx e1 (is_cheap_enough ctx e2) p in
+		let i = add_local_with_origin ctx TVOForVariable i iterator.it_type pi in
+		let e2 = type_expr ctx e2 NoValue in
+		check_display (i,pi,dko);
+		ctx.in_loop <- old_loop;
+		old_locals();
+		begin try
+			IterationKind.to_texpr ctx i iterator e2 p
+		with Exit ->
+			mk (TFor (i,iterator.it_expr,e2)) ctx.t.tvoid p
+		end
+	| IKKeyValue((ikey,pkey,dkokey),(ivalue,pvalue,dkovalue)) ->
+		let e1,pt = IterationKind.check_iterator ctx "keyValueIterator" e1 e1.epos in
+		begin match follow e1.etype with
+		| TDynamic _ | TMono _ -> display_error ctx "You can't iterate on a Dynamic value, please specify KeyValueIterator or KeyValueIterable" e1.epos;
+		| _ -> ()
+		end;
+		let vtmp = gen_local ctx e1.etype e1.epos in
+		let etmp = make_local vtmp vtmp.v_pos in
+		let ehasnext = !build_call_ref ctx (type_field_default_cfg ctx etmp "hasNext" etmp.epos MCall) [] WithType.value etmp.epos in
+		let enext = !build_call_ref ctx (type_field_default_cfg ctx etmp "next" etmp.epos MCall) [] WithType.value etmp.epos in
+		let v = gen_local ctx pt e1.epos in
+		let ev = make_local v v.v_pos in
+		let ekey = Calls.acc_get ctx (type_field_default_cfg ctx ev "key" ev.epos MGet) ev.epos in
+		let evalue = Calls.acc_get ctx (type_field_default_cfg ctx ev "value" ev.epos MGet) ev.epos in
+		let vkey = add_local_with_origin ctx TVOForVariable ikey ekey.etype pkey in
+		let vvalue = add_local_with_origin ctx TVOForVariable ivalue evalue.etype pvalue in
+		let e2 = type_expr ctx e2 NoValue in
+		check_display (vkey,pkey,dkokey);
+		check_display (vvalue,pvalue,dkovalue);
+		let ebody = mk (TBlock [
+			mk (TVar(v,Some enext)) ctx.t.tvoid enext.epos;
+			mk (TVar(vkey,Some ekey)) ctx.t.tvoid ekey.epos;
+			mk (TVar(vvalue,Some evalue)) ctx.t.tvoid evalue.epos;
+			e2;
+		]) ctx.t.tvoid e2.epos in
+		let e = mk (TBlock [
+			mk (TVar(vtmp,Some e1)) ctx.t.tvoid e1.epos;
+			mk (TWhile(ehasnext,ebody,NormalWhile)) ctx.t.tvoid p;
+		]) ctx.t.tvoid p in
+		ctx.in_loop <- old_loop;
+		old_locals();
+		e
+
+
diff --git a/src/typing/generic.ml b/src/typing/generic.ml
new file mode 100644
index 0000000000000000000000000000000000000000..c22e714b9f56f50b4fba24cb13fd88e428bc326a
--- /dev/null
+++ b/src/typing/generic.ml
@@ -0,0 +1,309 @@
+open Globals
+open DisplayTypes.DisplayMode
+open Common
+open Ast
+open Type
+open Typecore
+open Error
+
+exception Generic_Exception of string * pos
+
+type generic_context = {
+	ctx : typer;
+	subst : (t * (t * texpr option)) list;
+	name : string;
+	p : pos;
+	mutable mg : module_def option;
+}
+
+let generic_check_const_expr ctx t =
+	match follow t with
+	| TInst({cl_kind = KExpr e},_) ->
+		let e = type_expr {ctx with locals = PMap.empty} e WithType.value in
+		e.etype,Some e
+	| _ -> t,None
+
+let make_generic ctx ps pt p =
+	let rec loop l1 l2 =
+		match l1, l2 with
+		| [] , [] -> []
+		| (x,TLazy f) :: l1, _ -> loop ((x,lazy_type f) :: l1) l2
+		| (_,t1) :: l1 , t2 :: l2 ->
+			let t,eo = generic_check_const_expr ctx t2 in
+			(t1,(t,eo)) :: loop l1 l2
+		| _ -> assert false
+	in
+	let name =
+		String.concat "_" (List.map2 (fun (s,_) t ->
+			let rec subst s = "_" ^ string_of_int (Char.code (String.get (Str.matched_string s) 0)) ^ "_" in
+			let ident_safe = Str.global_substitute (Str.regexp "[^a-zA-Z0-9_]") subst in
+			let s_type_path_underscore (p,s) = match p with [] -> s | _ -> String.concat "_" p ^ "_" ^ s in
+			let rec loop top t = match follow t with
+				| TInst(c,tl) -> (match c.cl_kind with
+					| KExpr e -> ident_safe (Ast.Printer.s_expr e)
+					| _ -> (ident_safe (s_type_path_underscore c.cl_path)) ^ (loop_tl tl))
+				| TEnum(en,tl) -> (s_type_path_underscore en.e_path) ^ (loop_tl tl)
+				| TAnon(a) -> "anon_" ^ String.concat "_" (PMap.foldi (fun s f acc -> (s ^ "_" ^ (loop false (follow f.cf_type))) :: acc) a.a_fields [])
+				| TFun(args, return_type) -> "func_" ^ (String.concat "_" (List.map (fun (_, _, t) -> loop false t) args)) ^ "_" ^ (loop false return_type)
+				| TAbstract(a,tl) -> (s_type_path_underscore a.a_path) ^ (loop_tl tl)
+				| _ when not top -> "_" (* allow unknown/incompatible types as type parameters to retain old behavior *)
+				| TMono _ -> raise (Generic_Exception (("Could not determine type for parameter " ^ s), p))
+				| TDynamic _ -> "Dynamic"
+				| t -> raise (Generic_Exception (("Unsupported type parameter: " ^ (s_type (print_context()) t) ^ ")"), p))
+			and loop_tl tl = match tl with
+				| [] -> ""
+				| tl -> "_" ^ String.concat "_" (List.map (loop false) tl)
+			in
+			loop true t
+		) ps pt)
+	in
+	{
+		ctx = ctx;
+		subst = loop ps pt;
+		name = name;
+		p = p;
+		mg = None;
+	}
+
+let rec generic_substitute_type gctx t =
+	match t with
+	| TInst ({ cl_kind = KGeneric } as c2,tl2) ->
+		(* maybe loop, or generate cascading generics *)
+		let _, _, f = gctx.ctx.g.do_build_instance gctx.ctx (TClassDecl c2) gctx.p in
+		let t = f (List.map (generic_substitute_type gctx) tl2) in
+		(match follow t,gctx.mg with TInst(c,_), Some m -> add_dependency m c.cl_module | _ -> ());
+		t
+	| _ ->
+		try
+			let t,_ = List.assq t gctx.subst in
+			generic_substitute_type gctx t
+		with Not_found ->
+			Type.map (generic_substitute_type gctx) t
+
+let generic_substitute_expr gctx e =
+	let vars = Hashtbl.create 0 in
+	let build_var v =
+		try
+			Hashtbl.find vars v.v_id
+		with Not_found ->
+			let v2 = alloc_var v.v_kind v.v_name (generic_substitute_type gctx v.v_type) v.v_pos in
+			v2.v_meta <- v.v_meta;
+			Hashtbl.add vars v.v_id v2;
+			v2
+	in
+	let rec build_expr e =
+		match e.eexpr with
+		| TField(e1, FInstance({cl_kind = KGeneric} as c,tl,cf)) ->
+			let _, _, f = gctx.ctx.g.do_build_instance gctx.ctx (TClassDecl c) gctx.p in
+			let t = f (List.map (generic_substitute_type gctx) tl) in
+			begin match follow t with
+			| TInst(c',_) when c == c' ->
+				(* The @:generic class wasn't expanded, let's not recurse to avoid infinite loop (#6430) *)
+				map_expr_type build_expr (generic_substitute_type gctx) build_var e
+			| _ ->
+				let fa = try
+					quick_field t cf.cf_name
+				with Not_found ->
+					error (Printf.sprintf "Type %s has no field %s (possible typing order issue)" (s_type (print_context()) t) cf.cf_name) e.epos
+				in
+				build_expr {e with eexpr = TField(e1,fa)}
+			end;
+		| TTypeExpr (TClassDecl ({cl_kind = KTypeParameter _;} as c)) when Meta.has Meta.Const c.cl_meta ->
+			let rec loop subst = match subst with
+				| (t1,(_,eo)) :: subst ->
+					begin match follow t1 with
+						| TInst(c2,_) when c == c2 -> eo
+						| _ -> loop subst
+					end
+				| [] -> raise Not_found
+			in
+			begin try
+				let eo = loop gctx.subst in
+				begin match eo with
+					| Some e -> e
+					| None -> error "Only Const type parameters can be used as value" e.epos
+				end
+			with Not_found ->
+				e
+			end
+		| _ ->
+			map_expr_type build_expr (generic_substitute_type gctx) build_var e
+	in
+	build_expr e
+
+let get_short_name =
+	let i = ref (-1) in
+	(fun () ->
+		incr i;
+		Printf.sprintf "Hx___short___hx_type_%i" !i
+	)
+
+let rec build_generic ctx c p tl =
+	let pack = fst c.cl_path in
+	let recurse = ref false in
+	let rec check_recursive t =
+		match follow t with
+		| TInst (c2,tl) ->
+			(match c2.cl_kind with
+			| KTypeParameter tl ->
+				if not (TypeloadCheck.is_generic_parameter ctx c2) && has_ctor_constraint c2 then
+					error "Type parameters with a constructor cannot be used non-generically" p;
+				recurse := true
+			| _ -> ());
+			List.iter check_recursive tl;
+		| _ ->
+			()
+	in
+	List.iter check_recursive tl;
+	if !recurse || not (ctx.com.display.dms_full_typing) then begin
+		TInst (c,tl) (* build a normal instance *)
+	end else begin
+	let gctx = make_generic ctx c.cl_params tl p in
+	let name = (snd c.cl_path) ^ "_" ^ gctx.name in
+	try
+		let t = Typeload.load_instance ctx ({ tpackage = pack; tname = name; tparams = []; tsub = None },p) false in
+		match t with
+		| TInst({ cl_kind = KGenericInstance (csup,_) },_) when c == csup -> t
+		| _ -> error ("Cannot specialize @:generic because the generated type name is already used: " ^ name) p
+	with Error(Module_not_found path,_) when path = (pack,name) ->
+		let m = (try Hashtbl.find ctx.g.modules (Hashtbl.find ctx.g.types_module c.cl_path) with Not_found -> assert false) in
+		(* let ctx = { ctx with m = { ctx.m with module_types = m.m_types @ ctx.m.module_types } } in *)
+		ignore(c.cl_build()); (* make sure the super class is already setup *)
+		let mg = {
+			m_id = alloc_mid();
+			m_path = (pack,name);
+			m_types = [];
+			m_extra = module_extra (s_type_path (pack,name)) m.m_extra.m_sign 0. MFake m.m_extra.m_check_policy;
+		} in
+		gctx.mg <- Some mg;
+		let cg = mk_class mg (pack,name) c.cl_pos null_pos in
+		mg.m_types <- [TClassDecl cg];
+		Hashtbl.add ctx.g.modules mg.m_path mg;
+		add_dependency mg m;
+		add_dependency ctx.m.curmod mg;
+		(* ensure that type parameters are set in dependencies *)
+		let dep_stack = ref [] in
+		let rec loop t =
+			if not (List.memq t !dep_stack) then begin
+			dep_stack := t :: !dep_stack;
+			match t with
+			| TInst (c,tl) -> add_dep c.cl_module tl
+			| TEnum (e,tl) -> add_dep e.e_module tl
+			| TType (t,tl) -> add_dep t.t_module tl
+			| TAbstract (a,tl) -> add_dep a.a_module tl
+			| TMono r ->
+				(match !r with
+				| None -> ()
+				| Some t -> loop t)
+			| TLazy f ->
+				loop (lazy_type f);
+			| TDynamic t2 ->
+				if t == t2 then () else loop t2
+			| TAnon a ->
+				PMap.iter (fun _ f -> loop f.cf_type) a.a_fields
+			| TFun (args,ret) ->
+				List.iter (fun (_,_,t) -> loop t) args;
+				loop ret
+			end
+		and add_dep m tl =
+			add_dependency mg m;
+			List.iter loop tl
+		in
+		List.iter loop tl;
+		let build_field cf_old =
+			(* We have to clone the type parameters (issue #4672). We cannot substitute the constraints immediately because
+			   we need the full substitution list first. *)
+			let param_subst,params = List.fold_left (fun (subst,params) (s,t) -> match follow t with
+				| TInst(c,tl) as t ->
+					let t2 = TInst({c with cl_module = mg;},tl) in
+					(t,(t2,None)) :: subst,(s,t2) :: params
+				| _ -> assert false
+			) ([],[]) cf_old.cf_params in
+			let gctx = {gctx with subst = param_subst @ gctx.subst} in
+			let cf_new = {cf_old with cf_pos = cf_old.cf_pos} in (* copy *)
+			(* Type parameter constraints are substituted here. *)
+			cf_new.cf_params <- List.rev_map (fun (s,t) -> match follow t with
+				| TInst({cl_kind = KTypeParameter tl1} as c,_) ->
+					let tl1 = List.map (generic_substitute_type gctx) tl1 in
+					c.cl_kind <- KTypeParameter tl1;
+					s,t
+				| _ -> assert false
+			) params;
+			let f () =
+				let t = generic_substitute_type gctx cf_old.cf_type in
+				ignore (follow t);
+				begin try (match cf_old.cf_expr with
+					| None ->
+						begin match cf_old.cf_kind with
+							| Method _ when not c.cl_interface && not c.cl_extern ->
+								display_error ctx (Printf.sprintf "Field %s has no expression (possible typing order issue)" cf_new.cf_name) cf_new.cf_pos;
+								display_error ctx (Printf.sprintf "While building %s" (s_type_path cg.cl_path)) p;
+							| _ ->
+								()
+						end
+					| Some e ->
+						cf_new.cf_expr <- Some (generic_substitute_expr gctx e)
+				) with Unify_error l ->
+					error (error_msg (Unify l)) cf_new.cf_pos
+				end;
+				t
+			in
+			let r = exc_protect ctx (fun r ->
+				let t = mk_mono() in
+				r := lazy_processing (fun() -> t);
+				let t0 = f() in
+				unify_raise ctx t0 t p;
+				link_dynamic t0 t;
+				t
+			) "build_generic" in
+			cf_new.cf_type <- TLazy r;
+			cf_new
+		in
+		if c.cl_init <> None then error "This class can't be generic" p;
+		List.iter (fun cf -> match cf.cf_kind with
+			| Method MethMacro when not ctx.in_macro -> ()
+			| _ -> error "A generic class can't have static fields" cf.cf_pos
+		) c.cl_ordered_statics;
+		cg.cl_super <- (match c.cl_super with
+			| None -> None
+			| Some (cs,pl) ->
+				let ts = follow (apply_params c.cl_params tl (TInst(cs,pl))) in
+				let cs,pl = TypeloadCheck.Inheritance.check_extends ctx c ts p in
+				match cs.cl_kind with
+				| KGeneric ->
+					(match build_generic ctx cs p pl with
+					| TInst (cs,pl) -> Some (cs,pl)
+					| _ -> assert false)
+				| _ -> Some(cs,pl)
+		);
+		TypeloadFunction.add_constructor ctx cg false p;
+		cg.cl_kind <- KGenericInstance (c,tl);
+		cg.cl_meta <- (Meta.NoDoc,[],null_pos) :: cg.cl_meta;
+		if has_meta Meta.Keep c.cl_meta then cg.cl_meta <- (Meta.Keep,[],null_pos) :: cg.cl_meta;
+		cg.cl_interface <- c.cl_interface;
+		cg.cl_constructor <- (match cg.cl_constructor, c.cl_constructor, c.cl_super with
+			| _, Some cf, _ -> Some (build_field cf)
+			| Some ctor, _, _ -> Some ctor
+			| None, None, None -> None
+			| _ -> error "Please define a constructor for this class in order to use it as generic" c.cl_pos
+		);
+		cg.cl_implements <- List.map (fun (i,tl) ->
+			(match follow (generic_substitute_type gctx (TInst (i, List.map (generic_substitute_type gctx) tl))) with
+			| TInst (i,tl) -> i, tl
+			| _ -> assert false)
+		) c.cl_implements;
+		cg.cl_ordered_fields <- List.map (fun f ->
+			let f = build_field f in
+			cg.cl_fields <- PMap.add f.cf_name f cg.cl_fields;
+			f
+		) c.cl_ordered_fields;
+		cg.cl_overrides <- List.map (fun f ->
+			try PMap.find f.cf_name cg.cl_fields with Not_found -> assert false
+		) c.cl_overrides;
+		(* In rare cases the class name can become too long, so let's shorten it (issue #3090). *)
+		if String.length (snd cg.cl_path) > 254 then begin
+			let n = get_short_name () in
+			cg.cl_meta <- (Meta.Native,[EConst(String (n,SDoubleQuotes)),p],null_pos) :: cg.cl_meta;
+		end;
+		TInst (cg,[])
+	end
diff --git a/src/typing/instanceBuilder.ml b/src/typing/instanceBuilder.ml
new file mode 100644
index 0000000000000000000000000000000000000000..a999fdc130b923abd0451b6cf3230fe5857896da
--- /dev/null
+++ b/src/typing/instanceBuilder.ml
@@ -0,0 +1,103 @@
+open Globals
+open Ast
+open Typecore
+open Type
+open Error
+
+let get_macro_path ctx e args p =
+	let rec loop e =
+		match fst e with
+		| EField (e,f) -> f :: loop e
+		| EConst (Ident i) -> [i]
+		| _ -> error "Invalid macro call" p
+	in
+	let path = match e with
+		| (EConst(Ident i)),_ ->
+			let path = try
+				if not (PMap.mem i ctx.curclass.cl_statics) then raise Not_found;
+				ctx.curclass.cl_path
+			with Not_found -> try
+				(t_infos (let path,_,_ = PMap.find i ctx.m.module_globals in path)).mt_path
+			with Not_found ->
+				error "Invalid macro call" p
+			in
+			i :: (snd path) :: (fst path)
+		| _ ->
+			loop e
+	in
+	(match path with
+	| meth :: cl :: path -> (List.rev path,cl), meth, args
+	| _ -> error "Invalid macro call" p)
+
+let build_macro_type ctx pl p =
+	let path, field, args = (match pl with
+		| [TInst ({ cl_kind = KExpr (ECall (e,args),_) },_)]
+		| [TInst ({ cl_kind = KExpr (EArrayDecl [ECall (e,args),_],_) },_)] ->
+			get_macro_path ctx e args p
+		| _ ->
+			error "MacroType requires a single expression call parameter" p
+	) in
+	let old = ctx.ret in
+	let t = (match ctx.g.do_macro ctx MMacroType path field args p with
+		| None -> mk_mono()
+		| Some _ -> ctx.ret
+	) in
+	ctx.ret <- old;
+	t
+
+let build_macro_build ctx c pl cfl p =
+	let path, field, args = match Meta.get Meta.GenericBuild c.cl_meta with
+		| _,[ECall(e,args),_],_ -> get_macro_path ctx e args p
+		| _ -> error "genericBuild requires a single expression call parameter" p
+	in
+	let old = ctx.ret,ctx.get_build_infos in
+	ctx.get_build_infos <- (fun() -> Some (TClassDecl c, pl, cfl));
+	let t = (match ctx.g.do_macro ctx MMacroType path field args p with
+		| None -> mk_mono()
+		| Some _ -> ctx.ret
+	) in
+	ctx.ret <- fst old;
+	ctx.get_build_infos <- snd old;
+	t
+
+(* -------------------------------------------------------------------------- *)
+(* API EVENTS *)
+
+let build_instance ctx mtype p =
+	match mtype with
+	| TClassDecl c ->
+		if ctx.pass > PBuildClass then ignore(c.cl_build());
+		let build f s =
+			let r = exc_protect ctx (fun r ->
+				let t = mk_mono() in
+				r := lazy_processing (fun() -> t);
+				let tf = (f()) in
+				unify_raise ctx tf t p;
+				link_dynamic t tf;
+				(match tf with
+					| TInst (c, _) -> ignore(c.cl_build())
+					| TAbstract (a, _) -> Abstract.build_abstract a
+					| _ -> ()
+				);
+				t
+			) s in
+			TLazy r
+		in
+		let ft = (fun pl ->
+			match c.cl_kind with
+			| KGeneric ->
+				build (fun () -> Generic.build_generic ctx c p pl) "build_generic"
+			| KMacroType ->
+				build (fun () -> build_macro_type ctx pl p) "macro_type"
+			| KGenericBuild cfl ->
+				build (fun () -> build_macro_build ctx c pl cfl p) "generic_build"
+			| _ ->
+				TInst (c,pl)
+		) in
+		c.cl_params , c.cl_path , ft
+	| TEnumDecl e ->
+		e.e_params , e.e_path , (fun t -> TEnum (e,t))
+	| TTypeDecl t ->
+		t.t_params , t.t_path , (fun tl -> TType(t,tl))
+	| TAbstractDecl a ->
+		a.a_params, a.a_path, (fun tl -> TAbstract(a,tl))
diff --git a/src/macro/macroContext.ml b/src/typing/macroContext.ml
similarity index 62%
rename from src/macro/macroContext.ml
rename to src/typing/macroContext.ml
index 75808ff2c73a14ca9572578516a9efbb9a22be58..a4d809a657e000fd57e6da6a890ee5a6fa92a3ac 100644
--- a/src/macro/macroContext.ml
+++ b/src/typing/macroContext.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -18,14 +18,22 @@
  *)
 
 open Ast
-open Common.DisplayMode
+open DisplayTypes.DisplayMode
 open Common
 open Type
 open Typecore
 open Error
 open Globals
 
-module InterpImpl = Interp (* Hlmacro *)
+module Eval = struct
+	include EvalEncode
+	include EvalDecode
+	include EvalValue
+	include EvalContext
+	include EvalMain
+end
+
+module InterpImpl = Eval (* Hlmacro *)
 
 module Interp = struct
 	module BuiltApi = MacroApi.MacroApiImpl(InterpImpl)
@@ -35,12 +43,17 @@ end
 
 let macro_enable_cache = ref false
 let macro_interp_cache = ref None
-let macro_interp_on_reuse = ref []
-let macro_interp_reused = ref false
 
-let delayed_macro_result = ref ((fun() -> assert false) : unit -> unit -> Interp.value)
-let unify_call_args_ref = ref (fun _ _ _ _ _ _ _-> assert false)
-let unify_call_args a b c d e f g : (texpr list * t) = !unify_call_args_ref a b c d e f g
+let safe_decode ctx v expected t p f =
+	try
+		f ()
+	with MacroApi.Invalid_expr | EvalContext.RunTimeException _ ->
+		let path = [dump_path ctx.com;"decoding_error"] in
+		let ch = Path.create_file false ".txt" [] path  in
+		let errors = Interp.handle_decoding_error (output_string ch) v t in
+		List.iter (fun (s,i) -> Printf.fprintf ch "\nline %i: %s" i s) (List.rev errors);
+		close_out ch;
+		error (Printf.sprintf "Expected %s but got %s (see %s.txt for details)" expected (Interp.value_string v) (String.concat "/" path)) p
 
 let get_next_stored_typed_expr_id =
 	let uid = ref 0 in
@@ -74,21 +87,25 @@ let get_type_patch ctx t sub =
 			tp
 
 let macro_timer ctx l =
-	Common.timer (if Common.defined ctx.com Define.MacroTimes then ("macro" :: l) else ["macro"])
+	Timer.timer (if Common.defined ctx.com Define.MacroTimes then ("macro" :: l) else ["macro"])
 
 let typing_timer ctx need_type f =
-	let t = Common.timer ["typing"] in
-	let old = ctx.com.error and oldp = ctx.pass in
+	let t = Timer.timer ["typing"] in
+	let old = ctx.com.error and oldp = ctx.pass and oldlocals = ctx.locals in
 	(*
 		disable resumable errors... unless we are in display mode (we want to reach point of completion)
 	*)
 	(*if ctx.com.display = DMNone then ctx.com.error <- (fun e p -> raise (Error(Custom e,p)));*) (* TODO: review this... *)
 	ctx.com.error <- (fun e p -> raise (Error(Custom e,p)));
-	if need_type && ctx.pass < PTypeField then ctx.pass <- PTypeField;
+	if need_type && ctx.pass < PTypeField then begin
+		ctx.pass <- PTypeField;
+		flush_pass ctx PBuildClass "typing_timer";
+	end;
 	let exit() =
 		t();
 		ctx.com.error <- old;
 		ctx.pass <- oldp;
+		ctx.locals <- oldlocals;
 	in
 	try
 		let r = f() in
@@ -108,13 +125,32 @@ let load_macro_ref : (typer -> bool -> path -> string -> pos -> (typer * ((strin
 
 let make_macro_api ctx p =
 	let parse_expr_string s p inl =
-		typing_timer ctx false (fun() -> try Parser.parse_expr_string ctx.com s p error inl with Exit -> raise MacroApi.Invalid_expr)
+		typing_timer ctx false (fun() ->
+			try
+				begin match ParserEntry.parse_expr_string ctx.com.defines s p error inl with
+					| ParseSuccess data -> data
+					| ParseDisplayFile(data,_) when inl -> data (* ignore errors when inline-parsing in display file *)
+					| ParseDisplayFile _ -> assert false (* cannot happen because ParserEntry.parse_string sets `display_position := null_pos;` *)
+					| ParseError _ -> raise MacroApi.Invalid_expr
+				end
+			with Exit ->
+				raise MacroApi.Invalid_expr)
+	in
+	let parse_metadata s p =
+		try
+			match ParserEntry.parse_string ctx.com.defines (s ^ " typedef T = T") null_pos error false with
+			| ParseSuccess(_,[ETypedef t,_]) -> t.d_meta
+			| ParseDisplayFile _ -> assert false (* cannot happen because null_pos is used *)
+			| ParseError(_,_,_) -> error "Malformed metadata string" p
+			| _ -> assert false
+		with _ ->
+			error "Malformed metadata string" p
 	in
 	{
 		MacroApi.pos = p;
 		MacroApi.get_com = (fun() -> ctx.com);
 		MacroApi.get_type = (fun s ->
-			typing_timer ctx true (fun() ->
+			typing_timer ctx false (fun() ->
 				let path = parse_path s in
 				let tp = match List.rev (fst path) with
 					| s :: sl when String.length s > 0 && (match s.[0] with 'A'..'Z' -> true | _ -> false) ->
@@ -123,59 +159,59 @@ let make_macro_api ctx p =
 						{ tpackage = fst path; tname = snd path; tparams = []; tsub = None }
 				in
 				try
-					let m = Some (Typeload.load_instance ctx (tp,null_pos) true p) in
+					let m = Some (Typeload.load_instance ctx (tp,p) true) in
 					m
 				with Error (Module_not_found _,p2) when p == p2 ->
 					None
 			)
 		);
 		MacroApi.resolve_type = (fun t p ->
-			typing_timer ctx true (fun() -> Typeload.load_complex_type ctx false p (t,null_pos))
+			typing_timer ctx false (fun() -> Typeload.load_complex_type ctx false (t,p))
 		);
 		MacroApi.get_module = (fun s ->
-			typing_timer ctx true (fun() ->
+			typing_timer ctx false (fun() ->
 				let path = parse_path s in
-				let m = List.map type_of_module_type (Typeload.load_module ctx path p).m_types in
+				let m = List.map type_of_module_type (TypeloadModule.load_module ctx path p).m_types in
 				m
 			)
 		);
 		MacroApi.after_typing = (fun f ->
-			Common.add_typing_filter ctx.com (fun tl ->
+			ctx.com.callbacks#add_after_typing (fun tl ->
 				let t = macro_timer ctx ["afterTyping"] in
 				f tl;
 				t()
 			)
 		);
-		MacroApi.on_generate = (fun f ->
-			Common.add_filter ctx.com (fun() ->
+		MacroApi.on_generate = (fun f b ->
+			(if b then ctx.com.callbacks#add_before_save else ctx.com.callbacks#add_after_save) (fun() ->
 				let t = macro_timer ctx ["onGenerate"] in
 				f (List.map type_of_module_type ctx.com.types);
 				t()
 			)
 		);
 		MacroApi.after_generate = (fun f ->
-			Common.add_final_filter ctx.com (fun() ->
+			ctx.com.callbacks#add_after_generation (fun() ->
 				let t = macro_timer ctx ["afterGenerate"] in
 				f();
 				t()
 			)
 		);
 		MacroApi.on_type_not_found = (fun f ->
-			ctx.com.load_extern_type <- ctx.com.load_extern_type @ [fun path p ->
+			ctx.com.load_extern_type <- ctx.com.load_extern_type @ ["onTypeNotFound",fun path p ->
 				let td = f (s_type_path path) in
 				if td = Interp.vnull then
 					None
 				else
 					let (pack,name),tdef,p = Interp.decode_type_def td in
-					Some (name,(pack,[tdef,p]))
+					Some (pack,[tdef,p])
 			];
 		);
 		MacroApi.parse_string = parse_expr_string;
 		MacroApi.type_expr = (fun e ->
-			typing_timer ctx true (fun() -> type_expr ctx e Value)
+			typing_timer ctx true (fun() -> type_expr ctx e WithType.value)
 		);
 		MacroApi.type_macro_expr = (fun e ->
-			let e = typing_timer ctx true (fun() -> type_expr ctx e Value) in
+			let e = typing_timer ctx true (fun() -> type_expr ctx e WithType.value) in
 			let rec loop e = match e.eexpr with
 				| TField(_,FStatic(c,({cf_kind = Method _} as cf))) -> ignore(!load_macro_ref ctx false c.cl_path cf.cf_name e.epos)
 				| _ -> Type.iter loop e
@@ -183,6 +219,9 @@ let make_macro_api ctx p =
 			loop e;
 			e
 		);
+		MacroApi.flush_context = (fun f ->
+			typing_timer ctx true f
+		);
 		MacroApi.store_typed_expr = (fun te ->
 			let p = te.epos in
 			let id = get_next_stored_typed_expr_id() in
@@ -194,8 +233,10 @@ let make_macro_api ctx p =
 		MacroApi.type_patch = (fun t f s v ->
 			typing_timer ctx false (fun() ->
 				let v = (match v with None -> None | Some s ->
-					match Parser.parse_string ctx.com ("typedef T = " ^ s) null_pos error false with
-					| _,[ETypedef { d_data = ct },_] -> Some ct
+					match ParserEntry.parse_string ctx.com.defines ("typedef T = " ^ s) null_pos error false with
+					| ParseSuccess(_,[ETypedef { d_data = ct },_]) -> Some ct
+					| ParseDisplayFile _ -> assert false (* cannot happen because null_pos is used *)
+					| ParseError(_,(msg,p),_) -> Parser.error msg p (* p is null_pos, but we don't have anything else here... *)
 					| _ -> assert false
 				) in
 				let tp = get_type_patch ctx t (Some (f,s)) in
@@ -204,16 +245,14 @@ let make_macro_api ctx p =
 				| Some _ -> tp.tp_type <- Option.map fst v
 			);
 		);
-		MacroApi.meta_patch = (fun m t f s ->
-			let m = (match Parser.parse_string ctx.com (m ^ " typedef T = T") null_pos error false with
-				| _,[ETypedef t,_] -> t.d_meta
-				| _ -> assert false
-			) in
+		MacroApi.meta_patch = (fun m t f s p ->
+			let ml = parse_metadata m p in
 			let tp = get_type_patch ctx t (match f with None -> None | Some f -> Some (f,s)) in
-			tp.tp_meta <- tp.tp_meta @ m;
+			tp.tp_meta <- tp.tp_meta @ (List.map (fun (m,el,_) -> (m,el,p)) ml);
 		);
 		MacroApi.set_js_generator = (fun gen ->
-			let js_ctx = Genjs.alloc_ctx ctx.com in
+			Path.mkdir_from_path ctx.com.file;
+			let js_ctx = Genjs.alloc_ctx ctx.com (get_es_version ctx.com) in
 			ctx.com.js_gen <- Some (fun() ->
 				let t = macro_timer ctx ["jsGenerator"] in
 				gen js_ctx;
@@ -221,14 +260,15 @@ let make_macro_api ctx p =
 			);
 		);
 		MacroApi.get_local_type = (fun() ->
-			match ctx.g.get_build_infos() with
+			match ctx.get_build_infos() with
 			| Some (mt,tl,_) ->
 				Some (match mt with
 					| TClassDecl c -> TInst (c,tl)
 					| TEnumDecl e -> TEnum (e,tl)
 					| TTypeDecl t -> TType (t,tl)
-					| TAbstractDecl a -> TAbstract(a,tl))
-			| None ->
+					| TAbstractDecl a -> TAbstract(a,tl)
+				)
+			| _ ->
 				if ctx.curclass == null_class then
 					None
 				else
@@ -236,7 +276,7 @@ let make_macro_api ctx p =
 		);
 		MacroApi.get_expected_type = (fun() ->
 			match ctx.with_type_stack with
-				| (WithType t) :: _ -> Some t
+				| (WithType.WithType(t,_)) :: _ -> Some t
 				| _ -> None
 		);
 		MacroApi.get_call_arguments = (fun() ->
@@ -257,24 +297,33 @@ let make_macro_api ctx p =
 			ctx.locals;
 		);
 		MacroApi.get_build_fields = (fun() ->
-			match ctx.g.get_build_infos() with
+			match ctx.get_build_infos() with
 			| None -> Interp.vnull
-			| Some (_,_,fields) -> Interp.enc_array (List.map Interp.encode_field fields)
+			| Some (_,_,fields) -> Interp.encode_array (List.map Interp.encode_field fields)
 		);
-		MacroApi.get_pattern_locals = (fun e t ->
-			!get_pattern_locals_ref ctx e t
-		);
-		MacroApi.define_type = (fun v ->
-			let m, tdef, pos = (try Interp.decode_type_def v with MacroApi.Invalid_expr -> Interp.exc_string "Invalid type definition") in
+		MacroApi.define_type = (fun v mdep ->
+			let cttype = { tpackage = ["haxe";"macro"]; tname = "Expr"; tparams = []; tsub = Some ("TypeDefinition") } in
+			let mctx = (match ctx.g.macros with None -> assert false | Some (_,mctx) -> mctx) in
+			let ttype = Typeload.load_instance mctx (cttype,p) false in
+			let f () = Interp.decode_type_def v in
+			let m, tdef, pos = safe_decode ctx v "TypeDefinition" ttype p f in
+			let has_native_meta = match tdef with
+				| EClass d -> Meta.has Meta.Native d.d_meta
+				| EEnum d -> Meta.has Meta.Native d.d_meta
+				| ETypedef d -> Meta.has Meta.Native d.d_meta
+				| EAbstract d -> Meta.has Meta.Native d.d_meta
+				| _ -> false
+			in
 			let add is_macro ctx =
-				let mnew = Typeload.type_module ctx m ctx.m.curmod.m_extra.m_file [tdef,pos] pos in
+				let mdep = Option.map_default (fun s -> TypeloadModule.load_module ctx (parse_path s) pos) ctx.m.curmod mdep in
+				let mnew = TypeloadModule.type_module ctx ~dont_check_path:(has_native_meta) m mdep.m_extra.m_file [tdef,pos] pos in
 				mnew.m_extra.m_kind <- if is_macro then MMacro else MFake;
-				add_dependency mnew ctx.m.curmod;
+				add_dependency mnew mdep;
 			in
 			add false ctx;
 			(* if we are adding a class which has a macro field, we also have to add it to the macro context (issue #1497) *)
-			if not ctx.in_macro then match tdef,ctx.g.macros with
-			| EClass c,Some (_,mctx) when List.exists (fun cff -> (Meta.has Meta.Macro cff.cff_meta || List.mem AMacro cff.cff_access)) c.d_data ->
+			if not ctx.in_macro then match tdef with
+			| EClass c when List.exists (fun cff -> (Meta.has Meta.Macro cff.cff_meta || List.mem_assoc AMacro cff.cff_access)) c.d_data ->
 				add true mctx
 			| _ ->
 				()
@@ -294,32 +343,26 @@ let make_macro_api ctx p =
 			let mpath = Ast.parse_path m in
 			begin try
 				let m = Hashtbl.find ctx.g.modules mpath in
-				ignore(Typeload.type_types_into_module ctx m types pos)
+				ignore(TypeloadModule.type_types_into_module ctx m types pos)
 			with Not_found ->
-				let mnew = Typeload.type_module ctx mpath ctx.m.curmod.m_extra.m_file types pos in
+				let mnew = TypeloadModule.type_module ctx mpath ctx.m.curmod.m_extra.m_file types pos in
 				mnew.m_extra.m_kind <- MFake;
 				add_dependency mnew ctx.m.curmod;
 			end
 		);
-		MacroApi.module_dependency = (fun mpath file ismacro ->
-			let m = typing_timer ctx false (fun() -> Typeload.load_module ctx (parse_path mpath) p) in
-			if ismacro then
-				m.m_extra.m_macro_calls <- file :: List.filter ((<>) file) m.m_extra.m_macro_calls
-			else
-				add_dependency m (create_fake_module ctx file);
+		MacroApi.module_dependency = (fun mpath file ->
+			let m = typing_timer ctx false (fun() ->
+				let old_deps = ctx.m.curmod.m_extra.m_deps in
+				let m = TypeloadModule.load_module ctx (parse_path mpath) p in
+				ctx.m.curmod.m_extra.m_deps <- old_deps;
+				m
+			) in
+			add_dependency m (create_fake_module ctx file);
 		);
 		MacroApi.current_module = (fun() ->
 			ctx.m.curmod
 		);
 		MacroApi.current_macro_module = (fun () -> assert false);
-		MacroApi.delayed_macro = (fun i ->
-			let mctx = (match ctx.g.macros with None -> assert false | Some (_,mctx) -> mctx) in
-			let f = (try DynArray.get mctx.g.delayed_macros i with _ -> failwith "Delayed macro retrieve failure") in
-			f();
-			let ret = !delayed_macro_result in
-			delayed_macro_result := (fun() -> assert false);
-			ret
-		);
 		MacroApi.use_cache = (fun() ->
 			!macro_enable_cache
 		);
@@ -327,21 +370,25 @@ let make_macro_api ctx p =
 			ctx.g.do_format_string ctx s p
 		);
 		MacroApi.cast_or_unify = (fun t e p ->
-			AbstractCast.cast_or_unify_raise ctx t e p
+			typing_timer ctx true (fun () ->
+				try
+					ignore(AbstractCast.cast_or_unify_raise ctx t e p);
+					true
+				with Error (Unify _,_) ->
+					false
+			)
 		);
-		MacroApi.add_global_metadata = (fun s1 s2 config ->
-			let meta = (match Parser.parse_string ctx.com (s2 ^ " typedef T = T") null_pos error false with
-				| _,[ETypedef t,_] -> t.d_meta
-				| _ -> assert false
-			) in
-			List.iter (fun m ->
+		MacroApi.add_global_metadata = (fun s1 s2 config p ->
+			let meta = parse_metadata s2 p in
+			List.iter (fun (m,el,_) ->
+				let m = (m,el,p) in
 				ctx.g.global_metadata <- (ExtString.String.nsplit s1 ".",m,config) :: ctx.g.global_metadata;
 			) meta;
 		);
 		MacroApi.add_module_check_policy = (fun sl il b i ->
 			let add ctx =
 				ctx.g.module_check_policies <- (List.fold_left (fun acc s -> (ExtString.String.nsplit s ".",List.map Obj.magic il,b) :: acc) ctx.g.module_check_policies sl);
-				Hashtbl.iter (fun _ m -> m.m_extra.m_check_policy <- Typeload.get_policy ctx m.m_path) ctx.g.modules;
+				Hashtbl.iter (fun _ m -> m.m_extra.m_check_policy <- TypeloadModule.get_policy ctx m.m_path) ctx.g.modules;
 			in
 			let add_macro ctx = match ctx.g.macros with
 				| None -> ()
@@ -352,21 +399,20 @@ let make_macro_api ctx p =
 			| CompilationServer.MacroContext -> add_macro ctx
 			| CompilationServer.NormalAndMacroContext -> add ctx; add_macro ctx;
 		);
-		MacroApi.on_reuse = (fun f ->
-			macro_interp_on_reuse := f :: !macro_interp_on_reuse
-		);
+		MacroApi.decode_expr = Interp.decode_expr;
+		MacroApi.encode_expr = Interp.encode_expr;
+		MacroApi.encode_ctype = Interp.encode_ctype;
+		MacroApi.decode_type = Interp.decode_type;
 	}
 
 let rec init_macro_interp ctx mctx mint =
 	let p = null_pos in
-	ignore(Typeload.load_module mctx (["haxe";"macro"],"Expr") p);
-	ignore(Typeload.load_module mctx (["haxe";"macro"],"Type") p);
+	ignore(TypeloadModule.load_module mctx (["haxe";"macro"],"Expr") p);
+	ignore(TypeloadModule.load_module mctx (["haxe";"macro"],"Type") p);
 	flush_macro_context mint ctx;
 	Interp.init mint;
 	if !macro_enable_cache && not (Common.defined mctx.com Define.NoMacroCache) then begin
 		macro_interp_cache := Some mint;
-		macro_interp_on_reuse := [];
-		macro_interp_reused := true;
 	end
 
 and flush_macro_context mint ctx =
@@ -376,28 +422,8 @@ and flush_macro_context mint ctx =
 	let _, types, modules = ctx.g.do_generate mctx in
 	mctx.com.types <- types;
 	mctx.com.Common.modules <- modules;
-	let check_reuse() =
-		if !macro_interp_reused then
-			true
-		else if not (List.for_all (fun f -> f())  !macro_interp_on_reuse) then
-			false
-		else begin
-			macro_interp_reused := true;
-			true;
-		end
-	in
-	(* if one of the type we are using has been modified, we need to create a new macro context from scratch *)
-	let mint = if not (Interp.can_reuse mint types && check_reuse()) then begin
-		let com2 = mctx.com in
-		let mint = Interp.create com2 (make_macro_api ctx Globals.null_pos) in
-		let macro = ((fun() -> Interp.select mint), mctx) in
-		ctx.g.macros <- Some macro;
-		mctx.g.macros <- Some macro;
-		init_macro_interp ctx mctx mint;
-		mint
-	end else mint in
 	(* we should maybe ensure that all filters in Main are applied. Not urgent atm *)
-	let expr_filters = [AbstractCast.handle_abstract_casts mctx; Filters.captured_vars mctx.com; Filters.rename_local_vars mctx] in
+	let expr_filters = [VarLazifier.apply mctx.com;AbstractCast.handle_abstract_casts mctx; CapturedVars.captured_vars mctx.com;] in
 
 	(*
 		some filters here might cause side effects that would break compilation server.
@@ -413,7 +439,7 @@ and flush_macro_context mint ctx =
 			()
 	in
 	let type_filters = [
-		Filters.add_field_inits mctx;
+		Filters.add_field_inits (StringMap.empty) mctx;
 		minimal_restore;
 		Filters.apply_native_paths mctx
 	] in
@@ -430,10 +456,10 @@ let create_macro_interp ctx mctx =
 	let com2 = mctx.com in
 	let mint, init = (match !macro_interp_cache with
 		| None ->
-			let mint = Interp.create com2 (make_macro_api ctx null_pos) in
+			let mint = Interp.create com2 (make_macro_api ctx null_pos) true in
+			Interp.select mint;
 			mint, (fun() -> init_macro_interp ctx mctx mint)
 		| Some mint ->
-			macro_interp_reused := false;
 			Interp.do_reuse mint (make_macro_api ctx null_pos);
 			mint, (fun() -> ())
 	) in
@@ -460,22 +486,39 @@ let get_macro_context ctx p =
 		ctx.com.get_macros <- (fun() -> Some com2);
 		com2.package_rules <- PMap.empty;
 		com2.main_class <- None;
-		com2.display <- DisplayMode.create DMNone;
-		List.iter (fun p -> com2.defines <- PMap.remove (Globals.platform_name p) com2.defines) Globals.platforms;
-		com2.defines_signature <- None;
+		(* Inherit most display settings, but require normal typing. *)
+		com2.display <- {ctx.com.display with dms_kind = DMNone; dms_display = false; dms_full_typing = true; dms_force_macro_typing = true; dms_inline = true; };
 		com2.class_path <- List.filter (fun s -> not (ExtString.String.exists s "/_std/")) com2.class_path;
 		let name = platform_name !Globals.macro_platform in
 		com2.class_path <- List.map (fun p -> p ^ name ^ "/_std/") com2.std_path @ com2.class_path;
-		let to_remove = List.map (fun d -> fst (Define.infos d)) [Define.NoTraces] in
-		let to_remove = to_remove @ List.map (fun (_,d) -> "flash" ^ d) Common.flash_versions in
-		com2.defines <- PMap.foldi (fun k v acc -> if List.mem k to_remove then acc else PMap.add k v acc) com2.defines PMap.empty;
-		Common.define com2 Define.Macro;
+		let defines = adapt_defines_to_macro_context com2.defines; in
+		com2.defines.values <- defines.values;
+		com2.defines.defines_signature <- None;
 		Common.init_platform com2 !Globals.macro_platform;
 		let mctx = ctx.g.do_create com2 in
-		mctx.is_display_file <- ctx.is_display_file;
+		mctx.is_display_file <- false;
 		create_macro_interp ctx mctx;
+		CommonCache.lock_signature com2 "get_macro_context";
 		api, mctx
 
+let load_macro_module ctx cpath display p =
+	let api, mctx = get_macro_context ctx p in
+	let m = (try Hashtbl.find ctx.g.types_module cpath with Not_found -> cpath) in
+	(* Temporarily enter display mode while typing the macro. *)
+	let old = mctx.com.display in
+	if display then mctx.com.display <- ctx.com.display;
+	let mloaded = TypeloadModule.load_module mctx m p in
+	api.MacroApi.current_macro_module <- (fun() -> mloaded);
+	mctx.m <- {
+		curmod = mloaded;
+		module_types = [];
+		module_using = [];
+		module_globals = PMap.empty;
+		wildcard_packages = [];
+		module_imports = [];
+	};
+	mloaded,(fun () -> mctx.com.display <- old)
+
 let load_macro ctx display cpath f p =
 	let api, mctx = get_macro_context ctx p in
 	let mint = Interp.get_ctx() in
@@ -483,35 +526,21 @@ let load_macro ctx display cpath f p =
 		| name :: pack when name.[0] >= 'A' && name.[0] <= 'Z' -> (List.rev pack,name), Some (snd cpath)
 		| _ -> cpath, None
 	) in
-	let meth = try Hashtbl.find mctx.com.cached_macros (cpath,f) with Not_found ->
+	let (meth,mloaded) = try Hashtbl.find mctx.com.cached_macros (cpath,f) with Not_found ->
 		let t = macro_timer ctx ["typing";s_type_path cpath ^ "." ^ f] in
-		(* Temporarily enter display mode while typing the macro. *)
-		if display then mctx.com.display <- ctx.com.display;
-		let m = (try Hashtbl.find ctx.g.types_module cpath with Not_found -> cpath) in
-		let mloaded = Typeload.load_module mctx m p in
-		api.MacroApi.current_macro_module <- (fun() -> mloaded);
-		mctx.m <- {
-			curmod = mloaded;
-			module_types = [];
-			module_using = [];
-			module_globals = PMap.empty;
-			wildcard_packages = [];
-			module_imports = [];
-		};
-		add_dependency ctx.m.curmod mloaded;
+		let mloaded,restore = load_macro_module ctx cpath display p in
 		let mt = Typeload.load_type_def mctx p { tpackage = fst cpath; tname = snd cpath; tparams = []; tsub = sub } in
 		let cl, meth = (match mt with
 			| TClassDecl c ->
-				let t = macro_timer ctx ["finalize"] in
 				mctx.g.do_finalize mctx;
-				t();
 				c, (try PMap.find f c.cl_statics with Not_found -> error ("Method " ^ f ^ " not found on class " ^ s_type_path cpath) p)
 			| _ -> error "Macro should be called on a class" p
 		) in
+		api.MacroApi.current_macro_module <- (fun() -> mloaded);
 		if not (Common.defined ctx.com Define.NoDeprecationWarnings) then
-			Display.DeprecationCheck.check_cf mctx.com meth p;
-		let meth = (match follow meth.cf_type with TFun (args,ret) -> args,ret,cl,meth | _ -> error "Macro call should be a method" p) in
-		mctx.com.display <- DisplayMode.create DMNone;
+			DeprecationCheck.check_cf mctx.com meth p;
+		let meth = (match follow meth.cf_type with TFun (args,ret) -> (args,ret,cl,meth),mloaded | _ -> error "Macro call should be a method" p) in
+		restore();
 		if not ctx.in_macro then flush_macro_context mint ctx;
 		Hashtbl.add mctx.com.cached_macros (cpath,f) meth;
 		mctx.m <- {
@@ -525,11 +554,14 @@ let load_macro ctx display cpath f p =
 		t();
 		meth
 	in
+	add_dependency ctx.m.curmod mloaded;
 	let call args =
+		if ctx.com.verbose then Common.log ctx.com ("Calling macro " ^ s_type_path cpath ^ "." ^ f ^ " (" ^ p.pfile ^ ":" ^ string_of_int (Lexer.get_error_line p) ^ ")");
 		let t = macro_timer ctx ["execution";s_type_path cpath ^ "." ^ f] in
 		incr stats.s_macros_called;
 		let r = Interp.call_path (Interp.get_ctx()) ((fst cpath) @ [(match sub with None -> snd cpath | Some s -> s)]) f args api in
 		t();
+		if ctx.com.verbose then Common.log ctx.com ("Exiting macro " ^ s_type_path cpath ^ "." ^ f);
 		r
 	in
 	mctx, meth, call
@@ -543,7 +575,7 @@ let type_macro ctx mode cpath f (el:Ast.expr list) p =
 	let mctx, (margs,mret,mclass,mfield), call_macro = load_macro ctx (mode = MDisplay) cpath f p in
 	let mpos = mfield.cf_pos in
 	let ctexpr = { tpackage = ["haxe";"macro"]; tname = "Expr"; tparams = []; tsub = None } in
-	let expr = Typeload.load_instance mctx (ctexpr,null_pos) false p in
+	let expr = Typeload.load_instance mctx (ctexpr,p) false in
 	(match mode with
 	| MDisplay ->
 		raise Exit (* We don't have to actually call the macro. *)
@@ -551,18 +583,18 @@ let type_macro ctx mode cpath f (el:Ast.expr list) p =
 		unify mctx mret expr mpos;
 	| MBuild ->
 		let ctfields = { tpackage = []; tname = "Array"; tparams = [TPType (CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tparams = []; tsub = Some "Field" },null_pos)]; tsub = None } in
-		let tfields = Typeload.load_instance mctx (ctfields,null_pos) false p in
+		let tfields = Typeload.load_instance mctx (ctfields,p) false in
 		unify mctx mret tfields mpos
 	| MMacroType ->
 		let cttype = { tpackage = ["haxe";"macro"]; tname = "Type"; tparams = []; tsub = None } in
-		let ttype = Typeload.load_instance mctx (cttype,null_pos) false p in
+		let ttype = Typeload.load_instance mctx (cttype,p) false in
 		try
 			unify_raise mctx mret ttype mpos;
 			(* TODO: enable this again in the future *)
 			(* ctx.com.warning "Returning Type from @:genericBuild macros is deprecated, consider returning ComplexType instead" p; *)
 		with Error (Unify _,_) ->
 			let cttype = { tpackage = ["haxe";"macro"]; tname = "Expr"; tparams = []; tsub = Some ("ComplexType") } in
-			let ttype = Typeload.load_instance mctx (cttype,null_pos) false p in
+			let ttype = Typeload.load_instance mctx (cttype,p) false in
 			unify_raise mctx mret ttype mpos;
 	);
 	(*
@@ -610,16 +642,19 @@ let type_macro ctx mode cpath f (el:Ast.expr list) p =
 		let constants = List.map (fun e ->
 			let p = snd e in
 			let e = (try
-				(match Codegen.type_constant_value ctx.com e with
-				| { eexpr = TConst (TString _); epos = p } when Lexer.is_fmt_string p ->
-					Lexer.remove_fmt_string p;
-					todo := (fun() -> Lexer.add_fmt_string p) :: !todo;
-				| _ -> ());
+				let e' = Texpr.type_constant_value ctx.com.basic e in
+				let rec loop e = match e with
+					| { eexpr = TConst (TString _); epos = p } when Lexer.is_fmt_string p ->
+						Lexer.remove_fmt_string p;
+						todo := (fun() -> Lexer.add_fmt_string p) :: !todo;
+					| _ -> Type.iter loop e
+				in
+				loop e';
 				e
 			with Error (Custom _,_) ->
 				(* if it's not a constant, let's make something that is typed as haxe.macro.Expr - for nice error reporting *)
 				(EBlock [
-					(EVars [("__tmp",null_pos),Some (CTPath ctexpr,p),Some (EConst (Ident "null"),p)],p);
+					(EVars [("__tmp",null_pos),false,Some (CTPath ctexpr,p),Some (EConst (Ident "null"),p)],p);
 					(EConst (Ident "__tmp"),p);
 				],p)
 			) in
@@ -627,7 +662,7 @@ let type_macro ctx mode cpath f (el:Ast.expr list) p =
 			incr index;
 			(EArray ((EArrayDecl [e],p),(EConst (Int (string_of_int (!index))),p)),p)
 		) el in
-		let elt, _ = unify_call_args mctx constants (List.map fst eargs) t_dynamic p false false in
+		let elt, _ = try Calls.unify_call_args mctx constants (List.map fst eargs) t_dynamic p false false with e -> List.iter (fun f -> f()) (!todo); raise e; in
 		List.iter (fun f -> f()) (!todo);
 		List.map2 (fun (_,mct) e ->
 			let e, et = (match e.eexpr with
@@ -648,88 +683,69 @@ let type_macro ctx mode cpath f (el:Ast.expr list) p =
 				| None -> Interp.vnull
 				end
 			| MAOther -> match Interp.eval_expr ictx et with
-				| None -> assert false
+				| None -> Interp.vnull
 				| Some v -> v
 		) eargs elt
 	in
 	let args = match el2 with
 		| [] -> args
-		| _ -> (match List.rev args with _::args -> List.rev args | [] -> []) @ [Interp.enc_array (List.map Interp.encode_expr el2)]
+		| _ -> (match List.rev args with _::args -> List.rev args | [] -> []) @ [Interp.encode_array (List.map Interp.encode_expr el2)]
 	in
 	let call() =
 		match call_macro args with
 		| None -> None
 		| Some v ->
-			try
-				Some (match mode with
-				| MExpr | MDisplay -> Interp.decode_expr v
+			let expected,process = match mode with
+				| MExpr | MDisplay ->
+					"Expr",(fun () -> Some (Interp.decode_expr v))
 				| MBuild ->
-					let fields = if v = Interp.vnull then
-							(match ctx.g.get_build_infos() with
-							| None -> assert false
-							| Some (_,_,fields) -> fields)
-						else
-							List.map Interp.decode_field (Interp.dec_array v)
-					in
-					(EVars [("fields",null_pos),Some (CTAnonymous fields,p),None],p)
+					"Array<Field>",(fun () ->
+						let fields = if v = Interp.vnull then
+								(match ctx.get_build_infos() with
+								| None -> assert false
+								| Some (_,_,fields) -> fields)
+							else
+								List.map Interp.decode_field (Interp.decode_array v)
+						in
+						Some (EVars [("fields",null_pos),false,Some (CTAnonymous fields,p),None],p)
+					)
 				| MMacroType ->
-					let t = if v = Interp.vnull then
-						mk_mono()
-					else try
-						let ct = Interp.decode_ctype v in
-						Typeload.load_complex_type ctx false p ct;
-					with MacroApi.Invalid_expr ->
-						Interp.decode_type v
-					in
-					ctx.ret <- t;
-					(EBlock [],p)
-				)
-			with MacroApi.Invalid_expr ->
-				if v = Interp.vnull then
-					error "Unexpected null value returned from macro" p
-				else
-					error "The macro didn't return a valid result" p
+					"ComplexType",(fun () ->
+						let t = if v = Interp.vnull then
+							mk_mono()
+						else try
+							let ct = Interp.decode_ctype v in
+							Typeload.load_complex_type ctx false ct;
+						with MacroApi.Invalid_expr | EvalContext.RunTimeException _ ->
+							Interp.decode_type v
+						in
+						ctx.ret <- t;
+						Some (EBlock [],p)
+					)
+			in
+			safe_decode ctx v expected mret p process
 	in
-	let e = (if ctx.in_macro then begin
-		(*
-			this is super-tricky : we can't evaluate a macro inside a macro because we might trigger some cycles.
-			So instead, we generate a haxe.macro.Context.delayedCalled(i) expression that will only evaluate the
-			macro if/when it is called.
-
-			The tricky part is that the whole delayed-evaluation process has to use the same contextual informations
-			as if it was evaluated now.
-		*)
-		let ctx = {
-			ctx with locals = ctx.locals;
-		} in
-		let pos = DynArray.length mctx.g.delayed_macros in
-		DynArray.add mctx.g.delayed_macros (fun() ->
-			delayed_macro_result := (fun() ->
-				let mint = Interp.get_ctx() in
-				match call() with
-				| None -> (fun() -> raise MacroApi.Abort)
-				| Some e -> Interp.eval_delayed mint (type_expr ctx e Value)
-			);
-		);
-		ctx.m.curmod.m_extra.m_time <- -1.; (* disable caching for modules having macro-in-macro *)
-		if Common.defined ctx.com Define.MacroDebug then
-			ctx.com.warning "Macro-in-macro call detected" p;
-		let e = (EConst (Ident "$__delayed_call__"),p) in
-		Some (EUntyped (ECall (e,[EConst (Int (string_of_int pos)),p]),p),p)
-	end else
+	let e = if ctx.in_macro then
+		Some (EThrow((EConst(String("macro-in-macro",SDoubleQuotes))),p),p)
+	else
 		call()
-	) in
+	in
 	e
 
 let call_macro ctx path meth args p =
 	let mctx, (margs,_,mclass,mfield), call = load_macro ctx false path meth p in
-	let el, _ = unify_call_args mctx args margs t_dynamic p false false in
+	let el, _ = Calls.unify_call_args mctx args margs t_dynamic p false false in
 	call (List.map (fun e -> try Interp.make_const e with Exit -> error "Parameter should be a constant" e.epos) el)
 
 let call_init_macro ctx e =
-	let p = { pfile = "--macro"; pmin = 0; pmax = 0 } in
+	let p = { pfile = "--macro " ^ e; pmin = -1; pmax = -1 } in
 	let e = try
-		Parser.parse_expr_string ctx.com e p error false
+		if String.get e (String.length e - 1) = ';' then error "Unexpected ;" p;
+		begin match ParserEntry.parse_expr_string ctx.com.defines e p error false with
+		| ParseSuccess data -> data
+		| ParseError(_,(msg,p),_) -> (Parser.error msg p)
+		| ParseDisplayFile _ -> assert false (* cannot happen *)
+		end
 	with err ->
 		display_error ctx ("Could not parse `" ^ e ^ "`") p;
 		raise err
@@ -752,14 +768,18 @@ let call_init_macro ctx e =
 		error "Invalid macro call" p
 
 let interpret ctx =
-	let mctx = Interp.create ctx.com (make_macro_api ctx null_pos) in
+	let mctx = Interp.create ctx.com (make_macro_api ctx null_pos) false in
 	Interp.add_types mctx ctx.com.types (fun t -> ());
 	match ctx.com.main with
-	| None -> ()
-	| Some e -> ignore(Interp.eval_expr mctx e)
+		| None -> ()
+		| Some e -> ignore(Interp.eval_expr mctx e)
 
 let setup() =
 	Interp.setup Interp.macro_api
 
+let type_stored_expr ctx e1 =
+	let id = match e1 with (EConst (Int s),_) -> int_of_string s | _ -> assert false in
+	get_stored_typed_expr ctx.com id
+
 ;;
 load_macro_ref := load_macro;
diff --git a/src/typing/magicTypes.ml b/src/typing/magicTypes.ml
new file mode 100644
index 0000000000000000000000000000000000000000..3afc6f1eb5963619f87a51b864f8ad3ea9a362f6
--- /dev/null
+++ b/src/typing/magicTypes.ml
@@ -0,0 +1,145 @@
+open Ast
+open Globals
+open Common
+open Type
+open Typecore
+open Typeload
+open TypeloadModule
+open Error
+
+(* -------------------------------------------------------------------------- *)
+(* REMOTING PROXYS *)
+
+let extend_remoting ctx c t p async prot =
+	if c.cl_super <> None then error "Cannot extend several classes" p;
+	(* remove forbidden packages *)
+	let rules = ctx.com.package_rules in
+	ctx.com.package_rules <- PMap.foldi (fun key r acc -> match r with Forbidden -> acc | _ -> PMap.add key r acc) rules PMap.empty;
+	(* parse module *)
+	let path = (t.tpackage,t.tname) in
+	let new_name = (if async then "Async_" else "Remoting_") ^ t.tname in
+	(* check if the proxy already exists *)
+	let t = (try
+		load_type_def ctx p { tpackage = fst path; tname = new_name; tparams = []; tsub = None }
+	with
+		Error (Module_not_found _,p2) when p == p2 ->
+	(* build it *)
+	Common.log ctx.com ("Building proxy for " ^ s_type_path path);
+	let file, decls = (try
+		TypeloadParse.parse_module ctx path p
+	with
+		| Not_found -> ctx.com.package_rules <- rules; error ("Could not load proxy module " ^ s_type_path path ^ (if fst path = [] then " (try using absolute path)" else "")) p
+		| e -> ctx.com.package_rules <- rules; raise e) in
+	ctx.com.package_rules <- rules;
+	let base_fields = [
+		{ cff_name = "__cnx",null_pos; cff_pos = p; cff_doc = None; cff_meta = []; cff_access = []; cff_kind = FVar (Some (CTPath { tpackage = ["haxe";"remoting"]; tname = if async then "AsyncConnection" else "Connection"; tparams = []; tsub = None },null_pos),None) };
+		{ cff_name = "new",null_pos; cff_pos = p; cff_doc = None; cff_meta = []; cff_access = [APublic,null_pos]; cff_kind = FFun { f_args = [("c",null_pos),false,[],None,None]; f_type = None; f_expr = Some (EBinop (OpAssign,(EConst (Ident "__cnx"),p),(EConst (Ident "c"),p)),p); f_params = [] } };
+	] in
+	let tvoid = CTPath { tpackage = []; tname = "Void"; tparams = []; tsub = None } in
+	let build_field is_public acc f =
+		if fst f.cff_name = "new" then
+			acc
+		else match f.cff_kind with
+		| FFun fd when (is_public || List.mem_assoc APublic f.cff_access) && not (List.mem_assoc AStatic f.cff_access) ->
+			if List.exists (fun (_,_,_,t,_) -> t = None) fd.f_args then error ("Field " ^ fst f.cff_name ^ " type is not complete and cannot be used by RemotingProxy") p;
+			let eargs = [EArrayDecl (List.map (fun ((a,_),_,_,_,_) -> (EConst (Ident a),p)) fd.f_args),p] in
+			let ftype = (match fd.f_type with Some (CTPath { tpackage = []; tname = "Void" },_) -> None | _ -> fd.f_type) in
+			let fargs, eargs = if async then match ftype with
+				| Some (tret,_) -> fd.f_args @ [("__callb",null_pos),true,[],Some (CTFunction ([tret,null_pos],(tvoid,null_pos)),null_pos),None], eargs @ [EConst (Ident "__callb"),p]
+				| _ -> fd.f_args, eargs @ [EConst (Ident "null"),p]
+			else
+				fd.f_args, eargs
+			in
+			let id = (EConst (String (fst f.cff_name,SDoubleQuotes)), p) in
+			let id = if prot then id else ECall ((EConst (Ident "__unprotect__"),p),[id]),p in
+			let expr = ECall (
+				(EField (
+					(ECall ((EField ((EConst (Ident "__cnx"),p),"resolve"),p),[id]),p),
+					"call")
+				,p),eargs),p
+			in
+			let expr = if async || ftype = None then expr else (EReturn (Some expr),p) in
+			let fd = {
+				f_params = fd.f_params;
+				f_args = fargs;
+				f_type = if async then None else ftype;
+				f_expr = Some (EBlock [expr],p);
+			} in
+			{ cff_name = f.cff_name; cff_pos = f.cff_pos; cff_doc = None; cff_meta = []; cff_access = [APublic,null_pos]; cff_kind = FFun fd } :: acc
+		| _ -> acc
+	in
+	let decls = List.map (fun d ->
+		match d with
+		| EClass c, p when fst c.d_name = t.tname ->
+			let is_public = List.mem HExtern c.d_flags || List.mem HInterface c.d_flags in
+			let fields = List.rev (List.fold_left (build_field is_public) base_fields c.d_data) in
+			(EClass { c with d_flags = []; d_name = new_name,pos c.d_name; d_data = fields },p)
+		| _ -> d
+	) decls in
+	let m = type_module ctx (t.tpackage,new_name) file decls p in
+	add_dependency ctx.m.curmod m;
+	try
+		List.find (fun tdecl -> snd (t_path tdecl) = new_name) m.m_types
+	with Not_found ->
+		error ("Module " ^ s_type_path path ^ " does not define type " ^ t.tname) p
+	) in
+	match t with
+	| TClassDecl c2 when c2.cl_params = [] -> ignore(c2.cl_build()); c.cl_super <- Some (c2,[]);
+	| _ -> error "Remoting proxy must be a class without parameters" p
+
+(* -------------------------------------------------------------------------- *)
+(* HAXE.XML.PROXY *)
+
+let extend_xml_proxy ctx c t file p =
+	let t = load_complex_type ctx false (t,p) in
+	let file = (try Common.find_file ctx.com file with Not_found -> file) in
+	add_dependency c.cl_module (create_fake_module ctx file);
+	let used = ref PMap.empty in
+	let print_results() =
+		PMap.iter (fun id used ->
+			if not used then ctx.com.warning (id ^ " is not used") p;
+		) (!used)
+	in
+	let check_used = Common.defined ctx.com Define.CheckXmlProxy in
+	if check_used then ctx.g.hook_generate <- print_results :: ctx.g.hook_generate;
+	try
+		let rec loop = function
+			| Xml.Element (_,attrs,childs) ->
+				(try
+					let id = List.assoc "id" attrs in
+					if PMap.mem id c.cl_fields then error ("Duplicate id " ^ id) p;
+					let t = if not check_used then t else begin
+						used := PMap.add id false (!used);
+						let ft() = used := PMap.add id true (!used); t in
+						TLazy (ref (lazy_wait ft))
+					end in
+					let f = {
+						(mk_field id t p null_pos) with
+						cf_kind = Var { v_read = AccResolve; v_write = AccNo };
+					} in
+					c.cl_fields <- PMap.add id f c.cl_fields;
+				with
+					Not_found -> ());
+				List.iter loop childs;
+			| Xml.PCData _ -> ()
+		in
+		loop (Xml.parse_file file)
+	with
+		| Xml.Error e -> error ("XML error " ^ Xml.error e) p
+		| Xml.File_not_found f -> error ("XML File not found : " ^ f) p
+
+let on_inherit ctx c p (is_extends,tp) =
+	if not is_extends then
+		true
+	else match fst tp with
+	| { tpackage = ["haxe";"remoting"]; tname = "Proxy"; tparams = [TPType(CTPath t,null_pos)] } ->
+		extend_remoting ctx c t p false true;
+		false
+	| { tpackage = ["haxe";"remoting"]; tname = "AsyncProxy"; tparams = [TPType(CTPath t,null_pos)] } ->
+		extend_remoting ctx c t p true true;
+		false
+	| { tpackage = ["haxe";"xml"]; tname = "Proxy"; tparams = [TPExpr(EConst (String(file,SDoubleQuotes)),p);TPType (t,_)] } ->
+		extend_xml_proxy ctx c t file p;
+		true
+	| _ ->
+		true
diff --git a/src/typing/matcher.ml b/src/typing/matcher.ml
index f3de28e82bbeaad1f7e1d1c33dff537b41a5f97a..1f087035fe0d59a6a7b2ed96b916a7c87b737939 100644
--- a/src/typing/matcher.ml
+++ b/src/typing/matcher.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -21,12 +21,14 @@ open Globals
 open Ast
 open Type
 open Common
+open Texpr.Builder
 open Error
+open DisplayTypes
 
 exception Internal_match_failure
 
-let s_type = s_type (print_context())
-let s_expr_pretty = s_expr_pretty false "" false s_type
+let s_type t = s_type (print_context()) t
+let s_expr_pretty e = s_expr_pretty false "" false s_type e
 
 let fake_tuple_type = TInst(mk_class null_module ([],"-Tuple") null_pos null_pos, [])
 
@@ -37,10 +39,21 @@ let make_offset_list left right middle other =
 	(ExtList.List.make left other) @ [middle] @ (ExtList.List.make right other)
 
 let type_field_access ctx ?(resume=false) e name =
-	Typer.acc_get ctx (Typer.type_field ~resume ctx e name e.epos Typer.MGet) e.epos
+	Calls.acc_get ctx (Fields.type_field (Fields.TypeFieldConfig.create resume) ctx e name e.epos MGet) e.epos
 
 let unapply_type_parameters params monos =
-	List.iter2 (fun (_,t1) t2 -> match t2,follow t2 with TMono m1,TMono m2 when m1 == m2 -> Type.unify t1 t2 | _ -> ()) params monos
+	let unapplied = ref [] in
+	List.iter2 (fun (_,t1) t2 ->
+		match t2,follow t2 with
+		| TMono m1,TMono m2 ->
+			unapplied := (m1,!m1) :: !unapplied;
+			m1 := Some t1;
+		| _ -> ()
+	) params monos;
+	!unapplied
+
+let reapply_type_parameters unapplied =
+	List.iter (fun (m,o) -> m := o) unapplied
 
 let get_general_module_type ctx mt p =
 	let rec loop = function
@@ -56,10 +69,10 @@ let get_general_module_type ctx mt p =
 			end
 		| _ -> error "Cannot use this type as a value" p
 	in
-	Typeload.load_instance ctx ({tname=loop mt;tpackage=[];tsub=None;tparams=[]},null_pos) true p
+	Typeload.load_instance ctx ({tname=loop mt;tpackage=[];tsub=None;tparams=[]},p) true
 
 module Constructor = struct
-	type t =
+	type t_kind =
 		| ConConst of tconstant
 		| ConEnum of tenum * tenum_field
 		| ConStatic of tclass * tclass_field
@@ -67,7 +80,9 @@ module Constructor = struct
 		| ConFields of string list
 		| ConArray of int
 
-	let to_string con = match con with
+	type t = t_kind * pos
+
+	let to_string con = match fst con with
 		| ConConst ct -> s_const ct
 		| ConEnum(en,ef) -> ef.ef_name
 		| ConStatic(c,cf) -> Printf.sprintf "%s.%s" (s_type_path (match c.cl_kind with KAbstractImpl a -> a.a_path | _ -> c.cl_path)) cf.cf_name
@@ -75,7 +90,7 @@ module Constructor = struct
 		| ConFields fields -> Printf.sprintf "{ %s }" (String.concat ", " fields)
 		| ConArray i -> Printf.sprintf "<array %i>" i
 
-	let equal con1 con2 = match con1,con2 with
+	let equal con1 con2 = match fst con1,fst con2 with
 		| ConConst ct1,ConConst ct2 -> ct1 = ct2
 		| ConEnum(en1,ef1),ConEnum(en2,ef2) -> en1 == en2 && ef1 == ef2
 		| ConStatic(c1,cf1),ConStatic(c2,cf2) -> c1 == c2 && cf1 == cf2
@@ -84,7 +99,7 @@ module Constructor = struct
 		| ConArray i1,ConArray i2 -> i1 = i2
 		| _ -> false
 
-	let arity con = match con with
+	let arity con = match fst con with
 		| ConEnum (_,{ef_type = TFun(args,_)}) -> List.length args
 		| ConEnum _ -> 0
 		| ConConst _ -> 0
@@ -93,7 +108,7 @@ module Constructor = struct
 		| ConTypeExpr _ -> 0
 		| ConStatic _ -> 0
 
-	let compare con1 con2 = match con1,con2 with
+	let compare con1 con2 = match fst con1,fst con2 with
 		| ConConst ct1,ConConst ct2 -> compare ct1 ct2
 		| ConEnum(en1,ef1),ConEnum(en2,ef2) -> compare ef1.ef_index ef2.ef_index
 		| ConStatic(c1,cf1),ConStatic(c2,cf2) -> compare cf1.cf_name cf2.cf_name
@@ -104,20 +119,19 @@ module Constructor = struct
 
 	open Typecore
 
-	let to_texpr ctx match_debug p con = match con with
+	let to_texpr ctx match_debug con =
+		let p = pos con in
+		match fst con with
 		| ConEnum(en,ef) ->
-			if Meta.has Meta.FakeEnum en.e_meta then begin
-				let e_mt = !type_module_type_ref ctx (TEnumDecl en) None p in
- 				mk (TField(e_mt,FEnum(en,ef))) ef.ef_type p
- 			end else if match_debug then mk (TConst (TString ef.ef_name)) ctx.t.tstring p
+			if match_debug then mk (TConst (TString ef.ef_name)) ctx.t.tstring p
 			else mk (TConst (TInt (Int32.of_int ef.ef_index))) ctx.t.tint p
-		| ConConst ct -> Codegen.ExprBuilder.make_const_texpr ctx.com ct p
-		| ConArray i -> Codegen.ExprBuilder.make_int ctx.com i p
-		| ConTypeExpr mt -> Typer.type_module_type ctx mt None p
-		| ConStatic(c,cf) -> Codegen.ExprBuilder.make_static_field c cf p
+		| ConConst ct -> make_const_texpr ctx.com.basic ct p
+		| ConArray i -> make_int ctx.com.basic i p
+		| ConTypeExpr mt -> TyperBase.type_module_type ctx mt None p
+		| ConStatic(c,cf) -> make_static_field c cf p
 		| ConFields _ -> error "Something went wrong" p
 
-	let hash = Hashtbl.hash
+	let hash con = Hashtbl.hash (fst con)
 end
 
 module Pattern = struct
@@ -138,8 +152,11 @@ module Pattern = struct
 	type pattern_context = {
 		ctx : typer;
 		or_locals : (string, tvar * pos) PMap.t option;
+		ctx_locals : (string, tvar) PMap.t;
 		mutable current_locals : (string, tvar * pos) PMap.t;
 		mutable in_reification : bool;
+		is_postfix_match : bool;
+		unapply_type_parameters : unit -> (Type.t option ref * Type.t option) list;
 	}
 
 	exception Bad_pattern of string
@@ -159,11 +176,11 @@ module Pattern = struct
 			| TAbstract(a,_) -> unify ctx (TAbstract(a,[mk_mono()])) t p
 			| _ -> assert false
 
-	let rec make pctx t e =
+	let rec make pctx toplevel t e =
 		let ctx = pctx.ctx in
 		let p = pos e in
 		let fail () =
-			error ("Unrecognized pattern: " ^ (Ast.s_expr e)) p
+			error ("Unrecognized pattern: " ^ (Ast.Printer.s_expr e)) p
 		in
 		let unify_expected t' =
 			unify ctx t' t p
@@ -171,8 +188,9 @@ module Pattern = struct
 		let verror name p =
 			error (Printf.sprintf "Variable %s must appear exactly once in each sub-pattern" name) p
 		in
-		let add_local name p =
+		let add_local final name p =
 			let is_wildcard_local = name = "_" in
+			if not is_wildcard_local && pctx.is_postfix_match then error "Pattern variables are not allowed in .match patterns" p;
 			if not is_wildcard_local && PMap.mem name pctx.current_locals then error (Printf.sprintf "Variable %s is bound multiple times" name) p;
 			match pctx.or_locals with
 			| Some map when not is_wildcard_local ->
@@ -181,84 +199,105 @@ module Pattern = struct
 				pctx.current_locals <- PMap.add name (v,p) pctx.current_locals;
 				v
 			| _ ->
-				let v = alloc_var name t p in
+				let v = alloc_var (VUser TVOPatternVariable) name t p in
+				if final then v.v_final <- true;
 				pctx.current_locals <- PMap.add name (v,p) pctx.current_locals;
 				ctx.locals <- PMap.add name v ctx.locals;
 				v
 		in
+		let con_enum en ef p =
+			if not (Common.defined ctx.com Define.NoDeprecationWarnings) then begin
+				DeprecationCheck.check_enum pctx.ctx.com en p;
+				DeprecationCheck.check_ef pctx.ctx.com ef p;
+			end;
+			ConEnum(en,ef),p
+		in
+		let con_static c cf p = ConStatic(c,cf),p in
+		let con_const ct p = ConConst ct,p in
+		let con_type_expr mt p = ConTypeExpr mt,p in
+		let con_array i p = ConArray i,p in
+		let con_fields fl p = ConFields fl,p in
 		let check_expr e =
 			let rec loop e = match e.eexpr with
 				| TField(_,FEnum(en,ef)) ->
 					(* Let the unification afterwards fail so we don't recover. *)
 					(* (match follow ef.ef_type with TFun _ -> raise Exit | _ -> ()); *)
-					PatConstructor(ConEnum(en,ef),[])
+					PatConstructor(con_enum en ef e.epos,[])
 				| TField(_,FStatic(c,({cf_kind = Var {v_write = AccNever}} as cf))) ->
-					PatConstructor(ConStatic(c,cf),[])
+					PatConstructor(con_static c cf e.epos,[])
 				| TConst ct ->
-					PatConstructor(ConConst ct,[])
+					PatConstructor(con_const ct e.epos,[])
 				| TCast(e1,None) ->
 					loop e1
 				| TField _ ->
 					raise (Bad_pattern "Only inline or read-only (default, never) fields can be used as a pattern")
+				| TTypeExpr mt ->
+					PatConstructor(con_type_expr mt e.epos,[])
 				| _ ->
 					raise Exit
 			in
 			loop e
 		in
+		let display_mode () =
+			if pctx.is_postfix_match then DKMarked else DKPattern toplevel
+		in
 		let try_typing e =
 			let old = ctx.untyped in
 			ctx.untyped <- true;
-			let e = try type_expr ctx e (WithType t) with exc -> ctx.untyped <- old; raise exc in
+			let e = try type_expr ctx e (WithType.with_type t) with exc -> ctx.untyped <- old; raise exc in
 			ctx.untyped <- old;
-			match e.eexpr with
-				| TTypeExpr mt ->
-					unify_type_pattern ctx mt t e.epos;
-					PatConstructor(ConTypeExpr mt,[])
-				| _ ->
-					let pat = check_expr e in
-					begin try
-						Type.unify e.etype t
-					with (Unify_error l) ->
-						(* Hack: Allow matching the underlying type against its abstract. *)
-						begin match follow e.etype with
-							| TAbstract(a,tl) when not (Meta.has Meta.CoreType a.a_meta) && type_iseq t (Abstract.get_underlying_type a tl) -> ()
-							| _ -> raise_or_display ctx l p
-						end
-					end;
-					pat
+			let pat = check_expr e in
+			begin match pat with
+				| PatConstructor((ConTypeExpr mt,_),_) -> unify_type_pattern ctx mt t e.epos;
+				| _ -> unify ctx e.etype t p;
+			end;
+			pat
 		in
 		let handle_ident s p =
-			let save =
-				let old = ctx.locals in
-				ctx.locals <- (try PMap.add "this" (PMap.find "this" old) PMap.empty with Not_found -> PMap.empty);
-				(fun () ->
-					ctx.locals <- old;
-				)
-			in
 			try
-				let pat = try_typing (EConst (Ident s),p) in
-				save();
-				pat
+				try_typing (EConst (Ident s),p)
 			with
 			| Exit | Bad_pattern _ ->
+				let restore =
+					let old = ctx.on_error in
+					ctx.on_error <- (fun _ _ _ ->
+						raise Exit
+					);
+					(fun () ->
+						ctx.on_error <- old
+					)
+				in
 				begin try
 					let mt = module_type_of_type t in
-					let e_mt = Typer.type_module_type ctx mt None p in
+					let e_mt = TyperBase.type_module_type ctx mt None p in
 					let e = type_field_access ctx ~resume:true e_mt s in
-					let pat = check_expr e in
-					save();
-					pat
+					restore();
+					check_expr e
 				with _ ->
-					save();
+					restore();
 					if not (is_lower_ident s) && (match s.[0] with '`' | '_' -> false | _ -> true) then begin
-						display_error ctx "Capture variables must be lower-case" p;
+						display_error ctx "Pattern variables must be lower-case" p;
+					end;
+					let sl = match follow t with
+						| TEnum(en,_) ->
+							en.e_names
+						| TAbstract({a_impl = Some c} as a,pl) when Meta.has Meta.Enum a.a_meta ->
+							ExtList.List.filter_map (fun cf ->
+								if Meta.has Meta.Impl cf.cf_meta && Meta.has Meta.Enum cf.cf_meta then Some cf.cf_name else None
+							) c.cl_ordered_statics
+						| _ ->
+							[]
+					in
+					begin match StringError.get_similar s sl with
+						| [] ->
+							()
+							(* if toplevel then
+								pctx.ctx.com.warning (Printf.sprintf "`case %s` has been deprecated, use `case var %s` instead" s s) p *)
+						| l -> pctx.ctx.com.warning ("Potential typo detected (expected similar values are " ^ (String.concat ", " l) ^ "). Consider using `var " ^ s ^ "` instead") p
 					end;
-					let v = add_local s p in
+					let v = add_local false s p in
 					PatVariable v
 				end
-			| exc ->
-				save();
-				raise exc
 		in
 		let rec loop e = match fst e with
 			| EParenthesis e1 | ECast(e1,None) ->
@@ -270,34 +309,31 @@ module Pattern = struct
 				pctx.in_reification <- old;
 				e
 			| EConst((Ident ("false" | "true") | Int _ | String _ | Float _) as ct) ->
-				let e = Codegen.type_constant ctx.com ct p in
+				let p = pos e in
+				let e = Texpr.type_constant ctx.com.basic ct p in
 				unify_expected e.etype;
 				let ct = match e.eexpr with TConst ct -> ct | _ -> assert false in
-				PatConstructor(ConConst ct,[])
+				PatConstructor(con_const ct p,[])
 			| EConst (Ident i) ->
-				begin match i with
-					| "_" ->
-						begin match follow t with
-							| TFun(ta,tr) when tr == fake_tuple_type ->
-								PatTuple(List.map (fun (_,_,t) -> (PatAny,pos e)) ta)
-							| _ ->
-								PatAny
-						end
+				begin match follow t with
+					| TFun(ta,tr) when tr == fake_tuple_type ->
+						if i = "_" then PatTuple(List.map (fun (_,_,t) -> (PatAny,pos e)) ta)
+						else error "Cannot bind matched tuple to variable, use _ instead" p
 					| _ ->
-						handle_ident i (pos e)
+						if i = "_" then PatAny
+						else handle_ident i (pos e)
 				end
-			| EVars([(s,p),None,None]) ->
-				let v = add_local s p in
+			| EVars([(s,p),final,None,None]) ->
+				let v = add_local final s p in
 				PatVariable v
 			| ECall(e1,el) ->
-				let t = tfun (List.map (fun _ -> mk_mono()) el) t in
-				let e1 = type_expr ctx e1 (WithType t) in
+				let e1 = type_expr ctx e1 (WithType.with_type t) in
 				begin match e1.eexpr,follow e1.etype with
 					| TField(_, FEnum(en,ef)),TFun(_,TEnum(_,tl)) ->
 						let monos = List.map (fun _ -> mk_mono()) ef.ef_params in
 						let map t = apply_params en.e_params tl (apply_params ef.ef_params monos t) in
-						(* We cannot use e1.etype here because it has applied type parameters (issue #1310). *)
-						let args = match follow (map ef.ef_type) with
+						unify ctx (map ef.ef_type) e1.etype e1.epos;
+						let args = match follow e1.etype with
 							| TFun(args,r) ->
 								unify_expected r;
 								args
@@ -308,7 +344,7 @@ module Pattern = struct
 								(* Allow using final _ to match "multiple" arguments *)
 								(PatAny,p) :: (match tl with [] -> [] | _ -> loop el tl)
 							| e :: el,(_,_,t) :: tl ->
-								make pctx t e :: loop el tl
+								make pctx false t e :: loop el tl
 							| [],(_,true,t) :: tl ->
 								(PatAny,pos e) :: loop [] tl
 							| [],[] ->
@@ -319,10 +355,8 @@ module Pattern = struct
 								error "Too many arguments" p
 						in
 						let patterns = loop el args in
-						(* We want to change the original monomorphs back to type parameters, but we don't want to do that
-						   if they are bound to other monomorphs (issue #4578). *)
-						unapply_type_parameters ef.ef_params monos;
-						PatConstructor(ConEnum(en,ef),patterns)
+						ignore(unapply_type_parameters ef.ef_params monos);
+						PatConstructor(con_enum en ef e1.epos,patterns)
 					| _ ->
 						fail()
 				end
@@ -334,11 +368,11 @@ module Pattern = struct
 					| Bad_pattern s -> error s p
 				end
 			| EArrayDecl el ->
-				begin match follow t with
+				let rec pattern t = match follow t with
 					| TFun(tl,tr) when tr == fake_tuple_type ->
 						let rec loop el tl = match el,tl with
 							| e :: el,(_,_,t) :: tl ->
-								let pat = make pctx t e in
+								let pat = make pctx false t e in
 								pat :: loop el tl
 							| [],[] -> []
 							| [],_ -> error "Not enough arguments" p
@@ -348,35 +382,56 @@ module Pattern = struct
 						PatTuple patterns
 					| TInst({cl_path=[],"Array"},[t2]) | (TDynamic _ as t2) ->
 						let patterns = ExtList.List.mapi (fun i e ->
-							make pctx t2 e
+							make pctx false t2 e
 						) el in
-						PatConstructor(ConArray (List.length patterns),patterns)
+						PatConstructor(con_array (List.length patterns) (pos e),patterns)
+					| TAbstract(a,tl) ->
+						begin match TyperBase.get_abstract_froms a tl with
+							| [t2] -> pattern t2
+							| _ -> fail()
+						end
 					| _ ->
 						fail()
-				end
+				in
+				pattern t
 			| EObjectDecl fl ->
-				let known_fields = match follow t with
+				let rec known_fields t = match follow t with
 					| TAnon an ->
 						PMap.fold (fun cf acc -> (cf,cf.cf_type) :: acc) an.a_fields []
 					| TInst(c,tl) ->
 						let rec loop fields c tl =
-							let fields = List.fold_left (fun acc cf -> (cf,apply_params c.cl_params tl cf.cf_type) :: acc) fields c.cl_ordered_fields in
+							let fields = List.fold_left (fun acc cf ->
+								if Typecore.can_access ctx c cf false then (cf,apply_params c.cl_params tl cf.cf_type) :: acc
+								else acc
+							) fields c.cl_ordered_fields in
 							match c.cl_super with
 								| None -> fields
 								| Some (csup,tlsup) -> loop fields csup (List.map (apply_params c.cl_params tl) tlsup)
 						in
 						loop [] c tl
 					| TAbstract({a_impl = Some c} as a,tl) ->
+						let fields = try
+							let _,el,_ = Meta.get Meta.Forward a.a_meta in
+							let sl = ExtList.List.filter_map (fun e -> match fst e with
+								| EConst(Ident s) -> Some s
+								| _ -> None
+							) el in
+							let fields = known_fields (Abstract.get_underlying_type a tl) in
+							if sl = [] then fields else List.filter (fun (cf,t) -> List.mem cf.cf_name sl) fields
+						with Not_found ->
+							[]
+						in
 						let fields = List.fold_left (fun acc cf ->
 							if Meta.has Meta.Impl cf.cf_meta then
 								(cf,apply_params a.a_params tl cf.cf_type) :: acc
 							else
 								acc
-						) [] c.cl_ordered_statics in
+						) fields c.cl_ordered_statics in
 						fields
 					| _ ->
 						error (Printf.sprintf "Cannot field-match against %s" (s_type t)) (pos e)
 				in
+				let known_fields = known_fields t in
 				let is_matchable cf =
 					match cf.cf_kind with Method _ -> false | _ -> true
 				in
@@ -384,58 +439,86 @@ module Pattern = struct
 					try
 						if pctx.in_reification && cf.cf_name = "pos" then raise Not_found;
 						let e1 = Expr.field_assoc cf.cf_name fl in
-						make pctx t e1 :: patterns,cf.cf_name :: fields
+						make pctx false t e1 :: patterns,cf.cf_name :: fields
 					with Not_found ->
 						if is_matchable cf then
 							(PatAny,cf.cf_pos) :: patterns,cf.cf_name :: fields
 						else
 							patterns,fields
 				) ([],[]) known_fields in
-				List.iter (fun ((s,_),e) -> if not (List.mem s fields) then error (Printf.sprintf "%s has no field %s" (s_type t) s) (pos e)) fl;
-				PatConstructor(ConFields fields,patterns)
+				List.iter (fun ((s,_,_),e) -> if not (List.mem s fields) then error (Printf.sprintf "%s has no field %s" (s_type t) s) (pos e)) fl;
+				PatConstructor(con_fields fields (pos e),patterns)
 			| EBinop(OpOr,e1,e2) ->
 				let pctx1 = {pctx with current_locals = PMap.empty} in
-				let pat1 = make pctx1 t e1 in
+				let pat1 = make pctx1 toplevel t e1 in
 				let pctx2 = {pctx with current_locals = PMap.empty; or_locals = Some (pctx1.current_locals)} in
-				let pat2 = make pctx2 t e2 in
+				let pat2 = make pctx2 toplevel t e2 in
 				PMap.iter (fun name (v,p) ->
-					if not (PMap.mem name pctx2.current_locals) then verror name p;
+					if not (PMap.mem name pctx2.current_locals) && name <> "_" then verror name p;
 					pctx.current_locals <- PMap.add name (v,p) pctx.current_locals
 				) pctx1.current_locals;
 				PatOr(pat1,pat2)
-			| EBinop(OpAssign,(EConst (Ident s),p),e2) ->
-				let pat = make pctx t e2 in
-				let v = add_local s p in
-				PatBind(v,pat)
+			| EBinop(OpAssign,e1,e2) ->
+				let rec loop dko e = match e with
+					| (EConst (Ident s),p) ->
+						let v = add_local false s p in
+						begin match dko with
+						| None -> ()
+						| Some dk -> ignore(TyperDisplay.display_expr ctx e (mk (TLocal v) v.v_type p) dk (WithType.with_type t) p);
+						end;
+						let pat = make pctx false t e2 in
+						PatBind(v,pat)
+					| (EParenthesis e1,_) -> loop dko e1
+					| (EDisplay(e1,dk),_) -> loop (Some dk) e1
+					| _ -> fail()
+				in
+				loop None e1
 			| EBinop(OpArrow,e1,e2) ->
-				let v = add_local "_" null_pos in
-				let e1 = type_expr ctx e1 Value in
+				let restore = save_locals ctx in
+				ctx.locals <- pctx.ctx_locals;
+				let v = add_local false "_" null_pos in
+				(* Tricky stuff: Extractor expressions are like normal expressions, so we don't want to deal with GADT-applied types here.
+				   Let's unapply, then reapply after we're done with the extractor (#5952). *)
+				let unapplied = pctx.unapply_type_parameters () in
+				let e1 = type_expr ctx e1 WithType.value in
+				reapply_type_parameters unapplied;
 				v.v_name <- "tmp";
-				let pat = make pctx e1.etype e2 in
+				restore();
+				let pat = make pctx toplevel e1.etype e2 in
 				PatExtractor(v,e1,pat)
-			| EDisplay(e,iscall) ->
+			(* Special case for completion on a pattern local: We don't want to add the local to the context
+			   while displaying (#7319) *)
+			| EDisplay((EConst (Ident _),_ as e),dk) when pctx.ctx.com.display.dms_kind = DMDefault ->
+				let locals = ctx.locals in
+				let pat = loop e in
+				let locals' = ctx.locals in
+				ctx.locals <- locals;
+				ignore(TyperDisplay.handle_edisplay ctx e (display_mode()) (WithType.with_type t));
+				ctx.locals <- locals';
+				pat
+			(* For signature completion, we don't want to recurse into the inner pattern because there's probably
+			   a EDisplay(_,DMMarked) in there. We can handle display immediately because inner patterns should not
+			   matter (#7326) *)
+			| EDisplay(e1,DKCall) ->
+				ignore(TyperDisplay.handle_edisplay ctx e (display_mode()) (WithType.with_type t));
+				loop e1
+			| EDisplay(e,dk) ->
 				let pat = loop e in
-				let _ = if iscall then Typer.handle_signature_display ctx e (WithType t)
-				else Typer.handle_display ctx e (WithType t) in
+				ignore(TyperDisplay.handle_edisplay ctx e (display_mode()) (WithType.with_type t));
 				pat
+			| EMeta((Meta.StoredTypedExpr,_,_),e1) ->
+				let e1 = MacroContext.type_stored_expr ctx e1 in
+				loop (TExprToExpr.convert_expr e1)
 			| _ ->
 				fail()
 		in
 		let pat = loop e in
 		pat,p
-
-	let make ctx t e =
-		let pctx = {
-			ctx = ctx;
-			current_locals = PMap.empty;
-			or_locals = None;
-			in_reification = false;
-		} in
-		make pctx t e
 end
 
 module Case = struct
 	open Typecore
+	open Pattern
 
 	type t = {
 		case_guard : texpr option;
@@ -443,7 +526,7 @@ module Case = struct
 		case_pos : pos;
 	}
 
-	let make ctx t el eg eo_ast with_type p =
+	let make ctx t el eg eo_ast with_type postfix_match p =
 		let rec collapse_case el = match el with
 			| e :: [] ->
 				e
@@ -464,20 +547,29 @@ module Case = struct
 		) ctx.locals [] in
 		let old_ret = ctx.ret in
 		ctx.ret <- map ctx.ret;
-		let pat = Pattern.make ctx (map t) e in
-		unapply_type_parameters ctx.type_params monos;
+		let pctx = {
+			ctx = ctx;
+			current_locals = PMap.empty;
+			ctx_locals = ctx.locals;
+			or_locals = None;
+			in_reification = false;
+			is_postfix_match = postfix_match;
+			unapply_type_parameters = (fun () -> unapply_type_parameters ctx.type_params monos);
+		} in
+		let pat = Pattern.make pctx true (map t) e in
+		ignore(unapply_type_parameters ctx.type_params monos);
 		let eg = match eg with
 			| None -> None
-			| Some e -> Some (type_expr ctx e Value)
+			| Some e -> Some (type_expr ctx e WithType.value)
 		in
 		let eo = match eo_ast,with_type with
-			| None,WithType t ->
+			| None,WithType.WithType(t,_) ->
 				unify ctx ctx.t.tvoid t (pos e);
 				None
 			| None,_ ->
 				None
-			| Some e,WithType t ->
-				let e = type_expr ctx e (WithType (map t)) in
+			| Some e,WithType.WithType(t,_) ->
+				let e = type_expr ctx e (WithType.with_type (map t)) in
 				let e = AbstractCast.cast_or_unify ctx (map t) e e.epos in
 				Some e
 			| Some e,_ ->
@@ -487,11 +579,6 @@ module Case = struct
 		ctx.ret <- old_ret;
 		List.iter (fun (v,t) -> v.v_type <- t) old_types;
 		save();
-		if ctx.is_display_file && Display.is_display_position p then begin match eo,eo_ast with
-			| Some e,Some e_ast -> ignore(Typer.display_expr ctx e_ast e with_type p)
-			| None,None -> ignore(Typer.display_expr ctx (EBlock [],p) (mk (TBlock []) ctx.t.tvoid p) with_type p)
-			| _ -> assert false
-		end;
 		{
 			case_guard = eg;
 			case_expr = eo;
@@ -522,31 +609,85 @@ module Decision_tree = struct
 		dt_i : int;
 		dt_pos : pos;
 		mutable dt_goto_target : bool;
+		mutable dt_texpr : texpr option;
 	}
 
-	let s_case_expr tabs case = match case.case_expr with
-		| None -> ""
-		| Some e -> Type.s_expr_pretty false tabs false s_type e
-
-	let rec to_string tabs dt = match dt.dt_t with
-		| Leaf case ->
-			s_case_expr tabs case
-		| Switch(e,cases,dt) ->
-			let s_case (con,b,dt) =
-				Printf.sprintf "\n\t%scase %s%s: %s" tabs (Constructor.to_string con) (if b then "(unguarded) " else "") (to_string (tabs ^ "\t") dt)
-			in
-			let s_cases = String.concat "" (List.map s_case cases) in
-			let s_default = to_string (tabs ^ "\t") dt in
-			Printf.sprintf "switch (%s) {%s\n%s\tdefault: %s\n%s}" (Type.s_expr_pretty false tabs false s_type e) s_cases tabs s_default tabs
-		| Bind(bl,dt) ->
-			(String.concat "" (List.map (fun (v,_,e) -> if v.v_name = "_" then "" else Printf.sprintf "%s<%i> = %s; " v.v_name v.v_id (s_expr_pretty e)) bl)) ^
-			to_string tabs dt
-		| Guard(e,dt1,dt2) ->
-			Printf.sprintf "if (%s) {\n\t%s%s\n%s} else {\n\t%s%s\n%s}" (s_expr_pretty e) tabs (to_string (tabs ^ "\t") dt1) tabs tabs (to_string (tabs ^ "\t") dt2) tabs
-		| GuardNull(e,dt1,dt2) ->
-			Printf.sprintf "if (%s == null) {\n\t%s%s\n%s} else {\n\t%s%s\n%s}" (s_expr_pretty e) tabs (to_string (tabs ^ "\t") dt1) tabs tabs (to_string (tabs ^ "\t") dt2) tabs
-		| Fail ->
-			"<fail>"
+	let tab_string = "    "
+
+	let to_string dt =
+		let buf = Buffer.create 0 in
+		let indices = Stack.create () in
+		let push_index i = Stack.push i indices in
+		let add_line tabs s =
+			if Buffer.length buf > 0 then Buffer.add_char buf '\n';
+			if not (Stack.is_empty indices) then begin
+				Buffer.add_string buf (Printf.sprintf "%2i" (Stack.pop indices));
+				Buffer.add_substring buf tabs 0 (String.length tabs - 2);
+			end else
+				Buffer.add_string buf tabs;
+			Buffer.add_string buf s
+		in
+		let add s =
+			Buffer.add_string buf s
+		in
+		let s_expr tabs e =
+			Type.s_expr_pretty false tabs false s_type e
+		in
+		let print_expr_noblock tabs e = match e.eexpr with
+			| TBlock el ->
+				List.iter (fun e ->
+					add_line tabs (s_expr tabs e) ;
+				) el
+			| _ ->
+				add_line tabs (s_expr tabs e)
+		in
+		let print_case_expr tabs case = match case.case_expr with
+			| None ->
+				()
+			| Some e ->
+				print_expr_noblock tabs e
+		in
+		let rec loop tabs dt =
+			push_index dt.dt_i;
+			match dt.dt_t with
+			| Leaf case ->
+				print_case_expr tabs case
+			| Switch(e,cases,dt) ->
+				add_line tabs (Printf.sprintf "switch (%s)" (s_expr tabs e));
+				List.iter (fun (con,unguarded,dt) ->
+					add_line (tabs ^ tab_string) "case ";
+					add (Constructor.to_string con);
+					add (if unguarded then "(unguarded)" else "guarded");
+					add ":";
+					loop (tabs ^ tab_string ^ tab_string) dt;
+				) cases;
+				add_line (tabs ^ tab_string) "default";
+				loop (tabs ^ tab_string ^ tab_string) dt;
+			| Bind(bl,dt) ->
+				List.iter (fun (v,_,e) ->
+					add_line tabs "var ";
+					add v.v_name;
+					add " = ";
+					add (s_expr tabs e);
+				) bl;
+				loop tabs dt
+			| Guard(e,dt1,dt2) ->
+				print_guard tabs e dt1 dt2 false
+			| GuardNull(e,dt1,dt2) ->
+				print_guard tabs e dt1 dt2 true
+			| Fail ->
+				add_line tabs "<fail>";
+		and print_guard tabs e dt1 dt2 is_null_guard =
+			add_line tabs "if (";
+			add (s_expr tabs e);
+			if is_null_guard then add " == null";
+			add ")";
+			loop (tabs ^ tab_string) dt1;
+			add_line tabs "else";
+			loop (tabs ^ tab_string) dt2;
+		in
+		loop tab_string dt;
+		Buffer.contents buf
 
 	let equal_dt dt1 dt2 = dt1.dt_i = dt2.dt_i
 
@@ -554,11 +695,11 @@ module Decision_tree = struct
 		| Leaf case1,Leaf case2 ->
 			case1 == case2
 		| Switch(subject1,cases1,dt1),Switch(subject2,cases2,dt2) ->
-			subject1 == subject2 &&
+			Texpr.equal subject1 subject2 &&
 			safe_for_all2 (fun (con1,b1,dt1) (con2,b2,dt2) -> Constructor.equal con1 con2 && b1 = b2 && equal_dt dt1 dt2) cases1 cases2 &&
 			equal_dt dt1 dt2
 		| Bind(l1,dt1),Bind(l2,dt2) ->
-			safe_for_all2 (fun (v1,_,e1) (v2,_,e2) -> v1 == v2 && e1 == e2) l1 l2 &&
+			safe_for_all2 (fun (v1,_,e1) (v2,_,e2) -> v1 == v2 && Texpr.equal e1 e2) l1 l2 &&
 			equal_dt dt1 dt2
 		| Fail,Fail ->
 			true
@@ -634,7 +775,7 @@ module Useless = struct
 					let s = specialize false con pM in
 					u s (patterns @ ql)
 				| PatTuple patterns ->
-					let s = specialize true (ConConst TNull) pM in
+					let s = specialize true (ConConst TNull,pos pat) pM in
 					u s (patterns @ ql)
 				| (PatVariable _ | PatAny) ->
 					let d = default pM in
@@ -734,7 +875,7 @@ module Useless = struct
 					let pM,qM,rM = specialize' false con pM qM rM in
 					u' pM qM rM (patterns @ pl) q r
 				| PatTuple patterns ->
-					let pM,qM,rM = specialize' true (ConConst TNull) pM qM rM in
+					let pM,qM,rM = specialize' true (ConConst TNull,pos pat) pM qM rM in
 					u' pM qM rM (patterns @ pl) q r
 				| PatAny | PatVariable _ ->
 					let pM,qM = transfer_column pM qM in
@@ -788,7 +929,7 @@ module Compile = struct
 		try
 			DtTable.find mctx.dt_table dt
 		with Not_found ->
-			let dti = {dt_t = dt; dt_i = mctx.dt_count; dt_pos = p; dt_goto_target = false } in
+			let dti = {dt_t = dt; dt_i = mctx.dt_count; dt_pos = p; dt_goto_target = false; dt_texpr = None } in
 			DtTable.add mctx.dt_table dt dti;
 			mctx.dt_count <- mctx.dt_count + 1;
 			dti
@@ -800,15 +941,27 @@ module Compile = struct
 	let guard mctx e dt1 dt2 = hashcons mctx (Guard(e,dt1,dt2)) (punion dt1.dt_pos dt2.dt_pos)
 	let guard_null mctx e dt1 dt2 = hashcons mctx (GuardNull(e,dt1,dt2)) (punion dt1.dt_pos dt2.dt_pos)
 
-	let rec get_sub_subjects mctx e con =
-		match con with
+	let rec get_sub_subjects mctx e con arg_positions =
+		match fst con with
 		| ConEnum(en,ef) ->
 			let tl = List.map (fun _ -> mk_mono()) en.e_params in
 			let t_en = TEnum(en,tl) in
 			let e = if not (type_iseq t_en e.etype) then mk (TCast(e,None)) t_en e.epos else e in
 			begin match follow ef.ef_type with
 				| TFun(args,_) ->
-					ExtList.List.mapi (fun i (_,_,t) -> mk (TEnumParameter(e,ef,i)) (apply_params en.e_params tl (monomorphs ef.ef_params t)) e.epos) args
+					let rec combine args positions =
+						match (args, positions) with
+							| (a :: args, p :: positions) -> (a, p) :: combine args positions
+							| (a :: args, []) -> (a, e.epos) :: combine args positions
+							| _ -> []
+					in
+					let arg_and_pos = combine args arg_positions in
+					ExtList.List.mapi
+						(fun i ((_,_,t), p) ->
+							let params = apply_params en.e_params tl (monomorphs ef.ef_params t) in
+							mk (TEnumParameter({ e with epos = p },ef,i)) params p
+						)
+						arg_and_pos
 				| _ ->
 					[]
 			end
@@ -816,10 +969,9 @@ module Compile = struct
 			List.map (type_field_access mctx.ctx e) sl
 		| ConArray 0 -> []
 		| ConArray i ->
-			let t = match follow e.etype with TInst({cl_path=[],"Array"},[t]) -> t | TDynamic _ as t -> t | _ -> assert false in
 			ExtList.List.init i (fun i ->
-				let ei = Codegen.ExprBuilder.make_int mctx.ctx.com i e.epos in
-				mk (TArray(e,ei)) t e.epos
+				let ei = make_int mctx.ctx.com.basic i e.epos in
+				Calls.acc_get mctx.ctx (Calls.array_access mctx.ctx e ei MGet e.epos) e.epos
 			)
 		| ConConst _ | ConTypeExpr _ | ConStatic _ ->
 			[]
@@ -981,28 +1133,39 @@ module Compile = struct
 			let unguarded = ConTable.create 0 in
 			let null = ref [] in
 			List.iter (fun (case,bindings,patterns) ->
-				let rec loop pat = match fst pat with
-					| PatConstructor(ConConst TNull,_) ->
+				let rec loop bindings pat = match fst pat with
+					| PatConstructor((ConConst TNull,_),_) ->
 						null := (case,bindings,List.tl patterns) :: !null;
-					| PatConstructor(con,_) ->
+					| PatConstructor(con,patterns) ->
 						if case.case_guard = None then ConTable.replace unguarded con true;
-						ConTable.replace sigma con true;
-					| PatBind(_,pat) -> loop pat
+						let arg_positions = snd (List.split patterns) in
+						ConTable.replace sigma con arg_positions;
+					| PatBind(v,pat) -> loop ((v,pos pat,subject) :: bindings) pat
 					| PatVariable _ | PatAny -> ()
 					| PatExtractor _ -> raise Extractor
 					| _ -> error ("Unexpected pattern: " ^ (Pattern.to_string pat)) case.case_pos;
 				in
-				loop (List.hd patterns)
+				loop bindings (List.hd patterns)
 			) cases;
-			let sigma = ConTable.fold (fun con _ acc -> (con,ConTable.mem unguarded con) :: acc) sigma [] in
+			let sigma = ConTable.fold (fun con arg_positions acc -> (con,ConTable.mem unguarded con,arg_positions) :: acc) sigma [] in
 			sigma,List.rev !null
 		in
 		let sigma,null = get_column_sigma cases in
 		if mctx.match_debug then print_endline (Printf.sprintf "compile_switch:\n\tsubject: %s\n\ttsubjects: %s\n\tcases: %s" (s_expr_pretty subject) (s_subjects subjects) (s_cases cases));
-		let switch_cases = List.map (fun (con,unguarded) ->
-			let subjects = get_sub_subjects mctx subject con @ subjects in
+		let switch_cases = List.map (fun (con,unguarded,arg_positions) ->
+			let sub_subjects = get_sub_subjects mctx subject con arg_positions in
+			let rec loop bindings locals sub_subjects = match sub_subjects with
+				| e :: sub_subjects ->
+					let v = gen_local mctx.ctx e.etype e.epos in
+					loop ((v,v.v_pos,e) :: bindings) ((mk (TLocal v) v.v_type v.v_pos) :: locals) sub_subjects
+				| [] ->
+					List.rev bindings,List.rev locals
+			in
+			let bindings,sub_subjects = loop [] [] sub_subjects in
+			let subjects = sub_subjects @ subjects in
 			let spec = specialize subject con cases in
 			let dt = compile mctx subjects spec in
+			let dt = bind mctx bindings dt in
 			con,unguarded,dt
 		) sigma in
 		let default = default subject cases in
@@ -1035,23 +1198,24 @@ module Compile = struct
 		let pat_any = (PatAny,null_pos) in
 		let _,_,ex_subjects,cases,bindings = List.fold_left2 (fun (left,right,subjects,cases,ex_bindings) (case,bindings,patterns) extractor -> match extractor,patterns with
 			| Some(v,e1,pat,vars), _ :: patterns ->
-				let patterns = make_offset_list (left + 1) (right - 1) pat pat_any @ patterns in
 				let rec loop e = match e.eexpr with
 					| TLocal v' when v' == v -> subject
 					| _ -> Type.map_expr loop e
 				in
 				let e1 = loop e1 in
 				let bindings = List.map (fun v -> v,subject.epos,subject) vars @ bindings in
-				let v,ex_bindings = try
-					let v,_,_ = List.find (fun (_,_,e2) -> Texpr.equal e1 e2) ex_bindings in
-					v,ex_bindings
+				begin try
+					let v,_,_,left2,right2 = List.find (fun (_,_,e2,_,_) -> Texpr.equal e1 e2) ex_bindings in
+					let ev = mk (TLocal v) v.v_type e1.epos in
+					let patterns = make_offset_list (left2 + 1) (right2 - 1) pat pat_any @ patterns in
+					(left + 1, right - 1,ev :: subjects,((case,bindings,patterns) :: cases),ex_bindings)
 				with Not_found ->
-					let v = alloc_var "_hx_tmp" e1.etype e1.epos in
-					v.v_meta <- (Meta.Custom ":extractorVariable",[],v.v_pos) :: v.v_meta;
-					v,(v,e1.epos,e1) :: ex_bindings
-				in
-				let ev = mk (TLocal v) v.v_type e1.epos in
-				(left + 1, right - 1,ev :: subjects,((case,bindings,patterns) :: cases),ex_bindings)
+					let v = alloc_var VExtractorVariable "_hx_tmp" e1.etype e1.epos in
+					let ex_bindings = (v,e1.epos,e1,left,right) :: ex_bindings in
+					let patterns = make_offset_list (left + 1) (right - 1) pat pat_any @ patterns in
+					let ev = mk (TLocal v) v.v_type e1.epos in
+					(left + 1, right - 1,ev :: subjects,((case,bindings,patterns) :: cases),ex_bindings)
+				end
 			| None,pat :: patterns ->
 				let patterns = make_offset_list 0 num_extractors pat pat_any @ patterns in
 				(left,right,subjects,((case,bindings,patterns) :: cases),ex_bindings)
@@ -1059,6 +1223,7 @@ module Compile = struct
 				assert false
 		) (0,num_extractors,[],[],[]) cases (List.rev extractors) in
 		let dt = compile mctx ((subject :: List.rev ex_subjects) @ subjects) (List.rev cases) in
+		let bindings = List.map (fun (a,b,c,_,_) -> (a,b,c)) bindings in
 		bind mctx bindings dt
 
 	let compile ctx match_debug subjects cases p =
@@ -1077,11 +1242,17 @@ module Compile = struct
 				let ev = mk (TLocal v) e.etype e.epos in
 				(ev :: subjects,(v,e.epos,e) :: vars)
 		) ([],[]) subjects in
-		let dt = compile mctx subjects cases in
-		Useless.check mctx.ctx.com cases;
-		match vars with
-			| [] -> dt
-			| _ -> bind mctx vars dt
+		begin match cases,subjects with
+		| [],(subject :: _) ->
+			let dt_fail = fail mctx subject.epos in
+			switch mctx subject [] dt_fail
+		| _ ->
+			let dt = compile mctx subjects cases in
+			Useless.check mctx.ctx.com cases;
+			match vars with
+				| [] -> dt
+				| _ -> bind mctx vars dt
+		end
 end
 
 module TexprConverter = struct
@@ -1093,37 +1264,44 @@ module TexprConverter = struct
 	type match_kind =
 		| SKValue
 		| SKEnum
-		| SKFakeEnum
 		| SKLength
 
 	exception Not_exhaustive
 
-	let s_subject s e =
-		let rec loop s e = match e.eexpr with
+	let s_subject v_lookup s e =
+		let rec loop top s e = match e.eexpr with
+			| TField(_,FEnum(en,ef)) ->
+				s
 			| TField(e1,fa) ->
-				loop (Printf.sprintf "{ %s: %s }" (field_name fa) s) e1
+				if top then loop false s e1
+				else loop false (Printf.sprintf "{ %s: %s }" (field_name fa) s) e1
 			| TEnumParameter(e1,ef,i) ->
 				let arity = match follow ef.ef_type with TFun(args,_) -> List.length args | _ -> assert false in
 				let l = make_offset_list i (arity - i - 1) s "_" in
-				loop (Printf.sprintf "%s(%s)" ef.ef_name (String.concat ", " l)) e1
+				loop false (Printf.sprintf "%s(%s)" ef.ef_name (String.concat ", " l)) e1
+			| TLocal v ->
+				begin try
+					loop top s (IntMap.find v.v_id v_lookup)
+				with Not_found ->
+					s
+				end
 			| _ ->
 				s
 		in
-		loop s e
+		loop true s e
 
 	let s_match_kind = function
 		| SKValue -> "value"
 		| SKEnum -> "enum"
-		| SKFakeEnum -> "fakeEnum"
 		| SKLength -> "length"
 
 	let unify_constructor ctx params t con =
-		match con with
+		match fst con with
 		| ConEnum(en,ef) ->
 			let t_ef = match follow ef.ef_type with TFun(_,t) -> t | _ -> ef.ef_type in
 			let t_ef = apply_params ctx.type_params params (monomorphs en.e_params (monomorphs ef.ef_params t_ef)) in
 			let monos = List.map (fun t -> match follow t with
-				| TInst({cl_kind = KTypeParameter _},_) -> mk_mono()
+				| TInst({cl_kind = KTypeParameter _},_) | TMono _ -> mk_mono()
 				| _ -> t
 			) params in
 			let rec duplicate_monos t = match follow t with
@@ -1140,6 +1318,11 @@ module TexprConverter = struct
 		| _ ->
 			Some(con,params)
 
+	let rec extract_const e = match e.eexpr with
+		| TConst ct -> Some ct
+		| TCast(e1,None) -> extract_const e1
+		| _ -> None
+
 	let all_ctors ctx e cases =
 		let infer_type() = match cases with
 			| [] -> e,e.etype,false
@@ -1148,7 +1331,7 @@ module TexprConverter = struct
 					(* error "Could not determine switch kind, make sure the type is known" e.epos; *)
 					t_dynamic
 				in
-				let t = match con with
+				let t = match fst con with
 					| ConEnum(en,_) -> TEnum(en,List.map snd en.e_params)
 					| ConArray _ -> ctx.t.tarray t_dynamic
 					| ConConst ct ->
@@ -1163,7 +1346,7 @@ module TexprConverter = struct
 					| ConTypeExpr mt -> get_general_module_type ctx mt e.epos
 					| ConFields _ | ConStatic _ -> fail()
 				in
-				mk (TCast(e,None)) t e.epos,t,true
+				e,t,true
 		in
 		let e,t,inferred = match follow e.etype with
 			| TDynamic _ | TMono _ ->
@@ -1177,16 +1360,19 @@ module TexprConverter = struct
 		in
 		let rec loop t = match follow t with
 			| TAbstract({a_path = [],"Bool"},_) ->
-				add (ConConst(TBool true));
-				add (ConConst(TBool false));
+				add (ConConst(TBool true),null_pos);
+				add (ConConst(TBool false),null_pos);
 				SKValue,RunTimeFinite
 			| TAbstract({a_impl = Some c} as a,pl) when Meta.has Meta.Enum a.a_meta ->
 				List.iter (fun cf ->
 					ignore(follow cf.cf_type);
 					if Meta.has Meta.Impl cf.cf_meta && Meta.has Meta.Enum cf.cf_meta then match cf.cf_expr with
-						| Some {eexpr = TConst ct | TCast ({eexpr = TConst ct},None)} ->
-							if ct != TNull then add (ConConst ct)
-						| _ -> add (ConStatic(c,cf))
+						| Some e ->
+							begin match extract_const e with
+							| Some ct -> if ct <> TNull then add (ConConst ct,null_pos)
+							| None -> add (ConStatic(c,cf),null_pos)
+							end;
+						| _ -> add (ConStatic(c,cf),null_pos)
 				) c.cl_ordered_statics;
 				SKValue,CompileTimeFinite
 			| TAbstract(a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
@@ -1197,21 +1383,18 @@ module TexprConverter = struct
 			| TInst({cl_path=[],"Array"},_) ->
 				SKLength,Infinite
 			| TEnum(en,pl) ->
-				PMap.iter (fun _ ef -> add (ConEnum(en,ef))) en.e_constrs;
-				if Meta.has Meta.FakeEnum en.e_meta then
-					SKFakeEnum,CompileTimeFinite
-				else
-					SKEnum,RunTimeFinite
+				PMap.iter (fun _ ef -> add (ConEnum(en,ef),null_pos)) en.e_constrs;
+				SKEnum,RunTimeFinite
 			| TAnon _ ->
-				SKValue,CompileTimeFinite
+				SKValue,Infinite
 			| TInst(_,_) ->
-				SKValue,CompileTimeFinite
+				SKValue,Infinite
 			| _ ->
 				SKValue,Infinite
 		in
 		let kind,finiteness = loop t in
-		let compatible_kind con = match con with
-			| ConEnum _ -> kind = SKEnum || kind = SKFakeEnum
+		let compatible_kind con = match fst con with
+			| ConEnum _ -> kind = SKEnum
 			| ConArray _ -> kind = SKLength
 			| _ -> kind = SKValue
 		in
@@ -1222,14 +1405,18 @@ module TexprConverter = struct
 		let unmatched = ConTable.fold (fun con _ acc -> con :: acc) h [] in
 		e,unmatched,kind,finiteness
 
-	let report_not_exhaustive e_subject unmatched =
+	let report_not_exhaustive v_lookup e_subject unmatched =
 		let sl = match follow e_subject.etype with
 			| TAbstract({a_impl = Some c} as a,tl) when Meta.has Meta.Enum a.a_meta ->
-				List.map (fun (con,_) -> match con with
+				List.map (fun (con,_) -> match fst con with
 					| ConConst ct1 ->
 						let cf = List.find (fun cf ->
 							match cf.cf_expr with
-							| Some ({eexpr = TConst ct2 | TCast({eexpr = TConst ct2},None)}) -> ct1 = ct2
+							| Some e ->
+								begin match extract_const e with
+								| Some ct2 -> ct1 = ct2
+								| None -> false
+								end
 							| _ -> false
 						) c.cl_ordered_statics in
 						cf.cf_name
@@ -1243,20 +1430,20 @@ module TexprConverter = struct
 			| [] -> "_"
 			| _ -> String.concat " | " (List.sort Pervasives.compare sl)
 		in
-		error (Printf.sprintf "Unmatched patterns: %s" (s_subject s e_subject)) e_subject.epos
+		error (Printf.sprintf "Unmatched patterns: %s" (s_subject v_lookup s e_subject)) e_subject.epos
 
 	let to_texpr ctx t_switch match_debug with_type dt =
+		let v_lookup = ref IntMap.empty in
 		let com = ctx.com in
 		let p = dt.dt_pos in
-		let c_type = match follow (Typeload.load_instance ctx ({ tpackage = ["std"]; tname="Type"; tparams=[]; tsub = None},null_pos) true p) with TInst(c,_) -> c | t -> assert false in
+		let c_type = match follow (Typeload.load_instance ctx ({ tpackage = ["std"]; tname="Type"; tparams=[]; tsub = None},p) true) with TInst(c,_) -> c | t -> assert false in
 		let mk_index_call e =
 			if not ctx.in_macro && not ctx.com.display.DisplayMode.dms_full_typing then
 				(* If we are in display mode there's a chance that these fields don't exist. Let's just use a
 				   (correctly typed) neutral value because it doesn't actually matter. *)
 				mk (TConst (TInt (Int32.of_int 0))) ctx.t.tint e.epos
 			else
-				let cf = PMap.find "enumIndex" c_type.cl_statics in
-				make_static_call ctx c_type cf (fun t -> t) [e] com.basic.tint e.epos
+				mk (TEnumIndex e) com.basic.tint e.epos
 		in
 		let mk_name_call e =
 			if not ctx.in_macro && not ctx.com.display.DisplayMode.dms_full_typing then
@@ -1265,107 +1452,136 @@ module TexprConverter = struct
 				let cf = PMap.find "enumConstructor" c_type.cl_statics in
 				make_static_call ctx c_type cf (fun t -> t) [e] com.basic.tstring e.epos
 		in
-		let rec loop toplevel params dt = match dt.dt_t with
-			| Leaf case ->
-				begin match case.case_expr with
-					| Some e -> e
-					| None -> mk (TBlock []) ctx.t.tvoid case.case_pos
-				end
-			| Switch(_,[ConFields _,_,dt],_) -> (* TODO: Can we improve this by making it more general? *)
-				loop false params dt
-			| Switch(e_subject,cases,default) ->
-				let e_subject,unmatched,kind,finiteness = all_ctors ctx e_subject cases in
-				let unmatched = ExtList.List.filter_map (unify_constructor ctx params e_subject.etype) unmatched in
-				let loop toplevel params dt =
-					try Some (loop toplevel params dt)
-					with Not_exhaustive -> match with_type,finiteness with
-						| NoValue,Infinite -> None
-						| _,CompileTimeFinite when unmatched = [] -> None
-						| _ when ctx.com.display.DisplayMode.dms_error_policy = DisplayMode.EPIgnore -> None
-						| _ -> report_not_exhaustive e_subject unmatched
-				in
-				let cases = ExtList.List.filter_map (fun (con,_,dt) -> match unify_constructor ctx params e_subject.etype con with
-					| Some(_,params) -> Some (con,dt,params)
-					| None -> None
-				) cases in
-				let group cases =
-					let h = DtTable.create 0 in
-					List.iter (fun (con,dt,params) ->
-						let l,_,_ = try DtTable.find h dt.dt_t with Not_found -> [],dt,params in
-						DtTable.replace h dt.dt_t (con :: l,dt,params)
-					) cases;
-					DtTable.fold (fun _ (cons,dt,params) acc -> (cons,dt,params) :: acc) h []
-				in
-				let cases = group cases in
-				let cases = List.sort (fun (cons1,_,_) (cons2,_,_) -> match cons1,cons2 with
-					| (con1 :: _),con2 :: _ -> Constructor.compare con1 con2
-					| _ -> -1
-				) cases in
-				let e_default = match unmatched,finiteness with
-					| [],RunTimeFinite ->
-						None
-					| _ ->
-						loop false params default
-				in
-				let cases = ExtList.List.filter_map (fun (cons,dt,params) ->
-					let eo = loop false params dt in
-					begin match eo with
-						| None -> None
-						| Some e -> Some (List.map (Constructor.to_texpr ctx match_debug dt.dt_pos) (List.sort Constructor.compare cons),e)
-					end
-				) cases in
-				let e_subject = match kind with
-					| SKValue | SKFakeEnum -> e_subject
-					| SKEnum -> if match_debug then mk_name_call e_subject else mk_index_call e_subject
-					| SKLength -> type_field_access ctx e_subject "length"
-				in
-				begin match cases with
-					| [_,e2] when e_default = None && (match finiteness with RunTimeFinite -> true | _ -> false) ->
-						e2
-					| [[e1],e2] when (with_type = NoValue || e_default <> None) && ctx.com.platform <> Java (* TODO: problem with TestJava.hx:285 *) ->
-						let e_op = mk (TBinop(OpEq,e_subject,e1)) ctx.t.tbool e_subject.epos in
-						mk (TIf(e_op,e2,e_default)) t_switch dt.dt_pos
-					| _ ->
-						let e_subject = match finiteness with
-							| RunTimeFinite | CompileTimeFinite when e_default = None ->
-								let meta = (Meta.Exhaustive,[],dt.dt_pos) in
-								mk (TMeta(meta,e_subject)) e_subject.etype e_subject.epos
+		let rec loop toplevel params dt = match dt.dt_texpr with
+			| Some e ->
+				e
+			| None ->
+				let e = match dt.dt_t with
+					| Leaf case ->
+						begin match case.case_expr with
+							| Some e -> e
+							| None -> mk (TBlock []) ctx.t.tvoid case.case_pos
+						end
+					| Switch(_,[(ConFields _,_),_,dt],_) -> (* TODO: Can we improve this by making it more general? *)
+						loop false params dt
+					| Switch(e_subject,cases,default) ->
+						let e_subject,unmatched,kind,finiteness = all_ctors ctx e_subject cases in
+						let unmatched = ExtList.List.filter_map (unify_constructor ctx params e_subject.etype) unmatched in
+						let loop toplevel params dt =
+							try Some (loop false params dt)
+							with Not_exhaustive -> match with_type,finiteness with
+								| WithType.NoValue,Infinite when toplevel -> None
+								| _,CompileTimeFinite when unmatched = [] -> None
+								| _ when ctx.com.display.DisplayMode.dms_error_policy = DisplayMode.EPIgnore -> None
+								| _ -> report_not_exhaustive !v_lookup e_subject unmatched
+						in
+						let cases = ExtList.List.filter_map (fun (con,_,dt) -> match unify_constructor ctx params e_subject.etype con with
+							| Some(_,params) -> Some (con,dt,params)
+							| None -> None
+						) cases in
+						let group cases =
+							let h = DtTable.create 0 in
+							List.iter (fun (con,dt,params) ->
+								let l,_,_ = try DtTable.find h dt.dt_t with Not_found -> [],dt,params in
+								DtTable.replace h dt.dt_t (con :: l,dt,params)
+							) cases;
+							DtTable.fold (fun _ (cons,dt,params) acc -> (cons,dt,params) :: acc) h []
+						in
+						let cases = group cases in
+						let cases = List.sort (fun (cons1,_,_) (cons2,_,_) -> match cons1,cons2 with
+							| (con1 :: _),con2 :: _ -> Constructor.compare con1 con2
+							| _ -> -1
+						) cases in
+						let e_default = match unmatched,finiteness with
+							| [],RunTimeFinite ->
+								None
 							| _ ->
-								e_subject
+								loop toplevel params default
 						in
-						mk (TSwitch(e_subject,cases,e_default)) t_switch dt.dt_pos
-				end
-			| Guard(e,dt1,dt2) ->
-				let e_then = loop false params dt1 in
-				begin try
-					let e_else = loop false params dt2 in
-					mk (TIf(e,e_then,Some e_else)) t_switch (punion e_then.epos e_else.epos)
-				with Not_exhaustive when with_type = NoValue ->
-					mk (TIf(e,e_then,None)) ctx.t.tvoid (punion e.epos e_then.epos)
-				end
-			| GuardNull(e,dt1,dt2) ->
-				let e_null = Codegen.ExprBuilder.make_null e.etype e.epos in
-				let f = try
-					let e_then = loop false params dt1 in
-					(fun () ->
-						let e_else = loop false params dt2 in
-						let e_op = mk (TBinop(OpEq,e,e_null)) ctx.t.tbool e.epos in
-						mk (TIf(e_op,e_then,Some e_else)) t_switch (punion e_then.epos e_else.epos)
-					)
-				with Not_exhaustive ->
-					if toplevel then (fun () -> loop false params dt2)
-					else if ctx.com.display.DisplayMode.dms_error_policy = DisplayMode.EPIgnore then (fun () -> mk (TConst TNull) (mk_mono()) dt2.dt_pos)
-					else report_not_exhaustive e [ConConst TNull,dt.dt_pos]
+						let cases = ExtList.List.filter_map (fun (cons,dt,params) ->
+							let eo = loop toplevel params dt in
+							begin match eo with
+								| None -> None
+								| Some e -> Some (List.map (Constructor.to_texpr ctx match_debug) (List.sort Constructor.compare cons),e)
+							end
+						) cases in
+						let is_nullable_subject = is_explicit_null e_subject.etype in
+						let e_subject = match kind with
+							| SKValue -> e_subject
+							| SKEnum -> if match_debug then mk_name_call e_subject else mk_index_call e_subject
+							| SKLength -> type_field_access ctx e_subject "length"
+						in
+						begin match cases,e_default,with_type with
+							| [_,e2],None,_ when (match finiteness with RunTimeFinite -> true | _ -> false) && not is_nullable_subject ->
+								{e2 with etype = t_switch}
+							| [[e1],e2],Some _,_
+							| [[e1],e2],None,NoValue when ctx.com.platform <> Java (* TODO: problem with TestJava.hx:285 *) ->
+								let e_op = mk (TBinop(OpEq,e_subject,e1)) ctx.t.tbool e_subject.epos in
+								begin match e2.eexpr with
+									| TIf(e_op2,e3,e_default2) when (match e_default,e_default2 with Some(e1),Some(e2) when e1 == e2 -> true | _ -> false) ->
+										let eand = binop OpBoolAnd e_op e_op2 ctx.t.tbool (punion e_op.epos e_op2.epos) in
+										mk (TIf(eand,e3,e_default)) t_switch dt.dt_pos
+									| _ ->
+										mk (TIf(e_op,e2,e_default)) t_switch dt.dt_pos
+								end
+							| [([{eexpr = TConst (TBool true)}],e1);([{eexpr = TConst (TBool false)}],e2)],None,_
+							| [([{eexpr = TConst (TBool false)}],e2);([{eexpr = TConst (TBool true)}],e1)],None,_ ->
+								mk (TIf(e_subject,e1,Some e2)) t_switch dt.dt_pos
+							| _ ->
+								let e_subject = match finiteness with
+									| RunTimeFinite | CompileTimeFinite when e_default = None ->
+										let meta = (Meta.Exhaustive,[],dt.dt_pos) in
+										mk (TMeta(meta,e_subject)) e_subject.etype e_subject.epos
+									| _ ->
+										e_subject
+								in
+								mk (TSwitch(e_subject,cases,e_default)) t_switch dt.dt_pos
+						end
+					| Guard(e,dt1,dt2) ->
+						let e_then = loop false params dt1 in
+						begin try
+							let e_else = loop false params dt2 in
+							mk (TIf(e,e_then,Some e_else)) t_switch (punion e_then.epos e_else.epos)
+						with Not_exhaustive when with_type = NoValue ->
+							mk (TIf(e,e_then,None)) ctx.t.tvoid (punion e.epos e_then.epos)
+						end
+					| GuardNull(e,dt1,dt2) ->
+						let e_null = make_null e.etype e.epos in
+						let f_op e = mk (TBinop(OpEq,e,e_null)) ctx.t.tbool e.epos in
+						let f = try
+							let rec loop2 acc dt = match dt.dt_t with
+								| GuardNull(e,dt1,dt3) when Decision_tree.equal_dt dt2 dt3 ->
+									loop2 ((f_op e) :: acc) dt1
+								| Guard(e,dt1,dt3) when Decision_tree.equal_dt dt2 dt3 ->
+									loop2 (e :: acc) dt1
+								| _ ->
+									List.rev acc,dt
+							in
+							let conds,dt1 = loop2 [] dt1 in
+							let e_then = loop toplevel params dt1 in
+							(fun () ->
+								let e_else = loop toplevel params dt2 in
+								let e_cond = List.fold_left (fun e1 e2 -> binop OpBoolAnd e1 e2 ctx.t.tbool (punion e1.epos e2.epos)) (f_op e) conds in
+								mk (TIf(e_cond,e_then,Some e_else)) t_switch (punion e_then.epos e_else.epos)
+							)
+						with Not_exhaustive ->
+							if toplevel then (fun () -> loop toplevel params dt2)
+							else if ctx.com.display.DisplayMode.dms_error_policy = DisplayMode.EPIgnore then (fun () -> mk (TConst TNull) (mk_mono()) dt2.dt_pos)
+							else report_not_exhaustive !v_lookup e [(ConConst TNull,dt.dt_pos),dt.dt_pos]
+						in
+						f()
+					| Bind(bl,dt) ->
+						let el = List.rev_map (fun (v,p,e) ->
+							v_lookup := IntMap.add v.v_id e !v_lookup;
+							mk (TVar(v,Some e)) com.basic.tvoid p
+						) bl in
+						let e = loop toplevel params dt in
+						mk (TBlock (el @ [e])) e.etype dt.dt_pos
+					| Fail ->
+						raise Not_exhaustive
 				in
-				f()
-			| Bind(bl,dt) ->
-				let el = List.rev_map (fun (v,p,e) ->
-					mk (TVar(v,Some e)) com.basic.tvoid p
-				) bl in
-				let e = loop toplevel params dt in
-				mk (TBlock (el @ [e])) e.etype dt.dt_pos
-			| Fail ->
-				raise Not_exhaustive
+				dt.dt_texpr <- Some e;
+				e
 		in
 		let params = List.map snd ctx.type_params in
 		let e = loop true params dt in
@@ -1375,17 +1591,17 @@ end
 module Match = struct
 	open Typecore
 
-	let match_expr ctx e cases def with_type p =
+	let match_expr ctx e cases def with_type postfix_match p =
 		let match_debug = Meta.has (Meta.Custom ":matchDebug") ctx.curfield.cf_meta in
 		let rec loop e = match fst e with
 			| EArrayDecl el when (match el with [(EFor _ | EWhile _),_] -> false | _ -> true) ->
-				let el = List.map (fun e -> type_expr ctx e Value) el in
+				let el = List.map (fun e -> type_expr ctx e WithType.value) el in
 				let t = tuple_type (List.map (fun e -> e.etype) el) in
 				t,el
 			| EParenthesis e1 ->
 				loop e1
 			| _ ->
-				let e = type_expr ctx e Value in
+				let e = type_expr ctx e WithType.value in
 				e.etype,[e]
 		in
 		let t,subjects = loop e in
@@ -1394,21 +1610,45 @@ module Match = struct
 			| None -> cases
 			| Some (eo,p) -> cases @ [[EConst (Ident "_"),p],None,eo,p]
 		in
-		let tmono,with_type = match with_type with
-			| WithType t -> (match follow t with TMono _ -> Some t,Value | _ -> None,with_type)
-			| _ -> None,with_type
+		let tmono,with_type,allow_min_void = match with_type with
+			| WithType.WithType(t,src) ->
+				(match follow t, src with
+				| TMono _, Some ImplicitReturn -> Some t, WithType.Value src, true
+				| TMono _, _ -> Some t,WithType.value,false
+				| _ -> None,with_type,false)
+			| _ -> None,with_type,false
 		in
 		let cases = List.map (fun (el,eg,eo,p) ->
-			let case,bindings,pat = Case.make ctx t el eg eo with_type p in
+			let p = match eo with Some e when p = null_pos -> pos e | _ -> p in
+			let case,bindings,pat = Case.make ctx t el eg eo with_type postfix_match p in
 			case,bindings,[pat]
 		) cases in
 		let infer_switch_type () =
 			match with_type with
-				| NoValue -> mk_mono()
-				| Value ->
-					let el = List.map (fun (case,_,_) -> match case.Case.case_expr with Some e -> e | None -> mk (TBlock []) ctx.t.tvoid p) cases in
-					unify_min ctx el
-				| WithType t -> t
+				| WithType.NoValue -> ctx.t.tvoid
+				| WithType.Value(_) ->
+					begin match cases with
+					| [] ->
+						(* If there are no cases we assume Void. This then causes a "Cannot use Void as value" error.
+						   Note that we cannot rely on an exhaustiveness error because the switch could be over an empty enum. *)
+						ctx.t.tvoid
+					| _ ->
+						let el = List.map (fun (case,_,_) ->
+							match case.Case.case_expr with
+							| Some e ->
+								(* If we have a block, use the position of the last element. *)
+								begin match e.eexpr with
+								| TBlock el when el <> [] -> List.hd (List.rev el)
+								| _ -> e
+								end
+							| None ->
+								(* If we have no block we have to use the `case pattern` position because that's all we have. *)
+								mk (TBlock []) ctx.t.tvoid case.Case.case_pos
+						) cases in
+						if allow_min_void then unify_min_for_type_source ctx el (Some WithType.ImplicitReturn)
+						else unify_min ctx el
+					end
+				| WithType.WithType(t,_) -> t
 		in
 		if match_debug then begin
 			print_endline "CASES BEGIN";
@@ -1420,7 +1660,7 @@ module Match = struct
 		let dt = Compile.compile ctx match_debug subjects cases p in
 		if match_debug then begin
 			print_endline "DECISION TREE BEGIN";
-			print_endline (Decision_tree.to_string "" dt);
+			print_endline (Decision_tree.to_string dt);
 			print_endline "DECISION TREE END";
 		end;
 		let e = try
@@ -1436,6 +1676,10 @@ module Match = struct
 			print_endline "TEXPR END";
 		end;
 		{e with epos = p}
-end
-;;
-Typecore.match_expr_ref := Match.match_expr
\ No newline at end of file
+
+	let match_expr ctx e cases def with_type postfix_match p = match cases,def with
+		| [],None when (match with_type with WithType.NoValue -> true | _ -> false) ->
+			type_expr ctx e WithType.value
+		| _ ->
+			match_expr ctx e cases def with_type postfix_match p
+end
\ No newline at end of file
diff --git a/src/typing/nullSafety.ml b/src/typing/nullSafety.ml
new file mode 100644
index 0000000000000000000000000000000000000000..022a3d9de8716263fd0467fd95a64af3f79395fd
--- /dev/null
+++ b/src/typing/nullSafety.ml
@@ -0,0 +1,1570 @@
+open Globals
+open Ast
+open Type
+
+type safety_message = {
+	sm_msg : string;
+	sm_pos : pos;
+}
+
+type safety_report = {
+	mutable sr_errors : safety_message list;
+}
+
+let add_error report msg pos =
+	let error = { sm_msg = ("Null safety: " ^ msg); sm_pos = pos; } in
+	if not (List.mem error report.sr_errors) then
+		report.sr_errors <- error :: report.sr_errors;
+
+type scope_type =
+	| STNormal
+	| STLoop
+	| STClosure
+	(* A closure which gets executed along the "normal" program flow without being delayed or stored somewhere *)
+	| STImmediateClosure
+
+type safety_unify_error =
+	| NullSafetyError
+
+exception Safety_error of safety_unify_error
+
+let safety_error () : unit = raise (Safety_error NullSafetyError)
+
+type safety_mode =
+	| SMOff
+	| SMLoose
+	| SMStrict
+
+(**
+	Terminates compiler process and prints user-friendly instructions about filing an issue in compiler repo.
+*)
+let fail ?msg hxpos mlpos =
+	let msg =
+		(Lexer.get_error_pos (Printf.sprintf "%s:%d:") hxpos) ^ ": "
+		^ "Null safety: " ^ (match msg with Some msg -> msg | _ -> "unexpected expression.") ^ "\n"
+		^ "Submit an issue to https://github.com/HaxeFoundation/haxe/issues with expression example and following information:"
+	in
+	match mlpos with
+		| (file, line, _, _) ->
+			Printf.eprintf "%s\n" msg;
+			Printf.eprintf "%s:%d\n" file line;
+			assert false
+
+(**
+	Returns human-readable string representation of specified type
+*)
+let str_type = s_type (print_context())
+
+(**
+	Returns human-readable representation of specified expression
+*)
+let str_expr = s_expr_pretty false "\t" true str_type
+
+let is_string_type t =
+	match t with
+		| TInst ({ cl_path = ([], "String")}, _)
+		| TAbstract ({ a_path = ([],"Null") },[TInst ({ cl_path = ([], "String")}, _)]) -> true
+		| _ -> false
+
+(**
+	Check for explicit `Null<>` typing
+*)
+let rec is_nullable_type = function
+	| TMono r ->
+		(match !r with None -> false | Some t -> is_nullable_type t)
+	| TAbstract ({ a_path = ([],"Null") },[t]) ->
+		true
+	| TAbstract (a,tl) when not (Meta.has Meta.CoreType a.a_meta) ->
+		is_nullable_type (apply_params a.a_params tl a.a_this)
+	| TLazy f ->
+		is_nullable_type (lazy_type f)
+	| TType (t,tl) ->
+		is_nullable_type (apply_params t.t_params tl t.t_type)
+	| _ ->
+		false
+
+(**
+	If `expr` is a TCast or TMeta, returns underlying expression (recursively bypassing nested casts).
+	Otherwise returns `expr` as is.
+	If `stay_safe` is true, then casts to non-nullable types won't be revealed and an expression will stay intact.
+*)
+let rec reveal_expr ?(stay_safe=true) expr =
+	match expr.eexpr with
+		| TCast (e, _) when not stay_safe || is_nullable_type expr.etype -> reveal_expr e
+		| TMeta (_, e) -> reveal_expr e
+		| _ -> expr
+
+(**
+	Try to get a human-readable representation of an `expr`
+*)
+let symbol_name expr =
+	match (reveal_expr ~stay_safe:false expr).eexpr with
+		| TField (_, access) -> field_name access
+		| TIdent name -> name
+		| TLocal { v_name = name } -> name
+		| TNew _ -> "new"
+		| _ -> ""
+
+type safety_subject =
+	(*
+		Fields accessed through a static access are identified by the class path and the field name.
+		E.g.
+			`pack.MyClass.field` is `((["pack"], "MyClass"), ["field"])`
+			`pack.MyClass.field.sub` is `((["pack"], "MyClass"), ["field"; "sub"])`
+	*)
+	| SFieldOfClass of (path * (string list))
+	(*
+		Fields accessed through a local variable are identified by the var id and the field name.
+		E.g.
+			`v.field` is `(v.v_id, ["field"])`
+			`v.field.sub` is `(v.v_id, ["field"; "sub"])`
+	*)
+	| SFieldOfLocalVar of (int * (string list))
+	(*
+		Fields accessed through `this` are identified by their names.
+		E.g.
+			`this.field` is `["field"]`
+			`this.field.sub` is `["field"; "sub"]`
+	*)
+	| SFieldOfThis of (string list)
+	(*
+		Local variables - by tvar.v_id
+	*)
+	| SLocalVar of int
+	(*
+		For expressions, which cannot be checked agains `null` to become safe
+	*)
+	| SNotSuitable
+
+let rec get_subject loose_safety expr =
+	match (reveal_expr expr).eexpr with
+		| TLocal v ->
+			SLocalVar v.v_id
+		| TField ({ eexpr = TTypeExpr _ }, FStatic (cls, field)) when loose_safety || (has_class_field_flag field CfFinal) ->
+			SFieldOfClass (cls.cl_path, [field.cf_name])
+		| TField ({ eexpr = TConst TThis }, (FInstance (_, _, field) | FAnon field)) when loose_safety || (has_class_field_flag field CfFinal) ->
+			SFieldOfThis [field.cf_name]
+		| TField ({ eexpr = TLocal v }, (FInstance (_, _, field) | FAnon field)) when loose_safety || (has_class_field_flag field CfFinal) ->
+			SFieldOfLocalVar (v.v_id, [field.cf_name])
+		| TField (e, (FInstance (_, _, field) | FAnon field)) when loose_safety ->
+			(match get_subject loose_safety e with
+				| SFieldOfClass (path, fields) -> SFieldOfClass (path, field.cf_name :: fields)
+				| SFieldOfThis fields -> SFieldOfThis (field.cf_name :: fields)
+				| SFieldOfLocalVar (var_id, fields) -> SFieldOfLocalVar (var_id, field.cf_name :: fields)
+				|_ -> SNotSuitable
+			)
+		|_ -> SNotSuitable
+
+let rec is_suitable loose_safety expr =
+	match (reveal_expr expr).eexpr with
+		| TField ({ eexpr = TConst TThis }, FInstance _)
+		| TField ({ eexpr = TLocal _ }, (FInstance _ | FAnon _))
+		| TField ({ eexpr = TTypeExpr _ }, FStatic _)
+		| TLocal _ -> true
+		| TField (target, (FInstance _ | FStatic _ | FAnon _)) when loose_safety -> is_suitable loose_safety target
+		|_ -> false
+
+class unificator =
+	object(self)
+		val stack = new_rec_stack()
+		(**
+			Check if it's possible to pass a value of type `a` to a place where a value of type `b` is expected.
+			Raises `Safety_error` exception if it's not.
+		*)
+		method unify a b =
+			if a == b then
+				()
+			else
+				match a, b with
+					(* if `b` is nullable, no more checks needed *)
+					| _, TAbstract ({ a_path = ([],"Null") },[t]) ->
+						()
+					| TAbstract ({ a_path = ([],"Null") },[t]), _ when not (is_nullable_type b) ->
+						safety_error()
+					| TInst (_, a_params), TInst(_, b_params) when (List.length a_params) = (List.length b_params) ->
+						List.iter2 self#unify a_params b_params
+					| TAnon a_anon, TAnon b_anon ->
+						self#unify_anon_to_anon a_anon b_anon
+					| TInst (a_cls, a_params), TAnon b_anon ->
+						self#unify_class_to_anon a_cls a_params b_anon
+					| TFun a_signature, TFun b_signature ->
+						self#unify_functions a_signature b_signature
+					(* patterns below are used to reveal real type *)
+					| TLazy f, _ ->
+						self#unify (lazy_type f) b
+					| _, TLazy f -> self#unify a (lazy_type f)
+					| TMono t, _ ->
+						(match !t with None -> () | Some t -> self#unify t b)
+					| _, TMono t ->
+						(match !t with None -> () | Some t -> self#unify a t)
+					| TType (t,tl), _ ->
+						self#unify_rec a b (fun() -> self#unify (apply_params t.t_params tl t.t_type) b)
+					| _, TType (t,tl) ->
+						self#unify_rec a b (fun() -> self#unify a (apply_params t.t_params tl t.t_type))
+					| TAbstract (abstr,tl), _ when not (Meta.has Meta.CoreType abstr.a_meta) ->
+						self#unify (apply_params abstr.a_params tl abstr.a_this) b
+					| _, TAbstract (abstr,tl) when not (Meta.has Meta.CoreType abstr.a_meta) ->
+						self#unify a (apply_params abstr.a_params tl abstr.a_this)
+					| _ ->
+						()
+
+		method unify_rec (a:t) (b:t) (frun:unit->unit) =
+			let checked =
+				rec_stack_exists
+					(fun(a2,b2) -> fast_eq a a2 && fast_eq b b2)
+					stack
+			in
+			if not checked then begin
+				try
+					stack.rec_stack <- (a, b) :: stack.rec_stack;
+					frun();
+					stack.rec_stack <- List.tl stack.rec_stack
+				with
+					| e ->
+						stack.rec_stack <- List.tl stack.rec_stack;
+						raise e
+			end
+
+		method private unify_anon_to_anon (a:tanon) (b:tanon) =
+			PMap.iter
+				(fun name b_field ->
+					let a_field =
+						try Some (PMap.find name a.a_fields)
+						with Not_found -> None
+					in
+					match a_field with
+						| None -> ()
+						| Some a_field -> self#unify a_field.cf_type b_field.cf_type
+				)
+				b.a_fields
+
+		method private unify_class_to_anon (a:tclass) (a_params:tparams) (b:tanon) =
+			PMap.iter
+				(fun name b_field ->
+					let a_field =
+						try Some (PMap.find name a.cl_fields)
+						with Not_found -> None
+					in
+					match a_field with
+						| None -> ()
+						| Some a_field ->
+							let a_type = apply_params a.cl_params a_params a_field.cf_type in
+							self#unify a_type b_field.cf_type
+				)
+				b.a_fields
+
+		method private unify_functions (a_args, a_result) (b_args, b_result) =
+			(* check return type *)
+			(match b_result with
+				| TAbstract ({ a_path = ([], "Void") }, []) -> ()
+				| _ -> self#unify a_result b_result;
+			);
+			(* check arguments *)
+			let rec traverse a_args b_args =
+				match a_args, b_args with
+					| [], _ | _, [] -> ()
+					| (_, _, a_arg) :: a_rest, (_, _, b_arg) :: b_rest ->
+						self#unify b_arg a_arg;
+						traverse a_rest b_rest
+			in
+			traverse a_args b_args
+	end
+
+(**
+	Checks if execution of provided expression is guaranteed to be terminated with `return`, `throw`, `break` or `continue`.
+*)
+let rec is_dead_end e =
+	match e.eexpr with
+		| TThrow _ -> true
+		| TReturn _ -> true
+		| TBreak -> true
+		| TContinue -> true
+		| TWhile (_, body, DoWhile) -> is_dead_end body
+		| TIf (_, if_body, Some else_body) -> is_dead_end if_body && is_dead_end else_body
+		| TBlock exprs -> List.exists is_dead_end exprs
+		| TMeta (_, e) -> is_dead_end e
+		| TCast (e, _) -> is_dead_end e
+		| _ -> false
+
+(**
+	Check if `expr` is a `trace` (not a call, but identifier itself)
+*)
+let is_trace expr =
+	match expr.eexpr with
+	| TIdent "`trace" -> true
+	| TField (_, FStatic ({ cl_path = (["haxe"], "Log") }, { cf_name = "trace" })) -> true
+	| _ -> false
+
+(**
+	If `t` represents `Null<SomeType>` this function returns `SomeType`.
+*)
+let rec unfold_null t =
+	match t with
+		| TMono r -> (match !r with None -> t | Some t -> unfold_null t)
+		| TAbstract ({ a_path = ([],"Null") }, [t]) -> unfold_null t
+		| TLazy f -> unfold_null (lazy_type f)
+		| TType (t,tl) -> unfold_null (apply_params t.t_params tl t.t_type)
+		| _ -> t
+
+(**
+	Shadow Type.error to avoid raising unification errors, which should not be raised from null-safety checks
+*)
+let safety_error () : unit = raise (Safety_error NullSafetyError)
+
+let accessed_field_name access =
+	match access with
+		| FInstance (_, _, { cf_name = name }) -> name
+		| FStatic (_, { cf_name = name }) -> name
+		| FAnon { cf_name = name } -> name
+		| FDynamic name -> name
+		| FClosure (_, { cf_name = name }) -> name
+		| FEnum (_, { ef_name = name }) -> name
+
+let rec can_pass_type src dst =
+	if is_nullable_type src && not (is_nullable_type dst) then
+		false
+	else
+		(* TODO *)
+		match dst with
+			| TMono r -> (match !r with None -> true | Some t -> can_pass_type src t)
+			| TEnum (_, params) -> true
+			| TInst _ -> true
+			| TType (t, tl) -> can_pass_type src (apply_params t.t_params tl t.t_type)
+			| TFun _ -> true
+			| TAnon _ -> true
+			| TDynamic _ -> true
+			| TLazy _ -> true
+			| TAbstract ({ a_path = ([],"Null") }, [t]) -> true
+			| TAbstract _ -> true
+
+(**
+	Collect nullable local vars which are checked against `null`.
+	Returns a tuple of (vars_checked_to_be_null * vars_checked_to_be_not_null) in case `condition` evaluates to `true`.
+*)
+let rec process_condition loose_safety condition (is_nullable_expr:texpr->bool) callback =
+	let nulls = ref []
+	and not_nulls = ref [] in
+	let add to_nulls expr =
+		let expr = reveal_expr expr in
+		if to_nulls then nulls := expr :: !nulls
+		else not_nulls := expr :: !not_nulls
+	in
+	let rec traverse positive e =
+		match e.eexpr with
+			| TUnop (Not, Prefix, e) -> traverse (not positive) e
+			| TBinop (OpEq, { eexpr = TConst TNull }, checked_expr) when is_suitable loose_safety checked_expr ->
+				add positive checked_expr
+			| TBinop (OpEq, checked_expr, { eexpr = TConst TNull }) when is_suitable loose_safety checked_expr ->
+				add positive checked_expr
+			| TBinop (OpNotEq, { eexpr = TConst TNull }, checked_expr) when is_suitable loose_safety checked_expr ->
+				add (not positive) checked_expr
+			| TBinop (OpNotEq, checked_expr, { eexpr = TConst TNull }) when is_suitable loose_safety checked_expr ->
+				add (not positive) checked_expr
+			| TBinop (OpEq, e, checked_expr) when is_suitable loose_safety checked_expr && not (is_nullable_expr e) ->
+				if positive then not_nulls := checked_expr :: !not_nulls
+			| TBinop (OpEq, checked_expr, e) when is_suitable loose_safety checked_expr && not (is_nullable_expr e) ->
+				if positive then not_nulls := checked_expr :: !not_nulls
+			| TBinop (OpBoolAnd, left_expr, right_expr) when positive ->
+				traverse positive left_expr;
+				traverse positive right_expr
+			| TBinop (OpBoolAnd, left_expr, right_expr) when not positive ->
+				List.iter
+					(fun e ->
+						let _, not_nulls = process_condition loose_safety left_expr is_nullable_expr callback in
+						List.iter (add true) not_nulls
+					)
+					[left_expr; right_expr]
+			| TBinop (OpBoolOr, left_expr, right_expr) when not positive ->
+				traverse positive left_expr;
+				traverse positive right_expr
+			| TBinop (OpBoolOr, left_expr, right_expr) when positive ->
+				List.iter
+					(fun e ->
+						let nulls, _ = process_condition loose_safety left_expr is_nullable_expr callback in
+						List.iter (add true) nulls
+					)
+					[left_expr; right_expr]
+			| TParenthesis e -> traverse positive e
+			| _ -> callback e
+	in
+	traverse true condition;
+	(!nulls, !not_nulls)
+
+(**
+	Check if metadata contains @:nullSafety(Off) meta
+**)
+let rec contains_unsafe_meta metadata =
+	match metadata with
+		| [] -> false
+		| (Meta.NullSafety, [(EConst (Ident "Off"), _)], _) :: _  -> true
+		| _ :: rest -> contains_unsafe_meta rest
+
+(**
+	Check if metadata contains @:nullSafety or @:nullSafety(true) meta
+**)
+let rec contains_safe_meta metadata =
+	match metadata with
+		| [] -> false
+		| (Meta.NullSafety, [], _) :: _
+		| (Meta.NullSafety, [(EConst (Ident ("Loose" | "Strict")), _)], _) :: _  -> true
+		| _ :: rest -> contains_safe_meta rest
+
+let safety_enabled meta =
+	(contains_safe_meta meta) && not (contains_unsafe_meta meta)
+
+let safety_mode (metadata:Ast.metadata) =
+	let rec traverse mode meta =
+		match mode, meta with
+			| Some SMOff, _
+			| _, [] -> mode
+			| _, (Meta.NullSafety, [(EConst (Ident "Off"), _)], _) :: _ ->
+				Some SMOff
+			| None, (Meta.NullSafety, ([] | [(EConst (Ident "Loose"), _)]), _) :: rest ->
+				traverse (Some SMLoose) rest
+			| _, (Meta.NullSafety, [(EConst (Ident "Strict"), _)], _) :: rest ->
+				traverse (Some SMStrict) rest
+			| _, _ :: rest ->
+				traverse mode rest
+	in
+	match traverse None metadata with
+		| Some mode -> mode
+		| None -> SMOff
+
+let rec validate_safety_meta error (metadata:Ast.metadata) =
+	match metadata with
+		| [] -> ()
+		| (Meta.NullSafety, args, pos) :: rest ->
+			(match args with
+				| ([] | [(EConst (Ident ("Off" | "Loose" | "Strict")), _)]) -> ()
+				| _ -> error "Invalid argument for @:nullSafety meta" pos
+			);
+			validate_safety_meta error rest
+		| _ :: rest -> validate_safety_meta error rest
+
+(**
+	Check if specified `field` represents a `var` field which will exist at runtime.
+*)
+let should_be_initialized field =
+	match field.cf_kind with
+		| Var { v_read = AccNormal | AccInline | AccNo } | Var { v_write = AccNormal | AccNo } -> true
+		| Var _ -> Meta.has Meta.IsVar field.cf_meta
+		| _ -> false
+
+(**
+	Check if `field` is overridden in subclasses
+*)
+let is_overridden cls field =
+	let rec loop_inheritance c =
+		(PMap.mem field.cf_name c.cl_fields)
+		|| List.exists (fun d -> loop_inheritance d) c.cl_descendants;
+	in
+	List.exists (fun d -> loop_inheritance d) cls.cl_descendants
+
+(**
+	Check if all items of the `needle` list exist in the same order in the beginning of the `haystack` list.
+*)
+let rec list_starts_with_list (haystack:string list) (needle:string list) =
+	match haystack, needle with
+		| _, [] -> true
+		| [], _ -> false
+		| current_haystack :: rest_haystack, current_needle :: rest_needle ->
+			current_haystack = current_needle && list_starts_with_list rest_haystack rest_needle
+
+(**
+	A class which is used to check if an anonymous function passed to a method will be executed
+	before that method execution is finished.
+*)
+class immediate_execution =
+	object(self)
+		val cache = Hashtbl.create 500
+		(**
+			Get cached results of the previous checks for the specified `field`
+		*)
+		method private get_cache field =
+			try
+				Hashtbl.find cache field
+			with
+				| Not_found ->
+					let field_cache = Hashtbl.create 5 in
+					Hashtbl.add cache field field_cache;
+					field_cache
+		(**
+			Check if a lambda passed to `arg_num`th argument of the `callee` function will be executed immediately without
+			delaying it or storing it somewhere else.
+		*)
+		method check callee arg_num =
+			match (reveal_expr callee).eexpr with
+				| TField (_, FClosure (Some (cls, _), ({ cf_kind = Method (MethNormal | MethInline) } as field)))
+				| TField (_, FStatic (cls, ({ cf_kind = Method (MethNormal | MethInline) } as field)))
+				| TField (_, FInstance (cls, _, ({ cf_kind = Method (MethNormal | MethInline) } as field))) ->
+					if PurityState.is_pure cls field then
+						true
+					else
+						(match cls, field with
+							(* known to be pure *)
+							| { cl_path = ([], "Array") }, _ -> true
+							(* try to analyze function code *)
+							| _, ({ cf_expr = (Some { eexpr = TFunction fn }) } as field) when (has_class_field_flag field CfFinal) || not (is_overridden cls field) ->
+								if arg_num < 0 || arg_num >= List.length fn.tf_args then
+									false
+								else begin
+									let cache = self#get_cache field in
+									if Hashtbl.mem cache arg_num then
+										Hashtbl.find cache arg_num
+									else begin
+										Hashtbl.add cache arg_num true;
+										let (arg_var, _) = List.nth fn.tf_args arg_num in
+										let result = not (self#is_stored arg_var fn.tf_expr) in
+										Hashtbl.replace cache arg_num result;
+										result
+									end
+								end
+							| _ ->
+								false
+						)
+				| _ -> false
+		(**
+			Check if `fn_var` is passed somewhere else in `expr` (stored to a var/field, captured by a closure etc.)
+		*)
+		method private is_stored fn_var expr =
+			match expr.eexpr with
+				| TThrow { eexpr = TLocal v }
+				| TReturn (Some { eexpr = TLocal v })
+				| TCast ({ eexpr = TLocal v }, _)
+				| TMeta (_, { eexpr = TLocal v })
+				| TBinop (OpAssign, _, { eexpr = TLocal v }) when v.v_id = fn_var.v_id ->
+					true
+				| TFunction fn ->
+					let rec captured e =
+						match e.eexpr with
+							| TLocal v -> v.v_id = fn_var.v_id
+							| _ -> check_expr captured e
+					in
+					captured fn.tf_expr
+				| TCall (callee, args) ->
+					if self#is_stored fn_var callee then
+						true
+					else begin
+						let arg_num = ref 0 in
+						List.exists
+							(fun arg ->
+								let result =
+									match arg.eexpr with
+										| TLocal v when v.v_id = fn_var.v_id -> not (self#check callee !arg_num)
+										| _ -> self#is_stored fn_var arg
+								in
+								incr arg_num;
+								result
+							)
+							args
+					end
+				| _ -> check_expr (self#is_stored fn_var) expr
+	end
+
+(**
+	Each loop or function should have its own safety scope.
+*)
+class safety_scope (mode:safety_mode) (scope_type:scope_type) (safe_locals:(safety_subject,texpr) Hashtbl.t) (never_safe:(safety_subject,texpr) Hashtbl.t) =
+	object (self)
+		(** Local vars declared in current scope *)
+		val declarations = Hashtbl.create 100
+		method get_safe_locals = safe_locals
+		method get_never_safe = never_safe
+		method get_type = scope_type
+		(**
+			Reset local vars safety to the specified state
+		*)
+		method reset_to (state:(safety_subject,texpr) Hashtbl.t) =
+			Hashtbl.clear safe_locals;
+			Hashtbl.iter (Hashtbl.add safe_locals) state
+		(**
+			Should be called for each local var declared
+		*)
+		method declare_var v =
+			Hashtbl.add declarations v.v_id v
+		(**
+			Check if local var was declared in this scope
+		*)
+		method owns_var v =
+			Hashtbl.mem declarations v.v_id
+		(**
+			Check if local variable declared in this scope is guaranteed to not have a `null` value.
+		*)
+		method is_safe (expr:texpr) =
+			not (is_nullable_type expr.etype)
+			|| match self#get_subject expr with
+				| SNotSuitable ->
+					false
+				| subj ->
+					not (Hashtbl.mem never_safe subj)
+					&& Hashtbl.mem safe_locals subj
+			(* not (Hashtbl.mem never_safe local_var.v_id)
+			&& (
+				Hashtbl.mem safe_locals local_var.v_id
+				|| not (is_nullable_type local_var.v_type)
+			) *)
+		(**
+			Add variable to the list of safe locals.
+		*)
+		method add_to_safety expr =
+			match self#get_subject expr with
+				| SNotSuitable -> ()
+				| subj -> Hashtbl.replace safe_locals subj expr
+		(**
+			Remove variable from the list of safe locals.
+		*)
+		method remove_from_safety ?(forever=false) expr =
+			match self#get_subject expr with
+				| SNotSuitable -> ()
+				| subj ->
+					Hashtbl.remove safe_locals subj;
+					if forever then
+						Hashtbl.replace never_safe subj expr
+		(**
+			Remove locals, which don't exist in `sample`, from safety.
+		*)
+		method filter_safety (sample:(safety_subject,texpr) Hashtbl.t) =
+			Hashtbl.iter
+				(fun subj expr ->
+					if not (Hashtbl.mem sample subj) then
+						Hashtbl.remove safe_locals subj
+				)
+				(Hashtbl.copy safe_locals);
+		(**
+			Should be called upon assigning a value to `expr`.
+			Removes subjects like `expr.subField` from safety.
+		*)
+		method reassigned (expr:texpr) =
+			match self#get_subject expr with
+				| SNotSuitable -> ()
+				| subj ->
+					let remove safe_subj safe_fields fields =
+						if list_starts_with_list (List.rev safe_fields) (List.rev fields) then
+							Hashtbl.remove safe_locals safe_subj
+					in
+					Hashtbl.iter
+						(fun safe_subj safe_expr ->
+							match safe_subj, subj with
+								| SFieldOfLocalVar (safe_id, _), SLocalVar v_id when safe_id = v_id ->
+									Hashtbl.remove safe_locals safe_subj
+								| SFieldOfLocalVar (safe_id, safe_fields), SFieldOfLocalVar (v_id, fields) when safe_id = v_id ->
+									remove safe_subj safe_fields fields
+								| SFieldOfClass (safe_path, safe_fields), SFieldOfClass (path, fields) when safe_path = path ->
+									remove safe_subj safe_fields fields
+								| SFieldOfClass (safe_path, safe_fields), SFieldOfClass (path, fields) when safe_path = path ->
+									remove safe_subj safe_fields fields
+								| SFieldOfThis safe_fields, SFieldOfThis fields ->
+									remove safe_subj safe_fields fields
+								| _ -> ()
+						)
+						(Hashtbl.copy safe_locals)
+		(**
+			Wrapper for `get_subject` function
+		*)
+		method private get_subject =
+			get_subject (mode <> SMStrict)
+	end
+
+(**
+	Class to simplify collecting lists of local vars, fields and other symbols checked against `null`.
+*)
+class local_safety (mode:safety_mode) =
+	object (self)
+		val mutable scopes = [new safety_scope mode STNormal (Hashtbl.create 100) (Hashtbl.create 100)]
+		(**
+			Drop collected data
+		*)
+		method clear =
+			scopes <- [new safety_scope mode STNormal (Hashtbl.create 100) (Hashtbl.create 100)]
+		(**
+			Get the latest created scope.
+		*)
+		method private get_current_scope =
+			match scopes with
+				| current :: _-> current
+				| [] -> fail ~msg:"List of scopes should never end." null_pos __POS__
+		(**
+			Get a copy of hashtable, which stores currently safe locals
+		*)
+		method get_safe_locals_copy =
+			Hashtbl.copy (self#get_current_scope#get_safe_locals)
+		(**
+			Remove locals, which don't exist in `sample`, from safety.
+		*)
+		method filter_safety sample =
+			self#get_current_scope#filter_safety sample
+		(**
+			Should be called upon local function declaration.
+		*)
+		method function_declared (immediate_execution:bool) (fn:tfunc) =
+			let scope =
+				if immediate_execution || mode = SMLoose then
+					new safety_scope mode STImmediateClosure self#get_current_scope#get_safe_locals self#get_current_scope#get_never_safe
+				else
+					new safety_scope mode STClosure (Hashtbl.create 100) (Hashtbl.create 100)
+			in
+			scopes <- scope :: scopes;
+			List.iter (fun (v, _) -> scope#declare_var v) fn.tf_args
+		(**
+			Should be called upon entering a loop.
+		*)
+		method loop_declared e =
+			let scope = new safety_scope mode STLoop self#get_current_scope#get_safe_locals self#get_current_scope#get_never_safe in
+			(* let scope = new safety_scope mode STLoop (Hashtbl.create 100) (Hashtbl.create 100) in *)
+			scopes <- scope :: scopes;
+			match e.eexpr with
+				| TFor (v, _, _) -> scope#declare_var v
+				| TWhile _ -> ()
+				| _ -> fail ~msg:"Expected TFor or TWhile." e.epos __POS__
+		(**
+			Should be called upon leaving local function declaration.
+		*)
+		method scope_closed =
+			match scopes with
+				| [] -> fail ~msg:"No scopes left." null_pos __POS__
+				| [scope] -> fail ~msg:"Cannot close the last scope." null_pos __POS__
+				| _ :: rest -> scopes <- rest
+		(**
+			Should be called for each local var declared
+		*)
+		method declare_var ?(is_safe=false) (v:tvar) =
+			let scope = self#get_current_scope in
+			scope#declare_var v;
+			if is_safe then scope#add_to_safety { eexpr = TVar (v, None); etype = v.v_type; epos = v.v_pos }
+		(**
+			Check if local variable is guaranteed to not have a `null` value.
+		*)
+		method is_safe expr =
+			if not (is_nullable_type expr.etype) then
+				true
+			else
+				let captured () =
+					match expr.eexpr with
+						| TLocal local_var ->
+							let rec traverse scopes =
+								match scopes with
+									| [] -> false
+									| current :: rest ->
+										if current#owns_var local_var then
+											false
+										else if current#get_type = STClosure then
+											true
+										else
+											traverse rest
+							in
+							traverse scopes
+						| _ -> false
+				in
+				(mode = SMLoose || not (captured())) && self#get_current_scope#is_safe expr
+		(**
+			This method should be called upon passing `while`.
+			It collects locals which are checked against `null` and executes callbacks for expressions with proper statuses of locals.
+		*)
+		method process_while expr is_nullable_expr (condition_callback:texpr->unit) (body_callback:(unit->unit)->texpr->unit) =
+			match expr.eexpr with
+				| TWhile (condition, body, DoWhile) ->
+					let original_safe_locals = self#get_safe_locals_copy in
+					condition_callback condition;
+					let (_, not_nulls) = process_condition (mode <> SMStrict) condition is_nullable_expr (fun _ -> ()) in
+					body_callback
+						(fun () ->
+							List.iter
+								(fun not_null ->
+									match get_subject (mode <> SMStrict) not_null with
+										| SNotSuitable -> ()
+										| subj ->
+											if Hashtbl.mem original_safe_locals subj then
+												self#get_current_scope#add_to_safety not_null
+								)
+								not_nulls
+						)
+						body
+				| TWhile (condition, body, NormalWhile) ->
+					condition_callback condition;
+					let (nulls, not_nulls) = process_condition (mode <> SMStrict) condition is_nullable_expr (fun _ -> ()) in
+					(** execute `body` with known not-null variables *)
+					List.iter self#get_current_scope#add_to_safety not_nulls;
+					body_callback
+						(fun () -> List.iter self#get_current_scope#add_to_safety not_nulls)
+						body;
+					List.iter self#get_current_scope#remove_from_safety not_nulls;
+				| _ -> fail ~msg:"Expected TWhile" expr.epos __POS__
+		(**
+			Should be called for bodies of loops (for, while)
+		*)
+		method process_loop_body (first_check:unit->unit) (intermediate_action:(unit->unit) option) (second_check:unit->unit) =
+			let original_safe_locals = self#get_safe_locals_copy in
+			(** The first check to find out which vars will become unsafe in a loop *)
+			first_check();
+			(* If local var became safe in a loop, then we need to remove it from safety to make it unsafe outside of a loop again *)
+			self#filter_safety original_safe_locals;
+			Option.may (fun action -> action()) intermediate_action;
+			(** The second check with unsafe vars removed from safety *)
+			second_check()
+		(**
+			This method should be called upon passing `try`.
+		*)
+		method process_try (try_block:texpr) (catches:(tvar * texpr) list) (check_expr:texpr->unit) =
+			let original_safe_locals = self#get_safe_locals_copy in
+			check_expr try_block;
+			(* Remove locals which became safe inside of a try block from safety *)
+			self#filter_safety original_safe_locals;
+			let safe_after_try = self#get_safe_locals_copy
+			and safe_after_catches = self#get_safe_locals_copy in
+			List.iter
+				(fun (_, catch_block) ->
+					self#get_current_scope#reset_to safe_after_try;
+					check_expr catch_block;
+					Hashtbl.iter
+						(fun var_id v ->
+							if not (self#is_safe v) then
+								Hashtbl.remove safe_after_catches var_id
+						)
+						(Hashtbl.copy safe_after_catches)
+				)
+				catches;
+			self#get_current_scope#reset_to safe_after_catches
+		(**
+			This method should be called upon passing `if`.
+			It collects locals which are checked against `null` and executes callbacks for expressions with proper statuses of locals.
+		*)
+		method process_if expr is_nullable_expr (condition_callback:texpr->unit) (body_callback:texpr->unit) =
+			match expr.eexpr with
+				| TIf (condition, if_body, else_body) ->
+					condition_callback condition;
+					let (_, not_nulls) =
+						process_condition (mode <> SMStrict) condition is_nullable_expr (fun _ -> ())
+					in
+					(* Don't touch expressions, which already was safe before this `if` *)
+					let filter = List.filter (fun e -> not (self#is_safe e)) in
+					let not_nulls = filter not_nulls in
+					let not_condition =
+						{ eexpr = TUnop (Not, Prefix, condition); etype = condition.etype; epos = condition.epos }
+					in
+					let (_, else_not_nulls) =
+						process_condition (mode <> SMStrict) not_condition is_nullable_expr (fun _ -> ())
+					in
+					let else_not_nulls = filter else_not_nulls in
+					(** execute `if_body` with known not-null variables *)
+					List.iter self#get_current_scope#add_to_safety not_nulls;
+					body_callback if_body;
+					List.iter self#get_current_scope#remove_from_safety not_nulls;
+					(** execute `else_body` with known not-null variables *)
+					let handle_dead_end body safe_vars =
+						if is_dead_end body then
+							List.iter self#get_current_scope#add_to_safety safe_vars
+					in
+					(match else_body with
+						| None ->
+							(** If `if_body` terminates execution, then bypassing `if` means `else_not_nulls` are safe now *)
+							handle_dead_end if_body else_not_nulls
+						| Some else_body ->
+							List.iter self#get_current_scope#add_to_safety else_not_nulls;
+							body_callback else_body;
+							List.iter self#get_current_scope#remove_from_safety else_not_nulls;
+							(** If `if_body` terminates execution, then bypassing `if` means `else_not_nulls` are safe now *)
+							handle_dead_end if_body else_not_nulls;
+							(** If `else_body` terminates execution, then bypassing `else` means `not_nulls` are safe now *)
+							handle_dead_end else_body not_nulls
+					);
+				| _ -> fail ~msg:"Expected TIf" expr.epos __POS__
+		(**
+			Handle boolean AND outside of `if` condition.
+		*)
+		method process_and left_expr right_expr is_nullable_expr (callback:texpr->unit) =
+			callback left_expr;
+			let (_, not_nulls) = process_condition (mode <> SMStrict) left_expr is_nullable_expr (fun e -> ()) in
+			List.iter self#get_current_scope#add_to_safety not_nulls;
+			callback right_expr;
+			List.iter self#get_current_scope#remove_from_safety not_nulls
+		(**
+			Handle boolean OR outside of `if` condition.
+		*)
+		method process_or left_expr right_expr is_nullable_expr (callback:texpr->unit) =
+			let (nulls, _) = process_condition (mode <> SMStrict) left_expr is_nullable_expr callback in
+			List.iter self#get_current_scope#add_to_safety nulls;
+			callback right_expr;
+			List.iter self#get_current_scope#remove_from_safety nulls
+		(**
+			Remove subject from the safety list if a nullable value is assigned or if an object with safe field is reassigned.
+		*)
+		method handle_assignment is_nullable_expr left_expr (right_expr:texpr) =
+			if is_suitable (mode <> SMStrict) left_expr then
+				self#get_current_scope#reassigned left_expr;
+				if is_nullable_expr right_expr then
+					match left_expr.eexpr with
+						| TLocal v ->
+							let captured = ref false in
+							let rec traverse (lst:safety_scope list) =
+								match lst with
+									| [] -> ()
+									| current :: rest ->
+										if current#owns_var v then
+											current#remove_from_safety ~forever:!captured left_expr
+										else begin
+											captured := !captured || current#get_type = STClosure;
+											current#remove_from_safety ~forever:!captured left_expr;
+											traverse rest
+										end
+							in
+							traverse scopes
+						| _ -> ()
+				else if is_nullable_type left_expr.etype then
+					self#get_current_scope#add_to_safety left_expr
+	end
+
+(**
+	This class is used to recursively check typed expressions for null-safety
+*)
+class expr_checker mode immediate_execution report =
+	object (self)
+		val local_safety = new local_safety mode
+		val mutable return_types = []
+		val mutable in_closure = false
+		(* if this flag is `true` then spotted errors and warnings will not be reported *)
+		val mutable is_pretending = false
+		(* val mutable cnt = 0 *)
+		(**
+			Get safety mode for this expression checker
+		*)
+		method get_mode = mode
+		(**
+			Register an error
+		*)
+		method error msg (positions:Globals.pos list) =
+			if not is_pretending then begin
+				let rec get_first_valid_pos positions =
+					match positions with
+						| [] -> null_pos
+						| p :: rest ->
+							if p <> null_pos then p
+							else get_first_valid_pos rest
+				in
+				add_error report msg (get_first_valid_pos positions)
+			end
+		(**
+			Check if `e` is nullable even if the type is reported not-nullable.
+			Haxe type system lies sometimes.
+		*)
+		method private is_nullable_expr e =
+			let e = reveal_expr e in
+			match e.eexpr with
+				| TConst TNull -> true
+				| TConst _ -> false
+				| TParenthesis e -> self#is_nullable_expr e
+				| TMeta (m, _) when contains_unsafe_meta [m] -> false
+				| TMeta (_, e) -> self#is_nullable_expr e
+				| TThrow _ -> false
+				| TReturn (Some e) -> self#is_nullable_expr e
+				| TBinop ((OpAssign | OpAssignOp _), _, right) -> self#is_nullable_expr right
+				| TBlock exprs ->
+					(match exprs with
+						| [] -> false
+						| _ -> self#is_nullable_expr (List.hd (List.rev exprs))
+					)
+				| TIf _ ->
+					let nullable = ref false in
+					let check body = nullable := !nullable || self#is_nullable_expr body in
+					local_safety#process_if e self#is_nullable_expr (fun _ -> ()) check;
+					!nullable
+				| _ ->
+					is_nullable_type e.etype && not (local_safety#is_safe e)
+		(**
+			Check if `expr` can be passed to a place where `to_type` is expected.
+			This method has side effect: it logs an error if `expr` has a type parameter incompatible with the type parameter of `to_type`.
+			E.g.: `Array<Null<String>>` vs `Array<String>` returns `true`, but also adds a compilation error.
+		*)
+		method can_pass_expr expr to_type p =
+			match expr.eexpr, to_type with
+				| TObjectDecl fields, TAnon to_type ->
+					List.for_all
+						(fun ((name, _, _), field_expr) ->
+							try
+								let field_to_type = PMap.find name to_type.a_fields in
+								self#can_pass_expr field_expr field_to_type.cf_type p
+							with Not_found -> false)
+						fields
+				| _, _ ->
+					if self#is_nullable_expr expr && not (is_nullable_type to_type) then
+						false
+					else begin
+						let expr_type = unfold_null expr.etype in
+						try
+							new unificator#unify expr_type to_type;
+							true
+						with
+							| Safety_error err ->
+								self#error ("Cannot unify " ^ (str_type expr_type) ^ " with " ^ (str_type to_type)) [p; expr.epos];
+								(* returning `true` because error is already logged in the line above *)
+								true
+							| e ->
+								fail ~msg:"Null safety unification failure" expr.epos __POS__
+						(* can_pass_type expr.etype to_type *)
+					end
+		(**
+			Should be called for the root expressions of a method or for then initialization expressions of fields.
+		*)
+		method check_root_expr e =
+			self#check_expr e;
+			local_safety#clear;
+			return_types <- [];
+			in_closure <- false
+		(**
+			Recursively checks an expression
+		*)
+		method private check_expr e =
+			match e.eexpr with
+				| TConst _ -> ()
+				| TLocal _ -> ()
+				| TArray (arr, idx) -> self#check_array_access arr idx e.epos
+				| TBinop (op, left_expr, right_expr) -> self#check_binop op left_expr right_expr e.epos
+				| TField (target, access) -> self#check_field target access e.epos
+				| TTypeExpr _ -> ()
+				| TParenthesis e -> self#check_expr e
+				| TObjectDecl fields -> List.iter (fun (_, e) -> self#check_expr e) fields
+				| TArrayDecl items -> self#check_array_decl items e.etype e.epos
+				| TCall (callee, args) -> self#check_call callee args e.epos
+				| TNew _ -> self#check_new e
+				| TUnop (_, _, expr) -> self#check_unop expr e.epos
+				| TFunction fn -> self#check_function fn
+				| TVar (v, init_expr) -> self#check_var v init_expr e.epos
+				| TBlock exprs -> self#check_block exprs e.epos
+				| TFor _ -> self#check_for e
+				| TIf _ -> self#check_if e
+				| TWhile _ -> self#check_while e
+				| TSwitch (target, cases, default) -> self#check_switch target cases default e.epos
+				| TTry (try_block, catches) -> self#check_try try_block catches
+				| TReturn (Some expr) -> self#check_return expr e.epos
+				| TReturn None -> ()
+				| TBreak -> ()
+				| TContinue -> ()
+				| TThrow expr -> self#check_throw expr e.epos
+				| TCast (expr, _) -> self#check_cast expr e.etype e.epos
+				| TMeta (m, _) when contains_unsafe_meta [m] -> ()
+				| TMeta (_, e) -> self#check_expr e
+				| TEnumIndex idx -> self#check_enum_index idx e.epos
+				| TEnumParameter (e, _, _) -> self#check_expr e (** Checking enum value itself is not needed here because this expr always follows after TEnumIndex *)
+				| TIdent _ -> ()
+		(**
+			Check expressions in a block
+		*)
+		method private check_block exprs p =
+			match exprs with
+				| [] -> ()
+				| e :: rest ->
+					self#check_expr e;
+					self#check_block rest p
+		(**
+			Don't allow to use nullable values as items in declaration of not-nullable arrays
+		*)
+		method private check_array_decl items arr_type p =
+			(match Abstract.follow_with_abstracts arr_type with
+				| TInst ({ cl_path = ([], "Array") }, [item_type]) ->
+					List.iter
+						(fun e ->
+							if not (self#can_pass_expr e item_type e.epos) then
+								self#error ("Cannot use nullable value of " ^ (str_type e.etype) ^ " as an item in Array<" ^ (str_type item_type) ^ ">") [e.epos; p]
+						)
+						items;
+				| _ -> ()
+			);
+			List.iter self#check_expr items
+		(**
+			Deal with nullable enum values
+		*)
+		method private check_enum_index idx p =
+			if self#is_nullable_expr idx then
+				self#error "Cannot access nullable enum value." [idx.epos; p];
+			self#check_expr idx
+		(**
+			Check try...catch
+		*)
+		method private check_try try_block catches =
+			local_safety#process_try try_block catches self#check_expr
+		(**
+			Don't use nullable value as a condition in `while`
+		*)
+		method private check_while e =
+			match e.eexpr with
+				| TWhile _ ->
+					let check_condition condition =
+						if self#is_nullable_expr condition then
+							self#error "Cannot use nullable value as a condition in \"while\"." [condition.epos; e.epos];
+						self#check_expr condition
+					in
+					local_safety#loop_declared e;
+					local_safety#process_while
+						e
+						self#is_nullable_expr
+						check_condition
+						(* self#check_loop_body; *)
+						(fun handle_condition_effect body ->
+							self#check_loop_body
+								(Some handle_condition_effect)
+								body
+						);
+					local_safety#scope_closed
+				| _ -> fail ~msg:"Expected TWhile." e.epos __POS__
+		(**
+			Don't iterate on nullable values
+		*)
+		method private check_for e =
+			match e.eexpr with
+				| TFor (v, iterable, body) ->
+					if self#is_nullable_expr iterable then
+						self#error "Cannot iterate over nullable value." [iterable.epos; e.epos];
+					self#check_expr iterable;
+					local_safety#declare_var v;
+					local_safety#loop_declared e;
+					self#check_loop_body None body;
+					local_safety#scope_closed
+				| _ -> fail ~msg:"Expected TFor." e.epos __POS__
+		(**
+			Handle safety inside of loops
+		*)
+		method private check_loop_body (handle_condition_effect:(unit->unit) option) body =
+			local_safety#process_loop_body
+				(* Start pretending to ignore errors *)
+				(fun () ->
+					is_pretending <- true;
+					self#check_expr body
+				)
+				handle_condition_effect
+				(* Now we know, which vars will become unsafe in this loop. Stop pretending and check again *)
+				(fun () ->
+					is_pretending <- false;
+					self#check_expr body;
+				)
+		(**
+			Don't throw nullable values
+		*)
+		method private check_throw e p =
+			if self#is_nullable_expr e then
+				self#error "Cannot throw nullable value." [p; e.epos];
+			self#check_expr e
+		(**
+			Don't cast nullable expressions to not-nullable types
+		*)
+		method private check_cast expr to_type p =
+			self#check_expr expr;
+			match to_type with
+				(* untyped cast *)
+				| TMono _ -> ()
+				(* typed cast and type check *)
+				| _ ->
+					if not (self#can_pass_expr expr to_type p) then
+						self#error "Cannot cast nullable value to not nullable type." [p; expr.epos]
+		(**
+			Check safety in a function
+		*)
+		method private check_function ?(immediate_execution=false) fn =
+			local_safety#function_declared immediate_execution fn;
+			return_types <- fn.tf_type :: return_types;
+			if immediate_execution || mode = SMLoose then
+				begin
+					let original_safe_locals = local_safety#get_safe_locals_copy in
+					(* Start pretending to ignore errors *)
+					is_pretending <- true;
+					self#check_expr fn.tf_expr;
+					(* Now we know, which vars will become unsafe in this closure. Stop pretending and perform real check *)
+					is_pretending <- false;
+					local_safety#filter_safety original_safe_locals;
+					self#check_expr fn.tf_expr
+				end
+			else
+				self#check_expr fn.tf_expr;
+			return_types <- List.tl return_types;
+			local_safety#scope_closed
+		(**
+			Don't return nullable values as not-nullable return types.
+		*)
+		method private check_return e p =
+			self#check_expr e;
+			match return_types with
+				| t :: _ when not (self#can_pass_expr e t p) ->
+					self#error ("Cannot return nullable value of " ^ (str_type e.etype) ^ " as " ^ (str_type t)) [p; e.epos]
+				| _ -> ()
+		(**
+			Check safety in `switch` expressions.
+		*)
+		method private check_switch target cases default p =
+			if self#is_nullable_expr target then
+				self#error "Cannot switch on nullable value." [target.epos; p];
+			self#check_expr target;
+			let rec traverse_cases cases =
+				match cases with
+					| [] -> ()
+					| (_, body) :: rest ->
+						self#check_expr body;
+						traverse_cases rest
+			in
+			traverse_cases cases;
+			match default with
+				| None -> ()
+				| Some e -> self#check_expr e
+		(**
+			Check safety in `if` expressions
+		*)
+		method private check_if expr =
+			let check_condition e =
+				if self#is_nullable_expr e then
+					self#error "Cannot use nullable value as condition in \"if\"." [e.epos; expr.epos];
+				self#check_expr e
+			in
+			local_safety#process_if expr self#is_nullable_expr check_condition self#check_expr
+		(**
+			Check array access on nullable values or using nullable indexes
+		*)
+		method private check_array_access arr idx p =
+			if self#is_nullable_expr arr then
+				self#error "Cannot perform array access on nullable value." [p; arr.epos];
+			if self#is_nullable_expr idx then
+				self#error "Cannot use nullable value as an index for array access." [p; idx.epos];
+			self#check_expr arr;
+			self#check_expr idx
+		(**
+			Don't perform unsafe binary operations
+		*)
+		method private check_binop op left_expr right_expr p =
+			let check_both () =
+				self#check_expr left_expr;
+				self#check_expr right_expr
+			in
+			match op with
+				| OpEq | OpNotEq -> check_both()
+				| OpBoolAnd ->
+					local_safety#process_and left_expr right_expr self#is_nullable_expr self#check_expr
+				| OpBoolOr ->
+					local_safety#process_or left_expr right_expr self#is_nullable_expr self#check_expr
+				(* String concatination is safe if one of operands is safe *)
+				| OpAdd
+				| OpAssignOp OpAdd when is_string_type left_expr.etype || is_string_type right_expr.etype  ->
+					check_both();
+					if is_nullable_type left_expr.etype && is_nullable_type right_expr.etype then
+						self#error "Cannot concatenate two nullable values." [p; left_expr.epos; right_expr.epos]
+				| OpAssign ->
+					check_both();
+					if not (self#can_pass_expr right_expr left_expr.etype p) then
+						self#error "Cannot assign nullable value here." [p; right_expr.epos; left_expr.epos]
+					else
+						local_safety#handle_assignment self#is_nullable_expr left_expr right_expr;
+				| _->
+					if self#is_nullable_expr left_expr || self#is_nullable_expr right_expr then
+						self#error "Cannot perform binary operation on nullable value." [p; left_expr.epos; right_expr.epos];
+					check_both()
+		(**
+			Don't perform unops on nullable values
+		*)
+		method private check_unop e p =
+			if self#is_nullable_expr e then
+				self#error "Cannot perform unary operation on nullable value." [p; e.epos];
+			self#check_expr e
+		(**
+			Don't assign nullable value to not-nullable variable on var declaration
+		*)
+		method private check_var v init p =
+			local_safety#declare_var v;
+			match init with
+				| None -> ()
+				(* Local named functions like `function fn() {}`, which are generated as `var fn = null; fn = function(){}` *)
+				| Some { eexpr = TConst TNull } when v.v_kind = VUser TVOLocalFunction -> ()
+				(* `_this = null` is generated for local `inline function` *)
+				| Some { eexpr = TConst TNull } when v.v_kind = VGenerated -> ()
+				| Some e ->
+					let local = { eexpr = TLocal v; epos = v.v_pos; etype = v.v_type } in
+					self#check_binop OpAssign local e p
+					(* self#check_expr e;
+					local_safety#handle_assignment self#is_nullable_expr local e;
+					if not (self#can_pass_expr e v.v_type p) then
+						self#error "Cannot assign nullable value to not-nullable variable." p; *)
+		(**
+			Make sure nobody tries to access a field on a nullable value
+		*)
+		method private check_field target access p =
+			if self#is_nullable_expr target then
+				self#error ("Cannot access \"" ^ accessed_field_name access ^ "\" of a nullable value.") [p; target.epos];
+			self#check_expr target
+		(**
+			Check constructor invocation: don't pass nulable values to not-nullable arguments
+		*)
+		method private check_new e_new =
+			match e_new.eexpr with
+				| TNew (cls, params, args) ->
+					let ctor =
+						try
+							Some (get_constructor (fun ctor -> apply_params cls.cl_params params ctor.cf_type) cls)
+						with
+							| Not_found -> None
+					in
+					(match ctor with
+						| None ->
+							List.iter self#check_expr args
+						| Some (ctor_type, _) ->
+							let rec traverse t =
+								match follow t with
+									| TFun (types, _) -> self#check_args e_new args types
+									| _ -> fail ~msg:"Unexpected constructor type." e_new.epos __POS__
+							in
+							traverse ctor_type
+					)
+				| _ -> fail ~msg:"TNew expected" e_new.epos __POS__
+		(**
+			Check calls: don't call a nullable value, dont' pass nulable values to not-nullable arguments
+		*)
+		method private check_call callee args p =
+			if self#is_nullable_expr callee then
+				self#error "Cannot call a nullable value." [callee.epos; p];
+			(match callee.eexpr with
+				| TFunction fn | TParenthesis { eexpr = TFunction fn } ->
+					self#check_function ~immediate_execution:true fn
+				| _ ->
+					self#check_expr callee
+			);
+			match follow callee.etype with
+				| TFun (types, _) ->
+					if is_trace callee then
+						let real_args =
+							match List.rev args with
+								| { eexpr = TObjectDecl fields } :: [first_arg] ->
+									(try
+										let arr =
+											snd (List.find (fun ((name, _, _), _) -> name = "customParams") fields)
+										in
+										match arr.eexpr with
+											| TArrayDecl rest_args -> first_arg :: rest_args
+											| _ -> args
+									with Not_found -> args
+									)
+								| _ -> args
+						in
+						List.iter self#check_expr real_args
+					else
+						self#check_args callee args types
+				| _ ->
+					List.iter self#check_expr args
+		(**
+			Check if specified expressions can be passed to a call which expects `types`.
+		*)
+		method private check_args ?(arg_num=0) callee args types =
+			match (args, types) with
+				| (arg :: args, (arg_name, optional, t) :: types) ->
+					if not optional && not (self#can_pass_expr arg t arg.epos) then begin
+						let fn_str = match symbol_name callee with "" -> "" | name -> " of function \"" ^ name ^ "\""
+						and arg_str = if arg_name = "" then "" else " \"" ^ arg_name ^ "\"" in
+						self#error ("Cannot pass nullable value to not-nullable argument" ^ arg_str ^ fn_str ^ ".") [arg.epos; callee.epos]
+					end;
+					(match arg.eexpr with
+						| TFunction fn ->
+							self#check_function ~immediate_execution:(immediate_execution#check callee arg_num) fn
+						| _ ->
+							self#check_expr arg
+					);
+					self#check_args ~arg_num:(arg_num + 1) callee args types;
+				| _ -> ()
+	end
+
+class class_checker cls immediate_execution report  =
+	let cls_meta = cls.cl_meta @ (match cls.cl_kind with KAbstractImpl a -> a.a_meta | _ -> []) in
+	object (self)
+			val is_safe_class = (safety_enabled cls_meta)
+			val mutable checker = new expr_checker SMLoose immediate_execution report
+			val mutable mode = None
+		(**
+			Entry point for checking a class
+		*)
+		method check =
+			if is_safe_class && (not cls.cl_extern) && (not cls.cl_interface) then
+				self#check_var_fields;
+			let check_field is_static f =
+				match (safety_mode (cls_meta @ f.cf_meta)) with
+					| SMOff -> ()
+					| mode ->
+						(match f.cf_expr with
+							| None -> ()
+							| Some expr ->
+								(self#get_checker mode)#check_root_expr expr
+						);
+						self#check_accessors is_static f
+			in
+			if is_safe_class then
+				Option.may ((self#get_checker (safety_mode cls_meta))#check_root_expr) cls.cl_init;
+			Option.may (check_field false) cls.cl_constructor;
+			List.iter (check_field false) cls.cl_ordered_fields;
+			List.iter (check_field true) cls.cl_ordered_statics;
+		(**
+			Check if a getter/setter for non-nullable property return safe values.
+			E.g.
+			```
+			var str(get,never):String;
+			function get_str() return (null:Null<String>); //should fail null safety check
+			```
+		*)
+		method private check_accessors is_static field =
+			match field.cf_kind with
+				| Var { v_read = read_access; v_write = write_access } when not (is_nullable_type field.cf_type) ->
+					let fields = if is_static then cls.cl_statics else cls.cl_fields in
+					let check_accessor prefix =
+						let accessor =
+							try Some (PMap.find (prefix ^ field.cf_name) fields)
+							with Not_found -> None
+						in
+						match accessor with
+							| None -> ()
+							| Some accessor ->
+								if self#is_in_safety accessor then
+									match accessor.cf_expr with
+										| Some ({ eexpr = TFunction fn } as accessor_expr) ->
+											let fn = { fn with tf_type = field.cf_type } in
+											(self#get_checker self#class_safety_mode)#check_root_expr { accessor_expr with eexpr = TFunction fn }
+										| _ -> ()
+					in
+					if read_access = AccCall then check_accessor "get_";
+					if write_access = AccCall then check_accessor "set_"
+				| _ -> ()
+		(**
+			Get safety mode for the current class
+		*)
+		method private class_safety_mode =
+			match mode with
+				| Some mode -> mode
+				| None ->
+					let m = safety_mode cls_meta in
+					mode <- Some m;
+					m
+		(**
+			Get an instance of expression checker with safety mode set to `mode`
+		*)
+		method private get_checker mode =
+			if checker#get_mode <> mode then
+				checker <- new expr_checker mode immediate_execution report;
+			checker
+		(**
+			Check if field should be checked by null safety
+		*)
+		method private is_in_safety field =
+			(is_safe_class && not (contains_unsafe_meta field.cf_meta)) || safety_enabled field.cf_meta
+		(**
+			Check `var` fields are initialized properly
+		*)
+		method check_var_fields =
+			let check_field is_static field =
+				if should_be_initialized field then
+					if not (is_nullable_type field.cf_type) && self#is_in_safety field then
+						match field.cf_expr with
+							| None ->
+								if is_static then
+									checker#error
+										("Field \"" ^ field.cf_name ^ "\" is not nullable thus should have an initial value.")
+										[field.cf_pos]
+							| Some e ->
+								if not (checker#can_pass_expr e field.cf_type e.epos) then
+									checker#error ("Cannot set nullable initial value for not-nullable field \"" ^ field.cf_name ^ "\".") [field.cf_pos]
+			in
+			List.iter (check_field false) cls.cl_ordered_fields;
+			List.iter (check_field true) cls.cl_ordered_statics;
+			self#check_fields_initialization_in_constructor ()
+		(**
+			Check instance fields without initial values are properly initialized in constructor
+		*)
+		method private check_fields_initialization_in_constructor () =
+			let fields_to_initialize = Hashtbl.create 20
+			(* Compiler-autogenerated local vars for transfering `this` to local functions *)
+			and this_vars = Hashtbl.create 5 in
+			List.iter
+				(fun f ->
+					if
+						should_be_initialized f
+						&& not (is_nullable_type f.cf_type)
+						&& not (contains_unsafe_meta f.cf_meta)
+					then
+						match f.cf_expr with
+							| Some _ -> ()
+							| None -> Hashtbl.add fields_to_initialize f.cf_name f
+				)
+				cls.cl_ordered_fields;
+			let rec check_unsafe_usage init_list safety_enabled e =
+				if Hashtbl.length init_list > 0 then
+					match e.eexpr with
+						| TField ({ eexpr = TConst TThis }, FInstance (_, _, field)) ->
+							if Hashtbl.mem init_list field.cf_name then
+								checker#error ("Cannot use field " ^ field.cf_name ^ " until initialization.") [e.epos]
+						| TField ({ eexpr = TConst TThis }, FClosure (_, field)) ->
+							checker#error ("Cannot use method " ^ field.cf_name ^ " until all instance fields are initialized.") [e.epos];
+						| TCall ({ eexpr = TField ({ eexpr = TConst TThis }, FInstance (_, _, field)) }, args) ->
+							checker#error ("Cannot call method " ^ field.cf_name ^ " until all instance fields are initialized.") [e.epos];
+							List.iter (check_unsafe_usage init_list safety_enabled) args
+						| TConst TThis when safety_enabled ->
+							checker#error "Cannot use \"this\" until all instance fields are initialized." [e.epos]
+						| TLocal v when Hashtbl.mem this_vars v.v_id ->
+							checker#error "Cannot use \"this\" until all instance fields are initialized." [e.epos]
+						| TMeta ((Meta.NullSafety, [(EConst (Ident "Off"), _)], _), e) ->
+							iter (check_unsafe_usage init_list false) e
+						| TMeta ((Meta.NullSafety, _, _), e) ->
+							iter (check_unsafe_usage init_list true) e
+						| _ ->
+							iter (check_unsafe_usage init_list safety_enabled) e
+			in
+			let rec traverse init_list e =
+				(match e.eexpr with
+					| TBinop (OpAssign, { eexpr = TField ({ eexpr = TConst TThis }, FInstance (_, _, f)) }, right_expr) ->
+						Hashtbl.remove init_list f.cf_name;
+						ignore (traverse init_list right_expr)
+					| TWhile (condition, body, DoWhile) ->
+						check_unsafe_usage init_list true condition;
+						ignore (traverse init_list body)
+					| TBlock exprs ->
+						List.iter (fun e -> ignore (traverse init_list e)) exprs
+					| TIf (_, if_block, Some else_block) ->
+						let if_init_list = traverse (Hashtbl.copy init_list) if_block
+						and else_init_list = traverse (Hashtbl.copy init_list) else_block in
+						Hashtbl.clear init_list;
+						Hashtbl.iter (Hashtbl.replace init_list) if_init_list;
+						Hashtbl.iter (Hashtbl.replace init_list) else_init_list
+					(* var _gthis = this *)
+					| TVar (v, Some { eexpr = TConst TThis }) ->
+						Hashtbl.add this_vars v.v_id v
+					| _ ->
+						check_unsafe_usage init_list true e
+				);
+				init_list
+			in
+			(match cls.cl_constructor with
+				| Some { cf_expr = Some { eexpr = TFunction { tf_expr = e } } } ->
+					ignore (traverse fields_to_initialize e);
+				| _ -> ()
+			);
+			Hashtbl.iter
+				(fun name field ->
+					checker#error
+						("Field \"" ^ name ^ "\" is not nullable thus should have an initial value or should be initialized in constructor.")
+						[field.cf_pos]
+				)
+				fields_to_initialize
+	end
+
+(**
+	Run null safety checks.
+*)
+let run (com:Common.context) (types:module_type list) =
+	let timer = Timer.timer ["null safety"] in
+	let report = { sr_errors = [] } in
+	let immediate_execution = new immediate_execution in
+	let rec traverse module_type =
+		match module_type with
+			| TEnumDecl enm -> ()
+			| TTypeDecl typedef -> ()
+			| TAbstractDecl abstr -> ()
+			| TClassDecl cls -> (new class_checker cls immediate_execution report)#check
+	in
+	List.iter traverse types;
+	timer();
+	match com.callbacks#get_null_safety_report with
+		| [] ->
+			List.iter (fun err -> com.error err.sm_msg err.sm_pos) (List.rev report.sr_errors)
+		| callbacks ->
+			let errors =
+				List.map (fun err -> (err.sm_msg, err.sm_pos)) report.sr_errors
+			in
+			List.iter (fun fn -> fn errors) callbacks
+
+;;
diff --git a/src/typing/typecore.ml b/src/typing/typecore.ml
deleted file mode 100644
index 8bdff33f897b52ace1995410c590e4524fef271b..0000000000000000000000000000000000000000
--- a/src/typing/typecore.ml
+++ /dev/null
@@ -1,730 +0,0 @@
-(*
-	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *)
-
-open Globals
-open Ast
-open Common
-open Type
-open Error
-
-type with_type =
-	| NoValue
-	| Value
-	| WithType of t
-
-type type_patch = {
-	mutable tp_type : complex_type option;
-	mutable tp_remove : bool;
-	mutable tp_meta : metadata;
-}
-
-type current_fun =
-	| FunMember
-	| FunStatic
-	| FunConstructor
-	| FunMemberAbstract
-	| FunMemberClassLocal
-	| FunMemberAbstractLocal
-
-type macro_mode =
-	| MExpr
-	| MBuild
-	| MMacroType
-	| MDisplay
-
-type typer_pass =
-	| PBuildModule			(* build the module structure and setup module type parameters *)
-	| PBuildClass			(* build the class structure *)
-	| PTypeField			(* type the class field, allow access to types structures *)
-	| PCheckConstraint		(* perform late constraint checks with inferred types *)
-	| PForce				(* usually ensure that lazy have been evaluated *)
-	| PFinal				(* not used, only mark for finalize *)
-
-type typer_module = {
-	curmod : module_def;
-	mutable module_types : (module_type * pos) list;
-	mutable module_using : (tclass * pos) list;
-	mutable module_globals : (string, (module_type * string * pos)) PMap.t;
-	mutable wildcard_packages : (string list * pos) list;
-	mutable module_imports : import list;
-}
-
-type typer_globals = {
-	types_module : (path, path) Hashtbl.t;
-	modules : (path , module_def) Hashtbl.t;
-	mutable delayed : (typer_pass * (unit -> unit) list) list;
-	mutable debug_delayed : (typer_pass * ((unit -> unit) * string * typer) list) list;
-	doinline : bool;
-	mutable core_api : typer option;
-	mutable macros : ((unit -> unit) * typer) option;
-	mutable std : module_def;
-	mutable hook_generate : (unit -> unit) list;
-	type_patches : (path, (string * bool, type_patch) Hashtbl.t * type_patch) Hashtbl.t;
-	mutable global_metadata : (string list * metadata_entry * (bool * bool * bool)) list;
-	mutable module_check_policies : (string list * module_check_policy list * bool) list;
-	mutable get_build_infos : unit -> (module_type * t list * class_field list) option;
-	delayed_macros : (unit -> unit) DynArray.t;
-	mutable global_using : (tclass * pos) list;
-	(* api *)
-	do_inherit : typer -> Type.tclass -> pos -> (bool * placed_type_path) -> bool;
-	do_create : Common.context -> typer;
-	do_macro : typer -> macro_mode -> path -> string -> expr list -> pos -> expr option;
-	do_load_module : typer -> path -> pos -> module_def;
-	do_optimize : typer -> texpr -> texpr;
-	do_build_instance : typer -> module_type -> pos -> ((string * t) list * path * (t list -> t));
-	do_format_string : typer -> string -> pos -> Ast.expr;
-	do_finalize : typer -> unit;
-	do_generate : typer -> (texpr option * module_type list * module_def list);
-}
-
-and typer = {
-	(* shared *)
-	com : context;
-	t : basic_types;
-	g : typer_globals;
-	mutable meta : metadata;
-	mutable this_stack : texpr list;
-	mutable with_type_stack : with_type list;
-	mutable call_argument_stack : expr list list;
-	(* variable *)
-	mutable pass : typer_pass;
-	(* per-module *)
-	mutable m : typer_module;
-	mutable is_display_file : bool;
-	(* per-class *)
-	mutable curclass : tclass;
-	mutable tthis : t;
-	mutable type_params : (string * t) list;
-	(* per-function *)
-	mutable curfield : tclass_field;
-	mutable untyped : bool;
-	mutable in_loop : bool;
-	mutable in_display : bool;
-	mutable in_macro : bool;
-	mutable macro_depth : int;
-	mutable curfun : current_fun;
-	mutable ret : t;
-	mutable locals : (string, tvar) PMap.t;
-	mutable opened : anon_status ref list;
-	mutable vthis : tvar option;
-	mutable in_call_args : bool;
-	(* events *)
-	mutable on_error : typer -> string -> pos -> unit;
-}
-exception Forbid_package of (string * path * pos) * pos list * string
-
-exception WithTypeError of error_msg * pos
-
-let make_call_ref : (typer -> texpr -> texpr list -> t -> pos -> texpr) ref = ref (fun _ _ _ _ _ -> assert false)
-let type_expr_ref : (typer -> expr -> with_type -> texpr) ref = ref (fun _ _ _ -> assert false)
-let type_module_type_ref : (typer -> module_type -> t list option -> pos -> texpr) ref = ref (fun _ _ _ _ -> assert false)
-let unify_min_ref : (typer -> texpr list -> t) ref = ref (fun _ _ -> assert false)
-let match_expr_ref : (typer -> expr -> (expr list * expr option * expr option * pos) list -> (expr option * pos) option -> with_type -> pos -> texpr) ref = ref (fun _ _ _ _ _ _ -> assert false)
-let get_pattern_locals_ref : (typer -> expr -> Type.t -> (string, tvar * pos) PMap.t) ref = ref (fun _ _ _ -> assert false)
-let get_constructor_ref : (typer -> tclass -> t list -> pos -> (t * tclass_field)) ref = ref (fun _ _ _ _ -> assert false)
-let cast_or_unify_ref : (typer -> t -> texpr -> pos -> texpr) ref = ref (fun _ _ _ _ -> assert false)
-let find_array_access_raise_ref : (typer -> tabstract -> tparams -> texpr -> texpr option -> pos -> (tclass_field * t * t * texpr * texpr option)) ref = ref (fun _ _ _ _ _ _ -> assert false)
-let analyzer_run_on_expr_ref : (Common.context -> texpr -> texpr) ref = ref (fun _ _ -> assert false)
-let merge_core_doc_ref : (typer -> tclass -> unit) ref = ref (fun _ _ -> assert false)
-
-let pass_name = function
-	| PBuildModule -> "build-module"
-	| PBuildClass -> "build-class"
-	| PTypeField -> "type-field"
-	| PCheckConstraint -> "check-constraint"
-	| PForce -> "force"
-	| PFinal -> "final"
-
-let display_error ctx msg p = match ctx.com.display.DisplayMode.dms_error_policy with
-	| DisplayMode.EPShow | DisplayMode.EPIgnore -> ctx.on_error ctx msg p
-	| DisplayMode.EPCollect -> add_diagnostics_message ctx.com msg p DisplayTypes.DiagnosticsSeverity.Error
-
-let make_call ctx e el t p = (!make_call_ref) ctx e el t p
-
-let type_expr ctx e with_type = (!type_expr_ref) ctx e with_type
-
-let unify_min ctx el = (!unify_min_ref) ctx el
-
-let match_expr ctx e cases def with_type p = !match_expr_ref ctx e cases def with_type p
-
-let make_static_this c p =
-	let ta = TAnon { a_fields = c.cl_statics; a_status = ref (Statics c) } in
-	mk (TTypeExpr (TClassDecl c)) ta p
-
-let make_static_field_access c cf t p =
-	let ethis = make_static_this c p in
-	mk (TField (ethis,(FStatic (c,cf)))) t p
-
-let make_static_call ctx c cf map args t p =
-	let monos = List.map (fun _ -> mk_mono()) cf.cf_params in
-	let map t = map (apply_params cf.cf_params monos t) in
-	let ef = make_static_field_access c cf (map cf.cf_type) p in
-	make_call ctx ef args (map t) p
-
-let raise_or_display ctx l p =
-	if ctx.untyped then ()
-	else if ctx.in_call_args then raise (WithTypeError(Unify l,p))
-	else display_error ctx (error_msg (Unify l)) p
-
-let raise_or_display_message ctx msg p =
-	if ctx.in_call_args then raise (WithTypeError (Custom msg,p))
-	else display_error ctx msg p
-
-let unify ctx t1 t2 p =
-	try
-		Type.unify t1 t2
-	with
-		Unify_error l ->
-			raise_or_display ctx l p
-
-let unify_raise ctx t1 t2 p =
-	try
-		Type.unify t1 t2
-	with
-		Unify_error l ->
-			(* no untyped check *)
-			raise (Error (Unify l,p))
-
-let save_locals ctx =
-	let locals = ctx.locals in
-	(fun() -> ctx.locals <- locals)
-
-let add_local ctx n t p =
-	let v = alloc_var n t p in
-	ctx.locals <- PMap.add n v ctx.locals;
-	v
-
-let add_unbound_local ctx n t p =
-	let v = add_local ctx n t p in
-	v.v_meta <- (Meta.Unbound,[],null_pos) :: v.v_meta;
-	v
-
-let gen_local_prefix = "`"
-
-let gen_local ctx t p =
-	(* ensure that our generated local does not mask an existing one *)
-	let rec loop n =
-		let nv = (if n = 0 then gen_local_prefix else gen_local_prefix ^ string_of_int n) in
-		if PMap.mem nv ctx.locals then
-			loop (n+1)
-		else
-			nv
-	in
-	add_local ctx (loop 0) t p
-
-let is_gen_local v =
-	String.unsafe_get v.v_name 0 = String.unsafe_get gen_local_prefix 0
-
-let delay ctx p f =
-	let rec loop = function
-		| [] -> [p,[f]]
-		| (p2,l) :: rest ->
-			if p2 = p then
-				(p, f :: l) :: rest
-			else if p2 < p then
-				(p2,l) :: loop rest
-			else
-				(p,[f]) :: (p2,l) :: rest
-	in
-	ctx.g.delayed <- loop ctx.g.delayed
-
-let delay_late ctx p f =
-	let rec loop = function
-		| [] -> [p,[f]]
-		| (p2,l) :: rest ->
-			if p2 <= p then
-				(p2,l) :: loop rest
-			else
-				(p,[f]) :: (p2,l) :: rest
-	in
-	ctx.g.delayed <- loop ctx.g.delayed
-
-let rec flush_pass ctx p (where:string) =
-	match ctx.g.delayed with
-	| (p2,l) :: rest when p2 <= p ->
-		(match l with
-		| [] ->
-			ctx.g.delayed <- rest;
-		| f :: l ->
-			ctx.g.delayed <- (p2,l) :: rest;
-			f());
-		flush_pass ctx p where
-	| _ ->
-		()
-
-let make_pass ctx f = f
-
-let init_class_done ctx =
-	ctx.pass <- PTypeField
-
-let exc_protect ctx f (where:string) =
-	let rec r = ref (fun() ->
-		try
-			f r
-		with
-			| Error (m,p) ->
-				raise (Fatal_error ((error_msg m),p))
-	) in
-	r
-
-let fake_modules = Hashtbl.create 0
-let create_fake_module ctx file =
-	let file = Path.unique_full_path file in
-	let mdep = (try Hashtbl.find fake_modules file with Not_found ->
-		let mdep = {
-			m_id = alloc_mid();
-			m_path = (["$DEP"],file);
-			m_types = [];
-			m_extra = module_extra file (Common.get_signature ctx.com) (file_time file) MFake [];
-		} in
-		Hashtbl.add fake_modules file mdep;
-		mdep
-	) in
-	Hashtbl.replace ctx.g.modules mdep.m_path mdep;
-	mdep
-
-let push_this ctx e = match e.eexpr with
-	| TConst ((TInt _ | TFloat _ | TString _ | TBool _) as ct) ->
-		(EConst (tconst_to_const ct),e.epos),fun () -> ()
-	| _ ->
-		ctx.this_stack <- e :: ctx.this_stack;
-		let er = EMeta((Meta.This,[],e.epos), (EConst(Ident "this"),e.epos)),e.epos in
-		er,fun () -> ctx.this_stack <- List.tl ctx.this_stack
-
-let is_removable_field ctx f =
-	Meta.has Meta.Extern f.cf_meta || Meta.has Meta.Generic f.cf_meta
-	|| (match f.cf_kind with
-		| Var {v_read = AccRequire (s,_)} -> true
-		| Method MethMacro -> not ctx.in_macro
-		| _ -> false)
-
-(* -------------------------------------------------------------------------- *)
-(* ABSTRACT CASTS *)
-
-module AbstractCast = struct
-
-	let cast_stack = ref []
-
-	let make_static_call ctx c cf a pl args t p =
-		if cf.cf_kind = Method MethMacro then begin
-			match args with
-				| [e] ->
-					let e,f = push_this ctx e in
-					ctx.with_type_stack <- (WithType t) :: ctx.with_type_stack;
-					let e = match ctx.g.do_macro ctx MExpr c.cl_path cf.cf_name [e] p with
-						| Some e -> type_expr ctx e Value
-						| None ->  type_expr ctx (EConst (Ident "null"),p) Value
-					in
-					ctx.with_type_stack <- List.tl ctx.with_type_stack;
-					f();
-					e
-				| _ -> assert false
-		end else
-			make_static_call ctx c cf (apply_params a.a_params pl) args t p
-
-	let do_check_cast ctx tleft eright p =
-		let recurse cf f =
-			if cf == ctx.curfield || List.mem cf !cast_stack then error "Recursive implicit cast" p;
-			cast_stack := cf :: !cast_stack;
-			let r = f() in
-			cast_stack := List.tl !cast_stack;
-			r
-		in
-		let find a tl f =
-			let tcf,cf = f() in
-			if (Meta.has Meta.MultiType a.a_meta) then
-				mk_cast eright tleft p
-			else match a.a_impl with
-				| Some c -> recurse cf (fun () ->
-					let ret = make_static_call ctx c cf a tl [eright] tleft p in
-					{ ret with eexpr = TMeta( (Meta.ImplicitCast,[],ret.epos), ret) }
-				)
-				| None -> assert false
-		in
-		if type_iseq tleft eright.etype then
-			eright
-		else begin
-			let rec loop tleft tright = match follow tleft,follow tright with
-			| TAbstract(a1,tl1),TAbstract(a2,tl2) ->
-				begin try find a2 tl2 (fun () -> Abstract.find_to a2 tl2 tleft)
-				with Not_found -> try find a1 tl1 (fun () -> Abstract.find_from a1 tl1 eright.etype tleft)
-				with Not_found -> raise Not_found
-				end
-			| TAbstract(a,tl),_ ->
-				begin try find a tl (fun () -> Abstract.find_from a tl eright.etype tleft)
-				with Not_found ->
-					let rec loop2 tcl = match tcl with
-						| tc :: tcl ->
-							if not (type_iseq tc tleft) then loop (apply_params a.a_params tl tc) tright
-							else loop2 tcl
-						| [] -> raise Not_found
-					in
-					loop2 a.a_from
-				end
-			| _,TAbstract(a,tl) ->
-				begin try find a tl (fun () -> Abstract.find_to a tl tleft)
-				with Not_found ->
-					let rec loop2 tcl = match tcl with
-						| tc :: tcl ->
-							if not (type_iseq tc tright) then loop tleft (apply_params a.a_params tl tc)
-							else loop2 tcl
-						| [] -> raise Not_found
-					in
-					loop2 a.a_to
-				end
-			| _ ->
-				raise Not_found
-			in
-			loop tleft eright.etype
-		end
-
-	let cast_or_unify_raise ctx tleft eright p =
-		try
-			(* can't do that anymore because this might miss macro calls (#4315) *)
-			(* if ctx.com.display <> DMNone then raise Not_found; *)
-			do_check_cast ctx tleft eright p
-		with Not_found ->
-			unify_raise ctx eright.etype tleft p;
-			eright
-
-	let cast_or_unify ctx tleft eright p =
-		try
-			cast_or_unify_raise ctx tleft eright p
-		with Error (Unify l,p) ->
-			raise_or_display ctx l p;
-			eright
-
-	let find_array_access_raise ctx a pl e1 e2o p =
-		let is_set = e2o <> None in
-		let ta = apply_params a.a_params pl a.a_this in
-		let rec loop cfl = match cfl with
-			| [] -> raise Not_found
-			| cf :: cfl ->
-				let monos = List.map (fun _ -> mk_mono()) cf.cf_params in
-				let map t = apply_params a.a_params pl (apply_params cf.cf_params monos t) in
-				let check_constraints () =
-					List.iter2 (fun m (name,t) -> match follow t with
-						| TInst ({ cl_kind = KTypeParameter constr },_) when constr <> [] ->
-							List.iter (fun tc -> match follow m with TMono _ -> raise (Unify_error []) | _ -> Type.unify m (map tc) ) constr
-						| _ -> ()
-					) monos cf.cf_params;
-				in
-				match follow (map cf.cf_type) with
-				| TFun([(_,_,tab);(_,_,ta1);(_,_,ta2)],r) as tf when is_set ->
-					begin try
-						Type.unify tab ta;
-						let e1 = cast_or_unify_raise ctx ta1 e1 p in
-						let e2o = match e2o with None -> None | Some e2 -> Some (cast_or_unify_raise ctx ta2 e2 p) in
-						check_constraints();
-						cf,tf,r,e1,e2o
-					with Unify_error _ | Error (Unify _,_) ->
-						loop cfl
-					end
-				| TFun([(_,_,tab);(_,_,ta1)],r) as tf when not is_set ->
-					begin try
-						Type.unify tab ta;
-						let e1 = cast_or_unify_raise ctx ta1 e1 p in
-						check_constraints();
-						cf,tf,r,e1,None
-					with Unify_error _ | Error (Unify _,_) ->
-						loop cfl
-					end
-				| _ -> loop cfl
-		in
-		loop a.a_array
-
-	let find_array_access ctx a tl e1 e2o p =
-		try find_array_access_raise ctx a tl e1 e2o p
-		with Not_found -> match e2o with
-			| None ->
-				error (Printf.sprintf "No @:arrayAccess function accepts argument of %s" (s_type (print_context()) e1.etype)) p
-			| Some e2 ->
-				error (Printf.sprintf "No @:arrayAccess function accepts arguments of %s and %s" (s_type (print_context()) e1.etype) (s_type (print_context()) e2.etype)) p
-
-	let find_multitype_specialization com a pl p =
-		let m = mk_mono() in
-		let tl = match Meta.get Meta.MultiType a.a_meta with
-			| _,[],_ -> pl
-			| _,el,_ ->
-				let relevant = Hashtbl.create 0 in
-				List.iter (fun e ->
-					let rec loop f e = match fst e with
-						| EConst(Ident s) ->
-							Hashtbl.replace relevant s f
-						| EMeta((Meta.Custom ":followWithAbstracts",_,_),e1) ->
-							loop Abstract.follow_with_abstracts e1;
-						| _ ->
-							error "Type parameter expected" (pos e)
-					in
-					loop (fun t -> t) e
-				) el;
-				let tl = List.map2 (fun (n,_) t ->
-					try
-						(Hashtbl.find relevant n) t
-					with Not_found ->
-						if not (has_mono t) then t
-						else t_dynamic
-				) a.a_params pl in
-				if com.platform = Globals.Js && a.a_path = ([],"Map") then begin match tl with
-					| t1 :: _ ->
-						let rec loop stack t =
-							if List.exists (fun t2 -> fast_eq t t2) stack then
-								t
-							else begin
-								let stack = t :: stack in
-								match follow t with
-								| TAbstract ({ a_path = [],"Class" },_) ->
-									error (Printf.sprintf "Cannot use %s as key type to Map because Class<T> is not comparable" (s_type (print_context()) t1)) p;
-								| TEnum(en,tl) ->
-									PMap.iter (fun _ ef -> ignore(loop stack ef.ef_type)) en.e_constrs;
-									Type.map (loop stack) t
-								| t ->
-									Type.map (loop stack) t
-							end
-						in
-						ignore(loop [] t1)
-					| _ -> assert false
-				end;
-				tl
-		in
-		let _,cf =
-			try
-				Abstract.find_to a tl m
-			with Not_found ->
-				let at = apply_params a.a_params pl a.a_this in
-				let st = s_type (print_context()) at in
-				if has_mono at then
-					error ("Type parameters of multi type abstracts must be known (for " ^ st ^ ")") p
-				else
-					error ("Abstract " ^ (s_type_path a.a_path) ^ " has no @:to function that accepts " ^ st) p;
-		in
-		cf, follow m
-
-	let handle_abstract_casts ctx e =
-		let rec loop ctx e = match e.eexpr with
-			| TNew({cl_kind = KAbstractImpl a} as c,pl,el) ->
-				if not (Meta.has Meta.MultiType a.a_meta) then begin
-					(* This must have been a @:generic expansion with a { new } constraint (issue #4364). In this case
-					   let's construct the underlying type. *)
-					match Abstract.get_underlying_type a pl with
-					| TInst(c,tl) as t -> {e with eexpr = TNew(c,tl,el); etype = t}
-					| _ -> error ("Cannot construct " ^ (s_type (print_context()) (TAbstract(a,pl)))) e.epos
-				end else begin
-					(* a TNew of an abstract implementation is only generated if it is a multi type abstract *)
-					let cf,m = find_multitype_specialization ctx.com a pl e.epos in
-					let e = make_static_call ctx c cf a pl ((mk (TConst TNull) (TAbstract(a,pl)) e.epos) :: el) m e.epos in
-					{e with etype = m}
-				end
-			| TCall({eexpr = TField(_,FStatic({cl_path=[],"Std"},{cf_name = "string"}))},[e1]) when (match follow e1.etype with TAbstract({a_impl = Some _},_) -> true | _ -> false) ->
-				begin match follow e1.etype with
-					| TAbstract({a_impl = Some c} as a,tl) ->
-						begin try
-							let cf = PMap.find "toString" c.cl_statics in
-							make_static_call ctx c cf a tl [e1] ctx.t.tstring e.epos
-						with Not_found ->
-							e
-						end
-					| _ ->
-						assert false
-				end
-			| TCall(e1, el) ->
-				begin try
-					let rec find_abstract e t = match follow t,e.eexpr with
-						| TAbstract(a,pl),_ when Meta.has Meta.MultiType a.a_meta -> a,pl,e
-						| _,TCast(e1,None) -> find_abstract e1 e1.etype
-						| _,TLocal {v_extra = Some(_,Some e')} ->
-							begin match follow e'.etype with
-							| TAbstract(a,pl) when Meta.has Meta.MultiType a.a_meta -> a,pl,mk (TCast(e,None)) e'.etype e.epos
-							| _ -> raise Not_found
-							end
-						| _ -> raise Not_found
-					in
-					let rec find_field e1 =
-						match e1.eexpr with
-						| TCast(e2,None) ->
-							{e1 with eexpr = TCast(find_field e2,None)}
-						| TField(e2,fa) ->
-							let a,pl,e2 = find_abstract e2 e2.etype in
-							let m = Abstract.get_underlying_type a pl in
-							let fname = field_name fa in
-							let el = List.map (loop ctx) el in
-							begin try
-								let fa = quick_field m fname in
-								let get_fun_type t = match follow t with
-									| TFun(_,tr) as tf -> tf,tr
-									| _ -> raise Not_found
-								in
-								let tf,tr = match fa with
-									| FStatic(_,cf) -> get_fun_type cf.cf_type
-									| FInstance(c,tl,cf) -> get_fun_type (apply_params c.cl_params tl cf.cf_type)
-									| FAnon cf -> get_fun_type cf.cf_type
-									| _ -> raise Not_found
-								in
-								let ef = mk (TField({e2 with etype = m},fa)) tf e2.epos in
-								let ecall = make_call ctx ef el tr e.epos in
-								if not (type_iseq ecall.etype e.etype) then
-									mk (TCast(ecall,None)) e.etype e.epos
-								else
-									ecall
-							with Not_found ->
-								(* quick_field raises Not_found if m is an abstract, we have to replicate the 'using' call here *)
-								match follow m with
-								| TAbstract({a_impl = Some c} as a,pl) ->
-									let cf = PMap.find fname c.cl_statics in
-									make_static_call ctx c cf a pl (e2 :: el) e.etype e.epos
-								| _ -> raise Not_found
-							end
-						| _ ->
-							raise Not_found
-					in
-					find_field e1
-				with Not_found ->
-					Type.map_expr (loop ctx) e
-				end
-			| _ ->
-				Type.map_expr (loop ctx) e
-		in
-		loop ctx e
-end
-
-(* -------------- debug functions to activate when debugging typer passes ------------------------------- *)
-(*/*
-
-let delay_tabs = ref ""
-
-let context_ident ctx =
-	if Common.defined ctx.com Common.Define.CoreApi then
-		" core "
-	else if Common.defined ctx.com Common.Define.Macro then
-		"macro "
-	else
-		"  out "
-
-let debug ctx str =
-	if Common.raw_defined ctx.com "cdebug" then prerr_endline (context_ident ctx ^ !delay_tabs ^ str)
-
-let init_class_done ctx =
-	debug ctx ("init_class_done " ^ s_type_path ctx.curclass.cl_path);
-	init_class_done ctx
-
-let ctx_pos ctx =
-	let inf = s_type_path ctx.m.curmod.m_path in
-	let inf = (match snd ctx.curclass.cl_path with "" -> inf | n when n = snd ctx.m.curmod.m_path -> inf | n -> inf ^ "." ^ n) in
-	let inf = (match ctx.curfield.cf_name with "" -> inf | n -> inf ^ ":" ^ n) in
-	inf
-
-let pass_infos ctx p =
-	let inf = pass_name p ^ " ("  ^ ctx_pos ctx ^ ")" in
-	let inf = if ctx.pass > p then inf ^ " ??CURPASS=" ^ pass_name ctx.pass else inf in
-	inf
-
-let delay ctx p f =
-	let inf = pass_infos ctx p in
-	let rec loop = function
-		| [] -> [p,[f,inf,ctx]]
-		| (p2,l) :: rest ->
-			if p2 = p then
-				(p, (f,inf,ctx) :: l) :: rest
-			else if p2 < p then
-				(p2,l) :: loop rest
-			else
-				(p,[f,inf,ctx]) :: (p2,l) :: rest
-	in
-	ctx.g.debug_delayed <- loop ctx.g.debug_delayed;
-	debug ctx ("add " ^ inf)
-
-let pending_passes ctx =
-	let rec loop acc = function
-		| (p,l) :: pl when p < ctx.pass -> loop (acc @ l) pl
-		| _ -> acc
-	in
-	match loop [] ctx.g.debug_delayed with
-	| [] -> ""
-	| l -> " ??PENDING[" ^ String.concat ";" (List.map (fun (_,i,_) -> i) l) ^ "]"
-
-let display_error ctx msg p =
-	debug ctx ("ERROR " ^ msg);
-	display_error ctx msg p
-
-let make_pass ?inf ctx f =
-	let inf = (match inf with None -> pass_infos ctx ctx.pass | Some inf -> inf) in
-	(fun v ->
-		debug ctx ("run " ^ inf ^ pending_passes ctx);
-		let old = !delay_tabs in
-		delay_tabs := !delay_tabs ^ "\t";
-		let t = (try
-			f v
-		with
-			| Fatal_error (e,p) ->
-				delay_tabs := old;
-				raise (Fatal_error (e,p))
-			| exc when not (Common.raw_defined ctx.com "stack") ->
-				debug ctx ("FATAL " ^ Printexc.to_string exc);
-				delay_tabs := old;
-				raise exc
-		) in
-		delay_tabs := old;
-		t
-	)
-
-let rec flush_pass ctx p where =
-	let rec loop() =
-		match ctx.g.debug_delayed with
-		| (p2,l) :: rest when p2 <= p ->
-			(match l with
-			| [] ->
-				ctx.g.debug_delayed <- rest
-			| (f,inf,ctx2) :: l ->
-				ctx.g.debug_delayed <- (p2,l) :: rest;
-				match p2 with
-				| PTypeField | PBuildClass -> f()
-				| _ -> (make_pass ~inf ctx f)());
-			loop()
-		| _ ->
-			()
-	in
-	match ctx.g.debug_delayed with
-	| (p2,_) :: _ when p2 <= p ->
-		let old = !delay_tabs in
-		debug ctx ("flush " ^ pass_name p ^ "(" ^ where ^ ")");
-		delay_tabs := !delay_tabs ^ "\t";
-		loop();
-		delay_tabs := old;
-		debug ctx "flush-done";
-	| _ ->
-		()
-
-let make_where ctx where =
-	where ^ " (" ^ ctx_pos ctx ^ ")"
-
-let exc_protect ctx f (where:string) =
-	let f = make_pass ~inf:(make_where ctx where) ctx f in
-	let rec r = ref (fun() ->
-		try
-			f r
-		with
-			| Error (m,p) ->
-				raise (Fatal_error (error_msg m,p))
-	) in
-	r
-
-*/*)
-(* --------------------------------------------------- *)
-
-
diff --git a/src/typing/typeload.ml b/src/typing/typeload.ml
index 76e57ad68b4dd2634fc9b98172593b2ceaae06c7..20c1252c7fb877ea4e48404afd15f70248144574 100644
--- a/src/typing/typeload.ml
+++ b/src/typing/typeload.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -17,381 +17,160 @@
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *)
 
+(* Type instance and type parameter handling. *)
+
 open Ast
 open Common
-open Common.DisplayMode
+open DisplayTypes.DisplayMode
+open DisplayTypes.CompletionResultKind
+open CompletionItem
+open CompletionModuleType
+open CompletionModuleKind
+open ClassFieldOrigin
+open DisplayException
 open Type
 open Typecore
 open Error
 open Globals
+open Filename
 
-exception Build_canceled of build_state
+let build_count = ref 0
 
-let locate_macro_error = ref true
+let type_function_params_rec = ref (fun _ _ _ _ -> assert false)
 
-let transform_abstract_field com this_t a_t a f =
-	let stat = List.mem AStatic f.cff_access in
-	let p = f.cff_pos in
-	match f.cff_kind with
-	| FProp ((("get" | "never"),_),(("set" | "never"),_),_,_) when not stat ->
-		(* TODO: hack to avoid issues with abstract property generation on As3 *)
-		if Common.defined com Define.As3 then f.cff_meta <- (Meta.Extern,[],null_pos) :: f.cff_meta;
-		{ f with cff_access = AStatic :: f.cff_access; cff_meta = (Meta.Impl,[],null_pos) :: f.cff_meta }
-	| FProp _ when not stat ->
-		error "Member property accessors must be get/set or never" p;
-	| FFun fu when fst f.cff_name = "new" && not stat ->
-		let init p = (EVars [("this",null_pos),Some this_t,None],p) in
-		let cast e = (ECast(e,None)),pos e in
-		let ret p = (EReturn (Some (cast (EConst (Ident "this"),p))),p) in
-		let meta = (Meta.Impl,[],null_pos) :: f.cff_meta in
-		let meta = if Meta.has Meta.MultiType a.a_meta then begin
-			if List.mem AInline f.cff_access then error "MultiType constructors cannot be inline" f.cff_pos;
-			if fu.f_expr <> None then error "MultiType constructors cannot have a body" f.cff_pos;
-			(Meta.Extern,[],null_pos) :: meta
-		end else
-			meta
+let check_field_access ctx cff =
+	let display_access = ref None in
+	let rec loop p0 acc l =
+		let check_display p1 =
+			let pmid = {p0 with pmin = p0.pmax; pmax = p1.pmin} in
+			if DisplayPosition.display_position#enclosed_in pmid then match acc with
+			| access :: _ -> display_access := Some access;
+			| [] -> ()
 		in
-		(* We don't want the generated expression positions to shadow the real code. *)
-		let p = { p with pmax = p.pmin } in
-		let fu = {
-			fu with
-			f_expr = (match fu.f_expr with
-			| None -> if Meta.has Meta.MultiType a.a_meta then Some (EConst (Ident "null"),p) else None
-			| Some (EBlock el,_) -> Some (EBlock (init p :: el @ [ret p]),p)
-			| Some e -> Some (EBlock [init p;e;ret p],p)
-			);
-			f_type = Some a_t;
-		} in
-		{ f with cff_name = "_new",pos f.cff_name; cff_access = AStatic :: f.cff_access; cff_kind = FFun fu; cff_meta = meta }
-	| FFun fu when not stat ->
-		if Meta.has Meta.From f.cff_meta then error "@:from cast functions must be static" f.cff_pos;
-		let fu = { fu with f_args = (if List.mem AMacro f.cff_access then fu.f_args else (("this",null_pos),false,[],Some this_t,None) :: fu.f_args) } in
-		{ f with cff_kind = FFun fu; cff_access = AStatic :: f.cff_access; cff_meta = (Meta.Impl,[],null_pos) :: f.cff_meta }
-	| _ ->
-		f
-
-let get_policy ctx mpath =
-	let sl1 = full_dot_path mpath mpath in
-	List.fold_left (fun acc (sl2,policy,recursive) -> if match_path recursive sl1 sl2 then policy @ acc else acc) [] ctx.g.module_check_policies
-
-let make_module ctx mpath file loadp =
-	let m = {
-		m_id = alloc_mid();
-		m_path = mpath;
-		m_types = [];
-		m_extra = module_extra (Path.unique_full_path file) (Common.get_signature ctx.com) (file_time file) (if ctx.in_macro then MMacro else MCode) (get_policy ctx mpath);
-	} in
-	m
-
-(*
-	Build module structure : should be atomic - no type loading is possible
-*)
-let module_pass_1 ctx m tdecls loadp =
-	let com = ctx.com in
-	let decls = ref [] in
-	let make_path name priv =
-		if List.exists (fun (t,_) -> snd (t_path t) = name) !decls then error ("Type name " ^ name ^ " is already defined in this module") loadp;
-		if priv then (fst m.m_path @ ["_" ^ snd m.m_path], name) else (fst m.m_path, name)
-	in
-	let pt = ref None in
-	let rec make_decl acc decl =
-		let p = snd decl in
-		let acc = (match fst decl with
-		| EImport _ | EUsing _ ->
-			(match !pt with
-			| None -> acc
-			| Some _ -> error "import and using may not appear after a type declaration" p)
-		| EClass d ->
-			let name = fst d.d_name in
-			if String.length name > 0 && name.[0] = '$' then error "Type names starting with a dollar are not allowed" p;
-			pt := Some p;
-			let priv = List.mem HPrivate d.d_flags in
-			let path = make_path name priv in
-			let c = mk_class m path p (pos d.d_name) in
-			(* we shouldn't load any other type until we propertly set cl_build *)
-			c.cl_build <- (fun() -> error (s_type_path c.cl_path ^ " is not ready to be accessed, separate your type declarations in several files") p);
-			c.cl_module <- m;
-			c.cl_private <- priv;
-			c.cl_doc <- d.d_doc;
-			c.cl_meta <- d.d_meta;
-			decls := (TClassDecl c, decl) :: !decls;
-			acc
-		| EEnum d ->
-			let name = fst d.d_name in
-			if String.length name > 0 && name.[0] = '$' then error "Type names starting with a dollar are not allowed" p;
-			pt := Some p;
-			let priv = List.mem EPrivate d.d_flags in
-			let path = make_path name priv in
-			let e = {
-				e_path = path;
-				e_module = m;
-				e_pos = p;
-				e_name_pos = (pos d.d_name);
-				e_doc = d.d_doc;
-				e_meta = d.d_meta;
-				e_params = [];
-				e_private = priv;
-				e_extern = List.mem EExtern d.d_flags;
-				e_constrs = PMap.empty;
-				e_names = [];
-				e_type = {
-					t_path = [], "Enum<" ^ (s_type_path path) ^ ">";
-					t_module = m;
-					t_doc = None;
-					t_pos = p;
-					t_name_pos = null_pos;
-					t_type = mk_mono();
-					t_private = true;
-					t_params = [];
-					t_meta = [];
-				};
-			} in
-			decls := (TEnumDecl e, decl) :: !decls;
-			acc
-		| ETypedef d ->
-			let name = fst d.d_name in
-			if String.length name > 0 && name.[0] = '$' then error "Type names starting with a dollar are not allowed" p;
-			pt := Some p;
-			let priv = List.mem EPrivate d.d_flags in
-			let path = make_path name priv in
-			let t = {
-				t_path = path;
-				t_module = m;
-				t_pos = p;
-				t_name_pos = pos d.d_name;
-				t_doc = d.d_doc;
-				t_private = priv;
-				t_params = [];
-				t_type = mk_mono();
-				t_meta = d.d_meta;
-			} in
-			(* failsafe in case the typedef is not initialized (see #3933) *)
-			delay ctx PBuildModule (fun () ->
-				match t.t_type with
-				| TMono r -> (match !r with None -> r := Some com.basic.tvoid | _ -> ())
-				| _ -> ()
-			);
-			decls := (TTypeDecl t, decl) :: !decls;
-			acc
-		 | EAbstract d ->
-		 	let name = fst d.d_name in
-			if String.length name > 0 && name.[0] = '$' then error "Type names starting with a dollar are not allowed" p;
-			let priv = List.mem APrivAbstract d.d_flags in
-			let path = make_path name priv in
-			let a = {
-				a_path = path;
-				a_private = priv;
-				a_module = m;
-				a_pos = p;
-				a_name_pos = pos d.d_name;
-				a_doc = d.d_doc;
-				a_params = [];
-				a_meta = d.d_meta;
-				a_from = [];
-				a_to = [];
-				a_from_field = [];
-				a_to_field = [];
-				a_ops = [];
-				a_unops = [];
-				a_impl = None;
-				a_array = [];
-				a_this = mk_mono();
-				a_resolve = None;
-			} in
-			decls := (TAbstractDecl a, decl) :: !decls;
-			match d.d_data with
-			| [] when Meta.has Meta.CoreType a.a_meta ->
-				a.a_this <- t_dynamic;
-				acc
-			| fields ->
-				let a_t =
-					let params = List.map (fun t -> TPType (CTPath { tname = fst t.tp_name; tparams = []; tsub = None; tpackage = [] },null_pos)) d.d_params in
-					CTPath { tpackage = []; tname = fst d.d_name; tparams = params; tsub = None },null_pos
-				in
-				let rec loop = function
-					| [] -> a_t
-					| AIsType t :: _ -> t
-					| _ :: l -> loop l
-				in
-				let this_t = loop d.d_flags in
-				let fields = List.map (transform_abstract_field com this_t a_t a) fields in
-				let meta = ref [] in
-				if has_meta Meta.Dce a.a_meta then meta := (Meta.Dce,[],null_pos) :: !meta;
-				let acc = make_decl acc (EClass { d_name = (fst d.d_name) ^ "_Impl_",snd d.d_name; d_flags = [HPrivate]; d_data = fields; d_doc = None; d_params = []; d_meta = !meta },p) in
-				(match !decls with
-				| (TClassDecl c,_) :: _ ->
-					List.iter (fun m -> match m with
-						| ((Meta.Build | Meta.CoreApi | Meta.Allow | Meta.Access | Meta.Enum | Meta.Dce | Meta.Native | Meta.JsRequire | Meta.PythonImport | Meta.Expose | Meta.Deprecated | Meta.PhpConstants | Meta.PhpGlobal),_,_) ->
-							c.cl_meta <- m :: c.cl_meta;
-						| _ ->
-							()
-					) a.a_meta;
-					a.a_impl <- Some c;
-					c.cl_kind <- KAbstractImpl a;
-					c.cl_meta <- (Meta.Final,[],null_pos) :: c.cl_meta
-				| _ -> assert false);
-				acc
-		) in
-		decl :: acc
+		match l with
+		| [] ->
+			(* This is a bit dodgy. Ideally we would use the position of the `function` keyword, but we don't have that...
+			   Using the name means this is going to complete within the `function` keyword too. Not sure what we
+			   can do about it. *)
+			check_display (pos (cff.cff_name))
+		| (access,p1) :: l ->
+			check_display p1;
+			try
+				let _,p2 = List.find (fun (access',_) -> access = access') acc in
+				if p1 <> null_pos && p2 <> null_pos then begin
+					display_error ctx (Printf.sprintf "Duplicate access modifier %s" (Ast.s_access access)) p1;
+					display_error ctx "Previously defined here" p2;
+				end;
+				loop p1 acc l
+			with Not_found -> match access with
+				| APublic | APrivate ->
+					begin try
+						let _,p2 = List.find (fun (access',_) -> match access' with APublic | APrivate -> true | _ -> false) acc in
+						display_error ctx (Printf.sprintf "Conflicting access modifier %s" (Ast.s_access access)) p1;
+						display_error ctx "Conflicts with this" p2;
+						loop p1 acc l
+					with Not_found ->
+						loop p1 ((access,p1) :: acc) l
+					end
+				| _ ->
+					loop p1 ((access,p1) :: acc) l
 	in
-	let tdecls = List.fold_left make_decl [] tdecls in
-	let decls = List.rev !decls in
-	decls, List.rev tdecls
-
-let parse_file_from_lexbuf com file p lexbuf =
-	let t = Common.timer ["parsing"] in
-	Lexer.init file true;
-	incr stats.s_files_parsed;
-	let data = (try Parser.parse com lexbuf with e -> t(); raise e) in
-	begin match !display_default with
-		| DMModuleSymbols filter when filter <> None || Display.is_display_file file ->
-			let ds = Display.DocumentSymbols.collect_module_symbols data in
-			com.shared.shared_display_information.document_symbols <- (file,ds) :: com.shared.shared_display_information.document_symbols;
-		| _ ->
-			()
-	end;
-	t();
-	Common.log com ("Parsed " ^ file);
-	data
-
-let parse_file_from_string com file p string =
-	parse_file_from_lexbuf com file p (Lexing.from_string string)
-
-let current_stdin = ref None (* TODO: we're supposed to clear this at some point *)
-
-let parse_file com file p =
-	let use_stdin = (Common.defined com Define.DisplayStdin) && Display.is_display_file file in
-	if use_stdin then
-		let s =
-			match !current_stdin with
-			| Some s ->
-				s
-			| None ->
-				let s = Std.input_all stdin in
-				close_in stdin;
-				current_stdin := Some s;
-				s
-		in
-		parse_file_from_string com file p s
-	else
-		let ch = try open_in_bin file with _ -> error ("Could not open " ^ file) p in
-		Std.finally (fun() -> close_in ch) (parse_file_from_lexbuf com file p) (Lexing.from_channel ch)
-
-let parse_hook = ref parse_file
-let type_module_hook = ref (fun _ _ _ -> None)
-let type_function_params_rec = ref (fun _ _ _ _ -> assert false)
-let return_partial_type = ref false
+	let pmin = {cff.cff_pos with pmax = cff.cff_pos.pmin} in
+	loop pmin [] cff.cff_access;
+	!display_access
 
-let type_function_arg ctx t e opt p =
-	if opt then
-		let e = (match e with None -> Some (EConst (Ident "null"),p) | _ -> e) in
-		ctx.t.tnull t, e
-	else
-		let t = match e with Some (EConst (Ident "null"),p) -> ctx.t.tnull t | _ -> t in
-		t, e
+let find_type_in_module m tname =
+	List.find (fun mt ->
+		let infos = t_infos mt in
+		not infos.mt_private && snd infos.mt_path = tname
+	) m.m_types
 
-let type_var_field ctx t e stat do_display p =
-	if stat then ctx.curfun <- FunStatic else ctx.curfun <- FunMember;
-	let e = if do_display then Display.ExprPreprocessing.process_expr ctx.com e else e in
-	let e = type_expr ctx e (WithType t) in
-	let e = (!cast_or_unify_ref) ctx t e p in
-	match t with
-	| TType ({ t_path = ([],"UInt") },[]) | TAbstract ({ a_path = ([],"UInt") },[]) when stat -> { e with etype = t }
-	| _ -> e
+(* raises Module_not_found or Type_not_found *)
+let load_type_raise ctx mpath tname p =
+	let m = ctx.g.do_load_module ctx mpath p in
+	try
+		find_type_in_module m tname
+	with Not_found ->
+		raise_error (Type_not_found(mpath,tname)) p
 
-let apply_macro ctx mode path el p =
-	let cpath, meth = (match List.rev (ExtString.String.nsplit path ".") with
-		| meth :: name :: pack -> (List.rev pack,name), meth
-		| _ -> error "Invalid macro path" p
-	) in
-	ctx.g.do_macro ctx mode cpath meth el p
+(* raises Not_found *)
+let load_type ctx mpath tname p = try
+	load_type_raise ctx mpath tname p
+with Error((Module_not_found _ | Type_not_found _),p2) when p = p2 ->
+	raise Not_found
 
 (** since load_type_def and load_instance are used in PASS2, they should not access the structure of a type **)
 
 (*
 	load a type or a subtype definition
 *)
-let rec load_type_def ctx p t =
+let load_type_def ctx p t =
 	let no_pack = t.tpackage = [] in
+	if t = Parser.magic_type_path then raise_fields (DisplayToplevel.collect ctx TKType NoValue) CRTypeHint (DisplayTypes.make_subject None p);
+	(* The type name is the module name or the module sub-type name *)
 	let tname = (match t.tsub with None -> t.tname | Some n -> n) in
-	if tname = "" then raise (Display.DisplayToplevel (Display.ToplevelCollector.run ctx true));
 	try
+		(* If there's a sub-type, there's no reason to look in our module or its imports *)
 		if t.tsub <> None then raise Not_found;
 		let path_matches t2 =
 			let tp = t_path t2 in
 			tp = (t.tpackage,tname) || (no_pack && snd tp = tname)
 		in
 		try
+			(* Check the types in our own module *)
 			List.find path_matches ctx.m.curmod.m_types
 		with Not_found ->
+			(* Check the local imports *)
 			let t,pi = List.find (fun (t2,pi) -> path_matches t2) ctx.m.module_types in
-			Display.ImportHandling.mark_import_position ctx.com pi;
+			ImportHandling.mark_import_position ctx.com pi;
 			t
 	with
-		Not_found ->
-			let next() =
-				let t, m = (try
-					t, ctx.g.do_load_module ctx (t.tpackage,t.tname) p
-				with Error (Module_not_found _,p2) as e when p == p2 ->
-					match t.tpackage with
-					| "std" :: l ->
-						let t = { t with tpackage = l } in
-						t, ctx.g.do_load_module ctx (t.tpackage,t.tname) p
-					| _ -> raise e
-				) in
-				let tpath = (t.tpackage,tname) in
-				try
-					List.find (fun t -> not (t_infos t).mt_private && t_path t = tpath) m.m_types
-				with
-					Not_found -> raise (Error (Type_not_found (m.m_path,tname),p))
+	| Not_found when no_pack ->
+		(* Unqualified *)
+		begin try
+			let rec loop l = match l with
+				| [] ->
+					raise Exit
+				| (pack,ppack) :: l ->
+					begin try
+						let mt = load_type ctx (pack,t.tname) tname p in
+						ImportHandling.mark_import_position ctx.com ppack;
+						mt
+					with Not_found ->
+						loop l
+					end
 			in
-			(* lookup in wildcard imported packages *)
-			try
-				if not no_pack then raise Exit;
-				let rec loop l = match l with
-					| [] -> raise Exit
-					| (wp,pi) :: l ->
-						try
-							let t = load_type_def ctx p { t with tpackage = wp } in
-							Display.ImportHandling.mark_import_position ctx.com pi;
-							t
-						with
-							| Error (Module_not_found _,p2)
-							| Error (Type_not_found _,p2) when p == p2 -> loop l
-				in
-				loop ctx.m.wildcard_packages
-			with Exit ->
-			(* lookup in our own package - and its upper packages *)
-			let rec loop = function
-				| [] -> raise Exit
-				| (_ :: lnext) as l ->
-					try
-						load_type_def ctx p { t with tpackage = List.rev l }
-					with
-						| Error (Module_not_found _,p2)
-						| Error (Type_not_found _,p2) when p == p2 -> loop lnext
+			(* Check wildcard packages by using their package *)
+			loop ctx.m.wildcard_packages
+		with Exit ->
+			let rec loop l = match l with
+				| [] ->
+					load_type_raise ctx ([],t.tname) tname p
+				| _ :: sl as l ->
+					(try load_type ctx (List.rev l,t.tname) tname p with Not_found -> loop sl)
 			in
-			try
-				if not no_pack then raise Exit;
-				(match fst ctx.m.curmod.m_path with
-				| [] -> raise Exit
-				| x :: _ ->
-					(* this can occur due to haxe remoting : a module can be
-						already defined in the "js" package and is not allowed
-						to access the js classes *)
-					try
-						(match PMap.find x ctx.com.package_rules with
-						| Forbidden -> raise Exit
-						| _ -> ())
-					with Not_found -> ());
-				loop (List.rev (fst ctx.m.curmod.m_path));
-			with
-				Exit -> next()
+			(* Check our current module's path and its parent paths *)
+			loop (List.rev (fst ctx.m.curmod.m_path))
+		end
+	| Not_found ->
+		(* Qualified *)
+		try
+			(* Try loading the fully qualified module *)
+			load_type_raise ctx (t.tpackage,t.tname) tname p
+		with Error((Module_not_found _ | Type_not_found _),_) as exc -> match t.tpackage with
+		| "std" :: l ->
+			load_type_raise ctx (l,t.tname) tname p
+		| _ ->
+			raise exc
+
+(* let load_type_def ctx p t =
+	let timer = Timer.timer ["typing";"load_type_def"] in
+	Std.finally timer (load_type_def ctx p) t *)
 
 let resolve_position_by_path ctx path p =
 	let mt = load_type_def ctx p path in
 	let p = (t_infos mt).mt_pos in
-	raise (Display.DisplayPosition [p])
+	raise_positions [p]
 
 let check_param_constraints ctx types t pl c p =
 	match follow t with
@@ -410,28 +189,55 @@ let check_param_constraints ctx types t pl c p =
 			try
 				unify_raise ctx t ti p
 			with Error(Unify l,p) ->
-				if not ctx.untyped then display_error ctx (error_msg (Unify (Constraint_failure (s_type_path c.cl_path) :: l))) p;
+				let fail() =
+					if not ctx.untyped then display_error ctx (error_msg (Unify (Constraint_failure (s_type_path c.cl_path) :: l))) p;
+				in
+				match follow t with
+				| TInst({cl_kind = KExpr e},_) ->
+					let e = type_expr {ctx with locals = PMap.empty} e (WithType.with_type ti) in
+					begin try unify_raise ctx e.etype ti p
+					with Error (Unify _,_) -> fail() end
+				| _ ->
+					fail()
+
 		) ctl
 
-let requires_value_meta com co =
-	Common.defined com Define.DocGen || (match co with
-		| None -> false
-		| Some c -> c.cl_extern || Meta.has Meta.Rtti c.cl_meta)
+let generate_value_meta com co fadd args =
+	let values = List.fold_left (fun acc ((name,p),_,_,_,eo) -> match eo with Some e -> ((name,p,NoQuotes),e) :: acc | _ -> acc) [] args in
+	match values with
+		| [] -> ()
+		| _ -> fadd (Meta.Value,[EObjectDecl values,null_pos],null_pos)
 
-let generate_value_meta com co cf args =
-	if requires_value_meta com co then begin
-		let values = List.fold_left (fun acc ((name,p),_,_,_,eo) -> match eo with Some e -> ((name,p),e) :: acc | _ -> acc) [] args in
-		match values with
-			| [] -> ()
-			| _ -> cf.cf_meta <- ((Meta.Value,[EObjectDecl values,cf.cf_pos],null_pos) :: cf.cf_meta)
-	end
+let is_redefined ctx cf1 fields p =
+	try
+		let cf2 = PMap.find cf1.cf_name fields in
+		let st = s_type (print_context()) in
+		if not (type_iseq cf1.cf_type cf2.cf_type) then begin
+			display_error ctx ("Cannot redefine field " ^ cf1.cf_name ^ " with different type") p;
+			display_error ctx ("First type was " ^ (st cf1.cf_type)) cf1.cf_pos;
+			error ("Second type was " ^ (st cf2.cf_type)) cf2.cf_pos
+		end else
+			true
+	with Not_found ->
+		false
 
-let pselect p1 p2 =
-	if p1 = null_pos then p2 else p1
+let make_extension_type ctx tl =
+	let mk_extension fields (t,p) = match follow t with
+		| TAnon a ->
+			PMap.fold (fun cf fields ->
+				if not (is_redefined ctx cf fields p) then PMap.add cf.cf_name cf fields
+				else fields
+			) a.a_fields fields
+		| _ ->
+			error "Can only extend structures" p
+	in
+	let fields = List.fold_left mk_extension PMap.empty tl in
+	let tl = List.map (fun (t,_) -> t) tl in
+	let ta = TAnon { a_fields = fields; a_status = ref (Extend tl); } in
+	ta
 
 (* build an instance from a full type *)
-let rec load_instance ?(allow_display=false) ctx (t,pn) allow_no_params p =
-	let p = pselect pn p in
+let rec load_instance' ctx (t,p) allow_no_params =
 	let t = try
 		if t.tpackage <> [] || t.tsub <> None then raise Not_found;
 		let pt = List.assoc t.tname ctx.type_params in
@@ -442,6 +248,18 @@ let rec load_instance ?(allow_display=false) ctx (t,pn) allow_no_params p =
 		let is_generic,is_generic_build = match mt with
 			| TClassDecl {cl_kind = KGeneric} -> true,false
 			| TClassDecl {cl_kind = KGenericBuild _} -> false,true
+			| TTypeDecl td ->
+				if not (Common.defined ctx.com Define.NoDeprecationWarnings) then
+					begin try
+						let msg = match Meta.get Meta.Deprecated td.t_meta with
+							| _,[EConst(String(s,_)),_],_ -> s
+							| _ -> "This typedef is deprecated in favor of " ^ (s_type (print_context()) td.t_type)
+						in
+						DeprecationCheck.warn_deprecation ctx.com msg p
+					with Not_found ->
+						()
+					end;
+				false,false
 			| _ -> false,false
 		in
 		let types , path , f = ctx.g.do_build_instance ctx mt p in
@@ -460,7 +278,7 @@ let rec load_instance ?(allow_display=false) ctx (t,pn) allow_no_params p =
 		end else if path = ([],"Dynamic") then
 			match t.tparams with
 			| [] -> t_dynamic
-			| [TPType t] -> TDynamic (load_complex_type ctx true p t)
+			| [TPType t] -> TDynamic (load_complex_type ctx true t)
 			| _ -> error "Too many parameters for Dynamic" p
 		else begin
 			if not is_rest && ctx.com.display.dms_error_policy <> EPIgnore && List.length types <> List.length t.tparams then error ("Invalid number of type parameters for " ^ s_type_path path) p;
@@ -468,15 +286,18 @@ let rec load_instance ?(allow_display=false) ctx (t,pn) allow_no_params p =
 				match t with
 				| TPExpr e ->
 					let name = (match fst e with
-						| EConst (String s) -> "S" ^ s
+						| EConst (String(s,_)) -> "S" ^ s
 						| EConst (Int i) -> "I" ^ i
 						| EConst (Float f) -> "F" ^ f
+						| EDisplay _ ->
+							ignore(type_expr ctx e WithType.value);
+							"Expr"
 						| _ -> "Expr"
 					) in
-					let c = mk_class null_module ([],name) p (pos e) in
+					let c = mk_class ctx.m.curmod ([],name) p (pos e) in
 					c.cl_kind <- KExpr e;
 					TInst (c,[])
-				| TPType t -> load_complex_type ctx true p t
+				| TPType t -> load_complex_type ctx true t
 			) t.tparams in
 			let rec loop tl1 tl2 is_rest = match tl1,tl2 with
 				| t :: tl1,(name,t2) :: tl2 ->
@@ -498,11 +319,10 @@ let rec load_instance ?(allow_display=false) ctx (t,pn) allow_no_params p =
 						| TInst (c,[]) ->
 							check_const c;
 							let r = exc_protect ctx (fun r ->
-								r := (fun() -> t);
+								r := lazy_available t;
 								delay ctx PCheckConstraint (fun() -> check_param_constraints ctx types t tparams c p);
 								t
 							) "constraint" in
-							delay ctx PForce (fun () -> ignore(!r()));
 							TLazy r
 						| _ -> assert false
 					in
@@ -518,6 +338,8 @@ let rec load_instance ?(allow_display=false) ctx (t,pn) allow_no_params p =
 				| t :: tl,[] ->
 					if is_rest then
 						t :: loop tl [] true
+					else if ctx.com.display.dms_error_policy = EPIgnore then
+						[]
 					else
 						error ("Too many parameters for " ^ s_type_path path) p
 			in
@@ -525,79 +347,104 @@ let rec load_instance ?(allow_display=false) ctx (t,pn) allow_no_params p =
 			f params
 		end
 	in
-	if allow_display then Display.DisplayEmitter.check_display_type ctx t pn;
 	t
 
+and load_instance ctx ?(allow_display=false) (t,pn) allow_no_params =
+	try
+		let t = load_instance' ctx (t,pn) allow_no_params in
+		if allow_display then DisplayEmitter.check_display_type ctx t pn;
+		t
+	with Error (Module_not_found path,_) when (ctx.com.display.dms_kind = DMDefault) && DisplayPosition.display_position#enclosed_in pn ->
+		let s = s_type_path path in
+		DisplayToplevel.collect_and_raise ctx TKType NoValue CRTypeHint (s,pn) {pn with pmin = pn.pmax - String.length s;}
+
 (*
 	build an instance from a complex type
 *)
-and load_complex_type ctx allow_display p (t,pn) =
-	let p = pselect pn p in
+and load_complex_type' ctx allow_display (t,p) =
 	match t with
-	| CTParent t -> load_complex_type ctx allow_display p t
-	| CTPath t -> load_instance ~allow_display ctx (t,pn) false p
+	| CTParent t -> load_complex_type ctx allow_display t
+	| CTPath t -> load_instance ~allow_display ctx (t,p) false
 	| CTOptional _ -> error "Optional type not allowed here" p
+	| CTNamed _ -> error "Named type not allowed here" p
+	| CTIntersection tl ->
+		let tl = List.map (fun (t,pn) ->
+			try
+				(load_complex_type ctx allow_display (t,pn),pn)
+			with DisplayException(DisplayFields Some({fkind = CRTypeHint} as r)) ->
+				let l = List.filter (fun item -> match item.ci_kind with
+					| ITType({kind = Struct},_) -> true
+					| _ -> false
+				) r.fitems in
+				raise_fields l (CRStructExtension true) r.fsubject
+		) tl in
+		let tr = ref None in
+		let t = TMono tr in
+		let r = exc_protect ctx (fun r ->
+			r := lazy_processing (fun() -> t);
+			let ta = make_extension_type ctx tl in
+			tr := Some ta;
+			ta
+		) "constraint" in
+		TLazy r
 	| CTExtend (tl,l) ->
-		(match load_complex_type ctx allow_display p (CTAnonymous l,p) with
+		begin match load_complex_type ctx allow_display (CTAnonymous l,p) with
 		| TAnon a as ta ->
-			let is_redefined cf1 a2 =
-				try
-					let cf2 = PMap.find cf1.cf_name a2.a_fields in
-					let st = s_type (print_context()) in
-					if not (type_iseq cf1.cf_type cf2.cf_type) then begin
-						display_error ctx ("Cannot redefine field " ^ cf1.cf_name ^ " with different type") p;
-						display_error ctx ("First type was " ^ (st cf1.cf_type)) cf1.cf_pos;
-						error ("Second type was " ^ (st cf2.cf_type)) cf2.cf_pos
-					end else
-						true
-				with Not_found ->
-					false
-			in
-			let mk_extension t =
+			let mk_extension (t,p) =
 				match follow t with
 				| TInst ({cl_kind = KTypeParameter _},_) ->
 					error "Cannot structurally extend type parameters" p
 				| TMono _ ->
 					error "Loop found in cascading signatures definitions. Please change order/import" p
 				| TAnon a2 ->
-					PMap.iter (fun _ cf -> ignore(is_redefined cf a2)) a.a_fields;
+					PMap.iter (fun _ cf -> ignore(is_redefined ctx cf a2.a_fields p)) a.a_fields;
 					TAnon { a_fields = (PMap.foldi PMap.add a.a_fields a2.a_fields); a_status = ref (Extend [t]); }
 				| _ -> error "Can only extend structures" p
 			in
-			let loop t = match follow t with
+			let loop (t,p) = match follow t with
 				| TAnon a2 ->
 					PMap.iter (fun f cf ->
-						if not (is_redefined cf a) then
+						if not (is_redefined ctx cf a.a_fields p) then
 							a.a_fields <- PMap.add f cf a.a_fields
 					) a2.a_fields
 				| _ ->
 					error "Can only extend structures" p
 			in
-			let il = List.map (fun (t,pn) -> load_instance ctx ~allow_display (t,pn) false p) tl in
+			let il = List.map (fun (t,pn) ->
+				try
+					(load_instance ctx ~allow_display (t,pn) false,pn)
+				with DisplayException(DisplayFields Some({fkind = CRTypeHint} as r)) ->
+					let l = List.filter (fun item -> match item.ci_kind with
+						| ITType({kind = Struct},_) -> true
+						| _ -> false
+					) r.fitems in
+					raise_fields l (CRStructExtension false) r.fsubject
+			) tl in
 			let tr = ref None in
 			let t = TMono tr in
 			let r = exc_protect ctx (fun r ->
-				r := (fun _ -> t);
+				r := lazy_processing (fun() -> t);
 				tr := Some (match il with
 					| [i] ->
 						mk_extension i
 					| _ ->
 						List.iter loop il;
-						a.a_status := Extend il;
+						a.a_status := Extend (List.map (fun(t,_) -> t) il);
 						ta);
 				t
 			) "constraint" in
-			delay ctx PForce (fun () -> ignore(!r()));
 			TLazy r
-		| _ -> assert false)
+		| _ -> assert false
+		end
 	| CTAnonymous l ->
+		let displayed_field = ref None in
 		let rec loop acc f =
 			let n = fst f.cff_name in
 			let p = f.cff_pos in
 			if PMap.mem n acc then error ("Duplicate field declaration : " ^ n) p;
 			let topt = function
 				| None -> error ("Explicit type required for field " ^ n) p
-				| Some t -> load_complex_type ctx allow_display p t
+				| Some t -> load_complex_type ctx allow_display t
 			in
 			if n = "new" then ctx.com.warning "Structures with new are deprecated, use haxe.Constraints.Constructible instead" p;
 			let no_expr = function
@@ -607,14 +454,25 @@ and load_complex_type ctx allow_display p (t,pn) =
 			let pub = ref true in
 			let dyn = ref false in
 			let params = ref [] in
+			let final = ref false in
+			ignore(check_field_access ctx f); (* TODO: do we want to do anything with this? *)
 			List.iter (fun a ->
-				match a with
+				match fst a with
 				| APublic -> ()
-				| APrivate -> pub := false;
+				| APrivate ->
+					let p = pos a in
+					if Filename.basename p.pfile <> "NativeIterable.hx" then (* Terrible workaround for #7436 *)
+						ctx.com.warning "private structure fields are deprecated" p;
+					pub := false;
 				| ADynamic when (match f.cff_kind with FFun _ -> true | _ -> false) -> dyn := true
-				| AStatic | AOverride | AInline | ADynamic | AMacro -> error ("Invalid access " ^ Ast.s_access a) p
+				| AFinal -> final := true
+				| AStatic | AOverride | AInline | ADynamic | AMacro | AExtern as a -> error ("Invalid access " ^ Ast.s_access a) p
 			) f.cff_access;
 			let t , access = (match f.cff_kind with
+				| FVar(t,e) when !final ->
+					no_expr e;
+					let t = (match t with None -> error "Type required for structure property" p | Some t -> t) in
+					load_complex_type ctx allow_display t, Var { v_read = AccNormal; v_write = AccNever }
 				| FVar (Some (CTPath({tpackage=[];tname="Void"}),_), _)  | FProp (_,_,Some (CTPath({tpackage=[];tname="Void"}),_),_) ->
 					error "Fields of type Void are not allowed in structures" p
 				| FVar (t, e) ->
@@ -645,40 +503,54 @@ and load_complex_type ctx allow_display p (t,pn) =
 							error "Custom property access is no longer supported in Haxe 3" f.cff_pos;
 					in
 					let t = (match t with None -> error "Type required for structure property" p | Some t -> t) in
-					load_complex_type ctx allow_display p t, Var { v_read = access i1 true; v_write = access i2 false }
+					load_complex_type ctx allow_display t, Var { v_read = access i1 true; v_write = access i2 false }
 			) in
 			let t = if Meta.has Meta.Optional f.cff_meta then ctx.t.tnull t else t in
 			let cf = {
-				cf_name = n;
-				cf_type = t;
-				cf_pos = p;
-				cf_name_pos = (pos f.cff_name);
-				cf_public = !pub;
+				(mk_field n ~public:!pub t p (pos f.cff_name)) with
 				cf_kind = access;
 				cf_params = !params;
-				cf_expr = None;
-				cf_expr_unoptimized = None;
 				cf_doc = f.cff_doc;
 				cf_meta = f.cff_meta;
-				cf_overloads = [];
 			} in
+			if !final then add_class_field_flag cf CfFinal;
 			init_meta_overloads ctx None cf;
 			if ctx.is_display_file then begin
-				Display.DisplayEmitter.check_display_metadata ctx cf.cf_meta;
-				Display.DisplayEmitter.maybe_display_field ctx (cf.cf_name_pos) cf;
+				DisplayEmitter.check_display_metadata ctx cf.cf_meta;
+				if DisplayPosition.display_position#enclosed_in cf.cf_name_pos then displayed_field := Some cf;
 			end;
 			PMap.add n cf acc
 		in
-		mk_anon (List.fold_left loop PMap.empty l)
+		let a = { a_fields = (List.fold_left loop PMap.empty l); a_status = ref Closed; } in
+		begin match !displayed_field with
+		| None ->
+			()
+		| Some cf ->
+			delay ctx PBuildClass (fun () -> DisplayEmitter.display_field ctx (AnonymousStructure a) CFSMember cf cf.cf_name_pos);
+		end;
+		TAnon a
 	| CTFunction (args,r) ->
 		match args with
 		| [CTPath { tpackage = []; tparams = []; tname = "Void" },_] ->
-			TFun ([],load_complex_type ctx allow_display p r)
+			TFun ([],load_complex_type ctx allow_display r)
 		| _ ->
 			TFun (List.map (fun t ->
-				let t, opt = (match fst t with CTOptional t -> t, true | _ -> t,false) in
-				"",opt,load_complex_type ctx allow_display p t
-			) args,load_complex_type ctx allow_display p r)
+				let t, opt = (match fst t with CTOptional t | CTParent((CTOptional t,_)) -> t, true | _ -> t,false) in
+				let n,t = (match fst t with CTNamed (n,t) -> (fst n), t | _ -> "", t) in
+				n,opt,load_complex_type ctx allow_display t
+			) args,load_complex_type ctx allow_display r)
+
+and load_complex_type ctx allow_display (t,pn) =
+	try
+		load_complex_type' ctx allow_display (t,pn)
+	with Error(Module_not_found(([],name)),p) as exc ->
+		if Diagnostics.is_diagnostics_run p then begin
+			delay ctx PForce (fun () -> DisplayToplevel.handle_unresolved_identifier ctx name p true);
+			t_dynamic
+		end else if ctx.com.display.dms_display && not (DisplayPosition.display_position#enclosed_in pn) then
+			t_dynamic
+		else
+			raise exc
 
 and init_meta_overloads ctx co cf =
 	let overloads = ref [] in
@@ -689,8 +561,8 @@ and init_meta_overloads ctx co cf =
 	let cf_meta = List.filter filter_meta cf.cf_meta in
 	cf.cf_meta <- List.filter (fun m ->
 		match m with
-		| (Meta.Overload,[(EFunction (fname,f),p)],_)  ->
-			if fname <> None then error "Function name must not be part of @:overload" p;
+		| (Meta.Overload,[(EFunction (kind,f),p)],_)  ->
+			(match kind with FKNamed _ -> error "Function name must not be part of @:overload" p | _ -> ());
 			(match f.f_expr with Some (EBlock [], _) -> () | _ -> error "Overload must only declare an empty method body {}" p);
 			let old = ctx.type_params in
 			(match cf.cf_params with
@@ -698,10 +570,10 @@ and init_meta_overloads ctx co cf =
 			| l -> ctx.type_params <- List.filter (fun t -> not (List.mem t l)) ctx.type_params);
 			let params = (!type_function_params_rec) ctx f cf.cf_name p in
 			ctx.type_params <- params @ ctx.type_params;
-			let topt = function None -> error "Explicit type required" p | Some t -> load_complex_type ctx true p t in
-			let args = List.map (fun ((a,_),opt,_,t,_) -> a,opt,topt t) f.f_args in
+			let topt = function None -> error "Explicit type required" p | Some t -> load_complex_type ctx true t in
+			let args = List.map (fun ((a,_),opt,_,t,cto) -> a,opt || cto <> None,topt t) f.f_args in
 			let cf = { cf with cf_type = TFun (args,topt f.f_type); cf_params = params; cf_meta = cf_meta} in
-			generate_value_meta ctx.com co cf f.f_args;
+			generate_value_meta ctx.com co (fun meta -> cf.cf_meta <- meta :: cf.cf_meta) f.f_args;
 			overloads := cf :: !overloads;
 			ctx.type_params <- old;
 			false
@@ -745,7 +617,7 @@ let hide_params ctx =
 *)
 let load_core_type ctx name =
 	let show = hide_params ctx in
-	let t = load_instance ctx ({ tpackage = []; tname = name; tparams = []; tsub = None; },null_pos) false null_pos in
+	let t = load_instance ctx ({ tpackage = []; tname = name; tparams = []; tsub = None; },null_pos) false in
 	show();
 	add_dependency ctx.m.curmod (match t with
 	| TInst (c,_) -> c.cl_module
@@ -773,330 +645,13 @@ let t_iterator ctx =
 let load_type_hint ?(opt=false) ctx pcur t =
 	let t = match t with
 		| None -> mk_mono()
-		| Some (t,p) ->
-			try
-				load_complex_type ctx true pcur (t,p)
-			with Error(Module_not_found(([],name)),p) as exc ->
-				if Display.Diagnostics.is_diagnostics_run ctx then Display.ToplevelCollector.handle_unresolved_identifier ctx name p true;
-				(* Default to Dynamic in display mode *)
-				if ctx.com.display.dms_display then t_dynamic else raise exc
+		| Some (t,p) ->	load_complex_type ctx true (t,p)
 	in
 	if opt then ctx.t.tnull t else t
 
-(* ---------------------------------------------------------------------- *)
-(* Structure check *)
-
-let valid_redefinition ctx f1 t1 f2 t2 = (* child, parent *)
-	let valid t1 t2 =
-		Type.unify t1 t2;
-		if is_null t1 <> is_null t2 || ((follow t1) == t_dynamic && (follow t2) != t_dynamic) then raise (Unify_error [Cannot_unify (t1,t2)]);
-	in
-	let open OptimizerTexpr in
-	begin match PurityState.get_purity_from_meta f2.cf_meta,PurityState.get_purity_from_meta f1.cf_meta with
-		| PurityState.Pure,PurityState.MaybePure -> f1.cf_meta <- (Meta.Pure,[EConst(Ident "expect"),f2.cf_pos],null_pos) :: f1.cf_meta
-		| PurityState.ExpectPure p,PurityState.MaybePure -> f1.cf_meta <- (Meta.Pure,[EConst(Ident "expect"),p],null_pos) :: f1.cf_meta
-		| _ -> ()
-	end;
-	let t1, t2 = (match f1.cf_params, f2.cf_params with
-		| [], [] -> t1, t2
-		| l1, l2 when List.length l1 = List.length l2 ->
-			let to_check = ref [] in
-			let monos = List.map2 (fun (name,p1) (_,p2) ->
-				(match follow p1, follow p2 with
-				| TInst ({ cl_kind = KTypeParameter ct1 } as c1,pl1), TInst ({ cl_kind = KTypeParameter ct2 } as c2,pl2) ->
-					(match ct1, ct2 with
-					| [], [] -> ()
-					| _, _ when List.length ct1 = List.length ct2 ->
-						(* if same constraints, they are the same type *)
-						let check monos =
-							List.iter2 (fun t1 t2  ->
-								try
-									let t1 = apply_params l1 monos (apply_params c1.cl_params pl1 t1) in
-									let t2 = apply_params l2 monos (apply_params c2.cl_params pl2 t2) in
-									type_eq EqStrict t1 t2
-								with Unify_error l ->
-									raise (Unify_error (Unify_custom "Constraints differ" :: l))
-							) ct1 ct2
-						in
-						to_check := check :: !to_check;
-					| _ ->
-						raise (Unify_error [Unify_custom "Different number of constraints"]))
-				| _ -> ());
-				TInst (mk_class null_module ([],name) null_pos null_pos,[])
-			) l1 l2 in
-			List.iter (fun f -> f monos) !to_check;
-			apply_params l1 monos t1, apply_params l2 monos t2
-		| _  ->
-			(* ignore type params, will create other errors later *)
-			t1, t2
-	) in
-	match f1.cf_kind,f2.cf_kind with
-	| Method m1, Method m2 when not (m1 = MethDynamic) && not (m2 = MethDynamic) ->
-		begin match follow t1, follow t2 with
-		| TFun (args1,r1) , TFun (args2,r2) -> (
-			if not (List.length args1 = List.length args2) then raise (Unify_error [Unify_custom "Different number of function arguments"]);
-			try
-				List.iter2 (fun (n,o1,a1) (_,o2,a2) ->
-					if o1 <> o2 then raise (Unify_error [Not_matching_optional n]);
-					(try valid a2 a1 with Unify_error _ -> raise (Unify_error [Cannot_unify(a1,a2)]))
-				) args1 args2;
-				valid r1 r2
-			with Unify_error l ->
-				raise (Unify_error (Cannot_unify (t1,t2) :: l)))
-		| _ ->
-			assert false
-		end
-	| _,(Var { v_write = AccNo | AccNever }) ->
-		(* write variance *)
-		valid t1 t2
-	| _,(Var { v_read = AccNo | AccNever }) ->
-		(* read variance *)
-		valid t2 t1
-	| _ , _ ->
-		(* in case args differs, or if an interface var *)
-		type_eq EqStrict t1 t2;
-		if is_null t1 <> is_null t2 then raise (Unify_error [Cannot_unify (t1,t2)])
-
-let copy_meta meta_src meta_target sl =
-	let meta = ref meta_target in
-	List.iter (fun (m,e,p) ->
-		if List.mem m sl then meta := (m,e,p) :: !meta
-	) meta_src;
-	!meta
-
-let check_overriding ctx c =
-	match c.cl_super with
-	| None ->
-		(match c.cl_overrides with
-		| [] -> ()
-		| i :: _ ->
-			display_error ctx ("Field " ^ i.cf_name ^ " is declared 'override' but doesn't override any field") i.cf_pos)
-	| _ when c.cl_extern && Meta.has Meta.CsNative c.cl_meta -> () (* -net-lib specific: do not check overrides on extern CsNative classes *)
-	| Some (csup,params) ->
-		PMap.iter (fun i f ->
-			let p = f.cf_pos in
-			let check_field f get_super_field is_overload = try
-				(if is_overload && not (Meta.has Meta.Overload f.cf_meta) then
-					display_error ctx ("Missing @:overload declaration for field " ^ i) p);
-				let t, f2 = get_super_field csup i in
-				(* allow to define fields that are not defined for this platform version in superclass *)
-				(match f2.cf_kind with
-				| Var { v_read = AccRequire _ } -> raise Not_found;
-				| _ -> ());
-				if ctx.com.config.pf_overload && (Meta.has Meta.Overload f2.cf_meta && not (Meta.has Meta.Overload f.cf_meta)) then
-					display_error ctx ("Field " ^ i ^ " should be declared with @:overload since it was already declared as @:overload in superclass") p
-				else if not (List.memq f c.cl_overrides) then
-					display_error ctx ("Field " ^ i ^ " should be declared with 'override' since it is inherited from superclass " ^ s_type_path csup.cl_path) p
-				else if not f.cf_public && f2.cf_public then
-					display_error ctx ("Field " ^ i ^ " has less visibility (public/private) than superclass one") p
-				else (match f.cf_kind, f2.cf_kind with
-				| _, Method MethInline ->
-					display_error ctx ("Field " ^ i ^ " is inlined and cannot be overridden") p
-				| a, b when a = b -> ()
-				| Method MethInline, Method MethNormal ->
-					() (* allow to redefine a method as inlined *)
-				| _ ->
-					display_error ctx ("Field " ^ i ^ " has different property access than in superclass") p);
-				if has_meta Meta.Final f2.cf_meta then display_error ctx ("Cannot override @:final method " ^ i) p;
-				try
-					let t = apply_params csup.cl_params params t in
-					valid_redefinition ctx f f.cf_type f2 t
-				with
-					Unify_error l ->
-						display_error ctx ("Field " ^ i ^ " overloads parent class with different or incomplete type") p;
-						display_error ctx ("Base field is defined here") f2.cf_pos;
-						display_error ctx (error_msg (Unify l)) p;
-			with
-				Not_found ->
-					if List.memq f c.cl_overrides then
-						let msg = if is_overload then
-							("Field " ^ i ^ " is declared 'override' but no compatible overload was found")
-						else
-							("Field " ^ i ^ " is declared 'override' but doesn't override any field")
-						in
-						display_error ctx msg p
-			in
-			if ctx.com.config.pf_overload && Meta.has Meta.Overload f.cf_meta then begin
-				let overloads = Overloads.get_overloads csup i in
-				List.iter (fun (t,f2) ->
-					(* check if any super class fields are vars *)
-					match f2.cf_kind with
-					| Var _ ->
-						display_error ctx ("A variable named '" ^ f2.cf_name ^ "' was already declared in a superclass") f.cf_pos
-					| _ -> ()
-				) overloads;
-				List.iter (fun f ->
-					(* find the exact field being overridden *)
-					check_field f (fun csup i ->
-						List.find (fun (t,f2) ->
-							Overloads.same_overload_args f.cf_type (apply_params csup.cl_params params t) f f2
-						) overloads
-					) true
-				) (f :: f.cf_overloads)
-			end else
-				check_field f (fun csup i ->
-					let _, t, f2 = raw_class_field (fun f -> f.cf_type) csup params i in
-					t, f2) false
-		) c.cl_fields
-
-let class_field_no_interf c i =
-	try
-		let f = PMap.find i c.cl_fields in
-		f.cf_type , f
-	with Not_found ->
-		match c.cl_super with
-		| None ->
-			raise Not_found
-		| Some (c,tl) ->
-			(* rec over class_field *)
-			let _, t , f = raw_class_field (fun f -> f.cf_type) c tl i in
-			apply_params c.cl_params tl t , f
-
-let rec return_flow ctx e =
-	let error() =
-		display_error ctx (Printf.sprintf "Missing return: %s" (s_type (print_context()) ctx.ret)) e.epos; raise Exit
-	in
-	let return_flow = return_flow ctx in
-	let rec uncond e = match e.eexpr with
-		| TIf _ | TWhile _ | TSwitch _ | TTry _ | TFunction _ -> ()
-		| TReturn _ | TThrow _ -> raise Exit
-		| _ -> Type.iter uncond e
-	in
-	let has_unconditional_flow e = try uncond e; false with Exit -> true in
-	match e.eexpr with
-	| TReturn _ | TThrow _ -> ()
-	| TParenthesis e | TMeta(_,e) ->
-		return_flow e
-	| TBlock el ->
-		let rec loop = function
-			| [] -> error()
-			| [e] -> return_flow e
-			| e :: _ when has_unconditional_flow e -> ()
-			| _ :: l -> loop l
-		in
-		loop el
-	| TIf (_,e1,Some e2) ->
-		return_flow e1;
-		return_flow e2;
-	| TSwitch (v,cases,Some e) ->
-		List.iter (fun (_,e) -> return_flow e) cases;
-		return_flow e
-	| TSwitch ({eexpr = TMeta((Meta.Exhaustive,_,_),_)},cases,None) ->
-		List.iter (fun (_,e) -> return_flow e) cases;
-	| TTry (e,cases) ->
-		return_flow e;
-		List.iter (fun (_,e) -> return_flow e) cases;
-	| TWhile({eexpr = (TConst (TBool true))},e,_) ->
-		(* a special case for "inifite" while loops that have no break *)
-		let rec loop e = match e.eexpr with
-			(* ignore nested loops to not accidentally get one of its breaks *)
-			| TWhile _ | TFor _ -> ()
-			| TBreak -> error()
-			| _ -> Type.iter loop e
-		in
-		loop e
-	| _ ->
-		error()
-
 (* ---------------------------------------------------------------------- *)
 (* PASS 1 & 2 : Module and Class Structure *)
 
-let is_generic_parameter ctx c =
-	(* first check field parameters, then class parameters *)
-	try
-		ignore (List.assoc (snd c.cl_path) ctx.curfield.cf_params);
-		Meta.has Meta.Generic ctx.curfield.cf_meta
-	with Not_found -> try
-		ignore(List.assoc (snd c.cl_path) ctx.type_params);
-		(match ctx.curclass.cl_kind with | KGeneric -> true | _ -> false);
-	with Not_found ->
-		false
-
-let type_function_arg_value ctx t c do_display =
-	match c with
-		| None -> None
-		| Some e ->
-			let p = pos e in
-			let e = if do_display then Display.ExprPreprocessing.process_expr ctx.com e else e in
-			let e = ctx.g.do_optimize ctx (type_expr ctx e (WithType t)) in
-			unify ctx e.etype t p;
-			let rec loop e = match e.eexpr with
-				| TConst c -> Some c
-				| TCast(e,None) -> loop e
-				| _ ->
-					if not ctx.com.display.dms_display || ctx.com.display.dms_inline && ctx.com.display.dms_error_policy = EPCollect then
-						display_error ctx "Parameter default value should be constant" p;
-					None
-			in
-			loop e
-
-(**** strict meta ****)
-let get_native_repr md pos =
-	let path, meta = match md with
-		| TClassDecl cl -> cl.cl_path, cl.cl_meta
-		| TEnumDecl e -> e.e_path, e.e_meta
-		| TTypeDecl t -> t.t_path, t.t_meta
-		| TAbstractDecl a -> a.a_path, a.a_meta
-	in
-	let rec loop acc = function
-		| (Meta.JavaCanonical,[EConst(String pack),_; EConst(String name),_],_) :: _ ->
-			ExtString.String.nsplit pack ".", name
-		| (Meta.Native,[EConst(String name),_],_) :: meta ->
-			loop (Ast.parse_path name) meta
-		| _ :: meta ->
-			loop acc meta
-		| [] ->
-			acc
-	in
-	let pack, name = loop path meta in
-	match pack with
-		| [] ->
-			(EConst(Ident(name)), pos)
-		| hd :: tl ->
-			let rec loop pack expr = match pack with
-				| hd :: tl ->
-					loop tl (EField(expr,hd),pos)
-				| [] ->
-					(EField(expr,name),pos)
-			in
-			loop tl (EConst(Ident(hd)),pos)
-
-let rec process_meta_argument ?(toplevel=true) ctx expr = match expr.eexpr with
-	| TField(e,f) ->
-		(EField(process_meta_argument ~toplevel:false ctx e,field_name f),expr.epos)
-	| TConst(TInt i) ->
-		(EConst(Int (Int32.to_string i)), expr.epos)
-	| TConst(TFloat f) ->
-		(EConst(Float f), expr.epos)
-	| TConst(TString s) ->
-		(EConst(String s), expr.epos)
-	| TConst TNull ->
-		(EConst(Ident "null"), expr.epos)
-	| TConst(TBool b) ->
-		(EConst(Ident (string_of_bool b)), expr.epos)
-	| TCast(e,_) | TMeta(_,e) | TParenthesis(e) ->
-		process_meta_argument ~toplevel ctx e
-	| TTypeExpr md when toplevel ->
-		let p = expr.epos in
-		if ctx.com.platform = Cs then
-			(ECall( (EConst(Ident "typeof"), p), [get_native_repr md expr.epos] ), p)
-		else
-			(EField(get_native_repr md expr.epos, "class"), p)
-	| TTypeExpr md ->
-		get_native_repr md expr.epos
-	| _ ->
-		display_error ctx "This expression is too complex to be a strict metadata argument" expr.epos;
-		(EConst(Ident "null"), expr.epos)
-
-let make_meta ctx texpr extra =
-	match texpr.eexpr with
-		| TNew(c,_,el) ->
-			ECall(get_native_repr (TClassDecl c) texpr.epos, (List.map (process_meta_argument ctx) el) @ extra), texpr.epos
-		| TTypeExpr(md) ->
-			ECall(get_native_repr md texpr.epos, extra), texpr.epos
-		| _ ->
-			display_error ctx "Unexpected expression" texpr.epos; assert false
-
 let field_to_type_path ctx e =
 	let rec loop e pack name = match e with
 		| EField(e,f),p when Char.lowercase (String.get f 0) <> String.get f 0 -> (match name with
@@ -1114,7 +669,7 @@ let field_to_type_path ctx e =
 					if Char.uppercase fchar = fchar then
 						pack, f, None
 					else begin
-						display_error ctx "A class name must start with an uppercase character" (snd e);
+						display_error ctx "A class name must start with an uppercase letter" (snd e);
 						raise Exit
 					end
 				| [name] ->
@@ -1131,395 +686,6 @@ let field_to_type_path ctx e =
 	in
 	loop e [] []
 
-let handle_fields ctx fields_to_check with_type_expr =
-	List.map (fun ((name,_),expr) ->
-		let pos = snd expr in
-		let field = (EField(with_type_expr,name), pos) in
-		let fieldexpr = (EConst(Ident name),pos) in
-		let left_side = match ctx.com.platform with
-			| Cs -> field
-			| Java -> (ECall(field,[]),pos)
-			| _ -> assert false
-		in
-
-		let left = type_expr ctx left_side NoValue in
-		let right = type_expr ctx expr (WithType left.etype) in
-		unify ctx left.etype right.etype (snd expr);
-		(EBinop(Ast.OpAssign,fieldexpr,process_meta_argument ctx right), pos)
-	) fields_to_check
-
-let get_strict_meta ctx params pos =
-	let pf = ctx.com.platform in
-	let changed_expr, fields_to_check, ctype = match params with
-		| [ECall(ef, el),p] ->
-			(* check last argument *)
-			let el, fields = match List.rev el with
-				| (EObjectDecl(decl),_) :: el ->
-					List.rev el, decl
-				| _ ->
-					el, []
-			in
-			let tpath = field_to_type_path ctx ef in
-			if pf = Cs then
-				(ENew((tpath,snd ef), el), p), fields, CTPath tpath
-			else
-				ef, fields, CTPath tpath
-		| [EConst(Ident i),p as expr] ->
-			let tpath = { tpackage=[]; tname=i; tparams=[]; tsub=None } in
-			if pf = Cs then
-				(ENew((tpath,p), []), p), [], CTPath tpath
-			else
-				expr, [], CTPath tpath
-		| [ (EField(_),p as field) ] ->
-			let tpath = field_to_type_path ctx field in
-			if pf = Cs then
-				(ENew((tpath,p), []), p), [], CTPath tpath
-			else
-				field, [], CTPath tpath
-		| _ ->
-			display_error ctx "A @:strict metadata must contain exactly one parameter. Please check the documentation for more information" pos;
-			raise Exit
-	in
-	let texpr = type_expr ctx changed_expr NoValue in
-	let with_type_expr = (ECheckType( (EConst (Ident "null"), pos), (ctype,null_pos) ), pos) in
-	let extra = handle_fields ctx fields_to_check with_type_expr in
-	Meta.Meta, [make_meta ctx texpr extra], pos
-
-let check_strict_meta ctx metas =
-	let pf = ctx.com.platform in
-	match pf with
-		| Cs | Java ->
-			let ret = ref [] in
-			List.iter (function
-				| Meta.Strict,params,pos -> (try
-					ret := get_strict_meta ctx params pos :: !ret
-				with | Exit -> ())
-				| _ -> ()
-			) metas;
-			!ret
-		| _ -> []
-
-(**** end of strict meta handling *****)
-
-let add_constructor ctx c force_constructor p =
-	match c.cl_constructor, c.cl_super with
-	| None, Some ({ cl_constructor = Some cfsup } as csup,cparams) when not c.cl_extern ->
-		let cf = {
-			cfsup with
-			cf_pos = p;
-			cf_meta = List.filter (fun (m,_,_) -> m = Meta.CompilerGenerated) cfsup.cf_meta;
-			cf_doc = None;
-			cf_expr = None;
-		} in
-		let r = exc_protect ctx (fun r ->
-			let t = mk_mono() in
-			r := (fun() -> t);
-			let ctx = { ctx with
-				curfield = cf;
-				pass = PTypeField;
-			} in
-			ignore (follow cfsup.cf_type); (* make sure it's typed *)
-			(if ctx.com.config.pf_overload then List.iter (fun cf -> ignore (follow cf.cf_type)) cf.cf_overloads);
-			let map_arg (v,def) =
-				(*
-					let's optimize a bit the output by not always copying the default value
-					into the inherited constructor when it's not necessary for the platform
-				*)
-				match ctx.com.platform, def with
-				| _, Some _ when not ctx.com.config.pf_static -> v, (Some TNull)
-				| Flash, Some (TString _) -> v, (Some TNull)
-				| Cpp, Some (TString _) -> v, def
-				| Cpp, Some _ -> { v with v_type = ctx.t.tnull v.v_type }, (Some TNull)
-				| _ -> v, def
-			in
-			let args = (match cfsup.cf_expr with
-				| Some { eexpr = TFunction f } ->
-					List.map map_arg f.tf_args
-				| _ ->
-					let values = get_value_meta cfsup.cf_meta in
-					match follow cfsup.cf_type with
-					| TFun (args,_) ->
-						List.map (fun (n,o,t) ->
-							let def = try type_function_arg_value ctx t (Some (PMap.find n values)) false with Not_found -> if o then Some TNull else None in
-							map_arg (alloc_var n (if o then ctx.t.tnull t else t) p,def) (* TODO: var pos *)
-						) args
-					| _ -> assert false
-			) in
-			let p = c.cl_pos in
-			let vars = List.map (fun (v,def) -> alloc_var v.v_name (apply_params csup.cl_params cparams v.v_type) v.v_pos, def) args in
-			let super_call = mk (TCall (mk (TConst TSuper) (TInst (csup,cparams)) p,List.map (fun (v,_) -> mk (TLocal v) v.v_type p) vars)) ctx.t.tvoid p in
-			let constr = mk (TFunction {
-				tf_args = vars;
-				tf_type = ctx.t.tvoid;
-				tf_expr = super_call;
-			}) (TFun (List.map (fun (v,c) -> v.v_name, c <> None, v.v_type) vars,ctx.t.tvoid)) p in
-			cf.cf_expr <- Some constr;
-			cf.cf_type <- t;
-			unify ctx t constr.etype p;
-			t
-		) "add_constructor" in
-		cf.cf_type <- TLazy r;
-		c.cl_constructor <- Some cf;
-		delay ctx PForce (fun() -> ignore((!r)()));
-	| None,_ when force_constructor ->
-		let constr = mk (TFunction {
-			tf_args = [];
-			tf_type = ctx.t.tvoid;
-			tf_expr = mk (TBlock []) ctx.t.tvoid p;
-		}) (tfun [] ctx.t.tvoid) p in
-		let cf = mk_field "new" constr.etype p null_pos in
-		cf.cf_expr <- Some constr;
-		cf.cf_type <- constr.etype;
-		cf.cf_meta <- [Meta.CompilerGenerated,[],null_pos];
-		cf.cf_kind <- Method MethNormal;
-		c.cl_constructor <- Some cf;
-	| _ ->
-		(* nothing to do *)
-		()
-
-let get_method_args field = 
-	match field.cf_expr with
-		| Some { eexpr = TFunction { tf_args = args } } -> args
-		| _ -> raise Not_found
-
-let get_struct_init_super_info ctx c p =
-	match c.cl_super with
-		| Some ({ cl_constructor = Some ctor } as csup, cparams) -> 
-			let args = (try get_method_args ctor with Not_found -> []) in
-			let tl,el = 
-				List.fold_left (fun (args,exprs) (v,value) ->
-					let opt = match value with Some _ -> true | None -> false in
-					let t = if opt then ctx.t.tnull v.v_type else v.v_type in
-					(v.v_name,opt,t) :: args,(mk (TLocal v) v.v_type p) :: exprs
-				) ([],[]) args
-			in
-			let super_expr = mk (TCall (mk (TConst TSuper) (TInst (csup,cparams)) p, el)) ctx.t.tvoid p in
-			(args,Some super_expr,tl)
-		| _ -> 
-			[],None,[]
-
-let check_struct_init_constructor ctx c p = match c.cl_constructor with
-	| Some _ ->
-		()
-	| None ->
-		let super_args,super_expr,super_tl = get_struct_init_super_info ctx c p in
-		let params = List.map snd c.cl_params in
-		let ethis = mk (TConst TThis) (TInst(c,params)) p in
-		let args,el,tl = List.fold_left (fun (args,el,tl) cf -> match cf.cf_kind with
-			| Var _ ->
-				let opt = Meta.has Meta.Optional cf.cf_meta in
-				let t = if opt then ctx.t.tnull cf.cf_type else cf.cf_type in
-				let v = alloc_var cf.cf_name t p in
-				let ef = mk (TField(ethis,FInstance(c,params,cf))) t p in
-				let ev = mk (TLocal v) v.v_type p in
-				let e = mk (TBinop(OpAssign,ef,ev)) ev.etype p in
-				(v,None) :: args,e :: el,(cf.cf_name,opt,t) :: tl
-			| Method _ ->
-				args,el,tl
-		) ([],[],[]) (List.rev c.cl_ordered_fields) in
-		let el = match super_expr with Some e -> e :: el | None -> el in
-		let tf = {
-			tf_args = args @ super_args;
-			tf_type = ctx.t.tvoid;
-			tf_expr = mk (TBlock el) ctx.t.tvoid p
-		} in
-		let e = mk (TFunction tf) (TFun(tl @ super_tl,ctx.t.tvoid)) p in
-		let cf = mk_field "new" e.etype p null_pos in
-		cf.cf_expr <- Some e;
-		cf.cf_type <- e.etype;
-		cf.cf_meta <- [Meta.CompilerGenerated,[],null_pos];
-		cf.cf_kind <- Method MethNormal;
-		c.cl_constructor <- Some cf
-
-module Inheritance = struct
-	let check_extends ctx c t p = match follow t with
-		| TInst ({ cl_path = [],"Array"; cl_extern = basic_extern },_)
-		| TInst ({ cl_path = [],"String"; cl_extern = basic_extern },_)
-		| TInst ({ cl_path = [],"Date"; cl_extern = basic_extern },_)
-		| TInst ({ cl_path = [],"Xml"; cl_extern = basic_extern },_) when not (c.cl_extern && basic_extern) ->
-			error "Cannot extend basic class" p;
-		| TInst (csup,params) ->
-			if is_parent c csup then error "Recursive class" p;
-			begin match csup.cl_kind with
-				| KTypeParameter _ when not (is_generic_parameter ctx csup) -> error "Cannot extend non-generic type parameters" p
-				| _ -> csup,params
-			end
-		| _ -> error "Should extend by using a class" p
-
-	let rec check_interface ctx c intf params =
-		let p = c.cl_pos in
-		let rec check_field i f =
-			(if ctx.com.config.pf_overload then
-				List.iter (function
-					| f2 when f != f2 ->
-							check_field i f2
-					| _ -> ()) f.cf_overloads);
-			let is_overload = ref false in
-			try
-				let t2, f2 = class_field_no_interf c i in
-				let t2, f2 =
-					if ctx.com.config.pf_overload && (f2.cf_overloads <> [] || Meta.has Meta.Overload f2.cf_meta) then
-						let overloads = Overloads.get_overloads c i in
-						is_overload := true;
-						let t = (apply_params intf.cl_params params f.cf_type) in
-						List.find (fun (t1,f1) -> Overloads.same_overload_args t t1 f f1) overloads
-					else
-						t2, f2
-				in
-				if ctx.com.display.dms_collect_data then begin
-						let h = ctx.com.display_information in
-						h.interface_field_implementations <- (intf,f,c,Some f2) :: h.interface_field_implementations;
-				end;
-				ignore(follow f2.cf_type); (* force evaluation *)
-				let p = (match f2.cf_expr with None -> p | Some e -> e.epos) in
-				let mkind = function
-					| MethNormal | MethInline -> 0
-					| MethDynamic -> 1
-					| MethMacro -> 2
-				in
-				if f.cf_public && not f2.cf_public && not (Meta.has Meta.CompilerGenerated f.cf_meta) then
-					display_error ctx ("Field " ^ i ^ " should be public as requested by " ^ s_type_path intf.cl_path) p
-				else if not (unify_kind f2.cf_kind f.cf_kind) || not (match f.cf_kind, f2.cf_kind with Var _ , Var _ -> true | Method m1, Method m2 -> mkind m1 = mkind m2 | _ -> false) then
-					display_error ctx ("Field " ^ i ^ " has different property access than in " ^ s_type_path intf.cl_path ^ " (" ^ s_kind f2.cf_kind ^ " should be " ^ s_kind f.cf_kind ^ ")") p
-				else try
-					valid_redefinition ctx f2 t2 f (apply_params intf.cl_params params f.cf_type)
-				with
-					Unify_error l ->
-						if not (Meta.has Meta.CsNative c.cl_meta && c.cl_extern) then begin
-							display_error ctx ("Field " ^ i ^ " has different type than in " ^ s_type_path intf.cl_path) p;
-							display_error ctx ("Interface field is defined here") f.cf_pos;
-							display_error ctx (error_msg (Unify l)) p;
-						end
-			with
-				| Not_found when not c.cl_interface ->
-					let msg = if !is_overload then
-						let ctx = print_context() in
-						let args = match follow f.cf_type with | TFun(args,_) -> String.concat ", " (List.map (fun (n,o,t) -> (if o then "?" else "") ^ n ^ " : " ^ (s_type ctx t)) args) | _ -> assert false in
-						"No suitable overload for " ^ i ^ "( " ^ args ^ " ), as needed by " ^ s_type_path intf.cl_path ^ " was found"
-					else
-						("Field " ^ i ^ " needed by " ^ s_type_path intf.cl_path ^ " is missing")
-					in
-					display_error ctx msg p
-				| Not_found -> ()
-		in
-		PMap.iter check_field intf.cl_fields;
-		List.iter (fun (i2,p2) ->
-			check_interface ctx c i2 (List.map (apply_params intf.cl_params params) p2)
-		) intf.cl_implements
-
-	let check_interfaces ctx c =
-		match c.cl_path with
-		| "Proxy" :: _ , _ -> ()
-		| _ when c.cl_extern && Meta.has Meta.CsNative c.cl_meta -> ()
-		| _ ->
-		List.iter (fun (intf,params) -> check_interface ctx c intf params) c.cl_implements
-
-	let set_heritance ctx c herits p =
-		let is_lib = Meta.has Meta.LibType c.cl_meta in
-		let ctx = { ctx with curclass = c; type_params = c.cl_params; } in
-		let old_meta = c.cl_meta in
-		let process_meta csup =
-			List.iter (fun m ->
-				match m with
-				| Meta.Final, _, _ -> if not (Meta.has Meta.Hack c.cl_meta || (match c.cl_kind with KTypeParameter _ -> true | _ -> false)) then error "Cannot extend a final class" p;
-				| Meta.AutoBuild, el, p -> c.cl_meta <- (Meta.Build,el,null_pos) :: m :: c.cl_meta
-				| _ -> ()
-			) csup.cl_meta
-		in
-		let check_cancel_build csup =
-			match csup.cl_build() with
-			| Built -> ()
-			| state ->
-				(* for macros reason, our super class is not yet built - see #2177 *)
-				(* let's reset our build and delay it until we are done *)
-				c.cl_meta <- old_meta;
-				raise (Build_canceled state)
-		in
-		let has_interf = ref false in
-		(*
-			resolve imports before calling build_inheritance, since it requires full paths.
-			that means that typedefs are not working, but that's a fair limitation
-		*)
-		let resolve_imports (t,p) =
-			match t.tpackage with
-			| _ :: _ -> t,p
-			| [] ->
-				try
-					let path_matches lt = snd (t_path lt) = t.tname in
-					let lt = try
-						List.find path_matches ctx.m.curmod.m_types
-					with Not_found ->
-						let t,pi = List.find (fun (lt,_) -> path_matches lt) ctx.m.module_types in
-						Display.ImportHandling.mark_import_position ctx.com pi;
-						t
-					in
-					{ t with tpackage = fst (t_path lt) },p
-				with
-					Not_found -> t,p
-		in
-		let herits = ExtList.List.filter_map (function
-			| HExtends t -> Some(true,resolve_imports t)
-			| HImplements t -> Some(false,resolve_imports t)
-			| t -> None
-		) herits in
-		let herits = List.filter (ctx.g.do_inherit ctx c p) herits in
-		(* Pass 1: Check and set relations *)
-		let check_herit t is_extends =
-			if is_extends then begin
-				if c.cl_super <> None then error "Cannot extend several classes" p;
-				let csup,params = check_extends ctx c t p in
-				if c.cl_interface then begin
-					if not csup.cl_interface then error "Cannot extend by using a class" p;
-					c.cl_implements <- (csup,params) :: c.cl_implements;
-					if not !has_interf then begin
-						if not is_lib then delay ctx PForce (fun() -> check_interfaces ctx c);
-						has_interf := true;
-					end
-				end else begin
-					if csup.cl_interface then error "Cannot extend by using an interface" p;
-					c.cl_super <- Some (csup,params)
-				end;
-				(fun () ->
-					check_cancel_build csup;
-					process_meta csup;
-				)
-			end else begin match follow t with
-				| TInst ({ cl_path = [],"ArrayAccess"; cl_extern = true; },[t]) ->
-					if c.cl_array_access <> None then error "Duplicate array access" p;
-					c.cl_array_access <- Some t;
-					(fun () -> ())
-				| TInst (intf,params) ->
-					if is_parent c intf then error "Recursive class" p;
-					if c.cl_interface then error "Interfaces cannot implement another interface (use extends instead)" p;
-					if not intf.cl_interface then error "You can only implement an interface" p;
-					c.cl_implements <- (intf, params) :: c.cl_implements;
-					if not !has_interf && not is_lib && not (Meta.has (Meta.Custom "$do_not_check_interf") c.cl_meta) then begin
-						delay ctx PForce (fun() -> check_interfaces ctx c);
-						has_interf := true;
-					end;
-					(fun () ->
-						check_cancel_build intf;
-						process_meta intf;
-					)
-				| TDynamic t ->
-					if c.cl_dynamic <> None then error "Cannot have several dynamics" p;
-					c.cl_dynamic <- Some t;
-					(fun () -> ())
-				| _ ->
-					error "Should implement by using an interface" p
-			end
-		in
-		let fl = ExtList.List.filter_map (fun (is_extends,t) ->
-			try
-				let t = load_instance ~allow_display:true ctx t false p in
-				Some (check_herit t is_extends)
-			with Error(Module_not_found(([],name)),p) when ctx.com.display.dms_display ->
-				if Display.Diagnostics.is_diagnostics_run ctx then Display.ToplevelCollector.handle_unresolved_identifier ctx name p true;
-				None
-		) herits in
-		fl
-end
-
 let rec type_type_param ?(enum_constructor=false) ctx path get_params p tp =
 	let n = fst tp.tp_name in
 	let c = mk_class ctx.m.curmod (fst path @ [snd path],n) (pos tp.tp_name) (pos tp.tp_name) in
@@ -1528,16 +694,19 @@ let rec type_type_param ?(enum_constructor=false) ctx path get_params p tp =
 	c.cl_meta <- tp.Ast.tp_meta;
 	if enum_constructor then c.cl_meta <- (Meta.EnumConstructorParam,[],null_pos) :: c.cl_meta;
 	let t = TInst (c,List.map snd c.cl_params) in
-	if ctx.is_display_file && Display.is_display_position (pos tp.tp_name) then
-		Display.DisplayEmitter.display_type ctx.com.display t (pos tp.tp_name);
+	if ctx.is_display_file && DisplayPosition.display_position#enclosed_in (pos tp.tp_name) then
+		DisplayEmitter.display_type ctx t (pos tp.tp_name);
 	match tp.tp_constraints with
-	| [] ->
+	| None ->
 		n, t
-	| _ ->
+	| Some th ->
 		let r = exc_protect ctx (fun r ->
-			r := (fun _ -> t);
+			r := lazy_processing (fun() -> t);
 			let ctx = { ctx with type_params = ctx.type_params @ get_params() } in
-			let constr = List.map (load_complex_type ctx true p) tp.tp_constraints in
+			let constr = match fst th with
+				| CTIntersection tl -> List.map (load_complex_type ctx true) tl
+				| _ -> [load_complex_type ctx true th]
+			in
 			(* check against direct recursion *)
 			let rec loop t =
 				match follow t with
@@ -1551,7 +720,6 @@ let rec type_type_param ?(enum_constructor=false) ctx path get_params p tp =
 			c.cl_kind <- KTypeParameter constr;
 			t
 		) "constraint" in
-		delay ctx PForce (fun () -> ignore(!r()));
 		n, TLazy r
 
 and type_type_params ?(enum_constructor=false) ctx path get_params p tpl =
@@ -1562,146 +730,18 @@ and type_type_params ?(enum_constructor=false) ctx path get_params p tpl =
 		type_type_param ~enum_constructor ctx path get_params p tp
 	) tpl
 
-let type_function_params ctx fd fname p =
-	let params = ref [] in
-	params := type_type_params ctx ([],fname) (fun() -> !params) p fd.f_params;
-	!params
-
-let save_function_state ctx =
-	let old_ret = ctx.ret in
-	let old_fun = ctx.curfun in
-	let old_opened = ctx.opened in
-	let locals = ctx.locals in
-	(fun () ->
-		ctx.locals <- locals;
-		ctx.ret <- old_ret;
-		ctx.curfun <- old_fun;
-		ctx.opened <- old_opened;
-	)
-
-let type_function ctx args ret fmode f do_display p =
-	let fargs = List.map2 (fun (n,c,t) ((_,pn),_,m,_,_) ->
-		if n.[0] = '$' then error "Function argument names starting with a dollar are not allowed" p;
-		let c = type_function_arg_value ctx t c do_display in
-		let v,c = add_local ctx n t pn, c in
-		v.v_meta <- m;
-		if do_display && Display.is_display_position pn then
-			Display.DisplayEmitter.display_variable ctx.com.display v pn;
-		if n = "this" then v.v_meta <- (Meta.This,[],null_pos) :: v.v_meta;
-		v,c
-	) args f.f_args in
-	ctx.curfun <- fmode;
-	ctx.ret <- ret;
-	ctx.opened <- [];
-	let e = match f.f_expr with
-		| None ->
-			if ctx.com.display.dms_error_policy = EPIgnore then
-				(* when we don't care because we're in display mode, just act like
-				   the function has an empty block body. this is fine even if function
-				   defines a return type, because returns aren't checked in this mode
-				*)
-				EBlock [],p
-			else
-				error "Function body required" p
-		| Some e -> e
-	in
-	let e = if not do_display then
-		type_expr ctx e NoValue
-	else begin
-		let e = Display.ExprPreprocessing.process_expr ctx.com e in
-		try
-			if Common.defined ctx.com Define.NoCOpt then raise Exit;
-			type_expr ctx (Optimizer.optimize_completion_expr e) NoValue
-		with
-		| Parser.TypePath (_,None,_) | Exit ->
-			type_expr ctx e NoValue
-		| Display.DisplayType (t,_,_) when (match follow t with TMono _ -> true | _ -> false) ->
-			type_expr ctx (if ctx.com.display.dms_kind = DMToplevel then Display.ExprPreprocessing.find_enclosing ctx.com e else e) NoValue
-	end in
-	let e = match e.eexpr with
-		| TMeta((Meta.MergeBlock,_,_), ({eexpr = TBlock el} as e1)) -> e1
-		| _ -> e
-	in
-	let has_return e =
-		let rec loop e =
-			match e.eexpr with
-			| TReturn (Some _) -> raise Exit
-			| TFunction _ -> ()
-			| _ -> Type.iter loop e
-		in
-		try loop e; false with Exit -> true
-	in
-	begin match follow ret with
-		| TAbstract({a_path=[],"Void"},_) -> ()
-		(* We have to check for the presence of return expressions here because
-		   in the case of Dynamic ctx.ret is still a monomorph. If we indeed
-		   don't have a return expression we can link the monomorph to Void. We
-		   can _not_ use type_iseq to avoid the Void check above because that
-		   would turn Dynamic returns to Void returns. *)
-		| TMono t when not (has_return e) -> ignore(link t ret ctx.t.tvoid)
-		| _ when ctx.com.display.dms_error_policy = EPIgnore -> ()
-		| _ -> (try return_flow ctx e with Exit -> ())
-	end;
-	let rec loop e =
-		match e.eexpr with
-		| TCall ({ eexpr = TConst TSuper },_) -> raise Exit
-		| TFunction _ -> ()
-		| _ -> Type.iter loop e
-	in
-	let has_super_constr() =
-		match ctx.curclass.cl_super with
-		| None ->
-			None
-		| Some (csup,tl) ->
-			try
-				let _,cf = get_constructor (fun f->f.cf_type) csup in
-				Some (Meta.has Meta.CompilerGenerated cf.cf_meta,TInst(csup,tl))
-			with Not_found ->
-				None
-	in
-	let e = if fmode <> FunConstructor then
-		e
-	else match has_super_constr() with
-		| Some (was_forced,t_super) ->
-			(try
-				loop e;
-				if was_forced then
-					let e_super = mk (TConst TSuper) t_super e.epos in
-					let e_super_call = mk (TCall(e_super,[])) ctx.t.tvoid e.epos in
-					concat e_super_call e
-				else begin
-					display_error ctx "Missing super constructor call" p;
-					e
-				end
-			with
-				Exit -> e);
-		| None ->
-			e
-	in
-	let e = match ctx.curfun, ctx.vthis with
-		| (FunMember|FunConstructor), Some v ->
-			let ev = mk (TVar (v,Some (mk (TConst TThis) ctx.tthis p))) ctx.t.tvoid p in
-			(match e.eexpr with
-			| TBlock l -> { e with eexpr = TBlock (ev::l) }
-			| _ -> mk (TBlock [ev;e]) e.etype p)
-		| _ -> e
-	in
-	List.iter (fun r -> r := Closed) ctx.opened;
-	e , fargs
-
-let type_function ctx args ret fmode f do_display p =
-	let save = save_function_state ctx in
-	Std.finally save (type_function ctx args ret fmode f do_display) p
-
 let load_core_class ctx c =
 	let ctx2 = (match ctx.g.core_api with
 		| None ->
 			let com2 = Common.clone ctx.com in
-			com2.defines <- PMap.empty;
+			com2.defines.Define.values <- PMap.empty;
 			Common.define com2 Define.CoreApi;
 			Common.define com2 Define.Sys;
+			Define.raw_define_value com2.defines "target.threaded" "true"; (* hack because we check this in sys.thread classes *)
 			if ctx.in_macro then Common.define com2 Define.Macro;
 			com2.class_path <- ctx.com.std_path;
+			if com2.display.dms_check_core_api then com2.display <- {com2.display with dms_check_core_api = false};
+			CommonCache.lock_signature com2 "load_core_class";
 			let ctx2 = ctx.g.do_create com2 in
 			ctx.g.core_api <- Some ctx2;
 			ctx2
@@ -1712,7 +752,7 @@ let load_core_class ctx c =
 		| KAbstractImpl a -> { tpackage = fst a.a_path; tname = snd a.a_path; tparams = []; tsub = None; }
 		| _ -> { tpackage = fst c.cl_path; tname = snd c.cl_path; tparams = []; tsub = None; }
 	in
-	let t = load_instance ctx2 (tpath,c.cl_pos) true c.cl_pos in
+	let t = load_instance ctx2 (tpath,c.cl_pos) true in
 	flush_pass ctx2 PFinal "core_final";
 	match t with
 	| TInst (ccore,_) | TAbstract({a_impl = Some ccore}, _) ->
@@ -1751,7 +791,7 @@ let init_core_api ctx c =
 		with Unify_error l ->
 			display_error ctx ("Field " ^ f.cf_name ^ " has different type than in core type") p;
 			display_error ctx (error_msg (Unify l)) p);
-		if f2.cf_public <> f.cf_public then error ("Field " ^ f.cf_name ^ " has different visibility than core type") p;
+		if (has_class_field_flag f2 CfPublic) <> (has_class_field_flag f CfPublic) then error ("Field " ^ f.cf_name ^ " has different visibility than core type") p;
 		(match f2.cf_doc with
 		| None -> f2.cf_doc <- f.cf_doc
 		| Some _ -> ());
@@ -1772,2463 +812,59 @@ let init_core_api ctx c =
 	in
 	let check_fields fcore fl =
 		PMap.iter (fun i f ->
-			if not f.cf_public then () else
+			if not (has_class_field_flag f CfPublic) then () else
 			let f2 = try PMap.find f.cf_name fl with Not_found -> error ("Missing field " ^ i ^ " required by core type") c.cl_pos in
 			compare_fields f f2;
 		) fcore;
 		PMap.iter (fun i f ->
 			let p = (match f.cf_expr with None -> c.cl_pos | Some e -> e.epos) in
-			if f.cf_public && not (Meta.has Meta.Hack f.cf_meta) && not (PMap.mem f.cf_name fcore) && not (List.memq f c.cl_overrides) then error ("Public field " ^ i ^ " is not part of core type") p;
+			if (has_class_field_flag f CfPublic) && not (Meta.has Meta.Hack f.cf_meta) && not (PMap.mem f.cf_name fcore) && not (List.memq f c.cl_overrides) then error ("Public field " ^ i ^ " is not part of core type") p;
 		) fl;
 	in
 	check_fields ccore.cl_fields c.cl_fields;
 	check_fields ccore.cl_statics c.cl_statics;
 	(match ccore.cl_constructor, c.cl_constructor with
 	| None, None -> ()
-	| Some { cf_public = false }, _ -> ()
+	| Some cf, _ when not (has_class_field_flag cf CfPublic) -> ()
 	| Some f, Some f2 -> compare_fields f f2
-	| None, Some { cf_public = false } -> ()
+	| None, Some cf when not (has_class_field_flag cf CfPublic) -> ()
 	| _ -> error "Constructor differs from core type" c.cl_pos)
 
-let check_global_metadata ctx meta f_add mpath tpath so =
-	let sl1 = full_dot_path mpath tpath in
-	let sl1,field_mode = match so with None -> sl1,false | Some s -> sl1 @ [s],true in
-	List.iter (fun (sl2,m,(recursive,to_types,to_fields)) ->
-		let add = ((field_mode && to_fields) || (not field_mode && to_types)) && (match_path recursive sl1 sl2) in
-		if add then f_add m
-	) ctx.g.global_metadata;
-	if ctx.is_display_file then Display.DisplayEmitter.check_display_metadata ctx meta
-
-let patch_class ctx c fields =
-	let path = match c.cl_kind with
-		| KAbstractImpl a -> a.a_path
-		| _ -> c.cl_path
-	in
-	let h = (try Some (Hashtbl.find ctx.g.type_patches path) with Not_found -> None) in
-	match h with
-	| None -> fields
-	| Some (h,hcl) ->
-		c.cl_meta <- c.cl_meta @ hcl.tp_meta;
-		let rec loop acc = function
-			| [] -> acc
-			| f :: l ->
-				(* patch arguments types *)
-				(match f.cff_kind with
-				| FFun ff ->
-					let param (((n,pn),opt,m,_,e) as p) =
-						try
-							let t2 = (try Hashtbl.find h (("$" ^ (fst f.cff_name) ^ "__" ^ n),false) with Not_found -> Hashtbl.find h (("$" ^ n),false)) in
-							(n,pn), opt, m, (match t2.tp_type with None -> None | Some t -> Some (t,null_pos)), e
-						with Not_found ->
-							p
-					in
-					f.cff_kind <- FFun { ff with f_args = List.map param ff.f_args }
-				| _ -> ());
-				(* other patches *)
-				match (try Some (Hashtbl.find h (fst f.cff_name,List.mem AStatic f.cff_access)) with Not_found -> None) with
-				| None -> loop (f :: acc) l
-				| Some { tp_remove = true } -> loop acc l
-				| Some p ->
-					f.cff_meta <- f.cff_meta @ p.tp_meta;
-					(match p.tp_type with
-					| None -> ()
-					| Some t ->
-						f.cff_kind <- match f.cff_kind with
-						| FVar (_,e) -> FVar (Some (t,null_pos),e)
-						| FProp (get,set,_,eo) -> FProp (get,set,Some (t,null_pos),eo)
-						| FFun f -> FFun { f with f_type = Some (t,null_pos) });
-					loop (f :: acc) l
-		in
-		List.rev (loop [] fields)
-
 let string_list_of_expr_path (e,p) =
 	try string_list_of_expr_path_raise (e,p)
 	with Exit -> error "Invalid path" p
 
-let build_enum_abstract ctx c a fields p =
-	List.iter (fun field ->
-		match field.cff_kind with
-		| FVar(ct,eo) when not (List.mem AStatic field.cff_access) ->
-			field.cff_access <- [AStatic; if (List.mem APrivate field.cff_access) then APrivate else APublic];
-			field.cff_meta <- (Meta.Enum,[],null_pos) :: (Meta.Impl,[],null_pos) :: field.cff_meta;
-			let ct = match ct with
-				| Some _ -> ct
-				| None -> Some (TExprToExpr.convert_type (TAbstract(a,List.map snd a.a_params)),null_pos)
-			in
-			begin match eo with
-				| None ->
-					if not c.cl_extern then error "Value required" field.cff_pos
-					else field.cff_kind <- FProp(("default",null_pos),("never",null_pos),ct,None)
-				| Some e ->
-					field.cff_access <- AInline :: field.cff_access;
-					let e = (ECast(e,None),(pos e)) in
-					field.cff_kind <- FVar(ct,Some e)
-			end
-		| _ ->
-			()
-	) fields;
-	EVars [("",null_pos),Some (CTAnonymous fields,p),None],p
-
-let is_java_native_function meta = try
-	match Meta.get Meta.Native meta with
-		| (Meta.Native,[],_) -> true
-		| _ -> false
-	with | Not_found -> false
-
-let build_module_def ctx mt meta fvars context_init fbuild =
-	let loop (f_build,f_enum) = function
-		| Meta.Build,args,p -> (fun () ->
-				let epath, el = (match args with
-					| [ECall (epath,el),p] -> epath, el
-					| _ -> error "Invalid build parameters" p
-				) in
-				let s = try String.concat "." (List.rev (string_list_of_expr_path epath)) with Error (_,p) -> error "Build call parameter must be a class path" p in
-				if ctx.in_macro then error "You cannot use @:build inside a macro : make sure that your type is not used in macro" p;
-				let old = ctx.g.get_build_infos in
-				ctx.g.get_build_infos <- (fun() -> Some (mt, List.map snd (t_infos mt).mt_params, fvars()));
-				context_init();
-				let r = try apply_macro ctx MBuild s el p with e -> ctx.g.get_build_infos <- old; raise e in
-				ctx.g.get_build_infos <- old;
-				(match r with
-				| None -> error "Build failure" p
-				| Some e -> fbuild e)
-			) :: f_build,f_enum
-		| Meta.Enum,_,p -> f_build,Some (fun () ->
-				begin match mt with
-					| TClassDecl ({cl_kind = KAbstractImpl a} as c) ->
-						context_init();
-						let e = build_enum_abstract ctx c a (fvars()) p in
-						fbuild e;
-					| _ ->
-						()
-				end
-			)
-		| _ ->
-			f_build,f_enum
+let handle_using ctx path p =
+	let t = match List.rev path with
+		| (s1,_) :: (s2,_) :: sl ->
+			if is_lower_ident s2 then { tpackage = (List.rev (s2 :: List.map fst sl)); tname = s1; tsub = None; tparams = [] }
+			else { tpackage = List.rev (List.map fst sl); tname = s2; tsub = Some s1; tparams = [] }
+		| (s1,_) :: sl ->
+			{ tpackage = List.rev (List.map fst sl); tname = s1; tsub = None; tparams = [] }
+		| [] ->
+			DisplayException.raise_fields (DisplayToplevel.collect ctx TKType NoValue) CRUsing (DisplayTypes.make_subject None {p with pmin = p.pmax});
 	in
-	(* let errors go through to prevent resume if build fails *)
-	let f_build,f_enum = List.fold_left loop ([],None) meta in
-	List.iter (fun f -> f()) (List.rev f_build);
-	(match f_enum with None -> () | Some f -> f())
-
-module ClassInitializer = struct
-	type class_init_ctx = {
-		tclass : tclass; (* I don't trust ctx.curclass because it's mutable. *)
-		is_lib : bool;
-		is_native : bool;
-		is_core_api : bool;
-		is_class_debug : bool;
-		extends_public : bool;
-		abstract : tabstract option;
-		context_init : unit -> unit;
-		mutable delayed_expr : (typer * (unit -> t) ref option) list;
-		mutable force_constructor : bool;
-	}
-
-	type field_kind =
-		| FKNormal
-		| FKConstructor
-		| FKInit
-
-	type field_init_ctx = {
-		is_inline : bool;
-		is_static : bool;
-		is_override : bool;
-		is_extern : bool;
-		is_macro : bool;
-		is_abstract_member : bool;
-		is_display_field : bool;
-		is_field_debug : bool;
-		field_kind : field_kind;
-		mutable do_bind : bool;
-		mutable do_add : bool;
-	}
-
-	let dump_class_context cctx =
-		Printer.s_record_fields "" [
-			"tclass",Printer.s_tclass "\t" cctx.tclass;
-			"is_lib",string_of_bool cctx.is_lib;
-			"is_native",string_of_bool cctx.is_native;
-			"is_core_api",string_of_bool cctx.is_core_api;
-			"is_class_debug",string_of_bool cctx.is_class_debug;
-			"extends_public",string_of_bool cctx.extends_public;
-			"abstract",Printer.s_opt (Printer.s_tabstract "\t") cctx.abstract;
-			"force_constructor",string_of_bool cctx.force_constructor;
-		]
-
-	let s_field_kind = function
-		| FKNormal -> "FKNormal"
-		| FKConstructor -> "FKConstructor"
-		| FKInit -> "FKInit"
-
-	let dump_field_context fctx =
-		Printer.s_record_fields "" [
-			"is_inline",string_of_bool fctx.is_inline;
-			"is_static",string_of_bool fctx.is_static;
-			"is_override",string_of_bool fctx.is_override;
-			"is_extern",string_of_bool fctx.is_extern;
-			"is_macro",string_of_bool fctx.is_macro;
-			"is_abstract_member",string_of_bool fctx.is_abstract_member;
-			"is_display_field",string_of_bool fctx.is_display_field;
-			"is_field_debug",string_of_bool fctx.is_field_debug;
-			"field_kind",s_field_kind fctx.field_kind;
-			"do_bind",string_of_bool fctx.do_bind;
-			"do_add",string_of_bool fctx.do_add;
-		]
-
-	let create_class_context ctx c context_init p =
-		locate_macro_error := true;
-		incr stats.s_classes_built;
-		let abstract = match c.cl_kind with
-			| KAbstractImpl a -> Some a
-			| _ -> None
-		in
-		let ctx = {
-			ctx with
-			curclass = c;
-			type_params = c.cl_params;
-			pass = PBuildClass;
-			tthis = (match abstract with
-				| Some a ->
-					(match a.a_this with
-					| TMono r when !r = None -> TAbstract (a,List.map snd c.cl_params)
-					| t -> t)
-				| None -> TInst (c,List.map snd c.cl_params));
-			on_error = (fun ctx msg ep ->
-				ctx.com.error msg ep;
-				(* macros expressions might reference other code, let's recall which class we are actually compiling *)
-				if !locate_macro_error && (ep.pfile <> c.cl_pos.pfile || ep.pmax < c.cl_pos.pmin || ep.pmin > c.cl_pos.pmax) then ctx.com.error "Defined in this class" c.cl_pos
-			);
-		} in
-		(* a lib type will skip most checks *)
-		let is_lib = Meta.has Meta.LibType c.cl_meta in
-		if is_lib && not c.cl_extern then ctx.com.error "@:libType can only be used in extern classes" c.cl_pos;
-		(* a native type will skip one check: the static vs non-static field *)
-		let is_native = Meta.has Meta.JavaNative c.cl_meta || Meta.has Meta.CsNative c.cl_meta in
-		if Meta.has Meta.Macro c.cl_meta then display_error ctx "Macro classes are no longer allowed in haxe 3" c.cl_pos;
-		let rec extends_public c =
-			Meta.has Meta.PublicFields c.cl_meta ||
-			match c.cl_super with
-			| None -> false
-			| Some (c,_) -> extends_public c
-		in
-		let cctx = {
-			tclass = c;
-			is_lib = is_lib;
-			is_native = is_native;
-			is_core_api = Meta.has Meta.CoreApi c.cl_meta;
-			is_class_debug = false;
-			extends_public = extends_public c;
-			abstract = abstract;
-			context_init = context_init;
-			force_constructor = false;
-			delayed_expr = [];
-		} in
-		ctx,cctx
-
-	let create_field_context (ctx,cctx) c cff =
-		let ctx = {
-			ctx with
-			pass = PBuildClass; (* will be set later to PTypeExpr *)
-		} in
-		let is_static = List.mem AStatic cff.cff_access in
-		let is_extern = Meta.has Meta.Extern cff.cff_meta || c.cl_extern in
-		let allow_inline = cctx.abstract <> None || match cff.cff_kind with
-			| FFun _ -> ctx.g.doinline || is_extern
-			| _ -> true
-		in
-		let is_inline = allow_inline && List.mem AInline cff.cff_access in
-		let is_override = List.mem AOverride cff.cff_access in
-		let is_macro = List.mem AMacro cff.cff_access in
-		let field_kind = match fst cff.cff_name with
-			| "new" -> FKConstructor
-			| "__init__" when is_static -> FKInit
-			| _ -> FKNormal
+	let types = (match t.tsub with
+		| None ->
+			let md = ctx.g.do_load_module ctx (t.tpackage,t.tname) p in
+			let types = List.filter (fun t -> not (t_infos t).mt_private) md.m_types in
+			types
+		| Some _ ->
+			let t = load_type_def ctx p t in
+			[t]
+	) in
+	(* delay the using since we need to resolve typedefs *)
+	let filter_classes types =
+		let rec loop acc types = match types with
+			| td :: l ->
+				(match resolve_typedef td with
+				| TClassDecl c | TAbstractDecl({a_impl = Some c}) ->
+					loop ((c,p) :: acc) l
+				| td ->
+					loop acc l)
+			| [] ->
+				acc
 		in
-		let fctx = {
-			is_inline = is_inline;
-			is_static = is_static;
-			is_override = is_override;
-			is_macro = is_macro;
-			is_extern = is_extern;
-			is_display_field = ctx.is_display_file && Display.is_display_position cff.cff_pos;
-			is_field_debug = cctx.is_class_debug;
-			is_abstract_member = cctx.abstract <> None && Meta.has Meta.Impl cff.cff_meta;
-			field_kind = field_kind;
-			do_bind = (((not c.cl_extern || is_inline) && not c.cl_interface) || field_kind = FKInit);
-			do_add = true;
-		} in
-		ctx,fctx
-
-	let is_public (ctx,cctx) access parent =
-		let c = cctx.tclass in
-		if List.mem APrivate access then
-			false
-		else if List.mem APublic access then
-			true
-		else match parent with
-			| Some { cf_public = p } -> p
-			| _ -> c.cl_extern || c.cl_interface || cctx.extends_public
-
-	let rec get_parent c name =
-		match c.cl_super with
-		| None -> None
-		| Some (csup,_) ->
-			try
-				Some (PMap.find name csup.cl_fields)
-			with
-				Not_found -> get_parent csup name
-
-	let add_field c cf is_static =
-		if is_static then begin
-			c.cl_statics <- PMap.add cf.cf_name cf c.cl_statics;
-			c.cl_ordered_statics <- cf :: c.cl_ordered_statics;
-		end else begin
-			c.cl_fields <- PMap.add cf.cf_name cf c.cl_fields;
-			c.cl_ordered_fields <- cf :: c.cl_ordered_fields;
-		end
-
-	let type_opt (ctx,cctx) p t =
-		let c = cctx.tclass in
-		match t with
-		| None when c.cl_extern || c.cl_interface ->
-			display_error ctx "Type required for extern classes and interfaces" p;
-			t_dynamic
-		| None when cctx.is_core_api ->
-			display_error ctx "Type required for core api classes" p;
-			t_dynamic
-		| _ ->
-			load_type_hint ctx p t
-
-	let build_fields (ctx,cctx) c fields =
-		let fields = ref fields in
-		let get_fields() = !fields in
-		let pending = ref [] in
-		c.cl_build <- (fun() -> BuildMacro pending);
-		build_module_def ctx (TClassDecl c) c.cl_meta get_fields cctx.context_init (fun (e,p) ->
-			match e with
-			| EVars [_,Some (CTAnonymous f,p),None] ->
-				let f = List.map (fun f ->
-					let f = match cctx.abstract with
-						| Some a ->
-							let a_t = TExprToExpr.convert_type' (TAbstract(a,List.map snd a.a_params)) in
-							let this_t = TExprToExpr.convert_type' a.a_this in (* TODO: better pos? *)
-							transform_abstract_field ctx.com this_t a_t a f
-						| None ->
-							f
-					in
-					if List.mem AMacro f.cff_access then
-						(match ctx.g.macros with
-						| Some (_,mctx) when Hashtbl.mem mctx.g.types_module c.cl_path ->
-							(* assume that if we had already a macro with the same name, it has not been changed during the @:build operation *)
-							if not (List.exists (fun f2 -> f2.cff_name = f.cff_name && List.mem AMacro f2.cff_access) (!fields)) then
-								error "Class build macro cannot return a macro function when the class has already been compiled into the macro context" p
-						| _ -> ());
-					f
-				) f in
-				fields := f
-			| _ -> error "Class build macro must return a single variable with anonymous fields" p
-		);
-		c.cl_build <- (fun() -> Building);
-		List.iter (fun f -> f()) !pending;
-		!fields
-
-	let bind_type (ctx,cctx,fctx) cf r p =
-		let c = cctx.tclass in
-		let rec is_full_type t =
-			match t with
-			| TFun (args,ret) -> is_full_type ret && List.for_all (fun (_,_,t) -> is_full_type t) args
-			| TMono r -> (match !r with None -> false | Some t -> is_full_type t)
-			| TAbstract _ | TInst _ | TEnum _ | TLazy _ | TDynamic _ | TAnon _ | TType _ -> true
-		in
-		let force_macro () =
-			(* force macro system loading of this class in order to get completion *)
-			delay ctx PTypeField (fun() -> try ignore(ctx.g.do_macro ctx MDisplay c.cl_path cf.cf_name [] p) with Exit | Error _ -> ())
-		in
-		let handle_display_field () =
-			if fctx.is_macro && not ctx.in_macro then
-				force_macro()
-			else begin
-				cf.cf_type <- TLazy r;
-				cctx.delayed_expr <- (ctx,Some r) :: cctx.delayed_expr;
-			end
-		in
-		if ctx.com.display.dms_full_typing then begin
-			if fctx.is_macro && not ctx.in_macro then
-				()
-			else begin
-				cf.cf_type <- TLazy r;
-				(* is_lib ? *)
-				cctx.delayed_expr <- (ctx,Some r) :: cctx.delayed_expr;
-			end
-		end else if ctx.com.display.dms_force_macro_typing && fctx.is_macro && not ctx.in_macro then
-			force_macro()
-		else begin
-			if fctx.is_display_field then begin
-				handle_display_field()
-			end else begin
-				if not (is_full_type cf.cf_type) then begin
-					cctx.delayed_expr <- (ctx, None) :: cctx.delayed_expr;
-					cf.cf_type <- TLazy r;
-				end;
-			end
-		end
-
-	let bind_var (ctx,cctx,fctx) cf e =
-		let c = cctx.tclass in
-		let p = cf.cf_pos in
-		let rec get_declared f = function
-			| None -> None
-			| Some (c,a) when PMap.exists f c.cl_fields ->
-				Some (c,a)
-			| Some (c,_) ->
-				let ret = get_declared f c.cl_super in
-				match ret with
-					| Some r -> Some r
-					| None ->
-						let rec loop ifaces = match ifaces with
-							| [] -> None
-							| i :: ifaces -> match get_declared f (Some i) with
-								| Some r -> Some r
-								| None -> loop ifaces
-						in
-						loop c.cl_implements
-		in
-		if not fctx.is_static && not cctx.is_lib then begin match get_declared cf.cf_name c.cl_super with
-				| None -> ()
-				| Some (csup,_) ->
-					(* this can happen on -net-lib generated classes if a combination of explicit interfaces and variables with the same name happens *)
-					if not (csup.cl_interface && Meta.has Meta.CsNative c.cl_meta) then
-						error ("Redefinition of variable " ^ cf.cf_name ^ " in subclass is not allowed. Previously declared at " ^ (s_type_path csup.cl_path) ) p
-		end;
-		let t = cf.cf_type in
-
-		match e with
-		| None ->
-			if fctx.is_display_field then Display.DisplayEmitter.maybe_display_field ctx (cf.cf_name_pos) cf;
-		| Some e ->
-			if requires_value_meta ctx.com (Some c) then cf.cf_meta <- ((Meta.Value,[e],null_pos) :: cf.cf_meta);
-			let check_cast e =
-				(* insert cast to keep explicit field type (issue #1901) *)
-				if type_iseq e.etype cf.cf_type then
-					e
-				else begin match e.eexpr,follow cf.cf_type with
-					| TConst (TInt i),TAbstract({a_path=[],"Float"},_) ->
-						(* turn int constant to float constant if expected type is float *)
-						{e with eexpr = TConst (TFloat (Int32.to_string i))}
-					| _ ->
-						mk_cast e cf.cf_type e.epos
-				end
-			in
-			let r = exc_protect ctx (fun r ->
-				(* type constant init fields (issue #1956) *)
-				if not !return_partial_type || (match fst e with EConst _ -> true | _ -> false) then begin
-					r := (fun() -> t);
-					cctx.context_init();
-					if ctx.com.verbose then Common.log ctx.com ("Typing " ^ (if ctx.in_macro then "macro " else "") ^ s_type_path c.cl_path ^ "." ^ cf.cf_name);
-					let e = type_var_field ctx t e fctx.is_static fctx.is_display_field p in
-					let maybe_run_analyzer e = match e.eexpr with
-						| TConst _ | TLocal _ | TFunction _ -> e
-						| _ -> !analyzer_run_on_expr_ref ctx.com e
-					in
-					let require_constant_expression e msg =
-						if ctx.com.display.dms_display && ctx.com.display.dms_error_policy <> EPCollect then
-							e
-						else match Optimizer.make_constant_expression ctx (maybe_run_analyzer e) with
-						| Some e -> e
-						| None -> display_error ctx msg p; e
-					in
-					let e = (match cf.cf_kind with
-					| Var v when c.cl_extern || Meta.has Meta.Extern cf.cf_meta ->
-						if not fctx.is_static then begin
-							display_error ctx "Extern non-static variables may not be initialized" p;
-							e
-						end else if not fctx.is_inline then begin
-							display_error ctx "Extern non-inline variables may not be initialized" p;
-							e
-						end else require_constant_expression e "Extern variable initialization must be a constant value"
-					| Var v when is_extern_field cf ->
-						(* disallow initialization of non-physical fields (issue #1958) *)
-						display_error ctx "This field cannot be initialized because it is not a real variable" p; e
-					| Var v when not fctx.is_static ->
-						let e = if ctx.com.display.dms_display && ctx.com.display.dms_error_policy <> EPCollect then
-							e
-						else match Optimizer.make_constant_expression ctx (maybe_run_analyzer e) with
-							| Some e -> e
-							| None ->
-								let rec has_this e = match e.eexpr with
-									| TConst TThis ->
-										display_error ctx "Cannot access this or other member field in variable initialization" e.epos;
-									| TLocal v when (match ctx.vthis with Some v2 -> v == v2 | None -> false) ->
-										display_error ctx "Cannot access this or other member field in variable initialization" e.epos;
-									| _ ->
-									Type.iter has_this e
-								in
-								has_this e;
-								e
-						in
-						e
-					| Var v when v.v_read = AccInline ->
-						let e = require_constant_expression e "Inline variable initialization must be a constant value" in
-						begin match c.cl_kind with
-							| KAbstractImpl a when Meta.has Meta.Enum cf.cf_meta && Meta.has Meta.Enum a.a_meta ->
-								unify ctx t (TAbstract(a,(List.map (fun _ -> mk_mono()) a.a_params))) p;
-								begin match e.eexpr with
-									| TCast(e1,None) -> unify ctx e1.etype a.a_this e1.epos
-									| _ -> assert false
-								end
-							| _ ->
-								()
-						end;
-						e
-					| _ ->
-						e
-					) in
-					let e = check_cast e in
-					cf.cf_expr <- Some e;
-					cf.cf_type <- t;
-					if fctx.is_display_field then Display.DisplayEmitter.maybe_display_field ctx (cf.cf_name_pos) cf;
-				end;
-				t
-			) "bind_var" in
-			if not fctx.is_static then cctx.force_constructor <- true;
-			bind_type (ctx,cctx,fctx) cf r (snd e)
-
-	let create_variable (ctx,cctx,fctx) c f t eo p =
-		if not fctx.is_static && cctx.abstract <> None then error (fst f.cff_name ^ ": Cannot declare member variable in abstract") p;
-		if fctx.is_inline && not fctx.is_static then error (fst f.cff_name ^ ": Inline variable must be static") p;
-		if fctx.is_inline && eo = None then error (fst f.cff_name ^ ": Inline variable must be initialized") p;
-
-		let t = (match t with
-			| None when not fctx.is_static && eo = None ->
-				error ("Type required for member variable " ^ fst f.cff_name) p;
-			| None ->
-				mk_mono()
-			| Some t ->
-				(* TODO is_lib: only load complex type if needed *)
-				let old = ctx.type_params in
-				if fctx.is_static then ctx.type_params <- (match cctx.abstract with
-					| Some a -> a.a_params
-					| _ -> []
-				);
-				let t = load_complex_type ctx true p t in
-				if fctx.is_static then ctx.type_params <- old;
-				t
-		) in
-		let cf = {
-			cf_name = fst f.cff_name;
-			cf_doc = f.cff_doc;
-			cf_meta = f.cff_meta;
-			cf_type = t;
-			cf_pos = f.cff_pos;
-			cf_name_pos = pos f.cff_name;
-			cf_kind = Var (if fctx.is_inline then { v_read = AccInline ; v_write = AccNever } else { v_read = AccNormal; v_write = AccNormal });
-			cf_expr = None;
-			cf_expr_unoptimized = None;
-			cf_public = is_public (ctx,cctx) f.cff_access None;
-			cf_params = [];
-			cf_overloads = [];
-		} in
-		ctx.curfield <- cf;
-		bind_var (ctx,cctx,fctx) cf eo;
-		cf
-
-	let check_abstract (ctx,cctx,fctx) c cf fd t ret p =
-		match cctx.abstract with
-			| Some a ->
-				let m = mk_mono() in
-				let ta = TAbstract(a, List.map (fun _ -> mk_mono()) a.a_params) in
-				let tthis = if fctx.is_abstract_member || Meta.has Meta.To cf.cf_meta then monomorphs a.a_params a.a_this else a.a_this in
-				let allows_no_expr = ref (Meta.has Meta.CoreType a.a_meta) in
-				let rec loop ml = match ml with
-					| (Meta.From,_,_) :: _ ->
-						let r = fun () ->
-							(* the return type of a from-function must be the abstract, not the underlying type *)
-							if not fctx.is_macro then (try type_eq EqStrict ret ta with Unify_error l -> error (error_msg (Unify l)) p);
-							match t with
-								| TFun([_,_,t],_) -> t
-								| _ -> error (cf.cf_name ^ ": @:from cast functions must accept exactly one argument") p
-						in
-						a.a_from_field <- (TLazy (ref r),cf) :: a.a_from_field;
-					| (Meta.To,_,_) :: _ ->
-						if fctx.is_macro then error (cf.cf_name ^ ": Macro cast functions are not supported") p;
-						(* TODO: this doesn't seem quite right... *)
-						if not (Meta.has Meta.Impl cf.cf_meta) then cf.cf_meta <- (Meta.Impl,[],null_pos) :: cf.cf_meta;
-						let resolve_m args =
-							(try unify_raise ctx t (tfun (tthis :: args) m) cf.cf_pos with Error (Unify l,p) -> error (error_msg (Unify l)) p);
-							match follow m with
-								| TMono _ when (match t with TFun(_,r) -> r == t_dynamic | _ -> false) -> t_dynamic
-								| m -> m
-						in
-							let r = exc_protect ctx (fun r ->
-								let args = if Meta.has Meta.MultiType a.a_meta then begin
-								let ctor = try
-									PMap.find "_new" c.cl_statics
-								with Not_found ->
-									error "Constructor of multi-type abstract must be defined before the individual @:to-functions are" cf.cf_pos
-								in
-								(* delay ctx PFinal (fun () -> unify ctx m tthis f.cff_pos); *)
-								let args = match follow (monomorphs a.a_params ctor.cf_type) with
-									| TFun(args,_) -> List.map (fun (_,_,t) -> t) args
-									| _ -> assert false
-								in
-								args
-							end else
-								[]
-							in
-							let t = resolve_m args in
-							r := (fun() -> t);
-							t
-						) "@:to" in
-						delay ctx PForce (fun() -> ignore ((!r)()));
-						a.a_to_field <- (TLazy r, cf) :: a.a_to_field
-					| ((Meta.ArrayAccess,_,_) | (Meta.Op,[(EArrayDecl _),_],_)) :: _ ->
-						if fctx.is_macro then error (cf.cf_name ^ ": Macro array-access functions are not supported") p;
-						a.a_array <- cf :: a.a_array;
-					| (Meta.Op,[EBinop(op,_,_),_],_) :: _ ->
-						if fctx.is_macro then error (cf.cf_name ^ ": Macro operator functions are not supported") p;
-						let targ = if fctx.is_abstract_member then tthis else ta in
-						let left_eq,right_eq = match follow t with
-							| TFun([(_,_,t1);(_,_,t2)],_) ->
-								type_iseq targ t1,type_iseq targ t2
-							| _ ->
-								if fctx.is_abstract_member then
-									error (cf.cf_name ^ ": Member @:op functions must accept exactly one argument") cf.cf_pos
-								else
-									error (cf.cf_name ^ ": Static @:op functions must accept exactly two arguments") cf.cf_pos
-						in
-						if not (left_eq || right_eq) then error (cf.cf_name ^ ": The left or right argument type must be " ^ (s_type (print_context()) targ)) cf.cf_pos;
-						if right_eq && Meta.has Meta.Commutative cf.cf_meta then error (cf.cf_name ^ ": @:commutative is only allowed if the right argument is not " ^ (s_type (print_context()) targ)) cf.cf_pos;
-						a.a_ops <- (op,cf) :: a.a_ops;
-						allows_no_expr := true;
-					| (Meta.Op,[EUnop(op,flag,_),_],_) :: _ ->
-						if fctx.is_macro then error (cf.cf_name ^ ": Macro operator functions are not supported") p;
-						let targ = if fctx.is_abstract_member then tthis else ta in
-						(try type_eq EqStrict t (tfun [targ] (mk_mono())) with Unify_error l -> raise (Error ((Unify l),cf.cf_pos)));
-						a.a_unops <- (op,flag,cf) :: a.a_unops;
-						allows_no_expr := true;
-					| (Meta.Impl,_,_) :: ml when cf.cf_name <> "_new" && not fctx.is_macro ->
-						begin match follow t with
-							| TFun((_,_,t1) :: _, _) when type_iseq tthis t1 ->
-								()
-							| _ ->
-								display_error ctx ("First argument of implementation function must be " ^ (s_type (print_context()) tthis)) cf.cf_pos
-						end;
-						loop ml
-					| ((Meta.Resolve,_,_) | (Meta.Op,[EField _,_],_)) :: _ ->
-						if a.a_resolve <> None then error "Multiple resolve methods are not supported" cf.cf_pos;
-						let targ = if fctx.is_abstract_member then tthis else ta in
-						begin match follow t with
-							| TFun([(_,_,t1);(_,_,t2)],_) ->
-								if not fctx.is_macro then begin
-									if not (type_iseq targ t1) then error ("First argument type must be " ^ (s_type (print_context()) targ)) cf.cf_pos;
-									if not (type_iseq ctx.t.tstring t2) then error ("Second argument type must be String") cf.cf_pos
-								end
-							| _ ->
-								error ("Field type of resolve must be " ^ (s_type (print_context()) targ) ^ " -> String -> T") cf.cf_pos
-						end;
-						a.a_resolve <- Some cf;
-					| _ :: ml ->
-						loop ml
-					| [] ->
-						()
-				in
-				loop cf.cf_meta;
-				let check_bind () =
-					if fd.f_expr = None then begin
-						if fctx.is_inline then error (cf.cf_name ^ ": Inline functions must have an expression") cf.cf_pos;
-						begin match fd.f_type with
-							| None -> error (cf.cf_name ^ ": Functions without expressions must have an explicit return type") cf.cf_pos
-							| Some _ -> ()
-						end;
-						cf.cf_meta <- (Meta.NoExpr,[],null_pos) :: cf.cf_meta;
-						fctx.do_bind <- false;
-						if not (Meta.has Meta.CoreType a.a_meta) then fctx.do_add <- false;
-					end
-				in
-				if cf.cf_name = "_new" && Meta.has Meta.MultiType a.a_meta then fctx.do_bind <- false;
-				if !allows_no_expr then check_bind()
-			| _ ->
-				()
-
-	let create_method (ctx,cctx,fctx) c f fd p =
-		let params = type_function_params ctx fd (fst f.cff_name) p in
-		if Meta.has Meta.Generic f.cff_meta then begin
-			if params = [] then error (fst f.cff_name ^ ": Generic functions must have type parameters") p;
-		end;
-		let fd = if fctx.is_macro && not ctx.in_macro && not fctx.is_static then
-			(* remove display of first argument which will contain the "this" expression *)
-			{ fd with f_args = match fd.f_args with [] -> [] | _ :: l -> l }
-		else
-			fd
-		in
-		let fd = if not fctx.is_macro then
-			fd
-		else begin
-			if ctx.in_macro then begin
-				(* a class with a macro cannot be extern in macro context (issue #2015) *)
-				c.cl_extern <- false;
-				let texpr = CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tparams = []; tsub = None } in
-				(* ExprOf type parameter might contain platform-specific type, let's replace it by Expr *)
-				let no_expr_of (t,p) = match t with
-					| CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = Some ("ExprOf"); tparams = [TPType _] }
-					| CTPath { tpackage = []; tname = ("ExprOf"); tsub = None; tparams = [TPType _] } -> Some (texpr,p)
-					| t -> Some (t,p)
-				in
-				{
-					f_params = fd.f_params;
-					f_type = (match fd.f_type with None -> Some (texpr,null_pos) | Some t -> no_expr_of t);
-					f_args = List.map (fun (a,o,m,t,e) -> a,o,m,(match t with None -> Some (texpr,null_pos) | Some t -> no_expr_of t),e) fd.f_args;
-					f_expr = fd.f_expr;
-				}
-			end else
-				let tdyn = Some (CTPath { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None },null_pos) in
-				let to_dyn p t = match t with
-					| { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = Some ("ExprOf"); tparams = [TPType t] } -> Some t
-					| { tpackage = []; tname = ("ExprOf"); tsub = None; tparams = [TPType t] } -> Some t
-					| { tpackage = ["haxe"]; tname = ("PosInfos"); tsub = None; tparams = [] } -> error "haxe.PosInfos is not allowed on macro functions, use Context.currentPos() instead" p
-					| _ -> tdyn
-				in
-				{
-					f_params = fd.f_params;
-					f_type = (match fd.f_type with Some (CTPath t,p) -> to_dyn p t | _ -> tdyn);
-					f_args = List.map (fun (a,o,m,t,_) -> a,o,m,(match t with Some (CTPath t,p) -> to_dyn p t | _ -> tdyn),None) fd.f_args;
-					f_expr = None;
-				}
-		end in
-		begin match c.cl_interface,fctx.field_kind with
-			| true,FKConstructor ->
-				error "An interface cannot have a constructor" p;
-			| true,_ ->
-				if not fctx.is_static && fd.f_expr <> None then error (fst f.cff_name ^ ": An interface method cannot have a body") p;
-				if fctx.is_inline && c.cl_interface then error (fst f.cff_name ^ ": You can't declare inline methods in interfaces") p;
-			| false,FKConstructor ->
-				if fctx.is_static then error "A constructor must not be static" p;
-				begin match fd.f_type with
-					| None | Some (CTPath { tpackage = []; tname = "Void" },_) -> ()
-					| _ -> error "A class constructor can't have a return value" p;
-				end
-			| false,_ ->
-				()
-		end;
-		let parent = (if not fctx.is_static then get_parent c (fst f.cff_name) else None) in
-		let dynamic = List.mem ADynamic f.cff_access || (match parent with Some { cf_kind = Method MethDynamic } -> true | _ -> false) in
-		if fctx.is_inline && dynamic then error (fst f.cff_name ^ ": You can't have both 'inline' and 'dynamic'") p;
-		ctx.type_params <- (match cctx.abstract with
-			| Some a when fctx.is_abstract_member ->
-				params @ a.a_params
-			| _ ->
-				if fctx.is_static then params else params @ ctx.type_params);
-		(* TODO is_lib: avoid forcing the return type to be typed *)
-		let ret = if fctx.field_kind = FKConstructor then ctx.t.tvoid else type_opt (ctx,cctx) p fd.f_type in
-		let rec loop args = match args with
-			| ((name,p),opt,m,t,ct) :: args ->
-				(* TODO is_lib: avoid forcing the field to be typed *)
-				let t, ct = type_function_arg ctx (type_opt (ctx,cctx) p t) ct opt p in
-				delay ctx PTypeField (fun() -> match follow t with
-					| TAbstract({a_path = ["haxe";"extern"],"Rest"},_) ->
-						if not c.cl_extern then error "Rest argument are only supported for extern methods" p;
-						if opt then error "Rest argument cannot be optional" p;
-						begin match ct with None -> () | Some (_,p) -> error "Rest argument cannot have default value" p end;
-						if args <> [] then error "Rest should only be used for the last function argument" p;
-					| _ ->
-						()
-				);
-				(name, ct, t) :: (loop args)
-			| [] ->
-				[]
-		in
-		let args = loop fd.f_args in
-		let t = TFun (fun_args args,ret) in
-		let cf = {
-			cf_name = fst f.cff_name;
-			cf_doc = f.cff_doc;
-			cf_meta = f.cff_meta;
-			cf_type = t;
-			cf_pos = f.cff_pos;
-			cf_name_pos = pos f.cff_name;
-			cf_kind = Method (if fctx.is_macro then MethMacro else if fctx.is_inline then MethInline else if dynamic then MethDynamic else MethNormal);
-			cf_expr = None;
-			cf_expr_unoptimized = None;
-			cf_public = is_public (ctx,cctx) f.cff_access parent;
-			cf_params = params;
-			cf_overloads = [];
-		} in
-		cf.cf_meta <- List.map (fun (m,el,p) -> match m,el with
-			| Meta.AstSource,[] -> (m,(match fd.f_expr with None -> [] | Some e -> [e]),p)
-			| _ -> m,el,p
-		) cf.cf_meta;
-		generate_value_meta ctx.com (Some c) cf fd.f_args;
-		check_abstract (ctx,cctx,fctx) c cf fd t ret p;
-		init_meta_overloads ctx (Some c) cf;
-		ctx.curfield <- cf;
-		let r = exc_protect ctx (fun r ->
-			if not !return_partial_type then begin
-				r := (fun() -> t);
-				cctx.context_init();
-				incr stats.s_methods_typed;
-				if ctx.com.verbose then Common.log ctx.com ("Typing " ^ (if ctx.in_macro then "macro " else "") ^ s_type_path c.cl_path ^ "." ^ fst f.cff_name);
-				let fmode = (match cctx.abstract with
-					| Some _ ->
-						(match args with
-						| ("this",_,_) :: _ -> FunMemberAbstract
-						| _ when fst f.cff_name = "_new" -> FunMemberAbstract
-						| _ -> FunStatic)
-					| None ->
-						if fctx.field_kind = FKConstructor then FunConstructor else if fctx.is_static then FunStatic else FunMember
-				) in
-				match ctx.com.platform with
-					| Java when is_java_native_function cf.cf_meta ->
-						if fd.f_expr <> None then
-							ctx.com.warning "@:native function definitions shouldn't include an expression. This behaviour is deprecated." cf.cf_pos;
-						cf.cf_expr <- None;
-						cf.cf_type <- t
-					| _ ->
-						let e , fargs = type_function ctx args ret fmode fd fctx.is_display_field p in
-						let tf = {
-							tf_args = fargs;
-							tf_type = ret;
-							tf_expr = e;
-						} in
-						if fctx.field_kind = FKInit then
-							(match e.eexpr with
-							| TBlock [] | TBlock [{ eexpr = TConst _ }] | TConst _ | TObjectDecl [] -> ()
-							| _ -> c.cl_init <- Some e);
-						cf.cf_expr <- Some (mk (TFunction tf) t p);
-						cf.cf_type <- t;
-						if fctx.is_display_field then Display.DisplayEmitter.maybe_display_field ctx (cf.cf_name_pos) cf;
-			end;
-			t
-		) "type_fun" in
-		if fctx.do_bind then bind_type (ctx,cctx,fctx) cf r (match fd.f_expr with Some e -> snd e | None -> f.cff_pos);
-		cf
-
-	let create_property (ctx,cctx,fctx) c f (get,set,t,eo) p =
-		let name = fst f.cff_name in
-		(match cctx.abstract with
-		| Some a when fctx.is_abstract_member ->
-			ctx.type_params <- a.a_params;
-		| _ -> ());
-		(* TODO is_lib: lazify load_complex_type *)
-		let ret = (match t, eo with
-			| None, None -> error (name ^ ": Property must either define a type or a default value") p;
-			| None, _ -> mk_mono()
-			| Some t, _ -> load_complex_type ctx true p t
-		) in
-		let t_get,t_set = match cctx.abstract with
-			| Some a when fctx.is_abstract_member ->
-				if Meta.has Meta.IsVar f.cff_meta then error (name ^ ": Abstract properties cannot be real variables") f.cff_pos;
-				let ta = apply_params a.a_params (List.map snd a.a_params) a.a_this in
-				tfun [ta] ret, tfun [ta;ret] ret
-			| _ -> tfun [] ret, TFun(["value",false,ret],ret)
-		in
-		let find_accessor m =
-			(* on pf_overload platforms, the getter/setter may have been defined as an overloaded function; get all overloads *)
-			if ctx.com.config.pf_overload then
-				if fctx.is_static then
-					let f = PMap.find m c.cl_statics in
-					(f.cf_type, f) :: (List.map (fun f -> f.cf_type, f) f.cf_overloads)
-				else
-					Overloads.get_overloads c m
-			else
-				[ if fctx.is_static then
-					let f = PMap.find m c.cl_statics in
-					f.cf_type, f
-				else match class_field c (List.map snd c.cl_params) m with
-					| _, t,f -> t,f ]
-		in
-		let check_method m t req_name =
-			if ctx.com.display.dms_error_policy = EPIgnore then () else
-			try
-				let overloads = find_accessor m in
-				(* choose the correct overload if and only if there is more than one overload found *)
-				let rec get_overload overl = match overl with
-					| [tf] -> tf
-					| (t2,f2) :: overl ->
-						if type_iseq t t2 then
-							(t2,f2)
-						else
-							get_overload overl
-					| [] ->
-						if c.cl_interface then
-							raise Not_found
-						else
-							raise (Error (Custom
-								(Printf.sprintf "No overloaded method named %s was compatible with the property %s with expected type %s" m (name) (s_type (print_context()) t)
-							), p))
-				in
-				let t2, f2 = get_overload overloads in
-				(* accessors must be public on As3 (issue #1872) *)
-				if Common.defined ctx.com Define.As3 then f2.cf_meta <- (Meta.Public,[],null_pos) :: f2.cf_meta;
-				(match f2.cf_kind with
-					| Method MethMacro ->
-						display_error ctx (f2.cf_name ^ ": Macro methods cannot be used as property accessor") p;
-						display_error ctx (f2.cf_name ^ ": Accessor method is here") f2.cf_pos;
-					| _ -> ());
-				unify_raise ctx t2 t f2.cf_pos;
-				if (fctx.is_abstract_member && not (Meta.has Meta.Impl f2.cf_meta)) || (Meta.has Meta.Impl f2.cf_meta && not (fctx.is_abstract_member)) then
-					display_error ctx "Mixing abstract implementation and static properties/accessors is not allowed" f2.cf_pos;
-				(match req_name with None -> () | Some n -> display_error ctx ("Please use " ^ n ^ " to name your property access method") f2.cf_pos);
-				f2.cf_meta <- List.fold_left (fun acc ((m,_,_) as meta) -> match m with
-					| Meta.Deprecated -> meta :: acc
-					| _ -> acc
-				) f2.cf_meta f.cff_meta;
-			with
-				| Error (Unify l,p) -> raise (Error (Stack (Custom ("In method " ^ m ^ " required by property " ^ name),Unify l),p))
-				| Not_found ->
-					if req_name <> None then display_error ctx (name ^ ": Custom property accessor is no longer supported, please use get/set") p else
-					if c.cl_interface then begin
-						let cf = mk_field m t p null_pos in
-						cf.cf_meta <- [Meta.CompilerGenerated,[],null_pos];
-						cf.cf_kind <- Method MethNormal;
-						c.cl_fields <- PMap.add cf.cf_name cf c.cl_fields;
-						c.cl_ordered_fields <- cf :: c.cl_ordered_fields;
-					end else if not c.cl_extern then begin
-						try
-							let _, _, f2 = (if not fctx.is_static then let f = PMap.find m c.cl_statics in None, f.cf_type, f else class_field c (List.map snd c.cl_params) m) in
-							display_error ctx (Printf.sprintf "Method %s is no valid accessor for %s because it is %sstatic" m (name) (if fctx.is_static then "not " else "")) f2.cf_pos
-						with Not_found ->
-							display_error ctx ("Method " ^ m ^ " required by property " ^ name ^ " is missing") p
-					end
-		in
-		let display_accessor m p =
-			try
-				let cf = match find_accessor m with [_,cf] -> cf | _ -> raise Not_found in
-				Display.DisplayEmitter.display_field ctx.com.display cf p
-			with Not_found ->
-				()
-		in
-		let delay_check = if c.cl_interface then delay_late ctx PBuildClass else delay ctx PTypeField in
-		let get = (match get with
-			| "null",_ -> AccNo
-			| "dynamic",_ -> AccCall
-			| "never",_ -> AccNever
-			| "default",_ -> AccNormal
-			| get,pget ->
-				let get = if get = "get" then "get_" ^ name else get in
-				if fctx.is_display_field && Display.is_display_position pget then delay ctx PTypeField (fun () -> display_accessor get pget);
-				if not cctx.is_lib then delay_check (fun() -> check_method get t_get (if get <> "get" && get <> "get_" ^ name then Some ("get_" ^ name) else None));
-				AccCall
-		) in
-		let set = (match set with
-			| "null",_ ->
-				(* standard flash library read-only variables can't be accessed for writing, even in subclasses *)
-				if c.cl_extern && (match c.cl_path with "flash" :: _	, _ -> true | _ -> false) && ctx.com.platform = Flash then
-					AccNever
-				else
-					AccNo
-			| "never",_ -> AccNever
-			| "dynamic",_ -> AccCall
-			| "default",_ -> AccNormal
-			| set,pset ->
-				let set = if set = "set" then "set_" ^ name else set in
-				if fctx.is_display_field && Display.is_display_position pset then delay ctx PTypeField (fun () -> display_accessor set pset);
-				if not cctx.is_lib then delay_check (fun() -> check_method set t_set (if set <> "set" && set <> "set_" ^ name then Some ("set_" ^ name) else None));
-				AccCall
-		) in
-		if set = AccNormal && (match get with AccCall -> true | _ -> false) then error (name ^ ": Unsupported property combination") p;
-		let cf = {
-			cf_name = name;
-			cf_doc = f.cff_doc;
-			cf_meta = f.cff_meta;
-			cf_pos = f.cff_pos;
-			cf_name_pos = pos f.cff_name;
-			cf_kind = Var { v_read = get; v_write = set };
-			cf_expr = None;
-			cf_expr_unoptimized = None;
-			cf_type = ret;
-			cf_public = is_public (ctx,cctx) f.cff_access None;
-			cf_params = [];
-			cf_overloads = [];
-		} in
-		ctx.curfield <- cf;
-		bind_var (ctx,cctx,fctx) cf eo;
-		cf
-
-	let init_field (ctx,cctx,fctx) f =
-		let c = cctx.tclass in
-		let name = fst f.cff_name in
-		check_global_metadata ctx f.cff_meta (fun m -> f.cff_meta <- m :: f.cff_meta) c.cl_module.m_path c.cl_path (Some name);
-		let p = f.cff_pos in
-		if name.[0] = '$' then display_error ctx "Field names starting with a dollar are not allowed" p;
-		List.iter (fun acc ->
-			match (acc, f.cff_kind) with
-			| APublic, _ | APrivate, _ | AStatic, _ -> ()
-			| ADynamic, FFun _ | AOverride, FFun _ | AMacro, FFun _ | AInline, FFun _ | AInline, FVar _ -> ()
-			| _, FVar _ -> error ("Invalid accessor '" ^ Ast.s_access acc ^ "' for variable " ^ name) p
-			| _, FProp _ -> error ("Invalid accessor '" ^ Ast.s_access acc ^ "' for property " ^ name) p
-		) f.cff_access;
-		if fctx.is_override then (match c.cl_super with None -> error ("Invalid override on field '" ^ name ^ "': class has no super class") p | _ -> ());
-		match f.cff_kind with
-		| FVar (t,e) ->
-			create_variable (ctx,cctx,fctx) c f t e p
-		| FFun fd ->
-			create_method (ctx,cctx,fctx) c f fd p
-		| FProp (get,set,t,eo) ->
-			create_property (ctx,cctx,fctx) c f (get,set,t,eo) p
-
-	let check_overloads ctx c =
-		(* check if field with same signature was declared more than once *)
-		List.iter (fun f ->
-			if Meta.has Meta.Overload f.cf_meta then
-				List.iter (fun f2 ->
-					try
-						ignore (List.find (fun f3 -> f3 != f2 && Overloads.same_overload_args f2.cf_type f3.cf_type f2 f3) (f :: f.cf_overloads));
-						display_error ctx ("Another overloaded field of same signature was already declared : " ^ f2.cf_name) f2.cf_pos
-					with | Not_found -> ()
-			) (f :: f.cf_overloads)) (c.cl_ordered_fields @ c.cl_ordered_statics)
-
-	let init_class ctx c p context_init herits fields =
-		let ctx,cctx = create_class_context ctx c context_init p in
-		if cctx.is_class_debug then print_endline ("Created class context: " ^ dump_class_context cctx);
-		let fields = patch_class ctx c fields in
-		let fields = build_fields (ctx,cctx) c fields in
-		if cctx.is_core_api && ctx.com.display.dms_check_core_api then delay ctx PForce (fun() -> init_core_api ctx c);
-		if not cctx.is_lib then begin
-			(match c.cl_super with None -> () | Some _ -> delay_late ctx PForce (fun() -> check_overriding ctx c));
-			if ctx.com.config.pf_overload then delay ctx PForce (fun() -> check_overloads ctx c)
-		end;
-		let rec has_field f = function
-			| None -> false
-			| Some (c,_) ->
-				PMap.exists f c.cl_fields || has_field f c.cl_super || List.exists (fun i -> has_field f (Some i)) c.cl_implements
-		in
-		let rec check_require = function
-			| [] -> None
-			| (Meta.Require,conds,_) :: l ->
-				let rec loop = function
-					| [] -> check_require l
-					| e :: l ->
-						let sc = match fst e with
-							| EConst (Ident s) -> s
-							| EBinop ((OpEq|OpNotEq|OpGt|OpGte|OpLt|OpLte) as op,(EConst (Ident s),_),(EConst ((Int _ | Float _ | String _) as c),_)) -> s ^ s_binop op ^ s_constant c
-							| _ -> ""
-						in
-						if not (Parser.is_true (Parser.eval ctx.com e)) then
-							Some (sc,(match List.rev l with (EConst (String msg),_) :: _ -> Some msg | _ -> None))
-						else
-							loop l
-				in
-				loop conds
-			| _ :: l ->
-				check_require l
-		in
-		let rec check_if_feature = function
-			| [] -> []
-			| (Meta.IfFeature,el,_) :: _ -> List.map (fun (e,p) -> match e with EConst (String s) -> s | _ -> error "String expected" p) el
-			| _ :: l -> check_if_feature l
-		in
-		let cl_if_feature = check_if_feature c.cl_meta in
-		let cl_req = check_require c.cl_meta in
-		List.iter (fun f ->
-			let p = f.cff_pos in
-			try
-				let ctx,fctx = create_field_context (ctx,cctx) c f in
-				if fctx.is_field_debug then print_endline ("Created field context: " ^ dump_field_context fctx);
-				let cf = init_field (ctx,cctx,fctx) f in
-				if fctx.is_field_debug then print_endline ("Created field: " ^ Printer.s_tclass_field "" cf);
-				if fctx.is_static && c.cl_interface && fctx.field_kind <> FKInit && not cctx.is_lib then error "You can't declare static fields in interfaces" p;
-				let set_feature s =
-					ctx.m.curmod.m_extra.m_if_feature <- (s,(c,cf,fctx.is_static)) :: ctx.m.curmod.m_extra.m_if_feature
-				in
-				List.iter set_feature cl_if_feature;
-				List.iter set_feature (check_if_feature cf.cf_meta);
-				let req = check_require f.cff_meta in
-				let req = (match req with None -> if fctx.is_static || fctx.field_kind = FKConstructor then cl_req else None | _ -> req) in
-				(match req with
-				| None -> ()
-				| Some r -> cf.cf_kind <- Var { v_read = AccRequire (fst r, snd r); v_write = AccRequire (fst r, snd r) });
-				begin match fctx.field_kind with
-				| FKConstructor ->
-					begin match c.cl_constructor with
-					| None ->
-							c.cl_constructor <- Some cf
-					| Some ctor when ctx.com.config.pf_overload ->
-							if Meta.has Meta.Overload cf.cf_meta && Meta.has Meta.Overload ctor.cf_meta then
-								ctor.cf_overloads <- cf :: ctor.cf_overloads
-							else
-								display_error ctx ("If using overloaded constructors, all constructors must be declared with @:overload") (if Meta.has Meta.Overload cf.cf_meta then ctor.cf_pos else cf.cf_pos)
-					| Some ctor ->
-								display_error ctx "Duplicate constructor" p
-					end
-				| FKInit ->
-					()
-				| FKNormal ->
-					let dup = if fctx.is_static then PMap.exists cf.cf_name c.cl_fields || has_field cf.cf_name c.cl_super else PMap.exists cf.cf_name c.cl_statics in
-					if not cctx.is_native && not c.cl_extern && dup then error ("Same field name can't be use for both static and instance : " ^ cf.cf_name) p;
-					if List.mem AOverride f.cff_access then c.cl_overrides <- cf :: c.cl_overrides;
-					let is_var f = match cf.cf_kind with | Var _ -> true | _ -> false in
-					if PMap.mem cf.cf_name (if fctx.is_static then c.cl_statics else c.cl_fields) then
-						if ctx.com.config.pf_overload && Meta.has Meta.Overload cf.cf_meta && not (is_var f) then
-							let mainf = PMap.find cf.cf_name (if fctx.is_static then c.cl_statics else c.cl_fields) in
-							if is_var mainf then display_error ctx "Cannot declare a variable with same name as a method" mainf.cf_pos;
-							(if not (Meta.has Meta.Overload mainf.cf_meta) then display_error ctx ("Overloaded methods must have @:overload metadata") mainf.cf_pos);
-							mainf.cf_overloads <- cf :: mainf.cf_overloads
-						else
-							display_error ctx ("Duplicate class field declaration : " ^ cf.cf_name) p
-					else
-					if fctx.do_add then add_field c cf (fctx.is_static || fctx.is_macro && ctx.in_macro)
-				end
-			with Error (Custom str,p2) when p = p2 ->
-				display_error ctx str p
-		) fields;
-		(match cctx.abstract with
-		| Some a ->
-			a.a_to_field <- List.rev a.a_to_field;
-			a.a_from_field <- List.rev a.a_from_field;
-			a.a_ops <- List.rev a.a_ops;
-			a.a_unops <- List.rev a.a_unops;
-			a.a_array <- List.rev a.a_array;
-		| None -> ());
-		c.cl_ordered_statics <- List.rev c.cl_ordered_statics;
-		c.cl_ordered_fields <- List.rev c.cl_ordered_fields;
-		(*
-			make sure a default contructor with same access as super one will be added to the class structure at some point.
-		*)
-		if Meta.has Meta.StructInit c.cl_meta then 
-			check_struct_init_constructor ctx c p
-		else
-			(* add_constructor does not deal with overloads correctly *)
-			if not ctx.com.config.pf_overload then add_constructor ctx c cctx.force_constructor p;
-		(* check overloaded constructors *)
-		(if ctx.com.config.pf_overload && not cctx.is_lib then match c.cl_constructor with
-		| Some ctor ->
-			delay ctx PTypeField (fun() ->
-				List.iter (fun f ->
-					try
-						(* TODO: consider making a broader check, and treat some types, like TAnon and type parameters as Dynamic *)
-						ignore(List.find (fun f2 -> f != f2 && Overloads.same_overload_args f.cf_type f2.cf_type f f2) (ctor :: ctor.cf_overloads));
-						display_error ctx ("Another overloaded field of same signature was already declared : " ^ f.cf_name) f.cf_pos;
-					with Not_found -> ()
-				) (ctor :: ctor.cf_overloads)
-			)
-		| _ -> ());
-		(* push delays in reverse order so they will be run in correct order *)
-		List.iter (fun (ctx,r) ->
-			init_class_done ctx;
-			(match r with
-			| None -> ()
-			| Some r -> delay ctx PTypeField (fun() -> ignore((!r)())))
-		) cctx.delayed_expr
-end
-
-let check_module_types ctx m p t =
-	let t = t_infos t in
-	try
-		let m2 = Hashtbl.find ctx.g.types_module t.mt_path in
-		if m.m_path <> m2 && String.lowercase (s_type_path m2) = String.lowercase (s_type_path m.m_path) then error ("Module " ^ s_type_path m2 ^ " is loaded with a different case than " ^ s_type_path m.m_path) p;
-		error ("Type name " ^ s_type_path t.mt_path ^ " is redefined from module " ^ s_type_path m2) p
-	with
-		Not_found ->
-			Hashtbl.add ctx.g.types_module t.mt_path m.m_path
-
-let add_module ctx m p =
-	List.iter (check_module_types ctx m p) m.m_types;
-	Hashtbl.add ctx.g.modules m.m_path m
-
-let handle_path_display ctx path p =
-	let open Display.ImportHandling in
-	match Display.ImportHandling.convert_import_to_something_usable !Parser.resume_display path,ctx.com.display.dms_kind with
-		| (IDKPackage sl,_),_ ->
-			raise (Parser.TypePath(sl,None,true))
-		| (IDKModule(sl,s),_),DMPosition ->
-			(* We assume that we want to go to the module file, not a specific type
-			   which might not even exist anyway. *)
-			let mt = ctx.g.do_load_module ctx (sl,s) p in
-			let p = { pfile = mt.m_extra.m_file; pmin = 0; pmax = 0} in
-			raise (Display.DisplayPosition [p])
-		| (IDKModule(sl,s),_),_ ->
-			(* TODO: wait till nadako requests @type display for these, then implement it somehow *)
-			raise (Parser.TypePath(sl,Some(s,false),true))
-		| (IDKSubType(sl,sm,st),p),DMPosition ->
-			resolve_position_by_path ctx { tpackage = sl; tname = sm; tparams = []; tsub = Some st} p
-		| (IDKSubType(sl,sm,st),_),_ ->
-			raise (Parser.TypePath(sl @ [sm],Some(st,false),true))
-		| ((IDKSubTypeField(sl,sm,st,sf) | IDKModuleField(sl,(sm as st),sf)),p),_ ->
-			let m = ctx.g.do_load_module ctx (sl,sm) p in
-			List.iter (fun t -> match t with
-				| TClassDecl c when snd c.cl_path = st ->
-					ignore(c.cl_build());
-					let cf = PMap.find sf c.cl_statics in
-					Display.DisplayEmitter.display_field ctx.com.display cf p
-				| _ ->
-					()
-			) m.m_types;
-		| (IDK,_),_ ->
-			()
-
-(*
-	In this pass, we can access load and access other modules types, but we cannot follow them or access their structure
-	since they have not been setup. We also build a context_init list that will be evaluated the first time we evaluate
-	an expression into the context
-*)
-let init_module_type ctx context_init do_init (decl,p) =
-	let get_type name =
-		try List.find (fun t -> snd (t_infos t).mt_path = name) ctx.m.curmod.m_types with Not_found -> assert false
-	in
-	let check_path_display path p = match ctx.com.display.dms_kind with
-		(* We cannot use ctx.is_display_file because the import could come from an import.hx file. *)
-		| DMDiagnostics b when (b && not (ExtString.String.ends_with p.pfile "import.hx")) || Display.is_display_file p.pfile ->
-			Display.ImportHandling.add_import_position ctx.com p path;
-		| DMStatistics | DMUsage _ ->
-			Display.ImportHandling.add_import_position ctx.com p path;
-		| _ ->
-			if Display.is_display_file p.pfile then handle_path_display ctx path p
-	in
-	match decl with
-	| EImport (path,mode) ->
-		ctx.m.module_imports <- (path,mode) :: ctx.m.module_imports;
-		check_path_display path p;
-		let rec loop acc = function
-			| x :: l when is_lower_ident (fst x) -> loop (x::acc) l
-			| rest -> List.rev acc, rest
-		in
-		let pack, rest = loop [] path in
-		(match rest with
-		| [] ->
-			(match mode with
-			| IAll ->
-				ctx.m.wildcard_packages <- (List.map fst pack,p) :: ctx.m.wildcard_packages
-			| _ ->
-				(match List.rev path with
-				| [] -> raise (Display.DisplayToplevel (Display.ToplevelCollector.run ctx true));
-				| (_,p) :: _ -> error "Module name must start with an uppercase letter" p))
-		| (tname,p2) :: rest ->
-			let p1 = (match pack with [] -> p2 | (_,p1) :: _ -> p1) in
-			let p_type = punion p1 p2 in
-			let md = ctx.g.do_load_module ctx (List.map fst pack,tname) p_type in
-			let types = md.m_types in
-			let no_private (t,_) = not (t_infos t).mt_private in
-			let chk_private t p = if (t_infos t).mt_private then error "You can't import a private type" p in
-			let has_name name t = snd (t_infos t).mt_path = name in
-			let get_type tname =
-				let t = (try List.find (has_name tname) types with Not_found -> error (StringError.string_error tname (List.map (fun mt -> snd (t_infos mt).mt_path) types) ("Module " ^ s_type_path md.m_path ^ " does not define type " ^ tname)) p_type) in
-				chk_private t p_type;
-				t
-			in
-			let rebind t name =
-				if not (name.[0] >= 'A' && name.[0] <= 'Z') then
-					error "Type aliases must start with an uppercase letter" p;
-				let _, _, f = ctx.g.do_build_instance ctx t p_type in
-				(* create a temp private typedef, does not register it in module *)
-				TTypeDecl {
-					t_path = (fst md.m_path @ ["_" ^ snd md.m_path],name);
-					t_module = md;
-					t_pos = p;
-					t_name_pos = null_pos;
-					t_private = true;
-					t_doc = None;
-					t_meta = [];
-					t_params = (t_infos t).mt_params;
-					t_type = f (List.map snd (t_infos t).mt_params);
-				}
-			in
-			let add_static_init t name s =
-				let name = (match name with None -> s | Some n -> n) in
-				match resolve_typedef t with
-				| TClassDecl c ->
-					ignore(c.cl_build());
-					ignore(PMap.find s c.cl_statics);
-					ctx.m.module_globals <- PMap.add name (TClassDecl c,s,p) ctx.m.module_globals
-				| TEnumDecl e ->
-					ignore(PMap.find s e.e_constrs);
-					ctx.m.module_globals <- PMap.add name (TEnumDecl e,s,p) ctx.m.module_globals
-				| _ ->
-					raise Not_found
-			in
-			(match mode with
-			| INormal | IAsName _ ->
-				let name = (match mode with IAsName n -> Some n | _ -> None) in
-				(match rest with
-				| [] ->
-					(match name with
-					| None ->
-						ctx.m.module_types <- List.filter no_private (List.map (fun t -> t,p) types) @ ctx.m.module_types
-					| Some newname ->
-						ctx.m.module_types <- (rebind (get_type tname) newname,p) :: ctx.m.module_types);
-				| [tsub,p2] ->
-					let pu = punion p1 p2 in
-					(try
-						let tsub = List.find (has_name tsub) types in
-						chk_private tsub pu;
-						ctx.m.module_types <- ((match name with None -> tsub | Some n -> rebind tsub n),p) :: ctx.m.module_types
-					with Not_found ->
-						(* this might be a static property, wait later to check *)
-						let tmain = get_type tname in
-						context_init := (fun() ->
-							try
-								add_static_init tmain name tsub
-							with Not_found ->
-								error (s_type_path (t_infos tmain).mt_path ^ " has no field or subtype " ^ tsub) p
-						) :: !context_init)
-				| (tsub,p2) :: (fname,p3) :: rest ->
-					(match rest with
-					| [] -> ()
-					| (n,p) :: _ -> error ("Unexpected " ^ n) p);
-					let tsub = get_type tsub in
-					context_init := (fun() ->
-						try
-							add_static_init tsub name fname
-						with Not_found ->
-							error (s_type_path (t_infos tsub).mt_path ^ " has no field " ^ fname) (punion p p3)
-					) :: !context_init;
-				)
-			| IAll ->
-				let t = (match rest with
-					| [] -> get_type tname
-					| [tsub,_] -> get_type tsub
-					| _ :: (n,p) :: _ -> error ("Unexpected " ^ n) p
-				) in
-				context_init := (fun() ->
-					match resolve_typedef t with
-					| TClassDecl c
-					| TAbstractDecl {a_impl = Some c} ->
-						ignore(c.cl_build());
-						PMap.iter (fun _ cf -> if not (has_meta Meta.NoImportGlobal cf.cf_meta) then ctx.m.module_globals <- PMap.add cf.cf_name (TClassDecl c,cf.cf_name,p) ctx.m.module_globals) c.cl_statics
-					| TEnumDecl e ->
-						PMap.iter (fun _ c -> if not (has_meta Meta.NoImportGlobal c.ef_meta) then ctx.m.module_globals <- PMap.add c.ef_name (TEnumDecl e,c.ef_name,p) ctx.m.module_globals) e.e_constrs
-					| _ ->
-						error "No statics to import from this type" p
-				) :: !context_init
-			))
-	| EUsing path ->
-		check_path_display path p;
-		let t = match List.rev path with
-			| (s1,_) :: (s2,_) :: sl ->
-				if is_lower_ident s2 then { tpackage = (List.rev (s2 :: List.map fst sl)); tname = s1; tsub = None; tparams = [] }
-				else { tpackage = List.rev (List.map fst sl); tname = s2; tsub = Some s1; tparams = [] }
-			| (s1,_) :: sl ->
-				{ tpackage = List.rev (List.map fst sl); tname = s1; tsub = None; tparams = [] }
-			| [] ->
-				raise (Display.DisplayToplevel (Display.ToplevelCollector.run ctx true));
-		in
-		(* do the import first *)
-		let types = (match t.tsub with
-			| None ->
-				let md = ctx.g.do_load_module ctx (t.tpackage,t.tname) p in
-				let types = List.filter (fun t -> not (t_infos t).mt_private) md.m_types in
-				ctx.m.module_types <- (List.map (fun t -> t,p) types) @ ctx.m.module_types;
-				types
-			| Some _ ->
-				let t = load_type_def ctx p t in
-				ctx.m.module_types <- (t,p) :: ctx.m.module_types;
-				[t]
-		) in
-		(* delay the using since we need to resolve typedefs *)
-		let filter_classes types =
-			let rec loop acc types = match types with
-				| td :: l ->
-					(match resolve_typedef td with
-					| TClassDecl c | TAbstractDecl({a_impl = Some c}) ->
-						loop ((c,p) :: acc) l
-					| td ->
-						loop acc l)
-				| [] ->
-					acc
-			in
-			loop [] types
-		in
-		context_init := (fun() -> ctx.m.module_using <- filter_classes types @ ctx.m.module_using) :: !context_init
-	| EClass d ->
-		let c = (match get_type (fst d.d_name) with TClassDecl c -> c | _ -> assert false) in
-		if ctx.is_display_file && Display.is_display_position (pos d.d_name) then
-			Display.DisplayEmitter.display_module_type ctx.com.display (match c.cl_kind with KAbstractImpl a -> TAbstractDecl a | _ -> TClassDecl c) (pos d.d_name);
-		check_global_metadata ctx c.cl_meta (fun m -> c.cl_meta <- m :: c.cl_meta) c.cl_module.m_path c.cl_path None;
-		let herits = d.d_flags in
-		c.cl_extern <- List.mem HExtern herits;
-		c.cl_interface <- List.mem HInterface herits;
-		let build() =
-			let fl = Inheritance.set_heritance ctx c herits p in
-			let rec build() =
-				c.cl_build <- (fun()-> Building);
-				try
-					List.iter (fun f -> f()) fl;
-					ClassInitializer.init_class ctx c p do_init d.d_flags d.d_data;
-					c.cl_build <- (fun()-> Built);
-					List.iter (fun (_,t) -> ignore(follow t)) c.cl_params;
-					Built;
-				with Build_canceled state ->
-					c.cl_build <- make_pass ctx build;
-					let rebuild() =
-						delay_late ctx PBuildClass (fun() -> ignore(c.cl_build()));
-					in
-					(match state with
-					| Built -> assert false
-					| Building -> rebuild()
-					| BuildMacro f -> f := rebuild :: !f);
-					state
-				| exn ->
-					c.cl_build <- (fun()-> Built);
-					raise exn
-			in
-			build()
-		in
-		ctx.pass <- PBuildClass;
-		ctx.curclass <- c;
-		c.cl_build <- make_pass ctx build;
-		ctx.pass <- PBuildModule;
-		ctx.curclass <- null_class;
-		delay ctx PBuildClass (fun() -> ignore(c.cl_build()));
-		if (ctx.com.platform = Java || ctx.com.platform = Cs) && not c.cl_extern then
-			delay ctx PTypeField (fun () ->
-				let metas = check_strict_meta ctx c.cl_meta in
-				if metas <> [] then c.cl_meta <- metas @ c.cl_meta;
-				let rec run_field cf =
-					let metas = check_strict_meta ctx cf.cf_meta in
-					if metas <> [] then cf.cf_meta <- metas @ cf.cf_meta;
-					List.iter run_field cf.cf_overloads
-				in
-				List.iter run_field c.cl_ordered_statics;
-				List.iter run_field c.cl_ordered_fields;
-				match c.cl_constructor with
-					| Some f -> run_field f
-					| _ -> ()
-			);
-	| EEnum d ->
-		let e = (match get_type (fst d.d_name) with TEnumDecl e -> e | _ -> assert false) in
-		if ctx.is_display_file && Display.is_display_position (pos d.d_name) then
-			Display.DisplayEmitter.display_module_type ctx.com.display (TEnumDecl e) (pos d.d_name);
-		let ctx = { ctx with type_params = e.e_params } in
-		let h = (try Some (Hashtbl.find ctx.g.type_patches e.e_path) with Not_found -> None) in
-		check_global_metadata ctx e.e_meta (fun m -> e.e_meta <- m :: e.e_meta) e.e_module.m_path e.e_path None;
-		(match h with
-		| None -> ()
-		| Some (h,hcl) ->
-			Hashtbl.iter (fun _ _ -> error "Field type patch not supported for enums" e.e_pos) h;
-			e.e_meta <- e.e_meta @ hcl.tp_meta);
-		let constructs = ref d.d_data in
-		let get_constructs() =
-			List.map (fun c ->
-				{
-					cff_name = c.ec_name;
-					cff_doc = c.ec_doc;
-					cff_meta = c.ec_meta;
-					cff_pos = c.ec_pos;
-					cff_access = [];
-					cff_kind = (match c.ec_args, c.ec_params with
-						| [], [] -> FVar (c.ec_type,None)
-						| _ -> FFun { f_params = c.ec_params; f_type = c.ec_type; f_expr = None; f_args = List.map (fun (n,o,t) -> (n,null_pos),o,[],Some t,None) c.ec_args });
-				}
-			) (!constructs)
-		in
-		let init () = List.iter (fun f -> f()) !context_init in
-		build_module_def ctx (TEnumDecl e) e.e_meta get_constructs init (fun (e,p) ->
-			match e with
-			| EVars [_,Some (CTAnonymous fields,p),None] ->
-				constructs := List.map (fun f ->
-					let args, params, t = (match f.cff_kind with
-					| FVar (t,None) -> [], [], t
-					| FFun { f_params = pl; f_type = t; f_expr = (None|Some (EBlock [],_)); f_args = al } ->
-						let al = List.map (fun ((n,_),o,_,t,_) -> match t with None -> error "Missing function parameter type" f.cff_pos | Some t -> n,o,t) al in
-						al, pl, t
-					| _ ->
-						error "Invalid enum constructor in @:build result" p
-					) in
-					{
-						ec_name = f.cff_name;
-						ec_doc = f.cff_doc;
-						ec_meta = f.cff_meta;
-						ec_pos = f.cff_pos;
-						ec_args = args;
-						ec_params = params;
-						ec_type = t;
-					}
-				) fields
-			| _ -> error "Enum build macro must return a single variable with anonymous object fields" p
-		);
-		let et = TEnum (e,List.map snd e.e_params) in
-		let names = ref [] in
-		let index = ref 0 in
-		let is_flat = ref true in
-		let fields = ref PMap.empty in
-		List.iter (fun c ->
-			let p = c.ec_pos in
-			let params = ref [] in
-			params := type_type_params ~enum_constructor:true ctx ([],fst c.ec_name) (fun() -> !params) c.ec_pos c.ec_params;
-			let params = !params in
-			let ctx = { ctx with type_params = params @ ctx.type_params } in
-			let rt = (match c.ec_type with
-				| None -> et
-				| Some t ->
-					let t = load_complex_type ctx true p t in
-					(match follow t with
-					| TEnum (te,_) when te == e ->
-						()
-					| _ ->
-						error "Explicit enum type must be of the same enum type" p);
-					t
-			) in
-			let t = (match c.ec_args with
-				| [] -> rt
-				| l ->
-					is_flat := false;
-					let pnames = ref PMap.empty in
-					TFun (List.map (fun (s,opt,(t,tp)) ->
-						(match t with CTPath({tpackage=[];tname="Void"}) -> error "Arguments of type Void are not allowed in enum constructors" c.ec_pos | _ -> ());
-						if PMap.mem s (!pnames) then error ("Duplicate parameter '" ^ s ^ "' in enum constructor " ^ fst c.ec_name) p;
-						pnames := PMap.add s () (!pnames);
-						s, opt, load_type_hint ~opt ctx p (Some (t,tp))
-					) l, rt)
-			) in
-			if PMap.mem (fst c.ec_name) e.e_constrs then error ("Duplicate constructor " ^ fst c.ec_name) p;
-			let f = {
-				ef_name = fst c.ec_name;
-				ef_type = t;
-				ef_pos = p;
-				ef_name_pos = snd c.ec_name;
-				ef_doc = c.ec_doc;
-				ef_index = !index;
-				ef_params = params;
-				ef_meta = c.ec_meta;
-			} in
-			let cf = {
-				cf_name = f.ef_name;
-				cf_public = true;
-				cf_type = f.ef_type;
-				cf_kind = (match follow f.ef_type with
-					| TFun _ -> Method MethNormal
-					| _ -> Var { v_read = AccNormal; v_write = AccNo }
-				);
-				cf_pos = p;
-				cf_name_pos = f.ef_name_pos;
-				cf_doc = f.ef_doc;
-				cf_meta = no_meta;
-				cf_expr = None;
-				cf_expr_unoptimized = None;
-				cf_params = f.ef_params;
-				cf_overloads = [];
-			} in
- 			if ctx.is_display_file && Display.is_display_position p then
- 				Display.DisplayEmitter.display_enum_field ctx.com.display f p;
-			e.e_constrs <- PMap.add f.ef_name f e.e_constrs;
-			fields := PMap.add cf.cf_name cf !fields;
-			incr index;
-			names := (fst c.ec_name) :: !names;
-		) (!constructs);
-		e.e_names <- List.rev !names;
-		e.e_extern <- e.e_extern;
-		e.e_type.t_params <- e.e_params;
-		e.e_type.t_type <- TAnon {
-			a_fields = !fields;
-			a_status = ref (EnumStatics e);
-		};
-		if !is_flat then e.e_meta <- (Meta.FlatEnum,[],null_pos) :: e.e_meta;
-
-		if (ctx.com.platform = Java || ctx.com.platform = Cs) && not e.e_extern then
-			delay ctx PTypeField (fun () ->
-				let metas = check_strict_meta ctx e.e_meta in
-				e.e_meta <- metas @ e.e_meta;
-				PMap.iter (fun _ ef ->
-					let metas = check_strict_meta ctx ef.ef_meta in
-					if metas <> [] then ef.ef_meta <- metas @ ef.ef_meta
-				) e.e_constrs
-			);
-	| ETypedef d ->
-		let t = (match get_type (fst d.d_name) with TTypeDecl t -> t | _ -> assert false) in
-		if ctx.is_display_file && Display.is_display_position (pos d.d_name) then
-			Display.DisplayEmitter.display_module_type ctx.com.display (TTypeDecl t) (pos d.d_name);
-		check_global_metadata ctx t.t_meta (fun m -> t.t_meta <- m :: t.t_meta) t.t_module.m_path t.t_path None;
-		let ctx = { ctx with type_params = t.t_params } in
-		let tt = load_complex_type ctx true p d.d_data in
-		let tt = (match fst d.d_data with
-		| CTExtend _ -> tt
-		| CTPath { tpackage = ["haxe";"macro"]; tname = "MacroType" } ->
-			(* we need to follow MacroType immediately since it might define other module types that we will load afterwards *)
-			if t.t_type == follow tt then error "Recursive typedef is not allowed" p;
-			tt
-		| _ ->
-			if (Meta.has Meta.Eager d.d_meta) then
-				follow tt
-			else begin
-				let f r =
-					if t.t_type == follow tt then error "Recursive typedef is not allowed" p;
-					r := (fun() -> tt);
-					tt
-				in
-				let r = exc_protect ctx f "typedef_rec_check" in
-				delay ctx PForce (fun () -> ignore(!r()));
-				TLazy r
-			end
-		) in
-		(match t.t_type with
-		| TMono r ->
-			(match !r with
-			| None -> r := Some tt;
-			| Some _ -> assert false);
-		| _ -> assert false);
-		if ctx.com.platform = Cs && t.t_meta <> [] then
-			delay ctx PTypeField (fun () ->
-				let metas = check_strict_meta ctx t.t_meta in
-				if metas <> [] then t.t_meta <- metas @ t.t_meta;
-			);
-	| EAbstract d ->
-		let a = (match get_type (fst d.d_name) with TAbstractDecl a -> a | _ -> assert false) in
-		if ctx.is_display_file && Display.is_display_position (pos d.d_name) then
-			Display.DisplayEmitter.display_module_type ctx.com.display (TAbstractDecl a) (pos d.d_name);
-		check_global_metadata ctx a.a_meta (fun m -> a.a_meta <- m :: a.a_meta) a.a_module.m_path a.a_path None;
-		let ctx = { ctx with type_params = a.a_params } in
-		let is_type = ref false in
-		let load_type t from =
-			let t = load_complex_type ctx true p t in
-			let t = if not (Meta.has Meta.CoreType a.a_meta) then begin
-				if !is_type then begin
-					let r = exc_protect ctx (fun r ->
-						r := (fun() -> t);
-						let at = monomorphs a.a_params a.a_this in
-						(try (if from then Type.unify t at else Type.unify at t) with Unify_error _ -> error "You can only declare from/to with compatible types" p);
-						t
-					) "constraint" in
-					delay ctx PForce (fun () -> ignore(!r()));
-					TLazy r
-				end else
-					error "Missing underlying type declaration or @:coreType declaration" p;
-			end else begin
-				if Meta.has Meta.Callable a.a_meta then
-					error "@:coreType abstracts cannot be @:callable" p;
-				t
-			end in
-			t
-		in
-		List.iter (function
-			| AFromType t -> a.a_from <- (load_type t true) :: a.a_from
-			| AToType t -> a.a_to <- (load_type t false) :: a.a_to
-			| AIsType t ->
-				if a.a_impl = None then error "Abstracts with underlying type must have an implementation" a.a_pos;
-				if Meta.has Meta.CoreType a.a_meta then error "@:coreType abstracts cannot have an underlying type" p;
-				let at = load_complex_type ctx true p t in
-				delay ctx PForce (fun () ->
-					begin match follow at with
-						| TAbstract(a2,_) when a == a2 -> error "Abstract underlying type cannot be recursive" a.a_pos
-						| _ -> ()
-					end;
-				);
-				a.a_this <- at;
-				is_type := true;
-			| AExtern ->
-				(match a.a_impl with Some c -> c.cl_extern <- true | None -> (* Hmmmm.... *) ())
-			| APrivAbstract -> ()
-		) d.d_flags;
-		if not !is_type then begin
-			if Meta.has Meta.CoreType a.a_meta then
-				a.a_this <- TAbstract(a,List.map snd a.a_params)
-			else
-				error "Abstract is missing underlying type declaration" a.a_pos
-		end
-
-let module_pass_2 ctx m decls tdecls p =
-	(* here is an additional PASS 1 phase, which define the type parameters for all module types.
-		 Constraints are handled lazily (no other type is loaded) because they might be recursive anyway *)
-	List.iter (fun d ->
-		match d with
-		| (TClassDecl c, (EClass d, p)) ->
-			c.cl_params <- type_type_params ctx c.cl_path (fun() -> c.cl_params) p d.d_params;
-			if Meta.has Meta.Generic c.cl_meta && c.cl_params <> [] then c.cl_kind <- KGeneric;
-			if Meta.has Meta.GenericBuild c.cl_meta then begin
-				if ctx.in_macro then error "@:genericBuild cannot be used in macros" c.cl_pos;
-				c.cl_kind <- KGenericBuild d.d_data;
-			end;
-			if c.cl_path = (["haxe";"macro"],"MacroType") then c.cl_kind <- KMacroType;
-		| (TEnumDecl e, (EEnum d, p)) ->
-			e.e_params <- type_type_params ctx e.e_path (fun() -> e.e_params) p d.d_params;
-		| (TTypeDecl t, (ETypedef d, p)) ->
-			t.t_params <- type_type_params ctx t.t_path (fun() -> t.t_params) p d.d_params;
-		| (TAbstractDecl a, (EAbstract d, p)) ->
-			a.a_params <- type_type_params ctx a.a_path (fun() -> a.a_params) p d.d_params;
-		| _ ->
-			assert false
-	) decls;
-	(* setup module types *)
-	let context_init = ref [] in
-	let do_init() =
-		match !context_init with
-		| [] -> ()
-		| l -> context_init := []; List.iter (fun f -> f()) (List.rev l)
-	in
-	List.iter (init_module_type ctx context_init do_init) tdecls
-
-(*
-	Creates a module context for [m] and types [tdecls] using it.
-*)
-let type_types_into_module ctx m tdecls p =
-	let decls, tdecls = module_pass_1 ctx m tdecls p in
-	let types = List.map fst decls in
-	List.iter (check_module_types ctx m p) types;
-	m.m_types <- m.m_types @ types;
-	(* define the per-module context for the next pass *)
-	let ctx = {
-		com = ctx.com;
-		g = ctx.g;
-		t = ctx.t;
-		m = {
-			curmod = m;
-			module_types = List.map (fun t -> t,null_pos) ctx.g.std.m_types;
-			module_using = [];
-			module_globals = PMap.empty;
-			wildcard_packages = [];
-			module_imports = [];
-		};
-		is_display_file = (ctx.com.display.dms_display && Display.is_display_file m.m_extra.m_file);
-		meta = [];
-		this_stack = [];
-		with_type_stack = [];
-		call_argument_stack = [];
-		pass = PBuildModule;
-		on_error = (fun ctx msg p -> ctx.com.error msg p);
-		macro_depth = ctx.macro_depth;
-		curclass = null_class;
-		curfield = null_field;
-		tthis = ctx.tthis;
-		ret = ctx.ret;
-		locals = PMap.empty;
-		type_params = [];
-		curfun = FunStatic;
-		untyped = false;
-		in_macro = ctx.in_macro;
-		in_display = false;
-		in_loop = false;
-		opened = [];
-		in_call_args = false;
-		vthis = None;
-	} in
-	if ctx.g.std != null_module then begin
-		add_dependency m ctx.g.std;
-		(* this will ensure both String and (indirectly) Array which are basic types which might be referenced *)
-		ignore(load_core_type ctx "String");
-	end;
-	module_pass_2 ctx m decls tdecls p;
-	ctx
-
-let handle_import_hx ctx m decls p =
-	let path_split = List.tl (List.rev (Path.get_path_parts m.m_extra.m_file)) in
-	let join l = String.concat Path.path_sep (List.rev ("import.hx" :: l)) in
-	let rec loop path pack = match path,pack with
-		| _,[] -> [join path]
-		| (p :: path),(_ :: pack) -> (join (p :: path)) :: (loop path pack)
-		| _ -> []
-	in
-	let candidates = loop path_split (fst m.m_path) in
-	let make_import_module path r =
-		Hashtbl.replace ctx.com.parser_cache path r;
-		(* We use the file path as module name to make it unique. This may or may not be a good idea... *)
-		let m_import = make_module ctx ([],path) path p in
-		m_import.m_extra.m_kind <- MImport;
-		add_module ctx m_import p;
-		m_import
-	in
-	List.fold_left (fun acc path ->
-		let decls = try
-			let r = Hashtbl.find ctx.com.parser_cache path in
-			let mimport = Hashtbl.find ctx.g.modules ([],path) in
-			if mimport.m_extra.m_kind <> MFake then add_dependency m mimport;
-			r
-		with Not_found ->
-			if Sys.file_exists path then begin
-				let _,r = parse_file ctx.com path p in
-				List.iter (fun (d,p) -> match d with EImport _ | EUsing _ -> () | _ -> error "Only import and using is allowed in import.hx files" p) r;
-				add_dependency m (make_import_module path r);
-				r
-			end else begin
-				let r = [] in
-				(* Add empty decls so we don't check the file system all the time. *)
-				(make_import_module path r).m_extra.m_kind <- MFake;
-				r
-			end
-		in
-		decls @ acc
-	) decls candidates
-
-(*
-	Creates a new module and types [tdecls] into it.
-*)
-let type_module ctx mpath file ?(is_extern=false) tdecls p =
-	let m = make_module ctx mpath file p in
-	Hashtbl.add ctx.g.modules m.m_path m;
-	let tdecls = handle_import_hx ctx m tdecls p in
-	let ctx = type_types_into_module ctx m tdecls p in
-	if is_extern then m.m_extra.m_kind <- MExtern;
-	begin if ctx.is_display_file then match ctx.com.display.dms_kind with
-		| DMResolve s ->
-			resolve_position_by_path ctx {tname = s; tpackage = []; tsub = None; tparams = []} p
-		| _ ->
-			()
-	end;
-	m
-
-let resolve_module_file com m remap p =
-	let forbid = ref false in
-	let compose_path no_rename =
-		(match m with
-		| [] , name -> name
-		| x :: l , name ->
-			let x = (try
-				match PMap.find x com.package_rules with
-				| Forbidden -> forbid := true; x
-				| Directory d -> if no_rename then x else d
-				| Remap d -> remap := d :: l; d
-				with Not_found -> x
-			) in
-			String.concat "/" (x :: l) ^ "/" ^ name
-		) ^ ".hx"
-	in
-	let file = try
-			Common.find_file com (compose_path false)
-		with Not_found ->
-			Common.find_file com (compose_path true)
-	in
-	let file = (match String.lowercase (snd m) with
-	| "con" | "aux" | "prn" | "nul" | "com1" | "com2" | "com3" | "lpt1" | "lpt2" | "lpt3" when Sys.os_type = "Win32" ->
-		(* these names are reserved by the OS - old DOS legacy, such files cannot be easily created but are reported as visible *)
-		if (try (Unix.stat file).Unix.st_size with _ -> 0) > 0 then file else raise Not_found
-	| _ -> file
-	) in
-	(* if we try to load a std.xxxx class and resolve a real std file, the package name is not valid, ignore *)
-	(match fst m with
-	| "std" :: _ ->
-		let file = Path.unique_full_path file in
-		if List.exists (fun path -> ExtString.String.starts_with file (try Path.unique_full_path path with _ -> path)) com.std_path then raise Not_found;
-	| _ -> ());
-	if !forbid then begin
-		let _, decls = (!parse_hook) com file p in
-		let rec loop decls = match decls with
-			| ((EImport _,_) | (EUsing _,_)) :: decls -> loop decls
-			| (EClass d,_) :: _ -> d.d_meta
-			| (EEnum d,_) :: _ -> d.d_meta
-			| (EAbstract d,_) :: _ -> d.d_meta
-			| (ETypedef d,_) :: _ -> d.d_meta
-			| [] -> []
-		in
-		let meta = loop decls in
-		if not (Meta.has Meta.NoPackageRestrict meta) then begin
-			let x = (match fst m with [] -> assert false | x :: _ -> x) in
-			raise (Forbid_package ((x,m,p),[],if Common.defined com Define.Macro then "macro" else platform_name com.platform));
-		end;
-	end;
-	file
-
-let parse_module ctx m p =
-	let remap = ref (fst m) in
-	let file = resolve_module_file ctx.com m remap p in
-	let pack, decls = (!parse_hook) ctx.com file p in
-	if pack <> !remap then begin
-		let spack m = if m = [] then "<empty>" else String.concat "." m in
-		if p == null_pos then
-			display_error ctx ("Invalid commandline class : " ^ s_type_path m ^ " should be " ^ s_type_path (pack,snd m)) p
-		else
-			display_error ctx ("Invalid package : " ^ spack (fst m) ^ " should be " ^ spack pack) p
-	end;
-	file, if !remap <> fst m then
-		(* build typedefs to redirect to real package *)
-		List.rev (List.fold_left (fun acc (t,p) ->
-			let build f d =
-				let priv = List.mem f d.d_flags in
-				(ETypedef {
-					d_name = d.d_name;
-					d_doc = None;
-					d_meta = [];
-					d_params = d.d_params;
-					d_flags = if priv then [EPrivate] else [];
-					d_data = CTPath (if priv then { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None; } else
-						{
-							tpackage = !remap;
-							tname = fst d.d_name;
-							tparams = List.map (fun tp ->
-								TPType (CTPath { tpackage = []; tname = fst tp.tp_name; tparams = []; tsub = None; },null_pos)
-							) d.d_params;
-							tsub = None;
-						}),null_pos;
-				},p) :: acc
-			in
-			match t with
-			| EClass d -> build HPrivate d
-			| EEnum d -> build EPrivate d
-			| ETypedef d -> build EPrivate d
-			| EAbstract d -> build APrivAbstract d
-			| EImport _ | EUsing _ -> acc
-		) [(EImport (List.map (fun s -> s,null_pos) (!remap @ [snd m]),INormal),null_pos)] decls)
-	else
-		decls
-
-let load_module ctx m p =
-	let m2 = (try
-		Hashtbl.find ctx.g.modules m
-	with
-		Not_found ->
-			match !type_module_hook ctx m p with
-			| Some m -> m
-			| None ->
-			let is_extern = ref false in
-			let file, decls = (try
-				parse_module ctx m p
-			with Not_found ->
-				let rec loop = function
-					| [] ->
-						raise (Error (Module_not_found m,p))
-					| load :: l ->
-						match load m p with
-						| None -> loop l
-						| Some (file,(_,a)) -> file, a
-				in
-				is_extern := true;
-				loop ctx.com.load_extern_type
-			) in
-			let is_extern = !is_extern in
-			try
-				type_module ctx m file ~is_extern decls p
-			with Forbid_package (inf,pl,pf) when p <> null_pos ->
-				raise (Forbid_package (inf,p::pl,pf))
-	) in
-	add_dependency ctx.m.curmod m2;
-	if ctx.pass = PTypeField then flush_pass ctx PBuildClass "load_module";
-	m2
-
-;;
-type_function_params_rec := type_function_params
-
-(* former codegen.ml stuff starting here *)
-
-(* -------------------------------------------------------------------------- *)
-(* REMOTING PROXYS *)
-
-let extend_remoting ctx c t p async prot =
-	if c.cl_super <> None then error "Cannot extend several classes" p;
-	(* remove forbidden packages *)
-	let rules = ctx.com.package_rules in
-	ctx.com.package_rules <- PMap.foldi (fun key r acc -> match r with Forbidden -> acc | _ -> PMap.add key r acc) rules PMap.empty;
-	(* parse module *)
-	let path = (t.tpackage,t.tname) in
-	let new_name = (if async then "Async_" else "Remoting_") ^ t.tname in
-	(* check if the proxy already exists *)
-	let t = (try
-		load_type_def ctx p { tpackage = fst path; tname = new_name; tparams = []; tsub = None }
-	with
-		Error (Module_not_found _,p2) when p == p2 ->
-	(* build it *)
-	Common.log ctx.com ("Building proxy for " ^ s_type_path path);
-	let file, decls = (try
-		parse_module ctx path p
-	with
-		| Not_found -> ctx.com.package_rules <- rules; error ("Could not load proxy module " ^ s_type_path path ^ (if fst path = [] then " (try using absolute path)" else "")) p
-		| e -> ctx.com.package_rules <- rules; raise e) in
-	ctx.com.package_rules <- rules;
-	let base_fields = [
-		{ cff_name = "__cnx",null_pos; cff_pos = p; cff_doc = None; cff_meta = []; cff_access = []; cff_kind = FVar (Some (CTPath { tpackage = ["haxe";"remoting"]; tname = if async then "AsyncConnection" else "Connection"; tparams = []; tsub = None },null_pos),None) };
-		{ cff_name = "new",null_pos; cff_pos = p; cff_doc = None; cff_meta = []; cff_access = [APublic]; cff_kind = FFun { f_args = [("c",null_pos),false,[],None,None]; f_type = None; f_expr = Some (EBinop (OpAssign,(EConst (Ident "__cnx"),p),(EConst (Ident "c"),p)),p); f_params = [] } };
-	] in
-	let tvoid = CTPath { tpackage = []; tname = "Void"; tparams = []; tsub = None } in
-	let build_field is_public acc f =
-		if fst f.cff_name = "new" then
-			acc
-		else match f.cff_kind with
-		| FFun fd when (is_public || List.mem APublic f.cff_access) && not (List.mem AStatic f.cff_access) ->
-			if List.exists (fun (_,_,_,t,_) -> t = None) fd.f_args then error ("Field " ^ fst f.cff_name ^ " type is not complete and cannot be used by RemotingProxy") p;
-			let eargs = [EArrayDecl (List.map (fun ((a,_),_,_,_,_) -> (EConst (Ident a),p)) fd.f_args),p] in
-			let ftype = (match fd.f_type with Some (CTPath { tpackage = []; tname = "Void" },_) -> None | _ -> fd.f_type) in
-			let fargs, eargs = if async then match ftype with
-				| Some (tret,_) -> fd.f_args @ [("__callb",null_pos),true,[],Some (CTFunction ([tret,null_pos],(tvoid,null_pos)),null_pos),None], eargs @ [EConst (Ident "__callb"),p]
-				| _ -> fd.f_args, eargs @ [EConst (Ident "null"),p]
-			else
-				fd.f_args, eargs
-			in
-			let id = (EConst (String (fst f.cff_name)), p) in
-			let id = if prot then id else ECall ((EConst (Ident "__unprotect__"),p),[id]),p in
-			let expr = ECall (
-				(EField (
-					(ECall ((EField ((EConst (Ident "__cnx"),p),"resolve"),p),[id]),p),
-					"call")
-				,p),eargs),p
-			in
-			let expr = if async || ftype = None then expr else (EReturn (Some expr),p) in
-			let fd = {
-				f_params = fd.f_params;
-				f_args = fargs;
-				f_type = if async then None else ftype;
-				f_expr = Some (EBlock [expr],p);
-			} in
-			{ cff_name = f.cff_name; cff_pos = f.cff_pos; cff_doc = None; cff_meta = []; cff_access = [APublic]; cff_kind = FFun fd } :: acc
-		| _ -> acc
+		loop [] types
 	in
-	let decls = List.map (fun d ->
-		match d with
-		| EClass c, p when fst c.d_name = t.tname ->
-			let is_public = List.mem HExtern c.d_flags || List.mem HInterface c.d_flags in
-			let fields = List.rev (List.fold_left (build_field is_public) base_fields c.d_data) in
-			(EClass { c with d_flags = []; d_name = new_name,pos c.d_name; d_data = fields },p)
-		| _ -> d
-	) decls in
-	let m = type_module ctx (t.tpackage,new_name) file decls p in
-	add_dependency ctx.m.curmod m;
-	try
-		List.find (fun tdecl -> snd (t_path tdecl) = new_name) m.m_types
-	with Not_found ->
-		error ("Module " ^ s_type_path path ^ " does not define type " ^ t.tname) p
-	) in
-	match t with
-	| TClassDecl c2 when c2.cl_params = [] -> ignore(c2.cl_build()); c.cl_super <- Some (c2,[]);
-	| _ -> error "Remoting proxy must be a class without parameters" p
-
-(* -------------------------------------------------------------------------- *)
-(* HAXE.RTTI.GENERIC *)
-
-exception Generic_Exception of string * pos
-
-type generic_context = {
-	ctx : typer;
-	subst : (t * t) list;
-	name : string;
-	p : pos;
-	mutable mg : module_def option;
-}
-
-let make_generic ctx ps pt p =
-	let rec loop l1 l2 =
-		match l1, l2 with
-		| [] , [] -> []
-		| (x,TLazy f) :: l1, _ -> loop ((x,(!f)()) :: l1) l2
-		| (_,t1) :: l1 , t2 :: l2 -> (t1,t2) :: loop l1 l2
-		| _ -> assert false
-	in
-	let name =
-		String.concat "_" (List.map2 (fun (s,_) t ->
-			let s_type_path_underscore (p,s) = match p with [] -> s | _ -> String.concat "_" p ^ "_" ^ s in
-			let rec loop top t = match follow t with
-				| TInst(c,tl) -> (s_type_path_underscore c.cl_path) ^ (loop_tl tl)
-				| TEnum(en,tl) -> (s_type_path_underscore en.e_path) ^ (loop_tl tl)
-				| TAbstract(a,tl) -> (s_type_path_underscore a.a_path) ^ (loop_tl tl)
-				| _ when not top -> "_" (* allow unknown/incompatible types as type parameters to retain old behavior *)
-				| TMono _ -> raise (Generic_Exception (("Could not determine type for parameter " ^ s), p))
-				| TDynamic _ -> "Dynamic"
-				| t -> raise (Generic_Exception (("Type parameter must be a class or enum instance (found " ^ (s_type (print_context()) t) ^ ")"), p))
-			and loop_tl tl = match tl with
-				| [] -> ""
-				| tl -> "_" ^ String.concat "_" (List.map (loop false) tl)
-			in
-			loop true t
-		) ps pt)
-	in
-	{
-		ctx = ctx;
-		subst = loop ps pt;
-		name = name;
-		p = p;
-		mg = None;
-	}
-
-let rec generic_substitute_type gctx t =
-	match t with
-	| TInst ({ cl_kind = KGeneric } as c2,tl2) ->
-		(* maybe loop, or generate cascading generics *)
-		let _, _, f = gctx.ctx.g.do_build_instance gctx.ctx (TClassDecl c2) gctx.p in
-		let t = f (List.map (generic_substitute_type gctx) tl2) in
-		(match follow t,gctx.mg with TInst(c,_), Some m -> add_dependency m c.cl_module | _ -> ());
-		t
-	| _ ->
-		try
-			generic_substitute_type gctx (List.assq t gctx.subst)
-		with Not_found ->
-			Type.map (generic_substitute_type gctx) t
-
-let generic_substitute_expr gctx e =
-	let vars = Hashtbl.create 0 in
-	let build_var v =
-		try
-			Hashtbl.find vars v.v_id
-		with Not_found ->
-			let v2 = alloc_var v.v_name (generic_substitute_type gctx v.v_type) v.v_pos in
-			v2.v_meta <- v.v_meta;
-			Hashtbl.add vars v.v_id v2;
-			v2
-	in
-	let rec build_expr e =
-		match e.eexpr with
-		| TField(e1, FInstance({cl_kind = KGeneric} as c,tl,cf)) ->
-			let _, _, f = gctx.ctx.g.do_build_instance gctx.ctx (TClassDecl c) gctx.p in
-			let t = f (List.map (generic_substitute_type gctx) tl) in
-			let fa = try
-				quick_field t cf.cf_name
-			with Not_found ->
-				error (Printf.sprintf "Type %s has no field %s (possible typing order issue)" (s_type (print_context()) t) cf.cf_name) e.epos
-			in
-			build_expr {e with eexpr = TField(e1,fa)}
-		| TTypeExpr (TClassDecl ({cl_kind = KTypeParameter _;} as c)) when Meta.has Meta.Const c.cl_meta ->
-			let rec loop subst = match subst with
-				| (t1,t2) :: subst ->
-					begin match follow t1 with
-						| TInst(c2,_) when c == c2 -> t2
-						| _ -> loop subst
-					end
-				| [] -> raise Not_found
-			in
-			begin try
-				let t = loop gctx.subst in
-				begin match follow t with
-					| TInst({cl_kind = KExpr e},_) -> type_expr gctx.ctx e Value
-					| _ -> error "Only Const type parameters can be used as value" e.epos
-				end
-			with Not_found ->
-				e
-			end
-		| _ ->
-			map_expr_type build_expr (generic_substitute_type gctx) build_var e
-	in
-	build_expr e
-
-let get_short_name =
-	let i = ref (-1) in
-	(fun () ->
-		incr i;
-		Printf.sprintf "Hx___short___hx_type_%i" !i
-	)
-
-let rec build_generic ctx c p tl =
-	let pack = fst c.cl_path in
-	let recurse = ref false in
-	let rec check_recursive t =
-		match follow t with
-		| TInst (c2,tl) ->
-			(match c2.cl_kind with
-			| KTypeParameter tl ->
-				if not (is_generic_parameter ctx c2) && has_ctor_constraint c2 then
-					error "Type parameters with a constructor cannot be used non-generically" p;
-				recurse := true
-			| _ -> ());
-			List.iter check_recursive tl;
-		| _ ->
-			()
-	in
-	List.iter check_recursive tl;
-	if !recurse || not (ctx.com.display.dms_full_typing) then begin
-		TInst (c,tl) (* build a normal instance *)
-	end else begin
-	let gctx = make_generic ctx c.cl_params tl p in
-	let name = (snd c.cl_path) ^ "_" ^ gctx.name in
-	try
-		load_instance ctx ({ tpackage = pack; tname = name; tparams = []; tsub = None },p) false p
-	with Error(Module_not_found path,_) when path = (pack,name) ->
-		let m = (try Hashtbl.find ctx.g.modules (Hashtbl.find ctx.g.types_module c.cl_path) with Not_found -> assert false) in
-		(* let ctx = { ctx with m = { ctx.m with module_types = m.m_types @ ctx.m.module_types } } in *)
-		ignore(c.cl_build()); (* make sure the super class is already setup *)
-		let mg = {
-			m_id = alloc_mid();
-			m_path = (pack,name);
-			m_types = [];
-			m_extra = module_extra (s_type_path (pack,name)) m.m_extra.m_sign 0. MFake m.m_extra.m_check_policy;
-		} in
-		gctx.mg <- Some mg;
-		let cg = mk_class mg (pack,name) c.cl_pos null_pos in
-		mg.m_types <- [TClassDecl cg];
-		Hashtbl.add ctx.g.modules mg.m_path mg;
-		add_dependency mg m;
-		add_dependency ctx.m.curmod mg;
-		(* ensure that type parameters are set in dependencies *)
-		let dep_stack = ref [] in
-		let rec loop t =
-			if not (List.memq t !dep_stack) then begin
-			dep_stack := t :: !dep_stack;
-			match t with
-			| TInst (c,tl) -> add_dep c.cl_module tl
-			| TEnum (e,tl) -> add_dep e.e_module tl
-			| TType (t,tl) -> add_dep t.t_module tl
-			| TAbstract (a,tl) -> add_dep a.a_module tl
-			| TMono r ->
-				(match !r with
-				| None -> ()
-				| Some t -> loop t)
-			| TLazy f ->
-				loop ((!f)());
-			| TDynamic t2 ->
-				if t == t2 then () else loop t2
-			| TAnon a ->
-				PMap.iter (fun _ f -> loop f.cf_type) a.a_fields
-			| TFun (args,ret) ->
-				List.iter (fun (_,_,t) -> loop t) args;
-				loop ret
-			end
-		and add_dep m tl =
-			add_dependency mg m;
-			List.iter loop tl
-		in
-		List.iter loop tl;
-		let build_field cf_old =
-			(* We have to clone the type parameters (issue #4672). We cannot substitute the constraints immediately because
-			   we need the full substitution list first. *)
-			let param_subst,params = List.fold_left (fun (subst,params) (s,t) -> match follow t with
-				| TInst(c,tl) as t ->
-					let t2 = TInst({c with cl_pos = c.cl_pos;},tl) in
-					(t,t2) :: subst,(s,t2) :: params
-				| _ -> assert false
-			) ([],[]) cf_old.cf_params in
-			let gctx = {gctx with subst = param_subst @ gctx.subst} in
-			let cf_new = {cf_old with cf_pos = cf_old.cf_pos} in (* copy *)
-			(* Type parameter constraints are substituted here. *)
-			cf_new.cf_params <- List.rev_map (fun (s,t) -> match follow t with
-				| TInst({cl_kind = KTypeParameter tl1} as c,_) ->
-					let tl1 = List.map (generic_substitute_type gctx) tl1 in
-					c.cl_kind <- KTypeParameter tl1;
-					s,t
-				| _ -> assert false
-			) params;
-			let f () =
-				let t = generic_substitute_type gctx cf_old.cf_type in
-				ignore (follow t);
-				begin try (match cf_old.cf_expr with
-					| None ->
-						begin match cf_old.cf_kind with
-							| Method _ when not c.cl_interface && not c.cl_extern ->
-								display_error ctx (Printf.sprintf "Field %s has no expression (possible typing order issue)" cf_new.cf_name) cf_new.cf_pos;
-								display_error ctx (Printf.sprintf "While building %s" (s_type_path cg.cl_path)) p;
-							| _ ->
-								()
-						end
-					| Some e ->
-						cf_new.cf_expr <- Some (generic_substitute_expr gctx e)
-				) with Unify_error l ->
-					error (error_msg (Unify l)) cf_new.cf_pos
-				end;
-				t
-			in
-			let r = exc_protect ctx (fun r ->
-				let t = mk_mono() in
-				r := (fun() -> t);
-				unify_raise ctx (f()) t p;
-				t
-			) "build_generic" in
-			delay ctx PForce (fun() -> ignore ((!r)()));
-			cf_new.cf_type <- TLazy r;
-			cf_new
-		in
-		if c.cl_init <> None || c.cl_dynamic <> None then error "This class can't be generic" p;
-		List.iter (fun cf -> match cf.cf_kind with
-			| Method MethMacro when not ctx.in_macro -> ()
-			| _ -> error "A generic class can't have static fields" cf.cf_pos
-		) c.cl_ordered_statics;
-		cg.cl_super <- (match c.cl_super with
-			| None -> None
-			| Some (cs,pl) ->
-				let find_class subst =
-					let rec loop subst = match subst with
-						| (TInst(c,[]),t) :: subst when c == cs -> t
-						| _ :: subst -> loop subst
-						| [] -> raise Not_found
-					in
-					try
-						if pl <> [] then raise Not_found;
-						let t = loop subst in
-						(* extended type parameter: concrete type must have a constructor, but generic base class must not have one *)
-						begin match follow t,c.cl_constructor with
-							| TInst(cs,_),None ->
-								ignore(cs.cl_build());
-								begin match cs.cl_constructor with
-									| None -> error ("Cannot use " ^ (s_type_path cs.cl_path) ^ " as type parameter because it is extended and has no constructor") p
-									| _ -> ()
-								end;
-							| _,Some cf -> error "Generics extending type parameters cannot have constructors" cf.cf_pos
-							| _ -> ()
-						end;
-						t
-					with Not_found ->
-						apply_params c.cl_params tl (TInst(cs,pl))
-				in
-				let ts = follow (find_class gctx.subst) in
-				let cs,pl = Inheritance.check_extends ctx c ts p in
-				match cs.cl_kind with
-				| KGeneric ->
-					(match build_generic ctx cs p pl with
-					| TInst (cs,pl) -> Some (cs,pl)
-					| _ -> assert false)
-				| _ -> Some(cs,pl)
-		);
-		add_constructor ctx cg false p;
-		cg.cl_kind <- KGenericInstance (c,tl);
-		cg.cl_meta <- (Meta.NoDoc,[],null_pos) :: cg.cl_meta;
-		if has_meta Meta.Keep c.cl_meta then cg.cl_meta <- (Meta.Keep,[],null_pos) :: cg.cl_meta;
-		cg.cl_interface <- c.cl_interface;
-		cg.cl_constructor <- (match cg.cl_constructor, c.cl_constructor, c.cl_super with
-			| _, Some cf, _ -> Some (build_field cf)
-			| Some ctor, _, _ -> Some ctor
-			| None, None, None -> None
-			| _ -> error "Please define a constructor for this class in order to use it as generic" c.cl_pos
-		);
-		cg.cl_implements <- List.map (fun (i,tl) ->
-			(match follow (generic_substitute_type gctx (TInst (i, List.map (generic_substitute_type gctx) tl))) with
-			| TInst (i,tl) -> i, tl
-			| _ -> assert false)
-		) c.cl_implements;
-		cg.cl_ordered_fields <- List.map (fun f ->
-			let f = build_field f in
-			cg.cl_fields <- PMap.add f.cf_name f cg.cl_fields;
-			f
-		) c.cl_ordered_fields;
-		cg.cl_overrides <- List.map (fun f ->
-			try PMap.find f.cf_name cg.cl_fields with Not_found -> assert false
-		) c.cl_overrides;
-		(* In rare cases the class name can become too long, so let's shorten it (issue #3090). *)
-		if String.length (snd cg.cl_path) > 254 then begin
-			let n = get_short_name () in
-			cg.cl_meta <- (Meta.Native,[EConst(String (n)),p],null_pos) :: cg.cl_meta;
-		end;
-		TInst (cg,[])
-	end
-
-(* -------------------------------------------------------------------------- *)
-(* HAXE.XML.PROXY *)
-
-let extend_xml_proxy ctx c t file p =
-	let t = load_complex_type ctx false p (t,p) in
-	let file = (try Common.find_file ctx.com file with Not_found -> file) in
-	add_dependency c.cl_module (create_fake_module ctx file);
-	let used = ref PMap.empty in
-	let print_results() =
-		PMap.iter (fun id used ->
-			if not used then ctx.com.warning (id ^ " is not used") p;
-		) (!used)
-	in
-	let check_used = Common.defined ctx.com Define.CheckXmlProxy in
-	if check_used then ctx.g.hook_generate <- print_results :: ctx.g.hook_generate;
-	try
-		let rec loop = function
-			| Xml.Element (_,attrs,childs) ->
-				(try
-					let id = List.assoc "id" attrs in
-					if PMap.mem id c.cl_fields then error ("Duplicate id " ^ id) p;
-					let t = if not check_used then t else begin
-						used := PMap.add id false (!used);
-						let ft() = used := PMap.add id true (!used); t in
-						TLazy (ref ft)
-					end in
-					let f = {
-						cf_name = id;
-						cf_type = t;
-						cf_public = true;
-						cf_pos = p;
-						cf_name_pos = null_pos;
-						cf_doc = None;
-						cf_meta = no_meta;
-						cf_kind = Var { v_read = AccResolve; v_write = AccNo };
-						cf_params = [];
-						cf_expr = None;
-						cf_expr_unoptimized = None;
-						cf_overloads = [];
-					} in
-					c.cl_fields <- PMap.add id f c.cl_fields;
-				with
-					Not_found -> ());
-				List.iter loop childs;
-			| Xml.PCData _ -> ()
-		in
-		loop (Xml.parse_file file)
-	with
-		| Xml.Error e -> error ("XML error " ^ Xml.error e) p
-		| Xml.File_not_found f -> error ("XML File not found : " ^ f) p
-
-(* -------------------------------------------------------------------------- *)
-(* MACRO TYPE *)
-
-let get_macro_path ctx e args p =
-	let rec loop e =
-		match fst e with
-		| EField (e,f) -> f :: loop e
-		| EConst (Ident i) -> [i]
-		| _ -> error "Invalid macro call" p
-	in
-	let path = match e with
-		| (EConst(Ident i)),_ ->
-			let path = try
-				if not (PMap.mem i ctx.curclass.cl_statics) then raise Not_found;
-				ctx.curclass.cl_path
-			with Not_found -> try
-				(t_infos (let path,_,_ = PMap.find i ctx.m.module_globals in path)).mt_path
-			with Not_found ->
-				error "Invalid macro call" p
-			in
-			i :: (snd path) :: (fst path)
-		| _ ->
-			loop e
-	in
-	(match path with
-	| meth :: cl :: path -> (List.rev path,cl), meth, args
-	| _ -> error "Invalid macro call" p)
-
-let build_macro_type ctx pl p =
-	let path, field, args = (match pl with
-		| [TInst ({ cl_kind = KExpr (ECall (e,args),_) },_)]
-		| [TInst ({ cl_kind = KExpr (EArrayDecl [ECall (e,args),_],_) },_)] ->
-			get_macro_path ctx e args p
-		| _ ->
-			error "MacroType requires a single expression call parameter" p
-	) in
-	let old = ctx.ret in
-	let t = (match ctx.g.do_macro ctx MMacroType path field args p with
-		| None -> mk_mono()
-		| Some _ -> ctx.ret
-	) in
-	ctx.ret <- old;
-	t
-
-let build_macro_build ctx c pl cfl p =
-	let path, field, args = match Meta.get Meta.GenericBuild c.cl_meta with
-		| _,[ECall(e,args),_],_ -> get_macro_path ctx e args p
-		| _ -> error "genericBuild requires a single expression call parameter" p
-	in
-	let old = ctx.ret,ctx.g.get_build_infos in
-	ctx.g.get_build_infos <- (fun() -> Some (TClassDecl c, pl, cfl));
-	let t = (match ctx.g.do_macro ctx MMacroType path field args p with
-		| None -> mk_mono()
-		| Some _ -> ctx.ret
-	) in
-	ctx.ret <- fst old;
-	ctx.g.get_build_infos <- snd old;
-	t
-
-(* -------------------------------------------------------------------------- *)
-(* API EVENTS *)
-
-let build_instance ctx mtype p =
-	match mtype with
-	| TClassDecl c ->
-		if ctx.pass > PBuildClass then ignore(c.cl_build());
-		let build f s =
-			let r = exc_protect ctx (fun r ->
-				let t = mk_mono() in
-				r := (fun() -> t);
-				let tf = (f()) in
-				unify_raise ctx tf t p;
-				link_dynamic t tf;
-				t
-			) s in
-			delay ctx PForce (fun() -> ignore ((!r)()));
-			TLazy r
-		in
-		let ft = (fun pl ->
-			match c.cl_kind with
-			| KGeneric ->
-				build (fun () -> build_generic ctx c p pl) "build_generic"
-			| KMacroType ->
-				build (fun () -> build_macro_type ctx pl p) "macro_type"
-			| KGenericBuild cfl ->
-				build (fun () -> build_macro_build ctx c pl cfl p) "generic_build"
-			| _ ->
-				TInst (c,pl)
-		) in
-		c.cl_params , c.cl_path , ft
-	| TEnumDecl e ->
-		e.e_params , e.e_path , (fun t -> TEnum (e,t))
-	| TTypeDecl t ->
-		t.t_params , t.t_path , (fun tl -> TType(t,tl))
-	| TAbstractDecl a ->
-		a.a_params, a.a_path, (fun tl -> TAbstract(a,tl))
-
-let on_inherit ctx c p (is_extends,tp) =
-	if not is_extends then
-		true
-	else match fst tp with
-	| { tpackage = ["haxe";"remoting"]; tname = "Proxy"; tparams = [TPType(CTPath t,null_pos)] } ->
-		extend_remoting ctx c t p false true;
-		false
-	| { tpackage = ["haxe";"remoting"]; tname = "AsyncProxy"; tparams = [TPType(CTPath t,null_pos)] } ->
-		extend_remoting ctx c t p true true;
-		false
-	| { tpackage = ["haxe";"xml"]; tname = "Proxy"; tparams = [TPExpr(EConst (String file),p);TPType (t,_)] } ->
-		extend_xml_proxy ctx c t file p;
-		true
-	| _ ->
-		true
+	types,filter_classes
\ No newline at end of file
diff --git a/src/typing/typeloadCheck.ml b/src/typing/typeloadCheck.ml
new file mode 100644
index 0000000000000000000000000000000000000000..5c34080842364d6f37572349321035c925b937bc
--- /dev/null
+++ b/src/typing/typeloadCheck.ml
@@ -0,0 +1,544 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+(* Various checks performed while loading types. *)
+
+open Globals
+open Ast
+open Type
+open Typecore
+open DisplayException
+open DisplayTypes
+open DisplayMode
+open CompletionItem
+open CompletionModuleKind
+open CompletionModuleType
+open CompletionResultKind
+open Common
+open Error
+
+exception Build_canceled of build_state
+
+let is_generic_parameter ctx c =
+	(* first check field parameters, then class parameters *)
+	try
+		ignore (List.assoc (snd c.cl_path) ctx.curfield.cf_params);
+		Meta.has Meta.Generic ctx.curfield.cf_meta
+	with Not_found -> try
+		ignore(List.assoc (snd c.cl_path) ctx.type_params);
+		(match ctx.curclass.cl_kind with | KGeneric -> true | _ -> false);
+	with Not_found ->
+		false
+
+let valid_redefinition ctx f1 t1 f2 t2 = (* child, parent *)
+	let valid t1 t2 =
+		Type.unify t1 t2;
+		if is_null t1 <> is_null t2 || ((follow t1) == t_dynamic && (follow t2) != t_dynamic) then raise (Unify_error [Cannot_unify (t1,t2)]);
+	in
+	let open OptimizerTexpr in
+	begin match PurityState.get_purity_from_meta f2.cf_meta,PurityState.get_purity_from_meta f1.cf_meta with
+		| PurityState.Pure,PurityState.MaybePure -> f1.cf_meta <- (Meta.Pure,[EConst(Ident "expect"),f2.cf_pos],null_pos) :: f1.cf_meta
+		| PurityState.ExpectPure p,PurityState.MaybePure -> f1.cf_meta <- (Meta.Pure,[EConst(Ident "expect"),p],null_pos) :: f1.cf_meta
+		| _ -> ()
+	end;
+	let t1, t2 = (match f1.cf_params, f2.cf_params with
+		| [], [] -> t1, t2
+		| l1, l2 when List.length l1 = List.length l2 ->
+			let to_check = ref [] in
+			let monos = List.map2 (fun (name,p1) (_,p2) ->
+				(match follow p1, follow p2 with
+				| TInst ({ cl_kind = KTypeParameter ct1 } as c1,pl1), TInst ({ cl_kind = KTypeParameter ct2 } as c2,pl2) ->
+					(match ct1, ct2 with
+					| [], [] -> ()
+					| _, _ when List.length ct1 = List.length ct2 ->
+						(* if same constraints, they are the same type *)
+						let check monos =
+							List.iter2 (fun t1 t2  ->
+								try
+									let t1 = apply_params l1 monos (apply_params c1.cl_params pl1 t1) in
+									let t2 = apply_params l2 monos (apply_params c2.cl_params pl2 t2) in
+									type_eq EqStrict t1 t2
+								with Unify_error l ->
+									raise (Unify_error (Unify_custom "Constraints differ" :: l))
+							) ct1 ct2
+						in
+						to_check := check :: !to_check;
+					| _ ->
+						raise (Unify_error [Unify_custom "Different number of constraints"]))
+				| _ -> ());
+				TInst (mk_class null_module ([],name) null_pos null_pos,[])
+			) l1 l2 in
+			List.iter (fun f -> f monos) !to_check;
+			apply_params l1 monos t1, apply_params l2 monos t2
+		| _  ->
+			(* ignore type params, will create other errors later *)
+			t1, t2
+	) in
+	match f1.cf_kind,f2.cf_kind with
+	| Method m1, Method m2 when not (m1 = MethDynamic) && not (m2 = MethDynamic) ->
+		begin match follow t1, follow t2 with
+		| TFun (args1,r1) , TFun (args2,r2) -> (
+			if not (List.length args1 = List.length args2) then raise (Unify_error [Unify_custom "Different number of function arguments"]);
+			let i = ref 0 in
+			try
+				valid r1 r2;
+				List.iter2 (fun (n,o1,a1) (_,o2,a2) ->
+					incr i;
+					if o1 <> o2 then raise (Unify_error [Not_matching_optional n]);
+					(try valid a2 a1 with Unify_error _ -> raise (Unify_error [Cannot_unify(a1,a2)]))
+				) args1 args2;
+			with Unify_error l ->
+				let msg = if !i = 0 then Invalid_return_type else Invalid_function_argument(!i,List.length args1) in
+				raise (Unify_error (Cannot_unify (t1,t2) :: msg :: l)))
+		| _ ->
+			assert false
+		end
+	| _,(Var { v_write = AccNo | AccNever }) ->
+		(* write variance *)
+		valid t1 t2
+	| _,(Var { v_read = AccNo | AccNever }) ->
+		(* read variance *)
+		valid t2 t1
+	| _,_ when has_class_field_flag f2 CfFinal ->
+		(* write variance *)
+		valid t1 t2
+	| _ , _ ->
+		(* in case args differs, or if an interface var *)
+		type_eq EqStrict t1 t2;
+		if is_null t1 <> is_null t2 then raise (Unify_error [Cannot_unify (t1,t2)])
+
+let copy_meta meta_src meta_target sl =
+	let meta = ref meta_target in
+	List.iter (fun (m,e,p) ->
+		if List.mem m sl then meta := (m,e,p) :: !meta
+	) meta_src;
+	!meta
+
+(** retrieve string from @:native metadata or raise Not_found *)
+let get_native_name meta =
+	let rec get_native meta = match meta with
+		| [] -> raise Not_found
+		| (Meta.Native,[v],p as meta) :: _ ->
+			meta
+		| _ :: meta ->
+			get_native meta
+	in
+	let (_,e,mp) = get_native meta in
+	match e with
+	| [Ast.EConst (Ast.String(name,_)),p] ->
+		name,p
+	| [] ->
+		raise Not_found
+	| _ ->
+		error "String expected" mp
+
+let check_native_name_override ctx child base =
+	let error() =
+		display_error ctx ("Field " ^ child.cf_name ^ " has different @:native value than in superclass") child.cf_pos;
+		display_error ctx ("Base field is defined here") base.cf_pos
+	in
+	try
+		let native_name = fst (get_native_name child.cf_meta) in
+		try if fst (get_native_name base.cf_meta) <> native_name then error()
+		with Not_found -> error()
+	with Not_found -> ()
+
+let check_overriding ctx c f =
+	match c.cl_super with
+	| None ->
+		if List.memq f c.cl_overrides then display_error ctx ("Field " ^ f.cf_name ^ " is declared 'override' but doesn't override any field") f.cf_pos
+	| _ when c.cl_extern && Meta.has Meta.CsNative c.cl_meta -> () (* -net-lib specific: do not check overrides on extern CsNative classes *)
+	| Some (csup,params) ->
+		let p = f.cf_pos in
+		let i = f.cf_name in
+		let check_field f get_super_field is_overload = try
+			(if is_overload && not (Meta.has Meta.Overload f.cf_meta) then
+				display_error ctx ("Missing @:overload declaration for field " ^ i) p);
+			let t, f2 = get_super_field csup i in
+			check_native_name_override ctx f f2;
+			(* allow to define fields that are not defined for this platform version in superclass *)
+			(match f2.cf_kind with
+			| Var { v_read = AccRequire _ } -> raise Not_found;
+			| _ -> ());
+			if ctx.com.config.pf_overload && (Meta.has Meta.Overload f2.cf_meta && not (Meta.has Meta.Overload f.cf_meta)) then
+				display_error ctx ("Field " ^ i ^ " should be declared with @:overload since it was already declared as @:overload in superclass") p
+			else if not (List.memq f c.cl_overrides) then
+				display_error ctx ("Field " ^ i ^ " should be declared with 'override' since it is inherited from superclass " ^ s_type_path csup.cl_path) p
+			else if not (has_class_field_flag f CfPublic) && (has_class_field_flag f2 CfPublic) then
+				display_error ctx ("Field " ^ i ^ " has less visibility (public/private) than superclass one") p
+			else (match f.cf_kind, f2.cf_kind with
+			| _, Method MethInline ->
+				display_error ctx ("Field " ^ i ^ " is inlined and cannot be overridden") p
+			| a, b when a = b -> ()
+			| Method MethInline, Method MethNormal ->
+				() (* allow to redefine a method as inlined *)
+			| _ ->
+				display_error ctx ("Field " ^ i ^ " has different property access than in superclass") p);
+			if (has_class_field_flag f2 CfFinal) then display_error ctx ("Cannot override final method " ^ i) p;
+			try
+				let t = apply_params csup.cl_params params t in
+				valid_redefinition ctx f f.cf_type f2 t;
+			with
+				Unify_error l ->
+					display_error ctx ("Field " ^ i ^ " overrides parent class with different or incomplete type") p;
+					display_error ctx ("Base field is defined here") f2.cf_pos;
+					display_error ctx (error_msg (Unify l)) p;
+		with
+			Not_found ->
+				if List.memq f c.cl_overrides then
+					let msg = if is_overload then
+						("Field " ^ i ^ " is declared 'override' but no compatible overload was found")
+					else begin
+						let fields = TClass.get_all_super_fields c in
+						let fields = PMap.fold (fun (_,cf) acc -> match cf.cf_kind with
+							| Method MethNormal when not (has_class_field_flag cf CfFinal) -> cf.cf_name :: acc
+							| _ -> acc
+						) fields [] in
+						StringError.string_error i fields ("Field " ^ i ^ " is declared 'override' but doesn't override any field")
+					end in
+					display_error ctx msg p
+		in
+		if ctx.com.config.pf_overload && Meta.has Meta.Overload f.cf_meta then begin
+			let overloads = Overloads.get_overloads csup i in
+			List.iter (fun (t,f2) ->
+				(* check if any super class fields are vars *)
+				match f2.cf_kind with
+				| Var _ ->
+					display_error ctx ("A variable named '" ^ f2.cf_name ^ "' was already declared in a superclass") f.cf_pos
+				| _ -> ()
+			) overloads;
+			List.iter (fun f ->
+				(* find the exact field being overridden *)
+				check_field f (fun csup i ->
+					List.find (fun (t,f2) ->
+						Overloads.same_overload_args f.cf_type (apply_params csup.cl_params params t) f f2
+					) overloads
+				) true
+			) (f :: f.cf_overloads)
+		end else
+			check_field f (fun csup i ->
+				let _, t, f2 = raw_class_field (fun f -> f.cf_type) csup params i in
+				t, f2) false
+
+let class_field_no_interf c i =
+	try
+		let f = PMap.find i c.cl_fields in
+		f.cf_type , f
+	with Not_found ->
+		match c.cl_super with
+		| None ->
+			raise Not_found
+		| Some (c,tl) ->
+			(* rec over class_field *)
+			let _, t , f = raw_class_field (fun f -> f.cf_type) c tl i in
+			apply_params c.cl_params tl t , f
+
+let rec return_flow ctx e =
+	let error() =
+		display_error ctx (Printf.sprintf "Missing return: %s" (s_type (print_context()) ctx.ret)) e.epos; raise Exit
+	in
+	let return_flow = return_flow ctx in
+	let rec uncond e = match e.eexpr with
+		| TIf _ | TWhile _ | TSwitch _ | TTry _ | TFunction _ -> ()
+		| TReturn _ | TThrow _ -> raise Exit
+		| _ -> Type.iter uncond e
+	in
+	let has_unconditional_flow e = try uncond e; false with Exit -> true in
+	match e.eexpr with
+	| TReturn _ | TThrow _ -> ()
+	| TParenthesis e | TMeta(_,e) ->
+		return_flow e
+	| TBlock el ->
+		let rec loop = function
+			| [] -> error()
+			| [e] -> return_flow e
+			| e :: _ when has_unconditional_flow e -> ()
+			| _ :: l -> loop l
+		in
+		loop el
+	| TIf (_,e1,Some e2) ->
+		return_flow e1;
+		return_flow e2;
+	| TSwitch (v,cases,Some e) ->
+		List.iter (fun (_,e) -> return_flow e) cases;
+		return_flow e
+	| TSwitch ({eexpr = TMeta((Meta.Exhaustive,_,_),_)},cases,None) ->
+		List.iter (fun (_,e) -> return_flow e) cases;
+	| TTry (e,cases) ->
+		return_flow e;
+		List.iter (fun (_,e) -> return_flow e) cases;
+	| TWhile({eexpr = (TConst (TBool true))},e,_) ->
+		(* a special case for "inifite" while loops that have no break *)
+		let rec loop e = match e.eexpr with
+			(* ignore nested loops to not accidentally get one of its breaks *)
+			| TWhile _ | TFor _ -> ()
+			| TBreak -> error()
+			| _ -> Type.iter loop e
+		in
+		loop e
+	| _ ->
+		error()
+
+let check_global_metadata ctx meta f_add mpath tpath so =
+	let sl1 = full_dot_path2 mpath tpath in
+	let sl1,field_mode = match so with None -> sl1,false | Some s -> sl1 @ [s],true in
+	List.iter (fun (sl2,m,(recursive,to_types,to_fields)) ->
+		let add = ((field_mode && to_fields) || (not field_mode && to_types)) && (match_path recursive sl1 sl2) in
+		if add then f_add m
+	) ctx.g.global_metadata;
+	if ctx.is_display_file then delay ctx PCheckConstraint (fun () -> DisplayEmitter.check_display_metadata ctx meta)
+
+let check_module_types ctx m p t =
+	let t = t_infos t in
+	try
+		let m2 = Hashtbl.find ctx.g.types_module t.mt_path in
+		if m.m_path <> m2 && String.lowercase (s_type_path m2) = String.lowercase (s_type_path m.m_path) then error ("Module " ^ s_type_path m2 ^ " is loaded with a different case than " ^ s_type_path m.m_path) p;
+		error ("Type name " ^ s_type_path t.mt_path ^ " is redefined from module " ^ s_type_path m2) p
+	with
+		Not_found ->
+			Hashtbl.add ctx.g.types_module t.mt_path m.m_path
+
+module Inheritance = struct
+	let is_basic_class_path path = match path with
+		| ([],("Array" | "String" | "Date" | "Xml")) -> true
+		| _ -> false
+
+	let check_extends ctx c t p = match follow t with
+		| TInst (csup,params) ->
+			if is_basic_class_path csup.cl_path && not (c.cl_extern && csup.cl_extern) then error "Cannot extend basic class" p;
+			if is_parent c csup then error "Recursive class" p;
+			begin match csup.cl_kind with
+				| KTypeParameter _ ->
+					if is_generic_parameter ctx csup then error "Extending generic type parameters is no longer allowed in Haxe 4" p;
+					error "Cannot extend type parameters" p
+				| _ -> csup,params
+			end
+		| _ -> error "Should extend by using a class" p
+
+	let rec check_interface ctx c intf params =
+		let p = c.cl_pos in
+		let rec check_field i f =
+			(if ctx.com.config.pf_overload then
+				List.iter (function
+					| f2 when f != f2 ->
+							check_field i f2
+					| _ -> ()) f.cf_overloads);
+			let is_overload = ref false in
+			try
+				let t2, f2 = class_field_no_interf c i in
+				let t2, f2 =
+					if ctx.com.config.pf_overload && (f2.cf_overloads <> [] || Meta.has Meta.Overload f2.cf_meta) then
+						let overloads = Overloads.get_overloads c i in
+						is_overload := true;
+						let t = (apply_params intf.cl_params params f.cf_type) in
+						List.find (fun (t1,f1) -> Overloads.same_overload_args t t1 f f1) overloads
+					else
+						t2, f2
+				in
+				if ctx.com.display.dms_collect_data then begin
+						let h = ctx.com.display_information in
+						h.interface_field_implementations <- (intf,f,c,Some f2) :: h.interface_field_implementations;
+				end;
+				ignore(follow f2.cf_type); (* force evaluation *)
+				let p = (match f2.cf_expr with None -> p | Some e -> e.epos) in
+				let mkind = function
+					| MethNormal | MethInline -> 0
+					| MethDynamic -> 1
+					| MethMacro -> 2
+				in
+				if (has_class_field_flag f CfPublic) && not (has_class_field_flag f2 CfPublic) && not (Meta.has Meta.CompilerGenerated f.cf_meta) then
+					display_error ctx ("Field " ^ i ^ " should be public as requested by " ^ s_type_path intf.cl_path) p
+				else if not (unify_kind f2.cf_kind f.cf_kind) || not (match f.cf_kind, f2.cf_kind with Var _ , Var _ -> true | Method m1, Method m2 -> mkind m1 = mkind m2 | _ -> false) then
+					display_error ctx ("Field " ^ i ^ " has different property access than in " ^ s_type_path intf.cl_path ^ " (" ^ s_kind f2.cf_kind ^ " should be " ^ s_kind f.cf_kind ^ ")") p
+				else try
+					valid_redefinition ctx f2 t2 f (apply_params intf.cl_params params f.cf_type)
+				with
+					Unify_error l ->
+						if not (Meta.has Meta.CsNative c.cl_meta && c.cl_extern) then begin
+							display_error ctx ("Field " ^ i ^ " has different type than in " ^ s_type_path intf.cl_path) p;
+							display_error ctx ("Interface field is defined here") f.cf_pos;
+							display_error ctx (error_msg (Unify l)) p;
+						end
+			with
+				| Not_found when not c.cl_interface ->
+					let msg = if !is_overload then
+						let ctx = print_context() in
+						let args = match follow f.cf_type with | TFun(args,_) -> String.concat ", " (List.map (fun (n,o,t) -> (if o then "?" else "") ^ n ^ " : " ^ (s_type ctx t)) args) | _ -> assert false in
+						"No suitable overload for " ^ i ^ "( " ^ args ^ " ), as needed by " ^ s_type_path intf.cl_path ^ " was found"
+					else
+						("Field " ^ i ^ " needed by " ^ s_type_path intf.cl_path ^ " is missing")
+					in
+					display_error ctx msg p
+				| Not_found -> ()
+		in
+		PMap.iter check_field intf.cl_fields;
+		List.iter (fun (i2,p2) ->
+			check_interface ctx c i2 (List.map (apply_params intf.cl_params params) p2)
+		) intf.cl_implements
+
+	let check_interfaces ctx c =
+		match c.cl_path with
+		| "Proxy" :: _ , _ -> ()
+		| _ when c.cl_extern && Meta.has Meta.CsNative c.cl_meta -> ()
+		| _ ->
+		List.iter (fun (intf,params) -> check_interface ctx c intf params) c.cl_implements
+
+	let set_heritance ctx c herits p =
+		let is_lib = Meta.has Meta.LibType c.cl_meta in
+		let ctx = { ctx with curclass = c; type_params = c.cl_params; } in
+		let old_meta = c.cl_meta in
+		let process_meta csup =
+			List.iter (fun m ->
+				match m with
+				| Meta.AutoBuild, el, p -> c.cl_meta <- (Meta.Build,el,{ c.cl_pos with pmax = c.cl_pos.pmin }(* prevent display metadata *)) :: m :: c.cl_meta
+				| _ -> ()
+			) csup.cl_meta;
+			if csup.cl_final && not ((csup.cl_extern && Meta.has Meta.Hack c.cl_meta) || (match c.cl_kind with KTypeParameter _ -> true | _ -> false)) then
+				error ("Cannot extend a final " ^ if c.cl_interface then "interface" else "class") p;
+		in
+		let check_cancel_build csup =
+			match csup.cl_build() with
+			| Built -> ()
+			| state ->
+				(* for macros reason, our super class is not yet built - see #2177 *)
+				(* let's reset our build and delay it until we are done *)
+				c.cl_meta <- old_meta;
+				raise (Build_canceled state)
+		in
+		let has_interf = ref false in
+		(*
+			resolve imports before calling build_inheritance, since it requires full paths.
+			that means that typedefs are not working, but that's a fair limitation
+		*)
+		let resolve_imports (t,p) =
+			match t.tpackage with
+			| _ :: _ -> t,p
+			| [] ->
+				try
+					let path_matches lt = snd (t_path lt) = t.tname in
+					let lt = try
+						List.find path_matches ctx.m.curmod.m_types
+					with Not_found ->
+						let t,pi = List.find (fun (lt,_) -> path_matches lt) ctx.m.module_types in
+						ImportHandling.mark_import_position ctx.com pi;
+						t
+					in
+					{ t with tpackage = fst (t_path lt) },p
+				with
+					Not_found -> t,p
+		in
+		let herits = ExtList.List.filter_map (function
+			| HExtends t -> Some(true,resolve_imports t)
+			| HImplements t -> Some(false,resolve_imports t)
+			| t -> None
+		) herits in
+		let herits = List.filter (ctx.g.do_inherit ctx c p) herits in
+		(* Pass 1: Check and set relations *)
+		let check_herit t is_extends p =
+			if is_extends then begin
+				if c.cl_super <> None then error "Cannot extend several classes" p;
+				let csup,params = check_extends ctx c t p in
+				if c.cl_interface then begin
+					if not csup.cl_interface then error "Cannot extend by using a class" p;
+					c.cl_implements <- (csup,params) :: c.cl_implements;
+					if not !has_interf then begin
+						if not is_lib then delay ctx PForce (fun() -> check_interfaces ctx c);
+						has_interf := true;
+					end
+				end else begin
+					if csup.cl_interface then error "Cannot extend by using an interface" p;
+					c.cl_super <- Some (csup,params)
+				end;
+				(fun () ->
+					check_cancel_build csup;
+					process_meta csup;
+				)
+			end else begin match follow t with
+				| TInst ({ cl_path = [],"ArrayAccess"; cl_extern = true; },[t]) ->
+					if c.cl_array_access <> None then error "Duplicate array access" p;
+					c.cl_array_access <- Some t;
+					(fun () -> ())
+				| TInst (intf,params) ->
+					if is_parent c intf then error "Recursive class" p;
+					if c.cl_interface then error "Interfaces cannot implement another interface (use extends instead)" p;
+					if not intf.cl_interface then error "You can only implement an interface" p;
+					c.cl_implements <- (intf, params) :: c.cl_implements;
+					if not !has_interf && not is_lib && not (Meta.has (Meta.Custom "$do_not_check_interf") c.cl_meta) then begin
+						delay ctx PForce (fun() -> check_interfaces ctx c);
+						has_interf := true;
+					end;
+					(fun () ->
+						check_cancel_build intf;
+						process_meta intf;
+					)
+				| TDynamic t ->
+					if c.cl_dynamic <> None then error "Cannot have several dynamics" p;
+					if not c.cl_extern then display_error ctx "In haxe 4, implements Dynamic is only supported on externs" p;
+					c.cl_dynamic <- Some t;
+					(fun () -> ())
+				| _ ->
+					error "Should implement by using an interface" p
+			end
+		in
+		let fl = ExtList.List.filter_map (fun (is_extends,(ct,p)) ->
+			try
+				let t = try
+					Typeload.load_instance ~allow_display:true ctx (ct,p) false
+				with DisplayException(DisplayFields Some({fkind = CRTypeHint} as r)) ->
+					(* We don't allow `implements` on interfaces. Just raise fields completion with no fields. *)
+					if not is_extends && c.cl_interface then raise_fields [] CRImplements r.fsubject;
+					let l = List.filter (fun item -> match item.ci_kind with
+						| ITType({kind = Interface} as cm,_) -> (not is_extends || c.cl_interface) && CompletionModuleType.get_path cm <> c.cl_path
+						| ITType({kind = Class} as cm,_) ->
+							is_extends && not c.cl_interface && CompletionModuleType.get_path cm <> c.cl_path &&
+							(not cm.is_final || Meta.has Meta.Hack c.cl_meta) &&
+							(not (is_basic_class_path (cm.pack,cm.name)) || (c.cl_extern && cm.is_extern))
+						| _ -> false
+					) r.fitems in
+					raise_fields l (if is_extends then CRExtends else CRImplements) r.fsubject
+				in
+				Some (check_herit t is_extends p)
+			with Error(Module_not_found(([],name)),p) when ctx.com.display.dms_kind <> DMNone ->
+				if Diagnostics.is_diagnostics_run p then DisplayToplevel.handle_unresolved_identifier ctx name p true;
+				None
+		) herits in
+		fl
+end
+
+let check_final_vars ctx e =
+	let final_vars = Hashtbl.create 0 in
+	List.iter (fun cf -> match cf.cf_kind with
+		| Var _ when (has_class_field_flag cf CfFinal) && cf.cf_expr = None ->
+			Hashtbl.add final_vars cf.cf_name cf
+		| _ ->
+			()
+	) ctx.curclass.cl_ordered_fields;
+	if Hashtbl.length final_vars > 0 then begin
+		let rec find_inits e = match e.eexpr with
+			| TBinop(OpAssign,{eexpr = TField({eexpr = TConst TThis},fa)},e2) ->
+				Hashtbl.remove final_vars (field_name fa);
+				find_inits e2;
+			| _ ->
+				Type.iter find_inits e
+		in
+		find_inits e;
+		Hashtbl.iter (fun _ cf ->
+			display_error ctx ("final field " ^ cf.cf_name ^ " must be initialized immediately or in the constructor") cf.cf_pos;
+		) final_vars
+	end
\ No newline at end of file
diff --git a/src/typing/typeloadFields.ml b/src/typing/typeloadFields.ml
new file mode 100644
index 0000000000000000000000000000000000000000..c8c3f4521c882c613ac634a3be5e191eda21cafc
--- /dev/null
+++ b/src/typing/typeloadFields.ml
@@ -0,0 +1,1549 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+(* Logic for building fields. *)
+
+open Globals
+open Ast
+open Type
+open Typecore
+open Typeload
+open DisplayTypes.DisplayMode
+open CompletionItem.ClassFieldOrigin
+open Common
+open Error
+
+type class_init_ctx = {
+	tclass : tclass; (* I don't trust ctx.curclass because it's mutable. *)
+	is_lib : bool;
+	is_native : bool;
+	is_core_api : bool;
+	is_class_debug : bool;
+	extends_public : bool;
+	abstract : tabstract option;
+	context_init : unit -> unit;
+	mutable has_display_field : bool;
+	mutable delayed_expr : (typer * tlazy ref option) list;
+	mutable force_constructor : bool;
+	mutable uninitialized_final : pos option;
+}
+
+type field_kind =
+	| FKNormal
+	| FKConstructor
+	| FKInit
+
+type field_init_ctx = {
+	is_inline : bool;
+	is_final : bool;
+	is_static : bool;
+	override : pos option;
+	is_extern : bool;
+	is_macro : bool;
+	is_abstract_member : bool;
+	is_display_field : bool;
+	is_field_debug : bool;
+	field_kind : field_kind;
+	display_modifier : placed_access option;
+	mutable do_bind : bool;
+	mutable do_add : bool;
+	(* If true, cf_expr = None makes a difference in the logic. We insert a dummy expression in
+	   display mode in order to address this. *)
+	mutable expr_presence_matters : bool;
+}
+
+let locate_macro_error = ref true
+
+let dump_class_context cctx =
+	Printer.s_record_fields "" [
+		"tclass",Printer.s_tclass "\t" cctx.tclass;
+		"is_lib",string_of_bool cctx.is_lib;
+		"is_native",string_of_bool cctx.is_native;
+		"is_core_api",string_of_bool cctx.is_core_api;
+		"is_class_debug",string_of_bool cctx.is_class_debug;
+		"extends_public",string_of_bool cctx.extends_public;
+		"abstract",Printer.s_opt (Printer.s_tabstract "\t") cctx.abstract;
+		"force_constructor",string_of_bool cctx.force_constructor;
+	]
+
+let s_field_kind = function
+	| FKNormal -> "FKNormal"
+	| FKConstructor -> "FKConstructor"
+	| FKInit -> "FKInit"
+
+let dump_field_context fctx =
+	Printer.s_record_fields "" [
+		"is_inline",string_of_bool fctx.is_inline;
+		"is_static",string_of_bool fctx.is_static;
+		"is_extern",string_of_bool fctx.is_extern;
+		"is_macro",string_of_bool fctx.is_macro;
+		"is_abstract_member",string_of_bool fctx.is_abstract_member;
+		"is_display_field",string_of_bool fctx.is_display_field;
+		"is_field_debug",string_of_bool fctx.is_field_debug;
+		"field_kind",s_field_kind fctx.field_kind;
+		"do_bind",string_of_bool fctx.do_bind;
+		"do_add",string_of_bool fctx.do_add;
+		"expr_presence_matters",string_of_bool fctx.expr_presence_matters;
+	]
+
+
+let is_java_native_function meta = try
+	match Meta.get Meta.Native meta with
+		| (Meta.Native,[],_) -> true
+		| _ -> false
+	with | Not_found -> false
+
+(**** end of strict meta handling *****)
+
+let get_method_args field =
+	match field.cf_expr with
+		| Some { eexpr = TFunction { tf_args = args } } -> args
+		| _ -> raise Not_found
+
+(**
+	Get super constructor data required for @:structInit descendants.
+*)
+let get_struct_init_super_info ctx c p =
+	match c.cl_super with
+		| Some ({ cl_constructor = Some ctor } as csup, cparams) ->
+			let args = (try get_method_args ctor with Not_found -> []) in
+			let tl,el =
+				List.fold_left (fun (args,exprs) (v,value) ->
+					let opt = match value with Some _ -> true | None -> false in
+					let t = if opt then ctx.t.tnull v.v_type else v.v_type in
+					(v.v_name,opt,t) :: args,(mk (TLocal v) v.v_type p) :: exprs
+				) ([],[]) args
+			in
+			let super_expr = mk (TCall (mk (TConst TSuper) (TInst (csup,cparams)) p, el)) ctx.t.tvoid p in
+			(args,Some super_expr,tl)
+		| _ ->
+			[],None,[]
+
+(**
+	Generates a constructor for a @:structInit class `c` if it does not have one yet.
+*)
+let ensure_struct_init_constructor ctx c ast_fields p =
+	match c.cl_constructor with
+	| Some _ ->
+		()
+	| None ->
+		let field_has_default_expr field_name =
+			List.exists
+				(fun ast_field ->
+					match ast_field.cff_name with
+						| (name, _) when name <> field_name -> false
+						| _ ->
+							match ast_field.cff_kind with
+								| FVar (_, Some _) | FProp (_, _, _, Some _) -> true
+								| _ -> false
+				)
+				ast_fields
+		in
+		let super_args,super_expr,super_tl = get_struct_init_super_info ctx c p in
+		let params = List.map snd c.cl_params in
+		let ethis = mk (TConst TThis) (TInst(c,params)) p in
+		let args,el,tl = List.fold_left (fun (args,el,tl) cf -> match cf.cf_kind with
+			| Var _ ->
+				let has_default_expr = field_has_default_expr cf.cf_name in
+				let opt = has_default_expr || (Meta.has Meta.Optional cf.cf_meta) in
+				let t = if opt then ctx.t.tnull cf.cf_type else cf.cf_type in
+				let v = alloc_var VGenerated cf.cf_name t p in
+				let ef = mk (TField(ethis,FInstance(c,params,cf))) cf.cf_type p in
+				let ev = mk (TLocal v) v.v_type p in
+				(* this.field = <constructor_argument> *)
+				let assign_expr = mk (TBinop(OpAssign,ef,ev)) cf.cf_type p in
+				let e =
+					if has_default_expr then
+						begin
+							(* <constructor_argument> != null *)
+							let condition = mk (TBinop(OpNotEq, ev, (null t p))) ctx.t.tbool p in
+							(* if(<constructor_argument> != null) this.field = <constructor_argument> *)
+							mk (TIf(condition, assign_expr, None)) ctx.t.tvoid p
+						end
+					else
+						assign_expr
+				in
+				(v,None) :: args,e :: el,(cf.cf_name,opt,t) :: tl
+			| Method _ ->
+				args,el,tl
+		) ([],[],[]) (List.rev c.cl_ordered_fields) in
+		let el = match super_expr with Some e -> e :: el | None -> el in
+		let tf = {
+			tf_args = args @ super_args;
+			tf_type = ctx.t.tvoid;
+			tf_expr = mk (TBlock el) ctx.t.tvoid p
+		} in
+		let e = mk (TFunction tf) (TFun(tl @ super_tl,ctx.t.tvoid)) p in
+		let cf = mk_field "new" e.etype p null_pos in
+		cf.cf_expr <- Some e;
+		cf.cf_type <- e.etype;
+		cf.cf_meta <- [Meta.CompilerGenerated,[],null_pos];
+		cf.cf_kind <- Method MethNormal;
+		c.cl_constructor <- Some cf
+
+let transform_abstract_field com this_t a_t a f =
+	let stat = List.mem_assoc AStatic f.cff_access in
+	let p = f.cff_pos in
+	match f.cff_kind with
+	| FProp ((("get" | "never"),_),(("set" | "never"),_),_,_) when not stat ->
+		(* TODO: hack to avoid issues with abstract property generation on As3 *)
+		if Common.defined com Define.As3 then f.cff_access <- (AExtern,null_pos) :: f.cff_access;
+		{ f with cff_access = (AStatic,null_pos) :: f.cff_access; cff_meta = (Meta.Impl,[],null_pos) :: f.cff_meta }
+	| FProp _ when not stat ->
+		error "Member property accessors must be get/set or never" p;
+	| FFun fu when fst f.cff_name = "new" && not stat ->
+		let init p = (EVars [("this",null_pos),false,Some this_t,None],p) in
+		let cast e = (ECast(e,None)),pos e in
+		let ret p = (EReturn (Some (cast (EConst (Ident "this"),p))),p) in
+		let meta = (Meta.Impl,[],null_pos) :: (Meta.NoCompletion,[],null_pos) :: f.cff_meta in
+		if Meta.has Meta.MultiType a.a_meta then begin
+			if List.mem_assoc AInline f.cff_access then error "MultiType constructors cannot be inline" f.cff_pos;
+			if fu.f_expr <> None then error "MultiType constructors cannot have a body" f.cff_pos;
+			f.cff_access <- (AExtern,null_pos) :: f.cff_access;
+		end;
+		(try
+			let _, p = List.find (fun (acc, _) -> acc = AMacro) f.cff_access in
+			error "Macro abstract constructors are not supported" p
+		with Not_found -> ());
+		(* We don't want the generated expression positions to shadow the real code. *)
+		let p = { p with pmax = p.pmin } in
+		let fu = {
+			fu with
+			f_expr = (match fu.f_expr with
+			| None -> None
+			| Some (EBlock el,_) -> Some (EBlock (init p :: el @ [ret p]),p)
+			| Some e -> Some (EBlock [init p;e;ret p],p)
+			);
+			f_type = Some a_t;
+		} in
+		{ f with cff_name = "_new",pos f.cff_name; cff_access = (AStatic,null_pos) :: f.cff_access; cff_kind = FFun fu; cff_meta = meta }
+	| FFun fu when not stat ->
+		if Meta.has Meta.From f.cff_meta then error "@:from cast functions must be static" f.cff_pos;
+		let fu = { fu with f_args = (if List.mem_assoc AMacro f.cff_access then fu.f_args else (("this",null_pos),false,[],Some this_t,None) :: fu.f_args) } in
+		{ f with cff_kind = FFun fu; cff_access = (AStatic,null_pos) :: f.cff_access; cff_meta = (Meta.Impl,[],null_pos) :: f.cff_meta }
+	| _ ->
+		f
+
+let patch_class ctx c fields =
+	let path = match c.cl_kind with
+		| KAbstractImpl a -> a.a_path
+		| _ -> c.cl_path
+	in
+	let h = (try Some (Hashtbl.find ctx.g.type_patches path) with Not_found -> None) in
+	match h with
+	| None -> fields
+	| Some (h,hcl) ->
+		c.cl_meta <- c.cl_meta @ hcl.tp_meta;
+		let patch_getter t fn =
+			{ fn with f_type = t }
+		in
+		let patch_setter t fn =
+			match fn.f_args with
+			| [(name,opt,meta,_,expr)] ->
+				{ fn with f_args = [(name,opt,meta,t,expr)]; f_type = t }
+			| _ -> fn
+		in
+		let rec loop acc accessor_acc = function
+			| [] -> acc, accessor_acc
+			| f :: l ->
+				(* patch arguments types *)
+				(match f.cff_kind with
+				| FFun ff ->
+					let param (((n,pn),opt,m,_,e) as p) =
+						try
+							let t2 = (try Hashtbl.find h (("$" ^ (fst f.cff_name) ^ "__" ^ n),false) with Not_found -> Hashtbl.find h (("$" ^ n),false)) in
+							(n,pn), opt, m, (match t2.tp_type with None -> None | Some t -> Some (t,null_pos)), e
+						with Not_found ->
+							p
+					in
+					f.cff_kind <- FFun { ff with f_args = List.map param ff.f_args }
+				| _ -> ());
+				(* other patches *)
+				match (try Some (Hashtbl.find h (fst f.cff_name,List.mem_assoc AStatic f.cff_access)) with Not_found -> None) with
+				| None -> loop (f :: acc) accessor_acc l
+				| Some { tp_remove = true } -> loop acc accessor_acc l
+				| Some p ->
+					f.cff_meta <- f.cff_meta @ p.tp_meta;
+					let accessor_acc =
+						match p.tp_type with
+						| None -> accessor_acc
+						| Some t ->
+							match f.cff_kind with
+							| FVar (_,e) ->
+								f.cff_kind <- FVar (Some (t,null_pos),e); accessor_acc
+							| FProp (get,set,_,eo) ->
+								let typehint = Some (t,null_pos) in
+								let accessor_acc = if fst get = "get" then ("get_" ^ fst f.cff_name, patch_getter typehint) :: accessor_acc else accessor_acc in
+								let accessor_acc = if fst set = "set" then ("set_" ^ fst f.cff_name, patch_setter typehint) :: accessor_acc else accessor_acc in
+								f.cff_kind <- FProp (get,set,typehint,eo); accessor_acc
+							| FFun fn ->
+								f.cff_kind <- FFun { fn with f_type = Some (t,null_pos) }; accessor_acc
+					in
+					loop (f :: acc) accessor_acc l
+		in
+		let fields, accessor_patches = loop [] [] fields in
+		List.iter (fun (accessor_name, patch) ->
+			try
+				let f_accessor = List.find (fun f -> fst f.cff_name = accessor_name) fields in
+				match f_accessor.cff_kind with
+				| FFun fn -> f_accessor.cff_kind <- FFun (patch fn)
+				| _ -> ()
+			with Not_found ->
+				()
+		) accessor_patches;
+		List.rev fields
+
+let lazy_display_type ctx f =
+	(* if ctx.is_display_file then begin
+		let r = exc_protect ctx (fun r ->
+			let t = f () in
+			r := lazy_processing (fun () -> t);
+			t
+		) "" in
+		TLazy r
+	end else *)
+		f ()
+
+type enum_abstract_mode =
+	| EAString
+	| EAInt of int ref
+	| EAOther
+
+let build_enum_abstract ctx c a fields p =
+	let mode =
+		if does_unify a.a_this ctx.t.tint then EAInt (ref 0)
+		else if does_unify a.a_this ctx.t.tstring then EAString
+		else EAOther
+	in
+	List.iter (fun field ->
+		match field.cff_kind with
+		| FVar(ct,eo) when not (List.mem_assoc AStatic field.cff_access) ->
+			field.cff_access <- [AStatic,null_pos; if (List.mem_assoc APrivate field.cff_access) then (APrivate,null_pos) else (APublic,null_pos)];
+			field.cff_meta <- (Meta.Enum,[],null_pos) :: (Meta.Impl,[],null_pos) :: field.cff_meta;
+			let ct = match ct with
+				| Some _ -> ct
+				| None -> Some (TExprToExpr.convert_type (TAbstract(a,List.map snd a.a_params)),null_pos)
+			in
+			let set_field e =
+				field.cff_access <- (AInline,null_pos) :: field.cff_access;
+				let e = (ECast(e,None),(pos e)) in
+				field.cff_kind <- FVar(ct,Some e)
+			in
+			begin match eo with
+				| None ->
+					if not c.cl_extern then begin match mode with
+						| EAString ->
+							set_field (EConst (String (fst field.cff_name,SDoubleQuotes)),null_pos)
+						| EAInt i ->
+							set_field (EConst (Int (string_of_int !i)),null_pos);
+							incr i;
+						| EAOther ->
+							error "Value required" field.cff_pos
+					end else field.cff_kind <- FProp(("default",null_pos),("never",null_pos),ct,None)
+				| Some e ->
+					begin match mode,e with
+						| EAInt i,(EConst(Int s),_) ->
+							begin try
+								let i' = int_of_string s in
+								i := (i' + 1)
+							with _ ->
+								()
+							end
+						| _ -> ()
+					end;
+					set_field e
+			end
+		| _ ->
+			()
+	) fields;
+	EVars [("",null_pos),false,Some (CTAnonymous fields,p),None],p
+
+let apply_macro ctx mode path el p =
+	let cpath, meth = (match List.rev (ExtString.String.nsplit path ".") with
+		| meth :: name :: pack -> (List.rev pack,name), meth
+		| _ -> error "Invalid macro path" p
+	) in
+	ctx.g.do_macro ctx mode cpath meth el p
+
+let build_module_def ctx mt meta fvars context_init fbuild =
+	let loop (f_build,f_enum) = function
+		| Meta.Build,args,p -> (fun () ->
+				let epath, el = (match args with
+					| [ECall (epath,el),p] -> epath, el
+					| _ -> error "Invalid build parameters" p
+				) in
+				let s = try String.concat "." (List.rev (string_list_of_expr_path epath)) with Error (_,p) -> error "Build call parameter must be a class path" p in
+				if ctx.in_macro then error "You cannot use @:build inside a macro : make sure that your type is not used in macro" p;
+				let old = ctx.get_build_infos in
+				ctx.get_build_infos <- (fun() -> Some (mt, List.map snd (t_infos mt).mt_params, fvars()));
+				context_init();
+				let r = try apply_macro ctx MBuild s el p with e -> ctx.get_build_infos <- old; raise e in
+				ctx.get_build_infos <- old;
+				(match r with
+				| None -> error "Build failure" p
+				| Some e -> fbuild e)
+			) :: f_build,f_enum
+		| Meta.Enum,_,p -> f_build,Some (fun () ->
+				begin match mt with
+					| TClassDecl ({cl_kind = KAbstractImpl a} as c) ->
+						(* if p <> null_pos && not (Define.is_haxe3_compat ctx.com.defines) then
+							ctx.com.warning "`@:enum abstract` is deprecated in favor of `enum abstract`" p; *)
+						context_init();
+						let e = build_enum_abstract ctx c a (fvars()) p in
+						fbuild e;
+					| _ ->
+						()
+				end
+			)
+		| Meta.Using,el,p -> (fun () ->
+			List.iter (fun e ->
+				try
+					let path = List.rev (string_pos_list_of_expr_path_raise e) in
+					let types,filter_classes = handle_using ctx path (pos e) in
+					let ti =
+						match mt with
+							| TClassDecl { cl_kind = KAbstractImpl a } -> t_infos (TAbstractDecl a)
+							| _ -> t_infos mt
+					in
+					ti.mt_using <- (filter_classes types) @ ti.mt_using;
+				with Exit ->
+					error "dot path expected" (pos e)
+			) el;
+		) :: f_build,f_enum
+		| _ ->
+			f_build,f_enum
+	in
+	(* let errors go through to prevent resume if build fails *)
+	let f_build,f_enum = List.fold_left loop ([],None) meta in
+	(* Go for @:using in parents and interfaces *)
+	(match mt with
+		| TClassDecl { cl_super = csup; cl_implements = interfaces; cl_kind = kind } ->
+			let ti = t_infos mt in
+			let inherit_using (c,_) =
+				ti.mt_using <- ti.mt_using @ (t_infos (TClassDecl c)).mt_using
+			in
+			Option.may inherit_using csup;
+			List.iter inherit_using interfaces
+		| _ -> ()
+	);
+	List.iter (fun f -> f()) (List.rev f_build);
+	(match f_enum with None -> () | Some f -> f())
+
+let create_class_context ctx c context_init p =
+	locate_macro_error := true;
+	incr stats.s_classes_built;
+	let abstract = match c.cl_kind with
+		| KAbstractImpl a -> Some a
+		| _ -> None
+	in
+	let ctx = {
+		ctx with
+		curclass = c;
+		type_params = c.cl_params;
+		pass = PBuildClass;
+		tthis = (match abstract with
+			| Some a ->
+				(match a.a_this with
+				| TMono r when !r = None -> TAbstract (a,List.map snd c.cl_params)
+				| t -> t)
+			| None -> TInst (c,List.map snd c.cl_params));
+		on_error = (fun ctx msg ep ->
+			ctx.com.error msg ep;
+			(* macros expressions might reference other code, let's recall which class we are actually compiling *)
+			if !locate_macro_error && (ep.pfile <> c.cl_pos.pfile || ep.pmax < c.cl_pos.pmin || ep.pmin > c.cl_pos.pmax) then ctx.com.error "Defined in this class" c.cl_pos
+		);
+	} in
+	(* a lib type will skip most checks *)
+	let is_lib = Meta.has Meta.LibType c.cl_meta in
+	if is_lib && not c.cl_extern then ctx.com.error "@:libType can only be used in extern classes" c.cl_pos;
+	(* a native type will skip one check: the static vs non-static field *)
+	let is_native = Meta.has Meta.JavaNative c.cl_meta || Meta.has Meta.CsNative c.cl_meta in
+	if Meta.has Meta.Macro c.cl_meta then display_error ctx "Macro classes are no longer allowed in haxe 3" c.cl_pos;
+	let rec extends_public c =
+		Meta.has Meta.PublicFields c.cl_meta ||
+		match c.cl_super with
+		| None -> false
+		| Some (c,_) -> extends_public c
+	in
+	let cctx = {
+		tclass = c;
+		is_lib = is_lib;
+		is_native = is_native;
+		is_core_api = Meta.has Meta.CoreApi c.cl_meta;
+		is_class_debug = Meta.has (Meta.Custom ":debug.typeload") c.cl_meta;
+		extends_public = extends_public c;
+		abstract = abstract;
+		context_init = context_init;
+		force_constructor = false;
+		uninitialized_final = None;
+		delayed_expr = [];
+		has_display_field = false;
+	} in
+	ctx,cctx
+
+let create_field_context (ctx,cctx) c cff =
+	let ctx = {
+		ctx with
+		pass = PBuildClass; (* will be set later to PTypeExpr *)
+	} in
+	let display_modifier = Typeload.check_field_access ctx cff in
+	let is_static = List.mem_assoc AStatic cff.cff_access in
+	let is_extern = ref (List.mem_assoc AExtern cff.cff_access) in
+	let is_final = ref (List.mem_assoc AFinal cff.cff_access) in
+	List.iter (fun (m,_,p) ->
+		match m with
+		| Meta.Final ->
+			is_final := true;
+			(* if p <> null_pos && not (Define.is_haxe3_compat ctx.com.defines) then
+				ctx.com.warning "`@:final` is deprecated in favor of `final`" p; *)
+		| Meta.Extern ->
+			(* if not (Define.is_haxe3_compat ctx.com.defines) then
+				ctx.com.warning "`@:extern` on fields is deprecated in favor of `extern`" (pos cff.cff_name); *)
+			is_extern := true;
+		| _ ->
+			()
+	) cff.cff_meta;
+	let allow_inline = cctx.abstract <> None || match cff.cff_kind with
+		| FFun _ -> ctx.g.doinline || !is_extern || c.cl_extern
+		| _ -> true
+	in
+	let is_inline = allow_inline && List.mem_assoc AInline cff.cff_access in
+	let override = try Some (List.assoc AOverride cff.cff_access) with Not_found -> None in
+	let is_macro = List.mem_assoc AMacro cff.cff_access in
+	let field_kind = match fst cff.cff_name with
+		| "new" -> FKConstructor
+		| "__init__" when is_static -> FKInit
+		| _ -> FKNormal
+	in
+	let fctx = {
+		is_inline = is_inline;
+		is_static = is_static;
+		override = override;
+		is_macro = is_macro;
+		is_extern = !is_extern;
+		is_final = !is_final;
+		is_display_field = ctx.is_display_file && DisplayPosition.display_position#enclosed_in cff.cff_pos;
+		is_field_debug = cctx.is_class_debug || Meta.has (Meta.Custom ":debug.typeload") cff.cff_meta;
+		display_modifier = display_modifier;
+		is_abstract_member = cctx.abstract <> None && Meta.has Meta.Impl cff.cff_meta;
+		field_kind = field_kind;
+		do_bind = (((not (c.cl_extern || !is_extern) || is_inline) && not c.cl_interface) || field_kind = FKInit);
+		do_add = true;
+		expr_presence_matters = false;
+	} in
+	if fctx.is_display_field then cctx.has_display_field <- true;
+	ctx,fctx
+
+let is_public (ctx,cctx) access parent =
+	let c = cctx.tclass in
+	if List.mem_assoc APrivate access then
+		false
+	else if List.mem_assoc APublic access then
+		true
+	else match parent with
+		| Some cf -> (has_class_field_flag cf CfPublic)
+		| _ -> c.cl_extern || c.cl_interface || cctx.extends_public
+
+let rec get_parent c name =
+	match c.cl_super with
+	| None -> None
+	| Some (csup,_) ->
+		try
+			Some (PMap.find name csup.cl_fields)
+		with
+			Not_found -> get_parent csup name
+
+let add_field c cf is_static =
+	if is_static then begin
+		c.cl_statics <- PMap.add cf.cf_name cf c.cl_statics;
+		c.cl_ordered_statics <- cf :: c.cl_ordered_statics;
+	end else begin
+		c.cl_fields <- PMap.add cf.cf_name cf c.cl_fields;
+		c.cl_ordered_fields <- cf :: c.cl_ordered_fields;
+	end
+
+let type_opt (ctx,cctx) p t =
+	let c = cctx.tclass in
+	match t with
+	| None when c.cl_extern || c.cl_interface ->
+		display_error ctx "Type required for extern classes and interfaces" p;
+		t_dynamic
+	| None when cctx.is_core_api ->
+		display_error ctx "Type required for core api classes" p;
+		t_dynamic
+	| _ ->
+		load_type_hint ctx p t
+
+let build_fields (ctx,cctx) c fields =
+	let fields = ref fields in
+	let get_fields() = !fields in
+	let pending = ref [] in
+	c.cl_build <- (fun() -> BuildMacro pending);
+	build_module_def ctx (TClassDecl c) c.cl_meta get_fields cctx.context_init (fun (e,p) ->
+		match e with
+		| EVars [_,_,Some (CTAnonymous f,p),None] ->
+			let f = List.map (fun f ->
+				let f = match cctx.abstract with
+					| Some a ->
+						let a_t = TExprToExpr.convert_type' (TAbstract(a,List.map snd a.a_params)) in
+						let this_t = TExprToExpr.convert_type' a.a_this in (* TODO: better pos? *)
+						transform_abstract_field ctx.com this_t a_t a f
+					| None ->
+						f
+				in
+				if List.mem_assoc AMacro f.cff_access then
+					(match ctx.g.macros with
+					| Some (_,mctx) when Hashtbl.mem mctx.g.types_module c.cl_path ->
+						(* assume that if we had already a macro with the same name, it has not been changed during the @:build operation *)
+						if not (List.exists (fun f2 -> f2.cff_name = f.cff_name && List.mem_assoc AMacro f2.cff_access) (!fields)) then
+							error "Class build macro cannot return a macro function when the class has already been compiled into the macro context" p
+					| _ -> ());
+				f
+			) f in
+			fields := f
+		| _ -> error "Class build macro must return a single variable with anonymous fields" p
+	);
+	c.cl_build <- (fun() -> Building [c]);
+	List.iter (fun f -> f()) !pending;
+	!fields
+
+let bind_type (ctx,cctx,fctx) cf r p =
+	let c = cctx.tclass in
+	let rec is_full_type t =
+		match t with
+		| TFun (args,ret) -> is_full_type ret && List.for_all (fun (_,_,t) -> is_full_type t) args
+		| TMono r -> (match !r with None -> false | Some t -> is_full_type t)
+		| TAbstract _ | TInst _ | TEnum _ | TLazy _ | TDynamic _ | TAnon _ | TType _ -> true
+	in
+	let force_macro () =
+		(* force macro system loading of this class in order to get completion *)
+		delay ctx PTypeField (fun() -> try ignore(ctx.g.do_macro ctx MDisplay c.cl_path cf.cf_name [] p) with Exit | Error _ -> ())
+	in
+	let handle_display_field () =
+		if fctx.is_macro && not ctx.in_macro then
+			force_macro()
+		else begin
+			cf.cf_type <- TLazy r;
+			cctx.delayed_expr <- (ctx,Some r) :: cctx.delayed_expr;
+		end
+	in
+	if ctx.com.display.dms_full_typing then begin
+		if fctx.is_macro && not ctx.in_macro then
+			force_macro ()
+		else begin
+			cf.cf_type <- TLazy r;
+			(* is_lib ? *)
+			cctx.delayed_expr <- (ctx,Some r) :: cctx.delayed_expr;
+		end
+	end else if ctx.com.display.dms_force_macro_typing && fctx.is_macro && not ctx.in_macro then
+		force_macro()
+	else begin
+		if fctx.is_display_field then begin
+			handle_display_field()
+		end else begin
+			if not (is_full_type cf.cf_type) then begin
+				cctx.delayed_expr <- (ctx, None) :: cctx.delayed_expr;
+				cf.cf_type <- TLazy r;
+			end else if fctx.expr_presence_matters then
+				cf.cf_expr <- Some (mk (TConst TNull) t_dynamic null_pos)
+		end
+	end
+
+let check_field_display ctx fctx c cf =
+	if fctx.is_display_field then begin
+		let scope, cf = match c.cl_kind with
+			| KAbstractImpl _ ->
+				if Meta.has Meta.Impl cf.cf_meta then
+					(if cf.cf_name = "_new" then
+						CFSConstructor, {cf with cf_name = "new"}
+					else
+						CFSMember, cf)
+				else
+					CFSStatic, cf;
+			| _ ->
+				(if fctx.is_static then
+					CFSStatic
+				else if fctx.field_kind = FKConstructor then
+					CFSConstructor
+				else
+					CFSMember), cf;
+		in
+		let origin = match c.cl_kind with
+			| KAbstractImpl a -> Self (TAbstractDecl a)
+			| _ -> Self (TClassDecl c)
+		in
+		DisplayEmitter.maybe_display_field ctx origin scope cf cf.cf_name_pos;
+		DisplayEmitter.check_field_modifiers ctx c cf fctx.override fctx.display_modifier;
+	end
+
+let bind_var (ctx,cctx,fctx) cf e =
+	let c = cctx.tclass in
+	let p = cf.cf_pos in
+	let rec get_declared f = function
+		| None -> None
+		| Some (c,a) when PMap.exists f c.cl_fields ->
+			Some (c,a)
+		| Some (c,_) ->
+			let ret = get_declared f c.cl_super in
+			match ret with
+				| Some r -> Some r
+				| None ->
+					let rec loop ifaces = match ifaces with
+						| [] -> None
+						| i :: ifaces -> match get_declared f (Some i) with
+							| Some r -> Some r
+							| None -> loop ifaces
+					in
+					loop c.cl_implements
+	in
+	if not fctx.is_static && not cctx.is_lib then begin match get_declared cf.cf_name c.cl_super with
+			| None -> ()
+			| Some (csup,_) ->
+				(* this can happen on -net-lib generated classes if a combination of explicit interfaces and variables with the same name happens *)
+				if not (csup.cl_interface && Meta.has Meta.CsNative c.cl_meta) then
+					error ("Redefinition of variable " ^ cf.cf_name ^ " in subclass is not allowed. Previously declared at " ^ (s_type_path csup.cl_path) ) p
+	end;
+	let t = cf.cf_type in
+
+	match e with
+	| None ->
+		check_field_display ctx fctx c cf;
+	| Some e ->
+		if c.cl_interface then display_error ctx "Default values on interfaces are not allowed" (pos e);
+		cf.cf_meta <- ((Meta.Value,[e],null_pos) :: cf.cf_meta);
+		let check_cast e =
+			(* insert cast to keep explicit field type (issue #1901) *)
+			if type_iseq e.etype cf.cf_type then
+				e
+			else begin match e.eexpr,follow cf.cf_type with
+				| TConst (TInt i),TAbstract({a_path=[],"Float"},_) ->
+					(* turn int constant to float constant if expected type is float *)
+					{e with eexpr = TConst (TFloat (Int32.to_string i)); etype = cf.cf_type}
+				| _ ->
+					mk_cast e cf.cf_type e.epos
+			end
+		in
+		let r = exc_protect ~force:false ctx (fun r ->
+			(* type constant init fields (issue #1956) *)
+			if not !return_partial_type || (match fst e with EConst _ -> true | _ -> false) then begin
+				r := lazy_processing (fun() -> t);
+				cctx.context_init();
+				if ctx.com.verbose then Common.log ctx.com ("Typing " ^ (if ctx.in_macro then "macro " else "") ^ s_type_path c.cl_path ^ "." ^ cf.cf_name);
+				let e = TypeloadFunction.type_var_field ctx t e fctx.is_static fctx.is_display_field p in
+				let maybe_run_analyzer e = match e.eexpr with
+					| TConst _ | TLocal _ | TFunction _ -> e
+					| _ -> !analyzer_run_on_expr_ref ctx.com e
+				in
+				let require_constant_expression e msg =
+					if ctx.com.display.dms_kind <> DMNone && ctx.com.display.dms_error_policy <> EPCollect then
+						e
+					else match Optimizer.make_constant_expression ctx (maybe_run_analyzer e) with
+					| Some e -> e
+					| None -> display_error ctx msg p; e
+				in
+				let e = (match cf.cf_kind with
+				| Var v when c.cl_extern || fctx.is_extern ->
+					if not fctx.is_static then begin
+						display_error ctx "Extern non-static variables may not be initialized" p;
+						e
+					end else if not fctx.is_inline then begin
+						display_error ctx "Extern non-inline variables may not be initialized" p;
+						e
+					end else require_constant_expression e "Extern variable initialization must be a constant value"
+				| Var v when not (is_physical_field cf) ->
+					(* disallow initialization of non-physical fields (issue #1958) *)
+					display_error ctx "This field cannot be initialized because it is not a real variable" p; e
+				| Var v when not fctx.is_static ->
+					let e = if ctx.com.display.dms_display && ctx.com.display.dms_error_policy <> EPCollect then
+						e
+					else begin
+						let e = Optimizer.reduce_loop ctx (maybe_run_analyzer e) in
+						let e = (match Optimizer.make_constant_expression ctx e with
+							| Some e -> e
+							| None -> e
+						) in
+						let rec check_this e = match e.eexpr with
+							| TConst TThis ->
+								display_error ctx "Cannot access this or other member field in variable initialization" e.epos;
+								raise Exit
+							| TLocal v when (match ctx.vthis with Some v2 -> v == v2 | None -> false) ->
+								display_error ctx "Cannot access this or other member field in variable initialization" e.epos;
+								raise Exit
+							| _ ->
+							Type.iter check_this e
+						in
+						(try check_this e with Exit -> ());
+						e
+					end in
+					e
+				| Var v when v.v_read = AccInline ->
+					let e = require_constant_expression e "Inline variable initialization must be a constant value" in
+					begin match c.cl_kind with
+						| KAbstractImpl a when Meta.has Meta.Enum cf.cf_meta && Meta.has Meta.Enum a.a_meta ->
+							unify ctx t (TAbstract(a,(List.map (fun _ -> mk_mono()) a.a_params))) p;
+							let e1 = match e.eexpr with TCast(e1,None) -> e1 | _ -> e in
+							unify ctx e1.etype a.a_this e1.epos
+						| _ ->
+							()
+					end;
+					e
+				| _ ->
+					e
+				) in
+				let e = check_cast e in
+				cf.cf_expr <- Some e;
+				cf.cf_type <- t;
+				check_field_display ctx fctx c cf;
+			end;
+			t
+		) "bind_var" in
+		if not fctx.is_static then cctx.force_constructor <- true;
+		bind_type (ctx,cctx,fctx) cf r (snd e)
+
+let create_variable (ctx,cctx,fctx) c f t eo p =
+	if not fctx.is_static && cctx.abstract <> None then error (fst f.cff_name ^ ": Cannot declare member variable in abstract") p;
+	if fctx.is_inline && not fctx.is_static then error (fst f.cff_name ^ ": Inline variable must be static") p;
+	if fctx.is_inline && eo = None then error (fst f.cff_name ^ ": Inline variable must be initialized") p;
+	if fctx.is_final && not (fctx.is_extern || c.cl_extern || c.cl_interface)  && eo = None then begin
+		if fctx.is_static then error (fst f.cff_name ^ ": Static final variable must be initialized") p
+		else cctx.uninitialized_final <- Some f.cff_pos;
+	end;
+	let t = (match t with
+		| None when eo = None ->
+			error ("Variable requires type-hint or initialization") (pos f.cff_name);
+		| None ->
+			mk_mono()
+		| Some t ->
+			lazy_display_type ctx (fun () -> load_type_hint ctx p (Some t))
+	) in
+	let kind = if fctx.is_inline then
+		{ v_read = AccInline ; v_write = AccNever }
+	else if fctx.is_final then
+		{ v_read = AccNormal ; v_write = if fctx.is_static then AccNever else AccCtor }
+	else
+		{ v_read = AccNormal ; v_write = AccNormal }
+	in
+	let cf = {
+		(mk_field (fst f.cff_name) ~public:(is_public (ctx,cctx) f.cff_access None) t f.cff_pos (pos f.cff_name)) with
+		cf_doc = f.cff_doc;
+		cf_meta = f.cff_meta;
+		cf_kind = Var kind;
+	} in
+	if fctx.is_final then add_class_field_flag cf CfFinal;
+	if fctx.is_extern then add_class_field_flag cf CfExtern;
+	ctx.curfield <- cf;
+	bind_var (ctx,cctx,fctx) cf eo;
+	cf
+
+let check_abstract (ctx,cctx,fctx) c cf fd t ret p =
+	match cctx.abstract with
+		| Some a ->
+			let m = mk_mono() in
+			let ta = TAbstract(a, List.map (fun _ -> mk_mono()) a.a_params) in
+			let tthis = if fctx.is_abstract_member || Meta.has Meta.To cf.cf_meta then monomorphs a.a_params a.a_this else a.a_this in
+			let allows_no_expr = ref (Meta.has Meta.CoreType a.a_meta) in
+			let rec loop ml =
+				(match ml with
+				| (Meta.From,_,_) :: _ ->
+					let r = exc_protect ctx (fun r ->
+						r := lazy_processing (fun () -> t);
+						(* the return type of a from-function must be the abstract, not the underlying type *)
+						if not fctx.is_macro then (try type_eq EqStrict ret ta with Unify_error l -> error (error_msg (Unify l)) p);
+						match t with
+							| TFun([_,_,t],_) -> t
+							| _ -> error (cf.cf_name ^ ": @:from cast functions must accept exactly one argument") p
+					) "@:from" in
+					a.a_from_field <- (TLazy r,cf) :: a.a_from_field;
+				| (Meta.To,_,_) :: _ ->
+					if fctx.is_macro then error (cf.cf_name ^ ": Macro cast functions are not supported") p;
+					(* TODO: this doesn't seem quite right... *)
+					if not (Meta.has Meta.Impl cf.cf_meta) then cf.cf_meta <- (Meta.Impl,[],null_pos) :: cf.cf_meta;
+					let resolve_m args =
+						(try unify_raise ctx t (tfun (tthis :: args) m) cf.cf_pos with Error (Unify l,p) -> error (error_msg (Unify l)) p);
+						match follow m with
+							| TMono _ when (match t with TFun(_,r) -> r == t_dynamic | _ -> false) -> t_dynamic
+							| m -> m
+					in
+					let r = exc_protect ctx (fun r ->
+						r := lazy_processing (fun () -> t);
+						let args = if Meta.has Meta.MultiType a.a_meta then begin
+							let ctor = try
+								PMap.find "_new" c.cl_statics
+							with Not_found ->
+								error "Constructor of multi-type abstract must be defined before the individual @:to-functions are" cf.cf_pos
+							in
+							(* delay ctx PFinal (fun () -> unify ctx m tthis f.cff_pos); *)
+							let args = match follow (monomorphs a.a_params ctor.cf_type) with
+								| TFun(args,_) -> List.map (fun (_,_,t) -> t) args
+								| _ -> assert false
+							in
+							args
+						end else
+							[]
+						in
+						let t = resolve_m args in
+						t
+					) "@:to" in
+					a.a_to_field <- (TLazy r, cf) :: a.a_to_field
+				| ((Meta.ArrayAccess,_,_) | (Meta.Op,[(EArrayDecl _),_],_)) :: _ ->
+					if fctx.is_macro then error (cf.cf_name ^ ": Macro array-access functions are not supported") p;
+					a.a_array <- cf :: a.a_array;
+					fctx.expr_presence_matters <- true;
+				| (Meta.Op,[EBinop(OpAssign,_,_),_],_) :: _ ->
+					error (cf.cf_name ^ ": Assignment overloading is not supported") p;
+				| (Meta.Op,[EBinop(op,_,_),_],_) :: _ ->
+					if fctx.is_macro then error (cf.cf_name ^ ": Macro operator functions are not supported") p;
+					let targ = if fctx.is_abstract_member then tthis else ta in
+					let left_eq,right_eq = match follow t with
+						| TFun([(_,_,t1);(_,_,t2)],_) ->
+							type_iseq targ t1,type_iseq targ t2
+						| _ ->
+							if fctx.is_abstract_member then
+								error (cf.cf_name ^ ": Member @:op functions must accept exactly one argument") cf.cf_pos
+							else
+								error (cf.cf_name ^ ": Static @:op functions must accept exactly two arguments") cf.cf_pos
+					in
+					if not (left_eq || right_eq) then error (cf.cf_name ^ ": The left or right argument type must be " ^ (s_type (print_context()) targ)) cf.cf_pos;
+					if right_eq && Meta.has Meta.Commutative cf.cf_meta then error (cf.cf_name ^ ": @:commutative is only allowed if the right argument is not " ^ (s_type (print_context()) targ)) cf.cf_pos;
+					a.a_ops <- (op,cf) :: a.a_ops;
+					allows_no_expr := true;
+					fctx.expr_presence_matters <- true;
+				| (Meta.Op,[EUnop(op,flag,_),_],_) :: _ ->
+					if fctx.is_macro then error (cf.cf_name ^ ": Macro operator functions are not supported") p;
+					let targ = if fctx.is_abstract_member then tthis else ta in
+					(try type_eq EqStrict t (tfun [targ] (mk_mono())) with Unify_error l -> raise (Error ((Unify l),cf.cf_pos)));
+					a.a_unops <- (op,flag,cf) :: a.a_unops;
+					allows_no_expr := true;
+					fctx.expr_presence_matters <- true;
+				| (Meta.Impl,_,_) :: ml when cf.cf_name <> "_new" && not fctx.is_macro ->
+					begin match follow t with
+						| TFun((_,_,t1) :: _, _) when type_iseq tthis t1 ->
+							()
+						| _ ->
+							display_error ctx ("First argument of implementation function must be " ^ (s_type (print_context()) tthis)) cf.cf_pos
+					end;
+				| ((Meta.Resolve,_,_) | (Meta.Op,[EField _,_],_)) :: _ ->
+					let targ = if fctx.is_abstract_member then tthis else ta in
+					let check_fun t1 t2 =
+						if not fctx.is_macro then begin
+							if not (type_iseq targ t1) then error ("First argument type must be " ^ (s_type (print_context()) targ)) cf.cf_pos;
+							if not (type_iseq ctx.t.tstring t2) then error ("Second argument type must be String") cf.cf_pos
+						end
+					in
+					begin match follow t with
+						| TFun([(_,_,t1);(_,_,t2)],_) ->
+							if a.a_read <> None then error "Multiple resolve-read methods are not supported" cf.cf_pos;
+							check_fun t1 t2;
+							a.a_read <- Some cf;
+						| TFun([(_,_,t1);(_,_,t2);(_,_,t3)],_) ->
+							if a.a_write <> None then error "Multiple resolve-write methods are not supported" cf.cf_pos;
+							check_fun t1 t2;
+							a.a_write <- Some cf;
+						| _ ->
+							error ("Field type of resolve must be " ^ (s_type (print_context()) targ) ^ " -> String -> T") cf.cf_pos
+					end;
+				| _ -> ());
+				match ml with
+				| _ :: ml -> loop ml
+				| [] -> ()
+			in
+			loop cf.cf_meta;
+			let check_bind () =
+				if fd.f_expr = None then begin
+					if fctx.is_inline then error (cf.cf_name ^ ": Inline functions must have an expression") cf.cf_pos;
+					begin match fd.f_type with
+						| None -> error (cf.cf_name ^ ": Functions without expressions must have an explicit return type") cf.cf_pos
+						| Some _ -> ()
+					end;
+					cf.cf_meta <- (Meta.NoExpr,[],null_pos) :: cf.cf_meta;
+					fctx.do_bind <- false;
+					if not (Meta.has Meta.CoreType a.a_meta) then fctx.do_add <- false;
+				end
+			in
+			if cf.cf_name = "_new" && Meta.has Meta.MultiType a.a_meta then fctx.do_bind <- false;
+			if !allows_no_expr then check_bind()
+		| _ ->
+			()
+
+let create_method (ctx,cctx,fctx) c f fd p =
+	let params = TypeloadFunction.type_function_params ctx fd (fst f.cff_name) p in
+	if Meta.has Meta.Generic f.cff_meta then begin
+		if params = [] then error (fst f.cff_name ^ ": Generic functions must have type parameters") p;
+	end;
+	let fd = if fctx.is_macro && not ctx.in_macro && not fctx.is_static then
+		(* remove display of first argument which will contain the "this" expression *)
+		{ fd with f_args = match fd.f_args with [] -> [] | _ :: l -> l }
+	else
+		fd
+	in
+	let fd = if not fctx.is_macro then
+		fd
+	else begin
+		if ctx.in_macro then begin
+			(* a class with a macro cannot be extern in macro context (issue #2015) *)
+			c.cl_extern <- false;
+			let texpr = CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tparams = []; tsub = None } in
+			(* ExprOf type parameter might contain platform-specific type, let's replace it by Expr *)
+			let no_expr_of (t,p) = match t with
+				| CTPath { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = Some ("ExprOf"); tparams = [TPType _] }
+				| CTPath { tpackage = []; tname = ("ExprOf"); tsub = None; tparams = [TPType _] } -> Some (texpr,p)
+				| t -> Some (t,p)
+			in
+			{
+				f_params = fd.f_params;
+				f_type = (match fd.f_type with None -> Some (texpr,null_pos) | Some t -> no_expr_of t);
+				f_args = List.map (fun (a,o,m,t,e) -> a,o,m,(match t with None -> Some (texpr,null_pos) | Some t -> no_expr_of t),e) fd.f_args;
+				f_expr = fd.f_expr;
+			}
+		end else
+			let tdyn = Some (CTPath { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None },null_pos) in
+			let to_dyn p t = match t with
+				| { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = Some ("ExprOf"); tparams = [TPType t] } -> Some t
+				| { tpackage = []; tname = ("ExprOf"); tsub = None; tparams = [TPType t] } -> Some t
+				| { tpackage = ["haxe"]; tname = ("PosInfos"); tsub = None; tparams = [] } -> error "haxe.PosInfos is not allowed on macro functions, use Context.currentPos() instead" p
+				| _ -> tdyn
+			in
+			{
+				f_params = fd.f_params;
+				f_type = (match fd.f_type with Some (CTPath t,p) -> to_dyn p t | _ -> tdyn);
+				f_args = List.map (fun (a,o,m,t,_) -> a,o,m,(match t with Some (CTPath t,p) -> to_dyn p t | _ -> tdyn),None) fd.f_args;
+				f_expr = None;
+			}
+	end in
+	begin match c.cl_interface,fctx.field_kind with
+		| true,FKConstructor ->
+			error "An interface cannot have a constructor" p;
+		| true,_ ->
+			if not fctx.is_static && fd.f_expr <> None then error (fst f.cff_name ^ ": An interface method cannot have a body") p;
+			if fctx.is_inline && c.cl_interface then error (fst f.cff_name ^ ": You can't declare inline methods in interfaces") p;
+		| false,FKConstructor ->
+			if fctx.is_static then error "A constructor must not be static" p;
+			begin match fd.f_type with
+				| None -> ()
+				| Some (CTPath ({ tpackage = []; tname = "Void" } as tp),p) ->
+					if ctx.is_display_file && DisplayPosition.display_position#enclosed_in p then
+						ignore(load_instance ~allow_display:true ctx (tp,p) false);
+				| _ -> error "A class constructor can't have a return value" p;
+			end
+		| false,_ ->
+			()
+	end;
+	let parent = (if not fctx.is_static then get_parent c (fst f.cff_name) else None) in
+	let dynamic = List.mem_assoc ADynamic f.cff_access || (match parent with Some { cf_kind = Method MethDynamic } -> true | _ -> false) in
+	if fctx.is_inline && dynamic then error (fst f.cff_name ^ ": You can't have both 'inline' and 'dynamic'") p;
+	ctx.type_params <- if fctx.is_static && not fctx.is_abstract_member then params else params @ ctx.type_params;
+	(* TODO is_lib: avoid forcing the return type to be typed *)
+	let ret = if fctx.field_kind = FKConstructor then ctx.t.tvoid else type_opt (ctx,cctx) p fd.f_type in
+	let rec loop args = match args with
+		| ((name,p),opt,m,t,ct) :: args ->
+			(* TODO is_lib: avoid forcing the field to be typed *)
+			let t, ct = TypeloadFunction.type_function_arg ctx (type_opt (ctx,cctx) p t) ct opt p in
+			delay ctx PTypeField (fun() -> match follow t with
+				| TAbstract({a_path = ["haxe";"extern"],"Rest"},_) ->
+					if not fctx.is_extern && not c.cl_extern then error "Rest argument are only supported for extern methods" p;
+					if opt then error "Rest argument cannot be optional" p;
+					begin match ct with None -> () | Some (_,p) -> error "Rest argument cannot have default value" p end;
+					if args <> [] then error "Rest should only be used for the last function argument" p;
+				| _ ->
+					()
+			);
+			(name, ct, t) :: (loop args)
+		| [] ->
+			[]
+	in
+	let args = loop fd.f_args in
+	let t = TFun (fun_args args,ret) in
+	let cf = {
+		(mk_field (fst f.cff_name) ~public:(is_public (ctx,cctx) f.cff_access parent) t f.cff_pos (pos f.cff_name)) with
+		cf_doc = f.cff_doc;
+		cf_meta = f.cff_meta;
+		cf_kind = Method (if fctx.is_macro then MethMacro else if fctx.is_inline then MethInline else if dynamic then MethDynamic else MethNormal);
+		cf_params = params;
+	} in
+	if fctx.is_final then add_class_field_flag cf CfFinal;
+	if fctx.is_extern then add_class_field_flag cf CfExtern;
+	cf.cf_meta <- List.map (fun (m,el,p) -> match m,el with
+		| Meta.AstSource,[] -> (m,(match fd.f_expr with None -> [] | Some e -> [e]),p)
+		| _ -> m,el,p
+	) cf.cf_meta;
+	Option.may (fun cf_parent ->
+		if not (Meta.has Meta.Native cf.cf_meta) then
+			try
+				let native_meta = Meta.get Meta.Native cf_parent.cf_meta in
+				cf.cf_meta <- native_meta :: cf.cf_meta;
+			with Not_found ->
+				()
+	) parent;
+	generate_value_meta ctx.com (Some c) (fun meta -> cf.cf_meta <- meta :: cf.cf_meta) fd.f_args;
+	check_abstract (ctx,cctx,fctx) c cf fd t ret p;
+	init_meta_overloads ctx (Some c) cf;
+	ctx.curfield <- cf;
+	let r = exc_protect ~force:false ctx (fun r ->
+		if not !return_partial_type then begin
+			r := lazy_processing (fun() -> t);
+			cctx.context_init();
+			incr stats.s_methods_typed;
+			if ctx.com.verbose then Common.log ctx.com ("Typing " ^ (if ctx.in_macro then "macro " else "") ^ s_type_path c.cl_path ^ "." ^ fst f.cff_name);
+			let fmode = (match cctx.abstract with
+				| Some _ ->
+					(match args with
+					| ("this",_,_) :: _ -> FunMemberAbstract
+					| _ when fst f.cff_name = "_new" -> FunMemberAbstract
+					| _ -> FunStatic)
+				| None ->
+					if fctx.field_kind = FKConstructor then FunConstructor else if fctx.is_static then FunStatic else FunMember
+			) in
+			begin match ctx.com.platform with
+				| Java when is_java_native_function cf.cf_meta ->
+					if fd.f_expr <> None then
+						ctx.com.warning "@:native function definitions shouldn't include an expression. This behaviour is deprecated." cf.cf_pos;
+					cf.cf_expr <- None;
+					cf.cf_type <- t
+				| _ ->
+					if Meta.has Meta.DisplayOverride cf.cf_meta then DisplayEmitter.check_field_modifiers ctx c cf fctx.override fctx.display_modifier;
+					let e , fargs = TypeloadFunction.type_function ctx args ret fmode fd fctx.is_display_field p in
+					begin match fctx.field_kind with
+					| FKNormal when not fctx.is_static -> TypeloadCheck.check_overriding ctx c cf
+					| _ -> ()
+					end;
+					(* Disabled for now, see https://github.com/HaxeFoundation/haxe/issues/3033 *)
+					(* List.iter (fun (v,_) ->
+						if v.v_name <> "_" && has_mono v.v_type then ctx.com.warning "Uninferred function argument, please add a type-hint" v.v_pos;
+					) fargs; *)
+					let tf = {
+						tf_args = fargs;
+						tf_type = ret;
+						tf_expr = e;
+					} in
+					if fctx.field_kind = FKInit then
+						(match e.eexpr with
+						| TBlock [] | TBlock [{ eexpr = TConst _ }] | TConst _ | TObjectDecl [] -> ()
+						| _ -> c.cl_init <- Some e);
+					cf.cf_expr <- Some (mk (TFunction tf) t p);
+					cf.cf_type <- t;
+					check_field_display ctx fctx c cf;
+			end;
+		end;
+		t
+	) "type_fun" in
+	if fctx.do_bind then
+		bind_type (ctx,cctx,fctx) cf r (match fd.f_expr with Some e -> snd e | None -> f.cff_pos)
+	else begin
+		delay ctx PTypeField (fun () ->
+			(* We never enter type_function so we're missing out on the argument processing there. Let's do it here. *)
+			List.iter2 (fun (n,ct,t) ((_,pn),_,m,_,_) ->
+				(* dirty dodge to avoid flash extern problems until somebody fixes that *)
+				begin if ctx.com.platform = Flash && c.cl_extern then
+					()
+				else
+					ignore(TypeloadFunction.process_function_arg ctx n t ct fctx.is_display_field pn)
+				end;
+				if fctx.is_display_field && DisplayPosition.display_position#enclosed_in pn then begin
+					let v = add_local_with_origin ctx TVOArgument n t pn in
+					DisplayEmitter.display_variable ctx v pn;
+				end
+			) args fd.f_args;
+		);
+		check_field_display ctx fctx c cf;
+		if fd.f_expr <> None && not (fctx.is_inline || fctx.is_macro) then ctx.com.warning "Extern non-inline function may not have an expression" p;
+	end;
+	cf
+
+let create_property (ctx,cctx,fctx) c f (get,set,t,eo) p =
+	let name = fst f.cff_name in
+	(* TODO is_lib: lazify load_complex_type *)
+	let ret = (match t, eo with
+		| None, None -> error (name ^ ": Property requires type-hint or initialization") p;
+		| None, _ -> mk_mono()
+		| Some t, _ -> lazy_display_type ctx (fun () -> load_type_hint ctx p (Some t))
+	) in
+	let t_get,t_set = match cctx.abstract with
+		| Some a when fctx.is_abstract_member ->
+			if Meta.has Meta.IsVar f.cff_meta then error (name ^ ": Abstract properties cannot be real variables") f.cff_pos;
+			let ta = apply_params a.a_params (List.map snd a.a_params) a.a_this in
+			tfun [ta] ret, tfun [ta;ret] ret
+		| _ -> tfun [] ret, TFun(["value",false,ret],ret)
+	in
+	let find_accessor m =
+		(* on pf_overload platforms, the getter/setter may have been defined as an overloaded function; get all overloads *)
+		if ctx.com.config.pf_overload then
+			if fctx.is_static then
+				let f = PMap.find m c.cl_statics in
+				(f.cf_type, f) :: (List.map (fun f -> f.cf_type, f) f.cf_overloads)
+			else
+				Overloads.get_overloads c m
+		else
+			[ if fctx.is_static then
+				let f = PMap.find m c.cl_statics in
+				f.cf_type, f
+			else match class_field c (List.map snd c.cl_params) m with
+				| _, t,f -> t,f ]
+	in
+	let check_method m t =
+		if ctx.com.display.dms_error_policy = EPIgnore then () else
+		try
+			let overloads = find_accessor m in
+			(* choose the correct overload if and only if there is more than one overload found *)
+			let rec get_overload overl = match overl with
+				| [tf] -> tf
+				| (t2,f2) :: overl ->
+					if type_iseq t t2 then
+						(t2,f2)
+					else
+						get_overload overl
+				| [] ->
+					if c.cl_interface then
+						raise Not_found
+					else
+						raise (Error (Custom
+							(Printf.sprintf "No overloaded method named %s was compatible with the property %s with expected type %s" m (name) (s_type (print_context()) t)
+						), p))
+			in
+			let t2, f2 = get_overload overloads in
+			(* accessors must be public on As3 (issue #1872) *)
+			if Common.defined ctx.com Define.As3 then f2.cf_meta <- (Meta.Public,[],null_pos) :: f2.cf_meta;
+			(match f2.cf_kind with
+				| Method MethMacro ->
+					display_error ctx (f2.cf_name ^ ": Macro methods cannot be used as property accessor") p;
+					display_error ctx (f2.cf_name ^ ": Accessor method is here") f2.cf_pos;
+				| _ -> ());
+			unify_raise ctx t2 t f2.cf_pos;
+			if (fctx.is_abstract_member && not (Meta.has Meta.Impl f2.cf_meta)) || (Meta.has Meta.Impl f2.cf_meta && not (fctx.is_abstract_member)) then
+				display_error ctx "Mixing abstract implementation and static properties/accessors is not allowed" f2.cf_pos;
+			f2.cf_meta <- List.fold_left (fun acc ((m,_,_) as meta) -> match m with
+				| Meta.Deprecated -> meta :: acc
+				| _ -> acc
+			) f2.cf_meta f.cff_meta;
+		with
+			| Error (Unify l,p) -> raise (Error (Stack (Custom ("In method " ^ m ^ " required by property " ^ name),Unify l),p))
+			| Not_found ->
+				if c.cl_interface then begin
+					let cf = mk_field m t p null_pos in
+					cf.cf_meta <- [Meta.CompilerGenerated,[],null_pos];
+					cf.cf_kind <- Method MethNormal;
+					c.cl_fields <- PMap.add cf.cf_name cf c.cl_fields;
+					c.cl_ordered_fields <- cf :: c.cl_ordered_fields;
+				end else if not c.cl_extern then begin
+					try
+						let _, _, f2 = (if not fctx.is_static then let f = PMap.find m c.cl_statics in None, f.cf_type, f else class_field c (List.map snd c.cl_params) m) in
+						display_error ctx (Printf.sprintf "Method %s is no valid accessor for %s because it is %sstatic" m (name) (if fctx.is_static then "not " else "")) f2.cf_pos
+					with Not_found ->
+						display_error ctx ("Method " ^ m ^ " required by property " ^ name ^ " is missing") p
+				end
+	in
+	let display_accessor m p =
+		try
+			let cf = match find_accessor m with [_,cf] -> cf | _ -> raise Not_found in
+			DisplayEmitter.display_field ctx (Self (TClassDecl c)) (if fctx.is_static then CFSStatic else CFSMember) cf p
+		with Not_found ->
+			()
+	in
+	let delay_check = delay ctx PConnectField in
+	let get = (match get with
+		| "null",_ -> AccNo
+		| "dynamic",_ -> AccCall
+		| "never",_ -> AccNever
+		| "default",_ -> AccNormal
+		| "get",pget ->
+			let get = "get_" ^ name in
+			if fctx.is_display_field && DisplayPosition.display_position#enclosed_in pget then delay ctx PConnectField (fun () -> display_accessor get pget);
+			if not cctx.is_lib then delay_check (fun() -> check_method get t_get);
+			AccCall
+		| _,pget ->
+			display_error ctx (name ^ ": Custom property accessor is no longer supported, please use `get`") pget;
+			AccCall
+	) in
+	let set = (match set with
+		| "null",_ ->
+			(* standard flash library read-only variables can't be accessed for writing, even in subclasses *)
+			if c.cl_extern && (match c.cl_path with "flash" :: _	, _ -> true | _ -> false) && ctx.com.platform = Flash then
+				AccNever
+			else
+				AccNo
+		| "never",_ -> AccNever
+		| "dynamic",_ -> AccCall
+		| "default",_ -> AccNormal
+		| "set",pset ->
+			let set = "set_" ^ name in
+			if fctx.is_display_field && DisplayPosition.display_position#enclosed_in pset then delay ctx PConnectField (fun () -> display_accessor set pset);
+			if not cctx.is_lib then delay_check (fun() -> check_method set t_set);
+			AccCall
+		| _,pset ->
+			display_error ctx (name ^ ": Custom property accessor is no longer supported, please use `set`") pset;
+			AccCall
+	) in
+	if (set = AccNormal && get = AccCall) || (set = AccNever && get = AccNever)  then error (name ^ ": Unsupported property combination") p;
+	let cf = {
+		(mk_field name ~public:(is_public (ctx,cctx) f.cff_access None) ret f.cff_pos (pos f.cff_name)) with
+		cf_doc = f.cff_doc;
+		cf_meta = f.cff_meta;
+		cf_kind = Var { v_read = get; v_write = set };
+	} in
+	if fctx.is_extern then add_class_field_flag cf CfExtern;
+	ctx.curfield <- cf;
+	bind_var (ctx,cctx,fctx) cf eo;
+	cf
+
+(**
+	Emit compilation error on `final static function`
+*)
+let reject_final_static_method ctx cctx fctx f =
+	if fctx.is_static && fctx.is_final && not cctx.tclass.cl_extern then
+		let p =
+			try snd (List.find (fun (a,p) -> a = AFinal) f.cff_access)
+			with Not_found ->
+				try match Meta.get Meta.Final f.cff_meta with _, _, p -> p
+				with Not_found ->
+					try snd (List.find (fun (a,p) -> a = AStatic) f.cff_access)
+					with Not_found -> f.cff_pos
+		in
+		ctx.com.error "Static method cannot be final" p
+
+let init_field (ctx,cctx,fctx) f =
+	let c = cctx.tclass in
+	let name = fst f.cff_name in
+	TypeloadCheck.check_global_metadata ctx f.cff_meta (fun m -> f.cff_meta <- m :: f.cff_meta) c.cl_module.m_path c.cl_path (Some name);
+	let p = f.cff_pos in
+	if not c.cl_extern && not (Meta.has Meta.Native f.cff_meta) then Typecore.check_field_name ctx name p;
+	List.iter (fun acc ->
+		match (fst acc, f.cff_kind) with
+		| APublic, _ | APrivate, _ | AStatic, _ | AFinal, _ | AExtern, _ -> ()
+		| ADynamic, FFun _ | AOverride, FFun _ | AMacro, FFun _ | AInline, FFun _ | AInline, FVar _ -> ()
+		| _, FVar _ -> display_error ctx ("Invalid accessor '" ^ Ast.s_placed_access acc ^ "' for variable " ^ name) p
+		| _, FProp _ -> display_error ctx ("Invalid accessor '" ^ Ast.s_placed_access acc ^ "' for property " ^ name) p
+	) f.cff_access;
+	begin match fctx.override with
+		| Some _ -> (match c.cl_super with None -> error ("Invalid override on field '" ^ name ^ "': class has no super class") p | _ -> ());
+		| None -> ()
+	end;
+	begin match cctx.abstract with
+		| Some a when fctx.is_abstract_member -> ctx.type_params <- a.a_params;
+		| _ -> ()
+	end;
+	match f.cff_kind with
+	| FVar (t,e) ->
+		create_variable (ctx,cctx,fctx) c f t e p
+	| FFun fd ->
+		reject_final_static_method ctx cctx fctx f;
+		create_method (ctx,cctx,fctx) c f fd p
+	| FProp (get,set,t,eo) ->
+		create_property (ctx,cctx,fctx) c f (get,set,t,eo) p
+
+let check_overload ctx f fs =
+	try
+		let f2 =
+			List.find (fun f2 ->
+				f != f2 &&
+				Overloads.compare_overload_args ~ctx f.cf_type f2.cf_type f f2 = Overloads.Same
+			) fs
+		in
+		display_error ctx ("Another overloaded field of same signature was already declared : " ^ f.cf_name) f.cf_pos;
+		display_error ctx ("The second field is declared here") f2.cf_pos
+	with Not_found ->
+		try
+			let f2 =
+				List.find (fun f2 ->
+					f != f2 &&
+					Overloads.compare_overload_args ~ctx f.cf_type f2.cf_type f f2 = Overloads.Impl_conflict
+				) fs
+			in
+			display_error ctx (
+				"Another overloaded field of similar signature was already declared : " ^
+				f.cf_name ^
+				"\nThe signatures are different in Haxe, but not in the target language"
+			) f.cf_pos;
+			display_error ctx ("The second field is declared here") f2.cf_pos
+		with | Not_found -> ()
+
+let check_overloads ctx c =
+	(* check if field with same signature was declared more than once *)
+	List.iter (fun f ->
+		if Meta.has Meta.Overload f.cf_meta then
+			check_overload ctx f (f :: f.cf_overloads)
+	) (c.cl_ordered_fields @ c.cl_ordered_statics)
+
+let init_class ctx c p context_init herits fields =
+	let ctx,cctx = create_class_context ctx c context_init p in
+	if cctx.is_class_debug then print_endline ("Created class context: " ^ dump_class_context cctx);
+	let fields = patch_class ctx c fields in
+	let fields = build_fields (ctx,cctx) c fields in
+	if cctx.is_core_api && ctx.com.display.dms_check_core_api then delay ctx PForce (fun() -> init_core_api ctx c);
+	if not cctx.is_lib then begin
+		if ctx.com.config.pf_overload then delay ctx PForce (fun() -> check_overloads ctx c)
+	end;
+	let rec has_field f = function
+		| None -> false
+		| Some (c,_) ->
+			PMap.exists f c.cl_fields || has_field f c.cl_super || List.exists (fun i -> has_field f (Some i)) c.cl_implements
+	in
+	let rec check_require = function
+		| [] -> None
+		| (Meta.Require,conds,_) :: l ->
+			let rec loop = function
+				| [] -> check_require l
+				| e :: l ->
+					let sc = match fst e with
+						| EConst (Ident s) -> s
+						| EBinop ((OpEq|OpNotEq|OpGt|OpGte|OpLt|OpLte) as op,(EConst (Ident s),_),(EConst ((Int _ | Float _ | String _) as c),_)) -> s ^ s_binop op ^ s_constant c
+						| _ -> ""
+					in
+					if not (ParserEntry.is_true (ParserEntry.eval ctx.com.defines e)) then
+						Some (sc,(match List.rev l with (EConst (String(msg,_)),_) :: _ -> Some msg | _ -> None))
+					else
+						loop l
+			in
+			loop conds
+		| _ :: l ->
+			check_require l
+	in
+	let rec check_if_feature = function
+		| [] -> []
+		| (Meta.IfFeature,el,_) :: _ -> List.map (fun (e,p) -> match e with EConst (String(s,_)) -> s | _ -> error "String expected" p) el
+		| _ :: l -> check_if_feature l
+	in
+	let cl_if_feature = check_if_feature c.cl_meta in
+	let cl_req = check_require c.cl_meta in
+	List.iter (fun f ->
+		let p = f.cff_pos in
+		try
+			let ctx,fctx = create_field_context (ctx,cctx) c f in
+			if fctx.is_field_debug then print_endline ("Created field context: " ^ dump_field_context fctx);
+			let cf = init_field (ctx,cctx,fctx) f in
+			if fctx.is_field_debug then print_endline ("Created field: " ^ Printer.s_tclass_field "" cf);
+			if fctx.is_static && c.cl_interface && fctx.field_kind <> FKInit && not cctx.is_lib && not (c.cl_extern) then
+				error "You can't declare static fields in interfaces" p;
+			let set_feature s =
+				ctx.m.curmod.m_extra.m_if_feature <- (s,(c,cf,fctx.is_static)) :: ctx.m.curmod.m_extra.m_if_feature
+			in
+			List.iter set_feature cl_if_feature;
+			List.iter set_feature (check_if_feature cf.cf_meta);
+			let req = check_require f.cff_meta in
+			let req = (match req with None -> if fctx.is_static || fctx.field_kind = FKConstructor then cl_req else None | _ -> req) in
+			(match req with
+			| None -> ()
+			| Some r -> cf.cf_kind <- Var { v_read = AccRequire (fst r, snd r); v_write = AccRequire (fst r, snd r) });
+			begin match fctx.field_kind with
+			| FKConstructor ->
+				begin match c.cl_super with
+				| Some ({ cl_extern = false; cl_constructor = Some ctor_sup }, _) when has_class_field_flag ctor_sup CfFinal ->
+					ctx.com.error "Cannot override final constructor" cf.cf_pos
+				| _ -> ()
+				end;
+				begin match c.cl_constructor with
+				| None ->
+						c.cl_constructor <- Some cf
+				| Some ctor when ctx.com.config.pf_overload ->
+						if Meta.has Meta.Overload cf.cf_meta && Meta.has Meta.Overload ctor.cf_meta then
+							ctor.cf_overloads <- cf :: ctor.cf_overloads
+						else
+							display_error ctx ("If using overloaded constructors, all constructors must be declared with @:overload") (if Meta.has Meta.Overload cf.cf_meta then ctor.cf_pos else cf.cf_pos)
+				| Some ctor ->
+							display_error ctx "Duplicate constructor" p
+				end
+			| FKInit ->
+				()
+			| FKNormal ->
+				let dup = if fctx.is_static then PMap.exists cf.cf_name c.cl_fields || has_field cf.cf_name c.cl_super else PMap.exists cf.cf_name c.cl_statics in
+				if not cctx.is_native && not c.cl_extern && dup then error ("Same field name can't be used for both static and instance : " ^ cf.cf_name) p;
+				if fctx.override <> None then c.cl_overrides <- cf :: c.cl_overrides;
+				let is_var cf = match cf.cf_kind with | Var _ -> true | _ -> false in
+				if PMap.mem cf.cf_name (if fctx.is_static then c.cl_statics else c.cl_fields) then
+					if ctx.com.config.pf_overload && Meta.has Meta.Overload cf.cf_meta && not (is_var cf) then
+						let mainf = PMap.find cf.cf_name (if fctx.is_static then c.cl_statics else c.cl_fields) in
+						if is_var mainf then display_error ctx "Cannot declare a variable with same name as a method" mainf.cf_pos;
+						(if not (Meta.has Meta.Overload mainf.cf_meta) then display_error ctx ("Overloaded methods must have @:overload metadata") mainf.cf_pos);
+						mainf.cf_overloads <- cf :: mainf.cf_overloads
+					else
+						let type_kind,path = match c.cl_kind with
+							| KAbstractImpl a -> "abstract",a.a_path
+							| _ -> "class",c.cl_path
+						in
+						display_error ctx ("Duplicate " ^ type_kind ^ " field declaration : " ^ s_type_path path ^ "." ^ cf.cf_name) p
+				else
+				if fctx.do_add then add_field c cf (fctx.is_static || fctx.is_macro && ctx.in_macro)
+			end
+		with Error (Custom str,p2) when p = p2 ->
+			display_error ctx str p
+	) fields;
+	(match cctx.abstract with
+	| Some a ->
+		a.a_to_field <- List.rev a.a_to_field;
+		a.a_from_field <- List.rev a.a_from_field;
+		a.a_ops <- List.rev a.a_ops;
+		a.a_unops <- List.rev a.a_unops;
+		a.a_array <- List.rev a.a_array;
+	| None -> ());
+	c.cl_ordered_statics <- List.rev c.cl_ordered_statics;
+	c.cl_ordered_fields <- List.rev c.cl_ordered_fields;
+	(* if ctx.is_display_file && not cctx.has_display_field && Display.is_display_position c.cl_pos && ctx.com.display.dms_kind = DMToplevel then begin
+		let rec loop acc c tl =
+			let maybe_add acc cf = match cf.cf_kind with
+				| Method MethNormal when not (PMap.mem cf.cf_name acc) -> PMap.add cf.cf_name cf acc
+				| _ -> acc
+			in
+			let acc = List.fold_left maybe_add PMap.empty c.cl_ordered_fields in
+			match c.cl_super with
+			| Some(c,tl) -> loop acc c tl
+			| None -> acc
+		in
+		let fields = match c.cl_super with
+			| Some(c,tl) -> loop PMap.empty c tl
+			| None -> PMap.empty
+		in
+		let open Display in
+		let l = PMap.fold (fun cf acc ->
+			if not (List.exists (fun cf' -> cf'.cf_name = cf.cf_name) c.cl_overrides) then
+				(IdentifierType.ITClassMember cf) :: acc
+			else acc
+		) fields [] in
+		raise (Display.DisplayToplevel l)
+	end; *)
+	(*
+		make sure a default contructor with same access as super one will be added to the class structure at some point.
+	*)
+	let has_struct_init = Meta.has Meta.StructInit c.cl_meta in
+	if has_struct_init then
+		ensure_struct_init_constructor ctx c fields p;
+	begin match cctx.uninitialized_final with
+		| Some pf when c.cl_constructor = None ->
+			display_error ctx "This class has uninitialized final vars, which requires a constructor" p;
+			display_error ctx "Example of an uninitialized final var" pf;
+		| _ ->
+			()
+	end;
+	if not has_struct_init then
+		(* add_constructor does not deal with overloads correctly *)
+		if not ctx.com.config.pf_overload then TypeloadFunction.add_constructor ctx c cctx.force_constructor p;
+	(* check overloaded constructors *)
+	(if ctx.com.config.pf_overload && not cctx.is_lib then match c.cl_constructor with
+	| Some ctor ->
+		delay ctx PTypeField (fun () ->
+			(* TODO: consider making a broader check, and treat some types, like TAnon and type parameters as Dynamic *)
+			List.iter (fun f ->
+				check_overload ctx f (ctor :: ctor.cf_overloads)
+			) (ctor :: ctor.cf_overloads)
+		)
+	| _ -> ());
+	(* push delays in reverse order so they will be run in correct order *)
+	List.iter (fun (ctx,r) ->
+		init_class_done ctx;
+		(match r with
+		| None -> ()
+		| Some r -> delay ctx PTypeField (fun() -> ignore(lazy_type r)))
+	) cctx.delayed_expr
\ No newline at end of file
diff --git a/src/typing/typeloadFunction.ml b/src/typing/typeloadFunction.ml
new file mode 100644
index 0000000000000000000000000000000000000000..e85a9164a714e35eb8b41c041695c05394c1dea4
--- /dev/null
+++ b/src/typing/typeloadFunction.ml
@@ -0,0 +1,310 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+(* Typing of functions and their arguments. *)
+
+open Globals
+open Ast
+open Type
+open Typecore
+open DisplayTypes.DisplayMode
+open DisplayException
+open Common
+open Error
+
+let type_function_arg ctx t e opt p =
+	(* TODO https://github.com/HaxeFoundation/haxe/issues/8461 *)
+	(* delay ctx PTypeField (fun() ->
+		if ExtType.is_void (follow t) then
+			error "Arguments of type Void are not allowed" p
+	); *)
+	if opt then
+		let e = (match e with None -> Some (EConst (Ident "null"),null_pos) | _ -> e) in
+		ctx.t.tnull t, e
+	else
+		let t = match e with Some (EConst (Ident "null"),null_pos) -> ctx.t.tnull t | _ -> t in
+		t, e
+
+let save_field_state ctx =
+	let old_ret = ctx.ret in
+	let old_fun = ctx.curfun in
+	let old_opened = ctx.opened in
+	let locals = ctx.locals in
+	(fun () ->
+		ctx.locals <- locals;
+		ctx.ret <- old_ret;
+		ctx.curfun <- old_fun;
+		ctx.opened <- old_opened;
+	)
+
+let type_var_field ctx t e stat do_display p =
+	if stat then ctx.curfun <- FunStatic else ctx.curfun <- FunMember;
+	let e = if do_display then Display.ExprPreprocessing.process_expr ctx.com e else e in
+	let e = type_expr ctx e (WithType.with_type t) in
+	let e = AbstractCast.cast_or_unify ctx t e p in
+	match t with
+	| TType ({ t_path = ([],"UInt") },[]) | TAbstract ({ a_path = ([],"UInt") },[]) when stat -> { e with etype = t }
+	| _ -> e
+
+let type_var_field ctx t e stat do_display p =
+	let save = save_field_state ctx in
+	Std.finally save (type_var_field ctx t e stat do_display) p
+
+let type_function_params ctx fd fname p =
+	let params = ref [] in
+	params := Typeload.type_type_params ctx ([],fname) (fun() -> !params) p fd.f_params;
+	!params
+
+let type_function_arg_value ctx t c do_display =
+	match c with
+		| None -> None
+		| Some e ->
+			let p = pos e in
+			let e = if do_display then Display.ExprPreprocessing.process_expr ctx.com e else e in
+			let e = ctx.g.do_optimize ctx (type_expr ctx e (WithType.with_type t)) in
+			unify ctx e.etype t p;
+			let rec loop e = match e.eexpr with
+				| TConst _ -> Some e
+				| TField({eexpr = TTypeExpr _},FEnum _) -> Some e
+				| TCast(e,None) -> loop e
+				| _ ->
+					if ctx.com.display.dms_kind = DMNone || ctx.com.display.dms_inline && ctx.com.display.dms_error_policy = EPCollect then
+						display_error ctx "Parameter default value should be constant" p;
+					None
+			in
+			loop e
+
+let process_function_arg ctx n t c do_display p =
+	if starts_with n '$' then error "Function argument names starting with a dollar are not allowed" p;
+	type_function_arg_value ctx t c do_display
+
+let type_function ctx args ret fmode f do_display p =
+	let fargs = List.map2 (fun (n,c,t) ((_,pn),_,m,_,_) ->
+		let c = process_function_arg ctx n t c do_display pn in
+		let v = add_local_with_origin ctx TVOArgument n t pn in
+		v.v_meta <- v.v_meta @ m;
+		if do_display && DisplayPosition.display_position#enclosed_in pn then
+			DisplayEmitter.display_variable ctx v pn;
+		if n = "this" then v.v_meta <- (Meta.This,[],null_pos) :: v.v_meta;
+		v,c
+	) args f.f_args in
+	ctx.curfun <- fmode;
+	ctx.ret <- ret;
+	ctx.opened <- [];
+	let e = match f.f_expr with
+		| None ->
+			if ctx.com.display.dms_error_policy = EPIgnore then
+				(* when we don't care because we're in display mode, just act like
+				   the function has an empty block body. this is fine even if function
+				   defines a return type, because returns aren't checked in this mode
+				*)
+				EBlock [],p
+			else
+				error "Function body required" p
+		| Some e -> e
+	in
+	let is_position_debug = Meta.has (Meta.Custom ":debug.position") ctx.curfield.cf_meta in
+	let e = if not do_display then begin
+		if is_position_debug then print_endline ("syntax:\n" ^ (Expr.dump_with_pos e));
+		type_expr ctx e NoValue
+	end else begin
+		let is_display_debug = Meta.has (Meta.Custom ":debug.display") ctx.curfield.cf_meta in
+		if is_display_debug then print_endline ("before processing:\n" ^ (Expr.dump_with_pos e));
+		let e = if !Parser.had_resume then e else Display.ExprPreprocessing.process_expr ctx.com e in
+		if is_display_debug then print_endline ("after processing:\n" ^ (Expr.dump_with_pos e));
+		type_expr ctx e NoValue
+	end in
+	let e = match e.eexpr with
+		| TMeta((Meta.MergeBlock,_,_), ({eexpr = TBlock el} as e1)) -> e1
+		| _ -> e
+	in
+	let has_return e =
+		let rec loop e =
+			match e.eexpr with
+			| TReturn (Some _) -> raise Exit
+			| TFunction _ -> ()
+			| _ -> Type.iter loop e
+		in
+		try loop e; false with Exit -> true
+	in
+	begin match follow ret with
+		| TAbstract({a_path=[],"Void"},_) -> ()
+		(* We have to check for the presence of return expressions here because
+		   in the case of Dynamic ctx.ret is still a monomorph. If we indeed
+		   don't have a return expression we can link the monomorph to Void. We
+		   can _not_ use type_iseq to avoid the Void check above because that
+		   would turn Dynamic returns to Void returns. *)
+		| TMono t when not (has_return e) -> ignore(link t ret ctx.t.tvoid)
+		| _ when ctx.com.display.dms_error_policy = EPIgnore -> ()
+		| _ -> (try TypeloadCheck.return_flow ctx e with Exit -> ())
+	end;
+	let rec loop e =
+		match e.eexpr with
+		| TCall ({ eexpr = TConst TSuper },_) -> raise Exit
+		| TFunction _ -> ()
+		| _ -> Type.iter loop e
+	in
+	let has_super_constr() =
+		match ctx.curclass.cl_super with
+		| None ->
+			None
+		| Some (csup,tl) ->
+			try
+				let _,cf = get_constructor (fun f->f.cf_type) csup in
+				Some (Meta.has Meta.CompilerGenerated cf.cf_meta,TInst(csup,tl))
+			with Not_found ->
+				None
+	in
+	let e = if fmode <> FunConstructor then
+		e
+	else begin
+		delay ctx PForce (fun () -> TypeloadCheck.check_final_vars ctx e);
+		match has_super_constr() with
+		| Some (was_forced,t_super) ->
+			(try
+				loop e;
+				if was_forced then
+					let e_super = mk (TConst TSuper) t_super e.epos in
+					let e_super_call = mk (TCall(e_super,[])) ctx.t.tvoid e.epos in
+					concat e_super_call e
+				else begin
+					display_error ctx "Missing super constructor call" p;
+					e
+				end
+			with
+				Exit -> e);
+		| None ->
+			e
+	end in
+	let e = match ctx.curfun, ctx.vthis with
+		| (FunMember|FunConstructor), Some v ->
+			let ev = mk (TVar (v,Some (mk (TConst TThis) ctx.tthis p))) ctx.t.tvoid p in
+			(match e.eexpr with
+			| TBlock l ->
+				if ctx.com.config.pf_this_before_super then
+					{ e with eexpr = TBlock (ev :: l) }
+				else begin
+					let rec has_v e = match e.eexpr with
+						| TLocal v' when v == v -> true
+						| _ -> check_expr has_v e
+					in
+					let rec loop el = match el with
+						| e :: el ->
+							if has_v e then
+								ev :: e :: el
+							else
+								e :: loop el
+						| [] ->
+							(* should not happen... *)
+							[]
+					in
+					{ e with eexpr = TBlock (loop l) }
+				end
+			| _ -> mk (TBlock [ev;e]) e.etype p)
+		| _ -> e
+	in
+	List.iter (fun r -> r := Closed) ctx.opened;
+	if is_position_debug then print_endline ("typing:\n" ^ (Texpr.dump_with_pos "" e));
+	e , fargs
+
+let type_function ctx args ret fmode f do_display p =
+	let save = save_field_state ctx in
+	Std.finally save (type_function ctx args ret fmode f do_display) p
+
+let add_constructor ctx c force_constructor p =
+	match c.cl_constructor, c.cl_super with
+	| None, Some ({ cl_constructor = Some cfsup } as csup,cparams) when not c.cl_extern ->
+		let cf = {
+			cfsup with
+			cf_pos = p;
+			cf_meta = List.filter (fun (m,_,_) -> m = Meta.CompilerGenerated) cfsup.cf_meta;
+			cf_doc = None;
+			cf_expr = None;
+		} in
+		let r = exc_protect ctx (fun r ->
+			let t = mk_mono() in
+			r := lazy_processing (fun() -> t);
+			let ctx = { ctx with
+				curfield = cf;
+				pass = PTypeField;
+			} in
+			ignore (follow cfsup.cf_type); (* make sure it's typed *)
+			(if ctx.com.config.pf_overload then List.iter (fun cf -> ignore (follow cf.cf_type)) cf.cf_overloads);
+			let map_arg (v,def) =
+				(*
+					let's optimize a bit the output by not always copying the default value
+					into the inherited constructor when it's not necessary for the platform
+				*)
+				let null () = Some (Texpr.Builder.make_null v.v_type v.v_pos) in
+				match ctx.com.platform, def with
+				| _, Some _ when not ctx.com.config.pf_static -> v, null()
+				| Flash, Some ({eexpr = TConst (TString _)}) -> v, null()
+				| Cpp, Some ({eexpr = TConst (TString _)}) -> v, def
+				| Cpp, Some _ -> { v with v_type = ctx.t.tnull v.v_type }, null()
+				| _ -> v, def
+			in
+			let args = (match cfsup.cf_expr with
+				| Some { eexpr = TFunction f } ->
+					List.map map_arg f.tf_args
+				| _ ->
+					let values = get_value_meta cfsup.cf_meta in
+					match follow cfsup.cf_type with
+					| TFun (args,_) ->
+						List.map (fun (n,o,t) ->
+							let def = try
+								type_function_arg_value ctx t (Some (PMap.find n values)) false
+							with Not_found ->
+								if o then Some (Texpr.Builder.make_null t null_pos) else None
+							in
+							map_arg (alloc_var (VUser TVOArgument) n (if o then ctx.t.tnull t else t) p,def) (* TODO: var pos *)
+						) args
+					| _ -> assert false
+			) in
+			let p = c.cl_pos in
+			let vars = List.map (fun (v,def) -> alloc_var (VUser TVOArgument) v.v_name (apply_params csup.cl_params cparams v.v_type) v.v_pos, def) args in
+			let super_call = mk (TCall (mk (TConst TSuper) (TInst (csup,cparams)) p,List.map (fun (v,_) -> mk (TLocal v) v.v_type p) vars)) ctx.t.tvoid p in
+			let constr = mk (TFunction {
+				tf_args = vars;
+				tf_type = ctx.t.tvoid;
+				tf_expr = super_call;
+			}) (TFun (List.map (fun (v,c) -> v.v_name, c <> None, v.v_type) vars,ctx.t.tvoid)) p in
+			cf.cf_expr <- Some constr;
+			cf.cf_type <- t;
+			unify ctx t constr.etype p;
+			t
+		) "add_constructor" in
+		cf.cf_type <- TLazy r;
+		c.cl_constructor <- Some cf;
+	| None,_ when force_constructor ->
+		let constr = mk (TFunction {
+			tf_args = [];
+			tf_type = ctx.t.tvoid;
+			tf_expr = mk (TBlock []) ctx.t.tvoid p;
+		}) (tfun [] ctx.t.tvoid) p in
+		let cf = mk_field "new" constr.etype p null_pos in
+		cf.cf_expr <- Some constr;
+		cf.cf_type <- constr.etype;
+		cf.cf_meta <- [Meta.CompilerGenerated,[],null_pos];
+		cf.cf_kind <- Method MethNormal;
+		c.cl_constructor <- Some cf;
+	| _ ->
+		(* nothing to do *)
+		()
+;;
+Typeload.type_function_params_rec := type_function_params
\ No newline at end of file
diff --git a/src/typing/typeloadModule.ml b/src/typing/typeloadModule.ml
new file mode 100644
index 0000000000000000000000000000000000000000..4e880a9a4e1bb1824e1b81ddc4a9cb5f5a261d79
--- /dev/null
+++ b/src/typing/typeloadModule.ml
@@ -0,0 +1,995 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+(* Initial typing of modules and their types. *)
+
+open Globals
+open Ast
+open Filename
+open Type
+open Typecore
+open DisplayTypes.DisplayMode
+open DisplayTypes.CompletionResultKind
+open Common
+open Typeload
+open Error
+
+let get_policy ctx mpath =
+	let sl1 = full_dot_path2 mpath mpath in
+	List.fold_left (fun acc (sl2,policy,recursive) -> if match_path recursive sl1 sl2 then policy @ acc else acc) [] ctx.g.module_check_policies
+
+let make_module ctx mpath file loadp =
+	let m = {
+		m_id = alloc_mid();
+		m_path = mpath;
+		m_types = [];
+		m_extra = module_extra (Path.unique_full_path file) (Define.get_signature ctx.com.defines) (file_time file) (if ctx.in_macro then MMacro else MCode) (get_policy ctx mpath);
+	} in
+	m
+
+let add_module ctx m p =
+	List.iter (TypeloadCheck.check_module_types ctx m p) m.m_types;
+	Hashtbl.add ctx.g.modules m.m_path m
+
+module StrictMeta = struct
+	let get_native_repr md pos =
+		let path, meta = match md with
+			| TClassDecl cl -> cl.cl_path, cl.cl_meta
+			| TEnumDecl e -> e.e_path, e.e_meta
+			| TTypeDecl t -> t.t_path, t.t_meta
+			| TAbstractDecl a -> a.a_path, a.a_meta
+		in
+		let rec loop acc = function
+			| (Meta.JavaCanonical,[EConst(String(pack,_)),_; EConst(String(name,_)),_],_) :: _ ->
+				ExtString.String.nsplit pack ".", name
+			| (Meta.Native,[EConst(String(name,_)),_],_) :: meta ->
+				loop (Ast.parse_path name) meta
+			| _ :: meta ->
+				loop acc meta
+			| [] ->
+				acc
+		in
+		let pack, name = loop path meta in
+		match pack with
+			| [] ->
+				(EConst(Ident(name)), pos)
+			| hd :: tl ->
+				let rec loop pack expr = match pack with
+					| hd :: tl ->
+						loop tl (EField(expr,hd),pos)
+					| [] ->
+						(EField(expr,name),pos)
+				in
+				loop tl (EConst(Ident(hd)),pos)
+
+	let rec process_meta_argument ?(toplevel=true) ctx expr = match expr.eexpr with
+		| TField(e,f) ->
+			(EField(process_meta_argument ~toplevel:false ctx e,field_name f),expr.epos)
+		| TConst(TInt i) ->
+			(EConst(Int (Int32.to_string i)), expr.epos)
+		| TConst(TFloat f) ->
+			(EConst(Float f), expr.epos)
+		| TConst(TString s) ->
+			(EConst(String(s,SDoubleQuotes)), expr.epos)
+		| TConst TNull ->
+			(EConst(Ident "null"), expr.epos)
+		| TConst(TBool b) ->
+			(EConst(Ident (string_of_bool b)), expr.epos)
+		| TCast(e,_) | TMeta(_,e) | TParenthesis(e) ->
+			process_meta_argument ~toplevel ctx e
+		| TTypeExpr md when toplevel ->
+			let p = expr.epos in
+			if ctx.com.platform = Cs then
+				(ECall( (EConst(Ident "typeof"), p), [get_native_repr md expr.epos] ), p)
+			else
+				(EField(get_native_repr md expr.epos, "class"), p)
+		| TTypeExpr md ->
+			get_native_repr md expr.epos
+		| _ ->
+			display_error ctx "This expression is too complex to be a strict metadata argument" expr.epos;
+			(EConst(Ident "null"), expr.epos)
+
+	let handle_fields ctx fields_to_check with_type_expr =
+		List.map (fun ((name,_,_),expr) ->
+			let pos = snd expr in
+			let field = (EField(with_type_expr,name), pos) in
+			let fieldexpr = (EConst(Ident name),pos) in
+			let left_side = match ctx.com.platform with
+				| Cs -> field
+				| Java -> (ECall(field,[]),pos)
+				| _ -> assert false
+			in
+
+			let left = type_expr ctx left_side NoValue in
+			let right = type_expr ctx expr (WithType.with_type left.etype) in
+			unify ctx left.etype right.etype (snd expr);
+			(EBinop(Ast.OpAssign,fieldexpr,process_meta_argument ctx right), pos)
+		) fields_to_check
+
+	let make_meta ctx texpr extra =
+		match texpr.eexpr with
+			| TNew(c,_,el) ->
+				ECall(get_native_repr (TClassDecl c) texpr.epos, (List.map (process_meta_argument ctx) el) @ extra), texpr.epos
+			| TTypeExpr(md) ->
+				ECall(get_native_repr md texpr.epos, extra), texpr.epos
+			| _ ->
+				display_error ctx "Unexpected expression" texpr.epos; assert false
+
+	let get_strict_meta ctx params pos =
+		let pf = ctx.com.platform in
+		let changed_expr, fields_to_check, ctype = match params with
+			| [ECall(ef, el),p] ->
+				(* check last argument *)
+				let el, fields = match List.rev el with
+					| (EObjectDecl(decl),_) :: el ->
+						List.rev el, decl
+					| _ ->
+						el, []
+				in
+				let tpath = field_to_type_path ctx ef in
+				if pf = Cs then
+					(ENew((tpath,snd ef), el), p), fields, CTPath tpath
+				else
+					ef, fields, CTPath tpath
+			| [EConst(Ident i),p as expr] ->
+				let tpath = { tpackage=[]; tname=i; tparams=[]; tsub=None } in
+				if pf = Cs then
+					(ENew((tpath,p), []), p), [], CTPath tpath
+				else
+					expr, [], CTPath tpath
+			| [ (EField(_),p as field) ] ->
+				let tpath = field_to_type_path ctx field in
+				if pf = Cs then
+					(ENew((tpath,p), []), p), [], CTPath tpath
+				else
+					field, [], CTPath tpath
+			| _ ->
+				display_error ctx "A @:strict metadata must contain exactly one parameter. Please check the documentation for more information" pos;
+				raise Exit
+		in
+		let texpr = type_expr ctx changed_expr NoValue in
+		let with_type_expr = (ECheckType( (EConst (Ident "null"), pos), (ctype,null_pos) ), pos) in
+		let extra = handle_fields ctx fields_to_check with_type_expr in
+		Meta.Meta, [make_meta ctx texpr extra], pos
+
+	let check_strict_meta ctx metas =
+		let pf = ctx.com.platform in
+		match pf with
+			| Cs | Java ->
+				let ret = ref [] in
+				List.iter (function
+					| Meta.Strict,params,pos -> (try
+						ret := get_strict_meta ctx params pos :: !ret
+					with | Exit -> ())
+					| _ -> ()
+				) metas;
+				!ret
+			| _ -> []
+end
+
+(*
+	Build module structure : should be atomic - no type loading is possible
+*)
+let module_pass_1 ctx m tdecls loadp =
+	let com = ctx.com in
+	let decls = ref [] in
+	let make_path name priv =
+		if List.exists (fun (t,_) -> snd (t_path t) = name) !decls then error ("Type name " ^ name ^ " is already defined in this module") loadp;
+		if priv then (fst m.m_path @ ["_" ^ snd m.m_path], name) else (fst m.m_path, name)
+	in
+	let pt = ref None in
+	let rec make_decl acc decl =
+		let p = snd decl in
+		let check_type_name type_name meta =
+			let module_name = snd m.m_path in
+			if type_name <> module_name && not (Meta.has Meta.Native meta) then Typecore.check_uppercase_identifier_name ctx type_name "type" p;
+		in
+		let acc = (match fst decl with
+		| EImport _ | EUsing _ ->
+			(match !pt with
+			| None -> acc
+			| Some _ -> error "import and using may not appear after a type declaration" p)
+		| EClass d ->
+			let name = fst d.d_name in
+			pt := Some p;
+			let priv = List.mem HPrivate d.d_flags in
+			let path = make_path name priv in
+			let c = mk_class m path p (pos d.d_name) in
+			(* we shouldn't load any other type until we propertly set cl_build *)
+			c.cl_build <- (fun() -> error (s_type_path c.cl_path ^ " is not ready to be accessed, separate your type declarations in several files") p);
+			c.cl_module <- m;
+			c.cl_private <- priv;
+			c.cl_doc <- d.d_doc;
+			c.cl_meta <- d.d_meta;
+			List.iter (function
+				| HExtern -> c.cl_extern <- true
+				| HInterface -> c.cl_interface <- true
+				| HFinal -> c.cl_final <- true
+				| _ -> ()
+			) d.d_flags;
+			if not c.cl_extern then check_type_name name d.d_meta;
+			decls := (TClassDecl c, decl) :: !decls;
+			acc
+		| EEnum d ->
+			let name = fst d.d_name in
+			pt := Some p;
+			let priv = List.mem EPrivate d.d_flags in
+			let path = make_path name priv in
+			if Meta.has (Meta.Custom ":fakeEnum") d.d_meta then error "@:fakeEnum enums is no longer supported in Haxe 4, use extern enum abstract instead" p;
+			let e = {
+				e_path = path;
+				e_module = m;
+				e_pos = p;
+				e_name_pos = (pos d.d_name);
+				e_doc = d.d_doc;
+				e_meta = d.d_meta;
+				e_params = [];
+				e_using = [];
+				e_private = priv;
+				e_extern = List.mem EExtern d.d_flags;
+				e_constrs = PMap.empty;
+				e_names = [];
+				e_type = enum_module_type m path p;
+			} in
+			if not e.e_extern then check_type_name name d.d_meta;
+			decls := (TEnumDecl e, decl) :: !decls;
+			acc
+		| ETypedef d ->
+			let name = fst d.d_name in
+			check_type_name name d.d_meta;
+			if has_meta Meta.Using d.d_meta then error "@:using on typedef is not allowed" p;
+			pt := Some p;
+			let priv = List.mem EPrivate d.d_flags in
+			let path = make_path name priv in
+			let t = {
+				t_path = path;
+				t_module = m;
+				t_pos = p;
+				t_name_pos = pos d.d_name;
+				t_doc = d.d_doc;
+				t_private = priv;
+				t_params = [];
+				t_using = [];
+				t_type = mk_mono();
+				t_meta = d.d_meta;
+			} in
+			(* failsafe in case the typedef is not initialized (see #3933) *)
+			delay ctx PBuildModule (fun () ->
+				match t.t_type with
+				| TMono r -> (match !r with None -> r := Some com.basic.tvoid | _ -> ())
+				| _ -> ()
+			);
+			decls := (TTypeDecl t, decl) :: !decls;
+			acc
+		 | EAbstract d ->
+		 	let name = fst d.d_name in
+			check_type_name name d.d_meta;
+			let priv = List.mem AbPrivate d.d_flags in
+			let path = make_path name priv in
+			let a = {
+				a_path = path;
+				a_private = priv;
+				a_module = m;
+				a_pos = p;
+				a_name_pos = pos d.d_name;
+				a_doc = d.d_doc;
+				a_params = [];
+				a_using = [];
+				a_meta = d.d_meta;
+				a_from = [];
+				a_to = [];
+				a_from_field = [];
+				a_to_field = [];
+				a_ops = [];
+				a_unops = [];
+				a_impl = None;
+				a_array = [];
+				a_this = mk_mono();
+				a_read = None;
+				a_write = None;
+			} in
+			decls := (TAbstractDecl a, decl) :: !decls;
+			match d.d_data with
+			| [] when Meta.has Meta.CoreType a.a_meta ->
+				a.a_this <- t_dynamic;
+				acc
+			| fields ->
+				let a_t =
+					let params = List.map (fun t -> TPType (CTPath { tname = fst t.tp_name; tparams = []; tsub = None; tpackage = [] },null_pos)) d.d_params in
+					CTPath { tpackage = []; tname = fst d.d_name; tparams = params; tsub = None },null_pos
+				in
+				let rec loop = function
+					| [] -> a_t
+					| AbOver t :: _ -> t
+					| _ :: l -> loop l
+				in
+				let this_t = loop d.d_flags in
+				let fields = List.map (TypeloadFields.transform_abstract_field com this_t a_t a) fields in
+				let meta = ref [] in
+				if has_meta Meta.Dce a.a_meta then meta := (Meta.Dce,[],null_pos) :: !meta;
+				let acc = make_decl acc (EClass { d_name = (fst d.d_name) ^ "_Impl_",snd d.d_name; d_flags = [HPrivate]; d_data = fields; d_doc = None; d_params = []; d_meta = !meta },p) in
+				(match !decls with
+				| (TClassDecl c,_) :: _ ->
+					List.iter (fun m -> match m with
+						| ((Meta.Using | Meta.Build | Meta.CoreApi | Meta.Allow | Meta.Access | Meta.Enum | Meta.Dce | Meta.Native | Meta.HlNative | Meta.JsRequire | Meta.PythonImport | Meta.Expose | Meta.Deprecated | Meta.PhpGlobal),_,_) ->
+							c.cl_meta <- m :: c.cl_meta;
+						| _ ->
+							()
+					) a.a_meta;
+					a.a_impl <- Some c;
+					c.cl_kind <- KAbstractImpl a;
+					c.cl_final <- true;
+				| _ -> assert false);
+				acc
+		) in
+		decl :: acc
+	in
+	let tdecls = List.fold_left make_decl [] tdecls in
+	let decls = List.rev !decls in
+	decls, List.rev tdecls
+
+(*
+	In this pass, we can access load and access other modules types, but we cannot follow them or access their structure
+	since they have not been setup. We also build a context_init list that will be evaluated the first time we evaluate
+	an expression into the context
+*)
+let init_module_type ctx context_init do_init (decl,p) =
+	let get_type name =
+		try List.find (fun t -> snd (t_infos t).mt_path = name) ctx.m.curmod.m_types with Not_found -> assert false
+	in
+	let check_path_display path p = match ctx.com.display.dms_kind with
+		(* We cannot use ctx.is_display_file because the import could come from an import.hx file. *)
+		| DMDiagnostics b when (b || DisplayPosition.display_position#is_in_file p.pfile) && Filename.basename p.pfile <> "import.hx" ->
+			ImportHandling.add_import_position ctx.com p path;
+		| DMStatistics ->
+			ImportHandling.add_import_position ctx.com p path;
+		| DMUsage _ ->
+			ImportHandling.add_import_position ctx.com p path;
+			if DisplayPosition.display_position#is_in_file p.pfile then DisplayPath.handle_path_display ctx path p
+		| _ ->
+			if DisplayPosition.display_position#is_in_file p.pfile then DisplayPath.handle_path_display ctx path p
+	in
+	match decl with
+	| EImport (path,mode) ->
+		ctx.m.module_imports <- (path,mode) :: ctx.m.module_imports;
+		check_path_display path p;
+		let rec loop acc = function
+			| x :: l when is_lower_ident (fst x) -> loop (x::acc) l
+			| rest -> List.rev acc, rest
+		in
+		let pack, rest = loop [] path in
+		(match rest with
+		| [] ->
+			(match mode with
+			| IAll ->
+				ctx.m.wildcard_packages <- (List.map fst pack,p) :: ctx.m.wildcard_packages
+			| _ ->
+				(match List.rev path with
+				(* p spans `import |` (to the display position), so we take the pmax here *)
+				| [] -> DisplayException.raise_fields (DisplayToplevel.collect ctx TKType NoValue) CRImport (DisplayTypes.make_subject None {p with pmin = p.pmax})
+				| (_,p) :: _ -> error "Module name must start with an uppercase letter" p))
+		| (tname,p2) :: rest ->
+			let p1 = (match pack with [] -> p2 | (_,p1) :: _ -> p1) in
+			let p_type = punion p1 p2 in
+			let md = ctx.g.do_load_module ctx (List.map fst pack,tname) p_type in
+			let types = md.m_types in
+			let no_private (t,_) = not (t_infos t).mt_private in
+			let chk_private t p = if (t_infos t).mt_private then error "You can't import a private type" p in
+			let has_name name t = snd (t_infos t).mt_path = name in
+			let get_type tname =
+				let t = (try List.find (has_name tname) types with Not_found -> error (StringError.string_error tname (List.map (fun mt -> snd (t_infos mt).mt_path) types) ("Module " ^ s_type_path md.m_path ^ " does not define type " ^ tname)) p_type) in
+				chk_private t p_type;
+				t
+			in
+			let rebind t name p =
+				if not (name.[0] >= 'A' && name.[0] <= 'Z') then
+					error "Type aliases must start with an uppercase letter" p;
+				let _, _, f = ctx.g.do_build_instance ctx t p_type in
+				(* create a temp private typedef, does not register it in module *)
+				let mt = TTypeDecl {
+					t_path = (fst md.m_path @ ["_" ^ snd md.m_path],name);
+					t_module = ctx.m.curmod;
+					t_pos = p;
+					t_name_pos = p;
+					t_private = true;
+					t_doc = None;
+					t_meta = [];
+					t_params = (t_infos t).mt_params;
+					t_using = [];
+					t_type = f (List.map snd (t_infos t).mt_params);
+				} in
+				if ctx.is_display_file && DisplayPosition.display_position#enclosed_in p then
+					DisplayEmitter.display_module_type ctx mt p;
+				mt
+			in
+			let add_static_init t name s =
+				let name = (match name with None -> s | Some (n,_) -> n) in
+				match resolve_typedef t with
+				| TClassDecl c | TAbstractDecl {a_impl = Some c} ->
+					ignore(c.cl_build());
+					ignore(PMap.find s c.cl_statics);
+					ctx.m.module_globals <- PMap.add name (TClassDecl c,s,p) ctx.m.module_globals
+				| TEnumDecl e ->
+					ignore(PMap.find s e.e_constrs);
+					ctx.m.module_globals <- PMap.add name (TEnumDecl e,s,p) ctx.m.module_globals
+				| _ ->
+					raise Not_found
+			in
+			(match mode with
+			| INormal | IAsName _ ->
+				let name = (match mode with IAsName n -> Some n | _ -> None) in
+				(match rest with
+				| [] ->
+					(match name with
+					| None ->
+						ctx.m.module_types <- List.filter no_private (List.map (fun t -> t,p) types) @ ctx.m.module_types
+					| Some(newname,pname) ->
+						ctx.m.module_types <- (rebind (get_type tname) newname pname,p) :: ctx.m.module_types);
+				| [tsub,p2] ->
+					let pu = punion p1 p2 in
+					(try
+						let tsub = List.find (has_name tsub) types in
+						chk_private tsub pu;
+						ctx.m.module_types <- ((match name with None -> tsub | Some(n,pname) -> rebind tsub n pname),p) :: ctx.m.module_types
+					with Not_found ->
+						(* this might be a static property, wait later to check *)
+						let tmain = get_type tname in
+						context_init := (fun() ->
+							try
+								add_static_init tmain name tsub
+							with Not_found ->
+								error (s_type_path (t_infos tmain).mt_path ^ " has no field or subtype " ^ tsub) p
+						) :: !context_init)
+				| (tsub,p2) :: (fname,p3) :: rest ->
+					(match rest with
+					| [] -> ()
+					| (n,p) :: _ -> error ("Unexpected " ^ n) p);
+					let tsub = get_type tsub in
+					context_init := (fun() ->
+						try
+							add_static_init tsub name fname
+						with Not_found ->
+							error (s_type_path (t_infos tsub).mt_path ^ " has no field " ^ fname) (punion p p3)
+					) :: !context_init;
+				)
+			| IAll ->
+				let t = (match rest with
+					| [] -> get_type tname
+					| [tsub,_] -> get_type tsub
+					| _ :: (n,p) :: _ -> error ("Unexpected " ^ n) p
+				) in
+				context_init := (fun() ->
+					match resolve_typedef t with
+					| TClassDecl c
+					| TAbstractDecl {a_impl = Some c} ->
+						ignore(c.cl_build());
+						PMap.iter (fun _ cf -> if not (has_meta Meta.NoImportGlobal cf.cf_meta) then ctx.m.module_globals <- PMap.add cf.cf_name (TClassDecl c,cf.cf_name,p) ctx.m.module_globals) c.cl_statics
+					| TEnumDecl e ->
+						PMap.iter (fun _ c -> if not (has_meta Meta.NoImportGlobal c.ef_meta) then ctx.m.module_globals <- PMap.add c.ef_name (TEnumDecl e,c.ef_name,p) ctx.m.module_globals) e.e_constrs
+					| _ ->
+						error "No statics to import from this type" p
+				) :: !context_init
+			))
+	| EUsing path ->
+		check_path_display path p;
+		let types,filter_classes = handle_using ctx path p in
+		(* do the import first *)
+		ctx.m.module_types <- (List.map (fun t -> t,p) types) @ ctx.m.module_types;
+		context_init := (fun() -> ctx.m.module_using <- filter_classes types @ ctx.m.module_using) :: !context_init
+	| EClass d ->
+		let c = (match get_type (fst d.d_name) with TClassDecl c -> c | _ -> assert false) in
+		if ctx.is_display_file && DisplayPosition.display_position#enclosed_in (pos d.d_name) then
+			DisplayEmitter.display_module_type ctx (match c.cl_kind with KAbstractImpl a -> TAbstractDecl a | _ -> TClassDecl c) (pos d.d_name);
+		TypeloadCheck.check_global_metadata ctx c.cl_meta (fun m -> c.cl_meta <- m :: c.cl_meta) c.cl_module.m_path c.cl_path None;
+		let herits = d.d_flags in
+		List.iter (fun (m,_,p) ->
+			if m = Meta.Final then begin
+				c.cl_final <- true;
+				(* if p <> null_pos && not (Define.is_haxe3_compat ctx.com.defines) then
+					ctx.com.warning "`@:final class` is deprecated in favor of `final class`" p; *)
+			end
+		) d.d_meta;
+		let prev_build_count = ref (!build_count - 1) in
+		let build() =
+			let fl = TypeloadCheck.Inheritance.set_heritance ctx c herits p in
+			let rec build() =
+				c.cl_build <- (fun()-> Building [c]);
+				try
+					List.iter (fun f -> f()) fl;
+					TypeloadFields.init_class ctx c p do_init d.d_flags d.d_data;
+					c.cl_build <- (fun()-> Built);
+					incr build_count;
+					List.iter (fun (_,t) -> ignore(follow t)) c.cl_params;
+					Built;
+				with TypeloadCheck.Build_canceled state ->
+					c.cl_build <- make_pass ctx build;
+					let rebuild() =
+						delay_late ctx PBuildClass (fun() -> ignore(c.cl_build()));
+					in
+					(match state with
+					| Built -> assert false
+					| Building cl ->
+						if !build_count = !prev_build_count then error ("Loop in class building prevent compiler termination (" ^ String.concat "," (List.map (fun c -> s_type_path c.cl_path) cl) ^ ")") c.cl_pos;
+						prev_build_count := !build_count;
+						rebuild();
+						Building (c :: cl)
+					| BuildMacro f ->
+						f := rebuild :: !f;
+						state);
+				| exn ->
+					c.cl_build <- (fun()-> Built);
+					raise exn
+			in
+			build()
+		in
+		ctx.pass <- PBuildClass;
+		ctx.curclass <- c;
+		c.cl_build <- make_pass ctx build;
+		ctx.pass <- PBuildModule;
+		ctx.curclass <- null_class;
+		delay ctx PBuildClass (fun() -> ignore(c.cl_build()));
+		if (ctx.com.platform = Java || ctx.com.platform = Cs) && not c.cl_extern then
+			delay ctx PTypeField (fun () ->
+				let metas = StrictMeta.check_strict_meta ctx c.cl_meta in
+				if metas <> [] then c.cl_meta <- metas @ c.cl_meta;
+				let rec run_field cf =
+					let metas = StrictMeta.check_strict_meta ctx cf.cf_meta in
+					if metas <> [] then cf.cf_meta <- metas @ cf.cf_meta;
+					List.iter run_field cf.cf_overloads
+				in
+				List.iter run_field c.cl_ordered_statics;
+				List.iter run_field c.cl_ordered_fields;
+				match c.cl_constructor with
+					| Some f -> run_field f
+					| _ -> ()
+			);
+	| EEnum d ->
+		let e = (match get_type (fst d.d_name) with TEnumDecl e -> e | _ -> assert false) in
+		if ctx.is_display_file && DisplayPosition.display_position#enclosed_in (pos d.d_name) then
+			DisplayEmitter.display_module_type ctx (TEnumDecl e) (pos d.d_name);
+		let ctx = { ctx with type_params = e.e_params } in
+		let h = (try Some (Hashtbl.find ctx.g.type_patches e.e_path) with Not_found -> None) in
+		TypeloadCheck.check_global_metadata ctx e.e_meta (fun m -> e.e_meta <- m :: e.e_meta) e.e_module.m_path e.e_path None;
+		(match h with
+		| None -> ()
+		| Some (h,hcl) ->
+			Hashtbl.iter (fun _ _ -> error "Field type patch not supported for enums" e.e_pos) h;
+			e.e_meta <- e.e_meta @ hcl.tp_meta);
+		let constructs = ref d.d_data in
+		let get_constructs() =
+			List.map (fun c ->
+				{
+					cff_name = c.ec_name;
+					cff_doc = c.ec_doc;
+					cff_meta = c.ec_meta;
+					cff_pos = c.ec_pos;
+					cff_access = [];
+					cff_kind = (match c.ec_args, c.ec_params with
+						| [], [] -> FVar (c.ec_type,None)
+						| _ -> FFun { f_params = c.ec_params; f_type = c.ec_type; f_expr = None; f_args = List.map (fun (n,o,t) -> (n,null_pos),o,[],Some t,None) c.ec_args });
+				}
+			) (!constructs)
+		in
+		let init () = List.iter (fun f -> f()) !context_init in
+		TypeloadFields.build_module_def ctx (TEnumDecl e) e.e_meta get_constructs init (fun (e,p) ->
+			match e with
+			| EVars [_,_,Some (CTAnonymous fields,p),None] ->
+				constructs := List.map (fun f ->
+					let args, params, t = (match f.cff_kind with
+					| FVar (t,None) -> [], [], t
+					| FFun { f_params = pl; f_type = t; f_expr = (None|Some (EBlock [],_)); f_args = al } ->
+						let al = List.map (fun ((n,_),o,_,t,_) -> match t with None -> error "Missing function parameter type" f.cff_pos | Some t -> n,o,t) al in
+						al, pl, t
+					| _ ->
+						error "Invalid enum constructor in @:build result" p
+					) in
+					{
+						ec_name = f.cff_name;
+						ec_doc = f.cff_doc;
+						ec_meta = f.cff_meta;
+						ec_pos = f.cff_pos;
+						ec_args = args;
+						ec_params = params;
+						ec_type = t;
+					}
+				) fields
+			| _ -> error "Enum build macro must return a single variable with anonymous object fields" p
+		);
+		let et = TEnum (e,List.map snd e.e_params) in
+		let names = ref [] in
+		let index = ref 0 in
+		let is_flat = ref true in
+		let fields = ref PMap.empty in
+		List.iter (fun c ->
+			let p = c.ec_pos in
+			let params = ref [] in
+			params := type_type_params ~enum_constructor:true ctx ([],fst c.ec_name) (fun() -> !params) c.ec_pos c.ec_params;
+			let params = !params in
+			let ctx = { ctx with type_params = params @ ctx.type_params } in
+			let rt = (match c.ec_type with
+				| None -> et
+				| Some (t,pt) ->
+					let t = load_complex_type ctx true (t,pt) in
+					(match follow t with
+					| TEnum (te,_) when te == e ->
+						()
+					| _ ->
+						error "Explicit enum type must be of the same enum type" pt);
+					t
+			) in
+			let t = (match c.ec_args with
+				| [] -> rt
+				| l ->
+					is_flat := false;
+					let pnames = ref PMap.empty in
+					TFun (List.map (fun (s,opt,(t,tp)) ->
+						(match t with CTPath({tpackage=[];tname="Void"}) -> error "Arguments of type Void are not allowed in enum constructors" tp | _ -> ());
+						if PMap.mem s (!pnames) then error ("Duplicate argument `" ^ s ^ "` in enum constructor " ^ fst c.ec_name) p;
+						pnames := PMap.add s () (!pnames);
+						s, opt, load_type_hint ~opt ctx p (Some (t,tp))
+					) l, rt)
+			) in
+			if PMap.mem (fst c.ec_name) e.e_constrs then error ("Duplicate constructor " ^ fst c.ec_name) (pos c.ec_name);
+			let f = {
+				ef_name = fst c.ec_name;
+				ef_type = t;
+				ef_pos = p;
+				ef_name_pos = snd c.ec_name;
+				ef_doc = c.ec_doc;
+				ef_index = !index;
+				ef_params = params;
+				ef_meta = c.ec_meta;
+			} in
+			let cf = {
+				(mk_field f.ef_name f.ef_type p f.ef_name_pos) with
+				cf_kind = (match follow f.ef_type with
+					| TFun _ -> Method MethNormal
+					| _ -> Var { v_read = AccNormal; v_write = AccNo }
+				);
+				cf_doc = f.ef_doc;
+				cf_params = f.ef_params;
+			} in
+ 			if ctx.is_display_file && DisplayPosition.display_position#enclosed_in f.ef_name_pos then
+ 				DisplayEmitter.display_enum_field ctx e f p;
+			e.e_constrs <- PMap.add f.ef_name f e.e_constrs;
+			fields := PMap.add cf.cf_name cf !fields;
+			incr index;
+			names := (fst c.ec_name) :: !names;
+		) (!constructs);
+		e.e_names <- List.rev !names;
+		e.e_extern <- e.e_extern;
+		e.e_type.t_params <- e.e_params;
+		e.e_type.t_type <- TAnon {
+			a_fields = !fields;
+			a_status = ref (EnumStatics e);
+		};
+		if !is_flat then e.e_meta <- (Meta.FlatEnum,[],null_pos) :: e.e_meta;
+
+		if (ctx.com.platform = Java || ctx.com.platform = Cs) && not e.e_extern then
+			delay ctx PTypeField (fun () ->
+				let metas = StrictMeta.check_strict_meta ctx e.e_meta in
+				e.e_meta <- metas @ e.e_meta;
+				PMap.iter (fun _ ef ->
+					let metas = StrictMeta.check_strict_meta ctx ef.ef_meta in
+					if metas <> [] then ef.ef_meta <- metas @ ef.ef_meta
+				) e.e_constrs
+			);
+	| ETypedef d ->
+		let t = (match get_type (fst d.d_name) with TTypeDecl t -> t | _ -> assert false) in
+		if ctx.is_display_file && DisplayPosition.display_position#enclosed_in (pos d.d_name) then
+			DisplayEmitter.display_module_type ctx (TTypeDecl t) (pos d.d_name);
+		TypeloadCheck.check_global_metadata ctx t.t_meta (fun m -> t.t_meta <- m :: t.t_meta) t.t_module.m_path t.t_path None;
+		let ctx = { ctx with type_params = t.t_params } in
+		let tt = load_complex_type ctx true d.d_data in
+		let tt = (match fst d.d_data with
+		| CTExtend _ -> tt
+		| CTPath { tpackage = ["haxe";"macro"]; tname = "MacroType" } ->
+			(* we need to follow MacroType immediately since it might define other module types that we will load afterwards *)
+			if t.t_type == follow tt then error "Recursive typedef is not allowed" p;
+			tt
+		| _ ->
+			if (Meta.has Meta.Eager d.d_meta) then
+				follow tt
+			else begin
+				let rec check_rec tt =
+					if tt == t.t_type then error "Recursive typedef is not allowed" p;
+					match tt with
+					| TMono r ->
+						(match !r with
+						| None -> ()
+						| Some t -> check_rec t)
+					| TLazy f ->
+						check_rec (lazy_type f);
+					| TType (td,tl) ->
+						if td == t then error "Recursive typedef is not allowed" p;
+						check_rec (apply_params td.t_params tl td.t_type)
+					| _ ->
+						()
+				in
+				let r = exc_protect ctx (fun r ->
+					r := lazy_processing (fun() -> tt);
+					check_rec tt;
+					tt
+				) "typedef_rec_check" in
+				TLazy r
+			end
+		) in
+		(match t.t_type with
+		| TMono r ->
+			(match !r with
+			| None -> r := Some tt;
+			| Some _ -> assert false);
+		| _ -> assert false);
+		if ctx.com.platform = Cs && t.t_meta <> [] then
+			delay ctx PTypeField (fun () ->
+				let metas = StrictMeta.check_strict_meta ctx t.t_meta in
+				if metas <> [] then t.t_meta <- metas @ t.t_meta;
+			);
+	| EAbstract d ->
+		let a = (match get_type (fst d.d_name) with TAbstractDecl a -> a | _ -> assert false) in
+		if ctx.is_display_file && DisplayPosition.display_position#enclosed_in (pos d.d_name) then
+			DisplayEmitter.display_module_type ctx (TAbstractDecl a) (pos d.d_name);
+		TypeloadCheck.check_global_metadata ctx a.a_meta (fun m -> a.a_meta <- m :: a.a_meta) a.a_module.m_path a.a_path None;
+		let ctx = { ctx with type_params = a.a_params } in
+		let is_type = ref false in
+		let load_type t from =
+			let _, pos = t in
+			let t = load_complex_type ctx true t in
+			let t = if not (Meta.has Meta.CoreType a.a_meta) then begin
+				if !is_type then begin
+					let r = exc_protect ctx (fun r ->
+						r := lazy_processing (fun() -> t);
+						(try (if from then Type.unify t a.a_this else Type.unify a.a_this t) with Unify_error _ -> error "You can only declare from/to with compatible types" pos);
+						t
+					) "constraint" in
+					TLazy r
+				end else
+					error "Missing underlying type declaration or @:coreType declaration" p;
+			end else begin
+				if Meta.has Meta.Callable a.a_meta then
+					error "@:coreType abstracts cannot be @:callable" p;
+				t
+			end in
+			t
+		in
+		List.iter (function
+			| AbFrom t -> a.a_from <- (load_type t true) :: a.a_from
+			| AbTo t -> a.a_to <- (load_type t false) :: a.a_to
+			| AbOver t ->
+				if a.a_impl = None then error "Abstracts with underlying type must have an implementation" a.a_pos;
+				if Meta.has Meta.CoreType a.a_meta then error "@:coreType abstracts cannot have an underlying type" p;
+				let at = load_complex_type ctx true t in
+				delay ctx PForce (fun () ->
+					let rec loop stack t =
+						match follow t with
+						| TAbstract(a,_) when not (Meta.has Meta.CoreType a.a_meta) ->
+							if List.memq a stack then
+								error "Abstract underlying type cannot be recursive" a.a_pos
+							else
+								loop (a :: stack) a.a_this
+						| _ -> ()
+					in
+					loop [] at
+				);
+				a.a_this <- at;
+				is_type := true;
+			| AbExtern ->
+				(match a.a_impl with Some c -> c.cl_extern <- true | None -> (* Hmmmm.... *) ())
+			| AbPrivate -> ()
+		) d.d_flags;
+		if not !is_type then begin
+			if Meta.has Meta.CoreType a.a_meta then
+				a.a_this <- TAbstract(a,List.map snd a.a_params)
+			else
+				error "Abstract is missing underlying type declaration" a.a_pos
+		end
+
+let module_pass_2 ctx m decls tdecls p =
+	(* here is an additional PASS 1 phase, which define the type parameters for all module types.
+		 Constraints are handled lazily (no other type is loaded) because they might be recursive anyway *)
+	List.iter (fun d ->
+		match d with
+		| (TClassDecl c, (EClass d, p)) ->
+			c.cl_params <- type_type_params ctx c.cl_path (fun() -> c.cl_params) p d.d_params;
+			if Meta.has Meta.Generic c.cl_meta && c.cl_params <> [] then c.cl_kind <- KGeneric;
+			if Meta.has Meta.GenericBuild c.cl_meta then begin
+				if ctx.in_macro then error "@:genericBuild cannot be used in macros" c.cl_pos;
+				c.cl_kind <- KGenericBuild d.d_data;
+			end;
+			if c.cl_path = (["haxe";"macro"],"MacroType") then c.cl_kind <- KMacroType;
+		| (TEnumDecl e, (EEnum d, p)) ->
+			e.e_params <- type_type_params ctx e.e_path (fun() -> e.e_params) p d.d_params;
+		| (TTypeDecl t, (ETypedef d, p)) ->
+			t.t_params <- type_type_params ctx t.t_path (fun() -> t.t_params) p d.d_params;
+		| (TAbstractDecl a, (EAbstract d, p)) ->
+			a.a_params <- type_type_params ctx a.a_path (fun() -> a.a_params) p d.d_params;
+		| _ ->
+			assert false
+	) decls;
+	(* setup module types *)
+	let context_init = ref [] in
+	let do_init() =
+		match !context_init with
+		| [] -> ()
+		| l -> context_init := []; List.iter (fun f -> f()) (List.rev l)
+	in
+	List.iter (init_module_type ctx context_init do_init) tdecls
+
+(*
+	Creates a module context for [m] and types [tdecls] using it.
+*)
+let type_types_into_module ctx m tdecls p =
+	let decls, tdecls = module_pass_1 ctx m tdecls p in
+	let types = List.map fst decls in
+	List.iter (TypeloadCheck.check_module_types ctx m p) types;
+	m.m_types <- m.m_types @ types;
+	(* define the per-module context for the next pass *)
+	let ctx = {
+		com = ctx.com;
+		g = ctx.g;
+		t = ctx.t;
+		m = {
+			curmod = m;
+			module_types = List.map (fun t -> t,null_pos) ctx.g.std.m_types;
+			module_using = [];
+			module_globals = PMap.empty;
+			wildcard_packages = [];
+			module_imports = [];
+		};
+		is_display_file = (ctx.com.display.dms_kind <> DMNone && DisplayPosition.display_position#is_in_file m.m_extra.m_file);
+		bypass_accessor = 0;
+		meta = [];
+		this_stack = [];
+		with_type_stack = [];
+		call_argument_stack = [];
+		pass = PBuildModule;
+		get_build_infos = (fun() -> None);
+		on_error = (fun ctx msg p -> ctx.com.error msg p);
+		macro_depth = ctx.macro_depth;
+		curclass = null_class;
+		curfield = null_field;
+		tthis = ctx.tthis;
+		ret = ctx.ret;
+		locals = PMap.empty;
+		type_params = [];
+		curfun = FunStatic;
+		untyped = false;
+		in_macro = ctx.in_macro;
+		in_display = false;
+		in_loop = false;
+		opened = [];
+		in_call_args = false;
+		vthis = None;
+		memory_marker = Typecore.memory_marker;
+	} in
+	if ctx.g.std != null_module then begin
+		add_dependency m ctx.g.std;
+		(* this will ensure both String and (indirectly) Array which are basic types which might be referenced *)
+		ignore(load_core_type ctx "String");
+	end;
+	module_pass_2 ctx m decls tdecls p;
+	ctx
+
+let handle_import_hx ctx m decls p =
+	let path_split = match List.rev (Path.get_path_parts m.m_extra.m_file) with
+		| [] -> []
+		| _ :: l -> l
+	in
+	let join l = String.concat Path.path_sep (List.rev ("import.hx" :: l)) in
+	let rec loop path pack = match path,pack with
+		| _,[] -> [join path]
+		| (p :: path),(_ :: pack) -> (join (p :: path)) :: (loop path pack)
+		| _ -> []
+	in
+	let candidates = loop path_split (fst m.m_path) in
+	let make_import_module path r =
+		Hashtbl.replace ctx.com.parser_cache path r;
+		(* We use the file path as module name to make it unique. This may or may not be a good idea... *)
+		let m_import = make_module ctx ([],path) path p in
+		m_import.m_extra.m_kind <- MImport;
+		add_module ctx m_import p;
+		m_import
+	in
+	List.fold_left (fun acc path ->
+		let decls = try
+			let r = Hashtbl.find ctx.com.parser_cache path in
+			let mimport = Hashtbl.find ctx.g.modules ([],path) in
+			if mimport.m_extra.m_kind <> MFake then add_dependency m mimport;
+			r
+		with Not_found ->
+			if Sys.file_exists path then begin
+				let _,r = match !TypeloadParse.parse_hook ctx.com path p with
+					| ParseSuccess data -> data
+					| ParseDisplayFile(data,_) -> data
+					| ParseError(_,(msg,p),_) -> Parser.error msg p
+				in
+				List.iter (fun (d,p) -> match d with EImport _ | EUsing _ -> () | _ -> error "Only import and using is allowed in import.hx files" p) r;
+				add_dependency m (make_import_module path r);
+				r
+			end else begin
+				let r = [] in
+				(* Add empty decls so we don't check the file system all the time. *)
+				(make_import_module path r).m_extra.m_kind <- MFake;
+				r
+			end
+		in
+		decls @ acc
+	) decls candidates
+
+(*
+	Creates a new module and types [tdecls] into it.
+*)
+let type_module ctx mpath file ?(dont_check_path=false) ?(is_extern=false) tdecls p =
+	let m = make_module ctx mpath file p in
+	Hashtbl.add ctx.g.modules m.m_path m;
+	let tdecls = handle_import_hx ctx m tdecls p in
+	let ctx = type_types_into_module ctx m tdecls p in
+	if is_extern then m.m_extra.m_kind <- MExtern else if not dont_check_path then Typecore.check_module_path ctx m.m_path p;
+	begin if ctx.is_display_file then match ctx.com.display.dms_kind with
+		| DMResolve s ->
+			DisplayPath.resolve_position_by_path ctx {tname = s; tpackage = []; tsub = None; tparams = []} p
+		| _ ->
+			()
+	end;
+	m
+
+(* let type_module ctx mpath file ?(is_extern=false) tdecls p =
+	let timer = Timer.timer ["typing";"type_module"] in
+	Std.finally timer (type_module ctx mpath file ~is_extern tdecls) p *)
+
+let type_module_hook = ref (fun _ _ _ -> None)
+
+let load_module ctx m p =
+	let m2 = (try
+		Hashtbl.find ctx.g.modules m
+	with
+		Not_found ->
+			match !type_module_hook ctx m p with
+			| Some m -> m
+			| None ->
+			let is_extern = ref false in
+			let file, decls = (try
+				TypeloadParse.parse_module ctx m p
+			with Not_found ->
+				let rec loop = function
+					| [] ->
+						raise (Error (Module_not_found m,p))
+					| (file,load) :: l ->
+						match load m p with
+						| None -> loop l
+						| Some (_,a) -> file, a
+				in
+				is_extern := true;
+				loop ctx.com.load_extern_type
+			) in
+			let is_extern = !is_extern in
+			try
+				type_module ctx m file ~is_extern decls p
+			with Forbid_package (inf,pl,pf) when p <> null_pos ->
+				raise (Forbid_package (inf,p::pl,pf))
+	) in
+	add_dependency ctx.m.curmod m2;
+	if ctx.pass = PTypeField then flush_pass ctx PBuildClass "load_module";
+	m2
+
+(* let load_module ctx m p =
+	let timer = Timer.timer ["typing";"load_module"] in
+	Std.finally timer (load_module ctx m) p *)
+
+;;
diff --git a/src/typing/typeloadParse.ml b/src/typing/typeloadParse.ml
new file mode 100644
index 0000000000000000000000000000000000000000..216622a9445c288048bb4d7e3dc648e67777ade2
--- /dev/null
+++ b/src/typing/typeloadParse.ml
@@ -0,0 +1,349 @@
+(*
+	The Haxe Compiler
+	Copyright (C) 2005-2019  Haxe Foundation
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *)
+
+(* Parsing of module files into modules. *)
+
+open Globals
+open Ast
+open DisplayTypes.DiagnosticsSeverity
+open DisplayTypes.DisplayMode
+open Common
+open Type
+open Typecore
+open Error
+
+exception DisplayInMacroBlock
+
+let parse_file_from_lexbuf com file p lexbuf =
+	let t = Timer.timer ["parsing"] in
+	Lexer.init file;
+	incr stats.s_files_parsed;
+	let parse_result = try
+		ParserEntry.parse com.defines lexbuf file
+	with
+		| Sedlexing.MalFormed ->
+			t();
+			error "Malformed file. Source files must be encoded with UTF-8." {pfile = file; pmin = 0; pmax = 0}
+		| e ->
+			t();
+			raise e
+	in
+	begin match !Parser.display_mode,parse_result with
+		| DMModuleSymbols (Some ""),_ -> ()
+		| DMModuleSymbols filter,(ParseSuccess data | ParseDisplayFile(data,_)) when filter = None && DisplayPosition.display_position#is_in_file file ->
+			let ds = DocumentSymbols.collect_module_symbols (filter = None) data in
+			DisplayException.raise_module_symbols (DocumentSymbols.Printer.print_module_symbols com [file,ds] filter);
+		| _ ->
+			()
+	end;
+	t();
+	Common.log com ("Parsed " ^ file);
+	parse_result
+
+let parse_file_from_string com file p string =
+	parse_file_from_lexbuf com file p (Sedlexing.Utf8.from_string string)
+
+let current_stdin = ref None (* TODO: we're supposed to clear this at some point *)
+
+let parse_file com file p =
+	let use_stdin = (Common.defined com Define.DisplayStdin) && DisplayPosition.display_position#is_in_file file in
+	if use_stdin then
+		let s =
+			match !current_stdin with
+			| Some s ->
+				s
+			| None ->
+				let s = Std.input_all stdin in
+				close_in stdin;
+				current_stdin := Some s;
+				s
+		in
+		parse_file_from_string com file p s
+	else
+		let ch = try open_in_bin file with _ -> error ("Could not open " ^ file) p in
+		Std.finally (fun() -> close_in ch) (parse_file_from_lexbuf com file p) (Sedlexing.Utf8.from_channel ch)
+
+let parse_hook = ref parse_file
+
+let resolve_module_file com m remap p =
+	let forbid = ref false in
+	let compose_path no_rename =
+		(match m with
+		| [] , name -> name
+		| x :: l , name ->
+			let x = (try
+				match PMap.find x com.package_rules with
+				| Forbidden -> forbid := true; x
+				| Directory d -> if no_rename then x else d
+				| Remap d -> remap := d :: l; d
+				with Not_found -> x
+			) in
+			String.concat "/" (x :: l) ^ "/" ^ name
+		) ^ ".hx"
+	in
+	let file = try
+			Common.find_file com (compose_path false)
+		with Not_found ->
+			Common.find_file com (compose_path true)
+	in
+	let file = (match String.lowercase (snd m) with
+	| "con" | "aux" | "prn" | "nul" | "com1" | "com2" | "com3" | "lpt1" | "lpt2" | "lpt3" when Sys.os_type = "Win32" ->
+		(* these names are reserved by the OS - old DOS legacy, such files cannot be easily created but are reported as visible *)
+		if (try (Unix.stat file).Unix.st_size with _ -> 0) > 0 then file else raise Not_found
+	| _ -> file
+	) in
+	(* if we try to load a std.xxxx class and resolve a real std file, the package name is not valid, ignore *)
+	(match fst m with
+	| "std" :: _ ->
+		let file = Path.unique_full_path file in
+		if List.exists (fun path -> ExtString.String.starts_with file (try Path.unique_full_path path with _ -> path)) com.std_path then raise Not_found;
+	| _ -> ());
+	if !forbid then begin
+		let parse_result = (!parse_hook) com file p in
+		let rec loop decls = match decls with
+			| ((EImport _,_) | (EUsing _,_)) :: decls -> loop decls
+			| (EClass d,_) :: _ -> d.d_meta
+			| (EEnum d,_) :: _ -> d.d_meta
+			| (EAbstract d,_) :: _ -> d.d_meta
+			| (ETypedef d,_) :: _ -> d.d_meta
+			| [] -> []
+		in
+		let meta =  match parse_result with
+			| ParseSuccess(_,decls) | ParseDisplayFile((_,decls),_) -> loop decls
+			| ParseError _ -> []
+		in
+		if not (Meta.has Meta.NoPackageRestrict meta) then begin
+			let x = (match fst m with [] -> assert false | x :: _ -> x) in
+			raise (Forbid_package ((x,m,p),[],platform_name_macro com));
+		end;
+	end;
+	file
+
+let resolve_module_file com m remap p =
+	try
+		Hashtbl.find com.module_to_file m
+	with Not_found ->
+		let file = resolve_module_file com m remap p in
+		Hashtbl.add com.module_to_file m file;
+		file
+
+(* let resolve_module_file com m remap p =
+	let timer = Timer.timer ["typing";"resolve_module_file"] in
+	Std.finally timer (resolve_module_file com m remap) p *)
+
+module ConditionDisplay = struct
+	open ParserEntry
+	open CompletionItem.CompletionType
+	open DisplayPosition
+
+	exception Result of expr
+
+	let t_semver = TInst(mk_class null_module ([],"SemVer") null_pos null_pos,[])
+
+	let convert_small_type com = function
+		| TNull -> "null",Type.mk_mono()
+		| TBool b -> string_of_bool b,com.basic.tbool
+		| TFloat f -> string_of_float f,com.basic.tfloat
+		| TString s -> "\"" ^ StringHelper.s_escape s ^ "\"",com.basic.tstring
+		| TVersion(r,p) -> Semver.to_string (r,p),t_semver
+
+	let check_condition com e =
+		let check_position = (if com.display.dms_kind = DMHover then
+			encloses_position_gt
+		else
+			encloses_position
+		) display_position#get in
+		let tpair t = (t,CompletionItem.CompletionType.from_type (fun _ -> Imported) t) in
+		let check_expr (e,p) =
+			match e with
+				| ECall ((EConst (Ident "version"),p),_)  ->
+					let t = TFun ([("s",false,com.basic.tstring)],t_semver) in
+					if check_position p then
+						DisplayException.raise_hover (CompletionItem.make_ci_class_field {
+							field = {
+								cf_name = "version";
+								cf_type = t;
+								cf_pos = null_pos;
+								cf_name_pos = null_pos;
+								cf_doc = Some (
+"Allows comparing defines (such as the version of a Haxelib or Haxe) with SemVer semantics.
+Both the define and the string passed to `version()` must be valid semantic versions.
+
+Example:
+```haxe
+#if (haxe >= version(\"4.0.0-rc.3\"))\n
+```
+
+Note: this syntax does not parse with Haxe versions earlier than 4.0.0-rc.3,
+so it should be avoided if backwards-compatibility with earlier versions is needed.
+
+@see https://semver.org/");
+								cf_meta = [];
+								cf_kind = Method MethNormal;
+								cf_params = [];
+								cf_expr = None;
+								cf_expr_unoptimized = None;
+								cf_overloads = [];
+								cf_flags = set_flag 0 (int_of_class_field_flag CfPublic);
+							};
+							scope = CFSStatic;
+							origin = BuiltIn;
+							is_qualified = true;
+						} (tpair t)) None p
+				| EConst(Ident(n)) ->
+					let v = eval com.defines (e,p) in
+					DisplayException.raise_hover (CompletionItem.make_ci_define n (match v with
+						| TNull -> None
+						| TString s -> Some (StringHelper.s_escape s)
+						| _ -> assert false
+					) (tpair com.basic.tstring)) None p
+				| _ ->
+					()
+		in
+		let rec loop (e,p) =
+			if check_position p then check_expr (e,p);
+			Ast.iter_expr loop (e,p);
+			if check_position p then
+				let v = eval com.defines (e,p) in
+				let s,t = convert_small_type com v in
+				DisplayException.raise_hover (CompletionItem.make_ci_literal s (tpair t)) None p
+		in
+		loop e;
+end
+
+module PdiHandler = struct
+	open Parser
+	open DisplayPosition
+
+	let is_true defines e =
+		ParserEntry.is_true (ParserEntry.eval defines e)
+
+	let handle_pdi com file pdi =
+		let macro_defines = adapt_defines_to_macro_context com.defines in
+		let check = (if com.display.dms_kind = DMHover then
+			encloses_position_gt
+		else
+			encloses_position
+		) display_position#get in
+		List.iter (fun (p,e) ->
+			let has_macro_define = is_true macro_defines e in
+			if has_macro_define then com.display_information.display_module_has_macro_defines <- true;
+			if check p then begin
+				if has_macro_define then
+					raise DisplayInMacroBlock;
+				begin match com.display.dms_kind with
+				| DMHover ->
+					raise (DisplayException.DisplayException(DisplayHover None))
+				| _ ->
+					()
+				end;
+			end;
+		) pdi.pd_dead_blocks;
+		begin match com.display.dms_kind with
+		| DMHover ->
+			List.iter (ConditionDisplay.check_condition com) pdi.pd_conditions;
+		| _ ->
+			()
+		end;
+		let display_defines = {macro_defines with values = PMap.add "display" "1" macro_defines.values} in
+		let dead_blocks = List.filter (fun (_,e) -> not (is_true display_defines e)) pdi.pd_dead_blocks in
+		let sdi = com.shared.shared_display_information in
+		begin try
+			let dead_blocks2 = Hashtbl.find sdi.dead_blocks file in
+			(* Intersect *)
+			let dead_blocks2 = List.filter (fun (p,_) -> List.mem_assoc p dead_blocks) dead_blocks2 in
+			Hashtbl.replace sdi.dead_blocks file dead_blocks2
+		with Not_found ->
+			Hashtbl.add sdi.dead_blocks file dead_blocks
+		end;
+end
+
+let parse_module_file com file p =
+	let handle_parser_error msg p =
+		let msg = Parser.error_msg msg in
+		match com.display.dms_error_policy with
+			| EPShow -> error msg p
+			| EPIgnore -> ()
+			| EPCollect -> add_diagnostics_message com msg p DKParserError Error
+	in
+	let pack,decls = match (!parse_hook) com file p with
+		| ParseSuccess data -> data
+		| ParseDisplayFile(data,pdi) ->
+			begin match pdi.pd_errors with
+			| (msg,p) :: _ -> handle_parser_error msg p
+			| [] -> ()
+			end;
+			PdiHandler.handle_pdi com file pdi;
+			data
+		| ParseError(data,(msg,p),_) ->
+			handle_parser_error msg p;
+			data
+	in
+	pack,decls
+
+let parse_module' com m p =
+	let remap = ref (fst m) in
+	let file = resolve_module_file com m remap p in
+	let pack,decls = parse_module_file com file p in
+	file,remap,pack,decls
+
+let parse_module ctx m p =
+	let file,remap,pack,decls = parse_module' ctx.com m p in
+	if pack <> !remap then begin
+		let spack m = if m = [] then "`package;`" else "`package " ^ (String.concat "." m) ^ ";`" in
+		if p == null_pos then
+			display_error ctx ("Invalid commandline class : " ^ s_type_path m ^ " should be " ^ s_type_path (pack,snd m)) p
+		else
+			display_error ctx (spack pack ^ " in " ^ file ^ " should be " ^ spack (fst m)) {p with pmax = p.pmin}
+	end;
+	file, if !remap <> fst m then
+		(* build typedefs to redirect to real package *)
+		List.rev (List.fold_left (fun acc (t,p) ->
+			let build f d =
+				let priv = List.mem f d.d_flags in
+				(ETypedef {
+					d_name = d.d_name;
+					d_doc = None;
+					d_meta = [];
+					d_params = d.d_params;
+					d_flags = if priv then [EPrivate] else [];
+					d_data = CTPath (if priv then { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None; } else
+						{
+							tpackage = !remap;
+							tname = fst d.d_name;
+							tparams = List.map (fun tp ->
+								TPType (CTPath { tpackage = []; tname = fst tp.tp_name; tparams = []; tsub = None; },null_pos)
+							) d.d_params;
+							tsub = None;
+						}),null_pos;
+				},p) :: acc
+			in
+			match t with
+			| EClass d -> build HPrivate d
+			| EEnum d -> build EPrivate d
+			| ETypedef d -> build EPrivate d
+			| EAbstract d -> build AbPrivate d
+			| EImport _ | EUsing _ -> acc
+		) [(EImport (List.map (fun s -> s,null_pos) (!remap @ [snd m]),INormal),null_pos)] decls)
+	else
+		decls
+
+(* let parse_module ctx m p =
+	let timer = Timer.timer ["typing";"parse_module"] in
+	Std.finally timer (parse_module ctx m) p *)
\ No newline at end of file
diff --git a/src/typing/typer.ml b/src/typing/typer.ml
index a6f5bfb736f73b4870cfda1df56c81f669fba85c..1c9533e2d63ce42d5c0e87e5d15f9d845a1eb66f 100644
--- a/src/typing/typer.ml
+++ b/src/typing/typer.ml
@@ -1,6 +1,6 @@
 (*
 	The Haxe Compiler
-	Copyright (C) 2005-2017  Haxe Foundation
+	Copyright (C) 2005-2019  Haxe Foundation
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -15,64 +15,38 @@
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *)
-
+*)
 open Ast
-open Common.DisplayMode
+open DisplayTypes.DisplayMode
+open DisplayException
+open DisplayTypes.CompletionResultKind
+open CompletionItem.ClassFieldOrigin
 open Common
 open Type
 open Typecore
 open Error
 open Globals
+open TyperBase
+open Fields
+open Calls
 
 (* ---------------------------------------------------------------------- *)
 (* TOOLS *)
 
-type switch_mode =
-	| CMatch of (tenum_field * (string * t) option list option * pos)
-	| CExpr of texpr
-
-type access_mode =
-	| MGet
-	| MSet
-	| MCall
-
-type access_kind =
-	| AKNo of string
-	| AKExpr of texpr
-	| AKSet of texpr * t * tclass_field
-	| AKInline of texpr * tclass_field * tfield_access * t
-	| AKMacro of texpr * tclass_field
-	| AKUsing of texpr * tclass * tclass_field * texpr
-	| AKAccess of tabstract * tparams * tclass * texpr * texpr
-
-type object_decl_kind =
-	| ODKWithStructure of tanon
-	| ODKWithClass of tclass * tparams
-	| ODKPlain
-
-let build_call_ref : (typer -> access_kind -> expr list -> with_type -> pos -> texpr) ref = ref (fun _ _ _ _ _ -> assert false)
-
-let mk_infos ctx p params =
-	let file = if ctx.in_macro then p.pfile else if Common.defined ctx.com Define.AbsolutePath then Path.get_full_path p.pfile else Filename.basename p.pfile in
-	(EObjectDecl (
-		(("fileName",null_pos) , (EConst (String file) , p)) ::
-		(("lineNumber",null_pos) , (EConst (Int (string_of_int (Lexer.get_error_line p))),p)) ::
-		(("className",null_pos) , (EConst (String (s_type_path ctx.curclass.cl_path)),p)) ::
-		if ctx.curfield.cf_name = "" then
-			params
-		else
-			(("methodName",null_pos), (EConst (String ctx.curfield.cf_name),p)) :: params
-	) ,p)
+let is_lower_ident s p =
+	try Ast.is_lower_ident s
+	with Invalid_argument msg -> error msg p
 
 let check_assign ctx e =
 	match e.eexpr with
-	| TLocal {v_extra = None} | TArray _ | TField _ ->
+	| TLocal {v_final = true} ->
+		error "Cannot assign to final" e.epos
+	| TLocal {v_extra = None} | TArray _ | TField _ | TIdent _ ->
 		()
 	| TConst TThis | TTypeExpr _ when ctx.untyped ->
 		()
 	| _ ->
-		error "Invalid assign" e.epos
+		invalid_assign e.epos
 
 type type_class =
 	| KInt
@@ -81,7 +55,8 @@ type type_class =
 	| KUnk
 	| KDyn
 	| KOther
-	| KParam of t
+	| KNumParam of t
+	| KStrParam of t
 	| KAbstract of tabstract * t list
 
 let rec classify t =
@@ -90,8 +65,10 @@ let rec classify t =
 	| TAbstract({a_impl = Some _} as a,tl) -> KAbstract (a,tl)
 	| TAbstract ({ a_path = [],"Int" },[]) -> KInt
 	| TAbstract ({ a_path = [],"Float" },[]) -> KFloat
-	| TAbstract (a,[]) when List.exists (fun t -> match classify t with KInt | KFloat -> true | _ -> false) a.a_to -> KParam t
-	| TInst ({ cl_kind = KTypeParameter ctl },_) when List.exists (fun t -> match classify t with KInt | KFloat -> true | _ -> false) ctl -> KParam t
+	| TAbstract (a,[]) when List.exists (fun t -> match classify t with KInt | KFloat -> true | _ -> false) a.a_to -> KNumParam t
+	| TInst ({ cl_kind = KTypeParameter ctl },_) when List.exists (fun t -> match classify t with KInt | KFloat -> true | _ -> false) ctl -> KNumParam t
+	| TAbstract (a,[]) when List.exists (fun t -> match classify t with KString -> true | _ -> false) a.a_to -> KStrParam t
+	| TInst ({ cl_kind = KTypeParameter ctl },_) when List.exists (fun t -> match classify t with KString -> true | _ -> false) ctl -> KStrParam t
 	| TMono r when !r = None -> KUnk
 	| TDynamic _ -> KDyn
 	| _ -> KOther
@@ -122,267 +99,76 @@ let get_iterable_param t =
 			raise Not_found)
 	| _ -> raise Not_found
 
-let get_abstract_froms a pl =
-	let l = List.map (apply_params a.a_params pl) a.a_from in
-	List.fold_left (fun acc (t,f) ->
-		match follow (field_type f) with
-		| TFun ([_,_,v],t) ->
-			(try
-				ignore(type_eq EqStrict t (TAbstract(a,List.map dup pl))); (* unify fields monomorphs *)
-				v :: acc
-			with Unify_error _ ->
-				acc)
-		| _ ->
-			acc
-	) l a.a_from_field
-
-(*
-	temporally remove the constant flag from structures to allow larger unification
-*)
-let remove_constant_flag t callb =
-	let tmp = ref [] in
-	let rec loop t =
-		match follow t with
-		| TAnon a ->
-			if !(a.a_status) = Const then begin
-				a.a_status := Closed;
-				tmp := a :: !tmp;
-			end;
-			PMap.iter (fun _ f -> loop f.cf_type) a.a_fields;
-		|  _ ->
-			()
-	in
-	let restore() =
-		List.iter (fun a -> a.a_status := Const) (!tmp)
-	in
+let maybe_type_against_enum ctx f with_type iscall p =
 	try
-		loop t;
-		let ret = callb (!tmp <> []) in
-		restore();
-		ret
-	with e ->
-		restore();
-		raise e
-
-let rec is_pos_infos = function
-	| TMono r ->
-		(match !r with
-		| Some t -> is_pos_infos t
-		| _ -> false)
-	| TLazy f ->
-		is_pos_infos (!f())
-	| TType ({ t_path = ["haxe"] , "PosInfos" },[]) ->
-		true
-	| TType (t,tl) ->
-		is_pos_infos (apply_params t.t_params tl t.t_type)
-	| _ ->
-		false
-
-let check_constraints ctx tname tpl tl map delayed p =
-	List.iter2 (fun m (name,t) ->
-		match follow t with
-		| TInst ({ cl_kind = KTypeParameter constr },_) when constr <> [] ->
-			let f = (fun() ->
-				List.iter (fun ct ->
-					try
-						Type.unify (map m) (map ct)
-					with Unify_error l ->
-						let l = Constraint_failure (tname ^ "." ^ name) :: l in
-						raise (Unify_error l)
-				) constr
-			) in
-			if delayed then
-				delay ctx PCheckConstraint (fun () -> try f() with Unify_error l -> display_error ctx (error_msg (Unify l)) p)
-			else
+		begin match with_type with
+		| WithType.WithType(t,_) ->
+			let rec loop stack t = match follow t with
+				| TEnum (en,_) ->
+					true,en.e_path,en.e_names,TEnumDecl en
+				| TAbstract ({a_impl = Some c} as a,_) when has_meta Meta.Enum a.a_meta ->
+					let fields = ExtList.List.filter_map (fun cf ->
+						if Meta.has Meta.Enum cf.cf_meta then Some cf.cf_name else None
+					) c.cl_ordered_statics in
+					false,a.a_path,fields,TAbstractDecl a
+				| TAbstract (a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
+					begin match get_abstract_froms a pl with
+						| [t2] ->
+							if (List.exists (shallow_eq t) stack) then raise Exit;
+							loop (t :: stack) t2
+						| _ -> raise Exit
+					end
+				| _ ->
+					raise Exit
+			in
+			let is_enum,path,fields,mt = loop [] t in
+			let old = ctx.m.curmod.m_types in
+			let restore () = ctx.m.curmod.m_types <- old in
+			ctx.m.curmod.m_types <- ctx.m.curmod.m_types @ [mt];
+			let e = try
 				f()
-		| _ ->
-			()
-	) tl tpl
-
-let enum_field_type ctx en ef tl_en tl_ef p =
-	let map t = apply_params en.e_params tl_en (apply_params ef.ef_params tl_ef t) in
-	begin try
-		check_constraints ctx (s_type_path en.e_path) en.e_params tl_en map true p;
-		check_constraints ctx ef.ef_name ef.ef_params tl_ef map true p;
-	with Unify_error l ->
-		display_error ctx (error_msg (Unify l)) p
-	end;
-	map ef.ef_type
-
-let add_constraint_checks ctx ctypes pl f tl p =
-	List.iter2 (fun m (name,t) ->
-		match follow t with
-		| TInst ({ cl_kind = KTypeParameter constr },_) when constr <> [] ->
-			let constr = List.map (fun t ->
-				let t = apply_params f.cf_params tl t in
-				(* only apply params if not static : in that case no param is passed *)
-				let t = (if pl = [] then t else apply_params ctypes pl t) in
-				t
-			) constr in
-			delay ctx PCheckConstraint (fun() ->
-				List.iter (fun ct ->
-					try
-						(* if has_mono m then raise (Unify_error [Unify_custom "Could not resolve full type for constraint checks"; Unify_custom ("Type was " ^ (s_type (print_context()) m))]); *)
-						Type.unify m ct
-					with Unify_error l ->
-						display_error ctx (error_msg (Unify (Constraint_failure (f.cf_name ^ "." ^ name) :: l))) p;
-				) constr
-			);
-		| _ -> ()
-	) tl f.cf_params
-
-let field_type ctx c pl f p =
-	match f.cf_params with
-	| [] -> f.cf_type
-	| l ->
-		let monos = List.map (fun _ -> mk_mono()) l in
-		if not (Meta.has Meta.Generic f.cf_meta) then add_constraint_checks ctx c.cl_params pl f monos p;
-		apply_params l monos f.cf_type
-
-let class_field ctx c tl name p =
-	raw_class_field (fun f -> field_type ctx c tl f p) c tl name
-
-(* checks if we can access to a given class field using current context *)
-let rec can_access ctx ?(in_overload=false) c cf stat =
-	if cf.cf_public then
-		true
-	else if not in_overload && ctx.com.config.pf_overload && Meta.has Meta.Overload cf.cf_meta then
-		true
-	else
-	(* TODO: should we add a c == ctx.curclass short check here? *)
-	(* has metadata path *)
-	let rec make_path c f = match c.cl_kind with
-		| KAbstractImpl a -> fst a.a_path @ [snd a.a_path; f.cf_name]
-		| KGenericInstance(c,_) -> make_path c f
-		| _ when c.cl_private -> List.rev (f.cf_name :: snd c.cl_path :: (List.tl (List.rev (fst c.cl_path))))
-		| _ -> fst c.cl_path @ [snd c.cl_path; f.cf_name]
-	in
-	let rec expr_path acc e =
-		match fst e with
-		| EField (e,f) -> expr_path (f :: acc) e
-		| EConst (Ident n) -> n :: acc
-		| _ -> []
-	in
-	let rec chk_path psub pfull =
-		match psub, pfull with
-		| [], _ -> true
-		| a :: l1, b :: l2 when a = b -> chk_path l1 l2
-		| _ -> false
-	in
-	let has m c f path =
-		let rec loop = function
-			| (m2,el,_) :: l when m = m2 ->
-				List.exists (fun e ->
-					let p = expr_path [] e in
-					(p <> [] && chk_path p path)
-				) el
-				|| loop l
-			| _ :: l -> loop l
-			| [] -> false
-		in
-		loop c.cl_meta || loop f.cf_meta
-	in
-	let cur_paths = ref [] in
-	let rec loop c =
-		cur_paths := make_path c ctx.curfield :: !cur_paths;
-		begin match c.cl_super with
-			| Some (csup,_) -> loop csup
-			| None -> ()
-		end;
-		List.iter (fun (c,_) -> loop c) c.cl_implements;
-	in
-	loop ctx.curclass;
-	let is_constr = cf.cf_name = "new" in
-	let rec loop c =
-		(try
-			(* if our common ancestor declare/override the field, then we can access it *)
-			let f = if is_constr then (match c.cl_constructor with None -> raise Not_found | Some c -> c) else PMap.find cf.cf_name (if stat then c.cl_statics else c.cl_fields) in
-			is_parent c ctx.curclass || (List.exists (has Meta.Allow c f) !cur_paths)
-		with Not_found ->
-			false
-		)
-		|| (match c.cl_super with
-		| Some (csup,_) -> loop csup
-		| None -> false)
-		|| has Meta.Access ctx.curclass ctx.curfield (make_path c cf)
-	in
-	let b = loop c
-	(* access is also allowed of we access a type parameter which is constrained to our (base) class *)
-	|| (match c.cl_kind with
-		| KTypeParameter tl ->
-			List.exists (fun t -> match follow t with TInst(c,_) -> loop c | _ -> false) tl
-		| _ -> false)
-	|| (Meta.has Meta.PrivateAccess ctx.meta) in
-	(* TODO: find out what this does and move it to genas3 *)
-	if b && Common.defined ctx.com Common.Define.As3 && not (Meta.has Meta.Public cf.cf_meta) then cf.cf_meta <- (Meta.Public,[],cf.cf_pos) :: cf.cf_meta;
-	b
-
-(* removes the first argument of the class field's function type and all its overloads *)
-let prepare_using_field cf = match follow cf.cf_type with
-	| TFun((_,_,tf) :: args,ret) ->
-		let rec loop acc overloads = match overloads with
-			| ({cf_type = TFun((_,_,tfo) :: args,ret)} as cfo) :: l ->
-				let tfo = apply_params cfo.cf_params (List.map snd cfo.cf_params) tfo in
-				(* ignore overloads which have a different first argument *)
-				if Type.type_iseq tf tfo then loop ({cfo with cf_type = TFun(args,ret)} :: acc) l else loop acc l
-			| _ :: l ->
-				loop acc l
-			| [] ->
-				acc
-		in
-		{cf with cf_overloads = loop [] cf.cf_overloads; cf_type = TFun(args,ret)}
-	| _ -> cf
-
-let eval ctx s =
-	let p = { pfile = "--eval"; pmin = 0; pmax = String.length s; } in
-	let pack,decls = Parser.parse_string ctx.com s p error false in
-	let rec find_main current decls = match decls with
-		| (EClass c,_) :: decls ->
-			let path = pack,fst c.d_name in
-			begin try
-				let cff = List.find (fun cff -> fst cff.cff_name = "main") c.d_data in
-				if ctx.com.main_class <> None then error "Multiple main" cff.cff_pos;
-				ctx.com.main_class <- Some path;
-				Some path
-			with Not_found ->
-				find_main (if current = None then Some path else current) decls
+			with
+			| Error (Unknown_ident n,_) ->
+				restore();
+				raise_or_display_message ctx (StringError.string_error n fields ("Identifier '" ^ n ^ "' is not part of " ^ s_type_path path)) p;
+				AKExpr (mk (TConst TNull) (mk_mono()) p)
+			| exc ->
+				restore();
+				raise exc;
+			in
+			restore();
+			begin match e with
+				| AKExpr e ->
+					begin match follow e.etype with
+						| TFun(_,t') when is_enum ->
+							(* TODO: this is a dodge for #7603 *)
+							(try Type.unify t' t with Unify_error _ -> ());
+							AKExpr e
+						| _ ->
+							if iscall then
+								AKExpr e
+							else begin
+								AKExpr (AbstractCast.cast_or_unify ctx t e e.epos)
+							end
+					end
+				| _ -> e (* ??? *)
 			end
-		| ((EEnum {d_name = (s,_)} | ETypedef {d_name = (s,_)} | EAbstract {d_name = (s,_)}),_) :: decls when current = None ->
-			find_main (Some (pack,s)) decls
-		| _ :: decls ->
-			find_main current decls
-		| [] ->
-			current
-	in
-	let path_module = match find_main None decls with
-		| None -> error "Evaluated string did not define any types" p
-		| Some path -> path
-	in
-	ignore(Typeload.type_module ctx path_module "eval" decls p);
-	flush_pass ctx PBuildClass "eval"
-
-let merge_core_doc ctx c =
-	let c_core = Typeload.load_core_class ctx c in
-	if c.cl_doc = None then c.cl_doc <- c_core.cl_doc;
-	let maybe_merge cf_map cf =
-		if cf.cf_doc = None then try cf.cf_doc <- (PMap.find cf.cf_name cf_map).cf_doc with Not_found -> ()
-	in
-	List.iter (maybe_merge c_core.cl_fields) c.cl_ordered_fields;
-	List.iter (maybe_merge c_core.cl_statics) c.cl_ordered_statics;
-	match c.cl_constructor,c_core.cl_constructor with
-		| Some ({cf_doc = None} as cf),Some cf2 -> cf.cf_doc <- cf2.cf_doc
-		| _ -> ()
+		| _ ->
+			raise Exit
+		end
+	with Exit ->
+		f()
 
 let check_error ctx err p = match err with
-	| Module_not_found ([],name) when Display.Diagnostics.is_diagnostics_run ctx ->
-		Display.ToplevelCollector.handle_unresolved_identifier ctx name p true
+	| Module_not_found ([],name) when Diagnostics.is_diagnostics_run p ->
+		DisplayToplevel.handle_unresolved_identifier ctx name p true
 	| _ ->
 		display_error ctx (error_msg err) p
 
 (* ---------------------------------------------------------------------- *)
 (* PASS 3 : type expression & check structure *)
 
-let rec unify_min_raise ctx (el:texpr list) : t =
+let rec unify_min_raise basic (el:texpr list) : t =
 	let rec base_types t =
 		let tl = ref [] in
 		let rec loop t = (match t with
@@ -398,14 +184,11 @@ let rec unify_min_raise ctx (el:texpr list) : t =
 					let t = apply_params cl.cl_params params (TInst (csup,pl)) in
 					loop t);
 				tl := t :: !tl;
-			| TEnum(en,(_ :: _ as tl2)) ->
-				tl := (TEnum(en,List.map (fun _ -> t_dynamic) tl2)) :: !tl;
-				tl := t :: !tl;
 			| TType (td,pl) ->
 				loop (apply_params td.t_params pl td.t_type);
 				(* prioritize the most generic definition *)
 				tl := t :: !tl;
-			| TLazy f -> loop (!f())
+			| TLazy f -> loop (lazy_type f)
 			| TMono r -> (match !r with None -> () | Some t -> loop t)
 			| _ -> tl := t :: !tl)
 		in
@@ -416,7 +199,7 @@ let rec unify_min_raise ctx (el:texpr list) : t =
 	| [] -> mk_mono()
 	| [e] -> e.etype
 	| _ ->
-		let rec chk_null e = is_null e.etype ||
+		let rec chk_null e = is_null e.etype || is_explicit_null e.etype ||
 			match e.eexpr with
 			| TConst TNull -> true
 			| TBlock el ->
@@ -432,14 +215,14 @@ let rec unify_min_raise ctx (el:texpr list) : t =
 			| [] ->
 				false, t
 			| e :: el ->
-				let t = if chk_null e then ctx.t.tnull t else t in
+				let t = if chk_null e then basic.tnull t else t in
 				try
-					unify_raise ctx e.etype t e.epos;
+					Type.unify e.etype t;
 					loop t el
-				with Error (Unify _,_) -> try
-					unify_raise ctx t e.etype e.epos;
-					loop (if is_null t then ctx.t.tnull e.etype else e.etype) el
-				with Error (Unify _,_) ->
+				with Unify_error _ -> try
+					Type.unify t e.etype;
+					loop (if is_null t then basic.tnull e.etype else e.etype) el
+				with Unify_error _ ->
 					true, t
 		in
 		let has_error, t = loop (mk_mono()) el in
@@ -466,7 +249,7 @@ let rec unify_min_raise ctx (el:texpr list) : t =
 					raise Not_found
 			) PMap.empty el in
 			let fields = PMap.foldi (fun n el acc ->
-				let t = try unify_min_raise ctx el with Error (Unify _, _) -> raise Not_found in
+				let t = try unify_min_raise basic el with Unify_error _ -> raise Not_found in
 				PMap.add n (mk_field n t (List.hd el).epos null_pos) acc
 			) fields PMap.empty in
 			TAnon { a_fields = fields; a_status = ref Closed }
@@ -486,12 +269,12 @@ let rec unify_min_raise ctx (el:texpr list) : t =
 			let common_types = ref (match List.rev dyn_types with [] -> common_types | l -> common_types @ l) in
 			let loop e =
 				let first_error = ref None in
-				let filter t = (try unify_raise ctx e.etype t e.epos; true
-					with Error (Unify l, p) as err -> if !first_error = None then first_error := Some(err); false)
+				let filter t = (try Type.unify e.etype t; true
+					with Unify_error l -> if !first_error = None then first_error := Some(Unify l,e.epos); false)
 				in
 				common_types := List.filter filter !common_types;
 				match !common_types, !first_error with
-				| [], Some err -> raise err
+				| [], Some(err,p) -> raise_error err p
 				| _ -> ()
 			in
 			match !common_types with
@@ -502,671 +285,17 @@ let rec unify_min_raise ctx (el:texpr list) : t =
 				List.hd !common_types
 
 let unify_min ctx el =
-	try unify_min_raise ctx el
+	try unify_min_raise ctx.com.basic el
 	with Error (Unify l,p) ->
 		if not ctx.untyped then display_error ctx (error_msg (Unify l)) p;
 		(List.hd el).etype
 
-let is_forced_inline c cf =
-	match c with
-	| Some { cl_extern = true } -> true
-	| Some { cl_kind = KAbstractImpl _ } -> true
-	| _ when Meta.has Meta.Extern cf.cf_meta -> true
-	| _ -> false
-
-let rec unify_call_args' ctx el args r callp inline force_inline =
-	let in_call_args = ctx.in_call_args in
-	ctx.in_call_args <- true;
-	let call_error err p =
-		raise (Error (Call_error err,p))
-	in
-	let arg_error ul name opt p =
-		let err = Stack (ul,Custom ("For " ^ (if opt then "optional " else "") ^ "function argument '" ^ name ^ "'")) in
-		call_error (Could_not_unify err) p
-	in
-	let mk_pos_infos t =
-		let infos = mk_infos ctx callp [] in
-		type_expr ctx infos (WithType t)
-	in
-	let rec default_value name t =
-		if is_pos_infos t then
-			mk_pos_infos t
-		else
-			null (ctx.t.tnull t) callp
-	in
-	let skipped = ref [] in
-	let invalid_skips = ref [] in
-	let skip name ul t p =
-		if not ctx.com.config.pf_can_skip_non_nullable_argument && not (is_nullable t) then
-			invalid_skips := name :: !invalid_skips;
-		skipped := (name,ul,p) :: !skipped;
-		default_value name t
-	in
-	(* let force_inline, is_extern = match cf with Some(TInst(c,_),f) -> is_forced_inline (Some c) f, c.cl_extern | _ -> false, false in *)
-	let type_against t e =
-		try
-			let e = type_expr ctx e (WithType t) in
-			AbstractCast.cast_or_unify_raise ctx t e e.epos
-		with Error(l,p) when (match l with Call_error _ | Module_not_found _ -> false | _ -> true) ->
-			raise (WithTypeError (l,p))
-	in
-	let rec loop el args = match el,args with
-		| [],[] ->
-			begin match List.rev !invalid_skips with
-				| [] -> ()
-				| name :: _ -> call_error (Cannot_skip_non_nullable name) callp;
-			end;
-			[]
-		| _,[name,false,t] when (match follow t with TAbstract({a_path = ["haxe";"extern"],"Rest"},_) -> true | _ -> false) ->
-			begin match follow t with
-				| TAbstract({a_path=(["haxe";"extern"],"Rest")},[t]) ->
-					(try List.map (fun e -> type_against t e,false) el with WithTypeError(ul,p) -> arg_error ul name false p)
-				| _ ->
-					assert false
-			end
-		| [],(_,false,_) :: _ ->
-			call_error (Not_enough_arguments args) callp
-		| [],(name,true,t) :: args ->
-			begin match loop [] args with
-				| [] when not (inline && (ctx.g.doinline || force_inline)) && not ctx.com.config.pf_pad_nulls ->
-					if is_pos_infos t then [mk_pos_infos t,true]
-					else []
-				| args ->
-					let e_def = default_value name t in
-					(e_def,true) :: args
-			end
-		| (_,p) :: _, [] ->
-			begin match List.rev !skipped with
-				| [] -> call_error Too_many_arguments p
-				| (s,ul,p) :: _ -> arg_error ul s true p
-			end
-		| e :: el,(name,opt,t) :: args ->
-			begin try
-				let e = type_against t e in
-				(e,opt) :: loop el args
-			with
-				WithTypeError (ul,p)->
-					if opt then
-						let e_def = skip name ul t p in
-						(e_def,true) :: loop (e :: el) args
-					else
-						arg_error ul name false p
-			end
-	in
-	let el = try loop el args with exc -> ctx.in_call_args <- in_call_args; raise exc; in
-	ctx.in_call_args <- in_call_args;
-	el,TFun(args,r)
-
-let unify_call_args ctx el args r p inline force_inline =
-	let el,tf = unify_call_args' ctx el args r p inline force_inline in
-	List.map fst el,tf
-
-let unify_field_call ctx fa el args ret p inline =
-	let map_cf cf0 map cf =
-		let t = map (monomorphs cf.cf_params cf.cf_type) in
-		begin match cf.cf_expr,cf.cf_kind with
-		| None,Method MethInline when not ctx.com.config.pf_overload ->
-			(* This is really awkward and shouldn't be here. We'll keep it for
-			   3.2 in order to not break code that relied on the quirky behavior
-			   in 3.1.3, but it should really be reviewed afterwards.
-			   Related issue: https://github.com/HaxeFoundation/haxe/issues/3846
-			*)
-			cf.cf_expr <- cf0.cf_expr;
-			cf.cf_kind <- cf0.cf_kind;
-		| _ ->
-			()
-		end;
-		t,cf
-	in
-	let expand_overloads map cf =
-		(TFun(args,ret),cf) :: (List.map (map_cf cf map) cf.cf_overloads)
-	in
-	let candidates,co,cf,mk_fa = match fa with
-		| FStatic(c,cf) ->
-			expand_overloads (fun t -> t) cf,Some c,cf,(fun cf -> FStatic(c,cf))
-		| FAnon cf ->
-			expand_overloads (fun t -> t) cf,None,cf,(fun cf -> FAnon cf)
-		| FInstance(c,tl,cf) ->
-			let map = apply_params c.cl_params tl in
-			let cfl = if cf.cf_name = "new" || not (Meta.has Meta.Overload cf.cf_meta && ctx.com.config.pf_overload) then
-				List.map (map_cf cf map) cf.cf_overloads
-			else
-				List.map (fun (t,cf) -> map (monomorphs cf.cf_params t),cf) (Overloads.get_overloads c cf.cf_name)
-			in
-			(TFun(args,ret),cf) :: cfl,Some c,cf,(fun cf -> FInstance(c,tl,cf))
-		| FClosure(co,cf) ->
-			let c = match co with None -> None | Some (c,_) -> Some c in
-			expand_overloads (fun t -> t) cf,c,cf,(fun cf -> match co with None -> FAnon cf | Some (c,tl) -> FInstance(c,tl,cf))
-		| _ ->
-			error "Invalid field call" p
-	in
-	let is_forced_inline = is_forced_inline co cf in
-	let is_overload = Meta.has Meta.Overload cf.cf_meta in
-	let attempt_call t cf = match follow t with
-		| TFun(args,ret) ->
-			let el,tf = unify_call_args' ctx el args ret p inline is_forced_inline in
-			let mk_call ethis p_field =
-				let ef = mk (TField(ethis,mk_fa cf)) t p_field in
-				make_call ctx ef (List.map fst el) ret p
-			in
-			el,tf,mk_call
-		| _ ->
-			assert false
-	in
-	let rec loop candidates = match candidates with
-		| [] -> [],[]
-		| (t,cf) :: candidates ->
-			begin try
-				let candidate = attempt_call t cf in
-				if ctx.com.config.pf_overload && is_overload then begin
-					let candidates,failures = loop candidates in
-					candidate :: candidates,failures
-				end else
-					[candidate],[]
-			with Error ((Call_error _ as err),p) ->
-				let candidates,failures = loop candidates in
-				candidates,(cf,err,p) :: failures
-			end
-	in
-	let fail_fun () =
-		let tf = TFun(args,ret) in
-		[],tf,(fun ethis p_field ->
-			let e1 = mk (TField(ethis,mk_fa cf)) tf p_field in
-			mk (TCall(e1,[])) ret p)
-	in
-	match candidates with
-	| [t,cf] ->
-		begin try
-			let el,tf,mk_call = attempt_call t cf in
-			List.map fst el,tf,mk_call
-		with Error _ when ctx.com.display.dms_error_policy = EPIgnore ->
-			fail_fun();
-		end
-	| _ ->
-		let candidates,failures = loop candidates in
-		let fail () =
-			let failures = List.map (fun (cf,err,p) -> cf,error_msg err,p) failures in
-			let failures = remove_duplicates (fun (_,msg1,_) (_,msg2,_) -> msg1 <> msg2) failures in
-			begin match failures with
-			| [_,msg,p] ->
-				error msg p
-			| _ ->
-				display_error ctx "Could not find a suitable overload, reasons follow" p;
-				List.iter (fun (cf,msg,p2) ->
-					display_error ctx ("Overload resolution failed for " ^ (s_type (print_context()) cf.cf_type)) p;
-					display_error ctx msg p2;
-				) failures;
-				error "End of overload failure reasons" p
-			end
-		in
-		if is_overload && ctx.com.config.pf_overload then begin match Overloads.Resolution.reduce_compatible candidates with
-			| [] -> fail()
-			| [el,tf,mk_call] -> List.map fst el,tf,mk_call
-			| _ -> error "Ambiguous overload" p
-		end else begin match List.rev candidates with
-			| [] -> fail()
-			| (el,tf,mk_call) :: _ -> List.map fst el,tf,mk_call
-		end
-
-let fast_enum_field e ef p =
-	let et = mk (TTypeExpr (TEnumDecl e)) (TAnon { a_fields = PMap.empty; a_status = ref (EnumStatics e) }) p in
-	TField (et,FEnum (e,ef))
-
-let abstract_module_type a tl = {
-	t_path = [],Printf.sprintf "Abstract<%s%s>" (s_type_path a.a_path) (s_type_params (ref []) tl);
-	t_module = a.a_module;
-	t_doc = None;
-	t_pos = a.a_pos;
-	t_name_pos = null_pos;
-	t_type = TAnon {
-		a_fields = PMap.empty;
-		a_status = ref (AbstractStatics a);
-	};
-	t_private = true;
-	t_params = [];
-	t_meta = no_meta;
-}
-
-let rec type_module_type ctx t tparams p =
-	match t with
-	| TClassDecl {cl_kind = KGenericBuild _} ->
-		let _,_,f = Typeload.build_instance ctx t p in
-		let t = f (match tparams with None -> [] | Some tl -> tl) in
-		let mt = try
-			module_type_of_type t
-		with Exit ->
-			if follow t == t_dynamic then Typeload.load_type_def ctx p { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None }
-			else error "Invalid module type" p
-		in
-		type_module_type ctx mt None p
-	| TClassDecl c ->
-		let t_tmp = {
-			t_path = [],"Class<" ^ (s_type_path c.cl_path) ^ ">" ;
-			t_module = c.cl_module;
-			t_doc = None;
-			t_pos = c.cl_pos;
-			t_name_pos = null_pos;
-			t_type = TAnon {
-				a_fields = c.cl_statics;
-				a_status = ref (Statics c);
-			};
-			t_private = true;
-			t_params = [];
-			t_meta = no_meta;
-		} in
-		mk (TTypeExpr (TClassDecl c)) (TType (t_tmp,[])) p
-	| TEnumDecl e ->
-		let types = (match tparams with None -> List.map (fun _ -> mk_mono()) e.e_params | Some l -> l) in
-		mk (TTypeExpr (TEnumDecl e)) (TType (e.e_type,types)) p
-	| TTypeDecl s ->
-		let t = apply_params s.t_params (List.map (fun _ -> mk_mono()) s.t_params) s.t_type in
-		if not (Common.defined ctx.com Define.NoDeprecationWarnings) then
-			Display.DeprecationCheck.check_typedef ctx.com s p;
-		(match follow t with
-		| TEnum (e,params) ->
-			type_module_type ctx (TEnumDecl e) (Some params) p
-		| TInst (c,params) ->
-			type_module_type ctx (TClassDecl c) (Some params) p
-		| TAbstract (a,params) ->
-			type_module_type ctx (TAbstractDecl a) (Some params) p
-		| _ ->
-			error (s_type_path s.t_path ^ " is not a value") p)
-	| TAbstractDecl { a_impl = Some c } ->
-		type_module_type ctx (TClassDecl c) tparams p
-	| TAbstractDecl a ->
-		if not (Meta.has Meta.RuntimeValue a.a_meta) then error (s_type_path a.a_path ^ " is not a value") p;
-		let t_tmp = abstract_module_type a [] in
-		mk (TTypeExpr (TAbstractDecl a)) (TType (t_tmp,[])) p
-
-let type_type ctx tpath p =
-	type_module_type ctx (Typeload.load_type_def ctx p { tpackage = fst tpath; tname = snd tpath; tparams = []; tsub = None }) None p
-
-let get_constructor ctx c params p =
-	match c.cl_kind with
-	| KAbstractImpl a ->
-		let f = (try PMap.find "_new" c.cl_statics with Not_found -> raise_error (No_constructor (TAbstractDecl a)) p) in
-		let ct = field_type ctx c params f p in
-		apply_params a.a_params params ct, f
+let unify_min_for_type_source ctx el src =
+	match src with
+	| Some WithType.ImplicitReturn when List.exists (fun e -> ExtType.is_void (follow e.etype)) el ->
+		ctx.com.basic.tvoid
 	| _ ->
-		let ct, f = (try Type.get_constructor (fun f -> field_type ctx c params f p) c with Not_found -> raise_error (No_constructor (TClassDecl c)) p) in
-		apply_params c.cl_params params ct, f
-
-let make_call ctx e params t p =
-	try
-		let ethis,cl,f = match e.eexpr with
-			| TField (ethis,fa) ->
-				let co,cf = match fa with
-					| FInstance(c,_,cf) | FStatic(c,cf) -> Some c,cf
-					| FAnon cf -> None,cf
-					| _ -> raise Exit
-				in
-				ethis,co,cf
-			| _ ->
-				raise Exit
-		in
-		if f.cf_kind <> Method MethInline then raise Exit;
-		let config = match cl with
-			| Some ({cl_kind = KAbstractImpl _}) when Meta.has Meta.Impl f.cf_meta ->
-				let t = if f.cf_name = "_new" then
-					t
-				else if params = [] then
-					error "Invalid abstract implementation function" f.cf_pos
-				else
-					follow (List.hd params).etype
-				in
-				begin match t with
-					| TAbstract(a,pl) ->
-						let has_params = a.a_params <> [] || f.cf_params <> [] in
-						let monos = List.map (fun _ -> mk_mono()) f.cf_params in
-						let map_type = fun t -> apply_params a.a_params pl (apply_params f.cf_params monos t) in
-						Some (has_params,map_type)
-					| _ ->
-						None
-				end
-			| _ ->
-				None
-		in
-		ignore(follow f.cf_type); (* force evaluation *)
-		let params = List.map (ctx.g.do_optimize ctx) params in
-		let force_inline = is_forced_inline cl f in
-		(match f.cf_expr_unoptimized,f.cf_expr with
-		| Some fd,_
-		| None,Some { eexpr = TFunction fd } ->
-			(match Optimizer.type_inline ctx f fd ethis params t config p force_inline with
-			| None ->
-				if force_inline then error "Inline could not be done" p;
-				raise Exit;
-			| Some e -> e)
-		| _ ->
-			(*
-				we can't inline because there is most likely a loop in the typing.
-				this can be caused by mutually recursive vars/functions, some of them
-				being inlined or not. In that case simply ignore inlining.
-			*)
-			raise Exit)
-	with Exit ->
-		mk (TCall (e,params)) t p
-
-let mk_array_get_call ctx (cf,tf,r,e1,e2o) c ebase p = match cf.cf_expr with
-	| None ->
-		if not (Meta.has Meta.NoExpr cf.cf_meta) then display_error ctx "Recursive array get method" p;
-		mk (TArray(ebase,e1)) r p
-	| Some _ ->
-		let et = type_module_type ctx (TClassDecl c) None p in
-		let ef = mk (TField(et,(FStatic(c,cf)))) tf p in
-		make_call ctx ef [ebase;e1] r p
-
-let mk_array_set_call ctx (cf,tf,r,e1,e2o) c ebase p =
-	let evalue = match e2o with None -> assert false | Some e -> e in
-	match cf.cf_expr with
-		| None ->
-			if not (Meta.has Meta.NoExpr cf.cf_meta) then display_error ctx "Recursive array set method" p;
-			let ea = mk (TArray(ebase,e1)) r p in
-			mk (TBinop(OpAssign,ea,evalue)) r p
-		| Some _ ->
-			let et = type_module_type ctx (TClassDecl c) None p in
-			let ef = mk (TField(et,(FStatic(c,cf)))) tf p in
-			make_call ctx ef [ebase;e1;evalue] r p
-
-let rec acc_get ctx g p =
-	match g with
-	| AKNo f -> error ("Field " ^ f ^ " cannot be accessed for reading") p
-	| AKExpr e -> e
-	| AKSet _ | AKAccess _ -> assert false
-	| AKUsing (et,c,cf,e) when ctx.in_display ->
-		(* Generate a TField node so we can easily match it for position/usage completion (issue #1968) *)
-		let ec = type_module_type ctx (TClassDecl c) None p in
-		let t = match follow et.etype with
-			| TFun (_ :: args,ret) -> TFun(args,ret)
-			| _ -> et.etype
-		in
-		mk (TField(ec,FStatic(c,cf))) t et.epos
-	| AKUsing (et,_,cf,e) ->
-		(* build a closure with first parameter applied *)
-		(match follow et.etype with
-		| TFun (_ :: args,ret) ->
-			let tcallb = TFun (args,ret) in
-			let twrap = TFun ([("_e",false,e.etype)],tcallb) in
-			(* arguments might not have names in case of variable fields of function types, so we generate one (issue #2495) *)
-			let args = List.map (fun (n,o,t) ->
-				let t = if o then ctx.t.tnull t else t in
-				o,if n = "" then gen_local ctx t e.epos else alloc_var n t e.epos (* TODO: var pos *)
-			) args in
-			let ve = alloc_var "_e" e.etype e.epos in
-			let ecall = make_call ctx et (List.map (fun v -> mk (TLocal v) v.v_type p) (ve :: List.map snd args)) ret p in
-			let ecallb = mk (TFunction {
-				tf_args = List.map (fun (o,v) -> v,if o then Some TNull else None) args;
-				tf_type = ret;
-				tf_expr = (match follow ret with | TAbstract ({a_path = [],"Void"},_) -> ecall | _ -> mk (TReturn (Some ecall)) t_dynamic p);
-			}) tcallb p in
-			let ewrap = mk (TFunction {
-				tf_args = [ve,None];
-				tf_type = tcallb;
-				tf_expr = mk (TReturn (Some ecallb)) t_dynamic p;
-			}) twrap p in
-			make_call ctx ewrap [e] tcallb p
-		| _ -> assert false)
-	| AKInline (e,f,fmode,t) ->
-		(* do not create a closure for static calls *)
-		let cmode = (match fmode with FStatic _ -> fmode | FInstance (c,tl,f) -> FClosure (Some (c,tl),f) | _ -> assert false) in
-		ignore(follow f.cf_type); (* force computing *)
-		(match f.cf_expr with
-		| None when ctx.com.display.dms_display ->
-			mk (TField (e,cmode)) t p
-		| None ->
-			error "Recursive inline is not supported" p
-		| Some { eexpr = TFunction _ } ->
-			let chk_class c = (c.cl_extern || Meta.has Meta.Extern f.cf_meta) && not (Meta.has Meta.Runtime f.cf_meta) in
-			let wrap_extern c =
-				let c2 =
-					let m = c.cl_module in
-					let mpath = (fst m.m_path @ ["_" ^ snd m.m_path],(snd m.m_path) ^ "_Impl_") in
-					try
-						let rec loop mtl = match mtl with
-							| (TClassDecl c) :: _ when c.cl_path = mpath -> c
-							| _ :: mtl -> loop mtl
-							| [] -> raise Not_found
-						in
-						loop c.cl_module.m_types
-					with Not_found ->
-						let c2 = mk_class c.cl_module mpath c.cl_pos null_pos in
-						c.cl_module.m_types <- (TClassDecl c2) :: c.cl_module.m_types;
-						c2
-				in
-				let cf = try
-					PMap.find f.cf_name c2.cl_statics
-				with Not_found ->
-					let cf = {f with cf_kind = Method MethNormal} in
-					c2.cl_statics <- PMap.add cf.cf_name cf c2.cl_statics;
-					c2.cl_ordered_statics <- cf :: c2.cl_ordered_statics;
-					cf
-				in
-				let e_t = type_module_type ctx (TClassDecl c2) None p in
-				mk (TField(e_t,FStatic(c2,cf))) t p
-			in
-			let e_def = mk (TField (e,cmode)) t p in
-			begin match follow e.etype with
-				| TInst (c,_) when chk_class c ->
-					display_error ctx "Can't create closure on an extern inline member method" p;
-					e_def
-				| TAnon a ->
-					begin match !(a.a_status) with
-						| Statics {cl_extern = false} when Meta.has Meta.Extern f.cf_meta ->
-							display_error ctx "Cannot create closure on @:extern inline method" p;
-							e_def
-						| Statics c when chk_class c -> wrap_extern c
-						| _ -> e_def
-					end
-				| _ -> e_def
-			end
-		| Some e ->
-			let rec loop e = Type.map_expr loop { e with epos = p } in
-			loop e)
-	| AKMacro _ ->
-		assert false
-
-let error_require r p =
-	if r = "" then
-		error "This field is not available with the current compilation flags" p
-	else
-	let r = if r = "sys" then
-		"a system platform (php,php7,neko,cpp,etc.)"
-	else try
-		if String.sub r 0 5 <> "flash" then raise Exit;
-		let _, v = ExtString.String.replace (String.sub r 5 (String.length r - 5)) "_" "." in
-		"flash version " ^ v ^ " (use -swf-version " ^ v ^ ")"
-	with _ ->
-		"'" ^ r ^ "' to be enabled"
-	in
-	error ("Accessing this field requires " ^ r) p
-
-let get_this ctx p =
-	match ctx.curfun with
-	| FunStatic ->
-		error "Cannot access this from a static function" p
-	| FunMemberClassLocal | FunMemberAbstractLocal ->
-		let v = match ctx.vthis with
-			| None ->
-				let v = if ctx.curfun = FunMemberAbstractLocal then
-					PMap.find "this" ctx.locals
-				else
-					add_local ctx "`this" ctx.tthis p
-				in
-				ctx.vthis <- Some v;
-				v
-			| Some v ->
-				ctx.locals <- PMap.add v.v_name v ctx.locals;
-				v
-		in
-		mk (TLocal v) ctx.tthis p
-	| FunMemberAbstract ->
-		let v = (try PMap.find "this" ctx.locals with Not_found -> assert false) in
-		mk (TLocal v) v.v_type p
-	| FunConstructor | FunMember ->
-		mk (TConst TThis) ctx.tthis p
-
-let field_access ctx mode f fmode t e p =
-	let fnormal() = AKExpr (mk (TField (e,fmode)) t p) in
-	let normal() =
-		match follow e.etype with
-		| TAnon a ->
-			(match !(a.a_status) with
-			| EnumStatics en ->
-				let c = (try PMap.find f.cf_name en.e_constrs with Not_found -> assert false) in
-				let fmode = FEnum (en,c) in
-				AKExpr (mk (TField (e,fmode)) t p)
-			| _ -> fnormal())
-		| _ -> fnormal()
-	in
-	match f.cf_kind with
-	| Method m ->
-		if mode = MSet && m <> MethDynamic && not ctx.untyped then error "Cannot rebind this method : please use 'dynamic' before method declaration" p;
-		begin match ctx.curfun,e.eexpr with
-		| (FunMemberAbstract | FunMemberAbstractLocal),TTypeExpr(TClassDecl ({cl_kind = KAbstractImpl a} as c)) when c == ctx.curclass && Meta.has Meta.Impl f.cf_meta ->
-			let e = mk (TField(e,fmode)) t p in
-			let ethis = get_this ctx p in
-			let ethis = {ethis with etype = TAbstract(a,List.map snd a.a_params)} in
-			AKUsing(e,ctx.curclass,f,ethis)
-		| _ ->
-			(match m, mode with
-			| MethInline, _ -> AKInline (e,f,fmode,t)
-			| MethMacro, MGet -> display_error ctx "Macro functions must be called immediately" p; normal()
-			| MethMacro, MCall -> AKMacro (e,f)
-			| _ , MGet ->
-				let cmode = (match fmode with
-					| FInstance(_, _, cf) | FStatic(_, cf) when Meta.has Meta.Generic cf.cf_meta -> display_error ctx "Cannot create closure on generic function" p; fmode
-					| FInstance (c,tl,cf) -> FClosure (Some (c,tl),cf)
-					| FStatic _ | FEnum _ -> fmode
-					| FAnon f -> FClosure (None, f)
-					| FDynamic _ | FClosure _ -> assert false
-				) in
-				AKExpr (mk (TField (e,cmode)) t p)
-			| _ -> normal())
-		end
-	| Var v ->
-		match (match mode with MGet | MCall -> v.v_read | MSet -> v.v_write) with
-		| AccNo when not (Meta.has Meta.PrivateAccess ctx.meta) ->
-			(match follow e.etype with
-			| TInst (c,_) when is_parent c ctx.curclass || can_access ctx c { f with cf_public = false } false -> normal()
-			| TAnon a ->
-				(match !(a.a_status) with
-				| Opened when mode = MSet ->
-					f.cf_kind <- Var { v with v_write = AccNormal };
-					normal()
-				| Statics c2 when ctx.curclass == c2 || can_access ctx c2 { f with cf_public = false } true -> normal()
-				| _ -> if ctx.untyped then normal() else AKNo f.cf_name)
-			| _ ->
-				if ctx.untyped then normal() else AKNo f.cf_name)
-		| AccNormal | AccNo ->
-			(*
-				if we are reading from a read-only variable on an anonymous object, it might actually be a method, so make sure to create a closure
-			*)
-			let is_maybe_method() =
-				match v.v_write, follow t, follow e.etype with
-				| (AccNo | AccNever), TFun _, TAnon a ->
-					(match !(a.a_status) with
-					| Statics _ | EnumStatics _ -> false
-					| _ -> true)
-				| _ -> false
-			in
-			if mode = MGet && is_maybe_method() then
-				AKExpr (mk (TField (e,FClosure (None,f))) t p)
-			else
-				normal()
-		| AccCall ->
-			let m = (match mode with MSet -> "set_" | _ -> "get_") ^ f.cf_name in
-			let is_abstract_this_access () = match e.eexpr,ctx.curfun with
-				| TTypeExpr (TClassDecl ({cl_kind = KAbstractImpl _} as c)),(FunMemberAbstract | FunMemberAbstractLocal) ->
-					c == ctx.curclass
-				| _ ->
-					false
-			in
-			if m = ctx.curfield.cf_name && (match e.eexpr with TConst TThis -> true | TLocal v -> Option.map_default (fun vthis -> v == vthis) false ctx.vthis | TTypeExpr (TClassDecl c) when c == ctx.curclass -> true | _ -> false) then
-				let prefix = (match ctx.com.platform with Flash when Common.defined ctx.com Define.As3 -> "$" | _ -> "") in
-				if is_extern_field f then begin
-					display_error ctx "This field cannot be accessed because it is not a real variable" p;
-					display_error ctx "Add @:isVar here to enable it" f.cf_pos;
-				end;
-				AKExpr (mk (TField (e,if prefix = "" then fmode else FDynamic (prefix ^ f.cf_name))) t p)
-			else if is_abstract_this_access() then begin
-				let this = get_this ctx p in
-				if mode = MSet then begin
-					let c,a = match ctx.curclass with {cl_kind = KAbstractImpl a} as c -> c,a | _ -> assert false in
-					let f = PMap.find m c.cl_statics in
-					(* we don't have access to the type parameters here, right? *)
-					(* let t = apply_params a.a_params pl (field_type ctx c [] f p) in *)
-					let t = (field_type ctx c [] f p) in
-					let ef = mk (TField (e,FStatic (c,f))) t p in
-					AKUsing (ef,c,f,this)
-				end else
-					AKExpr (make_call ctx (mk (TField (e,quick_field_dynamic e.etype m)) (tfun [this.etype] t) p) [this] t p)
-			end else if mode = MSet then
-				AKSet (e,t,f)
-			else
-				AKExpr (make_call ctx (mk (TField (e,quick_field_dynamic e.etype m)) (tfun [] t) p) [] t p)
-		| AccResolve ->
-			let fstring = mk (TConst (TString f.cf_name)) ctx.t.tstring p in
-			let tresolve = tfun [ctx.t.tstring] t in
-			AKExpr (make_call ctx (mk (TField (e,FDynamic "resolve")) tresolve p) [fstring] t p)
-		| AccNever ->
-			if ctx.untyped then normal() else AKNo f.cf_name
-		| AccInline ->
-			AKInline (e,f,fmode,t)
-		| AccRequire (r,msg) ->
-			match msg with
-			| None -> error_require r p
-			| Some msg -> error msg p
-
-let rec using_field ctx mode e i p =
-	if mode = MSet then raise Not_found;
-	(* do not try to find using fields if the type is a monomorph, which could lead to side-effects *)
-	let is_dynamic = match follow e.etype with
-		| TMono _ -> raise Not_found
-		| t -> t == t_dynamic
-	in
-	let check_constant_struct = ref false in
-	let rec loop = function
-	| [] ->
-		raise Not_found
-	| (c,pc) :: l ->
-		try
-			let cf = PMap.find i c.cl_statics in
-			if Meta.has Meta.NoUsing cf.cf_meta || not (can_access ctx c cf true) || (Meta.has Meta.Impl cf.cf_meta) then raise Not_found;
-			let monos = List.map (fun _ -> mk_mono()) cf.cf_params in
-			let map = apply_params cf.cf_params monos in
-			let t = map cf.cf_type in
-			begin match follow t with
-				| TFun((_,_,(TType({t_path = ["haxe";"macro"],"ExprOf"},[t0]) | t0)) :: args,r) ->
-					if is_dynamic && follow t0 != t_dynamic then raise Not_found;
-					let e = AbstractCast.cast_or_unify_raise ctx t0 e p in
-					(* early constraints check is possible because e.etype has no monomorphs *)
-					List.iter2 (fun m (name,t) -> match follow t with
-						| TInst ({ cl_kind = KTypeParameter constr },_) when constr <> [] && not (has_mono m) ->
-							List.iter (fun tc -> Type.unify m (map tc)) constr
-						| _ -> ()
-					) monos cf.cf_params;
-					let et = type_module_type ctx (TClassDecl c) None p in
-					Display.ImportHandling.maybe_mark_import_position ctx pc;
-					AKUsing (mk (TField (et,FStatic (c,cf))) t p,c,cf,e)
-				| _ ->
-					raise Not_found
-			end
-		with Not_found ->
-			loop l
-		| Unify_error el | Error (Unify el,_) ->
-			if List.exists (function Has_extra_field _ -> true | _ -> false) el then check_constant_struct := true;
-			loop l
-	in
-	try loop ctx.m.module_using with Not_found ->
-	try
-		let acc = loop ctx.g.global_using in
-		(match acc with
-		| AKUsing (_,c,_,_) -> add_dependency ctx.m.curmod c.cl_module
-		| _ -> assert false);
-		acc
-	with Not_found ->
-	if not !check_constant_struct then raise Not_found;
-	remove_constant_flag e.etype (fun ok -> if ok then using_field ctx mode e i p else raise Not_found)
+		unify_min ctx el
 
 let rec type_ident_raise ctx i p mode =
 	match i with
@@ -1181,12 +310,11 @@ let rec type_ident_raise ctx i p mode =
 		else
 			AKNo i
 	| "this" ->
+		if mode = MSet then add_class_field_flag ctx.curfield CfModifiesThis;
 		(match mode, ctx.curclass.cl_kind with
 		| MSet, KAbstractImpl _ ->
-			(match ctx.curfield.cf_kind with
-			| Method MethInline -> ()
-			| Method _ when ctx.curfield.cf_name = "_new" -> ()
-			| _ -> error "You can only modify 'this' inside an inline function" p);
+			if not (assign_to_this_is_allowed ctx) then
+				error "Abstract 'this' value can only be modified inside an inline function" p;
 			AKExpr (get_this ctx p)
 		| (MCall, KAbstractImpl _) | (MGet, _)-> AKExpr(get_this ctx p)
 		| _ -> AKNo i)
@@ -1213,7 +341,7 @@ let rec type_ident_raise ctx i p mode =
 		| Some (params,e) ->
 			let t = monomorphs params v.v_type in
 			(match e with
-			| Some ({ eexpr = TFunction f } as e) when ctx.com.display.dms_full_typing ->
+			| Some ({ eexpr = TFunction f } as e) when ctx.com.display.dms_inline ->
 				begin match mode with
 					| MSet -> error "Cannot set inline closure" p
 					| MGet -> error "Cannot create closure on inline closure" p
@@ -1234,12 +362,6 @@ let rec type_ident_raise ctx i p mode =
 		if ctx.curfun = FunStatic then raise Not_found;
 		let c , t , f = class_field ctx ctx.curclass (List.map snd ctx.curclass.cl_params) i p in
 		field_access ctx mode f (match c with None -> FAnon f | Some (c,tl) -> FInstance (c,tl,f)) t (get_this ctx p) p
-	with Not_found -> try
-		(* lookup using on 'this' *)
-		if ctx.curfun = FunStatic then raise Not_found;
-		(match using_field ctx mode (mk (TConst TThis) ctx.tthis p) i p with
-		| AKUsing (et,c,f,_) -> AKUsing (et,c,f,get_this ctx p)
-		| _ -> assert false)
 	with Not_found -> try
 		(* static variable lookup *)
 		let f = PMap.find i ctx.curclass.cl_statics in
@@ -1269,7 +391,7 @@ let rec type_ident_raise ctx i p mode =
 							let et = type_module_type ctx (TClassDecl c) None p in
 							let fa = FStatic(c,cf) in
 							let t = monomorphs cf.cf_params cf.cf_type in
-							Display.ImportHandling.maybe_mark_import_position ctx pt;
+							ImportHandling.maybe_mark_import_position ctx pt;
 							begin match cf.cf_kind with
 								| Var {v_read = AccInline} -> AKInline(et,cf,fa,t)
 								| _ -> AKExpr (mk (TField(et,fa)) t p)
@@ -1283,6 +405,7 @@ let rec type_ident_raise ctx i p mode =
 				| TTypeDecl t ->
 					(match follow t.t_type with
 					| TEnum (e,_) -> loop ((TEnumDecl e,pt) :: l)
+					| TAbstract (a,_) when Meta.has Meta.Enum a.a_meta -> loop ((TAbstractDecl a,pt) :: l)
 					| _ -> loop l)
 				| TEnumDecl e ->
 					try
@@ -1290,7 +413,7 @@ let rec type_ident_raise ctx i p mode =
 						let et = type_module_type ctx t None p in
 						let monos = List.map (fun _ -> mk_mono()) e.e_params in
 						let monos2 = List.map (fun _ -> mk_mono()) ef.ef_params in
-						Display.ImportHandling.maybe_mark_import_position ctx pt;
+						ImportHandling.maybe_mark_import_position ctx pt;
 						wrap (mk (TField (et,FEnum (e,ef))) (enum_field_type ctx e ef monos monos2 p) p)
 					with
 						Not_found -> loop l
@@ -1299,360 +422,21 @@ let rec type_ident_raise ctx i p mode =
 	with Not_found ->
 		(* lookup imported globals *)
 		let t, name, pi = PMap.find i ctx.m.module_globals in
-		Display.ImportHandling.maybe_mark_import_position ctx pi;
+		ImportHandling.maybe_mark_import_position ctx pi;
 		let e = type_module_type ctx t None p in
-		type_field ctx e name p mode
+		type_field_default_cfg ctx e name p mode
 
-and type_field ?(resume=false) ctx e i p mode =
-	let no_field() =
-		if resume then raise Not_found;
-		let t = match follow e.etype with
-			| TAnon a -> (match !(a.a_status) with
-				| Statics {cl_kind = KAbstractImpl a} -> TAbstract(a,[])
-				| _ -> e.etype)
-			| TInst({cl_kind = KAbstractImpl a},_) -> TAbstract(a,[])
-			| _ -> e.etype
-		in
-		let has_special_field a =
-			List.exists (fun (_,cf) -> cf.cf_name = i) a.a_ops
-			|| List.exists (fun (_,_,cf) -> cf.cf_name = i) a.a_unops
-			|| List.exists (fun cf -> cf.cf_name = i) a.a_array
-		in
-		if not ctx.untyped then begin
-			match t with
-			| TAbstract(a,_) when has_special_field a ->
-				(* the abstract field is not part of the field list, which is only true when it has no expression (issue #2344) *)
-				display_error ctx ("Field " ^ i ^ " cannot be called directly because it has no expression") p;
-			| _ ->
-				display_error ctx (StringError.string_error i (string_source t) (s_type (print_context()) t ^ " has no field " ^ i)) p;
-		end;
-		AKExpr (mk (TField (e,FDynamic i)) (mk_mono()) p)
-	in
-	let does_forward a stat =
-		try
-			let _,el,_ = Meta.get (if stat then Meta.ForwardStatics else Meta.Forward) a.a_meta in
-			match el with
-				| [] ->
-					true
-				| _ ->
-					List.exists (fun e -> match fst e with
-						| EConst(Ident s | String s) -> s = i
-						| _ -> error "Identifier or string expected as argument to @:forward" (pos e)
-					) el
-		with Not_found ->
-			false
-	in
-	match follow e.etype with
-	| TInst (c,params) ->
-		let rec loop_dyn c params =
-			match c.cl_dynamic with
-			| Some t ->
-				let t = apply_params c.cl_params params t in
-				if (mode = MGet || mode = MCall) && PMap.mem "resolve" c.cl_fields then begin
-					let f = PMap.find "resolve" c.cl_fields in
-					begin match f.cf_kind with
-						| Method MethMacro -> display_error ctx "The macro accessor is not allowed for field resolve" f.cf_pos
-						| _ -> ()
-					end;
-					let texpect = tfun [ctx.t.tstring] t in
-					let tfield = apply_params c.cl_params params (monomorphs f.cf_params f.cf_type) in
-					(try Type.unify tfield texpect
-					with Unify_error l ->
-						display_error ctx "Field resolve has an invalid type" f.cf_pos;
-						display_error ctx (error_msg (Unify [Cannot_unify(tfield,texpect)])) f.cf_pos);
-					AKExpr (make_call ctx (mk (TField (e,FInstance (c,params,f))) tfield p) [Codegen.type_constant ctx.com (String i) p] t p)
-				end else
-					AKExpr (mk (TField (e,FDynamic i)) t p)
-			| None ->
-				match c.cl_super with
-				| None -> raise Not_found
-				| Some (c,params) -> loop_dyn c params
-		in
-		(try
-			let c2, t , f = class_field ctx c params i p in
-			if e.eexpr = TConst TSuper then (match mode,f.cf_kind with
-				| MGet,Var {v_read = AccCall }
-				| MSet,Var {v_write = AccCall }
-				| MCall,Var {v_read = AccCall } ->
-					()
-				| MCall, Var _ ->
-					display_error ctx "Cannot access superclass variable for calling: needs to be a proper method" p
-				| MCall, _ ->
-					()
-				| MGet,Var _
-				| MSet,Var _ when (match c2 with Some ({ cl_extern = true; cl_path = ("flash" :: _,_) }, _) -> true | _ -> false) ->
-					()
-				| _, Method _ ->
-					display_error ctx "Cannot create closure on super method" p
-				| _ ->
-					display_error ctx "Normal variables cannot be accessed with 'super', use 'this' instead" p);
-			if not (can_access ctx c f false) && not ctx.untyped then display_error ctx ("Cannot access private field " ^ i) p;
-			field_access ctx mode f (match c2 with None -> FAnon f | Some (c,tl) -> FInstance (c,tl,f)) (apply_params c.cl_params params t) e p
-		with Not_found -> try
-			using_field ctx mode e i p
-		with Not_found -> try
-			loop_dyn c params
-		with Not_found -> try
-			(* if we have an abstract constraint we have to check its static fields and recurse (issue #2343) *)
-			begin match c.cl_kind with
-				| KTypeParameter tl ->
-					let rec loop tl = match tl with
-						| t :: tl ->
-							begin match follow t with
-								| TAbstract({a_impl = Some c},tl) when PMap.mem i c.cl_statics ->
-									let e = mk_cast e t p in
-									type_field ctx e i p mode;
-								| _ ->
-									loop tl
-							end
-						| [] ->
-							raise Not_found
-					in
-					loop tl
-				| _ ->
-					raise Not_found
-			end
-		with Not_found ->
-			if PMap.mem i c.cl_statics then error ("Cannot access static field " ^ i ^ " from a class instance") p;
-			no_field())
-	| TDynamic t ->
-		(try
-			using_field ctx mode e i p
-		with Not_found ->
-			AKExpr (mk (TField (e,FDynamic i)) t p))
-	| TAnon a ->
-		(try
-			let f = PMap.find i a.a_fields in
-			if not f.cf_public && not ctx.untyped then begin
-				match !(a.a_status) with
-				| Closed | Extend _ -> () (* always allow anon private fields access *)
-				| Statics c when can_access ctx c f true -> ()
-				| _ -> display_error ctx ("Cannot access private field " ^ i) p
-			end;
-			let fmode, ft = (match !(a.a_status) with
-				| Statics c -> FStatic (c,f), field_type ctx c [] f p
-				| EnumStatics e -> FEnum (e,try PMap.find f.cf_name e.e_constrs with Not_found -> assert false), Type.field_type f
-				| _ ->
-					match f.cf_params with
-					| [] ->
-						FAnon f, Type.field_type f
-					| l ->
-						(* handle possible constraints *)
-						let monos = List.map (fun _ -> mk_mono()) l in
-						let t = apply_params f.cf_params monos f.cf_type in
-						add_constraint_checks ctx [] [] f monos p;
-						FAnon f, t
-			) in
-			field_access ctx mode f fmode ft e p
-		with Not_found -> try
-				match !(a.a_status) with
-				| Statics {cl_kind = KAbstractImpl a} when does_forward a true ->
-					let mt = try module_type_of_type a.a_this with Exit -> raise Not_found in
-					let et = type_module_type ctx mt None p in
-					type_field ctx et i p mode;
-				| _ ->
-					raise Not_found
-			with Not_found ->
-				if is_closed a then try
-					using_field ctx mode e i p
-				with Not_found ->
-					no_field()
-				else
-				let f = {
-					cf_name = i;
-					cf_type = mk_mono();
-					cf_doc = None;
-					cf_meta = no_meta;
-					cf_public = true;
-					cf_pos = p;
-					cf_name_pos = null_pos;
-					cf_kind = Var { v_read = AccNormal; v_write = (match mode with MSet -> AccNormal | MGet | MCall -> AccNo) };
-					cf_expr = None;
-					cf_expr_unoptimized = None;
-					cf_params = [];
-					cf_overloads = [];
-				} in
-				a.a_fields <- PMap.add i f a.a_fields;
-				field_access ctx mode f (FAnon f) (Type.field_type f) e p
-		)
-	| TMono r ->
-		let f = {
-			cf_name = i;
-			cf_type = mk_mono();
-			cf_doc = None;
-			cf_meta = no_meta;
-			cf_public = true;
-			cf_pos = p;
-			cf_name_pos = null_pos;
-			cf_kind = Var { v_read = AccNormal; v_write = (match mode with MSet -> AccNormal | MGet | MCall -> AccNo) };
-			cf_expr = None;
-			cf_expr_unoptimized = None;
-			cf_params = [];
-			cf_overloads = [];
-		} in
-		let x = ref Opened in
-		let t = TAnon { a_fields = PMap.add i f PMap.empty; a_status = x } in
-		ctx.opened <- x :: ctx.opened;
-		r := Some t;
-		field_access ctx mode f (FAnon f) (Type.field_type f) e p
-	| TAbstract (a,pl) ->
-		let static_abstract_access_through_instance = ref false in
-		(try
-			let c = (match a.a_impl with None -> raise Not_found | Some c -> c) in
-			let f = PMap.find i c.cl_statics in
-			if not (can_access ctx c f true) && not ctx.untyped then display_error ctx ("Cannot access private field " ^ i) p;
-			let field_type f =
-				if not (Meta.has Meta.Impl f.cf_meta) then begin
-					static_abstract_access_through_instance := true;
-					raise Not_found;
-				end;
-				let t = field_type ctx c [] f p in
-				apply_params a.a_params pl t
-			in
-			let et = type_module_type ctx (TClassDecl c) None p in
-			let field_expr f t = mk (TField (et,FStatic (c,f))) t p in
-			(match mode, f.cf_kind with
-			| (MGet | MCall), Var {v_read = AccCall } ->
-				(* getter call *)
-				let f = PMap.find ("get_" ^ f.cf_name) c.cl_statics in
-				let t = field_type f in
-				let r = match follow t with TFun(_,r) -> r | _ -> raise Not_found in
-				let ef = field_expr f t in
-				AKExpr(make_call ctx ef [e] r p)
-			| MSet, Var {v_write = AccCall } ->
-				let f = PMap.find ("set_" ^ f.cf_name) c.cl_statics in
-				let t = field_type f in
-				let ef = field_expr f t in
-				AKUsing (ef,c,f,e)
-			| (MGet | MCall), Var {v_read = AccNever} ->
-				AKNo f.cf_name
-			| (MGet | MCall), _ ->
-				let rec loop cfl = match cfl with
-					| [] -> error (Printf.sprintf "Field %s cannot be called on %s" f.cf_name (s_type (print_context()) e.etype)) p
-					| cf :: cfl ->
-						match follow (apply_params a.a_params pl (monomorphs cf.cf_params cf.cf_type)) with
-							| TFun((_,_,t1) :: _,_) when type_iseq t1 (Abstract.get_underlying_type a pl) ->
-								cf
-							| _ ->
-								loop cfl
-				in
-				let f = match f.cf_overloads with
-					| [] -> f
-					| cfl -> loop (f :: cfl)
-				in
-				let t = field_type f in
-				begin match follow t with
-					| TFun((_,_,t1) :: _,_) -> ()
-					| _ -> error ("Invalid call to static function " ^ i ^ " through abstract instance") p
-				end;
-				let ef = field_expr f t in
-				AKUsing (ef,c,f,e)
-			| MSet, _ ->
-				error "This operation is unsupported" p)
-		with Not_found -> try
-			if does_forward a false then
-				type_field ~resume:true ctx {e with etype = apply_params a.a_params pl a.a_this} i p mode
-			else
-				raise Not_found
-		with Not_found -> try
-			using_field ctx mode e i p
-		with Not_found -> try
-			(match ctx.curfun, e.eexpr with
-			| FunMemberAbstract, TConst (TThis) -> type_field ctx {e with etype = apply_params a.a_params pl a.a_this} i p mode;
-			| _ -> raise Not_found)
-		with Not_found -> try
-			let c,cf = match a.a_impl,a.a_resolve with
-				| Some c,Some cf -> c,cf
-				| _ -> raise Not_found
-			in
-			let et = type_module_type ctx (TClassDecl c) None p in
-			let t = apply_params a.a_params pl (field_type ctx c [] cf p) in
-			let ef = mk (TField (et,FStatic (c,cf))) t p in
-			AKExpr ((!build_call_ref) ctx (AKUsing(ef,c,cf,e)) [EConst (String i),p] NoValue p)
-		with Not_found ->
-			if !static_abstract_access_through_instance then error ("Invalid call to static function " ^ i ^ " through abstract instance") p
-			else no_field())
-	| _ ->
-		try using_field ctx mode e i p with Not_found -> no_field()
-
-let type_bind ctx (e : texpr) params p =
-	let args,ret = match follow e.etype with TFun(args, ret) -> args, ret | _ -> error "First parameter of callback is not a function" p in
-	let vexpr v = mk (TLocal v) v.v_type p in
-	let acount = ref 0 in
-	let alloc_name n =
-		if n = "" || String.length n > 2 && not ctx.is_display_file then begin
-			incr acount;
-			"a" ^ string_of_int !acount;
-		end else
-			n
-	in
-	let rec loop args params given_args missing_args ordered_args = match args, params with
-		| [], [] -> given_args,missing_args,ordered_args
-		| [], _ -> error "Too many callback arguments" p
-		| (n,o,t) :: args , [] when o ->
-			let a = if is_pos_infos t then
-					let infos = mk_infos ctx p [] in
-					ordered_args @ [type_expr ctx infos (WithType t)]
-				else if ctx.com.config.pf_pad_nulls then
-					(ordered_args @ [(mk (TConst TNull) t_dynamic p)])
-				else
-					ordered_args
-			in
-			loop args [] given_args missing_args a
-		| (n,o,t) :: _ , (EConst(Ident "_"),p) :: _ when not ctx.com.config.pf_can_skip_non_nullable_argument && o && not (is_nullable t) ->
-			error "Usage of _ is not supported for optional non-nullable arguments" p
-		| (n,o,t) :: args , ([] as params)
-		| (n,o,t) :: args , (EConst(Ident "_"),_) :: params ->
-			let v = alloc_var (alloc_name n) (if o then ctx.t.tnull t else t) p in
-			loop args params given_args (missing_args @ [v,o]) (ordered_args @ [vexpr v])
-		| (n,o,t) :: args , param :: params ->
-			let e = type_expr ctx param (WithType t) in
-			let e = AbstractCast.cast_or_unify ctx t e p in
-			let v = alloc_var (alloc_name n) t (pos param) in
-			loop args params (given_args @ [v,o,Some e]) missing_args (ordered_args @ [vexpr v])
-	in
-	let given_args,missing_args,ordered_args = loop args params [] [] [] in
-	let rec gen_loc_name n =
-		let name = if n = 0 then "f" else "f" ^ (string_of_int n) in
-		if List.exists (fun (n,_,_) -> name = n) args then gen_loc_name (n + 1) else name
-	in
-	let loc = alloc_var (gen_loc_name 0) e.etype e.epos in
-	let given_args = (loc,false,Some e) :: given_args in
-	let inner_fun_args l = List.map (fun (v,o) -> v.v_name, o, v.v_type) l in
-	let t_inner = TFun(inner_fun_args missing_args, ret) in
-	let call = make_call ctx (vexpr loc) ordered_args ret p in
-	let e_ret = match follow ret with
-		| TAbstract ({a_path = [],"Void"},_) ->
-			call
-		| TMono _ ->
-			mk (TReturn (Some call)) t_dynamic p;
-		| _ ->
-			mk (TReturn (Some call)) t_dynamic p;
-	in
-	let func = mk (TFunction {
-		tf_args = List.map (fun (v,o) -> v, if o then Some TNull else None) missing_args;
-		tf_type = ret;
-		tf_expr = e_ret;
-	}) t_inner p in
-	let outer_fun_args l = List.map (fun (v,o,_) -> v.v_name, o, v.v_type) l in
-	let func = mk (TFunction {
-		tf_args = List.map (fun (v,_,_) -> v,None) given_args;
-		tf_type = t_inner;
-		tf_expr = mk (TReturn (Some func)) t_inner p;
-	}) (TFun(outer_fun_args given_args, t_inner)) p in
-	make_call ctx func (List.map (fun (_,_,e) -> (match e with Some e -> e | None -> assert false)) given_args) t_inner p
-
-(*
-	We want to try unifying as an integer and apply side effects.
-	However, in case the value is not a normal Monomorph but one issued
-	from a Dynamic relaxation, we will instead unify with float since
-	we don't want to accidentaly truncate the value
-*)
-let unify_int ctx e k =
-	let is_dynamic t =
-		match follow t with
-		| TDynamic _ -> true
-		| _ -> false
+(*
+	We want to try unifying as an integer and apply side effects.
+	However, in case the value is not a normal Monomorph but one issued
+	from a Dynamic relaxation, we will instead unify with float since
+	we don't want to accidentaly truncate the value
+*)
+let unify_int ctx e k =
+	let is_dynamic t =
+		match follow t with
+		| TDynamic _ -> true
+		| _ -> false
 	in
 	let is_dynamic_array t =
 		match follow t with
@@ -1700,123 +484,37 @@ let unify_int ctx e k =
 		unify ctx e.etype ctx.t.tint e.epos;
 		true
 
- let type_generic_function ctx (e,fa) el ?(using_param=None) with_type p =
-	let c,tl,cf,stat = match fa with
-		| FInstance(c,tl,cf) -> c,tl,cf,false
-		| FStatic(c,cf) -> c,[],cf,true
-		| _ -> assert false
-	in
-	if cf.cf_params = [] then error "Function has no type parameters and cannot be generic" p;
-	let monos = List.map (fun _ -> mk_mono()) cf.cf_params in
-	let map_monos t = apply_params cf.cf_params monos t in
-	let map t = if stat then map_monos t else apply_params c.cl_params tl (map_monos t) in
-	let t = map cf.cf_type in
-	let args,ret = match t,using_param with
-		| TFun((_,_,ta) :: args,ret),Some e ->
-			let ta = if not (Meta.has Meta.Impl cf.cf_meta) then ta
-			else match follow ta with TAbstract(a,tl) -> Abstract.get_underlying_type a tl | _ -> assert false
-			in
-			(* manually unify first argument *)
-			unify ctx e.etype ta p;
-			args,ret
-		| TFun(args,ret),None -> args,ret
-		| _ ->  error "Invalid field type for generic call" p
-	in
-	begin match with_type with
-		| WithType t -> unify ctx ret t p
-		| _ -> ()
-	end;
-	let el,_ = unify_call_args ctx el args ret p false false in
-	begin try
-		check_constraints ctx cf.cf_name cf.cf_params monos map false p
-	with Unify_error l ->
-		display_error ctx (error_msg (Unify l)) p
-	end;
-	let el = match using_param with None -> el | Some e -> e :: el in
-	(try
-		let gctx = Typeload.make_generic ctx cf.cf_params monos p in
-		let name = cf.cf_name ^ "_" ^ gctx.Typeload.name in
-		let unify_existing_field tcf pcf = try
-			unify_raise ctx tcf t p
-		with Error(Unify _,_) as err ->
-			display_error ctx ("Cannot create field " ^ name ^ " due to type mismatch") p;
-			display_error ctx "Conflicting field was defined here" pcf;
-			raise err
-		in
-		let cf2 = try
-			let cf2 = if stat then
-				let cf2 = PMap.find name c.cl_statics in
-				unify_existing_field cf2.cf_type cf2.cf_pos;
-				cf2
-			else
-				let cf2 = PMap.find name c.cl_fields in
-				unify_existing_field cf2.cf_type cf2.cf_pos;
-				cf2
-			in
-			cf2
-		with Not_found ->
-			let cf2 = mk_field name (map_monos cf.cf_type) cf.cf_pos cf.cf_name_pos in
-			if stat then begin
-				c.cl_statics <- PMap.add name cf2 c.cl_statics;
-				c.cl_ordered_statics <- cf2 :: c.cl_ordered_statics
-			end else begin
-				if List.memq cf c.cl_overrides then c.cl_overrides <- cf2 :: c.cl_overrides;
-				c.cl_fields <- PMap.add name cf2 c.cl_fields;
-				c.cl_ordered_fields <- cf2 :: c.cl_ordered_fields
-			end;
-			ignore(follow cf.cf_type);
-			let rec check e = match e.eexpr with
-				| TNew({cl_kind = KTypeParameter _} as c,_,_) when not (Typeload.is_generic_parameter ctx c) ->
-					display_error ctx "Only generic type parameters can be constructed" e.epos;
-					display_error ctx "While specializing this call" p;
-				| _ ->
-					Type.iter check e
-			in
-			cf2.cf_expr <- (match cf.cf_expr with
-				| None ->
-					display_error ctx "Recursive @:generic function" p; None;
-				| Some e ->
-					let e = Typeload.generic_substitute_expr gctx e in
-					check e;
-					Some e
-			);
-			cf2.cf_kind <- cf.cf_kind;
-			cf2.cf_public <- cf.cf_public;
-			let metadata = List.filter (fun (m,_,_) -> match m with
-				| Meta.Generic -> false
-				| _ -> true
-			) cf.cf_meta in
-			cf2.cf_meta <- (Meta.NoCompletion,[],p) :: (Meta.NoUsing,[],p) :: (Meta.GenericInstance,[],p) :: metadata;
-			cf2
-		in
-		let path = match c.cl_kind with
-			| KAbstractImpl(a) ->
-				a.a_path
-			| _ -> c.cl_path
-		in
-		let e = if stat then type_type ctx path p else e in
-		let fa = if stat then FStatic (c,cf2) else FInstance (c,tl,cf2) in
-		let e = mk (TField(e,fa)) cf2.cf_type p in
-		make_call ctx e el ret p
-	with Typeload.Generic_Exception (msg,p) ->
-		error msg p)
-
-let call_to_string ctx ?(resume=false) e =
-	(* Ignore visibility of the toString field. *)
-	ctx.meta <- (Meta.PrivateAccess,[],e.epos) :: ctx.meta;
-	let acc = type_field ~resume ctx e "toString" e.epos MCall in
-	ctx.meta <- List.tl ctx.meta;
-	!build_call_ref ctx acc [] (WithType ctx.t.tstring) e.epos
-
 let rec type_binop ctx op e1 e2 is_assign_op with_type p =
+	let type_non_assign_op abstract_overload_only =
+		(* If the with_type is an abstract which has exactly one applicable @:op method, we can promote it
+		   to the individual arguments (issue #2786). *)
+		let wt = match with_type with
+			| WithType.WithType(t,_) ->
+				begin match follow t with
+					| TAbstract(a,_) ->
+						begin match List.filter (fun (o,_) -> o = OpAssignOp(op) || o == op) a.a_ops with
+							| [_] -> with_type
+							| _ -> WithType.value
+						end
+					| _ ->
+						WithType.value
+				end
+			| _ ->
+				WithType.value
+		in
+		let e1 = type_expr ctx e1 wt in
+		type_binop2 ~abstract_overload_only ctx op e1 e2 is_assign_op wt p
+	in
 	match op with
 	| OpAssign ->
 		let e1 = type_access ctx (fst e1) (snd e1) MSet in
-		let tt = (match e1 with AKNo _ | AKInline _ | AKUsing _ | AKMacro _ | AKAccess _ -> Value | AKSet(_,t,_) -> WithType t | AKExpr e -> WithType e.etype) in
-		let e2 = type_expr ctx e2 tt in
+		let e2 with_type = type_expr ctx e2 with_type in
 		(match e1 with
 		| AKNo s -> error ("Cannot access field or identifier " ^ s ^ " for writing") p
+		| AKExpr { eexpr = TLocal { v_kind = VUser TVOLocalFunction; v_name = name } } ->
+			error ("Cannot access function " ^ name ^ " for writing") p
 		| AKExpr e1  ->
+			let e2 = e2 (WithType.with_type e1.etype) in
 			let e2 = AbstractCast.cast_or_unify ctx e1.etype e2 p in
 			check_assign ctx e1;
 			(match e1.eexpr , e2.eexpr with
@@ -1826,14 +524,24 @@ let rec type_binop ctx op e1 e2 is_assign_op with_type p =
 			| _ , _ -> ());
 			mk (TBinop (op,e1,e2)) e1.etype p
 		| AKSet (e,t,cf) ->
+			let e2 = e2 (WithType.with_type t) in
 			let e2 = AbstractCast.cast_or_unify ctx t e2 p in
 			make_call ctx (mk (TField (e,quick_field_dynamic e.etype ("set_" ^ cf.cf_name))) (tfun [t] t) p) [e2] t p
 		| AKAccess(a,tl,c,ebase,ekey) ->
+			let e2 = e2 WithType.value in
 			mk_array_set_call ctx (AbstractCast.find_array_access ctx a tl ekey (Some e2) p) c ebase p
-		| AKUsing(ef,_,_,et) ->
+		| AKFieldSet(ethis,e1,fname,t) ->
+			let e2 = e2 (WithType.with_type t) in
+			begin match follow e1.etype with
+				| TFun([_;_;(_,_,t)],_) -> unify ctx e2.etype t e2.epos;
+				| _ -> assert false
+			end;
+			make_call ctx e1 [ethis;Texpr.Builder.make_string ctx.t fname null_pos;e2] t p
+		| AKUsing(ef,_,_,et,_) ->
 			(* this must be an abstract setter *)
 			let e2,ret = match follow ef.etype with
 				| TFun([_;(_,_,t)],ret) ->
+					let e2 = e2 (WithType.with_type t) in
 					AbstractCast.cast_or_unify ctx t e2 p,ret
 				| _ ->  error "Invalid field type for abstract setter" p
 			in
@@ -1844,7 +552,11 @@ let rec type_binop ctx op e1 e2 is_assign_op with_type p =
 		error "The operators ||= and &&= are not supported" p
 	| OpAssignOp op ->
 		(match type_access ctx (fst e1) (snd e1) MSet with
-		| AKNo s -> error ("Cannot access field or identifier " ^ s ^ " for writing") p
+		| AKNo s ->
+			(* try abstract operator overloading *)
+			(try type_non_assign_op true
+			with Not_found -> error ("Cannot access field or identifier " ^ s ^ " for writing") p
+			)
 		| AKExpr e ->
 			let save = save_locals ctx in
 			let v = gen_local ctx e.etype e.epos in
@@ -1913,7 +625,7 @@ let rec type_binop ctx op e1 e2 is_assign_op with_type p =
 				mk (TVar (v,Some e)) ctx.t.tvoid p;
 				e'
 			]) t p
-		| AKUsing(ef,c,cf,et) ->
+		| AKUsing(ef,c,cf,et,_) ->
 			(* abstract setter + getter *)
 			let ta = match c.cl_kind with KAbstractImpl a -> TAbstract(a, List.map (fun _ -> mk_mono()) a.a_params) | _ -> assert false in
 			let ret = match follow ef.etype with
@@ -1953,7 +665,7 @@ let rec type_binop ctx op e1 e2 is_assign_op with_type p =
 			let ekey,ekey' = maybe_bind_to_temp ekey in
 			let ebase,ebase' = maybe_bind_to_temp ebase in
 			let eget = mk_array_get_call ctx (cf_get,tf_get,r_get,ekey,None) c ebase p in
-			let eget = type_binop2 ctx op eget e2 true (WithType eget.etype) p in
+			let eget = type_binop2 ctx op eget e2 true (WithType.with_type eget.etype) p in
 			unify ctx eget.etype r_get p;
 			let cf_set,tf_set,r_set,ekey,eget = AbstractCast.find_array_access ctx a tl ekey (Some eget) p in
 			let eget = match eget with None -> assert false | Some e -> e in
@@ -1961,7 +673,7 @@ let rec type_binop ctx op e1 e2 is_assign_op with_type p =
 			let e = match cf_set.cf_expr,cf_get.cf_expr with
 				| None,None ->
 					let ea = mk (TArray(ebase,ekey)) r_get p in
-					mk (TBinop(OpAssignOp op,ea,type_expr ctx e2 (WithType r_get))) r_set p
+					mk (TBinop(OpAssignOp op,ea,type_expr ctx e2 (WithType.with_type r_get))) r_set p
 				| Some _,Some _ ->
 					let ef_set = mk (TField(et,(FStatic(c,cf_set)))) tf_set p in
 					let el = [make_call ctx ef_set [ebase;ekey;eget] r_set p] in
@@ -1976,30 +688,19 @@ let rec type_binop ctx op e1 e2 is_assign_op with_type p =
 			in
 			save();
 			e
+		| AKFieldSet _ ->
+			error "Invalid operation" p
 		| AKInline _ | AKMacro _ ->
 			assert false)
 	| _ ->
-		(* If the with_type is an abstract which has exactly one applicable @:op method, we can promote it
-		   to the individual arguments (issue #2786). *)
-		let wt = match with_type with
-			| WithType t ->
-				begin match follow t with
-					| TAbstract(a,_) ->
-						begin match List.filter (fun (o,_) -> o = OpAssignOp(op) || o == op) a.a_ops with
-							| [_] -> with_type
-							| _ -> Value
-						end
-					| _ ->
-						Value
-				end
-			| _ ->
-				Value
-		in
-		let e1 = type_expr ctx e1 wt in
-		type_binop2 ctx op e1 e2 is_assign_op wt p
+		type_non_assign_op false
 
-and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
-	let e2 = type_expr ctx e2 (if op == OpEq || op == OpNotEq then WithType e1.etype else wt) in
+and type_binop2 ?(abstract_overload_only=false) ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
+	let with_type = match op with
+		| OpEq | OpNotEq | OpLt | OpLte | OpGt | OpGte -> WithType.with_type e1.etype
+		| _ -> wt
+	in
+	let e2 = type_expr ctx e2 with_type in
 	let tint = ctx.t.tint in
 	let tfloat = ctx.t.tfloat in
 	let tstring = ctx.t.tstring in
@@ -2008,9 +709,9 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 			| KAbstract ({a_impl = Some c},_) when PMap.mem "toString" c.cl_statics ->
 				call_to_string ctx e
 			| KInt | KFloat | KString -> e
-			| KUnk | KDyn | KParam _ | KOther ->
+			| KUnk | KDyn | KNumParam _ | KStrParam _ | KOther ->
 				let std = type_type ctx ([],"Std") e.epos in
-				let acc = acc_get ctx (type_field ctx std "string" e.epos MCall) e.epos in
+				let acc = acc_get ctx (type_field_default_cfg ctx std "string" e.epos MCall) e.epos in
 				ignore(follow acc.etype);
 				let acc = (match acc.eexpr with TField (e,FClosure (Some (c,tl),f)) -> { acc with eexpr = TField (e,FInstance (c,tl,f)) } | _ -> acc) in
 				make_call ctx acc [e] ctx.t.tstring e.epos
@@ -2062,18 +763,21 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 			let ok1 = unify_int ctx e1 KUnk in
 			let ok2 = unify_int ctx e2 KUnk in
 			if ok1 && ok2 then tint else tfloat
-		| KParam t1, KParam t2 when Type.type_iseq t1 t2 ->
+		| KNumParam t1, KNumParam t2 when Type.type_iseq t1 t2 ->
 			t1
-		| KParam t, KInt | KInt, KParam t ->
+		| KNumParam t, KInt | KInt, KNumParam t ->
 			t
-		| KParam _, KFloat | KFloat, KParam _ | KParam _, KParam _ ->
+		| KNumParam _, KFloat | KFloat, KNumParam _ | KNumParam _, KNumParam _ ->
 			tfloat
-		| KParam t, KUnk ->
+		| KNumParam t, KUnk ->
 			unify ctx e2.etype tfloat e2.epos;
 			tfloat
-		| KUnk, KParam t ->
+		| KUnk, KNumParam t ->
 			unify ctx e1.etype tfloat e1.epos;
 			tfloat
+		| KStrParam _, _
+		| _, KStrParam _ ->
+			tstring
 		| KAbstract _,KFloat ->
 			unify ctx e1.etype tfloat e1.epos;
 			tfloat
@@ -2088,8 +792,8 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 			ctx.t.tint
 		| KAbstract _,_
 		| _,KAbstract _
-		| KParam _, _
-		| _, KParam _
+		| KNumParam _, _
+		| _, KNumParam _
 		| KOther, _
 		| _ , KOther ->
 			let pr = print_context() in
@@ -2113,13 +817,13 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 		(match classify e1.etype, classify e2.etype with
 		| KFloat, KFloat ->
 			result := tfloat
-		| KParam t1, KParam t2 when Type.type_iseq t1 t2 ->
+		| KNumParam t1, KNumParam t2 when Type.type_iseq t1 t2 ->
 			if op <> OpDiv then result := t1
-		| KParam _, KParam _ ->
+		| KNumParam _, KNumParam _ ->
 			result := tfloat
-		| KParam t, KInt | KInt, KParam t ->
+		| KNumParam t, KInt | KInt, KNumParam t ->
 			if op <> OpDiv then result := t
-		| KParam _, KFloat | KFloat, KParam _ ->
+		| KNumParam _, KFloat | KFloat, KNumParam _ ->
 			result := tfloat
 		| KFloat, k ->
 			ignore(unify_int ctx e2 k);
@@ -2142,6 +846,13 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 		with Error (Unify _,_) ->
 			e1,AbstractCast.cast_or_unify ctx e1.etype e2 p
 		in
+		if not ctx.com.config.pf_supports_function_equality then begin match e1.eexpr, e2.eexpr with
+		| TConst TNull , _ | _ , TConst TNull -> ()
+		| _ ->
+			match follow e1.etype, follow e2.etype with
+			| TFun _ , _ | _, TFun _ -> ctx.com.warning "Comparison of function values is unspecified on this target, use Reflect.compareMethods instead" p
+			| _ -> ()
+		end;
 		mk_op e1 e2 ctx.t.tbool
 	| OpGt
 	| OpGte
@@ -2159,7 +870,10 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 		| KDyn , KInt | KDyn , KFloat | KDyn , KString -> ()
 		| KInt , KDyn | KFloat , KDyn | KString , KDyn -> ()
 		| KDyn , KDyn -> ()
-		| KParam _ , x | x , KParam _ when x <> KString && x <> KOther -> ()
+		| KNumParam _ , (KInt | KFloat | KNumParam _ | KDyn | KUnk ) -> ()
+		| (KInt | KFloat | KDyn | KUnk ), KNumParam _ -> ()
+		| KStrParam _ , (KString | KStrParam _ | KUnk | KDyn) -> ()
+		| (KString | KUnk | KDyn) , KStrParam _ -> ()
 		| KAbstract _,_
 		| _,KAbstract _
 		| KDyn , KUnk
@@ -2168,8 +882,10 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 		| KString , KFloat
 		| KInt , KString
 		| KFloat , KString
-		| KParam _ , _
-		| _ , KParam _
+		| KNumParam _ , _
+		| _ , KNumParam _
+		| KStrParam _ , _
+		| _ , KStrParam _
 		| KOther , _
 		| _ , KOther ->
 			let pr = print_context() in
@@ -2189,6 +905,8 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 		mk (TNew ((match t with TInst (c,[]) -> c | _ -> assert false),[],[e1;e2])) t p
 	| OpArrow ->
 		error "Unexpected =>" p
+	| OpIn ->
+		error "Unexpected in" p
 	| OpAssign
 	| OpAssignOp _ ->
 		assert false
@@ -2213,9 +931,8 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 								error (Printf.sprintf "The result of this operation (%s) is not compatible with declared return type %s" (st t_expected) (st tret)) p
 					end;
 				end;
-				let e = Codegen.binop op e1 e2 tret p in
+				let e = Texpr.Builder.binop op e1 e2 tret p in
 				mk_cast e tret p
-				(* Codegen.maybe_cast e tret *)
 			end else begin
 				let e = make_static_call ctx c cf map [e1;e2] tret p in
 				e
@@ -2223,7 +940,7 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 		in
 		(* special case for == and !=: if the second type is a monomorph, assume that we want to unify
 		   it with the first type to preserve comparison semantics. *)
-	let is_eq_op = match op with OpEq | OpNotEq -> true | _ -> false in
+		let is_eq_op = match op with OpEq | OpNotEq -> true | _ -> false in
 		if is_eq_op then begin match follow e1.etype,follow e2.etype with
 			| TMono _,_ | _,TMono _ ->
 				Type.unify e1.etype e2.etype
@@ -2300,7 +1017,13 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 			| [] ->
 				raise Not_found
 		in
-		loop (if left then a.a_ops else List.filter (fun (_,cf) -> not (Meta.has Meta.Impl cf.cf_meta)) a.a_ops)
+		if left then
+			loop a.a_ops
+		else
+			let not_impl_or_is_commutative (_, cf) =
+				not (Meta.has Meta.Impl cf.cf_meta) || Meta.has Meta.Commutative cf.cf_meta
+			in
+			loop (List.filter not_impl_or_is_commutative a.a_ops)
 	in
 	try
 		begin match follow e1.etype with
@@ -2313,7 +1036,8 @@ and type_binop2 ctx op (e1 : texpr) (e2 : Ast.expr) is_assign_op wt p =
 			| _ -> raise Not_found
 		end
 	with Not_found ->
-		make e1 e2
+		if abstract_overload_only then raise Not_found
+		else make e1 e2
 
 and type_unop ctx op flag e p =
 	let set = (op = Increment || op = Decrement) in
@@ -2334,7 +1058,7 @@ and type_unop ctx op flag e p =
 				if set then check_assign ctx e;
 				(match classify e.etype with
 				| KFloat -> ctx.t.tfloat
-				| KParam t ->
+				| KNumParam t ->
 					unify ctx e.etype ctx.t.tfloat e.epos;
 					t
 				| k ->
@@ -2379,12 +1103,12 @@ and type_unop ctx op flag e p =
 		| AKAccess(a,tl,c,ebase,ekey) ->
 			begin try
 				(match op with Increment | Decrement -> () | _ -> raise Not_found);
-				let v_key = alloc_var "tmp" ekey.etype ekey.epos in
+				let v_key = alloc_var VGenerated "tmp" ekey.etype ekey.epos in
 				let evar_key = mk (TVar(v_key,Some ekey)) ctx.com.basic.tvoid ekey.epos in
 				let ekey = mk (TLocal v_key) ekey.etype ekey.epos in
 				(* get *)
 				let e_get = mk_array_get_call ctx (AbstractCast.find_array_access_raise ctx a tl ekey None p) c ebase p in
-				let v_get = alloc_var "tmp" e_get.etype e_get.epos in
+				let v_get = alloc_var VGenerated "tmp" e_get.etype e_get.epos in
 				let ev_get = mk (TLocal v_get) v_get.v_type p in
 				let evar_get = mk (TVar(v_get,Some e_get)) ctx.com.basic.tvoid p in
 				(* op *)
@@ -2400,6 +1124,8 @@ and type_unop ctx op flag e p =
 			end
 		| AKInline _ | AKUsing _ | AKMacro _ ->
 			error "This kind of operation is not supported" p
+		| AKFieldSet _ ->
+			error "Invalid operation" p
 		| AKSet (e,t,cf) ->
 			let l = save_locals ctx in
 			let v = gen_local ctx e.etype p in
@@ -2409,7 +1135,7 @@ and type_unop ctx op flag e p =
 			let eget = (EField ((EConst (Ident v.v_name),p),cf.cf_name),p) in
 			match flag with
 			| Prefix ->
-				let get = type_binop ctx op eget one false Value p in
+				let get = type_binop ctx op eget one false WithType.value p in
 				unify ctx get.etype t p;
 				l();
 				mk (TBlock [
@@ -2419,8 +1145,8 @@ and type_unop ctx op flag e p =
 			| Postfix ->
 				let v2 = gen_local ctx t p in
 				let ev2 = mk (TLocal v2) t p in
-				let get = type_expr ctx eget Value in
-				let plusone = type_binop ctx op (EConst (Ident v2.v_name),p) one false Value p in
+				let get = type_expr ctx eget WithType.value in
+				let plusone = type_binop ctx op (EConst (Ident v2.v_name),p) one false WithType.value p in
 				unify ctx get.etype t p;
 				l();
 				mk (TBlock [
@@ -2437,55 +1163,70 @@ and type_ident ctx i p mode =
 		type_ident_raise ctx i p mode
 	with Not_found -> try
 		(* lookup type *)
-		if is_lower_ident i then raise Not_found;
+		if is_lower_ident i p then raise Not_found;
 		let e = (try type_type ctx ([],i) p with Error (Module_not_found ([],name),_) when name = i -> raise Not_found) in
 		AKExpr e
 	with Not_found ->
-		if ctx.untyped then begin
-			if i = "__this__" then
-				AKExpr (mk (TConst TThis) ctx.tthis p)
-			else
-				let t = mk_mono() in
-				let v = alloc_unbound_var i t p in
-				AKExpr (mk (TLocal v) t p)
-		end else begin
-			if ctx.curfun = FunStatic && PMap.mem i ctx.curclass.cl_fields then error ("Cannot access " ^ i ^ " in static function") p;
-			begin try
-				let t = List.find (fun (i2,_) -> i2 = i) ctx.type_params in
-				let c = match follow (snd t) with TInst(c,_) -> c | _ -> assert false in
-				if Typeload.is_generic_parameter ctx c && Meta.has Meta.Const c.cl_meta then
-					AKExpr (type_module_type ctx (TClassDecl c) None p)
-				else begin
-					display_error ctx ("Type parameter " ^ i ^ " is only available at compilation and is not a runtime value") p;
+		let resolved_to_type_parameter = ref false in
+		try
+			let t = List.find (fun (i2,_) -> i2 = i) ctx.type_params in
+			resolved_to_type_parameter := true;
+			let c = match follow (snd t) with TInst(c,_) -> c | _ -> assert false in
+			if TypeloadCheck.is_generic_parameter ctx c && Meta.has Meta.Const c.cl_meta then begin
+				let e = type_module_type ctx (TClassDecl c) None p in
+				AKExpr {e with etype = (snd t)}
+			end else
+				raise Not_found
+		with Not_found ->
+			if ctx.untyped then begin
+				if i = "__this__" then
+					AKExpr (mk (TConst TThis) ctx.tthis p)
+				else
+					let t = mk_mono() in
+					AKExpr ((mk (TIdent i)) t p)
+			end else begin
+				if ctx.curfun = FunStatic && PMap.mem i ctx.curclass.cl_fields then error ("Cannot access " ^ i ^ " in static function") p;
+				if !resolved_to_type_parameter then begin
+					display_error ctx ("Only @:const type parameters on @:generic classes can be used as value") p;
 					AKExpr (mk (TConst TNull) t_dynamic p)
+				end else begin
+					let err = Unknown_ident i in
+					if ctx.in_display then begin
+						raise (Error (err,p))
+					end;
+					match ctx.com.display.dms_kind with
+						| DMNone ->
+							raise (Error(err,p))
+						| DMDiagnostics b when b || ctx.is_display_file ->
+							DisplayToplevel.handle_unresolved_identifier ctx i p false;
+							let t = mk_mono() in
+							AKExpr (mk (TIdent i) t p)
+						| _ ->
+							display_error ctx (error_msg err) p;
+							let t = mk_mono() in
+							(* Add a fake local for #8751. *)
+							if !ServerConfig.legacy_completion then
+								ignore(add_local ctx VGenerated i t p);
+							AKExpr (mk (TIdent i) t p)
 				end
-			with Not_found ->
-				let err = Unknown_ident i in
-				if ctx.in_display then begin
-					raise (Error (err,p))
-				end;
-				match ctx.com.display.dms_kind with
-					| DMNone ->
-						raise (Error(err,p))
-					| DMDiagnostics b when b || ctx.is_display_file ->
-						Display.ToplevelCollector.handle_unresolved_identifier ctx i p false;
-						let t = mk_mono() in
-						AKExpr (mk (TLocal (add_unbound_local ctx i t p)) t p)
-					| _ ->
-						display_error ctx (error_msg err) p;
-						let t = mk_mono() in
-						AKExpr (mk (TLocal (add_unbound_local ctx i t p)) t p)
 			end
-		end
 
 (* MORDOR *)
 and handle_efield ctx e p mode =
+	let p0 = p in
+	(*
+		given chain of fields as the `path` argument and an `access_mode->access_kind` getter for some starting expression as `e`,
+		return a new `access_mode->access_kind` getter for the whole field access chain.
+
+		if `resume` is true, `Not_found` will be raised if the first field in chain fails to resolve, in all other
+		cases, normal type errors will be raised if a field can't be accessed.
+	*)
 	let fields ?(resume=false) path e =
 		let resume = ref resume in
 		let force = ref false in
 		let e = List.fold_left (fun e (f,_,p) ->
 			let e = acc_get ctx (e MGet) p in
-			let f = type_field ~resume:(!resume) ctx e f p in
+			let f = type_field (TypeFieldConfig.create !resume) ctx e f p in
 			force := !resume;
 			resume := false;
 			f
@@ -2493,52 +1234,63 @@ and handle_efield ctx e p mode =
 		if !force then ignore(e MCall); (* not necessarily a call, but prevent #2602 among others *)
 		e
 	in
+
+	(*
+		given a chain of identifiers (dot-path) represented as a list of (ident,starts_uppercase,pos) tuples,
+		resolve it into an `access_mode->access_kind` getter for the resolved expression
+	*)
 	let type_path path =
+		(*
+			this is an actual loop for processing a fully-qualified dot-path.
+			it relies on the fact that packages start with a lowercase letter, while modules and types
+			start with upper-case letters, so it processes path parts, accumulating lowercase package parts in `acc`,
+			until it encounters an upper-case part, which can mean either a module access or module's primary type access,
+			so it tries to figure out the type and and calls `fields` on it to resolve the rest of field access chain.
+		*)
 		let rec loop acc path =
 			match path with
-			| [] ->
-				(match List.rev acc with
-				| [] -> assert false
-				| (name,flag,p) :: path ->
-					try
-						fields path (type_ident ctx name p)
-					with
-						Error (Unknown_ident _,p2) as e when p = p2 ->
-							try
-								let path = ref [] in
-								let name , _ , _ = List.find (fun (name,flag,p) ->
-									if flag then
-										true
-									else begin
-										path := name :: !path;
-										false
-									end
-								) (List.rev acc) in
-								raise (Error (Module_not_found (List.rev !path,name),p))
-							with
-								Not_found ->
-									if ctx.in_display then raise (Parser.TypePath (List.map (fun (n,_,_) -> n) (List.rev acc),None,false));
-									raise e)
 			| (_,false,_) as x :: path ->
+				(* part starts with lowercase - it's a package part, add it the accumulator and proceed *)
 				loop (x :: acc) path
+
 			| (name,true,p) as x :: path ->
+				(* part starts with uppercase - it either points to a module or its main type *)
+
+				(* acc is contains all the package parts now, so extract package from them *)
 				let pack = List.rev_map (fun (x,_,_) -> x) acc in
+
+				(* default behaviour: try loading module's primary type (with the same name as module)
+				   and resolve the rest of the field chain against its statics, or the type itself
+				   if the rest of chain is empty *)
 				let def() =
 					try
 						let e = type_type ctx (pack,name) p in
 						fields path (fun _ -> AKExpr e)
 					with
 						Error (Module_not_found m,_) when m = (pack,name) ->
+							(* if it's not a module path after all, it could be an untyped field access that looks like
+							   a dot-path, e.g. `untyped __global__.String`, add the whole path to the accumulator and
+							   proceed to the untyped identifier resolution *)
 							loop ((List.rev path) @ x :: acc) []
 				in
-				match path with
+
+				(match path with
 				| (sname,true,p) :: path ->
+					(* next part starts with uppercase, meaning it can be either a module sub-type access
+					   or static field access for the primary module type, so we have to do some guessing here
+
+					   In this block, `name` is the first first-uppercase part (possibly a module name),
+					   and `sname` is the second first-uppsercase part (possibly a subtype name). *)
+
+					(* get static field by `sname` from a given type `t`, if `resume` is true - raise Not_found *)
 					let get_static resume t =
 						fields ~resume ((sname,true,p) :: path) (fun _ -> AKExpr (type_module_type ctx t None p))
 					in
-					let check_module m v =
+
+					(* try accessing subtype or main class static field by `sname` in given module with path `m` *)
+					let check_module m =
 						try
-							let md = Typeload.load_module ctx m p in
+							let md = TypeloadModule.load_module ctx m p in
 							(* first look for existing subtype *)
 							(try
 								let t = List.find (fun t -> not (t_infos t).mt_private && t_path t = (fst m,sname)) md.m_types in
@@ -2553,52 +1305,118 @@ and handle_efield ctx e p mode =
 						with Error (Module_not_found m2,_) when m = m2 ->
 							None
 					in
-					let rec loop pack =
-						match check_module (pack,name) sname with
-						| Some r -> r
-						| None ->
-							match List.rev pack with
-							| [] -> def()
-							| _ :: l -> loop (List.rev l)
-					in
+
 					(match pack with
 					| [] ->
+						(* if there's no package specified... *)
 						(try
+							(* first try getting a type by `name` in current module types and current imports
+							   and try accessing its static field by `sname` *)
 							let path_match t = snd (t_infos t).mt_path = name in
-							let t = try
-								List.find path_match ctx.m.curmod.m_types
-							with Not_found ->
-								let t,p = List.find (fun (t,_) -> path_match t) ctx.m.module_types in
-								Display.ImportHandling.maybe_mark_import_position ctx p;
-								t
+							let t =
+								try
+									List.find path_match ctx.m.curmod.m_types (* types in this modules *)
+								with Not_found ->
+									let t,p = List.find (fun (t,_) -> path_match t) ctx.m.module_types in (* imported types *)
+									ImportHandling.maybe_mark_import_position ctx p;
+									t
 							in
-							(* if the static is not found, look for a subtype instead - #1916 *)
 							get_static true t
 						with Not_found ->
+							(* if the static field (or the type) wasn't not found, look for a subtype instead - #1916
+							   look for subtypes/main-class-statics in modules of current package and its parent packages *)
+							let rec loop pack =
+								match check_module (pack,name) with
+								| Some r -> r
+								| None ->
+									match List.rev pack with
+									| [] -> def()
+									| _ :: l -> loop (List.rev l)
+							in
 							loop (fst ctx.m.curmod.m_path))
 					| _ ->
-						match check_module (pack,name) sname with
+						(* if package was specified, treat it as fully-qualified access to either
+						   a module subtype or a static field of module's primary type*)
+						match check_module (pack,name) with
 						| Some r -> r
 						| None -> def());
-				| _ -> def()
+				| _ ->
+					(* no more parts or next part starts with lowercase - it's surely not a type name,
+					   so do the default thing: resolve fields against primary module type *)
+					def())
+
+			| [] ->
+				(* If we get to here, it means that either there were no uppercase-first-letter parts,
+				   or we couldn't find the specified module, so it's not a qualified dot-path after all.
+				   And it's not a known identifier too, because otherwise `loop` wouldn't be called at all.
+				   So this must be an untyped access (or a typo). Try resolving the first identifier with support
+				   for untyped and resolve the rest of field chain against it.
+
+				   TODO: extract this into a separate function
+				*)
+				(match List.rev acc with
+				| [] -> assert false
+				| (name,flag,p) :: path ->
+					try
+						fields path (type_ident ctx name p)
+					with
+						Error (Unknown_ident _,p2) as e when p = p2 ->
+							try
+								(* try raising a more sensible error if there was an uppercase-first (module name) part *)
+								let path = ref [] in
+								let name , _ , _ = List.find (fun (name,flag,p) ->
+									if flag then
+										true
+									else begin
+										path := name :: !path;
+										false
+									end
+								) (List.rev acc) in
+								raise (Error (Module_not_found (List.rev !path,name),p))
+							with
+								Not_found ->
+									let sl = List.map (fun (n,_,_) -> n) (List.rev acc) in
+									(* if there was no module name part, last guess is that we're trying to get package completion *)
+									if ctx.in_display then begin
+										if is_legacy_completion ctx.com then raise (Parser.TypePath (sl,None,false,p))
+										else DisplayToplevel.collect_and_raise ctx TKType WithType.no_value (CRToplevel None) (String.concat "." sl,p0) p0
+									end;
+									raise e)
 		in
 		match path with
 		| [] -> assert false
 		| (name,_,p) :: pnext ->
 			try
+				(*
+					first, try to resolve the first ident in the chain and access its fields.
+					this doesn't support untyped identifiers yet, because we want to check
+					fully-qualified dot paths first even in an untyped block.
+				*)
 				fields pnext (fun _ -> type_ident_raise ctx name p MGet)
-			with
-				Not_found -> loop [] path
+			with Not_found ->
+				(* first ident couldn't be resolved, it's probably a fully qualified path - resolve it *)
+				loop [] path
 	in
-	let rec loop acc e =
-		let p = pos e in
-		match fst e with
+
+	(*
+		loop through the given EField expression and behave differently depending on whether it's a simple dot-path
+		or a more complex expression, accumulating field access parts in form of (ident,starts_uppercase,pos) tuples.
+
+		if it's a dot-path, then it might be either fully-qualified access (pack.Class.field) or normal field access of
+		a local/global/field identifier. we pass the accumulated path to `type_path` and let it figure out what it is.
+
+		if it's NOT a dot-path (anything other than indentifiers appears in EField chain), then we can be sure it's
+		normal field access, not fully-qualified access, so we pass the non-ident expr along with the accumulated
+		fields chain to the `fields` function and let it type the field access.
+	*)
+	let rec loop acc (e,p) =
+		match e with
 		| EField (e,s) ->
-			loop ((s,not (is_lower_ident s),p) :: acc) e
+			loop ((s,not (is_lower_ident s p),p) :: acc) e
 		| EConst (Ident i) ->
-			type_path ((i,not (is_lower_ident i),p) :: acc)
+			type_path ((i,not (is_lower_ident i p),p) :: acc)
 		| _ ->
-			fields acc (type_access ctx (fst e) (snd e))
+			fields acc (type_access ctx e p)
 	in
 	loop [] (e,p) mode
 
@@ -2607,15 +1425,16 @@ and type_access ctx e p mode =
 	| EConst (Ident s) ->
 		type_ident ctx s p mode
 	| EField (e1,"new") ->
-		let e1 = type_expr ctx e1 Value in
+		let e1 = type_expr ctx e1 WithType.value in
 		begin match e1.eexpr with
 			| TTypeExpr (TClassDecl c) ->
 				if mode = MSet then error "Cannot set constructor" p;
 				if mode = MCall then error ("Cannot call constructor like this, use 'new " ^ (s_type_path c.cl_path) ^ "()' instead") p;
-				let monos = List.map (fun _ -> mk_mono()) c.cl_params in
+				let monos = List.map (fun _ -> mk_mono()) (match c.cl_kind with KAbstractImpl a -> a.a_params | _ -> c.cl_params) in
 				let ct, cf = get_constructor ctx c monos p in
+				check_constructor_access ctx c cf p;
 				let args = match follow ct with TFun(args,ret) -> args | _ -> assert false in
-				let vl = List.map (fun (n,_,t) -> alloc_var n t c.cl_pos) args in
+				let vl = List.map (fun (n,_,t) -> alloc_var VGenerated n t c.cl_pos) args in
 				let vexpr v = mk (TLocal v) v.v_type p in
 				let el = List.map vexpr vl in
 				let ec,t = match c.cl_kind with
@@ -2638,72 +1457,47 @@ and type_access ctx e p mode =
 	| EField _ ->
 		handle_efield ctx e p mode
 	| EArray (e1,e2) ->
-		let e1 = type_expr ctx e1 Value in
-		let e2 = type_expr ctx e2 Value in
-		let has_abstract_array_access = ref false in
-		(try (match follow e1.etype with
-		| TAbstract ({a_impl = Some c} as a,pl) when a.a_array <> [] ->
-			begin match mode with
-			| MSet ->
-				(* resolve later *)
-				AKAccess (a,pl,c,e1,e2)
-			| _ ->
-				has_abstract_array_access := true;
-				let e = mk_array_get_call ctx (AbstractCast.find_array_access ctx a pl e2 None p) c e1 p in
-				AKExpr e
-			end
-		| _ -> raise Not_found)
-		with Not_found ->
-		unify ctx e2.etype ctx.t.tint e2.epos;
-		let rec loop et =
-			match follow et with
-			| TInst ({ cl_array_access = Some t; cl_params = pl },tl) ->
-				apply_params pl tl t
-			| TInst ({ cl_super = Some (c,stl); cl_params = pl },tl) ->
-				apply_params pl tl (loop (TInst (c,stl)))
-			| TInst ({ cl_path = [],"ArrayAccess" },[t]) ->
-				t
-			| TInst ({ cl_path = [],"Array"},[t]) when t == t_dynamic ->
-				t_dynamic
-			| TAbstract(a,tl) when Meta.has Meta.ArrayAccess a.a_meta ->
-				loop (apply_params a.a_params tl a.a_this)
-			| _ ->
-				let pt = mk_mono() in
-				let t = ctx.t.tarray pt in
-				(try unify_raise ctx et t p
-				with Error(Unify _,_) -> if not ctx.untyped then begin
-					if !has_abstract_array_access then error ("No @:arrayAccess function accepts an argument of " ^ (s_type (print_context()) e2.etype)) e1.epos
-					else error ("Array access is not allowed on " ^ (s_type (print_context()) e1.etype)) e1.epos
-				end);
-				pt
-		in
-		let pt = loop e1.etype in
-		AKExpr (mk (TArray (e1,e2)) pt p))
+		type_array_access ctx e1 e2 p mode
+	| EDisplay (e,dk) ->
+		let resume_typing = type_expr ~mode in
+		AKExpr (TyperDisplay.handle_edisplay ~resume_typing ctx e dk WithType.value)
 	| _ ->
-		AKExpr (type_expr ctx (e,p) Value)
+		AKExpr (type_expr ~mode ctx (e,p) WithType.value)
+
+and type_array_access ctx e1 e2 p mode =
+	let e1 = type_expr ctx e1 WithType.value in
+	let e2 = type_expr ctx e2 WithType.value in
+	Calls.array_access ctx e1 e2 mode p
 
 and type_vars ctx vl p =
-	let vl = List.map (fun ((v,pv),t,e) ->
+	let vl = List.map (fun ((v,pv),final,t,e) ->
 		try
 			let t = Typeload.load_type_hint ctx p t in
 			let e = (match e with
 				| None -> None
 				| Some e ->
-					let e = type_expr ctx e (WithType t) in
+					let e = type_expr ctx e (WithType.with_type t) in
 					let e = AbstractCast.cast_or_unify ctx t e p in
 					Some e
 			) in
-			if v.[0] = '$' then display_error ctx "Variables names starting with a dollar are not allowed" p;
-			let v = add_local ctx v t pv in
-			v.v_meta <- (Meta.UserVariable,[],pv) :: v.v_meta;
-			if ctx.in_display && Display.is_display_position pv then
-				Display.DisplayEmitter.display_variable ctx.com.display v pv;
+			let v = add_local_with_origin ctx TVOLocalVariable v t pv in
+			if final then v.v_final <- true;
+			if ctx.in_display && DisplayPosition.display_position#enclosed_in pv then
+				DisplayEmitter.display_variable ctx v pv;
 			v,e
 		with
 			Error (e,p) ->
 				check_error ctx e p;
-				add_unbound_local ctx v t_dynamic pv, None
+				add_local ctx VGenerated v t_dynamic pv, None (* TODO: What to do with this... *)
 	) vl in
+	delay ctx PTypeField (fun() ->
+		List.iter
+			(fun (v,_) ->
+				if ExtType.is_void (follow v.v_type) then
+					error "Variables of type Void are not allowed" v.v_pos
+			)
+			vl
+	);
 	match vl with
 	| [v,eo] ->
 		mk (TVar (v,eo)) ctx.t.tvoid p
@@ -2717,7 +1511,7 @@ and format_string ctx s p =
 	let min = ref (p.pmin + 1) in
 	let add_expr (enext,p) len =
 		min := !min + len;
-		let enext = if ctx.in_display && Display.is_display_position p then
+		let enext = if ctx.in_display && DisplayPosition.display_position#enclosed_in p then
 			Display.ExprPreprocessing.process_expr ctx.com (enext,p)
 		else
 			enext,p
@@ -2733,11 +1527,7 @@ and format_string ctx s p =
 	in
 	let add_sub start pos =
 		let len = pos - start in
-		if len > 0 || !e = None then add (EConst (String (String.sub s start len))) len
-	in
-	let warn_escape = Common.defined ctx.com Define.FormatWarning in
-	let warn pos len =
-		ctx.com.warning "This string is formated" { p with pmin = !pmin + 1 + pos; pmax = !pmin + 1 + pos + len }
+		if len > 0 || !e = None then add (EConst (String (String.sub s start len,SDoubleQuotes))) len
 	in
 	let len = String.length s in
 	let rec parse start pos =
@@ -2751,7 +1541,6 @@ and format_string ctx s p =
 		if c <> '$' || pos = len then parse start pos else
 		match String.unsafe_get s pos with
 		| '$' ->
-			if warn_escape then warn pos 1;
 			(* double $ *)
 			add_sub start pos;
 			parse (pos + 1) (pos + 1)
@@ -2769,7 +1558,6 @@ and format_string ctx s p =
 			in
 			let iend = loop (pos + 1) in
 			let len = iend - pos in
-			if warn_escape then warn pos len;
 			add (EConst (Ident (String.sub s pos len))) len;
 			parse (pos + len) (pos + len)
 		| _ ->
@@ -2795,10 +1583,20 @@ and format_string ctx s p =
 		let send = loop [pos] (pos + 1) in
 		let slen = send - pos - 1 in
 		let scode = String.sub s (pos + 1) slen in
-		if warn_escape then warn (pos + 1) slen;
 		min := !min + 2;
-		if slen > 0 then
-			add_expr (Parser.parse_expr_string ctx.com scode { p with pmin = !pmin + pos + 2; pmax = !pmin + send + 1 } error true) slen;
+		if slen > 0 then begin
+			let e =
+				let ep = { p with pmin = !pmin + pos + 2; pmax = !pmin + send + 1 } in
+				try
+					begin match ParserEntry.parse_expr_string ctx.com.defines scode ep error true with
+						| ParseSuccess data | ParseDisplayFile(data,_) -> data
+						| ParseError(_,(msg,p),_) -> error (Parser.error_msg msg) p
+					end
+				with Exit ->
+					error "Invalid interpolated expression" ep
+			in
+			add_expr e slen
+		end;
 		min := !min + 1;
 		parse (send + 1) (send + 1)
 	in
@@ -2808,25 +1606,19 @@ and format_string ctx s p =
 	| Some e -> e
 
 and type_block ctx el with_type p =
-	let merge e = match e.eexpr with
+	let merge acc e = match e.eexpr with
 		| TMeta((Meta.MergeBlock,_,_), {eexpr = TBlock el}) ->
-			el
-		| _ -> [e]
+			List.rev el @ acc
+		| _ ->
+			e :: acc
 	in
-	let rec loop = function
-		| [] -> []
-		| [e] ->
-			(try
-				merge (type_expr ctx e with_type)
-			with Error (e,p) -> check_error ctx e p; [])
+	let rec loop acc = function
+		| [] -> List.rev acc
 		| e :: l ->
-			try
-				let e = type_expr ctx e NoValue in
-				merge e @ loop l
-			with
-				Error (e,p) -> check_error ctx e p; loop l
+			let acc = try merge acc (type_expr ctx e (if l = [] then with_type else WithType.no_value)) with Error (e,p) -> check_error ctx e p; acc in
+			loop acc l
 	in
-	let l = loop el in
+	let l = loop [] el in
 	let rec loop = function
 		| [] -> ctx.t.tvoid
 		| [e] -> e.etype
@@ -2837,12 +1629,16 @@ and type_block ctx el with_type p =
 and type_object_decl ctx fl with_type p =
 	let dynamic_parameter = ref None in
 	let a = (match with_type with
-	| WithType t ->
-		let rec loop in_abstract_from t =
+	| WithType.WithType(t,_) ->
+		let rec loop seen t =
 			match follow t with
-			| TAnon a when not (PMap.is_empty a.a_fields) && not in_abstract_from -> ODKWithStructure a
-			| TAbstract (a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
-				(match List.fold_left (fun acc t -> match loop true t with ODKPlain -> acc | t -> t :: acc) [] (get_abstract_froms a pl) with
+			| TAnon a -> ODKWithStructure a
+			| TAbstract (a,pl) as t
+				when not (Meta.has Meta.CoreType a.a_meta)
+					&& not (List.exists (fun t' -> shallow_eq t t') seen) ->
+				let froms = get_abstract_froms a pl
+				and fold = fun acc t' -> match loop (t :: seen) t' with ODKPlain -> acc | t -> t :: acc in
+				(match List.fold_left fold [] froms with
 				| [t] -> t
 				| _ -> ODKPlain)
 			| TDynamic t when (follow t != t_dynamic) ->
@@ -2856,42 +1652,42 @@ and type_object_decl ctx fl with_type p =
 			| _ ->
 				ODKPlain
 		in
-		loop false t
+		loop [] t
 	| _ ->
 		ODKPlain
 	) in
-	let wrap_quoted_meta e =
-		mk (TMeta((Meta.QuotedField,[],e.epos),e)) e.etype e.epos
-	in
 	let type_fields field_map =
 		let fields = ref PMap.empty in
 		let extra_fields = ref [] in
-		let fl = List.map (fun ((n,pn),e) ->
-			let n,is_quoted,is_valid = Parser.unquote_ident n in
+		let fl = List.map (fun ((n,pn,qs),e) ->
+			let is_valid = Lexer.is_valid_identifier n in
 			if PMap.mem n !fields then error ("Duplicate field in object declaration : " ^ n) p;
+			let is_final = ref false in
 			let e = try
 				let t = match !dynamic_parameter with
 					| Some t -> t
 					| None ->
 						let cf = PMap.find n field_map in
-						if ctx.in_display && Display.is_display_position pn then Display.DisplayEmitter.display_field ctx.com.display cf pn;
+						if (has_class_field_flag cf CfFinal) then is_final := true;
+						if ctx.in_display && DisplayPosition.display_position#enclosed_in pn then DisplayEmitter.display_field ctx Unknown CFSMember cf pn;
 						cf.cf_type
 				in
-				let e = type_expr ctx e (WithType t) in
-				let e = AbstractCast.cast_or_unify ctx t e p in
+				let e = type_expr ctx e (WithType.with_structure_field t n) in
+				let e = AbstractCast.cast_or_unify ctx t e e.epos in
+				let e = if is_null t && not (is_null e.etype) then mk (TCast(e,None)) (ctx.t.tnull e.etype) e.epos else e in
 				(try type_eq EqStrict e.etype t; e with Unify_error _ -> mk (TCast (e,None)) t e.epos)
 			with Not_found ->
 				if is_valid then
 					extra_fields := n :: !extra_fields;
-				type_expr ctx e Value
+				type_expr ctx e WithType.value
 			in
 			if is_valid then begin
-				if String.length n > 0 && n.[0] = '$' then error "Field names starting with a dollar are not allowed" p;
+				if starts_with n '$' then error "Field names starting with a dollar are not allowed" p;
 				let cf = mk_field n e.etype (punion pn e.epos) pn in
+				if !is_final then add_class_field_flag cf CfFinal;
 				fields := PMap.add n cf !fields;
 			end;
-			let e = if is_quoted then wrap_quoted_meta e else e in
-			(n,e)
+			((n,pn,qs),e)
 		) fl in
 		let t = (TAnon { a_fields = !fields; a_status = ref Const }) in
 		if not ctx.untyped then begin
@@ -2905,18 +1701,16 @@ and type_object_decl ctx fl with_type p =
 		end;
 		t, fl
 	in
-	(match a with
-	| ODKPlain ->
-		let rec loop (l,acc) ((f,pf),e) =
-			let f,is_quoted,is_valid = Parser.unquote_ident f in
+	let type_plain_fields () =
+		let rec loop (l,acc) ((f,pf,qs),e) =
+			let is_valid = Lexer.is_valid_identifier f in
 			if PMap.mem f acc then error ("Duplicate field in object declaration : " ^ f) p;
-			let e = type_expr ctx e Value in
+			let e = type_expr ctx e (WithType.named_structure_field f) in
 			(match follow e.etype with TAbstract({a_path=[],"Void"},_) -> error "Fields of type Void are not allowed in structures" e.epos | _ -> ());
 			let cf = mk_field f e.etype (punion pf e.epos) pf in
-			if ctx.in_display && Display.is_display_position pf then Display.DisplayEmitter.display_field ctx.com.display cf pf;
-			let e = if is_quoted then wrap_quoted_meta e else e in
-			((f,e) :: l, if is_valid then begin
-				if String.length f > 0 && f.[0] = '$' then error "Field names starting with a dollar are not allowed" p;
+			if ctx.in_display && DisplayPosition.display_position#enclosed_in pf then DisplayEmitter.display_field ctx Unknown CFSMember cf pf;
+			(((f,pf,qs),e) :: l, if is_valid then begin
+				if starts_with f '$' then error "Field names starting with a dollar are not allowed" p;
 				PMap.add f cf acc
 			end else acc)
 		in
@@ -2924,9 +1718,13 @@ and type_object_decl ctx fl with_type p =
 		let x = ref Const in
 		ctx.opened <- x :: ctx.opened;
 		mk (TObjectDecl (List.rev fields)) (TAnon { a_fields = types; a_status = x }) p
+	in
+	(match a with
+	| ODKPlain -> type_plain_fields()
+	| ODKWithStructure a when PMap.is_empty a.a_fields && !dynamic_parameter = None -> type_plain_fields()
 	| ODKWithStructure a ->
 		let t, fl = type_fields a.a_fields in
-		if !(a.a_status) <> Const then a.a_status := Closed;
+		if !(a.a_status) = Opened then a.a_status := Closed;
 		mk (TObjectDecl fl) t p
 	| ODKWithClass (c,tl) ->
 		let t,ctor = get_constructor ctx c tl p in
@@ -2955,14 +1753,14 @@ and type_object_decl ctx fl with_type p =
 			end
 		) ([],[],false) (List.rev fl) in
 		let el = List.map (fun (n,_,t) ->
-			try List.assoc n fl
+			try Expr.field_assoc n fl
 			with Not_found -> mk (TConst TNull) t p
 		) args in
 		let e = mk (TNew(c,tl,el)) (TInst(c,tl)) p in
 		mk (TBlock (List.rev (e :: (List.rev evars)))) e.etype e.epos
 	)
 
-and type_new ctx path el with_type p =
+and type_new ctx path el with_type force_inline p =
 	let unify_constructor_call c params f ct = match follow ct with
 		| TFun (args,r) ->
 			(try
@@ -2974,33 +1772,40 @@ and type_new ctx path el with_type p =
 		| _ ->
 			error "Constructor is not a function" p
 	in
-	let t = if (fst path).tparams <> [] then
-		follow (Typeload.load_instance ctx path false p)
-	else try
+	let t = if (fst path).tparams <> [] then begin
+		try
+			Typeload.load_instance ctx path false
+		with Error _ as exc when ctx.com.display.dms_display ->
+			(* If we fail for some reason, process the arguments in case we want to display them (#7650). *)
+			List.iter (fun e -> ignore(type_expr ctx e WithType.value)) el;
+			raise exc
+	end else try
 		ctx.call_argument_stack <- el :: ctx.call_argument_stack;
-		let t = follow (Typeload.load_instance ctx path true p) in
+		let t = Typeload.load_instance ctx path true in
+		let t_follow = follow t in
 		ctx.call_argument_stack <- List.tl ctx.call_argument_stack;
 		(* Try to properly build @:generic classes here (issue #2016) *)
-		begin match t with
-			| TInst({cl_kind = KGeneric } as c,tl) -> follow (Typeload.build_generic ctx c p tl)
+		begin match t_follow with
+			| TInst({cl_kind = KGeneric } as c,tl) -> follow (Generic.build_generic ctx c p tl)
 			| _ -> t
 		end
-	with Typeload.Generic_Exception _ ->
+	with
+	| Generic.Generic_Exception _ ->
 		(* Try to infer generic parameters from the argument list (issue #2044) *)
-		match resolve_typedef (Typeload.load_type_def ctx p (fst path)) with
+		begin match resolve_typedef (Typeload.load_type_def ctx p (fst path)) with
 		| TClassDecl ({cl_constructor = Some cf} as c) ->
 			let monos = List.map (fun _ -> mk_mono()) c.cl_params in
 			let ct, f = get_constructor ctx c monos p in
 			ignore (unify_constructor_call c monos f ct);
 			begin try
-				let t = Typeload.build_generic ctx c p monos in
+				let t = Generic.build_generic ctx c p monos in
 				let map = apply_params c.cl_params monos in
 				check_constraints ctx (s_type_path c.cl_path) c.cl_params monos map true p;
 				t
-			with Typeload.Generic_Exception _ as exc ->
+			with Generic.Generic_Exception _ as exc ->
 				(* If we have an expected type, just use that (issue #3804) *)
 				begin match with_type with
-					| WithType t ->
+					| WithType.WithType(t,_) ->
 						begin match follow t with
 							| TMono _ -> raise exc
 							| t -> t
@@ -3011,12 +1816,16 @@ and type_new ctx path el with_type p =
 			end
 		| mt ->
 			error ((s_type_path (t_infos mt).mt_path) ^ " cannot be constructed") p
+		end
+	| Error _ as exc when ctx.com.display.dms_display ->
+		List.iter (fun e -> ignore(type_expr ctx e WithType.value)) el;
+		raise exc
 	in
-	Display.DisplayEmitter.check_display_type ctx t (pos path);
+	DisplayEmitter.check_display_type ctx t (pos path);
+	let t = follow t in
 	let build_constructor_call c tl =
 		let ct, f = get_constructor ctx c tl p in
-		if (Meta.has Meta.CompilerGenerated f.cf_meta) then display_error ctx (error_msg (No_constructor (TClassDecl c))) p;
-		if not (can_access ctx c f true || is_parent c ctx.curclass) && not ctx.untyped then display_error ctx "Cannot access private constructor" p;
+		check_constructor_access ctx c f p;
 		(match f.cf_kind with
 		| Var { v_read = AccRequire (r,msg) } -> (match msg with Some msg -> error msg p | None -> error_require r p)
 		| _ -> ());
@@ -3025,36 +1834,28 @@ and type_new ctx path el with_type p =
 	in
 	try begin match t with
 	| TInst ({cl_kind = KTypeParameter tl} as c,params) ->
-		if not (Typeload.is_generic_parameter ctx c) then error "Only generic type parameters can be constructed" p;
-		let el = List.map (fun e -> type_expr ctx e Value) el in
-		let ct = (tfun (List.map (fun e -> e.etype) el) ctx.t.tvoid) in
-		let rec loop t = match follow t with
-			| TAnon a ->
-				(try
-					unify ctx (PMap.find "new" a.a_fields).cf_type ct p;
-					true
-				with Not_found ->
-					 false)
-			| TAbstract({a_path = ["haxe"],"Constructible"},_) -> true
-			| TInst({cl_kind = KTypeParameter tl},_) -> List.exists loop tl
-			| _ -> false
-		in
-		if not (List.exists loop tl) then raise_error (No_constructor (TClassDecl c)) p;
-		mk (TNew (c,params,el)) t p
+		if not (TypeloadCheck.is_generic_parameter ctx c) then error "Only generic type parameters can be constructed" p;
+ 		begin match get_constructible_constraint ctx tl p with
+		| None ->
+			raise_error (No_constructor (TClassDecl c)) p
+		| Some(tl,tr) ->
+			let el,_ = unify_call_args ctx el tl tr p false false in
+			mk (TNew (c,params,el)) t p
+		end
 	| TAbstract({a_impl = Some c} as a,tl) when not (Meta.has Meta.MultiType a.a_meta) ->
 		let el,cf,ct = build_constructor_call c tl in
 		let ta = TAnon { a_fields = c.cl_statics; a_status = ref (Statics c) } in
 		let e = mk (TTypeExpr (TClassDecl c)) ta p in
 		let e = mk (TField (e,(FStatic (c,cf)))) ct p in
-		make_call ctx e el t p
+		make_call ctx e el t ~force_inline p
 	| TInst (c,params) | TAbstract({a_impl = Some c},params) ->
 		let el,_,_ = build_constructor_call c params in
 		mk (TNew (c,params,el)) t p
 	| _ ->
 		error (s_type (print_context()) t ^ " cannot be constructed") p
-	end with Error(No_constructor _ as err,p) when ctx.com.display.dms_display ->
+	end with Error(No_constructor _ as err,p) when ctx.com.display.dms_kind <> DMNone ->
 		display_error ctx (error_msg err) p;
-		Display.Diagnostics.secure_generated_code ctx (mk (TConst TNull) t p)
+		Diagnostics.secure_generated_code ctx (mk (TConst TNull) t p)
 
 and type_try ctx e1 catches with_type p =
 	let e1 = type_expr ctx (Expr.ensure_block e1) with_type in
@@ -3089,10 +1890,10 @@ and type_try ctx e1 catches with_type p =
 		| x :: _ , _ -> x
 		| [] , name -> name)
 	in
-	let catches = List.fold_left (fun acc ((v,pv),t,e_ast,pc) ->
-		let t = Typeload.load_complex_type ctx true p t in
+	let catches,el = List.fold_left (fun (acc1,acc2) ((v,pv),t,e_ast,pc) ->
+		let t = Typeload.load_complex_type ctx true t in
 		let rec loop t = match follow t with
-			| TInst ({ cl_kind = KTypeParameter _} as c,_) when not (Typeload.is_generic_parameter ctx c) ->
+			| TInst ({ cl_kind = KTypeParameter _} as c,_) when not (TypeloadCheck.is_generic_parameter ctx c) ->
 				error "Cannot catch non-generic type parameter" p
 			| TInst ({ cl_path = path },params)
 			| TEnum ({ e_path = path },params) ->
@@ -3105,35 +1906,45 @@ and type_try ctx e1 catches with_type p =
 			| _ -> error "Catch type must be a class, an enum or Dynamic" (pos e_ast)
 		in
 		let name,t2 = loop t in
-		if v.[0] = '$' then display_error ctx "Catch variable names starting with a dollar are not allowed" p;
-		check_unreachable acc t2 (pos e_ast);
+		check_unreachable acc1 t2 (pos e_ast);
 		let locals = save_locals ctx in
-		let v = add_local ctx v t pv in
-		if ctx.is_display_file && Display.is_display_position pv then
-			Display.DisplayEmitter.display_variable ctx.com.display v pv;
+		let v = add_local_with_origin ctx TVOCatchVariable v t pv in
+		if ctx.is_display_file && DisplayPosition.display_position#enclosed_in pv then
+			DisplayEmitter.display_variable ctx v pv;
 		let e = type_expr ctx e_ast with_type in
 		(* If the catch position is the display position it means we get completion on the catch keyword or some
 		   punctuation. Otherwise we wouldn't reach this point. *)
-		if ctx.is_display_file && Display.is_display_position pc then ignore(display_expr ctx e_ast e with_type pc);
+		if ctx.is_display_file && DisplayPosition.display_position#enclosed_in pc then ignore(TyperDisplay.display_expr ctx e_ast e DKMarked with_type pc);
 		v.v_type <- t2;
 		locals();
-		if with_type <> NoValue then unify ctx e.etype e1.etype e.epos;
 		if PMap.mem name ctx.locals then error ("Local variable " ^ name ^ " is preventing usage of this type here") e.epos;
-		(v , e) :: acc
-	) [] catches in
-	mk (TTry (e1,List.rev catches)) (if with_type = NoValue then ctx.t.tvoid else e1.etype) p
+		((v,e) :: acc1),(e :: acc2)
+	) ([],[e1]) catches in
+	let e1,catches,t = match with_type with
+		| WithType.NoValue -> e1,catches,ctx.t.tvoid
+		| WithType.Value _ -> e1,catches,unify_min ctx el
+		| WithType.WithType(t,src) when (match follow t with TMono _ -> true | t -> ExtType.is_void t) ->
+			e1,catches,unify_min_for_type_source ctx el src
+		| WithType.WithType(t,_) ->
+			let e1 = AbstractCast.cast_or_unify ctx t e1 e1.epos in
+			let catches = List.map (fun (v,e) ->
+				v,AbstractCast.cast_or_unify ctx t e e.epos
+			) catches in
+			e1,catches,t
+	in
+	mk (TTry (e1,List.rev catches)) t p
 
 and type_map_declaration ctx e1 el with_type p =
 	let (tkey,tval,has_type) =
 		let get_map_params t = match follow t with
-			| TAbstract({a_path=[],"Map"},[tk;tv]) -> tk,tv,true
+			| TAbstract({a_path=["haxe";"ds"],"Map"},[tk;tv]) -> tk,tv,true
 			| TInst({cl_path=["haxe";"ds"],"IntMap"},[tv]) -> ctx.t.tint,tv,true
 			| TInst({cl_path=["haxe";"ds"],"StringMap"},[tv]) -> ctx.t.tstring,tv,true
 			| TInst({cl_path=["haxe";"ds"],("ObjectMap" | "EnumValueMap")},[tk;tv]) -> tk,tv,true
 			| _ -> mk_mono(),mk_mono(),false
 		in
 		match with_type with
-		| WithType t -> get_map_params t
+		| WithType.WithType(t,_) -> get_map_params t
 		| _ -> (mk_mono(),mk_mono(),false)
 	in
 	let keys = Hashtbl.create 0 in
@@ -3152,23 +1963,23 @@ and type_map_declaration ctx e1 el with_type p =
 	) el in
 	let el_k,el_v,tkey,tval = if has_type then begin
 		let el_k,el_v = List.fold_left (fun (el_k,el_v) (e1,e2) ->
-			let e1 = type_expr ctx e1 (WithType tkey) in
+			let e1 = type_expr ctx e1 (WithType.with_type tkey) in
 			check_key e1;
 			let e1 = AbstractCast.cast_or_unify ctx tkey e1 e1.epos in
-			let e2 = type_expr ctx e2 (WithType tval) in
+			let e2 = type_expr ctx e2 (WithType.with_type tval) in
 			let e2 = AbstractCast.cast_or_unify ctx tval e2 e2.epos in
 			(e1 :: el_k,e2 :: el_v)
 		) ([],[]) el_kv in
 		el_k,el_v,tkey,tval
 	end else begin
 		let el_k,el_v = List.fold_left (fun (el_k,el_v) (e1,e2) ->
-			let e1 = type_expr ctx e1 Value in
+			let e1 = type_expr ctx e1 WithType.value in
 			check_key e1;
-			let e2 = type_expr ctx e2 Value in
+			let e2 = type_expr ctx e2 WithType.value in
 			(e1 :: el_k,e2 :: el_v)
 		) ([],[]) el_kv in
 		let unify_min_resume el = try
-			unify_min_raise ctx el
+			unify_min_raise ctx.com.basic el
 		with Error (Unify l,p) when ctx.in_call_args ->
 			 raise (WithTypeError(Unify l,p))
 		in
@@ -3176,7 +1987,7 @@ and type_map_declaration ctx e1 el with_type p =
 		let tval = unify_min_resume el_v in
 		el_k,el_v,tkey,tval
 	end in
-	let m = Typeload.load_module ctx ([],"Map") null_pos in
+	let m = TypeloadModule.load_module ctx (["haxe";"ds"],"Map") null_pos in
 	let a,c = match m.m_types with
 		| (TAbstractDecl ({a_impl = Some c} as a)) :: _ -> a,c
 		| _ -> assert false
@@ -3192,17 +2003,17 @@ and type_map_declaration ctx e1 el with_type p =
 	let el = (mk (TVar (v,Some enew)) t_dynamic p) :: (List.rev el) in
 	mk (TBlock el) tmap p
 
-and type_local_function ctx name f with_type p =
-	let params = Typeload.type_function_params ctx f (match name with None -> "localfun" | Some n -> n) p in
+and type_local_function ctx kind f with_type p =
+	let name,inline = match kind with FKNamed (name,inline) -> Some name,inline | _ -> None,false in
+	let params = TypeloadFunction.type_function_params ctx f (match name with None -> "localfun" | Some (n,_) -> n) p in
 	if params <> [] then begin
 		if name = None then display_error ctx "Type parameters not supported in unnamed local functions" p;
-		if with_type <> NoValue then error "Type parameters are not supported for rvalue functions" p
+		if with_type <> WithType.NoValue then error "Type parameters are not supported for rvalue functions" p
 	end;
-	List.iter (fun tp -> if tp.tp_constraints <> [] then display_error ctx "Type parameter constraints are not supported for local functions" p) f.f_params;
-	let inline, v = (match name with
-		| None -> false, None
-		| Some v when ExtString.String.starts_with v "inline_" -> true, Some (String.sub v 7 (String.length v - 7))
-		| Some v -> false, Some v
+	List.iter (fun tp -> if tp.tp_constraints <> None then display_error ctx "Type parameter constraints are not supported for local functions" p) f.f_params;
+	let v,pname = (match name with
+		| None -> None,p
+		| Some (v,pn) -> Some v,pn
 	) in
 	let old_tp,old_in_loop = ctx.type_params,ctx.in_loop in
 	ctx.type_params <- params @ ctx.type_params;
@@ -3210,11 +2021,11 @@ and type_local_function ctx name f with_type p =
 	let rt = Typeload.load_type_hint ctx p f.f_type in
 	let args = List.map (fun ((s,_),opt,_,t,c) ->
 		let t = Typeload.load_type_hint ctx p t in
-		let t, c = Typeload.type_function_arg ctx t c opt p in
+		let t, c = TypeloadFunction.type_function_arg ctx t c opt p in
 		s, c, t
 	) f.f_args in
 	(match with_type with
-	| WithType t ->
+	| WithType.WithType(t,_) ->
 		let rec loop t =
 			(match follow t with
 			| TFun (args2,tr) when List.length args2 = List.length args ->
@@ -3234,7 +2045,7 @@ and type_local_function ctx name f with_type p =
 			| _ -> ())
 		in
 		loop t
-	| NoValue ->
+	| WithType.NoValue ->
 		if name = None then display_error ctx "Unnamed lvalue functions are not supported" p
 	| _ ->
 		());
@@ -3242,80 +2053,109 @@ and type_local_function ctx name f with_type p =
 	let v = (match v with
 		| None -> None
 		| Some v ->
-			if v.[0] = '$' then display_error ctx "Variable names starting with a dollar are not allowed" p;
-			Some (add_local ctx v ft p) (* TODO: var pos *)
+			let v = (add_local_with_origin ctx TVOLocalFunction v ft pname) in
+			if params <> [] then v.v_extra <- Some (params,None);
+			Some v
 	) in
 	let curfun = match ctx.curfun with
 		| FunStatic -> FunStatic
-		| FunMemberAbstract -> FunMemberAbstractLocal
+		| FunMemberAbstract
+		| FunMemberAbstractLocal -> FunMemberAbstractLocal
 		| _ -> FunMemberClassLocal
 	in
-	let e , fargs = Typeload.type_function ctx args rt curfun f ctx.in_display p in
+	let e , fargs = TypeloadFunction.type_function ctx args rt curfun f ctx.in_display p in
 	ctx.type_params <- old_tp;
 	ctx.in_loop <- old_in_loop;
-	let f = {
+	let tf = {
 		tf_args = fargs;
 		tf_type = rt;
 		tf_expr = e;
 	} in
-	let e = mk (TFunction f) ft p in
-	(match v with
+	let e = mk (TFunction tf) ft p in
+	match v with
 	| None -> e
 	| Some v ->
+		Typeload.generate_value_meta ctx.com None (fun m -> v.v_meta <- m :: v.v_meta) f.f_args;
+		let open LocalUsage in
 		if params <> [] || inline then v.v_extra <- Some (params,if inline then Some e else None);
 		let rec loop = function
-			| Filters.Block f | Filters.Loop f | Filters.Function f -> f loop
-			| Filters.Use v2 | Filters.Assign v2 when v == v2 -> raise Exit
-			| Filters.Use _ | Filters.Assign _ | Filters.Declare _ -> ()
+			| LocalUsage.Block f | LocalUsage.Loop f | LocalUsage.Function f -> f loop
+			| LocalUsage.Use v2 | LocalUsage.Assign v2 when v == v2 -> raise Exit
+			| LocalUsage.Use _ | LocalUsage.Assign _ | LocalUsage.Declare _ -> ()
 		in
-		let is_rec = (try Filters.local_usage loop e; false with Exit -> true) in
-		let decl = (if is_rec then begin
-			if inline then display_error ctx "Inline function cannot be recursive" e.epos;
-			let vnew = add_local ctx v.v_name ft v.v_pos in
-			mk (TVar (vnew,Some (mk (TBlock [
-				mk (TVar (v,Some (mk (TConst TNull) ft p))) ctx.t.tvoid p;
-				mk (TBinop (OpAssign,mk (TLocal v) ft p,e)) ft p;
-				mk (TLocal v) ft p
-			]) ft p))) ctx.t.tvoid p
-		end else if inline then
-			mk (TBlock []) ctx.t.tvoid p (* do not add variable since it will be inlined *)
-		else
-			mk (TVar (v,Some e)) ctx.t.tvoid p
-		) in
-		if with_type <> NoValue && not inline then mk (TBlock [decl;mk (TLocal v) v.v_type p]) v.v_type p else decl)
+		let is_rec = (try local_usage loop e; false with Exit -> true) in
+		let exprs =
+			if with_type <> WithType.NoValue && not inline then [mk (TLocal v) v.v_type p]
+			else []
+		in
+		let exprs =
+			if is_rec then begin
+				if inline then display_error ctx "Inline function cannot be recursive" e.epos;
+				(mk (TVar (v,Some (mk (TConst TNull) ft p))) ctx.t.tvoid p) ::
+				(mk (TBinop (OpAssign,mk (TLocal v) ft p,e)) ft p) ::
+				exprs
+			end else if inline && not ctx.com.display.dms_display then
+				(mk (TBlock []) ctx.t.tvoid p) :: exprs (* do not add variable since it will be inlined *)
+			else
+				(mk (TVar (v,Some e)) ctx.t.tvoid p) :: exprs
+		in
+		match exprs with
+		| [e] -> e
+		| _ ->
+			let block = mk (TBlock exprs) v.v_type p in
+			mk (TMeta ((Meta.MergeBlock, [], null_pos), block)) v.v_type p
 
 and type_array_decl ctx el with_type p =
+	let allow_array_dynamic = ref false in
 	let tp = (match with_type with
-	| WithType t ->
-		let rec loop t =
+	| WithType.WithType(t,_) ->
+		let rec loop seen t =
 			(match follow t with
 			| TInst ({ cl_path = [],"Array" },[tp]) ->
 				(match follow tp with
 				| TMono _ -> None
-				| _ -> Some tp)
+				| _ as t ->
+					if t == t_dynamic then allow_array_dynamic := true;
+					Some tp)
 			| TAnon _ ->
 				(try
 					Some (get_iterable_param t)
 				with Not_found ->
 					None)
-			| TAbstract (a,pl) ->
-				(match List.fold_left (fun acc t -> match loop t with None -> acc | Some t -> t :: acc) [] (get_abstract_froms a pl) with
+			| TAbstract (a,pl) as t when not (List.exists (fun t' -> shallow_eq t t') seen) ->
+				let types =
+					List.fold_left
+						(fun acc t' -> match loop (t :: seen) t' with
+							| None -> acc
+							| Some t -> t :: acc
+						)
+						[]
+						(get_abstract_froms a pl)
+				in
+				(match types with
 				| [t] -> Some t
 				| _ -> None)
 			| t ->
-				if t == t_dynamic then Some t else None)
+				if t == t_dynamic then begin
+					allow_array_dynamic := true;
+					Some t
+				end else
+					None
+			)
 		in
-		loop t
+		loop [] t
 	| _ ->
 		None
 	) in
 	(match tp with
 	| None ->
-		let el = List.map (fun e -> type_expr ctx e Value) el in
+		let el = List.map (fun e -> type_expr ctx e WithType.value) el in
 		let t = try
-			unify_min_raise ctx el
+			unify_min_raise ctx.com.basic el
 		with Error (Unify l,p) ->
-			if ctx.untyped || ctx.com.display.dms_error_policy = EPIgnore then t_dynamic else begin
+			if !allow_array_dynamic || ctx.untyped || ctx.com.display.dms_error_policy = EPIgnore then
+				t_dynamic
+			else begin
 				display_error ctx "Arrays of mixed types are only allowed if the type is forced to Array<Dynamic>" p;
 				raise (Error (Unify l, p))
 			end
@@ -3323,37 +2163,333 @@ and type_array_decl ctx el with_type p =
 		mk (TArrayDecl el) (ctx.t.tarray t) p
 	| Some t ->
 		let el = List.map (fun e ->
-			let e = type_expr ctx e (WithType t) in
+			let e = type_expr ctx e (WithType.with_type t) in
 			AbstractCast.cast_or_unify ctx t e p;
 		) el in
 		mk (TArrayDecl el) (ctx.t.tarray t) p)
 
-and type_expr ctx (e,p) (with_type:with_type) =
-	match e with
-	| EField ((EConst (String s),ps),"code") ->
+and type_array_comprehension ctx e with_type p =
+	let v = gen_local ctx (mk_mono()) p in
+	let et = ref (EConst(Ident "null"),p) in
+	let comprehension_pos = p in
+	let rec map_compr (e,p) =
+		match e with
+		| EFor(it,e2) -> (EFor (it, map_compr e2),p)
+		| EWhile(cond,e2,flag) -> (EWhile (cond,map_compr e2,flag),p)
+		| EIf (cond,e2,None) -> (EIf (cond,map_compr e2,None),p)
+		| EBlock [e] -> (EBlock [map_compr e],p)
+		| EBlock el -> begin match List.rev el with
+			| e :: el -> (EBlock ((List.rev el) @ [map_compr e]),p)
+			| [] -> e,p
+			end
+		| EParenthesis e2 -> (EParenthesis (map_compr e2),p)
+		| EBinop(OpArrow,a,b) ->
+			et := (ENew(({tpackage=["haxe";"ds"];tname="Map";tparams=[];tsub=None},null_pos),[]),comprehension_pos);
+			(ECall ((EField ((EConst (Ident v.v_name),p),"set"),p),[a;b]),p)
+		| _ ->
+			et := (EArrayDecl [],comprehension_pos);
+			(ECall ((EField ((EConst (Ident v.v_name),p),"push"),p),[(e,p)]),p)
+	in
+	let e = map_compr e in
+	let ea = type_expr ctx !et with_type in
+	unify ctx v.v_type ea.etype p;
+	let efor = type_expr ctx e WithType.NoValue in
+	mk (TBlock [
+		mk (TVar (v,Some ea)) ctx.t.tvoid p;
+		efor;
+		mk (TLocal v) v.v_type p;
+	]) v.v_type p
+
+and type_return ?(implicit=false) ctx e with_type p =
+	match e with
+	| None ->
+		let v = ctx.t.tvoid in
+		unify ctx v ctx.ret p;
+		let expect_void = match with_type with
+			| WithType.WithType(t,_) -> ExtType.is_void (follow t)
+			| WithType.Value (Some ImplicitReturn) -> true
+			| _ -> false
+		in
+		mk (TReturn None) (if expect_void then v else t_dynamic) p
+	| Some e ->
+		try
+			let with_expected_type =
+				if implicit then WithType.of_implicit_return ctx.ret
+				else WithType.with_type ctx.ret
+			in
+			let e = type_expr ctx e with_expected_type in
+			let e = AbstractCast.cast_or_unify ctx ctx.ret e p in
+			begin match follow e.etype with
+			| TAbstract({a_path=[],"Void"},_) ->
+				begin match (Texpr.skip e).eexpr with
+				| TConst TNull -> error "Cannot return `null` from Void-function" p
+				| _ -> ()
+				end;
+				(* if we get a Void expression (e.g. from inlining) we don't want to return it (issue #4323) *)
+				mk (TBlock [
+					e;
+					mk (TReturn None) t_dynamic p
+				]) t_dynamic e.epos;
+			| _ ->
+				mk (TReturn (Some e)) t_dynamic p
+			end
+		with Error(err,p) ->
+			check_error ctx err p;
+			(* If we have a bad return, let's generate a return null expression at least. This surpresses various
+				follow-up errors that come from the fact that the function no longer has a return expression (issue #6445). *)
+			let e_null = mk (TConst TNull) (mk_mono()) p in
+			mk (TReturn (Some e_null)) t_dynamic p
+
+and type_cast ctx e t p =
+	let t = Typeload.load_complex_type ctx true t in
+	let check_param pt = match follow pt with
+		| TMono _ -> () (* This probably means that Dynamic wasn't bound (issue #4675). *)
+		| t when t == t_dynamic -> ()
+		| _ ->error "Cast type parameters must be Dynamic" p
+	in
+	let rec loop t = match follow t with
+		| TInst (_,params) | TEnum (_,params) ->
+			List.iter check_param params;
+			(match follow t with
+			| TInst (c,_) ->
+				(match c.cl_kind with KTypeParameter _ -> error "Can't cast to a type parameter" p | _ -> ());
+				TClassDecl c
+			| TEnum (e,_) -> TEnumDecl e
+			| _ -> assert false);
+		| TAbstract (a,params) when Meta.has Meta.RuntimeValue a.a_meta ->
+			List.iter check_param params;
+			TAbstractDecl a
+		| TAbstract (a,params) ->
+			loop (Abstract.get_underlying_type a params)
+		| _ ->
+			error "Cast type must be a class or an enum" p
+	in
+	let texpr = loop t in
+	mk (TCast (type_expr ctx e WithType.value,Some texpr)) t p
+
+and type_if ctx e e1 e2 with_type p =
+	let e = type_expr ctx e WithType.value in
+	let e = AbstractCast.cast_or_unify ctx ctx.t.tbool e p in
+	let e1 = type_expr ctx (Expr.ensure_block e1) with_type in
+	(match e2 with
+	| None ->
+		mk (TIf (e,e1,None)) ctx.t.tvoid p
+	| Some e2 ->
+		let e2 = type_expr ctx (Expr.ensure_block e2) with_type in
+		let e1,e2,t = match with_type with
+			| WithType.NoValue -> e1,e2,ctx.t.tvoid
+			| WithType.Value _ -> e1,e2,unify_min ctx [e1; e2]
+			| WithType.WithType(t,src) when (match follow t with TMono _ -> true | t -> ExtType.is_void t) ->
+				e1,e2,unify_min_for_type_source ctx [e1; e2] src
+			| WithType.WithType(t,_) ->
+				let e1 = AbstractCast.cast_or_unify ctx t e1 e1.epos in
+				let e2 = AbstractCast.cast_or_unify ctx t e2 e2.epos in
+				e1,e2,t
+		in
+		mk (TIf (e,e1,Some e2)) t p)
+
+and type_meta ?(mode=MGet) ctx m e1 with_type p =
+	if ctx.is_display_file then DisplayEmitter.check_display_metadata ctx [m];
+	let old = ctx.meta in
+	ctx.meta <- m :: ctx.meta;
+	let e () = type_expr ~mode ctx e1 with_type in
+	let e = match m with
+		| (Meta.ToString,_,_) ->
+			let e = e() in
+			(match follow e.etype with
+				| TAbstract({a_impl = Some c},_) when PMap.mem "toString" c.cl_statics -> call_to_string ctx e
+				| _ -> e)
+		| (Meta.Markup,_,_) ->
+			error "Markup literals must be processed by a macro" p
+		| (Meta.This,_,_) ->
+			let e = match ctx.this_stack with
+				| [] -> error "Cannot type @:this this here" p
+				| e :: _ -> e
+			in
+			let rec loop e = match e.eexpr with
+				| TConst TThis -> get_this ctx e.epos
+				| _ -> Type.map_expr loop e
+			in
+			loop e
+		| (Meta.Analyzer,_,_) ->
+			let e = e() in
+			{e with eexpr = TMeta(m,e)}
+		| (Meta.MergeBlock,_,_) ->
+			begin match fst e1 with
+			| EBlock el ->
+				let e = type_block ctx el with_type p in
+				{e with eexpr = TMeta(m,e)}
+			| _ -> e()
+			end
+		| (Meta.StoredTypedExpr,_,_) ->
+			MacroContext.type_stored_expr ctx e1
+		| (Meta.NoPrivateAccess,_,_) ->
+			ctx.meta <- List.filter (fun(m,_,_) -> m <> Meta.PrivateAccess) ctx.meta;
+			e()
+		| (Meta.Fixed,_,_) when ctx.com.platform=Cpp ->
+			let e = e() in
+			{e with eexpr = TMeta(m,e)}
+		| (Meta.NullSafety, [(EConst (Ident "Off"), _)],_) ->
+			let e = e() in
+			{e with eexpr = TMeta(m,e)}
+		| (Meta.BypassAccessor,_,p) ->
+			let old_counter = ctx.bypass_accessor in
+			ctx.bypass_accessor <- old_counter + 1;
+			let e = e () in
+			(if ctx.bypass_accessor > old_counter then display_error ctx "Field access expression expected after @:bypassAccessor metadata" p);
+			e
+		| (Meta.Inline,_,_) ->
+			begin match fst e1 with
+			| ECall(e1,el) ->
+				type_call ctx e1 el WithType.value true p
+			| ENew (t,el) ->
+				let e = type_new ctx t el with_type true p in
+				{e with eexpr = TMeta((Meta.Inline,[],null_pos),e)}
+			| _ ->
+				display_error ctx "Call or function expected after inline keyword" p;
+				e();
+			end
+		| (Meta.ImplicitReturn,_,_) ->
+			begin match e1 with
+			| (EReturn e, p) -> type_return ~implicit:true ctx e with_type p
+			| _ -> e()
+			end
+		| _ -> e()
+	in
+	ctx.meta <- old;
+	e
+
+and type_call_target ctx e with_type inline p =
+	let e = maybe_type_against_enum ctx (fun () -> type_access ctx (fst e) (snd e) MCall) with_type true p in
+	if not inline then
+		e
+	else match e with
+		| AKExpr {eexpr = TField(e1,fa); etype = t} ->
+			begin match extract_field fa with
+			| Some cf -> AKInline(e1,cf,fa,t)
+			| None -> e
+			end;
+		| AKUsing(e,c,cf,ef,_) ->
+			AKUsing(e,c,cf,ef,true)
+		| AKExpr {eexpr = TLocal _} ->
+			display_error ctx "Cannot force inline on local functions" p;
+			e
+		| _ ->
+			e
+
+and type_call ?(mode=MGet) ctx e el (with_type:WithType.t) inline p =
+	let def () =
+		let e = type_call_target ctx e with_type inline p in
+		build_call ~mode ctx e el with_type p
+	in
+	match e, el with
+	| (EConst (Ident "trace"),p) , e :: el ->
+		if Common.defined ctx.com Define.NoTraces then
+			null ctx.t.tvoid p
+		else
+		let mk_to_string_meta e = EMeta((Meta.ToString,[],null_pos),e),pos e in
+		let params = (match el with [] -> [] | _ -> [("customParams",null_pos,NoQuotes),(EArrayDecl (List.map mk_to_string_meta el) , p)]) in
+		let infos = mk_infos ctx p params in
+		if (platform ctx.com Js || platform ctx.com Python) && el = [] && has_dce ctx.com then
+			let e = type_expr ctx e WithType.value in
+			let infos = type_expr ctx infos WithType.value in
+			let e = match follow e.etype with
+				| TAbstract({a_impl = Some c},_) when PMap.mem "toString" c.cl_statics ->
+					call_to_string ctx e
+				| _ ->
+					e
+			in
+			let e_trace = mk (TIdent "`trace") t_dynamic p in
+			mk (TCall (e_trace,[e;infos])) ctx.t.tvoid p
+		else
+			type_expr ctx (ECall ((EField ((EField ((EConst (Ident "haxe"),p),"Log"),p),"trace"),p),[mk_to_string_meta e;infos]),p) WithType.NoValue
+	| (EField ((EConst (Ident "super"),_),_),_), _ ->
+		(match def() with
+			| { eexpr = TCall ({ eexpr = TField (_, FInstance(_, _, { cf_kind = Method MethDynamic; cf_name = name })); epos = p }, _) } as e ->
+				ctx.com.error ("Cannot call super." ^ name ^ " since it's a dynamic method") p;
+				e
+			| e -> e
+		)
+	| (EField (e,"bind"),p), args ->
+		let e = type_expr ctx e WithType.value in
+		(match follow e.etype with
+			| TFun signature -> type_bind ctx e signature args p
+			| _ -> def ())
+	| (EConst (Ident "$type"),_) , [e] ->
+		let e = type_expr ctx e WithType.value in
+		ctx.com.warning (s_type (print_context()) e.etype) e.epos;
+		let e = Diagnostics.secure_generated_code ctx e in
+		e
+	| (EField(e,"match"),p), [epat] ->
+		let et = type_expr ctx e WithType.value in
+		(match follow et.etype with
+			| TEnum _ ->
+				Matcher.Match.match_expr ctx e [[epat],None,Some (EConst(Ident "true"),p),p] (Some (Some (EConst(Ident "false"),p),p)) (WithType.with_type ctx.t.tbool) true p
+			| _ -> def ())
+	| (EConst (Ident "__unprotect__"),_) , [(EConst (String _),_) as e] ->
+		let e = type_expr ctx e WithType.value in
+		if Common.platform ctx.com Flash then
+			let t = tfun [e.etype] e.etype in
+			let e_unprotect = mk (TIdent "__unprotect__") t p in
+			mk (TCall (e_unprotect,[e])) e.etype e.epos
+		else
+			e
+	| (EDisplay((EConst (Ident "super"),_ as e1),dk),_),_ ->
+		TyperDisplay.handle_display ctx (ECall(e1,el),p) dk with_type
+	| (EConst (Ident "super"),sp) , el ->
+		if ctx.curfun <> FunConstructor then error "Cannot call super constructor outside class constructor" p;
+		let el, t = (match ctx.curclass.cl_super with
+		| None -> error "Current class does not have a super" p
+		| Some (c,params) ->
+			let ct, f = get_constructor ctx c params p in
+			if (Meta.has Meta.CompilerGenerated f.cf_meta) then display_error ctx (error_msg (No_constructor (TClassDecl c))) p;
+			let el = (match follow ct with
+			| TFun (args,r) ->
+				let el,_,_ = unify_field_call ctx (FInstance(c,params,f)) el args r p false in
+				el
+			| _ ->
+				error "Constructor is not a function" p
+			) in
+			el , TInst (c,params)
+		) in
+		mk (TCall (mk (TConst TSuper) t sp,el)) ctx.t.tvoid p
+	| _ ->
+		def ()
+
+and type_expr ?(mode=MGet) ctx (e,p) (with_type:WithType.t) =
+	match e with
+	| EField ((EConst (String(s,_)),ps),"code") ->
 		if UTF8.length s <> 1 then error "String must be a single UTF8 char" ps;
-		mk (TConst (TInt (Int32.of_int (UChar.code (UTF8.get s 0))))) ctx.t.tint p
-	| EField(_,n) when n.[0] = '$' ->
+		mk (TConst (TInt (Int32.of_int (UCharExt.code (UTF8.get s 0))))) ctx.t.tint p
+	| EField(_,n) when starts_with n '$' ->
 		error "Field names starting with $ are not allowed" p
 	| EConst (Ident s) ->
-		if s = "super" && with_type <> NoValue && not ctx.in_display then error "Cannot use super as value" p;
-		let e = maybe_type_against_enum ctx (fun () -> type_ident ctx s p MGet) with_type p in
+		if s = "super" && with_type <> WithType.NoValue && not ctx.in_display then error "Cannot use super as value" p;
+		let e = maybe_type_against_enum ctx (fun () -> type_ident ctx s p mode) with_type false p in
 		acc_get ctx e p
 	| EField _
 	| EArray _ ->
-		acc_get ctx (type_access ctx e p MGet) p
+		acc_get ctx (type_access ctx e p mode) p
 	| EConst (Regexp (r,opt)) ->
 		let str = mk (TConst (TString r)) ctx.t.tstring p in
 		let opt = mk (TConst (TString opt)) ctx.t.tstring p in
 		let t = Typeload.load_core_type ctx "EReg" in
 		mk (TNew ((match t with TInst (c,[]) -> c | _ -> assert false),[],[str;opt])) t p
-	| EConst (String s) when s <> "" && Lexer.is_fmt_string p ->
+	| EConst (String(s,_)) when s <> "" && Lexer.is_fmt_string p ->
 		type_expr ctx (format_string ctx s p) with_type
 	| EConst c ->
-		Codegen.type_constant ctx.com c p
+		Texpr.type_constant ctx.com.basic c p
 	| EBinop (op,e1,e2) ->
 		type_binop ctx op e1 e2 false with_type p
-	| EBlock [] when with_type <> NoValue ->
+	| EBlock [] when (match with_type with
+			| NoValue -> false
+			(*
+				If expected type is unknown then treat `(...) -> {}` as an empty function
+				(just like `function(...) {}`) instead of returning an object.
+			*)
+			| WithType (t, Some ImplicitReturn) -> not (ExtType.is_mono (follow t))
+			| _ -> true
+		) ->
 		type_expr ctx (EObjectDecl [],p) with_type
 	| EBlock l ->
 		let locals = save_locals ctx in
@@ -3366,154 +2502,52 @@ and type_expr ctx (e,p) (with_type:with_type) =
 	| EObjectDecl fl ->
 		type_object_decl ctx fl with_type p
 	| EArrayDecl [(EFor _,_) | (EWhile _,_) as e] ->
-		let v = gen_local ctx (mk_mono()) p in
-		let et = ref (EConst(Ident "null"),p) in
-		let rec map_compr (e,p) =
-			match e with
-			| EFor(it,e2) -> (EFor (it, map_compr e2),p)
-			| EWhile(cond,e2,flag) -> (EWhile (cond,map_compr e2,flag),p)
-			| EIf (cond,e2,None) -> (EIf (cond,map_compr e2,None),p)
-			| EBlock [e] -> (EBlock [map_compr e],p)
-			| EParenthesis e2 -> (EParenthesis (map_compr e2),p)
-			| EBinop(OpArrow,a,b) ->
-				et := (ENew(({tpackage=[];tname="Map";tparams=[];tsub=None},null_pos),[]),p);
-				(ECall ((EField ((EConst (Ident v.v_name),p),"set"),p),[a;b]),p)
-			| _ ->
-				et := (EArrayDecl [],p);
-				(ECall ((EField ((EConst (Ident v.v_name),p),"push"),p),[(e,p)]),p)
-		in
-		let e = map_compr e in
-		let ea = type_expr ctx !et with_type in
-		unify ctx v.v_type ea.etype p;
-		let efor = type_expr ctx e NoValue in
-		mk (TBlock [
-			mk (TVar (v,Some ea)) ctx.t.tvoid p;
-			efor;
-			mk (TLocal v) v.v_type p;
-		]) v.v_type p
+		type_array_comprehension ctx e with_type p
 	| EArrayDecl ((EBinop(OpArrow,_,_),_) as e1 :: el) ->
 		type_map_declaration ctx e1 el with_type p
 	| EArrayDecl el ->
-		type_array_decl ctx el with_type p
+		begin match el,with_type with
+			| [],WithType(t,_) ->
+				let rec loop t = match follow t with
+					| TAbstract({a_path = (["haxe";"ds"],"Map")},_) ->
+						type_expr ctx (ENew(({tpackage=["haxe";"ds"];tname="Map";tparams=[];tsub=None},null_pos),[]),p) with_type
+					| _ ->
+						type_array_decl ctx el with_type p
+				in
+				loop t
+			| _ ->
+				type_array_decl ctx el with_type p
+		end
 	| EVars vl ->
 		type_vars ctx vl p
 	| EFor (it,e2) ->
-		let rec loop_ident display e1 = match e1 with
-			| EConst(Ident i),p -> i,p,display
-			| EDisplay(e1,_),_ -> loop_ident true e1
-			| _ -> error "Identifier expected" (pos e1)
-		in
-		let rec loop display e1 = match fst e1 with
-			| EIn(e1,e2) -> loop_ident display e1,e2
-			| EDisplay(e1,_) -> loop true e1
-			| _ -> error "For expression should be 'v in expr'" (snd it)
-		in
-		let (i, pi, display), e1 = loop false it in
-		let e1 = type_expr ctx e1 Value in
-		let old_loop = ctx.in_loop in
-		let old_locals = save_locals ctx in
-		ctx.in_loop <- true;
-		let e2 = Expr.ensure_block e2 in
-		let default() =
-			let t, pt = Typeload.t_iterator ctx in
-			let i = add_local ctx i pt pi in
-			let e1 = (match follow e1.etype with
-			| TMono _
-			| TDynamic _ ->
-				display_error ctx "You can't iterate on a Dynamic value, please specify Iterator or Iterable" e1.epos;
-				e1
-			| TLazy _ ->
-				assert false
-			| _ ->
-				(try
-					AbstractCast.cast_or_unify_raise ctx t e1 p
-				with Error (Unify _,_) ->
-					let acc = build_call ctx (type_field ctx e1 "iterator" e1.epos MCall) [] Value e1.epos in
-					try
-						unify_raise ctx acc.etype t acc.epos;
-						acc
-					with Error (Unify(l),p) ->
-						display_error ctx "Field iterator has an invalid type" acc.epos;
-						display_error ctx (error_msg (Unify l)) p;
-						mk (TConst TNull) t_dynamic p
-				)
-			) in
-			if display then ignore(handle_display ctx (EConst(Ident i.v_name),i.v_pos) (WithType i.v_type));
-			let e2 = type_expr ctx e2 NoValue in
-			(try Optimizer.optimize_for_loop_iterator ctx i e1 e2 p with Exit -> mk (TFor (i,e1,e2)) ctx.t.tvoid p)
-		in
-		let e = match Optimizer.optimize_for_loop ctx (i,pi) e1 e2 p with
-			| Some e ->
-				if display then ignore(handle_display ctx (EConst(Ident i),pi) Value);
-				e
-			| None -> default()
-		in
-		ctx.in_loop <- old_loop;
-		old_locals();
-		e
-	| EIn _ ->
-		error "This expression is not allowed outside a for loop" p
+		ForLoop.type_for_loop ctx TyperDisplay.handle_display it e2 p
 	| ETernary (e1,e2,e3) ->
 		type_expr ctx (EIf (e1,e2,Some e3),p) with_type
 	| EIf (e,e1,e2) ->
-		let e = type_expr ctx e Value in
-		let e = AbstractCast.cast_or_unify ctx ctx.t.tbool e p in
-		let e1 = type_expr ctx (Expr.ensure_block e1) with_type in
-		(match e2 with
-		| None ->
-			mk (TIf (e,e1,None)) ctx.t.tvoid p
-		| Some e2 ->
-			let e2 = type_expr ctx (Expr.ensure_block e2) with_type in
-			let e1,e2,t = match with_type with
-				| NoValue -> e1,e2,ctx.t.tvoid
-				| Value -> e1,e2,unify_min ctx [e1; e2]
-				| WithType t when (match follow t with TMono _ -> true | _ -> false) -> e1,e2,unify_min ctx [e1; e2]
-				| WithType t ->
-					let e1 = AbstractCast.cast_or_unify ctx t e1 e1.epos in
-					let e2 = AbstractCast.cast_or_unify ctx t e2 e2.epos in
-					e1,e2,t
-			in
-			mk (TIf (e,e1,Some e2)) t p)
+		type_if ctx e e1 e2 with_type p
 	| EWhile (cond,e,NormalWhile) ->
 		let old_loop = ctx.in_loop in
-		let cond = type_expr ctx cond Value in
+		let cond = type_expr ctx cond WithType.value in
 		let cond = AbstractCast.cast_or_unify ctx ctx.t.tbool cond p in
 		ctx.in_loop <- true;
-		let e = type_expr ctx (Expr.ensure_block e) NoValue in
+		let e = type_expr ctx (Expr.ensure_block e) WithType.NoValue in
 		ctx.in_loop <- old_loop;
 		mk (TWhile (cond,e,NormalWhile)) ctx.t.tvoid p
 	| EWhile (cond,e,DoWhile) ->
 		let old_loop = ctx.in_loop in
 		ctx.in_loop <- true;
-		let e = type_expr ctx (Expr.ensure_block e) NoValue in
+		let e = type_expr ctx (Expr.ensure_block e) WithType.NoValue in
 		ctx.in_loop <- old_loop;
-		let cond = type_expr ctx cond Value in
+		let cond = type_expr ctx cond WithType.value in
 		let cond = AbstractCast.cast_or_unify ctx ctx.t.tbool cond cond.epos in
 		mk (TWhile (cond,e,DoWhile)) ctx.t.tvoid p
 	| ESwitch (e1,cases,def) ->
 		let wrap e1 = mk (TMeta((Meta.Ast,[e,p],p),e1)) e1.etype e1.epos in
-		let e = match_expr ctx e1 cases def with_type p in
+		let e = Matcher.Match.match_expr ctx e1 cases def with_type false p in
 		wrap e
 	| EReturn e ->
-		begin match e with
-			| None ->
-				let v = ctx.t.tvoid in
-				unify ctx v ctx.ret p;
-				mk (TReturn None) t_dynamic p
-			| Some e ->
-				let e = type_expr ctx e (WithType ctx.ret) in
-				let e = AbstractCast.cast_or_unify ctx ctx.ret e p in
-				begin match follow e.etype with
-				| TAbstract({a_path=[],"Void"},_) ->
-					(* if we get a Void expression (e.g. from inlining) we don't want to return it (issue #4323) *)
-					mk (TBlock [
-						e;
-						mk (TReturn None) t_dynamic p
-					]) t_dynamic e.epos;
-				| _ ->
-					mk (TReturn (Some e)) t_dynamic p
-				end
-		end
+		type_return ctx e with_type p
 	| EBreak ->
 		if not ctx.in_loop then display_error ctx "Break outside loop" p;
 		mk TBreak t_dynamic p
@@ -3525,16 +2559,16 @@ and type_expr ctx (e,p) (with_type:with_type) =
 	| ETry (e1,catches) ->
 		type_try ctx e1 catches with_type p
 	| EThrow e ->
-		let e = type_expr ctx e Value in
+		let e = type_expr ctx e WithType.value in
 		mk (TThrow e) (mk_mono()) p
 	| ECall (e,el) ->
-		type_call ctx e el with_type p
+		type_call ~mode ctx e el with_type false p
 	| ENew (t,el) ->
-		type_new ctx t el with_type p
+		type_new ctx t el with_type false p
 	| EUnop (op,flag,e) ->
 		type_unop ctx op flag e p
-	| EFunction (name,f) ->
-		type_local_function ctx name f with_type p
+	| EFunction (kind,f) ->
+		type_local_function ctx kind f with_type p
 	| EUntyped e ->
 		let old = ctx.untyped in
 		ctx.untyped <- true;
@@ -3547,902 +2581,21 @@ and type_expr ctx (e,p) (with_type:with_type) =
 			epos = e.epos;
 		}
 	| ECast (e,None) ->
-		let e = type_expr ctx e Value in
+		let e = type_expr ctx e WithType.value in
 		mk (TCast (e,None)) (mk_mono()) p
 	| ECast (e, Some t) ->
-		let t = Typeload.load_complex_type ctx true p t in
-		let check_param pt = match follow pt with
-			| TMono _ -> () (* This probably means that Dynamic wasn't bound (issue #4675). *)
-			| t when t == t_dynamic -> ()
-			| _ ->error "Cast type parameters must be Dynamic" p
-		in
-		let rec loop t = match follow t with
-			| TInst (_,params) | TEnum (_,params) ->
-				List.iter check_param params;
-				(match follow t with
-				| TInst (c,_) ->
-					(match c.cl_kind with KTypeParameter _ -> error "Can't cast to a type parameter" p | _ -> ());
-					TClassDecl c
-				| TEnum (e,_) -> TEnumDecl e
-				| _ -> assert false);
-			| TAbstract (a,params) when Meta.has Meta.RuntimeValue a.a_meta ->
-				List.iter check_param params;
-				TAbstractDecl a
-			| TAbstract (a,params) ->
-				loop (Abstract.get_underlying_type a params)
-			| _ ->
-				error "Cast type must be a class or an enum" p
-		in
-		let texpr = loop t in
-		mk (TCast (type_expr ctx e Value,Some texpr)) t p
-	| EDisplay (e,iscall) ->
-		begin match ctx.com.display.dms_kind with
-			| DMField | DMSignature when iscall -> handle_signature_display ctx e with_type
-			| _ -> handle_display ctx e with_type
-		end
+		type_cast ctx e t p
+	| EDisplay (e,dk) ->
+		TyperDisplay.handle_edisplay ctx e dk with_type
 	| EDisplayNew t ->
 		assert false
-		(*let t = Typeload.load_instance ctx t true p in
-		(match follow t with
-		| TInst (c,params) | TAbstract({a_impl = Some c},params) ->
-			let ct, f = get_constructor ctx c params p in
-			raise (Display.DisplaySignatures ((ct,f.cf_doc) :: List.map (fun f -> (f.cf_type,f.cf_doc)) f.cf_overloads))
-		| _ ->
-			error "Not a class" p)*)
 	| ECheckType (e,t) ->
-		let t = Typeload.load_complex_type ctx true p t in
-		let e = type_expr ctx e (WithType t) in
+		let t = Typeload.load_complex_type ctx true t in
+		let e = type_expr ctx e (WithType.with_type t) in
 		let e = AbstractCast.cast_or_unify ctx t e p in
 		if e.etype == t then e else mk (TCast (e,None)) t p
 	| EMeta (m,e1) ->
-		if ctx.is_display_file then Display.DisplayEmitter.check_display_metadata ctx [m];
-		let old = ctx.meta in
-		ctx.meta <- m :: ctx.meta;
-		let e () = type_expr ctx e1 with_type in
-		let e = match m with
-			| (Meta.ToString,_,_) ->
-				let e = e() in
-				(match follow e.etype with
-					| TAbstract({a_impl = Some c},_) when PMap.mem "toString" c.cl_statics -> call_to_string ctx e
-					| _ -> e)
-			| (Meta.This,_,_) ->
-				let e = match ctx.this_stack with
-					| [] -> error "Cannot type @:this this here" p
-					| e :: _ -> e
-				in
-				let rec loop e = match e.eexpr with
-					| TConst TThis -> get_this ctx e.epos
-					| _ -> Type.map_expr loop e
-				in
-				loop e
-			| (Meta.Analyzer,_,_) ->
-				let e = e() in
-				{e with eexpr = TMeta(m,e)}
-			| (Meta.MergeBlock,_,_) ->
-				begin match fst e1 with
-				| EBlock el ->
-					let e = type_block ctx el with_type p in
-					{e with eexpr = TMeta(m,e)}
-				| _ -> e()
-				end
-			| (Meta.StoredTypedExpr,_,_) ->
-				let id = match e1 with (EConst (Int s),_) -> int_of_string s | _ -> assert false in
-				MacroContext.get_stored_typed_expr ctx.com id
-			| (Meta.NoPrivateAccess,_,_) ->
-				ctx.meta <- List.filter (fun(m,_,_) -> m <> Meta.PrivateAccess) ctx.meta;
-				e()
-			| (Meta.Fixed,_,_) when ctx.com.platform=Cpp ->
-				let e = e() in
-				{e with eexpr = TMeta(m,e)}
-			| _ -> e()
-		in
-		ctx.meta <- old;
-		e
-
-and get_submodule_fields ctx path =
-	let m = Hashtbl.find ctx.g.modules path in
-	let tl = List.filter (fun t -> path <> (t_infos t).mt_path && not (t_infos t).mt_private) m.m_types in
-	let tl = List.map (fun mt ->
-		let infos = t_infos mt in
-		(snd infos.mt_path),Display.FKType (type_of_module_type mt),infos.mt_doc
-	) tl in
-	tl
-
-and handle_display ctx e_ast with_type =
-	let old = ctx.in_display,ctx.in_call_args in
-	ctx.in_display <- true;
-	ctx.in_call_args <- false;
-	let e = match e_ast,with_type with
-	| (EConst (Ident "$type"),_),_ ->
-		let mono = mk_mono() in
-		raise (Display.DisplaySignatures ([((["expression",false,mono],mono),Some "Outputs type of argument as a warning and uses argument as value")],0))
-	| (EConst (Ident "trace"),_),_ ->
-		raise (Display.DisplaySignatures ([((["value",false,t_dynamic],ctx.com.basic.tvoid),Some "Print given arguments")],0))
-	| (EConst (Ident "_"),p),WithType t ->
-		mk (TConst TNull) t p (* This is "probably" a bind skip, let's just use the expected type *)
-	| _ -> try
-		type_expr ctx e_ast with_type
-	with Error (Unknown_ident n,_) ->
-		raise (Parser.TypePath ([n],None,false))
-	| Error (Type_not_found (path,_),_) as err ->
-		begin try
-			raise (Display.DisplayFields (get_submodule_fields ctx path))
-		with Not_found ->
-			raise err
-		end
-	in
-	let p = e.epos in
-	let e = match with_type with
-		| WithType t -> (try AbstractCast.cast_or_unify_raise ctx t e e.epos with Error (Unify l,p) -> e)
-		| _ -> e
-	in
-	ctx.in_display <- fst old;
-	ctx.in_call_args <- snd old;
-	display_expr ctx e_ast e with_type p
-
-and handle_signature_display ctx e_ast with_type =
-	ctx.in_display <- true;
-	let p = pos e_ast in
-	let find_constructor_types t = match follow t with
-		| TInst (c,tl) | TAbstract({a_impl = Some c},tl) ->
-			let ct,cf = get_constructor ctx c tl p in
-			let tl = (ct,cf.cf_doc) :: List.rev_map (fun cf' -> cf'.cf_type,cf.cf_doc) cf.cf_overloads in
-			tl
-		| _ ->
-			[]
-	in
-	let tl,el,p0 = match fst e_ast with
-		| ECall(e1,el) ->
-			let e1 = try
-				type_expr ctx e1 Value
-			with Error (Unknown_ident "trace",_) ->
-				let e = expr_of_type_path (["haxe";"Log"],"trace") p in
-				type_expr ctx e Value
-			in
-			let tl = match e1.eexpr with
-				| TField(_,fa) ->
-					begin match extract_field fa with
-						| Some cf -> (e1.etype,cf.cf_doc) :: List.rev_map (fun cf' -> cf'.cf_type,cf.cf_doc) cf.cf_overloads
-						| None -> [e1.etype,None]
-					end
-				| TConst TSuper ->
-					find_constructor_types e1.etype
-				| _ -> [e1.etype,None]
-			in
-			tl,el,e1.epos
-		| ENew(tpath,el) ->
-			let t = Typeload.load_instance ctx tpath true p in
-			find_constructor_types t,el,pos tpath
-		| _ -> error "Call expected" p
-	in
-	let rec follow_with_callable (t,doc) = match follow t with
-		| TAbstract(a,tl) when Meta.has Meta.Callable a.a_meta -> follow_with_callable (Abstract.get_underlying_type a tl,doc)
-		| TFun(args,ret) -> ((args,ret),doc)
-		| _ -> error ("Not a callable type: " ^ (s_type (print_context()) t)) p
-	in
-	let tl = List.map follow_with_callable tl in
-	let rec loop i p1 el = match el with
-		| (e,p2) :: el ->
-			if Display.is_display_position (punion p1 p2) then i else loop (i + 1) p2 el
-		| [] ->
-			i
-	in
-	let display_arg = loop 0 p0 el in
-	(* If our display position exceeds the argument number we add a null expression in order to make
-	   unify_call_args error out. *)
-	let el = if display_arg >= List.length el then el @ [EConst (Ident "null"),null_pos] else el in
-	let rec loop acc tl = match tl with
-		| (t,doc) :: tl ->
-			let keep (args,r) =
-				begin try
-					let _ = unify_call_args' ctx el args r p false false in
-					true
-				with
-				| Error(Call_error (Not_enough_arguments _),_) -> true
-				| _ -> false
-				end
-			in
-			loop (if keep t then (t,doc) :: acc else acc) tl
-		| [] ->
-			acc
-	in
-	let overloads = match loop [] tl with [] -> tl | tl -> tl in
-	raise (Display.DisplaySignatures(overloads,display_arg))
-
-and display_expr ctx e_ast e with_type p =
-	let get_super_constructor () = match ctx.curclass.cl_super with
-		| None -> error "Current class does not have a super" p
-		| Some (c,params) ->
-			let _, f = get_constructor ctx c params p in
-			f
-	in
-	match ctx.com.display.dms_kind with
-	| DMResolve _ | DMPackage | DMSignature ->
-		assert false
-	| DMType ->
-		let rec loop e = match e.eexpr with
-			| TVar(v,_) -> v.v_type,None
-			| TCall({eexpr = TConst TSuper; etype = t},_) -> t,None
-			| TNew({cl_kind = KAbstractImpl a},tl,_) -> TType(abstract_module_type a tl,[]),None
-			| TNew(c,tl,_) -> TInst(c,tl),None
-			| TTypeExpr (TClassDecl {cl_kind = KAbstractImpl a}) -> TType(abstract_module_type a (List.map snd a.a_params),[]),None
-			| TField(e1,FDynamic "bind") when (match follow e1.etype with TFun _ -> true | _ -> false) -> e1.etype,None
-			| TReturn (Some e1) -> loop e1 (* No point in letting the internal Dynamic surface (issue #5655) *)
-			| TField(_,(FStatic(c,cf) | FInstance(c,_,cf) | FClosure(Some(c,_),cf))) ->
-				if Meta.has Meta.CoreApi c.cl_meta then merge_core_doc ctx c;
-				e.etype,cf.cf_doc
-			| TField(_,FEnum(_,ef)) ->
-				e.etype,ef.ef_doc
-			| _ -> e.etype,None
-		in
-		let t,doc = loop e in
-		raise (Display.DisplayType (t,p,doc))
-	| DMUsage _ ->
-		let rec loop e = match e.eexpr with
-		| TField(_,FEnum(_,ef)) ->
-			ef.ef_meta <- (Meta.Usage,[],p) :: ef.ef_meta;
-		| TField(_,(FAnon cf | FInstance (_,_,cf) | FStatic (_,cf) | FClosure (_,cf))) ->
-			cf.cf_meta <- (Meta.Usage,[],p) :: cf.cf_meta;
-		| TLocal v | TVar(v,_) ->
-			v.v_meta <- (Meta.Usage,[],p) :: v.v_meta;
-		| TTypeExpr mt ->
-			let ti = t_infos mt in
-			ti.mt_meta <- (Meta.Usage,[],p) :: ti.mt_meta;
-		| TNew(c,tl,_) ->
-			begin try
-				let _,cf = get_constructor ctx c tl p in
-				cf.cf_meta <- (Meta.Usage,[],p) :: cf.cf_meta;
-			with Not_found ->
-				()
-			end
-		| TCall({eexpr = TConst TSuper},_) ->
-			begin try
-				let cf = get_super_constructor() in
-				cf.cf_meta <- (Meta.Usage,[],p) :: cf.cf_meta;
-			with Not_found ->
-				()
-			end
-		| TConst TSuper ->
-			begin match ctx.curclass.cl_super with
-				| None -> ()
-				| Some (c,_) -> c.cl_meta <- (Meta.Usage,[],p) :: c.cl_meta;
-			end
-		| TCall(e1,_) ->
-			loop e1
-		| _ ->
-			()
-		in
-		loop e;
-		e
-	| DMPosition ->
-		let rec loop e = match e.eexpr with
-		| TField(_,FEnum(_,ef)) -> [ef.ef_pos]
-		| TField(_,(FAnon cf | FInstance (_,_,cf) | FStatic (_,cf) | FClosure (_,cf))) -> [cf.cf_pos]
-		| TLocal v | TVar(v,_) -> [v.v_pos]
-		| TTypeExpr mt -> [(t_infos mt).mt_pos]
-		| TNew(c,tl,_) ->
-			begin try
-				let _,cf = get_constructor ctx c tl p in
-				[cf.cf_pos]
-			with Not_found ->
-				[]
-			end
-		| TCall({eexpr = TConst TSuper},_) ->
-			begin try
-				let cf = get_super_constructor() in
-				[cf.cf_pos]
-			with Not_found ->
-				[]
-			end
-		| TConst TSuper ->
-			begin match ctx.curclass.cl_super with
-				| None -> []
-				| Some (c,_) -> [c.cl_pos]
-			end
-		| TCall(e1,_) ->
-			loop e1
-		| _ ->
-			[]
-		in
-		let pl = loop e in
-		raise (Display.DisplayPosition pl);
-	| DMToplevel ->
-		raise (Display.DisplayToplevel (Display.ToplevelCollector.run ctx false))
-	| DMField | DMNone | DMModuleSymbols _ | DMDiagnostics _ | DMStatistics ->
-		let opt_args args ret = TFun(List.map(fun (n,o,t) -> n,true,t) args,ret) in
-		let e = match e.eexpr with
-			| TField (e1,fa) ->
-				if field_name fa = "bind" then (match follow e1.etype with
-					| TFun(args,ret) -> {e1 with etype = opt_args args ret}
-					| _ -> e)
-				else
-					e
-			| _ ->
-				e
-		in
-		let opt_type t =
-			match t with
-			| TLazy f ->
-				Typeload.return_partial_type := true;
-				let t = (!f)() in
-				Typeload.return_partial_type := false;
-				t
-			| _ ->
-				t
-		in
-		let should_access c cf stat =
-			if c != ctx.curclass && not cf.cf_public && String.length cf.cf_name > 4 then begin match String.sub cf.cf_name 0 4 with
-				| "get_" | "set_" -> false
-				| _ -> can_access ctx c cf stat
-			end else
-				can_access ctx c cf stat
-		in
-		let rec get_fields t =
-			match follow t with
-			| TInst (c,params) ->
-				if Meta.has Meta.CoreApi c.cl_meta then merge_core_doc ctx c;
-				let merge ?(cond=(fun _ -> true)) a b =
-					PMap.foldi (fun k f m -> if cond f then PMap.add k f m else m) a b
-				in
-				let rec loop c params =
-					let m = List.fold_left (fun m (i,params) ->
-						merge m (loop i params)
-					) PMap.empty c.cl_implements in
-					let m = (match c.cl_super with
-						| None -> m
-						| Some (csup,cparams) -> merge m (loop csup cparams)
-					) in
-					let m = merge ~cond:(fun f -> should_access c f false) c.cl_fields m in
-					let m = (match c.cl_kind with
-						| KTypeParameter pl -> List.fold_left (fun acc t -> merge acc (get_fields t)) m pl
-						| _ -> m
-					) in
-					PMap.map (fun f -> { f with cf_type = apply_params c.cl_params params (opt_type f.cf_type); cf_public = true; }) m
-				in
-				loop c params
-			| TAbstract({a_impl = Some c} as a,pl) ->
-				if Meta.has Meta.CoreApi c.cl_meta then merge_core_doc ctx c;
-				let fields = try
-					let _,el,_ = Meta.get Meta.Forward a.a_meta in
-					let sl = ExtList.List.filter_map (fun e -> match fst e with
-						| EConst(Ident s) -> Some s
-						| _ -> None
-					) el in
-					let fields = get_fields (apply_params a.a_params pl a.a_this) in
-					if sl = [] then fields else PMap.fold (fun cf acc ->
-						if List.mem cf.cf_name sl then
-							PMap.add cf.cf_name cf acc
-						else
-							acc
-					) fields PMap.empty
-				with Not_found ->
-					PMap.empty
-				in
-				PMap.fold (fun f acc ->
-					if f.cf_name <> "_new" && should_access c f true && Meta.has Meta.Impl f.cf_meta && not (Meta.has Meta.Enum f.cf_meta) then begin
-						let f = prepare_using_field f in
-						let t = apply_params a.a_params pl (follow f.cf_type) in
-						PMap.add f.cf_name { f with cf_public = true; cf_type = opt_type t } acc
-					end else
-						acc
-				) c.cl_statics fields
-			| TAnon a when PMap.is_empty a.a_fields ->
-				begin match with_type with
-				| WithType t -> get_fields t
-				| _ -> a.a_fields
-				end
-			| TAnon a ->
-				(match !(a.a_status) with
-				| Statics c ->
-					if Meta.has Meta.CoreApi c.cl_meta then merge_core_doc ctx c;
-					let is_abstract_impl = match c.cl_kind with KAbstractImpl _ -> true | _ -> false in
-					let pm = match c.cl_constructor with None -> PMap.empty | Some cf -> PMap.add "new" cf PMap.empty in
-					PMap.fold (fun f acc ->
-						if should_access c f true && (not is_abstract_impl || not (Meta.has Meta.Impl f.cf_meta) || Meta.has Meta.Enum f.cf_meta) then
-							PMap.add f.cf_name { f with cf_public = true; cf_type = opt_type f.cf_type } acc else acc
-					) a.a_fields pm
-				| _ ->
-					a.a_fields)
-			| TFun (args,ret) ->
-				let t = opt_args args ret in
-				let cf = mk_field "bind" (tfun [t] t) p null_pos in
-				PMap.add "bind" cf PMap.empty
-			| _ ->
-				PMap.empty
-		in
-		let fields = get_fields e.etype in
-		(*
-			add 'using' methods compatible with this type
-		*)
-		let rec loop acc = function
-			| [] -> acc
-			| (c,_) :: l ->
-				let acc = ref (loop acc l) in
-				let rec dup t = Type.map dup t in
-				List.iter (fun f ->
-					if not (Meta.has Meta.NoUsing f.cf_meta) then
-					let f = { f with cf_type = opt_type f.cf_type } in
-					let monos = List.map (fun _ -> mk_mono()) f.cf_params in
-					let map = apply_params f.cf_params monos in
-					match follow (map f.cf_type) with
-					| TFun((_,_,TType({t_path=["haxe";"macro"], "ExprOf"}, [t])) :: args, ret)
-					| TFun((_,_,t) :: args, ret) ->
-						(try
-							unify_raise ctx (dup e.etype) t e.epos;
-							List.iter2 (fun m (name,t) -> match follow t with
-								| TInst ({ cl_kind = KTypeParameter constr },_) when constr <> [] ->
-									List.iter (fun tc -> unify_raise ctx m (map tc) e.epos) constr
-								| _ -> ()
-							) monos f.cf_params;
-							if not (can_access ctx c f true) || follow e.etype == t_dynamic && follow t != t_dynamic then
-								()
-							else begin
-								let f = prepare_using_field f in
-								let f = { f with cf_params = []; cf_public = true; cf_type = TFun(args,ret) } in
-								acc := PMap.add f.cf_name f (!acc)
-							end
-						with Error (Unify _,_) -> ())
-					| _ -> ()
-				) c.cl_ordered_statics;
-				!acc
-		in
-		let use_methods = match follow e.etype with TMono _ -> PMap.empty | _ -> loop (loop PMap.empty ctx.g.global_using) ctx.m.module_using in
-		let fields = PMap.fold (fun f acc -> PMap.add f.cf_name f acc) fields use_methods in
-		let fields = match fst e_ast with
-			| EConst(String s) when String.length s = 1 ->
-				let cf = mk_field "code" ctx.t.tint e.epos null_pos in
-				cf.cf_doc <- Some "The character code of this character (inlined at compile-time).";
-				cf.cf_kind <- Var { v_read = AccNormal; v_write = AccNever };
-				PMap.add cf.cf_name cf fields
-			| _ ->
-				fields
-		in
-		let fields = PMap.fold (fun f acc -> if Meta.has Meta.NoCompletion f.cf_meta then acc else f :: acc) fields [] in
-		let get_field acc f =
-			List.fold_left (fun acc f ->
-				let kind = match f.cf_kind with Method _ -> Display.FKMethod f.cf_type | Var _ -> Display.FKVar f.cf_type in
-				if f.cf_public then (f.cf_name,kind,f.cf_doc) :: acc else acc
-			) acc (f :: f.cf_overloads)
-		in
-		let fields = List.fold_left get_field [] fields in
-		let fields = try
-			let sl = string_list_of_expr_path_raise e_ast in
-			fields @ get_submodule_fields ctx (List.tl sl,List.hd sl)
-		with Exit | Not_found ->
-			fields
-		in
-		raise (Display.DisplayFields fields)
-
-and maybe_type_against_enum ctx f with_type p =
-	try
-		begin match with_type with
-		| WithType t ->
-			let rec loop stack t = match follow t with
-				| TEnum (en,_) ->
-					en.e_path,en.e_names,TEnumDecl en
-				| TAbstract ({a_impl = Some c} as a,_) when has_meta Meta.Enum a.a_meta ->
-					let fields = ExtList.List.filter_map (fun cf ->
-						if Meta.has Meta.Enum cf.cf_meta then Some cf.cf_name else None
-					) c.cl_ordered_statics in
-					a.a_path,fields,TAbstractDecl a
-				| TAbstract (a,pl) when not (Meta.has Meta.CoreType a.a_meta) ->
-					begin match get_abstract_froms a pl with
-						| [t2] ->
-							if (List.exists (fast_eq t) stack) then raise Exit;
-							loop (t :: stack) t2
-						| _ -> raise Exit
-					end
-				(* We might type against an enum constructor. *)
-				| TFun(_,tr) ->
-					loop stack tr
-				| _ ->
-					raise Exit
-			in
-			let path,fields,mt = loop [] t in
-			let old = ctx.m.curmod.m_types in
-			let restore () = ctx.m.curmod.m_types <- old in
-			ctx.m.curmod.m_types <- ctx.m.curmod.m_types @ [mt];
-			let e = try
-				f()
-			with
-			| Error (Unknown_ident n,_) ->
-				restore();
-				raise_or_display_message ctx (StringError.string_error n fields ("Identifier '" ^ n ^ "' is not part of " ^ s_type_path path)) p;
-				AKExpr (mk (TConst TNull) (mk_mono()) p)
-			| exc ->
-				restore();
-				raise exc;
-			in
-			restore();
-			e
-		| _ ->
-			raise Exit
-		end
-	with Exit ->
-		f()
-
-and type_call ctx e el (with_type:with_type) p =
-	let def () =
-		let e = maybe_type_against_enum ctx (fun () -> type_access ctx (fst e) (snd e) MCall) with_type p in
-		let e = build_call ctx e el with_type p in
-		e
-	in
-	match e, el with
-	| (EConst (Ident "trace"),p) , e :: el ->
-		if Common.defined ctx.com Define.NoTraces then
-			null ctx.t.tvoid p
-		else
-		let mk_to_string_meta e = EMeta((Meta.ToString,[],null_pos),e),pos e in
-		let params = (match el with [] -> [] | _ -> [("customParams",null_pos),(EArrayDecl (List.map mk_to_string_meta el) , p)]) in
-		let infos = mk_infos ctx p params in
-		if (platform ctx.com Js || platform ctx.com Python) && el = [] && has_dce ctx.com then
-			let e = type_expr ctx e Value in
-			let infos = type_expr ctx infos Value in
-			let e = match follow e.etype with
-				| TAbstract({a_impl = Some c},_) when PMap.mem "toString" c.cl_statics ->
-					call_to_string ctx e
-				| _ ->
-					e
-			in
-			let v_trace = alloc_unbound_var "`trace" t_dynamic p in
-			mk (TCall (mk (TLocal v_trace) t_dynamic p,[e;infos])) ctx.t.tvoid p
-		else
-			type_expr ctx (ECall ((EField ((EField ((EConst (Ident "haxe"),p),"Log"),p),"trace"),p),[mk_to_string_meta e;infos]),p) NoValue
-	| (EConst(Ident "callback"),p1),args ->
-		let ecb = try Some (type_ident_raise ctx "callback" p1 MCall) with Not_found -> None in
-		(match ecb with
-		| Some ecb ->
-			build_call ctx ecb args with_type p
-		| None ->
-			display_error ctx "callback syntax has changed to func.bind(args)" p;
-			let e = type_expr ctx e Value in
-			type_bind ctx e args p)
-	| (EField ((EConst (Ident "super"),_),_),_), _ ->
-		def()
-	| (EField (e,"bind"),p), args ->
-		let e = type_expr ctx e Value in
-		(match follow e.etype with
-			| TFun _ -> type_bind ctx e args p
-			| _ -> def ())
-	| (EConst (Ident "$type"),_) , [e] ->
-		let e = type_expr ctx e Value in
-		ctx.com.warning (s_type (print_context()) e.etype) e.epos;
-		let e = Display.Diagnostics.secure_generated_code ctx e in
-		e
-	| (EField(e,"match"),p), [epat] ->
-		let et = type_expr ctx e Value in
-		(match follow et.etype with
-			| TEnum _ ->
-				let e = match_expr ctx e [[epat],None,Some (EConst(Ident "true"),p),p] (Some (Some (EConst(Ident "false"),p),p)) (WithType ctx.t.tbool) p in
-				(* TODO: add that back *)
-(* 				let locals = !get_pattern_locals_ref ctx epat t in
-				PMap.iter (fun _ (_,p) -> display_error ctx "Capture variables are not allowed" p) locals; *)
-				e
-			| _ -> def ())
-	| (EConst (Ident "__unprotect__"),_) , [(EConst (String _),_) as e] ->
-		let e = type_expr ctx e Value in
-		if Common.platform ctx.com Flash then
-			let t = tfun [e.etype] e.etype in
-			let v_unprotect = alloc_unbound_var "__unprotect__" t p in
-			mk (TCall (mk (TLocal v_unprotect) t p,[e])) e.etype e.epos
-		else
-			e
-	| (EDisplay((EConst (Ident "super"),_ as e1),false),_),_ ->
-		handle_display ctx (ECall(e1,el),p) with_type
-	| (EConst (Ident "super"),sp) , el ->
-		if ctx.curfun <> FunConstructor then error "Cannot call super constructor outside class constructor" p;
-		let el, t = (match ctx.curclass.cl_super with
-		| None -> error "Current class does not have a super" p
-		| Some (c,params) ->
-			let ct, f = get_constructor ctx c params p in
-			if (Meta.has Meta.CompilerGenerated f.cf_meta) then display_error ctx (error_msg (No_constructor (TClassDecl c))) p;
-			let el = (match follow ct with
-			| TFun (args,r) ->
-				let el,_,_ = unify_field_call ctx (FInstance(c,params,f)) el args r p false in
-				el
-			| _ ->
-				error "Constructor is not a function" p
-			) in
-			el , TInst (c,params)
-		) in
-		mk (TCall (mk (TConst TSuper) t sp,el)) ctx.t.tvoid p
-	| _ ->
-		def ()
-
-and build_call ctx acc el (with_type:with_type) p =
-	match acc with
-	| AKInline (ethis,f,fmode,t) when Meta.has Meta.Generic f.cf_meta ->
-		type_generic_function ctx (ethis,fmode) el with_type p
-	| AKInline (ethis,f,fmode,t) ->
-		(match follow t with
-			| TFun (args,r) ->
-				let _,_,mk_call = unify_field_call ctx fmode el args r p true in
-				mk_call ethis p
-			| _ ->
-				error (s_type (print_context()) t ^ " cannot be called") p
-		)
-	| AKUsing (et,cl,ef,eparam) when Meta.has Meta.Generic ef.cf_meta ->
-		(match et.eexpr with
-		| TField(ec,fa) ->
-			type_generic_function ctx (ec,fa) el ~using_param:(Some eparam) with_type p
-		| _ -> assert false)
-	| AKUsing (et,cl,ef,eparam) ->
-		begin match ef.cf_kind with
-		| Method MethMacro ->
-			let ethis = type_module_type ctx (TClassDecl cl) None p in
-			let eparam,f = push_this ctx eparam in
-			let e = build_call ctx (AKMacro (ethis,ef)) (eparam :: el) with_type p in
-			f();
-			e
-		| _ ->
-			let t = follow (field_type ctx cl [] ef p) in
-			(* for abstracts we have to apply their parameters to the static function *)
-			let t,tthis = match follow eparam.etype with
-				| TAbstract(a,tl) when Meta.has Meta.Impl ef.cf_meta -> apply_params a.a_params tl t,apply_params a.a_params tl a.a_this
-				| te -> t,te
-			in
-			let params,args,r,eparam = match t with
-				| TFun ((_,_,t1) :: args,r) ->
-					unify ctx tthis t1 eparam.epos;
-					let ef = prepare_using_field ef in
-					begin match unify_call_args ctx el args r p (ef.cf_kind = Method MethInline) (is_forced_inline (Some cl) ef) with
-					| el,TFun(args,r) -> el,args,r,eparam
-					| _ -> assert false
-					end
-				| _ -> assert false
-			in
-			make_call ctx et (eparam :: params) r p
-		end
-	| AKMacro (ethis,cf) ->
-		if ctx.macro_depth > 300 then error "Stack overflow" p;
-		ctx.macro_depth <- ctx.macro_depth + 1;
-		ctx.with_type_stack <- with_type :: ctx.with_type_stack;
-		let ethis_f = ref (fun () -> ()) in
-		let f = (match ethis.eexpr with
-		| TTypeExpr (TClassDecl c) ->
-			(match ctx.g.do_macro ctx MExpr c.cl_path cf.cf_name el p with
-			| None -> (fun() -> type_expr ctx (EConst (Ident "null"),p) Value)
-			| Some (EMeta((Meta.MergeBlock,_,_),(EBlock el,_)),_) -> (fun () -> let e = type_block ctx el with_type p in mk (TMeta((Meta.MergeBlock,[],p), e)) e.etype e.epos)
-			| Some e -> (fun() -> type_expr ctx e with_type))
-		| _ ->
-			(* member-macro call : since we will make a static call, let's found the actual class and not its subclass *)
-			(match follow ethis.etype with
-			| TInst (c,_) ->
-				let rec loop c =
-					if PMap.mem cf.cf_name c.cl_fields then
-						let eparam,f = push_this ctx ethis in
-						ethis_f := f;
-						let e = match ctx.g.do_macro ctx MExpr c.cl_path cf.cf_name (eparam :: el) p with
-							| None -> (fun() -> type_expr ctx (EConst (Ident "null"),p) Value)
-							| Some e -> (fun() -> type_expr ctx e Value)
-						in
-						e
-					else
-						match c.cl_super with
-						| None -> assert false
-						| Some (csup,_) -> loop csup
-				in
-				loop c
-			| _ -> assert false))
-		in
-		ctx.macro_depth <- ctx.macro_depth - 1;
-		ctx.with_type_stack <- List.tl ctx.with_type_stack;
-		let old = ctx.on_error in
-		ctx.on_error <- (fun ctx msg ep ->
-			(* display additional info in the case the error is not part of our original call *)
-			if ep.pfile <> p.pfile || ep.pmax < p.pmin || ep.pmin > p.pmax then begin
-				Typeload.locate_macro_error := false;
-				old ctx msg ep;
-				Typeload.locate_macro_error := true;
-				ctx.com.error "Called from macro here" p;
-			end else
-				old ctx msg ep;
-		);
-		let e = try
-			f()
-		with Error (m,p) ->
-			ctx.on_error <- old;
-			!ethis_f();
-			raise (Fatal_error ((error_msg m),p))
-		in
-		let e = Display.Diagnostics.secure_generated_code ctx e in
-		ctx.on_error <- old;
-		!ethis_f();
-		e
-	| AKNo _ | AKSet _ | AKAccess _ ->
-		ignore(acc_get ctx acc p);
-		assert false
-	| AKExpr e ->
-		let rec loop t = match follow t with
-		| TFun (args,r) ->
-			begin match e.eexpr with
-				| TField(e1,fa) when not (match fa with FEnum _ -> true | _ -> false) ->
-					begin match fa with
-						| FInstance(_,_,cf) | FStatic(_,cf) when Meta.has Meta.Generic cf.cf_meta ->
-							type_generic_function ctx (e1,fa) el with_type p
-						| _ ->
-							let _,_,mk_call = unify_field_call ctx fa el args r p false in
-							mk_call e1 e.epos
-					end
-				| _ ->
-					let el, tfunc = unify_call_args ctx el args r p false false in
-					let r = match tfunc with TFun(_,r) -> r | _ -> assert false in
-					mk (TCall (e,el)) r p
-			end
-		| TAbstract(a,tl) when Meta.has Meta.Callable a.a_meta ->
-			loop (Abstract.get_underlying_type a tl)
-		| TMono _ ->
-			let t = mk_mono() in
-			let el = List.map (fun e -> type_expr ctx e Value) el in
-			unify ctx (tfun (List.map (fun e -> e.etype) el) t) e.etype e.epos;
-			mk (TCall (e,el)) t p
-		| t ->
-			let el = List.map (fun e -> type_expr ctx e Value) el in
-			let t = if t == t_dynamic then
-				t_dynamic
-			else if ctx.untyped then
-				mk_mono()
-			else
-				error (s_type (print_context()) e.etype ^ " cannot be called") e.epos
-			in
-			mk (TCall (e,el)) t p
-		in
-		loop e.etype
-
-(* ---------------------------------------------------------------------- *)
-(* FINALIZATION *)
-
-let get_main ctx types =
-	match ctx.com.main_class with
-	| None -> None
-	| Some cl ->
-		let t = Typeload.load_type_def ctx null_pos { tpackage = fst cl; tname = snd cl; tparams = []; tsub = None } in
-		let fmode, ft, r = (match t with
-		| TEnumDecl _ | TTypeDecl _ | TAbstractDecl _ ->
-			error ("Invalid -main : " ^ s_type_path cl ^ " is not a class") null_pos
-		| TClassDecl c ->
-			try
-				let f = PMap.find "main" c.cl_statics in
-				let t = Type.field_type f in
-				(match follow t with
-				| TFun ([],r) -> FStatic (c,f), t, r
-				| _ -> error ("Invalid -main : " ^ s_type_path cl ^ " has invalid main function") c.cl_pos);
-			with
-				Not_found -> error ("Invalid -main : " ^ s_type_path cl ^ " does not have static function main") c.cl_pos
-		) in
-		let emain = type_type ctx cl null_pos in
-		let main = mk (TCall (mk (TField (emain,fmode)) ft null_pos,[])) r null_pos in
-		(* add haxe.EntryPoint.run() call *)
-		let main = (try
-			let et = List.find (fun t -> t_path t = (["haxe"],"EntryPoint")) types in
-			let ec = (match et with TClassDecl c -> c | _ -> assert false) in
-			let ef = PMap.find "run" ec.cl_statics in
-			let p = null_pos in
-			let et = mk (TTypeExpr et) (TAnon { a_fields = PMap.empty; a_status = ref (Statics ec) }) p in
-			let call = mk (TCall (mk (TField (et,FStatic (ec,ef))) ef.cf_type p,[])) ctx.t.tvoid p in
-			mk (TBlock [main;call]) ctx.t.tvoid p
-		with Not_found ->
-			main
-		) in
-		Some main
-
-let finalize ctx =
-	flush_pass ctx PFinal "final";
-	match ctx.com.callbacks.after_typing with
-		| [] ->
-			()
-		| fl ->
-			let rec loop handled_types =
-				let all_types = Hashtbl.fold (fun _ m acc -> m.m_types @ acc) ctx.g.modules [] in
-				match (List.filter (fun mt -> not (List.memq mt handled_types)) all_types) with
-				| [] ->
-					()
-				| new_types ->
-					List.iter (fun f -> f new_types) fl;
-					flush_pass ctx PFinal "final";
-					loop all_types
-			in
-			loop []
-
-type state =
-	| Generating
-	| Done
-	| NotYet
-
-let generate ctx =
-	let types = ref [] in
-	let states = Hashtbl.create 0 in
-	let state p = try Hashtbl.find states p with Not_found -> NotYet in
-	let statics = ref PMap.empty in
-
-	let rec loop t =
-		let p = t_path t in
-		match state p with
-		| Done -> ()
-		| Generating ->
-			ctx.com.warning ("Warning : maybe loop in static generation of " ^ s_type_path p) (t_infos t).mt_pos;
-		| NotYet ->
-			Hashtbl.add states p Generating;
-			let t = (match t with
-			| TClassDecl c ->
-				walk_class p c;
-				t
-			| TEnumDecl _ | TTypeDecl _ | TAbstractDecl _ ->
-				t
-			) in
-			Hashtbl.replace states p Done;
-			types := t :: !types
-
-	and loop_class p c =
-		if c.cl_path <> p then loop (TClassDecl c)
-
-	and loop_enum p e =
-		if e.e_path <> p then loop (TEnumDecl e)
-
-	and loop_abstract p a =
-		if a.a_path <> p then loop (TAbstractDecl a)
-
-	and walk_static_field p c cf =
-		match cf.cf_expr with
-		| None -> ()
-		| Some e ->
-			if PMap.mem (c.cl_path,cf.cf_name) (!statics) then
-				()
-			else begin
-				statics := PMap.add (c.cl_path,cf.cf_name) () (!statics);
-				walk_expr p e;
-			end
-
-	and walk_expr p e =
-		match e.eexpr with
-		| TTypeExpr t ->
-			(match t with
-			| TClassDecl c -> loop_class p c
-			| TEnumDecl e -> loop_enum p e
-			| TAbstractDecl a -> loop_abstract p a
-			| TTypeDecl _ -> assert false)
-		| TNew (c,_,_) ->
-			iter (walk_expr p) e;
-			loop_class p c;
-			let rec loop c =
-				if PMap.mem (c.cl_path,"new") (!statics) then
-					()
-				else begin
-					statics := PMap.add (c.cl_path,"new") () !statics;
-					(match c.cl_constructor with
-					| Some { cf_expr = Some e } -> walk_expr p e
-					| _ -> ());
-					match c.cl_super with
-					| None -> ()
-					| Some (csup,_) -> loop csup
-				end
-			in
-			loop c
-		| TField(e1,FStatic(c,cf)) ->
-			walk_expr p e1;
-			walk_static_field p c cf;
-		| _ ->
-			iter (walk_expr p) e
-
-	and walk_class p c =
-		(match c.cl_super with None -> () | Some (c,_) -> loop_class p c);
-		List.iter (fun (c,_) -> loop_class p c) c.cl_implements;
-		(match c.cl_init with
-		| None -> ()
-		| Some e -> walk_expr p e);
-		PMap.iter (fun _ f ->
-			match f.cf_expr with
-			| None -> ()
-			| Some e ->
-				match e.eexpr with
-				| TFunction _ -> ()
-				| _ -> walk_expr p e
-		) c.cl_statics
-
-	in
-	let sorted_modules = List.sort (fun m1 m2 -> compare m1.m_path m2.m_path) (Hashtbl.fold (fun _ m acc -> m :: acc) ctx.g.modules []) in
-	List.iter (fun m -> List.iter loop m.m_types) sorted_modules;
-	get_main ctx !types, List.rev !types, sorted_modules
+		type_meta ~mode ctx m e1 with_type p
 
 (* ---------------------------------------------------------------------- *)
 (* TYPER INITIALIZATION *)
@@ -4461,21 +2614,23 @@ let rec create com =
 			module_check_policies = [];
 			delayed = [];
 			debug_delayed = [];
-			delayed_macros = DynArray.create();
 			doinline = com.display.dms_inline && not (Common.defined com Define.NoInline);
 			hook_generate = [];
-			get_build_infos = (fun() -> None);
 			std = null_module;
 			global_using = [];
-			do_inherit = Typeload.on_inherit;
+			complete = false;
+			type_hints = [];
+			do_inherit = MagicTypes.on_inherit;
 			do_create = create;
 			do_macro = MacroContext.type_macro;
-			do_load_module = Typeload.load_module;
+			do_load_module = TypeloadModule.load_module;
+			do_load_type_def = Typeload.load_type_def;
 			do_optimize = Optimizer.reduce_expression;
-			do_build_instance = Typeload.build_instance;
+			do_build_instance = InstanceBuilder.build_instance;
 			do_format_string = format_string;
-			do_finalize = finalize;
-			do_generate = generate;
+			do_finalize = Finalization.finalize;
+			do_generate = Finalization.generate;
+			do_load_core_class = Typeload.load_core_class;
 		};
 		m = {
 			curmod = null_module;
@@ -4486,6 +2641,7 @@ let rec create com =
 			module_imports = [];
 		};
 		is_display_file = false;
+		bypass_accessor = 0;
 		meta = [];
 		this_stack = [];
 		with_type_stack = [];
@@ -4496,6 +2652,7 @@ let rec create com =
 		curfun = FunStatic;
 		in_loop = false;
 		in_display = false;
+		get_build_infos = (fun() -> None);
 		in_macro = Common.defined com Define.Macro;
 		ret = mk_mono();
 		locals = PMap.empty;
@@ -4507,11 +2664,17 @@ let rec create com =
 		vthis = None;
 		in_call_args = false;
 		on_error = (fun ctx msg p -> ctx.com.error msg p);
+		memory_marker = Typecore.memory_marker;
 	} in
 	ctx.g.std <- (try
-		Typeload.load_module ctx ([],"StdTypes") null_pos
+		TypeloadModule.load_module ctx ([],"StdTypes") null_pos
 	with
-		Error (Module_not_found ([],"StdTypes"),_) -> error "Standard library not found" null_pos
+		Error (Module_not_found ([],"StdTypes"),_) ->
+			try
+				let std_path = Sys.getenv "HAXE_STD_PATH" in
+				error ("Standard library not found. Please check your `HAXE_STD_PATH` environment variable (current value: \"" ^ std_path ^ "\")") null_pos
+			with Not_found ->
+				error "Standard library not found. You may need to set your `HAXE_STD_PATH` environment variable" null_pos
 	);
 	(* We always want core types to be available so we add them as default imports (issue #1904 and #3131). *)
 	ctx.m.module_types <- List.map (fun t -> t,null_pos) ctx.g.std.m_types;
@@ -4524,35 +2687,31 @@ let rec create com =
 			| "Int" -> ctx.t.tint <- TAbstract (a,[])
 			| "Bool" -> ctx.t.tbool <- TAbstract (a,[])
 			| "Dynamic" -> t_dynamic_def := TAbstract(a,List.map snd a.a_params);
-			| _ -> ());
-		| TEnumDecl e ->
-			()
-		| TClassDecl c ->
-			()
-		| TTypeDecl td ->
-			(match snd td.t_path with
 			| "Null" ->
 				let mk_null t =
 					try
-						if not (is_null ~no_lazy:true t) then TType (td,[t]) else t
+						if not (is_null ~no_lazy:true t || is_explicit_null t) then TAbstract (a,[t]) else t
 					with Exit ->
 						(* don't force lazy evaluation *)
-						let r = ref (fun() -> assert false) in
-						r := (fun() ->
-							let t = (if not (is_null t) then TType (td,[t]) else t) in
-							r := (fun() -> t);
+						let r = ref (lazy_available t_dynamic) in
+						r := lazy_wait (fun() ->
+							let t = (if not (is_null t) then TAbstract (a,[t]) else t) in
+							r := lazy_available t;
 							t
 						);
 						TLazy r
 				in
 				ctx.t.tnull <- mk_null;
-			| _ -> ());
+			| _ -> ())
+		| TEnumDecl _ | TClassDecl _ | TTypeDecl _ ->
+			()
 	) ctx.g.std.m_types;
-	let m = Typeload.load_module ctx ([],"String") null_pos in
-	(match m.m_types with
-	| [TClassDecl c] -> ctx.t.tstring <- TInst (c,[])
-	| _ -> assert false);
-	let m = Typeload.load_module ctx ([],"Array") null_pos in
+	let m = TypeloadModule.load_module ctx ([],"String") null_pos in
+	List.iter (fun mt -> match mt with
+		| TClassDecl c -> ctx.t.tstring <- TInst (c,[])
+		| _ -> ()
+	) m.m_types;
+	let m = TypeloadModule.load_module ctx ([],"Array") null_pos in
 	(try
 		List.iter (fun t -> (
 			match t with
@@ -4563,24 +2722,22 @@ let rec create com =
 		)) m.m_types;
 		assert false
 	with Exit -> ());
-	let m = Typeload.load_module ctx (["haxe"],"EnumTools") null_pos in
+	let m = TypeloadModule.load_module ctx (["haxe"],"EnumTools") null_pos in
 	(match m.m_types with
 	| [TClassDecl c1;TClassDecl c2] -> ctx.g.global_using <- (c1,c1.cl_pos) :: (c2,c2.cl_pos) :: ctx.g.global_using
 	| [TClassDecl c1] ->
-		let m = Typeload.load_module ctx (["haxe"],"EnumValueTools") null_pos in
+		let m = TypeloadModule.load_module ctx (["haxe"],"EnumWithType.valueTools") null_pos in
 		(match m.m_types with
 		| [TClassDecl c2 ] -> ctx.g.global_using <- (c1,c1.cl_pos) :: (c2,c2.cl_pos) :: ctx.g.global_using
 		| _ -> assert false);
 	| _ -> assert false);
+	ctx.g.complete <- true;
 	ctx
 
 ;;
 unify_min_ref := unify_min;
+unify_min_for_type_source_ref := unify_min_for_type_source;
 make_call_ref := make_call;
-get_constructor_ref := get_constructor;
-cast_or_unify_ref := AbstractCast.cast_or_unify_raise;
-type_module_type_ref := type_module_type;
-find_array_access_raise_ref := AbstractCast.find_array_access_raise;
 build_call_ref := build_call;
-merge_core_doc_ref := merge_core_doc;
-MacroContext.unify_call_args_ref := unify_call_args
\ No newline at end of file
+type_call_target_ref := type_call_target;
+type_block_ref := type_block
diff --git a/src/typing/typerBase.ml b/src/typing/typerBase.ml
new file mode 100644
index 0000000000000000000000000000000000000000..9ab8bce2c337600f1dad6f67f46f0a1d0305cd7c
--- /dev/null
+++ b/src/typing/typerBase.ml
@@ -0,0 +1,212 @@
+open Globals
+open Ast
+open Type
+open Typecore
+open Error
+
+type access_kind =
+	| AKNo of string
+	| AKExpr of texpr
+	| AKSet of texpr * t * tclass_field
+	| AKInline of texpr * tclass_field * tfield_access * t
+	| AKMacro of texpr * tclass_field
+	| AKUsing of texpr * tclass * tclass_field * texpr * bool (* forced inline *)
+	| AKAccess of tabstract * tparams * tclass * texpr * texpr
+	| AKFieldSet of texpr * texpr * string * t
+
+type object_decl_kind =
+	| ODKWithStructure of tanon
+	| ODKWithClass of tclass * tparams
+	| ODKPlain
+
+let build_call_ref : (typer -> access_kind -> expr list -> WithType.t -> pos -> texpr) ref = ref (fun _ _ _ _ _ -> assert false)
+let type_call_target_ref : (typer -> expr -> WithType.t -> bool -> pos -> access_kind) ref = ref (fun _ _ _ _ _ -> assert false)
+
+let relative_path ctx file =
+	let slashes path = String.concat "/" (ExtString.String.nsplit path "\\") in
+	let fpath = slashes (Path.get_full_path file) in
+	let fpath_lower = String.lowercase fpath in
+	let flen = String.length fpath_lower in
+	let rec loop = function
+		| [] -> file
+		| path :: l ->
+			let spath = String.lowercase (slashes path) in
+			let slen = String.length spath in
+			if slen > 0 && slen < flen && String.sub fpath_lower 0 slen = spath then String.sub fpath slen (flen - slen) else loop l
+	in
+	loop ctx.com.Common.class_path
+
+let mk_infos ctx p params =
+	let file = if ctx.in_macro then p.pfile else if Common.defined ctx.com Define.AbsolutePath then Path.get_full_path p.pfile else relative_path ctx p.pfile in
+	(EObjectDecl (
+		(("fileName",null_pos,NoQuotes) , (EConst (String(file,SDoubleQuotes)) , p)) ::
+		(("lineNumber",null_pos,NoQuotes) , (EConst (Int (string_of_int (Lexer.get_error_line p))),p)) ::
+		(("className",null_pos,NoQuotes) , (EConst (String (s_type_path ctx.curclass.cl_path,SDoubleQuotes)),p)) ::
+		if ctx.curfield.cf_name = "" then
+			params
+		else
+			(("methodName",null_pos,NoQuotes), (EConst (String (ctx.curfield.cf_name,SDoubleQuotes)),p)) :: params
+	) ,p)
+
+let rec is_pos_infos = function
+	| TMono r ->
+		(match !r with
+		| Some t -> is_pos_infos t
+		| _ -> false)
+	| TLazy f ->
+		is_pos_infos (lazy_type f)
+	| TType ({ t_path = ["haxe"] , "PosInfos" },[]) ->
+		true
+	| TType (t,tl) ->
+		is_pos_infos (apply_params t.t_params tl t.t_type)
+	| TAbstract({a_path=[],"Null"},[t]) ->
+		is_pos_infos t
+	| _ ->
+		false
+
+let get_this ctx p =
+	match ctx.curfun with
+	| FunStatic ->
+		error "Cannot access this from a static function" p
+	| FunMemberClassLocal | FunMemberAbstractLocal ->
+		let v = match ctx.vthis with
+			| None ->
+				let v = if ctx.curfun = FunMemberAbstractLocal then
+					PMap.find "this" ctx.locals
+				else
+					add_local ctx VGenerated "`this" ctx.tthis p
+				in
+				ctx.vthis <- Some v;
+				v
+			| Some v ->
+				ctx.locals <- PMap.add v.v_name v ctx.locals;
+				v
+		in
+		mk (TLocal v) ctx.tthis p
+	| FunMemberAbstract ->
+		let v = (try PMap.find "this" ctx.locals with Not_found -> assert false) in
+		mk (TLocal v) v.v_type p
+	| FunConstructor | FunMember ->
+		mk (TConst TThis) ctx.tthis p
+
+let assign_to_this_is_allowed ctx =
+	match ctx.curclass.cl_kind with
+		| KAbstractImpl _ ->
+			(match ctx.curfield.cf_kind with
+				| Method MethInline -> true
+				| Method _ when ctx.curfield.cf_name = "_new" -> true
+				| _ -> false
+			)
+		| _ -> false
+
+let rec type_module_type ctx t tparams p =
+	match t with
+	| TClassDecl {cl_kind = KGenericBuild _} ->
+		let _,_,f = InstanceBuilder.build_instance ctx t p in
+		let t = f (match tparams with None -> [] | Some tl -> tl) in
+		let mt = try
+			module_type_of_type t
+		with Exit ->
+			if follow t == t_dynamic then Typeload.load_type_def ctx p { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None }
+			else error "Invalid module type" p
+		in
+		type_module_type ctx mt None p
+	| TClassDecl c ->
+		let t_tmp = class_module_type c in
+		mk (TTypeExpr (TClassDecl c)) (TType (t_tmp,[])) p
+	| TEnumDecl e ->
+		let types = (match tparams with None -> List.map (fun _ -> mk_mono()) e.e_params | Some l -> l) in
+		mk (TTypeExpr (TEnumDecl e)) (TType (e.e_type,types)) p
+	| TTypeDecl s ->
+		let t = apply_params s.t_params (List.map (fun _ -> mk_mono()) s.t_params) s.t_type in
+		if not (Common.defined ctx.com Define.NoDeprecationWarnings) then
+			DeprecationCheck.check_typedef ctx.com s p;
+		(match follow t with
+		| TEnum (e,params) ->
+			type_module_type ctx (TEnumDecl e) (Some params) p
+		| TInst (c,params) ->
+			type_module_type ctx (TClassDecl c) (Some params) p
+		| TAbstract (a,params) ->
+			type_module_type ctx (TAbstractDecl a) (Some params) p
+		| _ ->
+			error (s_type_path s.t_path ^ " is not a value") p)
+	| TAbstractDecl { a_impl = Some c } ->
+		type_module_type ctx (TClassDecl c) tparams p
+	| TAbstractDecl a ->
+		if not (Meta.has Meta.RuntimeValue a.a_meta) then error (s_type_path a.a_path ^ " is not a value") p;
+		let t_tmp = abstract_module_type a [] in
+		mk (TTypeExpr (TAbstractDecl a)) (TType (t_tmp,[])) p
+
+let type_type ctx tpath p =
+	type_module_type ctx (Typeload.load_type_def ctx p { tpackage = fst tpath; tname = snd tpath; tparams = []; tsub = None }) None p
+
+let s_access_kind acc =
+	let st = s_type (print_context()) in
+	let se = s_expr_pretty true "" false st in
+	let sfa = s_field_access st in
+	match acc with
+	| AKNo s -> "AKNo " ^ s
+	| AKExpr e -> "AKExpr " ^ (se e)
+	| AKSet(e,t,cf) -> Printf.sprintf "AKSet(%s, %s, %s)" (se e) (st t) cf.cf_name
+	| AKInline(e,cf,fa,t) -> Printf.sprintf "AKInline(%s, %s, %s, %s)" (se e) cf.cf_name (sfa fa) (st t)
+	| AKMacro(e,cf) -> Printf.sprintf "AKMacro(%s, %s)" (se e) cf.cf_name
+	| AKUsing(e1,c,cf,e2,b) -> Printf.sprintf "AKUsing(%s, %s, %s, %s, %b)" (se e1) (s_type_path c.cl_path) cf.cf_name (se e2) b
+	| AKAccess(a,tl,c,e1,e2) -> Printf.sprintf "AKAccess(%s, [%s], %s, %s, %s)" (s_type_path a.a_path) (String.concat ", " (List.map st tl)) (s_type_path c.cl_path) (se e1) (se e2)
+	| AKFieldSet(_) -> ""
+
+let get_constructible_constraint ctx tl p =
+	let extract_function t = match follow t with
+		| TFun(tl,tr) -> tl,tr
+		| _ -> error "Constructible type parameter should be function" p
+	in
+	let rec loop tl = match tl with
+		| [] -> None
+		| t :: tl ->
+			begin match follow t with
+			| TAnon a ->
+				begin try
+					Some (extract_function (PMap.find "new" a.a_fields).cf_type);
+				with Not_found ->
+					loop tl
+				end;
+			| TAbstract({a_path = ["haxe"],"Constructible"},[t1]) ->
+				Some (extract_function t1)
+			| TInst({cl_kind = KTypeParameter tl1},_) ->
+				begin match loop tl1 with
+				| None -> loop tl
+				| Some _ as t -> t
+				end
+			| _ ->
+				loop tl
+			end
+	in
+	loop tl
+
+let unify_static_extension ctx e t p =
+	let multitype_involed t1 t2 =
+		let check t = match follow t with
+			| TAbstract(a,_) when Meta.has Meta.MultiType a.a_meta -> true
+			| _ -> false
+		in
+		check t1 || check t2
+	in
+	if multitype_involed e.etype t then
+		AbstractCast.cast_or_unify_raise ctx t e p
+	else begin
+		Type.unify e.etype t;
+		e
+	end
+
+let get_abstract_froms a pl =
+	let l = List.map (apply_params a.a_params pl) a.a_from in
+	List.fold_left (fun acc (t,f) ->
+		match follow (Type.field_type f) with
+		| TFun ([_,_,v],t) ->
+			(try
+				ignore(type_eq EqStrict t (TAbstract(a,List.map duplicate pl))); (* unify fields monomorphs *)
+				v :: acc
+			with Unify_error _ ->
+				acc)
+		| _ ->
+			acc
+	) l a.a_from_field
\ No newline at end of file
diff --git a/src/typing/typerDisplay.ml b/src/typing/typerDisplay.ml
new file mode 100644
index 0000000000000000000000000000000000000000..39674ed3bf718c6af6a316d31285f35ede3e0002
--- /dev/null
+++ b/src/typing/typerDisplay.ml
@@ -0,0 +1,633 @@
+open Globals
+open Ast
+open DisplayTypes
+open DisplayMode
+open CompletionResultKind
+open CompletionItem
+open CompletionModuleKind
+open CompletionModuleType
+open ClassFieldOrigin
+open DisplayException
+open DisplayEmitter
+open Display
+open Common
+open Type
+open Typecore
+open TyperBase
+open Fields
+open Calls
+open Error
+
+let convert_function_signature ctx values (args,ret) = match CompletionType.from_type (get_import_status ctx) ~values (TFun(args,ret)) with
+	| CompletionType.CTFunction ctf -> ((args,ret),ctf)
+	| _ -> assert false
+
+let completion_item_of_expr ctx e =
+	let retype e s t =
+		try
+			let e' = type_expr ctx (EConst(Ident s),null_pos) (WithType.with_type t) in
+			Texpr.equal e e'
+		with _ ->
+			false
+	in
+	let tpair ?(values=PMap.empty) t =
+		let ct = CompletionType.from_type (get_import_status ctx) ~values t in
+		(t,ct)
+	in
+	let of_field e origin cf scope make_ci =
+		let is_qualified = retype e cf.cf_name e.etype in
+		make_ci (CompletionClassField.make cf scope origin is_qualified) (tpair ~values:(get_value_meta cf.cf_meta) e.etype)
+	in
+	let of_enum_field e origin ef =
+		let is_qualified = retype e ef.ef_name e.etype in
+		make_ci_enum_field (CompletionEnumField.make ef origin is_qualified) (tpair e.etype)
+	in
+	let itexpr e =
+		let t = tpair e.etype in
+		make_ci_expr e t
+	in
+	let rec loop e = match e.eexpr with
+		| TLocal v | TVar(v,_) -> make_ci_local v (tpair ~values:(get_value_meta v.v_meta) v.v_type)
+		| TField(e1,FStatic(c,cf)) ->
+			Display.merge_core_doc ctx (TClassDecl c);
+			let decl = decl_of_class c in
+			let origin = match c.cl_kind,e1.eexpr with
+				| KAbstractImpl _,_ when Meta.has Meta.Impl cf.cf_meta -> Self decl
+				| _,TMeta((Meta.StaticExtension,_,_),_) -> StaticExtension decl
+				| _ -> Self decl
+			in
+			let make_ci = match c.cl_kind with
+				| KAbstractImpl a when Meta.has Meta.Enum cf.cf_meta -> make_ci_enum_abstract_field a
+				| _ -> make_ci_class_field
+			in
+			of_field e origin cf CFSStatic make_ci
+		| TField(e1,(FInstance(c,_,cf) | FClosure(Some(c,_),cf))) ->
+			Display.merge_core_doc ctx (TClassDecl c);
+			let origin = match follow e1.etype with
+			| TInst(c',_) when c != c' ->
+				Parent (TClassDecl c)
+			| _ ->
+				Self (TClassDecl c)
+			in
+			of_field e origin cf CFSMember make_ci_class_field
+		| TField(_,FEnum(en,ef)) -> of_enum_field e (Self (TEnumDecl en)) ef
+		| TField(e1,(FAnon cf | FClosure(None,cf))) ->
+			begin match follow e1.etype with
+				| TAnon an ->
+					let origin = match e1.etype with
+						| TType(td,_) -> Self (TTypeDecl td)
+						| _ -> AnonymousStructure an
+					in
+					of_field e origin cf CFSMember make_ci_class_field
+				| _ -> itexpr e
+			end
+		| TTypeExpr (TClassDecl {cl_kind = KAbstractImpl a}) ->
+			Display.merge_core_doc ctx (TAbstractDecl a);
+			let t = TType(abstract_module_type a (List.map snd a.a_params),[]) in
+			let t = tpair t in
+			make_ci_type (CompletionModuleType.of_module_type (TAbstractDecl a)) ImportStatus.Imported (Some t)
+		| TTypeExpr mt ->
+			Display.merge_core_doc ctx mt;
+			let t = tpair e.etype in
+			make_ci_type (CompletionModuleType.of_module_type mt) ImportStatus.Imported (Some t) (* TODO *)
+		| TConst (TThis | TSuper) -> itexpr e (* TODO *)
+		| TConst(ct) -> make_ci_literal (s_const ct) (tpair e.etype)
+		| TObjectDecl _ ->
+			begin match follow e.etype with
+				| TAnon an -> make_ci_anon an (tpair e.etype)
+				| _ -> itexpr e
+			end
+		| TNew(c,tl,_) ->
+			Display.merge_core_doc ctx (TClassDecl c);
+			(* begin match fst e_ast with
+			| EConst (Regexp (r,opt)) ->
+				let present,absent = List.partition (String.contains opt) ['g';'i';'m';'s';'u'] in
+				let doc flag desc = Printf.sprintf "* %s: %s" (String.make 1 flag) desc in
+				let f c = match c with
+					| 'g' -> doc c "global split and replace"
+					| 'i' -> doc c "case insensitive matching"
+					| 'm' -> doc c "multiline matching"
+					| 's' -> doc c "dot also match newlines"
+					| 'u' -> doc c "use UTF-8 matching"
+					| _ -> assert false
+				in
+				let present = List.map f present in
+				let present = match present with [] -> [] | _ -> "\n\nActive flags:\n\n" :: present in
+				let absent = List.map f absent in
+				let absent = match absent with [] -> [] | _ -> "\n\nInactive flags:\n\n" :: absent in
+				(TInst(c,tl)),Some ("Regular expression\n\n" ^ (String.concat "\n" (present @ absent)))
+			| _ -> *)
+				let t,cf = get_constructor ctx c tl e.epos in
+				let t = match follow t with
+					| TFun(args,_) -> TFun(args,TInst(c,tl))
+					| _ -> t
+				in
+				make_ci_class_field (CompletionClassField.make cf CFSConstructor (Self (decl_of_class c)) true) (tpair ~values:(get_value_meta cf.cf_meta) t)
+			(* end *)
+		| TCall({eexpr = TConst TSuper; etype = t} as e1,_) ->
+			itexpr e1 (* TODO *)
+		| TCast(e1,_) -> loop {e1 with etype = e.etype}
+		| TParenthesis e1 | TMeta(_,e1) -> loop e1
+		| _ -> itexpr e
+	in
+	loop e
+
+let get_expected_type ctx with_type =
+	let t = match with_type with
+		| WithType.WithType(t,_) -> Some t
+		| _ -> None
+	in
+	match t with
+		| None -> None
+		| Some t ->
+			let from_type = CompletionType.from_type (get_import_status ctx) in
+			Some (from_type t,from_type (follow t))
+
+let raise_toplevel ctx dk with_type (subject,psubject) =
+	let expected_type = get_expected_type ctx with_type in
+	DisplayToplevel.collect_and_raise ctx (match dk with DKPattern _ -> TKPattern psubject | _ -> TKExpr psubject) with_type (CRToplevel expected_type) (subject,psubject) psubject
+
+let display_dollar_type ctx p make_type =
+	let mono = mk_mono() in
+	let doc = Some "Outputs type of argument as a warning and uses argument as value" in
+	let arg = ["expression",false,mono] in
+	begin match ctx.com.display.dms_kind with
+	| DMSignature ->
+		raise_signatures [(convert_function_signature ctx PMap.empty (arg,mono),doc)] 0 0 SKCall
+	| DMHover ->
+		let t = TFun(arg,mono) in
+		raise_hover (make_ci_expr (mk (TIdent "trace") t p) (make_type t)) (Some (WithType.named_argument "expression")) p
+	| DMDefinition | DMTypeDefinition ->
+		raise_positions []
+	| _ ->
+		error "Unsupported method" p
+	end
+
+let rec handle_signature_display ctx e_ast with_type =
+	ctx.in_display <- true;
+	let p = pos e_ast in
+	let handle_call tl el p0 =
+		let rec follow_with_callable (t,doc,values) = match follow t with
+			| TAbstract(a,tl) when Meta.has Meta.Callable a.a_meta -> follow_with_callable (Abstract.get_underlying_type a tl,doc,values)
+			| TFun(args,ret) -> ((args,ret),doc,values)
+			| _ -> error ("Not a callable type: " ^ (s_type (print_context()) t)) p
+		in
+		let tl = List.map follow_with_callable tl in
+		let rec loop i acc el = match el with
+			| e :: el ->
+				begin match fst e with
+				| EDisplay(e1,DKMarked) -> i,List.rev (e1 :: acc) @ el
+				| _ -> loop (i + 1) (e :: acc) el
+				end
+			| [] ->
+				0,List.rev acc
+		in
+		let display_arg,el = loop 0 [] el in
+		(* If our display position exceeds the argument number we add a null expression in order to make
+		unify_call_args error out. *)
+		let el = if el <> [] && display_arg >= List.length el then el @ [EConst (Ident "null"),null_pos] else el in
+		let rec loop acc tl = match tl with
+			| (t,doc,values) :: tl ->
+				let keep (args,r) =
+					begin try
+						let _ = unify_call_args' ctx el args r p false false in
+						true
+					with
+					| Error(Call_error (Not_enough_arguments _),_) -> true
+					| _ -> false
+					end
+				in
+				loop (if keep t then (t,doc,values) :: acc else acc) tl
+			| [] ->
+				acc
+		in
+		let overloads = match loop [] tl with [] -> tl | tl -> tl in
+		let overloads = List.map (fun (t,doc,values) -> (convert_function_signature ctx values t,doc)) overloads in
+		raise_signatures overloads 0 (* ? *) display_arg SKCall
+	in
+	let find_constructor_types t = match follow t with
+		| TInst ({cl_kind = KTypeParameter tl} as c,_) ->
+			let rec loop tl = match tl with
+				| [] -> raise_error (No_constructor (TClassDecl c)) p
+				| t :: tl -> match follow t with
+					| TAbstract({a_path = ["haxe"],"Constructible"},[t]) -> t
+					| _ -> loop tl
+			in
+			[loop tl,None,PMap.empty]
+		| TInst (c,tl) | TAbstract({a_impl = Some c},tl) ->
+			Display.merge_core_doc ctx (TClassDecl c);
+			let ct,cf = get_constructor ctx c tl p in
+			let tl = (ct,cf.cf_doc,get_value_meta cf.cf_meta) :: List.rev_map (fun cf' -> cf'.cf_type,cf.cf_doc,get_value_meta cf'.cf_meta) cf.cf_overloads in
+			tl
+		| _ ->
+			[]
+	in
+	match fst e_ast with
+		| ECall(e1,el) ->
+			let def () =
+				try
+					acc_get ctx (!type_call_target_ref ctx e1 with_type false (pos e1)) (pos e1)
+				with
+				| Error (Unknown_ident "trace",_) ->
+					let e = expr_of_type_path (["haxe";"Log"],"trace") p in
+					type_expr ctx e WithType.value
+				| Error (Unknown_ident "$type",p) ->
+					display_dollar_type ctx p (fun t -> t,(CompletionType.from_type (get_import_status ctx) t))
+			in
+			let e1 = match e1 with
+				| (EField (e,"bind"),p) ->
+					let e = type_expr ctx e WithType.value in
+					(match follow e.etype with
+						| TFun signature -> e
+						| _ -> def ())
+				| _ ->	def()
+			in
+			let tl = match e1.eexpr with
+				| TField(_,fa) ->
+					begin match extract_field fa with
+						| Some cf -> (e1.etype,cf.cf_doc,get_value_meta cf.cf_meta) :: List.rev_map (fun cf' -> cf'.cf_type,cf.cf_doc,get_value_meta cf'.cf_meta) cf.cf_overloads
+						| None -> [e1.etype,None,PMap.empty]
+					end
+				| TConst TSuper ->
+					find_constructor_types e1.etype
+				| TLocal v ->
+					[e1.etype,None,get_value_meta v.v_meta]
+				| _ -> [e1.etype,None,PMap.empty]
+			in
+			handle_call tl el e1.epos
+		| ENew(tpath,el) ->
+			let t = Typeload.load_instance ctx tpath true in
+			handle_call (find_constructor_types t) el (pos tpath)
+		| EArray(e1,e2) ->
+			let e1 = type_expr ctx e1 WithType.value in
+			begin match follow e1.etype with
+			| TInst({cl_path=([],"Array")},[t]) ->
+				let res = convert_function_signature ctx PMap.empty (["index",false,ctx.t.tint],t) in
+				raise_signatures [res,Some "The array index"] 0 0 SKCall
+			| TAbstract(a,tl) ->
+				(match a.a_impl with Some c -> ignore(c.cl_build()) | _ -> ());
+				let sigs = ExtList.List.filter_map (fun cf -> match follow cf.cf_type with
+					| TFun(_ :: args,r) ->
+						if ExtType.is_void (follow r) && (match with_type with WithType.NoValue -> false | _ -> true) then
+							None
+						else begin
+							let map = apply_params a.a_params tl in
+							let tl = List.map (fun (n,o,t) -> n,o,map t) args in
+							let r = map r in
+							Some (convert_function_signature ctx PMap.empty (tl,r),cf.cf_doc)
+						end
+					| _ ->
+						None
+				) a.a_array in
+				raise_signatures sigs 0 0 SKArrayAccess
+			| _ ->
+				raise_signatures [] 0 0 SKArrayAccess
+			end
+		| _ -> error "Call expected" p
+
+and display_expr ctx e_ast e dk with_type p =
+	let get_super_constructor () = match ctx.curclass.cl_super with
+		| None -> error "Current class does not have a super" p
+		| Some (c,params) ->
+			let _, f = get_constructor ctx c params p in
+			f
+	in
+	match ctx.com.display.dms_kind with
+	| DMResolve _ | DMPackage ->
+		assert false
+	| DMSignature ->
+		handle_signature_display ctx e_ast with_type
+	| DMHover ->
+		let item = completion_item_of_expr ctx e in
+		raise_hover item (Some with_type) e.epos
+	| DMUsage _ ->
+		let rec loop e = match e.eexpr with
+		| TField(_,FEnum(_,ef)) ->
+			Display.ReferencePosition.set (ef.ef_name,ef.ef_name_pos,KEnumField);
+		| TField(_,(FAnon cf | FInstance (_,_,cf) | FStatic (_,cf) | FClosure (_,cf))) ->
+			Display.ReferencePosition.set (cf.cf_name,cf.cf_name_pos,KClassField);
+		| TLocal v | TVar(v,_) ->
+			Display.ReferencePosition.set (v.v_name,v.v_pos,KVar);
+		| TTypeExpr mt ->
+			let ti = t_infos mt in
+			Display.ReferencePosition.set (snd ti.mt_path,ti.mt_name_pos,KModuleType);
+		| TNew(c,tl,_) ->
+			begin try
+				let _,cf = get_constructor ctx c tl p in
+				Display.ReferencePosition.set (snd c.cl_path,cf.cf_name_pos,KConstructor);
+			with Not_found ->
+				()
+			end
+		| TCall({eexpr = TConst TSuper},_) ->
+			begin try
+				let cf = get_super_constructor() in
+				Display.ReferencePosition.set (cf.cf_name,cf.cf_name_pos,KClassField);
+			with Not_found ->
+				()
+			end
+		| TConst TSuper ->
+			begin match ctx.curclass.cl_super with
+				| None -> ()
+				| Some (c,_) -> Display.ReferencePosition.set (snd c.cl_path,c.cl_name_pos,KModuleType);
+			end
+		| TCall(e1,_) ->
+			loop e1
+		| _ ->
+			()
+		in
+		loop e;
+		e
+	| DMDefinition ->
+		let rec loop e = match e.eexpr with
+		| TField(_,FEnum(_,ef)) -> [ef.ef_name_pos]
+		| TField(_,(FStatic (c,cf))) when Meta.has Meta.CoreApi c.cl_meta ->
+			let c' = ctx.g.do_load_core_class ctx c in
+			cf.cf_name_pos :: (try [(PMap.find cf.cf_name c'.cl_statics).cf_name_pos] with Not_found -> [])
+		| TField(_,(FInstance (c,tl,cf) | FClosure (Some(c,tl),cf))) when Meta.has Meta.CoreApi c.cl_meta ->
+			let c' = ctx.g.do_load_core_class ctx c in
+			let l = try
+				let _,_,cf = Type.class_field c' tl cf.cf_name in
+				[cf.cf_name_pos]
+			with Not_found ->
+				[]
+			in
+			cf.cf_name_pos :: l
+		| TField(_,(FAnon cf | FInstance (_,_,cf) | FStatic (_,cf) | FClosure (_,cf))) -> [cf.cf_name_pos]
+		| TLocal v | TVar(v,_) -> [v.v_pos]
+		| TTypeExpr (TClassDecl c) when Meta.has Meta.CoreApi c.cl_meta ->
+			let c' = ctx.g.do_load_core_class ctx c in
+			[c.cl_name_pos;c'.cl_name_pos]
+		| TTypeExpr mt -> [(t_infos mt).mt_name_pos]
+		| TNew(c,tl,_) ->
+			begin try
+				let _,cf = get_constructor ctx c tl p in
+				if Meta.has Meta.CoreApi c.cl_meta then begin
+					let c' = ctx.g.do_load_core_class ctx c in
+					begin match c'.cl_constructor with
+					| Some cf' -> [cf.cf_name_pos;cf'.cf_name_pos]
+					| None -> [cf.cf_name_pos]
+					end
+				end else
+					[cf.cf_name_pos]
+			with Not_found ->
+				[]
+			end
+		| TCall({eexpr = TConst TSuper},_) ->
+			begin try
+				let cf = get_super_constructor() in
+				[cf.cf_name_pos]
+			with Not_found ->
+				[]
+			end
+		| TConst TSuper ->
+			begin match ctx.curclass.cl_super with
+				| None -> []
+				| Some (c,_) -> [c.cl_name_pos]
+			end
+		| TCall(e1,_) ->
+			loop e1
+		| _ ->
+			[]
+		in
+		let pl = loop e in
+		raise_positions pl
+	| DMTypeDefinition ->
+		raise_position_of_type e.etype
+	| DMDefault when not (!Parser.had_resume)->
+		let display_fields e_ast e1 so =
+			let l = match so with None -> 0 | Some s -> String.length s in
+			let fields = DisplayFields.collect ctx e_ast e1 dk with_type p in
+			let item = completion_item_of_expr ctx e1 in
+			raise_fields fields (CRField(item,e1.epos,None,None)) (make_subject so ~start_pos:(Some (pos e_ast)) {e.epos with pmin = e.epos.pmax - l;})
+		in
+		begin match fst e_ast,e.eexpr with
+			| EField(e1,s),TField(e2,_) ->
+				display_fields e1 e2 (Some s)
+			| EObjectDecl [(name,pn,_),(EConst (Ident "null"),pe)],_ when pe.pmin = -1 ->
+				(* This is what the parser emits for #8651. Bit of a dodgy heuristic but should be fine. *)
+				raise_toplevel ctx dk with_type (name,pn)
+			| _ ->
+				if dk = DKDot then display_fields e_ast e None
+				else begin
+					let name = try String.concat "." (string_list_of_expr_path_raise e_ast) with Exit -> "" in
+					let name = if name = "null" then "" else name in
+					let p = pos e_ast in
+					let p = if name <> "" then p else (DisplayPosition.display_position#with_pos p) in
+					raise_toplevel ctx dk with_type (name,p)
+				end
+		end
+	| DMDefault | DMNone | DMModuleSymbols _ | DMDiagnostics _ | DMStatistics ->
+		let fields = DisplayFields.collect ctx e_ast e dk with_type p in
+		let item = completion_item_of_expr ctx e in
+		let iterator = try
+			let it = (ForLoop.IterationKind.of_texpr ~resume:true ctx e (fun _ -> false) e.epos) in
+			match follow it.it_type with
+				| TDynamic _ ->  None
+				| t -> Some t
+			with Error _ | Not_found ->
+				None
+		in
+		let keyValueIterator =
+			try begin
+				let _,pt = ForLoop.IterationKind.check_iterator ~resume:true ctx "keyValueIterator" e e.epos in
+				match follow pt with
+					| TAnon a ->
+						let key = PMap.find "key" a.a_fields in
+						let value = PMap.find "value" a.a_fields in
+						Some (key.cf_type,value.cf_type)
+					| _ ->
+						None
+			end with Error _ | Not_found ->
+				None
+		in
+		raise_fields fields (CRField(item,e.epos,iterator,keyValueIterator)) (make_subject None (DisplayPosition.display_position#with_pos p))
+
+let handle_structure_display ctx e fields origin =
+	let p = pos e in
+	let fields = PMap.foldi (fun _ cf acc -> cf :: acc) fields [] in
+	let fields = List.sort (fun cf1 cf2 -> -compare cf1.cf_pos.pmin cf2.cf_pos.pmin) fields in
+	let tpair ?(values=PMap.empty) t =
+		let ct = CompletionType.from_type (get_import_status ctx) ~values t in
+		(t,ct)
+	in
+	let make_field_item cf =
+		make_ci_class_field (CompletionClassField.make cf CFSMember origin true) (tpair ~values:(get_value_meta cf.cf_meta) cf.cf_type)
+	in
+	match fst e with
+	| EObjectDecl fl ->
+		let fields = ref fields in
+		let rec loop subj fl = match fl with
+			| [] -> subj
+			| ((n,p,_),_) :: fl ->
+				let subj = if DisplayPosition.display_position#enclosed_in p then
+					Some(n,p)
+				else begin
+					fields := List.filter (fun cf -> cf.cf_name <> n) !fields;
+					subj
+				end in
+				loop subj fl
+		in
+		let subj = loop None fl in
+		let name,pinsert = match subj with
+			| None -> None,DisplayPosition.display_position#with_pos (pos e)
+			| Some(name,p) -> Some name,p
+		in
+		let fields = List.map make_field_item !fields in
+		raise_fields fields CRStructureField (make_subject name pinsert)
+	| EBlock [] ->
+		let fields = List.fold_left (fun acc cf ->
+			(make_field_item cf) :: acc
+		) [] fields in
+		let pinsert = DisplayPosition.display_position#with_pos (pos e) in
+		raise_fields fields CRStructureField (make_subject None pinsert)
+	| _ ->
+		error "Expected object expression" p
+
+let handle_display ?resume_typing ctx e_ast dk with_type =
+	let old = ctx.in_display,ctx.in_call_args in
+	ctx.in_display <- true;
+	ctx.in_call_args <- false;
+	let tpair t =
+		let ct = CompletionType.from_type (get_import_status ctx) t in
+		(t,ct)
+	in
+	let e = match e_ast,with_type with
+	| (EConst (Ident "$type"),p),_ ->
+		display_dollar_type ctx p tpair
+	| (EConst (Ident "trace"),_),_ ->
+		let doc = Some "Print given arguments" in
+		let arg = ["value",false,t_dynamic] in
+		let ret = ctx.com.basic.tvoid in
+		let p = pos e_ast in
+		begin match ctx.com.display.dms_kind with
+		| DMSignature ->
+			raise_signatures [(convert_function_signature ctx PMap.empty (arg,ret),doc)] 0 0 SKCall
+		| DMHover ->
+			let t = TFun(arg,ret) in
+			raise_hover (make_ci_expr (mk (TIdent "trace") t p) (tpair t)) (Some (WithType.named_argument "value")) p
+		| DMDefinition | DMTypeDefinition ->
+			raise_positions []
+		| _ ->
+			error "Unsupported method" p
+		end
+	| (EConst (Ident "_"),p),WithType.WithType(t,_) ->
+		mk (TConst TNull) t p (* This is "probably" a bind skip, let's just use the expected type *)
+	| (_,p),_ -> try
+		match resume_typing with
+		| None -> type_expr ctx e_ast with_type
+		| Some fn -> fn ctx e_ast with_type
+	with Error (Unknown_ident n,_) when ctx.com.display.dms_kind = DMDefault ->
+        if dk = DKDot && is_legacy_completion ctx.com then raise (Parser.TypePath ([n],None,false,p))
+		else raise_toplevel ctx dk with_type (n,p)
+	| Error ((Type_not_found (path,_) | Module_not_found path),_) as err when ctx.com.display.dms_kind = DMDefault ->
+		if is_legacy_completion ctx.com then begin try
+			raise_fields (DisplayFields.get_submodule_fields ctx path) (CRField((make_ci_module path),p,None,None)) (make_subject None (pos e_ast))
+		with Not_found ->
+			raise err
+		end else
+			raise_toplevel ctx dk with_type (s_type_path path,p)
+	| DisplayException(DisplayFields Some({fkind = CRTypeHint} as r)) when (match fst e_ast with ENew _ -> true | _ -> false) ->
+		let timer = Timer.timer ["display";"toplevel";"filter ctors"] in
+		ctx.pass <- PBuildClass;
+		let l = List.filter (fun item ->
+			let is_private_to_current_module mt =
+				(* Remove the _Module nonsense from the package *)
+				let pack = List.rev (List.tl (List.rev mt.pack)) in
+				(pack,mt.module_name) = ctx.m.curmod.m_path
+			in
+			match item.ci_kind with
+			| ITType({kind = (Class | Abstract | TypeAlias)} as mt,_) when not mt.is_private || is_private_to_current_module mt ->
+				begin match mt.has_constructor with
+				| Yes -> true
+				| YesButPrivate ->
+					if (Meta.has Meta.PrivateAccess ctx.meta) then true
+					else begin
+						let path = (mt.pack,mt.name) in
+						let rec loop c =
+							if c.cl_path = path then true
+							else match c.cl_super with
+								| Some(c,_) -> loop c
+								| None -> false
+						in
+						loop ctx.curclass
+					end
+				| No -> false
+				| Maybe ->
+					begin try
+						let mt = ctx.g.do_load_type_def ctx null_pos {tpackage=mt.pack;tname=mt.module_name;tsub=Some mt.name;tparams=[]} in
+						begin match resolve_typedef mt with
+						| TClassDecl c when has_constructor c -> true
+						| TAbstractDecl {a_impl = Some c} ->
+							ignore(c.cl_build());
+							PMap.mem "_new" c.cl_statics
+						| _ -> false
+						end
+					with _ ->
+						false
+					end
+				end
+			| ITTypeParameter {cl_kind = KTypeParameter tl} when get_constructible_constraint ctx tl null_pos <> None ->
+				true
+			| _ -> false
+		) r.fitems in
+		timer();
+		raise_fields l CRNew r.fsubject
+	in
+	let e = match e.eexpr with
+		| TField(e1,FDynamic "bind") when (match follow e1.etype with TFun _ -> true | _ -> false) -> e1
+		| _ -> e
+	in
+	let is_display_debug = Meta.has (Meta.Custom ":debug.display") ctx.curfield.cf_meta in
+	if is_display_debug then begin
+		print_endline (Printf.sprintf "expected type: %s" (WithType.to_string with_type));
+		print_endline (Printf.sprintf "typed expr:\n%s" (s_expr_ast true "" (s_type (print_context())) e));
+	end;
+	let p = e.epos in
+	begin match with_type with
+		| WithType.WithType(t,_) ->
+			(* We don't want to actually use the transformed expression which may have inserted implicit cast calls.
+			   It only matters that unification takes place. *)
+			(try ignore(AbstractCast.cast_or_unify_raise ctx t e e.epos) with Error (Unify l,p) -> ());
+		| _ ->
+			()
+	end;
+	if is_display_debug then begin
+		print_endline (Printf.sprintf "cast expr:\n%s" (s_expr_ast true "" (s_type (print_context())) e));
+	end;
+	ctx.in_display <- fst old;
+	ctx.in_call_args <- snd old;
+	display_expr ctx e_ast e dk with_type p
+
+let handle_edisplay ?resume_typing ctx e dk with_type =
+	let handle_display ctx e dk with_type =
+		match resume_typing with
+		| Some resume_typing -> handle_display ~resume_typing ctx e dk with_type
+		| None -> handle_display ctx e dk with_type
+	in
+	match dk,ctx.com.display.dms_kind with
+	| DKCall,(DMSignature | DMDefault) -> handle_signature_display ctx e with_type
+	| DKStructure,DMDefault ->
+		begin match with_type with
+			| WithType.WithType(t,_) ->
+				begin match follow t with
+					| TAnon an ->
+						let origin = match t with
+							| TType(td,_) -> Self (TTypeDecl td)
+							| _ -> AnonymousStructure an
+						in
+						handle_structure_display ctx e an.a_fields origin
+					| TInst(c,tl) when Meta.has Meta.StructInit c.cl_meta ->
+						let fields = PMap.map (fun cf -> {cf with cf_type = apply_params c.cl_params tl cf.cf_type}) c.cl_fields in
+						handle_structure_display ctx e fields (Self (TClassDecl c))
+					| _ -> handle_display ctx e dk with_type
+				end
+			| _ ->
+				handle_display ctx e dk with_type
+		end
+	| DKPattern outermost,DMDefault ->
+		begin try
+			handle_display ctx e dk with_type
+		with DisplayException(DisplayFields Some({fkind = CRToplevel _} as r)) ->
+			raise_fields r.fitems (CRPattern ((get_expected_type ctx with_type),outermost)) r.fsubject
+		end
+	| _ -> handle_display ctx e dk with_type
\ No newline at end of file
diff --git a/std/Any.hx b/std/Any.hx
index e40221002fdfa0ac71348aa4459dde0bec4eccb8..d5bc429d8a360139e8d62df89e31fc2f055843ad 100644
--- a/std/Any.hx
+++ b/std/Any.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,7 +32,12 @@
 	to another type.
 **/
 abstract Any(Dynamic) {
-	@:noCompletion @:extern @:to inline function __promote<T>():T return this;
-	@:noCompletion @:extern @:from inline static function __cast<T>(value:T):Any return cast value;
-	@:noCompletion @:extern inline function toString():String return Std.string(this);
+	@:noCompletion @:to extern inline function __promote<T>():T
+		return this;
+
+	@:noCompletion @:from extern inline static function __cast<T>(value:T):Any
+		return cast value;
+
+	@:noCompletion extern inline function toString():String
+		return Std.string(this);
 }
diff --git a/std/Array.hx b/std/Array.hx
index f8f4d1d3457b272863f8ccbcc3e1a297c976ee7f..10c0a516cc097ad71ab5de7c209d2945bbe0718a 100644
--- a/std/Array.hx
+++ b/std/Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 /**
 	An Array is a storage for values. You can access it using indexes or
 	with its API.
@@ -27,16 +28,15 @@
 	@see https://haxe.org/manual/lf-array-comprehension.html
 **/
 extern class Array<T> {
-
 	/**
 		The length of `this` Array.
 	**/
-	var length(default,null) : Int;
+	var length(default, null):Int;
 
 	/**
 		Creates a new Array.
 	**/
-	function new() : Void;
+	function new():Void;
 
 	/**
 		Returns a new Array by appending the elements of `a` to the elements of
@@ -51,7 +51,7 @@ extern class Array<T> {
 
 		If `a` is `null`, the result is unspecified.
 	**/
-	function concat( a : Array<T> ) : Array<T>;
+	function concat(a:Array<T>):Array<T>;
 
 	/**
 		Returns a string representation of `this` Array, with `sep` separating
@@ -66,7 +66,7 @@ extern class Array<T> {
 
 		If `sep` is null, the result is unspecified.
 	**/
-	function join( sep : String ) : String;
+	function join(sep:String):String;
 
 	/**
 		Removes the last element of `this` Array and returns it.
@@ -78,7 +78,7 @@ extern class Array<T> {
 		If `this` is the empty Array `[]`, null is returned and the length
 		remains 0.
 	**/
-	function pop() : Null<T>;
+	function pop():Null<T>;
 
 	/**
 		Adds the element `x` at the end of `this` Array and returns the new
@@ -88,7 +88,7 @@ extern class Array<T> {
 
 		`this.length` increases by 1.
 	**/
-	function push(x : T) : Int;
+	function push(x:T):Int;
 
 	/**
 		Reverse the order of elements of `this` Array.
@@ -97,7 +97,7 @@ extern class Array<T> {
 
 		If `this.length < 2`, `this` remains unchanged.
 	**/
-	function reverse() : Void;
+	function reverse():Void;
 
 	/**
 		Removes the first element of `this` Array and returns it.
@@ -110,7 +110,7 @@ extern class Array<T> {
 		If `this` is the empty Array `[]`, `null` is returned and the length
 		remains 0.
 	**/
-	function shift() : Null<T>;
+	function shift():Null<T>;
 
 	/**
 		Creates a shallow copy of the range of `this` Array, starting at and
@@ -130,7 +130,7 @@ extern class Array<T> {
 		If `pos` exceeds `this.length` or if `end` is less than or equals
 		`pos`, the result is `[]`.
 	**/
-	function slice( pos : Int, ?end : Int ) : Array<T>;
+	function slice(pos:Int, ?end:Int):Array<T>;
 
 	/**
 		Sorts `this` Array according to the comparison function `f`, where
@@ -145,7 +145,7 @@ extern class Array<T> {
 
 		If `f` is null, the result is unspecified.
 	**/
-	function sort( f : T -> T -> Int ) : Void;
+	function sort(f:T->T->Int):Void;
 
 	/**
 		Removes `len` elements from `this` Array, starting at and including
@@ -153,7 +153,7 @@ extern class Array<T> {
 
 		This operation modifies `this` Array in place.
 
-		If `len` is < 0 or `pos` exceeds `this`.length, an empty Array [] is 
+		If `len` is < 0 or `pos` exceeds `this`.length, an empty Array [] is
 		returned and `this` Array is unchanged.
 
 		If `pos` is negative, its value is calculated from the end	of `this`
@@ -169,7 +169,7 @@ extern class Array<T> {
 		words, each element of the original `this` Array either remains in
 		`this` Array or becomes an element of the returned Array.
 	**/
-	function splice( pos : Int, len : Int ) : Array<T>;
+	function splice(pos:Int, len:Int):Array<T>;
 
 	/**
 		Returns a string representation of `this` Array.
@@ -179,7 +179,7 @@ extern class Array<T> {
 		use `Std.string()` to get a String representation that is consistent
 		across platforms.
 	**/
-	function toString() : String;
+	function toString():String;
 
 	/**
 		Adds the element `x` at the start of `this` Array.
@@ -188,7 +188,7 @@ extern class Array<T> {
 
 		`this.length` and the index of each Array element increases by 1.
 	**/
-	function unshift( x : T ) : Void;
+	function unshift(x:T):Void;
 
 	/**
 		Inserts the element `x` at the position `pos`.
@@ -207,7 +207,7 @@ extern class Array<T> {
 		and including that offset to the end of `this` Array are moved one index
 		ahead.
 	**/
-	function insert( pos : Int, x : T ) : Void;
+	function insert(pos:Int, x:T):Void;
 
 	/**
 		Removes the first occurrence of `x` in `this` Array.
@@ -221,7 +221,7 @@ extern class Array<T> {
 		If `x` is not found, `this` Array is not changed and the function
 		returns false.
 	**/
-	function remove( x : T ) : Bool;
+	function remove(x:T):Bool;
 
 	/**
 		Returns position of the first occurrence of `x` in `this` Array, searching front to back.
@@ -236,7 +236,7 @@ extern class Array<T> {
 		starting index is less than 0, the whole array will be searched, if it is greater than
 		or equal to the length of `this` Array, the function returns -1.
 	**/
-	function indexOf( x : T, ?fromIndex:Int ) : Int;
+	function indexOf(x:T, ?fromIndex:Int):Int;
 
 	/**
 		Returns position of the last occurrence of `x` in `this` Array, searching back to front.
@@ -251,7 +251,7 @@ extern class Array<T> {
 		given or computed starting index is greater than or equal to the length of `this` Array,
 		the whole array will be searched, if it is less than 0, the function returns -1.
 	**/
-	function lastIndexOf( x : T, ?fromIndex:Int ) : Int;
+	function lastIndexOf(x:T, ?fromIndex:Int):Int;
 
 	/**
 		Returns a shallow copy of `this` Array.
@@ -260,12 +260,12 @@ extern class Array<T> {
 		`a[i] == a.copy()[i]` is true for any valid `i`. However,
 		`a == a.copy()` is always false.
 	**/
-	function copy() : Array<T>;
+	function copy():Array<T>;
 
 	/**
 		Returns an iterator of the Array values.
 	**/
-	function iterator() : Iterator<T>;
+	function iterator():Iterator<T>;
 
 	/**
 		Creates a new Array by applying function `f` to all elements of `this`.
@@ -274,7 +274,15 @@ extern class Array<T> {
 
 		If `f` is null, the result is unspecified.
 	**/
-	function map<S>( f : T -> S ) : Array<S>;
+	@:runtime inline function map<S>(f:T->S):Array<S> {
+		#if (cpp && !cppia)
+		var result = cpp.NativeArray.create(length);
+		for (i in 0...length) cpp.NativeArray.unsafeSet(result, i, f(cpp.NativeArray.unsafeGet(this, i)));
+		return result;
+		#else
+		return [for (v in this) f(v)];
+		#end
+	}
 
 	/**
 		Returns an Array containing those elements of `this` for which `f`
@@ -284,5 +292,21 @@ extern class Array<T> {
 
 		If `f` is null, the result is unspecified.
 	**/
-	function filter( f : T -> Bool ) : Array<T>;
+	@:runtime inline function filter(f:T->Bool):Array<T> {
+		return [for (v in this) if (f(v)) v];
+	}
+
+	/**
+		Set the length of the Array.
+
+		If `len` is shorter than the array's current size, the last
+		`length - len` elements will be removed. If `len` is longer, the Array
+		will be extended, with new elements set to a target-specific default
+		value:
+
+		- always null on dynamic targets
+		- 0, 0.0 or false for Int, Float and Bool respectively on static targets
+		- null for other types on static targets
+	**/
+	function resize(len:Int):Void;
 }
diff --git a/std/Class.hx b/std/Class.hx
index 5eb31102a8409ab2f82ccb8135e32bde8c7773b5..73d91c3504a5b5dbdeef1ee571afeb40cdee382b 100644
--- a/std/Class.hx
+++ b/std/Class.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 /**
 	An abstract type that represents a Class.
 
@@ -26,5 +27,4 @@
 
 	@see https://haxe.org/manual/types-class-instance.html
 **/
-@:coreType @:runtimeValue abstract Class<T> {
-}
+@:coreType @:runtimeValue abstract Class<T> {}
diff --git a/std/Date.hx b/std/Date.hx
index adca8aea368802d1058ae086c6894bcfd3fa5c58..309b340a74c6d497f739b9a15bf8b0165f5bb72b 100644
--- a/std/Date.hx
+++ b/std/Date.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
- /**
+/**
 	The Date class provides a basic structure for date and time related
 	information. Date instances can be created by
 
@@ -32,143 +32,152 @@
 	There are some extra functions available in the `DateTools` class.
 
 	In the context of Haxe dates, a timestamp is defined as the number of
-	milliseconds elapsed since 1st January 1970.
+	milliseconds elapsed since 1st January 1970 UTC.
+
+	## Supported range
+
+	Due to platform limitations, only dates in the range 1970 through 2038 are
+	supported consistently. Some targets may support dates outside this range,
+	depending on the OS at runtime. The `Date.fromTime` method will not work with
+	timestamps outside the range on any target.
 **/
-extern class Date
-{
+extern class Date {
 	/**
 		Creates a new date object from the given arguments.
 
 		The behaviour of a Date instance is only consistent across platforms if
 		the the arguments describe a valid date.
 
-		- month: 0 to 11
+		- month: 0 to 11 (note that this is zero-based)
 		- day: 1 to 31
 		- hour: 0 to 23
 		- min: 0 to 59
 		- sec: 0 to 59
 	**/
-	function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void;
+	function new(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Void;
+
+	/**
+		Returns the timestamp (in milliseconds) of `this` date.
+		On cpp and neko, this function only has a second resolution, so the
+		result will always be a multiple of `1000.0`, e.g. `1454698271000.0`.
+		To obtain the current timestamp with better precision on cpp and neko,
+		see the `Sys.time` API.
+
+		For measuring time differences with millisecond accuracy on
+		all platforms, see `haxe.Timer.stamp`.
+	**/
+	function getTime():Float;
+
+	/**
+		Returns the hours of `this` Date (0-23 range) in the local timezone.
+	**/
+	function getHours():Int;
+
+	/**
+		Returns the minutes of `this` Date (0-59 range) in the local timezone.
+	**/
+	function getMinutes():Int;
+
+	/**
+		Returns the seconds of `this` Date (0-59 range) in the local timezone.
+	**/
+	function getSeconds():Int;
 
 	/**
-		Returns the timestamp (in milliseconds) of the date. It might
-		only have a per-second precision depending on the platforms.
+		Returns the full year of `this` Date (4 digits) in the local timezone.
 	**/
-	function getTime() : Float;
+	function getFullYear():Int;
 
 	/**
-		Returns the hours of `this` Date (0-23 range).
+		Returns the month of `this` Date (0-11 range) in the local timezone.
+		Note that the month number is zero-based.
 	**/
-	function getHours() : Int;
+	function getMonth():Int;
 
 	/**
-		Returns the minutes of `this` Date (0-59 range).
+		Returns the day of `this` Date (1-31 range) in the local timezone.
 	**/
-	function getMinutes() : Int;
+	function getDate():Int;
 
 	/**
-		Returns the seconds of `this` Date (0-59 range).
+		Returns the day of the week of `this` Date (0-6 range, where `0` is Sunday)
+		in the local timezone.
 	**/
-	function getSeconds() : Int;
+	function getDay():Int;
 
 	/**
-		Returns the full year of `this` Date (4-digits).
+		Returns the hours of `this` Date (0-23 range) in UTC.
 	**/
-	function getFullYear() : Int;
+	function getUTCHours():Int;
 
 	/**
-		Returns the month of `this` Date (0-11 range).
+		Returns the minutes of `this` Date (0-59 range) in UTC.
 	**/
-	function getMonth() : Int;
+	function getUTCMinutes():Int;
 
 	/**
-		Returns the day of `this` Date (1-31 range).
+		Returns the seconds of `this` Date (0-59 range) in UTC.
 	**/
-	function getDate() : Int;
+	function getUTCSeconds():Int;
 
 	/**
-		Returns the day of the week of `this` Date (0-6 range) where `0` is Sunday.
+		Returns the full year of `this` Date (4 digits) in UTC.
 	**/
-	function getDay() : Int;
+	function getUTCFullYear():Int;
 
 	/**
-		Returns a string representation of `this` Date, by using the
-		standard format [YYYY-MM-DD HH:MM:SS]. See `DateTools.format` for
-		other formating rules.
+		Returns the month of `this` Date (0-11 range) in UTC.
+		Note that the month number is zero-based.
+	**/
+	function getUTCMonth():Int;
+
+	/**
+		Returns the day of `this` Date (1-31 range) in UTC.
+	**/
+	function getUTCDate():Int;
+
+	/**
+		Returns the day of the week of `this` Date (0-6 range, where `0` is Sunday)
+		in UTC.
+	**/
+	function getUTCDay():Int;
+
+	/**
+		Returns the time zone difference of `this` Date in the current locale
+		to UTC, in minutes.
+
+		Assuming the function is executed on a machine in a UTC+2 timezone,
+		`Date.now().getTimezoneOffset()` will return `-120`.
+	**/
+	function getTimezoneOffset():Int;
+
+	/**
+		Returns a string representation of `this` Date in the local timezone
+		using the standard format `YYYY-MM-DD HH:MM:SS`. See `DateTools.format` for
+		other formatting rules.
 	**/
 	function toString():String;
 
 	/**
 		Returns a Date representing the current local time.
 	**/
-	static function now() : Date;
+	static function now():Date;
 
 	/**
-		Returns a Date from timestamp `t`.
+		Creates a Date from the timestamp (in milliseconds) `t`.
 	**/
-	static function fromTime( t : Float ) : Date;
+	static function fromTime(t:Float):Date;
 
 	/**
-		Returns a Date from a formated string `s`, with the following accepted
-		formats:
+		Creates a Date from the formatted string `s`. The following formats are
+		accepted by the function:
 
 		- `"YYYY-MM-DD hh:mm:ss"`
 		- `"YYYY-MM-DD"`
 		- `"hh:mm:ss"`
 
-		The first two formats are expressed in local time, the third in UTC
-		Epoch.
-	**/
-	static function fromString( s : String ) : Date;
-
-
-#if flash
-	private static function __init__() : Void untyped {
-		var d : Dynamic = Date;
-		d.now = function() {
-			return __new__(Date);
-		};
-		d.fromTime = function(t){
-			var d : Date = __new__(Date);
-			d.setTime(t);
-			return d;
-		};
-		d.fromString = function(s : String) {
-			switch( s.length ) {
-			case 8: // hh:mm:ss
-				var k = s.split(":");
-				var d : Date = __new__(Date);
-				d.setTime(0);
-				d.setUTCHours(k[0]);
-				d.setUTCMinutes(k[1]);
-				d.setUTCSeconds(k[2]);
-				return d;
-			case 10: // YYYY-MM-DD
-				var k = s.split("-");
-				return new Date(cast k[0],cast k[1] - 1,cast k[2],0,0,0);
-			case 19: // YYYY-MM-DD hh:mm:ss
-				var k = s.split(" ");
-				var y = k[0].split("-");
-				var t = k[1].split(":");
-				return new Date(cast y[0],cast y[1] - 1,cast y[2],cast t[0],cast t[1],cast t[2]);
-			default:
-				throw "Invalid date format : " + s;
-			}
-		};
-		d.prototype[#if (as3 || no_flash_override) "toStringHX" #else "toString" #end] = function() {
-			var date : Date = __this__;
-			var m = date.getMonth() + 1;
-			var d = date.getDate();
-			var h = date.getHours();
-			var mi = date.getMinutes();
-			var s = date.getSeconds();
-			return date.getFullYear()
-				+"-"+(if( m < 10 ) "0"+m else ""+m)
-				+"-"+(if( d < 10 ) "0"+d else ""+d)
-				+" "+(if( h < 10 ) "0"+h else ""+h)
-				+":"+(if( mi < 10 ) "0"+mi else ""+mi)
-				+":"+(if( s < 10 ) "0"+s else ""+s);
-		};
-	}
-#end
+		The first two formats expressed a date in local time. The third is a time
+		relative to the UTC epoch.
+	**/
+	static function fromString(s:String):Date;
 }
diff --git a/std/DateTools.hx b/std/DateTools.hx
index f7578bd97c35bd2ad66a806289e065933c2574f7..c22afda95d8de4768135d7297edc99971c048bf1 100644
--- a/std/DateTools.hx
+++ b/std/DateTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,93 +28,99 @@
 	milliseconds elapsed since 1st January 1970.
 **/
 class DateTools {
-
 	#if php
 	#elseif (neko && !(macro || interp))
-	static var date_format = neko.Lib.load("std","date_format",2);
+	static var date_format = neko.Lib.load("std", "date_format", 2);
 	#else
 	static var DAY_SHORT_NAMES = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
 	static var DAY_NAMES = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
-	static var MONTH_SHORT_NAMES = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-	static var MONTH_NAMES = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-	
-	private static function __format_get( d : Date, e : String ) : String {
-		return switch( e ){
+	static var MONTH_SHORT_NAMES = [
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+	];
+	static var MONTH_NAMES = [
+		"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
+	];
+
+	private static function __format_get(d:Date, e:String):String {
+		return switch (e) {
 			case "%":
 				"%";
 			case "a":
 				DAY_SHORT_NAMES[d.getDay()];
 			case "A":
 				DAY_NAMES[d.getDay()];
-			case "b","h":
+			case "b", "h":
 				MONTH_SHORT_NAMES[d.getMonth()];
 			case "B":
 				MONTH_NAMES[d.getMonth()];
 			case "C":
-				untyped StringTools.lpad(Std.string(Std.int(d.getFullYear()/100)),"0",2);
+				untyped StringTools.lpad(Std.string(Std.int(d.getFullYear() / 100)), "0", 2);
 			case "d":
-				untyped StringTools.lpad(Std.string(d.getDate()),"0",2);
+				untyped StringTools.lpad(Std.string(d.getDate()), "0", 2);
 			case "D":
-				__format(d,"%m/%d/%y");
+				__format(d, "%m/%d/%y");
 			case "e":
 				untyped Std.string(d.getDate());
 			case "F":
-				__format(d,"%Y-%m-%d");
-			case "H","k":
-				untyped StringTools.lpad(Std.string(d.getHours()),if( e == "H" ) "0" else " ",2);
-			case "I","l":
-				var hour = d.getHours()%12;
-				untyped StringTools.lpad(Std.string(hour == 0 ? 12 : hour),if( e == "I" ) "0" else " ",2);
+				__format(d, "%Y-%m-%d");
+			case "H", "k":
+				untyped StringTools.lpad(Std.string(d.getHours()), if (e == "H") "0" else " ", 2);
+			case "I", "l":
+				var hour = d.getHours() % 12;
+				untyped StringTools.lpad(Std.string(hour == 0 ? 12 : hour), if (e == "I") "0" else " ", 2);
 			case "m":
-				untyped StringTools.lpad(Std.string(d.getMonth()+1),"0",2);
+				untyped StringTools.lpad(Std.string(d.getMonth() + 1), "0", 2);
 			case "M":
-				untyped StringTools.lpad(Std.string(d.getMinutes()),"0",2);
+				untyped StringTools.lpad(Std.string(d.getMinutes()), "0", 2);
 			case "n":
 				"\n";
 			case "p":
-				untyped if( d.getHours() > 11 ) "PM"; else "AM";
+				untyped if (d.getHours() > 11) "PM"; else "AM";
 			case "r":
-				__format(d,"%I:%M:%S %p");
+				__format(d, "%I:%M:%S %p");
 			case "R":
-				__format(d,"%H:%M");
+				__format(d, "%H:%M");
 			case "s":
-				Std.string(Std.int(d.getTime()/1000));
+				Std.string(Std.int(d.getTime() / 1000));
 			case "S":
-				untyped StringTools.lpad(Std.string(d.getSeconds()),"0",2);
+				untyped StringTools.lpad(Std.string(d.getSeconds()), "0", 2);
 			case "t":
 				"\t";
 			case "T":
-				__format(d,"%H:%M:%S");
+				__format(d, "%H:%M:%S");
 			case "u":
-				untyped{
+				untyped {
 					var t = d.getDay();
-					if( t == 0 ) "7"; else Std.string(t);
+					if (t == 0)
+						"7";
+					else
+						Std.string(t);
 				}
 			case "w":
 				untyped Std.string(d.getDay());
 			case "y":
-				untyped StringTools.lpad(Std.string(d.getFullYear()%100),"0",2);
+				untyped StringTools.lpad(Std.string(d.getFullYear() % 100), "0", 2);
 			case "Y":
 				untyped Std.string(d.getFullYear());
 			default:
-				throw "Date.format %"+e+"- not implemented yet.";
+				throw "Date.format %" + e + "- not implemented yet.";
 		}
 	}
 
-	private static function __format( d : Date, f : String ) : String {
+	private static function __format(d:Date, f:String):String {
 		var r = new StringBuf();
 		var p = 0;
-		while( true ){
+		while (true) {
 			var np = f.indexOf("%", p);
-			if( np < 0 )
+			if (np < 0)
 				break;
 
-			r.addSub(f,p,np-p);
-			r.add( __format_get(d, f.substr(np+1,1) ) );
+			r.addSub(f, p, np - p);
+			r.add(__format_get(d, f.substr(np + 1, 1)));
 
-			p = np+2;
+			p = np + 2;
 		}
-		r.addSub(f,p,f.length-p);
+		r.addSub(f, p, f.length - p);
 		return r.toString();
 	}
 	#end
@@ -140,13 +146,13 @@ class DateTools {
 		// 2016-07-08
 		```
 	**/
-	public static function format( d : Date, f : String ) : String {
+	public static function format(d:Date, f:String):String {
 		#if (neko && !(macro || interp))
-			return new String(untyped date_format(d.__t, f.__s));
+		return new String(untyped date_format(d.__t, f.__s));
 		#elseif php
-			return untyped __call__("strftime",f,d.__t);
+		return php.Global.strftime(f, php.Syntax.int(@:privateAccess d.__t));
 		#else
-			return __format(d,f);
+		return __format(d, f);
 		#end
 	}
 
@@ -156,8 +162,8 @@ class DateTools {
 		This is a convenience function for calling
 		`Date.fromTime(d.getTime() + t)`.
 	**/
-	public static inline function delta( d : Date, t : Float ) : Date {
-		return Date.fromTime( d.getTime() + t );
+	public static inline function delta(d:Date, t:Float):Date {
+		return Date.fromTime(d.getTime() + t);
 	}
 
 	static var DAYS_OF_MONTH = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
@@ -167,7 +173,7 @@ class DateTools {
 
 		This method handles leap years.
 	**/
-	public static function getMonthDays( d : Date ) : Int {
+	public static function getMonthDays(d:Date):Int {
 		var month = d.getMonth();
 		var year = d.getFullYear();
 
@@ -181,51 +187,57 @@ class DateTools {
 	/**
 		Converts a number of seconds to a timestamp.
 	**/
-	public static inline function seconds( n : Float ) : Float {
+	public static inline function seconds(n:Float):Float {
 		return n * 1000.0;
 	}
 
 	/**
 		Converts a number of minutes to a timestamp.
 	**/
-	#if as3 @:extern #end public static inline function minutes( n : Float ) : Float {
+	#if as3 extern #end public static inline function minutes(n:Float):Float {
 		return n * 60.0 * 1000.0;
 	}
 
 	/**
 		Converts a number of hours to a timestamp.
 	**/
-	public static inline function hours( n : Float ) : Float {
+	public static inline function hours(n:Float):Float {
 		return n * 60.0 * 60.0 * 1000.0;
 	}
 
 	/**
 		Converts a number of days to a timestamp.
 	**/
-	public static inline function days( n : Float ) : Float {
+	public static inline function days(n:Float):Float {
 		return n * 24.0 * 60.0 * 60.0 * 1000.0;
 	}
 
 	/**
 		Separate a date-time into several components
 	**/
-	public static function parse( t : Float ) {
+	public static function parse(t:Float) {
 		var s = t / 1000;
 		var m = s / 60;
 		var h = m / 60;
 		return {
-			ms : t % 1000,
-			seconds : Std.int(s % 60),
-			minutes : Std.int(m % 60),
-			hours : Std.int(h % 24),
-			days : Std.int(h / 24),
+			ms: t % 1000,
+			seconds: Std.int(s % 60),
+			minutes: Std.int(m % 60),
+			hours: Std.int(h % 24),
+			days: Std.int(h / 24),
 		};
 	}
 
 	/**
 		Build a date-time from several components
 	**/
-	public static function make( o : { ms : Float, seconds : Int, minutes : Int, hours : Int, days : Int } ) {
+	public static function make(o:{
+		ms:Float,
+		seconds:Int,
+		minutes:Int,
+		hours:Int,
+		days:Int
+	}) {
 		return o.ms + 1000.0 * (o.seconds + 60.0 * (o.minutes + 60.0 * (o.hours + 24.0 * o.days)));
 	}
 
@@ -233,16 +245,16 @@ class DateTools {
 	/**
 		Retrieve Unix timestamp value from Date components. Takes same argument sequence as the Date constructor.
 	**/
-	public static #if (js || flash || php) inline #end function makeUtc(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ):Float {
-	    #if (js || flash || python)
-		   return untyped Date.UTC(year, month, day, hour, min, sec);
+	public static #if (js || flash || php) inline #end function makeUtc(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Float {
+		#if (js || flash || python)
+		return untyped Date.UTC(year, month, day, hour, min, sec);
 		#elseif php
-		   return untyped __call__("gmmktime", hour, min, sec, month + 1, day, year) * 1000;
+		return php.Global.gmmktime(hour, min, sec, month + 1, day, year) * 1000;
 		#elseif cpp
-		  return untyped __global__.__hxcpp_utc_date(year,month,day,hour,min,sec)*1000.0 ;
+		return untyped __global__.__hxcpp_utc_date(year, month, day, hour, min, sec) * 1000.0;
 		#else
-			//TODO
-		   return 0.;
+		// TODO
+		return 0.;
 		#end
 	}
 	#end
diff --git a/std/EReg.hx b/std/EReg.hx
index 62f2397b33f0ff6466682d595cc5d0880662dadc..ba33b85b9a1b9c0458093e19e373f977e133cfba 100644
--- a/std/EReg.hx
+++ b/std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,7 +37,6 @@
 	<https://haxe.org/manual/std-regex.html>
 **/
 class EReg {
-
 	/**
 		Creates a new regular expression with pattern `r` and modifiers `opt`.
 
@@ -45,7 +44,7 @@ class EReg {
 
 		If `r` or `opt` are null, the result is unspecified.
 	**/
-	public function new( r : String, opt : String ) {
+	public function new(r:String, opt:String) {
 		throw "Regular expressions are not implemented for this platform";
 	}
 
@@ -56,7 +55,7 @@ class EReg {
 
 		If `s` is `null`, the result is unspecified.
 	**/
-	public function match( s : String ) : Bool {
+	public function match(s:String):Bool {
 		return false;
 	}
 
@@ -67,11 +66,11 @@ class EReg {
 		`this.matchSub`, and then operates on the String of that operation.
 
 		The index `n` corresponds to the n-th set of parentheses in the pattern
-		of `this` EReg. If no such sub-group exists, an exception is thrown.
+		of `this` EReg. If no such sub-group exists, the result is unspecified.
 
 		If `n` equals 0, the whole matched substring is returned.
 	**/
-	public function matched( n : Int ) : String {
+	public function matched(n:Int):String {
 		return null;
 	}
 
@@ -86,7 +85,7 @@ class EReg {
 
 		The result does not include the matched part.
 	**/
-	public function matchedLeft() : String {
+	public function matchedLeft():String {
 		return null;
 	}
 
@@ -101,7 +100,7 @@ class EReg {
 
 		The result does not include the matched part.
 	**/
-	public function matchedRight() : String {
+	public function matchedRight():String {
 		return null;
 	}
 
@@ -116,7 +115,7 @@ class EReg {
 		If the global g modifier was in place for the matching, the position and
 		length of the leftmost substring is returned.
 	**/
-	public function matchedPos() : { pos : Int, len : Int } {
+	public function matchedPos():{pos:Int, len:Int} {
 		return null;
 	}
 
@@ -131,7 +130,7 @@ class EReg {
 
 		If `s` is null, the result is unspecified.
 	**/
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
 		return false;
 	}
 
@@ -153,7 +152,7 @@ class EReg {
 
 		If `s` is null, the result is unspecified.
 	**/
-	public function split( s : String ) : Array<String> {
+	public function split(s:String):Array<String> {
 		return null;
 	}
 
@@ -171,7 +170,7 @@ class EReg {
 
 		If `s` or `by` are null, the result is unspecified.
 	**/
-	public function replace( s : String, by : String ) : String {
+	public function replace(s:String, by:String):String {
 		return null;
 	}
 
@@ -189,7 +188,16 @@ class EReg {
 
 		If `s` or `f` are null, the result is unspecified.
 	**/
-	public function map( s : String, f : EReg -> String ) : String {
+	public function map(s:String, f:EReg->String):String {
+		return null;
+	}
+
+	/**
+		Escape the string `s` for use as a part of regular expression.
+
+		If `s` is null, the result is unspecified.
+	**/
+	public static function escape(s:String):String {
 		return null;
 	}
 }
diff --git a/std/Enum.hx b/std/Enum.hx
index 8748bf94ebeb20335d9106dc7c67e2ae29d9bca0..12f9a1f2aed8f759340ac924c89688fb7e1c1f59 100644
--- a/std/Enum.hx
+++ b/std/Enum.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,5 +29,4 @@
 
 	@see https://haxe.org/manual/types-enum-instance.html
 **/
-@:coreType @:runtimeValue abstract Enum<T> {
-}
+@:coreType @:runtimeValue abstract Enum<T> {}
diff --git a/std/EnumValue.hx b/std/EnumValue.hx
index eca6d58d484a095c87aac8d66537bc37dba4fd83..7297d0b734e4e87bac0f79b2fb1ca51571272957 100644
--- a/std/EnumValue.hx
+++ b/std/EnumValue.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,4 +27,35 @@
 	@see https://haxe.org/manual/types-enum-instance.html
 **/
 @:coreType abstract EnumValue {
+	/**
+		Matches enum instance `e` against pattern `pattern`, returning `true` if
+		matching succeeded and `false` otherwise.
+
+		Example usage:
+
+		```haxe
+		if (e.match(pattern)) {
+			// codeIfTrue
+		} else {
+			// codeIfFalse
+		}
+		```
+
+		This is equivalent to the following code:
+
+		```haxe
+		switch (e) {
+			case pattern:
+				// codeIfTrue
+			case _:
+				// codeIfFalse
+		}
+		```
+
+		This method is implemented in the compiler. This definition exists only
+		for documentation.
+	**/
+	public function match(pattern:Dynamic):Bool {
+		return false;
+	}
 }
diff --git a/std/IntIterator.hx b/std/IntIterator.hx
index 64705e2b5bd7e3ed7778c1cf0f57935b36587f5b..f87bc09644f96dbe9e3c2c6b6d4bd0972d55fa6f 100644
--- a/std/IntIterator.hx
+++ b/std/IntIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
- /**
+/**
 	IntIterator is used for implementing interval iterations.
 
 	It is usually not used explicitly, but through its special syntax:
@@ -34,16 +34,15 @@
 	@see https://haxe.org/manual/lf-iterators.html
 **/
 class IntIterator {
-
-	var min : Int;
-	var max : Int;
+	var min:Int;
+	var max:Int;
 
 	/**
 		Iterates from `min` (inclusive) to `max` (exclusive).
 
 		If `max <= min`, the iterator will not act as a countdown.
 	**/
-	public inline function new( min : Int, max : Int ) {
+	public inline function new(min:Int, max:Int) {
 		this.min = min;
 		this.max = max;
 	}
@@ -63,5 +62,4 @@ class IntIterator {
 	public inline function next() {
 		return min++;
 	}
-
 }
diff --git a/std/Lambda.hx b/std/Lambda.hx
index 5d6efecba40512442dd1ef44d5500f8e80041895..e3f95eb800ca441dadb227cc0401db50dd0e50bf 100644
--- a/std/Lambda.hx
+++ b/std/Lambda.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,6 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+import haxe.ds.List;
+
 /**
 	The `Lambda` class is a collection of methods to support functional
 	programming. It is ideally used with `using Lambda` and then acts as an
@@ -35,15 +37,14 @@
 	@see https://haxe.org/manual/std-Lambda.html
 **/
 class Lambda {
-
 	/**
 		Creates an Array from Iterable `it`.
 
 		If `it` is an Array, this function returns a copy of it.
 	**/
-	public static function array<A>( it : Iterable<A> ) : Array<A> {
+	public static function array<A>(it:Iterable<A>):Array<A> {
 		var a = new Array<A>();
-		for(i in it)
+		for (i in it)
 			a.push(i);
 		return a;
 	}
@@ -53,63 +54,46 @@ class Lambda {
 
 		If `it` is a List, this function returns a copy of it.
 	**/
-	public static function list<A>( it : Iterable<A> ) : List<A> {
+	public static function list<A>(it:Iterable<A>):List<A> {
 		var l = new List<A>();
-		for(i in it)
+		for (i in it)
 			l.add(i);
 		return l;
 	}
 
 	/**
-		Creates a new List by applying function `f` to all elements of `it`.
-
+		Creates a new Array by applying function `f` to all elements of `it`.
 		The order of elements is preserved.
-
 		If `f` is null, the result is unspecified.
 	**/
-	public static function map<A,B>( it : Iterable<A>, f : A -> B ) : List<B> {
-		var l = new List<B>();
-		for( x in it )
-			l.add(f(x));
-		return l;
+	public static inline function map<A, B>(it:Iterable<A>, f:(item:A) -> B):Array<B> {
+		return [for (x in it) f(x)];
 	}
 
 	/**
 		Similar to map, but also passes the index of each element to `f`.
-
 		The order of elements is preserved.
-
 		If `f` is null, the result is unspecified.
 	**/
-	public static function mapi<A,B>( it : Iterable<A>, f : Int -> A -> B ) : List<B> {
-		var l = new List<B>();
+	public static inline function mapi<A, B>(it:Iterable<A>, f:(index:Int, item:A) -> B):Array<B> {
 		var i = 0;
-		for( x in it )
-			l.add(f(i++,x));
-		return l;
+		return [for (x in it) f(i++, x)];
 	}
 
 	/**
-		Concatenate a list of lists.
-
+		Concatenate a list of iterables.
 		The order of elements is preserved.
 	**/
-	public static function flatten<A>( it : Iterable<Iterable<A>> ) : List<A> {
-		var l = new List<A>();
-		for (e in it)
-			for (x in e)
-				l.add(x);
-		return l;
+	public static inline function flatten<A>(it:Iterable<Iterable<A>>):Array<A> {
+		return [for (e in it) for (x in e) x];
 	}
 
 	/**
 		A composition of map and flatten.
-
 		The order of elements is preserved.
-
 		If `f` is null, the result is unspecified.
 	**/
-	public static function flatMap<A,B>( it : Iterable<A>, f: A -> Iterable<B> ) : List<B> {
+	public static inline function flatMap<A, B>(it:Iterable<A>, f:(item:A) -> Iterable<B>):Array<B> {
 		return Lambda.flatten(Lambda.map(it, f));
 	}
 
@@ -121,9 +105,9 @@ class Lambda {
 
 		If no such element is found, the result is false.
 	**/
-	public static function has<A>( it : Iterable<A>, elt : A ) : Bool {
-		for( x in it )
-			if( x == elt )
+	public static function has<A>(it:Iterable<A>, elt:A):Bool {
+		for (x in it)
+			if (x == elt)
 				return true;
 		return false;
 	}
@@ -138,9 +122,9 @@ class Lambda {
 
 		If `f` is null, the result is unspecified.
 	**/
-	public static function exists<A>( it : Iterable<A>, f : A -> Bool ) {
-		for( x in it )
-			if( f(x) )
+	public static function exists<A>(it:Iterable<A>, f:(item:A) -> Bool) {
+		for (x in it)
+			if (f(x))
 				return true;
 		return false;
 	}
@@ -157,9 +141,9 @@ class Lambda {
 
 		If `f` is null, the result is unspecified.
 	**/
-	public static function foreach<A>( it : Iterable<A>, f : A -> Bool ) {
-		for( x in it )
-			if( !f(x) )
+	public static function foreach<A>(it:Iterable<A>, f:(item:A) -> Bool) {
+		for (x in it)
+			if (!f(x))
 				return false;
 		return true;
 	}
@@ -169,25 +153,19 @@ class Lambda {
 
 		If `f` is null, the result is unspecified.
 	**/
-	public static function iter<A>( it : Iterable<A>, f : A -> Void ) {
-		for( x in it )
+	public static function iter<A>(it:Iterable<A>, f:(item:A) -> Void) {
+		for (x in it)
 			f(x);
 	}
 
 	/**
-		Returns a List containing those elements of `it` for which `f` returned
+		Returns a Array containing those elements of `it` for which `f` returned
 		true.
-
-		If `it` is empty, the result is the empty List even if `f` is null.
-
+		If `it` is empty, the result is the empty Array even if `f` is null.
 		Otherwise if `f` is null, the result is unspecified.
 	**/
-	public static function filter<A>( it : Iterable<A>, f : A -> Bool ) {
-		var l = new List<A>();
-		for( x in it )
-			if( f(x) )
-				l.add(x);
-		return l;
+	public static function filter<A>(it:Iterable<A>, f:(item:A) -> Bool) {
+		return [for (x in it) if (f(x)) x];
 	}
 
 	/**
@@ -202,9 +180,9 @@ class Lambda {
 
 		If `it` or `f` are null, the result is unspecified.
 	**/
-	public static function fold<A,B>( it : Iterable<A>, f : A -> B -> B, first : B ) : B {
-		for( x in it )
-			first = f(x,first);
+	public static function fold<A, B>(it:Iterable<A>, f:(item:A, result:B) -> B, first:B):B {
+		for (x in it)
+			first = f(x, first);
 		return first;
 	}
 
@@ -214,14 +192,14 @@ class Lambda {
 
 		This function traverses all elements.
 	**/
-	public static function count<A>( it : Iterable<A>, ?pred : A -> Bool ) {
+	public static function count<A>(it:Iterable<A>, ?pred:(item:A) -> Bool) {
 		var n = 0;
-		if( pred == null )
-			for( _ in it )
+		if (pred == null)
+			for (_ in it)
 				n++;
 		else
-			for( x in it )
-				if( pred(x) )
+			for (x in it)
+				if (pred(x))
 					n++;
 		return n;
 	}
@@ -229,7 +207,7 @@ class Lambda {
 	/**
 		Tells if Iterable `it` does not contain any element.
 	**/
-	public static function empty<T>( it : Iterable<T> ) : Bool {
+	public static function empty<T>(it:Iterable<T>):Bool {
 		return !it.iterator().hasNext();
 	}
 
@@ -240,10 +218,10 @@ class Lambda {
 
 		If `v` does not exist in `it`, the result is -1.
 	**/
-	public static function indexOf<T>( it : Iterable<T>, v : T ) : Int {
+	public static function indexOf<T>(it:Iterable<T>, v:T):Int {
 		var i = 0;
-		for( v2 in it ) {
-			if( v == v2 )
+		for (v2 in it) {
+			if (v == v2)
 				return i;
 			i++;
 		}
@@ -260,26 +238,26 @@ class Lambda {
 
 		If `f` is null, the result is unspecified.
 	**/
-	public static function find<T>( it : Iterable<T>, f : T -> Bool ) : Null<T> {
-		for( v in it ) {
-			if(f(v)) return v;
+	public static function find<T>(it:Iterable<T>, f:(item:T) -> Bool):Null<T> {
+		for (v in it) {
+			if (f(v))
+				return v;
 		}
 		return null;
 	}
 
 	/**
-		Returns a new List containing all elements of Iterable `a` followed by
+		Returns a new Array containing all elements of Iterable `a` followed by
 		all elements of Iterable `b`.
 
 		If `a` or `b` are null, the result is unspecified.
 	**/
-	public static function concat<T>( a : Iterable<T>, b : Iterable<T> ) : List<T> {
-		var l = new List();
-		for( x in a )
-			l.add(x);
-		for( x in b )
-			l.add(x);
+	public static function concat<T>(a:Iterable<T>, b:Iterable<T>):Array<T> {
+		var l = new Array();
+		for (x in a)
+			l.push(x);
+		for (x in b)
+			l.push(x);
 		return l;
 	}
-
 }
diff --git a/std/List.hx b/std/List.hx
index 66e9f995d1a230b667e6b789a5713a835dc73432..ee5b506794ca21d0849ac98fe6d091186b5c0f84 100644
--- a/std/List.hx
+++ b/std/List.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,263 +19,4 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-/**
-	A linked-list of elements. The list is composed of element container objects
-	that are chained together. It is optimized so that adding or removing an
-	element does not imply copying the whole list content every time.
-
-	@see https://haxe.org/manual/std-List.html
-**/
-class List<T> {
-
-	private var h : ListNode<T>;
-	private var q : ListNode<T>;
-
-	/**
-		The length of `this` List.
-	**/
-	public var length(default,null) : Int;
-
-	/**
-		Creates a new empty list.
-	**/
-	public function new() {
-		length = 0;
-	}
-
-	/**
-		Adds element `item` at the end of `this` List.
-
-		`this.length` increases by 1.
-	**/
-	public function add( item : T ) {
-		var x = ListNode.create(item, null);
-		if( h == null )
-			h = x;
-		else
-			q.next = x;
-		q = x;
-		length++;
-	}
-
-	/**
-		Adds element `item` at the beginning of `this` List.
-
-		`this.length` increases by 1.
-	**/
-	public function push( item : T ) {
-		var x = ListNode.create(item, h);
-		h = x;
-		if( q == null )
-			q = x;
-		length++;
-	}
-
-	/**
-		Returns the first element of `this` List, or null if no elements exist.
-
-		This function does not modify `this` List.
-	**/
-	public function first() : Null<T> {
-		return if( h == null ) null else h.item;
-	}
-
-	/**
-		Returns the last element of `this` List, or null if no elements exist.
-
-		This function does not modify `this` List.
-	**/
-	public function last() : Null<T> {
-		return if( q == null ) null else q.item;
-	}
-
-
-	/**
-		Returns the first element of `this` List, or null if no elements exist.
-
-		The element is removed from `this` List.
-	**/
-	public function pop() : Null<T> {
-		if( h == null )
-			return null;
-		var x = h.item;
-		h = h.next;
-		if( h == null )
-			q = null;
-		length--;
-		return x;
-	}
-
-	/**
-		Tells if `this` List is empty.
-	**/
-	public function isEmpty() : Bool {
-		return (h == null);
-	}
-
-	/**
-		Empties `this` List.
-
-		This function does not traverse the elements, but simply sets the
-		internal references to null and `this.length` to 0.
-	**/
-	public function clear() : Void {
-		h = null;
-		q = null;
-		length = 0;
-	}
-
-	/**
-		Removes the first occurrence of `v` in `this` List.
-
-		If `v` is found by checking standard equality, it is removed from `this`
-		List and the function returns true.
-
-		Otherwise, false is returned.
-	**/
-	public function remove( v : T ) : Bool {
-		var prev:ListNode<T> = null;
-		var l = h;
-		while( l != null ) {
-			if( l.item == v ) {
-				if( prev == null )
-					h = l.next;
-				else
-					prev.next = l.next;
-				if( q == l )
-					q = prev;
-				length--;
-				return true;
-			}
-			prev = l;
-			l = l.next;
-		}
-		return false;
-	}
-
-	/**
-		Returns an iterator on the elements of the list.
-	**/
-	public inline function iterator() : ListIterator<T> {
-		return new ListIterator<T>(h);
-	}
-
-	/**
-		Returns a string representation of `this` List.
-
-		The result is enclosed in { } with the individual elements being
-		separated by a comma.
-	**/
-	public function toString() {
-		var s = new StringBuf();
-		var first = true;
-		var l = h;
-		s.add("{");
-		while( l != null ) {
-			if( first )
-				first = false;
-			else
-				s.add(", ");
-			s.add(Std.string(l.item));
-			l = l.next;
-		}
-		s.add("}");
-		return s.toString();
-	}
-
-	/**
-		Returns a string representation of `this` List, with `sep` separating
-		each element.
-	**/
-	public function join(sep : String) {
-		var s = new StringBuf();
-		var first = true;
-		var l = h;
-		while( l != null ) {
-			if( first )
-				first = false;
-			else
-				s.add(sep);
-			s.add(l.item);
-			l = l.next;
-		}
-		return s.toString();
-	}
-
-	/**
-		Returns a list filtered with `f`. The returned list will contain all
-		elements for which `f(x) == true`.
-	**/
-	public function filter( f : T -> Bool ) {
-		var l2 = new List();
-		var l = h;
-		while( l != null ) {
-			var v = l.item;
-			l = l.next;
-			if( f(v) )
-				l2.add(v);
-		}
-		return l2;
-	}
-
-	/**
-		Returns a new list where all elements have been converted by the
-		function `f`.
-	**/
-	public function map<X>(f : T -> X) : List<X> {
-		var b = new List();
-		var l = h;
-		while( l != null ) {
-			var v = l.item;
-			l = l.next;
-			b.add(f(v));
-		}
-		return b;
-	}
-
-}
-
-#if neko
-private extern class ListNode<T> extends neko.NativeArray<Dynamic> {
-	var item(get,set):T;
-	var next(get,set):ListNode<T>;
-	private inline function get_item():T return this[0];
-	private inline function set_item(v:T):T return this[0] = v;
-	private inline function get_next():ListNode<T> return this[1];
-	private inline function set_next(v:ListNode<T>):ListNode<T> return this[1] = v;
-	inline static function create<T>(item:T, next:ListNode<T>):ListNode<T> {
-		return untyped __dollar__array(item, next);
-	}
-}
-#else
-private class ListNode<T> {
-	public var item:T;
-	public var next:ListNode<T>;
-	public function new(item:T, next:ListNode<T>) {
-		this.item = item;
-		this.next = next;
-	}
-	@:extern public inline static function create<T>(item:T, next:ListNode<T>):ListNode<T> {
-		return new ListNode(item, next);
-	}
-}
-#end
-
-private class ListIterator<T> {
-	var head:ListNode<T>;
-
-	public inline function new(head:ListNode<T>) {
-		this.head = head;
-	}
-
-	public inline function hasNext():Bool {
-		return head != null;
-	}
-
-	public inline function next():T {
-		var val = head.item;
-		head = head.next;
-		return val;
-	}
-}
+typedef List<T> = haxe.ds.List<T>;
diff --git a/std/Map.hx b/std/Map.hx
index e9eece5542fe0fd5a81a673cc68f0adc751fd9fe..4f38a916b910f2c7719064ef97ed64b8f36e9b95 100644
--- a/std/Map.hx
+++ b/std/Map.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,152 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-import haxe.ds.StringMap;
-import haxe.ds.IntMap;
-import haxe.ds.HashMap;
-import haxe.ds.ObjectMap;
-import haxe.ds.WeakMap;
-import haxe.ds.EnumValueMap;
-import haxe.Constraints.IMap;
-
- /**
-	Map allows key to value mapping for arbitrary value types, and many key
-	types.
-
-	This is a multi-type abstract, it is instantiated as one of its
-	specialization types depending on its type parameters.
-
-	A Map can be instantiated without explicit type parameters. Type inference
-	will then determine the type parameters from the usage.
-
-	Maps can also be created with `key1 => value1, key2 => value2` syntax.
-
-	Map is an abstract type, it is not available at runtime.
-
-	@see https://haxe.org/manual/std-Map.html
-**/
-@:multiType(@:followWithAbstracts K)
-abstract Map<K,V>(IMap<K,V> ) {
-
-	/**
-		Creates a new Map.
-
-		This becomes a constructor call to one of the specialization types in
-		the output. The rules for that are as follows:
-
-		1. if K is a `String`, `haxe.ds.StringMap` is used
-		2. if K is an `Int`, `haxe.ds.IntMap` is used
-		3. if K is an `EnumValue`, `haxe.ds.EnumValueMap` is used
-		4. if K is any other class or structure, `haxe.ds.ObjectMap` is used
-		5. if K is any other type, it causes a compile-time error
-
-		(Cpp) Map does not use weak keys on ObjectMap by default.
-	**/
-	public function new();
-
-	/**
-		Maps `key` to `value`.
-
-		If `key` already has a mapping, the previous value disappears.
-
-		If `key` is null, the result is unspecified.
-	**/
-	public inline function set(key:K, value:V) this.set(key, value);
-
-	/**
-		Returns the current mapping of `key`.
-
-		If no such mapping exists, null is returned.
-
-		Note that a check like `map.get(key) == null` can hold for two reasons:
-
-		1. the map has no mapping for `key`
-		2. the map has a mapping with a value of `null`
-
-		If it is important to distinguish these cases, `exists()` should be
-		used.
-
-		If `key` is null, the result is unspecified.
-	**/
-	@:arrayAccess public inline function get(key:K) return this.get(key);
-
-	/**
-		Returns true if `key` has a mapping, false otherwise.
-
-		If `key` is null, the result is unspecified.
-	**/
-	public inline function exists(key:K) return this.exists(key);
-
-	/**
-		Removes the mapping of `key` and returns true if such a mapping existed,
-		false otherwise.
-
-		If `key` is null, the result is unspecified.
-	**/
-	public inline function remove(key:K) return this.remove(key);
-
-	/**
-		Returns an Iterator over the keys of `this` Map.
-
-		The order of keys is undefined.
-	**/
-	public inline function keys():Iterator<K> {
-		return this.keys();
-	}
-
-	/**
-		Returns an Iterator over the values of `this` Map.
-
-		The order of values is undefined.
-	**/
-	public inline function iterator():Iterator<V> {
-		return this.iterator();
-	}
-
-	/**
-		Returns a String representation of `this` Map.
-
-		The exact representation depends on the platform and key-type.
-	**/
-	public inline function toString():String {
-		return this.toString();
-	}
-
-	@:arrayAccess @:noCompletion public inline function arrayWrite(k:K, v:V):V {
-		this.set(k, v);
-		return v;
-	}
-
-	@:to static inline function toStringMap<K:String,V>(t:IMap<K,V>):StringMap<V> {
-		return new StringMap<V>();
-	}
-
-	@:to static inline function toIntMap<K:Int,V>(t:IMap<K,V>):IntMap<V> {
-		return new IntMap<V>();
-	}
-
-	@:to static inline function toEnumValueMapMap<K:EnumValue,V>(t:IMap<K,V>):EnumValueMap<K,V> {
-		return new EnumValueMap<K, V>();
-	}
-
-	@:to static inline function toObjectMap<K:{ },V>(t:IMap<K,V>):ObjectMap<K,V> {
-		return new ObjectMap<K, V>();
-	}
-
-	@:from static inline function fromStringMap<V>(map:StringMap<V>):Map< String, V > {
-		return cast map;
-	}
-
-	@:from static inline function fromIntMap<V>(map:IntMap<V>):Map< Int, V > {
-		return cast map;
-	}
-
-	@:from static inline function fromObjectMap<K:{ }, V>(map:ObjectMap<K,V>):Map<K,V> {
-		return cast map;
-	}
-}
+typedef Map<K, V> = haxe.ds.Map<K, V>;
 
 @:dox(hide)
 @:deprecated
-typedef IMap<K, V> = haxe.Constraints.IMap<K, V>;
\ No newline at end of file
+typedef IMap<K, V> = haxe.Constraints.IMap<K, V>;
diff --git a/std/Math.hx b/std/Math.hx
index 8837f100049c0255f517f9b2e9ce9747fbbd23f8..1fa4503afbdcb318862a4d2f59b0571bce7150ca 100644
--- a/std/Math.hx
+++ b/std/Math.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,20 +19,22 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 /**
 	This class defines mathematical functions and constants.
 
 	@see https://haxe.org/manual/std-math.html
 **/
-#if cpp @:include("hxMath.h") #end
+#if cpp
+@:include("hxMath.h")
+#end
 @:pure
-extern class Math
-{
+extern class Math {
 	/**
 		Represents the ratio of the circumference of a circle to its diameter,
 		specified by the constant, π. `PI` is approximately 3.141592653589793.
 	**/
-	static var PI(default,null) : Float;
+	static var PI(default, null):Float;
 
 	/**
 		A special `Float` constant which denotes negative infinity.
@@ -45,7 +47,7 @@ extern class Math
 		If this constant is converted to an `Int`, e.g. through `Std.int()`, the
 		result is unspecified.
 	**/
-	static var NEGATIVE_INFINITY(default, null) : Float;
+	static var NEGATIVE_INFINITY(default, null):Float;
 
 	/**
 		A special `Float` constant which denotes positive infinity.
@@ -58,7 +60,7 @@ extern class Math
 		If this constant is converted to an `Int`, e.g. through `Std.int()`, the
 		result is unspecified.
 	**/
-	static var POSITIVE_INFINITY(default,null) : Float;
+	static var POSITIVE_INFINITY(default, null):Float;
 
 	/**
 		A special `Float` constant which denotes an invalid number.
@@ -73,12 +75,8 @@ extern class Math
 		result is unspecified.
 
 		In order to test if a value is `NaN`, you should use `Math.isNaN()` function.
-
-		@php In PHP versions prior to 5.3.1 VC 9 there may be unexpected
-		results when performing arithmetic operations with `NaN` on Windows,
-		see <https://bugs.php.net/bug.php?id=42143>
 	**/
-	static var NaN(default, null) : Float;
+	static var NaN(default, null):Float;
 
 	/**
 		Returns the absolute value of `v`.
@@ -233,16 +231,16 @@ extern class Math
 		Returns a pseudo-random number which is greater than or equal to 0.0,
 		and less than 1.0.
 	**/
-	static function random() : Float;
+	static function random():Float;
 
-	#if ((flash && !as3) || cpp)
+	#if ((flash && !as3) || cpp || eval)
 	/**
 		Returns the largest integer value that is not greater than `v`, as a `Float`.
 
 		If `v` is is `NaN`, `NEGATIVE_INFINITY` or `POSITIVE_INFINITY`,
 		the result is unspecified.
 	**/
-	static function ffloor( v : Float ) : Float;
+	static function ffloor(v:Float):Float;
 
 	/**
 		Returns the smallest integer value that is not less than `v`, as a `Float`.
@@ -250,7 +248,7 @@ extern class Math
 		If `v` is is `NaN`, `NEGATIVE_INFINITY` or `POSITIVE_INFINITY`,
 		the result is unspecified.
 	**/
-	static function fceil( v : Float ) : Float;
+	static function fceil(v:Float):Float;
 
 	/**
 		Rounds `v` to the nearest integer value, as a Float.
@@ -260,32 +258,28 @@ extern class Math
 		If `v` is is `NaN`, `NEGATIVE_INFINITY` or `POSITIVE_INFINITY`,
 		the result is unspecified.
 	**/
-	static function fround( v : Float ) : Float;
-
+	static function fround(v:Float):Float;
 	#else
-
-	static inline function ffloor( v : Float ) : Float {
+	static inline function ffloor(v:Float):Float {
 		return floor(v);
 	}
 
-	static inline function fceil( v : Float ) : Float {
+	static inline function fceil(v:Float):Float {
 		return ceil(v);
 	}
 
-	static inline function fround( v : Float ) : Float {
+	static inline function fround(v:Float):Float {
 		return round(v);
 	}
-
 	#end
 
-
 	/**
 		Tells if `f` is a finite number.
 
 		If `f` is `POSITIVE_INFINITY`, `NEGATIVE_INFINITY` or `NaN`, the result
 		is `false`, otherwise the result is `true`.
 	**/
-	static function isFinite( f : Float ) : Bool;
+	static function isFinite(f:Float):Bool;
 
 	/**
 		Tells if `f` is not a valid number.
@@ -294,35 +288,28 @@ extern class Math
 		In particular, both `POSITIVE_INFINITY` and `NEGATIVE_INFINITY` are
 		not considered `NaN`.
 	**/
-	static function isNaN( f : Float ) : Bool;
+	static function isNaN(f:Float):Bool;
 
-	private static function __init__() : Void untyped {
-	#if flash
-		NaN = __global__["Number"].NaN;
-		NEGATIVE_INFINITY = __global__["Number"].NEGATIVE_INFINITY;
-		POSITIVE_INFINITY = __global__["Number"].POSITIVE_INFINITY;
-	#else
-		Math.__name__ = ["Math"];
-		Math.NaN = Number["NaN"];
-		Math.NEGATIVE_INFINITY = Number["NEGATIVE_INFINITY"];
-		Math.POSITIVE_INFINITY = Number["POSITIVE_INFINITY"];
-	#end
-		Math.isFinite = function(i) {
-			return
-			#if flash
-			__global__["isFinite"](i);
-			#else
-			false;
-			#end
-		};
-		Math.isNaN = function(i) {
-			return
+	#if !eval
+	private static function __init__():Void
+		untyped {
 			#if flash
-			__global__["isNaN"](i);
+			NaN = __global__["Number"].NaN;
+			NEGATIVE_INFINITY = __global__["Number"].NEGATIVE_INFINITY;
+			POSITIVE_INFINITY = __global__["Number"].POSITIVE_INFINITY;
 			#else
-			false;
+			// TODO: Abandoned code block? Js has its own _std/Math.hx
+			Math.__name__ = ["Math"];
+			Math.NaN = Number["NaN"];
+			Math.NEGATIVE_INFINITY = Number["NEGATIVE_INFINITY"];
+			Math.POSITIVE_INFINITY = Number["POSITIVE_INFINITY"];
 			#end
-		};
-	}
-
+			Math.isFinite = function(i) {
+				return #if flash __global__["isFinite"](i); #else false; #end
+			};
+			Math.isNaN = function(i) {
+				return #if flash __global__["isNaN"](i); #else false; #end
+			};
+		}
+	#end
 }
diff --git a/std/Reflect.hx b/std/Reflect.hx
index 03807936b75f71a419e951e29572ebb2df4e2d87..e91dd8a6a340fc8e3e1e5b341a2d96924eb664d8 100644
--- a/std/Reflect.hx
+++ b/std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 /**
 	The Reflect API is a way to manipulate values dynamically through an
 	abstract interface in an untyped manner. Use with care.
@@ -26,7 +27,6 @@
 	@see https://haxe.org/manual/std-reflection.html
 **/
 extern class Reflect {
-
 	/**
 		Tells if structure `o` has a field named `field`.
 
@@ -35,7 +35,7 @@ extern class Reflect {
 
 		If `o` or `field` are null, the result is unspecified.
 	**/
-	public static function hasField( o : Dynamic, field : String ) : Bool;
+	public static function hasField(o:Dynamic, field:String):Bool;
 
 	/**
 		Returns the value of the field named `field` on object `o`.
@@ -51,7 +51,7 @@ extern class Reflect {
 		(As3) If used on a property field, the getter will be invoked. It is
 		not possible to obtain the value directly.
 	**/
-	public static function field( o : Dynamic, field : String ) : Dynamic;
+	public static function field(o:Dynamic, field:String):Dynamic;
 
 	/**
 		Sets the field named `field` of object `o` to value `value`.
@@ -64,7 +64,7 @@ extern class Reflect {
 		(As3) If used on a property field, the setter will be invoked. It is
 		not possible to set the value directly.
 	**/
-	public static function setField( o : Dynamic, field : String, value : Dynamic ) : Void;
+	public static function setField(o:Dynamic, field:String, value:Dynamic):Void;
 
 	/**
 		Returns the value of the field named `field` on object `o`, taking
@@ -75,7 +75,7 @@ extern class Reflect {
 
 		If `o` or `field` are null, the result is unspecified.
 	**/
-	public static function getProperty( o : Dynamic, field : String ) : Dynamic;
+	public static function getProperty(o:Dynamic, field:String):Dynamic;
 
 	/**
 		Sets the field named `field` of object `o` to value `value`, taking
@@ -86,12 +86,22 @@ extern class Reflect {
 
 		If `field` is null, the result is unspecified.
 	**/
-	public static function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void;
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void;
 
 	/**
-		Call a method with the given object and arguments.
+		Call a method `func` with the given arguments `args`.
+
+		The object `o` is ignored in most cases. It serves as the `this`-context in the following
+		situations:
+
+		* (neko) Allows switching the context to `o` in all cases.
+		* (macro) Same as neko for Haxe 3. No context switching in Haxe 4.
+		* (js, lua) Require the `o` argument if `func` does not, but should have a context.
+			This can occur by accessing a function field natively, e.g. through `Reflect.field`
+			or by using `(object : Dynamic).field`. However, if `func` has a context, `o` is
+			ignored like on other targets.
 	**/
-	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic;
+	public static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic;
 
 	/**
 		Returns the fields of structure `o`.
@@ -101,14 +111,14 @@ extern class Reflect {
 
 		If `o` is null, the result is unspecified.
 	**/
-	public static function fields( o : Dynamic ) : Array<String>;
+	public static function fields(o:Dynamic):Array<String>;
 
 	/**
 		Returns true if `f` is a function, false otherwise.
 
 		If `f` is null, the result is false.
 	**/
-	public static function isFunction( f : Dynamic ) : Bool;
+	public static function isFunction(f:Dynamic):Bool;
 
 	/**
 		Compares `a` and `b`.
@@ -131,17 +141,21 @@ extern class Reflect {
 		If `a` and `b` are null, the result is 0. If only one of them is null,
 		the result is unspecified.
 	**/
-	public static function compare<T>( a : T, b : T ) : Int;
+	public static function compare<T>(a:T, b:T):Int;
 
 	/**
 		Compares the functions `f1` and `f2`.
 
+		If `f1` or `f2` are null, the result is false.
 		If `f1` or `f2` are not functions, the result is unspecified.
 
 		Otherwise the result is true if `f1` and the `f2` are physically equal,
 		false otherwise.
+
+		If `f1` or `f2` are member method closures, the result is true if they
+		are closures of the same method on the same object value, false otherwise.
 	**/
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool;
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool;
 
 	/**
 		Tells if `v` is an object.
@@ -155,7 +169,7 @@ extern class Reflect {
 
 		Otherwise, including if `v` is null, the result is false.
 	**/
-	public static function isObject( v : Dynamic ) : Bool;
+	public static function isObject(v:Dynamic):Bool;
 
 	/**
 		Tells if `v` is an enum value.
@@ -165,7 +179,7 @@ extern class Reflect {
 
 		Otherwise, including if `v` is null, the result is false.
 	**/
-	public static function isEnumValue( v : Dynamic ) : Bool;
+	public static function isEnumValue(v:Dynamic):Bool;
 
 	/**
 		Removes the field named `field` from structure `o`.
@@ -174,22 +188,21 @@ extern class Reflect {
 
 		If `o` or `field` are null, the result is unspecified.
 	**/
-	public static function deleteField( o : Dynamic, field : String ) : Bool;
+	public static function deleteField(o:Dynamic, field:String):Bool;
 
 	/**
 		Copies the fields of structure `o`.
 
 		This is only guaranteed to work on anonymous structures.
 
-		If `o` is null, the result is unspecified.
+		If `o` is null, the result is `null`.
 	**/
-	public static function copy<T>( o : T ) : T;
+	public static function copy<T>(o:Null<T>):Null<T>;
 
 	/**
 		Transform a function taking an array of arguments into a function that can
 		be called with any number of arguments.
 	**/
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic;
-
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic;
 }
diff --git a/std/Std.hx b/std/Std.hx
index 10cffb3a32a8188be1cefbedc9e4c6511cd80dd6..e919ae3164316dcd5fede0e224af4f988a02d8b2 100644
--- a/std/Std.hx
+++ b/std/Std.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#if !(core_api || cross)
+#if !(core_api || cross || eval)
 #error "Please don't add haxe/std to your classpath, instead set HAXE_STD_PATH env var"
 #end
 
@@ -27,29 +27,33 @@
 	The Std class provides standard methods for manipulating basic types.
 **/
 extern class Std {
-
 	/**
 		Tells if a value `v` is of the type `t`. Returns `false` if `v` or `t` are null.
+
+		If `t` is a class or interface with `@:generic` meta, the result is `false`.
 	**/
-	public static function is( v : Dynamic, t : Dynamic ) : Bool;
+	public static function is(v:Dynamic, t:Dynamic):Bool;
 
 	/**
-		Checks if object `value` is an instance of class `c`.
+		Checks if object `value` is an instance of class or interface `c`.
 
-		Compiles only if the class specified by `c` can be assigned to the type
+		Compiles only if the type specified by `c` can be assigned to the type
 		of `value`.
 
 		This method checks if a downcast is possible. That is, if the runtime
-		type of `value` is assignable to the class specified by `c`, `value` is
+		type of `value` is assignable to the type specified by `c`, `value` is
 		returned. Otherwise null is returned.
 
-		This method is not guaranteed to work with interfaces or core types such
-		as `String`, `Array` and `Date`.
+		This method is not guaranteed to work with core types such as `String`,
+		`Array` and `Date`.
 
 		If `value` is null, the result is null. If `c` is null, the result is
 		unspecified.
 	**/
-	public static function instance<T:{},S:T>( value : T, c : Class<S> ) : S;
+	public static function downcast<T:{}, S:T>(value:T, c:Class<S>):S;
+
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	public static function instance<T:{}, S:T>(value:T, c:Class<S>):S;
 
 	/**
 		Converts any value to a String.
@@ -69,14 +73,14 @@ extern class Std {
 
 		If s is null, "null" is returned.
 	**/
-	public static function string( s : Dynamic ) : String;
+	public static function string(s:Dynamic):String;
 
 	/**
 		Converts a `Float` to an `Int`, rounded towards 0.
 
 		If `x` is outside of the signed Int32 range, or is `NaN`, `NEGATIVE_INFINITY` or `POSITIVE_INFINITY`, the result is unspecified.
 	**/
-	public static function int( x : Float ) : Int;
+	public static function int(x:Float):Int;
 
 	/**
 		Converts a `String` to an `Int`.
@@ -96,9 +100,10 @@ extern class Std {
 		Leading 0s that are not part of the 0x/0X hexadecimal notation are ignored, which means octal
 		notation is not supported.
 
-		If the input cannot be recognized, the result is `null`.
+		If `x` is null, the result is unspecified.
+		If `x` cannot be parsed as integer, the result is `null`.
 	**/
-	public static function parseInt( x : String ) : Null<Int>;
+	public static function parseInt(x:String):Null<Int>;
 
 	/**
 		Converts a `String` to a `Float`.
@@ -108,12 +113,12 @@ extern class Std {
 
 		Additionally, decimal notation may contain a single `.` to denote the start of the fractions.
 	**/
-	public static function parseFloat( x : String ) : Float;
+	public static function parseFloat(x:String):Float;
 
 	/**
 		Return a random integer between 0 included and `x` excluded.
 
 		If `x <= 1`, the result is always 0.
 	**/
-	public static function random( x : Int ) : Int;
+	public static function random(x:Int):Int;
 }
diff --git a/std/StdTypes.hx b/std/StdTypes.hx
index 8a2a62c6f5e2129ce6d96264390783509994ce02..2da4ff0a72144720baf0a6d92021a634b7750b65 100644
--- a/std/StdTypes.hx
+++ b/std/StdTypes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,7 +26,10 @@
 
 	@see https://haxe.org/manual/types-void.html
 **/
-@:coreType abstract Void { }
+#if jvm
+@:runtimeValue
+#end
+@:coreType abstract Void {}
 
 /**
 	The standard `Float` type, this is a double-precision IEEE 64bit float.
@@ -40,7 +43,7 @@
 	@see https://haxe.org/manual/types-basic-types.html
 	@see https://haxe.org/manual/types-nullability.html
 **/
-@:coreType @:notNull @:runtimeValue abstract Float { }
+@:coreType @:notNull @:runtimeValue abstract Float {}
 
 /**
 	The standard `Int` type. Its precision depends on the platform.
@@ -55,9 +58,9 @@
 	@see https://haxe.org/manual/std-math-integer-math.html
 	@see https://haxe.org/manual/types-nullability.html
 **/
-@:coreType @:notNull @:runtimeValue abstract Int to Float { }
+@:coreType @:notNull @:runtimeValue abstract Int to Float {}
 
-#if (java || cs || hl)
+#if (java || cs || hl || cpp)
 /**
 	Single-precision IEEE 32bit float (4-byte).
 **/
@@ -65,14 +68,19 @@
 #end
 
 /**
-	`Null` can be useful in two cases. In order to document some methods
-	that accept or can return a `null` value, or for the Flash compiler and AS3
-	generator to distinguish between base values that can be `null` and others that
-	can't.
+	`Null<T>` is a wrapper that can be used to make the basic types `Int`,
+	`Float` and `Bool` nullable on static targets.
+
+	If null safety is enabled, only types wrapped in `Null<T>` are nullable.
+
+	Otherwise, it has no effect on non-basic-types, but it can be useful as a way to document
+	that `null` is an acceptable value for a method argument, return value or variable.
 
 	@see https://haxe.org/manual/types-nullability.html
 **/
-typedef Null<T> = T
+@:forward
+@:coreType
+abstract Null<T> from T to T {}
 
 /**
 	The standard Boolean type, which can either be `true` or `false`.
@@ -83,8 +91,7 @@ typedef Null<T> = T
 	@see https://haxe.org/manual/types-bool.html
 	@see https://haxe.org/manual/types-nullability.html
 **/
-@:coreType @:notNull @:runtimeValue abstract Bool {
-}
+@:coreType @:notNull @:runtimeValue abstract Bool {}
 
 /**
 	`Dynamic` is a special type which is compatible with all other types.
@@ -95,8 +102,7 @@ typedef Null<T> = T
 
 	@see https://haxe.org/manual/types-dynamic.html
 **/
-@:coreType @:runtimeValue abstract Dynamic<T> {
-}
+@:coreType @:runtimeValue abstract Dynamic<T> {}
 
 /**
 	An `Iterator` is a structure that permits iteration over elements of type `T`.
@@ -108,7 +114,6 @@ typedef Null<T> = T
 	@see https://haxe.org/manual/lf-iterators.html
 **/
 typedef Iterator<T> = {
-
 	/**
 		Returns `false` if the iteration is complete, `true` otherwise.
 
@@ -117,7 +122,7 @@ typedef Iterator<T> = {
 		in custom iterators any logic may be used to determine the completion
 		state.
 	**/
-	function hasNext() : Bool;
+	function hasNext():Bool;
 
 	/**
 		Returns the current item of the `Iterator` and advances to the next one.
@@ -128,8 +133,7 @@ typedef Iterator<T> = {
 		On the other hand, iterators should not require a call to `hasNext()`
 		before the first call to `next()` if an element is available.
 	**/
-	function next() : T;
-
+	function next():T;
 }
 
 /**
@@ -139,7 +143,20 @@ typedef Iterator<T> = {
 	@see https://haxe.org/manual/lf-iterators.html
 **/
 typedef Iterable<T> = {
-	function iterator() : Iterator<T>;
+	function iterator():Iterator<T>;
+}
+
+/**
+	A `KeyValueIterator` is an `Iterator` that has a key and a value.
+**/
+typedef KeyValueIterator<K, V> = Iterator<{key:K, value:V}>;
+
+/**
+	A `KeyValueIterable` is a data structure which has a `keyValueIterator()`
+	method to iterate over key-value-pairs.
+**/
+typedef KeyValueIterable<K, V> = {
+	function keyValueIterator():KeyValueIterator<K, V>;
 }
 
 /**
@@ -152,4 +169,4 @@ typedef Iterable<T> = {
 
 	@see https://haxe.org/manual/types-abstract-array-access.html
 **/
-extern interface ArrayAccess<T> { }
+extern interface ArrayAccess<T> {}
diff --git a/std/String.hx b/std/String.hx
index 74663a3248d06a41322b26a916f806c6958dea96..5f48050bd5e58941ab101c7b306b7f277c9e1e69 100644
--- a/std/String.hx
+++ b/std/String.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 /**
 	The basic String class.
 
@@ -29,34 +30,29 @@
 
 	String can be concatenated by using the `+` operator. If an operand is not a
 	String, it is passed through `Std.string()` first.
-	
+
 	@see https://haxe.org/manual/std-String.html
 **/
 extern class String {
-
 	/**
 		The number of characters in `this` String.
 	**/
-	var length(default,null) : Int;
+	var length(default, null):Int;
 
 	/**
 		Creates a copy from a given String.
 	**/
-	function new(string:String) : Void;
+	function new(string:String):Void;
 
 	/**
 		Returns a String where all characters of `this` String are upper case.
-
-		Affects the characters `a-z`. Other characters remain unchanged.
 	**/
-	function toUpperCase() : String;
+	function toUpperCase():String;
 
 	/**
 		Returns a String where all characters of `this` String are lower case.
-
-		Affects the characters `A-Z`. Other characters remain unchanged.
 	**/
-	function toLowerCase() : String;
+	function toLowerCase():String;
 
 	/**
 		Returns the character at position `index` of `this` String.
@@ -64,7 +60,7 @@ extern class String {
 		If `index` is negative or exceeds `this.length`, the empty String `""`
 		is returned.
 	**/
-	function charAt(index : Int) : String;
+	function charAt(index:Int):String;
 
 	/**
 		Returns the character code at position `index` of `this` String.
@@ -75,33 +71,37 @@ extern class String {
 		used instead to inline the character code at compile time. Note that
 		this only works on String literals of length 1.
 	**/
-	function charCodeAt( index : Int) : Null<Int>;
+	function charCodeAt(index:Int):Null<Int>;
 
 	/**
 		Returns the position of the leftmost occurrence of `str` within `this`
 		String.
 
 		If `startIndex` is given, the search is performed within the substring
-		of `this` String starting from `startIndex`. Otherwise the search is
-		performed within `this` String. In either case, the returned position
-		is relative to the beginning of `this` String.
+		of `this` String starting from `startIndex` (if `startIndex` is posivite
+		or 0) or `max(this.length + startIndex, 0)` (if `startIndex` is negative).
+
+		If `startIndex` exceeds `this.length`, -1 is returned.
+
+		Otherwise the search is performed within `this` String. In either case,
+		the returned position is relative to the beginning of `this` String.
 
 		If `str` cannot be found, -1 is returned.
 	**/
-	function indexOf( str : String, ?startIndex : Int ) : Int;
+	function indexOf(str:String, ?startIndex:Int):Int;
 
 	/**
 		Returns the position of the rightmost occurrence of `str` within `this`
 		String.
 
 		If `startIndex` is given, the search is performed within the substring
-		of `this` String from 0 to `startIndex`. Otherwise the search is
-		performed within `this` String. In either case, the returned position
+		of `this` String from 0 to `startIndex + str.length`. Otherwise the search
+		is performed within `this` String. In either case, the returned position
 		is relative to the beginning of `this` String.
 
 		If `str` cannot be found, -1 is returned.
 	**/
-	function lastIndexOf( str : String, ?startIndex : Int ) : Int;
+	function lastIndexOf(str:String, ?startIndex:Int):Int;
 
 	/**
 		Splits `this` String at each occurrence of `delimiter`.
@@ -123,7 +123,7 @@ extern class String {
 		result `Array` contains a leading (or trailing) empty String `""` element.
 		Two subsequent delimiters also result in an empty String `""` element.
 	**/
-	function split( delimiter : String ) : Array<String>;
+	function split(delimiter:String):Array<String>;
 
 	/**
 		Returns `len` characters of `this` String, starting at position `pos`.
@@ -140,7 +140,7 @@ extern class String {
 
 		If `len` is negative, the result is unspecified.
 	**/
-	function substr( pos : Int, ?len : Int ) : String;
+	function substr(pos:Int, ?len:Int):String;
 
 	/**
 		Returns the part of `this` String from `startIndex` to but not including `endIndex`.
@@ -155,12 +155,12 @@ extern class String {
 		If the (possibly swapped) `startIndex` exceeds `this.length`, the empty
 		String `""` is returned.
 	**/
-	function substring( startIndex : Int, ?endIndex : Int ) : String;
+	function substring(startIndex:Int, ?endIndex:Int):String;
 
 	/**
 		Returns the String itself.
 	**/
-	function toString() : String;
+	function toString():String;
 
 	/**
 		Returns the String corresponding to the character code `code`.
@@ -168,5 +168,5 @@ extern class String {
 		If `code` is negative or has another invalid value, the result is
 		unspecified.
 	**/
-	@:pure static function fromCharCode( code : Int ) : String;
+	@:pure static function fromCharCode(code:Int):String;
 }
diff --git a/std/StringBuf.hx b/std/StringBuf.hx
index 6b80b1178186b0c89a84f721cc4d2cc985253614..1f84574b1c49868c014ae6fb64c619c8a85735d5 100644
--- a/std/StringBuf.hx
+++ b/std/StringBuf.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 /**
 	A String buffer is an efficient way to build a big string by appending small
 	elements together.
@@ -31,13 +32,12 @@
 	values. However, the internal buffer cannot be modified.
 **/
 class StringBuf {
-
 	var b:String;
 
 	/**
 		The length of `this` StringBuf in characters.
 	**/
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
 	/**
 		Creates a new StringBuf instance.
@@ -48,7 +48,7 @@ class StringBuf {
 		b = "";
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return b.length;
 	}
 
@@ -61,7 +61,7 @@ class StringBuf {
 
 		If `x` is null, the String "null" is appended.
 	**/
-	public inline function add<T>( x : T ) : Void {
+	public inline function add<T>(x:T):Void {
 		b += x;
 	}
 
@@ -71,7 +71,7 @@ class StringBuf {
 		If `c` is negative or has another invalid value, the result is
 		unspecified.
 	**/
-	public inline function addChar( c : Int ) : Void {
+	public inline function addChar(c:Int):Void {
 		b += String.fromCharCode(c);
 	}
 
@@ -87,7 +87,7 @@ class StringBuf {
 		If `len` is omitted or null, the substring ranges from `pos` to the end
 		of `s`.
 	**/
-	public inline function addSub( s : String, pos : Int, ?len : Int) : Void {
+	public inline function addSub(s:String, pos:Int, ?len:Int):Void {
 		b += (len == null ? s.substr(pos) : s.substr(pos, len));
 	}
 
@@ -96,8 +96,7 @@ class StringBuf {
 
 		The buffer is not emptied by this operation.
 	**/
-	public inline function toString() : String {
+	public inline function toString():String {
 		return b;
 	}
-
 }
diff --git a/std/StringTools.hx b/std/StringTools.hx
index f3d2df54e1a1c6e6de274b06d46b300918bca931..c0dade39ba0b03c16c721cc4d32c8d1ca47a5548 100644
--- a/std/StringTools.hx
+++ b/std/StringTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
+import haxe.iterators.StringIterator;
+import haxe.iterators.StringKeyValueIterator;
+
+#if cpp
+using cpp.NativeString;
+#end
+
 /**
 	This class provides advanced methods on Strings. It is ideally used with
 	`using StringTools` and then acts as an [extension](https://haxe.org/manual/lf-static-extension.html)
@@ -27,112 +35,109 @@
 	If the first argument to any of the methods is null, the result is
 	unspecified.
 **/
-#if cpp
-using cpp.NativeString;
-#end
 class StringTools {
 	/**
 		Encode an URL by using the standard format.
 	**/
-	#if (!java && !cpp && !lua) inline #end public static function urlEncode( s : String ) : String {
+	#if (!java && !cpp && !lua && !eval) inline #end public static function urlEncode(s:String):String {
 		#if flash
-			return untyped __global__["encodeURIComponent"](s);
+		return untyped __global__["encodeURIComponent"](s);
 		#elseif neko
-			return untyped new String(_urlEncode(s.__s));
+		return untyped new String(_urlEncode(s.__s));
 		#elseif js
-			return untyped encodeURIComponent(s);
+		return untyped encodeURIComponent(s);
 		#elseif cpp
-			return untyped s.__URLEncode();
+		return untyped s.__URLEncode();
 		#elseif java
-			return postProcessUrlEncode(java.net.URLEncoder.encode(s, "UTF-8"));
+		return postProcessUrlEncode(java.net.URLEncoder.encode(s, "UTF-8"));
 		#elseif cs
-			return untyped cs.system.Uri.EscapeDataString(s);
+		return untyped cs.system.Uri.EscapeDataString(s);
 		#elseif python
-			return python.lib.urllib.Parse.quote(s, "");
+		return python.lib.urllib.Parse.quote(s, "");
 		#elseif hl
-			var len = 0;
-			var b = @:privateAccess s.bytes.urlEncode(len);
-			return @:privateAccess String.__alloc__(b,len);
+		var len = 0;
+		var b = @:privateAccess s.bytes.urlEncode(len);
+		return @:privateAccess String.__alloc__(b, len);
 		#elseif lua
-			s = lua.NativeStringTools.gsub(s, "\n", "\r\n");
-			s = lua.NativeStringTools.gsub(s, "([^%w %-%_%.%~])", function (c) {
-				return lua.NativeStringTools.format("%%%02X", lua.NativeStringTools.byte(c) + '');
-			});
-			s = lua.NativeStringTools.gsub(s, " ", "+");
-			return s;
+		s = lua.NativeStringTools.gsub(s, "\n", "\r\n");
+		s = lua.NativeStringTools.gsub(s, "([^%w %-%_%.%~])", function(c) {
+			return lua.NativeStringTools.format("%%%02X", lua.NativeStringTools.byte(c) + '');
+		});
+		s = lua.NativeStringTools.gsub(s, " ", "+");
+		return s;
 		#else
-			return null;
+		return null;
 		#end
 	}
 
-#if java
-	private static function postProcessUrlEncode( s : String ) : String {
+	#if java
+	private static function postProcessUrlEncode(s:String):String {
 		var ret = new StringBuf();
-		var i = 0,
-		    len = s.length;
+		var i = 0, len = s.length;
 		while (i < len) {
-			switch(_charAt(s, i++)) {
-			case '+'.code:
-				ret.add('%20');
-			case '%'.code if (i <= len - 2):
-				var c1 = _charAt(s, i++),
-				    c2 = _charAt(s, i++);
-				switch[c1, c2] {
-				case ['2'.code, '1'.code]:
-					ret.addChar('!'.code);
-				case ['2'.code, '7'.code]:
-					ret.addChar('\''.code);
-				case ['2'.code, '8'.code]:
-					ret.addChar('('.code);
-				case ['2'.code, '9'.code]:
-					ret.addChar(')'.code);
-				case ['7'.code, 'E'.code] | ['7'.code, 'e'.code]:
-					ret.addChar('~'.code);
-				case _:
-					ret.addChar('%'.code);
-					ret.addChar(cast c1);
-					ret.addChar(cast c2);
-				}
-			case chr:
-				ret.addChar(cast chr);
+			switch (_charAt(s, i++)) {
+				case '+'.code:
+					ret.add('%20');
+				case '%'.code if (i <= len - 2):
+					var c1 = _charAt(s, i++), c2 = _charAt(s, i++);
+					switch [c1, c2] {
+						case ['2'.code, '1'.code]:
+							ret.addChar('!'.code);
+						case ['2'.code, '7'.code]:
+							ret.addChar('\''.code);
+						case ['2'.code, '8'.code]:
+							ret.addChar('('.code);
+						case ['2'.code, '9'.code]:
+							ret.addChar(')'.code);
+						case ['7'.code, 'E'.code] | ['7'.code, 'e'.code]:
+							ret.addChar('~'.code);
+						case _:
+							ret.addChar('%'.code);
+							ret.addChar(cast c1);
+							ret.addChar(cast c2);
+					}
+				case var chr:
+					ret.addChar(cast chr);
 			}
 		}
 		return ret.toString();
 	}
-#end
+	#end
 
 	/**
 		Decode an URL using the standard format.
 	**/
-	#if (!java && !cpp && !lua) inline #end public static function urlDecode( s : String ) : String {
+	#if (!java && !cpp && !lua && !eval) inline #end public static function urlDecode(s:String):String {
 		#if flash
-			return untyped __global__["decodeURIComponent"](s.split("+").join(" "));
+		return untyped __global__["decodeURIComponent"](s.split("+").join(" "));
 		#elseif neko
-			return untyped new String(_urlDecode(s.__s));
+		return untyped new String(_urlDecode(s.__s));
 		#elseif js
-			return untyped decodeURIComponent(s.split("+").join(" "));
+		return untyped decodeURIComponent(s.split("+").join(" "));
 		#elseif cpp
-			return untyped s.__URLDecode();
+		return untyped s.__URLDecode();
 		#elseif java
-			try
-				return untyped __java__("java.net.URLDecoder.decode(s, \"UTF-8\")")
-			catch (e:Dynamic) throw e;
+		try
+			return java.net.URLDecoder.decode(s, "UTF-8")
+		catch (e:Dynamic)
+			throw e;
 		#elseif cs
-			return untyped cs.system.Uri.UnescapeDataString(s);
+		return untyped cs.system.Uri.UnescapeDataString(s);
 		#elseif python
-			return python.lib.urllib.Parse.unquote(s);
+		return python.lib.urllib.Parse.unquote(s);
 		#elseif hl
-			var len = 0;
-			var b = @:privateAccess s.bytes.urlDecode(len);
-			return @:privateAccess String.__alloc__(b,len);
+		var len = 0;
+		var b = @:privateAccess s.bytes.urlDecode(len);
+		return @:privateAccess String.__alloc__(b, len);
 		#elseif lua
-			s = lua.NativeStringTools.gsub (s, "+", " ");
-			s = lua.NativeStringTools.gsub (s, "%%(%x%x)",
-				function(h) {return lua.NativeStringTools.char(lua.Lua.tonumber(h,16));});
-			s = lua.NativeStringTools.gsub (s, "\r\n", "\n");
-			return s;
+		s = lua.NativeStringTools.gsub(s, "+", " ");
+		s = lua.NativeStringTools.gsub(s, "%%(%x%x)", function(h) {
+			return lua.NativeStringTools.char(lua.Lua.tonumber(h, 16));
+		});
+		s = lua.NativeStringTools.gsub(s, "\r\n", "\n");
+		return s;
 		#else
-			return null;
+		return null;
 		#end
 	}
 
@@ -150,9 +155,25 @@ class StringTools {
 		- `"` becomes `&quot`;
 		- `'` becomes `&#039`;
 	**/
-	public static function htmlEscape( s : String, ?quotes : Bool ) : String {
-		s = s.split("&").join("&amp;").split("<").join("&lt;").split(">").join("&gt;");
-		return quotes ? s.split('"').join("&quot;").split("'").join("&#039;") : s;
+	public static function htmlEscape(s:String, ?quotes:Bool):String {
+		var buf = new StringBuf();
+		for (code in new haxe.iterators.StringIteratorUnicode(s)) {
+			switch (code) {
+				case '&'.code:
+					buf.add("&amp;");
+				case '<'.code:
+					buf.add("&lt;");
+				case '>'.code:
+					buf.add("&gt;");
+				case '"'.code if (quotes):
+					buf.add("&quot;");
+				case '\''.code if (quotes):
+					buf.add("&#039;");
+				case _:
+					buf.addChar(code);
+			}
+		}
+		return buf.toString();
 	}
 
 	/**
@@ -169,8 +190,26 @@ class StringTools {
 		- `&quot;` becomes `"`
 		- `&#039;` becomes `'`
 	**/
-	public static function htmlUnescape( s : String ) : String {
-		return s.split("&gt;").join(">").split("&lt;").join("<").split("&quot;").join('"').split("&#039;").join("'").split("&amp;").join("&");
+	public static function htmlUnescape(s:String):String {
+		return s.split("&gt;")
+			.join(">")
+			.split("&lt;")
+			.join("<")
+			.split("&quot;")
+			.join('"')
+			.split("&#039;")
+			.join("'")
+			.split("&amp;")
+			.join("&");
+	}
+
+	/**
+		Returns `true` if `s` contains `value` and  `false` otherwise.
+
+		When `value` is `null`, the result is unspecified.
+	**/
+	public static inline function contains(s:String, value:String):Bool {
+		return s.indexOf(value) != -1;
 	}
 
 	/**
@@ -180,24 +219,26 @@ class StringTools {
 
 		If `start` is the empty String `""`, the result is true.
 	**/
-	public static #if (cs || java) inline #end function startsWith( s : String, start : String ) : Bool {
+	public static #if (cs || java || python) inline #end function startsWith(s:String, start:String):Bool {
 		#if java
-		return untyped s.startsWith(start);
+		return (cast s : java.NativeString).startsWith(start);
 		#elseif cs
 		return untyped s.StartsWith(start);
 		#elseif cpp
-		if (s.length<start.length)
+		if (s.length < start.length)
 			return false;
 		var p0 = s.c_str();
 		var p1 = start.c_str();
-		for(i in 0...start.length)
-			if ( p0.at(i) != p1.at(i) )
+		for (i in 0...start.length)
+			if (p0.at(i) != p1.at(i))
 				return false;
 		return true;
 		#elseif hl
-		return @:privateAccess (s.length >= start.length && s.bytes.compare(0,start.bytes,0,start.length<<1) == 0);
+		return @:privateAccess (s.length >= start.length && s.bytes.compare(0, start.bytes, 0, start.length << 1) == 0);
+		#elseif python
+		return python.NativeStringTools.startswith(s, start);
 		#else
-		return( s.length >= start.length && s.substr(0, start.length) == start );
+		return (s.length >= start.length && s.lastIndexOf(start, 0) == 0);
 		#end
 	}
 
@@ -208,28 +249,30 @@ class StringTools {
 
 		If `end` is the empty String `""`, the result is true.
 	**/
-	public static #if (cs || java) inline #end function endsWith( s : String, end : String ) : Bool {
+	public static #if (cs || java || python) inline #end function endsWith(s:String, end:String):Bool {
 		#if java
-		return untyped s.endsWith(end);
+		return (cast s : java.NativeString).endsWith(end);
 		#elseif cs
 		return untyped s.EndsWith(end);
 		#elseif cpp
-		if (s.length<end.length)
+		if (s.length < end.length)
 			return false;
-		var p0 = s.c_str().add( s.length-end.length );
+		var p0 = s.c_str().add(s.length - end.length);
 		var p1 = end.c_str();
-		for(i in 0...end.length)
-			if ( p0.at(i) != p1.at(i) )
+		for (i in 0...end.length)
+			if (p0.at(i) != p1.at(i))
 				return false;
 		return true;
 		#elseif hl
 		var elen = end.length;
 		var slen = s.length;
 		return @:privateAccess (slen >= elen && s.bytes.compare((slen - elen) << 1, end.bytes, 0, elen << 1) == 0);
+		#elseif python
+		return python.NativeStringTools.endswith(s, end);
 		#else
 		var elen = end.length;
 		var slen = s.length;
-		return( slen >= elen && s.substr(slen - elen, elen) == end );
+		return (slen >= elen && s.indexOf(end, (slen - elen)) == (slen - elen));
 		#end
 	}
 
@@ -242,11 +285,12 @@ class StringTools {
 		If `s` is the empty String `""`, or if pos is not a valid position within
 		`s`, the result is false.
 	**/
-	public static function isSpace( s : String, pos : Int ) : Bool {
+	public static function isSpace(s:String, pos:Int):Bool {
 		#if (python || lua)
-		if (s.length == 0 || pos < 0 || pos >= s.length) return false;
+		if (s.length == 0 || pos < 0 || pos >= s.length)
+			return false;
 		#end
-		var c = s.charCodeAt( pos );
+		var c = s.charCodeAt(pos);
 		return (c > 8 && c < 14) || c == 32;
 	}
 
@@ -259,17 +303,17 @@ class StringTools {
 		If `s` is the empty String `""` or consists only of space characters, the
 		result is the empty String `""`.
 	**/
-	public #if cs inline #end static function ltrim( s : String ) : String {
+	public #if cs inline #end static function ltrim(s:String):String {
 		#if cs
 		return untyped s.TrimStart();
 		#else
 		var l = s.length;
 		var r = 0;
-		while( r < l && isSpace(s,r) ){
+		while (r < l && isSpace(s, r)) {
 			r++;
 		}
-		if( r > 0 )
-			return s.substr(r, l-r);
+		if (r > 0)
+			return s.substr(r, l - r);
 		else
 			return s;
 		#end
@@ -284,18 +328,18 @@ class StringTools {
 		If `s` is the empty String `""` or consists only of space characters, the
 		result is the empty String `""`.
 	**/
-	public #if cs inline #end static function rtrim( s : String ) : String {
+	public #if cs inline #end static function rtrim(s:String):String {
 		#if cs
 		return untyped s.TrimEnd();
 		#else
 		var l = s.length;
 		var r = 0;
-		while( r < l && isSpace(s,l-r-1) ){
+		while (r < l && isSpace(s, l - r - 1)) {
 			r++;
 		}
-		if( r > 0 ){
-			return s.substr(0, l-r);
-		}else{
+		if (r > 0) {
+			return s.substr(0, l - r);
+		} else {
 			return s;
 		}
 		#end
@@ -306,11 +350,11 @@ class StringTools {
 
 		This is a convenience function for `ltrim(rtrim(s))`.
 	**/
-	public #if (cs || java) inline #end static function trim( s : String ) : String {
+	public #if (cs || java) inline #end static function trim(s:String):String {
 		#if cs
 		return untyped s.Trim();
 		#elseif java
-		return untyped s.trim();
+		return (cast s : java.NativeString).trim();
 		#else
 		return ltrim(rtrim(s));
 		#end
@@ -328,14 +372,17 @@ class StringTools {
 
 		If `c` is null, the result is unspecified.
 	**/
-	public static function lpad( s : String, c : String, l : Int ) : String {
+	public static function lpad(s:String, c:String, l:Int):String {
 		if (c.length <= 0)
 			return s;
 
-		while (s.length < l) {
-			s = c + s;
+		var buf = new StringBuf();
+		l -= s.length;
+		while (buf.length < l) {
+			buf.add(c);
 		}
-		return s;
+		buf.add(s);
+		return buf.toString();
 	}
 
 	/**
@@ -350,14 +397,16 @@ class StringTools {
 
 		If `c` is null, the result is unspecified.
 	**/
-	public static function rpad( s : String, c : String, l : Int ) : String {
+	public static function rpad(s:String, c:String, l:Int):String {
 		if (c.length <= 0)
 			return s;
 
-		while (s.length < l) {
-			s = s + c;
+		var buf = new StringBuf();
+		buf.add(s);
+		while (buf.length < l) {
+			buf.add(c);
 		}
-		return s;
+		return buf.toString();
 	}
 
 	/**
@@ -365,18 +414,17 @@ class StringTools {
 		String `by`.
 
 		If `sub` is the empty String `""`, `by` is inserted after each character
-		of `s`. If `by` is also the empty String `""`, `s` remains unchanged.
-
-		This is a convenience function for `s.split(sub).join(by)`.
+		of `s` except the last one. If `by` is also the empty String `""`, `s`
+		remains unchanged.
 
 		If `sub` or `by` are null, the result is unspecified.
 	**/
-	public static function replace( s : String, sub : String, by : String ) : String {
+	public static function replace(s:String, sub:String, by:String):String {
 		#if java
 		if (sub.length == 0)
 			return s.split(sub).join(by);
 		else
-			return untyped s.replace(sub, by);
+			return (cast s : java.NativeString).replace(sub, by);
 		#elseif cs
 		if (sub.length == 0)
 			return s.split(sub).join(by);
@@ -393,18 +441,18 @@ class StringTools {
 		If `digits` is specified, the resulting String is padded with "0" until
 		its `length` equals `digits`.
 	**/
-	public static function hex( n : Int, ?digits : Int ) {
+	public static function hex(n:Int, ?digits:Int) {
 		#if flash
-			var n : UInt = n;
-			var s : String = untyped n.toString(16);
-			s = s.toUpperCase();
+		var n:UInt = n;
+		var s:String = untyped n.toString(16);
+		s = s.toUpperCase();
 		#else
-			var s = "";
-			var hexChars = "0123456789ABCDEF";
-			do {
-				s = hexChars.charAt(n&15) + s;
-				n >>>= 4;
-			} while( n > 0 );
+		var s = "";
+		var hexChars = "0123456789ABCDEF";
+		do {
+			s = hexChars.charAt(n & 15) + s;
+			n >>>= 4;
+		} while (n > 0);
 		#end
 		#if python
 		if (digits != null && s.length < digits) {
@@ -414,9 +462,9 @@ class StringTools {
 			}
 		}
 		#else
-		if( digits != null )
-			while( s.length < digits )
-				s = "0"+s;
+		if (digits != null)
+			while (s.length < digits)
+				s = "0" + s;
 		#end
 		return s;
 	}
@@ -435,7 +483,7 @@ class StringTools {
 		This operation is not guaranteed to work if `s` contains the `\0`
 		character.
 	**/
-	public static inline function fastCodeAt( s : String, index : Int ) : Int {
+	public static #if !eval inline #end function fastCodeAt(s:String, index:Int):Int {
 		#if neko
 		return untyped __dollar__sget(s.__s, index);
 		#elseif cpp
@@ -443,37 +491,59 @@ class StringTools {
 		#elseif flash
 		return untyped s.cca(index);
 		#elseif java
-		return ( index < s.length ) ? cast(_charAt(s, index), Int) : -1;
+		return (index < s.length) ? cast(_charAt(s, index), Int) : -1;
 		#elseif cs
-		return ( cast(index, UInt) < s.length ) ? cast(s[index], Int) : -1;
+		return (cast(index, UInt) < s.length) ? cast(s[index], Int) : -1;
 		#elseif js
-		return (untyped s).charCodeAt(index);
+		return (cast s).charCodeAt(index);
 		#elseif python
 		return if (index >= s.length) -1 else python.internal.UBuiltins.ord(python.Syntax.arrayAccess(s, index));
 		#elseif hl
 		return @:privateAccess s.bytes.getUI16(index << 1);
 		#elseif lua
-		return lua.NativeStringTools.byte(s,index+1);
+		#if lua_vanilla
+		return lua.NativeStringTools.byte(s, index + 1);
+		#else
+		return lua.lib.luautf8.Utf8.byte(s, index + 1);
+		#end
 		#else
 		return untyped s.cca(index);
 		#end
 	}
 
-	/*
+	/**
+		Returns an iterator of the char codes.
+
+		Note that char codes may differ across platforms because of different
+		internal encoding of strings in different runtimes.
+		For the consistent cross-platform UTF8 char codes see `haxe.iterators.StringIteratorUnicode`.
+	**/
+	public static inline function iterator(s:String):StringIterator {
+		return new StringIterator(s);
+	}
+
+	/**
+		Returns an iterator of the char indexes and codes.
+
+		Note that char codes may differ across platforms because of different
+		internal encoding of strings in different of runtimes.
+		For the consistent cross-platform UTF8 char codes see `haxe.iterators.StringKeyValueIteratorUnicode`.
+	**/
+	public static inline function keyValueIterator(s:String):StringKeyValueIterator {
+		return new StringKeyValueIterator(s);
+	}
+
+	/**
 		Tells if `c` represents the end-of-file (EOF) character.
-	*/
-	@:noUsing public static inline function isEof( c : Int ) : Bool {
+	**/
+	@:noUsing public static inline function isEof(c:Int):Bool {
 		#if (flash || cpp || hl)
 		return c == 0;
 		#elseif js
 		return c != c; // fast NaN
-		#elseif (neko || lua)
+		#elseif (neko || lua || eval)
 		return c == null;
-		#elseif cs
-		return c == -1;
-		#elseif java
-		return c == -1;
-		#elseif python
+		#elseif (cs || java || python)
 		return c == -1;
 		#else
 		return false;
@@ -484,26 +554,19 @@ class StringTools {
 		Returns a String that can be used as a single command line argument
 		on Unix.
 		The input will be quoted, or escaped if necessary.
-	*/
+	**/
+	@:noCompletion
+	@:deprecated('StringTools.quoteUnixArg() is deprecated. Use haxe.SysTools.quoteUnixArg() instead.')
 	public static function quoteUnixArg(argument:String):String {
-		// Based on cpython's shlex.quote().
-		// https://hg.python.org/cpython/file/a3f076d4f54f/Lib/shlex.py#l278
-
-		if (argument == "")
-			return "''";
-
-		if (!~/[^a-zA-Z0-9_@%+=:,.\/-]/.match(argument))
-			return argument;
-
-		// use single quotes, and put single quotes into double quotes
-		// the string $'b is then quoted as '$'"'"'b'
-		return "'" + replace(argument, "'", "'\"'\"'") + "'";
+		return inline haxe.SysTools.quoteUnixArg(argument);
 	}
 
 	/**
 		Character codes of the characters that will be escaped by `quoteWinArg(_, true)`.
-	*/
-	public static var winMetaCharacters = [" ".code, "(".code, ")".code, "%".code, "!".code, "^".code, "\"".code, "<".code, ">".code, "&".code, "|".code, "\n".code, "\r".code, ",".code, ";".code];
+	**/
+	@:noCompletion
+	@:deprecated('StringTools.winMetaCharacters is deprecated. Use haxe.SysTools.winMetaCharacters instead.')
+	public static var winMetaCharacters:Array<Int> = cast haxe.SysTools.winMetaCharacters;
 
 	/**
 		Returns a String that can be used as a single command line argument
@@ -513,80 +576,36 @@ class StringTools {
 		http://msdn.microsoft.com/en-us/library/ms880421
 
 		Examples:
-		```
+		```haxe
 		quoteWinArg("abc") == "abc";
 		quoteWinArg("ab c") == '"ab c"';
 		```
-	*/
+	**/
+	@:noCompletion
+	@:deprecated('StringTools.quoteWinArg() is deprecated. Use haxe.SysTools.quoteWinArg() instead.')
 	public static function quoteWinArg(argument:String, escapeMetaCharacters:Bool):String {
-		// If there is no space, tab, back-slash, or double-quotes, and it is not an empty string.
-		if (!~/^[^ \t\\"]+$/.match(argument)) {
-
-			// Based on cpython's subprocess.list2cmdline().
-			// https://hg.python.org/cpython/file/50741316dd3a/Lib/subprocess.py#l620
-
-			var result = new StringBuf();
-			var needquote = argument.indexOf(" ") != -1 || argument.indexOf("\t") != -1 || argument == "";
-
-			if (needquote)
-				result.add('"');
-
-			var bs_buf = new StringBuf();
-			for (i in 0...argument.length) {
-				switch (argument.charCodeAt(i)) {
-					case "\\".code:
-						// Don't know if we need to double yet.
-						bs_buf.add("\\");
-					case '"'.code:
-						// Double backslashes.
-						var bs = bs_buf.toString();
-						result.add(bs);
-						result.add(bs);
-						bs_buf = new StringBuf();
-						result.add('\\"');
-					case c:
-						// Normal char
-						if (bs_buf.length > 0) {
-							result.add(bs_buf.toString());
-							bs_buf = new StringBuf();
-						}
-						result.addChar(c);
-				}
-			}
-
-			// Add remaining backslashes, if any.
-			result.add(bs_buf.toString());
-
-			if (needquote) {
-				result.add(bs_buf.toString());
-				result.add('"');
-			}
-
-			argument = result.toString();
-		}
-
-		if (escapeMetaCharacters) {
-			var result = new StringBuf();
-			for (i in 0...argument.length) {
-				var c = argument.charCodeAt(i);
-				if (winMetaCharacters.indexOf(c) >= 0) {
-					result.addChar("^".code);
-				}
-				result.addChar(c);
-			}
-			return result.toString();
-		} else {
-			return argument;
-		}
+		return inline haxe.SysTools.quoteWinArg(argument, escapeMetaCharacters);
 	}
 
 	#if java
-	private static inline function _charAt(str:String, idx:Int):java.StdTypes.Char16 return untyped str._charAt(idx);
+	private static inline function _charAt(str:String, idx:Int):java.StdTypes.Char16
+		return (cast str : java.NativeString).charAt(idx);
 	#end
 
 	#if neko
-	private static var _urlEncode = neko.Lib.load("std","url_encode",1);
-	private static var _urlDecode = neko.Lib.load("std","url_decode",1);
+	private static var _urlEncode = neko.Lib.load("std", "url_encode", 1);
+	private static var _urlDecode = neko.Lib.load("std", "url_decode", 1);
 	#end
 
+	#if utf16
+	static inline var MIN_SURROGATE_CODE_POINT = 65536;
+
+	static inline function utf16CodePointAt(s:String, index:Int):Int {
+		var c = StringTools.fastCodeAt(s, index);
+		if (c >= 0xD800 && c <= 0xDBFF) {
+			c = ((c - 0xD7C0) << 10) | (StringTools.fastCodeAt(s, index + 1) & 0x3FF);
+		}
+		return c;
+	}
+	#end
 }
diff --git a/std/Sys.hx b/std/Sys.hx
index 4d80ba7daa85fe6cf5a3a36573829ef68a138173..fe3781421133b1bc7c5e9b3171967f04848a796f 100644
--- a/std/Sys.hx
+++ b/std/Sys.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,130 +19,153 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 /**
-	This class gives you access to many base functionalities of system platforms. Looks in `sys` sub packages for more system APIs.
+	This class provides access to various base functions of system platforms.
+	Look in the `sys` package for more system APIs.
 **/
 @:require(sys)
 extern class Sys {
-
 	/**
-		Print any value on the standard output.
+		Prints any value to the standard output.
 	**/
-	static function print( v : Dynamic ) : Void;
+	static function print(v:Dynamic):Void;
 
 	/**
-		Print any value on the standard output, followed by a newline.
+		Prints any value to the standard output, followed by a newline.
+		On Windows, this function outputs a CRLF newline.
+		LF newlines are printed on all other platforms.
 	**/
-	static function println( v : Dynamic ) : Void;
+	static function println(v:Dynamic):Void;
 
 	/**
-		Returns all the arguments that were passed by the command line.
+		Returns all the arguments that were passed in the command line.
+		This does not include the interpreter or the name of the program file.
+
+		(java)(eval) On Windows, non-ASCII Unicode arguments will not work correctly.
+
+		(cs) Non-ASCII Unicode arguments will not work correctly.
 	**/
-	static function args() : Array<String>;
+	static function args():Array<String>;
 
 	/**
-		Returns the value of the given environment variable.
+		Returns the value of the given environment variable, or `null` if it
+		doesn't exist.
 	**/
-	static function getEnv( s : String ) : String;
+	static function getEnv(s:String):String;
 
 	/**
-		Set the value of the given environment variable.
+		Sets the value of the given environment variable.
+
+		(java) This functionality is not available on Java; calling this function will throw.
 	**/
-	static function putEnv( s : String, v : String ) : Void;
+	static function putEnv(s:String, v:String):Void;
 
 	/**
 		Returns all environment variables.
 	**/
-	static function environment() : Map<String,String>;
+	static function environment():Map<String, String>;
 
 	/**
-		Suspend the current execution for the given time (in seconds).
+		Suspends execution for the given length of time (in seconds).
 	**/
-	static function sleep( seconds : Float ) : Void;
+	static function sleep(seconds:Float):Void;
 
 	/**
-		Change the current time locale, which will affect `DateTools.format` date formating.
-		Returns true if the locale was successfully changed
+		Changes the current time locale, which will affect `DateTools.format` date formating.
+		Returns `true` if the locale was successfully changed.
 	**/
-	static function setTimeLocale( loc : String ) : Bool;
+	static function setTimeLocale(loc:String):Bool;
 
 	/**
-		Get the current working directory (usually the one in which the program was started)
+		Gets the current working directory (usually the one in which the program was started).
 	**/
-	static function getCwd() : String;
+	static function getCwd():String;
 
 	/**
-		Change the current working directory.
+		Changes the current working directory.
+
+		(java) This functionality is not available on Java; calling this function will throw.
 	**/
-	static function setCwd( s : String ) : Void;
+	static function setCwd(s:String):Void;
 
 	/**
-		Returns the name of the system you are running on. For instance :
-			"Windows", "Linux", "BSD" and "Mac" depending on your desktop OS.
+		Returns the type of the current system. Possible values are:
+		 - `"Windows"`
+		 - `"Linux"`
+		 - `"BSD"`
+		 - `"Mac"`
 	**/
-	static function systemName() : String;
+	static function systemName():String;
 
 	/**
-		Run the given command. The command output will be printed on the same output as the current process.
-		The current process will block until the command terminates and it will return the command result (0 if there was no error).
+		Runs the given command. The command output will be printed to the same output as the current process.
+		The current process will block until the command terminates.
+		The return value is the exit code of the command (usually `0` indicates no error).
 
-		Command arguments can be passed in two ways: 1. using `args`, 2. appending to `cmd` and leaving `args` as `null`.
+		Command arguments can be passed in two ways:
 
-		 1. When using `args` to pass command arguments, each argument will be automatically quoted, and shell meta-characters will be escaped if needed.
-		`cmd` should be an executable name that can be located in the `PATH` environment variable, or a path to an executable.
+		 1. Using `args` to pass command arguments. Each argument will be automatically quoted and shell meta-characters will be escaped if needed.
+		`cmd` should be an executable name that can be located in the `PATH` environment variable, or a full path to an executable.
 
 		 2. When `args` is not given or is `null`, command arguments can be appended to `cmd`. No automatic quoting/escaping will be performed. `cmd` should be formatted exactly as it would be when typed at the command line.
 		It can run executables, as well as shell commands that are not executables (e.g. on Windows: `dir`, `cd`, `echo` etc).
 
-		Read the `sys.io.Process` api for a more complete way to start background processes.
+		Use the `sys.io.Process` API for more complex tasks, such as background processes, or providing input to the command.
 	**/
-	static function command( cmd : String, ?args : Array<String> ) : Int;
+	static function command(cmd:String, ?args:Array<String>):Int;
 
 	/**
-		Exit the current process with the given error code.
+		Exits the current process with the given exit code.
+
+		(macro)(eval) Being invoked in a macro or eval context (e.g. with `-x` or `--run`) immediately terminates
+		the compilation process, which also prevents the execution of any `--next` sections of compilation arguments.
 	**/
-	static function exit( code : Int ) : Void;
+	static function exit(code:Int):Void;
 
 	/**
-		Gives the most precise timestamp value (in seconds).
+		Gives the most precise timestamp value available (in seconds).
 	**/
-	static function time() : Float;
+	static function time():Float;
 
 	/**
-		Gives the most precise timestamp value (in seconds) but only account for the actual time spent running on the CPU for the current thread/process.
+		Gives the most precise timestamp value available (in seconds),
+		but only accounts for the actual time spent running on the CPU for the current thread/process.
 	**/
-	static function cpuTime() : Float;
+	static function cpuTime():Float;
 
 	/**
 		Returns the path to the current executable that we are running.
 	**/
-	@:deprecated("Use programPath instead") static function executablePath() : String;
+	@:deprecated("Use programPath instead") static function executablePath():String;
 
 	/**
 		Returns the absolute path to the current program file that we are running.
 		Concretely, for an executable binary, it returns the path to the binary.
 		For a script (e.g. a PHP file), it returns the path to the script.
 	**/
-	static function programPath() : String;
+	static function programPath():String;
 
 	/**
-		Read a single input character from the standard input (without blocking) and returns it. Setting `echo` to true will also display it on the output.
+		Reads a single input character from the standard input and returns it.
+		Setting `echo` to `true` will also display the character on the output.
 	**/
-	static function getChar( echo : Bool ) : Int;
+	static function getChar(echo:Bool):Int;
 
 	/**
-		Returns the process standard input, from which you can read what user enters. Usually it will block until the user send a full input line. See `getChar` for an alternative.
+		Returns the standard input of the process, from which user input can be read.
+		Usually it will block until the user sends a full input line.
+		See `getChar` for an alternative.
 	**/
-	static function stdin() : haxe.io.Input;
+	static function stdin():haxe.io.Input;
 
 	/**
-		Returns the process standard output on which you can write.
+		Returns the standard output of the process, to which program output can be written.
 	**/
-	static function stdout() : haxe.io.Output;
+	static function stdout():haxe.io.Output;
 
 	/**
-		Returns the process standard error on which you can write.
+		Returns the standard error of the process, to which program errors can be written.
 	**/
-	static function stderr() : haxe.io.Output;
-
+	static function stderr():haxe.io.Output;
 }
diff --git a/std/Type.hx b/std/Type.hx
index ad81c2806fa033bee8dccd1b362ab8f81171ef93..dab42fdda16189631f1bf52e2b96548c3ce3d79e 100644
--- a/std/Type.hx
+++ b/std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,7 +30,6 @@
 	@see https://haxe.org/manual/std-reflection.html
 **/
 extern class Type {
-
 	/**
 		Returns the class of `o`, if `o` is a class instance.
 
@@ -38,7 +37,7 @@ extern class Type {
 
 		In general, type parameter information cannot be obtained at runtime.
 	**/
-	public static function getClass<T>( o : T ) : Class<T>;
+	public static function getClass<T>(o:T):Class<T>;
 
 	/**
 		Returns the enum of enum instance `o`.
@@ -50,8 +49,7 @@ extern class Type {
 
 		In general, type parameter information cannot be obtained at runtime.
 	**/
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic>;
-
+	public static function getEnum(o:EnumValue):Enum<Dynamic>;
 
 	/**
 		Returns the super-class of class `c`.
@@ -62,8 +60,7 @@ extern class Type {
 
 		In general, type parameter information cannot be obtained at runtime.
 	**/
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic>;
-
+	public static function getSuperClass(c:Class<Dynamic>):Class<Dynamic>;
 
 	/**
 		Returns the name of class `c`, including its path.
@@ -80,7 +77,7 @@ extern class Type {
 
 		The class name does not include any type parameters.
 	**/
-	public static function getClassName( c : Class<Dynamic> ) : String;
+	public static function getClassName(c:Class<Dynamic>):String;
 
 	/**
 		Returns the name of enum `e`, including its path.
@@ -97,7 +94,7 @@ extern class Type {
 
 		The enum name does not include any type parameters.
 	**/
-	public static function getEnumName( e : Enum<Dynamic> ) : String;
+	public static function getEnumName(e:Enum<Dynamic>):String;
 
 	/**
 		Resolves a class by name.
@@ -111,7 +108,7 @@ extern class Type {
 
 		The class name must not include any type parameters.
 	**/
-	public static function resolveClass( name : String ) : Class<Dynamic>;
+	public static function resolveClass(name:String):Class<Dynamic>;
 
 	/**
 		Resolves an enum by name.
@@ -126,7 +123,7 @@ extern class Type {
 
 		The enum name must not include any type parameters.
 	**/
-	public static function resolveEnum( name : String ) : Enum<Dynamic>;
+	public static function resolveEnum(name:String):Enum<Dynamic>;
 
 	/**
 		Creates an instance of class `cl`, using `args` as arguments to the
@@ -145,7 +142,7 @@ extern class Type {
 		In particular, default values of constructor arguments are not
 		guaranteed to be taken into account.
 	**/
-	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T;
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T;
 
 	/**
 		Creates an instance of class `cl`.
@@ -154,7 +151,7 @@ extern class Type {
 
 		If `cl` is null, the result is unspecified.
 	**/
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T;
+	public static function createEmptyInstance<T>(cl:Class<T>):T;
 
 	/**
 		Creates an instance of enum `e` by calling its constructor `constr` with
@@ -165,7 +162,7 @@ extern class Type {
 		expected number of constructor arguments, or if any argument has an
 		invalid type, the result is unspecified.
 	**/
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T;
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T;
 
 	/**
 		Creates an instance of enum `e` by calling its constructor number
@@ -179,14 +176,15 @@ extern class Type {
 		expected number of constructor arguments, or if any argument has an
 		invalid type, the result is unspecified.
 	**/
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T;
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T;
 
 	/**
-		Returns a list of the instance fields of class `c`.
+		Returns a list of the instance fields of class `c`, including
+		inherited fields.
 
 		This only includes fields which are known at compile-time. In
-		particular, using getInstanceFields(getClass(obj)) will not include
-		any fields which were added to obj at runtime.
+		particular, using `getInstanceFields(getClass(obj))` will not include
+		any fields which were added to `obj` at runtime.
 
 		The order of the fields in the returned Array is unspecified.
 
@@ -194,7 +192,7 @@ extern class Type {
 
 		(As3) This method only returns instance fields that are public.
 	**/
-	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String>;
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String>;
 
 	/**
 		Returns a list of static fields of class `c`.
@@ -207,7 +205,7 @@ extern class Type {
 
 		(As3) This method only returns class fields that are public.
 	**/
-	public static function getClassFields( c : Class<Dynamic> ) : Array<String>;
+	public static function getClassFields(c:Class<Dynamic>):Array<String>;
 
 	/**
 		Returns a list of the names of all constructors of enum `e`.
@@ -215,9 +213,9 @@ extern class Type {
 		The order of the constructor names in the returned Array is preserved
 		from the original syntax.
 
-		If `c` is null, the result is unspecified.
+		If `e` is null, the result is unspecified.
 	**/
-	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String>;
+	public static function getEnumConstructs(e:Enum<Dynamic>):Array<String>;
 
 	/**
 		Returns the runtime type of value `v`.
@@ -226,7 +224,7 @@ extern class Type {
 		per platform. Assumptions regarding this should be minimized to avoid
 		surprises.
 	**/
-	public static function typeof( v : Dynamic ) : ValueType;
+	public static function typeof(v:Dynamic):ValueType;
 
 	/**
 		Recursively compares two enum instances `a` and `b` by value.
@@ -236,7 +234,7 @@ extern class Type {
 
 		If `a` or `b` are null, the result is unspecified.
 	**/
-	public static function enumEq<T:EnumValue>( a : T, b : T ) : Bool;
+	public static function enumEq<T:EnumValue>(a:T, b:T):Bool;
 
 	/**
 		Returns the constructor name of enum instance `e`.
@@ -245,7 +243,7 @@ extern class Type {
 
 		If `e` is null, the result is unspecified.
 	**/
-	public static function enumConstructor( e : EnumValue ) : String;
+	public static function enumConstructor(e:EnumValue):String;
 
 	/**
 		Returns a list of the constructor arguments of enum instance `e`.
@@ -257,7 +255,7 @@ extern class Type {
 
 		If `e` is null, the result is unspecified.
 	**/
-	public static function enumParameters( e : EnumValue ) : Array<Dynamic>;
+	public static function enumParameters(e:EnumValue):Array<Dynamic>;
 
 	/**
 		Returns the index of enum instance `e`.
@@ -267,7 +265,7 @@ extern class Type {
 
 		If `e` is null, the result is unspecified.
 	**/
-	public static function enumIndex( e : EnumValue ) : Int;
+	public static function enumIndex(e:EnumValue):Int;
 
 	/**
 		Returns a list of all constructors of enum `e` that require no
@@ -282,11 +280,9 @@ extern class Type {
 
 		If `e` is null, the result is unspecified.
 	**/
-	public static function allEnums<T>( e : Enum<T> ) : Array<T>;
-
+	public static function allEnums<T>(e:Enum<T>):Array<T>;
 }
 
-
 /**
 	The different possible runtime types of a value.
 **/
@@ -297,7 +293,7 @@ enum ValueType {
 	TBool;
 	TObject;
 	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
 	TUnknown;
 }
diff --git a/std/UInt.hx b/std/UInt.hx
index bdef243d41192d598f9616490fc337ee6bb4234e..44d7f1795a8df66b26403318c09b18f3ae285548 100644
--- a/std/UInt.hx
+++ b/std/UInt.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 #if ((flash || flash9doc || cs || hl) && !doc_gen)
 /**
 	The unsigned `Int` type is only defined for Flash and C#. It's currently
@@ -31,68 +30,100 @@
 @:notNull
 @:runtimeValue
 @:analyzer(no_const_propagation)
-abstract UInt to Int from Int
-{
-	@:commutative @:op(A+B) private static function addI(lhs:UInt, rhs:Int):UInt;
-	@:commutative @:op(A+B) private static function addF(lhs:UInt, rhs:Float):Float;
-	@:op(A+B) private static function add(lhs:UInt, rhs:UInt):UInt;
-
-	@:commutative @:op(A*B) private static function mulI(lhs:UInt, rhs:Int):UInt;
-	@:commutative @:op(A*B) private static function mulF(lhs:UInt, rhs:Float):Float;
-	@:op(A*B) private static function mul(lhs:UInt, rhs:UInt):UInt;
-
-	@:op(A%B) private static function modI(lhs:UInt, rhs:Int):UInt;
-	@:op(A%B) private static function modF(lhs:UInt, rhs:Float):Float;
-	@:op(A%B) private static function mod(lhs:UInt, rhs:UInt):UInt;
-
-	@:op(A-B) private static function subI(lhs:UInt, rhs:Int):UInt;
-	@:op(A-B) private static function subF(lhs:UInt, rhs:Float):Float;
-	@:op(A-B) private static function sub(lhs:UInt, rhs:UInt):UInt;
-
-	@:op(A/B) private static function divI(lhs:UInt, rhs:Int):Float;
-	@:op(A/B) private static function divF(lhs:UInt, rhs:Float):Float;
-	@:op(A/B) private static function div(lhs:UInt, rhs:UInt):Float;
-
-	@:commutative @:op(A|B) private static function orI(lhs:UInt, rhs:Int):UInt;
-	@:op(A|B) private static function or(lhs:UInt, rhs:UInt):UInt;
-
-	@:commutative @:op(A^B) private static function xorI(lhs:UInt, rhs:Int):UInt;
-	@:op(A^B) private static function xor(lhs:UInt, rhs:UInt):UInt;
-
-	@:commutative @:op(A&B) private static function andI(lhs:UInt, rhs:Int):UInt;
-	@:op(A&B) private static function and(lhs:UInt, rhs:UInt):UInt;
-
-	@:op(A<<B) private static function shl(lhs:UInt, rhs:Int):UInt;
-	@:op(A>>B) private static inline function shr(lhs:UInt, rhs:Int):UInt return lhs >>> rhs;
-	@:op(A>>>B) private static function ushr(lhs:UInt, rhs:Int):UInt;
-
-	@:op(A>B) private static function gt(lhs:UInt, rhs:UInt):Bool;
-	@:op(A>=B) private static function gte(lhs:UInt, rhs:UInt):Bool;
-	@:op(A<B) private static function lt(lhs:UInt, rhs:UInt):Bool;
-	@:op(A<=B) private static function lte(lhs:UInt, rhs:UInt):Bool;
-
-	@:op(A>B) private static function gtf(lhs:UInt, rhs:Float):Bool;
-	@:op(A>B) private static function gtf2(lhs:Float, rhs:UInt):Bool;
-	@:op(A>=B) private static function gtef(lhs:UInt, rhs:Float):Bool;
-	@:op(A>=B) private static function gtef2(lhs:Float, rhs:UInt):Bool;
-	@:op(A<B) private static function ltf(lhs:UInt, rhs:Float):Bool;
-	@:op(A<B) private static function ltf2(lhs:Float, rhs:UInt):Bool;
-	@:op(A<=B) private static function ltef(lhs:UInt, rhs:Float):Bool;
-	@:op(A<=B) private static function ltef2(lhs:Float, rhs:UInt):Bool;
+abstract UInt to Int from Int {
+	@:commutative @:op(A + B) private static function addI(lhs:UInt, rhs:Int):UInt;
+
+	@:commutative @:op(A + B) private static function addF(lhs:UInt, rhs:Float):Float;
+
+	@:op(A + B) private static function add(lhs:UInt, rhs:UInt):UInt;
+
+	@:commutative @:op(A * B) private static function mulI(lhs:UInt, rhs:Int):UInt;
+
+	@:commutative @:op(A * B) private static function mulF(lhs:UInt, rhs:Float):Float;
+
+	@:op(A * B) private static function mul(lhs:UInt, rhs:UInt):UInt;
+
+	@:op(A % B) private static function modI(lhs:UInt, rhs:Int):UInt;
+
+	@:op(A % B) private static function modF(lhs:UInt, rhs:Float):Float;
+
+	@:op(A % B) private static function mod(lhs:UInt, rhs:UInt):UInt;
+
+	@:op(A - B) private static function subI(lhs:UInt, rhs:Int):UInt;
+
+	@:op(A - B) private static function subF(lhs:UInt, rhs:Float):Float;
+
+	@:op(A - B) private static function sub(lhs:UInt, rhs:UInt):UInt;
+
+	@:op(A / B) private static function divI(lhs:UInt, rhs:Int):Float;
+
+	@:op(A / B) private static function divF(lhs:UInt, rhs:Float):Float;
+
+	@:op(A / B) private static function div(lhs:UInt, rhs:UInt):Float;
+
+	@:commutative @:op(A | B) private static function orI(lhs:UInt, rhs:Int):UInt;
+
+	@:op(A | B) private static function or(lhs:UInt, rhs:UInt):UInt;
+
+	@:commutative @:op(A ^ B) private static function xorI(lhs:UInt, rhs:Int):UInt;
+
+	@:op(A ^ B) private static function xor(lhs:UInt, rhs:UInt):UInt;
+
+	@:commutative @:op(A & B) private static function andI(lhs:UInt, rhs:Int):UInt;
+
+	@:op(A & B) private static function and(lhs:UInt, rhs:UInt):UInt;
+
+	@:op(A << B) private static function shl(lhs:UInt, rhs:Int):UInt;
+
+	@:op(A >> B) private static inline function shr(lhs:UInt, rhs:Int):UInt
+		return lhs >>> rhs;
+
+	@:op(A >>> B) private static function ushr(lhs:UInt, rhs:Int):UInt;
+
+	@:op(A > B) private static function gt(lhs:UInt, rhs:UInt):Bool;
+
+	@:op(A >= B) private static function gte(lhs:UInt, rhs:UInt):Bool;
+
+	@:op(A < B) private static function lt(lhs:UInt, rhs:UInt):Bool;
+
+	@:op(A <= B) private static function lte(lhs:UInt, rhs:UInt):Bool;
+
+	@:op(A > B) private static function gtf(lhs:UInt, rhs:Float):Bool;
+
+	@:op(A > B) private static function gtf2(lhs:Float, rhs:UInt):Bool;
+
+	@:op(A >= B) private static function gtef(lhs:UInt, rhs:Float):Bool;
+
+	@:op(A >= B) private static function gtef2(lhs:Float, rhs:UInt):Bool;
+
+	@:op(A < B) private static function ltf(lhs:UInt, rhs:Float):Bool;
+
+	@:op(A < B) private static function ltf2(lhs:Float, rhs:UInt):Bool;
+
+	@:op(A <= B) private static function ltef(lhs:UInt, rhs:Float):Bool;
+
+	@:op(A <= B) private static function ltef2(lhs:Float, rhs:UInt):Bool;
 
 	@:op(~A) private static function bneg(t:UInt):UInt;
 
 	@:commutative @:op(A == B) private static function equalsInt<T:Int>(a:UInt, b:T):Bool;
+
 	@:commutative @:op(A != B) private static function notEqualsInt<T:Int>(a:UInt, b:T):Bool;
+
 	@:commutative @:op(A == B) private static function equalsFloat<T:Float>(a:UInt, b:T):Bool;
+
 	@:commutative @:op(A != B) private static function notEqualsFloat<T:Float>(a:UInt, b:T):Bool;
 
 	@:op(++A) private function prefixIncrement():UInt;
+
 	@:op(A++) private function postfixIncrement():UInt;
+
 	@:op(--A) private function prefixDecrement():UInt;
+
 	@:op(A--) private function postfixDecrement():UInt;
 }
 #else
+
 /**
 	The unsigned `Int` type is only defined for Flash and C#.
 	Simulate it for other platforms.
@@ -100,7 +131,6 @@ abstract UInt to Int from Int
 	@see https://haxe.org/manual/types-basic-types.html
 **/
 abstract UInt(Int) from Int to Int {
-
 	@:op(A + B) private static inline function add(a:UInt, b:UInt):UInt {
 		return a.toInt() + b.toInt();
 	}
@@ -117,20 +147,18 @@ abstract UInt(Int) from Int to Int {
 		return a.toInt() - b.toInt();
 	}
 
-	@:op(A > B) private static #if !js inline #end function gt(a:UInt, b:UInt):Bool {
+	@:op(A > B)
+	private static #if !js inline #end function gt(a:UInt, b:UInt):Bool {
 		var aNeg = a.toInt() < 0;
 		var bNeg = b.toInt() < 0;
-		return
-			if( aNeg != bNeg ) aNeg;
-			else a.toInt() > b.toInt();
+		return if (aNeg != bNeg) aNeg; else a.toInt() > b.toInt();
 	}
 
-	@:op(A >= B) private static #if !js inline #end function gte(a:UInt, b:UInt):Bool {
+	@:op(A >= B)
+	private static #if !js inline #end function gte(a:UInt, b:UInt):Bool {
 		var aNeg = a.toInt() < 0;
 		var bNeg = b.toInt() < 0;
-		return
-			if( aNeg != bNeg ) aNeg;
-			else a.toInt() >= b.toInt();
+		return if (aNeg != bNeg) aNeg; else a.toInt() >= b.toInt();
 	}
 
 	@:op(A < B) private static inline function lt(a:UInt, b:UInt):Bool {
@@ -166,7 +194,7 @@ abstract UInt(Int) from Int to Int {
 	}
 
 	@:op(A % B) private static inline function mod(a:UInt, b:UInt):UInt {
-		return Std.int( a.toFloat() % b.toFloat() );
+		return Std.int(a.toFloat() % b.toFloat());
 	}
 
 	@:commutative @:op(A + B) private static inline function addWithFloat(a:UInt, b:Float):Float {
@@ -217,7 +245,6 @@ abstract UInt(Int) from Int to Int {
 		return a.toFloat() >= b;
 	}
 
-
 	@:op(A > B) private static inline function floatGt(a:Float, b:UInt):Bool {
 		return a > b.toFloat();
 	}
@@ -272,7 +299,11 @@ abstract UInt(Int) from Int to Int {
 
 	// TODO: radix is just defined to deal with doc_gen issues
 	private inline function toString(?radix:Int):String {
+		#if static
 		return Std.string(toFloat());
+		#else
+		return Std.string(this == null ? null : toFloat());
+		#end
 	}
 
 	private inline function toInt():Int {
@@ -283,8 +314,7 @@ abstract UInt(Int) from Int to Int {
 		var int = toInt();
 		if (int < 0) {
 			return 4294967296.0 + int;
-		}
-		else {
+		} else {
 			// + 0.0 here to make sure we promote to Float on some platforms
 			// In particular, PHP was having issues when comparing to Int in the == op.
 			return int + 0.0;
diff --git a/std/UnicodeString.hx b/std/UnicodeString.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7ac030e0d9f002f05e457d03fd9985ca663a8020
--- /dev/null
+++ b/std/UnicodeString.hx
@@ -0,0 +1,443 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+import haxe.io.Bytes;
+import haxe.io.Encoding;
+import haxe.iterators.StringIteratorUnicode;
+import haxe.iterators.StringKeyValueIteratorUnicode;
+
+/**
+	This abstract provides consistent cross-target unicode support.
+
+	@see https://haxe.org/manual/std-UnicodeString.html
+**/
+@:forward
+@:access(StringTools)
+abstract UnicodeString(String) from String to String {
+	/**
+		Tells if `b` is a correctly encoded UTF8 byte sequence.
+	**/
+	static public function validate(b:Bytes, encoding:Encoding):Bool {
+		switch (encoding) {
+			case RawNative:
+				throw "UnicodeString.validate: RawNative encoding is not supported";
+			case UTF8:
+				var data = b.getData();
+				var pos = 0;
+				var max = b.length;
+				while (pos < max) {
+					var c:Int = Bytes.fastGet(data, pos++);
+					if (c < 0x80) {} else if (c < 0xC2) {
+						return false;
+					} else if (c < 0xE0) {
+						if (pos + 1 > max) {
+							return false;
+						}
+						var c2:Int = Bytes.fastGet(data, pos++);
+						if (c2 < 0x80 || c2 > 0xBF) {
+							return false;
+						}
+					} else if (c < 0xF0) {
+						if (pos + 2 > max) {
+							return false;
+						}
+						var c2:Int = Bytes.fastGet(data, pos++);
+						if (c == 0xE0) {
+							if (c2 < 0xA0 || c2 > 0xBF)
+								return false;
+						} else {
+							if (c2 < 0x80 || c2 > 0xBF)
+								return false;
+						}
+						var c3:Int = Bytes.fastGet(data, pos++);
+						if (c3 < 0x80 || c3 > 0xBF) {
+							return false;
+						}
+						c = (c << 16) | (c2 << 8) | c3;
+						if (0xEDA080 <= c && c <= 0xEDBFBF) { // surrogate pairs
+							return false;
+						}
+					} else if (c > 0xF4) {
+						return false;
+					} else {
+						if (pos + 3 > max) {
+							return false;
+						}
+						var c2:Int = Bytes.fastGet(data, pos++);
+						if (c == 0xF0) {
+							if (c2 < 0x90 || c2 > 0xBF)
+								return false;
+						} else if (c == 0xF4) {
+							if (c2 < 0x80 || c2 > 0x8F)
+								return false;
+						} else {
+							if (c2 < 0x80 || c2 > 0xBF)
+								return false;
+						}
+						var c3:Int = Bytes.fastGet(data, pos++);
+						if (c3 < 0x80 || c3 > 0xBF) {
+							return false;
+						}
+						var c4:Int = Bytes.fastGet(data, pos++);
+						if (c4 < 0x80 || c4 > 0xBF) {
+							return false;
+						}
+					}
+				}
+				return true;
+		}
+	}
+
+	#if target.unicode
+	/**
+		Creates an instance of UnicodeString.
+	**/
+	public inline function new(string:String):Void {
+		this = string;
+	}
+
+	/**
+		Returns an iterator of the unicode code points.
+	**/
+	public inline function iterator():StringIteratorUnicode {
+		return new StringIteratorUnicode(this);
+	}
+
+	/**
+		Returns an iterator of the code point indices and unicode code points.
+	**/
+	public inline function keyValueIterator():StringKeyValueIteratorUnicode {
+		return new StringKeyValueIteratorUnicode(this);
+	}
+
+	#if target.utf16
+	/**
+		The number of characters in `this` String.
+	**/
+	public var length(get, never):Int;
+
+	/**
+		Returns the character at position `index` of `this` String.
+
+		If `index` is negative or exceeds `this.length`, the empty String `""`
+		is returned.
+	**/
+	public function charAt(index:Int):String {
+		if (index < 0)
+			return '';
+		var unicodeOffset = 0;
+		var nativeOffset = 0;
+		while (nativeOffset < this.length) {
+			var c = StringTools.utf16CodePointAt(this, nativeOffset++);
+			if (unicodeOffset == index) {
+				return String.fromCharCode(c);
+			}
+			if (c >= StringTools.MIN_SURROGATE_CODE_POINT) {
+				nativeOffset++;
+			}
+			unicodeOffset++;
+		}
+		return '';
+	}
+
+	/**
+		Returns the character code at position `index` of `this` String.
+
+		If `index` is negative or exceeds `this.length`, `null` is returned.
+	**/
+	public function charCodeAt(index:Int):Null<Int> {
+		if (index < 0)
+			return null;
+		var unicodeOffset = 0;
+		var nativeOffset = 0;
+		while (nativeOffset < this.length) {
+			var c = StringTools.utf16CodePointAt(this, nativeOffset++);
+			if (unicodeOffset == index) {
+				return c;
+			}
+			if (c >= StringTools.MIN_SURROGATE_CODE_POINT) {
+				nativeOffset++;
+			}
+			unicodeOffset++;
+		}
+		return null;
+	}
+
+	/**
+		Returns the position of the leftmost occurrence of `str` within `this`
+		String.
+
+		If `startIndex` is given, the search is performed within the substring
+		of `this` String starting from `startIndex` (if `startIndex` is posivite
+		or 0) or `max(this.length + startIndex, 0)` (if `startIndex` is negative).
+
+		If `startIndex` exceeds `this.length`, -1 is returned.
+
+		Otherwise the search is performed within `this` String. In either case,
+		the returned position is relative to the beginning of `this` String.
+
+		If `str` cannot be found, -1 is returned.
+	**/
+	public function indexOf(str:String, ?startIndex:Int):Int {
+		if (startIndex == null) {
+			startIndex = 0;
+		} else {
+			if (startIndex < 0) {
+				startIndex = (this : UnicodeString).length + startIndex;
+			}
+		}
+
+		var unicodeOffset = 0;
+		var nativeOffset = 0;
+		var matchingOffset = 0;
+		var result = -1;
+		while (nativeOffset <= this.length) {
+			var c = StringTools.utf16CodePointAt(this, nativeOffset);
+
+			if (unicodeOffset >= startIndex) {
+				var c2 = StringTools.utf16CodePointAt(str, matchingOffset);
+				if (c == c2) {
+					if (matchingOffset == 0) {
+						result = unicodeOffset;
+					}
+					matchingOffset++;
+					if (c2 >= StringTools.MIN_SURROGATE_CODE_POINT) {
+						matchingOffset++;
+					}
+					if (matchingOffset == str.length) {
+						return result;
+					}
+				} else if (matchingOffset != 0) {
+					result = -1;
+					matchingOffset = 0;
+					continue;
+				}
+			}
+
+			nativeOffset++;
+			if (c >= StringTools.MIN_SURROGATE_CODE_POINT) {
+				nativeOffset++;
+			}
+			unicodeOffset++;
+		}
+		return -1;
+	}
+
+	/**
+		Returns the position of the rightmost occurrence of `str` within `this`
+		String.
+
+		If `startIndex` is given, the search is performed within the substring
+		of `this` String from 0 to `startIndex + str.length`. Otherwise the search
+		is performed within `this` String. In either case, the returned position
+		is relative to the beginning of `this` String.
+
+		If `str` cannot be found, -1 is returned.
+	**/
+	public function lastIndexOf(str:String, ?startIndex:Int):Int {
+		if (startIndex == null) {
+			startIndex = this.length;
+		} else if (startIndex < 0) {
+			startIndex = 0;
+		}
+
+		var unicodeOffset = 0;
+		var nativeOffset = 0;
+		var result = -1;
+		var lastIndex = -1;
+		var matchingOffset = 0;
+		var strUnicodeLength = (str : UnicodeString).length;
+		while (nativeOffset < this.length && unicodeOffset < startIndex + strUnicodeLength) {
+			var c = StringTools.utf16CodePointAt(this, nativeOffset);
+
+			var c2 = StringTools.utf16CodePointAt(str, matchingOffset);
+			if (c == c2) {
+				if (matchingOffset == 0) {
+					lastIndex = unicodeOffset;
+				}
+				matchingOffset++;
+				if (c2 >= StringTools.MIN_SURROGATE_CODE_POINT) {
+					matchingOffset++;
+				}
+				if (matchingOffset == str.length) {
+					result = lastIndex;
+					lastIndex = -1;
+				}
+			} else if (matchingOffset != 0) {
+				lastIndex = -1;
+				matchingOffset = 0;
+				continue;
+			}
+
+			nativeOffset++;
+			if (c >= StringTools.MIN_SURROGATE_CODE_POINT) {
+				nativeOffset++;
+			}
+			unicodeOffset++;
+		}
+		return result;
+	}
+
+	/**
+		Returns `len` characters of `this` String, starting at position `pos`.
+
+		If `len` is omitted, all characters from position `pos` to the end of
+		`this` String are included.
+
+		If `pos` is negative, its value is calculated from the end of `this`
+		String by `this.length + pos`. If this yields a negative value, 0 is
+		used instead.
+
+		If the calculated position + `len` exceeds `this.length`, the characters
+		from that position to the end of `this` String are returned.
+
+		If `len` is negative, the result is unspecified.
+	**/
+	public function substr(pos:Int, ?len:Int):String {
+		if (pos < 0) {
+			pos = (this : UnicodeString).length + pos;
+			if (pos < 0) {
+				pos = 0;
+			}
+		}
+		if (len != null) {
+			if (len < 0) {
+				len = (this : UnicodeString).length + len;
+			}
+			if (len <= 0) {
+				return "";
+			}
+		}
+		var unicodeOffset = 0;
+		var nativeOffset = 0;
+		var fromOffset = -1;
+		var subLength = 0;
+		while (nativeOffset < this.length) {
+			var c = StringTools.utf16CodePointAt(this, nativeOffset);
+
+			if (unicodeOffset >= pos) {
+				if (fromOffset < 0) {
+					if (len == null) {
+						return this.substr(nativeOffset);
+					}
+					fromOffset = nativeOffset;
+				}
+				subLength++;
+				if (subLength >= len) {
+					var lastOffset = (c < StringTools.MIN_SURROGATE_CODE_POINT ? nativeOffset : nativeOffset + 1);
+					return this.substr(fromOffset, lastOffset - fromOffset + 1);
+				}
+			}
+
+			nativeOffset += (c >= StringTools.MIN_SURROGATE_CODE_POINT ? 2 : 1);
+			unicodeOffset++;
+		}
+		return (fromOffset < 0 ? "" : this.substr(fromOffset));
+	}
+
+	/**
+		Returns the part of `this` String from `startIndex` to but not including `endIndex`.
+
+		If `startIndex` or `endIndex` are negative, 0 is used instead.
+
+		If `startIndex` exceeds `endIndex`, they are swapped.
+
+		If the (possibly swapped) `endIndex` is omitted or exceeds
+		`this.length`, `this.length` is used instead.
+
+		If the (possibly swapped) `startIndex` exceeds `this.length`, the empty
+		String `""` is returned.
+	**/
+	public function substring(startIndex:Int, ?endIndex:Int):String {
+		if (startIndex < 0) {
+			startIndex = 0;
+		}
+		if (endIndex != null) {
+			if (endIndex < 0) {
+				endIndex = 0;
+			}
+			if (startIndex == endIndex) {
+				return "";
+			}
+			if (startIndex > endIndex) {
+				var tmp = startIndex;
+				startIndex = endIndex;
+				endIndex = tmp;
+			}
+		}
+
+		var unicodeOffset = 0;
+		var nativeOffset = 0;
+		var fromOffset = -1;
+		var subLength = 0;
+		while (nativeOffset < this.length) {
+			var c = StringTools.utf16CodePointAt(this, nativeOffset);
+
+			if (startIndex <= unicodeOffset) {
+				if (fromOffset < 0) {
+					if (endIndex == null) {
+						return this.substr(nativeOffset);
+					}
+					fromOffset = nativeOffset;
+				}
+				subLength++;
+				if (subLength >= endIndex - startIndex) {
+					var lastOffset = (c < StringTools.MIN_SURROGATE_CODE_POINT ? nativeOffset : nativeOffset + 1);
+					return this.substr(fromOffset, lastOffset - fromOffset + 1);
+				}
+			}
+
+			nativeOffset += (c >= StringTools.MIN_SURROGATE_CODE_POINT ? 2 : 1);
+			unicodeOffset++;
+		}
+		return (fromOffset < 0 ? "" : this.substr(fromOffset));
+	}
+
+	function get_length():Int {
+		var l = 0;
+		for (c in new StringIteratorUnicode(this)) {
+			l++;
+		}
+		return l;
+	}
+	#end
+	#end
+	@:op(A < B) static function lt(a:UnicodeString, b:UnicodeString):Bool;
+
+	@:op(A <= B) static function lte(a:UnicodeString, b:UnicodeString):Bool;
+
+	@:op(A > B) static function gt(a:UnicodeString, b:UnicodeString):Bool;
+
+	@:op(A >= B) static function gte(a:UnicodeString, b:UnicodeString):Bool;
+
+	@:op(A == B) static function eq(a:UnicodeString, b:UnicodeString):Bool;
+
+	@:op(A != B) static function neq(a:UnicodeString, b:UnicodeString):Bool;
+
+	@:op(A + B) static function add(a:UnicodeString, b:UnicodeString):UnicodeString;
+
+	@:op(A += B) static function assignAdd(a:UnicodeString, b:UnicodeString):UnicodeString;
+
+	@:op(A + B) @:commutative static function add(a:UnicodeString, b:String):UnicodeString;
+
+	@:op(A += B) @:commutative static function assignAdd(a:UnicodeString, b:String):UnicodeString;
+}
diff --git a/std/Xml.hx b/std/Xml.hx
index 15e4cd51731e0924d80d58ecd5403d55a2ecc725..e9ac618f5fd717bc5074f3d7144bb45a80e592b1 100644
--- a/std/Xml.hx
+++ b/std/Xml.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,35 +25,53 @@
 
 	@see https://haxe.org/manual/std-Xml.html
 **/
-@:enum abstract XmlType(Int) {
+enum abstract XmlType(Int) {
 	/**
 		Represents an XML element type.
 	**/
 	var Element = 0;
+
 	/**
 		Represents XML parsed character data type.
 	**/
 	var PCData = 1;
+
 	/**
 		Represents XML character data type.
 	**/
 	var CData = 2;
+
 	/**
 		Represents an XML comment type.
 	**/
 	var Comment = 3;
+
 	/**
 		Represents an XML doctype element type.
 	**/
 	var DocType = 4;
+
 	/**
-	 	Represents an XML processing instruction type.
+		Represents an XML processing instruction type.
 	**/
 	var ProcessingInstruction = 5;
+
 	/**
 		Represents an XML document type.
 	**/
 	var Document = 6;
+
+	public function toString():String {
+		return switch (cast this : XmlType) {
+			case Element: "Element";
+			case PCData: "PCData";
+			case CData: "CData";
+			case Comment: "Comment";
+			case DocType: "DocType";
+			case ProcessingInstruction: "ProcessingInstruction";
+			case Document: "Document";
+		};
+	}
 }
 
 /**
@@ -65,36 +83,42 @@ class Xml {
 	/**
 		XML element type.
 	**/
-	static public var Element(default,never) = XmlType.Element;
+	static public var Element(default, never) = XmlType.Element;
+
 	/**
 		XML parsed character data type.
 	**/
-	static public var PCData(default,never) = XmlType.PCData;
+	static public var PCData(default, never) = XmlType.PCData;
+
 	/**
 		XML character data type.
 	**/
-	static public var CData(default,never) = XmlType.CData;
+	static public var CData(default, never) = XmlType.CData;
+
 	/**
 		XML comment type.
 	**/
-	static public var Comment(default,never) = XmlType.Comment;
+	static public var Comment(default, never) = XmlType.Comment;
+
 	/**
 		XML doctype element type.
 	**/
-	static public var DocType(default,never) = XmlType.DocType;
+	static public var DocType(default, never) = XmlType.DocType;
+
 	/**
-	 	XML processing instruction type.
+		XML processing instruction type.
 	**/
-	static public var ProcessingInstruction(default,never) = XmlType.ProcessingInstruction;
+	static public var ProcessingInstruction(default, never) = XmlType.ProcessingInstruction;
+
 	/**
 		XML document type.
 	**/
-	static public var Document(default,never) = XmlType.Document;
+	static public var Document(default, never) = XmlType.Document;
 
 	/**
 		Parses the String into an Xml document.
 	**/
-	static public function parse( str : String ) : Xml {
+	static public function parse(str:String):Xml {
 		return haxe.xml.Parser.parse(str);
 	}
 
@@ -103,23 +127,23 @@ class Xml {
 		accessing other functions since some might raise an exception
 		if the node type is not correct.
 	**/
-	public var nodeType(default, null) : XmlType;
+	public var nodeType(default, null):XmlType;
 
 	/**
 		Returns the node name of an Element.
 	**/
-	@:isVar public var nodeName(get, set) : String;
+	@:isVar public var nodeName(get, set):String;
 
 	/**
 		Returns the node value. Only works if the Xml node is not an Element or a Document.
 	**/
-	@:isVar public var nodeValue(get, set) : String;
+	@:isVar public var nodeValue(get, set):String;
 
 	/**
 		Returns the parent object in the Xml hierarchy.
 		The parent can be `null`, an Element or a Document.
 	**/
-	public var parent(default, null) : Xml;
+	public var parent(default, null):Xml;
 
 	var children:Array<Xml>;
 	var attributeMap:Map<String, String>;
@@ -155,7 +179,7 @@ class Xml {
 	/**
 		Creates a node of the given type.
 	**/
-	static public function createElement( name : String ) : Xml {
+	static public function createElement(name:String):Xml {
 		var xml = new Xml(Element);
 		xml.nodeName = name;
 		return xml;
@@ -164,7 +188,7 @@ class Xml {
 	/**
 		Creates a node of the given type.
 	**/
-	static public function createPCData( data : String ) : Xml {
+	static public function createPCData(data:String):Xml {
 		var xml = new Xml(PCData);
 		xml.nodeValue = data;
 		return xml;
@@ -173,7 +197,7 @@ class Xml {
 	/**
 		Creates a node of the given type.
 	**/
-	static public function createCData( data : String ) : Xml {
+	static public function createCData(data:String):Xml {
 		var xml = new Xml(CData);
 		xml.nodeValue = data;
 		return xml;
@@ -182,7 +206,7 @@ class Xml {
 	/**
 		Creates a node of the given type.
 	**/
-	static public function createComment( data : String ) : Xml {
+	static public function createComment(data:String):Xml {
 		var xml = new Xml(Comment);
 		xml.nodeValue = data;
 		return xml;
@@ -191,7 +215,7 @@ class Xml {
 	/**
 		Creates a node of the given type.
 	**/
-	static public function createDocType( data : String ) : Xml {
+	static public function createDocType(data:String):Xml {
 		var xml = new Xml(DocType);
 		xml.nodeValue = data;
 		return xml;
@@ -200,7 +224,7 @@ class Xml {
 	/**
 		Creates a node of the given type.
 	**/
-	static public function createProcessingInstruction( data : String ) : Xml {
+	static public function createProcessingInstruction(data:String):Xml {
 		var xml = new Xml(ProcessingInstruction);
 		xml.nodeValue = data;
 		return xml;
@@ -209,7 +233,7 @@ class Xml {
 	/**
 		Creates a node of the given type.
 	**/
-	static public function createDocument() : Xml {
+	static public function createDocument():Xml {
 		return new Xml(Document);
 	}
 
@@ -217,7 +241,7 @@ class Xml {
 		Get the given attribute of an Element node. Returns `null` if not found.
 		Attributes are case-sensitive.
 	**/
-	public function get( att : String ) : String {
+	public function get(att:String):String {
 		if (nodeType != Element) {
 			throw 'Bad node type, expected Element but found $nodeType';
 		}
@@ -228,7 +252,7 @@ class Xml {
 		Set the given attribute value for an Element node.
 		Attributes are case-sensitive.
 	**/
-	public function set( att : String, value : String ) : Void {
+	public function set(att:String, value:String):Void {
 		if (nodeType != Element) {
 			throw 'Bad node type, expected Element but found $nodeType';
 		}
@@ -239,7 +263,7 @@ class Xml {
 		Removes an attribute for an Element node.
 		Attributes are case-sensitive.
 	**/
-	public function remove( att : String ) : Void {
+	public function remove(att:String):Void {
 		if (nodeType != Element) {
 			throw 'Bad node type, expected Element but found $nodeType';
 		}
@@ -250,7 +274,7 @@ class Xml {
 		Tells if the Element node has a given attribute.
 		Attributes are case-sensitive.
 	**/
-	public function exists( att : String ) : Bool {
+	public function exists(att:String):Bool {
 		if (nodeType != Element) {
 			throw 'Bad node type, expected Element but found $nodeType';
 		}
@@ -260,7 +284,7 @@ class Xml {
 	/**
 		Returns an `Iterator` on all the attribute names.
 	**/
-	public function attributes() : Iterator<String> {
+	public function attributes():Iterator<String> {
 		if (nodeType != Element) {
 			throw 'Bad node type, expected Element but found $nodeType';
 		}
@@ -271,7 +295,7 @@ class Xml {
 		Returns an iterator of all child nodes.
 		Only works if the current node is an Element or a Document.
 	**/
-	public #if !cppia inline #end function iterator() : Iterator<Xml> {
+	public #if !cppia inline #end function iterator():Iterator<Xml> {
 		ensureElementType();
 		return children.iterator();
 	}
@@ -280,7 +304,7 @@ class Xml {
 		Returns an iterator of all child nodes which are Elements.
 		Only works if the current node is an Element or a Document.
 	**/
-	public function elements() : Iterator<Xml> {
+	public function elements():Iterator<Xml> {
 		ensureElementType();
 		var ret = [for (child in children) if (child.nodeType == Element) child];
 		return ret.iterator();
@@ -290,16 +314,19 @@ class Xml {
 		Returns an iterator of all child nodes which are Elements with the given nodeName.
 		Only works if the current node is an Element or a Document.
 	**/
-	public function elementsNamed( name : String ) : Iterator<Xml> {
+	public function elementsNamed(name:String):Iterator<Xml> {
 		ensureElementType();
-		var ret = [for (child in children) if (child.nodeType == Element && child.nodeName == name) child];
+		var ret = [
+			for (child in children)
+				if (child.nodeType == Element && child.nodeName == name) child
+		];
 		return ret.iterator();
 	}
 
 	/**
 		Returns the first child node.
 	**/
-	public #if !cppia inline #end function firstChild() : Xml {
+	public #if !cppia inline #end function firstChild():Xml {
 		ensureElementType();
 		return children[0];
 	}
@@ -307,7 +334,7 @@ class Xml {
 	/**
 		Returns the first child node which is an Element.
 	**/
-	public function firstElement() : Xml {
+	public function firstElement():Xml {
 		ensureElementType();
 		for (child in children) {
 			if (child.nodeType == Element) {
@@ -323,7 +350,7 @@ class Xml {
 		If the child is already inside this Document or Element, it will be moved to the last position among the Document or Element's children.
 		If the child node was previously inside a different node, it will be moved to this Document or Element.
 	**/
-	public function addChild( x : Xml ) : Void {
+	public function addChild(x:Xml):Void {
 		ensureElementType();
 		if (x.parent != null) {
 			x.parent.removeChild(x);
@@ -336,7 +363,7 @@ class Xml {
 		Removes a child from the Document or Element.
 		Returns true if the child was successfuly removed.
 	**/
-	public function removeChild( x : Xml ) : Bool {
+	public function removeChild(x:Xml):Bool {
 		ensureElementType();
 		if (children.remove(x)) {
 			x.parent = null;
@@ -351,7 +378,7 @@ class Xml {
 		If the child is already inside this Document or Element, it will be moved to the new position among the Document or Element's children.
 		If the child node was previously inside a different node, it will be moved to this Document or Element.
 	**/
-	public function insertChild( x : Xml, pos : Int ) : Void {
+	public function insertChild(x:Xml, pos:Int):Void {
 		ensureElementType();
 		if (x.parent != null) {
 			x.parent.children.remove(x);
@@ -363,7 +390,7 @@ class Xml {
 	/**
 		Returns a String representation of the Xml node.
 	**/
-	public #if !cppia inline #end function toString() : String {
+	public #if !cppia inline #end function toString():String {
 		return haxe.xml.Printer.print(this);
 	}
 
diff --git a/std/cpp/ArrayBase.hx b/std/cpp/ArrayBase.hx
index 518db9a426f5277a78e150b4adf3f0958f0f0f68..a51154e323286382801feb64b7c9adf67e78b4ec 100644
--- a/std/cpp/ArrayBase.hx
+++ b/std/cpp/ArrayBase.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
 
-extern class ArrayBase
-{
-   // Length is number of elements
-   public var length(default,null):Int;
-   public function getElementSize():Int;
-   public function getByteCount():Int;
-   public function getBase():RawPointer<Char>;
-}
+package cpp;
 
+extern class ArrayBase {
+	// Length is number of elements
+	public var length(default, null):Int;
+	public function getElementSize():Int;
+	public function getByteCount():Int;
+	public function getBase():RawPointer<Char>;
+}
diff --git a/std/cpp/AtomicInt.hx b/std/cpp/AtomicInt.hx
index cc88d8c07f10cc5da311cbbce0a41b11dada24b7..f84e866c76c0b7558aa666e180b0b11ef89e485a 100644
--- a/std/cpp/AtomicInt.hx
+++ b/std/cpp/AtomicInt.hx
@@ -1,18 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 @:scalar @:coreType
-extern abstract AtomicInt from(Int) to(Int)
-{
-   // returns true if exchange took place
-   @:native("_hx_atomic_exchange_if")
-   public static function exchangeIf(ioValue:Pointer<AtomicInt>, test:Int, newVal:Int) : Bool;
+extern abstract AtomicInt from(Int) to(Int) {
+	/**
+		Returns true if exchange took place.
+	**/
+	@:native("_hx_atomic_exchange_if")
+	public static function exchangeIf(ioValue:Pointer<AtomicInt>, test:Int, newVal:Int):Bool;
 
-   // returns value before increment
-   @:native("_hx_atomic_inc")
-   public static function atomicInc(ioValue:Pointer<AtomicInt>) : Int;
+	/**
+		Returns value before increment.
+	**/
+	@:native("_hx_atomic_inc")
+	public static function atomicInc(ioValue:Pointer<AtomicInt>):Int;
 
-   // returns value before decrement
-   @:native("_hx_atomic_dec")
-   public static function atomicDec(ioValue:Pointer<AtomicInt>) : Int;
+	/**
+		Returns value before decrement.
+	**/
+	@:native("_hx_atomic_dec")
+	public static function atomicDec(ioValue:Pointer<AtomicInt>):Int;
 }
-
diff --git a/std/cpp/AutoCast.hx b/std/cpp/AutoCast.hx
index f7fe302abb5ecbea4ca53679302a2fceac9ba1b3..2a0900cec76cc868006ccdd0eafcb49a91c1a002 100644
--- a/std/cpp/AutoCast.hx
+++ b/std/cpp/AutoCast.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
-extern class AutoCast { }
+extern class AutoCast {}
diff --git a/std/cpp/Callable.hx b/std/cpp/Callable.hx
index c57c4df068aafb07ec5bd62b6b374180c489e73c..85fd050c62d525e95179d5dffa6bb4362584708e 100644
--- a/std/cpp/Callable.hx
+++ b/std/cpp/Callable.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,40 +19,54 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp;
 
+package cpp;
 
 @:noPackageRestrict @:callable
 typedef CallableData<T> = T;
 
-// The generator intercepts this type and converts it to a cpp.Function<T> on cpp
-@:noPackageRestrict @:callable
-#if cpp extern #end
-abstract Callable<T>( CallableData<T> )
-{
-   inline public function new(inValue:T) this = inValue;
-   public var call(get,never):CallableData<T>;
-   inline function get_call():CallableData<T> return this;
-
-   #if cpp
-   @:from
-   inline static public function fromFunction<F>( func:Function<F,cpp.abi.Abi> ) : Callable<F>
-       return new Callable<F>(cast func);
-   @:to
-   inline public function toFunction() : Function<T,cpp.abi.Abi> return cast this;
-
-
-   inline public static function getProcAddress<T,ABI:cpp.abi.Abi>(inModule:String, inFunction:String) : Function<T,ABI>
-      return Function.getProcAddress(inModule, inFunction);
-
-   inline public static function fromStaticFunction<T>(inStaticFunction:T) : Callable<T>
-      return Function.fromStaticFunction(inStaticFunction);
-
-   inline public function lt(inOther:Callable<T>):Bool return toFunction().lt(inOther.toFunction());
-   inline public function leq(inOther:Callable<T>):Bool return toFunction().leq(inOther.toFunction());
-   inline public function gt(inOther:Callable<T>):Bool return toFunction().gt(inOther.toFunction());
-   inline public function geq(inOther:Callable<T>):Bool return toFunction().geq(inOther.toFunction());
-   #end
-}
+/**
+	The generator intercepts this type and converts it to a cpp.Function<T> on cpp.
+**/
+@:noPackageRestrict
+@:callable
+#if cpp
+extern
+#end
+abstract Callable<T>(CallableData<T>) {
+	inline public function new(inValue:T)
+		this = inValue;
+
+	public var call(get, never):CallableData<T>;
+
+	inline function get_call():CallableData<T>
+		return this;
+
+	#if cpp
+	@:from
+	inline static public function fromFunction<F>(func:Function<F, cpp.abi.Abi>):Callable<F>
+		return new Callable<F>(cast func);
 
+	@:to
+	inline public function toFunction():Function<T, cpp.abi.Abi>
+		return cast this;
 
+	inline public static function getProcAddress<T, ABI:cpp.abi.Abi>(inModule:String, inFunction:String):Function<T, ABI>
+		return Function.getProcAddress(inModule, inFunction);
+
+	inline public static function fromStaticFunction<T>(inStaticFunction:T):Callable<T>
+		return Function.fromStaticFunction(inStaticFunction);
+
+	inline public function lt(inOther:Callable<T>):Bool
+		return toFunction().lt(inOther.toFunction());
+
+	inline public function leq(inOther:Callable<T>):Bool
+		return toFunction().leq(inOther.toFunction());
+
+	inline public function gt(inOther:Callable<T>):Bool
+		return toFunction().gt(inOther.toFunction());
+
+	inline public function geq(inOther:Callable<T>):Bool
+		return toFunction().geq(inOther.toFunction());
+	#end
+}
diff --git a/std/cpp/CastCharStar.hx b/std/cpp/CastCharStar.hx
index fb91fb981c2cf77a5ea70c8e962b18763c3c53fb..dc78863b09c9a133d16bf2f295c2cb7238cfb606 100644
--- a/std/cpp/CastCharStar.hx
+++ b/std/cpp/CastCharStar.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,16 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
 
-abstract CastCharStar( RawPointer<Char> ) to(RawPointer<Char>)
-{
-   inline function new(s:String) this = cast untyped s.__s;
+package cpp;
 
-   @:from
-   static public inline function fromString(s:String) return new CastCharStar(s);
+abstract CastCharStar(RawPointer<Char>) to(RawPointer<Char>) {
+	inline function new(s:String)
+		this = cast untyped s.__s;
 
-    @:to
-    public inline function toPointer() return this;
-}
+	@:from
+	static public inline function fromString(s:String)
+		return new CastCharStar(s);
 
+	@:to
+	public inline function toPointer()
+		return this;
+}
diff --git a/std/cpp/Char.hx b/std/cpp/Char.hx
index 5524efa6f176d5c01bff18b1c9cbcc4ab3effeeb..dec9d8888b43919fc49ca7b087a440d6e45e6463 100644
--- a/std/cpp/Char.hx
+++ b/std/cpp/Char.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract Char from Int to Int {}
diff --git a/std/cpp/ConstCharStar.hx b/std/cpp/ConstCharStar.hx
index 5c7cd82254333a65297820afd9b28abd35a65d0e..04d3268b17d225d2441c350a5263e0366e920d1b 100644
--- a/std/cpp/ConstCharStar.hx
+++ b/std/cpp/ConstCharStar.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,19 +19,20 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
 
-@:extern abstract ConstCharStar( RawConstPointer<Char> ) to(RawConstPointer<Char>)
-{
-   inline function new(s:String) this = untyped s.__s;
+package cpp;
 
-   @:from
-   static public inline function fromString(s:String) return new ConstCharStar(s);
+extern abstract ConstCharStar(RawConstPointer<Char>) to(RawConstPointer<Char>) {
+	inline function new(s:String)
+		this = untyped s.__s;
 
-   @:to @:extern
-   public inline function toString():String return new String(untyped this);
+	@:from
+	static public inline function fromString(s:String):ConstCharStar
+		return new ConstCharStar(s);
 
-    @:to @:extern
-    public inline function toPointer() return this;
-}
+	@:to extern public inline function toString():String
+		return new String(untyped this);
 
+	@:to extern public inline function toPointer():RawConstPointer<Char>
+		return this;
+}
diff --git a/std/cpp/ConstPointer.hx b/std/cpp/ConstPointer.hx
index 3d1225c334b6f9f28283706ed95523326bfd4900..e4bc099517f6e16212bdaa691498f95ab0927b21 100644
--- a/std/cpp/ConstPointer.hx
+++ b/std/cpp/ConstPointer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,52 +19,53 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
 
-@:coreType @:include("cpp/Pointer.h") @:native("cpp.Pointer") @:analyzer(as_var)
-extern class ConstPointer<T>
-{
-   // ptr actually returns the pointer - not strictly a 'T' - for pointers to smart pointers
-   // Use value or ref to get dereferenced value
-   public var ptr:Star<T>;
+package cpp;
 
-   public var value(get,never):T;
+@:coreType @:include("cpp/Pointer.h") @:native("cpp.Pointer") @:semantics(variable)
+extern class ConstPointer<T> {
+	// ptr actually returns the pointer - not strictly a 'T' - for pointers to smart pointers
+	// Use value or ref to get dereferenced value
+	public var ptr:Star<T>;
 
-   // Typecast to non-const
-   public var raw(get,never):RawPointer<T>;
+	public var value(get, never):T;
 
-   // const version
-   public var constRaw(get,never):RawConstPointer<T>;
+	// Typecast to non-const
+	public var raw(get, never):RawPointer<T>;
 
-   public function get_value() : Reference<T>;
+	// const version
+	public var constRaw(get, never):RawConstPointer<T>;
 
-   public function get_constRaw() : RawConstPointer<T>;
-   public function get_raw() : RawPointer<T>;
+	public function get_value():Reference<T>;
 
+	public function get_constRaw():RawConstPointer<T>;
+	public function get_raw():RawPointer<T>;
 
-   public function lt(inOther:ConstPointer<T>):Bool;
-   public function leq(inOther:ConstPointer<T>):Bool;
-   public function gt(inOther:ConstPointer<T>):Bool;
-   public function geq(inOther:ConstPointer<T>):Bool;
+	public function lt(inOther:ConstPointer<T>):Bool;
+	public function leq(inOther:ConstPointer<T>):Bool;
+	public function gt(inOther:ConstPointer<T>):Bool;
+	public function geq(inOther:ConstPointer<T>):Bool;
 
-   public function setRaw<O>(ptr:RawPointer<O>) : Void;
+	public function setRaw<O>(ptr:RawPointer<O>):Void;
 
-   public static function fromRaw<T>(ptr:RawConstPointer<T>) : ConstPointer<T>;
+	public static function fromRaw<T>(ptr:RawConstPointer<T>):ConstPointer<T>;
 
+	@:native("::cpp::Pointer_obj::fromRaw")
+	public static function fromStar<T>(star:Star<T>):ConstPointer<T>;
 
-   public static function fromPointer<T>(inNativePointer:Dynamic) : ConstPointer<T>;
+	public static function fromPointer<T>(inNativePointer:Dynamic):ConstPointer<T>;
 
-   public function reinterpret<Other>():Pointer<Other>;
+	public function reinterpret<Other>():Pointer<Other>;
 
-   public function rawCast<Other>():RawPointer<Other>;
+	public function rawCast<Other>():RawPointer<Other>;
 
-   public function at(inIndex:Int):Reference<T>;
-
-   public function inc():ConstPointer<T>;
-   public function dec():ConstPointer<T>;
-   public function postIncVal():Reference<T>;
-   public function incBy(inT:Int):ConstPointer<T>;
-   public function add(inT:Int):ConstPointer<T>;
+	public function at(inIndex:Int):Reference<T>;
 
+	public function inc():ConstPointer<T>;
+	public function dec():ConstPointer<T>;
+	public function incBy(inT:Int):ConstPointer<T>;
+	public function decBy(inT:Int):ConstPointer<T>;
+	public function add(inT:Int):ConstPointer<T>;
+	public function sub(inT:Int):ConstPointer<T>;
+	public function postIncVal():Reference<T>;
 }
-
diff --git a/std/cpp/ConstStar.hx b/std/cpp/ConstStar.hx
index 43df45a23fa04f0c2f1f496e0e11da41a4c31d30..b99fe00e5457fd6a9f0fc507d4d509042f709d94 100644
--- a/std/cpp/ConstStar.hx
+++ b/std/cpp/ConstStar.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,9 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp;
-
-// Allows haxe to type result correctly, and hxcpp can recognise this use the correct type
-typedef ConstStar<T> = T;
 
+package cpp;
 
+/**
+	Allows haxe to type the result correctly, and hxcpp can recognise this uses
+	the correct type.
+**/
+typedef ConstStar<T> = Null<T>;
diff --git a/std/cpp/EnumBase.hx b/std/cpp/EnumBase.hx
index 9cb66493f2c58726efb203c7b185c9d2079edb52..507d12f14b7f47ea1e96380a499eb3b1fa328fba 100644
--- a/std/cpp/EnumBase.hx
+++ b/std/cpp/EnumBase.hx
@@ -1,31 +1,60 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 @:native("hx.EnumBase")
-extern class EnumBase
-{
-   #if (hxcpp_api_level >= 330)
-   public function _hx_getIndex():Int;
-   public function _hx_getTag():String;
-   public function _hx_getParamCount():Int;
-   public function _hx_getParamI(inIndex:Int):Dynamic;
-   public function _hx_getParameters():Array<Dynamic>;
-
-   inline public function getIndex():Int return _hx_getIndex();
-   inline public function getTag():String return _hx_getTag();
-   inline public function getParamCount():Int return _hx_getParamCount();
-   inline public function getParamI(inIndex:Int):Dynamic return _hx_getParamI(inIndex);
-   inline public function getParameters():Array<Dynamic> return _hx_getParameters();
-   #else
-   public function __EnumParams():Array<Dynamic>;
-   public function __Tag():String;
-   public function __Index():Int;
+extern class EnumBase {
+	#if (hxcpp_api_level >= 330)
+	public function _hx_getIndex():Int;
+	public function _hx_getTag():String;
+	public function _hx_getParamCount():Int;
+	public function _hx_getParamI(inIndex:Int):Dynamic;
+	public function _hx_getParameters():Array<Dynamic>;
 
-   inline public function _hx_getIndex():Int  return untyped __Index();
-   inline public function _hx_getTag():String  return untyped __Tag();
-   inline public function _hx_getParamCount():Int return untyped __EnumParams()==null ? 0 : __EnumParams().length;
-   inline public function _hx_getParamI(inIndex:Int):Dynamic return untyped __EnumParams()[inIndex];
-   inline public function _hx_getParameters():Array<Dynamic> return __EnumParams()==null ? [] : __EnumParams();
+	inline public function getIndex():Int
+		return _hx_getIndex();
+	inline public function getTag():String
+		return _hx_getTag();
+	inline public function getParamCount():Int
+		return _hx_getParamCount();
+	inline public function getParamI(inIndex:Int):Dynamic
+		return _hx_getParamI(inIndex);
+	inline public function getParameters():Array<Dynamic>
+		return _hx_getParameters();
+	#else
+	public function __EnumParams():Array<Dynamic>;
+	public function __Tag():String;
+	public function __Index():Int;
 
-   #end
+	inline public function _hx_getIndex():Int
+		return untyped __Index();
+	inline public function _hx_getTag():String
+		return untyped __Tag();
+	inline public function _hx_getParamCount():Int
+		return untyped __EnumParams() == null ? 0 : __EnumParams().length;
+	inline public function _hx_getParamI(inIndex:Int):Dynamic
+		return untyped __EnumParams()[inIndex];
+	inline public function _hx_getParameters():Array<Dynamic>
+		return __EnumParams() == null ? [] : __EnumParams();
+	#end
 }
-
diff --git a/std/cpp/ErrorConstants.hx b/std/cpp/ErrorConstants.hx
new file mode 100644
index 0000000000000000000000000000000000000000..837e605ddde8abd96da8c263a3802abd8fd9ffe6
--- /dev/null
+++ b/std/cpp/ErrorConstants.hx
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
+
+extern class ErrorConstants {
+	@:native("HX_INVALID_CAST")
+	public static var invalidCast:Dynamic;
+
+	@:native("HX_INDEX_OUT_OF_BOUNDS")
+	public static var indexOutOfBounds:Dynamic;
+
+	@:native("HX_INVALID_OBJECT")
+	public static var invalidObject:Dynamic;
+
+	@:native("HX_INVALID_ARG_COUNT")
+	public static var invalidArgCount:Dynamic;
+
+	@:native("HX_NULL_FUNCTION_POINTER")
+	public static var nullFunctionPointer:Dynamic;
+}
diff --git a/std/cpp/FILE.hx b/std/cpp/FILE.hx
index f80371d979f0343e391d183cbfd9f30b086ab8a4..c22f24093fc6fe4336b3b0dac9489207026bec06 100644
--- a/std/cpp/FILE.hx
+++ b/std/cpp/FILE.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,5 +24,4 @@ package cpp;
 
 @:include("stdio.h")
 @:native(" ::cpp::Pointer<FILE>")
-extern class FILE { }
-
+extern class FILE {}
diff --git a/std/cpp/FastIterator.hx b/std/cpp/FastIterator.hx
index b64f41793874faba02c75953b8866f7c073a99d4..e5955e8d0417d9b374d82f2e391323ab662010b0 100644
--- a/std/cpp/FastIterator.hx
+++ b/std/cpp/FastIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
-extern class FastIterator<T>
-{
+extern class FastIterator<T> {
 	public function hasNext():Bool;
 	public function next():T;
 }
-
diff --git a/std/cpp/Finalizable.hx b/std/cpp/Finalizable.hx
index 31a086ac1a2c5c72351566ed6232689bce17a7a2..02287270a3936f143fc3ca956288aa03546023e1 100644
--- a/std/cpp/Finalizable.hx
+++ b/std/cpp/Finalizable.hx
@@ -1,14 +1,36 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
-// This is just a helper class.  You do not actually need to inherit from this to use
-//  NativeGc.addFinalizable(this,inPin), you just need a function called "finalize"
-class Finalizable
-{
-   public function new(inPin = false)
-   {
-      NativeGc.addFinalizable(this,inPin);
-   }
+/**
+	This is just a helper class. It is not actually required to inherit from this
+	to use `NativeGc.addFinalizable(this,inPin)`, only a function called
+	`finalize` is needed.
+**/
+class Finalizable {
+	public function new(inPin = false) {
+		NativeGc.addFinalizable(this, inPin);
+	}
 
-   public function finalize():Void { }
+	public function finalize():Void {}
 }
-
diff --git a/std/cpp/Float32.hx b/std/cpp/Float32.hx
index 7b852f032a3a0e3f4f5649578d6f37a48b60764d..c00c14545980810634b0ff34d021b0986eee7954 100644
--- a/std/cpp/Float32.hx
+++ b/std/cpp/Float32.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract Float32 from Float to Float {}
diff --git a/std/cpp/Float64.hx b/std/cpp/Float64.hx
index 1bf957fda49dfad9b1913c451392a58651cdd4b6..bd4b376b2c890cc06f6c26d640301674d10f3066 100644
--- a/std/cpp/Float64.hx
+++ b/std/cpp/Float64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract Float64 from Float to Float {}
diff --git a/std/cpp/Function.hx b/std/cpp/Function.hx
index 2b4b52ec68c0019e03a2623695772860326e579c..22d0b4a860a80b05366ff3a185760fe849191e15 100644
--- a/std/cpp/Function.hx
+++ b/std/cpp/Function.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,41 +19,42 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
 @:callable
-typedef FunctionData<T,ABI> = T;
-
+typedef FunctionData<T, ABI> = T;
 
 @:include("cpp/Pointer.h") @:callable
-extern abstract Function<T, ABI:cpp.abi.Abi>( FunctionData<T,ABI> )
-{
-   inline public function new(inValue:T) this = inValue;
-
-   // Legacy Api
-   public var call(get,never):FunctionData<T,ABI>;
-   inline function get_call():FunctionData<T,ABI> return this;
-
-
-   @:native("::cpp::Function_obj::getProcAddress")
-   @:extern static function nativeGetProcAddress<T,ABI:cpp.abi.Abi>(inModule:String, inFunction:String) : AutoCast return null;
-   inline public static function getProcAddress<T,ABI:cpp.abi.Abi>(inModule:String, inFunction:String) : Function<T,ABI>
-   {
-      return cast nativeGetProcAddress(inModule, inFunction);
-   }
-
-   @:native("::cpp::Function_obj::fromStaticFunction")
-   @:extern static function nativeFromStaticFunction<T>(inStaticFunction:T) : AutoCast return null;
-   inline public static function fromStaticFunction<T>(inStaticFunction:T) : Callable<T>
-   {
-      return cast nativeFromStaticFunction(inStaticFunction);
-   }
-
-	@:extern public function lt(inOther:Function<T,ABI>):Bool return false;
-	@:extern public function leq(inOther:Function<T,ABI>):Bool return false;
-	@:extern public function gt(inOther:Function<T,ABI>):Bool return false;
-	@:extern public function geq(inOther:Function<T,ABI>):Bool return false;
-}
+extern abstract Function<T, ABI:cpp.abi.Abi>(FunctionData<T, ABI>) {
+	inline public function new(inValue:T)
+		this = inValue;
+
+	// Legacy Api
+	public var call(get, never):FunctionData<T, ABI>;
+
+	inline function get_call():FunctionData<T, ABI>
+		return this;
+
+	@:native("::cpp::Function_obj::getProcAddress")
+	extern static function nativeGetProcAddress<T, ABI:cpp.abi.Abi>(inModule:String, inFunction:String):AutoCast;
 
+	inline public static function getProcAddress<T, ABI:cpp.abi.Abi>(inModule:String, inFunction:String):Function<T, ABI> {
+		return cast nativeGetProcAddress(inModule, inFunction);
+	}
 
+	@:native("::cpp::Function_obj::fromStaticFunction")
+	extern static function nativeFromStaticFunction<T>(inStaticFunction:T):AutoCast;
 
+	inline public static function fromStaticFunction<T>(inStaticFunction:T):Callable<T> {
+		return cast nativeFromStaticFunction(inStaticFunction);
+	}
+
+	extern public function lt(inOther:Function<T, ABI>):Bool;
+
+	extern public function leq(inOther:Function<T, ABI>):Bool;
+
+	extern public function gt(inOther:Function<T, ABI>):Bool;
+
+	extern public function geq(inOther:Function<T, ABI>):Bool;
+}
diff --git a/std/cpp/Int16.hx b/std/cpp/Int16.hx
index 0b67d0d3470d09f06b905a509269974fcdf2dd8a..713e1666c42a53641f580ba591a4ec361e41a9a6 100644
--- a/std/cpp/Int16.hx
+++ b/std/cpp/Int16.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract Int16 from Int to Int {}
diff --git a/std/cpp/Int32.hx b/std/cpp/Int32.hx
index 625499018d67b4ce9c9cec81dfd41c243951706f..d60bd648464baf03148e2d8110b97e2817cd017c 100644
--- a/std/cpp/Int32.hx
+++ b/std/cpp/Int32.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract Int32 from Int to Int {}
diff --git a/std/cpp/Int64.hx b/std/cpp/Int64.hx
index b10e041f685ef1afc582af347627eaf99a91387a..2e69337e8f3d92054ac9644d5bebb9d707b3ca3b 100644
--- a/std/cpp/Int64.hx
+++ b/std/cpp/Int64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract Int64 from Int to Int {}
diff --git a/std/cpp/Int8.hx b/std/cpp/Int8.hx
index 844cdd3e2c45bfe2b1ed88edac60ab65166ef898..faae9d7e1d6c35f3a7c17d13e0f069e5fa378678 100644
--- a/std/cpp/Int8.hx
+++ b/std/cpp/Int8.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract Int8 from Int to Int {}
diff --git a/std/cpp/Lib.hx b/std/cpp/Lib.hx
index 49978fa980e9c4c2c9a53d2aea095528f46d3bcf..30696bdc270864e30e5ca0466817e22a413d898d 100644
--- a/std/cpp/Lib.hx
+++ b/std/cpp/Lib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,23 +19,23 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
 /**
-	Platform-specific Cpp Library. Provides some platform-specific functions 
-	for the C++ target, such as conversion from Haxe types to native types 
+	Platform-specific Cpp Library. Provides some platform-specific functions
+	for the C++ target, such as conversion from Haxe types to native types
 	and vice-versa.
 **/
 class Lib {
-
 	/**
 		Load and return a Cpp primitive from a DLL library.
 	**/
-	public static function load( lib : String, prim : String, nargs : Int ) : Dynamic {
+	public static function load(lib:String, prim:String, nargs:Int):Dynamic {
 		#if (iphone || emscripten)
-		return loadLazy(lib,prim,nargs);
+		return loadLazy(lib, prim, nargs);
 		#else
-		return untyped __global__.__loadprim(lib,prim,nargs);
+		return untyped __global__.__loadprim(lib, prim, nargs);
 		#end
 	}
 
@@ -43,64 +43,62 @@ class Lib {
 		Unloaded all dynamic libraries in reverse order of loading.
 		Returns the number of libraries unloaded.
 	**/
-	public static function unloadAllLibraries() : Int {
+	public static function unloadAllLibraries():Int {
 		return untyped __global__.__hxcpp_unload_all_libraries();
 	}
 
-	public static function _loadPrime( lib : String, prim : String, signature : String, quietFail = false ) : Dynamic {
-		var factory:Callable< ConstCharStar -> Object > =
-		untyped __global__.__hxcpp_cast_get_proc_address(lib, prim + "__prime", quietFail);
-		if (factory!=null)
-		{
+	public static function _loadPrime(lib:String, prim:String, signature:String, quietFail = false):Dynamic {
+		var factory:Callable<ConstCharStar->Object> = untyped __global__.__hxcpp_cast_get_proc_address(lib, prim + "__prime", quietFail);
+		if (factory != null) {
 			var func:Dynamic = factory.call(signature);
-			if (func==null && !quietFail)
+			if (func == null && !quietFail)
 				throw '$prim does not have signature $signature';
 			return func;
 		}
 		return null;
 	}
 
-
 	/**
 		Tries to load, and always returns a valid function, but the function may throw
 		if called.
 	**/
-	public static function loadLazy(lib,prim,nargs) : Dynamic {
+	public static function loadLazy(lib:String, prim:String, nargs:Int):Dynamic {
 		try {
-			return untyped __global__.__loadprim(lib,prim,nargs);
-		} catch( e : Dynamic ) {
-			switch(nargs) {
-			case 0 : return function() { throw e; };
-			case 2 : return function(_1,_2) { throw e; };
-			case 3 : return function(_1,_2,_3) { throw e; };
-			case 4 : return function(_1,_2,_3,_4) { throw e; };
-			case 5 : return function(_1,_2,_3,_4,_5) { throw e; };
-			default : return function(_1) { throw e; };
-			}
+			return untyped __global__.__loadprim(lib, prim, nargs);
+		} catch (e:Dynamic) {
+			return switch (nargs) {
+				case 0: () -> throw e;
+				case 2: (_, _) -> throw e;
+				case 3: (_, _, _) -> throw e;
+				case 4: (_, _, _, _) -> throw e;
+				case 5: (_, _, _, _, _) -> throw e;
+				default: _ -> throw e;
+			};
 		}
 		return null;
 	}
 
-	@:extern  @:noDebug @:native("HX_STACK_DO_RETHROW")
-	static function do_rethrow(inExp:Dynamic) { throw inExp; }
+	@:noDebug @:native("HX_STACK_DO_RETHROW")
+	extern static function do_rethrow(inExp:Dynamic);
 
-	@:noDebug #if(!cppia) inline #end
-	public static function rethrow(inExp:Dynamic) { do_rethrow(inExp); }
+	@:noDebug #if (!cppia) inline #end
+	public static function rethrow(inExp:Dynamic) {
+		do_rethrow(inExp);
+	}
 
-	public static function stringReference(inBytes:haxe.io.Bytes) : String
-	{
+	public static function stringReference(inBytes:haxe.io.Bytes):String {
 		var result:String = "";
 		untyped __global__.__hxcpp_string_of_bytes(inBytes.b, result, 0, 0, true);
 		return result;
 	}
 
-	public static function pushDllSearchPath(inPath:String) : Void
+	public static function pushDllSearchPath(inPath:String):Void
 		untyped __global__.__hxcpp_push_dll_path(inPath);
 
-	public static function getDllExtension() : String
+	public static function getDllExtension():String
 		return untyped __global__.__hxcpp_get_dll_extension();
 
-	public static function getBinDirectory() : String
+	public static function getBinDirectory():String
 		return untyped __global__.__hxcpp_get_bin_dir();
 
 	/**
@@ -109,7 +107,7 @@ class Lib {
 		Changing one string can cause others to change unexpectedly.
 		Only really safe if you are using it read-only or if it comes from stringReference above
 	**/
-	public inline static function bytesReference( s : String ) : haxe.io.Bytes {
+	public inline static function bytesReference(s:String):haxe.io.Bytes {
 		var bytes = new haxe.io.BytesData();
 		untyped bytes.__unsafeStringReference(s);
 		return haxe.io.Bytes.ofData(bytes);
@@ -118,7 +116,7 @@ class Lib {
 	/**
 		Print the specified value on the default output.
 	**/
-	public static function print( v : Dynamic ) : Void {
+	public static function print(v:Dynamic):Void {
 		untyped __global__.__hxcpp_print(v);
 	}
 
@@ -126,7 +124,7 @@ class Lib {
 		This function is used to make porting from neko to cpp easy.
 		It does not need to do anything because the c-code can work with any Dynamic
 	**/
-	public static function haxeToNeko( v : Dynamic ) : Dynamic {
+	public static function haxeToNeko(v:Dynamic):Dynamic {
 		return v;
 	}
 
@@ -134,19 +132,18 @@ class Lib {
 		This function is used to make porting from neko to cpp easy.
 		It does not need to do anything because the c-code can work with any Dynamic
 	**/
-	public static function nekoToHaxe( v : Dynamic ) : Dynamic {
+	public static function nekoToHaxe(v:Dynamic):Dynamic {
 		return v;
 	}
+
 	/**
 		Print the specified value on the default output followed by a newline character.
 	**/
-	public static function println( v : Dynamic ) : Void {
+	public static function println(v:Dynamic):Void {
 		untyped __global__.__hxcpp_println(v);
 	}
 
-	public static function setFloatFormat(inFormat:String):Void
-	{
+	public static function setFloatFormat(inFormat:String):Void {
 		untyped __global__.__hxcpp_set_float_format(inFormat);
 	}
-
 }
diff --git a/std/cpp/Native.hx b/std/cpp/Native.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d900b089d9e1b10ca1d6f51a3d013d648ff23bfb
--- /dev/null
+++ b/std/cpp/Native.hx
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
+
+@:include("stdlib.h")
+extern class Native {
+	@:native("malloc")
+	public static function nativeMalloc(bytes:Int):cpp.Star<cpp.Void>;
+	@:native("calloc")
+	public static function nativeCalloc(bytes:Int):cpp.Star<cpp.Void>;
+	@:native("realloc")
+	public static function nativeRealloc(inPtr:cpp.Star<cpp.Void>, bytes:Int):cpp.RawPointer<cpp.Void>;
+	@:native("free")
+	public static function nativeFree(ptr:cpp.Star<cpp.Void>):Void;
+	@:native("memcpy")
+	public static function nativeMemcpy(dest:cpp.Star<cpp.Void>, src:cpp.Star<cpp.Void>, bytes:Int):Void;
+
+	@:native("hx::ClassSizeOf") @:templatedCall
+	public static function sizeof<T>(t:T):Int;
+
+	#if !cppia
+	@:native("hx::Dereference")
+	public static function star<T>(ptr:cpp.Star<T>):cpp.Reference<T>;
+
+	@:generic
+	public static inline function set<T>(ptr:cpp.Star<T>, value:T):Void {
+		var ref:cpp.Reference<T> = star(ptr);
+		ref = value;
+	}
+	@:generic
+	public static inline function get<T>(ptr:cpp.Star<T>):T {
+		var ref:cpp.Reference<T> = star(ptr);
+		return ref;
+	}
+
+	@:generic
+	public static inline function memcpy<DEST, SRC>(dest:cpp.Star<DEST>, src:cpp.Star<SRC>, bytes:Int):Void
+		nativeMemcpy(cast dest, cast src, bytes);
+
+	@:generic
+	public static inline function malloc<T>(bytes:Int):cpp.Star<T>
+		return cast nativeMalloc(bytes);
+
+	@:generic
+	public static inline function calloc<T>(bytes:Int):cpp.Star<T>
+		return cast nativeCalloc(bytes);
+
+	@:generic
+	public static inline function realloc<T>(ioPtr:cpp.Star<T>, bytes:Int):cpp.Star<T>
+		return cast nativeRealloc(cast ioPtr, bytes);
+
+	@:generic
+	public static inline function free<T>(ptr:cpp.Star<T>):Void {
+		if (ptr != null)
+			nativeFree(cast ptr);
+	}
+
+	@:native("hx::StarOf")
+	public static function addressOf<T>(inVariable:Reference<T>):Star<T>;
+	#else
+	public static inline function addressOf<T>(inVariable:Reference<T>):Star<T> {
+		throw "Native.addressOf not available in cppia";
+	}
+	public static inline function star<T>(ptr:cpp.Star<T>):cpp.Reference<T> {
+		throw "Native.star not available in cppia";
+	}
+
+	public static inline function set<T>(ptr:cpp.Star<T>, value:T):Void {
+		throw "Native.set not available in cppia";
+	}
+	public static inline function get<T>(ptr:cpp.Star<T>):T {
+		throw "Native.get not available in cppia";
+		var d:Dynamic = null;
+		return d;
+	}
+
+	public static function memcpy<DEST, SRC>(dest:cpp.Star<DEST>, src:cpp.Star<SRC>, bytes:Int):Void;
+	public static function malloc<T>(bytes:Int):cpp.Star<T>;
+	public static function calloc<T>(bytes:Int):cpp.Star<T>;
+	public static function realloc<T>(ioPtr:cpp.Star<T>, bytes:Int):cpp.Star<T>;
+	public static function free<T>(ptr:cpp.Star<T>):Void;
+	#end
+}
diff --git a/std/cpp/NativeArc.hx b/std/cpp/NativeArc.hx
index 286b7147b9583dd64bbef5403940ab5ace1f1ef4..be889cc2a3c9e02aac295fe81531cf9f86b7887b 100644
--- a/std/cpp/NativeArc.hx
+++ b/std/cpp/NativeArc.hx
@@ -1,12 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
-extern class NativeArc
-{
-   @:native("(__bridge_transfer id)")
-   public static function _bridgeTransfer<T>(ptr:cpp.RawPointer<cpp.Void> ):cpp.RawPointer<T>;
+extern class NativeArc {
+	@:native("(__bridge_transfer id)")
+	public static function _bridgeTransfer<T>(ptr:cpp.RawPointer<cpp.Void>):cpp.RawPointer<T>;
 
-   public static inline function bridgeTransfer<T>(ptr:cpp.RawPointer<cpp.Void> ):T return cast _bridgeTransfer(ptr);
+	public static inline function bridgeTransfer<T>(ptr:cpp.RawPointer<cpp.Void>):T
+		return cast _bridgeTransfer(ptr);
 }
-
-
-
diff --git a/std/cpp/NativeArray.hx b/std/cpp/NativeArray.hx
index 05bec6222b0532581bc023a8dbbbc554572bf29f..e065edd56ae06fa92d124334642787389bdf6eba 100644
--- a/std/cpp/NativeArray.hx
+++ b/std/cpp/NativeArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,87 +19,79 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
 
-extern class NativeArray {
-
-   #if cppia
-   public static inline function create<T>(length:Int):Array<T>
-   {
-      var result = new Array<T>();
-      NativeArray.setSize(result,length);
-      return result;
-   }
-
-   #else
+package cpp;
 
-   @:native("_hx_create_array_length")
-   public static function create<T>(length:Int):Array<T>;
-   #end
+extern class NativeArray {
+	#if cppia
+	public static inline function create<T>(length:Int):Array<T> {
+		var result = new Array<T>();
+		NativeArray.setSize(result, length);
+		return result;
+	}
+	#else
+	@:native("_hx_create_array_length")
+	public static function create<T>(length:Int):Array<T>;
+	#end
 
-   public static inline function blit<T>( ioDestArray:Array<T>,
-		inDestElement:Int, inSourceArray:Array<T>,
-		inSourceElement:Int, inElementCount:Int ): Void  {
-	untyped ioDestArray.blit(inDestElement, inSourceArray, inSourceElement, inElementCount);
+	public static inline function blit<T>(ioDestArray:Array<T>, inDestElement:Int, inSourceArray:Array<T>, inSourceElement:Int, inElementCount:Int):Void {
+		untyped ioDestArray.blit(inDestElement, inSourceArray, inSourceElement, inElementCount);
 	};
 
-	public static inline function getBase( inArray:Array<Dynamic> ) : ArrayBase {
-      return untyped inArray;
-   }
-
-   @:nativeStaticExtension
-	public static function reserve<T>( inArray:Array<T>,inElements:Int ) : Void { }
+	public static inline function getBase(inArray:Array<Dynamic>):ArrayBase {
+		return untyped inArray;
+	}
 
-   @:nativeStaticExtension
-	public static function capacity<T>( inArray:Array<T> ) : Int { }
+	@:nativeStaticExtension
+	public static function reserve<T>(inArray:Array<T>, inElements:Int):Void;
 
-   @:nativeStaticExtension
-	public static function getElementSize<T>( inArray:Array<T> ) : Int { }
+	@:nativeStaticExtension
+	public static function capacity<T>(inArray:Array<T>):Int;
 
-	public static inline function address<T>( inArray:Array<T>,inIndex:Int ) : Pointer<T> {
-      return Pointer.arrayElem(inArray,inIndex);
-   }
+	@:nativeStaticExtension
+	public static function getElementSize<T>(inArray:Array<T>):Int;
 
-   @:nativeStaticExtension
-	public static function setData<T>( inArray:Array<T>,inData:Pointer<T>,inElementCount:Int ) : Void { }
+	public static inline function address<T>(inArray:Array<T>, inIndex:Int):Pointer<T> {
+		return Pointer.arrayElem(inArray, inIndex);
+	}
 
-   @:nativeStaticExtension
-	public static function setUnmanagedData<T>( inArray:Array<T>,inData:ConstPointer<T>,inElementCount:Int ) : Void { }
+	@:nativeStaticExtension
+	public static function setData<T>(inArray:Array<T>, inData:Pointer<T>, inElementCount:Int):Void;
 
-   @:nativeStaticExtension
-	public static function zero<T>( ioDestArray:Array<T>, ?inFirst:Int, ?inElements:Int ) : Void { };
+	@:nativeStaticExtension
+	public static function setUnmanagedData<T>(inArray:Array<T>, inData:ConstPointer<T>, inElementCount:Int):Void;
 
-   @:nativeStaticExtension
-	public static function memcmp<T>( inArrayA:Array<T>, inArrayB:Array<T>) : Int { }
+	@:nativeStaticExtension
+	public static function zero<T>(ioDestArray:Array<T>, ?inFirst:Int, ?inElements:Int):Void;
 
-   @:native("_hx_reslove_virtual_array")
-	public static function resolveVirtualArray( inArray:Array<Dynamic>) : Dynamic { }
+	@:nativeStaticExtension
+	public static function memcmp<T>(inArrayA:Array<T>, inArrayB:Array<T>):Int;
 
+	@:native("_hx_reslove_virtual_array")
+	public static function resolveVirtualArray(inArray:Array<Dynamic>):Dynamic;
 
-   #if cppia
-	public static inline function unsafeGet<T>( inDestArray:Array<T>, inIndex:Int) : T {
+	#if cppia
+	public static inline function unsafeGet<T>(inDestArray:Array<T>, inIndex:Int):T {
 		return untyped inDestArray.__unsafe_get(inIndex);
 	}
 
-	public static inline function unsafeSet<T>( ioDestArray:Array<T>, inIndex:Int, inValue:T) : T {
-		return untyped ioDestArray.__unsafe_set(inIndex,inValue);
+	public static inline function unsafeSet<T>(ioDestArray:Array<T>, inIndex:Int, inValue:T):T {
+		return untyped ioDestArray.__unsafe_set(inIndex, inValue);
 	}
 
-	public static inline function setSize<T>( ioArray:Array<T>, inSize:Int) : Array<T> {
+	public static inline function setSize<T>(ioArray:Array<T>, inSize:Int):Array<T> {
 		return untyped ioArray.__SetSizeExact(inSize);
-   }
-
-   #else
-   @:native("_hx_array_unsafe_get")
-	public static function unsafeGet<T>( inDestArray:Array<T>, inIndex:Int) : T { return untyped null; }
-
-   @:native("_hx_array_unsafe_set")
-	public static inline function unsafeSet<T>( ioDestArray:Array<T>, inIndex:Int, inValue:T) : T {
-		return untyped ioDestArray.__unsafe_set(inIndex,inValue);
 	}
+	#else
+	@:native("_hx_array_unsafe_get")
+	public static function unsafeGet<T>(inDestArray:Array<T>, inIndex:Int):T;
 
-   @:native("_hx_array_set_size_exact")
-	public static function setSize<T>( ioArray:Array<T>, inSize:Int) : Array<T> return null;
-   #end
+	@:native("_hx_array_unsafe_set")
+	public static inline function unsafeSet<T>(ioDestArray:Array<T>, inIndex:Int, inValue:T):T {
+		return untyped ioDestArray.__unsafe_set(inIndex, inValue);
+	}
 
+	@:native("_hx_array_set_size_exact")
+	public static function setSize<T>(ioArray:Array<T>, inSize:Int):Array<T>;
+	#end
 }
diff --git a/std/cpp/NativeFile.hx b/std/cpp/NativeFile.hx
index 1caaf9b23dee1dfe7ec596c1936f6e3948b9bd88..add849a8337c7bc7686dac41041f382522b7acb0 100644
--- a/std/cpp/NativeFile.hx
+++ b/std/cpp/NativeFile.hx
@@ -1,64 +1,71 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 @:buildXml('<include name="${HXCPP}/src/hx/libs/std/Build.xml"/>')
-extern class NativeFile
-{
-   @:extern @:native("_hx_std_file_open")
-   public static function file_open(fname:String,r:String) : Dynamic return null;
-
-   @:extern @:native("_hx_std_file_close")
-   public static function file_close(handle:Dynamic) : Void { }
-
-
-   @:extern @:native("_hx_std_file_write")
-   public static function file_write(handle:Dynamic,s:haxe.io.BytesData,p:Int,n:Int) : Int return 0;
-
-
-   @:extern @:native("_hx_std_file_write_char")
-   public static function file_write_char(handle:Dynamic,c:Int) : Void { }
-
-
-   @:extern @:native("_hx_std_file_read")
-   public static function file_read(handle:Dynamic,s:haxe.io.BytesData,p:Int,n:Int) : Int return 0;
-
-
-   @:extern @:native("_hx_std_file_read_char")
-   public static function file_read_char(handle:Dynamic) : Int return 0;
-
-
-   @:extern @:native("_hx_std_file_seek")
-   public static function file_seek(handle:Dynamic,pos:Int,kind:Int) : Void { }
-
-
-   @:extern @:native("_hx_std_file_tell")
-   public static function file_tell(handle:Dynamic) : Int return 0;
-
+extern class NativeFile {
+	@:native("_hx_std_file_open")
+	extern public static function file_open(fname:String, r:String):Dynamic;
 
-   @:extern @:native("_hx_std_file_eof")
-   public static function file_eof(handle:Dynamic) : Bool return false;
+	@:native("_hx_std_file_close")
+	extern public static function file_close(handle:Dynamic):Void;
 
+	@:native("_hx_std_file_write")
+	extern public static function file_write(handle:Dynamic, s:haxe.io.BytesData, p:Int, n:Int):Int;
 
-   @:extern @:native("_hx_std_file_flush")
-   public static function file_flush(handle:Dynamic) : Void return null;
+	@:native("_hx_std_file_write_char")
+	extern public static function file_write_char(handle:Dynamic, c:Int):Void;
 
+	@:native("_hx_std_file_read")
+	extern public static function file_read(handle:Dynamic, s:haxe.io.BytesData, p:Int, n:Int):Int;
 
-   @:extern @:native("_hx_std_file_contents_string")
-   public static function file_contents_string(name:String) : String return null;
+	@:native("_hx_std_file_read_char")
+	extern public static function file_read_char(handle:Dynamic):Int;
 
+	@:native("_hx_std_file_seek")
+	extern public static function file_seek(handle:Dynamic, pos:Int, kind:Int):Void;
 
-   @:extern @:native("_hx_std_file_contents_bytes")
-   public static function file_contents_bytes(name:String) : haxe.io.BytesData return null;
+	@:native("_hx_std_file_tell")
+	extern public static function file_tell(handle:Dynamic):Int;
 
+	@:native("_hx_std_file_eof")
+	extern public static function file_eof(handle:Dynamic):Bool;
 
-   @:extern @:native("_hx_std_file_stdin")
-   public static function file_stdin() : Dynamic return null;
+	@:native("_hx_std_file_flush")
+	extern public static function file_flush(handle:Dynamic):Void;
 
+	@:native("_hx_std_file_contents_string")
+	extern public static function file_contents_string(name:String):String;
 
-   @:extern @:native("_hx_std_file_stdout")
-   public static function file_stdout() : Dynamic return null;
+	@:native("_hx_std_file_contents_bytes")
+	extern public static function file_contents_bytes(name:String):haxe.io.BytesData;
 
+	@:native("_hx_std_file_stdin")
+	extern public static function file_stdin():Dynamic;
 
-   @:extern @:native("_hx_std_file_stderr")
-   public static function file_stderr() : Dynamic return null;
+	@:native("_hx_std_file_stdout")
+	extern public static function file_stdout():Dynamic;
 
+	@:native("_hx_std_file_stderr")
+	extern public static function file_stderr():Dynamic;
 }
diff --git a/std/cpp/NativeGc.hx b/std/cpp/NativeGc.hx
index 6dd40115af6b9781217d2befc1519cc35062ceee..ed0662e3f9d849791c142005ab1479779d50b92b 100644
--- a/std/cpp/NativeGc.hx
+++ b/std/cpp/NativeGc.hx
@@ -1,59 +1,65 @@
-package cpp;
+/*
+ * Copyright (C)2005-2019 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.
+ */
 
-extern class NativeGc
-{
-   @:native("__hxcpp_gc_mem_info")
-   static public function memInfo(inWhatInfo:Int) : Float return 0.0;
+package cpp;
 
-   @:native("_hx_allocate_extended") @:templatedCall
-   static public function allocateExtended<T>(cls:Class<T>, size:Int) : T return null;
+extern class NativeGc {
+	@:native("__hxcpp_gc_mem_info")
+	static public function memInfo(inWhatInfo:Int):Float;
 
-   @:native("_hx_add_finalizable")
-   public static function addFinalizable( instance:{ function finalize():Void; }, inPin:Bool ): Void {}
+	@:native("_hx_allocate_extended") @:templatedCall
+	static public function allocateExtended<T>(cls:Class<T>, size:Int):T;
 
-   @:native("hx::InternalNew")
-   public static function allocGcBytesRaw( inBytes : Int, isContainer:Bool ): RawPointer<cpp.Void> return null;
+	@:native("_hx_add_finalizable")
+	public static function addFinalizable(instance:{function finalize():Void;}, inPin:Bool):Void;
 
-   inline public static function allocGcBytes( inBytes : Int ): Pointer<cpp.Void>
-   {
-      return Pointer.fromRaw( allocGcBytesRaw(inBytes, false) );
-   }
+	@:native("hx::InternalNew")
+	public static function allocGcBytesRaw(inBytes:Int, isContainer:Bool):RawPointer<cpp.Void>;
 
+	inline public static function allocGcBytes(inBytes:Int):Pointer<cpp.Void> {
+		return Pointer.fromRaw(allocGcBytesRaw(inBytes, false));
+	}
 
-   @:native("__hxcpp_enable") @:extern
-   static public function enable(inEnable:Bool) : Void { }
+	@:native("__hxcpp_enable") extern static public function enable(inEnable:Bool):Void;
 
-   @:native("__hxcpp_collect") @:extern
-   static public function run(major:Bool) : Void { }
+	@:native("__hxcpp_collect") extern static public function run(major:Bool):Void;
 
-   @:native("__hxcpp_gc_compact") @:extern
-   static public function compact() : Void { }
+	@:native("__hxcpp_gc_compact") extern static public function compact():Void;
 
-   @:native("__hxcpp_gc_trace") @:extern
-   static public function nativeTrace(sought:Class<Dynamic>,printInstances:Bool) : Int return 0;
+	@:native("__hxcpp_gc_trace") extern static public function nativeTrace(sought:Class<Dynamic>, printInstances:Bool):Int;
 
-   @:native("__hxcpp_gc_do_not_kill") @:extern
-   static public function doNotKill(inObject:Dynamic) : Void { }
+	@:native("__hxcpp_gc_do_not_kill") extern static public function doNotKill(inObject:Dynamic):Void;
 
-   @:native("__hxcpp_get_next_zombie") @:extern
-   static public function getNextZombie() : Dynamic return null;
+	@:native("__hxcpp_get_next_zombie") extern static public function getNextZombie():Dynamic;
 
-   @:native("__hxcpp_gc_safe_point") @:extern
-   static public function safePoint() : Void { }
+	@:native("__hxcpp_gc_safe_point") extern static public function safePoint():Void;
 
-   @:native("__hxcpp_enter_gc_free_zone") @:extern
-   static public function enterGCFreeZone() : Void { }
+	@:native("__hxcpp_enter_gc_free_zone") extern static public function enterGCFreeZone():Void;
 
-   @:native("__hxcpp_exit_gc_free_zone") @:extern
-   static public function exitGCFreeZone() : Void { }
+	@:native("__hxcpp_exit_gc_free_zone") extern static public function exitGCFreeZone():Void;
 
-   @:native("__hxcpp_set_minimum_free_space") @:extern
-   static public function setMinimumFreeSpace(inBytes:Int) : Void { }
+	@:native("__hxcpp_set_minimum_free_space") extern static public function setMinimumFreeSpace(inBytes:Int):Void;
 
-   @:native("__hxcpp_set_target_free_space_percentage") @:extern
-   static public function setTargetFreeSpacePercentage(inPercentage:Int) : Void { }
+	@:native("__hxcpp_set_target_free_space_percentage") extern static public function setTargetFreeSpacePercentage(inPercentage:Int):Void;
 
-   @:native("__hxcpp_set_minimum_working_memory") @:extern
-   static public function setMinimumWorkingMemory(inBytes:Int) : Void { }
+	@:native("__hxcpp_set_minimum_working_memory") extern static public function setMinimumWorkingMemory(inBytes:Int):Void;
 }
-
diff --git a/std/cpp/NativeMath.hx b/std/cpp/NativeMath.hx
index d6bfaa6ade1f3793dd2600a3391cbed0fd725b92..75bbcf952838cf2fa13ace1e4a12b2621f28e88e 100644
--- a/std/cpp/NativeMath.hx
+++ b/std/cpp/NativeMath.hx
@@ -1,31 +1,49 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 @:noPackageRestrict
-extern class NativeMath
-{
-#if (cpp && !cppia)
-   @:native("_hx_idiv")
-   public static function idiv(num:Int,denom:Int):Int return 0;
-   @:native("_hx_imod")
-   public static function imod(num:Int,denom:Int):Int return 0;
-   @:native("_hx_cast_int")
-   public static function castInt(f:Float):Int return 0;
-   @:native("_hx_fast_floor")
-   public static function fastInt(f:Float):Int return 0;
-
-#else
-
-   public static inline function imod(num:Int,denom:Int):Int
-      return num%denom;
-
-   public static inline function idiv(num:Int,denom:Int):Int
-      return Std.int(num/denom);
+extern class NativeMath {
+	#if (cpp && !cppia)
+	@:native("_hx_idiv")
+	public static function idiv(num:Int, denom:Int):Int;
+	@:native("_hx_imod")
+	public static function imod(num:Int, denom:Int):Int;
+	@:native("_hx_cast_int")
+	public static function castInt(f:Float):Int;
+	@:native("_hx_fast_floor")
+	public static function fastInt(f:Float):Int;
+	#else
+	public static inline function imod(num:Int, denom:Int):Int
+		return num % denom;
 
-   public static inline function castInt(f:Float):Int
-      return Std.int(f);
+	public static inline function idiv(num:Int, denom:Int):Int
+		return Std.int(num / denom);
 
-   public static inline function fastInt(f:Float):Int
-      return Std.int(f);
+	public static inline function castInt(f:Float):Int
+		return Std.int(f);
 
-#end
+	public static inline function fastInt(f:Float):Int
+		return Std.int(f);
+	#end
 }
diff --git a/std/cpp/NativeProcess.hx b/std/cpp/NativeProcess.hx
index fcce680fd3aa355aa82c6787ac2c9f638e0c7d7a..e73ab9d5795cd22c6384edd23b13903336a3b09e 100644
--- a/std/cpp/NativeProcess.hx
+++ b/std/cpp/NativeProcess.hx
@@ -1,40 +1,56 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 @:buildXml('<include name="${HXCPP}/src/hx/libs/std/Build.xml"/>')
-extern class NativeProcess
-{
-
-   @:extern @:native("_hx_std_process_run")
-   public static function process_run(cmd:String,vargs:Array<String>) : Dynamic return null;
-
-   @:extern @:native("_hx_std_process_run")
-   public static function process_run_with_show(cmd:String,vargs:Array<String>,inShow:Int) : Dynamic return null;
-
-   @:extern @:native("_hx_std_process_stdout_read")
-   public static function process_stdout_read(handle:Dynamic,buf:haxe.io.BytesData,pos:Int,len:Int) : Int return 0;
-
-
-   @:extern @:native("_hx_std_process_stderr_read")
-   public static function process_stderr_read(handle:Dynamic,buf:haxe.io.BytesData,pos:Int,len:Int) : Int return 0;
-
-
-   @:extern @:native("_hx_std_process_stdin_write")
-   public static function process_stdin_write(handle:Dynamic,buf:haxe.io.BytesData,pos:Int,len:Int) : Int return 0;
+extern class NativeProcess {
+	@:native("_hx_std_process_run")
+	public static function process_run(cmd:String, vargs:Array<String>):Dynamic;
 
+	@:native("_hx_std_process_run")
+	public static function process_run_with_show(cmd:String, vargs:Array<String>, inShow:Int):Dynamic;
 
-   @:extern @:native("_hx_std_process_stdin_close")
-   public static function process_stdin_close(handle:Dynamic) : Void { }
+	@:native("_hx_std_process_stdout_read")
+	public static function process_stdout_read(handle:Dynamic, buf:haxe.io.BytesData, pos:Int, len:Int):Int;
 
+	@:native("_hx_std_process_stderr_read")
+	public static function process_stderr_read(handle:Dynamic, buf:haxe.io.BytesData, pos:Int, len:Int):Int;
 
-   @:extern @:native("_hx_std_process_exit")
-   public static function process_exit(handle:Dynamic) : Int return 0;
+	@:native("_hx_std_process_stdin_write")
+	public static function process_stdin_write(handle:Dynamic, buf:haxe.io.BytesData, pos:Int, len:Int):Int;
 
+	@:native("_hx_std_process_stdin_close")
+	public static function process_stdin_close(handle:Dynamic):Void;
 
-   @:extern @:native("_hx_std_process_pid")
-   public static function process_pid(handle:Dynamic) : Int return 0;
+	@:native("_hx_std_process_exit")
+	public static function process_exit(handle:Dynamic):Int;
 
+	@:native("_hx_std_process_pid")
+	public static function process_pid(handle:Dynamic):Int;
 
-   @:extern @:native("_hx_std_process_close")
-   public static function process_close(handle:Dynamic) : Void { };
+	@:native("_hx_std_process_kill")
+	public static function process_kill(handle:Dynamic):Void;
 
+	@:native("_hx_std_process_close")
+	public static function process_close(handle:Dynamic):Void;
 }
diff --git a/std/cpp/NativeRandom.hx b/std/cpp/NativeRandom.hx
index 3b6a41be178992aa151de7becea607510b07dab8..a8ee8a0293795dadc469ac3b2978046c69e23cf7 100644
--- a/std/cpp/NativeRandom.hx
+++ b/std/cpp/NativeRandom.hx
@@ -1,23 +1,38 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 @:buildXml('<include name="${HXCPP}/src/hx/libs/std/Build.xml"/>')
-extern class NativeRandom
-{
-
-   @:extern @:native("_hx_std_random_new")
-   public static function random_new() : Dynamic return null;
-
-
-   @:extern @:native("_hx_std_random_set_seed")
-   public static function random_set_seed(handle:Dynamic,v:Int) : Void { }
+extern class NativeRandom {
+	@:native("_hx_std_random_new")
+	public static function random_new():Dynamic;
 
+	@:native("_hx_std_random_set_seed")
+	public static function random_set_seed(handle:Dynamic, v:Int):Void;
 
-   @:extern @:native("_hx_std_random_int")
-   public static function random_int(handle:Dynamic,max:Int) : Int return 0;
-
-   @:extern @:native("_hx_std_random_float")
-   public static function random_float(handle:Dynamic) : Float return 0.0;
-
+	@:native("_hx_std_random_int")
+	public static function random_int(handle:Dynamic, max:Int):Int;
 
+	@:native("_hx_std_random_float")
+	public static function random_float(handle:Dynamic):Float;
 }
-
diff --git a/std/cpp/NativeSocket.hx b/std/cpp/NativeSocket.hx
index 0125556405ef5390ed6f8aa9f6f0e6e38976128a..d81944cc1d5ed8ab3387fd46845b7165ef1c8497 100644
--- a/std/cpp/NativeSocket.hx
+++ b/std/cpp/NativeSocket.hx
@@ -1,155 +1,145 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 import sys.net.Socket;
 
 @:buildXml('<include name="${HXCPP}/src/hx/libs/std/Build.xml"/>')
-extern class NativeSocket
-{
-   @:extern @:native("_hx_std_socket_init")
-   public static function socket_init() : Void { }
-
-
-   @:extern @:native("_hx_std_socket_new")
-   public static function socket_new(udp:Bool) : Dynamic return null;
-
-   @:extern @:native("_hx_std_socket_new")
-   public static function socket_new_ip(udp:Bool,ipv6:Bool) : Dynamic return null;
-
-
-   @:extern @:native("_hx_std_socket_close")
-   public static function socket_close(handle:Dynamic) : Void { }
-
-
-   @:extern @:native("_hx_std_socket_bind")
-   public static function socket_bind(o:Dynamic,host:Int,port:Int) : Void { }
-
-   @:extern @:native("_hx_std_socket_bind_ipv6")
-   public static function socket_bind_ipv6(o:Dynamic,host:haxe.io.BytesData,port:Int) : Void { }
-
-
-   @:extern @:native("_hx_std_socket_send_char")
-   public static function socket_send_char(o:Dynamic,c:Int) : Void { }
-
-
-   @:extern @:native("_hx_std_socket_send")
-   public static function socket_send(o:Dynamic,buf:haxe.io.BytesData,p:Int,l:Int) : Int return 0;
-
-
-   @:extern @:native("_hx_std_socket_recv")
-   public static function socket_recv(o:Dynamic,buf:haxe.io.BytesData,p:Int,l:Int) : Int return 0;
-
-
-   @:extern @:native("_hx_std_socket_recv_char")
-   public static function socket_recv_char(o:Dynamic) : Int return 0;
-
+extern class NativeSocket {
+	@:native("_hx_std_socket_init")
+	public static function socket_init():Void;
 
-   @:extern @:native("_hx_std_socket_write")
-   public static function socket_write(o:Dynamic,buf:haxe.io.BytesData) : Void { }
+	@:native("_hx_std_socket_new")
+	public static function socket_new(udp:Bool):Dynamic;
 
+	@:native("_hx_std_socket_new")
+	public static function socket_new_ip(udp:Bool, ipv6:Bool):Dynamic;
 
-   @:extern @:native("_hx_std_socket_read")
-   public static function socket_read(o:Dynamic) : haxe.io.BytesData return null;
+	@:native("_hx_std_socket_close")
+	public static function socket_close(handle:Dynamic):Void;
 
-   @:extern @:native("_hx_std_host_resolve_ipv6")
-   public static function host_resolve_ipv6(host:String) : haxe.io.BytesData return null;
+	@:native("_hx_std_socket_bind")
+	public static function socket_bind(o:Dynamic, host:Int, port:Int):Void;
 
+	@:native("_hx_std_socket_bind_ipv6")
+	public static function socket_bind_ipv6(o:Dynamic, host:haxe.io.BytesData, port:Int):Void;
 
-   @:extern @:native("_hx_std_host_resolve")
-   public static function host_resolve(host:String) : Int return 0;
+	@:native("_hx_std_socket_send_char")
+	public static function socket_send_char(o:Dynamic, c:Int):Void;
 
+	@:native("_hx_std_socket_send")
+	public static function socket_send(o:Dynamic, buf:haxe.io.BytesData, p:Int, l:Int):Int;
 
-   @:extern @:native("_hx_std_host_to_string")
-   public static function host_to_string(ip:Int) : String return null;
+	@:native("_hx_std_socket_recv")
+	public static function socket_recv(o:Dynamic, buf:haxe.io.BytesData, p:Int, l:Int):Int;
 
-   @:extern @:native("_hx_std_host_to_string_ipv6")
-   public static function host_to_string_ipv6(ipv6:haxe.io.BytesData) : String return null;
+	@:native("_hx_std_socket_recv_char")
+	public static function socket_recv_char(o:Dynamic):Int;
 
+	@:native("_hx_std_socket_write")
+	public static function socket_write(o:Dynamic, buf:haxe.io.BytesData):Void;
 
-   @:extern @:native("_hx_std_host_reverse")
-   public static function host_reverse(host:Int) : String return null;
+	@:native("_hx_std_socket_read")
+	public static function socket_read(o:Dynamic):haxe.io.BytesData;
 
-   @:extern @:native("_hx_std_host_reverse_ipv6")
-   public static function host_reverse_ipv6(ipv6:haxe.io.BytesData) : String return null;
+	@:native("_hx_std_host_resolve_ipv6")
+	public static function host_resolve_ipv6(host:String):haxe.io.BytesData;
 
+	@:native("_hx_std_host_resolve")
+	public static function host_resolve(host:String):Int;
 
-   @:extern @:native("_hx_std_host_local")
-   public static function host_local() : String return null;
+	@:native("_hx_std_host_to_string")
+	public static function host_to_string(ip:Int):String;
 
-   inline public static function host_local_ipv6() : String return "::1";
+	@:native("_hx_std_host_to_string_ipv6")
+	public static function host_to_string_ipv6(ipv6:haxe.io.BytesData):String;
 
+	@:native("_hx_std_host_reverse")
+	public static function host_reverse(host:Int):String;
 
-   @:extern @:native("_hx_std_socket_connect")
-   public static function socket_connect(o:Dynamic,host:Int,port:Int) : Void { }
+	@:native("_hx_std_host_reverse_ipv6")
+	public static function host_reverse_ipv6(ipv6:haxe.io.BytesData):String;
 
-   @:extern @:native("_hx_std_socket_connect_ipv6")
-   public static function socket_connect_ipv6(o:Dynamic,host:haxe.io.BytesData,port:Int) : Void { }
+	@:native("_hx_std_host_local")
+	public static function host_local():String;
 
+	inline public static function host_local_ipv6():String
+		return "::1";
 
-   @:extern @:native("_hx_std_socket_listen")
-   public static function socket_listen(o:Dynamic,n:Int) : Void { }
+	@:native("_hx_std_socket_connect")
+	public static function socket_connect(o:Dynamic, host:Int, port:Int):Void;
 
+	@:native("_hx_std_socket_connect_ipv6")
+	public static function socket_connect_ipv6(o:Dynamic, host:haxe.io.BytesData, port:Int):Void;
 
-   @:extern @:native("_hx_std_socket_select")
-   public static function socket_select(rs:Array<Dynamic>,ws:Array<Dynamic>,es:Array<Dynamic>,timeout:Dynamic) : Array<Dynamic> return null;
+	@:native("_hx_std_socket_listen")
+	public static function socket_listen(o:Dynamic, n:Int):Void;
 
+	@:native("_hx_std_socket_select")
+	public static function socket_select(rs:Array<Dynamic>, ws:Array<Dynamic>, es:Array<Dynamic>, timeout:Dynamic):Array<Dynamic>;
 
-   @:extern @:native("_hx_std_socket_fast_select")
-   public static function socket_fast_select(rs:Array<Dynamic>,ws:Array<Dynamic>,es:Array<Dynamic>,timeout:Dynamic) : Void { }
+	@:native("_hx_std_socket_fast_select")
+	public static function socket_fast_select(rs:Array<Dynamic>, ws:Array<Dynamic>, es:Array<Dynamic>, timeout:Dynamic):Void;
 
+	@:native("_hx_std_socket_accept")
+	public static function socket_accept(o:Dynamic):Dynamic;
 
-   @:extern @:native("_hx_std_socket_accept")
-   public static function socket_accept(o:Dynamic) : Dynamic return null;
+	@:native("_hx_std_socket_peer")
+	public static function socket_peer(o:Dynamic):Array<Int>;
 
+	@:native("_hx_std_socket_host")
+	public static function socket_host(o:Dynamic):Array<Int>;
 
-   @:extern @:native("_hx_std_socket_peer")
-   public static function socket_peer(o:Dynamic) : Array<Int> return null;
+	@:native("_hx_std_socket_set_timeout")
+	public static function socket_set_timeout(o:Dynamic, t:Dynamic):Void;
 
+	@:native("_hx_std_socket_shutdown")
+	public static function socket_shutdown(o:Dynamic, r:Bool, w:Bool):Void;
 
-   @:extern @:native("_hx_std_socket_host")
-   public static function socket_host(o:Dynamic) : Array<Int> return null;
+	@:native("_hx_std_socket_set_blocking")
+	public static function socket_set_blocking(o:Dynamic, b:Bool):Void;
 
+	@:native("_hx_std_socket_set_fast_send")
+	public static function socket_set_fast_send(o:Dynamic, b:Bool):Void;
 
-   @:extern @:native("_hx_std_socket_set_timeout")
-   public static function socket_set_timeout(o:Dynamic,t:Dynamic) : Void { }
+	@:native("_hx_std_socket_set_broadcast")
+	public static function socket_set_broadcast(o:Dynamic, b:Bool):Void;
 
+	@:native("_hx_std_socket_poll_alloc")
+	public static function socket_poll_alloc(nsocks:Int):Dynamic;
 
-   @:extern @:native("_hx_std_socket_shutdown")
-   public static function socket_shutdown(o:Dynamic,r:Bool,w:Bool) : Void { }
+	@:native("_hx_std_socket_poll_prepare")
+	public static function socket_poll_prepare(pdata:Dynamic, rsocks:Array<Socket>, wsocks:Array<Socket>):Array<Array<Int>>;
 
+	@:native("_hx_std_socket_poll_events")
+	public static function socket_poll_events(pdata:Dynamic, timeout:Float):Void;
 
-   @:extern @:native("_hx_std_socket_set_blocking")
-   public static function socket_set_blocking(o:Dynamic,b:Bool) : Void { }
-
-
-   @:extern @:native("_hx_std_socket_set_fast_send")
-   public static function socket_set_fast_send(o:Dynamic,b:Bool) : Void { }
-
-
-   @:extern @:native("_hx_std_socket_poll_alloc")
-   public static function socket_poll_alloc(nsocks:Int) : Dynamic return null;
-
-
-   @:extern @:native("_hx_std_socket_poll_prepare")
-   public static function socket_poll_prepare(pdata:Dynamic,rsocks:Array<Socket>,wsocks:Array<Socket>) : Array< Array<Int> > return null;
-
-
-   @:extern @:native("_hx_std_socket_poll_events")
-   public static function socket_poll_events(pdata:Dynamic,timeout:Float) : Void { }
-
-
-   @:extern @:native("_hx_std_socket_poll")
-   public static function socket_poll(socks:Array<Socket>,pdata:Dynamic,timeout:Float) : Array<Socket> return null;
-
-
-   @:extern @:native("_hx_std_socket_send_to")
-   public static function socket_send_to(o:Dynamic,buf:haxe.io.BytesData,p:Int,l:Int,inAddr:Dynamic) : Int return 0;
-
-
-   @:extern @:native("_hx_std_socket_recv_from")
-   public static function socket_recv_from(o:Dynamic,buf:haxe.io.BytesData,p:Int,l:Int,outAddr:Dynamic) : Int return 0;
-
+	@:native("_hx_std_socket_poll")
+	public static function socket_poll(socks:Array<Socket>, pdata:Dynamic, timeout:Float):Array<Socket>;
 
+	@:native("_hx_std_socket_send_to")
+	public static function socket_send_to(o:Dynamic, buf:haxe.io.BytesData, p:Int, l:Int, inAddr:Dynamic):Int;
 
+	@:native("_hx_std_socket_recv_from")
+	public static function socket_recv_from(o:Dynamic, buf:haxe.io.BytesData, p:Int, l:Int, outAddr:Dynamic):Int;
 }
-
-
diff --git a/std/cpp/NativeSsl.hx b/std/cpp/NativeSsl.hx
index 24766599619bf90978d18dff05a09c6f7ec91c73..4ec353fbf5b2cc612ad354cb30d158f4df4c6158 100644
--- a/std/cpp/NativeSsl.hx
+++ b/std/cpp/NativeSsl.hx
@@ -1,114 +1,134 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 @:buildXml('<include name="${HXCPP}/src/hx/libs/ssl/Build.xml"/>')
-extern class NativeSsl
-{
-   @:extern @:native("_hx_ssl_new")
-   public static function ssl_new( conf : Dynamic ) : Dynamic { }
-
-   @:extern @:native("_hx_ssl_close")
-   public static function ssl_close( ctx : Dynamic ) : Void { }
+extern class NativeSsl {
+	@:native("_hx_ssl_new")
+	public static function ssl_new(conf:Dynamic):Dynamic;
 
-   @:extern @:native("_hx_ssl_handshake")
-   public static function ssl_handshake( ctx : Dynamic ) : Void { }
+	@:native("_hx_ssl_close")
+	public static function ssl_close(ctx:Dynamic):Void;
 
-   @:extern @:native("_hx_ssl_set_socket")
-   public static function ssl_set_socket( ctx : Dynamic, socket : Dynamic ) : Void { }
+	@:native("_hx_ssl_handshake")
+	public static function ssl_handshake(ctx:Dynamic):Void;
 
-   @:extern @:native("_hx_ssl_set_hostname")
-   public static function ssl_set_hostname( ctx : Dynamic, hostname : String ) : Void { }
+	@:native("_hx_ssl_set_socket")
+	public static function ssl_set_socket(ctx:Dynamic, socket:Dynamic):Void;
 
-   @:extern @:native("_hx_ssl_get_peer_certificate")
-   public static function ssl_get_peer_certificate( ctx : Dynamic ) : Dynamic { }
+	@:native("_hx_ssl_set_hostname")
+	public static function ssl_set_hostname(ctx:Dynamic, hostname:String):Void;
 
-   @:extern @:native("_hx_ssl_get_verify_result")
-   public static function ssl_get_verify_result( ctx : Dynamic ) : Bool { }
+	@:native("_hx_ssl_get_peer_certificate")
+	public static function ssl_get_peer_certificate(ctx:Dynamic):Dynamic;
 
-   @:extern @:native("_hx_ssl_send_char")
-   public static function ssl_send_char( ctx : Dynamic, char : Int ) : Void { }
+	@:native("_hx_ssl_get_verify_result")
+	public static function ssl_get_verify_result(ctx:Dynamic):Bool;
 
-   @:extern @:native("_hx_ssl_send")
-   public static function ssl_send( ctx : Dynamic, buf : haxe.io.BytesData, p : Int, l : Int ) : Int { }
+	@:native("_hx_ssl_send_char")
+	public static function ssl_send_char(ctx:Dynamic, char:Int):Void;
 
-   @:extern @:native("_hx_ssl_write")
-   public static function ssl_write( ctx : Dynamic, data : haxe.io.BytesData ) : Void { }
+	@:native("_hx_ssl_send")
+	public static function ssl_send(ctx:Dynamic, buf:haxe.io.BytesData, p:Int, l:Int):Int;
 
-   @:extern @:native("_hx_ssl_recv_char")
-   public static function ssl_recv_char( ctx : Dynamic ) : Int { }
+	@:native("_hx_ssl_write")
+	public static function ssl_write(ctx:Dynamic, data:haxe.io.BytesData):Void;
 
-   @:extern @:native("_hx_ssl_recv")
-   public static function ssl_recv( ctx : Dynamic, buf : haxe.io.BytesData, p : Int, l : Int ) : Int { }
+	@:native("_hx_ssl_recv_char")
+	public static function ssl_recv_char(ctx:Dynamic):Int;
 
-   @:extern @:native("_hx_ssl_read")
-   public static function ssl_read( ctx : Dynamic ) : haxe.io.BytesData { }
+	@:native("_hx_ssl_recv")
+	public static function ssl_recv(ctx:Dynamic, buf:haxe.io.BytesData, p:Int, l:Int):Int;
 
-   @:extern @:native("_hx_ssl_conf_new")
-   public static function conf_new( server : Bool ) : Dynamic { }
+	@:native("_hx_ssl_read")
+	public static function ssl_read(ctx:Dynamic):haxe.io.BytesData;
 
-   @:extern @:native("_hx_ssl_conf_close")
-   public static function conf_close( conf : Dynamic ) : Void { }
+	@:native("_hx_ssl_conf_new")
+	public static function conf_new(server:Bool):Dynamic;
 
-   @:extern @:native("_hx_ssl_conf_set_ca")
-   public static function conf_set_ca( conf : Dynamic, cert : Dynamic ) : Void { }
+	@:native("_hx_ssl_conf_close")
+	public static function conf_close(conf:Dynamic):Void;
 
-   @:extern @:native("_hx_ssl_conf_set_verify")
-   public static function conf_set_verify( conf : Dynamic, mode : Int ) : Void { }
+	@:native("_hx_ssl_conf_set_ca")
+	public static function conf_set_ca(conf:Dynamic, cert:Dynamic):Void;
 
-   @:extern @:native("_hx_ssl_conf_set_cert")
-   public static function conf_set_cert( conf : Dynamic, cert : Dynamic, pkey : Dynamic ) : Void { }
+	@:native("_hx_ssl_conf_set_verify")
+	public static function conf_set_verify(conf:Dynamic, mode:Int):Void;
 
-   @:extern @:native("_hx_ssl_conf_set_servername_callback")
-   public static function conf_set_servername_callback( conf : Dynamic, cb : Dynamic ) : Void { }
+	@:native("_hx_ssl_conf_set_cert")
+	public static function conf_set_cert(conf:Dynamic, cert:Dynamic, pkey:Dynamic):Void;
 
-   @:extern @:native("_hx_ssl_cert_load_defaults")
-   public static function cert_load_defaults() : Dynamic { }
+	@:native("_hx_ssl_conf_set_servername_callback")
+	public static function conf_set_servername_callback(conf:Dynamic, cb:Dynamic):Void;
 
-   @:extern @:native("_hx_ssl_cert_load_file")
-   public static function cert_load_file( file : String ) : Dynamic { }
+	@:native("_hx_ssl_cert_load_defaults")
+	public static function cert_load_defaults():Dynamic;
 
-   @:extern @:native("_hx_ssl_cert_load_path")
-   public static function cert_load_path( path : String ) : Dynamic { }
+	@:native("_hx_ssl_cert_load_file")
+	public static function cert_load_file(file:String):Dynamic;
 
-   @:extern @:native("_hx_ssl_cert_get_subject")
-   public static function cert_get_subject( cert : Dynamic, field : String ) : String { }
+	@:native("_hx_ssl_cert_load_path")
+	public static function cert_load_path(path:String):Dynamic;
 
-   @:extern @:native("_hx_ssl_cert_get_issuer")
-   public static function cert_get_issuer( cert : Dynamic, field : String ) : String { }
+	@:native("_hx_ssl_cert_get_subject")
+	public static function cert_get_subject(cert:Dynamic, field:String):String;
 
-   @:extern @:native("_hx_ssl_cert_get_altnames")
-   public static function cert_get_altnames( cert : Dynamic ) : Array<String> { }
+	@:native("_hx_ssl_cert_get_issuer")
+	public static function cert_get_issuer(cert:Dynamic, field:String):String;
 
-   @:extern @:native("_hx_ssl_cert_get_notbefore")
-   public static function cert_get_notbefore( cert : Dynamic ) : Array<Int> { }
+	@:native("_hx_ssl_cert_get_altnames")
+	public static function cert_get_altnames(cert:Dynamic):Array<String>;
 
-   @:extern @:native("_hx_ssl_cert_get_notafter")
-   public static function cert_get_notafter( cert : Dynamic ) : Array<Int> { }
+	@:native("_hx_ssl_cert_get_notbefore")
+	public static function cert_get_notbefore(cert:Dynamic):Array<Int>;
 
-   @:extern @:native("_hx_ssl_cert_get_next")
-   public static function cert_get_next( cert : Dynamic ) : Dynamic { }
+	@:native("_hx_ssl_cert_get_notafter")
+	public static function cert_get_notafter(cert:Dynamic):Array<Int>;
 
-   @:extern @:native("_hx_ssl_cert_add_pem")
-   public static function cert_add_pem( cert : Dynamic, data : String ) : Dynamic { }
+	@:native("_hx_ssl_cert_get_next")
+	public static function cert_get_next(cert:Dynamic):Dynamic;
 
-   @:extern @:native("_hx_ssl_cert_add_der")
-   public static function cert_add_der( cert : Dynamic, data : haxe.io.BytesData ) : Dynamic { }
+	@:native("_hx_ssl_cert_add_pem")
+	public static function cert_add_pem(cert:Dynamic, data:String):Dynamic;
 
-   @:extern @:native("_hx_ssl_key_from_der")
-   public static function key_from_der( data : haxe.io.BytesData, pub : Bool ) : Dynamic { }
+	@:native("_hx_ssl_cert_add_der")
+	public static function cert_add_der(cert:Dynamic, data:haxe.io.BytesData):Dynamic;
 
-   @:extern @:native("_hx_ssl_key_from_pem")
-   public static function key_from_pem( data : String, pub : Bool, pass : String ) : Dynamic { }
+	@:native("_hx_ssl_key_from_der")
+	public static function key_from_der(data:haxe.io.BytesData, pub:Bool):Dynamic;
 
-   @:extern @:native("_hx_ssl_dgst_make")
-   public static function dgst_make( data : haxe.io.BytesData, alg : String ) : haxe.io.BytesData { }
+	@:native("_hx_ssl_key_from_pem")
+	public static function key_from_pem(data:String, pub:Bool, pass:String):Dynamic;
 
-   @:extern @:native("_hx_ssl_dgst_sign")
-   public static function dgst_sign( data : haxe.io.BytesData, key : Dynamic, alg : String ) : haxe.io.BytesData { }
+	@:native("_hx_ssl_dgst_make")
+	public static function dgst_make(data:haxe.io.BytesData, alg:String):haxe.io.BytesData;
 
-   @:extern @:native("_hx_ssl_dgst_verify")
-   public static function dgst_verify( data : haxe.io.BytesData, sign : haxe.io.BytesData, key : Dynamic, alg : String ) : Bool { }
+	@:native("_hx_ssl_dgst_sign")
+	public static function dgst_sign(data:haxe.io.BytesData, key:Dynamic, alg:String):haxe.io.BytesData;
 
-   @:extern @:native("_hx_ssl_init")
-   public static function init() : Void { }
+	@:native("_hx_ssl_dgst_verify")
+	public static function dgst_verify(data:haxe.io.BytesData, sign:haxe.io.BytesData, key:Dynamic, alg:String):Bool;
 
+	@:native("_hx_ssl_init")
+	public static function init():Void;
 }
diff --git a/std/cpp/NativeString.hx b/std/cpp/NativeString.hx
index b9e3ce5332db60f8af74ef71e3b068f37260fade..6d90fc300d2b7790af9970e92987fd79f7ad51be 100644
--- a/std/cpp/NativeString.hx
+++ b/std/cpp/NativeString.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,44 +19,41 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
 
-extern class NativeString {
-
-	public static inline function raw( inString:String ) : RawConstPointer<Char> {
-      return untyped inString.__s;
-   }
-	public static inline function c_str( inString:String ) : ConstPointer<Char> {
-		return cpp.ConstPointer.fromPointer(untyped inString.__s);
-   }
-	public static inline function fromPointer(inPtr:ConstPointer<Char> ) : String {
-      return untyped __global__.String(inPtr.ptr);
-   }
-	public static inline function fromGcPointer(inPtr:ConstPointer<Char>, inLen:Int ) : String {
-      return untyped __global__.String(inPtr.ptr,inLen);
-   }
-
-
-   @:native("_hx_string_compare")
-   public static function compare(inString0:String, inString1:String) : Int return 0;
-
-   @:native("_hx_utf8_char_code_at")
-   public static function utf8CharCodeAt(inString:String, inIndex:Int) : Int return 0;
-
-   @:native("_hx_utf8_length")
-   public static function utf8Length(inString:String) : Int return 1;
-
-   @:native("_hx_utf8_is_valid")
-   public static function utf8IsValid(inString:String) : Bool return false;
-
-   @:native("_hx_utf8_sub")
-   public static function utf8Sub(inString:String,charStart:Int, inLen:Int) : String return null;
-
-   @:native("_hx_string_create")
-   public static function fromPointerLen(inPtr:ConstPointer<Char>, len:Int ) : String;
-
-   @:native("_hx_utf8_decode_advance")
-   public static function utf8DecodeAdvance(reference:Char) : Int  return 0;
+package cpp;
 
+extern class NativeString {
+	public static inline function raw(inString:String):RawConstPointer<Char> {
+		return untyped inString.raw_ptr();
+	}
+	public static inline function c_str(inString:String):ConstPointer<Char> {
+		return cpp.ConstPointer.fromPointer(untyped inString.c_str());
+	}
+	public static inline function fromPointer(inPtr:ConstPointer<Char>):String {
+		return untyped __global__.String(inPtr.ptr);
+	}
+	public static inline function fromGcPointer(inPtr:ConstPointer<Char>, inLen:Int):String {
+		return untyped __global__.String(inPtr.ptr, inLen);
+	}
+
+	@:native("_hx_string_compare")
+	public static function compare(inString0:String, inString1:String):Int;
+
+	@:native("_hx_utf8_char_code_at")
+	public static function utf8CharCodeAt(inString:String, inIndex:Int):Int;
+
+	@:native("_hx_utf8_length")
+	public static function utf8Length(inString:String):Int;
+
+	@:native("_hx_utf8_is_valid")
+	public static function utf8IsValid(inString:String):Bool;
+
+	@:native("_hx_utf8_sub")
+	public static function utf8Sub(inString:String, charStart:Int, inLen:Int):String;
+
+	@:native("_hx_string_create")
+	public static function fromPointerLen(inPtr:ConstPointer<Char>, len:Int):String;
+
+	@:native("_hx_utf8_decode_advance")
+	public static function utf8DecodeAdvance(reference:Char):Int;
 }
-
diff --git a/std/cpp/NativeSys.hx b/std/cpp/NativeSys.hx
index 17e0383d2f8c694d0b3ba75e1c4d75d2d87545c4..d2656a28a4f3676bb9f8bc8b145631c098ce21fd 100644
--- a/std/cpp/NativeSys.hx
+++ b/std/cpp/NativeSys.hx
@@ -1,113 +1,107 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 @:buildXml('<include name="${HXCPP}/src/hx/libs/std/Build.xml"/>')
-extern class NativeSys
-{
-   @:native("__hxcpp_print")
-   public static function print( v : Dynamic ) : Void { }
-
-   @:native("__hxcpp_println")
-   public static function println( v : Dynamic ) : Void { }
-
-   @:extern @:native("_hx_std_get_env")
-   public static function get_env(v:String) : String return null;
-
-
-   @:extern @:native("_hx_std_put_env")
-   public static function put_env(e:String,v:String) : Void { }
-
-
-   @:extern @:native("_hx_std_sys_sleep")
-   public static function sys_sleep(f:Float) : Void { }
-
-
-   @:extern @:native("_hx_std_set_time_locale")
-   public static function set_time_locale(l:String) : Bool return false;
-
-
-   @:extern @:native("_hx_std_get_cwd")
-   public static function get_cwd() : String return null;
-
-
-   @:extern @:native("_hx_std_set_cwd")
-   public static function set_cwd(d:String) : Void { }
-
+extern class NativeSys {
+	@:native("__hxcpp_print")
+	public static function print(v:Dynamic):Void;
 
-   @:extern @:native("_hx_std_sys_string")
-   public static function sys_string() : String return null;
+	@:native("__hxcpp_println")
+	public static function println(v:Dynamic):Void;
 
+	@:native("_hx_std_get_env")
+	extern public static function get_env(v:String):String;
 
-   @:extern @:native("_hx_std_sys_is64")
-   public static function sys_is64() : Bool return false;
+	@:native("_hx_std_put_env")
+	extern public static function put_env(e:String, v:String):Void;
 
+	@:native("_hx_std_sys_sleep")
+	extern public static function sys_sleep(f:Float):Void;
 
-   @:extern @:native("_hx_std_sys_command")
-   public static function sys_command(cmd:String) : Int return 0;
+	@:native("_hx_std_set_time_locale")
+	extern public static function set_time_locale(l:String):Bool;
 
+	@:native("_hx_std_get_cwd")
+	extern public static function get_cwd():String;
 
-   @:extern @:native("_hx_std_sys_exit")
-   public static function sys_exit(code:Int) : Void { }
+	@:native("_hx_std_set_cwd")
+	extern public static function set_cwd(d:String):Void;
 
+	@:native("_hx_std_sys_string")
+	extern public static function sys_string():String;
 
-   @:extern @:native("_hx_std_sys_exists")
-   public static function sys_exists(path:String) : Bool return false;
+	@:native("_hx_std_sys_is64")
+	extern public static function sys_is64():Bool;
 
+	@:native("_hx_std_sys_command")
+	extern public static function sys_command(cmd:String):Int;
 
-   @:extern @:native("_hx_std_file_delete")
-   public static function file_delete(path:String) : Void { }
+	@:native("_hx_std_sys_exit")
+	extern public static function sys_exit(code:Int):Void;
 
+	@:native("_hx_std_sys_exists")
+	extern public static function sys_exists(path:String):Bool;
 
-   @:extern @:native("_hx_std_sys_rename")
-   public static function sys_rename(path:String,newname:String) : Bool return false;
+	@:native("_hx_std_file_delete")
+	extern public static function file_delete(path:String):Void;
 
+	@:native("_hx_std_sys_rename")
+	extern public static function sys_rename(path:String, newname:String):Bool;
 
-   @:extern @:native("_hx_std_sys_stat")
-   public static function sys_stat(path:String) : Dynamic return null;
+	@:native("_hx_std_sys_stat")
+	extern public static function sys_stat(path:String):Dynamic;
 
+	@:native("_hx_std_sys_file_type")
+	extern public static function sys_file_type(path:String):String;
 
-   @:extern @:native("_hx_std_sys_file_type")
-   public static function sys_file_type(path:String) : String return null;
+	@:native("_hx_std_sys_create_dir")
+	extern public static function sys_create_dir(path:String, mode:Int):Bool;
 
+	@:native("_hx_std_sys_remove_dir")
+	extern public static function sys_remove_dir(path:String):Void;
 
-   @:extern @:native("_hx_std_sys_create_dir")
-   public static function sys_create_dir(path:String,mode:Int) : Bool return false;
+	@:native("_hx_std_sys_time")
+	extern public static function sys_time():Float;
 
+	@:native("_hx_std_sys_cpu_time")
+	extern public static function sys_cpu_time():Float;
 
-   @:extern @:native("_hx_std_sys_remove_dir")
-   public static function sys_remove_dir(path:String) : Void { }
+	@:native("_hx_std_sys_read_dir")
+	extern public static function sys_read_dir(p:String):Array<String>;
 
+	@:native("_hx_std_file_full_path")
+	extern public static function file_full_path(path:String):String;
 
-   @:extern @:native("_hx_std_sys_time")
-   public static function sys_time() : Float return 0;
+	@:native("_hx_std_sys_exe_path")
+	extern public static function sys_exe_path():String;
 
+	@:native("_hx_std_sys_env")
+	extern public static function sys_env():Array<String>;
 
-   @:extern @:native("_hx_std_sys_cpu_time")
-   public static function sys_cpu_time() : Float return 0;
-
-
-   @:extern @:native("_hx_std_sys_read_dir")
-   public static function sys_read_dir(p:String) : Array<String> return null;
-
-
-   @:extern @:native("_hx_std_file_full_path")
-   public static function file_full_path(path:String) : String return null;
-
-
-   @:extern @:native("_hx_std_sys_exe_path")
-   public static function sys_exe_path() : String return null;
-
-
-   @:extern @:native("_hx_std_sys_env")
-   public static function sys_env() : Array<String> return null;
-
-
-   @:extern @:native("_hx_std_sys_getch")
-   public static function sys_getch(b:Bool) : Int return 0;
-
-
-   @:extern @:native("_hx_std_sys_get_pid")
-   public static function sys_get_pid() : Int return 0;
+	@:native("_hx_std_sys_getch")
+	extern public static function sys_getch(b:Bool):Int;
 
+	@:native("_hx_std_sys_get_pid")
+	extern public static function sys_get_pid():Int;
 }
-
-
diff --git a/std/cpp/NativeXml.hx b/std/cpp/NativeXml.hx
index 0670d686109592f928548ae997de86d2a9fcd7cf..a45aa88801746a351ce830a52e45ecb8af5d7a46 100644
--- a/std/cpp/NativeXml.hx
+++ b/std/cpp/NativeXml.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,482 +19,455 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
-@:enum abstract XmlType(Int) {
-   /**
-      Represents an XML element type.
-   **/
-   var Element = 0;
-   /**
-      Represents XML parsed character data type.
-   **/
-   var PCData = 1;
-   /**
-      Represents XML character data type.
-   **/
-   var CData = 2;
-   /**
-      Represents an XML comment type.
-   **/
-   var Comment = 3;
-   /**
-      Represents an XML doctype element type.
-   **/
-   var DocType = 4;
-   /**
-       Represents an XML processing instruction type.
-   **/
-   var ProcessingInstruction = 5;
-   /**
-      Represents an XML document type.
-   **/
-   var Document = 6;
+enum abstract XmlType(Int) {
+	/**
+		Represents an XML element type.
+	**/
+	var Element = 0;
+
+	/**
+		Represents XML parsed character data type.
+	**/
+	var PCData = 1;
+
+	/**
+		Represents XML character data type.
+	**/
+	var CData = 2;
+
+	/**
+		Represents an XML comment type.
+	**/
+	var Comment = 3;
+
+	/**
+		Represents an XML doctype element type.
+	**/
+	var DocType = 4;
+
+	/**
+		Represents an XML processing instruction type.
+	**/
+	var ProcessingInstruction = 5;
+
+	/**
+		Represents an XML document type.
+	**/
+	var Document = 6;
 }
 
-class NativeXmlState
-{
-   var cur : Xml;
-
-   public function new(x:Xml)
-   {
-      x._children = new Array<Xml>();
-      cur = x;
-   }
-
-
-   @:keep
-   public function xml(name:String, att:Dynamic<String>)
-   {
-      var x = new Xml();
-      x._parent = cur;
-      x.nodeType = Xml.Element;
-      x._nodeName = name;
-      x._attributes = att;
-      x._children = new Array<Xml>();
-      cur.addChild(x);
-      cur = x;
-   }
-
-   @:keep
-   public function cdata(text:String)
-   {
-      var x = new Xml();
-      x._parent = cur;
-      x.nodeType = Xml.CData;
-      x._nodeValue = text;
-      cur.addChild(x);
-   }
-
-   @:keep
-   public function pcdata(text:String)
-   {
-      var x = new Xml();
-      x._parent = cur;
-      x.nodeType = Xml.PCData;
-      x._nodeValue = text;
-      cur.addChild(x);
-   }
-
-   @:keep
-   public function comment(text:String)
-   {
-      var x = new Xml();
-      x._parent = cur;
-      if( text.length>1 && StringTools.fastCodeAt(text,0) == 63 )
-      {
-         x.nodeType = Xml.ProcessingInstruction;
-         text = text.substr(1, text.length - 2);
-      }
-      else
-      {
-         x.nodeType = Xml.Comment;
-      }
-      x._nodeValue = text;
-      cur.addChild(x);
-   }
-
-   @:keep
-   public function doctype(text:String)
-   {
-      var x = new Xml();
-      x._parent = cur;
-      x.nodeType = Xml.DocType;
-      x._nodeValue = text.substr(1);
-      cur.addChild(x);
-   }
-   
-   @:keep
-   public function done()
-   {
-     cur = cur._parent;
-   }
+class NativeXmlState {
+	var cur:Xml;
+
+	public function new(x:Xml) {
+		x._children = new Array<Xml>();
+		cur = x;
+	}
+
+	@:keep
+	public function xml(name:String, att:Dynamic<String>) {
+		var x = new Xml();
+		x._parent = cur;
+		x.nodeType = Xml.Element;
+		x._nodeName = name;
+		x._attributes = att;
+		x._children = new Array<Xml>();
+		cur.addChild(x);
+		cur = x;
+	}
+
+	@:keep
+	public function cdata(text:String) {
+		var x = new Xml();
+		x._parent = cur;
+		x.nodeType = Xml.CData;
+		x._nodeValue = text;
+		cur.addChild(x);
+	}
+
+	@:keep
+	public function pcdata(text:String) {
+		var x = new Xml();
+		x._parent = cur;
+		x.nodeType = Xml.PCData;
+		x._nodeValue = text;
+		cur.addChild(x);
+	}
+
+	@:keep
+	public function comment(text:String) {
+		var x = new Xml();
+		x._parent = cur;
+		if (text.length > 1 && StringTools.fastCodeAt(text, 0) == 63) {
+			x.nodeType = Xml.ProcessingInstruction;
+			text = text.substr(1, text.length - 2);
+		} else {
+			x.nodeType = Xml.Comment;
+		}
+		x._nodeValue = text;
+		cur.addChild(x);
+	}
+
+	@:keep
+	public function doctype(text:String) {
+		var x = new Xml();
+		x._parent = cur;
+		x.nodeType = Xml.DocType;
+		x._nodeValue = text.substr(1);
+		cur.addChild(x);
+	}
+
+	@:keep
+	public function done() {
+		cur = cur._parent;
+	}
 }
 
-private class NativeXmlIterator
-{
-   var cur = 0;
-   var children:Array<Xml>;
-
-   public function new(inChildren:Array<Xml>)
-   {
-      children = inChildren;
-      cur = 0;
-   }
-
-   public function hasNext() : Bool
-   {
-      var k = cur;
-      var l = children.length;
-      while( k < l )
-      {
-         if (children[k].nodeType == Xml.Element)
-            break;
-         k += 1;
-      }
-      cur = k;
-      return k < l;
-   }
-
-   public function next():Xml
-   {
-      var k = cur;
-      var l = children.length;
-      while( k < l )
-      {
-         var n = children[k];
-         k += 1;
-         if( n.nodeType == Xml.Element )
-         {
-            cur = k;
-            return n;
-         }
-      }
-      return null;
-   }
+private class NativeXmlIterator {
+	var cur = 0;
+	var children:Array<Xml>;
+
+	public function new(inChildren:Array<Xml>) {
+		children = inChildren;
+		cur = 0;
+	}
+
+	public function hasNext():Bool {
+		var k = cur;
+		var l = children.length;
+		while (k < l) {
+			if (children[k].nodeType == Xml.Element)
+				break;
+			k += 1;
+		}
+		cur = k;
+		return k < l;
+	}
+
+	public function next():Xml {
+		var k = cur;
+		var l = children.length;
+		while (k < l) {
+			var n = children[k];
+			k += 1;
+			if (n.nodeType == Xml.Element) {
+				cur = k;
+				return n;
+			}
+		}
+		return null;
+	}
 }
 
-private class NativeXmlNamedIterator
-{
-   var cur = 0;
-   var children:Array<Xml>;
-   var name:String;
-
-   public function new(inChildren:Array<Xml>, inName:String)
-   {
-      children = inChildren;
-      name = inName;
-      cur = 0;
-   }
-
-
-   public function hasNext() : Bool
-   {
-      var k = cur;
-      var l = children.length;
-      while( k < l )
-      {
-         var n = children[k];
-         if( n.nodeType == Xml.Element && n._nodeName == name )
-            break;
-         k++;
-     }
-     cur = k;
-     return k < l;
-   }
-
-   public function next():Xml
-   {
-      var k = cur;
-      var l = children.length;
-      while( k < l )
-      {
-         var n = children[k];
-         k++;
-         if( n.nodeType == Xml.Element && n._nodeName == name ) {
-            cur = k;
-            return n;
-         }
-      }
-      return null;
-   }
+private class NativeXmlNamedIterator {
+	var cur = 0;
+	var children:Array<Xml>;
+	var name:String;
+
+	public function new(inChildren:Array<Xml>, inName:String) {
+		children = inChildren;
+		name = inName;
+		cur = 0;
+	}
+
+	public function hasNext():Bool {
+		var k = cur;
+		var l = children.length;
+		while (k < l) {
+			var n = children[k];
+			if (n.nodeType == Xml.Element && n._nodeName == name)
+				break;
+			k++;
+		}
+		cur = k;
+		return k < l;
+	}
+
+	public function next():Xml {
+		var k = cur;
+		var l = children.length;
+		while (k < l) {
+			var n = children[k];
+			k++;
+			if (n.nodeType == Xml.Element && n._nodeName == name) {
+				cur = k;
+				return n;
+			}
+		}
+		return null;
+	}
 }
 
-
-
-
 @:cppInclude("./NativeXmlImport.cpp")
 @:allow(cpp.NativeXmlState) @:allow(cpp.NativeXmlIterator) @:allow(cpp.NativeXmlNamedIterator)
 class Xml {
-   static inline var Element = XmlType.Element;
-   static inline var PCData = XmlType.PCData;
-   static inline var CData = XmlType.CData;
-   static inline var Comment = XmlType.Comment;
-   static inline var DocType = XmlType.DocType;
-   static inline var ProcessingInstruction = XmlType.ProcessingInstruction;
-   static inline var Document = XmlType.Document;
-
-
-   private var _nodeName : String;
-   private var _nodeValue : String;
-   private var _attributes : Dynamic<String>;
-   private var _children : Array<Xml>;
-   private var _parent : Xml;
-
-   function new() : Void {
-   }
-
-   @:extern @:native("parse_xml")
-   static function parse_xml(str:String, state:NativeXmlState) { }
-
-   public static function parse( str : String ) : Xml
-   {
-      var x = new Xml();
-      var state = new NativeXmlState(x);
-      parse_xml(str,state);
-      x.nodeType = Xml.Document;
-      return x;
-   }
-
-
-   public static function createElement( name : String ) : Xml {
-      var r = new Xml();
-      r.nodeType = Xml.Element;
-      r._nodeName = name;
-      r._attributes = null;
-      r._children = new Array();
-      return r;
-   }
-
-   public static function createPCData( data : String ) : Xml {
-      var r = new Xml();
-      r.nodeType = Xml.PCData;
-      r._nodeValue = data;
-      return r;
-   }
-
-   public static function createCData( data : String ) : Xml {
-      var r = new Xml();
-      r.nodeType = Xml.CData;
-      r._nodeValue = data;
-      return r;
-   }
-
-   public static function createComment( data : String ) : Xml {
-      var r = new Xml();
-      r.nodeType = Xml.Comment;
-      r._nodeValue = data;
-      return r;
-   }
-
-   public static function createDocType( data : String ) : Xml {
-      var r = new Xml();
-      r.nodeType = Xml.DocType;
-      r._nodeValue = data;
-      return r;
-   }
-
-   public static function createProcessingInstruction( data : String ) : Xml {
-      var r = new Xml();
-      r.nodeType = Xml.ProcessingInstruction;
-      r._nodeValue = data;
-      return r;
-   }
-
-   public static function createDocument() : Xml {
-      var r = new Xml();
-      r.nodeType = Xml.Document;
-      r._children = new Array();
-      return r;
-   }
-
-   public var nodeType(default,null) : XmlType;
-
-   public var nodeName(get,set) : String;
-
-   public var nodeValue(get,set) : String;
-
-
-   private function get_nodeName() : String {
-      if( nodeType != Xml.Element )
-         throw "bad nodeType";
-      return _nodeName;
-   }
-
-   private function set_nodeName( n : String ) : String {
-      if( nodeType != Xml.Element )
-         throw "bad nodeType";
-      return _nodeName = n;
-   }
-
-   private function get_nodeValue() : String {
-      if( nodeType == Xml.Element || nodeType == Xml.Document )
-         throw "bad nodeType";
-      return _nodeValue;
-   }
-
-   private function set_nodeValue( v : String ) : String {
-      if( nodeType == Xml.Element || nodeType == Xml.Document )
-         throw "bad nodeType";
-      return _nodeValue = v;
-   }
-
-   public var parent(get,null) : Xml;
-   private function get_parent() : Xml {
-      return _parent;
-   }
-
-   public function get( att : String ) : String {
-      if( nodeType != Xml.Element )
-         throw "bad nodeType";
-      return Reflect.field( _attributes, att );
-   }
-
-   public function set( att : String, value : String ) : Void {
-      if( nodeType != Xml.Element )
-         throw "bad nodeType";
-      if (_attributes==null)
-         _attributes = {};
-      Reflect.setField (_attributes, att, value );
-      return null;
-   }
-
-   public function remove( att : String ) : Void{
-      if( nodeType != Xml.Element )
-         throw "bad nodeType";
-      Reflect.deleteField( _attributes, att );
-      return null;
-   }
-
-   public function exists( att : String ) : Bool {
-      if( nodeType != Xml.Element )
-         throw "bad nodeType";
-      return Reflect.hasField( _attributes, att );
-   }
-
-   public function attributes() : Iterator<String> {
-      if( nodeType != Xml.Element )
-         throw "bad nodeType";
-      return Reflect.fields( _attributes ).iterator();
-   }
-
-   public function iterator() : Iterator<Xml> {
-      if( _children == null )
-         throw "bad nodetype";
-      return untyped _children.iterator();
-   }
-
-
-   public function elements(): Iterator<Xml>
-   {
-      if( _children == null )
-         throw "bad nodetype";
-      return new NativeXmlIterator(_children);
-   }
-
-   public function elementsNamed( name : String ) : Iterator<Xml>
-   {
-      if( _children == null )
-         throw "bad nodetype";
-      return new NativeXmlNamedIterator(_children,name);
-   }
-
-   public function firstChild() : Xml {
-      if( _children == null )
-         throw "bad nodetype";
-      return _children[0];
-   }
-
-   public function firstElement() : Xml {
-      if( _children == null )
-         throw "bad nodetype";
-      for( cur in 0..._children.length ) {
-         var n:Xml = _children[cur];
-         if( n.nodeType == Xml.Element )
-            return n;
-      }
-      return null;
-   }
-
-   public function addChild( x : Xml ) : Void {
-      if( _children == null )
-         throw "bad nodetype";
-      if( x._parent != null ) x._parent._children.remove(x);
-      x._parent = this;
-      _children.push( x );
-      return null;
-   }
-
-   public function removeChild( x : Xml ) : Bool {
-      if( _children == null )
-         throw "bad nodetype";
-      var b = _children.remove( x );
-      if( b ) x._parent = null;
-      return b;
-   }
-
-   public function insertChild( x : Xml, pos : Int ) : Void {
-      if( _children == null )
-         throw "bad nodetype";
-      if( x._parent != null ) x._parent._children.remove(x);
-      x._parent = this;
-      _children.insert( pos, x );
-      return null;
-   }
-
-   public function toString() : String {
-      var s = new StringBuf();
-      toStringRec(s);
-      return s.toString();
-   }
-
-   private function toStringRec(s: StringBuf) : Void {
-      switch( nodeType ) {
-      case Xml.Document:
-         for( x in _children )
-            x.toStringRec(s);
-      case Xml.Element:
-         s.addChar("<".code);
-         s.add(_nodeName);
-         for( k in Reflect.fields(_attributes) ) {
-            s.addChar(" ".code);
-            s.add(k);
-            s.addChar("=".code);
-            s.addChar("\"".code);
-            s.add(Reflect.field(_attributes,k));
-            s.addChar("\"".code);
-         }
-         if( _children.length == 0 ) {
-            s.addChar("/".code);
-            s.addChar(">".code);
-            return;
-         }
-         s.addChar(">".code);
-         for( x in _children )
-            x.toStringRec(s);
-         s.addChar("<".code);
-         s.addChar("/".code);
-         s.add(_nodeName);
-         s.addChar(">".code);
-      case Xml.PCData:
-         s.add(StringTools.htmlEscape(_nodeValue));
-      case Xml.CData:
-         s.add("<![CDATA[");
-         s.add(_nodeValue);
-         s.add("]]>");
-      case Xml.Comment:
-         s.add("<!--");
-         s.add(_nodeValue);
-         s.add("-->");
-      case Xml.DocType:
-         s.add("<!DOCTYPE ");
-         s.add(_nodeValue);
-         s.add(">");
-      case Xml.ProcessingInstruction:
-         s.add("<?");
-         s.add(_nodeValue);
-         s.add("?>");
-      }
-   }
-
+	static inline var Element = XmlType.Element;
+	static inline var PCData = XmlType.PCData;
+	static inline var CData = XmlType.CData;
+	static inline var Comment = XmlType.Comment;
+	static inline var DocType = XmlType.DocType;
+	static inline var ProcessingInstruction = XmlType.ProcessingInstruction;
+	static inline var Document = XmlType.Document;
+
+	private var _nodeName:String;
+	private var _nodeValue:String;
+	private var _attributes:Dynamic<String>;
+	private var _children:Array<Xml>;
+	private var _parent:Xml;
+
+	function new():Void {}
+
+	@:native("parse_xml")
+	extern static function parse_xml(str:String, state:NativeXmlState);
+
+	public static function parse(str:String):Xml {
+		var x = new Xml();
+		var state = new NativeXmlState(x);
+		parse_xml(str, state);
+		x.nodeType = Xml.Document;
+		return x;
+	}
+
+	public static function createElement(name:String):Xml {
+		var r = new Xml();
+		r.nodeType = Xml.Element;
+		r._nodeName = name;
+		r._attributes = null;
+		r._children = new Array();
+		return r;
+	}
+
+	public static function createPCData(data:String):Xml {
+		var r = new Xml();
+		r.nodeType = Xml.PCData;
+		r._nodeValue = data;
+		return r;
+	}
+
+	public static function createCData(data:String):Xml {
+		var r = new Xml();
+		r.nodeType = Xml.CData;
+		r._nodeValue = data;
+		return r;
+	}
+
+	public static function createComment(data:String):Xml {
+		var r = new Xml();
+		r.nodeType = Xml.Comment;
+		r._nodeValue = data;
+		return r;
+	}
+
+	public static function createDocType(data:String):Xml {
+		var r = new Xml();
+		r.nodeType = Xml.DocType;
+		r._nodeValue = data;
+		return r;
+	}
+
+	public static function createProcessingInstruction(data:String):Xml {
+		var r = new Xml();
+		r.nodeType = Xml.ProcessingInstruction;
+		r._nodeValue = data;
+		return r;
+	}
+
+	public static function createDocument():Xml {
+		var r = new Xml();
+		r.nodeType = Xml.Document;
+		r._children = new Array();
+		return r;
+	}
+
+	public var nodeType(default, null):XmlType;
+
+	public var nodeName(get, set):String;
+
+	public var nodeValue(get, set):String;
+
+	private function get_nodeName():String {
+		if (nodeType != Xml.Element)
+			throw "bad nodeType";
+		return _nodeName;
+	}
+
+	private function set_nodeName(n:String):String {
+		if (nodeType != Xml.Element)
+			throw "bad nodeType";
+		return _nodeName = n;
+	}
+
+	private function get_nodeValue():String {
+		if (nodeType == Xml.Element || nodeType == Xml.Document)
+			throw "bad nodeType";
+		return _nodeValue;
+	}
+
+	private function set_nodeValue(v:String):String {
+		if (nodeType == Xml.Element || nodeType == Xml.Document)
+			throw "bad nodeType";
+		return _nodeValue = v;
+	}
+
+	public var parent(get, null):Xml;
+
+	private function get_parent():Xml {
+		return _parent;
+	}
+
+	public function get(att:String):String {
+		if (nodeType != Xml.Element)
+			throw "bad nodeType";
+		return Reflect.field(_attributes, att);
+	}
+
+	public function set(att:String, value:String):Void {
+		if (nodeType != Xml.Element)
+			throw "bad nodeType";
+		if (_attributes == null)
+			_attributes = {};
+		Reflect.setField(_attributes, att, value);
+		return;
+	}
+
+	public function remove(att:String):Void {
+		if (nodeType != Xml.Element)
+			throw "bad nodeType";
+		Reflect.deleteField(_attributes, att);
+		return;
+	}
+
+	public function exists(att:String):Bool {
+		if (nodeType != Xml.Element)
+			throw "bad nodeType";
+		return Reflect.hasField(_attributes, att);
+	}
+
+	public function attributes():Iterator<String> {
+		if (nodeType != Xml.Element)
+			throw "bad nodeType";
+		return Reflect.fields(_attributes).iterator();
+	}
+
+	public function iterator():Iterator<Xml> {
+		if (_children == null)
+			throw "bad nodetype";
+		return untyped _children.iterator();
+	}
+
+	public function elements():Iterator<Xml> {
+		if (_children == null)
+			throw "bad nodetype";
+		return new NativeXmlIterator(_children);
+	}
+
+	public function elementsNamed(name:String):Iterator<Xml> {
+		if (_children == null)
+			throw "bad nodetype";
+		return new NativeXmlNamedIterator(_children, name);
+	}
+
+	public function firstChild():Xml {
+		if (_children == null)
+			throw "bad nodetype";
+		return _children[0];
+	}
+
+	public function firstElement():Xml {
+		if (_children == null)
+			throw "bad nodetype";
+		for (cur in 0..._children.length) {
+			var n:Xml = _children[cur];
+			if (n.nodeType == Xml.Element)
+				return n;
+		}
+		return null;
+	}
+
+	public function addChild(x:Xml):Void {
+		if (_children == null)
+			throw "bad nodetype";
+		if (x._parent != null)
+			x._parent._children.remove(x);
+		x._parent = this;
+		_children.push(x);
+		return;
+	}
+
+	public function removeChild(x:Xml):Bool {
+		if (_children == null)
+			throw "bad nodetype";
+		var b = _children.remove(x);
+		if (b)
+			x._parent = null;
+		return b;
+	}
+
+	public function insertChild(x:Xml, pos:Int):Void {
+		if (_children == null)
+			throw "bad nodetype";
+		if (x._parent != null)
+			x._parent._children.remove(x);
+		x._parent = this;
+		_children.insert(pos, x);
+		return;
+	}
+
+	public function toString():String {
+		var s = new StringBuf();
+		toStringRec(s);
+		return s.toString();
+	}
+
+	private function toStringRec(s:StringBuf):Void {
+		switch (nodeType) {
+			case Xml.Document:
+				for (x in _children)
+					x.toStringRec(s);
+			case Xml.Element:
+				s.addChar("<".code);
+				s.add(_nodeName);
+				for (k in Reflect.fields(_attributes)) {
+					s.addChar(" ".code);
+					s.add(k);
+					s.addChar("=".code);
+					s.addChar("\"".code);
+					s.add(Reflect.field(_attributes, k));
+					s.addChar("\"".code);
+				}
+				if (_children.length == 0) {
+					s.addChar("/".code);
+					s.addChar(">".code);
+					return;
+				}
+				s.addChar(">".code);
+				for (x in _children)
+					x.toStringRec(s);
+				s.addChar("<".code);
+				s.addChar("/".code);
+				s.add(_nodeName);
+				s.addChar(">".code);
+			case Xml.PCData:
+				s.add(StringTools.htmlEscape(_nodeValue));
+			case Xml.CData:
+				s.add("<![CDATA[");
+				s.add(_nodeValue);
+				s.add("]]>");
+			case Xml.Comment:
+				s.add("<!--");
+				s.add(_nodeValue);
+				s.add("-->");
+			case Xml.DocType:
+				s.add("<!DOCTYPE ");
+				s.add(_nodeValue);
+				s.add(">");
+			case Xml.ProcessingInstruction:
+				s.add("<?");
+				s.add(_nodeValue);
+				s.add("?>");
+		}
+	}
 }
diff --git a/std/cpp/NativeXmlImport.cpp b/std/cpp/NativeXmlImport.cpp
index 140f3988d70d5bf350a59745fe33e0b3b67508e6..a98b748088f8f529341361ec40c0af85f3eb9e5c 100644
--- a/std/cpp/NativeXmlImport.cpp
+++ b/std/cpp/NativeXmlImport.cpp
@@ -1,3 +1,24 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
 
 #ifdef EPPC
 #include <memory>
diff --git a/std/cpp/Object.hx b/std/cpp/Object.hx
index 0a0386964960895b920ee636c55c9d1ea98a4001..e1adaf9759c2db2f78324229af6f1f6c149b9ed3 100644
--- a/std/cpp/Object.hx
+++ b/std/cpp/Object.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:noPackageRestrict
 typedef Object = Dynamic;
-
diff --git a/std/cpp/ObjectType.hx b/std/cpp/ObjectType.hx
index b527fc2a872b6629463776bb902640e3fa0fce29..8b25ed754d2b6f55eb15b1426d89b9da3d93ff7e 100644
--- a/std/cpp/ObjectType.hx
+++ b/std/cpp/ObjectType.hx
@@ -1,19 +1,39 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
-extern class ObjectType
-{
-   public inline static var vtUnknown = -1;
-   public inline static var vtInt = 0xff;
-   public inline static var vtNull = 0;
-   public inline static var vtFloat = 1;
-   public inline static var vtBool = 2;
-   public inline static var vtString = 3;
-   public inline static var vtObject = 4;
-   public inline static var vtArray = 5;
-   public inline static var vtFunction = 6;
-   public inline static var vtEnum = 7;
-   public inline static var vtClass = 8;
-   public inline static var vtInt64 = 9;
-   public inline static var vtAbstractBase = 0x100;
+extern class ObjectType {
+	public inline static var vtUnknown = -1;
+	public inline static var vtInt = 0xff;
+	public inline static var vtNull = 0;
+	public inline static var vtFloat = 1;
+	public inline static var vtBool = 2;
+	public inline static var vtString = 3;
+	public inline static var vtObject = 4;
+	public inline static var vtArray = 5;
+	public inline static var vtFunction = 6;
+	public inline static var vtEnum = 7;
+	public inline static var vtClass = 8;
+	public inline static var vtInt64 = 9;
+	public inline static var vtAbstractBase = 0x100;
 }
-
diff --git a/std/cpp/Pointer.hx b/std/cpp/Pointer.hx
index 98cc1323964c1f4e2c45541153f634bad6ff56d1..2762155e69c3fce9ecf0314bba66763181e01c55 100644
--- a/std/cpp/Pointer.hx
+++ b/std/cpp/Pointer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,69 +19,68 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 import haxe.extern.AsVar;
 
 @:coreType
-@:analyzer(as_var)
-extern class Pointer<T> extends ConstPointer<T> implements ArrayAccess<T>
-{
-   public var ref(get,set):Reference<T>;
+@:semantics(variable)
+extern class Pointer<T> extends ConstPointer<T> implements ArrayAccess<T> {
+	public var ref(get, set):Reference<T>;
 
-   public function get_ref() : Reference<T>;
-   public function set_ref(t:T) : Reference<T>;
+	public function get_ref():Reference<T>;
+	public function set_ref(t:T):Reference<T>;
 
-   public function setAt(inIndex:Int, value:T):Void;
+	public function setAt(inIndex:Int, value:T):Void;
 
-   public static function fromRaw<T>(ptr:RawPointer<T>) : Pointer<T>;
+	public static function fromRaw<T>(ptr:RawPointer<T>):Pointer<T>;
 
-   @:native("::cpp::Pointer_obj::fromHandle")
-   static function nativeFromHandle<T>(inHandle:Dynamic,?inKind:String):AutoCast;
-   inline public static function fromHandle<T>(inHandle:Dynamic,?inKind:String) : Pointer<T>
-   {
-     return cast nativeFromHandle(inHandle,inKind);
-   }
+	@:native("::cpp::Pointer_obj::fromRaw")
+	public static function fromStar<T>(star:Star<T>):Pointer<T>;
 
-   public static function fromPointer<T>(inNativePointer:Dynamic) : Pointer<T>;
+	@:native("::cpp::Pointer_obj::fromHandle")
+	static function nativeFromHandle<T>(inHandle:Dynamic, ?inKind:String):AutoCast;
+	inline public static function fromHandle<T>(inHandle:Dynamic, ?inKind:String):Pointer<T> {
+		return cast nativeFromHandle(inHandle, inKind);
+	}
 
-   public static function addressOf<T>(inVariable:cpp.Reference<T>) : Pointer<T>;
+	public static function fromPointer<T>(inNativePointer:Dynamic):Pointer<T>;
 
-   public static function endOf<T:{}>(inVariable:T) : Pointer<cpp.Void>;
+	public static function addressOf<T>(inVariable:cpp.Reference<T>):Pointer<T>;
 
-   @:native("::cpp::Pointer_obj::arrayElem")
-   static function nativeArrayElem<T>(array:Array<T>, inElem:Int):AutoCast;
-   inline static function arrayElem<T>(array:Array<T>, inElem:Int):Pointer<T>
-   {
-      return cast nativeArrayElem(array,inElem);
-   }
+	public static function endOf<T:{}>(inVariable:T):Pointer<cpp.Void>;
 
-   @:native("::cpp::Pointer_obj::ofArray")
-   static function nativeOfArray<T>(array:Array<T>):AutoCast;
-   inline public static function ofArray<T>(array:Array<T>):Pointer<T>
-   {
-     return cast nativeOfArray(array);
-   }
+	@:native("::cpp::Pointer_obj::arrayElem")
+	static function nativeArrayElem<T>(array:Array<T>, inElem:Int):AutoCast;
+	inline static function arrayElem<T>(array:Array<T>, inElem:Int):Pointer<T> {
+		return cast nativeArrayElem(array, inElem);
+	}
 
-   inline public function toUnmanagedArray(elementCount:Int) : Array<T>
-   {
-      var result = new Array<T>();
-      NativeArray.setUnmanagedData(result,this,elementCount);
-      return result;
-   }
+	@:native("::cpp::Pointer_obj::ofArray")
+	static function nativeOfArray<T>(array:Array<T>):AutoCast;
+	inline public static function ofArray<T>(array:Array<T>):Pointer<T> {
+		return cast nativeOfArray(array);
+	}
 
-   inline public function toUnmanagedVector(elementCount:Int) : haxe.ds.Vector<T>
-      return cast toUnmanagedArray(elementCount);
+	inline public function toUnmanagedArray(elementCount:Int):Array<T> {
+		var result = new Array<T>();
+		NativeArray.setUnmanagedData(result, this, elementCount);
+		return result;
+	}
 
+	inline public function toUnmanagedVector(elementCount:Int):haxe.ds.Vector<T>
+		return cast toUnmanagedArray(elementCount);
 
-   override public function inc():Pointer<T>;
-   override public function dec():Pointer<T>;
-   override public function incBy(inT:Int):Pointer<T>;
-   override public function add(inT:Int):Pointer<T>;
+	override public function inc():Pointer<T>;
+	override public function dec():Pointer<T>;
+	override public function incBy(inT:Int):Pointer<T>;
+	override public function decBy(inT:Int):Pointer<T>;
+	override public function add(inT:Int):Pointer<T>;
+	override public function sub(inT:Int):Pointer<T>;
 
-   public function postIncRef():Reference<T>;
+	public function postIncRef():Reference<T>;
 
-   public function destroy():Void;
-   public function destroyArray():Void;
+	public function destroy():Void;
+	public function destroyArray():Void;
 }
-
diff --git a/std/cpp/Prime.hx b/std/cpp/Prime.hx
index b0ce509ff761a459697dffa515929309a21a9057..ecc2bac4ed4ad0cff7ea5058fc5bfcbf4ad56349 100644
--- a/std/cpp/Prime.hx
+++ b/std/cpp/Prime.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
 #if macro
@@ -29,94 +30,88 @@ import haxe.macro.Expr;
 
 @:noPackageRestrict
 class Prime {
-
-   #if (!macro && cpp)
-
-	public static function _loadPrime( lib : String, prim : String, signature : String, quietFail = false ) : Dynamic {
-		var factory:Callable< ConstCharStar -> Object > =
-               untyped __global__.__hxcpp_cast_get_proc_address(lib, prim + "__prime", quietFail);
-      if (factory!=null)
-      {
-         var func:Dynamic = factory.call(signature);
-         if (func==null && !quietFail)
-            throw '$prim does not have signature $signature';
-         return func;
-      }
-      return null;
+	#if (!macro && cpp)
+	public static function _loadPrime(lib:String, prim:String, signature:String, quietFail = false):Dynamic {
+		var factory:Callable<ConstCharStar->Object> = untyped __global__.__hxcpp_cast_get_proc_address(lib, prim + "__prime", quietFail);
+		if (factory != null) {
+			var func:Dynamic = factory.call(signature);
+			if (func == null && !quietFail)
+				throw '$prim does not have signature $signature';
+			return func;
+		}
+		return null;
 	}
-   #end
-
-   #if (macro)
-   static function codeToType(code:String,forCpp:Bool) : String
-   {
-      var isCpp = Context.defined("cpp");
-
-      switch(code)
-      {
-         case "b" : return "Bool";
-         case "i" : return "Int";
-         case "d" : return "Float";
-         case "s" : return "String";
-         case "f" : return forCpp ? "cpp.Float32" : "Float";
-         case "o" : return forCpp ? "cpp.Object" : "Dynamic";
-         case "v" : return forCpp ? "cpp.Void" : "Dynamic";
-         case "c" :
-             if (forCpp)
-                return "cpp.ConstCharStar";
-             throw "const char * type only supported in cpp mode";
-         default:
-            throw "Unknown signature type :" + code;
-      }
-   }
-   #end
+	#end
 
-   public static function nekoInit(inModuleName:String) : Bool
-   {
-      #if neko
-      var init = neko.Lib.load(inModuleName, "neko_init", 5);
+	#if (macro)
+	static function codeToType(code:String, forCpp:Bool):String {
+		if (code == "c" && !forCpp)
+			throw "const char * type only supported in cpp mode";
 
-      if (init != null)
-      {
-         init( function(s) return new String(s),
-               function(len:Int) { var r = []; if (len > 0) r[len - 1] = null; return r; },
-               null,
-               true,
-               false);
-         return true;
-
-      }
-      #end
-      return false;
-   }
+		switch (code) {
+			case "b":
+				return "Bool";
+			case "i":
+				return "Int";
+			case "d":
+				return "Float";
+			case "s":
+				return "String";
+			case "f":
+				return forCpp ? "cpp.Float32" : "Float";
+			case "o":
+				return forCpp ? "cpp.Object" : "Dynamic";
+			case "v":
+				return forCpp ? "cpp.Void" : "Dynamic";
+			case "c":
+				return "cpp.ConstCharStar";
+			default:
+				throw "Unknown signature type :" + code;
+		}
+	}
+	#end
 
+	public static function nekoInit(inModuleName:String):Bool {
+		#if neko
+		var init = neko.Lib.load(inModuleName, "neko_init", 5);
 
-   public static macro function load(inModule:String, inName:String, inSig:String,inAllowFail:Bool = false)
-   {
-      var parts = inSig.split("");
-      if (parts.length<1)
-         throw "Invalid function signature " + inSig;
-      var argCount = parts.length-1;
+		if (init != null) {
+			init(function(s) return new String(s), function(len:Int) {
+				var r = [];
+				if (len > 0)
+					r[len - 1] = null;
+				return r;
+			}, null, true, false);
+			return true;
+		}
+		#end
+		return false;
+	}
 
-      var cppMode = Context.defined("cpp");
+	public static macro function load(inModule:String, inName:String, inSig:String, inAllowFail:Bool = false) {
+		var parts = inSig.split("");
+		if (parts.length < 1)
+			throw "Invalid function signature " + inSig;
+		var argCount = parts.length - 1;
 
-      var typeString = parts.length==1 ? "Void" : codeToType(parts.shift(),cppMode);
-      for(p in parts)
-         typeString += "->" + codeToType(p,cppMode);
+		var cppiaMode = Context.defined("cppia");
+		var cppMode = Context.defined("cpp") && !cppiaMode;
 
-      if (cppMode)
-      {
-         typeString = "cpp.Callable<" + typeString + ">";
-         var expr = 'new $typeString(cpp.Prime._loadPrime("$inModule","$inName","$inSig",$inAllowFail))';
-         return Context.parse( expr, Context.currentPos() );
-      }
-      else
-      {
-         if (argCount>5)
-            argCount = -1;
-         var lazy = inAllowFail ? "loadLazy" : "load";
-         var expr = 'new cpp.Callable<$typeString>(neko.Lib.$lazy("$inModule","$inName",$argCount))';
-         return Context.parse( expr, Context.currentPos() );
-      }
-   }
+		var typeString = parts.length == 1 ? "Void" : codeToType(parts.shift(), cppMode);
+		for (p in parts)
+			typeString += "->" + codeToType(p, cppMode);
 
+		if (cppMode) {
+			typeString = "cpp.Callable<" + typeString + ">";
+			var expr = 'new $typeString(cpp.Prime._loadPrime("$inModule","$inName","$inSig",$inAllowFail))';
+			return Context.parse(expr, Context.currentPos());
+		} else {
+			if (argCount > 5)
+				argCount = -1;
+			var lazy = inAllowFail ? "loadLazy" : "load";
+			var lib = cppiaMode ? "cpp" : "neko";
+			var expr = 'new cpp.Callable<$typeString>($lib.Lib.$lazy("$inModule","$inName",$argCount))';
+			return Context.parse(expr, Context.currentPos());
+		}
+	}
 }
diff --git a/std/cpp/Random.hx b/std/cpp/Random.hx
index 3b47b8872e02a72044c102cfa025f47ebb9fe384..5ecbdfcf76097b759872eba6e629ca4dc2c850af 100644
--- a/std/cpp/Random.hx
+++ b/std/cpp/Random.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,26 +19,25 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
 class Random {
-
-	var r : Dynamic;
+	var r:Dynamic;
 
 	public function new() {
 		r = cpp.NativeRandom.random_new();
 	}
 
-	public function setSeed( s : Int ) {
-		cpp.NativeRandom.random_set_seed(r,s);
+	public function setSeed(s:Int) {
+		cpp.NativeRandom.random_set_seed(r, s);
 	}
 
-	public function int( max : Int ) : Int {
-		return cpp.NativeRandom.random_int(r,max);
+	public function int(max:Int):Int {
+		return cpp.NativeRandom.random_int(r, max);
 	}
 
-	public function float() : Float {
+	public function float():Float {
 		return cpp.NativeRandom.random_float(r);
 	}
-
 }
diff --git a/std/cpp/RawConstPointer.hx b/std/cpp/RawConstPointer.hx
index 426b0307625ef3fc0f7dd6a5bc83c639a4b46a8e..adaf122c7e5274851e9cdedbaa5c40d5428ba27b 100644
--- a/std/cpp/RawConstPointer.hx
+++ b/std/cpp/RawConstPointer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:unreflective
-extern class RawConstPointer<T> implements ArrayAccess<T>
-{
-   @:native("hx::AddressOf")
-   public static function addressOf<T>(t:T) : RawConstPointer<T>;
+extern class RawConstPointer<T> implements ArrayAccess<T> {
+	@:native("hx::AddressOf")
+	public static function addressOf<T>(t:T):RawConstPointer<T>;
 }
diff --git a/std/cpp/RawPointer.hx b/std/cpp/RawPointer.hx
index 2a9381bbd0acbda3250c731925f980ed09a8fbcb..c52bbd57da74739eec79f40d72d022d5ed28e5da 100644
--- a/std/cpp/RawPointer.hx
+++ b/std/cpp/RawPointer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:unreflective
-extern class RawPointer<T> extends RawConstPointer<T>
-{
-   @:native("hx::AddressOf")
-   public static function addressOf<T>(t:T) : RawPointer<T>;
+extern class RawPointer<T> extends RawConstPointer<T> {
+	@:native("hx::AddressOf")
+	public static function addressOf<T>(t:T):RawPointer<T>;
 }
diff --git a/std/cpp/Reference.hx b/std/cpp/Reference.hx
index 884608cdcc3f9e3044eeb22e2123c1e54b971fd6..c1ad6d0db7cfe08beb4de8a70512df3ced6caf17 100644
--- a/std/cpp/Reference.hx
+++ b/std/cpp/Reference.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,10 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
-// Allows haxe to type result correctly, and hxcpp can recognise this and prevent
-//  unwanted casting
+/**
+	Allows haxe to type result correctly, and hxcpp can recognise this and
+	prevent unwanted casting.
+**/
+@:semantics(reference)
 typedef Reference<T> = T;
-
-
diff --git a/std/cpp/SizeT.hx b/std/cpp/SizeT.hx
index c476e72c8b242382deb1408fa9bc9f11646681c9..3892c6a2b75f07e276872b075ad136d9163555bc 100644
--- a/std/cpp/SizeT.hx
+++ b/std/cpp/SizeT.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,9 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:native("size_t")
 @:scalar @:coreType @:notNull
-extern abstract SizeT from(Int) to(Int) {
-}
+extern abstract SizeT from(Int) to(Int) {}
diff --git a/std/cpp/Star.hx b/std/cpp/Star.hx
index 7adb84042951f2c1f9cd923eb7f1b504fd516f9f..2e60be25f8defd613eeeb6cce8eeecd950fbac3d 100644
--- a/std/cpp/Star.hx
+++ b/std/cpp/Star.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,9 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp;
-
-// Allows haxe to type result correctly, and hxcpp can recognise this use the correct type
-typedef Star<T> = T;
 
+package cpp;
 
+/**
+	Allows haxe to type result correctly, and hxcpp can recognise this use the
+	correct type.
+**/
+typedef Star<T> = Null<T>;
diff --git a/std/cpp/StdString.hx b/std/cpp/StdString.hx
index f640dc30e1b5650ac1dd7262cda344524d47532d..41b4e6144f7942b390270c1329f174479b5b35b7 100644
--- a/std/cpp/StdString.hx
+++ b/std/cpp/StdString.hx
@@ -1,3 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 using cpp.NativeString;
@@ -6,17 +28,22 @@ using cpp.NativeString;
 @:include("hx/StdString.h")
 @:stackOnly
 @:structAccess
-extern class StdString extends StdStringRef
-{
-   @:extern @:native("std::string::npos")
-   public static var npos(default,null):Int;
+@:unreflective
+extern class StdString {
+	@:native("std::string::npos")
+	public static var npos(default, null):Int;
 
-   //public function new(inData:StdStringData);
+	// public function new(inData:StdStringData);
+	@:native("hx::StdString")
+	static public function ofString(s:String):StdString;
 
-   @:native("hx::StdString")
-   static public function ofString(s:String) : StdString;
-   //public function toString():String;
-   //public function find(s:String):Int;
-   //public function substr(pos:Int, len:Int):StdString;
+	// public function toString():String;
+	// public function find(s:String):Int;
+	// public function substr(pos:Int, len:Int):StdString;
+	public function c_str():ConstPointer<Char>;
+	public function size():Int;
+	public function find(s:String):Int;
+	public function substr(pos:Int, len:Int):StdString;
+	public function toString():String;
+	public function toStdString():StdString;
 }
-
diff --git a/std/cpp/StdStringRef.hx b/std/cpp/StdStringRef.hx
index 63dd8f272e3b87ff0ab1a784afdcc779215a7687..a55472ad3295851acb787e4235bf0d500f3a5f22 100644
--- a/std/cpp/StdStringRef.hx
+++ b/std/cpp/StdStringRef.hx
@@ -1,3 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 using cpp.NativeString;
@@ -5,13 +27,11 @@ using cpp.NativeString;
 @:native("hx::StdString const &")
 @:include("hx/StdString.h")
 @:structAccess
-extern class StdStringRef
-{
-   public function c_str() : ConstPointer<Char>;
-   public function size() : Int;
-   public function find(s:String):Int;
-   public function substr(pos:Int, len:Int):StdString;
-   public function toString():String;
-   public function toStdString():StdString;
+extern class StdStringRef {
+	public function c_str():ConstPointer<Char>;
+	public function size():Int;
+	public function find(s:String):Int;
+	public function substr(pos:Int, len:Int):StdString;
+	public function toString():String;
+	public function toStdString():StdString;
 }
-
diff --git a/std/cpp/Stdio.hx b/std/cpp/Stdio.hx
index 6e09a66025a7efff60d5f4c1f735c43d8abceb75..6c30aeb62eccc217c06d4586f7e396fef744a119 100644
--- a/std/cpp/Stdio.hx
+++ b/std/cpp/Stdio.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,27 +19,25 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
 import haxe.extern.Rest;
 
 @:include("stdio.h")
-extern class Stdio
-{
-   @:native("printf")
-   public static function printf(format:ConstCharStar, rest:Rest<VarArg>):Void;
-
-   @:native("fopen")
-   public static function fopen(filename:ConstCharStar, mode:ConstCharStar) : FILE;
+extern class Stdio {
+	@:native("printf")
+	public static function printf(format:ConstCharStar, rest:Rest<VarArg>):Void;
 
-   @:native("fwrite")
-   public static function fwrite<T>(data:RawPointer<T>, elemSize:SizeT, elemCount:SizeT, file:FILE ) : SizeT;
+	@:native("fopen")
+	public static function fopen(filename:ConstCharStar, mode:ConstCharStar):FILE;
 
-   @:native("fclose")
-   public static function fclose(file:FILE) : Int;
+	@:native("fwrite")
+	public static function fwrite<T>(data:RawPointer<T>, elemSize:SizeT, elemCount:SizeT, file:FILE):SizeT;
 
+	@:native("fclose")
+	public static function fclose(file:FILE):Int;
 
-   @:native("fprintf")
-   public static function fprintf(file:FILE,format:ConstCharStar, rest:Rest<VarArg>):Void;
+	@:native("fprintf")
+	public static function fprintf(file:FILE, format:ConstCharStar, rest:Rest<VarArg>):Void;
 }
-
diff --git a/std/cpp/Stdlib.hx b/std/cpp/Stdlib.hx
index 12a461438822b8ddbad4b67265027514c3c365aa..2b299e58a5c5fcbe07faea0471d6452044bae245 100644
--- a/std/cpp/Stdlib.hx
+++ b/std/cpp/Stdlib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,40 +23,37 @@
 package cpp;
 
 @:include("stdlib.h")
-extern class Stdlib
-{
-   @:native("malloc")
-   public static function nativeMalloc(bytes:Int) : cpp.RawPointer<cpp.Void> return null;
-   @:native("calloc")
-   public static function nativeCalloc(bytes:Int) : cpp.RawPointer<cpp.Void> return null;
-   @:native("realloc")
-   public static function nativeRealloc(inPtr:cpp.RawPointer<cpp.Void>,bytes:Int) : cpp.RawPointer<cpp.Void> return null;
-   @:native("free")
-   public static function nativeFree(ptr:cpp.RawPointer<cpp.Void>) : Void { }
-   @:native("memcpy")
-   public static function nativeMemcpy(dest:cpp.RawPointer<cpp.Void>, src:cpp.RawConstPointer<cpp.Void>, bytes:Int) : Void { }
-
-   @:native("hx::ClassSizeOf") @:templatedCall
-   public static function sizeof<T>(t:T) : Int { }
-
-   inline public static function memcpy<DEST,SRC>(dest:cpp.Pointer<DEST>, src:cpp.ConstPointer<SRC>, bytes:Int) : Void
-      nativeMemcpy(cast dest.ptr, cast src.ptr, bytes);
-
-   inline public static function malloc<T>(bytes:Int) : cpp.Pointer<T>
-      return cast nativeMalloc(bytes);
-
-   inline public static function calloc<T>(bytes:Int) : cpp.Pointer<T>
-      return cast nativeCalloc(bytes);
-
-   inline public static function realloc<T>(ioPtr:cpp.Pointer<T>, bytes:Int) : Void
-      ioPtr.setRaw( nativeRealloc(cast ioPtr.ptr, bytes) );
-
-   inline public static function free<T>(ptr:cpp.Pointer<T>) : Void
-   {
-      if (ptr!=null)
-      {
-         nativeFree(cast ptr.ptr);
-         ptr.ptr = null;
-      }
-   }
+extern class Stdlib {
+	@:native("malloc")
+	public static function nativeMalloc(bytes:Int):cpp.RawPointer<cpp.Void>;
+	@:native("calloc")
+	public static function nativeCalloc(bytes:Int):cpp.RawPointer<cpp.Void>;
+	@:native("realloc")
+	public static function nativeRealloc(inPtr:cpp.RawPointer<cpp.Void>, bytes:Int):cpp.RawPointer<cpp.Void>;
+	@:native("free")
+	public static function nativeFree(ptr:cpp.RawPointer<cpp.Void>):Void;
+	@:native("memcpy")
+	public static function nativeMemcpy(dest:cpp.RawPointer<cpp.Void>, src:cpp.RawConstPointer<cpp.Void>, bytes:Int):Void;
+
+	@:native("hx::ClassSizeOf") @:templatedCall
+	public static function sizeof<T>(t:T):Int;
+
+	inline public static function memcpy<DEST, SRC>(dest:cpp.Pointer<DEST>, src:cpp.ConstPointer<SRC>, bytes:Int):Void
+		nativeMemcpy(cast dest.ptr, cast src.ptr, bytes);
+
+	inline public static function malloc<T>(bytes:Int):cpp.Pointer<T>
+		return cast nativeMalloc(bytes);
+
+	inline public static function calloc<T>(bytes:Int):cpp.Pointer<T>
+		return cast nativeCalloc(bytes);
+
+	inline public static function realloc<T>(ioPtr:cpp.Pointer<T>, bytes:Int):Void
+		ioPtr.setRaw(nativeRealloc(cast ioPtr.ptr, bytes));
+
+	inline public static function free<T>(ptr:cpp.Pointer<T>):Void {
+		if (ptr != null) {
+			nativeFree(cast ptr.ptr);
+			ptr.ptr = null;
+		}
+	}
 }
diff --git a/std/cpp/Struct.hx b/std/cpp/Struct.hx
index c217939b279bb81bbef4b955e72f5c00fe6cb27f..957857a454ac6a2821f0ef872ac9cf223345097f 100644
--- a/std/cpp/Struct.hx
+++ b/std/cpp/Struct.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,10 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
-// Wrap external types with a class that integrates with Dynamic
+/**
+	Wraps external types with a class that integrates with Dynamic.
+**/
 typedef Struct<T> = T;
-
-
-
diff --git a/std/cpp/UInt16.hx b/std/cpp/UInt16.hx
index 9a82bbb4594187e2609c51bab71bb6d282280976..b155b9b8bcbd279d4f9a32f97ae3df14f0314513 100644
--- a/std/cpp/UInt16.hx
+++ b/std/cpp/UInt16.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract UInt16 from Int to Int {}
diff --git a/std/cpp/UInt32.hx b/std/cpp/UInt32.hx
index 0188d5b9633c73e35095ebc601304625ced8b4af..e5dd135ba024f33116b36bae27c3b9d28d3009bc 100644
--- a/std/cpp/UInt32.hx
+++ b/std/cpp/UInt32.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract UInt32 from Int to Int {}
diff --git a/std/cpp/UInt64.hx b/std/cpp/UInt64.hx
index 6662d6a603e7a842388f65cb40d19520c1bcb56a..8a160e58c5e9f264259b682199876e4ee50033b1 100644
--- a/std/cpp/UInt64.hx
+++ b/std/cpp/UInt64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract UInt64 from Int to Int {}
diff --git a/std/cpp/UInt8.hx b/std/cpp/UInt8.hx
index f32df37c2f69ee29f3662eb10fbbbb9f43ddf9a4..d19bed91f74abc514eee480bf8c8e3e6bd8defc4 100644
--- a/std/cpp/UInt8.hx
+++ b/std/cpp/UInt8.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
+
+package cpp;
 
 @:coreType @:notNull @:runtimeValue abstract UInt8 from Int to Int {}
diff --git a/std/cpp/VarArg.hx b/std/cpp/VarArg.hx
index 655587fe8475748aea23144caefd7acac60cd373..41af99d9be7bd605a524b26a27a752fd07ed7029 100644
--- a/std/cpp/VarArg.hx
+++ b/std/cpp/VarArg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,10 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp;
 
-// Allows haxe to type params correctly, and hxcpp can recognise this use the correct type
+/**
+	Allows haxe to type params correctly, and hxcpp can recognise this use the
+	correct type.
+**/
 typedef VarArg = Dynamic;
-
-
-
diff --git a/std/cpp/VirtualArray.hx b/std/cpp/VirtualArray.hx
index 263ab7528670a7818957240646de5303227e1116..9af2d7faf57f8cea424d9e049675d373305e745e 100644
--- a/std/cpp/VirtualArray.hx
+++ b/std/cpp/VirtualArray.hx
@@ -1,76 +1,132 @@
+/*
+ * Copyright (C)2005-2019 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 cpp;
 
 @:native("cpp::VirtualArray")
-@:coreType extern class NativeVirtualArray implements ArrayAccess<Dynamic>
-{
-   public function new() : Void;
-   public var length(get,null) : Int;
-   // concat<T>( a:Array<T> ) : Array<T> ?
-   public function concat( a : VirtualArray ) : VirtualArray;
-   public function join( sep : String ) : String;
-   public function pop() : Dynamic;
-   public function push(x : Dynamic) : Int;
-   public function reverse() : Void;
-   public function shift() : Dynamic;
-   public function slice( pos : Int, ?end : Int ) : VirtualArray;
-   public function sort( f : Dynamic -> Dynamic -> Int ) : Void;
-   public function splice( pos : Int, len : Int ) : VirtualArray;
-   public function toString() : String;
-   public function unshift( x : Dynamic ) : Void;
-   public function insert( pos : Int, x : Dynamic ) : Void;
-   public function remove( x : Dynamic ) : Bool;
-   public function indexOf( x : Dynamic, ?fromIndex:Int ) : Int;
-   public function lastIndexOf( x : Dynamic, ?fromIndex:Int ) : Int;
-   public function copy() : VirtualArray;
-   public function iterator() : Iterator<Dynamic>;
-   public function map<S>( f : Dynamic -> S ) : VirtualArray;
-   public function filter( f : Dynamic -> Bool ) : VirtualArray;
+@:coreType extern class NativeVirtualArray implements ArrayAccess<Dynamic> {
+	public function new():Void;
+	public var length(get, null):Int;
+	// concat<T>( a:Array<T> ) : Array<T> ?
+	public function concat(a:VirtualArray):VirtualArray;
+	public function join(sep:String):String;
+	public function pop():Dynamic;
+	public function push(x:Dynamic):Int;
+	public function reverse():Void;
+	public function shift():Dynamic;
+	public function slice(pos:Int, ?end:Int):VirtualArray;
+	public function sort(f:Dynamic->Dynamic->Int):Void;
+	public function splice(pos:Int, len:Int):VirtualArray;
+	public function toString():String;
+	public function unshift(x:Dynamic):Void;
+	public function insert(pos:Int, x:Dynamic):Void;
+	public function remove(x:Dynamic):Bool;
+	public function indexOf(x:Dynamic, ?fromIndex:Int):Int;
+	public function lastIndexOf(x:Dynamic, ?fromIndex:Int):Int;
+	public function copy():VirtualArray;
+	public function iterator():Iterator<Dynamic>;
+	public function map<S>(f:Dynamic->S):VirtualArray;
+	public function filter(f:Dynamic->Bool):VirtualArray;
+	public function resize(len:Int):Void;
 }
 
+abstract VirtualArray(NativeVirtualArray) {
+	// Add these two functions...
+	@:from extern inline static public function fromArray<T>(a:Array<T>):VirtualArray
+		return untyped a;
 
-abstract VirtualArray(NativeVirtualArray)
-{
-   // Add these two functions...
-   @:from @:extern inline static public function fromArray<T>(a:Array<T>) : VirtualArray
-      return untyped a;
-   @:to @:extern inline public function toArray<T>() : Array<T>
-      return untyped this;
+	@:to extern inline public function toArray<T>():Array<T>
+		return untyped this;
 
+	// The rest is just boiler-plate
+	inline public function new()
+		this = new NativeVirtualArray();
 
+	@:arrayAccess extern inline function get(idx:Int):Dynamic
+		return untyped this[idx];
 
+	@:arrayAccess extern inline function set<T>(pos:Int, value:T):T
+		return untyped this[idx] = value;
 
-   // The rest is just boiler-plate
-   inline public function new() this=new NativeVirtualArray();
+	public var length(get, never):Int;
 
-   @:extern @:arrayAccess inline function get(idx:Int) : Dynamic
-      return untyped this[idx];
+	extern inline public function get_length():Int
+		return this.length;
 
-   @:extern @:arrayAccess inline function set<T>(pos:Int, value:T ) : T
-      return untyped this[idx] = value;
+	// concat<T>( a:Array<T> ) : Array<T> ?
+	extern inline public function concat(a:VirtualArray):VirtualArray
+		return this.concat(a);
 
-   public var length(get,never) : Int;
-   @:extern inline public function get_length() : Int return this.length;
+	extern inline public function join(sep:String):String
+		return this.join(sep);
 
+	extern inline public function pop():Dynamic
+		return this.pop();
 
+	extern inline public function push(x:Dynamic):Int
+		return this.push(x);
 
-   // concat<T>( a:Array<T> ) : Array<T> ?
-   @:extern inline public function concat( a : VirtualArray ) : VirtualArray return this.concat(a);
-   @:extern inline public function join( sep : String ) : String return this.join(sep);
-   @:extern inline public function pop() : Dynamic return this.pop();
-   @:extern inline public function push(x : Dynamic) : Int return this.push(x);
-   @:extern inline public function reverse() : Void this.reverse();
-   @:extern inline public function shift() : Dynamic return this.shift();
-   @:extern inline public function slice( pos : Int, ?end : Int ) : VirtualArray return this.slice(pos,end);
-   @:extern inline public function sort( f : Dynamic -> Dynamic -> Int ) : Void this.sort(f);
-   @:extern inline public function splice( pos : Int, len : Int ) : VirtualArray return this.slice(pos,len);
-   @:extern inline public function unshift( x : Dynamic ) : Void this.unshift(x);
-   @:extern inline public function insert( pos : Int, x : Dynamic ) : Void this.insert(pos,x);
-   @:extern inline public function remove( x : Dynamic ) : Bool return this.remove(x);
-   @:extern inline public function indexOf( x : Dynamic, ?fromIndex:Int ) : Int return this.indexOf(x,fromIndex);
-   @:extern inline public function lastIndexOf( x : Dynamic, ?fromIndex:Int ) : Int return this.lastIndexOf(x,fromIndex);
-   @:extern inline public function copy() : VirtualArray return this.copy();
-   @:extern inline public function iterator() : Iterator<Dynamic> return this.iterator();
-   @:extern inline public function map<S>( f : Dynamic -> S ) : VirtualArray return this.map(f);
-   @:extern inline public function filter( f : Dynamic -> Bool ) : VirtualArray return this.filter(f);
-}
+	extern inline public function reverse():Void
+		this.reverse();
+
+	extern inline public function shift():Dynamic
+		return this.shift();
+
+	extern inline public function slice(pos:Int, ?end:Int):VirtualArray
+		return this.slice(pos, end);
+
+	extern inline public function sort(f:Dynamic->Dynamic->Int):Void
+		this.sort(f);
+
+	extern inline public function splice(pos:Int, len:Int):VirtualArray
+		return this.slice(pos, len);
+
+	extern inline public function unshift(x:Dynamic):Void
+		this.unshift(x);
+
+	extern inline public function insert(pos:Int, x:Dynamic):Void
+		this.insert(pos, x);
 
+	extern inline public function remove(x:Dynamic):Bool
+		return this.remove(x);
+
+	extern inline public function indexOf(x:Dynamic, ?fromIndex:Int):Int
+		return this.indexOf(x, fromIndex);
+
+	extern inline public function lastIndexOf(x:Dynamic, ?fromIndex:Int):Int
+		return this.lastIndexOf(x, fromIndex);
+
+	extern inline public function copy():VirtualArray
+		return this.copy();
+
+	extern inline public function iterator():Iterator<Dynamic>
+		return this.iterator();
+
+	extern inline public function map<S>(f:Dynamic->S):VirtualArray
+		return this.map(f);
+
+	extern inline public function filter(f:Dynamic->Bool):VirtualArray
+		return this.filter(f);
+
+	extern inline public function resize(len:Int):Void
+		return this.resize(len);
+}
diff --git a/std/cpp/Void.hx b/std/cpp/Void.hx
index af33561ef47432c1689a985368809a3cf6dedc2c..d002c538356a5a9aa29e1f8def49115caae3e96c 100644
--- a/std/cpp/Void.hx
+++ b/std/cpp/Void.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp;
 
-@:native("void")
-extern class Void { }
+package cpp;
 
+@:native("void")
+extern class Void {}
diff --git a/std/cpp/_std/Date.hx b/std/cpp/_std/Date.hx
index f960aa14b74ae900257a0a9f6dccb556f6b78cbc..3556b10312e2c52c03ad5f1e66ae48da3b07e173 100644
--- a/std/cpp/_std/Date.hx
+++ b/std/cpp/_std/Date.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,65 +19,110 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-@:coreApi  class Date {
-
+@:coreApi class Date {
 	private var mSeconds:Float;
 
-	public function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void	{
-		mSeconds = untyped __global__.__hxcpp_new_date(year,month,day,hour,min,sec);
+	public function new(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Void {
+		mSeconds = untyped __global__.__hxcpp_new_date(year, month, day, hour, min, sec);
 	}
 
-	public function getTime() : Float {
+	public function getTime():Float {
 		return mSeconds * 1000.0;
 	}
 
-	public function getHours() : Int { return untyped __global__.__hxcpp_get_hours(mSeconds); }
+	public function getHours():Int {
+		return untyped __global__.__hxcpp_get_hours(mSeconds);
+	}
+
+	public function getMinutes():Int {
+		return untyped __global__.__hxcpp_get_minutes(mSeconds);
+	}
 
-	public function getMinutes() : Int { return untyped __global__.__hxcpp_get_minutes(mSeconds); }
+	public function getSeconds():Int {
+		return untyped __global__.__hxcpp_get_seconds(mSeconds);
+	}
+
+	public function getFullYear():Int {
+		return untyped __global__.__hxcpp_get_year(mSeconds);
+	}
 
-	public function getSeconds() : Int { return untyped __global__.__hxcpp_get_seconds(mSeconds); }
+	public function getMonth():Int {
+		return untyped __global__.__hxcpp_get_month(mSeconds);
+	}
 
-	public function getFullYear() : Int { return untyped __global__.__hxcpp_get_year(mSeconds); }
+	public function getDate():Int {
+		return untyped __global__.__hxcpp_get_date(mSeconds);
+	}
 
-	public function getMonth() : Int { return untyped __global__.__hxcpp_get_month(mSeconds); }
+	public function getDay():Int {
+		return untyped __global__.__hxcpp_get_day(mSeconds);
+	}
 
-	public function getDate() : Int { return untyped __global__.__hxcpp_get_date(mSeconds); }
+	public function getUTCHours():Int {
+		return untyped __global__.__hxcpp_get_utc_hours(mSeconds);
+	}
 
-	public function getDay() : Int { return untyped __global__.__hxcpp_get_day(mSeconds); }
+	public function getUTCMinutes():Int {
+		return untyped __global__.__hxcpp_get_utc_minutes(mSeconds);
+	}
 
-	public function toString():String { return untyped __global__.__hxcpp_to_string(mSeconds); }
+	public function getUTCSeconds():Int {
+		return untyped __global__.__hxcpp_get_utc_seconds(mSeconds);
+	}
 
-	public static function now() : Date {
-		return fromTime( untyped __global__.__hxcpp_date_now()*1000.0);
+	public function getUTCFullYear():Int {
+		return untyped __global__.__hxcpp_get_utc_year(mSeconds);
 	}
-  	private static function new1(t : Dynamic) : Date {
-		return  new Date(2005,1,1,0,0,0);
+
+	public function getUTCMonth():Int {
+		return untyped __global__.__hxcpp_get_utc_month(mSeconds);
 	}
 
-	public static function fromTime( t : Float ) : Date {
-		var result = new Date(0,0,0,0,0,0);
-		result.mSeconds = t*0.001;
+	public function getUTCDate():Int {
+		return untyped __global__.__hxcpp_get_utc_date(mSeconds);
+	}
+
+	public function getUTCDay():Int {
+		return untyped __global__.__hxcpp_get_utc_day(mSeconds);
+	}
+
+	public function getTimezoneOffset():Int {
+		return -Std.int((untyped __global__.__hxcpp_timezone_offset(mSeconds)) / 60);
+	}
+
+	public function toString():String {
+		return untyped __global__.__hxcpp_to_string(mSeconds);
+	}
+
+	public static function now():Date {
+		return fromTime(untyped __global__.__hxcpp_date_now() * 1000.0);
+	}
+
+	private static function new1(t:Dynamic):Date {
+		return new Date(2005, 1, 1, 0, 0, 0);
+	}
+
+	public static function fromTime(t:Float):Date {
+		var result = new Date(0, 0, 0, 0, 0, 0);
+		result.mSeconds = t * 0.001;
 		return result;
 	}
 
-	public static function fromString( s : String ) : Date {
-		switch( s.length ) {
+	public static function fromString(s:String):Date {
+		switch (s.length) {
 			case 8: // hh:mm:ss
 				var k = s.split(":");
-				var d : Date = new Date(0,0,0,Std.parseInt(k[0]),Std.parseInt(k[1]),Std.parseInt(k[2]));
-				return d;
+				return Date.fromTime(Std.parseInt(k[0]) * 3600000. + Std.parseInt(k[1]) * 60000. + Std.parseInt(k[2]) * 1000.);
 			case 10: // YYYY-MM-DD
 				var k = s.split("-");
-				return new Date(Std.parseInt(k[0]),Std.parseInt(k[1])-1,Std.parseInt(k[2]),0,0,0);
+				return new Date(Std.parseInt(k[0]), Std.parseInt(k[1]) - 1, Std.parseInt(k[2]), 0, 0, 0);
 			case 19: // YYYY-MM-DD hh:mm:ss
 				var k = s.split(" ");
 				var y = k[0].split("-");
 				var t = k[1].split(":");
-				return new Date(Std.parseInt(y[0]),Std.parseInt(y[1]) - 1,Std.parseInt(y[2]),
-					Std.parseInt(t[0]),Std.parseInt(t[1]),Std.parseInt(t[2]));
+				return new Date(Std.parseInt(y[0]), Std.parseInt(y[1]) - 1, Std.parseInt(y[2]), Std.parseInt(t[0]), Std.parseInt(t[1]), Std.parseInt(t[2]));
 			default:
 				throw "Invalid date format : " + s;
 		}
 	}
 }
-
diff --git a/std/cpp/_std/EReg.hx b/std/cpp/_std/EReg.hx
index 676837558aeb82890948b8d3828dd93d4c93a8d2..b671550318b55ed836f264155eb7e020580a76d7 100644
--- a/std/cpp/_std/EReg.hx
+++ b/std/cpp/_std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,136 +19,134 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 @:buildXml('<include name="${HXCPP}/src/hx/libs/regexp/Build.xml"/>')
 @:coreApi class EReg {
-
-	var r : Dynamic;
-	var last : String;
-	var global : Bool;
-
-	public function new( r : String, opt : String ) : Void {
-			var a = opt.split("g");
-			global = a.length > 1;
-			if( global )
-				opt = a.join("");
-			this.r = _hx_regexp_new_options(r, opt);
+	var r:Dynamic;
+	var last:String;
+	var global:Bool;
+
+	public function new(r:String, opt:String):Void {
+		var a = opt.split("g");
+		global = a.length > 1;
+		if (global)
+			opt = a.join("");
+		this.r = _hx_regexp_new_options(r, opt);
 	}
 
-	public function match( s : String ) : Bool {
-			var p = _hx_regexp_match(r,s,0,s.length);
-			if( p )
-				last = s;
-			else
-				last = null;
-			return p;
+	public function match(s:String):Bool {
+		var p = _hx_regexp_match(r, s, 0, s.length);
+		if (p)
+			last = s;
+		else
+			last = null;
+		return p;
 	}
 
-	public function matched( n : Int ) : String {
-			var m = _hx_regexp_matched(r,n);
-			return m;
+	public function matched(n:Int):String {
+		var m = _hx_regexp_matched(r, n);
+		return m;
 	}
 
-	public function matchedLeft() : String {
-			var p = _hx_regexp_matched_pos(r,0);
-			return last.substr(0,p.pos);
+	public function matchedLeft():String {
+		var p = _hx_regexp_matched_pos(r, 0);
+		return last.substr(0, p.pos);
 	}
 
-	public function matchedRight() : String {
-			var p = _hx_regexp_matched_pos(r,0);
-			var sz = p.pos+p.len;
-			return last.substr(sz,last.length-sz);
+	public function matchedRight():String {
+		var p = _hx_regexp_matched_pos(r, 0);
+		var sz = p.pos + p.len;
+		return last.substr(sz, last.length - sz);
 	}
 
-	public function matchedPos() : { pos : Int, len : Int } {
-			return _hx_regexp_matched_pos(r,0);
+	public function matchedPos():{pos:Int, len:Int} {
+		return _hx_regexp_matched_pos(r, 0);
 	}
 
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
-			var p = _hx_regexp_match(r, s, pos, len < 0 ? s.length - pos : len);
-			if (p)
-				last = s;
-			else
-				last = null;
-			return p;
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
+		var p = _hx_regexp_match(r, s, pos, len < 0 ? s.length - pos : len);
+		if (p)
+			last = s;
+		else
+			last = null;
+		return p;
 	}
 
-	public function split( s : String ) : Array<String> {
-			var pos = 0;
-			var len = s.length;
-			var a = new Array();
-			var first = true;
-			do {
-				if( !_hx_regexp_match(r,s,pos,len) )
+	public function split(s:String):Array<String> {
+		var pos = 0;
+		var len = s.length;
+		var a = new Array();
+		var first = true;
+		do {
+			if (!_hx_regexp_match(r, s, pos, len))
+				break;
+			var p = _hx_regexp_matched_pos(r, 0);
+			if (p.len == 0 && !first) {
+				if (p.pos == s.length)
 					break;
-				var p = _hx_regexp_matched_pos(r,0);
-				if( p.len == 0 && !first ) {
-					if( p.pos == s.length )
-						break;
-					p.pos += 1;
-				}
-				a.push(s.substr(pos,p.pos - pos));
-				var tot = p.pos + p.len - pos;
-				pos += tot;
-				len -= tot;
-				first = false;
-			} while( global );
-			a.push(s.substr(pos,len));
-			return a;
+				p.pos += 1;
+			}
+			a.push(s.substr(pos, p.pos - pos));
+			var tot = p.pos + p.len - pos;
+			pos += tot;
+			len -= tot;
+			first = false;
+		} while (global);
+		a.push(s.substr(pos, len));
+		return a;
 	}
 
-	public function replace( s : String, by : String ) : String {
-			var b = new StringBuf();
-			var pos = 0;
-			var len = s.length;
-			var a = by.split("$");
-			var first = true;
-			do {
-				if( !_hx_regexp_match(r,s,pos,len) )
+	public function replace(s:String, by:String):String {
+		var b = new StringBuf();
+		var pos = 0;
+		var len = s.length;
+		var a = by.split("$");
+		var first = true;
+		do {
+			if (!_hx_regexp_match(r, s, pos, len))
+				break;
+			var p = _hx_regexp_matched_pos(r, 0);
+			if (p.len == 0 && !first) {
+				if (p.pos == s.length)
 					break;
-				var p = _hx_regexp_matched_pos(r,0);
-				if( p.len == 0 && !first ) {
-					if( p.pos == s.length )
-						break;
-					p.pos += 1;
-				}
-				b.addSub(s,pos,p.pos-pos);
-				if( a.length > 0 )
-					b.add(a[0]);
-				var i = 1;
-				while( i < a.length ) {
-					var k = a[i];
-					var c = k.charCodeAt(0);
-					// 1...9
-					if( c >= 49 && c <= 57 ) {
-						var p = try _hx_regexp_matched_pos(r,Std.int(c)-48) catch( e : String ) null;
-						if( p == null ){
-							b.add("$");
-							b.add(k);
-						}else{
-						b.addSub(s,p.pos,p.len);
-						b.addSub(k,1,k.length - 1);
-						}
-					} else if( c == null ) {
+				p.pos += 1;
+			}
+			b.addSub(s, pos, p.pos - pos);
+			if (a.length > 0)
+				b.add(a[0]);
+			var i = 1;
+			while (i < a.length) {
+				var k = a[i];
+				var c = k.charCodeAt(0);
+				// 1...9
+				if (c >= 49 && c <= 57) {
+					var p = try _hx_regexp_matched_pos(r, Std.int(c) - 48) catch (e:String) null;
+					if (p == null) {
 						b.add("$");
-						i++;
-						var k2 = a[i];
-						if( k2 != null && k2.length > 0 )
-							b.add(k2);
-					} else
-						b.add("$"+k);
+						b.add(k);
+					} else {
+						b.addSub(s, p.pos, p.len);
+						b.addSub(k, 1, k.length - 1);
+					}
+				} else if (c == null) {
+					b.add("$");
 					i++;
-				}
-				var tot = p.pos + p.len - pos;
-				pos += tot;
-				len -= tot;
-				first = false;
-			} while( global );
-			b.addSub(s,pos,len);
-			return b.toString();
+					var k2 = a[i];
+					if (k2 != null && k2.length > 0)
+						b.add(k2);
+				} else
+					b.add("$" + k);
+				i++;
+			}
+			var tot = p.pos + p.len - pos;
+			pos += tot;
+			len -= tot;
+			first = false;
+		} while (global);
+		b.addSub(s, pos, len);
+		return b.toString();
 	}
 
-	public function map( s : String, f : EReg -> String ) : String {
+	public function map(s:String, f:EReg->String):String {
 		var offset = 0;
 		var buf = new StringBuf();
 		do {
@@ -158,14 +156,13 @@
 				buf.add(s.substr(offset));
 				break;
 			}
-			var p = _hx_regexp_matched_pos(r,0);
+			var p = _hx_regexp_matched_pos(r, 0);
 			buf.add(s.substr(offset, p.pos - offset));
 			buf.add(f(this));
 			if (p.len == 0) {
 				buf.add(s.substr(p.pos, 1));
 				offset = p.pos + 1;
-			}
-			else
+			} else
 				offset = p.pos + p.len;
 		} while (global);
 		if (!global && offset > 0 && offset < s.length)
@@ -173,16 +170,24 @@
 		return buf.toString();
 	}
 
+	public static function escape(s:String):String {
+		return escapeRegExpRe.map(s, function(r) return "\\" + r.matched(0));
+	}
+
+	static var escapeRegExpRe = ~/[\[\]{}()*+?.\\\^$|]/g;
+
+	function toString():String
+		return 'EReg($r)';
 
-   @:extern @:native("_hx_regexp_new_options")
-	static function _hx_regexp_new_options(s:String, options:String) : Dynamic return null;
+	@:native("_hx_regexp_new_options")
+	extern static function _hx_regexp_new_options(s:String, options:String):Dynamic;
 
-   @:extern @:native("_hx_regexp_match")
-	static function _hx_regexp_match(handler: Dynamic, string:String, pos:Int, len:Int) : Bool return false;
+	@:native("_hx_regexp_match")
+	extern static function _hx_regexp_match(handler:Dynamic, string:String, pos:Int, len:Int):Bool;
 
-   @:extern @:native("_hx_regexp_matched")
-	static function _hx_regexp_matched(handle:Dynamic, pos:Int) : String return null;
+	@:native("_hx_regexp_matched")
+	extern static function _hx_regexp_matched(handle:Dynamic, pos:Int):String;
 
-   @:extern @:native("_hx_regexp_matched_pos")
-	static function _hx_regexp_matched_pos(handle:Dynamic, match:Int) : {pos:Int, len:Int} return null;
+	@:native("_hx_regexp_matched_pos")
+	extern static function _hx_regexp_matched_pos(handle:Dynamic, match:Int):{pos:Int, len:Int};
 }
diff --git a/std/cpp/_std/Reflect.hx b/std/cpp/_std/Reflect.hx
index a80e4d214b21966790ec1ac7e96b4999065f88ac..32ba5c8ecff42a74376ea646a2bb51b5f0d4a891 100644
--- a/std/cpp/_std/Reflect.hx
+++ b/std/cpp/_std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,88 +25,105 @@ import cpp.ObjectType;
 @:coreApi
 @:analyzer(ignore)
 class Reflect {
-
-	public  static function hasField( o : Dynamic, field : String ) : Bool untyped {
-		return o!=null && o.__HasField(field);
-	}
-
-	public static function field( o : Dynamic, field : String ) : Dynamic untyped {
-		return (o==null) ? null : o.__Field(field,untyped __cpp__("hx::paccNever") );
-	}
-
-	public static function setField( o : Dynamic, field : String, value : Dynamic ) : Void untyped {
-		if (o!=null)
-			o.__SetField(field,value,untyped __cpp__("hx::paccNever") );
+	public static function hasField(o:Dynamic, field:String):Bool
+		untyped {
+			return o != null && o.__HasField(field);
+		}
+
+	public static function field(o:Dynamic, field:String):Dynamic
+		untyped {
+			return (o == null) ? null : o.__Field(field, untyped __cpp__("hx::paccNever"));
+		}
+
+	public static function setField(o:Dynamic, field:String, value:Dynamic):Void
+		untyped {
+			if (o != null)
+				o.__SetField(field, value, untyped __cpp__("hx::paccNever"));
+		}
+
+	public static function getProperty(o:Dynamic, field:String):Dynamic {
+		return (o == null) ? null : o.__Field(field, untyped __cpp__("hx::paccAlways"));
 	}
 
-	public static function getProperty( o : Dynamic, field : String ) : Dynamic {
-		return (o==null) ? null : o.__Field(field,untyped __cpp__("hx::paccAlways") );
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void {
+		if (o != null)
+			o.__SetField(field, value, untyped __cpp__("hx::paccAlways"));
 	}
 
-	public static function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void {
-		if (o!=null)
-			o.__SetField(field,value,untyped __cpp__("hx::paccAlways") );
-	}
-
-	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
-			if (func!=null && func.__GetType()==ObjectType.vtString)
-				func = o.__Field(func,untyped __cpp__("hx::paccDynamic"));
+	public static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic
+		untyped {
+			if (func != null && func.__GetType() == ObjectType.vtString) {
+				if (o == null)
+					throw cpp.ErrorConstants.invalidObject;
+				func = o.__Field(func, untyped __cpp__("hx::paccDynamic"));
+			}
+			if (func == null)
+				throw cpp.ErrorConstants.nullFunctionPointer;
 			untyped func.__SetThis(o);
-         return untyped func.__Run(args);
+			return untyped func.__Run(args);
+		}
+
+	public static function fields(o:Dynamic):Array<String>
+		untyped {
+			if (o == null)
+				return new Array();
+			var a:Array<String> = [];
+			o.__GetFields(a);
+			return a;
+		}
+
+	public static function isFunction(f:Dynamic):Bool
+		untyped {
+			return f != null && f.__GetType() == ObjectType.vtFunction;
+		}
+
+	public static function compare<T>(a:T, b:T):Int {
+		return (a == b) ? 0 : (((a : Dynamic) > (b : Dynamic)) ? 1 : -1);
 	}
 
-	public static function fields( o : Dynamic ) : Array<String> untyped {
-		if( o == null ) return new Array();
-		var a : Array<String> = [];
-		o.__GetFields(a);
-		return a;
-	}
-
-	public static function isFunction( f : Dynamic ) : Bool untyped {
-		return f!=null && f.__GetType() ==  ObjectType.vtFunction;
-	}
-
-	public static function compare<T>( a : T, b : T ) : Int {
-		return ( a == b ) ? 0 : (((a:Dynamic) > (b:Dynamic)) ? 1 : -1);
-	}
-
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool {
-		if( f1 == f2 )
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
+		if (f1 == f2)
 			return true;
-		if( !isFunction(f1) || !isFunction(f2) )
+		if (!isFunction(f1) || !isFunction(f2))
 			return false;
-		return untyped __global__.__hxcpp_same_closure(f1,f2);
-	}
-
-	public static function isObject( v : Dynamic ) : Bool untyped {
-		if (v==null) return false;
-		var t:Int = v.__GetType();
-		return t ==  ObjectType.vtObject || t==ObjectType.vtClass || t==ObjectType.vtString ||
-				t==ObjectType.vtArray;
-	}
-
-	public static function isEnumValue( v : Dynamic ) : Bool untyped {
-		return v!=null && v.__GetType() == ObjectType.vtEnum;
-	}
-
-	public static function deleteField( o : Dynamic, field : String ) : Bool untyped {
-		if (o==null) return false;
-		return untyped __global__.__hxcpp_anon_remove(o,field);
+		return untyped __global__.__hxcpp_same_closure(f1, f2);
 	}
 
-	public static function copy<T>( o : T ) : T {
-		if (o==null) return null;
-		if(untyped o.__GetType()==ObjectType.vtString ) return o;
-		if(untyped o.__GetType()==ObjectType.vtArray )
+	public static function isObject(v:Dynamic):Bool
+		untyped {
+			if (v == null)
+				return false;
+			var t:Int = v.__GetType();
+			return t == ObjectType.vtObject || t == ObjectType.vtClass || t == ObjectType.vtString || t == ObjectType.vtArray;
+		}
+
+	public static function isEnumValue(v:Dynamic):Bool
+		untyped {
+			return v != null && v.__GetType() == ObjectType.vtEnum;
+		}
+
+	public static function deleteField(o:Dynamic, field:String):Bool
+		untyped {
+			if (o == null)
+				return false;
+			return untyped __global__.__hxcpp_anon_remove(o, field);
+		}
+
+	public static function copy<T>(o:Null<T>):Null<T> {
+		if (o == null)
+			return null;
+		if (untyped o.__GetType() == ObjectType.vtString)
+			return o;
+		if (untyped o.__GetType() == ObjectType.vtArray)
 			return untyped o.__Field("copy", untyped __cpp__("hx::paccDynamic"))();
-		var o2 : Dynamic = {};
-		for( f in Reflect.fields(o) )
-			Reflect.setField(o2,f,Reflect.field(o,f));
+		var o2:Dynamic = {};
+		for (f in Reflect.fields(o))
+			Reflect.setField(o2, f, Reflect.field(o, f));
 		return o2;
 	}
 
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
 		return untyped __global__.__hxcpp_create_var_args(f);
 	}
 }
diff --git a/std/cpp/_std/Std.hx b/std/cpp/_std/Std.hx
index fe7a71048a7347ac20d36ea89e3cbeb9f6de9ebc..95be55dce55e2a38ba8c7ae758daa646e5b4da2d 100644
--- a/std/cpp/_std/Std.hx
+++ b/std/cpp/_std/Std.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,33 +19,40 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+@:headerClassCode("\t\tstatic inline String string(String &s) { return s; }")
 @:coreApi class Std {
-	@:keep public static function is( v : Dynamic, t : Dynamic ) : Bool {
-		return untyped __global__.__instanceof(v,t);
+	@:keep public static function is(v:Dynamic, t:Dynamic):Bool {
+		return untyped __global__.__instanceof(v, t);
 	}
 
-	@:keep public static function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
+	@:keep public static function downcast<T:{}, S:T>(value:T, c:Class<S>):S {
 		return Std.is(value, c) ? cast value : null;
 	}
 
-	@:keep public static function string( s : Dynamic ) : String {
-		return untyped s==null ? "null" : s.toString();
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	@:keep public static function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return inline downcast(value, c);
 	}
 
-	@:keep public static function int( x : Float ) : Int {
+	@:keep public static function string(s:Dynamic):String {
+		return untyped s == null ? "null" : s.toString();
+	}
+
+	@:keep public static function int(x:Float):Int {
 		return untyped __global__.__int__(x);
 	}
 
-	@:keep public static function parseInt( x : String ) : Null<Int> {
+	@:keep public static function parseInt(x:String):Null<Int> {
 		return untyped __global__.__hxcpp_parse_int(x);
 	}
 
-	@:keep public static function parseFloat( x : String ) : Float {
+	@:keep public static function parseFloat(x:String):Float {
 		return untyped __global__.__hxcpp_parse_float(x);
 	}
 
-	@:keep public static function random( x : Int ) : Int {
-		if (x <= 0) return 0;
+	@:keep public static function random(x:Int):Int {
+		if (x <= 0)
+			return 0;
 		return untyped __global__.__hxcpp_irand(x);
 	}
 }
diff --git a/std/cpp/_std/StringBuf.hx b/std/cpp/_std/StringBuf.hx
index 97d53810303e383c2906f87531a26ee06722c44a..aca39e22dbed27534021adcace071dc2bb361f47 100644
--- a/std/cpp/_std/StringBuf.hx
+++ b/std/cpp/_std/StringBuf.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,71 +19,83 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import cpp.NativeString;
+
 using cpp.NativeArray;
 
 @:coreApi
 class StringBuf {
-   private var b : Array<String>;
-   public var length(get,never) : Int;
-   var charBuf:Array<cpp.Char>;
+	private var b:Array<String>;
+
+	public var length(get, never):Int;
+
+	var charBuf:Array<cpp.Char>;
 
-   public function new() : Void {
-   }
+	public function new():Void {}
 
-   private function charBufAsString() : String
-   {
-      var len = charBuf.length;
-      charBuf.push(0);
-      return NativeString.fromGcPointer( charBuf.address(0), len );
-   }
+	private function charBufAsString():String {
+		var len = charBuf.length;
+		charBuf.push(0);
+		return NativeString.fromGcPointer(charBuf.address(0), len);
+	}
 
-   private function flush() : Void{
-      if (b==null)
-         b = [charBufAsString()];
-      else
-         b.push( charBufAsString() );
-      charBuf = null;
-   }
-   function get_length() : Int {
-      var len = 0;
-      if (charBuf!=null)
-         len = charBuf.length;
-      if (b!=null)
-         for(s in b)
-            len += s==null ? 4 : s.length;
-      return len;
-   }
+	private function flush():Void {
+		if (b == null)
+			b = [charBufAsString()];
+		else
+			b.push(charBufAsString());
+		charBuf = null;
+	}
 
-   public inline function add<T>( x : T ) : Void {
-      if (charBuf!=null) flush();
-      if (b==null)
-         b = [Std.string(x)];
-      else
-         b.push(Std.string(x));
-   }
+	function get_length():Int {
+		var len = 0;
+		if (charBuf != null)
+			len = charBuf.length;
+		if (b != null)
+			for (s in b)
+				len += s == null ? 4 : s.length;
+		return len;
+	}
 
-   public #if !cppia inline #end function addSub( s : String, pos : Int, ?len : Int ) : Void {
-      if (charBuf!=null) flush();
-      if (b==null)
-         b = [s.substr(pos,len)];
-      else
-         b.push(s.substr(pos,len));
-   }
+	public inline function add<T>(x:T):Void {
+		if (charBuf != null)
+			flush();
+		if (b == null)
+			b = [Std.string(x)];
+		else
+			b.push(Std.string(x));
+	}
 
-   public #if !cppia inline #end function addChar( c : Int ) : Void {
-      if (charBuf==null) charBuf = new Array<cpp.Char>();
-      charBuf.push(c);
-   }
+	public #if !cppia inline #end function addSub(s:String, pos:Int, ?len:Int):Void {
+		if (charBuf != null)
+			flush();
+		if (b == null)
+			b = [s.substr(pos, len)];
+		else
+			b.push(s.substr(pos, len));
+	}
 
-   public function toString() : String {
-      if (charBuf!=null)
-         flush();
-      if (b==null || b.length==0)
-         return "";
-      if (b.length==1)
-         return b[0];
-      return b.join("");
-   }
+	public #if !cppia inline #end function addChar(c:Int):Void {
+		#if hxcpp_smart_strings
+		if (c >= 127)
+			add(String.fromCharCode(c));
+		else
+		#end
+		{
+			if (charBuf == null)
+				charBuf = new Array<cpp.Char>();
+			charBuf.push(c);
+		}
+	}
 
+	public function toString():String {
+		if (charBuf != null)
+			flush();
+		if (b == null || b.length == 0)
+			return "";
+		if (b.length == 1)
+			return b[0];
+		return b.join("");
+	}
 }
diff --git a/std/cpp/_std/Sys.hx b/std/cpp/_std/Sys.hx
index 88a0c90f23ec1065e97c9246246e7273ba5cc52e..0d2e77ab2c1d857bc5ac50a9413df1d732edf602 100644
--- a/std/cpp/_std/Sys.hx
+++ b/std/cpp/_std/Sys.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,73 +19,75 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import cpp.NativeSys;
+import haxe.SysTools;
 
 @:coreApi class Sys {
-
-	public static function print( v : Dynamic ) : Void {
+	public static function print(v:Dynamic):Void {
 		untyped __global__.__hxcpp_print(v);
 	}
 
-	public static function println( v : Dynamic ) : Void {
+	public static function println(v:Dynamic):Void {
 		untyped __global__.__hxcpp_println(v);
 	}
 
-   @:access(sys.io.FileInput)
-	public static function stdin() : haxe.io.Input {
+	@:access(sys.io.FileInput)
+	public static function stdin():haxe.io.Input {
 		return new sys.io.FileInput(cpp.NativeFile.file_stdin());
 	}
 
-   @:access(sys.io.FileOutput)
-	public static function stdout() : haxe.io.Output {
+	@:access(sys.io.FileOutput)
+	public static function stdout():haxe.io.Output {
 		return new sys.io.FileOutput(cpp.NativeFile.file_stdout());
 	}
 
-   @:access(sys.io.FileOutput)
-	public static function stderr() : haxe.io.Output {
+	@:access(sys.io.FileOutput)
+	public static function stderr():haxe.io.Output {
 		return new sys.io.FileOutput(cpp.NativeFile.file_stderr());
 	}
 
-	public static function getChar( echo : Bool ) : Int {
+	public static function getChar(echo:Bool):Int {
 		return NativeSys.sys_getch(echo);
 	}
 
-	public static function args() : Array<String> untyped {
-		return __global__.__get_args();
-	}
+	public static function args():Array<String>
+		untyped {
+			return __global__.__get_args();
+		}
 
-	public static function getEnv( s : String ):String {
+	public static function getEnv(s:String):String {
 		var v = NativeSys.get_env(s);
-		if( v == null )
+		if (v == null)
 			return null;
 		return v;
 	}
 
-	public static function putEnv( s : String, v : String ) : Void {
-		NativeSys.put_env(s,v);
+	public static function putEnv(s:String, v:String):Void {
+		NativeSys.put_env(s, v);
 	}
 
-	public static function sleep( seconds : Float ) : Void {
+	public static function sleep(seconds:Float):Void {
 		NativeSys.sys_sleep(seconds);
 	}
 
-	public static function setTimeLocale( loc : String ) : Bool {
+	public static function setTimeLocale(loc:String):Bool {
 		return NativeSys.set_time_locale(loc);
 	}
 
-	public static function getCwd() : String {
+	public static function getCwd():String {
 		return NativeSys.get_cwd();
 	}
 
-	public static function setCwd( s : String ) : Void {
+	public static function setCwd(s:String):Void {
 		NativeSys.set_cwd(s);
 	}
 
-	public static function systemName() : String {
+	public static function systemName():String {
 		return NativeSys.sys_string();
 	}
 
-	public static function command( cmd : String, ?args : Array<String> ) : Int {
+	public static function command(cmd:String, ?args:Array<String>):Int {
 		if (args == null) {
 			return NativeSys.sys_command(cmd);
 		} else {
@@ -93,45 +95,44 @@ import cpp.NativeSys;
 				case "Windows":
 					cmd = [
 						for (a in [StringTools.replace(cmd, "/", "\\")].concat(args))
-						StringTools.quoteWinArg(a, true)
+							SysTools.quoteWinArg(a, true)
 					].join(" ");
 					return NativeSys.sys_command(cmd);
 				case _:
-					cmd = [cmd].concat(args).map(StringTools.quoteUnixArg).join(" ");
+					cmd = [cmd].concat(args).map(SysTools.quoteUnixArg).join(" ");
 					return NativeSys.sys_command(cmd);
 			}
 		}
 	}
 
-	public static function exit( code : Int ) : Void {
+	public static function exit(code:Int):Void {
 		untyped __global__.__hxcpp_exit(code);
 	}
 
-	public static function time() : Float {
+	public static function time():Float {
 		return NativeSys.sys_time();
 	}
 
-	public static function cpuTime() : Float {
+	public static function cpuTime():Float {
 		return NativeSys.sys_cpu_time();
 	}
 
-	@:deprecated("Use programPath instead") public static function executablePath() : String {
+	@:deprecated("Use programPath instead") public static function executablePath():String {
 		return NativeSys.sys_exe_path();
 	}
 
-	public static function programPath() : String {
+	public static function programPath():String {
 		return NativeSys.sys_exe_path();
 	}
 
-	public static function environment() : Map<String,String> {
+	public static function environment():Map<String, String> {
 		var vars:Array<String> = NativeSys.sys_env();
 		var result = new haxe.ds.StringMap<String>();
 		var i = 0;
-		while(i<vars.length) {
-			result.set( vars[i], vars[i+1] );
-			i+=2;
+		while (i < vars.length) {
+			result.set(vars[i], vars[i + 1]);
+			i += 2;
 		}
 		return result;
 	}
-
 }
diff --git a/std/cpp/_std/Type.hx b/std/cpp/_std/Type.hx
index c9028e7c694e7ec59b6d0708578d3abe9d1c4116..e898a96b5db96c0976993b0a738a3b699c3bc1a3 100644
--- a/std/cpp/_std/Type.hx
+++ b/std/cpp/_std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 enum ValueType {
 	TNull;
 	TInt;
@@ -27,140 +26,155 @@ enum ValueType {
 	TBool;
 	TObject;
 	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
 	TUnknown;
 }
 
 @:coreApi class Type {
-	public static function getClass<T>( o : T ) : Class<T> untyped {
-			if (o==null || !Reflect.isObject(o))  return null;
+	public static function getClass<T>(o:T):Class<T>
+		untyped {
+			if (o == null || !Reflect.isObject(o))
+				return null;
 			var c = o.__GetClass();
-			switch(c.toString())
-			{
-				case "__Anon" : return null;
-				case "Class" : return null;
+			switch (c.toString()) {
+				case "__Anon":
+					return null;
+				case "Class":
+					return null;
 			}
 			return c;
-	}
-
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic> untyped {
-		if (o==null) return null;
-		return untyped o.__GetClass();
-	}
-
-
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic> untyped {
-		return c.GetSuper();
-	}
-
-	public static function getClassName( c : Class<Dynamic> ) : String {
-		if( c == null )
+		}
+
+	public static function getEnum(o:EnumValue):Enum<Dynamic>
+		untyped {
+			if (o == null)
+				return null;
+			return untyped o.__GetClass();
+		}
+
+	public static function getSuperClass(c:Class<Dynamic>):Class<Dynamic>
+		untyped {
+			return c.GetSuper();
+		}
+
+	public static function getClassName(c:Class<Dynamic>):String {
+		if (c == null)
 			return null;
 		return untyped c.mName;
 	}
 
-	public static function getEnumName( e : Enum<Dynamic> ) : String {
+	public static function getEnumName(e:Enum<Dynamic>):String {
 		return untyped e.__ToString();
 	}
 
-	public static function resolveClass( name : String ) : Class<Dynamic> untyped {
-		var result:Class<Dynamic> = Class.Resolve(name);
-		if (result!=null && result.__IsEnum() )
-			return null;
-		return result;
-	}
-
-	public static function resolveEnum( name : String ) : Enum<Dynamic> untyped {
-		var result:Class<Dynamic> = Class.Resolve(name);
-		if (result!=null && !result.__IsEnum() )
+	public static function resolveClass(name:String):Class<Dynamic>
+		untyped {
+			var result:Class<Dynamic> = Class.Resolve(name);
+			if (result != null && result.__IsEnum())
+				return null;
+			return result;
+		}
+
+	public static function resolveEnum(name:String):Enum<Dynamic>
+		untyped {
+			var result:Class<Dynamic> = Class.Resolve(name);
+			if (result != null && !result.__IsEnum())
+				return null;
+			return result;
+		}
+
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T
+		untyped {
+			if (cl != null)
+				return cl.ConstructArgs(args);
 			return null;
-		return result;
-	}
+		}
 
-	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T untyped {
-		if (cl!=null)
-			return cl.ConstructArgs(args);
-		return null;
-	}
-
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T untyped {
-		return cl.ConstructEmpty();
-	}
+	public static function createEmptyInstance<T>(cl:Class<T>):T
+		untyped {
+			return cl.ConstructEmpty();
+		}
 
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		return untyped e.ConstructEnum(constr,params);
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T {
+		return untyped e.ConstructEnum(constr, params);
 	}
 
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T {
 		var c = Type.getEnumConstructs(e)[index];
-		if( c == null ) throw index+" is not a valid enum constructor index";
-		return createEnum(e,c,params);
+		if (c == null)
+			throw index + " is not a valid enum constructor index";
+		return createEnum(e, c, params);
 	}
 
-	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String> {
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String> {
 		return untyped c.GetInstanceFields();
 	}
 
-	public static function getClassFields( c : Class<Dynamic> ) : Array<String> {
-			return untyped c.GetClassFields();
+	public static function getClassFields(c:Class<Dynamic>):Array<String> {
+		return untyped c.GetClassFields();
 	}
 
-	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> untyped {
+	public static function getEnumConstructs(e:Enum<Dynamic>):Array<String>
+		untyped {
 			return untyped e.GetClassFields();
-	}
+		}
 
-	public static function typeof( v : Dynamic ) : ValueType untyped {
-			if (v==null) return TNull;
+	public static function typeof(v:Dynamic):ValueType
+		untyped {
+			if (v == null)
+				return TNull;
 			var t:Int = untyped v.__GetType();
-			switch(t)
-			{
-				case 2 : return TBool;
-				case 0xFF : return TInt;
-				case 1 : return TFloat;
-				case 6 : return TFunction;
-				case 4 : return TObject;
-				case 7 : return TEnum(v.__GetClass());
+			switch (t) {
+				case 2:
+					return TBool;
+				case 0xFF:
+					return TInt;
+				case 1:
+					return TFloat;
+				case 6:
+					return TFunction;
+				case 4:
+					return TObject;
+				case 7:
+					return TEnum(v.__GetClass());
 				default:
 					return untyped TClass(v.__GetClass());
 			}
-	}
+		}
 
-	public static function enumEq<T>( a : T, b : T ) : Bool untyped {
-			return a==b;
-	}
+	public static function enumEq<T>(a:T, b:T):Bool
+		untyped {
+			return a == b;
+		}
 
-	public static function enumConstructor( e : EnumValue ) : String {
-			var value:cpp.EnumBase = cast e;
-			return value._hx_getTag();
+	public static function enumConstructor(e:EnumValue):String {
+		var value:cpp.EnumBase = cast e;
+		return value._hx_getTag();
 	}
 
-	public static function enumParameters( e : EnumValue ) : Array<Dynamic> {
-			var value:cpp.EnumBase = cast e;
-			return value._hx_getParameters();
+	public static function enumParameters(e:EnumValue):Array<Dynamic> {
+		var value:cpp.EnumBase = cast e;
+		return value._hx_getParameters();
 	}
 
-   @:extern @:native("_hx_getEnumValueIndex")
-	private static function getEnumValueIndex( e : EnumValue ) : Int return 0;
+	@:native("_hx_getEnumValueIndex")
+	extern private static function getEnumValueIndex(e:EnumValue):Int;
 
-	#if !cppia inline #end public static function enumIndex( e : EnumValue ) : Int {
-			return getEnumValueIndex(e);
+	#if !cppia inline #end public static function enumIndex(e:EnumValue):Int {
+		return getEnumValueIndex(e);
 	}
 
-	public static function allEnums<T>( e : Enum<T> ) : Array<T> {
-      var names:Array<String> =  untyped e.GetClassFields();
+	public static function allEnums<T>(e:Enum<T>):Array<T> {
+		var names:Array<String> = untyped e.GetClassFields();
 		var enums = new Array<T>();
-      for(name in names)
-      {
-         try {
-            var result:T = untyped e.ConstructEnum(name,null);
-            if (result!=null)
-               enums.push( result );
-         } catch ( invalidArgCount:String) {
-         }
-      }
+		for (name in names) {
+			try {
+				var result:T = untyped e.ConstructEnum(name, null);
+				if (result != null)
+					enums.push(result);
+			} catch (invalidArgCount:String) {}
+		}
 		return enums;
 	}
-
 }
-
diff --git a/std/cpp/_std/haxe/Int64.hx b/std/cpp/_std/haxe/Int64.hx
index 0e75eea568942ebea765ae7a47e5a3c611ff8956..37f3da93081c1d27e21ff5b9330857981a8f7353 100644
--- a/std/cpp/_std/haxe/Int64.hx
+++ b/std/cpp/_std/haxe/Int64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,446 +19,395 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 import haxe.Int64Helper;
 
 @:notNull
-
-
 @:include("cpp/Int64.h")
 @:native("cpp::Int64Struct")
 private extern class ___Int64 {
-   public function get():cpp.Int64;
-
-   @:native("_hx_int64_make")
-   public static function make(high:Int32, low:Int32): __Int64 return null;
+	public function get():cpp.Int64;
 
-   @:native(" ::cpp::Int64Struct")
-   public static function ofInt(value:Int): __Int64 return null;
+	@:native("_hx_int64_make")
+	public static function make(high:Int32, low:Int32):__Int64;
 
-   @:native(" ::cpp::Int64Struct::is")
-   public static function is(d:Dynamic):Bool return false;
+	@:native(" ::cpp::Int64Struct")
+	public static function ofInt(value:Int):__Int64;
 
-   @:native("_hx_int64_is_neg")
-   public static function isNeg(a:__Int64):Bool return false;
+	@:native(" ::cpp::Int64Struct::is")
+	public static function is(d:Dynamic):Bool;
 
-   @:native("_hx_int64_is_zero")
-   public static function isZero(a:__Int64):Bool return false;
+	@:native("_hx_int64_is_neg")
+	public static function isNeg(a:__Int64):Bool;
 
-   @:native("_hx_int64_compare")
-   public static function compare(a:__Int64, b:__Int64):Int return 0;
+	@:native("_hx_int64_is_zero")
+	public static function isZero(a:__Int64):Bool;
 
-   @:native("_hx_int64_ucompare")
-   public static function ucompare(a:__Int64, b:__Int64):Int return 0;
+	@:native("_hx_int64_compare")
+	public static function compare(a:__Int64, b:__Int64):Int;
 
-   @:native("_hx_int64_to_string")
-   public static function toString(a:__Int64):String return null;
+	@:native("_hx_int64_ucompare")
+	public static function ucompare(a:__Int64, b:__Int64):Int;
 
-   @:native("_hx_int64_neg")
-   public static function neg(a:__Int64): __Int64 return null;
+	@:native("_hx_int64_to_string")
+	public static function toString(a:__Int64):String;
 
-   @:native("_hx_int64_pre_increment")
-   public static function preIncrement(a:__Int64): __Int64 return null;
+	@:native("_hx_int64_neg")
+	public static function neg(a:__Int64):__Int64;
 
-   @:native("_hx_int64_post_increment")
-   public static function postIncrement(a:__Int64): __Int64 return null;
+	@:native("_hx_int64_pre_increment")
+	public static function preIncrement(a:__Int64):__Int64;
 
-   @:native("_hx_int64_pre_decrement")
-   public static function preDecrement(a:__Int64): __Int64 return null;
+	@:native("_hx_int64_post_increment")
+	public static function postIncrement(a:__Int64):__Int64;
 
-   @:native("_hx_int64_post_decrement")
-   public static function postDecrement(a:__Int64): __Int64 return null;
+	@:native("_hx_int64_pre_decrement")
+	public static function preDecrement(a:__Int64):__Int64;
 
-   @:native("_hx_int64_add")
-   public static function add(a:__Int64, b:__Int64): __Int64 return null;
+	@:native("_hx_int64_post_decrement")
+	public static function postDecrement(a:__Int64):__Int64;
 
-   @:native("_hx_int64_add")
-   public static function addInt(a:__Int64, b:Int): __Int64 return null;
+	@:native("_hx_int64_add")
+	public static function add(a:__Int64, b:__Int64):__Int64;
 
-   @:native("_hx_int64_sub")
-   public static function sub(a:__Int64, b:__Int64): __Int64 return null;
+	@:native("_hx_int64_add")
+	public static function addInt(a:__Int64, b:Int):__Int64;
 
-   @:native("_hx_int64_sub")
-   public static function subInt(a:__Int64, b:Int): __Int64 return null;
+	@:native("_hx_int64_sub")
+	public static function sub(a:__Int64, b:__Int64):__Int64;
 
-   @:native("_hx_int64_sub")
-   public static function intSub(a:Int, b:__Int64): __Int64 return null;
+	@:native("_hx_int64_sub")
+	public static function subInt(a:__Int64, b:Int):__Int64;
 
-   @:native("_hx_int64_mul")
-   public static function mul(a:__Int64, b:__Int64): __Int64 return null;
+	@:native("_hx_int64_sub")
+	public static function intSub(a:Int, b:__Int64):__Int64;
 
-   @:native("_hx_int64_div")
-   public static function div(a:__Int64, b:__Int64): __Int64 return null;
+	@:native("_hx_int64_mul")
+	public static function mul(a:__Int64, b:__Int64):__Int64;
 
-   @:native("_hx_int64_mod")
-   public static function mod(a:__Int64, b:__Int64): __Int64 return null;
+	@:native("_hx_int64_div")
+	public static function div(a:__Int64, b:__Int64):__Int64;
 
-   @:native("_hx_int64_eq")
-   public static function eq(a:__Int64, b:__Int64): Bool return null;
+	@:native("_hx_int64_mod")
+	public static function mod(a:__Int64, b:__Int64):__Int64;
 
-   @:native("_hx_int64_eq")
-   public static function eqInt(a:__Int64, b:Int): Bool return null;
+	@:native("_hx_int64_eq")
+	public static function eq(a:__Int64, b:__Int64):Bool;
 
-   @:native("_hx_int64_neq")
-   public static function neq(a:__Int64, b:__Int64): Bool return null;
+	@:native("_hx_int64_eq")
+	public static function eqInt(a:__Int64, b:Int):Bool;
 
-   @:native("_hx_int64_neq")
-   public static function neqInt(a:__Int64, b:Int): Bool return null;
+	@:native("_hx_int64_neq")
+	public static function neq(a:__Int64, b:__Int64):Bool;
 
-   @:native("_hx_int64_complement")
-   public static function complement(a:__Int64): __Int64 return null;
+	@:native("_hx_int64_neq")
+	public static function neqInt(a:__Int64, b:Int):Bool;
 
-   @:native("_hx_int64_and")
-   public static function bitAnd(a:__Int64, b:__Int64): __Int64 return null;
+	@:native("_hx_int64_complement")
+	public static function complement(a:__Int64):__Int64;
 
-   @:native("_hx_int64_or")
-   public static function bitOr(a:__Int64, b:__Int64): __Int64 return null;
+	@:native("_hx_int64_and")
+	public static function bitAnd(a:__Int64, b:__Int64):__Int64;
 
-   @:native("_hx_int64_xor")
-   public static function bitXor(a:__Int64, b:__Int64): __Int64 return null;
+	@:native("_hx_int64_or")
+	public static function bitOr(a:__Int64, b:__Int64):__Int64;
 
-   @:native("_hx_int64_shl")
-   public static function shl(a:__Int64, b:Int): __Int64 return null;
+	@:native("_hx_int64_xor")
+	public static function bitXor(a:__Int64, b:__Int64):__Int64;
 
-   @:native("_hx_int64_shr")
-   public static function shr(a:__Int64, b:Int): __Int64 return null;
+	@:native("_hx_int64_shl")
+	public static function shl(a:__Int64, b:Int):__Int64;
 
-   @:native("_hx_int64_ushr")
-   public static function ushr(a:__Int64, b:Int): __Int64 return null;
+	@:native("_hx_int64_shr")
+	public static function shr(a:__Int64, b:Int):__Int64;
 
-   @:native("_hx_int64_high")
-   public static function high(a:__Int64):Int32 return 0;
+	@:native("_hx_int64_ushr")
+	public static function ushr(a:__Int64, b:Int):__Int64;
 
-   @:native("_hx_int64_low")
-   public static function low(a:__Int64):Int32 return 0;
+	@:native("_hx_int64_high")
+	public static function high(a:__Int64):Int32;
 
+	@:native("_hx_int64_low")
+	public static function low(a:__Int64):Int32;
 }
 
 private typedef __Int64 = ___Int64;
 
 @:coreApi
-abstract Int64( __Int64 ) from __Int64 to __Int64
-{
-   /**
-		Makes a copy of `this` Int64.
-	**/
-	public #if !cppia inline #end function copy():Int64 return this;
+abstract Int64(__Int64) from __Int64 to __Int64 {
+	public #if !cppia inline #end function copy():Int64
+		return this;
 
-
-	public static #if !cppia inline #end function make( high : Int32, low : Int32 ) : Int64 {
-      return __Int64.make(high,low);
+	public static #if !cppia inline #end function make(high:Int32, low:Int32):Int64 {
+		return __Int64.make(high, low);
 	}
 
-	@:from public static #if !cppia inline #end function ofInt( x : Int ) : Int64 {
-      return __Int64.ofInt(x);
+	@:from
+	public static #if !cppia inline #end function ofInt(x:Int):Int64 {
+		return __Int64.ofInt(x);
 	}
 
-
-	/**
-		Returns an Int with the value of the Int64 `x`.
-		Throws an exception  if `x` cannot be represented in 32 bits.
-	**/
-	public static #if !cppia inline #end function toInt( x : Int64 ) : Int {
-		if( x.high != x.low >> 31 )
+	public static #if !cppia inline #end function toInt(x:Int64):Int {
+		if (x.high != x.low >> 31)
 			throw "Overflow";
 
 		return x.low;
 	}
 
-	/**
-		Returns whether the value `val` is of type `haxe.Int64`
-	**/
-	public static #if !cppia inline #end function is( val : Dynamic ) : Bool
-      return __Int64.is(val);
+	public static #if !cppia inline #end function is(val:Dynamic):Bool
+		return __Int64.is(val);
 
-	/**
-		Returns the high 32-bit word of `x`.
-	**/
 	@:deprecated("Use high instead")
-	public static #if !cppia inline #end function getHigh( x : Int64 ) : Int32
+	public static #if !cppia inline #end function getHigh(x:Int64):Int32
 		return x.high;
 
-	/**
-		Returns the low 32-bit word of `x`.
-	**/
 	@:deprecated("Use low instead")
-	public static #if !cppia inline #end function getLow( x : Int64 ) : Int32
+	public static #if !cppia inline #end function getLow(x:Int64):Int32
 		return x.low;
 
-	/**
-		Returns `true` if `x` is less than zero.
-	**/
-	public static #if !cppia inline #end function isNeg( x : Int64) : Bool
-      return __Int64.isNeg(x);
-
-	/**
-		Returns `true` if `x` is exactly zero.
-	**/
-	public static #if !cppia inline #end function isZero( x : Int64 ) : Bool
-      return __Int64.isZero(x);
-
-	/**
-		Compares `a` and `b` in signed mode.
-		Returns a negative value if `a < b`, positive if `a > b`,
-		or 0 if `a == b`.
-	**/
-	public static #if !cppia inline #end function compare( a : Int64, b : Int64 ) : Int
-      return __Int64.compare(a,b);
-
-	/**
-		Compares `a` and `b` in unsigned mode.
-		Returns a negative value if `a < b`, positive if `a > b`,
-		or 0 if `a == b`.
-	**/
-	public static #if !cppia inline #end function ucompare( a : Int64, b : Int64 ) : Int
-      return __Int64.ucompare(a,b);
-
-	/**
-		Returns a signed decimal `String` representation of `x`.
-	**/
-	public static #if !cppia inline #end function toStr(x:Int64) : String
+	public static #if !cppia inline #end function isNeg(x:Int64):Bool
+		return __Int64.isNeg(x);
+
+	public static #if !cppia inline #end function isZero(x:Int64):Bool
+		return __Int64.isZero(x);
+
+	public static #if !cppia inline #end function compare(a:Int64, b:Int64):Int
+		return __Int64.compare(a, b);
+
+	public static #if !cppia inline #end function ucompare(a:Int64, b:Int64):Int
+		return __Int64.ucompare(a, b);
+
+	public static #if !cppia inline #end function toStr(x:Int64):String
 		return x.toString();
 
-	private #if !cppia inline #end function toString() : String
-      return __Int64.toString(this);
+	private #if !cppia inline #end function toString():String
+		return __Int64.toString(this);
 
-	public static function parseString( sParam : String ) : Int64 {
-		return Int64Helper.parseString( sParam );
+	public static function parseString(sParam:String):Int64 {
+		return Int64Helper.parseString(sParam);
 	}
 
-	public static function fromFloat( f : Float ) : Int64 {
-		return Int64Helper.fromFloat( f );
+	public static function fromFloat(f:Float):Int64 {
+		return Int64Helper.fromFloat(f);
 	}
 
-	/**
-		Performs signed integer divison of `dividend` by `divisor`.
-		Returns `{ quotient : Int64, modulus : Int64 }`.
-	**/
-	public static function divMod( dividend : Int64, divisor : Int64 ) : { quotient : Int64, modulus : Int64 }
-	{
-      var q = dividend/divisor;
+	public static function divMod(dividend:Int64, divisor:Int64):{quotient:Int64, modulus:Int64} {
+		var q = dividend / divisor;
 
-      if (isZero(divisor))
-	       throw "divide by zero";
+		if (isZero(divisor))
+			throw "divide by zero";
 
-      var m = dividend - q*divisor;
+		var m = dividend - q * divisor;
 
-      return { quotient : q, modulus : m };
+		return {quotient: q, modulus: m};
 	}
 
-	/**
-		Returns the negative of `x`.
-	**/
-	@:op(-A) public static #if !cppia inline #end function neg( x : Int64 ) : Int64
-      return __Int64.neg(x);
-
-	@:op(++A) private inline  function preIncrement() : Int64 {
-      #if cppia
-      this = this + make(0,1);
-      return this;
-      #else
+	@:op(-A)
+	public static #if !cppia inline #end function neg(x:Int64):Int64
+		return __Int64.neg(x);
+
+	@:op(++A) private inline function preIncrement():Int64 {
+		#if cppia
+		this = this + make(0, 1);
+		return this;
+		#else
 		return __Int64.preIncrement(this);
-      #end
+		#end
 	}
 
-	@:op(A++) private inline function postIncrement() : Int64 {
-      #if cppia
-      var result = this;
-      this = this + make(0,1);
-      return result;
-      #else
+	@:op(A++) private inline function postIncrement():Int64 {
+		#if cppia
+		var result = this;
+		this = this + make(0, 1);
+		return result;
+		#else
 		return __Int64.postIncrement(this);
-      #end
+		#end
 	}
 
-	@:op(--A) private inline function preDecrement() : Int64 {
-      #if cppia
-      untyped this = this - make(0,1);
-      return this;
-      #else
+	@:op(--A) private inline function preDecrement():Int64 {
+		#if cppia
+		untyped this = this - make(0, 1);
+		return this;
+		#else
 		return __Int64.preDecrement(this);
-      #end
+		#end
 	}
 
-	@:op(A--) private inline function postDecrement() : Int64 {
-      #if cppia
-      var result = this;
-      this = this - make(0,1);
-      return result;
-      #else
+	@:op(A--) private inline function postDecrement():Int64 {
+		#if cppia
+		var result = this;
+		this = this - make(0, 1);
+		return result;
+		#else
 		return __Int64.postDecrement(this);
-      #end
+		#end
 	}
 
-	/**
-		Returns the sum of `a` and `b`.
-	**/
-	@:op(A + B) public static #if !cppia inline #end function add( a : Int64, b : Int64 ) : Int64
-      return __Int64.add(a,b);
+	@:op(A + B)
+	public static #if !cppia inline #end function add(a:Int64, b:Int64):Int64
+		return __Int64.add(a, b);
 
-	@:op(A + B) @:commutative private static #if !cppia inline #end function addInt( a : Int64, b : Int ) : Int64
-      return __Int64.addInt(a,b);
+	@:op(A + B)
+	@:commutative
+	private static #if !cppia inline #end function addInt(a:Int64, b:Int):Int64
+		return __Int64.addInt(a, b);
 
-	/**
-		Returns `a` minus `b`.
-	**/
-	@:op(A - B) public static #if !cppia inline #end function sub( a : Int64, b : Int64 ) : Int64 {
-      return __Int64.sub(a,b);
+	@:op(A - B)
+	public static #if !cppia inline #end function sub(a:Int64, b:Int64):Int64 {
+		return __Int64.sub(a, b);
 	}
 
-	@:op(A - B) private static #if !cppia inline #end function subInt( a : Int64, b : Int ) : Int64
-		return __Int64.subInt( a, b );
+	@:op(A - B)
+	private static #if !cppia inline #end function subInt(a:Int64, b:Int):Int64
+		return __Int64.subInt(a, b);
 
-	@:op(A - B) private static #if !cppia inline #end function intSub( a : Int, b : Int64 ) : Int64
-		return __Int64.intSub( a, b );
+	@:op(A - B)
+	private static #if !cppia inline #end function intSub(a:Int, b:Int64):Int64
+		return __Int64.intSub(a, b);
 
-	/**
-		Returns the product of `a` and `b`.
-	**/
-	@:op(A * B) public static #if !cppia inline #end function mul( a : Int64, b : Int64 ) : Int64
-		return __Int64.mul( a, b );
+	@:op(A * B)
+	public static #if !cppia inline #end function mul(a:Int64, b:Int64):Int64
+		return __Int64.mul(a, b);
 
-	@:op(A * B) @:commutative private static #if !cppia inline #end function mulInt( a : Int64, b : Int ) : Int64
-		return mul( a, b );
+	@:op(A * B)
+	@:commutative
+	private static #if !cppia inline #end function mulInt(a:Int64, b:Int):Int64
+		return mul(a, b);
 
-	/**
-		Returns the quotient of `a` divided by `b`.
-	**/
-	@:op(A / B) public static #if !cppia inline #end function div( a : Int64, b : Int64 ) : Int64 {
+	@:op(A / B)
+	public static #if !cppia inline #end function div(a:Int64, b:Int64):Int64 {
 		if (__Int64.isZero(b))
 			throw "divide by zero";
-		return __Int64.div(a,b);
+		return __Int64.div(a, b);
 	}
 
+	@:op(A / B)
+	private static #if !cppia inline #end function divInt(a:Int64, b:Int):Int64
+		return div(a, b);
 
-	@:op(A / B) private static #if !cppia inline #end function divInt( a : Int64, b : Int ) : Int64
-		return div( a, b );
-
-	@:op(A / B) private static #if !cppia inline #end function intDiv( a : Int, b : Int64 ) : Int64
-		return toInt(div( a, b ));
+	@:op(A / B)
+	private static #if !cppia inline #end function intDiv(a:Int, b:Int64):Int64
+		return toInt(div(a, b));
 
-	/**
-		Returns the modulus of `a` divided by `b`.
-	**/
-	@:op(A % B) public static #if !cppia inline #end function mod( a : Int64, b : Int64 ) : Int64
-   {
+	@:op(A % B)
+	public static #if !cppia inline #end function mod(a:Int64, b:Int64):Int64 {
 		if (__Int64.isZero(b))
 			throw "divide by zero";
 		return __Int64.mod(a, b);
-   }
+	}
 
-	@:op(A % B) private static #if !cppia inline #end function modInt( a : Int64, b : Int ) : Int64
-		return toInt(mod( a, b ));
+	@:op(A % B)
+	private static #if !cppia inline #end function modInt(a:Int64, b:Int):Int64
+		return toInt(mod(a, b));
 
-	@:op(A % B) private static #if !cppia inline #end function intMod( a : Int, b : Int64 ) : Int64
-		return toInt(mod( a, b ));
+	@:op(A % B)
+	private static #if !cppia inline #end function intMod(a:Int, b:Int64):Int64
+		return toInt(mod(a, b));
 
-	/**
-		Returns `true` if `a` is equal to `b`.
-	**/
-	@:op(A == B) public static #if !cppia inline #end function eq( a : Int64, b : Int64 ) : Bool
-      return __Int64.eq(a,b);
+	@:op(A == B)
+	public static #if !cppia inline #end function eq(a:Int64, b:Int64):Bool
+		return __Int64.eq(a, b);
 
-	@:op(A == B) @:commutative private static #if !cppia inline #end function eqInt( a : Int64, b : Int ) : Bool
-		return __Int64.eqInt( a, b );
+	@:op(A == B)
+	@:commutative
+	private static #if !cppia inline #end function eqInt(a:Int64, b:Int):Bool
+		return __Int64.eqInt(a, b);
 
-	/**
-		Returns `true` if `a` is not equal to `b`.
-	**/
-	@:op(A != B) public static #if !cppia inline #end function neq( a : Int64, b : Int64 ) : Bool
-		return __Int64.neq( a, b );
+	@:op(A != B)
+	public static #if !cppia inline #end function neq(a:Int64, b:Int64):Bool
+		return __Int64.neq(a, b);
 
-	@:op(A != B) @:commutative private static #if !cppia inline #end function neqInt( a : Int64, b : Int ) : Bool
-		return neq( a, b );
+	@:op(A != B)
+	@:commutative
+	private static #if !cppia inline #end function neqInt(a:Int64, b:Int):Bool
+		return neq(a, b);
 
-	@:op(A < B) private static #if !cppia inline #end function lt( a : Int64, b : Int64 ) : Bool
+	@:op(A < B)
+	private static #if !cppia inline #end function lt(a:Int64, b:Int64):Bool
 		return compare(a, b) < 0;
 
-	@:op(A < B) private static #if !cppia inline #end function ltInt( a : Int64, b : Int ) : Bool
+	@:op(A < B)
+	private static #if !cppia inline #end function ltInt(a:Int64, b:Int):Bool
 		return lt(a, b);
 
-	@:op(A < B) private static #if !cppia inline #end function intLt( a : Int, b : Int64 ) : Bool
+	@:op(A < B)
+	private static #if !cppia inline #end function intLt(a:Int, b:Int64):Bool
 		return lt(a, b);
 
-	@:op(A <= B) private static #if !cppia inline #end function lte( a : Int64, b : Int64 ) : Bool
+	@:op(A <= B)
+	private static #if !cppia inline #end function lte(a:Int64, b:Int64):Bool
 		return compare(a, b) <= 0;
 
-	@:op(A <= B) private static #if !cppia inline #end function lteInt( a : Int64, b : Int ) : Bool
+	@:op(A <= B)
+	private static #if !cppia inline #end function lteInt(a:Int64, b:Int):Bool
 		return lte(a, b);
 
-	@:op(A <= B) private static #if !cppia inline #end function intLte( a : Int, b : Int64 ) : Bool
+	@:op(A <= B)
+	private static #if !cppia inline #end function intLte(a:Int, b:Int64):Bool
 		return lte(a, b);
 
-	@:op(A > B) private static #if !cppia inline #end function gt( a : Int64, b : Int64 ) : Bool
+	@:op(A > B)
+	private static #if !cppia inline #end function gt(a:Int64, b:Int64):Bool
 		return compare(a, b) > 0;
 
-	@:op(A > B) private static #if !cppia inline #end function gtInt( a : Int64, b : Int ) : Bool
+	@:op(A > B)
+	private static #if !cppia inline #end function gtInt(a:Int64, b:Int):Bool
 		return gt(a, b);
 
-	@:op(A > B) private static #if !cppia inline #end function intGt( a : Int, b : Int64 ) : Bool
-		return gt( a, b );
+	@:op(A > B)
+	private static #if !cppia inline #end function intGt(a:Int, b:Int64):Bool
+		return gt(a, b);
 
-	@:op(A >= B) private static #if !cppia inline #end function gte( a : Int64, b : Int64 ) : Bool
+	@:op(A >= B)
+	private static #if !cppia inline #end function gte(a:Int64, b:Int64):Bool
 		return compare(a, b) >= 0;
 
-	@:op(A >= B) private static #if !cppia inline #end function gteInt( a : Int64, b : Int ) : Bool
+	@:op(A >= B)
+	private static #if !cppia inline #end function gteInt(a:Int64, b:Int):Bool
 		return gte(a, b);
 
-	@:op(A >= B) private static #if !cppia inline #end function intGte( a : Int, b : Int64 ) : Bool
+	@:op(A >= B)
+	private static #if !cppia inline #end function intGte(a:Int, b:Int64):Bool
 		return gte(a, b);
 
-	/**
-		Returns the bitwise NOT of `a`.
-	**/
-	@:op(~A) private static #if !cppia inline #end function complement( a : Int64 ) : Int64
-      return __Int64.complement(a);
-
-	/**
-		Returns the bitwise AND of `a` and `b`.
-	**/
-	@:op(A & B) public static #if !cppia inline #end function and( a : Int64, b : Int64 ) : Int64
-      return __Int64.bitAnd(a,b);
-
-	/**
-		Returns the bitwise OR of `a` and `b`.
-	**/
-	@:op(A | B) public static #if !cppia inline #end function or( a : Int64, b : Int64 ) : Int64
-      return __Int64.bitOr(a,b);
-
-	/**
-		Returns the bitwise XOR of `a` and `b`.
-	**/
-	@:op(A ^ B) public static #if !cppia inline #end function xor( a : Int64, b : Int64 ) : Int64
-      return __Int64.bitXor(a,b);
-
-	/**
-		Returns `a` left-shifted by `b` bits.
-	**/
-	@:op(A << B) public static #if !cppia inline #end function shl( a : Int64, b : Int ) : Int64
-      return __Int64.shl(a,b);
-
-	/**
-		Returns `a` right-shifted by `b` bits in signed mode.
-		`a` is sign-extended.
-	**/
-	@:op(A >> B) public static #if !cppia inline #end function shr( a : Int64, b : Int) : Int64
-      return __Int64.shr(a,b);
-
-	/**
-		Returns `a` right-shifted by `b` bits in unsigned mode.
-		`a` is padded with zeroes.
-	**/
-	@:op(A >>> B) public static #if !cppia inline #end function ushr( a : Int64, b : Int ) : Int64
-      return __Int64.ushr(a,b);
-
-	public var high(get, never) : Int32;
-	private #if !cppia inline #end function get_high() : Int32
-      return __Int64.high(this);
-
-	public var low(get, never) : Int32;
-	private #if !cppia inline #end function get_low() : Int32
-      return __Int64.low(this);
+	@:op(~A)
+	private static #if !cppia inline #end function complement(a:Int64):Int64
+		return __Int64.complement(a);
 
-}
+	@:op(A & B)
+	public static #if !cppia inline #end function and(a:Int64, b:Int64):Int64
+		return __Int64.bitAnd(a, b);
+
+	@:op(A | B)
+	public static #if !cppia inline #end function or(a:Int64, b:Int64):Int64
+		return __Int64.bitOr(a, b);
+
+	@:op(A ^ B)
+	public static #if !cppia inline #end function xor(a:Int64, b:Int64):Int64
+		return __Int64.bitXor(a, b);
+
+	@:op(A << B)
+	public static #if !cppia inline #end function shl(a:Int64, b:Int):Int64
+		return __Int64.shl(a, b);
 
+	@:op(A >> B)
+	public static #if !cppia inline #end function shr(a:Int64, b:Int):Int64
+		return __Int64.shr(a, b);
+
+	@:op(A >>> B)
+	public static #if !cppia inline #end function ushr(a:Int64, b:Int):Int64
+		return __Int64.ushr(a, b);
+
+	public var high(get, never):Int32;
+
+	private #if !cppia inline #end function get_high():Int32
+		return __Int64.high(this);
+
+	public var low(get, never):Int32;
+
+	private #if !cppia inline #end function get_low():Int32
+		return __Int64.low(this);
+}
diff --git a/std/cpp/_std/haxe/Log.hx b/std/cpp/_std/haxe/Log.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c02376eaf03273b1fde7485dac7b58d0ff6d0d3f
--- /dev/null
+++ b/std/cpp/_std/haxe/Log.hx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)2005-2019 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 haxe;
+
+@:coreApi class Log {
+	@:native("__trace")
+	extern private static function nativeTrace(message:String, posInfo:Dynamic):Void;
+
+	public static dynamic function trace(v:Dynamic, ?infos:PosInfos):Void {
+		if (infos != null && infos.customParams != null) {
+			var extra:String = "";
+			for (v in infos.customParams)
+				extra += "," + v;
+			nativeTrace(v + extra, infos);
+		} else
+			nativeTrace(v, infos);
+	}
+
+	public static function formatOutput(v:Dynamic, infos:PosInfos):String {
+		var str = Std.string(v);
+		if (infos == null)
+			return str;
+		var pstr = infos.fileName + ":" + infos.lineNumber;
+		if (infos != null && infos.customParams != null)
+			for (v in infos.customParams)
+				str += ", " + Std.string(v);
+		return pstr + ": " + str;
+	}
+}
diff --git a/std/cpp/_std/haxe/Resource.hx b/std/cpp/_std/haxe/Resource.hx
index e59d97a74680e1c0a9105c2f88549a3cfee076cc..6f574b3bd7d09766364a7a38224c1b691cb6a7a2 100644
--- a/std/cpp/_std/haxe/Resource.hx
+++ b/std/cpp/_std/haxe/Resource.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,23 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 @:coreApi
 class Resource {
-
-	public static function listNames() : Array<String> {
+	public static function listNames():Array<String> {
 		return untyped __global__.__hxcpp_resource_names();
 	}
-	public static function getString(name:String) : String {
+
+	public static function getString(name:String):String {
 		return untyped __global__.__hxcpp_resource_string(name);
 	}
-	public static function getBytes(name:String) : haxe.io.Bytes {
+
+	public static function getBytes(name:String):haxe.io.Bytes {
 		var array:haxe.io.BytesData = untyped __global__.__hxcpp_resource_bytes(name);
-		if (array==null) return null;
+		if (array == null)
+			return null;
 		return haxe.io.Bytes.ofData(array);
 	}
-
 }
diff --git a/std/cpp/_std/haxe/Utf8.hx b/std/cpp/_std/haxe/Utf8.hx
index ff6e0501804b4b4893356031a535f29e02b78dfa..accd2da739cec4517b36ddf42311dc2fec26cc06 100644
--- a/std/cpp/_std/haxe/Utf8.hx
+++ b/std/cpp/_std/haxe/Utf8.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,69 +19,67 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 using cpp.NativeString;
 
 @:coreApi
-class Utf8
-{
-   var __s:Array<Int>;
-
-	public function new( ?size : Null<Int> ) : Void {
-      __s = new Array<Int>();
-      if (size!=null && size>0)
-         cpp.NativeArray.reserve(__s,size);
+@:deprecated('haxe.Utf8 is deprecated. Use UnicodeString instead.')
+class Utf8 {
+	var __s:Array<Int>;
+
+	public function new(?size:Null<Int>):Void {
+		__s = new Array<Int>();
+		if (size != null && size > 0)
+			cpp.NativeArray.reserve(__s, size);
 	}
 
-	public function addChar( c : Int ) : Void {
-      __s.push(c);
+	public function addChar(c:Int):Void {
+		__s.push(c);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		return untyped __global__.__hxcpp_char_array_to_utf8_string(__s);
 	}
 
-   // Incoming string is array of bytes containing possibly invalid utf8 chars
-   // Result is the same string with the bytes expanded into utf8 sequences
-	public static function encode( s : String ) : String {
+	// Incoming string is array of bytes containing possibly invalid utf8 chars
+	// Result is the same string with the bytes expanded into utf8 sequences
+	public static function encode(s:String):String {
 		return untyped __global__.__hxcpp_char_bytes_to_utf8_string(s);
 	}
 
-   // Incoming string is array of bytes representing valid utf8 chars
-   // Result is a string containing the compressed bytes
-	public static function decode( s : String ) : String {
+	// Incoming string is array of bytes representing valid utf8 chars
+	// Result is a string containing the compressed bytes
+	public static function decode(s:String):String {
 		return untyped __global__.__hxcpp_utf8_string_to_char_bytes(s);
 	}
 
-	public #if !cppia inline #end static function iter( s : String, chars : Int -> Void ) : Void {
-      var src = s.c_str();
-      var end = src.add( s.length );
+	public #if !cppia inline #end static function iter(s:String, chars:Int->Void):Void {
+		var src = s.c_str();
+		var end = src.add(s.length);
 
-      while(src.lt(end))
-         chars(src.ptr.utf8DecodeAdvance());
+		while (src.lt(end))
+			chars(src.ptr.utf8DecodeAdvance());
 	}
 
-	public static function charCodeAt( s : String, index : Int ) : Int {
-      return s.utf8CharCodeAt(index);
+	public static function charCodeAt(s:String, index:Int):Int {
+		return s.utf8CharCodeAt(index);
 	}
 
-	public static function validate( s : String ) : Bool {
-      return s.utf8IsValid();
+	public static function validate(s:String):Bool {
+		return s.utf8IsValid();
 	}
 
-	public static function length( s : String ) : Int {
-      return s.utf8Length();
+	public static function length(s:String):Int {
+		return s.utf8Length();
 	}
 
-	public static function compare( a : String, b : String ) : Int {
-      return a.compare(b);
+	public static function compare(a:String, b:String):Int {
+		return a.compare(b);
 	}
 
-	public static function sub( s : String, pos : Int, len : Int ) : String {
-      return s.utf8Sub(pos,len);
+	public static function sub(s:String, pos:Int, len:Int):String {
+		return s.utf8Sub(pos, len);
 	}
-
 }
-
-
diff --git a/std/cpp/_std/haxe/ds/IntMap.hx b/std/cpp/_std/haxe/ds/IntMap.hx
index 24645e1221e7e381a56830a53a5e95b46273d9d5..590f1e6afec34dab843d6a317b182868f9938905 100644
--- a/std/cpp/_std/haxe/ds/IntMap.hx
+++ b/std/cpp/_std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,66 +19,124 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 @:headerClassCode("
-  inline void set(int key, ::null value) { __int_hash_set(h,key,value); }
-  inline void set(int key, bool value) { __int_hash_set(h,key,value); }
-  inline void set(int key, char value) { __int_hash_set_int(h,key,value); }
-  inline void set(int key, unsigned char value) { __int_hash_set_int(h,key,value); }
-  inline void set(int key, signed char value) { __int_hash_set_int(h,key,value); }
-  inline void set(int key, short value) { __int_hash_set_int(h,key,value); }
-  inline void set(int key, unsigned short value) { __int_hash_set_int(h,key,value); }
-  inline void set(int key, int value) { __int_hash_set_int(h,key,value); }
-  inline void set(int key, unsigned int value) { __int_hash_set_int(h,key,value); }
-  inline void set(int key, float value) { __int_hash_set_float(h,key,value); }
-  inline void set(int key, double value) { __int_hash_set_float(h,key,value); }
-  inline void set(int key, ::String value) { __int_hash_set_string(h,key,value); }
+  inline void set(int key, ::null value) { __int_hash_set(HX_MAP_THIS,key,value); }
+  inline void set(int key, bool value) { __int_hash_set(HX_MAP_THIS,key,value); }
+  inline void set(int key, char value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(int key, unsigned char value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(int key, signed char value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(int key, short value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(int key, unsigned short value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(int key, int value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(int key, unsigned int value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(int key, float value) { __int_hash_set_float(HX_MAP_THIS,key,value); }
+  inline void set(int key, double value) { __int_hash_set_float(HX_MAP_THIS,key,value); }
+  inline void set(int key, ::String value) { __int_hash_set_string(HX_MAP_THIS,key,value); }
 
   template<typename V, typename H>
-  inline void set(int key, const ::cpp::Struct<V,H> &value) {__int_hash_set(h,key,value); }
+  inline void set(int key, const ::cpp::Struct<V,H> &value) {__int_hash_set(HX_MAP_THIS,key,value); }
   template<typename F>
-  inline void set(int key, const ::cpp::Function<F> &value) {__int_hash_set(h,key,value); }
+  inline void set(int key, const ::cpp::Function<F> &value) {__int_hash_set(HX_MAP_THIS,key,value); }
   template<typename V>
-  inline void set(int key, const ::cpp::Pointer<V> &value) {__int_hash_set(h,key,(Dynamic)value ); }
+  inline void set(int key, const ::cpp::Pointer<V> &value) {__int_hash_set(HX_MAP_THIS,key,(Dynamic)value ); }
 
   template<typename VALUE>
   inline void set(Dynamic &key, const VALUE &value) { set( (int)key, value ); }
-")
-@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
 
+  inline bool get_bool(int key) { return __int_hash_get_bool(h,key); }
+  inline int get_int(int key) { return __int_hash_get_int(h,key); }
+  inline Float get_float(int key) { return __int_hash_get_float(h,key); }
+  inline String get_string(int key) { return __int_hash_get_string(h,key); }
+")
+@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
 	@:ifFeature("haxe.ds.IntMap.*")
-	private var h : Dynamic;
+	private var h:Dynamic;
 
-	public function new() : Void { }
+	public function new():Void {}
 
-	public function set( key : Int, value : T ) : Void {
-		untyped __global__.__int_hash_set(h,key,value);
+	public function set(key:Int, value:T):Void {
+		untyped __global__.__int_hash_set(__cpp__("HX_MAP_THIS"), key, value);
 	}
 
-	public function get( key : Int ) : Null<T> {
-		return untyped __global__.__int_hash_get(h,key);
+	public function get(key:Int):Null<T> {
+		return untyped __global__.__int_hash_get(h, key);
 	}
 
-	public function exists( key : Int ) : Bool {
-		return untyped __global__.__int_hash_exists(h,key);
+	public function exists(key:Int):Bool {
+		return untyped __global__.__int_hash_exists(h, key);
 	}
 
-	public function remove( key : Int ) : Bool {
-		return untyped __global__.__int_hash_remove(h,key);
+	public function remove(key:Int):Bool {
+		return untyped __global__.__int_hash_remove(h, key);
 	}
 
-	public function keys() : Iterator<Int> {
+	public function keys():Iterator<Int> {
 		var a:Array<Int> = untyped __global__.__int_hash_keys(h);
 		return a.iterator();
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		var a:Array<Dynamic> = untyped __global__.__int_hash_values(h);
 		return a.iterator();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():IntMap<T> {
+		var copied = new IntMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		return untyped __global__.__int_hash_to_string(h);
 	}
+
+	public function clear():Void {
+		#if (hxcpp_api_level >= 400)
+		return untyped __global__.__int_hash_clear(h);
+		#else
+		h = null;
+		#end
+	}
+
+	#if (scriptable)
+	private function setString(key:Int, val:String):Void {
+		untyped __int_hash_set_string(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function setInt(key:Int, val:Int):Void {
+		untyped __int_hash_set_int(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function setBool(key:Int, val:Bool):Void {
+		untyped __int_hash_set_int(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function setFloat(key:Int, val:Float):Void {
+		untyped __int_hash_set_float(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function getString(key:Int):String {
+		return untyped __int_hash_get_string(h, key);
+	}
+
+	private function getInt(key:Int):Int {
+		return untyped __int_hash_get_int(h, key);
+	}
+
+	private function getBool(key:Int):Bool {
+		return untyped __int_hash_get_bool(h, key);
+	}
+
+	private function getFloat(key:Int):Float {
+		return untyped __int_hash_get_float(h, key);
+	}
+	#end
 }
diff --git a/std/cpp/_std/haxe/ds/ObjectMap.hx b/std/cpp/_std/haxe/ds/ObjectMap.hx
index 4dd8ba34284740f442ef31651bf3904840dadc7f..e078a5ae132ba7e703b660ad09241ce46aa0a2ba 100644
--- a/std/cpp/_std/haxe/ds/ObjectMap.hx
+++ b/std/cpp/_std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,65 +19,124 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 @:headerClassCode("
-  inline void set(Dynamic key, ::null value) { __object_hash_set(h,key,value); }
-  inline void set(Dynamic key, bool value) { __object_hash_set(h,key,value); }
-  inline void set(Dynamic key, char value) { __object_hash_set_int(h,key,value); }
-  inline void set(Dynamic key, unsigned char value) { __object_hash_set_int(h,key,value); }
-  inline void set(Dynamic key, signed char value) { __object_hash_set_int(h,key,value); }
-  inline void set(Dynamic key, short value) { __object_hash_set_int(h,key,value); }
-  inline void set(Dynamic key, unsigned short value) { __object_hash_set_int(h,key,value); }
-  inline void set(Dynamic key, int value) { __object_hash_set_int(h,key,value); }
-  inline void set(Dynamic key, unsigned int value) { __object_hash_set_int(h,key,value); }
-  inline void set(Dynamic key, float value) { __object_hash_set_float(h,key,value); }
-  inline void set(Dynamic key, double value) { __object_hash_set_float(h,key,value); }
-  inline void set(Dynamic key, ::String value) { __object_hash_set_string(h,key,value); }
+  inline void set(Dynamic key, ::null value) { __object_hash_set(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, bool value) { __object_hash_set(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, char value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, unsigned char value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, signed char value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, short value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, unsigned short value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, int value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, unsigned int value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, float value) { __object_hash_set_float(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, double value) { __object_hash_set_float(HX_MAP_THIS,key,value); }
+  inline void set(Dynamic key, ::String value) { __object_hash_set_string(HX_MAP_THIS,key,value); }
 
 
   template<typename V, typename H>
-  inline void set(Dynamic key, const ::cpp::Struct<V,H> &value) {__object_hash_set(h,key,value); }
+  inline void set(Dynamic key, const ::cpp::Struct<V,H> &value) {__object_hash_set(HX_MAP_THIS,key,value); }
   template<typename V>
-  inline void set(Dynamic key, const ::cpp::Function<V> &value) {__object_hash_set(h,key,(Dynamic)value ); }
+  inline void set(Dynamic key, const ::cpp::Function<V> &value) {__object_hash_set(HX_MAP_THIS,key,(Dynamic)value ); }
   template<typename V>
-  inline void set(Dynamic key, const ::cpp::Pointer<V> &value) {__object_hash_set(h,key,(Dynamic)value ); }
+  inline void set(Dynamic key, const ::cpp::Pointer<V> &value) {__object_hash_set(HX_MAP_THIS,key,(Dynamic)value ); }
+
+  inline bool get_bool(Dynamic key) { return __object_hash_get_bool(h,key); }
+  inline int get_int(Dynamic key) { return __object_hash_get_int(h,key); }
+  inline Float get_float(Dynamic key) { return __object_hash_get_float(h,key); }
+  inline String get_string(Dynamic key) { return __object_hash_get_string(h,key); }
 
 ")
 @:coreApi
-class ObjectMap<K:{},V> implements haxe.Constraints.IMap<K,V> {
+class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
 	@:ifFeature("haxe.ds.ObjectMap.*")
-	private var h : Dynamic;
+	private var h:Dynamic;
 
-	public function new() : Void { }
+	public function new():Void {}
 
-	public function set( key : K, value : V ) : Void {
-		untyped __global__.__object_hash_set(h,key,value);
+	public function set(key:K, value:V):Void {
+		untyped __global__.__object_hash_set(__cpp__("HX_MAP_THIS"), key, value);
 	}
 
-	public function get( key : K ) : Null<V> {
-		return untyped __global__.__object_hash_get(h,key);
+	public function get(key:K):Null<V> {
+		return untyped __global__.__object_hash_get(h, key);
 	}
 
-	public function exists( key : K ) : Bool {
-		return untyped __global__.__object_hash_exists(h,key);
+	public function exists(key:K):Bool {
+		return untyped __global__.__object_hash_exists(h, key);
 	}
 
-	public function remove( key : K ) : Bool {
-		return untyped __global__.__object_hash_remove(h,key);
+	public function remove(key:K):Bool {
+		return untyped __global__.__object_hash_remove(h, key);
 	}
 
-	public function keys() : Iterator<K> {
+	public function keys():Iterator<K> {
 		var a:Array<K> = untyped __global__.__object_hash_keys(h);
 		return a.iterator();
 	}
 
-	public function iterator() : Iterator<V> {
+	public function iterator():Iterator<V> {
 		var a:Array<Dynamic> = untyped __global__.__object_hash_values(h);
 		return a.iterator();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():ObjectMap<K, V> {
+		var copied = new ObjectMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		return untyped __global__.__object_hash_to_string(h);
 	}
+
+	public function clear():Void {
+		#if (hxcpp_api_level >= 400)
+		return untyped __global__.__object_hash_clear(h);
+		#else
+		h = null;
+		#end
+	}
+
+	#if (scriptable)
+	private function setString(key:Dynamic, val:String):Void {
+		untyped __object_hash_set_string(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function setInt(key:Dynamic, val:Int):Void {
+		untyped __object_hash_set_int(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function setBool(key:Dynamic, val:Bool):Void {
+		untyped __object_hash_set_int(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function setFloat(key:Dynamic, val:Float):Void {
+		untyped __object_hash_set_float(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function getString(key:Dynamic):String {
+		return untyped __object_hash_get_string(h, key);
+	}
+
+	private function getInt(key:Dynamic):Int {
+		return untyped __object_hash_get_int(h, key);
+	}
+
+	private function getBool(key:Dynamic):Bool {
+		return untyped __object_hash_get_bool(h, key);
+	}
+
+	private function getFloat(key:Dynamic):Float {
+		return untyped __object_hash_get_float(h, key);
+	}
+	#end
 }
diff --git a/std/cpp/_std/haxe/ds/StringMap.hx b/std/cpp/_std/haxe/ds/StringMap.hx
index 5fdf58eea6c77540309efb18671be989dc1e7d04..5147beac8a6f42edf0a0581ad19af2e2fd0d863d 100644
--- a/std/cpp/_std/haxe/ds/StringMap.hx
+++ b/std/cpp/_std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,65 +19,124 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 @:headerClassCode("
-  inline void set(String key, ::null value) { __string_hash_set(h,key,value); }
-  inline void set(String key, bool value) { __string_hash_set(h,key,value); }
-  inline void set(String key, char value) { __string_hash_set_int(h,key,value); }
-  inline void set(String key, unsigned char value) { __string_hash_set_int(h,key,value); }
-  inline void set(String key, signed char value) { __string_hash_set_int(h,key,value); }
-  inline void set(String key, short value) { __string_hash_set_int(h,key,value); }
-  inline void set(String key, unsigned short value) { __string_hash_set_int(h,key,value); }
-  inline void set(String key, int value) { __string_hash_set_int(h,key,value); }
-  inline void set(String key, unsigned int value) { __string_hash_set_int(h,key,value); }
-  inline void set(String key, float value) { __string_hash_set_float(h,key,value); }
-  inline void set(String key, double value) { __string_hash_set_float(h,key,value); }
-  inline void set(String key, ::String value) { __string_hash_set_string(h,key,value); }
+  inline void set(String key, ::null value) { __string_hash_set(HX_MAP_THIS,key,value); }
+  inline void set(String key, bool value) { __string_hash_set(HX_MAP_THIS,key,value); }
+  inline void set(String key, char value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(String key, unsigned char value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(String key, signed char value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(String key, short value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(String key, unsigned short value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(String key, int value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(String key, unsigned int value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
+  inline void set(String key, float value) { __string_hash_set_float(HX_MAP_THIS,key,value); }
+  inline void set(String key, double value) { __string_hash_set_float(HX_MAP_THIS,key,value); }
+  inline void set(String key, ::String value) { __string_hash_set_string(HX_MAP_THIS,key,value); }
 
   template<typename V, typename H>
-  inline void set(String key, const ::cpp::Struct<V,H> &value) {__string_hash_set(h,key,value); }
+  inline void set(String key, const ::cpp::Struct<V,H> &value) {__string_hash_set(HX_MAP_THIS,key,value); }
   template<typename V>
-  inline void set(String key, const ::cpp::Function<V> &value) {__string_hash_set(h,key,(Dynamic)value ); }
+  inline void set(String key, const ::cpp::Function<V> &value) {__string_hash_set(HX_MAP_THIS,key,(Dynamic)value ); }
   template<typename V>
-  inline void set(String key, const ::cpp::Pointer<V> &value) {__string_hash_set(h,key,(Dynamic)value ); }
+  inline void set(String key, const ::cpp::Pointer<V> &value) {__string_hash_set(HX_MAP_THIS,key,(Dynamic)value ); }
 
   template<typename VALUE>
   inline void set(Dynamic &key, const VALUE &value) { set( (String)key, value ); }
+
+  inline bool get_bool(String key) { return __string_hash_get_bool(h,key); }
+  inline int get_int(String key) { return __string_hash_get_int(h,key); }
+  inline Float get_float(String key) { return __string_hash_get_float(h,key); }
+  inline String get_string(String key) { return __string_hash_get_string(h,key); }
 ")
-@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String,T> {
+@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String, T> {
 	@:ifFeature("haxe.ds.StringMap.*")
-	private var h : Dynamic;
+	private var h:Dynamic;
 
-	public function new() : Void { }
+	public function new():Void {}
 
-	public function set( key : String, value : T ) : Void {
-		untyped __global__.__string_hash_set(h,key,value);
+	public function set(key:String, value:T):Void {
+		untyped __global__.__string_hash_set(__cpp__("HX_MAP_THIS"), key, value);
 	}
 
-	public function get( key : String ) : Null<T> {
-		return untyped __global__.__string_hash_get(h,key);
+	public function get(key:String):Null<T> {
+		return untyped __global__.__string_hash_get(h, key);
 	}
 
-	public function exists( key : String ) : Bool {
-		return untyped __global__.__string_hash_exists(h,key);
+	public function exists(key:String):Bool {
+		return untyped __global__.__string_hash_exists(h, key);
 	}
 
-	public function remove( key : String ) : Bool {
-		return untyped __global__.__string_hash_remove(h,key);
+	public function remove(key:String):Bool {
+		return untyped __global__.__string_hash_remove(h, key);
 	}
 
-	public function keys() : Iterator<String> {
+	public function keys():Iterator<String> {
 		var a:Array<String> = untyped __global__.__string_hash_keys(h);
 		return a.iterator();
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		var a:Array<Dynamic> = untyped __global__.__string_hash_values(h);
 		return a.iterator();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():StringMap<T> {
+		var copied = new StringMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		return untyped __global__.__string_hash_to_string(h);
 	}
+
+	public function clear():Void {
+		#if (hxcpp_api_level >= 400)
+		return untyped __global__.__string_hash_clear(h);
+		#else
+		h = null;
+		#end
+	}
+
+	#if (scriptable)
+	private function setString(key:String, val:String):Void {
+		untyped __string_hash_set_string(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function setInt(key:String, val:Int):Void {
+		untyped __string_hash_set_int(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function setBool(key:String, val:Bool):Void {
+		untyped __string_hash_set_int(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function setFloat(key:String, val:Float):Void {
+		untyped __string_hash_set_float(__cpp__("HX_MAP_THIS"), key, val);
+	}
+
+	private function getString(key:String):String {
+		return untyped __string_hash_get_string(h, key);
+	}
+
+	private function getInt(key:String):Int {
+		return untyped __string_hash_get_int(h, key);
+	}
+
+	private function getBool(key:String):Bool {
+		return untyped __string_hash_get_bool(h, key);
+	}
+
+	private function getFloat(key:String):Float {
+		return untyped __string_hash_get_float(h, key);
+	}
+	#end
 }
diff --git a/std/cpp/_std/haxe/ds/WeakMap.hx b/std/cpp/_std/haxe/ds/WeakMap.hx
index 0b7b34e0ce8812d6352d30091dfb9029ab9882e3..728574f47b6db54393e14bf9ac417238c5729ecb 100644
--- a/std/cpp/_std/haxe/ds/WeakMap.hx
+++ b/std/cpp/_std/haxe/ds/WeakMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,63 +19,83 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 @:headerClassCode("
-  inline void set(Dynamic key, ::null value) { __object_hash_set(h,key,value,true); }
-  inline void set(Dynamic key, bool value) { __object_hash_set(h,key,value,true); }
-  inline void set(Dynamic key, char value) { __object_hash_set_int(h,key,value,true); }
-  inline void set(Dynamic key, unsigned char value) { __object_hash_set_int(h,key,value,true); }
-  inline void set(Dynamic key, signed char value) { __object_hash_set_int(h,key,value,true); }
-  inline void set(Dynamic key, short value) { __object_hash_set_int(h,key,value,true); }
-  inline void set(Dynamic key, unsigned short value) { __object_hash_set_int(h,key,value,true); }
-  inline void set(Dynamic key, int value) { __object_hash_set_int(h,key,value,true); }
-  inline void set(Dynamic key, unsigned int value) { __object_hash_set_int(h,key,value,true); }
-  inline void set(Dynamic key, float value) { __object_hash_set_float(h,key,value,true); }
-  inline void set(Dynamic key, double value) { __object_hash_set_float(h,key,value,true); }
-  inline void set(Dynamic key, ::String value) { __object_hash_set_string(h,key,value,true); }
+  inline void set(Dynamic key, ::null value) { __object_hash_set(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, bool value) { __object_hash_set(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, char value) { __object_hash_set_int(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, unsigned char value) { __object_hash_set_int(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, signed char value) { __object_hash_set_int(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, short value) { __object_hash_set_int(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, unsigned short value) { __object_hash_set_int(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, int value) { __object_hash_set_int(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, unsigned int value) { __object_hash_set_int(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, float value) { __object_hash_set_float(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, double value) { __object_hash_set_float(HX_MAP_THIS,key,value,true); }
+  inline void set(Dynamic key, ::String value) { __object_hash_set_string(HX_MAP_THIS,key,value,true); }
 
   template<typename V, typename H>
-  inline void set(Dynamic key, const ::cpp::Struct<V,H> &value) {__object_hash_set(h,key,value,true); }
+  inline void set(Dynamic key, const ::cpp::Struct<V,H> &value) {__object_hash_set(HX_MAP_THIS,key,value,true); }
   template<typename V>
-  inline void set(Dynamic key, const ::cpp::Pointer<V> &value) {__object_hash_set(h,key,(Dynamic)value,true ); }
+  inline void set(Dynamic key, const ::cpp::Pointer<V> &value) {__object_hash_set(HX_MAP_THIS,key,(Dynamic)value,true ); }
   template<typename V>
-  inline void set(Dynamic key, const ::cpp::Function<V> &value) {__object_hash_set(h,key,(Dynamic)value,true ); }
+  inline void set(Dynamic key, const ::cpp::Function<V> &value) {__object_hash_set(HX_MAP_THIS,key,(Dynamic)value,true ); }
 ")
 @:coreApi
-class WeakMap<K:{},V> implements haxe.Constraints.IMap<K,V> {
+class WeakMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
 	@:ifFeature("haxe.ds.WeakMap.*")
-	private var h : Dynamic;
+	private var h:Dynamic;
 
-	public function new() : Void { }
+	public function new():Void {}
 
-	public function set( key : K, value : V ) : Void {
-		untyped __global__.__object_hash_set(h,key,value,true);
+	public function set(key:K, value:V):Void {
+		untyped __global__.__object_hash_set(__cpp__("HX_MAP_THIS"), key, value, true);
 	}
 
-	public function get( key : K ) : Null<V> {
-		return untyped __global__.__object_hash_get(h,key);
+	public function get(key:K):Null<V> {
+		return untyped __global__.__object_hash_get(h, key);
 	}
 
-	public function exists( key : K ) : Bool {
-		return untyped __global__.__object_hash_exists(h,key);
+	public function exists(key:K):Bool {
+		return untyped __global__.__object_hash_exists(h, key);
 	}
 
-	public function remove( key : K ) : Bool {
-		return untyped __global__.__object_hash_remove(h,key);
+	public function remove(key:K):Bool {
+		return untyped __global__.__object_hash_remove(h, key);
 	}
 
-	public function keys() : Iterator<K> {
+	public function keys():Iterator<K> {
 		var a:Array<K> = untyped __global__.__object_hash_keys(h);
 		return a.iterator();
 	}
 
-	public function iterator() : Iterator<V> {
+	public function iterator():Iterator<V> {
 		var a:Array<Dynamic> = untyped __global__.__object_hash_values(h);
 		return a.iterator();
 	}
 
-	public function toString() : String {
+	public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():WeakMap<K, V> {
+		var copied = new WeakMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		return untyped __global__.__object_hash_to_string(h);
 	}
+
+	public function clear():Void {
+		#if (hxcpp_api_level >= 400)
+		return untyped __global__.__object_hash_clear(h);
+		#else
+		h = null;
+		#end
+	}
 }
diff --git a/std/cpp/_std/haxe/zip/Compress.hx b/std/cpp/_std/haxe/zip/Compress.hx
index afa69eb3c3fa643304b4979ca3d376777ade2d44..4d7ef850d118052e52d32fcbe3380746b5196d40 100644
--- a/std/cpp/_std/haxe/zip/Compress.hx
+++ b/std/cpp/_std/haxe/zip/Compress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,53 +19,53 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 @:coreApi @:buildXml('<include name="${HXCPP}/src/hx/libs/zlib/Build.xml" />')
 class Compress {
+	var s:Dynamic;
 
-	var s : Dynamic;
-
-	public function new( level : Int ) : Void {
+	public function new(level:Int):Void {
 		s = _deflate_init(level);
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
-		return _deflate_buffer(s,src.getData(),srcPos,dst.getData(),dstPos);
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
+		return _deflate_buffer(s, src.getData(), srcPos, dst.getData(), dstPos);
 	}
 
-	public function setFlushMode( f : FlushMode ) : Void {
-		_set_flush_mode(s,Std.string(f));
+	public function setFlushMode(f:FlushMode):Void {
+		_set_flush_mode(s, Std.string(f));
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		_deflate_end(s);
 	}
 
-	public static function run( s : haxe.io.Bytes, level : Int ) : haxe.io.Bytes {
+	public static function run(s:haxe.io.Bytes, level:Int):haxe.io.Bytes {
 		var c = new Compress(level);
 		c.setFlushMode(FlushMode.FINISH);
-		var out = haxe.io.Bytes.alloc(_deflate_bound(c.s,s.length));
-		var r = c.execute(s,0,out,0);
+		var out = haxe.io.Bytes.alloc(_deflate_bound(c.s, s.length));
+		var r = c.execute(s, 0, out, 0);
 		c.close();
-		if( !r.done || r.read != s.length )
+		if (!r.done || r.read != s.length)
 			throw "Compression failed";
-		return out.sub(0,r.write);
+		return out.sub(0, r.write);
 	}
 
-   @:extern @:native("_hx_deflate_init")
-	static function _deflate_init(level:Int) : Dynamic return null;
-
-   @:extern @:native("_hx_deflate_bound")
-	static function _deflate_bound(handle:Dynamic,length:Int):Int return 0;
+	@:native("_hx_deflate_init")
+	extern static function _deflate_init(level:Int):Dynamic;
 
-   @:extern @:native("_hx_deflate_buffer")
-	static function _deflate_buffer(handle:Dynamic, src:haxe.io.BytesData, srcPos:Int,  dest:haxe.io.BytesData, destPos:Int) : { done : Bool, read : Int, write : Int } return null;
+	@:native("_hx_deflate_bound")
+	extern static function _deflate_bound(handle:Dynamic, length:Int):Int;
 
-   @:extern @:native("_hx_deflate_end")
-	static function _deflate_end(handle:Dynamic) : Void { }
+	@:native("_hx_deflate_buffer")
+	extern static function _deflate_buffer(handle:Dynamic, src:haxe.io.BytesData, srcPos:Int, dest:haxe.io.BytesData,
+		destPos:Int):{done:Bool, read:Int, write:Int};
 
-   @:extern @:native("_hx_zip_set_flush_mode")
-	static function _set_flush_mode(handle:Dynamic, flushMode:String):Void { }
+	@:native("_hx_deflate_end")
+	extern static function _deflate_end(handle:Dynamic):Void;
 
+	@:native("_hx_zip_set_flush_mode")
+	extern static function _set_flush_mode(handle:Dynamic, flushMode:String):Void;
 }
diff --git a/std/cpp/_std/haxe/zip/Uncompress.hx b/std/cpp/_std/haxe/zip/Uncompress.hx
index 8a6244f3888d35dd962b004a0edc5fb2d2b933c0..1168ba32c9421bc2c2530723152c793f15000889 100644
--- a/std/cpp/_std/haxe/zip/Uncompress.hx
+++ b/std/cpp/_std/haxe/zip/Uncompress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,56 +19,58 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 @:coreApi @:buildXml('<include name="${HXCPP}/src/hx/libs/zlib/Build.xml"/>')
 class Uncompress {
-	var s : Dynamic;
+	var s:Dynamic;
 
-	public function new( ?windowBits : Int ) : Void {
+	public function new(?windowBits:Int):Void {
 		s = _inflate_init(windowBits);
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
-		return _inflate_buffer(s,src.getData(),srcPos,dst.getData(),dstPos);
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
+		return _inflate_buffer(s, src.getData(), srcPos, dst.getData(), dstPos);
 	}
 
-	public function setFlushMode( f : FlushMode ) : Void {
-		_set_flush_mode(s,untyped f.__Tag());
+	public function setFlushMode(f:FlushMode):Void {
+		_set_flush_mode(s, untyped f.__Tag());
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		_inflate_end(s);
 	}
 
-	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
+	public static function run(src:haxe.io.Bytes, ?bufsize:Int):haxe.io.Bytes {
 		var u = new Uncompress(null);
-		if( bufsize == null ) bufsize = 1 << 16; // 64K
+		if (bufsize == null)
+			bufsize = 1 << 16; // 64K
 		var tmp = haxe.io.Bytes.alloc(bufsize);
 		var b = new haxe.io.BytesBuffer();
 		var pos = 0;
 		u.setFlushMode(FlushMode.SYNC);
-		while( true ) {
-			var r = u.execute(src,pos,tmp,0);
-			b.addBytes(tmp,0,r.write);
+		while (true) {
+			var r = u.execute(src, pos, tmp, 0);
+			b.addBytes(tmp, 0, r.write);
 			pos += r.read;
-			if( r.done )
+			if (r.done)
 				break;
 		}
 		u.close();
 		return b.getBytes();
 	}
 
-   @:extern @:native("_hx_inflate_init")
-	static function _inflate_init(windowBits:Dynamic) : Dynamic return null;
-
-   @:extern @:native("_hx_inflate_buffer")
-	static function _inflate_buffer(handle:Dynamic, src:haxe.io.BytesData, srcPos:Int,  dest:haxe.io.BytesData, destPos:Int) : { done : Bool, read : Int, write : Int } return null;
+	@:native("_hx_inflate_init")
+	extern static function _inflate_init(windowBits:Dynamic):Dynamic;
 
-   @:extern @:native("_hx_inflate_end")
-	static function _inflate_end(handle:Dynamic):Void { }
+	@:native("_hx_inflate_buffer")
+	extern static function _inflate_buffer(handle:Dynamic, src:haxe.io.BytesData, srcPos:Int, dest:haxe.io.BytesData,
+		destPos:Int):{done:Bool, read:Int, write:Int};
 
-   @:extern @:native("_hx_zip_set_flush_mode")
-	static function _set_flush_mode(handle:Dynamic, flushMode:String):Void { }
+	@:native("_hx_inflate_end")
+	extern static function _inflate_end(handle:Dynamic):Void;
 
+	@:native("_hx_zip_set_flush_mode")
+	extern static function _set_flush_mode(handle:Dynamic, flushMode:String):Void;
 }
diff --git a/std/cpp/_std/sys/FileSystem.hx b/std/cpp/_std/sys/FileSystem.hx
index 959b42e85361a89ce97a91ec44fba63c3ec4e6e1..df101833e8b06076f7299b594450c4f49141601b 100644
--- a/std/cpp/_std/sys/FileSystem.hx
+++ b/std/cpp/_std/sys/FileSystem.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys;
 
 import cpp.NativeSys;
@@ -26,43 +27,55 @@ import cpp.NativeSys;
 @:buildXml('<include name="${HXCPP}/src/hx/libs/std/Build.xml"/>')
 @:coreApi
 class FileSystem {
-
-	public static function exists( path : String ) : Bool {
+	public static function exists(path:String):Bool {
 		return NativeSys.sys_exists(makeCompatiblePath(path));
 	}
 
-	public static function rename( path : String, newPath : String ) : Void {
-		NativeSys.sys_rename(path,newPath);
+	public static function rename(path:String, newPath:String):Void {
+		NativeSys.sys_rename(path, newPath);
 	}
 
-	public static function stat( path : String ) : FileStat {
-		var s : FileStat = NativeSys.sys_stat(makeCompatiblePath(path));
-		if (s==null)
-			return { gid:0, uid:0, atime:Date.fromTime(0), mtime:Date.fromTime(0), ctime:Date.fromTime(0), dev:0, ino:0, nlink:0, rdev:0, size:0, mode:0 };
-		s.atime = Date.fromTime(1000.0*(untyped s.atime));
-		s.mtime = Date.fromTime(1000.0*(untyped s.mtime));
-		s.ctime = Date.fromTime(1000.0*(untyped s.ctime));
+	public static function stat(path:String):FileStat {
+		var s:FileStat = NativeSys.sys_stat(makeCompatiblePath(path));
+		if (s == null)
+			return {
+				gid: 0,
+				uid: 0,
+				atime: Date.fromTime(0),
+				mtime: Date.fromTime(0),
+				ctime: Date.fromTime(0),
+				dev: 0,
+				ino: 0,
+				nlink: 0,
+				rdev: 0,
+				size: 0,
+				mode: 0
+			};
+		s.atime = Date.fromTime(1000.0 * (untyped s.atime));
+		s.mtime = Date.fromTime(1000.0 * (untyped s.mtime));
+		s.ctime = Date.fromTime(1000.0 * (untyped s.ctime));
 		return s;
 	}
 
-	public static function fullPath( relPath : String ) : String {
+	public static function fullPath(relPath:String):String {
 		return NativeSys.file_full_path(relPath);
 	}
 
-	public static function absolutePath ( relPath : String ) : String {
-		if (haxe.io.Path.isAbsolute(relPath)) return relPath;
+	public static function absolutePath(relPath:String):String {
+		if (haxe.io.Path.isAbsolute(relPath))
+			return relPath;
 		return haxe.io.Path.join([Sys.getCwd(), relPath]);
 	}
 
-	inline static function kind( path : String ) : String {
-		return  NativeSys.sys_file_type(makeCompatiblePath(path));
+	inline static function kind(path:String):String {
+		return NativeSys.sys_file_type(makeCompatiblePath(path));
 	}
 
-	public static function isDirectory( path : String ) : Bool {
+	public static function isDirectory(path:String):Bool {
 		return kind(path) == "dir";
 	}
 
-	public static function createDirectory( path : String ) : Void {
+	public static function createDirectory(path:String):Void {
 		var path = haxe.io.Path.addTrailingSlash(path);
 		var _p = null;
 		var parts = [];
@@ -71,26 +84,28 @@ class FileSystem {
 			path = _p;
 		}
 		for (part in parts) {
-			if (part.charCodeAt(part.length - 1) != ":".code && !exists(part) && !NativeSys.sys_create_dir( part, 493 ))
+			if (part.charCodeAt(part.length - 1) != ":".code && !exists(part) && !NativeSys.sys_create_dir(part, 493))
 				throw "Could not create directory:" + part;
 		}
 	}
 
-	public static function deleteFile( path : String ) : Void {
+	public static function deleteFile(path:String):Void {
 		NativeSys.file_delete(path);
 	}
 
-	public static function deleteDirectory( path : String ) : Void {
+	public static function deleteDirectory(path:String):Void {
 		NativeSys.sys_remove_dir(path);
 	}
 
-	public static function readDirectory( path : String ) : Array<String> {
+	public static function readDirectory(path:String):Array<String> {
 		return NativeSys.sys_read_dir(path);
 	}
 
 	private static inline function makeCompatiblePath(path:String):String {
 		return if (path.charCodeAt(1) == ":".code && path.length <= 3) {
 			haxe.io.Path.addTrailingSlash(path);
+		} else if (path == "/") {
+			"/";
 		} else {
 			haxe.io.Path.removeTrailingSlashes(path);
 		}
diff --git a/std/cpp/_std/sys/db/Mysql.hx b/std/cpp/_std/sys/db/Mysql.hx
index 449b97f6f86a72e7957af322e477dd01d4538fc5..9ecdbecb90a2c353cc4e76a7b185afc9283b1fe7 100644
--- a/std/cpp/_std/sys/db/Mysql.hx
+++ b/std/cpp/_std/sys/db/Mysql.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,57 +19,65 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
 @:keep
 private class D {
+	@:native("_hx_mysql_connect")
+	extern public static function connect(params:Dynamic):Dynamic;
+
+	@:native("_hx_mysql_select_db")
+	extern public static function select_db(handle:Dynamic, db:String):Void;
+
+	@:native("_hx_mysql_request")
+	extern public static function request(handle:Dynamic, req:String):Dynamic;
+
+	@:native("_hx_mysql_close")
+	extern public static function close(handle:Dynamic):Dynamic;
+
+	@:native("_hx_mysql_escape")
+	extern public static function escape(handle:Dynamic, str:String):String;
+
+	@:native("_hx_mysql_result_get_length")
+	extern public static function result_get_length(handle:Dynamic):Int;
+
+	@:native("_hx_mysql_result_get_nfields")
+	extern public static function result_get_nfields(handle:Dynamic):Int;
+
+	@:native("_hx_mysql_result_next")
+	extern public static function result_next(handle:Dynamic):Dynamic;
+
+	@:native("_hx_mysql_result_get")
+	extern public static function result_get(handle:Dynamic, i:Int):String;
 
-   @:extern @:native("_hx_mysql_connect")
-	public static function connect(params:Dynamic):Dynamic return null;
-   @:extern @:native("_hx_mysql_select_db")
-	public static function select_db(handle:Dynamic, db:String):Void { }
-   @:extern @:native("_hx_mysql_request")
-	public static function request(handle:Dynamic,req:String):Dynamic return null;
-   @:extern @:native("_hx_mysql_close")
-	public static function close(handle:Dynamic):Dynamic return null;
-   @:extern @:native("_hx_mysql_escape")
-	public static function escape(handle:Dynamic,str:String):String return null;
-   @:extern @:native("_hx_mysql_result_get_length")
-	public static function result_get_length(handle:Dynamic):Int return 0;
-   @:extern @:native("_hx_mysql_result_get_nfields")
-	public static function result_get_nfields(handle:Dynamic):Int return 0;
-   @:extern @:native("_hx_mysql_result_next")
-	public static function result_next(handle:Dynamic):Dynamic return null;
-   @:extern @:native("_hx_mysql_result_get")
-	public static function result_get(handle:Dynamic,i:Int) : String return null;
-   @:extern @:native("_hx_mysql_result_get_int")
-	public static function result_get_int(handle:Dynamic,i:Int) : Int return 0;
-   @:extern @:native("_hx_mysql_result_get_float")
-	public static function result_get_float(handle:Dynamic,i:Int):Float return 0.0;
-   @:extern @:native("_hx_mysql_result_get_fields_names")
-	public static function result_fields_names(handle:Dynamic):Array<String> return null;
-
-   @:extern @:native("_hx_mysql_set_conversion")
-	public static function set_conv_funs(
-      charsToBytes: cpp.Callable< Dynamic -> Dynamic >,
-      intToDate: cpp.Callable< Float -> Dynamic > ) : Void {}
-
-   public static function charsToBytes(data:Dynamic) : Dynamic
-      return haxe.io.Bytes.ofData(data);
-
-   public static function secondsToDate(seconds:Float) : Dynamic
-      return Date.fromTime(seconds);
+	@:native("_hx_mysql_result_get_int")
+	extern public static function result_get_int(handle:Dynamic, i:Int):Int;
 
+	@:native("_hx_mysql_result_get_float")
+	extern public static function result_get_float(handle:Dynamic, i:Int):Float;
+
+	@:native("_hx_mysql_result_get_fields_names")
+	extern public static function result_fields_names(handle:Dynamic):Array<String>;
+
+	@:native("_hx_mysql_set_conversion")
+	extern public static function set_conv_funs(charsToBytes:cpp.Callable<Dynamic->Dynamic>, intToDate:cpp.Callable<Float->Dynamic>):Void;
+
+	public static function charsToBytes(data:Dynamic):Dynamic
+		return haxe.io.Bytes.ofData(data);
+
+	public static function secondsToDate(seconds:Float):Dynamic
+		return Date.fromTime(seconds * 1000);
 }
 
 private class MysqlResultSet implements sys.db.ResultSet {
+	public var length(get, null):Int;
+	public var nfields(get, null):Int;
 
-	public var length(get,null) : Int;
-	public var nfields(get,null) : Int;
-	private var __r : Dynamic;
-	private var cache : Dynamic;
+	private var __r:Dynamic;
+	private var cache:Dynamic;
 
-	public function new(r) {
+	public function new(r:Dynamic) {
 		__r = r;
 	}
 
@@ -82,14 +90,14 @@ private class MysqlResultSet implements sys.db.ResultSet {
 	}
 
 	public function hasNext() {
-		if( cache == null )
+		if (cache == null)
 			cache = next();
 		return (cache != null);
 	}
 
-	public function next() : Dynamic {
+	public function next():Dynamic {
 		var c = cache;
-		if( c != null ) {
+		if (c != null) {
 			cache = null;
 			return c;
 		}
@@ -97,72 +105,67 @@ private class MysqlResultSet implements sys.db.ResultSet {
 		return c;
 	}
 
-	public function results() : List<Dynamic> {
+	public function results():List<Dynamic> {
 		var l = new List();
-		while( hasNext() )
+		while (hasNext())
 			l.add(next());
 		return l;
 	}
 
-	public function getResult( n : Int ) {
-		return D.result_get(__r,n);
+	public function getResult(n:Int) {
+		return D.result_get(__r, n);
 	}
 
-	public function getIntResult( n : Int ) : Int {
-		return D.result_get_int(__r,n);
+	public function getIntResult(n:Int):Int {
+		return D.result_get_int(__r, n);
 	}
 
-	public function getFloatResult( n : Int ) : Float {
-		return D.result_get_float(__r,n);
+	public function getFloatResult(n:Int):Float {
+		return D.result_get_float(__r, n);
 	}
 
-	public function getFieldsNames() : Array<String> {
+	public function getFieldsNames():Array<String> {
 		var a = D.result_fields_names(__r);
 		return a;
 	}
-
 }
 
 private class MysqlConnection implements sys.db.Connection {
+	private var __c:Dynamic;
 
-	private var __c : Dynamic;
-
-	public function new(c) {
+	public function new(c:Dynamic) {
 		__c = c;
-	 D.set_conv_funs( cpp.Function.fromStaticFunction(D.charsToBytes),
-                     cpp.Function.fromStaticFunction(D.secondsToDate) );
-    
+		D.set_conv_funs(cpp.Function.fromStaticFunction(D.charsToBytes), cpp.Function.fromStaticFunction(D.secondsToDate));
 	}
 
-	public function request( s : String ) : sys.db.ResultSet {
-			var r = D.request(this.__c, s);
-			return new MysqlResultSet(r);
+	public function request(s:String):sys.db.ResultSet {
+		var r = D.request(this.__c, s);
+		return new MysqlResultSet(r);
 	}
 
 	public function close() {
 		D.close(__c);
 	}
 
-	public function escape( s : String ) {
-		return D.escape(__c,s);
+	public function escape(s:String) {
+		return D.escape(__c, s);
 	}
 
-	public function quote( s : String ) {
-		return "'"+escape(s)+"'";
+	public function quote(s:String) {
+		return "'" + escape(s) + "'";
 	}
 
-	public function addValue( s : StringBuf, v : Dynamic ) {
+	public function addValue(s:StringBuf, v:Dynamic) {
 		if (v == null) {
 			s.add(v);
-      }
-      else if (Std.is(v,Bool)) {
-				s.add( v ? 1 : 0 );
-			} else {
+		} else if (Std.is(v, Bool)) {
+			s.add(v ? 1 : 0);
+		} else {
 			var t:Int = untyped v.__GetType();
-			if( t == 0xff )
+			if (t == 0xff)
 				s.add(v);
-			else if( t == 2 )
-				s.add( untyped v.__GetInt() ? "1".code : "0".code );
+			else if (t == 2)
+				s.add(untyped v.__GetInt() ? "1".code : "0".code);
 			else {
 				s.addChar("'".code);
 				s.add(escape(Std.string(v)));
@@ -196,30 +199,30 @@ private class MysqlConnection implements sys.db.Connection {
 
 @:buildXml('<include name="${HXCPP}/src/hx/libs/mysql/Build.xml"/>')
 @:coreApi class Mysql {
-
-	public static function connect( params : {
-		host : String,
-		?port : Int,
-		user : String,
-		pass : String,
-		?socket : String,
-		database : String
-	} ) : sys.db.Connection {
+	public static function connect(params:{
+		host:String,
+		?port:Int,
+		user:String,
+		pass:String,
+		?socket:String,
+		?database:String
+	}):sys.db.Connection {
 		var o = {
-			host : params.host,
-			port : if( params.port == null ) 3306 else params.port,
-			user : params.user,
-			pass : params.pass,
-			socket : if( params.socket == null ) null else params.socket
+			host: params.host,
+			port: if (params.port == null) 3306 else params.port,
+			user: params.user,
+			pass: params.pass,
+			socket: if (params.socket == null) null else params.socket
 		};
 		var c = D.connect(o);
-		try {
-			D.select_db(c,params.database);
-		} catch( e : Dynamic ) {
-			D.close(c);
-			cpp.Lib.rethrow(e);
+		if (params.database != null) {
+			try {
+				D.select_db(c, params.database);
+			} catch (e:Dynamic) {
+				D.close(c);
+				cpp.Lib.rethrow(e);
+			}
 		}
 		return new MysqlConnection(c);
 	}
-
 }
diff --git a/std/cpp/_std/sys/db/Sqlite.hx b/std/cpp/_std/sys/db/Sqlite.hx
index 153207bbf89a7a6194ec0c00b1a177a53d05a25f..d8f3b2756806555264e1f0fde36ee6b951029438 100644
--- a/std/cpp/_std/sys/db/Sqlite.hx
+++ b/std/cpp/_std/sys/db/Sqlite.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
 private class SqliteConnection implements Connection {
+	var c:Dynamic;
 
-	var c : Dynamic;
-
-	public function new( file : String ) {
+	public function new(file:String) {
 		c = _connect(file);
 	}
 
@@ -33,47 +33,45 @@ private class SqliteConnection implements Connection {
 		_close(c);
 	}
 
-	public function request( s : String ) : ResultSet {
+	public function request(s:String):ResultSet {
 		try {
-			return new SqliteResultSet(_request(c,s));
-		} catch( e : String ) {
-			throw "Error while executing "+s+" ("+e+")";
+			return new SqliteResultSet(_request(c, s));
+		} catch (e:String) {
+			throw "Error while executing " + s + " (" + e + ")";
 		}
 	}
 
-	public function escape( s : String ) {
+	public function escape(s:String) {
 		return s.split("'").join("''");
 	}
 
-	public function quote( s : String ) {
-		if( s.indexOf("\000") >= 0 )
-      {
-         var hexChars = new Array<String>();
-         for(i in 0...s.length)
-           hexChars.push( StringTools.hex( StringTools.fastCodeAt(s,i),2 ) );
-			return "x'"+ hexChars.join("") +"'";
-      }
-		return "'"+s.split("'").join("''")+"'";
+	public function quote(s:String) {
+		if (s.indexOf("\000") >= 0) {
+			var hexChars = new Array<String>();
+			for (i in 0...s.length)
+				hexChars.push(StringTools.hex(StringTools.fastCodeAt(s, i), 2));
+			return "x'" + hexChars.join("") + "'";
+		}
+		return "'" + s.split("'").join("''") + "'";
 	}
 
-	public function addValue( s : StringBuf, v : Dynamic ) {
+	public function addValue(s:StringBuf, v:Dynamic) {
 		if (v == null) {
 			s.add(v);
-      }
-      else if (Std.is(v,Bool)) {
-				s.add( v ? 1 : 0 );
-			} else {
+		} else if (Std.is(v, Bool)) {
+			s.add(v ? 1 : 0);
+		} else {
 			var t:Int = untyped v.__GetType();
-			if( t == 0xff )
+			if (t == 0xff)
 				s.add(v);
-			else if( t == 2 )
-				s.add( untyped v.__GetInt() );
+			else if (t == 2)
+				s.add(untyped v.__GetInt());
 			else
 				s.add(quote(Std.string(v)));
 		}
 	}
 
-	public function lastInsertId() : Int{
+	public function lastInsertId():Int {
 		return _last_id(c);
 	}
 
@@ -95,37 +93,37 @@ private class SqliteConnection implements Connection {
 		startTransaction(); // match mysql usage
 	}
 
+	@:native("_hx_sqlite_connect")
+	extern public static function _connect(filename:String):Dynamic;
 
-   @:extern @:native("_hx_sqlite_connect")
-	public static function _connect(filename:String):Dynamic return null;
-   @:extern @:native("_hx_sqlite_request")
-	public static function _request(handle:Dynamic,req:String):Dynamic return null;
-   @:extern @:native("_hx_sqlite_close")
-	public static function _close(handle:Dynamic):Void { };
-   @:extern @:native("_hx_sqlite_last_insert_id")
-	public static function _last_id(handle:Dynamic):Int return 0;
+	@:native("_hx_sqlite_request")
+	extern public static function _request(handle:Dynamic, req:String):Dynamic;
 
-}
+	@:native("_hx_sqlite_close")
+	extern public static function _close(handle:Dynamic):Void;
 
+	@:native("_hx_sqlite_last_insert_id")
+	extern public static function _last_id(handle:Dynamic):Int;
+}
 
 private class SqliteResultSet implements ResultSet {
+	public var length(get, null):Int;
+	public var nfields(get, null):Int;
 
-	public var length(get,null) : Int;
-	public var nfields(get,null) : Int;
-	var r : Dynamic;
-	var cache : List<Dynamic>;
+	var r:Dynamic;
+	var cache:List<Dynamic>;
 
-	public function new( r ) {
+	public function new(r:Dynamic) {
 		cache = new List();
 		this.r = r;
 		hasNext(); // execute the request
 	}
 
 	function get_length() {
-		if( nfields != 0 ) {
-			while( true ) {
+		if (nfields != 0) {
+			while (true) {
 				var c = result_next(r);
-				if( c == null )
+				if (c == null)
 					break;
 				cache.add(c);
 			}
@@ -140,68 +138,68 @@ private class SqliteResultSet implements ResultSet {
 
 	public function hasNext() {
 		var c = next();
-		if( c == null )
+		if (c == null)
 			return false;
 		cache.push(c);
 		return true;
 	}
 
-	public function next() : Dynamic {
+	public function next():Dynamic {
 		var c = cache.pop();
-		if( c != null )
+		if (c != null)
 			return c;
 		return result_next(r);
 	}
 
-	public function results() : List<Dynamic> {
+	public function results():List<Dynamic> {
 		var l = new List();
-		while( true ) {
+		while (true) {
 			var c = next();
-			if( c == null )
+			if (c == null)
 				break;
 			l.add(c);
 		}
 		return l;
 	}
 
-	public function getResult( n : Int ) {
-		return new String(result_get(r,n));
+	public function getResult(n:Int) {
+		return new String(result_get(r, n));
 	}
 
-	public function getIntResult( n : Int ) : Int {
-		return result_get_int(r,n);
+	public function getIntResult(n:Int):Int {
+		return result_get_int(r, n);
 	}
 
-	public function getFloatResult( n : Int ) : Float {
-		return result_get_float(r,n);
+	public function getFloatResult(n:Int):Float {
+		return result_get_float(r, n);
 	}
 
-	public function getFieldsNames() : Array<String> {
+	public function getFieldsNames():Array<String> {
 		return null;
 	}
 
+	@:native("_hx_sqlite_result_next")
+	extern public static function result_next(handle:Dynamic):Dynamic;
 
+	@:native("_hx_sqlite_result_get_length")
+	extern public static function result_get_length(handle:Dynamic):Int;
 
-   @:extern @:native("_hx_sqlite_result_next")
-	public static function result_next(handle:Dynamic):Dynamic return null;
-   @:extern @:native("_hx_sqlite_result_get_length")
-	public static function result_get_length(handle:Dynamic):Int return 0;
-   @:extern @:native("_hx_sqlite_result_get_nfields")
-	public static function result_get_nfields(handle:Dynamic):Int return 0;
-   @:extern @:native("_hx_sqlite_result_get")
-	public static function result_get(handle:Dynamic,i:Int) : String return null;
-   @:extern @:native("_hx_sqlite_result_get_int")
-	public static function result_get_int(handle:Dynamic,i:Int) : Int return 0;
-   @:extern @:native("_hx_sqlite_result_get_float")
-	public static function result_get_float(handle:Dynamic,i:Int):Float return 0.0;
+	@:native("_hx_sqlite_result_get_nfields")
+	extern public static function result_get_nfields(handle:Dynamic):Int;
 
+	@:native("_hx_sqlite_result_get")
+	extern public static function result_get(handle:Dynamic, i:Int):String;
+
+	@:native("_hx_sqlite_result_get_int")
+	extern public static function result_get_int(handle:Dynamic, i:Int):Int;
+
+	@:native("_hx_sqlite_result_get_float")
+	extern public static function result_get_float(handle:Dynamic, i:Int):Float;
 }
 
 @:buildXml('<include name="${HXCPP}/src/hx/libs/sqlite/Build.xml"/>')
 @:coreApi class Sqlite {
-
-	public static function open( file : String ) : Connection {
+	public static function open(file:String):Connection {
 		return new SqliteConnection(file);
 	}
-
 }
diff --git a/std/cpp/_std/sys/io/File.hx b/std/cpp/_std/sys/io/File.hx
index d193f9eef25dff717433dfe053dbac4969d6bdc8..78fdebd596f76a7a63b8ca442c5e8b00c01563d6 100644
--- a/std/cpp/_std/sys/io/File.hx
+++ b/std/cpp/_std/sys/io/File.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,52 +19,58 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 import cpp.NativeFile;
 
 @:coreApi
 class File {
-
-	public static function getContent( path : String ) : String {
+	public static function getContent(path:String):String {
 		return NativeFile.file_contents_string(path);
 	}
 
-	public static function getBytes( path : String ) : haxe.io.Bytes {
+	public static function getBytes(path:String):haxe.io.Bytes {
 		var data = NativeFile.file_contents_bytes(path);
 		return haxe.io.Bytes.ofData(data);
 	}
 
-	public static function saveContent( path : String, content : String ) : Void {
+	public static function saveContent(path:String, content:String):Void {
 		var f = write(path);
 		f.writeString(content);
 		f.close();
 	}
 
-	public static function saveBytes( path : String, bytes : haxe.io.Bytes ) : Void {
+	public static function saveBytes(path:String, bytes:haxe.io.Bytes):Void {
 		var f = write(path);
 		f.write(bytes);
 		f.close();
 	}
 
-	public static function read( path : String, binary : Bool = true ) : FileInput {
-		return untyped new FileInput(NativeFile.file_open(path,(if( binary ) "rb" else "r")));
+	public static function read(path:String, binary:Bool = true):FileInput {
+		return untyped new FileInput(NativeFile.file_open(path, (if (binary) "rb" else "r")));
 	}
 
-	public static function write( path : String, binary : Bool = true ) : FileOutput {
-		return untyped new FileOutput(NativeFile.file_open(path,(if( binary ) "wb" else "w")));
+	public static function write(path:String, binary:Bool = true):FileOutput {
+		return untyped new FileOutput(NativeFile.file_open(path, (if (binary) "wb" else "w")));
 	}
 
-	public static function append( path : String, binary : Bool = true ) : FileOutput {
-		return untyped new FileOutput(NativeFile.file_open(path,(if( binary ) "ab" else "a")));
+	public static function append(path:String, binary:Bool = true):FileOutput {
+		return untyped new FileOutput(NativeFile.file_open(path, (if (binary) "ab" else "a")));
 	}
 
-	public static function copy( srcPath : String, dstPath : String ) : Void {
-		var s = read(srcPath,true);
-		var d = write(dstPath,true);
+	public static function update(path:String, binary:Bool = true):FileOutput {
+		if (!FileSystem.exists(path)) {
+			write(path).close();
+		}
+		return untyped new FileOutput(NativeFile.file_open(path, (if (binary) "rb+" else "r+")));
+	}
+
+	public static function copy(srcPath:String, dstPath:String):Void {
+		var s = read(srcPath, true);
+		var d = write(dstPath, true);
 		d.writeInput(s);
 		s.close();
 		d.close();
 	}
-
 }
diff --git a/std/cpp/_std/sys/io/FileInput.hx b/std/cpp/_std/sys/io/FileInput.hx
index 086641580e9c1c9138d46e0044dbe156b7c1177a..df8aa1d7c4e39382c7a9bcdf91bd839e4e68c296 100644
--- a/std/cpp/_std/sys/io/FileInput.hx
+++ b/std/cpp/_std/sys/io/FileInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,57 +19,56 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
+
 import sys.io.FileSeek;
 import cpp.NativeFile;
 
 @:coreApi
 class FileInput extends haxe.io.Input {
+	private var __f:Dynamic;
 
-	private var __f : Dynamic;
-
-	function new(f:Dynamic) : Void {
+	function new(f:Dynamic):Void {
 		__f = f;
 	}
 
-	public override function readByte() : Int {
+	public override function readByte():Int {
 		return try {
 			NativeFile.file_read_char(__f);
-		} catch( e : Dynamic ) {
-			if( untyped e.__IsArray() )
+		} catch (e:Dynamic) {
+			if (untyped e.__IsArray())
 				throw new haxe.io.Eof();
 			else
 				throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	public override function readBytes( s : haxe.io.Bytes, p : Int, l : Int ) : Int {
+	public override function readBytes(s:haxe.io.Bytes, p:Int, l:Int):Int {
 		return try {
-			NativeFile.file_read(__f,s.getData(),p,l);
-		} catch( e : Dynamic ) {
-			if( untyped e.__IsArray() )
+			NativeFile.file_read(__f, s.getData(), p, l);
+		} catch (e:Dynamic) {
+			if (untyped e.__IsArray())
 				throw new haxe.io.Eof();
 			else
 				throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	public override function close() : Void {
+	public override function close():Void {
 		super.close();
 		NativeFile.file_close(__f);
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void {
-		NativeFile.file_seek(__f,p,pos==SeekBegin ? 0 : pos==SeekCur ? 1 :  2 );
+	public function seek(p:Int, pos:FileSeek):Void {
+		NativeFile.file_seek(__f, p, pos == SeekBegin ? 0 : pos == SeekCur ? 1 : 2);
 	}
 
-	public function tell() : Int {
+	public function tell():Int {
 		return NativeFile.file_tell(__f);
 	}
 
-
-	public function eof() : Bool {
+	public function eof():Bool {
 		return NativeFile.file_eof(__f);
 	}
-
 }
diff --git a/std/cpp/_std/sys/io/FileOutput.hx b/std/cpp/_std/sys/io/FileOutput.hx
index e7ba92bccb0bd45e4cc8e461322fe561403cdd3c..19ea87614542a960ed6d309a779cefa458d404ee 100644
--- a/std/cpp/_std/sys/io/FileOutput.hx
+++ b/std/cpp/_std/sys/io/FileOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,42 +19,45 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
+
 import sys.io.FileSeek;
 import cpp.NativeFile;
 
 @:coreApi
 class FileOutput extends haxe.io.Output {
+	private var __f:Dynamic;
 
-	private var __f : Dynamic;
-
-	function new(f:Dynamic) : Void {
+	function new(f:Dynamic):Void {
 		__f = f;
 	}
 
-	public override function writeByte( c : Int ) : Void {
-		try NativeFile.file_write_char(__f,c) catch( e : Dynamic ) throw haxe.io.Error.Custom(e);
+	public override function writeByte(c:Int):Void {
+		try
+			NativeFile.file_write_char(__f, c)
+		catch (e:Dynamic)
+			throw haxe.io.Error.Custom(e);
 	}
 
-	public override function writeBytes( s : haxe.io.Bytes, p : Int, l : Int ) : Int {
-		return try NativeFile.file_write(__f,s.getData(),p,l) catch( e : Dynamic ) throw haxe.io.Error.Custom(e);
+	public override function writeBytes(s:haxe.io.Bytes, p:Int, l:Int):Int {
+		return try NativeFile.file_write(__f, s.getData(), p, l) catch (e:Dynamic) throw haxe.io.Error.Custom(e);
 	}
 
-	public override function flush() : Void {
+	public override function flush():Void {
 		NativeFile.file_flush(__f);
 	}
 
-	public override function close() : Void {
+	public override function close():Void {
 		super.close();
 		NativeFile.file_close(__f);
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void {
-		NativeFile.file_seek(__f,p, pos == SeekBegin ? 0 : pos ==  SeekCur ? 1 : 2);
+	public function seek(p:Int, pos:FileSeek):Void {
+		NativeFile.file_seek(__f, p, pos == SeekBegin ? 0 : pos == SeekCur ? 1 : 2);
 	}
 
-	public function tell() : Int {
+	public function tell():Int {
 		return NativeFile.file_tell(__f);
 	}
-
 }
diff --git a/std/cpp/_std/sys/io/Process.hx b/std/cpp/_std/sys/io/Process.hx
index a719e5011d737675feca2623c5f856fc946a1060..59726154ba76cddf45f733cf140c4232647223eb 100644
--- a/std/cpp/_std/sys/io/Process.hx
+++ b/std/cpp/_std/sys/io/Process.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,16 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 import cpp.NativeProcess;
 
 private class Stdin extends haxe.io.Output {
+	var p:Dynamic;
+	var buf:haxe.io.Bytes;
 
-	var p : Dynamic;
-	var buf : haxe.io.Bytes;
-
-	public function new(p) {
+	public function new(p:Dynamic) {
 		this.p = p;
 		buf = haxe.io.Bytes.alloc(1);
 	}
@@ -39,82 +39,82 @@ private class Stdin extends haxe.io.Output {
 	}
 
 	public override function writeByte(c) {
-		buf.set(0,c);
-		writeBytes(buf,0,1);
+		buf.set(0, c);
+		writeBytes(buf, 0, 1);
 	}
 
-	public override function writeBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) : Int {
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
 		try {
-			return NativeProcess.process_stdin_write(p,buf.getData(),pos,len);
-		} catch( e : Dynamic ) {
+			return NativeProcess.process_stdin_write(p, buf.getData(), pos, len);
+		} catch (e:Dynamic) {
 			throw new haxe.io.Eof();
 		}
 		return 0;
 	}
-
 }
 
 private class Stdout extends haxe.io.Input {
+	var p:Dynamic;
+	var out:Bool;
+	var buf:haxe.io.Bytes;
 
-	var p : Dynamic;
-	var out : Bool;
-	var buf : haxe.io.Bytes;
-
-	public function new(p,out) {
+	public function new(p:Dynamic, out) {
 		this.p = p;
 		this.out = out;
 		buf = haxe.io.Bytes.alloc(1);
 	}
 
 	public override function readByte() {
-		if( readBytes(buf,0,1) == 0 )
+		if (readBytes(buf, 0, 1) == 0)
 			throw haxe.io.Error.Blocked;
 		return buf.get(0);
 	}
 
-	public override function readBytes( str : haxe.io.Bytes, pos : Int, len : Int ) : Int {
+	public override function readBytes(str:haxe.io.Bytes, pos:Int, len:Int):Int {
 		var result:Int;
 		try {
-			result = out? NativeProcess.process_stdout_read(p,str.getData(),pos,len) :
-                       NativeProcess.process_stderr_read(p,str.getData(),pos,len);
-		} catch( e : Dynamic ) {
+			result = out ? NativeProcess.process_stdout_read(p, str.getData(), pos, len) : NativeProcess.process_stderr_read(p, str.getData(), pos, len);
+		} catch (e:Dynamic) {
 			throw new haxe.io.Eof();
 		}
-		if (result==0)throw new haxe.io.Eof();
+		if (result == 0)
+			throw new haxe.io.Eof();
 		return result;
 	}
 }
 
 @:coreApi
 class Process {
+	var p:Dynamic;
 
-	var p : Dynamic;
-	public var stdout(default,null) : haxe.io.Input;
-	public var stderr(default,null) : haxe.io.Input;
-	public var stdin(default,null) : haxe.io.Output;
+	public var stdout(default, null):haxe.io.Input;
+	public var stderr(default, null):haxe.io.Input;
+	public var stdin(default, null):haxe.io.Output;
 
-	public function new( cmd : String, ?args : Array<String> ) : Void {
-		p = try NativeProcess.process_run(cmd,args) catch( e : Dynamic ) throw "Process creation failure : "+cmd;
+	public function new(cmd:String, ?args:Array<String>, ?detached:Bool):Void {
+		if (detached)
+			throw "Detached process is not supported on this platform";
+		p = try NativeProcess.process_run(cmd, args) catch (e:Dynamic) throw "Process creation failure : " + cmd;
 		stdin = new Stdin(p);
-		stdout = new Stdout(p,true);
-		stderr = new Stdout(p,false);
+		stdout = new Stdout(p, true);
+		stderr = new Stdout(p, false);
 	}
 
-	public function getPid() : Int {
+	public function getPid():Int {
 		return NativeProcess.process_pid(p);
 	}
 
-	public function exitCode( block : Bool = true ) : Null<Int> {
-		if( block == false ) throw "Non blocking exitCode() not supported on this platform";
+	public function exitCode(block:Bool = true):Null<Int> {
+		if (block == false)
+			throw "Non blocking exitCode() not supported on this platform";
 		return NativeProcess.process_exit(p);
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		NativeProcess.process_close(p);
 	}
 
-	public function kill() : Void {
-		throw "Not implemented";
+	public function kill():Void {
+		NativeProcess.process_kill(p);
 	}
-
 }
diff --git a/std/cpp/_std/sys/net/Host.hx b/std/cpp/_std/sys/net/Host.hx
index 1d1177f64a2e1c76969072b255d5cd5ed6d07aab..f403b96e0cc3506477a79d294e5ba1098f0bc524 100644
--- a/std/cpp/_std/sys/net/Host.hx
+++ b/std/cpp/_std/sys/net/Host.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,44 +19,41 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
 import cpp.NativeSocket;
 
 @:coreApi
 class Host {
+	public var host(default, null):String;
 
-	public var host(default,null) : String;
-
-	public var ip(default,null) : Int;
+	public var ip(default, null):Int;
 
-   private var ipv6(default,null) : haxe.io.BytesData;
+	private var ipv6(default, null):haxe.io.BytesData;
 
-	public function new( name : String ) : Void {
+	public function new(name:String):Void {
 		host = name;
-      try {
+		try {
 			ip = NativeSocket.host_resolve(name);
-      }
-      catch(e:Dynamic)
-      {
-		   ipv6 = NativeSocket.host_resolve_ipv6(name);
-      }
+		} catch (e:Dynamic) {
+			ipv6 = NativeSocket.host_resolve_ipv6(name);
+		}
 	}
 
-	public function toString() : String {
-		return ipv6==null ? NativeSocket.host_to_string(ip) : NativeSocket.host_to_string_ipv6(ipv6);
+	public function toString():String {
+		return ipv6 == null ? NativeSocket.host_to_string(ip) : NativeSocket.host_to_string_ipv6(ipv6);
 	}
 
-	public function reverse() : String {
-		return ipv6==null ? NativeSocket.host_reverse(ip) : NativeSocket.host_reverse_ipv6(ipv6);
+	public function reverse():String {
+		return ipv6 == null ? NativeSocket.host_reverse(ip) : NativeSocket.host_reverse_ipv6(ipv6);
 	}
 
-	public static function localhost() : String {
+	public static function localhost():String {
 		return NativeSocket.host_local();
 	}
 
-	static function __init__() : Void {
+	static function __init__():Void {
 		NativeSocket.socket_init();
 	}
-
 }
diff --git a/std/cpp/_std/sys/net/Socket.hx b/std/cpp/_std/sys/net/Socket.hx
index 2705b69b0de4225117f57ab4b3bb93a6f7f193bd..4c297cd3f133fad869887579aee3dfe36cde0a37 100644
--- a/std/cpp/_std/sys/net/Socket.hx
+++ b/std/cpp/_std/sys/net/Socket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,247 +19,255 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
 import haxe.io.Error;
 import cpp.NativeSocket;
+import cpp.NativeString;
+import cpp.Pointer;
 
 private class SocketInput extends haxe.io.Input {
-
-   var __s : Dynamic;
-
-   public function new(s) {
-      __s = s;
-   }
-
-   public override function readByte() {
-      return try {
-         NativeSocket.socket_recv_char(__s);
-      } catch( e : Dynamic ) {
-         if( e == "Blocking" )
-            throw Blocked;
-         else if( __s == null )
-            throw Custom(e);
-         else
-            throw new haxe.io.Eof();
-      }
-   }
-
-   public override function readBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) : Int {
-      var r;
-      if (__s==null)
-         throw "Invalid handle";
-      try {
-         r = NativeSocket.socket_recv(__s,buf.getData(),pos,len);
-      } catch( e : Dynamic ) {
-         if( e == "Blocking" )
-            throw Blocked;
-         else
-            throw Custom(e);
-      }
-      if( r == 0 )
-         throw new haxe.io.Eof();
-      return r;
-   }
-
-   public override function close() {
-      super.close();
-      if( __s != null ) NativeSocket.socket_close(__s);
-   }
-
+	var __s:Dynamic;
+
+	public function new(s:Dynamic) {
+		__s = s;
+	}
+
+	public override function readByte() {
+		return try {
+			NativeSocket.socket_recv_char(__s);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
+				throw Blocked;
+			else if (__s == null)
+				throw Custom(e);
+			else
+				throw new haxe.io.Eof();
+		}
+	}
+
+	public override function readBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
+		var r;
+		if (__s == null)
+			throw "Invalid handle";
+		try {
+			r = NativeSocket.socket_recv(__s, buf.getData(), pos, len);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
+				throw Blocked;
+			else
+				throw Custom(e);
+		}
+		if (r == 0)
+			throw new haxe.io.Eof();
+		return r;
+	}
+
+	public override function close() {
+		super.close();
+		if (__s != null)
+			NativeSocket.socket_close(__s);
+	}
 }
 
 private class SocketOutput extends haxe.io.Output {
-
-   var __s : Dynamic;
-
-   public function new(s) {
-      __s = s;
-   }
-
-   public override function writeByte( c : Int ) {
-      if (__s==null)
-         throw "Invalid handle";
-      try {
-         NativeSocket.socket_send_char(__s, c);
-      } catch( e : Dynamic ) {
-         if( e == "Blocking" )
-            throw Blocked;
-         else
-            throw Custom(e);
-      }
-   }
-
-   public override function writeBytes( buf : haxe.io.Bytes, pos : Int, len : Int) : Int {
-      return try {
-         NativeSocket.socket_send(__s, buf.getData(), pos, len);
-      } catch( e : Dynamic ) {
-         if( e == "Blocking" )
-            throw Blocked;
-         else if (e == "EOF")
-            throw new haxe.io.Eof();
-         else
-            throw Custom(e);
-      }
-   }
-
-   public override function close() {
-      super.close();
-      if( __s != null ) NativeSocket.socket_close(__s);
-   }
-
+	var __s:Dynamic;
+
+	public function new(s:Dynamic) {
+		__s = s;
+	}
+
+	public override function writeByte(c:Int) {
+		if (__s == null)
+			throw "Invalid handle";
+		try {
+			NativeSocket.socket_send_char(__s, c);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
+				throw Blocked;
+			else
+				throw Custom(e);
+		}
+	}
+
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
+		return try {
+			NativeSocket.socket_send(__s, buf.getData(), pos, len);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
+				throw Blocked;
+			else if (e == "EOF")
+				throw new haxe.io.Eof();
+			else
+				throw Custom(e);
+		}
+	}
+
+	public override function close() {
+		super.close();
+		if (__s != null)
+			NativeSocket.socket_close(__s);
+	}
 }
 
-
 @:coreApi
 class Socket {
-
-   private var __s : Dynamic;
-   public var input(default,null) : haxe.io.Input;
-   public var output(default,null) : haxe.io.Output;
-   public var custom : Dynamic;
-
-   public function new() : Void {
-      init();
-   }
-
-   private function init() : Void {
-      if( __s == null )__s = NativeSocket.socket_new(false);
-      input = new SocketInput(__s);
-      output = new SocketOutput(__s);
-   }
-
-   public function close() : Void {
-      NativeSocket.socket_close(__s);
-      untyped {
-         var input : SocketInput = cast input;
-         var output : SocketOutput = cast output;
-         input.__s = null;
-         output.__s = null;
-      }
-      input.close();
-      output.close();
-   }
-
-   public function read() : String {
-      var bytes:haxe.io.BytesData = NativeSocket.socket_read(__s);
-      if (bytes==null) return "";
-      return bytes.toString();
-   }
-
-   public function write( content : String ) : Void {
-      NativeSocket.socket_write(__s, haxe.io.Bytes.ofString(content).getData() );
-   }
-
-   public function connect(host : Host, port : Int) : Void {
-      try {
-         if (host.ip==0 && host.host!="0.0.0.0") {
-            // hack, hack, hack
-            var ipv6:haxe.io.BytesData = Reflect.field(host,"ipv6");
-            if (ipv6!=null)
-            {
-                close();
-                __s = NativeSocket.socket_new_ip(false,true);
-                init();
-                NativeSocket.socket_connect_ipv6(__s, ipv6, port);
-            }
-            else
-               throw "Unresolved host";
-         }
-         else
-            NativeSocket.socket_connect(__s, host.ip, port);
-      } catch( s : String ) {
-         if( s == "Invalid socket handle" )
-            throw "Failed to connect on "+host.toString()+":"+port;
-         else if (s == "Blocking") {
-            // Do nothing, this is not a real error, it simply indicates
-            // that a non-blocking connect is in progress
-         }
-         else
-            cpp.Lib.rethrow(s);
-      }
-   }
-
-   public function listen(connections : Int) : Void {
-      NativeSocket.socket_listen(__s, connections);
-   }
-
-   public function shutdown( read : Bool, write : Bool ) : Void {
-      NativeSocket.socket_shutdown(__s,read,write);
-   }
-
-   public function bind(host : Host, port : Int) : Void {
-      if (host.ip==0  && host.host!="0.0.0.0")
-      {
-          var ipv6:haxe.io.BytesData = Reflect.field(host,"ipv6");
-          if (ipv6!=null)
-          {
-              close();
-              __s = NativeSocket.socket_new_ip(false,true);
-              init();
-              NativeSocket.socket_bind_ipv6(__s, ipv6, port);
-          }
-          else
-             throw "Unresolved host";
-      }
-      else
-         NativeSocket.socket_bind(__s, host.ip, port);
-   }
-
-   public function accept() : Socket {
-      var c = NativeSocket.socket_accept(__s);
-      var s = Type.createEmptyInstance(Socket);
-      s.__s = c;
-      s.input = new SocketInput(c);
-      s.output = new SocketOutput(c);
-      return s;
-   }
-
-   public function peer() : { host : Host, port : Int } {
-      var a : Dynamic = NativeSocket.socket_peer(__s);
-      if (a == null) {
-         return null;
-      }
-      var h = new Host("127.0.0.1");
-      untyped h.ip = a[0];
-      return { host : h, port : a[1] };
-   }
-
-   public function host() : { host : Host, port : Int } {
-      var a : Dynamic = NativeSocket.socket_host(__s);
-      if (a == null) {
-         return null;
-      }
-      var h = new Host("127.0.0.1");
-      untyped h.ip = a[0];
-      return { host : h, port : a[1] };
-   }
-
-   public function setTimeout( timeout : Float ) : Void {
-      NativeSocket.socket_set_timeout(__s, timeout);
-   }
-
-   public function waitForRead() : Void {
-      select([this],null,null,null);
-   }
-
-   public function setBlocking( b : Bool ) : Void {
-      NativeSocket.socket_set_blocking(__s,b);
-   }
-
-   public function setFastSend( b : Bool ) : Void {
-      NativeSocket.socket_set_fast_send(__s,b);
-   }
-
-   public static function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float ) : {read: Array<Socket>,write: Array<Socket>,others: Array<Socket>} {
-      var neko_array = NativeSocket.socket_select(read,write,others, timeout);
-      if (neko_array==null)
-         throw "Select error";
-      return @:fixed {
-         read: neko_array[0],
-         write: neko_array[1],
-         others: neko_array[2]
-      };
-   }
-
+	private var __s:Dynamic;
+
+	// We need to keep these values so that we can restore
+	// them if we re-create the socket for ipv6 as in
+	// connect() and bind() below.
+	private var __timeout:Float = 0.0;
+	private var __blocking:Bool = true;
+	private var __fastSend:Bool = false;
+
+	public var input(default, null):haxe.io.Input;
+	public var output(default, null):haxe.io.Output;
+	public var custom:Dynamic;
+
+	public function new():Void {
+		init();
+	}
+
+	private function init():Void {
+		if (__s == null)
+			__s = NativeSocket.socket_new(false);
+		// Restore these values if they changed. This can happen
+		// in connect() and bind() if using an ipv6 address.
+		setTimeout(__timeout);
+		setBlocking(__blocking);
+		setFastSend(__fastSend);
+		input = new SocketInput(__s);
+		output = new SocketOutput(__s);
+	}
+
+	public function close():Void {
+		NativeSocket.socket_close(__s);
+		untyped {
+			var input:SocketInput = cast input;
+			var output:SocketOutput = cast output;
+			input.__s = null;
+			output.__s = null;
+		}
+		input.close();
+		output.close();
+	}
+
+	public function read():String {
+		var bytes:haxe.io.BytesData = NativeSocket.socket_read(__s);
+		if (bytes == null)
+			return "";
+		var arr:Array<cpp.Char> = cast bytes;
+		return NativeString.fromPointer(Pointer.ofArray(arr));
+	}
+
+	public function write(content:String):Void {
+		NativeSocket.socket_write(__s, haxe.io.Bytes.ofString(content).getData());
+	}
+
+	public function connect(host:Host, port:Int):Void {
+		try {
+			if (host.ip == 0 && host.host != "0.0.0.0") {
+				// hack, hack, hack
+				var ipv6:haxe.io.BytesData = Reflect.field(host, "ipv6");
+				if (ipv6 != null) {
+					close();
+					__s = NativeSocket.socket_new_ip(false, true);
+					init();
+					NativeSocket.socket_connect_ipv6(__s, ipv6, port);
+				} else
+					throw "Unresolved host";
+			} else
+				NativeSocket.socket_connect(__s, host.ip, port);
+		} catch (s:String) {
+			if (s == "Invalid socket handle")
+				throw "Failed to connect on " + host.toString() + ":" + port;
+			else if (s == "Blocking") {
+				// Do nothing, this is not a real error, it simply indicates
+				// that a non-blocking connect is in progress
+			} else
+				cpp.Lib.rethrow(s);
+		}
+	}
+
+	public function listen(connections:Int):Void {
+		NativeSocket.socket_listen(__s, connections);
+	}
+
+	public function shutdown(read:Bool, write:Bool):Void {
+		NativeSocket.socket_shutdown(__s, read, write);
+	}
+
+	public function bind(host:Host, port:Int):Void {
+		if (host.ip == 0 && host.host != "0.0.0.0") {
+			var ipv6:haxe.io.BytesData = Reflect.field(host, "ipv6");
+			if (ipv6 != null) {
+				close();
+				__s = NativeSocket.socket_new_ip(false, true);
+				init();
+				NativeSocket.socket_bind_ipv6(__s, ipv6, port);
+			} else
+				throw "Unresolved host";
+		} else
+			NativeSocket.socket_bind(__s, host.ip, port);
+	}
+
+	public function accept():Socket {
+		var c = NativeSocket.socket_accept(__s);
+		var s = Type.createEmptyInstance(Socket);
+		s.__s = c;
+		s.input = new SocketInput(c);
+		s.output = new SocketOutput(c);
+		return s;
+	}
+
+	public function peer():{host:Host, port:Int} {
+		var a:Dynamic = NativeSocket.socket_peer(__s);
+		if (a == null) {
+			return null;
+		}
+		var h = new Host("127.0.0.1");
+		untyped h.ip = a[0];
+		return {host: h, port: a[1]};
+	}
+
+	public function host():{host:Host, port:Int} {
+		var a:Dynamic = NativeSocket.socket_host(__s);
+		if (a == null) {
+			return null;
+		}
+		var h = new Host("127.0.0.1");
+		untyped h.ip = a[0];
+		return {host: h, port: a[1]};
+	}
+
+	public function setTimeout(timeout:Float):Void {
+		__timeout = timeout;
+		NativeSocket.socket_set_timeout(__s, timeout);
+	}
+
+	public function waitForRead():Void {
+		select([this], null, null, null);
+	}
+
+	public function setBlocking(b:Bool):Void {
+		__blocking = b;
+		NativeSocket.socket_set_blocking(__s, b);
+	}
+
+	public function setFastSend(b:Bool):Void {
+		__fastSend = b;
+		NativeSocket.socket_set_fast_send(__s, b);
+	}
+
+	public static function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+			?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>} {
+		var neko_array = NativeSocket.socket_select(read, write, others, timeout);
+		if (neko_array == null)
+			throw "Select error";
+		return @:fixed {
+			read:neko_array[0], write:neko_array[1], others:neko_array[2]
+		};
+	}
 }
diff --git a/std/cpp/_std/sys/net/UdpSocket.hx b/std/cpp/_std/sys/net/UdpSocket.hx
index f3deae9f857636d071713a971d2757ff7778a5a2..dc4728c4935c515a3758a4f157d54a33e5c7c501 100644
--- a/std/cpp/_std/sys/net/UdpSocket.hx
+++ b/std/cpp/_std/sys/net/UdpSocket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,42 +19,46 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
+
 import haxe.io.Error;
 import cpp.NativeSocket;
 
 @:coreApi
 class UdpSocket extends Socket {
-
-	private override function init() : Void {
+	private override function init():Void {
 		__s = NativeSocket.socket_new(true);
 		super.init();
 	}
 
-	public function sendTo( buf : haxe.io.Bytes, pos : Int, len : Int, addr : Address ) : Int {
+	public function sendTo(buf:haxe.io.Bytes, pos:Int, len:Int, addr:Address):Int {
 		return try {
 			NativeSocket.socket_send_to(__s, buf.getData(), pos, len, addr);
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw Blocked;
 			else
 				throw Custom(e);
 		}
 	}
 
-	public function readFrom( buf : haxe.io.Bytes, pos : Int, len : Int, addr : Address ) : Int {
+	public function readFrom(buf:haxe.io.Bytes, pos:Int, len:Int, addr:Address):Int {
 		var r;
 		try {
-			r = NativeSocket.socket_recv_from(__s,buf.getData(),pos,len,addr);
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			r = NativeSocket.socket_recv_from(__s, buf.getData(), pos, len, addr);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw Blocked;
 			else
 				throw Custom(e);
 		}
-		if( r == 0 )
+		if (r == 0)
 			throw new haxe.io.Eof();
 		return r;
 	}
 
+	public function setBroadcast(b:Bool):Void {
+		NativeSocket.socket_set_broadcast(__s, b);
+	}
 }
diff --git a/std/cpp/_std/sys/ssl/Certificate.hx b/std/cpp/_std/sys/ssl/Certificate.hx
index de676f4a53d9b24d7a42aa84aaf0fbfb018ea7f1..705f67324a74b5f67c7b219971d182d43c3804a6 100644
--- a/std/cpp/_std/sys/ssl/Certificate.hx
+++ b/std/cpp/_std/sys/ssl/Certificate.hx
@@ -1,60 +1,82 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
+
 import cpp.NativeSsl;
 
 @:coreApi
 class Certificate {
-	
-	var __h : Null<Certificate>;
-	var __x : Dynamic;
+	var __h:Null<Certificate>;
+	var __x:Dynamic;
 
 	@:allow(sys.ssl.Socket)
-	function new( x : Dynamic, ?h: Null<Certificate> ){
+	function new(x:Dynamic, ?h:Null<Certificate>) {
 		__x = x;
 		__h = h;
 	}
 
-	public static function loadFile( file : String ) : Certificate {
-		return new Certificate( NativeSsl.cert_load_file( file ) );
+	public static function loadFile(file:String):Certificate {
+		return new Certificate(NativeSsl.cert_load_file(file));
 	}
-	
-	public static function loadPath( path : String ) : Certificate {
-		return new Certificate( NativeSsl.cert_load_path( path ) );
+
+	public static function loadPath(path:String):Certificate {
+		return new Certificate(NativeSsl.cert_load_path(path));
 	}
 
-	public static function fromString( str : String ) : Certificate {
-		return new Certificate( NativeSsl.cert_add_pem(null, str) );
+	public static function fromString(str:String):Certificate {
+		return new Certificate(NativeSsl.cert_add_pem(null, str));
 	}
 
-	public static function loadDefaults() : Certificate {
+	public static function loadDefaults():Certificate {
 		var x = NativeSsl.cert_load_defaults();
-		if ( x != null )
-			return new Certificate( x );
-		
+		if (x != null)
+			return new Certificate(x);
+
 		var defPaths = null;
-		switch( Sys.systemName() ){
+		switch (Sys.systemName()) {
 			case "Linux":
 				defPaths = [
 					"/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc.
-					"/etc/pki/tls/certs/ca-bundle.crt",   // Fedora/RHEL
-					"/etc/ssl/ca-bundle.pem",             // OpenSUSE
-					"/etc/pki/tls/cacert.pem",            // OpenELEC
-					"/etc/ssl/certs",                     // SLES10/SLES11
-					"/system/etc/security/cacerts"        // Android
+					"/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL
+					"/etc/ssl/ca-bundle.pem", // OpenSUSE
+					"/etc/pki/tls/cacert.pem", // OpenELEC
+					"/etc/ssl/certs", // SLES10/SLES11
+					"/system/etc/security/cacerts" // Android
 				];
 			case "BSD":
 				defPaths = [
 					"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
-					"/etc/ssl/cert.pem",                      // OpenBSD
-					"/etc/openssl/certs/ca-certificates.crt", // NetBSD	
+					"/etc/ssl/cert.pem", // OpenBSD
+					"/etc/openssl/certs/ca-certificates.crt", // NetBSD
 				];
 			case "Android":
 				defPaths = ["/system/etc/security/cacerts"];
 			default:
 		}
-		if( defPaths != null ){
-			for ( path in defPaths ){
-				if ( sys.FileSystem.exists(path) ){
-					if( sys.FileSystem.isDirectory(path) )
+		if (defPaths != null) {
+			for (path in defPaths) {
+				if (sys.FileSystem.exists(path)) {
+					if (sys.FileSystem.isDirectory(path))
 						return loadPath(path);
 					else
 						return loadFile(path);
@@ -64,52 +86,51 @@ class Certificate {
 		return null;
 	}
 
-	public var commonName(get,null) : Null<String>;
-	public var altNames(get, null) : Array<String>;
-	public var notBefore(get,null) : Date;
-	public var notAfter(get,null) : Date;
+	public var commonName(get, null):Null<String>;
+	public var altNames(get, null):Array<String>;
+	public var notBefore(get, null):Date;
+	public var notAfter(get, null):Date;
 
-	function get_commonName() : Null<String> {
+	function get_commonName():Null<String> {
 		return subject("CN");
 	}
 
-	function get_altNames() : Array<String> {
+	function get_altNames():Array<String> {
 		return NativeSsl.cert_get_altnames(__x);
 	}
-	
-	public function subject( field : String ) : Null<String> {
+
+	public function subject(field:String):Null<String> {
 		return NativeSsl.cert_get_subject(__x, field);
 	}
-	
-	public function issuer( field : String ) : Null<String> {
+
+	public function issuer(field:String):Null<String> {
 		return NativeSsl.cert_get_issuer(__x, field);
 	}
 
-	function get_notBefore() : Date {
-		var a = NativeSsl.cert_get_notbefore( __x );
-		return new Date( a[0], a[1] - 1, a[2], a[3], a[4], a[5] );
+	function get_notBefore():Date {
+		var a = NativeSsl.cert_get_notbefore(__x);
+		return new Date(a[0], a[1] - 1, a[2], a[3], a[4], a[5]);
 	}
 
-	function get_notAfter() : Date {
-		var a = NativeSsl.cert_get_notafter( __x );
-		return new Date( a[0], a[1] - 1, a[2], a[3], a[4], a[5] );
+	function get_notAfter():Date {
+		var a = NativeSsl.cert_get_notafter(__x);
+		return new Date(a[0], a[1] - 1, a[2], a[3], a[4], a[5]);
 	}
-	
-	public function next() : Null<Certificate> {
+
+	public function next():Null<Certificate> {
 		var n = NativeSsl.cert_get_next(__x);
-		return n == null ? null : new Certificate( n, __h==null ? this : __h );
+		return n == null ? null : new Certificate(n, __h == null ? this : __h);
 	}
 
-	public function add( pem : String ) : Void {
-		NativeSsl.cert_add_pem(__x,pem);
+	public function add(pem:String):Void {
+		NativeSsl.cert_add_pem(__x, pem);
 	}
 
-	public function addDER( der : haxe.io.Bytes ) : Void {
-		NativeSsl.cert_add_der(__x,der.getData());
+	public function addDER(der:haxe.io.Bytes):Void {
+		NativeSsl.cert_add_der(__x, der.getData());
 	}
 
-	static function __init__() : Void {
+	static function __init__():Void {
 		NativeSsl.init();
 	}
-
 }
diff --git a/std/cpp/_std/sys/ssl/Digest.hx b/std/cpp/_std/sys/ssl/Digest.hx
index ca6300b4e1021dc23eee6390f0fdc2e5737308b2..4130887d40806da2bdec524861333314c11eb8ca 100644
--- a/std/cpp/_std/sys/ssl/Digest.hx
+++ b/std/cpp/_std/sys/ssl/Digest.hx
@@ -1,19 +1,40 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
+
 import cpp.NativeSsl;
 
 @:coreApi
 class Digest {
-
-	public static function make( data : haxe.io.Bytes, alg : DigestAlgorithm ) : haxe.io.Bytes {
-		return haxe.io.Bytes.ofData( NativeSsl.dgst_make( data.getData(), alg ) );
+	public static function make(data:haxe.io.Bytes, alg:DigestAlgorithm):haxe.io.Bytes {
+		return haxe.io.Bytes.ofData(NativeSsl.dgst_make(data.getData(), alg));
 	}
-	
-	public static function sign( data : haxe.io.Bytes, privKey : Key, alg : DigestAlgorithm ) : haxe.io.Bytes {
-		return haxe.io.Bytes.ofData( NativeSsl.dgst_sign( data.getData(), @:privateAccess privKey.__k, alg ) );
-	}
-	
-	public static function verify( data : haxe.io.Bytes, signature : haxe.io.Bytes, pubKey : Key, alg : DigestAlgorithm ) : Bool{
-		return NativeSsl.dgst_verify( data.getData(), signature.getData(), @:privateAccess pubKey.__k, alg );
+
+	public static function sign(data:haxe.io.Bytes, privKey:Key, alg:DigestAlgorithm):haxe.io.Bytes {
+		return haxe.io.Bytes.ofData(NativeSsl.dgst_sign(data.getData(), @:privateAccess privKey.__k, alg));
 	}
 
+	public static function verify(data:haxe.io.Bytes, signature:haxe.io.Bytes, pubKey:Key, alg:DigestAlgorithm):Bool {
+		return NativeSsl.dgst_verify(data.getData(), signature.getData(), @:privateAccess pubKey.__k, alg);
+	}
 }
diff --git a/std/cpp/_std/sys/ssl/Key.hx b/std/cpp/_std/sys/ssl/Key.hx
index b078855df83435792d3b1a1123f5ab07813ae0fe..26c0beec89170de9301a96eddac332495eecbf6b 100644
--- a/std/cpp/_std/sys/ssl/Key.hx
+++ b/std/cpp/_std/sys/ssl/Key.hx
@@ -1,36 +1,57 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
+
 import cpp.NativeSsl;
 
 private typedef PKEY = Dynamic;
 
 @:coreApi
 class Key {
-	
-	private var __k : PKEY;
+	private var __k:PKEY;
 
-	private function new( k : PKEY ){
+	private function new(k:PKEY) {
 		__k = k;
 	}
-	
-	public static function loadFile( file : String, ?isPublic : Bool, ?pass : String ) : Key {
-		var data = sys.io.File.getBytes( file );
+
+	public static function loadFile(file:String, ?isPublic:Bool, ?pass:String):Key {
+		var data = sys.io.File.getBytes(file);
 		var str = cpp.Lib.stringReference(data);
-		if( str.indexOf("-----BEGIN ") >= 0 )
-			return readPEM( str, isPublic==true, pass );
+		if (str.indexOf("-----BEGIN ") >= 0)
+			return readPEM(str, isPublic == true, pass);
 		else
-			return readDER( data, isPublic==true );
+			return readDER(data, isPublic == true);
 	}
-	
-	public static function readPEM( data : String, isPublic : Bool, ?pass : String ) : Key {
-		return new Key( NativeSsl.key_from_pem( data, isPublic, pass ) );
+
+	public static function readPEM(data:String, isPublic:Bool, ?pass:String):Key {
+		return new Key(NativeSsl.key_from_pem(data, isPublic, pass));
 	}
 
-	public static function readDER( data : haxe.io.Bytes, isPublic : Bool ) : Key {
-		return new Key( NativeSsl.key_from_der( data.getData(), isPublic ) );
+	public static function readDER(data:haxe.io.Bytes, isPublic:Bool):Key {
+		return new Key(NativeSsl.key_from_der(data.getData(), isPublic));
 	}
 
-	static function __init__() : Void {
+	static function __init__():Void {
 		NativeSsl.init();
 	}
-
 }
diff --git a/std/cpp/_std/sys/ssl/Socket.hx b/std/cpp/_std/sys/ssl/Socket.hx
index 204ffc4130f0d8f3e41454b2965df7b6e0cafab5..535787795cf776fa72d5e817a552e9816b80987b 100644
--- a/std/cpp/_std/sys/ssl/Socket.hx
+++ b/std/cpp/_std/sys/ssl/Socket.hx
@@ -1,4 +1,27 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
+
 import cpp.NativeSocket;
 import cpp.NativeSsl;
 
@@ -7,78 +30,78 @@ private typedef CONF = Dynamic;
 private typedef SSL = Dynamic;
 
 private class SocketInput extends haxe.io.Input {
-	@:allow(sys.ssl.Socket) private var __s : Socket;
+	@:allow(sys.ssl.Socket) private var __s:Socket;
 
-	public function new( s : Socket ) {
+	public function new(s:Socket) {
 		this.__s = s;
 	}
 
 	public override function readByte() {
 		return try {
 			__s.handshake();
-			NativeSsl.ssl_recv_char( @:privateAccess __s.ssl );
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			NativeSsl.ssl_recv_char(@:privateAccess __s.ssl);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw haxe.io.Error.Blocked;
-			else if( __s == null )
+			else if (__s == null)
 				throw haxe.io.Error.Custom(e);
 			else
 				throw new haxe.io.Eof();
 		}
 	}
 
-	public override function readBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) : Int {
-		var r : Int;
-		if( __s == null )
+	public override function readBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
+		var r:Int;
+		if (__s == null)
 			throw "Invalid handle";
 		try {
 			__s.handshake();
-			r = NativeSsl.ssl_recv( @:privateAccess __s.ssl, buf.getData(), pos, len );
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			r = NativeSsl.ssl_recv(@:privateAccess __s.ssl, buf.getData(), pos, len);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw haxe.io.Error.Blocked;
 			else
 				throw haxe.io.Error.Custom(e);
 		}
-		if( r == 0 )
+		if (r == 0)
 			throw new haxe.io.Eof();
 		return r;
 	}
 
 	public override function close() {
 		super.close();
-		if( __s != null ) __s.close();
+		if (__s != null)
+			__s.close();
 	}
-
 }
 
 private class SocketOutput extends haxe.io.Output {
-	@:allow(sys.ssl.Socket) private var __s : Socket;
+	@:allow(sys.ssl.Socket) private var __s:Socket;
 
-	public function new( s : Socket ) {
+	public function new(s:Socket) {
 		this.__s = s;
 	}
 
-	public override function writeByte( c : Int ) {
-		if( __s == null )
+	public override function writeByte(c:Int) {
+		if (__s == null)
 			throw "Invalid handle";
 		try {
 			__s.handshake();
-			NativeSsl.ssl_send_char( @:privateAccess __s.ssl, c );
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			NativeSsl.ssl_send_char(@:privateAccess __s.ssl, c);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw haxe.io.Error.Blocked;
 			else
 				throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	public override function writeBytes( buf : haxe.io.Bytes, pos : Int, len : Int) : Int {
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
 		return try {
 			__s.handshake();
-			NativeSsl.ssl_send( @:privateAccess __s.ssl, buf.getData(), pos, len );
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			NativeSsl.ssl_send(@:privateAccess __s.ssl, buf.getData(), pos, len);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw haxe.io.Error.Blocked;
 			else
 				throw haxe.io.Error.Custom(e);
@@ -87,137 +110,139 @@ private class SocketOutput extends haxe.io.Output {
 
 	public override function close() {
 		super.close();
-		if( __s != null ) __s.close();
+		if (__s != null)
+			__s.close();
 	}
-
 }
 
 @:coreApi
 class Socket extends sys.net.Socket {
-	
-	public static var DEFAULT_VERIFY_CERT : Null<Bool> = true;
-
-	public static var DEFAULT_CA : Null<Certificate>;
-	
-	private var conf : CONF;
-	private var ssl : SSL;
-	
-	public var verifyCert : Null<Bool>;
-	private var caCert : Null<Certificate>;
-	private var hostname : String;
-
-	private var ownCert : Null<Certificate>;
-	private var ownKey : Null<Key>;
-	private var altSNIContexts : Null<Array<{match: String->Bool, key: Key, cert: Certificate}>>;
-	private var sniCallback : Dynamic;
-	private var handshakeDone : Bool;
-
-	private override function init() : Void {
-		__s = NativeSocket.socket_new( false );
-		input = new SocketInput( this );
-		output = new SocketOutput( this );
-		if( DEFAULT_VERIFY_CERT && DEFAULT_CA == null ){
+	public static var DEFAULT_VERIFY_CERT:Null<Bool> = true;
+
+	public static var DEFAULT_CA:Null<Certificate>;
+
+	private var conf:CONF;
+	private var ssl:SSL;
+
+	public var verifyCert:Null<Bool>;
+
+	private var caCert:Null<Certificate>;
+	private var hostname:String;
+
+	private var ownCert:Null<Certificate>;
+	private var ownKey:Null<Key>;
+	private var altSNIContexts:Null<Array<{match:String->Bool, key:Key, cert:Certificate}>>;
+	private var sniCallback:Dynamic;
+	private var handshakeDone:Bool;
+
+	private override function init():Void {
+		__s = NativeSocket.socket_new(false);
+		input = new SocketInput(this);
+		output = new SocketOutput(this);
+		if (DEFAULT_VERIFY_CERT && DEFAULT_CA == null) {
 			try {
 				DEFAULT_CA = Certificate.loadDefaults();
-			}catch( e : Dynamic ){}
-		}	
+			} catch (e:Dynamic) {}
+		}
 		caCert = DEFAULT_CA;
 		verifyCert = DEFAULT_VERIFY_CERT;
 	}
 
-	public override function connect(host : sys.net.Host, port : Int) : Void {
+	public override function connect(host:sys.net.Host, port:Int):Void {
 		try {
-			conf = buildSSLConfig( false );
-			ssl = NativeSsl.ssl_new( conf );
+			conf = buildSSLConfig(false);
+			ssl = NativeSsl.ssl_new(conf);
 			handshakeDone = false;
-			NativeSsl.ssl_set_socket( ssl, __s );
-			if( hostname == null )
+			NativeSsl.ssl_set_socket(ssl, __s);
+			if (hostname == null)
 				hostname = host.host;
-			if( hostname != null )
-				NativeSsl.ssl_set_hostname( ssl, hostname );
-			NativeSocket.socket_connect( __s, host.ip, port );
+			if (hostname != null)
+				NativeSsl.ssl_set_hostname(ssl, hostname);
+			NativeSocket.socket_connect(__s, host.ip, port);
 			handshake();
-		} catch( s : String ) {
-			if( s == "Invalid socket handle" )
-				throw "Failed to connect on "+host.host+":"+port;
+		} catch (s:String) {
+			if (s == "Invalid socket handle")
+				throw "Failed to connect on " + host.host + ":" + port;
 			else
 				cpp.Lib.rethrow(s);
-		} catch( e : Dynamic ) {
+		} catch (e:Dynamic) {
 			cpp.Lib.rethrow(e);
 		}
 	}
 
-	public function handshake() : Void {
-		if( !handshakeDone ){
+	public function handshake():Void {
+		if (!handshakeDone) {
 			try {
-				NativeSsl.ssl_handshake( ssl );
+				NativeSsl.ssl_handshake(ssl);
 				handshakeDone = true;
-			} catch( e : Dynamic ) {
-				if( e == "Blocking" )
+			} catch (e:Dynamic) {
+				if (e == "Blocking")
 					throw haxe.io.Error.Blocked;
 				else
-					cpp.Lib.rethrow( e );
+					cpp.Lib.rethrow(e);
 			}
 		}
 	}
 
-	public function setCA( cert : Certificate ) : Void {
+	public function setCA(cert:Certificate):Void {
 		caCert = cert;
 	}
 
-	public function setHostname( name : String ) : Void {
+	public function setHostname(name:String):Void {
 		hostname = name;
 	}
 
-	public function setCertificate( cert : Certificate, key : Key ) : Void {
+	public function setCertificate(cert:Certificate, key:Key):Void {
 		ownCert = cert;
 		ownKey = key;
 	}
 
-	public override function read() : String {
+	public override function read():String {
 		handshake();
-		var b = NativeSsl.ssl_read( ssl );
-		if( b == null )
+		var b = NativeSsl.ssl_read(ssl);
+		if (b == null)
 			return "";
 		return haxe.io.Bytes.ofData(b).toString();
 	}
 
-	public override function write( content : String ) : Void {
+	public override function write(content:String):Void {
 		handshake();
-		NativeSsl.ssl_write( ssl, haxe.io.Bytes.ofString(content).getData() );
+		NativeSsl.ssl_write(ssl, haxe.io.Bytes.ofString(content).getData());
 	}
 
-	public override function close() : Void {
-		if( ssl != null ) NativeSsl.ssl_close( ssl );
-		if( conf != null ) NativeSsl.conf_close( conf );
-		if( altSNIContexts != null )
+	public override function close():Void {
+		if (ssl != null)
+			NativeSsl.ssl_close(ssl);
+		if (conf != null)
+			NativeSsl.conf_close(conf);
+		if (altSNIContexts != null)
 			sniCallback = null;
-		NativeSocket.socket_close( __s );
-		var input : SocketInput = cast input;
-		var output : SocketOutput = cast output;
+		NativeSocket.socket_close(__s);
+		var input:SocketInput = cast input;
+		var output:SocketOutput = cast output;
 		@:privateAccess input.__s = output.__s = null;
 		input.close();
 		output.close();
 	}
 
-	public function addSNICertificate( cbServernameMatch : String->Bool, cert : Certificate, key : Key ) : Void {
-		if( altSNIContexts == null )
+	public function addSNICertificate(cbServernameMatch:String->Bool, cert:Certificate, key:Key):Void {
+		if (altSNIContexts == null)
 			altSNIContexts = [];
-		altSNIContexts.push( {match: cbServernameMatch, cert: cert, key: key} );
+		altSNIContexts.push({match: cbServernameMatch, cert: cert, key: key});
 	}
 
-	public override function bind( host : sys.net.Host, port : Int ) : Void {
-		conf = buildSSLConfig( true );
+	public override function bind(host:sys.net.Host, port:Int):Void {
+		conf = buildSSLConfig(true);
 
-		NativeSocket.socket_bind( __s, host.ip, port );
+		NativeSocket.socket_bind(__s, host.ip, port);
 	}
 
-	public override function accept() : Socket {
-		var c = NativeSocket.socket_accept( __s );
-		var ssl = NativeSsl.ssl_new( conf );
-		NativeSsl.ssl_set_socket( ssl, c );
+	public override function accept():Socket {
+		var c = NativeSocket.socket_accept(__s);
+		var ssl = NativeSsl.ssl_new(conf);
+		NativeSsl.ssl_set_socket(ssl, c);
 
-		var s = Type.createEmptyInstance( sys.ssl.Socket );
+		var s = Type.createEmptyInstance(sys.ssl.Socket);
 		s.__s = c;
 		s.ssl = ssl;
 		s.input = new SocketInput(s);
@@ -227,42 +252,46 @@ class Socket extends sys.net.Socket {
 		return s;
 	}
 
-	public function peerCertificate() : sys.ssl.Certificate {
-		var x = NativeSsl.ssl_get_peer_certificate( ssl );
-		return x==null ? null : new sys.ssl.Certificate( x );
+	public function peerCertificate():sys.ssl.Certificate {
+		var x = NativeSsl.ssl_get_peer_certificate(ssl);
+		return x == null ? null : new sys.ssl.Certificate(x);
 	}
 
-	private function buildSSLConfig( server : Bool ) : CONF {
-		var conf : CONF = NativeSsl.conf_new( server );
+	private function buildSSLConfig(server:Bool):CONF {
+		var conf:CONF = NativeSsl.conf_new(server);
 
-		if( ownCert != null && ownKey != null )
-			NativeSsl.conf_set_cert( conf, @:privateAccess ownCert.__x, @:privateAccess ownKey.__k );
+		if (ownCert != null && ownKey != null)
+			NativeSsl.conf_set_cert(conf, @:privateAccess ownCert.__x, @:privateAccess ownKey.__k);
 
-		if ( altSNIContexts != null ) {
+		if (altSNIContexts != null) {
 			sniCallback = function(servername) {
 				var servername = new String(cast servername);
-				for( c in altSNIContexts ){
-					if( c.match(servername) )
-						return @:privateAccess {key: c.key.__k, cert: c.cert.__x};
+				for (c in altSNIContexts) {
+					if (c.match(servername))
+						return @:privateAccess {
+							key:c.key.__k, cert:c.cert.__x
+						};
 				}
-				if( ownKey != null && ownCert != null )
-					return @:privateAccess { key: ownKey.__k, cert: ownCert.__x };
+				if (ownKey != null && ownCert != null)
+					return @:privateAccess {
+						key:ownKey.__k, cert:ownCert.__x
+					};
 				return null;
 			}
-			NativeSsl.conf_set_servername_callback( conf, sniCallback );
+			NativeSsl.conf_set_servername_callback(conf, sniCallback);
 		}
 
-		if ( caCert != null ) 
-			NativeSsl.conf_set_ca( conf, caCert == null ? null : @:privateAccess caCert.__x  );
-		if( verifyCert == null )
-			NativeSsl.conf_set_verify( conf, 2 );
+		if (caCert != null)
+			NativeSsl.conf_set_ca(conf, caCert == null ? null : @:privateAccess caCert.__x);
+		if (verifyCert == null)
+			NativeSsl.conf_set_verify(conf, 2);
 		else
-			NativeSsl.conf_set_verify( conf, verifyCert ? 1 : 0 );
-		
+			NativeSsl.conf_set_verify(conf, verifyCert ? 1 : 0);
+
 		return conf;
 	}
 
-	static function __init__() : Void {
+	static function __init__():Void {
 		NativeSsl.init();
 	}
 }
diff --git a/std/cpp/_std/sys/thread/Deque.hx b/std/cpp/_std/sys/thread/Deque.hx
new file mode 100644
index 0000000000000000000000000000000000000000..36a6ed983f005736ec09972def4db8388d5c5ee8
--- /dev/null
+++ b/std/cpp/_std/sys/thread/Deque.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:coreApi
+class Deque<T> {
+	var q:Dynamic;
+
+	public function new() {
+		q = untyped __global__.__hxcpp_deque_create();
+	}
+
+	public function add(i:T):Void {
+		untyped __global__.__hxcpp_deque_add(q, i);
+	}
+
+	public function push(i:T):Void {
+		untyped __global__.__hxcpp_deque_push(q, i);
+	}
+
+	public function pop(block:Bool):Null<T> {
+		return untyped __global__.__hxcpp_deque_pop(q, block);
+	}
+}
diff --git a/std/cpp/_std/sys/thread/Lock.hx b/std/cpp/_std/sys/thread/Lock.hx
new file mode 100644
index 0000000000000000000000000000000000000000..992d4d1ddf425f0fc958a75fd469f76f33177ce5
--- /dev/null
+++ b/std/cpp/_std/sys/thread/Lock.hx
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:coreApi
+class Lock {
+	var l:Dynamic;
+
+	public function new() {
+		l = untyped __global__.__hxcpp_lock_create();
+	}
+
+	public function wait(?timeout:Float = -1):Bool {
+		return untyped __global__.__hxcpp_lock_wait(l, timeout);
+	}
+
+	public function release():Void {
+		untyped __global__.__hxcpp_lock_release(l);
+	}
+}
diff --git a/std/cpp/_std/sys/thread/Mutex.hx b/std/cpp/_std/sys/thread/Mutex.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8d10509df23d49149b96993c7832ee1f82b62cf6
--- /dev/null
+++ b/std/cpp/_std/sys/thread/Mutex.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:coreApi
+class Mutex {
+	var m:Dynamic;
+
+	public function new() {
+		m = untyped __global__.__hxcpp_mutex_create();
+	}
+
+	public function acquire():Void {
+		untyped __global__.__hxcpp_mutex_acquire(m);
+	}
+
+	public function tryAcquire():Bool {
+		return untyped __global__.__hxcpp_mutex_try(m);
+	}
+
+	public function release():Void {
+		untyped __global__.__hxcpp_mutex_release(m);
+	}
+}
diff --git a/std/cpp/_std/sys/thread/Thread.hx b/std/cpp/_std/sys/thread/Thread.hx
new file mode 100644
index 0000000000000000000000000000000000000000..44c9cedf75c342f86387c65fc3894578247bd8cd
--- /dev/null
+++ b/std/cpp/_std/sys/thread/Thread.hx
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:callable
+@:coreType
+private abstract ThreadHandle {}
+
+abstract Thread(ThreadHandle) {
+	inline function new(h:ThreadHandle):Void {
+		this = h;
+	}
+
+	public inline function sendMessage(msg:Dynamic):Void {
+		untyped __global__.__hxcpp_thread_send(this, msg);
+	}
+
+	public static inline function current():Thread {
+		return new Thread(untyped __global__.__hxcpp_thread_current());
+	}
+
+	public static inline function create(callb:Void->Void):Thread {
+		return new Thread(untyped __global__.__hxcpp_thread_create(callb));
+	}
+
+	public static function readMessage(block:Bool):Dynamic {
+		return untyped __global__.__hxcpp_thread_read_message(block);
+	}
+
+	@:op(A == B)
+	public inline function equals(other:Thread):Bool {
+		return getHandle() == other.getHandle();
+	}
+
+	private inline function getHandle():ThreadHandle {
+		return this;
+	}
+}
diff --git a/std/cpp/_std/sys/thread/Tls.hx b/std/cpp/_std/sys/thread/Tls.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7baad6ca4e2c16ab029366db0c841b66f8f3a068
--- /dev/null
+++ b/std/cpp/_std/sys/thread/Tls.hx
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:coreApi
+class Tls<T> {
+	static var sFreeSlot = 0;
+
+	var mTLSID:Int;
+
+	public var value(get, set):T;
+
+	public function new() {
+		mTLSID = sFreeSlot++;
+	}
+
+	function get_value():T {
+		return untyped __global__.__hxcpp_tls_get(mTLSID);
+	}
+
+	function set_value(v:T):T {
+		untyped __global__.__hxcpp_tls_set(mTLSID, v);
+		return v;
+	}
+}
diff --git a/std/cpp/abi/Abi.hx b/std/cpp/abi/Abi.hx
index c313080925cec46ad072e5d9d3b380fc8407e1a2..ca9b182c9d52470b59d08d0788350a5aad79a03b 100644
--- a/std/cpp/abi/Abi.hx
+++ b/std/cpp/abi/Abi.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.abi;
+
+package cpp.abi;
 
 // Base case, for calling conventions - means "use default"
-extern class Abi { }
+extern class Abi {}
diff --git a/std/cpp/abi/CDecl.hx b/std/cpp/abi/CDecl.hx
index 8b8cf6f5f397e00f2ea131a3b5734f440f8ea575..efecc84cc09309c12afb9a92848ce66bb0ce1afb 100644
--- a/std/cpp/abi/CDecl.hx
+++ b/std/cpp/abi/CDecl.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.abi;
+
+package cpp.abi;
 
 @:abi("__cdecl")
-extern class CDecl extends Abi { }
+extern class CDecl extends Abi {}
diff --git a/std/cpp/abi/FastCall.hx b/std/cpp/abi/FastCall.hx
index 921bfa2ff4bb4e64bb6f24703a19e4a75361476a..32b235e8422534273560112be16afca1e62f156f 100644
--- a/std/cpp/abi/FastCall.hx
+++ b/std/cpp/abi/FastCall.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.abi;
+
+package cpp.abi;
 
 @:abi("__fastcall")
-extern class FastCall extends Abi { }
+extern class FastCall extends Abi {}
diff --git a/std/cpp/abi/StdCall.hx b/std/cpp/abi/StdCall.hx
index 271f3d79ac72145c66d1c62ff0eb24e4d7edf7e5..f966adf17dc52ae0593d474e3d4494259dfeba82 100644
--- a/std/cpp/abi/StdCall.hx
+++ b/std/cpp/abi/StdCall.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.abi;
+
+package cpp.abi;
 
 @:abi("__stdcall")
-extern class StdCall extends Abi { }
+extern class StdCall extends Abi {}
diff --git a/std/cpp/abi/ThisCall.hx b/std/cpp/abi/ThisCall.hx
index 077f8294dd1b571bbcc977fd3031197bcf0ac108..ce5f6e951017da0ecbe9cc3a7da8f879af8dd950 100644
--- a/std/cpp/abi/ThisCall.hx
+++ b/std/cpp/abi/ThisCall.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.abi;
+
+package cpp.abi;
 
 @:abi("__thiscall")
-extern class ThisCall extends Abi { }
+extern class ThisCall extends Abi {}
diff --git a/std/cpp/abi/Winapi.hx b/std/cpp/abi/Winapi.hx
index 1ad8dd7be975f0916aa7023375899b53d6c54783..36580f9e3e0dae216d10063bc0c5fdfc7d54f317 100644
--- a/std/cpp/abi/Winapi.hx
+++ b/std/cpp/abi/Winapi.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.abi;
+
+package cpp.abi;
 
 @:abi("__stdcall")
-extern class Winapi extends Abi { }
+extern class Winapi extends Abi {}
diff --git a/std/cpp/cppia/Host.hx b/std/cpp/cppia/Host.hx
index 5efd1e9e99f31aa0c4975df5535274253833951f..cc3081c7397bd14e3c5c187d89c2e5833de0576c 100644
--- a/std/cpp/cppia/Host.hx
+++ b/std/cpp/cppia/Host.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,40 +19,48 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.cppia;
 
+package cpp.cppia;
 
-class Host
-{
-   public static function run(source:String)
-   {
-      var module = Module.fromString(source);
-      module.boot();
-      module.run();
-   }
+class Host {
+	#if utf16
+	public static function run(source:haxe.io.Bytes) {
+		var module = Module.fromData(source.getData());
+		module.boot();
+		module.run();
+	}
+	#else
+	public static function run(source:String) {
+		var module = Module.fromString(source);
+		module.boot();
+		module.run();
+	}
+	#end
 
-   public static function runFile(filename:String)
-   {
-      run( sys.io.File.getContent(filename) );
-   }
+	@:native("hx::EnableJit")
+	extern public static function enableJit(enable:Bool):Void;
 
+	public static function runFile(filename:String) {
+		var source = sys.io.File.getBytes(filename);
+		var module = Module.fromData(source.getData());
+		module.boot();
+		module.run();
+	}
 
-   public static function main()
-   {
-      var script = Sys.args()[0];
-      #if (!scriptable && !doc_gen)
-      #error "Please define scriptable to use cppia"
-      #end
-      if (script==null)
-      {
-         Sys.println("Usage : Cppia scriptname");
-      }
-      else
-      {
-         var source = sys.io.File.getContent(script);
-         var module = Module.fromString(source);
-         module.boot();
-         module.run();
-      }
-   }
+	public static function main() {
+		var args = Sys.args();
+		if (args.remove("-jit"))
+			enableJit(true);
+
+		var script = args[0];
+
+		#if (!scriptable && !doc_gen)
+		#error "Please define scriptable to use cppia"
+		#end
+		if (script == null) {
+			Sys.println("Usage : Cppia scriptname");
+		} else {
+			runFile(script);
+		}
+	}
 }
diff --git a/std/cpp/cppia/HostClasses.hx b/std/cpp/cppia/HostClasses.hx
index e12000bbf36cddf1753b8b93a0e6de99f52cf7a9..f8ebbc25e971dba7fbc36607f61048128c417c43 100644
--- a/std/cpp/cppia/HostClasses.hx
+++ b/std/cpp/cppia/HostClasses.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,250 +19,223 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.cppia;
+
+package cpp.cppia;
 
 import haxe.macro.Compiler;
 import haxe.macro.Context;
 import haxe.macro.Type;
-
 #if !macro
-  #if cppia
-  @:build(cpp.cppia.HostClasses.exclude())
-  #end
-class HostClasses { }
+#if cppia
+@:build(cpp.cppia.HostClasses.exclude())
+#end
+class HostClasses {}
 #else
-
 import Sys;
 import haxe.Constraints;
 
 @:noPackageRestrict
-class HostClasses
-{
-   static var classes = [
-   "cpp.Lib",
-   "cpp.NativeArray",
-   "cpp.NativeString",
-   "cpp.vm.Debugger",
-   "cpp.vm.Deque",
-   "cpp.vm.ExecutionTrace",
-   "cpp.vm.Gc",
-   "cpp.vm.Lock",
-   "cpp.vm.Mutex",
-   "cpp.vm.Profiler",
-   "cpp.vm.Thread",
-   "cpp.vm.Tls",
-   "cpp.vm.Unsafe",
-   "cpp.vm.WeakRef",
-   "cpp.Object",
-   "cpp.Int64",
-   "cpp.Finalizable",
-   "Std",
-   "StringBuf",
-   "sys.db.Mysql",
-   "sys.db.Sqlite",
-   "sys.FileSystem",
-   "sys.io.File",
-   "sys.io.FileInput",
-   "sys.net.UdpSocket",
-   "sys.net.Socket",
-   "sys.ssl.Certificate",
-   "sys.ssl.Digest",
-   "sys.ssl.Key",
-   "sys.ssl.Socket",
-   "Enum",
-   "EnumValue",
-   //"Sys",
-   "Type",
-   "Xml",
-   "Date",
-   "Lambda",
-   "DateTools",
-   "List",
-   "Math",
-   "Reflect",
-   "StringBuf",
-   "StringTools",
-
-   "haxe.ds.IntMap",
-   "haxe.ds.ObjectMap",
-   "haxe.ds.StringMap",
-   "haxe.ds.BalancedTree",
-   "haxe.CallStack",
-   "haxe.Serializer",
-   "haxe.Unserializer",
-   "haxe.Resource",
-   "haxe.Template",
-   "haxe.Utf8",
-   "haxe.Log",
-   "haxe.zip.Compress",
-   "haxe.zip.Uncompress",
-
-   "haxe.crypto.BaseCode",
-   "haxe.crypto.Sha256",
-   "haxe.crypto.Hmac",
-   "haxe.crypto.Crc32",
-   "haxe.crypto.Base64",
-   "haxe.crypto.Adler32",
-   "haxe.crypto.Md5",
-   "haxe.crypto.Sha1",
-
-   "haxe.io.BufferInput",
-   "haxe.io.Bytes",
-   "haxe.io.BytesBuffer",
-   "haxe.io.BytesData",
-   "haxe.io.BytesInput",
-   "haxe.io.BytesOutput",
-   "haxe.io.Eof",
-   "haxe.io.Error",
-   "haxe.io.FPHelper",
-   "haxe.io.Input",
-   "haxe.io.Output",
-   "haxe.io.Path",
-   "haxe.io.StringInput",
-   "haxe.xml.Parser",
-   "haxe.Json",
-
-   "haxe.CallStack",
-   "haxe.Resource",
-   "haxe.Utf8",
-   "haxe.Int64",
-   "haxe.Int32",
-   "haxe.Serializer",
-   "haxe.Unserializer",
-
-
-   "haxe.ds.ArraySort",
-   "haxe.ds.GenericStack",
-   "haxe.ds.ObjectMap",
-   "haxe.ds.Vector",
-   "haxe.ds.BalancedTree",
-   "haxe.ds.HashMap",
-   "haxe.ds.Option",
-   "haxe.ds.WeakMap",
-   "haxe.ds.EnumValueMap",
-   "haxe.ds.IntMap",
-   "haxe.ds.StringMap",
-
-   "StdTypes",
-   "Array",
-   "Class",
-   "Date",
-   "EReg",
-   "Enum",
-   "EnumValue",
-   // "IntIterator",
-   "List",
-   "Map",
-   "String",
-
-
-   ];
-
-
-   static function parseClassInfo(externs:Map<String,Bool>, filename:String)
-   {
-      if (sys.FileSystem.exists(filename))
-      {
-         var file = sys.io.File.read(filename);
-         try
-         {
-            while(true)
-            {
-               var line = file.readLine();
-               var parts = line.split(" ");
-               if (parts[0]=="class" || parts[0]=="interface" || parts[0]=="enum")
-                  externs.set(parts[1],true);
-            }
-         } catch( e : Dynamic ) { }
-         if (file!=null)
-            file.close();
-      }
-   }
-
-
-   static function onGenerateCppia(types:Array<Type>):Void
-   {
-      var externs = new Map<String,Bool>();
-      externs.set("Sys",true);
-      externs.set("haxe.IMap",true);
-      externs.set("haxe.crypto.HashMethod",true);
-      externs.set("haxe._Int64.Int64_Impl_",true);
-      externs.set("haxe._Int64.___Int64",true);
-      externs.set("haxe._Int32.Int32_Impl_",true);
-      externs.set("haxe._Int32.___Int32",true);
-      // Hidded in implementation classes
-      //externs.set("sys.db.RecordType",true);
-      externs.set("sys.db._Sqlite.SqliteConnection",true);
-      externs.set("sys.db._Sqlite.SqliteResultSet",true);
-      externs.set("sys.db._Mysql.MysqlConnection",true);
-      externs.set("sys.db._Mysql.MysqlResultSet",true);
-      externs.set("sys.net._Socket.SocketInput",true);
-      externs.set("sys.net._Socket.SocketOutput",true);
-      externs.set("sys.ssl._Socket.SocketInput",true);
-      externs.set("sys.ssl._Socket.SocketOutput",true);
-      externs.set("haxe.ds.TreeNode",true);
-      externs.set("haxe.xml.XmlParserException",true);
-      for(e in classes)
-         externs.set(e,true);
-
-
-      var define = Context.defined("dll_import") ? Context.definedValue("dll_import") : "1";
-      if (define!="1")
-         parseClassInfo(externs,define);
-      else
-      {
-         var tried = new Map<String, Bool>();
-         for(path in Context.getClassPath())
-            if (!tried.exists(path))
-            {
-                tried.set(path,true);
-                parseClassInfo(externs,path + "/export_classes.info");
-            }
-      }
-
-      for(type in types)
-      {
-         switch(type)
-         {
-            case TInst(classRef, params):
-               if (externs.exists(classRef.toString()))
-                    classRef.get().exclude();
-            case TEnum(enumRef, params):
-               if (externs.exists(enumRef.toString()))
-                    enumRef.get().exclude();
-            default:
-         }
-      }
-   }
-
-   // Exclude the standard classes, and any described in 'export_classes.info' files found in the classpath
-   public static function exclude()
-   {
-      if (Context.defined("cppia"))
-         Context.onGenerate(onGenerateCppia);
-      else
-         Context.error("cpp.cppia.excludeHostFiles is only for cppia code", Context.currentPos());
-      return Context.getBuildFields();
-   }
-
-
-   // Ensure that the standard classes are included in the host
-   public static function include()
-   {
-      Compiler.keep("haxe.IMap");
-      Compiler.keep("haxe.crypto.HashMethod");
-      Compiler.keep("haxe._Int64.Int64_Impl_");
-      Compiler.keep("haxe._Int32.Int32_Impl_");
-      Compiler.keep("haxe._Int64.___Int64");
-      Compiler.keep("haxe._Int32.___Int32");
-      for(cls in classes)
-      {
-         Context.getModule(cls);
-         Compiler.keep(cls);
-      }
-      return Context.getBuildFields();
-   }
+class HostClasses {
+	static var classes = [
+		"cpp.Lib",
+		"cpp.NativeArray",
+		"cpp.NativeString",
+		"cpp.vm.Debugger",
+		"cpp.vm.Deque",
+		"cpp.vm.ExecutionTrace",
+		"cpp.vm.Gc",
+		"cpp.vm.Lock",
+		"cpp.vm.Mutex",
+		"cpp.vm.Profiler",
+		"cpp.vm.Thread",
+		"cpp.vm.Tls",
+		"cpp.vm.Unsafe",
+		"cpp.vm.WeakRef",
+		"cpp.Object",
+		"cpp.Int64",
+		"cpp.Finalizable",
+		"Std",
+		"StringBuf",
+		"sys.db.Mysql",
+		"sys.db.Sqlite",
+		"sys.FileSystem",
+		"sys.io.File",
+		"sys.io.FileInput",
+		"sys.io.Process",
+		"sys.net.UdpSocket",
+		"sys.net.Socket",
+		"sys.ssl.Certificate",
+		"sys.ssl.Digest",
+		"sys.ssl.Key",
+		"sys.ssl.Socket",
+		"Enum",
+		"EnumValue",
+		// "Sys",
+		"Type",
+		"Xml",
+		"Date",
+		"Lambda",
+		"DateTools",
+		"List",
+		"Math",
+		"Reflect",
+		"StringBuf",
+		"StringTools",
+		"haxe.ds.IntMap",
+		"haxe.ds.ObjectMap",
+		"haxe.ds.StringMap",
+		"haxe.ds.BalancedTree",
+		"haxe.CallStack",
+		"haxe.Serializer",
+		"haxe.Unserializer",
+		"haxe.Resource",
+		"haxe.Template",
+		"haxe.Utf8",
+		"haxe.Log",
+		"haxe.zip.Compress",
+		"haxe.zip.Uncompress",
+		"haxe.crypto.BaseCode",
+		"haxe.crypto.Sha256",
+		"haxe.crypto.Hmac",
+		"haxe.crypto.Crc32",
+		"haxe.crypto.Base64",
+		"haxe.crypto.Adler32",
+		"haxe.crypto.Md5",
+		"haxe.crypto.Sha1",
+		"haxe.io.BufferInput",
+		"haxe.io.Bytes",
+		"haxe.io.BytesBuffer",
+		"haxe.io.BytesData",
+		"haxe.io.BytesInput",
+		"haxe.io.BytesOutput",
+		"haxe.io.Eof",
+		"haxe.io.Error",
+		"haxe.io.FPHelper",
+		"haxe.io.Input",
+		"haxe.io.Output",
+		"haxe.io.Path",
+		"haxe.io.StringInput",
+		"haxe.xml.Parser",
+		"haxe.Json",
+		"haxe.CallStack",
+		"haxe.Resource",
+		"haxe.Utf8",
+		"haxe.Int64",
+		"haxe.Int32",
+		"haxe.Serializer",
+		"haxe.Unserializer",
+		"haxe.ds.ArraySort",
+		"haxe.ds.GenericStack",
+		"haxe.ds.ObjectMap",
+		"haxe.ds.Vector",
+		"haxe.ds.BalancedTree",
+		"haxe.ds.HashMap",
+		"haxe.ds.Option",
+		"haxe.ds.WeakMap",
+		"haxe.ds.EnumValueMap",
+		"haxe.ds.IntMap",
+		"haxe.ds.StringMap",
+		"haxe.iterators.MapKeyValueIterator",
+		"StdTypes",
+		"Array",
+		"Class",
+		"Date",
+		"EReg",
+		"Enum",
+		"EnumValue",
+		// "IntIterator",
+		"List",
+		"Map",
+		"String",
+	];
+
+	static function parseClassInfo(externs:Map<String, Bool>, filename:String) {
+		if (sys.FileSystem.exists(filename)) {
+			var file = sys.io.File.read(filename);
+			try {
+				while (true) {
+					var line = file.readLine();
+					var parts = line.split(" ");
+					if (parts[0] == "class" || parts[0] == "interface" || parts[0] == "enum")
+						externs.set(parts[1], true);
+				}
+			} catch (e:Dynamic) {}
+			if (file != null)
+				file.close();
+		}
+	}
+
+	static function onGenerateCppia(types:Array<Type>):Void {
+		var externs = new Map<String, Bool>();
+		externs.set("Sys", true);
+		externs.set("haxe.IMap", true);
+		externs.set("haxe.crypto.HashMethod", true);
+		externs.set("haxe._Int64.Int64_Impl_", true);
+		externs.set("haxe._Int64.___Int64", true);
+		externs.set("haxe._Int32.Int32_Impl_", true);
+		externs.set("haxe._Int32.___Int32", true);
+		// Hidded in implementation classes
+		// externs.set("sys.db.RecordType",true);
+		externs.set("sys.db._Sqlite.SqliteConnection", true);
+		externs.set("sys.db._Sqlite.SqliteResultSet", true);
+		externs.set("sys.db._Mysql.MysqlConnection", true);
+		externs.set("sys.db._Mysql.MysqlResultSet", true);
+		externs.set("sys.net._Socket.SocketInput", true);
+		externs.set("sys.net._Socket.SocketOutput", true);
+		externs.set("sys.ssl._Socket.SocketInput", true);
+		externs.set("sys.ssl._Socket.SocketOutput", true);
+		externs.set("haxe.ds.TreeNode", true);
+		externs.set("haxe.xml.XmlParserException", true);
+		for (e in classes)
+			externs.set(e, true);
+
+		var define = Context.defined("dll_import") ? Context.definedValue("dll_import") : "1";
+		if (define != "1")
+			parseClassInfo(externs, define);
+		else {
+			var tried = new Map<String, Bool>();
+			for (path in Context.getClassPath())
+				if (!tried.exists(path)) {
+					tried.set(path, true);
+					parseClassInfo(externs, path + "/export_classes.info");
+				}
+		}
+
+		for (type in types) {
+			switch (type) {
+				case TInst(classRef, params):
+					if (externs.exists(classRef.toString()))
+						classRef.get().exclude();
+				case TEnum(enumRef, params):
+					if (externs.exists(enumRef.toString()))
+						enumRef.get().exclude();
+				default:
+			}
+		}
+	}
+
+	// Exclude the standard classes, and any described in 'export_classes.info' files found in the classpath
+	public static function exclude() {
+		if (Context.defined("cppia"))
+			Context.onGenerate(onGenerateCppia);
+		else
+			Context.error("cpp.cppia.excludeHostFiles is only for cppia code", Context.currentPos());
+		return Context.getBuildFields();
+	}
+
+	// Ensure that the standard classes are included in the host
+	public static function include() {
+		Compiler.keep("haxe.IMap");
+		Compiler.keep("haxe.crypto.HashMethod");
+		Compiler.keep("haxe._Int64.Int64_Impl_");
+		Compiler.keep("haxe._Int32.Int32_Impl_");
+		Compiler.keep("haxe._Int64.___Int64");
+		Compiler.keep("haxe._Int32.___Int32");
+		for (cls in classes) {
+			Context.getModule(cls);
+			Compiler.keep(cls);
+		}
+		return Context.getBuildFields();
+	}
 }
 #end
-
-
diff --git a/std/cpp/cppia/Module.hx b/std/cpp/cppia/Module.hx
index 8bcbee36d273a165976f51f1a926588f13332d59..10e2abf642f4f95e78b4e3f74b83bfa43a192a53 100644
--- a/std/cpp/cppia/Module.hx
+++ b/std/cpp/cppia/Module.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp.cppia;
 
+package cpp.cppia;
 
 @:native("hx::CppiaLoadedModule")
 @:build(cpp.cppia.HostClasses.include())
-extern class Module
-{
-   @:native("__scriptable_cppia_from_string")
-   public static function fromString(sourceCode:String) : Module;
-   public function boot():Void;
-   public function run():Void;
-   public function resolveClass(inName:String):Class<Dynamic>;
-}
+extern class Module {
+	@:native("__scriptable_cppia_from_string")
+	public static function fromString(sourceCode:String):Module;
+	@:native("__scriptable_cppia_from_data")
+	public static function fromData(data:haxe.io.BytesData):Module;
 
+	public function boot():Void;
+	public function run():Void;
+	public function resolveClass(inName:String):Class<Dynamic>;
+}
diff --git a/std/cpp/link/StaticMysql.hx b/std/cpp/link/StaticMysql.hx
index bf6a487f4445f0fc745185392c8f10438fb44a2f..39c58742fde413f10f683f94462efeb9fbae0b0e 100644
--- a/std/cpp/link/StaticMysql.hx
+++ b/std/cpp/link/StaticMysql.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,25 +19,22 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.link;
 
-#if (hxcpp_api_level>=330)
-class StaticMysql { }
+#if (hxcpp_api_level >= 330)
+class StaticMysql {}
 #else
-
-@:cppFileCode( 'extern "C" int mysql_register_prims();')
+@:cppFileCode('extern "C" int mysql_register_prims();')
 @:buildXml("
 <target id='haxe'>
   <lib name='${HXCPP}/lib/${BINDIR}/libmysql5${LIBEXTRA}${LIBEXT}'/>
   <lib name='ws2_32.lib' if='windows'/>
 </target>
 ")
-@:keep class StaticMysql
-{
-   static function __init__()
-   {
-     untyped __cpp__("mysql_register_prims();");
-   }
+@:keep class StaticMysql {
+	static function __init__() {
+		untyped __cpp__("mysql_register_prims();");
+	}
 }
-
 #end
diff --git a/std/cpp/link/StaticRegexp.hx b/std/cpp/link/StaticRegexp.hx
index 9e470c188c9bc34bcb2b59221e26d6f91fe0d09b..e9a984d0b5ef49a1ec36d1ebf8d72dd419155196 100644
--- a/std/cpp/link/StaticRegexp.hx
+++ b/std/cpp/link/StaticRegexp.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,24 +19,21 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.link;
 
-#if (hxcpp_api_level>=330)
-class StaticRegexp { }
+#if (hxcpp_api_level >= 330)
+class StaticRegexp {}
 #else
-
-@:cppFileCode( 'extern "C" int regexp_register_prims();')
+@:cppFileCode('extern "C" int regexp_register_prims();')
 @:buildXml("
 <target id='haxe'>
   <lib name='${HXCPP}/lib/${BINDIR}/libregexp${LIBEXTRA}${LIBEXT}'/>
 </target>
 ")
-@:keep class StaticRegexp
-{
-   static function __init__()
-   {
-     untyped __cpp__("regexp_register_prims();");
-   }
+@:keep class StaticRegexp {
+	static function __init__() {
+		untyped __cpp__("regexp_register_prims();");
+	}
 }
-
 #end
diff --git a/std/cpp/link/StaticSqlite.hx b/std/cpp/link/StaticSqlite.hx
index dcc34722e7338d0d726108e6a6d7e9cfe229cefe..23e0ded09fda8ca09943f9f13c21f07441b3d935 100644
--- a/std/cpp/link/StaticSqlite.hx
+++ b/std/cpp/link/StaticSqlite.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,25 +19,22 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.link;
 
-#if (hxcpp_api_level>=330)
-class StaticSqlite { }
+#if (hxcpp_api_level >= 330)
+class StaticSqlite {}
 #else
-
-@:cppFileCode( 'extern "C" int sqlite_register_prims();')
+@:cppFileCode('extern "C" int sqlite_register_prims();')
 @:buildXml("
 <target id='haxe'>
   <lib name='${HXCPP}/lib/${BINDIR}/libsqlite${LIBEXTRA}${LIBEXT}'/>
   <lib name='-lpthread' if='linux'/>
 </target>
 ")
-@:keep class StaticSqlite
-{
-   static function __init__()
-   {
-     untyped __cpp__("sqlite_register_prims();");
-   }
+@:keep class StaticSqlite {
+	static function __init__() {
+		untyped __cpp__("sqlite_register_prims();");
+	}
 }
-
 #end
diff --git a/std/cpp/link/StaticStd.hx b/std/cpp/link/StaticStd.hx
index d65097c3d589954eefe16de25c44ae25a35e22f1..ca7b46fbb1e3fc53614c1dbdc26ee1cb5da94013 100644
--- a/std/cpp/link/StaticStd.hx
+++ b/std/cpp/link/StaticStd.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,25 +19,22 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.link;
 
-#if (hxcpp_api_level>=330)
-class StaticStd { }
+#if (hxcpp_api_level >= 330)
+class StaticStd {}
 #else
-
-@:cppFileCode( 'extern "C" int std_register_prims();')
+@:cppFileCode('extern "C" int std_register_prims();')
 @:buildXml("
 <target id='haxe'>
   <lib name='${HXCPP}/lib/${BINDIR}/libstd${LIBEXTRA}${LIBEXT}'/>
    <lib name='ws2_32.lib' if='windows'/>
 </target>
 ")
-@:keep class StaticStd
-{
-   static function __init__()
-   {
-     untyped __cpp__("std_register_prims();");
-   }
+@:keep class StaticStd {
+	static function __init__() {
+		untyped __cpp__("std_register_prims();");
+	}
 }
-
 #end
diff --git a/std/cpp/link/StaticZlib.hx b/std/cpp/link/StaticZlib.hx
index ef71a56818e15b91a4ff222e0522827821c930fb..a47741f0d8f85abe2b9ba91b1d95e434caab117f 100644
--- a/std/cpp/link/StaticZlib.hx
+++ b/std/cpp/link/StaticZlib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,25 +19,21 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.link;
 
-#if (hxcpp_api_level>=330)
-class StaticZlib { }
+#if (hxcpp_api_level >= 330)
+class StaticZlib {}
 #else
-
-@:cppFileCode( 'extern "C" int zlib_register_prims();')
+@:cppFileCode('extern "C" int zlib_register_prims();')
 @:buildXml("
 <target id='haxe'>
   <lib name='${HXCPP}/lib/${BINDIR}/libzlib${LIBEXTRA}${LIBEXT}'/>
 </target>
 ")
-@:keep class StaticZlib
-{
-   static function __init__()
-   {
-     untyped __cpp__("zlib_register_prims();");
-   }
+@:keep class StaticZlib {
+	static function __init__() {
+		untyped __cpp__("zlib_register_prims();");
+	}
 }
-
 #end
-
diff --git a/std/cpp/net/Poll.hx b/std/cpp/net/Poll.hx
index 58a502d4a84a3c3fba5a956760c492e03c194d95..fb7dbf70901f0aa07c7db130ebbd3ca388a74acd 100644
--- a/std/cpp/net/Poll.hx
+++ b/std/cpp/net/Poll.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,36 +19,39 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.net;
+
 import sys.net.Socket;
 import cpp.NativeSocket;
 
 class Poll {
+	var mPollHandle:Dynamic;
 
-	var mPollHandle : Dynamic;
-	public var readIndexes : Array<Int>;
-	public var writeIndexes : Array<Int>;
+	public var readIndexes:Array<Int>;
+	public var writeIndexes:Array<Int>;
 
-	public function new( n : Int ) {
+	public function new(n:Int) {
 		mPollHandle = NativeSocket.socket_poll_alloc(n);
 		readIndexes = [];
 		writeIndexes = [];
 	}
 
-	public function prepare( read : Array<Socket>, write : Array<Socket> ) {
-		var k = NativeSocket.socket_poll_prepare(mPollHandle,read,write);
+	public function prepare(read:Array<Socket>, write:Array<Socket>) {
+		var k = NativeSocket.socket_poll_prepare(mPollHandle, read, write);
 		readIndexes = k[0];
 		writeIndexes = k[1];
 	}
 
-	public function events( ?t : Float ) {
-		if (t==null) t=-1.0;
-		NativeSocket.socket_poll_events(mPollHandle,t);
+	public function events(?t:Float) {
+		if (t == null)
+			t = -1.0;
+		NativeSocket.socket_poll_events(mPollHandle, t);
 	}
 
-	public function poll( a : Array<Socket>, ?t : Float ) : Array<Socket> {
-		if (t==null) t=-1.0;
-		return NativeSocket.socket_poll(a,mPollHandle,t);
+	public function poll(a:Array<Socket>, ?t:Float):Array<Socket> {
+		if (t == null)
+			t = -1.0;
+		return NativeSocket.socket_poll(a, mPollHandle, t);
 	}
-
 }
diff --git a/std/cpp/net/ThreadServer.hx b/std/cpp/net/ThreadServer.hx
index 54d85faeb66e04da2a21a941a02226bca23b0333..cecdb5f3aa66a38eede6e8d696ac4714782ab833 100644
--- a/std/cpp/net/ThreadServer.hx
+++ b/std/cpp/net/ThreadServer.hx
@@ -1,24 +1,25 @@
 /*
-* Copyright (C)2005-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.
-*/
+ * Copyright (C)2005-2019 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 cpp.net;
 
 import cpp.vm.Thread;
@@ -26,339 +27,337 @@ import cpp.net.Poll;
 import cpp.vm.Lock;
 
 private typedef ThreadInfos = {
-        var id : Int;
-        var t : Thread;
-        var p : Poll;
-        var socks : Array<sys.net.Socket>;
+	var id:Int;
+	var t:Thread;
+	var p:Poll;
+	var socks:Array<sys.net.Socket>;
 }
 
 private typedef ClientInfos<Client> = {
-        var client : Client;
-        var sock : sys.net.Socket;
-        var thread : ThreadInfos;
-        var buf : haxe.io.Bytes;
-        var bufpos : Int;
+	var client:Client;
+	var sock:sys.net.Socket;
+	var thread:ThreadInfos;
+	var buf:haxe.io.Bytes;
+	var bufpos:Int;
 }
 
 /**
-    The ThreadServer can be used to easily create a multithreaded server where each thread polls multiple connections. 
-    To use it, at a minimum you must override or rebind clientConnected, readClientMessage, and clientMessage and you must define your Client and Message.
+	The ThreadServer can be used to easily create a multithreaded server where each thread polls multiple connections.
+	To use it, at a minimum you must override or rebind clientConnected, readClientMessage, and clientMessage and you must define your Client and Message.
 **/
-class ThreadServer<Client,Message> {
-
-        var threads : Array<ThreadInfos>;
-        var sock : sys.net.Socket;
-        var worker : Thread;
-        var timer : Thread;
-
-        /**
-            Number of total connections the server will accept.
-        **/
-        public var listen : Int;
-
-        /**
-            Number of server threads.
-        **/
-        public var nthreads : Int;
-
-        /**
-            Polling timeout.
-        **/
-        public var connectLag : Float;
-
-        /**
-            Stream to send error messages.
-        **/
-        public var errorOutput : haxe.io.Output;
-
-        /**
-            Space allocated to buffers when they are created.
-        **/
-        public var initialBufferSize : Int;
-
-        /**
-            Maximum size of buffered data read from a socket. An exception is thrown if the buffer exceeds this value.
-        **/
-        public var maxBufferSize : Int;
-
-        /**
-            Minimum message size.
-        **/
-        public var messageHeaderSize : Int;
-
-        /**
-            Time between calls to update.
-        **/
-        public var updateTime : Float;
-
-        /**
-            The most sockets a thread will handle.
-        **/
-        public var maxSockPerThread : Int;
-
-        /**
-            Creates a ThreadServer.
-        **/
-        public function new() {
-                threads = new Array();
-                nthreads = if( Sys.systemName() == "Windows" ) 150 else 10;
-                messageHeaderSize = 1;
-                listen = 10;
-                connectLag = 0.5;
-                errorOutput = Sys.stderr();
-                initialBufferSize = (1 << 10);
-                maxBufferSize = (1 << 16);
-                maxSockPerThread = 64;
-                updateTime = 1;
-        }
-
-        function runThread(t) {
-                while( true ) {
-                        try {
-                                loopThread(t);
-                        } catch( e : Dynamic ) {
-                                logError(e);
-                        }
-                }
-        }
-
-        function readClientData( c : ClientInfos<Client> ) {
-                var available = c.buf.length - c.bufpos;
-                if( available == 0 ) {
-                        var newsize = c.buf.length * 2;
-                        if( newsize > maxBufferSize ) {
-                                newsize = maxBufferSize;
-                                if( c.buf.length == maxBufferSize )
-                                        throw "Max buffer size reached";
-                        }
-                        var newbuf = haxe.io.Bytes.alloc(newsize);
-                        newbuf.blit(0,c.buf,0,c.bufpos);
-                        c.buf = newbuf;
-                        available = newsize - c.bufpos;
-                }
-                var bytes = c.sock.input.readBytes(c.buf,c.bufpos,available);
-                var pos = 0;
-                var len = c.bufpos + bytes;
-                while( len >= messageHeaderSize ) {
-                        var m = readClientMessage(c.client,c.buf,pos,len);
-                        if( m == null )
-                                break;
-                        pos += m.bytes;
-                        len -= m.bytes;
-                        work(clientMessage.bind(c.client,m.msg));
-                }
-                if( pos > 0 )
-                        c.buf.blit(0,c.buf,pos,len);
-                c.bufpos = len;
-        }
-
-        function loopThread( t : ThreadInfos ) {
-                if( t.socks.length > 0 )
-                        for( s in t.p.poll(t.socks,connectLag) ) {
-                                var infos : ClientInfos<Client> = s.custom;
-                                try {
-                                        readClientData(infos);
-                                } catch( e : Dynamic ) {
-                                        t.socks.remove(s);
-                                        if( !Std.is(e,haxe.io.Eof) && !Std.is(e,haxe.io.Error) )
-                                                logError(e);
-                                        work(doClientDisconnected.bind(s,infos.client));
-                                }
-                        }
-                while( true ) {
-                        var m : { s : sys.net.Socket, cnx : Bool } = Thread.readMessage(t.socks.length == 0);
-                        if( m == null )
-                                break;
-                        if( m.cnx )
-                                t.socks.push(m.s);
-                        else if( t.socks.remove(m.s) ) {
-                                var infos : ClientInfos<Client> = m.s.custom;
-                                work(doClientDisconnected.bind(m.s,infos.client));
-                        }
-                }
-        }
-
-        function doClientDisconnected(s,c) {
-                try s.close() catch( e : Dynamic ) {};
-                clientDisconnected(c);
-        }
-
-        function runWorker() {
-                while( true ) {
-                        var f = Thread.readMessage(true);
-                        try {
-                                f();
-                        } catch( e : Dynamic ) {
-                                logError(e);
-                        }
-                        try {
-                                afterEvent();
-                        } catch( e : Dynamic ) {
-                                logError(e);
-                        }
-                }
-        }
-
-        /**
-            Internally used to delegate something to the worker thread.
-        **/
-        public function work( f : Void -> Void ) {
-                worker.sendMessage(f);
-        }
-
-        function logError( e : Dynamic ) {
-                var stack = haxe.CallStack.exceptionStack();
-                if( Thread.current() == worker )
-                        onError(e,stack);
-                else
-                        work(onError.bind(e,stack));
-        }
-
-        function addClient( sock : sys.net.Socket ) {
-                var start = Std.random(nthreads);
-                for( i in 0...nthreads ) {
-                        var t = threads[(start + i)%nthreads];
-                        if( t.socks.length < maxSockPerThread ) {
-                                var infos : ClientInfos<Client> = {
-                                        thread : t,
-                                        client : clientConnected(sock),
-                                        sock : sock,
-                                        buf : haxe.io.Bytes.alloc(initialBufferSize),
-                                        bufpos : 0,
-                                };
-                                sock.custom = infos;
-                                infos.thread.t.sendMessage({ s : sock, cnx : true });
-                                return;
-                        }
-                }
-                refuseClient(sock);
-        }
-
-        function refuseClient( sock : sys.net.Socket) {
-                // we have reached maximum number of active clients
-                sock.close();
-        }
-
-        function runTimer() {
-                var l = new Lock();
-                while( true ) {
-                        l.wait(updateTime);
-                        work(update);
-                }
-        }
-
-        function init() {
-                worker = Thread.create(runWorker);
-                timer = Thread.create(runTimer);
-                for( i in 0...nthreads ) {
-                        var t = {
-                                id : i,
-                                t : null,
-                                socks : new Array(),
-                                p : new Poll(maxSockPerThread),
-                        };
-                        threads.push(t);
-                        t.t = Thread.create(runThread.bind(t));
-                }
-        }
-
-        /**
-            Called when the server gets a new connection.
-        **/
-        public function addSocket( s : sys.net.Socket ) {
-                s.setBlocking(false);
-                work(addClient.bind(s));
-        }
-
-        /**
-            Start the server at the specified host and port.
-        **/
-        public function run( host, port ) {
-                sock = new sys.net.Socket();
-                sock.bind(new sys.net.Host(host),port);
-                sock.listen(listen);
-                init();
-                while( true ) {
-                        try {
-                                addSocket(sock.accept());
-                        } catch( e : Dynamic ) {
-                                logError(e);
-                        }
-                }
-        }
-
-        /**
-            Send data to a client. 
-        **/
-        public function sendData( s : sys.net.Socket, data : String ) {
-                try {
-                        s.write(data);
-                } catch( e : Dynamic ) {
-                        stopClient(s);
-                }
-        }
-
-        /**
-            Shutdown a client's connection and remove them from the server.
-        **/
-        public function stopClient( s : sys.net.Socket ) {
-                var infos : ClientInfos<Client> = s.custom;
-                try s.shutdown(true,true) catch( e : Dynamic ) { };
-                infos.thread.t.sendMessage({ s : s, cnx : false });
-        }
-
-        // --- CUSTOMIZABLE API ---
-
-        /**
-            Called when an error has ocurred.
-        **/
-        public dynamic function onError( e : Dynamic, stack ) {
-                var estr = try Std.string(e) catch( e2 : Dynamic ) "???" + try "["+Std.string(e2)+"]" catch( e : Dynamic ) "";
-                errorOutput.writeString( estr + "\n" + haxe.CallStack.toString(stack) );
-                errorOutput.flush();
-        }
-
-        /**
-            Called when a client connects. Returns a client object.
-        **/
-        public dynamic function clientConnected( s : sys.net.Socket ) : Client {
-                return null;
-        }
-
-        /**
-            Called when a client disconnects or an error forces the connection to close.
-        **/
-        public dynamic function clientDisconnected( c : Client ) {
-        }
-
-        /**
-            Called when data has been read from a socket. This method should try to extract a message from the buffer.
-            The available data resides in buf, starts at pos, and is len bytes wide. Return the new message and the number of bytes read from the buffer. 
-            If no message could be read, return null.
-        **/
-        public dynamic function readClientMessage( c : Client, buf : haxe.io.Bytes, pos : Int, len : Int ) : { msg : Message, bytes : Int } {
-                return {
-                        msg : null,
-                        bytes : len,
-                };
-        }
-
-        /**
-            Called when a message has been recieved. Message handling code should go here.
-        **/
-        public dynamic function clientMessage( c : Client, msg : Message ) {
-        }
-
-        /**
-            This method is called periodically. It can be used to do server maintenance.
-        **/
-        public dynamic function update() {
-        }
-
-        /**
-            Called after a client connects, disconnects, a message is received, or an update is performed.
-        **/
-        public dynamic function afterEvent() {
-        }
-
+class ThreadServer<Client, Message> {
+	var threads:Array<ThreadInfos>;
+	var sock:sys.net.Socket;
+	var worker:Thread;
+	var timer:Thread;
+
+	/**
+		Number of total connections the server will accept.
+	**/
+	public var listen:Int;
+
+	/**
+		Number of server threads.
+	**/
+	public var nthreads:Int;
+
+	/**
+		Polling timeout.
+	**/
+	public var connectLag:Float;
+
+	/**
+		Stream to send error messages.
+	**/
+	public var errorOutput:haxe.io.Output;
+
+	/**
+		Space allocated to buffers when they are created.
+	**/
+	public var initialBufferSize:Int;
+
+	/**
+		Maximum size of buffered data read from a socket. An exception is thrown if the buffer exceeds this value.
+	**/
+	public var maxBufferSize:Int;
+
+	/**
+		Minimum message size.
+	**/
+	public var messageHeaderSize:Int;
+
+	/**
+		Time between calls to update.
+	**/
+	public var updateTime:Float;
+
+	/**
+		The most sockets a thread will handle.
+	**/
+	public var maxSockPerThread:Int;
+
+	/**
+		Creates a ThreadServer.
+	**/
+	public function new() {
+		threads = new Array();
+		nthreads = if (Sys.systemName() == "Windows") 150 else 10;
+		messageHeaderSize = 1;
+		listen = 10;
+		connectLag = 0.5;
+		errorOutput = Sys.stderr();
+		initialBufferSize = (1 << 10);
+		maxBufferSize = (1 << 16);
+		maxSockPerThread = 64;
+		updateTime = 1;
+	}
+
+	function runThread(t) {
+		while (true) {
+			try {
+				loopThread(t);
+			} catch (e:Dynamic) {
+				logError(e);
+			}
+		}
+	}
+
+	function readClientData(c:ClientInfos<Client>) {
+		var available = c.buf.length - c.bufpos;
+		if (available == 0) {
+			var newsize = c.buf.length * 2;
+			if (newsize > maxBufferSize) {
+				newsize = maxBufferSize;
+				if (c.buf.length == maxBufferSize)
+					throw "Max buffer size reached";
+			}
+			var newbuf = haxe.io.Bytes.alloc(newsize);
+			newbuf.blit(0, c.buf, 0, c.bufpos);
+			c.buf = newbuf;
+			available = newsize - c.bufpos;
+		}
+		var bytes = c.sock.input.readBytes(c.buf, c.bufpos, available);
+		var pos = 0;
+		var len = c.bufpos + bytes;
+		while (len >= messageHeaderSize) {
+			var m = readClientMessage(c.client, c.buf, pos, len);
+			if (m == null)
+				break;
+			pos += m.bytes;
+			len -= m.bytes;
+			work(clientMessage.bind(c.client, m.msg));
+		}
+		if (pos > 0)
+			c.buf.blit(0, c.buf, pos, len);
+		c.bufpos = len;
+	}
+
+	function loopThread(t:ThreadInfos) {
+		if (t.socks.length > 0)
+			for (s in t.p.poll(t.socks, connectLag)) {
+				var infos:ClientInfos<Client> = s.custom;
+				try {
+					readClientData(infos);
+				} catch (e:Dynamic) {
+					t.socks.remove(s);
+					if (!Std.is(e, haxe.io.Eof) && !Std.is(e, haxe.io.Error))
+						logError(e);
+					work(doClientDisconnected.bind(s, infos.client));
+				}
+			}
+		while (true) {
+			var m:{s:sys.net.Socket, cnx:Bool} = Thread.readMessage(t.socks.length == 0);
+			if (m == null)
+				break;
+			if (m.cnx)
+				t.socks.push(m.s);
+			else if (t.socks.remove(m.s)) {
+				var infos:ClientInfos<Client> = m.s.custom;
+				work(doClientDisconnected.bind(m.s, infos.client));
+			}
+		}
+	}
+
+	function doClientDisconnected(s:sys.net.Socket, c) {
+		try
+			s.close()
+		catch (e:Dynamic) {};
+		clientDisconnected(c);
+	}
+
+	function runWorker() {
+		while (true) {
+			var f = Thread.readMessage(true);
+			try {
+				f();
+			} catch (e:Dynamic) {
+				logError(e);
+			}
+			try {
+				afterEvent();
+			} catch (e:Dynamic) {
+				logError(e);
+			}
+		}
+	}
+
+	/**
+		Internally used to delegate something to the worker thread.
+	**/
+	public function work(f:Void->Void) {
+		worker.sendMessage(f);
+	}
+
+	function logError(e:Dynamic) {
+		var stack = haxe.CallStack.exceptionStack();
+		if (Thread.current() == worker)
+			onError(e, stack);
+		else
+			work(onError.bind(e, stack));
+	}
+
+	function addClient(sock:sys.net.Socket) {
+		var start = Std.random(nthreads);
+		for (i in 0...nthreads) {
+			var t = threads[(start + i) % nthreads];
+			if (t.socks.length < maxSockPerThread) {
+				var infos:ClientInfos<Client> = {
+					thread: t,
+					client: clientConnected(sock),
+					sock: sock,
+					buf: haxe.io.Bytes.alloc(initialBufferSize),
+					bufpos: 0,
+				};
+				sock.custom = infos;
+				infos.thread.t.sendMessage({s: sock, cnx: true});
+				return;
+			}
+		}
+		refuseClient(sock);
+	}
+
+	function refuseClient(sock:sys.net.Socket) {
+		// we have reached maximum number of active clients
+		sock.close();
+	}
+
+	function runTimer() {
+		var l = new Lock();
+		while (true) {
+			l.wait(updateTime);
+			work(update);
+		}
+	}
+
+	function init() {
+		worker = Thread.create(runWorker);
+		timer = Thread.create(runTimer);
+		for (i in 0...nthreads) {
+			var t = {
+				id: i,
+				t: null,
+				socks: new Array(),
+				p: new Poll(maxSockPerThread),
+			};
+			threads.push(t);
+			t.t = Thread.create(runThread.bind(t));
+		}
+	}
+
+	/**
+		Called when the server gets a new connection.
+	**/
+	public function addSocket(s:sys.net.Socket) {
+		s.setBlocking(false);
+		work(addClient.bind(s));
+	}
+
+	/**
+		Start the server at the specified host and port.
+	**/
+	public function run(host, port) {
+		sock = new sys.net.Socket();
+		sock.bind(new sys.net.Host(host), port);
+		sock.listen(listen);
+		init();
+		while (true) {
+			try {
+				addSocket(sock.accept());
+			} catch (e:Dynamic) {
+				logError(e);
+			}
+		}
+	}
+
+	/**
+		Send data to a client.
+	**/
+	public function sendData(s:sys.net.Socket, data:String) {
+		try {
+			s.write(data);
+		} catch (e:Dynamic) {
+			stopClient(s);
+		}
+	}
+
+	/**
+		Shutdown a client's connection and remove them from the server.
+	**/
+	public function stopClient(s:sys.net.Socket) {
+		var infos:ClientInfos<Client> = s.custom;
+		try
+			s.shutdown(true, true)
+		catch (e:Dynamic) {};
+		infos.thread.t.sendMessage({s: s, cnx: false});
+	}
+
+	// --- CUSTOMIZABLE API ---
+
+	/**
+		Called when an error has ocurred.
+	**/
+	public dynamic function onError(e:Dynamic, stack) {
+		var estr = try Std.string(e) catch (e2:Dynamic) "???" + try "[" + Std.string(e2) + "]" catch (e:Dynamic) "";
+		errorOutput.writeString(estr + "\n" + haxe.CallStack.toString(stack));
+		errorOutput.flush();
+	}
+
+	/**
+		Called when a client connects. Returns a client object.
+	**/
+	public dynamic function clientConnected(s:sys.net.Socket):Client {
+		return null;
+	}
+
+	/**
+		Called when a client disconnects or an error forces the connection to close.
+	**/
+	public dynamic function clientDisconnected(c:Client) {}
+
+	/**
+		Called when data has been read from a socket. This method should try to extract a message from the buffer.
+		The available data resides in buf, starts at pos, and is len bytes wide. Return the new message and the number of bytes read from the buffer.
+		If no message could be read, return null.
+	**/
+	public dynamic function readClientMessage(c:Client, buf:haxe.io.Bytes, pos:Int, len:Int):{msg:Message, bytes:Int} {
+		return {
+			msg: null,
+			bytes: len,
+		};
+	}
+
+	/**
+		Called when a message has been recieved. Message handling code should go here.
+	**/
+	public dynamic function clientMessage(c:Client, msg:Message) {}
+
+	/**
+		This method is called periodically. It can be used to do server maintenance.
+	**/
+	public dynamic function update() {}
+
+	/**
+		Called after a client connects, disconnects, a message is received, or an update is performed.
+	**/
+	public dynamic function afterEvent() {}
 }
diff --git a/std/cpp/objc/NSData.hx b/std/cpp/objc/NSData.hx
index 9980c8bda6ae967fd32bfab89589faf3ebfba5c4..d73348cc3ddbd8c74c4e751f23bb7428ba860283 100644
--- a/std/cpp/objc/NSData.hx
+++ b/std/cpp/objc/NSData.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,33 +19,34 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.objc;
 
-@:native("NSData") @:objc extern class NSDataData { }
+@:native("NSData") @:objc extern class NSDataData {}
 
 @:objc
-extern abstract NSData( NSDataData )
-{
-   @:native("_hx_value_to_objc") @:extern static function to_data(b:haxe.io.BytesData) : NSData return null;
-   @:native("_hx_value_to_objc") @:extern static function to_data_data(b:haxe.io.BytesData) : NSDataData return null;
-   @:native("_hx_objc_to_bytes") @:extern static function NSDataDataToBytes(d:NSDataData) : haxe.io.BytesData return null;
+extern abstract NSData(NSDataData) {
+	@:native("_hx_value_to_objc") extern static function to_data(b:haxe.io.BytesData):NSData;
 
+	@:native("_hx_value_to_objc") extern static function to_data_data(b:haxe.io.BytesData):NSDataData;
 
-   inline function new(d:NSDataData) this = d;
+	@:native("_hx_objc_to_bytes") extern static function NSDataDataToBytes(d:NSDataData):haxe.io.BytesData;
 
-   @:from @:extern
-   static public inline function fromBytesData(d:haxe.io.BytesData):NSData return new NSData( to_data_data(d) );
+	inline function new(d:NSDataData)
+		this = d;
 
-   @:from @:extern
-   static public inline function fromBytes(d:haxe.io.Bytes):NSData return new NSData( to_data_data(d.getData()) );
+	@:from extern static public inline function fromBytesData(d:haxe.io.BytesData):NSData
+		return new NSData(to_data_data(d));
 
-   @:to @:extern
-   public inline function toBytesData():haxe.io.BytesData return NSDataDataToBytes(this);
+	@:from extern static public inline function fromBytes(d:haxe.io.Bytes):NSData
+		return new NSData(to_data_data(d.getData()));
 
-   @:to @:extern
-   public inline function toBytes():haxe.io.Bytes return haxe.io.Bytes.ofData(NSDataDataToBytes(this));
+	@:to extern public inline function toBytesData():haxe.io.BytesData
+		return NSDataDataToBytes(this);
 
-   @:to @:extern public inline function toNSObject():NSObject return cast this;
+	@:to extern public inline function toBytes():haxe.io.Bytes
+		return haxe.io.Bytes.ofData(NSDataDataToBytes(this));
 
+	@:to extern public inline function toNSObject():NSObject
+		return cast this;
 }
-
diff --git a/std/cpp/objc/NSDictionary.hx b/std/cpp/objc/NSDictionary.hx
index a8dd97d6a15d126479a8d5690c0ae416fb463fd6..e26ae98b6568bc056dfbe6f810ab5147c657a687 100644
--- a/std/cpp/objc/NSDictionary.hx
+++ b/std/cpp/objc/NSDictionary.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,26 +19,26 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.objc;
 
-@:native("NSDictionary<NSString *, id>") @:objc extern class DictionaryData { }
+@:native("NSDictionary<NSString *, id>") @:objc extern class DictionaryData {}
 
 @:objc
-extern abstract NSDictionary( DictionaryData )
-{
-   @:native("_hx_obj_to_nsdictionary") @:extern static function _hx_obj_to_nsdictionary(obj:Dynamic) : DictionaryData return null;
-   @:native("_hx_nsdictionary_to_obj") @:extern static function _hx_nsdictionary_to_obj(d:DictionaryData) : Dynamic return null;
-
+extern abstract NSDictionary(DictionaryData) {
+	@:native("_hx_obj_to_nsdictionary") extern static function _hx_obj_to_nsdictionary(obj:Dynamic):DictionaryData;
 
-   inline function new(dict:DictionaryData) this = dict;
+	@:native("_hx_nsdictionary_to_obj") extern static function _hx_nsdictionary_to_obj(d:DictionaryData):Dynamic;
 
-   @:from @:extern
-   static public inline function fromDynamic(o:Dynamic):NSDictionary return new NSDictionary( _hx_obj_to_nsdictionary(o) );
+	inline function new(dict:DictionaryData)
+		this = dict;
 
-   @:to @:extern
-   public inline function toDynamic():Dynamic return _hx_nsdictionary_to_obj(this);
+	@:from extern static public inline function fromDynamic(o:Dynamic):NSDictionary
+		return new NSDictionary(_hx_obj_to_nsdictionary(o));
 
-   @:to @:extern public inline function toNSObject():NSObject return cast this;
+	@:to extern public inline function toDynamic():Dynamic
+		return _hx_nsdictionary_to_obj(this);
 
+	@:to extern public inline function toNSObject():NSObject
+		return cast this;
 }
-
diff --git a/std/cpp/objc/NSError.hx b/std/cpp/objc/NSError.hx
index 2510d66d96dd51001128c538657dc17047601699..0cea993a36858090dad1ee88dfda7c84a8ba92ea 100644
--- a/std/cpp/objc/NSError.hx
+++ b/std/cpp/objc/NSError.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.objc;
 
 @:objc
 @:native("NSError")
-extern class NSError
-{
-   public var localizedDescription(default,null):NSString;
+extern class NSError {
+	public var localizedDescription(default, null):NSString;
 }
-
diff --git a/std/cpp/objc/NSLog.hx b/std/cpp/objc/NSLog.hx
index 9bba4c32737482e506c6ad0dad3533d406e42d62..19b792dfa3e0c4a856a5f1662f39327e9080e7e6 100644
--- a/std/cpp/objc/NSLog.hx
+++ b/std/cpp/objc/NSLog.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp.objc;
 
-extern class NSLog
-{
-   @:native("NSLog")
-   @:overload(function(format:NSString,a0:NSObject):Void { })
-   @:overload(function(format:NSString,a0:NSObject,a1:NSObject):Void { })
-   public static function log(format:NSString):Void;
+package cpp.objc;
 
+extern class NSLog {
+	@:native("NSLog")
+	@:overload(function(format:NSString, a0:NSObject):Void {})
+	@:overload(function(format:NSString, a0:NSObject, a1:NSObject):Void {})
+	public static function log(format:NSString):Void;
 }
-
-
diff --git a/std/cpp/objc/NSObject.hx b/std/cpp/objc/NSObject.hx
index 9c8398d85006342b62e3f4e69038105450c1b1c3..6055999db02a0367edb8829e95228b7430c5dc67 100644
--- a/std/cpp/objc/NSObject.hx
+++ b/std/cpp/objc/NSObject.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,26 +19,23 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.objc;
 
-@:native("id")  @:objc extern class NSObjectData { }
+@:native("id") @:objc extern class NSObjectData {}
 
 @:objc
-extern abstract NSObject( NSObjectData )
-{
-   @:native("_hx_value_to_objc") @:extern static function _hx_value_to_objc(obj:Dynamic) : NSObject return null;
-   @:native("_hx_objc_to_dynamic") @:extern static function _hx_objc_to_dynamic(d:NSObjectData) : Dynamic return null;
-
-
-   inline function new(d:NSObjectData) this = d;
+extern abstract NSObject(NSObjectData) {
+	@:native("_hx_value_to_objc") extern static function _hx_value_to_objc(obj:Dynamic):NSObject;
 
+	@:native("_hx_objc_to_dynamic") extern static function _hx_objc_to_dynamic(d:NSObjectData):Dynamic;
 
-   @:from @:extern
-   static public inline function fromHaxe(d:Dynamic):NSObject return _hx_value_to_objc(d);
+	inline function new(d:NSObjectData)
+		this = d;
 
+	@:from extern static public inline function fromHaxe(d:Dynamic):NSObject
+		return _hx_value_to_objc(d);
 
-   @:to @:extern
-   public inline function toHaxe():Dynamic return _hx_objc_to_dynamic(this);
+	@:to extern public inline function toHaxe():Dynamic
+		return _hx_objc_to_dynamic(this);
 }
-
-
diff --git a/std/cpp/objc/NSString.hx b/std/cpp/objc/NSString.hx
index c82e228bbf7ae2fc60c790577582f2bf768b9ee2..49c8487827991ffed036cdb40435cc89bc89b1f8 100644
--- a/std/cpp/objc/NSString.hx
+++ b/std/cpp/objc/NSString.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,27 +19,28 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.objc;
 
-@:native("NSString")  @:objc extern class NSStringData { }
+@:native("NSString") @:objc extern class NSStringData {}
 
 @:objc
-extern abstract NSString( NSStringData )
-{
-   inline function new(s:NSStringData) this = s;
-   @:native("(id)") @:extern static function toObject(d:NSStringData) : NSObject return null;
+extern abstract NSString(NSStringData) {
+	inline function new(s:NSStringData)
+		this = s;
 
-   @:native("(NSString *)") @:extern static function castFromString(s:String) : NSString return null;
-   @:native("String") @:extern static function castToString(s:NSStringData) : String return null;
+	@:native("(id)") extern static function toObject(d:NSStringData):NSObject;
 
+	@:native("(NSString *)") extern static function castFromString(s:String):NSString;
 
-   @:from @:extern
-   static public inline function fromString(s:String):NSString return castFromString(s);
+	@:native("String") extern static function castToString(s:NSStringData):String;
 
+	@:from extern static public inline function fromString(s:String):NSString
+		return castFromString(s);
 
-   @:to @:extern
-   public inline function toString():String return castToString(this);
+	@:to extern public inline function toString():String
+		return castToString(this);
 
-   @:to @:extern public inline function toNSObject():NSObject return toObject(this);
+	@:to extern public inline function toNSObject():NSObject
+		return toObject(this);
 }
-
diff --git a/std/cpp/objc/ObjcBlock.hx b/std/cpp/objc/ObjcBlock.hx
index 4075faaaa2026467ddba8126989a848e8d32e3ad..0b252cc3a7c4ebc27e895b097076ba920b5d513c 100644
--- a/std/cpp/objc/ObjcBlock.hx
+++ b/std/cpp/objc/ObjcBlock.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,9 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.objc;
 
 @:objc
 typedef ObjcBlock<T> = T;
-
-
diff --git a/std/cpp/objc/Protocol.hx b/std/cpp/objc/Protocol.hx
index 1c5c4d92b538dc72d016f456c38d0459e953f472..1469a0875ef59449710a2971d4d0fc2e2f19fcc9 100644
--- a/std/cpp/objc/Protocol.hx
+++ b/std/cpp/objc/Protocol.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,9 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.objc;
 
 @:objc
-typedef Protocol<T /*:interface*/ > = T;
-
-
+typedef Protocol<T /*:interface*/> = T;
diff --git a/std/cpp/rtti/FieldIntegerLookup.hx b/std/cpp/rtti/FieldIntegerLookup.hx
index 86908b8c98e3a4beea4c7caad48c17713e2b5487..c90fbae0c1d318cf802fb46568baa76a74981b83 100644
--- a/std/cpp/rtti/FieldIntegerLookup.hx
+++ b/std/cpp/rtti/FieldIntegerLookup.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.rtti;
 
 /**
 	If you implement this interface, then the backend will generate code that
 	allows fast dynamic access to fields by integer id.  This should speed up the CFFI.
 **/
-interface FieldIntegerLookup {
-}
+interface FieldIntegerLookup {}
diff --git a/std/cpp/rtti/FieldNumericIntegerLookup.hx b/std/cpp/rtti/FieldNumericIntegerLookup.hx
index bc04b1d30cb1d97d876f74a6b417a7d3c5d32911..3efa4443437a68116e2c35b2e000a4680b598cd0 100644
--- a/std/cpp/rtti/FieldNumericIntegerLookup.hx
+++ b/std/cpp/rtti/FieldNumericIntegerLookup.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.rtti;
 
 /**
 	If you implement this interface, then the backend will generate code that
 	allows fast numeric access to fields by integer id.  This should speed up the CFFI.
 **/
-interface FieldNumericIntegerLookup {
-}
+interface FieldNumericIntegerLookup {}
diff --git a/std/cpp/vm/Debugger.hx b/std/cpp/vm/Debugger.hx
index 1a250e864251fbf5090c83bb68ecb5ef9258481d..8f5f86d2bd4eef2b28d73e0cfb025fb22968fc8f 100644
--- a/std/cpp/vm/Debugger.hx
+++ b/std/cpp/vm/Debugger.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,401 +19,335 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp.vm;
 
+package cpp.vm;
 
 /**
- * Parameter describes a function parameter.  Instances of this class are
- * embedded in stack frame objects to describe the function parameters that
- * were used in the invocation of the function that defines that stack frame.
- **/
-class Parameter
-{
-    public var name(default, null) : String;
-    public var value(default, null) : Dynamic;
-
-    public function new(name : String, value : Dynamic)
-   {
-        this.name = name;
-        this.value = value;
-   }
-   }
+	Parameter describes a function parameter. Instances of this class are
+	embedded in stack frame objects to describe the function parameters that
+	were used in the invocation of the function that defines that stack frame.
+**/
+class Parameter {
+	public var name(default, null):String;
+	public var value(default, null):Dynamic;
+
+	public function new(name:String, value:Dynamic) {
+		this.name = name;
+		this.value = value;
+	}
+}
 
 /**
- * StackFrame describes one call stack frame.
- **/
-class StackFrame
-   {
-    public var fileName(default, null) : String;
-    public var lineNumber(default, null) : Int;
-    public var className(default, null) : String;
-    public var functionName(default, null) : String;
-    public var parameters(default, null) : Array<Parameter>;
-
-    public function new(fileName : String, lineNumber : Int,
-                        className : String, functionName : String)
-   {
-        this.fileName = fileName;
-        this.lineNumber = lineNumber;
-        this.className = className;
-        this.functionName = functionName;
-        this.parameters = new Array<Parameter>();
-   }
-   }
+	`StackFrame` describes one call stack frame.
+**/
+class StackFrame {
+	public var fileName(default, null):String;
+	public var lineNumber(default, null):Int;
+	public var className(default, null):String;
+	public var functionName(default, null):String;
+	public var parameters(default, null):Array<Parameter>;
+
+	public function new(fileName:String, lineNumber:Int, className:String, functionName:String) {
+		this.fileName = fileName;
+		this.lineNumber = lineNumber;
+		this.className = className;
+		this.functionName = functionName;
+		this.parameters = new Array<Parameter>();
+	}
+}
 
 /**
- * ThreadInfo describes the state of a single thread.
- **/
-class ThreadInfo
-   {
-    public static inline var STATUS_RUNNING = 1;
-    public static inline var STATUS_STOPPED_BREAK_IMMEDIATE = 2;
-    public static inline var STATUS_STOPPED_BREAKPOINT = 3;
-    public static inline var STATUS_STOPPED_UNCAUGHT_EXCEPTION = 4;
-    public static inline var STATUS_STOPPED_CRITICAL_ERROR = 5;
-
-    // 0 is never a valid thread number
-    public var number(default, null) : Int;
-    public var status(default, null) : Int;
-    // If status is "stopped breakpoint", this is the breakpoint number
-    public var breakpoint(default, null) : Int;
-    // If status is "critical error", this describes the error
-    public var criticalErrorDescription(default, null) : String;
-    // Stack will be listed with the lowest frame first
-    public var stack(default, null) : Array<StackFrame>;
-
-    public function new(number : Int, status : Int, breakpoint : Int = -1,
-                        criticalErrorDescription : String = null)
-   {
-        this.number = number;
-        this.status = status;
-        this.breakpoint = breakpoint;
-        this.criticalErrorDescription = criticalErrorDescription;
-        this.stack = new Array<StackFrame>();
-   }
-   }
+	`ThreadInfo` describes the state of a single thread.
+**/
+class ThreadInfo {
+	public static inline var STATUS_RUNNING = 1;
+	public static inline var STATUS_STOPPED_BREAK_IMMEDIATE = 2;
+	public static inline var STATUS_STOPPED_BREAKPOINT = 3;
+	public static inline var STATUS_STOPPED_UNCAUGHT_EXCEPTION = 4;
+	public static inline var STATUS_STOPPED_CRITICAL_ERROR = 5;
+
+	/** 0 is never a valid thread number **/
+	public var number(default, null):Int;
+
+	public var status(default, null):Int;
+
+	/** If status is "stopped breakpoint", this is the breakpoint number **/
+	public var breakpoint(default, null):Int;
+
+	/** If status is "critical error", this describes the error **/
+	public var criticalErrorDescription(default, null):String;
+
+	/** Stack will be listed with the lowest frame first **/
+	public var stack(default, null):Array<StackFrame>;
+
+	public function new(number:Int, status:Int, breakpoint:Int = -1, criticalErrorDescription:String = null) {
+		this.number = number;
+		this.status = status;
+		this.breakpoint = breakpoint;
+		this.criticalErrorDescription = criticalErrorDescription;
+		this.stack = new Array<StackFrame>();
+	}
+}
 
 /**
- * This class wraps the hxcpp C++ implementation to provide a Haxe interface
- * to the low level debugging features
- **/
-class Debugger
-   {
-    public static inline var THREAD_CREATED = 1;
-    public static inline var THREAD_TERMINATED = 2;
-    public static inline var THREAD_STARTED = 3;
-    public static inline var THREAD_STOPPED = 4;
-
-    public static inline var STEP_INTO = 1;
-    public static inline var STEP_OVER = 2;
-    public static inline var STEP_OUT = 3;
-
-    // This tagging value is returned by getStackVariableValue() and
-    // setStackVariableValue if the requested value does not exist at the
-    // requested stack frame
-    public static var NONEXISTENT_VALUE = new String("NONEXISTENT_VALUE");
-    // This tagging value is returned by getStackVariableValue and
-    // setStackVariableValue if the stack variable that is being set is on a
-    // thread that is running, in which case the set does not take place.
-    public static var THREAD_NOT_STOPPED = new String("THREAD_NOT_STOPPED");
-
-    /**
-     * Sets the handler callback to be made when asynchronous events occur,
-     * specifically, when threads are created, terminated, started, or
-     * stopped.  The calling thread becomes the "debugger" thread, which means
-     * that it will be discluded from any breakpoints and will not be reported
-     * on by any thread reporting requests.
-     *
-     * Be aware that this callback is made asynchronously and possibly by
-     * multiple threads simultaneously.
-     *
-     * Setting this to null prevents further callbacks.
-     *
-     * Throws a string exception if the program does not support debugging
-     * because it was not compiled with the HXCPP_DEBUGGER flag set.
-     *
-     * @param handler is a function that will be called back by asynchronous
-     *        thread events.  Note that this function is called directly from
-     *        the thread experiencing the event and the handler should return
-     *        quickly to avoid blocking the calling thread unnecessarily.
-     *        The parameters to handler are:
-     *          - threadNumber, the thread number of the event
-     *          - event, one of THREAD_CREATED, THREAD_TERMINATED,
-     *            THREAD_STARTED, or THREAD_STOPPED
-     *          - stackFrame, the stack frame number at which the thread is stopped,
-     *            undefined if event is not THREAD_STOPPED
-     *          - className, the class name at which the thread is stopped,
-     *            undefined if event is not THREAD_STOPPED
-     *          - functionName, the function name at which the thread is
-     *            stopped, undefined if event is not THREAD_STOPPED
-     *          - fileName, the file name at which the thread is stopped,
-     *            undefined if event is not THREAD_STOPPED
-     *          - lineNumber, the line number at which the thread is stopped,
-     *            undefined if event is not THREAD_STOPPED
-     **/
-    public static function setEventNotificationHandler(
-             handler : Int -> Int -> Int -> String -> String -> String -> Int -> Void)
-    {
-        untyped __global__.__hxcpp_dbg_setEventNotificationHandler(handler);
-    }
-
-    /**
-     * This can be called to turn off (and then back on) all stopping of
-     * debugged threads temporarily.  It should only be used by classes that
-     * actually implement the debugger to hide themselves from the debugger as
-     * necessary.
-     **/
-    public static function enableCurrentThreadDebugging(enabled : Bool)
-    {
-        untyped __global__.__hxcpp_dbg_enableCurrentThreadDebugging(enabled);
-    }
-
-    /**
-     * Returns the thread number of the calling thread.
-     *
-     * @return the thread number of the calling thread.
-     **/
-	public static function getCurrentThreadNumber() : Int
-	{
-        return untyped __global__.__hxcpp_dbg_getCurrentThreadNumber();
+	This class wraps the hxcpp C++ implementation to provide a Haxe interface
+	to the low level debugging features
+**/
+class Debugger {
+	public static inline var THREAD_CREATED = 1;
+	public static inline var THREAD_TERMINATED = 2;
+	public static inline var THREAD_STARTED = 3;
+	public static inline var THREAD_STOPPED = 4;
+
+	public static inline var STEP_INTO = 1;
+	public static inline var STEP_OVER = 2;
+	public static inline var STEP_OUT = 3;
+
+	/**
+		This tagging value is returned by `getStackVariableValue()` and
+		`setStackVariableValue()` if the requested value does not exist at the
+		requested stack frame
+	**/
+	public static var NONEXISTENT_VALUE = "NONEXISTENT_VALUE";
+
+	/**
+		This tagging value is returned by `getStackVariableValue()` and
+		`setStackVariableValue()` if the stack variable that is being set is on a
+		thread that is running, in which case the set does not take place.
+	**/
+	public static var THREAD_NOT_STOPPED = "THREAD_NOT_STOPPED";
+
+	/**
+		Sets the handler callback to be made when asynchronous events occur,
+		specifically, when threads are created, terminated, started, or
+		stopped. The calling thread becomes the "debugger" thread, which means
+		that it will be discluded from any breakpoints and will not be reported
+		on by any thread reporting requests.
+
+		Be aware that this callback is made asynchronously and possibly by
+		multiple threads simultaneously.
+
+		Setting this to `null` prevents further callbacks.
+
+		Throws a string exception if the program does not support debugging
+		because it was not compiled with the `HXCPP_DEBUGGER` flag set.
+
+		@param handler is a function that will be called back by asynchronous
+			   thread events.  Note that this function is called directly from
+			   the thread experiencing the event and the handler should return
+			   quickly to avoid blocking the calling thread unnecessarily.
+			   The parameters to handler are:
+				 - `threadNumber`, the thread number of the event
+				 - event, one of `THREAD_CREATED`, `THREAD_TERMINATED`,
+				   `THREAD_STARTED`, or `THREAD_STOPPED`
+				 - stackFrame, the stack frame number at which the thread is stopped,
+				   undefined if event is not `THREAD_STOPPED`
+				 - `className`, the class name at which the thread is stopped,
+				   undefined if event is not `THREAD_STOPPED`
+				 - `functionName`, the function name at which the thread is
+				   stopped, undefined if event is not `THREAD_STOPPED`
+				 - `fileName`, the file name at which the thread is stopped,
+				   undefined if event is not `THREAD_STOPPED`
+				 - `lineNumber`, the line number at which the thread is stopped,
+				   undefined if event is not `THREAD_STOPPED`
+	**/
+	public static function setEventNotificationHandler(handler:(threadNumber:Int, event:Int, stackFrame:Int, className:String, functionName:String,
+		fileName:String, lineNumber:Int) -> Void) {
+		untyped __global__.__hxcpp_dbg_setEventNotificationHandler(handler);
 	}
 
-    /**
-     * Returns the set of source files known to the debugger.  This is a copy
-     * of the original array and could be quite large.  The caller should
-     * cache this value to avoid multiple copies needing to be made.
-     *
-     * @return the set of source files known to the debugger.
-     **/
-    public static function getFiles() : Array<String>
-   {
-        return untyped __global__.__hxcpp_dbg_getFiles();
-   }
-
-
-    /**
-     * Returns the full paths of the set of source files known to the debugger.
-     * This is a copy of the original array and could be quite large.
-     * It is possible that this set will be empty, in which case the full paths are not known.
-     * The index of these files matches the index from "getFiles", so the full path for
-     * a given short path can be calculated.
-     *
-     * @return the known full paths of the set of source files
-     **/
-   public static function getFilesFullPath() : Array<String>
-   {
-        return untyped __global__.__hxcpp_dbg_getFilesFullPath();
-   }
-
-    /**
-     * Returns the set of class names of all classes known to the debugger.
-     * This is a copy of the original array and could be quite large.  The
-     * caller should cache this value to avoid multiple copies needing to be
-     * made.
-     *
-     * @return the set of class names of all classes known to the debugger.
-     **/
-    public static function getClasses() : Array<String>
-    {
-        return untyped __global__.__hxcpp_dbg_getClasses();
-    }
-
-    /**
-     * Returns a ThreadInfo object describing every thread that existed at the
-     * moment that the call was made, except for the debugger thread.
-     **/
-    public static function getThreadInfos() : Array<ThreadInfo>
-    {
-        return untyped __global__.__hxcpp_dbg_getThreadInfos();
-    }
-
-    /**
-     * Returns a ThreadInfo object describing a single thread, or null if
-     * there is no such thread or the thread queried about was the debugger
-     * thread and unsafe was not true.
-     **/
-    public static function getThreadInfo(threadNumber : Int,
-                                         unsafe : Bool) : ThreadInfo
-    {
-        return untyped __global__.__hxcpp_dbg_getThreadInfo
-            (threadNumber, unsafe);
-    }
-
-    /**
-     * Adds a new file:line breakpoint.  The breakpoint number of the newly
-     * added breakpoint is returned.
-     **/
-    public static function addFileLineBreakpoint(file : String,
-                                                 line : Int) : Int
-    {
-        return untyped __global__.__hxcpp_dbg_addFileLineBreakpoint
-            (file, line);
-    }
-
-    /**
-     * Adds a new class:function breakpoint.  The breakpoint number of the
-     * newly added breakpoint is returned.
-     **/
-    public static function addClassFunctionBreakpoint(className : String,
-                                                   functionName : String) : Int
-    {
-        return untyped __global__.__hxcpp_dbg_addClassFunctionBreakpoint
-            (className, functionName);
-    }
-
-    /**
-     * Deletes a breakpoint, or all breakpoints.
-     **/
-    public static function deleteBreakpoint(number : Null<Int>)
-    {
-        if (number == null) {
-            untyped __global__.__hxcpp_dbg_deleteAllBreakpoints();
-        }
-        else {
-            untyped __global__.__hxcpp_dbg_deleteBreakpoint
-                (cast (number, Int));
-        }
-    }
-
-    /**
-     * Breaks all threads except the debugger thread (which should be the same
-     * as the calling thread!).
-     *
-     * If `wait` is true, waits up to 2 seconds for all threads to be broken.
-     * Threads which are in blocking system calls and cannot break after 2
-     * seconds remain running when this function returns.
-     **/
-    public static function breakNow(wait : Bool = true)
-    {
-        untyped __global__.__hxcpp_dbg_breakNow(wait);
-    }
-
-    /**
-     * Continue execution of all stopped threads.  If specialThreadNumber
-     * is a valid thread number, then it will be continued past
-     * `continueCount` breakpoints instead of just 1 like all of the other
-     * threads.
-     **/
-    public static function continueThreads(specialThreadNumber : Int,
-                                           continueCount : Int)
-    {
-        untyped __global__.__hxcpp_dbg_continueThreads
-            (specialThreadNumber, continueCount);
-    }
-
-    /**
-     * Single steps the given thread.
-     **/
-    public static function stepThread(threadNumber : Int,
-                                      stepType : Int,
-                                      stepCount : Int = 1)
-    {
-        untyped __global__.__hxcpp_dbg_stepThread
-            (threadNumber, stepType, stepCount);
-    }
-
-    /**
-     * Returns the list of local variables (including "this", function
-     * arguments, and local variables) visible to the given thread at the
-     * given stack frame.
-     *
-     * Returns a list with a single entry, THREAD_NOT_STOPPED, if the
-     * thread is not stopped and thus variables cannot be fetched and
-     * unsafe is not true.
-     *
-     * @return the list of local variables (including "this", function
-     *         arguments, and local variables) visible to the given thread at
-     *         the given stack frame.
-     **/
-    public static function getStackVariables(threadNumber : Int,
-                                             stackFrameNumber : Int,
-                                             unsafe : Bool) : Array<String>
-    {
-        return untyped __global__.__hxcpp_dbg_getStackVariables
-            (threadNumber, stackFrameNumber, unsafe, THREAD_NOT_STOPPED);
-    }
-
-    /**
-     * Returns the value of a stack variable, or NONEXISTENT_VALUE if the
-     * requested value does not exist.  If the thread is actively running
-     * and unsafe is not true, returns THREAD_NOT_STOPPED.
-     **/
-    public static function getStackVariableValue(threadNumber : Int,
-                                                 stackFrameNumber : Int,
-                                                 name : String,
-                                                 unsafe : Bool) : Dynamic
-    {
-        return untyped __global__.__hxcpp_dbg_getStackVariableValue
-            (threadNumber, stackFrameNumber, name, unsafe, NONEXISTENT_VALUE,
-             THREAD_NOT_STOPPED);
-    }
-
-    /**
-     * Sets the value of a stack variable and returns that value.  If the
-     * variable does not exist, on the stack, this function returns
-     * NONEXISTENT_VALUE.  If the thread is actively running and unsafe is not
-     * true, returns THREAD_NOT_STOPPED, and the value is not set.
-     **/
-    public static function setStackVariableValue(threadNumber : Int,
-                                                 stackFrameNumber : Int,
-                                                 name : String,
-                                                 value : Dynamic,
-                                                 unsafe : Bool) : Dynamic
-    {
-        return untyped __global__.__hxcpp_dbg_setStackVariableValue
-            (threadNumber, stackFrameNumber, name, value, unsafe,
-             NONEXISTENT_VALUE, THREAD_NOT_STOPPED);
-    }
-
-    // The hxcpp runtime calls back through these functions to create Haxe
-    // objects as needed, which allows the C++ implementation code to create
-    // Haxe objects without having to actually know the structure of those
-    // objects
-    private static function __init__()
-    {
-        untyped __global__.__hxcpp_dbg_setNewParameterFunction
-        (
-         function (name : String, value : Dynamic) : Dynamic {
-             return new Parameter(name, value);
-         }
-        );
-
-        untyped __global__.__hxcpp_dbg_setNewStackFrameFunction
-        (
-         function (fileName : String, lineNumber : Int,
-                   className : String, functionName : String)
-         {
-             return new StackFrame(fileName, lineNumber,
-                                   className, functionName);
-         }
-        );
-
-        untyped __global__.__hxcpp_dbg_setNewThreadInfoFunction
-        (
-         function (number : Int, status : Int, breakpoint : Int,
-                   criticalErrorDescription : String) : Dynamic {
-             return new ThreadInfo(number, status, breakpoint,
-                                   criticalErrorDescription);
-         }
-        );
-
-        untyped __global__.__hxcpp_dbg_setAddParameterToStackFrameFunction
-        (
-         function(inStackFrame : Dynamic, inParameter : Dynamic) {
-             var stackFrame : StackFrame = cast inStackFrame;
-             var parameter : Parameter = cast inParameter;
-             stackFrame.parameters.push(parameter);
-         }
-        );
-
-        untyped __global__.__hxcpp_dbg_setAddStackFrameToThreadInfoFunction
-        (
-         function(inThreadInfo : Dynamic, inStackFrame : Dynamic) {
-             var threadInfo : ThreadInfo = cast inThreadInfo;
-             var stackFrame : StackFrame = cast inStackFrame;
-             threadInfo.stack.push(stackFrame);
-   }
-        );
-   }
-}
+	/**
+		This can be called to turn off (and then back on) all stopping of
+		debugged threads temporarily. It should only be used by classes that
+		actually implement the debugger to hide themselves from the debugger as
+		necessary.
+	**/
+	public static function enableCurrentThreadDebugging(enabled:Bool) {
+		untyped __global__.__hxcpp_dbg_enableCurrentThreadDebugging(enabled);
+	}
+
+	/**
+		Returns the thread number of the calling thread.
+
+		@return the thread number of the calling thread.
+	**/
+	public static function getCurrentThreadNumber():Int {
+		return untyped __global__.__hxcpp_dbg_getCurrentThreadNumber();
+	}
+
+	/**
+		Returns the set of source files known to the debugger. This is a copy
+		of the original array and could be quite large. The caller should
+		cache this value to avoid multiple copies needing to be made.
+
+		@return the set of source files known to the debugger.
+	**/
+	public static function getFiles():Array<String> {
+		return untyped __global__.__hxcpp_dbg_getFiles();
+	}
+
+	/**
+		Returns the full paths of the set of source files known to the debugger.
+		This is a copy of the original array and could be quite large.
+		It is possible that this set will be empty, in which case the full paths are not known.
+		The index of these files matches the index from `getFiles()`, so the full path for
+		a given short path can be calculated.
+
+		@return the known full paths of the set of source files
+	**/
+	public static function getFilesFullPath():Array<String> {
+		return untyped __global__.__hxcpp_dbg_getFilesFullPath();
+	}
+
+	/**
+		Returns the set of class names of all classes known to the debugger.
+		This is a copy of the original array and could be quite large. The
+		caller should cache this value to avoid multiple copies needing to be
+		made.
+
+		@return the set of class names of all classes known to the debugger.
+	**/
+	public static function getClasses():Array<String> {
+		return untyped __global__.__hxcpp_dbg_getClasses();
+	}
+
+	/**
+		Returns a `ThreadInfo` object describing every thread that existed at the
+		moment that the call was made, except for the debugger thread.
+	**/
+	public static function getThreadInfos():Array<ThreadInfo> {
+		return untyped __global__.__hxcpp_dbg_getThreadInfos();
+	}
 
+	/**
+		Returns a `ThreadInfo` object describing a single thread, or `null` if
+		there is no such thread or the thread queried about was the debugger
+		thread and `unsafe` was not `true`.
+	**/
+	public static function getThreadInfo(threadNumber:Int, unsafe:Bool):ThreadInfo {
+		return untyped __global__.__hxcpp_dbg_getThreadInfo(threadNumber, unsafe);
+	}
+
+	/**
+		Adds a new `file:line` breakpoint. The breakpoint number of the newly
+		added breakpoint is returned.
+	**/
+	public static function addFileLineBreakpoint(file:String, line:Int):Int {
+		return untyped __global__.__hxcpp_dbg_addFileLineBreakpoint(file, line);
+	}
+
+	/**
+		Adds a new `class:function` breakpoint. The breakpoint number of the
+		newly added breakpoint is returned.
+	**/
+	public static function addClassFunctionBreakpoint(className:String, functionName:String):Int {
+		return untyped __global__.__hxcpp_dbg_addClassFunctionBreakpoint(className, functionName);
+	}
+
+	/**
+		Deletes a breakpoint, or all breakpoints.
+	**/
+	public static function deleteBreakpoint(number:Null<Int>) {
+		if (number == null) {
+			untyped __global__.__hxcpp_dbg_deleteAllBreakpoints();
+		} else {
+			untyped __global__.__hxcpp_dbg_deleteBreakpoint(cast(number, Int));
+		}
+	}
+
+	/**
+		Breaks all threads except the debugger thread (which should be the same
+		as the calling thread!).
+
+		If `wait` is `true`, waits up to 2 seconds for all threads to be broken.
+		Threads which are in blocking system calls and cannot break after 2
+		seconds remain running when this function returns.
+	**/
+	public static function breakNow(wait:Bool = true) {
+		untyped __global__.__hxcpp_dbg_breakNow(wait);
+	}
+
+	/**
+		Continue execution of all stopped threads. If `specialThreadNumber`
+		is a valid thread number, then it will be continued past
+		`continueCount` breakpoints instead of just 1 like all of the other
+		threads.
+	**/
+	public static function continueThreads(specialThreadNumber:Int, continueCount:Int) {
+		untyped __global__.__hxcpp_dbg_continueThreads(specialThreadNumber, continueCount);
+	}
+
+	/**
+		Single steps the given thread.
+	**/
+	public static function stepThread(threadNumber:Int, stepType:Int, stepCount:Int = 1) {
+		untyped __global__.__hxcpp_dbg_stepThread(threadNumber, stepType, stepCount);
+	}
+
+	/**
+		Returns the list of local variables (including `this`, function
+		arguments, and local variables) visible to the given thread at the
+		given stack frame.
+
+		Returns a list with a single entry, `THREAD_NOT_STOPPED`, if the
+		thread is not stopped and thus variables cannot be fetched and
+		`unsafe` is not `true`.
+
+		@return the list of local variables (including `this`, function
+				arguments, and local variables) visible to the given thread at
+				the given stack frame.
+	**/
+	public static function getStackVariables(threadNumber:Int, stackFrameNumber:Int, unsafe:Bool):Array<String> {
+		return untyped __global__.__hxcpp_dbg_getStackVariables(threadNumber, stackFrameNumber, unsafe, THREAD_NOT_STOPPED);
+	}
+
+	/**
+		Returns the value of a stack variable, or `NONEXISTENT_VALUE` if the
+		requested value does not exist.  If the thread is actively running
+		and `unsafe` is not `true`, returns `THREAD_NOT_STOPPED`.
+	**/
+	public static function getStackVariableValue(threadNumber:Int, stackFrameNumber:Int, name:String, unsafe:Bool):Dynamic {
+		return untyped __global__.__hxcpp_dbg_getStackVariableValue(threadNumber, stackFrameNumber, name, unsafe, NONEXISTENT_VALUE, THREAD_NOT_STOPPED);
+	}
+
+	/**
+		Sets the value of a stack variable and returns that value. If the
+		variable does not exist, on the stack, this function returns
+		`NONEXISTENT_VALUE`. If the thread is actively running and `unsafe` is not
+		`true`, returns `THREAD_NOT_STOPPED`, and the value is not set.
+	**/
+	public static function setStackVariableValue(threadNumber:Int, stackFrameNumber:Int, name:String, value:Dynamic, unsafe:Bool):Dynamic {
+		return untyped __global__.__hxcpp_dbg_setStackVariableValue(threadNumber, stackFrameNumber, name, value, unsafe, NONEXISTENT_VALUE,
+			THREAD_NOT_STOPPED);
+	}
+
+	// The hxcpp runtime calls back through these functions to create Haxe
+	// objects as needed, which allows the C++ implementation code to create
+	// Haxe objects without having to actually know the structure of those
+	// objects
+	private static function __init__() {
+		untyped __global__.__hxcpp_dbg_setNewParameterFunction(function(name:String, value:Dynamic):Dynamic {
+			return new Parameter(name, value);
+		});
+
+		untyped __global__.__hxcpp_dbg_setNewStackFrameFunction(function(fileName:String, lineNumber:Int, className:String, functionName:String) {
+			return new StackFrame(fileName, lineNumber, className, functionName);
+		});
+
+		untyped __global__.__hxcpp_dbg_setNewThreadInfoFunction(function(number:Int, status:Int, breakpoint:Int, criticalErrorDescription:String):Dynamic {
+			return new ThreadInfo(number, status, breakpoint, criticalErrorDescription);
+		});
+
+		untyped __global__.__hxcpp_dbg_setAddParameterToStackFrameFunction(function(inStackFrame:Dynamic, inParameter:Dynamic) {
+			var stackFrame:StackFrame = cast inStackFrame;
+			var parameter:Parameter = cast inParameter;
+			stackFrame.parameters.push(parameter);
+		});
+
+		untyped __global__.__hxcpp_dbg_setAddStackFrameToThreadInfoFunction(function(inThreadInfo:Dynamic, inStackFrame:Dynamic) {
+			var threadInfo:ThreadInfo = cast inThreadInfo;
+			var stackFrame:StackFrame = cast inStackFrame;
+			threadInfo.stack.push(stackFrame);
+		});
+	}
+}
diff --git a/std/cpp/vm/Deque.hx b/std/cpp/vm/Deque.hx
index df6859f8581ba30ae09902483338c5339526bb01..6858dffa1bb34bcf65a2c98372a1dbc0a0d98058 100644
--- a/std/cpp/vm/Deque.hx
+++ b/std/cpp/vm/Deque.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,22 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp.vm;
-
 
-class Deque<T> {
-	var q : Dynamic;
-	public function new() {
-		q = untyped __global__.__hxcpp_deque_create();
-	}
-	public function add( i : T ) {
-		untyped __global__.__hxcpp_deque_add(q,i);
-	}
-	public function push( i : T ) {
-		untyped __global__.__hxcpp_deque_push(q,i);
-	}
-	public function pop( block : Bool ) : Null<T> {
-		return untyped __global__.__hxcpp_deque_pop(q,block);
-	}
-}
+package cpp.vm;
 
+@:deprecated typedef Deque<T> = sys.thread.Deque<T>;
diff --git a/std/cpp/vm/ExecutionTrace.hx b/std/cpp/vm/ExecutionTrace.hx
index a9a9e579b8d03dcda9c63228a466b9a251c2f9f3..61e52b9715690339ca279ed6e7c28ce411991a5c 100644
--- a/std/cpp/vm/ExecutionTrace.hx
+++ b/std/cpp/vm/ExecutionTrace.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,20 +19,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.vm;
 
-class ExecutionTrace
-{
-   public static function traceOff()
-   {
-      untyped __hxcpp_execution_trace(0);
-   }
-   public static function traceFunctions()
-   {
-      untyped __hxcpp_execution_trace(1);
-   }
-   public static function traceLines()
-   {
-      untyped __hxcpp_execution_trace(2);
-   }
+package cpp.vm;
+
+class ExecutionTrace {
+	public static function traceOff() {
+		untyped __hxcpp_execution_trace(0);
+	}
+
+	public static function traceFunctions() {
+		untyped __hxcpp_execution_trace(1);
+	}
+
+	public static function traceLines() {
+		untyped __hxcpp_execution_trace(2);
+	}
 }
diff --git a/std/cpp/vm/Gc.hx b/std/cpp/vm/Gc.hx
index 6d5350a01f6dd8f5729a182c66a1f5db33023ef9..ce7ce88592811a6737e56a3911476129036b84c1 100644
--- a/std/cpp/vm/Gc.hx
+++ b/std/cpp/vm/Gc.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,94 +19,113 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cpp.vm;
 
-class Gc
-{
-   public static inline var MEM_INFO_USAGE = 0;
-   public static inline var MEM_INFO_RESERVED = 1;
-   public static inline var MEM_INFO_CURRENT = 2;
-   public static inline var MEM_INFO_LARGE = 3;
-
-
-   // Introduced hxcpp_api_level 310
-   // Returns stats on memory usage:
-   //   MEM_INFO_USAGE - estimate of how much is needed by program (at last collect)
-   //   MEM_INFO_RESERVED - memory allocated for possible use
-   //   MEM_INFO_CURRENT - memory in use, includes uncollected garbage.
-   //     This will generally saw-tooth between USAGE and RESERVED
-   //   MEM_INFO_LARGE - Size of separate pool used for large allocs.  Included in all the above.
-   static public function memInfo(inWhatInfo:Int) : Int
-   {
-      return Std.int(NativeGc.memInfo(inWhatInfo));
-   }
-
-   // Returns Float
-   static public function memInfo64(inWhatInfo:Int) : Float
-   {
-      return NativeGc.memInfo(inWhatInfo);
-   }
-
-   static public function memUsage() : Int
-   {
-      return Std.int(NativeGc.memInfo(MEM_INFO_USAGE));
-   }
-
-   static public function versionCheck() { return true; }
-
-   static public function trace(sought:Class<Dynamic>,printInstances:Bool=true) : Int
-   {
-      return cpp.NativeGc.nativeTrace(sought,printInstances);
-   }
-
-
-   #if !cppia inline #end
-   static public function enable(inEnable:Bool) : Void
-      cpp.NativeGc.enable(inEnable);
-
-   #if !cppia inline #end
-   static public function run(major:Bool) : Void
-      cpp.NativeGc.run(major);
-
-   #if !cppia inline #end
-   static public function compact() : Void
-      cpp.NativeGc.compact();
-
-   #if !cppia inline #end
-   static public function doNotKill(inObject:Dynamic) : Void
-      cpp.NativeGc.doNotKill(inObject);
-
-   #if !cppia inline #end
-   static public function getNextZombie() : Dynamic
-      return cpp.NativeGc.getNextZombie();
-
-   #if !cppia inline #end
-   static public function safePoint() : Void
-      cpp.NativeGc.safePoint();
-
-   #if !cppia inline #end
-   static public function enterGCFreeZone() : Void
-      cpp.NativeGc.enterGCFreeZone();
-
-   #if !cppia inline #end
-   static public function exitGCFreeZone() : Void
-      cpp.NativeGc.exitGCFreeZone();
-
-   #if !cppia inline #end
-   static public function setMinimumFreeSpace(inBytes:Int) : Void
-      cpp.NativeGc.setMinimumFreeSpace(inBytes);
-
-   #if !cppia inline #end
-   static public function setTargetFreeSpacePercentage(inPercentage:Int) : Void
-      cpp.NativeGc.setTargetFreeSpacePercentage(inPercentage);
-
-   #if !cppia inline #end
-   static public function setMinimumWorkingMemory(inBytes:Int) : Void
-      cpp.NativeGc.setMinimumWorkingMemory(inBytes);
-
-   #if !cppia
-   @:native("__hxcpp_set_finalizer") @:extern
-   static public function setFinalizer<T>(inObject:T, inFinalizer:cpp.Callable<T->Void> ) : Void { }
-   #end
+class Gc {
+	public static inline var MEM_INFO_USAGE = 0;
+	public static inline var MEM_INFO_RESERVED = 1;
+	public static inline var MEM_INFO_CURRENT = 2;
+	public static inline var MEM_INFO_LARGE = 3;
+
+	/**
+		Introduced hxcpp_api_level 310
+
+		Returns stats on memory usage:
+		- `MEM_INFO_USAGE` - estimate of how much is needed by program (at last collect)
+		- `MEM_INFO_RESERVED` - memory allocated for possible use
+		- `MEM_INFO_CURRENT` - memory in use, includes uncollected garbage.
+			This will generally saw-tooth between USAGE and RESERVED
+		- `MEM_INFO_LARGE` - Size of separate pool used for large allocs.  Included in all the above.
+	**/
+	static public function memInfo(inWhatInfo:Int):Int {
+		return Std.int(NativeGc.memInfo(inWhatInfo));
+	}
+
+	// Returns Float
+	static public function memInfo64(inWhatInfo:Int):Float {
+		return NativeGc.memInfo(inWhatInfo);
+	}
+
+	static public function memUsage():Int {
+		return Std.int(NativeGc.memInfo(MEM_INFO_USAGE));
+	}
+
+	static public function versionCheck() {
+		return true;
+	}
+
+	static public function trace(sought:Class<Dynamic>, printInstances:Bool = true):Int {
+		return cpp.NativeGc.nativeTrace(sought, printInstances);
+	}
+
+	#if !cppia
+	inline
+	#end
+	static public function enable(inEnable:Bool):Void
+		cpp.NativeGc.enable(inEnable);
+
+	#if !cppia
+	inline
+	#end
+	static public function run(major:Bool):Void
+		cpp.NativeGc.run(major);
+
+	#if !cppia
+	inline
+	#end
+	static public function compact():Void
+		cpp.NativeGc.compact();
+
+	#if !cppia
+	inline
+	#end
+	static public function doNotKill(inObject:Dynamic):Void
+		cpp.NativeGc.doNotKill(inObject);
+
+	#if !cppia
+	inline
+	#end
+	static public function getNextZombie():Dynamic
+		return cpp.NativeGc.getNextZombie();
+
+	#if !cppia
+	inline
+	#end
+	static public function safePoint():Void
+		cpp.NativeGc.safePoint();
+
+	#if !cppia
+	inline
+	#end
+	static public function enterGCFreeZone():Void
+		cpp.NativeGc.enterGCFreeZone();
+
+	#if !cppia
+	inline
+	#end
+	static public function exitGCFreeZone():Void
+		cpp.NativeGc.exitGCFreeZone();
+
+	#if !cppia
+	inline
+	#end
+	static public function setMinimumFreeSpace(inBytes:Int):Void
+		cpp.NativeGc.setMinimumFreeSpace(inBytes);
+
+	#if !cppia
+	inline
+	#end
+	static public function setTargetFreeSpacePercentage(inPercentage:Int):Void
+		cpp.NativeGc.setTargetFreeSpacePercentage(inPercentage);
+
+	#if !cppia
+	inline
+	#end
+	static public function setMinimumWorkingMemory(inBytes:Int):Void
+		cpp.NativeGc.setMinimumWorkingMemory(inBytes);
+
+	#if !cppia
+	@:native("__hxcpp_set_finalizer") extern static public function setFinalizer<T>(inObject:T, inFinalizer:cpp.Callable<T->Void>):Void;
+	#end
 }
-
diff --git a/std/cpp/vm/Lock.hx b/std/cpp/vm/Lock.hx
index bcde565ec16cfe87296d7674995344e90135e81d..9aa46bfea77710162836de51d65ff36779f15d39 100644
--- a/std/cpp/vm/Lock.hx
+++ b/std/cpp/vm/Lock.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,19 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp.vm;
-
 
-class Lock {
-	var l : Dynamic;
-	public function new() {
-		l = untyped __global__.__hxcpp_lock_create();
-	}
-	public function wait( ?timeout : Float = -1) : Bool {
-		return untyped __global__.__hxcpp_lock_wait(l,timeout);
-	}
-	public function release() {
-		untyped __global__.__hxcpp_lock_release(l);
-	}
-}
+package cpp.vm;
 
+@:deprecated typedef Lock = sys.thread.Lock;
diff --git a/std/cpp/vm/Mutex.hx b/std/cpp/vm/Mutex.hx
index 926e0992f9ab70eba3ff92ef6c079b749f570b8e..de23e91f291d54cb0d511d110c03caa9c9ea0294 100644
--- a/std/cpp/vm/Mutex.hx
+++ b/std/cpp/vm/Mutex.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,22 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp.vm;
-
-class Mutex {
-	var m : Dynamic;
 
-	public function new() {
-		m = untyped __global__.__hxcpp_mutex_create();
-	}
-	public function acquire() {
-		untyped __global__.__hxcpp_mutex_acquire(m);
-	}
-	public function tryAcquire() : Bool {
-		return untyped __global__.__hxcpp_mutex_try(m);
-	}
-	public function release() {
-		untyped __global__.__hxcpp_mutex_release(m);
-	}
-}
+package cpp.vm;
 
+@:deprecated typedef Mutex = sys.thread.Mutex;
diff --git a/std/cpp/vm/Profiler.hx b/std/cpp/vm/Profiler.hx
index 256ff70d594b6f654ab59f21d24aa4a3c7c4988c..8cd4e40fee3f1abc253f63323f93f645e8f0eac8 100644
--- a/std/cpp/vm/Profiler.hx
+++ b/std/cpp/vm/Profiler.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp.vm;
-
-class Profiler
-{
 
-   static public function start(?inDumpFile:String) : Void
-   {
-      untyped __global__.__hxcpp_start_profiler(inDumpFile);
-   }
+package cpp.vm;
 
-   static public function stop() : Void
-   {
-      untyped __global__.__hxcpp_stop_profiler();
-   }
+class Profiler {
+	static public function start(?inDumpFile:String):Void {
+		untyped __global__.__hxcpp_start_profiler(inDumpFile);
+	}
 
+	static public function stop():Void {
+		untyped __global__.__hxcpp_stop_profiler();
+	}
 }
-
-
diff --git a/std/cpp/vm/Thread.hx b/std/cpp/vm/Thread.hx
index 1c23f1d1b5f13710e6a0e9dd6bb14af659186268..39093773162a25d96e76e84bd4483138e0ed787b 100644
--- a/std/cpp/vm/Thread.hx
+++ b/std/cpp/vm/Thread.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,52 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp.vm;
-
-typedef ThreadHandle = Dynamic;
-
-class Thread {
-
-	public var handle(default,null) : ThreadHandle;
-
-	function new(h) {
-		handle = h;
-	}
-
-	/**
-		Send a message to the thread queue. This message can be read by using `readMessage`.
-	**/
-	public function sendMessage( msg : Dynamic ) {
-		untyped __global__.__hxcpp_thread_send(handle,msg);
-	}
 
+package cpp.vm;
 
-	/**
-		Returns the current thread.
-	**/
-	public static function current() {
-		return new Thread(untyped __global__.__hxcpp_thread_current());
-	}
-
-	/**
-		Creates a new thread that will execute the `callb` function, then exit.
-	**/
-	public static function create( callb : Void -> Void ) {
-		return new Thread(untyped __global__.__hxcpp_thread_create(callb));
-	}
-
-	/**
-		Reads a message from the thread queue. If `block` is true, the function
-		blocks until a message is available. If `block` is false, the function
-		returns `null` if no message is available.
-	**/
-	public static function readMessage( block : Bool ) : Dynamic {
-		return untyped __global__.__hxcpp_thread_read_message(block);
-	}
-
-	@:keep function __compare(t) : Int {
-		return handle == t.handle ? 0 : 1;
-	}
-
-}
-
+@:deprecated typedef Thread = sys.thread.Thread;
diff --git a/std/cpp/vm/Tls.hx b/std/cpp/vm/Tls.hx
index 7b04453eb3ba65634e77c08b948b5e82a84de6ae..e75d6a14fcadb655fae9a8b42c538b7cfb804f95 100644
--- a/std/cpp/vm/Tls.hx
+++ b/std/cpp/vm/Tls.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,26 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp.vm;
-
-class Tls<T> {
-
-	static var sFreeSlot = 0;
-	var mTLSID : Int;
-	public var value(get,set) : T;
-
-	public function new() {
-		mTLSID = sFreeSlot++;
-	}
 
-	function get_value() : T {
-		return untyped __global__.__hxcpp_tls_get(mTLSID);
-	}
-
-	function set_value( v : T ) {
-		untyped __global__.__hxcpp_tls_set(mTLSID,v);
-		return v;
-	}
-
-}
+package cpp.vm;
 
+@:deprecated typedef Tls<T> = sys.thread.Tls<T>;
diff --git a/std/cpp/vm/Unsafe.hx b/std/cpp/vm/Unsafe.hx
index c6a969755b1eaf7d28baaa93a7979b978c265b20..984fd945f393c7ee7a5c7c8d2c9efd9c5822462d 100644
--- a/std/cpp/vm/Unsafe.hx
+++ b/std/cpp/vm/Unsafe.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.vm;
 
-class Unsafe
-{
-   public static inline function unsafeSet(outForced:Dynamic,inValue:Dynamic) : Void
-   {
-      untyped __global__.__hxcpp_unsafe_set(outForced,inValue);
-   }
-}
+package cpp.vm;
 
+class Unsafe {
+	public static inline function unsafeSet(outForced:Dynamic, inValue:Dynamic):Void {
+		untyped __global__.__hxcpp_unsafe_set(outForced, inValue);
+	}
+}
diff --git a/std/cpp/vm/WeakRef.hx b/std/cpp/vm/WeakRef.hx
index 5f94877abc82d2e7f72cd1bd9b14056c4380e572..d61ba8cc93c3beb27249fd664352a169844293ef 100644
--- a/std/cpp/vm/WeakRef.hx
+++ b/std/cpp/vm/WeakRef.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,35 +19,29 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cpp.vm;
-
 
-class WeakRef<T>
-{
-   var ref:Dynamic;
-   var hardRef:Bool;
+package cpp.vm;
 
+class WeakRef<T> {
+	var ref:Dynamic;
+	var hardRef:Bool;
 
-	public function new(inObject:T, inHard:Bool = false)
-	{
+	public function new(inObject:T, inHard:Bool = false) {
 		hardRef = inHard;
 		if (hardRef)
-         ref = inObject;
-      else
+			ref = inObject;
+		else
 			ref = untyped __global__.__hxcpp_weak_ref_create(inObject);
 	}
 
-
-	public function get():T
-	{
+	public function get():T {
 		if (hardRef)
 			return ref;
 
-		return  untyped __global__.__hxcpp_weak_ref_get(ref);
+		return untyped __global__.__hxcpp_weak_ref_get(ref);
 	}
 
-	public function set(inObject:T):T
-	{
+	public function set(inObject:T):T {
 		if (hardRef)
 			ref = inObject;
 		else
@@ -55,9 +49,7 @@ class WeakRef<T>
 		return inObject;
 	}
 
-	public function toString():String
-	{
+	public function toString():String {
 		return "WeakRef(" + get() + ")";
 	}
 }
-
diff --git a/std/cpp/zip/Compress.hx b/std/cpp/zip/Compress.hx
index adfc2827042c685f8cf9ec7469630d3e513311de..295337a3871a25dc88c5496d3fb0fe94c53ee7fd 100644
--- a/std/cpp/zip/Compress.hx
+++ b/std/cpp/zip/Compress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.zip;
 
-#if (haxe_ver < 4.0)
+package cpp.zip;
+
 typedef Compress = haxe.zip.Compress;
-#end
\ No newline at end of file
diff --git a/std/cpp/zip/Flush.hx b/std/cpp/zip/Flush.hx
index 5f256fb15bb352433db9b41868276312e44c4cf5..f65f0146fcb8419618d93722ae9cdb5866970ed4 100644
--- a/std/cpp/zip/Flush.hx
+++ b/std/cpp/zip/Flush.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.zip;
 
-#if (haxe_ver < 4.0)
+package cpp.zip;
+
 typedef Flush = haxe.zip.FlushMode;
-#end
\ No newline at end of file
diff --git a/std/cpp/zip/Uncompress.hx b/std/cpp/zip/Uncompress.hx
index 8446b44408648c8cafc3035303dde8be47f4f823..6f5d3cb348a85027fa97950084c230b1b00706bc 100644
--- a/std/cpp/zip/Uncompress.hx
+++ b/std/cpp/zip/Uncompress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cpp.zip;
 
-#if (haxe_ver < 4.0)
+package cpp.zip;
+
 typedef Uncompress = haxe.zip.Uncompress;
-#end
\ No newline at end of file
diff --git a/std/cs/Boot.hx b/std/cs/Boot.hx
index be60e5cac1ebc9b47843ddb71f474e088a1f845f..921fe4939af012593d827696c6646691a17ad5fd 100644
--- a/std/cs/Boot.hx
+++ b/std/cs/Boot.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs;
+
 import cs.internal.Exceptions;
 import cs.internal.FieldLookup;
 import cs.internal.Function;
 import cs.internal.HxObject;
 import cs.internal.Runtime;
-// TODO (see Gencommon.IteratorsInterfaceModf)
-//import cs.internal.Iterator;
 #if !erase_generics
 import cs.internal.Null;
 #end
@@ -39,12 +39,12 @@ import haxe.ds.StringMap;
 import Reflect;
 
 @:dox(hide)
-class Boot
-{
-
-	@:keep public static function init():Void
-	{
+class Boot {
+	@:keep public static function init():Void {
+		#if std_encoding_utf8
+			cs.system.Console.InputEncoding = new cs.system.text.UTF8Encoding();
+			cs.system.Console.OutputEncoding = new cs.system.text.UTF8Encoding();
+		#end
 		cs.Lib.applyCultureChanges();
 	}
-
 }
diff --git a/std/cs/Constraints.hx b/std/cs/Constraints.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c1caed8059d41a7407f9603c2321df7835f3e8e9
--- /dev/null
+++ b/std/cs/Constraints.hx
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C)2005-2019 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 cs;
+
+/**
+	The type argument must be a value type. Any value type except Nullable_1<T>
+	can be specified.
+
+	It is intended to be used as a native cs type parameter constraint, when
+	using `@:nativeGen`. This constraint won't have any effect on Haxe code.
+	If used as a real type, the underlying type will be `Dynamic`.
+**/
+@:coreType abstract CsStruct from Dynamic {}
+
+/**
+	The type argument must be a reference type. This constraint applies also to
+	any class, interface, delegate, or array type.
+
+	It is intended to be used as a native cs type parameter constraint, when
+	using `@:nativeGen`. This constraint won't have any effect on Haxe code.
+	If used as a real type, the underlying type will be `Dynamic`.
+**/
+@:coreType abstract CsClass from Dynamic {}
+
+#if (cs_ver >= "7.3")
+/**
+	The type argument must not be a reference type and must not contain any
+	reference type members at any level of nesting.
+
+	It is intended to be used as a native cs type parameter constraint, when
+	using `@:nativeGen`. This constraint won't have any effect on Haxe code.
+	If used as a real type, the underlying type will be `Dynamic`.
+**/
+@:coreType abstract CsUnmanaged from Dynamic {}
+#end
diff --git a/std/cs/Flags.hx b/std/cs/Flags.hx
index 2dcbddac11713ddc1ce9e98106229046fdffefa8..9e6281314ddc15d3c6b4ae82e83f632fe575df2a 100644
--- a/std/cs/Flags.hx
+++ b/std/cs/Flags.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cs;
+
+package cs;
 
 /**
 	Use this type to have access to the bitwise operators of C# enums that have a `cs.system.FlagsAttribute` attribute.
@@ -27,95 +28,87 @@
 	Usage example:
 
 	```haxe
-		import cs.system.reflection.BindingFlags;
-		var binding = new Flags(BindingFlags.Public) | BindingFlags.Static | BindingFlags.NonPublic;
+	import cs.system.reflection.BindingFlags;
+	var binding = new Flags(BindingFlags.Public) | BindingFlags.Static | BindingFlags.NonPublic;
 	```
- **/
-abstract Flags<T : EnumValue>(T) from T to T
-{
-
+**/
+abstract Flags<T:EnumValue>(T) from T to T {
 	/**
 		Creates a new `Flags` type with an optional initial value. If no initial value was specified,
 		the default enum value for an empty flags attribute is specified
-	 **/
-	@:extern inline public function new(?initial:T)
-		this = initial;
+	**/
+	extern inline public function new(?initial:T)
+		this = initial == null ? cast null : initial;
 
 	/**
 		Accessible through the bitwise OR operator (`|`). Returns a new `Flags` type with the flags
 		passed at `flags` added to it.
-	 **/
-	@:op(A|B) @:extern inline public function add(flags:Flags<T>):Flags<T>
-	{
+	**/
+	@:op(A | B) extern inline public function add(flags:Flags<T>):Flags<T> {
 		return new Flags(underlying() | flags.underlying());
 	}
 
 	/**
 		Accessible through the bitwise AND operator (`&`). Returns a new `Flags` type with
 		the flags that are set on both `this` and `flags`
-	 **/
-	@:op(A&B) @:extern inline public function bitAnd(flags:Flags<T>):Flags<T>
-	{
+	**/
+	@:op(A & B) extern inline public function bitAnd(flags:Flags<T>):Flags<T> {
 		return new Flags(underlying() & flags.underlying());
 	}
 
 	/**
 		Accessible through the bitwise XOR operator (`^`).
-	 **/
-	@:op(A^B) @:extern inline public function bitXor(flags:Flags<T>):Flags<T>
-	{
+	**/
+	@:op(A ^ B) extern inline public function bitXor(flags:Flags<T>):Flags<T> {
 		return new Flags(underlying() & flags.underlying());
 	}
 
 	/**
 		Accesible through the bitwise negation operator (`~`). Returns a new `Flags` type
 		with all unset flags as set - but the ones that are set already.
-	 **/
-	@:op(~A) @:extern inline public function bitNeg():Flags<T>
-	{
+	**/
+	@:op(~A) extern inline public function bitNeg():Flags<T> {
 		return new Flags(~underlying());
 	}
 
 	/**
 		Returns a new `Flags` type with all flags set by `flags` unset
-	 **/
-	@:extern inline public function remove(flags:Flags<T>):Flags<T>
-	{
+	**/
+	extern inline public function remove(flags:Flags<T>):Flags<T> {
 		return new Flags(underlying() & ~flags.underlying());
 	}
 
 	/**
 		Returns whether `flag` is present on `this` type
-	 **/
-	@:extern inline public function has(flag:T):Bool
-	{
+	**/
+	extern inline public function has(flag:T):Bool {
 		return underlying() & new Flags(flag).underlying() != null;
 	}
 
 	/**
 		Returns whether `this` type has any flag set by `flags` also set
-	 **/
-	@:extern inline public function hasAny(flags:Flags<T>):Bool
-	{
+	**/
+	extern inline public function hasAny(flags:Flags<T>):Bool {
 		return underlying() & flags.underlying() != null;
 	}
 
 	/**
 		Returns whether `this` type has all flags set by `flags` also set
-	 **/
-	@:extern inline public function hasAll(flags:Flags<T>):Bool
-	{
+	**/
+	extern inline public function hasAll(flags:Flags<T>):Bool {
 		return underlying() & flags.underlying() == flags.underlying();
 	}
 
-	@:extern inline private function underlying():EnumUnderlying<T>
+	extern inline private function underlying():EnumUnderlying<T>
 		return this;
 }
 
-@:coreType private abstract EnumUnderlying<T> from T to T
-{
-	@:op(A|B) public static function or<T>(lhs:EnumUnderlying<T>, rhs:EnumUnderlying<T>):T;
-	@:op(A^B) public static function xor<T>(lhs:EnumUnderlying<T>, rhs:EnumUnderlying<T>):T;
-	@:op(A&B) public static function and<T>(lhs:EnumUnderlying<T>, rhs:EnumUnderlying<T>):T;
+@:coreType private abstract EnumUnderlying<T> from T to T {
+	@:op(A | B) public static function or<T>(lhs:EnumUnderlying<T>, rhs:EnumUnderlying<T>):T;
+
+	@:op(A ^ B) public static function xor<T>(lhs:EnumUnderlying<T>, rhs:EnumUnderlying<T>):T;
+
+	@:op(A & B) public static function and<T>(lhs:EnumUnderlying<T>, rhs:EnumUnderlying<T>):T;
+
 	@:op(~A) public static function bneg<T>(t:EnumUnderlying<T>):T;
 }
diff --git a/std/cs/Lib.hx b/std/cs/Lib.hx
index b8cd8ceafc072126f70ab05aa6e9b017f4b11158..a1bfe4157543c4fc490e1e7a2dc0d4d05b2de330 100644
--- a/std/cs/Lib.hx
+++ b/std/cs/Lib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,23 +19,23 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs;
+
 import cs.system.Type;
 
 /**
 	Platform-specific C# Library. Provides some platform-specific functions for the C# target,
 	such as conversion from haxe types to native types and vice-versa.
 **/
-class Lib
-{
+class Lib {
 	private static var decimalSeparator:String;
 
 	/**
 		Changes the current culture settings to allow a consistent cross-target behavior.
 		Currently the only change made is in regard to the decimal separator, which is always set to "."
 	**/
-	public static function applyCultureChanges():Void
-	{
+	public static function applyCultureChanges():Void {
 		var ci = new cs.system.globalization.CultureInfo(cs.system.threading.Thread.CurrentThread.CurrentCulture.Name, true);
 		decimalSeparator = ci.NumberFormat.NumberDecimalSeparator;
 		ci.NumberFormat.NumberDecimalSeparator = ".";
@@ -45,8 +45,7 @@ class Lib
 	/**
 		Reverts the culture changes to the default settings.
 	**/
-	public static function revertDefaultCulture():Void
-	{
+	public static function revertDefaultCulture():Void {
 		var ci = new cs.system.globalization.CultureInfo(cs.system.threading.Thread.CurrentThread.CurrentCulture.Name, true);
 		cs.system.threading.Thread.CurrentThread.CurrentCulture = ci;
 	}
@@ -57,26 +56,24 @@ class Lib
 
 		If equalLengthRequired is true, the result might be a copy of an array with the correct size.
 	**/
-	@:extern inline public static function nativeArray<T>(arr:Array<T>, equalLengthRequired:Bool):NativeArray<T>
-	{
+	extern inline public static function nativeArray<T>(arr:Array<T>, equalLengthRequired:Bool):NativeArray<T> {
 		var ret = new cs.NativeArray(arr.length);
-#if erase_generics
+		#if erase_generics
 		for (i in 0...arr.length)
 			ret[i] = arr[i];
-#else
-		p_nativeArray(arr,ret);
-#end
+		#else
+		p_nativeArray(arr, ret);
+		#end
 		return ret;
 	}
 
-#if !erase_generics
-	static function p_nativeArray<T>(arr:Array<T>, ret:cs.system.Array):Void
-	{
+	#if !erase_generics
+	static function p_nativeArray<T>(arr:Array<T>, ret:cs.system.Array):Void {
 		var native:NativeArray<T> = untyped arr.__a;
 		var len = arr.length;
 		cs.system.Array.Copy(native, 0, ret, 0, len);
 	}
-#end
+	#end
 
 	/**
 		Provides support for the "as" keyword in C#.
@@ -85,8 +82,7 @@ class Lib
 		This function will not work with Value Types (such as Int, Float, Bool...)
 	**/
 	@:pure
-	@:extern public static inline function as<T>(obj:Dynamic, cl:Class<T>):T
-	{
+	extern public static inline function as<T>(obj:Dynamic, cl:Class<T>):T {
 		return untyped __as__(obj);
 	}
 
@@ -96,8 +92,7 @@ class Lib
 		Currently Haxe's Class<> is equivalent to System.Type, but this is an implementation detail.
 		This may change in the future, so use this function whenever you need to perform such conversion.
 	**/
-	public static inline function fromNativeType(t:cs.system.Type):Class<Dynamic>
-	{
+	public static inline function fromNativeType(t:cs.system.Type):Class<Dynamic> {
 		return untyped t;
 	}
 
@@ -107,16 +102,14 @@ class Lib
 		Currently Haxe's Class<> is equivalent to System.Type, but this is an implementation detail.
 		This may change in the future, so use this function whenever you need to perform such conversion.
 	**/
-	public static inline function toNativeType(cl:Class<Dynamic>):Type
-	{
+	public static inline function toNativeType(cl:Class<Dynamic>):Type {
 		return untyped cl;
 	}
 
 	/**
 		Returns a System.Type equivalent to the Haxe Enum<> type.
 	**/
-	public static inline function toNativeEnum(cl:Enum<Dynamic>):Type
-	{
+	public static inline function toNativeEnum(cl:Enum<Dynamic>):Type {
 		return untyped cl;
 	}
 
@@ -125,28 +118,25 @@ class Lib
 		[deprecated] - use `getNativeType` instead
 	**/
 	@:deprecated('The function `nativeType` is deprecated and will be removed in later versions. Please use `getNativeType` instead')
-	public static inline function nativeType(obj:Dynamic):Type
-	{
+	public static inline function nativeType(obj:Dynamic):Type {
 		return untyped obj.GetType();
 	}
 
 	/**
 		Gets the native System.Type from the supplied object. Will throw an exception in case of null being passed.
 	**/
-	public static inline function getNativeType(obj:Dynamic):Type
-	{
+	public static inline function getNativeType(obj:Dynamic):Type {
 		return untyped obj.GetType();
 	}
 
-#if erase_generics
-	inline private static function mkDynamic<T>(native:NativeArray<T>):NativeArray<Dynamic>
-	{
+	#if erase_generics
+	inline private static function mkDynamic<T>(native:NativeArray<T>):NativeArray<Dynamic> {
 		var ret = new cs.NativeArray<Dynamic>(native.Length);
 		for (i in 0...native.Length)
 			ret[i] = native[i];
 		return ret;
 	}
-#end
+	#end
 
 	/**
 		Returns a Haxe Array of a native Array.
@@ -154,21 +144,19 @@ class Lib
 		so unless any operation triggers an array resize, all changes made to the Haxe array
 		will affect the native array argument.
 	**/
-	inline public static function array<T>(native:cs.NativeArray<T>):Array<T>
-	{
-#if erase_generics
+	inline public static function array<T>(native:cs.NativeArray<T>):Array<T> {
+		#if erase_generics
 		var dyn:NativeArray<Dynamic> = mkDynamic(native);
 		return @:privateAccess Array.ofNative(dyn);
-#else
+		#else
 		return @:privateAccess Array.ofNative(native);
-#end
+		#end
 	}
 
 	/**
 		Allocates a new Haxe Array with a predetermined size
 	**/
-	inline public static function arrayAlloc<T>(size:Int):Array<T>
-	{
+	inline public static function arrayAlloc<T>(size:Int):Array<T> {
 		return @:privateAccess Array.alloc(size);
 	}
 
@@ -176,9 +164,8 @@ class Lib
 		Rethrow an exception. This is useful when manually filtering an exception in order
 		to keep the previous exception stack.
 	**/
-	@:extern inline public static function rethrow(e:Dynamic):Void
-	{
-		untyped __rethrow__();
+	extern inline public static function rethrow(e:Dynamic):Void {
+		throw untyped __rethrow__;
 	}
 
 	/**
@@ -194,8 +181,7 @@ class Lib
 			});
 		This method only exists at compile-time, so it can't be called via reflection.
 	**/
-	@:extern public static inline function checked<V>(block:V):Void
-	{
+	extern public static inline function checked<V>(block:V):Void {
 		untyped __checked__(block);
 	}
 
@@ -206,12 +192,12 @@ class Lib
 
 		This method only exists at compile-time, so it can't be called via reflection.
 	**/
-	@:extern public static inline function lock<O,V>(obj:O, block:V):Void
-	{
+	extern public static inline function lock<O, V>(obj:O, block:V):Void {
 		untyped __lock__(obj, block);
 	}
 
-	//Unsafe code manipulation
+	// Unsafe code manipulation
+
 	#if unsafe
 	/**
 		Marks its parameters as fixed objects inside the defined block.
@@ -228,8 +214,7 @@ class Lib
 
 		This method only exists at compile-time, so it can't be called via reflection.
 	**/
-	@:extern public static inline function fixed<V>(block:V):Void
-	{
+	extern public static inline function fixed<V>(block:V):Void {
 		untyped __fixed__(block);
 	}
 
@@ -242,8 +227,7 @@ class Lib
 
 		This method only exists at compile-time, so it can't be called via reflection.
 	**/
-	@:extern public static inline function unsafe<V>(block:V):Void
-	{
+	extern public static inline function unsafe<V>(block:V):Void {
 		untyped __unsafe__(block);
 	}
 
@@ -260,8 +244,7 @@ class Lib
 		This method only exists at compile-time, so it can't be called via reflection.
 		Warning: This method will only work if a local variable is passed as an argument.
 	**/
-	@:extern public static inline function addressOf<T>(variable:T):cs.Pointer<T>
-	{
+	extern public static inline function addressOf<T>(variable:T):cs.Pointer<T> {
 		return untyped __addressOf__(variable);
 	}
 
@@ -279,8 +262,7 @@ class Lib
 
 		This method only exists at compile-time, so it can't be called via reflection.
 	**/
-	@:extern public static inline function valueOf<T>(pointer:cs.Pointer<T>):T
-	{
+	extern public static inline function valueOf<T>(pointer:cs.Pointer<T>):T {
 		return untyped __valueOf__(pointer);
 	}
 
@@ -300,16 +282,14 @@ class Lib
 
 		This method only exists at compile-time, so it can't be called via reflection.
 	**/
-	@:extern public static inline function pointerOfArray<T>(array:cs.NativeArray<T>):cs.Pointer<T>
-	{
+	extern public static inline function pointerOfArray<T>(array:cs.NativeArray<T>):cs.Pointer<T> {
 		return untyped __ptr__(array);
 	}
 
 	/**
 		Returns the byte size of the given struct. Only works with structs and basic types.
 	**/
-	@:extern public static inline function sizeof(struct:Class<Dynamic>):Int
-	{
+	extern public static inline function sizeof(struct:Class<Dynamic>):Int {
 		return untyped __sizeof__(struct);
 	}
 	#end
diff --git a/std/cs/NativeArray.hx b/std/cs/NativeArray.hx
index 478cbe3b03e7fd9a0a44584858df7fc815bea005..7f92f1ad70b64832b5dac7ab94b004e176fdf4da 100644
--- a/std/cs/NativeArray.hx
+++ b/std/cs/NativeArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs;
 
 import haxe.extern.Rest;
@@ -26,8 +27,7 @@ import haxe.extern.Rest;
 /**
 	Represents a C# fixed-size Array (`T[]`)
 **/
-extern class NativeArray<T> extends cs.system.Array implements ArrayAccess<T>
-{
+extern class NativeArray<T> extends cs.system.Array implements ArrayAccess<T> {
 	/**
 		Creates a new array with the specified elements.
 
@@ -35,37 +35,36 @@ extern class NativeArray<T> extends cs.system.Array implements ArrayAccess<T>
 		```haxe
 		var elements = NativeArray.make(1,2,3,4,5,6);
 		```
-	 **/
+	**/
 	public static function make<T>(elements:Rest<T>):NativeArray<T>;
 
 	/**
 		Allocates a new array with size `len`
-	 **/
+	**/
 	public function new(len:Int):Void;
 
 	/**
 		Alias to array's `Length` property. Returns the size of the array
-	 **/
-	public var length(get,never):Int;
+	**/
+	public var length(get, never):Int;
 
-	@:extern inline private function get_length():Int return this.Length;
+	extern inline private function get_length():Int
+		return this.Length;
 
 	static function Reverse(arr:cs.system.Array):Void;
 
 	/**
 		Returns an iterator so it's possible to use `for` with C#'s `NativeArray`
-	 **/
-	@:extern inline public function iterator():NativeArrayIterator<T>
+	**/
+	extern inline public function iterator():NativeArrayIterator<T>
 		return new NativeArrayIterator(this);
 }
 
-@:dce private class NativeArrayIterator<T>
-{
-	public var arr(default,null):NativeArray<T>;
-	public var idx(default,null):UInt;
+@:dce private class NativeArrayIterator<T> {
+	public var arr(default, null):NativeArray<T>;
+	public var idx(default, null):UInt;
 
-	inline public function new(arr)
-	{
+	inline public function new(arr) {
 		this.arr = arr;
 		this.idx = 0;
 	}
@@ -73,8 +72,7 @@ extern class NativeArray<T> extends cs.system.Array implements ArrayAccess<T>
 	inline public function hasNext():Bool
 		return this.idx < this.arr.Length;
 
-	inline public function next():T
-	{
+	inline public function next():T {
 		return this.arr[this.idx++];
 	}
 }
diff --git a/std/cs/Out.hx b/std/cs/Out.hx
index 587097667e2e8fb993605176eae2a7ddb05956cf..c4e78ad8e7f60be613ed98055deb4d3b9140ee51 100644
--- a/std/cs/Out.hx
+++ b/std/cs/Out.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs;
 
 /**
@@ -27,6 +28,6 @@ package cs;
 
 	Note: Using this type should be considered a bad practice unless overriding a native function is needed.
 **/
-@:analyzer(no_simplification)
 @:analyzer(no_local_dce)
-typedef Out<T> = T;
\ No newline at end of file
+@:semantics(reference)
+typedef Out<T> = T;
diff --git a/std/cs/Pointer.hx b/std/cs/Pointer.hx
index b71af6b484a4ed48b4055b2e0e0a524a8b329b16..5d18c665369acdc6b65b665aa3eb1a847ebb13d4 100644
--- a/std/cs/Pointer.hx
+++ b/std/cs/Pointer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs;
+
 import cs.StdTypes.Int64;
 
 /**
@@ -43,63 +45,89 @@ import cs.StdTypes.Int64;
 #if !unsafe
 #error "You need to define 'unsafe' to be able to use unsafe code in hxcs"
 #else
-@:runtimeValue @:coreType abstract Pointer<T> from Int64 from PointerAccess<T> to PointerAccess<T>
-{
-	@:op(A+B) public static function addIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
-	@:op(A+B) public static function addp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
-	@:op(A*B) public static function mulIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
-	@:op(A*B) public static function mulp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
-	@:op(A%B) public static function modIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
-	@:op(A%B) public static function modp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
-	@:op(A-B) public static function subIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
-	@:op(A-B) public static function subp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
-	@:op(A/B) public static function divIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
-	@:op(A/B) public static function divp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
-	@:op(A|B) public static function orIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
-	@:op(A|B) public static function orp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
-	@:op(A^B) public static function xorIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
-	@:op(A^B) public static function xorp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
-	@:op(A&B) public static function andIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
-	@:op(A&B) public static function andp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
-	@:op(A<<B) public static function shlIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
-	@:op(A<<B) public static function shlp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
-	@:op(A>>B) public static function shrIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
-	@:op(A>>B) public static function shrp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
-
-	@:op(A>B) public static function gtp<T>(lhs:Pointer<T>, rhs:Pointer<T>):Bool;
-	@:op(A>=B) public static function gtep<T>(lhs:Pointer<T>, rhs:Pointer<T>):Bool;
-	@:op(A<B) public static function ltp<T>(lhs:Pointer<T>, rhs:Pointer<T>):Bool;
-	@:op(A<=B) public static function ltep<T>(lhs:Pointer<T>, rhs:Pointer<T>):Bool;
+@:runtimeValue @:coreType abstract Pointer<T> from Int64 from PointerAccess<T> to PointerAccess<T> {
+	@:op(A + B) public static function addIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
+
+	@:op(A + B) public static function addp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
+
+	@:op(A * B) public static function mulIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
+
+	@:op(A * B) public static function mulp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
+
+	@:op(A % B) public static function modIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
+
+	@:op(A % B) public static function modp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
+
+	@:op(A - B) public static function subIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
+
+	@:op(A - B) public static function subp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
+
+	@:op(A / B) public static function divIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
+
+	@:op(A / B) public static function divp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
+
+	@:op(A | B) public static function orIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
+
+	@:op(A | B) public static function orp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
+
+	@:op(A ^ B) public static function xorIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
+
+	@:op(A ^ B) public static function xorp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
+
+	@:op(A & B) public static function andIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
+
+	@:op(A & B) public static function andp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
+
+	@:op(A << B) public static function shlIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
+
+	@:op(A << B) public static function shlp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
+
+	@:op(A >> B) public static function shrIp<T>(lhs:Pointer<T>, rhs:Int):Pointer<T>;
+
+	@:op(A >> B) public static function shrp<T>(lhs:Pointer<T>, rhs:Int64):Pointer<T>;
+
+	@:op(A > B) public static function gtp<T>(lhs:Pointer<T>, rhs:Pointer<T>):Bool;
+
+	@:op(A >= B) public static function gtep<T>(lhs:Pointer<T>, rhs:Pointer<T>):Bool;
+
+	@:op(A < B) public static function ltp<T>(lhs:Pointer<T>, rhs:Pointer<T>):Bool;
+
+	@:op(A <= B) public static function ltep<T>(lhs:Pointer<T>, rhs:Pointer<T>):Bool;
 
 	@:op(~A) public static function bnegp<T>(t:Pointer<T>):Pointer<T>;
+
 	@:op(A++) public static function prepp<T>(t:Pointer<T>):Pointer<T>;
+
 	@:op(A--) public static function prenn<T>(t:Pointer<T>):Pointer<T>;
+
 	@:op(++A) public static function postpp<T>(t:Pointer<T>):Pointer<T>;
+
 	@:op(--A) public static function postnn<T>(t:Pointer<T>):Pointer<T>;
 
 	/**
 		Returns a `cs.PointerAccess` type, which in turn allows the underlying Pointer's
 		fields to be accessed.
-	 **/
+	**/
 	// @:analyzer(no_simplification)
-	public var acc(get,never):PointerAccess<T>;
+	public var acc(get, never):PointerAccess<T>;
 
 	// @:analyzer(no_simplification)
-	@:extern inline private function get_acc():PointerAccess<T> return (cast this : PointerAccess<T>);
+	extern inline private function get_acc():PointerAccess<T>
+		return (cast this : PointerAccess<T>);
 
 	// backwards compatibility
-	inline public function add(i:Int):Pointer<T>
-	{
+	inline public function add(i:Int):Pointer<T> {
 		return this + i;
 	}
 
 	@:arrayAccess public static function getIp<T>(p:Pointer<T>, at:Int):T;
+
 	@:arrayAccess public static function setIp<T>(p:Pointer<T>, at:Int, val:T):T;
+
 	@:arrayAccess public static function getp<T>(p:Pointer<T>, at:Int64):T;
+
 	@:arrayAccess public static function setp<T>(p:Pointer<T>, at:Int64, val:T):T;
 }
 
-@:forward abstract PointerAccess<T>(T)
-{
-}
+@:forward abstract PointerAccess<T>(T) {}
 #end
diff --git a/std/cs/Ref.hx b/std/cs/Ref.hx
index 024d5da8a3f3142e965081aa94b5245cc3e1d979..609bd2aa5dd1bb43c9274026a3d1b452969b9105 100644
--- a/std/cs/Ref.hx
+++ b/std/cs/Ref.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs;
 
 /**
@@ -27,5 +28,5 @@ package cs;
 
 	Note: Using this type should be considered a bad practice unless overriding a native function is needed.
 **/
-@:analyzer(no_simplification)
-typedef Ref<T> = T;
\ No newline at end of file
+@:semantics(reference)
+typedef Ref<T> = T;
diff --git a/std/cs/StdTypes.hx b/std/cs/StdTypes.hx
index 05cef4bc506b87b1df103a87f4f16acc83ebb39b..d2d72e90d8968a2b6622ca36bfc7c37246f55213 100644
--- a/std/cs/StdTypes.hx
+++ b/std/cs/StdTypes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs;
 
 @:notNull @:runtimeValue @:coreType extern abstract Int8 to Int {}
@@ -26,75 +27,127 @@ package cs;
 @:notNull @:runtimeValue @:coreType extern abstract Char16 from Int {}
 @:notNull @:runtimeValue @:coreType extern abstract UInt8 to Int from Int {}
 @:notNull @:runtimeValue @:coreType extern abstract UInt16 to Int {}
-@:notNull @:runtimeValue @:coreType extern abstract Int64 from Int from Float
-{
-	@:op(A+B) public static function addI(lhs:Int64, rhs:Int):Int64;
-	@:op(A+B) public static function add(lhs:Int64, rhs:Int64):Int64;
-	@:op(A*B) public static function mulI(lhs:Int64, rhs:Int):Int64;
-	@:op(A*B) public static function mul(lhs:Int64, rhs:Int64):Int64;
-	@:op(A%B) public static function modI(lhs:Int64, rhs:Int):Int64;
-	@:op(A%B) public static function mod(lhs:Int64, rhs:Int64):Int64;
-	@:op(A-B) public static function subI(lhs:Int64, rhs:Int):Int64;
-	@:op(A-B) public static function sub(lhs:Int64, rhs:Int64):Int64;
-	@:op(A/B) public static function divI(lhs:Int64, rhs:Int):Int64;
-	@:op(A/B) public static function div(lhs:Int64, rhs:Int64):Int64;
-	@:op(A|B) public static function orI(lhs:Int64, rhs:Int):Int64;
-	@:op(A|B) public static function or(lhs:Int64, rhs:Int64):Int64;
-	@:op(A^B) public static function xorI(lhs:Int64, rhs:Int):Int64;
-	@:op(A^B) public static function xor(lhs:Int64, rhs:Int64):Int64;
-	@:op(A&B) public static function andI(lhs:Int64, rhs:Int):Int64;
-	@:op(A&B) public static function and(lhs:Int64, rhs:Int64):Int64;
-	@:op(A<<B) public static function shlI(lhs:Int64, rhs:Int):Int64;
-	@:op(A<<B) public static function shl(lhs:Int64, rhs:Int64):Int64;
-	@:op(A>>B) public static function shrI(lhs:Int64, rhs:Int):Int64;
-	@:op(A>>B) public static function shr(lhs:Int64, rhs:Int64):Int64;
-
-	@:op(A>B) public static function gt(lhs:Int64, rhs:Int64):Bool;
-	@:op(A>=B) public static function gte(lhs:Int64, rhs:Int64):Bool;
-	@:op(A<B) public static function lt(lhs:Int64, rhs:Int64):Bool;
-	@:op(A<=B) public static function lte(lhs:Int64, rhs:Int64):Bool;
+
+@:notNull @:runtimeValue @:coreType extern abstract Int64 from Int from Float {
+	@:op(A + B) public static function addI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A + B) public static function add(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A * B) public static function mulI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A * B) public static function mul(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A % B) public static function modI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A % B) public static function mod(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A - B) public static function subI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A - B) public static function sub(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A / B) public static function divI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A / B) public static function div(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A | B) public static function orI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A | B) public static function or(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A ^ B) public static function xorI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A ^ B) public static function xor(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A & B) public static function andI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A & B) public static function and(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A << B) public static function shlI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A << B) public static function shl(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A >> B) public static function shrI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A >> B) public static function shr(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A > B) public static function gt(lhs:Int64, rhs:Int64):Bool;
+
+	@:op(A >= B) public static function gte(lhs:Int64, rhs:Int64):Bool;
+
+	@:op(A < B) public static function lt(lhs:Int64, rhs:Int64):Bool;
+
+	@:op(A <= B) public static function lte(lhs:Int64, rhs:Int64):Bool;
 
 	@:op(~A) public static function bneg(t:Int64):Int64;
+
 	@:op(-A) public static function neg(t:Int64):Int64;
 
 	@:op(++A) public static function preIncrement(t:Int64):Int64;
+
 	@:op(A++) public static function postIncrement(t:Int64):Int64;
+
 	@:op(--A) public static function preDecrement(t:Int64):Int64;
+
 	@:op(A--) public static function postDecrement(t:Int64):Int64;
 }
-@:notNull @:runtimeValue @:coreType extern abstract UInt64 from Int from Int64 from Float from haxe.Int64
-{
-	@:op(A+B) public static function addI(lhs:UInt64, rhs:Int):UInt64;
-	@:op(A+B) public static function add(lhs:UInt64, rhs:UInt64):UInt64;
-	@:op(A*B) public static function mulI(lhs:UInt64, rhs:Int):UInt64;
-	@:op(A*B) public static function mul(lhs:UInt64, rhs:UInt64):UInt64;
-	@:op(A%B) public static function modI(lhs:UInt64, rhs:Int):UInt64;
-	@:op(A%B) public static function mod(lhs:UInt64, rhs:UInt64):UInt64;
-	@:op(A-B) public static function subI(lhs:UInt64, rhs:Int):UInt64;
-	@:op(A-B) public static function sub(lhs:UInt64, rhs:UInt64):UInt64;
-	@:op(A/B) public static function divI(lhs:UInt64, rhs:Int):UInt64;
-	@:op(A/B) public static function div(lhs:UInt64, rhs:UInt64):UInt64;
-	@:op(A|B) public static function orI(lhs:UInt64, rhs:Int):UInt64;
-	@:op(A|B) public static function or(lhs:UInt64, rhs:UInt64):UInt64;
-	@:op(A^B) public static function xorI(lhs:UInt64, rhs:Int):UInt64;
-	@:op(A^B) public static function xor(lhs:UInt64, rhs:UInt64):UInt64;
-	@:op(A&B) public static function andI(lhs:UInt64, rhs:Int):UInt64;
-	@:op(A&B) public static function and(lhs:UInt64, rhs:UInt64):UInt64;
-	@:op(A<<B) public static function shlI(lhs:UInt64, rhs:Int):UInt64;
-	@:op(A<<B) public static function shl(lhs:UInt64, rhs:UInt64):UInt64;
-	@:op(A>>B) public static function shrI(lhs:UInt64, rhs:Int):UInt64;
-	@:op(A>>B) public static function shr(lhs:UInt64, rhs:UInt64):UInt64;
-
-	@:op(A>B) public static function gt(lhs:UInt64, rhs:UInt64):Bool;
-	@:op(A>=B) public static function gte(lhs:UInt64, rhs:UInt64):Bool;
-	@:op(A<B) public static function lt(lhs:UInt64, rhs:UInt64):Bool;
-	@:op(A<=B) public static function lte(lhs:UInt64, rhs:UInt64):Bool;
+
+@:notNull @:runtimeValue @:coreType extern abstract UInt64 from Int from Int64 from Float from haxe.Int64 {
+	@:op(A + B) public static function addI(lhs:UInt64, rhs:Int):UInt64;
+
+	@:op(A + B) public static function add(lhs:UInt64, rhs:UInt64):UInt64;
+
+	@:op(A * B) public static function mulI(lhs:UInt64, rhs:Int):UInt64;
+
+	@:op(A * B) public static function mul(lhs:UInt64, rhs:UInt64):UInt64;
+
+	@:op(A % B) public static function modI(lhs:UInt64, rhs:Int):UInt64;
+
+	@:op(A % B) public static function mod(lhs:UInt64, rhs:UInt64):UInt64;
+
+	@:op(A - B) public static function subI(lhs:UInt64, rhs:Int):UInt64;
+
+	@:op(A - B) public static function sub(lhs:UInt64, rhs:UInt64):UInt64;
+
+	@:op(A / B) public static function divI(lhs:UInt64, rhs:Int):UInt64;
+
+	@:op(A / B) public static function div(lhs:UInt64, rhs:UInt64):UInt64;
+
+	@:op(A | B) public static function orI(lhs:UInt64, rhs:Int):UInt64;
+
+	@:op(A | B) public static function or(lhs:UInt64, rhs:UInt64):UInt64;
+
+	@:op(A ^ B) public static function xorI(lhs:UInt64, rhs:Int):UInt64;
+
+	@:op(A ^ B) public static function xor(lhs:UInt64, rhs:UInt64):UInt64;
+
+	@:op(A & B) public static function andI(lhs:UInt64, rhs:Int):UInt64;
+
+	@:op(A & B) public static function and(lhs:UInt64, rhs:UInt64):UInt64;
+
+	@:op(A << B) public static function shlI(lhs:UInt64, rhs:Int):UInt64;
+
+	@:op(A << B) public static function shl(lhs:UInt64, rhs:UInt64):UInt64;
+
+	@:op(A >> B) public static function shrI(lhs:UInt64, rhs:Int):UInt64;
+
+	@:op(A >> B) public static function shr(lhs:UInt64, rhs:UInt64):UInt64;
+
+	@:op(A > B) public static function gt(lhs:UInt64, rhs:UInt64):Bool;
+
+	@:op(A >= B) public static function gte(lhs:UInt64, rhs:UInt64):Bool;
+
+	@:op(A < B) public static function lt(lhs:UInt64, rhs:UInt64):Bool;
+
+	@:op(A <= B) public static function lte(lhs:UInt64, rhs:UInt64):Bool;
 
 	@:op(~A) public static function bneg(t:UInt64):UInt64;
+
 	@:op(-A) public static function neg(t:UInt64):UInt64;
 
 	@:op(++A) public static function preIncrement(t:UInt64):UInt64;
+
 	@:op(A++) public static function postIncrement(t:UInt64):UInt64;
+
 	@:op(--A) public static function preDecrement(t:UInt64):UInt64;
+
 	@:op(A--) public static function postDecrement(t:UInt64):UInt64;
 }
diff --git a/std/cs/_std/Array.hx b/std/cs/_std/Array.hx
index 5ed8d0f0abe389cf21fd0f943e68895f9de001c9..929b65373c66f45a6f9ee6774d7828ff94912915 100644
--- a/std/cs/_std/Array.hx
+++ b/std/cs/_std/Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,56 +19,52 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import cs.NativeArray;
 
 #if core_api_serialize
 @:meta(System.Serializable)
 #end
-@:final class Array<T> implements ArrayAccess<T> {
-
-	public var length(default,null) : Int;
+final class Array<T> implements ArrayAccess<T> {
+	public var length(default, null):Int;
 
 	private var __a:NativeArray<T>;
 
-#if erase_generics
-	inline private static function ofNative<X>(native:NativeArray<Dynamic>):Array<X>
-	{
+	@:skipReflection static var __hx_toString_depth = 0;
+	@:skipReflection static inline final __hx_defaultCapacity = 4;
+
+	#if erase_generics
+	inline private static function ofNative<X>(native:NativeArray<Dynamic>):Array<X> {
 		return new Array(native);
 	}
-#else
-	inline private static function ofNative<X>(native:NativeArray<X>):Array<X>
-	{
+	#else
+	inline private static function ofNative<X>(native:NativeArray<X>):Array<X> {
 		return new Array(native);
 	}
-#end
+	#end
 
-	inline private static function alloc<Y>(size:Int):Array<Y>
-	{
+	inline private static function alloc<Y>(size:Int):Array<Y> {
 		return new Array(new NativeArray(size));
 	}
 
-	@:overload public function new() : Void
-	{
+	@:overload public function new():Void {
 		this.length = 0;
 		this.__a = new NativeArray(0);
 	}
 
-#if erase_generics
-	@:overload private function new(native:NativeArray<Dynamic>)
-	{
+	#if erase_generics
+	@:overload private function new(native:NativeArray<Dynamic>) {
 		this.length = native.Length;
 		this.__a = untyped native;
 	}
-#else
-	@:overload private function new(native:NativeArray<T>)
-	{
+	#else
+	@:overload private function new(native:NativeArray<T>) {
 		this.length = native.Length;
 		this.__a = native;
 	}
-#end
+	#end
 
-	public function concat( a : Array<T> ) : Array<T>
-	{
+	public function concat(a:Array<T>):Array<T> {
 		var len = length + a.length;
 		var retarr = new NativeArray(len);
 		cs.system.Array.Copy(__a, 0, retarr, 0, length);
@@ -77,12 +73,10 @@ import cs.NativeArray;
 		return ofNative(retarr);
 	}
 
-	private function concatNative( a : NativeArray<T> ) : Void
-	{
+	private function concatNative(a:NativeArray<T>):Void {
 		var __a = __a;
 		var len = length + a.Length;
-		if (__a.Length >= len)
-		{
+		if (__a.Length >= len) {
 			cs.system.Array.Copy(a, 0, __a, length, length);
 		} else {
 			var newarr = new NativeArray(len);
@@ -95,45 +89,37 @@ import cs.NativeArray;
 		this.length = len;
 	}
 
-	public function indexOf( x : T, ?fromIndex:Int ) : Int
-	{
+	public function indexOf(x:T, ?fromIndex:Int):Int {
 		var len = length, i:Int = (fromIndex == null) ? 0 : fromIndex;
-		if (i < 0)
-		{
+		if (i < 0) {
 			i += len;
-			if (i < 0) i = 0;
-		}
-		else if (i >= len)
-		{
+			if (i < 0)
+				i = 0;
+		} else if (i >= len) {
 			return -1;
 		}
 		return cs.system.Array.IndexOf(__a, x, i, len - i);
 	}
 
-	public function lastIndexOf( x : T, ?fromIndex:Int ) : Int
-	{
+	public function lastIndexOf(x:T, ?fromIndex:Int):Int {
 		var len = length, i:Int = (fromIndex == null) ? len - 1 : fromIndex;
-		if (i >= len)
-		{
+		if (i >= len) {
 			i = len - 1;
-		}
-		else if (i < 0)
-		{
+		} else if (i < 0) {
 			i += len;
-			if (i < 0) return -1;
+			if (i < 0)
+				return -1;
 		}
 		return cs.system.Array.LastIndexOf(__a, x, i, i + 1);
 	}
 
-	public function join( sep : String ) : String
-	{
+	public function join(sep:String):String {
 		var buf = new StringBuf();
 		var i = -1;
 
 		var first = true;
 		var length = length;
-		while (++i < length)
-		{
+		while (++i < length) {
 			if (first)
 				first = false;
 			else
@@ -144,12 +130,10 @@ import cs.NativeArray;
 		return buf.toString();
 	}
 
-	public function pop() : Null<T>
-	{
+	public function pop():Null<T> {
 		var __a = __a;
 		var length = length;
-		if (length > 0)
-		{
+		if (length > 0) {
 			var val = __a[--length];
 			__a[length] = null;
 			this.length = length;
@@ -160,11 +144,9 @@ import cs.NativeArray;
 		}
 	}
 
-	public function push(x : T) : Int
-	{
-		if (length >= __a.Length)
-		{
-			var newLen = (length << 1) + 1;
+	public function push(x:T):Int {
+		if (length >= __a.Length) {
+			var newLen = length == 0 ? __hx_defaultCapacity : (length << 1);
 			var newarr = new NativeArray(newLen);
 			__a.CopyTo(newarr, 0);
 
@@ -175,53 +157,50 @@ import cs.NativeArray;
 		return ++length;
 	}
 
-	public function reverse() : Void
-	{
+	public function reverse():Void {
 		var i = 0;
 		var l = this.length;
 		var a = this.__a;
 		var half = l >> 1;
 		l -= 1;
-		while ( i < half )
-		{
+		while (i < half) {
 			var tmp = a[i];
-			a[i] = a[l-i];
-			a[l-i] = tmp;
+			a[i] = a[l - i];
+			a[l - i] = tmp;
 			i += 1;
 		}
 	}
 
-	public function shift() : Null<T>
-	{
+	public function shift():Null<T> {
 		var l = this.length;
-		if( l == 0 )
+		if (l == 0)
 			return null;
 
 		var a = this.__a;
 		var x = a[0];
 		l -= 1;
-		cs.system.Array.Copy(a, 1, a, 0, length-1);
+		cs.system.Array.Copy(a, 1, a, 0, length - 1);
 		a[l] = null;
 		this.length = l;
 
 		return x;
 	}
 
-	public function slice( pos : Int, ?end : Int ) : Array<T>
-	{
-		if( pos < 0 ){
+	public function slice(pos:Int, ?end:Int):Array<T> {
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 )
+			if (pos < 0)
 				pos = 0;
 		}
-		if( end == null )
+		if (end == null)
 			end = this.length;
-		else if( end < 0 )
+		else if (end < 0)
 			end = this.length + end;
-		if( end > this.length )
+		if (end > this.length)
 			end = this.length;
 		var len = end - pos;
-		if ( len < 0 ) return new Array();
+		if (len < 0)
+			return new Array();
 
 		var newarr = new NativeArray(len);
 		cs.system.Array.Copy(__a, pos, newarr, 0, len);
@@ -229,47 +208,49 @@ import cs.NativeArray;
 		return ofNative(newarr);
 	}
 
-	public function sort( f : T -> T -> Int ) : Void
-	{
+	public function sort(f:T->T->Int):Void {
 		if (length == 0)
 			return;
 		quicksort(0, length - 1, f);
 	}
 
-	private function quicksort( lo : Int, hi : Int, f : T -> T -> Int ) : Void
-	{
+	private function quicksort(lo:Int, hi:Int, f:T->T->Int):Void {
 		var buf = __a;
 		var i = lo, j = hi;
 		var p = buf[(i + j) >> 1];
-		while ( i <= j )
-		{
-			while ( i < hi && f(buf[i], p) < 0 ) i++;
-			while ( j > lo && f(buf[j], p) > 0 ) j--;
-			if ( i <= j )
-			{
+		while (i <= j) {
+			while (i < hi && f(buf[i], p) < 0)
+				i++;
+			while (j > lo && f(buf[j], p) > 0)
+				j--;
+			if (i <= j) {
 				var t = buf[i];
 				buf[i++] = buf[j];
 				buf[j--] = t;
 			}
 		}
 
-		if( lo < j ) quicksort( lo, j, f );
-		if( i < hi ) quicksort( i, hi, f );
+		if (lo < j)
+			quicksort(lo, j, f);
+		if (i < hi)
+			quicksort(i, hi, f);
 	}
 
-	public function splice( pos : Int, len : Int ) : Array<T>
-	{
-		if( len < 0 ) return new Array();
-		if( pos < 0 ) {
+	public function splice(pos:Int, len:Int):Array<T> {
+		if (len < 0)
+			return new Array();
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 ) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
-		if( pos > this.length ) {
+		if (pos > this.length) {
 			pos = 0;
 			len = 0;
-		} else if( pos + len > this.length ) {
+		} else if (pos + len > this.length) {
 			len = this.length - pos;
-			if( len < 0 ) len = 0;
+			if (len < 0)
+				len = 0;
 		}
 		var a = this.__a;
 
@@ -280,42 +261,58 @@ import cs.NativeArray;
 		var end = pos + len;
 		cs.system.Array.Copy(a, end, a, pos, this.length - end);
 		this.length -= len;
-		while( --len >= 0 )
+		while (--len >= 0)
 			a[this.length + len] = null;
 		return ret;
 	}
 
-	private function spliceVoid( pos : Int, len : Int ) : Void
-	{
-		if( len < 0 ) return;
-		if( pos < 0 ) {
+	private function spliceVoid(pos:Int, len:Int):Void {
+		if (len < 0)
+			return;
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 ) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
-		if( pos > this.length ) {
+		if (pos > this.length) {
 			pos = 0;
 			len = 0;
-		} else if( pos + len > this.length ) {
+		} else if (pos + len > this.length) {
 			len = this.length - pos;
-			if( len < 0 ) len = 0;
+			if (len < 0)
+				len = 0;
 		}
 		var a = this.__a;
 
 		var end = pos + len;
 		cs.system.Array.Copy(a, end, a, pos, this.length - end);
 		this.length -= len;
-		while( --len >= 0 )
+		while (--len >= 0)
 			a[this.length + len] = null;
 	}
 
-	public function toString() : String
-	{
+	public function toString():String {
+		if (__hx_toString_depth >= 5) {
+			return "...";
+		}
+		++__hx_toString_depth;
+		try {
+			var s = __hx_toString();
+			--__hx_toString_depth;
+			return s;
+		} catch (e:Dynamic) {
+			--__hx_toString_depth;
+			throw(e);
+		}
+	}
+
+	@:skipReflection
+	function __hx_toString():String {
 		var ret = new StringBuf();
 		var a = __a;
 		ret.add("[");
 		var first = true;
-		for (i in 0...length)
-		{
+		for (i in 0...length) {
 			if (first)
 				first = false;
 			else
@@ -327,12 +324,10 @@ import cs.NativeArray;
 		return ret.toString();
 	}
 
-	public function unshift( x : T ) : Void
-	{
+	public function unshift(x:T):Void {
 		var __a = __a;
 		var length = length;
-		if (length >= __a.Length)
-		{
+		if (length >= __a.Length) {
 			var newLen = (length << 1) + 1;
 			var newarr = new NativeArray(newLen);
 			cs.system.Array.Copy(__a, 0, newarr, 1, length);
@@ -346,14 +341,14 @@ import cs.NativeArray;
 		++this.length;
 	}
 
-	public function insert( pos : Int, x : T ) : Void
-	{
+	public function insert(pos:Int, x:T):Void {
 		var l = this.length;
-		if( pos < 0 ) {
+		if (pos < 0) {
 			pos = l + pos;
-			if( pos < 0 ) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
-		if ( pos >= l ) {
+		if (pos >= l) {
 			this.push(x);
 			return;
 		} else if (pos == 0) {
@@ -361,8 +356,7 @@ import cs.NativeArray;
 			return;
 		}
 
-		if (l >= __a.Length)
-		{
+		if (l >= __a.Length) {
 			var newLen = (length << 1) + 1;
 			var newarr = new NativeArray(newLen);
 			cs.system.Array.Copy(__a, 0, newarr, 0, pos);
@@ -380,15 +374,12 @@ import cs.NativeArray;
 		}
 	}
 
-	public function remove( x : T ) : Bool
-	{
+	public function remove(x:T):Bool {
 		var __a = __a;
 		var i = -1;
 		var length = length;
-		while (++i < length)
-		{
-			if (__a[i] == x)
-			{
+		while (++i < length) {
+			if (__a[i] == x) {
 				cs.system.Array.Copy(__a, i + 1, __a, i, length - i - 1);
 				__a[--this.length] = null;
 
@@ -399,23 +390,24 @@ import cs.NativeArray;
 		return false;
 	}
 
-	public function map<S>( f : T -> S ) : Array<S> {
-		var ret = [];
-		for (elt in this)
-			ret.push(f(elt));
+	public inline function map<S>(f:T->S):Array<S> {
+		var ret = alloc(length);
+		for (i in 0...length)
+			ret.__unsafe_set(i, f(__unsafe_get(i)));
 		return ret;
 	}
 
-	public function filter( f : T -> Bool ) : Array<T> {
+	public inline function filter(f:T->Bool):Array<T> {
 		var ret = [];
-		for (elt in this)
+		for (i in 0...length) {
+			var elt = __unsafe_get(i);
 			if (f(elt))
 				ret.push(elt);
+		}
 		return ret;
 	}
 
-	public function copy() : Array<T>
-	{
+	public function copy():Array<T> {
 		var len = length;
 		var __a = __a;
 		var newarr = new NativeArray(len);
@@ -423,22 +415,29 @@ import cs.NativeArray;
 		return ofNative(newarr);
 	}
 
-	public inline function iterator() : Iterator<T>
-	{
+	public inline function iterator():Iterator<T> {
 		return new ArrayIterator<T>(this);
 	}
 
-	private function __get(idx:Int):T
-	{
+	public function resize(len:Int):Void {
+		if (length < len) {
+			if (__a.length < len) {
+				cs.system.Array.Resize(__a, len);
+			}
+			this.length = len;
+		} else if (length > len) {
+			spliceVoid(len, length - len);
+		}
+	}
+
+	private function __get(idx:Int):T {
 		return if ((cast idx : UInt) >= length) null else __a[idx];
 	}
 
-	private function __set(idx:Int, v:T):T
-	{
+	private function __set(idx:Int, v:T):T {
 		var idx:UInt = idx;
 		var __a = __a;
-		if (idx >= __a.Length)
-		{
+		if (idx >= __a.Length) {
 			var len = idx + 1;
 			if (idx == __a.Length)
 				len = (idx << 1) + 1;
@@ -453,31 +452,29 @@ import cs.NativeArray;
 		return __a[idx] = v;
 	}
 
-	private inline function __unsafe_get(idx:Int):T
-	{
+	private inline function __unsafe_get(idx:Int):T {
 		return __a[idx];
 	}
 
-	private inline function __unsafe_set(idx:Int, val:T):T
-	{
+	private inline function __unsafe_set(idx:Int, val:T):T {
 		return __a[idx] = val;
 	}
 }
 
-@:final
-private class ArrayIterator<T>
-{
+private final class ArrayIterator<T> {
 	var arr:Array<T>;
 	var len:Int;
 	var i:Int;
 
-	public inline function new(a:Array<T>)
-	{
+	public inline function new(a:Array<T>) {
 		arr = a;
 		len = a.length;
 		i = 0;
 	}
 
-	public inline function hasNext():Bool return i < len;
-	public inline function next():T return arr[i++];
+	public inline function hasNext():Bool
+		return i < len;
+
+	public inline function next():T
+		return arr[i++];
 }
diff --git a/std/cs/_std/Date.hx b/std/cs/_std/Date.hx
index 1f94ac2ae21780ed8d88b650f5123de823f32728..49b0f126db5161f23f3505aa1c10dccb87f47955 100644
--- a/std/cs/_std/Date.hx
+++ b/std/cs/_std/Date.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,119 +19,144 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package;
+
 import cs.system.DateTime;
+import cs.system.DateTimeKind;
 import cs.system.TimeSpan;
 import haxe.Int64;
 
 #if core_api_serialize
 @:meta(System.Serializable)
 #end
-@:coreApi class Date
-{
+@:coreApi class Date {
 	@:readOnly private static var epochTicks:Int64 = new DateTime(1970, 1, 1).Ticks;
-	private var date:DateTime;
 
-	@:overload public function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void
-	{
-		if (day <= 0) day = 1;
-		if (year <= 0) year = 1;
-		date = new DateTime(year, month + 1, day, hour, min, sec);
+	private var date:DateTime;
+	private var dateUTC:DateTime;
+
+	@:overload public function new(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Void {
+		if (day <= 0)
+			day = 1;
+		if (year <= 0)
+			year = 1;
+		date = new DateTime(year, month + 1, day, hour, min, sec, DateTimeKind.Local);
+		dateUTC = date.ToUniversalTime();
 	}
 
-	@:overload private function new(native:DateTime)
-	{
-		date = native;
+	@:overload private function new(native:DateTime) {
+		if (native.Kind == DateTimeKind.Utc) {
+			dateUTC = native;
+			date = dateUTC.ToLocalTime();
+		} else {
+			date = native;
+			dateUTC = date.ToUniversalTime();
+		}
 	}
 
-	public inline function getTime() : Float
-	{
+	public inline function getTime():Float {
+		#if (net_ver < 35)
 		return cast(cs.system.TimeZone.CurrentTimeZone.ToUniversalTime(date).Ticks - epochTicks, Float) / cast(TimeSpan.TicksPerMillisecond, Float);
+		#else
+		return cast(cs.system.TimeZoneInfo.ConvertTimeToUtc(date).Ticks - epochTicks, Float) / cast(TimeSpan.TicksPerMillisecond, Float);
+		#end
 	}
 
-	public inline function getHours() : Int
-	{
+	public inline function getHours():Int {
 		return date.Hour;
 	}
 
-	public inline function getMinutes() : Int
-	{
+	public inline function getMinutes():Int {
 		return date.Minute;
 	}
 
-	public inline function getSeconds() : Int
-	{
+	public inline function getSeconds():Int {
 		return date.Second;
 	}
 
-	public inline function getFullYear() : Int
-	{
+	public inline function getFullYear():Int {
 		return date.Year;
 	}
 
-	public inline function getMonth() : Int
-	{
+	public inline function getMonth():Int {
 		return date.Month - 1;
 	}
 
-	public inline function getDate() : Int
-	{
+	public inline function getDate():Int {
 		return date.Day;
 	}
 
-	public inline function getDay() : Int
-	{
+	public inline function getDay():Int {
 		return cast(date.DayOfWeek, Int);
 	}
 
-	public function toString():String
-	{
-		var m = getMonth() + 1;
-		var d = getDate();
-		var h = getHours();
-		var mi = getMinutes();
-		var s = getSeconds();
-		return (getFullYear())
-			+"-"+(if( m < 10 ) "0"+m else ""+m)
-			+"-"+(if( d < 10 ) "0"+d else ""+d)
-			+" "+(if( h < 10 ) "0"+h else ""+h)
-			+":"+(if( mi < 10 ) "0"+mi else ""+mi)
-			+":"+(if( s < 10 ) "0"+s else ""+s);
+	public inline function getUTCHours():Int {
+		return dateUTC.Hour;
+	}
+
+	public inline function getUTCMinutes():Int {
+		return dateUTC.Minute;
+	}
+
+	public inline function getUTCSeconds():Int {
+		return dateUTC.Second;
+	}
+
+	public inline function getUTCFullYear():Int {
+		return dateUTC.Year;
+	}
+
+	public inline function getUTCMonth():Int {
+		return dateUTC.Month - 1;
+	}
+
+	public inline function getUTCDate():Int {
+		return dateUTC.Day;
+	}
+
+	public inline function getUTCDay():Int {
+		return cast(dateUTC.DayOfWeek, Int);
+	}
+
+	public inline function getTimezoneOffset():Int {
+		return Std.int((cast(dateUTC.Ticks - date.Ticks, Float) / cast(TimeSpan.TicksPerMillisecond, Float)) / 60000.);
+	}
+
+	public function toString():String {
+		return date.ToString("yyyy-MM-dd HH\\:mm\\:ss");
 	}
 
-	static public inline function now() : Date
-	{
+	static public inline function now():Date {
 		return new Date(DateTime.Now);
 	}
 
-	static public inline function fromTime( t : Float ) : Date
-	{
+	static public inline function fromTime(t:Float):Date {
+		#if (net_ver < 35)
 		return new Date(cs.system.TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(cast(t * cast(TimeSpan.TicksPerMillisecond, Float), Int64) + epochTicks)));
+		#else
+		return new Date(cs.system.TimeZoneInfo.ConvertTimeFromUtc(new DateTime(cast(t * cast(TimeSpan.TicksPerMillisecond, Float), Int64) + epochTicks),
+			cs.system.TimeZoneInfo.Local));
+		#end
 	}
 
-	static public function fromString( s : String ) : Date
-	{
-		switch( s.length )
-		{
+	static public function fromString(s:String):Date {
+		switch (s.length) {
 			case 8: // hh:mm:ss
 				var k = s.split(":");
-				var d : Date = new Date(1, 1, 1, Std.parseInt(k[0]), Std.parseInt(k[1]), Std.parseInt(k[2]));
-				return d;
+				return new Date(new DateTime(1970, 1, 1, Std.parseInt(k[0]), Std.parseInt(k[1]), Std.parseInt(k[2]), DateTimeKind.Utc));
 			case 10: // YYYY-MM-DD
 				var k = s.split("-");
-				return new Date(Std.parseInt(k[0]),Std.parseInt(k[1]) - 1,Std.parseInt(k[2]),0,0,0);
+				return new Date(new DateTime(Std.parseInt(k[0]), Std.parseInt(k[1]), Std.parseInt(k[2]), 0, 0, 0, DateTimeKind.Local));
 			case 19: // YYYY-MM-DD hh:mm:ss
 				var k = s.split(" ");
 				var y = k[0].split("-");
 				var t = k[1].split(":");
-				return new Date(Std.parseInt(y[0]),Std.parseInt(y[1]) - 1,Std.parseInt(y[2]),Std.parseInt(t[0]),Std.parseInt(t[1]),Std.parseInt(t[2]));
+				return new Date(new DateTime(Std.parseInt(y[0]), Std.parseInt(y[1]), Std.parseInt(y[2]), Std.parseInt(t[0]), Std.parseInt(t[1]), Std.parseInt(t[2]), DateTimeKind.Local));
 			default:
 				throw "Invalid date format : " + s;
 		}
 	}
 
-	private static inline function fromNative( d : cs.system.DateTime ) : Date
-	{
+	private static inline function fromNative(d:cs.system.DateTime):Date {
 		return new Date(d);
 	}
 }
diff --git a/std/cs/_std/EReg.hx b/std/cs/_std/EReg.hx
index b430359a6d4c43c4a6533e3bd945fea19423f5ad..4b6bcea078980c6e34ed650770678d093508a4e8 100644
--- a/std/cs/_std/EReg.hx
+++ b/std/cs/_std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,94 +19,93 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import cs.system.text.regularexpressions.Regex;
 import cs.system.text.regularexpressions.Match;
 import cs.system.text.regularexpressions.RegexOptions;
 import cs.system.text.regularexpressions.*;
 
-@:coreApi @:final class EReg {
-
-	private var regex : Regex;
-	private var m : Match;
-	private var isGlobal : Bool;
-	private var cur : String;
+@:coreApi final class EReg {
+	private var regex:Regex;
+	private var m:Match;
+	private var isGlobal:Bool;
+	private var cur:String;
 
-	public function new( r : String, opt : String ) : Void {
+	public function new(r:String, opt:String):Void {
 		var opts:Int = cast CultureInvariant;
-		for (i in 0...opt.length) untyped {
-			switch(cast(opt[i], Int))
-			{
-				case 'i'.code:
-					opts |= cast(IgnoreCase, Int);
-				case 'g'.code:
-					isGlobal = true;
-				case 'm'.code:
-					opts |= cast(Multiline, Int);
-#if (!unity && !unity_std_target)
-				case 'c'.code:
-					opts |= cast(Compiled, Int);
-#end
+		for (i in 0...opt.length)
+			untyped {
+				switch (cast(opt[i], Int)) {
+					case 'i'.code:
+						opts |= cast(IgnoreCase, Int);
+					case 'g'.code:
+						isGlobal = true;
+					case 'm'.code:
+						opts |= cast(Multiline, Int);
+					#if (!unity && !unity_std_target)
+					case 'c'.code:
+						opts |= cast(Compiled, Int);
+					#end
+				}
 			}
-		}
 
 		this.regex = new Regex(r, cast(opts, RegexOptions));
 	}
 
-	public function match( s : String ) : Bool {
+	public function match(s:String):Bool {
 		m = regex.Match(s);
 		cur = s;
 		return m.Success;
 	}
 
-	public function matched( n : Int ) : String {
+	public function matched(n:Int):String {
 		if (m == null || cast(n, UInt) > m.Groups.Count)
 			throw "EReg::matched";
-		if (!m.Groups[n].Success) return null;
+		if (!m.Groups[n].Success)
+			return null;
 		return m.Groups[n].Value;
 	}
 
-	public function matchedLeft() : String {
+	public function matchedLeft():String {
 		return untyped cur.Substring(0, m.Index);
 	}
 
-	public function matchedRight() : String {
+	public function matchedRight():String {
 		return untyped cur.Substring(m.Index + m.Length);
 	}
 
-	public function matchedPos() : { pos : Int, len : Int } {
-		return { pos : m.Index, len : m.Length };
+	public function matchedPos():{pos:Int, len:Int} {
+		return {pos: m.Index, len: m.Length};
 	}
 
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
-		m= if (len<0) regex.Match(s,pos) else regex.Match(s, pos, len);
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
+		m = if (len < 0) regex.Match(s, pos) else regex.Match(s, pos, len);
 		cur = s;
 		return m.Success;
 	}
 
-	public function split( s : String ) : Array<String> {
+	public function split(s:String):Array<String> {
 		if (isGlobal)
 			return cs.Lib.array(regex.Split(s));
 		var m = regex.Match(s);
-		if (!m.Success) return [s];
+		if (!m.Success)
+			return [s];
 		return untyped [s.Substring(0, m.Index), s.Substring(m.Index + m.Length)];
 	}
 
-	inline function start(group:Int) : Int
-	{
+	inline function start(group:Int):Int {
 		return m.Groups[group].Index;
 	}
 
-	inline function len(group:Int) : Int
-	{
+	inline function len(group:Int):Int {
 		return m.Groups[group].Length;
 	}
 
-	public function replace( s : String, by : String ) : String
-	{
-      return (isGlobal) ? regex.Replace(s, by): regex.Replace(s,by,1);
+	public function replace(s:String, by:String):String {
+		return (isGlobal) ? regex.Replace(s, by) : regex.Replace(s, by, 1);
 	}
 
-	public function map( s : String, f : EReg -> String ) : String {
+	public function map(s:String, f:EReg->String):String {
 		var offset = 0;
 		var buf = new StringBuf();
 		do {
@@ -122,12 +121,15 @@ import cs.system.text.regularexpressions.*;
 			if (p.len == 0) {
 				buf.add(s.substr(p.pos, 1));
 				offset = p.pos + 1;
-			}
-			else
+			} else
 				offset = p.pos + p.len;
 		} while (isGlobal);
 		if (!isGlobal && offset > 0 && offset < s.length)
 			buf.add(s.substr(offset));
 		return buf.toString();
 	}
+
+	public static inline function escape(s:String):String {
+		return Regex.Escape(s);
+	}
 }
diff --git a/std/cs/_std/Math.hx b/std/cs/_std/Math.hx
index 3b867070bcbd5d9f7d35e2cc043115596fe4ff44..0bc15157ed703c8fab75a3d353e69b743ac9bcfb 100644
--- a/std/cs/_std/Math.hx
+++ b/std/cs/_std/Math.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,91 +19,76 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-@:coreApi @:nativeGen class Math
-{
+@:coreApi @:nativeGen class Math {
 	@:readOnly
 	private static var rand = new cs.system.Random();
 
 	@:readOnly
-	public static var PI(default,null) = cs.system.Math.PI;
+	public static var PI(default, null) = cs.system.Math.PI;
 	@:readOnly
-	public static var NaN(default,null) = cs.system.Double.NaN;
+	public static var NaN(default, null) = cs.system.Double.NaN;
 	@:readOnly
-	public static var NEGATIVE_INFINITY(default,null) = cs.system.Double.NegativeInfinity;
+	public static var NEGATIVE_INFINITY(default, null) = cs.system.Double.NegativeInfinity;
 	@:readOnly
-	public static var POSITIVE_INFINITY(default,null) = cs.system.Double.PositiveInfinity;
+	public static var POSITIVE_INFINITY(default, null) = cs.system.Double.PositiveInfinity;
 
-	public static inline function abs(v:Float):Float
-	{
+	public static inline function abs(v:Float):Float {
 		return cs.system.Math.Abs(v);
 	}
 
-	public static inline function min(a:Float, b:Float):Float
-	{
-		return cs.system.Math.Min(a,b);
+	public static inline function min(a:Float, b:Float):Float {
+		return cs.system.Math.Min(a, b);
 	}
 
-	public static inline function max(a:Float, b:Float):Float
-	{
-		return cs.system.Math.Max(a,b);
+	public static inline function max(a:Float, b:Float):Float {
+		return cs.system.Math.Max(a, b);
 	}
 
-	public static inline function sin(v:Float):Float
-	{
+	public static inline function sin(v:Float):Float {
 		return cs.system.Math.Sin(v);
 	}
 
-	public static inline function cos(v:Float):Float
-	{
+	public static inline function cos(v:Float):Float {
 		return cs.system.Math.Cos(v);
 	}
 
-	public static inline function atan2(y:Float, x:Float):Float
-	{
+	public static inline function atan2(y:Float, x:Float):Float {
 		return cs.system.Math.Atan2(y, x);
 	}
 
-	public static inline function tan(v:Float):Float
-	{
+	public static inline function tan(v:Float):Float {
 		return cs.system.Math.Tan(v);
 	}
 
-	public static inline function exp(v:Float):Float
-	{
+	public static inline function exp(v:Float):Float {
 		return cs.system.Math.Exp(v);
 	}
 
-	public static inline function log(v:Float):Float
-	{
+	public static inline function log(v:Float):Float {
 		return cs.system.Math.Log(v);
 	}
 
-	public static inline function sqrt(v:Float):Float
-	{
+	public static inline function sqrt(v:Float):Float {
 		return cs.system.Math.Sqrt(v);
 	}
 
-	public static inline function fround(v:Float):Float
-	{
+	public static inline function fround(v:Float):Float {
 		return cs.system.Math.Floor(v + 0.5);
 	}
 
-	public static inline function ffloor(v:Float):Float
-	{
+	public static inline function ffloor(v:Float):Float {
 		return cs.system.Math.Floor(v);
 	}
 
-	public static inline function fceil(v:Float):Float
-	{
+	public static inline function fceil(v:Float):Float {
 		return cs.system.Math.Ceiling(v);
 	}
 
-	public static function round(v:Float):Int
-	{
+	public static function round(v:Float):Int {
 		var vint = Std.int(v);
 		var dec = v - vint;
 		if (dec >= 1 || dec <= -1)
-			return vint; //overflow
+			return vint; // overflow
 		if (dec >= .5)
 			return vint + 1;
 		if (dec < -.5)
@@ -111,48 +96,39 @@
 		return vint;
 	}
 
-	public static inline function floor(v:Float):Int
-	{
+	public static inline function floor(v:Float):Int {
 		return Std.int(cs.system.Math.Floor(v));
 	}
 
-	public static inline function ceil(v:Float):Int
-	{
+	public static inline function ceil(v:Float):Int {
 		return Std.int(cs.system.Math.Ceiling(v));
 	}
 
-	public static inline function atan(v:Float):Float
-	{
+	public static inline function atan(v:Float):Float {
 		return cs.system.Math.Atan(v);
 	}
 
-	public static inline function asin(v:Float):Float
-	{
+	public static inline function asin(v:Float):Float {
 		return cs.system.Math.Asin(v);
 	}
 
-	public static inline function acos(v:Float):Float
-	{
+	public static inline function acos(v:Float):Float {
 		return cs.system.Math.Acos(v);
 	}
 
-	public static inline function pow(v:Float, exp:Float):Float
-	{
+	public static inline function pow(v:Float, exp:Float):Float {
 		return cs.system.Math.Pow(v, exp);
 	}
 
-	public static inline function random() : Float
-	{
+	public static inline function random():Float {
 		return rand.NextDouble();
 	}
 
-	public static inline function isFinite( f : Float ) : Bool
-	{
+	public static inline function isFinite(f:Float):Bool {
 		return !cs.system.Double.IsInfinity(f) && !cs.system.Double.IsNaN(f);
 	}
 
-	public static inline function isNaN( f : Float ) : Bool
-	{
+	public static inline function isNaN(f:Float):Bool {
 		return cs.system.Double.IsNaN(f);
 	}
 }
diff --git a/std/cs/_std/Reflect.hx b/std/cs/_std/Reflect.hx
index 1462caab9045f32eefe57c116b54c93a32ae2a3a..c02c7e46646d44c7a07a6afece5a003806962669 100644
--- a/std/cs/_std/Reflect.hx
+++ b/std/cs/_std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,9 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import cs.internal.Function;
 import cs.system.reflection.*;
-
 import cs.internal.*;
 import cs.internal.HxObject;
 import cs.internal.Runtime;
@@ -31,38 +31,36 @@ import cs.system.Object;
 import cs.system.reflection.*;
 
 @:coreApi class Reflect {
+	public static function hasField(o:Dynamic, field:String):Bool {
+		var ihx:IHxObject = Lib.as(o, IHxObject);
+		if (ihx != null)
+			return untyped ihx.__hx_getField(field, FieldLookup.hash(field), false, true, false) != Runtime.undefined;
 
-	public static function hasField( o : Dynamic, field : String ) : Bool
-	{
-		var ihx:IHxObject = Lib.as(o,IHxObject);
-		if (ihx != null) return untyped ihx.__hx_getField(field, FieldLookup.hash(field), false, true, false) != Runtime.undefined;
-
-		return Runtime.slowHasField(o,field);
+		return Runtime.slowHasField(o, field);
 	}
 
 	@:keep
-	public static function field( o : Dynamic, field : String ) : Dynamic
-	{
-		var ihx:IHxObject = Lib.as(o,IHxObject);
-		if (ihx != null) return untyped ihx.__hx_getField(field, FieldLookup.hash(field), false, false, false);
+	public static function field(o:Dynamic, field:String):Dynamic {
+		var ihx:IHxObject = Lib.as(o, IHxObject);
+		if (ihx != null)
+			return untyped ihx.__hx_getField(field, FieldLookup.hash(field), false, false, false);
 
-		return Runtime.slowGetField(o,field,false);
+		return Runtime.slowGetField(o, field, false);
 	}
 
 	@:keep
-	public static function setField( o : Dynamic, field : String, value : Dynamic ) : Void
-	{
-		var ihx:IHxObject = Lib.as(o,IHxObject);
+	public static function setField(o:Dynamic, field:String, value:Dynamic):Void {
+		var ihx:IHxObject = Lib.as(o, IHxObject);
 		if (ihx != null)
 			untyped ihx.__hx_setField(field, FieldLookup.hash(field), value, false);
 		else
-			Runtime.slowSetField(o,field,value);
+			Runtime.slowSetField(o, field, value);
 	}
 
-	public static function getProperty( o : Dynamic, field : String ) : Dynamic
-	{
-		var ihx:IHxObject = Lib.as(o,IHxObject);
-		if (ihx != null) return untyped ihx.__hx_getField(field, FieldLookup.hash(field), false, false, true);
+	public static function getProperty(o:Dynamic, field:String):Dynamic {
+		var ihx:IHxObject = Lib.as(o, IHxObject);
+		if (ihx != null)
+			return untyped ihx.__hx_getField(field, FieldLookup.hash(field), false, false, true);
 
 		if (Runtime.slowHasField(o, "get_" + field))
 			return Runtime.slowCallField(o, "get_" + field, null);
@@ -70,69 +68,60 @@ import cs.system.reflection.*;
 		return Runtime.slowGetField(o, field, false);
 	}
 
-	public static function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void
-	{
-		var ihx:IHxObject = Lib.as(o,IHxObject);
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void {
+		var ihx:IHxObject = Lib.as(o, IHxObject);
 		if (ihx != null)
 			untyped ihx.__hx_setField(field, FieldLookup.hash(field), value, true);
 		else if (Runtime.slowHasField(o, 'set_$field'))
-			Runtime.slowCallField(o, 'set_$field', [value]);
+			Runtime.slowCallField(o, 'set_$field', cs.NativeArray.make(value));
 		else
-			Runtime.slowSetField(o,field,value);
+			Runtime.slowSetField(o, field, value);
 	}
 
-	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic
-	{
+	public static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic {
+		var args = cs.Lib.nativeArray(args, true);
 		return untyped cast(func, Function).__hx_invokeDynamic(args);
 	}
 
 	@:keep
-	public static function fields( o : Dynamic ) : Array<String>
-	{
-		var ihx = Lib.as(o,IHxObject);
-		if (ihx != null)
-		{
+	public static function fields(o:Dynamic):Array<String> {
+		var ihx = Lib.as(o, IHxObject);
+		if (ihx != null) {
 			var ret = [];
 			untyped ihx.__hx_getFields(ret);
 			return ret;
 		} else if (Std.is(o, cs.system.Type)) {
 			return Type.getClassFields(o);
 		} else {
-			return instanceFields( untyped o.GetType() );
+			return instanceFields(untyped o.GetType());
 		}
 	}
 
-	private static function instanceFields( c : Class<Dynamic> ) : Array<String>
-	{
+	private static function instanceFields(c:Class<Dynamic>):Array<String> {
 		var c = cs.Lib.toNativeType(c);
 		var ret = [];
 		var mis = c.GetFields(new cs.Flags(BindingFlags.Public) | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
-		for (i in 0...mis.Length)
-		{
+		for (i in 0...mis.Length) {
 			var i = mis[i];
 			ret.push(i.Name);
 		}
 		return ret;
 	}
 
-	inline public static function isFunction( f : Dynamic ) : Bool
-	{
+	inline public static function isFunction(f:Dynamic):Bool {
 		return Std.is(f, Function);
 	}
 
-	public static function compare<T>( a : T, b : T ) : Int
-	{
+	public static function compare<T>(a:T, b:T):Int {
 		return cs.internal.Runtime.compare(a, b);
 	}
 
 	@:access(cs.internal.Closure)
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool
-	{
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
 		if (f1 == f2)
 			return true;
 
-		if (Std.is(f1, Closure) && Std.is(f2, Closure))
-		{
+		if (Std.is(f1, Closure) && Std.is(f2, Closure)) {
 			var f1c:Closure = cast f1;
 			var f2c:Closure = cast f2;
 
@@ -142,35 +131,32 @@ import cs.system.reflection.*;
 		return false;
 	}
 
-	public static function isObject( v : Dynamic ) : Bool
-	{
+	public static function isObject(v:Dynamic):Bool {
 		return v != null && !(Std.is(v, HxEnum) || Std.is(v, Function) || Std.is(v, cs.system.ValueType));
 	}
 
-	public static function isEnumValue( v : Dynamic ) : Bool {
+	public static function isEnumValue(v:Dynamic):Bool {
 		return v != null && (Std.is(v, HxEnum) || Std.is(v, cs.system.Enum));
 	}
 
-	public static function deleteField( o : Dynamic, field : String ) : Bool
-	{
-		var ihx = Lib.as(o,DynamicObject);
+	public static function deleteField(o:Dynamic, field:String):Bool {
+		var ihx = Lib.as(o, DynamicObject);
 		if (ihx != null)
 			return untyped ihx.__hx_deleteField(field, FieldLookup.hash(field));
 		return false;
 	}
 
-	public static function copy<T>( o : T ) : T
-	{
-		var o2 : Dynamic = {};
-		for( f in Reflect.fields(o) )
-			Reflect.setField(o2,f,Reflect.field(o,f));
+	public static function copy<T>(o:Null<T>):Null<T> {
+		if (o == null)
+			return null;
+		var o2:Dynamic = {};
+		for (f in Reflect.fields(o))
+			Reflect.setField(o2, f, Reflect.field(o, f));
 		return cast o2;
 	}
 
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic
-	{
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
 		return new VarArgsFunction(f);
 	}
-
 }
diff --git a/std/cs/_std/Std.hx b/std/cs/_std/Std.hx
index 9a1349d40ead0b3bd3c120152a37ae1d139c71af..6d700fde3f7f59b3f4d34a90f9e1ba068d830b89 100644
--- a/std/cs/_std/Std.hx
+++ b/std/cs/_std/Std.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,23 +19,22 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import cs.Boot;
 import cs.Lib;
 import cs.internal.Exceptions;
 
 @:coreApi @:nativeGen class Std {
-	public static function is( v : Dynamic, t : Dynamic ) : Bool
-	{
+	public static function is(v:Dynamic, t:Dynamic):Bool {
 		if (v == null)
-			return t == Dynamic;
+			return false;
 		if (t == null)
 			return false;
 		var clt = cs.Lib.as(t, cs.system.Type);
 		if (clt == null)
 			return false;
 
-		switch(clt.ToString())
-		{
+		switch (clt.ToString()) {
 			case "System.Double":
 				return untyped __cs__('{0} is double || {0} is int', v);
 			case "System.Int32":
@@ -63,7 +62,7 @@ import cs.internal.Exceptions;
 		return false;
 	}
 
-	public static function string( s : Dynamic ) : String {
+	public static function string(s:Dynamic):String {
 		if (s == null)
 			return "null";
 		if (Std.is(s, Bool))
@@ -72,23 +71,22 @@ import cs.internal.Exceptions;
 		return s.ToString();
 	}
 
-	public static function int( x : Float ) : Int {
+	public static function int(x:Float):Int {
 		return cast x;
 	}
 
-	public static function parseInt( x : String ) : Null<Int> {
-		if (x == null) return null;
+	public static function parseInt(x:String):Null<Int> {
+		if (x == null)
+			return null;
 
 		var ret = 0;
 		var base = 10;
 		var i = -1;
 		var len = x.length;
 
-		if (StringTools.startsWith(x, "0") && len > 2)
-		{
+		if (StringTools.startsWith(x, "0") && len > 2) {
 			var c:Int = cast untyped x[1];
-			if (c == 'x'.code || c == 'X'.code)
-			{
+			if (c == 'x'.code || c == 'X'.code) {
 				i = 1;
 				base = 16;
 			}
@@ -96,13 +94,10 @@ import cs.internal.Exceptions;
 
 		var foundAny = i != -1;
 		var isNeg = false;
-		while (++i < len)
-		{
-			var c = cast(untyped x[i], Int); //fastCodeAt
-			if (!foundAny)
-			{
-				switch(c)
-				{
+		while (++i < len) {
+			var c = cast(untyped x[i], Int); // fastCodeAt
+			if (!foundAny) {
+				switch (c) {
 					case '-'.code:
 						isNeg = true;
 						continue;
@@ -113,22 +108,23 @@ import cs.internal.Exceptions;
 				}
 			}
 
-			if (c >= '0'.code && c <= '9'.code)
-			{
-				if (!foundAny && c == '0'.code)
-				{
+			if (c >= '0'.code && c <= '9'.code) {
+				if (!foundAny && c == '0'.code) {
 					foundAny = true;
 					continue;
 				}
-				ret *= base; foundAny = true;
+				ret *= base;
+				foundAny = true;
 
 				ret += c - '0'.code;
 			} else if (base == 16) {
 				if (c >= 'a'.code && c <= 'f'.code) {
-					ret *= base; foundAny = true;
+					ret *= base;
+					foundAny = true;
 					ret += c - 'a'.code + 10;
 				} else if (c >= 'A'.code && c <= 'F'.code) {
-					ret *= base; foundAny = true;
+					ret *= base;
+					foundAny = true;
 					ret += c - 'A'.code + 10;
 				} else {
 					break;
@@ -144,59 +140,64 @@ import cs.internal.Exceptions;
 			return null;
 	}
 
-	public static function parseFloat( x : String ) : Float {
-		if (x == null) return Math.NaN;
+	public static function parseFloat(x:String):Float {
+		if (x == null)
+			return Math.NaN;
 		x = StringTools.ltrim(x);
-		var found = false, hasDot = false, hasSign = false,
-		    hasE = false, hasESign = false, hasEData = false;
+		var found = false,
+			hasDot = false,
+			hasSign = false,
+			hasE = false,
+			hasESign = false,
+			hasEData = false;
 		var i = -1;
-		inline function getch(i:Int):Int return cast ((untyped x : cs.system.String)[i]);
+		inline function getch(i:Int):Int
+			return cast((untyped x : cs.system.String)[i]);
 
-		while (++i < x.length)
-		{
+		while (++i < x.length) {
 			var chr = getch(i);
-			if (chr >= '0'.code && chr <= '9'.code)
-			{
-				if (hasE)
-				{
+			if (chr >= '0'.code && chr <= '9'.code) {
+				if (hasE) {
 					hasEData = true;
 				}
 				found = true;
-			} else switch (chr) {
-				case 'e'.code | 'E'.code if(!hasE):
-					hasE = true;
-				case '.'.code if (!hasDot):
-					hasDot = true;
-				case '-'.code, '+'.code if (!found && !hasSign):
-					hasSign = true;
-				case '-'.code | '+'.code if (found && !hasESign && hasE && !hasEData):
-					hasESign = true;
-				case _:
-					break;
-			}
+			} else
+				switch (chr) {
+					case 'e'.code | 'E'.code if (!hasE):
+						hasE = true;
+					case '.'.code if (!hasDot):
+						hasDot = true;
+					case '-'.code, '+'.code if (!found && !hasSign):
+						hasSign = true;
+					case '-'.code | '+'.code if (found && !hasESign && hasE && !hasEData):
+						hasESign = true;
+					case _:
+						break;
+				}
 		}
-		if (hasE && !hasEData)
-		{
+		if (hasE && !hasEData) {
 			i--;
 			if (hasESign)
 				i--;
 		}
-		if (i != x.length)
-		{
-			x = x.substr(0,i);
+		if (i != x.length) {
+			x = x.substr(0, i);
 		}
-		return try
-			cs.system.Double.Parse(x, cs.system.globalization.CultureInfo.InvariantCulture)
-		catch(e:Dynamic)
-			Math.NaN;
+		return try cs.system.Double.Parse(x, cs.system.globalization.CultureInfo.InvariantCulture) catch (e:Dynamic) Math.NaN;
+	}
+
+	extern inline public static function downcast<T:{}, S:T>(value:T, c:Class<S>):S {
+		return cs.Lib.as(value, c);
 	}
 
-	@:extern inline public static function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
-		return cs.Lib.as(value,c);
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	extern inline public static function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return downcast(value, c);
 	}
 
-	public static function random( x : Int ) : Int {
-		if (x <= 0) return 0;
+	public static function random(x:Int):Int {
+		if (x <= 0)
+			return 0;
 		return untyped Math.rand.Next(x);
 	}
 }
diff --git a/std/cs/_std/String.hx b/std/cs/_std/String.hx
index f4af89a28e00f7084655830b0fc9ddd319ff100a..af78337d21c24417454c8c1ec50035fb5396f506 100644
--- a/std/cs/_std/String.hx
+++ b/std/cs/_std/String.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,38 +19,40 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import cs.StdTypes;
 
 @:coreApi extern class String implements ArrayAccess<Char16> {
-
 	@:overload private static function Compare(s1:String, s2:String):Int;
 	@:overload private static function Compare(s1:String, s2:String, kind:cs.system.StringComparison):Int;
 
-	var length(default,null) : Int;
+	private static function CompareOrdinal(s1:String, s2:String):Int;
 
-	function new(string:String) : Void;
+	var length(default, null):Int;
 
-	function toUpperCase() : String;
+	function new(string:String):Void;
 
-	function toLowerCase() : String;
+	function toUpperCase():String;
 
-	function charAt( index : Int) : String;
+	function toLowerCase():String;
 
-	function charCodeAt( index : Int) : Null<Int>;
+	function charAt(index:Int):String;
 
-	function indexOf( str : String, ?startIndex : Int ) : Int;
+	function charCodeAt(index:Int):Null<Int>;
 
-	function lastIndexOf( str : String, ?startIndex : Int ) : Int;
+	function indexOf(str:String, ?startIndex:Int):Int;
 
-	function split( delimiter : String ) : Array<String>;
+	function lastIndexOf(str:String, ?startIndex:Int):Int;
 
-	function substr( pos : Int, ?len : Int ) : String;
+	function split(delimiter:String):Array<String>;
 
-	function substring( startIndex : Int, ?endIndex : Int ) : String;
+	function substr(pos:Int, ?len:Int):String;
 
-	function toString() : String;
+	function substring(startIndex:Int, ?endIndex:Int):String;
 
-	static function fromCharCode( code : Int ) : String;
+	function toString():String;
+
+	static function fromCharCode(code:Int):String;
 
 	private function IndexOf(value:String, startIndex:Int, comparisonType:cs.system.StringComparison):Int;
 	private function Replace(oldValue:String, newValue:String):String;
@@ -62,5 +64,4 @@ import cs.StdTypes;
 	private function CompareTo(obj:Dynamic):Int;
 	@:overload(function(startIndex:Int):String {})
 	private function Substring(startIndex:Int, length:Int):String;
-
 }
diff --git a/std/cs/_std/StringBuf.hx b/std/cs/_std/StringBuf.hx
index 2fadac9bb2b4bd271c503e7ca357962d191bdcb7..b46bb5cb9eb98c7e934ffd7f99a738f8f6913c81 100644
--- a/std/cs/_std/StringBuf.hx
+++ b/std/cs/_std/StringBuf.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,37 +19,42 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import cs.system.text.StringBuilder;
 
 @:coreApi
 class StringBuf {
+	private var b:StringBuilder;
 
-	private var b : StringBuilder;
-
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
-	public inline function new() : Void {
+	public inline function new():Void {
 		b = new StringBuilder();
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return b.Length;
 	}
 
-	public inline function add<T>( x : T ) : Void {
+	public inline function add<T>(x:T):Void {
 		b.Append(Std.string(x));
 	}
 
-	public inline function addSub( s : String, pos : Int, ?len : Int ) : Void {
+	public inline function addSub(s:String, pos:Int, ?len:Int):Void {
 		b.Append(s, pos, (len == null) ? (s.length - pos) : len);
 	}
 
-	public inline function addChar( c : Int ) : Void untyped {
-		b.Append(cast(c, cs.StdTypes.Char16));
-	}
-
-	public inline function toString() : String {
+	public function addChar(c:Int):Void
+		untyped {
+			if (c >= 0x10000) {
+				b.Append(cast((c >> 10) + 0xD7C0, cs.StdTypes.Char16));
+				b.Append(cast((c & 0x3FF) + 0xDC00, cs.StdTypes.Char16));
+			} else {
+				b.Append(cast(c, cs.StdTypes.Char16));
+			}
+		}
+
+	public inline function toString():String {
 		return b.ToString();
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/cs/_std/Sys.hx b/std/cs/_std/Sys.hx
index edb583bd52c6db59f7cffac4157951e22d723bd5..7cf8d55cf0d8ffd74ed72fa4d371eba912f19ab6 100644
--- a/std/cs/_std/Sys.hx
+++ b/std/cs/_std/Sys.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import sys.io.Process;
 import cs.system.Environment;
 import cs.system.threading.Thread;
@@ -28,20 +29,16 @@ class Sys {
 	private static var _env:haxe.ds.StringMap<String>;
 	private static var _args:Array<String>;
 
-	public static inline function print( v : Dynamic ) : Void
-	{
+	public static inline function print(v:Dynamic):Void {
 		cs.system.Console.Write(v);
 	}
 
-	public static inline function println( v : Dynamic ) : Void
-	{
+	public static inline function println(v:Dynamic):Void {
 		cs.system.Console.WriteLine(v);
 	}
 
-	public static function args() : Array<String>
-	{
-		if (_args == null)
-		{
+	public static function args():Array<String> {
+		if (_args == null) {
 			var ret = cs.Lib.array(Environment.GetCommandLineArgs());
 			ret.shift();
 			_args = ret;
@@ -49,26 +46,21 @@ class Sys {
 		return _args.copy();
 	}
 
-	public static inline function getEnv( s : String ) : String
-	{
+	public static inline function getEnv(s:String):String {
 		return Environment.GetEnvironmentVariable(s);
 	}
 
-	public static function putEnv( s : String, v : String ) : Void
-	{
+	public static function putEnv(s:String, v:String):Void {
 		Environment.SetEnvironmentVariable(s, v);
 		if (_env != null)
 			_env.set(s, v);
 	}
 
-	public static function environment() : Map<String,String>
-	{
-		if (_env == null)
-		{
+	public static function environment():Map<String, String> {
+		if (_env == null) {
 			var e = _env = new haxe.ds.StringMap();
 			var nenv = Environment.GetEnvironmentVariables().GetEnumerator();
-			while (nenv.MoveNext())
-			{
+			while (nenv.MoveNext()) {
 				e.set(nenv.Key, nenv.Value);
 			}
 		}
@@ -76,35 +68,32 @@ class Sys {
 		return _env;
 	}
 
-	public static inline function sleep( seconds : Float ) : Void
-	{
-		Thread.Sleep( Std.int(seconds * 1000) );
+	public static inline function sleep(seconds:Float):Void {
+		Thread.Sleep(Std.int(seconds * 1000));
 	}
 
-	public static function setTimeLocale( loc : String ) : Bool
-	{
-		//TODO C#
+	public static function setTimeLocale(loc:String):Bool {
+		// TODO C#
 		return false;
 	}
 
-	public static inline function getCwd() : String
-	{
+	public static inline function getCwd():String {
 		return cs.system.io.Directory.GetCurrentDirectory();
 	}
 
-	public static inline function setCwd( s : String ) : Void
-	{
+	public static inline function setCwd(s:String):Void {
 		cs.system.io.Directory.SetCurrentDirectory(s);
 	}
 
-	public static function systemName() : String
-	{
-		//doing a switch with strings since MacOS might not be available
-		switch(Environment.OSVersion.Platform + "")
-		{
-			case "Unix": return "Linux";
-			case "Xbox": return "Xbox";
-			case "MacOSX": return "Mac";
+	public static function systemName():String {
+		// doing a switch with strings since MacOS might not be available
+		switch (Environment.OSVersion.Platform + "") {
+			case "Unix":
+				return "Linux";
+			case "Xbox":
+				return "Xbox";
+			case "MacOSX":
+				return "Mac";
 			default:
 				var ver = cast(Environment.OSVersion.Platform, Int);
 				if (ver == 4 || ver == 6 || ver == 128)
@@ -113,24 +102,19 @@ class Sys {
 		}
 	}
 
-	public static function command( cmd : String, ?args : Array<String> ) : Int
-	{
+	public static function command(cmd:String, ?args:Array<String>):Int {
 		var proc = Process.createNativeProcess(cmd, args);
-		proc.add_OutputDataReceived(new cs.system.diagnostics.DataReceivedEventHandler(
-			function(p, evtArgs) {
-				var data = evtArgs.Data;
-				if (data != null && data != "")
-					println(data);
-			}
-		));
+		proc.add_OutputDataReceived(new cs.system.diagnostics.DataReceivedEventHandler(function(p, evtArgs) {
+			var data = evtArgs.Data;
+			if (data != null && data != "")
+				println(data);
+		}));
 		var stderr = stderr();
-		proc.add_ErrorDataReceived(new cs.system.diagnostics.DataReceivedEventHandler(
-			function(p, evtArgs) {
-				var data = evtArgs.Data;
-				if (data != null && data != "")
-					stderr.writeString(data + "\n");
-			}
-		));
+		proc.add_ErrorDataReceived(new cs.system.diagnostics.DataReceivedEventHandler(function(p, evtArgs) {
+			var data = evtArgs.Data;
+			if (data != null && data != "")
+				stderr.writeString(data + "\n");
+		}));
 		proc.Start();
 		proc.BeginOutputReadLine();
 		proc.BeginErrorReadLine();
@@ -140,65 +124,57 @@ class Sys {
 		return exitCode;
 	}
 
-	public static inline function exit( code : Int ) : Void
-	{
+	public static inline function exit(code:Int):Void {
 		Environment.Exit(code);
 	}
 
 	@:readOnly static var epochTicks = new cs.system.DateTime(1970, 1, 1).Ticks;
-	public static function time() : Float
-	{
+
+	public static function time():Float {
 		return cast((cs.system.DateTime.UtcNow.Ticks - epochTicks), Float) / cast(cs.system.TimeSpan.TicksPerSecond, Float);
 	}
 
-	public static inline function cpuTime() : Float
-	{
+	public static inline function cpuTime():Float {
 		return Environment.TickCount / 1000;
 	}
 
-	@:deprecated("Use programPath instead") public static inline function executablePath() : String
-	{
+	@:deprecated("Use programPath instead") public static inline function executablePath():String {
 		return cs.system.reflection.Assembly.GetExecutingAssembly().GetName().CodeBase;
 	}
 
-	public static function programPath() : String {
+	public static function programPath():String {
 		return cs.system.reflection.Assembly.GetExecutingAssembly().Location;
 	}
 
-	public static function getChar( echo : Bool ) : Int
-	{
-		#if !(Xbox || CF || MF) //Xbox, Compact Framework, Micro Framework
+	public static function getChar(echo:Bool):Int {
+		#if !(Xbox || CF || MF) // Xbox, Compact Framework, Micro Framework
 		return cast(cs.system.Console.ReadKey(!echo).KeyChar, Int);
 		#else
 		return -1;
 		#end
 	}
 
-	public static inline function stdin() : haxe.io.Input
-	{
-#if !(Xbox || CF || MF)
+	public static inline function stdin():haxe.io.Input {
+		#if !(Xbox || CF || MF)
 		return new cs.io.NativeInput(cs.system.Console.OpenStandardInput());
-#else
+		#else
 		return null;
-#end
+		#end
 	}
 
-	public static inline function stdout() : haxe.io.Output
-	{
-#if !(Xbox || CF || MF)
+	public static inline function stdout():haxe.io.Output {
+		#if !(Xbox || CF || MF)
 		return new cs.io.NativeOutput(cs.system.Console.OpenStandardOutput());
-#else
+		#else
 		return null;
-#end
+		#end
 	}
 
-	public static inline function stderr() : haxe.io.Output
-	{
-#if !(Xbox || CF || MF)
+	public static inline function stderr():haxe.io.Output {
+		#if !(Xbox || CF || MF)
 		return new cs.io.NativeOutput(cs.system.Console.OpenStandardError());
-#else
+		#else
 		return null;
-#end
+		#end
 	}
-
 }
diff --git a/std/cs/_std/Type.hx b/std/cs/_std/Type.hx
index a45c1735d22a608bd114410ba53335b5e9c115c0..1bad536289be7d31fdefebe65ed2224979ea0618 100644
--- a/std/cs/_std/Type.hx
+++ b/std/cs/_std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import cs.Lib;
 import cs.internal.HxObject;
 import cs.internal.Runtime;
@@ -26,6 +27,7 @@ import cs.internal.Function;
 import cs.Flags;
 import cs.system.Object;
 import cs.system.reflection.*;
+
 using StringTools;
 
 enum ValueType {
@@ -35,141 +37,136 @@ enum ValueType {
 	TBool;
 	TObject;
 	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
 	TUnknown;
 }
 
 @:coreApi class Type {
-
-	public static function getClass<T>( o : T ) : Class<T> untyped
-	{
-		if (Object.ReferenceEquals(o,null) || Std.is(o,DynamicObject) || Std.is(o,cs.system.Type))
+	public static function getClass<T>(o:T):Class<T> {
+		if (Object.ReferenceEquals(o, null) || Std.is(o, DynamicObject) || Std.is(o, cs.system.Type))
 			return null;
 
-		return untyped o.GetType();
+		return cast cs.Lib.getNativeType(o);
 	}
 
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic> untyped
-	{
-		if (Std.is(o, cs.system.Enum) || Std.is(o,HxEnum))
-			return untyped o.GetType();
+	public static function getEnum(o:EnumValue):Enum<Dynamic> {
+		if (Std.is(o, HxEnum))
+			return cast cs.Lib.getNativeType(o).BaseType; // enum constructors are subclasses of an enum type
+		else if (Std.is(o, cs.system.Enum))
+			return cast cs.Lib.getNativeType(o);
 		return null;
 	}
 
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic>
-	{
-		var t:cs.system.Type = Lib.toNativeType(c);
-		var base = t.BaseType;
-		if (base == null || base.ToString() == "haxe.lang.HxObject" || base.ToString() == "System.Object")
+	public static function getSuperClass(c:Class<Dynamic>):Class<Dynamic> {
+		var base = Lib.toNativeType(c).BaseType;
+		if (Object.ReferenceEquals(base, null) || base.ToString() == "haxe.lang.HxObject" || base.ToString() == "System.Object")
 			return null;
 		return Lib.fromNativeType(base);
 	}
 
-	public static function getClassName( c : Class<Dynamic> ) : String {
-		var ret:String = cast Lib.toNativeType(c);
-#if no_root
+	public static function getClassName(c:Class<Dynamic>):String {
+		var ret = Lib.toNativeType(c).ToString();
+		#if no_root
 		if (ret.length > 10 && StringTools.startsWith(ret, "haxe.root."))
 			ret = ret.substr(10);
-#end
+		#end
 
-		return switch(ret)
-		{
+		return switch (ret) {
+			// TODO: are those really needed?
 			case "System.Int32": "Int";
 			case "System.Double": "Float";
 			case "System.String": "String";
+			case "System.Boolean": "Bool";
 			case "System.Object": "Dynamic";
 			case "System.Type": "Class";
-			default: ret.split("`")[0];
+			default: cast(ret, cs.system.String).Split(cs.NativeArray.make(("`".code : cs.StdTypes.Char16)))[0];
 		}
 	}
 
-	public static function getEnumName( e : Enum<Dynamic> ) : String
-	{
-		var ret:String = cast Lib.toNativeType(untyped e);
-#if no_root
+	public static function getEnumName(e:Enum<Dynamic>):String {
+		var ret = Lib.toNativeType(cast e).ToString();
+		#if no_root
 		if (ret.length > 10 && StringTools.startsWith(ret, "haxe.root."))
 			ret = ret.substr(10);
-#end
-		if (ret.length == 14 && ret == "System.Boolean")
-			return "Bool";
+		#end
 		return ret;
 	}
 
-	public static function resolveClass( name : String ) : Class<Dynamic>
-	{
-#if no_root
+	public static function resolveClass(name:String):Class<Dynamic> {
+		#if no_root
 		if (name.indexOf(".") == -1)
 			name = "haxe.root." + name;
-#end
-		var t:cs.system.Type = cs.system.Type._GetType(name);
-#if !CF
-		if (t == null)
-		{
+		#end
+		var t = cs.system.Type._GetType(name);
+		#if !CF
+		if (Object.ReferenceEquals(t, null)) {
 			var all = cs.system.AppDomain.CurrentDomain.GetAssemblies().GetEnumerator();
-			while (all.MoveNext())
-			{
+			while (all.MoveNext()) {
 				var t2:cs.system.reflection.Assembly = all.Current;
 				t = t2.GetType(name);
-				if (t != null)
+				if (!Object.ReferenceEquals(t, null))
 					break;
 			}
 		}
-#end
-		if (t == null)
-		{
-			switch(name)
-			{
-				case #if no_root "haxe.root.Int" #else "Int" #end: return cast Int;
-				case #if no_root "haxe.root.Float" #else "Float" #end: return cast Float;
-				case #if no_root "haxe.root.Class" #else "Class" #end: return cast Class;
-				case #if no_root "haxe.root.Dynamic" #else "Dynamic" #end: return cast Dynamic;
-				case #if no_root "haxe.root.String" #else "String" #end: return cast String;
-				default: return null;
+		#end
+		if (Object.ReferenceEquals(t, null)) {
+			switch (name) {
+				case #if no_root "haxe.root.Int" #else "Int" #end:
+					return cast Int;
+				case #if no_root "haxe.root.Float" #else "Float" #end:
+					return cast Float;
+				case #if no_root "haxe.root.Class" #else "Class" #end:
+					return cast Class;
+				case #if no_root "haxe.root.Dynamic" #else "Dynamic" #end:
+					return cast Dynamic;
+				case #if no_root "haxe.root.String" #else "String" #end:
+					return cast String;
+				case #if no_root "haxe.root.Bool" #else "Bool" #end:
+					return cast Bool;
+				default:
+					return null;
 			}
-#if !erase_generics
-		} else if (t.IsInterface && cast(untyped __typeof__(IGenericObject), cs.system.Type).IsAssignableFrom(t)) {
-			for (attr in t.GetCustomAttributes(true))
-			{
+		#if !erase_generics
+		}
+		else if (t.IsInterface && cast(IGenericObject, cs.system.Type).IsAssignableFrom(t)) {
+			for (attr in t.GetCustomAttributes(true)) {
 				var g = cs.Lib.as(attr, cs.internal.HxObject.GenericInterface);
 				if (g != null)
 					return Lib.fromNativeType(g.generic);
 			}
 
 			return Lib.fromNativeType(t);
-#end
+		#end
 		} else {
 			return Lib.fromNativeType(t);
 		}
 	}
 
-	public static function resolveEnum( name : String ) : Enum<Dynamic> untyped
-	{
-		if (name == "Bool") return Bool;
+	public static function resolveEnum(name:String):Enum<Dynamic> {
 		var t = Lib.toNativeType(resolveClass(name));
-		if (t != null && t.BaseType.Equals( Lib.toNativeType(cs.system.Enum) ) || Lib.toNativeType(HxEnum).IsAssignableFrom(t))
-			return t;
+		if (!Object.ReferenceEquals(t, null)
+			&& untyped t.BaseType.Equals(Lib.toNativeType(cs.system.Enum)) || Lib.toNativeType(HxEnum).IsAssignableFrom(t))
+			return cast t;
 		return null;
 	}
 
-	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T
-	{
-		if (untyped cl == String)
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T {
+		if (Object.ReferenceEquals(cl, String))
 			return args[0];
-		var t:cs.system.Type = Lib.toNativeType(cl);
-		if (t.IsInterface)
-		{
-			//may be generic
+		var t = Lib.toNativeType(cl);
+		if (t.IsInterface) {
+			// may be generic
 			t = Lib.toNativeType(resolveClass(getClassName(cl)));
 		}
 		var ctors = t.GetConstructors();
-		return Runtime.callMethod(null, cast ctors, ctors.Length, args);
+		return Runtime.callMethod(null, cast ctors, ctors.Length, cs.Lib.nativeArray(args, true));
 	}
 
 	// cache empty constructor arguments so we don't allocate it on each createEmptyInstance call
 	@:protected @:readOnly static var __createEmptyInstance_EMPTY_ARGS = cs.NativeArray.make((cs.internal.Runtime.EmptyObject.EMPTY : Any));
 
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T {
+	public static function createEmptyInstance<T>(cl:Class<T>):T {
 		var t = Lib.toNativeType(cl);
 
 		if (cs.system.Object.ReferenceEquals(t, String))
@@ -179,10 +176,8 @@ enum ValueType {
 			return untyped __cs__("(T)(object){0}", "");
 			#end
 
-		var res = try
-			cs.system.Activator.CreateInstance(t, __createEmptyInstance_EMPTY_ARGS)
-		catch (_:cs.system.MissingMemberException)
-			cs.system.Activator.CreateInstance(t);
+		var res = try cs.system.Activator.CreateInstance(t,
+			__createEmptyInstance_EMPTY_ARGS) catch (_:cs.system.MissingMemberException) cs.system.Activator.CreateInstance(t);
 
 		#if erase_generics
 		return res;
@@ -191,42 +186,36 @@ enum ValueType {
 		#end
 	}
 
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T
-	{
-		if (params == null || params.length == 0)
-		{
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T {
+		if (params == null || params.length == 0) {
 			var ret = cs.internal.Runtime.slowGetField(e, constr, true);
 			if (Reflect.isFunction(ret))
 				throw 'Constructor $constr needs parameters';
 			return ret;
 		} else {
-			return cs.internal.Runtime.slowCallField(e,constr,params);
+			return cs.internal.Runtime.slowCallField(e, constr, cs.Lib.nativeArray(params, true));
 		}
 	}
 
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T {
 		var constr = getEnumConstructs(e);
 		return createEnum(e, constr[index], params);
 	}
 
-	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String>
-	{
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String> {
 		if (c == String)
 			return cs.internal.StringExt.StringRefl.fields;
 
 		var c = cs.Lib.toNativeType(c);
 		var ret = [];
 		var mis = c.GetMembers(new cs.Flags(BindingFlags.Public) | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
-		for (i in 0...mis.Length)
-		{
+		for (i in 0...mis.Length) {
 			var i = mis[i];
 			if (Std.is(i, PropertyInfo))
 				continue;
 			var n = i.Name;
-			if (!n.startsWith('__hx_') && n.fastCodeAt(0) != '.'.code)
-			{
-				switch(n)
-				{
+			if (!n.startsWith('__hx_') && n.fastCodeAt(0) != '.'.code) {
+				switch (n) {
 					case 'Equals' | 'ToString' | 'GetHashCode' | 'GetType':
 					case _:
 						ret.push(n);
@@ -236,50 +225,55 @@ enum ValueType {
 		return ret;
 	}
 
-	public static function getClassFields( c : Class<Dynamic> ) : Array<String> {
-		if (Object.ReferenceEquals(c, String))
-		{
+	public static function getClassFields(c:Class<Dynamic>):Array<String> {
+		if (Object.ReferenceEquals(c, String)) {
 			return ['fromCharCode'];
 		}
 
 		var ret = [];
 		var infos = Lib.toNativeType(c).GetMembers(new Flags(BindingFlags.Public) | BindingFlags.Static);
-		for (i in 0...infos.Length)
-		{
+		for (i in 0...infos.Length) {
 			var name = infos[i].Name;
-			if (!name.startsWith('__hx_'))
-			{
+			if (!name.startsWith('__hx_')) {
 				ret.push(name);
 			}
 		}
 		return ret;
 	}
 
-	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> {
-		if (Reflect.hasField(e, "__hx_constructs")) {
-			var ret:Array<String> = cs.Lib.array(untyped e.__hx_constructs);
-			return ret.copy();
-		}
-		return cs.Lib.array(cs.system.Enum.GetNames(untyped e));
+	public static function getEnumConstructs(e:Enum<Dynamic>):Array<String> {
+		var t = cs.Lib.as(e, cs.system.Type);
+		var f = t.GetField("__hx_constructs", new cs.Flags(BindingFlags.Static) | BindingFlags.NonPublic);
+		if (f != null) {
+			var values:cs.system.Array = f.GetValue(null);
+			var copy = new cs.NativeArray(values.Length);
+			cs.system.Array.Copy(values, copy, values.Length);
+			return cs.Lib.array(copy);
+		} else
+			return cs.Lib.array(cs.system.Enum.GetNames(t));
 	}
 
-	public static function typeof( v : Dynamic ) : ValueType {
-		if (v == null) return ValueType.TNull;
+	public static function typeof(v:Dynamic):ValueType {
+		if (v == null)
+			return ValueType.TNull;
 
-		var t:cs.system.Type = cs.Lib.as(v, cs.system.Type);
-		if (t != null) {
-			//class type
+		var t = cs.Lib.as(v, cs.system.Type);
+		if (!Object.ReferenceEquals(t, null)) {
+			// class type
 			return ValueType.TObject;
 		}
 
 		t = v.GetType();
-		if (t.IsEnum || Std.is(v, HxEnum))
+		if (t.IsEnum)
 			return ValueType.TEnum(cast t);
+		if (Std.is(v, HxEnum))
+			return ValueType.TEnum(cast t.BaseType); // enum constructors are subclasses of an enum type
 		if (t.IsValueType) {
 			var vc:cs.system.IConvertible = cast v;
 			if (vc != null) {
 				switch (vc.GetTypeCode()) {
-					case cs.system.TypeCode.Boolean: return ValueType.TBool;
+					case cs.system.TypeCode.Boolean:
+						return ValueType.TBool;
 					case cs.system.TypeCode.Double:
 						var d:Float = vc.ToDouble(null);
 						if (d >= cs.system.Int32.MinValue && d <= cs.system.Int32.MaxValue && d == vc.ToInt32(null))
@@ -299,8 +293,6 @@ enum ValueType {
 		if (Std.is(v, IHxObject)) {
 			if (Std.is(v, DynamicObject))
 				return ValueType.TObject;
-			else if (Std.is(v, HxEnum))
-				return ValueType.TEnum(cast t);
 			return ValueType.TClass(cast t);
 		} else if (Std.is(v, Function)) {
 			return ValueType.TFunction;
@@ -309,8 +301,8 @@ enum ValueType {
 		}
 	}
 
-	public static function enumEq<T>( a : T, b : T ) : Bool
-	{
+	@:ifFeature("has_enum")
+	public static function enumEq<T>(a:T, b:T):Bool {
 		if (a == null)
 			return b == null;
 		else if (b == null)
@@ -319,34 +311,29 @@ enum ValueType {
 			return untyped a.Equals(b);
 	}
 
-	public static function enumConstructor( e : EnumValue ) : String untyped
-	{
-		return Std.is(e, cs.system.Enum) ? e+'' : cast(e,HxEnum).getTag();
+	public static function enumConstructor(e:EnumValue):String {
+		return Std.is(e, cs.system.Enum) ? cast(e, cs.system.Enum).ToString() : cast(e, HxEnum).getTag();
 	}
 
-	public static function enumParameters( e : EnumValue ) : Array<Dynamic> untyped
-	{
-		return Std.is(e, cs.system.Enum) ? [] : cast(e,HxEnum).getParams();
+	public static function enumParameters(e:EnumValue):Array<Dynamic> {
+		return Std.is(e, cs.system.Enum) ? [] : cast(e, HxEnum).getParams();
 	}
 
+	@:ifFeature("has_enum")
 	@:pure
-	public static function enumIndex( e : EnumValue ) : Int  untyped
-	{
-		if (Std.is(e, cs.system.Enum))
-		{
+	public static function enumIndex(e:EnumValue):Int {
+		if (Std.is(e, cs.system.Enum)) {
 			var values = cs.system.Enum.GetValues(Lib.getNativeType(e));
 			return cs.system.Array.IndexOf(values, e);
 		} else {
-			return cast(e, HxEnum).index;
+			return @:privateAccess cast(e, HxEnum)._hx_index;
 		}
 	}
 
-	public static function allEnums<T>( e : Enum<T> ) : Array<T>
-	{
+	public static function allEnums<T>(e:Enum<T>):Array<T> {
 		var ctors = getEnumConstructs(e);
 		var ret = [];
-		for (ctor in ctors)
-		{
+		for (ctor in ctors) {
 			var v = Reflect.field(e, ctor);
 			if (Std.is(v, e))
 				ret.push(v);
@@ -354,6 +341,4 @@ enum ValueType {
 
 		return ret;
 	}
-
 }
-
diff --git a/std/cs/_std/haxe/Int64.hx b/std/cs/_std/haxe/Int64.hx
index 7f441fbb523842ff636037b6f06387a5ee326283..7121df24126378cfbbb7d87c0c887ac456d3bb4f 100644
--- a/std/cs/_std/haxe/Int64.hx
+++ b/std/cs/_std/haxe/Int64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
+
 using haxe.Int64;
 
 import haxe.Int64Helper;
@@ -27,202 +29,209 @@ import haxe.Int64Helper;
 private typedef __Int64 = cs.StdTypes.Int64;
 
 @:coreApi
-abstract Int64(__Int64) from __Int64 to __Int64
-{
+abstract Int64(__Int64) from __Int64 to __Int64 {
+	public static inline function make(high:Int32, low:Int32):Int64
+		return new Int64((cast(high, __Int64) << 32) | (cast(low, __Int64) & (untyped __cs__('0xffffffffL') : Int64)));
 
-	public static inline function make( high : Int32, low : Int32 ) : Int64
-		return new Int64( (cast(high, __Int64) << 32) | (cast(low, __Int64)& (untyped __cs__('0xffffffffL') : Int64)) );
-
-	private inline function new(x : __Int64)
+	private inline function new(x:__Int64)
 		this = x;
 
-	private var val( get, set ) : __Int64;
-	inline function get_val() : __Int64 return this;
-	inline function set_val( x : __Int64 ) : __Int64 return this = x;
+	private var val(get, set):__Int64;
+
+	inline function get_val():__Int64
+		return this;
+
+	inline function set_val(x:__Int64):__Int64
+		return this = x;
+
+	public var high(get, never):Int32;
+
+	public inline function get_high():Int32
+		return cast(this >> 32);
 
-	public var high( get, never ):Int32;
-	public inline function get_high():Int32 return cast(this >> 32);
+	public var low(get, never):Int32;
 
-	public var low( get, never ):Int32;
-	public inline function get_low():Int32 return cast this;
+	public inline function get_low():Int32
+		return cast this;
 
 	public inline function copy():Int64
-		return new Int64( this );
+		return new Int64(this);
 
-	@:from public static inline function ofInt( x : Int ) : Int64
+	@:from public static inline function ofInt(x:Int):Int64
 		return cast x;
 
-	public static inline function toInt( x : Int64 ) : Int {
-		if( x.val < 0x80000000 || x.val > 0x7FFFFFFF )
+	public static inline function toInt(x:Int64):Int {
+		if (x.val < 0x80000000 || x.val > 0x7FFFFFFF)
 			throw "Overflow";
 		return cast x.val;
 	}
 
-	inline public static function is( val : Dynamic ) : Bool
-		return Std.is(val,cs.system.Int64);
+	inline public static function is(val:Dynamic):Bool
+		return Std.is(val, cs.system.Int64);
 
-	public static inline function getHigh( x : Int64 ) : Int32
-		return cast( x.val >> 32 );
+	public static inline function getHigh(x:Int64):Int32
+		return cast(x.val >> 32);
 
-	public static inline function getLow( x : Int64 ) : Int32
-		return cast( x.val );
+	public static inline function getLow(x:Int64):Int32
+		return cast(x.val);
 
-	public static inline function isNeg( x : Int64 ) : Bool
+	public static inline function isNeg(x:Int64):Bool
 		return x.val < 0;
 
-	public static inline function isZero( x : Int64 ) : Bool
+	public static inline function isZero(x:Int64):Bool
 		return x.val == 0;
 
-	public static inline function compare( a : Int64, b : Int64 ) : Int
-	{
-		if( a.val < b.val ) return -1;
-		if( a.val > b.val ) return 1;
+	public static inline function compare(a:Int64, b:Int64):Int {
+		if (a.val < b.val)
+			return -1;
+		if (a.val > b.val)
+			return 1;
 		return 0;
 	}
 
-	public static inline function ucompare( a : Int64, b : Int64 ) : Int {
-		if( a.val < 0 )
-			return ( b.val < 0 ) ? compare( a, b ) : 1;
-		return ( b.val < 0 ) ? -1 : compare( a, b );
+	public static inline function ucompare(a:Int64, b:Int64):Int {
+		if (a.val < 0)
+			return (b.val < 0) ? compare(a, b) : 1;
+		return (b.val < 0) ? -1 : compare(a, b);
 	}
 
-	public static inline function toStr( x : Int64 ) : String
+	public static inline function toStr(x:Int64):String
 		return '${x.val}';
 
-	public static inline function divMod( dividend : Int64, divisor : Int64 ) : { quotient : Int64, modulus : Int64 }
-		return { quotient: dividend / divisor, modulus: dividend % divisor };
+	public static inline function divMod(dividend:Int64, divisor:Int64):{quotient:Int64, modulus:Int64}
+		return {quotient: dividend / divisor, modulus: dividend % divisor};
 
-	private inline function toString() : String
+	private inline function toString():String
 		return '$this';
 
-	public static function parseString( sParam : String ) : Int64 {
-		return Int64Helper.parseString( sParam );
+	public static function parseString(sParam:String):Int64 {
+		return Int64Helper.parseString(sParam);
 	}
 
-	public static function fromFloat( f : Float ) : Int64 {
-		return Int64Helper.fromFloat( f );
+	public static function fromFloat(f:Float):Int64 {
+		return Int64Helper.fromFloat(f);
 	}
 
-	@:op(-A) public static function neg( x : Int64 ) : Int64
+	@:op(-A) public static function neg(x:Int64):Int64
 		return -x.val;
 
-	@:op(++A) private inline function preIncrement() : Int64
+	@:op(++A) private inline function preIncrement():Int64
 		return ++this;
 
-	@:op(A++) private inline function postIncrement() : Int64
+	@:op(A++) private inline function postIncrement():Int64
 		return this++;
 
-	@:op(--A) private inline function preDecrement() : Int64
+	@:op(--A) private inline function preDecrement():Int64
 		return --this;
 
-	@:op(A--) private inline function postDecrement() : Int64
+	@:op(A--) private inline function postDecrement():Int64
 		return this--;
 
-	@:op(A + B) public static inline function add( a : Int64, b : Int64 ) : Int64
+	@:op(A + B) public static inline function add(a:Int64, b:Int64):Int64
 		return a.val + b.val;
 
-	@:op(A + B) @:commutative private static inline function addInt( a : Int64, b : Int ) : Int64
+	@:op(A + B) @:commutative private static inline function addInt(a:Int64, b:Int):Int64
 		return a.val + b;
 
-	@:op(A - B) public static inline function sub( a : Int64, b : Int64 ) : Int64
+	@:op(A - B) public static inline function sub(a:Int64, b:Int64):Int64
 		return a.val - b.val;
 
-	@:op(A - B) private static inline function subInt( a : Int64, b : Int ) : Int64
+	@:op(A - B) private static inline function subInt(a:Int64, b:Int):Int64
 		return a.val - b;
 
-	@:op(A - B) private static inline function intSub( a : Int, b : Int64 ) : Int64
+	@:op(A - B) private static inline function intSub(a:Int, b:Int64):Int64
 		return a - b.val;
 
-	@:op(A * B) public static inline function mul( a : Int64, b : Int64 ) : Int64
+	@:op(A * B) public static inline function mul(a:Int64, b:Int64):Int64
 		return a.val * b.val;
 
-	@:op(A * B) @:commutative private static inline function mulInt( a : Int64, b : Int ) : Int64
+	@:op(A * B) @:commutative private static inline function mulInt(a:Int64, b:Int):Int64
 		return a.val * b;
 
-	@:op(A / B) public static inline function div( a : Int64, b : Int64 ) : Int64
+	@:op(A / B) public static inline function div(a:Int64, b:Int64):Int64
 		return a.val / b.val;
 
-	@:op(A / B) private static inline function divInt( a : Int64, b : Int ) : Int64
+	@:op(A / B) private static inline function divInt(a:Int64, b:Int):Int64
 		return a.val / b;
 
-	@:op(A / B) private static inline function intDiv( a : Int, b : Int64 ) : Int64
+	@:op(A / B) private static inline function intDiv(a:Int, b:Int64):Int64
 		return a / b.val;
 
-	@:op(A % B) public static inline function mod( a : Int64, b : Int64 ) : Int64
+	@:op(A % B) public static inline function mod(a:Int64, b:Int64):Int64
 		return a.val % b.val;
 
-	@:op(A % B) private static inline function modInt( a : Int64, b : Int ) : Int64
+	@:op(A % B) private static inline function modInt(a:Int64, b:Int):Int64
 		return a.val % b;
 
-	@:op(A % B) private static inline function intMod( a : Int, b : Int64 ) : Int64
+	@:op(A % B) private static inline function intMod(a:Int, b:Int64):Int64
 		return a % b.val;
 
-	@:op(A == B) public static inline function eq( a : Int64, b : Int64 ) : Bool
+	@:op(A == B) public static inline function eq(a:Int64, b:Int64):Bool
 		return a.val == b.val;
 
-	@:op(A == B) @:commutative private static inline function eqInt( a : Int64, b : Int ) : Bool
+	@:op(A == B) @:commutative private static inline function eqInt(a:Int64, b:Int):Bool
 		return a.val == b;
 
-	@:op(A != B) public static inline function neq( a : Int64, b : Int64 ) : Bool
+	@:op(A != B) public static inline function neq(a:Int64, b:Int64):Bool
 		return a.val != b.val;
 
-	@:op(A != B) @:commutative private static inline function neqInt( a : Int64, b : Int ) : Bool
+	@:op(A != B) @:commutative private static inline function neqInt(a:Int64, b:Int):Bool
 		return a.val != b;
 
-	@:op(A < B) private static inline function lt( a : Int64, b : Int64 ) : Bool
+	@:op(A < B) private static inline function lt(a:Int64, b:Int64):Bool
 		return a.val < b.val;
 
-	@:op(A < B) private static inline function ltInt( a : Int64, b : Int ) : Bool
+	@:op(A < B) private static inline function ltInt(a:Int64, b:Int):Bool
 		return a.val < b;
 
-	@:op(A < B) private static inline function intLt( a : Int, b : Int64 ) : Bool
+	@:op(A < B) private static inline function intLt(a:Int, b:Int64):Bool
 		return a < b.val;
 
-	@:op(A <= B) private static inline function lte( a : Int64, b : Int64 ) : Bool
+	@:op(A <= B) private static inline function lte(a:Int64, b:Int64):Bool
 		return a.val <= b.val;
 
-	@:op(A <= B) private static inline function lteInt( a : Int64, b : Int ) : Bool
+	@:op(A <= B) private static inline function lteInt(a:Int64, b:Int):Bool
 		return a.val <= b;
 
-	@:op(A <= B) private static inline function intLte( a : Int, b : Int64 ) : Bool
+	@:op(A <= B) private static inline function intLte(a:Int, b:Int64):Bool
 		return a <= b.val;
 
-	@:op(A > B) private static inline function gt( a : Int64, b : Int64 ) : Bool
+	@:op(A > B) private static inline function gt(a:Int64, b:Int64):Bool
 		return a.val > b.val;
 
-	@:op(A > B) private static inline function gtInt( a : Int64, b : Int ) : Bool
+	@:op(A > B) private static inline function gtInt(a:Int64, b:Int):Bool
 		return a.val > b;
 
-	@:op(A > B) private static inline function intGt( a : Int, b : Int64 ) : Bool
+	@:op(A > B) private static inline function intGt(a:Int, b:Int64):Bool
 		return a > b.val;
 
-	@:op(A >= B) private static inline function gte( a : Int64, b : Int64 ) : Bool
+	@:op(A >= B) private static inline function gte(a:Int64, b:Int64):Bool
 		return a.val >= b.val;
 
-	@:op(A >= B) private static inline function gteInt( a : Int64, b : Int ) : Bool
+	@:op(A >= B) private static inline function gteInt(a:Int64, b:Int):Bool
 		return a.val >= b;
 
-	@:op(A >= B) private static inline function intGte( a : Int, b : Int64 ) : Bool
+	@:op(A >= B) private static inline function intGte(a:Int, b:Int64):Bool
 		return a >= b.val;
 
-	@:op(~A) private static inline function complement( x : Int64 ) : Int64
+	@:op(~A) private static inline function complement(x:Int64):Int64
 		return ~x.val;
 
-	@:op(A & B) public static inline function and( a : Int64, b : Int64 ) : Int64
+	@:op(A & B) public static inline function and(a:Int64, b:Int64):Int64
 		return a.val & b.val;
 
-	@:op(A | B) public static inline function or( a : Int64, b : Int64 ) : Int64
+	@:op(A | B) public static inline function or(a:Int64, b:Int64):Int64
 		return a.val | b.val;
 
-	@:op(A ^ B) public static inline function xor( a : Int64, b : Int64 ) : Int64
+	@:op(A ^ B) public static inline function xor(a:Int64, b:Int64):Int64
 		return a.val ^ b.val;
 
-	@:op(A << B) public static inline function shl( a : Int64, b : Int ) : Int64
+	@:op(A << B) public static inline function shl(a:Int64, b:Int):Int64
 		return a.val << b;
 
-	@:op(A >> B) public static inline function shr( a : Int64, b : Int ) : Int64
+	@:op(A >> B) public static inline function shr(a:Int64, b:Int):Int64
 		return a.val >> b;
 
-	@:op(A >>> B) public static inline function ushr( a : Int64, b : Int ) : Int64
-		return cast ( (a.val : cs.StdTypes.UInt64) >> b );
+	@:op(A >>> B) public static inline function ushr(a:Int64, b:Int):Int64
+		return cast((a.val : cs.StdTypes.UInt64) >> b);
 }
diff --git a/std/cs/_std/haxe/Resource.hx b/std/cs/_std/haxe/Resource.hx
index 958040cc7966cf818e5c258545ab82e2f6af9862..bbf50909096d68e717052eeec8ffc57737a28e9b 100644
--- a/std/cs/_std/haxe/Resource.hx
+++ b/std/cs/_std/haxe/Resource.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 @:coreApi class Resource {
+	@:keep static var content:Array<String>;
+	static var paths:Map<String, String>;
 
-	@:keep static var content : Array<String>;
-	static var paths : Map<String,String>;
-
-	@:keep static function getPaths():Map<String,String> {
+	@:keep static function getPaths():Map<String, String> {
 		if (paths != null)
 			return paths;
 
@@ -40,12 +40,12 @@ package haxe;
 		return paths = p;
 	}
 
-	public static inline function listNames() : Array<String> {
+	public static inline function listNames():Array<String> {
 		return content.copy();
 	}
 
 	@:access(haxe.io.Path.escape)
-	public static function getString( name : String ) : String {
+	public static function getString(name:String):String {
 		name = haxe.io.Path.escape(name, true);
 		var path = getPaths().get(name);
 		if (path == null)
@@ -57,7 +57,7 @@ package haxe;
 	}
 
 	@:access(haxe.io.Path.escape)
-	public static function getBytes( name : String ) : haxe.io.Bytes {
+	public static function getBytes(name:String):haxe.io.Bytes {
 		name = haxe.io.Path.escape(name, true);
 		var path = getPaths().get(name);
 		if (path == null)
diff --git a/std/cs/_std/haxe/ds/IntMap.hx b/std/cs/_std/haxe/ds/IntMap.hx
index 864edfa87312127a70a931fa51a2105e055b36ba..064510bc5896dc4220ac9767c000350df4b02acf 100644
--- a/std/cs/_std/haxe/ds/IntMap.hx
+++ b/std/cs/_std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,6 +21,7 @@
  */
 
 package haxe.ds;
+
 import cs.NativeArray;
 
 /*
@@ -30,8 +31,7 @@ import cs.NativeArray;
  * Thanks also to Jonas Malaco Filho for his Haxe-written IntMap code inspired by Python tables.
  * (https://jonasmalaco.com/fossil/test/jonas-haxe/artifact/887b53126e237d6c68951111d594033403889304)
  */
-@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int,T>
-{
+@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
 	private static inline var HASH_UPPER = 0.7;
 
 	private var flags:NativeArray<Int>;
@@ -43,166 +43,160 @@ import cs.NativeArray;
 	private var nOccupied:Int;
 	private var upperBound:Int;
 
-#if !no_map_cache
+	#if !no_map_cache
 	private var cachedKey:Int;
 	private var cachedIndex:Int;
-#end
+	#end
 
-	public function new() : Void
-	{
-#if !no_map_cache
+	public function new():Void {
+		#if !no_map_cache
 		cachedIndex = -1;
-#end
+		#end
 	}
 
-	public function set( key : Int, value : T ) : Void
-	{
-		var x:Int;
-		if (nOccupied >= upperBound)
-		{
-			if (nBuckets > (size << 1))
-				resize(nBuckets - 1); //clear "deleted" elements
-			else
+	public function set(key:Int, value:T):Void {
+		var targetIndex:Int;
+		if (nOccupied >= upperBound) {
+			if (nBuckets > (size << 1)) {
+				resize(nBuckets - 1); // clear "deleted" elements
+			} else {
 				resize(nBuckets + 1);
+			}
 		}
 
 		var flags = flags, _keys = _keys;
 		{
-			var mask = nBuckets - 1;
-			var site = x = nBuckets;
-			var k = hash(key);
-			var i = k & mask;
-
-			var delKey = -1;
-			//for speed up
-			if (flagIsEmpty(flags, i)) {
-				x = i;
+			var mask = nBuckets - 1,
+				hashedKey = hash(key),
+				curIndex = hashedKey & mask;
+
+			var delKey = -1, curFlag = 0;
+			// to speed things up, don't loop if the first bucket is already free
+			if (isEmpty(getFlag(flags, curIndex))) {
+				targetIndex = curIndex;
 			} else {
-				var inc = getInc(k, mask);
-				var last = i;
-				while (! (flagIsEmpty(flags, i) || _keys[i] == key) )
-				{
-					if (delKey == -1 && flagIsDel(flags,i))
-						delKey = i;
-					i = (i + inc) & mask;
-#if DEBUG_HASHTBL
-					if (i == last)
-					{
-						throw "assert";
+				var inc = getInc(hashedKey, mask), last = curIndex;
+				while (!(_keys[curIndex] == key || isEmpty(curFlag = getFlag(flags, curIndex)))) {
+					if (delKey == -1 && isDel(curFlag)) {
+						delKey = curIndex;
 					}
-#end
+					curIndex = (curIndex + inc) & mask;
+					#if debug
+					assert(curIndex != last);
+					#end
 				}
 
-				if (flagIsEmpty(flags,i) && delKey != -1)
-					x = delKey;
-				else
-					x = i;
+				if (delKey != -1 && isEmpty(getFlag(flags, curIndex))) {
+					targetIndex = delKey;
+				} else {
+					targetIndex = curIndex;
+				}
 			}
 		}
 
-		if (flagIsEmpty(flags, x))
-		{
-			_keys[x] = key;
-			vals[x] = value;
-			setIsBothFalse(flags, x);
+		var flag = getFlag(flags, targetIndex);
+		if (isEmpty(flag)) {
+			_keys[targetIndex] = key;
+			vals[targetIndex] = value;
+			setIsBothFalse(flags, targetIndex);
 			size++;
 			nOccupied++;
-		} else if (flagIsDel(flags, x)) {
-			_keys[x] = key;
-			vals[x] = value;
-			setIsBothFalse(flags, x);
+		} else if (isDel(flag)) {
+			_keys[targetIndex] = key;
+			vals[targetIndex] = value;
+			setIsBothFalse(flags, targetIndex);
 			size++;
 		} else {
-			assert(_keys[x] == key);
-			vals[x] = value;
+			#if debug
+			assert(_keys[targetIndex] == key);
+			#end
+			vals[targetIndex] = value;
 		}
 	}
 
-	@:final private function lookup( key : Int ) : Int
-	{
-		if (nBuckets != 0)
-		{
+	final private function lookup(key:Int):Int {
+		if (nBuckets != 0) {
 			var flags = flags, _keys = _keys;
 
-			var mask = nBuckets - 1, k = hash(key);
-			var i = k & mask;
-			var inc = getInc(k, mask); /* inc == 1 for linear probing */
-			var last = i;
-			while (!flagIsEmpty(flags, i) && (flagIsDel(flags, i) || _keys[i] != key))
-			{
-				i = (i + inc) & mask;
-				if (i == last)
-					return -1;
-			}
-			return isEither(flags, i) ? -1 : i;
+			var mask = nBuckets - 1,
+				k = hash(key),
+				index = k & mask,
+				curFlag = -1,
+				inc = getInc(k, mask), /* inc == 1 for linear probing */
+				last = index;
+			do {
+				if (_keys[index] == key) {
+					if (isEmpty(curFlag = getFlag(flags, index))) {
+						index = (index + inc) & mask;
+						continue;
+					} else if (isDel(curFlag)) {
+						return -1;
+					} else {
+						return index;
+					}
+				} else {
+					index = (index + inc) & mask;
+				}
+			} while (index != last);
 		}
 
 		return -1;
 	}
 
-	public function get( key : Int ) : Null<T>
-	{
+	public function get(key:Int):Null<T> {
 		var idx = -1;
-#if !no_map_cache
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
-#end
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
-#if !no_map_cache
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-#end
+			#end
 			return vals[idx];
 		}
 
 		return null;
 	}
 
-	private function getDefault( key : Int, def : T ) : T
-	{
+	private function getDefault(key:Int, def:T):T {
 		var idx = -1;
-#if !no_map_cache
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
-#end
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
-#if !no_map_cache
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-#end
+			#end
 			return vals[idx];
 		}
 
 		return def;
 	}
 
-	public function exists( key : Int ) : Bool
-	{
+	public function exists(key:Int):Bool {
 		var idx = -1;
-#if !no_map_cache
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return true;
 		}
-#end
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
-#if !no_map_cache
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-#end
+			#end
 
 			return true;
 		}
@@ -210,105 +204,110 @@ import cs.NativeArray;
 		return false;
 	}
 
-	public function remove( key : Int ) : Bool
-	{
+	public function remove(key:Int):Bool {
 		var idx = -1;
-#if !no_map_cache
-		if (! (cachedKey == key && ( (idx = cachedIndex) != -1 )))
-#end
+		#if !no_map_cache
+		if (!(cachedKey == key && ((idx = cachedIndex) != -1)))
+		#end
 		{
 			idx = lookup(key);
 		}
 
-		if (idx == -1)
-		{
+		if (idx == -1) {
 			return false;
 		} else {
-#if !no_map_cache
-			if (cachedKey == key)
+			#if !no_map_cache
+			if (cachedKey == key) {
 				cachedIndex = -1;
-#end
-			if (!isEither(flags, idx))
-			{
+			}
+			#end
+			if (!isEither(getFlag(flags, idx))) {
 				setIsDelTrue(flags, idx);
 				--size;
 
 				vals[idx] = null;
-				_keys[idx] = 0;
+				// we do NOT reset the keys here, as unlike StringMap, we check for keys equality
+				// and stop if we find a key that is equal to the one we're looking for
+				// setting this to 0 will allow the hash to contain duplicate `0` keys
+				// (see #6457)
+				// _keys[idx] = 0;
 			}
 
 			return true;
 		}
 	}
 
-	@:final private function resize(newNBuckets:Int) : Void
-	{
-		//This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
+	final private function resize(newNBuckets:Int):Void {
+		// This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
 		var newFlags = null;
 		var j = 1;
 		{
 			newNBuckets = roundUp(newNBuckets);
-			if (newNBuckets < 4) newNBuckets = 4;
-			if (size >= (newNBuckets * HASH_UPPER + 0.5)) /* requested size is too small */
-			{
+			if (newNBuckets < 4)
+				newNBuckets = 4;
+			if (size >= (newNBuckets * HASH_UPPER + 0.5))
+				/* requested size is too small */ {
 				j = 0;
 			} else { /* hash table size to be changed (shrink or expand); rehash */
 				var nfSize = flagsSize(newNBuckets);
-				newFlags = new NativeArray( nfSize );
-				for (i in 0...nfSize)
-					newFlags[i] = 0xaaaaaaaa;
-				if (nBuckets < newNBuckets) //expand
+				newFlags = new NativeArray(nfSize);
+				for (i in 0...nfSize) {
+					newFlags[i] = 0xaaaaaaaa; // isEmpty = true; isDel = false
+				}
+				if (nBuckets < newNBuckets) // expand
 				{
 					var k = new NativeArray(newNBuckets);
-					if (_keys != null)
+					if (_keys != null) {
 						arrayCopy(_keys, 0, k, 0, nBuckets);
+					}
 					_keys = k;
 
 					var v = new NativeArray(newNBuckets);
-					if (vals != null)
+					if (vals != null) {
 						arrayCopy(vals, 0, v, 0, nBuckets);
+					}
 					vals = v;
-				} //otherwise shrink
+				} // otherwise shrink
 			}
 		}
 
-		if (j != 0)
-		{ //rehashing is required
-#if !no_map_cache
-			//resetting cache
+		if (j != 0) { // rehashing is required
+			#if !no_map_cache
+			// resetting cache
 			cachedKey = 0;
 			cachedIndex = -1;
-#end
+			#end
 
 			j = -1;
 			var nBuckets = nBuckets, _keys = _keys, vals = vals, flags = flags;
 
 			var newMask = newNBuckets - 1;
-			while (++j < nBuckets)
-			{
-				if (!isEither(flags, j))
-				{
+			while (++j < nBuckets) {
+				if (!isEither(getFlag(flags, j))) {
 					var key = _keys[j];
 					var val = vals[j];
 
+					// do not set keys as 0 - see comment about #6457
+					// _keys[j] = 0;
+					vals[j] = cast null;
 					setIsDelTrue(flags, j);
-					while (true) /* kick-out process; sort of like in Cuckoo hashing */
-					{
+					while (true)
+						/* kick-out process; sort of like in Cuckoo hashing */ {
 						var k = hash(key);
 						var inc = getInc(k, newMask);
 						var i = k & newMask;
-						while (!flagIsEmpty(newFlags, i))
+						while (!isEmpty(getFlag(newFlags, i))) {
 							i = (i + inc) & newMask;
+						}
 						setIsEmptyFalse(newFlags, i);
 
-						if (i < nBuckets && !isEither(flags, i)) /* kick out the existing element */
-						{
+						if (i < nBuckets && !isEither(getFlag(flags, i)))
+							/* kick out the existing element */ {
 							{
 								var tmp = _keys[i];
 								_keys[i] = key;
 								key = tmp;
-							}
-							{
+							} {
 								var tmp = vals[i];
 								vals[i] = val;
 								val = tmp;
@@ -324,14 +323,13 @@ import cs.NativeArray;
 				}
 			}
 
-			if (nBuckets > newNBuckets) /* shrink the hash table */
-			{
+			if (nBuckets > newNBuckets)
+				/* shrink the hash table */ {
 				{
 					var k = new NativeArray(newNBuckets);
 					arrayCopy(_keys, 0, k, 0, newNBuckets);
 					this._keys = k;
-				}
-				{
+				} {
 					var v = new NativeArray(newNBuckets);
 					arrayCopy(vals, 0, v, 0, newNBuckets);
 					this.vals = v;
@@ -345,84 +343,116 @@ import cs.NativeArray;
 		}
 	}
 
-	/**
-		Returns an iterator of all keys in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public inline function keys() : Iterator<Int>
-	{
+	public inline function keys():Iterator<Int> {
 		return new IntMapKeyIterator(this);
 	}
 
-	/**
-		Returns an iterator of all values in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public inline function iterator() : Iterator<T>
-	{
+	public inline function iterator():Iterator<T> {
 		return new IntMapValueIterator(this);
 	}
 
-	/**
-		Returns an displayable representation of the hashtable content.
-	**/
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():IntMap<T> {
+		var copied = new IntMap<T>();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
 
-	public function toString() : String {
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
-	private static inline function assert(x:Bool):Void
-	{
+	public function clear():Void {
+		flags = null;
+		_keys = null;
+		vals = null;
+		nBuckets = 0;
+		size = 0;
+		nOccupied = 0;
+		upperBound = 0;
+		#if !no_map_cache
+		cachedKey = 0;
+		cachedIndex = -1;
+		#end
+	}
+
+	private static inline function assert(x:Bool):Void {
 		#if debug
-		if (!x) throw "assert failed";
+		if (!x)
+			throw "assert failed";
 		#end
 	}
 
-	private static inline function defaultK():Int return 0;
+	private static inline function defaultK():Int
+		return 0;
 
-	private static inline function arrayCopy(sourceArray:cs.system.Array, sourceIndex:Int, destinationArray:cs.system.Array, destinationIndex:Int, length:Int):Void
+	private static inline function arrayCopy(sourceArray:cs.system.Array, sourceIndex:Int, destinationArray:cs.system.Array, destinationIndex:Int,
+			length:Int):Void {
 		cs.system.Array.Copy(sourceArray, sourceIndex, destinationArray, destinationIndex, length);
+	}
 
-	private static inline function getInc(k:Int, mask:Int):Int
+	private static inline function getInc(k:Int, mask:Int):Int {
 		return (((k) >> 3 ^ (k) << 3) | 1) & (mask);
+	}
 
-	private static inline function hash(i:Int):Int
+	private static inline function hash(i:Int):Int {
 		return i;
+	}
 
-	private static inline function flagIsEmpty(flag:NativeArray<Int>, i:Int):Bool
-		return ( (flag[i >> 4] >>> ((i & 0xf) << 1)) & 2 ) != 0;
+	// flags represents a bit array with 2 significant bits for each index
+	// one bit for deleted (1), one for empty (2)
+	// so what this function does is:
+	//  * gets the integer with (flags / 16)
+	//  * shifts those bits to the right ((flags % 16) * 2) places
+	//  * masks it with 0b11
+	private static inline function getFlag(flags:NativeArray<Int>, i:Int):Int {
+		return ((flags[i >> 4] >>> ((i & 0xf) << 1)) & 3);
+	}
 
-	private static inline function flagIsDel(flag:NativeArray<Int>, i:Int):Bool
-		return ((flag[i >> 4] >>> ((i & 0xf) << 1)) & 1) != 0;
+	private static inline function isDel(flag:Int):Bool {
+		return (flag & 1) != 0;
+	}
 
-	private static inline function isEither(flag:NativeArray<Int>, i:Int):Bool
-		return ((flag[i >> 4] >>> ((i & 0xf) << 1)) & 3) != 0;
+	private static inline function isEmpty(flag:Int):Bool {
+		return (flag & 2) != 0;
+	}
 
-	private static inline function setIsDelFalse(flag:NativeArray<Int>, i:Int):Void
-		flag[i >> 4] &= ~(1 << ((i & 0xf) << 1));
+	private static inline function isEither(flag:Int):Bool {
+		return flag != 0;
+	}
 
-	private static inline function setIsEmptyFalse(flag:NativeArray<Int>, i:Int):Void
-		flag[i >> 4] &= ~(2 << ((i & 0xf) << 1));
+	private static inline function setIsDelFalse(flags:NativeArray<Int>, i:Int):Void {
+		flags[i >> 4] &= ~(1 << ((i & 0xf) << 1));
+	}
 
-	private static inline function setIsBothFalse(flag:NativeArray<Int>, i:Int):Void
-		flag[i >> 4] &= ~(3 << ((i & 0xf) << 1));
+	private static inline function setIsEmptyFalse(flags:NativeArray<Int>, i:Int):Void {
+		flags[i >> 4] &= ~(2 << ((i & 0xf) << 1));
+	}
+
+	private static inline function setIsBothFalse(flags:NativeArray<Int>, i:Int):Void {
+		flags[i >> 4] &= ~(3 << ((i & 0xf) << 1));
+	}
 
-	private static inline function setIsDelTrue(flag:NativeArray<Int>, i:Int):Void
-		flag[i >> 4] |= 1 << ((i & 0xf) << 1);
+	private static inline function setIsDelTrue(flags:NativeArray<Int>, i:Int):Void {
+		flags[i >> 4] |= 1 << ((i & 0xf) << 1);
+	}
 
-	private static inline function roundUp(x:Int):Int
-	{
+	private static inline function roundUp(x:Int):Int {
 		--x;
 		x |= (x) >>> 1;
 		x |= (x) >>> 2;
@@ -432,13 +462,13 @@ import cs.NativeArray;
 		return ++x;
 	}
 
-	private static inline function flagsSize(m:Int):Int
-		return ((m) < 16? 1 : (m) >> 4);
+	private static inline function flagsSize(m:Int):Int {
+		return ((m) < 16 ? 1 : (m) >> 4);
+	}
 }
 
 @:access(haxe.ds.IntMap)
-@:final
-private class IntMapKeyIterator<T> {
+private final class IntMapKeyIterator<T> {
 	var m:IntMap<T>;
 	var i:Int;
 	var len:Int;
@@ -451,7 +481,7 @@ private class IntMapKeyIterator<T> {
 
 	public function hasNext():Bool {
 		for (j in i...len) {
-			if (!IntMap.isEither(m.flags, j)) {
+			if (!IntMap.isEither(IntMap.getFlag(m.flags, j))) {
 				i = j;
 				return true;
 			}
@@ -461,18 +491,17 @@ private class IntMapKeyIterator<T> {
 
 	public function next():Int {
 		var ret = m._keys[i];
-#if !no_map_cache
+		#if !no_map_cache
 		m.cachedIndex = i;
 		m.cachedKey = ret;
-#end
+		#end
 		i++;
 		return ret;
 	}
 }
 
 @:access(haxe.ds.IntMap)
-@:final
-private class IntMapValueIterator<T> {
+private final class IntMapValueIterator<T> {
 	var m:IntMap<T>;
 	var i:Int;
 	var len:Int;
@@ -485,7 +514,7 @@ private class IntMapValueIterator<T> {
 
 	public function hasNext():Bool {
 		for (j in i...len) {
-			if (!IntMap.isEither(m.flags, j)) {
+			if (!IntMap.isEither(IntMap.getFlag(m.flags, j))) {
 				i = j;
 				return true;
 			}
diff --git a/std/cs/_std/haxe/ds/ObjectMap.hx b/std/cs/_std/haxe/ds/ObjectMap.hx
index d7137e6ceafae95331cc0a84e9ffbb7b5107b1ab..03481ddc23e9058a9d022c2a855d7d0cd6b03a55 100644
--- a/std/cs/_std/haxe/ds/ObjectMap.hx
+++ b/std/cs/_std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 import cs.NativeArray;
 
-@:coreApi class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K,V>
-{
-	@:extern private static inline var HASH_UPPER = 0.77;
-	@:extern private static inline var FLAG_EMPTY = 0;
-	@:extern private static inline var FLAG_DEL = 1;
+@:coreApi class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
+	extern private static inline var HASH_UPPER = 0.77;
+	extern private static inline var FLAG_EMPTY = 0;
+	extern private static inline var FLAG_DEL = 1;
 
 	/**
 	 * This is the most important structure here and the reason why it's so fast.
@@ -38,6 +38,7 @@ import cs.NativeArray;
 	 * The insertion algorithm will do the same but will also break when FLAG_DEL is found;
 	 */
 	private var hashes:NativeArray<HashType>;
+
 	private var _keys:NativeArray<K>;
 	private var vals:NativeArray<V>;
 
@@ -46,32 +47,29 @@ import cs.NativeArray;
 	private var nOccupied:Int;
 	private var upperBound:Int;
 
-#if !no_map_cache
+	#if !no_map_cache
 	private var cachedKey:K;
 	private var cachedIndex:Int;
-#end
+	#end
 
-#if DEBUG_HASHTBL
+	#if DEBUG_HASHTBL
 	private var totalProbes:Int;
 	private var probeTimes:Int;
 	private var sameHash:Int;
 	private var maxProbe:Int;
-#end
+	#end
 
-	public function new() : Void
-	{
-#if !no_map_cache
+	public function new():Void {
+		#if !no_map_cache
 		cachedIndex = -1;
-#end
+		#end
 	}
 
-	public function set( key : K, value : V ) : Void
-	{
+	public function set(key:K, value:V):Void {
 		var x:Int, k:Int;
-		if (nOccupied >= upperBound)
-		{
+		if (nOccupied >= upperBound) {
 			if (nBuckets > (size << 1))
-				resize(nBuckets - 1); //clear "deleted" elements
+				resize(nBuckets - 1); // clear "deleted" elements
 			else
 				resize(nBuckets + 2);
 		}
@@ -84,22 +82,21 @@ import cs.NativeArray;
 			var i = k & mask, nProbes = 0;
 
 			var delKey = -1;
-			//for speed up
+			// for speed up
 			if (isEmpty(hashes[i])) {
 				x = i;
 			} else {
-				//var inc = getInc(k, mask);
+				// var inc = getInc(k, mask);
 				var last = i, flag;
-				while(! (isEmpty(flag = hashes[i]) || (flag == k && _keys[i] == key)) )
-				{
+				while (!(isEmpty(flag = hashes[i]) || (flag == k && _keys[i] == key))) {
 					if (isDel(flag) && delKey == -1)
 						delKey = i;
 					i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
+					#if DEBUG_HASHTBL
 					probeTimes++;
 					if (i == last)
 						throw "assert";
-#end
+					#end
 				}
 
 				if (isEmpty(flag) && delKey != -1)
@@ -108,16 +105,15 @@ import cs.NativeArray;
 					x = i;
 			}
 
-#if DEBUG_HASHTBL
+			#if DEBUG_HASHTBL
 			if (nProbes > maxProbe)
 				maxProbe = nProbes;
 			totalProbes++;
-#end
+			#end
 		}
 
 		var flag = hashes[x];
-		if (isEmpty(flag))
-		{
+		if (isEmpty(flag)) {
 			keys[x] = key;
 			vals[x] = value;
 			hashes[x] = k;
@@ -133,58 +129,55 @@ import cs.NativeArray;
 			vals[x] = value;
 		}
 
-#if !no_map_cache
+		#if !no_map_cache
 		cachedIndex = x;
 		cachedKey = key;
-#end
+		#end
 	}
 
-	@:final private function lookup( key : K ) : Int
-	{
-		if (nBuckets != 0)
-		{
+	private final function lookup(key:K):Int {
+		if (nBuckets != 0) {
 			var hashes = hashes, keys = _keys;
 
 			var mask = nBuckets - 1, hash = hash(key), k = hash, nProbes = 0;
 			var i = k & mask;
 			var last = i, flag;
-			//var inc = getInc(k, mask);
-			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || keys[i] != key))
-			{
+			// var inc = getInc(k, mask);
+			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || keys[i] != key)) {
 				i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
+				#if DEBUG_HASHTBL
 				probeTimes++;
 				if (i == last)
 					throw "assert";
-#end
+				#end
 			}
 
-#if DEBUG_HASHTBL
+			#if DEBUG_HASHTBL
 			if (nProbes > maxProbe)
 				maxProbe = nProbes;
 			totalProbes++;
-#end
+			#end
 			return isEither(flag) ? -1 : i;
 		}
 
 		return -1;
 	}
 
-	@:final @:private function resize(newNBuckets:Int) : Void
-	{
-		//This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
+	final function resize(newNBuckets:Int):Void {
+		// This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
 		var newHash = null;
 		var j = 1;
 		{
 			newNBuckets = roundUp(newNBuckets);
-			if (newNBuckets < 4) newNBuckets = 4;
-			if (size >= (newNBuckets * HASH_UPPER + 0.5)) /* requested size is too small */
-			{
+			if (newNBuckets < 4)
+				newNBuckets = 4;
+			if (size >= (newNBuckets * HASH_UPPER + 0.5))
+				/* requested size is too small */ {
 				j = 0;
 			} else { /* hash table size to be changed (shrink or expand); rehash */
 				var nfSize = newNBuckets;
-				newHash = new NativeArray( nfSize );
-				if (nBuckets < newNBuckets) //expand
+				newHash = new NativeArray(nfSize);
+				if (nBuckets < newNBuckets) // expand
 				{
 					var k = new NativeArray(newNBuckets);
 					if (_keys != null)
@@ -195,35 +188,37 @@ import cs.NativeArray;
 					if (vals != null)
 						arrayCopy(vals, 0, v, 0, nBuckets);
 					vals = v;
-				} //otherwise shrink
+				} // otherwise shrink
 			}
 		}
 
-		if (j != 0)
-		{ //rehashing is required
-#if !no_map_cache
-			//resetting cache
+		if (j != 0) { // rehashing is required
+			#if !no_map_cache
+			// resetting cache
 			cachedKey = null;
 			cachedIndex = -1;
-#end
+			#end
 
 			j = -1;
-			var nBuckets = nBuckets, _keys = _keys, vals = vals, hashes = hashes;
+			var nBuckets = nBuckets,
+				_keys = _keys,
+				vals = vals,
+				hashes = hashes;
 
 			var newMask = newNBuckets - 1;
-			while (++j < nBuckets)
-			{
+			while (++j < nBuckets) {
 				var k;
-				if (!isEither(k = hashes[j]))
-				{
+				if (!isEither(k = hashes[j])) {
 					var key = _keys[j];
 					var val = vals[j];
 
+					_keys[j] = null;
+					vals[j] = cast null;
 					hashes[j] = FLAG_DEL;
-					while (true) /* kick-out process; sort of like in Cuckoo hashing */
-					{
+					while (true)
+						/* kick-out process; sort of like in Cuckoo hashing */ {
 						var nProbes = 0;
-						//var inc = getInc(k, newMask);
+						// var inc = getInc(k, newMask);
 						var i = k & newMask;
 
 						while (!isEmpty(newHash[i]))
@@ -231,14 +226,13 @@ import cs.NativeArray;
 
 						newHash[i] = k;
 
-						if (i < nBuckets && !isEither(k = hashes[i])) /* kick out the existing element */
-						{
+						if (i < nBuckets && !isEither(k = hashes[i]))
+							/* kick out the existing element */ {
 							{
 								var tmp = _keys[i];
 								_keys[i] = key;
 								key = tmp;
-							}
-							{
+							} {
 								var tmp = vals[i];
 								vals[i] = val;
 								val = tmp;
@@ -254,14 +248,13 @@ import cs.NativeArray;
 				}
 			}
 
-			if (nBuckets > newNBuckets) /* shrink the hash table */
-			{
+			if (nBuckets > newNBuckets)
+				/* shrink the hash table */ {
 				{
 					var k = new NativeArray(newNBuckets);
 					arrayCopy(_keys, 0, k, 0, newNBuckets);
 					this._keys = k;
-				}
-				{
+				} {
 					var v = new NativeArray(newNBuckets);
 					arrayCopy(vals, 0, v, 0, newNBuckets);
 					this.vals = v;
@@ -275,23 +268,20 @@ import cs.NativeArray;
 		}
 	}
 
-	public function get( key : K ) : Null<V>
-	{
+	public function get(key:K):Null<V> {
 		var idx = -1;
-#if !no_map_cache
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
-#end
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
-#if !no_map_cache
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-#end
+			#end
 
 			return vals[idx];
 		}
@@ -299,23 +289,20 @@ import cs.NativeArray;
 		return null;
 	}
 
-	private function getDefault( key : K, def : V ) : V
-	{
+	private function getDefault(key:K, def:V):V {
 		var idx = -1;
-#if !no_map_cache
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
-#end
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
-#if !no_map_cache
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-#end
+			#end
 
 			return vals[idx];
 		}
@@ -323,23 +310,20 @@ import cs.NativeArray;
 		return def;
 	}
 
-	public function exists( key : K ) : Bool
-	{
+	public function exists(key:K):Bool {
 		var idx = -1;
-#if !no_map_cache
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return true;
 		}
-#end
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
-#if !no_map_cache
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-#end
+			#end
 
 			return true;
 		}
@@ -347,24 +331,22 @@ import cs.NativeArray;
 		return false;
 	}
 
-	public function remove( key : K ) : Bool
-	{
+	public function remove(key:K):Bool {
 		var idx = -1;
-#if !no_map_cache
-		if (! (cachedKey == key && ( (idx = cachedIndex) != -1 )))
-#end
+		#if !no_map_cache
+		if (!(cachedKey == key && ((idx = cachedIndex) != -1)))
+		#end
 		{
 			idx = lookup(key);
 		}
 
-		if (idx == -1)
-		{
+		if (idx == -1) {
 			return false;
 		} else {
-#if !no_map_cache
+			#if !no_map_cache
 			if (cachedKey == key)
 				cachedIndex = -1;
-#end
+			#end
 
 			hashes[idx] = FLAG_DEL;
 			_keys[idx] = null;
@@ -375,45 +357,61 @@ import cs.NativeArray;
 		}
 	}
 
-	/**
-		Returns an iterator of all keys in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function keys() : Iterator<K>
-	{
+	public function keys():Iterator<K> {
 		return new ObjectMapKeyIterator(this);
 	}
 
-	/**
-		Returns an iterator of all values in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function iterator() : Iterator<V>
-	{
+	public function iterator():Iterator<V> {
 		return new ObjectMapValueIterator(this);
 	}
 
-	/**
-		Returns an displayable representation of the hashtable content.
-	**/
+	@:runtime public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():ObjectMap<K, V> {
+		var copied = new ObjectMap<K, V>();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
 
-	public function toString() : String {
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(Std.string(i));
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
-	@:extern private static inline function roundUp(x:Int):Int
-	{
+	public function clear():Void {
+		hashes = null;
+		_keys = null;
+		vals = null;
+		nBuckets = 0;
+		size = 0;
+		nOccupied = 0;
+		upperBound = 0;
+		#if !no_map_cache
+		cachedKey = null;
+		cachedIndex = -1;
+		#end
+		#if DEBUG_HASHTBL
+		totalProbes = 0;
+		probeTimes = 0;
+		sameHash = 0;
+		maxProbe = 0;
+		#end
+	}
+
+	extern private static inline function roundUp(x:Int):Int {
 		--x;
 		x |= (x) >>> 1;
 		x |= (x) >>> 2;
@@ -423,38 +421,36 @@ import cs.NativeArray;
 		return ++x;
 	}
 
-	@:extern private static inline function getInc(k:Int, mask:Int):Int //return 1 for linear probing
+	extern private static inline function getInc(k:Int, mask:Int):Int // return 1 for linear probing
 		return (((k) >> 3 ^ (k) << 3) | 1) & (mask);
 
-	@:extern private static inline function isEither(v:HashType):Bool
+	extern private static inline function isEither(v:HashType):Bool
 		return (v & 0xFFFFFFFE) == 0;
 
-	@:extern private static inline function isEmpty(v:HashType):Bool
+	extern private static inline function isEmpty(v:HashType):Bool
 		return v == FLAG_EMPTY;
 
-	@:extern private static inline function isDel(v:HashType):Bool
+	extern private static inline function isDel(v:HashType):Bool
 		return v == FLAG_DEL;
 
-	//guarantee: Whatever this function is, it will never return 0 nor 1
-	@:extern private static inline function hash<K>(s:K):HashType
-	{
+	// guarantee: Whatever this function is, it will never return 0 nor 1
+	extern private static inline function hash<K>(s:K):HashType {
 		var k:Int = untyped s.GetHashCode();
-		//k *= 357913941;
-		//k ^= k << 24;
-		//k += ~357913941;
-		//k ^= k >> 31;
-		//k ^= k << 31;
-
-		k = (k+0x7ed55d16) + (k<<12);
-		k = (k^0xc761c23c) ^ (k>>19);
-		k = (k+0x165667b1) + (k<<5);
-		k = (k+0xd3a2646c) ^ (k<<9);
-		k = (k+0xfd7046c5) + (k<<3);
-		k = (k^0xb55a4f09) ^ (k>>16);
+		// k *= 357913941;
+		// k ^= k << 24;
+		// k += ~357913941;
+		// k ^= k >> 31;
+		// k ^= k << 31;
+
+		k = (k + 0x7ed55d16) + (k << 12);
+		k = (k ^ 0xc761c23c) ^ (k >> 19);
+		k = (k + 0x165667b1) + (k << 5);
+		k = (k + 0xd3a2646c) ^ (k << 9);
+		k = (k + 0xfd7046c5) + (k << 3);
+		k = (k ^ 0xb55a4f09) ^ (k >> 16);
 
 		var ret = k;
-		if (isEither(ret))
-		{
+		if (isEither(ret)) {
 			if (ret == 0)
 				ret = 2;
 			else
@@ -464,35 +460,33 @@ import cs.NativeArray;
 		return ret;
 	}
 
-	@:extern private static inline function arrayCopy(sourceArray:cs.system.Array, sourceIndex:Int, destinationArray:cs.system.Array, destinationIndex:Int, length:Int):Void
+	extern private static inline function arrayCopy(sourceArray:cs.system.Array, sourceIndex:Int, destinationArray:cs.system.Array, destinationIndex:Int,
+			length:Int):Void
 		cs.system.Array.Copy(sourceArray, sourceIndex, destinationArray, destinationIndex, length);
 
-	@:extern private static inline function assert(x:Bool):Void
-	{
-#if DEBUG_HASHTBL
-		if (!x) throw "assert failed";
-#end
+	extern private static inline function assert(x:Bool):Void {
+		#if DEBUG_HASHTBL
+		if (!x)
+			throw "assert failed";
+		#end
 	}
 }
 
 @:access(haxe.ds.ObjectMap)
-@:final
-private class ObjectMapKeyIterator<T:{},V> {
-	var m:ObjectMap<T,V>;
+private final class ObjectMapKeyIterator<T:{}, V> {
+	var m:ObjectMap<T, V>;
 	var i:Int;
 	var len:Int;
 
-	public function new(m:ObjectMap<T,V>) {
+	public function new(m:ObjectMap<T, V>) {
 		this.i = 0;
 		this.m = m;
 		this.len = m.nBuckets;
 	}
 
 	public function hasNext():Bool {
-		for (j in i...len)
-		{
-			if (!ObjectMap.isEither(m.hashes[j]))
-			{
+		for (j in i...len) {
+			if (!ObjectMap.isEither(m.hashes[j])) {
 				i = j;
 				return true;
 			}
@@ -500,13 +494,13 @@ private class ObjectMapKeyIterator<T:{},V> {
 		return false;
 	}
 
-	public function next() : T {
+	public function next():T {
 		var ret = m._keys[i];
 
-#if !no_map_cache
+		#if !no_map_cache
 		m.cachedIndex = i;
 		m.cachedKey = ret;
-#end
+		#end
 
 		i = i + 1;
 		return ret;
@@ -514,24 +508,20 @@ private class ObjectMapKeyIterator<T:{},V> {
 }
 
 @:access(haxe.ds.ObjectMap)
-@:final
-private class ObjectMapValueIterator<K:{},T> {
-	var m:ObjectMap<K,T>;
+private final class ObjectMapValueIterator<K:{}, T> {
+	var m:ObjectMap<K, T>;
 	var i:Int;
 	var len:Int;
 
-	public function new(m:ObjectMap<K,T>)
-	{
+	public function new(m:ObjectMap<K, T>) {
 		this.i = 0;
 		this.m = m;
 		this.len = m.nBuckets;
 	}
 
-	public function hasNext() : Bool {
-		for (j in i...len)
-		{
-			if (!ObjectMap.isEither(m.hashes[j]))
-			{
+	public function hasNext():Bool {
+		for (j in i...len) {
+			if (!ObjectMap.isEither(m.hashes[j])) {
 				i = j;
 				return true;
 			}
diff --git a/std/cs/_std/haxe/ds/StringMap.hx b/std/cs/_std/haxe/ds/StringMap.hx
index 72faafccf93e45c75216f4691924939445fa3b18..64fc72a25d8717c371d94a08afe681648f4244a0 100644
--- a/std/cs/_std/haxe/ds/StringMap.hx
+++ b/std/cs/_std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 import cs.NativeArray;
 
-@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String,T>
-{
-	@:extern private static inline var HASH_UPPER = 0.77;
-	@:extern private static inline var FLAG_EMPTY = 0;
-	@:extern private static inline var FLAG_DEL = 1;
+@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String, T> {
+	extern private static inline var HASH_UPPER = 0.77;
+	extern private static inline var FLAG_EMPTY = 0;
+	extern private static inline var FLAG_DEL = 1;
 
 	/**
 	 * This is the most important structure here and the reason why it's so fast.
@@ -38,6 +38,7 @@ import cs.NativeArray;
 	 * The insertion algorithm will do the same but will also break when FLAG_DEL is found;
 	 */
 	private var hashes:NativeArray<HashType>;
+
 	private var _keys:NativeArray<String>;
 	private var vals:NativeArray<T>;
 
@@ -46,34 +47,32 @@ import cs.NativeArray;
 	private var nOccupied:Int;
 	private var upperBound:Int;
 
-#if !no_map_cache
+	#if !no_map_cache
 	private var cachedKey:String;
 	private var cachedIndex:Int;
-#end
+	#end
 
-#if DEBUG_HASHTBL
+	#if DEBUG_HASHTBL
 	private var totalProbes:Int;
 	private var probeTimes:Int;
 	private var sameHash:Int;
 	private var maxProbe:Int;
-#end
+	#end
 
-	public function new() : Void
-	{
-#if !no_map_cache
+	public function new():Void {
+		#if !no_map_cache
 		cachedIndex = -1;
-#end
+		#end
 	}
 
-	public function set( key : String, value : T ) : Void
-	{
+	public function set(key:String, value:T):Void {
 		var x:Int, k:Int;
-		if (nOccupied >= upperBound)
-		{
-			if (nBuckets > (size << 1))
-				resize(nBuckets - 1); //clear "deleted" elements
-			else
+		if (nOccupied >= upperBound) {
+			if (nBuckets > (size << 1)) {
+				resize(nBuckets - 1); // clear "deleted" elements
+			} else {
 				resize(nBuckets + 2);
+			}
 		}
 
 		var hashes = hashes, keys = _keys, hashes = hashes;
@@ -84,39 +83,39 @@ import cs.NativeArray;
 			var i = k & mask, nProbes = 0;
 
 			var delKey = -1;
-			//for speed up
+			// to speed things up, don't loop if the first bucket is already free
 			if (isEmpty(hashes[i])) {
 				x = i;
 			} else {
 				var last = i, flag;
-				while(! (isEmpty(flag = hashes[i]) || (flag == k && _keys[i] == key)) )
-				{
-					if (isDel(flag) && delKey == -1)
+				while (!(isEmpty(flag = hashes[i]) || (flag == k && _keys[i] == key))) {
+					if (isDel(flag) && delKey == -1) {
 						delKey = i;
+					}
 					i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
+					#if DEBUG_HASHTBL
 					probeTimes++;
 					if (i == last)
 						throw "assert";
-#end
+					#end
 				}
 
-				if (isEmpty(flag) && delKey != -1)
+				if (isEmpty(flag) && delKey != -1) {
 					x = delKey;
-				else
+				} else {
 					x = i;
+				}
 			}
 
-#if DEBUG_HASHTBL
+			#if DEBUG_HASHTBL
 			if (nProbes > maxProbe)
 				maxProbe = nProbes;
 			totalProbes++;
-#end
+			#end
 		}
 
 		var flag = hashes[x];
-		if (isEmpty(flag))
-		{
+		if (isEmpty(flag)) {
 			keys[x] = key;
 			vals[x] = value;
 			hashes[x] = k;
@@ -132,58 +131,55 @@ import cs.NativeArray;
 			vals[x] = value;
 		}
 
-#if !no_map_cache
+		#if !no_map_cache
 		cachedIndex = x;
 		cachedKey = key;
-#end
+		#end
 	}
 
-	@:final private function lookup( key : String ) : Int
-	{
-		if (nBuckets != 0)
-		{
+	private final function lookup(key:String):Int {
+		if (nBuckets != 0) {
 			var hashes = hashes, keys = _keys;
 
 			var mask = nBuckets - 1, hash = hash(key), k = hash, nProbes = 0;
 			var i = k & mask;
 			var last = i, flag;
-			//var inc = getInc(k, mask);
-			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || keys[i] != key))
-			{
+			// if we hit an empty bucket, it means we're done
+			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || keys[i] != key)) {
 				i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
+				#if DEBUG_HASHTBL
 				probeTimes++;
 				if (i == last)
 					throw "assert";
-#end
+				#end
 			}
 
-#if DEBUG_HASHTBL
+			#if DEBUG_HASHTBL
 			if (nProbes > maxProbe)
 				maxProbe = nProbes;
 			totalProbes++;
-#end
+			#end
 			return isEither(flag) ? -1 : i;
 		}
 
 		return -1;
 	}
 
-	@:final @:private function resize(newNBuckets:Int) : Void
-	{
-		//This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
+	final function resize(newNBuckets:Int):Void {
+		// This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
 		var newHash = null;
 		var j = 1;
 		{
 			newNBuckets = roundUp(newNBuckets);
-			if (newNBuckets < 4) newNBuckets = 4;
-			if (size >= (newNBuckets * HASH_UPPER + 0.5)) /* requested size is too small */
-			{
+			if (newNBuckets < 4)
+				newNBuckets = 4;
+			if (size >= (newNBuckets * HASH_UPPER + 0.5))
+				/* requested size is too small */ {
 				j = 0;
 			} else { /* hash table size to be changed (shrink or expand); rehash */
 				var nfSize = newNBuckets;
-				newHash = new NativeArray( nfSize );
-				if (nBuckets < newNBuckets) //expand
+				newHash = new NativeArray(nfSize);
+				if (nBuckets < newNBuckets) // expand
 				{
 					var k = new NativeArray(newNBuckets);
 					if (_keys != null)
@@ -194,50 +190,51 @@ import cs.NativeArray;
 					if (vals != null)
 						arrayCopy(vals, 0, v, 0, nBuckets);
 					vals = v;
-				} //otherwise shrink
+				} // otherwise shrink
 			}
 		}
 
-		if (j != 0)
-		{ //rehashing is required
-			//resetting cache
-#if !no_map_cache
+		if (j != 0) { // rehashing is required
+			// resetting cache
+			#if !no_map_cache
 			cachedKey = null;
 			cachedIndex = -1;
-#end
+			#end
 
 			j = -1;
-			var nBuckets = nBuckets, _keys = _keys, vals = vals, hashes = hashes;
+			var nBuckets = nBuckets,
+				_keys = _keys,
+				vals = vals,
+				hashes = hashes;
 
 			var newMask = newNBuckets - 1;
-			while (++j < nBuckets)
-			{
+			while (++j < nBuckets) {
 				var k;
-				if (!isEither(k = hashes[j]))
-				{
+				if (!isEither(k = hashes[j])) {
 					var key = _keys[j];
 					var val = vals[j];
 
+					_keys[j] = null;
+					vals[j] = cast null;
 					hashes[j] = FLAG_DEL;
-					while (true) /* kick-out process; sort of like in Cuckoo hashing */
-					{
+					while (true)
+						/* kick-out process; sort of like in Cuckoo hashing */ {
 						var nProbes = 0;
-						//var inc = getInc(k, newMask);
 						var i = k & newMask;
 
-						while (!isEmpty(newHash[i]))
+						while (!isEmpty(newHash[i])) {
 							i = (i + ++nProbes) & newMask;
+						}
 
 						newHash[i] = k;
 
-						if (i < nBuckets && !isEither(k = hashes[i])) /* kick out the existing element */
-						{
-							{
+						if (i < nBuckets && !isEither(k = hashes[i]))
+							/* kick out the existing element */ {
+							{ // inlined swap
 								var tmp = _keys[i];
 								_keys[i] = key;
 								key = tmp;
-							}
-							{
+							} { // inlined swap
 								var tmp = vals[i];
 								vals[i] = val;
 								val = tmp;
@@ -253,14 +250,13 @@ import cs.NativeArray;
 				}
 			}
 
-			if (nBuckets > newNBuckets) /* shrink the hash table */
-			{
-				{
+			if (nBuckets > newNBuckets)
+				/* shrink the hash table */ {
+				{ // inlined swap
 					var k = new NativeArray(newNBuckets);
 					arrayCopy(_keys, 0, k, 0, newNBuckets);
 					this._keys = k;
-				}
-				{
+				} { // inlined swap
 					var v = new NativeArray(newNBuckets);
 					arrayCopy(vals, 0, v, 0, newNBuckets);
 					this.vals = v;
@@ -274,45 +270,39 @@ import cs.NativeArray;
 		}
 	}
 
-	public function get( key : String ) : Null<T>
-	{
+	public function get(key:String):Null<T> {
 		var idx = -1;
-#if !no_map_cache
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
-#end
+		#end
 		idx = lookup(key);
-		if (idx != -1)
-		{
-#if !no_map_cache
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-#end
+			#end
 			return vals[idx];
 		}
 
 		return null;
 	}
 
-	private function getDefault( key : String, def : T ) : T
-	{
+	private function getDefault(key:String, def:T):T {
 		var idx = -1;
-#if !no_map_cache
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
-#end
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
-#if !no_map_cache
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-#end
+			#end
 
 			return vals[idx];
 		}
@@ -320,47 +310,43 @@ import cs.NativeArray;
 		return def;
 	}
 
-	public function exists( key : String ) : Bool
-	{
+	public function exists(key:String):Bool {
 		var idx = -1;
-#if !no_map_cache
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return true;
 		}
-#end
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
-#if !no_map_cache
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-#end
+			#end
 			return true;
 		}
 
 		return false;
 	}
 
-	public function remove( key : String ) : Bool
-	{
+	public function remove(key:String):Bool {
 		var idx = -1;
-#if !no_map_cache
-		if (! (cachedKey == key && ( (idx = cachedIndex) != -1 )))
-#end
+		#if !no_map_cache
+		if (!(cachedKey == key && ((idx = cachedIndex) != -1)))
+		#end
 		{
 			idx = lookup(key);
 		}
 
-		if (idx == -1)
-		{
+		if (idx == -1) {
 			return false;
 		} else {
-#if !no_map_cache
-			if (cachedKey == key)
+			#if !no_map_cache
+			if (cachedKey == key) {
 				cachedIndex = -1;
-#end
+			}
+			#end
 			hashes[idx] = FLAG_DEL;
 			_keys[idx] = null;
 			vals[idx] = null;
@@ -370,45 +356,61 @@ import cs.NativeArray;
 		}
 	}
 
-	/**
-		Returns an iterator of all keys in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public inline function keys() : Iterator<String>
-	{
+	public inline function keys():Iterator<String> {
 		return new StringMapKeyIterator(this);
 	}
 
-	/**
-		Returns an iterator of all values in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public inline function iterator() : Iterator<T>
-	{
+	public inline function iterator():Iterator<T> {
 		return new StringMapValueIterator(this);
 	}
 
-	/**
-		Returns an displayable representation of the hashtable content.
-	**/
+	@:runtime public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
 
-	public function toString() : String {
+	public function copy():StringMap<T> {
+		var copied = new StringMap<T>();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
-	@:extern private static inline function roundUp(x:Int):Int
-	{
+	public function clear():Void {
+		hashes = null;
+		_keys = null;
+		vals = null;
+		nBuckets = 0;
+		size = 0;
+		nOccupied = 0;
+		upperBound = 0;
+		#if !no_map_cache
+		cachedKey = null;
+		cachedIndex = -1;
+		#end
+		#if DEBUG_HASHTBL
+		totalProbes = 0;
+		probeTimes = 0;
+		sameHash = 0;
+		maxProbe = 0;
+		#end
+	}
+
+	extern private static inline function roundUp(x:Int):Int {
 		--x;
 		x |= (x) >>> 1;
 		x |= (x) >>> 2;
@@ -418,38 +420,33 @@ import cs.NativeArray;
 		return ++x;
 	}
 
-	@:extern private static inline function getInc(k:Int, mask:Int):Int //return 1 for linear probing
-		return (((k) >> 3 ^ (k) << 3) | 1) & (mask);
-
-	@:extern private static inline function isEither(v:HashType):Bool
+	extern private static inline function isEither(v:HashType):Bool
 		return (v & 0xFFFFFFFE) == 0;
 
-	@:extern private static inline function isEmpty(v:HashType):Bool
+	extern private static inline function isEmpty(v:HashType):Bool
 		return v == FLAG_EMPTY;
 
-	@:extern private static inline function isDel(v:HashType):Bool
+	extern private static inline function isDel(v:HashType):Bool
 		return v == FLAG_DEL;
 
-	//guarantee: Whatever this function is, it will never return 0 nor 1
-	@:extern private static inline function hash(s:String):HashType
-	{
+	// guarantee: Whatever this function is, it will never return 0 nor 1
+	extern private static inline function hash(s:String):HashType {
 		var k:Int = untyped s.GetHashCode();
-		//k *= 357913941;
-		//k ^= k << 24;
-		//k += ~357913941;
-		//k ^= k >> 31;
-		//k ^= k << 31;
-
-		k = (k+0x7ed55d16) + (k<<12);
-		k = (k^0xc761c23c) ^ (k>>19);
-		k = (k+0x165667b1) + (k<<5);
-		k = (k+0xd3a2646c) ^ (k<<9);
-		k = (k+0xfd7046c5) + (k<<3);
-		k = (k^0xb55a4f09) ^ (k>>16);
+		// k *= 357913941;
+		// k ^= k << 24;
+		// k += ~357913941;
+		// k ^= k >> 31;
+		// k ^= k << 31;
+
+		k = (k + 0x7ed55d16) + (k << 12);
+		k = (k ^ 0xc761c23c) ^ (k >> 19);
+		k = (k + 0x165667b1) + (k << 5);
+		k = (k + 0xd3a2646c) ^ (k << 9);
+		k = (k + 0xfd7046c5) + (k << 3);
+		k = (k ^ 0xb55a4f09) ^ (k >> 16);
 
 		var ret = k;
-		if (isEither(ret))
-		{
+		if (isEither(ret)) {
 			if (ret == 0)
 				ret = 2;
 			else
@@ -459,22 +456,22 @@ import cs.NativeArray;
 		return ret;
 	}
 
-	@:extern private static inline function arrayCopy(sourceArray:cs.system.Array, sourceIndex:Int, destinationArray:cs.system.Array, destinationIndex:Int, length:Int):Void
+	extern private static inline function arrayCopy(sourceArray:cs.system.Array, sourceIndex:Int, destinationArray:cs.system.Array, destinationIndex:Int,
+			length:Int):Void
 		cs.system.Array.Copy(sourceArray, sourceIndex, destinationArray, destinationIndex, length);
 
-	@:extern private static inline function assert(x:Bool):Void
-	{
-#if DEBUG_HASHTBL
-		if (!x) throw "assert failed";
-#end
+	extern private static inline function assert(x:Bool):Void {
+		#if DEBUG_HASHTBL
+		if (!x)
+			throw "assert failed";
+		#end
 	}
 }
 
 private typedef HashType = Int;
 
-@:final
 @:access(haxe.ds.StringMap)
-private class StringMapKeyIterator<T> {
+private final class StringMapKeyIterator<T> {
 	var m:StringMap<T>;
 	var i:Int;
 	var len:Int;
@@ -497,18 +494,17 @@ private class StringMapKeyIterator<T> {
 
 	public function next():String {
 		var ret = m._keys[i];
-#if !no_map_cache
+		#if !no_map_cache
 		m.cachedIndex = i;
 		m.cachedKey = ret;
-#end
+		#end
 		i++;
 		return ret;
 	}
 }
 
-@:final
 @:access(haxe.ds.StringMap)
-private class StringMapValueIterator<T> {
+private final class StringMapValueIterator<T> {
 	var m:StringMap<T>;
 	var i:Int;
 	var len:Int;
diff --git a/std/cs/_std/haxe/ds/WeakMap.hx2 b/std/cs/_std/haxe/ds/WeakMap.hx2
deleted file mode 100644
index 53f00172d4191b72aa42c1b86ebd2cdfdcd0a545..0000000000000000000000000000000000000000
--- a/std/cs/_std/haxe/ds/WeakMap.hx2
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
- * Copyright (C)2005-2012 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 haxe.ds;
-
-import cs.NativeArray;
-import cs.system.WeakReference;
-
-// This implementation works by lazily evaluating the weak references, and only cleaning them up when needed.
-@:coreApi class WeakMap<K:{}, V> implements haxe.Constraints.IMap<K,V>
-{
-	@:extern private static inline var HASH_UPPER = 0.77;
-	@:extern private static inline var FLAG_EMPTY = 0;
-	@:extern private static inline var FLAG_DEL = 1;
-
-	/**
-	 * This is the most important structure here and the reason why it's so fast.
-	 * It's an array of all the hashes contained in the table. These hashes cannot be 0 nor 1,
-	 * which stand for "empty" and "deleted" states.
-	 *
-	 * The lookup algorithm will keep looking until a 0 or the key wanted is found;
-	 * The insertion algorithm will do the same but will also break when FLAG_DEL is found;
-	 */
-	private var hashes:NativeArray<HashType>;
-	private var entries:NativeArray<Entry<K,V>>;
-
-	private var nBuckets:Int;
-	private var size:Int;
-	private var nOccupied:Int;
-	private var upperBound:Int;
-
-	private var cachedEntry:Entry<K,V>;
-	private var cachedIndex:Int;
-
-#if DEBUG_HASHTBL
-	private var totalProbes:Int;
-	private var probeTimes:Int;
-	private var sameHash:Int;
-	private var maxProbe:Int;
-#end
-
-	public function new() : Void
-	{
-		cachedIndex = -1;
-	}
-
-	@:final private function checkSize():Void
-	{
-		//iterate over the hashes and remove dead references
-		var size = size, entries = entries, hashes = hashes;
-		if (entries == null)
-			return;
-		for (i in 0...entries.Length)
-		{
-			var e = entries[i];
-			if (e != null && e.Target == null)
-			{
-				--size;
-				hashes[i] = FLAG_DEL;
-				entries[i] = null;
-			}
-		}
-		this.size = size;
-	}
-
-	public function set( key : K, value : V ) : Void
-	{
-		var x:Int, k:Int;
-
-		if (nOccupied >= upperBound)
-		{
-			if (nBuckets > (size << 1))
-				resize(nBuckets - 1); //clear "deleted" elements
-			else
-				resize(nBuckets + 2);
-		}
-
-		k = hash(key);
-		var hashes = hashes, entries = entries;
-		{
-			var mask = (nBuckets == 0) ? 0 : nBuckets - 1;
-			var site = x = nBuckets;
-			var i = k & mask, nProbes = 0;
-
-			//for speed up
-			var delKey = -1;
-			if (isEmpty(hashes[i])) {
-				x = i;
-			} else {
-				//var inc = getInc(k, mask);
-				var last = i, flag;
-				while(! (isEmpty(flag = hashes[i]) || (flag == k && entries[i].keyEquals(key) )) )
-				{
-					if (delKey == -1 && isDel(flag))
-						delKey = i;
-
-					var entry = entries[i];
-					if (entry.Target == null)
-					{
-						hashes[i] = FLAG_DEL;
-						entries[i] = null;
-						--size;
-						if (delKey == -1)
-							delKey = i;
-					}
-
-					i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
-					probeTimes++;
-					if (i == last)
-						throw "assert";
-#end
-				}
-
-				if (isEmpty(flag) && delKey != -1)
-					x = delKey;
-				else
-					x = i;
-			}
-
-#if DEBUG_HASHTBL
-			if (nProbes > maxProbe)
-				maxProbe = nProbes;
-			totalProbes++;
-#end
-		}
-
-		var flag = hashes[x], entry = new Entry(key,value,k);
-		if (isEmpty(flag))
-		{
-			entries[x] = entry;
-			hashes[x] = k;
-			size++;
-			nOccupied++;
-		} else if (isDel(flag)) {
-			entries[x] = entry;
-			hashes[x] = k;
-			size++;
-		} else {
-			assert(entries[x].keyEquals(key));
-			entries[x] = entry;
-		}
-
-		cachedIndex = x;
-		cachedEntry = entry;
-	}
-
-	@:final private function lookup( key : K ) : Int
-	{
-		if (nBuckets != 0)
-		{
-			var hashes = hashes, entries = entries;
-
-			var mask = nBuckets - 1, hash = hash(key), k = hash, nProbes = 0;
-			var i = k & mask;
-			var last = i, flag;
-			//var inc = getInc(k, mask);
-			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || !entries[i].keyEquals(key)))
-			{
-				if (!isDel(flag))
-				{
-					var entry = entries[i];
-					if (entry.Target == null)
-					{
-						entries[i] = null;
-						hashes[i] = FLAG_DEL;
-						--size;
-					}
-				}
-				i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
-				probeTimes++;
-				if (i == last)
-					throw "assert";
-#end
-			}
-
-#if DEBUG_HASHTBL
-			if (nProbes > maxProbe)
-				maxProbe = nProbes;
-			totalProbes++;
-#end
-			return isEither(flag) ? -1 : i;
-		}
-
-		return -1;
-	}
-
-	@:final @:private function resize(newNBuckets:Int) : Void
-	{
-		//This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
-		var newHash = null;
-		var j = 1;
-		{
-			newNBuckets = roundUp(newNBuckets);
-			if (newNBuckets < 4) newNBuckets = 4;
-			if (size >= (newNBuckets * HASH_UPPER + 0.5)) /* requested size is too small */
-			{
-				j = 0;
-			} else { /* hash table size to be changed (shrink or expand); rehash */
-				var nfSize = newNBuckets;
-				newHash = new NativeArray( nfSize );
-				if (nBuckets < newNBuckets) //expand
-				{
-					var e = new NativeArray(newNBuckets);
-					if (entries != null)
-						arrayCopy(entries, 0, e, 0, nBuckets);
-					entries = e;
-				} //otherwise shrink
-			}
-		}
-
-		if (j != 0)
-		{ //rehashing is required
-			//resetting cache
-			cachedEntry = null;
-			cachedIndex = -1;
-
-			j = -1;
-			var nBuckets = nBuckets, entries = entries, hashes = hashes;
-
-			var newMask = newNBuckets - 1;
-			while (++j < nBuckets)
-			{
-				var k;
-				if (!isEither(k = hashes[j]))
-				{
-					var entry = entries[j];
-					if (entry.Target != null)
-					{
-						hashes[j] = FLAG_DEL;
-						while (true) /* kick-out process; sort of like in Cuckoo hashing */
-						{
-							var nProbes = 0;
-							var i = k & newMask;
-
-							while (!isEmpty(newHash[i]))
-								i = (i + ++nProbes) & newMask;
-
-							newHash[i] = k;
-
-							if (i < nBuckets && !isEither(k = hashes[i])) /* kick out the existing element */
-							{
-								{
-									var tmp = entries[i];
-									entries[i] = entry;
-									entry = tmp;
-								}
-
-								hashes[i] = FLAG_DEL; /* mark it as deleted in the old hash table */
-							} else { /* write the element and jump out of the loop */
-								entries[i] = entry;
-								break;
-							}
-						}
-					}
-				}
-			}
-
-			if (nBuckets > newNBuckets) /* shrink the hash table */
-			{
-				{
-					var e = new NativeArray(newNBuckets);
-					arrayCopy(entries, 0, e, 0, newNBuckets);
-					this.entries = e;
-				}
-			}
-
-			this.hashes = newHash;
-			this.nBuckets = newNBuckets;
-			this.nOccupied = size;
-			this.upperBound = Std.int(newNBuckets * HASH_UPPER + .5);
-		}
-	}
-
-	public function get( key : K ) : Null<V>
-	{
-		var idx = -1;
-		if (cachedEntry != null && cachedEntry.keyEquals(key) && ( (idx = cachedIndex) != -1 ))
-		{
-			return cachedEntry.value;
-		}
-
-		idx = lookup(key);
-		if (idx != -1)
-		{
-			var entry = entries[idx];
-			cachedEntry = entry;
-			cachedIndex = idx;
-
-			return entry.value;
-		}
-
-		return null;
-	}
-
-	private function getDefault( key : K, def : V ) : V
-	{
-		var idx = -1;
-		if (cachedEntry != null && cachedEntry.keyEquals(key) && ( (idx = cachedIndex) != -1 ))
-		{
-			return cachedEntry.value;
-		}
-
-		idx = lookup(key);
-		if (idx != -1)
-		{
-			var entry = entries[idx];
-			cachedEntry = entry;
-			cachedIndex = idx;
-
-			return entry.value;
-		}
-
-		return def;
-	}
-
-	public function exists( key : K ) : Bool
-	{
-		var idx = -1;
-		if (cachedEntry != null && cachedEntry.keyEquals(key) && ( (idx = cachedIndex) != -1 ))
-		{
-			return true;
-		}
-
-		idx = lookup(key);
-		if (idx != -1)
-		{
-			var entry = entries[idx];
-			cachedEntry = entry;
-			cachedIndex = idx;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function remove( key : K ) : Bool
-	{
-		var idx = -1;
-		if ( !(cachedEntry != null && cachedEntry.keyEquals(key) && ( (idx = cachedIndex) != -1 )) )
-		{
-			idx = lookup(key);
-		}
-
-		if (idx == -1)
-		{
-			return false;
-		} else {
-			if (cachedEntry != null && cachedEntry.keyEquals(key))
-			{
-				cachedIndex = -1;
-				cachedEntry = null;
-			}
-
-			hashes[idx] = FLAG_DEL;
-			entries[idx] = null;
-			--size;
-
-			return true;
-		}
-	}
-
-	/**
-		Returns an iterator of all keys in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function keys() : Iterator<K>
-	{
-		var i = 0;
-		var len = nBuckets;
-		var lastKey = null; //keep a strong reference to the key while iterating, so it can't be collected while iterating
-		return {
-			hasNext: function() {
-				for (j in i...len)
-				{
-					if (!isEither(hashes[j]))
-					{
-						var entry = entries[j];
-						var last = entry.Target;
-						if (last != null)
-						{
-							lastKey = last;
-							cachedIndex = i;
-							cachedEntry = entry;
-							i = j;
-							return true;
-						} else {
-							--size;
-							hashes[j] = FLAG_DEL;
-							entries[j] = null;
-						}
-					}
-				}
-				return false;
-			},
-			next: function() {
-				i = i + 1;
-				return lastKey;
-			}
-		};
-	}
-
-	/**
-		Returns an iterator of all values in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function iterator() : Iterator<V>
-	{
-		var i = 0;
-		var len = nBuckets;
-		var lastKey = null; //keep a strong reference to the key while iterating, so it can't be collected while iterating
-		return {
-			hasNext: function() {
-				for (j in i...len)
-				{
-					if (!isEither(hashes[j]))
-					{
-						var entry = entries[j];
-						var last = entry.Target;
-						if (last != null)
-						{
-							lastKey = last;
-							cachedIndex = i;
-							cachedEntry = entry;
-							i = j;
-							return true;
-						} else {
-							--size;
-							hashes[j] = FLAG_DEL;
-							entries[j] = null;
-						}
-					}
-				}
-				return false;
-			},
-			next: function() {
-				var ret = entries[i].value;
-				i = i + 1;
-				return ret;
-			}
-		};
-	}
-
-	/**
-		Returns an displayable representation of the hashtable content.
-	**/
-
-	public function toString() : String {
-		var s = new StringBuf();
-		s.add("{");
-		var it = keys();
-		for( i in it ) {
-			s.add(Std.string(i));
-			s.add(" => ");
-			s.add(Std.string(get(i)));
-			if( it.hasNext() )
-				s.add(", ");
-		}
-		s.add("}");
-		return s.toString();
-	}
-
-	@:extern private static inline function roundUp(x:Int):Int
-	{
-		--x;
-		x |= (x) >>> 1;
-		x |= (x) >>> 2;
-		x |= (x) >>> 4;
-		x |= (x) >>> 8;
-		x |= (x) >>> 16;
-		return ++x;
-	}
-
-	@:extern private static inline function getInc(k:Int, mask:Int):Int //return 1 for linear probing
-		return (((k) >> 3 ^ (k) << 3) | 1) & (mask);
-
-	@:extern private static inline function isEither(v:HashType):Bool
-		return (v & 0xFFFFFFFE) == 0;
-
-	@:extern private static inline function isEmpty(v:HashType):Bool
-		return v == FLAG_EMPTY;
-
-	@:extern private static inline function isDel(v:HashType):Bool
-		return v == FLAG_DEL;
-
-	//guarantee: Whatever this function is, it will never return 0 nor 1
-	@:extern private static inline function hash(s:Dynamic):HashType
-	{
-		var k:Int = untyped s.GetHashCode();
-		//k *= 357913941;
-		//k ^= k << 24;
-		//k += ~357913941;
-		//k ^= k >> 31;
-		//k ^= k << 31;
-
-		// k = (k+0x7ed55d16) + (k<<12);
-		// k = (k^0xc761c23c) ^ (k>>19);
-		// k = (k+0x165667b1) + (k<<5);
-		// k = (k+0xd3a2646c) ^ (k<<9);
-		// k = (k+0xfd7046c5) + (k<<3);
-		// k = (k^0xb55a4f09) ^ (k>>16);
-
-		var ret = k;
-		if (isEither(ret))
-		{
-			if (ret == 0)
-				ret = 2;
-			else
-				ret = 0xFFFFFFFF;
-		}
-
-		return ret;
-	}
-
-	@:extern private static inline function arrayCopy(sourceArray:cs.system.Array, sourceIndex:Int, destinationArray:cs.system.Array, destinationIndex:Int, length:Int):Void
-		cs.system.Array.Copy(sourceArray, sourceIndex, destinationArray, destinationIndex, length);
-
-	@:extern private static inline function assert(x:Bool):Void
-	{
-#if DEBUG_HASHTBL
-		if (!x) throw "assert failed";
-#end
-	}
-}
-
-private class Entry<K,V> extends WeakReference
-{
-	public var value:V;
-	public var hash(default, null):Int;
-	public function new(key:K, value:V, hash:Int)
-	{
-		super(key, false);
-		this.value = value;
-		this.hash = hash;
-	}
-
-	public function reuse(key,hash)
-	{
-		this.Target = key;
-		this.hash = hash;
-	}
-
-	@:final inline public function keyEquals(k:K):Bool
-	{
-		return k != null && untyped k.Equals(Target);
-	}
-}
-
-private typedef HashType = Int;
diff --git a/std/cs/_std/sys/FileSystem.hx b/std/cs/_std/sys/FileSystem.hx
index 52ef590eaf95e2740b81c3e144235a82bae134ee..8b079654bb51e95b159c4bccd7766bf5f95bc8a6 100644
--- a/std/cs/_std/sys/FileSystem.hx
+++ b/std/cs/_std/sys/FileSystem.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys;
+
 import cs.system.io.DirectoryInfo;
 import cs.system.io.File;
 import cs.system.io.Directory;
@@ -27,109 +29,97 @@ import cs.system.io.FileInfo;
 
 @:coreApi
 class FileSystem {
-
-	public static function exists( path : String ) : Bool
-	{
+	public static function exists(path:String):Bool {
 		return (File.Exists(path) || Directory.Exists(path));
 	}
 
-	public static function rename( path : String, newPath : String ) : Void
-	{
+	public static function rename(path:String, newPath:String):Void {
 		Directory.Move(path, newPath);
 	}
 
 	@:access(Date.fromNative)
-	public static function stat( path : String ) : FileStat
-	{
-		if (File.Exists(path))
-		{
+	public static function stat(path:String):FileStat {
+		if (File.Exists(path)) {
 			var fi = new FileInfo(path);
 			return {
-				gid: 0, //C# doesn't let you get this info
-				uid: 0, //same
+				gid: 0, // C# doesn't let you get this info
+				uid: 0, // same
 				atime: Date.fromNative(fi.LastAccessTime),
 				mtime: Date.fromNative(fi.LastWriteTime),
 				ctime: Date.fromNative(fi.CreationTime),
-				size: cast(fi.Length, Int), //TODO: maybe change to Int64 for Haxe 3?
-				dev: 0, //FIXME: not sure what that is
-				ino: 0, //FIXME: not sure what that is
-				nlink: 0, //FIXME: not sure what that is
-				rdev: 0, //FIXME: not sure what that is
-				mode: 0 //FIXME: not sure what that is
+				size: cast(fi.Length, Int), // TODO: maybe change to Int64 for Haxe 3?
+				dev: 0, // FIXME: not sure what that is
+				ino: 0, // FIXME: not sure what that is
+				nlink: 0, // FIXME: not sure what that is
+				rdev: 0, // FIXME: not sure what that is
+				mode: 0 // FIXME: not sure what that is
 			};
 		} else if (Directory.Exists(path)) {
 			var fi = new DirectoryInfo(path);
 			return {
-				gid: 0, //C# doesn't let you get this info
-				uid: 0, //same
+				gid: 0, // C# doesn't let you get this info
+				uid: 0, // same
 				atime: Date.fromNative(fi.LastAccessTime),
 				mtime: Date.fromNative(fi.LastWriteTime),
 				ctime: Date.fromNative(fi.CreationTime),
-				size: 0, //TODO: maybe change to Int64 for Haxe 3?
-				dev: 0, //FIXME: not sure what that is
-				ino: 0, //FIXME: not sure what that is
-				nlink: 0, //FIXME: not sure what that is
-				rdev: 0, //FIXME: not sure what that is
-				mode: 0 //FIXME: not sure what that is
+				size: 0, // TODO: maybe change to Int64 for Haxe 3?
+				dev: 0, // FIXME: not sure what that is
+				ino: 0, // FIXME: not sure what that is
+				nlink: 0, // FIXME: not sure what that is
+				rdev: 0, // FIXME: not sure what that is
+				mode: 0 // FIXME: not sure what that is
 			};
 		} else {
 			throw "Path '" + path + "' doesn't exist";
 		}
-
 	}
 
-	public static function fullPath( relPath : String ) : String
-	{
+	public static function fullPath(relPath:String):String {
 		return new FileInfo(relPath).FullName;
 	}
 
-	public static function absolutePath ( relPath : String ) : String {
-		if (haxe.io.Path.isAbsolute(relPath)) return relPath;
+	public static function absolutePath(relPath:String):String {
+		if (haxe.io.Path.isAbsolute(relPath))
+			return relPath;
 		return haxe.io.Path.join([Sys.getCwd(), relPath]);
 	}
 
-	public static function isDirectory( path : String ) : Bool
-	{
+	public static function isDirectory(path:String):Bool {
 		var isdir = Directory.Exists(path);
 		if (isdir != File.Exists(path))
 			return isdir;
 		throw "Path '" + path + "' doesn't exist";
 	}
 
-	public static function createDirectory( path : String ) : Void
-	{
+	public static function createDirectory(path:String):Void {
 		Directory.CreateDirectory(path);
 	}
 
-	public static function deleteFile( path : String ) : Void
-	{
-		if (!File.Exists(path)) throw "Path '" + path + "' doesn't exist";
+	public static function deleteFile(path:String):Void {
+		if (!File.Exists(path))
+			throw "Path '" + path + "' doesn't exist";
 		File.Delete(path);
 	}
 
-	public static function deleteDirectory( path : String ) : Void
-	{
-		if (!Directory.Exists(path)) throw "Path '" + path + "' doesn't exist";
+	public static function deleteDirectory(path:String):Void {
+		if (!Directory.Exists(path))
+			throw "Path '" + path + "' doesn't exist";
 		Directory.Delete(path);
 	}
 
-	public static function readDirectory( path : String ) : Array<String>
-	{
+	public static function readDirectory(path:String):Array<String> {
 		var ret = Directory.GetFileSystemEntries(path);
-		if (ret.Length > 0)
-		{
+		if (ret.Length > 0) {
 			var fst = ret[0];
 			var sep = "/";
 			if (fst.lastIndexOf(sep) < fst.lastIndexOf("\\"))
 				sep = "\\";
-			for (i in 0...ret.Length)
-			{
+			for (i in 0...ret.Length) {
 				var path = ret[i];
 				ret[i] = path.substr(path.lastIndexOf(sep) + 1);
 			}
 		}
 
-		return cs.Lib.array( ret );
+		return cs.Lib.array(ret);
 	}
-
 }
diff --git a/std/cs/_std/sys/db/Sqlite.hx b/std/cs/_std/sys/db/Sqlite.hx
index ae41d4f7a3df7384a4f831f8f5d814f45456c53d..52d496bdf17e9c91c6528a154d34f87989e39ea4 100644
--- a/std/cs/_std/sys/db/Sqlite.hx
+++ b/std/cs/_std/sys/db/Sqlite.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,37 +19,28 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package sys.db;
 
-class Sqlite
-{
+package sys.db;
+
+class Sqlite {
 	static var type:Class<cs.system.data.IDbConnection>;
-	/**
-		Opens a new SQLite connection on the specified path.
-		Note that you will need a SQLite ADO.NET Provider (see http://www.mono-project.com/docs/database-access/providers/sqlite/).
-		Also note that this will try to open an assembly named `Mono.Data.Sqlite` if it wasn't loaded yet.
-	**/
-	public static function open(file:String):sys.db.Connection
-	{
+
+	public static function open(file:String):sys.db.Connection {
 		var cnxString = 'Data Source=$file';
-		if (type == null)
-		{
+		if (type == null) {
 			var t = null;
 			var assemblies = cs.system.AppDomain.CurrentDomain.GetAssemblies();
-			for (i in 0...assemblies.Length)
-			{
+			for (i in 0...assemblies.Length) {
 				var a = assemblies[i];
 				t = a.GetType('Mono.Data.Sqlite.SqliteConnection');
 				if (t == null)
 					t = a.GetType('System.Data.SQLite.SQLiteConnection');
-				if (t != null)
-				{
+				if (t != null) {
 					break;
 				}
 			}
 
-			if (t == null)
-			{
+			if (t == null) {
 				var asm = cs.system.reflection.Assembly.Load('Mono.Data.Sqlite');
 				t = asm.GetType('Mono.Data.Sqlite.SqliteConnection');
 			}
@@ -58,12 +49,11 @@ class Sqlite
 				type = cast cs.Lib.fromNativeType(t);
 		}
 
-		if (type == null)
-		{
+		if (type == null) {
 			throw "No ADO.NET SQLite provider was found!";
 		}
-		var ret = Type.createInstance(type,[cnxString]);
+		var ret = Type.createInstance(type, [cnxString]);
 		ret.Open();
-		return cs.db.AdoNet.create(ret,'SQLite');
+		return cs.db.AdoNet.create(ret, 'SQLite');
 	}
 }
diff --git a/std/cs/_std/sys/io/File.hx b/std/cs/_std/sys/io/File.hx
index 10e84f4a555a01cefe1fe5c68692e165b080dba7..6736085bd65b7d0be1bf982943d3684b2594f1ca 100644
--- a/std/cs/_std/sys/io/File.hx
+++ b/std/cs/_std/sys/io/File.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,44 +19,39 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 @:coreApi
 class File {
-
-	public static function getContent( path : String ) : String
-	{
+	public static function getContent(path:String):String {
 		var f = read(path, false);
 		var ret = f.readAll().toString();
 		f.close();
 		return ret;
 	}
 
-	public static function saveContent( path : String, content : String ) : Void
-	{
+	public static function saveContent(path:String, content:String):Void {
 		var f = write(path, false);
 		f.writeString(content);
 		f.close();
 	}
 
-	public static function getBytes( path : String ) : haxe.io.Bytes
-	{
+	public static function getBytes(path:String):haxe.io.Bytes {
 		var f = read(path, true);
 		var ret = f.readAll();
 		f.close();
 		return ret;
 	}
 
-	public static function saveBytes( path : String, bytes : haxe.io.Bytes ) : Void
-	{
+	public static function saveBytes(path:String, bytes:haxe.io.Bytes):Void {
 		var f = write(path, true);
 		f.writeBytes(bytes, 0, bytes.length);
 		f.close();
 	}
 
-	public static function read( path : String, binary : Bool = true ) : FileInput
-	{
-		#if std_buffer //standardize 4kb buffers
+	public static function read(path:String, binary:Bool = true):FileInput {
+		#if std_buffer // standardize 4kb buffers
 		var stream = new cs.system.io.FileStream(path, Open, Read, ReadWrite, 4096);
 		#else
 		var stream = new cs.system.io.FileStream(path, Open, Read, ReadWrite);
@@ -64,9 +59,8 @@ class File {
 		return new FileInput(stream);
 	}
 
-	public static function write( path : String, binary : Bool = true ) : FileOutput
-	{
-		#if std_buffer //standardize 4kb buffers
+	public static function write(path:String, binary:Bool = true):FileOutput {
+		#if std_buffer // standardize 4kb buffers
 		var stream = new cs.system.io.FileStream(path, Create, Write, ReadWrite, 4096);
 		#else
 		var stream = new cs.system.io.FileStream(path, Create, Write, ReadWrite);
@@ -74,9 +68,8 @@ class File {
 		return new FileOutput(stream);
 	}
 
-	public static function append( path : String, binary : Bool = true ) : FileOutput
-	{
-		#if std_buffer //standardize 4kb buffers
+	public static function append(path:String, binary:Bool = true):FileOutput {
+		#if std_buffer // standardize 4kb buffers
 		var stream = new cs.system.io.FileStream(path, Append, Write, ReadWrite, 4096);
 		#else
 		var stream = new cs.system.io.FileStream(path, Append, Write, ReadWrite);
@@ -84,8 +77,19 @@ class File {
 		return new FileOutput(stream);
 	}
 
-	public static function copy( srcPath : String, dstPath : String ) : Void
-	{
-		cs.system.io.File.Copy(srcPath, dstPath);
+	public static function update(path:String, binary:Bool = true):FileOutput {
+		if (!FileSystem.exists(path)) {
+			write(path).close();
+		}
+		#if std_buffer // standardize 4kb buffers
+		var stream = new cs.system.io.FileStream(path, OpenOrCreate, Write, ReadWrite, 4096);
+		#else
+		var stream = new cs.system.io.FileStream(path, OpenOrCreate, Write, ReadWrite);
+		#end
+		return new FileOutput(stream);
+	}
+
+	public static function copy(srcPath:String, dstPath:String):Void {
+		cs.system.io.File.Copy(srcPath, dstPath, true);
 	}
 }
diff --git a/std/cs/_std/sys/io/FileInput.hx b/std/cs/_std/sys/io/FileInput.hx
index 51c1d1a5af24b902461b94c60266a2a9bedb2367..1d87218a08ac7ab554f5b080ae72deb3b84982cc 100644
--- a/std/cs/_std/sys/io/FileInput.hx
+++ b/std/cs/_std/sys/io/FileInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 class FileInput extends cs.io.NativeInput {
-	public function new(stream:cs.system.io.FileStream)
-	{
+	public function new(stream:cs.system.io.FileStream) {
 		super(stream);
 	}
 }
diff --git a/std/cs/_std/sys/io/FileOutput.hx b/std/cs/_std/sys/io/FileOutput.hx
index b58bdb21409ad7322a083f02043a12055cf0b54e..400e749a973a89baa195cad54b28bfb782b542d8 100644
--- a/std/cs/_std/sys/io/FileOutput.hx
+++ b/std/cs/_std/sys/io/FileOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 class FileOutput extends cs.io.NativeOutput {
-	public function new(stream:cs.system.io.FileStream)
-	{
+	public function new(stream:cs.system.io.FileStream) {
 		super(stream);
 	}
 }
diff --git a/std/cs/_std/sys/io/Process.hx b/std/cs/_std/sys/io/Process.hx
index 71f49b481b7dccf46c51740296dd6aa4ddb26355..63e473e3e5ab6bf59233cd666437ee6f707f5153 100644
--- a/std/cs/_std/sys/io/Process.hx
+++ b/std/cs/_std/sys/io/Process.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
+
 import haxe.io.BytesInput;
 import cs.system.io.StreamReader;
 import cs.system.io.StreamWriter;
@@ -28,15 +30,15 @@ import cs.system.diagnostics.ProcessStartInfo as NativeStartInfo;
 
 @:coreApi
 class Process {
-
-	public var stdout(default,null) : haxe.io.Input;
-	public var stderr(default,null) : haxe.io.Input;
-	public var stdin(default, null) : haxe.io.Output;
+	public var stdout(default, null):haxe.io.Input;
+	public var stderr(default, null):haxe.io.Input;
+	public var stdin(default, null):haxe.io.Output;
 
 	private var native:NativeProcess;
 
-	public function new( cmd : String, ?args : Array<String> ) : Void
-	{
+	public function new(cmd:String, ?args:Array<String>, ?detached:Bool):Void {
+		if (detached)
+			throw "Detached process is not supported on this platform";
 		this.native = createNativeProcess(cmd, args);
 		native.Start();
 
@@ -46,7 +48,7 @@ class Process {
 	}
 
 	@:allow(Sys)
-	private static function createNativeProcess( cmd : String, ?args : Array<String> ) : NativeProcess {
+	private static function createNativeProcess(cmd:String, ?args:Array<String>):NativeProcess {
 		var native = new NativeProcess();
 		native.StartInfo.CreateNoWindow = true;
 		native.StartInfo.RedirectStandardError = native.StartInfo.RedirectStandardInput = native.StartInfo.RedirectStandardOutput = true;
@@ -62,7 +64,7 @@ class Process {
 				case "Windows":
 					native.StartInfo.FileName = switch (Sys.getEnv("COMSPEC")) {
 						case null: "cmd.exe";
-						case comspec: comspec;
+						case var comspec: comspec;
 					}
 					native.StartInfo.Arguments = '/C "$cmd"';
 				case _:
@@ -79,7 +81,7 @@ class Process {
 			case "Windows":
 				[
 					for (a in args)
-					StringTools.quoteWinArg(a, false)
+						haxe.SysTools.quoteWinArg(a, false)
 				].join(" ");
 			case _:
 				// mono uses a slightly different quoting/escaping rule...
@@ -93,7 +95,7 @@ class Process {
 							switch (c) {
 								case '"'.code | '\\'.code:
 									b.addChar('\\'.code);
-								case _: //pass
+								case _: // pass
 							}
 							b.addChar(c);
 						}
@@ -104,27 +106,22 @@ class Process {
 		}
 	}
 
-	public function getPid() : Int
-	{
+	public function getPid():Int {
 		return native.Id;
 	}
 
-	public function exitCode( block : Bool = true ) : Null<Int>
-	{
-		if( block == false && !native.HasExited )
+	public function exitCode(block:Bool = true):Null<Int> {
+		if (block == false && !native.HasExited)
 			return null;
 		native.WaitForExit();
 		return native.ExitCode;
 	}
 
-	public function close() : Void
-	{
+	public function close():Void {
 		native.Close();
 	}
 
-	public function kill() : Void
-	{
+	public function kill():Void {
 		native.Kill();
 	}
-
 }
diff --git a/std/cs/_std/sys/net/Host.hx b/std/cs/_std/sys/net/Host.hx
index 6e02ef9f42127a0d22b96c5d2bba6e5d58e953cb..fc2b10e3873132d744af908643892ff5565dbb0c 100644
--- a/std/cs/_std/sys/net/Host.hx
+++ b/std/cs/_std/sys/net/Host.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- 
+
 package sys.net;
 
 import cs.system.Array;
@@ -30,32 +30,20 @@ import cs.system.net.sockets.AddressFamily;
 import haxe.io.Bytes;
 import haxe.io.BytesInput;
 
-/**
-	A given IP host name.
-**/
 @:coreapi
 class Host {
-	public var hostEntry(default, null) : IPHostEntry;
-	public var ipAddress(default, null) : IPAddress;
+	public var hostEntry(default, null):IPHostEntry;
+	public var ipAddress(default, null):IPAddress;
+
+	public var host(default, null):String;
 
-	/**
-		The provided host string.
-	**/
-	var host(default,null) : String;
+	public var ip(get, null):Int;
 
-	/**
-		The actual IP corresponding to the host.
-	**/
-	public var ip(get, null) : Int;
-	private function get_ip() : Int {
-		return new BytesInput(Bytes.ofData( ipAddress.GetAddressBytes() )).readInt32();
+	private function get_ip():Int {
+		return new BytesInput(Bytes.ofData(ipAddress.GetAddressBytes())).readInt32();
 	}
 
-	/**
-		Creates a new Host : the name can be an IP in the form "127.0.0.1" or an host name such as "google.com", in which case
-		the corresponding IP address is resolved using DNS. An exception occur if the host name could not be found.
-	**/
-	public function new( name : String ) : Void {
+	public function new(name:String):Void {
 		host = name;
 		hostEntry = Dns.GetHostEntry(name);
 		for (i in 0...hostEntry.AddressList.Length) {
@@ -66,25 +54,15 @@ class Host {
 		}
 	}
 
-	/**
-		Returns the IP representation of the host
-	**/
-	public function toString() : String {
+	public function toString():String {
 		return ipAddress.ToString();
 	}
 
-	/**
-		Perform a reverse-DNS query to resolve a host name from an IP.
-	**/
-	public function reverse() : String {
+	public function reverse():String {
 		return hostEntry.HostName;
 	}
 
-	/**
-		Returns the local computer host name
-	**/
-	static public function localhost() : String {
+	static public function localhost():String {
 		return Dns.GetHostName();
 	}
-
 }
diff --git a/std/cs/_std/sys/net/Socket.hx b/std/cs/_std/sys/net/Socket.hx
index 65f7d5e4479f326c898aa62d3478fe1ca420f2a6..f3e24f9add99297489b6f3f9e117757b1dd3caae 100644
--- a/std/cs/_std/sys/net/Socket.hx
+++ b/std/cs/_std/sys/net/Socket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,9 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- 
+
 package sys.net;
 
+import cs.NativeArray;
+import cs.system.collections.ArrayList;
 import cs.system.net.IPEndPoint;
 import cs.system.net.sockets.AddressFamily;
 import cs.system.net.sockets.NetworkStream;
@@ -30,179 +32,151 @@ import cs.system.net.sockets.SocketFlags;
 import cs.system.net.sockets.SocketShutdown;
 import cs.system.net.sockets.SocketType;
 import cs.system.threading.Thread;
+import cs.system.net.sockets.Socket in NativeSocket;
 import haxe.io.Bytes;
 import haxe.io.Error;
 import haxe.io.Input;
 import haxe.io.Output;
 
-/**
-	A TCP socket class : allow you to both connect to a given server and exchange messages or start your own server and wait for connections.
-**/
-@:coreapi
+@:coreApi
 class Socket {
-	private var sock : cs.system.net.sockets.Socket = null;
-
-	/**
-		The stream on which you can read available data. By default the stream is blocking until the requested data is available,
-		use `setBlocking(false)` or `setTimeout` to prevent infinite waiting.
-	**/
-	public var input(default,null) : haxe.io.Input;
-
-	/**
-		The stream on which you can send data. Please note that in case the output buffer you will block while writing the data, use `setBlocking(false)` or `setTimeout` to prevent that.
-	**/
-	public var output(default,null) : haxe.io.Output;
-
-	/**
-		A custom value that can be associated with the socket. Can be used to retrieve your custom infos after a `select`.
-	***/
-	public var custom : Dynamic;
-
-	/**
-		Creates a new unconnected socket.
-	**/
-	public function new() : Void {
-		sock = new cs.system.net.sockets.Socket( AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp );
+	private var sock:NativeSocket = null;
+
+	public var input(default, null):haxe.io.Input;
+
+	public var output(default, null):haxe.io.Output;
+
+	public var custom:Dynamic;
+
+	public function new():Void {
+		sock = new NativeSocket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
 		sock.Blocking = true;
 	}
 
-	/**
-		Closes the socket : make sure to properly close all your sockets or you will crash when you run out of file descriptors.
-	**/
-	public function close() : Void {
+	public function close():Void {
 		sock.Close();
 		input = null;
 		output = null;
 	}
 
-	/**
-		Read the whole data available on the socket.
-	**/
-	public function read() : String {
+	public function read():String {
 		return input.readAll().toString();
 	}
 
-	/**
-		Write the whole data to the socket output.
-	**/
-	public function write( content : String ) : Void {
-		output.writeString( content );
+	public function write(content:String):Void {
+		output.writeString(content);
 	}
 
-	/**
-		Connect to the given server host/port. Throw an exception in case we couldn't successfully connect.
-	**/
-	public function connect( host : Host, port : Int ) : Void {
-		sock.Connect( host.ipAddress, port );
+	public function connect(host:Host, port:Int):Void {
+		sock.Connect(host.ipAddress, port);
 		if (sock.Connected) {
-			this.output = new cs.io.NativeOutput( new NetworkStream(sock) );
-			this.input = new cs.io.NativeInput( new NetworkStream(sock) );
+			this.output = new cs.io.NativeOutput(new NetworkStream(sock));
+			this.input = new cs.io.NativeInput(new NetworkStream(sock));
 		} else {
 			throw "Connection failed.";
 		}
 	}
 
-	/**
-		Allow the socket to listen for incoming questions. The parameter tells how many pending connections we can have until they get refused. Use `accept()` to accept incoming connections.
-	**/
-	public function listen( connections : Int ) : Void {
-		sock.Listen( connections );
+	public function listen(connections:Int):Void {
+		sock.Listen(connections);
 	}
 
-	/**
-		Shutdown the socket, either for reading or writing.
-	**/
-	public function shutdown( read : Bool, write : Bool ) : Void {
-		if ( read && write ) {
-			sock.Shutdown( SocketShutdown.Both );
+	public function shutdown(read:Bool, write:Bool):Void {
+		if (read && write) {
+			sock.Shutdown(SocketShutdown.Both);
 			input = null;
 			output = null;
-		} else if ( read ) {
-			sock.Shutdown( SocketShutdown.Receive );
+		} else if (read) {
+			sock.Shutdown(SocketShutdown.Receive);
 			input = null;
-		} else if ( write ) {
-			sock.Shutdown( SocketShutdown.Send );
+		} else if (write) {
+			sock.Shutdown(SocketShutdown.Send);
 			output = null;
 		}
 	}
 
-	/**
-		Bind the socket to the given host/port so it can afterwards listen for connections there.
-	**/
-	public function bind( host : Host, port : Int ) : Void {
-		sock = new cs.system.net.sockets.Socket( AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp );
-		sock.Bind( new IPEndPoint(host.ipAddress, port) );
+	public function bind(host:Host, port:Int):Void {
+		sock = new NativeSocket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+		sock.Bind(new IPEndPoint(host.ipAddress, port));
 	}
 
-	/**
-		Accept a new connected client. This will return a connected socket on which you can read/write some data.
-	**/
-	public function accept() : Socket {
+	public function accept():Socket {
 		var r = new Socket();
 		r.sock = sock.Accept();
-		r.output = new cs.io.NativeOutput( new NetworkStream(r.sock) );
-		r.input = new cs.io.NativeInput( new NetworkStream(r.sock) );
+		r.output = new cs.io.NativeOutput(new NetworkStream(r.sock));
+		r.input = new cs.io.NativeInput(new NetworkStream(r.sock));
 		return r;
 	}
 
-	/**
-		Return the information about the other side of a connected socket.
-	**/
-	public function peer() : { host : Host, port : Int } {
+	public function peer():{host:Host, port:Int} {
 		var remoteIP = cast(sock.RemoteEndPoint, IPEndPoint);
-		return { host: new Host(remoteIP.Address.ToString()), port: remoteIP.Port };
+		return {host: new Host(remoteIP.Address.ToString()), port: remoteIP.Port};
 	}
 
-	/**
-		Return the information about our side of a connected socket.
-	**/
-	public function host() : { host : Host, port : Int } {
+	public function host():{host:Host, port:Int} {
 		var localIP = cast(sock.LocalEndPoint, IPEndPoint);
-		return { host: new Host(localIP.Address.ToString()), port: localIP.Port };
+		return {host: new Host(localIP.Address.ToString()), port: localIP.Port};
 	}
 
-	/**
-		Gives a timeout after which blocking socket operations (such as reading and writing) will abort and throw an exception.
-	**/
-	public function setTimeout( timeout : Float ) : Void {
+	public function setTimeout(timeout:Float):Void {
 		sock.ReceiveTimeout = sock.SendTimeout = Math.round(timeout * 1000);
 	}
 
-	/**
-		Block until some data is available for read on the socket.
-	**/
-	public function waitForRead() : Void {
+	public function waitForRead():Void {
 		var end = Date.now().getTime() + ((sock.ReceiveTimeout <= 0) ? Math.POSITIVE_INFINITY : sock.ReceiveTimeout);
-		while ( sock.Available == 0 && Date.now().getTime() < end) {
+		while (sock.Available == 0 && Date.now().getTime() < end) {
 			Thread.Sleep(5);
 		}
 	}
 
-	/**
-		Change the blocking mode of the socket. A blocking socket is the default behavior. A non-blocking socket will abort blocking operations immediately by throwing a haxe.io.Error.Blocking value.
-	**/
-	public function setBlocking( b : Bool ) : Void {
+	public function setBlocking(b:Bool):Void {
 		sock.Blocking = b;
 	}
 
-	/**
-		Allows the socket to immediately send the data when written to its output : this will cause less ping but might increase the number of packets / data size, especially when doing a lot of small writes.
-	**/
-	public function setFastSend( b : Bool ) : Void {
+	public function setFastSend(b:Bool):Void {
 		sock.NoDelay = b;
 	}
 
-	/**
-		Wait until one of the sockets groups is ready for the given operation :
-		* `read` contains sockets on which we want to wait for available data to be read,
-		* `write` contains sockets on which we want to wait until we are allowed to write some data to their output buffers,
-		* `others` contains sockets on which we want to wait for exceptional conditions.
-		* `select` will block until one of the condition is met, in which case it will return the sockets for which the condition was true.
-		In case a `timeout` (in seconds) is specified, select might wait at worse until the timeout expires.
-	**/
-	static public function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float) : { read: Array<Socket>,write: Array<Socket>,others: Array<Socket> } {
-		throw "Not implemented yet.";
-		return null;
-	}
+	static public function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+			?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>} {
+		var map:Map<Int, Socket> = new Map();
+		inline function addSockets(sockets:Array<Socket>) {
+			if (sockets != null)
+				for (s in sockets)
+					map[s.sock.Handle.ToInt32()] = s;
+		}
+		inline function getRaw(sockets:Array<Socket>):ArrayList {
+			var a = new ArrayList(sockets == null ? 0 : sockets.length);
+			if (sockets != null)
+				for (s in sockets) {
+					a.Add(s.sock);
+				}
+			return a;
+		}
+		inline function getOriginal(result:ArrayList) {
+			var a:Array<Socket> = [];
+			for (i in 0...result.Count) {
+				var s:NativeSocket = result[i];
+				a.push(map[s.Handle.ToInt32()]);
+			}
+			return a;
+		}
 
+		addSockets(read);
+		addSockets(write);
+		addSockets(others);
+
+		// unwrap Sockets into native sockets
+		var rawRead:ArrayList = getRaw(read),
+			rawWrite:ArrayList = getRaw(write),
+			rawOthers:ArrayList = getRaw(others);
+		var microsec = timeout == null ? -1 : Std.int(timeout * 1000000);
+		NativeSocket.Select(rawRead, rawWrite, rawOthers, microsec);
+		// convert native sockets back to Socket objects
+		return {
+			read: getOriginal(rawRead),
+			write: getOriginal(rawWrite),
+			others: getOriginal(rawOthers),
+		}
+	}
 }
diff --git a/std/cs/_std/sys/thread/Deque.hx b/std/cs/_std/sys/thread/Deque.hx
new file mode 100644
index 0000000000000000000000000000000000000000..09f1b59fd6887cd4c4af94678b02324243c9078b
--- /dev/null
+++ b/std/cs/_std/sys/thread/Deque.hx
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+import cs.system.threading.ManualResetEvent;
+import cs.Lib;
+
+@:coreApi class Deque<T> {
+	final storage:Array<T> = [];
+	final lockObj = {};
+	final addEvent = new ManualResetEvent(false);
+
+	public function new():Void {}
+
+	public function add(i:T):Void {
+		Lib.lock(lockObj, {
+			storage.push(i);
+			addEvent.Set();
+		});
+	}
+
+	public function push(i:T):Void {
+		Lib.lock(lockObj, {
+			storage.unshift(i);
+			addEvent.Set();
+		});
+	}
+
+	public function pop(block:Bool):Null<T> {
+		do {
+			Lib.lock(lockObj, {
+				if (storage.length > 0) {
+					return storage.shift();
+				}
+				addEvent.Reset();
+			});
+		} while (block && addEvent.WaitOne());
+		return null;
+	}
+}
diff --git a/std/cs/_std/sys/thread/Lock.hx b/std/cs/_std/sys/thread/Lock.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e7c79d7f9e4705e8b5102de8a8a32a756526ec0b
--- /dev/null
+++ b/std/cs/_std/sys/thread/Lock.hx
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+import haxe.Timer;
+import cs.Lib;
+import cs.system.threading.ManualResetEvent;
+
+class Lock {
+	final lockObj = {};
+	final releaseEvent = new ManualResetEvent(false);
+
+	var waitCount = 1; // initially locked
+	var releaseCount = 0;
+
+	public function new():Void {}
+
+	public function wait(?timeout:Float):Bool {
+		var myTicket;
+		// Get a ticket in queue
+		Lib.lock(lockObj, {
+			myTicket = waitCount;
+			waitCount++;
+			if (myTicket <= releaseCount) {
+				return true;
+			}
+			releaseEvent.Reset();
+		});
+
+		if (timeout == null) {
+			do {
+				releaseEvent.WaitOne();
+				if (myTicket <= releaseCount) {
+					return true;
+				}
+			} while (true);
+		} else {
+			var timeoutStamp = Timer.stamp() + timeout;
+			do {
+				var secondsLeft = timeoutStamp - Timer.stamp();
+				if (secondsLeft <= 0 || !releaseEvent.WaitOne(Std.int(secondsLeft * 1000))) {
+					// Timeout. Do not occupy a place in queue anymore
+					release();
+					return false;
+				}
+				if (myTicket <= releaseCount) {
+					return true;
+				}
+			} while (true);
+		}
+	}
+
+	public function release():Void {
+		Lib.lock(lockObj, {
+			releaseCount++;
+			releaseEvent.Set();
+		});
+	}
+}
diff --git a/std/cs/_std/sys/thread/Mutex.hx b/std/cs/_std/sys/thread/Mutex.hx
new file mode 100644
index 0000000000000000000000000000000000000000..184f9d837e5e8190070108f28a1a988ed4be317d
--- /dev/null
+++ b/std/cs/_std/sys/thread/Mutex.hx
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+import cs.system.threading.Mutex as NativeMutex;
+
+class Mutex {
+	final native = new NativeMutex();
+
+	public function new():Void {}
+
+	public function acquire():Void {
+		native.WaitOne();
+	}
+
+	public function tryAcquire():Bool {
+		return native.WaitOne(0);
+	}
+
+	public function release():Void {
+		native.ReleaseMutex();
+	}
+}
diff --git a/std/cs/_std/sys/thread/Thread.hx b/std/cs/_std/sys/thread/Thread.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d2765a1a0877e47a58bf6be169b047da392cba7d
--- /dev/null
+++ b/std/cs/_std/sys/thread/Thread.hx
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+import cs.system.threading.Thread as NativeThread;
+import cs.system.WeakReference;
+import cs.Lib;
+
+abstract Thread(HaxeThread) {
+	inline function new(thread:HaxeThread) {
+		this = thread;
+	}
+
+	public static function create(cb:Void->Void):Thread {
+		var native = new NativeThread(cb);
+		native.IsBackground = true;
+		var hx = HaxeThread.allocate(native);
+		native.Start();
+
+		return new Thread(hx);
+	}
+
+	public static inline function current():Thread {
+		return new Thread(HaxeThread.get(NativeThread.CurrentThread));
+	}
+
+	public static function readMessage(block:Bool):Dynamic {
+		return current().readMessageImpl(block);
+	}
+
+	public inline function sendMessage(msg:Dynamic):Void {
+		this.sendMessage(msg);
+	}
+
+	inline function readMessageImpl(block:Bool):Dynamic {
+		return this.readMessage(block);
+	}
+}
+
+private class HaxeThread {
+	static final threads = new Map<Int, WeakReference>();
+	static var allocateCount = 0;
+
+	public final native:NativeThread;
+
+	final messages = new Deque<Dynamic>();
+
+	public static function get(native:NativeThread):HaxeThread {
+		var native = NativeThread.CurrentThread;
+		var ref:Null<WeakReference> = null;
+		Lib.lock(threads, {
+			var key = native.ManagedThreadId;
+			ref = threads.get(key);
+		});
+		if (ref == null || !ref.IsAlive) {
+			return allocate(native);
+		}
+		return ref.Target;
+	}
+
+	public static function allocate(native:NativeThread):HaxeThread {
+		allocateCount++;
+		inline function cleanup() {
+			if (allocateCount % 100 == 0) {
+				for (key => ref in threads) {
+					if (!ref.IsAlive) {
+						threads.remove(key);
+					}
+				}
+			}
+		}
+		var hx = new HaxeThread(native);
+		var ref = new WeakReference(hx);
+		Lib.lock(threads, {
+			cleanup();
+			threads.set(native.ManagedThreadId, ref);
+		});
+		return hx;
+	}
+
+	public function new(native:NativeThread) {
+		this.native = native;
+	}
+
+	public inline function readMessage(block:Bool):Dynamic {
+		return messages.pop(block);
+	}
+
+	public function sendMessage(msg:Dynamic):Void {
+		messages.add(msg);
+	}
+}
diff --git a/std/cs/_std/sys/thread/Tls.hx b/std/cs/_std/sys/thread/Tls.hx
new file mode 100644
index 0000000000000000000000000000000000000000..13c77a1bd29fac74b26f6467a9b2f3bd4f6a05a0
--- /dev/null
+++ b/std/cs/_std/sys/thread/Tls.hx
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+import cs.system.threading.Thread as NativeThread;
+import cs.system.LocalDataStoreSlot;
+
+class Tls<T> {
+	public var value(get, set):T;
+
+	final slot:LocalDataStoreSlot;
+
+	public function new():Void {
+		slot = NativeThread.GetNamedDataSlot('__hx__Tls');
+	}
+
+	function get_value():T {
+		return NativeThread.GetData(slot);
+	}
+
+	function set_value(value:T):T {
+		NativeThread.SetData(slot, value);
+		return value;
+	}
+}
diff --git a/std/cs/db/AdoNet.hx b/std/cs/db/AdoNet.hx
index 0d32b25b25711251d6076e351616ad621ffb17f7..98fbdb3bdb2eb685abd67d68ccc8c58fedd6a9df 100644
--- a/std/cs/db/AdoNet.hx
+++ b/std/cs/db/AdoNet.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,33 +19,32 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cs.db;
+
+package cs.db;
+
 import sys.db.*;
 import cs.system.data.*;
 
-class AdoNet
-{
-	public static function create(cnx:IDbConnection, dbName:String):Connection
-	{
-		return new AdoConnection(cnx,dbName);
+class AdoNet {
+	public static function create(cnx:IDbConnection, dbName:String):Connection {
+		return new AdoConnection(cnx, dbName);
 	}
 }
 
-private class AdoConnection implements Connection
-{
+private class AdoConnection implements Connection {
 	private static var ids = 0;
+
 	private var id:Int;
 
 	private var cnx:IDbConnection;
-	//escape handling
+	// escape handling
 	private var escapeRegex:EReg;
 	private var escapes:Array<IDbDataParameter>;
 	private var name:String;
 	private var command:IDbCommand;
 	private var transaction:IDbTransaction;
 
-	public function new(cnx,name:String)
-	{
+	public function new(cnx, name:String) {
 		this.id = cs.system.threading.Interlocked.Increment(ids);
 		this.cnx = cnx;
 		this.name = name;
@@ -54,49 +53,43 @@ private class AdoConnection implements Connection
 		this.escapeRegex = ~/@HX_ESCAPE(\d+)_(\d+)/;
 	}
 
-	public function close() : Void
-	{
+	public function close():Void {
 		cnx.Close();
 	}
 
-	public function escape(s:String):String
-	{
+	public function escape(s:String):String {
 		var param = command.CreateParameter();
-		var name = "@HX_ESCAPE" + id + "_" +escapes.push(param) + "";
+		var name = "@HX_ESCAPE" + id + "_" + escapes.push(param) + "";
 		param.ParameterName = name;
 		param.Value = s;
 		return name;
 	}
 
-	public function quote(s:String):String
-	{
+	public function quote(s:String):String {
 		var param = command.CreateParameter();
-		var name = "@HX_ESCAPE" + id + "_" +escapes.push(param) + "";
+		var name = "@HX_ESCAPE" + id + "_" + escapes.push(param) + "";
 		param.ParameterName = name;
 		param.Value = s;
 		return name;
 	}
 
-	public function addValue(s:StringBuf, v:Dynamic)
-	{
-		if (Std.is(v, Date))
-		{
+	public function addValue(s:StringBuf, v:Dynamic) {
+		if (Std.is(v, Date)) {
 			v = Std.string(v);
 		} else if (Std.is(v, haxe.io.Bytes)) {
 			var bt:haxe.io.Bytes = v;
 			v = bt.getData();
 		}
 		var param = command.CreateParameter();
-		var name = "@HX_ESCAPE" + id + "_" +escapes.push(param) + "";
+		var name = "@HX_ESCAPE" + id + "_" + escapes.push(param) + "";
 		param.ParameterName = name;
 		param.Value = v;
 		s.add(name);
 	}
 
-	public function lastInsertId():Int
-	{
+	public function lastInsertId():Int {
 		var ret = cnx.CreateCommand();
-		ret.CommandText = switch(name) {
+		ret.CommandText = switch (name) {
 			case 'SQLite':
 				'SELECT last_insert_rowid()';
 			case _:
@@ -109,69 +102,65 @@ private class AdoConnection implements Connection
 		return r;
 	}
 
-	public function dbName() : String
-	{
+	public function dbName():String {
 		return name;
 	}
 
-	public function startTransaction() : Void
-	{
+	public function startTransaction():Void {
 		if (this.transaction != null)
 			throw 'Transaction already active';
 		this.transaction = cnx.BeginTransaction();
 	}
 
-	public function commit() : Void
-	{
+	public function commit():Void {
 		if (this.transaction == null)
 			throw 'No transaction was initiated';
 		this.transaction.Commit();
 	}
 
-	public function rollback() : Void
-	{
+	public function rollback():Void {
 		if (this.transaction == null)
 			throw 'No transaction was initiated';
 		this.transaction.Rollback();
 	}
 
-	private static function getFirstStatement(s:String)
-	{
+	private static function getFirstStatement(s:String) {
 		var buf = new StringBuf();
 		var hasData = false;
-		var chr = 0,
-				i = 0;
-		inline function getch() return chr = StringTools.fastCodeAt(s,i++);
-		while ( !StringTools.isEof(getch()) )
-		{
-			inline function peek() { var c = StringTools.fastCodeAt(s,i); if (StringTools.isEof(c)) break; return c; }
-			switch(chr)
-			{
+		var chr = 0, i = 0;
+		inline function getch()
+			return chr = StringTools.fastCodeAt(s, i++);
+		while (!StringTools.isEof(getch())) {
+			inline function peek() {
+				var c = StringTools.fastCodeAt(s, i);
+				if (StringTools.isEof(c))
+					break;
+				return c;
+			}
+			switch (chr) {
 				case ' '.code | '\t'.code | '\n'.code:
 					if (hasData)
 						return buf.toString();
 				case '-'.code if (peek() == '-'.code):
 					if (hasData)
 						return buf.toString();
-					while (!StringTools.isEof(getch()))
-					{
-						if (chr == '\n'.code) break;
+					while (!StringTools.isEof(getch())) {
+						if (chr == '\n'.code)
+							break;
 					}
 				case '#'.code:
 					if (hasData)
 						return buf.toString();
-					while (!StringTools.isEof(getch()))
-					{
-						if (chr == '\n'.code) break;
+					while (!StringTools.isEof(getch())) {
+						if (chr == '\n'.code)
+							break;
 					}
 				case '/'.code if (peek() == '*'.code):
 					i++;
 					if (hasData)
 						return buf.toString();
-					while (!StringTools.isEof(getch()))
-					{
-						if (chr == '*'.code && peek() == '/'.code)
-						{
+					while (!StringTools.isEof(getch())) {
+						if (chr == '*'.code && peek() == '/'.code) {
 							i++;
 							break;
 						}
@@ -184,31 +173,29 @@ private class AdoConnection implements Connection
 		return buf.toString();
 	}
 
-	public function request( s : String ) : ResultSet
-	{
+	public function request(s:String):ResultSet {
 		var newst = new StringBuf();
-		//cycle through the request string, adding any @HX_ESCAPE reference to the command
+		// cycle through the request string, adding any @HX_ESCAPE reference to the command
 		var ret:ResultSet = null;
 		var r = escapeRegex;
 		var myid = id + "", escapes = escapes, elen = escapes.length;
 		var cmd = this.command;
-		try
-		{
-			while (r.match(s))
-			{
+		try {
+			while (r.match(s)) {
 				var id = r.matched(1);
-#if debug
-				if (id != myid) throw "Request quotes are only valid for one single request; They can't be cached.";
-#end
+				#if debug
+				if (id != myid)
+					throw "Request quotes are only valid for one single request; They can't be cached.";
+				#end
 
 				newst.add(r.matchedLeft());
 				var eid = Std.parseInt(r.matched(2));
-#if debug
+				#if debug
 				if (eid == null || eid > elen)
 					throw "Invalid request quote ID " + eid;
-#end
+				#end
 				cmd.Parameters.Add(escapes[eid - 1]);
-				newst.add(escapes[eid-1].ParameterName);
+				newst.add(escapes[eid - 1].ParameterName);
 				s = r.matchedRight();
 			}
 			newst.add(s);
@@ -217,9 +204,8 @@ private class AdoConnection implements Connection
 			cmd.CommandText = s;
 
 			var stmt = getFirstStatement(s).toLowerCase();
-			if (stmt == 'select')
-			{
-				ret = new AdoResultSet( cmd.ExecuteReader() );
+			if (stmt == 'select') {
+				ret = new AdoResultSet(cmd.ExecuteReader());
 			} else {
 				cmd.ExecuteNonQuery();
 				ret = EmptyResultSet.empty;
@@ -231,13 +217,13 @@ private class AdoConnection implements Connection
 			cmd.Dispose();
 			this.command = cnx.CreateCommand();
 			return ret;
-		}
-		catch(e:Dynamic)
-		{
+		} catch (e:Dynamic) {
 			if (escapes.length != 0)
 				this.escapes = [];
 			this.id = cs.system.threading.Interlocked.Increment(ids);
-			try { cmd.Dispose(); } catch(e:Dynamic) {}
+			try {
+				cmd.Dispose();
+			} catch (e:Dynamic) {}
 			this.command = cnx.CreateCommand();
 			cs.Lib.rethrow(e);
 		}
@@ -245,47 +231,40 @@ private class AdoConnection implements Connection
 	}
 }
 
-private class AdoResultSet implements ResultSet
-{
-	public var length(get,null) : Int;
-	public var nfields(get,null) : Int;
+private class AdoResultSet implements ResultSet {
+	public var length(get, null):Int;
+	public var nfields(get, null):Int;
 
 	private var reader:IDataReader;
 	private var didNext:Bool;
 	private var names:Array<String>;
 	private var types:Array<Class<Dynamic>>;
 
-	public function new(reader)
-	{
+	public function new(reader) {
 		this.reader = reader;
-		this.names = [ for (i in 0...reader.FieldCount) reader.GetName(i) ];
-		this.types = [ for (i in 0...names.length) cs.Lib.fromNativeType(reader.GetFieldType(i)) ];
+		this.names = [for (i in 0...reader.FieldCount) reader.GetName(i)];
+		this.types = [for (i in 0...names.length) cs.Lib.fromNativeType(reader.GetFieldType(i))];
 	}
 
-	private function get_length()
-	{
+	private function get_length() {
 		return reader.Depth;
 	}
 
-	private function get_nfields()
-	{
+	private function get_nfields() {
 		return names.length;
 	}
 
-	public function hasNext() : Bool
-	{
+	public function hasNext():Bool {
 		didNext = true;
 		return reader.Read();
 	}
 
-	public function next() : Dynamic
-	{
+	public function next():Dynamic {
 		if (!didNext && !hasNext())
 			return null;
 		didNext = false;
 		var ret = {}, names = names, types = types;
-		for (i in 0...names.length)
-		{
+		for (i in 0...names.length) {
 			var name = names[i], t = types[i], val:Dynamic = null;
 			if (reader.IsDBNull(i)) {
 				val = null;
@@ -299,74 +278,77 @@ private class AdoResultSet implements ResultSet
 				val = null;
 			} else if (t == cs.system.Byte) {
 				var v2:cs.StdTypes.UInt8 = reader.GetValue(i);
-				val = cast(v2,Int);
+				val = cast(v2, Int);
 			} else if (Std.string(t) == 'System.Byte[]') {
 				val = haxe.io.Bytes.ofData(reader.GetValue(i));
 			} else {
 				val = reader.GetValue(i);
 			}
-			if (Std.is(val,cs.system.DBNull))
+			if (Std.is(val, cs.system.DBNull))
 				val = null;
 			Reflect.setField(ret, name, val);
 		}
 		return ret;
 	}
 
-	public function results() : List<Dynamic>
-	{
+	public function results():List<Dynamic> {
 		var l = new List();
 		while (hasNext())
 			l.add(next());
 		return l;
 	}
 
-	public function getResult( n : Int ) : String
-	{
+	public function getResult(n:Int):String {
 		return reader.GetString(n);
 	}
 
-	public function getIntResult( n : Int ) : Int
-	{
+	public function getIntResult(n:Int):Int {
 		return reader.GetInt32(n);
 	}
 
-	public function getFloatResult( n : Int ) : Float
-	{
+	public function getFloatResult(n:Int):Float {
 		return reader.GetDouble(n);
 	}
 
-	public function getFieldsNames() : Null<Array<String>>
-	{
+	public function getFieldsNames():Null<Array<String>> {
 		return names;
 	}
-
 }
 
-private class EmptyResultSet implements ResultSet
-{
+private class EmptyResultSet implements ResultSet {
 	public static var empty = new EmptyResultSet();
-	public function new()
-	{
-	}
 
-	public var length(get,null) : Int;
-	public var nfields(get,null) : Int;
+	public function new() {}
 
-	private function get_length()
-	{
+	public var length(get, null):Int;
+	public var nfields(get, null):Int;
+
+	private function get_length() {
 		return 0;
 	}
 
-	private function get_nfields()
-	{
+	private function get_nfields() {
 		return 0;
 	}
 
-	public function hasNext() : Bool return false;
-	public function next() : Dynamic return null;
-	public function results() : List<Dynamic> return new List();
-	public function getResult( n : Int ) : String return null;
-	public function getIntResult( n : Int ) : Int return 0;
-	public function getFloatResult( n : Int ) : Float return 0;
-	public function getFieldsNames() : Null<Array<String>> return null;
+	public function hasNext():Bool
+		return false;
+
+	public function next():Dynamic
+		return null;
+
+	public function results():List<Dynamic>
+		return new List();
+
+	public function getResult(n:Int):String
+		return null;
+
+	public function getIntResult(n:Int):Int
+		return 0;
+
+	public function getFloatResult(n:Int):Float
+		return 0;
+
+	public function getFieldsNames():Null<Array<String>>
+		return null;
 }
diff --git a/std/cs/internal/BoxedPointer.hx b/std/cs/internal/BoxedPointer.hx
index 3c9d7c3ba2fcaca2ea830172a1678a4cb6e340b6..2b94161ff0b884254452769ad1eaaf1e647d7058 100644
--- a/std/cs/internal/BoxedPointer.hx
+++ b/std/cs/internal/BoxedPointer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package cs.internal;
 
-@:unsafe @:keep @:native('haxe.lang.BoxedPointer') @:nativeGen class BoxedPointer
-{
-	@:readonly public var value(default,null):Pointer<Dynamic>;
+package cs.internal;
 
-	public function new(val)
-	{
+@:unsafe @:keep @:native('haxe.lang.BoxedPointer') @:nativeGen class BoxedPointer {
+	@:readonly public var value(default, null):Pointer<Dynamic>;
+
+	public function new(val) {
 		this.value = val;
 	}
-
 }
diff --git a/std/cs/internal/Exceptions.hx b/std/cs/internal/Exceptions.hx
index 5ac0df5b5d435740863898df5b59da5b22e63405..318bf2a6cfb4dce9807889e52c8322d57858e4d9 100644
--- a/std/cs/internal/Exceptions.hx
+++ b/std/cs/internal/Exceptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,47 +19,44 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.internal;
+
 import cs.system.Exception;
 
 @:nativeGen @:keep @:native("haxe.lang.Exceptions") class Exceptions {
-
 	@:allow(haxe.CallStack)
 	@:meta(System.ThreadStaticAttribute)
 	static var exception:cs.system.Exception;
 }
 
-//should NOT be usable inside Haxe code
+// should NOT be usable inside Haxe code
+
 @:classCode('override public string Message { get { return this.toString(); } }\n\n')
-@:nativeGen @:keep @:native("haxe.lang.HaxeException") private class HaxeException extends Exception
-{
+@:nativeGen @:keep @:native("haxe.lang.HaxeException") private class HaxeException extends Exception {
 	private var obj:Dynamic;
 
-	public function new(obj:Dynamic)
-	{
+	public function new(obj:Dynamic) {
 		super();
 
-		if (Std.is(obj, HaxeException))
-		{
+		if (Std.is(obj, HaxeException)) {
 			var _obj:HaxeException = cast obj;
 			obj = _obj.getObject();
 		}
 		this.obj = obj;
 	}
 
-	public function getObject():Dynamic
-	{
+	public function getObject():Dynamic {
 		return obj;
 	}
 
-	public function toString():String
-	{
+	public function toString():String {
 		return Std.string(obj);
 	}
 
-	public static function wrap(obj:Dynamic):Exception
-	{
-		if (Std.is(obj, Exception)) return obj;
+	public static function wrap(obj:Dynamic):Exception {
+		if (Std.is(obj, Exception))
+			return obj;
 
 		return new HaxeException(obj);
 	}
diff --git a/std/cs/internal/FieldLookup.hx b/std/cs/internal/FieldLookup.hx
index aa532dc31bef896f08c8beb274b9e17e6409f7d4..59739d8f391ad23cf1a1759207a78a0eb203a795 100644
--- a/std/cs/internal/FieldLookup.hx
+++ b/std/cs/internal/FieldLookup.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,16 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.internal;
 
 @:native('haxe.lang.FieldHashConflict')
-@:final @:nativeGen
-@:keep class FieldHashConflict {
-	@:readOnly public var hash(default,never):Int;
-	@:readOnly public var name(default,never):String;
+@:nativeGen @:keep
+final class FieldHashConflict {
+	@:readOnly public var hash(default, never):Int;
+	@:readOnly public var name(default, never):String;
 	public var value:Dynamic;
 	public var next:FieldHashConflict;
-	public function new(hash, name, value, next) {
+
+	public function new(hash, name, value:Dynamic, next) {
 		untyped this.hash = hash;
 		untyped this.name = name;
 		this.value = value;
@@ -37,51 +39,43 @@ package cs.internal;
 }
 
 @:native('haxe.lang.FieldLookup')
-@:final @:nativeGen
 @:classCode("#pragma warning disable 628\n")
-@:keep @:static class FieldLookup
-{
+@:nativeGen @:keep @:static
+final class FieldLookup {
 	@:protected private static var fieldIds:cs.NativeArray<Int>;
 	@:protected private static var fields:cs.NativeArray<String>;
 	@:protected private static var length:Int;
 
-	static function __init__()
-	{
+	static function __init__() {
 		length = fieldIds.Length;
 	}
 
-	private static function addFields(nids:cs.NativeArray<Int>, nfields:cs.NativeArray<String>):Void
-	{
+	private static function addFields(nids:cs.NativeArray<Int>, nfields:cs.NativeArray<String>):Void {
 		// first see if we need to add anything
-		var cids = fieldIds,
-		    cfields = fields;
+		var cids = fieldIds, cfields = fields;
 		var nlen = nids.Length;
 		var clen = length;
-		if (nfields.Length != nlen) throw 'Different fields length: $nlen and ${nfields.Length}';
+		if (nfields.Length != nlen)
+			throw 'Different fields length: $nlen and ${nfields.Length}';
 
-		//TODO optimize
+		// TODO optimize
 		var needsChange = false;
-		for (i in nids)
-		{
-			if (findHash(i, cids, clen) < 0)
-			{
+		for (i in nids) {
+			if (findHash(i, cids, clen) < 0) {
 				needsChange = true;
 				break;
 			}
 		}
 
 		// if we do, lock and merge
-		if (needsChange)
-		{
+		if (needsChange) {
 			cs.Lib.lock(FieldLookup, {
 				// trace(cs.Lib.array(nids), cs.Lib.array(cids));
 				var ansIds = new cs.NativeArray(clen + nlen),
-				    ansFields = new cs.NativeArray(clen + nlen);
+					ansFields = new cs.NativeArray(clen + nlen);
 				var ci = 0, ni = 0, ansi = 0;
-				while (ci < clen && ni < nlen)
-				{
-					if (cids[ci] < nids[ni])
-					{
+				while (ci < clen && ni < nlen) {
+					if (cids[ci] < nids[ni]) {
 						ansIds[ansi] = cids[ci];
 						ansFields[ansi] = cfields[ci];
 						++ci;
@@ -93,15 +87,13 @@ package cs.internal;
 					++ansi;
 				}
 
-				if (ci < clen)
-				{
+				if (ci < clen) {
 					cs.system.Array.Copy(cids, ci, ansIds, ansi, clen - ci);
 					cs.system.Array.Copy(cfields, ci, ansFields, ansi, clen - ci);
 					ansi += clen - ci;
 				}
 
-				if (ni < nlen)
-				{
+				if (ni < nlen) {
 					cs.system.Array.Copy(nids, ni, ansIds, ansi, nlen - ni);
 					cs.system.Array.Copy(nfields, ni, ansFields, ansi, nlen - ni);
 					ansi += nlen - ni;
@@ -115,31 +107,25 @@ package cs.internal;
 		}
 	}
 
-	//s cannot be null here
-	private static inline function doHash(s:String):Int
-	{
-		var acc = 0; //alloc_int
-		for (i in 0...s.length)
-		{
-			acc = (( 223 * (acc >> 1) + cast(s[i], Int)) << 1);
+	// s cannot be null here
+	private static inline function doHash(s:String):Int {
+		var acc = 0; // alloc_int
+		for (i in 0...s.length) {
+			acc = ((223 * (acc >> 1) + cast(s[i], Int)) << 1);
 		}
 
-		return acc >>> 1; //always positive
+		return acc >>> 1; // always positive
 	}
 
-	public static function lookupHash(key:Int):String
-	{
-		//start of binary search algorithm
+	public static function lookupHash(key:Int):String {
 		var ids = fieldIds;
 		var min = 0;
 		var max = length;
 
-		while (min < max)
-		{
+		while (min < max) {
 			var mid = min + Std.int((max - min) / 2);
 			var imid = ids[mid];
-			if (key < imid)
-			{
+			if (key < imid) {
 				max = mid;
 			} else if (key > imid) {
 				min = mid + 1;
@@ -147,72 +133,58 @@ package cs.internal;
 				return fields[mid];
 			}
 		}
-		//if not found, it's definitely an error
+		// if not found, it's definitely an error
 		throw "Field not found for hash " + key;
 	}
 
-	public static function hash(s:String):Int
-	{
-		if (s == null) return 0;
+	public static function hash(s:String):Int {
+		if (s == null)
+			return 0;
 
 		var key = doHash(s);
 
-		//start of binary search algorithm
-		var ids = fieldIds,
-		    fld = fields;
+		var ids = fieldIds, fld = fields;
 		var min = 0;
 		var max = length;
 
 		var len = length;
 
-		while (min < max)
-		{
-			var mid = Std.int(min + (max - min) / 2); //overflow safe
+		while (min < max) {
+			var mid = Std.int(min + (max - min) / 2); // overflow safe
 			var imid = ids[mid];
-			if (key < imid)
-			{
+			if (key < imid) {
 				max = mid;
 			} else if (key > imid) {
 				min = mid + 1;
 			} else {
 				var field = fld[mid];
 				if (field != s)
-					return ~key; //special case
+					return ~key; // special case
 				return key;
 			}
 		}
 
-		//if not found, min holds the value where we should insert the key
-		//ensure thread safety:
+		// if not found, min holds the value where we should insert the key
+		// ensure thread safety:
 		cs.Lib.lock(FieldLookup, {
-			if (len != length) //race condition which will very rarely happen - other thread modified sooner.
-				return hash(s); //since we already own the lock, this second try will always succeed
+			if (len != length) // race condition which will very rarely happen - other thread modified sooner.
+				return hash(s); // since we already own the lock, this second try will always succeed
 
-#if erase_generics
 			fieldIds = insertInt(fieldIds, length, min, key);
 			fields = insertString(fields, length, min, s);
-#else
-			insert(fieldIds, length, min, key);
-			insert(fields, length, min, s);
-			// ids.insert(min, key);
-			// fields.insert(min, s);
-#end
 			++length;
 		});
 		return key;
 	}
 
-	public static function findHash(hash:Int, hashs:cs.NativeArray<Int>, length:Int):Int
-	{
+	public static function findHash(hash:Int, hashs:cs.NativeArray<Int>, length:Int):Int {
 		var min = 0;
 		var max = length;
 
-		while (min < max)
-		{
-			var mid = Std.int((max + min) / 2); //overflow safe
+		while (min < max) {
+			var mid = Std.int((max + min) / 2);
 			var imid = hashs[mid];
-			if (hash < imid)
-			{
+			if (hash < imid) {
 				max = mid;
 			} else if (hash > imid) {
 				min = mid + 1;
@@ -220,113 +192,48 @@ package cs.internal;
 				return mid;
 			}
 		}
-		//if not found, return a negative value of where it should be inserted
+		// if not found, return a negative value of where it should be inserted
 		return ~min;
 	}
 
-	#if !erase_generics
-	static function remove<T>(a:cs.NativeArray<T>, length:Int, pos:Int)
-	{
-		cs.system.Array.Copy(a, pos + 1, a, pos, length - pos - 1);
-		a[length - 1] = null;
-	}
-
-	static function insert<T>(a:cs.Ref<cs.NativeArray<T>>, length:Int, pos:Int, x:T)
-	{
-		var capacity = a.Length;
-		if (pos == length)
-		{
-			if (capacity == length)
-			{
-				var newarr = new NativeArray((length << 1) + 1);
-				a.CopyTo(newarr, 0);
-				a = newarr;
-			}
-		}
-		else if (pos == 0)
-		{
-			if (capacity == length)
-			{
-				var newarr = new NativeArray((length << 1) + 1);
-				cs.system.Array.Copy(a, 0, newarr, 1, length);
-				a = newarr;
-			}
-			else
-			{
-				cs.system.Array.Copy(a, 0, a, 1, length);
-			}
-		}
-		else
-		{
-			if (capacity == length)
-			{
-				var newarr = new NativeArray((length << 1) + 1);
-				cs.system.Array.Copy(a, 0, newarr, 0, pos);
-				cs.system.Array.Copy(a, pos, newarr, pos + 1, length - pos);
-				a = newarr;
-			}
-			else
-			{
-				cs.system.Array.Copy(a, pos, a, pos + 1, length - pos);
-				cs.system.Array.Copy(a, 0, a, 0, pos);
-			}
-		}
-		a[pos] = x;
-	}
-	#else
-	static function removeInt(a:cs.NativeArray<Int>, length:Int, pos:Int)
-	{
+	public static function removeInt(a:cs.NativeArray<Int>, length:Int, pos:Int) {
 		cs.system.Array.Copy(a, pos + 1, a, pos, length - pos - 1);
 		a[length - 1] = 0;
 	}
-	static function removeFloat(a:cs.NativeArray<Float>, length:Int, pos:Int)
-	{
+
+	public static function removeFloat(a:cs.NativeArray<Float>, length:Int, pos:Int) {
 		cs.system.Array.Copy(a, pos + 1, a, pos, length - pos - 1);
 		a[length - 1] = 0;
 	}
-	static function removeDynamic(a:cs.NativeArray<Dynamic>, length:Int, pos:Int)
-	{
+
+	public static function removeDynamic(a:cs.NativeArray<Dynamic>, length:Int, pos:Int) {
 		cs.system.Array.Copy(a, pos + 1, a, pos, length - pos - 1);
 		a[length - 1] = null;
 	}
 
-	@:extern
-	static inline function __insert<T>(a:cs.NativeArray<T>, length:Int, pos:Int, x:T):cs.NativeArray<T>
-	{
+	extern static inline function __insert<T>(a:cs.NativeArray<T>, length:Int, pos:Int, x:T):cs.NativeArray<T> {
 		var capacity = a.Length;
-		if (pos == length)
-		{
-			if (capacity == length)
-			{
+		if (pos == length) {
+			if (capacity == length) {
 				var newarr = new NativeArray((length << 1) + 1);
 				a.CopyTo(newarr, 0);
 				a = newarr;
 			}
-		}
-		else if (pos == 0)
-		{
-			if (capacity == length)
-			{
+		} else if (pos == 0) {
+			if (capacity == length) {
 				var newarr = new NativeArray((length << 1) + 1);
 				cs.system.Array.Copy(a, 0, newarr, 1, length);
 				a = newarr;
-			}
-			else
-			{
+			} else {
 				cs.system.Array.Copy(a, 0, a, 1, length);
 			}
-		}
-		else
-		{
-			if (capacity == length)
-			{
+		} else {
+			if (capacity == length) {
 				var newarr = new NativeArray((length << 1) + 1);
 				cs.system.Array.Copy(a, 0, newarr, 0, pos);
 				cs.system.Array.Copy(a, pos, newarr, pos + 1, length - pos);
 				a = newarr;
-			}
-			else
-			{
+			} else {
 				cs.system.Array.Copy(a, pos, a, pos + 1, length - pos);
 				cs.system.Array.Copy(a, 0, a, 0, pos);
 			}
@@ -335,13 +242,19 @@ package cs.internal;
 		return a;
 	}
 
-	static function insertInt(a:cs.NativeArray<Int>, length:Int, pos:Int, x:Int):cs.NativeArray<Int> return __insert(a, length, pos, x);
-	static function insertFloat(a:cs.NativeArray<Float>, length:Int, pos:Int, x:Float):cs.NativeArray<Float> return __insert(a, length, pos, x);
-	static function insertDynamic(a:cs.NativeArray<Dynamic>, length:Int, pos:Int, x:Dynamic):cs.NativeArray<Dynamic> return __insert(a, length, pos, x);
-	static function insertString(a:cs.NativeArray<String>, length:Int, pos:Int, x:Dynamic):cs.NativeArray<String> return __insert(a, length, pos, x);
-	#end
+	public static function insertInt(a:cs.NativeArray<Int>, length:Int, pos:Int, x:Int):cs.NativeArray<Int>
+		return __insert(a, length, pos, x);
+
+	public static function insertFloat(a:cs.NativeArray<Float>, length:Int, pos:Int, x:Float):cs.NativeArray<Float>
+		return __insert(a, length, pos, x);
+
+	public static function insertDynamic(a:cs.NativeArray<Dynamic>, length:Int, pos:Int, x:Dynamic):cs.NativeArray<Dynamic>
+		return __insert(a, length, pos, x);
+
+	public static function insertString(a:cs.NativeArray<String>, length:Int, pos:Int, x:String):cs.NativeArray<String>
+		return __insert(a, length, pos, x);
 
-	static function getHashConflict(head:FieldHashConflict, hash:Int, name:String):FieldHashConflict {
+	public static function getHashConflict(head:FieldHashConflict, hash:Int, name:String):FieldHashConflict {
 		while (head != null) {
 			if (head.hash == hash && head.name == name) {
 				return head;
@@ -351,7 +264,7 @@ package cs.internal;
 		return null;
 	}
 
-	static function setHashConflict(head:cs.Ref<FieldHashConflict>, hash:Int, name:String, value:Dynamic):Void {
+	public static function setHashConflict(head:cs.Ref<FieldHashConflict>, hash:Int, name:String, value:Dynamic):Void {
 		var node = head;
 		while (node != null) {
 			if (node.hash == hash && node.name == name) {
@@ -363,7 +276,7 @@ package cs.internal;
 		head = new FieldHashConflict(hash, name, value, head);
 	}
 
-	static function deleteHashConflict(head:cs.Ref<FieldHashConflict>, hash:Int, name:String):Bool {
+	public static function deleteHashConflict(head:cs.Ref<FieldHashConflict>, hash:Int, name:String):Bool {
 		// no conflicting fields at all
 		if (head == null) {
 			return false;
@@ -389,7 +302,7 @@ package cs.internal;
 		return false;
 	}
 
-	static function addHashConflictNames(head:FieldHashConflict, arr:Array<String>):Void {
+	public static function addHashConflictNames(head:FieldHashConflict, arr:Array<String>):Void {
 		while (head != null) {
 			arr.push(head.name);
 			head = head.next;
diff --git a/std/cs/internal/Function.hx b/std/cs/internal/Function.hx
index d0c674ce94871f7e5e28d973a47fe603b7ff0ba5..d64f11da4a86730fc9dcd230ef9af7c14bf63fd8 100644
--- a/std/cs/internal/Function.hx
+++ b/std/cs/internal/Function.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,75 +19,61 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.internal;
 
 /**
- These classes are automatically generated by the compiler. They are only
- here so there is an option for e.g. defining them as externs if you are compiling
- in modules (untested).
+	These classes are automatically generated by the compiler. They are only
+	here so there is an option for e.g. defining them as externs if you are compiling
+	in modules (untested).
 **/
-
-@:keep @:abstract @:nativeGen @:native("haxe.lang.Function") class Function
-{
-	function new(arity:Int, type:Int)
-	{
-
-	}
+@:keep @:abstract @:nativeGen @:native("haxe.lang.Function") class Function {
+	function new(arity:Int, type:Int) {}
 }
 
-@:keep @:nativeGen @:native("haxe.lang.VarArgsBase") private class VarArgsBase extends Function
-{
-	public function __hx_invokeDynamic(dynArgs:Array<Dynamic>):Dynamic
-	{
+@:keep @:nativeGen @:native("haxe.lang.VarArgsBase") private class VarArgsBase extends Function {
+	public function __hx_invokeDynamic(dynArgs:cs.NativeArray<Dynamic>):Dynamic {
 		throw "Abstract implementation";
 	}
 }
 
-@:keep @:nativeGen @:native('haxe.lang.VarArgsFunction') class VarArgsFunction extends VarArgsBase
-{
+@:keep @:nativeGen @:native('haxe.lang.VarArgsFunction') class VarArgsFunction extends VarArgsBase {
 	private var fun:Array<Dynamic>->Dynamic;
 
-	public function new(fun)
-	{
+	public function new(fun) {
 		super(-1, -1);
 		this.fun = fun;
 	}
 
-	override public function __hx_invokeDynamic(dynArgs:Array<Dynamic>):Dynamic
-	{
-		return fun(dynArgs);
+	override public function __hx_invokeDynamic(dynArgs:cs.NativeArray<Dynamic>):Dynamic {
+		return fun(cs.Lib.array(dynArgs));
 	}
 }
 
-@:keep @:nativeGen @:native('haxe.lang.Closure') class Closure extends VarArgsBase
-{
+@:keep @:nativeGen @:native('haxe.lang.Closure') class Closure extends VarArgsBase {
 	private var obj:Dynamic;
 	private var field:String;
 	private var hash:Int;
 
-	public function new(obj:Dynamic, field, hash)
-	{
+	public function new(obj:Dynamic, field, hash) {
 		super(-1, -1);
 		this.obj = obj;
 		this.field = field;
 		this.hash = hash;
 	}
 
-	override public function __hx_invokeDynamic(dynArgs:Array<Dynamic>):Dynamic
-	{
+	override public function __hx_invokeDynamic(dynArgs:cs.NativeArray<Dynamic>):Dynamic {
 		return Runtime.callField(obj, field, hash, dynArgs);
 	}
 
-	public function Equals(obj:Dynamic):Bool
-	{
+	public function Equals(obj:Dynamic):Bool {
 		var c = cs.Lib.as(obj, Closure);
 		if (c == null)
 			return false;
 		return (c.obj == this.obj && c.field == this.field);
 	}
 
-	public function GetHashCode():Int
-	{
+	public function GetHashCode():Int {
 		return obj.GetHashCode() ^ untyped field.GetHashCode();
 	}
 }
diff --git a/std/cs/internal/HxObject.hx b/std/cs/internal/HxObject.hx
index 12446a76c1b731c926f274b7c16f43f66b478a27..f1197e4046c528a3176c486a457b74e7e4084bb7 100644
--- a/std/cs/internal/HxObject.hx
+++ b/std/cs/internal/HxObject.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,121 +19,280 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.internal;
+
 import cs.system.Type;
 import haxe.ds.Vector;
+import cs.internal.FieldLookup;
+
 private typedef StdType = std.Type;
 
 @:keep @:native('haxe.lang.HxObject')
-class HxObject implements IHxObject
-{
+class HxObject implements IHxObject {
+	public function __hx_deleteField(field:String, hash:Int):Bool {
+		return false;
+	}
 }
 
 @:keep @:native('haxe.lang.IHxObject')
-interface IHxObject
-{
-}
+interface IHxObject {}
 
 #if core_api_serialize
 @:meta(System.Serializable)
 #end
 @:keep @:native('haxe.lang.DynamicObject')
-class DynamicObject extends HxObject implements Dynamic
-{
-	@:skipReflection public function toString():String
-	{
+class DynamicObject extends HxObject {
+	@:skipReflection var __hx_hashes:NativeArray<Int>;
+	@:skipReflection var __hx_dynamics:NativeArray<Dynamic>;
+
+	@:skipReflection var __hx_hashes_f:NativeArray<Int>;
+	@:skipReflection var __hx_dynamics_f:NativeArray<Float>;
+
+	@:skipReflection var __hx_length:Int;
+	@:skipReflection var __hx_length_f:Int;
+	@:skipReflection var __hx_conflicts:FieldHashConflict;
+
+	@:skipReflection static var __hx_toString_depth = 0;
+
+	@:overload public function new() {
+		this.__hx_hashes = new NativeArray(0);
+		this.__hx_dynamics = new NativeArray(0);
+		this.__hx_hashes_f = new NativeArray(0);
+		this.__hx_dynamics_f = new NativeArray(0);
+		this.__hx_conflicts = null;
+	}
+
+	@:overload public function new(hashes:NativeArray<Int>, dynamics:NativeArray<Dynamic>, hashes_f:NativeArray<Int>, dynamics_f:NativeArray<Float>) {
+		this.__hx_hashes = hashes;
+		this.__hx_dynamics = dynamics;
+		this.__hx_hashes_f = hashes_f;
+		this.__hx_dynamics_f = dynamics_f;
+		this.__hx_length = hashes.length;
+		this.__hx_length_f = hashes_f.length;
+		this.__hx_conflicts = null;
+	}
+
+	override public function __hx_deleteField(field:String, hash:Int):Bool {
+		if (hash < 0) {
+			return FieldLookup.deleteHashConflict(this.__hx_conflicts, hash, field);
+		}
+
+		var res = FieldLookup.findHash(hash, this.__hx_hashes, this.__hx_length);
+		if (res >= 0) {
+			FieldLookup.removeInt(this.__hx_hashes, this.__hx_length, res);
+			FieldLookup.removeDynamic(this.__hx_dynamics, this.__hx_length, res);
+			this.__hx_length--;
+			return true;
+		}
+		res = FieldLookup.findHash(hash, this.__hx_hashes_f, this.__hx_length_f);
+		if (res >= 0) {
+			FieldLookup.removeInt(this.__hx_hashes_f, this.__hx_length_f, res);
+			FieldLookup.removeFloat(this.__hx_dynamics_f, this.__hx_length_f, res);
+			this.__hx_length_f--;
+			return true;
+		}
+		return false;
+	}
+
+	public function __hx_getField(field:String, hash:Int, throwErrors:Bool, isCheck:Bool, handleProperties:Bool):Dynamic {
+		if (hash < 0) {
+			var conflict = FieldLookup.getHashConflict(this.__hx_conflicts, hash, field);
+			if (conflict != null) {
+				return conflict.value;
+			}
+		}
+
+		var res = FieldLookup.findHash(hash, this.__hx_hashes, this.__hx_length);
+		if (res >= 0) {
+			return this.__hx_dynamics[res];
+		}
+		res = FieldLookup.findHash(hash, this.__hx_hashes_f, this.__hx_length_f);
+		if (res >= 0) {
+			return this.__hx_dynamics_f[res];
+		}
+
+		return isCheck ? Runtime.undefined : null;
+	}
+
+	public function __hx_setField(field:String, hash:Int, value:Dynamic, handleProperties:Bool):Dynamic {
+		if (hash < 0) {
+			FieldLookup.setHashConflict(this.__hx_conflicts, hash, field, value);
+			return value;
+		}
+
+		var res = FieldLookup.findHash(hash, this.__hx_hashes, this.__hx_length);
+		if (res >= 0) {
+			return this.__hx_dynamics[res] = value;
+		} else {
+			var res = FieldLookup.findHash(hash, this.__hx_hashes_f, this.__hx_length_f);
+			if (res >= 0) {
+				if (Std.is(value, Float)) {
+					return this.__hx_dynamics_f[res] = value;
+				}
+
+				FieldLookup.removeInt(this.__hx_hashes_f, this.__hx_length_f, res);
+				FieldLookup.removeFloat(this.__hx_dynamics_f, this.__hx_length_f, res);
+				this.__hx_length_f--;
+			}
+		}
+
+		this.__hx_hashes = FieldLookup.insertInt(this.__hx_hashes, this.__hx_length, ~(res), hash);
+		this.__hx_dynamics = FieldLookup.insertDynamic(this.__hx_dynamics, this.__hx_length, ~(res), value);
+		this.__hx_length++;
+		return value;
+	}
+
+	public function __hx_getField_f(field:String, hash:Int, throwErrors:Bool, handleProperties:Bool):Float {
+		if (hash < 0) {
+			var conflict = FieldLookup.getHashConflict(this.__hx_conflicts, hash, field);
+			if (conflict != null) {
+				return conflict.value;
+			}
+		}
+
+		var res = FieldLookup.findHash(hash, this.__hx_hashes_f, this.__hx_length_f);
+		if (res >= 0) {
+			return this.__hx_dynamics_f[res];
+		}
+		res = FieldLookup.findHash(hash, this.__hx_hashes, this.__hx_length);
+		if (res >= 0) {
+			return this.__hx_dynamics[res];
+		}
+
+		return 0.0;
+	}
+
+	public function __hx_setField_f(field:String, hash:Int, value:Float, handleProperties:Bool):Float {
+		if (hash < 0) {
+			FieldLookup.setHashConflict(this.__hx_conflicts, hash, field, value);
+			return value;
+		}
+
+		var res = FieldLookup.findHash(hash, this.__hx_hashes_f, this.__hx_length_f);
+		if (res >= 0) {
+			return this.__hx_dynamics_f[res] = value;
+		} else {
+			var res = FieldLookup.findHash(hash, this.__hx_hashes, this.__hx_length);
+			if (res >= 0) {
+				// return this.__hx_dynamics[res] = value;
+				FieldLookup.removeInt(this.__hx_hashes, this.__hx_length, res);
+				FieldLookup.removeDynamic(this.__hx_dynamics, this.__hx_length, res);
+				this.__hx_length--;
+			}
+		}
+
+		this.__hx_hashes_f = FieldLookup.insertInt(this.__hx_hashes_f, this.__hx_length_f, ~(res), hash);
+		this.__hx_dynamics_f = FieldLookup.insertFloat(this.__hx_dynamics_f, this.__hx_length_f, ~(res), value);
+		this.__hx_length_f++;
+		return value;
+	}
+
+	public function __hx_getFields(baseArr:Array<String>):Void {
+		for (i in 0...this.__hx_length) {
+			baseArr.push(FieldLookup.lookupHash(this.__hx_hashes[i]));
+		}
+		for (i in 0...this.__hx_length_f) {
+			baseArr.push(FieldLookup.lookupHash(this.__hx_hashes_f[i]));
+		}
+		FieldLookup.addHashConflictNames(this.__hx_conflicts, baseArr);
+	}
+
+	public function __hx_invokeField(field:String, hash:Int, dynargs:NativeArray<Dynamic>):Dynamic {
+		if (field == "toString") {
+			return this.toString();
+		}
+		var fn:Function = this.__hx_getField(field, hash, false, false, false);
+		if (fn == null) {
+			throw 'Cannot invoke field $field: It does not exist';
+		}
+
+		return untyped fn.__hx_invokeDynamic(dynargs);
+	}
+
+	@:skipReflection public function toString() {
+		if (__hx_toString_depth >= 5) {
+			return "...";
+		}
+		++__hx_toString_depth;
+		try {
+			var s = __hx_toString();
+			--__hx_toString_depth;
+			return s;
+		} catch (e:Dynamic) {
+			--__hx_toString_depth;
+			throw(e);
+		}
+	}
+
+	@:skipReflection public function __hx_toString():String {
 		var ts = Reflect.field(this, "toString");
 		if (ts != null)
 			return ts();
 		var ret = new StringBuf();
 		ret.add("{");
 		var first = true;
-		for (f in Reflect.fields(this))
-		{
-			if( first )
+		for (f in Reflect.fields(this)) {
+			if (first)
 				first = false;
 			else
 				ret.add(",");
-			ret.add(" "); ret.add(f);
+			ret.add(" ");
+			ret.add(f);
 			ret.add(" : ");
 			ret.add(Reflect.field(this, f));
 		}
-		if (!first) ret.add(" ");
+		if (!first)
+			ret.add(" ");
 		ret.add("}");
 		return ret.toString();
 	}
 }
 
 #if !erase_generics
-@:keep @:native('haxe.lang.IGenericObject') interface IGenericObject
-{
-}
+@:keep @:native('haxe.lang.IGenericObject') interface IGenericObject {}
 
-@:nativeGen @:keep @:native('haxe.lang.GenericInterface') class GenericInterface extends cs.system.Attribute
-{
-	@:readOnly public var generic(default,never):cs.system.Type;
+@:nativeGen @:keep @:native('haxe.lang.GenericInterface') class GenericInterface extends cs.system.Attribute {
+	@:readOnly public var generic(default, never):cs.system.Type;
 
-	public function new(generic)
-	{
+	public function new(generic) {
 		super();
 		untyped this.generic = generic;
 	}
 }
 #end
 
-@:keep @:native('haxe.lang.Enum') @:nativeGen
+@:keep
+@:native('haxe.lang.Enum')
+@:nativeGen
 #if core_api_serialize
 @:meta(System.Serializable)
 #end
-class HxEnum
-{
-	@:readOnly private var index(default,never):Int;
+class HxEnum {
+	@:readOnly var _hx_index(default, never):Int;
 
-	public function new(index:Int)
-	{
-		untyped this.index = index;
+	@:protected function new(index:Int) {
+		untyped this._hx_index = index;
 	}
 
-	public function getTag():String
-	{
+	public function getTag():String {
 		return throw 'Not Implemented';
 	}
 
-	public function getParams():Array<{}>
-	{
+	public function getParams():Array<{}> {
 		return [];
 	}
 
-	public function toString():String
-	{
+	public function toString():String {
 		return getTag();
 	}
-}
-
-@:keep @:native('haxe.lang.ParamEnum') @:nativeGen
-private class ParamEnum extends HxEnum
-{
-	@:readOnly private var params(default,never):Vector<Dynamic>;
-
-	public function new(index:Int, params:Vector<Dynamic>)
-	{
-		super(index);
-		untyped this.params = params;
-	}
 
-	override public function getParams():Array<{}>
-	{
-		return params == null ? [] : cs.Lib.array(cast params.toData());
-	}
-
-	override public function toString():String
-	{
-		if (params == null || params.length == 0) return getTag();
+	@:protected static function paramsToString(tag:String, params:Vector<Dynamic>):String {
 		var ret = new StringBuf();
-		ret.add(getTag()); ret.add("(");
+		ret.add(tag);
+		ret.add("(");
 		var first = true;
-		for (p in params)
-		{
+		for (p in params) {
 			if (first)
 				first = false;
 			else
@@ -144,38 +303,15 @@ private class ParamEnum extends HxEnum
 		return ret.toString();
 	}
 
-	public function Equals(obj:Dynamic)
-	{
-		if (obj == this) //we cannot use == as .Equals !
-			return true;
-		var obj:ParamEnum = Std.instance(obj, ParamEnum);
-		var ret = obj != null && Std.is(obj, StdType.getClass(this)) && obj.index == this.index;
-		if (!ret)
-			return false;
-		if (obj.params == this.params)
-			return true;
-		var len = 0;
-		if (obj.params == null || this.params == null || (len = this.params.length) != obj.params.length)
-			return false;
-		for (i in 0...len)
-		{
-			if (!StdType.enumEq(obj.params[i], this.params[i]))
-				return false;
-		}
-		return true;
-	}
-
-	public function GetHashCode():Int
-	{
+	@:protected static function paramsGetHashCode(index:Int, params:Vector<Dynamic>):Int {
 		var h:Int = 19;
-		if (params != null) for (p in params)
-		{
-			h = h * 31;
-			if (p != null)
-				untyped h += p.GetHashCode();
-		}
+		if (params != null)
+			for (p in params) {
+				h = h * 31;
+				if (p != null)
+					untyped h += p.GetHashCode();
+			}
 		h += index;
 		return h;
 	}
-
 }
diff --git a/std/cs/internal/Null.hx b/std/cs/internal/Null.hx
index 92fd1eb18e81ae47563e51954b82a2b29707005f..57213d4b49fee629e1913157f65e184d4c6750f9 100644
--- a/std/cs/internal/Null.hx
+++ b/std/cs/internal/Null.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.internal;
 
 @:classCode('//This function is here to be used with Reflection, when the haxe.lang.Null type is known
@@ -46,20 +47,20 @@ package cs.internal;
 			private __NoValue__() {}
 		}
 
+		override public string ToString() {
+			if (!hasValue) return "null";
+			else return value.ToString();
+		}
 ')
 #if core_api_serialize
 @:meta(System.Serializable)
 #end
-@:keep @:struct @:nativeGen @:native("haxe.lang.Null") private class Nullable<T>
-{
-
-	@:readOnly public var value(default,never):T;
-	@:readOnly public var hasValue(default,never):Bool;
+@:keep @:struct @:nativeGen @:native("haxe.lang.Null") private class Nullable<T> {
+	@:readOnly public var value(default, never):T;
+	@:readOnly public var hasValue(default, never):Bool;
 
-	public function new(v:T, hasValue:Bool)
-	{
-		if (hasValue && cs.system.Object.ReferenceEquals(v, null))
-		{
+	public function new(v:T, hasValue:Bool) {
+		if (hasValue && cs.system.Object.ReferenceEquals(v, null)) {
 			hasValue = false;
 		}
 		untyped this.value = v;
@@ -75,13 +76,11 @@ package cs.internal;
 			} else {
 				return new haxe.lang.Null<D>((D) obj, true);
 			}')
-	public static function ofDynamic<D>(obj:Dynamic):Nullable<D>
-	{
+	public static function ofDynamic<D>(obj:Dynamic):Nullable<D> {
 		return null;
 	}
 
-	public function toDynamic():Dynamic
-	{
+	public function toDynamic():Dynamic {
 		if (this.hasValue)
 			return value;
 		return null;
diff --git a/std/cs/internal/Runtime.hx b/std/cs/internal/Runtime.hx
index 32d2b816b87316b604aa0eafebd7198a3b9ca1f8..a5b2855dcf0adc5541a7c81585ab0ea49c5944a2 100644
--- a/std/cs/internal/Runtime.hx
+++ b/std/cs/internal/Runtime.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.internal;
+
 import cs.Lib;
 import cs.Lib.*;
 import cs.NativeArray;
@@ -34,10 +36,9 @@ import cs.system.Type;
 import cs.system.Object;
 
 /**
- This class is meant for internal compiler use only. It provides the Haxe runtime
- compatibility to the host language.
+	This class is meant for internal compiler use only. It provides the Haxe runtime
+	compatibility to the host language.
 **/
-
 @:nativeGen
 @:native('haxe.lang.Runtime')
 @:access(String)
@@ -64,46 +65,39 @@ import cs.system.Object;
 		return obj.__hx_setField_f(field, (fieldHash == 0) ? haxe.lang.FieldLookup.hash(field) : fieldHash, value, false);
 	}
 
-	public static object callField(haxe.lang.HxObject obj, string field, int fieldHash, Array args)
+	public static object callField(haxe.lang.HxObject obj, string field, int fieldHash, object[] args)
 	{
 		return obj.__hx_invokeField(field, (fieldHash == 0) ? haxe.lang.FieldLookup.hash(field) : fieldHash, args);
 	}
 ')
-@:keep class Runtime
-{
+@:keep class Runtime {
 	@:readOnly public static var undefined(default, never):Dynamic = new cs.system.Object();
 
-	public static function closure(obj:Dynamic, hash:Int, field:String):Dynamic
-	{
+	public static function closure(obj:Dynamic, hash:Int, field:String):Dynamic {
 		return new cs.internal.Function.Closure(obj, field, hash);
 	}
 
-	public static function eq(v1:Dynamic, v2:Dynamic):Bool
-	{
+	public static function eq(v1:Dynamic, v2:Dynamic):Bool {
 		if (Object.ReferenceEquals(v1, v2))
 			return true;
-		if (Object.ReferenceEquals(v1,null) || Object.ReferenceEquals(v2,null))
+		if (Object.ReferenceEquals(v1, null) || Object.ReferenceEquals(v2, null))
 			return false;
 
 		var v1c = Lib.as(v1, IConvertible);
-		if (v1c != null)
-		{
+		if (v1c != null) {
 			var v2c = Lib.as(v2, IConvertible);
-			if (v2c == null)
-			{
+			if (v2c == null) {
 				return false;
 			}
 
-			var t1 = v1c.GetTypeCode(),
-					t2 = v2c.GetTypeCode();
+			var t1 = v1c.GetTypeCode(), t2 = v2c.GetTypeCode();
 			if (t1 == t2)
-				return Object._Equals(v1c,v2c);
+				return Object._Equals(v1c, v2c);
 
 			if (t1 == cs.system.TypeCode.String || t2 == cs.system.TypeCode.String)
 				return false;
 
-			switch [t1,t2]
-			{
+			switch [t1, t2] {
 				case [Decimal, _] | [_, Decimal]:
 					return v1c.ToDecimal(null) == v2c.ToDecimal(null);
 				case [Int64, _] | [_, Int64]:
@@ -118,61 +112,53 @@ import cs.system.Object;
 		}
 
 		var v1v = Lib.as(v1, cs.system.ValueType);
-		if (v1v != null)
-		{
+		if (v1v != null) {
 			return v1.Equals(v2);
-#if !erase_generics
-		} else {
+		#if !erase_generics
+		}
+		else {
 			var v1t = Lib.as(v1, Type);
-			if (v1t != null)
-			{
+			if (v1t != null) {
 				var v2t = Lib.as(v2, Type);
 				if (v2t != null)
 					return typeEq(v1t, v2t);
 				return false;
 			}
-#end
+		#end
 		}
 
 		return false;
 	}
 
-	public static function refEq(v1: { }, v2: { } ):Bool
-	{
-#if !erase_generics
+	public static function refEq(v1:{}, v2:{}):Bool {
+		#if !erase_generics
 		if (Std.is(v1, Type))
-			return typeEq(Lib.as(v1,Type), Lib.as(v2,Type));
-#end
-		return Object.ReferenceEquals(v1,v2);
+			return typeEq(Lib.as(v1, Type), Lib.as(v2, Type));
+		#end
+		return Object.ReferenceEquals(v1, v2);
 	}
 
-	public static function toDouble(obj:Dynamic):Float
-	{
-		return (obj == null) ? .0 : Std.is(obj,Float) ? cast obj : Lib.as(obj,IConvertible).ToDouble(null);
+	public static function toDouble(obj:Dynamic):Float {
+		return (obj == null) ? .0 : Std.is(obj, Float) ? cast obj : Lib.as(obj, IConvertible).ToDouble(null);
 	}
 
-	public static function toInt(obj:Dynamic):Int
-	{
-		return (obj == null) ? 0 : Std.is(obj,Int) ? cast obj : Lib.as(obj,IConvertible).ToInt32(null);
+	public static function toInt(obj:Dynamic):Int {
+		return (obj == null) ? 0 : Std.is(obj, Int) ? cast obj : Lib.as(obj, IConvertible).ToInt32(null);
 	}
 
-#if erase_generics
-	public static function toLong(obj:Dynamic):Int64
-	{
-		return (obj == null) ? 0 : Std.is(obj,Int64) ? cast obj : Lib.as(obj,IConvertible).ToInt64(null);
+	#if erase_generics
+	public static function toLong(obj:Dynamic):Int64 {
+		return (obj == null) ? 0 : Std.is(obj, Int64) ? cast obj : Lib.as(obj, IConvertible).ToInt64(null);
 	}
-#end
+	#end
 
-	public static function isInt(obj:Dynamic):Bool
-	{
+	public static function isInt(obj:Dynamic):Bool {
 		var cv1 = Lib.as(obj, IConvertible);
-		if (cv1 != null)
-		{
-			switch (cv1.GetTypeCode())
-			{
+		if (cv1 != null) {
+			switch (cv1.GetTypeCode()) {
 				case Double:
 					var d:Float = cast obj;
-					return d >= cs.system.Int32.MinValue && d <= cs.system.Int32.MaxValue && d == ( cast(d,Int) );
+					return d >= cs.system.Int32.MinValue && d <= cs.system.Int32.MaxValue && d == (cast(d, Int));
 				case UInt32, Int32:
 					return true;
 				default:
@@ -182,53 +168,47 @@ import cs.system.Object;
 		return false;
 	}
 
-	public static function isUInt(obj:Dynamic):Bool
-	{
+	public static function isUInt(obj:Dynamic):Bool {
 		var cv1 = Lib.as(obj, IConvertible);
-		if (cv1 != null)
-		{
-			switch (cv1.GetTypeCode())
-			{
+		if (cv1 != null) {
+			switch (cv1.GetTypeCode()) {
 				case Double:
 					var d:Float = cast obj;
-					return d >= cs.system.UInt32.MinValue && d <= cs.system.UInt32.MaxValue && d == ( cast(d,UInt) );
+					return d >= cs.system.UInt32.MinValue && d <= cs.system.UInt32.MaxValue && d == (cast(d, UInt));
 				case UInt32:
 					return true;
 				default:
 					return false;
 			}
-
 		}
 		return false;
 	}
 
-	public static function compare(v1:Dynamic, v2:Dynamic):Int
-	{
-		if (Object.ReferenceEquals(v1,v2)) return 0;
-		if (Object.ReferenceEquals(v1,null)) return -1;
-		if (Object.ReferenceEquals(v2,null)) return 1;
+	public static function compare(v1:Dynamic, v2:Dynamic):Int {
+		if (Object.ReferenceEquals(v1, v2))
+			return 0;
+		if (Object.ReferenceEquals(v1, null))
+			return -1;
+		if (Object.ReferenceEquals(v2, null))
+			return 1;
 
 		var cv1 = Lib.as(v1, IConvertible);
-		if (cv1 != null)
-		{
+		if (cv1 != null) {
 			var cv2 = Lib.as(v2, IConvertible);
 
-			if (cv2 == null)
-			{
+			if (cv2 == null) {
 				throw new cs.system.ArgumentException("Cannot compare " + getNativeType(v1).ToString() + " and " + getNativeType(v2).ToString());
 			}
 
-			switch(cv1.GetTypeCode())
-			{
+			switch (cv1.GetTypeCode()) {
 				case cs.system.TypeCode.String:
 					if (cv2.GetTypeCode() != cs.system.TypeCode.String)
 						throw new cs.system.ArgumentException("Cannot compare " + getNativeType(v1).ToString() + " and " + getNativeType(v2).ToString());
-					var s1 = Lib.as(v1,String);
-					var s2 = Lib.as(v2,String);
-					return String.Compare(s1,s2, cs.system.StringComparison.Ordinal);
+					var s1 = Lib.as(v1, String);
+					var s2 = Lib.as(v2, String);
+					return String.Compare(s1, s2, cs.system.StringComparison.Ordinal);
 				case cs.system.TypeCode.Double:
-					var d1:Float = cast v1,
-							d2:Float = cv2.ToDouble(null);
+					var d1:Float = cast v1, d2:Float = cv2.ToDouble(null);
 					return (d1 < d2) ? -1 : (d1 > d2) ? 1 : 0;
 				default:
 					var d1d = cv1.ToDouble(null);
@@ -240,32 +220,30 @@ import cs.system.Object;
 		var c1 = Lib.as(v1, IComparable);
 		var c2 = Lib.as(v2, IComparable);
 
-		if (c1 == null || c2 == null)
-		{
+		if (c1 == null || c2 == null) {
 			throw new cs.system.ArgumentException("Cannot compare " + getNativeType(v1).ToString() + " and " + getNativeType(v2).ToString());
 		}
 
 		return c1.CompareTo(c2);
 	}
 
-	public static function plus(v1:Dynamic, v2:Dynamic):Dynamic
-	{
-		if (Std.is(v1,String) || Std.is(v2,String))
+	public static function plus(v1:Dynamic, v2:Dynamic):Dynamic {
+		if (Std.is(v1, String) || Std.is(v2, String))
 			return Std.string(v1) + Std.string(v2);
 
-		if (v1 == null)
-		{
-			if (v2 == null) return null;
+		if (v1 == null) {
+			if (v2 == null)
+				return null;
 			v1 = 0;
-		} else if (v2 == null) v2 = 0;
+		} else if (v2 == null)
+			v2 = 0;
 
 		var cv1 = Lib.as(v1, IConvertible);
-		if (cv1 != null)
-		{
+		if (cv1 != null) {
 			var cv2 = Lib.as(v2, IConvertible);
-			if (cv2 == null)
-			{
-				throw new cs.system.ArgumentException("Cannot dynamically add " + cs.Lib.getNativeType(v1).ToString() + " and " + cs.Lib.getNativeType(v2).ToString());
+			if (cv2 == null) {
+				throw new cs.system.ArgumentException("Cannot dynamically add " + cs.Lib.getNativeType(v1).ToString() + " and "
+					+ cs.Lib.getNativeType(v2).ToString());
 			}
 			return cv1.ToDouble(null) + cv2.ToDouble(null);
 		}
@@ -273,8 +251,7 @@ import cs.system.Object;
 		throw new cs.system.ArgumentException("Cannot dynamically add " + v1 + " and " + v2);
 	}
 
-	public static function slowGetField(obj:Dynamic, field:String, throwErrors:Bool):Dynamic
-	{
+	public static function slowGetField(obj:Dynamic, field:String, throwErrors:Bool):Dynamic {
 		if (obj == null)
 			if (throwErrors)
 				throw new cs.system.NullReferenceException("Cannot access field \'" + field + "\' of null.");
@@ -282,52 +259,39 @@ import cs.system.Object;
 				return null;
 
 		var t = Lib.as(obj, cs.system.Type);
-		var bf =
-			if (t == null)
-			{
-				var s = Lib.as(obj, String);
-				if (s != null)
-					return cs.internal.StringExt.StringRefl.handleGetField(s, field, throwErrors);
-				t = obj.GetType();
-				new cs.Flags(BindingFlags.Instance) | BindingFlags.Public | BindingFlags.FlattenHierarchy;
-			} else {
-				if (t == Lib.toNativeType(String) && field == "fromCharCode")
-					return new cs.internal.Function.Closure(StringExt, field, 0);
+		var bf = if (t == null) {
+			var s = Lib.as(obj, String);
+			if (s != null)
+				return cs.internal.StringExt.StringRefl.handleGetField(s, field, throwErrors);
+			t = obj.GetType();
+			new cs.Flags(BindingFlags.Instance) | BindingFlags.Public | BindingFlags.FlattenHierarchy;
+		} else {
+			if (t == Lib.toNativeType(String) && field == "fromCharCode")
+				return new cs.internal.Function.Closure(StringExt, field, 0);
 
-				obj = null;
-				new cs.Flags(BindingFlags.Static) | BindingFlags.Public;
-			}
+			obj = null;
+			new cs.Flags(BindingFlags.Static) | BindingFlags.Public;
+		}
 
 		var f = t.GetField(field, bf);
-		if (f != null)
-		{
+		if (f != null) {
 			return unbox(f.GetValue(obj));
-		}
-		else
-		{
+		} else {
 			var prop = t.GetProperty(field, bf);
-			if (prop == null)
-			{
+			if (prop == null) {
 				var m = t.GetMember(field, bf);
 				if (m.length == 0 && (field == "__get" || field == "__set"))
 					m = t.GetMember(field == "__get" ? "get_Item" : "set_Item", bf);
 
-				if (m.Length > 0)
-				{
+				if (m.Length > 0) {
 					return new cs.internal.Function.Closure(obj != null ? obj : t, field, 0);
-				}
-				else
-				{
+				} else {
 					// COM object handling
-					if (t.IsCOMObject)
-					{
-						try
-						{
+					if (t.IsCOMObject) {
+						try {
 							return t.InvokeMember(field, BindingFlags.GetProperty, null, obj, new cs.NativeArray(0));
-						}
-						catch (e:cs.system.Exception)
-						{
-							//Closures of COM objects not supported currently
+						} catch (e:cs.system.Exception) {
+							// Closures of COM objects not supported currently
 						}
 					}
 
@@ -341,85 +305,72 @@ import cs.system.Object;
 		}
 	}
 
-	public static function slowHasField(obj:Dynamic, field:String):Bool
-	{
-		if (obj == null) return false;
+	public static function slowHasField(obj:Dynamic, field:String):Bool {
+		if (obj == null)
+			return false;
 		var t = Lib.as(obj, cs.system.Type);
-		var bf =
-			if (t == null) {
-				var s = Lib.as(obj, String);
-				if (s != null)
-					return cs.internal.StringExt.StringRefl.handleGetField(s, field, false) != null;
-				t = obj.GetType();
-				new cs.Flags(BindingFlags.Instance) | BindingFlags.Public | BindingFlags.FlattenHierarchy;
-			} else {
-				if (t == Lib.toNativeType(String))
-					return field == "fromCharCode";
-				obj = null;
-				new cs.Flags(BindingFlags.Static) | BindingFlags.Public;
-			}
+		var bf = if (t == null) {
+			var s = Lib.as(obj, String);
+			if (s != null)
+				return cs.internal.StringExt.StringRefl.handleGetField(s, field, false) != null;
+			t = obj.GetType();
+			new cs.Flags(BindingFlags.Instance) | BindingFlags.Public | BindingFlags.FlattenHierarchy;
+		} else {
+			if (t == Lib.toNativeType(String))
+				return field == "fromCharCode";
+			obj = null;
+			new cs.Flags(BindingFlags.Static) | BindingFlags.Public;
+		}
 		var mi = t.GetMember(field, bf);
 		return mi != null && mi.length > 0;
 	}
 
-	public static function slowSetField(obj:Dynamic, field:String, value:Dynamic):Dynamic
-	{
+	public static function slowSetField(obj:Dynamic, field:String, value:Dynamic):Dynamic {
 		if (obj == null)
 			throw new cs.system.NullReferenceException("Cannot access field \'" + field + "\' of null.");
 
 		var t = Lib.as(obj, cs.system.Type);
-		var bf =
-			if (t == null)
-			{
-				t = obj.GetType();
-				new cs.Flags(BindingFlags.Instance) | BindingFlags.Public | BindingFlags.FlattenHierarchy;
-			} else {
-				obj = null;
-				new cs.Flags(BindingFlags.Static) | BindingFlags.Public;
-			}
+		var bf = if (t == null) {
+			t = obj.GetType();
+			new cs.Flags(BindingFlags.Instance) | BindingFlags.Public | BindingFlags.FlattenHierarchy;
+		} else {
+			obj = null;
+			new cs.Flags(BindingFlags.Static) | BindingFlags.Public;
+		}
 
 		var f = t.GetField(field, bf);
-		if (f != null)
-		{
-			if (f.FieldType.ToString().StartsWith("haxe.lang.Null"))
-			{
+		if (f != null) {
+			if (f.FieldType.ToString().StartsWith("haxe.lang.Null")) {
 				value = mkNullable(value, f.FieldType);
 			}
-			if (value != null && Object.ReferenceEquals(Lib.toNativeType(cs.system.Double), Lib.getNativeType(value)) && !Object.ReferenceEquals(t, f.FieldType))
-			{
+			if (value != null
+				&& Object.ReferenceEquals(Lib.toNativeType(cs.system.Double), Lib.getNativeType(value))
+				&& !Object.ReferenceEquals(t, f.FieldType)) {
 				var ic = Lib.as(value, IConvertible);
 				value = ic.ToType(f.FieldType, null);
 			}
 
 			f.SetValue(obj, value);
 			return value;
-		}
-		else
-		{
+		} else {
 			var prop = t.GetProperty(field, bf);
-			if (prop == null)
-			{
+			if (prop == null) {
 				// COM object handling
-				if (t.IsCOMObject)
-				{
-					try
-					{
+				if (t.IsCOMObject) {
+					try {
 						return t.InvokeMember(field, BindingFlags.SetProperty, null, obj, cs.NativeArray.make(value));
-					}
-					catch (e:cs.system.Exception)
-					{
-						//Closures of COM objects not supported currently
+					} catch (e:cs.system.Exception) {
+						// Closures of COM objects not supported currently
 					}
 				}
 				throw "Field \'" + field + "\' not found for writing from Class " + t;
 			}
 
-			if (prop.PropertyType.ToString().StartsWith("haxe.lang.Null"))
-			{
+			if (prop.PropertyType.ToString().StartsWith("haxe.lang.Null")) {
 				value = mkNullable(value, prop.PropertyType);
 			}
-			if (Object.ReferenceEquals(Lib.toNativeType(cs.system.Double), Lib.getNativeType(value)) && !Object.ReferenceEquals(t, f.FieldType))
-			{
+			if (Object.ReferenceEquals(Lib.toNativeType(cs.system.Double), Lib.getNativeType(value))
+				&& !Object.ReferenceEquals(t, f.FieldType)) {
 				var ic = Lib.as(value, IConvertible);
 				value = ic.ToType(f.FieldType, null);
 			}
@@ -429,16 +380,15 @@ import cs.system.Object;
 		}
 	}
 
-	public static function callMethod(obj:Dynamic, methods:NativeArray<MethodBase>, methodLength:Int, args:Array<Dynamic>):Dynamic
-	{
-		if (methodLength == 0) throw "No available methods";
+	public static function callMethod(obj:Dynamic, methods:NativeArray<MethodBase>, methodLength:Int, args:cs.NativeArray<Dynamic>):Dynamic {
+		if (methodLength == 0)
+			throw "No available methods";
 		var length = args.length;
 		var oargs:NativeArray<Dynamic> = new NativeArray(length);
 		var ts:NativeArray<Type> = new NativeArray(length);
 		var rates:NativeArray<Int> = new NativeArray(methods.Length);
 
-		for (i in 0...length)
-		{
+		for (i in 0...length) {
 			oargs[i] = args[i];
 			if (args[i] != null)
 				ts[i] = Lib.getNativeType(args[i]);
@@ -446,37 +396,33 @@ import cs.system.Object;
 
 		var last = 0;
 
-		//first filter by number of parameters and if it is assignable
-		if (methodLength > 1)
-		{
-			for (i in 0...methodLength)
-			{
+		// first filter by number of parameters and if it is assignable
+		if (methodLength > 1) {
+			for (i in 0...methodLength) {
 				var params = methods[i].GetParameters();
 				if (params.Length != length) {
 					continue;
 				} else {
 					var fits = true, crate = 0;
-					for (i in 0...params.Length)
-					{
+					for (i in 0...params.Length) {
 						var param = params[i].ParameterType;
 						var strParam = param + "";
-						if (param.IsAssignableFrom(ts[i]) || (ts[i] == null && !param.IsValueType))
-						{
-							//if it is directly assignable, we'll give it top rate
+						if (param.IsAssignableFrom(ts[i]) || (ts[i] == null && !param.IsValueType)) {
+							// if it is directly assignable, we'll give it top rate
 							continue;
-						} else if (untyped strParam.StartsWith("haxe.lang.Null") || ( (oargs[i] == null || Std.is(oargs[i], IConvertible) ) && cast(untyped __typeof__(IConvertible), Type).IsAssignableFrom(param) ))
-						{
-							//if it needs conversion, give a penalty. TODO rate penalty
+						} else if (untyped strParam.StartsWith("haxe.lang.Null")
+							|| ((oargs[i] == null || Std.is(oargs[i], IConvertible))
+								&& cast(untyped __typeof__(IConvertible), Type).IsAssignableFrom(param))) {
+							// if it needs conversion, give a penalty. TODO rate penalty
 							crate++;
 							continue;
-						} else if (!param.ContainsGenericParameters) { //generics don't appear as assignable, but may be in the end. no rate there.
+						} else if (!param.ContainsGenericParameters) { // generics don't appear as assignable, but may be in the end. no rate there.
 							fits = false;
 							break;
 						}
 					}
 
-					if (fits)
-					{
+					if (fits) {
 						rates[last] = crate;
 						methods[last++] = methods[i];
 					}
@@ -488,20 +434,18 @@ import cs.system.Object;
 			methodLength = 0;
 		}
 
-		//At this time, we should be left with only one method.
-		//Of course, realistically, we can be left with plenty of methods, if there are lots of variants with IConvertible
-		//But at this time we still aren't rating the best methods
-		//FIXME rate best methods
+		// At this time, we should be left with only one method.
+		// Of course, realistically, we can be left with plenty of methods, if there are lots of variants with IConvertible
+		// But at this time we still aren't rating the best methods
+		// FIXME rate best methods
 
 		if (methodLength == 0)
 			throw "Invalid calling parameters for method " + methods[0].Name;
 
 		var best = cs.system.Double.PositiveInfinity;
 		var bestMethod = 0;
-		for(i in 0...methodLength)
-		{
-			if (rates[i] < best)
-			{
+		for (i in 0...methodLength) {
+			if (rates[i] < best) {
 				bestMethod = i;
 				best = rates[i];
 			}
@@ -509,13 +453,10 @@ import cs.system.Object;
 
 		methods[0] = methods[bestMethod];
 		var params = methods[0].GetParameters();
-		for (i in 0...params.Length)
-		{
+		for (i in 0...params.Length) {
 			var param = params[i].ParameterType;
-			var strParam = param + "",
-					arg = oargs[i];
-			if (StringTools.startsWith(strParam, "haxe.lang.Null"))
-			{
+			var strParam = param + "", arg = oargs[i];
+			if (StringTools.startsWith(strParam, "haxe.lang.Null")) {
 				oargs[i] = mkNullable(arg, param);
 			} else if (cast(untyped __typeof__(IConvertible), Type).IsAssignableFrom(param)) {
 				if (arg == null) {
@@ -527,12 +468,10 @@ import cs.system.Object;
 			}
 		}
 
-		if (methods[0].ContainsGenericParameters && Std.is(methods[0], cs.system.reflection.MethodInfo))
-		{
+		if (methods[0].ContainsGenericParameters && Std.is(methods[0], cs.system.reflection.MethodInfo)) {
 			var m:MethodInfo = cast methods[0];
 			var tgs = m.GetGenericArguments();
-			for (i in 0...tgs.Length)
-			{
+			for (i in 0...tgs.Length) {
 				tgs[i] = untyped __typeof__(Dynamic);
 			}
 			m = m.MakeGenericMethod(tgs);
@@ -541,8 +480,7 @@ import cs.system.Object;
 		}
 
 		var m = methods[0];
-		if (obj == null && Std.is(m, cs.system.reflection.ConstructorInfo))
-		{
+		if (obj == null && Std.is(m, cs.system.reflection.ConstructorInfo)) {
 			var ret = cast(m, cs.system.reflection.ConstructorInfo).Invoke(oargs);
 			return unbox(ret);
 		}
@@ -551,112 +489,40 @@ import cs.system.Object;
 		return unbox(ret);
 	}
 
-	public static function unbox(dyn:Dynamic):Dynamic
-	{
-		if (dyn != null && untyped (Lib.getNativeType(dyn) + "").StartsWith("haxe.lang.Null"))
-		{
+	public static function unbox(dyn:Dynamic):Dynamic {
+		if (dyn != null && untyped (Lib.getNativeType(dyn) + "").StartsWith("haxe.lang.Null")) {
 			return dyn.toDynamic();
 		} else {
 			return dyn;
 		}
 	}
 
-#if !erase_generics
+	#if !erase_generics
 	@:functionCode('
 		if (nullableType.ContainsGenericParameters)
 			return haxe.lang.Null<object>.ofDynamic<object>(obj);
 		return nullableType.GetMethod("_ofDynamic").Invoke(null, new object[] { obj });
 	')
-	public static function mkNullable(obj:Dynamic, nullableType:Type):Dynamic
-	{
+	public static function mkNullable(obj:Dynamic, nullableType:Type):Dynamic {
 		return null;
 	}
-#else
-	public static function mkNullable(obj:Dynamic, nullable:Type):Dynamic
-	{
-		return obj; //do nothing
-	}
-#end
-
-	// @:functionCode('
-	// 	if (field == "toString")
-	// 	{
-	// 		if (args == null)
-	// 			return obj.ToString();
-	// 		field = "ToString";
-	// 	}
-	// 	if (args == null) args = new Array<object>();
-
-	// 	System.Reflection.BindingFlags bf;
-	// 	System.Type t = obj as System.Type;
-	// 	if (t == null)
-	// 	{
-	// 		string s = obj as string;
-	// 		if (s != null)
-	// 			return haxe.lang.StringRefl.handleCallField(s, field, args);
-	// 		t = obj.GetType();
-	// 		bf = System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.FlattenHierarchy;
-	// 	} else {
-	// 		if (t == typeof(string) && field.Equals("fromCharCode"))
-	// 			return haxe.lang.StringExt.fromCharCode(toInt(args[0]));
-	// 		obj = null;
-	// 		bf = System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public;
-	// 	}
-
-	// 	System.Reflection.MethodInfo[] mis = t.GetMethods(bf);
-	// 	int last = 0;
-	// 	for (int i = 0; i < mis.Length; i++)
-	// 	{
-	// 		string name = mis[i].Name;
-	// 		if (name.Equals(field))
-	// 		{
-	// 			mis[last++] = mis[i];
-	// 		}
-	// 	}
-
-	// 	if (last == 0 && (field == "__get" || field == "__set"))
-	// 	{
-	// 		field = field == "__get" ? "get_Item" : "set_Item";
-	// 		for (int i = 0; i < mis.Length; i++)
-	// 		{
-	// 			string name = mis[i].Name;
-	// 			if (name.Equals(field))
-	// 			{
-	// 				mis[last++] = mis[i];
-	// 			}
-	// 		}
-	// 	}
-
-	// 	if (last == 0 && t.IsCOMObject)
-	// 	{
-	// 		object[] oargs = new object[arrLen(args)];
-	// 		for (int i = 0; i < oargs.Length; i++)
-	// 		{
-	// 			oargs[i] = args[i];
-	// 		}
-	// 		return t.InvokeMember(field, System.Reflection.BindingFlags.InvokeMethod, null, obj, oargs);
-	// 	}
-
-	// 	if (last == 0)
-	// 	{
-	// 		throw haxe.lang.HaxeException.wrap("Method \'" + field + "\' not found on type " + t);
-	// 	}
-
-	// 	return haxe.lang.Runtime.callMethod(obj, mis, last, args);
-	// ')
-	public static function slowCallField(obj:Dynamic, field:String, args:Array<Dynamic>):Dynamic
-	{
-		if (field == "toString" && (args == null || args.length == 0))
-		{
+	#else
+	public static function mkNullable(obj:Dynamic, nullable:Type):Dynamic {
+		return obj; // do nothing
+	}
+	#end
+
+	public static function slowCallField(obj:Dynamic, field:String, args:cs.NativeArray<Dynamic>):Dynamic {
+		if (field == "toString" && (args == null || args.length == 0)) {
 			return obj.ToString();
 		}
-		if (args == null) args = [];
+		if (args == null)
+			args = new cs.NativeArray(0);
 
 		var bf:BindingFlags;
-		var t = Lib.as(obj,cs.system.Type);
-		if (t == null)
-		{
-			var s = Lib.as(obj,String);
+		var t = Lib.as(obj, cs.system.Type);
+		if (t == null) {
+			var s = Lib.as(obj, String);
 			if (s != null)
 				return cs.internal.StringExt.StringRefl.handleCallField(untyped s, untyped field, args);
 			t = untyped obj.GetType();
@@ -670,54 +536,40 @@ import cs.system.Object;
 
 		var mis:NativeArray<MethodBase> = untyped t.GetMethods(bf);
 		var last = 0;
-		for (i in 0...mis.Length)
-		{
+		for (i in 0...mis.Length) {
 			var name = mis[i].Name;
 			if (name == field)
 				mis[last++] = mis[i];
 		}
 
-		if (last == 0 && (field == "__get" || field == "__set"))
-		{
+		if (last == 0 && (field == "__get" || field == "__set")) {
 			field = field == "__get" ? "get_Item" : "set_Item";
-			for (i in 0...mis.Length)
-			{
+			for (i in 0...mis.Length) {
 				var name = mis[i].Name;
-				if (name == field)
-				{
+				if (name == field) {
 					mis[last++] = mis[i];
 				}
 			}
 		}
 
 		if (last == 0 && t.IsCOMObject)
-		{
-			var oargs = new NativeArray(args.length);
-			for (i in 0...oargs.Length)
-			{
-				oargs[i] = args[i];
-			}
-			return t.InvokeMember(field, BindingFlags.InvokeMethod, null, obj, oargs);
-		}
+			return t.InvokeMember(field, BindingFlags.InvokeMethod, null, obj, args);
 
-		if (last == 0)
-		{
+		if (last == 0) {
 			throw 'Method "$field" not found on type $t';
 		}
 
 		return Runtime.callMethod(obj, mis, last, args);
 	}
 
-	public static function callField(obj:Dynamic, field:String, fieldHash:Int, args:Array<Dynamic>):Dynamic
-	{
+	public static function callField(obj:Dynamic, field:String, fieldHash:Int, args:cs.NativeArray<Dynamic>):Dynamic {
 		var hxObj = Lib.as(obj, HxObject);
 		if (hxObj != null)
 			return untyped hxObj.__hx_invokeField(field, (fieldHash == 0) ? FieldLookup.hash(field) : fieldHash, args);
 		return slowCallField(obj, field, args);
 	}
 
-	public static function getField(obj:Dynamic, field:String, fieldHash:Int, throwErrors:Bool):Dynamic
-	{
+	public static function getField(obj:Dynamic, field:String, fieldHash:Int, throwErrors:Bool):Dynamic {
 		var hxObj = Lib.as(obj, HxObject);
 		if (hxObj != null)
 			return untyped hxObj.__hx_getField(field, (fieldHash == 0) ? FieldLookup.hash(field) : fieldHash, throwErrors, false, false);
@@ -725,8 +577,7 @@ import cs.system.Object;
 		return slowGetField(obj, field, throwErrors);
 	}
 
-	public static function getField_f(obj:Dynamic, field:String, fieldHash:Int, throwErrors:Bool):Float
-	{
+	public static function getField_f(obj:Dynamic, field:String, fieldHash:Int, throwErrors:Bool):Float {
 		var hxObj = Lib.as(obj, HxObject);
 		if (hxObj != null)
 			return untyped hxObj.__hx_getField_f(field, (fieldHash == 0) ? FieldLookup.hash(field) : fieldHash, throwErrors, false);
@@ -734,8 +585,7 @@ import cs.system.Object;
 		return toDouble(slowGetField(obj, field, throwErrors));
 	}
 
-	public static function setField(obj:Dynamic, field:String, fieldHash:Int, value:Dynamic):Dynamic
-	{
+	public static function setField(obj:Dynamic, field:String, fieldHash:Int, value:Dynamic):Dynamic {
 		var hxObj = Lib.as(obj, HxObject);
 		if (hxObj != null)
 			return untyped hxObj.__hx_setField(field, (fieldHash == 0) ? FieldLookup.hash(field) : fieldHash, value, false);
@@ -743,8 +593,7 @@ import cs.system.Object;
 		return slowSetField(obj, field, value);
 	}
 
-	public static function setField_f(obj:Dynamic, field:String, fieldHash:Int, value:Float):Float
-	{
+	public static function setField_f(obj:Dynamic, field:String, fieldHash:Int, value:Float):Float {
 		var hxObj = Lib.as(obj, HxObject);
 		if (hxObj != null)
 			return untyped hxObj.__hx_setField_f(field, (fieldHash == 0) ? FieldLookup.hash(field) : fieldHash, value, false);
@@ -752,12 +601,11 @@ import cs.system.Object;
 		return toDouble(slowSetField(obj, field, value));
 	}
 
-	public static function toString(obj:Dynamic):String
-	{
+	public static function toString(obj:Dynamic):String {
 		if (obj == null)
 			return null;
 		if (Std.is(obj, Bool))
-			if(obj)
+			if (obj)
 				return "true";
 			else
 				return "false";
@@ -765,20 +613,16 @@ import cs.system.Object;
 		return untyped obj.ToString();
 	}
 
-#if erase_generics
+	#if erase_generics
 	inline
-#end
-	public static function typeEq(t1:Type, t2:Type):Bool
-	{
+	#end
+	public static function typeEq(t1:Type, t2:Type):Bool {
 		if (t1 == null || t2 == null)
 			return t1 == t2;
-#if !erase_generics
-		var t1i = t1.IsInterface,
-		    t2i = t2.IsInterface;
-		if (t1i != t2i)
-		{
-			if (t1i)
-			{
+		#if !erase_generics
+		var t1i = t1.IsInterface, t2i = t2.IsInterface;
+		if (t1i != t2i) {
+			if (t1i) {
 				var g = getGenericAttr(t1);
 				if (g != null)
 					t1 = g.generic;
@@ -788,25 +632,24 @@ import cs.system.Object;
 					t2 = g.generic;
 			}
 		}
-
-#end
-		if (t1.GetGenericArguments().Length > 0) t1 = t1.GetGenericTypeDefinition();
-		if (t2.GetGenericArguments().Length > 0) t2 = t2.GetGenericTypeDefinition();
-		return Object.ReferenceEquals(t1,t2);
+		#end
+		if (t1.GetGenericArguments().Length > 0)
+			t1 = t1.GetGenericTypeDefinition();
+		if (t2.GetGenericArguments().Length > 0)
+			t2 = t2.GetGenericTypeDefinition();
+		return Object.ReferenceEquals(t1, t2);
 	}
 
-
-#if !erase_generics
-	public static function getGenericAttr(t:cs.system.Type):cs.internal.HxObject.GenericInterface
-	{
+	#if !erase_generics
+	public static function getGenericAttr(t:cs.system.Type):cs.internal.HxObject.GenericInterface {
 		for (attr in t.GetCustomAttributes(true))
-			if (Std.is(attr,cs.internal.HxObject.GenericInterface))
+			if (Std.is(attr, cs.internal.HxObject.GenericInterface))
 				return cast attr;
 		return null;
 	}
-#end
+	#end
 
-#if !erase_generics
+	#if !erase_generics
 	@:functionCode('
 		if (obj is To)
 			return (To) obj;
@@ -823,43 +666,38 @@ import cs.system.Object;
 		else
 			return (To) obj;
 	')
-	public static function genericCast<To>(obj:Dynamic):To
-	{
+	public static function genericCast<To>(obj:Dynamic):To {
 		return null;
 	}
-#end
+	#end
 
 	@:functionCode('
 		return (s1 == null ? "null" : s1) + (s2 == null ? "null" : s2);
 	')
-	public static function concat(s1:String, s2:String):String
-	{
+	public static function concat(s1:String, s2:String):String {
 		return null;
 	}
 
-	public static function toBool(dyn:Dynamic):Bool
-	{
+	public static function toBool(dyn:Dynamic):Bool {
 		return if (dyn == null) false else untyped __cs__("(bool){0}", dyn);
 	}
 
-
-	//TODO: change from genericCast to getConverter, so we don't need to handle extra boxing associated with it
+	// TODO: change from genericCast to getConverter, so we don't need to handle extra boxing associated with it
 	/*@:functionCode('
-		if (typeof(To).TypeHandle == typeof(double).TypeHandle)
-			return (System.Converter<object,To>) new System.Converter<object,double>(toDouble);
-		else if (typeof(To).TypeHandle == typeof(double).TypeHandle)
-			return (System.Converter<object,To>) new System.Converter<object,double>(toDouble);
-		else
-			return (System.Converter<object, To>) delegate(object obj) { return (To) obj; };
-	')
-	public static function getConverter<To>():cs.system.Converter<Dynamic,To>
-	{
-		return null;
+			if (typeof(To).TypeHandle == typeof(double).TypeHandle)
+				return (System.Converter<object,To>) new System.Converter<object,double>(toDouble);
+			else if (typeof(To).TypeHandle == typeof(double).TypeHandle)
+				return (System.Converter<object,To>) new System.Converter<object,double>(toDouble);
+			else
+				return (System.Converter<object, To>) delegate(object obj) { return (To) obj; };
+		')
+		public static function getConverter<To>():cs.system.Converter<Dynamic,To>
+		{
+			return null;
 	}*/
 }
 
 @:nativeGen
-@:keep @:native("haxe.lang.EmptyObject") enum EmptyObject
-{
+@:keep @:native("haxe.lang.EmptyObject") enum EmptyObject {
 	EMPTY;
 }
diff --git a/std/cs/internal/StringExt.hx b/std/cs/internal/StringExt.hx
index ca60c98492e83202d2adb64ad48cae106690bb2f..f742198fb8d55a04759b1dc7910cb3177dcfac0d 100644
--- a/std/cs/internal/StringExt.hx
+++ b/std/cs/internal/StringExt.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,57 +19,59 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.internal;
+
 import cs.internal.Function;
+
 private typedef NativeString = cs.system.String;
 
-@:keep @:nativeGen @:native("haxe.lang.StringExt") class StringExt
-{
-	@:readOnly static var empty(default,never) = new NativeString(cast 0,0);
+@:keep @:nativeGen @:native("haxe.lang.StringExt") class StringExt {
+	@:readOnly static var empty(default, never) = new NativeString(cast 0, 0);
 
-	public static function charAt(me:NativeString, index:Int):NativeString
-	{
-		if (cast(index,UInt) >= me.Length)
+	public static function charAt(me:NativeString, index:Int):NativeString {
+		if (cast(index, UInt) >= me.Length)
 			return empty;
 		else
 			return new NativeString(me[index], 1);
 	}
 
-	public static function charCodeAt(me:NativeString, index:Int):Null<Int>
-	{
-		if (cast(index,UInt) >= me.Length)
+	public static function charCodeAt(me:NativeString, index:Int):Null<Int> {
+		if (cast(index, UInt) >= me.Length)
 			return null;
 		else
 			return cast(me[index], Int);
 	}
 
-	public static function indexOf(me:NativeString, str:String, ?startIndex:Int):Int
-	{
+	public static function indexOf(me:NativeString, str:String, ?startIndex:Int):Int {
 		var sIndex:Int = startIndex != null ? startIndex : 0;
 		if (sIndex >= me.Length)
 			return -1;
 		return @:privateAccess me.IndexOf(str, sIndex, cs.system.StringComparison.Ordinal);
 	}
 
-	public static function lastIndexOf(me:NativeString, str:NativeString, ?startIndex:Int):Int
-	{
+	public static function lastIndexOf(me:NativeString, str:NativeString, ?startIndex:Int):Int {
 		var sIndex:Int = startIndex == null ? me.Length - 1 : startIndex;
 		if (sIndex >= me.Length)
 			sIndex = me.Length - 1;
 		else if (sIndex < 0)
 			return -1;
 
-		//TestBaseTypes.hx@133 fix
-		if (startIndex != null)
-		{
+		// TestBaseTypes.hx@133 fix
+		if (startIndex != null) {
+			// if the number of letters between start index and the length of the string
+			// is less than the length of a searched substring - shift start index to the
+			// left by the difference to avoid OOB access later and save some work
+			var d = me.Length - sIndex - str.Length;
+			if (d < 0) {
+				sIndex += d;
+			}
+
 			var i = sIndex + 1;
-			while (i --> 0)
-			{
+			while (i-- > 0) {
 				var found = true;
-				for (j in 0...str.Length)
-				{
-					if(me[i + j] != str[j])
-					{
+				for (j in 0...str.Length) {
+					if (me[i + j] != str[j]) {
 						found = false;
 						break;
 					}
@@ -86,15 +88,13 @@ private typedef NativeString = cs.system.String;
 		return -1;
 	}
 
-	public static function split(me:NativeString, delimiter:NativeString):Array<String>
-	{
+	public static function split(me:NativeString, delimiter:NativeString):Array<String> {
 		var native:NativeArray<String>;
-		if (delimiter.Length == 0)
-		{
+		if (delimiter.Length == 0) {
 			var len = me.Length;
 			native = new NativeArray(len);
 			for (i in 0...len)
-				native[i] = untyped new NativeString(me[i],1);
+				native[i] = untyped new NativeString(me[i], 1);
 		} else {
 			var str = new NativeArray<String>(1);
 			str[0] = cast delimiter;
@@ -105,42 +105,39 @@ private typedef NativeString = cs.system.String;
 		return cs.Lib.array(native);
 	}
 
-	public static function substr(me:NativeString, pos:Int, ?len:Int):String
-	{
+	public static function substr(me:NativeString, pos:Int, ?len:Int):String {
 		var meLen = me.Length;
 		var targetLen = meLen;
-		if (len != null)
-		{
+		if (len != null) {
 			targetLen = len;
 			if (targetLen == 0 || (pos != 0 && targetLen < 0))
 				return "";
 		}
 
-		if (pos < 0)
-		{
+		if (pos < 0) {
 			pos = meLen + pos;
-			if (pos < 0) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		} else if (targetLen < 0) {
 			targetLen = meLen + targetLen - pos;
 		}
 
-		if (pos + targetLen > meLen)
-		{
+		if (pos + targetLen > meLen) {
 			targetLen = meLen - pos;
 		}
 
-		if (pos < 0 || targetLen <= 0) return "";
+		if (pos < 0 || targetLen <= 0)
+			return "";
 
 		return me.Substring(pos, targetLen);
 	}
 
-	public static function substring(me:NativeString, startIndex:Int, ?endIndex:Int):String
-	{
+	public static function substring(me:NativeString, startIndex:Int, ?endIndex:Int):String {
 		var len = me.Length;
 		var endIdx:Int;
 		if (endIndex == null)
 			endIdx = len;
-		else if ( (endIdx = endIndex) < 0 )
+		else if ((endIdx = endIndex) < 0)
 			endIdx = 0;
 		else if (endIdx > len)
 			endIdx = len;
@@ -150,8 +147,7 @@ private typedef NativeString = cs.system.String;
 		else if (startIndex > len)
 			startIndex = len;
 
-		if (startIndex > endIdx)
-		{
+		if (startIndex > endIdx) {
 			var tmp = startIndex;
 			startIndex = endIdx;
 			endIdx = tmp;
@@ -160,41 +156,37 @@ private typedef NativeString = cs.system.String;
 		return me.Substring(startIndex, endIdx - startIndex);
 	}
 
-	public static function toString(me:NativeString):NativeString
-	{
+	public static function toString(me:NativeString):NativeString {
 		return me;
 	}
 
-	public static function toLowerCase(me:NativeString):String
-	{
+	public static function toLowerCase(me:NativeString):String {
 		return me.ToLowerInvariant();
 	}
 
-	public static function toUpperCase(me:NativeString):String
-	{
+	public static function toUpperCase(me:NativeString):String {
 		return me.ToUpperInvariant();
 	}
 
-	public static function toNativeString(me:NativeString):NativeString
-	{
+	public static function toNativeString(me:NativeString):NativeString {
 		return me;
 	}
 
-	public static function fromCharCode(code:Int):NativeString
-	{
-		return new NativeString( cast(code,cs.StdTypes.Char16), 1 );
+	public static function fromCharCode(code:Int):String {
+		return cs.system.Char.ConvertFromUtf32(code);
+		// return new NativeString( cast(code,cs.StdTypes.Char16), 1 );
 	}
 }
 
-@:keep @:nativeGen @:native('haxe.lang.StringRefl') class StringRefl
-{
-	public static var fields = ["length", "toUpperCase", "toLowerCase", "charAt", "charCodeAt", "indexOf", "lastIndexOf", "split", "substr", "substring"];
+@:keep @:nativeGen @:native('haxe.lang.StringRefl') class StringRefl {
+	public static var fields = [
+		"length", "toUpperCase", "toLowerCase", "charAt", "charCodeAt", "indexOf", "lastIndexOf", "split", "substr", "substring"
+	];
 
-	public static function handleGetField(str:String, f:String, throwErrors:Bool):Dynamic
-	{
-		switch(f)
-		{
-			case "length": return str.length;
+	public static function handleGetField(str:String, f:String, throwErrors:Bool):Dynamic {
+		switch (f) {
+			case "length":
+				return str.length;
 			case "toUpperCase", "toLowerCase", "charAt", "charCodeAt", "indexOf", "lastIndexOf", "split", "substr", "substring":
 				return new Closure(str, f, 0);
 			default:
@@ -205,14 +197,16 @@ private typedef NativeString = cs.system.String;
 		}
 	}
 
-	public static function handleCallField(str:NativeString, f:String, args:Array<Dynamic>):Dynamic
-	{
-		var _args:Array<Dynamic> = [str];
-		if (args == null)
-			args = _args;
-		else
-			args = _args.concat(args);
-
-		return Runtime.slowCallField(StringExt, f, args);
+	public static function handleCallField(str:NativeString, f:String, args:cs.NativeArray<Dynamic>):Dynamic {
+		var _args:cs.NativeArray<Dynamic>;
+		if (args == null) {
+			_args = cs.NativeArray.make(str);
+		} else {
+			_args = new cs.NativeArray(args.length + 1);
+			for (i in 0...args.length)
+				_args[i + 1] = args[i];
+			_args[0] = str;
+		}
+		return Runtime.slowCallField(StringExt, f, _args);
 	}
 }
diff --git a/std/cs/io/NativeInput.hx b/std/cs/io/NativeInput.hx
index 782e58d65df6c744811d930560979d59d32fa25d..c0e6eae7eaefc4ad829b6572dccbe436404e745e 100644
--- a/std/cs/io/NativeInput.hx
+++ b/std/cs/io/NativeInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,29 +19,29 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.io;
+
 import haxe.Int64;
 import haxe.io.Bytes;
 import haxe.io.Eof;
 import haxe.io.Error;
 import haxe.io.Input;
 
-class NativeInput extends Input
-{
-	public var canSeek(get,never):Bool;
+class NativeInput extends Input {
+	public var canSeek(get, never):Bool;
 
 	var stream:cs.system.io.Stream;
 	var _eof:Bool;
 
-	public function new(stream)
-	{
+	public function new(stream) {
 		this.stream = stream;
 		this._eof = false;
-		if (!stream.CanRead) throw "Write-only stream";
+		if (!stream.CanRead)
+			throw "Write-only stream";
 	}
 
-	override public function readByte():Int
-	{
+	override public function readByte():Int {
 		var ret = stream.ReadByte();
 		if (ret == -1) {
 			_eof = true;
@@ -50,9 +50,8 @@ class NativeInput extends Input
 		return ret;
 	}
 
-	override public function readBytes(s:Bytes, pos:Int, len:Int):Int
-	{
-		if( pos < 0 || len < 0 || pos + len > s.length )
+	override public function readBytes(s:Bytes, pos:Int, len:Int):Int {
+		if (pos < 0 || len < 0 || pos + len > s.length)
 			throw Error.OutsideBounds;
 		var ret = stream.Read(s.getData(), pos, len);
 		if (ret == 0) {
@@ -62,21 +61,17 @@ class NativeInput extends Input
 		return ret;
 	}
 
-	override public function close():Void
-	{
+	override public function close():Void {
 		stream.Close();
 	}
 
-	private inline function get_canSeek():Bool
-	{
+	private inline function get_canSeek():Bool {
 		return stream.CanSeek;
 	}
 
-	public function seek( p : Int, pos : sys.io.FileSeek ) : Void
-	{
+	public function seek(p:Int, pos:sys.io.FileSeek):Void {
 		_eof = false;
-		var pos = switch(pos)
-		{
+		var pos = switch (pos) {
 			case SeekBegin: cs.system.io.SeekOrigin.Begin;
 			case SeekCur: cs.system.io.SeekOrigin.Current;
 			case SeekEnd: cs.system.io.SeekOrigin.End;
@@ -85,13 +80,11 @@ class NativeInput extends Input
 		stream.Seek(cast(p, Int64), pos);
 	}
 
-	public function tell() : Int
-	{
+	public function tell():Int {
 		return cast(stream.Position, Int);
 	}
 
-	public inline function eof() : Bool
-	{
+	public inline function eof():Bool {
 		return _eof;
 	}
-}
\ No newline at end of file
+}
diff --git a/std/cs/io/NativeOutput.hx b/std/cs/io/NativeOutput.hx
index a78dd707ad330df9faee4853bee3dd394178e4e7..4221e02ecff333fff3d6cf055ceb5bbac70479bf 100644
--- a/std/cs/io/NativeOutput.hx
+++ b/std/cs/io/NativeOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,62 +19,56 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.io;
+
 import haxe.Int64;
 import haxe.io.Bytes;
 import haxe.io.Output;
 
-class NativeOutput extends Output
-{
-	var canSeek(get,never):Bool;
+class NativeOutput extends Output {
+	var canSeek(get, never):Bool;
 
 	var stream:cs.system.io.Stream;
-	public function new(stream)
-	{
+
+	public function new(stream) {
 		this.stream = stream;
-		if (!stream.CanWrite) throw "Read-only stream";
+		if (!stream.CanWrite)
+			throw "Read-only stream";
 	}
 
-	override public function writeByte(c:Int):Void
-	{
+	override public function writeByte(c:Int):Void {
 		stream.WriteByte(cast c);
 	}
 
-	override public function close():Void
-	{
+	override public function close():Void {
 		stream.Close();
 	}
 
-	override public function flush():Void
-	{
+	override public function flush():Void {
 		stream.Flush();
 	}
 
-	override public function prepare(nbytes:Int):Void
-	{
-		//TODO see if implementation is correct
+	override public function prepare(nbytes:Int):Void {
+		// TODO see if implementation is correct
 		stream.SetLength(haxe.Int64.add(stream.Length, cast(nbytes, Int64)));
 	}
 
-	private inline function get_canSeek():Bool
-	{
+	private inline function get_canSeek():Bool {
 		return stream.CanSeek;
 	}
 
-	public function seek( p : Int, pos : sys.io.FileSeek ) : Void
-	{
-		var p = switch(pos)
-		{
+	public function seek(p:Int, pos:sys.io.FileSeek):Void {
+		var pos = switch (pos) {
 			case SeekBegin: cs.system.io.SeekOrigin.Begin;
 			case SeekCur: cs.system.io.SeekOrigin.Current;
 			case SeekEnd: cs.system.io.SeekOrigin.End;
 		};
 
-		stream.Seek(cast(p, Int64), p);
+		stream.Seek(cast(p, Int64), pos);
 	}
 
-	public function tell() : Int
-	{
+	public function tell():Int {
 		return cast(stream.Position, Int);
 	}
 }
diff --git a/std/cs/types/Char16.hx b/std/cs/types/Char16.hx
index eb8fc1da76d1b9656e326ecb3ab3edf678ee7ef1..23060aecf55fc259f52159ced9a64322c9bd3e74 100644
--- a/std/cs/types/Char16.hx
+++ b/std/cs/types/Char16.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.types;
 
 typedef Char16 = cs.StdTypes.Char16;
diff --git a/std/cs/types/Int16.hx b/std/cs/types/Int16.hx
index 9a4fcd507b9bae8c5b641b204d40c63796a486a9..bb1ba494d052b60e3259c1731f68d8d44fecc103 100644
--- a/std/cs/types/Int16.hx
+++ b/std/cs/types/Int16.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.types;
 
 typedef Int16 = cs.StdTypes.Int16;
diff --git a/std/cs/types/Int64.hx b/std/cs/types/Int64.hx
index d8d7b8d9140251cc5ff3337b9907093451d546da..5bd867a80aa5872b03d28fb0415bb3ed3e5ede3d 100644
--- a/std/cs/types/Int64.hx
+++ b/std/cs/types/Int64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.types;
 
 typedef Int64 = cs.StdTypes.Int64;
-
diff --git a/std/cs/types/Int8.hx b/std/cs/types/Int8.hx
index 5120c71bd5b5725e672d9675d6baf7b90e78a905..d0309f1a8fb7321a31a84f44cce530f492019d40 100644
--- a/std/cs/types/Int8.hx
+++ b/std/cs/types/Int8.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.types;
 
 typedef Int8 = cs.StdTypes.Int8;
diff --git a/std/cs/types/UInt16.hx b/std/cs/types/UInt16.hx
index ef037e5243e37373660588f8f7bd4a6e235c8fa3..fc8de77c3c1b411e4b7e1203400ac457795b24ee 100644
--- a/std/cs/types/UInt16.hx
+++ b/std/cs/types/UInt16.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.types;
 
 typedef UInt16 = cs.StdTypes.UInt16;
diff --git a/std/cs/types/UInt64.hx b/std/cs/types/UInt64.hx
index c8d864b271fb20617687f3d4318655cd343604c0..62f4b585e838d868e32e809e858ac26a42219e80 100644
--- a/std/cs/types/UInt64.hx
+++ b/std/cs/types/UInt64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.types;
 
 typedef UInt64 = cs.StdTypes.UInt64;
diff --git a/std/cs/types/UInt8.hx b/std/cs/types/UInt8.hx
index befa2e1cc5cd62404ff1500b1d9234aff4065671..e3c9961dc389b4de075134df76ae9b1436f9757d 100644
--- a/std/cs/types/UInt8.hx
+++ b/std/cs/types/UInt8.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package cs.types;
 
 typedef UInt8 = cs.StdTypes.UInt8;
diff --git a/std/eval/Vector.hx b/std/eval/Vector.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b5dc38666a6a112cce6d13106c997b5c54826d58
--- /dev/null
+++ b/std/eval/Vector.hx
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C)2005-2019 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 eval;
+
+extern class Vector<T> implements ArrayAccess<T> {
+	public function new(size:Int):Void;
+	public var length(default, null):Int;
+	public function blit<T>(srcPos:Int, dest:Vector<T>, destPos:Int, len:Int):Void;
+	public function toArray():Array<T>;
+	static public function fromArrayCopy<T>(array:Array<T>):Vector<T>;
+	public function copy<T>():Vector<T>;
+	public function join<T>(sep:String):String;
+	public function map<S>(f:T->S):Vector<S>;
+}
diff --git a/std/eval/_std/EReg.hx b/std/eval/_std/EReg.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d542debf9ad739e9149bd867e204aa6b6e7da955
--- /dev/null
+++ b/std/eval/_std/EReg.hx
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+// We need this class so that calls to the empty standard implementations
+// don't get optimized away.
+@:coreApi
+extern class EReg {
+	public function new(r:String, opt:String):Void;
+	public function match(s:String):Bool;
+	public function matched(n:Int):String;
+	public function matchedLeft():String;
+	public function matchedRight():String;
+	public function matchedPos():{pos:Int, len:Int};
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool;
+	public function split(s:String):Array<String>;
+	public function replace(s:String, by:String):String;
+	public function map(s:String, f:EReg->String):String;
+	public static function escape(s:String):String;
+}
diff --git a/std/cs/internal/Iterator.hx b/std/eval/_std/StringBuf.hx
similarity index 75%
rename from std/cs/internal/Iterator.hx
rename to std/eval/_std/StringBuf.hx
index d43153ceef8f5b7a1295e296f89b343a6c0fd6d6..66f4f3999d3d3985c8d63a0b0f742f9929968e6d 100644
--- a/std/cs/internal/Iterator.hx
+++ b/std/eval/_std/StringBuf.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package cs.internal;
-/* TODO (see Gencommon.IteratorsInterfaceModf)
-@:keep @:native('haxe.lang.Iterator') interface Iterator<T>
-{
-
-	public function hasNext():Bool;
-
-	public function next():T;
-
+@:coreApi
+extern class StringBuf {
+	public var length(get, never):Int;
+	public function new():Void;
+	private function get_length():Int;
+	public function add<T>(x:T):Void;
+	public function addChar(c:Int):Void;
+	public function addSub(s:String, pos:Int, ?len:Int):Void;
+	public function toString():String;
 }
-
-@:keep @:native('haxe.lang.Iterable') interface Iterable<T>
-{
-
-	public function iterator():Iterator<T>;
-
-}
-*/
diff --git a/std/eval/_std/Sys.hx b/std/eval/_std/Sys.hx
new file mode 100644
index 0000000000000000000000000000000000000000..30561e3dea5e1cb48d10a62b9f0c7e0aa9c55897
--- /dev/null
+++ b/std/eval/_std/Sys.hx
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+import haxe.SysTools;
+
+@:require(sys)
+@:coreApi
+class Sys {
+	extern static public function print(v:Dynamic):Void;
+
+	extern static public function println(v:Dynamic):Void;
+
+	extern static public function args():Array<String>;
+
+	extern static public function getEnv(s:String):String;
+
+	extern static public function putEnv(s:String, v:String):Void;
+
+	extern static public function environment():Map<String, String>;
+
+	extern static public function sleep(seconds:Float):Void;
+
+	extern static public function setTimeLocale(loc:String):Bool;
+
+	extern static public function getCwd():String;
+
+	extern static public function setCwd(s:String):Void;
+
+	extern static public function systemName():String;
+
+	extern static function _command(cmd:String):Int;
+
+	static public function command(cmd:String, ?args:Array<String>):Int {
+		if (args == null) {
+			return _command(cmd);
+		} else {
+			switch (systemName()) {
+				case "Windows":
+					cmd = [
+						for (a in [StringTools.replace(cmd, "/", "\\")].concat(args))
+							SysTools.quoteWinArg(a, true)
+					].join(" ");
+					return _command(cmd);
+				case _:
+					cmd = [cmd].concat(args).map(SysTools.quoteUnixArg).join(" ");
+					return _command(cmd);
+			}
+		}
+	}
+
+	static public function executablePath():String {
+		return programPath();
+	}
+
+	extern static public function exit(code:Int):Void;
+
+	extern static public function time():Float;
+
+	extern static public function cpuTime():Float;
+
+	extern static public function programPath():String;
+
+	extern static public function getChar(echo:Bool):Int;
+
+	extern static public function stdin():haxe.io.Input;
+
+	extern static public function stdout():haxe.io.Output;
+
+	extern static public function stderr():haxe.io.Output;
+
+	static function __init__():Void {
+		// This nonsense causes the classes to be loaded. Otherwise they might not make
+		// it into the interpreter, and then stderr() et. al. don't work.
+		var _ = (null : sys.io.FileOutput);
+		var _ = (null : sys.io.FileInput);
+	}
+}
diff --git a/std/eval/_std/haxe/Resource.hx b/std/eval/_std/haxe/Resource.hx
new file mode 100644
index 0000000000000000000000000000000000000000..314699673f9ee78aa00e41b611c993057b6fe168
--- /dev/null
+++ b/std/eval/_std/haxe/Resource.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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 haxe;
+
+@:coreApi
+extern class Resource {
+	public static function listNames():Array<String>;
+	public static function getString(name:String):String;
+	public static function getBytes(name:String):haxe.io.Bytes;
+}
diff --git a/std/eval/_std/haxe/Utf8.hx b/std/eval/_std/haxe/Utf8.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b5e26c6d29675029c14b136d3cc4e0c35450e5ac
--- /dev/null
+++ b/std/eval/_std/haxe/Utf8.hx
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C)2005-2019 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 haxe;
+
+@:coreApi
+@:deprecated('haxe.Utf8 is deprecated. Use UnicodeString instead.')
+extern class Utf8 {
+	public function new(?size:Int):Void;
+	public function addChar(c:Int):Void;
+	public function toString():String;
+	public static function iter(s:String, chars:Int->Void):Void;
+	public static function encode(s:String):String;
+	public static function decode(s:String):String;
+	public static function charCodeAt(s:String, index:Int):Int;
+	public static function validate(s:String):Bool;
+	public static function length(s:String):Int;
+	public static function compare(a:String, b:String):Int;
+	public static function sub(s:String, pos:Int, len:Int):String;
+}
diff --git a/std/eval/_std/haxe/io/Bytes.hx b/std/eval/_std/haxe/io/Bytes.hx
new file mode 100644
index 0000000000000000000000000000000000000000..75489c6ab048814679afbeaf473dbb66a19657bb
--- /dev/null
+++ b/std/eval/_std/haxe/io/Bytes.hx
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.io;
+
+// @:coreApi
+extern class Bytes {
+	function new(length:Int, b:BytesData):Void;
+	public var length(default, null):Int;
+	public function get(pos:Int):Int;
+	public function set(pos:Int, v:Int):Void;
+	public function blit(pos:Int, src:Bytes, srcpos:Int, len:Int):Void;
+	public function fill(pos:Int, len:Int, value:Int):Void;
+	public function sub(pos:Int, len:Int):Bytes;
+	public function compare(other:Bytes):Int;
+	public function getDouble(pos:Int):Float;
+	public function getFloat(pos:Int):Float;
+	public function setDouble(pos:Int, v:Float):Void;
+	public function setFloat(pos:Int, v:Float):Void;
+	public function getUInt16(pos:Int):Int;
+	public function setUInt16(pos:Int, v:Int):Void;
+	public function getInt32(pos:Int):Int;
+	public function getInt64(pos:Int):haxe.Int64;
+	public function setInt32(pos:Int, v:Int):Void;
+	public function setInt64(pos:Int, v:haxe.Int64):Void;
+	public function getString(pos:Int, len:Int, ?encoding:Encoding):String;
+	public function toString():String;
+	public function toHex():String;
+	public function getData():BytesData;
+	public static function alloc(length:Int):Bytes;
+	@:pure
+	public static function ofString(s:String, ?encoding:Encoding):Bytes;
+	public static function ofData(b:BytesData):Bytes;
+	public static function ofHex(s:String):Bytes;
+	public static function fastGet(b:BytesData, pos:Int):Int;
+	static function __init__():Void {
+		haxe.io.Error;
+	}
+}
diff --git a/std/eval/_std/haxe/io/BytesBuffer.hx b/std/eval/_std/haxe/io/BytesBuffer.hx
new file mode 100644
index 0000000000000000000000000000000000000000..328784fa68ea9d81d5c739cb1679e567f966f50a
--- /dev/null
+++ b/std/eval/_std/haxe/io/BytesBuffer.hx
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.io;
+
+@:coreApi
+extern class BytesBuffer {
+	public var length(get, never):Int;
+	public function new():Void;
+	private function get_length():Int;
+	public function addByte(byte:Int):Void;
+	public function add(src:Bytes):Void;
+	public function addString(v:String, ?encoding:Encoding):Void;
+	public function addInt32(v:Int):Void;
+	public function addInt64(v:haxe.Int64):Void;
+	public function addFloat(v:Float):Void;
+	public function addDouble(v:Float):Void;
+	public function addBytes(src:Bytes, pos:Int, len:Int):Void;
+	public function getBytes():Bytes;
+}
diff --git a/std/eval/_std/haxe/io/BytesData.hx b/std/eval/_std/haxe/io/BytesData.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3bce2385f3fd6471243b96313f02c0dec560b4cb
--- /dev/null
+++ b/std/eval/_std/haxe/io/BytesData.hx
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.io;
+
+@:forward
+private abstract NativeBytesDataAbstract(Bytes) from Bytes to Bytes {
+	@:arrayAccess public inline function get(i:Int)
+		return this.get(i);
+
+	@:arrayAccess public inline function set(i:Int, v:Dynamic)
+		this.set(i, v);
+}
+
+typedef BytesData = NativeBytesDataAbstract;
diff --git a/std/eval/_std/haxe/zip/Compress.hx b/std/eval/_std/haxe/zip/Compress.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6e0f793de988029d7fd6975de28eb1745b5468b2
--- /dev/null
+++ b/std/eval/_std/haxe/zip/Compress.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.zip;
+
+extern class Compress {
+	public function new(level:Int):Void;
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, wriet:Int};
+	public function setFlushMode(f:FlushMode):Void;
+	public function close():Void;
+	public static function run(s:haxe.io.Bytes, level:Int):haxe.io.Bytes;
+}
diff --git a/std/eval/_std/haxe/zip/Uncompress.hx b/std/eval/_std/haxe/zip/Uncompress.hx
new file mode 100644
index 0000000000000000000000000000000000000000..73adbec46b34998a43cb11d2783849e8c22e3189
--- /dev/null
+++ b/std/eval/_std/haxe/zip/Uncompress.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.zip;
+
+extern class Uncompress {
+	public function new(?windowBits:Int):Void;
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int};
+	public function setFlushMode(f:FlushMode):Void;
+	public function close():Void;
+	public static function run(src:haxe.io.Bytes, ?bufsize:Int):haxe.io.Bytes;
+}
diff --git a/std/eval/_std/sys/FileSystem.hx b/std/eval/_std/sys/FileSystem.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ed3b4e1c59e833a5f3adf2026850769f7df48db5
--- /dev/null
+++ b/std/eval/_std/sys/FileSystem.hx
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C)2005-2019 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 sys;
+
+// This class is here so it re-shadows other FileSystem classes in macros,
+// e.g. from hxnodejs.
+@:coreApi
+class FileSystem {
+	extern static public function exists(path:String):Bool;
+
+	extern static public function rename(path:String, newPath:String):Void;
+
+	extern static public function stat(path:String):FileStat;
+
+	extern static public function fullPath(relPath:String):String;
+
+	static public function absolutePath(relPath:String):String {
+		if (haxe.io.Path.isAbsolute(relPath))
+			return relPath;
+		return haxe.io.Path.join([Sys.getCwd(), relPath]);
+	}
+
+	extern static public function isDirectory(path:String):Bool;
+
+	extern static public function createDirectory(path:String):Void;
+
+	extern static public function deleteFile(path:String):Void;
+
+	extern static public function deleteDirectory(path:String):Void;
+
+	extern static public function readDirectory(path:String):Array<String>;
+}
diff --git a/std/eval/_std/sys/io/File.hx b/std/eval/_std/sys/io/File.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d3570b5bb7ca5726dee20d6f676aa02b2f8d29d9
--- /dev/null
+++ b/std/eval/_std/sys/io/File.hx
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C)2005-2019 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 sys.io;
+
+@:coreApi
+class File {
+	extern static public function getContent(path:String):String;
+
+	extern static public function saveContent(path:String, content:String):Void;
+
+	extern static public function getBytes(path:String):haxe.io.Bytes;
+
+	extern static public function saveBytes(path:String, bytes:haxe.io.Bytes):Void;
+
+	extern static public function read(path:String, binary:Bool = true):FileInput;
+
+	extern static public function write(path:String, binary:Bool = true):FileOutput;
+
+	extern static public function append(path:String, binary:Bool = true):FileOutput;
+
+	extern static public function update(path:String, binary:Bool = true):FileOutput;
+
+	static public function copy(srcPath:String, dstPath:String):Void {
+		var s = read(srcPath, true);
+		var d = write(dstPath, true);
+		d.writeInput(s);
+		s.close();
+		d.close();
+	}
+}
diff --git a/std/eval/_std/sys/io/FileInput.hx b/std/eval/_std/sys/io/FileInput.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1df7f0ad724b522d025d4e8e6093e16ab9c56de7
--- /dev/null
+++ b/std/eval/_std/sys/io/FileInput.hx
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C)2005-2019 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 sys.io;
+
+// This class is not extern because externs overriding non-externs messes with DCE
+@:coreApi
+class FileInput extends haxe.io.Input {
+	extern public override function close():Void;
+
+	extern public function eof():Bool;
+
+	extern public function seek(p:Int, pos:FileSeek):Void;
+
+	extern public function tell():Int;
+
+	extern public override function readByte():Int;
+
+	extern public override function readBytes(bytes:haxe.io.Bytes, pos:Int, len:Int):Int;
+}
diff --git a/std/eval/_std/sys/io/FileOutput.hx b/std/eval/_std/sys/io/FileOutput.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4e9705521ed30f53e4eefb0de0ccc2b7cef66bbe
--- /dev/null
+++ b/std/eval/_std/sys/io/FileOutput.hx
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C)2005-2019 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 sys.io;
+
+// This class is not extern because externs overriding non-externs messes with DCE
+@:coreApi
+class FileOutput extends haxe.io.Output {
+	extern public override function close():Void;
+
+	extern public override function flush():Void;
+
+	extern public function seek(p:Int, pos:FileSeek):Void;
+
+	extern public function tell():Int;
+
+	extern public override function writeByte(c:Int):Void;
+
+	extern public override function writeBytes(bytes:haxe.io.Bytes, pos:Int, len:Int):Int;
+}
diff --git a/std/eval/_std/sys/io/Process.hx b/std/eval/_std/sys/io/Process.hx
new file mode 100644
index 0000000000000000000000000000000000000000..255411d436b4ad57d6997214baf2d550a017e896
--- /dev/null
+++ b/std/eval/_std/sys/io/Process.hx
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C)2005-2019 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 sys.io;
+
+private extern class NativeProcess {
+	function new(cmd:String, ?args:Array<String>):Void;
+
+	function close():Void;
+	function exitCode():Int;
+	function getPid():Int;
+	function kill():Void;
+
+	function readStderr(bytes:haxe.io.Bytes, pos:Int, len:Int):Int;
+	function readStdout(bytes:haxe.io.Bytes, pos:Int, len:Int):Int;
+
+	function closeStdin():Void;
+	function writeStdin(bytes:haxe.io.Bytes, pos:Int, len:Int):Int;
+}
+
+private class Stdin extends haxe.io.Output {
+	var proc:NativeProcess;
+	var buf:haxe.io.Bytes;
+
+	public function new(proc:NativeProcess) {
+		this.proc = proc;
+		buf = haxe.io.Bytes.alloc(1);
+	}
+
+	public override function close() {
+		super.close();
+		proc.closeStdin();
+	}
+
+	public override function writeByte(c:Int) {
+		buf.set(0, c);
+		writeBytes(buf, 0, 1);
+	}
+
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int) {
+		try {
+			return proc.writeStdin(buf, pos, len);
+		} catch (e:Dynamic) {
+			throw new haxe.io.Eof();
+		}
+	}
+}
+
+private class Stdout extends haxe.io.Input {
+	var proc:NativeProcess;
+	var out:Bool;
+	var buf:haxe.io.Bytes;
+
+	public function new(proc:NativeProcess, out:Bool) {
+		this.proc = proc;
+		this.out = out;
+		buf = haxe.io.Bytes.alloc(1);
+	}
+
+	public override function readByte() {
+		if (readBytes(buf, 0, 1) == 0)
+			throw haxe.io.Error.Blocked;
+		return buf.get(0);
+	}
+
+	public override function readBytes(bytes:haxe.io.Bytes, pos:Int, len:Int):Int {
+		try {
+			if (out) {
+				return proc.readStdout(bytes, pos, len);
+			} else {
+				return proc.readStderr(bytes, pos, len);
+			}
+		} catch (e:Dynamic) {
+			throw new haxe.io.Eof();
+		}
+	}
+}
+
+@:coreApi
+class Process {
+	public var stdout(default, null):haxe.io.Input;
+	public var stderr(default, null):haxe.io.Input;
+	public var stdin(default, null):haxe.io.Output;
+
+	var proc:NativeProcess;
+
+	public function new(cmd:String, ?args:Array<String>, ?detached:Bool):Void {
+		if (detached) {
+			throw "Detached process is not supported on this platform";
+		}
+		proc = new NativeProcess(cmd, args);
+		stdout = new Stdout(proc, true);
+		stderr = new Stdout(proc, false);
+		stdin = new Stdin(proc);
+	}
+
+	public inline function getPid():Int {
+		return proc.getPid();
+	}
+
+	public function exitCode(block:Bool = true):Null<Int> {
+		if (block == false)
+			throw "Non blocking exitCode() not supported on this platform";
+		return proc.exitCode();
+	}
+
+	public inline function close():Void {
+		proc.close();
+	}
+
+	public inline function kill():Void {
+		proc.kill();
+	}
+}
diff --git a/std/eval/_std/sys/net/Host.hx b/std/eval/_std/sys/net/Host.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3a73c052ef135503d2ab8348c1cd5ba8fecce893
--- /dev/null
+++ b/std/eval/_std/sys/net/Host.hx
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C)2005-2019 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 sys.net;
+
+class Host {
+	public var host(default, null):String;
+	public var ip(default, null):Int;
+
+	public function new(name:String) {
+		host = name;
+		init(resolve(name));
+	}
+
+	public function toString() {
+		return hostToString(ip);
+	}
+
+	public function reverse() {
+		return hostReverse(ip);
+	}
+
+	function init(ip:Int) {
+		this.ip = ip;
+	}
+
+	extern static public function localhost();
+
+	extern static function hostReverse(ip:Int);
+
+	extern static function hostToString(ip:Int);
+
+	extern static function resolve(name:String);
+}
diff --git a/std/eval/_std/sys/net/Socket.hx b/std/eval/_std/sys/net/Socket.hx
new file mode 100644
index 0000000000000000000000000000000000000000..629943ff94060ad2a50726af82cfa9aaa3535980
--- /dev/null
+++ b/std/eval/_std/sys/net/Socket.hx
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C)2005-2019 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 sys.net;
+
+import haxe.io.Error;
+
+extern private class NativeSocket {
+	function new():Void;
+	function accept():NativeSocket;
+	function bind(host:Int, port:Int):Void;
+	function close():Void;
+	function connect(host:Int, port:Int):Void;
+	function host():{ip:Int, port:Int};
+	function listen(connections:Int):Void;
+	function peer():{ip:Int, port:Int};
+	function receive(buf:haxe.io.Bytes, pos:Int, len:Int):Int;
+	function receiveChar():Int;
+	function send(buf:haxe.io.Bytes, pos:Int, len:Int):Int;
+	function sendChar(char:Int):Void;
+	function setFastSend(b:Bool):Void;
+	function setTimeout(timeout:Float):Void;
+	function shutdown(read:Bool, write:Bool):Void;
+
+	public static function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+		?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>};
+}
+
+private class SocketOutput extends haxe.io.Output {
+	var socket:NativeSocket;
+
+	public function new(socket:NativeSocket) {
+		this.socket = socket;
+	}
+
+	public override function writeByte(c:Int) {
+		try {
+			socket.sendChar(c);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
+				throw Blocked;
+			else if (e == "EOF")
+				throw new haxe.io.Eof();
+			else
+				throw Custom(e);
+		}
+	}
+
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int) {
+		return try {
+			socket.send(buf, pos, len);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
+				throw Blocked;
+			else
+				throw Custom(e);
+		}
+	}
+
+	public override function close() {
+		super.close();
+		socket.close();
+	}
+}
+
+private class SocketInput extends haxe.io.Input {
+	var socket:NativeSocket;
+
+	public function new(socket:NativeSocket) {
+		this.socket = socket;
+	}
+
+	public override function readByte() {
+		return try {
+			socket.receiveChar();
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
+				throw Blocked;
+			else
+				throw new haxe.io.Eof();
+		}
+	}
+
+	public override function readBytes(buf:haxe.io.Bytes, pos:Int, len:Int) {
+		var r;
+		try {
+			r = socket.receive(buf, pos, len);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
+				throw Blocked;
+			else
+				throw Custom(e);
+		}
+		if (r == 0)
+			throw new haxe.io.Eof();
+		return r;
+	}
+
+	public override function close() {
+		super.close();
+		socket.close();
+	}
+}
+
+@:coreApi
+class Socket {
+	public var input(default, null):haxe.io.Input;
+	public var output(default, null):haxe.io.Output;
+	public var custom:Dynamic;
+
+	@:ifFeature("sys.net.Socket.select") var socket:NativeSocket;
+
+	public function new() {
+		init(new NativeSocket());
+	}
+
+	private function init(socket:NativeSocket):Void {
+		this.socket = socket;
+		input = new SocketInput(socket);
+		output = new SocketOutput(socket);
+	}
+
+	public function close():Void {
+		socket.close();
+	}
+
+	public function read():String {
+		return input.readAll().toString();
+	}
+
+	public function write(content:String):Void {
+		output.writeString(content);
+	}
+
+	public function connect(host:Host, port:Int):Void {
+		socket.connect(host.ip, port);
+	}
+
+	public function listen(connections:Int):Void {
+		socket.listen(connections);
+	}
+
+	public function shutdown(read:Bool, write:Bool):Void {
+		socket.shutdown(read, write);
+	}
+
+	public function bind(host:Host, port:Int):Void {
+		socket.bind(host.ip, port);
+	}
+
+	public function accept():Socket {
+		var nativeSocket = socket.accept();
+		var socket:Socket = Type.createEmptyInstance(Socket);
+		socket.init(nativeSocket);
+		return socket;
+	}
+
+	@:access(sys.net.Host.init)
+	public function peer():{host:Host, port:Int} {
+		var info = socket.peer();
+		var host:Host = Type.createEmptyInstance(Host);
+		host.init(info.ip);
+		return {host: host, port: info.port};
+	}
+
+	@:access(sys.net.Host.init)
+	public function host():{host:Host, port:Int} {
+		var info = socket.host();
+		var host:Host = Type.createEmptyInstance(Host);
+		host.init(info.ip);
+		return {host: host, port: info.port};
+	}
+
+	public function setTimeout(timeout:Float):Void {
+		socket.setTimeout(timeout);
+	}
+
+	public function waitForRead():Void {
+		select([this], null, null, -1);
+	}
+
+	public function setBlocking(b:Bool):Void {} // TODO: Don't know how to implement this...
+
+	public function setFastSend(b:Bool):Void {
+		socket.setFastSend(b);
+	}
+
+	public static function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+			?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>} {
+		return NativeSocket.select(read, write, others, timeout);
+	}
+}
diff --git a/std/php7/_std/StringBuf.hx b/std/eval/_std/sys/thread/Thread.hx
similarity index 57%
rename from std/php7/_std/StringBuf.hx
rename to std/eval/_std/sys/thread/Thread.hx
index d321fad2f33b23ce972c4dd2ec8d019acfc82074..eb93020cb8285853cfe5270ae1c88dc1da481b3b 100644
--- a/std/php7/_std/StringBuf.hx
+++ b/std/eval/_std/sys/thread/Thread.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,43 +20,41 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-import php.Global;
-import php.Syntax;
+package sys.thread;
 
-@:coreApi class StringBuf {
-	private var b : String;
+import eval.vm.NativeThread;
 
-	public var length(get,never) : Int;
+abstract Thread(NativeThread) {
+	inline function new(h:NativeThread):Void {
+		this = h;
+	}
+
+	public inline function sendMessage(msg:Dynamic):Void {
+		this.sendMessage(msg);
+	}
 
-	public function new() : Void {
-		b = "";
+	public static inline function current():Thread {
+		return new Thread(NativeThread.self());
 	}
 
-	inline function get_length() : Int {
-		return b.length;
+	public static inline function create(callb:Void->Void):Thread {
+		return new Thread(new NativeThread(callb));
 	}
 
-	public function add<T>( x : T ) : Void {
-		if( x == null ) {
-			Syntax.binop(b, '.=', 'null');
-		} else if( Global.is_bool(x) ) {
-			Syntax.binop(b, '.=', ((x:Dynamic) ? 'true' : 'false'));
-		} else if( Global.is_string(x) ) {
-			Syntax.binop(b, '.=', x);
-		} else {
-			b += x;
-		}
+	public static inline function readMessage(block:Bool):Dynamic {
+		return NativeThread.readMessage(block);
 	}
 
-	public inline function addSub( s : String, pos : Int, ?len : Int ) : Void {
-		b += s.substr(pos,len);
+	public static inline function yield():Void {
+		NativeThread.yield();
 	}
 
-	public inline function addChar( c : Int ) : Void {
-		b += String.fromCharCode(c);
+	@:op(A == B)
+	public inline function equals(other:Thread):Bool {
+		return getHandle().id() == other.getHandle().id();
 	}
 
-	public inline function toString() : String {
-		return b;
+	private inline function getHandle():NativeThread {
+		return this;
 	}
 }
diff --git a/std/eval/vm/Context.hx b/std/eval/vm/Context.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b5f7b36135d2af436b35f54cf6e5e31361af74c1
--- /dev/null
+++ b/std/eval/vm/Context.hx
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C)2005-2019 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 eval.vm;
+
+extern class Context {
+	static function addBreakpoint(file:String, line:Int):Void;
+	static function breakHere():Void;
+	static function callMacroApi(s:String):Dynamic;
+
+	/**
+		Loads and returns a plugin from file `filePath`.
+
+		If Haxe is built natively, the extension automatically defaults to `.cmxs`,
+		even if a different extension is provided in `filePath`. In bytecode mode,
+		the default extension is `.cmo`.
+
+		Sample plugin:
+
+		```ocaml
+		open EvalValue
+		open EvalContext
+		open EvalEncode
+
+		let add_int = vfun2 (fun v1 v2 -> match v1,v2 with
+			| VInt32 i1,VInt32 i2 -> vint32 (Int32.add i1 i2)
+			| _ -> exc_string "Expected int + int"
+		)
+		;;
+		EvalStdLib.StdContext.register ["add_int",add_int]
+		```
+
+		Usage from Haxe:
+
+		```haxe
+		var module:TestPlugin = eval.vm.Context.loadPlugin("testPlugin.cmo");
+		trace(module.add_int(4, 3));
+		```
+
+		Plugins have to be compiled with the same OCaml version as the Haxe compiler
+		and using the same Haxe version. If a plugin cannot be loaded, an exception
+		of type `String` is thrown.
+	**/
+	static function loadPlugin<T>(filePath:String):T;
+}
diff --git a/std/eval/vm/Gc.hx b/std/eval/vm/Gc.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b52842b1439dd397963464fd049297a4d2171edc
--- /dev/null
+++ b/std/eval/vm/Gc.hx
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C)2005-2019 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 eval.vm;
+
+/**
+	The memory management counters are returned in a stat record.
+	The total amount of memory allocated by the program since it was started is (in words) minor_words + major_words - promoted_words. Multiply by the word size (4 on a 32-bit machine, 8 on a 64-bit machine) to get the number of bytes.
+**/
+typedef Stat = {
+	/**
+		Number of words allocated in the minor heap since the program was started. This number is accurate in byte-code programs, but only an approximation in programs compiled to native code.
+	**/
+	var minor_words:Float;
+
+	/**
+		Number of words allocated in the minor heap that survived a minor collection and were moved to the major heap since the program was started.
+	**/
+	var promoted_words:Float;
+
+	/**
+		Number of words allocated in the major heap, including the promoted words, since the program was started.
+	**/
+	var major_words:Float;
+
+	/**
+		Number of minor collections since the program was started.
+	**/
+	var minor_collections:Float;
+
+	/**
+		Number of major collection cycles completed since the program was started.
+	**/
+	var major_collections:Float;
+
+	/**
+		Total size of the major heap, in words.
+	**/
+	var heap_words:Int;
+
+	/**
+		Number of contiguous pieces of memory that make up the major heap.
+	**/
+	var heap_chunks:Int;
+
+	/**
+		Number of words of live data in the major heap, including the header words.
+	**/
+	var live_words:Int;
+
+	/**
+		Number of live blocks in the major heap.
+	**/
+	var live_blocks:Int;
+
+	/**
+		Number of words in the free list.
+	**/
+	var free_words:Int;
+
+	/**
+		Number of blocks in the free list.
+	**/
+	var free_blocks:Int;
+
+	/**
+		Size (in words) of the largest block in the free list.
+	**/
+	var largest_free:Int;
+
+	/**
+		Number of wasted words due to fragmentation. These are 1-words free blocks placed between two live blocks. They are not available for allocation.
+	**/
+	var fragments:Int;
+
+	/**
+		Number of heap compactions since the program was started.
+	**/
+	var compactions:Int;
+
+	/**
+		Maximum size reached by the major heap, in words.
+	**/
+	var top_heap_words:Int;
+
+	/**
+		Current size of the stack, in words.
+	**/
+	var stack_size:Int;
+}
+
+/**
+	The GC parameters are given as a control record. Note that these parameters can also be initialised by setting the OCAMLRUNPARAM environment variable. See the documentation of ocamlrun.
+**/
+typedef Control = {
+	/**
+		The size (in words) of the minor heap. Changing this parameter will trigger a minor collection. Default: 256k.
+	**/
+	var minor_heap_size:Int;
+
+	/**
+		How much to add to the major heap when increasing it. If this number is less than or equal to 1000, it is a percentage of the current heap size (i.e. setting it to 100 will double the heap size at each increase). If it is more than 1000, it is a fixed number of words that will be added to the heap. Default: 15.
+	**/
+	var major_heap_increment:Int;
+
+	/**
+		The major GC speed is computed from this parameter. This is the memory that will be "wasted" because the GC does not immediatly collect unreachable blocks. It is expressed as a percentage of the memory used for live data. The GC will work more (use more CPU time and collect blocks more eagerly) if space_overhead is smaller. Default: 80.
+	**/
+	var space_overhead:Int;
+
+	/**
+		This value controls the GC messages on standard error output. It is a sum of some of the following flags, to print messages on the corresponding events:
+			* 0x001 Start of major GC cycle.
+			* 0x002 Minor collection and major GC slice.
+			* 0x004 Growing and shrinking of the heap.
+			* 0x008 Resizing of stacks and memory manager tables.
+			* 0x010 Heap compaction.
+			* 0x020 Change of GC parameters.
+			* 0x040 Computation of major GC slice size.
+			* 0x080 Calling of finalisation functions.
+			* 0x100 Bytecode executable and shared library search at start-up.
+			* 0x200 Computation of compaction-triggering condition.
+			* 0x400 Output GC statistics at program exit. Default: 0.
+	**/
+	var verbose:Int;
+
+	/**
+		Heap compaction is triggered when the estimated amount of "wasted" memory is more than max_overhead percent of the amount of live data. If max_overhead is set to 0, heap compaction is triggered at the end of each major GC cycle (this setting is intended for testing purposes only). If max_overhead >= 1000000, compaction is never triggered. If compaction is permanently disabled, it is strongly suggested to set allocation_policy to 1. Default: 500.
+	**/
+	var max_overhead:Int;
+
+	/**
+		The maximum size of the stack (in words). This is only relevant to the byte-code runtime, as the native code runtime uses the operating system's stack. Default: 1024k.
+	**/
+	var stack_limit:Int;
+
+	/**
+		The policy used for allocating in the heap. Possible values are 0 and 1. 0 is the next-fit policy, which is quite fast but can result in fragmentation. 1 is the first-fit policy, which can be slower in some cases but can be better for programs with fragmentation problems. Default: 0.
+	**/
+	var allocation_policy:Int;
+}
+
+/**
+	Memory management control and statistics; finalised values.
+**/
+extern class Gc {
+	/**
+		Return the total number of bytes allocated since the program was started. It is returned as a float to avoid overflow problems with int on 32-bit machines.
+	**/
+	static function allocated_bytes():Float;
+
+	/**
+		Perform a full major collection and compact the heap. Note that heap compaction is a lengthy operation.
+	**/
+	static function compact():Void;
+
+	/**
+		Return (minor_words, promoted_words, major_words). This function is as fast as quick_stat.
+	**/
+	static function counters():{minor_words:Float, promoted_words:Float, major_words:Float};
+
+	/**
+		Registers f as a finalisation function for v. v must be heap-allocated. f will be called with v as argument at some point between the first time v becomes unreachable (including through weak pointers) and the time v is collected by the GC. Several functions can be registered for the same value, or even several instances of the same function. Each instance will be called once (or never, if the program terminates before v becomes unreachable).
+		The GC will call the finalisation functions in the order of deallocation. When several values become unreachable at the same time (i.e. during the same GC cycle), the finalisation functions will be called in the reverse order of the corresponding calls to finalise. If finalise is called in the same order as the values are allocated, that means each value is finalised before the values it depends upon. Of course, this becomes false if additional dependencies are introduced by assignments.
+
+		In the presence of multiple OCaml threads it should be assumed that any particular finaliser may be executed in any of the threads.
+	**/
+	static function finalise<T>(f:T->Void, v:T):Void;
+
+	/**
+		Do a minor collection, finish the current major collection cycle, and perform a complete new cycle. This will collect all currently unreachable blocks.
+	**/
+	static function full_major():Void;
+
+	/**
+		Return the current values of the GC parameters in a control record.
+	**/
+	static function get():Control;
+
+	/**
+		Do a minor collection and finish the current major collection cycle.
+	**/
+	static function major():Void;
+
+	/**
+		Do a minor collection and a slice of major collection. n is the size of the slice: the GC will do enough work to free (on average) n words of memory. If n = 0, the GC will try to do enough work to ensure that the next automatic slice has no work to do. This function returns an unspecified integer (currently: 0).
+	**/
+	static function major_slice():Void;
+
+	/**
+		Trigger a minor collection.
+	**/
+	static function minor():Void;
+
+	/**
+		Print the current values of the memory management counters (in human-readable form) into the channel argument.
+	**/
+	static function print_stat(out_channel:haxe.io.Output):Void;
+
+	/**
+		Same as stat except that live_words, live_blocks, free_words, free_blocks, largest_free, and fragments are set to 0. This function is much faster than stat because it does not need to go through the heap.
+	**/
+	static function quick_stat():Stat;
+
+	/**
+		Changes the GC parameters according to the control record r.
+	**/
+	static function set(r:Control):Void;
+
+	/**
+		Return the current values of the memory management counters in a stat record. This function examines every heap block to get the statistics.
+	**/
+	static function stat():Stat;
+}
diff --git a/std/eval/vm/NativeThread.hx b/std/eval/vm/NativeThread.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6640f4a5b733bdc564b5028162a1841c68724f6d
--- /dev/null
+++ b/std/eval/vm/NativeThread.hx
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C)2005-2019 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 eval.vm;
+
+extern class NativeThread {
+	/**
+		Creates a new thread that executes function `f`.
+
+		Exceptions caused while executing `f` are printed to stderr and are not
+		propagated to the parent thread.
+	**/
+	function new(f:Void->Void):Void;
+
+	/**
+		Return the identifier of the given thread. A thread identifier is an integer
+		that identifies uniquely the thread. It can be used to build data structures
+		indexed by threads.
+	**/
+	function id():Int;
+
+	/**
+		Terminate prematurely the thread whose handle is given. This functionality is
+		available only with bytecode-level threads.
+	**/
+	function kill():Int;
+
+	/**
+		Suspends the execution of the calling thread for `f` seconds. The other program
+		threads continue to run during this time.
+	**/
+	static function delay(f:Float):Void;
+
+	/**
+		Terminate prematurely the currently executing thread.
+	**/
+	static function exit():Void;
+
+	/**
+		Suspends the execution of the calling thread until the thread `thread` has
+		terminated.
+	**/
+	static function join(thread:NativeThread):Void;
+
+	/**
+		Return the thread currently executing.
+	**/
+	static function self():NativeThread;
+
+	/**
+		Re-schedule the calling thread without suspending it. This function can be used
+		to give scheduling hints, telling the scheduler that now is a good time to switch
+		to other threads.
+	**/
+	static function yield():Void;
+
+	static function readMessage<T>(block:Bool):T;
+
+	function sendMessage<T>(msg:T):Void;
+}
diff --git a/std/flash/AnyType.hx b/std/flash/AnyType.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0e35c323cefc2c2e0a40fd895835a3224dcb9eb2
--- /dev/null
+++ b/std/flash/AnyType.hx
@@ -0,0 +1,9 @@
+package flash;
+
+/**
+	This type represents the Flash `*` type, which is
+	actually the absense of type. It can be used as a
+	type parameter for `flash.Vector` to represent the
+	native `Vector.<*>` type.
+**/
+@:coreType abstract AnyType from Dynamic to Dynamic {}
diff --git a/std/flash/Boot.hx b/std/flash/Boot.hx
index c19a7d0074ed2dbfcfb9efc780b8f665e08cfb80..95ed3b9d3e2bad537ef62771110f8c7f46206f15 100644
--- a/std/flash/Boot.hx
+++ b/std/flash/Boot.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package flash;
 
 #if !as3
-@:keep private class RealBoot extends Boot implements Dynamic {
+@:keep private class RealBoot extends Boot {
 	#if swc
 	public function new() {
 		super();
 	}
+
 	public static function initSwc(mc) {
 		flash.Lib.current = mc;
 		new RealBoot().init();
@@ -34,7 +36,8 @@ package flash;
 	#else
 	function new() {
 		super();
-		if( flash.Lib.current == null ) flash.Lib.current = this;
+		if (flash.Lib.current == null)
+			flash.Lib.current = this;
 		start();
 	}
 	#end
@@ -44,30 +47,29 @@ package flash;
 @:dox(hide)
 @:keep
 class Boot extends flash.display.MovieClip {
-
-	static var tf : flash.text.TextField;
-	static var lines : Array<String>;
-	static var lastError : flash.errors.Error;
+	static var tf:flash.text.TextField;
+	static var lines:Array<String>;
+	static var lastError:flash.errors.Error;
 
 	public static var skip_constructor = false;
 
 	function start() {
 		#if dontWaitStage
-			init();
+		init();
 		#else
-			var c = flash.Lib.current;
-			try {
-				untyped if( c == this && c.stage != null && c.stage.align == "" )
-					c.stage.align = "TOP_LEFT";
-			} catch( e : Dynamic ) {
-				// security error when loading from different domain
-			}
-			if( c.stage == null )
-				c.addEventListener(flash.events.Event.ADDED_TO_STAGE, doInitDelay);
-			else if( c.stage.stageWidth == 0 || c.stage.stageHeight == 0 )
-				untyped __global__["flash.utils.setTimeout"](start,1);
-			else
-				init();
+		var c = flash.Lib.current;
+		try {
+			untyped if (c == this && c.stage != null && c.stage.align == "")
+				c.stage.align = "TOP_LEFT";
+		} catch (e:Dynamic) {
+			// security error when loading from different domain
+		}
+		if (c.stage == null)
+			c.addEventListener(flash.events.Event.ADDED_TO_STAGE, doInitDelay);
+		else if (c.stage.stageWidth == 0 || c.stage.stageHeight == 0)
+			untyped __global__["flash.utils.setTimeout"](start, 1);
+		else
+			init();
 		#end
 	}
 
@@ -81,33 +83,33 @@ class Boot extends flash.display.MovieClip {
 	}
 
 	static var IN_E = 0;
-	public static function enum_to_string( e : { tag : String, params : Array<Dynamic> } ) {
-		if( e.params == null )
+
+	public static function enum_to_string(e:{tag:String, params:Array<Dynamic>}) {
+		if (e.params == null)
 			return e.tag;
 		var pstr = [];
-		if( IN_E > 15 ) {
+		if (IN_E > 15) {
 			pstr.push("...");
 		} else {
 			IN_E++;
-			for( p in e.params )
+			for (p in e.params)
 				pstr.push(__string_rec(p, ""));
 			IN_E--;
 		}
-		return e.tag+"("+pstr.join(",")+")";
+		return e.tag + "(" + pstr.join(",") + ")";
 	}
 
-	public static function __instanceof( v : Dynamic, t : Dynamic ) {
+	public static function __instanceof(v:Dynamic, t:Dynamic) {
 		try {
-			if( t == Dynamic )
-				return true;
-			return untyped __is__(v,t);
-		} catch( e : Dynamic ) {
-		}
+			if (t == Dynamic)
+				return v != null;
+			return untyped __is__(v, t);
+		} catch (e:Dynamic) {}
 		return false;
 	}
 
 	public static function __clear_trace() {
-		if( tf == null )
+		if (tf == null)
 			return;
 		tf.parent.removeChild(tf);
 		tf = null;
@@ -122,11 +124,11 @@ class Boot extends flash.display.MovieClip {
 
 	public static function getTrace() {
 		var mc = flash.Lib.current;
-		if( tf == null ) {
+		if (tf == null) {
 			tf = new flash.text.TextField();
 			#if flash10_2
 			var color = 0xFFFFFF, glow = 0;
-			if( mc.stage != null ) {
+			if (mc.stage != null) {
 				glow = mc.stage.color;
 				color = 0xFFFFFF - glow;
 			}
@@ -137,82 +139,97 @@ class Boot extends flash.display.MovieClip {
 			format.font = "_sans";
 			tf.defaultTextFormat = format;
 			tf.selectable = false;
-			tf.width = if( mc.stage == null ) 800 else mc.stage.stageWidth;
+			tf.width = if (mc.stage == null) 800 else mc.stage.stageWidth;
 			tf.autoSize = flash.text.TextFieldAutoSize.LEFT;
 			tf.mouseEnabled = false;
 		}
-		if( mc.stage == null )
+		if (mc.stage == null)
 			mc.addChild(tf);
 		else
 			mc.stage.addChild(tf); // on top
 		return tf;
 	}
 
-	public static function __trace( v : Dynamic, pos : haxe.PosInfos ) {
+	public static function __trace(v:Dynamic, pos:haxe.PosInfos) {
 		var tf = getTrace();
-		var pstr = if( pos == null ) "(null)" else pos.fileName+":"+pos.lineNumber;
-		if( lines == null ) lines = [];
-		var str = pstr +": "+__string_rec(v, "");
-		if( pos != null && pos.customParams != null )
-			for( v in pos.customParams )
-				str += ","+__string_rec(v, "");
+		var pstr = if (pos == null) "(null)" else pos.fileName + ":" + pos.lineNumber;
+		if (lines == null)
+			lines = [];
+		var str = pstr + ": " + __string_rec(v, "");
+		if (pos != null && pos.customParams != null)
+			for (v in pos.customParams)
+				str += "," + __string_rec(v, "");
 		lines = lines.concat(str.split("\n"));
 		tf.text = lines.join("\n");
 		var stage = flash.Lib.current.stage;
-		if( stage == null )
+		if (stage == null)
 			return;
-		while( lines.length > 1 && tf.height > stage.stageHeight ) {
+		while (lines.length > 1 && tf.height > stage.stageHeight) {
 			lines.shift();
 			tf.text = lines.join("\n");
 		}
 	}
 
-	public static function __string_rec( v : Dynamic, str : String ) {
+	public static function __string_rec(v:Dynamic, str:String, maxRecursion:Int = 5) {
+		if (maxRecursion <= 0) {
+			return "<...>";
+		}
 		var cname = untyped __global__["flash.utils.getQualifiedClassName"](v);
-		switch( cname ) {
-		case "Object":
-			var k : Array<String> = untyped __keys__(v);
-			var s = "{";
-			var first = true;
-			for( i in 0...k.length ) {
-				var key = k[i];
-				if( key == "toString" )
-					try return v.toString() catch( e : Dynamic ) {}
-				if( first )
-					first = false;
-				else
-					s += ",";
-				s += " "+key+" : "+__string_rec(v[untyped key],str);
-			}
-			if( !first )
-				s += " ";
-			s += "}";
-			return s;
-		case "Array":
-			if( v == Array )
-				return "#Array";
-			var s = "[";
-			var i;
-			var first = true;
-			var a : Array<Dynamic> = v;
-			for( i in 0...a.length ) {
-				if( first )
-					first = false;
-				else
-					s += ",";
-				s += __string_rec(a[i],str);
-			}
-			return s + "]";
-		default:
-			switch( untyped __typeof__(v) ) {
-			case "function": return "<function>";
-			case "undefined": return "null";
-			}
+		switch (cname) {
+			case "Object":
+				var k:Array<String> = untyped __keys__(v);
+				var s = "{";
+				var first = true;
+				for (i in 0...k.length) {
+					var key = k[i];
+					if (key == "toString")
+						try
+							return v.toString()
+						catch (e:Dynamic) {}
+					if (first)
+						first = false;
+					else
+						s += ",";
+					s += " " + key + " : " + __string_rec(v[untyped key], str, maxRecursion - 1);
+				}
+				if (!first)
+					s += " ";
+				s += "}";
+				return s;
+			case "Array":
+				if (v == Array)
+					return "#Array";
+				var s = "[";
+				var i;
+				var first = true;
+				var a:Array<Dynamic> = v;
+				for (i in 0...a.length) {
+					if (first)
+						first = false;
+					else
+						s += ",";
+					s += __string_rec(a[i], str, maxRecursion - 1);
+				}
+				return s + "]";
+			default:
+				switch (untyped __typeof__(v)) {
+					case "function": return "<function>";
+					case "undefined": return "null";
+				}
 		}
 		return new String(v);
 	}
 
-	static function __unprotect__( s : String ) {
+	static public function fromCodePoint(code:Int) {
+		var o = new flash.utils.ByteArray();
+		o.endian = LITTLE_ENDIAN;
+		o.writeShort((code >> 10) + 0xD7C0);
+		o.writeShort((code & 0x3FF) + 0xDC00);
+		o.position = 0;
+		return o.readMultiByte(4, "unicode");
+	}
+
+	static function __unprotect__(s:String) {
 		return s;
 	}
 
@@ -232,97 +249,145 @@ class Boot extends flash.display.MovieClip {
 		}
 	}
 
-	static function __init__() untyped {
-		var aproto = Array.prototype;
-		aproto.copy = function() {
-			return __this__.slice();
-		};
-		aproto.insert = function(i,x) {
-			__this__.splice(i,0,x);
-		};
-		aproto.remove = function(obj) {
-			var idx = __this__.indexOf(obj);
-			if( idx == -1 ) return false;
-			#if flash19
-			__this__.removeAt(idx);
-			#else
-			__this__.splice(idx,1);
-			#end
-			return true;
-		}
-		aproto.iterator = function() {
-			var cur = 0;
-			var arr : Array<Dynamic> = __this__;
-			return {
-				hasNext : function() {
-					return cur < arr.length;
-				},
-				next : function() {
-					return arr[cur++];
+	static function __init__()
+		untyped {
+			var d:Dynamic = Date;
+			d.now = function() {
+				return __new__(Date);
+			};
+			d.fromTime = function(t) {
+				var d:Date = __new__(Date);
+				d.setTime(t);
+				return d;
+			};
+			d.fromString = function(s:String) {
+				switch (s.length) {
+					case 8: // hh:mm:ss
+						var k = s.split(":");
+						var d:Date = __new__(Date);
+						d.setTime(0);
+						d.setUTCHours(k[0]);
+						d.setUTCMinutes(k[1]);
+						d.setUTCSeconds(k[2]);
+						return d;
+					case 10: // YYYY-MM-DD
+						var k = s.split("-");
+						return new Date(cast k[0], cast k[1] - 1, cast k[2], 0, 0, 0);
+					case 19: // YYYY-MM-DD hh:mm:ss
+						var k = s.split(" ");
+						var y = k[0].split("-");
+						var t = k[1].split(":");
+						return new Date(cast y[0], cast y[1] - 1, cast y[2], cast t[0], cast t[1], cast t[2]);
+					default:
+						throw "Invalid date format : " + s;
 				}
+			};
+			d.prototype[#if (as3 || no_flash_override) "toStringHX" #else "toString" #end] = function() {
+				var date:Date = __this__;
+				var m = date.getMonth() + 1;
+				var d = date.getDate();
+				var h = date.getHours();
+				var mi = date.getMinutes();
+				var s = date.getSeconds();
+				return date.getFullYear() + "-" + (if (m < 10) "0" + m else "" + m) + "-" + (if (d < 10) "0" + d else "" + d) + " "
+					+ (if (h < 10) "0" + h else "" + h) + ":" + (if (mi < 10) "0" + mi else "" + mi) + ":" + (if (s < 10) "0" + s else "" + s);
+			};
+			var aproto = Array.prototype;
+			aproto.copy = function() {
+				return __this__.slice();
+			};
+			aproto.insert = function(i, x) {
+				__this__.splice(i, 0, x);
+			};
+			aproto.remove = function(obj) {
+				var idx = __this__.indexOf(obj);
+				if (idx == -1)
+					return false;
+				#if flash19
+				// removeAt is only available through as3 namespace and genswf9 will only generate it for a known Array,
+				// so we have to type it properly (thus the typecheck). See https://github.com/HaxeFoundation/haxe/issues/8612
+				(__this__:Array<Dynamic>).removeAt(idx);
+				#else
+				__this__.splice(idx, 1);
+				#end
+				return true;
 			}
-		};
-		aproto.setPropertyIsEnumerable("copy", false);
-		aproto.setPropertyIsEnumerable("insert", false);
-		aproto.setPropertyIsEnumerable("remove", false);
-		aproto.setPropertyIsEnumerable("iterator", false);
-		#if (as3 || no_flash_override)
-		aproto.filterHX = function(f) {
-			var ret = [];
-			var i = 0;
-			var l = __this__.length;
-			while ( i < l ) {
-				if (f(__this__[i]))
-					ret.push(__this__[i]);
-				i++;
-			}
-			return ret;
-		};
-		aproto.mapHX = function(f) {
-			var ret = [];
-			var i = 0;
-			var l = __this__.length;
-			while( i < l ) {
-				ret.push(f(__this__[i]));
-				i++;
-			}
-			return ret;
-		};
-		aproto.setPropertyIsEnumerable("mapHX", false);
-		aproto.setPropertyIsEnumerable("filterHX", false);
-		String.prototype.charCodeAtHX = function(i) : Null<Int> {
-		#else
-		aproto["filter"] = function(f) {
-			var ret = [];
-			var i = 0;
-			var l = __this__.length;
-			while ( i < l ) {
-				if (f(__this__[i]))
-					ret.push(__this__[i]);
-				i++;
-			}
-			return ret;
-		};
-		aproto["map"] = function(f) {
-			var ret = [];
-			var i = 0;
-			var l = __this__.length;
-			while( i < l ) {
-				ret.push(f(__this__[i]));
-				i++;
-			}
-			return ret;
-		};
-		aproto.setPropertyIsEnumerable("map", false);
-		aproto.setPropertyIsEnumerable("filter", false);
-		String.prototype.charCodeAt = function(i) : Null<Int> {
-		#end
-			var s : String = __this__;
-			var x : Float = s.cca(i);
-			if( __global__["isNaN"](x) )
-				return null;
-			return Std.int(x);
-		};
+			aproto.iterator = function() {
+				var cur = 0;
+				var arr:Array<Dynamic> = __this__;
+				return {
+					hasNext: function() {
+						return cur < arr.length;
+					},
+					next: function() {
+						return arr[cur++];
+					}
+				}
+			};
+			aproto.resize = function(len) {
+				__this__.length = len;
+			};
+			aproto.setPropertyIsEnumerable("copy", false);
+			aproto.setPropertyIsEnumerable("insert", false);
+			aproto.setPropertyIsEnumerable("remove", false);
+			aproto.setPropertyIsEnumerable("iterator", false);
+			aproto.setPropertyIsEnumerable("resize", false);
+			#if (as3 || no_flash_override)
+			aproto.filterHX = function(f) {
+				var ret = [];
+				var i = 0;
+				var l = __this__.length;
+				while (i < l) {
+					if (f(__this__[i]))
+						ret.push(__this__[i]);
+					i++;
+				}
+				return ret;
+			};
+			aproto.mapHX = function(f) {
+				var ret = [];
+				var i = 0;
+				var l = __this__.length;
+				while (i < l) {
+					ret.push(f(__this__[i]));
+					i++;
+				}
+				return ret;
+			};
+			aproto.setPropertyIsEnumerable("mapHX", false);
+			aproto.setPropertyIsEnumerable("filterHX", false);
+			String.prototype.charCodeAtHX = function(i):Null<Int> {
+			#else
+			aproto["filter"] = function(f) {
+				var ret = [];
+				var i = 0;
+				var l = __this__.length;
+				while (i < l) {
+					if (f(__this__[i]))
+						ret.push(__this__[i]);
+					i++;
+				}
+				return ret;
+			};
+			aproto["map"] = function(f) {
+				var ret = [];
+				var i = 0;
+				var l = __this__.length;
+				while (i < l) {
+					ret.push(f(__this__[i]));
+					i++;
+				}
+				return ret;
+			};
+			aproto.setPropertyIsEnumerable("map", false);
+			aproto.setPropertyIsEnumerable("filter", false);
+			String.prototype.charCodeAt = function(i):Null<Int> {
+			#end
+				var s:String = __this__;
+				var x:Float = s.cca(i);
+				if (__global__["isNaN"](x))
+					return null;
+				return Std.int(x);
+			};
 	}
-
 }
diff --git a/std/flash/Lib.hx b/std/flash/Lib.hx
index 5dd355a3eb72df7f63769385a8b818aa290d7d9a..06b631a56510cee02f7839e1c51fcc9bf3464eb0 100644
--- a/std/flash/Lib.hx
+++ b/std/flash/Lib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,67 +19,68 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package flash;
 
 /**
-	Platform-specific Flash Library. Provides some platform-specific 
+	Platform-specific Flash Library. Provides some platform-specific
 	functions for the Flash target.
 **/
 class Lib {
+	public static var current:flash.display.MovieClip;
 
-	public static var current : flash.display.MovieClip;
-
-	public inline static function getTimer() : Int {
+	public inline static function getTimer():Int {
 		return untyped __global__["flash.utils.getTimer"]();
 	}
 
-	public static function eval( path : String ) : Dynamic {
+	public static function eval(path:String):Dynamic {
 		var p = path.split(".");
 		var fields = new Array();
-		var o : Dynamic = null;
-		while( p.length > 0 ) {
+		var o:Dynamic = null;
+		while (p.length > 0) {
 			try {
 				o = untyped __global__["flash.utils.getDefinitionByName"](p.join("."));
-			} catch( e : Dynamic ) {
+			} catch (e:Dynamic) {
 				fields.unshift(p.pop());
 			}
-			if( o != null )
+			if (o != null)
 				break;
 		}
-		for( f in fields ) {
-			if( o == null ) return null;
+		for (f in fields) {
+			if (o == null)
+				return null;
 			o = untyped o[f];
 		}
 		return o;
 	}
 
-	public static function getURL( url : flash.net.URLRequest, ?target : String ) {
+	public static function getURL(url:flash.net.URLRequest, ?target:String) {
 		var f = untyped __global__["flash.net.navigateToURL"];
-		if( target == null )
+		if (target == null)
 			f(url);
 		else
-			(cast f)(url,target);
+			(cast f)(url, target);
 	}
 
-	public static function fscommand( cmd : String, ?param : String ) {
-		untyped __global__["flash.system.fscommand"](cmd,if( param == null ) "" else param);
+	public static function fscommand(cmd:String, ?param:String) {
+		untyped __global__["flash.system.fscommand"](cmd, if (param == null) "" else param);
 	}
 
-	public static function trace( arg : Dynamic ) {
+	public static function trace(arg:Dynamic) {
 		untyped __global__["trace"](arg);
 	}
-	
-	public static function describeType( value : Dynamic ) : flash.xml.XML {
+
+	public static function describeType(value:Dynamic):flash.xml.XML {
 		return untyped __global__["flash.utils.describeType"](value);
 	}
 
-	public static function attach( name : String ) : flash.display.MovieClip {
-		var cl = untyped __as__(__global__["flash.utils.getDefinitionByName"](name),Class);
+	public static function attach(name:String):flash.display.MovieClip {
+		var cl = untyped __as__(__global__["flash.utils.getDefinitionByName"](name), Class);
 		return untyped __new__(cl);
 	}
 
-	public inline static function as<T>( v : Dynamic, c : Class<T> ) : Null<T> {
-		return untyped __as__(v,c);
+	public inline static function as<T>(v:Dynamic, c:Class<T>):Null<T> {
+		return untyped __as__(v, c);
 	}
 
 	public static function redirectTraces() {
@@ -87,15 +88,16 @@ class Lib {
 			haxe.Log.trace = traceToConsole;
 	}
 
-	static function traceToConsole(v : Dynamic, ?inf : haxe.PosInfos ) {
-		var type = if( inf != null && inf.customParams != null ) inf.customParams[0] else null;
-		if( type != "warn" && type != "info" && type != "debug" && type != "error" )
-			type = if( inf == null ) "error" else "log";
-		var str = if( inf == null ) "" else inf.fileName + ":" + inf.lineNumber + " : ";
-		try	str += Std.string(v) catch( e : Dynamic ) str += "????";
+	static function traceToConsole(v:Dynamic, ?inf:haxe.PosInfos) {
+		var type = if (inf != null && inf.customParams != null) inf.customParams[0] else null;
+		if (type != "warn" && type != "info" && type != "debug" && type != "error")
+			type = if (inf == null) "error" else "log";
+		var str = if (inf == null) "" else inf.fileName + ":" + inf.lineNumber + " : ";
+		try
+			str += Std.string(v)
+		catch (e:Dynamic)
+			str += "????";
 		str = str.split("\\").join("\\\\");
-		flash.external.ExternalInterface.call("console."+type,str);
+		flash.external.ExternalInterface.call("console." + type, str);
 	}
 }
-
-
diff --git a/std/flash/Memory.hx b/std/flash/Memory.hx
index 4d20d19d5ea45e0b729111ffda6d5ab8d2a2d685..88a27cf4b85417e70f2effb12d846742ed53cabb 100644
--- a/std/flash/Memory.hx
+++ b/std/flash/Memory.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,64 +19,63 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package flash;
 
 extern class Memory {
-
-	public static inline function select( b : flash.utils.ByteArray ) : Void {
+	public static inline function select(b:flash.utils.ByteArray):Void {
 		flash.system.ApplicationDomain.currentDomain.domainMemory = b;
 	}
 
-	public static inline function setByte( addr : Int, v : Int ) : Void {
-		untyped __vmem_set__(0,addr,v);
+	public static inline function setByte(addr:Int, v:Int):Void {
+		untyped __vmem_set__(0, addr, v);
 	}
 
-	public static inline function setI16( addr : Int, v : Int ) : Void {
-		untyped __vmem_set__(1,addr,v);
+	public static inline function setI16(addr:Int, v:Int):Void {
+		untyped __vmem_set__(1, addr, v);
 	}
 
-	public static inline function setI32( addr : Int, v : Int ) : Void {
-		untyped __vmem_set__(2,addr,v);
+	public static inline function setI32(addr:Int, v:Int):Void {
+		untyped __vmem_set__(2, addr, v);
 	}
 
-	public static inline function setFloat( addr : Int, v : Float ) : Void {
-		untyped __vmem_set__(3,addr,v);
+	public static inline function setFloat(addr:Int, v:Float):Void {
+		untyped __vmem_set__(3, addr, v);
 	}
 
-	public static inline function setDouble( addr : Int, v : Float ) : Void {
-		untyped __vmem_set__(4,addr,v);
+	public static inline function setDouble(addr:Int, v:Float):Void {
+		untyped __vmem_set__(4, addr, v);
 	}
 
-	public static inline function getByte( addr : Int ) : Int {
-		return untyped __vmem_get__(0,addr);
+	public static inline function getByte(addr:Int):Int {
+		return untyped __vmem_get__(0, addr);
 	}
 
-	public static inline function getUI16( addr : Int ) : Int {
-		return untyped __vmem_get__(1,addr);
+	public static inline function getUI16(addr:Int):Int {
+		return untyped __vmem_get__(1, addr);
 	}
 
-	public static inline function getI32( addr : Int ) : Int {
-		return untyped __vmem_get__(2,addr);
+	public static inline function getI32(addr:Int):Int {
+		return untyped __vmem_get__(2, addr);
 	}
 
-	public static inline function getFloat( addr : Int ) : Float {
-		return untyped __vmem_get__(3,addr);
+	public static inline function getFloat(addr:Int):Float {
+		return untyped __vmem_get__(3, addr);
 	}
 
-	public static inline function getDouble( addr : Int ) : Float {
-		return untyped __vmem_get__(4,addr);
+	public static inline function getDouble(addr:Int):Float {
+		return untyped __vmem_get__(4, addr);
 	}
 
-	public static inline function signExtend1( v : Int ) : Int {
-		return untyped __vmem_sign__(0,v);
+	public static inline function signExtend1(v:Int):Int {
+		return untyped __vmem_sign__(0, v);
 	}
 
-	public static inline function signExtend8( v : Int ) : Int {
-		return untyped __vmem_sign__(1,v);
+	public static inline function signExtend8(v:Int):Int {
+		return untyped __vmem_sign__(1, v);
 	}
 
-	public static inline function signExtend16( v : Int ) : Int {
-		return untyped __vmem_sign__(2,v);
+	public static inline function signExtend16(v:Int):Int {
+		return untyped __vmem_sign__(2, v);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/flash/NativeXml.hx b/std/flash/NativeXml.hx
index dfb090f3b8ce785a1a0e50700994f1970bf932ff..309e224826944488e6891e044afd5f2af76aeab7 100644
--- a/std/flash/NativeXml.hx
+++ b/std/flash/NativeXml.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,119 +19,118 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package flash;
 
 import flash.xml.XML;
 import flash.xml.XMLList;
 
-extern enum XmlType {
-}
-
+extern enum XmlType {}
 typedef NativeXml = Xml;
 
 class Xml {
-
-	public static var Element(default,null) : XmlType;
-	public static var PCData(default,null) : XmlType;
-	public static var CData(default,null) : XmlType;
-	public static var Comment(default,null) : XmlType;
-	public static var DocType(default,null) : XmlType;
-	public static var ProcessingInstruction(default,null) : XmlType;
-	public static var Document(default,null) : XmlType;
-
-	public var nodeType(default,null) : XmlType;
-	public var nodeName(get,set) : String;
-	public var nodeValue(get,set) : String;
-	public var parent(get,null) : Xml;
-
-	var _node : flash.xml.XML;
-
-	public static function parse( str : String ) : Xml {
+	public static var Element(default, null):XmlType;
+	public static var PCData(default, null):XmlType;
+	public static var CData(default, null):XmlType;
+	public static var Comment(default, null):XmlType;
+	public static var DocType(default, null):XmlType;
+	public static var ProcessingInstruction(default, null):XmlType;
+	public static var Document(default, null):XmlType;
+
+	public var nodeType(default, null):XmlType;
+	public var nodeName(get, set):String;
+	public var nodeValue(get, set):String;
+	public var parent(get, null):Xml;
+
+	var _node:flash.xml.XML;
+
+	public static function parse(str:String):Xml {
 		XML.ignoreWhitespace = false;
 		XML.ignoreProcessingInstructions = false;
 		XML.ignoreComments = false;
 		var prefix = "<__document";
 		var root = null;
-		while( root == null ) {
+		while (root == null) {
 			try {
-				root = new flash.xml.XML(prefix+">" + str + "</__document>");
-			} catch( e : flash.errors.TypeError ) {
+				root = new flash.xml.XML(prefix + ">" + str + "</__document>");
+			} catch (e:flash.errors.TypeError) {
 				// if we miss a namespace, let's add it !
-				var r = ~/"([^"]+)"/; //"
-				if( e.errorID == 1083 && r.match(e.message) ) {
+				var r = ~/"([^"]+)"/; // "
+				if (e.errorID == 1083 && r.match(e.message)) {
 					var ns = r.matched(1);
 					prefix += " xmlns:" + ns + '="@' + ns + '"';
 				} else
 					throw e;
 			}
 		}
-		return wrap( root, Xml.Document );
+		return wrap(root, Xml.Document);
 	}
 
-	@:keep #if as3 @:hack public #end static function compare( a : Xml, b : Xml ) : Bool {
+	@:keep #if as3 @:hack
+	public #end static function compare(a:Xml, b:Xml):Bool {
 		return a == null ? b == null : (b == null ? false : a._node == b._node);
 	}
 
-	private function new() : Void {}
+	private function new():Void {}
 
-	public static function createElement( name : String ) : Xml {
-		return wrap( new flash.xml.XML("<"+name+"/>"), Xml.Element );
+	public static function createElement(name:String):Xml {
+		return wrap(new flash.xml.XML("<" + name + "/>"), Xml.Element);
 	}
 
-	public static function createPCData( data : String ) : Xml {
+	public static function createPCData(data:String):Xml {
 		XML.ignoreWhitespace = false;
-		return wrap( new flash.xml.XML(data), Xml.PCData );
+		return wrap(new flash.xml.XML(data), Xml.PCData);
 	}
 
-	public static function createCData( data : String ) : Xml {
-		return wrap( new flash.xml.XML("<![CDATA["+data+"]]>"), Xml.CData );
+	public static function createCData(data:String):Xml {
+		return wrap(new flash.xml.XML("<![CDATA[" + data + "]]>"), Xml.CData);
 	}
 
-	public static function createComment( data : String ) : Xml {
+	public static function createComment(data:String):Xml {
 		XML.ignoreComments = false;
-		return wrap( new flash.xml.XML("<!--"+data+"-->"), Xml.Comment );
+		return wrap(new flash.xml.XML("<!--" + data + "-->"), Xml.Comment);
 	}
 
-	public static function createDocType( data : String ) : Xml {
-		return wrap( new flash.xml.XML("<!DOCTYPE "+data+">"), Xml.DocType );
+	public static function createDocType(data:String):Xml {
+		return wrap(new flash.xml.XML("<!DOCTYPE " + data + ">"), Xml.DocType);
 	}
 
-	public static function createProcessingInstruction( data : String ) : Xml {
+	public static function createProcessingInstruction(data:String):Xml {
 		XML.ignoreProcessingInstructions = false;
-		return wrap( new flash.xml.XML("<?"+data+"?>"), Xml.ProcessingInstruction );
+		return wrap(new flash.xml.XML("<?" + data + "?>"), Xml.ProcessingInstruction);
 	}
 
-	public static function createDocument() : Xml {
-		return wrap( new flash.xml.XML("<__document/>"), Xml.Document );
+	public static function createDocument():Xml {
+		return wrap(new flash.xml.XML("<__document/>"), Xml.Document);
 	}
 
-	private static function getNodeType( node : flash.xml.XML ) : XmlType {
-		switch( node.nodeKind() ) {
-		case "element":
-			return Xml.Element;
-		case "text":
-			return Xml.PCData;
-		case "processing-instruction":
-			return Xml.ProcessingInstruction;
-		case "comment":
-			return Xml.Comment;
-		default :
-			throw "unimplemented node type: " + node.nodeType;
+	private static function getNodeType(node:flash.xml.XML):XmlType {
+		switch (node.nodeKind()) {
+			case "element":
+				return Xml.Element;
+			case "text":
+				return Xml.PCData;
+			case "processing-instruction":
+				return Xml.ProcessingInstruction;
+			case "comment":
+				return Xml.Comment;
+			default:
+				throw "unimplemented node type: " + node.nodeType;
 		}
 	}
 
-	private function get_nodeName() : String {
-		if( nodeType != Xml.Element )
+	private function get_nodeName():String {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
 		var ns = _node.namespace();
-		return (ns.prefix == "") ? _node.localName() : ns.prefix+":"+_node.localName();
+		return (ns.prefix == "") ? _node.localName() : ns.prefix + ":" + _node.localName();
 	}
 
-	private function set_nodeName( n : String ) : String {
-		if( nodeType != Xml.Element )
+	private function set_nodeName(n:String):String {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
 		var ns = n.split(":");
-		if( ns.length == 1 )
+		if (ns.length == 1)
 			_node.setLocalName(n);
 		else {
 			_node.setLocalName(ns[1]);
@@ -140,32 +139,32 @@ class Xml {
 		return n;
 	}
 
-	private function get_nodeValue() : String {
+	private function get_nodeValue():String {
 		var nodeType = nodeType;
-		if( nodeType == Xml.Element || nodeType == Xml.Document )
+		if (nodeType == Xml.Element || nodeType == Xml.Document)
 			throw "bad nodeType";
-		if( nodeType == Xml.Comment )
-			return _node.toString().substr(4,-7);
+		if (nodeType == Xml.Comment)
+			return _node.toString().substr(4, -7);
 		return _node.toString();
 	}
 
-	private function set_nodeValue( v : String ) : String {
+	private function set_nodeValue(v:String):String {
 		var nodeType = nodeType;
 		var x = null;
-		if( nodeType == Xml.Element || nodeType == Xml.Document )
+		if (nodeType == Xml.Element || nodeType == Xml.Document)
 			throw "bad nodeType";
-		else if( nodeType == Xml.PCData )
+		else if (nodeType == Xml.PCData)
 			x = createPCData(v);
-		else if( nodeType == Xml.CData )
+		else if (nodeType == Xml.CData)
 			x = createCData(v);
-		else if( nodeType == Xml.Comment )
+		else if (nodeType == Xml.Comment)
 			x = createComment(v);
-		else if( nodeType == Xml.DocType )
+		else if (nodeType == Xml.DocType)
 			x = createDocType(v);
 		else
 			x = createProcessingInstruction(v);
 		var p = _node.parent();
-		if( p != null ) {
+		if (p != null) {
 			p.insertChildAfter(_node, x._node);
 			var i = _node.childIndex();
 			var children = p.children();
@@ -175,196 +174,196 @@ class Xml {
 		return v;
 	}
 
-	private function get_parent() :Xml {
+	private function get_parent():Xml {
 		var p = _node.parent();
-		return p == null ? null : wrap( p );
+		return p == null ? null : wrap(p);
 	}
 
-	private static function wrap( node : XML, ?type : XmlType ) : Xml {
+	private static function wrap(node:XML, ?type:XmlType):Xml {
 		var x = new Xml();
 		x._node = node;
-		x.nodeType = (type != null) ? type : getNodeType( node );
+		x.nodeType = (type != null) ? type : getNodeType(node);
 		return x;
 	}
 
-	private function wraps( xList : XMLList ) : Array<Xml> {
+	private function wraps(xList:XMLList):Array<Xml> {
 		var out = new Array<Xml>();
-		for( i in 0...xList.length() )
-			out.push( wrap(xList[i]) );
+		for (i in 0...xList.length())
+			out.push(wrap(xList[i]));
 		return out;
 	}
 
-	function getAttribNS( cur : XML, ns : Array<String> ) : XMLList {
+	function getAttribNS(cur:XML, ns:Array<String>):XMLList {
 		var n = cur.namespace(ns[0]);
-		if( n == null ) {
+		if (n == null) {
 			var parent = cur.parent();
-			if( parent == null ) {
-				n = new flash.utils.Namespace(ns[0], "@"+ns[0]);
+			if (parent == null) {
+				n = new flash.utils.Namespace(ns[0], "@" + ns[0]);
 				cur.addNamespace(n);
 			} else
 				return getAttribNS(parent, ns);
 		}
-		return _node.attribute(new flash.utils.QName(n,ns[1]));
+		return _node.attribute(new flash.utils.QName(n, ns[1]));
 	}
 
-	public function get( att : String ) : String {
-		if( nodeType != Xml.Element )
+	public function get(att:String):String {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
 		var ns = att.split(":");
-		if( ns[0] == "xmlns" ) {
+		if (ns[0] == "xmlns") {
 			var n = _node.namespace((ns[1] == null) ? "" : ns[1]);
 			return (n == null) ? null : n.uri;
 		}
-		if( ns.length == 1 ) {
-			if( !Reflect.hasField(_node,"@"+att) )
+		if (ns.length == 1) {
+			if (!Reflect.hasField(_node, "@" + att))
 				return null;
-			return Reflect.field(_node, "@"+att);
+			return Reflect.field(_node, "@" + att);
 		}
-		var a = getAttribNS(_node,ns);
+		var a = getAttribNS(_node, ns);
 		return (a.length() == 0) ? null : a.toString();
 	}
 
-	public function set( att : String, value : String ) : Void {
-		if( nodeType != Xml.Element )
+	public function set(att:String, value:String):Void {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
 		var ns = att.split(":");
-		if( ns[0] == "xmlns" ) {
+		if (ns[0] == "xmlns") {
 			var n = _node.namespace((ns[1] == null) ? "" : ns[1]);
-			if( n != null )
+			if (n != null)
 				throw "Can't modify namespace";
-			if( ns[1] == null )
+			if (ns[1] == null)
 				throw "Can't set default namespace";
 			_node.addNamespace(new flash.utils.Namespace(ns[1], value));
 			return;
 		}
-		if( ns.length == 1 )
-			Reflect.setField(_node, "@"+att, value);
+		if (ns.length == 1)
+			Reflect.setField(_node, "@" + att, value);
 		else {
-			var a = getAttribNS(_node,ns);
+			var a = getAttribNS(_node, ns);
 			untyped a[0] = value;
 		}
 	}
 
-	public function remove( att : String ) : Void{
-		if( nodeType != Xml.Element )
+	public function remove(att:String):Void {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
 		var ns = att.split(":");
-		if( ns.length == 1 )
-			Reflect.deleteField(_node, "@"+att);
+		if (ns.length == 1)
+			Reflect.deleteField(_node, "@" + att);
 		else
-			untyped __delete__(getAttribNS(_node,ns),0);
+			untyped __delete__(getAttribNS(_node, ns), 0);
 	}
 
-	public function exists( att : String ) : Bool {
-		if( nodeType != Xml.Element )
+	public function exists(att:String):Bool {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
 		var ns = att.split(":");
-		if( ns[0] == "xmlns" )
+		if (ns[0] == "xmlns")
 			return _node.namespace((ns[1] == null) ? "" : ns[1]) != null;
-		if( ns.length == 1 )
-			return Reflect.hasField(_node, "@"+att);
-		return getAttribNS(_node,ns).length() > 0;
-	}
-
-	public function attributes() : Iterator<String> {
-	    if( nodeType != Xml.Element )
-	        throw "bad nodeType";
-	    var attributes :XMLList = _node.attributes();
-	    var names = Reflect.fields(attributes);
-	    var cur = 0;
-	    var nss = _node.namespaceDeclarations();
-	    return {
-	        hasNext : function(){
-	            return cur < names.length + nss.length;
-	        },
-	        next : function() {
-	            if(cur<names.length){
-	                return attributes[Std.parseInt(names[cur++])].name();
-	            }else {
-	                var ns:flash.utils.Namespace = nss[cur++ - names.length];
-	                return "xmlns:"+ns.prefix;
-	            }
-	        }
-	    }
-	}
-
-	public function iterator() : Iterator<Xml> {
-		if( nodeType != Xml.Element && nodeType != Xml.Document )
+		if (ns.length == 1)
+			return Reflect.hasField(_node, "@" + att);
+		return getAttribNS(_node, ns).length() > 0;
+	}
+
+	public function attributes():Iterator<String> {
+		if (nodeType != Xml.Element)
+			throw "bad nodeType";
+		var attributes:XMLList = _node.attributes();
+		var names = Reflect.fields(attributes);
+		var cur = 0;
+		var nss = _node.namespaceDeclarations();
+		return {
+			hasNext: function() {
+				return cur < names.length + nss.length;
+			},
+			next: function() {
+				if (cur < names.length) {
+					return attributes[Std.parseInt(names[cur++])].name();
+				} else {
+					var ns:flash.utils.Namespace = nss[cur++ - names.length];
+					return "xmlns:" + ns.prefix;
+				}
+			}
+		}
+	}
+
+	public function iterator():Iterator<Xml> {
+		if (nodeType != Xml.Element && nodeType != Xml.Document)
 			throw "bad nodeType";
 		var children:XMLList = _node.children();
-		var wrappers :Array<Xml> = wraps(children);
+		var wrappers:Array<Xml> = wraps(children);
 		var cur = 0;
 		return {
-			hasNext : function(){
+			hasNext: function() {
 				return cur < wrappers.length;
 			},
-			next : function(){
+			next: function() {
 				return wrappers[cur++];
 			}
 		};
 	}
 
-	public function elements() : Iterator<Xml> {
-		if( nodeType != Xml.Element && nodeType != Xml.Document )
+	public function elements():Iterator<Xml> {
+		if (nodeType != Xml.Element && nodeType != Xml.Document)
 			throw "bad nodeType";
 		var elements:XMLList = _node.elements();
-		var wrappers :Array<Xml> = wraps(elements);
+		var wrappers:Array<Xml> = wraps(elements);
 		var cur = 0;
 		return {
-			hasNext : function(){
+			hasNext: function() {
 				return cur < wrappers.length;
 			},
-			next : function(){
+			next: function() {
 				return wrappers[cur++];
 			}
 		};
 	}
 
-	public function elementsNamed( name : String ) : Iterator<Xml> {
-		if( nodeType != Xml.Element && nodeType != Xml.Document )
+	public function elementsNamed(name:String):Iterator<Xml> {
+		if (nodeType != Xml.Element && nodeType != Xml.Document)
 			throw "bad nodeType";
 		var ns = name.split(":");
 		var elements:XMLList;
-		if( ns.length == 1 )
+		if (ns.length == 1)
 			elements = _node.elements(name);
 		else
 			elements = _node.elements();
-		var wrappers :Array<Xml> = wraps(elements);
-		if( ns.length != 1 )
-			for( w in wrappers.copy() )
-				if( w._node.localName() != ns[1] || w._node.namespace().prefix != ns[0] )
+		var wrappers:Array<Xml> = wraps(elements);
+		if (ns.length != 1)
+			for (w in wrappers.copy())
+				if (w._node.localName() != ns[1] || w._node.namespace().prefix != ns[0])
 					wrappers.remove(w);
 		var cur = 0;
 		return {
-			hasNext : function(){
+			hasNext: function() {
 				return cur < wrappers.length;
 			},
-			next : function(){
+			next: function() {
 				return wrappers[cur++];
 			}
 		};
 	}
 
-	public function firstChild() : Xml {
-		if( nodeType != Xml.Element && nodeType != Xml.Document )
+	public function firstChild():Xml {
+		if (nodeType != Xml.Element && nodeType != Xml.Document)
 			throw "bad nodeType";
 		var children:XMLList = _node.children();
-		if( children.length() == 0 )
+		if (children.length() == 0)
 			return null;
-		return wrap( children[0] );
+		return wrap(children[0]);
 	}
 
-	public function firstElement() : Xml {
-		if( nodeType != Xml.Element && nodeType != Xml.Document )
+	public function firstElement():Xml {
+		if (nodeType != Xml.Element && nodeType != Xml.Document)
 			throw "bad nodeType";
 		var elements:XMLList = _node.elements();
-		if( elements.length() == 0 )
+		if (elements.length() == 0)
 			return null;
-		return wrap( elements[0] );
+		return wrap(elements[0]);
 	}
 
-	public function addChild( x : Xml ) : Void {
-		if( nodeType != Xml.Element && nodeType != Xml.Document )
+	public function addChild(x:Xml):Void {
+		if (nodeType != Xml.Element && nodeType != Xml.Document)
 			throw "bad nodeType";
 		if (x.parent != null)
 			x.parent.removeChild(x);
@@ -372,32 +371,32 @@ class Xml {
 		_node.appendChild(x._node);
 	}
 
-	public function removeChild( x : Xml ) : Bool {
-		if( nodeType != Xml.Element && nodeType != Xml.Document )
+	public function removeChild(x:Xml):Bool {
+		if (nodeType != Xml.Element && nodeType != Xml.Document)
 			throw "bad nodeType";
 		var children:XMLList = _node.children();
-		if( _node != x._node.parent() )
+		if (_node != x._node.parent())
 			return false;
 		var i = x._node.childIndex();
 		untyped __delete__(children, Reflect.fields(children)[i]);
 		return true;
 	}
 
-	public function insertChild( x : Xml, pos : Int ) : Void {
-		if( nodeType != Xml.Element && nodeType != Xml.Document )
+	public function insertChild(x:Xml, pos:Int):Void {
+		if (nodeType != Xml.Element && nodeType != Xml.Document)
 			throw "bad nodeType";
 		if (x.parent != null)
 			x.parent.removeChild(x);
 		var children:XMLList = _node.children();
-		if( pos < children.length() )
+		if (pos < children.length())
 			_node.insertChildBefore(children[pos], x._node);
 		else
 			_node.appendChild(x._node);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		XML.prettyPrinting = false;
-		if( nodeType == Xml.Document ) {
+		if (nodeType == Xml.Document) {
 			var str = _node.toXMLString();
 			// remove <__document xmlns....>STR</__document> wrapper
 			str = str.substr(str.indexOf(">") + 1);
@@ -407,15 +406,14 @@ class Xml {
 		return _node.toXMLString();
 	}
 
-	static function __init__() : Void untyped {
-		Element = "element";
-		PCData = "pcdata";
-		CData = "cdata";
-		Comment = "comment";
-		DocType = "doctype";
-		ProcessingInstruction = "processingInstruction";
-		Document = "document";
-	}
-
-
-}
\ No newline at end of file
+	static function __init__():Void
+		untyped {
+			Element = "element";
+			PCData = "pcdata";
+			CData = "cdata";
+			Comment = "comment";
+			DocType = "doctype";
+			ProcessingInstruction = "processingInstruction";
+			Document = "document";
+		}
+}
diff --git a/std/flash/Vector.hx b/std/flash/Vector.hx
index b841ae7e89b66dcf005c9e2504bbfd7e64b55478..3892edf3b6f101cc008cadfc5c5d454d05047715 100644
--- a/std/flash/Vector.hx
+++ b/std/flash/Vector.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,37 +19,76 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package flash;
 
 /**
 	The Vector class is very similar to Array but is only supported by the Flash Player 10+
 **/
 @:require(flash10) extern class Vector<T> implements ArrayAccess<T> {
+	var length:Int;
+	var fixed:Bool;
+
+	function new(?length:UInt, ?fixed:Bool):Void;
+	function concat(?a:Vector<T>):Vector<T>;
+	function join(sep:String):String;
+	function pop():Null<T>;
+	function push(x:T):Int;
+	function reverse():Void;
+	function shift():Null<T>;
+	function unshift(x:T):Void;
+	function slice(?pos:Int, ?end:Int):Vector<T>;
+	function sort(f:T->T->Int):Void;
+	function splice(pos:Int, len:Int):Vector<T>;
+	function toString():String;
+	function indexOf(x:T, ?from:Int):Int;
+	function lastIndexOf(x:T, ?from:Int):Int;
 
-	var length : Int;
-	var fixed : Bool;
-
-	function new( ?length : UInt, ?fixed : Bool ) : Void;
-	function concat( ?a : Vector<T> ) : Vector<T>;
-	function join( sep : String ) : String;
-	function pop() : Null<T>;
-	function push(x : T) : Int;
-	function reverse() : Void;
-	function shift() : Null<T>;
-	function unshift( x : T ) : Void;
-	function slice( ?pos : Int, ?end : Int ) : Vector<T>;
-	function sort( f : T -> T -> Int ) : Void;
-	function splice( pos : Int, len : Int ) : Vector<T>;
-	function toString() : String;
-	function indexOf( x : T, ?from : Int ) : Int;
-	function lastIndexOf( x : T, ?from : Int ) : Int;
-
-	public inline static function ofArray<T>( v : Array<T> ) : Vector<T> {
+	#if flash19
+	function insertAt(index:Int, element:T):Void;
+	#else
+	inline function insertAt(index:Int, element:T):Void {
+		(cast this).splice(index, 0, element);
+	}
+	#end
+	@:require(flash19) function removeAt(index:Int):T;
+
+	public inline static function ofArray<T>(v:Array<T>):Vector<T> {
 		return untyped __vector__(v);
 	}
 
-	public inline static function convert<T,U>( v : Vector<T> ) : Vector<U> {
+	public inline static function convert<T, U>(v:Vector<T>):Vector<U> {
 		return untyped __vector__(v);
 	}
 
+	/**
+		Get a run-time value referencing the `Vector` class with concrete type parameters.
+
+		Normally in Haxe, for most of the types, type parameters are eliminated at run-time,
+		so there is no way to check if a value is of a type with specific type parameters.
+
+		However, on the Flash target, the `flash.Vector<T>` values carry type parameter
+		information at run-time all the type-checks (such as `Std.is` and `Std.downcast`) on them
+		must be done using a `Class<T>` value that also carries the type parameters. However,
+		Haxe syntax does not allow creating such values and this function exists to mitigate
+		this limitation.
+
+		It should be used as such:
+		```haxe
+		var specificVectorType:Class<Vector<Int>> = Vector.typeReference();
+		trace(Std.is(vec, specificVectorType));
+		```
+		or using the type-check syntax:
+		```haxe
+		trace(Std.is(vec, (Vector.typeReference() : Class<Vector<Int>>)));
+		```
+
+		It's also helpful when working with native Flash libraries, that receive Class instances:
+		```haxe
+		new Signal((Vector.typeReference() : Class<Vector<Int>>));
+		```
+	**/
+	public inline static function typeReference<T>():Class<Vector<T>> {
+		return untyped __vector__();
+	}
 }
diff --git a/std/flash/_std/EReg.hx b/std/flash/_std/EReg.hx
index 7c49a78f021579741c3104c2c0c9e2912a9a5f53..fd7e37cafec1dced91e5abf3908d7ed50986593e 100644
--- a/std/flash/_std/EReg.hx
+++ b/std/flash/_std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,73 +20,76 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi class EReg {
+	var r:flash.utils.RegExp;
+	var result:Dynamic;
 
-	var r : flash.utils.RegExp;
-	var result : Dynamic;
-
-	public function new( r : String, opt : String ) : Void {
-		this.r = new flash.utils.RegExp(r,opt);
+	public function new(r:String, opt:String):Void {
+		this.r = new flash.utils.RegExp(r, opt);
 	}
 
-	public function match( s : String ) : Bool {
-		if( r.global ) r.lastIndex = 0;
+	public function match(s:String):Bool {
+		if (r.global)
+			r.lastIndex = 0;
 		result = r.exec(s);
 		return (result != null);
 	}
 
-	public function matched( n : Int ) : String {
-		return if( result != null && n >= 0 && n < (result : Array<Dynamic>).length ) result[n] else throw "EReg::matched";
+	public function matched(n:Int):String {
+		return if (result != null && n >= 0 && n < (result:Array<Dynamic>).length) result[n] else throw "EReg::matched";
 	}
 
-	public function matchedLeft() : String {
-		if( result == null ) throw "No string matched";
-		var s : String = untyped result.input;
-		return s.substr(0,untyped result["index"]);
+	public function matchedLeft():String {
+		if (result == null)
+			throw "No string matched";
+		var s:String = result.input;
+		return s.substr(0, result.index);
 	}
 
-	public function matchedRight() : String {
-		if( result == null ) throw "No string matched";
-		var rl = (result[untyped "index"] : Int) + (result[0] : String).length;
-		var s : String = untyped result.input;
-		return s.substr(rl,s.length - rl);
+	public function matchedRight():String {
+		if (result == null)
+			throw "No string matched";
+		var rl = (result.index : Int) + (result[0] : String).length;
+		var s:String = result.input;
+		return s.substr(rl, s.length - rl);
 	}
 
-	public function matchedPos() : { pos : Int, len : Int } {
-		if( result == null ) throw "No string matched";
-		return { pos : result[untyped "index"], len : (result[0] : String).length };
+	public function matchedPos():{pos:Int, len:Int} {
+		if (result == null)
+			throw "No string matched";
+		return {pos: result.index, len: (result[0] : String).length};
 	}
 
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
 		return if (r.global) {
 			r.lastIndex = pos;
 			result = r.exec(len < 0 ? s : s.substr(0, pos + len));
 			var b = result != null;
 			if (b) {
-				untyped result.input = s;
+				result.input = s;
 			}
 			b;
 		} else {
-			var b = match( len < 0 ? s.substr(pos) : s.substr(pos,len) );
+			var b = match(len < 0 ? s.substr(pos) : s.substr(pos, len));
 			if (b) {
-				untyped result.input = s;
-				untyped result["index"] += pos;
+				result.input = s;
+				result.index += pos;
 			}
 			b;
 		}
 	}
 
-	public function split( s : String ) : Array<String> {
+	public function split(s:String):Array<String> {
 		// we can't use directly s.split because it's ignoring the 'g' flag
 		var d = "#__delim__#";
-		var s : String = untyped s.replace(r, d);
+		var s:String = (s : Dynamic).replace(r, d);
 		return s.split(d);
 	}
 
-	public function replace( s : String, by : String ) : String {
-		return untyped s.replace(r,by);
+	public function replace(s:String, by:String):String {
+		return (s : Dynamic).replace(r, by);
 	}
 
-	public function map( s : String, f : EReg -> String ) : String {
+	public function map(s:String, f:EReg->String):String {
 		var offset = 0;
 		var buf = new StringBuf();
 		var first = true;
@@ -103,8 +106,7 @@
 			if (p.len == 0) {
 				buf.add(s.substr(p.pos, 1));
 				offset = p.pos + 1;
-			}
-			else
+			} else
 				offset = p.pos + p.len;
 			first = false;
 		} while (r.global);
@@ -112,4 +114,10 @@
 			buf.add(s.substr(offset));
 		return buf.toString();
 	}
+
+	public static inline function escape(s:String):String {
+		return (cast s).replace(escapeRe, "\\$&");
+	}
+
+	static var escapeRe = new flash.utils.RegExp("[.*+?^${}()|[\\]\\\\]", "g");
 }
diff --git a/std/flash/_std/Reflect.hx b/std/flash/_std/Reflect.hx
index e5b1dd82c4c4224959b4e1973df3a4578c269212..88b7c2789c6ced7aab662db49a263a91fa85e209 100644
--- a/std/flash/_std/Reflect.hx
+++ b/std/flash/_std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,113 +20,127 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi class Reflect {
+	public static function hasField(o:Dynamic, field:String):Bool
+		untyped {
+			return o.hasOwnProperty(field);
+		}
 
-	public static function hasField( o : Dynamic, field : String ) : Bool untyped {
-		return o.hasOwnProperty( field );
-	}
-
-	public static function field( o : Dynamic, field : String ) : Dynamic untyped {
-		// sealed classes will throw an exception
-		return try o[field] catch( e : Dynamic ) null;
-	}
-
-	public inline static function setField( o : Dynamic, field : String, value : Dynamic ) : Void untyped {
-		o[field] = value;
-	}
-
-	public static function getProperty( o : Dynamic, field : String ) : Dynamic untyped {
-		try {
-			return o["get_" + field]();
-		} catch( e : Dynamic ) try {
-			return o[field];
-		} catch( e : Dynamic ) {
-			return null;
+	public static function field(o:Dynamic, field:String):Dynamic
+		untyped {
+			return o != null && __in__(field, o) ? o[field] : null;
 		}
-	}
 
-	public static function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void untyped {
-		try {
-			o["set_" + field](value);
-		} catch( e : Dynamic ) {
+	public inline static function setField(o:Dynamic, field:String, value:Dynamic):Void
+		untyped {
 			o[field] = value;
 		}
-	}
 
-	public inline static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
-		return func.apply(o,args);
-	}
+	public static function getProperty(o:Dynamic, field:String):Dynamic
+		untyped {
+			if (o == null)
+				return null;
+			var getter = 'get_$field';
+			if (__in__(getter, o)) {
+				return o[getter]();
+			}
+			return __in__(field, o) ? o[field] : null;
+		}
 
-	public static function fields( o : Dynamic ) : Array<String> untyped {
-		if( o == null ) return new Array();
-		#if as3
-		var a : Array<String> = __keys__(o);
-		var i = 0;
-		while( i < a.length ){
-			if( !o.hasOwnProperty(a[i]) )
-				a.splice(i,1);
-			else
-				++i;
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void
+		untyped {
+			var setter = 'set_$field';
+			if (__in__(setter, o)) {
+				o[setter](value);
+			} else {
+				o[field] = value;
+			}
 		}
-		#else
-		var i = 0;
-		var a = [];
-		while( untyped __has_next__(o,i) ) {
-			var prop = untyped __forin__(o,i);
-			if( o.hasOwnProperty(prop) )
-				a.push(prop);
+
+	public inline static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic
+		untyped {
+			return func.apply(o, args);
 		}
-		#end
-		return a;
-	}
 
-	public static function isFunction( f : Dynamic ) : Bool untyped {
-		return __typeof__(f) == "function";
-	}
+	public static function fields(o:Dynamic):Array<String>
+		untyped {
+			if (o == null)
+				return new Array();
+			#if as3
+			var a:Array<String> = __keys__(o);
+			var i = 0;
+			while (i < a.length) {
+				if (!o.hasOwnProperty(a[i]))
+					a.splice(i, 1);
+				else
+					++i;
+			}
+			#else
+			var i = 0;
+			var a = [];
+			while (untyped __has_next__(o, i)) {
+				var prop = untyped __forin__(o, i);
+				if (o.hasOwnProperty(prop))
+					a.push(prop);
+			}
+			#end
+			return a;
+		}
 
-	public static function compare<T>( a : T, b : T ) : Int {
-		var a : Dynamic = a;
-		var b : Dynamic = b;
-		return ( a == b ) ? 0 : ((a > b) ? 1 : -1);
+	public static function isFunction(f:Dynamic):Bool
+		untyped {
+			return __typeof__(f) == "function";
+		}
+
+	public static function compare<T>(a:T, b:T):Int {
+		var a:Dynamic = a;
+		var b:Dynamic = b;
+		return (a == b) ? 0 : ((a > b) ? 1 : -1);
 	}
 
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool {
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
 		return f1 == f2; // VM-level closures
 	}
 
-	public static function isObject( v : Dynamic ) : Bool untyped {
-		if( v == null )
-			return false;
-		var t = __typeof__(v);
-		if ( t == "object" ) {
-			return !isEnumValue(v);
+	public static function isObject(v:Dynamic):Bool
+		untyped {
+			if (v == null)
+				return false;
+			var t = __typeof__(v);
+			if (t == "object") {
+				return !isEnumValue(v);
+			}
+			return (t == "string");
 		}
-		return (t == "string");
-	}
 
-	public static function isEnumValue( v : Dynamic ) : Bool {
+	public static function isEnumValue(v:Dynamic):Bool {
 		#if as3
-		return try Type.getEnum(v) != null catch ( e: Dynamic) false;
+		return try Type.getEnum(v) != null catch (e:Dynamic) false;
 		#else
-		return try v.__enum__ == true catch ( e : Dynamic) false;
+		return try v.__enum__ == true catch (e:Dynamic) false;
 		#end
 	}
 
-	public static function deleteField( o : Dynamic, field : String ) : Bool untyped {
-		if( o.hasOwnProperty(field) != true ) return false;
-		__delete__(o,field);
-		return true;
-	}
+	public static function deleteField(o:Dynamic, field:String):Bool
+		untyped {
+			if (o.hasOwnProperty(field) != true)
+				return false;
+			__delete__(o, field);
+			return true;
+		}
 
-	public static function copy<T>( o : T ) : T {
-		var o2 : Dynamic = {};
-		for( f in Reflect.fields(o) )
-			Reflect.setField(o2,f,Reflect.field(o,f));
+	public static function copy<T>(o:Null<T>):Null<T> {
+		if (o == null)
+			return null;
+		var o2:Dynamic = {};
+		for (f in Reflect.fields(o))
+			Reflect.setField(o2, f, Reflect.field(o, f));
 		return o2;
 	}
 
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
-		return function(__arguments__) { return f(__arguments__); };
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
+		return function(__arguments__) {
+			return f(__arguments__);
+		};
 	}
-
 }
diff --git a/std/flash/_std/Std.hx b/std/flash/_std/Std.hx
index 361f24f841dab4075b2c15c77499222ebf3fcea4..ca34930d8be07bb769dc2939ef77fa00c6c60b11 100644
--- a/std/flash/_std/Std.hx
+++ b/std/flash/_std/Std.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,38 +19,44 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import flash.Boot;
 
 @:coreApi class Std {
-
-	public static function is( v : Dynamic, t : Dynamic ) : Bool {
-		return untyped flash.Boot.__instanceof(v,t);
+	public static function is(v:Dynamic, t:Dynamic):Bool {
+		return flash.Boot.__instanceof(v, t);
 	}
 
-	public static inline function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
+	public static inline function downcast<T:{}, S:T>(value:T, c:Class<S>):S {
 		return flash.Lib.as(value, c);
 	}
 
-	public static function string( s : Dynamic ) : String {
-		return untyped flash.Boot.__string_rec(s,"");
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	public static inline function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return downcast(value, c);
 	}
 
-	public inline static function int( x : Float ) : Int {
-		return untyped __int__(x);
+	public static function string(s:Dynamic):String {
+		return flash.Boot.__string_rec(s, "");
 	}
 
-	public static function parseInt( x : String ) : Null<Int> untyped {
-		var v = __global__["parseInt"](x);
-		if( __global__["isNaN"](v) )
-			return null;
-		return v;
+	public inline static function int(x:Float):Int {
+		return untyped __int__(x);
 	}
 
-	public static function parseFloat( x : String ) : Float {
+	public static function parseInt(x:String):Null<Int>
+		untyped {
+			var v = __global__["parseInt"](x);
+			if (__global__["isNaN"](v))
+				return null;
+			return v;
+		}
+
+	public static function parseFloat(x:String):Float {
 		return untyped __global__["parseFloat"](x);
 	}
 
-	public static function random( x : Int ) : Int {
-		return untyped x <= 0 ? 0 : Math.floor(Math.random()*x);
+	public static function random(x:Int):Int {
+		return x <= 0 ? 0 : Math.floor(Math.random() * x);
 	}
 }
diff --git a/std/flash/_std/String.hx b/std/flash/_std/String.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6893eb0664a6fb8741f908824b6259aa680db6b2
--- /dev/null
+++ b/std/flash/_std/String.hx
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+@:coreApi
+extern class String {
+	var length(default, null):Int;
+	function new(string:String):Void;
+	function toUpperCase():String;
+	function toLowerCase():String;
+	function charAt(index:Int):String;
+	function charCodeAt(index:Int):Null<Int>;
+	function indexOf(str:String, ?startIndex:Int):Int;
+	function lastIndexOf(str:String, ?startIndex:Int):Int;
+	function split(delimiter:String):Array<String>;
+	function substr(pos:Int, ?len:Int):String;
+	function substring(startIndex:Int, ?endIndex:Int):String;
+	function toString():String;
+
+	@:pure static inline function fromCharCode(code:Int):String
+		untyped {
+			return code < 0x10000 ? String["fromCharCode"](code) : flash.Boot.fromCodePoint(code);
+		}
+}
diff --git a/std/flash/_std/Type.hx b/std/flash/_std/Type.hx
index 4f4bfa003b91aa8784f1f341762e5ee9e6e2b76b..4585e97d4d4595e24b285e1a6734622ce49b0b7f 100644
--- a/std/flash/_std/Type.hx
+++ b/std/flash/_std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 enum ValueType {
 	TNull;
 	TInt;
@@ -27,270 +26,292 @@ enum ValueType {
 	TBool;
 	TObject;
 	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
 	TUnknown;
 }
 
 @:coreApi class Type {
+	public static function getClass<T>(o:T):Class<T>
+		untyped {
+			var cname = __global__["flash.utils.getQualifiedClassName"](o);
+			if (cname == "null" || cname == "Object" || cname == "int" || cname == "Number" || cname == "Boolean")
+				return null;
+			if (o.hasOwnProperty("prototype"))
+				return null;
+			var c = __as__(__global__["flash.utils.getDefinitionByName"](cname), Class);
+			if (c.__isenum)
+				return null;
+			return c;
+		}
 
-	public static function getClass<T>( o : T ) : Class<T> untyped {
-		var cname = __global__["flash.utils.getQualifiedClassName"](o);
-		if( cname == "null" || cname == "Object" || cname == "int" || cname == "Number" || cname == "Boolean" )
-			return null;
-		if( o.hasOwnProperty("prototype") )
-			return null;
-		var c = __as__(__global__["flash.utils.getDefinitionByName"](cname),Class);
-		if( c.__isenum )
-			return null;
-		return c;
-	}
-
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic> untyped {
-		var cname = __global__["flash.utils.getQualifiedClassName"](o);
-		if( cname == "null" || cname.substr(0,8) == "builtin." )
-			return null;
-		// getEnum(Enum) should be null
-		if( o.hasOwnProperty("prototype") )
-			return null;
-		var c = __as__(__global__["flash.utils.getDefinitionByName"](cname),Class);
-		if( !c.__isenum )
-			return null;
-		return c;
-	}
-
+	public static function getEnum(o:EnumValue):Enum<Dynamic>
+		untyped {
+			var cname = __global__["flash.utils.getQualifiedClassName"](o);
+			if (cname == "null" || cname.substr(0, 8) == "builtin.")
+				return null;
+			// getEnum(Enum) should be null
+			if (o.hasOwnProperty("prototype"))
+				return null;
+			var c = __as__(__global__["flash.utils.getDefinitionByName"](cname), Class);
+			if (!c.__isenum)
+				return null;
+			return c;
+		}
 
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic> untyped {
-		var cname = __global__["flash.utils.getQualifiedSuperclassName"](c);
-		if( cname == null || cname == "Object" )
-			return null;
-		return __as__(__global__["flash.utils.getDefinitionByName"](cname),Class);
-	}
+	public static function getSuperClass(c:Class<Dynamic>):Class<Dynamic>
+		untyped {
+			var cname = __global__["flash.utils.getQualifiedSuperclassName"](c);
+			if (cname == null || cname == "Object")
+				return null;
+			return __as__(__global__["flash.utils.getDefinitionByName"](cname), Class);
+		}
 
-	public static function getClassName( c : Class<Dynamic> ) : String {
-		if( c == null )
+	public static function getClassName(c:Class<Dynamic>):String {
+		if (c == null)
 			return null;
-		var str : String = untyped __global__["flash.utils.getQualifiedClassName"](c);
-		switch( str ) {
-		case "int": return "Int";
-		case "Number": return "Float";
-		case "Boolean": return "Bool";
-		#if as3
-		case "Object": return "Dynamic";
-		#end
-		default:
+		var str:String = untyped __global__["flash.utils.getQualifiedClassName"](c);
+		switch (str) {
+			case "int":
+				return "Int";
+			case "Number":
+				return "Float";
+			case "Boolean":
+				return "Bool";
+			#if as3
+			case "Object":
+				return "Dynamic";
+			#end
+			default:
 		}
 		var parts = str.split("::");
 		#if as3
-		if(parts[parts.length - 1] == "_Object") {
+		if (parts[parts.length - 1] == "_Object") {
 			parts[parts.length - 1] = "Object";
 		}
 		#end
 		return parts.join(".");
 	}
 
-	public static function getEnumName( e : Enum<Dynamic> ) : String {
+	public static function getEnumName(e:Enum<Dynamic>):String {
 		return getClassName(cast e);
 	}
 
-	public static function resolveClass( name : String ) : Class<Dynamic> untyped {
-		var cl : Class<Dynamic>;
-		try {
-			cl = __as__(__global__["flash.utils.getDefinitionByName"](name),Class);
-			if( cl.__isenum )
+	public static function resolveClass(name:String):Class<Dynamic>
+		untyped {
+			var cl:Class<Dynamic>;
+			try {
+				cl = __as__(__global__["flash.utils.getDefinitionByName"](name), Class);
+				if (cl.__isenum)
+					return null;
+				return cl; // skip test below
+			} catch (e:Dynamic) {
+				switch (name) {
+					case "Int":
+						return Int;
+					case "Float":
+						return Float;
+					#if as3
+					case "Dynamic":
+						return Dynamic;
+					#end
+				}
 				return null;
-			return cl; // skip test below
-		} catch( e : Dynamic ) {
-			switch( name ) {
-			case "Int": return Int;
-			case "Float": return Float;
-			#if as3
-			case "Dynamic": return Dynamic;
-			#end
 			}
-			return null;
+			// ensure that this is a class
+			if (cl == null || cl.__name__ == null)
+				return null;
+			return cl;
 		}
-		// ensure that this is a class
-		if( cl == null || cl.__name__ == null )
-			return null;
-		return cl;
-	}
-
 
-	public static function resolveEnum( name : String ) : Enum<Dynamic> untyped {
-		var e : Dynamic;
-		try {
-			e = __global__["flash.utils.getDefinitionByName"](name);
-			if( !e.__isenum )
+	public static function resolveEnum(name:String):Enum<Dynamic>
+		untyped {
+			var e:Dynamic;
+			try {
+				e = __global__["flash.utils.getDefinitionByName"](name);
+				if (!e.__isenum)
+					return null;
+				return e;
+			} catch (e:Dynamic) {
+				if (name == "Bool")
+					return Bool;
+				return null;
+			}
+			// ensure that this is an enum
+			if (e == null || e.__ename__ == null)
 				return null;
 			return e;
-		} catch( e : Dynamic ) {
-			if( name == "Bool" ) return Bool;
-			return null;
 		}
-		// ensure that this is an enum
-		if( e == null || e.__ename__ == null )
-			return null;
-		return e;
-	}
 
-	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T untyped {
-		return switch( args.length ) {
-		case 0: __new__(cl);
-		case 1: __new__(cl,args[0]);
-		case 2: __new__(cl,args[0],args[1]);
-		case 3: __new__(cl,args[0],args[1],args[2]);
-		case 4: __new__(cl,args[0],args[1],args[2],args[3]);
-		case 5: __new__(cl,args[0],args[1],args[2],args[3],args[4]);
-		case 6: __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5]);
-		case 7: __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6]);
-		case 8: __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]);
-		case 9: __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8]);
-		case 10: __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9]);
-		case 11: __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10]);
-		case 12: __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11]);
-		case 13: __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12]);
-		case 14: __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13]);
-		default: throw "Too many arguments";
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T
+		untyped {
+			return switch (args.length) {
+				case 0: __new__(cl);
+				case 1: __new__(cl, args[0]);
+				case 2: __new__(cl, args[0], args[1]);
+				case 3: __new__(cl, args[0], args[1], args[2]);
+				case 4: __new__(cl, args[0], args[1], args[2], args[3]);
+				case 5: __new__(cl, args[0], args[1], args[2], args[3], args[4]);
+				case 6: __new__(cl, args[0], args[1], args[2], args[3], args[4], args[5]);
+				case 7: __new__(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
+				case 8: __new__(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
+				case 9: __new__(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+				case 10: __new__(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
+				case 11: __new__(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10]);
+				case 12: __new__(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11]);
+				case 13: __new__(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12]);
+				case 14: __new__(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12],
+						args[13]);
+				default: throw "Too many arguments";
+			}
 		}
-	}
 
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T untyped {
-		try {
-			flash.Boot.skip_constructor = true;
-			var i = __new__(cl);
-			flash.Boot.skip_constructor = false;
-			return i;
-		} catch( e : Dynamic ) {
-			flash.Boot.skip_constructor = false;
-			throw e;
+	public static function createEmptyInstance<T>(cl:Class<T>):T
+		untyped {
+			try {
+				flash.Boot.skip_constructor = true;
+				var i = __new__(cl);
+				flash.Boot.skip_constructor = false;
+				return i;
+			} catch (e:Dynamic) {
+				flash.Boot.skip_constructor = false;
+				throw e;
+			}
+			return null;
 		}
-		return null;
-	}
 
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T {
 		var f:Dynamic = untyped e[constr];
-		if( f == null ) throw "No such constructor "+constr;
-		if( Reflect.isFunction(f) ) {
-			if( params == null ) throw "Constructor "+constr+" need parameters";
-			return Reflect.callMethod(e,f,params);
+		if (f == null)
+			throw "No such constructor " + constr;
+		if (Reflect.isFunction(f)) {
+			if (params == null)
+				throw "Constructor " + constr + " need parameters";
+			return Reflect.callMethod(e, f, params);
 		}
-		if( params != null && params.length != 0 )
-			throw "Constructor "+constr+" does not need parameters";
+		if (params != null && params.length != 0)
+			throw "Constructor " + constr + " does not need parameters";
 		return f;
 	}
 
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
-		var c : String = (untyped e.__constructs__)[index];
-		if( c == null ) throw index+" is not a valid enum constructor index";
-		return createEnum(e,c,params);
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T {
+		var c:String = (untyped e.__constructs__)[index];
+		if (c == null)
+			throw index + " is not a valid enum constructor index";
+		return createEnum(e, c, params);
 	}
 
-	static function describe( t : Dynamic, fact : Bool ) : Array<String> untyped {
-		var fields = new Array();
-		var xml : flash.xml.XML = __global__["flash.utils.describeType"](t);
-		if( fact )
-			xml = xml.factory[0];
-		var methods = xml.child("method");
-		for( i in 0...methods.length() )
-			fields.push( Std.string(methods[i].attribute("name")) );
-		var vars = xml.child("variable");
-		for( i in 0...vars.length() )
-			fields.push( Std.string(vars[i].attribute("name")) );
-		var accs = xml.child("accessor");
-		for( i in 0...accs.length() )
-			fields.push( Std.string(accs[i].attribute("name")) );
-		return fields;
-	}
+	static function describe(t:Dynamic, fact:Bool):Array<String>
+		untyped {
+			var fields = new Array();
+			var xml:flash.xml.XML = __global__["flash.utils.describeType"](t);
+			if (fact)
+				xml = xml.factory[0];
+			var methods = xml.child("method");
+			for (i in 0...methods.length())
+				fields.push(Std.string(methods[i].attribute("name")));
+			var vars = xml.child("variable");
+			for (i in 0...vars.length())
+				fields.push(Std.string(vars[i].attribute("name")));
+			var accs = xml.child("accessor");
+			for (i in 0...accs.length())
+				fields.push(Std.string(accs[i].attribute("name")));
+			return fields;
+		}
 
-	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String> {
-		return describe(c,true);
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String> {
+		return describe(c, true);
 	}
 
-	public static function getClassFields( c : Class<Dynamic> ) : Array<String> {
-		var a = describe(c,false);
+	public static function getClassFields(c:Class<Dynamic>):Array<String> {
+		var a = describe(c, false);
 		a.remove("__construct__");
 		a.remove("prototype");
 		return a;
 	}
 
-	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> {
-		var a : Array<String> = untyped e.__constructs__;
+	public static function getEnumConstructs(e:Enum<Dynamic>):Array<String> {
+		var a:Array<String> = untyped e.__constructs__;
 		return a.copy();
 	}
 
-	public static function typeof( v : Dynamic ) : ValueType untyped {
-		var cname = __global__["flash.utils.getQualifiedClassName"](v);
-		switch(cname) {
-		case "null": return TNull;
-		case "void": return TNull; // undefined
-		case "int": return TInt;
-		case "Number":
-			// integers >28 bits are stored as Numbers in avm2
-			if( (v < -0x10000000 || v >= 0x10000000) && Std.int(v) == v )
-				return TInt;
-			return TFloat;
-		case "Boolean": return TBool;
-		case "Object": return TObject;
-		case "Function": return TFunction;
-		default:
-			var c : Dynamic = null;
-			try {
-				c = __global__["flash.utils.getDefinitionByName"](cname);
-				if( v.hasOwnProperty("prototype") )
+	public static function typeof(v:Dynamic):ValueType
+		untyped {
+			var cname = __global__["flash.utils.getQualifiedClassName"](v);
+			switch (cname) {
+				case "null":
+					return TNull;
+				case "void":
+					return TNull; // undefined
+				case "int":
+					return TInt;
+				case "Number":
+					// integers >28 bits are stored as Numbers in avm2
+					if ((v < -0x10000000 || v >= 0x10000000) && Std.int(v) == v)
+						return TInt;
+					return TFloat;
+				case "Boolean":
+					return TBool;
+				case "Object":
 					return TObject;
-				if( c.__isenum )
-					return TEnum(c);
-				return TClass(c);
-			} catch( e : Dynamic ) {
-				if( cname == "builtin.as$0::MethodClosure" || cname.indexOf("-") != -1 )
+				case "Function":
 					return TFunction;
-				return if( c == null ) TFunction else TClass(c);
+				default:
+					var c:Dynamic = null;
+					try {
+						c = __global__["flash.utils.getDefinitionByName"](cname);
+						if (v.hasOwnProperty("prototype"))
+							return TObject;
+						if (c.__isenum)
+							return TEnum(c);
+						return TClass(c);
+					} catch (e:Dynamic) {
+						if (cname == "builtin.as$0::MethodClosure" || cname.indexOf("-") != -1)
+							return TFunction;
+						return if (c == null) TFunction else TClass(c);
+					}
 			}
+			return null;
 		}
-		return null;
-	}
 
-	public static function enumEq<T>( a : T, b : T ) : Bool untyped {
-		if( a == b )
-			return true;
-		try {
-			if( a.index != b.index )
-				return false;
-			var ap : Array<Dynamic> = a.params;
-			var bp : Array<Dynamic> = b.params;
-			for( i in 0...ap.length )
-				if( !enumEq(ap[i],bp[i]) )
+	public static function enumEq<T>(a:T, b:T):Bool
+		untyped {
+			if (a == b)
+				return true;
+			try {
+				if (a.index != b.index)
 					return false;
-		} catch( e : Dynamic ) {
-			return false;
+				var ap:Array<Dynamic> = a.params;
+				var bp:Array<Dynamic> = b.params;
+				for (i in 0...ap.length)
+					if (!enumEq(ap[i], bp[i]))
+						return false;
+			} catch (e:Dynamic) {
+				return false;
+			}
+			return true;
 		}
-		return true;
-	}
 
-	public static function enumConstructor( e : EnumValue ) : String {
+	public static function enumConstructor(e:EnumValue):String {
 		return untyped e.tag;
 	}
 
-	public static function enumParameters( e : EnumValue ) : Array<Dynamic> {
-		return untyped if( e.params == null ) [] else e.params;
+	public static function enumParameters(e:EnumValue):Array<Dynamic> {
+		return untyped if (e.params == null) [] else e.params;
 	}
 
-	@:extern
-	public inline static function enumIndex( e : EnumValue ) : Int {
+	extern public inline static function enumIndex(e:EnumValue):Int {
 		return untyped e.index;
 	}
 
-	public static function allEnums<T>( e : Enum<T> ) : Array<T> {
+	public static function allEnums<T>(e:Enum<T>):Array<T> {
 		var all = [];
-		var cst : Array<String> = untyped e.__constructs__;
-		for( c in cst ) {
-			var v = Reflect.field(e,c);
-			if( !Reflect.isFunction(v) )
+		var cst:Array<String> = untyped e.__constructs__;
+		for (c in cst) {
+			var v = Reflect.field(e, c);
+			if (!Reflect.isFunction(v))
 				all.push(v);
 		}
 		return all;
 	}
-
 }
-
diff --git a/std/flash/_std/haxe/Http.hx b/std/flash/_std/haxe/Http.hx
new file mode 100644
index 0000000000000000000000000000000000000000..df45418488cbbf7a0a38ae2313d65caf1044509d
--- /dev/null
+++ b/std/flash/_std/haxe/Http.hx
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C)2005-2019 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 haxe;
+
+import haxe.io.Bytes;
+
+typedef Http = HttpFlash;
+
+class HttpFlash extends haxe.http.HttpBase {
+	var req:flash.net.URLLoader;
+
+	/**
+		Cancels `this` Http request if `request` has been called and a response
+		has not yet been received.
+	**/
+	public function cancel() {
+		if (req == null)
+			return;
+		req.close();
+		req = null;
+	}
+
+	public override function request(?post:Bool) {
+		responseAsString = null;
+		responseBytes = null;
+		var loader = req = new flash.net.URLLoader();
+		loader.dataFormat = BINARY;
+		loader.addEventListener("complete", function(e) {
+			req = null;
+			success(Bytes.ofData(loader.data));
+		});
+		loader.addEventListener("httpStatus", function(e:flash.events.HTTPStatusEvent) {
+			// on Firefox 1.5, Flash calls onHTTPStatus with 0 (!??)
+			if (e.status != 0)
+				onStatus(e.status);
+		});
+		loader.addEventListener("ioError", function(e:flash.events.IOErrorEvent) {
+			req = null;
+			responseBytes = Bytes.ofData(loader.data);
+			onError(e.text);
+		});
+		loader.addEventListener("securityError", function(e:flash.events.SecurityErrorEvent) {
+			req = null;
+			onError(e.text);
+		});
+
+		// headers
+		var param = false;
+		var vars = new flash.net.URLVariables();
+		for (p in params) {
+			param = true;
+			Reflect.setField(vars, p.name, p.value);
+		}
+		var small_url = url;
+		if (param && !post) {
+			var k = url.split("?");
+			if (k.length > 1) {
+				small_url = k.shift();
+				vars.decode(k.join("?"));
+			}
+		}
+		// Bug in flash player 9 ???
+		small_url.split("xxx");
+
+		var request = new flash.net.URLRequest(small_url);
+		for (h in headers)
+			request.requestHeaders.push(new flash.net.URLRequestHeader(h.name, h.value));
+
+		if (postData != null) {
+			request.data = postData;
+			request.method = "POST";
+		} else if (postBytes != null) {
+			request.data = postBytes.getData();
+			request.method = "POST";
+		} else {
+			request.data = vars;
+			request.method = if (post) "POST" else "GET";
+		}
+
+		try {
+			loader.load(request);
+		} catch (e:Dynamic) {
+			req = null;
+			onError("Exception: " + Std.string(e));
+		}
+	}
+}
diff --git a/std/flash/_std/haxe/Json.hx b/std/flash/_std/haxe/Json.hx
index 39a32f42930c2bf618962bce700f03c3adb2f573..c56160ab77564183108a8135d244feec3d74e876 100644
--- a/std/flash/_std/haxe/Json.hx
+++ b/std/flash/_std/haxe/Json.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,28 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 @:coreApi
 #if (!haxeJSON && flash11)
-@:native("JSON") extern
+@:native("JSON")
+extern
 #end
 class Json {
+	#if (haxeJSON || !flash11)
+	inline
+	#end
+	public static function parse(text:String):Dynamic
+		#if (!haxeJSON && flash11); #else {
+			return haxe.format.JsonParser.parse(text);
+		} #end
 
-	#if (haxeJSON || !flash11) inline #end
-	public static function parse( text : String ) : Dynamic {
-		return haxe.format.JsonParser.parse(text);
-	}
-
-	#if (haxeJSON || !flash11) inline #end
-	public static function stringify( value : Dynamic, ?replacer:Dynamic -> Dynamic -> Dynamic, ?space:String ) : String {
-		return haxe.format.JsonPrinter.print(value, replacer, space);
-	}
+	#if (haxeJSON || !flash11)
+	inline
+	#end
+	public static function stringify(value:Dynamic, ?replacer:(key:Dynamic, value:Dynamic) -> Dynamic, ?space:String):String
+		#if (!haxeJSON && flash11); #else {
+			return haxe.format.JsonPrinter.print(value, replacer, space);
+		} #end
 }
diff --git a/std/js/html/webgl/ExtensionLoseContext.hx b/std/flash/_std/haxe/Log.hx
similarity index 54%
rename from std/js/html/webgl/ExtensionLoseContext.hx
rename to std/flash/_std/haxe/Log.hx
index 73b947636f0485d8c821debee0b79589152cd2c9..7f32e7de966769e9b6e7121aa958034d79406e69 100644
--- a/std/js/html/webgl/ExtensionLoseContext.hx
+++ b/std/flash/_std/haxe/Log.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,28 +20,42 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+package haxe;
 
-package js.html.webgl;
+@:coreApi class Log {
+	public static function formatOutput(v:Dynamic, infos:PosInfos):String {
+		var str = Std.string(v);
+		if (infos == null)
+			return str;
+		var pstr = infos.fileName + ":" + infos.lineNumber;
+		if (infos != null && infos.customParams != null)
+			for (v in infos.customParams)
+				str += ", " + Std.string(v);
+		return pstr + ": " + str;
+	}
 
-/**
-	The WEBGL_lose_context extension is part of the WebGL API and exposes functions to simulate losing and restoring a `WebGLRenderingContext`.
+	public static dynamic function trace(v:Dynamic, ?infos:PosInfos):Void {
+		#if (fdb || native_trace)
+		var str = formatOutput(v, infos);
+		untyped __global__["trace"](str);
+		#else
+		flash.Boot.__trace(v, infos);
+		#end
+	}
 
-	Documentation [WEBGL_lose_context](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_lose_context) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_lose_context$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
-
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_lose_context>
-**/
-@:native("WEBGL_lose_context")
-extern class ExtensionLoseContext
-{
-	
 	/**
-		Simulates losing the context.
+		Clears the trace output.
 	**/
-	function loseContext() : Void;
-	
+	@:hack
+	public static dynamic function clear():Void {
+		flash.Boot.__clear_trace();
+	}
+
 	/**
-		Simulates restoring the context.
+		Sets the color of the trace output to `rgb`.
 	**/
-	function restoreContext() : Void;
-}
\ No newline at end of file
+	@:hack
+	public static dynamic function setColor(rgb:Int):Void {
+		flash.Boot.__set_trace_color(rgb);
+	}
+}
diff --git a/std/flash/_std/haxe/Resource.hx b/std/flash/_std/haxe/Resource.hx
index dd4ebd420021ae0939ad57ead93762bd597f46b1..263aaad6f82c47ae4c364417e1693101f2f109e7 100644
--- a/std/flash/_std/haxe/Resource.hx
+++ b/std/flash/_std/haxe/Resource.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,69 +19,73 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 #if as3
 @:coreApi
 class Resource {
-	public static function listNames() : Array<String> untyped {
-		return __keys__(__resources__.list);
-	}
+	public static function listNames():Array<String>
+		untyped {
+			return __keys__(__resources__.list);
+		}
 
-	public static function getString( name : String ) : String {
+	public static function getString(name:String):String {
 		var b = resolve(name);
 		return b == null ? null : b.readUTFBytes(b.length);
 	}
 
-	public static function getBytes( name : String ) : haxe.io.Bytes {
+	public static function getBytes(name:String):haxe.io.Bytes {
 		var b = resolve(name);
 		return b == null ? null : haxe.io.Bytes.ofData(b);
 	}
 
-	static function resolve( name : String) :flash.utils.ByteArray untyped {
-		var n = __resources__.list[name];
-		if (n == null) return null;
-		return untyped __new__(n);
-	}
+	static function resolve(name:String):flash.utils.ByteArray
+		untyped {
+			var n = __resources__.list[name];
+			if (n == null)
+				return null;
+			return untyped __new__(n);
+		}
 
-	static function __init__() : Void {
+	static function __init__():Void {
 		untyped __resources__.__init__();
 	}
 }
 #else
 @:coreApi
 class Resource {
+	static var content:Array<{name:String}>;
 
-	static var content : Array<{ name : String }>;
-
-	public static function listNames() : Array<String> {
+	public static function listNames():Array<String> {
 		var names = new Array();
-		for( x in content )
+		for (x in content)
 			names.push(x.name);
 		return names;
 	}
 
-	public static function getString( name : String ) : String {
+	public static function getString(name:String):String {
 		var b = resolve(name);
 		return b == null ? null : b.readUTFBytes(b.length);
 	}
 
-	public static function getBytes( name : String ) : haxe.io.Bytes {
+	public static function getBytes(name:String):haxe.io.Bytes {
 		var b = resolve(name);
 		return b == null ? null : haxe.io.Bytes.ofData(b);
 	}
 
-	static function resolve( name : String ) : flash.utils.ByteArray {
-		try untyped {
-			var c = __as__(__global__["flash.utils.getDefinitionByName"]("_res._"+name.split(".").join("_")),Class);
-			return __new__(c);
-		} catch( e : Dynamic ) {
+	static function resolve(name:String):flash.utils.ByteArray {
+		try
+			untyped {
+				var c = __as__(__global__["flash.utils.getDefinitionByName"]("_res._" + name.split(".").join("_")), Class);
+				return __new__(c);
+			} catch (e:Dynamic) {
 			return null;
 		}
 	}
 
-	static function __init__() : Void {
+	static function __init__():Void {
 		content = untyped __resources__();
 	}
 }
-#end
\ No newline at end of file
+#end
diff --git a/std/flash/_std/haxe/ds/IntMap.hx b/std/flash/_std/haxe/ds/IntMap.hx
index ba0d0467fe2e0508278b66ddae4bb40db7537d55..18a2d84a296a11b01f6faffb644ea788b685a4cf 100644
--- a/std/flash/_std/haxe/ds/IntMap.hx
+++ b/std/flash/_std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,88 +19,104 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.ds;
 
-@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
+package haxe.ds;
 
-	private var h : flash.utils.Dictionary;
+@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
+	private var h:flash.utils.Dictionary;
 
-	public function new() : Void {
+	public function new():Void {
 		h = new flash.utils.Dictionary();
 	}
 
-	public inline function set( key : Int, value : T ) : Void {
+	public inline function set(key:Int, value:T):Void {
 		untyped h[key] = value;
 	}
 
-	public inline function get( key : Int ) : Null<T> {
+	public inline function get(key:Int):Null<T> {
 		return untyped h[key];
 	}
 
-	public inline function exists( key : Int ) : Bool {
-		return untyped __in__(key,h);
+	public inline function exists(key:Int):Bool {
+		return untyped __in__(key, h);
 	}
 
-	public function remove( key : Int ) : Bool {
-		if( !exists(key) ) return false;
-		untyped __delete__(h,key);
+	public function remove(key:Int):Bool {
+		if (!exists(key))
+			return false;
+		untyped __delete__(h, key);
 		return true;
 	}
 
 	#if as3
-
 	// unoptimized version
-	
-	public function keys() : Iterator<Int> {
+
+	public function keys():Iterator<Int> {
 		return untyped (__keys__(h)).iterator();
 	}
 
-	@:analyzer(ignore) public function iterator() : Iterator<T> {
+	@:analyzer(ignore) public function iterator():Iterator<T> {
 		return untyped {
-			ref : h,
-			it : keys(),
-			hasNext : function() { return __this__.it.hasNext(); },
-			next : function() { var i = __this__.it.next(); return __this__.ref[i]; }
+			ref: h,
+			it: keys(),
+			hasNext: function() {
+				return __this__.it.hasNext();
+			},
+			next: function() {
+				var i = __this__.it.next();
+				return __this__.ref[i];
+			}
 		};
 	}
-
 	#else
-
-	public inline function keys() : Iterator<Int> {
+	public inline function keys():Iterator<Int> {
 		return new IntMapKeysIterator(h);
 	}
 
-	public inline function iterator() : Iterator<T> {
+	public inline function iterator():Iterator<T> {
 		return new IntMapValuesIterator<T>(h);
 	}
-
 	#end
-	
-	public function toString() : String {
+
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():IntMap<T> {
+		var copied = new IntMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
+
+	public inline function clear():Void {
+		h = new flash.utils.Dictionary();
+	}
 }
 
 #if !as3
-
 // this version uses __has_next__/__forin__ special SWF opcodes for iteration with no allocation
 
 @:allow(haxe.ds.IntMap)
 private class IntMapKeysIterator {
 	var h:flash.utils.Dictionary;
-	var index : Int;
-	var nextIndex : Int;
+	var index:Int;
+	var nextIndex:Int;
 
 	inline function new(h:flash.utils.Dictionary):Void {
 		this.h = h;
@@ -116,18 +132,17 @@ private class IntMapKeysIterator {
 	}
 
 	public inline function next():Int {
-		var r : Int = untyped __forin__(h, nextIndex);
+		var r:Int = untyped __forin__(h, nextIndex);
 		index = nextIndex;
 		return r;
 	}
-
 }
 
 @:allow(haxe.ds.IntMap)
 private class IntMapValuesIterator<T> {
 	var h:flash.utils.Dictionary;
-	var index : Int;
-	var nextIndex : Int;
+	var index:Int;
+	var nextIndex:Int;
 
 	inline function new(h:flash.utils.Dictionary):Void {
 		this.h = h;
@@ -147,6 +162,5 @@ private class IntMapValuesIterator<T> {
 		index = nextIndex;
 		return r;
 	}
-
 }
 #end
diff --git a/std/flash/_std/haxe/ds/ObjectMap.hx b/std/flash/_std/haxe/ds/ObjectMap.hx
index e62b794c3e3a4a5b63822d60a478d24f8986bad7..64f06c7171fcef3845fe5a702fd4236d4f4041ac 100644
--- a/std/flash/_std/haxe/ds/ObjectMap.hx
+++ b/std/flash/_std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,69 +19,83 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package haxe.ds;
 
-@:coreApi
-class ObjectMap<K:{},V> extends flash.utils.Dictionary implements haxe.Constraints.IMap<K,V> {
+package haxe.ds;
 
+@:coreApi
+class ObjectMap<K:{}, V> extends flash.utils.Dictionary implements haxe.Constraints.IMap<K, V> {
 	public function new() {
 		super(false);
 	}
 
-	public inline function get( key : K ) : Null<V> {
+	public inline function get(key:K):Null<V> {
 		return untyped this[key];
 	}
 
-	public inline function set( key : K, value : V ):Void {
+	public inline function set(key:K, value:V):Void {
 		untyped this[key] = value;
 	}
 
-	public inline function exists( key : K ) : Bool {
+	public inline function exists(key:K):Bool {
 		return untyped this[key] != null;
 	}
 
-	public function remove( key : K ):Bool {
+	public function remove(key:K):Bool {
 		var has = exists(key);
 		untyped __delete__(this, key);
 		return has;
 	}
 
 	#if as3
-
- 	public function keys() : Iterator<K> {
+	public function keys():Iterator<K> {
 		return untyped __keys__(this).iterator();
- 	}
+	}
 
- 	public function iterator() : Iterator<V> {
+	public function iterator():Iterator<V> {
 		var ret = [];
 		for (i in keys())
 			ret.push(get(i));
 		return ret.iterator();
- 	}
+	}
 	#else
-
-	public function keys() : Iterator<K> {
+	public function keys():Iterator<K> {
 		return NativePropertyIterator.iterator(this);
 	}
 
-	public function iterator() : Iterator<V> {
+	public function iterator():Iterator<V> {
 		return NativeValueIterator.iterator(this);
 	}
-
 	#end
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():ObjectMap<K, V> {
+		var copied = new ObjectMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = "";
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s += (s == "" ? "" : ",") + Std.string(i);
 			s += " => ";
 			s += Std.string(get(i));
 		}
 		return s + "}";
 	}
+
+	public function clear():Void {
+		for (i in keys())
+			untyped __delete__(this, i);
+	}
 }
 
+#if !as3
 private class NativePropertyIterator {
 	var collection:Dynamic;
 	var index:Int = 0;
@@ -139,3 +153,4 @@ private class NativeValueIterator {
 		return result;
 	}
 }
+#end
diff --git a/std/flash/_std/haxe/ds/StringMap.hx b/std/flash/_std/haxe/ds/StringMap.hx
index d037d67318320c99f31bed6ecfb4790e834afda2..144973ba89484942141facaa1a3ea0b587f19c24 100644
--- a/std/flash/_std/haxe/ds/StringMap.hx
+++ b/std/flash/_std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,127 +19,146 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
-@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String,T> {
+@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String, T> {
+	private var h:Dynamic;
+	private var rh:Dynamic;
 
-	private var h : Dynamic;
-	private var rh : Dynamic;
-	static var reserved = { };
+	static var reserved = {};
 
-	public function new() : Void {
+	public function new():Void {
 		h = {};
 	}
 
-	inline function isReserved(key:String) : Bool {
-		return untyped __in__(key,reserved);
+	inline function isReserved(key:String):Bool {
+		return untyped __in__(key, reserved);
 	}
 
-	public inline function set( key : String, value : T ) : Void {
-		if( isReserved(key) )
+	public inline function set(key:String, value:T):Void {
+		if (isReserved(key))
 			setReserved(key, value);
 		else
 			untyped h[key] = value;
 	}
 
-	public inline function get( key : String ) : Null<T> {
-		if( isReserved(key) )
+	public inline function get(key:String):Null<T> {
+		if (isReserved(key))
 			return getReserved(key);
 		return untyped h[key];
 	}
 
-	public inline function exists( key : String ) : Bool {
-		if( isReserved(key) )
+	public inline function exists(key:String):Bool {
+		if (isReserved(key))
 			return existsReserved(key);
-		return untyped __in__(key,h);
+		return untyped __in__(key, h);
 	}
 
-	function setReserved( key : String, value : T ) : Void {
-		if( rh == null ) rh = {};
-		untyped rh["$"+key] = value;
+	function setReserved(key:String, value:T):Void {
+		if (rh == null)
+			rh = {};
+		untyped rh["$" + key] = value;
 	}
 
-	function getReserved( key : String ) : Null<T> {
-		return rh == null ? null : untyped rh["$"+key];
+	function getReserved(key:String):Null<T> {
+		return rh == null ? null : untyped rh["$" + key];
 	}
 
-	function existsReserved( key : String ) : Bool {
-		if( rh == null ) return false;
-		return untyped __in__("$"+key,rh);
+	function existsReserved(key:String):Bool {
+		if (rh == null)
+			return false;
+		return untyped __in__("$" + key, rh);
 	}
 
-	public function remove( key : String ) : Bool {
-		if( isReserved(key) ) {
+	public function remove(key:String):Bool {
+		if (isReserved(key)) {
 			key = "$" + key;
-			if( rh == null || !untyped __in__(key,rh) ) return false;
-			untyped __delete__(rh,key);
+			if (rh == null || !untyped __in__(key, rh))
+				return false;
+			untyped __delete__(rh, key);
 			return true;
 		} else {
-			if( !untyped __in__(key,h) )
+			if (!untyped __in__(key, h))
 				return false;
-			untyped __delete__(h,key);
+			untyped __delete__(h, key);
 			return true;
 		}
 	}
 
 	#if as3
-
 	// unoptimized version
 
-	public function keys() : Iterator<String> {
-		var out : Array<String> = untyped __keys__(h);
-		if( rh != null ) out = out.concat(untyped __hkeys__(rh));
+	public function keys():Iterator<String> {
+		var out:Array<String> = untyped __keys__(h);
+		if (rh != null)
+			out = out.concat(untyped __hkeys__(rh));
 		return out.iterator();
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return untyped {
-			it : keys(),
-			hasNext : function() { return __this__.it.hasNext(); },
-			next : function() { return get(__this__.it.next()); }
+			it: keys(),
+			hasNext: function() {
+				return __this__.it.hasNext();
+			},
+			next: function() {
+				return get(__this__.it.next());
+			}
 		};
 	}
-
 	#else
-
-	public inline function keys() : Iterator<String> {
+	public inline function keys():Iterator<String> {
 		return new StringMapKeysIterator(h, rh);
 	}
 
-	public inline function iterator() : Iterator<T> {
+	public inline function iterator():Iterator<T> {
 		return new StringMapValuesIterator<T>(h, rh);
 	}
-
 	#end
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():StringMap<T> {
+		var copied = new StringMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
+	public inline function clear():Void {
+		h = {};
+		rh = null;
+	}
 }
 
 #if !as3
-
 // this version uses __has_next__/__forin__ special SWF opcodes for iteration with no allocation
 
 @:allow(haxe.ds.StringMap)
 private class StringMapKeysIterator {
 	var h:Dynamic;
 	var rh:Dynamic;
-	var index : Int;
-	var nextIndex : Int;
-	var isReserved : Bool;
+	var index:Int;
+	var nextIndex:Int;
+	var isReserved:Bool;
 
 	inline function new(h:Dynamic, rh:Dynamic):Void {
 		this.h = h;
@@ -152,7 +171,7 @@ private class StringMapKeysIterator {
 	public inline function hasNext():Bool {
 		var h = h, index = index; // tmp vars required for __has_next
 		var n = untyped __has_next__(h, index);
-		if( !n && rh != null ) {
+		if (!n && rh != null) {
 			h = this.h = rh;
 			index = this.index = 0;
 			rh = null;
@@ -164,20 +183,20 @@ private class StringMapKeysIterator {
 	}
 
 	public inline function next():String {
-		var r : String = untyped __forin__(h, nextIndex);
+		var r:String = untyped __forin__(h, nextIndex);
 		index = nextIndex;
-		if( isReserved ) r = r.substr(1);
+		if (isReserved)
+			r = r.substr(1);
 		return r;
 	}
-
 }
 
 @:allow(haxe.ds.StringMap)
 private class StringMapValuesIterator<T> {
 	var h:Dynamic;
 	var rh:Dynamic;
-	var index : Int;
-	var nextIndex : Int;
+	var index:Int;
+	var nextIndex:Int;
 
 	inline function new(h:Dynamic, rh:Dynamic):Void {
 		this.h = h;
@@ -189,7 +208,7 @@ private class StringMapValuesIterator<T> {
 	public inline function hasNext():Bool {
 		var h = h, index = index; // tmp vars required for __has_next
 		var n = untyped __has_next__(h, index);
-		if( !n && rh != null ) {
+		if (!n && rh != null) {
 			h = this.h = rh;
 			index = this.index = 0;
 			rh = null;
@@ -204,6 +223,5 @@ private class StringMapValuesIterator<T> {
 		index = nextIndex;
 		return r;
 	}
-
 }
 #end
diff --git a/std/flash/_std/haxe/ds/UnsafeStringMap.hx b/std/flash/_std/haxe/ds/UnsafeStringMap.hx
index da4f5ace8e4a2f77c2335b545a984a62a8effaf7..73946229911b47d2e33ab579e0fee04ae832c361 100644
--- a/std/flash/_std/haxe/ds/UnsafeStringMap.hx
+++ b/std/flash/_std/haxe/ds/UnsafeStringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 /**
@@ -26,87 +27,101 @@ package haxe.ds;
 	As a result, it will be faster to access the map for reading, but it might fail
 	with some reserved keys such as `constructor` or `prototype`.
 **/
-class UnsafeStringMap<T> implements haxe.Constraints.IMap<String,T> {
-
-	private var h : flash.utils.Dictionary;
+class UnsafeStringMap<T> implements haxe.Constraints.IMap<String, T> {
+	private var h:flash.utils.Dictionary;
 
-	public function new() : Void {
+	public function new():Void {
 		h = new flash.utils.Dictionary();
 	}
 
-	public inline function set( key : String, value : T ) : Void {
+	public inline function set(key:String, value:T):Void {
 		untyped h[key] = value;
 	}
 
-	public inline function get( key : String ) : Null<T> {
+	public inline function get(key:String):Null<T> {
 		return untyped h[key];
 	}
 
-	public inline function exists( key : String ) : Bool {
-		return untyped __in__(key,h);
+	public inline function exists(key:String):Bool {
+		return untyped __in__(key, h);
 	}
 
-	public function remove( key : String ) : Bool {
-		if( untyped !h.hasOwnProperty(key) ) return false;
-		untyped __delete__(h,key);
+	public function remove(key:String):Bool {
+		if (untyped !h.hasOwnProperty(key))
+			return false;
+		untyped __delete__(h, key);
 		return true;
 	}
 
 	#if as3
-
 	// unoptimized version
-	
-	public function keys() : Iterator<String> {
+
+	public function keys():Iterator<String> {
 		return untyped (__keys__(h)).iterator();
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return untyped {
-			ref : h,
-			it : __keys__(h).iterator(),
-			hasNext : function() { return __this__.it.hasNext(); },
-			next : function() { var i : Dynamic = __this__.it.next(); return __this__.ref[i]; }
+			ref: h,
+			it: __keys__(h).iterator(),
+			hasNext: function() {
+				return __this__.it.hasNext();
+			},
+			next: function() {
+				var i:Dynamic = __this__.it.next();
+				return __this__.ref[i];
+			}
 		};
 	}
-
 	#else
-
-	public inline function keys() : Iterator<String> {
+	public inline function keys():Iterator<String> {
 		return new UnsafeStringMapKeysIterator(h);
 	}
 
-	public inline function iterator() : Iterator<T> {
+	public inline function iterator():Iterator<T> {
 		return new UnsafeStringMapValuesIterator<T>(h);
 	}
-
 	#end
 
-	public function toString() : String {
+	public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():UnsafeStringMap<T> {
+		var copied = new UnsafeStringMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
+	public inline function clear():Void {
+		h = new flash.utils.Dictionary();
+	}
 }
 
 #if !as3
-
 // this version uses __has_next__/__forin__ special SWF opcodes for iteration with no allocation
 
 @:allow(haxe.ds.UnsafeStringMap)
 private class UnsafeStringMapKeysIterator {
 	var h:flash.utils.Dictionary;
-	var index : Int;
-	var nextIndex : Int;
+	var index:Int;
+	var nextIndex:Int;
 
 	inline function new(h:flash.utils.Dictionary):Void {
 		this.h = h;
@@ -122,18 +137,17 @@ private class UnsafeStringMapKeysIterator {
 	}
 
 	public inline function next():String {
-		var r : String = untyped __forin__(h, nextIndex);
+		var r:String = untyped __forin__(h, nextIndex);
 		index = nextIndex;
 		return r;
 	}
-
 }
 
 @:allow(haxe.ds.UnsafeStringMap)
 private class UnsafeStringMapValuesIterator<T> {
 	var h:flash.utils.Dictionary;
-	var index : Int;
-	var nextIndex : Int;
+	var index:Int;
+	var nextIndex:Int;
 
 	inline function new(h:flash.utils.Dictionary):Void {
 		this.h = h;
@@ -153,6 +167,5 @@ private class UnsafeStringMapValuesIterator<T> {
 		index = nextIndex;
 		return r;
 	}
-
 }
 #end
diff --git a/std/flash/_std/haxe/ds/WeakMap.hx b/std/flash/_std/haxe/ds/WeakMap.hx
index 9b125e5f086269d7fb0f5fbc89795df21a7edf64..7b52ecda7ac0f5570bccecda5a3c2f4b0e4a8b53 100644
--- a/std/flash/_std/haxe/ds/WeakMap.hx
+++ b/std/flash/_std/haxe/ds/WeakMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,69 +19,83 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package haxe.ds;
 
-@:coreApi
-class WeakMap<K:{},V> extends flash.utils.Dictionary implements haxe.Constraints.IMap<K,V> {
+package haxe.ds;
 
+@:coreApi
+class WeakMap<K:{}, V> extends flash.utils.Dictionary implements haxe.Constraints.IMap<K, V> {
 	public function new() {
 		super(true);
 	}
 
-	public inline function get( key : K ) : Null<V> {
+	public inline function get(key:K):Null<V> {
 		return untyped this[key];
 	}
 
-	public inline function set( key : K, value : V ):Void {
+	public inline function set(key:K, value:V):Void {
 		untyped this[key] = value;
 	}
 
-	public inline function exists( key : K ) : Bool {
+	public inline function exists(key:K):Bool {
 		return untyped this[key] != null;
 	}
 
-	public function remove( key : K ):Bool {
+	public function remove(key:K):Bool {
 		var has = exists(key);
 		untyped __delete__(this, key);
 		return has;
 	}
 
 	#if as3
-
- 	public function keys() : Iterator<K> {
+	public function keys():Iterator<K> {
 		return untyped __keys__(this).iterator();
- 	}
+	}
 
- 	public function iterator() : Iterator<V> {
+	public function iterator():Iterator<V> {
 		var ret = [];
 		for (i in keys())
 			ret.push(get(i));
 		return ret.iterator();
- 	}
+	}
 	#else
-
-	public function keys() : Iterator<K> {
+	public function keys():Iterator<K> {
 		return NativePropertyIterator.iterator(this);
 	}
 
-	public function iterator() : Iterator<V> {
+	public function iterator():Iterator<V> {
 		return NativeValueIterator.iterator(this);
 	}
-
 	#end
 
-	public function toString() : String {
+	public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():WeakMap<K, V> {
+		var copied = new WeakMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = "";
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s += (s == "" ? "" : ",") + Std.string(i);
 			s += " => ";
 			s += Std.string(get(i));
 		}
 		return s + "}";
 	}
+
+	public function clear():Void {
+		for (i in keys())
+			untyped __delete__(this, i);
+	}
 }
 
+#if !as3
 private class NativePropertyIterator {
 	var collection:Dynamic;
 	var index:Int = 0;
@@ -139,3 +153,4 @@ private class NativeValueIterator {
 		return result;
 	}
 }
+#end
diff --git a/std/flash/_std/haxe/zip/Compress.hx b/std/flash/_std/haxe/zip/Compress.hx
index 0efc61f610c2cbf9295ad77d97640475d5534950..e706d9cb8303dcb40515246db300a61a48e13f5d 100644
--- a/std/flash/_std/haxe/zip/Compress.hx
+++ b/std/flash/_std/haxe/zip/Compress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,37 +19,36 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 @:coreApi
 class Compress {
-
-	public function new( level : Int ) : Void {
+	public function new(level:Int):Void {
 		throw "Not implemented for this platform";
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
 		return null;
 	}
 
-	public function setFlushMode( f : FlushMode ) : Void {
-	}
+	public function setFlushMode(f:FlushMode):Void {}
 
-	public function close() : Void {
-	}
+	public function close():Void {}
 
-	public static function run( s : haxe.io.Bytes, level : Int ) : haxe.io.Bytes {
-		if( s.length == 0 ) {
+	public static function run(s:haxe.io.Bytes, level:Int):haxe.io.Bytes {
+		if (s.length == 0) {
 			// Flash returns 0 bytes for 0 length compress (which can't be decoded on other platforms...)
 			var b = haxe.io.Bytes.alloc(8);
-			b.set(0,0x78);b.set(1,0xDA);b.set(2,0x03);
-			b.set(7,0x01);
+			b.set(0, 0x78);
+			b.set(1, 0xDA);
+			b.set(2, 0x03);
+			b.set(7, 0x01);
 			return b;
 		}
 		var tmp = new flash.utils.ByteArray();
-		tmp.writeBytes(s.getData(),0,s.length);
+		tmp.writeBytes(s.getData(), 0, s.length);
 		tmp.compress();
 		return haxe.io.Bytes.ofData(tmp);
 	}
-
 }
diff --git a/std/flash/_std/haxe/zip/Uncompress.hx b/std/flash/_std/haxe/zip/Uncompress.hx
index 2332fe9fbbbe8ea2129e5bb31e4db30d0c2d9401..4beec60143cc9aba228b316a16789293277b1e00 100644
--- a/std/flash/_std/haxe/zip/Uncompress.hx
+++ b/std/flash/_std/haxe/zip/Uncompress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,30 +19,27 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 @:coreApi
 class Uncompress {
-
-	public function new( ?windowBits : Int ) : Void {
+	public function new(?windowBits:Int):Void {
 		throw "Not implemented for this platform";
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
 		return null;
 	}
 
-	public function setFlushMode( f : FlushMode ) : Void {
-	}
+	public function setFlushMode(f:FlushMode):Void {}
 
-	public function close() : Void {
-	}
+	public function close():Void {}
 
-	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
+	public static function run(src:haxe.io.Bytes, ?bufsize:Int):haxe.io.Bytes {
 		var tmp = new flash.utils.ByteArray();
-		tmp.writeBytes(src.getData(),0,src.length);
+		tmp.writeBytes(src.getData(), 0, src.length);
 		tmp.uncompress();
 		return haxe.io.Bytes.ofData(tmp);
 	}
-
 }
diff --git a/std/flash/accessibility/Accessibility.hx b/std/flash/accessibility/Accessibility.hx
index 6df721c36bcc481a9b275b353cea43cd22fe0ead..e7e67e54db10a651635680dca617a718a718196f 100644
--- a/std/flash/accessibility/Accessibility.hx
+++ b/std/flash/accessibility/Accessibility.hx
@@ -1,7 +1,8 @@
 package flash.accessibility;
 
 extern class Accessibility {
-	static var active(default,never) : Bool;
+	@:flash.property static var active(get,never) : Bool;
+	private static function get_active() : Bool;
 	static function sendEvent(source : flash.display.DisplayObject, childID : UInt, eventType : UInt, nonHTML : Bool = false) : Void;
 	static function updateProperties() : Void;
 }
diff --git a/std/flash/accessibility/ISearchableText.hx b/std/flash/accessibility/ISearchableText.hx
index 474dee6469c12963e61ea3ea9d9db6c8174df4bc..976eca432031afdb2e3cc64fc17b69419bae3ab0 100644
--- a/std/flash/accessibility/ISearchableText.hx
+++ b/std/flash/accessibility/ISearchableText.hx
@@ -1,5 +1,6 @@
 package flash.accessibility;
 
 @:require(flash10_1) extern interface ISearchableText {
-	var searchText(default,never) : String;
+	@:flash.property var searchText(get,never) : String;
+	private function get_searchText() : String;
 }
diff --git a/std/flash/accessibility/ISimpleTextSelection.hx b/std/flash/accessibility/ISimpleTextSelection.hx
index 01b8c890d1cc188f6157c45194a0890eb5e47794..3f32d93831b12cb564850c70080afc4a14c6c132 100644
--- a/std/flash/accessibility/ISimpleTextSelection.hx
+++ b/std/flash/accessibility/ISimpleTextSelection.hx
@@ -1,6 +1,8 @@
 package flash.accessibility;
 
 @:require(flash10_1) extern interface ISimpleTextSelection {
-	var selectionActiveIndex(default,never) : Int;
-	var selectionAnchorIndex(default,never) : Int;
+	@:flash.property var selectionActiveIndex(get,never) : Int;
+	@:flash.property var selectionAnchorIndex(get,never) : Int;
+	private function get_selectionActiveIndex() : Int;
+	private function get_selectionAnchorIndex() : Int;
 }
diff --git a/std/flash/automation/AutomationAction.hx b/std/flash/automation/AutomationAction.hx
index b7168866d7f4da390ba4db697ed5dd0bb3354deb..31e68d56fce44ab08c8ba1819388a77272b9ee1f 100644
--- a/std/flash/automation/AutomationAction.hx
+++ b/std/flash/automation/AutomationAction.hx
@@ -1,6 +1,8 @@
 package flash.automation;
 
 @:require(flash10_1) extern class AutomationAction {
-	var type : String;
+	@:flash.property var type(get,set) : String;
 	function new() : Void;
+	private function get_type() : String;
+	private function set_type(value : String) : String;
 }
diff --git a/std/flash/automation/Configuration.hx b/std/flash/automation/Configuration.hx
index 3bd1b84b20581c4225881c19ce6f8dae072f5548..dbc6a2a4d6bcfa6105b386332f8baf9279a05d99 100644
--- a/std/flash/automation/Configuration.hx
+++ b/std/flash/automation/Configuration.hx
@@ -1,6 +1,9 @@
 package flash.automation;
 
 @:require(flash10_1) extern class Configuration {
-	static var deviceConfiguration : String;
-	static var testAutomationConfiguration(default,never) : String;
+	@:flash.property static var deviceConfiguration(get,set) : String;
+	@:flash.property static var testAutomationConfiguration(get,never) : String;
+	private static function get_deviceConfiguration() : String;
+	private static function get_testAutomationConfiguration() : String;
+	private static function set_deviceConfiguration(value : String) : String;
 }
diff --git a/std/flash/automation/KeyboardAutomationAction.hx b/std/flash/automation/KeyboardAutomationAction.hx
index ed5ca7b999bea02bce05fb5e4d605d62c721048d..4042474d7bf30769abb7aa29cee67029c444c47b 100644
--- a/std/flash/automation/KeyboardAutomationAction.hx
+++ b/std/flash/automation/KeyboardAutomationAction.hx
@@ -1,8 +1,10 @@
 package flash.automation;
 
 @:require(flash10_1) extern class KeyboardAutomationAction extends AutomationAction {
-	var keyCode : UInt;
+	@:flash.property var keyCode(get,set) : UInt;
 	function new(type : String, keyCode : UInt = 0) : Void;
-	static var KEY_DOWN(default,never) : String;
-	static var KEY_UP(default,never) : String;
+	private function get_keyCode() : UInt;
+	private function set_keyCode(value : UInt) : UInt;
+	static final KEY_DOWN : String;
+	static final KEY_UP : String;
 }
diff --git a/std/flash/automation/MouseAutomationAction.hx b/std/flash/automation/MouseAutomationAction.hx
index 518b3520d70a014075080ca2db88c6d524008b30..260a7352c2313ad8ca041751daec9983ddb1ef27 100644
--- a/std/flash/automation/MouseAutomationAction.hx
+++ b/std/flash/automation/MouseAutomationAction.hx
@@ -1,16 +1,22 @@
 package flash.automation;
 
 @:require(flash10_1) extern class MouseAutomationAction extends AutomationAction {
-	var delta : Int;
-	var stageX : Float;
-	var stageY : Float;
+	@:flash.property var delta(get,set) : Int;
+	@:flash.property var stageX(get,set) : Float;
+	@:flash.property var stageY(get,set) : Float;
 	function new(type : String, stageX : Float = 0, stageY : Float = 0, delta : Int = 0) : Void;
-	static var MIDDLE_MOUSE_DOWN(default,never) : String;
-	static var MIDDLE_MOUSE_UP(default,never) : String;
-	static var MOUSE_DOWN(default,never) : String;
-	static var MOUSE_MOVE(default,never) : String;
-	static var MOUSE_UP(default,never) : String;
-	static var MOUSE_WHEEL(default,never) : String;
-	static var RIGHT_MOUSE_DOWN(default,never) : String;
-	static var RIGHT_MOUSE_UP(default,never) : String;
+	private function get_delta() : Int;
+	private function get_stageX() : Float;
+	private function get_stageY() : Float;
+	private function set_delta(value : Int) : Int;
+	private function set_stageX(value : Float) : Float;
+	private function set_stageY(value : Float) : Float;
+	static final MIDDLE_MOUSE_DOWN : String;
+	static final MIDDLE_MOUSE_UP : String;
+	static final MOUSE_DOWN : String;
+	static final MOUSE_MOVE : String;
+	static final MOUSE_UP : String;
+	static final MOUSE_WHEEL : String;
+	static final RIGHT_MOUSE_DOWN : String;
+	static final RIGHT_MOUSE_UP : String;
 }
diff --git a/std/flash/automation/StageCapture.hx b/std/flash/automation/StageCapture.hx
index dfd58f2ac99121e96917e42322f4322e15000a83..81aca8213cbe1c504df06281d3d855a07a9064f6 100644
--- a/std/flash/automation/StageCapture.hx
+++ b/std/flash/automation/StageCapture.hx
@@ -1,18 +1,26 @@
 package flash.automation;
 
 @:require(flash10_1) extern class StageCapture extends flash.events.EventDispatcher {
-	var capturePTS : Float;
-	var captureSource : String;
-	var clipRect : flash.geom.Rectangle;
-	var fileNameBase : String;
+	@:flash.property var capturePTS(get,set) : Float;
+	@:flash.property var captureSource(get,set) : String;
+	@:flash.property var clipRect(get,set) : flash.geom.Rectangle;
+	@:flash.property var fileNameBase(get,set) : String;
 	function new() : Void;
 	function cancel() : Void;
 	function capture(type : String) : Void;
 	function captureBitmapData() : flash.display.BitmapData;
-	static var CURRENT(default,never) : String;
-	static var MULTIPLE(default,never) : String;
-	static var NEXT(default,never) : String;
-	static var RASTER(default,never) : String;
-	static var SCREEN(default,never) : String;
-	static var STAGE(default,never) : String;
+	private function get_capturePTS() : Float;
+	private function get_captureSource() : String;
+	private function get_clipRect() : flash.geom.Rectangle;
+	private function get_fileNameBase() : String;
+	private function set_capturePTS(value : Float) : Float;
+	private function set_captureSource(value : String) : String;
+	private function set_clipRect(value : flash.geom.Rectangle) : flash.geom.Rectangle;
+	private function set_fileNameBase(value : String) : String;
+	static final CURRENT : String;
+	static final MULTIPLE : String;
+	static final NEXT : String;
+	static final RASTER : String;
+	static final SCREEN : String;
+	static final STAGE : String;
 }
diff --git a/std/flash/automation/StageCaptureEvent.hx b/std/flash/automation/StageCaptureEvent.hx
index c02222660ac2e77dddba764d05c96dff2f3679bd..dd0158ac347c7f62101e2f721c6c96dff175a2be 100644
--- a/std/flash/automation/StageCaptureEvent.hx
+++ b/std/flash/automation/StageCaptureEvent.hx
@@ -1,9 +1,12 @@
 package flash.automation;
 
 @:require(flash10_1) extern class StageCaptureEvent extends flash.events.Event {
-	var checksum(default,never) : UInt;
-	var pts(default,never) : Float;
-	var url(default,never) : String;
+	@:flash.property var checksum(get,never) : UInt;
+	@:flash.property var pts(get,never) : Float;
+	@:flash.property var url(get,never) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?url : String, checksum : UInt = 0, pts : Float = 0) : Void;
-	static var CAPTURE(default,never) : String;
+	private function get_checksum() : UInt;
+	private function get_pts() : Float;
+	private function get_url() : String;
+	static final CAPTURE : String;
 }
diff --git a/std/flash/concurrent/Condition.hx b/std/flash/concurrent/Condition.hx
index 66316fcbbcadca11155a2661e8780357f06727ad..3d9dcda808792c0de616acc07b123a11937b85c3 100644
--- a/std/flash/concurrent/Condition.hx
+++ b/std/flash/concurrent/Condition.hx
@@ -1,10 +1,12 @@
 package flash.concurrent;
 
-@:final @:require(flash11_4) extern class Condition {
-	var mutex(default,never) : Mutex;
+@:require(flash11_4) extern final class Condition {
+	@:flash.property var mutex(get,never) : Mutex;
 	function new(mutex : Mutex) : Void;
+	private function get_mutex() : Mutex;
 	function notify() : Void;
 	function notifyAll() : Void;
 	function wait(timeout : Float = -1) : Bool;
-	static var isSupported(default,never) : Bool;
+	@:flash.property static var isSupported(get,never) : Bool;
+	private static function get_isSupported() : Bool;
 }
diff --git a/std/flash/concurrent/Mutex.hx b/std/flash/concurrent/Mutex.hx
index 45fed1f6a90a37c98933e802042405b366980b93..db500056600362824df214601f748549b0be94f1 100644
--- a/std/flash/concurrent/Mutex.hx
+++ b/std/flash/concurrent/Mutex.hx
@@ -1,9 +1,10 @@
 package flash.concurrent;
 
-@:final @:require(flash11_4) extern class Mutex {
+@:require(flash11_4) extern final class Mutex {
 	function new() : Void;
 	function lock() : Void;
 	function tryLock() : Bool;
 	function unlock() : Void;
-	static var isSupported(default,never) : Bool;
+	@:flash.property static var isSupported(get,never) : Bool;
+	private static function get_isSupported() : Bool;
 }
diff --git a/std/flash/desktop/Clipboard.hx b/std/flash/desktop/Clipboard.hx
index 1b5dad0d841c89e57cbb5af2e604b9d900f0871f..6fba4c517d4eec939b1f2f9486fc577806947c94 100644
--- a/std/flash/desktop/Clipboard.hx
+++ b/std/flash/desktop/Clipboard.hx
@@ -1,12 +1,14 @@
 package flash.desktop;
 
 @:require(flash10) extern class Clipboard {
-	var formats(default,never) : Array<ClipboardFormats>;
+	@:flash.property var formats(get,never) : Array<ClipboardFormats>;
 	function clear() : Void;
 	function clearData(format : ClipboardFormats) : Void;
 	function getData(format : ClipboardFormats, ?transferMode : ClipboardTransferMode) : flash.utils.Object;
+	private function get_formats() : Array<ClipboardFormats>;
 	function hasFormat(format : ClipboardFormats) : Bool;
 	function setData(format : ClipboardFormats, data : flash.utils.Object, serializable : Bool = true) : Bool;
 	function setDataHandler(format : ClipboardFormats, handler : flash.utils.Function, serializable : Bool = true) : Bool;
-	static var generalClipboard(default,never) : Clipboard;
+	@:flash.property static var generalClipboard(get,never) : Clipboard;
+	private static function get_generalClipboard() : Clipboard;
 }
diff --git a/std/flash/desktop/ClipboardFormats.hx b/std/flash/desktop/ClipboardFormats.hx
index f5f715fa10faf706373b704db7d7d5942a71d2a6..3f6e0b1aff72a4491a8fdcde6c8bbf478ab56860 100644
--- a/std/flash/desktop/ClipboardFormats.hx
+++ b/std/flash/desktop/ClipboardFormats.hx
@@ -1,15 +1,15 @@
 package flash.desktop;
 
-@:fakeEnum(String) @:require(flash10) extern enum ClipboardFormats {
-	AIR_PREFIX;
-	BITMAP_FORMAT;
-	FILE_LIST_FORMAT;
-	FILE_PROMISE_LIST_FORMAT;
-	FLASH_PREFIX;
-	HTML_FORMAT;
-	REFERENCE_PREFIX;
-	RICH_TEXT_FORMAT;
-	SERIALIZATION_PREFIX;
-	TEXT_FORMAT;
-	URL_FORMAT;
+@:native("flash.desktop.ClipboardFormats") @:require(flash10) extern enum abstract ClipboardFormats(String) {
+	var AIR_PREFIX;
+	var BITMAP_FORMAT;
+	var FILE_LIST_FORMAT;
+	var FILE_PROMISE_LIST_FORMAT;
+	var FLASH_PREFIX;
+	var HTML_FORMAT;
+	var REFERENCE_PREFIX;
+	var RICH_TEXT_FORMAT;
+	var SERIALIZATION_PREFIX;
+	var TEXT_FORMAT;
+	var URL_FORMAT;
 }
diff --git a/std/flash/desktop/ClipboardTransferMode.hx b/std/flash/desktop/ClipboardTransferMode.hx
index c76f81bd5680ae72734b523b3fc2eeafb5c3c5c4..52c05ddb691998e03c303fd9800bc3225299c533 100644
--- a/std/flash/desktop/ClipboardTransferMode.hx
+++ b/std/flash/desktop/ClipboardTransferMode.hx
@@ -1,8 +1,8 @@
 package flash.desktop;
 
-@:fakeEnum(String) @:require(flash10) extern enum ClipboardTransferMode {
-	CLONE_ONLY;
-	CLONE_PREFERRED;
-	ORIGINAL_ONLY;
-	ORIGINAL_PREFERRED;
+@:native("flash.desktop.ClipboardTransferMode") @:require(flash10) extern enum abstract ClipboardTransferMode(String) {
+	var CLONE_ONLY;
+	var CLONE_PREFERRED;
+	var ORIGINAL_ONLY;
+	var ORIGINAL_PREFERRED;
 }
diff --git a/std/flash/display/AVM1Movie.hx b/std/flash/display/AVM1Movie.hx
index 32944ad0ebbdf51e45e372113e1ab3d973ba40dc..f035bb6eb7017345f02bfc4f367616eca4451561 100644
--- a/std/flash/display/AVM1Movie.hx
+++ b/std/flash/display/AVM1Movie.hx
@@ -3,5 +3,5 @@ package flash.display;
 extern class AVM1Movie extends DisplayObject {
 	function new() : Void;
 	function addCallback(functionName : String, closure : flash.utils.Function) : Void;
-	function call(functionName : String, ?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Dynamic;
+	function call(functionName : String, restArgs : haxe.extern.Rest<Dynamic>) : Dynamic;
 }
diff --git a/std/flash/display/ActionScriptVersion.hx b/std/flash/display/ActionScriptVersion.hx
index 02e538336a1bf5eeeabc1263e90f1caafe7ffcf2..497b372835b2c447c860ce5fb4923a178c2f85f0 100644
--- a/std/flash/display/ActionScriptVersion.hx
+++ b/std/flash/display/ActionScriptVersion.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:fakeEnum(UInt) extern enum ActionScriptVersion {
-	ACTIONSCRIPT2;
-	ACTIONSCRIPT3;
+@:native("flash.display.ActionScriptVersion") extern enum abstract ActionScriptVersion(UInt) {
+	var ACTIONSCRIPT2;
+	var ACTIONSCRIPT3;
 }
diff --git a/std/flash/display/Bitmap.hx b/std/flash/display/Bitmap.hx
index ff8101a474b26c7298bd630da670701681eb6668..b32e9aad7ac7574589fd5c023929812528c60c94 100644
--- a/std/flash/display/Bitmap.hx
+++ b/std/flash/display/Bitmap.hx
@@ -1,8 +1,14 @@
 package flash.display;
 
 extern class Bitmap extends DisplayObject {
-	var bitmapData : BitmapData;
-	var pixelSnapping : PixelSnapping;
-	var smoothing : Bool;
+	@:flash.property var bitmapData(get,set) : BitmapData;
+	@:flash.property var pixelSnapping(get,set) : PixelSnapping;
+	@:flash.property var smoothing(get,set) : Bool;
 	function new(?bitmapData : BitmapData, ?pixelSnapping : PixelSnapping, smoothing : Bool = false) : Void;
+	private function get_bitmapData() : BitmapData;
+	private function get_pixelSnapping() : PixelSnapping;
+	private function get_smoothing() : Bool;
+	private function set_bitmapData(value : BitmapData) : BitmapData;
+	private function set_pixelSnapping(value : PixelSnapping) : PixelSnapping;
+	private function set_smoothing(value : Bool) : Bool;
 }
diff --git a/std/flash/display/BitmapCompressColorSpace.hx b/std/flash/display/BitmapCompressColorSpace.hx
index 6d0252c159b32abeb1d4706014b0615816203b32..956e78f2a066a175c6d152f7bd25d1c6336baf67 100644
--- a/std/flash/display/BitmapCompressColorSpace.hx
+++ b/std/flash/display/BitmapCompressColorSpace.hx
@@ -1,9 +1,8 @@
 package flash.display;
 
-@:fakeEnum(String)
-enum BitmapCompressColorSpace {
-	COLORSPACE_4_2_0;
-	COLORSPACE_4_2_2;
-	COLORSPACE_4_4_4;
-	COLORSPACE_AUTO;
+@:native("flash.display.BitmapCompressColorSpace") extern enum abstract BitmapCompressColorSpace(String) {
+	var COLORSPACE_4_2_0;
+	var COLORSPACE_4_2_2;
+	var COLORSPACE_4_4_4;
+	var COLORSPACE_AUTO;
 }
diff --git a/std/flash/display/BitmapData.hx b/std/flash/display/BitmapData.hx
index 2f100402640a6f94dc88ee88b620714b1ef93598..3b7788f029033bdd17835edee91e324b5f090a10 100644
--- a/std/flash/display/BitmapData.hx
+++ b/std/flash/display/BitmapData.hx
@@ -1,10 +1,10 @@
 package flash.display;
 
 extern class BitmapData implements IBitmapDrawable {
-	var height(default,never) : Int;
-	var rect(default,never) : flash.geom.Rectangle;
-	var transparent(default,never) : Bool;
-	var width(default,never) : Int;
+	@:flash.property var height(get,never) : Int;
+	@:flash.property var rect(get,never) : flash.geom.Rectangle;
+	@:flash.property var transparent(get,never) : Bool;
+	@:flash.property var width(get,never) : Int;
 	function new(width : Int, height : Int, transparent : Bool = true, fillColor : UInt = 0xFFFFFFFF) : Void;
 	function applyFilter(sourceBitmapData : BitmapData, sourceRect : flash.geom.Rectangle, destPoint : flash.geom.Point, filter : flash.filters.BitmapFilter) : Void;
 	function clone() : BitmapData;
@@ -25,6 +25,10 @@ extern class BitmapData implements IBitmapDrawable {
 	function getPixel32(x : Int, y : Int) : UInt;
 	function getPixels(rect : flash.geom.Rectangle) : flash.utils.ByteArray;
 	@:require(flash10) function getVector(rect : flash.geom.Rectangle) : flash.Vector<UInt>;
+	private function get_height() : Int;
+	private function get_rect() : flash.geom.Rectangle;
+	private function get_transparent() : Bool;
+	private function get_width() : Int;
 	@:require(flash10) function histogram(?hRect : flash.geom.Rectangle) : flash.Vector<flash.Vector<Float>>;
 	function hitTest(firstPoint : flash.geom.Point, firstAlphaThreshold : UInt, secondObject : flash.utils.Object, ?secondBitmapDataPoint : flash.geom.Point, secondAlphaThreshold : UInt = 1) : Bool;
 	function lock() : Void;
diff --git a/std/flash/display/BitmapEncodingColorSpace.hx b/std/flash/display/BitmapEncodingColorSpace.hx
index d6e532769019bc377f9d15cfa1bbeac53def9309..5090d839236f5cc8a78e11a0a139e60f147ce206 100644
--- a/std/flash/display/BitmapEncodingColorSpace.hx
+++ b/std/flash/display/BitmapEncodingColorSpace.hx
@@ -1,8 +1,8 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum BitmapEncodingColorSpace {
-	COLORSPACE_4_2_0;
-	COLORSPACE_4_2_2;
-	COLORSPACE_4_4_4;
-	COLORSPACE_AUTO;
+@:native("flash.display.BitmapEncodingColorSpace") extern enum abstract BitmapEncodingColorSpace(String) {
+	var COLORSPACE_4_2_0;
+	var COLORSPACE_4_2_2;
+	var COLORSPACE_4_4_4;
+	var COLORSPACE_AUTO;
 }
diff --git a/std/flash/display/BlendMode.hx b/std/flash/display/BlendMode.hx
index 61ef16414f2bb5222786670c67de312c4a5c4742..d1b0031fbce90548466ba5502f452aa091426494 100644
--- a/std/flash/display/BlendMode.hx
+++ b/std/flash/display/BlendMode.hx
@@ -1,19 +1,19 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum BlendMode {
-	ADD;
-	ALPHA;
-	DARKEN;
-	DIFFERENCE;
-	ERASE;
-	HARDLIGHT;
-	INVERT;
-	LAYER;
-	LIGHTEN;
-	MULTIPLY;
-	NORMAL;
-	OVERLAY;
-	SCREEN;
-	SHADER;
-	SUBTRACT;
+@:native("flash.display.BlendMode") extern enum abstract BlendMode(String) {
+	var ADD;
+	var ALPHA;
+	var DARKEN;
+	var DIFFERENCE;
+	var ERASE;
+	var HARDLIGHT;
+	var INVERT;
+	var LAYER;
+	var LIGHTEN;
+	var MULTIPLY;
+	var NORMAL;
+	var OVERLAY;
+	var SCREEN;
+	var SHADER;
+	var SUBTRACT;
 }
diff --git a/std/flash/display/CapsStyle.hx b/std/flash/display/CapsStyle.hx
index 1b67b499d781f5887c6cff91f72ffae4631fc780..e173e1791dcc9b3d161eddeb97e91b561cebc35a 100644
--- a/std/flash/display/CapsStyle.hx
+++ b/std/flash/display/CapsStyle.hx
@@ -1,7 +1,7 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum CapsStyle {
-	NONE;
-	ROUND;
-	SQUARE;
+@:native("flash.display.CapsStyle") extern enum abstract CapsStyle(String) {
+	var NONE;
+	var ROUND;
+	var SQUARE;
 }
diff --git a/std/flash/display/ColorCorrection.hx b/std/flash/display/ColorCorrection.hx
index 57b7f30fe16e97abaea00d076a7caec7a3e8cae0..6c48b6279d14ace7bba2f4be0af4d283a97160d1 100644
--- a/std/flash/display/ColorCorrection.hx
+++ b/std/flash/display/ColorCorrection.hx
@@ -1,7 +1,7 @@
 package flash.display;
 
-@:fakeEnum(String) @:require(flash10_1) extern enum ColorCorrection {
-	DEFAULT;
-	OFF;
-	ON;
+@:native("flash.display.ColorCorrection") @:require(flash10_1) extern enum abstract ColorCorrection(String) {
+	var DEFAULT;
+	var OFF;
+	var ON;
 }
diff --git a/std/flash/display/ColorCorrectionSupport.hx b/std/flash/display/ColorCorrectionSupport.hx
index 173712f1c10d8cbad5afc6d75cf69c8c0ee852de..f4aa3acbc84f02f93ec1efb117a88bbf0bd1c9c8 100644
--- a/std/flash/display/ColorCorrectionSupport.hx
+++ b/std/flash/display/ColorCorrectionSupport.hx
@@ -1,7 +1,7 @@
 package flash.display;
 
-@:fakeEnum(String) @:require(flash10_1) extern enum ColorCorrectionSupport {
-	DEFAULT_OFF;
-	DEFAULT_ON;
-	UNSUPPORTED;
+@:native("flash.display.ColorCorrectionSupport") @:require(flash10_1) extern enum abstract ColorCorrectionSupport(String) {
+	var DEFAULT_OFF;
+	var DEFAULT_ON;
+	var UNSUPPORTED;
 }
diff --git a/std/flash/display/DisplayObject.hx b/std/flash/display/DisplayObject.hx
index 639e08a65cba311185acd054c59816225b6630d2..b140f2a2dd2e267da60a48ae43c1215b09ce44b1 100644
--- a/std/flash/display/DisplayObject.hx
+++ b/std/flash/display/DisplayObject.hx
@@ -1,43 +1,100 @@
 package flash.display;
 
 extern class DisplayObject extends flash.events.EventDispatcher implements IBitmapDrawable {
-	var accessibilityProperties : flash.accessibility.AccessibilityProperties;
-	var alpha : Float;
-	var blendMode : BlendMode;
-	@:require(flash10) var blendShader(never,default) : Shader;
-	var cacheAsBitmap : Bool;
-	var filters : Array<flash.filters.BitmapFilter>;
-	var height : Float;
-	var loaderInfo(default,never) : LoaderInfo;
-	var mask : DisplayObject;
-	var mouseX(default,never) : Float;
-	var mouseY(default,never) : Float;
-	var name : String;
-	var opaqueBackground : Null<UInt>;
-	var parent(default,never) : DisplayObjectContainer;
-	var root(default,never) : DisplayObject;
-	var rotation : Float;
-	@:require(flash10) var rotationX : Float;
-	@:require(flash10) var rotationY : Float;
-	@:require(flash10) var rotationZ : Float;
-	var scale9Grid : flash.geom.Rectangle;
-	var scaleX : Float;
-	var scaleY : Float;
-	@:require(flash10) var scaleZ : Float;
-	var scrollRect : flash.geom.Rectangle;
-	var stage(default,never) : Stage;
-	var transform : flash.geom.Transform;
-	var visible : Bool;
-	var width : Float;
-	var x : Float;
-	var y : Float;
-	@:require(flash10) var z : Float;
+	@:flash.property var accessibilityProperties(get,set) : flash.accessibility.AccessibilityProperties;
+	@:flash.property var alpha(get,set) : Float;
+	@:flash.property var blendMode(get,set) : BlendMode;
+	@:flash.property @:require(flash10) var blendShader(never,set) : Shader;
+	@:flash.property var cacheAsBitmap(get,set) : Bool;
+	@:flash.property var filters(get,set) : Array<flash.filters.BitmapFilter>;
+	@:flash.property var height(get,set) : Float;
+	@:flash.property var loaderInfo(get,never) : LoaderInfo;
+	@:flash.property var mask(get,set) : DisplayObject;
+	@:flash.property var mouseX(get,never) : Float;
+	@:flash.property var mouseY(get,never) : Float;
+	@:flash.property var name(get,set) : String;
+	@:flash.property var opaqueBackground(get,set) : Null<UInt>;
+	@:flash.property var parent(get,never) : DisplayObjectContainer;
+	@:flash.property var root(get,never) : DisplayObject;
+	@:flash.property var rotation(get,set) : Float;
+	@:flash.property @:require(flash10) var rotationX(get,set) : Float;
+	@:flash.property @:require(flash10) var rotationY(get,set) : Float;
+	@:flash.property @:require(flash10) var rotationZ(get,set) : Float;
+	@:flash.property var scale9Grid(get,set) : flash.geom.Rectangle;
+	@:flash.property var scaleX(get,set) : Float;
+	@:flash.property var scaleY(get,set) : Float;
+	@:flash.property @:require(flash10) var scaleZ(get,set) : Float;
+	@:flash.property var scrollRect(get,set) : flash.geom.Rectangle;
+	@:flash.property var stage(get,never) : Stage;
+	@:flash.property var transform(get,set) : flash.geom.Transform;
+	@:flash.property var visible(get,set) : Bool;
+	@:flash.property var width(get,set) : Float;
+	@:flash.property var x(get,set) : Float;
+	@:flash.property var y(get,set) : Float;
+	@:flash.property @:require(flash10) var z(get,set) : Float;
 	function getBounds(targetCoordinateSpace : DisplayObject) : flash.geom.Rectangle;
 	function getRect(targetCoordinateSpace : DisplayObject) : flash.geom.Rectangle;
+	private function get_accessibilityProperties() : flash.accessibility.AccessibilityProperties;
+	private function get_alpha() : Float;
+	private function get_blendMode() : BlendMode;
+	private function get_cacheAsBitmap() : Bool;
+	private function get_filters() : Array<flash.filters.BitmapFilter>;
+	private function get_height() : Float;
+	private function get_loaderInfo() : LoaderInfo;
+	private function get_mask() : DisplayObject;
+	private function get_metaData() : Dynamic;
+	private function get_mouseX() : Float;
+	private function get_mouseY() : Float;
+	private function get_name() : String;
+	private function get_opaqueBackground() : Null<UInt>;
+	private function get_parent() : DisplayObjectContainer;
+	private function get_root() : DisplayObject;
+	private function get_rotation() : Float;
+	private function get_rotationX() : Float;
+	private function get_rotationY() : Float;
+	private function get_rotationZ() : Float;
+	private function get_scale9Grid() : flash.geom.Rectangle;
+	private function get_scaleX() : Float;
+	private function get_scaleY() : Float;
+	private function get_scaleZ() : Float;
+	private function get_scrollRect() : flash.geom.Rectangle;
+	private function get_stage() : Stage;
+	private function get_transform() : flash.geom.Transform;
+	private function get_visible() : Bool;
+	private function get_width() : Float;
+	private function get_x() : Float;
+	private function get_y() : Float;
+	private function get_z() : Float;
 	function globalToLocal(point : flash.geom.Point) : flash.geom.Point;
 	@:require(flash10) function globalToLocal3D(point : flash.geom.Point) : flash.geom.Vector3D;
 	function hitTestObject(obj : DisplayObject) : Bool;
 	function hitTestPoint(x : Float, y : Float, shapeFlag : Bool = false) : Bool;
 	@:require(flash10) function local3DToGlobal(point3d : flash.geom.Vector3D) : flash.geom.Point;
 	function localToGlobal(point : flash.geom.Point) : flash.geom.Point;
+	private function set_accessibilityProperties(value : flash.accessibility.AccessibilityProperties) : flash.accessibility.AccessibilityProperties;
+	private function set_alpha(value : Float) : Float;
+	private function set_blendMode(value : BlendMode) : BlendMode;
+	private function set_blendShader(value : Shader) : Shader;
+	private function set_cacheAsBitmap(value : Bool) : Bool;
+	private function set_filters(value : Array<flash.filters.BitmapFilter>) : Array<flash.filters.BitmapFilter>;
+	private function set_height(value : Float) : Float;
+	private function set_mask(value : DisplayObject) : DisplayObject;
+	private function set_metaData(value : Dynamic) : Dynamic;
+	private function set_name(value : String) : String;
+	private function set_opaqueBackground(value : Null<UInt>) : Null<UInt>;
+	private function set_rotation(value : Float) : Float;
+	private function set_rotationX(value : Float) : Float;
+	private function set_rotationY(value : Float) : Float;
+	private function set_rotationZ(value : Float) : Float;
+	private function set_scale9Grid(value : flash.geom.Rectangle) : flash.geom.Rectangle;
+	private function set_scaleX(value : Float) : Float;
+	private function set_scaleY(value : Float) : Float;
+	private function set_scaleZ(value : Float) : Float;
+	private function set_scrollRect(value : flash.geom.Rectangle) : flash.geom.Rectangle;
+	private function set_transform(value : flash.geom.Transform) : flash.geom.Transform;
+	private function set_visible(value : Bool) : Bool;
+	private function set_width(value : Float) : Float;
+	private function set_x(value : Float) : Float;
+	private function set_y(value : Float) : Float;
+	private function set_z(value : Float) : Float;
 }
diff --git a/std/flash/display/DisplayObjectContainer.hx b/std/flash/display/DisplayObjectContainer.hx
index deb49ed2832fd8f8304b3f39c1fdee18a660be4b..cd11f78eb71f6394c0390e1386f3eda1c5e68658 100644
--- a/std/flash/display/DisplayObjectContainer.hx
+++ b/std/flash/display/DisplayObjectContainer.hx
@@ -1,10 +1,10 @@
 package flash.display;
 
 extern class DisplayObjectContainer extends InteractiveObject {
-	var mouseChildren : Bool;
-	var numChildren(default,never) : Int;
-	var tabChildren : Bool;
-	var textSnapshot(default,never) : flash.text.TextSnapshot;
+	@:flash.property var mouseChildren(get,set) : Bool;
+	@:flash.property var numChildren(get,never) : Int;
+	@:flash.property var tabChildren(get,set) : Bool;
+	@:flash.property var textSnapshot(get,never) : flash.text.TextSnapshot;
 	function new() : Void;
 	function addChild(child : DisplayObject) : DisplayObject;
 	function addChildAt(child : DisplayObject, index : Int) : DisplayObject;
@@ -14,10 +14,16 @@ extern class DisplayObjectContainer extends InteractiveObject {
 	function getChildByName(name : String) : DisplayObject;
 	function getChildIndex(child : DisplayObject) : Int;
 	function getObjectsUnderPoint(point : flash.geom.Point) : Array<DisplayObject>;
+	private function get_mouseChildren() : Bool;
+	private function get_numChildren() : Int;
+	private function get_tabChildren() : Bool;
+	private function get_textSnapshot() : flash.text.TextSnapshot;
 	function removeChild(child : DisplayObject) : DisplayObject;
 	function removeChildAt(index : Int) : DisplayObject;
 	@:require(flash11) function removeChildren(beginIndex : Int = 0, endIndex : Int = 2147483647) : Void;
 	function setChildIndex(child : DisplayObject, index : Int) : Void;
+	private function set_mouseChildren(value : Bool) : Bool;
+	private function set_tabChildren(value : Bool) : Bool;
 	@:require(flash11_8) function stopAllMovieClips() : Void;
 	function swapChildren(child1 : DisplayObject, child2 : DisplayObject) : Void;
 	function swapChildrenAt(index1 : Int, index2 : Int) : Void;
diff --git a/std/flash/display/FocusDirection.hx b/std/flash/display/FocusDirection.hx
index ee490e3a2c7a9b538fb5717966b4b77c7ec52645..b36d567cd567b7b652cdc30d8bb27a23baee6972 100644
--- a/std/flash/display/FocusDirection.hx
+++ b/std/flash/display/FocusDirection.hx
@@ -1,7 +1,7 @@
 package flash.display;
 
-@:fakeEnum(String) @:require(flash10_1) extern enum FocusDirection {
-	BOTTOM;
-	NONE;
-	TOP;
+@:native("flash.display.FocusDirection") @:require(flash10_1) extern enum abstract FocusDirection(String) {
+	var BOTTOM;
+	var NONE;
+	var TOP;
 }
diff --git a/std/flash/display/FrameLabel.hx b/std/flash/display/FrameLabel.hx
index 605633657d30218fc4f0f007ad99d2c959a5e257..bf56c1903d51d3a928a6a26d0f4d338017eafb51 100644
--- a/std/flash/display/FrameLabel.hx
+++ b/std/flash/display/FrameLabel.hx
@@ -1,7 +1,9 @@
 package flash.display;
 
-@:final extern class FrameLabel extends flash.events.EventDispatcher {
-	var frame(default,never) : Int;
-	var name(default,never) : String;
+extern final class FrameLabel extends flash.events.EventDispatcher {
+	@:flash.property var frame(get,never) : Int;
+	@:flash.property var name(get,never) : String;
 	function new(name : String, frame : Int) : Void;
+	private function get_frame() : Int;
+	private function get_name() : String;
 }
diff --git a/std/flash/display/GradientType.hx b/std/flash/display/GradientType.hx
index 12bd83629035cc7a9a6104b32993a7b3f790aec9..d488c60643ef35e7b234350fce0098b3d92e2335 100644
--- a/std/flash/display/GradientType.hx
+++ b/std/flash/display/GradientType.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum GradientType {
-	LINEAR;
-	RADIAL;
+@:native("flash.display.GradientType") extern enum abstract GradientType(String) {
+	var LINEAR;
+	var RADIAL;
 }
diff --git a/std/flash/display/Graphics.hx b/std/flash/display/Graphics.hx
index eaa237b370a4d44b4b883c75dd12e8dedf61a494..23d3ac291061a77e0c08825193581be53134f7de 100644
--- a/std/flash/display/Graphics.hx
+++ b/std/flash/display/Graphics.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:final extern class Graphics {
+extern final class Graphics {
 	function new() : Void;
 	function beginBitmapFill(bitmap : BitmapData, ?matrix : flash.geom.Matrix, repeat : Bool = true, smooth : Bool = false) : Void;
 	function beginFill(color : UInt, alpha : Float = 1) : Void;
diff --git a/std/flash/display/GraphicsBitmapFill.hx b/std/flash/display/GraphicsBitmapFill.hx
index 11213bb27cd6eb6f869fbe08465b346345d70a10..b42a39f983b36bf550d8b94dbaa37c2b6d0acd41 100644
--- a/std/flash/display/GraphicsBitmapFill.hx
+++ b/std/flash/display/GraphicsBitmapFill.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:final extern class GraphicsBitmapFill implements IGraphicsData implements IGraphicsFill {
+extern final class GraphicsBitmapFill implements IGraphicsData implements IGraphicsFill {
 	var bitmapData : BitmapData;
 	var matrix : flash.geom.Matrix;
 	var repeat : Bool;
diff --git a/std/flash/display/GraphicsGradientFill.hx b/std/flash/display/GraphicsGradientFill.hx
index 9c19c9a11c15c9181dec88080d9da31bef3e7791..fa87f8c41adde5d7274925d9828175e6628a6ea3 100644
--- a/std/flash/display/GraphicsGradientFill.hx
+++ b/std/flash/display/GraphicsGradientFill.hx
@@ -1,13 +1,19 @@
 package flash.display;
 
-@:final extern class GraphicsGradientFill implements IGraphicsData implements IGraphicsFill {
+extern final class GraphicsGradientFill implements IGraphicsData implements IGraphicsFill {
 	var alphas : Array<Float>;
 	var colors : Array<UInt>;
 	var focalPointRatio : Float;
-	var interpolationMethod : InterpolationMethod;
+	@:flash.property var interpolationMethod(get,set) : InterpolationMethod;
 	var matrix : flash.geom.Matrix;
 	var ratios : Array<Float>;
-	var spreadMethod : SpreadMethod;
-	var type : GradientType;
+	@:flash.property var spreadMethod(get,set) : SpreadMethod;
+	@:flash.property var type(get,set) : GradientType;
 	function new(?type : GradientType, ?colors : Array<UInt>, ?alphas : Array<Float>, ?ratios : Array<Float>, ?matrix : flash.geom.Matrix, ?spreadMethod : SpreadMethod, ?interpolationMethod : InterpolationMethod, focalPointRatio : Float = 0) : Void;
+	private function get_interpolationMethod() : InterpolationMethod;
+	private function get_spreadMethod() : SpreadMethod;
+	private function get_type() : GradientType;
+	private function set_interpolationMethod(value : InterpolationMethod) : InterpolationMethod;
+	private function set_spreadMethod(value : SpreadMethod) : SpreadMethod;
+	private function set_type(value : GradientType) : GradientType;
 }
diff --git a/std/flash/display/GraphicsPath.hx b/std/flash/display/GraphicsPath.hx
index 7d016f25d2738db7def4fee0f9c5b756359b7336..568c2d2883015bbc017a681b881ff4052ffc2321 100644
--- a/std/flash/display/GraphicsPath.hx
+++ b/std/flash/display/GraphicsPath.hx
@@ -1,14 +1,16 @@
 package flash.display;
 
-@:final extern class GraphicsPath implements IGraphicsData implements IGraphicsPath {
+extern final class GraphicsPath implements IGraphicsData implements IGraphicsPath {
 	var commands : flash.Vector<Int>;
 	var data : flash.Vector<Float>;
-	var winding : GraphicsPathWinding;
+	@:flash.property var winding(get,set) : GraphicsPathWinding;
 	function new(?commands : flash.Vector<Int>, ?data : flash.Vector<Float>, ?winding : GraphicsPathWinding) : Void;
 	@:require(flash11) function cubicCurveTo(controlX1 : Float, controlY1 : Float, controlX2 : Float, controlY2 : Float, anchorX : Float, anchorY : Float) : Void;
 	function curveTo(controlX : Float, controlY : Float, anchorX : Float, anchorY : Float) : Void;
+	private function get_winding() : GraphicsPathWinding;
 	function lineTo(x : Float, y : Float) : Void;
 	function moveTo(x : Float, y : Float) : Void;
+	private function set_winding(value : GraphicsPathWinding) : GraphicsPathWinding;
 	function wideLineTo(x : Float, y : Float) : Void;
 	function wideMoveTo(x : Float, y : Float) : Void;
 }
diff --git a/std/flash/display/GraphicsPathWinding.hx b/std/flash/display/GraphicsPathWinding.hx
index 05295d58d77458dfe8408c3b43431f1967539bdb..ec3eb013aa40fe27388917532ca371efcd8e5c4a 100644
--- a/std/flash/display/GraphicsPathWinding.hx
+++ b/std/flash/display/GraphicsPathWinding.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum GraphicsPathWinding {
-	EVEN_ODD;
-	NON_ZERO;
+@:native("flash.display.GraphicsPathWinding") extern enum abstract GraphicsPathWinding(String) {
+	var EVEN_ODD;
+	var NON_ZERO;
 }
diff --git a/std/flash/display/GraphicsShaderFill.hx b/std/flash/display/GraphicsShaderFill.hx
index e715f8d80478bd2b325a18f19fdcacd9c7e3849c..7878a00fc33b15b268d73bac101018ef0e7e11c0 100644
--- a/std/flash/display/GraphicsShaderFill.hx
+++ b/std/flash/display/GraphicsShaderFill.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:final extern class GraphicsShaderFill implements IGraphicsData implements IGraphicsFill {
+extern final class GraphicsShaderFill implements IGraphicsData implements IGraphicsFill {
 	var matrix : flash.geom.Matrix;
 	var shader : Shader;
 	function new(?shader : Shader, ?matrix : flash.geom.Matrix) : Void;
diff --git a/std/flash/display/GraphicsSolidFill.hx b/std/flash/display/GraphicsSolidFill.hx
index e59208bd7e365f3919882256f35d34d99dda68fa..462f7c66d8a5cffe7b93ff3afae76a1a21f39649 100644
--- a/std/flash/display/GraphicsSolidFill.hx
+++ b/std/flash/display/GraphicsSolidFill.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:final extern class GraphicsSolidFill implements IGraphicsData implements IGraphicsFill {
+extern final class GraphicsSolidFill implements IGraphicsData implements IGraphicsFill {
 	var alpha : Float;
 	var color : UInt;
 	function new(color : UInt = 0, alpha : Float = 1) : Void;
diff --git a/std/flash/display/GraphicsStroke.hx b/std/flash/display/GraphicsStroke.hx
index fe0c7fde1f45e462ac5f6c2e0745fd2ba514e752..4ca9edab2951cc5c094305c37bfb4cb737d474a0 100644
--- a/std/flash/display/GraphicsStroke.hx
+++ b/std/flash/display/GraphicsStroke.hx
@@ -1,12 +1,18 @@
 package flash.display;
 
-@:final extern class GraphicsStroke implements IGraphicsData implements IGraphicsStroke {
-	var caps : CapsStyle;
+extern final class GraphicsStroke implements IGraphicsData implements IGraphicsStroke {
+	@:flash.property var caps(get,set) : CapsStyle;
 	var fill : IGraphicsFill;
-	var joints : JointStyle;
+	@:flash.property var joints(get,set) : JointStyle;
 	var miterLimit : Float;
 	var pixelHinting : Bool;
-	var scaleMode : LineScaleMode;
+	@:flash.property var scaleMode(get,set) : LineScaleMode;
 	var thickness : Float;
 	function new(thickness : Float = 0./*NaN*/, pixelHinting : Bool = false, ?scaleMode : LineScaleMode, ?caps : CapsStyle, ?joints : JointStyle, miterLimit : Float = 3, ?fill : IGraphicsFill) : Void;
+	private function get_caps() : CapsStyle;
+	private function get_joints() : JointStyle;
+	private function get_scaleMode() : LineScaleMode;
+	private function set_caps(value : CapsStyle) : CapsStyle;
+	private function set_joints(value : JointStyle) : JointStyle;
+	private function set_scaleMode(value : LineScaleMode) : LineScaleMode;
 }
diff --git a/std/flash/display/GraphicsTrianglePath.hx b/std/flash/display/GraphicsTrianglePath.hx
index 9bc48048903c69c64e7c1abd10661d48a852fc9a..39a56b06cd1c150953bd0f0c6a79f63da63f0b92 100644
--- a/std/flash/display/GraphicsTrianglePath.hx
+++ b/std/flash/display/GraphicsTrianglePath.hx
@@ -1,9 +1,11 @@
 package flash.display;
 
-@:final extern class GraphicsTrianglePath implements IGraphicsData implements IGraphicsPath {
-	var culling : TriangleCulling;
+extern final class GraphicsTrianglePath implements IGraphicsData implements IGraphicsPath {
+	@:flash.property var culling(get,set) : TriangleCulling;
 	var indices : flash.Vector<Int>;
 	var uvtData : flash.Vector<Float>;
 	var vertices : flash.Vector<Float>;
 	function new(?vertices : flash.Vector<Float>, ?indices : flash.Vector<Int>, ?uvtData : flash.Vector<Float>, ?culling : TriangleCulling) : Void;
+	private function get_culling() : TriangleCulling;
+	private function set_culling(value : TriangleCulling) : TriangleCulling;
 }
diff --git a/std/flash/display/InteractiveObject.hx b/std/flash/display/InteractiveObject.hx
index 6218ae86194fdd34fa22665951c0beae494ab89a..8ab1f7177bafae1fe81bd114a5ef715f1dbafb6f 100644
--- a/std/flash/display/InteractiveObject.hx
+++ b/std/flash/display/InteractiveObject.hx
@@ -1,15 +1,33 @@
 package flash.display;
 
 extern class InteractiveObject extends DisplayObject {
-	var accessibilityImplementation : flash.accessibility.AccessibilityImplementation;
-	var contextMenu : flash.ui.ContextMenu;
-	var doubleClickEnabled : Bool;
-	var focusRect : Dynamic;
-	var mouseEnabled : Bool;
-	@:require(flash11) var needsSoftKeyboard : Bool;
-	@:require(flash11) var softKeyboardInputAreaOfInterest : flash.geom.Rectangle;
-	var tabEnabled : Bool;
-	var tabIndex : Int;
+	@:flash.property var accessibilityImplementation(get,set) : flash.accessibility.AccessibilityImplementation;
+	@:flash.property var contextMenu(get,set) : flash.ui.ContextMenu;
+	@:flash.property var doubleClickEnabled(get,set) : Bool;
+	@:flash.property var focusRect(get,set) : Dynamic;
+	@:flash.property var mouseEnabled(get,set) : Bool;
+	@:flash.property @:require(flash11) var needsSoftKeyboard(get,set) : Bool;
+	@:flash.property @:require(flash11) var softKeyboardInputAreaOfInterest(get,set) : flash.geom.Rectangle;
+	@:flash.property var tabEnabled(get,set) : Bool;
+	@:flash.property var tabIndex(get,set) : Int;
 	function new() : Void;
+	private function get_accessibilityImplementation() : flash.accessibility.AccessibilityImplementation;
+	private function get_contextMenu() : flash.ui.ContextMenu;
+	private function get_doubleClickEnabled() : Bool;
+	private function get_focusRect() : Dynamic;
+	private function get_mouseEnabled() : Bool;
+	private function get_needsSoftKeyboard() : Bool;
+	private function get_softKeyboardInputAreaOfInterest() : flash.geom.Rectangle;
+	private function get_tabEnabled() : Bool;
+	private function get_tabIndex() : Int;
 	@:require(flash11) function requestSoftKeyboard() : Bool;
+	private function set_accessibilityImplementation(value : flash.accessibility.AccessibilityImplementation) : flash.accessibility.AccessibilityImplementation;
+	private function set_contextMenu(value : flash.ui.ContextMenu) : flash.ui.ContextMenu;
+	private function set_doubleClickEnabled(value : Bool) : Bool;
+	private function set_focusRect(value : Dynamic) : Dynamic;
+	private function set_mouseEnabled(value : Bool) : Bool;
+	private function set_needsSoftKeyboard(value : Bool) : Bool;
+	private function set_softKeyboardInputAreaOfInterest(value : flash.geom.Rectangle) : flash.geom.Rectangle;
+	private function set_tabEnabled(value : Bool) : Bool;
+	private function set_tabIndex(value : Int) : Int;
 }
diff --git a/std/flash/display/InterpolationMethod.hx b/std/flash/display/InterpolationMethod.hx
index a617d78f6eafdcd4e55e8eb8bd4b501e4ea69e8d..58f14c255b3b5464de9f73c54ff1ece28c751704 100644
--- a/std/flash/display/InterpolationMethod.hx
+++ b/std/flash/display/InterpolationMethod.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum InterpolationMethod {
-	LINEAR_RGB;
-	RGB;
+@:native("flash.display.InterpolationMethod") extern enum abstract InterpolationMethod(String) {
+	var LINEAR_RGB;
+	var RGB;
 }
diff --git a/std/flash/display/JPEGCompressOptions.hx b/std/flash/display/JPEGCompressOptions.hx
index 85f4c7e4ca741cc5b813125ba9ffd1cf3e261070..f4db4f28c79fc07c3505b1300da153a66bc5e995 100644
--- a/std/flash/display/JPEGCompressOptions.hx
+++ b/std/flash/display/JPEGCompressOptions.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:final extern class JPEGCompressOptions implements IBitmapCompressOptions {
+extern final class JPEGCompressOptions implements IBitmapCompressOptions {
 	var quality : UInt;
 	function new(quality : UInt = 80) : Void;
 }
diff --git a/std/flash/display/JPEGEncoderOptions.hx b/std/flash/display/JPEGEncoderOptions.hx
index 53b2d996879f75191d3cfe61d2154846bd4454aa..a861b7cd09352e26875a06367bcf3a52f0e3b357 100644
--- a/std/flash/display/JPEGEncoderOptions.hx
+++ b/std/flash/display/JPEGEncoderOptions.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:final extern class JPEGEncoderOptions {
+extern final class JPEGEncoderOptions {
 	var quality : UInt;
 	function new(quality : UInt = 80) : Void;
 }
diff --git a/std/flash/display/JPEGXRCompressOptions.hx b/std/flash/display/JPEGXRCompressOptions.hx
index b6a7883ca71df9ef30b6ae3c24df4a6ed1ae05f6..a605a96a0b4110a5e35a97b617e51fb72e655e77 100644
--- a/std/flash/display/JPEGXRCompressOptions.hx
+++ b/std/flash/display/JPEGXRCompressOptions.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:final extern class JPEGXRCompressOptions implements IBitmapCompressOptions {
+extern final class JPEGXRCompressOptions implements IBitmapCompressOptions {
 	var colorSpace : String;
 	var quantization : UInt;
 	var trimFlexBits : UInt;
diff --git a/std/flash/display/JPEGXREncoderOptions.hx b/std/flash/display/JPEGXREncoderOptions.hx
index a75840461c83d7b7eefdb569710026ef05982a98..3c0162858e323d32fda7885088961949e080736f 100644
--- a/std/flash/display/JPEGXREncoderOptions.hx
+++ b/std/flash/display/JPEGXREncoderOptions.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:final extern class JPEGXREncoderOptions {
+extern final class JPEGXREncoderOptions {
 	var colorSpace : BitmapEncodingColorSpace;
 	var quantization : UInt;
 	var trimFlexBits : UInt;
diff --git a/std/flash/display/JointStyle.hx b/std/flash/display/JointStyle.hx
index 7480b6ccdb32c2c95f3042b2d85cdc00bc4cb40b..981f7c9be37630d9cef6d4cbcf79bde7bc54d60c 100644
--- a/std/flash/display/JointStyle.hx
+++ b/std/flash/display/JointStyle.hx
@@ -1,7 +1,7 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum JointStyle {
-	BEVEL;
-	MITER;
-	ROUND;
+@:native("flash.display.JointStyle") extern enum abstract JointStyle(String) {
+	var BEVEL;
+	var MITER;
+	var ROUND;
 }
diff --git a/std/flash/display/LineScaleMode.hx b/std/flash/display/LineScaleMode.hx
index 93b655a7e254595fc59d00edab8dbf3e5bfec7f3..5c5f35a308f289605347cb5face0a7b10a583d31 100644
--- a/std/flash/display/LineScaleMode.hx
+++ b/std/flash/display/LineScaleMode.hx
@@ -1,8 +1,8 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum LineScaleMode {
-	HORIZONTAL;
-	NONE;
-	NORMAL;
-	VERTICAL;
+@:native("flash.display.LineScaleMode") extern enum abstract LineScaleMode(String) {
+	var HORIZONTAL;
+	var NONE;
+	var NORMAL;
+	var VERTICAL;
 }
diff --git a/std/flash/display/Loader.hx b/std/flash/display/Loader.hx
index 3264fd6ab23f92653a5bd4d95ede0731430602dc..0dc6ac3879bfe38b3b65e76012716f065ed320a5 100644
--- a/std/flash/display/Loader.hx
+++ b/std/flash/display/Loader.hx
@@ -1,11 +1,14 @@
 package flash.display;
 
 extern class Loader extends DisplayObjectContainer {
-	var content(default,never) : DisplayObject;
-	var contentLoaderInfo(default,never) : LoaderInfo;
-	@:require(flash10_1) var uncaughtErrorEvents(default,never) : flash.events.UncaughtErrorEvents;
+	@:flash.property var content(get,never) : DisplayObject;
+	@:flash.property var contentLoaderInfo(get,never) : LoaderInfo;
+	@:flash.property @:require(flash10_1) var uncaughtErrorEvents(get,never) : flash.events.UncaughtErrorEvents;
 	function new() : Void;
 	function close() : Void;
+	private function get_content() : DisplayObject;
+	private function get_contentLoaderInfo() : LoaderInfo;
+	private function get_uncaughtErrorEvents() : flash.events.UncaughtErrorEvents;
 	function load(request : flash.net.URLRequest, ?context : flash.system.LoaderContext) : Void;
 	function loadBytes(bytes : flash.utils.ByteArray, ?context : flash.system.LoaderContext) : Void;
 	function unload() : Void;
diff --git a/std/flash/display/LoaderInfo.hx b/std/flash/display/LoaderInfo.hx
index eeaacb898f49123aee825f03fdb343376373ea96..a741b431a644a3f755ecce1c87eb1b51174c9dba 100644
--- a/std/flash/display/LoaderInfo.hx
+++ b/std/flash/display/LoaderInfo.hx
@@ -1,28 +1,53 @@
 package flash.display;
 
 extern class LoaderInfo extends flash.events.EventDispatcher {
-	var actionScriptVersion(default,never) : ActionScriptVersion;
-	var applicationDomain(default,never) : flash.system.ApplicationDomain;
-	var bytes(default,never) : flash.utils.ByteArray;
-	var bytesLoaded(default,never) : UInt;
-	var bytesTotal(default,never) : UInt;
-	var childAllowsParent(default,never) : Bool;
-	@:require(flash11_4) var childSandboxBridge : Dynamic;
-	var content(default,never) : DisplayObject;
-	var contentType(default,never) : String;
-	var frameRate(default,never) : Float;
-	var height(default,never) : Int;
-	@:require(flash10_1) var isURLInaccessible(default,never) : Bool;
-	var loader(default,never) : Loader;
-	var loaderURL(default,never) : String;
-	var parameters(default,never) : Dynamic<String>;
-	var parentAllowsChild(default,never) : Bool;
-	@:require(flash11_4) var parentSandboxBridge : Dynamic;
-	var sameDomain(default,never) : Bool;
-	var sharedEvents(default,never) : flash.events.EventDispatcher;
-	var swfVersion(default,never) : UInt;
-	@:require(flash10_1) var uncaughtErrorEvents(default,never) : flash.events.UncaughtErrorEvents;
-	var url(default,never) : String;
-	var width(default,never) : Int;
+	@:flash.property var actionScriptVersion(get,never) : ActionScriptVersion;
+	@:flash.property var applicationDomain(get,never) : flash.system.ApplicationDomain;
+	@:flash.property var bytes(get,never) : flash.utils.ByteArray;
+	@:flash.property var bytesLoaded(get,never) : UInt;
+	@:flash.property var bytesTotal(get,never) : UInt;
+	@:flash.property var childAllowsParent(get,never) : Bool;
+	@:flash.property @:require(flash11_4) var childSandboxBridge(get,set) : Dynamic;
+	@:flash.property var content(get,never) : DisplayObject;
+	@:flash.property var contentType(get,never) : String;
+	@:flash.property var frameRate(get,never) : Float;
+	@:flash.property var height(get,never) : Int;
+	@:flash.property @:require(flash10_1) var isURLInaccessible(get,never) : Bool;
+	@:flash.property var loader(get,never) : Loader;
+	@:flash.property var loaderURL(get,never) : String;
+	@:flash.property var parameters(get,never) : Dynamic<String>;
+	@:flash.property var parentAllowsChild(get,never) : Bool;
+	@:flash.property @:require(flash11_4) var parentSandboxBridge(get,set) : Dynamic;
+	@:flash.property var sameDomain(get,never) : Bool;
+	@:flash.property var sharedEvents(get,never) : flash.events.EventDispatcher;
+	@:flash.property var swfVersion(get,never) : UInt;
+	@:flash.property @:require(flash10_1) var uncaughtErrorEvents(get,never) : flash.events.UncaughtErrorEvents;
+	@:flash.property var url(get,never) : String;
+	@:flash.property var width(get,never) : Int;
+	private function get_actionScriptVersion() : ActionScriptVersion;
+	private function get_applicationDomain() : flash.system.ApplicationDomain;
+	private function get_bytes() : flash.utils.ByteArray;
+	private function get_bytesLoaded() : UInt;
+	private function get_bytesTotal() : UInt;
+	private function get_childAllowsParent() : Bool;
+	private function get_childSandboxBridge() : Dynamic;
+	private function get_content() : DisplayObject;
+	private function get_contentType() : String;
+	private function get_frameRate() : Float;
+	private function get_height() : Int;
+	private function get_isURLInaccessible() : Bool;
+	private function get_loader() : Loader;
+	private function get_loaderURL() : String;
+	private function get_parameters() : Dynamic<String>;
+	private function get_parentAllowsChild() : Bool;
+	private function get_parentSandboxBridge() : Dynamic;
+	private function get_sameDomain() : Bool;
+	private function get_sharedEvents() : flash.events.EventDispatcher;
+	private function get_swfVersion() : UInt;
+	private function get_uncaughtErrorEvents() : flash.events.UncaughtErrorEvents;
+	private function get_url() : String;
+	private function get_width() : Int;
+	private function set_childSandboxBridge(value : Dynamic) : Dynamic;
+	private function set_parentSandboxBridge(value : Dynamic) : Dynamic;
 	static function getLoaderInfoByDefinition(object : Dynamic) : LoaderInfo;
 }
diff --git a/std/flash/display/MovieClip.hx b/std/flash/display/MovieClip.hx
index 10ba642a406868cfdb9cab3af1e0a84710cfc2b8..0f20402e32e6f91b9bd4909b3a4c52ee4b0246e6 100644
--- a/std/flash/display/MovieClip.hx
+++ b/std/flash/display/MovieClip.hx
@@ -1,19 +1,30 @@
 package flash.display;
 
 extern class MovieClip extends Sprite #if !flash_strict implements Dynamic #end {
-	var currentFrame(default,never) : Int;
-	@:require(flash10) var currentFrameLabel(default,never) : String;
-	var currentLabel(default,never) : String;
-	var currentLabels(default,never) : Array<FrameLabel>;
-	var currentScene(default,never) : Scene;
-	var enabled : Bool;
-	var framesLoaded(default,never) : Int;
-	@:require(flash11) var isPlaying(default,never) : Bool;
-	var scenes(default,never) : Array<Scene>;
-	var totalFrames(default,never) : Int;
-	var trackAsMenu : Bool;
+	@:flash.property var currentFrame(get,never) : Int;
+	@:flash.property @:require(flash10) var currentFrameLabel(get,never) : String;
+	@:flash.property var currentLabel(get,never) : String;
+	@:flash.property var currentLabels(get,never) : Array<FrameLabel>;
+	@:flash.property var currentScene(get,never) : Scene;
+	@:flash.property var enabled(get,set) : Bool;
+	@:flash.property var framesLoaded(get,never) : Int;
+	@:flash.property @:require(flash11) var isPlaying(get,never) : Bool;
+	@:flash.property var scenes(get,never) : Array<Scene>;
+	@:flash.property var totalFrames(get,never) : Int;
+	@:flash.property var trackAsMenu(get,set) : Bool;
 	function new() : Void;
-	function addFrameScript(?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
+	function addFrameScript(restArgs : haxe.extern.Rest<Dynamic>) : Void;
+	private function get_currentFrame() : Int;
+	private function get_currentFrameLabel() : String;
+	private function get_currentLabel() : String;
+	private function get_currentLabels() : Array<FrameLabel>;
+	private function get_currentScene() : Scene;
+	private function get_enabled() : Bool;
+	private function get_framesLoaded() : Int;
+	private function get_isPlaying() : Bool;
+	private function get_scenes() : Array<Scene>;
+	private function get_totalFrames() : Int;
+	private function get_trackAsMenu() : Bool;
 	function gotoAndPlay(frame : flash.utils.Object, ?scene : String) : Void;
 	function gotoAndStop(frame : flash.utils.Object, ?scene : String) : Void;
 	function nextFrame() : Void;
@@ -21,5 +32,7 @@ extern class MovieClip extends Sprite #if !flash_strict implements Dynamic #end
 	function play() : Void;
 	function prevFrame() : Void;
 	function prevScene() : Void;
+	private function set_enabled(value : Bool) : Bool;
+	private function set_trackAsMenu(value : Bool) : Bool;
 	function stop() : Void;
 }
diff --git a/std/flash/display/NativeMenuItem.hx b/std/flash/display/NativeMenuItem.hx
index 3f238805994f91415512cfdd289ba9e1724d2d96..d484f96364e86a6dad209e10595bbccf65d1d73e 100644
--- a/std/flash/display/NativeMenuItem.hx
+++ b/std/flash/display/NativeMenuItem.hx
@@ -1,6 +1,8 @@
 package flash.display;
 
 @:require(flash10_1) extern class NativeMenuItem extends flash.events.EventDispatcher {
-	var enabled : Bool;
+	@:flash.property var enabled(get,set) : Bool;
 	function new() : Void;
+	private function get_enabled() : Bool;
+	private function set_enabled(value : Bool) : Bool;
 }
diff --git a/std/flash/display/PNGEncoderOptions.hx b/std/flash/display/PNGEncoderOptions.hx
index 642a917acbd121f708c496eef5744187aca97beb..3d315ade64b48acdbe2c6e1b7e6a5823b3d37d38 100644
--- a/std/flash/display/PNGEncoderOptions.hx
+++ b/std/flash/display/PNGEncoderOptions.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:final extern class PNGEncoderOptions {
+extern final class PNGEncoderOptions {
 	var fastCompression : Bool;
 	function new(fastCompression : Bool = false) : Void;
 }
diff --git a/std/flash/display/PixelSnapping.hx b/std/flash/display/PixelSnapping.hx
index a830eb0143bb15f1de88f5ed9f4244907b5803e0..c83ea30755630de9eabd98bedab228a708cb6ec0 100644
--- a/std/flash/display/PixelSnapping.hx
+++ b/std/flash/display/PixelSnapping.hx
@@ -1,7 +1,7 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum PixelSnapping {
-	ALWAYS;
-	AUTO;
-	NEVER;
+@:native("flash.display.PixelSnapping") extern enum abstract PixelSnapping(String) {
+	var ALWAYS;
+	var AUTO;
+	var NEVER;
 }
diff --git a/std/flash/display/SWFVersion.hx b/std/flash/display/SWFVersion.hx
index 9912de01704b65f6b11336dff1c3130a8d49dce1..969368a41c086013ee02981855afcaa825baa178 100644
--- a/std/flash/display/SWFVersion.hx
+++ b/std/flash/display/SWFVersion.hx
@@ -1,16 +1,16 @@
 package flash.display;
 
 extern class SWFVersion {
-	static var FLASH1(default,never) : UInt;
-	static var FLASH10(default,never) : UInt;
-	static var FLASH11(default,never) : UInt;
-	static var FLASH12(default,never) : UInt;
-	static var FLASH2(default,never) : UInt;
-	static var FLASH3(default,never) : UInt;
-	static var FLASH4(default,never) : UInt;
-	static var FLASH5(default,never) : UInt;
-	static var FLASH6(default,never) : UInt;
-	static var FLASH7(default,never) : UInt;
-	static var FLASH8(default,never) : UInt;
-	static var FLASH9(default,never) : UInt;
+	static final FLASH1 : UInt;
+	static final FLASH10 : UInt;
+	static final FLASH11 : UInt;
+	static final FLASH12 : UInt;
+	static final FLASH2 : UInt;
+	static final FLASH3 : UInt;
+	static final FLASH4 : UInt;
+	static final FLASH5 : UInt;
+	static final FLASH6 : UInt;
+	static final FLASH7 : UInt;
+	static final FLASH8 : UInt;
+	static final FLASH9 : UInt;
 }
diff --git a/std/flash/display/Scene.hx b/std/flash/display/Scene.hx
index 4fa352135a480845e3de77fcb3c37a01034ae534..42d9b91238a7c4393a1b1d3ee23f1cd09a545f68 100644
--- a/std/flash/display/Scene.hx
+++ b/std/flash/display/Scene.hx
@@ -1,8 +1,11 @@
 package flash.display;
 
-@:final extern class Scene {
-	var labels(default,never) : Array<FrameLabel>;
-	var name(default,never) : String;
-	var numFrames(default,never) : Int;
+extern final class Scene {
+	@:flash.property var labels(get,never) : Array<FrameLabel>;
+	@:flash.property var name(get,never) : String;
+	@:flash.property var numFrames(get,never) : Int;
 	function new(name : String, labels : Array<FrameLabel>, numFrames : Int) : Void;
+	private function get_labels() : Array<FrameLabel>;
+	private function get_name() : String;
+	private function get_numFrames() : Int;
 }
diff --git a/std/flash/display/Shader.hx b/std/flash/display/Shader.hx
index 59a70c4daad4654eeacd1c42595750609e395f0b..e35cf92636ed863c8219c2b4fef7a0dec8caa80b 100644
--- a/std/flash/display/Shader.hx
+++ b/std/flash/display/Shader.hx
@@ -1,8 +1,13 @@
 package flash.display;
 
 @:require(flash10) extern class Shader {
-	var byteCode(never,default) : flash.utils.ByteArray;
-	var data : ShaderData;
-	var precisionHint : ShaderPrecision;
+	@:flash.property var byteCode(never,set) : flash.utils.ByteArray;
+	@:flash.property var data(get,set) : ShaderData;
+	@:flash.property var precisionHint(get,set) : ShaderPrecision;
 	function new(?code : flash.utils.ByteArray) : Void;
+	private function get_data() : ShaderData;
+	private function get_precisionHint() : ShaderPrecision;
+	private function set_byteCode(value : flash.utils.ByteArray) : flash.utils.ByteArray;
+	private function set_data(value : ShaderData) : ShaderData;
+	private function set_precisionHint(value : ShaderPrecision) : ShaderPrecision;
 }
diff --git a/std/flash/display/ShaderInput.hx b/std/flash/display/ShaderInput.hx
index 5ce1686dc2ab199efb8ed118bb9840ea91ff1f20..abff29a332693aa7f06bc80216a0e9dec9a13f6d 100644
--- a/std/flash/display/ShaderInput.hx
+++ b/std/flash/display/ShaderInput.hx
@@ -1,10 +1,18 @@
 package flash.display;
 
-@:final extern class ShaderInput implements Dynamic {
-	var channels(default,never) : Int;
-	var height : Int;
-	var index(default,never) : Int;
-	var input : Dynamic;
-	var width : Int;
+extern final class ShaderInput implements Dynamic {
+	@:flash.property var channels(get,never) : Int;
+	@:flash.property var height(get,set) : Int;
+	@:flash.property var index(get,never) : Int;
+	@:flash.property var input(get,set) : Dynamic;
+	@:flash.property var width(get,set) : Int;
 	function new() : Void;
+	private function get_channels() : Int;
+	private function get_height() : Int;
+	private function get_index() : Int;
+	private function get_input() : Dynamic;
+	private function get_width() : Int;
+	private function set_height(value : Int) : Int;
+	private function set_input(value : Dynamic) : Dynamic;
+	private function set_width(value : Int) : Int;
 }
diff --git a/std/flash/display/ShaderJob.hx b/std/flash/display/ShaderJob.hx
index f5108222806a9a0996a6091e6f8be27b61b60c14..cfe57702043182388adcf200923cac22ac6de81c 100644
--- a/std/flash/display/ShaderJob.hx
+++ b/std/flash/display/ShaderJob.hx
@@ -1,12 +1,21 @@
 package flash.display;
 
 extern class ShaderJob extends flash.events.EventDispatcher {
-	var height : Int;
-	var progress(default,never) : Float;
-	var shader : Shader;
-	var target : Dynamic;
-	var width : Int;
+	@:flash.property var height(get,set) : Int;
+	@:flash.property var progress(get,never) : Float;
+	@:flash.property var shader(get,set) : Shader;
+	@:flash.property var target(get,set) : Dynamic;
+	@:flash.property var width(get,set) : Int;
 	function new(?shader : Shader, ?target : Dynamic, width : Int = 0, height : Int = 0) : Void;
 	function cancel() : Void;
+	private function get_height() : Int;
+	private function get_progress() : Float;
+	private function get_shader() : Shader;
+	private function get_target() : Dynamic;
+	private function get_width() : Int;
+	private function set_height(value : Int) : Int;
+	private function set_shader(value : Shader) : Shader;
+	private function set_target(value : Dynamic) : Dynamic;
+	private function set_width(value : Int) : Int;
 	function start(waitForCompletion : Bool = false) : Void;
 }
diff --git a/std/flash/display/ShaderParameter.hx b/std/flash/display/ShaderParameter.hx
index 4b02ccb89817762a0e8e2c7231cae10324dbacda..b7dcae69ab1d1f083b901df627875c7cca43a75a 100644
--- a/std/flash/display/ShaderParameter.hx
+++ b/std/flash/display/ShaderParameter.hx
@@ -1,7 +1,11 @@
 package flash.display;
 
-@:final extern class ShaderParameter implements Dynamic {
-	var index(default,never) : Int;
-	var type(default,never) : ShaderParameterType;
-	var value : Array<Dynamic>;
+extern final class ShaderParameter implements Dynamic {
+	@:flash.property var index(get,never) : Int;
+	@:flash.property var type(get,never) : ShaderParameterType;
+	@:flash.property var value(get,set) : Array<Dynamic>;
+	private function get_index() : Int;
+	private function get_type() : ShaderParameterType;
+	private function get_value() : Array<Dynamic>;
+	private function set_value(value : Array<Dynamic>) : Array<Dynamic>;
 }
diff --git a/std/flash/display/ShaderParameterType.hx b/std/flash/display/ShaderParameterType.hx
index 6758d3f5f4e13b84eaf40dc54d6b28e1beb8f507..78d867b67364b6148f8ceca3cacd7b8df44d23d4 100644
--- a/std/flash/display/ShaderParameterType.hx
+++ b/std/flash/display/ShaderParameterType.hx
@@ -1,19 +1,19 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum ShaderParameterType {
-	BOOL;
-	BOOL2;
-	BOOL3;
-	BOOL4;
-	FLOAT;
-	FLOAT2;
-	FLOAT3;
-	FLOAT4;
-	INT;
-	INT2;
-	INT3;
-	INT4;
-	MATRIX2X2;
-	MATRIX3X3;
-	MATRIX4X4;
+@:native("flash.display.ShaderParameterType") extern enum abstract ShaderParameterType(String) {
+	var BOOL;
+	var BOOL2;
+	var BOOL3;
+	var BOOL4;
+	var FLOAT;
+	var FLOAT2;
+	var FLOAT3;
+	var FLOAT4;
+	var INT;
+	var INT2;
+	var INT3;
+	var INT4;
+	var MATRIX2X2;
+	var MATRIX3X3;
+	var MATRIX4X4;
 }
diff --git a/std/flash/display/ShaderPrecision.hx b/std/flash/display/ShaderPrecision.hx
index 8a276c96c2d0cf989e130580933fb908dafcd08e..941642b7f9e9ae3d3ea307a57d1845f66e8b722a 100644
--- a/std/flash/display/ShaderPrecision.hx
+++ b/std/flash/display/ShaderPrecision.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum ShaderPrecision {
-	FAST;
-	FULL;
+@:native("flash.display.ShaderPrecision") extern enum abstract ShaderPrecision(String) {
+	var FAST;
+	var FULL;
 }
diff --git a/std/flash/display/Shape.hx b/std/flash/display/Shape.hx
index fb13285c781b0aff12419005b077b643ab927769..605fa9aa3dc89eff5878ab9a8b923968e69d2d55 100644
--- a/std/flash/display/Shape.hx
+++ b/std/flash/display/Shape.hx
@@ -1,6 +1,7 @@
 package flash.display;
 
 extern class Shape extends DisplayObject {
-	var graphics(default,never) : Graphics;
+	@:flash.property var graphics(get,never) : Graphics;
 	function new() : Void;
+	private function get_graphics() : Graphics;
 }
diff --git a/std/flash/display/SimpleButton.hx b/std/flash/display/SimpleButton.hx
index bedb0e8bcb3b209cc672a93459db44e2efde75b1..fde09d2fd1bd2c76ba74174f960e6905c74e7c17 100644
--- a/std/flash/display/SimpleButton.hx
+++ b/std/flash/display/SimpleButton.hx
@@ -1,13 +1,29 @@
 package flash.display;
 
 extern class SimpleButton extends InteractiveObject {
-	var downState : DisplayObject;
-	var enabled : Bool;
-	var hitTestState : DisplayObject;
-	var overState : DisplayObject;
-	var soundTransform : flash.media.SoundTransform;
-	var trackAsMenu : Bool;
-	var upState : DisplayObject;
-	var useHandCursor : Bool;
+	@:flash.property var downState(get,set) : DisplayObject;
+	@:flash.property var enabled(get,set) : Bool;
+	@:flash.property var hitTestState(get,set) : DisplayObject;
+	@:flash.property var overState(get,set) : DisplayObject;
+	@:flash.property var soundTransform(get,set) : flash.media.SoundTransform;
+	@:flash.property var trackAsMenu(get,set) : Bool;
+	@:flash.property var upState(get,set) : DisplayObject;
+	@:flash.property var useHandCursor(get,set) : Bool;
 	function new(?upState : DisplayObject, ?overState : DisplayObject, ?downState : DisplayObject, ?hitTestState : DisplayObject) : Void;
+	private function get_downState() : DisplayObject;
+	private function get_enabled() : Bool;
+	private function get_hitTestState() : DisplayObject;
+	private function get_overState() : DisplayObject;
+	private function get_soundTransform() : flash.media.SoundTransform;
+	private function get_trackAsMenu() : Bool;
+	private function get_upState() : DisplayObject;
+	private function get_useHandCursor() : Bool;
+	private function set_downState(value : DisplayObject) : DisplayObject;
+	private function set_enabled(value : Bool) : Bool;
+	private function set_hitTestState(value : DisplayObject) : DisplayObject;
+	private function set_overState(value : DisplayObject) : DisplayObject;
+	private function set_soundTransform(value : flash.media.SoundTransform) : flash.media.SoundTransform;
+	private function set_trackAsMenu(value : Bool) : Bool;
+	private function set_upState(value : DisplayObject) : DisplayObject;
+	private function set_useHandCursor(value : Bool) : Bool;
 }
diff --git a/std/flash/display/SpreadMethod.hx b/std/flash/display/SpreadMethod.hx
index 7b65ba75bfeb57d36ace70c7f28646f025a61b19..d2f8a18f427ba2963393f89390eb952bde272a64 100644
--- a/std/flash/display/SpreadMethod.hx
+++ b/std/flash/display/SpreadMethod.hx
@@ -1,7 +1,7 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum SpreadMethod {
-	PAD;
-	REFLECT;
-	REPEAT;
+@:native("flash.display.SpreadMethod") extern enum abstract SpreadMethod(String) {
+	var PAD;
+	var REFLECT;
+	var REPEAT;
 }
diff --git a/std/flash/display/Sprite.hx b/std/flash/display/Sprite.hx
index aad8eeb98d15b0da6c2b1bb42f279e7c055e8a3c..b238ae842cf5ee343a3d50a4bf92dc4debe7797f 100644
--- a/std/flash/display/Sprite.hx
+++ b/std/flash/display/Sprite.hx
@@ -1,13 +1,23 @@
 package flash.display;
 
 extern class Sprite extends DisplayObjectContainer {
-	var buttonMode : Bool;
-	var dropTarget(default,never) : DisplayObject;
-	var graphics(default,never) : Graphics;
-	var hitArea : Sprite;
-	var soundTransform : flash.media.SoundTransform;
-	var useHandCursor : Bool;
+	@:flash.property var buttonMode(get,set) : Bool;
+	@:flash.property var dropTarget(get,never) : DisplayObject;
+	@:flash.property var graphics(get,never) : Graphics;
+	@:flash.property var hitArea(get,set) : Sprite;
+	@:flash.property var soundTransform(get,set) : flash.media.SoundTransform;
+	@:flash.property var useHandCursor(get,set) : Bool;
 	function new() : Void;
+	private function get_buttonMode() : Bool;
+	private function get_dropTarget() : DisplayObject;
+	private function get_graphics() : Graphics;
+	private function get_hitArea() : Sprite;
+	private function get_soundTransform() : flash.media.SoundTransform;
+	private function get_useHandCursor() : Bool;
+	private function set_buttonMode(value : Bool) : Bool;
+	private function set_hitArea(value : Sprite) : Sprite;
+	private function set_soundTransform(value : flash.media.SoundTransform) : flash.media.SoundTransform;
+	private function set_useHandCursor(value : Bool) : Bool;
 	function startDrag(lockCenter : Bool = false, ?bounds : flash.geom.Rectangle) : Void;
 	@:require(flash10_1) function startTouchDrag(touchPointID : Int, lockCenter : Bool = false, ?bounds : flash.geom.Rectangle) : Void;
 	function stopDrag() : Void;
diff --git a/std/flash/display/Stage.hx b/std/flash/display/Stage.hx
index 6bdc2aaa60caf2dc5d9c634b745cb2714c21ec8e..0edf295dc7adf468649c219fd6667a3e3f55f406 100644
--- a/std/flash/display/Stage.hx
+++ b/std/flash/display/Stage.hx
@@ -1,32 +1,74 @@
 package flash.display;
 
 extern class Stage extends DisplayObjectContainer {
-	var align : StageAlign;
-	var allowsFullScreen(default,never) : Bool;
-	@:require(flash11_3) var allowsFullScreenInteractive(default,never) : Bool;
-	var browserZoomFactor(default,never) : Float;
-	@:require(flash10_2) var color : UInt;
-	@:require(flash10) var colorCorrection : ColorCorrection;
-	@:require(flash10) var colorCorrectionSupport(default,never) : ColorCorrectionSupport;
-	@:require(flash11_4) var contentsScaleFactor(default,never) : Float;
-	@:require(flash11) var displayContextInfo(default,never) : String;
-	var displayState : StageDisplayState;
-	var focus : InteractiveObject;
-	var frameRate : Float;
-	var fullScreenHeight(default,never) : UInt;
-	var fullScreenSourceRect : flash.geom.Rectangle;
-	var fullScreenWidth(default,never) : UInt;
-	@:require(flash11_2) var mouseLock : Bool;
-	var quality : StageQuality;
-	var scaleMode : StageScaleMode;
-	var showDefaultContextMenu : Bool;
-	@:require(flash11) var softKeyboardRect(default,never) : flash.geom.Rectangle;
-	@:require(flash11) var stage3Ds(default,never) : flash.Vector<Stage3D>;
-	var stageFocusRect : Bool;
-	var stageHeight : Int;
-	@:require(flash10_2) var stageVideos(default,never) : flash.Vector<flash.media.StageVideo>;
-	var stageWidth : Int;
-	@:require(flash10_1) var wmodeGPU(default,never) : Bool;
+	@:flash.property var align(get,set) : StageAlign;
+	@:flash.property var allowsFullScreen(get,never) : Bool;
+	@:flash.property @:require(flash11_3) var allowsFullScreenInteractive(get,never) : Bool;
+	@:flash.property var browserZoomFactor(get,never) : Float;
+	@:flash.property @:require(flash10_2) var color(get,set) : UInt;
+	@:flash.property @:require(flash10) var colorCorrection(get,set) : ColorCorrection;
+	@:flash.property @:require(flash10) var colorCorrectionSupport(get,never) : ColorCorrectionSupport;
+	@:flash.property @:require(flash11_4) var contentsScaleFactor(get,never) : Float;
+	@:flash.property @:require(flash11) var displayContextInfo(get,never) : String;
+	@:flash.property var displayState(get,set) : StageDisplayState;
+	@:flash.property var focus(get,set) : InteractiveObject;
+	@:flash.property var frameRate(get,set) : Float;
+	@:flash.property var fullScreenHeight(get,never) : UInt;
+	@:flash.property var fullScreenSourceRect(get,set) : flash.geom.Rectangle;
+	@:flash.property var fullScreenWidth(get,never) : UInt;
+	@:flash.property @:require(flash11_2) var mouseLock(get,set) : Bool;
+	@:flash.property var quality(get,set) : StageQuality;
+	@:flash.property var scaleMode(get,set) : StageScaleMode;
+	@:flash.property var showDefaultContextMenu(get,set) : Bool;
+	@:flash.property @:require(flash11) var softKeyboardRect(get,never) : flash.geom.Rectangle;
+	@:flash.property @:require(flash11) var stage3Ds(get,never) : flash.Vector<Stage3D>;
+	@:flash.property var stageFocusRect(get,set) : Bool;
+	@:flash.property var stageHeight(get,set) : Int;
+	@:flash.property @:require(flash10_2) var stageVideos(get,never) : flash.Vector<flash.media.StageVideo>;
+	@:flash.property var stageWidth(get,set) : Int;
+	@:flash.property @:require(flash10_1) var wmodeGPU(get,never) : Bool;
+	private function get_align() : StageAlign;
+	private function get_allowsFullScreen() : Bool;
+	private function get_allowsFullScreenInteractive() : Bool;
+	private function get_browserZoomFactor() : Float;
+	private function get_color() : UInt;
+	private function get_colorCorrection() : ColorCorrection;
+	private function get_colorCorrectionSupport() : ColorCorrectionSupport;
+	private function get_constructor() : Dynamic;
+	private function get_contentsScaleFactor() : Float;
+	private function get_displayContextInfo() : String;
+	private function get_displayState() : StageDisplayState;
+	private function get_focus() : InteractiveObject;
+	private function get_frameRate() : Float;
+	private function get_fullScreenHeight() : UInt;
+	private function get_fullScreenSourceRect() : flash.geom.Rectangle;
+	private function get_fullScreenWidth() : UInt;
+	private function get_mouseLock() : Bool;
+	private function get_quality() : StageQuality;
+	private function get_scaleMode() : StageScaleMode;
+	private function get_showDefaultContextMenu() : Bool;
+	private function get_softKeyboardRect() : flash.geom.Rectangle;
+	private function get_stage3Ds() : flash.Vector<Stage3D>;
+	private function get_stageFocusRect() : Bool;
+	private function get_stageHeight() : Int;
+	private function get_stageVideos() : flash.Vector<flash.media.StageVideo>;
+	private function get_stageWidth() : Int;
+	private function get_wmodeGPU() : Bool;
 	function invalidate() : Void;
 	function isFocusInaccessible() : Bool;
+	private function set_align(value : StageAlign) : StageAlign;
+	private function set_color(value : UInt) : UInt;
+	private function set_colorCorrection(value : ColorCorrection) : ColorCorrection;
+	private function set_constructor(value : Dynamic) : Dynamic;
+	private function set_displayState(value : StageDisplayState) : StageDisplayState;
+	private function set_focus(value : InteractiveObject) : InteractiveObject;
+	private function set_frameRate(value : Float) : Float;
+	private function set_fullScreenSourceRect(value : flash.geom.Rectangle) : flash.geom.Rectangle;
+	private function set_mouseLock(value : Bool) : Bool;
+	private function set_quality(value : StageQuality) : StageQuality;
+	private function set_scaleMode(value : StageScaleMode) : StageScaleMode;
+	private function set_showDefaultContextMenu(value : Bool) : Bool;
+	private function set_stageFocusRect(value : Bool) : Bool;
+	private function set_stageHeight(value : Int) : Int;
+	private function set_stageWidth(value : Int) : Int;
 }
diff --git a/std/flash/display/Stage3D.hx b/std/flash/display/Stage3D.hx
index 09784dc11151a8f055b51c5c022d0e81518658cb..30abb2fb8032ea96d30a265f78202317336ded01 100644
--- a/std/flash/display/Stage3D.hx
+++ b/std/flash/display/Stage3D.hx
@@ -1,10 +1,17 @@
 package flash.display;
 
 @:require(flash11) extern class Stage3D extends flash.events.EventDispatcher {
-	var context3D(default,never) : flash.display3D.Context3D;
-	var visible : Bool;
-	var x : Float;
-	var y : Float;
+	@:flash.property var context3D(get,never) : flash.display3D.Context3D;
+	@:flash.property var visible(get,set) : Bool;
+	@:flash.property var x(get,set) : Float;
+	@:flash.property var y(get,set) : Float;
+	private function get_context3D() : flash.display3D.Context3D;
+	private function get_visible() : Bool;
+	private function get_x() : Float;
+	private function get_y() : Float;
 	function requestContext3D(?context3DRenderMode : String, ?profile : flash.display3D.Context3DProfile) : Void;
 	@:require(flash12) function requestContext3DMatchingProfiles(profiles : flash.Vector<String>) : Void;
+	private function set_visible(value : Bool) : Bool;
+	private function set_x(value : Float) : Float;
+	private function set_y(value : Float) : Float;
 }
diff --git a/std/flash/display/StageAlign.hx b/std/flash/display/StageAlign.hx
index a505c0e211d47d54b6e6d8a9d31cc0e8cd0ebc7d..b23699182f62e6752c0523ecd9d615efbbfb1fb9 100644
--- a/std/flash/display/StageAlign.hx
+++ b/std/flash/display/StageAlign.hx
@@ -1,12 +1,12 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum StageAlign {
-	BOTTOM;
-	BOTTOM_LEFT;
-	BOTTOM_RIGHT;
-	LEFT;
-	RIGHT;
-	TOP;
-	TOP_LEFT;
-	TOP_RIGHT;
+@:native("flash.display.StageAlign") extern enum abstract StageAlign(String) {
+	var BOTTOM;
+	var BOTTOM_LEFT;
+	var BOTTOM_RIGHT;
+	var LEFT;
+	var RIGHT;
+	var TOP;
+	var TOP_LEFT;
+	var TOP_RIGHT;
 }
diff --git a/std/flash/display/StageDisplayState.hx b/std/flash/display/StageDisplayState.hx
index 1c0fef9a019f0eccba9494ff11d26285083eebc9..12311c7dde5aa2da04a1684cd9594c66877960c6 100644
--- a/std/flash/display/StageDisplayState.hx
+++ b/std/flash/display/StageDisplayState.hx
@@ -1,7 +1,7 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum StageDisplayState {
-	FULL_SCREEN;
-	FULL_SCREEN_INTERACTIVE;
-	NORMAL;
+@:native("flash.display.StageDisplayState") extern enum abstract StageDisplayState(String) {
+	var FULL_SCREEN;
+	var FULL_SCREEN_INTERACTIVE;
+	var NORMAL;
 }
diff --git a/std/flash/display/StageQuality.hx b/std/flash/display/StageQuality.hx
index 901c866d179da5a9fefceef0aabdb98dc0bb54f9..5237a4ad8071d79884a36a66ec026c35543e4a4e 100644
--- a/std/flash/display/StageQuality.hx
+++ b/std/flash/display/StageQuality.hx
@@ -1,12 +1,12 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum StageQuality {
-	BEST;
-	HIGH;
-	HIGH_16X16;
-	HIGH_16X16_LINEAR;
-	HIGH_8X8;
-	HIGH_8X8_LINEAR;
-	LOW;
-	MEDIUM;
+@:native("flash.display.StageQuality") extern enum abstract StageQuality(String) {
+	var BEST;
+	var HIGH;
+	var HIGH_16X16;
+	var HIGH_16X16_LINEAR;
+	var HIGH_8X8;
+	var HIGH_8X8_LINEAR;
+	var LOW;
+	var MEDIUM;
 }
diff --git a/std/flash/display/StageScaleMode.hx b/std/flash/display/StageScaleMode.hx
index eee9aee9d0037b86b7fcff1ce2b343b7d5d8375e..027fcbe2b255432c1757a7c6fce7b99d160103b4 100644
--- a/std/flash/display/StageScaleMode.hx
+++ b/std/flash/display/StageScaleMode.hx
@@ -1,8 +1,8 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum StageScaleMode {
-	EXACT_FIT;
-	NO_BORDER;
-	NO_SCALE;
-	SHOW_ALL;
+@:native("flash.display.StageScaleMode") extern enum abstract StageScaleMode(String) {
+	var EXACT_FIT;
+	var NO_BORDER;
+	var NO_SCALE;
+	var SHOW_ALL;
 }
diff --git a/std/flash/display/StageWorker.hx b/std/flash/display/StageWorker.hx
index 6bfae8484245138fdeb3c47358eb2577e8ad76dc..164675f7a173d7f08bf9017c0c9f92f9e0c4d285 100644
--- a/std/flash/display/StageWorker.hx
+++ b/std/flash/display/StageWorker.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:require(flash11_2) @:final extern class StageWorker extends Sprite {
+@:require(flash11_2) extern final class StageWorker extends Sprite {
 	var scaleMode : String;
 	var viewport : flash.geom.Rectangle;
 	function new() : Void;
diff --git a/std/flash/display/TriangleCulling.hx b/std/flash/display/TriangleCulling.hx
index 395297cf359968af88b982b9973565c058bf7ec9..01a23940037da88f3b7cbfa40e38362db34f4fd2 100644
--- a/std/flash/display/TriangleCulling.hx
+++ b/std/flash/display/TriangleCulling.hx
@@ -1,7 +1,7 @@
 package flash.display;
 
-@:fakeEnum(String) extern enum TriangleCulling {
-	NEGATIVE;
-	NONE;
-	POSITIVE;
+@:native("flash.display.TriangleCulling") extern enum abstract TriangleCulling(String) {
+	var NEGATIVE;
+	var NONE;
+	var POSITIVE;
 }
diff --git a/std/flash/display/Worker.hx b/std/flash/display/Worker.hx
index 63a4ba2818f426cc2bf1e76c4b7a3deafab6ce87..71cdc282960d2e4defa58368d243fe791ffe7941 100644
--- a/std/flash/display/Worker.hx
+++ b/std/flash/display/Worker.hx
@@ -1,6 +1,6 @@
 package flash.display;
 
-@:require(flash11_2) @:final extern class Worker extends flash.events.EventDispatcher {
+@:require(flash11_2) extern final class Worker extends flash.events.EventDispatcher {
 	var running(default,null) : Bool;
 	var view(default,null) : StageWorker;
 	function new() : Void;
diff --git a/std/flash/display3D/Context3D.hx b/std/flash/display3D/Context3D.hx
index 7d355ad78ce00bd83a9214d41bb8f0b7e238d7b3..549f13ab8171ffc0fa8f621788dcc6eca70cfde0 100644
--- a/std/flash/display3D/Context3D.hx
+++ b/std/flash/display3D/Context3D.hx
@@ -1,14 +1,14 @@
 package flash.display3D;
 
-@:final extern class Context3D extends flash.events.EventDispatcher {
-	var backBufferHeight(default,never) : Int;
-	var backBufferWidth(default,never) : Int;
-	var driverInfo(default,never) : String;
-	var enableErrorChecking : Bool;
-	var maxBackBufferHeight : Int;
-	var maxBackBufferWidth : Int;
-	@:require(flash12) var profile(default,never) : String;
-	var totalGPUMemory(default,never) : Float;
+extern final class Context3D extends flash.events.EventDispatcher {
+	@:flash.property var backBufferHeight(get,never) : Int;
+	@:flash.property var backBufferWidth(get,never) : Int;
+	@:flash.property var driverInfo(get,never) : String;
+	@:flash.property var enableErrorChecking(get,set) : Bool;
+	@:flash.property var maxBackBufferHeight(get,set) : Int;
+	@:flash.property var maxBackBufferWidth(get,set) : Int;
+	@:flash.property @:require(flash12) var profile(get,never) : String;
+	@:flash.property var totalGPUMemory(get,never) : Float;
 	function clear(red : Float = 0, green : Float = 0, blue : Float = 0, alpha : Float = 1, depth : Float = 1, stencil : UInt = 0, mask : UInt = 0xFFFFFFFF) : Void;
 	function configureBackBuffer(width : Int, height : Int, antiAlias : Int, enableDepthAndStencil : Bool = true, wantsBestResolution : Bool = false, wantsBestResolutionOnBrowserZoom : Bool = false) : Void;
 	function createCubeTexture(size : Int, format : Context3DTextureFormat, optimizeForRenderToTexture : Bool, streamingLevels : Int = 0) : flash.display3D.textures.CubeTexture;
@@ -21,6 +21,14 @@ package flash.display3D;
 	function dispose(recreate : Bool = true) : Void;
 	function drawToBitmapData(destination : flash.display.BitmapData) : Void;
 	function drawTriangles(indexBuffer : IndexBuffer3D, firstIndex : Int = 0, numTriangles : Int = -1) : Void;
+	private function get_backBufferHeight() : Int;
+	private function get_backBufferWidth() : Int;
+	private function get_driverInfo() : String;
+	private function get_enableErrorChecking() : Bool;
+	private function get_maxBackBufferHeight() : Int;
+	private function get_maxBackBufferWidth() : Int;
+	private function get_profile() : String;
+	private function get_totalGPUMemory() : Float;
 	function present() : Void;
 	function setBlendFactors(sourceFactor : Context3DBlendFactor, destinationFactor : Context3DBlendFactor) : Void;
 	function setColorMask(red : Bool, green : Bool, blue : Bool, alpha : Bool) : Void;
@@ -38,5 +46,9 @@ package flash.display3D;
 	function setStencilReferenceValue(referenceValue : UInt, readMask : UInt = 255, writeMask : UInt = 255) : Void;
 	function setTextureAt(sampler : Int, texture : flash.display3D.textures.TextureBase) : Void;
 	function setVertexBufferAt(index : Int, buffer : VertexBuffer3D, bufferOffset : Int = 0, ?format : Context3DVertexBufferFormat) : Void;
-	static var supportsVideoTexture(default,never) : Bool;
+	private function set_enableErrorChecking(value : Bool) : Bool;
+	private function set_maxBackBufferHeight(value : Int) : Int;
+	private function set_maxBackBufferWidth(value : Int) : Int;
+	@:flash.property static var supportsVideoTexture(get,never) : Bool;
+	private static function get_supportsVideoTexture() : Bool;
 }
diff --git a/std/flash/display3D/Context3DBlendFactor.hx b/std/flash/display3D/Context3DBlendFactor.hx
index 23535f9c3ac6f45a9663eddf7e2345a41be1daf1..225a678d961dcfc93e86ab684a0ea77dd4f713f6 100644
--- a/std/flash/display3D/Context3DBlendFactor.hx
+++ b/std/flash/display3D/Context3DBlendFactor.hx
@@ -1,14 +1,14 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DBlendFactor {
-	DESTINATION_ALPHA;
-	DESTINATION_COLOR;
-	ONE;
-	ONE_MINUS_DESTINATION_ALPHA;
-	ONE_MINUS_DESTINATION_COLOR;
-	ONE_MINUS_SOURCE_ALPHA;
-	ONE_MINUS_SOURCE_COLOR;
-	SOURCE_ALPHA;
-	SOURCE_COLOR;
-	ZERO;
+@:native("flash.display3D.Context3DBlendFactor") extern enum abstract Context3DBlendFactor(String) {
+	var DESTINATION_ALPHA;
+	var DESTINATION_COLOR;
+	var ONE;
+	var ONE_MINUS_DESTINATION_ALPHA;
+	var ONE_MINUS_DESTINATION_COLOR;
+	var ONE_MINUS_SOURCE_ALPHA;
+	var ONE_MINUS_SOURCE_COLOR;
+	var SOURCE_ALPHA;
+	var SOURCE_COLOR;
+	var ZERO;
 }
diff --git a/std/flash/display3D/Context3DBufferUsage.hx b/std/flash/display3D/Context3DBufferUsage.hx
index 96a4dca1e17cdd35474bd718d2c54c9b6d04355c..f01b2ca39876beb36f262b17a48b4b1fb29a28d7 100644
--- a/std/flash/display3D/Context3DBufferUsage.hx
+++ b/std/flash/display3D/Context3DBufferUsage.hx
@@ -1,6 +1,6 @@
 package flash.display3D;
 
-@:fakeEnum(String) @:require(flash12) extern enum Context3DBufferUsage {
-	DYNAMIC_DRAW;
-	STATIC_DRAW;
+@:native("flash.display3D.Context3DBufferUsage") @:require(flash12) extern enum abstract Context3DBufferUsage(String) {
+	var DYNAMIC_DRAW;
+	var STATIC_DRAW;
 }
diff --git a/std/flash/display3D/Context3DClearMask.hx b/std/flash/display3D/Context3DClearMask.hx
index c66f3122a1cc9bea6c96e86a81a8cca228b0fbc5..c20e86ef435fd4ad3fbdd86a7440e50ea7c73c9b 100644
--- a/std/flash/display3D/Context3DClearMask.hx
+++ b/std/flash/display3D/Context3DClearMask.hx
@@ -1,8 +1,8 @@
 package flash.display3D;
 
 extern class Context3DClearMask {
-	static var ALL(default,never) : Int;
-	static var COLOR(default,never) : Int;
-	static var DEPTH(default,never) : Int;
-	static var STENCIL(default,never) : Int;
+	static final ALL : Int;
+	static final COLOR : Int;
+	static final DEPTH : Int;
+	static final STENCIL : Int;
 }
diff --git a/std/flash/display3D/Context3DCompareMode.hx b/std/flash/display3D/Context3DCompareMode.hx
index ff3b992f9c6595a41ab627ab14d8c0c93645a682..7bca910a06ac7038145ff124b572f0b79c6ee584 100644
--- a/std/flash/display3D/Context3DCompareMode.hx
+++ b/std/flash/display3D/Context3DCompareMode.hx
@@ -1,12 +1,12 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DCompareMode {
-	ALWAYS;
-	EQUAL;
-	GREATER;
-	GREATER_EQUAL;
-	LESS;
-	LESS_EQUAL;
-	NEVER;
-	NOT_EQUAL;
+@:native("flash.display3D.Context3DCompareMode") extern enum abstract Context3DCompareMode(String) {
+	var ALWAYS;
+	var EQUAL;
+	var GREATER;
+	var GREATER_EQUAL;
+	var LESS;
+	var LESS_EQUAL;
+	var NEVER;
+	var NOT_EQUAL;
 }
diff --git a/std/flash/display3D/Context3DFillMode.hx b/std/flash/display3D/Context3DFillMode.hx
index 2d17d05aef3653eab3b3d8b13c17daaed36bfc75..5c44208d6401d28df4fee4b34bf6bb5d933c8a16 100644
--- a/std/flash/display3D/Context3DFillMode.hx
+++ b/std/flash/display3D/Context3DFillMode.hx
@@ -1,6 +1,6 @@
 package flash.display3D;
 
-@:fakeEnum(String) @:require(flash16) extern enum Context3DFillMode {
-	SOLID;
-	WIREFRAME;
+@:native("flash.display3D.Context3DFillMode") @:require(flash16) extern enum abstract Context3DFillMode(String) {
+	var SOLID;
+	var WIREFRAME;
 }
diff --git a/std/flash/display3D/Context3DMipFilter.hx b/std/flash/display3D/Context3DMipFilter.hx
index 795a2442dfdfe665b5820b0dc3b3547be84513c0..6f10e9c743783a54b9033eb27de89091c082fbfe 100644
--- a/std/flash/display3D/Context3DMipFilter.hx
+++ b/std/flash/display3D/Context3DMipFilter.hx
@@ -1,7 +1,7 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DMipFilter {
-	MIPLINEAR;
-	MIPNEAREST;
-	MIPNONE;
+@:native("flash.display3D.Context3DMipFilter") extern enum abstract Context3DMipFilter(String) {
+	var MIPLINEAR;
+	var MIPNEAREST;
+	var MIPNONE;
 }
diff --git a/std/flash/display3D/Context3DProfile.hx b/std/flash/display3D/Context3DProfile.hx
index a90ea9c6eaea10e1b2f0f0989ef40dfdcd76eecb..6ff113f44f666ad1a832f3bc1fb404267a375824 100644
--- a/std/flash/display3D/Context3DProfile.hx
+++ b/std/flash/display3D/Context3DProfile.hx
@@ -1,10 +1,10 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DProfile {
-	BASELINE;
-	BASELINE_CONSTRAINED;
-	BASELINE_EXTENDED;
-	STANDARD;
-	STANDARD_CONSTRAINED;
-	STANDARD_EXTENDED;
+@:native("flash.display3D.Context3DProfile") extern enum abstract Context3DProfile(String) {
+	var BASELINE;
+	var BASELINE_CONSTRAINED;
+	var BASELINE_EXTENDED;
+	var STANDARD;
+	var STANDARD_CONSTRAINED;
+	var STANDARD_EXTENDED;
 }
diff --git a/std/flash/display3D/Context3DProgramType.hx b/std/flash/display3D/Context3DProgramType.hx
index 877f058377c07d5815ea08a694748ddc46e2cf73..e1447e3e9845fae05301a975161e54900e2869e9 100644
--- a/std/flash/display3D/Context3DProgramType.hx
+++ b/std/flash/display3D/Context3DProgramType.hx
@@ -1,6 +1,6 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DProgramType {
-	FRAGMENT;
-	VERTEX;
+@:native("flash.display3D.Context3DProgramType") extern enum abstract Context3DProgramType(String) {
+	var FRAGMENT;
+	var VERTEX;
 }
diff --git a/std/flash/display3D/Context3DRenderMode.hx b/std/flash/display3D/Context3DRenderMode.hx
index 8da47959a592c07bcb850ca8a5d53c07625e8562..286cc6729dc73c26d3faf40b1f107836ba533512 100644
--- a/std/flash/display3D/Context3DRenderMode.hx
+++ b/std/flash/display3D/Context3DRenderMode.hx
@@ -1,6 +1,6 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DRenderMode {
-	AUTO;
-	SOFTWARE;
+@:native("flash.display3D.Context3DRenderMode") extern enum abstract Context3DRenderMode(String) {
+	var AUTO;
+	var SOFTWARE;
 }
diff --git a/std/flash/display3D/Context3DStencilAction.hx b/std/flash/display3D/Context3DStencilAction.hx
index 23efe419b3880a6ab5ab38840bbd004c90d6ea81..6b29fc8ac925d8a01b47fbf0b2c6f0def93c8193 100644
--- a/std/flash/display3D/Context3DStencilAction.hx
+++ b/std/flash/display3D/Context3DStencilAction.hx
@@ -1,12 +1,12 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DStencilAction {
-	DECREMENT_SATURATE;
-	DECREMENT_WRAP;
-	INCREMENT_SATURATE;
-	INCREMENT_WRAP;
-	INVERT;
-	KEEP;
-	SET;
-	ZERO;
+@:native("flash.display3D.Context3DStencilAction") extern enum abstract Context3DStencilAction(String) {
+	var DECREMENT_SATURATE;
+	var DECREMENT_WRAP;
+	var INCREMENT_SATURATE;
+	var INCREMENT_WRAP;
+	var INVERT;
+	var KEEP;
+	var SET;
+	var ZERO;
 }
diff --git a/std/flash/display3D/Context3DTextureFilter.hx b/std/flash/display3D/Context3DTextureFilter.hx
index e47af2833d25802eb0063fb201fb81bce7d5f389..2e3e23180eab06ad2b84835d3145c1cf8110fc2c 100644
--- a/std/flash/display3D/Context3DTextureFilter.hx
+++ b/std/flash/display3D/Context3DTextureFilter.hx
@@ -1,10 +1,10 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DTextureFilter {
-	ANISOTROPIC16X;
-	ANISOTROPIC2X;
-	ANISOTROPIC4X;
-	ANISOTROPIC8X;
-	LINEAR;
-	NEAREST;
+@:native("flash.display3D.Context3DTextureFilter") extern enum abstract Context3DTextureFilter(String) {
+	var ANISOTROPIC16X;
+	var ANISOTROPIC2X;
+	var ANISOTROPIC4X;
+	var ANISOTROPIC8X;
+	var LINEAR;
+	var NEAREST;
 }
diff --git a/std/flash/display3D/Context3DTextureFormat.hx b/std/flash/display3D/Context3DTextureFormat.hx
index 0833a8560b5ba81299c7c3a755dc33cec9689159..32f574768219f7497ed8217ab6820b7ca48862dd 100644
--- a/std/flash/display3D/Context3DTextureFormat.hx
+++ b/std/flash/display3D/Context3DTextureFormat.hx
@@ -1,10 +1,10 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DTextureFormat {
-	BGRA;
-	BGRA_PACKED;
-	BGR_PACKED;
-	COMPRESSED;
-	COMPRESSED_ALPHA;
-	RGBA_HALF_FLOAT;
+@:native("flash.display3D.Context3DTextureFormat") extern enum abstract Context3DTextureFormat(String) {
+	var BGRA;
+	var BGRA_PACKED;
+	var BGR_PACKED;
+	var COMPRESSED;
+	var COMPRESSED_ALPHA;
+	var RGBA_HALF_FLOAT;
 }
diff --git a/std/flash/display3D/Context3DTriangleFace.hx b/std/flash/display3D/Context3DTriangleFace.hx
index 7d8e8e8456b4864f0adfd6efdd44a90e405dcc90..5bf25be46b170f0e2a0f18e2907f5f96d752d168 100644
--- a/std/flash/display3D/Context3DTriangleFace.hx
+++ b/std/flash/display3D/Context3DTriangleFace.hx
@@ -1,8 +1,8 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DTriangleFace {
-	BACK;
-	FRONT;
-	FRONT_AND_BACK;
-	NONE;
+@:native("flash.display3D.Context3DTriangleFace") extern enum abstract Context3DTriangleFace(String) {
+	var BACK;
+	var FRONT;
+	var FRONT_AND_BACK;
+	var NONE;
 }
diff --git a/std/flash/display3D/Context3DVertexBufferFormat.hx b/std/flash/display3D/Context3DVertexBufferFormat.hx
index 0cba74ee12afe588493c20fd688cfe6fbe34c8f2..743b927ec171b0656559cca896d36377baa841d3 100644
--- a/std/flash/display3D/Context3DVertexBufferFormat.hx
+++ b/std/flash/display3D/Context3DVertexBufferFormat.hx
@@ -1,9 +1,9 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DVertexBufferFormat {
-	BYTES_4;
-	FLOAT_1;
-	FLOAT_2;
-	FLOAT_3;
-	FLOAT_4;
+@:native("flash.display3D.Context3DVertexBufferFormat") extern enum abstract Context3DVertexBufferFormat(String) {
+	var BYTES_4;
+	var FLOAT_1;
+	var FLOAT_2;
+	var FLOAT_3;
+	var FLOAT_4;
 }
diff --git a/std/flash/display3D/Context3DWrapMode.hx b/std/flash/display3D/Context3DWrapMode.hx
index 38999f3fb46cad73488e142ee0a956df6a877f08..0af6e59c8854c5761e05265af98d94d3377c8a6e 100644
--- a/std/flash/display3D/Context3DWrapMode.hx
+++ b/std/flash/display3D/Context3DWrapMode.hx
@@ -1,8 +1,8 @@
 package flash.display3D;
 
-@:fakeEnum(String) extern enum Context3DWrapMode {
-	CLAMP;
-	CLAMP_U_REPEAT_V;
-	REPEAT;
-	REPEAT_U_CLAMP_V;
+@:native("flash.display3D.Context3DWrapMode") extern enum abstract Context3DWrapMode(String) {
+	var CLAMP;
+	var CLAMP_U_REPEAT_V;
+	var REPEAT;
+	var REPEAT_U_CLAMP_V;
 }
diff --git a/std/flash/display3D/IndexBuffer3D.hx b/std/flash/display3D/IndexBuffer3D.hx
index 851025798fcc5ccbbe2e522d1b0d3f245d199289..fc41aed22598878328bcfcfe8b55a207469a611f 100644
--- a/std/flash/display3D/IndexBuffer3D.hx
+++ b/std/flash/display3D/IndexBuffer3D.hx
@@ -1,6 +1,6 @@
 package flash.display3D;
 
-@:final extern class IndexBuffer3D {
+extern final class IndexBuffer3D {
 	function dispose() : Void;
 	function uploadFromByteArray(data : flash.utils.ByteArray, byteArrayOffset : Int, startOffset : Int, count : Int) : Void;
 	function uploadFromVector(data : flash.Vector<UInt>, startOffset : Int, count : Int) : Void;
diff --git a/std/flash/display3D/Program3D.hx b/std/flash/display3D/Program3D.hx
index 5cc9d6b166c51b837468c74ae08a8b6694dadb62..8ac34a4ba7baee2d9a31e9fc82f1de2ae5ee69e7 100644
--- a/std/flash/display3D/Program3D.hx
+++ b/std/flash/display3D/Program3D.hx
@@ -1,6 +1,6 @@
 package flash.display3D;
 
-@:final extern class Program3D {
+extern final class Program3D {
 	function dispose() : Void;
 	function upload(vertexProgram : flash.utils.ByteArray, fragmentProgram : flash.utils.ByteArray) : Void;
 }
diff --git a/std/flash/display3D/textures/CubeTexture.hx b/std/flash/display3D/textures/CubeTexture.hx
index 5d334a73b1f85a6f36ae74233dc3707a4bd59d17..1d93b40dde234ad58c8b6951dfdce6fbe4fe1aad 100644
--- a/std/flash/display3D/textures/CubeTexture.hx
+++ b/std/flash/display3D/textures/CubeTexture.hx
@@ -1,6 +1,6 @@
 package flash.display3D.textures;
 
-@:final extern class CubeTexture extends TextureBase {
+extern final class CubeTexture extends TextureBase {
 	function uploadCompressedTextureFromByteArray(data : flash.utils.ByteArray, byteArrayOffset : UInt, async : Bool = false) : Void;
 	function uploadFromBitmapData(source : flash.display.BitmapData, side : UInt, miplevel : UInt = 0) : Void;
 	function uploadFromByteArray(data : flash.utils.ByteArray, byteArrayOffset : UInt, side : UInt, miplevel : UInt = 0) : Void;
diff --git a/std/flash/display3D/textures/RectangleTexture.hx b/std/flash/display3D/textures/RectangleTexture.hx
index 1f4316c47a46cf04b89eb14414f3dab9c0b661af..01a34acd141f26bb487d9d622444b3ba00e92c1f 100644
--- a/std/flash/display3D/textures/RectangleTexture.hx
+++ b/std/flash/display3D/textures/RectangleTexture.hx
@@ -1,6 +1,6 @@
 package flash.display3D.textures;
 
-@:final extern class RectangleTexture extends TextureBase {
+extern final class RectangleTexture extends TextureBase {
 	function new() : Void;
 	function uploadFromBitmapData(source : flash.display.BitmapData) : Void;
 	function uploadFromByteArray(data : flash.utils.ByteArray, byteArrayOffset : UInt) : Void;
diff --git a/std/flash/display3D/textures/Texture.hx b/std/flash/display3D/textures/Texture.hx
index 9f3fea38103f1bcb6326a33191d8cd73ebaf0d06..b47e2e81b38cea9eb6b1dfcac2f8e6fe651fbc8c 100644
--- a/std/flash/display3D/textures/Texture.hx
+++ b/std/flash/display3D/textures/Texture.hx
@@ -1,6 +1,6 @@
 package flash.display3D.textures;
 
-@:final extern class Texture extends TextureBase {
+extern final class Texture extends TextureBase {
 	function uploadCompressedTextureFromByteArray(data : flash.utils.ByteArray, byteArrayOffset : UInt, async : Bool = false) : Void;
 	function uploadFromBitmapData(source : flash.display.BitmapData, miplevel : UInt = 0) : Void;
 	function uploadFromByteArray(data : flash.utils.ByteArray, byteArrayOffset : UInt, miplevel : UInt = 0) : Void;
diff --git a/std/flash/display3D/textures/VideoTexture.hx b/std/flash/display3D/textures/VideoTexture.hx
index ae3175e90696739e10c8eb0bf717f435c24907a9..3955c75d83ce456ec17dea2696a92fdfad6b3752 100644
--- a/std/flash/display3D/textures/VideoTexture.hx
+++ b/std/flash/display3D/textures/VideoTexture.hx
@@ -1,9 +1,11 @@
 package flash.display3D.textures;
 
-@:final extern class VideoTexture extends TextureBase {
-	var videoHeight(default,never) : Int;
-	var videoWidth(default,never) : Int;
+extern final class VideoTexture extends TextureBase {
+	@:flash.property var videoHeight(get,never) : Int;
+	@:flash.property var videoWidth(get,never) : Int;
 	function new() : Void;
 	function attachCamera(theCamera : flash.media.Camera) : Void;
 	function attachNetStream(netStream : flash.net.NetStream) : Void;
+	private function get_videoHeight() : Int;
+	private function get_videoWidth() : Int;
 }
diff --git a/std/flash/errors/DRMManagerError.hx b/std/flash/errors/DRMManagerError.hx
index 573d73c1a460f913d4f36ee98515031dccfcb24b..357bb4f75cd50047296c252cf40e968c8870af63 100644
--- a/std/flash/errors/DRMManagerError.hx
+++ b/std/flash/errors/DRMManagerError.hx
@@ -1,7 +1,8 @@
 package flash.errors;
 
 @:require(flash10_1) extern class DRMManagerError extends Error {
-	var subErrorID(default,never) : Int;
+	@:flash.property var subErrorID(get,never) : Int;
 	function new(message : String, id : Int, subErrorID : Int) : Void;
+	private function get_subErrorID() : Int;
 	function toString() : String;
 }
diff --git a/std/flash/errors/Error.hx b/std/flash/errors/Error.hx
index b5bd7281040591a941b1386aba77c255d3b769dc..4711f68e82c24c3a873752a56348c63088a6f985 100644
--- a/std/flash/errors/Error.hx
+++ b/std/flash/errors/Error.hx
@@ -1,12 +1,13 @@
 package flash.errors;
 
 extern class Error #if !flash_strict implements Dynamic #end {
-	var errorID(default,never) : Int;
+	@:flash.property var errorID(get,never) : Int;
 	var message : Dynamic;
 	var name : Dynamic;
 	function new(?message : Dynamic, id : Dynamic = 0) : Void;
 	function getStackTrace() : String;
-	static var length(default,never) : Int;
+	private function get_errorID() : Int;
+	static final length : Int;
 	static function getErrorMessage(index : Int) : String;
-	static function throwError(type : Class<Dynamic>, index : UInt, ?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Dynamic;
+	static function throwError(type : Class<Dynamic>, index : UInt, restArgs : haxe.extern.Rest<Dynamic>) : Dynamic;
 }
diff --git a/std/flash/events/AVDictionaryDataEvent.hx b/std/flash/events/AVDictionaryDataEvent.hx
index 98e41dbef99c07b51bf0af4de5cdc916c6032d77..c5d2c5914f1ca124de56b083562748eabea792c6 100644
--- a/std/flash/events/AVDictionaryDataEvent.hx
+++ b/std/flash/events/AVDictionaryDataEvent.hx
@@ -1,8 +1,10 @@
 package flash.events;
 
 extern class AVDictionaryDataEvent extends Event {
-	var dictionary(default,never) : flash.utils.Dictionary;
-	var time(default,never) : Float;
+	@:flash.property var dictionary(get,never) : flash.utils.Dictionary;
+	@:flash.property var time(get,never) : Float;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, ?init_dictionary : flash.utils.Dictionary, init_dataTime : Float = 0) : Void;
-	static var AV_DICTIONARY_DATA(default,never) : String;
+	private function get_dictionary() : flash.utils.Dictionary;
+	private function get_time() : Float;
+	static final AV_DICTIONARY_DATA : String;
 }
diff --git a/std/flash/events/AVHTTPStatusEvent.hx b/std/flash/events/AVHTTPStatusEvent.hx
index a0f02831467de8ef8f96eafb24cc22cdf8e7b691..cea61c44708b4f814353ec526f400daf409565ed 100644
--- a/std/flash/events/AVHTTPStatusEvent.hx
+++ b/std/flash/events/AVHTTPStatusEvent.hx
@@ -1,9 +1,14 @@
 package flash.events;
 
 extern class AVHTTPStatusEvent extends Event {
-	var responseHeaders : Array<Dynamic>;
-	var responseURL : String;
-	var status(default,never) : Int;
+	@:flash.property var responseHeaders(get,set) : Array<Dynamic>;
+	@:flash.property var responseURL(get,set) : String;
+	@:flash.property var status(get,never) : Int;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, status : Int = 0, ?responseUrl : String, ?responseHeaders : Array<Dynamic>) : Void;
-	static var AV_HTTP_RESPONSE_STATUS(default,never) : String;
+	private function get_responseHeaders() : Array<Dynamic>;
+	private function get_responseURL() : String;
+	private function get_status() : Int;
+	private function set_responseHeaders(value : Array<Dynamic>) : Array<Dynamic>;
+	private function set_responseURL(value : String) : String;
+	static final AV_HTTP_RESPONSE_STATUS : String;
 }
diff --git a/std/flash/events/AVLoadInfoEvent.hx b/std/flash/events/AVLoadInfoEvent.hx
index 2415b32f5a5036c4c0fc961fafee502af361f84c..cd23ef462677e0781e2d9d51436d40f99dd8d75b 100644
--- a/std/flash/events/AVLoadInfoEvent.hx
+++ b/std/flash/events/AVLoadInfoEvent.hx
@@ -1,7 +1,8 @@
 package flash.events;
 
 extern class AVLoadInfoEvent extends Event {
-	var loadInfo(default,never) : flash.utils.Dictionary;
+	@:flash.property var loadInfo(get,never) : flash.utils.Dictionary;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, ?inLoadInfo : flash.utils.Dictionary) : Void;
-	static var AV_LOAD_INFO(default,never) : Dynamic;
+	private function get_loadInfo() : flash.utils.Dictionary;
+	static final AV_LOAD_INFO : Dynamic;
 }
diff --git a/std/flash/events/AVManifestLoadEvent.hx b/std/flash/events/AVManifestLoadEvent.hx
index 5a168b6e138f67ab1eaa14a4a597a8f2f9d30016..be53c47b9598ba34097d6c61eb24d877f61b1adc 100644
--- a/std/flash/events/AVManifestLoadEvent.hx
+++ b/std/flash/events/AVManifestLoadEvent.hx
@@ -1,10 +1,14 @@
 package flash.events;
 
 extern class AVManifestLoadEvent extends Event {
-	var duration(default,never) : Float;
-	var handle(default,never) : Int;
-	var result(default,never) : flash.media.AVResult;
-	var userData(default,never) : Int;
+	@:flash.property var duration(get,never) : Float;
+	@:flash.property var handle(get,never) : Int;
+	@:flash.property var result(get,never) : flash.media.AVResult;
+	@:flash.property var userData(get,never) : Int;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, inResult : Int = 0, inUserData : Int = 0, inHandle : Int = 0, inDuration : Float = 0) : Void;
-	static var AV_MANIFEST_LOAD(default,never) : String;
+	private function get_duration() : Float;
+	private function get_handle() : Int;
+	private function get_result() : flash.media.AVResult;
+	private function get_userData() : Int;
+	static final AV_MANIFEST_LOAD : String;
 }
diff --git a/std/flash/events/AVPauseAtPeriodEndEvent.hx b/std/flash/events/AVPauseAtPeriodEndEvent.hx
index 2a577c888cef0f4f388881d2b3ee6c47ca53fce7..cbf9fa5af9686631d733b51f075d6c0f4649ef29 100644
--- a/std/flash/events/AVPauseAtPeriodEndEvent.hx
+++ b/std/flash/events/AVPauseAtPeriodEndEvent.hx
@@ -1,7 +1,8 @@
 package flash.events;
 
 extern class AVPauseAtPeriodEndEvent extends Event {
-	var userData(default,never) : Int;
+	@:flash.property var userData(get,never) : Int;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, userData : Int = 0) : Void;
-	static var AV_PAUSE_AT_PERIOD_END(default,never) : String;
+	private function get_userData() : Int;
+	static final AV_PAUSE_AT_PERIOD_END : String;
 }
diff --git a/std/flash/events/AVPlayStateEvent.hx b/std/flash/events/AVPlayStateEvent.hx
index f5c6d2174bd4f19d44ab40b25fb51e850f5d8ce6..6613ac6ded4d2300b2ffce91b706a5ae25ac2ad4 100644
--- a/std/flash/events/AVPlayStateEvent.hx
+++ b/std/flash/events/AVPlayStateEvent.hx
@@ -1,7 +1,8 @@
 package flash.events;
 
 extern class AVPlayStateEvent extends Event {
-	var playState(default,never) : flash.media.AVPlayState;
+	@:flash.property var playState(get,never) : flash.media.AVPlayState;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, inState : Int = 0) : Void;
-	static var AV_PLAY_STATE(default,never) : String;
+	private function get_playState() : flash.media.AVPlayState;
+	static final AV_PLAY_STATE : String;
 }
diff --git a/std/flash/events/AVStatusEvent.hx b/std/flash/events/AVStatusEvent.hx
index 99a2a806fb15f1c68e0475534975a9ca41deb6f2..5a3a270d25423ecc13118f56274e292b6bd23b58 100644
--- a/std/flash/events/AVStatusEvent.hx
+++ b/std/flash/events/AVStatusEvent.hx
@@ -1,25 +1,28 @@
 package flash.events;
 
 extern class AVStatusEvent extends Event {
-	var description(default,never) : String;
-	var notificationType(default,never) : String;
-	var result(default,never) : flash.media.AVResult;
+	@:flash.property var description(get,never) : String;
+	@:flash.property var notificationType(get,never) : String;
+	@:flash.property var result(get,never) : flash.media.AVResult;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, ?inNotificationType : String, inResult : Int = 0, ?inDescription : String) : Void;
-	static var AV_STATUS(default,never) : String;
-	static var BACKGROUND_MANIFEST_ERROR(default,never) : String;
-	static var BACKGROUND_MANIFEST_WARNING(default,never) : String;
-	static var BUFFER_STATE(default,never) : String;
-	static var DECODER_TYPE(default,never) : String;
-	static var DIMENSION_CHANGE(default,never) : String;
-	static var ERROR(default,never) : String;
-	static var INSERTION_COMPLETE(default,never) : String;
-	static var LOAD_COMPLETE(default,never) : String;
-	static var MANIFEST_UPDATE(default,never) : String;
-	static var PLAY_STATE(default,never) : String;
-	static var RENDER_TYPE(default,never) : String;
-	static var SEEK_COMPLETE(default,never) : String;
-	static var STEP_COMPLETE(default,never) : String;
-	static var STREAM_SWITCH(default,never) : String;
-	static var TRICKPLAY_ENDED(default,never) : String;
-	static var WARNING(default,never) : String;
+	private function get_description() : String;
+	private function get_notificationType() : String;
+	private function get_result() : flash.media.AVResult;
+	static final AV_STATUS : String;
+	static final BACKGROUND_MANIFEST_ERROR : String;
+	static final BACKGROUND_MANIFEST_WARNING : String;
+	static final BUFFER_STATE : String;
+	static final DECODER_TYPE : String;
+	static final DIMENSION_CHANGE : String;
+	static final ERROR : String;
+	static final INSERTION_COMPLETE : String;
+	static final LOAD_COMPLETE : String;
+	static final MANIFEST_UPDATE : String;
+	static final PLAY_STATE : String;
+	static final RENDER_TYPE : String;
+	static final SEEK_COMPLETE : String;
+	static final STEP_COMPLETE : String;
+	static final STREAM_SWITCH : String;
+	static final TRICKPLAY_ENDED : String;
+	static final WARNING : String;
 }
diff --git a/std/flash/events/AVStreamSwitchEvent.hx b/std/flash/events/AVStreamSwitchEvent.hx
index e216a7af2160318a333f3b6c86fd4445bcc3f0ce..3ffc530e06361f28c697031c9d168834b25adbc0 100644
--- a/std/flash/events/AVStreamSwitchEvent.hx
+++ b/std/flash/events/AVStreamSwitchEvent.hx
@@ -1,13 +1,18 @@
 package flash.events;
 
 extern class AVStreamSwitchEvent extends Event {
-	var bitrate(default,never) : Int;
-	var description(default,never) : String;
-	var switchType(default,never) : Int;
-	var time(default,never) : Float;
-	var userData(default,never) : Int;
+	@:flash.property var bitrate(get,never) : Int;
+	@:flash.property var description(get,never) : String;
+	@:flash.property var switchType(get,never) : Int;
+	@:flash.property var time(get,never) : Float;
+	@:flash.property var userData(get,never) : Int;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, time : Float = 0, switchType : Int = 0, bitrate : Int = 0, ?description : String, userData : Int = 0) : Void;
-	static var ABR_SWITCH(default,never) : Int;
-	static var AV_STREAM_SWITCH(default,never) : String;
-	static var PERIOD_SWITCH(default,never) : Int;
+	private function get_bitrate() : Int;
+	private function get_description() : String;
+	private function get_switchType() : Int;
+	private function get_time() : Float;
+	private function get_userData() : Int;
+	static final ABR_SWITCH : Int;
+	static final AV_STREAM_SWITCH : String;
+	static final PERIOD_SWITCH : Int;
 }
diff --git a/std/flash/events/AccelerometerEvent.hx b/std/flash/events/AccelerometerEvent.hx
index 08997c6d0a9ac9e995522354d5dec3bdda9dbf22..430d1d796abd02034129a0b0958c1cb47988b879 100644
--- a/std/flash/events/AccelerometerEvent.hx
+++ b/std/flash/events/AccelerometerEvent.hx
@@ -1,10 +1,18 @@
 package flash.events;
 
 @:require(flash10_1) extern class AccelerometerEvent extends Event {
-	var accelerationX : Float;
-	var accelerationY : Float;
-	var accelerationZ : Float;
-	var timestamp : Float;
+	@:flash.property var accelerationX(get,set) : Float;
+	@:flash.property var accelerationY(get,set) : Float;
+	@:flash.property var accelerationZ(get,set) : Float;
+	@:flash.property var timestamp(get,set) : Float;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, timestamp : Float = 0, accelerationX : Float = 0, accelerationY : Float = 0, accelerationZ : Float = 0) : Void;
-	static var UPDATE(default,never) : String;
+	private function get_accelerationX() : Float;
+	private function get_accelerationY() : Float;
+	private function get_accelerationZ() : Float;
+	private function get_timestamp() : Float;
+	private function set_accelerationX(value : Float) : Float;
+	private function set_accelerationY(value : Float) : Float;
+	private function set_accelerationZ(value : Float) : Float;
+	private function set_timestamp(value : Float) : Float;
+	static final UPDATE : String;
 }
diff --git a/std/flash/events/ActivityEvent.hx b/std/flash/events/ActivityEvent.hx
index c569a3da74068b3bd77aa53c8747db0a61c1f7ce..a746a513261793bb35fcf5aca9e3114c7ca90177 100644
--- a/std/flash/events/ActivityEvent.hx
+++ b/std/flash/events/ActivityEvent.hx
@@ -1,7 +1,9 @@
 package flash.events;
 
 extern class ActivityEvent extends Event {
-	var activating : Bool;
+	@:flash.property var activating(get,set) : Bool;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, activating : Bool = false) : Void;
-	static var ACTIVITY(default,never) : String;
+	private function get_activating() : Bool;
+	private function set_activating(value : Bool) : Bool;
+	static final ACTIVITY : String;
 }
diff --git a/std/flash/events/AsyncErrorEvent.hx b/std/flash/events/AsyncErrorEvent.hx
index 00e8def810c1f78f11efd2facc2b5a288a894e62..f80c605430c29361477abcb6a0620ba6c0182b17 100644
--- a/std/flash/events/AsyncErrorEvent.hx
+++ b/std/flash/events/AsyncErrorEvent.hx
@@ -3,5 +3,5 @@ package flash.events;
 extern class AsyncErrorEvent extends ErrorEvent {
 	var error : flash.errors.Error;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?text : String, ?error : flash.errors.Error) : Void;
-	static var ASYNC_ERROR(default,never) : String;
+	static final ASYNC_ERROR : String;
 }
diff --git a/std/flash/events/AudioOutputChangeEvent.hx b/std/flash/events/AudioOutputChangeEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e0aab7466324b0a36980dc2dd7abff55ab43eeda
--- /dev/null
+++ b/std/flash/events/AudioOutputChangeEvent.hx
@@ -0,0 +1,8 @@
+package flash.events;
+
+extern class AudioOutputChangeEvent extends Event {
+	@:flash.property var reason(get,never) : String;
+	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?reason : String) : Void;
+	private function get_reason() : String;
+	static final AUDIO_OUTPUT_CHANGE : String;
+}
diff --git a/std/flash/events/ContextMenuEvent.hx b/std/flash/events/ContextMenuEvent.hx
index 35cc0959ca7bdd422e5dea97106eaa10a8714feb..be2bc27074dab3da00dad3f4bfd3afbef406f5ac 100644
--- a/std/flash/events/ContextMenuEvent.hx
+++ b/std/flash/events/ContextMenuEvent.hx
@@ -1,10 +1,16 @@
 package flash.events;
 
 extern class ContextMenuEvent extends Event {
-	var contextMenuOwner : flash.display.InteractiveObject;
-	@:require(flash10) var isMouseTargetInaccessible : Bool;
-	var mouseTarget : flash.display.InteractiveObject;
+	@:flash.property var contextMenuOwner(get,set) : flash.display.InteractiveObject;
+	@:flash.property @:require(flash10) var isMouseTargetInaccessible(get,set) : Bool;
+	@:flash.property var mouseTarget(get,set) : flash.display.InteractiveObject;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?mouseTarget : flash.display.InteractiveObject, ?contextMenuOwner : flash.display.InteractiveObject) : Void;
-	static var MENU_ITEM_SELECT(default,never) : String;
-	static var MENU_SELECT(default,never) : String;
+	private function get_contextMenuOwner() : flash.display.InteractiveObject;
+	private function get_isMouseTargetInaccessible() : Bool;
+	private function get_mouseTarget() : flash.display.InteractiveObject;
+	private function set_contextMenuOwner(value : flash.display.InteractiveObject) : flash.display.InteractiveObject;
+	private function set_isMouseTargetInaccessible(value : Bool) : Bool;
+	private function set_mouseTarget(value : flash.display.InteractiveObject) : flash.display.InteractiveObject;
+	static final MENU_ITEM_SELECT : String;
+	static final MENU_SELECT : String;
 }
diff --git a/std/flash/events/DRMAuthenticateEvent.hx b/std/flash/events/DRMAuthenticateEvent.hx
index 02181ee55b84d26fe87d273ea1c3128c4929c5e8..4c7d735600c14168b04b4b2934ff2d49ccd1d8b9 100644
--- a/std/flash/events/DRMAuthenticateEvent.hx
+++ b/std/flash/events/DRMAuthenticateEvent.hx
@@ -1,14 +1,20 @@
 package flash.events;
 
 @:require(flash10_1) extern class DRMAuthenticateEvent extends Event {
-	var authenticationType(default,never) : String;
-	var header(default,never) : String;
-	var netstream(default,never) : flash.net.NetStream;
-	var passwordPrompt(default,never) : String;
-	var urlPrompt(default,never) : String;
-	var usernamePrompt(default,never) : String;
+	@:flash.property var authenticationType(get,never) : String;
+	@:flash.property var header(get,never) : String;
+	@:flash.property var netstream(get,never) : flash.net.NetStream;
+	@:flash.property var passwordPrompt(get,never) : String;
+	@:flash.property var urlPrompt(get,never) : String;
+	@:flash.property var usernamePrompt(get,never) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?header : String, ?userPrompt : String, ?passPrompt : String, ?urlPrompt : String, ?authenticationType : String, ?netstream : flash.net.NetStream) : Void;
-	static var AUTHENTICATION_TYPE_DRM(default,never) : String;
-	static var AUTHENTICATION_TYPE_PROXY(default,never) : String;
-	static var DRM_AUTHENTICATE(default,never) : String;
+	private function get_authenticationType() : String;
+	private function get_header() : String;
+	private function get_netstream() : flash.net.NetStream;
+	private function get_passwordPrompt() : String;
+	private function get_urlPrompt() : String;
+	private function get_usernamePrompt() : String;
+	static final AUTHENTICATION_TYPE_DRM : String;
+	static final AUTHENTICATION_TYPE_PROXY : String;
+	static final DRM_AUTHENTICATE : String;
 }
diff --git a/std/flash/events/DRMAuthenticationCompleteEvent.hx b/std/flash/events/DRMAuthenticationCompleteEvent.hx
index 018b08a6793138f11cfaf189fc710b12af0ce406..47c01cec881b4eb514e51123711f673f42c08572 100644
--- a/std/flash/events/DRMAuthenticationCompleteEvent.hx
+++ b/std/flash/events/DRMAuthenticationCompleteEvent.hx
@@ -1,9 +1,15 @@
 package flash.events;
 
 @:require(flash10_1) extern class DRMAuthenticationCompleteEvent extends Event {
-	var domain : String;
-	var serverURL : String;
-	var token : flash.utils.ByteArray;
+	@:flash.property var domain(get,set) : String;
+	@:flash.property var serverURL(get,set) : String;
+	@:flash.property var token(get,set) : flash.utils.ByteArray;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?inServerURL : String, ?inDomain : String, ?inToken : flash.utils.ByteArray) : Void;
-	static var AUTHENTICATION_COMPLETE(default,never) : String;
+	private function get_domain() : String;
+	private function get_serverURL() : String;
+	private function get_token() : flash.utils.ByteArray;
+	private function set_domain(value : String) : String;
+	private function set_serverURL(value : String) : String;
+	private function set_token(value : flash.utils.ByteArray) : flash.utils.ByteArray;
+	static final AUTHENTICATION_COMPLETE : String;
 }
diff --git a/std/flash/events/DRMAuthenticationErrorEvent.hx b/std/flash/events/DRMAuthenticationErrorEvent.hx
index cfd134f6d07e73ca01fcc2b2bb98db2dca049522..62217a9a2a49c8f81d13d5e7771f932e70fdd325 100644
--- a/std/flash/events/DRMAuthenticationErrorEvent.hx
+++ b/std/flash/events/DRMAuthenticationErrorEvent.hx
@@ -1,9 +1,15 @@
 package flash.events;
 
 @:require(flash10_1) extern class DRMAuthenticationErrorEvent extends ErrorEvent {
-	var domain : String;
-	var serverURL : String;
-	var subErrorID : Int;
+	@:flash.property var domain(get,set) : String;
+	@:flash.property var serverURL(get,set) : String;
+	@:flash.property var subErrorID(get,set) : Int;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?inDetail : String, inErrorID : Int = 0, inSubErrorID : Int = 0, ?inServerURL : String, ?inDomain : String) : Void;
-	static var AUTHENTICATION_ERROR(default,never) : String;
+	private function get_domain() : String;
+	private function get_serverURL() : String;
+	private function get_subErrorID() : Int;
+	private function set_domain(value : String) : String;
+	private function set_serverURL(value : String) : String;
+	private function set_subErrorID(value : Int) : Int;
+	static final AUTHENTICATION_ERROR : String;
 }
diff --git a/std/flash/events/DRMDeviceGroupErrorEvent.hx b/std/flash/events/DRMDeviceGroupErrorEvent.hx
index 982bf386ff1aa68dd1f8903a6fde16bc4b148d37..3585a8c91a7d556b3a1e23b820fa2fc173aa6894 100644
--- a/std/flash/events/DRMDeviceGroupErrorEvent.hx
+++ b/std/flash/events/DRMDeviceGroupErrorEvent.hx
@@ -1,11 +1,17 @@
 package flash.events;
 
 extern class DRMDeviceGroupErrorEvent extends ErrorEvent {
-	var deviceGroup : flash.net.drm.DRMDeviceGroup;
-	var drmUpdateNeeded(default,never) : Bool;
-	var subErrorID : Int;
-	var systemUpdateNeeded(default,never) : Bool;
+	@:flash.property var deviceGroup(get,set) : flash.net.drm.DRMDeviceGroup;
+	@:flash.property var drmUpdateNeeded(get,never) : Bool;
+	@:flash.property var subErrorID(get,set) : Int;
+	@:flash.property var systemUpdateNeeded(get,never) : Bool;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?errorDetail : String, errorCode : Int = 0, subErrorID : Int = 0, ?deviceGroup : flash.net.drm.DRMDeviceGroup, systemUpdateNeeded : Bool = false, drmUpdateNeeded : Bool = false) : Void;
-	static var ADD_TO_DEVICE_GROUP_ERROR(default,never) : String;
-	static var REMOVE_FROM_DEVICE_GROUP_ERROR(default,never) : String;
+	private function get_deviceGroup() : flash.net.drm.DRMDeviceGroup;
+	private function get_drmUpdateNeeded() : Bool;
+	private function get_subErrorID() : Int;
+	private function get_systemUpdateNeeded() : Bool;
+	private function set_deviceGroup(value : flash.net.drm.DRMDeviceGroup) : flash.net.drm.DRMDeviceGroup;
+	private function set_subErrorID(value : Int) : Int;
+	static final ADD_TO_DEVICE_GROUP_ERROR : String;
+	static final REMOVE_FROM_DEVICE_GROUP_ERROR : String;
 }
diff --git a/std/flash/events/DRMDeviceGroupEvent.hx b/std/flash/events/DRMDeviceGroupEvent.hx
index 57af6bd0a1135ea7f096cacdd2b8e6d01f8b475f..2b579c267f3626111c686c82c840ae7db44a93d6 100644
--- a/std/flash/events/DRMDeviceGroupEvent.hx
+++ b/std/flash/events/DRMDeviceGroupEvent.hx
@@ -1,8 +1,10 @@
 package flash.events;
 
 extern class DRMDeviceGroupEvent extends Event {
-	var deviceGroup : flash.net.drm.DRMDeviceGroup;
+	@:flash.property var deviceGroup(get,set) : flash.net.drm.DRMDeviceGroup;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?deviceGroup : flash.net.drm.DRMDeviceGroup) : Void;
-	static var ADD_TO_DEVICE_GROUP_COMPLETE(default,never) : String;
-	static var REMOVE_FROM_DEVICE_GROUP_COMPLETE(default,never) : String;
+	private function get_deviceGroup() : flash.net.drm.DRMDeviceGroup;
+	private function set_deviceGroup(value : flash.net.drm.DRMDeviceGroup) : flash.net.drm.DRMDeviceGroup;
+	static final ADD_TO_DEVICE_GROUP_COMPLETE : String;
+	static final REMOVE_FROM_DEVICE_GROUP_COMPLETE : String;
 }
diff --git a/std/flash/events/DRMErrorEvent.hx b/std/flash/events/DRMErrorEvent.hx
index 9e035fab261432b36e0f36699302bc6810500228..0f3cce7667e7d922b9904dce7e06300d85f93c51 100644
--- a/std/flash/events/DRMErrorEvent.hx
+++ b/std/flash/events/DRMErrorEvent.hx
@@ -1,11 +1,16 @@
 package flash.events;
 
 @:require(flash10_1) extern class DRMErrorEvent extends ErrorEvent {
-	var contentData : flash.net.drm.DRMContentData;
-	var drmUpdateNeeded(default,never) : Bool;
-	var subErrorID(default,never) : Int;
-	var systemUpdateNeeded(default,never) : Bool;
+	@:flash.property var contentData(get,set) : flash.net.drm.DRMContentData;
+	@:flash.property var drmUpdateNeeded(get,never) : Bool;
+	@:flash.property var subErrorID(get,never) : Int;
+	@:flash.property var systemUpdateNeeded(get,never) : Bool;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, ?inErrorDetail : String, inErrorCode : Int = 0, insubErrorID : Int = 0, ?inMetadata : flash.net.drm.DRMContentData, inSystemUpdateNeeded : Bool = false, inDrmUpdateNeeded : Bool = false) : Void;
-	static var DRM_ERROR(default,never) : String;
-	static var DRM_LOAD_DEVICEID_ERROR(default,never) : String;
+	private function get_contentData() : flash.net.drm.DRMContentData;
+	private function get_drmUpdateNeeded() : Bool;
+	private function get_subErrorID() : Int;
+	private function get_systemUpdateNeeded() : Bool;
+	private function set_contentData(value : flash.net.drm.DRMContentData) : flash.net.drm.DRMContentData;
+	static final DRM_ERROR : String;
+	static final DRM_LOAD_DEVICEID_ERROR : String;
 }
diff --git a/std/flash/events/DRMLicenseRequestEvent.hx b/std/flash/events/DRMLicenseRequestEvent.hx
index 873f4b8292a1b87e09a09d05bb93f268d051ecdd..745b46d90c99e7617e81b224f47aad7c11222448 100644
--- a/std/flash/events/DRMLicenseRequestEvent.hx
+++ b/std/flash/events/DRMLicenseRequestEvent.hx
@@ -1,7 +1,9 @@
 package flash.events;
 
 extern class DRMLicenseRequestEvent extends Event {
-	var serverURL : String;
+	@:flash.property var serverURL(get,set) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?inServerURL : String) : Void;
-	static var LICENSE_REQUEST(default,never) : String;
+	private function get_serverURL() : String;
+	private function set_serverURL(value : String) : String;
+	static final LICENSE_REQUEST : String;
 }
diff --git a/std/flash/events/DRMMetadataEvent.hx b/std/flash/events/DRMMetadataEvent.hx
index 4a4aebd011eab4e4814d7ea65566119d0eff2233..f279c73cb6d4684e2d2fc7e990c70d95b6cfbfd6 100644
--- a/std/flash/events/DRMMetadataEvent.hx
+++ b/std/flash/events/DRMMetadataEvent.hx
@@ -1,8 +1,10 @@
 package flash.events;
 
 extern class DRMMetadataEvent extends Event {
-	var drmMetadata(default,never) : flash.net.drm.DRMContentData;
-	var timestamp(default,never) : Float;
+	@:flash.property var drmMetadata(get,never) : flash.net.drm.DRMContentData;
+	@:flash.property var timestamp(get,never) : Float;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, ?inMetadata : flash.utils.ByteArray, inTimestamp : Float = 0) : Void;
-	static var DRM_METADATA(default,never) : String;
+	private function get_drmMetadata() : flash.net.drm.DRMContentData;
+	private function get_timestamp() : Float;
+	static final DRM_METADATA : String;
 }
diff --git a/std/flash/events/DRMReturnVoucherCompleteEvent.hx b/std/flash/events/DRMReturnVoucherCompleteEvent.hx
index dbec165c5d5fb43ae91775e1cdacec3ad89317ae..31ef37dd84b403c697124945e586ab7d43d7d47a 100644
--- a/std/flash/events/DRMReturnVoucherCompleteEvent.hx
+++ b/std/flash/events/DRMReturnVoucherCompleteEvent.hx
@@ -1,10 +1,18 @@
 package flash.events;
 
 extern class DRMReturnVoucherCompleteEvent extends Event {
-	var licenseID : String;
-	var numberOfVouchersReturned : Int;
-	var policyID : String;
-	var serverURL : String;
+	@:flash.property var licenseID(get,set) : String;
+	@:flash.property var numberOfVouchersReturned(get,set) : Int;
+	@:flash.property var policyID(get,set) : String;
+	@:flash.property var serverURL(get,set) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?inServerURL : String, ?inLicenseID : String, ?inPolicyID : String, inNumberOfVouchersReturned : Int = 0) : Void;
-	static var RETURN_VOUCHER_COMPLETE(default,never) : String;
+	private function get_licenseID() : String;
+	private function get_numberOfVouchersReturned() : Int;
+	private function get_policyID() : String;
+	private function get_serverURL() : String;
+	private function set_licenseID(value : String) : String;
+	private function set_numberOfVouchersReturned(value : Int) : Int;
+	private function set_policyID(value : String) : String;
+	private function set_serverURL(value : String) : String;
+	static final RETURN_VOUCHER_COMPLETE : String;
 }
diff --git a/std/flash/events/DRMReturnVoucherErrorEvent.hx b/std/flash/events/DRMReturnVoucherErrorEvent.hx
index 568a31ad995cd70748c61234f2dc7b1865de801d..91fc46f4d1ff25a41c2f4415fff9c60aa1c6c577 100644
--- a/std/flash/events/DRMReturnVoucherErrorEvent.hx
+++ b/std/flash/events/DRMReturnVoucherErrorEvent.hx
@@ -1,10 +1,18 @@
 package flash.events;
 
 extern class DRMReturnVoucherErrorEvent extends ErrorEvent {
-	var licenseID : String;
-	var policyID : String;
-	var serverURL : String;
-	var subErrorID : Int;
+	@:flash.property var licenseID(get,set) : String;
+	@:flash.property var policyID(get,set) : String;
+	@:flash.property var serverURL(get,set) : String;
+	@:flash.property var subErrorID(get,set) : Int;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?inDetail : String, inErrorID : Int = 0, inSubErrorID : Int = 0, ?inServerURL : String, ?inLicenseID : String, ?inPolicyID : String) : Void;
-	static var RETURN_VOUCHER_ERROR(default,never) : String;
+	private function get_licenseID() : String;
+	private function get_policyID() : String;
+	private function get_serverURL() : String;
+	private function get_subErrorID() : Int;
+	private function set_licenseID(value : String) : String;
+	private function set_policyID(value : String) : String;
+	private function set_serverURL(value : String) : String;
+	private function set_subErrorID(value : Int) : Int;
+	static final RETURN_VOUCHER_ERROR : String;
 }
diff --git a/std/flash/events/DRMStatusEvent.hx b/std/flash/events/DRMStatusEvent.hx
index ac71f0b5037fe0d38d7229ddb25d7b04378c0aa6..b9e6018d4756034409042921227748fbce376b0e 100644
--- a/std/flash/events/DRMStatusEvent.hx
+++ b/std/flash/events/DRMStatusEvent.hx
@@ -1,9 +1,15 @@
 package flash.events;
 
 @:require(flash10_1) extern class DRMStatusEvent extends Event {
-	var contentData : flash.net.drm.DRMContentData;
-	var isLocal : Bool;
-	var voucher : flash.net.drm.DRMVoucher;
+	@:flash.property var contentData(get,set) : flash.net.drm.DRMContentData;
+	@:flash.property var isLocal(get,set) : Bool;
+	@:flash.property var voucher(get,set) : flash.net.drm.DRMVoucher;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, ?inMetadata : flash.net.drm.DRMContentData, ?inVoucher : flash.net.drm.DRMVoucher, inLocal : Bool = false) : Void;
-	static var DRM_STATUS(default,never) : String;
+	private function get_contentData() : flash.net.drm.DRMContentData;
+	private function get_isLocal() : Bool;
+	private function get_voucher() : flash.net.drm.DRMVoucher;
+	private function set_contentData(value : flash.net.drm.DRMContentData) : flash.net.drm.DRMContentData;
+	private function set_isLocal(value : Bool) : Bool;
+	private function set_voucher(value : flash.net.drm.DRMVoucher) : flash.net.drm.DRMVoucher;
+	static final DRM_STATUS : String;
 }
diff --git a/std/flash/events/DataEvent.hx b/std/flash/events/DataEvent.hx
index 359146c4a496de41615113ca5bff11bfc0ba1e07..bbbde23cb3d36f8bdc08624161d158c3f22740d8 100644
--- a/std/flash/events/DataEvent.hx
+++ b/std/flash/events/DataEvent.hx
@@ -1,8 +1,10 @@
 package flash.events;
 
 extern class DataEvent extends TextEvent {
-	var data : String;
+	@:flash.property var data(get,set) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?data : String) : Void;
-	static var DATA(default,never) : String;
-	static var UPLOAD_COMPLETE_DATA(default,never) : String;
+	private function get_data() : String;
+	private function set_data(value : String) : String;
+	static final DATA : String;
+	static final UPLOAD_COMPLETE_DATA : String;
 }
diff --git a/std/flash/events/ErrorEvent.hx b/std/flash/events/ErrorEvent.hx
index 1541236f46d1fc0308e6f340f044f8de3ce5791e..a8ed65b52de6d834cde3ae53e71fabf35fd50823 100644
--- a/std/flash/events/ErrorEvent.hx
+++ b/std/flash/events/ErrorEvent.hx
@@ -1,7 +1,8 @@
 package flash.events;
 
 extern class ErrorEvent extends TextEvent {
-	@:require(flash10_1) var errorID(default,never) : Int;
+	@:flash.property @:require(flash10_1) var errorID(get,never) : Int;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?text : String, id : Int = 0) : Void;
-	static var ERROR(default,never) : String;
+	private function get_errorID() : Int;
+	static final ERROR : String;
 }
diff --git a/std/flash/events/Event.hx b/std/flash/events/Event.hx
index 1406fbde427152973dbdb637b83b3fde3108137e..6594afd4540c775fce14f97ebe69983b0f9e7c07 100644
--- a/std/flash/events/Event.hx
+++ b/std/flash/events/Event.hx
@@ -1,61 +1,67 @@
 package flash.events;
 
 extern class Event {
-	var bubbles(default,never) : Bool;
-	var cancelable(default,never) : Bool;
-	var currentTarget(default,never) : Dynamic;
-	var eventPhase(default,never) : EventPhase;
-	var target(default,never) : Dynamic;
-	var type(default,never) : String;
+	@:flash.property var bubbles(get,never) : Bool;
+	@:flash.property var cancelable(get,never) : Bool;
+	@:flash.property var currentTarget(get,never) : Dynamic;
+	@:flash.property var eventPhase(get,never) : EventPhase;
+	@:flash.property var target(get,never) : Dynamic;
+	@:flash.property var type(get,never) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false) : Void;
 	function clone() : Event;
-	function formatToString(className : String, ?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : String;
+	function formatToString(className : String, restArgs : haxe.extern.Rest<Dynamic>) : String;
+	private function get_bubbles() : Bool;
+	private function get_cancelable() : Bool;
+	private function get_currentTarget() : Dynamic;
+	private function get_eventPhase() : EventPhase;
+	private function get_target() : Dynamic;
+	private function get_type() : String;
 	function isDefaultPrevented() : Bool;
 	function preventDefault() : Void;
 	function stopImmediatePropagation() : Void;
 	function stopPropagation() : Void;
 	function toString() : String;
-	static var ACTIVATE(default,never) : String;
-	static var ADDED(default,never) : String;
-	static var ADDED_TO_STAGE(default,never) : String;
-	static var BROWSER_ZOOM_CHANGE(default,never) : String;
-	static var CANCEL(default,never) : String;
-	static var CHANGE(default,never) : String;
-	static var CHANNEL_MESSAGE(default,never) : String;
-	static var CHANNEL_STATE(default,never) : String;
-	@:require(flash10) static var CLEAR(default,never) : String;
-	static var CLOSE(default,never) : String;
-	static var COMPLETE(default,never) : String;
-	static var CONNECT(default,never) : String;
-	@:require(flash11) static var CONTEXT3D_CREATE(default,never) : String;
-	@:require(flash10) static var COPY(default,never) : String;
-	@:require(flash10) static var CUT(default,never) : String;
-	static var DEACTIVATE(default,never) : String;
-	static var ENTER_FRAME(default,never) : String;
-	@:require(flash10) static var EXIT_FRAME(default,never) : String;
-	@:require(flash10) static var FRAME_CONSTRUCTED(default,never) : String;
-	@:require(flash11_3) static var FRAME_LABEL(default,never) : String;
-	static var FULLSCREEN(default,never) : String;
-	static var ID3(default,never) : String;
-	static var INIT(default,never) : String;
-	static var MOUSE_LEAVE(default,never) : String;
-	static var OPEN(default,never) : String;
-	@:require(flash10) static var PASTE(default,never) : String;
-	static var REMOVED(default,never) : String;
-	static var REMOVED_FROM_STAGE(default,never) : String;
-	static var RENDER(default,never) : String;
-	static var RESIZE(default,never) : String;
-	static var SCROLL(default,never) : String;
-	static var SELECT(default,never) : String;
-	@:require(flash10) static var SELECT_ALL(default,never) : String;
-	static var SOUND_COMPLETE(default,never) : String;
-	@:require(flash11_3) static var SUSPEND(default,never) : String;
-	static var TAB_CHILDREN_CHANGE(default,never) : String;
-	static var TAB_ENABLED_CHANGE(default,never) : String;
-	static var TAB_INDEX_CHANGE(default,never) : String;
-	@:require(flash11_3) static var TEXTURE_READY(default,never) : String;
-	@:require(flash11) static var TEXT_INTERACTION_MODE_CHANGE(default,never) : String;
-	static var UNLOAD(default,never) : String;
-	static var VIDEO_FRAME(default,never) : String;
-	static var WORKER_STATE(default,never) : String;
+	static final ACTIVATE : String;
+	static final ADDED : String;
+	static final ADDED_TO_STAGE : String;
+	static final BROWSER_ZOOM_CHANGE : String;
+	static final CANCEL : String;
+	static final CHANGE : String;
+	static final CHANNEL_MESSAGE : String;
+	static final CHANNEL_STATE : String;
+	@:require(flash10) static final CLEAR : String;
+	static final CLOSE : String;
+	static final COMPLETE : String;
+	static final CONNECT : String;
+	@:require(flash11) static final CONTEXT3D_CREATE : String;
+	@:require(flash10) static final COPY : String;
+	@:require(flash10) static final CUT : String;
+	static final DEACTIVATE : String;
+	static final ENTER_FRAME : String;
+	@:require(flash10) static final EXIT_FRAME : String;
+	@:require(flash10) static final FRAME_CONSTRUCTED : String;
+	@:require(flash11_3) static final FRAME_LABEL : String;
+	static final FULLSCREEN : String;
+	static final ID3 : String;
+	static final INIT : String;
+	static final MOUSE_LEAVE : String;
+	static final OPEN : String;
+	@:require(flash10) static final PASTE : String;
+	static final REMOVED : String;
+	static final REMOVED_FROM_STAGE : String;
+	static final RENDER : String;
+	static final RESIZE : String;
+	static final SCROLL : String;
+	static final SELECT : String;
+	@:require(flash10) static final SELECT_ALL : String;
+	static final SOUND_COMPLETE : String;
+	@:require(flash11_3) static final SUSPEND : String;
+	static final TAB_CHILDREN_CHANGE : String;
+	static final TAB_ENABLED_CHANGE : String;
+	static final TAB_INDEX_CHANGE : String;
+	@:require(flash11_3) static final TEXTURE_READY : String;
+	@:require(flash11) static final TEXT_INTERACTION_MODE_CHANGE : String;
+	static final UNLOAD : String;
+	static final VIDEO_FRAME : String;
+	static final WORKER_STATE : String;
 }
diff --git a/std/flash/events/EventPhase.hx b/std/flash/events/EventPhase.hx
index a704069b62af8f0e963f7de4afe84957ddf28659..87e3f2151ae84f18106cfe3f98bf2a0d39e74e37 100644
--- a/std/flash/events/EventPhase.hx
+++ b/std/flash/events/EventPhase.hx
@@ -1,7 +1,7 @@
 package flash.events;
 
-@:fakeEnum(UInt) extern enum EventPhase {
-	AT_TARGET;
-	BUBBLING_PHASE;
-	CAPTURING_PHASE;
+@:native("flash.events.EventPhase") extern enum abstract EventPhase(UInt) {
+	var AT_TARGET;
+	var BUBBLING_PHASE;
+	var CAPTURING_PHASE;
 }
diff --git a/std/flash/events/FocusEvent.hx b/std/flash/events/FocusEvent.hx
index 1142f5ab767e863e13d94d5b794fecdd0cfda9f3..98c0dc50726798f12f7433161560b5f30899cd88 100644
--- a/std/flash/events/FocusEvent.hx
+++ b/std/flash/events/FocusEvent.hx
@@ -1,13 +1,21 @@
 package flash.events;
 
 extern class FocusEvent extends Event {
-	@:require(flash10) var isRelatedObjectInaccessible : Bool;
-	var keyCode : UInt;
-	var relatedObject : flash.display.InteractiveObject;
-	var shiftKey : Bool;
+	@:flash.property @:require(flash10) var isRelatedObjectInaccessible(get,set) : Bool;
+	@:flash.property var keyCode(get,set) : UInt;
+	@:flash.property var relatedObject(get,set) : flash.display.InteractiveObject;
+	@:flash.property var shiftKey(get,set) : Bool;
 	function new(type : String, bubbles : Bool = true, cancelable : Bool = false, ?relatedObject : flash.display.InteractiveObject, shiftKey : Bool = false, keyCode : UInt = 0) : Void;
-	static var FOCUS_IN(default,never) : String;
-	static var FOCUS_OUT(default,never) : String;
-	static var KEY_FOCUS_CHANGE(default,never) : String;
-	static var MOUSE_FOCUS_CHANGE(default,never) : String;
+	private function get_isRelatedObjectInaccessible() : Bool;
+	private function get_keyCode() : UInt;
+	private function get_relatedObject() : flash.display.InteractiveObject;
+	private function get_shiftKey() : Bool;
+	private function set_isRelatedObjectInaccessible(value : Bool) : Bool;
+	private function set_keyCode(value : UInt) : UInt;
+	private function set_relatedObject(value : flash.display.InteractiveObject) : flash.display.InteractiveObject;
+	private function set_shiftKey(value : Bool) : Bool;
+	static final FOCUS_IN : String;
+	static final FOCUS_OUT : String;
+	static final KEY_FOCUS_CHANGE : String;
+	static final MOUSE_FOCUS_CHANGE : String;
 }
diff --git a/std/flash/events/FullScreenEvent.hx b/std/flash/events/FullScreenEvent.hx
index bcb6e000c8228de062c84072493fa8705c3c723d..4aa45411efa7e38447ddbf73d98833353092e97a 100644
--- a/std/flash/events/FullScreenEvent.hx
+++ b/std/flash/events/FullScreenEvent.hx
@@ -1,9 +1,11 @@
 package flash.events;
 
 extern class FullScreenEvent extends ActivityEvent {
-	var fullScreen(default,never) : Bool;
-	@:require(flash11_3) var interactive(default,never) : Bool;
+	@:flash.property var fullScreen(get,never) : Bool;
+	@:flash.property @:require(flash11_3) var interactive(get,never) : Bool;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, fullScreen : Bool = false, interactive : Bool = false) : Void;
-	static var FULL_SCREEN(default,never) : String;
-	@:require(flash11_3) static var FULL_SCREEN_INTERACTIVE_ACCEPTED(default,never) : String;
+	private function get_fullScreen() : Bool;
+	private function get_interactive() : Bool;
+	static final FULL_SCREEN : String;
+	@:require(flash11_3) static final FULL_SCREEN_INTERACTIVE_ACCEPTED : String;
 }
diff --git a/std/flash/events/GameInputEvent.hx b/std/flash/events/GameInputEvent.hx
index 7bcbb9a96617aedb78ba82dd191117ebc7df43f8..5fd728861e61b894d7e70010febc2bd35b78de52 100644
--- a/std/flash/events/GameInputEvent.hx
+++ b/std/flash/events/GameInputEvent.hx
@@ -1,9 +1,10 @@
 package flash.events;
 
-@:final @:require(flash11_8) extern class GameInputEvent extends Event {
-	var device(default,never) : flash.ui.GameInputDevice;
+@:require(flash11_8) extern final class GameInputEvent extends Event {
+	@:flash.property var device(get,never) : flash.ui.GameInputDevice;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?device : flash.ui.GameInputDevice) : Void;
-	static var DEVICE_ADDED(default,never) : String;
-	static var DEVICE_REMOVED(default,never) : String;
-	static var DEVICE_UNUSABLE(default,never) : String;
+	private function get_device() : flash.ui.GameInputDevice;
+	static final DEVICE_ADDED : String;
+	static final DEVICE_REMOVED : String;
+	static final DEVICE_UNUSABLE : String;
 }
diff --git a/std/flash/events/GeolocationEvent.hx b/std/flash/events/GeolocationEvent.hx
index d6248acc436396373ded1fef09f26a11cde8e67c..2f2994a5cbc24435875f8935482cf673dcae6bd2 100644
--- a/std/flash/events/GeolocationEvent.hx
+++ b/std/flash/events/GeolocationEvent.hx
@@ -1,14 +1,30 @@
 package flash.events;
 
 @:require(flash10_1) extern class GeolocationEvent extends Event {
-	var altitude : Float;
-	var heading : Float;
-	var horizontalAccuracy : Float;
-	var latitude : Float;
-	var longitude : Float;
-	var speed : Float;
-	var timestamp : Float;
-	var verticalAccuracy : Float;
+	@:flash.property var altitude(get,set) : Float;
+	@:flash.property var heading(get,set) : Float;
+	@:flash.property var horizontalAccuracy(get,set) : Float;
+	@:flash.property var latitude(get,set) : Float;
+	@:flash.property var longitude(get,set) : Float;
+	@:flash.property var speed(get,set) : Float;
+	@:flash.property var timestamp(get,set) : Float;
+	@:flash.property var verticalAccuracy(get,set) : Float;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, latitude : Float = 0, longitude : Float = 0, altitude : Float = 0, hAccuracy : Float = 0, vAccuracy : Float = 0, speed : Float = 0, heading : Float = 0, timestamp : Float = 0) : Void;
-	static var UPDATE(default,never) : String;
+	private function get_altitude() : Float;
+	private function get_heading() : Float;
+	private function get_horizontalAccuracy() : Float;
+	private function get_latitude() : Float;
+	private function get_longitude() : Float;
+	private function get_speed() : Float;
+	private function get_timestamp() : Float;
+	private function get_verticalAccuracy() : Float;
+	private function set_altitude(value : Float) : Float;
+	private function set_heading(value : Float) : Float;
+	private function set_horizontalAccuracy(value : Float) : Float;
+	private function set_latitude(value : Float) : Float;
+	private function set_longitude(value : Float) : Float;
+	private function set_speed(value : Float) : Float;
+	private function set_timestamp(value : Float) : Float;
+	private function set_verticalAccuracy(value : Float) : Float;
+	static final UPDATE : String;
 }
diff --git a/std/flash/events/GestureEvent.hx b/std/flash/events/GestureEvent.hx
index 40e002857d4e991ba03c42efdd7ed4897df74694..6b061abb98262a98e1c0f912d4ad936f4a7bd132 100644
--- a/std/flash/events/GestureEvent.hx
+++ b/std/flash/events/GestureEvent.hx
@@ -1,15 +1,29 @@
 package flash.events;
 
 @:require(flash10_1) extern class GestureEvent extends Event {
-	var altKey : Bool;
-	var ctrlKey : Bool;
-	var localX : Float;
-	var localY : Float;
-	var phase : String;
-	var shiftKey : Bool;
-	var stageX(default,never) : Float;
-	var stageY(default,never) : Float;
+	@:flash.property var altKey(get,set) : Bool;
+	@:flash.property var ctrlKey(get,set) : Bool;
+	@:flash.property var localX(get,set) : Float;
+	@:flash.property var localY(get,set) : Float;
+	@:flash.property var phase(get,set) : String;
+	@:flash.property var shiftKey(get,set) : Bool;
+	@:flash.property var stageX(get,never) : Float;
+	@:flash.property var stageY(get,never) : Float;
 	function new(type : String, bubbles : Bool = true, cancelable : Bool = false, ?phase : String, localX : Float = 0, localY : Float = 0, ctrlKey : Bool = false, altKey : Bool = false, shiftKey : Bool = false) : Void;
+	private function get_altKey() : Bool;
+	private function get_ctrlKey() : Bool;
+	private function get_localX() : Float;
+	private function get_localY() : Float;
+	private function get_phase() : String;
+	private function get_shiftKey() : Bool;
+	private function get_stageX() : Float;
+	private function get_stageY() : Float;
+	private function set_altKey(value : Bool) : Bool;
+	private function set_ctrlKey(value : Bool) : Bool;
+	private function set_localX(value : Float) : Float;
+	private function set_localY(value : Float) : Float;
+	private function set_phase(value : String) : String;
+	private function set_shiftKey(value : Bool) : Bool;
 	function updateAfterEvent() : Void;
-	static var GESTURE_TWO_FINGER_TAP(default,never) : String;
+	static final GESTURE_TWO_FINGER_TAP : String;
 }
diff --git a/std/flash/events/GesturePhase.hx b/std/flash/events/GesturePhase.hx
index 0a10aac7dabedc6e21801c93ac0fc281a0a62cbe..0780eb9778b8e3ef8b677da3d1d9ea7d5c78bc08 100644
--- a/std/flash/events/GesturePhase.hx
+++ b/std/flash/events/GesturePhase.hx
@@ -1,8 +1,8 @@
 package flash.events;
 
-@:fakeEnum(String) @:require(flash10_1) extern enum GesturePhase {
-	ALL;
-	BEGIN;
-	END;
-	UPDATE;
+@:native("flash.events.GesturePhase") @:require(flash10_1) extern enum abstract GesturePhase(String) {
+	var ALL;
+	var BEGIN;
+	var END;
+	var UPDATE;
 }
diff --git a/std/flash/events/HTTPStatusEvent.hx b/std/flash/events/HTTPStatusEvent.hx
index 131b65cf1fc7dd740f3fc23f614d0f88fcc6d641..fb75273e3d3662f57bcc5791ee88ca992f1efdfb 100644
--- a/std/flash/events/HTTPStatusEvent.hx
+++ b/std/flash/events/HTTPStatusEvent.hx
@@ -1,11 +1,18 @@
 package flash.events;
 
 extern class HTTPStatusEvent extends Event {
-	var redirected : Bool;
-	@:require(flash10_1) var responseHeaders : Array<Dynamic>;
-	@:require(flash10_1) var responseURL : String;
-	var status(default,never) : Int;
+	@:flash.property var redirected(get,set) : Bool;
+	@:flash.property @:require(flash10_1) var responseHeaders(get,set) : Array<Dynamic>;
+	@:flash.property @:require(flash10_1) var responseURL(get,set) : String;
+	@:flash.property var status(get,never) : Int;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, status : Int = 0, redirected : Bool = false) : Void;
-	@:require(flash10_1) static var HTTP_RESPONSE_STATUS(default,never) : String;
-	static var HTTP_STATUS(default,never) : String;
+	private function get_redirected() : Bool;
+	private function get_responseHeaders() : Array<Dynamic>;
+	private function get_responseURL() : String;
+	private function get_status() : Int;
+	private function set_redirected(value : Bool) : Bool;
+	private function set_responseHeaders(value : Array<Dynamic>) : Array<Dynamic>;
+	private function set_responseURL(value : String) : String;
+	@:require(flash10_1) static final HTTP_RESPONSE_STATUS : String;
+	static final HTTP_STATUS : String;
 }
diff --git a/std/flash/events/IMEEvent.hx b/std/flash/events/IMEEvent.hx
index 0553d5857163f9a20a76233d710979324bf45953..7b991dd6ef88e7e83ef8bc7e8bc07d949451b1b2 100644
--- a/std/flash/events/IMEEvent.hx
+++ b/std/flash/events/IMEEvent.hx
@@ -1,8 +1,10 @@
 package flash.events;
 
 extern class IMEEvent extends TextEvent {
-	@:require(flash10_1) var imeClient : flash.text.ime.IIMEClient;
+	@:flash.property @:require(flash10_1) var imeClient(get,set) : flash.text.ime.IIMEClient;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?text : String, ?imeClient : flash.text.ime.IIMEClient) : Void;
-	static var IME_COMPOSITION(default,never) : String;
-	@:require(flash10_1) static var IME_START_COMPOSITION(default,never) : String;
+	private function get_imeClient() : flash.text.ime.IIMEClient;
+	private function set_imeClient(value : flash.text.ime.IIMEClient) : flash.text.ime.IIMEClient;
+	static final IME_COMPOSITION : String;
+	@:require(flash10_1) static final IME_START_COMPOSITION : String;
 }
diff --git a/std/flash/events/IOErrorEvent.hx b/std/flash/events/IOErrorEvent.hx
index 4b351378c3024f1dc7952cb8c71ab2762b475e29..3ca285bd4b676b3f72d69c6b69e8e74580957424 100644
--- a/std/flash/events/IOErrorEvent.hx
+++ b/std/flash/events/IOErrorEvent.hx
@@ -2,8 +2,8 @@ package flash.events;
 
 extern class IOErrorEvent extends ErrorEvent {
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?text : String, id : Int = 0) : Void;
-	static var DISK_ERROR(default,never) : String;
-	static var IO_ERROR(default,never) : String;
-	static var NETWORK_ERROR(default,never) : String;
-	static var VERIFY_ERROR(default,never) : String;
+	static final DISK_ERROR : String;
+	static final IO_ERROR : String;
+	static final NETWORK_ERROR : String;
+	static final VERIFY_ERROR : String;
 }
diff --git a/std/flash/events/KeyboardEvent.hx b/std/flash/events/KeyboardEvent.hx
index 5e913d4523a2ba66e43b58d07ad9c2d88e290978..1f9129a03434d122a4827fd2839d0bd63278e377 100644
--- a/std/flash/events/KeyboardEvent.hx
+++ b/std/flash/events/KeyboardEvent.hx
@@ -1,14 +1,26 @@
 package flash.events;
 
 extern class KeyboardEvent extends Event {
-	var altKey : Bool;
-	var charCode : UInt;
-	var ctrlKey : Bool;
-	var keyCode : UInt;
-	var keyLocation : flash.ui.KeyLocation;
-	var shiftKey : Bool;
+	@:flash.property var altKey(get,set) : Bool;
+	@:flash.property var charCode(get,set) : UInt;
+	@:flash.property var ctrlKey(get,set) : Bool;
+	@:flash.property var keyCode(get,set) : UInt;
+	@:flash.property var keyLocation(get,set) : flash.ui.KeyLocation;
+	@:flash.property var shiftKey(get,set) : Bool;
 	function new(type : String, bubbles : Bool = true, cancelable : Bool = false, charCodeValue : UInt = 0, keyCodeValue : UInt = 0, keyLocationValue : flash.ui.KeyLocation = 0, ctrlKeyValue : Bool = false, altKeyValue : Bool = false, shiftKeyValue : Bool = false) : Void;
+	private function get_altKey() : Bool;
+	private function get_charCode() : UInt;
+	private function get_ctrlKey() : Bool;
+	private function get_keyCode() : UInt;
+	private function get_keyLocation() : flash.ui.KeyLocation;
+	private function get_shiftKey() : Bool;
+	private function set_altKey(value : Bool) : Bool;
+	private function set_charCode(value : UInt) : UInt;
+	private function set_ctrlKey(value : Bool) : Bool;
+	private function set_keyCode(value : UInt) : UInt;
+	private function set_keyLocation(value : flash.ui.KeyLocation) : flash.ui.KeyLocation;
+	private function set_shiftKey(value : Bool) : Bool;
 	function updateAfterEvent() : Void;
-	static var KEY_DOWN(default,never) : String;
-	static var KEY_UP(default,never) : String;
+	static final KEY_DOWN : String;
+	static final KEY_UP : String;
 }
diff --git a/std/flash/events/MouseEvent.hx b/std/flash/events/MouseEvent.hx
index c5b1d4c13edd7892449c5d73a0e94dce94fda1a6..9376f0994928ae3f60e3438c9505bb89e718b99e 100644
--- a/std/flash/events/MouseEvent.hx
+++ b/std/flash/events/MouseEvent.hx
@@ -1,37 +1,61 @@
 package flash.events;
 
 extern class MouseEvent extends Event {
-	var altKey : Bool;
-	var buttonDown : Bool;
-	var ctrlKey : Bool;
-	var delta : Int;
-	@:require(flash10) var isRelatedObjectInaccessible : Bool;
-	var localX : Float;
-	var localY : Float;
-	@:require(flash11_2) var movementX : Float;
-	@:require(flash11_2) var movementY : Float;
-	var relatedObject : flash.display.InteractiveObject;
-	var shiftKey : Bool;
-	var stageX(default,never) : Float;
-	var stageY(default,never) : Float;
+	@:flash.property var altKey(get,set) : Bool;
+	@:flash.property var buttonDown(get,set) : Bool;
+	@:flash.property var ctrlKey(get,set) : Bool;
+	@:flash.property var delta(get,set) : Int;
+	@:flash.property @:require(flash10) var isRelatedObjectInaccessible(get,set) : Bool;
+	@:flash.property var localX(get,set) : Float;
+	@:flash.property var localY(get,set) : Float;
+	@:flash.property @:require(flash11_2) var movementX(get,set) : Float;
+	@:flash.property @:require(flash11_2) var movementY(get,set) : Float;
+	@:flash.property var relatedObject(get,set) : flash.display.InteractiveObject;
+	@:flash.property var shiftKey(get,set) : Bool;
+	@:flash.property var stageX(get,never) : Float;
+	@:flash.property var stageY(get,never) : Float;
 	function new(type : String, bubbles : Bool = true, cancelable : Bool = false, localX : Null<Float> = 0, localY : Null<Float> = 0, ?relatedObject : flash.display.InteractiveObject, ctrlKey : Bool = false, altKey : Bool = false, shiftKey : Bool = false, buttonDown : Bool = false, delta : Int = 0) : Void;
+	private function get_altKey() : Bool;
+	private function get_buttonDown() : Bool;
+	private function get_ctrlKey() : Bool;
+	private function get_delta() : Int;
+	private function get_isRelatedObjectInaccessible() : Bool;
+	private function get_localX() : Float;
+	private function get_localY() : Float;
+	private function get_movementX() : Float;
+	private function get_movementY() : Float;
+	private function get_relatedObject() : flash.display.InteractiveObject;
+	private function get_shiftKey() : Bool;
+	private function get_stageX() : Float;
+	private function get_stageY() : Float;
+	private function set_altKey(value : Bool) : Bool;
+	private function set_buttonDown(value : Bool) : Bool;
+	private function set_ctrlKey(value : Bool) : Bool;
+	private function set_delta(value : Int) : Int;
+	private function set_isRelatedObjectInaccessible(value : Bool) : Bool;
+	private function set_localX(value : Float) : Float;
+	private function set_localY(value : Float) : Float;
+	private function set_movementX(value : Float) : Float;
+	private function set_movementY(value : Float) : Float;
+	private function set_relatedObject(value : flash.display.InteractiveObject) : flash.display.InteractiveObject;
+	private function set_shiftKey(value : Bool) : Bool;
 	function updateAfterEvent() : Void;
-	static var CLICK(default,never) : String;
-	@:require(flash11_2) static var CONTEXT_MENU(default,never) : String;
-	static var DOUBLE_CLICK(default,never) : String;
-	@:require(flash11_2) static var MIDDLE_CLICK(default,never) : String;
-	@:require(flash11_2) static var MIDDLE_MOUSE_DOWN(default,never) : String;
-	@:require(flash11_2) static var MIDDLE_MOUSE_UP(default,never) : String;
-	static var MOUSE_DOWN(default,never) : String;
-	static var MOUSE_MOVE(default,never) : String;
-	static var MOUSE_OUT(default,never) : String;
-	static var MOUSE_OVER(default,never) : String;
-	static var MOUSE_UP(default,never) : String;
-	static var MOUSE_WHEEL(default,never) : String;
-	@:require(flash11_3) static var RELEASE_OUTSIDE(default,never) : String;
-	@:require(flash11_2) static var RIGHT_CLICK(default,never) : String;
-	@:require(flash11_2) static var RIGHT_MOUSE_DOWN(default,never) : String;
-	@:require(flash11_2) static var RIGHT_MOUSE_UP(default,never) : String;
-	static var ROLL_OUT(default,never) : String;
-	static var ROLL_OVER(default,never) : String;
+	static final CLICK : String;
+	@:require(flash11_2) static final CONTEXT_MENU : String;
+	static final DOUBLE_CLICK : String;
+	@:require(flash11_2) static final MIDDLE_CLICK : String;
+	@:require(flash11_2) static final MIDDLE_MOUSE_DOWN : String;
+	@:require(flash11_2) static final MIDDLE_MOUSE_UP : String;
+	static final MOUSE_DOWN : String;
+	static final MOUSE_MOVE : String;
+	static final MOUSE_OUT : String;
+	static final MOUSE_OVER : String;
+	static final MOUSE_UP : String;
+	static final MOUSE_WHEEL : String;
+	@:require(flash11_3) static final RELEASE_OUTSIDE : String;
+	@:require(flash11_2) static final RIGHT_CLICK : String;
+	@:require(flash11_2) static final RIGHT_MOUSE_DOWN : String;
+	@:require(flash11_2) static final RIGHT_MOUSE_UP : String;
+	static final ROLL_OUT : String;
+	static final ROLL_OVER : String;
 }
diff --git a/std/flash/events/NetDataEvent.hx b/std/flash/events/NetDataEvent.hx
index 8349d780bd2ec39c5a0a708cc7afd0e88562e38c..686c600a8a822aef4be139b02a68169b5937dbc9 100644
--- a/std/flash/events/NetDataEvent.hx
+++ b/std/flash/events/NetDataEvent.hx
@@ -1,8 +1,10 @@
 package flash.events;
 
 extern class NetDataEvent extends Event {
-	var info(default,never) : Dynamic;
-	var timestamp(default,never) : Float;
+	@:flash.property var info(get,never) : Dynamic;
+	@:flash.property var timestamp(get,never) : Float;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, timestamp : Float = 0, ?info : Dynamic) : Void;
-	static var MEDIA_TYPE_DATA(default,never) : String;
+	private function get_info() : Dynamic;
+	private function get_timestamp() : Float;
+	static final MEDIA_TYPE_DATA : String;
 }
diff --git a/std/flash/events/NetMonitorEvent.hx b/std/flash/events/NetMonitorEvent.hx
index 6c3b743d4f5bab2c2067efad1a5e121ce244ecec..435573936ef78ad94f53ab1bc34950eb5a47a217 100644
--- a/std/flash/events/NetMonitorEvent.hx
+++ b/std/flash/events/NetMonitorEvent.hx
@@ -1,7 +1,8 @@
 package flash.events;
 
 extern class NetMonitorEvent extends Event {
-	var netStream(default,never) : flash.net.NetStream;
+	@:flash.property var netStream(get,never) : flash.net.NetStream;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?netStream : flash.net.NetStream) : Void;
-	static var NET_STREAM_CREATE(default,never) : String;
+	private function get_netStream() : flash.net.NetStream;
+	static final NET_STREAM_CREATE : String;
 }
diff --git a/std/flash/events/NetStatusEvent.hx b/std/flash/events/NetStatusEvent.hx
index fe23b7bc233b3bc6e23b32374bf918a69639de83..60a4b87be2b25abf72ef0de1b6099c7feba40284 100644
--- a/std/flash/events/NetStatusEvent.hx
+++ b/std/flash/events/NetStatusEvent.hx
@@ -1,7 +1,9 @@
 package flash.events;
 
 extern class NetStatusEvent extends Event {
-	var info : Dynamic;
+	@:flash.property var info(get,set) : Dynamic;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?info : Dynamic) : Void;
-	static var NET_STATUS(default,never) : String;
+	private function get_info() : Dynamic;
+	private function set_info(value : Dynamic) : Dynamic;
+	static final NET_STATUS : String;
 }
diff --git a/std/flash/events/OutputProgressEvent.hx b/std/flash/events/OutputProgressEvent.hx
index 501a67bf8ba5fd100c9879a65fd1a152f4cbe0d7..358ffd955a54429a75d4b3bd78077564e2d8859d 100644
--- a/std/flash/events/OutputProgressEvent.hx
+++ b/std/flash/events/OutputProgressEvent.hx
@@ -1,8 +1,12 @@
 package flash.events;
 
 extern class OutputProgressEvent extends Event {
-	var bytesPending : Float;
-	var bytesTotal : Float;
+	@:flash.property var bytesPending(get,set) : Float;
+	@:flash.property var bytesTotal(get,set) : Float;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, bytesPending : Float = 0, bytesTotal : Float = 0) : Void;
-	static var OUTPUT_PROGRESS(default,never) : String;
+	private function get_bytesPending() : Float;
+	private function get_bytesTotal() : Float;
+	private function set_bytesPending(value : Float) : Float;
+	private function set_bytesTotal(value : Float) : Float;
+	static final OUTPUT_PROGRESS : String;
 }
diff --git a/std/flash/events/PressAndTapGestureEvent.hx b/std/flash/events/PressAndTapGestureEvent.hx
index 6a65ab76188fc0c0463cd62346b3a6ba94f1dade..c1915b5e6f8a326ce3c61996deb2c9adcef16596 100644
--- a/std/flash/events/PressAndTapGestureEvent.hx
+++ b/std/flash/events/PressAndTapGestureEvent.hx
@@ -1,10 +1,16 @@
 package flash.events;
 
 @:require(flash10_1) extern class PressAndTapGestureEvent extends GestureEvent {
-	var tapLocalX : Float;
-	var tapLocalY : Float;
-	var tapStageX(default,never) : Float;
-	var tapStageY(default,never) : Float;
+	@:flash.property var tapLocalX(get,set) : Float;
+	@:flash.property var tapLocalY(get,set) : Float;
+	@:flash.property var tapStageX(get,never) : Float;
+	@:flash.property var tapStageY(get,never) : Float;
 	function new(type : String, bubbles : Bool = true, cancelable : Bool = false, ?phase : String, localX : Float = 0, localY : Float = 0, tapLocalX : Float = 0, tapLocalY : Float = 0, ctrlKey : Bool = false, altKey : Bool = false, shiftKey : Bool = false) : Void;
-	static var GESTURE_PRESS_AND_TAP(default,never) : String;
+	private function get_tapLocalX() : Float;
+	private function get_tapLocalY() : Float;
+	private function get_tapStageX() : Float;
+	private function get_tapStageY() : Float;
+	private function set_tapLocalX(value : Float) : Float;
+	private function set_tapLocalY(value : Float) : Float;
+	static final GESTURE_PRESS_AND_TAP : String;
 }
diff --git a/std/flash/events/ProgressEvent.hx b/std/flash/events/ProgressEvent.hx
index d49dc3480115f7e8cba724af67a05497c720d803..21cc26acfed10329b128d0c6234d555f64da04d7 100644
--- a/std/flash/events/ProgressEvent.hx
+++ b/std/flash/events/ProgressEvent.hx
@@ -1,9 +1,13 @@
 package flash.events;
 
 extern class ProgressEvent extends Event {
-	var bytesLoaded : Float;
-	var bytesTotal : Float;
+	@:flash.property var bytesLoaded(get,set) : Float;
+	@:flash.property var bytesTotal(get,set) : Float;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, bytesLoaded : Float = 0, bytesTotal : Float = 0) : Void;
-	static var PROGRESS(default,never) : String;
-	static var SOCKET_DATA(default,never) : String;
+	private function get_bytesLoaded() : Float;
+	private function get_bytesTotal() : Float;
+	private function set_bytesLoaded(value : Float) : Float;
+	private function set_bytesTotal(value : Float) : Float;
+	static final PROGRESS : String;
+	static final SOCKET_DATA : String;
 }
diff --git a/std/flash/events/SampleDataEvent.hx b/std/flash/events/SampleDataEvent.hx
index 219332fb1d1f5613742a88860efb33900ff05270..f9c946757774ed71585fd1f54e25979f08cfb937 100644
--- a/std/flash/events/SampleDataEvent.hx
+++ b/std/flash/events/SampleDataEvent.hx
@@ -1,8 +1,12 @@
 package flash.events;
 
 extern class SampleDataEvent extends Event {
-	var data : flash.utils.ByteArray;
-	var position : Float;
+	@:flash.property var data(get,set) : flash.utils.ByteArray;
+	@:flash.property var position(get,set) : Float;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, theposition : Float = 0, ?thedata : flash.utils.ByteArray) : Void;
-	static var SAMPLE_DATA(default,never) : String;
+	private function get_data() : flash.utils.ByteArray;
+	private function get_position() : Float;
+	private function set_data(value : flash.utils.ByteArray) : flash.utils.ByteArray;
+	private function set_position(value : Float) : Float;
+	static final SAMPLE_DATA : String;
 }
diff --git a/std/flash/events/SecurityErrorEvent.hx b/std/flash/events/SecurityErrorEvent.hx
index 9d4e267faf2410325e31eeba641330fe21fcd76b..3baa8ed901354d156001d9a0c975e352201584e0 100644
--- a/std/flash/events/SecurityErrorEvent.hx
+++ b/std/flash/events/SecurityErrorEvent.hx
@@ -2,5 +2,5 @@ package flash.events;
 
 extern class SecurityErrorEvent extends ErrorEvent {
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?text : String, id : Int = 0) : Void;
-	static var SECURITY_ERROR(default,never) : String;
+	static final SECURITY_ERROR : String;
 }
diff --git a/std/flash/events/ShaderEvent.hx b/std/flash/events/ShaderEvent.hx
index b7055cb6a1d2e19f36758ec2d93dc2a58d64976b..2c09d4a97d72b86b262b87165819dc9438c224ee 100644
--- a/std/flash/events/ShaderEvent.hx
+++ b/std/flash/events/ShaderEvent.hx
@@ -1,9 +1,15 @@
 package flash.events;
 
 extern class ShaderEvent extends Event {
-	var bitmapData : flash.display.BitmapData;
-	var byteArray : flash.utils.ByteArray;
-	var vector : flash.Vector<Float>;
+	@:flash.property var bitmapData(get,set) : flash.display.BitmapData;
+	@:flash.property var byteArray(get,set) : flash.utils.ByteArray;
+	@:flash.property var vector(get,set) : flash.Vector<Float>;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?bitmap : flash.display.BitmapData, ?array : flash.utils.ByteArray, ?vector : flash.Vector<Float>) : Void;
-	static var COMPLETE(default,never) : String;
+	private function get_bitmapData() : flash.display.BitmapData;
+	private function get_byteArray() : flash.utils.ByteArray;
+	private function get_vector() : flash.Vector<Float>;
+	private function set_bitmapData(value : flash.display.BitmapData) : flash.display.BitmapData;
+	private function set_byteArray(value : flash.utils.ByteArray) : flash.utils.ByteArray;
+	private function set_vector(value : flash.Vector<Float>) : flash.Vector<Float>;
+	static final COMPLETE : String;
 }
diff --git a/std/flash/events/SoftKeyboardEvent.hx b/std/flash/events/SoftKeyboardEvent.hx
index c1100893423561a5d9f86434db1fd242aedf2d24..1dcc37d386cdc5dd1dd2d827a4e22c4712f4146f 100644
--- a/std/flash/events/SoftKeyboardEvent.hx
+++ b/std/flash/events/SoftKeyboardEvent.hx
@@ -1,10 +1,13 @@
 package flash.events;
 
 extern class SoftKeyboardEvent extends Event {
-	var relatedObject : flash.display.InteractiveObject;
-	var triggerType(default,never) : String;
+	@:flash.property var relatedObject(get,set) : flash.display.InteractiveObject;
+	@:flash.property var triggerType(get,never) : String;
 	function new(type : String, bubbles : Bool, cancelable : Bool, relatedObjectVal : flash.display.InteractiveObject, triggerTypeVal : String) : Void;
-	static var SOFT_KEYBOARD_ACTIVATE(default,never) : String;
-	static var SOFT_KEYBOARD_ACTIVATING(default,never) : String;
-	static var SOFT_KEYBOARD_DEACTIVATE(default,never) : String;
+	private function get_relatedObject() : flash.display.InteractiveObject;
+	private function get_triggerType() : String;
+	private function set_relatedObject(value : flash.display.InteractiveObject) : flash.display.InteractiveObject;
+	static final SOFT_KEYBOARD_ACTIVATE : String;
+	static final SOFT_KEYBOARD_ACTIVATING : String;
+	static final SOFT_KEYBOARD_DEACTIVATE : String;
 }
diff --git a/std/flash/events/SoftKeyboardTrigger.hx b/std/flash/events/SoftKeyboardTrigger.hx
index 1396ac37b27cc53115b6ed50fc0d13f54ce8537d..122d8489c524ca95dc995183a013f75b21355552 100644
--- a/std/flash/events/SoftKeyboardTrigger.hx
+++ b/std/flash/events/SoftKeyboardTrigger.hx
@@ -2,6 +2,6 @@ package flash.events;
 
 extern class SoftKeyboardTrigger {
 	function new() : Void;
-	static var CONTENT_TRIGGERED(default,never) : String;
-	static var USER_TRIGGERED(default,never) : String;
+	static final CONTENT_TRIGGERED : String;
+	static final USER_TRIGGERED : String;
 }
diff --git a/std/flash/events/StageVideoAvailabilityEvent.hx b/std/flash/events/StageVideoAvailabilityEvent.hx
index 8a8c16800f01c4652e1ef9ead342dc1da42f5533..d2dd353d0eea82faca6c8c2a8682f515ea2fbcb3 100644
--- a/std/flash/events/StageVideoAvailabilityEvent.hx
+++ b/std/flash/events/StageVideoAvailabilityEvent.hx
@@ -1,9 +1,10 @@
 package flash.events;
 
 extern class StageVideoAvailabilityEvent extends Event {
-	var availability(default,never) : String;
-	var driver(default,never) : String;
-	var reason(default,never) : String;
+	@:flash.property var availability(get,never) : String;
+	final driver : String;
+	final reason : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?availability : String) : Void;
-	static var STAGE_VIDEO_AVAILABILITY(default,never) : String;
+	private function get_availability() : String;
+	static final STAGE_VIDEO_AVAILABILITY : String;
 }
diff --git a/std/flash/events/StageVideoEvent.hx b/std/flash/events/StageVideoEvent.hx
index 8df13c91d2abe2752c3151d8eac4d29381be81ba..e54f0e2bdd1ef45dba812a7fc086502cea911ea6 100644
--- a/std/flash/events/StageVideoEvent.hx
+++ b/std/flash/events/StageVideoEvent.hx
@@ -1,12 +1,14 @@
 package flash.events;
 
 @:require(flash10_2) extern class StageVideoEvent extends Event {
-	var codecInfo(default,never) : String;
-	var colorSpace(default,never) : String;
-	var status(default,never) : String;
+	final codecInfo : String;
+	@:flash.property var colorSpace(get,never) : String;
+	@:flash.property var status(get,never) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?status : String, ?colorSpace : String) : Void;
-	static var RENDER_STATE(default,never) : String;
-	static var RENDER_STATUS_ACCELERATED(default,never) : String;
-	static var RENDER_STATUS_SOFTWARE(default,never) : String;
-	static var RENDER_STATUS_UNAVAILABLE(default,never) : String;
+	private function get_colorSpace() : String;
+	private function get_status() : String;
+	static final RENDER_STATE : String;
+	static final RENDER_STATUS_ACCELERATED : String;
+	static final RENDER_STATUS_SOFTWARE : String;
+	static final RENDER_STATUS_UNAVAILABLE : String;
 }
diff --git a/std/flash/events/StatusEvent.hx b/std/flash/events/StatusEvent.hx
index fa06b59566e6ff893367545572c651bddb44fd99..9831bcf3d00c7d9b44ff2d5be8918ff1bb691890 100644
--- a/std/flash/events/StatusEvent.hx
+++ b/std/flash/events/StatusEvent.hx
@@ -1,8 +1,12 @@
 package flash.events;
 
 extern class StatusEvent extends Event {
-	var code : String;
-	var level : String;
+	@:flash.property var code(get,set) : String;
+	@:flash.property var level(get,set) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?code : String, ?level : String) : Void;
-	static var STATUS(default,never) : String;
+	private function get_code() : String;
+	private function get_level() : String;
+	private function set_code(value : String) : String;
+	private function set_level(value : String) : String;
+	static final STATUS : String;
 }
diff --git a/std/flash/events/SyncEvent.hx b/std/flash/events/SyncEvent.hx
index c519ab9f7958a58769d23029484d165f380b99cd..1d8718fc756a1e2c46df1c8d2c9081c5dd8a7a07 100644
--- a/std/flash/events/SyncEvent.hx
+++ b/std/flash/events/SyncEvent.hx
@@ -1,7 +1,9 @@
 package flash.events;
 
 extern class SyncEvent extends Event {
-	var changeList : Array<Dynamic>;
+	@:flash.property var changeList(get,set) : Array<Dynamic>;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?changeList : Array<Dynamic>) : Void;
-	static var SYNC(default,never) : String;
+	private function get_changeList() : Array<Dynamic>;
+	private function set_changeList(value : Array<Dynamic>) : Array<Dynamic>;
+	static final SYNC : String;
 }
diff --git a/std/flash/events/TextEvent.hx b/std/flash/events/TextEvent.hx
index fbaa1e36b0a5a7e50a63f65bf59988f378da95e2..d1194bb31477ff11ac78a7b945cf19d7c8f7820c 100644
--- a/std/flash/events/TextEvent.hx
+++ b/std/flash/events/TextEvent.hx
@@ -1,8 +1,10 @@
 package flash.events;
 
 extern class TextEvent extends Event {
-	var text : String;
+	@:flash.property var text(get,set) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?text : String) : Void;
-	static var LINK(default,never) : String;
-	static var TEXT_INPUT(default,never) : String;
+	private function get_text() : String;
+	private function set_text(value : String) : String;
+	static final LINK : String;
+	static final TEXT_INPUT : String;
 }
diff --git a/std/flash/events/ThrottleEvent.hx b/std/flash/events/ThrottleEvent.hx
index 8cf89a37a51f2480b3fc5afd0cf124ab9b1744d2..0eb973ee2121b27ac8b02805a2182ab82eb6b31b 100644
--- a/std/flash/events/ThrottleEvent.hx
+++ b/std/flash/events/ThrottleEvent.hx
@@ -1,8 +1,10 @@
 package flash.events;
 
 @:require(flash11_2) extern class ThrottleEvent extends Event {
-	var state(default,never) : String;
-	var targetFrameRate(default,never) : Float;
+	@:flash.property var state(get,never) : String;
+	@:flash.property var targetFrameRate(get,never) : Float;
 	function new(type : ThrottleType, bubbles : Bool = false, cancelable : Bool = false, ?state : String, targetFrameRate : Float = 0) : Void;
-	static var THROTTLE(default,never) : String;
+	private function get_state() : String;
+	private function get_targetFrameRate() : Float;
+	static final THROTTLE : String;
 }
diff --git a/std/flash/events/ThrottleType.hx b/std/flash/events/ThrottleType.hx
index 93c5e727a65e8852ecf9f8beb9d21256d837da38..6b57d0c6f715f3991f92081a828441ce591a98b8 100644
--- a/std/flash/events/ThrottleType.hx
+++ b/std/flash/events/ThrottleType.hx
@@ -1,7 +1,7 @@
 package flash.events;
 
-@:fakeEnum(String) extern enum ThrottleType {
-	PAUSE;
-	RESUME;
-	THROTTLE;
+@:native("flash.events.ThrottleType") extern enum abstract ThrottleType(String) {
+	var PAUSE;
+	var RESUME;
+	var THROTTLE;
 }
diff --git a/std/flash/events/TimerEvent.hx b/std/flash/events/TimerEvent.hx
index 3195b0faecbf64f1a730b1920eb7a3bdaedd967e..5ffc25b6e5faaff5a2e82ddd98459a462901b7d0 100644
--- a/std/flash/events/TimerEvent.hx
+++ b/std/flash/events/TimerEvent.hx
@@ -3,6 +3,6 @@ package flash.events;
 extern class TimerEvent extends Event {
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false) : Void;
 	function updateAfterEvent() : Void;
-	static var TIMER(default,never) : String;
-	static var TIMER_COMPLETE(default,never) : String;
+	static final TIMER : String;
+	static final TIMER_COMPLETE : String;
 }
diff --git a/std/flash/events/TouchEvent.hx b/std/flash/events/TouchEvent.hx
index 3b164614a8bd892a21d23b595decb880158c21c1..616c75bc865e08e577d3417fe5cfb7c7e41e9c22 100644
--- a/std/flash/events/TouchEvent.hx
+++ b/std/flash/events/TouchEvent.hx
@@ -1,35 +1,61 @@
 package flash.events;
 
 @:require(flash10_1) extern class TouchEvent extends Event {
-	var altKey : Bool;
-	var ctrlKey : Bool;
-	var isPrimaryTouchPoint : Bool;
-	var isRelatedObjectInaccessible : Bool;
-	var localX : Float;
-	var localY : Float;
-	var pressure : Float;
-	var relatedObject : flash.display.InteractiveObject;
-	var shiftKey : Bool;
-	var sizeX : Float;
-	var sizeY : Float;
-	var stageX(default,never) : Float;
-	var stageY(default,never) : Float;
-	var touchPointID : Int;
+	@:flash.property var altKey(get,set) : Bool;
+	@:flash.property var ctrlKey(get,set) : Bool;
+	@:flash.property var isPrimaryTouchPoint(get,set) : Bool;
+	@:flash.property var isRelatedObjectInaccessible(get,set) : Bool;
+	@:flash.property var localX(get,set) : Float;
+	@:flash.property var localY(get,set) : Float;
+	@:flash.property var pressure(get,set) : Float;
+	@:flash.property var relatedObject(get,set) : flash.display.InteractiveObject;
+	@:flash.property var shiftKey(get,set) : Bool;
+	@:flash.property var sizeX(get,set) : Float;
+	@:flash.property var sizeY(get,set) : Float;
+	@:flash.property var stageX(get,never) : Float;
+	@:flash.property var stageY(get,never) : Float;
+	@:flash.property var touchPointID(get,set) : Int;
 	function new(type : String, bubbles : Bool = true, cancelable : Bool = false, touchPointID : Int = 0, isPrimaryTouchPoint : Bool = false, localX : Float = 0./*NaN*/, localY : Float = 0./*NaN*/, sizeX : Float = 0./*NaN*/, sizeY : Float = 0./*NaN*/, pressure : Float = 0./*NaN*/, ?relatedObject : flash.display.InteractiveObject, ctrlKey : Bool = false, altKey : Bool = false, shiftKey : Bool = false) : Void;
+	private function get_altKey() : Bool;
+	private function get_ctrlKey() : Bool;
+	private function get_isPrimaryTouchPoint() : Bool;
+	private function get_isRelatedObjectInaccessible() : Bool;
+	private function get_localX() : Float;
+	private function get_localY() : Float;
+	private function get_pressure() : Float;
+	private function get_relatedObject() : flash.display.InteractiveObject;
+	private function get_shiftKey() : Bool;
+	private function get_sizeX() : Float;
+	private function get_sizeY() : Float;
+	private function get_stageX() : Float;
+	private function get_stageY() : Float;
+	private function get_touchPointID() : Int;
+	private function set_altKey(value : Bool) : Bool;
+	private function set_ctrlKey(value : Bool) : Bool;
+	private function set_isPrimaryTouchPoint(value : Bool) : Bool;
+	private function set_isRelatedObjectInaccessible(value : Bool) : Bool;
+	private function set_localX(value : Float) : Float;
+	private function set_localY(value : Float) : Float;
+	private function set_pressure(value : Float) : Float;
+	private function set_relatedObject(value : flash.display.InteractiveObject) : flash.display.InteractiveObject;
+	private function set_shiftKey(value : Bool) : Bool;
+	private function set_sizeX(value : Float) : Float;
+	private function set_sizeY(value : Float) : Float;
+	private function set_touchPointID(value : Int) : Int;
 	function updateAfterEvent() : Void;
-	static var PROXIMITY_BEGIN(default,never) : String;
-	static var PROXIMITY_END(default,never) : String;
-	static var PROXIMITY_MOVE(default,never) : String;
-	static var PROXIMITY_OUT(default,never) : String;
-	static var PROXIMITY_OVER(default,never) : String;
-	static var PROXIMITY_ROLL_OUT(default,never) : String;
-	static var PROXIMITY_ROLL_OVER(default,never) : String;
-	static var TOUCH_BEGIN(default,never) : String;
-	static var TOUCH_END(default,never) : String;
-	static var TOUCH_MOVE(default,never) : String;
-	static var TOUCH_OUT(default,never) : String;
-	static var TOUCH_OVER(default,never) : String;
-	static var TOUCH_ROLL_OUT(default,never) : String;
-	static var TOUCH_ROLL_OVER(default,never) : String;
-	static var TOUCH_TAP(default,never) : String;
+	static final PROXIMITY_BEGIN : String;
+	static final PROXIMITY_END : String;
+	static final PROXIMITY_MOVE : String;
+	static final PROXIMITY_OUT : String;
+	static final PROXIMITY_OVER : String;
+	static final PROXIMITY_ROLL_OUT : String;
+	static final PROXIMITY_ROLL_OVER : String;
+	static final TOUCH_BEGIN : String;
+	static final TOUCH_END : String;
+	static final TOUCH_MOVE : String;
+	static final TOUCH_OUT : String;
+	static final TOUCH_OVER : String;
+	static final TOUCH_ROLL_OUT : String;
+	static final TOUCH_ROLL_OVER : String;
+	static final TOUCH_TAP : String;
 }
diff --git a/std/flash/events/TransformGestureEvent.hx b/std/flash/events/TransformGestureEvent.hx
index 1aaf5542f1382d19345d68e65f136a86a8b28ab9..5345bb900a208703d7aa4319b9353670bc7101ee 100644
--- a/std/flash/events/TransformGestureEvent.hx
+++ b/std/flash/events/TransformGestureEvent.hx
@@ -1,14 +1,28 @@
 package flash.events;
 
 @:require(flash10_1) extern class TransformGestureEvent extends GestureEvent {
-	var offsetX : Float;
-	var offsetY : Float;
-	var rotation : Float;
-	var scaleX : Float;
-	var scaleY : Float;
+	@:flash.property var offsetX(get,set) : Float;
+	@:flash.property var offsetY(get,set) : Float;
+	@:flash.property var rotation(get,set) : Float;
+	@:flash.property var scaleX(get,set) : Float;
+	@:flash.property var scaleY(get,set) : Float;
+	@:flash.property var velocity(get,set) : Float;
 	function new(type : String, bubbles : Bool = true, cancelable : Bool = false, ?phase : String, localX : Float = 0, localY : Float = 0, scaleX : Float = 1, scaleY : Float = 1, rotation : Float = 0, offsetX : Float = 0, offsetY : Float = 0, ctrlKey : Bool = false, altKey : Bool = false, shiftKey : Bool = false) : Void;
-	static var GESTURE_PAN(default,never) : String;
-	static var GESTURE_ROTATE(default,never) : String;
-	static var GESTURE_SWIPE(default,never) : String;
-	static var GESTURE_ZOOM(default,never) : String;
+	private function get_offsetX() : Float;
+	private function get_offsetY() : Float;
+	private function get_rotation() : Float;
+	private function get_scaleX() : Float;
+	private function get_scaleY() : Float;
+	private function get_velocity() : Float;
+	private function set_offsetX(value : Float) : Float;
+	private function set_offsetY(value : Float) : Float;
+	private function set_rotation(value : Float) : Float;
+	private function set_scaleX(value : Float) : Float;
+	private function set_scaleY(value : Float) : Float;
+	private function set_velocity(value : Float) : Float;
+	static final GESTURE_DIRECTIONAL_TAP : String;
+	static final GESTURE_PAN : String;
+	static final GESTURE_ROTATE : String;
+	static final GESTURE_SWIPE : String;
+	static final GESTURE_ZOOM : String;
 }
diff --git a/std/flash/events/UncaughtErrorEvent.hx b/std/flash/events/UncaughtErrorEvent.hx
index 835d09283e56f22165794b3fd9f930a714da2dae..fb4a6cf431833fa40c33a0ace5e60051b9cb4d90 100644
--- a/std/flash/events/UncaughtErrorEvent.hx
+++ b/std/flash/events/UncaughtErrorEvent.hx
@@ -1,7 +1,8 @@
 package flash.events;
 
 @:require(flash10_1) extern class UncaughtErrorEvent extends ErrorEvent {
-	var error(default,never) : Dynamic;
+	@:flash.property var error(get,never) : Dynamic;
 	function new(?type : String, bubbles : Bool = true, cancelable : Bool = true, ?error_in : Dynamic) : Void;
-	static var UNCAUGHT_ERROR(default,never) : String;
+	private function get_error() : Dynamic;
+	static final UNCAUGHT_ERROR : String;
 }
diff --git a/std/flash/events/VideoEvent.hx b/std/flash/events/VideoEvent.hx
index 69b1d50a03b7e99fd302d42b662513d98eb40eb2..1760ae3e70a4c00f2286838e092b7494a1c73f2e 100644
--- a/std/flash/events/VideoEvent.hx
+++ b/std/flash/events/VideoEvent.hx
@@ -1,11 +1,12 @@
 package flash.events;
 
 @:require(flash10_2) extern class VideoEvent extends Event {
-	var codecInfo(default,never) : String;
-	var status(default,never) : String;
+	final codecInfo : String;
+	@:flash.property var status(get,never) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?status : String) : Void;
-	static var RENDER_STATE(default,never) : String;
-	static var RENDER_STATUS_ACCELERATED(default,never) : String;
-	static var RENDER_STATUS_SOFTWARE(default,never) : String;
-	static var RENDER_STATUS_UNAVAILABLE(default,never) : String;
+	private function get_status() : String;
+	static final RENDER_STATE : String;
+	static final RENDER_STATUS_ACCELERATED : String;
+	static final RENDER_STATUS_SOFTWARE : String;
+	static final RENDER_STATUS_UNAVAILABLE : String;
 }
diff --git a/std/flash/events/VideoTextureEvent.hx b/std/flash/events/VideoTextureEvent.hx
index c17657f8301822aceb4ffe4cb0093ef581d4ce9a..3551a49283752df9379bd89936dc8f93be42d827 100644
--- a/std/flash/events/VideoTextureEvent.hx
+++ b/std/flash/events/VideoTextureEvent.hx
@@ -1,9 +1,11 @@
 package flash.events;
 
 extern class VideoTextureEvent extends Event {
-	var codecInfo(default,never) : String;
-	var colorSpace(default,never) : String;
-	var status(default,never) : String;
+	final codecInfo : String;
+	@:flash.property var colorSpace(get,never) : String;
+	@:flash.property var status(get,never) : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?status : String, ?colorSpace : String) : Void;
-	static var RENDER_STATE(default,never) : String;
+	private function get_colorSpace() : String;
+	private function get_status() : String;
+	static final RENDER_STATE : String;
 }
diff --git a/std/flash/external/ExternalInterface.hx b/std/flash/external/ExternalInterface.hx
index 052a7372ac31c8a174c5fd1cd1ed6172af6deb9a..f408318c9aed6056d44cde4d79632d0fdbbc8da1 100644
--- a/std/flash/external/ExternalInterface.hx
+++ b/std/flash/external/ExternalInterface.hx
@@ -1,9 +1,11 @@
 package flash.external;
 
 extern class ExternalInterface {
-	static var available(default,never) : Bool;
+	@:flash.property static var available(get,never) : Bool;
 	static var marshallExceptions : Bool;
-	static var objectID(default,never) : String;
+	@:flash.property static var objectID(get,never) : String;
 	static function addCallback(functionName : String, closure : Dynamic) : Void;
-	static function call(functionName : String, ?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Dynamic;
+	static function call(functionName : String, restArgs : haxe.extern.Rest<Dynamic>) : Dynamic;
+	private static function get_available() : Bool;
+	private static function get_objectID() : String;
 }
diff --git a/std/flash/filters/BevelFilter.hx b/std/flash/filters/BevelFilter.hx
index 73c29764bae334758f65a5e9b0df71acc4dde588..e6a0b14b7cf90181a5b569aeec5c5af4d6cb9646 100644
--- a/std/flash/filters/BevelFilter.hx
+++ b/std/flash/filters/BevelFilter.hx
@@ -1,17 +1,41 @@
 package flash.filters;
 
-@:final extern class BevelFilter extends BitmapFilter {
-	var angle : Float;
-	var blurX : Float;
-	var blurY : Float;
-	var distance : Float;
-	var highlightAlpha : Float;
-	var highlightColor : UInt;
-	var knockout : Bool;
-	var quality : Int;
-	var shadowAlpha : Float;
-	var shadowColor : UInt;
-	var strength : Float;
-	var type : BitmapFilterType;
+extern final class BevelFilter extends BitmapFilter {
+	@:flash.property var angle(get,set) : Float;
+	@:flash.property var blurX(get,set) : Float;
+	@:flash.property var blurY(get,set) : Float;
+	@:flash.property var distance(get,set) : Float;
+	@:flash.property var highlightAlpha(get,set) : Float;
+	@:flash.property var highlightColor(get,set) : UInt;
+	@:flash.property var knockout(get,set) : Bool;
+	@:flash.property var quality(get,set) : Int;
+	@:flash.property var shadowAlpha(get,set) : Float;
+	@:flash.property var shadowColor(get,set) : UInt;
+	@:flash.property var strength(get,set) : Float;
+	@:flash.property var type(get,set) : BitmapFilterType;
 	function new(distance : Float = 4, angle : Float = 45, highlightColor : UInt = 0xFFFFFF, highlightAlpha : Float = 1, shadowColor : UInt = 0, shadowAlpha : Float = 1, blurX : Float = 4, blurY : Float = 4, strength : Float = 1, quality : Int = 1, ?type : BitmapFilterType, knockout : Bool = false) : Void;
+	private function get_angle() : Float;
+	private function get_blurX() : Float;
+	private function get_blurY() : Float;
+	private function get_distance() : Float;
+	private function get_highlightAlpha() : Float;
+	private function get_highlightColor() : UInt;
+	private function get_knockout() : Bool;
+	private function get_quality() : Int;
+	private function get_shadowAlpha() : Float;
+	private function get_shadowColor() : UInt;
+	private function get_strength() : Float;
+	private function get_type() : BitmapFilterType;
+	private function set_angle(value : Float) : Float;
+	private function set_blurX(value : Float) : Float;
+	private function set_blurY(value : Float) : Float;
+	private function set_distance(value : Float) : Float;
+	private function set_highlightAlpha(value : Float) : Float;
+	private function set_highlightColor(value : UInt) : UInt;
+	private function set_knockout(value : Bool) : Bool;
+	private function set_quality(value : Int) : Int;
+	private function set_shadowAlpha(value : Float) : Float;
+	private function set_shadowColor(value : UInt) : UInt;
+	private function set_strength(value : Float) : Float;
+	private function set_type(value : BitmapFilterType) : BitmapFilterType;
 }
diff --git a/std/flash/filters/BitmapFilterType.hx b/std/flash/filters/BitmapFilterType.hx
index deab80c8b4693fa39b7f620f256035663759c73d..ea45f124de9911b791437e1fa897c7b68a04cdef 100644
--- a/std/flash/filters/BitmapFilterType.hx
+++ b/std/flash/filters/BitmapFilterType.hx
@@ -1,7 +1,7 @@
 package flash.filters;
 
-@:fakeEnum(String) extern enum BitmapFilterType {
-	FULL;
-	INNER;
-	OUTER;
+@:native("flash.filters.BitmapFilterType") extern enum abstract BitmapFilterType(String) {
+	var FULL;
+	var INNER;
+	var OUTER;
 }
diff --git a/std/flash/filters/BlurFilter.hx b/std/flash/filters/BlurFilter.hx
index ea9c425469618e50b9df4e82ff9f906d90ee40ce..a1062915731ab31c9f27ec6998b2fba3d3cb516d 100644
--- a/std/flash/filters/BlurFilter.hx
+++ b/std/flash/filters/BlurFilter.hx
@@ -1,8 +1,14 @@
 package flash.filters;
 
-@:final extern class BlurFilter extends BitmapFilter {
-	var blurX : Float;
-	var blurY : Float;
-	var quality : Int;
+extern final class BlurFilter extends BitmapFilter {
+	@:flash.property var blurX(get,set) : Float;
+	@:flash.property var blurY(get,set) : Float;
+	@:flash.property var quality(get,set) : Int;
 	function new(blurX : Float = 4, blurY : Float = 4, quality : Int = 1) : Void;
+	private function get_blurX() : Float;
+	private function get_blurY() : Float;
+	private function get_quality() : Int;
+	private function set_blurX(value : Float) : Float;
+	private function set_blurY(value : Float) : Float;
+	private function set_quality(value : Int) : Int;
 }
diff --git a/std/flash/filters/ColorMatrixFilter.hx b/std/flash/filters/ColorMatrixFilter.hx
index c72e403ce462c3fff9692b3a19e4884201a342fd..050b334fb22b9d40f30fc97af59f1d7b8374c1ee 100644
--- a/std/flash/filters/ColorMatrixFilter.hx
+++ b/std/flash/filters/ColorMatrixFilter.hx
@@ -1,6 +1,8 @@
 package flash.filters;
 
-@:final extern class ColorMatrixFilter extends BitmapFilter {
-	var matrix : Array<Dynamic>;
+extern final class ColorMatrixFilter extends BitmapFilter {
+	@:flash.property var matrix(get,set) : Array<Dynamic>;
 	function new(?matrix : Array<Dynamic>) : Void;
+	private function get_matrix() : Array<Dynamic>;
+	private function set_matrix(value : Array<Dynamic>) : Array<Dynamic>;
 }
diff --git a/std/flash/filters/ConvolutionFilter.hx b/std/flash/filters/ConvolutionFilter.hx
index 18cbc74a7a08b4776afd0aea8d625c8a40b6b122..1411d52e2e3bd7dc89f7eaad41e197807a8dc836 100644
--- a/std/flash/filters/ConvolutionFilter.hx
+++ b/std/flash/filters/ConvolutionFilter.hx
@@ -1,14 +1,32 @@
 package flash.filters;
 
 extern class ConvolutionFilter extends BitmapFilter {
-	var alpha : Float;
-	var bias : Float;
-	var clamp : Bool;
-	var color : UInt;
-	var divisor : Float;
-	var matrix : Array<Dynamic>;
-	var matrixX : Float;
-	var matrixY : Float;
-	var preserveAlpha : Bool;
+	@:flash.property var alpha(get,set) : Float;
+	@:flash.property var bias(get,set) : Float;
+	@:flash.property var clamp(get,set) : Bool;
+	@:flash.property var color(get,set) : UInt;
+	@:flash.property var divisor(get,set) : Float;
+	@:flash.property var matrix(get,set) : Array<Dynamic>;
+	@:flash.property var matrixX(get,set) : Float;
+	@:flash.property var matrixY(get,set) : Float;
+	@:flash.property var preserveAlpha(get,set) : Bool;
 	function new(matrixX : Float = 0, matrixY : Float = 0, ?matrix : Array<Dynamic>, divisor : Float = 1, bias : Float = 0, preserveAlpha : Bool = true, clamp : Bool = true, color : UInt = 0, alpha : Float = 0) : Void;
+	private function get_alpha() : Float;
+	private function get_bias() : Float;
+	private function get_clamp() : Bool;
+	private function get_color() : UInt;
+	private function get_divisor() : Float;
+	private function get_matrix() : Array<Dynamic>;
+	private function get_matrixX() : Float;
+	private function get_matrixY() : Float;
+	private function get_preserveAlpha() : Bool;
+	private function set_alpha(value : Float) : Float;
+	private function set_bias(value : Float) : Float;
+	private function set_clamp(value : Bool) : Bool;
+	private function set_color(value : UInt) : UInt;
+	private function set_divisor(value : Float) : Float;
+	private function set_matrix(value : Array<Dynamic>) : Array<Dynamic>;
+	private function set_matrixX(value : Float) : Float;
+	private function set_matrixY(value : Float) : Float;
+	private function set_preserveAlpha(value : Bool) : Bool;
 }
diff --git a/std/flash/filters/DisplacementMapFilter.hx b/std/flash/filters/DisplacementMapFilter.hx
index 3dff32c47d6f2889cfb356c83773f79bb524bbd8..4eb2a241c4ae00699ae709a131bfbd28ba3ac1eb 100644
--- a/std/flash/filters/DisplacementMapFilter.hx
+++ b/std/flash/filters/DisplacementMapFilter.hx
@@ -1,14 +1,32 @@
 package flash.filters;
 
-@:final extern class DisplacementMapFilter extends BitmapFilter {
-	var alpha : Float;
-	var color : UInt;
-	var componentX : UInt;
-	var componentY : UInt;
-	var mapBitmap : flash.display.BitmapData;
-	var mapPoint : flash.geom.Point;
-	var mode : DisplacementMapFilterMode;
-	var scaleX : Float;
-	var scaleY : Float;
+extern final class DisplacementMapFilter extends BitmapFilter {
+	@:flash.property var alpha(get,set) : Float;
+	@:flash.property var color(get,set) : UInt;
+	@:flash.property var componentX(get,set) : UInt;
+	@:flash.property var componentY(get,set) : UInt;
+	@:flash.property var mapBitmap(get,set) : flash.display.BitmapData;
+	@:flash.property var mapPoint(get,set) : flash.geom.Point;
+	@:flash.property var mode(get,set) : DisplacementMapFilterMode;
+	@:flash.property var scaleX(get,set) : Float;
+	@:flash.property var scaleY(get,set) : Float;
 	function new(?mapBitmap : flash.display.BitmapData, ?mapPoint : flash.geom.Point, componentX : UInt = 0, componentY : UInt = 0, scaleX : Float = 0, scaleY : Float = 0, ?mode : DisplacementMapFilterMode, color : UInt = 0, alpha : Float = 0) : Void;
+	private function get_alpha() : Float;
+	private function get_color() : UInt;
+	private function get_componentX() : UInt;
+	private function get_componentY() : UInt;
+	private function get_mapBitmap() : flash.display.BitmapData;
+	private function get_mapPoint() : flash.geom.Point;
+	private function get_mode() : DisplacementMapFilterMode;
+	private function get_scaleX() : Float;
+	private function get_scaleY() : Float;
+	private function set_alpha(value : Float) : Float;
+	private function set_color(value : UInt) : UInt;
+	private function set_componentX(value : UInt) : UInt;
+	private function set_componentY(value : UInt) : UInt;
+	private function set_mapBitmap(value : flash.display.BitmapData) : flash.display.BitmapData;
+	private function set_mapPoint(value : flash.geom.Point) : flash.geom.Point;
+	private function set_mode(value : DisplacementMapFilterMode) : DisplacementMapFilterMode;
+	private function set_scaleX(value : Float) : Float;
+	private function set_scaleY(value : Float) : Float;
 }
diff --git a/std/flash/filters/DisplacementMapFilterMode.hx b/std/flash/filters/DisplacementMapFilterMode.hx
index 25710adc3910f1398b70b53f9f952a02c0b1d00a..59a160309087cb393497ae372b835db5e7384915 100644
--- a/std/flash/filters/DisplacementMapFilterMode.hx
+++ b/std/flash/filters/DisplacementMapFilterMode.hx
@@ -1,8 +1,8 @@
 package flash.filters;
 
-@:fakeEnum(String) extern enum DisplacementMapFilterMode {
-	CLAMP;
-	COLOR;
-	IGNORE;
-	WRAP;
+@:native("flash.filters.DisplacementMapFilterMode") extern enum abstract DisplacementMapFilterMode(String) {
+	var CLAMP;
+	var COLOR;
+	var IGNORE;
+	var WRAP;
 }
diff --git a/std/flash/filters/DropShadowFilter.hx b/std/flash/filters/DropShadowFilter.hx
index be103ca25cebbe48f8414b14bc16a934869f8353..462164c58c3aaabfbc705580693efbd53737d68d 100644
--- a/std/flash/filters/DropShadowFilter.hx
+++ b/std/flash/filters/DropShadowFilter.hx
@@ -1,16 +1,38 @@
 package flash.filters;
 
-@:final extern class DropShadowFilter extends BitmapFilter {
-	var alpha : Float;
-	var angle : Float;
-	var blurX : Float;
-	var blurY : Float;
-	var color : UInt;
-	var distance : Float;
-	var hideObject : Bool;
-	var inner : Bool;
-	var knockout : Bool;
-	var quality : Int;
-	var strength : Float;
+extern final class DropShadowFilter extends BitmapFilter {
+	@:flash.property var alpha(get,set) : Float;
+	@:flash.property var angle(get,set) : Float;
+	@:flash.property var blurX(get,set) : Float;
+	@:flash.property var blurY(get,set) : Float;
+	@:flash.property var color(get,set) : UInt;
+	@:flash.property var distance(get,set) : Float;
+	@:flash.property var hideObject(get,set) : Bool;
+	@:flash.property var inner(get,set) : Bool;
+	@:flash.property var knockout(get,set) : Bool;
+	@:flash.property var quality(get,set) : Int;
+	@:flash.property var strength(get,set) : Float;
 	function new(distance : Float = 4, angle : Float = 45, color : UInt = 0, alpha : Float = 1, blurX : Float = 4, blurY : Float = 4, strength : Float = 1, quality : Int = 1, inner : Bool = false, knockout : Bool = false, hideObject : Bool = false) : Void;
+	private function get_alpha() : Float;
+	private function get_angle() : Float;
+	private function get_blurX() : Float;
+	private function get_blurY() : Float;
+	private function get_color() : UInt;
+	private function get_distance() : Float;
+	private function get_hideObject() : Bool;
+	private function get_inner() : Bool;
+	private function get_knockout() : Bool;
+	private function get_quality() : Int;
+	private function get_strength() : Float;
+	private function set_alpha(value : Float) : Float;
+	private function set_angle(value : Float) : Float;
+	private function set_blurX(value : Float) : Float;
+	private function set_blurY(value : Float) : Float;
+	private function set_color(value : UInt) : UInt;
+	private function set_distance(value : Float) : Float;
+	private function set_hideObject(value : Bool) : Bool;
+	private function set_inner(value : Bool) : Bool;
+	private function set_knockout(value : Bool) : Bool;
+	private function set_quality(value : Int) : Int;
+	private function set_strength(value : Float) : Float;
 }
diff --git a/std/flash/filters/GlowFilter.hx b/std/flash/filters/GlowFilter.hx
index de5fc007e90035d411bf7c6d71abe35f1a99fce3..440c4c506213d014bad9b6a2b9c1b2cef2947770 100644
--- a/std/flash/filters/GlowFilter.hx
+++ b/std/flash/filters/GlowFilter.hx
@@ -1,13 +1,29 @@
 package flash.filters;
 
-@:final extern class GlowFilter extends BitmapFilter {
-	var alpha : Float;
-	var blurX : Float;
-	var blurY : Float;
-	var color : UInt;
-	var inner : Bool;
-	var knockout : Bool;
-	var quality : Int;
-	var strength : Float;
+extern final class GlowFilter extends BitmapFilter {
+	@:flash.property var alpha(get,set) : Float;
+	@:flash.property var blurX(get,set) : Float;
+	@:flash.property var blurY(get,set) : Float;
+	@:flash.property var color(get,set) : UInt;
+	@:flash.property var inner(get,set) : Bool;
+	@:flash.property var knockout(get,set) : Bool;
+	@:flash.property var quality(get,set) : Int;
+	@:flash.property var strength(get,set) : Float;
 	function new(color : UInt = 16711680, alpha : Float = 1, blurX : Float = 6, blurY : Float = 6, strength : Float = 2, quality : Int = 1, inner : Bool = false, knockout : Bool = false) : Void;
+	private function get_alpha() : Float;
+	private function get_blurX() : Float;
+	private function get_blurY() : Float;
+	private function get_color() : UInt;
+	private function get_inner() : Bool;
+	private function get_knockout() : Bool;
+	private function get_quality() : Int;
+	private function get_strength() : Float;
+	private function set_alpha(value : Float) : Float;
+	private function set_blurX(value : Float) : Float;
+	private function set_blurY(value : Float) : Float;
+	private function set_color(value : UInt) : UInt;
+	private function set_inner(value : Bool) : Bool;
+	private function set_knockout(value : Bool) : Bool;
+	private function set_quality(value : Int) : Int;
+	private function set_strength(value : Float) : Float;
 }
diff --git a/std/flash/filters/GradientBevelFilter.hx b/std/flash/filters/GradientBevelFilter.hx
index c04663e4cb8993970c4b5817d7662c30cf752df9..93ee39e48186bf0282e1fc08b865d7a699457238 100644
--- a/std/flash/filters/GradientBevelFilter.hx
+++ b/std/flash/filters/GradientBevelFilter.hx
@@ -1,16 +1,38 @@
 package flash.filters;
 
-@:final extern class GradientBevelFilter extends BitmapFilter {
-	var alphas : Array<Dynamic>;
-	var angle : Float;
-	var blurX : Float;
-	var blurY : Float;
-	var colors : Array<Dynamic>;
-	var distance : Float;
-	var knockout : Bool;
-	var quality : Int;
-	var ratios : Array<Dynamic>;
-	var strength : Float;
-	var type : String;
+extern final class GradientBevelFilter extends BitmapFilter {
+	@:flash.property var alphas(get,set) : Array<Dynamic>;
+	@:flash.property var angle(get,set) : Float;
+	@:flash.property var blurX(get,set) : Float;
+	@:flash.property var blurY(get,set) : Float;
+	@:flash.property var colors(get,set) : Array<Dynamic>;
+	@:flash.property var distance(get,set) : Float;
+	@:flash.property var knockout(get,set) : Bool;
+	@:flash.property var quality(get,set) : Int;
+	@:flash.property var ratios(get,set) : Array<Dynamic>;
+	@:flash.property var strength(get,set) : Float;
+	@:flash.property var type(get,set) : String;
 	function new(distance : Float = 4, angle : Float = 45, ?colors : Array<Dynamic>, ?alphas : Array<Dynamic>, ?ratios : Array<Dynamic>, blurX : Float = 4, blurY : Float = 4, strength : Float = 1, quality : Int = 1, ?type : String, knockout : Bool = false) : Void;
+	private function get_alphas() : Array<Dynamic>;
+	private function get_angle() : Float;
+	private function get_blurX() : Float;
+	private function get_blurY() : Float;
+	private function get_colors() : Array<Dynamic>;
+	private function get_distance() : Float;
+	private function get_knockout() : Bool;
+	private function get_quality() : Int;
+	private function get_ratios() : Array<Dynamic>;
+	private function get_strength() : Float;
+	private function get_type() : String;
+	private function set_alphas(value : Array<Dynamic>) : Array<Dynamic>;
+	private function set_angle(value : Float) : Float;
+	private function set_blurX(value : Float) : Float;
+	private function set_blurY(value : Float) : Float;
+	private function set_colors(value : Array<Dynamic>) : Array<Dynamic>;
+	private function set_distance(value : Float) : Float;
+	private function set_knockout(value : Bool) : Bool;
+	private function set_quality(value : Int) : Int;
+	private function set_ratios(value : Array<Dynamic>) : Array<Dynamic>;
+	private function set_strength(value : Float) : Float;
+	private function set_type(value : String) : String;
 }
diff --git a/std/flash/filters/GradientGlowFilter.hx b/std/flash/filters/GradientGlowFilter.hx
index 4f40b37a2cbfa9bd3bff9c48f33fa57f4fe0c1ad..74be7360bebafc7380de4ca41f2b4eb2f7f9c1b9 100644
--- a/std/flash/filters/GradientGlowFilter.hx
+++ b/std/flash/filters/GradientGlowFilter.hx
@@ -1,16 +1,38 @@
 package flash.filters;
 
-@:final extern class GradientGlowFilter extends BitmapFilter {
-	var alphas : Array<Dynamic>;
-	var angle : Float;
-	var blurX : Float;
-	var blurY : Float;
-	var colors : Array<Dynamic>;
-	var distance : Float;
-	var knockout : Bool;
-	var quality : Int;
-	var ratios : Array<Dynamic>;
-	var strength : Float;
-	var type : BitmapFilterType;
+extern final class GradientGlowFilter extends BitmapFilter {
+	@:flash.property var alphas(get,set) : Array<Dynamic>;
+	@:flash.property var angle(get,set) : Float;
+	@:flash.property var blurX(get,set) : Float;
+	@:flash.property var blurY(get,set) : Float;
+	@:flash.property var colors(get,set) : Array<Dynamic>;
+	@:flash.property var distance(get,set) : Float;
+	@:flash.property var knockout(get,set) : Bool;
+	@:flash.property var quality(get,set) : Int;
+	@:flash.property var ratios(get,set) : Array<Dynamic>;
+	@:flash.property var strength(get,set) : Float;
+	@:flash.property var type(get,set) : BitmapFilterType;
 	function new(distance : Float = 4, angle : Float = 45, ?colors : Array<Dynamic>, ?alphas : Array<Dynamic>, ?ratios : Array<Dynamic>, blurX : Float = 4, blurY : Float = 4, strength : Float = 1, quality : Int = 1, ?type : BitmapFilterType, knockout : Bool = false) : Void;
+	private function get_alphas() : Array<Dynamic>;
+	private function get_angle() : Float;
+	private function get_blurX() : Float;
+	private function get_blurY() : Float;
+	private function get_colors() : Array<Dynamic>;
+	private function get_distance() : Float;
+	private function get_knockout() : Bool;
+	private function get_quality() : Int;
+	private function get_ratios() : Array<Dynamic>;
+	private function get_strength() : Float;
+	private function get_type() : BitmapFilterType;
+	private function set_alphas(value : Array<Dynamic>) : Array<Dynamic>;
+	private function set_angle(value : Float) : Float;
+	private function set_blurX(value : Float) : Float;
+	private function set_blurY(value : Float) : Float;
+	private function set_colors(value : Array<Dynamic>) : Array<Dynamic>;
+	private function set_distance(value : Float) : Float;
+	private function set_knockout(value : Bool) : Bool;
+	private function set_quality(value : Int) : Int;
+	private function set_ratios(value : Array<Dynamic>) : Array<Dynamic>;
+	private function set_strength(value : Float) : Float;
+	private function set_type(value : BitmapFilterType) : BitmapFilterType;
 }
diff --git a/std/flash/filters/ShaderFilter.hx b/std/flash/filters/ShaderFilter.hx
index f4a91640f62f2860f996326407e563007b884a43..e58a0de07bf39de903ea70429bec3e96fee29ecc 100644
--- a/std/flash/filters/ShaderFilter.hx
+++ b/std/flash/filters/ShaderFilter.hx
@@ -1,10 +1,20 @@
 package flash.filters;
 
 extern class ShaderFilter extends BitmapFilter {
-	var bottomExtension : Int;
-	var leftExtension : Int;
-	var rightExtension : Int;
-	var shader : flash.display.Shader;
-	var topExtension : Int;
+	@:flash.property var bottomExtension(get,set) : Int;
+	@:flash.property var leftExtension(get,set) : Int;
+	@:flash.property var rightExtension(get,set) : Int;
+	@:flash.property var shader(get,set) : flash.display.Shader;
+	@:flash.property var topExtension(get,set) : Int;
 	function new(?shader : flash.display.Shader) : Void;
+	private function get_bottomExtension() : Int;
+	private function get_leftExtension() : Int;
+	private function get_rightExtension() : Int;
+	private function get_shader() : flash.display.Shader;
+	private function get_topExtension() : Int;
+	private function set_bottomExtension(value : Int) : Int;
+	private function set_leftExtension(value : Int) : Int;
+	private function set_rightExtension(value : Int) : Int;
+	private function set_shader(value : flash.display.Shader) : flash.display.Shader;
+	private function set_topExtension(value : Int) : Int;
 }
diff --git a/std/flash/geom/ColorTransform.hx b/std/flash/geom/ColorTransform.hx
index d320be9c54cddd0c7f9e524b10ae0c8528f97db2..ef85afd6c61e37112304f21de6ee73d72c11e351 100644
--- a/std/flash/geom/ColorTransform.hx
+++ b/std/flash/geom/ColorTransform.hx
@@ -5,12 +5,14 @@ extern class ColorTransform {
 	var alphaOffset : Float;
 	var blueMultiplier : Float;
 	var blueOffset : Float;
-	var color : UInt;
+	@:flash.property var color(get,set) : UInt;
 	var greenMultiplier : Float;
 	var greenOffset : Float;
 	var redMultiplier : Float;
 	var redOffset : Float;
 	function new(redMultiplier : Float = 1, greenMultiplier : Float = 1, blueMultiplier : Float = 1, alphaMultiplier : Float = 1, redOffset : Float = 0, greenOffset : Float = 0, blueOffset : Float = 0, alphaOffset : Float = 0) : Void;
 	function concat(second : ColorTransform) : Void;
+	private function get_color() : UInt;
+	private function set_color(value : UInt) : UInt;
 	function toString() : String;
 }
diff --git a/std/flash/geom/Matrix3D.hx b/std/flash/geom/Matrix3D.hx
index 3f7bab6e53baec80acd2440a21bf2ba320b897db..2e1e15d7fa84429841bf0b761214767120e40c5e 100644
--- a/std/flash/geom/Matrix3D.hx
+++ b/std/flash/geom/Matrix3D.hx
@@ -1,9 +1,9 @@
 package flash.geom;
 
 @:require(flash10) extern class Matrix3D {
-	var determinant(default,never) : Float;
-	var position : Vector3D;
-	var rawData : flash.Vector<Float>;
+	@:flash.property var determinant(get,never) : Float;
+	@:flash.property var position(get,set) : Vector3D;
+	@:flash.property var rawData(get,set) : flash.Vector<Float>;
 	function new(?v : flash.Vector<Float>) : Void;
 	function append(lhs : Matrix3D) : Void;
 	function appendRotation(degrees : Float, axis : Vector3D, ?pivotPoint : Vector3D) : Void;
@@ -20,6 +20,9 @@ package flash.geom;
 	@:require(flash11) function copyToMatrix3D(dest : Matrix3D) : Void;
 	function decompose(?orientationStyle : Orientation3D) : flash.Vector<Vector3D>;
 	function deltaTransformVector(v : Vector3D) : Vector3D;
+	private function get_determinant() : Float;
+	private function get_position() : Vector3D;
+	private function get_rawData() : flash.Vector<Float>;
 	function identity() : Void;
 	function interpolateTo(toMat : Matrix3D, percent : Float) : Void;
 	function invert() : Bool;
@@ -29,6 +32,8 @@ package flash.geom;
 	function prependScale(xScale : Float, yScale : Float, zScale : Float) : Void;
 	function prependTranslation(x : Float, y : Float, z : Float) : Void;
 	function recompose(components : flash.Vector<Vector3D>, ?orientationStyle : Orientation3D) : Bool;
+	private function set_position(value : Vector3D) : Vector3D;
+	private function set_rawData(value : flash.Vector<Float>) : flash.Vector<Float>;
 	function transformVector(v : Vector3D) : Vector3D;
 	function transformVectors(vin : flash.Vector<Float>, vout : flash.Vector<Float>) : Void;
 	function transpose() : Void;
diff --git a/std/flash/geom/Orientation3D.hx b/std/flash/geom/Orientation3D.hx
index 01cf205851a11ed3ce919e5a46afdff6dfc11dd2..f0df04b5471e265925456d1550c603775d830f07 100644
--- a/std/flash/geom/Orientation3D.hx
+++ b/std/flash/geom/Orientation3D.hx
@@ -1,7 +1,7 @@
 package flash.geom;
 
-@:fakeEnum(String) extern enum Orientation3D {
-	AXIS_ANGLE;
-	EULER_ANGLES;
-	QUATERNION;
+@:native("flash.geom.Orientation3D") extern enum abstract Orientation3D(String) {
+	var AXIS_ANGLE;
+	var EULER_ANGLES;
+	var QUATERNION;
 }
diff --git a/std/flash/geom/PerspectiveProjection.hx b/std/flash/geom/PerspectiveProjection.hx
index 3051df818a7e65d8eeb36ecfc89f97f31ebfdb2c..c5a6259c79196fb0ed84528db7f1bde8bc70b66a 100644
--- a/std/flash/geom/PerspectiveProjection.hx
+++ b/std/flash/geom/PerspectiveProjection.hx
@@ -1,9 +1,15 @@
 package flash.geom;
 
 @:require(flash10) extern class PerspectiveProjection {
-	var fieldOfView : Float;
-	var focalLength : Float;
-	var projectionCenter : Point;
+	@:flash.property var fieldOfView(get,set) : Float;
+	@:flash.property var focalLength(get,set) : Float;
+	@:flash.property var projectionCenter(get,set) : Point;
 	function new() : Void;
+	private function get_fieldOfView() : Float;
+	private function get_focalLength() : Float;
+	private function get_projectionCenter() : Point;
+	private function set_fieldOfView(value : Float) : Float;
+	private function set_focalLength(value : Float) : Float;
+	private function set_projectionCenter(value : Point) : Point;
 	function toMatrix3D() : Matrix3D;
 }
diff --git a/std/flash/geom/Point.hx b/std/flash/geom/Point.hx
index 1396b7fe8f1612ffb0c2dd27569c2be7184aed1e..7c96a2a1b619afc09d5a6b5daab36debb9f0ec4b 100644
--- a/std/flash/geom/Point.hx
+++ b/std/flash/geom/Point.hx
@@ -1,7 +1,7 @@
 package flash.geom;
 
 extern class Point {
-	var length(default,never) : Float;
+	@:flash.property var length(get,never) : Float;
 	var x : Float;
 	var y : Float;
 	function new(x : Float = 0, y : Float = 0) : Void;
@@ -9,6 +9,7 @@ extern class Point {
 	function clone() : Point;
 	@:require(flash11) function copyFrom(sourcePoint : Point) : Void;
 	function equals(toCompare : Point) : Bool;
+	private function get_length() : Float;
 	function normalize(thickness : Float) : Void;
 	function offset(dx : Float, dy : Float) : Void;
 	@:require(flash11) function setTo(xa : Float, ya : Float) : Void;
diff --git a/std/flash/geom/Rectangle.hx b/std/flash/geom/Rectangle.hx
index 7e09bcfcc05823aef1455bf34e418270460be11f..9f21bd75b23a662dfa41ffd68b08062b25b0e29a 100644
--- a/std/flash/geom/Rectangle.hx
+++ b/std/flash/geom/Rectangle.hx
@@ -1,14 +1,14 @@
 package flash.geom;
 
 extern class Rectangle {
-	var bottom : Float;
-	var bottomRight : Point;
+	@:flash.property var bottom(get,set) : Float;
+	@:flash.property var bottomRight(get,set) : Point;
 	var height : Float;
-	var left : Float;
-	var right : Float;
-	var size : Point;
-	var top : Float;
-	var topLeft : Point;
+	@:flash.property var left(get,set) : Float;
+	@:flash.property var right(get,set) : Float;
+	@:flash.property var size(get,set) : Point;
+	@:flash.property var top(get,set) : Float;
+	@:flash.property var topLeft(get,set) : Point;
 	var width : Float;
 	var x : Float;
 	var y : Float;
@@ -19,6 +19,13 @@ extern class Rectangle {
 	function containsRect(rect : Rectangle) : Bool;
 	@:require(flash11) function copyFrom(sourceRect : Rectangle) : Void;
 	function equals(toCompare : Rectangle) : Bool;
+	private function get_bottom() : Float;
+	private function get_bottomRight() : Point;
+	private function get_left() : Float;
+	private function get_right() : Float;
+	private function get_size() : Point;
+	private function get_top() : Float;
+	private function get_topLeft() : Point;
 	function inflate(dx : Float, dy : Float) : Void;
 	function inflatePoint(point : Point) : Void;
 	function intersection(toIntersect : Rectangle) : Rectangle;
@@ -28,6 +35,13 @@ extern class Rectangle {
 	function offsetPoint(point : Point) : Void;
 	function setEmpty() : Void;
 	@:require(flash11) function setTo(xa : Float, ya : Float, widtha : Float, heighta : Float) : Void;
+	private function set_bottom(value : Float) : Float;
+	private function set_bottomRight(value : Point) : Point;
+	private function set_left(value : Float) : Float;
+	private function set_right(value : Float) : Float;
+	private function set_size(value : Point) : Point;
+	private function set_top(value : Float) : Float;
+	private function set_topLeft(value : Point) : Point;
 	function toString() : String;
 	function union(toUnion : Rectangle) : Rectangle;
 }
diff --git a/std/flash/geom/Transform.hx b/std/flash/geom/Transform.hx
index 13f3c4400286fedb9cbd85850fa2bc78c1f5fe7b..dcd93fd271c101c0f3e858750eeaaeec05358ae7 100644
--- a/std/flash/geom/Transform.hx
+++ b/std/flash/geom/Transform.hx
@@ -1,13 +1,24 @@
 package flash.geom;
 
 extern class Transform {
-	var colorTransform : ColorTransform;
-	var concatenatedColorTransform(default,never) : ColorTransform;
-	var concatenatedMatrix(default,never) : Matrix;
-	var matrix : Matrix;
-	@:require(flash10) var matrix3D : Matrix3D;
-	@:require(flash10) var perspectiveProjection : PerspectiveProjection;
-	var pixelBounds(default,never) : Rectangle;
+	@:flash.property var colorTransform(get,set) : ColorTransform;
+	@:flash.property var concatenatedColorTransform(get,never) : ColorTransform;
+	@:flash.property var concatenatedMatrix(get,never) : Matrix;
+	@:flash.property var matrix(get,set) : Matrix;
+	@:flash.property @:require(flash10) var matrix3D(get,set) : Matrix3D;
+	@:flash.property @:require(flash10) var perspectiveProjection(get,set) : PerspectiveProjection;
+	@:flash.property var pixelBounds(get,never) : Rectangle;
 	function new(displayObject : flash.display.DisplayObject) : Void;
 	@:require(flash10) function getRelativeMatrix3D(relativeTo : flash.display.DisplayObject) : Matrix3D;
+	private function get_colorTransform() : ColorTransform;
+	private function get_concatenatedColorTransform() : ColorTransform;
+	private function get_concatenatedMatrix() : Matrix;
+	private function get_matrix() : Matrix;
+	private function get_matrix3D() : Matrix3D;
+	private function get_perspectiveProjection() : PerspectiveProjection;
+	private function get_pixelBounds() : Rectangle;
+	private function set_colorTransform(value : ColorTransform) : ColorTransform;
+	private function set_matrix(value : Matrix) : Matrix;
+	private function set_matrix3D(value : Matrix3D) : Matrix3D;
+	private function set_perspectiveProjection(value : PerspectiveProjection) : PerspectiveProjection;
 }
diff --git a/std/flash/geom/Vector3D.hx b/std/flash/geom/Vector3D.hx
index 01a91ff5b7e5366eed1620e31bf6df07e1f061a3..f03e51d4b33251ab314d115ce6af7e0efe241e8e 100644
--- a/std/flash/geom/Vector3D.hx
+++ b/std/flash/geom/Vector3D.hx
@@ -1,8 +1,8 @@
 package flash.geom;
 
 @:require(flash10) extern class Vector3D {
-	var length(default,never) : Float;
-	var lengthSquared(default,never) : Float;
+	@:flash.property var length(get,never) : Float;
+	@:flash.property var lengthSquared(get,never) : Float;
 	var w : Float;
 	var x : Float;
 	var y : Float;
@@ -15,6 +15,8 @@ package flash.geom;
 	function decrementBy(a : Vector3D) : Void;
 	function dotProduct(a : Vector3D) : Float;
 	function equals(toCompare : Vector3D, allFour : Bool = false) : Bool;
+	private function get_length() : Float;
+	private function get_lengthSquared() : Float;
 	function incrementBy(a : Vector3D) : Void;
 	function nearEquals(toCompare : Vector3D, tolerance : Float, allFour : Bool = false) : Bool;
 	function negate() : Void;
@@ -24,9 +26,9 @@ package flash.geom;
 	@:require(flash11) function setTo(xa : Float, ya : Float, za : Float) : Void;
 	function subtract(a : Vector3D) : Vector3D;
 	function toString() : String;
-	static var X_AXIS(default,never) : Vector3D;
-	static var Y_AXIS(default,never) : Vector3D;
-	static var Z_AXIS(default,never) : Vector3D;
+	static final X_AXIS : Vector3D;
+	static final Y_AXIS : Vector3D;
+	static final Z_AXIS : Vector3D;
 	static function angleBetween(a : Vector3D, b : Vector3D) : Float;
 	static function distance(pt1 : Vector3D, pt2 : Vector3D) : Float;
 }
diff --git a/std/flash/globalization/Collator.hx b/std/flash/globalization/Collator.hx
index de60b570c874ab4d53bb79f5b8fe8b238261b676..4e2e137e01cb48d51878ccdbcca830f286b66cee 100644
--- a/std/flash/globalization/Collator.hx
+++ b/std/flash/globalization/Collator.hx
@@ -1,17 +1,32 @@
 package flash.globalization;
 
-@:final @:require(flash10_1) extern class Collator {
-	var actualLocaleIDName(default,never) : String;
-	var ignoreCase : Bool;
-	var ignoreCharacterWidth : Bool;
-	var ignoreDiacritics : Bool;
-	var ignoreKanaType : Bool;
-	var ignoreSymbols : Bool;
-	var lastOperationStatus(default,never) : LastOperationStatus;
-	var numericComparison : Bool;
-	var requestedLocaleIDName(default,never) : String;
+@:require(flash10_1) extern final class Collator {
+	@:flash.property var actualLocaleIDName(get,never) : String;
+	@:flash.property var ignoreCase(get,set) : Bool;
+	@:flash.property var ignoreCharacterWidth(get,set) : Bool;
+	@:flash.property var ignoreDiacritics(get,set) : Bool;
+	@:flash.property var ignoreKanaType(get,set) : Bool;
+	@:flash.property var ignoreSymbols(get,set) : Bool;
+	@:flash.property var lastOperationStatus(get,never) : LastOperationStatus;
+	@:flash.property var numericComparison(get,set) : Bool;
+	@:flash.property var requestedLocaleIDName(get,never) : String;
 	function new(requestedLocaleIDName : String, ?initialMode : CollatorMode) : Void;
 	function compare(string1 : String, string2 : String) : Int;
 	function equals(string1 : String, string2 : String) : Bool;
+	private function get_actualLocaleIDName() : String;
+	private function get_ignoreCase() : Bool;
+	private function get_ignoreCharacterWidth() : Bool;
+	private function get_ignoreDiacritics() : Bool;
+	private function get_ignoreKanaType() : Bool;
+	private function get_ignoreSymbols() : Bool;
+	private function get_lastOperationStatus() : LastOperationStatus;
+	private function get_numericComparison() : Bool;
+	private function get_requestedLocaleIDName() : String;
+	private function set_ignoreCase(value : Bool) : Bool;
+	private function set_ignoreCharacterWidth(value : Bool) : Bool;
+	private function set_ignoreDiacritics(value : Bool) : Bool;
+	private function set_ignoreKanaType(value : Bool) : Bool;
+	private function set_ignoreSymbols(value : Bool) : Bool;
+	private function set_numericComparison(value : Bool) : Bool;
 	static function getAvailableLocaleIDNames() : flash.Vector<String>;
 }
diff --git a/std/flash/globalization/CollatorMode.hx b/std/flash/globalization/CollatorMode.hx
index 28a86f9b9c99eadc25469d5e8cbcdd7aa2cefbfb..4cdb56195eab3d24f637685f6da63c8caad20657 100644
--- a/std/flash/globalization/CollatorMode.hx
+++ b/std/flash/globalization/CollatorMode.hx
@@ -1,6 +1,6 @@
 package flash.globalization;
 
-@:fakeEnum(String) extern enum CollatorMode {
-	MATCHING;
-	SORTING;
+@:native("flash.globalization.CollatorMode") extern enum abstract CollatorMode(String) {
+	var MATCHING;
+	var SORTING;
 }
diff --git a/std/flash/globalization/CurrencyFormatter.hx b/std/flash/globalization/CurrencyFormatter.hx
index c19793ba3612e9923098326073f61f31008eda83..97e1df57712fb0ff254761eb660d8b949e854e9c 100644
--- a/std/flash/globalization/CurrencyFormatter.hx
+++ b/std/flash/globalization/CurrencyFormatter.hx
@@ -1,26 +1,53 @@
 package flash.globalization;
 
-@:final @:require(flash10_1) extern class CurrencyFormatter {
-	var actualLocaleIDName(default,never) : String;
-	var currencyISOCode(default,never) : String;
-	var currencySymbol(default,never) : String;
-	var decimalSeparator : String;
-	var digitsType : UInt;
-	var fractionalDigits : Int;
-	var groupingPattern : String;
-	var groupingSeparator : String;
-	var lastOperationStatus(default,never) : LastOperationStatus;
-	var leadingZero : Bool;
-	var negativeCurrencyFormat : UInt;
-	var negativeSymbol : String;
-	var positiveCurrencyFormat : UInt;
-	var requestedLocaleIDName(default,never) : String;
-	var trailingZeros : Bool;
-	var useGrouping : Bool;
+@:require(flash10_1) extern final class CurrencyFormatter {
+	@:flash.property var actualLocaleIDName(get,never) : String;
+	@:flash.property var currencyISOCode(get,never) : String;
+	@:flash.property var currencySymbol(get,never) : String;
+	@:flash.property var decimalSeparator(get,set) : String;
+	@:flash.property var digitsType(get,set) : UInt;
+	@:flash.property var fractionalDigits(get,set) : Int;
+	@:flash.property var groupingPattern(get,set) : String;
+	@:flash.property var groupingSeparator(get,set) : String;
+	@:flash.property var lastOperationStatus(get,never) : LastOperationStatus;
+	@:flash.property var leadingZero(get,set) : Bool;
+	@:flash.property var negativeCurrencyFormat(get,set) : UInt;
+	@:flash.property var negativeSymbol(get,set) : String;
+	@:flash.property var positiveCurrencyFormat(get,set) : UInt;
+	@:flash.property var requestedLocaleIDName(get,never) : String;
+	@:flash.property var trailingZeros(get,set) : Bool;
+	@:flash.property var useGrouping(get,set) : Bool;
 	function new(requestedLocaleIDName : String) : Void;
 	function format(value : Float, withCurrencySymbol : Bool = false) : String;
 	function formattingWithCurrencySymbolIsSafe(requestedISOCode : String) : Bool;
+	private function get_actualLocaleIDName() : String;
+	private function get_currencyISOCode() : String;
+	private function get_currencySymbol() : String;
+	private function get_decimalSeparator() : String;
+	private function get_digitsType() : UInt;
+	private function get_fractionalDigits() : Int;
+	private function get_groupingPattern() : String;
+	private function get_groupingSeparator() : String;
+	private function get_lastOperationStatus() : LastOperationStatus;
+	private function get_leadingZero() : Bool;
+	private function get_negativeCurrencyFormat() : UInt;
+	private function get_negativeSymbol() : String;
+	private function get_positiveCurrencyFormat() : UInt;
+	private function get_requestedLocaleIDName() : String;
+	private function get_trailingZeros() : Bool;
+	private function get_useGrouping() : Bool;
 	function parse(inputString : String) : CurrencyParseResult;
 	function setCurrency(currencyISOCode : String, currencySymbol : String) : Void;
+	private function set_decimalSeparator(value : String) : String;
+	private function set_digitsType(value : UInt) : UInt;
+	private function set_fractionalDigits(value : Int) : Int;
+	private function set_groupingPattern(value : String) : String;
+	private function set_groupingSeparator(value : String) : String;
+	private function set_leadingZero(value : Bool) : Bool;
+	private function set_negativeCurrencyFormat(value : UInt) : UInt;
+	private function set_negativeSymbol(value : String) : String;
+	private function set_positiveCurrencyFormat(value : UInt) : UInt;
+	private function set_trailingZeros(value : Bool) : Bool;
+	private function set_useGrouping(value : Bool) : Bool;
 	static function getAvailableLocaleIDNames() : flash.Vector<String>;
 }
diff --git a/std/flash/globalization/CurrencyParseResult.hx b/std/flash/globalization/CurrencyParseResult.hx
index b26e7c8d5ddb6e22993336b86ad20330fff36a89..3df82ea0f5c6e9a1ec69bdd5ce63f59edfb12ce9 100644
--- a/std/flash/globalization/CurrencyParseResult.hx
+++ b/std/flash/globalization/CurrencyParseResult.hx
@@ -1,7 +1,9 @@
 package flash.globalization;
 
-@:final extern class CurrencyParseResult {
-	var currencyString(default,never) : String;
-	var value(default,never) : Float;
+extern final class CurrencyParseResult {
+	@:flash.property var currencyString(get,never) : String;
+	@:flash.property var value(get,never) : Float;
 	function new(value : Float = 0./*NaN*/, ?symbol : String) : Void;
+	private function get_currencyString() : String;
+	private function get_value() : Float;
 }
diff --git a/std/flash/globalization/DateTimeFormatter.hx b/std/flash/globalization/DateTimeFormatter.hx
index 03b019cbf4eb53e1c7ff363ad65907f986c9e87e..e37bb8bfd039cf68a434490490f1c2dcbe7ea960 100644
--- a/std/flash/globalization/DateTimeFormatter.hx
+++ b/std/flash/globalization/DateTimeFormatter.hx
@@ -1,9 +1,9 @@
 package flash.globalization;
 
-@:final @:require(flash10_1) extern class DateTimeFormatter {
-	var actualLocaleIDName(default,never) : String;
-	var lastOperationStatus(default,never) : LastOperationStatus;
-	var requestedLocaleIDName(default,never) : String;
+@:require(flash10_1) extern final class DateTimeFormatter {
+	@:flash.property var actualLocaleIDName(get,never) : String;
+	@:flash.property var lastOperationStatus(get,never) : LastOperationStatus;
+	@:flash.property var requestedLocaleIDName(get,never) : String;
 	function new(requestedLocaleIDName : String, ?dateStyle : DateTimeStyle, ?timeStyle : DateTimeStyle) : Void;
 	function format(dateTime : Date) : String;
 	function formatUTC(dateTime : Date) : String;
@@ -13,6 +13,9 @@ package flash.globalization;
 	function getMonthNames(?nameStyle : DateTimeNameStyle, ?context : DateTimeNameContext) : flash.Vector<String>;
 	function getTimeStyle() : DateTimeStyle;
 	function getWeekdayNames(?nameStyle : DateTimeNameStyle, ?context : DateTimeNameContext) : flash.Vector<String>;
+	private function get_actualLocaleIDName() : String;
+	private function get_lastOperationStatus() : LastOperationStatus;
+	private function get_requestedLocaleIDName() : String;
 	function setDateTimePattern(pattern : String) : Void;
 	function setDateTimeStyles(dateStyle : DateTimeStyle, timeStyle : DateTimeStyle) : Void;
 	static function getAvailableLocaleIDNames() : flash.Vector<String>;
diff --git a/std/flash/globalization/DateTimeNameContext.hx b/std/flash/globalization/DateTimeNameContext.hx
index 35bd0661afd712d73287a20d88ff56dfeff933be..0d1f2e4a81be337933dfc257b99f17815be2dfb1 100644
--- a/std/flash/globalization/DateTimeNameContext.hx
+++ b/std/flash/globalization/DateTimeNameContext.hx
@@ -1,6 +1,6 @@
 package flash.globalization;
 
-@:fakeEnum(String) extern enum DateTimeNameContext {
-	FORMAT;
-	STANDALONE;
+@:native("flash.globalization.DateTimeNameContext") extern enum abstract DateTimeNameContext(String) {
+	var FORMAT;
+	var STANDALONE;
 }
diff --git a/std/flash/globalization/DateTimeNameStyle.hx b/std/flash/globalization/DateTimeNameStyle.hx
index bb8503b88e68a1ce2f2e7f7257f5c2895a99cd3f..067fbf653d1cdb53c1b21fb63496defa2404de42 100644
--- a/std/flash/globalization/DateTimeNameStyle.hx
+++ b/std/flash/globalization/DateTimeNameStyle.hx
@@ -1,7 +1,7 @@
 package flash.globalization;
 
-@:fakeEnum(String) extern enum DateTimeNameStyle {
-	FULL;
-	LONG_ABBREVIATION;
-	SHORT_ABBREVIATION;
+@:native("flash.globalization.DateTimeNameStyle") extern enum abstract DateTimeNameStyle(String) {
+	var FULL;
+	var LONG_ABBREVIATION;
+	var SHORT_ABBREVIATION;
 }
diff --git a/std/flash/globalization/DateTimeStyle.hx b/std/flash/globalization/DateTimeStyle.hx
index c084f5df90624259672a3f4ab4e1c370b9dc211d..1c6b84bcedf533b2d3f601ec4de6d98ef620f435 100644
--- a/std/flash/globalization/DateTimeStyle.hx
+++ b/std/flash/globalization/DateTimeStyle.hx
@@ -1,9 +1,9 @@
 package flash.globalization;
 
-@:fakeEnum(String) extern enum DateTimeStyle {
-	CUSTOM;
-	LONG;
-	MEDIUM;
-	NONE;
-	SHORT;
+@:native("flash.globalization.DateTimeStyle") extern enum abstract DateTimeStyle(String) {
+	var CUSTOM;
+	var LONG;
+	var MEDIUM;
+	var NONE;
+	var SHORT;
 }
diff --git a/std/flash/globalization/LastOperationStatus.hx b/std/flash/globalization/LastOperationStatus.hx
index a6bbd58461d785e058cbcdce7431bfcb59efe1ed..a18bf215dc356a3de05546583970cd4e4a9333da 100644
--- a/std/flash/globalization/LastOperationStatus.hx
+++ b/std/flash/globalization/LastOperationStatus.hx
@@ -1,21 +1,21 @@
 package flash.globalization;
 
-@:fakeEnum(String) extern enum LastOperationStatus {
-	BUFFER_OVERFLOW_ERROR;
-	ERROR_CODE_UNKNOWN;
-	ILLEGAL_ARGUMENT_ERROR;
-	INDEX_OUT_OF_BOUNDS_ERROR;
-	INVALID_ATTR_VALUE;
-	INVALID_CHAR_FOUND;
-	MEMORY_ALLOCATION_ERROR;
-	NO_ERROR;
-	NUMBER_OVERFLOW_ERROR;
-	PARSE_ERROR;
-	PATTERN_SYNTAX_ERROR;
-	PLATFORM_API_FAILED;
-	TRUNCATED_CHAR_FOUND;
-	UNEXPECTED_TOKEN;
-	UNSUPPORTED_ERROR;
-	USING_DEFAULT_WARNING;
-	USING_FALLBACK_WARNING;
+@:native("flash.globalization.LastOperationStatus") extern enum abstract LastOperationStatus(String) {
+	var BUFFER_OVERFLOW_ERROR;
+	var ERROR_CODE_UNKNOWN;
+	var ILLEGAL_ARGUMENT_ERROR;
+	var INDEX_OUT_OF_BOUNDS_ERROR;
+	var INVALID_ATTR_VALUE;
+	var INVALID_CHAR_FOUND;
+	var MEMORY_ALLOCATION_ERROR;
+	var NO_ERROR;
+	var NUMBER_OVERFLOW_ERROR;
+	var PARSE_ERROR;
+	var PATTERN_SYNTAX_ERROR;
+	var PLATFORM_API_FAILED;
+	var TRUNCATED_CHAR_FOUND;
+	var UNEXPECTED_TOKEN;
+	var UNSUPPORTED_ERROR;
+	var USING_DEFAULT_WARNING;
+	var USING_FALLBACK_WARNING;
 }
diff --git a/std/flash/globalization/LocaleID.hx b/std/flash/globalization/LocaleID.hx
index 250840c5f327523e1b82620b0b5c88e70bd3d7cf..f86d0d7270b3dfbd90feb9e96a01252979f75d1f 100644
--- a/std/flash/globalization/LocaleID.hx
+++ b/std/flash/globalization/LocaleID.hx
@@ -1,15 +1,17 @@
 package flash.globalization;
 
-@:final @:require(flash10_1) extern class LocaleID {
-	var lastOperationStatus(default,never) : LastOperationStatus;
-	var name(default,never) : String;
+@:require(flash10_1) extern final class LocaleID {
+	@:flash.property var lastOperationStatus(get,never) : LastOperationStatus;
+	@:flash.property var name(get,never) : String;
 	function new(name : String) : Void;
 	function getKeysAndValues() : flash.utils.Object;
 	function getLanguage() : String;
 	function getRegion() : String;
 	function getScript() : String;
 	function getVariant() : String;
+	private function get_lastOperationStatus() : LastOperationStatus;
+	private function get_name() : String;
 	function isRightToLeft() : Bool;
-	static var DEFAULT(default,never) : String;
+	static final DEFAULT : String;
 	static function determinePreferredLocales(want : flash.Vector<String>, have : flash.Vector<String>, ?keyword : String) : flash.Vector<String>;
 }
diff --git a/std/flash/globalization/NationalDigitsType.hx b/std/flash/globalization/NationalDigitsType.hx
index ede278cf27c888a92bbf0ae0c8a01139a10bc7ec..af535ae44ada02b85096ec4d831f5defb9d47462 100644
--- a/std/flash/globalization/NationalDigitsType.hx
+++ b/std/flash/globalization/NationalDigitsType.hx
@@ -1,36 +1,36 @@
 package flash.globalization;
 
-@:fakeEnum(UInt) extern enum NationalDigitsType {
-	ARABIC_INDIC;
-	BALINESE;
-	BENGALI;
-	CHAM;
-	DEVANAGARI;
-	EUROPEAN;
-	EXTENDED_ARABIC_INDIC;
-	FULL_WIDTH;
-	GUJARATI;
-	GURMUKHI;
-	KANNADA;
-	KAYAH_LI;
-	KHMER;
-	LAO;
-	LEPCHA;
-	LIMBU;
-	MALAYALAM;
-	MONGOLIAN;
-	MYANMAR;
-	MYANMAR_SHAN;
-	NEW_TAI_LUE;
-	NKO;
-	OL_CHIKI;
-	ORIYA;
-	OSMANYA;
-	SAURASHTRA;
-	SUNDANESE;
-	TAMIL;
-	TELUGU;
-	THAI;
-	TIBETAN;
-	VAI;
+@:native("flash.globalization.NationalDigitsType") extern enum abstract NationalDigitsType(UInt) {
+	var ARABIC_INDIC;
+	var BALINESE;
+	var BENGALI;
+	var CHAM;
+	var DEVANAGARI;
+	var EUROPEAN;
+	var EXTENDED_ARABIC_INDIC;
+	var FULL_WIDTH;
+	var GUJARATI;
+	var GURMUKHI;
+	var KANNADA;
+	var KAYAH_LI;
+	var KHMER;
+	var LAO;
+	var LEPCHA;
+	var LIMBU;
+	var MALAYALAM;
+	var MONGOLIAN;
+	var MYANMAR;
+	var MYANMAR_SHAN;
+	var NEW_TAI_LUE;
+	var NKO;
+	var OL_CHIKI;
+	var ORIYA;
+	var OSMANYA;
+	var SAURASHTRA;
+	var SUNDANESE;
+	var TAMIL;
+	var TELUGU;
+	var THAI;
+	var TIBETAN;
+	var VAI;
 }
diff --git a/std/flash/globalization/NumberFormatter.hx b/std/flash/globalization/NumberFormatter.hx
index 325edfc77f9cea3188e27230d0c31c9952352ee1..27b3f85053d108702c65d11f0858813e09b044f5 100644
--- a/std/flash/globalization/NumberFormatter.hx
+++ b/std/flash/globalization/NumberFormatter.hx
@@ -1,24 +1,47 @@
 package flash.globalization;
 
-@:final @:require(flash10_1) extern class NumberFormatter {
-	var actualLocaleIDName(default,never) : String;
-	var decimalSeparator : String;
-	var digitsType : NationalDigitsType;
-	var fractionalDigits : Int;
-	var groupingPattern : String;
-	var groupingSeparator : String;
-	var lastOperationStatus(default,never) : LastOperationStatus;
-	var leadingZero : Bool;
-	var negativeNumberFormat : UInt;
-	var negativeSymbol : String;
-	var requestedLocaleIDName(default,never) : String;
-	var trailingZeros : Bool;
-	var useGrouping : Bool;
+@:require(flash10_1) extern final class NumberFormatter {
+	@:flash.property var actualLocaleIDName(get,never) : String;
+	@:flash.property var decimalSeparator(get,set) : String;
+	@:flash.property var digitsType(get,set) : NationalDigitsType;
+	@:flash.property var fractionalDigits(get,set) : Int;
+	@:flash.property var groupingPattern(get,set) : String;
+	@:flash.property var groupingSeparator(get,set) : String;
+	@:flash.property var lastOperationStatus(get,never) : LastOperationStatus;
+	@:flash.property var leadingZero(get,set) : Bool;
+	@:flash.property var negativeNumberFormat(get,set) : UInt;
+	@:flash.property var negativeSymbol(get,set) : String;
+	@:flash.property var requestedLocaleIDName(get,never) : String;
+	@:flash.property var trailingZeros(get,set) : Bool;
+	@:flash.property var useGrouping(get,set) : Bool;
 	function new(requestedLocaleIDName : String) : Void;
 	function formatInt(value : Int) : String;
 	function formatNumber(value : Float) : String;
 	function formatUint(value : UInt) : String;
+	private function get_actualLocaleIDName() : String;
+	private function get_decimalSeparator() : String;
+	private function get_digitsType() : NationalDigitsType;
+	private function get_fractionalDigits() : Int;
+	private function get_groupingPattern() : String;
+	private function get_groupingSeparator() : String;
+	private function get_lastOperationStatus() : LastOperationStatus;
+	private function get_leadingZero() : Bool;
+	private function get_negativeNumberFormat() : UInt;
+	private function get_negativeSymbol() : String;
+	private function get_requestedLocaleIDName() : String;
+	private function get_trailingZeros() : Bool;
+	private function get_useGrouping() : Bool;
 	function parse(parseString : String) : NumberParseResult;
 	function parseNumber(parseString : String) : Float;
+	private function set_decimalSeparator(value : String) : String;
+	private function set_digitsType(value : NationalDigitsType) : NationalDigitsType;
+	private function set_fractionalDigits(value : Int) : Int;
+	private function set_groupingPattern(value : String) : String;
+	private function set_groupingSeparator(value : String) : String;
+	private function set_leadingZero(value : Bool) : Bool;
+	private function set_negativeNumberFormat(value : UInt) : UInt;
+	private function set_negativeSymbol(value : String) : String;
+	private function set_trailingZeros(value : Bool) : Bool;
+	private function set_useGrouping(value : Bool) : Bool;
 	static function getAvailableLocaleIDNames() : flash.Vector<String>;
 }
diff --git a/std/flash/globalization/NumberParseResult.hx b/std/flash/globalization/NumberParseResult.hx
index ab3484f679d6f6d2a5cf71009509ca3be2985720..9697303be0f75570be49a374402b90844ef8f6df 100644
--- a/std/flash/globalization/NumberParseResult.hx
+++ b/std/flash/globalization/NumberParseResult.hx
@@ -1,8 +1,11 @@
 package flash.globalization;
 
-@:final @:require(flash10_1) extern class NumberParseResult {
-	var endIndex(default,never) : Int;
-	var startIndex(default,never) : Int;
-	var value(default,never) : Float;
+@:require(flash10_1) extern final class NumberParseResult {
+	@:flash.property var endIndex(get,never) : Int;
+	@:flash.property var startIndex(get,never) : Int;
+	@:flash.property var value(get,never) : Float;
 	function new(value : Float = 0./*NaN*/, startIndex : Int = 2147483647, endIndex : Int = 2147483647) : Void;
+	private function get_endIndex() : Int;
+	private function get_startIndex() : Int;
+	private function get_value() : Float;
 }
diff --git a/std/flash/globalization/StringTools.hx b/std/flash/globalization/StringTools.hx
index 7dd7fce80f2a7c0fa358666514b72b7270c7c26a..4badc737261fa232f66d716257035e2cb45bb3c6 100644
--- a/std/flash/globalization/StringTools.hx
+++ b/std/flash/globalization/StringTools.hx
@@ -1,10 +1,13 @@
 package flash.globalization;
 
-@:final @:require(flash10_1) extern class StringTools {
-	var actualLocaleIDName(default,never) : String;
-	var lastOperationStatus(default,never) : LastOperationStatus;
-	var requestedLocaleIDName(default,never) : String;
+@:require(flash10_1) extern final class StringTools {
+	@:flash.property var actualLocaleIDName(get,never) : String;
+	@:flash.property var lastOperationStatus(get,never) : LastOperationStatus;
+	@:flash.property var requestedLocaleIDName(get,never) : String;
 	function new(requestedLocaleIDName : String) : Void;
+	private function get_actualLocaleIDName() : String;
+	private function get_lastOperationStatus() : LastOperationStatus;
+	private function get_requestedLocaleIDName() : String;
 	function toLowerCase(s : String) : String;
 	function toUpperCase(s : String) : String;
 	static function getAvailableLocaleIDNames() : flash.Vector<String>;
diff --git a/std/flash/media/AVABRParameters.hx b/std/flash/media/AVABRParameters.hx
index fb6f2e72c59e1c9a4fa1ba35de6e9c6c18622c56..249ce7fea5845f3851c66cafd80d6a4e6e28ff58 100644
--- a/std/flash/media/AVABRParameters.hx
+++ b/std/flash/media/AVABRParameters.hx
@@ -1,12 +1,20 @@
 package flash.media;
 
 extern class AVABRParameters {
-	var maxBitsPerSecond : Int;
-	var minBitsPerSecond : Int;
-	var policy : String;
-	var startBitsPerSecond : Int;
+	@:flash.property var maxBitsPerSecond(get,set) : Int;
+	@:flash.property var minBitsPerSecond(get,set) : Int;
+	@:flash.property var policy(get,set) : String;
+	@:flash.property var startBitsPerSecond(get,set) : Int;
 	function new(init_policy : String, init_startBitsPerSecond : UInt, init_minBitsPerSecond : UInt, init_maxBitsPerSecond : UInt) : Void;
-	static var AGGRESSIVE(default,never) : String;
-	static var CONSERVATIVE(default,never) : String;
-	static var MODERATE(default,never) : String;
+	private function get_maxBitsPerSecond() : Int;
+	private function get_minBitsPerSecond() : Int;
+	private function get_policy() : String;
+	private function get_startBitsPerSecond() : Int;
+	private function set_maxBitsPerSecond(value : Int) : Int;
+	private function set_minBitsPerSecond(value : Int) : Int;
+	private function set_policy(value : String) : String;
+	private function set_startBitsPerSecond(value : Int) : Int;
+	static final AGGRESSIVE : String;
+	static final CONSERVATIVE : String;
+	static final MODERATE : String;
 }
diff --git a/std/flash/media/AVABRProfileInfo.hx b/std/flash/media/AVABRProfileInfo.hx
index 990cc96b5597e791640df71e1cf8073208d63a5e..983e2c38595c927bc33ad501deef1ab35b5890ad 100644
--- a/std/flash/media/AVABRProfileInfo.hx
+++ b/std/flash/media/AVABRProfileInfo.hx
@@ -1,8 +1,11 @@
 package flash.media;
 
 extern class AVABRProfileInfo {
-	var bitsPerSecond(default,never) : Int;
-	var height(default,never) : Int;
-	var width(default,never) : Int;
+	@:flash.property var bitsPerSecond(get,never) : Int;
+	@:flash.property var height(get,never) : Int;
+	@:flash.property var width(get,never) : Int;
 	function new(init_bitsPerSecond : Int, init_width : Int, init_height : Int) : Void;
+	private function get_bitsPerSecond() : Int;
+	private function get_height() : Int;
+	private function get_width() : Int;
 }
diff --git a/std/flash/media/AVCaptionStyle.hx b/std/flash/media/AVCaptionStyle.hx
index 21436f18c31e5e674d1685ca281b027d7d579f92..fc3c76f8a7743ebba6bd648189a7ed7a31fc18d9 100644
--- a/std/flash/media/AVCaptionStyle.hx
+++ b/std/flash/media/AVCaptionStyle.hx
@@ -1,55 +1,77 @@
 package flash.media;
 
 extern class AVCaptionStyle {
-	var backgroundColor : String;
-	var backgroundOpacity : String;
-	var bottomInset : String;
-	var edgeColor : String;
-	var fillColor : String;
-	var fillOpacity : String;
-	var font : String;
-	var fontColor : String;
-	var fontEdge : String;
-	var fontOpacity : String;
-	var size : String;
+	@:flash.property var backgroundColor(get,set) : String;
+	@:flash.property var backgroundOpacity(get,set) : String;
+	@:flash.property var bottomInset(get,set) : String;
+	@:flash.property var edgeColor(get,set) : String;
+	@:flash.property var fillColor(get,set) : String;
+	@:flash.property var fillOpacity(get,set) : String;
+	@:flash.property var font(get,set) : String;
+	@:flash.property var fontColor(get,set) : String;
+	@:flash.property var fontEdge(get,set) : String;
+	@:flash.property var fontOpacity(get,set) : String;
+	@:flash.property var size(get,set) : String;
 	function new() : Void;
-	static var BLACK(default,never) : String;
-	static var BLUE(default,never) : String;
-	static var BRIGHT_BLUE(default,never) : String;
-	static var BRIGHT_CYAN(default,never) : String;
-	static var BRIGHT_GREEN(default,never) : String;
-	static var BRIGHT_MAGENTA(default,never) : String;
-	static var BRIGHT_RED(default,never) : String;
-	static var BRIGHT_WHITE(default,never) : String;
-	static var BRIGHT_YELLOW(default,never) : String;
-	static var CASUAL(default,never) : String;
-	static var CURSIVE(default,never) : String;
-	static var CYAN(default,never) : String;
-	static var DARK_BLUE(default,never) : String;
-	static var DARK_CYAN(default,never) : String;
-	static var DARK_GREEN(default,never) : String;
-	static var DARK_MAGENTA(default,never) : String;
-	static var DARK_RED(default,never) : String;
-	static var DARK_YELLOW(default,never) : String;
-	static var DEFAULT(default,never) : String;
-	static var DEPRESSED(default,never) : String;
-	static var GRAY(default,never) : String;
-	static var GREEN(default,never) : String;
-	static var LARGE(default,never) : String;
-	static var LEFT_DROP_SHADOW(default,never) : String;
-	static var MAGENTA(default,never) : String;
-	static var MEDIUM(default,never) : String;
-	static var MONOSPACED_WITHOUT_SERIFS(default,never) : String;
-	static var MONOSPACE_WITH_SERIFS(default,never) : String;
-	static var NONE(default,never) : String;
-	static var PROPORTIONAL_WITHOUT_SERIFS(default,never) : String;
-	static var PROPORTIONAL_WITH_SERIFS(default,never) : String;
-	static var RAISED(default,never) : String;
-	static var RED(default,never) : String;
-	static var RIGHT_DROP_SHADOW(default,never) : String;
-	static var SMALL(default,never) : String;
-	static var SMALL_CAPITALS(default,never) : String;
-	static var UNIFORM(default,never) : String;
-	static var WHITE(default,never) : String;
-	static var YELLOW(default,never) : String;
+	private function get_backgroundColor() : String;
+	private function get_backgroundOpacity() : String;
+	private function get_bottomInset() : String;
+	private function get_edgeColor() : String;
+	private function get_fillColor() : String;
+	private function get_fillOpacity() : String;
+	private function get_font() : String;
+	private function get_fontColor() : String;
+	private function get_fontEdge() : String;
+	private function get_fontOpacity() : String;
+	private function get_size() : String;
+	private function set_backgroundColor(value : String) : String;
+	private function set_backgroundOpacity(value : String) : String;
+	private function set_bottomInset(value : String) : String;
+	private function set_edgeColor(value : String) : String;
+	private function set_fillColor(value : String) : String;
+	private function set_fillOpacity(value : String) : String;
+	private function set_font(value : String) : String;
+	private function set_fontColor(value : String) : String;
+	private function set_fontEdge(value : String) : String;
+	private function set_fontOpacity(value : String) : String;
+	private function set_size(value : String) : String;
+	static final BLACK : String;
+	static final BLUE : String;
+	static final BRIGHT_BLUE : String;
+	static final BRIGHT_CYAN : String;
+	static final BRIGHT_GREEN : String;
+	static final BRIGHT_MAGENTA : String;
+	static final BRIGHT_RED : String;
+	static final BRIGHT_WHITE : String;
+	static final BRIGHT_YELLOW : String;
+	static final CASUAL : String;
+	static final CURSIVE : String;
+	static final CYAN : String;
+	static final DARK_BLUE : String;
+	static final DARK_CYAN : String;
+	static final DARK_GREEN : String;
+	static final DARK_MAGENTA : String;
+	static final DARK_RED : String;
+	static final DARK_YELLOW : String;
+	static final DEFAULT : String;
+	static final DEPRESSED : String;
+	static final GRAY : String;
+	static final GREEN : String;
+	static final LARGE : String;
+	static final LEFT_DROP_SHADOW : String;
+	static final MAGENTA : String;
+	static final MEDIUM : String;
+	static final MONOSPACED_WITHOUT_SERIFS : String;
+	static final MONOSPACE_WITH_SERIFS : String;
+	static final NONE : String;
+	static final PROPORTIONAL_WITHOUT_SERIFS : String;
+	static final PROPORTIONAL_WITH_SERIFS : String;
+	static final RAISED : String;
+	static final RED : String;
+	static final RIGHT_DROP_SHADOW : String;
+	static final SMALL : String;
+	static final SMALL_CAPITALS : String;
+	static final UNIFORM : String;
+	static final WHITE : String;
+	static final YELLOW : String;
 }
diff --git a/std/flash/media/AVCuePoint.hx b/std/flash/media/AVCuePoint.hx
index b8d7c852f4c88f70d8f35ade8e9a82c0f5261b8d..34b2427d55f299c139d88543b6be9a179ff3e88c 100644
--- a/std/flash/media/AVCuePoint.hx
+++ b/std/flash/media/AVCuePoint.hx
@@ -1,7 +1,9 @@
 package flash.media;
 
 extern class AVCuePoint {
-	var dictionary(default,never) : flash.utils.Dictionary;
-	var localTime(default,never) : Float;
+	@:flash.property var dictionary(get,never) : flash.utils.Dictionary;
+	@:flash.property var localTime(get,never) : Float;
 	function new(init_dictionary : flash.utils.Dictionary, init_localTime : Float) : Void;
+	private function get_dictionary() : flash.utils.Dictionary;
+	private function get_localTime() : Float;
 }
diff --git a/std/flash/media/AVInsertionResult.hx b/std/flash/media/AVInsertionResult.hx
index b306a15bb6864723bc3084de1152b989e2078987..8f1e555511a7cd841e156ccd58940368012308d8 100644
--- a/std/flash/media/AVInsertionResult.hx
+++ b/std/flash/media/AVInsertionResult.hx
@@ -1,7 +1,9 @@
 package flash.media;
 
 extern class AVInsertionResult extends AVResult {
-	var insertedBeforeReadHead(default,never) : Bool;
-	var periodIndex(default,never) : Int;
+	@:flash.property var insertedBeforeReadHead(get,never) : Bool;
+	@:flash.property var periodIndex(get,never) : Int;
 	function new(result : Int, periodIndex : Int, insertedBeforeReadHead : Bool) : Void;
+	private function get_insertedBeforeReadHead() : Bool;
+	private function get_periodIndex() : Int;
 }
diff --git a/std/flash/media/AVNetworkingParams.hx b/std/flash/media/AVNetworkingParams.hx
index e0056540c191f548fc9273e9a65e448fc63d576c..7bc5cbde149f34f369104e193b33fc691095ebb9 100644
--- a/std/flash/media/AVNetworkingParams.hx
+++ b/std/flash/media/AVNetworkingParams.hx
@@ -1,8 +1,20 @@
 package flash.media;
 
 extern class AVNetworkingParams {
-	var forceNativeNetworking : Bool;
-	var readSetCookieHeader : Bool;
-	var useCookieHeaderForAllRequests : Bool;
-	function new(init_forceNativeNetworking : Bool = false, init_readSetCookieHeader : Bool = true, init_useCookieHeaderForAllRequests : Bool = false) : Void;
+	@:flash.property var appendRandomQueryParameter(get,set) : String;
+	@:flash.property var forceNativeNetworking(get,set) : Bool;
+	@:flash.property var networkDownVerificationUrl(get,set) : String;
+	@:flash.property var readSetCookieHeader(get,set) : Bool;
+	@:flash.property var useCookieHeaderForAllRequests(get,set) : Bool;
+	function new(init_forceNativeNetworking : Bool = false, init_readSetCookieHeader : Bool = true, init_useCookieHeaderForAllRequests : Bool = false, ?init_networkDownVerificationUrl : String) : Void;
+	private function get_appendRandomQueryParameter() : String;
+	private function get_forceNativeNetworking() : Bool;
+	private function get_networkDownVerificationUrl() : String;
+	private function get_readSetCookieHeader() : Bool;
+	private function get_useCookieHeaderForAllRequests() : Bool;
+	private function set_appendRandomQueryParameter(value : String) : String;
+	private function set_forceNativeNetworking(value : Bool) : Bool;
+	private function set_networkDownVerificationUrl(value : String) : String;
+	private function set_readSetCookieHeader(value : Bool) : Bool;
+	private function set_useCookieHeaderForAllRequests(value : Bool) : Bool;
 }
diff --git a/std/flash/media/AVPeriodInfo.hx b/std/flash/media/AVPeriodInfo.hx
index 91cde1a74ce315756e259b13b17f0969b8b3fd79..5f49b21ce12b03dcd9a22d73bc090513ea2f31e9 100644
--- a/std/flash/media/AVPeriodInfo.hx
+++ b/std/flash/media/AVPeriodInfo.hx
@@ -1,15 +1,25 @@
 package flash.media;
 
 extern class AVPeriodInfo {
-	var duration(default,never) : Float;
-	var firstCuePointIndex(default,never) : Int;
-	var firstSubscribedTagIndex(default,never) : Int;
-	var lastCuePointIndex(default,never) : Int;
-	var lastSubscribedTagIndex(default,never) : Int;
-	var localStartTime(default,never) : Float;
-	var supportsTrickPlay(default,never) : Bool;
-	var targetDuration(default,never) : Float;
-	var userData(default,never) : Int;
-	var virtualStartTime(default,never) : Float;
+	@:flash.property var duration(get,never) : Float;
+	@:flash.property var firstCuePointIndex(get,never) : Int;
+	@:flash.property var firstSubscribedTagIndex(get,never) : Int;
+	@:flash.property var lastCuePointIndex(get,never) : Int;
+	@:flash.property var lastSubscribedTagIndex(get,never) : Int;
+	@:flash.property var localStartTime(get,never) : Float;
+	@:flash.property var supportsTrickPlay(get,never) : Bool;
+	@:flash.property var targetDuration(get,never) : Float;
+	@:flash.property var userData(get,never) : Int;
+	@:flash.property var virtualStartTime(get,never) : Float;
 	function new(init_localStartTime : Float, init_virtualStartTime : Float, init_duration : Float, init_firstCuePointIndex : Int, init_lastCuePointIndex : Int, init_firstSubscribedTagIndex : Int, init_lastSubscribedTagIndex : Int, init_userData : Int, init_supportsTrickPlay : Bool, init_targetDuration : Float) : Void;
+	private function get_duration() : Float;
+	private function get_firstCuePointIndex() : Int;
+	private function get_firstSubscribedTagIndex() : Int;
+	private function get_lastCuePointIndex() : Int;
+	private function get_lastSubscribedTagIndex() : Int;
+	private function get_localStartTime() : Float;
+	private function get_supportsTrickPlay() : Bool;
+	private function get_targetDuration() : Float;
+	private function get_userData() : Int;
+	private function get_virtualStartTime() : Float;
 }
diff --git a/std/flash/media/AVPlayState.hx b/std/flash/media/AVPlayState.hx
index 2b61091805e99fb33ffa3b46f21ddf2cb15c0ba9..00f402021029506796c4d556d9bb0609fff349c5 100644
--- a/std/flash/media/AVPlayState.hx
+++ b/std/flash/media/AVPlayState.hx
@@ -1,15 +1,16 @@
 package flash.media;
 
 extern class AVPlayState {
-	var state(default,never) : Int;
+	@:flash.property var state(get,never) : Int;
 	function new(state : UInt) : Void;
-	static var BUFFERING(default,never) : Int;
-	static var EOF(default,never) : Int;
-	static var PAUSED(default,never) : Int;
-	static var PLAYING(default,never) : Int;
-	static var READY(default,never) : Int;
-	static var SUSPENDED(default,never) : Int;
-	static var TRICK_PLAY(default,never) : Int;
-	static var UNINITIALIZED(default,never) : Int;
-	static var UNRECOVERABLE_ERROR(default,never) : Int;
+	private function get_state() : Int;
+	static final BUFFERING : Int;
+	static final EOF : Int;
+	static final PAUSED : Int;
+	static final PLAYING : Int;
+	static final READY : Int;
+	static final SUSPENDED : Int;
+	static final TRICK_PLAY : Int;
+	static final UNINITIALIZED : Int;
+	static final UNRECOVERABLE_ERROR : Int;
 }
diff --git a/std/flash/media/AVResult.hx b/std/flash/media/AVResult.hx
index 0fad410f2fa3a3fd3dc280f054c99b33b1ff7f29..1594a40cca3ded277ce4fa0e62e8f477b6585d78 100644
--- a/std/flash/media/AVResult.hx
+++ b/std/flash/media/AVResult.hx
@@ -1,107 +1,108 @@
 package flash.media;
 
 extern class AVResult {
-	var result(default,never) : Int;
+	@:flash.property var result(get,never) : Int;
 	function new(inResult : Int) : Void;
-	static var ASYNC_OPERATION_IN_PROGRESS(default,never) : Int;
-	static var AUDIO_ONLY_STREAM_END(default,never) : Int;
-	static var AUDIO_ONLY_STREAM_START(default,never) : Int;
-	static var AUDIO_START_ERROR(default,never) : Int;
-	static var BAD_MANIFEST_SIGNATURE(default,never) : Int;
-	static var BAD_MEDIASAMPLE_FOUND(default,never) : Int;
-	static var BAD_MEDIA_INTERLEAVING(default,never) : Int;
-	static var CALLED_FROM_WRONG_THREAD(default,never) : Int;
-	static var CANNOT_ERASE_TIMELINE(default,never) : Int;
-	static var CANNOT_FAIL_OVER(default,never) : Int;
-	static var CANNOT_HANDLE_MAIN_MANIFEST_UPDATE(default,never) : Int;
-	static var CANNOT_LOAD_PLAY_LIST(default,never) : Int;
-	static var CANNOT_SPLIT_TIMELINE(default,never) : Int;
-	static var CODEC_NOT_SUPPORTED(default,never) : Int;
-	static var COMPONENT_CREATION_FAILURE(default,never) : Int;
-	static var CONTAINER_NOT_SUPPORTED(default,never) : Int;
-	static var CONTENT_LENGTH_MISMATCH(default,never) : Int;
-	static var CRYPTO_ALGORITHM_NOT_SUPPORTED(default,never) : Int;
-	static var CRYPTO_ERROR_BAD_CERTIFICATE(default,never) : Int;
-	static var CRYPTO_ERROR_BAD_PARAMETER(default,never) : Int;
-	static var CRYPTO_ERROR_BUFFER_TOO_SMALL(default,never) : Int;
-	static var CRYPTO_ERROR_CORRUPTED_DATA(default,never) : Int;
-	static var CRYPTO_ERROR_DIGEST_FINISH(default,never) : Int;
-	static var CRYPTO_ERROR_DIGEST_UPDATE(default,never) : Int;
-	static var CRYPTO_ERROR_UNKNOWN(default,never) : Int;
-	static var CURRENT_PERIOD_EXPIRED(default,never) : Int;
-	static var DECODER_FAILED(default,never) : Int;
-	static var DEVICE_OPEN_ERROR(default,never) : Int;
-	static var DID_NOT_GET_NEXT_FRAGMENT(default,never) : Int;
-	static var DRM_INIT_ERROR(default,never) : Int;
-	static var DRM_NOT_AVAILABLE(default,never) : Int;
-	static var END_OF_PERIOD(default,never) : Int;
-	static var EOF(default,never) : Int;
-	static var FILE_NOT_FOUND(default,never) : Int;
-	static var FILE_OPEN_ERROR(default,never) : Int;
-	static var FILE_READ_ERROR(default,never) : Int;
-	static var FILE_STRUCTURE_INVALID(default,never) : Int;
-	static var FILE_WRITE_ERROR(default,never) : Int;
-	static var FRAGMENT_READ_ERROR(default,never) : Int;
-	static var GENERIC_ERROR(default,never) : Int;
-	static var HTTP_TIME_OUT(default,never) : Int;
-	static var ID3_PARSE_ERROR(default,never) : Int;
-	static var INCOMPATIBLE_RENDER_MODE(default,never) : Int;
-	static var INCOMPATIBLE_VERSION(default,never) : Int;
-	static var INTERNAL_ERROR(default,never) : Int;
-	static var INVALID_KEY(default,never) : Int;
-	static var INVALID_OPERATION(default,never) : Int;
-	static var INVALID_PARAMETER(default,never) : Int;
-	static var INVALID_REPLACE_DURATION(default,never) : Int;
-	static var INVALID_SEEK_TIME(default,never) : Int;
-	static var INVALID_WITH_AUDIO_ONLY_FILE(default,never) : Int;
-	static var IRRECOVERABLE_ERROR(default,never) : Int;
-	static var KEY_NOT_FOUND(default,never) : Int;
-	static var KEY_SERVER_NOT_FOUND(default,never) : Int;
-	static var LISTENER_NOT_FOUND(default,never) : Int;
-	static var LIVE_HOLD(default,never) : Int;
-	static var LIVE_WINDOW_MOVED_BACKWARD(default,never) : Int;
-	static var LOST_CONNECTION_RECOVERABLE(default,never) : Int;
-	static var MAIN_MANIFEST_UPDATE_TO_BE_HANDLED(default,never) : Int;
-	static var MANIFEST_FILE_UNEXPECTEDLY_CHANGED(default,never) : Int;
-	static var NETWORK_DOWN(default,never) : Int;
-	static var NETWORK_ERROR(default,never) : Int;
-	static var NETWORK_UNAVAILABLE(default,never) : Int;
-	static var NOT_IMPLEMENTED(default,never) : Int;
-	static var NO_AUDIO_SINK(default,never) : Int;
-	static var NO_FIXED_SIZE(default,never) : Int;
-	static var NO_TIMELINE(default,never) : Int;
-	static var NO_USEABLE_BITRATE_PROFILE(default,never) : Int;
-	static var NULL_OPERATION(default,never) : Int;
-	static var ONLY_ALLOWED_IN_PAUSED_STATE(default,never) : Int;
-	static var OPERATION_ABORTED(default,never) : Int;
-	static var OUT_OF_MEMORY(default,never) : Int;
-	static var OVERFLOW(default,never) : Int;
-	static var PARSE_ERROR(default,never) : Int;
-	static var PARTIAL_REPLACEMENT(default,never) : Int;
-	static var PERIOD_HOLD(default,never) : Int;
-	static var PERIOD_NOT_LOADED(default,never) : Int;
-	static var PLAYBACK_NOT_ENABLED(default,never) : Int;
-	static var POSTROLL_WITH_LIVE_NOT_ALLOWED(default,never) : Int;
-	static var PREVIOUS_STEP_SEEK_IN_PROGRESS(default,never) : Int;
-	static var PROTOCOL_NOT_SUPPORTED(default,never) : Int;
-	static var RANGE_ERROR(default,never) : Int;
-	static var RANGE_SPANS_READHEAD(default,never) : Int;
-	static var RENDITION_M3U8_ERROR(default,never) : Int;
-	static var REPLACEMENT_FAILED(default,never) : Int;
-	static var RESOURCE_NOT_SPECIFIED(default,never) : Int;
-	static var SECURITY_ERROR(default,never) : Int;
-	static var SEEK_FAILED(default,never) : Int;
-	static var SEGMENT_SKIPPED_ON_FAILURE(default,never) : Int;
-	static var SIZE_UNKNOWN(default,never) : Int;
-	static var SPS_PPS_FOUND_OUTSIDE_AVCC(default,never) : Int;
-	static var SUCCESS(default,never) : Int;
-	static var SWITCH_TO_ASYMMETRIC_PROFILE(default,never) : Int;
-	static var TIMELINE_TOO_SHORT(default,never) : Int;
-	static var UNDERFLOW(default,never) : Int;
-	static var UNREPORTED_TIME_DISCONTINUITY_FOUND(default,never) : Int;
-	static var UNSUPPORTED_CONFIGURATION(default,never) : Int;
-	static var UNSUPPORTED_HLS_VERSION(default,never) : Int;
-	static var UNSUPPORTED_OPERATION(default,never) : Int;
-	static var VIDEO_PROFILE_NOT_SUPPORTED(default,never) : Int;
-	static var WAITING_FOR_INIT(default,never) : Int;
+	private function get_result() : Int;
+	static final ASYNC_OPERATION_IN_PROGRESS : Int;
+	static final AUDIO_ONLY_STREAM_END : Int;
+	static final AUDIO_ONLY_STREAM_START : Int;
+	static final AUDIO_START_ERROR : Int;
+	static final BAD_MANIFEST_SIGNATURE : Int;
+	static final BAD_MEDIASAMPLE_FOUND : Int;
+	static final BAD_MEDIA_INTERLEAVING : Int;
+	static final CALLED_FROM_WRONG_THREAD : Int;
+	static final CANNOT_ERASE_TIMELINE : Int;
+	static final CANNOT_FAIL_OVER : Int;
+	static final CANNOT_HANDLE_MAIN_MANIFEST_UPDATE : Int;
+	static final CANNOT_LOAD_PLAY_LIST : Int;
+	static final CANNOT_SPLIT_TIMELINE : Int;
+	static final CODEC_NOT_SUPPORTED : Int;
+	static final COMPONENT_CREATION_FAILURE : Int;
+	static final CONTAINER_NOT_SUPPORTED : Int;
+	static final CONTENT_LENGTH_MISMATCH : Int;
+	static final CRYPTO_ALGORITHM_NOT_SUPPORTED : Int;
+	static final CRYPTO_ERROR_BAD_CERTIFICATE : Int;
+	static final CRYPTO_ERROR_BAD_PARAMETER : Int;
+	static final CRYPTO_ERROR_BUFFER_TOO_SMALL : Int;
+	static final CRYPTO_ERROR_CORRUPTED_DATA : Int;
+	static final CRYPTO_ERROR_DIGEST_FINISH : Int;
+	static final CRYPTO_ERROR_DIGEST_UPDATE : Int;
+	static final CRYPTO_ERROR_UNKNOWN : Int;
+	static final CURRENT_PERIOD_EXPIRED : Int;
+	static final DECODER_FAILED : Int;
+	static final DEVICE_OPEN_ERROR : Int;
+	static final DID_NOT_GET_NEXT_FRAGMENT : Int;
+	static final DRM_INIT_ERROR : Int;
+	static final DRM_NOT_AVAILABLE : Int;
+	static final END_OF_PERIOD : Int;
+	static final EOF : Int;
+	static final FILE_NOT_FOUND : Int;
+	static final FILE_OPEN_ERROR : Int;
+	static final FILE_READ_ERROR : Int;
+	static final FILE_STRUCTURE_INVALID : Int;
+	static final FILE_WRITE_ERROR : Int;
+	static final FRAGMENT_READ_ERROR : Int;
+	static final GENERIC_ERROR : Int;
+	static final HTTP_TIME_OUT : Int;
+	static final ID3_PARSE_ERROR : Int;
+	static final INCOMPATIBLE_RENDER_MODE : Int;
+	static final INCOMPATIBLE_VERSION : Int;
+	static final INTERNAL_ERROR : Int;
+	static final INVALID_KEY : Int;
+	static final INVALID_OPERATION : Int;
+	static final INVALID_PARAMETER : Int;
+	static final INVALID_REPLACE_DURATION : Int;
+	static final INVALID_SEEK_TIME : Int;
+	static final INVALID_WITH_AUDIO_ONLY_FILE : Int;
+	static final IRRECOVERABLE_ERROR : Int;
+	static final KEY_NOT_FOUND : Int;
+	static final KEY_SERVER_NOT_FOUND : Int;
+	static final LISTENER_NOT_FOUND : Int;
+	static final LIVE_HOLD : Int;
+	static final LIVE_WINDOW_MOVED_BACKWARD : Int;
+	static final LOST_CONNECTION_RECOVERABLE : Int;
+	static final MAIN_MANIFEST_UPDATE_TO_BE_HANDLED : Int;
+	static final MANIFEST_FILE_UNEXPECTEDLY_CHANGED : Int;
+	static final NETWORK_DOWN : Int;
+	static final NETWORK_ERROR : Int;
+	static final NETWORK_UNAVAILABLE : Int;
+	static final NOT_IMPLEMENTED : Int;
+	static final NO_AUDIO_SINK : Int;
+	static final NO_FIXED_SIZE : Int;
+	static final NO_TIMELINE : Int;
+	static final NO_USEABLE_BITRATE_PROFILE : Int;
+	static final NULL_OPERATION : Int;
+	static final ONLY_ALLOWED_IN_PAUSED_STATE : Int;
+	static final OPERATION_ABORTED : Int;
+	static final OUT_OF_MEMORY : Int;
+	static final OVERFLOW : Int;
+	static final PARSE_ERROR : Int;
+	static final PARTIAL_REPLACEMENT : Int;
+	static final PERIOD_HOLD : Int;
+	static final PERIOD_NOT_LOADED : Int;
+	static final PLAYBACK_NOT_ENABLED : Int;
+	static final POSTROLL_WITH_LIVE_NOT_ALLOWED : Int;
+	static final PREVIOUS_STEP_SEEK_IN_PROGRESS : Int;
+	static final PROTOCOL_NOT_SUPPORTED : Int;
+	static final RANGE_ERROR : Int;
+	static final RANGE_SPANS_READHEAD : Int;
+	static final RENDITION_M3U8_ERROR : Int;
+	static final REPLACEMENT_FAILED : Int;
+	static final RESOURCE_NOT_SPECIFIED : Int;
+	static final SECURITY_ERROR : Int;
+	static final SEEK_FAILED : Int;
+	static final SEGMENT_SKIPPED_ON_FAILURE : Int;
+	static final SIZE_UNKNOWN : Int;
+	static final SPS_PPS_FOUND_OUTSIDE_AVCC : Int;
+	static final SUCCESS : Int;
+	static final SWITCH_TO_ASYMMETRIC_PROFILE : Int;
+	static final TIMELINE_TOO_SHORT : Int;
+	static final UNDERFLOW : Int;
+	static final UNREPORTED_TIME_DISCONTINUITY_FOUND : Int;
+	static final UNSUPPORTED_CONFIGURATION : Int;
+	static final UNSUPPORTED_HLS_VERSION : Int;
+	static final UNSUPPORTED_OPERATION : Int;
+	static final VIDEO_PROFILE_NOT_SUPPORTED : Int;
+	static final WAITING_FOR_INIT : Int;
 }
diff --git a/std/flash/media/AVSegmentedSource.hx b/std/flash/media/AVSegmentedSource.hx
index 537775aaa998568e1ef4db3d566275367871efd8..b9fa0ec27e61ebc366cb95202bd40ec2888b5b18 100644
--- a/std/flash/media/AVSegmentedSource.hx
+++ b/std/flash/media/AVSegmentedSource.hx
@@ -1,10 +1,10 @@
 package flash.media;
 
 extern class AVSegmentedSource extends AVSource {
-	var cookieHeader(never,default) : String;
-	var masterUpdateInterval(never,default) : Int;
-	var networkingParams : AVNetworkingParams;
-	var useRedirectedUrl(never,default) : Bool;
+	@:flash.property var cookieHeader(never,set) : String;
+	@:flash.property var masterUpdateInterval(never,set) : Int;
+	@:flash.property var networkingParams(get,set) : AVNetworkingParams;
+	@:flash.property var useRedirectedUrl(never,set) : Bool;
 	function new() : Void;
 	function addCustomHeader(headerName : String, args : flash.Vector<String>) : Void;
 	function clearPauseAtPeriodEnd(periodIndex : Int) : AVResult;
@@ -13,8 +13,10 @@ extern class AVSegmentedSource extends AVSource {
 	function getBackgroundPeriodInfo(periodIndex : Int) : AVPeriodInfo;
 	function getBackgroundTimeline() : AVTimeline;
 	function getCuePoint(periodIndex : Int, cuePointIndex : Int) : AVCuePoint;
+	function getMediaPreferredStartTime() : Float;
 	function getPerceivedBandwidth() : UInt;
 	function getPeriodInfo(periodIndex : Int) : AVPeriodInfo;
+	function getPeriodInfoWithTagsAcrossIndexes(periodIndex : Int, startPeriodIndex : Int) : AVPeriodInfo;
 	function getSubscribedTag(periodIndex : Int, tagDataIndex : Int) : AVTagData;
 	function getSubscribedTagForBackgroundManifest(periodIndex : Int, tagDataIndex : Int) : AVTagData;
 	function getTimeline() : AVTimeline;
@@ -22,6 +24,7 @@ extern class AVSegmentedSource extends AVSource {
 	function getTimelineSubscribedTagForBackgroundManifest(tagDataIndex : Int) : AVTagData;
 	function getTrackCount(periodIndex : Int, payloadType : String) : Int;
 	function getTrackInfo(periodIndex : Int, payloadType : String, trackIndex : Int) : AVTrackInfo;
+	private function get_networkingParams() : AVNetworkingParams;
 	function insertByLocalTime(periodIndex : Int, insertionTime : Float, handle : Int, userData : Int = 0, replaceDuration : Float = 0) : AVInsertionResult;
 	function insertByVirtualTime(insertionTime : Float, handle : Int, userData : Int = 0, replaceDuration : Float = 0) : AVInsertionResult;
 	function load(url : String, ?containerType : String, userData : Int = 0) : AVResult;
@@ -30,6 +33,7 @@ extern class AVSegmentedSource extends AVSource {
 	function releaseManifest(handle : Int) : AVResult;
 	function removeByLocalTime(periodIndex : Int, timeStart : Float, timeEnd : Float, replaceWithMainMedia : Bool) : AVResult;
 	function removeByVirtualTime(virtualTimeStart : Float, virtualTimeEnd : Float) : AVResult;
+	function removeByVirtualTimeWithReplacement(virtualTimeStart : Float, virtualTimeEnd : Float, replaceWithMainMedia : Bool) : AVResult;
 	function selectTrack(periodIndex : Int, payloadType : String, trackIndex : Int) : AVResult;
 	function selectTrackString(periodIndex : Int, payloadType : String, trackString : String) : AVResult;
 	function setABRParameters(params : AVABRParameters) : AVResult;
@@ -39,14 +43,18 @@ extern class AVSegmentedSource extends AVSource {
 	function setPauseAtPeriodEnd(periodIndex : Int, userData : Int = 0) : AVResult;
 	function setSubscribedTags(tagArray : Array<Dynamic>) : AVResult;
 	function setSubscribedTagsForBackgroundManifest(tagArray : Array<Dynamic>) : AVResult;
-	static var AUDIO(default,never) : String;
-	static var AUDIO_DESCRIPTION(default,never) : String;
-	static var AUDIO_LANGUAGE(default,never) : String;
-	static var AUDIO_PID(default,never) : String;
-	static var DASH(default,never) : String;
-	static var DATA(default,never) : String;
-	static var DATA_DESCRIPTION(default,never) : String;
-	static var HLS(default,never) : String;
-	static var VIDEO(default,never) : String;
-	static var VIDEO_DESCRIPTION(default,never) : String;
+	private function set_cookieHeader(value : String) : String;
+	private function set_masterUpdateInterval(value : Int) : Int;
+	private function set_networkingParams(value : AVNetworkingParams) : AVNetworkingParams;
+	private function set_useRedirectedUrl(value : Bool) : Bool;
+	static final AUDIO : String;
+	static final AUDIO_DESCRIPTION : String;
+	static final AUDIO_LANGUAGE : String;
+	static final AUDIO_PID : String;
+	static final DASH : String;
+	static final DATA : String;
+	static final DATA_DESCRIPTION : String;
+	static final HLS : String;
+	static final VIDEO : String;
+	static final VIDEO_DESCRIPTION : String;
 }
diff --git a/std/flash/media/AVStream.hx b/std/flash/media/AVStream.hx
index e98442cecc6894a8c28f5ccae138e1038ae53176..272037b9f2dc408a23b083783371a90d44f4bf62 100644
--- a/std/flash/media/AVStream.hx
+++ b/std/flash/media/AVStream.hx
@@ -1,26 +1,39 @@
 package flash.media;
 
 extern class AVStream extends flash.events.EventDispatcher {
-	var backBufferLength(default,never) : Float;
-	var backBufferTime(never,default) : Float;
-	var bufferLength(default,never) : Float;
-	var bufferTime(never,default) : Float;
-	var captionStyle(never,default) : AVCaptionStyle;
-	var captionsEnabled : Bool;
-	var clientLivePoint(default,never) : Float;
-	var currentFPS(default,never) : Float;
-	var decoderType(default,never) : String;
-	var droppedFrames(default,never) : Int;
-	var frameTime(default,never) : Float;
-	var initialBufferTime(never,default) : Float;
-	var playState(default,never) : AVPlayState;
-	var renderType(default,never) : String;
-	var time(default,never) : Float;
-	var useHardwareDecoder : Bool;
-	var volume : Float;
+	@:flash.property var backBufferLength(get,never) : Float;
+	@:flash.property var backBufferTime(never,set) : Float;
+	@:flash.property var bufferLength(get,never) : Float;
+	@:flash.property var bufferTime(never,set) : Float;
+	@:flash.property var captionStyle(never,set) : AVCaptionStyle;
+	@:flash.property var captionsEnabled(get,set) : Bool;
+	@:flash.property var clientLivePoint(get,never) : Float;
+	@:flash.property var currentFPS(get,never) : Float;
+	@:flash.property var decoderType(get,never) : String;
+	@:flash.property var droppedFrames(get,never) : Int;
+	@:flash.property var frameTime(get,never) : Float;
+	@:flash.property var initialBufferTime(never,set) : Float;
+	@:flash.property var playState(get,never) : AVPlayState;
+	@:flash.property var renderType(get,never) : String;
+	@:flash.property var time(get,never) : Float;
+	@:flash.property var useHardwareDecoder(get,set) : Bool;
+	@:flash.property var volume(get,set) : Float;
 	function new(source : AVSource) : Void;
 	function dispose() : Void;
 	function fastForward(rate : Float) : AVResult;
+	private function get_backBufferLength() : Float;
+	private function get_bufferLength() : Float;
+	private function get_captionsEnabled() : Bool;
+	private function get_clientLivePoint() : Float;
+	private function get_currentFPS() : Float;
+	private function get_decoderType() : String;
+	private function get_droppedFrames() : Int;
+	private function get_frameTime() : Float;
+	private function get_playState() : AVPlayState;
+	private function get_renderType() : String;
+	private function get_time() : Float;
+	private function get_useHardwareDecoder() : Bool;
+	private function get_volume() : Float;
 	function pause() : AVResult;
 	function play() : AVResult;
 	function resume() : Bool;
@@ -30,8 +43,15 @@ extern class AVStream extends flash.events.EventDispatcher {
 	function seekToLivePoint() : AVResult;
 	function seekToLocalTime(periodIndex : Int, time : Float) : AVResult;
 	function setPlaySpeed(speed : Float, reserved : Float) : Void;
+	private function set_backBufferTime(value : Float) : Float;
+	private function set_bufferTime(value : Float) : Float;
+	private function set_captionStyle(value : AVCaptionStyle) : AVCaptionStyle;
+	private function set_captionsEnabled(value : Bool) : Bool;
+	private function set_initialBufferTime(value : Float) : Float;
+	private function set_useHardwareDecoder(value : Bool) : Bool;
+	private function set_volume(value : Float) : Float;
 	function step(frames : Int) : AVResult;
-	static var HARDWARE(default,never) : String;
-	static var SOFTWARE(default,never) : String;
-	static var UNDEFINED(default,never) : String;
+	static final HARDWARE : String;
+	static final SOFTWARE : String;
+	static final UNDEFINED : String;
 }
diff --git a/std/flash/media/AVTagData.hx b/std/flash/media/AVTagData.hx
index 6f3d42b652e41a97eaeef70885b84cf78306b66c..0d1272a6f94e884c91af45fa837787961c765f8d 100644
--- a/std/flash/media/AVTagData.hx
+++ b/std/flash/media/AVTagData.hx
@@ -1,7 +1,9 @@
 package flash.media;
 
 extern class AVTagData {
-	var data(default,never) : String;
-	var localTime(default,never) : Float;
+	@:flash.property var data(get,never) : String;
+	@:flash.property var localTime(get,never) : Float;
 	function new(init_data : String, init_localTime : Float) : Void;
+	private function get_data() : String;
+	private function get_localTime() : Float;
 }
diff --git a/std/flash/media/AVTimeline.hx b/std/flash/media/AVTimeline.hx
index b5ebd161462c7732473a415bbf3d271a294e1aaf..e939c8cfd97ed5b9806b330d217a10f667a04c48 100644
--- a/std/flash/media/AVTimeline.hx
+++ b/std/flash/media/AVTimeline.hx
@@ -1,13 +1,21 @@
 package flash.media;
 
 extern class AVTimeline {
-	var complete(default,never) : Bool;
-	var firstPeriodIndex(default,never) : Int;
-	var firstSubscribedTagIndex(default,never) : Int;
-	var lastPeriodIndex(default,never) : Int;
-	var lastSubscribedTagIndex(default,never) : Int;
-	var type(default,never) : String;
-	var virtualDuration(default,never) : Float;
-	var virtualStartTime(default,never) : Float;
+	@:flash.property var complete(get,never) : Bool;
+	@:flash.property var firstPeriodIndex(get,never) : Int;
+	@:flash.property var firstSubscribedTagIndex(get,never) : Int;
+	@:flash.property var lastPeriodIndex(get,never) : Int;
+	@:flash.property var lastSubscribedTagIndex(get,never) : Int;
+	@:flash.property var type(get,never) : String;
+	@:flash.property var virtualDuration(get,never) : Float;
+	@:flash.property var virtualStartTime(get,never) : Float;
 	function new(init_type : String, init_virtualStartTime : Float, init_virtualDuration : Float, init_firstPeriodIndex : Int, init_lastPeriodIndex : Int, init_firstSubscribedIndex : Int, init_lastSubscribedIndex : Int, init_complete : Bool) : Void;
+	private function get_complete() : Bool;
+	private function get_firstPeriodIndex() : Int;
+	private function get_firstSubscribedTagIndex() : Int;
+	private function get_lastPeriodIndex() : Int;
+	private function get_lastSubscribedTagIndex() : Int;
+	private function get_type() : String;
+	private function get_virtualDuration() : Float;
+	private function get_virtualStartTime() : Float;
 }
diff --git a/std/flash/media/AVTrackInfo.hx b/std/flash/media/AVTrackInfo.hx
index 8ca3777a4509f47a6d067995dfdf61b56ac71282..08dbd284942bb4f03179d0758e9ea52257436a4b 100644
--- a/std/flash/media/AVTrackInfo.hx
+++ b/std/flash/media/AVTrackInfo.hx
@@ -1,16 +1,24 @@
 package flash.media;
 
 extern class AVTrackInfo {
-	var activity(default,never) : Bool;
-	var autoSelect(default,never) : Bool;
-	var dataTrackInfoServiceType(default,never) : String;
-	var defaultTrack(default,never) : Bool;
-	var description(default,never) : String;
-	var forced(default,never) : Bool;
-	var language(default,never) : String;
-	var pid(default,never) : Int;
+	@:flash.property var activity(get,never) : Bool;
+	@:flash.property var autoSelect(get,never) : Bool;
+	@:flash.property var dataTrackInfoServiceType(get,never) : String;
+	@:flash.property var defaultTrack(get,never) : Bool;
+	@:flash.property var description(get,never) : String;
+	@:flash.property var forced(get,never) : Bool;
+	@:flash.property var language(get,never) : String;
+	@:flash.property var pid(get,never) : Int;
 	function new(init_description : String, init_language : String, init_defaultTrack : Bool, init_autoSelect : Bool, init_forced : Bool, init_activity : Bool, init_dataTrackInfoServiceType : String, init_pid : Int) : Void;
-	static var DTI_608_CAPTIONS(default,never) : String;
-	static var DTI_708_CAPTIONS(default,never) : String;
-	static var DTI_WEBVTT_CAPTIONS(default,never) : String;
+	private function get_activity() : Bool;
+	private function get_autoSelect() : Bool;
+	private function get_dataTrackInfoServiceType() : String;
+	private function get_defaultTrack() : Bool;
+	private function get_description() : String;
+	private function get_forced() : Bool;
+	private function get_language() : String;
+	private function get_pid() : Int;
+	static final DTI_608_CAPTIONS : String;
+	static final DTI_708_CAPTIONS : String;
+	static final DTI_WEBVTT_CAPTIONS : String;
 }
diff --git a/std/flash/media/AVURLLoader.hx b/std/flash/media/AVURLLoader.hx
index 05c4ca9715af600f87e592348c79c3fa419ea22e..4f9fd81b9b9c77e4b22fe66dd295a2c05c19cb5e 100644
--- a/std/flash/media/AVURLLoader.hx
+++ b/std/flash/media/AVURLLoader.hx
@@ -1,7 +1,8 @@
 package flash.media;
 
 extern class AVURLLoader extends flash.net.URLLoader {
-	var cookieHeader(never,default) : String;
+	@:flash.property var cookieHeader(never,set) : String;
 	var stream : AVURLStream;
 	function new(?request : flash.net.URLRequest) : Void;
+	private function set_cookieHeader(value : String) : String;
 }
diff --git a/std/flash/media/AVURLStream.hx b/std/flash/media/AVURLStream.hx
index 6e6ef8ff028e1e131c3fd2e644332a2c6bc2ac9b..ea59d6597bb7e27c3db8031208bfb95a75aa1712 100644
--- a/std/flash/media/AVURLStream.hx
+++ b/std/flash/media/AVURLStream.hx
@@ -1,6 +1,7 @@
 package flash.media;
 
 extern class AVURLStream extends flash.net.URLStream {
-	var cookieHeader(never,default) : String;
+	@:flash.property var cookieHeader(never,set) : String;
 	function new() : Void;
+	private function set_cookieHeader(value : String) : String;
 }
diff --git a/std/flash/media/AudioDecoder.hx b/std/flash/media/AudioDecoder.hx
index a4fe5e9551547163af58edf98000ba66cd12305c..a4cac29bbd35d697f24625c365c4d0e2dd262119 100644
--- a/std/flash/media/AudioDecoder.hx
+++ b/std/flash/media/AudioDecoder.hx
@@ -2,10 +2,10 @@ package flash.media;
 
 extern class AudioDecoder {
 	function new() : Void;
-	static var DOLBY_DIGITAL(default,never) : String;
-	static var DOLBY_DIGITAL_PLUS(default,never) : String;
-	static var DTS(default,never) : String;
-	static var DTS_EXPRESS(default,never) : String;
-	static var DTS_HD_HIGH_RESOLUTION_AUDIO(default,never) : String;
-	static var DTS_HD_MASTER_AUDIO(default,never) : String;
+	static final DOLBY_DIGITAL : String;
+	static final DOLBY_DIGITAL_PLUS : String;
+	static final DTS : String;
+	static final DTS_EXPRESS : String;
+	static final DTS_HD_HIGH_RESOLUTION_AUDIO : String;
+	static final DTS_HD_MASTER_AUDIO : String;
 }
diff --git a/std/flash/media/AudioDeviceManager.hx b/std/flash/media/AudioDeviceManager.hx
new file mode 100644
index 0000000000000000000000000000000000000000..791aba665a1a532064460a7493a599f33e40bd4e
--- /dev/null
+++ b/std/flash/media/AudioDeviceManager.hx
@@ -0,0 +1,14 @@
+package flash.media;
+
+extern final class AudioDeviceManager extends flash.events.EventDispatcher {
+	@:flash.property var deviceNames(get,never) : Array<Dynamic>;
+	@:flash.property var selectedDeviceIndex(get,set) : Int;
+	function new() : Void;
+	private function get_deviceNames() : Array<Dynamic>;
+	private function get_selectedDeviceIndex() : Int;
+	private function set_selectedDeviceIndex(value : Int) : Int;
+	@:flash.property static var audioDeviceManager(get,never) : AudioDeviceManager;
+	@:flash.property static var isSupported(get,never) : Bool;
+	private static function get_audioDeviceManager() : AudioDeviceManager;
+	private static function get_isSupported() : Bool;
+}
diff --git a/std/flash/media/AudioOutputChangeReason.hx b/std/flash/media/AudioOutputChangeReason.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3e12b6cb0c014adb5ef345132e699aa4c1e6528e
--- /dev/null
+++ b/std/flash/media/AudioOutputChangeReason.hx
@@ -0,0 +1,7 @@
+package flash.media;
+
+extern class AudioOutputChangeReason {
+	function new() : Void;
+	static final DEVICE_CHANGE : String;
+	static final USER_SELECTION : String;
+}
diff --git a/std/flash/media/Camera.hx b/std/flash/media/Camera.hx
index 75f0ef79e235628a715501a60bdbaef66912e9f8..033410a5e114b8421b049959588f4e9a156ef0c9 100644
--- a/std/flash/media/Camera.hx
+++ b/std/flash/media/Camera.hx
@@ -1,33 +1,50 @@
 package flash.media;
 
-@:final extern class Camera extends flash.events.EventDispatcher {
-	var activityLevel(default,never) : Float;
-	var bandwidth(default,never) : Int;
-	var currentFPS(default,never) : Float;
-	var fps(default,never) : Float;
-	var height(default,never) : Int;
-	var index(default,never) : Int;
-	var keyFrameInterval(default,never) : Int;
-	var loopback(default,never) : Bool;
-	var motionLevel(default,never) : Int;
-	var motionTimeout(default,never) : Int;
-	var muted(default,never) : Bool;
-	var name(default,never) : String;
-	@:require(flash11_2) var position(default,never) : String;
-	var quality(default,never) : Int;
-	var width(default,never) : Int;
+extern final class Camera extends flash.events.EventDispatcher {
+	@:flash.property var activityLevel(get,never) : Float;
+	@:flash.property var bandwidth(get,never) : Int;
+	@:flash.property var currentFPS(get,never) : Float;
+	@:flash.property var fps(get,never) : Float;
+	@:flash.property var height(get,never) : Int;
+	@:flash.property var index(get,never) : Int;
+	@:flash.property var keyFrameInterval(get,never) : Int;
+	@:flash.property var loopback(get,never) : Bool;
+	@:flash.property var motionLevel(get,never) : Int;
+	@:flash.property var motionTimeout(get,never) : Int;
+	@:flash.property var muted(get,never) : Bool;
+	@:flash.property var name(get,never) : String;
+	@:flash.property @:require(flash11_2) var position(get,never) : String;
+	@:flash.property var quality(get,never) : Int;
+	@:flash.property var width(get,never) : Int;
 	function new() : Void;
 	@:require(flash11_4) function copyToByteArray(rect : flash.geom.Rectangle, destination : flash.utils.ByteArray) : Void;
 	@:require(flash11_4) function copyToVector(rect : flash.geom.Rectangle, destination : flash.Vector<UInt>) : Void;
 	@:require(flash11_4) function drawToBitmapData(destination : flash.display.BitmapData) : Void;
+	private function get_activityLevel() : Float;
+	private function get_bandwidth() : Int;
+	private function get_currentFPS() : Float;
+	private function get_fps() : Float;
+	private function get_height() : Int;
+	private function get_index() : Int;
+	private function get_keyFrameInterval() : Int;
+	private function get_loopback() : Bool;
+	private function get_motionLevel() : Int;
+	private function get_motionTimeout() : Int;
+	private function get_muted() : Bool;
+	private function get_name() : String;
+	private function get_position() : String;
+	private function get_quality() : Int;
+	private function get_width() : Int;
 	function setCursor(value : Bool) : Void;
 	function setKeyFrameInterval(keyFrameInterval : Int) : Void;
 	function setLoopback(compress : Bool = false) : Void;
 	function setMode(width : Int, height : Int, fps : Float, favorArea : Bool = true) : Void;
 	function setMotionLevel(motionLevel : Int, timeout : Int = 2000) : Void;
 	function setQuality(bandwidth : Int, quality : Int) : Void;
-	@:require(flash10_1) static var isSupported(default,never) : Bool;
-	static var names(default,never) : Array<Dynamic>;
-	@:require(flash10_1) static function _scanHardware() : Void;
+	@:flash.property @:require(flash10_1) static var isSupported(get,never) : Bool;
+	@:flash.property static var names(get,never) : Array<Dynamic>;
+	@:ns("flash.media",internal) @:require(flash10_1) static function _scanHardware() : Void;
 	static function getCamera(?name : String) : Camera;
+	private static function get_isSupported() : Bool;
+	private static function get_names() : Array<Dynamic>;
 }
diff --git a/std/flash/media/H264Level.hx b/std/flash/media/H264Level.hx
index 02f62e1a5ea06823683bca93bddbad6247aa0765..e908c84f83d8e99dee7822f4965649b3748fd3bb 100644
--- a/std/flash/media/H264Level.hx
+++ b/std/flash/media/H264Level.hx
@@ -2,20 +2,20 @@ package flash.media;
 
 extern class H264Level {
 	function new() : Void;
-	static var LEVEL_1(default,never) : String;
-	static var LEVEL_1B(default,never) : String;
-	static var LEVEL_1_1(default,never) : String;
-	static var LEVEL_1_2(default,never) : String;
-	static var LEVEL_1_3(default,never) : String;
-	static var LEVEL_2(default,never) : String;
-	static var LEVEL_2_1(default,never) : String;
-	static var LEVEL_2_2(default,never) : String;
-	static var LEVEL_3(default,never) : String;
-	static var LEVEL_3_1(default,never) : String;
-	static var LEVEL_3_2(default,never) : String;
-	static var LEVEL_4(default,never) : String;
-	static var LEVEL_4_1(default,never) : String;
-	static var LEVEL_4_2(default,never) : String;
-	static var LEVEL_5(default,never) : String;
-	static var LEVEL_5_1(default,never) : String;
+	static final LEVEL_1 : String;
+	static final LEVEL_1B : String;
+	static final LEVEL_1_1 : String;
+	static final LEVEL_1_2 : String;
+	static final LEVEL_1_3 : String;
+	static final LEVEL_2 : String;
+	static final LEVEL_2_1 : String;
+	static final LEVEL_2_2 : String;
+	static final LEVEL_3 : String;
+	static final LEVEL_3_1 : String;
+	static final LEVEL_3_2 : String;
+	static final LEVEL_4 : String;
+	static final LEVEL_4_1 : String;
+	static final LEVEL_4_2 : String;
+	static final LEVEL_5 : String;
+	static final LEVEL_5_1 : String;
 }
diff --git a/std/flash/media/H264Profile.hx b/std/flash/media/H264Profile.hx
index 92ec292899a914bfa2c29cc2555401623a6ab7db..41ba13a5d271d45bdb7d1d6dcfcc11ee0b0f0b9f 100644
--- a/std/flash/media/H264Profile.hx
+++ b/std/flash/media/H264Profile.hx
@@ -2,6 +2,6 @@ package flash.media;
 
 extern class H264Profile {
 	function new() : Void;
-	static var BASELINE(default,never) : String;
-	static var MAIN(default,never) : String;
+	static final BASELINE : String;
+	static final MAIN : String;
 }
diff --git a/std/flash/media/H264VideoStreamSettings.hx b/std/flash/media/H264VideoStreamSettings.hx
index cc2c6e4eb7b880fee514d161ac41e10825f60605..7086be17cbada563a0835cfc2c4f629b6bceb64d 100644
--- a/std/flash/media/H264VideoStreamSettings.hx
+++ b/std/flash/media/H264VideoStreamSettings.hx
@@ -1,8 +1,10 @@
 package flash.media;
 
 extern class H264VideoStreamSettings extends VideoStreamSettings {
-	var level(default,never) : String;
-	var profile(default,never) : String;
+	@:flash.property var level(get,never) : String;
+	@:flash.property var profile(get,never) : String;
 	function new() : Void;
+	private function get_level() : String;
+	private function get_profile() : String;
 	function setProfileLevel(profile : String, level : String) : Void;
 }
diff --git a/std/flash/media/ID3Info.hx b/std/flash/media/ID3Info.hx
index 235a97b0280e82fbe5552f2bfcde4f3aee7b6581..aef5c75c65c4e44321e5c8995bc8dfe25bd95264 100644
--- a/std/flash/media/ID3Info.hx
+++ b/std/flash/media/ID3Info.hx
@@ -1,6 +1,6 @@
 package flash.media;
 
-@:final extern class ID3Info implements Dynamic {
+extern final class ID3Info implements Dynamic {
 	var album : String;
 	var artist : String;
 	var comment : String;
diff --git a/std/flash/media/Microphone.hx b/std/flash/media/Microphone.hx
index f2daac99b2066425df241b907af8f19130cc6540..4fd568fb5aa9a1cd7ad78a32ade732b1e660681e 100644
--- a/std/flash/media/Microphone.hx
+++ b/std/flash/media/Microphone.hx
@@ -1,28 +1,55 @@
 package flash.media;
 
-@:final extern class Microphone extends flash.events.EventDispatcher {
-	var activityLevel(default,never) : Float;
-	@:require(flash10) var codec : SoundCodec;
-	@:require(flash10_1) var enableVAD : Bool;
-	@:require(flash10) var encodeQuality : Int;
-	@:require(flash10_2) var enhancedOptions : MicrophoneEnhancedOptions;
-	@:require(flash10) var framesPerPacket : Int;
-	var gain : Float;
-	var index(default,never) : Int;
-	var muted(default,never) : Bool;
-	var name(default,never) : String;
-	@:require(flash10_1) var noiseSuppressionLevel : Int;
-	var rate : Int;
-	var silenceLevel(default,never) : Float;
-	var silenceTimeout(default,never) : Int;
-	var soundTransform : SoundTransform;
-	var useEchoSuppression(default,never) : Bool;
+extern final class Microphone extends flash.events.EventDispatcher {
+	@:flash.property var activityLevel(get,never) : Float;
+	@:flash.property @:require(flash10) var codec(get,set) : SoundCodec;
+	@:flash.property @:require(flash10_1) var enableVAD(get,set) : Bool;
+	@:flash.property @:require(flash10) var encodeQuality(get,set) : Int;
+	@:flash.property @:require(flash10_2) var enhancedOptions(get,set) : MicrophoneEnhancedOptions;
+	@:flash.property @:require(flash10) var framesPerPacket(get,set) : Int;
+	@:flash.property var gain(get,set) : Float;
+	@:flash.property var index(get,never) : Int;
+	@:flash.property var muted(get,never) : Bool;
+	@:flash.property var name(get,never) : String;
+	@:flash.property @:require(flash10_1) var noiseSuppressionLevel(get,set) : Int;
+	@:flash.property var rate(get,set) : Int;
+	@:flash.property var silenceLevel(get,never) : Float;
+	@:flash.property var silenceTimeout(get,never) : Int;
+	@:flash.property var soundTransform(get,set) : SoundTransform;
+	@:flash.property var useEchoSuppression(get,never) : Bool;
 	function new() : Void;
+	private function get_activityLevel() : Float;
+	private function get_codec() : SoundCodec;
+	private function get_enableVAD() : Bool;
+	private function get_encodeQuality() : Int;
+	private function get_enhancedOptions() : MicrophoneEnhancedOptions;
+	private function get_framesPerPacket() : Int;
+	private function get_gain() : Float;
+	private function get_index() : Int;
+	private function get_muted() : Bool;
+	private function get_name() : String;
+	private function get_noiseSuppressionLevel() : Int;
+	private function get_rate() : Int;
+	private function get_silenceLevel() : Float;
+	private function get_silenceTimeout() : Int;
+	private function get_soundTransform() : SoundTransform;
+	private function get_useEchoSuppression() : Bool;
 	function setLoopBack(state : Bool = true) : Void;
 	function setSilenceLevel(silenceLevel : Float, timeout : Int = -1) : Void;
 	function setUseEchoSuppression(useEchoSuppression : Bool) : Void;
-	@:require(flash10_1) static var isSupported(default,never) : Bool;
-	static var names(default,never) : Array<Dynamic>;
+	private function set_codec(value : SoundCodec) : SoundCodec;
+	private function set_enableVAD(value : Bool) : Bool;
+	private function set_encodeQuality(value : Int) : Int;
+	private function set_enhancedOptions(value : MicrophoneEnhancedOptions) : MicrophoneEnhancedOptions;
+	private function set_framesPerPacket(value : Int) : Int;
+	private function set_gain(value : Float) : Float;
+	private function set_noiseSuppressionLevel(value : Int) : Int;
+	private function set_rate(value : Int) : Int;
+	private function set_soundTransform(value : SoundTransform) : SoundTransform;
+	@:flash.property @:require(flash10_1) static var isSupported(get,never) : Bool;
+	@:flash.property static var names(get,never) : Array<Dynamic>;
 	@:require(flash10_2) static function getEnhancedMicrophone(index : Int = -1) : Microphone;
 	static function getMicrophone(index : Int = -1) : Microphone;
+	private static function get_isSupported() : Bool;
+	private static function get_names() : Array<Dynamic>;
 }
diff --git a/std/flash/media/MicrophoneEnhancedMode.hx b/std/flash/media/MicrophoneEnhancedMode.hx
index 82a6b90ae512a6ef6f64375026e1ec0f4c19b917..7d21c3fde4cfc0e0b3e8851bed4dd39bb8db1cff 100644
--- a/std/flash/media/MicrophoneEnhancedMode.hx
+++ b/std/flash/media/MicrophoneEnhancedMode.hx
@@ -1,9 +1,9 @@
 package flash.media;
 
-@:fakeEnum(String) @:require(flash10_2) extern enum MicrophoneEnhancedMode {
-	FULL_DUPLEX;
-	HALF_DUPLEX;
-	HEADSET;
-	OFF;
-	SPEAKER_MUTE;
+@:native("flash.media.MicrophoneEnhancedMode") @:require(flash10_2) extern enum abstract MicrophoneEnhancedMode(String) {
+	var FULL_DUPLEX;
+	var HALF_DUPLEX;
+	var HEADSET;
+	var OFF;
+	var SPEAKER_MUTE;
 }
diff --git a/std/flash/media/MicrophoneEnhancedOptions.hx b/std/flash/media/MicrophoneEnhancedOptions.hx
index 7a5b6ebf8a821637d553b162cc26a4d704006f77..d9bd921fb36da55d0388c1df5554b978bdfec0d2 100644
--- a/std/flash/media/MicrophoneEnhancedOptions.hx
+++ b/std/flash/media/MicrophoneEnhancedOptions.hx
@@ -1,10 +1,20 @@
 package flash.media;
 
-@:final @:require(flash10_2) extern class MicrophoneEnhancedOptions {
-	var autoGain : Bool;
-	var echoPath : Int;
-	var isVoiceDetected : Int;
-	var mode : MicrophoneEnhancedMode;
-	var nonLinearProcessing : Bool;
+@:require(flash10_2) extern final class MicrophoneEnhancedOptions {
+	@:flash.property var autoGain(get,set) : Bool;
+	@:flash.property var echoPath(get,set) : Int;
+	@:flash.property var isVoiceDetected(get,set) : Int;
+	@:flash.property var mode(get,set) : MicrophoneEnhancedMode;
+	@:flash.property var nonLinearProcessing(get,set) : Bool;
 	function new() : Void;
+	private function get_autoGain() : Bool;
+	private function get_echoPath() : Int;
+	private function get_isVoiceDetected() : Int;
+	private function get_mode() : MicrophoneEnhancedMode;
+	private function get_nonLinearProcessing() : Bool;
+	private function set_autoGain(value : Bool) : Bool;
+	private function set_echoPath(value : Int) : Int;
+	private function set_isVoiceDetected(value : Int) : Int;
+	private function set_mode(value : MicrophoneEnhancedMode) : MicrophoneEnhancedMode;
+	private function set_nonLinearProcessing(value : Bool) : Bool;
 }
diff --git a/std/flash/media/Sound.hx b/std/flash/media/Sound.hx
index 6fda1e36b383484179c1ea3225c400349d162433..45b2e195eaf071773872ac6db6b4a777ee604db2 100644
--- a/std/flash/media/Sound.hx
+++ b/std/flash/media/Sound.hx
@@ -1,16 +1,23 @@
 package flash.media;
 
 extern class Sound extends flash.events.EventDispatcher {
-	var bytesLoaded(default,never) : UInt;
-	var bytesTotal(default,never) : Int;
-	var id3(default,never) : ID3Info;
-	var isBuffering(default,never) : Bool;
-	@:require(flash10_1) var isURLInaccessible(default,never) : Bool;
-	var length(default,never) : Float;
-	var url(default,never) : String;
+	@:flash.property var bytesLoaded(get,never) : UInt;
+	@:flash.property var bytesTotal(get,never) : Int;
+	@:flash.property var id3(get,never) : ID3Info;
+	@:flash.property var isBuffering(get,never) : Bool;
+	@:flash.property @:require(flash10_1) var isURLInaccessible(get,never) : Bool;
+	@:flash.property var length(get,never) : Float;
+	@:flash.property var url(get,never) : String;
 	function new(?stream : flash.net.URLRequest, ?context : SoundLoaderContext) : Void;
 	function close() : Void;
 	@:require(flash10) function extract(target : flash.utils.ByteArray, length : Float, startPosition : Float = -1) : Float;
+	private function get_bytesLoaded() : UInt;
+	private function get_bytesTotal() : Int;
+	private function get_id3() : ID3Info;
+	private function get_isBuffering() : Bool;
+	private function get_isURLInaccessible() : Bool;
+	private function get_length() : Float;
+	private function get_url() : String;
 	function load(stream : flash.net.URLRequest, ?context : SoundLoaderContext) : Void;
 	@:require(flash11) function loadCompressedDataFromByteArray(bytes : flash.utils.ByteArray, bytesLength : UInt) : Void;
 	@:require(flash11) function loadPCMFromByteArray(bytes : flash.utils.ByteArray, samples : UInt, ?format : String, stereo : Bool = true, sampleRate : Float = 44100) : Void;
diff --git a/std/flash/media/SoundChannel.hx b/std/flash/media/SoundChannel.hx
index adee7c79ce6bf6703eb0046d39ec46581acc566b..f4874997ed020e3f4ecf506c92c30b7956f637a8 100644
--- a/std/flash/media/SoundChannel.hx
+++ b/std/flash/media/SoundChannel.hx
@@ -1,10 +1,15 @@
 package flash.media;
 
-@:final extern class SoundChannel extends flash.events.EventDispatcher {
-	var leftPeak(default,never) : Float;
-	var position(default,never) : Float;
-	var rightPeak(default,never) : Float;
-	var soundTransform : SoundTransform;
+extern final class SoundChannel extends flash.events.EventDispatcher {
+	@:flash.property var leftPeak(get,never) : Float;
+	@:flash.property var position(get,never) : Float;
+	@:flash.property var rightPeak(get,never) : Float;
+	@:flash.property var soundTransform(get,set) : SoundTransform;
 	function new() : Void;
+	private function get_leftPeak() : Float;
+	private function get_position() : Float;
+	private function get_rightPeak() : Float;
+	private function get_soundTransform() : SoundTransform;
+	private function set_soundTransform(value : SoundTransform) : SoundTransform;
 	function stop() : Void;
 }
diff --git a/std/flash/media/SoundCodec.hx b/std/flash/media/SoundCodec.hx
index b2d93cdd0b19873a4d7e754ffa44410b3abfcf62..ec09fde00e93b708a926af3686be18c5d2389299 100644
--- a/std/flash/media/SoundCodec.hx
+++ b/std/flash/media/SoundCodec.hx
@@ -1,8 +1,8 @@
 package flash.media;
 
-@:fakeEnum(String) extern enum SoundCodec {
-	NELLYMOSER;
-	PCMA;
-	PCMU;
-	SPEEX;
+@:native("flash.media.SoundCodec") extern enum abstract SoundCodec(String) {
+	var NELLYMOSER;
+	var PCMA;
+	var PCMU;
+	var SPEEX;
 }
diff --git a/std/flash/media/SoundMixer.hx b/std/flash/media/SoundMixer.hx
index 7eb50ff538a6162329713122e30d029e4ebd7906..5b31805e2adfb32dc62a5652ad76663f374e4301 100644
--- a/std/flash/media/SoundMixer.hx
+++ b/std/flash/media/SoundMixer.hx
@@ -1,11 +1,19 @@
 package flash.media;
 
 extern class SoundMixer {
-	static var audioPlaybackMode : String;
-	static var bufferTime : Int;
-	static var soundTransform : SoundTransform;
-	static var useSpeakerphoneForVoice : Bool;
+	@:flash.property static var audioPlaybackMode(get,set) : String;
+	@:flash.property static var bufferTime(get,set) : Int;
+	@:flash.property static var soundTransform(get,set) : SoundTransform;
+	@:flash.property static var useSpeakerphoneForVoice(get,set) : Bool;
 	static function areSoundsInaccessible() : Bool;
 	static function computeSpectrum(outputArray : flash.utils.ByteArray, FFTMode : Bool = false, stretchFactor : Int = 0) : Void;
+	private static function get_audioPlaybackMode() : String;
+	private static function get_bufferTime() : Int;
+	private static function get_soundTransform() : SoundTransform;
+	private static function get_useSpeakerphoneForVoice() : Bool;
+	private static function set_audioPlaybackMode(value : String) : String;
+	private static function set_bufferTime(value : Int) : Int;
+	private static function set_soundTransform(value : SoundTransform) : SoundTransform;
+	private static function set_useSpeakerphoneForVoice(value : Bool) : Bool;
 	static function stopAll() : Void;
 }
diff --git a/std/flash/media/SoundTransform.hx b/std/flash/media/SoundTransform.hx
index 91b8eda43167145d7311a4c36fac24ae93462240..53ec3deb51375fed3ceb9fdab4dbedbfef054079 100644
--- a/std/flash/media/SoundTransform.hx
+++ b/std/flash/media/SoundTransform.hx
@@ -1,11 +1,23 @@
 package flash.media;
 
-@:final extern class SoundTransform {
-	var leftToLeft : Float;
-	var leftToRight : Float;
-	var pan : Float;
-	var rightToLeft : Float;
-	var rightToRight : Float;
-	var volume : Float;
+extern final class SoundTransform {
+	@:flash.property var leftToLeft(get,set) : Float;
+	@:flash.property var leftToRight(get,set) : Float;
+	@:flash.property var pan(get,set) : Float;
+	@:flash.property var rightToLeft(get,set) : Float;
+	@:flash.property var rightToRight(get,set) : Float;
+	@:flash.property var volume(get,set) : Float;
 	function new(vol : Float = 1, panning : Float = 0) : Void;
+	private function get_leftToLeft() : Float;
+	private function get_leftToRight() : Float;
+	private function get_pan() : Float;
+	private function get_rightToLeft() : Float;
+	private function get_rightToRight() : Float;
+	private function get_volume() : Float;
+	private function set_leftToLeft(value : Float) : Float;
+	private function set_leftToRight(value : Float) : Float;
+	private function set_pan(value : Float) : Float;
+	private function set_rightToLeft(value : Float) : Float;
+	private function set_rightToRight(value : Float) : Float;
+	private function set_volume(value : Float) : Float;
 }
diff --git a/std/flash/media/StageVideo.hx b/std/flash/media/StageVideo.hx
index 39a716e566cdd8d20ff0a5efd3d7c28c205d0356..70e3b0a59cac82d96309e1b497214affa4a351e7 100644
--- a/std/flash/media/StageVideo.hx
+++ b/std/flash/media/StageVideo.hx
@@ -1,15 +1,26 @@
 package flash.media;
 
 @:require(flash10_2) extern class StageVideo extends flash.events.EventDispatcher {
-	var colorSpaces(default,never) : flash.Vector<String>;
-	var depth : Int;
-	var pan : flash.geom.Point;
-	var videoHeight(default,never) : Int;
-	var videoWidth(default,never) : Int;
-	var viewPort : flash.geom.Rectangle;
-	var zoom : flash.geom.Point;
+	@:flash.property var colorSpaces(get,never) : flash.Vector<String>;
+	@:flash.property var depth(get,set) : Int;
+	@:flash.property var pan(get,set) : flash.geom.Point;
+	@:flash.property var videoHeight(get,never) : Int;
+	@:flash.property var videoWidth(get,never) : Int;
+	@:flash.property var viewPort(get,set) : flash.geom.Rectangle;
+	@:flash.property var zoom(get,set) : flash.geom.Point;
 	function new() : Void;
 	@:require(flash11_7) function attachAVStream(avStream : AVStream) : Void;
 	@:require(flash11_4) function attachCamera(theCamera : Camera) : Void;
 	function attachNetStream(netStream : flash.net.NetStream) : Void;
+	private function get_colorSpaces() : flash.Vector<String>;
+	private function get_depth() : Int;
+	private function get_pan() : flash.geom.Point;
+	private function get_videoHeight() : Int;
+	private function get_videoWidth() : Int;
+	private function get_viewPort() : flash.geom.Rectangle;
+	private function get_zoom() : flash.geom.Point;
+	private function set_depth(value : Int) : Int;
+	private function set_pan(value : flash.geom.Point) : flash.geom.Point;
+	private function set_viewPort(value : flash.geom.Rectangle) : flash.geom.Rectangle;
+	private function set_zoom(value : flash.geom.Point) : flash.geom.Point;
 }
diff --git a/std/flash/media/StageVideoAvailability.hx b/std/flash/media/StageVideoAvailability.hx
index 88583b489c2a98cde87cb211f2b6bf654d5507cc..cdc367686db9ccab8449745006104ec751b1c92a 100644
--- a/std/flash/media/StageVideoAvailability.hx
+++ b/std/flash/media/StageVideoAvailability.hx
@@ -2,6 +2,6 @@ package flash.media;
 
 extern class StageVideoAvailability {
 	function new() : Void;
-	static var AVAILABLE(default,never) : String;
-	static var UNAVAILABLE(default,never) : String;
+	static final AVAILABLE : String;
+	static final UNAVAILABLE : String;
 }
diff --git a/std/flash/media/StageVideoAvailabilityReason.hx b/std/flash/media/StageVideoAvailabilityReason.hx
index a09dfac3999f49379079c5fb89ee735a473b8f1b..82ff954c2f506ac6524f0385bcac57d001a405b4 100644
--- a/std/flash/media/StageVideoAvailabilityReason.hx
+++ b/std/flash/media/StageVideoAvailabilityReason.hx
@@ -2,9 +2,9 @@ package flash.media;
 
 extern class StageVideoAvailabilityReason {
 	function new() : Void;
-	static var DRIVER_TOO_OLD(default,never) : String;
-	static var NO_ERROR(default,never) : String;
-	static var UNAVAILABLE(default,never) : String;
-	static var USER_DISABLED(default,never) : String;
-	static var WMODE_INCOMPATIBLE(default,never) : String;
+	static final DRIVER_TOO_OLD : String;
+	static final NO_ERROR : String;
+	static final UNAVAILABLE : String;
+	static final USER_DISABLED : String;
+	static final WMODE_INCOMPATIBLE : String;
 }
diff --git a/std/flash/media/Video.hx b/std/flash/media/Video.hx
index f8ac7596ba7eb284a07d30e65dee78c25fe271b6..d39918a4de215a10dfdf31d2daeff5fbc8a584a5 100644
--- a/std/flash/media/Video.hx
+++ b/std/flash/media/Video.hx
@@ -1,12 +1,18 @@
 package flash.media;
 
 extern class Video extends flash.display.DisplayObject {
-	var deblocking : Int;
-	var smoothing : Bool;
-	var videoHeight(default,never) : Int;
-	var videoWidth(default,never) : Int;
+	@:flash.property var deblocking(get,set) : Int;
+	@:flash.property var smoothing(get,set) : Bool;
+	@:flash.property var videoHeight(get,never) : Int;
+	@:flash.property var videoWidth(get,never) : Int;
 	function new(width : Int = 320, height : Int = 240) : Void;
 	function attachCamera(camera : Camera) : Void;
 	function attachNetStream(netStream : flash.net.NetStream) : Void;
 	function clear() : Void;
+	private function get_deblocking() : Int;
+	private function get_smoothing() : Bool;
+	private function get_videoHeight() : Int;
+	private function get_videoWidth() : Int;
+	private function set_deblocking(value : Int) : Int;
+	private function set_smoothing(value : Bool) : Bool;
 }
diff --git a/std/flash/media/VideoCodec.hx b/std/flash/media/VideoCodec.hx
index e18325f63d8640b277e087cf387a105f0bf9d54b..42afa7c1fab95223d224ebdc4c14d5e084673c39 100644
--- a/std/flash/media/VideoCodec.hx
+++ b/std/flash/media/VideoCodec.hx
@@ -2,7 +2,7 @@ package flash.media;
 
 extern class VideoCodec {
 	function new() : Void;
-	static var H264AVC(default,never) : String;
-	static var SORENSON(default,never) : String;
-	static var VP6(default,never) : String;
+	static final H264AVC : String;
+	static final SORENSON : String;
+	static final VP6 : String;
 }
diff --git a/std/flash/media/VideoStatus.hx b/std/flash/media/VideoStatus.hx
index 0304da72d1b2a936da32f3478cdf91f663d7fed8..92e357c7eaa93b09451f322724bfad106b2b2b87 100644
--- a/std/flash/media/VideoStatus.hx
+++ b/std/flash/media/VideoStatus.hx
@@ -2,7 +2,7 @@ package flash.media;
 
 extern class VideoStatus {
 	function new() : Void;
-	static var ACCELERATED(default,never) : String;
-	static var SOFTWARE(default,never) : String;
-	static var UNAVAILABLE(default,never) : String;
+	static final ACCELERATED : String;
+	static final SOFTWARE : String;
+	static final UNAVAILABLE : String;
 }
diff --git a/std/flash/media/VideoStreamSettings.hx b/std/flash/media/VideoStreamSettings.hx
index 305d8cc7ec2a37c7716597a462f2554dc389575d..fb1a93166eaa6c28a6e391620da0ecca3cb1c5a2 100644
--- a/std/flash/media/VideoStreamSettings.hx
+++ b/std/flash/media/VideoStreamSettings.hx
@@ -1,14 +1,21 @@
 package flash.media;
 
 extern class VideoStreamSettings {
-	var bandwidth(default,never) : Int;
-	var codec(default,never) : String;
-	var fps(default,never) : Float;
-	var height(default,never) : Int;
-	var keyFrameInterval(default,never) : Int;
-	var quality(default,never) : Int;
-	var width(default,never) : Int;
+	@:flash.property var bandwidth(get,never) : Int;
+	@:flash.property var codec(get,never) : String;
+	@:flash.property var fps(get,never) : Float;
+	@:flash.property var height(get,never) : Int;
+	@:flash.property var keyFrameInterval(get,never) : Int;
+	@:flash.property var quality(get,never) : Int;
+	@:flash.property var width(get,never) : Int;
 	function new() : Void;
+	private function get_bandwidth() : Int;
+	private function get_codec() : String;
+	private function get_fps() : Float;
+	private function get_height() : Int;
+	private function get_keyFrameInterval() : Int;
+	private function get_quality() : Int;
+	private function get_width() : Int;
 	function setKeyFrameInterval(keyFrameInterval : Int) : Void;
 	function setMode(width : Int, height : Int, fps : Float) : Void;
 	function setQuality(bandwidth : Int, quality : Int) : Void;
diff --git a/std/flash/net/FileFilter.hx b/std/flash/net/FileFilter.hx
index 176144bd823072bd7873949093e7b5772f71d56d..c56204c54668d972d41b8ab894d897d0744aff78 100644
--- a/std/flash/net/FileFilter.hx
+++ b/std/flash/net/FileFilter.hx
@@ -1,8 +1,14 @@
 package flash.net;
 
-@:final extern class FileFilter {
-	var description : String;
-	var extension : String;
-	var macType : String;
+extern final class FileFilter {
+	@:flash.property var description(get,set) : String;
+	@:flash.property var extension(get,set) : String;
+	@:flash.property var macType(get,set) : String;
 	function new(description : String, extension : String, ?macType : String) : Void;
+	private function get_description() : String;
+	private function get_extension() : String;
+	private function get_macType() : String;
+	private function set_description(value : String) : String;
+	private function set_extension(value : String) : String;
+	private function set_macType(value : String) : String;
 }
diff --git a/std/flash/net/FileReference.hx b/std/flash/net/FileReference.hx
index d86d601fc90b78a0efd616b983c90ef908da1427..1ff113f00b5cb70f0dacfa1a84fc114dde2c25bd 100644
--- a/std/flash/net/FileReference.hx
+++ b/std/flash/net/FileReference.hx
@@ -1,17 +1,24 @@
 package flash.net;
 
 extern class FileReference extends flash.events.EventDispatcher {
-	var creationDate(default,never) : Date;
-	var creator(default,never) : String;
-	@:require(flash10) var data(default,never) : flash.utils.ByteArray;
-	var modificationDate(default,never) : Date;
-	var name(default,never) : String;
-	var size(default,never) : Float;
-	var type(default,never) : String;
+	@:flash.property var creationDate(get,never) : Date;
+	@:flash.property var creator(get,never) : String;
+	@:flash.property @:require(flash10) var data(get,never) : flash.utils.ByteArray;
+	@:flash.property var modificationDate(get,never) : Date;
+	@:flash.property var name(get,never) : String;
+	@:flash.property var size(get,never) : Float;
+	@:flash.property var type(get,never) : String;
 	function new() : Void;
 	function browse(?typeFilter : Array<FileFilter>) : Bool;
 	function cancel() : Void;
 	function download(request : URLRequest, ?defaultFileName : String) : Void;
+	private function get_creationDate() : Date;
+	private function get_creator() : String;
+	private function get_data() : flash.utils.ByteArray;
+	private function get_modificationDate() : Date;
+	private function get_name() : String;
+	private function get_size() : Float;
+	private function get_type() : String;
 	@:require(flash10) function load() : Void;
 	@:require(flash10) function save(data : Dynamic, ?defaultFileName : String) : Void;
 	function upload(request : URLRequest, ?uploadDataFieldName : String, testUpload : Bool = false) : Void;
diff --git a/std/flash/net/FileReferenceList.hx b/std/flash/net/FileReferenceList.hx
index decb89ddafd05a29a0fc073655de8d3e7fd774df..65a2a3fa553135e504e0d23db5c76f0b0d668d35 100644
--- a/std/flash/net/FileReferenceList.hx
+++ b/std/flash/net/FileReferenceList.hx
@@ -1,7 +1,8 @@
 package flash.net;
 
 extern class FileReferenceList extends flash.events.EventDispatcher {
-	var fileList(default,never) : Array<FileReference>;
+	@:flash.property var fileList(get,never) : Array<FileReference>;
 	function new() : Void;
 	function browse(?typeFilter : Array<FileFilter>) : Bool;
+	private function get_fileList() : Array<FileReference>;
 }
diff --git a/std/flash/net/GroupSpecifier.hx b/std/flash/net/GroupSpecifier.hx
index c04e28a635d6b8050f2a7aa869521847b32b92b0..bf76d5c8d67577b27d519569b8b313348988c096 100644
--- a/std/flash/net/GroupSpecifier.hx
+++ b/std/flash/net/GroupSpecifier.hx
@@ -1,27 +1,44 @@
 package flash.net;
 
 @:require(flash10_1) extern class GroupSpecifier {
-	var ipMulticastMemberUpdatesEnabled : Bool;
-	var minGroupspecVersion : Int;
-	var multicastEnabled : Bool;
-	var objectReplicationEnabled : Bool;
-	var peerToPeerDisabled : Bool;
-	var postingEnabled : Bool;
-	var routingEnabled : Bool;
-	var serverChannelEnabled : Bool;
+	@:flash.property var ipMulticastMemberUpdatesEnabled(get,set) : Bool;
+	@:flash.property var minGroupspecVersion(get,set) : Int;
+	@:flash.property var multicastEnabled(get,set) : Bool;
+	@:flash.property var objectReplicationEnabled(get,set) : Bool;
+	@:flash.property var peerToPeerDisabled(get,set) : Bool;
+	@:flash.property var postingEnabled(get,set) : Bool;
+	@:flash.property var routingEnabled(get,set) : Bool;
+	@:flash.property var serverChannelEnabled(get,set) : Bool;
 	function new(name : String) : Void;
 	function addBootstrapPeer(peerID : String) : Void;
 	function addIPMulticastAddress(address : String, ?port : Dynamic, ?source : String) : Void;
 	function authorizations() : String;
+	private function get_ipMulticastMemberUpdatesEnabled() : Bool;
+	private function get_minGroupspecVersion() : Int;
+	private function get_multicastEnabled() : Bool;
+	private function get_objectReplicationEnabled() : Bool;
+	private function get_peerToPeerDisabled() : Bool;
+	private function get_postingEnabled() : Bool;
+	private function get_routingEnabled() : Bool;
+	private function get_serverChannelEnabled() : Bool;
 	function groupspecWithAuthorizations() : String;
 	function groupspecWithoutAuthorizations() : String;
 	function makeUnique() : Void;
 	function setPostingPassword(?password : String, ?salt : String) : Void;
 	function setPublishPassword(?password : String, ?salt : String) : Void;
+	private function set_ipMulticastMemberUpdatesEnabled(value : Bool) : Bool;
+	private function set_minGroupspecVersion(value : Int) : Int;
+	private function set_multicastEnabled(value : Bool) : Bool;
+	private function set_objectReplicationEnabled(value : Bool) : Bool;
+	private function set_peerToPeerDisabled(value : Bool) : Bool;
+	private function set_postingEnabled(value : Bool) : Bool;
+	private function set_routingEnabled(value : Bool) : Bool;
+	private function set_serverChannelEnabled(value : Bool) : Bool;
 	function toString() : String;
-	static var maxSupportedGroupspecVersion(default,never) : Int;
+	@:flash.property static var maxSupportedGroupspecVersion(get,never) : Int;
 	static function encodeBootstrapPeerIDSpec(peerID : String) : String;
 	static function encodeIPMulticastAddressSpec(address : String, ?port : Dynamic, ?source : String) : String;
 	static function encodePostingAuthorization(password : String) : String;
 	static function encodePublishAuthorization(password : String) : String;
+	private static function get_maxSupportedGroupspecVersion() : Int;
 }
diff --git a/std/flash/net/LocalConnection.hx b/std/flash/net/LocalConnection.hx
index 5ba14b21a2871cf62630050df36c128674e88e18..c3aad344cf8c59b3fe550b89e2e287b7bf8be630 100644
--- a/std/flash/net/LocalConnection.hx
+++ b/std/flash/net/LocalConnection.hx
@@ -1,14 +1,20 @@
 package flash.net;
 
 extern class LocalConnection extends flash.events.EventDispatcher {
-	var client : Dynamic;
-	var domain(default,never) : String;
-	@:require(flash10_1) var isPerUser : Bool;
+	@:flash.property var client(get,set) : Dynamic;
+	@:flash.property var domain(get,never) : String;
+	@:flash.property @:require(flash10_1) var isPerUser(get,set) : Bool;
 	function new() : Void;
-	function allowDomain(?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
-	function allowInsecureDomain(?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
+	function allowDomain(restArgs : haxe.extern.Rest<Dynamic>) : Void;
+	function allowInsecureDomain(restArgs : haxe.extern.Rest<Dynamic>) : Void;
 	function close() : Void;
 	function connect(connectionName : String) : Void;
-	function send(connectionName : String, methodName : String, ?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
-	@:require(flash10_1) static var isSupported(default,never) : Bool;
+	private function get_client() : Dynamic;
+	private function get_domain() : String;
+	private function get_isPerUser() : Bool;
+	function send(connectionName : String, methodName : String, restArgs : haxe.extern.Rest<Dynamic>) : Void;
+	private function set_client(value : Dynamic) : Dynamic;
+	private function set_isPerUser(value : Bool) : Bool;
+	@:flash.property @:require(flash10_1) static var isSupported(get,never) : Bool;
+	private static function get_isSupported() : Bool;
 }
diff --git a/std/flash/net/NetConnection.hx b/std/flash/net/NetConnection.hx
index a2acc221b7ba8a8425462bed8a53c5c27a66da96..e5b223004c826cc5621e689df0a1aaae37924db6 100644
--- a/std/flash/net/NetConnection.hx
+++ b/std/flash/net/NetConnection.hx
@@ -1,24 +1,44 @@
 package flash.net;
 
 extern class NetConnection extends flash.events.EventDispatcher {
-	var client : Dynamic;
-	var connected(default,never) : Bool;
-	var connectedProxyType(default,never) : String;
-	@:require(flash10) var farID(default,never) : String;
-	@:require(flash10) var farNonce(default,never) : String;
-	@:require(flash10) var maxPeerConnections : UInt;
-	@:require(flash10) var nearID(default,never) : String;
-	@:require(flash10) var nearNonce(default,never) : String;
-	var objectEncoding : UInt;
-	@:require(flash10) var protocol(default,never) : String;
-	var proxyType : String;
-	@:require(flash10) var unconnectedPeerStreams(default,never) : Array<Dynamic>;
-	var uri(default,never) : String;
-	var usingTLS(default,never) : Bool;
+	@:flash.property var client(get,set) : Dynamic;
+	@:flash.property var connected(get,never) : Bool;
+	@:flash.property var connectedProxyType(get,never) : String;
+	@:flash.property @:require(flash10) var farID(get,never) : String;
+	@:flash.property @:require(flash10) var farNonce(get,never) : String;
+	@:flash.property @:require(flash10) var maxPeerConnections(get,set) : UInt;
+	@:flash.property @:require(flash10) var nearID(get,never) : String;
+	@:flash.property @:require(flash10) var nearNonce(get,never) : String;
+	@:flash.property var objectEncoding(get,set) : UInt;
+	@:flash.property @:require(flash10) var protocol(get,never) : String;
+	@:flash.property var proxyType(get,set) : String;
+	@:flash.property @:require(flash10) var unconnectedPeerStreams(get,never) : Array<Dynamic>;
+	@:flash.property var uri(get,never) : String;
+	@:flash.property var usingTLS(get,never) : Bool;
 	function new() : Void;
 	function addHeader(operation : String, mustUnderstand : Bool = false, ?param : flash.utils.Object) : Void;
-	function call(command : String, responder : Responder, ?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
+	function call(command : String, responder : Responder, restArgs : haxe.extern.Rest<Dynamic>) : Void;
 	function close() : Void;
-	function connect(command : String, ?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
-	static var defaultObjectEncoding : UInt;
+	function connect(command : String, restArgs : haxe.extern.Rest<Dynamic>) : Void;
+	private function get_client() : Dynamic;
+	private function get_connected() : Bool;
+	private function get_connectedProxyType() : String;
+	private function get_farID() : String;
+	private function get_farNonce() : String;
+	private function get_maxPeerConnections() : UInt;
+	private function get_nearID() : String;
+	private function get_nearNonce() : String;
+	private function get_objectEncoding() : UInt;
+	private function get_protocol() : String;
+	private function get_proxyType() : String;
+	private function get_unconnectedPeerStreams() : Array<Dynamic>;
+	private function get_uri() : String;
+	private function get_usingTLS() : Bool;
+	private function set_client(value : Dynamic) : Dynamic;
+	private function set_maxPeerConnections(value : UInt) : UInt;
+	private function set_objectEncoding(value : UInt) : UInt;
+	private function set_proxyType(value : String) : String;
+	@:flash.property static var defaultObjectEncoding(get,set) : UInt;
+	private static function get_defaultObjectEncoding() : UInt;
+	private static function set_defaultObjectEncoding(value : UInt) : UInt;
 }
diff --git a/std/flash/net/NetGroup.hx b/std/flash/net/NetGroup.hx
index 542541aed5da7b196628d0c01643ae5f895d60d9..3e1f90f8b841dc8a66fb4dcde0948ddac40bbcf9 100644
--- a/std/flash/net/NetGroup.hx
+++ b/std/flash/net/NetGroup.hx
@@ -1,13 +1,13 @@
 package flash.net;
 
 @:require(flash10_1) extern class NetGroup extends flash.events.EventDispatcher {
-	var estimatedMemberCount(default,never) : Float;
-	var info(default,never) : NetGroupInfo;
-	var localCoverageFrom(default,never) : String;
-	var localCoverageTo(default,never) : String;
-	var neighborCount(default,never) : Float;
-	var receiveMode : String;
-	var replicationStrategy : String;
+	@:flash.property var estimatedMemberCount(get,never) : Float;
+	@:flash.property var info(get,never) : NetGroupInfo;
+	@:flash.property var localCoverageFrom(get,never) : String;
+	@:flash.property var localCoverageTo(get,never) : String;
+	@:flash.property var neighborCount(get,never) : Float;
+	@:flash.property var receiveMode(get,set) : String;
+	@:flash.property var replicationStrategy(get,set) : String;
 	function new(connection : NetConnection, groupspec : String) : Void;
 	function addHaveObjects(startIndex : Float, endIndex : Float) : Void;
 	function addMemberHint(peerID : String) : Bool;
@@ -16,11 +16,20 @@ package flash.net;
 	function close() : Void;
 	function convertPeerIDToGroupAddress(peerID : String) : String;
 	function denyRequestedObject(requestID : Int) : Void;
+	private function get_estimatedMemberCount() : Float;
+	private function get_info() : NetGroupInfo;
+	private function get_localCoverageFrom() : String;
+	private function get_localCoverageTo() : String;
+	private function get_neighborCount() : Float;
+	private function get_receiveMode() : String;
+	private function get_replicationStrategy() : String;
 	function post(message : flash.utils.Object) : String;
 	function removeHaveObjects(startIndex : Float, endIndex : Float) : Void;
 	function removeWantObjects(startIndex : Float, endIndex : Float) : Void;
 	function sendToAllNeighbors(message : flash.utils.Object) : String;
 	function sendToNearest(message : flash.utils.Object, groupAddress : String) : String;
 	function sendToNeighbor(message : flash.utils.Object, sendMode : String) : String;
+	private function set_receiveMode(value : String) : String;
+	private function set_replicationStrategy(value : String) : String;
 	function writeRequestedObject(requestID : Int, object : flash.utils.Object) : Void;
 }
diff --git a/std/flash/net/NetGroupInfo.hx b/std/flash/net/NetGroupInfo.hx
index 3f5696463b07c693ea243cd149c3de1befd2452e..e1746feb44ee3466d62f4059c76ca4f412a8a2b9 100644
--- a/std/flash/net/NetGroupInfo.hx
+++ b/std/flash/net/NetGroupInfo.hx
@@ -1,14 +1,22 @@
 package flash.net;
 
-@:final @:require(flash10_1) extern class NetGroupInfo {
-	var objectReplicationReceiveBytesPerSecond(default,never) : Float;
-	var objectReplicationSendBytesPerSecond(default,never) : Float;
-	var postingReceiveControlBytesPerSecond(default,never) : Float;
-	var postingReceiveDataBytesPerSecond(default,never) : Float;
-	var postingSendControlBytesPerSecond(default,never) : Float;
-	var postingSendDataBytesPerSecond(default,never) : Float;
-	var routingReceiveBytesPerSecond(default,never) : Float;
-	var routingSendBytesPerSecond(default,never) : Float;
+@:require(flash10_1) extern final class NetGroupInfo {
+	@:flash.property var objectReplicationReceiveBytesPerSecond(get,never) : Float;
+	@:flash.property var objectReplicationSendBytesPerSecond(get,never) : Float;
+	@:flash.property var postingReceiveControlBytesPerSecond(get,never) : Float;
+	@:flash.property var postingReceiveDataBytesPerSecond(get,never) : Float;
+	@:flash.property var postingSendControlBytesPerSecond(get,never) : Float;
+	@:flash.property var postingSendDataBytesPerSecond(get,never) : Float;
+	@:flash.property var routingReceiveBytesPerSecond(get,never) : Float;
+	@:flash.property var routingSendBytesPerSecond(get,never) : Float;
 	function new(postingSendDataBytesPerSecond : Float, postingSendControlBytesPerSecond : Float, postingReceiveDataBytesPerSecond : Float, postingReceiveControlBytesPerSecond : Float, routingSendBytesPerSecond : Float, routingReceiveBytesPerSecond : Float, objectReplicationSendBytesPerSecond : Float, objectReplicationReceiveBytesPerSecond : Float) : Void;
+	private function get_objectReplicationReceiveBytesPerSecond() : Float;
+	private function get_objectReplicationSendBytesPerSecond() : Float;
+	private function get_postingReceiveControlBytesPerSecond() : Float;
+	private function get_postingReceiveDataBytesPerSecond() : Float;
+	private function get_postingSendControlBytesPerSecond() : Float;
+	private function get_postingSendDataBytesPerSecond() : Float;
+	private function get_routingReceiveBytesPerSecond() : Float;
+	private function get_routingSendBytesPerSecond() : Float;
 	function toString() : String;
 }
diff --git a/std/flash/net/NetGroupReceiveMode.hx b/std/flash/net/NetGroupReceiveMode.hx
index 00bdd9e79f94ceeed8df4b10f64a8eae1020bcb0..48d50c99e3a473ed1bdf60eb868d6e8906b8588c 100644
--- a/std/flash/net/NetGroupReceiveMode.hx
+++ b/std/flash/net/NetGroupReceiveMode.hx
@@ -2,6 +2,6 @@ package flash.net;
 
 extern class NetGroupReceiveMode {
 	function new() : Void;
-	static var EXACT(default,never) : String;
-	static var NEAREST(default,never) : String;
+	static final EXACT : String;
+	static final NEAREST : String;
 }
diff --git a/std/flash/net/NetGroupReplicationStrategy.hx b/std/flash/net/NetGroupReplicationStrategy.hx
index 5c7e2bd7e3269de5f5b59ca2be47eea99da6ff2c..a6521be7c0631507a215f9f412e5f25fdee2f57c 100644
--- a/std/flash/net/NetGroupReplicationStrategy.hx
+++ b/std/flash/net/NetGroupReplicationStrategy.hx
@@ -2,6 +2,6 @@ package flash.net;
 
 extern class NetGroupReplicationStrategy {
 	function new() : Void;
-	static var LOWEST_FIRST(default,never) : String;
-	static var RAREST_FIRST(default,never) : String;
+	static final LOWEST_FIRST : String;
+	static final RAREST_FIRST : String;
 }
diff --git a/std/flash/net/NetGroupSendMode.hx b/std/flash/net/NetGroupSendMode.hx
index 79de5b709d42e283ba8d32b00813155b1723059f..fdd61293b87e9f605e87f31e91c467d0da5a51d8 100644
--- a/std/flash/net/NetGroupSendMode.hx
+++ b/std/flash/net/NetGroupSendMode.hx
@@ -2,6 +2,6 @@ package flash.net;
 
 extern class NetGroupSendMode {
 	function new() : Void;
-	static var NEXT_DECREASING(default,never) : String;
-	static var NEXT_INCREASING(default,never) : String;
+	static final NEXT_DECREASING : String;
+	static final NEXT_INCREASING : String;
 }
diff --git a/std/flash/net/NetGroupSendResult.hx b/std/flash/net/NetGroupSendResult.hx
index aa0122dba68e655a1fe666418225f0241d80a8bc..901d62e18055e0962698a0861af20baa935ce0fe 100644
--- a/std/flash/net/NetGroupSendResult.hx
+++ b/std/flash/net/NetGroupSendResult.hx
@@ -2,7 +2,7 @@ package flash.net;
 
 extern class NetGroupSendResult {
 	function new() : Void;
-	static var ERROR(default,never) : String;
-	static var NO_ROUTE(default,never) : String;
-	static var SENT(default,never) : String;
+	static final ERROR : String;
+	static final NO_ROUTE : String;
+	static final SENT : String;
 }
diff --git a/std/flash/net/NetStream.hx b/std/flash/net/NetStream.hx
index 8451653d2c735af758c04f7cd3795c5f1e4df91b..792976fcaca8a505ff3b1e47c2d12c1e4fc183ba 100644
--- a/std/flash/net/NetStream.hx
+++ b/std/flash/net/NetStream.hx
@@ -1,45 +1,45 @@
 package flash.net;
 
 extern class NetStream extends flash.events.EventDispatcher {
-	var audioCodec(default,never) : UInt;
-	@:require(flash10_1) var audioReliable : Bool;
-	@:require(flash10_1) var audioSampleAccess : Bool;
-	@:require(flash10_1) var backBufferLength(default,never) : Float;
-	@:require(flash10_1) var backBufferTime : Float;
-	var bufferLength(default,never) : Float;
-	var bufferTime : Float;
-	@:require(flash10_1) var bufferTimeMax : Float;
-	var bytesLoaded(default,never) : UInt;
-	var bytesTotal(default,never) : UInt;
-	var checkPolicyFile : Bool;
-	var client : Dynamic;
-	var currentFPS(default,never) : Float;
-	@:require(flash10_1) var dataReliable : Bool;
-	var decodedFrames(default,never) : UInt;
-	@:require(flash10) var farID(default,never) : String;
-	@:require(flash10) var farNonce(default,never) : String;
-	@:require(flash10_1) var inBufferSeek : Bool;
-	@:require(flash10) var info(default,never) : NetStreamInfo;
-	var liveDelay(default,never) : Float;
-	@:require(flash10) var maxPauseBufferTime : Float;
-	@:require(flash10_1) var multicastAvailabilitySendToAll : Bool;
-	@:require(flash10_1) var multicastAvailabilityUpdatePeriod : Float;
-	@:require(flash10_1) var multicastFetchPeriod : Float;
-	@:require(flash10_1) var multicastInfo(default,never) : NetStreamMulticastInfo;
-	@:require(flash10_1) var multicastPushNeighborLimit : Float;
-	@:require(flash10_1) var multicastRelayMarginDuration : Float;
-	@:require(flash10_1) var multicastWindowDuration : Float;
-	@:require(flash10) var nearNonce(default,never) : String;
-	var objectEncoding(default,never) : UInt;
-	@:require(flash10) var peerStreams(default,never) : Array<Dynamic>;
-	var soundTransform : flash.media.SoundTransform;
-	var time(default,never) : Float;
-	@:require(flash11) var useHardwareDecoder : Bool;
-	@:require(flash11_3) var useJitterBuffer : Bool;
-	var videoCodec(default,never) : UInt;
-	@:require(flash10_1) var videoReliable : Bool;
-	@:require(flash10_1) var videoSampleAccess : Bool;
-	@:require(flash11) var videoStreamSettings : flash.media.VideoStreamSettings;
+	@:flash.property var audioCodec(get,never) : UInt;
+	@:flash.property @:require(flash10_1) var audioReliable(get,set) : Bool;
+	@:flash.property @:require(flash10_1) var audioSampleAccess(get,set) : Bool;
+	@:flash.property @:require(flash10_1) var backBufferLength(get,never) : Float;
+	@:flash.property @:require(flash10_1) var backBufferTime(get,set) : Float;
+	@:flash.property var bufferLength(get,never) : Float;
+	@:flash.property var bufferTime(get,set) : Float;
+	@:flash.property @:require(flash10_1) var bufferTimeMax(get,set) : Float;
+	@:flash.property var bytesLoaded(get,never) : UInt;
+	@:flash.property var bytesTotal(get,never) : UInt;
+	@:flash.property var checkPolicyFile(get,set) : Bool;
+	@:flash.property var client(get,set) : Dynamic;
+	@:flash.property var currentFPS(get,never) : Float;
+	@:flash.property @:require(flash10_1) var dataReliable(get,set) : Bool;
+	@:flash.property var decodedFrames(get,never) : UInt;
+	@:flash.property @:require(flash10) var farID(get,never) : String;
+	@:flash.property @:require(flash10) var farNonce(get,never) : String;
+	@:flash.property @:require(flash10_1) var inBufferSeek(get,set) : Bool;
+	@:flash.property @:require(flash10) var info(get,never) : NetStreamInfo;
+	@:flash.property var liveDelay(get,never) : Float;
+	@:flash.property @:require(flash10) var maxPauseBufferTime(get,set) : Float;
+	@:flash.property @:require(flash10_1) var multicastAvailabilitySendToAll(get,set) : Bool;
+	@:flash.property @:require(flash10_1) var multicastAvailabilityUpdatePeriod(get,set) : Float;
+	@:flash.property @:require(flash10_1) var multicastFetchPeriod(get,set) : Float;
+	@:flash.property @:require(flash10_1) var multicastInfo(get,never) : NetStreamMulticastInfo;
+	@:flash.property @:require(flash10_1) var multicastPushNeighborLimit(get,set) : Float;
+	@:flash.property @:require(flash10_1) var multicastRelayMarginDuration(get,set) : Float;
+	@:flash.property @:require(flash10_1) var multicastWindowDuration(get,set) : Float;
+	@:flash.property @:require(flash10) var nearNonce(get,never) : String;
+	@:flash.property var objectEncoding(get,never) : UInt;
+	@:flash.property @:require(flash10) var peerStreams(get,never) : Array<Dynamic>;
+	@:flash.property var soundTransform(get,set) : flash.media.SoundTransform;
+	@:flash.property var time(get,never) : Float;
+	@:flash.property @:require(flash11) var useHardwareDecoder(get,set) : Bool;
+	@:flash.property @:require(flash11_3) var useJitterBuffer(get,set) : Bool;
+	@:flash.property var videoCodec(get,never) : UInt;
+	@:flash.property @:require(flash10_1) var videoReliable(get,set) : Bool;
+	@:flash.property @:require(flash10_1) var videoSampleAccess(get,set) : Bool;
+	@:flash.property @:require(flash11) var videoStreamSettings(get,set) : flash.media.VideoStreamSettings;
 	function new(connection : NetConnection, ?peerID : String) : Void;
 	@:require(flash10_1) function appendBytes(bytes : flash.utils.ByteArray) : Void;
 	@:require(flash10_1) function appendBytesAction(netStreamAppendBytesAction : String) : Void;
@@ -48,9 +48,48 @@ extern class NetStream extends flash.events.EventDispatcher {
 	function attachCamera(theCamera : flash.media.Camera, snapshotMilliseconds : Int = -1) : Void;
 	function close() : Void;
 	@:require(flash11_2) function dispose() : Void;
+	private function get_audioCodec() : UInt;
+	private function get_audioReliable() : Bool;
+	private function get_audioSampleAccess() : Bool;
+	private function get_backBufferLength() : Float;
+	private function get_backBufferTime() : Float;
+	private function get_bufferLength() : Float;
+	private function get_bufferTime() : Float;
+	private function get_bufferTimeMax() : Float;
+	private function get_bytesLoaded() : UInt;
+	private function get_bytesTotal() : UInt;
+	private function get_checkPolicyFile() : Bool;
+	private function get_client() : Dynamic;
+	private function get_currentFPS() : Float;
+	private function get_dataReliable() : Bool;
+	private function get_decodedFrames() : UInt;
+	private function get_farID() : String;
+	private function get_farNonce() : String;
+	private function get_inBufferSeek() : Bool;
+	private function get_info() : NetStreamInfo;
+	private function get_liveDelay() : Float;
+	private function get_maxPauseBufferTime() : Float;
+	private function get_multicastAvailabilitySendToAll() : Bool;
+	private function get_multicastAvailabilityUpdatePeriod() : Float;
+	private function get_multicastFetchPeriod() : Float;
+	private function get_multicastInfo() : NetStreamMulticastInfo;
+	private function get_multicastPushNeighborLimit() : Float;
+	private function get_multicastRelayMarginDuration() : Float;
+	private function get_multicastWindowDuration() : Float;
+	private function get_nearNonce() : String;
+	private function get_objectEncoding() : UInt;
+	private function get_peerStreams() : Array<Dynamic>;
+	private function get_soundTransform() : flash.media.SoundTransform;
+	private function get_time() : Float;
+	private function get_useHardwareDecoder() : Bool;
+	private function get_useJitterBuffer() : Bool;
+	private function get_videoCodec() : UInt;
+	private function get_videoReliable() : Bool;
+	private function get_videoSampleAccess() : Bool;
+	private function get_videoStreamSettings() : flash.media.VideoStreamSettings;
 	@:require(flash10) function onPeerConnect(subscriber : NetStream) : Bool;
 	function pause() : Void;
-	function play(?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
+	function play(restArgs : haxe.extern.Rest<Dynamic>) : Void;
 	@:require(flash10) function play2(param : NetStreamPlayOptions) : Void;
 	function publish(?name : String, ?type : String) : Void;
 	function receiveAudio(flag : Bool) : Void;
@@ -58,10 +97,32 @@ extern class NetStream extends flash.events.EventDispatcher {
 	function receiveVideoFPS(FPS : Float) : Void;
 	function resume() : Void;
 	function seek(offset : Float) : Void;
-	function send(handlerName : String, ?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
+	function send(handlerName : String, restArgs : haxe.extern.Rest<Dynamic>) : Void;
+	private function set_audioReliable(value : Bool) : Bool;
+	private function set_audioSampleAccess(value : Bool) : Bool;
+	private function set_backBufferTime(value : Float) : Float;
+	private function set_bufferTime(value : Float) : Float;
+	private function set_bufferTimeMax(value : Float) : Float;
+	private function set_checkPolicyFile(value : Bool) : Bool;
+	private function set_client(value : Dynamic) : Dynamic;
+	private function set_dataReliable(value : Bool) : Bool;
+	private function set_inBufferSeek(value : Bool) : Bool;
+	private function set_maxPauseBufferTime(value : Float) : Float;
+	private function set_multicastAvailabilitySendToAll(value : Bool) : Bool;
+	private function set_multicastAvailabilityUpdatePeriod(value : Float) : Float;
+	private function set_multicastFetchPeriod(value : Float) : Float;
+	private function set_multicastPushNeighborLimit(value : Float) : Float;
+	private function set_multicastRelayMarginDuration(value : Float) : Float;
+	private function set_multicastWindowDuration(value : Float) : Float;
+	private function set_soundTransform(value : flash.media.SoundTransform) : flash.media.SoundTransform;
+	private function set_useHardwareDecoder(value : Bool) : Bool;
+	private function set_useJitterBuffer(value : Bool) : Bool;
+	private function set_videoReliable(value : Bool) : Bool;
+	private function set_videoSampleAccess(value : Bool) : Bool;
+	private function set_videoStreamSettings(value : flash.media.VideoStreamSettings) : flash.media.VideoStreamSettings;
 	@:require(flash10_1) function step(frames : Int) : Void;
 	function togglePause() : Void;
-	@:require(flash10) static var CONNECT_TO_FMS(default,never) : String;
-	@:require(flash10) static var DIRECT_CONNECTIONS(default,never) : String;
+	@:require(flash10) static final CONNECT_TO_FMS : String;
+	@:require(flash10) static final DIRECT_CONNECTIONS : String;
 	static function resetDRMVouchers() : Void;
 }
diff --git a/std/flash/net/NetStreamAppendBytesAction.hx b/std/flash/net/NetStreamAppendBytesAction.hx
index b7c7f8c9cd67f338ad51e903c95e0b036e011909..a03f27f3fca7931a436a8c77deed9fd593fd6c6e 100644
--- a/std/flash/net/NetStreamAppendBytesAction.hx
+++ b/std/flash/net/NetStreamAppendBytesAction.hx
@@ -2,7 +2,7 @@ package flash.net;
 
 extern class NetStreamAppendBytesAction {
 	function new() : Void;
-	static var END_SEQUENCE(default,never) : String;
-	static var RESET_BEGIN(default,never) : String;
-	static var RESET_SEEK(default,never) : String;
+	static final END_SEQUENCE : String;
+	static final RESET_BEGIN : String;
+	static final RESET_SEEK : String;
 }
diff --git a/std/flash/net/NetStreamInfo.hx b/std/flash/net/NetStreamInfo.hx
index b65ea7767b85681500570fef674623a664422030..7c461e070500f55236ff2e34934139a3ec08b0d0 100644
--- a/std/flash/net/NetStreamInfo.hx
+++ b/std/flash/net/NetStreamInfo.hx
@@ -1,31 +1,56 @@
 package flash.net;
 
-@:final extern class NetStreamInfo {
-	var SRTT(default,never) : Float;
-	var audioBufferByteLength(default,never) : Float;
-	var audioBufferLength(default,never) : Float;
-	var audioByteCount(default,never) : Float;
-	var audioBytesPerSecond(default,never) : Float;
-	var audioLossRate(default,never) : Float;
-	var byteCount(default,never) : Float;
-	var currentBytesPerSecond(default,never) : Float;
-	var dataBufferByteLength(default,never) : Float;
-	var dataBufferLength(default,never) : Float;
-	var dataByteCount(default,never) : Float;
-	var dataBytesPerSecond(default,never) : Float;
-	var droppedFrames(default,never) : Float;
-	var isLive(default,never) : Bool;
-	var maxBytesPerSecond(default,never) : Float;
-	var metaData(default,never) : Dynamic;
-	var playbackBytesPerSecond(default,never) : Float;
-	var resourceName(default,never) : String;
-	var uri(default,never) : String;
-	var videoBufferByteLength(default,never) : Float;
-	var videoBufferLength(default,never) : Float;
-	var videoByteCount(default,never) : Float;
-	var videoBytesPerSecond(default,never) : Float;
-	@:require(flash10_1) var videoLossRate(default,never) : Float;
-	var xmpData(default,never) : Dynamic;
+extern final class NetStreamInfo {
+	@:flash.property var SRTT(get,never) : Float;
+	@:flash.property var audioBufferByteLength(get,never) : Float;
+	@:flash.property var audioBufferLength(get,never) : Float;
+	@:flash.property var audioByteCount(get,never) : Float;
+	@:flash.property var audioBytesPerSecond(get,never) : Float;
+	@:flash.property var audioLossRate(get,never) : Float;
+	@:flash.property var byteCount(get,never) : Float;
+	@:flash.property var currentBytesPerSecond(get,never) : Float;
+	@:flash.property var dataBufferByteLength(get,never) : Float;
+	@:flash.property var dataBufferLength(get,never) : Float;
+	@:flash.property var dataByteCount(get,never) : Float;
+	@:flash.property var dataBytesPerSecond(get,never) : Float;
+	@:flash.property var droppedFrames(get,never) : Float;
+	@:flash.property var isLive(get,never) : Bool;
+	@:flash.property var maxBytesPerSecond(get,never) : Float;
+	@:flash.property var metaData(get,never) : Dynamic;
+	@:flash.property var playbackBytesPerSecond(get,never) : Float;
+	@:flash.property var resourceName(get,never) : String;
+	@:flash.property var uri(get,never) : String;
+	@:flash.property var videoBufferByteLength(get,never) : Float;
+	@:flash.property var videoBufferLength(get,never) : Float;
+	@:flash.property var videoByteCount(get,never) : Float;
+	@:flash.property var videoBytesPerSecond(get,never) : Float;
+	@:flash.property @:require(flash10_1) var videoLossRate(get,never) : Float;
+	@:flash.property var xmpData(get,never) : Dynamic;
 	function new(curBPS : Float, byteCount : Float, maxBPS : Float, audioBPS : Float, audioByteCount : Float, videoBPS : Float, videoByteCount : Float, dataBPS : Float, dataByteCount : Float, playbackBPS : Float, droppedFrames : Float, audioBufferByteLength : Float, videoBufferByteLength : Float, dataBufferByteLength : Float, audioBufferLength : Float, videoBufferLength : Float, dataBufferLength : Float, srtt : Float, audioLossRate : Float, videoLossRate : Float, ?metaData : Dynamic, ?xmpData : Dynamic, ?uri : String, ?resourceName : String, isLive : Bool = true) : Void;
+	private function get_SRTT() : Float;
+	private function get_audioBufferByteLength() : Float;
+	private function get_audioBufferLength() : Float;
+	private function get_audioByteCount() : Float;
+	private function get_audioBytesPerSecond() : Float;
+	private function get_audioLossRate() : Float;
+	private function get_byteCount() : Float;
+	private function get_currentBytesPerSecond() : Float;
+	private function get_dataBufferByteLength() : Float;
+	private function get_dataBufferLength() : Float;
+	private function get_dataByteCount() : Float;
+	private function get_dataBytesPerSecond() : Float;
+	private function get_droppedFrames() : Float;
+	private function get_isLive() : Bool;
+	private function get_maxBytesPerSecond() : Float;
+	private function get_metaData() : Dynamic;
+	private function get_playbackBytesPerSecond() : Float;
+	private function get_resourceName() : String;
+	private function get_uri() : String;
+	private function get_videoBufferByteLength() : Float;
+	private function get_videoBufferLength() : Float;
+	private function get_videoByteCount() : Float;
+	private function get_videoBytesPerSecond() : Float;
+	private function get_videoLossRate() : Float;
+	private function get_xmpData() : Dynamic;
 	function toString() : String;
 }
diff --git a/std/flash/net/NetStreamMulticastInfo.hx b/std/flash/net/NetStreamMulticastInfo.hx
index c86a04df0c5e994761df343b326f1057af831f9c..5a40bb532778f3f888966923fabf0df44ab1c389 100644
--- a/std/flash/net/NetStreamMulticastInfo.hx
+++ b/std/flash/net/NetStreamMulticastInfo.hx
@@ -1,25 +1,44 @@
 package flash.net;
 
-@:final @:require(flash10_1) extern class NetStreamMulticastInfo {
-	var bytesPushedFromPeers(default,never) : Float;
-	var bytesPushedToPeers(default,never) : Float;
-	var bytesReceivedFromIPMulticast(default,never) : Float;
-	var bytesReceivedFromServer(default,never) : Float;
-	var bytesRequestedByPeers(default,never) : Float;
-	var bytesRequestedFromPeers(default,never) : Float;
-	var fragmentsPushedFromPeers(default,never) : Float;
-	var fragmentsPushedToPeers(default,never) : Float;
-	var fragmentsReceivedFromIPMulticast(default,never) : Float;
-	var fragmentsReceivedFromServer(default,never) : Float;
-	var fragmentsRequestedByPeers(default,never) : Float;
-	var fragmentsRequestedFromPeers(default,never) : Float;
-	var receiveControlBytesPerSecond(default,never) : Float;
-	var receiveDataBytesPerSecond(default,never) : Float;
-	var receiveDataBytesPerSecondFromIPMulticast(default,never) : Float;
-	var receiveDataBytesPerSecondFromServer(default,never) : Float;
-	var sendControlBytesPerSecond(default,never) : Float;
-	var sendControlBytesPerSecondToServer(default,never) : Float;
-	var sendDataBytesPerSecond(default,never) : Float;
+@:require(flash10_1) extern final class NetStreamMulticastInfo {
+	@:flash.property var bytesPushedFromPeers(get,never) : Float;
+	@:flash.property var bytesPushedToPeers(get,never) : Float;
+	@:flash.property var bytesReceivedFromIPMulticast(get,never) : Float;
+	@:flash.property var bytesReceivedFromServer(get,never) : Float;
+	@:flash.property var bytesRequestedByPeers(get,never) : Float;
+	@:flash.property var bytesRequestedFromPeers(get,never) : Float;
+	@:flash.property var fragmentsPushedFromPeers(get,never) : Float;
+	@:flash.property var fragmentsPushedToPeers(get,never) : Float;
+	@:flash.property var fragmentsReceivedFromIPMulticast(get,never) : Float;
+	@:flash.property var fragmentsReceivedFromServer(get,never) : Float;
+	@:flash.property var fragmentsRequestedByPeers(get,never) : Float;
+	@:flash.property var fragmentsRequestedFromPeers(get,never) : Float;
+	@:flash.property var receiveControlBytesPerSecond(get,never) : Float;
+	@:flash.property var receiveDataBytesPerSecond(get,never) : Float;
+	@:flash.property var receiveDataBytesPerSecondFromIPMulticast(get,never) : Float;
+	@:flash.property var receiveDataBytesPerSecondFromServer(get,never) : Float;
+	@:flash.property var sendControlBytesPerSecond(get,never) : Float;
+	@:flash.property var sendControlBytesPerSecondToServer(get,never) : Float;
+	@:flash.property var sendDataBytesPerSecond(get,never) : Float;
 	function new(sendDataBytesPerSecond : Float, sendControlBytesPerSecond : Float, receiveDataBytesPerSecond : Float, receiveControlBytesPerSecond : Float, bytesPushedToPeers : Float, fragmentsPushedToPeers : Float, bytesRequestedByPeers : Float, fragmentsRequestedByPeers : Float, bytesPushedFromPeers : Float, fragmentsPushedFromPeers : Float, bytesRequestedFromPeers : Float, fragmentsRequestedFromPeers : Float, sendControlBytesPerSecondToServer : Float, receiveDataBytesPerSecondFromServer : Float, bytesReceivedFromServer : Float, fragmentsReceivedFromServer : Float, receiveDataBytesPerSecondFromIPMulticast : Float, bytesReceivedFromIPMulticast : Float, fragmentsReceivedFromIPMulticast : Float) : Void;
+	private function get_bytesPushedFromPeers() : Float;
+	private function get_bytesPushedToPeers() : Float;
+	private function get_bytesReceivedFromIPMulticast() : Float;
+	private function get_bytesReceivedFromServer() : Float;
+	private function get_bytesRequestedByPeers() : Float;
+	private function get_bytesRequestedFromPeers() : Float;
+	private function get_fragmentsPushedFromPeers() : Float;
+	private function get_fragmentsPushedToPeers() : Float;
+	private function get_fragmentsReceivedFromIPMulticast() : Float;
+	private function get_fragmentsReceivedFromServer() : Float;
+	private function get_fragmentsRequestedByPeers() : Float;
+	private function get_fragmentsRequestedFromPeers() : Float;
+	private function get_receiveControlBytesPerSecond() : Float;
+	private function get_receiveDataBytesPerSecond() : Float;
+	private function get_receiveDataBytesPerSecondFromIPMulticast() : Float;
+	private function get_receiveDataBytesPerSecondFromServer() : Float;
+	private function get_sendControlBytesPerSecond() : Float;
+	private function get_sendControlBytesPerSecondToServer() : Float;
+	private function get_sendDataBytesPerSecond() : Float;
 	function toString() : String;
 }
diff --git a/std/flash/net/ObjectEncoding.hx b/std/flash/net/ObjectEncoding.hx
index 0b7b9f1472f3e73f7286521ba0628ca5dc8fc2e1..305ddfe80982f34e2368e53e3a81d4f342f28683 100644
--- a/std/flash/net/ObjectEncoding.hx
+++ b/std/flash/net/ObjectEncoding.hx
@@ -1,8 +1,10 @@
 package flash.net;
 
 extern class ObjectEncoding {
-	static var AMF0(default,never) : UInt;
-	static var AMF3(default,never) : UInt;
-	static var DEFAULT(default,never) : UInt;
-	static var dynamicPropertyWriter : IDynamicPropertyWriter;
+	static final AMF0 : UInt;
+	static final AMF3 : UInt;
+	static final DEFAULT : UInt;
+	@:flash.property static var dynamicPropertyWriter(get,set) : IDynamicPropertyWriter;
+	private static function get_dynamicPropertyWriter() : IDynamicPropertyWriter;
+	private static function set_dynamicPropertyWriter(value : IDynamicPropertyWriter) : IDynamicPropertyWriter;
 }
diff --git a/std/flash/net/SecureSocket.hx b/std/flash/net/SecureSocket.hx
index a895d58e09d688f1764eb86b8bf493b42df40134..a19352f25a736d60db9f76b28fccf52ca66e2874 100644
--- a/std/flash/net/SecureSocket.hx
+++ b/std/flash/net/SecureSocket.hx
@@ -1,9 +1,12 @@
 package flash.net;
 
 @:require(flash11) extern class SecureSocket extends Socket {
-	var serverCertificate(default,never) : flash.security.X509Certificate;
-	var serverCertificateStatus(default,never) : String;
+	@:flash.property var serverCertificate(get,never) : flash.security.X509Certificate;
+	@:flash.property var serverCertificateStatus(get,never) : String;
 	function new() : Void;
 	function addBinaryChainBuildingCertificate(certificate : flash.utils.ByteArray, trusted : Bool) : Void;
-	static var isSupported(default,never) : Bool;
+	private function get_serverCertificate() : flash.security.X509Certificate;
+	private function get_serverCertificateStatus() : String;
+	@:flash.property static var isSupported(get,never) : Bool;
+	private static function get_isSupported() : Bool;
 }
diff --git a/std/flash/net/SharedObject.hx b/std/flash/net/SharedObject.hx
index 267eb4fb7ead28b1683996c6fb6bdb97309a4b0b..cc152a3cd4ef103d438a7367f8c9ec1a51190b80 100644
--- a/std/flash/net/SharedObject.hx
+++ b/std/flash/net/SharedObject.hx
@@ -1,23 +1,34 @@
 package flash.net;
 
 extern class SharedObject extends flash.events.EventDispatcher {
-	var client : Dynamic;
-	var data(default,never) : Dynamic;
-	var fps(never,default) : Float;
-	var objectEncoding : UInt;
-	var size(default,never) : UInt;
+	@:flash.property var client(get,set) : Dynamic;
+	@:flash.property var data(get,never) : Dynamic;
+	@:flash.property var fps(never,set) : Float;
+	@:flash.property var objectEncoding(get,set) : UInt;
+	@:flash.property var size(get,never) : UInt;
 	function new() : Void;
 	function clear() : Void;
 	function close() : Void;
 	function connect(myConnection : NetConnection, ?params : String) : Void;
 	function flush(minDiskSpace : Int = 0) : String;
-	function send(?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
+	private function get_client() : Dynamic;
+	private function get_data() : Dynamic;
+	private function get_objectEncoding() : UInt;
+	private function get_size() : UInt;
+	function send(restArgs : haxe.extern.Rest<Dynamic>) : Void;
 	function setDirty(propertyName : String) : Void;
 	function setProperty(propertyName : String, ?value : flash.utils.Object) : Void;
-	static var defaultObjectEncoding : UInt;
-	@:require(flash11_7) static var preventBackup : Bool;
+	private function set_client(value : Dynamic) : Dynamic;
+	private function set_fps(value : Float) : Float;
+	private function set_objectEncoding(value : UInt) : UInt;
+	@:flash.property static var defaultObjectEncoding(get,set) : UInt;
+	@:flash.property @:require(flash11_7) static var preventBackup(get,set) : Bool;
 	static function deleteAll(url : String) : Int;
 	static function getDiskUsage(url : String) : Int;
 	static function getLocal(name : String, ?localPath : String, secure : Bool = false) : SharedObject;
 	static function getRemote(name : String, ?remotePath : String, persistence : Dynamic = false, secure : Bool = false) : SharedObject;
+	private static function get_defaultObjectEncoding() : UInt;
+	private static function get_preventBackup() : Bool;
+	private static function set_defaultObjectEncoding(value : UInt) : UInt;
+	private static function set_preventBackup(value : Bool) : Bool;
 }
diff --git a/std/flash/net/SharedObjectFlushStatus.hx b/std/flash/net/SharedObjectFlushStatus.hx
index 505c2da01aa17a88e3c3a25123d1c2ff2b8277bf..15e603156f222381730ddc759705a976a0deede2 100644
--- a/std/flash/net/SharedObjectFlushStatus.hx
+++ b/std/flash/net/SharedObjectFlushStatus.hx
@@ -2,6 +2,6 @@ package flash.net;
 
 extern class SharedObjectFlushStatus {
 	function new() : Void;
-	static var FLUSHED(default,never) : String;
-	static var PENDING(default,never) : String;
+	static final FLUSHED : String;
+	static final PENDING : String;
 }
diff --git a/std/flash/net/Socket.hx b/std/flash/net/Socket.hx
index d8dfd1470d81cec19b3c4788bacdeb3f2e5fb161..2c8716bf6209bb48778fa0b3c83f8574f766230f 100644
--- a/std/flash/net/Socket.hx
+++ b/std/flash/net/Socket.hx
@@ -1,16 +1,22 @@
 package flash.net;
 
 extern class Socket extends flash.events.EventDispatcher implements flash.utils.IDataOutput implements flash.utils.IDataInput {
-	var bytesAvailable(default,never) : UInt;
-	@:require(flash11) var bytesPending(default,never) : UInt;
-	var connected(default,never) : Bool;
-	var endian : flash.utils.Endian;
-	var objectEncoding : UInt;
-	@:require(flash10) var timeout : UInt;
+	@:flash.property var bytesAvailable(get,never) : UInt;
+	@:flash.property @:require(flash11) var bytesPending(get,never) : UInt;
+	@:flash.property var connected(get,never) : Bool;
+	@:flash.property var endian(get,set) : flash.utils.Endian;
+	@:flash.property var objectEncoding(get,set) : UInt;
+	@:flash.property @:require(flash10) var timeout(get,set) : UInt;
 	function new(?host : String, port : Int = 0) : Void;
 	function close() : Void;
 	function connect(host : String, port : Int) : Void;
 	function flush() : Void;
+	private function get_bytesAvailable() : UInt;
+	private function get_bytesPending() : UInt;
+	private function get_connected() : Bool;
+	private function get_endian() : flash.utils.Endian;
+	private function get_objectEncoding() : UInt;
+	private function get_timeout() : UInt;
 	function readBoolean() : Bool;
 	function readByte() : Int;
 	function readBytes(bytes : flash.utils.ByteArray, offset : UInt = 0, length : UInt = 0) : Void;
@@ -25,6 +31,9 @@ extern class Socket extends flash.events.EventDispatcher implements flash.utils.
 	function readUnsignedByte() : UInt;
 	function readUnsignedInt() : UInt;
 	function readUnsignedShort() : UInt;
+	private function set_endian(value : flash.utils.Endian) : flash.utils.Endian;
+	private function set_objectEncoding(value : UInt) : UInt;
+	private function set_timeout(value : UInt) : UInt;
 	function writeBoolean(value : Bool) : Void;
 	function writeByte(value : Int) : Void;
 	function writeBytes(bytes : flash.utils.ByteArray, offset : UInt = 0, length : UInt = 0) : Void;
diff --git a/std/flash/net/URLLoaderDataFormat.hx b/std/flash/net/URLLoaderDataFormat.hx
index b8827d7ff37203f0f203d40db8b1e48e95b308c3..19bf1b94db7b7e48f76d5fb6bb9bf9b1269bdd79 100644
--- a/std/flash/net/URLLoaderDataFormat.hx
+++ b/std/flash/net/URLLoaderDataFormat.hx
@@ -1,7 +1,7 @@
 package flash.net;
 
-@:fakeEnum(String) extern enum URLLoaderDataFormat {
-	BINARY;
-	TEXT;
-	VARIABLES;
+@:native("flash.net.URLLoaderDataFormat") extern enum abstract URLLoaderDataFormat(String) {
+	var BINARY;
+	var TEXT;
+	var VARIABLES;
 }
diff --git a/std/flash/net/URLRequest.hx b/std/flash/net/URLRequest.hx
index 61707bf6455d51b69bff6f203af5e9a99948eada..213fd1f4733ea55addf6dc26821d225065fe4bb2 100644
--- a/std/flash/net/URLRequest.hx
+++ b/std/flash/net/URLRequest.hx
@@ -1,12 +1,24 @@
 package flash.net;
 
-@:final extern class URLRequest {
-	var contentType : String;
-	var data : Dynamic;
-	var digest : String;
-	var method : String;
-	var requestHeaders : Array<URLRequestHeader>;
-	var url : String;
+extern final class URLRequest {
+	@:flash.property var contentType(get,set) : String;
+	@:flash.property var data(get,set) : Dynamic;
+	@:flash.property var digest(get,set) : String;
+	@:flash.property var method(get,set) : String;
+	@:flash.property var requestHeaders(get,set) : Array<URLRequestHeader>;
+	@:flash.property var url(get,set) : String;
 	function new(?url : String) : Void;
+	private function get_contentType() : String;
+	private function get_data() : Dynamic;
+	private function get_digest() : String;
+	private function get_method() : String;
+	private function get_requestHeaders() : Array<URLRequestHeader>;
+	private function get_url() : String;
+	private function set_contentType(value : String) : String;
+	private function set_data(value : Dynamic) : Dynamic;
+	private function set_digest(value : String) : String;
+	private function set_method(value : String) : String;
+	private function set_requestHeaders(value : Array<URLRequestHeader>) : Array<URLRequestHeader>;
+	private function set_url(value : String) : String;
 	function useRedirectedURL(sourceRequest : URLRequest, wholeURL : Bool = false, ?pattern : Dynamic, ?replace : String) : Void;
 }
diff --git a/std/flash/net/URLRequestHeader.hx b/std/flash/net/URLRequestHeader.hx
index 77b6224891cc4e3236e5652d95d039ce27b92220..e8c4e46d0c543e811fff1401c9d299e0b34fef74 100644
--- a/std/flash/net/URLRequestHeader.hx
+++ b/std/flash/net/URLRequestHeader.hx
@@ -1,6 +1,6 @@
 package flash.net;
 
-@:final extern class URLRequestHeader {
+extern final class URLRequestHeader {
 	var name : String;
 	var value : String;
 	function new(?name : String, ?value : String) : Void;
diff --git a/std/flash/net/URLRequestMethod.hx b/std/flash/net/URLRequestMethod.hx
index 7e00873f2e74c229282177d317aa3abe0bfd09b5..62a8413313f248f5c809b2838ac670548568557d 100644
--- a/std/flash/net/URLRequestMethod.hx
+++ b/std/flash/net/URLRequestMethod.hx
@@ -1,10 +1,10 @@
 package flash.net;
 
 extern class URLRequestMethod {
-	@:require(flash10_1) static var DELETE(default,never) : String;
-	static var GET(default,never) : String;
-	@:require(flash10_1) static var HEAD(default,never) : String;
-	@:require(flash10_1) static var OPTIONS(default,never) : String;
-	static var POST(default,never) : String;
-	@:require(flash10_1) static var PUT(default,never) : String;
+	@:require(flash10_1) static final DELETE : String;
+	static final GET : String;
+	@:require(flash10_1) static final HEAD : String;
+	@:require(flash10_1) static final OPTIONS : String;
+	static final POST : String;
+	@:require(flash10_1) static final PUT : String;
 }
diff --git a/std/flash/net/URLStream.hx b/std/flash/net/URLStream.hx
index 2cb4cf41f2a15c91d6bcdaba72143735cb0baeb3..d33139f417b0d8143a37a4417c04d5ec36224ea0 100644
--- a/std/flash/net/URLStream.hx
+++ b/std/flash/net/URLStream.hx
@@ -1,15 +1,22 @@
 package flash.net;
 
 extern class URLStream extends flash.events.EventDispatcher implements flash.utils.IDataInput {
-	var bytesAvailable(default,never) : UInt;
-	var connected(default,never) : Bool;
-	@:require(flash11_4) var diskCacheEnabled(default,never) : Bool;
-	var endian : flash.utils.Endian;
-	@:require(flash11_4) var length(default,never) : Float;
-	var objectEncoding : UInt;
-	@:require(flash11_4) var position : Float;
+	@:flash.property var bytesAvailable(get,never) : UInt;
+	@:flash.property var connected(get,never) : Bool;
+	@:flash.property @:require(flash11_4) var diskCacheEnabled(get,never) : Bool;
+	@:flash.property var endian(get,set) : flash.utils.Endian;
+	@:flash.property @:require(flash11_4) var length(get,never) : Float;
+	@:flash.property var objectEncoding(get,set) : UInt;
+	@:flash.property @:require(flash11_4) var position(get,set) : Float;
 	function new() : Void;
 	function close() : Void;
+	private function get_bytesAvailable() : UInt;
+	private function get_connected() : Bool;
+	private function get_diskCacheEnabled() : Bool;
+	private function get_endian() : flash.utils.Endian;
+	private function get_length() : Float;
+	private function get_objectEncoding() : UInt;
+	private function get_position() : Float;
 	function load(request : URLRequest) : Void;
 	function readBoolean() : Bool;
 	function readByte() : Int;
@@ -25,5 +32,8 @@ extern class URLStream extends flash.events.EventDispatcher implements flash.uti
 	function readUnsignedByte() : UInt;
 	function readUnsignedInt() : UInt;
 	function readUnsignedShort() : UInt;
+	private function set_endian(value : flash.utils.Endian) : flash.utils.Endian;
+	private function set_objectEncoding(value : UInt) : UInt;
+	private function set_position(value : Float) : Float;
 	@:require(flash11_4) function stop() : Void;
 }
diff --git a/std/flash/net/XMLSocket.hx b/std/flash/net/XMLSocket.hx
index b8e787efe2d484826c3fa70326c2eee5f4bfbfe4..777e99ec781a67fb9dd67eb3ff3da328bfc1254d 100644
--- a/std/flash/net/XMLSocket.hx
+++ b/std/flash/net/XMLSocket.hx
@@ -1,10 +1,13 @@
 package flash.net;
 
 extern class XMLSocket extends flash.events.EventDispatcher {
-	var connected(default,never) : Bool;
-	@:require(flash10) var timeout : Int;
+	@:flash.property var connected(get,never) : Bool;
+	@:flash.property @:require(flash10) var timeout(get,set) : Int;
 	function new(?host : String, port : Int = 0) : Void;
 	function close() : Void;
 	function connect(host : String, port : Int) : Void;
+	private function get_connected() : Bool;
+	private function get_timeout() : Int;
 	function send(object : Dynamic) : Void;
+	private function set_timeout(value : Int) : Int;
 }
diff --git a/std/flash/net/drm/AddToDeviceGroupSetting.hx b/std/flash/net/drm/AddToDeviceGroupSetting.hx
index 89739329db1a966fa9e95479768584a3452e25ba..bed0442ea066fc34e70416398e6d2ce33a2fc823 100644
--- a/std/flash/net/drm/AddToDeviceGroupSetting.hx
+++ b/std/flash/net/drm/AddToDeviceGroupSetting.hx
@@ -2,7 +2,7 @@ package flash.net.drm;
 
 extern class AddToDeviceGroupSetting {
 	function new() : Void;
-	static var ALLOW_SERVER(default,never) : String;
-	static var FORCE_REFRESH(default,never) : String;
-	static var LOCAL_ONLY(default,never) : String;
+	static final ALLOW_SERVER : String;
+	static final FORCE_REFRESH : String;
+	static final LOCAL_ONLY : String;
 }
diff --git a/std/flash/net/drm/AuthenticationMethod.hx b/std/flash/net/drm/AuthenticationMethod.hx
index 44b4afe5f0e80423af02fca08c7edd167bbb1865..6b9e13ac97922436a28c1e9e3fa0b9a3998e4ff0 100644
--- a/std/flash/net/drm/AuthenticationMethod.hx
+++ b/std/flash/net/drm/AuthenticationMethod.hx
@@ -2,6 +2,6 @@ package flash.net.drm;
 
 extern class AuthenticationMethod {
 	function new() : Void;
-	static var ANONYMOUS(default,never) : String;
-	static var USERNAME_AND_PASSWORD(default,never) : String;
+	static final ANONYMOUS : String;
+	static final USERNAME_AND_PASSWORD : String;
 }
diff --git a/std/flash/net/drm/DRMAuthenticationContext.hx b/std/flash/net/drm/DRMAuthenticationContext.hx
index c220658960d26771d2968bd81641ac91ecb9efee..dbe94a3ca561553ee147542599fe2a83ae3fffce 100644
--- a/std/flash/net/drm/DRMAuthenticationContext.hx
+++ b/std/flash/net/drm/DRMAuthenticationContext.hx
@@ -1,7 +1,8 @@
 package flash.net.drm;
 
 extern class DRMAuthenticationContext extends DRMManagerSession {
-	var authenticationToken(default,never) : flash.utils.ByteArray;
+	@:flash.property var authenticationToken(get,never) : flash.utils.ByteArray;
 	function new() : Void;
 	function authenticate(url : String, domain : String, username : String, password : String) : Void;
+	private function get_authenticationToken() : flash.utils.ByteArray;
 }
diff --git a/std/flash/net/drm/DRMContentData.hx b/std/flash/net/drm/DRMContentData.hx
index 5b5487ca776b7a004b948ce6a56767d77b576fe3..f1286940d961fc5d47ea78bed1308eb30c6b80ef 100644
--- a/std/flash/net/drm/DRMContentData.hx
+++ b/std/flash/net/drm/DRMContentData.hx
@@ -1,10 +1,14 @@
 package flash.net.drm;
 
 extern class DRMContentData {
-	var authenticationMethod(default,never) : String;
-	var domain(default,never) : String;
-	var licenseID(default,never) : String;
-	var serverURL(default,never) : String;
+	@:flash.property var authenticationMethod(get,never) : String;
+	@:flash.property var domain(get,never) : String;
+	@:flash.property var licenseID(get,never) : String;
+	@:flash.property var serverURL(get,never) : String;
 	function new(?rawData : flash.utils.ByteArray) : Void;
 	function getVoucherAccessInfo() : flash.Vector<VoucherAccessInfo>;
+	private function get_authenticationMethod() : String;
+	private function get_domain() : String;
+	private function get_licenseID() : String;
+	private function get_serverURL() : String;
 }
diff --git a/std/flash/net/drm/DRMDeviceGroup.hx b/std/flash/net/drm/DRMDeviceGroup.hx
index 7ede90f975a4909053e64e63bf3afb6de0bdaeec..bd2ad81a4bc40a27c2582461804754ef7021a51c 100644
--- a/std/flash/net/drm/DRMDeviceGroup.hx
+++ b/std/flash/net/drm/DRMDeviceGroup.hx
@@ -1,9 +1,14 @@
 package flash.net.drm;
 
-@:final extern class DRMDeviceGroup {
-	var authenticationMethod(default,never) : String;
-	var domain(default,never) : String;
-	var name : String;
-	var serverURL(default,never) : String;
+extern final class DRMDeviceGroup {
+	@:flash.property var authenticationMethod(get,never) : String;
+	@:flash.property var domain(get,never) : String;
+	@:flash.property var name(get,set) : String;
+	@:flash.property var serverURL(get,never) : String;
 	function new() : Void;
+	private function get_authenticationMethod() : String;
+	private function get_domain() : String;
+	private function get_name() : String;
+	private function get_serverURL() : String;
+	private function set_name(value : String) : String;
 }
diff --git a/std/flash/net/drm/DRMManager.hx b/std/flash/net/drm/DRMManager.hx
index 6e857657b6e80434be17e0b6aea2896f9e2fb0bf..4c2a4f08268822c6bf125c2a6f1e126fb12d1534 100644
--- a/std/flash/net/drm/DRMManager.hx
+++ b/std/flash/net/drm/DRMManager.hx
@@ -8,12 +8,15 @@ extern class DRMManager extends flash.events.EventDispatcher {
 	function loadVoucher(contentData : DRMContentData, setting : String) : Void;
 	function removeFromDeviceGroup(deviceGroup : DRMDeviceGroup) : Void;
 	function resetDRMVouchers() : Void;
-	function resetDRMVouchersInternal(isAutoReset : Bool) : Void;
+	@:ns("flash.net.drm",internal) function resetDRMVouchersInternal(isAutoReset : Bool) : Void;
 	function returnVoucher(inServerURL : String, immediateCommit : Bool, licenseID : String, policyID : String) : Void;
 	function setAuthenticationToken(serverUrl : String, domain : String, token : flash.utils.ByteArray) : Void;
 	function storeVoucher(voucher : flash.utils.ByteArray) : Void;
-	static var isSupported(default,never) : Bool;
-	static var networkIdleTimeout : Float;
+	@:flash.property static var isSupported(get,never) : Bool;
+	@:flash.property static var networkIdleTimeout(get,set) : Float;
 	static function getDRMManager() : DRMManager;
-	static function getDRMManagerInternal() : DRMManager;
+	@:ns("flash.net.drm",internal) static function getDRMManagerInternal() : DRMManager;
+	private static function get_isSupported() : Bool;
+	private static function get_networkIdleTimeout() : Float;
+	private static function set_networkIdleTimeout(value : Float) : Float;
 }
diff --git a/std/flash/net/drm/DRMManagerSession.hx b/std/flash/net/drm/DRMManagerSession.hx
index be1f42228da4d13c066b8e325bdb05c04d06589c..3ffb9ed759e0c43f4a40aab0aeddce0de33151ca 100644
--- a/std/flash/net/drm/DRMManagerSession.hx
+++ b/std/flash/net/drm/DRMManagerSession.hx
@@ -2,20 +2,22 @@ package flash.net.drm;
 
 extern class DRMManagerSession extends flash.events.EventDispatcher {
 	var m_isInSession : Bool;
-	var metadata : DRMContentData;
+	@:flash.property var metadata(get,set) : DRMContentData;
 	function new() : Void;
 	function checkStatus() : UInt;
 	function errorCodeToThrow(errorCode : UInt) : Void;
 	function getLastError() : UInt;
 	function getLastServerErrorString() : String;
 	function getLastSubErrorID() : UInt;
+	private function get_metadata() : DRMContentData;
 	function issueDRMErrorEvent(metadata : DRMContentData, errorID : Int, subErrorID : Int, serverErrorString : String) : Void;
 	function issueDRMStatusEvent(inMetadata : DRMContentData, voucher : DRMVoucher) : Dynamic;
 	function onSessionComplete() : Void;
 	function onSessionError() : Void;
 	function setTimerUp() : Void;
-	static var STATUS_FAILED(default,never) : UInt;
-	static var STATUS_NOTREADY(default,never) : UInt;
-	static var STATUS_READY(default,never) : UInt;
-	static var STATUS_UNKNOWN(default,never) : UInt;
+	private function set_metadata(value : DRMContentData) : DRMContentData;
+	@:ns("flash.net.drm",internal) static final STATUS_FAILED : UInt;
+	@:ns("flash.net.drm",internal) static final STATUS_NOTREADY : UInt;
+	@:ns("flash.net.drm",internal) static final STATUS_READY : UInt;
+	@:ns("flash.net.drm",internal) static final STATUS_UNKNOWN : UInt;
 }
diff --git a/std/flash/net/drm/DRMPlaybackTimeWindow.hx b/std/flash/net/drm/DRMPlaybackTimeWindow.hx
index 7014bd2edafefcaaa8a5426eaff0446d50eef71a..f4252d3c1d8a88d085d87c182ea48b971bf4a817 100644
--- a/std/flash/net/drm/DRMPlaybackTimeWindow.hx
+++ b/std/flash/net/drm/DRMPlaybackTimeWindow.hx
@@ -1,8 +1,11 @@
 package flash.net.drm;
 
 extern class DRMPlaybackTimeWindow {
-	var endDate(default,never) : Date;
-	var period(default,never) : UInt;
-	var startDate(default,never) : Date;
+	@:flash.property var endDate(get,never) : Date;
+	@:flash.property var period(get,never) : UInt;
+	@:flash.property var startDate(get,never) : Date;
 	function new() : Void;
+	private function get_endDate() : Date;
+	private function get_period() : UInt;
+	private function get_startDate() : Date;
 }
diff --git a/std/flash/net/drm/DRMVoucher.hx b/std/flash/net/drm/DRMVoucher.hx
index 710510448819f515c2874b2049bd7e5b3b802333..fc694a2d8ebd3dd7605c46478133e26d7d9a650f 100644
--- a/std/flash/net/drm/DRMVoucher.hx
+++ b/std/flash/net/drm/DRMVoucher.hx
@@ -1,15 +1,24 @@
 package flash.net.drm;
 
 extern class DRMVoucher {
-	var licenseID(default,never) : String;
-	var offlineLeaseEndDate(default,never) : Date;
-	var offlineLeaseStartDate(default,never) : Date;
-	var playbackTimeWindow(default,never) : DRMPlaybackTimeWindow;
-	var policies(default,never) : Dynamic;
-	var policyID(default,never) : String;
-	var serverURL(default,never) : String;
-	var voucherEndDate(default,never) : Date;
-	var voucherStartDate(default,never) : Date;
+	@:flash.property var licenseID(get,never) : String;
+	@:flash.property var offlineLeaseEndDate(get,never) : Date;
+	@:flash.property var offlineLeaseStartDate(get,never) : Date;
+	@:flash.property var playbackTimeWindow(get,never) : DRMPlaybackTimeWindow;
+	@:flash.property var policies(get,never) : Dynamic;
+	@:flash.property var policyID(get,never) : String;
+	@:flash.property var serverURL(get,never) : String;
+	@:flash.property var voucherEndDate(get,never) : Date;
+	@:flash.property var voucherStartDate(get,never) : Date;
 	function new() : Void;
+	private function get_licenseID() : String;
+	private function get_offlineLeaseEndDate() : Date;
+	private function get_offlineLeaseStartDate() : Date;
+	private function get_playbackTimeWindow() : DRMPlaybackTimeWindow;
+	private function get_policies() : Dynamic;
+	private function get_policyID() : String;
+	private function get_serverURL() : String;
+	private function get_voucherEndDate() : Date;
+	private function get_voucherStartDate() : Date;
 	function toByteArray() : flash.utils.ByteArray;
 }
diff --git a/std/flash/net/drm/DRMVoucherDownloadContext.hx b/std/flash/net/drm/DRMVoucherDownloadContext.hx
index 44c6725f40665c38efd527663187770bc2e68670..62b34c07af902b8db0afe2da4c1a90e65b740b95 100644
--- a/std/flash/net/drm/DRMVoucherDownloadContext.hx
+++ b/std/flash/net/drm/DRMVoucherDownloadContext.hx
@@ -1,7 +1,8 @@
 package flash.net.drm;
 
 extern class DRMVoucherDownloadContext extends DRMManagerSession {
-	var voucher(default,never) : DRMVoucher;
+	@:flash.property var voucher(get,never) : DRMVoucher;
 	function new() : Void;
 	function download(inMetadata : DRMContentData, previewVoucher : Bool = false) : Void;
+	private function get_voucher() : DRMVoucher;
 }
diff --git a/std/flash/net/drm/DRMVoucherStoreContext.hx b/std/flash/net/drm/DRMVoucherStoreContext.hx
index dc731f06764f5e8c0c2692128b4ad54c74848999..bbc7b0a4d9c3226a42ada083cdc49e438cbce769 100644
--- a/std/flash/net/drm/DRMVoucherStoreContext.hx
+++ b/std/flash/net/drm/DRMVoucherStoreContext.hx
@@ -1,7 +1,8 @@
 package flash.net.drm;
 
 extern class DRMVoucherStoreContext extends DRMManagerSession {
-	var voucher(default,never) : DRMVoucher;
+	@:flash.property var voucher(get,never) : DRMVoucher;
 	function new() : Void;
 	function getVoucherFromStore(inMetadata : DRMContentData) : Void;
+	private function get_voucher() : DRMVoucher;
 }
diff --git a/std/flash/net/drm/LoadVoucherSetting.hx b/std/flash/net/drm/LoadVoucherSetting.hx
index 18993c8d022c6a2d8a74025b27e3cdca5b0ad859..7fb9162e3c7c735fac07a9c873e36b1a7ca51ce0 100644
--- a/std/flash/net/drm/LoadVoucherSetting.hx
+++ b/std/flash/net/drm/LoadVoucherSetting.hx
@@ -2,7 +2,7 @@ package flash.net.drm;
 
 extern class LoadVoucherSetting {
 	function new() : Void;
-	static var ALLOW_SERVER(default,never) : String;
-	static var FORCE_REFRESH(default,never) : String;
-	static var LOCAL_ONLY(default,never) : String;
+	static final ALLOW_SERVER : String;
+	static final FORCE_REFRESH : String;
+	static final LOCAL_ONLY : String;
 }
diff --git a/std/flash/net/drm/VoucherAccessInfo.hx b/std/flash/net/drm/VoucherAccessInfo.hx
index 895bd536b1b4040bbc984f878a33be55bda876cd..ce0c64c75634185b6b80c7005f1949c646a27044 100644
--- a/std/flash/net/drm/VoucherAccessInfo.hx
+++ b/std/flash/net/drm/VoucherAccessInfo.hx
@@ -1,10 +1,15 @@
 package flash.net.drm;
 
-@:final extern class VoucherAccessInfo {
-	var authenticationMethod(default,never) : String;
-	var deviceGroup(default,never) : DRMDeviceGroup;
-	var displayName(default,never) : String;
-	var domain(default,never) : String;
-	var policyID(default,never) : String;
+extern final class VoucherAccessInfo {
+	@:flash.property var authenticationMethod(get,never) : String;
+	@:flash.property var deviceGroup(get,never) : DRMDeviceGroup;
+	@:flash.property var displayName(get,never) : String;
+	@:flash.property var domain(get,never) : String;
+	@:flash.property var policyID(get,never) : String;
 	function new() : Void;
+	private function get_authenticationMethod() : String;
+	private function get_deviceGroup() : DRMDeviceGroup;
+	private function get_displayName() : String;
+	private function get_domain() : String;
+	private function get_policyID() : String;
 }
diff --git a/std/flash/printing/PrintJob.hx b/std/flash/printing/PrintJob.hx
index 1fc72279c01dbac6d2316143bfb76bbff567b2ca..1f870be630219a1d74b985bf636adae3f0e7dacf 100644
--- a/std/flash/printing/PrintJob.hx
+++ b/std/flash/printing/PrintJob.hx
@@ -1,14 +1,20 @@
 package flash.printing;
 
 extern class PrintJob extends flash.events.EventDispatcher {
-	var orientation(default,never) : PrintJobOrientation;
-	var pageHeight(default,never) : Int;
-	var pageWidth(default,never) : Int;
-	var paperHeight(default,never) : Int;
-	var paperWidth(default,never) : Int;
+	@:flash.property var orientation(get,never) : PrintJobOrientation;
+	@:flash.property var pageHeight(get,never) : Int;
+	@:flash.property var pageWidth(get,never) : Int;
+	@:flash.property var paperHeight(get,never) : Int;
+	@:flash.property var paperWidth(get,never) : Int;
 	function new() : Void;
 	function addPage(sprite : flash.display.Sprite, ?printArea : flash.geom.Rectangle, ?options : PrintJobOptions, frameNum : Int = 0) : Void;
+	private function get_orientation() : PrintJobOrientation;
+	private function get_pageHeight() : Int;
+	private function get_pageWidth() : Int;
+	private function get_paperHeight() : Int;
+	private function get_paperWidth() : Int;
 	function send() : Void;
 	function start() : Bool;
-	@:require(flash10_1) static var isSupported(default,never) : Bool;
+	@:flash.property @:require(flash10_1) static var isSupported(get,never) : Bool;
+	private static function get_isSupported() : Bool;
 }
diff --git a/std/flash/printing/PrintJobOrientation.hx b/std/flash/printing/PrintJobOrientation.hx
index fb4f7551b0d0e3ad2c11781a3d19110198cd6b24..82f1d0445aeb6eb807ba952e06ac275a407ce207 100644
--- a/std/flash/printing/PrintJobOrientation.hx
+++ b/std/flash/printing/PrintJobOrientation.hx
@@ -1,6 +1,6 @@
 package flash.printing;
 
-@:fakeEnum(String) extern enum PrintJobOrientation {
-	LANDSCAPE;
-	PORTRAIT;
+@:native("flash.printing.PrintJobOrientation") extern enum abstract PrintJobOrientation(String) {
+	var LANDSCAPE;
+	var PORTRAIT;
 }
diff --git a/std/flash/profiler/Telemetry.hx b/std/flash/profiler/Telemetry.hx
index 2e878d40c4cdaac99aed41d82acc2638a54b0260..377ebfeafde9eadb7a6ed036114eb5a543d7e8ee 100644
--- a/std/flash/profiler/Telemetry.hx
+++ b/std/flash/profiler/Telemetry.hx
@@ -2,8 +2,10 @@ package flash.profiler;
 
 extern class Telemetry {
 	function new() : Void;
-	static var connected(default,never) : Bool;
-	static var spanMarker(default,never) : Float;
+	@:flash.property static var connected(get,never) : Bool;
+	@:flash.property static var spanMarker(get,never) : Float;
+	private static function get_connected() : Bool;
+	private static function get_spanMarker() : Float;
 	static function registerCommandHandler(commandName : String, handler : Dynamic) : Bool;
 	static function sendMetric(metric : String, value : Dynamic) : Void;
 	static function sendSpanMetric(metric : String, startSpanMarker : Float, ?value : Dynamic) : Void;
diff --git a/std/flash/sampler/ClassFactory.hx b/std/flash/sampler/ClassFactory.hx
index 2969ec5603bce61a6865c17d8b2854c776cbca4e..ba016eb349acc3141a1b533a9b2f438970c4d00b 100644
--- a/std/flash/sampler/ClassFactory.hx
+++ b/std/flash/sampler/ClassFactory.hx
@@ -2,8 +2,8 @@ package flash.sampler;
 
 extern class ClassFactory {
 	function new() : Void;
-	static var DeleteObjectSampleClass(default,never) : Class<Dynamic>;
-	static var NewObjectSampleClass(default,never) : Class<Dynamic>;
-	static var SampleClass(default,never) : Class<Dynamic>;
-	static var StackFrameClass(default,never) : Class<Dynamic>;
+	static final DeleteObjectSampleClass : Class<Dynamic>;
+	static final NewObjectSampleClass : Class<Dynamic>;
+	static final SampleClass : Class<Dynamic>;
+	static final StackFrameClass : Class<Dynamic>;
 }
diff --git a/std/flash/sampler/DeleteObjectSample.hx b/std/flash/sampler/DeleteObjectSample.hx
index 333afdd2eccb502cd6de7fa13bc2e393623f5b69..1766d47a57040507acc4a373ace706afa05b7dc5 100644
--- a/std/flash/sampler/DeleteObjectSample.hx
+++ b/std/flash/sampler/DeleteObjectSample.hx
@@ -1,6 +1,6 @@
 package flash.sampler;
 
-@:final extern class DeleteObjectSample extends Sample {
-	var id(default,never) : Float;
-	var size(default,never) : Float;
+extern final class DeleteObjectSample extends Sample {
+	final id : Float;
+	final size : Float;
 }
diff --git a/std/flash/sampler/NewObjectSample.hx b/std/flash/sampler/NewObjectSample.hx
index 3b78bcc0b76316e57bfb926f75d26088512f83c8..22c3e8f0c3856a55c69614078851a88a8c7809f5 100644
--- a/std/flash/sampler/NewObjectSample.hx
+++ b/std/flash/sampler/NewObjectSample.hx
@@ -1,8 +1,10 @@
 package flash.sampler;
 
-@:final extern class NewObjectSample extends Sample {
-	var id(default,never) : Float;
-	var object(default,never) : Dynamic;
-	@:require(flash10_1) var size(default,never) : Float;
-	var type(default,never) : Class<Dynamic>;
+extern final class NewObjectSample extends Sample {
+	final id : Float;
+	@:flash.property var object(get,never) : Dynamic;
+	@:flash.property @:require(flash10_1) var size(get,never) : Float;
+	final type : Class<Dynamic>;
+	private function get_object() : Dynamic;
+	private function get_size() : Float;
 }
diff --git a/std/flash/sampler/Sample.hx b/std/flash/sampler/Sample.hx
index 173137b37de271631501c95c724ae840ca165480..f6d80cb4767f818af2ec36a3ffa9ba072dab0832 100644
--- a/std/flash/sampler/Sample.hx
+++ b/std/flash/sampler/Sample.hx
@@ -1,6 +1,6 @@
 package flash.sampler;
 
 extern class Sample {
-	var stack(default,never) : Array<StackFrame>;
-	var time(default,never) : Float;
+	final stack : Array<StackFrame>;
+	final time : Float;
 }
diff --git a/std/flash/sampler/StackFrame.hx b/std/flash/sampler/StackFrame.hx
index 330213dedded0b4ce41303e604a38022884f24ce..2e4fa851ad5512174140223a382ed550bca0fd9c 100644
--- a/std/flash/sampler/StackFrame.hx
+++ b/std/flash/sampler/StackFrame.hx
@@ -1,9 +1,9 @@
 package flash.sampler;
 
-@:final extern class StackFrame {
-	var file(default,never) : String;
-	var line(default,never) : UInt;
-	var name(default,never) : String;
-	@:require(flash10_1) var scriptID(default,never) : Float;
+extern final class StackFrame {
+	final file : String;
+	final line : UInt;
+	final name : String;
+	@:require(flash10_1) final scriptID : Float;
 	function toString() : String;
 }
diff --git a/std/flash/security/CertificateStatus.hx b/std/flash/security/CertificateStatus.hx
index 05f873cd83c32ac66ce6fb87ee6517e8ab8dd619..886f07ef899aea02a2ef7bd6493a736b2796b1c3 100644
--- a/std/flash/security/CertificateStatus.hx
+++ b/std/flash/security/CertificateStatus.hx
@@ -2,13 +2,13 @@ package flash.security;
 
 extern class CertificateStatus {
 	function new() : Void;
-	static var EXPIRED(default,never) : String;
-	static var INVALID(default,never) : String;
-	static var INVALID_CHAIN(default,never) : String;
-	static var NOT_YET_VALID(default,never) : String;
-	static var PRINCIPAL_MISMATCH(default,never) : String;
-	static var REVOKED(default,never) : String;
-	static var TRUSTED(default,never) : String;
-	static var UNKNOWN(default,never) : String;
-	static var UNTRUSTED_SIGNERS(default,never) : String;
+	static final EXPIRED : String;
+	static final INVALID : String;
+	static final INVALID_CHAIN : String;
+	static final NOT_YET_VALID : String;
+	static final PRINCIPAL_MISMATCH : String;
+	static final REVOKED : String;
+	static final TRUSTED : String;
+	static final UNKNOWN : String;
+	static final UNTRUSTED_SIGNERS : String;
 }
diff --git a/std/flash/security/X500DistinguishedName.hx b/std/flash/security/X500DistinguishedName.hx
index 37defca3ac4800e044f8c1b6c0fae3c723de86f2..b69ae568e1e7b1379124801ead1f2406e837d2e0 100644
--- a/std/flash/security/X500DistinguishedName.hx
+++ b/std/flash/security/X500DistinguishedName.hx
@@ -1,12 +1,18 @@
 package flash.security;
 
 extern class X500DistinguishedName {
-	var commonName(default,never) : String;
-	var countryName(default,never) : String;
-	var localityName(default,never) : String;
-	var organizationName(default,never) : String;
-	var organizationalUnitName(default,never) : String;
-	var stateOrProvinceName(default,never) : String;
+	@:flash.property var commonName(get,never) : String;
+	@:flash.property var countryName(get,never) : String;
+	@:flash.property var localityName(get,never) : String;
+	@:flash.property var organizationName(get,never) : String;
+	@:flash.property var organizationalUnitName(get,never) : String;
+	@:flash.property var stateOrProvinceName(get,never) : String;
 	function new() : Void;
+	private function get_commonName() : String;
+	private function get_countryName() : String;
+	private function get_localityName() : String;
+	private function get_organizationName() : String;
+	private function get_organizationalUnitName() : String;
+	private function get_stateOrProvinceName() : String;
 	function toString() : String;
 }
diff --git a/std/flash/security/X509Certificate.hx b/std/flash/security/X509Certificate.hx
index dfdd82c5f173532283cd5654f6dc82fa7b3b6328..b1e7d10d47ed392988a63a94fe0ad2736e1c6b14 100644
--- a/std/flash/security/X509Certificate.hx
+++ b/std/flash/security/X509Certificate.hx
@@ -1,18 +1,31 @@
 package flash.security;
 
 extern class X509Certificate {
-	var encoded(default,never) : flash.utils.ByteArray;
-	var issuer(default,never) : X500DistinguishedName;
-	var issuerUniqueID(default,never) : String;
-	var serialNumber(default,never) : String;
-	var signatureAlgorithmOID(default,never) : String;
-	var signatureAlgorithmParams(default,never) : flash.utils.ByteArray;
-	var subject(default,never) : X500DistinguishedName;
-	var subjectPublicKey(default,never) : String;
-	var subjectPublicKeyAlgorithmOID(default,never) : String;
-	var subjectUniqueID(default,never) : String;
-	var validNotAfter(default,never) : Date;
-	var validNotBefore(default,never) : Date;
-	var version(default,never) : UInt;
+	@:flash.property var encoded(get,never) : flash.utils.ByteArray;
+	@:flash.property var issuer(get,never) : X500DistinguishedName;
+	@:flash.property var issuerUniqueID(get,never) : String;
+	@:flash.property var serialNumber(get,never) : String;
+	@:flash.property var signatureAlgorithmOID(get,never) : String;
+	@:flash.property var signatureAlgorithmParams(get,never) : flash.utils.ByteArray;
+	@:flash.property var subject(get,never) : X500DistinguishedName;
+	@:flash.property var subjectPublicKey(get,never) : String;
+	@:flash.property var subjectPublicKeyAlgorithmOID(get,never) : String;
+	@:flash.property var subjectUniqueID(get,never) : String;
+	@:flash.property var validNotAfter(get,never) : Date;
+	@:flash.property var validNotBefore(get,never) : Date;
+	@:flash.property var version(get,never) : UInt;
 	function new() : Void;
+	private function get_encoded() : flash.utils.ByteArray;
+	private function get_issuer() : X500DistinguishedName;
+	private function get_issuerUniqueID() : String;
+	private function get_serialNumber() : String;
+	private function get_signatureAlgorithmOID() : String;
+	private function get_signatureAlgorithmParams() : flash.utils.ByteArray;
+	private function get_subject() : X500DistinguishedName;
+	private function get_subjectPublicKey() : String;
+	private function get_subjectPublicKeyAlgorithmOID() : String;
+	private function get_subjectUniqueID() : String;
+	private function get_validNotAfter() : Date;
+	private function get_validNotBefore() : Date;
+	private function get_version() : UInt;
 }
diff --git a/std/flash/sensors/Accelerometer.hx b/std/flash/sensors/Accelerometer.hx
index dbeab47fca43eb7fc26aed4ea222ebb35e6595fc..ad341210142c86f4b302986aa4006866cc9e896f 100644
--- a/std/flash/sensors/Accelerometer.hx
+++ b/std/flash/sensors/Accelerometer.hx
@@ -1,8 +1,10 @@
 package flash.sensors;
 
 @:require(flash10_1) extern class Accelerometer extends flash.events.EventDispatcher {
-	var muted(default,never) : Bool;
+	@:flash.property var muted(get,never) : Bool;
 	function new() : Void;
+	private function get_muted() : Bool;
 	function setRequestedUpdateInterval(interval : Float) : Void;
-	static var isSupported(default,never) : Bool;
+	@:flash.property static var isSupported(get,never) : Bool;
+	private static function get_isSupported() : Bool;
 }
diff --git a/std/flash/sensors/Geolocation.hx b/std/flash/sensors/Geolocation.hx
index 7f917e248b744a73b7754d1870eb3ce017b4b661..d87fc25ba99701b2e11cfc0de73e85c47db7bf3c 100644
--- a/std/flash/sensors/Geolocation.hx
+++ b/std/flash/sensors/Geolocation.hx
@@ -1,8 +1,10 @@
 package flash.sensors;
 
 @:require(flash10_1) extern class Geolocation extends flash.events.EventDispatcher {
-	var muted(default,never) : Bool;
+	@:flash.property var muted(get,never) : Bool;
 	function new() : Void;
+	private function get_muted() : Bool;
 	function setRequestedUpdateInterval(interval : Float) : Void;
-	static var isSupported(default,never) : Bool;
+	@:flash.property static var isSupported(get,never) : Bool;
+	private static function get_isSupported() : Bool;
 }
diff --git a/std/flash/system/ApplicationDomain.hx b/std/flash/system/ApplicationDomain.hx
index 557689e7539ee722beccf39f1ca0fd64010d38f2..5b0f78335067e1e1280481a625f84c6466c1499d 100644
--- a/std/flash/system/ApplicationDomain.hx
+++ b/std/flash/system/ApplicationDomain.hx
@@ -1,12 +1,17 @@
 package flash.system;
 
-@:final extern class ApplicationDomain {
-	@:require(flash10) var domainMemory : flash.utils.ByteArray;
-	var parentDomain(default,never) : ApplicationDomain;
+extern final class ApplicationDomain {
+	@:flash.property @:require(flash10) var domainMemory(get,set) : flash.utils.ByteArray;
+	@:flash.property var parentDomain(get,never) : ApplicationDomain;
 	function new(?parentDomain : ApplicationDomain) : Void;
 	function getDefinition(name : String) : flash.utils.Object;
 	@:require(flash11_3) function getQualifiedDefinitionNames() : flash.Vector<String>;
+	private function get_domainMemory() : flash.utils.ByteArray;
+	private function get_parentDomain() : ApplicationDomain;
 	function hasDefinition(name : String) : Bool;
-	@:require(flash10) static var MIN_DOMAIN_MEMORY_LENGTH(default,never) : UInt;
-	static var currentDomain(default,never) : ApplicationDomain;
+	private function set_domainMemory(value : flash.utils.ByteArray) : flash.utils.ByteArray;
+	@:flash.property @:require(flash10) static var MIN_DOMAIN_MEMORY_LENGTH(get,never) : UInt;
+	@:flash.property static var currentDomain(get,never) : ApplicationDomain;
+	private static function get_MIN_DOMAIN_MEMORY_LENGTH() : UInt;
+	private static function get_currentDomain() : ApplicationDomain;
 }
diff --git a/std/flash/system/ApplicationInstaller.hx b/std/flash/system/ApplicationInstaller.hx
index 6c658b177409c6285f365a6c2568427f29756dc9..52491934692b564903f0ed8ec1cbf8bc4281e722 100644
--- a/std/flash/system/ApplicationInstaller.hx
+++ b/std/flash/system/ApplicationInstaller.hx
@@ -1,8 +1,9 @@
 package flash.system;
 
-@:final @:require(flash11_3) extern class ApplicationInstaller extends flash.events.EventDispatcher {
-	var isInstalled(default,never) : Bool;
+@:require(flash11_3) extern final class ApplicationInstaller extends flash.events.EventDispatcher {
+	@:flash.property var isInstalled(get,never) : Bool;
 	function new() : Void;
+	private function get_isInstalled() : Bool;
 	function install(?mode : String) : Void;
 	static function iconDigest(icon : flash.utils.ByteArray) : String;
 	static function stringsDigest(strings : flash.xml.XML) : String;
diff --git a/std/flash/system/ApplicationInstallerMode.hx b/std/flash/system/ApplicationInstallerMode.hx
index a512cc2b365658c7a6f068a1ddb9bc352fc7e717..4d67e6b15a766f784341a53b3dbef7f61ee00b40 100644
--- a/std/flash/system/ApplicationInstallerMode.hx
+++ b/std/flash/system/ApplicationInstallerMode.hx
@@ -1,7 +1,7 @@
 package flash.system;
 
-@:fakeEnum(String) extern enum ApplicationInstallerMode {
-	INSTALL_ONLY;
-	INSTALL_WITH_SHORTCUTS;
-	SHORTCUTS_ONLY;
+@:native("flash.system.ApplicationInstallerMode") extern enum abstract ApplicationInstallerMode(String) {
+	var INSTALL_ONLY;
+	var INSTALL_WITH_SHORTCUTS;
+	var SHORTCUTS_ONLY;
 }
diff --git a/std/flash/system/AuthorizedFeatures.hx b/std/flash/system/AuthorizedFeatures.hx
index 1eb9a131e0dda809866af6d5f47034b064a5d85a..cfc84b10f42445c6b058725c7a6871317a2cf186 100644
--- a/std/flash/system/AuthorizedFeatures.hx
+++ b/std/flash/system/AuthorizedFeatures.hx
@@ -1,6 +1,6 @@
 package flash.system;
 
-@:final @:require(flash11_3) extern class AuthorizedFeatures {
+@:require(flash11_3) extern final class AuthorizedFeatures {
 	function new() : Void;
 	function createApplicationInstaller(strings : flash.xml.XML, icon : flash.utils.ByteArray) : ApplicationInstaller;
 	function enableAVLoader(loader : flash.display.AVLoader) : Bool;
@@ -9,6 +9,6 @@ package flash.system;
 	@:require(flash11_4) function enableDiskCache(stream : flash.net.URLStream) : Bool;
 	@:require(flash11_7) function enableHLSPlayback(stream : flash.media.AVStream) : Bool;
 	function enableMediaPlayerHLSPlayback(player : Dynamic) : Bool;
-	@:require(flash11_4) function isFeatureEnabled(feature : String, ?data : String) : Bool;
-	@:require(flash11_4) function isNegativeToken() : Bool;
+	@:ns("flash.system",internal) @:require(flash11_4) function isFeatureEnabled(feature : String, ?data : String) : Bool;
+	@:ns("flash.system",internal) @:require(flash11_4) function isNegativeToken() : Bool;
 }
diff --git a/std/flash/system/AuthorizedFeaturesLoader.hx b/std/flash/system/AuthorizedFeaturesLoader.hx
index 6f5934564ebc3f48c3105f95b8ec7a66d97b3151..8ce6f162cef785018964671498b704f157ebd049 100644
--- a/std/flash/system/AuthorizedFeaturesLoader.hx
+++ b/std/flash/system/AuthorizedFeaturesLoader.hx
@@ -1,9 +1,10 @@
 package flash.system;
 
-@:final @:require(flash11_3) extern class AuthorizedFeaturesLoader extends flash.events.EventDispatcher {
-	var authorizedFeatures(default,never) : AuthorizedFeatures;
+@:require(flash11_3) extern final class AuthorizedFeaturesLoader extends flash.events.EventDispatcher {
+	@:flash.property var authorizedFeatures(get,never) : AuthorizedFeatures;
 	function new() : Void;
+	private function get_authorizedFeatures() : AuthorizedFeatures;
 	function loadAuthorizedFeatures() : Void;
 	@:require(flash11_7) function loadAuthorizedFeaturesFromData(data : flash.utils.ByteArray) : Void;
-	@:require(flash11_4) function makeGlobal() : Void;
+	@:ns("flash.system",internal) @:require(flash11_4) function makeGlobal() : Void;
 }
diff --git a/std/flash/system/Capabilities.hx b/std/flash/system/Capabilities.hx
index 0fe6f780d782aa281a354f7175bcc44f61edddc6..22f1f86ae2f41dc0567f07e28ffaa58d64fece60 100644
--- a/std/flash/system/Capabilities.hx
+++ b/std/flash/system/Capabilities.hx
@@ -1,39 +1,75 @@
 package flash.system;
 
 extern class Capabilities {
-	static var _internal(default,never) : UInt;
-	static var avHardwareDisable(default,never) : Bool;
-	@:require(flash10_1) static var cpuArchitecture(default,never) : String;
-	static var hasAccessibility(default,never) : Bool;
-	static var hasAudio(default,never) : Bool;
-	static var hasAudioEncoder(default,never) : Bool;
-	static var hasEmbeddedVideo(default,never) : Bool;
-	static var hasIME(default,never) : Bool;
-	static var hasMP3(default,never) : Bool;
-	static var hasPrinting(default,never) : Bool;
-	static var hasScreenBroadcast(default,never) : Bool;
-	static var hasScreenPlayback(default,never) : Bool;
-	static var hasStreamingAudio(default,never) : Bool;
-	static var hasStreamingVideo(default,never) : Bool;
-	static var hasTLS(default,never) : Bool;
-	static var hasVideoEncoder(default,never) : Bool;
-	static var isDebugger(default,never) : Bool;
-	@:require(flash10) static var isEmbeddedInAcrobat(default,never) : Bool;
-	static var language(default,never) : String;
-	static var localFileReadDisable(default,never) : Bool;
-	static var manufacturer(default,never) : String;
-	@:require(flash10) static var maxLevelIDC(default,never) : String;
-	static var os(default,never) : String;
-	static var pixelAspectRatio(default,never) : Float;
-	static var playerType(default,never) : String;
-	static var screenColor(default,never) : String;
-	static var screenDPI(default,never) : Float;
-	static var screenResolutionX(default,never) : Float;
-	static var screenResolutionY(default,never) : Float;
-	static var serverString(default,never) : String;
-	@:require(flash10_1) static var supports32BitProcesses(default,never) : Bool;
-	@:require(flash10_1) static var supports64BitProcesses(default,never) : Bool;
-	@:require(flash10_1) static var touchscreenType(default,never) : TouchscreenType;
-	static var version(default,never) : String;
+	@:flash.property static var _internal(get,never) : UInt;
+	@:flash.property static var avHardwareDisable(get,never) : Bool;
+	@:flash.property static var cpuAddressSize(get,never) : Float;
+	@:flash.property @:require(flash10_1) static var cpuArchitecture(get,never) : String;
+	@:flash.property static var hasAccessibility(get,never) : Bool;
+	@:flash.property static var hasAudio(get,never) : Bool;
+	@:flash.property static var hasAudioEncoder(get,never) : Bool;
+	@:flash.property static var hasEmbeddedVideo(get,never) : Bool;
+	@:flash.property static var hasIME(get,never) : Bool;
+	@:flash.property static var hasMP3(get,never) : Bool;
+	@:flash.property static var hasPrinting(get,never) : Bool;
+	@:flash.property static var hasScreenBroadcast(get,never) : Bool;
+	@:flash.property static var hasScreenPlayback(get,never) : Bool;
+	@:flash.property static var hasStreamingAudio(get,never) : Bool;
+	@:flash.property static var hasStreamingVideo(get,never) : Bool;
+	@:flash.property static var hasTLS(get,never) : Bool;
+	@:flash.property static var hasVideoEncoder(get,never) : Bool;
+	@:flash.property static var isDebugger(get,never) : Bool;
+	@:flash.property @:require(flash10) static var isEmbeddedInAcrobat(get,never) : Bool;
+	@:flash.property static var language(get,never) : String;
+	@:flash.property static var localFileReadDisable(get,never) : Bool;
+	@:flash.property static var manufacturer(get,never) : String;
+	@:flash.property @:require(flash10) static var maxLevelIDC(get,never) : String;
+	@:flash.property static var os(get,never) : String;
+	@:flash.property static var pixelAspectRatio(get,never) : Float;
+	@:flash.property static var playerType(get,never) : String;
+	@:flash.property static var screenColor(get,never) : String;
+	@:flash.property static var screenDPI(get,never) : Float;
+	@:flash.property static var screenResolutionX(get,never) : Float;
+	@:flash.property static var screenResolutionY(get,never) : Float;
+	@:flash.property static var serverString(get,never) : String;
+	@:flash.property @:require(flash10_1) static var supports32BitProcesses(get,never) : Bool;
+	@:flash.property @:require(flash10_1) static var supports64BitProcesses(get,never) : Bool;
+	@:flash.property @:require(flash10_1) static var touchscreenType(get,never) : TouchscreenType;
+	@:flash.property static var version(get,never) : String;
+	private static function get__internal() : UInt;
+	private static function get_avHardwareDisable() : Bool;
+	private static function get_cpuAddressSize() : Float;
+	private static function get_cpuArchitecture() : String;
+	private static function get_hasAccessibility() : Bool;
+	private static function get_hasAudio() : Bool;
+	private static function get_hasAudioEncoder() : Bool;
+	private static function get_hasEmbeddedVideo() : Bool;
+	private static function get_hasIME() : Bool;
+	private static function get_hasMP3() : Bool;
+	private static function get_hasPrinting() : Bool;
+	private static function get_hasScreenBroadcast() : Bool;
+	private static function get_hasScreenPlayback() : Bool;
+	private static function get_hasStreamingAudio() : Bool;
+	private static function get_hasStreamingVideo() : Bool;
+	private static function get_hasTLS() : Bool;
+	private static function get_hasVideoEncoder() : Bool;
+	private static function get_isDebugger() : Bool;
+	private static function get_isEmbeddedInAcrobat() : Bool;
+	private static function get_language() : String;
+	private static function get_localFileReadDisable() : Bool;
+	private static function get_manufacturer() : String;
+	private static function get_maxLevelIDC() : String;
+	private static function get_os() : String;
+	private static function get_pixelAspectRatio() : Float;
+	private static function get_playerType() : String;
+	private static function get_screenColor() : String;
+	private static function get_screenDPI() : Float;
+	private static function get_screenResolutionX() : Float;
+	private static function get_screenResolutionY() : Float;
+	private static function get_serverString() : String;
+	private static function get_supports32BitProcesses() : Bool;
+	private static function get_supports64BitProcesses() : Bool;
+	private static function get_touchscreenType() : TouchscreenType;
+	private static function get_version() : String;
 	@:require(flash11) static function hasMultiChannelAudio(type : String) : Bool;
 }
diff --git a/std/flash/system/ConnexionsClient.hx b/std/flash/system/ConnexionsClient.hx
index 923d25cdf5ca85e60a0d85cbe860b59f35703667..68300cc0022b5a75d2527e8de89f5e07013e18cd 100644
--- a/std/flash/system/ConnexionsClient.hx
+++ b/std/flash/system/ConnexionsClient.hx
@@ -1,6 +1,6 @@
 package flash.system;
 
-@:final extern class ConnexionsClient {
+extern final class ConnexionsClient {
 	function new() : Void;
 	function Connexions() : Dynamic;
 	function _init(topLocation : String, documentReferrer : String, windowLocation : String, movie : String, userAgent : String, timeout : UInt) : Void;
diff --git a/std/flash/system/IME.hx b/std/flash/system/IME.hx
index 5e94a16dfa92f19bcfc9153bcbcfcfdc1f5a586d..7a6659f186e640d42c99ed5bff633da2ae174f40 100644
--- a/std/flash/system/IME.hx
+++ b/std/flash/system/IME.hx
@@ -1,11 +1,16 @@
 package flash.system;
 
 extern class IME extends flash.events.EventDispatcher {
-	static var conversionMode : IMEConversionMode;
-	static var enabled : Bool;
-	@:require(flash10_1) static var isSupported(default,never) : Bool;
+	@:flash.property static var conversionMode(get,set) : IMEConversionMode;
+	@:flash.property static var enabled(get,set) : Bool;
+	@:flash.property @:require(flash10_1) static var isSupported(get,never) : Bool;
 	@:require(flash10_1) static function compositionAbandoned() : Void;
 	@:require(flash10_1) static function compositionSelectionChanged(start : Int, end : Int) : Void;
 	static function doConversion() : Void;
+	private static function get_conversionMode() : IMEConversionMode;
+	private static function get_enabled() : Bool;
+	private static function get_isSupported() : Bool;
 	static function setCompositionString(composition : String) : Void;
+	private static function set_conversionMode(value : IMEConversionMode) : IMEConversionMode;
+	private static function set_enabled(value : Bool) : Bool;
 }
diff --git a/std/flash/system/IMEConversionMode.hx b/std/flash/system/IMEConversionMode.hx
index ba1a04d7a4d678b6d488b07ec61cc408f912f37f..102baa905eff77d3397571e09768eaeefe745101 100644
--- a/std/flash/system/IMEConversionMode.hx
+++ b/std/flash/system/IMEConversionMode.hx
@@ -1,12 +1,12 @@
 package flash.system;
 
-@:fakeEnum(String) extern enum IMEConversionMode {
-	ALPHANUMERIC_FULL;
-	ALPHANUMERIC_HALF;
-	CHINESE;
-	JAPANESE_HIRAGANA;
-	JAPANESE_KATAKANA_FULL;
-	JAPANESE_KATAKANA_HALF;
-	KOREAN;
-	UNKNOWN;
+@:native("flash.system.IMEConversionMode") extern enum abstract IMEConversionMode(String) {
+	var ALPHANUMERIC_FULL;
+	var ALPHANUMERIC_HALF;
+	var CHINESE;
+	var JAPANESE_HIRAGANA;
+	var JAPANESE_KATAKANA_FULL;
+	var JAPANESE_KATAKANA_HALF;
+	var KOREAN;
+	var UNKNOWN;
 }
diff --git a/std/flash/system/ImageDecodingPolicy.hx b/std/flash/system/ImageDecodingPolicy.hx
index caa63053b4b1a99763f7fef675e5e11fd3f92cad..195b18777df103646bca3706d9c202776218acc2 100644
--- a/std/flash/system/ImageDecodingPolicy.hx
+++ b/std/flash/system/ImageDecodingPolicy.hx
@@ -1,6 +1,6 @@
 package flash.system;
 
-@:fakeEnum(String) extern enum ImageDecodingPolicy {
-	ON_DEMAND;
-	ON_LOAD;
+@:native("flash.system.ImageDecodingPolicy") extern enum abstract ImageDecodingPolicy(String) {
+	var ON_DEMAND;
+	var ON_LOAD;
 }
diff --git a/std/flash/system/LoaderContext.hx b/std/flash/system/LoaderContext.hx
index d3c4e32ef815a1c71fb52bcf1909868de5da04ff..3f5e6f531765c8fc368a097212b69332db94c3e6 100644
--- a/std/flash/system/LoaderContext.hx
+++ b/std/flash/system/LoaderContext.hx
@@ -2,7 +2,7 @@ package flash.system;
 
 extern class LoaderContext {
 	@:require(flash10_1) var allowCodeImport : Bool;
-	@:require(flash10_1) var allowLoadBytesCodeExecution : Bool;
+	@:flash.property @:require(flash10_1) var allowLoadBytesCodeExecution(get,set) : Bool;
 	var applicationDomain : ApplicationDomain;
 	var checkPolicyFile : Bool;
 	@:require(flash11) var imageDecodingPolicy : ImageDecodingPolicy;
@@ -10,4 +10,6 @@ extern class LoaderContext {
 	@:require(flash11) var requestedContentParent : flash.display.DisplayObjectContainer;
 	var securityDomain : SecurityDomain;
 	function new(checkPolicyFile : Bool = false, ?applicationDomain : ApplicationDomain, ?securityDomain : SecurityDomain) : Void;
+	private function get_allowLoadBytesCodeExecution() : Bool;
+	private function set_allowLoadBytesCodeExecution(value : Bool) : Bool;
 }
diff --git a/std/flash/system/MessageChannel.hx b/std/flash/system/MessageChannel.hx
index 9fcd885f7a1a5c9a030ea1d3086766dfd56310b6..1a184cd316a488924e835ce553db0d1ddd4beaaf 100644
--- a/std/flash/system/MessageChannel.hx
+++ b/std/flash/system/MessageChannel.hx
@@ -1,9 +1,11 @@
 package flash.system;
 
-@:final @:require(flash11_4) extern class MessageChannel extends flash.events.EventDispatcher {
-	var messageAvailable(default,never) : Bool;
-	var state(default,never) : MessageChannelState;
+@:require(flash11_4) extern final class MessageChannel extends flash.events.EventDispatcher {
+	@:flash.property var messageAvailable(get,never) : Bool;
+	@:flash.property var state(get,never) : MessageChannelState;
 	function close() : Void;
+	private function get_messageAvailable() : Bool;
+	private function get_state() : MessageChannelState;
 	function receive(blockUntilReceived : Bool = false) : Dynamic;
 	function send(arg : Dynamic, queueLimit : Int = -1) : Void;
 }
diff --git a/std/flash/system/MessageChannelState.hx b/std/flash/system/MessageChannelState.hx
index 27d04e81b45e21ad906cf19eb50732fc4e240f81..e8459061827f173b0bfbb6f8ec45d00a68706a6e 100644
--- a/std/flash/system/MessageChannelState.hx
+++ b/std/flash/system/MessageChannelState.hx
@@ -1,8 +1,7 @@
 package flash.system;
 
-extern class MessageChannelState {
-	function new() : Void;
-	static var CLOSED(default,never) : String;
-	static var CLOSING(default,never) : String;
-	static var OPEN(default,never) : String;
+@:native("flash.system.MessageChannelState") extern enum abstract MessageChannelState(String) {
+	var CLOSED;
+	var CLOSING;
+	var OPEN;
 }
diff --git a/std/flash/system/Security.hx b/std/flash/system/Security.hx
index 1c5e586f31ae8b6451f1fd58bce008c04c237d6e..70db3ef2fb7bfe8cf1afdf5cb9ddb6c01207b9d7 100644
--- a/std/flash/system/Security.hx
+++ b/std/flash/system/Security.hx
@@ -1,19 +1,25 @@
 package flash.system;
 
 extern class Security {
-	@:require(flash10_1) static var APPLICATION(default,never) : String;
-	static var LOCAL_TRUSTED(default,never) : String;
-	static var LOCAL_WITH_FILE(default,never) : String;
-	static var LOCAL_WITH_NETWORK(default,never) : String;
-	static var REMOTE(default,never) : String;
-	static var disableAVM1Loading : Bool;
-	static var exactSettings : Bool;
-	@:require(flash11) static var pageDomain(default,never) : String;
-	static var sandboxType(default,never) : String;
-	static function allowDomain(?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
-	static function allowInsecureDomain(?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Void;
-	@:require(flash10_1) static function duplicateSandboxBridgeInputArguments(toplevel : Dynamic, args : Array<Dynamic>) : Array<Dynamic>;
-	@:require(flash10_1) static function duplicateSandboxBridgeOutputArgument(toplevel : Dynamic, arg : Dynamic) : Dynamic;
+	@:require(flash10_1) static final APPLICATION : String;
+	static final LOCAL_TRUSTED : String;
+	static final LOCAL_WITH_FILE : String;
+	static final LOCAL_WITH_NETWORK : String;
+	static final REMOTE : String;
+	@:flash.property static var disableAVM1Loading(get,set) : Bool;
+	@:flash.property static var exactSettings(get,set) : Bool;
+	@:flash.property @:require(flash11) static var pageDomain(get,never) : String;
+	@:flash.property static var sandboxType(get,never) : String;
+	static function allowDomain(restArgs : haxe.extern.Rest<Dynamic>) : Void;
+	static function allowInsecureDomain(restArgs : haxe.extern.Rest<Dynamic>) : Void;
+	@:ns("flash.system",internal) @:require(flash10_1) static function duplicateSandboxBridgeInputArguments(toplevel : Dynamic, args : Array<Dynamic>) : Array<Dynamic>;
+	@:ns("flash.system",internal) @:require(flash10_1) static function duplicateSandboxBridgeOutputArgument(toplevel : Dynamic, arg : Dynamic) : Dynamic;
+	private static function get_disableAVM1Loading() : Bool;
+	private static function get_exactSettings() : Bool;
+	private static function get_pageDomain() : String;
+	private static function get_sandboxType() : String;
 	static function loadPolicyFile(url : String) : Void;
+	private static function set_disableAVM1Loading(value : Bool) : Bool;
+	private static function set_exactSettings(value : Bool) : Bool;
 	static function showSettings(?panel : SecurityPanel) : Void;
 }
diff --git a/std/flash/system/SecurityDomain.hx b/std/flash/system/SecurityDomain.hx
index 0334d7a17bb95e2ab3fa91d61a8358d5392992ac..ba6b7dbb8fa635d85808473be82c4855e61b7fd3 100644
--- a/std/flash/system/SecurityDomain.hx
+++ b/std/flash/system/SecurityDomain.hx
@@ -1,6 +1,8 @@
 package flash.system;
 
 extern class SecurityDomain {
-	@:require(flash11_3) var domainID(default,never) : String;
-	static var currentDomain(default,never) : SecurityDomain;
+	@:flash.property @:require(flash11_3) var domainID(get,never) : String;
+	private function get_domainID() : String;
+	@:flash.property static var currentDomain(get,never) : SecurityDomain;
+	private static function get_currentDomain() : SecurityDomain;
 }
diff --git a/std/flash/system/SecurityPanel.hx b/std/flash/system/SecurityPanel.hx
index caa1db8843d50f4ccaacd2f816b7df73f9b9de75..aa88021d9ab0875195283396ca0e69563a44fecf 100644
--- a/std/flash/system/SecurityPanel.hx
+++ b/std/flash/system/SecurityPanel.hx
@@ -1,11 +1,11 @@
 package flash.system;
 
-@:fakeEnum(String) extern enum SecurityPanel {
-	CAMERA;
-	DEFAULT;
-	DISPLAY;
-	LOCAL_STORAGE;
-	MICROPHONE;
-	PRIVACY;
-	SETTINGS_MANAGER;
+@:native("flash.system.SecurityPanel") extern enum abstract SecurityPanel(String) {
+	var CAMERA;
+	var DEFAULT;
+	var DISPLAY;
+	var LOCAL_STORAGE;
+	var MICROPHONE;
+	var PRIVACY;
+	var SETTINGS_MANAGER;
 }
diff --git a/std/flash/system/System.hx b/std/flash/system/System.hx
index 68110693249992bfb7f973644eeef5d19069967e..ba8c567c705ca79e3bdd12d694269a437f35acde 100644
--- a/std/flash/system/System.hx
+++ b/std/flash/system/System.hx
@@ -1,19 +1,28 @@
 package flash.system;
 
 extern class System {
-	@:require(flash10_1) static var freeMemory(default,never) : Float;
-	static var ime(default,never) : IME;
-	@:require(flash10_1) static var privateMemory(default,never) : Float;
-	@:require(flash11) static var processCPUUsage(default,never) : Float;
-	static var totalMemory(default,never) : UInt;
-	@:require(flash10_1) static var totalMemoryNumber(default,never) : Float;
-	static var useCodePage : Bool;
-	static var vmVersion(default,never) : String;
+	@:flash.property @:require(flash10_1) static var freeMemory(get,never) : Float;
+	@:flash.property static var ime(get,never) : IME;
+	@:flash.property @:require(flash10_1) static var privateMemory(get,never) : Float;
+	@:flash.property @:require(flash11) static var processCPUUsage(get,never) : Float;
+	@:flash.property static var totalMemory(get,never) : UInt;
+	@:flash.property @:require(flash10_1) static var totalMemoryNumber(get,never) : Float;
+	@:flash.property static var useCodePage(get,set) : Bool;
+	@:flash.property static var vmVersion(get,never) : String;
 	@:require(flash10_1) static function disposeXML(node : flash.xml.XML) : Void;
 	static function exit(code : UInt) : Void;
 	static function gc() : Void;
+	private static function get_freeMemory() : Float;
+	private static function get_ime() : IME;
+	private static function get_privateMemory() : Float;
+	private static function get_processCPUUsage() : Float;
+	private static function get_totalMemory() : UInt;
+	private static function get_totalMemoryNumber() : Float;
+	private static function get_useCodePage() : Bool;
+	private static function get_vmVersion() : String;
 	static function pause() : Void;
 	@:require(flash11) static function pauseForGCIfCollectionImminent(imminence : Float = 0.75) : Void;
 	static function resume() : Void;
 	static function setClipboard(string : String) : Void;
+	private static function set_useCodePage(value : Bool) : Bool;
 }
diff --git a/std/flash/system/SystemUpdaterType.hx b/std/flash/system/SystemUpdaterType.hx
index 2a3958008cd1b6c5a8ce8de7410a805700791a11..fc5ac33fa9d9fbdd1950f1d63ef0aa7ca5a360f5 100644
--- a/std/flash/system/SystemUpdaterType.hx
+++ b/std/flash/system/SystemUpdaterType.hx
@@ -1,6 +1,6 @@
 package flash.system;
 
-@:fakeEnum(String) extern enum SystemUpdaterType {
-	DRM;
-	SYSTEM;
+@:native("flash.system.SystemUpdaterType") extern enum abstract SystemUpdaterType(String) {
+	var DRM;
+	var SYSTEM;
 }
diff --git a/std/flash/system/TouchscreenType.hx b/std/flash/system/TouchscreenType.hx
index b6d900bef7a171fb54aecec5a4391d0b4e76f46d..463911de92370ba6b2e922ea9c7a74a5a69bda36 100644
--- a/std/flash/system/TouchscreenType.hx
+++ b/std/flash/system/TouchscreenType.hx
@@ -1,7 +1,7 @@
 package flash.system;
 
-@:fakeEnum(String) extern enum TouchscreenType {
-	FINGER;
-	NONE;
-	STYLUS;
+@:native("flash.system.TouchscreenType") extern enum abstract TouchscreenType(String) {
+	var FINGER;
+	var NONE;
+	var STYLUS;
 }
diff --git a/std/flash/system/Worker.hx b/std/flash/system/Worker.hx
index bf55de5f9daf72bb94b1dec5295b027322649a32..6abfee293c10649a110e4d697d65c3f3c26a678c 100644
--- a/std/flash/system/Worker.hx
+++ b/std/flash/system/Worker.hx
@@ -1,13 +1,17 @@
 package flash.system;
 
-@:final @:require(flash11_4) extern class Worker extends flash.events.EventDispatcher {
-	var isPrimordial(default,never) : Bool;
-	var state(default,never) : WorkerState;
+@:require(flash11_4) extern final class Worker extends flash.events.EventDispatcher {
+	@:flash.property var isPrimordial(get,never) : Bool;
+	@:flash.property var state(get,never) : WorkerState;
 	function createMessageChannel(receiver : Worker) : MessageChannel;
 	function getSharedProperty(key : String) : Dynamic;
+	private function get_isPrimordial() : Bool;
+	private function get_state() : WorkerState;
 	function setSharedProperty(key : String, value : Dynamic) : Void;
 	function start() : Void;
 	function terminate() : Bool;
-	static var current(default,never) : Worker;
-	static var isSupported(default,never) : Bool;
+	@:flash.property static var current(get,never) : Worker;
+	@:flash.property static var isSupported(get,never) : Bool;
+	private static function get_current() : Worker;
+	private static function get_isSupported() : Bool;
 }
diff --git a/std/flash/system/WorkerDomain.hx b/std/flash/system/WorkerDomain.hx
index 806db4a08a9f3037a0d2a3d516c37bc6820adc2d..a6070e4b24d15ea4aba975cf5de871e4fdd0a656 100644
--- a/std/flash/system/WorkerDomain.hx
+++ b/std/flash/system/WorkerDomain.hx
@@ -1,9 +1,11 @@
 package flash.system;
 
-@:final @:require(flash11_4) extern class WorkerDomain {
+@:require(flash11_4) extern final class WorkerDomain {
 	function new() : Void;
 	function createWorker(swf : flash.utils.ByteArray, giveAppPrivileges : Bool = false) : Worker;
 	function listWorkers() : flash.Vector<Worker>;
-	static var current(default,never) : WorkerDomain;
-	static var isSupported(default,never) : Bool;
+	@:flash.property static var current(get,never) : WorkerDomain;
+	@:flash.property static var isSupported(get,never) : Bool;
+	private static function get_current() : WorkerDomain;
+	private static function get_isSupported() : Bool;
 }
diff --git a/std/flash/system/WorkerState.hx b/std/flash/system/WorkerState.hx
index 10828ff32c66c7f787d630c9ead17a21c7074d2e..ed3ab4e030d6fa247b8e2e0222d0145eb8d05047 100644
--- a/std/flash/system/WorkerState.hx
+++ b/std/flash/system/WorkerState.hx
@@ -1,7 +1,7 @@
 package flash.system;
 
-@:fakeEnum(String) extern enum WorkerState {
-	NEW;
-	RUNNING;
-	TERMINATED;
+@:native("flash.system.WorkerState") extern enum abstract WorkerState(String) {
+	var NEW;
+	var RUNNING;
+	var TERMINATED;
 }
diff --git a/std/flash/text/AntiAliasType.hx b/std/flash/text/AntiAliasType.hx
index fdb8610b2a3d87a3a5af6a1ec810e41dad8e68e7..8ccc1c5c61f845970027c652efbf50f201e239d8 100644
--- a/std/flash/text/AntiAliasType.hx
+++ b/std/flash/text/AntiAliasType.hx
@@ -1,6 +1,6 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum AntiAliasType {
-	ADVANCED;
-	NORMAL;
+@:native("flash.text.AntiAliasType") extern enum abstract AntiAliasType(String) {
+	var ADVANCED;
+	var NORMAL;
 }
diff --git a/std/flash/text/CSMSettings.hx b/std/flash/text/CSMSettings.hx
index 2ff3e9f28b37fefce3fb18efcb1479e3ef1f5d36..4ea19e77553c89a53e5bc332783982fc89ca593f 100644
--- a/std/flash/text/CSMSettings.hx
+++ b/std/flash/text/CSMSettings.hx
@@ -1,6 +1,6 @@
 package flash.text;
 
-@:final extern class CSMSettings {
+extern final class CSMSettings {
 	var fontSize : Float;
 	var insideCutoff : Float;
 	var outsideCutoff : Float;
diff --git a/std/flash/text/Font.hx b/std/flash/text/Font.hx
index 6a30c0892c60176990dc979c719c8dd9619ff352..4e974f4dd23f3cdc17f1ee9f268376c291785ffa 100644
--- a/std/flash/text/Font.hx
+++ b/std/flash/text/Font.hx
@@ -1,10 +1,13 @@
 package flash.text;
 
 extern class Font {
-	var fontName(default,never) : String;
-	var fontStyle(default,never) : FontStyle;
-	var fontType(default,never) : FontType;
+	@:flash.property var fontName(get,never) : String;
+	@:flash.property var fontStyle(get,never) : FontStyle;
+	@:flash.property var fontType(get,never) : FontType;
 	function new() : Void;
+	private function get_fontName() : String;
+	private function get_fontStyle() : FontStyle;
+	private function get_fontType() : FontType;
 	function hasGlyphs(str : String) : Bool;
 	static function enumerateFonts(enumerateDeviceFonts : Bool = false) : Array<Font>;
 	static function registerFont(font : Class<Dynamic>) : Void;
diff --git a/std/flash/text/FontStyle.hx b/std/flash/text/FontStyle.hx
index d59e9a529c42ff6bf6eaad115502626e6b132ad6..2c7242ebab7c58ff34d548b28c0cba5ba88b499d 100644
--- a/std/flash/text/FontStyle.hx
+++ b/std/flash/text/FontStyle.hx
@@ -1,8 +1,8 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum FontStyle {
-	BOLD;
-	BOLD_ITALIC;
-	ITALIC;
-	REGULAR;
+@:native("flash.text.FontStyle") extern enum abstract FontStyle(String) {
+	var BOLD;
+	var BOLD_ITALIC;
+	var ITALIC;
+	var REGULAR;
 }
diff --git a/std/flash/text/FontType.hx b/std/flash/text/FontType.hx
index d83a915a31186fb857cdeb984c4b9219ab0a15d8..9c8cef0f0ed859449e3d1b58e485d7a2c4d5f954 100644
--- a/std/flash/text/FontType.hx
+++ b/std/flash/text/FontType.hx
@@ -1,7 +1,7 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum FontType {
-	DEVICE;
-	EMBEDDED;
-	EMBEDDED_CFF;
+@:native("flash.text.FontType") extern enum abstract FontType(String) {
+	var DEVICE;
+	var EMBEDDED;
+	var EMBEDDED_CFF;
 }
diff --git a/std/flash/text/GridFitType.hx b/std/flash/text/GridFitType.hx
index e4e754591dbccfdd203993f4992b8e7b3c5e64a5..f24bf93adcddc5437dc7f1a9cb195ee44c695b36 100644
--- a/std/flash/text/GridFitType.hx
+++ b/std/flash/text/GridFitType.hx
@@ -1,7 +1,7 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum GridFitType {
-	NONE;
-	PIXEL;
-	SUBPIXEL;
+@:native("flash.text.GridFitType") extern enum abstract GridFitType(String) {
+	var NONE;
+	var PIXEL;
+	var SUBPIXEL;
 }
diff --git a/std/flash/text/StaticText.hx b/std/flash/text/StaticText.hx
index 01d7e7c0e50d5fd94ad6e208f0bffb6d938c942a..1b9c995f4cb8963a17ca8c97347ecd07d35b39ad 100644
--- a/std/flash/text/StaticText.hx
+++ b/std/flash/text/StaticText.hx
@@ -1,6 +1,7 @@
 package flash.text;
 
-@:final extern class StaticText extends flash.display.DisplayObject {
-	var text(default,never) : String;
+extern final class StaticText extends flash.display.DisplayObject {
+	@:flash.property var text(get,never) : String;
 	function new() : Void;
+	private function get_text() : String;
 }
diff --git a/std/flash/text/StyleSheet.hx b/std/flash/text/StyleSheet.hx
index 10cb9a44039a5c3b6d9b84fa0b30127a4d133476..443bd0a9642846a099d386b2775f29d25c0e045d 100644
--- a/std/flash/text/StyleSheet.hx
+++ b/std/flash/text/StyleSheet.hx
@@ -1,10 +1,11 @@
 package flash.text;
 
 extern class StyleSheet extends flash.events.EventDispatcher implements Dynamic {
-	var styleNames(default,never) : Array<Dynamic>;
+	@:flash.property var styleNames(get,never) : Array<Dynamic>;
 	function new() : Void;
 	function clear() : Void;
 	function getStyle(styleName : String) : flash.utils.Object;
+	private function get_styleNames() : Array<Dynamic>;
 	function parseCSS(CSSText : String) : Void;
 	function setStyle(styleName : String, styleObject : flash.utils.Object) : Void;
 	function transform(formatObject : flash.utils.Object) : TextFormat;
diff --git a/std/flash/text/TextColorType.hx b/std/flash/text/TextColorType.hx
index fb7db4342d4058e31d58a0beb1f1267f518eb4fe..804dab9abd61c0d9741e94b0b61ca48dfb35b6e1 100644
--- a/std/flash/text/TextColorType.hx
+++ b/std/flash/text/TextColorType.hx
@@ -1,6 +1,6 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum TextColorType {
-	DARK_COLOR;
-	LIGHT_COLOR;
+@:native("flash.text.TextColorType") extern enum abstract TextColorType(String) {
+	var DARK_COLOR;
+	var LIGHT_COLOR;
 }
diff --git a/std/flash/text/TextDisplayMode.hx b/std/flash/text/TextDisplayMode.hx
index 84878cd11fe7cc5fac83f8f0e0f5194c84cfc311..0a0cd651e9bffbc2f17bf3d39eecc1eecb9d0dac 100644
--- a/std/flash/text/TextDisplayMode.hx
+++ b/std/flash/text/TextDisplayMode.hx
@@ -1,7 +1,7 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum TextDisplayMode {
-	CRT;
-	DEFAULT;
-	LCD;
+@:native("flash.text.TextDisplayMode") extern enum abstract TextDisplayMode(String) {
+	var CRT;
+	var DEFAULT;
+	var LCD;
 }
diff --git a/std/flash/text/TextField.hx b/std/flash/text/TextField.hx
index bfdba6105820c3eac30792bda4cce5d97b56dc8d..487be74918b85f385f4fe26878d872ea0afddbbe 100644
--- a/std/flash/text/TextField.hx
+++ b/std/flash/text/TextField.hx
@@ -1,49 +1,49 @@
 package flash.text;
 
 extern class TextField extends flash.display.InteractiveObject {
-	var alwaysShowSelection : Bool;
-	var antiAliasType : AntiAliasType;
-	var autoSize : TextFieldAutoSize;
-	var background : Bool;
-	var backgroundColor : UInt;
-	var border : Bool;
-	var borderColor : UInt;
-	var bottomScrollV(default,never) : Int;
-	var caretIndex(default,never) : Int;
-	var condenseWhite : Bool;
-	var defaultTextFormat : TextFormat;
-	var displayAsPassword : Bool;
-	var embedFonts : Bool;
-	var gridFitType : GridFitType;
-	var htmlText : String;
-	var length(default,never) : Int;
-	var maxChars : Int;
-	var maxScrollH(default,never) : Int;
-	var maxScrollV(default,never) : Int;
-	var mouseWheelEnabled : Bool;
-	var multiline : Bool;
-	var numLines(default,never) : Int;
-	var restrict : String;
-	var scrollH : Int;
-	var scrollV : Int;
-	var selectable : Bool;
-	var selectedText(default,never) : String;
-	var selectionBeginIndex(default,never) : Int;
-	var selectionEndIndex(default,never) : Int;
-	var sharpness : Float;
-	var styleSheet : StyleSheet;
-	var text : String;
-	var textColor : UInt;
-	var textHeight(default,never) : Float;
-	@:require(flash11) var textInteractionMode(default,never) : TextInteractionMode;
-	var textWidth(default,never) : Float;
-	var thickness : Float;
-	var type : TextFieldType;
-	var useRichTextClipboard : Bool;
-	var wordWrap : Bool;
+	@:flash.property var alwaysShowSelection(get,set) : Bool;
+	@:flash.property var antiAliasType(get,set) : AntiAliasType;
+	@:flash.property var autoSize(get,set) : TextFieldAutoSize;
+	@:flash.property var background(get,set) : Bool;
+	@:flash.property var backgroundColor(get,set) : UInt;
+	@:flash.property var border(get,set) : Bool;
+	@:flash.property var borderColor(get,set) : UInt;
+	@:flash.property var bottomScrollV(get,never) : Int;
+	@:flash.property var caretIndex(get,never) : Int;
+	@:flash.property var condenseWhite(get,set) : Bool;
+	@:flash.property var defaultTextFormat(get,set) : TextFormat;
+	@:flash.property var displayAsPassword(get,set) : Bool;
+	@:flash.property var embedFonts(get,set) : Bool;
+	@:flash.property var gridFitType(get,set) : GridFitType;
+	@:flash.property var htmlText(get,set) : String;
+	@:flash.property var length(get,never) : Int;
+	@:flash.property var maxChars(get,set) : Int;
+	@:flash.property var maxScrollH(get,never) : Int;
+	@:flash.property var maxScrollV(get,never) : Int;
+	@:flash.property var mouseWheelEnabled(get,set) : Bool;
+	@:flash.property var multiline(get,set) : Bool;
+	@:flash.property var numLines(get,never) : Int;
+	@:flash.property var restrict(get,set) : String;
+	@:flash.property var scrollH(get,set) : Int;
+	@:flash.property var scrollV(get,set) : Int;
+	@:flash.property var selectable(get,set) : Bool;
+	@:flash.property var selectedText(get,never) : String;
+	@:flash.property var selectionBeginIndex(get,never) : Int;
+	@:flash.property var selectionEndIndex(get,never) : Int;
+	@:flash.property var sharpness(get,set) : Float;
+	@:flash.property var styleSheet(get,set) : StyleSheet;
+	@:flash.property var text(get,set) : String;
+	@:flash.property var textColor(get,set) : UInt;
+	@:flash.property var textHeight(get,never) : Float;
+	@:flash.property @:require(flash11) var textInteractionMode(get,never) : TextInteractionMode;
+	@:flash.property var textWidth(get,never) : Float;
+	@:flash.property var thickness(get,set) : Float;
+	@:flash.property var type(get,set) : TextFieldType;
+	@:flash.property var useRichTextClipboard(get,set) : Bool;
+	@:flash.property var wordWrap(get,set) : Bool;
 	function new() : Void;
 	function appendText(newText : String) : Void;
-	function copyRichText() : String;
+	@:ns("flash.text",internal) function copyRichText() : String;
 	function getCharBoundaries(charIndex : Int) : flash.geom.Rectangle;
 	function getCharIndexAtPoint(x : Float, y : Float) : Int;
 	function getFirstCharInParagraph(charIndex : Int) : Int;
@@ -59,11 +59,79 @@ extern class TextField extends flash.display.InteractiveObject {
 	function getTextFormat(beginIndex : Int = -1, endIndex : Int = -1) : TextFormat;
 	function getTextRuns(beginIndex : Int = 0, endIndex : Int = 2147483647) : Array<Dynamic>;
 	function getXMLText(beginIndex : Int = 0, endIndex : Int = 2147483647) : String;
+	private function get_alwaysShowSelection() : Bool;
+	private function get_antiAliasType() : AntiAliasType;
+	private function get_autoSize() : TextFieldAutoSize;
+	private function get_background() : Bool;
+	private function get_backgroundColor() : UInt;
+	private function get_border() : Bool;
+	private function get_borderColor() : UInt;
+	private function get_bottomScrollV() : Int;
+	private function get_caretIndex() : Int;
+	private function get_condenseWhite() : Bool;
+	private function get_defaultTextFormat() : TextFormat;
+	private function get_displayAsPassword() : Bool;
+	private function get_embedFonts() : Bool;
+	private function get_gridFitType() : GridFitType;
+	private function get_htmlText() : String;
+	private function get_length() : Int;
+	private function get_maxChars() : Int;
+	private function get_maxScrollH() : Int;
+	private function get_maxScrollV() : Int;
+	private function get_mouseWheelEnabled() : Bool;
+	private function get_multiline() : Bool;
+	private function get_numLines() : Int;
+	private function get_restrict() : String;
+	private function get_scrollH() : Int;
+	private function get_scrollV() : Int;
+	private function get_selectable() : Bool;
+	private function get_selectedText() : String;
+	private function get_selectionBeginIndex() : Int;
+	private function get_selectionEndIndex() : Int;
+	private function get_sharpness() : Float;
+	private function get_styleSheet() : StyleSheet;
+	private function get_text() : String;
+	private function get_textColor() : UInt;
+	private function get_textHeight() : Float;
+	private function get_textInteractionMode() : TextInteractionMode;
+	private function get_textWidth() : Float;
+	private function get_thickness() : Float;
+	private function get_type() : TextFieldType;
+	private function get_useRichTextClipboard() : Bool;
+	private function get_wordWrap() : Bool;
 	function insertXMLText(beginIndex : Int, endIndex : Int, richText : String, pasting : Bool = false) : Void;
-	function pasteRichText(richText : String) : Bool;
+	@:ns("flash.text",internal) function pasteRichText(richText : String) : Bool;
 	function replaceSelectedText(value : String) : Void;
 	function replaceText(beginIndex : Int, endIndex : Int, newText : String) : Void;
 	function setSelection(beginIndex : Int, endIndex : Int) : Void;
 	function setTextFormat(format : TextFormat, beginIndex : Int = -1, endIndex : Int = -1) : Void;
+	private function set_alwaysShowSelection(value : Bool) : Bool;
+	private function set_antiAliasType(value : AntiAliasType) : AntiAliasType;
+	private function set_autoSize(value : TextFieldAutoSize) : TextFieldAutoSize;
+	private function set_background(value : Bool) : Bool;
+	private function set_backgroundColor(value : UInt) : UInt;
+	private function set_border(value : Bool) : Bool;
+	private function set_borderColor(value : UInt) : UInt;
+	private function set_condenseWhite(value : Bool) : Bool;
+	private function set_defaultTextFormat(value : TextFormat) : TextFormat;
+	private function set_displayAsPassword(value : Bool) : Bool;
+	private function set_embedFonts(value : Bool) : Bool;
+	private function set_gridFitType(value : GridFitType) : GridFitType;
+	private function set_htmlText(value : String) : String;
+	private function set_maxChars(value : Int) : Int;
+	private function set_mouseWheelEnabled(value : Bool) : Bool;
+	private function set_multiline(value : Bool) : Bool;
+	private function set_restrict(value : String) : String;
+	private function set_scrollH(value : Int) : Int;
+	private function set_scrollV(value : Int) : Int;
+	private function set_selectable(value : Bool) : Bool;
+	private function set_sharpness(value : Float) : Float;
+	private function set_styleSheet(value : StyleSheet) : StyleSheet;
+	private function set_text(value : String) : String;
+	private function set_textColor(value : UInt) : UInt;
+	private function set_thickness(value : Float) : Float;
+	private function set_type(value : TextFieldType) : TextFieldType;
+	private function set_useRichTextClipboard(value : Bool) : Bool;
+	private function set_wordWrap(value : Bool) : Bool;
 	@:require(flash10) static function isFontCompatible(fontName : String, fontStyle : String) : Bool;
 }
diff --git a/std/flash/text/TextFieldAutoSize.hx b/std/flash/text/TextFieldAutoSize.hx
index ce2da0bb37f6e0481af48b141d7edfb225c05ff0..67a59a1c9b75b00ca7332ea53a4b02b28550e11e 100644
--- a/std/flash/text/TextFieldAutoSize.hx
+++ b/std/flash/text/TextFieldAutoSize.hx
@@ -1,8 +1,8 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum TextFieldAutoSize {
-	CENTER;
-	LEFT;
-	NONE;
-	RIGHT;
+@:native("flash.text.TextFieldAutoSize") extern enum abstract TextFieldAutoSize(String) {
+	var CENTER;
+	var LEFT;
+	var NONE;
+	var RIGHT;
 }
diff --git a/std/flash/text/TextFieldType.hx b/std/flash/text/TextFieldType.hx
index d07365589b3936e775ae613e9fa3b4b7dd9eb2ae..7580dc29f83a823eb88127532f8c0507f8206224 100644
--- a/std/flash/text/TextFieldType.hx
+++ b/std/flash/text/TextFieldType.hx
@@ -1,6 +1,6 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum TextFieldType {
-	DYNAMIC;
-	INPUT;
+@:native("flash.text.TextFieldType") extern enum abstract TextFieldType(String) {
+	var DYNAMIC;
+	var INPUT;
 }
diff --git a/std/flash/text/TextFormat.hx b/std/flash/text/TextFormat.hx
index 08d6d45598796d06d19c0a4f00a3452f136971de..277755ec48b44f78633080d65c7f645c21b14e2f 100644
--- a/std/flash/text/TextFormat.hx
+++ b/std/flash/text/TextFormat.hx
@@ -1,24 +1,62 @@
 package flash.text;
 
 extern class TextFormat {
-	var align : TextFormatAlign;
-	var blockIndent : Null<Float>;
-	var bold : Null<Bool>;
-	var bullet : Null<Bool>;
-	var color : Null<UInt>;
-	var display : TextFormatDisplay;
-	var font : String;
-	var indent : Null<Float>;
-	var italic : Null<Bool>;
-	var kerning : Null<Bool>;
-	var leading : Null<Float>;
-	var leftMargin : Null<Float>;
-	var letterSpacing : Null<Float>;
-	var rightMargin : Null<Float>;
-	var size : Null<Float>;
-	var tabStops : Array<UInt>;
-	var target : String;
-	var underline : Null<Bool>;
-	var url : String;
+	@:flash.property var align(get,set) : TextFormatAlign;
+	@:flash.property var blockIndent(get,set) : Null<Float>;
+	@:flash.property var bold(get,set) : Null<Bool>;
+	@:flash.property var bullet(get,set) : Null<Bool>;
+	@:flash.property var color(get,set) : Null<UInt>;
+	@:flash.property var display(get,set) : TextFormatDisplay;
+	@:flash.property var font(get,set) : String;
+	@:flash.property var indent(get,set) : Null<Float>;
+	@:flash.property var italic(get,set) : Null<Bool>;
+	@:flash.property var kerning(get,set) : Null<Bool>;
+	@:flash.property var leading(get,set) : Null<Float>;
+	@:flash.property var leftMargin(get,set) : Null<Float>;
+	@:flash.property var letterSpacing(get,set) : Null<Float>;
+	@:flash.property var rightMargin(get,set) : Null<Float>;
+	@:flash.property var size(get,set) : Null<Float>;
+	@:flash.property var tabStops(get,set) : Array<UInt>;
+	@:flash.property var target(get,set) : String;
+	@:flash.property var underline(get,set) : Null<Bool>;
+	@:flash.property var url(get,set) : String;
 	function new(?font : String, size : Null<Float> = 0, color : Null<UInt> = 0, bold : Null<Bool> = false, italic : Null<Bool> = false, underline : Null<Bool> = false, ?url : String, ?target : String, ?align : TextFormatAlign, leftMargin : Null<Float> = 0, rightMargin : Null<Float> = 0, indent : Null<Float> = 0, leading : Null<Float> = 0) : Void;
+	private function get_align() : TextFormatAlign;
+	private function get_blockIndent() : Null<Float>;
+	private function get_bold() : Null<Bool>;
+	private function get_bullet() : Null<Bool>;
+	private function get_color() : Null<UInt>;
+	private function get_display() : TextFormatDisplay;
+	private function get_font() : String;
+	private function get_indent() : Null<Float>;
+	private function get_italic() : Null<Bool>;
+	private function get_kerning() : Null<Bool>;
+	private function get_leading() : Null<Float>;
+	private function get_leftMargin() : Null<Float>;
+	private function get_letterSpacing() : Null<Float>;
+	private function get_rightMargin() : Null<Float>;
+	private function get_size() : Null<Float>;
+	private function get_tabStops() : Array<UInt>;
+	private function get_target() : String;
+	private function get_underline() : Null<Bool>;
+	private function get_url() : String;
+	private function set_align(value : TextFormatAlign) : TextFormatAlign;
+	private function set_blockIndent(value : Null<Float>) : Null<Float>;
+	private function set_bold(value : Null<Bool>) : Null<Bool>;
+	private function set_bullet(value : Null<Bool>) : Null<Bool>;
+	private function set_color(value : Null<UInt>) : Null<UInt>;
+	private function set_display(value : TextFormatDisplay) : TextFormatDisplay;
+	private function set_font(value : String) : String;
+	private function set_indent(value : Null<Float>) : Null<Float>;
+	private function set_italic(value : Null<Bool>) : Null<Bool>;
+	private function set_kerning(value : Null<Bool>) : Null<Bool>;
+	private function set_leading(value : Null<Float>) : Null<Float>;
+	private function set_leftMargin(value : Null<Float>) : Null<Float>;
+	private function set_letterSpacing(value : Null<Float>) : Null<Float>;
+	private function set_rightMargin(value : Null<Float>) : Null<Float>;
+	private function set_size(value : Null<Float>) : Null<Float>;
+	private function set_tabStops(value : Array<UInt>) : Array<UInt>;
+	private function set_target(value : String) : String;
+	private function set_underline(value : Null<Bool>) : Null<Bool>;
+	private function set_url(value : String) : String;
 }
diff --git a/std/flash/text/TextFormatAlign.hx b/std/flash/text/TextFormatAlign.hx
index b8f52f828c8f80ef0112703d2d055f800cd26bae..b826cab3aa2aa9e5beb0ebe379e9b7e4a6587928 100644
--- a/std/flash/text/TextFormatAlign.hx
+++ b/std/flash/text/TextFormatAlign.hx
@@ -1,10 +1,10 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum TextFormatAlign {
-	CENTER;
-	END;
-	JUSTIFY;
-	LEFT;
-	RIGHT;
-	START;
+@:native("flash.text.TextFormatAlign") extern enum abstract TextFormatAlign(String) {
+	var CENTER;
+	var END;
+	var JUSTIFY;
+	var LEFT;
+	var RIGHT;
+	var START;
 }
diff --git a/std/flash/text/TextFormatDisplay.hx b/std/flash/text/TextFormatDisplay.hx
index 27987d271d5e7d13d1d54ab513c298d13d42e991..917d36fb79604d243becfd5783355a4699359555 100644
--- a/std/flash/text/TextFormatDisplay.hx
+++ b/std/flash/text/TextFormatDisplay.hx
@@ -1,6 +1,6 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum TextFormatDisplay {
-	BLOCK;
-	INLINE;
+@:native("flash.text.TextFormatDisplay") extern enum abstract TextFormatDisplay(String) {
+	var BLOCK;
+	var INLINE;
 }
diff --git a/std/flash/text/TextInteractionMode.hx b/std/flash/text/TextInteractionMode.hx
index c4a6f824463375c0639dbc80b5f425e26ddb175a..3724886085c4cbd8489276915e5f0fa7932e5fc8 100644
--- a/std/flash/text/TextInteractionMode.hx
+++ b/std/flash/text/TextInteractionMode.hx
@@ -1,6 +1,6 @@
 package flash.text;
 
-@:fakeEnum(String) extern enum TextInteractionMode {
-	NORMAL;
-	SELECTION;
+@:native("flash.text.TextInteractionMode") extern enum abstract TextInteractionMode(String) {
+	var NORMAL;
+	var SELECTION;
 }
diff --git a/std/flash/text/TextRenderer.hx b/std/flash/text/TextRenderer.hx
index 7de44e9073a483b33c51a413ad1956da7a884748..db747a9f8a25c2deb46dfe9814bfdf90ebfb5d9f 100644
--- a/std/flash/text/TextRenderer.hx
+++ b/std/flash/text/TextRenderer.hx
@@ -1,8 +1,14 @@
 package flash.text;
 
 extern class TextRenderer {
-	static var antiAliasType : AntiAliasType;
-	static var displayMode : TextDisplayMode;
-	static var maxLevel : Int;
+	@:flash.property static var antiAliasType(get,set) : AntiAliasType;
+	@:flash.property static var displayMode(get,set) : TextDisplayMode;
+	@:flash.property static var maxLevel(get,set) : Int;
+	private static function get_antiAliasType() : AntiAliasType;
+	private static function get_displayMode() : TextDisplayMode;
+	private static function get_maxLevel() : Int;
 	static function setAdvancedAntiAliasingTable(fontName : String, fontStyle : FontStyle, colorType : TextColorType, advancedAntiAliasingTable : Array<Dynamic>) : Void;
+	private static function set_antiAliasType(value : AntiAliasType) : AntiAliasType;
+	private static function set_displayMode(value : TextDisplayMode) : TextDisplayMode;
+	private static function set_maxLevel(value : Int) : Int;
 }
diff --git a/std/flash/text/TextSnapshot.hx b/std/flash/text/TextSnapshot.hx
index 80598c0d2430326940b2d19c2bc327b08db60845..cea8b3064b4e7200039487f3884d16a62b779e96 100644
--- a/std/flash/text/TextSnapshot.hx
+++ b/std/flash/text/TextSnapshot.hx
@@ -1,13 +1,14 @@
 package flash.text;
 
 extern class TextSnapshot {
-	var charCount(default,never) : Int;
+	@:flash.property var charCount(get,never) : Int;
 	function new() : Void;
 	function findText(beginIndex : Int, textToFind : String, caseSensitive : Bool) : Int;
 	function getSelected(beginIndex : Int, endIndex : Int) : Bool;
 	function getSelectedText(includeLineEndings : Bool = false) : String;
 	function getText(beginIndex : Int, endIndex : Int, includeLineEndings : Bool = false) : String;
 	function getTextRunInfo(beginIndex : Int, endIndex : Int) : Array<Dynamic>;
+	private function get_charCount() : Int;
 	function hitTestTextNearPos(x : Float, y : Float, maxDistance : Float = 0) : Float;
 	function setSelectColor(hexColor : UInt = 16776960) : Void;
 	function setSelected(beginIndex : Int, endIndex : Int, select : Bool) : Void;
diff --git a/std/flash/text/engine/BreakOpportunity.hx b/std/flash/text/engine/BreakOpportunity.hx
index 8def3901e10a1db1dd729cba167291e8bd664842..0b5d515fa784552b76f50490601f1780b8272b9c 100644
--- a/std/flash/text/engine/BreakOpportunity.hx
+++ b/std/flash/text/engine/BreakOpportunity.hx
@@ -1,8 +1,8 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum BreakOpportunity {
-	ALL;
-	ANY;
-	AUTO;
-	NONE;
+@:native("flash.text.engine.BreakOpportunity") extern enum abstract BreakOpportunity(String) {
+	var ALL;
+	var ANY;
+	var AUTO;
+	var NONE;
 }
diff --git a/std/flash/text/engine/CFFHinting.hx b/std/flash/text/engine/CFFHinting.hx
index be6a43e52c0a26dfc9aabf669b52441b75735ed0..09d2abf78346bab29ffed160f5d1e384c6685672 100644
--- a/std/flash/text/engine/CFFHinting.hx
+++ b/std/flash/text/engine/CFFHinting.hx
@@ -1,6 +1,6 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum CFFHinting {
-	HORIZONTAL_STEM;
-	NONE;
+@:native("flash.text.engine.CFFHinting") extern enum abstract CFFHinting(String) {
+	var HORIZONTAL_STEM;
+	var NONE;
 }
diff --git a/std/flash/text/engine/ContentElement.hx b/std/flash/text/engine/ContentElement.hx
index c6cb5fbfd33cc81c7332b1c1c1a06f5965544c63..b4e61486d07c8614d182fa09efa3c1bddeb61a24 100644
--- a/std/flash/text/engine/ContentElement.hx
+++ b/std/flash/text/engine/ContentElement.hx
@@ -1,15 +1,26 @@
 package flash.text.engine;
 
 extern class ContentElement {
-	var elementFormat : ElementFormat;
-	var eventMirror : flash.events.EventDispatcher;
-	var groupElement(default,never) : GroupElement;
-	var rawText(default,never) : String;
-	var text(default,never) : String;
-	var textBlock(default,never) : TextBlock;
-	var textBlockBeginIndex(default,never) : Int;
-	var textRotation : TextRotation;
+	@:flash.property var elementFormat(get,set) : ElementFormat;
+	@:flash.property var eventMirror(get,set) : flash.events.EventDispatcher;
+	@:flash.property var groupElement(get,never) : GroupElement;
+	@:flash.property var rawText(get,never) : String;
+	@:flash.property var text(get,never) : String;
+	@:flash.property var textBlock(get,never) : TextBlock;
+	@:flash.property var textBlockBeginIndex(get,never) : Int;
+	@:flash.property var textRotation(get,set) : TextRotation;
 	var userData : Dynamic;
 	function new(?elementFormat : ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : TextRotation) : Void;
-	static var GRAPHIC_ELEMENT(default,never) : UInt;
+	private function get_elementFormat() : ElementFormat;
+	private function get_eventMirror() : flash.events.EventDispatcher;
+	private function get_groupElement() : GroupElement;
+	private function get_rawText() : String;
+	private function get_text() : String;
+	private function get_textBlock() : TextBlock;
+	private function get_textBlockBeginIndex() : Int;
+	private function get_textRotation() : TextRotation;
+	private function set_elementFormat(value : ElementFormat) : ElementFormat;
+	private function set_eventMirror(value : flash.events.EventDispatcher) : flash.events.EventDispatcher;
+	private function set_textRotation(value : TextRotation) : TextRotation;
+	static final GRAPHIC_ELEMENT : UInt;
 }
diff --git a/std/flash/text/engine/DigitCase.hx b/std/flash/text/engine/DigitCase.hx
index 937d336c5b656c84fb1b663401b9850d243bca37..598d602fe24b9b14c0fba92ecdc03e0380af2707 100644
--- a/std/flash/text/engine/DigitCase.hx
+++ b/std/flash/text/engine/DigitCase.hx
@@ -1,7 +1,7 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum DigitCase {
-	DEFAULT;
-	LINING;
-	OLD_STYLE;
+@:native("flash.text.engine.DigitCase") extern enum abstract DigitCase(String) {
+	var DEFAULT;
+	var LINING;
+	var OLD_STYLE;
 }
diff --git a/std/flash/text/engine/DigitWidth.hx b/std/flash/text/engine/DigitWidth.hx
index bcbf801f3229e2be374444542e54307c1ad8211a..46cbc83326b710aba511611d16bc597192451574 100644
--- a/std/flash/text/engine/DigitWidth.hx
+++ b/std/flash/text/engine/DigitWidth.hx
@@ -1,7 +1,7 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum DigitWidth {
-	DEFAULT;
-	PROPORTIONAL;
-	TABULAR;
+@:native("flash.text.engine.DigitWidth") extern enum abstract DigitWidth(String) {
+	var DEFAULT;
+	var PROPORTIONAL;
+	var TABULAR;
 }
diff --git a/std/flash/text/engine/EastAsianJustifier.hx b/std/flash/text/engine/EastAsianJustifier.hx
index cb6a554dd01f48566ce4fd84f914582f9c930853..57b8136b47706fdc9afeea5960a138a36de473b9 100644
--- a/std/flash/text/engine/EastAsianJustifier.hx
+++ b/std/flash/text/engine/EastAsianJustifier.hx
@@ -1,7 +1,11 @@
 package flash.text.engine;
 
-@:final extern class EastAsianJustifier extends TextJustifier {
-	var composeTrailingIdeographicSpaces : Bool;
-	var justificationStyle : JustificationStyle;
+extern final class EastAsianJustifier extends TextJustifier {
+	@:flash.property var composeTrailingIdeographicSpaces(get,set) : Bool;
+	@:flash.property var justificationStyle(get,set) : JustificationStyle;
 	function new(?locale : String, ?lineJustification : LineJustification, ?justificationStyle : JustificationStyle) : Void;
+	private function get_composeTrailingIdeographicSpaces() : Bool;
+	private function get_justificationStyle() : JustificationStyle;
+	private function set_composeTrailingIdeographicSpaces(value : Bool) : Bool;
+	private function set_justificationStyle(value : JustificationStyle) : JustificationStyle;
 }
diff --git a/std/flash/text/engine/ElementFormat.hx b/std/flash/text/engine/ElementFormat.hx
index bbb986a4d87f4d9d72fc6abfd25cf315bd62748e..6c139a8c0ee3bb54594971740155920496592888 100644
--- a/std/flash/text/engine/ElementFormat.hx
+++ b/std/flash/text/engine/ElementFormat.hx
@@ -1,25 +1,61 @@
 package flash.text.engine;
 
-@:final extern class ElementFormat {
-	var alignmentBaseline : TextBaseline;
-	var alpha : Float;
-	var baselineShift : Float;
-	var breakOpportunity : BreakOpportunity;
-	var color : UInt;
-	var digitCase : DigitCase;
-	var digitWidth : DigitWidth;
-	var dominantBaseline : TextBaseline;
-	var fontDescription : FontDescription;
-	var fontSize : Float;
-	var kerning : Kerning;
-	var ligatureLevel : LigatureLevel;
-	var locale : String;
-	var locked : Bool;
-	var textRotation : TextRotation;
-	var trackingLeft : Float;
-	var trackingRight : Float;
-	var typographicCase : TypographicCase;
+extern final class ElementFormat {
+	@:flash.property var alignmentBaseline(get,set) : TextBaseline;
+	@:flash.property var alpha(get,set) : Float;
+	@:flash.property var baselineShift(get,set) : Float;
+	@:flash.property var breakOpportunity(get,set) : BreakOpportunity;
+	@:flash.property var color(get,set) : UInt;
+	@:flash.property var digitCase(get,set) : DigitCase;
+	@:flash.property var digitWidth(get,set) : DigitWidth;
+	@:flash.property var dominantBaseline(get,set) : TextBaseline;
+	@:flash.property var fontDescription(get,set) : FontDescription;
+	@:flash.property var fontSize(get,set) : Float;
+	@:flash.property var kerning(get,set) : Kerning;
+	@:flash.property var ligatureLevel(get,set) : LigatureLevel;
+	@:flash.property var locale(get,set) : String;
+	@:flash.property var locked(get,set) : Bool;
+	@:flash.property var textRotation(get,set) : TextRotation;
+	@:flash.property var trackingLeft(get,set) : Float;
+	@:flash.property var trackingRight(get,set) : Float;
+	@:flash.property var typographicCase(get,set) : TypographicCase;
 	function new(?fontDescription : FontDescription, fontSize : Float = 12, color : UInt = 0, alpha : Float = 1, ?textRotation : TextRotation, ?dominantBaseline : TextBaseline, ?alignmentBaseline : TextBaseline, baselineShift : Float = 0, ?kerning : Kerning, trackingRight : Float = 0, trackingLeft : Float = 0, ?locale : String, ?breakOpportunity : BreakOpportunity, ?digitCase : DigitCase, ?digitWidth : DigitWidth, ?ligatureLevel : LigatureLevel, ?typographicCase : TypographicCase) : Void;
 	function clone() : ElementFormat;
 	function getFontMetrics() : FontMetrics;
+	private function get_alignmentBaseline() : TextBaseline;
+	private function get_alpha() : Float;
+	private function get_baselineShift() : Float;
+	private function get_breakOpportunity() : BreakOpportunity;
+	private function get_color() : UInt;
+	private function get_digitCase() : DigitCase;
+	private function get_digitWidth() : DigitWidth;
+	private function get_dominantBaseline() : TextBaseline;
+	private function get_fontDescription() : FontDescription;
+	private function get_fontSize() : Float;
+	private function get_kerning() : Kerning;
+	private function get_ligatureLevel() : LigatureLevel;
+	private function get_locale() : String;
+	private function get_locked() : Bool;
+	private function get_textRotation() : TextRotation;
+	private function get_trackingLeft() : Float;
+	private function get_trackingRight() : Float;
+	private function get_typographicCase() : TypographicCase;
+	private function set_alignmentBaseline(value : TextBaseline) : TextBaseline;
+	private function set_alpha(value : Float) : Float;
+	private function set_baselineShift(value : Float) : Float;
+	private function set_breakOpportunity(value : BreakOpportunity) : BreakOpportunity;
+	private function set_color(value : UInt) : UInt;
+	private function set_digitCase(value : DigitCase) : DigitCase;
+	private function set_digitWidth(value : DigitWidth) : DigitWidth;
+	private function set_dominantBaseline(value : TextBaseline) : TextBaseline;
+	private function set_fontDescription(value : FontDescription) : FontDescription;
+	private function set_fontSize(value : Float) : Float;
+	private function set_kerning(value : Kerning) : Kerning;
+	private function set_ligatureLevel(value : LigatureLevel) : LigatureLevel;
+	private function set_locale(value : String) : String;
+	private function set_locked(value : Bool) : Bool;
+	private function set_textRotation(value : TextRotation) : TextRotation;
+	private function set_trackingLeft(value : Float) : Float;
+	private function set_trackingRight(value : Float) : Float;
+	private function set_typographicCase(value : TypographicCase) : TypographicCase;
 }
diff --git a/std/flash/text/engine/FontDescription.hx b/std/flash/text/engine/FontDescription.hx
index 3e91c4e2e11431adaa59f7bf06284d6853f83bea..2954df1e2ef29b8c1c28249bc00f8f55de471be9 100644
--- a/std/flash/text/engine/FontDescription.hx
+++ b/std/flash/text/engine/FontDescription.hx
@@ -1,15 +1,29 @@
 package flash.text.engine;
 
-@:final extern class FontDescription {
-	var cffHinting : CFFHinting;
-	var fontLookup : FontLookup;
-	var fontName : String;
-	var fontPosture : FontPosture;
-	var fontWeight : FontWeight;
-	var locked : Bool;
-	var renderingMode : RenderingMode;
+extern final class FontDescription {
+	@:flash.property var cffHinting(get,set) : CFFHinting;
+	@:flash.property var fontLookup(get,set) : FontLookup;
+	@:flash.property var fontName(get,set) : String;
+	@:flash.property var fontPosture(get,set) : FontPosture;
+	@:flash.property var fontWeight(get,set) : FontWeight;
+	@:flash.property var locked(get,set) : Bool;
+	@:flash.property var renderingMode(get,set) : RenderingMode;
 	function new(?fontName : String, ?fontWeight : FontWeight, ?fontPosture : FontPosture, ?fontLookup : FontLookup, ?renderingMode : RenderingMode, ?cffHinting : CFFHinting) : Void;
 	function clone() : FontDescription;
+	private function get_cffHinting() : CFFHinting;
+	private function get_fontLookup() : FontLookup;
+	private function get_fontName() : String;
+	private function get_fontPosture() : FontPosture;
+	private function get_fontWeight() : FontWeight;
+	private function get_locked() : Bool;
+	private function get_renderingMode() : RenderingMode;
+	private function set_cffHinting(value : CFFHinting) : CFFHinting;
+	private function set_fontLookup(value : FontLookup) : FontLookup;
+	private function set_fontName(value : String) : String;
+	private function set_fontPosture(value : FontPosture) : FontPosture;
+	private function set_fontWeight(value : FontWeight) : FontWeight;
+	private function set_locked(value : Bool) : Bool;
+	private function set_renderingMode(value : RenderingMode) : RenderingMode;
 	@:require(flash10_1) static function isDeviceFontCompatible(fontName : String, fontWeight : FontWeight, fontPosture : FontPosture) : Bool;
 	static function isFontCompatible(fontName : String, fontWeight : FontWeight, fontPosture : FontPosture) : Bool;
 }
diff --git a/std/flash/text/engine/FontLookup.hx b/std/flash/text/engine/FontLookup.hx
index dce00c8ee0ceddbb1f604102aef0d91c9787e78f..38de1f560458715715baeef2e79e321be0a7198b 100644
--- a/std/flash/text/engine/FontLookup.hx
+++ b/std/flash/text/engine/FontLookup.hx
@@ -1,6 +1,6 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum FontLookup {
-	DEVICE;
-	EMBEDDED_CFF;
+@:native("flash.text.engine.FontLookup") extern enum abstract FontLookup(String) {
+	var DEVICE;
+	var EMBEDDED_CFF;
 }
diff --git a/std/flash/text/engine/FontMetrics.hx b/std/flash/text/engine/FontMetrics.hx
index e7e9aa2a4c6e2e7d84822dab6c0f18df38bae733..5b184bac49cc00347d726501001b21c6e4b70f76 100644
--- a/std/flash/text/engine/FontMetrics.hx
+++ b/std/flash/text/engine/FontMetrics.hx
@@ -1,6 +1,6 @@
 package flash.text.engine;
 
-@:final extern class FontMetrics {
+extern final class FontMetrics {
 	var emBox : flash.geom.Rectangle;
 	var lineGap : Float;
 	var strikethroughOffset : Float;
diff --git a/std/flash/text/engine/FontPosture.hx b/std/flash/text/engine/FontPosture.hx
index 7d364851f4c77636c0cde0300fa52a2957140abf..e771f395263076286271a2ceab928f3690ae8da6 100644
--- a/std/flash/text/engine/FontPosture.hx
+++ b/std/flash/text/engine/FontPosture.hx
@@ -1,6 +1,6 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum FontPosture {
-	ITALIC;
-	NORMAL;
+@:native("flash.text.engine.FontPosture") extern enum abstract FontPosture(String) {
+	var ITALIC;
+	var NORMAL;
 }
diff --git a/std/flash/text/engine/FontWeight.hx b/std/flash/text/engine/FontWeight.hx
index 3fd85f62923fc1664ed5f63cb29c18cc93fc4717..3180321857752d8de938c18a50e7872dfb0f15bd 100644
--- a/std/flash/text/engine/FontWeight.hx
+++ b/std/flash/text/engine/FontWeight.hx
@@ -1,6 +1,6 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum FontWeight {
-	BOLD;
-	NORMAL;
+@:native("flash.text.engine.FontWeight") extern enum abstract FontWeight(String) {
+	var BOLD;
+	var NORMAL;
 }
diff --git a/std/flash/text/engine/GraphicElement.hx b/std/flash/text/engine/GraphicElement.hx
index 4e0513563d17f6d23dc6fe6c61e53e547d8678f4..f412d3b9ef4110c5e6cc693fe5cad4d09cd23c9f 100644
--- a/std/flash/text/engine/GraphicElement.hx
+++ b/std/flash/text/engine/GraphicElement.hx
@@ -1,8 +1,14 @@
 package flash.text.engine;
 
-@:final extern class GraphicElement extends ContentElement {
-	var elementHeight : Float;
-	var elementWidth : Float;
-	var graphic : flash.display.DisplayObject;
+extern final class GraphicElement extends ContentElement {
+	@:flash.property var elementHeight(get,set) : Float;
+	@:flash.property var elementWidth(get,set) : Float;
+	@:flash.property var graphic(get,set) : flash.display.DisplayObject;
 	function new(?graphic : flash.display.DisplayObject, elementWidth : Float = 15, elementHeight : Float = 15, ?elementFormat : ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : TextRotation) : Void;
+	private function get_elementHeight() : Float;
+	private function get_elementWidth() : Float;
+	private function get_graphic() : flash.display.DisplayObject;
+	private function set_elementHeight(value : Float) : Float;
+	private function set_elementWidth(value : Float) : Float;
+	private function set_graphic(value : flash.display.DisplayObject) : flash.display.DisplayObject;
 }
diff --git a/std/flash/text/engine/GroupElement.hx b/std/flash/text/engine/GroupElement.hx
index b48b4294efc97f0f700cd93711e6ea3ff8a5b3f4..7d031d85f8af42f3f82cfffc07cc429c9fa5d262 100644
--- a/std/flash/text/engine/GroupElement.hx
+++ b/std/flash/text/engine/GroupElement.hx
@@ -1,11 +1,12 @@
 package flash.text.engine;
 
-@:final extern class GroupElement extends ContentElement {
-	var elementCount(default,never) : Int;
+extern final class GroupElement extends ContentElement {
+	@:flash.property var elementCount(get,never) : Int;
 	function new(?elements : flash.Vector<ContentElement>, ?elementFormat : ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : TextRotation) : Void;
 	function getElementAt(index : Int) : ContentElement;
 	function getElementAtCharIndex(charIndex : Int) : ContentElement;
 	function getElementIndex(element : ContentElement) : Int;
+	private function get_elementCount() : Int;
 	function groupElements(beginIndex : Int, endIndex : Int) : GroupElement;
 	function mergeTextElements(beginIndex : Int, endIndex : Int) : TextElement;
 	function replaceElements(beginIndex : Int, endIndex : Int, newElements : flash.Vector<ContentElement>) : flash.Vector<ContentElement>;
diff --git a/std/flash/text/engine/JustificationStyle.hx b/std/flash/text/engine/JustificationStyle.hx
index 6ae3baf4e0723ab298df461fb60af5e834c4a937..1b665fbac7d310861f6fb7b3f90ffb523f18cd02 100644
--- a/std/flash/text/engine/JustificationStyle.hx
+++ b/std/flash/text/engine/JustificationStyle.hx
@@ -1,7 +1,7 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum JustificationStyle {
-	PRIORITIZE_LEAST_ADJUSTMENT;
-	PUSH_IN_KINSOKU;
-	PUSH_OUT_ONLY;
+@:native("flash.text.engine.JustificationStyle") extern enum abstract JustificationStyle(String) {
+	var PRIORITIZE_LEAST_ADJUSTMENT;
+	var PUSH_IN_KINSOKU;
+	var PUSH_OUT_ONLY;
 }
diff --git a/std/flash/text/engine/Kerning.hx b/std/flash/text/engine/Kerning.hx
index afc337d89563c0e92e0c7b0136e48a2ed367ec2f..a6c6e866a9f6c89528774575e413ef377860983f 100644
--- a/std/flash/text/engine/Kerning.hx
+++ b/std/flash/text/engine/Kerning.hx
@@ -1,7 +1,7 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum Kerning {
-	AUTO;
-	OFF;
-	ON;
+@:native("flash.text.engine.Kerning") extern enum abstract Kerning(String) {
+	var AUTO;
+	var OFF;
+	var ON;
 }
diff --git a/std/flash/text/engine/LigatureLevel.hx b/std/flash/text/engine/LigatureLevel.hx
index 733e307cc06dc60960d0afffccdade7b0fad7bcd..476dcd463f6415e9c98905b2b8b2c935982dd95e 100644
--- a/std/flash/text/engine/LigatureLevel.hx
+++ b/std/flash/text/engine/LigatureLevel.hx
@@ -1,9 +1,9 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum LigatureLevel {
-	COMMON;
-	EXOTIC;
-	MINIMUM;
-	NONE;
-	UNCOMMON;
+@:native("flash.text.engine.LigatureLevel") extern enum abstract LigatureLevel(String) {
+	var COMMON;
+	var EXOTIC;
+	var MINIMUM;
+	var NONE;
+	var UNCOMMON;
 }
diff --git a/std/flash/text/engine/LineJustification.hx b/std/flash/text/engine/LineJustification.hx
index d57fd8c8e9f6840a7ef355f882e956c07541640a..a348f8e19eb949554eb04ddc836d3c72bd04ebcd 100644
--- a/std/flash/text/engine/LineJustification.hx
+++ b/std/flash/text/engine/LineJustification.hx
@@ -1,8 +1,8 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum LineJustification {
-	ALL_BUT_LAST;
-	ALL_BUT_MANDATORY_BREAK;
-	ALL_INCLUDING_LAST;
-	UNJUSTIFIED;
+@:native("flash.text.engine.LineJustification") extern enum abstract LineJustification(String) {
+	var ALL_BUT_LAST;
+	var ALL_BUT_MANDATORY_BREAK;
+	var ALL_INCLUDING_LAST;
+	var UNJUSTIFIED;
 }
diff --git a/std/flash/text/engine/RenderingMode.hx b/std/flash/text/engine/RenderingMode.hx
index e624009a9d1c7d000d954edd7e70e61e147c496d..c48997f78a62e9d5bb4ae54cad12129afd33c535 100644
--- a/std/flash/text/engine/RenderingMode.hx
+++ b/std/flash/text/engine/RenderingMode.hx
@@ -1,6 +1,6 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum RenderingMode {
-	CFF;
-	NORMAL;
+@:native("flash.text.engine.RenderingMode") extern enum abstract RenderingMode(String) {
+	var CFF;
+	var NORMAL;
 }
diff --git a/std/flash/text/engine/SpaceJustifier.hx b/std/flash/text/engine/SpaceJustifier.hx
index fe61cf66745ce82fb4bc6e387c347d5f42705ba9..e1a9028d992209c32102616d7ce6ff753114d020 100644
--- a/std/flash/text/engine/SpaceJustifier.hx
+++ b/std/flash/text/engine/SpaceJustifier.hx
@@ -1,9 +1,17 @@
 package flash.text.engine;
 
-@:final extern class SpaceJustifier extends TextJustifier {
-	var letterSpacing : Bool;
-	@:require(flash10_1) var maximumSpacing : Float;
-	@:require(flash10_1) var minimumSpacing : Float;
-	@:require(flash10_1) var optimumSpacing : Float;
+extern final class SpaceJustifier extends TextJustifier {
+	@:flash.property var letterSpacing(get,set) : Bool;
+	@:flash.property @:require(flash10_1) var maximumSpacing(get,set) : Float;
+	@:flash.property @:require(flash10_1) var minimumSpacing(get,set) : Float;
+	@:flash.property @:require(flash10_1) var optimumSpacing(get,set) : Float;
 	function new(?locale : String, ?lineJustification : LineJustification, letterSpacing : Bool = false) : Void;
+	private function get_letterSpacing() : Bool;
+	private function get_maximumSpacing() : Float;
+	private function get_minimumSpacing() : Float;
+	private function get_optimumSpacing() : Float;
+	private function set_letterSpacing(value : Bool) : Bool;
+	private function set_maximumSpacing(value : Float) : Float;
+	private function set_minimumSpacing(value : Float) : Float;
+	private function set_optimumSpacing(value : Float) : Float;
 }
diff --git a/std/flash/text/engine/TabAlignment.hx b/std/flash/text/engine/TabAlignment.hx
index 0e99e4f3a7ac089080afe797cc0eae6fb0b96bb6..f22d6558125914021e93fcb54922cc8add9a411b 100644
--- a/std/flash/text/engine/TabAlignment.hx
+++ b/std/flash/text/engine/TabAlignment.hx
@@ -1,8 +1,8 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum TabAlignment {
-	CENTER;
-	DECIMAL;
-	END;
-	START;
+@:native("flash.text.engine.TabAlignment") extern enum abstract TabAlignment(String) {
+	var CENTER;
+	var DECIMAL;
+	var END;
+	var START;
 }
diff --git a/std/flash/text/engine/TabStop.hx b/std/flash/text/engine/TabStop.hx
index 2a1422c2b9a30707be799b77ed78003397676a4f..16998be3d514e6b851c75c524892b7d976d52dd4 100644
--- a/std/flash/text/engine/TabStop.hx
+++ b/std/flash/text/engine/TabStop.hx
@@ -1,8 +1,14 @@
 package flash.text.engine;
 
-@:final extern class TabStop {
-	var alignment : TabAlignment;
-	var decimalAlignmentToken : String;
-	var position : Float;
+extern final class TabStop {
+	@:flash.property var alignment(get,set) : TabAlignment;
+	@:flash.property var decimalAlignmentToken(get,set) : String;
+	@:flash.property var position(get,set) : Float;
 	function new(?alignment : TabAlignment, position : Float = 0, ?decimalAlignmentToken : String) : Void;
+	private function get_alignment() : TabAlignment;
+	private function get_decimalAlignmentToken() : String;
+	private function get_position() : Float;
+	private function set_alignment(value : TabAlignment) : TabAlignment;
+	private function set_decimalAlignmentToken(value : String) : String;
+	private function set_position(value : Float) : Float;
 }
diff --git a/std/flash/text/engine/TextBaseline.hx b/std/flash/text/engine/TextBaseline.hx
index 36795d3c4e4e3b71929a80e62a037e5b534e0076..f6181500f754c2db28edfa2a1a86db6fa340543a 100644
--- a/std/flash/text/engine/TextBaseline.hx
+++ b/std/flash/text/engine/TextBaseline.hx
@@ -1,11 +1,11 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum TextBaseline {
-	ASCENT;
-	DESCENT;
-	IDEOGRAPHIC_BOTTOM;
-	IDEOGRAPHIC_CENTER;
-	IDEOGRAPHIC_TOP;
-	ROMAN;
-	USE_DOMINANT_BASELINE;
+@:native("flash.text.engine.TextBaseline") extern enum abstract TextBaseline(String) {
+	var ASCENT;
+	var DESCENT;
+	var IDEOGRAPHIC_BOTTOM;
+	var IDEOGRAPHIC_CENTER;
+	var IDEOGRAPHIC_TOP;
+	var ROMAN;
+	var USE_DOMINANT_BASELINE;
 }
diff --git a/std/flash/text/engine/TextBlock.hx b/std/flash/text/engine/TextBlock.hx
index f59db45e1037c40f0768a478f8cb3e8eaee1a817..873596ed37ac24abfa615e8c2c3e6a5a1000e94d 100644
--- a/std/flash/text/engine/TextBlock.hx
+++ b/std/flash/text/engine/TextBlock.hx
@@ -1,19 +1,19 @@
 package flash.text.engine;
 
-@:final extern class TextBlock {
-	var applyNonLinearFontScaling : Bool;
-	var baselineFontDescription : FontDescription;
-	var baselineFontSize : Float;
-	var baselineZero : TextBaseline;
-	var bidiLevel : Int;
-	var content : ContentElement;
-	var firstInvalidLine(default,never) : TextLine;
-	var firstLine(default,never) : TextLine;
-	var lastLine(default,never) : TextLine;
-	var lineRotation : TextRotation;
-	var tabStops : flash.Vector<TabStop>;
-	var textJustifier : TextJustifier;
-	var textLineCreationResult(default,never) : TextLineCreationResult;
+extern final class TextBlock {
+	@:flash.property var applyNonLinearFontScaling(get,set) : Bool;
+	@:flash.property var baselineFontDescription(get,set) : FontDescription;
+	@:flash.property var baselineFontSize(get,set) : Float;
+	@:flash.property var baselineZero(get,set) : TextBaseline;
+	@:flash.property var bidiLevel(get,set) : Int;
+	@:flash.property var content(get,set) : ContentElement;
+	@:flash.property var firstInvalidLine(get,never) : TextLine;
+	@:flash.property var firstLine(get,never) : TextLine;
+	@:flash.property var lastLine(get,never) : TextLine;
+	@:flash.property var lineRotation(get,set) : TextRotation;
+	@:flash.property var tabStops(get,set) : flash.Vector<TabStop>;
+	@:flash.property var textJustifier(get,set) : TextJustifier;
+	@:flash.property var textLineCreationResult(get,never) : TextLineCreationResult;
 	var userData : Dynamic;
 	function new(?content : ContentElement, ?tabStops : flash.Vector<TabStop>, ?textJustifier : TextJustifier, ?lineRotation : TextRotation, ?baselineZero : TextBaseline, bidiLevel : Int = 0, applyNonLinearFontScaling : Bool = true, ?baselineFontDescription : FontDescription, baselineFontSize : Float = 12) : Void;
 	function createTextLine(?previousLine : TextLine, width : Float = 1000000, lineOffset : Float = 0, fitSomething : Bool = false) : TextLine;
@@ -23,7 +23,29 @@ package flash.text.engine;
 	function findPreviousAtomBoundary(beforeCharIndex : Int) : Int;
 	function findPreviousWordBoundary(beforeCharIndex : Int) : Int;
 	function getTextLineAtCharIndex(charIndex : Int) : TextLine;
+	private function get_applyNonLinearFontScaling() : Bool;
+	private function get_baselineFontDescription() : FontDescription;
+	private function get_baselineFontSize() : Float;
+	private function get_baselineZero() : TextBaseline;
+	private function get_bidiLevel() : Int;
+	private function get_content() : ContentElement;
+	private function get_firstInvalidLine() : TextLine;
+	private function get_firstLine() : TextLine;
+	private function get_lastLine() : TextLine;
+	private function get_lineRotation() : TextRotation;
+	private function get_tabStops() : flash.Vector<TabStop>;
+	private function get_textJustifier() : TextJustifier;
+	private function get_textLineCreationResult() : TextLineCreationResult;
 	@:require(flash10_1) function recreateTextLine(textLine : TextLine, ?previousLine : TextLine, width : Float = 1000000, lineOffset : Float = 0, fitSomething : Bool = false) : TextLine;
 	@:require(flash10_1) function releaseLineCreationData() : Void;
 	function releaseLines(firstLine : TextLine, lastLine : TextLine) : Void;
+	private function set_applyNonLinearFontScaling(value : Bool) : Bool;
+	private function set_baselineFontDescription(value : FontDescription) : FontDescription;
+	private function set_baselineFontSize(value : Float) : Float;
+	private function set_baselineZero(value : TextBaseline) : TextBaseline;
+	private function set_bidiLevel(value : Int) : Int;
+	private function set_content(value : ContentElement) : ContentElement;
+	private function set_lineRotation(value : TextRotation) : TextRotation;
+	private function set_tabStops(value : flash.Vector<TabStop>) : flash.Vector<TabStop>;
+	private function set_textJustifier(value : TextJustifier) : TextJustifier;
 }
diff --git a/std/flash/text/engine/TextElement.hx b/std/flash/text/engine/TextElement.hx
index 3ca785d2e01c9e067084f84519961152aa0209db..d32c30e4b6da143a4ee2e43fe949cb33555203e7 100644
--- a/std/flash/text/engine/TextElement.hx
+++ b/std/flash/text/engine/TextElement.hx
@@ -1,6 +1,7 @@
 package flash.text.engine;
 
-@:final extern class TextElement extends ContentElement {
+extern final class TextElement extends ContentElement {
 	function new(?text : String, ?elementFormat : ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : TextRotation) : Void;
 	function replaceText(beginIndex : Int, endIndex : Int, newText : String) : Void;
+	private function set_text(value : String) : String;
 }
diff --git a/std/flash/text/engine/TextJustifier.hx b/std/flash/text/engine/TextJustifier.hx
index 7525682faf61b51afd9ba1a27f3e4ed2c8657f39..abc6f44e67fe4e5b2f06332c223492d0207cdf70 100644
--- a/std/flash/text/engine/TextJustifier.hx
+++ b/std/flash/text/engine/TextJustifier.hx
@@ -1,9 +1,12 @@
 package flash.text.engine;
 
 extern class TextJustifier {
-	var lineJustification : LineJustification;
-	var locale(default,never) : String;
+	@:flash.property var lineJustification(get,set) : LineJustification;
+	@:flash.property var locale(get,never) : String;
 	function new(locale : String, lineJustification : LineJustification) : Void;
 	function clone() : TextJustifier;
+	private function get_lineJustification() : LineJustification;
+	private function get_locale() : String;
+	private function set_lineJustification(value : LineJustification) : LineJustification;
 	static function getJustifierForLocale(locale : String) : TextJustifier;
 }
diff --git a/std/flash/text/engine/TextLine.hx b/std/flash/text/engine/TextLine.hx
index b6e6aabce182a630b3da3c7d583f0e8b82323539..fd3400980a4c34c10030a9d377b197fcabb92418 100644
--- a/std/flash/text/engine/TextLine.hx
+++ b/std/flash/text/engine/TextLine.hx
@@ -1,26 +1,26 @@
 package flash.text.engine;
 
-@:final extern class TextLine extends flash.display.DisplayObjectContainer {
-	var ascent(default,never) : Float;
-	var atomCount(default,never) : Int;
-	var descent(default,never) : Float;
-	var hasGraphicElement(default,never) : Bool;
-	@:require(flash10_1) var hasTabs(default,never) : Bool;
-	var mirrorRegions(default,never) : flash.Vector<TextLineMirrorRegion>;
-	var nextLine(default,never) : TextLine;
-	var previousLine(default,never) : TextLine;
-	var rawTextLength(default,never) : Int;
-	var specifiedWidth(default,never) : Float;
-	var textBlock(default,never) : TextBlock;
-	var textBlockBeginIndex(default,never) : Int;
-	var textHeight(default,never) : Float;
-	var textWidth(default,never) : Float;
-	var totalAscent(default,never) : Float;
-	var totalDescent(default,never) : Float;
-	var totalHeight(default,never) : Float;
-	var unjustifiedTextWidth(default,never) : Float;
+extern final class TextLine extends flash.display.DisplayObjectContainer {
+	@:flash.property var ascent(get,never) : Float;
+	@:flash.property var atomCount(get,never) : Int;
+	@:flash.property var descent(get,never) : Float;
+	@:flash.property var hasGraphicElement(get,never) : Bool;
+	@:flash.property @:require(flash10_1) var hasTabs(get,never) : Bool;
+	@:flash.property var mirrorRegions(get,never) : flash.Vector<TextLineMirrorRegion>;
+	@:flash.property var nextLine(get,never) : TextLine;
+	@:flash.property var previousLine(get,never) : TextLine;
+	@:flash.property var rawTextLength(get,never) : Int;
+	@:flash.property var specifiedWidth(get,never) : Float;
+	@:flash.property var textBlock(get,never) : TextBlock;
+	@:flash.property var textBlockBeginIndex(get,never) : Int;
+	@:flash.property var textHeight(get,never) : Float;
+	@:flash.property var textWidth(get,never) : Float;
+	@:flash.property var totalAscent(get,never) : Float;
+	@:flash.property var totalDescent(get,never) : Float;
+	@:flash.property var totalHeight(get,never) : Float;
+	@:flash.property var unjustifiedTextWidth(get,never) : Float;
 	var userData : Dynamic;
-	var validity : String;
+	@:flash.property var validity(get,set) : String;
 	function new() : Void;
 	function dump() : String;
 	function flushAtomData() : Void;
@@ -36,5 +36,25 @@ package flash.text.engine;
 	function getAtomWordBoundaryOnLeft(atomIndex : Int) : Bool;
 	function getBaselinePosition(baseline : String) : Float;
 	function getMirrorRegion(mirror : flash.events.EventDispatcher) : TextLineMirrorRegion;
-	static var MAX_LINE_WIDTH(default,never) : Int;
+	private function get_ascent() : Float;
+	private function get_atomCount() : Int;
+	private function get_descent() : Float;
+	private function get_hasGraphicElement() : Bool;
+	private function get_hasTabs() : Bool;
+	private function get_mirrorRegions() : flash.Vector<TextLineMirrorRegion>;
+	private function get_nextLine() : TextLine;
+	private function get_previousLine() : TextLine;
+	private function get_rawTextLength() : Int;
+	private function get_specifiedWidth() : Float;
+	private function get_textBlock() : TextBlock;
+	private function get_textBlockBeginIndex() : Int;
+	private function get_textHeight() : Float;
+	private function get_textWidth() : Float;
+	private function get_totalAscent() : Float;
+	private function get_totalDescent() : Float;
+	private function get_totalHeight() : Float;
+	private function get_unjustifiedTextWidth() : Float;
+	private function get_validity() : String;
+	private function set_validity(value : String) : String;
+	static final MAX_LINE_WIDTH : Int;
 }
diff --git a/std/flash/text/engine/TextLineCreationResult.hx b/std/flash/text/engine/TextLineCreationResult.hx
index b01016f466ae7c6310fa11b8f2c5f3c45c4297be..34531b25bb0eb289ce68a5fe61df6c923476bc18 100644
--- a/std/flash/text/engine/TextLineCreationResult.hx
+++ b/std/flash/text/engine/TextLineCreationResult.hx
@@ -1,8 +1,8 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum TextLineCreationResult {
-	COMPLETE;
-	EMERGENCY;
-	INSUFFICIENT_WIDTH;
-	SUCCESS;
+@:native("flash.text.engine.TextLineCreationResult") extern enum abstract TextLineCreationResult(String) {
+	var COMPLETE;
+	var EMERGENCY;
+	var INSUFFICIENT_WIDTH;
+	var SUCCESS;
 }
diff --git a/std/flash/text/engine/TextLineMirrorRegion.hx b/std/flash/text/engine/TextLineMirrorRegion.hx
index 74f96c89456fc92842554eb8a2f9a81073144890..0d4aa8e4edf0f643e4b9077b40636dd92289344b 100644
--- a/std/flash/text/engine/TextLineMirrorRegion.hx
+++ b/std/flash/text/engine/TextLineMirrorRegion.hx
@@ -1,11 +1,17 @@
 package flash.text.engine;
 
-@:final extern class TextLineMirrorRegion {
-	var bounds(default,never) : flash.geom.Rectangle;
-	var element(default,never) : ContentElement;
-	var mirror(default,never) : flash.events.EventDispatcher;
-	var nextRegion(default,never) : TextLineMirrorRegion;
-	var previousRegion(default,never) : TextLineMirrorRegion;
-	var textLine(default,never) : TextLine;
+extern final class TextLineMirrorRegion {
+	@:flash.property var bounds(get,never) : flash.geom.Rectangle;
+	@:flash.property var element(get,never) : ContentElement;
+	@:flash.property var mirror(get,never) : flash.events.EventDispatcher;
+	@:flash.property var nextRegion(get,never) : TextLineMirrorRegion;
+	@:flash.property var previousRegion(get,never) : TextLineMirrorRegion;
+	@:flash.property var textLine(get,never) : TextLine;
 	function new() : Void;
+	private function get_bounds() : flash.geom.Rectangle;
+	private function get_element() : ContentElement;
+	private function get_mirror() : flash.events.EventDispatcher;
+	private function get_nextRegion() : TextLineMirrorRegion;
+	private function get_previousRegion() : TextLineMirrorRegion;
+	private function get_textLine() : TextLine;
 }
diff --git a/std/flash/text/engine/TextLineValidity.hx b/std/flash/text/engine/TextLineValidity.hx
index 4336ad9ac61dc8d2e59fc97476c731f9fbc76963..d8b773ff32fdfad55e92c639eaa6b1658c811352 100644
--- a/std/flash/text/engine/TextLineValidity.hx
+++ b/std/flash/text/engine/TextLineValidity.hx
@@ -1,8 +1,8 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum TextLineValidity {
-	INVALID;
-	POSSIBLY_INVALID;
-	STATIC;
-	VALID;
+@:native("flash.text.engine.TextLineValidity") extern enum abstract TextLineValidity(String) {
+	var INVALID;
+	var POSSIBLY_INVALID;
+	var STATIC;
+	var VALID;
 }
diff --git a/std/flash/text/engine/TextRotation.hx b/std/flash/text/engine/TextRotation.hx
index 391a0e5ac6e944f4b3c724cd929a5fc6e90ffdf6..b424d9d823a8b3ae350a68ce4ed6df0b99c15507 100644
--- a/std/flash/text/engine/TextRotation.hx
+++ b/std/flash/text/engine/TextRotation.hx
@@ -1,9 +1,9 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum TextRotation {
-	AUTO;
-	ROTATE_0;
-	ROTATE_180;
-	ROTATE_270;
-	ROTATE_90;
+@:native("flash.text.engine.TextRotation") extern enum abstract TextRotation(String) {
+	var AUTO;
+	var ROTATE_0;
+	var ROTATE_180;
+	var ROTATE_270;
+	var ROTATE_90;
 }
diff --git a/std/flash/text/engine/TypographicCase.hx b/std/flash/text/engine/TypographicCase.hx
index 6787c75e5f70807ea19dccbaf09fad08009bf987..2d5c0ff9bd727356641ba635d8c12217a855f2c0 100644
--- a/std/flash/text/engine/TypographicCase.hx
+++ b/std/flash/text/engine/TypographicCase.hx
@@ -1,11 +1,11 @@
 package flash.text.engine;
 
-@:fakeEnum(String) extern enum TypographicCase {
-	CAPS;
-	CAPS_AND_SMALL_CAPS;
-	DEFAULT;
-	LOWERCASE;
-	SMALL_CAPS;
-	TITLE;
-	UPPERCASE;
+@:native("flash.text.engine.TypographicCase") extern enum abstract TypographicCase(String) {
+	var CAPS;
+	var CAPS_AND_SMALL_CAPS;
+	var DEFAULT;
+	var LOWERCASE;
+	var SMALL_CAPS;
+	var TITLE;
+	var UPPERCASE;
 }
diff --git a/std/flash/text/ime/CompositionAttributeRange.hx b/std/flash/text/ime/CompositionAttributeRange.hx
index 69079f34eb977bf0b68bf394fb39063b0b7751a8..2a4d60beeccee53f249d049adfdaa0dc518b6fc4 100644
--- a/std/flash/text/ime/CompositionAttributeRange.hx
+++ b/std/flash/text/ime/CompositionAttributeRange.hx
@@ -1,6 +1,6 @@
 package flash.text.ime;
 
-@:final extern class CompositionAttributeRange {
+extern final class CompositionAttributeRange {
 	var converted : Bool;
 	var relativeEnd : Int;
 	var relativeStart : Int;
diff --git a/std/flash/text/ime/IIMEClient.hx b/std/flash/text/ime/IIMEClient.hx
index 12470fdde0e26ccc725489b062192d733145d29e..f5259952e1f0344df8c2465bfa89da107f6900ce 100644
--- a/std/flash/text/ime/IIMEClient.hx
+++ b/std/flash/text/ime/IIMEClient.hx
@@ -1,14 +1,19 @@
 package flash.text.ime;
 
 extern interface IIMEClient {
-	var compositionEndIndex(default,never) : Int;
-	var compositionStartIndex(default,never) : Int;
-	var selectionActiveIndex(default,never) : Int;
-	var selectionAnchorIndex(default,never) : Int;
-	var verticalTextLayout(default,never) : Bool;
+	@:flash.property var compositionEndIndex(get,never) : Int;
+	@:flash.property var compositionStartIndex(get,never) : Int;
+	@:flash.property var selectionActiveIndex(get,never) : Int;
+	@:flash.property var selectionAnchorIndex(get,never) : Int;
+	@:flash.property var verticalTextLayout(get,never) : Bool;
 	function confirmComposition(?text : String, preserveSelection : Bool = false) : Void;
 	function getTextBounds(startIndex : Int, endIndex : Int) : flash.geom.Rectangle;
 	function getTextInRange(startIndex : Int, endIndex : Int) : String;
+	private function get_compositionEndIndex() : Int;
+	private function get_compositionStartIndex() : Int;
+	private function get_selectionActiveIndex() : Int;
+	private function get_selectionAnchorIndex() : Int;
+	private function get_verticalTextLayout() : Bool;
 	function selectRange(anchorIndex : Int, activeIndex : Int) : Void;
 	function updateComposition(text : String, attributes : flash.Vector<CompositionAttributeRange>, compositionStartIndex : Int, compositionEndIndex : Int) : Void;
 }
diff --git a/std/flash/trace/Trace.hx b/std/flash/trace/Trace.hx
index 05902f961234c9077946260a84637bfdafa76c70..ba015974374a065fbd1b3d7b5b15fa767ff1108e 100644
--- a/std/flash/trace/Trace.hx
+++ b/std/flash/trace/Trace.hx
@@ -1,13 +1,13 @@
 package flash.trace;
 
 extern class Trace {
-	static var FILE(default,never) : Dynamic;
-	static var LISTENER(default,never) : Dynamic;
-	static var METHODS(default,never) : Int;
-	static var METHODS_AND_LINES(default,never) : Int;
-	static var METHODS_AND_LINES_WITH_ARGS(default,never) : Int;
-	static var METHODS_WITH_ARGS(default,never) : Int;
-	static var OFF(default,never) : Int;
+	static final FILE : Dynamic;
+	static final LISTENER : Dynamic;
+	static final METHODS : Int;
+	static final METHODS_AND_LINES : Int;
+	static final METHODS_AND_LINES_WITH_ARGS : Int;
+	static final METHODS_WITH_ARGS : Int;
+	static final OFF : Int;
 	static function getLevel(target : Int = 2) : Int;
 	static function getListener() : Dynamic;
 	static function setLevel(l : Int, target : Int = 2) : Dynamic;
diff --git a/std/flash/ui/ContextMenu.hx b/std/flash/ui/ContextMenu.hx
index 89cfe2bc507160c4e4d58204a47284c77f90753b..4372e8b15a0820b2d032241168d1992c86ae41d4 100644
--- a/std/flash/ui/ContextMenu.hx
+++ b/std/flash/ui/ContextMenu.hx
@@ -1,13 +1,24 @@
 package flash.ui;
 
-@:final extern class ContextMenu extends flash.display.NativeMenu {
-	var builtInItems : ContextMenuBuiltInItems;
-	@:require(flash10) var clipboardItems : ContextMenuClipboardItems;
-	@:require(flash10) var clipboardMenu : Bool;
-	var customItems : Array<Dynamic>;
-	@:require(flash10) var link : flash.net.URLRequest;
+extern final class ContextMenu extends flash.display.NativeMenu {
+	@:flash.property var builtInItems(get,set) : ContextMenuBuiltInItems;
+	@:flash.property @:require(flash10) var clipboardItems(get,set) : ContextMenuClipboardItems;
+	@:flash.property @:require(flash10) var clipboardMenu(get,set) : Bool;
+	@:flash.property var customItems(get,set) : Array<Dynamic>;
+	@:flash.property @:require(flash10) var link(get,set) : flash.net.URLRequest;
 	function new() : Void;
 	function clone() : ContextMenu;
+	private function get_builtInItems() : ContextMenuBuiltInItems;
+	private function get_clipboardItems() : ContextMenuClipboardItems;
+	private function get_clipboardMenu() : Bool;
+	private function get_customItems() : Array<Dynamic>;
+	private function get_link() : flash.net.URLRequest;
 	function hideBuiltInItems() : Void;
-	@:require(flash10_1) static var isSupported(default,never) : Bool;
+	private function set_builtInItems(value : ContextMenuBuiltInItems) : ContextMenuBuiltInItems;
+	private function set_clipboardItems(value : ContextMenuClipboardItems) : ContextMenuClipboardItems;
+	private function set_clipboardMenu(value : Bool) : Bool;
+	private function set_customItems(value : Array<Dynamic>) : Array<Dynamic>;
+	private function set_link(value : flash.net.URLRequest) : flash.net.URLRequest;
+	@:flash.property @:require(flash10_1) static var isSupported(get,never) : Bool;
+	private static function get_isSupported() : Bool;
 }
diff --git a/std/flash/ui/ContextMenuBuiltInItems.hx b/std/flash/ui/ContextMenuBuiltInItems.hx
index 21bb60039a7ad97a1cef7a99f7b69d1f22544da8..fa9fca158539fd3593b5699ad6a8f3fef12d3b6a 100644
--- a/std/flash/ui/ContextMenuBuiltInItems.hx
+++ b/std/flash/ui/ContextMenuBuiltInItems.hx
@@ -1,14 +1,30 @@
 package flash.ui;
 
-@:final extern class ContextMenuBuiltInItems {
-	var forwardAndBack : Bool;
-	var loop : Bool;
-	var play : Bool;
-	var print : Bool;
-	var quality : Bool;
-	var rewind : Bool;
-	var save : Bool;
-	var zoom : Bool;
+extern final class ContextMenuBuiltInItems {
+	@:flash.property var forwardAndBack(get,set) : Bool;
+	@:flash.property var loop(get,set) : Bool;
+	@:flash.property var play(get,set) : Bool;
+	@:flash.property var print(get,set) : Bool;
+	@:flash.property var quality(get,set) : Bool;
+	@:flash.property var rewind(get,set) : Bool;
+	@:flash.property var save(get,set) : Bool;
+	@:flash.property var zoom(get,set) : Bool;
 	function new() : Void;
 	function clone() : ContextMenuBuiltInItems;
+	private function get_forwardAndBack() : Bool;
+	private function get_loop() : Bool;
+	private function get_play() : Bool;
+	private function get_print() : Bool;
+	private function get_quality() : Bool;
+	private function get_rewind() : Bool;
+	private function get_save() : Bool;
+	private function get_zoom() : Bool;
+	private function set_forwardAndBack(value : Bool) : Bool;
+	private function set_loop(value : Bool) : Bool;
+	private function set_play(value : Bool) : Bool;
+	private function set_print(value : Bool) : Bool;
+	private function set_quality(value : Bool) : Bool;
+	private function set_rewind(value : Bool) : Bool;
+	private function set_save(value : Bool) : Bool;
+	private function set_zoom(value : Bool) : Bool;
 }
diff --git a/std/flash/ui/ContextMenuClipboardItems.hx b/std/flash/ui/ContextMenuClipboardItems.hx
index d99c43a2780765248508b320de0c05a18b9f2a10..8e49f9c9ca6c617432892e0da45111470eaf68af 100644
--- a/std/flash/ui/ContextMenuClipboardItems.hx
+++ b/std/flash/ui/ContextMenuClipboardItems.hx
@@ -1,11 +1,21 @@
 package flash.ui;
 
-@:final extern class ContextMenuClipboardItems {
-	var clear : Bool;
-	var copy : Bool;
-	var cut : Bool;
-	var paste : Bool;
-	var selectAll : Bool;
+extern final class ContextMenuClipboardItems {
+	@:flash.property var clear(get,set) : Bool;
+	@:flash.property var copy(get,set) : Bool;
+	@:flash.property var cut(get,set) : Bool;
+	@:flash.property var paste(get,set) : Bool;
+	@:flash.property var selectAll(get,set) : Bool;
 	function new() : Void;
 	function clone() : ContextMenuClipboardItems;
+	private function get_clear() : Bool;
+	private function get_copy() : Bool;
+	private function get_cut() : Bool;
+	private function get_paste() : Bool;
+	private function get_selectAll() : Bool;
+	private function set_clear(value : Bool) : Bool;
+	private function set_copy(value : Bool) : Bool;
+	private function set_cut(value : Bool) : Bool;
+	private function set_paste(value : Bool) : Bool;
+	private function set_selectAll(value : Bool) : Bool;
 }
diff --git a/std/flash/ui/ContextMenuItem.hx b/std/flash/ui/ContextMenuItem.hx
index 5039530b014952271bf6ad8ceb4cbe816292c2ec..2e6cf0b449b76d0312fece7fcda62bc29705020a 100644
--- a/std/flash/ui/ContextMenuItem.hx
+++ b/std/flash/ui/ContextMenuItem.hx
@@ -1,9 +1,15 @@
 package flash.ui;
 
-@:final extern class ContextMenuItem extends flash.display.NativeMenuItem {
-	var caption : String;
-	var separatorBefore : Bool;
-	var visible : Bool;
+extern final class ContextMenuItem extends flash.display.NativeMenuItem {
+	@:flash.property var caption(get,set) : String;
+	@:flash.property var separatorBefore(get,set) : Bool;
+	@:flash.property var visible(get,set) : Bool;
 	function new(caption : String, separatorBefore : Bool = false, enabled : Bool = true, visible : Bool = true) : Void;
 	function clone() : ContextMenuItem;
+	private function get_caption() : String;
+	private function get_separatorBefore() : Bool;
+	private function get_visible() : Bool;
+	private function set_caption(value : String) : String;
+	private function set_separatorBefore(value : Bool) : Bool;
+	private function set_visible(value : Bool) : Bool;
 }
diff --git a/std/flash/ui/GameInput.hx b/std/flash/ui/GameInput.hx
index 3f9671ffa759ac5252e0d09d4a843249ccd4becd..49aec66771b390e655e82d5c9980f924bc977fe0 100644
--- a/std/flash/ui/GameInput.hx
+++ b/std/flash/ui/GameInput.hx
@@ -1,7 +1,9 @@
 package flash.ui;
 
 @:require(flash11_8) extern class GameInput extends flash.events.EventDispatcher {
-	static var isSupported(default,never) : Bool;
-	static var numDevices(default,never) : Int;
+	@:flash.property static var isSupported(get,never) : Bool;
+	@:flash.property static var numDevices(get,never) : Int;
 	static function getDeviceAt(index : Int) : GameInputDevice;
+	private static function get_isSupported() : Bool;
+	private static function get_numDevices() : Int;
 }
diff --git a/std/flash/ui/GameInputControl.hx b/std/flash/ui/GameInputControl.hx
index e6c4314daef8562076318709cfc5ebda1a9e5b07..18549d42bcf28862a643f22e9249c9e26d016bf2 100644
--- a/std/flash/ui/GameInputControl.hx
+++ b/std/flash/ui/GameInputControl.hx
@@ -1,10 +1,15 @@
 package flash.ui;
 
 extern class GameInputControl extends flash.events.EventDispatcher implements Dynamic {
-	var device(default,never) : GameInputDevice;
-	var id(default,never) : String;
-	var maxValue(default,never) : Float;
-	var minValue(default,never) : Float;
-	var value(default,never) : Float;
+	@:flash.property var device(get,never) : GameInputDevice;
+	@:flash.property var id(get,never) : String;
+	@:flash.property var maxValue(get,never) : Float;
+	@:flash.property var minValue(get,never) : Float;
+	@:flash.property var value(get,never) : Float;
 	function new() : Void;
+	private function get_device() : GameInputDevice;
+	private function get_id() : String;
+	private function get_maxValue() : Float;
+	private function get_minValue() : Float;
+	private function get_value() : Float;
 }
diff --git a/std/flash/ui/GameInputControlType.hx b/std/flash/ui/GameInputControlType.hx
index 868b7824d759c93688115b1520ae3b32377c1fe4..cb4497eb0b538be989133289ead3bd0ac8c70ce7 100644
--- a/std/flash/ui/GameInputControlType.hx
+++ b/std/flash/ui/GameInputControlType.hx
@@ -1,10 +1,10 @@
 package flash.ui;
 
-@:fakeEnum(String) extern enum GameInputControlType {
-	ACCELERATION;
-	BUTTON;
-	DIRECTION;
-	MOVEMENT;
-	ROTATION;
-	TRIGGER;
+@:native("flash.ui.GameInputControlType") extern enum abstract GameInputControlType(String) {
+	var ACCELERATION;
+	var BUTTON;
+	var DIRECTION;
+	var MOVEMENT;
+	var ROTATION;
+	var TRIGGER;
 }
diff --git a/std/flash/ui/GameInputDevice.hx b/std/flash/ui/GameInputDevice.hx
index ad4b5994f3df7d9cd6ecf24ce6c5f9632d616bef..2201d58b0ac84edb3d78e11a81cb63784497965c 100644
--- a/std/flash/ui/GameInputDevice.hx
+++ b/std/flash/ui/GameInputDevice.hx
@@ -1,15 +1,22 @@
 package flash.ui;
 
-@:final @:require(flash11_8) extern class GameInputDevice {
-	var enabled : Bool;
-	var id(default,never) : String;
-	var name(default,never) : String;
-	var numControls(default,never) : Int;
-	var sampleInterval : Int;
+@:require(flash11_8) extern final class GameInputDevice {
+	@:flash.property var enabled(get,set) : Bool;
+	@:flash.property var id(get,never) : String;
+	@:flash.property var name(get,never) : String;
+	@:flash.property var numControls(get,never) : Int;
+	@:flash.property var sampleInterval(get,set) : Int;
 	function new() : Void;
 	function getCachedSamples(data : flash.utils.ByteArray, append : Bool = false) : Int;
 	function getControlAt(i : Int) : GameInputControl;
+	private function get_enabled() : Bool;
+	private function get_id() : String;
+	private function get_name() : String;
+	private function get_numControls() : Int;
+	private function get_sampleInterval() : Int;
+	private function set_enabled(value : Bool) : Bool;
+	private function set_sampleInterval(value : Int) : Int;
 	function startCachingSamples(numSamples : Int, controls : flash.Vector<String>) : Void;
 	function stopCachingSamples() : Void;
-	static var MAX_BUFFER_SIZE(default,never) : Int;
+	static final MAX_BUFFER_SIZE : Int;
 }
diff --git a/std/flash/ui/GameInputFinger.hx b/std/flash/ui/GameInputFinger.hx
index e5414e6d66337ecc159baf767f4a4257b212c213..52275fd9807ff57be626f04904457464a0869eb9 100644
--- a/std/flash/ui/GameInputFinger.hx
+++ b/std/flash/ui/GameInputFinger.hx
@@ -1,8 +1,8 @@
 package flash.ui;
 
-@:fakeEnum(String) extern enum GameInputFinger {
-	INDEX;
-	MIDDLE;
-	THUMB;
-	UNKNOWN;
+@:native("flash.ui.GameInputFinger") extern enum abstract GameInputFinger(String) {
+	var INDEX;
+	var MIDDLE;
+	var THUMB;
+	var UNKNOWN;
 }
diff --git a/std/flash/ui/GameInputHand.hx b/std/flash/ui/GameInputHand.hx
index 4f6a1a2b03b7719ede8dfec855960e08ad752feb..842286f2673c499bf51a3949d6885de448600cfa 100644
--- a/std/flash/ui/GameInputHand.hx
+++ b/std/flash/ui/GameInputHand.hx
@@ -1,7 +1,7 @@
 package flash.ui;
 
-@:fakeEnum(String) extern enum GameInputHand {
-	LEFT;
-	RIGHT;
-	UNKNOWN;
+@:native("flash.ui.GameInputHand") extern enum abstract GameInputHand(String) {
+	var LEFT;
+	var RIGHT;
+	var UNKNOWN;
 }
diff --git a/std/flash/ui/KeyLocation.hx b/std/flash/ui/KeyLocation.hx
index 10e015408fec27d7c97857e2bd80c3a7716c56ff..eac4a30dd8a11676b8ced7c76287c91246c0942c 100644
--- a/std/flash/ui/KeyLocation.hx
+++ b/std/flash/ui/KeyLocation.hx
@@ -1,9 +1,9 @@
 package flash.ui;
 
-@:fakeEnum(UInt) extern enum KeyLocation {
-	D_PAD;
-	LEFT;
-	NUM_PAD;
-	RIGHT;
-	STANDARD;
+@:native("flash.ui.KeyLocation") extern enum abstract KeyLocation(UInt) {
+	var D_PAD;
+	var LEFT;
+	var NUM_PAD;
+	var RIGHT;
+	var STANDARD;
 }
diff --git a/std/flash/ui/Keyboard.hx b/std/flash/ui/Keyboard.hx
index 4d78de55be505685e2c013b0aa6f3b64ee235ae3..e65f70e8b64a4c37c409dc79569ffe16b1470101 100644
--- a/std/flash/ui/Keyboard.hx
+++ b/std/flash/ui/Keyboard.hx
@@ -1,285 +1,291 @@
 package flash.ui;
 
 extern class Keyboard {
-	@:require(flash10_1) static var A(default,never) : UInt;
-	@:require(flash10_1) static var ALTERNATE(default,never) : UInt;
-	@:require(flash10_2) static var AUDIO(default,never) : UInt;
-	@:require(flash10_1) static var B(default,never) : UInt;
-	@:require(flash10_2) static var BACK(default,never) : UInt;
-	@:require(flash10_1) static var BACKQUOTE(default,never) : UInt;
-	@:require(flash10_1) static var BACKSLASH(default,never) : UInt;
-	static var BACKSPACE(default,never) : UInt;
-	@:require(flash10_2) static var BLUE(default,never) : UInt;
-	@:require(flash10_1) static var C(default,never) : UInt;
-	static var CAPS_LOCK(default,never) : UInt;
-	@:require(flash10_2) static var CHANNEL_DOWN(default,never) : UInt;
-	@:require(flash10_2) static var CHANNEL_UP(default,never) : UInt;
-	@:require(flash10_1) static var COMMA(default,never) : UInt;
-	@:require(flash10_1) static var COMMAND(default,never) : UInt;
-	static var CONTROL(default,never) : UInt;
-	@:require(flash10_1) static var CharCodeStrings(default,never) : Array<Dynamic>;
-	@:require(flash10_1) static var D(default,never) : UInt;
-	static var DELETE(default,never) : UInt;
-	static var DOWN(default,never) : UInt;
-	@:require(flash10_2) static var DVR(default,never) : UInt;
-	@:require(flash10_1) static var E(default,never) : UInt;
-	static var END(default,never) : UInt;
-	static var ENTER(default,never) : UInt;
-	@:require(flash10_1) static var EQUAL(default,never) : UInt;
-	static var ESCAPE(default,never) : UInt;
-	@:require(flash10_2) static var EXIT(default,never) : UInt;
-	@:require(flash10_1) static var F(default,never) : UInt;
-	static var F1(default,never) : UInt;
-	static var F10(default,never) : UInt;
-	static var F11(default,never) : UInt;
-	static var F12(default,never) : UInt;
-	static var F13(default,never) : UInt;
-	static var F14(default,never) : UInt;
-	static var F15(default,never) : UInt;
-	static var F2(default,never) : UInt;
-	static var F3(default,never) : UInt;
-	static var F4(default,never) : UInt;
-	static var F5(default,never) : UInt;
-	static var F6(default,never) : UInt;
-	static var F7(default,never) : UInt;
-	static var F8(default,never) : UInt;
-	static var F9(default,never) : UInt;
-	@:require(flash10_2) static var FAST_FORWARD(default,never) : UInt;
-	@:require(flash10_1) static var G(default,never) : UInt;
-	@:require(flash10_2) static var GREEN(default,never) : UInt;
-	@:require(flash10_2) static var GUIDE(default,never) : UInt;
-	@:require(flash10_1) static var H(default,never) : UInt;
-	@:require(flash10_2) static var HELP(default,never) : UInt;
-	static var HOME(default,never) : UInt;
-	@:require(flash10_1) static var I(default,never) : UInt;
-	@:require(flash10_2) static var INFO(default,never) : UInt;
-	@:require(flash10_2) static var INPUT(default,never) : UInt;
-	static var INSERT(default,never) : UInt;
-	@:require(flash10_1) static var J(default,never) : UInt;
-	@:require(flash10_1) static var K(default,never) : UInt;
-	@:require(flash10_1) static var KEYNAME_BEGIN(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_BREAK(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_CLEARDISPLAY(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_CLEARLINE(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_DELETE(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_DELETECHAR(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_DELETELINE(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_DOWNARROW(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_END(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_EXECUTE(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F1(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F10(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F11(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F12(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F13(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F14(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F15(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F16(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F17(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F18(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F19(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F2(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F20(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F21(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F22(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F23(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F24(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F25(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F26(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F27(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F28(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F29(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F3(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F30(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F31(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F32(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F33(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F34(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F35(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F4(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F5(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F6(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F7(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F8(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_F9(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_FIND(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_HELP(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_HOME(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_INSERT(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_INSERTCHAR(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_INSERTLINE(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_LEFTARROW(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_MENU(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_MODESWITCH(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_NEXT(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_PAGEDOWN(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_PAGEUP(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_PAUSE(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_PREV(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_PRINT(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_PRINTSCREEN(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_REDO(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_RESET(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_RIGHTARROW(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_SCROLLLOCK(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_SELECT(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_STOP(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_SYSREQ(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_SYSTEM(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_UNDO(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_UPARROW(default,never) : String;
-	@:require(flash10_1) static var KEYNAME_USER(default,never) : String;
-	@:require(flash10_1) static var L(default,never) : UInt;
-	@:require(flash10_2) static var LAST(default,never) : UInt;
-	static var LEFT(default,never) : UInt;
-	@:require(flash10_1) static var LEFTBRACKET(default,never) : UInt;
-	@:require(flash10_2) static var LIVE(default,never) : UInt;
-	@:require(flash10_1) static var M(default,never) : UInt;
-	@:require(flash10_2) static var MASTER_SHELL(default,never) : UInt;
-	@:require(flash10_2) static var MENU(default,never) : UInt;
-	@:require(flash10_1) static var MINUS(default,never) : UInt;
-	@:require(flash10_1) static var N(default,never) : UInt;
-	@:require(flash10_2) static var NEXT(default,never) : UInt;
-	@:require(flash10_1) static var NUMBER_0(default,never) : UInt;
-	@:require(flash10_1) static var NUMBER_1(default,never) : UInt;
-	@:require(flash10_1) static var NUMBER_2(default,never) : UInt;
-	@:require(flash10_1) static var NUMBER_3(default,never) : UInt;
-	@:require(flash10_1) static var NUMBER_4(default,never) : UInt;
-	@:require(flash10_1) static var NUMBER_5(default,never) : UInt;
-	@:require(flash10_1) static var NUMBER_6(default,never) : UInt;
-	@:require(flash10_1) static var NUMBER_7(default,never) : UInt;
-	@:require(flash10_1) static var NUMBER_8(default,never) : UInt;
-	@:require(flash10_1) static var NUMBER_9(default,never) : UInt;
-	@:require(flash10_1) static var NUMPAD(default,never) : UInt;
-	static var NUMPAD_0(default,never) : UInt;
-	static var NUMPAD_1(default,never) : UInt;
-	static var NUMPAD_2(default,never) : UInt;
-	static var NUMPAD_3(default,never) : UInt;
-	static var NUMPAD_4(default,never) : UInt;
-	static var NUMPAD_5(default,never) : UInt;
-	static var NUMPAD_6(default,never) : UInt;
-	static var NUMPAD_7(default,never) : UInt;
-	static var NUMPAD_8(default,never) : UInt;
-	static var NUMPAD_9(default,never) : UInt;
-	static var NUMPAD_ADD(default,never) : UInt;
-	static var NUMPAD_DECIMAL(default,never) : UInt;
-	static var NUMPAD_DIVIDE(default,never) : UInt;
-	static var NUMPAD_ENTER(default,never) : UInt;
-	static var NUMPAD_MULTIPLY(default,never) : UInt;
-	static var NUMPAD_SUBTRACT(default,never) : UInt;
-	@:require(flash10_1) static var O(default,never) : UInt;
-	@:require(flash10_1) static var P(default,never) : UInt;
-	static var PAGE_DOWN(default,never) : UInt;
-	static var PAGE_UP(default,never) : UInt;
-	@:require(flash10_2) static var PAUSE(default,never) : UInt;
-	@:require(flash10_1) static var PERIOD(default,never) : UInt;
-	@:require(flash10_2) static var PLAY(default,never) : UInt;
-	@:require(flash10_2) static var PREVIOUS(default,never) : UInt;
-	@:require(flash10_1) static var Q(default,never) : UInt;
-	@:require(flash10_1) static var QUOTE(default,never) : UInt;
-	@:require(flash10_1) static var R(default,never) : UInt;
-	@:require(flash10_2) static var RECORD(default,never) : UInt;
-	@:require(flash10_2) static var RED(default,never) : UInt;
-	@:require(flash10_2) static var REWIND(default,never) : UInt;
-	static var RIGHT(default,never) : UInt;
-	@:require(flash10_1) static var RIGHTBRACKET(default,never) : UInt;
-	@:require(flash10_1) static var S(default,never) : UInt;
-	@:require(flash10_2) static var SEARCH(default,never) : UInt;
-	@:require(flash10_1) static var SEMICOLON(default,never) : UInt;
-	@:require(flash10_2) static var SETUP(default,never) : UInt;
-	static var SHIFT(default,never) : UInt;
-	@:require(flash10_2) static var SKIP_BACKWARD(default,never) : UInt;
-	@:require(flash10_2) static var SKIP_FORWARD(default,never) : UInt;
-	@:require(flash10_1) static var SLASH(default,never) : UInt;
-	static var SPACE(default,never) : UInt;
-	@:require(flash10_2) static var STOP(default,never) : UInt;
-	@:require(flash10_1) static var STRING_BEGIN(default,never) : String;
-	@:require(flash10_1) static var STRING_BREAK(default,never) : String;
-	@:require(flash10_1) static var STRING_CLEARDISPLAY(default,never) : String;
-	@:require(flash10_1) static var STRING_CLEARLINE(default,never) : String;
-	@:require(flash10_1) static var STRING_DELETE(default,never) : String;
-	@:require(flash10_1) static var STRING_DELETECHAR(default,never) : String;
-	@:require(flash10_1) static var STRING_DELETELINE(default,never) : String;
-	@:require(flash10_1) static var STRING_DOWNARROW(default,never) : String;
-	@:require(flash10_1) static var STRING_END(default,never) : String;
-	@:require(flash10_1) static var STRING_EXECUTE(default,never) : String;
-	@:require(flash10_1) static var STRING_F1(default,never) : String;
-	@:require(flash10_1) static var STRING_F10(default,never) : String;
-	@:require(flash10_1) static var STRING_F11(default,never) : String;
-	@:require(flash10_1) static var STRING_F12(default,never) : String;
-	@:require(flash10_1) static var STRING_F13(default,never) : String;
-	@:require(flash10_1) static var STRING_F14(default,never) : String;
-	@:require(flash10_1) static var STRING_F15(default,never) : String;
-	@:require(flash10_1) static var STRING_F16(default,never) : String;
-	@:require(flash10_1) static var STRING_F17(default,never) : String;
-	@:require(flash10_1) static var STRING_F18(default,never) : String;
-	@:require(flash10_1) static var STRING_F19(default,never) : String;
-	@:require(flash10_1) static var STRING_F2(default,never) : String;
-	@:require(flash10_1) static var STRING_F20(default,never) : String;
-	@:require(flash10_1) static var STRING_F21(default,never) : String;
-	@:require(flash10_1) static var STRING_F22(default,never) : String;
-	@:require(flash10_1) static var STRING_F23(default,never) : String;
-	@:require(flash10_1) static var STRING_F24(default,never) : String;
-	@:require(flash10_1) static var STRING_F25(default,never) : String;
-	@:require(flash10_1) static var STRING_F26(default,never) : String;
-	@:require(flash10_1) static var STRING_F27(default,never) : String;
-	@:require(flash10_1) static var STRING_F28(default,never) : String;
-	@:require(flash10_1) static var STRING_F29(default,never) : String;
-	@:require(flash10_1) static var STRING_F3(default,never) : String;
-	@:require(flash10_1) static var STRING_F30(default,never) : String;
-	@:require(flash10_1) static var STRING_F31(default,never) : String;
-	@:require(flash10_1) static var STRING_F32(default,never) : String;
-	@:require(flash10_1) static var STRING_F33(default,never) : String;
-	@:require(flash10_1) static var STRING_F34(default,never) : String;
-	@:require(flash10_1) static var STRING_F35(default,never) : String;
-	@:require(flash10_1) static var STRING_F4(default,never) : String;
-	@:require(flash10_1) static var STRING_F5(default,never) : String;
-	@:require(flash10_1) static var STRING_F6(default,never) : String;
-	@:require(flash10_1) static var STRING_F7(default,never) : String;
-	@:require(flash10_1) static var STRING_F8(default,never) : String;
-	@:require(flash10_1) static var STRING_F9(default,never) : String;
-	@:require(flash10_1) static var STRING_FIND(default,never) : String;
-	@:require(flash10_1) static var STRING_HELP(default,never) : String;
-	@:require(flash10_1) static var STRING_HOME(default,never) : String;
-	@:require(flash10_1) static var STRING_INSERT(default,never) : String;
-	@:require(flash10_1) static var STRING_INSERTCHAR(default,never) : String;
-	@:require(flash10_1) static var STRING_INSERTLINE(default,never) : String;
-	@:require(flash10_1) static var STRING_LEFTARROW(default,never) : String;
-	@:require(flash10_1) static var STRING_MENU(default,never) : String;
-	@:require(flash10_1) static var STRING_MODESWITCH(default,never) : String;
-	@:require(flash10_1) static var STRING_NEXT(default,never) : String;
-	@:require(flash10_1) static var STRING_PAGEDOWN(default,never) : String;
-	@:require(flash10_1) static var STRING_PAGEUP(default,never) : String;
-	@:require(flash10_1) static var STRING_PAUSE(default,never) : String;
-	@:require(flash10_1) static var STRING_PREV(default,never) : String;
-	@:require(flash10_1) static var STRING_PRINT(default,never) : String;
-	@:require(flash10_1) static var STRING_PRINTSCREEN(default,never) : String;
-	@:require(flash10_1) static var STRING_REDO(default,never) : String;
-	@:require(flash10_1) static var STRING_RESET(default,never) : String;
-	@:require(flash10_1) static var STRING_RIGHTARROW(default,never) : String;
-	@:require(flash10_1) static var STRING_SCROLLLOCK(default,never) : String;
-	@:require(flash10_1) static var STRING_SELECT(default,never) : String;
-	@:require(flash10_1) static var STRING_STOP(default,never) : String;
-	@:require(flash10_1) static var STRING_SYSREQ(default,never) : String;
-	@:require(flash10_1) static var STRING_SYSTEM(default,never) : String;
-	@:require(flash10_1) static var STRING_UNDO(default,never) : String;
-	@:require(flash10_1) static var STRING_UPARROW(default,never) : String;
-	@:require(flash10_1) static var STRING_USER(default,never) : String;
-	@:require(flash10_2) static var SUBTITLE(default,never) : UInt;
-	@:require(flash10_1) static var T(default,never) : UInt;
-	static var TAB(default,never) : UInt;
-	@:require(flash10_1) static var U(default,never) : UInt;
-	static var UP(default,never) : UInt;
-	@:require(flash10_1) static var V(default,never) : UInt;
-	@:require(flash10_2) static var VOD(default,never) : UInt;
-	@:require(flash10_1) static var W(default,never) : UInt;
-	@:require(flash10_1) static var X(default,never) : UInt;
-	@:require(flash10_1) static var Y(default,never) : UInt;
-	@:require(flash10_2) static var YELLOW(default,never) : UInt;
-	@:require(flash10_1) static var Z(default,never) : UInt;
-	static var capsLock(default,never) : Bool;
-	@:require(flash10_1) static var hasVirtualKeyboard(default,never) : Bool;
-	static var numLock(default,never) : Bool;
-	@:require(flash10_1) static var physicalKeyboardType(default,never) : KeyboardType;
+	@:require(flash10_1) static final A : UInt;
+	@:require(flash10_1) static final ALTERNATE : UInt;
+	@:require(flash10_2) static final AUDIO : UInt;
+	@:require(flash10_1) static final B : UInt;
+	@:require(flash10_2) static final BACK : UInt;
+	@:require(flash10_1) static final BACKQUOTE : UInt;
+	@:require(flash10_1) static final BACKSLASH : UInt;
+	static final BACKSPACE : UInt;
+	@:require(flash10_2) static final BLUE : UInt;
+	@:require(flash10_1) static final C : UInt;
+	static final CAPS_LOCK : UInt;
+	@:require(flash10_2) static final CHANNEL_DOWN : UInt;
+	@:require(flash10_2) static final CHANNEL_UP : UInt;
+	@:require(flash10_1) static final COMMA : UInt;
+	@:require(flash10_1) static final COMMAND : UInt;
+	static final CONTROL : UInt;
+	@:require(flash10_1) static final CharCodeStrings : Array<Dynamic>;
+	@:require(flash10_1) static final D : UInt;
+	static final DELETE : UInt;
+	static final DOWN : UInt;
+	@:require(flash10_2) static final DVR : UInt;
+	@:require(flash10_1) static final E : UInt;
+	static final END : UInt;
+	static final ENTER : UInt;
+	@:require(flash10_1) static final EQUAL : UInt;
+	static final ESCAPE : UInt;
+	@:require(flash10_2) static final EXIT : UInt;
+	@:require(flash10_1) static final F : UInt;
+	static final F1 : UInt;
+	static final F10 : UInt;
+	static final F11 : UInt;
+	static final F12 : UInt;
+	static final F13 : UInt;
+	static final F14 : UInt;
+	static final F15 : UInt;
+	static final F2 : UInt;
+	static final F3 : UInt;
+	static final F4 : UInt;
+	static final F5 : UInt;
+	static final F6 : UInt;
+	static final F7 : UInt;
+	static final F8 : UInt;
+	static final F9 : UInt;
+	@:require(flash10_2) static final FAST_FORWARD : UInt;
+	@:require(flash10_1) static final G : UInt;
+	@:require(flash10_2) static final GREEN : UInt;
+	@:require(flash10_2) static final GUIDE : UInt;
+	@:require(flash10_1) static final H : UInt;
+	@:require(flash10_2) static final HELP : UInt;
+	static final HOME : UInt;
+	@:require(flash10_1) static final I : UInt;
+	@:require(flash10_2) static final INFO : UInt;
+	@:require(flash10_2) static final INPUT : UInt;
+	static final INSERT : UInt;
+	@:require(flash10_1) static final J : UInt;
+	@:require(flash10_1) static final K : UInt;
+	@:require(flash10_1) static final KEYNAME_BEGIN : String;
+	@:require(flash10_1) static final KEYNAME_BREAK : String;
+	@:require(flash10_1) static final KEYNAME_CLEARDISPLAY : String;
+	@:require(flash10_1) static final KEYNAME_CLEARLINE : String;
+	@:require(flash10_1) static final KEYNAME_DELETE : String;
+	@:require(flash10_1) static final KEYNAME_DELETECHAR : String;
+	@:require(flash10_1) static final KEYNAME_DELETELINE : String;
+	@:require(flash10_1) static final KEYNAME_DOWNARROW : String;
+	@:require(flash10_1) static final KEYNAME_END : String;
+	@:require(flash10_1) static final KEYNAME_EXECUTE : String;
+	@:require(flash10_1) static final KEYNAME_F1 : String;
+	@:require(flash10_1) static final KEYNAME_F10 : String;
+	@:require(flash10_1) static final KEYNAME_F11 : String;
+	@:require(flash10_1) static final KEYNAME_F12 : String;
+	@:require(flash10_1) static final KEYNAME_F13 : String;
+	@:require(flash10_1) static final KEYNAME_F14 : String;
+	@:require(flash10_1) static final KEYNAME_F15 : String;
+	@:require(flash10_1) static final KEYNAME_F16 : String;
+	@:require(flash10_1) static final KEYNAME_F17 : String;
+	@:require(flash10_1) static final KEYNAME_F18 : String;
+	@:require(flash10_1) static final KEYNAME_F19 : String;
+	@:require(flash10_1) static final KEYNAME_F2 : String;
+	@:require(flash10_1) static final KEYNAME_F20 : String;
+	@:require(flash10_1) static final KEYNAME_F21 : String;
+	@:require(flash10_1) static final KEYNAME_F22 : String;
+	@:require(flash10_1) static final KEYNAME_F23 : String;
+	@:require(flash10_1) static final KEYNAME_F24 : String;
+	@:require(flash10_1) static final KEYNAME_F25 : String;
+	@:require(flash10_1) static final KEYNAME_F26 : String;
+	@:require(flash10_1) static final KEYNAME_F27 : String;
+	@:require(flash10_1) static final KEYNAME_F28 : String;
+	@:require(flash10_1) static final KEYNAME_F29 : String;
+	@:require(flash10_1) static final KEYNAME_F3 : String;
+	@:require(flash10_1) static final KEYNAME_F30 : String;
+	@:require(flash10_1) static final KEYNAME_F31 : String;
+	@:require(flash10_1) static final KEYNAME_F32 : String;
+	@:require(flash10_1) static final KEYNAME_F33 : String;
+	@:require(flash10_1) static final KEYNAME_F34 : String;
+	@:require(flash10_1) static final KEYNAME_F35 : String;
+	@:require(flash10_1) static final KEYNAME_F4 : String;
+	@:require(flash10_1) static final KEYNAME_F5 : String;
+	@:require(flash10_1) static final KEYNAME_F6 : String;
+	@:require(flash10_1) static final KEYNAME_F7 : String;
+	@:require(flash10_1) static final KEYNAME_F8 : String;
+	@:require(flash10_1) static final KEYNAME_F9 : String;
+	@:require(flash10_1) static final KEYNAME_FIND : String;
+	@:require(flash10_1) static final KEYNAME_HELP : String;
+	@:require(flash10_1) static final KEYNAME_HOME : String;
+	@:require(flash10_1) static final KEYNAME_INSERT : String;
+	@:require(flash10_1) static final KEYNAME_INSERTCHAR : String;
+	@:require(flash10_1) static final KEYNAME_INSERTLINE : String;
+	@:require(flash10_1) static final KEYNAME_LEFTARROW : String;
+	@:require(flash10_1) static final KEYNAME_MENU : String;
+	@:require(flash10_1) static final KEYNAME_MODESWITCH : String;
+	@:require(flash10_1) static final KEYNAME_NEXT : String;
+	@:require(flash10_1) static final KEYNAME_PAGEDOWN : String;
+	@:require(flash10_1) static final KEYNAME_PAGEUP : String;
+	@:require(flash10_1) static final KEYNAME_PAUSE : String;
+	static final KEYNAME_PLAYPAUSE : String;
+	@:require(flash10_1) static final KEYNAME_PREV : String;
+	@:require(flash10_1) static final KEYNAME_PRINT : String;
+	@:require(flash10_1) static final KEYNAME_PRINTSCREEN : String;
+	@:require(flash10_1) static final KEYNAME_REDO : String;
+	@:require(flash10_1) static final KEYNAME_RESET : String;
+	@:require(flash10_1) static final KEYNAME_RIGHTARROW : String;
+	@:require(flash10_1) static final KEYNAME_SCROLLLOCK : String;
+	@:require(flash10_1) static final KEYNAME_SELECT : String;
+	@:require(flash10_1) static final KEYNAME_STOP : String;
+	@:require(flash10_1) static final KEYNAME_SYSREQ : String;
+	@:require(flash10_1) static final KEYNAME_SYSTEM : String;
+	@:require(flash10_1) static final KEYNAME_UNDO : String;
+	@:require(flash10_1) static final KEYNAME_UPARROW : String;
+	@:require(flash10_1) static final KEYNAME_USER : String;
+	@:require(flash10_1) static final L : UInt;
+	@:require(flash10_2) static final LAST : UInt;
+	static final LEFT : UInt;
+	@:require(flash10_1) static final LEFTBRACKET : UInt;
+	@:require(flash10_2) static final LIVE : UInt;
+	@:require(flash10_1) static final M : UInt;
+	@:require(flash10_2) static final MASTER_SHELL : UInt;
+	@:require(flash10_2) static final MENU : UInt;
+	@:require(flash10_1) static final MINUS : UInt;
+	@:require(flash10_1) static final N : UInt;
+	@:require(flash10_2) static final NEXT : UInt;
+	@:require(flash10_1) static final NUMBER_0 : UInt;
+	@:require(flash10_1) static final NUMBER_1 : UInt;
+	@:require(flash10_1) static final NUMBER_2 : UInt;
+	@:require(flash10_1) static final NUMBER_3 : UInt;
+	@:require(flash10_1) static final NUMBER_4 : UInt;
+	@:require(flash10_1) static final NUMBER_5 : UInt;
+	@:require(flash10_1) static final NUMBER_6 : UInt;
+	@:require(flash10_1) static final NUMBER_7 : UInt;
+	@:require(flash10_1) static final NUMBER_8 : UInt;
+	@:require(flash10_1) static final NUMBER_9 : UInt;
+	@:require(flash10_1) static final NUMPAD : UInt;
+	static final NUMPAD_0 : UInt;
+	static final NUMPAD_1 : UInt;
+	static final NUMPAD_2 : UInt;
+	static final NUMPAD_3 : UInt;
+	static final NUMPAD_4 : UInt;
+	static final NUMPAD_5 : UInt;
+	static final NUMPAD_6 : UInt;
+	static final NUMPAD_7 : UInt;
+	static final NUMPAD_8 : UInt;
+	static final NUMPAD_9 : UInt;
+	static final NUMPAD_ADD : UInt;
+	static final NUMPAD_DECIMAL : UInt;
+	static final NUMPAD_DIVIDE : UInt;
+	static final NUMPAD_ENTER : UInt;
+	static final NUMPAD_MULTIPLY : UInt;
+	static final NUMPAD_SUBTRACT : UInt;
+	@:require(flash10_1) static final O : UInt;
+	@:require(flash10_1) static final P : UInt;
+	static final PAGE_DOWN : UInt;
+	static final PAGE_UP : UInt;
+	@:require(flash10_2) static final PAUSE : UInt;
+	@:require(flash10_1) static final PERIOD : UInt;
+	@:require(flash10_2) static final PLAY : UInt;
+	static final PLAY_PAUSE : UInt;
+	@:require(flash10_2) static final PREVIOUS : UInt;
+	@:require(flash10_1) static final Q : UInt;
+	@:require(flash10_1) static final QUOTE : UInt;
+	@:require(flash10_1) static final R : UInt;
+	@:require(flash10_2) static final RECORD : UInt;
+	@:require(flash10_2) static final RED : UInt;
+	@:require(flash10_2) static final REWIND : UInt;
+	static final RIGHT : UInt;
+	@:require(flash10_1) static final RIGHTBRACKET : UInt;
+	@:require(flash10_1) static final S : UInt;
+	@:require(flash10_2) static final SEARCH : UInt;
+	@:require(flash10_1) static final SEMICOLON : UInt;
+	@:require(flash10_2) static final SETUP : UInt;
+	static final SHIFT : UInt;
+	@:require(flash10_2) static final SKIP_BACKWARD : UInt;
+	@:require(flash10_2) static final SKIP_FORWARD : UInt;
+	@:require(flash10_1) static final SLASH : UInt;
+	static final SPACE : UInt;
+	@:require(flash10_2) static final STOP : UInt;
+	@:require(flash10_1) static final STRING_BEGIN : String;
+	@:require(flash10_1) static final STRING_BREAK : String;
+	@:require(flash10_1) static final STRING_CLEARDISPLAY : String;
+	@:require(flash10_1) static final STRING_CLEARLINE : String;
+	@:require(flash10_1) static final STRING_DELETE : String;
+	@:require(flash10_1) static final STRING_DELETECHAR : String;
+	@:require(flash10_1) static final STRING_DELETELINE : String;
+	@:require(flash10_1) static final STRING_DOWNARROW : String;
+	@:require(flash10_1) static final STRING_END : String;
+	@:require(flash10_1) static final STRING_EXECUTE : String;
+	@:require(flash10_1) static final STRING_F1 : String;
+	@:require(flash10_1) static final STRING_F10 : String;
+	@:require(flash10_1) static final STRING_F11 : String;
+	@:require(flash10_1) static final STRING_F12 : String;
+	@:require(flash10_1) static final STRING_F13 : String;
+	@:require(flash10_1) static final STRING_F14 : String;
+	@:require(flash10_1) static final STRING_F15 : String;
+	@:require(flash10_1) static final STRING_F16 : String;
+	@:require(flash10_1) static final STRING_F17 : String;
+	@:require(flash10_1) static final STRING_F18 : String;
+	@:require(flash10_1) static final STRING_F19 : String;
+	@:require(flash10_1) static final STRING_F2 : String;
+	@:require(flash10_1) static final STRING_F20 : String;
+	@:require(flash10_1) static final STRING_F21 : String;
+	@:require(flash10_1) static final STRING_F22 : String;
+	@:require(flash10_1) static final STRING_F23 : String;
+	@:require(flash10_1) static final STRING_F24 : String;
+	@:require(flash10_1) static final STRING_F25 : String;
+	@:require(flash10_1) static final STRING_F26 : String;
+	@:require(flash10_1) static final STRING_F27 : String;
+	@:require(flash10_1) static final STRING_F28 : String;
+	@:require(flash10_1) static final STRING_F29 : String;
+	@:require(flash10_1) static final STRING_F3 : String;
+	@:require(flash10_1) static final STRING_F30 : String;
+	@:require(flash10_1) static final STRING_F31 : String;
+	@:require(flash10_1) static final STRING_F32 : String;
+	@:require(flash10_1) static final STRING_F33 : String;
+	@:require(flash10_1) static final STRING_F34 : String;
+	@:require(flash10_1) static final STRING_F35 : String;
+	@:require(flash10_1) static final STRING_F4 : String;
+	@:require(flash10_1) static final STRING_F5 : String;
+	@:require(flash10_1) static final STRING_F6 : String;
+	@:require(flash10_1) static final STRING_F7 : String;
+	@:require(flash10_1) static final STRING_F8 : String;
+	@:require(flash10_1) static final STRING_F9 : String;
+	@:require(flash10_1) static final STRING_FIND : String;
+	@:require(flash10_1) static final STRING_HELP : String;
+	@:require(flash10_1) static final STRING_HOME : String;
+	@:require(flash10_1) static final STRING_INSERT : String;
+	@:require(flash10_1) static final STRING_INSERTCHAR : String;
+	@:require(flash10_1) static final STRING_INSERTLINE : String;
+	@:require(flash10_1) static final STRING_LEFTARROW : String;
+	@:require(flash10_1) static final STRING_MENU : String;
+	@:require(flash10_1) static final STRING_MODESWITCH : String;
+	@:require(flash10_1) static final STRING_NEXT : String;
+	@:require(flash10_1) static final STRING_PAGEDOWN : String;
+	@:require(flash10_1) static final STRING_PAGEUP : String;
+	@:require(flash10_1) static final STRING_PAUSE : String;
+	@:require(flash10_1) static final STRING_PREV : String;
+	@:require(flash10_1) static final STRING_PRINT : String;
+	@:require(flash10_1) static final STRING_PRINTSCREEN : String;
+	@:require(flash10_1) static final STRING_REDO : String;
+	@:require(flash10_1) static final STRING_RESET : String;
+	@:require(flash10_1) static final STRING_RIGHTARROW : String;
+	@:require(flash10_1) static final STRING_SCROLLLOCK : String;
+	@:require(flash10_1) static final STRING_SELECT : String;
+	@:require(flash10_1) static final STRING_STOP : String;
+	@:require(flash10_1) static final STRING_SYSREQ : String;
+	@:require(flash10_1) static final STRING_SYSTEM : String;
+	@:require(flash10_1) static final STRING_UNDO : String;
+	@:require(flash10_1) static final STRING_UPARROW : String;
+	@:require(flash10_1) static final STRING_USER : String;
+	@:require(flash10_2) static final SUBTITLE : UInt;
+	@:require(flash10_1) static final T : UInt;
+	static final TAB : UInt;
+	@:require(flash10_1) static final U : UInt;
+	static final UP : UInt;
+	@:require(flash10_1) static final V : UInt;
+	@:require(flash10_2) static final VOD : UInt;
+	@:require(flash10_1) static final W : UInt;
+	@:require(flash10_1) static final X : UInt;
+	@:require(flash10_1) static final Y : UInt;
+	@:require(flash10_2) static final YELLOW : UInt;
+	@:require(flash10_1) static final Z : UInt;
+	@:flash.property static var capsLock(get,never) : Bool;
+	@:flash.property @:require(flash10_1) static var hasVirtualKeyboard(get,never) : Bool;
+	@:flash.property static var numLock(get,never) : Bool;
+	@:flash.property @:require(flash10_1) static var physicalKeyboardType(get,never) : KeyboardType;
+	private static function get_capsLock() : Bool;
+	private static function get_hasVirtualKeyboard() : Bool;
+	private static function get_numLock() : Bool;
+	private static function get_physicalKeyboardType() : KeyboardType;
 	static function isAccessible() : Bool;
 }
diff --git a/std/flash/ui/KeyboardType.hx b/std/flash/ui/KeyboardType.hx
index 1da12b81f2bb6bfea7f66bcbbb9eb53e9dc9dc0e..f2a589a5c742fac2618a28f65682b397362ae980 100644
--- a/std/flash/ui/KeyboardType.hx
+++ b/std/flash/ui/KeyboardType.hx
@@ -1,7 +1,7 @@
 package flash.ui;
 
-@:fakeEnum(String) extern enum KeyboardType {
-	ALPHANUMERIC;
-	KEYPAD;
-	NONE;
+@:native("flash.ui.KeyboardType") extern enum abstract KeyboardType(String) {
+	var ALPHANUMERIC;
+	var KEYPAD;
+	var NONE;
 }
diff --git a/std/flash/ui/Mouse.hx b/std/flash/ui/Mouse.hx
index e9070a8e9653fae9b5c9f3f915731c5cf96a4f31..18aac659f4a3cb95bb08be502f4e1b2ad5f57b41 100644
--- a/std/flash/ui/Mouse.hx
+++ b/std/flash/ui/Mouse.hx
@@ -1,11 +1,15 @@
 package flash.ui;
 
 extern class Mouse {
-	@:require(flash10) static var cursor : Dynamic;
-	@:require(flash10_1) static var supportsCursor(default,never) : Bool;
-	@:require(flash11) static var supportsNativeCursor(default,never) : Bool;
+	@:flash.property @:require(flash10) static var cursor(get,set) : Dynamic;
+	@:flash.property @:require(flash10_1) static var supportsCursor(get,never) : Bool;
+	@:flash.property @:require(flash11) static var supportsNativeCursor(get,never) : Bool;
+	private static function get_cursor() : Dynamic;
+	private static function get_supportsCursor() : Bool;
+	private static function get_supportsNativeCursor() : Bool;
 	static function hide() : Void;
 	@:require(flash10_2) static function registerCursor(name : String, cursor : MouseCursorData) : Void;
+	private static function set_cursor(value : Dynamic) : Dynamic;
 	static function show() : Void;
 	@:require(flash11) static function unregisterCursor(name : String) : Void;
 }
diff --git a/std/flash/ui/MouseCursor.hx b/std/flash/ui/MouseCursor.hx
index b5e62e6c5eab693a9b12560cd47fb2224edfa8d2..93bd0cc333ba425a8a4e0d466cd10f538e5fb76a 100644
--- a/std/flash/ui/MouseCursor.hx
+++ b/std/flash/ui/MouseCursor.hx
@@ -1,9 +1,9 @@
 package flash.ui;
 
 extern class MouseCursor {
-	static var ARROW(default,never) : String;
-	static var AUTO(default,never) : String;
-	static var BUTTON(default,never) : String;
-	static var HAND(default,never) : String;
-	static var IBEAM(default,never) : String;
+	static final ARROW : String;
+	static final AUTO : String;
+	static final BUTTON : String;
+	static final HAND : String;
+	static final IBEAM : String;
 }
diff --git a/std/flash/ui/MouseCursorData.hx b/std/flash/ui/MouseCursorData.hx
index f832e403ddc600e425e41f5483f467dc6d034954..93f4db871eb895227f147d7f880f40f38ddf5e6d 100644
--- a/std/flash/ui/MouseCursorData.hx
+++ b/std/flash/ui/MouseCursorData.hx
@@ -1,8 +1,14 @@
 package flash.ui;
 
-@:final @:require(flash10_2) extern class MouseCursorData {
-	var data : flash.Vector<flash.display.BitmapData>;
-	var frameRate : Float;
-	var hotSpot : flash.geom.Point;
+@:require(flash10_2) extern final class MouseCursorData {
+	@:flash.property var data(get,set) : flash.Vector<flash.display.BitmapData>;
+	@:flash.property var frameRate(get,set) : Float;
+	@:flash.property var hotSpot(get,set) : flash.geom.Point;
 	function new() : Void;
+	private function get_data() : flash.Vector<flash.display.BitmapData>;
+	private function get_frameRate() : Float;
+	private function get_hotSpot() : flash.geom.Point;
+	private function set_data(value : flash.Vector<flash.display.BitmapData>) : flash.Vector<flash.display.BitmapData>;
+	private function set_frameRate(value : Float) : Float;
+	private function set_hotSpot(value : flash.geom.Point) : flash.geom.Point;
 }
diff --git a/std/flash/ui/Multitouch.hx b/std/flash/ui/Multitouch.hx
index c1ae7018d213f88b42d93d3cbdb553cd2141b446..6cfa29f0d07d43c4239b72fd70cdbf78a80217de 100644
--- a/std/flash/ui/Multitouch.hx
+++ b/std/flash/ui/Multitouch.hx
@@ -1,10 +1,18 @@
 package flash.ui;
 
 @:require(flash10_1) extern class Multitouch {
-	static var inputMode : MultitouchInputMode;
-	static var mapTouchToMouse : Bool;
-	static var maxTouchPoints(default,never) : Int;
-	static var supportedGestures(default,never) : flash.Vector<String>;
-	static var supportsGestureEvents(default,never) : Bool;
-	static var supportsTouchEvents(default,never) : Bool;
+	@:flash.property static var inputMode(get,set) : MultitouchInputMode;
+	@:flash.property static var mapTouchToMouse(get,set) : Bool;
+	@:flash.property static var maxTouchPoints(get,never) : Int;
+	@:flash.property static var supportedGestures(get,never) : flash.Vector<String>;
+	@:flash.property static var supportsGestureEvents(get,never) : Bool;
+	@:flash.property static var supportsTouchEvents(get,never) : Bool;
+	private static function get_inputMode() : MultitouchInputMode;
+	private static function get_mapTouchToMouse() : Bool;
+	private static function get_maxTouchPoints() : Int;
+	private static function get_supportedGestures() : flash.Vector<String>;
+	private static function get_supportsGestureEvents() : Bool;
+	private static function get_supportsTouchEvents() : Bool;
+	private static function set_inputMode(value : MultitouchInputMode) : MultitouchInputMode;
+	private static function set_mapTouchToMouse(value : Bool) : Bool;
 }
diff --git a/std/flash/ui/MultitouchInputMode.hx b/std/flash/ui/MultitouchInputMode.hx
index eb4aae5d72e1b52564dd53bc025b589a25b26cea..29cdf5258bf93e4c5c4d1258aae36b0b7f63aa63 100644
--- a/std/flash/ui/MultitouchInputMode.hx
+++ b/std/flash/ui/MultitouchInputMode.hx
@@ -1,7 +1,7 @@
 package flash.ui;
 
-@:fakeEnum(String) @:require(flash10_1) extern enum MultitouchInputMode {
-	GESTURE;
-	NONE;
-	TOUCH_POINT;
+@:native("flash.ui.MultitouchInputMode") @:require(flash10_1) extern enum abstract MultitouchInputMode(String) {
+	var GESTURE;
+	var NONE;
+	var TOUCH_POINT;
 }
diff --git a/std/flash/utils/ByteArray.hx b/std/flash/utils/ByteArray.hx
index f9008156ff99cb8872a529460251e5bcc32373ed..866b611498d5845c65200d3885c08ec94a0bcfe2 100644
--- a/std/flash/utils/ByteArray.hx
+++ b/std/flash/utils/ByteArray.hx
@@ -1,18 +1,24 @@
 package flash.utils;
 
 extern class ByteArray implements IDataOutput2 implements IDataInput2 implements ArrayAccess<Int> {
-	var bytesAvailable(default,never) : UInt;
-	var endian : Endian;
-	var length : UInt;
-	var objectEncoding : UInt;
-	var position : UInt;
-	@:require(flash11_4) var shareable : Bool;
+	@:flash.property var bytesAvailable(get,never) : UInt;
+	@:flash.property var endian(get,set) : Endian;
+	@:flash.property var length(get,set) : UInt;
+	@:flash.property var objectEncoding(get,set) : UInt;
+	@:flash.property var position(get,set) : UInt;
+	@:flash.property @:require(flash11_4) var shareable(get,set) : Bool;
 	function new() : Void;
 	@:require(flash11_4) function atomicCompareAndSwapIntAt(byteIndex : Int, expectedValue : Int, newValue : Int) : Int;
 	@:require(flash11_4) function atomicCompareAndSwapLength(expectedLength : Int, newLength : Int) : Int;
 	@:require(flash10) function clear() : Void;
 	function compress(?algorithm : CompressionAlgorithm) : Void;
 	@:require(flash10) function deflate() : Void;
+	private function get_bytesAvailable() : UInt;
+	private function get_endian() : Endian;
+	private function get_length() : UInt;
+	private function get_objectEncoding() : UInt;
+	private function get_position() : UInt;
+	private function get_shareable() : Bool;
 	@:require(flash10) function inflate() : Void;
 	function readBoolean() : Bool;
 	function readByte() : Int;
@@ -28,6 +34,11 @@ extern class ByteArray implements IDataOutput2 implements IDataInput2 implements
 	function readUnsignedByte() : UInt;
 	function readUnsignedInt() : UInt;
 	function readUnsignedShort() : UInt;
+	private function set_endian(value : Endian) : Endian;
+	private function set_length(value : UInt) : UInt;
+	private function set_objectEncoding(value : UInt) : UInt;
+	private function set_position(value : UInt) : UInt;
+	private function set_shareable(value : Bool) : Bool;
 	function toString() : String;
 	function uncompress(?algorithm : CompressionAlgorithm) : Void;
 	function writeBoolean(value : Bool) : Void;
@@ -42,5 +53,7 @@ extern class ByteArray implements IDataOutput2 implements IDataInput2 implements
 	function writeUTF(value : String) : Void;
 	function writeUTFBytes(value : String) : Void;
 	function writeUnsignedInt(value : UInt) : Void;
-	static var defaultObjectEncoding : UInt;
+	@:flash.property static var defaultObjectEncoding(get,set) : UInt;
+	private static function get_defaultObjectEncoding() : UInt;
+	private static function set_defaultObjectEncoding(value : UInt) : UInt;
 }
diff --git a/std/flash/utils/CompressionAlgorithm.hx b/std/flash/utils/CompressionAlgorithm.hx
index 5f22bdc8210c800de7ef1f9b016165cc4f1d79c1..b2057a7236aa6c8f278dd546bda3f4a0895df12a 100644
--- a/std/flash/utils/CompressionAlgorithm.hx
+++ b/std/flash/utils/CompressionAlgorithm.hx
@@ -1,7 +1,7 @@
 package flash.utils;
 
-@:fakeEnum(String) @:require(flash11) extern enum CompressionAlgorithm {
-	DEFLATE;
-	LZMA;
-	ZLIB;
+@:native("flash.utils.CompressionAlgorithm") @:require(flash11) extern enum abstract CompressionAlgorithm(String) {
+	var DEFLATE;
+	var LZMA;
+	var ZLIB;
 }
diff --git a/std/flash/utils/Endian.hx b/std/flash/utils/Endian.hx
index 59ca426208c5255a0a7b29ef1fa18e2f76040203..9378bc480a437b512882125c8419913eedef9f13 100644
--- a/std/flash/utils/Endian.hx
+++ b/std/flash/utils/Endian.hx
@@ -1,6 +1,6 @@
 package flash.utils;
 
-@:fakeEnum(String) extern enum Endian {
-	BIG_ENDIAN;
-	LITTLE_ENDIAN;
+@:native("flash.utils.Endian") extern enum abstract Endian(String) {
+	var BIG_ENDIAN;
+	var LITTLE_ENDIAN;
 }
diff --git a/std/flash/utils/IDataInput.hx b/std/flash/utils/IDataInput.hx
index 0f51a1c1bd04d0a3f00cfd5af8c9804228929ebd..e60c2c36cde1f6d949dbf3a885ebe5c74b8bbc1d 100644
--- a/std/flash/utils/IDataInput.hx
+++ b/std/flash/utils/IDataInput.hx
@@ -1,9 +1,12 @@
 package flash.utils;
 
 extern interface IDataInput {
-	var bytesAvailable(default,never) : UInt;
-	var endian : Endian;
-	var objectEncoding : UInt;
+	@:flash.property var bytesAvailable(get,never) : UInt;
+	@:flash.property var endian(get,set) : Endian;
+	@:flash.property var objectEncoding(get,set) : UInt;
+	private function get_bytesAvailable() : UInt;
+	private function get_endian() : Endian;
+	private function get_objectEncoding() : UInt;
 	function readBoolean() : Bool;
 	function readByte() : Int;
 	function readBytes(bytes : ByteArray, offset : UInt = 0, length : UInt = 0) : Void;
@@ -18,4 +21,6 @@ extern interface IDataInput {
 	function readUnsignedByte() : UInt;
 	function readUnsignedInt() : UInt;
 	function readUnsignedShort() : UInt;
+	private function set_endian(value : Endian) : Endian;
+	private function set_objectEncoding(value : UInt) : UInt;
 }
diff --git a/std/flash/utils/IDataOutput.hx b/std/flash/utils/IDataOutput.hx
index 53b3bbb909f5a1161940f46399d1049807957cec..c5db43289ba51c84cdf9f6943556476de5f4d76c 100644
--- a/std/flash/utils/IDataOutput.hx
+++ b/std/flash/utils/IDataOutput.hx
@@ -1,8 +1,12 @@
 package flash.utils;
 
 extern interface IDataOutput {
-	var endian : Endian;
-	var objectEncoding : UInt;
+	@:flash.property var endian(get,set) : Endian;
+	@:flash.property var objectEncoding(get,set) : UInt;
+	private function get_endian() : Endian;
+	private function get_objectEncoding() : UInt;
+	private function set_endian(value : Endian) : Endian;
+	private function set_objectEncoding(value : UInt) : UInt;
 	function writeBoolean(value : Bool) : Void;
 	function writeByte(value : Int) : Void;
 	function writeBytes(bytes : ByteArray, offset : UInt = 0, length : UInt = 0) : Void;
diff --git a/std/flash/utils/Namespace.hx b/std/flash/utils/Namespace.hx
index 8531ba908d30bc5da683c22952a8272c37e7a382..ea08b6704462d6b2a8a28a0efd999340b92d261f 100644
--- a/std/flash/utils/Namespace.hx
+++ b/std/flash/utils/Namespace.hx
@@ -1,7 +1,9 @@
 package flash.utils;
 
-@:final extern class Namespace {
-	var prefix(default,never) : Dynamic;
-	var uri(default,never) : String;
+extern final class Namespace {
+	@:flash.property var prefix(get,never) : Dynamic;
+	@:flash.property var uri(get,never) : String;
 	function new(?prefix : Dynamic, ?uri : Dynamic) : Void;
+	private function get_prefix() : Dynamic;
+	private function get_uri() : String;
 }
diff --git a/std/flash/utils/Object.hx b/std/flash/utils/Object.hx
index 39b10eafa5262ba62c816947e1f9c5e87b78d550..94f153cfbadcbfbb2ab4a5e8d7a6eeb1c952216d 100644
--- a/std/flash/utils/Object.hx
+++ b/std/flash/utils/Object.hx
@@ -1,3 +1,4 @@
 package flash.utils;
 
-typedef Object = Dynamic
+@:coreType @:runtimeValue
+abstract Object from Dynamic to Dynamic {}
diff --git a/std/flash/utils/ObjectInput.hx b/std/flash/utils/ObjectInput.hx
index 871a009e540e1be6e48deb24467045d62a9bc56d..b2620be710dcb0597b71892a0ce61d4f9071cd48 100644
--- a/std/flash/utils/ObjectInput.hx
+++ b/std/flash/utils/ObjectInput.hx
@@ -1,10 +1,13 @@
 package flash.utils;
 
 extern class ObjectInput implements IDataInput {
-	var bytesAvailable(default,never) : UInt;
-	var endian : Endian;
-	var objectEncoding : UInt;
+	@:flash.property var bytesAvailable(get,never) : UInt;
+	@:flash.property var endian(get,set) : Endian;
+	@:flash.property var objectEncoding(get,set) : UInt;
 	function new() : Void;
+	private function get_bytesAvailable() : UInt;
+	private function get_endian() : Endian;
+	private function get_objectEncoding() : UInt;
 	function readBoolean() : Bool;
 	function readByte() : Int;
 	function readBytes(bytes : ByteArray, offset : UInt = 0, length : UInt = 0) : Void;
@@ -19,4 +22,6 @@ extern class ObjectInput implements IDataInput {
 	function readUnsignedByte() : UInt;
 	function readUnsignedInt() : UInt;
 	function readUnsignedShort() : UInt;
+	private function set_endian(value : Endian) : Endian;
+	private function set_objectEncoding(value : UInt) : UInt;
 }
diff --git a/std/flash/utils/ObjectOutput.hx b/std/flash/utils/ObjectOutput.hx
index c6dc82a4117dba0d853a91c1d22ea96096a985e8..4e856459a0f7b33acf1fe699976a6af4e9c646ee 100644
--- a/std/flash/utils/ObjectOutput.hx
+++ b/std/flash/utils/ObjectOutput.hx
@@ -1,9 +1,13 @@
 package flash.utils;
 
 extern class ObjectOutput implements IDataOutput {
-	var endian : Endian;
-	var objectEncoding : UInt;
+	@:flash.property var endian(get,set) : Endian;
+	@:flash.property var objectEncoding(get,set) : UInt;
 	function new() : Void;
+	private function get_endian() : Endian;
+	private function get_objectEncoding() : UInt;
+	private function set_endian(value : Endian) : Endian;
+	private function set_objectEncoding(value : UInt) : UInt;
 	function writeBoolean(value : Bool) : Void;
 	function writeByte(value : Int) : Void;
 	function writeBytes(bytes : ByteArray, offset : UInt = 0, length : UInt = 0) : Void;
diff --git a/std/flash/utils/Proxy.hx b/std/flash/utils/Proxy.hx
index 2ad1568d07896e96779b23add7f60670bc4c8992..0cddd76fcd08f74ba0aee71d048b16c78fbe13de 100644
--- a/std/flash/utils/Proxy.hx
+++ b/std/flash/utils/Proxy.hx
@@ -2,7 +2,7 @@ package flash.utils;
 
 extern class Proxy {
 	function new() : Void;
-	@:ns("http://www.adobe.com/2006/actionscript/flash/proxy") function callProperty(name : Dynamic, ?p1 : Dynamic, ?p2 : Dynamic, ?p3 : Dynamic, ?p4 : Dynamic, ?p5 : Dynamic) : Dynamic;
+	@:ns("http://www.adobe.com/2006/actionscript/flash/proxy") function callProperty(name : Dynamic, restArgs : haxe.extern.Rest<Dynamic>) : Dynamic;
 	@:ns("http://www.adobe.com/2006/actionscript/flash/proxy") function deleteProperty(name : Dynamic) : Bool;
 	@:ns("http://www.adobe.com/2006/actionscript/flash/proxy") function getDescendants(name : Dynamic) : Dynamic;
 	@:ns("http://www.adobe.com/2006/actionscript/flash/proxy") function getProperty(name : Dynamic) : Dynamic;
diff --git a/std/flash/utils/QName.hx b/std/flash/utils/QName.hx
index bf5a4ef9b1d0878cc385dd00153f61b8c27d3402..1ceb4bb34658f96a829076dd3643872d81bf238b 100644
--- a/std/flash/utils/QName.hx
+++ b/std/flash/utils/QName.hx
@@ -1,7 +1,9 @@
 package flash.utils;
 
-@:final extern class QName {
-	var localName(default,never) : String;
-	var uri(default,never) : Dynamic;
+extern final class QName {
+	@:flash.property var localName(get,never) : String;
+	@:flash.property var uri(get,never) : Dynamic;
 	function new(?namespace : Dynamic, ?name : Dynamic) : Void;
+	private function get_localName() : String;
+	private function get_uri() : Dynamic;
 }
diff --git a/std/flash/utils/RegExp.hx b/std/flash/utils/RegExp.hx
index 26b01c3dc21113c9af044e6d1a9d253ff01fea3e..fc20310b5c879ad6a22b76cc264bd9eb40331a29 100644
--- a/std/flash/utils/RegExp.hx
+++ b/std/flash/utils/RegExp.hx
@@ -1,14 +1,22 @@
 package flash.utils;
 
 @:realPath("flash.utils.RegExp") @:native("RegExp") extern class RegExp implements Dynamic {
-	var dotall(default,never) : Bool;
-	var extended(default,never) : Bool;
-	var global(default,never) : Bool;
-	var ignoreCase(default,never) : Bool;
-	var lastIndex : Int;
-	var multiline(default,never) : Bool;
-	var source(default,never) : String;
+	@:flash.property var dotall(get,never) : Bool;
+	@:flash.property var extended(get,never) : Bool;
+	@:flash.property var global(get,never) : Bool;
+	@:flash.property var ignoreCase(get,never) : Bool;
+	@:flash.property var lastIndex(get,set) : Int;
+	@:flash.property var multiline(get,never) : Bool;
+	@:flash.property var source(get,never) : String;
 	function new(?pattern : Dynamic, ?options : Dynamic) : Void;
 	@:ns("http://adobe.com/AS3/2006/builtin") function exec(?s : String) : Dynamic;
+	private function get_dotall() : Bool;
+	private function get_extended() : Bool;
+	private function get_global() : Bool;
+	private function get_ignoreCase() : Bool;
+	private function get_lastIndex() : Int;
+	private function get_multiline() : Bool;
+	private function get_source() : String;
+	private function set_lastIndex(value : Int) : Int;
 	@:ns("http://adobe.com/AS3/2006/builtin") function test(?s : String) : Bool;
 }
diff --git a/std/flash/utils/SetIntervalTimer.hx b/std/flash/utils/SetIntervalTimer.hx
index 08ff9b6bb4556f94f6350fc6e960eb8de860a27e..1c0c589f3718c9ab83759b58304e478f69a38dce 100644
--- a/std/flash/utils/SetIntervalTimer.hx
+++ b/std/flash/utils/SetIntervalTimer.hx
@@ -1,7 +1,7 @@
 package flash.utils;
 
-@:final extern class SetIntervalTimer extends Timer {
-	var id : UInt;
+extern final class SetIntervalTimer extends Timer {
+	@:ns("flash.utils",internal) var id : UInt;
 	function new(closure : Dynamic, delay : Float, repeats : Bool, rest : Array<Dynamic>) : Void;
-	static function clearInterval(id_to_clear : UInt) : Void;
+	@:ns("flash.utils",internal) static function clearInterval(id_to_clear : UInt) : Void;
 }
diff --git a/std/flash/utils/Timer.hx b/std/flash/utils/Timer.hx
index 728f9c5c993ba9e33477d3296ebeb4e87b2aac2f..9e5029a0390a8548a65499992eb019bf0e9e6603 100644
--- a/std/flash/utils/Timer.hx
+++ b/std/flash/utils/Timer.hx
@@ -1,12 +1,18 @@
 package flash.utils;
 
 extern class Timer extends flash.events.EventDispatcher {
-	var currentCount(default,never) : Int;
-	var delay : Float;
-	var repeatCount : Int;
-	var running(default,never) : Bool;
+	@:flash.property var currentCount(get,never) : Int;
+	@:flash.property var delay(get,set) : Float;
+	@:flash.property var repeatCount(get,set) : Int;
+	@:flash.property var running(get,never) : Bool;
 	function new(delay : Float, repeatCount : Int = 0) : Void;
+	private function get_currentCount() : Int;
+	private function get_delay() : Float;
+	private function get_repeatCount() : Int;
+	private function get_running() : Bool;
 	function reset() : Void;
+	private function set_delay(value : Float) : Float;
+	private function set_repeatCount(value : Int) : Int;
 	function start() : Void;
 	function stop() : Void;
 }
diff --git a/std/flash/xml/XML.hx b/std/flash/xml/XML.hx
index c52dc049d3adb0fd977b8839f6e34ffda42f8006..2ba80c264916d853dd75e4f3235b39fce7a556d6 100644
--- a/std/flash/xml/XML.hx
+++ b/std/flash/xml/XML.hx
@@ -1,6 +1,6 @@
 package flash.xml;
 
-@:final extern class XML implements Dynamic<XMLList> {
+extern final class XML implements Dynamic<XMLList> {
 	function new(?value : Dynamic) : Void;
 	function addNamespace(ns : Dynamic) : XML;
 	function appendChild(child : Dynamic) : XML;
@@ -42,12 +42,22 @@ package flash.xml;
 	function toString() : String;
 	function toXMLString() : String;
 	function valueOf() : XML;
-	static var ignoreComments : Bool;
-	static var ignoreProcessingInstructions : Bool;
-	static var ignoreWhitespace : Bool;
-	static var prettyIndent : Int;
-	static var prettyPrinting : Bool;
+	@:flash.property static var ignoreComments(get,set) : Bool;
+	@:flash.property static var ignoreProcessingInstructions(get,set) : Bool;
+	@:flash.property static var ignoreWhitespace(get,set) : Bool;
+	@:flash.property static var prettyIndent(get,set) : Int;
+	@:flash.property static var prettyPrinting(get,set) : Bool;
 	static function defaultSettings() : Dynamic;
+	private static function get_ignoreComments() : Bool;
+	private static function get_ignoreProcessingInstructions() : Bool;
+	private static function get_ignoreWhitespace() : Bool;
+	private static function get_prettyIndent() : Int;
+	private static function get_prettyPrinting() : Bool;
 	static function setSettings(?o : Dynamic) : Void;
+	private static function set_ignoreComments(value : Bool) : Bool;
+	private static function set_ignoreProcessingInstructions(value : Bool) : Bool;
+	private static function set_ignoreWhitespace(value : Bool) : Bool;
+	private static function set_prettyIndent(value : Int) : Int;
+	private static function set_prettyPrinting(value : Bool) : Bool;
 	static function settings() : Dynamic;
 }
diff --git a/std/flash/xml/XMLList.hx b/std/flash/xml/XMLList.hx
index 456849ac1d0a9a66780d6ce27cca94f79e4188b6..d46b83a958a828966c7c69df1d7ff160053cf851 100644
--- a/std/flash/xml/XMLList.hx
+++ b/std/flash/xml/XMLList.hx
@@ -1,6 +1,6 @@
 package flash.xml;
 
-@:final extern class XMLList implements ArrayAccess<XML> {
+extern final class XMLList implements ArrayAccess<XML> {
 	function new(?value : Dynamic) : Void;
 	function addNamespace(ns : Dynamic) : XML;
 	function appendChild(child : Dynamic) : XML;
diff --git a/std/flash/xml/XMLNode.hx b/std/flash/xml/XMLNode.hx
index 4dc45a5797056d941ec39b131593b585bc590690..9ba371d13adf16a1cf369b2c1adafb598ddcab34 100644
--- a/std/flash/xml/XMLNode.hx
+++ b/std/flash/xml/XMLNode.hx
@@ -1,26 +1,32 @@
 package flash.xml;
 
 extern class XMLNode {
-	var attributes : Dynamic;
-	var childNodes(default,never) : Array<Dynamic>;
+	@:flash.property var attributes(get,set) : Dynamic;
+	@:flash.property var childNodes(get,never) : Array<Dynamic>;
 	var firstChild : XMLNode;
 	var lastChild : XMLNode;
-	var localName(default,never) : String;
-	var namespaceURI(default,never) : String;
+	@:flash.property var localName(get,never) : String;
+	@:flash.property var namespaceURI(get,never) : String;
 	var nextSibling : XMLNode;
 	var nodeName : String;
 	var nodeType : XMLNodeType;
 	var nodeValue : String;
 	var parentNode : XMLNode;
-	var prefix(default,never) : String;
+	@:flash.property var prefix(get,never) : String;
 	var previousSibling : XMLNode;
 	function new(type : XMLNodeType, value : String) : Void;
 	function appendChild(node : XMLNode) : Void;
 	function cloneNode(deep : Bool) : XMLNode;
 	function getNamespaceForPrefix(prefix : String) : String;
 	function getPrefixForNamespace(ns : String) : String;
+	private function get_attributes() : Dynamic;
+	private function get_childNodes() : Array<Dynamic>;
+	private function get_localName() : String;
+	private function get_namespaceURI() : String;
+	private function get_prefix() : String;
 	function hasChildNodes() : Bool;
 	function insertBefore(node : XMLNode, before : XMLNode) : Void;
 	function removeNode() : Void;
+	private function set_attributes(value : Dynamic) : Dynamic;
 	function toString() : String;
 }
diff --git a/std/flash/xml/XMLNodeType.hx b/std/flash/xml/XMLNodeType.hx
index 6b728e6375fdfebc986f8747edf83542a0b25bf5..36f75cbba6d7f29d44022de35e73c6d08831e073 100644
--- a/std/flash/xml/XMLNodeType.hx
+++ b/std/flash/xml/XMLNodeType.hx
@@ -1,11 +1,11 @@
 package flash.xml;
 
-@:fakeEnum(UInt) extern enum XMLNodeType {
-	CDATA_NODE;
-	COMMENT_NODE;
-	DOCUMENT_TYPE_NODE;
-	ELEMENT_NODE;
-	PROCESSING_INSTRUCTION_NODE;
-	TEXT_NODE;
-	XML_DECLARATION;
+@:native("flash.xml.XMLNodeType") extern enum abstract XMLNodeType(UInt) {
+	var CDATA_NODE;
+	var COMMENT_NODE;
+	var DOCUMENT_TYPE_NODE;
+	var ELEMENT_NODE;
+	var PROCESSING_INSTRUCTION_NODE;
+	var TEXT_NODE;
+	var XML_DECLARATION;
 }
diff --git a/std/flash/xml/XMLParser.hx b/std/flash/xml/XMLParser.hx
index d21660bea1e72beb076f1a7665e081d0b824f9e1..ef9441d9abe08f423c5599c5f2b33ecfb287863c 100644
--- a/std/flash/xml/XMLParser.hx
+++ b/std/flash/xml/XMLParser.hx
@@ -1,6 +1,6 @@
 package flash.xml;
 
-@:final extern class XMLParser {
+extern final class XMLParser {
 	function new() : Void;
 	function getNext(tag : XMLTag) : Int;
 	function startParse(source : String, ignoreWhite : Bool) : Void;
diff --git a/std/flash/xml/XMLTag.hx b/std/flash/xml/XMLTag.hx
index dcddbd01178481610f22f7d324889ef393a9e56f..468fda40ab9862d11c4da631c7baa5d98096b7cf 100644
--- a/std/flash/xml/XMLTag.hx
+++ b/std/flash/xml/XMLTag.hx
@@ -1,9 +1,17 @@
 package flash.xml;
 
-@:final extern class XMLTag {
-	var attrs : Dynamic;
-	var empty : Bool;
-	var type : XMLNodeType;
-	var value : String;
+extern final class XMLTag {
+	@:flash.property var attrs(get,set) : Dynamic;
+	@:flash.property var empty(get,set) : Bool;
+	@:flash.property var type(get,set) : XMLNodeType;
+	@:flash.property var value(get,set) : String;
 	function new() : Void;
+	private function get_attrs() : Dynamic;
+	private function get_empty() : Bool;
+	private function get_type() : XMLNodeType;
+	private function get_value() : String;
+	private function set_attrs(value : Dynamic) : Dynamic;
+	private function set_empty(value : Bool) : Bool;
+	private function set_type(value : XMLNodeType) : XMLNodeType;
+	private function set_value(value : String) : String;
 }
diff --git a/std/haxe/CallStack.hx b/std/haxe/CallStack.hx
index 9e19e589823b3d9b1a4e6f5a296cf8fd977f028f..8e98b8c7a936a04391c4d3b2d6f331b5b0ffd501 100644
--- a/std/haxe/CallStack.hx
+++ b/std/haxe/CallStack.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 /**
@@ -26,10 +27,10 @@ package haxe;
 **/
 enum StackItem {
 	CFunction;
-	Module( m : String );
-	FilePos( s : Null<StackItem>, file : String, line : Int );
-	Method( classname : String, method : String );
-	LocalFunction( ?v : Int );
+	Module(m:String);
+	FilePos(s:Null<StackItem>, file:String, line:Int, ?column:Null<Int>);
+	Method(classname:Null<String>, method:String);
+	LocalFunction(?v:Int);
 }
 
 /**
@@ -37,27 +38,33 @@ enum StackItem {
 **/
 class CallStack {
 	#if js
-	static var lastException:js.Error;
+	static var lastException:js.lib.Error;
 
-	static function getStack(e:js.Error):Array<StackItem> {
-		if (e == null) return [];
+	static function getStack(e:js.lib.Error):Array<StackItem> {
+		if (e == null)
+			return [];
 		// https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
 		var oldValue = (untyped Error).prepareStackTrace;
-		(untyped Error).prepareStackTrace = function (error, callsites :Array<Dynamic>) {
+		(untyped Error).prepareStackTrace = function(error, callsites:Array<Dynamic>) {
 			var stack = [];
 			for (site in callsites) {
-				if (wrapCallSite != null) site = wrapCallSite(site);
+				if (wrapCallSite != null)
+					site = wrapCallSite(site);
 				var method = null;
-				var fullName :String = site.getFunctionName();
+				var fullName:String = site.getFunctionName();
 				if (fullName != null) {
 					var idx = fullName.lastIndexOf(".");
 					if (idx >= 0) {
 						var className = fullName.substr(0, idx);
-						var methodName = fullName.substr(idx+1);
+						var methodName = fullName.substr(idx + 1);
 						method = Method(className, methodName);
 					}
 				}
-				stack.push(FilePos(method, site.getFileName(), site.getLineNumber()));
+				var fileName:String = site.getFileName();
+				var fileAddr = fileName == null ? -1 : fileName.indexOf("file:");
+				if (wrapCallSite != null && fileAddr > 0)
+					fileName = fileName.substr(fileAddr + 6);
+				stack.push(FilePos(method, fileName, site.getLineNumber(), site.getColumnNumber()));
 			}
 			return stack;
 		}
@@ -71,87 +78,106 @@ class CallStack {
 	public static var wrapCallSite:Dynamic->Dynamic;
 	#end
 
+	#if eval
+	static function getCallStack() {
+		return [];
+	}
+
+	static function getExceptionStack() {
+		return [];
+	}
+	#end
+
 	/**
 		Return the call stack elements, or an empty array if not available.
 	**/
-	public static function callStack() : Array<StackItem> {
+	public static function callStack():Array<StackItem> {
 		#if neko
-			var a = makeStack(untyped __dollar__callstack());
-			a.shift(); // remove Stack.callStack()
-			return a;
+		var a = makeStack(untyped __dollar__callstack());
+		a.shift(); // remove Stack.callStack()
+		return a;
 		#elseif flash
-			var a = makeStack( new flash.errors.Error().getStackTrace() );
-			a.shift(); // remove Stack.callStack()
-			return a;
-		#elseif php
-			return makeStack("%s");
+		var a = makeStack(new flash.errors.Error().getStackTrace());
+		a.shift(); // remove Stack.callStack()
+		return a;
 		#elseif cpp
-			var s:Array<String> = untyped __global__.__hxcpp_get_call_stack(true);
-			return makeStack(s);
+		var s:Array<String> = untyped __global__.__hxcpp_get_call_stack(true);
+		return makeStack(s);
 		#elseif js
-			try {
-				throw new js.Error();
-			} catch( e : Dynamic ) {
-				var a = getStack(e);
-				a.shift(); // remove Stack.callStack()
-				return a;
-			}
-
+		try {
+			throw new js.lib.Error();
+		} catch (e:Dynamic) {
+			var a = getStack(js.Lib.getOriginalException());
+			a.shift(); // remove Stack.callStack()
+			return a;
+		}
 		#elseif java
-			var stack = [];
-			for ( el in java.lang.Thread.currentThread().getStackTrace() ) {
-				var className = el.getClassName();
-				var methodName = el.getMethodName();
-				var fileName = el.getFileName();
-				var lineNumber = el.getLineNumber();
-				var method = Method( className, methodName );
-				if ( fileName != null || lineNumber >= 0 ) {
-					stack.push( FilePos( method, fileName, lineNumber ) );
-				}
-				else {
-					stack.push( method );
-				}
+		var stack = [];
+		for (el in java.lang.Thread.currentThread().getStackTrace()) {
+			var className = el.getClassName();
+			var methodName = el.getMethodName();
+			var fileName = el.getFileName();
+			var lineNumber = el.getLineNumber();
+			var method = Method(className, methodName);
+			if (fileName != null || lineNumber >= 0) {
+				stack.push(FilePos(method, fileName, lineNumber));
+			} else {
+				stack.push(method);
 			}
-			stack.shift();
-			stack.shift();
-			stack.pop();
-			return stack;
+		}
+		stack.shift();
+		stack.shift();
+		stack.pop();
+		return stack;
 		#elseif cs
-			return makeStack(new cs.system.diagnostics.StackTrace(1, true));
+		return makeStack(new cs.system.diagnostics.StackTrace(1, true));
 		#elseif python
-			var stack = [];
-			var infos = python.lib.Traceback.extract_stack();
-			infos.pop();
-			infos.reverse();
-			for (elem in infos)
-				stack.push(FilePos(null, elem._1, elem._2));
-			return stack;
+		var stack = [];
+		var infos = python.lib.Traceback.extract_stack();
+		infos.pop();
+		infos.reverse();
+		for (elem in infos)
+			stack.push(FilePos(Method(null, elem._3), elem._1, elem._2));
+		return stack;
 		#elseif lua
-			var stack = [];
-			var infos = lua.Debug.traceback();
-			var luastack = infos.split("\n").slice(2,-1);
-			for (s in luastack){
-				var parts = s.split(":");
-				var file  = parts[0];
-				var line  = parts[1];
-				// TODO: Give more information for FilePos
-				stack.push(FilePos(null, file, Std.parseInt(line)));
+		var stack = [];
+		var infos = lua.Debug.traceback();
+		var luastack = infos.split("\n").slice(2, -1);
+		for (s in luastack) {
+			var parts = s.split(":");
+			var file = parts[0];
+			var line = parts[1];
+			var method = if(parts.length <= 2) {
+				null;
+			} else {
+				var methodPos = parts[2].indexOf("'");
+				if(methodPos < 0) {
+					null;
+				} else {
+					Method(null, parts[2].substring(methodPos + 1, parts[2].length - 1));
+				}
 			}
-			return stack;
+			stack.push(FilePos(method, file, Std.parseInt(line)));
+		}
+		return stack;
 		#elseif hl
-			try {
-				throw null;
-			} catch( e : Dynamic ) {
-				var st = _getExceptionStack();
-				return makeStack(st.length > 2 ? st.sub(2,st.length - 2) : st);
-			}
+		try {
+			throw null;
+		} catch (e:Dynamic) {
+			var st = _getExceptionStack();
+			return makeStack(st.length > 2 ? st.sub(2, st.length - 2) : st);
+		}
+		#elseif eval
+		return getCallStack();
 		#else
-			return []; // Unsupported
+		return []; // Unsupported
 		#end
 	}
 
 	#if hl
-	@:hlNative("std", "exception_stack") static function _getExceptionStack() : hl.NativeArray<hl.Bytes> { return null; }
+	@:hlNative("std", "exception_stack") static function _getExceptionStack():hl.NativeArray<hl.Bytes> {
+		return null;
+	}
 	#end
 
 	/**
@@ -159,228 +185,231 @@ class CallStack {
 		the place the last exception was thrown and the place it was
 		caught, or an empty array if not available.
 	**/
-	#if cpp @:noDebug #end /* Do not mess up the exception stack */
-	public static function exceptionStack() : Array<StackItem> {
+	#if cpp
+	@:noDebug /* Do not mess up the exception stack */
+	#end
+	public static function exceptionStack():Array<StackItem> {
 		#if neko
-			return makeStack(untyped __dollar__excstack());
+		return makeStack(untyped __dollar__excstack());
 		#elseif as3
-			return new Array();
+		return new Array();
 		#elseif hl
-			return makeStack(_getExceptionStack());
+		return makeStack(_getExceptionStack());
 		#elseif flash
-			var err : flash.errors.Error = untyped flash.Boot.lastError;
-			if( err == null ) return new Array();
-			var a = makeStack( err.getStackTrace() );
-			var c = callStack();
-			var i = c.length - 1;
-			while( i > 0 ) {
-				if( Std.string(a[a.length-1]) == Std.string(c[i]) )
-					a.pop();
-				else
-					break;
-				i--;
-			}
-			return a;
-		#elseif php
-			return makeStack("%e");
+		var err:flash.errors.Error = untyped flash.Boot.lastError;
+		if (err == null)
+			return new Array();
+		var a = makeStack(err.getStackTrace());
+		var c = callStack();
+		var i = c.length - 1;
+		while (i > 0) {
+			if (Std.string(a[a.length - 1]) == Std.string(c[i]))
+				a.pop();
+			else
+				break;
+			i--;
+		}
+		return a;
 		#elseif cpp
-			var s:Array<String> = untyped __global__.__hxcpp_get_exception_stack();
-			return makeStack(s);
+		var s:Array<String> = untyped __global__.__hxcpp_get_exception_stack();
+		return makeStack(s);
 		#elseif java
-			var stack = [];
-			for ( el in java.internal.Exceptions.currentException().getStackTrace() ) {
-				var className = el.getClassName();
-				var methodName = el.getMethodName();
-				var fileName = el.getFileName();
-				var lineNumber = el.getLineNumber();
-				var method = Method( className, methodName );
-				if ( fileName != null || lineNumber >= 0 ) {
-					stack.push( FilePos( method, fileName, lineNumber ) );
-				}
-				else {
-					stack.push( method );
+		var stack = [];
+		switch (#if jvm jvm.Exception #else java.internal.Exceptions #end.currentException()) {
+			case null:
+			case current:
+				for (el in current.getStackTrace()) {
+					var className = el.getClassName();
+					var methodName = el.getMethodName();
+					var fileName = el.getFileName();
+					var lineNumber = el.getLineNumber();
+					var method = Method(className, methodName);
+					if (fileName != null || lineNumber >= 0) {
+						stack.push(FilePos(method, fileName, lineNumber));
+					} else {
+						stack.push(method);
+					}
 				}
-			}
-			// stack.shift();
-			stack.shift();
-			stack.pop();
-			return stack;
+		}
+		return stack;
 		#elseif cs
-			return makeStack(new cs.system.diagnostics.StackTrace(cs.internal.Exceptions.exception, true));
+		return cs.internal.Exceptions.exception == null ? [] : makeStack(new cs.system.diagnostics.StackTrace(cs.internal.Exceptions.exception, true));
 		#elseif python
-			var stack = [];
-			var exc = python.lib.Sys.exc_info();
-			if (exc._3 != null)
-			{
-				var infos = python.lib.Traceback.extract_tb(exc._3);
-				infos.reverse();
-				for (elem in infos)
-					stack.push(FilePos(null, elem._1, elem._2));
-			}
-			return stack;
+		var stack = [];
+		var exc = python.lib.Sys.exc_info();
+		if (exc._3 != null) {
+			var infos = python.lib.Traceback.extract_tb(exc._3);
+			infos.reverse();
+			for (elem in infos)
+				stack.push(FilePos(Method(null, elem._3), elem._1, elem._2));
+		}
+		return stack;
 		#elseif js
-			return untyped __define_feature__("haxe.CallStack.exceptionStack", getStack(lastException));
+		return getStack(lastException);
+		#elseif eval
+		return getExceptionStack();
 		#else
-			return []; // Unsupported
+		return []; // Unsupported
 		#end
 	}
 
 	/**
 		Returns a representation of the stack as a printable string.
 	**/
-	public static function toString( stack : Array<StackItem> ) {
+	public static function toString(stack:Array<StackItem>) {
 		var b = new StringBuf();
-		for( s in stack ) {
+		for (s in stack) {
 			b.add("\nCalled from ");
-			itemToString(b,s);
+			itemToString(b, s);
 		}
 		return b.toString();
 	}
 
-	private static function itemToString( b : StringBuf, s ) {
-		switch( s ) {
-		case CFunction:
-			b.add("a C function");
-		case Module(m):
-			b.add("module ");
-			b.add(m);
-		case FilePos(s,file,line):
-			if( s != null ) {
-				itemToString(b,s);
-				b.add(" (");
-			}
-			b.add(file);
-			b.add(" line ");
-			b.add(line);
-			if( s != null ) b.add(")");
-		case Method(cname,meth):
-			b.add(cname);
-			b.add(".");
-			b.add(meth);
-		case LocalFunction(n):
-			b.add("local function #");
-			b.add(n);
+	private static function itemToString(b:StringBuf, s) {
+		switch (s) {
+			case CFunction:
+				b.add("a C function");
+			case Module(m):
+				b.add("module ");
+				b.add(m);
+			case FilePos(s, file, line, col):
+				if (s != null) {
+					itemToString(b, s);
+					b.add(" (");
+				}
+				b.add(file);
+				b.add(" line ");
+				b.add(line);
+				if (col != null) {
+					b.add(" column ");
+					b.add(col);
+				}
+				if (s != null)
+					b.add(")");
+			case Method(cname, meth):
+				b.add(cname == null ? "<unknown>" : cname);
+				b.add(".");
+				b.add(meth);
+			case LocalFunction(n):
+				b.add("local function #");
+				b.add(n);
 		}
 	}
 
-	#if cpp @:noDebug #end /* Do not mess up the exception stack */
-	private static function makeStack(s #if cs : cs.system.diagnostics.StackTrace #elseif hl : hl.NativeArray<hl.Bytes> #end) {
+	#if cpp
+	@:noDebug /* Do not mess up the exception stack */
+	#end
+	private static function makeStack(s #if cs:cs.system.diagnostics.StackTrace #elseif hl:hl.NativeArray<hl.Bytes> #else:Dynamic #end) {
 		#if neko
-			var a = new Array();
-			var l = untyped __dollar__asize(s);
-			var i = 0;
-			while( i < l ) {
-				var x = s[i++];
-				if( x == null )
-					a.unshift(CFunction);
-				else if( untyped __dollar__typeof(x) == __dollar__tstring )
-					a.unshift(Module(new String(x)));
-				else
-					a.unshift(FilePos(null,new String(untyped x[0]),untyped x[1]));
-			}
-			return a;
+		var a = new Array();
+		var l = untyped __dollar__asize(s);
+		var i = 0;
+		while (i < l) {
+			var x = s[i++];
+			if (x == null)
+				a.unshift(CFunction);
+			else if (untyped __dollar__typeof(x) == __dollar__tstring)
+				a.unshift(Module(new String(x)));
+			else
+				a.unshift(FilePos(null, new String(untyped x[0]), untyped x[1]));
+		}
+		return a;
 		#elseif flash
-			var a = new Array();
-			var r = ~/at ([^\/]+?)\$?(\/[^\(]+)?\(\)(\[(.*?):([0-9]+)\])?/;
-			var rlambda = ~/^MethodInfo-([0-9]+)$/g;
-			while( r.match(s) ) {
-				var cl = r.matched(1).split("::").join(".");
-				var meth = r.matched(2);
-				var item;
-				if( meth == null ) {
-					if( rlambda.match(cl) )
-						item = LocalFunction(Std.parseInt(rlambda.matched(1)));
-					else
-						item = Method(cl,"new");
-				} else
-					item = Method(cl,meth.substr(1));
-				if( r.matched(3) != null )
-					item = FilePos( item, r.matched(4), Std.parseInt(r.matched(5)) );
-				a.push(item);
-				s = r.matchedRight();
-			}
-			return a;
-		#elseif php
-			if (!untyped __call__("isset", __var__("GLOBALS", s)))
-				return [];
-			var a : Array<String> = untyped __var__("GLOBALS", s);
-			var m = [];
-			for( i in 0...a.length - ((s == "%s") ? 2 : 0)) {
-				var d = a[i].split("::");
-				m.unshift(Method(d[0],d[1]));
-			}
-			return m;
+		var a = new Array();
+		var r = ~/at ([^\/]+?)\$?(\/[^\(]+)?\(\)(\[(.*?):([0-9]+)\])?/;
+		var rlambda = ~/^MethodInfo-([0-9]+)$/g;
+		while (r.match(s)) {
+			var cl = r.matched(1).split("::").join(".");
+			var meth = r.matched(2);
+			var item;
+			if (meth == null) {
+				if (rlambda.match(cl))
+					item = LocalFunction(Std.parseInt(rlambda.matched(1)));
+				else
+					item = Method(cl, "new");
+			} else
+				item = Method(cl, meth.substr(1));
+			if (r.matched(3) != null)
+				item = FilePos(item, r.matched(4), Std.parseInt(r.matched(5)));
+			a.push(item);
+			s = r.matchedRight();
+		}
+		return a;
 		#elseif cpp
-			var stack : Array<String> = s;
-			var m = new Array<StackItem>();
-			for(func in stack) {
-				var words = func.split("::");
-				if (words.length==0)
-					m.push(CFunction)
-				else if (words.length==2)
-					m.push(Method(words[0],words[1]));
-				else if (words.length==4)
-					m.push(FilePos( Method(words[0],words[1]),words[2],Std.parseInt(words[3])));
-			}
-			return m;
+		var stack:Array<String> = s;
+		var m = new Array<StackItem>();
+		for (func in stack) {
+			var words = func.split("::");
+			if (words.length == 0)
+				m.push(CFunction)
+			else if (words.length == 2)
+				m.push(Method(words[0], words[1]));
+			else if (words.length == 4)
+				m.push(FilePos(Method(words[0], words[1]), words[2], Std.parseInt(words[3])));
+		}
+		return m;
 		#elseif js
-			if (s == null) {
-				return [];
-			} else if ((untyped __js__("typeof"))(s) == "string") {
-				// Return the raw lines in browsers that don't support prepareStackTrace
-				var stack : Array<String> = s.split("\n");
-				if( stack[0] == "Error" ) stack.shift();
-				var m = [];
-				var rie10 = ~/^   at ([A-Za-z0-9_. ]+) \(([^)]+):([0-9]+):([0-9]+)\)$/;
-				for( line in stack ) {
-					if( rie10.match(line) ) {
-						var path = rie10.matched(1).split(".");
-						var meth = path.pop();
-						var file = rie10.matched(2);
-						var line = Std.parseInt(rie10.matched(3));
-						m.push(FilePos( meth == "Anonymous function" ? LocalFunction() : meth == "Global code" ? null : Method(path.join("."),meth), file, line ));
-					} else
-						m.push(Module(StringTools.trim(line))); // A little weird, but better than nothing
-				}
-				return m;
-			} else {
-				return cast s;
+		if (s == null) {
+			return [];
+		} else if (js.Syntax.typeof(s) == "string") {
+			// Return the raw lines in browsers that don't support prepareStackTrace
+			var stack:Array<String> = s.split("\n");
+			if (stack[0] == "Error")
+				stack.shift();
+			var m = [];
+			var rie10 = ~/^   at ([A-Za-z0-9_. ]+) \(([^)]+):([0-9]+):([0-9]+)\)$/;
+			for (line in stack) {
+				if (rie10.match(line)) {
+					var path = rie10.matched(1).split(".");
+					var meth = path.pop();
+					var file = rie10.matched(2);
+					var line = Std.parseInt(rie10.matched(3));
+					var column = Std.parseInt(rie10.matched(4));
+					m.push(FilePos(meth == "Anonymous function" ? LocalFunction() : meth == "Global code" ? null : Method(path.join("."), meth), file, line,
+						column));
+				} else
+					m.push(Module(StringTools.trim(line))); // A little weird, but better than nothing
 			}
+			return m;
+		} else {
+			return cast s;
+		}
 		#elseif cs
-			var stack = [];
-			for (i in 0...s.FrameCount)
-			{
-				var frame = s.GetFrame(i);
-				var m = frame.GetMethod();
+		var stack = [];
+		for (i in 0...s.FrameCount) {
+			var frame = s.GetFrame(i);
+			var m = frame.GetMethod();
 
-				if (m == null) {
-					continue;
-				}
-				var method = StackItem.Method(m.ReflectedType.ToString(), m.Name);
+			if (m == null) {
+				continue;
+			}
+			var method = StackItem.Method(m.ReflectedType.ToString(), m.Name);
 
-				var fileName = frame.GetFileName();
-				var lineNumber = frame.GetFileLineNumber();
+			var fileName = frame.GetFileName();
+			var lineNumber = frame.GetFileLineNumber();
 
-				if (fileName != null || lineNumber >= 0)
-					stack.push(FilePos(method, fileName, lineNumber));
-				else
-					stack.push(method);
-			}
-			return stack;
+			if (fileName != null || lineNumber >= 0)
+				stack.push(FilePos(method, fileName, lineNumber));
+			else
+				stack.push(method);
+		}
+		return stack;
 		#elseif hl
-			var stack = [];
-			var r = ~/^([A-Za-z0-9.$_]+)\.([A-Za-z0-9_]+)\((.+):([0-9]+)\)$/;
-			for( i in 0...s.length-1 ) {
-				var str = @:privateAccess String.fromUCS2(s[i]);
-				if( r.match(str) )
-					stack.push(FilePos(Method(r.matched(1), r.matched(2)), r.matched(3), Std.parseInt(r.matched(4))));
-				else
-					stack.push(Module(str));
-			}
-			return stack;
+		var stack = [];
+		var r = ~/^([A-Za-z0-9.$_]+)\.([~A-Za-z0-9_]+(\.[0-9]+)?)\((.+):([0-9]+)\)$/;
+		var r_fun = ~/^fun\$([0-9]+)\((.+):([0-9]+)\)$/;
+		for (i in 0...s.length - 1) {
+			var str = @:privateAccess String.fromUCS2(s[i]);
+			if (r.match(str))
+				stack.push(FilePos(Method(r.matched(1), r.matched(2)), r.matched(4), Std.parseInt(r.matched(5))));
+			else if (r_fun.match(str))
+				stack.push(FilePos(LocalFunction(Std.parseInt(r_fun.matched(1))), r_fun.matched(2), Std.parseInt(r_fun.matched(3))));
+			else
+				stack.push(Module(str));
+		}
+		return stack;
 		#else
-			return null;
+		return null;
 		#end
 	}
-
 }
diff --git a/std/haxe/Constraints.hx b/std/haxe/Constraints.hx
index 8d18b56928830168f377bee7fcf5307184ed4ded..18f6402b4db107d1a0673df2c6385f61c3217f52 100644
--- a/std/haxe/Constraints.hx
+++ b/std/haxe/Constraints.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,7 +29,7 @@ package haxe;
 	type, the underlying type will be `Dynamic`.
 **/
 @:callable
-abstract Function(Dynamic) { }
+abstract Function(Dynamic) {}
 
 /**
 	This type unifies with an enum instance if all constructors of the enum
@@ -38,29 +38,33 @@ abstract Function(Dynamic) { }
 	It is intended to be used as a type parameter constraint. If used as a real
 	type, the underlying type will be `Dynamic`.
 **/
-abstract FlatEnum(Dynamic) { }
+abstract FlatEnum(Dynamic) {}
 
 /**
 	This type unifies with any instance of classes that have a constructor
 	which
-		* is public and
-		* unifies with the type used for type parameter `T`.
 
-	If a type parameter A is assigned to a type parameter B which is constrained
+	  * is `public` and
+	  * unifies with the type used for type parameter `T`.
+
+	If a type parameter `A` is assigned to a type parameter `B` which is constrained
 	to `Constructible<T>`, A must be explicitly constrained to
 	`Constructible<T>` as well.
 
 	It is intended to be used as a type parameter constraint. If used as a real
 	type, the underlying type will be `Dynamic`.
 **/
-abstract Constructible<T>(Dynamic) { }
+abstract Constructible<T>(Dynamic) {}
 
-interface IMap<K,V> {
-	public function get(k:K):Null<V>;
-	public function set(k:K, v:V):Void;
-	public function exists(k:K):Bool;
-	public function remove(k:K):Bool;
-	public function keys():Iterator<K>;
-	public function iterator():Iterator<V>;
-	public function toString():String;
-}
\ No newline at end of file
+interface IMap<K, V> {
+	function get(k:K):Null<V>;
+	function set(k:K, v:V):Void;
+	function exists(k:K):Bool;
+	function remove(k:K):Bool;
+	function keys():Iterator<K>;
+	function iterator():Iterator<V>;
+	function keyValueIterator():KeyValueIterator<K, V>;
+	function copy():IMap<K, V>;
+	function toString():String;
+	function clear():Void;
+}
diff --git a/std/haxe/DynamicAccess.hx b/std/haxe/DynamicAccess.hx
index 64924d71e499005e4f2fdc37015bac65a0a0c297..91f552bbf355535115bb424453974a114d2cde14 100644
--- a/std/haxe/DynamicAccess.hx
+++ b/std/haxe/DynamicAccess.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
+import haxe.iterators.DynamicAccessIterator;
+import haxe.iterators.DynamicAccessKeyValueIterator;
+
 /**
 	DynamicAccess is an abstract type for working with anonymous structures
 	that are intended to hold collections of objects by the string key.
@@ -30,18 +34,18 @@ package haxe;
 	Basically, it wraps `Reflect` calls in a `Map`-like interface.
 **/
 abstract DynamicAccess<T>(Dynamic<T>) from Dynamic<T> to Dynamic<T> {
-
 	/**
 		Creates a new structure.
 	**/
-	public inline function new() this = {};
+	public inline function new()
+		this = {};
 
 	/**
 		Returns a value by specified `key`.
 
-		If the structure does not contain the given key, null is returned.
+		If the structure does not contain the given key, `null` is returned.
 
-		If `key` is null, the result is unspecified.
+		If `key` is `null`, the result is unspecified.
 	**/
 	@:arrayAccess
 	public inline function get(key:String):Null<T> {
@@ -59,7 +63,7 @@ abstract DynamicAccess<T>(Dynamic<T>) from Dynamic<T> to Dynamic<T> {
 
 		Returns the given value.
 
-		If `key` is null, the result is unspecified.
+		If `key` is `null`, the result is unspecified.
 	**/
 	@:arrayAccess
 	public inline function set(key:String, value:T):T {
@@ -74,21 +78,48 @@ abstract DynamicAccess<T>(Dynamic<T>) from Dynamic<T> to Dynamic<T> {
 	/**
 		Tells if the structure contains a specified `key`.
 
-		If `key` is null, the result is unspecified.
+		If `key` is `null`, the result is unspecified.
 	**/
-	public inline function exists(key:String):Bool return Reflect.hasField(this, key);
+	public inline function exists(key:String):Bool
+		return Reflect.hasField(this, key);
 
 	/**
 		Removes a specified `key` from the structure.
 
 		Returns true, if `key` was present in structure, or false otherwise.
 
-		If `key` is null, the result is unspecified.
+		If `key` is `null`, the result is unspecified.
 	**/
-	public inline function remove(key:String):Bool return Reflect.deleteField(this, key);
+	public inline function remove(key:String):Bool
+		return Reflect.deleteField(this, key);
 
 	/**
 		Returns an array of `keys` in a structure.
 	**/
-	public inline function keys():Array<String> return Reflect.fields(this);
+	public inline function keys():Array<String>
+		return Reflect.fields(this);
+
+	/**
+		Returns a shallow copy of the structure
+	**/
+	public inline function copy():DynamicAccess<T>
+		return Reflect.copy(this);
+
+	/**
+		Returns an Iterator over the values of this `DynamicAccess`.
+
+		The order of values is undefined.
+	**/
+	public inline function iterator():DynamicAccessIterator<T> {
+		return new DynamicAccessIterator(this);
+	}
+
+	/**
+		Returns an Iterator over the keys and values of this `DynamicAccess`.
+
+		The order of values is undefined.
+	**/
+	public inline function keyValueIterator():DynamicAccessKeyValueIterator<T> {
+		return new DynamicAccessKeyValueIterator(this);
+	}
 }
diff --git a/std/haxe/EntryPoint.hx b/std/haxe/EntryPoint.hx
index fafafa26534397ef006fbabd9cd96415e11684d9..a35bd855732c34e08483d3a03f986a8ea36eca77 100644
--- a/std/haxe/EntryPoint.hx
+++ b/std/haxe/EntryPoint.hx
@@ -1,57 +1,47 @@
 package haxe;
 
-#if (neko && !macro && !interp)
-import neko.vm.Lock;
-import neko.vm.Mutex;
-import neko.vm.Thread;
-#elseif cpp
-import cpp.vm.Lock;
-import cpp.vm.Mutex;
-import cpp.vm.Thread;
-#elseif java
-import java.vm.Lock;
-import java.vm.Mutex;
-import java.vm.Thread;
+#if target.threaded
+import sys.thread.Lock;
+import sys.thread.Mutex;
+import sys.thread.Thread;
 #elseif sys
 private class Lock {
-	public function new() {
-	}
-	public inline function release() {
-	}
-	public inline function wait( ?t : Float ) {
-	}
+	public function new() {}
+
+	public inline function release() {}
+
+	public inline function wait(?t:Float) {}
 }
+
 private class Mutex {
-	public function new() {
-	}
-	public inline function acquire() {
-	}
-	public inline function release() {
-	}
+	public function new() {}
+
+	public inline function acquire() {}
+
+	public inline function release() {}
 }
+
 private class Thread {
-	public static function create( f : Void -> Void ) {
+	public static function create(f:Void->Void) {
 		f();
 	}
 }
 #end
 
 /**
-	If haxe.MainLoop is kept from DCE, then we will insert an haxe.EntryPoint.run() call just at then end of main().
+	If `haxe.MainLoop` is kept from DCE, then we will insert an `haxe.EntryPoint.run()` call just at then end of `main()`.
 	This class can be redefined by custom frameworks so they can handle their own main loop logic.
 **/
 class EntryPoint {
-
 	#if sys
 	static var sleepLock = new Lock();
 	static var mutex = new Mutex();
 	#end
 	static var pending = new Array<Void->Void>();
-
-	public static var threadCount(default,null) : Int = 0;
+	public static var threadCount(default, null):Int = 0;
 
 	/**
-		Wakeup a sleeping run()
+		Wakeup a sleeping `run()`
 	**/
 	public static function wakeup() {
 		#if sys
@@ -59,7 +49,7 @@ class EntryPoint {
 		#end
 	}
 
-	public static function runInMainThread( f : Void -> Void ) {
+	public static function runInMainThread(f:Void->Void) {
 		#if sys
 		mutex.acquire();
 		pending.push(f);
@@ -70,7 +60,7 @@ class EntryPoint {
 		#end
 	}
 
-	public static function addThread( f : Void -> Void ) {
+	public static function addThread(f:Void->Void) {
 		#if sys
 		mutex.acquire();
 		threadCount++;
@@ -79,18 +69,22 @@ class EntryPoint {
 			f();
 			mutex.acquire();
 			threadCount--;
-			if( threadCount == 0 ) wakeup();
+			if (threadCount == 0)
+				wakeup();
 			mutex.release();
 		});
 		#else
 		threadCount++;
-		pending.push(function() { f(); threadCount--; } );
+		pending.push(function() {
+			f();
+			threadCount--;
+		});
 		#end
 	}
 
-	static function processEvents() : Float {
+	static function processEvents():Float {
 		// flush all pending calls
-		while( true ) {
+		while (true) {
 			#if sys
 			mutex.acquire();
 			var f = pending.shift();
@@ -98,12 +92,14 @@ class EntryPoint {
 			#else
 			var f = pending.shift();
 			#end
-			if( f == null ) break;
+			if (f == null)
+				break;
 			f();
 		}
-		if( !MainLoop.hasEvents() && threadCount == 0 )
+		var time = @:privateAccess MainLoop.tick();
+		if (!MainLoop.hasEvents() && threadCount == 0)
 			return -1;
-		return @:privateAccess MainLoop.tick();
+		return time;
 	}
 
 	/**
@@ -111,37 +107,29 @@ class EntryPoint {
 	**/
 	@:keep public static function run() @:privateAccess {
 		#if js
-
 		var nextTick = processEvents();
 
 		#if nodejs
-		if( nextTick < 0 )
+		if (nextTick < 0)
 			return;
-		(untyped setTimeout)(run,nextTick);
+		(untyped setTimeout)(run, nextTick);
 		#else
-		var window : Dynamic = js.Browser.window;
-		var rqf : Dynamic = window.requestAnimationFrame ||
-			window.webkitRequestAnimationFrame ||
-			window.mozRequestAnimationFrame;
+		var window:Dynamic = js.Browser.window;
+		var rqf:Dynamic = window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame;
 		rqf(run);
 		#end
-
 		#elseif flash
-
 		flash.Lib.current.stage.addEventListener(flash.events.Event.ENTER_FRAME, function(_) processEvents());
-
 		#elseif sys
-		while( true ) {
+		while (true) {
 			var nextTick = processEvents();
-			if( nextTick < 0 )
+			if (nextTick < 0)
 				break;
-			if( nextTick > 0 )
+			if (nextTick > 0)
 				sleepLock.wait(nextTick); // wait until nextTick or wakeup() call
 		}
 		#else
-
 		// no implementation available, let's exit immediately
-
 		#end
 	}
 }
diff --git a/std/haxe/EnumFlags.hx b/std/haxe/EnumFlags.hx
index 4268d454f16821b04feb25dfcda13c49635926df..02d81bc7b830356348202381d8564c2afd50b955 100644
--- a/std/haxe/EnumFlags.hx
+++ b/std/haxe/EnumFlags.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 /**
@@ -28,11 +29,10 @@ package haxe;
 
 	Enum constructor indices are preserved from Haxe syntax, so the first
 	declared is index 0, the next index 1 etc. The methods are optimized if the
-	enum instance is passed directly, e.g. as has(EnumCtor). Otherwise
-	Type.enumIndex() reflection is used.
+	enum instance is passed directly, e.g. as `has(EnumCtor)`. Otherwise
+	`Type.enumIndex()` reflection is used.
 **/
 abstract EnumFlags<T:EnumValue>(Int) {
-
 	/**
 		Initializes the bitflags to `i`.
 	**/
@@ -44,11 +44,11 @@ abstract EnumFlags<T:EnumValue>(Int) {
 		Checks if the index of enum instance `v` is set.
 
 		This method is optimized if `v` is an enum instance expression such as
-		SomeEnum.SomeCtor.
+		`SomeEnum.SomeCtor`.
 
-		If `v` is null, the result is unspecified.
+		If `v` is `null`, the result is unspecified.
 	**/
-	public inline function has( v : T ) : Bool {
+	public inline function has(v:T):Bool {
 		return this & (1 << Type.enumIndex(v)) != 0;
 	}
 
@@ -56,11 +56,11 @@ abstract EnumFlags<T:EnumValue>(Int) {
 		Sets the index of enum instance `v`.
 
 		This method is optimized if `v` is an enum instance expression such as
-		SomeEnum.SomeCtor.
+		`SomeEnum.SomeCtor`.
 
-		If `v` is null, the result is unspecified.
+		If `v` is `null`, the result is unspecified.
 	**/
-	public inline function set( v : T ) : Void {
+	public inline function set(v:T):Void {
 		this |= 1 << Type.enumIndex(v);
 	}
 
@@ -68,11 +68,11 @@ abstract EnumFlags<T:EnumValue>(Int) {
 		Unsets the index of enum instance `v`.
 
 		This method is optimized if `v` is an enum instance expression such as
-		SomeEnum.SomeCtor.
+		`SomeEnum.SomeCtor`.
 
-		If `v` is null, the result is unspecified.
+		If `v` is `null`, the result is unspecified.
 	**/
-	public inline function unset( v : T ) : Void {
+	public inline function unset(v:T):Void {
 		this &= 0xFFFFFFFF - (1 << Type.enumIndex(v));
 	}
 
@@ -80,7 +80,7 @@ abstract EnumFlags<T:EnumValue>(Int) {
 		Convert a integer bitflag into a typed one (this is a no-op, it does not
 		have any impact on speed).
 	**/
-	public inline static function ofInt<T:EnumValue>( i : Int ) : EnumFlags<T> {
+	public inline static function ofInt<T:EnumValue>(i:Int):EnumFlags<T> {
 		return new EnumFlags<T>(i);
 	}
 
@@ -88,7 +88,7 @@ abstract EnumFlags<T:EnumValue>(Int) {
 		Convert the typed bitflag into the corresponding int value (this is a
 		no-op, it doesn't have any impact on speed).
 	**/
-	public inline function toInt() : Int {
+	public inline function toInt():Int {
 		return this;
 	}
 }
diff --git a/std/haxe/EnumTools.hx b/std/haxe/EnumTools.hx
index 93129ee6a77a55aa62b7a4c258e8d4aeeb1e134a..583f9f2c5943785a462774d526d3d3b0cccafd0d 100644
--- a/std/haxe/EnumTools.hx
+++ b/std/haxe/EnumTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,11 @@ package haxe;
 
 /**
 	This class provides advanced methods on enums. It is ideally used with
-	`using EnumTools` and then acts as an 
-  [extension](https://haxe.org/manual/lf-static-extension.html) to the 
-  `enum` types.
+	`using EnumTools` and then acts as an
+	  [extension](https://haxe.org/manual/lf-static-extension.html) to the
+	  `enum` types.
 
-	If the first argument to any of the methods is null, the result is
+	If the first argument to any of the methods is `null`, the result is
 	unspecified.
 **/
 extern class EnumTools {
@@ -37,7 +37,9 @@ extern class EnumTools {
 
 		If `e` is inside a package, the package structure is returned dot-
 		separated, with another dot separating the enum name:
+		
 			pack1.pack2.(...).packN.EnumName
+
 		If `e` is a sub-type of a Haxe module, that module is not part of the
 		package structure.
 
@@ -112,15 +114,14 @@ extern class EnumTools {
 
 /**
 	This class provides advanced methods on enum values. It is ideally used with
-	`using EnumValueTools` and then acts as an 
-  [extension](https://haxe.org/manual/lf-static-extension.html) to the 
-  `EnumValue` types.
+	`using EnumValueTools` and then acts as an
+	  [extension](https://haxe.org/manual/lf-static-extension.html) to the
+	  `EnumValue` types.
 
-	If the first argument to any of the methods is null, the result is
+	If the first argument to any of the methods is `null`, the result is
 	unspecified.
 **/
 extern class EnumValueTools {
-
 	/**
 		Recursively compares two enum instances `a` and `b` by value.
 
@@ -169,36 +170,4 @@ extern class EnumValueTools {
 	static public inline function getIndex(e:EnumValue):Int {
 		return Type.enumIndex(e);
 	}
-
-	/**
-		Matches enum instance `e` against pattern `pattern`, returning `true` if
-		matching succeeded and `false` otherwise.
-
-		Example usage:
-
-		```haxe
-		if (e.match(pattern)) {
-			// codeIfTrue
-		} else {
-			// codeIfFalse
-		}
-		```
-
-		This is equivalent to the following code:
-
-		```haxe
-		switch (e) {
-			case pattern:
-				// codeIfTrue
-			case _:
-				// codeIfFalse
-		}
-		```
-
-		This method is implemented in the compiler. This definition exists only
-		for documentation.
-	**/
-	static public function match(e:EnumValue, pattern:Dynamic):Bool {
-		return false;
-	}
 }
diff --git a/std/haxe/Http.hx b/std/haxe/Http.hx
index f104502a00214b4f96b4f25ac1560f970ca93472..2d23db2e05f7b4dbd22ab2f3c6a3b377e5b511cc 100644
--- a/std/haxe/Http.hx
+++ b/std/haxe/Http.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,824 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe;
-
-#if sys
-
-import sys.net.Host;
-import sys.net.Socket;
-
-#end
-
-/**
-	This class can be used to handle Http requests consistently across
-	platforms. There are two intended usages:
-
-	- call `haxe.Http.requestUrl(url)` and receive the result as a `String`
-	(not available on flash)
-	- create a `new haxe.Http(url)`, register your callbacks for `onData`, 
-	`onError` and `onStatus`, then call `request()`.
-**/
-class Http {
-
-	/**
-		The url of `this` request. It is used only by the `request()` method and
-		can be changed in order to send the same request to different target
-		Urls.
-	**/
-	public var url : String;
-	public var responseData(default, null) : Null<String>;
-#if sys
-	public var noShutdown : Bool;
-	public var cnxTimeout : Float;
-	public var responseHeaders : Map<String,String>;
-	var chunk_size : Null<Int>;
-	var chunk_buf : haxe.io.Bytes;
-	var file : { param : String, filename : String, io : haxe.io.Input, size : Int, mimeType : String };
-#elseif (js && !nodejs)
-	public var async : Bool;
-	public var withCredentials : Bool;
-#end
-	var postData : String;
-	var headers : List<{ header:String, value:String }>;
-	var params : List<{ param:String, value:String }>;
-
-	#if sys
-	public static var PROXY : { host : String, port : Int, auth : { user : String, pass : String } } = null;
-	#end
-
-	/**
-		Creates a new Http instance with `url` as parameter.
-
-		This does not do a request until `request()` is called.
-
-		If `url` is null, the field url must be set to a value before making the
-		call to `request()`, or the result is unspecified.
-
-		(Php) Https (SSL) connections are allowed only if the OpenSSL extension
-		is enabled.
-	**/
-	public function new( url : String ) {
-		this.url = url;
-		headers = new List<{ header:String, value:String }>();
-		params = new List<{ param:String, value:String }>();
-
-		#if (js && !nodejs)
-		async = true;
-		withCredentials = false;
-		#elseif sys
-		cnxTimeout = 10;
-		#end
-		#if php
-		noShutdown = ! untyped __call__('function_exists', 'stream_socket_shutdown');
-		#end
-	}
-
-	/**
-		Sets the header identified as `header` to value `value`.
-
-		If `header` or `value` are null, the result is unspecified.
-
-		This method provides a fluent interface.
-	**/
-	public function setHeader( header : String, value : String ):Http {
-		headers = Lambda.filter(headers, function(h) return h.header != header);
-		headers.push({ header:header, value:value });
-		return this;
-	}
-
-	public function addHeader( header : String, value : String ):Http {
-		headers.push({ header:header, value:value });
-		return this;
-	}
-
-	/**
-		Sets the parameter identified as `param` to value `value`.
-
-		If `header` or `value` are null, the result is unspecified.
-
-		This method provides a fluent interface.
-	**/
-	public function setParameter( param : String, value : String ):Http {
-		params = Lambda.filter(params, function(p) return p.param != param);
-		params.push({ param:param, value:value });
-		return this;
-	}
-
-	public function addParameter( param : String, value : String ):Http {
-		params.push({ param:param, value:value });
-		return this;
-	}
-
-	/**
-		Sets the post data of `this` Http request to `data`.
-
-		There can only be one post data per request. Subsequent calls overwrite
-		the previously set value.
-
-		If `data` is null, the post data is considered to be absent.
-
-		This method provides a fluent interface.
-	**/
-	public function setPostData( data : String ):Http {
-		postData = data;
-		return this;
-	}
-
-	#if (js || flash)
-
-	#if nodejs
-	var req:js.node.http.ClientRequest;
-	#elseif js
-	var req:js.html.XMLHttpRequest;
-	#elseif flash
-	var req:flash.net.URLLoader;
-	#end
-
-	/**
-		Cancels `this` Http request if `request` has been called and a response
-		has not yet been received.
-	**/
-	public function cancel()
-	{
-		if (req == null) return;
-		#if js
-		req.abort();
-		#elseif flash
-		req.close();
-		#end
-		req = null;
-	}
-	#end
-
-	/**
-		Sends `this` Http request to the Url specified by `this.url`.
-
-		If `post` is true, the request is sent as POST request, otherwise it is
-		sent as GET request.
 
-		Depending on the outcome of the request, this method calls the
-		`onStatus()`, `onError()` or `onData()` callback functions.
-
-		If `this.url` is null, the result is unspecified.
-
-		If `this.url` is an invalid or inaccessible Url, the `onError()` callback
-		function is called.
-
-		[js] If `this.async` is false, the callback functions are called before
-		this method returns.
-	**/
-	public function request( ?post : Bool ) : Void {
-		var me = this;
-	#if nodejs
-		me.responseData = null;
-		var parsedUrl = js.node.Url.parse(url);
-		var secure = (parsedUrl.protocol == "https:");
-		var host = parsedUrl.hostname;
-		var path = parsedUrl.path;
-		var port = if (parsedUrl.port != null) Std.parseInt(parsedUrl.port) else (secure ? 443 : 80);
-		var h:Dynamic = {};
-		for (i in headers) {
-			var arr = Reflect.field(h, i.header);
-			if (arr == null) {
-				arr = new Array<String>();
-				Reflect.setField(h, i.header, arr);
-			}
-			
-			arr.push(i.value);
-		}
-		var uri = postData;
-		if( uri != null )
-			post = true;
-		else for( p in params ) {
-			if( uri == null )
-				uri = "";
-			else
-				uri += "&";
-			uri += StringTools.urlEncode(p.param)+"="+StringTools.urlEncode(p.value);
-		}
-		var question = path.split("?").length <= 1;
-		if (!post && uri != null) path += (if( question ) "?" else "&") + uri;
-		
-		var opts = {
-			protocol: parsedUrl.protocol,
-			hostname: host,
-			port: port,
-			method: post ? 'POST' : 'GET',
-			path: path,
-			headers: h
-		};
-		function httpResponse (res) {
-			var s = res.statusCode;
-			if (s != null)
-				me.onStatus(s);
-			var body = '';
-			res.on('data', function (d) {
-				body += d;
-			});
-			res.on('end', function (_) {
-				me.responseData = body;
-				me.req = null;
-				if (s != null && s >= 200 && s < 400) {
-					me.onData(body);
-				} else {
-					me.onError("Http Error #"+s);
-				}
-			});
-		}
-		req = secure ? js.node.Https.request(untyped opts, httpResponse) : js.node.Http.request(untyped opts, httpResponse);
-		if (post) req.write(uri);
-		req.end();
-	#elseif js
-		me.responseData = null;
-		var r = req = js.Browser.createXMLHttpRequest();
-		var onreadystatechange = function(_) {
-			if( r.readyState != 4 )
-				return;
-			var s = try r.status catch( e : Dynamic ) null;
-			if ( s != null && untyped __js__('"undefined" !== typeof window') ) {
-				// If the request is local and we have data: assume a success (jQuery approach):
-				var protocol = js.Browser.location.protocol.toLowerCase();
-				var rlocalProtocol = ~/^(?:about|app|app-storage|.+-extension|file|res|widget):$/;
-				var isLocal = rlocalProtocol.match( protocol );
-				if ( isLocal ) {
-					s = r.responseText != null ? 200 : 404;
-				}
-			}
-			if( s == untyped __js__("undefined") )
-				s = null;
-			if( s != null )
-				me.onStatus(s);
-			if( s != null && s >= 200 && s < 400 ) {
-				me.req = null;
-				me.onData(me.responseData = r.responseText);
-			}
-			else if ( s == null ) {
-				me.req = null;
-				me.onError("Failed to connect or resolve host");
-			}
-			else switch( s ) {
-			case 12029:
-				me.req = null;
-				me.onError("Failed to connect to host");
-			case 12007:
-				me.req = null;
-				me.onError("Unknown host");
-			default:
-				me.req = null;
-				me.responseData = r.responseText;
-				me.onError("Http Error #"+r.status);
-			}
-		};
-		if( async )
-			r.onreadystatechange = onreadystatechange;
-		var uri = postData;
-		if( uri != null )
-			post = true;
-		else for( p in params ) {
-			if( uri == null )
-				uri = "";
-			else
-				uri += "&";
-			uri += StringTools.urlEncode(p.param)+"="+StringTools.urlEncode(p.value);
-		}
-		try {
-			if( post )
-				r.open("POST",url,async);
-			else if( uri != null ) {
-				var question = url.split("?").length <= 1;
-				r.open("GET",url+(if( question ) "?" else "&")+uri,async);
-				uri = null;
-			} else
-				r.open("GET",url,async);
-		} catch( e : Dynamic ) {
-			me.req = null;
-			onError(e.toString());
-			return;
-		}
-		r.withCredentials = withCredentials;
-		if( !Lambda.exists(headers, function(h) return h.header == "Content-Type") && post && postData == null )
-			r.setRequestHeader("Content-Type","application/x-www-form-urlencoded");
-
-		for( h in headers )
-			r.setRequestHeader(h.header,h.value);
-		r.send(uri);
-		if( !async )
-			onreadystatechange(null);
-	#elseif flash
-		me.responseData = null;
-		var loader = req = new flash.net.URLLoader();
-		loader.addEventListener( "complete", function(e) {
-			me.req = null;
-			me.responseData = loader.data;
-			me.onData( loader.data );
-		});
-		loader.addEventListener( "httpStatus", function(e:flash.events.HTTPStatusEvent){
-			// on Firefox 1.5, Flash calls onHTTPStatus with 0 (!??)
-			if( e.status != 0 )
-				me.onStatus( e.status );
-		});
-		loader.addEventListener( "ioError", function(e:flash.events.IOErrorEvent){
-			me.req = null;
-			me.responseData = loader.data;
-			me.onError(e.text);
-		});
-		loader.addEventListener( "securityError", function(e:flash.events.SecurityErrorEvent){
-			me.req = null;
-			me.onError(e.text);
-		});
-
-		// headers
-		var param = false;
-		var vars = new flash.net.URLVariables();
-		for( p in params ){
-			param = true;
-			Reflect.setField(vars,p.param,p.value);
-		}
-		var small_url = url;
-		if( param && !post ){
-			var k = url.split("?");
-			if( k.length > 1 ) {
-				small_url = k.shift();
-				vars.decode(k.join("?"));
-			}
-		}
-		// Bug in flash player 9 ???
-		var bug = small_url.split("xxx");
-
-		var request = new flash.net.URLRequest( small_url );
-		for( h in headers )
-			request.requestHeaders.push( new flash.net.URLRequestHeader(h.header,h.value) );
-
-		if( postData != null ) {
-			request.data = postData;
-			request.method = "POST";
-		} else {
-			request.data = vars;
-			request.method = if( post ) "POST" else "GET";
-		}
-
-		try {
-			loader.load( request );
-		}catch( e : Dynamic ){
-			me.req = null;
-			onError("Exception: "+Std.string(e));
-		}
-	#elseif sys
-		var me = this;
-		var output = new haxe.io.BytesOutput();
-		var old = onError;
-		var err = false;
-		onError = function(e) {
-			#if neko
-			me.responseData = neko.Lib.stringReference(output.getBytes());
-			#else
-			me.responseData = output.getBytes().toString();
-			#end
-			err = true;
-			// Resetting back onError before calling it allows for a second "retry" request to be sent without onError being wrapped twice
-			onError = old;
-			onError(e);
-		}
-		customRequest(post,output);
-		if( !err )
-		#if neko
-			me.onData(me.responseData = neko.Lib.stringReference(output.getBytes()));
-		#else
-			me.onData(me.responseData = output.getBytes().toString());
-		#end
-	#end
-	}
+package haxe;
 
 #if sys
-
-	/**
-      Note: Deprecated in 4.0
-	 **/
-	@:noCompletion
-	inline public function fileTransfert( argname : String, filename : String, file : haxe.io.Input, size : Int, mimeType = "application/octet-stream" ) {
-	    fileTransfer(argname, filename, file, size, mimeType);
-    }
-
-	public function fileTransfer( argname : String, filename : String, file : haxe.io.Input, size : Int, mimeType = "application/octet-stream" ) {
-		this.file = { param : argname, filename : filename, io : file, size : size, mimeType : mimeType };
-	}
-
-	public function customRequest( post : Bool, api : haxe.io.Output, ?sock : sys.net.Socket, ?method : String  ) {
-		this.responseData = null;
-		var url_regexp = ~/^(https?:\/\/)?([a-zA-Z\.0-9_-]+)(:[0-9]+)?(.*)$/;
-		if( !url_regexp.match(url) ) {
-			onError("Invalid URL");
-			return;
-		}
-		var secure = (url_regexp.matched(1) == "https://");
-		if( sock == null ) {
-			if( secure ) {
-				#if php
-				sock = new php.net.SslSocket();
-				#elseif java
-				sock = new java.net.SslSocket();
-				#elseif (!no_ssl && (hxssl || hl || cpp || (neko && !(macro || interp))))
-				sock = new sys.ssl.Socket();
-				#else
-				throw "Https is only supported with -lib hxssl";
-				#end
-			} else
-				sock = new Socket();
-		}
-		var host = url_regexp.matched(2);
-		var portString = url_regexp.matched(3);
-		var request = url_regexp.matched(4);
-		if( request == "" )
-			request = "/";
-		var port = if ( portString == null || portString == "" ) secure ? 443 : 80 else Std.parseInt(portString.substr(1, portString.length - 1));
-		var data;
-
-		var multipart = (file != null);
-		var boundary = null;
-		var uri = null;
-		if( multipart ) {
-			post = true;
-			boundary = Std.string(Std.random(1000))+Std.string(Std.random(1000))+Std.string(Std.random(1000))+Std.string(Std.random(1000));
-			while( boundary.length < 38 )
-				boundary = "-" + boundary;
-			var b = new StringBuf();
-			for( p in params ) {
-				b.add("--");
-				b.add(boundary);
-				b.add("\r\n");
-				b.add('Content-Disposition: form-data; name="');
-				b.add(p.param);
-				b.add('"');
-				b.add("\r\n");
-				b.add("\r\n");
-				b.add(p.value);
-				b.add("\r\n");
-			}
-			b.add("--");
-			b.add(boundary);
-			b.add("\r\n");
-			b.add('Content-Disposition: form-data; name="');
-			b.add(file.param);
-			b.add('"; filename="');
-			b.add(file.filename);
-			b.add('"');
-			b.add("\r\n");
-			b.add("Content-Type: "+file.mimeType+"\r\n"+"\r\n");
-			uri = b.toString();
-		} else {
-			for( p in params ) {
-				if( uri == null )
-					uri = "";
-				else
-					uri += "&";
-				uri += StringTools.urlEncode(p.param)+"="+StringTools.urlEncode(p.value);
-			}
-		}
-
-		var b = new StringBuf();
-		if( method != null ) {
-			b.add(method);
-			b.add(" ");
-		} else if( post )
-			b.add("POST ");
-		else
-			b.add("GET ");
-
-		if( Http.PROXY != null ) {
-			b.add("http://");
-			b.add(host);
-			if( port != 80 ) {
-				b.add(":");
-				b.add(port);
-			}
-		}
-		b.add(request);
-
-		if( !post && uri != null ) {
-			if( request.indexOf("?",0) >= 0 )
-				b.add("&");
-			else
-				b.add("?");
-			b.add(uri);
-		}
-		b.add(" HTTP/1.1\r\nHost: "+host+"\r\n");
-		if( postData != null )
-			b.add("Content-Length: "+postData.length+"\r\n");
-		else if( post && uri != null ) {
-			if( multipart || !Lambda.exists(headers, function(h) return h.header == "Content-Type") ) {
-				b.add("Content-Type: ");
-				if( multipart ) {
-					b.add("multipart/form-data");
-					b.add("; boundary=");
-					b.add(boundary);
-				} else
-					b.add("application/x-www-form-urlencoded");
-				b.add("\r\n");
-			}
-			if( multipart )
-				b.add("Content-Length: "+(uri.length+file.size+boundary.length+6)+"\r\n");
-			else
-				b.add("Content-Length: "+uri.length+"\r\n");
-		}
-		b.add("Connection: close\r\n");
-		for( h in headers ) {
-			b.add(h.header);
-			b.add(": ");
-			b.add(h.value);
-			b.add("\r\n");
-		}
-		b.add("\r\n");
-		if( postData != null)
-			b.add(postData);
-		else if( post && uri != null )
-			b.add(uri);
-		try {
-			if( Http.PROXY != null )
-				sock.connect(new Host(Http.PROXY.host),Http.PROXY.port);
-			else
-				sock.connect(new Host(host),port);
-			sock.write(b.toString());
-			if( multipart ) {
-				var bufsize = 4096;
-				var buf = haxe.io.Bytes.alloc(bufsize);
-				while( file.size > 0 ) {
-					var size = if( file.size > bufsize ) bufsize else file.size;
-					var len = 0;
-					try {
-						len = file.io.readBytes(buf,0,size);
-					} catch( e : haxe.io.Eof ) break;
-					sock.output.writeFullBytes(buf,0,len);
-					file.size -= len;
-				}
-				sock.write("\r\n");
-				sock.write("--");
-				sock.write(boundary);
-				sock.write("--");
-			}
-			readHttpResponse(api,sock);
-			sock.close();
-		} catch( e : Dynamic ) {
-			try sock.close() catch( e : Dynamic ) { };
-			onError(Std.string(e));
-		}
-	}
-
-	function readHttpResponse( api : haxe.io.Output, sock : sys.net.Socket ) {
-		// READ the HTTP header (until \r\n\r\n)
-		var b = new haxe.io.BytesBuffer();
-		var k = 4;
-		var s = haxe.io.Bytes.alloc(4);
-		sock.setTimeout(cnxTimeout);
-		while( true ) {
-			var p = sock.input.readBytes(s,0,k);
-			while( p != k )
-				p += sock.input.readBytes(s,p,k - p);
-			b.addBytes(s,0,k);
-			switch( k ) {
-			case 1:
-				var c = s.get(0);
-				if( c == 10 )
-					break;
-				if( c == 13 )
-					k = 3;
-				else
-					k = 4;
-			case 2:
-				var c = s.get(1);
-				if( c == 10 ) {
-					if( s.get(0) == 13 )
-						break;
-					k = 4;
-				} else if( c == 13 )
-					k = 3;
-				else
-					k = 4;
-			case 3:
-				var c = s.get(2);
-				if( c == 10 ) {
-					if( s.get(1) != 13 )
-						k = 4;
-					else if( s.get(0) != 10 )
-						k = 2;
-					else
-						break;
-				} else if( c == 13 ) {
-					if( s.get(1) != 10 || s.get(0) != 13 )
-						k = 1;
-					else
-						k = 3;
-				} else
-					k = 4;
-			case 4:
-				var c = s.get(3);
-				if( c == 10 ) {
-					if( s.get(2) != 13 )
-						continue;
-					else if( s.get(1) != 10 || s.get(0) != 13 )
-						k = 2;
-					else
-						break;
-				} else if( c == 13 ) {
-					if( s.get(2) != 10 || s.get(1) != 13 )
-						k = 3;
-					else
-						k = 1;
-				}
-			}
-		}
-		#if neko
-		var headers = neko.Lib.stringReference(b.getBytes()).split("\r\n");
-		#else
-		var headers = b.getBytes().toString().split("\r\n");
-		#end
-		var response = headers.shift();
-		var rp = response.split(" ");
-		var status = Std.parseInt(rp[1]);
-		if( status == 0 || status == null )
-			throw "Response status error";
-
-		// remove the two lasts \r\n\r\n
-		headers.pop();
-		headers.pop();
-		responseHeaders = new haxe.ds.StringMap();
-		var size = null;
-		var chunked = false;
-		for( hline in headers ) {
-			var a = hline.split(": ");
-			var hname = a.shift();
-			var hval = if( a.length == 1 ) a[0] else a.join(": ");
-			hval = StringTools.ltrim( StringTools.rtrim( hval ) );
-			responseHeaders.set(hname, hval);
-			switch(hname.toLowerCase())
-			{
-				case "content-length":
-					size = Std.parseInt(hval);
-				case "transfer-encoding":
-					chunked = (hval.toLowerCase() == "chunked");
-			}
-		}
-
-		onStatus(status);
-
-		var chunk_re = ~/^([0-9A-Fa-f]+)[ ]*\r\n/m;
-		chunk_size = null;
-		chunk_buf = null;
-
-		var bufsize = 1024;
-		var buf = haxe.io.Bytes.alloc(bufsize);
-		if( chunked ) {
-			try {
-				while( true ) {
-					var len = sock.input.readBytes(buf,0,bufsize);
-					if( !readChunk(chunk_re,api,buf,len) )
-						break;
-				}
-			} catch ( e : haxe.io.Eof ) {
-				throw "Transfer aborted";
-			}
-		} else if( size == null ) {
-			if( !noShutdown )
-				sock.shutdown(false,true);
-			try {
-				while( true ) {
-					var len = sock.input.readBytes(buf,0,bufsize);
-					api.writeBytes(buf,0,len);
-				}
-			} catch( e : haxe.io.Eof ) {
-			}
-		} else {
-			api.prepare(size);
-			try {
-				while( size > 0 ) {
-					var len = sock.input.readBytes(buf,0,if( size > bufsize ) bufsize else size);
-					api.writeBytes(buf,0,len);
-					size -= len;
-				}
-			} catch( e : haxe.io.Eof ) {
-				throw "Transfer aborted";
-			}
-		}
-		if( chunked && (chunk_size != null || chunk_buf != null) )
-			throw "Invalid chunk";
-		if( status < 200 || status >= 400 )
-			throw "Http Error #"+status;
-		api.close();
-	}
-
-	function readChunk(chunk_re : EReg, api : haxe.io.Output, buf : haxe.io.Bytes, len ) {
-		if( chunk_size == null ) {
-			if( chunk_buf != null ) {
-				var b = new haxe.io.BytesBuffer();
-				b.add(chunk_buf);
-				b.addBytes(buf,0,len);
-				buf = b.getBytes();
-				len += chunk_buf.length;
-				chunk_buf = null;
-			}
-			#if neko
-			if( chunk_re.match(neko.Lib.stringReference(buf)) ) {
-			#else
-			if( chunk_re.match(buf.toString()) ) {
-			#end
-				var p = chunk_re.matchedPos();
-				if( p.len <= len ) {
-					var cstr = chunk_re.matched(1);
-					chunk_size = Std.parseInt("0x"+cstr);
-					if( cstr == "0" ) {
-						chunk_size = null;
-						chunk_buf = null;
-						return false;
-					}
-					len -= p.len;
-					return readChunk(chunk_re,api,buf.sub(p.len,len),len);
-				}
-			}
-			// prevent buffer accumulation
-			if( len > 10 ) {
-				onError("Invalid chunk");
-				return false;
-			}
-			chunk_buf = buf.sub(0,len);
-			return true;
-		}
-		if( chunk_size > len ) {
-			chunk_size -= len;
-			api.writeBytes(buf,0,len);
-			return true;
-		}
-		var end = chunk_size + 2;
-		if( len >= end ) {
-			if( chunk_size > 0 )
-				api.writeBytes(buf,0,chunk_size);
-			len -= end;
-			chunk_size = null;
-			if( len == 0 )
-				return true;
-			return readChunk(chunk_re,api,buf.sub(end,len),len);
-		}
-		if( chunk_size > 0 )
-			api.writeBytes(buf,0,chunk_size);
-		chunk_size -= len;
-		return true;
-	}
-
+typedef Http = sys.Http;
+#elseif nodejs
+typedef Http = haxe.http.HttpNodeJs;
+#elseif js
+typedef Http = haxe.http.HttpJs;
+#else
+typedef Http = haxe.http.HttpBase;
 #end
-
-	/**
-		This method is called upon a successful request, with `data` containing
-		the result String.
-
-		The intended usage is to bind it to a custom function:  
-		`httpInstance.onData = function(data) { // handle result }`
-	**/
-	public dynamic function onData( data : String ) {
-	}
-
-	/**
-		This method is called upon a request error, with `msg` containing the
-		error description.
-
-		The intended usage is to bind it to a custom function:  
-		`httpInstance.onError = function(msg) { // handle error }`
-	**/
-	public dynamic function onError( msg : String ) {
-	}
-
-	/**
-		This method is called upon a Http status change, with `status` being the
-		new status.
-
-		The intended usage is to bind it to a custom function:  
-		`httpInstance.onStatus = function(status) { // handle status }`
-	**/
-	public dynamic function onStatus( status : Int ) {
-	}
-
-#if (!flash && !nodejs)
-	/**
-		Makes a synchronous request to `url`.
-
-		This creates a new Http instance and makes a GET request by calling its
-		`request(false)` method.
-
-		If `url` is null, the result is unspecified.
-	**/
-	public static function requestUrl( url : String ) : String {
-		var h = new Http(url);
-	#if js
-		h.async = false;
-	#end
-		var r = null;
-		h.onData = function(d){
-			r = d;
-		}
-		h.onError = function(e){
-			throw e;
-		}
-		h.request(false);
-		return r;
-	}
-#end
-
-}
diff --git a/std/haxe/Int32.hx b/std/haxe/Int32.hx
index b37d6371cee03f0a2d71c18e682983a2e4280592..5c1210049ec88466fd85f7dca969e4e7119392a5 100644
--- a/std/haxe/Int32.hx
+++ b/std/haxe/Int32.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package haxe;
 
- /**
- 	Int32 provides a 32-bit integer with consistent overflow behavior across
- 	all platforms.
- **/
+package haxe;
+
+/**
+	Int32 provides a 32-bit integer with consistent overflow behavior across
+	all platforms.
+**/
 abstract Int32(Int) from Int to Int {
-	@:op(-A) private function negate():Int32;
+	@:op(-A) private inline function negate():Int32
+		return clamp(~this + 1);
 
 	@:op(++A) private inline function preIncrement():Int32
 		return this = clamp(++this);
@@ -47,28 +49,27 @@ abstract Int32(Int) from Int to Int {
 	}
 
 	@:op(A + B) private static inline function add(a:Int32, b:Int32):Int32
-		return clamp( (a : Int) + (b : Int) );
+		return clamp((a : Int) + (b : Int));
 
 	@:op(A + B) @:commutative private static inline function addInt(a:Int32, b:Int):Int32
-		return clamp( (a : Int) + (b : Int) );
+		return clamp((a : Int) + (b : Int));
 
 	@:op(A + B) @:commutative private static function addFloat(a:Int32, b:Float):Float;
 
 	@:op(A - B) private static inline function sub(a:Int32, b:Int32):Int32
-		return clamp( (a : Int) - (b : Int) );
+		return clamp((a : Int) - (b : Int));
 
 	@:op(A - B) private static inline function subInt(a:Int32, b:Int):Int32
-		return clamp( (a : Int) - (b : Int) );
+		return clamp((a : Int) - (b : Int));
 
 	@:op(A - B) private static inline function intSub(a:Int, b:Int32):Int32
-		return clamp( (a : Int) - (b : Int) );
+		return clamp((a : Int) - (b : Int));
 
 	@:op(A - B) private static function subFloat(a:Int32, b:Float):Float;
 
 	@:op(A - B) public static function floatSub(a:Float, b:Int32):Float;
 
 	#if (as3 || js || php || python || lua)
-
 	#if js
 	// on JS we want to try using Math.imul, but we have to assign that function to Int32.mul only once,
 	// or else V8 will deoptimize it, so we need to be a bit funky with this.
@@ -76,161 +77,193 @@ abstract Int32(Int) from Int to Int {
 	@:op(A * B) inline static function mul(a:Int32, b:Int32):Int32
 		return _mul(a, b);
 
-	static var _mul:Int32->Int32->Int32 = untyped
-		if (Math.imul != null)
+	static var _mul:Int32->Int32->Int32 = untyped if (Math.imul != null)
 			Math.imul
 		else
-			function(a:Int32, b:Int32):Int32
-				return clamp( (a : Int) * ((b : Int) & 0xFFFF) + clamp( (a : Int) * ((b : Int) >>> 16) << 16 ) );
-
+			function(a:Int32, b:Int32):Int32 return clamp((a : Int) * ((b : Int) & 0xFFFF) + clamp((a : Int) * ((b : Int) >>> 16) << 16));
 	#else
 	@:op(A * B) private static function mul(a:Int32, b:Int32):Int32
-		return clamp( (a : Int) * ((b : Int) & 0xFFFF) + clamp( (a : Int) * ((b : Int) >>> 16) << 16 ) );
+		return clamp((a : Int) * ((b : Int) & 0xFFFF) + clamp((a : Int) * ((b : Int) >>> 16) << 16));
 	#end
 
 	@:op(A * B) @:commutative private static inline function mulInt(a:Int32, b:Int):Int32
 		return mul(a, b);
-
 	#else
-
 	@:op(A * B) private static function mul(a:Int32, b:Int32):Int32;
-	@:op(A * B) @:commutative private static function mulInt(a:Int32, b:Int):Int32;
 
+	@:op(A * B) @:commutative private static function mulInt(a:Int32, b:Int):Int32;
 	#end
 
 	@:op(A * B) @:commutative private static function mulFloat(a:Int32, b:Float):Float;
 
 	@:op(A / B) private static function div(a:Int32, b:Int32):Float;
+
 	@:op(A / B) private static function divInt(a:Int32, b:Int):Float;
+
 	@:op(A / B) private static function intDiv(a:Int, b:Int32):Float;
+
 	@:op(A / B) private static function divFloat(a:Int32, b:Float):Float;
+
 	@:op(A / B) private static function floatDiv(a:Float, b:Int32):Float;
 
 	@:op(A % B) private static function mod(a:Int32, b:Int32):Int32;
+
 	@:op(A % B) private static function modInt(a:Int32, b:Int):Int;
+
 	@:op(A % B) private static function intMod(a:Int, b:Int32):Int;
+
 	@:op(A % B) private static function modFloat(a:Int32, b:Float):Float;
+
 	@:op(A % B) private static function floatMod(a:Float, b:Int32):Float;
 
 	@:op(A == B) private static function eq(a:Int32, b:Int32):Bool;
+
 	@:op(A == B) @:commutative private static function eqInt(a:Int32, b:Int):Bool;
+
 	@:op(A == B) @:commutative private static function eqFloat(a:Int32, b:Float):Bool;
 
 	@:op(A != B) private static function neq(a:Int32, b:Int32):Bool;
+
 	@:op(A != B) @:commutative private static function neqInt(a:Int32, b:Int):Bool;
+
 	@:op(A != B) @:commutative private static function neqFloat(a:Int32, b:Float):Bool;
 
 	@:op(A < B) private static function lt(a:Int32, b:Int32):Bool;
+
 	@:op(A < B) private static function ltInt(a:Int32, b:Int):Bool;
+
 	@:op(A < B) private static function intLt(a:Int, b:Int32):Bool;
+
 	@:op(A < B) private static function ltFloat(a:Int32, b:Float):Bool;
+
 	@:op(A < B) private static function floatLt(a:Float, b:Int32):Bool;
 
 	@:op(A <= B) private static function lte(a:Int32, b:Int32):Bool;
+
 	@:op(A <= B) private static function lteInt(a:Int32, b:Int):Bool;
+
 	@:op(A <= B) private static function intLte(a:Int, b:Int32):Bool;
+
 	@:op(A <= B) private static function lteFloat(a:Int32, b:Float):Bool;
+
 	@:op(A <= B) private static function floatLte(a:Float, b:Int32):Bool;
 
 	@:op(A > B) private static function gt(a:Int32, b:Int32):Bool;
+
 	@:op(A > B) private static function gtInt(a:Int32, b:Int):Bool;
+
 	@:op(A > B) private static function intGt(a:Int, b:Int32):Bool;
+
 	@:op(A > B) private static function gtFloat(a:Int32, b:Float):Bool;
+
 	@:op(A > B) private static function floatGt(a:Float, b:Int32):Bool;
 
 	@:op(A >= B) private static function gte(a:Int32, b:Int32):Bool;
+
 	@:op(A >= B) private static function gteInt(a:Int32, b:Int):Bool;
+
 	@:op(A >= B) private static function intGte(a:Int, b:Int32):Bool;
+
 	@:op(A >= B) private static function gteFloat(a:Int32, b:Float):Bool;
+
 	@:op(A >= B) private static function floatGte(a:Float, b:Int32):Bool;
 
-	#if lua
-	@:op(~A) private static inline function complement( a : Int32 ) : Int32
-		return lua.Boot.clamp(~a);
+	#if (lua || python || php)
+	@:op(~A) private static inline function complement(a:Int32):Int32
+		#if lua return lua.Boot.clampInt32(~a); #else return clamp(~a); #end
 	#else
 	@:op(~A) private function complement():Int32;
 	#end
 
 	@:op(A & B) private static function and(a:Int32, b:Int32):Int32;
+
 	@:op(A & B) @:commutative private static function andInt(a:Int32, b:Int):Int32;
 
-	#if lua
-	@:op(A | B) private static function or(a:Int32, b:Int32):Int32
-		return clamp((a:Int) | (b:Int));
-	@:op(A | B) @:commutative private static function orInt(a:Int32, b:Int):Int32
-		return clamp((a:Int) | b);
+	#if (lua || python || php)
+	@:op(A | B) private static #if (python || php) inline #end function or(a:Int32, b:Int32):Int32
+		return clamp((a : Int) | (b : Int));
+
+	@:op(A | B) @:commutative private #if (python || php) inline #end static function orInt(a:Int32, b:Int):Int32
+		return clamp((a : Int) | b);
 	#else
 	@:op(A | B) private static function or(a:Int32, b:Int32):Int32;
+
 	@:op(A | B) @:commutative private static function orInt(a:Int32, b:Int):Int32;
 	#end
 
-	#if lua
-	@:op(A ^ B) private static function xor(a:Int32, b:Int32):Int32
-		return clamp((a:Int) ^ (b:Int));
-	@:op(A ^ B) @:commutative private static function xorInt(a:Int32, b:Int):Int32
-		return clamp((a:Int) ^ b);
+	#if (lua || python || php)
+	@:op(A ^ B) private static #if (python || php) inline #end function xor(a:Int32, b:Int32):Int32
+		return clamp((a : Int) ^ (b : Int));
+
+	@:op(A ^ B) @:commutative private static #if (python || php) inline #end function xorInt(a:Int32, b:Int):Int32
+		return clamp((a : Int) ^ b);
 	#else
 	@:op(A ^ B) private static function xor(a:Int32, b:Int32):Int32;
+
 	@:op(A ^ B) @:commutative private static function xorInt(a:Int32, b:Int):Int32;
 	#end
 
+	#if (lua || python || php)
+	@:op(A >> B) private static #if (python || php) inline #end function shr(a:Int32, b:Int32):Int32
+		return clamp((a : Int) >> (b : Int));
+
+	@:op(A >> B) private static #if (python || php) inline #end function shrInt(a:Int32, b:Int):Int32
+		return clamp((a : Int) >> b);
 
-#if lua
-	@:op(A >> B) private static function shr(a:Int32, b:Int32):Int32
-		return clamp((a:Int) >> (b:Int));
-	@:op(A >> B) private static function shrInt(a:Int32, b:Int):Int32
-		return clamp((a:Int) >> b);
-	@:op(A >> B) private static function intShr(a:Int, b:Int32):Int32
-		return clamp(a >> (b:Int));
-#else
+	@:op(A >> B) private static #if (python || php) inline #end function intShr(a:Int, b:Int32):Int32
+		return clamp(a >> (b : Int));
+	#else
 	@:op(A >> B) private static function shr(a:Int32, b:Int32):Int32;
+
 	@:op(A >> B) private static function shrInt(a:Int32, b:Int):Int32;
+
 	@:op(A >> B) private static function intShr(a:Int, b:Int32):Int32;
-#end
+	#end
 
 	@:op(A >>> B) private static function ushr(a:Int32, b:Int32):Int32;
+
 	@:op(A >>> B) private static function ushrInt(a:Int32, b:Int):Int32;
+
 	@:op(A >>> B) private static function intUshr(a:Int, b:Int32):Int32;
 
 	#if (php || python || lua)
-
 	// PHP may be 64-bit, so shifts must be clamped
 	@:op(A << B) private static inline function shl(a:Int32, b:Int32):Int32
-		return clamp( (a : Int) << (b : Int) );
+		return clamp((a : Int) << (b : Int));
 
 	@:op(A << B) private static inline function shlInt(a:Int32, b:Int):Int32
-		return clamp( (a : Int) << b );
+		return clamp((a : Int) << b);
 
 	@:op(A << B) private static inline function intShl(a:Int, b:Int32):Int32
- 		return clamp( a << (b : Int) );
-
+		return clamp(a << (b : Int));
 	#else
-
 	@:op(A << B) private static function shl(a:Int32, b:Int32):Int32;
+
 	@:op(A << B) private static function shlInt(a:Int32, b:Int):Int32;
-	@:op(A << B) private static function intShl(a:Int, b:Int32):Int32;
 
+	@:op(A << B) private static function intShl(a:Int, b:Int32):Int32;
 	#end
 
-
 	@:to private inline function toFloat():Float
 		return this;
 
 	/**
 		Compare `a` and `b` in unsigned mode.
 	**/
-	public static function ucompare( a : Int32, b : Int32 ) : Int {
-		if( a < 0 )
-			return b < 0 ? ( ~b - ~a ) : 1;
+	public static function ucompare(a:Int32, b:Int32):Int {
+		if (a < 0)
+			return b < 0 ? (~b - ~a) : 1;
 		return b < 0 ? -1 : (a - b);
 	}
 
 	#if php
-	static var extraBits : Int = untyped __php__("PHP_INT_SIZE") * 8 - 32;
+	static var extraBits:Int = php.Const.PHP_INT_SIZE * 8 - 32;
 	#end
 
-#if !lua inline #end
-	static function clamp( x : Int ) : Int {
+	#if !lua
+	inline
+	#end
+	static function clamp(x:Int):Int {
 		// force to-int conversion on platforms that require it
 		#if (as3 || js)
 		return x | 0;
@@ -238,9 +271,9 @@ abstract Int32(Int) from Int to Int {
 		// we might be on 64-bit php, so sign extend from 32-bit
 		return (x << extraBits) >> extraBits;
 		#elseif python
-		return python.Syntax.pythonCode("{0} % {1}", (x + python.Syntax.opPow(2, 31)), python.Syntax.opPow(2, 32)) - python.Syntax.opPow(2, 31);
+		return (python.Syntax.code("{0} % {1}", (x + python.Syntax.opPow(2, 31)), python.Syntax.opPow(2, 32)) : Int) - python.Syntax.opPow(2, 31);
 		#elseif lua
-		return lua.Boot.clamp(x);
+		return lua.Boot.clampInt32(x);
 		#else
 		return (x);
 		#end
diff --git a/std/haxe/Int64.hx b/std/haxe/Int64.hx
index e803c8daba362236ed54d2e1858cd64680cded1c..a4c7d202f72081f7a74cb443e3c57b877a430170 100644
--- a/std/haxe/Int64.hx
+++ b/std/haxe/Int64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,51 +19,47 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 using haxe.Int64;
 
- /**
+/**
 	A cross-platform signed 64-bit integer.
 	Int64 instances can be created from two 32-bit words using `Int64.make()`.
- **/
+**/
 #if flash
 @:notNull
 #end
-abstract Int64(__Int64) from __Int64 to __Int64
-{
-	private inline function new( x : __Int64 )
+abstract Int64(__Int64) from __Int64 to __Int64 {
+	private inline function new(x:__Int64)
 		this = x;
 
 	/**
 		Makes a copy of `this` Int64.
 	**/
 	public inline function copy():Int64
-		return make( high, low );
+		return make(high, low);
 
 	/**
 		Construct an Int64 from two 32-bit words `high` and `low`.
 	**/
-	public static inline function make( high:Int32, low:Int32 ) : Int64
-		return new Int64( new __Int64(high, low) );
+	public static inline function make(high:Int32, low:Int32):Int64
+		return new Int64(new __Int64(high, low));
 
 	/**
 		Returns an Int64 with the value of the Int `x`.
 		`x` is sign-extended to fill 64 bits.
 	**/
-	@:from public static inline function ofInt( x : Int ) : Int64
-#if lua
-		return make( (x:Int32) >> 31, (x:Int32));
-#else
-		return make( x >> 31, x );
-#end
+	@:from public static inline function ofInt(x:Int):Int64
+		#if lua return make((x : Int32) >> 31, (x : Int32)); #else return make(x >> 31, x); #end
 
 	/**
 		Returns an Int with the value of the Int64 `x`.
 		Throws an exception  if `x` cannot be represented in 32 bits.
 	**/
-	public static inline function toInt( x : Int64 ) : Int {
-		if( x.high != x.low >> 31 )
+	public static inline function toInt(x:Int64):Int {
+		if (x.high != x.low >> 31)
 			throw "Overflow";
 
 		return x.low;
@@ -72,33 +68,33 @@ abstract Int64(__Int64) from __Int64 to __Int64
 	/**
 		Returns whether the value `val` is of type `haxe.Int64`
 	**/
-	inline public static function is( val : Dynamic ) : Bool
-		return Std.is(val,__Int64);
+	inline public static function is(val:Dynamic):Bool
+		return Std.is(val, __Int64);
 
 	/**
 		Returns the high 32-bit word of `x`.
 	**/
 	@:deprecated("Use high instead")
-	public static inline function getHigh( x : Int64 ) : Int32
+	public static inline function getHigh(x:Int64):Int32
 		return x.high;
 
 	/**
 		Returns the low 32-bit word of `x`.
 	**/
 	@:deprecated("Use low instead")
-	public static inline function getLow( x : Int64 ) : Int32
+	public static inline function getLow(x:Int64):Int32
 		return x.low;
 
 	/**
 		Returns `true` if `x` is less than zero.
 	**/
-	public static inline function isNeg( x : Int64) : Bool
+	public static inline function isNeg(x:Int64):Bool
 		return x.high < 0;
 
 	/**
 		Returns `true` if `x` is exactly zero.
 	**/
-	public static inline function isZero( x : Int64 ) : Bool
+	public static inline function isZero(x:Int64):Bool
 		return x == 0;
 
 	/**
@@ -106,9 +102,9 @@ abstract Int64(__Int64) from __Int64 to __Int64
 		Returns a negative value if `a < b`, positive if `a > b`,
 		or 0 if `a == b`.
 	**/
-	public static inline function compare( a : Int64, b : Int64 ) : Int {
+	public static inline function compare(a:Int64, b:Int64):Int {
 		var v = a.high - b.high;
-		v = if( v != 0 ) v else Int32.ucompare(a.low, b.low);
+		v = if (v != 0) v else Int32.ucompare(a.low, b.low);
 		return a.high < 0 ? (b.high < 0 ? v : -1) : (b.high >= 0 ? v : 1);
 	}
 
@@ -117,31 +113,30 @@ abstract Int64(__Int64) from __Int64 to __Int64
 		Returns a negative value if `a < b`, positive if `a > b`,
 		or 0 if `a == b`.
 	**/
-	public static inline function ucompare( a : Int64, b : Int64 ) : Int {
+	public static inline function ucompare(a:Int64, b:Int64):Int {
 		var v = Int32.ucompare(a.high, b.high);
-		return if( v != 0 ) v else Int32.ucompare(a.low, b.low);
+		return if (v != 0) v else Int32.ucompare(a.low, b.low);
 	}
 
 	/**
 		Returns a signed decimal `String` representation of `x`.
 	**/
-	public static inline function toStr(x:Int64) : String
+	public static inline function toStr(x:Int64):String
 		return x.toString();
 
-	#if as3 public #else private #end function toString() : String
-	{
-		var i : Int64 = cast this;
-		if ( i == 0 )
+	#if as3 public #else private #end function toString():String {
+		var i:Int64 = cast this;
+		if (i == 0)
 			return "0";
 		var str = "";
 		var neg = false;
-		if( i.isNeg() ) {
+		if (i.isNeg()) {
 			neg = true;
 			// i = -i; cannot negate here as --9223372036854775808 = -9223372036854775808
 		}
-		var ten : Int64 = 10;
-		while( i != 0 ) {
-			var r = i.divMod( ten );
+		var ten:Int64 = 10;
+		while (i != 0) {
+			var r = i.divMod(ten);
 			if (r.modulus.isNeg()) {
 				str = Int64.neg(r.modulus).low + str;
 				i = Int64.neg(r.quotient);
@@ -150,30 +145,31 @@ abstract Int64(__Int64) from __Int64 to __Int64
 				i = r.quotient;
 			}
 		}
-		if( neg ) str = "-" + str;
+		if (neg)
+			str = "-" + str;
 		return str;
 	}
 
-	public static inline function parseString( sParam : String ) : Int64 {
-		return Int64Helper.parseString( sParam );
+	public static inline function parseString(sParam:String):Int64 {
+		return Int64Helper.parseString(sParam);
 	}
 
-	public static inline function fromFloat( f : Float ) : Int64 {
-		return Int64Helper.fromFloat( f );
+	public static inline function fromFloat(f:Float):Int64 {
+		return Int64Helper.fromFloat(f);
 	}
 
 	/**
 		Performs signed integer divison of `dividend` by `divisor`.
 		Returns `{ quotient : Int64, modulus : Int64 }`.
 	**/
-	public static function divMod( dividend : Int64, divisor : Int64 ) : { quotient : Int64, modulus : Int64 }
-	{
+	public static function divMod(dividend:Int64, divisor:Int64):{quotient:Int64, modulus:Int64} {
 		// Handle special cases of 0 and 1
-		if( divisor.high == 0 )
-		{
-			switch( divisor.low ) {
-				case 0: throw "divide by zero";
-				case 1: return { quotient : dividend.copy(), modulus : 0 };
+		if (divisor.high == 0) {
+			switch (divisor.low) {
+				case 0:
+					throw "divide by zero";
+				case 1:
+					return {quotient: dividend.copy(), modulus: 0};
 			}
 		}
 
@@ -182,18 +178,19 @@ abstract Int64(__Int64) from __Int64 to __Int64
 		var modulus = dividend.isNeg() ? -dividend : dividend.copy();
 		divisor = divisor.isNeg() ? -divisor : divisor;
 
-		var quotient : Int64 = 0;
-		var mask : Int64 = 1;
+		var quotient:Int64 = 0;
+		var mask:Int64 = 1;
 
-		while( !divisor.isNeg() ) {
-			var cmp = ucompare( divisor, modulus );
+		while (!divisor.isNeg()) {
+			var cmp = ucompare(divisor, modulus);
 			divisor <<= 1;
 			mask <<= 1;
-			if( cmp >= 0 ) break;
+			if (cmp >= 0)
+				break;
 		}
 
-		while( mask != 0 ) {
-			if( ucompare(modulus, divisor) >= 0 ) {
+		while (mask != 0) {
+			if (ucompare(modulus, divisor) >= 0) {
 				quotient |= mask;
 				modulus -= divisor;
 			}
@@ -201,47 +198,51 @@ abstract Int64(__Int64) from __Int64 to __Int64
 			divisor >>>= 1;
 		}
 
-		if( divSign ) quotient = -quotient;
-		if( dividend.isNeg() ) modulus = -modulus;
+		if (divSign)
+			quotient = -quotient;
+		if (dividend.isNeg())
+			modulus = -modulus;
 
 		return {
-			quotient : quotient,
-			modulus  : modulus
+			quotient: quotient,
+			modulus: modulus
 		};
 	}
 
 	/**
 		Returns the negative of `x`.
 	**/
-	@:op(-A) public static inline function neg( x : Int64 ) : Int64 {
+	@:op(-A) public static inline function neg(x:Int64):Int64 {
 		var high = ~x.high;
 		var low = -x.low;
-		if( low == 0 )
+		if (low == 0)
 			high++;
-		return make( high, low );
+		return make(high, low);
 	}
 
-	@:op(++A) private inline function preIncrement() : Int64 {
+	@:op(++A) private inline function preIncrement():Int64 {
 		this = copy();
 		this.low++;
-		if( this.low == 0 ) this.high++;
+		if (this.low == 0)
+			this.high++;
 		return cast this;
 	}
 
-	@:op(A++) private inline function postIncrement() : Int64 {
+	@:op(A++) private inline function postIncrement():Int64 {
 		var ret = this;
 		preIncrement();
 		return ret;
 	}
 
-	@:op(--A) private inline function preDecrement() : Int64 {
+	@:op(--A) private inline function preDecrement():Int64 {
 		this = copy();
-		if( this.low == 0 ) this.high--;
+		if (this.low == 0)
+			this.high--;
 		this.low--;
 		return cast this;
 	}
 
-	@:op(A--) private inline function postDecrement() : Int64 {
+	@:op(A--) private inline function postDecrement():Int64 {
 		var ret = this;
 		preDecrement();
 		return ret;
@@ -250,36 +251,39 @@ abstract Int64(__Int64) from __Int64 to __Int64
 	/**
 		Returns the sum of `a` and `b`.
 	**/
-	@:op(A + B) public static inline function add( a : Int64, b : Int64 ) : Int64 {
+	@:op(A + B) public static inline function add(a:Int64, b:Int64):Int64 {
 		var high = a.high + b.high;
 		var low = a.low + b.low;
-		if( Int32.ucompare( low, a.low ) < 0 ) high++;
-		return make( high, low );
+		if (Int32.ucompare(low, a.low) < 0)
+			high++;
+		return make(high, low);
 	}
 
-	@:op(A + B) @:commutative private static inline function addInt( a : Int64, b : Int ) : Int64
-		return add( a, b );
+	@:op(A + B) @:commutative private static inline function addInt(a:Int64, b:Int):Int64
+		return add(a, b);
 
 	/**
 		Returns `a` minus `b`.
 	**/
-	@:op(A - B) public static inline function sub( a : Int64, b : Int64 ) : Int64 {
+	@:op(A - B) public static inline function sub(a:Int64, b:Int64):Int64 {
 		var high = a.high - b.high;
 		var low = a.low - b.low;
-		if( Int32.ucompare( a.low, b.low ) < 0 ) high--;
-        return make( high, low );
+		if (Int32.ucompare(a.low, b.low) < 0)
+			high--;
+		return make(high, low);
 	}
 
-	@:op(A - B) private static inline function subInt( a : Int64, b : Int ) : Int64
-		return sub( a, b );
+	@:op(A - B) private static inline function subInt(a:Int64, b:Int):Int64
+		return sub(a, b);
 
-	@:op(A - B) private static inline function intSub( a : Int, b : Int64 ) : Int64
-		return sub( a, b );
+	@:op(A - B) private static inline function intSub(a:Int, b:Int64):Int64
+		return sub(a, b);
 
 	/**
 		Returns the product of `a` and `b`.
 	**/
-	@:op(A * B) public static #if !lua inline #end function mul( a : Int64, b : Int64 ) : Int64 {
+	@:op(A * B)
+	public static #if !lua inline #end function mul(a:Int64, b:Int64):Int64 {
 		var mask = 0xFFFF;
 		var al = a.low & mask, ah = a.low >>> 16;
 		var bl = b.low & mask, bh = b.low >>> 16;
@@ -291,181 +295,185 @@ abstract Int64(__Int64) from __Int64 to __Int64
 		var high = p11 + (p01 >>> 16) + (p10 >>> 16);
 		p01 <<= 16;
 		low += p01;
-		if( Int32.ucompare(low, p01) < 0 ) high++;
+		if (Int32.ucompare(low, p01) < 0)
+			high++;
 		p10 <<= 16;
 		low += p10;
-		if( Int32.ucompare(low, p10) < 0 ) high++;
+		if (Int32.ucompare(low, p10) < 0)
+			high++;
 		high += a.low * b.high + a.high * b.low;
-		return make( high, low );
+		return make(high, low);
 	}
 
-	@:op(A * B) @:commutative private static inline function mulInt( a : Int64, b : Int ) : Int64
-		return mul( a, b );
+	@:op(A * B) @:commutative private static inline function mulInt(a:Int64, b:Int):Int64
+		return mul(a, b);
 
 	/**
 		Returns the quotient of `a` divided by `b`.
 	**/
-	@:op(A / B) public static inline function div( a : Int64, b : Int64 ) : Int64
+	@:op(A / B) public static inline function div(a:Int64, b:Int64):Int64
 		return divMod(a, b).quotient;
 
-	@:op(A / B) private static inline function divInt( a : Int64, b : Int ) : Int64
-		return div( a, b );
+	@:op(A / B) private static inline function divInt(a:Int64, b:Int):Int64
+		return div(a, b);
 
-	@:op(A / B) private static inline function intDiv( a : Int, b : Int64 ) : Int64
-		return div( a, b ).toInt();
+	@:op(A / B) private static inline function intDiv(a:Int, b:Int64):Int64
+		return div(a, b).toInt();
 
 	/**
 		Returns the modulus of `a` divided by `b`.
 	**/
-	@:op(A % B) public static inline function mod( a : Int64, b : Int64 ) : Int64
+	@:op(A % B) public static inline function mod(a:Int64, b:Int64):Int64
 		return divMod(a, b).modulus;
 
-	@:op(A % B) private static inline function modInt( a : Int64, b : Int ) : Int64
-		return mod( a, b ).toInt();
+	@:op(A % B) private static inline function modInt(a:Int64, b:Int):Int64
+		return mod(a, b).toInt();
 
-	@:op(A % B) private static inline function intMod( a : Int, b : Int64 ) : Int64
-		return mod( a, b ).toInt();
+	@:op(A % B) private static inline function intMod(a:Int, b:Int64):Int64
+		return mod(a, b).toInt();
 
 	/**
 		Returns `true` if `a` is equal to `b`.
 	**/
-	@:op(A == B) public static inline function eq( a : Int64, b : Int64 ) : Bool
+	@:op(A == B) public static inline function eq(a:Int64, b:Int64):Bool
 		return a.high == b.high && a.low == b.low;
 
-	@:op(A == B) @:commutative private static inline function eqInt( a : Int64, b : Int ) : Bool
-		return eq( a, b );
+	@:op(A == B) @:commutative private static inline function eqInt(a:Int64, b:Int):Bool
+		return eq(a, b);
 
 	/**
 		Returns `true` if `a` is not equal to `b`.
 	**/
-	@:op(A != B) public static inline function neq( a : Int64, b : Int64 ) : Bool
+	@:op(A != B) public static inline function neq(a:Int64, b:Int64):Bool
 		return a.high != b.high || a.low != b.low;
 
-	@:op(A != B) @:commutative private static inline function neqInt( a : Int64, b : Int ) : Bool
+	@:op(A != B) @:commutative private static inline function neqInt(a:Int64, b:Int):Bool
 		return neq(a, b);
 
-	@:op(A < B) private static inline function lt( a : Int64, b : Int64 ) : Bool
+	@:op(A < B) private static inline function lt(a:Int64, b:Int64):Bool
 		return compare(a, b) < 0;
 
-	@:op(A < B) private static inline function ltInt( a : Int64, b : Int ) : Bool
+	@:op(A < B) private static inline function ltInt(a:Int64, b:Int):Bool
 		return lt(a, b);
 
-	@:op(A < B) private static inline function intLt( a : Int, b : Int64 ) : Bool
+	@:op(A < B) private static inline function intLt(a:Int, b:Int64):Bool
 		return lt(a, b);
 
-	@:op(A <= B) private static inline function lte( a : Int64, b : Int64 ) : Bool
+	@:op(A <= B) private static inline function lte(a:Int64, b:Int64):Bool
 		return compare(a, b) <= 0;
 
-	@:op(A <= B) private static inline function lteInt( a : Int64, b : Int ) : Bool
+	@:op(A <= B) private static inline function lteInt(a:Int64, b:Int):Bool
 		return lte(a, b);
 
-	@:op(A <= B) private static inline function intLte( a : Int, b : Int64 ) : Bool
+	@:op(A <= B) private static inline function intLte(a:Int, b:Int64):Bool
 		return lte(a, b);
 
-	@:op(A > B) private static inline function gt( a : Int64, b : Int64 ) : Bool
+	@:op(A > B) private static inline function gt(a:Int64, b:Int64):Bool
 		return compare(a, b) > 0;
 
-	@:op(A > B) private static inline function gtInt( a : Int64, b : Int ) : Bool
+	@:op(A > B) private static inline function gtInt(a:Int64, b:Int):Bool
 		return gt(a, b);
 
-	@:op(A > B) private static inline function intGt( a : Int, b : Int64 ) : Bool
-		return gt( a, b );
+	@:op(A > B) private static inline function intGt(a:Int, b:Int64):Bool
+		return gt(a, b);
 
-	@:op(A >= B) private static inline function gte( a : Int64, b : Int64 ) : Bool
+	@:op(A >= B) private static inline function gte(a:Int64, b:Int64):Bool
 		return compare(a, b) >= 0;
 
-	@:op(A >= B) private static inline function gteInt( a : Int64, b : Int ) : Bool
+	@:op(A >= B) private static inline function gteInt(a:Int64, b:Int):Bool
 		return gte(a, b);
 
-	@:op(A >= B) private static inline function intGte( a : Int, b : Int64 ) : Bool
+	@:op(A >= B) private static inline function intGte(a:Int, b:Int64):Bool
 		return gte(a, b);
 
 	/**
 		Returns the bitwise NOT of `a`.
 	**/
-	@:op(~A) private static inline function complement( a : Int64 ) : Int64
-		return make( ~a.high, ~a.low );
+	@:op(~A) private static inline function complement(a:Int64):Int64
+		return make(~a.high, ~a.low);
 
 	/**
 		Returns the bitwise AND of `a` and `b`.
 	**/
-	@:op(A & B) public static inline function and( a : Int64, b : Int64 ) : Int64
-		return make( a.high & b.high, a.low & b.low );
+	@:op(A & B) public static inline function and(a:Int64, b:Int64):Int64
+		return make(a.high & b.high, a.low & b.low);
 
 	/**
 		Returns the bitwise OR of `a` and `b`.
 	**/
-	@:op(A | B) public static inline function or( a : Int64, b : Int64 ) : Int64
-		return make( a.high | b.high, a.low | b.low );
+	@:op(A | B) public static inline function or(a:Int64, b:Int64):Int64
+		return make(a.high | b.high, a.low | b.low);
 
 	/**
 		Returns the bitwise XOR of `a` and `b`.
 	**/
-	@:op(A ^ B) public static inline function xor( a : Int64, b : Int64 ) : Int64
-		return make( a.high ^ b.high, a.low ^ b.low );
+	@:op(A ^ B) public static inline function xor(a:Int64, b:Int64):Int64
+		return make(a.high ^ b.high, a.low ^ b.low);
 
 	/**
 		Returns `a` left-shifted by `b` bits.
 	**/
-	@:op(A << B) public static inline function shl( a : Int64, b : Int ) : Int64 {
+	@:op(A << B) public static inline function shl(a:Int64, b:Int):Int64 {
 		b &= 63;
-		return if( b == 0 ) a.copy()
-			else if( b < 32 ) make( (a.high << b) | (a.low >>> (32-b)), a.low << b)
-			else make( a.low << (b-32), 0 );
+		return if (b == 0) a.copy() else if (b < 32) make((a.high << b) | (a.low >>> (32 - b)), a.low << b) else make(a.low << (b - 32), 0);
 	}
 
 	/**
 		Returns `a` right-shifted by `b` bits in signed mode.
 		`a` is sign-extended.
 	**/
-	@:op(A >> B) public static inline function shr( a : Int64, b : Int) : Int64 {
+	@:op(A >> B) public static inline function shr(a:Int64, b:Int):Int64 {
 		b &= 63;
-		return if( b == 0 ) a.copy()
-			else if( b < 32 ) make( a.high >> b, (a.high << (32-b)) | (a.low >>> b) );
-			else make( a.high >> 31, a.high >> (b - 32) );
+		return if (b == 0) a.copy() else if (b < 32) make(a.high >> b, (a.high << (32 - b)) | (a.low >>> b)); else make(a.high >> 31, a.high >> (b - 32));
 	}
 
 	/**
 		Returns `a` right-shifted by `b` bits in unsigned mode.
 		`a` is padded with zeroes.
 	**/
-	@:op(A >>> B) public static inline function ushr( a : Int64, b : Int ) : Int64 {
+	@:op(A >>> B) public static inline function ushr(a:Int64, b:Int):Int64 {
 		b &= 63;
-		return if( b == 0 ) a.copy()
-			else if( b < 32 ) make( a.high >>> b, (a.high << (32-b)) | (a.low >>> b) );
-			else make( 0, a.high >>> (b - 32) );
+		return if (b == 0) a.copy() else if (b < 32) make(a.high >>> b, (a.high << (32 - b)) | (a.low >>> b)); else make(0, a.high >>> (b - 32));
 	}
 
-	public var high(get, never) : Int32;
-	private inline function get_high() return this.high;
-	private inline function set_high(x) return this.high = x;
+	public var high(get, never):Int32;
+
+	private inline function get_high()
+		return this.high;
+
+	private inline function set_high(x)
+		return this.high = x;
+
+	public var low(get, never):Int32;
+
+	private inline function get_low()
+		return this.low;
 
-	public var low(get, never) : Int32;
-	private inline function get_low() return this.low;
-	private inline function set_low(x) return this.low = x;
+	private inline function set_low(x)
+		return this.low = x;
 }
 
 /**
-  * This typedef will fool @:coreApi into thinking that we are using
-  * the same underlying type, even though it might be different on
-  * specific platforms.
-  */
+	This typedef will fool `@:coreApi` into thinking that we are using
+	the same underlying type, even though it might be different on
+	specific platforms.
+**/
 private typedef __Int64 = ___Int64;
 
 private class ___Int64 {
-	public var high : Int32;
-	public var low : Int32;
+	public var high:Int32;
+	public var low:Int32;
 
-	public inline function new( high, low ) {
+	public inline function new(high, low) {
 		this.high = high;
 		this.low = low;
 	}
 
 	/**
 		We also define toString here to ensure we always get a pretty string
-		when tracing or calling Std.string. This tends not to happen when
-		toString is only in the abstract.
+		when tracing or calling `Std.string`. This tends not to happen when
+		`toString` is only in the abstract.
 	**/
-	public function toString() : String
-		return Int64.toStr( cast this );
+	public function toString():String
+		return Int64.toStr(cast this);
 }
diff --git a/std/haxe/Int64Helper.hx b/std/haxe/Int64Helper.hx
index ba0ab8c6092dd4990e35913fef190318a7bbbd48..bd34c341fed1113057c5c13e90c6a00625155e7b 100644
--- a/std/haxe/Int64Helper.hx
+++ b/std/haxe/Int64Helper.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 using haxe.Int64;
@@ -32,7 +33,7 @@ class Int64Helper {
 	/**
 		Create `Int64` from given string.
 	**/
-	public static function parseString( sParam : String ) : Int64 {
+	public static function parseString(sParam:String):Int64 {
 		var base = Int64.ofInt(10);
 		var current = Int64.ofInt(0);
 		var multiplier = Int64.ofInt(1);
@@ -52,18 +53,21 @@ class Int64Helper {
 				throw "NumberFormatError";
 			}
 
-			var digit:Int64 = Int64.ofInt(digitInt);
-			if (sIsNegative) {
-				current = Int64.sub(current, Int64.mul(multiplier, digit));
-				if (!Int64.isNeg(current)) {
-					throw "NumberFormatError: Underflow";
-				}
-			} else {
-				current = Int64.add(current, Int64.mul(multiplier, digit));
-				if (Int64.isNeg(current)) {
-					throw "NumberFormatError: Overflow";
+			if (digitInt != 0) {
+				var digit:Int64 = Int64.ofInt(digitInt);
+				if (sIsNegative) {
+					current = Int64.sub(current, Int64.mul(multiplier, digit));
+					if (!Int64.isNeg(current)) {
+						throw "NumberFormatError: Underflow";
+					}
+				} else {
+					current = Int64.add(current, Int64.mul(multiplier, digit));
+					if (Int64.isNeg(current)) {
+						throw "NumberFormatError: Overflow";
+					}
 				}
 			}
+
 			multiplier = Int64.mul(multiplier, base);
 		}
 		return current;
@@ -72,14 +76,17 @@ class Int64Helper {
 	/**
 		Create `Int64` from given float.
 	**/
-	public static function fromFloat( f : Float ) : Int64 {
+	public static function fromFloat(f:Float):Int64 {
 		if (Math.isNaN(f) || !Math.isFinite(f)) {
 			throw "Number is NaN or Infinite";
 		}
 
 		var noFractions = f - (f % 1);
 
-		// 2^53-1 and -2^53: these are parseable without loss of precision
+		// 2^53-1 and -2^53+1: these are parseable without loss of precision.
+		// In theory 2^53 and -2^53 are parseable too, but then there's no way to
+		// distinguish 2^53 from 2^53+1
+		// (i.e. trace(9007199254740992. + 1. > 9007199254740992.); // false!)
 		if (noFractions > 9007199254740991) {
 			throw "Conversion overflow";
 		}
diff --git a/std/haxe/Json.hx b/std/haxe/Json.hx
index aa16564dbcd34b8e6d16f97ef82ace1f15d97873..18a7dc4dbb9ccd94c6b7791f804ff6b0ef22411e 100644
--- a/std/haxe/Json.hx
+++ b/std/haxe/Json.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 /**
@@ -29,7 +30,6 @@ package haxe;
 	@see https://haxe.org/manual/std-Json.html
 **/
 class Json {
-
 	/**
 		Parses given JSON-encoded `text` and returns the resulting object.
 
@@ -40,7 +40,7 @@ class Json {
 
 		@see https://haxe.org/manual/std-Json-parsing.html
 	**/
-	public static inline function parse( text : String ) : Dynamic {
+	public static inline function parse(text:String):Dynamic {
 		return haxe.format.JsonParser.parse(text);
 	}
 
@@ -50,14 +50,13 @@ class Json {
 		If `replacer` is given and is not null, it is used to retrieve the
 		actual object to be encoded. The `replacer` function takes two parameters,
 		the key and the value being encoded. Initial key value is an empty string.
-		
+
 		If `space` is given and is not null, the result will be pretty-printed.
 		Successive levels will be indented by this string.
 
 		@see https://haxe.org/manual/std-Json-encoding.html
 	**/
-	public static inline function stringify( value : Dynamic, ?replacer:Dynamic -> Dynamic -> Dynamic, ?space : String ) : String {
+	public static inline function stringify(value:Dynamic, ?replacer:(key:Dynamic, value:Dynamic) -> Dynamic, ?space:String):String {
 		return haxe.format.JsonPrinter.print(value, replacer, space);
 	}
-
 }
diff --git a/std/haxe/Log.hx b/std/haxe/Log.hx
index 8c9b7a944dc443b42e6ebd858423969d5d841441..9814dde23db4284be504fcda0c7705ff073c35c1 100644
--- a/std/haxe/Log.hx
+++ b/std/haxe/Log.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 /**
@@ -26,6 +27,19 @@ package haxe;
 	`trace()` in Haxe code.
 **/
 class Log {
+	/**
+		Format the output of `trace` before printing it.
+	**/
+	public static function formatOutput(v:Dynamic, infos:PosInfos):String {
+		var str = Std.string(v);
+		if (infos == null)
+			return str;
+		var pstr = infos.fileName + ":" + infos.lineNumber;
+		if (infos.customParams != null)
+			for (v in infos.customParams)
+				str += ", " + Std.string(v);
+		return pstr + ": " + str;
+	}
 
 	/**
 		Outputs `v` in a platform-dependent way.
@@ -34,6 +48,7 @@ class Log {
 		information about the position where the `trace()` call was made.
 
 		This method can be rebound to a custom function:
+
 			var oldTrace = haxe.Log.trace; // store old function
 			haxe.Log.trace = function(v, ?infos) {
 			  // handle trace
@@ -44,102 +59,17 @@ class Log {
 		If it is bound to null, subsequent calls to `trace()` will cause an
 		exception.
 	**/
-	public static dynamic function trace( v : Dynamic, ?infos : PosInfos ) : Void {
-		#if flash
-			#if (fdb || native_trace)
-				var pstr = infos == null ? "(null)" : infos.fileName + ":" + infos.lineNumber;
-				var str = flash.Boot.__string_rec(v, "");
-				if( infos != null && infos.customParams != null ) for( v in infos.customParams ) str += "," + flash.Boot.__string_rec(v, "");
-				untyped __global__["trace"](pstr+": "+str);
-			#else
-				untyped flash.Boot.__trace(v,infos);
-			#end
-		#elseif neko
-			untyped {
-				$print(infos.fileName + ":" + infos.lineNumber + ": ", v);
-				if( infos.customParams != null ) for( v in infos.customParams ) $print(",", v);
-				$print("\n");
-			}
-		#elseif js
-			untyped js.Boot.__trace(v,infos);
-		#elseif (php && php7)
-			php.Boot.trace(v, infos);
-		#elseif php
-			if (infos!=null && infos.customParams!=null) {
-				var extra:String = "";
-				for( v in infos.customParams )
-					extra += "," + v;
-				untyped __call__('_hx_trace', v + extra, infos);
-			}
-			else
-				untyped __call__('_hx_trace', v, infos);
-		#elseif cpp
-			if (infos!=null && infos.customParams!=null) {
-				var extra:String = "";
-				for( v in infos.customParams )
-					extra += "," + v;
-				untyped __trace(v + extra,infos);
-			}
-			else
-				untyped __trace(v,infos);
-		#elseif (cs || java || lua)
-			var str:String = null;
-			if (infos != null) {
-				str = infos.fileName + ":" + infos.lineNumber + ": " + v;
-				if (infos.customParams != null)
-				{
-					str += "," + infos.customParams.join(",");
-				}
-			} else {
-				str = v;
-			}
-			#if cs
-			cs.system.Console.WriteLine(str);
-			#elseif java
-			untyped __java__("java.lang.System.out.println(str)");
-			#elseif lua
-			if (str == null) str = "null";
-			untyped __define_feature__("use._hx_print",_hx_print(str));
-			#end
-		#elseif (python)
-			var str:String = null;
-			if (infos != null) {
-				str = infos.fileName + ":" + Std.string(infos.lineNumber) + ": " + v;
-				if (infos.customParams != null) {
-					str += "," + infos.customParams.join(",");
-				}
-			} else {
-				str = v;
-			}
-			python.Lib.println(str);
-		#elseif hl
-			var pstr = infos == null ? "(null)" : infos.fileName + ":" + infos.lineNumber;
-			var str = Std.string(v);
-			if( infos != null && infos.customParams != null ) for( v in infos.customParams ) str += "," + Std.string(v);
-			Sys.println(pstr+": "+str);
-		#end
-	}
-
-	#if (flash || js)
-	/**
-		Clears the trace output.
-	**/
-	public static dynamic function clear() : Void {
-		#if flash
-		untyped flash.Boot.__clear_trace();
-		#elseif js
-		untyped js.Boot.__clear_trace();
+	public static dynamic function trace(v:Dynamic, ?infos:PosInfos):Void {
+		var str = formatOutput(v, infos);
+		#if js
+		if (js.Syntax.typeof(untyped console) != "undefined" && (untyped console).log != null)
+			(untyped console).log(str);
+		#elseif lua
+		untyped __define_feature__("use._hx_print", _hx_print(str));
+		#elseif sys
+		Sys.println(str);
+		#else
+		throw "Not implemented"
 		#end
 	}
-	#end
-
-	#if flash
-	/**
-		Sets the color of the trace output to `rgb`.
-	**/
-	public static dynamic function setColor( rgb : Int ) {
-		untyped flash.Boot.__set_trace_color(rgb);
-	}
-	#end
-
 }
diff --git a/std/haxe/MainLoop.hx b/std/haxe/MainLoop.hx
index 8a2f45510e1037bbd71d5d595fd56c1266daeccf..96a6fa933742d8bd03fb4526657e343ef54b006a 100644
--- a/std/haxe/MainLoop.hx
+++ b/std/haxe/MainLoop.hx
@@ -1,82 +1,96 @@
 package haxe;
+
 import haxe.EntryPoint;
 
 class MainEvent {
+	var f:Void->Void;
+	var prev:MainEvent;
+	var next:MainEvent;
 
-	var f : Void -> Void;
-	var prev : MainEvent;
-	var next : MainEvent;
-	public var nextRun(default,null) : Float;
-	public var priority(default,null) : Int;
+	/**
+		Tells if the event can lock the process from exiting (default:true)
+	**/
+	public var isBlocking:Bool = true;
+
+	public var nextRun(default, null):Float;
+	public var priority(default, null):Int;
 
 	function new(f, p) {
 		this.f = f;
 		this.priority = p;
-		nextRun = -1;
+		nextRun = Math.NEGATIVE_INFINITY;
 	}
 
 	/**
 		Delay the execution of the event for the given time, in seconds.
 		If t is null, the event will be run at tick() time.
 	**/
-	public function delay( t : Null<Float> ) {
-		nextRun = t == null ? -1 : haxe.Timer.stamp() + t;
+	public function delay(t:Null<Float>) {
+		nextRun = t == null ? Math.NEGATIVE_INFINITY : haxe.Timer.stamp() + t;
 	}
 
 	/**
-		Call the event. Will do nothing is the event has been stopped.
+		Call the event. Will do nothing if the event has been stopped.
 	**/
 	public inline function call() {
-		if( f != null ) f();
+		if (f != null)
+			f();
 	}
 
 	/**
 		Stop the event from firing anymore.
 	**/
 	public function stop() {
-		if( f == null ) return;
+		if (f == null)
+			return;
 		f = null;
-		nextRun = -1;
-		if( prev == null )
+		nextRun = Math.NEGATIVE_INFINITY;
+		if (prev == null)
 			@:privateAccess MainLoop.pending = next;
 		else
 			prev.next = next;
-		if( next != null )
+		if (next != null)
 			next.prev = prev;
 	}
-
 }
 
 @:access(haxe.MainEvent)
 class MainLoop {
+	static var pending:MainEvent;
 
-	static var pending : MainEvent = null;
+	public static var threadCount(get, never):Int;
 
-	public static var threadCount(get, never) : Int;
+	inline static function get_threadCount()
+		return EntryPoint.threadCount;
 
-	inline static function get_threadCount() return EntryPoint.threadCount;
-
-	public inline static function hasEvents() {
-		return pending != null;
+	public static function hasEvents() {
+		var p = pending;
+		while (p != null) {
+			if (p.isBlocking)
+				return true;
+			p = p.next;
+		}
+		return false;
 	}
 
-	public static function addThread( f : Void -> Void ) {
+	public static function addThread(f:Void->Void) {
 		EntryPoint.addThread(f);
 	}
 
-	public static function runInMainThread( f : Void -> Void ) {
+	public static function runInMainThread(f:Void->Void) {
 		EntryPoint.runInMainThread(f);
 	}
 
 	/**
 		Add a pending event to be run into the main loop.
 	**/
-	public static function add( f : Void -> Void, priority = 0 ) : MainEvent @:privateAccess {
-		if( f == null )
+	public static function add(f:Void->Void, priority = 0):MainEvent@:privateAccess {
+		if (f == null)
 			throw "Event function is null";
 		var e = new MainEvent(f, priority);
 		var head = pending;
-		if( head != null ) head.prev = e;
+		if (head != null)
+			head.prev = e;
 		e.next = head;
 		pending = e;
 		return e;
@@ -88,32 +102,36 @@ class MainLoop {
 		// we do then a manual inline, this also allow use to do a Float comparison of nextRun
 		var list = pending;
 
-		if( list == null ) return;
+		if (list == null)
+			return;
 
 		var insize = 1, nmerges, psize = 0, qsize = 0;
-		var p, q, e, tail : MainEvent;
+		var p, q, e, tail:MainEvent;
 
-		while( true ) {
+		while (true) {
 			p = list;
 			list = null;
 			tail = null;
 			nmerges = 0;
-			while( p != null ) {
+			while (p != null) {
 				nmerges++;
 				q = p;
 				psize = 0;
-				for( i in 0...insize ) {
+				for (i in 0...insize) {
 					psize++;
 					q = q.next;
-					if( q == null ) break;
+					if (q == null)
+						break;
 				}
 				qsize = insize;
-				while( psize > 0 || (qsize > 0 && q != null) ) {
-					if( psize == 0 ) {
+				while (psize > 0 || (qsize > 0 && q != null)) {
+					if (psize == 0) {
 						e = q;
 						q = q.next;
 						qsize--;
-					} else if( qsize == 0 || q == null || (p.priority > q.priority || (p.priority == q.priority && p.nextRun <= q.nextRun)) ) {
+					} else if (qsize == 0
+						|| q == null
+						|| (p.priority > q.priority || (p.priority == q.priority && p.nextRun <= q.nextRun))) {
 						e = p;
 						p = p.next;
 						psize--;
@@ -122,7 +140,7 @@ class MainLoop {
 						q = q.next;
 						qsize--;
 					}
-					if( tail != null )
+					if (tail != null)
 						tail.next = e;
 					else
 						list = e;
@@ -132,7 +150,7 @@ class MainLoop {
 				p = q;
 			}
 			tail.next = null;
-			if( nmerges <= 1 )
+			if (nmerges <= 1)
 				break;
 			insize *= 2;
 		}
@@ -148,17 +166,16 @@ class MainLoop {
 		var e = pending;
 		var now = haxe.Timer.stamp();
 		var wait = 1e9;
-		while( e != null ) {
+		while (e != null) {
 			var next = e.next;
 			var wt = e.nextRun - now;
-			if( e.nextRun < 0 || wt <= 0 ) {
+			if (wt <= 0) {
 				wait = 0;
 				e.call();
-			} else if( wait > wt )
+			} else if (wait > wt)
 				wait = wt;
 			e = next;
 		}
 		return wait;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/haxe/PosInfos.hx b/std/haxe/PosInfos.hx
index 8a18c39ddf3c10b628c4b3dbebd9841210445133..944de6c3441831def526e17dcc83cc4541be7a67 100644
--- a/std/haxe/PosInfos.hx
+++ b/std/haxe/PosInfos.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,23 +19,24 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 /**
-	PosInfos is a magic type which can be used to generate position information
+	`PosInfos` is a magic type which can be used to generate position information
 	into the output for debugging use.
 
 	If a function has a final optional argument of this type, i.e.
-	(..., ?pos:haxe.PosInfos), each call to that function which does not assign
+	`(..., ?pos:haxe.PosInfos)`, each call to that function which does not assign
 	a value to that argument has its position added as call argument.
 
 	This can be used to track positions of calls in e.g. a unit testing
 	framework.
 **/
 typedef PosInfos = {
-	var fileName : String;
-	var lineNumber : Int;
-	var className : String;
-	var methodName : String;
-	@:optional var customParams : Array<Dynamic>;
-}
\ No newline at end of file
+	var fileName:String;
+	var lineNumber:Int;
+	var className:String;
+	var methodName:String;
+	var ?customParams:Array<Dynamic>;
+}
diff --git a/std/haxe/Resource.hx b/std/haxe/Resource.hx
index 683a70614a64904f1d341ba640b54bd5f11036c3..1769ffa1166df8acbf59115401b220b511b357e5 100644
--- a/std/haxe/Resource.hx
+++ b/std/haxe/Resource.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,42 +19,43 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 /**
 	Resource can be used to access resources that were added through the
-	-resource file@name command line parameter.
+	`--resource file@name` command line parameter.
 
-	Depending on their type they can be obtained as String through
-	getString(name), or as binary data through getBytes(name).
+	Depending on their type they can be obtained as `String` through
+	`getString(name)`, or as binary data through `getBytes(name)`.
 
-	A list of all available resource names can be obtained from listNames().
+	A list of all available resource names can be obtained from `listNames()`.
 **/
 class Resource {
-
-	static var content : Array<{ name : String, data : String, str : String }>;
+	static var content:Array<{name:String, data:String, str:String}>;
 
 	/**
 		Lists all available resource names. The resource name is the name part
-		of the -resource file@name command line parameter.
+		of the `--resource file@name` command line parameter.
 	**/
-	public static function listNames() : Array<String> {
+	public static function listNames():Array<String> {
 		return [for (x in content) x.name];
 	}
 
 	/**
-		Retrieves the resource identified by `name` as a String.
+		Retrieves the resource identified by `name` as a `String`.
 
-		If `name` does not match any resource name, null is returned.
+		If `name` does not match any resource name, `null` is returned.
 	**/
-	public static function getString( name : String ) : String {
-		for( x in content )
-			if( x.name == name ) {
+	public static function getString(name:String):String {
+		for (x in content)
+			if (x.name == name) {
 				#if neko
 				return new String(x.data);
 				#else
-				if( x.str != null ) return x.str;
-				var b : haxe.io.Bytes = haxe.crypto.Base64.decode(x.data);
+				if (x.str != null)
+					return x.str;
+				var b:haxe.io.Bytes = haxe.crypto.Base64.decode(x.data);
 				return b.toString();
 				#end
 			}
@@ -65,15 +66,16 @@ class Resource {
 		Retrieves the resource identified by `name` as an instance of
 		haxe.io.Bytes.
 
-		If `name` does not match any resource name, null is returned.
+		If `name` does not match any resource name, `null` is returned.
 	**/
-	public static function getBytes( name : String ) : haxe.io.Bytes {
-		for( x in content )
-			if( x.name == name ) {
+	public static function getBytes(name:String):haxe.io.Bytes {
+		for (x in content)
+			if (x.name == name) {
 				#if neko
 				return haxe.io.Bytes.ofData(cast x.data);
 				#else
-				if( x.str != null ) return haxe.io.Bytes.ofString(x.str);
+				if (x.str != null)
+					return haxe.io.Bytes.ofString(x.str);
 				return haxe.crypto.Base64.decode(x.data);
 				#end
 			}
@@ -83,14 +85,11 @@ class Resource {
 	static function __init__() {
 		#if neko
 		var tmp = untyped __resources__();
-		content = untyped Array.new1(tmp,__dollar__asize(tmp));
-		#elseif php
-		content = null;
+		content = untyped Array.new1(tmp, __dollar__asize(tmp));
 		#elseif as3
 		null;
 		#else
 		content = untyped __resources__();
 		#end
 	}
-
 }
diff --git a/std/haxe/Serializer.hx b/std/haxe/Serializer.hx
index 5fc4a52e9b95c4758e16425c8f64861be27c9873..7d301e0219043b7f37cd013477511b88a880d1a4 100644
--- a/std/haxe/Serializer.hx
+++ b/std/haxe/Serializer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
+import haxe.ds.List;
+
 /**
 	The Serializer class can be used to encode values and objects into a `String`,
 	from which the `Unserializer` class can recreate the original representation.
@@ -37,10 +40,9 @@ package haxe;
 	or may not work for instances of external/native classes.
 
 	The specification of the serialization format can be found here:
-	<https://haxe.org/manual/serialization/format>
+	<https://haxe.org/manual/std-serialization-format.html>
 **/
 class Serializer {
-
 	/**
 		If the values you are serializing can contain circular references or
 		objects repetitions, you should set `USE_CACHE` to true to prevent
@@ -49,8 +51,8 @@ class Serializer {
 		This may also reduce the size of serialization Strings at the expense of
 		performance.
 
-		This value can be changed for individual instances of Serializer by
-		setting their useCache field.
+		This value can be changed for individual instances of `Serializer` by
+		setting their `useCache` field.
 	**/
 	public static var USE_CACHE = false;
 
@@ -61,32 +63,32 @@ class Serializer {
 		suited for long-term storage: If constructors are removed or added from
 		the enum, the indices may no longer match.
 
-		This value can be changed for individual instances of Serializer by
-		setting their useEnumIndex field.
+		This value can be changed for individual instances of `Serializer` by
+		setting their `useEnumIndex` field.
 	**/
 	public static var USE_ENUM_INDEX = false;
 
 	static var BASE64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789%:";
 	static var BASE64_CODES = null;
 
-	var buf : StringBuf;
-	var cache : Array<Dynamic>;
-	var shash : haxe.ds.StringMap<Int>;
-	var scount : Int;
+	var buf:StringBuf;
+	var cache:Array<Dynamic>;
+	var shash:haxe.ds.StringMap<Int>;
+	var scount:Int;
 
 	/**
 		The individual cache setting for `this` Serializer instance.
 
-		See USE_CACHE for a complete description.
+		See `USE_CACHE` for a complete description.
 	**/
-	public var useCache : Bool;
+	public var useCache:Bool;
 
 	/**
 		The individual enum index setting for `this` Serializer instance.
 
-		See USE_ENUM_INDEX for a complete description.
+		See `USE_ENUM_INDEX` for a complete description.
 	**/
-	public var useEnumIndex : Bool;
+	public var useEnumIndex:Bool;
 
 	/**
 		Creates a new Serializer instance.
@@ -95,8 +97,8 @@ class Serializer {
 		internal buffer of this String. Once complete, the contents can be
 		retrieved through a call to `this.toString`.
 
-		Each Serializer instance maintains its own cache if this.useCache` is
-		true.
+		Each `Serializer` instance maintains its own cache if `this.useCache` is
+		`true`.
 	**/
 	public function new() {
 		buf = new StringBuf();
@@ -148,19 +150,19 @@ class Serializer {
 		B : Enum<Dynamic>
 		M : haxe.ds.ObjectMap
 		C : custom
-	*/
-
-	function serializeString( s : String ) {
+	 */
+	function serializeString(s:String) {
 		var x = shash.get(s);
-		if( x != null ) {
+		if (x != null) {
 			buf.add("R");
 			buf.add(x);
 			return;
 		}
-		shash.set(s,scount++);
+		shash.set(s, scount++);
 		#if old_serialize
-			// no more support for -D old_serialize due to 'j' reuse
-			#if error #end
+		// no more support for -D old_serialize due to 'j' reuse
+		#if error
+		#end
 		#end
 		buf.add("y");
 		s = StringTools.urlEncode(s);
@@ -169,16 +171,16 @@ class Serializer {
 		buf.add(s);
 	}
 
-	function serializeRef(v) {
+	function serializeRef(v:Dynamic) {
 		#if js
-		var vt = untyped __js__("typeof")(v);
+		var vt = js.Syntax.typeof(v);
 		#end
-		for( i in 0...cache.length ) {
+		for (i in 0...cache.length) {
 			#if js
 			var ci = cache[i];
-			if( untyped __js__("typeof")(ci) == vt && ci == v ) {
+			if (js.Syntax.typeof(ci) == vt && ci == v) {
 			#else
-			if( cache[i] == v ) {
+			if (cache[i] == v) {
 			#end
 				buf.add("r");
 				buf.add(i);
@@ -192,351 +194,368 @@ class Serializer {
 	#if flash
 	// only the instance variables
 
-	function serializeClassFields(v,c) {
-		var xml : flash.xml.XML = untyped __global__["flash.utils.describeType"](c);
+	function serializeClassFields(v:Dynamic, c:Dynamic) {
+		var xml:flash.xml.XML = untyped __global__["flash.utils.describeType"](c);
 		var vars = xml.factory[0].child("variable");
-		for( i in 0...vars.length() ) {
+		for (i in 0...vars.length()) {
 			var f = vars[i].attribute("name").toString();
-			if( !v.hasOwnProperty(f) )
+			if (!v.hasOwnProperty(f))
 				continue;
 			serializeString(f);
-			serialize(Reflect.field(v,f));
+			serialize(Reflect.field(v, f));
 		}
 		buf.add("g");
 	}
 	#end
 
-	function serializeFields(v) {
-		for( f in Reflect.fields(v) ) {
+	function serializeFields(v:{}) {
+		for (f in Reflect.fields(v)) {
 			serializeString(f);
-			serialize(Reflect.field(v,f));
+			serialize(Reflect.field(v, f));
 		}
 		buf.add("g");
 	}
 
 	/**
-		Serializes `v`.
+	Serializes `v`.
 
-		All haxe-defined values and objects with the exception of functions can
-		be serialized. Serialization of external/native objects is not
-		guaranteed to work.
+	All haxe-defined values and objects with the exception of functions can
+	be serialized. Serialization of external/native objects is not
+	guaranteed to work.
 
-		The values of `this.useCache` and `this.useEnumIndex` may affect
-		serialization output.
-	**/
-	public function serialize( v : Dynamic ) {
-		switch( Type.typeof(v) ) {
-		case TNull:
-			buf.add("n");
-		case TInt:
-			var v : Int = v;
-			if( v == 0 ) {
-				buf.add("z");
-				return;
-			}
-			buf.add("i");
-			buf.add(v);
-		case TFloat:
-			var v : Float = v;
-			if( Math.isNaN(v) )
-				buf.add("k");
-			else if( !Math.isFinite(v) )
-				buf.add(if( v < 0 ) "m" else "p");
-			else {
-				buf.add("d");
+	The values of `this.useCache` and `this.useEnumIndex` may affect
+	serialization output.
+**/
+	public function serialize(v:Dynamic) {
+		switch (Type.typeof(v)) {
+			case TNull:
+				buf.add("n");
+			case TInt:
+				var v:Int = v;
+				if (v == 0) {
+					buf.add("z");
+					return;
+				}
+				buf.add("i");
 				buf.add(v);
-			}
-		case TBool:
-			buf.add(if( v ) "t" else "f");
-		case TClass(c):
-			if( #if neko untyped c.__is_String #else c == String #end ) {
-				serializeString(v);
-				return;
-			}
-			if( useCache && serializeRef(v) )
-				return;
-			switch( #if (neko || cs || python) Type.getClassName(c) #else c #end ) {
-			case #if (neko || cs || python) "Array" #else cast Array #end:
-				var ucount = 0;
-				buf.add("a");
-				#if (flash || python || hl)
-				var v : Array<Dynamic> = v;
-				#end
-				var l = #if (neko || flash || php || cs || java || python || hl || lua) v.length #elseif cpp v.__length() #else __getField(v, "length") #end;
-				for( i in 0...l ) {
-					if( v[i] == null )
-						ucount++;
-					else {
-						if( ucount > 0 ) {
-							if( ucount == 1 )
+			case TFloat:
+				var v:Float = v;
+				if (Math.isNaN(v))
+					buf.add("k");
+				else if (!Math.isFinite(v))
+					buf.add(if (v < 0) "m" else "p");
+				else {
+					buf.add("d");
+					buf.add(v);
+				}
+			case TBool:
+				buf.add(if (v) "t" else "f");
+			case TClass(c):
+				if (#if neko untyped c.__is_String #else c == String #end) {
+					serializeString(v);
+					return;
+				}
+				if (useCache && serializeRef(v))
+					return;
+				switch (#if (neko || cs || python) Type.getClassName(c) #else c #end) {
+					case #if (neko || cs || python) "Array" #else cast Array #end:
+						var ucount = 0;
+						buf.add("a");
+						#if (flash || python || hl)
+						var v:Array<Dynamic> = v;
+						#end
+						var l = #if (neko || flash || php || cs || java || python || hl || lua || eval) v.length #elseif cpp v.__length() #else __getField(v,
+							"length") #end;
+						for (i in 0...l) {
+							if (v[i] == null)
+								ucount++;
+							else {
+								if (ucount > 0) {
+									if (ucount == 1)
+										buf.add("n");
+									else {
+										buf.add("u");
+										buf.add(ucount);
+									}
+									ucount = 0;
+								}
+								serialize(v[i]);
+							}
+						}
+						if (ucount > 0) {
+							if (ucount == 1)
 								buf.add("n");
 							else {
 								buf.add("u");
 								buf.add(ucount);
 							}
-							ucount = 0;
 						}
-						serialize(v[i]);
-					}
+						buf.add("h");
+					case #if (neko || cs || python) "haxe.ds.List" #else cast List #end:
+						buf.add("l");
+						var v:List<Dynamic> = v;
+						for (i in v)
+							serialize(i);
+						buf.add("h");
+					case #if (neko || cs || python) "Date" #else cast Date #end:
+						var d:Date = v;
+						buf.add("v");
+						buf.add(d.getTime());
+					case #if (neko || cs || python) "haxe.ds.StringMap" #else cast haxe.ds.StringMap #end:
+						buf.add("b");
+						var v:haxe.ds.StringMap<Dynamic> = v;
+						for (k in v.keys()) {
+							serializeString(k);
+							serialize(v.get(k));
+						}
+						buf.add("h");
+					case #if (neko || cs || python) "haxe.ds.IntMap" #else cast haxe.ds.IntMap #end:
+						buf.add("q");
+						var v:haxe.ds.IntMap<Dynamic> = v;
+						for (k in v.keys()) {
+							buf.add(":");
+							buf.add(k);
+							serialize(v.get(k));
+						}
+						buf.add("h");
+					case #if (neko || cs || python) "haxe.ds.ObjectMap" #else cast haxe.ds.ObjectMap #end:
+						buf.add("M");
+						var v:haxe.ds.ObjectMap<Dynamic, Dynamic> = v;
+						for (k in v.keys()) {
+							#if (js || neko)
+							var id = Reflect.field(k, "__id__");
+							Reflect.deleteField(k, "__id__");
+							serialize(k);
+							Reflect.setField(k, "__id__", id);
+							#else
+							serialize(k);
+							#end
+							serialize(v.get(k));
+						}
+						buf.add("h");
+					case #if (neko || cs || python) "haxe.io.Bytes" #else cast haxe.io.Bytes #end:
+						var v:haxe.io.Bytes = v;
+						#if neko
+						var chars = new String(base_encode(v.getData(), untyped BASE64.__s));
+						buf.add("s");
+						buf.add(chars.length);
+						buf.add(":");
+						buf.add(chars);
+						#else
+						buf.add("s");
+						buf.add(Math.ceil((v.length * 8) / 6));
+						buf.add(":");
+
+						var i = 0;
+						var max = v.length - 2;
+						var b64 = BASE64_CODES;
+						if (b64 == null) {
+							b64 = new haxe.ds.Vector(BASE64.length);
+							for (i in 0...BASE64.length)
+								b64[i] = BASE64.charCodeAt(i);
+							BASE64_CODES = b64;
+						}
+						while (i < max) {
+							var b1 = v.get(i++);
+							var b2 = v.get(i++);
+							var b3 = v.get(i++);
+
+							buf.addChar(b64[b1 >> 2]);
+							buf.addChar(b64[((b1 << 4) | (b2 >> 4)) & 63]);
+							buf.addChar(b64[((b2 << 2) | (b3 >> 6)) & 63]);
+							buf.addChar(b64[b3 & 63]);
+						}
+						if (i == max) {
+							var b1 = v.get(i++);
+							var b2 = v.get(i++);
+							buf.addChar(b64[b1 >> 2]);
+							buf.addChar(b64[((b1 << 4) | (b2 >> 4)) & 63]);
+							buf.addChar(b64[(b2 << 2) & 63]);
+						} else if (i == max + 1) {
+							var b1 = v.get(i++);
+							buf.addChar(b64[b1 >> 2]);
+							buf.addChar(b64[(b1 << 4) & 63]);
+						}
+						#end
+					default:
+						if (useCache) cache.pop();
+						if (#if flash try
+							v.hxSerialize != null
+						catch (e:Dynamic)
+							false #elseif (cs || java || python) Reflect.hasField(v,
+								"hxSerialize") #elseif php php.Global.method_exists(v, 'hxSerialize') #else v.hxSerialize != null #end) {
+							buf.add("C");
+							serializeString(Type.getClassName(c));
+							if (useCache)
+								cache.push(v);
+							v.hxSerialize(this);
+							buf.add("g");
+						} else {
+							buf.add("c");
+							serializeString(Type.getClassName(c));
+							if (useCache)
+								cache.push(v);
+							#if flash
+							serializeClassFields(v, c);
+							#else
+							serializeFields(v);
+							#end
+						}
 				}
-				if( ucount > 0 ) {
-					if( ucount == 1 )
-						buf.add("n");
-					else {
-						buf.add("u");
-						buf.add(ucount);
-					}
+			case TObject:
+				if (Std.is(v, Class)) {
+					var className = Type.getClassName(v);
+					#if (flash || cpp)
+					// Currently, Enum and Class are the same for flash and cpp.
+					//  use resolveEnum to test if it is actually an enum
+					if (Type.resolveEnum(className) != null)
+						buf.add("B")
+					else
+					#end
+					buf.add("A");
+					serializeString(className);
+				} else if (Std.is(v, Enum)) {
+					buf.add("B");
+					serializeString(Type.getEnumName(v));
+				} else {
+					if (useCache && serializeRef(v))
+						return;
+					buf.add("o");
+					serializeFields(v);
 				}
-				buf.add("h");
-			case #if (neko || cs || python) "List" #else cast List #end:
-				buf.add("l");
-				var v : List<Dynamic> = v;
-				for( i in v )
-					serialize(i);
-				buf.add("h");
-			case #if (neko || cs || python) "Date" #else cast Date #end:
-				var d : Date = v;
-				buf.add("v");
-				buf.add(d.getTime());
-			case #if (neko || cs || python) "haxe.ds.StringMap" #else cast haxe.ds.StringMap #end:
-				buf.add("b");
-				var v : haxe.ds.StringMap<Dynamic> = v;
-				for( k in v.keys() ) {
-					serializeString(k);
-					serialize(v.get(k));
+			case TEnum(e):
+				if (useCache) {
+					if (serializeRef(v))
+						return;
+					cache.pop();
 				}
-				buf.add("h");
-			case #if (neko || cs || python) "haxe.ds.IntMap" #else cast haxe.ds.IntMap #end:
-				buf.add("q");
-				var v : haxe.ds.IntMap<Dynamic> = v;
-				for( k in v.keys() ) {
+				buf.add(useEnumIndex ? "j" : "w");
+				serializeString(Type.getEnumName(e));
+				#if neko
+				if (useEnumIndex) {
 					buf.add(":");
-					buf.add(k);
-					serialize(v.get(k));
+					buf.add(v.index);
+				} else
+					serializeString(new String(v.tag));
+				buf.add(":");
+				if (v.args == null)
+					buf.add(0);
+				else {
+					var l:Int = untyped __dollar__asize(v.args);
+					buf.add(l);
+					for (i in 0...l)
+						serialize(v.args[i]);
 				}
-				buf.add("h");
-			case #if (neko || cs || python) "haxe.ds.ObjectMap" #else cast haxe.ds.ObjectMap #end:
-				buf.add("M");
-				var v : haxe.ds.ObjectMap<Dynamic,Dynamic> = v;
-				for ( k in v.keys() ) {
-					#if (js || neko)
-					var id = Reflect.field(k, "__id__");
-					Reflect.deleteField(k, "__id__");
-					serialize(k);
-					Reflect.setField(k, "__id__", id);
-					#else
-					serialize(k);
-					#end
-					serialize(v.get(k));
+				#elseif flash
+				if (useEnumIndex) {
+					buf.add(":");
+					var i:Int = v.index;
+					buf.add(i);
+				} else
+					serializeString(v.tag);
+				buf.add(":");
+				var pl:Array<Dynamic> = v.params;
+				if (pl == null)
+					buf.add(0);
+				else {
+					buf.add(pl.length);
+					for (p in pl)
+						serialize(p);
 				}
-				buf.add("h");
-			case #if (neko || cs || python) "haxe.io.Bytes" #else cast haxe.io.Bytes #end:
-				var v : haxe.io.Bytes = v;
-				#if neko
-				var chars = new String(base_encode(v.getData(),untyped BASE64.__s));
-				buf.add("s");
-				buf.add(chars.length);
+				#elseif cpp
+				var enumBase:cpp.EnumBase = v;
+				if (useEnumIndex) {
+					buf.add(":");
+					buf.add(enumBase.getIndex());
+				} else
+					serializeString(enumBase.getTag());
 				buf.add(":");
-				buf.add(chars);
-				#else
-
-				buf.add("s");
-				buf.add(Math.ceil((v.length * 8) / 6));
+				var len = enumBase.getParamCount();
+				buf.add(len);
+				for (p in 0...len)
+					serialize(enumBase.getParamI(p));
+				#elseif php
+				if (useEnumIndex) {
+					buf.add(":");
+					buf.add(v.index);
+				} else
+					serializeString(v.tag);
 				buf.add(":");
-
-				var i = 0;
-				var max = v.length - 2;
-				var b64 = BASE64_CODES;
-				if( b64 == null ) {
-					b64 = new haxe.ds.Vector(BASE64.length);
-					for( i in 0...BASE64.length )
-						b64[i] = BASE64.charCodeAt(i);
-					BASE64_CODES = b64;
-				}
-				while( i < max ) {
-					var b1 = v.get(i++);
-					var b2 = v.get(i++);
-					var b3 = v.get(i++);
-
-					buf.addChar(b64[b1 >> 2]);
-					buf.addChar(b64[((b1 << 4) | (b2 >> 4)) & 63]);
-					buf.addChar(b64[((b2 << 2) | (b3 >> 6)) & 63]);
-					buf.addChar(b64[b3 & 63]);
-				}
-				if( i == max ) {
-					var b1 = v.get(i++);
-					var b2 = v.get(i++);
-					buf.addChar(b64[b1 >> 2]);
-					buf.addChar(b64[((b1 << 4) | (b2 >> 4)) & 63]);
-					buf.addChar(b64[(b2 << 2) & 63]);
-				} else if( i == max + 1 ) {
-					var b1 = v.get(i++);
-					buf.addChar(b64[b1 >> 2]);
-					buf.addChar(b64[(b1 << 4) & 63]);
+				var l:Int = php.Syntax.code("count({0})", v.params);
+				if (l == 0 || v.params == null)
+					buf.add(0);
+				else {
+					buf.add(l);
+					for (i in 0...l) {
+						#if php
+						serialize(v.params[i]);
+						#end
+					}
 				}
-				#end
-			default:
-				if( useCache ) cache.pop();
-				if( #if flash try v.hxSerialize != null catch( e : Dynamic ) false #elseif (cs || java || python) Reflect.hasField(v, "hxSerialize") #elseif (php && php7) php.Global.method_exists(v, 'hxSerialize') #else v.hxSerialize != null #end  ) {
-					buf.add("C");
-					serializeString(Type.getClassName(c));
-					if( useCache ) cache.push(v);
-					v.hxSerialize(this);
-					buf.add("g");
+				#elseif (java || cs || python || hl || eval)
+				if (useEnumIndex) {
+					buf.add(":");
+					buf.add(Type.enumIndex(v));
+				} else
+					serializeString(Type.enumConstructor(v));
+				buf.add(":");
+				var arr:Array<Dynamic> = Type.enumParameters(v);
+				if (arr != null) {
+					buf.add(arr.length);
+					for (v in arr)
+						serialize(v);
 				} else {
-					buf.add("c");
-					serializeString(Type.getClassName(c));
-					if( useCache ) cache.push(v);
-					#if flash
-					serializeClassFields(v,c);
-					#else
-					serializeFields(v);
-					#end
+					buf.add("0");
 				}
-			}
-		case TObject:
-			if (Std.is(v,Class)) {
-				var className = Type.getClassName(v);
-				#if (flash || cpp)
-				// Currently, Enum and Class are the same for flash and cpp.
-				//  use resolveEnum to test if it is actually an enum
-				if (Type.resolveEnum(className)!=null) buf.add("B") else
-				#end
-				buf.add("A");
-				serializeString(className);
-			} else if (Std.is(v,Enum)) {
-				buf.add("B");
-				serializeString(Type.getEnumName(v));
-			} else {
-				if( useCache && serializeRef(v) )
-					return;
-				buf.add("o");
-				serializeFields(v);
-			}
-		case TEnum(e):
-			if( useCache ) {
-				if( serializeRef(v) )
-					return;
-				cache.pop();
-			}
-			buf.add(useEnumIndex?"j":"w");
-			serializeString(Type.getEnumName(e));
-			#if neko
-			if( useEnumIndex ) {
-				buf.add(":");
-				buf.add(v.index);
-			} else
-				serializeString(new String(v.tag));
-			buf.add(":");
-			if( v.args == null )
-				buf.add(0);
-			else {
-				var l : Int = untyped __dollar__asize(v.args);
-				buf.add(l);
-				for( i in 0...l )
-					serialize(v.args[i]);
-			}
-			#elseif flash
-			if( useEnumIndex ) {
+				#elseif (js && !js_enums_as_arrays)
+				if (useEnumIndex) {
+					buf.add(":");
+					buf.add(v._hx_index);
+				} else
+					serializeString(Type.enumConstructor(v));
 				buf.add(":");
-				var i : Int = v.index;
-				buf.add(i);
-			} else
-				serializeString(v.tag);
-			buf.add(":");
-			var pl : Array<Dynamic> = v.params;
-			if( pl == null )
-				buf.add(0);
-			else {
-				buf.add(pl.length);
-				for( p in pl )
+				var params = Type.enumParameters(v);
+				buf.add(params.length);
+				for (p in params)
 					serialize(p);
-			}
-			#elseif cpp
-			var enumBase:cpp.EnumBase = v;
-			if( useEnumIndex ) {
-				buf.add(":");
-				buf.add(enumBase.getIndex());
-			} else
-				serializeString(enumBase.getTag());
-			buf.add(":");
-			var len = enumBase.getParamCount();
-			buf.add(len);
-			for( p in 0...len )
-				serialize( enumBase.getParamI(p));
-			#elseif php
-			if( useEnumIndex ) {
+				#else
+				if (useEnumIndex) {
+					buf.add(":");
+					buf.add(v[1]);
+				} else
+					serializeString(v[0]);
 				buf.add(":");
-				buf.add(v.index);
-			} else
-				serializeString(v.tag);
-			buf.add(":");
-			var l : Int = untyped __call__("count", v.params);
-			if( l == 0 || v.params == null)
-				buf.add(0);
-			else {
-				buf.add(l);
-				for( i in 0...l ) {
-					#if (php && php7)
-					serialize(v.params[i]);
-					#elseif php
-					serialize(untyped __field__(v, __php__("params"), i));
-					#end
+				var l = __getField(v, "length");
+				buf.add(l - 2);
+				for (i in 2...l)
+					serialize(v[i]);
+				#end
+				if (useCache)
+					cache.push(v);
+			case TFunction:
+				throw "Cannot serialize function";
+			default:
+				#if neko
+				if (untyped (__i32__kind != null && __dollar__iskind(v, __i32__kind))) {
+					buf.add("i");
+					buf.add(v);
+					return;
 				}
-			}
-			#elseif (java || cs || python || hl)
-			if( useEnumIndex ) {
-				buf.add(":");
-				buf.add(Type.enumIndex(v));
-			} else
-				serializeString(Type.enumConstructor(v));
-			buf.add(":");
-			var arr:Array<Dynamic> = Type.enumParameters(v);
-			if (arr != null)
-			{
-				buf.add(arr.length);
-				for (v in arr)
-					serialize(v);
-			} else {
-				buf.add("0");
-			}
-
-			#else
-			if( useEnumIndex ) {
-				buf.add(":");
-				buf.add(v[1]);
-			} else
-				serializeString(v[0]);
-			buf.add(":");
-			var l = __getField(v, "length");
-			buf.add(l - 2);
-			for( i in 2...l )
-				serialize(v[i]);
-			#end
-			if( useCache ) cache.push(v);
-		case TFunction:
-			throw "Cannot serialize function";
-		default:
-			#if neko
-			if( untyped (__i32__kind != null && __dollar__iskind(v,__i32__kind)) ) {
-				buf.add("i");
-				buf.add(v);
-				return;
-			}
-			#end
-			throw "Cannot serialize "+Std.string(v);
+				#end
+				throw "Cannot serialize " + Std.string(v);
 		}
 	}
 
-	@:extern inline function __getField(o:Dynamic, f:String):Dynamic return untyped o[f];
+	extern inline function __getField(o:Dynamic, f:String):Dynamic
+		return o[cast f];
 
-	public function serializeException( e : Dynamic ) {
+	public function serializeException(e:Dynamic) {
 		buf.add("x");
 		#if flash
-		if( untyped __is__(e,__global__["Error"]) ) {
-			var e : flash.errors.Error = e;
+		if (untyped __is__(e, __global__["Error"])) {
+			var e:flash.errors.Error = e;
 			var s = e.getStackTrace();
-			if( s == null )
+			if (s == null)
 				serialize(e.message);
 			else
 				serialize(s);
@@ -547,21 +566,19 @@ class Serializer {
 	}
 
 	/**
-		Serializes `v` and returns the String representation.
+	Serializes `v` and returns the String representation.
 
-		This is a convenience function for creating a new instance of
-		Serializer, serialize `v` into it and obtain the result through a call
-		to toString().
-	**/
-	public static function run( v : Dynamic ) {
+	This is a convenience function for creating a new instance of
+	Serializer, serialize `v` into it and obtain the result through a call
+	to `toString()`.
+**/
+	public static function run(v:Dynamic) {
 		var s = new Serializer();
 		s.serialize(v);
 		return s.toString();
 	}
 
 	#if neko
-	static var base_encode = neko.Lib.load("std","base_encode",2);
+	static var base_encode = neko.Lib.load("std", "base_encode", 2);
 	#end
-
 }
-
diff --git a/std/haxe/SysTools.hx b/std/haxe/SysTools.hx
new file mode 100644
index 0000000000000000000000000000000000000000..147f4e811998867dab05458306f832414a7e87bf
--- /dev/null
+++ b/std/haxe/SysTools.hx
@@ -0,0 +1,106 @@
+package haxe;
+
+import haxe.ds.ReadOnlyArray;
+
+class SysTools {
+	/**
+		Character codes of the characters that will be escaped by `quoteWinArg(_, true)`.
+	**/
+	public static final winMetaCharacters:ReadOnlyArray<Int> = [
+		" ".code, "(".code, ")".code, "%".code, "!".code, "^".code, "\"".code, "<".code, ">".code, "&".code, "|".code, "\n".code, "\r".code, ",".code, ";".code
+	];
+
+	/**
+		Returns a String that can be used as a single command line argument
+		on Unix.
+		The input will be quoted, or escaped if necessary.
+	**/
+	public static function quoteUnixArg(argument:String):String {
+		// Based on cpython's shlex.quote().
+		// https://hg.python.org/cpython/file/a3f076d4f54f/Lib/shlex.py#l278
+
+		if (argument == "")
+			return "''";
+
+		if (!~/[^a-zA-Z0-9_@%+=:,.\/-]/.match(argument))
+			return argument;
+
+		// use single quotes, and put single quotes into double quotes
+		// the string $'b is then quoted as '$'"'"'b'
+		return "'" + StringTools.replace(argument, "'", "'\"'\"'") + "'";
+	}
+
+	/**
+		Returns a String that can be used as a single command line argument
+		on Windows.
+		The input will be quoted, or escaped if necessary, such that the output
+		will be parsed as a single argument using the rule specified in
+		http://msdn.microsoft.com/en-us/library/ms880421
+
+		Examples:
+		```haxe
+		quoteWinArg("abc") == "abc";
+		quoteWinArg("ab c") == '"ab c"';
+		```
+	**/
+	public static function quoteWinArg(argument:String, escapeMetaCharacters:Bool):String {
+		// If there is no space, tab, back-slash, or double-quotes, and it is not an empty string.
+		if (!~/^[^ \t\\"]+$/.match(argument)) {
+			// Based on cpython's subprocess.list2cmdline().
+			// https://hg.python.org/cpython/file/50741316dd3a/Lib/subprocess.py#l620
+
+			var result = new StringBuf();
+			var needquote = argument.indexOf(" ") != -1 || argument.indexOf("\t") != -1 || argument == "";
+
+			if (needquote)
+				result.add('"');
+
+			var bs_buf = new StringBuf();
+			for (i in 0...argument.length) {
+				switch (argument.charCodeAt(i)) {
+					case "\\".code:
+						// Don't know if we need to double yet.
+						bs_buf.add("\\");
+					case '"'.code:
+						// Double backslashes.
+						var bs = bs_buf.toString();
+						result.add(bs);
+						result.add(bs);
+						bs_buf = new StringBuf();
+						result.add('\\"');
+					case var c:
+						// Normal char
+						if (bs_buf.length > 0) {
+							result.add(bs_buf.toString());
+							bs_buf = new StringBuf();
+						}
+						result.addChar(c);
+				}
+			}
+
+			// Add remaining backslashes, if any.
+			result.add(bs_buf.toString());
+
+			if (needquote) {
+				result.add(bs_buf.toString());
+				result.add('"');
+			}
+
+			argument = result.toString();
+		}
+
+		if (escapeMetaCharacters) {
+			var result = new StringBuf();
+			for (i in 0...argument.length) {
+				var c = argument.charCodeAt(i);
+				if (winMetaCharacters.indexOf(c) >= 0) {
+					result.addChar("^".code);
+				}
+				result.addChar(c);
+			}
+			return result.toString();
+		} else {
+			return argument;
+		}
+	}
+}
diff --git a/std/haxe/Template.hx b/std/haxe/Template.hx
index 26a23e0c3399f8ae0f00b69973e138aa2eaf2a3f..724626bd20b42f3a3a4dda6c8ad40978c35a497e 100644
--- a/std/haxe/Template.hx
+++ b/std/haxe/Template.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,38 +19,42 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
+import haxe.ds.List;
+
+using StringTools;
+
 private enum TemplateExpr {
-	OpVar( v : String );
-	OpExpr( expr :  Void -> Dynamic );
-	OpIf( expr : Void -> Dynamic,  eif : TemplateExpr, eelse : TemplateExpr );
-	OpStr( str : String );
-	OpBlock( l : List<TemplateExpr> );
-	OpForeach( expr : Void -> Dynamic, loop : TemplateExpr );
-	OpMacro( name : String, params : List<TemplateExpr> );
+	OpVar(v:String);
+	OpExpr(expr:Void->Dynamic);
+	OpIf(expr:Void->Dynamic, eif:TemplateExpr, eelse:TemplateExpr);
+	OpStr(str:String);
+	OpBlock(l:List<TemplateExpr>);
+	OpForeach(expr:Void->Dynamic, loop:TemplateExpr);
+	OpMacro(name:String, params:List<TemplateExpr>);
 }
 
 private typedef Token = {
-	var s : Bool;
-	var p : String;
-	var l : Array<String>;
+	var s:Bool;
+	var p:String;
+	var l:Array<String>;
 }
 
 private typedef ExprToken = {
-	var s : Bool;
-	var p : String;
+	var s:Bool;
+	var p:String;
 }
 
 /**
-	Template provides a basic templating mechanism to replace values in a source
+	`Template` provides a basic templating mechanism to replace values in a source
 	String, and to have some basic logic.
 
 	A complete documentation of the supported syntax is available at:
 	<https://haxe.org/manual/std-template.html>
 **/
 class Template {
-
 	static var splitter = ~/(::[A-Za-z0-9_ ()&|!+=\/><*."-]+::|\$\$([A-Za-z0-9_-]+)\()/;
 	static var expr_splitter = ~/(\(|\)|[ \r\n\t]*"[^"]*"[ \r\n\t]*|[!+=\/><*.&|-]+)/;
 	static var expr_trim = ~/^[ ]*([^ ]+)[ ]*$/;
@@ -58,52 +62,55 @@ class Template {
 	static var expr_float = ~/^([+-]?)(?=\d|,\d)\d*(,\d*)?([Ee]([+-]?\d+))?$/;
 
 	/**
-		Global replacements which are used across all Template instances. This
-		has lower priority than the context argument of execute().
+		Global replacements which are used across all `Template` instances. This
+		has lower priority than the context argument of `execute()`.
 	**/
-	public static var globals : Dynamic = {};
+	public static var globals:Dynamic = {};
+
+	// To avoid issues with DCE, keep the array iterator.
+	@:ifFeature("haxe.Template.run") static var hxKeepArrayIterator = [].iterator();
 
-	var expr : TemplateExpr;
-	var context : Dynamic;
-	var macros : Dynamic;
-	var stack : List<Dynamic>;
-	var buf : StringBuf;
+	var expr:TemplateExpr;
+	var context:Dynamic;
+	var macros:Dynamic;
+	var stack:List<Dynamic>;
+	var buf:StringBuf;
 
 	/**
-		Creates a new Template instance from `str`.
+		Creates a new `Template` instance from `str`.
 
 		`str` is parsed into tokens, which are stored for internal use. This
-		means that multiple execute() operations on a single Template instance
-		are more efficient than one execute() operations on multiple Template
+		means that multiple `execute()` operations on a single `Template` instance
+		are more efficient than one `execute()` operations on multiple `Template`
 		instances.
 
-		If `str` is null, the result is unspecified.
+		If `str` is `null`, the result is unspecified.
 	**/
-	public function new( str : String ) {
+	public function new(str:String) {
 		var tokens = parseTokens(str);
 		expr = parseBlock(tokens);
-		if( !tokens.isEmpty() )
-			throw "Unexpected '"+tokens.first().s+"'";
+		if (!tokens.isEmpty())
+			throw "Unexpected '" + tokens.first().s + "'";
 	}
 
 	/**
-		Executes `this` Template, taking into account `context` for
+		Executes `this` `Template`, taking into account `context` for
 		replacements and `macros` for callback functions.
 
-		If `context` has a field 'name', its value replaces all occurrences of
-		::name:: in the Template. Otherwise Template.globals is checked instead,
-		If 'name' is not a field of that either, ::name:: is replaced with null.
+		If `context` has a field `name`, its value replaces all occurrences of
+		`::name::` in the `Template`. Otherwise `Template.globals` is checked instead,
+		If `name` is not a field of that either, `::name::` is replaced with `null`.
 
-		If `macros` has a field 'name', all occurrences of $$name(args) are
+		If `macros` has a field `name`, all occurrences of `$$name(args)` are
 		replaced with the result of calling that field. The first argument is
-		always the resolve() method, followed by the given arguments.
+		always the `resolve()` method, followed by the given arguments.
 		If `macros` has no such field, the result is unspecified.
 
-		If `context` is null, the result is unspecified. If `macros` is null,
+		If `context` is `null`, the result is unspecified. If `macros` is `null`,
 		no macros are used.
 	**/
-	public function execute( context : Dynamic, ?macros : Dynamic ):String {
-		this.macros = if( macros == null ) {} else macros;
+	public function execute(context:Dynamic, ?macros:Dynamic):String {
+		this.macros = if (macros == null) {} else macros;
 		this.context = context;
 		stack = new List();
 		buf = new StringBuf();
@@ -111,30 +118,30 @@ class Template {
 		return buf.toString();
 	}
 
-	function resolve( v : String ) : Dynamic {
-		if( v == "__current__" )
+	function resolve(v:String):Dynamic {
+		if (v == "__current__")
 			return context;
 		var value = Reflect.getProperty(context, v);
-		if( value != null || Reflect.hasField(context,v) )
+		if (value != null || Reflect.hasField(context, v))
 			return value;
-		for( ctx in stack ) {
-			value = Reflect.getProperty(ctx,v);
-			if( value != null || Reflect.hasField(ctx,v) )
+		for (ctx in stack) {
+			value = Reflect.getProperty(ctx, v);
+			if (value != null || Reflect.hasField(ctx, v))
 				return value;
 		}
-		return Reflect.field(globals,v);
+		return Reflect.field(globals, v);
 	}
 
-	function parseTokens( data : String ) {
+	function parseTokens(data:String) {
 		var tokens = new List<Token>();
-		while( splitter.match(data) ) {
+		while (splitter.match(data)) {
 			var p = splitter.matchedPos();
-			if( p.pos > 0 )
-				tokens.add({ p : data.substr(0,p.pos), s : true, l : null });
+			if (p.pos > 0)
+				tokens.add({p: data.substr(0, p.pos), s: true, l: null});
 
 			// : ?
-			if( data.charCodeAt(p.pos) == 58 ) {
-				tokens.add({ p : data.substr(p.pos + 2,p.len - 4), s : false, l : null });
+			if (data.charCodeAt(p.pos) == 58) {
+				tokens.add({p: data.substr(p.pos + 2, p.len - 4), s: false, l: null});
 				data = splitter.matchedRight();
 				continue;
 			}
@@ -144,18 +151,19 @@ class Template {
 			var npar = 1;
 			var params = [];
 			var part = "";
-			while( true ) {
+			while (true) {
 				var c = data.charCodeAt(parp);
 				parp++;
-				if( c == 40 ) {
+				if (c == 40) {
 					npar++;
-				} else if( c == 41 ) {
+				} else if (c == 41) {
 					npar--;
-					if (npar <= 0) break;
-				} else if( c == null ){
+					if (npar <= 0)
+						break;
+				} else if (c == null) {
 					throw "Unclosed macro parenthesis";
 				}
-				if ( c == 44 && npar == 1) {
+				if (c == 44 && npar == 1) {
 					params.push(part);
 					part = "";
 				} else {
@@ -163,255 +171,336 @@ class Template {
 				}
 			}
 			params.push(part);
-			tokens.add({ p : splitter.matched(2), s : false, l : params });
-			data = data.substr(parp,data.length - parp);
+			tokens.add({p: splitter.matched(2), s: false, l: params});
+			data = data.substr(parp, data.length - parp);
 		}
-		if( data.length > 0 )
-			tokens.add({ p : data, s : true, l : null });
+		if (data.length > 0)
+			tokens.add({p: data, s: true, l: null});
 		return tokens;
 	}
 
-	function parseBlock( tokens : List<Token> ) {
+	function parseBlock(tokens:List<Token>) {
 		var l = new List();
-		while( true ) {
+		while (true) {
 			var t = tokens.first();
-			if( t == null )
+			if (t == null)
 				break;
-			if( !t.s && (t.p == "end" || t.p == "else" || t.p.substr(0,7) == "elseif ") )
+			if (!t.s && (t.p == "end" || t.p == "else" || t.p.substr(0, 7) == "elseif "))
 				break;
 			l.add(parse(tokens));
 		}
-		if( l.length == 1 )
+		if (l.length == 1)
 			return l.first();
 		return OpBlock(l);
 	}
 
-	function parse( tokens : List<Token> ) {
+	function parse(tokens:List<Token>) {
 		var t = tokens.pop();
 		var p = t.p;
-		if( t.s )
+		if (t.s)
 			return OpStr(p);
 		// macro
-		if( t.l != null ) {
+		if (t.l != null) {
 			var pe = new List();
-			for( p in t.l )
+			for (p in t.l)
 				pe.add(parseBlock(parseTokens(p)));
-			return OpMacro(p,pe);
+			return OpMacro(p, pe);
+		}
+		function kwdEnd(kwd:String):Int {
+			var pos = -1;
+			var length = kwd.length;
+			if (p.substr(0, length) == kwd) {
+				pos = length;
+				for (c in p.substr(length)) {
+					switch c {
+						case ' '.code: pos++;
+						case _: break;
+					}
+				}
+			}
+			return pos;
 		}
 		// 'end' , 'else', 'elseif' can't be found here
-		if( p.substr(0,3) == "if " ) {
-			p = p.substr(3,p.length - 3);
+		var pos = kwdEnd("if");
+		if (pos > 0) {
+			p = p.substr(pos, p.length - pos);
 			var e = parseExpr(p);
 			var eif = parseBlock(tokens);
 			var t = tokens.first();
 			var eelse;
-			if( t == null )
+			if (t == null)
 				throw "Unclosed 'if'";
-			if( t.p == "end" ) {
+			if (t.p == "end") {
 				tokens.pop();
 				eelse = null;
-			} else if( t.p == "else" ) {
+			} else if (t.p == "else") {
 				tokens.pop();
 				eelse = parseBlock(tokens);
 				t = tokens.pop();
-				if( t == null || t.p != "end" )
+				if (t == null || t.p != "end")
 					throw "Unclosed 'else'";
 			} else { // elseif
-				t.p = t.p.substr(4,t.p.length - 4);
+				t.p = t.p.substr(4, t.p.length - 4);
 				eelse = parse(tokens);
 			}
-			return OpIf(e,eif,eelse);
+			return OpIf(e, eif, eelse);
 		}
-		if( p.substr(0,8) == "foreach " ) {
-			p = p.substr(8,p.length - 8);
+		var pos = kwdEnd("foreach");
+		if (pos >= 0) {
+			p = p.substr(pos, p.length - pos);
 			var e = parseExpr(p);
 			var efor = parseBlock(tokens);
 			var t = tokens.pop();
-			if( t == null || t.p != "end" )
+			if (t == null || t.p != "end")
 				throw "Unclosed 'foreach'";
-			return OpForeach(e,efor);
+			return OpForeach(e, efor);
 		}
-		if( expr_splitter.match(p) )
+		if (expr_splitter.match(p))
 			return OpExpr(parseExpr(p));
 		return OpVar(p);
 	}
 
-	function parseExpr( data : String ) {
+	function parseExpr(data:String) {
 		var l = new List<ExprToken>();
 		var expr = data;
-		while( expr_splitter.match(data) ) {
+		while (expr_splitter.match(data)) {
 			var p = expr_splitter.matchedPos();
 			var k = p.pos + p.len;
-			if( p.pos != 0 )
-				l.add({ p : data.substr(0,p.pos), s : true });
+			if (p.pos != 0)
+				l.add({p: data.substr(0, p.pos), s: true});
 			var p = expr_splitter.matched(0);
-			l.add({ p : p, s : p.indexOf('"') >= 0 });
+			l.add({p: p, s: p.indexOf('"') >= 0});
 			data = expr_splitter.matchedRight();
 		}
-		if( data.length != 0 )
-			l.add({ p : data, s : true });
+		if (data.length != 0) {
+			for (i => c in data) {
+				switch c {
+					case ' '.code:
+					case _:
+						l.add({p: data.substr(i), s: true});
+						break;
+				}
+			}
+		}
 		var e:Void->Dynamic;
 		try {
 			e = makeExpr(l);
-			if( !l.isEmpty() )
+			if (!l.isEmpty())
 				throw l.first().p;
-		} catch( s : String ) {
-			throw "Unexpected '"+s+"' in "+expr;
+		} catch (s:String) {
+			throw "Unexpected '" + s + "' in " + expr;
 		}
 		return function() {
 			try {
 				return e();
-			} catch( exc : Dynamic ) {
-				throw "Error : "+Std.string(exc)+" in "+expr;
+			} catch (exc:Dynamic) {
+				throw "Error : " + Std.string(exc) + " in " + expr;
 			}
 		}
 	}
 
-	function makeConst( v : String ) : Void -> Dynamic {
+	function makeConst(v:String):Void->Dynamic {
 		expr_trim.match(v);
 		v = expr_trim.matched(1);
-		if( v.charCodeAt(0) == 34 ) {
-			var str = v.substr(1,v.length-2);
+		if (v.charCodeAt(0) == 34) {
+			var str = v.substr(1, v.length - 2);
 			return function() return str;
 		}
-		if( expr_int.match(v) ) {
+		if (expr_int.match(v)) {
 			var i = Std.parseInt(v);
-			return function() { return i; };
+			return function() {
+				return i;
+			};
 		}
-		if( expr_float.match(v) ) {
+		if (expr_float.match(v)) {
 			var f = Std.parseFloat(v);
-			return function() { return f; };
+			return function() {
+				return f;
+			};
 		}
 		var me = this;
-		return function() { return me.resolve(v); };
+		return function() {
+			return me.resolve(v);
+		};
 	}
 
-	function makePath( e : Void -> Dynamic, l : List<ExprToken> ) {
+	function makePath(e:Void->Dynamic, l:List<ExprToken>) {
 		var p = l.first();
-		if( p == null || p.p != "." )
+		if (p == null || p.p != ".")
 			return e;
 		l.pop();
 		var field = l.pop();
-		if( field == null || !field.s )
+		if (field == null || !field.s)
 			throw field.p;
 		var f = field.p;
 		expr_trim.match(f);
 		f = expr_trim.matched(1);
-		return makePath(function() { return Reflect.field(e(),f); },l);
+		return makePath(function() {
+			return Reflect.field(e(), f);
+		}, l);
 	}
 
-	function makeExpr( l ) {
-		return makePath(makeExpr2(l),l);
+	function makeExpr(l) {
+		return makePath(makeExpr2(l), l);
 	}
 
-	function makeExpr2( l : List<ExprToken> ) : Void -> Dynamic {
+	function skipSpaces(l:List<ExprToken>) {
+		var p = l.first();
+		while (p != null) {
+			for (c in p.p) {
+				if (c != " ".code) {
+					return;
+				}
+			}
+			l.pop();
+			p = l.first();
+		}
+	}
+
+	function makeExpr2(l:List<ExprToken>):Void->Dynamic {
+		skipSpaces(l);
 		var p = l.pop();
-		if( p == null )
+		skipSpaces(l);
+		if (p == null)
 			throw "<eof>";
-		if( p.s )
+		if (p.s)
 			return makeConst(p.p);
-		switch( p.p ) {
-		case "(":
-			var e1:Dynamic = makeExpr(l);
-			var p = l.pop();
-			if( p == null || p.s )
-				throw p;
-			if( p.p == ")" )
-				return e1;
-			var e2:Dynamic = makeExpr(l);
-			var p2 = l.pop();
-			if( p2 == null || p2.p != ")" )
-				throw p2;
-			return switch( p.p ) {
-			case "+": function() { return cast e1() + e2(); };
-			case "-": function() { return cast e1() - e2(); };
-			case "*": function() { return cast e1() * e2(); };
-			case "/": function() { return cast e1() / e2(); };
-			case ">": function() { return cast e1() > e2(); };
-			case "<": function() { return cast e1() < e2(); };
-			case ">=": function() { return cast e1() >= e2(); };
-			case "<=": function() { return cast e1() <= e2(); };
-			case "==": function() { return cast e1() == e2(); };
-			case "!=": function() { return cast e1() != e2(); };
-			case "&&": function() { return cast e1() && e2(); };
-			case "||": function() { return cast e1() || e2(); };
-			default: throw "Unknown operation "+p.p;
-			}
-		case "!":
-			var e : Void->Dynamic = makeExpr(l);
-			return function() {
-				var v : Dynamic = e();
-				return (v == null || v == false);
-			};
-		case "-":
-			var e = makeExpr(l);
-			return function() { return -e(); };
+		switch (p.p) {
+			case "(":
+				skipSpaces(l);
+				var e1:Dynamic = makeExpr(l);
+				skipSpaces(l);
+				var p = l.pop();
+				if (p == null || p.s)
+					throw p;
+				if (p.p == ")")
+					return e1;
+				skipSpaces(l);
+				var e2:Dynamic = makeExpr(l);
+				skipSpaces(l);
+				var p2 = l.pop();
+				skipSpaces(l);
+				if (p2 == null || p2.p != ")")
+					throw p2;
+				return switch (p.p) {
+					case "+": function() {
+							return cast e1() + e2();
+						};
+					case "-": function() {
+							return cast e1() - e2();
+						};
+					case "*": function() {
+							return cast e1() * e2();
+						};
+					case "/": function() {
+							return cast e1() / e2();
+						};
+					case ">": function() {
+							return cast e1() > e2();
+						};
+					case "<": function() {
+							return cast e1() < e2();
+						};
+					case ">=": function() {
+							return cast e1() >= e2();
+						};
+					case "<=": function() {
+							return cast e1() <= e2();
+						};
+					case "==": function() {
+							return cast e1() == e2();
+						};
+					case "!=": function() {
+							return cast e1() != e2();
+						};
+					case "&&": function() {
+							return cast e1() && e2();
+						};
+					case "||": function() {
+							return cast e1() || e2();
+						};
+					default: throw "Unknown operation " + p.p;
+				}
+			case "!":
+				var e:Void->Dynamic = makeExpr(l);
+				return function() {
+					var v:Dynamic = e();
+					return (v == null || v == false);
+				};
+			case "-":
+				var e = makeExpr(l);
+				return function() {
+					return -e();
+				};
 		}
 		throw p.p;
 	}
 
-	function run( e : TemplateExpr ) {
-		switch( e ) {
-		case OpVar(v):
-			buf.add(Std.string(resolve(v)));
-		case OpExpr(e):
-			buf.add(Std.string(e()));
-		case OpIf(e,eif,eelse):
-			var v : Dynamic = e();
-			if( v == null || v == false ) {
-				if( eelse != null ) run(eelse);
-			} else
-				run(eif);
-		case OpStr(str):
-			buf.add(str);
-		case OpBlock(l):
-			for( e in l )
-				run(e);
-		case OpForeach(e,loop):
-			var v : Dynamic = e();
-			try {
-				var x : Dynamic = v.iterator();
-				if( x.hasNext == null ) throw null;
-				v = x;
-			} catch( e : Dynamic ) try {
-				if( v.hasNext == null ) throw null;
-			} catch( e : Dynamic ) {
-				throw "Cannot iter on " + v;
-			}
-			stack.push(context);
-			var v : Iterator<Dynamic> = v;
-			for( ctx in v ) {
-				context = ctx;
-				run(loop);
-			}
-			context = stack.pop();
-		case OpMacro(m,params):
-			var v : Dynamic = Reflect.field(macros,m);
-			var pl = new Array<Dynamic>();
-			var old = buf;
-			pl.push(resolve);
-			for( p in params ) {
-				switch( p ) {
-				case OpVar(v): pl.push(resolve(v));
-				default:
-					buf = new StringBuf();
-					run(p);
-					pl.push(buf.toString());
+	function run(e:TemplateExpr) {
+		switch (e) {
+			case OpVar(v):
+				buf.add(Std.string(resolve(v)));
+			case OpExpr(e):
+				buf.add(Std.string(e()));
+			case OpIf(e, eif, eelse):
+				var v:Dynamic = e();
+				if (v == null || v == false) {
+					if (eelse != null)
+						run(eelse);
+				} else
+					run(eif);
+			case OpStr(str):
+				buf.add(str);
+			case OpBlock(l):
+				for (e in l)
+					run(e);
+			case OpForeach(e, loop):
+				var v:Dynamic = e();
+				try {
+					var x:Dynamic = v.iterator();
+					if (x.hasNext == null)
+						throw null;
+					v = x;
+				} catch (e:Dynamic)
+					try {
+						if (v.hasNext == null)
+							throw null;
+					} catch (e:Dynamic) {
+						throw "Cannot iter on " + v;
+					}
+				stack.push(context);
+				var v:Iterator<Dynamic> = v;
+				for (ctx in v) {
+					context = ctx;
+					run(loop);
+				}
+				context = stack.pop();
+			case OpMacro(m, params):
+				var v:Dynamic = Reflect.field(macros, m);
+				var pl = new Array<Dynamic>();
+				var old = buf;
+				pl.push(resolve);
+				for (p in params) {
+					switch (p) {
+						case OpVar(v): pl.push(resolve(v));
+						default:
+							buf = new StringBuf();
+							run(p);
+							pl.push(buf.toString());
+					}
+				}
+				buf = old;
+				try {
+					buf.add(Std.string(Reflect.callMethod(macros, v, pl)));
+				} catch (e:Dynamic) {
+					var plstr = try pl.join(",") catch (e:Dynamic) "???";
+					var msg = "Macro call " + m + "(" + plstr + ") failed (" + Std.string(e) + ")";
+					#if neko
+					neko.Lib.rethrow(msg);
+					#else
+					throw msg;
+					#end
 				}
-			}
-			buf = old;
-			try {
-				buf.add(Std.string(Reflect.callMethod(macros,v,pl)));
-			} catch( e : Dynamic ) {
-				var plstr = try pl.join(",") catch( e : Dynamic ) "???";
-				var msg = "Macro call "+m+"("+plstr+") failed ("+Std.string(e)+")";
-				#if neko
-				neko.Lib.rethrow(msg);
-				#else
-				throw msg;
-				#end
-			}
 		}
 	}
-
 }
diff --git a/std/haxe/Timer.hx b/std/haxe/Timer.hx
index ecbca0cc14c98dc6fa77fd0fe091453bc4b010d3..17e984f514e1bdbb54cd695481ddb67dfccd9c25 100644
--- a/std/haxe/Timer.hx
+++ b/std/haxe/Timer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,31 +19,31 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 /**
-	The Timer class allows you to create asynchronous timers on platforms that
+	The `Timer` class allows you to create asynchronous timers on platforms that
 	support events.
 
-	The intended usage is to create an instance of the Timer class with a given
-	interval, set its run() method to a custom function to be invoked and
-	eventually call stop() to stop the Timer.
+	The intended usage is to create an instance of the `Timer` class with a given
+	interval, set its `run()` method to a custom function to be invoked and
+	eventually call `stop()` to stop the `Timer`.
 
-	Note that a running Timer may or may not prevent the program to exit
-	automatically when main() returns.
+	Note that a running `Timer` may or may not prevent the program to exit
+	automatically when `main()` returns.
 
-	It is also possible to extend this class and override its run() method in
+	It is also possible to extend this class and override its `run()` method in
 	the child class.
 **/
 class Timer {
-
 	#if (flash || js)
-		private var id : Null<Int>;
+	private var id:Null<Int>;
 	#elseif java
-		private var timer : java.util.Timer;
-		private var task : java.util.TimerTask;
+	private var timer:java.util.Timer;
+	private var task:java.util.TimerTask;
 	#else
-		private var event : MainLoop.MainEvent;
+	private var event:MainLoop.MainEvent;
 	#end
 
 	/**
@@ -57,23 +57,25 @@ class Timer {
 
 		The accuracy of this may be platform-dependent.
 	**/
-	public function new( time_ms : Int ){
+	public function new(time_ms:Int) {
 		#if flash
-			var me = this;
-			id = untyped __global__["flash.utils.setInterval"](function() { me.run(); },time_ms);
+		var me = this;
+		id = untyped __global__["flash.utils.setInterval"](function() {
+			me.run();
+		}, time_ms);
 		#elseif js
-			var me = this;
-			id = untyped setInterval(function() me.run(),time_ms);
+		var me = this;
+		id = untyped setInterval(function() me.run(), time_ms);
 		#elseif java
-			timer = new java.util.Timer();
-			timer.scheduleAtFixedRate(task = new TimerTask(this), haxe.Int64.ofInt(time_ms), haxe.Int64.ofInt(time_ms));
+		timer = new java.util.Timer();
+		timer.scheduleAtFixedRate(task = new TimerTask(this), haxe.Int64.ofInt(time_ms), haxe.Int64.ofInt(time_ms));
 		#else
-			var dt = time_ms / 1000;
-			event = MainLoop.add(function() {
-				@:privateAccess event.nextRun += dt;
-				run();
-			});
-			event.delay(dt);
+		var dt = time_ms / 1000;
+		event = MainLoop.add(function() {
+			@:privateAccess event.nextRun += dt;
+			run();
+		});
+		event.delay(dt);
 		#end
 	}
 
@@ -87,25 +89,25 @@ class Timer {
 	**/
 	public function stop() {
 		#if (flash || js)
-			if( id == null )
-				return;
-			#if flash
-				untyped __global__["flash.utils.clearInterval"](id);
-			#elseif js
-				untyped clearInterval(id);
-			#end
-			id = null;
+		if (id == null)
+			return;
+		#if flash
+		untyped __global__["flash.utils.clearInterval"](id);
+		#elseif js
+		untyped clearInterval(id);
+		#end
+		id = null;
 		#elseif java
-			if(timer != null) {
-				timer.cancel();
-				timer = null;
-			}
-			task = null;
+		if (timer != null) {
+			timer.cancel();
+			timer = null;
+		}
+		task = null;
 		#else
-			if( event != null ) {
-				event.stop();
-				event = null;
-			}
+		if (event != null) {
+			event.stop();
+			event = null;
+		}
 		#end
 	}
 
@@ -114,26 +116,27 @@ class Timer {
 
 		It can be overridden in a subclass, or rebound directly to a custom
 		function:
-			var timer = new haxe.Timer(1000); // 1000ms delay
-			timer.run = function() { ... }
 
+		```haxe
+		var timer = new haxe.Timer(1000); // 1000ms delay
+		timer.run = function() { ... }
+		```
+		
 		Once bound, it can still be rebound to different functions until `this`
 		Timer is stopped through a call to `this.stop`.
 	**/
-	public dynamic function run() {
-
-	}
+	public dynamic function run() {}
 
 	/**
 		Invokes `f` after `time_ms` milliseconds.
 
 		This is a convenience function for creating a new Timer instance with
-		`time_ms` as argument, binding its run() method to `f` and then stopping
+		`time_ms` as argument, binding its `run()` method to `f` and then stopping
 		`this` Timer upon the first invocation.
 
-		If `f` is null, the result is unspecified.
+		If `f` is `null`, the result is unspecified.
 	**/
-	public static function delay( f : Void -> Void, time_ms : Int ) {
+	public static function delay(f:Void->Void, time_ms:Int) {
 		var t = new haxe.Timer(time_ms);
 		t.run = function() {
 			t.stop();
@@ -146,14 +149,14 @@ class Timer {
 		Measures the time it takes to execute `f`, in seconds with fractions.
 
 		This is a convenience function for calculating the difference between
-		Timer.stamp() before and after the invocation of `f`.
+		`Timer.stamp()` before and after the invocation of `f`.
 
-		The difference is passed as argument to Log.trace(), with "s" appended
+		The difference is passed as argument to `Log.trace()`, with `"s"` appended
 		to denote the unit. The optional `pos` argument is passed through.
 
-		If `f` is null, the result is unspecified.
+		If `f` is `null`, the result is unspecified.
 	**/
-	public static function measure<T>( f : Void -> T, ?pos : PosInfos ) : T {
+	public static function measure<T>(f:Void->T, ?pos:PosInfos):T {
 		var t0 = stamp();
 		var r = f();
 		Log.trace((stamp() - t0) + "s", pos);
@@ -166,31 +169,30 @@ class Timer {
 		The value itself might differ depending on platforms, only differences
 		between two values make sense.
 	**/
-	public static inline function stamp() : Float {
+	public static inline function stamp():Float {
 		#if flash
-			return flash.Lib.getTimer() / 1000;
+		return flash.Lib.getTimer() / 1000;
 		#elseif (neko || php)
-			return Sys.time();
+		return Sys.time();
 		#elseif js
-			return Date.now().getTime() / 1000;
+		return js.lib.Date.now() / 1000;
 		#elseif cpp
-			return untyped __global__.__time_stamp();
+		return untyped __global__.__time_stamp();
 		#elseif python
-			return Sys.cpuTime();
+		return Sys.cpuTime();
 		#elseif sys
-			return Sys.time();
-
+		return Sys.time();
 		#else
-			return 0;
+		return 0;
 		#end
 	}
-
 }
 
 #if java
 @:nativeGen
 private class TimerTask extends java.util.TimerTask {
 	var timer:Timer;
+
 	public function new(timer:Timer):Void {
 		super();
 		this.timer = timer;
diff --git a/std/haxe/Ucs2.hx b/std/haxe/Ucs2.hx
index 0c9a7d62313eac9d4ad57d15a4a394c0ed2de2af..0e3e6ebc23a4176b7f8c067091dee5f2a01f9d20 100644
--- a/std/haxe/Ucs2.hx
+++ b/std/haxe/Ucs2.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,16 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 /**
 	Cross platform UCS2 string API.
 **/
 abstract Ucs2(String) {
+	extern public var length(get, never):Int;
 
-	@:extern public var length(get,never) : Int;
-
-	@:extern inline function new(str:String) : Void {
+	extern inline function new(str:String):Void {
 		// this implementation only allows platforms which have native UCS2 String.
 		// other platforms should create a shadow class in their _std directory
 		#if !(flash || js)
@@ -37,7 +37,7 @@ abstract Ucs2(String) {
 		this = str;
 	}
 
-	@:extern inline function get_length() {
+	extern inline function get_length() {
 		return this.length;
 	}
 
@@ -46,7 +46,7 @@ abstract Ucs2(String) {
 
 		Affects the characters `a-z`. Other characters remain unchanged.
 	**/
-	@:extern public inline function toUpperCase() : Ucs2 {
+	extern public inline function toUpperCase():Ucs2 {
 		return new Ucs2(this.toUpperCase());
 	}
 
@@ -55,7 +55,7 @@ abstract Ucs2(String) {
 
 		Affects the characters `A-Z`. Other characters remain unchanged.
 	**/
-	@:extern public inline function toLowerCase() : Ucs2 {
+	extern public inline function toLowerCase():Ucs2 {
 		return new Ucs2(this.toLowerCase());
 	}
 
@@ -65,20 +65,20 @@ abstract Ucs2(String) {
 		If `index` is negative or exceeds `this.length`, the empty Ucs2 ""
 		is returned.
 	**/
-	@:extern public inline function charAt(index : Int) : Ucs2 {
+	extern public inline function charAt(index:Int):Ucs2 {
 		return new Ucs2(this.charAt(index));
 	}
 
 	/**
 		Returns the character code at position `index` of `this` Ucs2.
 
-		If `index` is negative or exceeds `this.length`, null is returned.
+		If `index` is negative or exceeds `this.length`, `null` is returned.
 
-		To obtain the character code of a single character, "x".code can be used
-		instead to @:extern public inline the character code at compile time. Note that this
+		To obtain the character code of a single character, `"x".code` can be used
+		instead to extern public inline the character code at compile time. Note that this
 		only works on Ucs2 literals of length 1.
 	**/
-	@:extern public inline function charCodeAt( index : Int) : Null<Int> {
+	extern public inline function charCodeAt(index:Int):Null<Int> {
 		return this.charCodeAt(index);
 	}
 
@@ -93,8 +93,8 @@ abstract Ucs2(String) {
 
 		If `str` cannot be found, -1 is returned.
 	**/
-	@:extern public inline function indexOf( str : Ucs2, ?startIndex : Int ) : Int {
-		return this.indexOf(str.toNativeString(),startIndex);
+	extern public inline function indexOf(str:Ucs2, ?startIndex:Int):Int {
+		return this.indexOf(str.toNativeString(), startIndex);
 	}
 
 	/**
@@ -108,8 +108,8 @@ abstract Ucs2(String) {
 
 		If `str` cannot be found, -1 is returned.
 	**/
-	@:extern public inline function lastIndexOf( str : Ucs2, ?startIndex : Int ) : Int {
-		return this.lastIndexOf(str.toNativeString(),startIndex);
+	extern public inline function lastIndexOf(str:Ucs2, ?startIndex:Int):Int {
+		return this.lastIndexOf(str.toNativeString(), startIndex);
 	}
 
 	/**
@@ -132,7 +132,7 @@ abstract Ucs2(String) {
 		result Array contains a leading (or trailing) empty Ucs2 "" element.
 		Two subsequent delimiters also result in an empty Ucs2 "" element.
 	**/
-	@:extern public inline function split( delimiter : Ucs2 ) : Array<Ucs2> {
+	extern public inline function split(delimiter:Ucs2):Array<Ucs2> {
 		return cast this.split(delimiter.toNativeString());
 	}
 
@@ -151,8 +151,8 @@ abstract Ucs2(String) {
 
 		If `len` is negative, the result is unspecified.
 	**/
-	@:extern public inline function substr( pos : Int, ?len : Int ) : Ucs2 {
-		return new Ucs2(this.substr(pos,len));
+	extern public inline function substr(pos:Int, ?len:Int):Ucs2 {
+		return new Ucs2(this.substr(pos, len));
 	}
 
 	/**
@@ -168,14 +168,14 @@ abstract Ucs2(String) {
 		If the (possibly swapped) `startIndex` exceeds `this.length`, the empty
 		Ucs2 "" is returned.
 	**/
-	@:extern public inline function substring( startIndex : Int, ?endIndex : Int ) : Ucs2 {
-		return new Ucs2(this.substring(startIndex,endIndex));
+	extern public inline function substring(startIndex:Int, ?endIndex:Int):Ucs2 {
+		return new Ucs2(this.substring(startIndex, endIndex));
 	}
 
 	/**
 		Returns the native underlying String.
 	**/
-	@:extern public inline function toNativeString() : String {
+	extern public inline function toNativeString():String {
 		return this;
 	}
 
@@ -185,8 +185,7 @@ abstract Ucs2(String) {
 		If `code` is negative or has another invalid value, the result is
 		unspecified.
 	**/
-	@:extern public static inline function fromCharCode( code : Int ) : Ucs2 {
+	extern public static inline function fromCharCode(code:Int):Ucs2 {
 		return new Ucs2(String.fromCharCode(code));
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/haxe/Unserializer.hx b/std/haxe/Unserializer.hx
index f66f277a8c3945a0bf403e8071026c89772b216d..1a1fedb2dd76d1b0172214d124a99d06035b0028 100644
--- a/std/haxe/Unserializer.hx
+++ b/std/haxe/Unserializer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
+import haxe.ds.List;
+
 @:noDoc
 typedef TypeResolver = {
-	function resolveClass( name : String ) : Class<Dynamic>;
-	function resolveEnum( name : String ) : Enum<Dynamic>;
+	function resolveClass(name:String):Class<Dynamic>;
+	function resolveEnum(name:String):Enum<Dynamic>;
 }
 
 /**
@@ -43,11 +46,10 @@ typedef TypeResolver = {
 	<https://haxe.org/manual/serialization/format>
 **/
 class Unserializer {
-
 	/**
 		This value can be set to use custom type resolvers.
 
-		A type resolver finds a `Class` or `Enum` instance from a given `String`. 
+		A type resolver finds a `Class` or `Enum` instance from a given `String`.
 		By default, the Haxe `Type` Api is used.
 
 		A type resolver must provide two methods:
@@ -60,7 +62,7 @@ class Unserializer {
 		This value is applied when a new `Unserializer` instance is created.
 		Changing it afterwards has no effect on previously created instances.
 	**/
-	public static var DEFAULT_RESOLVER : TypeResolver = new DefaultResolver();
+	public static var DEFAULT_RESOLVER:TypeResolver = new DefaultResolver();
 
 	static var BASE64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789%:";
 
@@ -68,27 +70,22 @@ class Unserializer {
 	static var CODES = null;
 
 	static function initCodes() {
-		var codes =
-			#if flash
-				new flash.utils.ByteArray();
-			#else
-				new Array();
-			#end
-		for( i in 0...BASE64.length )
-			codes[StringTools.fastCodeAt(BASE64,i)] = i;
+		var codes = #if flash new flash.utils.ByteArray(); #else new Array(); #end
+		for (i in 0...BASE64.length)
+			codes[StringTools.fastCodeAt(BASE64, i)] = i;
 		return codes;
 	}
 	#end
 
- 	var buf : String;
- 	var pos : Int;
- 	var length : Int;
- 	var cache : Array<Dynamic>;
- 	var scache : Array<String>;
- 	var resolver : TypeResolver;
- 	#if neko
- 	var upos : Int;
- 	#end
+	var buf:String;
+	var pos:Int;
+	var length:Int;
+	var cache:Array<Dynamic>;
+	var scache:Array<String>;
+	var resolver:TypeResolver;
+	#if neko
+	var upos:Int;
+	#end
 
 	/**
 		Creates a new Unserializer instance, with its internal buffer
@@ -99,33 +96,33 @@ class Unserializer {
 
 		Each Unserializer instance maintains its own cache.
 	**/
- 	public function new( buf : String ) {
- 		this.buf = buf;
- 		length = buf.length;
- 		pos = 0;
- 		#if neko
- 		upos = 0;
- 		#end
- 		scache = new Array();
- 		cache = new Array();
+	public function new(buf:String) {
+		this.buf = buf;
+		length = buf.length;
+		pos = 0;
+		#if neko
+		upos = 0;
+		#end
+		scache = new Array();
+		cache = new Array();
 		var r = DEFAULT_RESOLVER;
-		if( r == null ) {
+		if (r == null) {
 			r = new DefaultResolver();
 			DEFAULT_RESOLVER = r;
 		}
 		resolver = r;
- 	}
+	}
 
 	/**
 		Sets the type resolver of `this` Unserializer instance to `r`.
 
-		If `r` is null, a special resolver is used which returns null for all
+		If `r` is `null`, a special resolver is used which returns `null` for all
 		input values.
 
 		See `DEFAULT_RESOLVER` for more information on type resolvers.
 	**/
- 	public function setResolver( r ) {
-		if( r == null )
+	public function setResolver(r) {
+		if (r == null)
 			resolver = NullResolver.instance;
 		else
 			resolver = r;
@@ -136,78 +133,79 @@ class Unserializer {
 
 		See `DEFAULT_RESOLVER` for more information on type resolvers.
 	**/
- 	public function getResolver() {
+	public function getResolver() {
 		return resolver;
 	}
 
-	inline function get(p) : Int {
+	inline function get(p):Int {
 		return StringTools.fastCodeAt(buf, p);
 	}
 
- 	function readDigits() {
- 		var k = 0;
- 		var s = false;
- 		var fpos = pos;
- 		while( true ) {
- 			var c = get(pos);
-			if( StringTools.isEof(c) )
+	function readDigits() {
+		var k = 0;
+		var s = false;
+		var fpos = pos;
+		while (true) {
+			var c = get(pos);
+			if (StringTools.isEof(c))
+				break;
+			if (c == "-".code) {
+				if (pos != fpos)
+					break;
+				s = true;
+				pos++;
+				continue;
+			}
+			if (c < "0".code || c > "9".code)
 				break;
- 			if( c == "-".code ) {
- 				if( pos != fpos )
- 					break;
- 				s = true;
- 				pos++;
- 				continue;
- 			}
- 			if( c < "0".code || c > "9".code )
- 				break;
- 			k = k * 10 + (c - "0".code);
- 			pos++;
- 		}
- 		if( s )
- 			k *= -1;
- 		return k;
- 	}
+			k = k * 10 + (c - "0".code);
+			pos++;
+		}
+		if (s)
+			k *= -1;
+		return k;
+	}
 
 	function readFloat() {
 		var p1 = pos;
- 		while( true ) {
- 			var c = get(pos);
-			if( StringTools.isEof(c)) break;
- 			// + - . , 0-9
- 			if( (c >= 43 && c < 58) || c == "e".code || c == "E".code )
- 				pos++;
- 			else
- 				break;
- 		}
- 		return Std.parseFloat(buf.substr(p1,pos-p1));
+		while (true) {
+			var c = get(pos);
+			if (StringTools.isEof(c))
+				break;
+			// + - . , 0-9
+			if ((c >= 43 && c < 58) || c == "e".code || c == "E".code)
+				pos++;
+			else
+				break;
+		}
+		return Std.parseFloat(buf.substr(p1, pos - p1));
 	}
 
-	function unserializeObject(o) {
- 		while( true ) {
- 			if( pos >= length )
- 				throw "Invalid object";
- 			if( get(pos) == "g".code )
- 				break;
- 			var k = unserialize();
- 			if( !Std.is(k,String) )
- 				throw "Invalid object key";
- 			var v = unserialize();
- 			Reflect.setField(o,k,v);
- 		}
- 		pos++;
+	function unserializeObject(o:{}) {
+		while (true) {
+			if (pos >= length)
+				throw "Invalid object";
+			if (get(pos) == "g".code)
+				break;
+			var k:Dynamic = unserialize();
+			if (!Std.is(k, String))
+				throw "Invalid object key";
+			var v = unserialize();
+			Reflect.setField(o, k, v);
+		}
+		pos++;
 	}
 
-	function unserializeEnum( edecl, tag ) {
-		if( get(pos++) != ":".code )
+	function unserializeEnum<T>(edecl:Enum<T>, tag:String) {
+		if (get(pos++) != ":".code)
 			throw "Invalid enum format";
 		var nargs = readDigits();
-		if( nargs == 0 )
-			return Type.createEnum(edecl,tag);
+		if (nargs == 0)
+			return Type.createEnum(edecl, tag);
 		var args = new Array();
-		while( nargs-- > 0 )
+		while (nargs-- > 0)
 			args.push(unserialize());
-		return Type.createEnum(edecl,tag,args);
+		return Type.createEnum(edecl, tag, args);
 	}
 
 	/**
@@ -230,261 +228,269 @@ class Unserializer {
 		Classes are created from `Type.createEmptyInstance`, which means their
 		constructors are not called.
 	**/
- 	public function unserialize() : Dynamic {
- 		switch( get(pos++) ) {
- 		case "n".code:
- 			return null;
- 		case "t".code:
- 			return true;
- 		case "f".code:
- 			return false;
- 		case "z".code:
- 			return 0;
- 		case "i".code:
- 			return readDigits();
- 		case "d".code:
- 			return readFloat();
-		case "y".code:
- 			var len = readDigits();
- 			if( get(pos++) != ":".code || length - pos < len )
- 				throw "Invalid string length";
-			var s = buf.substr(pos,len);
-			pos += len;
-			s = StringTools.urlDecode(s);
-			scache.push(s);
-			return s;
- 		case "k".code:
- 			return Math.NaN;
- 		case "m".code:
- 			return Math.NEGATIVE_INFINITY;
- 		case "p".code:
- 			return Math.POSITIVE_INFINITY;
- 		case "a".code:
-			var buf = buf;
- 			var a = new Array<Dynamic>();
- 			#if cpp var cachePos = cache.length; #end
- 			cache.push(a);
- 			while( true ) {
- 				var c = get(pos);
- 				if( c == "h".code ) {
-					pos++;
- 					break;
+	public function unserialize():Dynamic {
+		switch (get(pos++)) {
+			case "n".code:
+				return null;
+			case "t".code:
+				return true;
+			case "f".code:
+				return false;
+			case "z".code:
+				return 0;
+			case "i".code:
+				return readDigits();
+			case "d".code:
+				return readFloat();
+			case "y".code:
+				var len = readDigits();
+				if (get(pos++) != ":".code || length - pos < len)
+					throw "Invalid string length";
+				var s = buf.substr(pos, len);
+				pos += len;
+				s = StringTools.urlDecode(s);
+				scache.push(s);
+				return s;
+			case "k".code:
+				return Math.NaN;
+			case "m".code:
+				return Math.NEGATIVE_INFINITY;
+			case "p".code:
+				return Math.POSITIVE_INFINITY;
+			case "a".code:
+				var buf = buf;
+				var a = new Array<Dynamic>();
+				#if cpp
+				var cachePos = cache.length;
+				#end
+				cache.push(a);
+				while (true) {
+					var c = get(pos);
+					if (c == "h".code) {
+						pos++;
+						break;
+					}
+					if (c == "u".code) {
+						pos++;
+						var n = readDigits();
+						a[a.length + n - 1] = null;
+					} else
+						a.push(unserialize());
 				}
- 				if( c == "u".code ) {
-					pos++;
- 					var n = readDigits();
- 					a[a.length+n-1] = null;
- 				} else
- 					a.push(unserialize());
- 			}
- 			#if cpp
- 			return cache[cachePos] = cpp.NativeArray.resolveVirtualArray(a);
- 			#else
- 			return a;
- 			#end
- 		case "o".code:
-	 		var o = {};
-	 		cache.push(o);
-			unserializeObject(o);
-			return o;
- 		case "r".code:
- 			var n = readDigits();
- 			if( n < 0 || n >= cache.length )
- 				throw "Invalid reference";
- 			return cache[n];
- 		case "R".code:
-			var n = readDigits();
-			if( n < 0 || n >= scache.length )
-				throw "Invalid string reference";
-			return scache[n];
- 		case "x".code:
-			throw unserialize();
-		case "c".code:
-	 		var name = unserialize();
-			var cl = resolver.resolveClass(name);
-			if( cl == null )
-				throw "Class not found " + name;
-			var o = Type.createEmptyInstance(cl);
-			cache.push(o);
-			unserializeObject(o);
-			return o;
-		case "w".code:
-			var name = unserialize();
-			var edecl = resolver.resolveEnum(name);
-			if( edecl == null )
-				throw "Enum not found " + name;
-			var e = unserializeEnum(edecl, unserialize());
-			cache.push(e);
-			return e;
- 		case "j".code:
-			var name = unserialize();
-			var edecl = resolver.resolveEnum(name);
-			if( edecl == null )
-				throw "Enum not found " + name;
-			pos++; /* skip ':' */
-			var index = readDigits();
-			var tag = Type.getEnumConstructs(edecl)[index];
-			if( tag == null )
-				throw "Unknown enum index "+name+"@"+index;
-			var e = unserializeEnum(edecl, tag);
-			cache.push(e);
-			return e;
-		case "l".code:
-			var l = new List();
-			cache.push(l);
-			var buf = buf;
-			while( get(pos) != "h".code )
-				l.add(unserialize());
-			pos++;
-			return l;
-		case "b".code:
-			var h = new haxe.ds.StringMap();
-			cache.push(h);
-			var buf = buf;
-			while( get(pos) != "h".code ) {
-				var s = unserialize();
-				h.set(s,unserialize());
-			}
-			pos++;
-			return h;
-		case "q".code:
-			var h = new haxe.ds.IntMap();
-			cache.push(h);
-			var buf = buf;
-			var c = get(pos++);
-			while( c == ":".code ) {
-				var i = readDigits();
-				h.set(i,unserialize());
-				c = get(pos++);
-			}
-			if( c != "h".code )
-				throw "Invalid IntMap format";
-			return h;
-		case "M".code:
-			var h = new haxe.ds.ObjectMap();
-			cache.push(h);
-			var buf = buf;
-			while( get(pos) != "h".code ) {
-				var s = unserialize();
-				h.set(s,unserialize());
-			}
-			pos++;
-			return h;
-		case "v".code:
-			var d;
-			if(	get(pos) >= '0'.code && get(pos) <= '9'.code &&
-				get(pos + 1) >= '0'.code && get(pos + 1) <= '9'.code &&
-				get(pos + 2) >= '0'.code && get(pos + 2) <= '9'.code &&
-				get(pos + 3) >= '0'.code && get(pos + 3) <= '9'.code &&
-				get(pos + 4) == '-'.code
-				) {
-				// Included for backwards compatibility
-				d = Date.fromString(buf.substr(pos,19));
-				pos += 19;
-			} else
-				d = Date.fromTime(readFloat());
-			cache.push(d);
-			return d;
- 		case "s".code:
- 			var len = readDigits();
-			var buf = buf;
- 			if( get(pos++) != ":".code || length - pos < len )
-				throw "Invalid bytes length";
-			#if neko
-			var bytes = haxe.io.Bytes.ofData( base_decode(untyped buf.substr(pos,len).__s,untyped BASE64.__s) );
-			#else
-			var codes = CODES;
-			if( codes == null ) {
-				codes = initCodes();
-				CODES = codes;
-			}
-			var i = pos;
-			var rest = len & 3;
-			var size = (len >> 2) * 3 + ((rest >= 2) ? rest - 1 : 0);
-			var max = i + (len - rest);
-			var bytes = haxe.io.Bytes.alloc(size);
-			var bpos = 0;
-			while( i < max ) {
-				var c1 = codes[StringTools.fastCodeAt(buf,i++)];
-				var c2 = codes[StringTools.fastCodeAt(buf,i++)];
-				bytes.set(bpos++,(c1 << 2) | (c2 >> 4));
-				var c3 = codes[StringTools.fastCodeAt(buf,i++)];
-				bytes.set(bpos++,(c2 << 4) | (c3 >> 2));
-				var c4 = codes[StringTools.fastCodeAt(buf,i++)];
-				bytes.set(bpos++,(c3 << 6) | c4);
-			}
-			if( rest >= 2 ) {
-				var c1 = codes[StringTools.fastCodeAt(buf,i++)];
-				var c2 = codes[StringTools.fastCodeAt(buf,i++)];
-				bytes.set(bpos++,(c1 << 2) | (c2 >> 4));
-				if( rest == 3 ) {
-					var c3 = codes[StringTools.fastCodeAt(buf,i++)];
-					bytes.set(bpos++,(c2 << 4) | (c3 >> 2));
+				#if cpp
+				return cache[cachePos] = cpp.NativeArray.resolveVirtualArray(a);
+				#else
+				return a;
+				#end
+			case "o".code:
+				var o = {};
+				cache.push(o);
+				unserializeObject(o);
+				return o;
+			case "r".code:
+				var n = readDigits();
+				if (n < 0 || n >= cache.length)
+					throw "Invalid reference";
+				return cache[n];
+			case "R".code:
+				var n = readDigits();
+				if (n < 0 || n >= scache.length)
+					throw "Invalid string reference";
+				return scache[n];
+			case "x".code:
+				throw unserialize();
+			case "c".code:
+				var name = unserialize();
+				var cl = resolver.resolveClass(name);
+				if (cl == null)
+					throw "Class not found " + name;
+				var o = Type.createEmptyInstance(cl);
+				cache.push(o);
+				unserializeObject(o);
+				return o;
+			case "w".code:
+				var name = unserialize();
+				var edecl = resolver.resolveEnum(name);
+				if (edecl == null)
+					throw "Enum not found " + name;
+				var e = unserializeEnum(edecl, unserialize());
+				cache.push(e);
+				return e;
+			case "j".code:
+				var name = unserialize();
+				var edecl = resolver.resolveEnum(name);
+				if (edecl == null)
+					throw "Enum not found " + name;
+				pos++; /* skip ':' */
+				var index = readDigits();
+				var tag = Type.getEnumConstructs(edecl)[index];
+				if (tag == null)
+					throw "Unknown enum index " + name + "@" + index;
+				var e = unserializeEnum(edecl, tag);
+				cache.push(e);
+				return e;
+			case "l".code:
+				var l = new List();
+				cache.push(l);
+				var buf = buf;
+				while (get(pos) != "h".code)
+					l.add(unserialize());
+				pos++;
+				return l;
+			case "b".code:
+				var h = new haxe.ds.StringMap();
+				cache.push(h);
+				var buf = buf;
+				while (get(pos) != "h".code) {
+					var s = unserialize();
+					h.set(s, unserialize());
 				}
-			}
- 			#end
-			pos += len;
-			cache.push(bytes);
-			return bytes;
-		case "C".code:
-	 		var name = unserialize();
-			var cl = resolver.resolveClass(name);
-			if( cl == null )
-				throw "Class not found " + name;
-			var o : Dynamic = Type.createEmptyInstance(cl);
-			cache.push(o);
-			o.hxUnserialize(this);
-			if( get(pos++) != "g".code )
-				throw "Invalid custom data";
-			return o;
-		case "A".code:
-			var name = unserialize();
-			var cl = resolver.resolveClass(name);
-			if( cl == null )
-				throw "Class not found " + name;
-			return cl;
-		case "B".code:
-			var name = unserialize();
-			var e = resolver.resolveEnum(name);
-			if( e == null )
-				throw "Enum not found " + name;
-			return e;
- 		default:
- 		}
- 		pos--;
- 		throw ("Invalid char "+buf.charAt(pos)+" at position "+pos);
- 	}
+				pos++;
+				return h;
+			case "q".code:
+				var h = new haxe.ds.IntMap();
+				cache.push(h);
+				var buf = buf;
+				var c = get(pos++);
+				while (c == ":".code) {
+					var i = readDigits();
+					h.set(i, unserialize());
+					c = get(pos++);
+				}
+				if (c != "h".code)
+					throw "Invalid IntMap format";
+				return h;
+			case "M".code:
+				var h = new haxe.ds.ObjectMap();
+				cache.push(h);
+				var buf = buf;
+				while (get(pos) != "h".code) {
+					var s = unserialize();
+					h.set(s, unserialize());
+				}
+				pos++;
+				return h;
+			case "v".code:
+				var d;
+				if (get(pos) >= '0'.code && get(pos) <= '9'.code && get(pos + 1) >= '0'.code && get(pos + 1) <= '9'.code && get(pos + 2) >= '0'.code
+					&& get(pos + 2) <= '9'.code && get(pos + 3) >= '0'.code && get(pos + 3) <= '9'.code && get(pos + 4) == '-'.code) {
+					// Included for backwards compatibility
+					d = Date.fromString(buf.substr(pos, 19));
+					pos += 19;
+				} else
+					d = Date.fromTime(readFloat());
+				cache.push(d);
+				return d;
+			case "s".code:
+				var len = readDigits();
+				var buf = buf;
+				if (get(pos++) != ":".code || length - pos < len)
+					throw "Invalid bytes length";
+				#if neko
+				var bytes = haxe.io.Bytes.ofData(base_decode(untyped buf.substr(pos, len).__s, untyped BASE64.__s));
+				#else
+				var codes = CODES;
+				if (codes == null) {
+					codes = initCodes();
+					CODES = codes;
+				}
+				var i = pos;
+				var rest = len & 3;
+				var size = (len >> 2) * 3 + ((rest >= 2) ? rest - 1 : 0);
+				var max = i + (len - rest);
+				var bytes = haxe.io.Bytes.alloc(size);
+				var bpos = 0;
+				while (i < max) {
+					var c1 = codes[StringTools.fastCodeAt(buf, i++)];
+					var c2 = codes[StringTools.fastCodeAt(buf, i++)];
+					bytes.set(bpos++, (c1 << 2) | (c2 >> 4));
+					var c3 = codes[StringTools.fastCodeAt(buf, i++)];
+					bytes.set(bpos++, (c2 << 4) | (c3 >> 2));
+					var c4 = codes[StringTools.fastCodeAt(buf, i++)];
+					bytes.set(bpos++, (c3 << 6) | c4);
+				}
+				if (rest >= 2) {
+					var c1 = codes[StringTools.fastCodeAt(buf, i++)];
+					var c2 = codes[StringTools.fastCodeAt(buf, i++)];
+					bytes.set(bpos++, (c1 << 2) | (c2 >> 4));
+					if (rest == 3) {
+						var c3 = codes[StringTools.fastCodeAt(buf, i++)];
+						bytes.set(bpos++, (c2 << 4) | (c3 >> 2));
+					}
+				}
+				#end
+				pos += len;
+				cache.push(bytes);
+				return bytes;
+			case "C".code:
+				var name = unserialize();
+				var cl = resolver.resolveClass(name);
+				if (cl == null)
+					throw "Class not found " + name;
+				var o:Dynamic = Type.createEmptyInstance(cl);
+				cache.push(o);
+				o.hxUnserialize(this);
+				if (get(pos++) != "g".code)
+					throw "Invalid custom data";
+				return o;
+			case "A".code:
+				var name = unserialize();
+				var cl = resolver.resolveClass(name);
+				if (cl == null)
+					throw "Class not found " + name;
+				return cl;
+			case "B".code:
+				var name = unserialize();
+				var e = resolver.resolveEnum(name);
+				if (e == null)
+					throw "Enum not found " + name;
+				return e;
+			default:
+		}
+		pos--;
+		throw("Invalid char " + buf.charAt(pos) + " at position " + pos);
+	}
 
 	/**
 		Unserializes `v` and returns the according value.
 
 		This is a convenience function for creating a new instance of
-		Unserializer with `v` as buffer and calling its unserialize() method
+		Unserializer with `v` as buffer and calling its `unserialize()` method
 		once.
 	**/
-	public static function run( v : String ) : Dynamic {
+	public static function run(v:String):Dynamic {
 		return new Unserializer(v).unserialize();
 	}
 
 	#if neko
-	static var base_decode = neko.Lib.load("std","base_decode",2);
+	static var base_decode = neko.Lib.load("std", "base_decode", 2);
 	#end
-
 }
 
 private class DefaultResolver {
 	public function new() {}
-	@:final public inline function resolveClass(name:String):Class<Dynamic> return Type.resolveClass(name);
-	@:final public inline function resolveEnum(name:String):Enum<Dynamic> return Type.resolveEnum(name);
+
+	public inline function resolveClass(name:String):Class<Dynamic>
+		return Type.resolveClass(name);
+
+	public inline function resolveEnum(name:String):Enum<Dynamic>
+		return Type.resolveEnum(name);
 }
 
 private class NullResolver {
 	function new() {}
-	@:final public inline function resolveClass(name:String):Class<Dynamic> return null;
-	@:final public inline function resolveEnum(name:String):Enum<Dynamic> return null;
-	public static var instance(get,null):NullResolver;
+
+	public inline function resolveClass(name:String):Class<Dynamic>
+		return null;
+
+	public inline function resolveEnum(name:String):Enum<Dynamic>
+		return null;
+
+	public static var instance(get, null):NullResolver;
+
 	inline static function get_instance():NullResolver {
-		if (instance == null) instance = new NullResolver();
+		if (instance == null)
+			instance = new NullResolver();
 		return instance;
 	}
 }
diff --git a/std/haxe/Utf8.hx b/std/haxe/Utf8.hx
index 09b2cad2d42b23ed7a8479eb7ef0418649846bed..9ceee126c121386d262fb329d167202f725b92a1 100644
--- a/std/haxe/Utf8.hx
+++ b/std/haxe/Utf8.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,49 +19,50 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 /**
 	Since not all platforms guarantee that `String` always uses UTF-8 encoding, you
 	can use this cross-platform API to perform operations on such strings.
 **/
+@:deprecated('haxe.Utf8 is deprecated. Use UnicodeString instead.')
 class Utf8 {
-
-	var __b : String;
+	var __b:String;
 
 	/**
 		Allocate a new Utf8 buffer using an optional bytes size.
 	**/
-	public function new( ?size : Int ) {
+	public function new(?size:Int) {
 		__b = "";
 	}
 
 	/**
 		Add the given UTF8 character code to the buffer.
 	**/
-	public inline function addChar( c : Int ) : Void {
+	public inline function addChar(c:Int):Void {
 		__b += String.fromCharCode(c);
 	}
 
 	/**
 		Returns the buffer converted to a String.
 	**/
-	public inline function toString() : String {
+	public inline function toString():String {
 		return __b;
 	}
 
 	/**
 		Call the `chars` function for each UTF8 char of the string.
 	**/
-	public static function iter( s : String, chars : Int -> Void ) {
-		for( i in 0...s.length )
+	public static function iter(s:String, chars:Int->Void) {
+		for (i in 0...s.length)
 			chars(s.charCodeAt(i));
 	}
 
 	/**
 		Encode the input ISO string into the corresponding UTF8 one.
 	**/
-	public static function encode( s : String ) : String {
+	public static function encode(s:String):String {
 		throw "Not implemented";
 	}
 
@@ -69,44 +70,45 @@ class Utf8 {
 		Decode an UTF8 string back to an ISO string.
 		Throw an exception if a given UTF8 character is not supported by the decoder.
 	**/
-	public static function decode( s : String ) : String {
+	public static function decode(s:String):String {
 		throw "Not implemented";
 	}
 
 	/**
 		Similar to `String.charCodeAt` but uses the UTF8 character position.
 	**/
-	public static inline function charCodeAt( s : String, index : Int ) : Int {
+	public static inline function charCodeAt(s:String, index:Int):Int {
 		return s.charCodeAt(index);
 	}
 
 	/**
 		Tells if the String is correctly encoded as UTF8.
 	**/
-	public static inline function validate( s : String ) : Bool {
+	public static inline function validate(s:String):Bool {
 		return true;
 	}
 
 	/**
 		Returns the number of UTF8 chars of the String.
 	**/
-	#if js @:extern #end
-	public static inline function length( s : String ) : Int {
+	#if js
+	extern
+	#end
+	public static inline function length(s:String):Int {
 		return s.length;
 	}
 
 	/**
 		Compare two UTF8 strings, character by character.
 	**/
-	public static function compare( a : String, b : String ) : Int {
+	public static function compare(a:String, b:String):Int {
 		return a > b ? 1 : (a == b ? 0 : -1);
 	}
 
 	/**
 		This is similar to `String.substr` but the `pos` and `len` parts are considering UTF8 characters.
 	**/
-	public static inline function sub( s : String, pos : Int, len : Int ) : String {
-		return s.substr(pos,len);
+	public static inline function sub(s:String, pos:Int, len:Int):String {
+		return s.substr(pos, len);
 	}
-
 }
diff --git a/std/haxe/crypto/Adler32.hx b/std/haxe/crypto/Adler32.hx
index 93e3f6552d0686a1096be8f642ad087e5eeab6d2..6bef9e12f320053bb569a5bc3eb7514b1dc271ec 100644
--- a/std/haxe/crypto/Adler32.hx
+++ b/std/haxe/crypto/Adler32.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 /**
-    Calculates the Adler32 of the given Bytes.
-*/
+	Calculates the Adler32 of the given Bytes.
+ */
 class Adler32 {
-
-	var a1 : Int;
-	var a2 : Int;
+	var a1:Int;
+	var a2:Int;
 
 	public function new() {
 		a1 = 1;
@@ -38,9 +38,9 @@ class Adler32 {
 		return (a2 << 16) | a1;
 	}
 
-	public function update( b : haxe.io.Bytes, pos, len ) {
+	public function update(b:haxe.io.Bytes, pos, len) {
 		var a1 = a1, a2 = a2;
-		for( p in pos...pos + len ) {
+		for (p in pos...pos + len) {
 			var c = b.get(p);
 			a1 = (a1 + c) % 65521;
 			a2 = (a2 + a1) % 65521;
@@ -49,15 +49,15 @@ class Adler32 {
 		this.a2 = a2;
 	}
 
-	public function equals( a : Adler32 ) {
+	public function equals(a:Adler32) {
 		return a.a1 == a1 && a.a2 == a2;
 	}
 
 	public function toString() {
-		return StringTools.hex(a2,8) + StringTools.hex(a1,8);
+		return StringTools.hex(a2, 8) + StringTools.hex(a1, 8);
 	}
 
-	public static function read( i : haxe.io.Input ) {
+	public static function read(i:haxe.io.Input) {
 		var a = new Adler32();
 		var a2a = i.readByte();
 		var a2b = i.readByte();
@@ -68,11 +68,9 @@ class Adler32 {
 		return a;
 	}
 
-	public static function make( b : haxe.io.Bytes ) {
+	public static function make(b:haxe.io.Bytes) {
 		var a = new Adler32();
-		a.update(b,0,b.length);
+		a.update(b, 0, b.length);
 		return a.get();
 	}
-
-
 }
diff --git a/std/haxe/crypto/Base64.hx b/std/haxe/crypto/Base64.hx
index b7b811943fe817cfd0b648b5a5a85155eeeb44d7..aee6895e96ffdc8c4ff34001bb643cdeca052886 100644
--- a/std/haxe/crypto/Base64.hx
+++ b/std/haxe/crypto/Base64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,34 +19,56 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 /**
-	Allows to encode/decode String and bytes using Base64 encoding.
+	Allows one to encode/decode String and bytes using Base64 encoding.
 **/
 class Base64 {
+	public static var CHARS(default, null) = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	public static var BYTES(default, null) = haxe.io.Bytes.ofString(CHARS);
 
-	public static var CHARS(default,null) = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-	public static var BYTES(default,null) = haxe.io.Bytes.ofString(CHARS);
+	public static var URL_CHARS(default, null) = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+	public static var URL_BYTES(default, null) = haxe.io.Bytes.ofString(URL_CHARS);
 
-	public static function encode( bytes : haxe.io.Bytes, complement = true ) : String {
+	public static function encode(bytes:haxe.io.Bytes, complement = true):String {
 		var str = new BaseCode(BYTES).encodeBytes(bytes).toString();
-		if( complement )
+		if (complement)
 			switch (bytes.length % 3) {
-			case 1:
-				str += "==";
-			case 2:
-				str += "=";
-			default:
+				case 1:
+					str += "==";
+				case 2:
+					str += "=";
+				default:
 			}
 		return str;
 	}
 
-	public static function decode( str : String, complement = true ) : haxe.io.Bytes {
-		if( complement )
-			while( str.charCodeAt(str.length-1) == "=".code )
-				str = str.substr(0,-1);
+	public static function decode(str:String, complement = true):haxe.io.Bytes {
+		if (complement)
+			while (str.charCodeAt(str.length - 1) == "=".code)
+				str = str.substr(0, -1);
 		return new BaseCode(BYTES).decodeBytes(haxe.io.Bytes.ofString(str));
 	}
 
+	public static function urlEncode(bytes:haxe.io.Bytes, complement = false):String {
+		var str = new BaseCode(URL_BYTES).encodeBytes(bytes).toString();
+		if (complement)
+			switch (bytes.length % 3) {
+				case 1:
+					str += "==";
+				case 2:
+					str += "=";
+				default:
+			}
+		return str;
+	}
+
+	public static function urlDecode(str:String, complement = false):haxe.io.Bytes {
+		if (complement)
+			while (str.charCodeAt(str.length - 1) == "=".code)
+				str = str.substr(0, -1);
+		return new BaseCode(URL_BYTES).decodeBytes(haxe.io.Bytes.ofString(str));
+	}
 }
diff --git a/std/haxe/crypto/BaseCode.hx b/std/haxe/crypto/BaseCode.hx
index 9028c0af37ab5d7979d2a3fb6097d2d6996b416f..0bf636a78593d276a08878bcbdeb0b75a2ade1b1 100644
--- a/std/haxe/crypto/BaseCode.hx
+++ b/std/haxe/crypto/BaseCode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,72 +19,73 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 /**
-	Allows to encode/decode String and bytes using a power of two base dictionary.
+	Allows one to encode/decode String and bytes using a power of two base dictionary.
 **/
 class BaseCode {
+	var base:haxe.io.Bytes;
+	var nbits:Int;
+	var tbl:Array<Int>;
 
-	var base : haxe.io.Bytes;
-	var nbits : Int;
-	var tbl : Array<Int>;
-
-	public function new( base : haxe.io.Bytes ) {
+	public function new(base:haxe.io.Bytes) {
 		var len = base.length;
 		var nbits = 1;
-		while( len > 1 << nbits )
+		while (len > 1 << nbits)
 			nbits++;
-		if( nbits > 8 || len != 1 << nbits )
+		if (nbits > 8 || len != 1 << nbits)
 			throw "BaseCode : base length must be a power of two.";
 		this.base = base;
 		this.nbits = nbits;
 	}
 
-	public function encodeBytes( b : haxe.io.Bytes ) : haxe.io.Bytes {
+	public function encodeBytes(b:haxe.io.Bytes):haxe.io.Bytes {
 		#if (neko && !interp)
-		return haxe.io.Bytes.ofData( base_encode(b.getData(),base.getData()) );
+		return haxe.io.Bytes.ofData(base_encode(b.getData(), base.getData()));
 		#else
 		var nbits = this.nbits;
 		var base = this.base;
 		var size = Std.int(b.length * 8 / nbits);
-		var out = haxe.io.Bytes.alloc(size + (((b.length * 8) % nbits == 0) ? 0 : 1) );
+		var out = haxe.io.Bytes.alloc(size + (((b.length * 8) % nbits == 0) ? 0 : 1));
 		var buf = 0;
 		var curbits = 0;
 		var mask = (1 << nbits) - 1;
 		var pin = 0;
 		var pout = 0;
-		while( pout < size ) {
-			while( curbits < nbits ) {
+		while (pout < size) {
+			while (curbits < nbits) {
 				curbits += 8;
 				buf <<= 8;
 				buf |= b.get(pin++);
 			}
 			curbits -= nbits;
-			out.set(pout++,base.get((buf >> curbits) & mask));
+			out.set(pout++, base.get((buf >> curbits) & mask));
 		}
-		if( curbits > 0 )
-			out.set(pout++,base.get((buf << (nbits - curbits)) & mask));
+		if (curbits > 0)
+			out.set(pout++, base.get((buf << (nbits - curbits)) & mask));
 		return out;
 		#end
 	}
 
 	function initTable() {
 		var tbl = new Array();
-		for( i in 0...256 )
+		for (i in 0...256)
 			tbl[i] = -1;
-		for( i in 0...base.length )
+		for (i in 0...base.length)
 			tbl[base.get(i)] = i;
 		this.tbl = tbl;
 	}
 
-	public function decodeBytes( b : haxe.io.Bytes ) : haxe.io.Bytes {
+	public function decodeBytes(b:haxe.io.Bytes):haxe.io.Bytes {
 		#if (neko && !interp)
-		return haxe.io.Bytes.ofData( base_decode(b.getData(),base.getData()) );
+		return haxe.io.Bytes.ofData(base_decode(b.getData(), base.getData()));
 		#else
 		var nbits = this.nbits;
 		var base = this.base;
-		if( this.tbl == null ) initTable();
+		if (this.tbl == null)
+			initTable();
 		var tbl = this.tbl;
 		var size = (b.length * nbits) >> 3;
 		var out = haxe.io.Bytes.alloc(size);
@@ -92,50 +93,50 @@ class BaseCode {
 		var curbits = 0;
 		var pin = 0;
 		var pout = 0;
-		while( pout < size ) {
-			while( curbits < 8 ) {
+		while (pout < size) {
+			while (curbits < 8) {
 				curbits += nbits;
 				buf <<= nbits;
 				var i = tbl[b.get(pin++)];
-				if( i == -1 )
+				if (i == -1)
 					throw "BaseCode : invalid encoded char";
 				buf |= i;
 			}
 			curbits -= 8;
-			out.set(pout++,(buf >> curbits) & 0xFF);
+			out.set(pout++, (buf >> curbits) & 0xFF);
 		}
 		return out;
 		#end
 	}
 
-	public function encodeString( s : String ) {
+	public function encodeString(s:String) {
 		#if (neko && !interp)
-		return neko.NativeString.toString( base_encode(neko.NativeString.ofString(s),base.getData()) );
+		return neko.NativeString.toString(base_encode(neko.NativeString.ofString(s), base.getData()));
 		#else
 		return encodeBytes(haxe.io.Bytes.ofString(s)).toString();
 		#end
 	}
 
-	public function decodeString( s : String ) {
+	public function decodeString(s:String) {
 		#if (neko && !interp)
-		return neko.NativeString.toString( base_decode(neko.NativeString.ofString(s),base.getData()) );
+		return neko.NativeString.toString(base_decode(neko.NativeString.ofString(s), base.getData()));
 		#else
 		return decodeBytes(haxe.io.Bytes.ofString(s)).toString();
 		#end
 	}
 
-	public static function encode( s : String, base : String ) {
+	public static function encode(s:String, base:String) {
 		var b = new BaseCode(haxe.io.Bytes.ofString(base));
 		return b.encodeString(s);
 	}
 
-	public static function decode( s : String, base : String ) {
+	public static function decode(s:String, base:String) {
 		var b = new BaseCode(haxe.io.Bytes.ofString(base));
 		return b.decodeString(s);
 	}
 
 	#if neko
-	private static var base_encode = neko.Lib.load("std","base_encode",2);
-	private static var base_decode = neko.Lib.load("std","base_decode",2);
+	private static var base_encode = neko.Lib.load("std", "base_encode", 2);
+	private static var base_decode = neko.Lib.load("std", "base_decode", 2);
 	#end
 }
diff --git a/std/haxe/crypto/Crc32.hx b/std/haxe/crypto/Crc32.hx
index a74d362a3d0f6bc7a403ab9dd3e3fd9a4c120d58..dc30a734de5e84a6b7e6e472c8efa01bcc4a11b2 100644
--- a/std/haxe/crypto/Crc32.hx
+++ b/std/haxe/crypto/Crc32.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,66 +19,46 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 /**
-    Calculates the Crc32 of the given Bytes.
-*/
+	Calculates the Crc32 of the given Bytes.
+ */
 class Crc32 {
+	var crc:Int;
 
-	var crc : Int;
-
-	public function new() {
+	public inline function new() {
 		crc = 0xFFFFFFFF;
 	}
 
-	public function byte( b : Int ) {
+	public inline function byte(b:Int) {
 		var tmp = (crc ^ b) & 0xFF;
-		for( j in 0...8 ) {
-			if( tmp & 1 == 1 )
-				tmp = (tmp >>> 1) ^ 0xEDB88320;
-			else
-				tmp >>>= 1;
-		}
+		for (j in 0...8)
+			tmp = (tmp >>> 1) ^ (-(tmp & 1) & 0xEDB88320);
 		crc = (crc >>> 8) ^ tmp;
 	}
 
-	public function update( b : haxe.io.Bytes, pos, len ) {
+	public inline function update(b:haxe.io.Bytes, pos, len) {
 		var b = b.getData();
-		for( i in pos...pos+len ) {
-			var tmp = (crc ^ haxe.io.Bytes.fastGet(b,i)) & 0xFF;
-			for( j in 0...8 ) {
-				if( tmp & 1 == 1 )
-					tmp = (tmp >>> 1) ^ 0xEDB88320;
-				else
-					tmp >>>= 1;
-			}
+		for (i in pos...pos + len) {
+			var tmp = (crc ^ haxe.io.Bytes.fastGet(b, i)) & 0xFF;
+			for (j in 0...8)
+				tmp = (tmp >>> 1) ^ (-(tmp & 1) & 0xEDB88320);
 			crc = (crc >>> 8) ^ tmp;
 		}
 	}
 
-	public function get() {
+	public inline function get() {
 		return crc ^ 0xFFFFFFFF;
 	}
 
 	/**
 		Calculates the CRC32 of the given data bytes
 	**/
-	public static function make( data : haxe.io.Bytes ) : Int {
-		var init = 0xFFFFFFFF;
-		var crc = init;
-		var b = data.getData();
-		for( i in 0...data.length ) {
-			var tmp = (crc ^ haxe.io.Bytes.fastGet(b,i)) & 0xFF;
-			for( j in 0...8 ) {
-				if( tmp & 1 == 1 )
-					tmp = (tmp >>> 1) ^ 0xEDB88320;
-				else
-					tmp >>>= 1;
-			}
-			crc = (crc >>> 8) ^ tmp;
-		}
-		return crc ^ init;
+	public static function make(data:haxe.io.Bytes):Int {
+		var c = new Crc32();
+		c.update(data, 0, data.length);
+		return c.get();
 	}
-
 }
diff --git a/std/haxe/crypto/Hmac.hx b/std/haxe/crypto/Hmac.hx
index e98b66283ea574b6f36fdd5bb96654a1144cd990..0137065fc5dd31f8dbab20ac90680df3ea37cc55 100644
--- a/std/haxe/crypto/Hmac.hx
+++ b/std/haxe/crypto/Hmac.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 /**
-    Hash methods for Hmac calculation.
-*/
+	Hash methods for Hmac calculation.
+**/
 enum HashMethod {
 	MD5;
 	SHA1;
@@ -31,47 +32,46 @@ enum HashMethod {
 }
 
 /**
-    Calculates a Hmac of the given Bytes using a HashMethod.
-*/
+	Calculates a Hmac of the given Bytes using a HashMethod.
+**/
 class Hmac {
-	
-	var method : HashMethod;
-	var blockSize : Int;
-	var length : Int;
-	
-	public function new( hashMethod : HashMethod ) {
+	var method:HashMethod;
+	var blockSize:Int;
+	var length:Int;
+
+	public function new(hashMethod:HashMethod) {
 		method = hashMethod;
-		blockSize = switch ( hashMethod ) {
+		blockSize = switch (hashMethod) {
 			case MD5, SHA1, SHA256: 64;
 		}
-		length = switch ( hashMethod ) {
+		length = switch (hashMethod) {
 			case MD5: 16;
 			case SHA1: 20;
 			case SHA256: 32;
 		}
 	}
-	
-	inline function doHash( b : haxe.io.Bytes ) : haxe.io.Bytes {
-		return switch ( method ) {
+
+	inline function doHash(b:haxe.io.Bytes):haxe.io.Bytes {
+		return switch (method) {
 			case MD5: Md5.make(b);
 			case SHA1: Sha1.make(b);
 			case SHA256: Sha256.make(b);
 		}
 	}
-	
-	function nullPad( s : haxe.io.Bytes, chunkLen : Int ) : haxe.io.Bytes {
+
+	function nullPad(s:haxe.io.Bytes, chunkLen:Int):haxe.io.Bytes {
 		var r = chunkLen - (s.length % chunkLen);
-		if(r == chunkLen && s.length != 0)
+		if (r == chunkLen && s.length != 0)
 			return s;
 		var sb = new haxe.io.BytesBuffer();
 		sb.add(s);
-		for(x in 0...r)
+		for (x in 0...r)
 			sb.addByte(0);
 		return sb.getBytes();
 	}
-	
-	public function make( key : haxe.io.Bytes, msg : haxe.io.Bytes ) : haxe.io.Bytes {
-		if(key.length > blockSize) {
+
+	public function make(key:haxe.io.Bytes, msg:haxe.io.Bytes):haxe.io.Bytes {
+		if (key.length > blockSize) {
 			key = doHash(key);
 		}
 		key = nullPad(key, blockSize);
@@ -87,5 +87,4 @@ class Hmac {
 		Ko.add(doHash(Ki.getBytes()));
 		return doHash(Ko.getBytes());
 	}
-	
 }
diff --git a/std/haxe/crypto/Md5.hx b/std/haxe/crypto/Md5.hx
index 98a87853d3cc7bc9ad0c4d098698d7a5e9caa697..057c048a167463679b7c4ceba44da05fb194be1e 100644
--- a/std/haxe/crypto/Md5.hx
+++ b/std/haxe/crypto/Md5.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,110 +19,103 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 /**
 	Creates a MD5 of a String.
 **/
 class Md5 {
-
-	public static function encode( s : String ) : String {
+	public static function encode(s:String):String {
 		#if neko
-			return untyped new String(base_encode(make_md5(s.__s),"0123456789abcdef".__s));
-		#elseif php
-			return untyped __call__("md5", s);
+		return untyped new String(base_encode(make_md5(s.__s), "0123456789abcdef".__s));
 		#else
-			var m = new Md5();
-			var h = m.doEncode(str2blks(s));
-			return m.hex(h);
+		var m = new Md5();
+		var h = m.doEncode(str2blks(s));
+		return m.hex(h);
 		#end
 	}
 
-	public static function make( b : haxe.io.Bytes ) : haxe.io.Bytes {
+	public static function make(b:haxe.io.Bytes):haxe.io.Bytes {
 		#if neko
-			return haxe.io.Bytes.ofData(make_md5(b.getData()));
-		#elseif php
-			return haxe.io.Bytes.ofData( haxe.io.BytesData.ofString(untyped __call__("md5", b.getData().toString(), true)));
+		return haxe.io.Bytes.ofData(make_md5(b.getData()));
 		#else
-			var h = new Md5().doEncode(bytes2blks(b));
-			var out = haxe.io.Bytes.alloc(16);
-			var p = 0;
-			for( i in 0...4 ) {
-				out.set(p++,h[i]&0xFF);
-				out.set(p++,(h[i]>>8)&0xFF);
-				out.set(p++,(h[i]>>16)&0xFF);
-				out.set(p++,h[i]>>>24);
-			}
-			return out;
+		var h = new Md5().doEncode(bytes2blks(b));
+		var out = haxe.io.Bytes.alloc(16);
+		var p = 0;
+		for (i in 0...4) {
+			out.set(p++, h[i] & 0xFF);
+			out.set(p++, (h[i] >> 8) & 0xFF);
+			out.set(p++, (h[i] >> 16) & 0xFF);
+			out.set(p++, h[i] >>> 24);
+		}
+		return out;
 		#end
 	}
 
 	#if neko
-	static var base_encode = neko.Lib.load("std","base_encode",2);
-	static var make_md5 = neko.Lib.load("std","make_md5",1);
-	#elseif !php
-
-/*
- * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
- * Digest Algorithm, as defined in RFC 1321.
- * Copyright (C) Paul Johnston 1999 - 2000.
- * Updated by Greg Holt 2000 - 2001.
- * See http://pajhome.org.uk/site/legal.html for details.
- */
-
-	function new() {
-	}
-
-	function bitOR(a, b){
+	static var base_encode = neko.Lib.load("std", "base_encode", 2);
+	static var make_md5 = neko.Lib.load("std", "make_md5", 1);
+	#else
+	/*
+	 * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+	 * Digest Algorithm, as defined in RFC 1321.
+	 * Copyright (C) Paul Johnston 1999 - 2000.
+	 * Updated by Greg Holt 2000 - 2001.
+	 * See http://pajhome.org.uk/site/legal.html for details.
+	 */
+	function new() {}
+
+	function bitOR(a, b) {
 		var lsb = (a & 0x1) | (b & 0x1);
 		var msb31 = (a >>> 1) | (b >>> 1);
 		return (msb31 << 1) | lsb;
 	}
 
-	function bitXOR(a, b){
+	function bitXOR(a, b) {
 		var lsb = (a & 0x1) ^ (b & 0x1);
 		var msb31 = (a >>> 1) ^ (b >>> 1);
 		return (msb31 << 1) | lsb;
 	}
 
-	function bitAND(a, b){
+	function bitAND(a, b) {
 		var lsb = (a & 0x1) & (b & 0x1);
 		var msb31 = (a >>> 1) & (b >>> 1);
 		return (msb31 << 1) | lsb;
 	}
 
 	function addme(x, y) {
-		var lsw = (x & 0xFFFF)+(y & 0xFFFF);
-		var msw = (x >> 16)+(y >> 16)+(lsw >> 16);
+		var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+		var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
 		return (msw << 16) | (lsw & 0xFFFF);
 	}
 
-	function hex( a : Array<Int> ){
+	function hex(a:Array<Int>) {
 		var str = "";
 		var hex_chr = "0123456789abcdef";
-		for( num in a )
-			for( j in 0...4 )
-				str += hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) +
-							 hex_chr.charAt((num >> (j * 8)) & 0x0F);
+		for (num in a)
+			for (j in 0...4)
+				str += hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) + hex_chr.charAt((num >> (j * 8)) & 0x0F);
 		return str;
 	}
 
-	static function bytes2blks( b : haxe.io.Bytes ){
+	static function bytes2blks(b:haxe.io.Bytes) {
 		var nblk = ((b.length + 8) >> 6) + 1;
 		var blks = new Array();
 
-		//preallocate size
+		// preallocate size
 		var blksSize = nblk * 16;
 		#if (neko || cs || cpp || java || hl)
 		blks[blksSize - 1] = 0;
 		#end
 
-		#if !(cpp || cs || hl) //C++ and C# will already initialize them with zeroes.
-		for( i in 0...blksSize ) blks[i] = 0;
+		#if !(cpp || cs || hl) // C++ and C# will already initialize them with zeroes.
+		for (i in 0...blksSize)
+			blks[i] = 0;
 		#end
 
 		var i = 0;
-		while( i < b.length ) {
+		while (i < b.length) {
 			blks[i >> 2] |= b.get(i) << ((((b.length << 3) + i) & 3) << 3);
 			i++;
 		}
@@ -136,28 +129,29 @@ class Md5 {
 		return blks;
 	}
 
-	static function str2blks( str : String ){
-#if !(neko || cpp || php)
+	static function str2blks(str:String) {
+		#if target.unicode
 		var str = haxe.io.Bytes.ofString(str);
-#end
+		#end
 		var nblk = ((str.length + 8) >> 6) + 1;
 		var blks = new Array();
 
-		//preallocate size
+		// preallocate size
 		var blksSize = nblk * 16;
-		#if (neko || cs || cpp || java || hl)
+		#if (neko || eval || cs || cpp || java || hl)
 		blks[blksSize - 1] = 0;
 		#end
 
-		#if !(cpp || cs || hl) //C++ and C# will already initialize them with zeroes.
-		for( i in 0...blksSize ) blks[i] = 0;
+		#if !(cpp || cs || hl) // C++ and C# will already initialize them with zeroes.
+		for (i in 0...blksSize)
+			blks[i] = 0;
 		#end
 
 		var i = 0;
 		var max = str.length;
 		var l = max * 8;
-		while( i < max ) {
-			blks[i >> 2] |= #if !(neko || cpp || php) str.get(i) #else StringTools.fastCodeAt(str, i) #end << (((l + i) % 4) * 8);
+		while (i < max) {
+			blks[i >> 2] |= #if target.unicode str.get(i) #else StringTools.fastCodeAt(str, i) #end << (((l + i) % 4) * 8);
 			i++;
 		}
 		blks[i >> 2] |= 0x80 << (((l + i) % 4) * 8);
@@ -169,111 +163,110 @@ class Md5 {
 		return blks;
 	}
 
-	function rol(num, cnt){
+	function rol(num, cnt) {
 		return (num << cnt) | (num >>> (32 - cnt));
 	}
 
-	function cmn(q, a, b, x, s, t){
+	function cmn(q, a, b, x, s, t) {
 		return addme(rol((addme(addme(a, q), addme(x, t))), s), b);
 	}
 
-	function ff(a, b, c, d, x, s, t){
+	function ff(a, b, c, d, x, s, t) {
 		return cmn(bitOR(bitAND(b, c), bitAND((~b), d)), a, b, x, s, t);
 	}
 
-	function gg(a, b, c, d, x, s, t){
+	function gg(a, b, c, d, x, s, t) {
 		return cmn(bitOR(bitAND(b, d), bitAND(c, (~d))), a, b, x, s, t);
 	}
 
-	function hh(a, b, c, d, x, s, t){
+	function hh(a, b, c, d, x, s, t) {
 		return cmn(bitXOR(bitXOR(b, c), d), a, b, x, s, t);
 	}
 
-	function ii(a, b, c, d, x, s, t){
+	function ii(a, b, c, d, x, s, t) {
 		return cmn(bitXOR(c, bitOR(b, (~d))), a, b, x, s, t);
 	}
 
-	function doEncode( x : Array<Int> ) : Array<Int> {
-
-		var a =  1732584193;
+	function doEncode(x:Array<Int>):Array<Int> {
+		var a = 1732584193;
 		var b = -271733879;
 		var c = -1732584194;
-		var d =  271733878;
+		var d = 271733878;
 
 		var step;
 
 		var i = 0;
-		while( i < x.length )  {
+		while (i < x.length) {
 			var olda = a;
 			var oldb = b;
 			var oldc = c;
 			var oldd = d;
 
 			step = 0;
-			a = ff(a, b, c, d, x[i+ 0], 7 , -680876936);
-			d = ff(d, a, b, c, x[i+ 1], 12, -389564586);
-			c = ff(c, d, a, b, x[i+ 2], 17,  606105819);
-			b = ff(b, c, d, a, x[i+ 3], 22, -1044525330);
-			a = ff(a, b, c, d, x[i+ 4], 7 , -176418897);
-			d = ff(d, a, b, c, x[i+ 5], 12,  1200080426);
-			c = ff(c, d, a, b, x[i+ 6], 17, -1473231341);
-			b = ff(b, c, d, a, x[i+ 7], 22, -45705983);
-			a = ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
-			d = ff(d, a, b, c, x[i+ 9], 12, -1958414417);
-			c = ff(c, d, a, b, x[i+10], 17, -42063);
-			b = ff(b, c, d, a, x[i+11], 22, -1990404162);
-			a = ff(a, b, c, d, x[i+12], 7 ,  1804603682);
-			d = ff(d, a, b, c, x[i+13], 12, -40341101);
-			c = ff(c, d, a, b, x[i+14], 17, -1502002290);
-			b = ff(b, c, d, a, x[i+15], 22,  1236535329);
-			a = gg(a, b, c, d, x[i+ 1], 5 , -165796510);
-			d = gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
-			c = gg(c, d, a, b, x[i+11], 14,  643717713);
-			b = gg(b, c, d, a, x[i+ 0], 20, -373897302);
-			a = gg(a, b, c, d, x[i+ 5], 5 , -701558691);
-			d = gg(d, a, b, c, x[i+10], 9 ,  38016083);
-			c = gg(c, d, a, b, x[i+15], 14, -660478335);
-			b = gg(b, c, d, a, x[i+ 4], 20, -405537848);
-			a = gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
-			d = gg(d, a, b, c, x[i+14], 9 , -1019803690);
-			c = gg(c, d, a, b, x[i+ 3], 14, -187363961);
-			b = gg(b, c, d, a, x[i+ 8], 20,  1163531501);
-			a = gg(a, b, c, d, x[i+13], 5 , -1444681467);
-			d = gg(d, a, b, c, x[i+ 2], 9 , -51403784);
-			c = gg(c, d, a, b, x[i+ 7], 14,  1735328473);
-			b = gg(b, c, d, a, x[i+12], 20, -1926607734);
-			a = hh(a, b, c, d, x[i+ 5], 4 , -378558);
-			d = hh(d, a, b, c, x[i+ 8], 11, -2022574463);
-			c = hh(c, d, a, b, x[i+11], 16,  1839030562);
-			b = hh(b, c, d, a, x[i+14], 23, -35309556);
-			a = hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
-			d = hh(d, a, b, c, x[i+ 4], 11,  1272893353);
-			c = hh(c, d, a, b, x[i+ 7], 16, -155497632);
-			b = hh(b, c, d, a, x[i+10], 23, -1094730640);
-			a = hh(a, b, c, d, x[i+13], 4 ,  681279174);
-			d = hh(d, a, b, c, x[i+ 0], 11, -358537222);
-			c = hh(c, d, a, b, x[i+ 3], 16, -722521979);
-			b = hh(b, c, d, a, x[i+ 6], 23,  76029189);
-			a = hh(a, b, c, d, x[i+ 9], 4 , -640364487);
-			d = hh(d, a, b, c, x[i+12], 11, -421815835);
-			c = hh(c, d, a, b, x[i+15], 16,  530742520);
-			b = hh(b, c, d, a, x[i+ 2], 23, -995338651);
-			a = ii(a, b, c, d, x[i+ 0], 6 , -198630844);
-			d = ii(d, a, b, c, x[i+ 7], 10,  1126891415);
-			c = ii(c, d, a, b, x[i+14], 15, -1416354905);
-			b = ii(b, c, d, a, x[i+ 5], 21, -57434055);
-			a = ii(a, b, c, d, x[i+12], 6 ,  1700485571);
-			d = ii(d, a, b, c, x[i+ 3], 10, -1894986606);
-			c = ii(c, d, a, b, x[i+10], 15, -1051523);
-			b = ii(b, c, d, a, x[i+ 1], 21, -2054922799);
-			a = ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
-			d = ii(d, a, b, c, x[i+15], 10, -30611744);
-			c = ii(c, d, a, b, x[i+ 6], 15, -1560198380);
-			b = ii(b, c, d, a, x[i+13], 21,  1309151649);
-			a = ii(a, b, c, d, x[i+ 4], 6 , -145523070);
-			d = ii(d, a, b, c, x[i+11], 10, -1120210379);
-			c = ii(c, d, a, b, x[i+ 2], 15,  718787259);
-			b = ii(b, c, d, a, x[i+ 9], 21, -343485551);
+			a = ff(a, b, c, d, x[i + 0], 7, -680876936);
+			d = ff(d, a, b, c, x[i + 1], 12, -389564586);
+			c = ff(c, d, a, b, x[i + 2], 17, 606105819);
+			b = ff(b, c, d, a, x[i + 3], 22, -1044525330);
+			a = ff(a, b, c, d, x[i + 4], 7, -176418897);
+			d = ff(d, a, b, c, x[i + 5], 12, 1200080426);
+			c = ff(c, d, a, b, x[i + 6], 17, -1473231341);
+			b = ff(b, c, d, a, x[i + 7], 22, -45705983);
+			a = ff(a, b, c, d, x[i + 8], 7, 1770035416);
+			d = ff(d, a, b, c, x[i + 9], 12, -1958414417);
+			c = ff(c, d, a, b, x[i + 10], 17, -42063);
+			b = ff(b, c, d, a, x[i + 11], 22, -1990404162);
+			a = ff(a, b, c, d, x[i + 12], 7, 1804603682);
+			d = ff(d, a, b, c, x[i + 13], 12, -40341101);
+			c = ff(c, d, a, b, x[i + 14], 17, -1502002290);
+			b = ff(b, c, d, a, x[i + 15], 22, 1236535329);
+			a = gg(a, b, c, d, x[i + 1], 5, -165796510);
+			d = gg(d, a, b, c, x[i + 6], 9, -1069501632);
+			c = gg(c, d, a, b, x[i + 11], 14, 643717713);
+			b = gg(b, c, d, a, x[i + 0], 20, -373897302);
+			a = gg(a, b, c, d, x[i + 5], 5, -701558691);
+			d = gg(d, a, b, c, x[i + 10], 9, 38016083);
+			c = gg(c, d, a, b, x[i + 15], 14, -660478335);
+			b = gg(b, c, d, a, x[i + 4], 20, -405537848);
+			a = gg(a, b, c, d, x[i + 9], 5, 568446438);
+			d = gg(d, a, b, c, x[i + 14], 9, -1019803690);
+			c = gg(c, d, a, b, x[i + 3], 14, -187363961);
+			b = gg(b, c, d, a, x[i + 8], 20, 1163531501);
+			a = gg(a, b, c, d, x[i + 13], 5, -1444681467);
+			d = gg(d, a, b, c, x[i + 2], 9, -51403784);
+			c = gg(c, d, a, b, x[i + 7], 14, 1735328473);
+			b = gg(b, c, d, a, x[i + 12], 20, -1926607734);
+			a = hh(a, b, c, d, x[i + 5], 4, -378558);
+			d = hh(d, a, b, c, x[i + 8], 11, -2022574463);
+			c = hh(c, d, a, b, x[i + 11], 16, 1839030562);
+			b = hh(b, c, d, a, x[i + 14], 23, -35309556);
+			a = hh(a, b, c, d, x[i + 1], 4, -1530992060);
+			d = hh(d, a, b, c, x[i + 4], 11, 1272893353);
+			c = hh(c, d, a, b, x[i + 7], 16, -155497632);
+			b = hh(b, c, d, a, x[i + 10], 23, -1094730640);
+			a = hh(a, b, c, d, x[i + 13], 4, 681279174);
+			d = hh(d, a, b, c, x[i + 0], 11, -358537222);
+			c = hh(c, d, a, b, x[i + 3], 16, -722521979);
+			b = hh(b, c, d, a, x[i + 6], 23, 76029189);
+			a = hh(a, b, c, d, x[i + 9], 4, -640364487);
+			d = hh(d, a, b, c, x[i + 12], 11, -421815835);
+			c = hh(c, d, a, b, x[i + 15], 16, 530742520);
+			b = hh(b, c, d, a, x[i + 2], 23, -995338651);
+			a = ii(a, b, c, d, x[i + 0], 6, -198630844);
+			d = ii(d, a, b, c, x[i + 7], 10, 1126891415);
+			c = ii(c, d, a, b, x[i + 14], 15, -1416354905);
+			b = ii(b, c, d, a, x[i + 5], 21, -57434055);
+			a = ii(a, b, c, d, x[i + 12], 6, 1700485571);
+			d = ii(d, a, b, c, x[i + 3], 10, -1894986606);
+			c = ii(c, d, a, b, x[i + 10], 15, -1051523);
+			b = ii(b, c, d, a, x[i + 1], 21, -2054922799);
+			a = ii(a, b, c, d, x[i + 8], 6, 1873313359);
+			d = ii(d, a, b, c, x[i + 15], 10, -30611744);
+			c = ii(c, d, a, b, x[i + 6], 15, -1560198380);
+			b = ii(b, c, d, a, x[i + 13], 21, 1309151649);
+			a = ii(a, b, c, d, x[i + 4], 6, -145523070);
+			d = ii(d, a, b, c, x[i + 11], 10, -1120210379);
+			c = ii(c, d, a, b, x[i + 2], 15, 718787259);
+			b = ii(b, c, d, a, x[i + 9], 21, -343485551);
 
 			a = addme(a, olda);
 			b = addme(b, oldb);
@@ -282,10 +275,7 @@ class Md5 {
 
 			i += 16;
 		}
-		return [a,b,c,d];
+		return [a, b, c, d];
 	}
-
 	#end
-
-
 }
diff --git a/std/haxe/crypto/Sha1.hx b/std/haxe/crypto/Sha1.hx
index bc3cfbf6e8dbdeeb3959fb54b1877ef6adf6b3b1..d1ca641807f20953bd8a208e9dd7ed959d337a72 100644
--- a/std/haxe/crypto/Sha1.hx
+++ b/std/haxe/crypto/Sha1.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,46 +19,35 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 /**
-    Creates a Sha1 of a String.
-*/
+	Creates a Sha1 of a String.
+**/
 class Sha1 {
-
-	public static function encode( s:String ) : String {
-		#if php
-		return untyped __call__("sha1", s);
-		#else
+	public static function encode(s:String):String {
 		var sh = new Sha1();
 		var h = sh.doEncode(str2blks(s));
 		return sh.hex(h);
-		#end
 	}
 
-	public static function make( b : haxe.io.Bytes ) : haxe.io.Bytes {
-		#if php
-		return haxe.io.Bytes.ofData(haxe.io.BytesData.ofString(untyped __call__("sha1", b.getData().toString(), true)));
-		#else
+	public static function make(b:haxe.io.Bytes):haxe.io.Bytes {
 		var h = new Sha1().doEncode(bytes2blks(b));
 		var out = haxe.io.Bytes.alloc(20);
 		var p = 0;
-		for( i in 0...5 ) {
-			out.set(p++,h[i]>>>24);
-			out.set(p++,(h[i]>>16)&0xFF);
-			out.set(p++,(h[i]>>8)&0xFF);
-			out.set(p++,h[i]&0xFF);
+		for (i in 0...5) {
+			out.set(p++, h[i] >>> 24);
+			out.set(p++, (h[i] >> 16) & 0xFF);
+			out.set(p++, (h[i] >> 8) & 0xFF);
+			out.set(p++, h[i] & 0xFF);
 		}
 		return out;
-		#end
 	}
 
-	#if !php
-
-	function new() {
-	}
+	function new() {}
 
-	function doEncode( x : Array<Int> ) : Array<Int> {
+	function doEncode(x:Array<Int>):Array<Int> {
 		var w = new Array<Int>();
 
 		var a = 0x67452301;
@@ -68,7 +57,7 @@ class Sha1 {
 		var e = 0xC3D2E1F0;
 
 		var i = 0;
-		while( i < x.length ) {
+		while (i < x.length) {
 			var olda = a;
 			var oldb = b;
 			var oldc = c;
@@ -76,11 +65,11 @@ class Sha1 {
 			var olde = e;
 
 			var j = 0;
-			while( j < 80 ) {
-				if(j < 16)
+			while (j < 80) {
+				if (j < 16)
 					w[j] = x[i + j];
 				else
-					w[j] = rol(w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16], 1);
+					w[j] = rol(w[j - 3] ^ w[j - 8] ^ w[j - 14] ^ w[j - 16], 1);
 				var t = rol(a, 5) + ft(j, b, c, d) + e + w[j] + kt(j);
 				e = d;
 				d = c;
@@ -96,26 +85,25 @@ class Sha1 {
 			e += olde;
 			i += 16;
 		}
-		return [a,b,c,d,e];
+		return [a, b, c, d, e];
 	}
 
-
-	/*
+	/**
 		Convert a string to a sequence of 16-word blocks, stored as an array.
 		Append padding bits and the length, as described in the SHA1 standard.
-	 */
-	static function str2blks( s :String ) : Array<Int> {
-#if !(neko || cpp || php)
+	**/
+	static function str2blks(s:String):Array<Int> {
+		#if target.unicode
 		var s = haxe.io.Bytes.ofString(s);
-#end
+		#end
 		var nblk = ((s.length + 8) >> 6) + 1;
 		var blks = new Array<Int>();
 
-		for (i in 0...nblk*16)
+		for (i in 0...nblk * 16)
 			blks[i] = 0;
-		for (i in 0...s.length){
+		for (i in 0...s.length) {
 			var p = i >> 2;
-			blks[p] |= #if !(neko || cpp || php) s.get(i) #else StringTools.fastCodeAt(s,i) #end << (24 - ((i & 3) << 3));
+			blks[p] |= #if target.unicode s.get(i) #else StringTools.fastCodeAt(s, i) #end << (24 - ((i & 3) << 3));
 		}
 		var i = s.length;
 		var p = i >> 2;
@@ -124,13 +112,13 @@ class Sha1 {
 		return blks;
 	}
 
-	static function bytes2blks( b : haxe.io.Bytes ) : Array<Int> {
+	static function bytes2blks(b:haxe.io.Bytes):Array<Int> {
 		var nblk = ((b.length + 8) >> 6) + 1;
 		var blks = new Array<Int>();
 
-		for (i in 0...nblk*16)
+		for (i in 0...nblk * 16)
 			blks[i] = 0;
-		for (i in 0...b.length){
+		for (i in 0...b.length) {
 			var p = i >> 2;
 			blks[p] |= b.get(i) << (24 - ((i & 3) << 3));
 		}
@@ -143,42 +131,42 @@ class Sha1 {
 
 	/**
 		Bitwise rotate a 32-bit number to the left
-	 */
-	inline function rol( num : Int, cnt : Int ) : Int {
+	**/
+	inline function rol(num:Int, cnt:Int):Int {
 		return (num << cnt) | (num >>> (32 - cnt));
 	}
 
 	/**
 		Perform the appropriate triplet combination function for the current iteration
-	*/
-	function ft( t : Int, b : Int, c : Int, d : Int ) : Int {
-		if ( t < 20 ) return (b & c) | ((~b) & d);
-		if ( t < 40 ) return b ^ c ^ d;
-		if ( t < 60 ) return (b & c) | (b & d) | (c & d);
+	**/
+	function ft(t:Int, b:Int, c:Int, d:Int):Int {
+		if (t < 20)
+			return (b & c) | ((~b) & d);
+		if (t < 40)
+			return b ^ c ^ d;
+		if (t < 60)
+			return (b & c) | (b & d) | (c & d);
 		return b ^ c ^ d;
 	}
 
 	/**
 		Determine the appropriate additive constant for the current iteration
-	*/
-	function kt( t : Int ) : Int {
-		if( t < 20)
+	**/
+	function kt(t:Int):Int {
+		if (t < 20)
 			return 0x5A827999;
-		if ( t < 40)
+		if (t < 40)
 			return 0x6ED9EBA1;
 		if (t < 60)
 			return 0x8F1BBCDC;
 		return 0xCA62C1D6;
 	}
 
-	function hex( a : Array<Int> ){
+	function hex(a:Array<Int>) {
 		var str = "";
-		for( num in a ) {
+		for (num in a) {
 			str += StringTools.hex(num, 8);
 		}
 		return str.toLowerCase();
 	}
-
-	#end
-
 }
diff --git a/std/haxe/crypto/Sha224.hx b/std/haxe/crypto/Sha224.hx
index a511cfe4debba7205e6407f7b445eda9021506e7..7623fc0585003182358095952da7863e1beca055 100644
--- a/std/haxe/crypto/Sha224.hx
+++ b/std/haxe/crypto/Sha224.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of Charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,183 +19,173 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 /**
-    Creates a Sha224 of a String.
-*/
+	Creates a Sha224 of a String.
+**/
 class Sha224 {
-
-    public static function encode( s:String ) : String {
-        #if php
-        return untyped __call__("hash", "sha224", s);
-        #else
-        var sh = new Sha224();
-        var h = sh.doEncode(s, s.length*8);
-        return sh.hex(h);
-        #end
-    }
-
-    public static function make( b : haxe.io.Bytes ) : haxe.io.Bytes {
-        #if php
-        return haxe.io.Bytes.ofData(haxe.io.BytesData.ofString(untyped __call__("hash", "sha224", b.getData().toString(), true)));
-        #else
-        var h = new Sha224().doEncode(b.toString(), b.length*8);
-        var out = haxe.io.Bytes.alloc(28);
-        var p = 0;
-        for( i in 0...8 ) {
-            out.set(p++,h[i]>>>24);
-            out.set(p++,(h[i]>>16)&0xFF);
-            out.set(p++,(h[i]>>8)&0xFF);
-            out.set(p++,h[i]&0xFF);
-        }
-        return out;
-        #end
-    }
-
-    public function new() {
-    }
-
-    function doEncode( str : String, strlen : Int ) : Array<Int> {
-        var K : Array<Int> = [
-            0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5,
-            0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5,
-            0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3,
-            0x72BE5D74, 0x80DEB1FE, 0x9BDC06A7, 0xC19BF174,
-            0xE49B69C1, 0xEFBE4786, 0xFC19DC6 , 0x240CA1CC,
-            0x2DE92C6F, 0x4A7484AA, 0x5CB0A9DC, 0x76F988DA,
-            0x983E5152, 0xA831C66D, 0xB00327C8, 0xBF597FC7,
-            0xC6E00BF3, 0xD5A79147, 0x6CA6351 , 0x14292967,
-            0x27B70A85, 0x2E1B2138, 0x4D2C6DFC, 0x53380D13,
-            0x650A7354, 0x766A0ABB, 0x81C2C92E, 0x92722C85,
-            0xA2BFE8A1, 0xA81A664B, 0xC24B8B70, 0xC76C51A3,
-            0xD192E819, 0xD6990624, 0xF40E3585, 0x106AA070,
-            0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5,
-            0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3,
-            0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208,
-            0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2
-        ];
-        var HASH : Array<Int> = [
-            0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
-            0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
-        ];
-        var W = new Array<Int>();
-        W[64] = 0;
-
-        var a:Int,b:Int,c:Int,d:Int,e:Int,f:Int,g:Int,h:Int,i:Int,j:Int;
-        var T1, T2;
-        var i : Int = 0;
-        var blocks : Array<Int> = str2blks(str);
-        blocks[strlen >> 5] |= 0x80 << (24 - strlen % 32);
-        blocks[((strlen + 64 >> 9) << 4) + 15] = strlen;
-
-        while ( i < blocks.length ) {
-            a = HASH[0];
-            b = HASH[1];
-            c = HASH[2];
-            d = HASH[3];
-            e = HASH[4];
-            f = HASH[5];
-            g = HASH[6];
-            h = HASH[7];
-
-            for ( j in 0...64 ) {
-                if (j < 16) {
-                    W[j] = blocks[j + i];
-                } else {
-                    W[j] = safeAdd(safeAdd(safeAdd(Gamma1(W[j - 2]), W[j - 7]), Gamma0(W[j - 15])), W[j - 16]);
-                }
-
-                T1 = safeAdd(safeAdd(safeAdd(safeAdd(h, Sigma1(e)), Ch(e, f, g)), K[j]), W[j]);
-                T2 = safeAdd(Sigma0(a), Maj(a, b, c));
-
-                h = g;
-                g = f;
-                f = e;
-                e = safeAdd(d, T1);
-                d = c;
-                c = b;
-                b = a;
-                a = safeAdd(T1, T2);
-            }
-
-            HASH[0] = safeAdd(a, HASH[0]);
-            HASH[1] = safeAdd(b, HASH[1]);
-            HASH[2] = safeAdd(c, HASH[2]);
-            HASH[3] = safeAdd(d, HASH[3]);
-            HASH[4] = safeAdd(e, HASH[4]);
-            HASH[5] = safeAdd(f, HASH[5]);
-            HASH[6] = safeAdd(g, HASH[6]);
-            HASH[7] = safeAdd(h, HASH[7]);
-            i += 16;
-        }
-        return HASH;
-    }
-
-    static function str2blks( s :String ) : Array<Int> {
-        var nblk = ((s.length + 8) >> 6) + 1;
-        var blks = new Array<Int>();
-        for (i in 0...nblk*16)
-            blks[i] = 0;
-        for (i in 0...s.length){
-            var p = i >> 2;
-            blks[p] |= s.charCodeAt(i) << (24 - ((i & 3) << 3));
-        }
-        var i = s.length;
-        var p = i >> 2;
-        blks[p] |= 0x80 << (24 - ((i & 3) << 3));
-        blks[nblk * 16 - 1] = s.length * 8;
-        return blks;
-    }
-
-    static function safeAdd(x, y) {
-        var lsw = (x & 0xFFFF) + (y & 0xFFFF);
-        var msw = (x >>> 16) + (y >>> 16) + (lsw >>> 16);
-        return ((msw & 0xFFFF) << 16) | (lsw & 0xFFFF);
-    }
-
-    // ++
-    function ROTR(X, n) {
-        return ( X >>> n ) | (X << (32 - n));
-    }
-
-    // ++
-    function SHR(X, n) {
-        return ( X >>> n );
-    }
-
-    // ++
-    function Ch(x, y, z) {
-        return ((x & y) ^ ((~x) & z));
-    }
-
-    // ++
-    function Maj(x, y, z) {
-        return ((x & y) ^ (x & z) ^ (y & z));
-    }
-
-    function Sigma0(x) {
-        return ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22);
-    }
-
-    function Sigma1(x) {
-        return ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25);
-    }
-
-    function Gamma0(x) {
-        return ROTR(x, 7) ^ ROTR(x, 18) ^ SHR(x, 3);
-    }
-
-    function Gamma1(x) {
-        return ROTR(x, 17) ^ ROTR(x, 19) ^ SHR(x, 10);
-    }
-
-    function hex( a : Array<Int> ){
-        var str = "";
-        for( num in a ) {
-            str += StringTools.hex(num, 8);
-        }
-        return str.substring(0, 56).toLowerCase();
-    }
-
+	public static function encode(s:String):String {
+		var sh = new Sha224();
+		var h = sh.doEncode(s, s.length * 8);
+		return sh.hex(h);
+	}
+
+	public static function make(b:haxe.io.Bytes):haxe.io.Bytes {
+		var h = new Sha224().doEncode(b.toString(), b.length * 8);
+		var out = haxe.io.Bytes.alloc(28);
+		var p = 0;
+		for (i in 0...8) {
+			out.set(p++, h[i] >>> 24);
+			out.set(p++, (h[i] >> 16) & 0xFF);
+			out.set(p++, (h[i] >> 8) & 0xFF);
+			out.set(p++, h[i] & 0xFF);
+		}
+		return out;
+	}
+
+	public function new() {}
+
+	function doEncode(str:String, strlen:Int):Array<Int> {
+		var K:Array<Int> = [
+			0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5,
+			0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5,
+			0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3,
+			0x72BE5D74, 0x80DEB1FE, 0x9BDC06A7, 0xC19BF174,
+			0xE49B69C1, 0xEFBE4786,  0xFC19DC6, 0x240CA1CC,
+			0x2DE92C6F, 0x4A7484AA, 0x5CB0A9DC, 0x76F988DA,
+			0x983E5152, 0xA831C66D, 0xB00327C8, 0xBF597FC7,
+			0xC6E00BF3, 0xD5A79147,  0x6CA6351, 0x14292967,
+			0x27B70A85, 0x2E1B2138, 0x4D2C6DFC, 0x53380D13,
+			0x650A7354, 0x766A0ABB, 0x81C2C92E, 0x92722C85,
+			0xA2BFE8A1, 0xA81A664B, 0xC24B8B70, 0xC76C51A3,
+			0xD192E819, 0xD6990624, 0xF40E3585, 0x106AA070,
+			0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5,
+			0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3,
+			0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208,
+			0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2
+		];
+		var HASH:Array<Int> = [
+			0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
+			0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
+		];
+		var W = new Array<Int>();
+		W[64] = 0;
+
+		var a:Int, b:Int, c:Int, d:Int, e:Int, f:Int, g:Int, h:Int, i:Int, j:Int;
+		var T1, T2;
+		var i:Int = 0;
+		var blocks:Array<Int> = str2blks(str);
+		blocks[strlen >> 5] |= 0x80 << (24 - strlen % 32);
+		blocks[((strlen + 64 >> 9) << 4) + 15] = strlen;
+
+		while (i < blocks.length) {
+			a = HASH[0];
+			b = HASH[1];
+			c = HASH[2];
+			d = HASH[3];
+			e = HASH[4];
+			f = HASH[5];
+			g = HASH[6];
+			h = HASH[7];
+
+			for (j in 0...64) {
+				if (j < 16) {
+					W[j] = blocks[j + i];
+				} else {
+					W[j] = safeAdd(safeAdd(safeAdd(Gamma1(W[j - 2]), W[j - 7]), Gamma0(W[j - 15])), W[j - 16]);
+				}
+
+				T1 = safeAdd(safeAdd(safeAdd(safeAdd(h, Sigma1(e)), Ch(e, f, g)), K[j]), W[j]);
+				T2 = safeAdd(Sigma0(a), Maj(a, b, c));
+
+				h = g;
+				g = f;
+				f = e;
+				e = safeAdd(d, T1);
+				d = c;
+				c = b;
+				b = a;
+				a = safeAdd(T1, T2);
+			}
+
+			HASH[0] = safeAdd(a, HASH[0]);
+			HASH[1] = safeAdd(b, HASH[1]);
+			HASH[2] = safeAdd(c, HASH[2]);
+			HASH[3] = safeAdd(d, HASH[3]);
+			HASH[4] = safeAdd(e, HASH[4]);
+			HASH[5] = safeAdd(f, HASH[5]);
+			HASH[6] = safeAdd(g, HASH[6]);
+			HASH[7] = safeAdd(h, HASH[7]);
+			i += 16;
+		}
+		return HASH;
+	}
+
+	static function str2blks(s:String):Array<Int> {
+		var nblk = ((s.length + 8) >> 6) + 1;
+		var blks = new Array<Int>();
+		for (i in 0...nblk * 16)
+			blks[i] = 0;
+		for (i in 0...s.length) {
+			var p = i >> 2;
+			blks[p] |= s.charCodeAt(i) << (24 - ((i & 3) << 3));
+		}
+		var i = s.length;
+		var p = i >> 2;
+		blks[p] |= 0x80 << (24 - ((i & 3) << 3));
+		blks[nblk * 16 - 1] = s.length * 8;
+		return blks;
+	}
+
+	extern inline static function safeAdd(x, y) {
+		var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+		var msw = (x >>> 16) + (y >>> 16) + (lsw >>> 16);
+		return ((msw & 0xFFFF) << 16) | (lsw & 0xFFFF);
+	}
+
+	// ++
+	extern inline function ROTR(X, n) {
+		return (X >>> n) | (X << (32 - n));
+	}
+
+	// ++
+	extern inline function SHR(X, n) {
+		return (X >>> n);
+	}
+
+	// ++
+	extern inline function Ch(x, y, z) {
+		return ((x & y) ^ ((~x) & z));
+	}
+
+	// ++
+	extern inline function Maj(x, y, z) {
+		return ((x & y) ^ (x & z) ^ (y & z));
+	}
+
+	extern inline function Sigma0(x) {
+		return ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22);
+	}
+
+	extern inline function Sigma1(x) {
+		return ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25);
+	}
+
+	extern inline function Gamma0(x) {
+		return ROTR(x, 7) ^ ROTR(x, 18) ^ SHR(x, 3);
+	}
+
+	extern inline function Gamma1(x) {
+		return ROTR(x, 17) ^ ROTR(x, 19) ^ SHR(x, 10);
+	}
+
+	function hex(a:Array<Int>) {
+		var str = "";
+		for (num in a) {
+			str += StringTools.hex(num, 8);
+		}
+		return str.substring(0, 56).toLowerCase();
+	}
 }
diff --git a/std/haxe/crypto/Sha256.hx b/std/haxe/crypto/Sha256.hx
index dabddc9ee715c40c247a5ba31fe3ae3d15963264..cc144525e6b87fa2590aaebbd5dce4ddc46cd701 100644
--- a/std/haxe/crypto/Sha256.hx
+++ b/std/haxe/crypto/Sha256.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,81 +19,79 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 /**
-    Creates a Sha256 of a String.
-*/
+	Creates a Sha256 of a String.
+**/
 class Sha256 {
-
-	public static function encode( s:String ) : String {
-		#if php
-		return untyped __call__("hash", "sha256", s);
-		#else
+	public static function encode(s:String):String {
 		var sh = new Sha256();
-		var h = sh.doEncode(str2blks(s), s.length*8);
+		var h = sh.doEncode(str2blks(s), s.length * 8);
 		return sh.hex(h);
-		#end
 	}
 
-	public static function make( b : haxe.io.Bytes ) : haxe.io.Bytes {
-		#if php
-		return haxe.io.Bytes.ofData(haxe.io.BytesData.ofString(untyped __call__("hash", "sha256", b.getData().toString(), true)));
-		#else
-		var h = new Sha256().doEncode(bytes2blks(b), b.length*8);
+	public static function make(b:haxe.io.Bytes):haxe.io.Bytes {
+		var h = new Sha256().doEncode(bytes2blks(b), b.length * 8);
 		var out = haxe.io.Bytes.alloc(32);
 		var p = 0;
-		for( i in 0...8 ) {
-			out.set(p++,h[i]>>>24);
-			out.set(p++,(h[i]>>16)&0xFF);
-			out.set(p++,(h[i]>>8)&0xFF);
-			out.set(p++,h[i]&0xFF);
+		for (i in 0...8) {
+			out.set(p++, h[i] >>> 24);
+			out.set(p++, (h[i] >> 16) & 0xFF);
+			out.set(p++, (h[i] >> 8) & 0xFF);
+			out.set(p++, h[i] & 0xFF);
 		}
 		return out;
-		#end
 	}
 
-	public function new() {
-	}
+	public function new() {}
 
-	function doEncode( m : Array<Int>, l : Int ) : Array<Int> {
-		var K : Array<Int> = [
-			0x428A2F98,0x71374491,0xB5C0FBCF,0xE9B5DBA5,0x3956C25B,
-			0x59F111F1,0x923F82A4,0xAB1C5ED5,0xD807AA98,0x12835B01,
-			0x243185BE,0x550C7DC3,0x72BE5D74,0x80DEB1FE,0x9BDC06A7,
-			0xC19BF174,0xE49B69C1,0xEFBE4786,0xFC19DC6,0x240CA1CC,
-			0x2DE92C6F,0x4A7484AA,0x5CB0A9DC,0x76F988DA,0x983E5152,
-			0xA831C66D,0xB00327C8,0xBF597FC7,0xC6E00BF3,0xD5A79147,
-			0x6CA6351,0x14292967,0x27B70A85,0x2E1B2138,0x4D2C6DFC,
-			0x53380D13,0x650A7354,0x766A0ABB,0x81C2C92E,0x92722C85,
-			0xA2BFE8A1,0xA81A664B,0xC24B8B70,0xC76C51A3,0xD192E819,
-			0xD6990624,0xF40E3585,0x106AA070,0x19A4C116,0x1E376C08,
-			0x2748774C,0x34B0BCB5,0x391C0CB3,0x4ED8AA4A,0x5B9CCA4F,
-			0x682E6FF3,0x748F82EE,0x78A5636F,0x84C87814,0x8CC70208,
-			0x90BEFFFA,0xA4506CEB,0xBEF9A3F7,0xC67178F2
+	function doEncode(m:Array<Int>, l:Int):Array<Int> {
+		var K:Array<Int> = [
+			0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5, 0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5, 0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3,
+			0x72BE5D74, 0x80DEB1FE, 0x9BDC06A7, 0xC19BF174, 0xE49B69C1, 0xEFBE4786, 0xFC19DC6, 0x240CA1CC, 0x2DE92C6F, 0x4A7484AA, 0x5CB0A9DC, 0x76F988DA,
+			0x983E5152, 0xA831C66D, 0xB00327C8, 0xBF597FC7, 0xC6E00BF3, 0xD5A79147, 0x6CA6351, 0x14292967, 0x27B70A85, 0x2E1B2138, 0x4D2C6DFC, 0x53380D13,
+			0x650A7354, 0x766A0ABB, 0x81C2C92E, 0x92722C85, 0xA2BFE8A1, 0xA81A664B, 0xC24B8B70, 0xC76C51A3, 0xD192E819, 0xD6990624, 0xF40E3585, 0x106AA070,
+			0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5, 0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3, 0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208,
+			0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2
 		];
-		var HASH : Array<Int> = [
-			0x6A09E667,0xBB67AE85,0x3C6EF372,0xA54FF53A,
-			0x510E527F,0x9B05688C,0x1F83D9AB,0x5BE0CD19
+		var HASH:Array<Int> = [
+			0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A,
+			0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19
 		];
 
 		var W = new Array<Int>();
 		W[64] = 0;
-		var a:Int,b:Int,c:Int,d:Int,e:Int,f:Int,g:Int,h:Int;
+		var a:Int, b:Int, c:Int, d:Int, e:Int, f:Int, g:Int, h:Int;
 		var T1, T2;
 		m[l >> 5] |= 0x80 << (24 - l % 32);
 		m[((l + 64 >> 9) << 4) + 15] = l;
-		var i : Int = 0;
-		while ( i < m.length ) {
-			a = HASH[0]; b = HASH[1]; c = HASH[2]; d = HASH[3]; e = HASH[4]; f = HASH[5]; g = HASH[6]; h = HASH[7];
-			for ( j in 0...64 ) {
+		var i:Int = 0;
+		while (i < m.length) {
+			a = HASH[0];
+			b = HASH[1];
+			c = HASH[2];
+			d = HASH[3];
+			e = HASH[4];
+			f = HASH[5];
+			g = HASH[6];
+			h = HASH[7];
+			for (j in 0...64) {
 				if (j < 16)
 					W[j] = m[j + i];
 				else
 					W[j] = safeAdd(safeAdd(safeAdd(Gamma1256(W[j - 2]), W[j - 7]), Gamma0256(W[j - 15])), W[j - 16]);
 				T1 = safeAdd(safeAdd(safeAdd(safeAdd(h, Sigma1256(e)), Ch(e, f, g)), K[j]), W[j]);
 				T2 = safeAdd(Sigma0256(a), Maj(a, b, c));
-				h = g; g = f; f = e; e = safeAdd(d, T1); d = c; c = b; b = a; a = safeAdd(T1, T2);
+				h = g;
+				g = f;
+				f = e;
+				e = safeAdd(d, T1);
+				d = c;
+				c = b;
+				b = a;
+				a = safeAdd(T1, T2);
 			}
 			HASH[0] = safeAdd(a, HASH[0]);
 			HASH[1] = safeAdd(b, HASH[1]);
@@ -108,22 +106,22 @@ class Sha256 {
 		return HASH;
 	}
 
-	/*
+	/**
 		Convert a string to a sequence of 16-word blocks, stored as an array.
 		Append padding bits and the length, as described in the SHA1 standard.
-	 */
-	static function str2blks( s :String ) : Array<Int> {
-#if !(neko || cpp || php)
+	**/
+	static function str2blks(s:String):Array<Int> {
+		#if target.unicode
 		var s = haxe.io.Bytes.ofString(s);
-#end
+		#end
 		var nblk = ((s.length + 8) >> 6) + 1;
 		var blks = new Array<Int>();
 
-		for (i in 0...nblk*16)
+		for (i in 0...nblk * 16)
 			blks[i] = 0;
-		for (i in 0...s.length){
+		for (i in 0...s.length) {
 			var p = i >> 2;
-			blks[p] |= #if !(neko || cpp || php) s.get(i) #else s.charCodeAt(i) #end << (24 - ((i & 3) << 3));
+			blks[p] |= #if target.unicode s.get(i) #else s.charCodeAt(i) #end << (24 - ((i & 3) << 3));
 		}
 		var i = s.length;
 		var p = i >> 2;
@@ -132,13 +130,13 @@ class Sha256 {
 		return blks;
 	}
 
-	static function bytes2blks( b : haxe.io.Bytes ) : Array<Int> {
+	static function bytes2blks(b:haxe.io.Bytes):Array<Int> {
 		var nblk = ((b.length + 8) >> 6) + 1;
 		var blks = new Array<Int>();
 
-		for (i in 0...nblk*16)
+		for (i in 0...nblk * 16)
 			blks[i] = 0;
-		for (i in 0...b.length){
+		for (i in 0...b.length) {
 			var p = i >> 2;
 			blks[p] |= b.get(i) << (24 - ((i & 3) << 3));
 		}
@@ -149,50 +147,49 @@ class Sha256 {
 		return blks;
 	}
 
-	function S(X, n) {
-		return ( X >>> n ) | (X << (32 - n));
+	extern inline function S(X, n) {
+		return (X >>> n) | (X << (32 - n));
 	}
 
-	function R(X, n) {
-		return ( X >>> n );
+	extern inline function R(X, n) {
+		return (X >>> n);
 	}
 
-	function Ch(x, y, z) {
+	extern inline function Ch(x, y, z) {
 		return ((x & y) ^ ((~x) & z));
 	}
 
-	function Maj(x, y, z) {
+	extern inline function Maj(x, y, z) {
 		return ((x & y) ^ (x & z) ^ (y & z));
 	}
 
-	function Sigma0256(x) {
+	extern inline function Sigma0256(x) {
 		return (S(x, 2) ^ S(x, 13) ^ S(x, 22));
 	}
 
-	function Sigma1256(x) {
+	extern inline function Sigma1256(x) {
 		return (S(x, 6) ^ S(x, 11) ^ S(x, 25));
 	}
 
-	function Gamma0256(x) {
+	extern inline function Gamma0256(x) {
 		return (S(x, 7) ^ S(x, 18) ^ R(x, 3));
 	}
 
-	function Gamma1256(x) {
+	extern inline function Gamma1256(x) {
 		return (S(x, 17) ^ S(x, 19) ^ R(x, 10));
 	}
 
-	function safeAdd(x, y) {
+	extern inline function safeAdd(x, y) {
 		var lsw = (x & 0xFFFF) + (y & 0xFFFF);
 		var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
 		return (msw << 16) | (lsw & 0xFFFF);
 	}
 
-	function hex( a : Array<Int> ){
+	function hex(a:Array<Int>) {
 		var str = "";
-		for( num in a ) {
+		for (num in a) {
 			str += StringTools.hex(num, 8);
 		}
 		return str.toLowerCase();
 	}
-
 }
diff --git a/std/haxe/display/Display.hx b/std/haxe/display/Display.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5b4bf6f7b744ff17a21e6dea5efbe68135e18ae1
--- /dev/null
+++ b/std/haxe/display/Display.hx
@@ -0,0 +1,518 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.display;
+
+import haxe.display.JsonModuleTypes;
+import haxe.display.Protocol;
+import haxe.display.Position;
+
+/**
+	Methods of the JSON-RPC-based `--display` protocol in Haxe 4.
+	A lot of the methods are *inspired* by the Language Server Protocol, but there is **no** intention to be directly compatible with it.
+**/
+@:publicFields
+class DisplayMethods {
+	/**
+		The completion request is sent from the client to Haxe to request code completion.
+		Haxe automatically determines the type of completion to use based on the passed position, see `CompletionResultKind`.
+	**/
+	static inline var Completion = new HaxeRequestMethod<CompletionParams, CompletionResult>("display/completion");
+
+	/**
+		The request is sent from the client to Haxe to resolve additional information for a given completion item.
+	**/
+	static inline var CompletionItemResolve = new HaxeRequestMethod<CompletionItemResolveParams, CompletionItemResolveResult>("display/completionItem/resolve");
+
+	/**
+		The find references request is sent from the client to Haxe to find locations that reference the symbol at a given text document position.
+	**/
+	static inline var FindReferences = new HaxeRequestMethod<PositionParams, GotoDefinitionResult>("display/references");
+
+	/**
+		The goto definition request is sent from the client to Haxe to resolve the definition location(s) of a symbol at a given text document position.
+	**/
+	static inline var GotoDefinition = new HaxeRequestMethod<PositionParams, GotoDefinitionResult>("display/definition");
+
+	/**
+		The goto type definition request is sent from the client to Haxe to resolve the type definition location(s) of a symbol at a given text document position.
+	**/
+	static inline var GotoTypeDefinition = new HaxeRequestMethod<PositionParams, GotoTypeDefinitionResult>("display/typeDefinition");
+
+	/**
+		The hover request is sent from the client to Haxe to request hover information at a given text document position.
+	**/
+	static inline var Hover = new HaxeRequestMethod<PositionParams, HoverResult>("display/hover");
+
+	/**
+		This request is sent from the client to Haxe to determine the package for a given file, based on class paths configuration.
+	**/
+	static inline var DeterminePackage = new HaxeRequestMethod<FileParams, DeterminePackageResult>("display/package");
+
+	/**
+		The signature help request is sent from the client to Haxe to request signature information at a given cursor position.
+	**/
+	static inline var SignatureHelp = new HaxeRequestMethod<SignatureHelpParams, SignatureHelpResult>("display/signatureHelp");
+
+	/*
+		TODO:
+
+		- finish completion
+		- diagnostics
+		- codeLens
+		- workspaceSymbols ("project/symbol"?)
+	 */
+}
+
+/** Completion **/
+typedef CompletionParams = PositionParams & {
+	var wasAutoTriggered:Bool;
+
+	/** list of metas to include in responses **/
+	var ?meta:Array<String>;
+}
+
+typedef FieldResolution = {
+	/**
+		Whether it's valid to use the unqualified name of the field or not.
+		This is `false` if the identifier is shadowed.
+	**/
+	var isQualified:Bool;
+
+	/**
+		The qualifier that has to be inserted to use the field if `!isQualified`.
+		Can either be `this` or `super` for instance fields for the type name for `static` fields.
+	**/
+	var qualifier:String;
+}
+
+typedef DisplayLocal<T> = {
+	var id:Int;
+	var name:String;
+	var type:JsonType<T>;
+	var origin:LocalOrigin;
+	var capture:Bool;
+	var ?extra:{
+		var params:Array<JsonTypeParameter>;
+		var expr:JsonExpr;
+	};
+	var meta:JsonMetadata;
+	var pos:JsonPos;
+	var isInline:Bool;
+	var isFinal:Bool;
+}
+
+enum abstract LocalOrigin(Int) {
+	var LocalVariable;
+	var Argument;
+	var ForVariable;
+	var PatternVariable;
+	var CatchVariable;
+	var LocalFunction;
+}
+
+enum abstract ClassFieldOriginKind<T>(Int) {
+	/**
+		The field is declared on the current type itself.
+	**/
+	var Self:ClassFieldOriginKind<JsonModuleType<T>>;
+
+	/**
+		The field is a static field brought into context via a static import
+		(`import pack.Module.Type.field`).
+	**/
+	var StaticImport:ClassFieldOriginKind<JsonModuleType<T>>;
+
+	/**
+		The field is declared on a parent type, such as:
+		- a super class field that is not overriden
+		- a forwarded abstract field
+	**/
+	var Parent:ClassFieldOriginKind<JsonModuleType<T>>;
+
+	/**
+		The field is a static extension method brought
+		into context with the `using` keyword.
+	**/
+	var StaticExtension:ClassFieldOriginKind<JsonModuleType<T>>;
+
+	/**
+		This field doesn't belong to any named type, just an anonymous structure.
+	**/
+	var AnonymousStructure:ClassFieldOriginKind<JsonAnon>;
+
+	/**
+		Special fields built into the compiler, such as:
+		- `code` on single-character Strings
+		- `bind()` on functions.
+	**/
+	var BuiltIn:ClassFieldOriginKind<NoData>;
+
+	/**
+		The origin of this class field is unknown.
+	**/
+	var Unknown:ClassFieldOriginKind<NoData>;
+}
+
+typedef ClassFieldOrigin<T> = {
+	var kind:ClassFieldOriginKind<T>;
+	var ?args:T;
+}
+
+typedef ClassFieldOccurrence<T> = {
+	var field:JsonClassField;
+	var resolution:FieldResolution;
+	var ?origin:ClassFieldOrigin<T>;
+}
+
+enum abstract EnumFieldOriginKind<T>(Int) {
+	/**
+		The enum value is declared on the current type itself.
+	**/
+	var Self:EnumFieldOriginKind<JsonModuleType<T>>;
+
+	/**
+		The enum value is brought into context via a static import
+		(`import pack.Module.Enum.Value`).
+	**/
+	var StaticImport:EnumFieldOriginKind<JsonModuleType<T>>;
+}
+
+typedef EnumFieldOrigin<T> = {
+	var kind:EnumFieldOriginKind<T>;
+	var ?args:T;
+}
+
+typedef EnumFieldOccurrence<T> = {
+	var field:JsonEnumField;
+	var resolution:FieldResolution;
+	var ?origin:EnumFieldOrigin<T>;
+}
+
+enum abstract Literal(String) {
+	var Null = "null";
+	var True = "true";
+	var False = "false";
+	var This = "this";
+	var Trace = "trace";
+}
+
+enum abstract DisplayModuleTypeKind(Int) {
+	var Class;
+	var Interface;
+	var Enum;
+	var Abstract;
+	var EnumAbstract;
+
+	/** A `typedef` that is just an alias for another type. **/
+	var TypeAlias;
+
+	/** A `typedef` that is an alias for an anonymous structure. **/
+	var Struct;
+
+	/** A type name introduced by `import as` / `import in` **/
+	// var ImportAlias;
+}
+
+typedef DisplayModuleType = {
+	var path:JsonTypePath;
+	var pos:JsonPos;
+	var isPrivate:Bool;
+	var params:Array<DisplayModuleTypeParameter>;
+	var meta:JsonMetadata;
+	var doc:JsonDoc;
+	var isExtern:Bool;
+	var isFinal:Bool;
+	var kind:DisplayModuleTypeKind;
+}
+
+typedef DisplayModuleTypeParameter = {
+	var name:String;
+	var meta:JsonMetadata;
+	var constraints:Array<JsonType<Dynamic>>;
+}
+
+typedef DisplayLiteral<T> = {
+	var name:String;
+}
+
+enum abstract MetadataTarget(String) {
+	var Class = "TClass";
+	var ClassField = "TClassField";
+	var Abstract = "TAbstract";
+	var AbstractField = "TAbstractField";
+	var Enum = "TEnum";
+	var Typedef = "TTypedef";
+	var AnyField = "TAnyField";
+	var Expr = "TExpr";
+	var TypeParameter = "TTypeParameter";
+}
+
+enum abstract Platform(String) {
+	var Cross = "cross";
+	var Js = "js";
+	var Lua = "lua";
+	var Neko = "neko";
+	var Flash = "flash";
+	var Php = "php";
+	var Cpp = "cpp";
+	var Cs = "cs";
+	var Java = "java";
+	var Python = "python";
+	var Hl = "hl";
+	var Eval = "eval";
+}
+
+typedef Metadata = {
+	var name:String;
+	var doc:JsonDoc;
+	var parameters:Array<String>;
+	var platforms:Array<Platform>;
+	var targets:Array<MetadataTarget>;
+	var internal:Bool;
+	var ?links:Array<String>;
+}
+
+typedef Define = {
+	var name:String;
+	var value:Null<String>;
+	var doc:JsonDoc;
+	var parameters:Array<String>;
+	var platforms:Array<Platform>;
+	var links:Array<String>;
+}
+
+typedef Keyword = {
+	var name:KeywordKind;
+}
+
+enum abstract KeywordKind(String) to String {
+	var Implements = "implements";
+	var Extends = "extends";
+	var Function = "function";
+	var Var = "var";
+	var If = "if";
+	var Else = "else";
+	var While = "while";
+	var Do = "do";
+	var For = "for";
+	var Break = "break";
+	var Return = "return";
+	var Continue = "continue";
+	var Switch = "switch";
+	var Case = "case";
+	var Default = "default";
+	var Try = "try";
+	var Catch = "catch";
+	var New = "new";
+	var Throw = "throw";
+	var Untyped = "untyped";
+	var Cast = "cast";
+	var Macro = "macro";
+	var Package = "package";
+	var Import = "import";
+	var Using = "using";
+	var Public = "public";
+	var Private = "private";
+	var Static = "static";
+	var Extern = "extern";
+	var Dynamic = "dynamic";
+	var Override = "override";
+	var Class = "class";
+	var Interface = "interface";
+	var Enum = "enum";
+	var Abstract = "abstract";
+	var Typedef = "typedef";
+	var Final = "final";
+	var Inline = "inline";
+}
+
+/* enum abstract PackageContentKind(Int) {
+	var Module;
+	var Package;
+}*/
+typedef Package = {
+	var path:JsonPackagePath;
+	// var ?contents:Array<{name:String, kind:PackageContentKind}>;
+}
+
+typedef Module = {
+	var path:JsonModulePath;
+	// var ?contents:Array<ModuleType>;
+}
+
+enum abstract DisplayItemKind<T>(String) {
+	var Local:DisplayItemKind<DisplayLocal<Dynamic>>;
+	var ClassField:DisplayItemKind<ClassFieldOccurrence<Dynamic>>;
+	var EnumField:DisplayItemKind<EnumFieldOccurrence<Dynamic>>;
+
+	/** Only for the enum values in enum abstracts, other fields use `ClassField`. **/
+	var EnumAbstractField:DisplayItemKind<ClassFieldOccurrence<Dynamic>>;
+
+	var Type:DisplayItemKind<DisplayModuleType>;
+	var Package:DisplayItemKind<Package>;
+	var Module:DisplayItemKind<Module>;
+	var Literal:DisplayItemKind<DisplayLiteral<Dynamic>>;
+	var Metadata:DisplayItemKind<Metadata>;
+	var Keyword:DisplayItemKind<Keyword>;
+	var AnonymousStructure:DisplayItemKind<JsonAnon>;
+	var Expression:DisplayItemKind<JsonTExpr>;
+	var TypeParameter:DisplayItemKind<DisplayModuleTypeParameter>;
+	var Define:DisplayItemKind<Define>;
+}
+
+typedef DisplayItem<T> = {
+	var kind:DisplayItemKind<T>;
+	var args:T;
+	var ?type:JsonType<Dynamic>;
+	var ?index:Int;
+}
+
+typedef DisplayItemOccurrence<T> = {
+	var range:Range;
+	var item:DisplayItem<T>;
+	var ?moduleType:JsonModuleType<Dynamic>;
+	var ?moduleTypeFollowed:JsonModuleType<Dynamic>;
+}
+
+typedef FieldCompletionSubject<T> = DisplayItemOccurrence<T> & {
+	var ?iterator:{
+		var type:JsonType<Dynamic>;
+	};
+	var ?keyValueIterator:{
+		var key:JsonType<Dynamic>;
+		var value:JsonType<Dynamic>;
+	};
+}
+
+typedef ToplevelCompletion<T> = {
+	var ?expectedType:JsonType<T>;
+	var ?expectedTypeFollowed:JsonType<T>;
+}
+
+typedef StructExtensionCompletion = {
+	var isIntersectionType:Bool;
+}
+
+typedef PatternCompletion<T> = ToplevelCompletion<T> & {
+	var isOutermostPattern:Bool;
+}
+
+enum abstract CompletionModeKind<T>(Int) {
+	var Field:CompletionModeKind<FieldCompletionSubject<Dynamic>>;
+	var StructureField;
+	var Toplevel:CompletionModeKind<ToplevelCompletion<Dynamic>>;
+	var Metadata;
+	var TypeHint;
+	var Extends;
+	var Implements;
+	var StructExtension:CompletionModeKind<StructExtensionCompletion>;
+	var Import;
+	var Using;
+	var New;
+	var Pattern:CompletionModeKind<PatternCompletion<Dynamic>>;
+	var Override;
+	var TypeRelation;
+	var TypeDeclaration;
+}
+
+typedef CompletionMode<T> = {
+	var kind:CompletionModeKind<T>;
+	var ?args:T;
+}
+
+typedef CompletionResponse<T1, T2> = {
+	var items:Array<DisplayItem<T1>>;
+	var mode:CompletionMode<T2>;
+	var ?replaceRange:Range;
+	var ?isIncomplete:Bool;
+	var ?filterString:String;
+}
+
+typedef CompletionResult = Response<Null<CompletionResponse<Dynamic, Dynamic>>>;
+
+/** CompletionItem Resolve **/
+typedef CompletionItemResolveParams = {
+	var index:Int;
+};
+
+typedef CompletionItemResolveResult = Response<{
+	var item:DisplayItem<Dynamic>;
+}>;
+
+/** GotoDefinition **/
+typedef GotoDefinitionResult = Response<Array<Location>>;
+
+/** GotoTypeDefinition **/
+typedef GotoTypeDefinitionResult = Response<Array<Location>>;
+
+/** Hover **/
+typedef HoverResult = Response<Null<HoverDisplayItemOccurence<Dynamic>>>;
+
+typedef HoverDisplayItemOccurence<T> = DisplayItemOccurrence<T> & {
+	var ?expected:{
+		var ?type:JsonType<Dynamic>;
+		var ?name:{
+			var name:String;
+			var kind:HoverExpectedNameKind;
+		};
+	};
+}
+
+enum abstract HoverExpectedNameKind(Int) {
+	var FunctionArgument;
+	var StructureField;
+}
+
+/** DeterminePackage **/
+typedef DeterminePackageResult = Response<Array<String>>;
+
+/** SignatureHelp **/
+typedef SignatureHelpParams = PositionParams & {
+	var wasAutoTriggered:Bool;
+}
+
+typedef SignatureInformation = JsonFunctionSignature & {
+	var ?documentation:String;
+}
+
+enum abstract SignatureItemKind(Int) {
+	var Call;
+	var ArrayAccess;
+}
+
+typedef SignatureItem = {
+	var signatures:Array<SignatureInformation>;
+	var activeSignature:Int;
+	var activeParameter:Int;
+	var kind:SignatureItemKind;
+}
+
+typedef SignatureHelpResult = Response<Null<SignatureItem>>;
+
+/** General types **/
+typedef PositionParams = FileParams & {
+	/** Unicode character offset in the file. **/
+	var offset:Int;
+
+	var ?contents:String;
+}
diff --git a/std/haxe/display/FsPath.hx b/std/haxe/display/FsPath.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f427b6fbf4aebe55889c78ff2a790096b2c2f567
--- /dev/null
+++ b/std/haxe/display/FsPath.hx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.display;
+
+abstract FsPath(String) {
+	public inline function new(path:String) {
+		this = path;
+	}
+
+	public inline function toString():String {
+		return this;
+	}
+}
diff --git a/std/haxe/display/JsonModuleTypes.hx b/std/haxe/display/JsonModuleTypes.hx
new file mode 100644
index 0000000000000000000000000000000000000000..88ba7d88b63cfe368f04ab083f56cb9ab076ca8c
--- /dev/null
+++ b/std/haxe/display/JsonModuleTypes.hx
@@ -0,0 +1,371 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.display;
+
+typedef JsonTodo = Dynamic;
+
+typedef JsonPos = {
+	var file:String;
+	var min:Int;
+	var max:Int;
+}
+
+typedef JsonDoc = Null<String>;
+
+enum abstract ImportStatus(Int) {
+	/**
+		This type is already available with it's unqualified name for one of these reasons:
+		  - it's a toplevel type
+		  - it's imported with an `import` in the current module
+		  - it's imported in an `import.hx` file
+	**/
+	var Imported;
+
+	/**
+		The type is currently not imported. It can be accessed either
+		with its fully qualified name or by inserting an import.
+	**/
+	var Unimported;
+
+	/**
+		A type with the same name is already imported in the module.
+		The fully qualified name has to be used to access it.
+	**/
+	var Shadowed;
+}
+
+/* Type instance */
+typedef JsonPackagePath = {
+	var pack:Array<String>;
+}
+
+typedef JsonModulePath = JsonPackagePath & {
+	var moduleName:String;
+	var ?importStatus:ImportStatus;
+}
+
+typedef JsonTypePath = JsonModulePath & {
+	var typeName:String;
+}
+
+typedef JsonStaticFieldPath = JsonTypePath & {
+	var fieldName:String;
+}
+
+typedef JsonTypePathWithParams = {
+	var path:JsonTypePath;
+	var params:JsonTypes;
+}
+
+typedef JsonFunctionArgument = {
+	var name:String;
+	var opt:Bool;
+	var t:JsonType<Dynamic>;
+	var ?value:{
+		var string:String;
+	};
+}
+
+typedef JsonFunctionSignature = {
+	var args:Array<JsonFunctionArgument>;
+	var ret:JsonType<Dynamic>;
+}
+
+enum abstract JsonAnonStatusKind<T>(String) {
+	var AClosed;
+	var AOpened;
+	var AConst;
+	var AExtend:JsonAnonStatusKind<JsonTypes>;
+	var AClassStatics:JsonAnonStatusKind<JsonTypePath>;
+	var AEnumStatics:JsonAnonStatusKind<JsonTypePath>;
+	var AAbstractStatics:JsonAnonStatusKind<JsonTypePath>;
+}
+
+typedef JsonAnonStatus<T> = {
+	var kind:JsonAnonStatusKind<T>;
+	var args:T;
+}
+
+typedef JsonAnon = {
+	var fields:JsonClassFields;
+	var status:JsonAnonStatus<Dynamic>;
+}
+
+enum abstract JsonTypeKind<T>(String) {
+	var TMono;
+	var TInst:JsonTypeKind<JsonTypePathWithParams>;
+	var TEnum:JsonTypeKind<JsonTypePathWithParams>;
+	var TType:JsonTypeKind<JsonTypePathWithParams>;
+	var TAbstract:JsonTypeKind<JsonTypePathWithParams>;
+	var TFun:JsonTypeKind<JsonFunctionSignature>;
+	var TAnonymous:JsonTypeKind<JsonAnon>;
+	var TDynamic:JsonTypeKind<Null<JsonType<Dynamic>>>;
+}
+
+typedef JsonType<T> = {
+	var kind:JsonTypeKind<T>;
+	var args:T;
+}
+
+typedef JsonTypes = Array<JsonType<Dynamic>>;
+
+/* Type parameters */
+typedef JsonTypeParameter = {
+	var name:String;
+	var constraints:JsonTypes;
+}
+
+typedef JsonTypeParameters = Array<JsonTypeParameter>;
+
+/* Expr */
+enum abstract JsonBinopKind<T>(String) {
+	var OpAdd;
+	var OpMult;
+	var OpDiv;
+	var OpSub;
+	var OpAssign;
+	var OpEq;
+	var OpNotEq;
+	var OpGt;
+	var OpGte;
+	var OpLt;
+	var OpLte;
+	var OpAnd;
+	var OpOr;
+	var OpXor;
+	var OpBoolAnd;
+	var OpBoolOr;
+	var OpShl;
+	var OpShr;
+	var OpUShr;
+	var OpMod;
+	var OpAssignOp:JsonBinopKind<JsonBinop<Dynamic>>;
+	var OpInterval;
+	var OpArrow;
+	var OpIn;
+}
+
+typedef JsonBinop<T> = {
+	var kind:JsonBinopKind<T>;
+	var args:T;
+}
+
+enum abstract JsonUnop(String) {
+	var OpIncrement;
+	var OpDecrement;
+	var OpNot;
+	var OpNeg;
+	var OpNegBits;
+}
+
+typedef JsonExpr = JsonTodo;
+
+typedef JsonMetadataEntry = {
+	var name:String;
+	var args:Array<JsonExpr>;
+	var pos:JsonPos;
+}
+
+typedef JsonMetadata = Array<JsonMetadataEntry>;
+
+enum abstract JsonTConstantKind<T>(String) {
+	var TInt:JsonTConstantKind<String>;
+	var TFloat:JsonTConstantKind<String>;
+	var TString:JsonTConstantKind<String>;
+	var TBool:JsonTConstantKind<Bool>;
+	var TNull;
+	var TThis;
+	var TSuper;
+}
+
+typedef JsonTConstant<T> = {
+	var kind:JsonTConstantKind<T>;
+	var args:T;
+}
+
+typedef JsonTExpr = JsonTodo;
+
+/* Fields */
+enum abstract JsonVarAccessKind<T>(String) {
+	var AccNormal;
+	var AccNo;
+	var AccNever;
+	var AccResolve;
+	var AccCall;
+	var AccInline;
+	var AccRequire:JsonVarAccessKind<{require:String, message:Null<String>}>;
+	var AccCtor;
+}
+
+typedef JsonVarAccess<T> = {
+	var kind:JsonVarAccessKind<T>;
+	var args:T;
+}
+
+enum abstract JsonMethodKind(String) {
+	var MethNormal;
+	var MethInline;
+	var MethDynamic;
+	var MethMacro;
+}
+
+enum abstract JsonFieldKindKind<T>(String) {
+	var FVar:JsonFieldKindKind<{read:JsonVarAccess<Dynamic>, write:JsonVarAccess<Dynamic>}>;
+	var FMethod:JsonFieldKindKind<JsonMethodKind>;
+}
+
+typedef JsonFieldKind<T> = {
+	var kind:JsonFieldKindKind<T>;
+	var args:T;
+}
+
+enum abstract JsonClassFieldScope(Int) {
+	var Static;
+	var Member;
+	var Constructor;
+}
+
+typedef JsonClassField = {
+	var name:String;
+	var type:JsonType<Dynamic>;
+	var isPublic:Bool;
+	var isFinal:Bool;
+	var params:JsonTypeParameters;
+	var meta:JsonMetadata;
+	var kind:JsonFieldKind<Dynamic>;
+	var ?expr:{
+		var string:String;
+	};
+	var pos:JsonPos;
+	var doc:JsonDoc;
+	var overloads:JsonClassFields;
+	var scope:JsonClassFieldScope;
+}
+
+typedef JsonClassFields = Array<JsonClassField>;
+typedef JsonClassFieldReference = String;
+
+typedef JsonEnumField = {
+	var name:String;
+	var type:JsonType<Dynamic>;
+	var pos:JsonPos;
+	var meta:JsonMetadata;
+	var index:Int;
+	var doc:JsonDoc;
+	var params:JsonTypeParameters;
+}
+
+typedef JsonEnumFields = Array<JsonEnumField>;
+
+/* Class */
+enum abstract JsonClassKindKind<T>(String) {
+	var KNormal;
+	var KTypeParameter:JsonClassKindKind<JsonTypes>;
+	var KExtension:JsonClassKindKind<JsonTypePathWithParams>;
+	var KExpr:JsonClassKindKind<JsonExpr>;
+	var KGeneric;
+	var KGenericInstance:JsonClassKindKind<JsonTypePathWithParams>;
+	var KMacroType;
+	var KAbstractImpl:JsonClassKindKind<JsonTypePath>;
+	var KGenericBuild;
+}
+
+typedef JsonClassKind<T> = {
+	var kind:JsonClassKindKind<T>;
+	var args:T;
+}
+
+typedef JsonClass = {
+	var kind:JsonClassKind<Dynamic>;
+	var isInterface:Bool;
+	var isExtern:Bool;
+	var superClass:Null<JsonTypePathWithParams>;
+	var interfaces:Array<JsonTypePathWithParams>;
+	var fields:JsonClassFields;
+	var statics:JsonClassFields;
+	var constructor:Null<JsonClassField>;
+	var init:Null<JsonTExpr>;
+	var overrides:Array<JsonClassFieldReference>;
+}
+
+/* Enum */
+typedef JsonEnum = {
+	var constructors:JsonEnumFields;
+	var isExtern:Bool;
+}
+
+/* Typedef */
+typedef JsonTypedef = {
+	var type:JsonType<Dynamic>;
+}
+
+/* Abstract */
+typedef JsonAbstractBinop = {
+	var op:JsonBinop<Dynamic>;
+	var field:JsonClassFieldReference;
+}
+
+typedef JsonAbstractUnop = {
+	var op:JsonUnop;
+	var postFix:Bool;
+	var field:JsonClassFieldReference;
+}
+
+typedef JsonAbstractCast = {
+	var t:JsonType<Dynamic>;
+	var field:JsonClassFieldReference;
+}
+
+typedef JsonAbstract = {
+	var type:JsonType<Dynamic>;
+	var impl:Null<JsonClass>;
+	var binops:Array<JsonAbstractBinop>;
+	var unops:Array<JsonAbstractUnop>;
+	var from:Array<JsonAbstractCast>;
+	var to:Array<JsonAbstractCast>;
+	var array:JsonClassFields;
+	var resolve:Null<JsonClassFieldReference>;
+}
+
+/* Module type */
+enum abstract JsonModuleTypeKind<T>(String) {
+	var Class:JsonModuleTypeKind<JsonClass> = "class";
+	var Enum:JsonModuleTypeKind<JsonEnum> = "enum";
+	var Typedef:JsonModuleTypeKind<JsonTypedef> = "typedef";
+	var Abstract:JsonModuleTypeKind<JsonAbstract> = "abstract";
+}
+
+typedef JsonModuleType<T> = {
+	var pack:Array<String>;
+	var name:String;
+	var moduleName:String;
+	var pos:JsonPos;
+	var isPrivate:Bool;
+	var params:JsonTypeParameters;
+	var meta:JsonMetadata;
+	var doc:JsonDoc;
+	var kind:JsonModuleTypeKind<T>;
+	var args:T;
+}
+
+typedef JsonModuleTypes = Array<JsonModuleType<Dynamic>>;
diff --git a/std/haxe/display/Position.hx b/std/haxe/display/Position.hx
new file mode 100644
index 0000000000000000000000000000000000000000..31bae6fd4dbf1ecff3ebf5eda4cee67bf04e3e3c
--- /dev/null
+++ b/std/haxe/display/Position.hx
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.display;
+
+/**
+	Position in a text document expressed as 1-based line and character offset.
+**/
+typedef Position = {
+	/**
+		Line position in a document (1-based).
+	**/
+	var line:Int;
+
+	/**
+		Character offset on a line in a document (1-based).
+	**/
+	var character:Int;
+}
+
+/**
+	A range in a text document expressed as (1-based) start and end positions.
+**/
+typedef Range = {
+	/**
+		The range's start position
+	**/
+	var start:Position;
+
+	/**
+		The range's end position
+	**/
+	var end:Position;
+}
+
+/**
+	Represents a location inside a resource, such as a line inside a text file.
+**/
+typedef Location = {
+	var file:FsPath;
+	var range:Range;
+}
diff --git a/std/haxe/display/Protocol.hx b/std/haxe/display/Protocol.hx
new file mode 100644
index 0000000000000000000000000000000000000000..99a27b57ba3ecdb97b822cff0883ab8e3af38f0f
--- /dev/null
+++ b/std/haxe/display/Protocol.hx
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.display;
+
+import haxe.display.Position;
+
+@:publicFields
+class Methods {
+	/**
+		The initialize request is sent from the client to Haxe to determine the capabilities.
+	**/
+	static inline var Initialize = new HaxeRequestMethod<InitializeParams, InitializeResult>("initialize");
+}
+
+/* Initialize */
+typedef InitializeParams = {
+	final ?supportsResolve:Bool;
+
+	/** dot paths to exclude from readClassPaths / toplevel completion **/
+	final ?exclude:Array<String>;
+
+	/** The maximum number of completion items to return **/
+	final ?maxCompletionItems:Int;
+}
+
+/**
+	Represents a semantic version, see https://semver.org/.
+**/
+typedef Version = {
+	final major:Int;
+	final minor:Int;
+	final patch:Int;
+	final pre:String;
+	final build:String;
+}
+
+typedef InitializeResult = Response<{
+	final protocolVersion:Version;
+	final haxeVersion:Version;
+	final methods:Array<String>;
+}>;
+
+/* general protocol types */
+typedef Timer = {
+	final name:String;
+	final time:Float;
+	final ?path:String;
+	final ?info:String;
+	final ?calls:Int;
+	final ?percentTotal:Float;
+	final ?percentParent:Float;
+	final ?children:Array<Timer>;
+}
+
+typedef Response<T> = {
+	final ?result:T;
+
+	/** UNIX timestamp at the moment the data was sent. **/
+	final ?timestamp:Float;
+
+	/** Only sent if `--times` is enabled. **/
+	final ?timers:Timer;
+}
+
+typedef FileParams = {
+	var file:FsPath;
+}
+
+abstract HaxeRequestMethod<TParams, TResponse>(String) to String {
+	public inline function new(method:String)
+		this = method;
+}
+
+abstract HaxeNotificationMethod<TParams>(String) to String {
+	public inline function new(method:String)
+		this = method;
+}
+
+typedef HaxeResponseErrorData = Array<{
+	var severity:HaxeResponseErrorSeverity;
+	var ?location:Location;
+	var message:String;
+}>;
+
+enum abstract HaxeResponseErrorSeverity(Int) {
+	var Error = 1;
+	var Warning;
+	var Hint;
+}
+
+enum NoData {}
diff --git a/std/haxe/display/Server.hx b/std/haxe/display/Server.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e6e28b0b2a07e51e00b6fdbc629fecba3c5a8e9e
--- /dev/null
+++ b/std/haxe/display/Server.hx
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.display;
+
+import haxe.display.JsonModuleTypes;
+import haxe.display.Position;
+import haxe.display.Protocol;
+
+@:publicFields
+class ServerMethods {
+	/**
+		This request is sent from the client to Haxe to explore the class paths. This effectively creates a cache for toplevel completion.
+	**/
+	static inline var ReadClassPaths = new HaxeRequestMethod<NoData, Response<{?files:Int}>>("server/readClassPaths");
+
+	static inline var Configure = new HaxeRequestMethod<ConfigureParams, Response<NoData>>("server/configure");
+	static inline var Invalidate = new HaxeRequestMethod<FileParams, Response<NoData>>("server/invalidate");
+	static inline var Contexts = new HaxeRequestMethod<NoData, Response<Array<HaxeServerContext>>>("server/contexts");
+	static inline var Memory = new HaxeRequestMethod<NoData, Response<HaxeMemoryResult>>("server/memory");
+	static inline var ContextMemory = new HaxeRequestMethod<ContextParams, Response<HaxeContextMemoryResult>>("server/memory/context");
+	static inline var ModuleMemory = new HaxeRequestMethod<ModuleParams, Response<HaxeModuleMemoryResult>>("server/memory/module");
+	static inline var Modules = new HaxeRequestMethod<ContextParams, Response<Array<String>>>("server/modules");
+	static inline var Module = new HaxeRequestMethod<ModuleParams, Response<JsonModule>>("server/module");
+	static inline var Files = new HaxeRequestMethod<ContextParams, Response<Array<JsonServerFile>>>("server/files");
+	static inline var ModuleCreated = new HaxeRequestMethod<FileParams, Response<NoData>>("server/moduleCreated");
+}
+
+/* Configure */
+typedef ConfigurePrintParams = {
+	var ?addedDirectory:Bool;
+	var ?foundDirectories:Bool;
+	var ?changedDirectories:Bool;
+	var ?modulePathChanged:Bool;
+	var ?notCached:Bool;
+	var ?parsed:Bool;
+	var ?removedDirectory:Bool;
+	var ?reusing:Bool;
+	var ?skippingDep:Bool;
+	var ?unchangedContent:Bool;
+	var ?cachedModules:Bool;
+	var ?arguments:Bool;
+	var ?completion:Bool;
+	var ?defines:Bool;
+	var ?signature:Bool;
+	var ?displayPosition:Bool;
+	var ?stats:Bool;
+	var ?message:Bool;
+	var ?socketMessage:Bool;
+	var ?uncaughtError:Bool;
+	var ?newContext:Bool;
+}
+
+typedef ConfigureParams = {
+	final ?noModuleChecks:Bool;
+	final ?legacyCompletion:Bool;
+	final ?print:ConfigurePrintParams;
+}
+
+/* Contexts */
+typedef HaxeServerContext = {
+	final index:Int;
+	final desc:String;
+	final signature:String;
+	final platform:String;
+	final classPaths:Array<String>;
+	final defines:Array<{key:String, value:String}>;
+}
+
+typedef ModuleId = {
+	final path:String;
+	final sign:String;
+}
+
+typedef JsonModule = {
+	final id:Int;
+	final path:JsonModulePath;
+	final types:Array<JsonTypePath>;
+	final file:String;
+	final sign:String;
+	final dependencies:Array<ModuleId>;
+}
+
+typedef JsonServerFile = {
+	final file:String;
+	final time:Float;
+	final pack:String;
+	final moduleName:Null<String>;
+}
+
+/* Memory */
+
+typedef HaxeMemoryResult = {
+	final contexts:Array<{
+		final context:HaxeServerContext;
+		final size:Int;
+	}>;
+	final memory:{
+		final totalCache:Int;
+		final contextCache:Int;
+		final haxelibCache:Int;
+		final directoryCache:Int;
+		final nativeLibCache:Int;
+		final ?additionalSizes:Array<{name:String, size:Int}>;
+	}
+}
+
+typedef HaxeContextMemoryResult = {
+	final moduleCache:{
+		final size:Int;
+		final list:Array<{
+			final path:String;
+			final size:Int;
+			final hasTypes:Bool;
+		}>;
+	};
+	final syntaxCache:{
+		final size:Int;
+	};
+	final ?leaks:Array<{
+		final path:String;
+		final leaks:Array<{
+			final path:String;
+		}>;
+	}>;
+}
+
+typedef HaxeModuleMemoryResult = {
+	final moduleExtra:Int;
+	final types:Array<{
+		final name:String;
+		final ?pos:Location;
+		final size:Int;
+		final fields:Array<{
+			final name:String;
+			final ?pos:Location;
+			final size:Int;
+		}>;
+	}>;
+}
+
+typedef ContextParams = {
+	final signature:String;
+}
+
+typedef ModuleParams = ContextParams & {
+	final path:String;
+}
diff --git a/std/haxe/ds/ArraySort.hx b/std/haxe/ds/ArraySort.hx
index c3ab76c7a73a83a8c7b17303c28f20168b782ee8..7467fdd38374206b43ecd465f2938d4384e85b94 100644
--- a/std/haxe/ds/ArraySort.hx
+++ b/std/haxe/ds/ArraySort.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,7 +28,6 @@ package haxe.ds;
 	of equal elements has to be retained on all targets.
 **/
 class ArraySort {
-
 	/**
 		Sorts Array `a` according to the comparison function `cmp`, where
 		`cmp(x,y)` returns 0 if `x == y`, a positive Int if `x > y` and a
@@ -40,14 +39,15 @@ class ArraySort {
 
 		If `a` or `cmp` are null, the result is unspecified.
 	**/
-	static public function sort<T>(a:Array<T>, cmp:T -> T -> Int) {
+	static public function sort<T>(a:Array<T>, cmp:T->T->Int) {
 		rec(a, cmp, 0, a.length);
 	}
 
 	static function rec<T>(a:Array<T>, cmp, from, to) {
 		var middle = (from + to) >> 1;
 		if (to - from < 12) {
-			if (to <= from) return;
+			if (to <= from)
+				return;
 			for (i in (from + 1)...to) {
 				var j = i;
 				while (j > from) {
@@ -91,9 +91,10 @@ class ArraySort {
 		doMerge(a, cmp, new_mid, second_cut, to, len1 - len11, len2 - len22);
 	}
 
-	static function rotate<T>(a:Array<T>, cmp, from, mid, to) {
+	static function rotate<T>(a:Array<T>, cmp:T->T->Int, from, mid, to) {
 		var n;
-		if (from == mid || mid == to) return;
+		if (from == mid || mid == to)
+			return;
 		n = gcd(to - from, mid - from);
 		while (n-- != 0) {
 			var val = a[from + n];
@@ -102,8 +103,10 @@ class ArraySort {
 			while (p2 != from + n) {
 				a[p1] = a[p2];
 				p1 = p2;
-				if (to - p2 > shift) p2 += shift;
-				else p2 = from + (shift - (to - p2));
+				if (to - p2 > shift)
+					p2 += shift;
+				else
+					p2 = from + (shift - (to - p2));
 			}
 			a[p1] = val;
 		}
@@ -153,7 +156,7 @@ class ArraySort {
 		a[j] = tmp;
 	}
 
-	static inline function compare<T>(a:Array<T>, cmp, i, j) {
+	static inline function compare<T>(a:Array<T>, cmp:T->T->Int, i, j) {
 		return cmp(a[i], a[j]);
 	}
-}
\ No newline at end of file
+}
diff --git a/std/haxe/ds/BalancedTree.hx b/std/haxe/ds/BalancedTree.hx
index 05a5b8f22d43604269275ea33fd5322c2d7abdf9..71350a22d479f5de8e356be6e52f81634afb14cc 100644
--- a/std/haxe/ds/BalancedTree.hx
+++ b/std/haxe/ds/BalancedTree.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,13 @@ package haxe.ds;
 	Iteration over keys and values, using `keys` and `iterator` respectively,
 	are in-order.
 **/
-class BalancedTree<K,V> {
-	var root:TreeNode<K,V>;
+class BalancedTree<K, V> implements haxe.Constraints.IMap<K, V> {
+	var root:TreeNode<K, V>;
 
 	/**
 		Creates a new BalancedTree, which is initially empty.
 	**/
-	public function new() { }
+	public function new() {}
 
 	/**
 		Binds `key` to `value`.
@@ -62,9 +62,12 @@ class BalancedTree<K,V> {
 		var node = root;
 		while (node != null) {
 			var c = compare(key, node.key);
-			if (c == 0) return node.value;
-			if (c < 0) node = node.left;
-			else node = node.right;
+			if (c == 0)
+				return node.value;
+			if (c < 0)
+				node = node.left;
+			else
+				node = node.right;
 		}
 		return null;
 	}
@@ -83,8 +86,7 @@ class BalancedTree<K,V> {
 		try {
 			root = removeLoop(key, root);
 			return true;
-		}
-		catch (e:String) {
+		} catch (e:String) {
 			return false;
 		}
 	}
@@ -100,9 +102,12 @@ class BalancedTree<K,V> {
 		var node = root;
 		while (node != null) {
 			var c = compare(key, node.key);
-			if (c == 0) return true;
-			else if (c < 0) node = node.left;
-			else node = node.right;
+			if (c == 0)
+				return true;
+			else if (c < 0)
+				node = node.left;
+			else
+				node = node.right;
 		}
 		return false;
 	}
@@ -118,6 +123,13 @@ class BalancedTree<K,V> {
 		return ret.iterator();
 	}
 
+	/**
+		See `Map.keyValueIterator`
+	**/
+	@:runtime public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
 	/**
 		Iterates over the keys of `this` BalancedTree.
 
@@ -129,11 +141,17 @@ class BalancedTree<K,V> {
 		return ret.iterator();
 	}
 
-	function setLoop(k:K, v:V, node:TreeNode<K,V>) {
-		if (node == null) return new TreeNode<K,V>(null, k, v, null);
+	public function copy():BalancedTree<K, V> {
+		var copied = new BalancedTree<K, V>();
+		copied.root = root;
+		return copied;
+	}
+
+	function setLoop(k:K, v:V, node:TreeNode<K, V>) {
+		if (node == null)
+			return new TreeNode<K, V>(null, k, v, null);
 		var c = compare(k, node.key);
-		return if (c == 0) new TreeNode<K,V>(node.left, k, v, node.right, node.get_height());
-		else if (c < 0) {
+		return if (c == 0) new TreeNode<K, V>(node.left, k, v, node.right, node.get_height()); else if (c < 0) {
 			var nl = setLoop(k, v, node.left);
 			balance(nl, node.key, node.value, node.right);
 		} else {
@@ -142,15 +160,16 @@ class BalancedTree<K,V> {
 		}
 	}
 
-	function removeLoop(k:K, node:TreeNode<K,V>) {
-		if (node == null) throw "Not_found";
+	function removeLoop(k:K, node:TreeNode<K, V>) {
+		if (node == null)
+			throw "Not_found";
 		var c = compare(k, node.key);
-		return if (c == 0) merge(node.left, node.right);
-		else if (c < 0) balance(removeLoop(k, node.left), node.key, node.value, node.right);
-		else balance(node.left, node.key, node.value, removeLoop(k, node.right));
+		return if (c == 0) merge(node.left,
+			node.right); else if (c < 0) balance(removeLoop(k, node.left), node.key, node.value,
+			node.right); else balance(node.left, node.key, node.value, removeLoop(k, node.right));
 	}
 
-	function iteratorLoop(node:TreeNode<K,V>, acc:Array<V>) {
+	function iteratorLoop(node:TreeNode<K, V>, acc:Array<V>) {
 		if (node != null) {
 			iteratorLoop(node.left, acc);
 			acc.push(node.value);
@@ -158,7 +177,7 @@ class BalancedTree<K,V> {
 		}
 	}
 
-	function keysLoop(node:TreeNode<K,V>, acc:Array<K>) {
+	function keysLoop(node:TreeNode<K, V>, acc:Array<K>) {
 		if (node != null) {
 			keysLoop(node.left, acc);
 			acc.push(node.key);
@@ -167,34 +186,39 @@ class BalancedTree<K,V> {
 	}
 
 	function merge(t1, t2) {
-		if (t1 == null) return t2;
-		if (t2 == null) return t1;
+		if (t1 == null)
+			return t2;
+		if (t2 == null)
+			return t1;
 		var t = minBinding(t2);
 		return balance(t1, t.key, t.value, removeMinBinding(t2));
 	}
 
-	function minBinding(t:TreeNode<K,V>) {
-		return if (t == null) throw "Not_found";
-		else if (t.left == null) t;
-		else minBinding(t.left);
+	function minBinding(t:TreeNode<K, V>) {
+		return if (t == null) throw "Not_found"; else if (t.left == null) t; else minBinding(t.left);
 	}
 
-	function removeMinBinding(t:TreeNode<K,V>) {
-		return if (t.left == null) t.right;
-		else balance(removeMinBinding(t.left), t.key, t.value, t.right);
+	function removeMinBinding(t:TreeNode<K, V>) {
+		return if (t.left == null) t.right; else balance(removeMinBinding(t.left), t.key, t.value, t.right);
 	}
 
-	function balance(l:TreeNode<K,V>, k:K, v:V, r:TreeNode<K,V>):TreeNode<K,V> {
+	function balance(l:TreeNode<K, V>, k:K, v:V, r:TreeNode<K, V>):TreeNode<K, V> {
 		var hl = l.get_height();
 		var hr = r.get_height();
 		return if (hl > hr + 2) {
-			if (l.left.get_height() >= l.right.get_height()) new TreeNode<K,V>(l.left, l.key, l.value, new TreeNode<K,V>(l.right, k, v, r));
-			else new TreeNode<K,V>(new TreeNode<K,V>(l.left,l.key, l.value, l.right.left), l.right.key, l.right.value, new TreeNode<K,V>(l.right.right, k, v, r));
+			if (l.left.get_height() >= l.right.get_height())
+				new TreeNode<K, V>(l.left, l.key, l.value, new TreeNode<K, V>(l.right, k, v, r));
+			else
+				new TreeNode<K, V>(new TreeNode<K, V>(l.left, l.key, l.value, l.right.left), l.right.key, l.right.value,
+					new TreeNode<K, V>(l.right.right, k, v, r));
 		} else if (hr > hl + 2) {
-			if (r.right.get_height() > r.left.get_height()) new TreeNode<K,V>(new TreeNode<K,V>(l, k, v, r.left), r.key, r.value, r.right);
-			else new TreeNode<K,V>(new TreeNode<K,V>(l, k, v, r.left.left), r.left.key, r.left.value, new TreeNode<K,V>(r.left.right, r.key, r.value, r.right));
+			if (r.right.get_height() > r.left.get_height())
+				new TreeNode<K, V>(new TreeNode<K, V>(l, k, v, r.left), r.key, r.value, r.right);
+			else
+				new TreeNode<K, V>(new TreeNode<K, V>(l, k, v, r.left.left), r.left.key, r.left.value,
+					new TreeNode<K, V>(r.left.right, r.key, r.value, r.right));
 		} else {
-			new TreeNode<K,V>(l, k, v, r, (hl > hr ? hl : hr) + 1);
+			new TreeNode<K, V>(l, k, v, r, (hl > hr ? hl : hr) + 1);
 		}
 	}
 
@@ -205,20 +229,28 @@ class BalancedTree<K,V> {
 	public function toString() {
 		return root == null ? '{}' : '{${root.toString()}}';
 	}
+
+	/**
+		Removes all keys from `this` BalancedTree.
+	**/
+	public function clear():Void {
+		root = null;
+	}
 }
 
 /**
 	A tree node of `haxe.ds.BalancedTree`.
 **/
-class TreeNode<K,V> {
-	public var left : TreeNode<K,V>;
-	public var right : TreeNode<K,V>;
-	public var key : K;
-	public var value : V;
+class TreeNode<K, V> {
+	public var left:TreeNode<K, V>;
+	public var right:TreeNode<K, V>;
+	public var key:K;
+	public var value:V;
+
 	#if as3
 	public
 	#end
-	var _height : Int;
+	var _height:Int;
 
 	public function new(l, k, v, r, h = -1) {
 		left = l;
@@ -231,9 +263,10 @@ class TreeNode<K,V> {
 			_height = h;
 	}
 
-	@:extern public inline function get_height() return this == null ? 0 : _height;
+	extern public inline function get_height()
+		return this == null ? 0 : _height;
 
 	public function toString() {
-		return (left == null ? "" : left.toString() + ", ") + '$key=$value' + (right == null ? "" : ", " +right.toString());
+		return (left == null ? "" : left.toString() + ", ") + '$key=$value' + (right == null ? "" : ", " + right.toString());
 	}
-}
\ No newline at end of file
+}
diff --git a/std/haxe/ds/Either.hx b/std/haxe/ds/Either.hx
index 3f405a230bb2e0031706c7b8e520be0157bf9e76..24bf6f1c45ed70412b028900e415e5f65726c138 100644
--- a/std/haxe/ds/Either.hx
+++ b/std/haxe/ds/Either.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,4 +29,4 @@ package haxe.ds;
 enum Either<L, R> {
 	Left(v:L);
 	Right(v:R);
-}
\ No newline at end of file
+}
diff --git a/std/haxe/ds/EnumValueMap.hx b/std/haxe/ds/EnumValueMap.hx
index 32f031551c86c4fd33c48213e20ac74b8a5c1f6a..742e3c1228f57778702fa079d5a3847eb45e93d1 100644
--- a/std/haxe/ds/EnumValueMap.hx
+++ b/std/haxe/ds/EnumValueMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,23 +28,26 @@ package haxe.ds;
 	Keys are compared by value and recursively over their parameters. If any
 	parameter is not an enum value, `Reflect.compare` is used to compare them.
 **/
-class EnumValueMap<K:EnumValue, V> extends haxe.ds.BalancedTree<K, V> implements haxe.Constraints.IMap<K,V> {
-
+class EnumValueMap<K:EnumValue, V> extends haxe.ds.BalancedTree<K, V> implements haxe.Constraints.IMap<K, V> {
 	override function compare(k1:EnumValue, k2:EnumValue):Int {
 		var d = k1.getIndex() - k2.getIndex();
-		if (d != 0) return d;
+		if (d != 0)
+			return d;
 		var p1 = k1.getParameters();
 		var p2 = k2.getParameters();
-		if (p1.length == 0 && p2.length == 0) return 0;
+		if (p1.length == 0 && p2.length == 0)
+			return 0;
 		return compareArgs(p1, p2);
 	}
 
 	function compareArgs(a1:Array<Dynamic>, a2:Array<Dynamic>):Int {
 		var ld = a1.length - a2.length;
-		if (ld != 0) return ld;
+		if (ld != 0)
+			return ld;
 		for (i in 0...a1.length) {
 			var d = compareArg(a1[i], a2[i]);
-			if (d != 0) return d;
+			if (d != 0)
+				return d;
 		}
 		return 0;
 	}
@@ -58,4 +61,10 @@ class EnumValueMap<K:EnumValue, V> extends haxe.ds.BalancedTree<K, V> implements
 			Reflect.compare(v1, v2);
 		}
 	}
-}
\ No newline at end of file
+
+	override function copy():EnumValueMap<K, V> {
+		var copied = new EnumValueMap<K, V>();
+		copied.root = root;
+		return copied;
+	}
+}
diff --git a/std/haxe/ds/GenericStack.hx b/std/haxe/ds/GenericStack.hx
index ab0225122ffb111809d940d2b34f37fef9c2b488..253b6f2ca1cd9bc266831748a425f36074f71c35 100644
--- a/std/haxe/ds/GenericStack.hx
+++ b/std/haxe/ds/GenericStack.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,32 +19,66 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 /**
 	A cell of `haxe.ds.GenericStack`.
-  
+
 	@see https://haxe.org/manual/std-GenericStack.html
 **/
 #if (flash || cpp)
 @:generic
 #end
 class GenericCell<T> {
-	public var elt : T;
-	public var next : GenericCell<T>;
-	public function new(elt,next) { this.elt = elt; this.next = next; }
+	public var elt:T;
+	public var next:GenericCell<T>;
+
+	public function new(elt, next) {
+		this.elt = elt;
+		this.next = next;
+	}
 }
 
 #if cpp
 @:generic
-private class GenericStackIterator<T> extends cpp.FastIterator<T> {
-	public var current : GenericCell<T>;
-	override public function hasNext():Bool { return current!=null; }
-	override public function next():T { var result = current.elt; current = current.next; return result; }
+#if cppia
+private class GenericStackIterator<T> {
+	public var current:GenericCell<T>;
+
+	public function hasNext():Bool {
+		return current != null;
+	}
+
+	public function next():T {
+		var result = current.elt;
+		current = current.next;
+		return result;
+	}
 
-	public function new(head) { current = head; }
+	public function new(head) {
+		current = head;
+	}
 }
+#else
+private class GenericStackIterator<T> extends cpp.FastIterator<T> {
+	public var current:GenericCell<T>;
 
+	override public function hasNext():Bool {
+		return current != null;
+	}
+
+	override public function next():T {
+		var result = current.elt;
+		current = current.next;
+		return result;
+	}
+
+	public function new(head) {
+		current = head;
+	}
+}
+#end
 #end
 
 /**
@@ -65,20 +99,18 @@ private class GenericStackIterator<T> extends cpp.FastIterator<T> {
 @:generic
 #end
 class GenericStack<T> {
-
-	public var head : GenericCell<T>;
+	public var head:GenericCell<T>;
 
 	/**
 		Creates a new empty GenericStack.
 	**/
-	public function new() {
-	}
+	public function new() {}
 
 	/**
 		Pushes element `item` onto the stack.
 	**/
-	public inline function add( item : T ) {
-		head = new GenericCell<T>(item,head);
+	public inline function add(item:T) {
+		head = new GenericCell<T>(item, head);
 	}
 
 	/**
@@ -86,8 +118,8 @@ class GenericStack<T> {
 
 		If the stack is empty, null is returned.
 	**/
-	public inline function first() : Null<T> {
-		return if( head == null ) null else head.elt;
+	public inline function first():Null<T> {
+		return if (head == null) null else head.elt;
 	}
 
 	/**
@@ -95,9 +127,9 @@ class GenericStack<T> {
 
 		If the stack is empty, null is returned.
 	**/
-	public inline function pop() : Null<T> {
+	public inline function pop():Null<T> {
 		var k = head;
-		if( k== null )
+		if (k == null)
 			return null;
 		else {
 			head = k.next;
@@ -108,7 +140,7 @@ class GenericStack<T> {
 	/**
 		Tells if the stack is empty.
 	**/
-	public inline function isEmpty() : Bool {
+	public inline function isEmpty():Bool {
 		return (head == null);
 	}
 
@@ -121,12 +153,12 @@ class GenericStack<T> {
 
 		If no matching element is found, false is returned.
 	**/
-	public function remove( v : T ) : Bool {
+	public function remove(v:T):Bool {
 		var prev:GenericCell<T> = null;
 		var l = head;
-		while( l != null ) {
-			if( l.elt == v ) {
-				if( prev == null )
+		while (l != null) {
+			if (l.elt == v) {
+				if (prev == null)
 					head = l.next;
 				else
 					prev.next = l.next;
@@ -139,33 +171,31 @@ class GenericStack<T> {
 	}
 
 	#if cpp
-
 	/**
 		Returns an iterator over the elements of `this` GenericStack.
 	**/
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return new GenericStackIterator<T>(head);
 	}
-
 	#else
 
 	/**
 		Returns an iterator over the elements of `this` GenericStack.
 	**/
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		var l = head;
 		return {
-			hasNext : function() {
+			hasNext: function() {
 				return l != null;
 			},
-			next : function() {
+			next: function() {
 				var k = l;
 				l = k.next;
 				return k.elt;
 			}
 		};
 	}
-   #end
+	#end
 
 	/**
 		Returns a String representation of `this` GenericStack.
@@ -173,11 +203,10 @@ class GenericStack<T> {
 	public function toString() {
 		var a = new Array();
 		var l = head;
-		while( l != null ) {
+		while (l != null) {
 			a.push(l.elt);
 			l = l.next;
 		}
-		return "{"+a.join(",")+"}";
+		return "{" + a.join(",") + "}";
 	}
-
 }
diff --git a/std/haxe/ds/HashMap.hx b/std/haxe/ds/HashMap.hx
index b9af364a1e9d38b21a14428ac87bba8bb2bcb77c..0f6a346b09981bba782606ec19c7a3ea115117a6 100644
--- a/std/haxe/ds/HashMap.hx
+++ b/std/haxe/ds/HashMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 /**
@@ -28,7 +29,7 @@ package haxe.ds;
 
 	@see https://haxe.org/manual/std-Map.html
 **/
-abstract HashMap<K:{ function hashCode():Int; }, V >(HashMapData<K,V>) {
+abstract HashMap<K:{function hashCode():Int;}, V>(HashMapData<K, V>) {
 	/**
 		Creates a new HashMap.
 	**/
@@ -73,19 +74,38 @@ abstract HashMap<K:{ function hashCode():Int; }, V >(HashMapData<K,V>) {
 		return this.keys.iterator();
 	}
 
+	/**
+		See `Map.copy`
+	**/
+	public function copy():HashMap<K, V> {
+		var copied = new HashMapData();
+		copied.keys = this.keys.copy();
+		copied.values = this.values.copy();
+		return cast copied;
+	}
+
 	/**
 		See `Map.iterator`
 	**/
 	public inline function iterator() {
 		return this.values.iterator();
 	}
+
+	/**
+		See `Map.clear`
+	**/
+	public inline function clear():Void {
+		this.keys.clear();
+		this.values.clear();
+	}
 }
 
-private class HashMapData<K:{ function hashCode():Int; },V> {
+private class HashMapData<K:{function hashCode():Int;}, V> {
 	public var keys:IntMap<K>;
 	public var values:IntMap<V>;
+
 	public inline function new() {
 		keys = new IntMap();
 		values = new IntMap();
 	}
-}
\ No newline at end of file
+}
diff --git a/std/haxe/ds/IntMap.hx b/std/haxe/ds/IntMap.hx
index 6090889dd8f0d662c103df5effd4384dfaf49b5a..713eabca11c885294b2bea65da8959807faa3249 100644
--- a/std/haxe/ds/IntMap.hx
+++ b/std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 /**
@@ -28,46 +29,71 @@ package haxe.ds;
 
 	@see https://haxe.org/manual/std-Map.html
 **/
-extern class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
-
+extern class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
 	/**
 		Creates a new IntMap.
 	**/
-	public function new() : Void;
+	public function new():Void;
 
 	/**
 		See `Map.set`
 	**/
-	public function set( key : Int, value : T ) : Void;
+	public function set(key:Int, value:T):Void;
 
 	/**
 		See `Map.get`
 	**/
-	public function get( key : Int ) : Null<T>;
+	public function get(key:Int):Null<T>;
 
 	/**
 		See `Map.exists`
 	**/
-	public function exists( key : Int ) : Bool;
+	public function exists(key:Int):Bool;
 
 	/**
 		See `Map.remove`
 	**/
-	public function remove( key : Int ) : Bool;
+	public function remove(key:Int):Bool;
 
 	/**
 		See `Map.keys`
+
+		(cs, java) Implementation detail: Do not `set()` any new value while
+		iterating, as it may cause a resize, which will break iteration.
 	**/
-	public function keys() : Iterator<Int>;
+	public function keys():Iterator<Int>;
 
 	/**
 		See `Map.iterator`
+
+		(cs, java) Implementation detail: Do not `set()` any new value while
+		iterating, as it may cause a resize, which will break iteration.
+	**/
+	public function iterator():Iterator<T>;
+
+	/**
+		See `Map.keyValueIterator`
+	**/
+	#if eval
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+	#else
+	public function keyValueIterator():KeyValueIterator<Int, T>;
+	#end
+
+	/**
+		See `Map.copy`
 	**/
-	public function iterator() : Iterator<T>;
+	public function copy():IntMap<T>;
 
 	/**
 		See `Map.toString`
 	**/
-	public function toString() : String;
+	public function toString():String;
 
+	/**
+		See `Map.clear`
+	**/
+	public function clear():Void;
 }
diff --git a/std/haxe/ds/List.hx b/std/haxe/ds/List.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8920c93a5dee483f8e3cdb6afb69ce35577bedbe
--- /dev/null
+++ b/std/haxe/ds/List.hx
@@ -0,0 +1,313 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.ds;
+
+/**
+	A linked-list of elements. The list is composed of element container objects
+	that are chained together. It is optimized so that adding or removing an
+	element does not imply copying the whole list content every time.
+
+	@see https://haxe.org/manual/std-List.html
+**/
+class List<T> {
+	private var h:ListNode<T>;
+	private var q:ListNode<T>;
+
+	/**
+		The length of `this` List.
+	**/
+	public var length(default, null):Int;
+
+	/**
+		Creates a new empty list.
+	**/
+	public function new() {
+		length = 0;
+	}
+
+	/**
+		Adds element `item` at the end of `this` List.
+
+		`this.length` increases by 1.
+	**/
+	public function add(item:T) {
+		var x = ListNode.create(item, null);
+		if (h == null)
+			h = x;
+		else
+			q.next = x;
+		q = x;
+		length++;
+	}
+
+	/**
+		Adds element `item` at the beginning of `this` List.
+
+		`this.length` increases by 1.
+	**/
+	public function push(item:T) {
+		var x = ListNode.create(item, h);
+		h = x;
+		if (q == null)
+			q = x;
+		length++;
+	}
+
+	/**
+		Returns the first element of `this` List, or null if no elements exist.
+
+		This function does not modify `this` List.
+	**/
+	public function first():Null<T> {
+		return if (h == null) null else h.item;
+	}
+
+	/**
+		Returns the last element of `this` List, or null if no elements exist.
+
+		This function does not modify `this` List.
+	**/
+	public function last():Null<T> {
+		return if (q == null) null else q.item;
+	}
+
+	/**
+		Returns the first element of `this` List, or null if no elements exist.
+
+		The element is removed from `this` List.
+	**/
+	public function pop():Null<T> {
+		if (h == null)
+			return null;
+		var x = h.item;
+		h = h.next;
+		if (h == null)
+			q = null;
+		length--;
+		return x;
+	}
+
+	/**
+		Tells if `this` List is empty.
+	**/
+	public function isEmpty():Bool {
+		return (h == null);
+	}
+
+	/**
+		Empties `this` List.
+
+		This function does not traverse the elements, but simply sets the
+		internal references to null and `this.length` to 0.
+	**/
+	public function clear():Void {
+		h = null;
+		q = null;
+		length = 0;
+	}
+
+	/**
+		Removes the first occurrence of `v` in `this` List.
+
+		If `v` is found by checking standard equality, it is removed from `this`
+		List and the function returns true.
+
+		Otherwise, false is returned.
+	**/
+	public function remove(v:T):Bool {
+		var prev:ListNode<T> = null;
+		var l = h;
+		while (l != null) {
+			if (l.item == v) {
+				if (prev == null)
+					h = l.next;
+				else
+					prev.next = l.next;
+				if (q == l)
+					q = prev;
+				length--;
+				return true;
+			}
+			prev = l;
+			l = l.next;
+		}
+		return false;
+	}
+
+	/**
+		Returns an iterator on the elements of the list.
+	**/
+	public inline function iterator():ListIterator<T> {
+		return new ListIterator<T>(h);
+	}
+
+	/**
+		Returns an iterator of the List indices and values.
+	**/
+	@:pure @:runtime public inline function keyValueIterator():ListKeyValueIterator<T> {
+		return new ListKeyValueIterator(h);
+	}
+
+	/**
+		Returns a string representation of `this` List.
+
+		The result is enclosed in { } with the individual elements being
+		separated by a comma.
+	**/
+	public function toString() {
+		var s = new StringBuf();
+		var first = true;
+		var l = h;
+		s.add("{");
+		while (l != null) {
+			if (first)
+				first = false;
+			else
+				s.add(", ");
+			s.add(Std.string(l.item));
+			l = l.next;
+		}
+		s.add("}");
+		return s.toString();
+	}
+
+	/**
+		Returns a string representation of `this` List, with `sep` separating
+		each element.
+	**/
+	public function join(sep:String) {
+		var s = new StringBuf();
+		var first = true;
+		var l = h;
+		while (l != null) {
+			if (first)
+				first = false;
+			else
+				s.add(sep);
+			s.add(l.item);
+			l = l.next;
+		}
+		return s.toString();
+	}
+
+	/**
+		Returns a list filtered with `f`. The returned list will contain all
+		elements for which `f(x) == true`.
+	**/
+	public function filter(f:T->Bool) {
+		var l2 = new List();
+		var l = h;
+		while (l != null) {
+			var v = l.item;
+			l = l.next;
+			if (f(v))
+				l2.add(v);
+		}
+		return l2;
+	}
+
+	/**
+		Returns a new list where all elements have been converted by the
+		function `f`.
+	**/
+	public function map<X>(f:T->X):List<X> {
+		var b = new List();
+		var l = h;
+		while (l != null) {
+			var v = l.item;
+			l = l.next;
+			b.add(f(v));
+		}
+		return b;
+	}
+}
+
+#if neko
+private extern class ListNode<T> extends neko.NativeArray<Dynamic> {
+	var item(get, set):T;
+	var next(get, set):ListNode<T>;
+	private inline function get_item():T
+		return this[0];
+	private inline function set_item(v:T):T
+		return this[0] = v;
+	private inline function get_next():ListNode<T>
+		return this[1];
+	private inline function set_next(v:ListNode<T>):ListNode<T>
+		return this[1] = v;
+	inline static function create<T>(item:T, next:ListNode<T>):ListNode<T> {
+		return untyped __dollar__array(item, next);
+	}
+}
+#else
+private class ListNode<T> {
+	public var item:T;
+	public var next:ListNode<T>;
+
+	public function new(item:T, next:ListNode<T>) {
+		this.item = item;
+		this.next = next;
+	}
+
+	extern public inline static function create<T>(item:T, next:ListNode<T>):ListNode<T> {
+		return new ListNode(item, next);
+	}
+}
+#end
+
+private class ListIterator<T> {
+	var head:ListNode<T>;
+
+	public inline function new(head:ListNode<T>) {
+		this.head = head;
+	}
+
+	public inline function hasNext():Bool {
+		return head != null;
+	}
+
+	public inline function next():T {
+		var val = head.item;
+		head = head.next;
+		return val;
+	}
+}
+
+private class ListKeyValueIterator<T> {
+	var idx:Int;
+	var head:ListNode<T>;
+
+	public inline function new(head:ListNode<T>) {
+		this.head = head;
+		this.idx = 0;
+	}
+
+	public inline function hasNext():Bool {
+		return head != null;
+	}
+
+	public inline function next():{key:Int, value:T} {
+		var val = head.item;
+		head = head.next;
+		return {value: val, key: idx++};
+	}
+}
diff --git a/std/haxe/ds/ListSort.hx b/std/haxe/ds/ListSort.hx
index a1f76afa197d68d76d7b855be7af2390b397cc82..82710c746a7babf7372dee5a92d1623d350ad52d 100644
--- a/std/haxe/ds/ListSort.hx
+++ b/std/haxe/ds/ListSort.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,7 +27,6 @@ package haxe.ds;
 	method. It has a O(N.log(N)) complexity and does not require additional memory allocation.
 **/
 class ListSort {
-
 	// Note : we prefer [inline] over [@:generic] here since we want to inline the comparison function as well
 
 	/**
@@ -40,33 +39,34 @@ class ListSort {
 
 		If `list` or `cmp` are null, the result is unspecified.
 	**/
-	public static inline function sort<T:{prev:T,next:T}>(list:T, cmp : T -> T -> Int) : T {
+	public static inline function sort<T:{prev:T, next:T}>(list:T, cmp:T->T->Int):T {
 		// ported from http://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html
-		if( list == null )
+		if (list == null)
 			return null;
 		var insize = 1, nmerges, psize = 0, qsize = 0;
-		var p, q, e, tail : T = null;
-		while( true ) {
+		var p, q, e, tail:T = null;
+		while (true) {
 			p = list;
 			list = null;
 			tail = null;
 			nmerges = 0;
-			while( p != null ) {
+			while (p != null) {
 				nmerges++;
 				q = p;
 				psize = 0;
-				for( i in 0...insize ) {
+				for (i in 0...insize) {
 					psize++;
 					q = q.next;
-					if( q == null ) break;
+					if (q == null)
+						break;
 				}
 				qsize = insize;
-				while( psize > 0 || (qsize > 0 && q != null) ) {
-					if( psize == 0 ) {
+				while (psize > 0 || (qsize > 0 && q != null)) {
+					if (psize == 0) {
 						e = q;
 						q = q.next;
 						qsize--;
-					} else if( qsize == 0 || q == null || cmp(p,q) <= 0 ) {
+					} else if (qsize == 0 || q == null || cmp(p, q) <= 0) {
 						e = p;
 						p = p.next;
 						psize--;
@@ -75,7 +75,7 @@ class ListSort {
 						q = q.next;
 						qsize--;
 					}
-					if( tail != null )
+					if (tail != null)
 						tail.next = e;
 					else
 						list = e;
@@ -85,7 +85,7 @@ class ListSort {
 				p = q;
 			}
 			tail.next = null;
-			if( nmerges <= 1 )
+			if (nmerges <= 1)
 				break;
 			insize *= 2;
 		}
@@ -93,36 +93,36 @@ class ListSort {
 		return list;
 	}
 
-
 	/**
 		Same as `sort` but on single linked list.
 	**/
-	public static inline function sortSingleLinked<T:{next:T}>(list:T, cmp : T -> T -> Int) : T {
-		if( list == null )
+	public static inline function sortSingleLinked<T:{next:T}>(list:T, cmp:T->T->Int):T {
+		if (list == null)
 			return null;
 		var insize = 1, nmerges, psize = 0, qsize = 0;
-		var p, q, e, tail : T;
-		while( true ) {
+		var p, q, e, tail:T;
+		while (true) {
 			p = list;
 			list = null;
 			tail = null;
 			nmerges = 0;
-			while( p != null ) {
+			while (p != null) {
 				nmerges++;
 				q = p;
 				psize = 0;
-				for( i in 0...insize ) {
+				for (i in 0...insize) {
 					psize++;
 					q = q.next;
-					if( q == null ) break;
+					if (q == null)
+						break;
 				}
 				qsize = insize;
-				while( psize > 0 || (qsize > 0 && q != null) ) {
-					if( psize == 0 ) {
+				while (psize > 0 || (qsize > 0 && q != null)) {
+					if (psize == 0) {
 						e = q;
 						q = q.next;
 						qsize--;
-					} else if( qsize == 0 || q == null || cmp(p,q) <= 0 ) {
+					} else if (qsize == 0 || q == null || cmp(p, q) <= 0) {
 						e = p;
 						p = p.next;
 						psize--;
@@ -131,7 +131,7 @@ class ListSort {
 						q = q.next;
 						qsize--;
 					}
-					if( tail != null )
+					if (tail != null)
 						tail.next = e;
 					else
 						list = e;
@@ -140,11 +140,10 @@ class ListSort {
 				p = q;
 			}
 			tail.next = null;
-			if( nmerges <= 1 )
+			if (nmerges <= 1)
 				break;
 			insize *= 2;
 		}
 		return list;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/haxe/ds/Map.hx b/std/haxe/ds/Map.hx
new file mode 100644
index 0000000000000000000000000000000000000000..db4e0b5c7e4a2e5caf9a557ebe72a4b051949029
--- /dev/null
+++ b/std/haxe/ds/Map.hx
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.ds;
+
+import haxe.ds.StringMap;
+import haxe.ds.IntMap;
+import haxe.ds.HashMap;
+import haxe.ds.ObjectMap;
+import haxe.ds.WeakMap;
+import haxe.ds.EnumValueMap;
+import haxe.Constraints.IMap;
+
+/**
+	Map allows key to value mapping for arbitrary value types, and many key
+	types.
+
+	This is a multi-type abstract, it is instantiated as one of its
+	specialization types depending on its type parameters.
+
+	A Map can be instantiated without explicit type parameters. Type inference
+	will then determine the type parameters from the usage.
+
+	Maps can also be created with `[key1 => value1, key2 => value2]` syntax.
+
+	Map is an abstract type, it is not available at runtime.
+
+	@see https://haxe.org/manual/std-Map.html
+**/
+@:multiType(@:followWithAbstracts K)
+abstract Map<K, V>(IMap<K, V>) {
+	/**
+		Creates a new Map.
+
+		This becomes a constructor call to one of the specialization types in
+		the output. The rules for that are as follows:
+
+		1. if `K` is a `String`, `haxe.ds.StringMap` is used
+		2. if `K` is an `Int`, `haxe.ds.IntMap` is used
+		3. if `K` is an `EnumValue`, `haxe.ds.EnumValueMap` is used
+		4. if `K` is any other class or structure, `haxe.ds.ObjectMap` is used
+		5. if `K` is any other type, it causes a compile-time error
+
+		(Cpp) Map does not use weak keys on `ObjectMap` by default.
+	**/
+	public function new();
+
+	/**
+		Maps `key` to `value`.
+
+		If `key` already has a mapping, the previous value disappears.
+
+		If `key` is `null`, the result is unspecified.
+	**/
+	public inline function set(key:K, value:V)
+		this.set(key, value);
+
+	/**
+		Returns the current mapping of `key`.
+
+		If no such mapping exists, `null` is returned.
+
+		Note that a check like `map.get(key) == null` can hold for two reasons:
+
+		1. the map has no mapping for `key`
+		2. the map has a mapping with a value of `null`
+
+		If it is important to distinguish these cases, `exists()` should be
+		used.
+
+		If `key` is `null`, the result is unspecified.
+	**/
+	@:arrayAccess public inline function get(key:K)
+		return this.get(key);
+
+	/**
+		Returns true if `key` has a mapping, false otherwise.
+
+		If `key` is `null`, the result is unspecified.
+	**/
+	public inline function exists(key:K)
+		return this.exists(key);
+
+	/**
+		Removes the mapping of `key` and returns true if such a mapping existed,
+		false otherwise.
+
+		If `key` is `null`, the result is unspecified.
+	**/
+	public inline function remove(key:K)
+		return this.remove(key);
+
+	/**
+		Returns an Iterator over the keys of `this` Map.
+
+		The order of keys is undefined.
+	**/
+	public inline function keys():Iterator<K> {
+		return this.keys();
+	}
+
+	/**
+		Returns an Iterator over the values of `this` Map.
+
+		The order of values is undefined.
+	**/
+	public inline function iterator():Iterator<V> {
+		return this.iterator();
+	}
+
+	/**
+		Returns an Iterator over the keys and values of `this` Map.
+
+		The order of values is undefined.
+	**/
+	public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return this.keyValueIterator();
+	}
+
+	/**
+		Returns a shallow copy of `this` map.
+
+		The order of values is undefined.
+	**/
+	public inline function copy():Map<K, V> {
+		return cast this.copy();
+	}
+
+	/**
+		Returns a String representation of `this` Map.
+
+		The exact representation depends on the platform and key-type.
+	**/
+	public inline function toString():String {
+		return this.toString();
+	}
+
+	/**
+		Removes all keys from `this` Map.
+	**/
+	public inline function clear():Void {
+		this.clear();
+	}
+
+	@:arrayAccess @:noCompletion public inline function arrayWrite(k:K, v:V):V {
+		this.set(k, v);
+		return v;
+	}
+
+	@:to static inline function toStringMap<K:String, V>(t:IMap<K, V>):StringMap<V> {
+		return new StringMap<V>();
+	}
+
+	@:to static inline function toIntMap<K:Int, V>(t:IMap<K, V>):IntMap<V> {
+		return new IntMap<V>();
+	}
+
+	@:to static inline function toEnumValueMapMap<K:EnumValue, V>(t:IMap<K, V>):EnumValueMap<K, V> {
+		return new EnumValueMap<K, V>();
+	}
+
+	@:to static inline function toObjectMap<K:{}, V>(t:IMap<K, V>):ObjectMap<K, V> {
+		return new ObjectMap<K, V>();
+	}
+
+	@:from static inline function fromStringMap<V>(map:StringMap<V>):Map<String, V> {
+		return cast map;
+	}
+
+	@:from static inline function fromIntMap<V>(map:IntMap<V>):Map<Int, V> {
+		return cast map;
+	}
+
+	@:from static inline function fromObjectMap<K:{}, V>(map:ObjectMap<K, V>):Map<K, V> {
+		return cast map;
+	}
+}
diff --git a/std/haxe/ds/ObjectMap.hx b/std/haxe/ds/ObjectMap.hx
index ad55de84d8ab13f95322a9d843a206ee178fe1be..ae613db8ce38140e620f72867010e36303e3b7a7 100644
--- a/std/haxe/ds/ObjectMap.hx
+++ b/std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package haxe.ds;
 
 	@see https://haxe.org/manual/std-Map.html
 **/
-extern class ObjectMap < K: { }, V > implements haxe.Constraints.IMap<K,V> {
-
+extern class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
 	/**
 		Creates a new ObjectMap.
 	**/
@@ -61,16 +60,43 @@ extern class ObjectMap < K: { }, V > implements haxe.Constraints.IMap<K,V> {
 
 	/**
 		See `Map.keys`
+
+		(cs, java) Implementation detail: Do not `set()` any new value while
+		iterating, as it may cause a resize, which will break iteration.
 	**/
 	public function keys():Iterator<K>;
 
 	/**
 		See `Map.iterator`
+
+		(cs, java) Implementation detail: Do not `set()` any new value while
+		iterating, as it may cause a resize, which will break iteration.
 	**/
 	public function iterator():Iterator<V>;
 
+	/**
+		See `Map.keyValueIterator`
+	**/
+	#if eval
+	@:runtime public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+	#else
+	public function keyValueIterator():KeyValueIterator<K, V>;
+	#end
+
+	/**
+		See `Map.copy`
+	**/
+	public function copy():ObjectMap<K, V>;
+
 	/**
 		See `Map.toString`
 	**/
 	public function toString():String;
-}
\ No newline at end of file
+
+	/**
+		See `Map.clear`
+	**/
+	public function clear():Void;
+}
diff --git a/std/haxe/ds/Option.hx b/std/haxe/ds/Option.hx
index 69037fcda1cd660dec9bf376a4f8afd0e91f7ba4..060b5b6e59abcdc5b931bc95e1971090bf13471a 100644
--- a/std/haxe/ds/Option.hx
+++ b/std/haxe/ds/Option.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,4 +31,4 @@ package haxe.ds;
 enum Option<T> {
 	Some(v:T);
 	None;
-}
\ No newline at end of file
+}
diff --git a/std/haxe/ds/ReadOnlyArray.hx b/std/haxe/ds/ReadOnlyArray.hx
new file mode 100644
index 0000000000000000000000000000000000000000..86197bc6e033b9b7e3852e1d038a5793496ac036
--- /dev/null
+++ b/std/haxe/ds/ReadOnlyArray.hx
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.ds;
+
+/**
+	`ReadOnlyArray` is an abstract over an ordinary `Array` which only exposes
+	APIs that don't modify the instance, hence "read-only".
+
+	Note that this doesn't necessarily mean that the instance is *immutable*.
+	Other code holding a reference to the underlying `Array` can still modify it,
+	and the reference can be obtained with a `cast`.
+**/
+@:forward(concat, copy, filter, indexOf, iterator, join, lastIndexOf, map, slice, toString)
+abstract ReadOnlyArray<T>(Array<T>) from Array<T> {
+	/**
+		The length of `this` Array.
+	**/
+	public var length(get, never):Int;
+
+	inline function get_length()
+		return this.length;
+
+	@:arrayAccess inline function get(i:Int)
+		return this[i];
+}
diff --git a/std/haxe/ds/StringMap.hx b/std/haxe/ds/StringMap.hx
index ab321c3aca56ff97de49778d9d2af653c33bd5f7..708fb619abb5f02d29e27f4f26e236839efcd110 100644
--- a/std/haxe/ds/StringMap.hx
+++ b/std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,46 +29,71 @@ package haxe.ds;
 
 	@see https://haxe.org/manual/std-Map.html
 **/
-extern class StringMap<T> implements haxe.Constraints.IMap<String,T> {
-
+extern class StringMap<T> implements haxe.Constraints.IMap<String, T> {
 	/**
 		Creates a new StringMap.
 	**/
-	public function new() : Void;
+	public function new():Void;
 
 	/**
 		See `Map.set`
 	**/
-	public function set( key : String, value : T ) : Void;
+	public function set(key:String, value:T):Void;
 
 	/**
 		See `Map.get`
 	**/
-	public function get( key : String ) : Null<T>;
+	public function get(key:String):Null<T>;
 
 	/**
 		See `Map.exists`
 	**/
-	public function exists( key : String ) : Bool;
+	public function exists(key:String):Bool;
 
 	/**
 		See `Map.remove`
 	**/
-	public function remove( key : String ) : Bool;
+	public function remove(key:String):Bool;
 
 	/**
 		See `Map.keys`
+
+		(cs, java) Implementation detail: Do not `set()` any new value while
+		iterating, as it may cause a resize, which will break iteration.
 	**/
-	public function keys() : Iterator<String>;
+	public function keys():Iterator<String>;
 
 	/**
 		See `Map.iterator`
+
+		(cs, java) Implementation detail: Do not `set()` any new value while
+		iterating, as it may cause a resize, which will break iteration.
+	**/
+	public function iterator():Iterator<T>;
+
+	/**
+		See `Map.keyValueIterator`
 	**/
-	public function iterator() : Iterator<T>;
+	#if eval
+	@:runtime public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+	#else
+	public function keyValueIterator():KeyValueIterator<String, T>;
+	#end
+
+	/**
+		See `Map.copy`
+	**/
+	public function copy():StringMap<T>;
 
 	/**
 		See `Map.toString`
 	**/
-	public function toString() : String;
+	public function toString():String;
 
+	/**
+		See `Map.clear`
+	**/
+	public function clear():Void;
 }
diff --git a/std/haxe/ds/Vector.hx b/std/haxe/ds/Vector.hx
index 20ddd11dca2e1f54bcbbb5b8a4a1958f1b73b052..50eff3a974b412bc41266e192198e487d4c38b96 100644
--- a/std/haxe/ds/Vector.hx
+++ b/std/haxe/ds/Vector.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,25 +19,29 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 #if cpp
 using cpp.NativeArray;
 #end
 
-private typedef VectorData<T> = #if flash10
+private typedef VectorData<T> =
+	#if flash10
 	flash.Vector<T>
-#elseif neko
+	#elseif neko
 	neko.NativeArray<T>
-#elseif cs
+	#elseif cs
 	cs.NativeArray<T>
-#elseif java
+	#elseif java
 	java.NativeArray<T>
-#elseif lua
-    lua.Table<Int,T>
-#else
+	#elseif lua
+	lua.Table<Int, T>
+	#elseif eval
+	eval.Vector<T>
+	#else
 	Array<T>
-#end
+	#end
 
 /**
 	A Vector is a storage of fixed size. It can be faster than Array on some
@@ -59,24 +63,26 @@ abstract Vector<T>(VectorData<T>) {
 	**/
 	public inline function new(length:Int) {
 		#if flash10
-			this = new flash.Vector<T>(length, true);
+		this = new flash.Vector<T>(length, true);
 		#elseif neko
-			this = untyped __dollar__amake(length);
+		this = untyped __dollar__amake(length);
 		#elseif js
-			this = untyped __new__(Array, length);
+		this = js.Syntax.construct(Array, length);
 		#elseif cs
-			this = new cs.NativeArray(length);
+		this = new cs.NativeArray(length);
 		#elseif java
-			this = new java.NativeArray(length);
+		this = new java.NativeArray(length);
 		#elseif cpp
-			this = NativeArray.create(length);
+		this = NativeArray.create(length);
 		#elseif python
-			this = python.Syntax.pythonCode("[{0}]*{1}", null, length);
+		this = python.Syntax.code("[{0}]*{1}", null, length);
 		#elseif lua
-			this = untyped __lua_table__({length:length});
+		this = untyped __lua_table__({length: length});
+		#elseif eval
+		this = new eval.Vector(length);
 		#else
-			this = [];
-			untyped this.length = length;
+		this = [];
+		untyped this.length = length;
 		#end
 	}
 
@@ -91,6 +97,8 @@ abstract Vector<T>(VectorData<T>) {
 		return this.unsafeGet(index);
 		#elseif python
 		return python.internal.ArrayImpl.unsafeGet(this, index);
+		#elseif eval
+		return this[index];
 		#else
 		return this[index];
 		#end
@@ -104,9 +112,11 @@ abstract Vector<T>(VectorData<T>) {
 	**/
 	@:op([]) public inline function set(index:Int, val:T):T {
 		#if cpp
-		return this.unsafeSet(index,val);
+		return this.unsafeSet(index, val);
 		#elseif python
 		return python.internal.ArrayImpl.unsafeSet(this, index, val);
+		#elseif eval
+		return this[index] = val;
 		#else
 		return this[index] = val;
 		#end
@@ -119,15 +129,15 @@ abstract Vector<T>(VectorData<T>) {
 
 	inline function get_length():Int {
 		#if neko
-			return untyped __dollar__asize(this);
+		return untyped __dollar__asize(this);
 		#elseif cs
-			return this.Length;
+		return this.Length;
 		#elseif java
-			return this.length;
+		return this.length;
 		#elseif python
-			return this.length;
+		return this.length;
 		#else
-			return untyped this.length;
+		return untyped this.length;
 		#end
 	}
 
@@ -138,63 +148,67 @@ abstract Vector<T>(VectorData<T>) {
 		The results are unspecified if `length` results in out-of-bounds access,
 		or if `src` or `dest` are null
 	**/
-	public static #if (cs || java || neko || cpp) inline #end function blit<T>(src:Vector<T>, srcPos:Int, dest:Vector<T>, destPos:Int, len:Int):Void
-	{
+	public static #if (cs || java || neko || cpp || eval) inline #end function blit<T>(src:Vector<T>, srcPos:Int, dest:Vector<T>, destPos:Int, len:Int):Void {
 		#if neko
-			untyped __dollar__ablit(dest,destPos,src,srcPos,len);
+		untyped __dollar__ablit(dest, destPos, src, srcPos, len);
 		#elseif java
-			java.lang.System.arraycopy(src, srcPos, dest, destPos, len);
+		java.lang.System.arraycopy(src, srcPos, dest, destPos, len);
 		#elseif cs
-			cs.system.Array.Copy(cast src, srcPos,cast dest, destPos, len);
+		cs.system.Array.Copy(cast src, srcPos, cast dest, destPos, len);
 		#elseif cpp
-			dest.toData().blit(destPos,src.toData(), srcPos,len);
+		dest.toData().blit(destPos, src.toData(), srcPos, len);
+		#elseif eval
+		src.toData().blit(srcPos, dest.toData(), destPos, len);
 		#else
-			if (src == dest) {
-				if (srcPos < destPos) {
-					var i = srcPos + len;
-					var j = destPos + len;
-					for (k in 0...len) {
-						i--;
-						j--;
-						src[j] = src[i];
-					}
-				} else if (srcPos > destPos) {
-					var i = srcPos;
-					var j = destPos;
-					for (k in 0...len) {
-						src[j] = src[i];
-						i++;
-						j++;
-					}
+		if (src == dest) {
+			if (srcPos < destPos) {
+				var i = srcPos + len;
+				var j = destPos + len;
+				for (k in 0...len) {
+					i--;
+					j--;
+					src[j] = src[i];
 				}
-			} else {
-				for (i in 0...len) {
-					dest[destPos + i] = src[srcPos + i];
+			} else if (srcPos > destPos) {
+				var i = srcPos;
+				var j = destPos;
+				for (k in 0...len) {
+					src[j] = src[i];
+					i++;
+					j++;
 				}
 			}
+		} else {
+			for (i in 0...len) {
+				dest[destPos + i] = src[srcPos + i];
+			}
+		}
 		#end
 	}
 
 	/**
 		Creates a new Array, copy the content from the Vector to it, and returns it.
 	**/
-	public #if (flash || cpp || js || java) inline #end function toArray():Array<T> {
+	public #if (flash || cpp || js || java || eval) inline #end function toArray():Array<T> {
 		#if cpp
-			return this.copy();
+		return this.copy();
 		#elseif python
-			return this.copy();
+		return this.copy();
 		#elseif js
-			return this.slice(0);
+		return this.slice(0);
+		#elseif eval
+		return this.toArray();
 		#else
-			var a = new Array();
-			var len = length;
-			#if (neko)
-			// prealloc good size
-			if( len > 0 ) a[len - 1] = get(0);
-			#end
-			for( i in 0...len )
-				a[i] = get(i);
-			return a;
+		var a = new Array();
+		var len = length;
+		#if (neko)
+		// prealloc good size
+		if (len > 0)
+			a[len - 1] = get(0);
+		#end
+		for (i in 0...len)
+			a[i] = get(i);
+		return a;
 		#end
 	}
 
@@ -227,20 +241,24 @@ abstract Vector<T>(VectorData<T>) {
 
 		If `array` is null, the result is unspecified.
 	**/
-	#if as3 @:extern #end
+	#if as3
+	extern
+	#end
 	static public inline function fromArrayCopy<T>(array:Array<T>):Vector<T> {
 		#if python
 		return cast array.copy();
 		#elseif flash10
 		return fromData(flash.Vector.ofArray(array));
 		#elseif java
-		return fromData(java.Lib.nativeArray(array,false));
+		return fromData(java.Lib.nativeArray(array, false));
 		#elseif cs
-		return fromData(cs.Lib.nativeArray(array,false));
+		return fromData(cs.Lib.nativeArray(array, false));
 		#elseif cpp
 		return cast array.copy();
 		#elseif js
 		return fromData(array.slice(0));
+		#elseif eval
+		return fromData(eval.Vector.fromArrayCopy(array));
 		#else
 		// TODO: Optimize this for others?
 		var vec = new Vector<T>(array.length);
@@ -257,10 +275,14 @@ abstract Vector<T>(VectorData<T>) {
 		`a[i] == a.copy()[i]` is true for any valid `i`. However,
 		`a == a.copy()` is always false.
 	**/
-	#if cs @:extern #end public inline function copy<T>():Vector<T> {
+	#if cs extern #end public inline function copy<T>():Vector<T> {
+		#if eval
+		return fromData(this.copy());
+		#else
 		var r = new Vector<T>(length);
 		Vector.blit(cast this, 0, r, 0, length);
 		return r;
+		#end
 	}
 
 	/**
@@ -276,16 +298,15 @@ abstract Vector<T>(VectorData<T>) {
 
 		If `sep` is null, the result is unspecified.
 	**/
-	#if cs @:extern #end public inline function join<T>(sep:String):String {
-		#if (flash10||cpp)
+	#if cs extern #end public inline function join<T>(sep:String):String {
+		#if (flash10 || cpp || eval)
 		return this.join(sep);
 		#else
 		var b = new StringBuf();
-		var i = 0;
 		var len = length;
-		for(i in 0...len) {
-			b.add( Std.string(get(i)) );
-			if(i < len-1) {
+		for (i in 0...len) {
+			b.add(Std.string(get(i)));
+			if (i < len - 1) {
 				b.add(sep);
 			}
 		}
@@ -300,16 +321,19 @@ abstract Vector<T>(VectorData<T>) {
 
 		If `f` is null, the result is unspecified.
 	**/
-	#if cs @:extern #end public inline function map<S>(f:T->S):Vector<S> {
+	#if cs extern #end public inline function map<S>(f:T->S):Vector<S> {
+		#if eval
+		return fromData(this.map(f));
+		#else
 		var length = length;
 		var r = new Vector<S>(length);
-		var i = 0;
 		var len = length;
-		for(i in 0...len) {
+		for (i in 0...len) {
 			var v = f(get(i));
 			r.set(i, v);
 		}
 		return r;
+		#end
 	}
 
 	/**
@@ -325,7 +349,7 @@ abstract Vector<T>(VectorData<T>) {
 		If `f` is null, the result is unspecified.
 	**/
 	public inline function sort<T>(f:T->T->Int):Void {
-		#if (neko || cs || java)
+		#if (neko || cs || java || eval)
 		throw "not yet supported";
 		#elseif lua
 		haxe.ds.ArraySort.sort(cast this, f);
diff --git a/std/haxe/ds/WeakMap.hx b/std/haxe/ds/WeakMap.hx
index eaf983faa4ad63b3de59f46e7e60a67a5b39b110..8b20c48090d420851251065c95f7ca6db43d4e97 100644
--- a/std/haxe/ds/WeakMap.hx
+++ b/std/haxe/ds/WeakMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,8 +31,7 @@ package haxe.ds;
 
 	@see https://haxe.org/manual/std-Map.html
 **/
-class WeakMap<K: { },V> implements haxe.Constraints.IMap<K,V> {
-
+class WeakMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
 	/**
 		Creates a new WeakMap.
 	**/
@@ -43,8 +42,7 @@ class WeakMap<K: { },V> implements haxe.Constraints.IMap<K,V> {
 	/**
 		See `Map.set`
 	**/
-	public function set(key:K, value:V):Void {
-	}
+	public function set(key:K, value:V):Void {}
 
 	/**
 		See `Map.get`
@@ -81,10 +79,29 @@ class WeakMap<K: { },V> implements haxe.Constraints.IMap<K,V> {
 		return null;
 	}
 
+	/**
+		See `Map.keyValueIterator`
+	**/
+	public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return null;
+	}
+
+	/**
+		See `Map.copy`
+	**/
+	public function copy():WeakMap<K, V> {
+		return null;
+	}
+
 	/**
 		See `Map.toString`
 	**/
 	public function toString():String {
 		return null;
 	}
-}
\ No newline at end of file
+
+	/**
+		See `Map.clear`
+	**/
+	public function clear():Void {}
+}
diff --git a/std/haxe/extern/AsVar.hx b/std/haxe/extern/AsVar.hx
index 3e95a1c5807ccf54006388c66f1042a6792ea2b7..c4990764efee7613381648e5320a1ae09956cd07 100644
--- a/std/haxe/extern/AsVar.hx
+++ b/std/haxe/extern/AsVar.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,5 +27,5 @@ package haxe.extern;
 	argument expressions are bound to a local variable.
 **/
 @:forward
-@:analyzer(as_var)
-abstract AsVar<T>(T) from T to T {}
\ No newline at end of file
+@:semantics(variable)
+abstract AsVar<T>(T) from T to T {}
diff --git a/std/haxe/extern/EitherType.hx b/std/haxe/extern/EitherType.hx
index 264bb1b4b4e3027c55da3c79cb2f6c8280c5c03c..5b57b77f622f335acf731e4cf767e9092776fea7 100644
--- a/std/haxe/extern/EitherType.hx
+++ b/std/haxe/extern/EitherType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.extern;
 
 /**
@@ -29,7 +30,7 @@ package haxe.extern;
 	such as JavaScript or Python.
 
 	Otherwise, use of this type is discouraged.
-	
+
 	@see <https://haxe.org/manual/lf-externs.html>
 **/
-abstract EitherType<T1,T2>(Dynamic) from T1 to T1 from T2 to T2 {}
+abstract EitherType<T1, T2>(Dynamic) from T1 to T1 from T2 to T2 {}
diff --git a/std/haxe/extern/Rest.hx b/std/haxe/extern/Rest.hx
index f15328a8608997d4674669552542c118600ad041..2aba9b223434f812fe2eeaa6a68f8d3c4f9a1314 100644
--- a/std/haxe/extern/Rest.hx
+++ b/std/haxe/extern/Rest.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,7 +28,7 @@ package haxe.extern;
 	Should be used as a type for the last argument of an extern method,
 	representing that arbitrary number of arguments of given type can be
 	passed to that method.
-	
+
 	@see <https://haxe.org/manual/lf-externs.html>
 **/
 abstract Rest<T>(Array<T>) {}
diff --git a/std/haxe/format/JsonParser.hx b/std/haxe/format/JsonParser.hx
index 9ba569c55c46089161a7236bdc6e0ae79b9c9fdd..e01b5c7c59ff7ca9d6ee30124130ba6fbd2aae5e 100644
--- a/std/haxe/format/JsonParser.hx
+++ b/std/haxe/format/JsonParser.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.format;
 
 /**
@@ -30,7 +31,6 @@ package haxe.format;
 	@see https://haxe.org/manual/std-Json-parsing.html
 **/
 class JsonParser {
-
 	/**
 		Parses given JSON-encoded `str` and returns the resulting object.
 
@@ -41,217 +41,280 @@ class JsonParser {
 
 		If `str` is null, the result is unspecified.
 	**/
-	static public inline function parse(str : String) : Dynamic {
-		return new JsonParser(str).parseRec();
+	static public inline function parse(str:String):Dynamic {
+		return new JsonParser(str).doParse();
 	}
 
-	var str : String;
-	var pos : Int;
+	var str:String;
+	var pos:Int;
 
-	function new( str : String ) {
+	function new(str:String) {
 		this.str = str;
 		this.pos = 0;
 	}
 
-	function parseRec() : Dynamic {
-		while( true ) {
+	function doParse():Dynamic {
+		var result = parseRec();
+		var c;
+		while (!StringTools.isEof(c = nextChar())) {
+			switch (c) {
+				case ' '.code, '\r'.code, '\n'.code, '\t'.code:
+				// allow trailing whitespace
+				default:
+					invalidChar();
+			}
+		}
+		return result;
+	}
+
+	function parseRec():Dynamic {
+		while (true) {
 			var c = nextChar();
-			switch( c ) {
-			case ' '.code, '\r'.code, '\n'.code, '\t'.code:
+			switch (c) {
+				case ' '.code, '\r'.code, '\n'.code, '\t'.code:
 				// loop
-			case '{'.code:
-				var obj = {}, field = null, comma : Null<Bool> = null;
-				while( true ) {
-					var c = nextChar();
-					switch( c ) {
-					case ' '.code, '\r'.code, '\n'.code, '\t'.code:
-						// loop
-					case '}'.code:
-						if( field != null || comma == false )
-							invalidChar();
-						return obj;
-					case ':'.code:
-						if( field == null )
-							invalidChar();
-						Reflect.setField(obj,field,parseRec());
-						field = null;
-						comma = true;
-					case ','.code:
-						if( comma ) comma = false else invalidChar();
-					case '"'.code:
-						if( comma ) invalidChar();
-						field = parseString();
-					default:
+				case '{'.code:
+					var obj = {}, field = null, comma:Null<Bool> = null;
+					while (true) {
+						var c = nextChar();
+						switch (c) {
+							case ' '.code, '\r'.code, '\n'.code, '\t'.code:
+							// loop
+							case '}'.code:
+								if (field != null || comma == false)
+									invalidChar();
+								return obj;
+							case ':'.code:
+								if (field == null)
+									invalidChar();
+								Reflect.setField(obj, field, parseRec());
+								field = null;
+								comma = true;
+							case ','.code:
+								if (comma) comma = false else invalidChar();
+							case '"'.code:
+								if (field != null || comma) invalidChar();
+								field = parseString();
+							default:
+								invalidChar();
+						}
+					}
+				case '['.code:
+					var arr = [], comma:Null<Bool> = null;
+					while (true) {
+						var c = nextChar();
+						switch (c) {
+							case ' '.code, '\r'.code, '\n'.code, '\t'.code:
+							// loop
+							case ']'.code:
+								if (comma == false) invalidChar();
+								return arr;
+							case ','.code:
+								if (comma) comma = false else invalidChar();
+							default:
+								if (comma) invalidChar();
+								pos--;
+								arr.push(parseRec());
+								comma = true;
+						}
+					}
+				case 't'.code:
+					var save = pos;
+					if (nextChar() != 'r'.code || nextChar() != 'u'.code || nextChar() != 'e'.code) {
+						pos = save;
 						invalidChar();
 					}
-				}
-			case '['.code:
-				var arr = [], comma : Null<Bool> = null;
-				while( true ) {
-					var c = nextChar();
-					switch( c ) {
-					case ' '.code, '\r'.code, '\n'.code, '\t'.code:
-						// loop
-					case ']'.code:
-						if( comma == false ) invalidChar();
-						return arr;
-					case ','.code:
-						if( comma ) comma = false else invalidChar();
-					default:
-						if( comma ) invalidChar();
-						pos--;
-						arr.push(parseRec());
-						comma = true;
+					return true;
+				case 'f'.code:
+					var save = pos;
+					if (nextChar() != 'a'.code || nextChar() != 'l'.code || nextChar() != 's'.code || nextChar() != 'e'.code) {
+						pos = save;
+						invalidChar();
 					}
-				}
-			case 't'.code:
-				var save = pos;
-				if( nextChar() != 'r'.code || nextChar() != 'u'.code || nextChar() != 'e'.code ) {
-					pos = save;
-					invalidChar();
-				}
-				return true;
-			case 'f'.code:
-				var save = pos;
-				if( nextChar() != 'a'.code || nextChar() != 'l'.code || nextChar() != 's'.code || nextChar() != 'e'.code ) {
-					pos = save;
-					invalidChar();
-				}
-				return false;
-			case 'n'.code:
-				var save = pos;
-				if( nextChar() != 'u'.code || nextChar() != 'l'.code || nextChar() != 'l'.code ) {
-					pos = save;
+					return false;
+				case 'n'.code:
+					var save = pos;
+					if (nextChar() != 'u'.code || nextChar() != 'l'.code || nextChar() != 'l'.code) {
+						pos = save;
+						invalidChar();
+					}
+					return null;
+				case '"'.code:
+					return parseString();
+				case '0'.code, '1'.code, '2'.code, '3'.code, '4'.code, '5'.code, '6'.code, '7'.code, '8'.code, '9'.code, '-'.code:
+					return parseNumber(c);
+				default:
 					invalidChar();
-				}
-				return null;
-			case '"'.code:
-				return parseString();
-			case '0'.code, '1'.code,'2'.code,'3'.code,'4'.code,'5'.code,'6'.code,'7'.code,'8'.code,'9'.code,'-'.code:
-				return parseNumber(c);
-			default:
-				invalidChar();
 			}
 		}
 	}
 
 	function parseString() {
 		var start = pos;
-		var buf = null;
-		while( true ) {
+		var buf:StringBuf = null;
+		#if target.unicode
+		var prev = -1;
+		inline function cancelSurrogate() {
+			// invalid high surrogate (not followed by low surrogate)
+			buf.addChar(0xFFFD);
+			prev = -1;
+		}
+		#end
+		while (true) {
 			var c = nextChar();
-			if( c == '"'.code )
+			if (c == '"'.code)
 				break;
-			if( c == '\\'.code ) {
+			if (c == '\\'.code) {
 				if (buf == null) {
 					buf = new StringBuf();
 				}
-				buf.addSub(str,start, pos - start - 1);
+				buf.addSub(str, start, pos - start - 1);
 				c = nextChar();
-				switch( c ) {
-				case "r".code: buf.addChar("\r".code);
-				case "n".code: buf.addChar("\n".code);
-				case "t".code: buf.addChar("\t".code);
-				case "b".code: buf.addChar(8);
-				case "f".code: buf.addChar(12);
-				case "/".code, '\\'.code, '"'.code: buf.addChar(c);
-				case 'u'.code:
-					var uc = Std.parseInt("0x" + str.substr(pos, 4));
-					pos += 4;
-					#if (neko || php || cpp || lua)
-					if( uc <= 0x7F )
-						buf.addChar(uc);
-					else if( uc <= 0x7FF ) {
-						buf.addChar(0xC0 | (uc >> 6));
-						buf.addChar(0x80 | (uc & 63));
-					} else if( uc <= 0xFFFF ) {
-						buf.addChar(0xE0 | (uc >> 12));
-						buf.addChar(0x80 | ((uc >> 6) & 63));
-						buf.addChar(0x80 | (uc & 63));
-					} else {
-						buf.addChar(0xF0 | (uc >> 18));
-						buf.addChar(0x80 | ((uc >> 12) & 63));
-						buf.addChar(0x80 | ((uc >> 6) & 63));
-						buf.addChar(0x80 | (uc & 63));
-					}
-					#else
-					buf.addChar(uc);
-					#end
-				default:
-					throw "Invalid escape sequence \\" + String.fromCharCode(c) + " at position " + (pos - 1);
+				#if target.unicode
+				if (c != "u".code && prev != -1)
+					cancelSurrogate();
+				#end
+				switch (c) {
+					case "r".code:
+						buf.addChar("\r".code);
+					case "n".code:
+						buf.addChar("\n".code);
+					case "t".code:
+						buf.addChar("\t".code);
+					case "b".code:
+						buf.addChar(8);
+					case "f".code:
+						buf.addChar(12);
+					case "/".code, '\\'.code, '"'.code:
+						buf.addChar(c);
+					case 'u'.code:
+						var uc:Int = Std.parseInt("0x" + str.substr(pos, 4));
+						pos += 4;
+						#if !target.unicode
+						if (uc <= 0x7F)
+							buf.addChar(uc);
+						else if (uc <= 0x7FF) {
+							buf.addChar(0xC0 | (uc >> 6));
+							buf.addChar(0x80 | (uc & 63));
+						} else if (uc <= 0xFFFF) {
+							buf.addChar(0xE0 | (uc >> 12));
+							buf.addChar(0x80 | ((uc >> 6) & 63));
+							buf.addChar(0x80 | (uc & 63));
+						} else {
+							buf.addChar(0xF0 | (uc >> 18));
+							buf.addChar(0x80 | ((uc >> 12) & 63));
+							buf.addChar(0x80 | ((uc >> 6) & 63));
+							buf.addChar(0x80 | (uc & 63));
+						}
+						#else
+						if (prev != -1) {
+							if (uc < 0xDC00 || uc > 0xDFFF)
+								cancelSurrogate();
+							else {
+								buf.addChar(((prev - 0xD800) << 10) + (uc - 0xDC00) + 0x10000);
+								prev = -1;
+							}
+						} else if (uc >= 0xD800 && uc <= 0xDBFF)
+							prev = uc;
+						else
+							buf.addChar(uc);
+						#end
+					default:
+						throw "Invalid escape sequence \\" + String.fromCharCode(c) + " at position " + (pos - 1);
 				}
 				start = pos;
 			}
-			#if (neko || php || cpp)
+			#if !(target.unicode)
 			// ensure utf8 chars are not cut
-			else if( c >= 0x80 ) {
+			else if (c >= 0x80) {
 				pos++;
-				if( c >= 0xFC ) pos += 4;
-				else if( c >= 0xF8 ) pos += 3;
-				else if( c >= 0xF0 ) pos += 2;
-				else if( c >= 0xE0 ) pos++;
+				if (c >= 0xFC)
+					pos += 4;
+				else if (c >= 0xF8)
+					pos += 3;
+				else if (c >= 0xF0)
+					pos += 2;
+				else if (c >= 0xE0)
+					pos++;
 			}
 			#end
-			else if( StringTools.isEof(c) )
-				throw "Unclosed string";
+		else if (StringTools.isEof(c))
+			throw "Unclosed string";
 		}
+		#if target.unicode
+		if (prev != -1)
+			cancelSurrogate();
+		#end
 		if (buf == null) {
 			return str.substr(start, pos - start - 1);
-		}
-		else {
-			buf.addSub(str,start, pos - start - 1);
+		} else {
+			buf.addSub(str, start, pos - start - 1);
 			return buf.toString();
 		}
 	}
 
-	inline function parseNumber( c : Int ) : Dynamic {
+	inline function parseNumber(c:Int):Dynamic {
 		var start = pos - 1;
 		var minus = c == '-'.code, digit = !minus, zero = c == '0'.code;
 		var point = false, e = false, pm = false, end = false;
-		while( true ) {
+		while (true) {
 			c = nextChar();
-			switch( c ) {
-				case '0'.code :
-					if (zero && !point) invalidNumber(start);
+			switch (c) {
+				case '0'.code:
+					if (zero && !point)
+						invalidNumber(start);
 					if (minus) {
-						minus = false; zero = true;
+						minus = false;
+						zero = true;
 					}
 					digit = true;
-				case '1'.code,'2'.code,'3'.code,'4'.code,'5'.code,'6'.code,'7'.code,'8'.code,'9'.code :
-					if (zero && !point) invalidNumber(start);
-					if (minus) minus = false;
-					digit = true; zero = false;
-				case '.'.code :
-					if (minus || point) invalidNumber(start);
-					digit = false; point = true;
-				case 'e'.code, 'E'.code :
-					if (minus || zero || e) invalidNumber(start);
-					digit = false; e = true;
-				case '+'.code, '-'.code :
-					if (!e || pm) invalidNumber(start);
-					digit = false; pm = true;
-				default :
-					if (!digit) invalidNumber(start);
+				case '1'.code, '2'.code, '3'.code, '4'.code, '5'.code, '6'.code, '7'.code, '8'.code, '9'.code:
+					if (zero && !point)
+						invalidNumber(start);
+					if (minus)
+						minus = false;
+					digit = true;
+					zero = false;
+				case '.'.code:
+					if (minus || point || e)
+						invalidNumber(start);
+					digit = false;
+					point = true;
+				case 'e'.code, 'E'.code:
+					if (minus || zero || e)
+						invalidNumber(start);
+					digit = false;
+					e = true;
+				case '+'.code, '-'.code:
+					if (!e || pm)
+						invalidNumber(start);
+					digit = false;
+					pm = true;
+				default:
+					if (!digit)
+						invalidNumber(start);
 					pos--;
 					end = true;
 			}
-			if (end) break;
+			if (end)
+				break;
 		}
+
 		var f = Std.parseFloat(str.substr(start, pos - start));
 		var i = Std.int(f);
-		return if( i == f ) i else f;
+		return if (i == f) i else f;
 	}
 
 	inline function nextChar() {
-		return StringTools.fastCodeAt(str,pos++);
+		return StringTools.fastCodeAt(str, pos++);
 	}
 
 	function invalidChar() {
 		pos--; // rewind
-		throw "Invalid char "+StringTools.fastCodeAt(str,pos)+" at position "+pos;
+		throw "Invalid char " + StringTools.fastCodeAt(str, pos) + " at position " + pos;
 	}
 
-	function invalidNumber( start : Int ) {
-		throw "Invalid number at position "+start+": " + str.substr(start, pos - start);
+	function invalidNumber(start:Int) {
+		throw "Invalid number at position " + start + ": " + str.substr(start, pos - start);
 	}
 }
diff --git a/std/haxe/format/JsonPrinter.hx b/std/haxe/format/JsonPrinter.hx
index 38a4e9b471a49fbb38bc6c9e496b5c15441b1fa6..093b037754daf212ae736978ba71b382cd3f2cde 100644
--- a/std/haxe/format/JsonPrinter.hx
+++ b/std/haxe/format/JsonPrinter.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.format;
 
 /**
@@ -30,7 +31,6 @@ package haxe.format;
 	@see https://haxe.org/manual/std-Json-encoding.html
 **/
 class JsonPrinter {
-
 	/**
 		Encodes `o`'s value and returns the resulting JSON string.
 
@@ -41,19 +41,19 @@ class JsonPrinter {
 		If `space` is given and is not null, the result will be pretty-printed.
 		Successive levels will be indented by this string.
 	**/
-	static public function print(o:Dynamic, ?replacer:Dynamic -> Dynamic -> Dynamic, ?space:String) : String {
+	static public function print(o:Dynamic, ?replacer:(key:Dynamic, value:Dynamic) -> Dynamic, ?space:String):String {
 		var printer = new JsonPrinter(replacer, space);
 		printer.write("", o);
 		return printer.buf.toString();
 	}
 
-	var buf : #if flash flash.utils.ByteArray #else StringBuf #end;
-	var replacer : Dynamic -> Dynamic -> Dynamic;
+	var buf:#if flash flash.utils.ByteArray #else StringBuf #end;
+	var replacer:(key:Dynamic, value:Dynamic) -> Dynamic;
 	var indent:String;
 	var pretty:Bool;
 	var nind:Int;
 
-	function new(replacer:Dynamic -> Dynamic -> Dynamic, space:String) {
+	function new(replacer:(key:Dynamic, value:Dynamic) -> Dynamic, space:String) {
 		this.replacer = replacer;
 		this.indent = space;
 		this.pretty = space != null;
@@ -68,76 +68,76 @@ class JsonPrinter {
 		#end
 	}
 
-	inline function ipad ():Void {
-		if (pretty) add(StringTools.lpad('', indent, nind * indent.length));
+	inline function ipad():Void {
+		if (pretty)
+			add(StringTools.lpad('', indent, nind * indent.length));
 	}
 
-	inline function newl ():Void {
-		if (pretty) addChar('\n'.code);
+	inline function newl():Void {
+		if (pretty)
+			addChar('\n'.code);
 	}
 
 	function write(k:Dynamic, v:Dynamic) {
-		if (replacer != null) v = replacer(k, v);
-		switch( Type.typeof(v) ) {
-		case TUnknown:
-			add('"???"');
-		case TObject:
-			objString(v);
-		case TInt:
-			add(#if as3 Std.string(v) #else v #end);
-		case TFloat:
-			add(Math.isFinite(v) ? v : 'null');
-		case TFunction:
-			add('"<fun>"');
-		case TClass(c):
-			if( c == String )
-				quote(v);
-			else if( c == Array ) {
-				var v : Array<Dynamic> = v;
-				addChar('['.code);
-
-				var len = v.length;
-				var last = len - 1;
-				for (i in 0...len)
-				{
-					if (i > 0) addChar(','.code) else nind++;
-					newl();
-					ipad();
-					write(i, v[i]);
-					if (i == last)
-					{
-						nind--;
+		if (replacer != null)
+			v = replacer(k, v);
+		switch (Type.typeof(v)) {
+			case TUnknown:
+				add('"???"');
+			case TObject:
+				objString(v);
+			case TInt:
+				add(#if (as3 || jvm) Std.string(v) #else v #end);
+			case TFloat:
+				add(Math.isFinite(v) ? Std.string(v) : 'null');
+			case TFunction:
+				add('"<fun>"');
+			case TClass(c):
+				if (c == String)
+					quote(v);
+				else if (c == Array) {
+					var v:Array<Dynamic> = v;
+					addChar('['.code);
+
+					var len = v.length;
+					var last = len - 1;
+					for (i in 0...len) {
+						if (i > 0)
+							addChar(','.code)
+						else
+							nind++;
 						newl();
 						ipad();
+						write(i, v[i]);
+						if (i == last) {
+							nind--;
+							newl();
+							ipad();
+						}
 					}
-				}
-				addChar(']'.code);
-			} else if( c == haxe.ds.StringMap ) {
-				var v : haxe.ds.StringMap<Dynamic> = v;
-				var o = {};
-				for( k in v.keys() )
-					Reflect.setField(o,k,v.get(k));
-				objString(o);
-			} else if( c == Date ) {
-				var v : Date = v;
-				quote(v.toString());
-			} else
-				#if flash
-				classString(v);
-				#else
-				objString(v);
-				#end
-		case TEnum(_):
-			var i : Dynamic = Type.enumIndex(v);
-			add(i);
-		case TBool:
-			add(#if (php || as3) (v ? 'true' : 'false') #else v #end);
-		case TNull:
-			add('null');
+					addChar(']'.code);
+				} else if (c == haxe.ds.StringMap) {
+					var v:haxe.ds.StringMap<Dynamic> = v;
+					var o = {};
+					for (k in v.keys())
+						Reflect.setField(o, k, v.get(k));
+					objString(o);
+				} else if (c == Date) {
+					var v:Date = v;
+					quote(v.toString());
+				} else
+					classString(v);
+			case TEnum(_):
+				var i:Dynamic = Type.enumIndex(v);
+				add(i);
+			case TBool:
+				add(#if (php || as3 || jvm) (v ? 'true' : 'false') #else v #end);
+			case TNull:
+				add('null');
 		}
 	}
 
-	@:extern inline function addChar(c:Int) {
+	extern inline function addChar(c:Int) {
 		#if flash
 		buf.writeByte(c);
 		#else
@@ -145,7 +145,7 @@ class JsonPrinter {
 		#end
 	}
 
-	@:extern inline function add(v:String) {
+	extern inline function add(v:String) {
 		#if flash
 		// argument is not always a string but will be automatically casted
 		buf.writeUTFBytes(v);
@@ -154,34 +154,37 @@ class JsonPrinter {
 		#end
 	}
 
-	#if flash
-	function classString ( v : Dynamic ) {
-		fieldsString(v,Type.getInstanceFields(Type.getClass(v)));
+	function classString(v:Dynamic) {
+		fieldsString(v, Type.getInstanceFields(Type.getClass(v)));
 	}
-	#end
 
-	inline function objString( v : Dynamic ) {
-		fieldsString(v,Reflect.fields(v));
+	inline function objString(v:Dynamic) {
+		fieldsString(v, Reflect.fields(v));
 	}
 
-	function fieldsString( v : Dynamic, fields : Array<String> ) {
+	function fieldsString(v:Dynamic, fields:Array<String>) {
 		addChar('{'.code);
 		var len = fields.length;
 		var last = len - 1;
 		var first = true;
-		for( i in 0...len ) {
+		for (i in 0...len) {
 			var f = fields[i];
-			var value = Reflect.field(v,f);
-			if( Reflect.isFunction(value) ) continue;
-			if( first ) { nind++; first = false; } else addChar(','.code);
+			var value = Reflect.field(v, f);
+			if (Reflect.isFunction(value))
+				continue;
+			if (first) {
+				nind++;
+				first = false;
+			} else
+				addChar(','.code);
 			newl();
 			ipad();
 			quote(f);
 			addChar(':'.code);
-			if (pretty) addChar(' '.code);
+			if (pretty)
+				addChar(' '.code);
 			write(f, value);
-			if (i == last)
-			{
+			if (i == last) {
 				nind--;
 				newl();
 				ipad();
@@ -190,49 +193,95 @@ class JsonPrinter {
 		addChar('}'.code);
 	}
 
-	function quote( s : String ) {
-		#if (neko || php || cpp)
-		if( s.length != haxe.Utf8.length(s) ) {
+	function quote(s:String) {
+		#if neko
+		if (s.length != neko.Utf8.length(s)) {
 			quoteUtf8(s);
 			return;
 		}
 		#end
 		addChar('"'.code);
 		var i = 0;
-		while( true ) {
+		#if hl
+		var prev = -1;
+		#end
+		while (true) {
 			var c = StringTools.fastCodeAt(s, i++);
-			if( StringTools.isEof(c) ) break;
-			switch( c ) {
-			case '"'.code: add('\\"');
-			case '\\'.code: add('\\\\');
-			case '\n'.code: add('\\n');
-			case '\r'.code: add('\\r');
-			case '\t'.code: add('\\t');
-			case 8: add('\\b');
-			case 12: add('\\f');
-			default:
-				#if flash
-				if( c >= 128 ) add(String.fromCharCode(c)) else addChar(c);
-				#else
-				addChar(c);
-				#end
+			if (StringTools.isEof(c))
+				break;
+			switch (c) {
+				case '"'.code:
+					add('\\"');
+				case '\\'.code:
+					add('\\\\');
+				case '\n'.code:
+					add('\\n');
+				case '\r'.code:
+					add('\\r');
+				case '\t'.code:
+					add('\\t');
+				case 8:
+					add('\\b');
+				case 12:
+					add('\\f');
+				default:
+					#if flash
+					if (c >= 128)
+						add(String.fromCharCode(c))
+					else
+						addChar(c);
+					#elseif hl
+					if (prev >= 0) {
+						if (c >= 0xD800 && c <= 0xDFFF) {
+							addChar((((prev - 0xD800) << 10) | (c - 0xDC00)) + 0x10000);
+							prev = -1;
+						} else {
+							addChar("□".code);
+							prev = c;
+						}
+					} else {
+						if (c >= 0xD800 && c <= 0xDFFF)
+							prev = c;
+						else
+							addChar(c);
+					}
+					#else
+					addChar(c);
+					#end
 			}
 		}
+		#if hl
+		if (prev >= 0)
+			addChar("□".code);
+		#end
 		addChar('"'.code);
 	}
 
-	#if (neko || php || cpp)
-	function quoteUtf8( s : String ) {
-		var u = new haxe.Utf8();
-		haxe.Utf8.iter(s,function(c) {
-			switch( c ) {
-			case '\\'.code, '"'.code: u.addChar('\\'.code); u.addChar(c);
-			case '\n'.code: u.addChar('\\'.code); u.addChar('n'.code);
-			case '\r'.code: u.addChar('\\'.code); u.addChar('r'.code);
-			case '\t'.code: u.addChar('\\'.code); u.addChar('t'.code);
-			case 8: u.addChar('\\'.code); u.addChar('b'.code);
-			case 12: u.addChar('\\'.code); u.addChar('f'.code);
-			default: u.addChar(c);
+	#if neko
+	function quoteUtf8(s:String) {
+		var u = new neko.Utf8();
+		neko.Utf8.iter(s, function(c) {
+			switch (c) {
+				case '\\'.code, '"'.code:
+					u.addChar('\\'.code);
+					u.addChar(c);
+				case '\n'.code:
+					u.addChar('\\'.code);
+					u.addChar('n'.code);
+				case '\r'.code:
+					u.addChar('\\'.code);
+					u.addChar('r'.code);
+				case '\t'.code:
+					u.addChar('\\'.code);
+					u.addChar('t'.code);
+				case 8:
+					u.addChar('\\'.code);
+					u.addChar('b'.code);
+				case 12:
+					u.addChar('\\'.code);
+					u.addChar('f'.code);
+				default:
+					u.addChar(c);
 			}
 		});
 		buf.add('"');
diff --git a/std/haxe/http/HttpBase.hx b/std/haxe/http/HttpBase.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ce357cfdce9bdcf1c5440cb68ab4cbd547b7ec8e
--- /dev/null
+++ b/std/haxe/http/HttpBase.hx
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.http;
+
+import haxe.io.Bytes;
+
+private typedef StringKeyValue = {
+	var name:String;
+	var value:String;
+}
+
+/**
+	This class can be used to handle Http requests consistently across
+	platforms. There are two intended usages:
+
+	- call `haxe.Http.requestUrl(url)` and receive the result as a `String`
+	(not available on flash)
+	- create a `new haxe.Http(url)`, register your callbacks for `onData`,
+	`onError` and `onStatus`, then call `request()`.
+**/
+class HttpBase {
+	/**
+		The url of `this` request. It is used only by the `request()` method and
+		can be changed in order to send the same request to different target
+		Urls.
+	**/
+	public var url:String;
+
+	public var responseData(get,never):Null<String>;
+	public var responseBytes(default,null):Null<Bytes>;
+
+	var responseAsString:Null<String>;
+	var postData:Null<String>;
+	var postBytes:Null<Bytes>;
+	var headers:Array<StringKeyValue>;
+	var params:Array<StringKeyValue>;
+
+	final emptyOnData:(String)->Void;
+
+	/**
+		Creates a new Http instance with `url` as parameter.
+
+		This does not do a request until `request()` is called.
+
+		If `url` is null, the field url must be set to a value before making the
+		call to `request()`, or the result is unspecified.
+
+		(Php) Https (SSL) connections are allowed only if the OpenSSL extension
+		is enabled.
+	**/
+	public function new(url:String) {
+		this.url = url;
+		headers = [];
+		params = [];
+		emptyOnData = onData;
+	}
+
+	/**
+		Sets the header identified as `header` to value `value`.
+
+		If `header` or `value` are null, the result is unspecified.
+
+		This method provides a fluent interface.
+	**/
+	public function setHeader(name:String, value:String) {
+		for (i in 0...headers.length) {
+			if (headers[i].name == name) {
+				headers[i] = {name: name, value: value};
+				return #if hx3compat this #end;
+			}
+		}
+		headers.push({name: name, value: value});
+		#if hx3compat
+		return this;
+		#end
+	}
+
+	public function addHeader(header:String, value:String) {
+		headers.push({name: header, value: value});
+		#if hx3compat
+		return this;
+		#end
+	}
+
+	/**
+		Sets the parameter identified as `param` to value `value`.
+
+		If `header` or `value` are null, the result is unspecified.
+
+		This method provides a fluent interface.
+	**/
+	public function setParameter(name:String, value:String) {
+		for (i in 0...params.length) {
+			if (params[i].name == name) {
+				params[i] = {name: name, value: value};
+				return #if hx3compat this #end;
+			}
+		}
+		params.push({name: name, value: value});
+		#if hx3compat
+		return this;
+		#end
+	}
+
+	public function addParameter(name:String, value:String) {
+		params.push({name: name, value: value});
+		#if hx3compat
+		return this;
+		#end
+	}
+
+	/**
+		Sets the post data of `this` Http request to `data` string.
+
+		There can only be one post data per request. Subsequent calls to
+		this method or to `setPostBytes()` overwrite the previously set value.
+
+		If `data` is null, the post data is considered to be absent.
+
+		This method provides a fluent interface.
+	**/
+	public function setPostData(data:Null<String>) {
+		postData = data;
+		postBytes = null;
+		#if hx3compat
+		return this;
+		#end
+	}
+
+	/**
+		Sets the post data of `this` Http request to `data` bytes.
+
+		There can only be one post data per request. Subsequent calls to
+		this method or to `setPostData()` overwrite the previously set value.
+
+		If `data` is null, the post data is considered to be absent.
+
+		This method provides a fluent interface.
+	**/
+	public function setPostBytes(data:Null<Bytes>) {
+		postBytes = data;
+		postData = null;
+		#if hx3compat
+		return this;
+		#end
+	}
+
+	/**
+		Sends `this` Http request to the Url specified by `this.url`.
+
+		If `post` is true, the request is sent as POST request, otherwise it is
+		sent as GET request.
+
+		Depending on the outcome of the request, this method calls the
+		`onStatus()`, `onError()`, `onData()` or `onBytes()` callback functions.
+
+		If `this.url` is null, the result is unspecified.
+
+		If `this.url` is an invalid or inaccessible Url, the `onError()` callback
+		function is called.
+
+		[js] If `this.async` is false, the callback functions are called before
+		this method returns.
+	**/
+	public function request(?post:Bool):Void {
+		throw "not implemented";
+	}
+
+	/**
+		This method is called upon a successful request, with `data` containing
+		the result String.
+
+		The intended usage is to bind it to a custom function:
+		`httpInstance.onData = function(data) { // handle result }`
+	**/
+	public dynamic function onData(data:String) {}
+
+	/**
+		This method is called upon a successful request, with `data` containing
+		the result String.
+
+		The intended usage is to bind it to a custom function:
+		`httpInstance.onBytes = function(data) { // handle result }`
+	**/
+	public dynamic function onBytes(data:Bytes) {}
+
+	/**
+		This method is called upon a request error, with `msg` containing the
+		error description.
+
+		The intended usage is to bind it to a custom function:
+		`httpInstance.onError = function(msg) { // handle error }`
+	**/
+	public dynamic function onError(msg:String) {}
+
+	/**
+		This method is called upon a Http status change, with `status` being the
+		new status.
+
+		The intended usage is to bind it to a custom function:
+		`httpInstance.onStatus = function(status) { // handle status }`
+	**/
+	public dynamic function onStatus(status:Int) {}
+
+	/**
+		Override this if extending `haxe.Http` with overriding `onData`
+	**/
+	function hasOnData():Bool {
+		return !Reflect.compareMethods(onData, emptyOnData);
+	}
+
+	function success(data:Bytes) {
+		responseBytes = data;
+		responseAsString = null;
+		if (hasOnData()) {
+			onData(responseData);
+		}
+		onBytes(responseBytes);
+	}
+
+	function get_responseData() {
+		if (responseAsString == null && responseBytes != null) {
+			#if neko
+			responseAsString = neko.Lib.stringReference(responseBytes);
+			#else
+			responseAsString = responseBytes.getString(0, responseBytes.length, UTF8);
+			#end
+		}
+		return responseAsString;
+	}
+}
diff --git a/std/haxe/http/HttpJs.hx b/std/haxe/http/HttpJs.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e768932329e39fe90857f4e0021e5279e06314b4
--- /dev/null
+++ b/std/haxe/http/HttpJs.hx
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.http;
+
+#if js
+import js.html.XMLHttpRequestResponseType;
+import js.html.Blob;
+import haxe.io.Bytes;
+
+class HttpJs extends haxe.http.HttpBase {
+	public var async:Bool;
+	public var withCredentials:Bool;
+
+	var req:js.html.XMLHttpRequest;
+
+	public function new(url:String) {
+		async = true;
+		withCredentials = false;
+		super(url);
+	}
+
+	/**
+		Cancels `this` Http request if `request` has been called and a response
+		has not yet been received.
+	**/
+	public function cancel() {
+		if (req == null)
+			return;
+		req.abort();
+		req = null;
+	}
+
+	public override function request(?post:Bool) {
+		this.responseAsString = null;
+		this.responseBytes = null;
+		var r = req = js.Browser.createXMLHttpRequest();
+		var onreadystatechange = function(_) {
+			if (r.readyState != 4)
+				return;
+			var s = try r.status catch (e:Dynamic) null;
+			if (s == 0 && js.Browser.supported) {
+				// If the request is local and we have data: assume a success (jQuery approach):
+				var protocol = js.Browser.location.protocol.toLowerCase();
+				var rlocalProtocol = ~/^(?:about|app|app-storage|.+-extension|file|res|widget):$/;
+				var isLocal = rlocalProtocol.match(protocol);
+				if (isLocal) {
+					s = r.response != null ? 200 : 404;
+				}
+			}
+			if (s == js.Lib.undefined)
+				s = null;
+			if (s != null)
+				onStatus(s);
+			if (s != null && s >= 200 && s < 400) {
+				req = null;
+				success(Bytes.ofData(r.response));
+			} else if (s == null) {
+				req = null;
+				onError("Failed to connect or resolve host");
+			} else
+				switch (s) {
+					case 12029:
+						req = null;
+						onError("Failed to connect to host");
+					case 12007:
+						req = null;
+						onError("Unknown host");
+					default:
+						req = null;
+						responseBytes = Bytes.ofData(r.response);
+						onError("Http Error #" + r.status);
+				}
+		};
+		if (async)
+			r.onreadystatechange = onreadystatechange;
+		var uri:Null<Any> = switch [postData, postBytes] {
+			case [null, null]: null;
+			case [str, null]: str;
+			case [null, bytes]: new Blob([bytes.getData()]);
+			case _: null;
+		}
+		if (uri != null)
+			post = true;
+		else
+			for (p in params) {
+				if (uri == null)
+					uri = "";
+				else
+					uri = uri + "&";
+				uri = uri + StringTools.urlEncode(p.name) + "=" + StringTools.urlEncode(p.value);
+			}
+		try {
+			if (post)
+				r.open("POST", url, async);
+			else if (uri != null) {
+				var question = url.split("?").length <= 1;
+				r.open("GET", url + (if (question) "?" else "&") + uri, async);
+				uri = null;
+			} else
+				r.open("GET", url, async);
+			r.responseType = ARRAYBUFFER;
+		} catch (e:Dynamic) {
+			req = null;
+			onError(e.toString());
+			return;
+		}
+		r.withCredentials = withCredentials;
+		if (!Lambda.exists(headers, function(h) return h.name == "Content-Type") && post && postData == null)
+			r.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+
+		for (h in headers)
+			r.setRequestHeader(h.name, h.value);
+		r.send(uri);
+		if (!async)
+			onreadystatechange(null);
+	}
+
+	/**
+		Makes a synchronous request to `url`.
+
+		This creates a new Http instance and makes a GET request by calling its
+		`request(false)` method.
+
+		If `url` is null, the result is unspecified.
+	**/
+	public static function requestUrl(url:String):String {
+		var h = new Http(url);
+		h.async = false;
+		var r = null;
+		h.onData = function(d) {
+			r = d;
+		}
+		h.onError = function(e) {
+			throw e;
+		}
+		h.request(false);
+		return r;
+	}
+}
+#end
diff --git a/std/haxe/http/HttpMethod.hx b/std/haxe/http/HttpMethod.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d0f8fe2a7e006aefe8c4b8310b068279bc803b08
--- /dev/null
+++ b/std/haxe/http/HttpMethod.hx
@@ -0,0 +1,84 @@
+package haxe.http;
+
+/**
+	HTTP defines methods (sometimes referred to as _verbs_) to indicate the desired action to be
+	performed on the identified resource. What this resource represents, whether pre-existing data
+	or data that is generated dynamically, depends on the implementation of the server.
+
+	Often, the resource corresponds to a file or the output of an executable residing on the server.
+	The HTTP/1.0 specification defined the `GET`, `POST` and `HEAD` methods and the HTTP/1.1
+	specification added 5 new methods: `OPTIONS`, `PUT`, `DELETE`, `TRACE` and `CONNECT`.
+
+	By being specified in these documents their semantics are well known and can be depended upon.
+	Any client can use any method and the server can be configured to support any combination of methods.
+	If a method is unknown to an intermediate it will be treated as an unsafe and non-idempotent method.
+	There is no limit to the number of methods that can be defined and this allows for future methods to
+	be specified without breaking existing infrastructure.
+**/
+enum abstract HttpMethod(String) from String to String {
+	/**
+		The `POST` method requests that the server accept the entity enclosed in the request as
+		a new subordinate of the web resource identified by the URI.
+		
+		The data `POST`ed might be, for example, an annotation for existing resources;
+		a message for a bulletin board, newsgroup, mailing list, or comment thread;
+		a block of data that is the result of submitting a web form to a data-handling process;
+		or an item to add to a database.
+	**/
+	var Post = 'POST';
+
+	/**
+		The `GET` method requests a representation of the specified resource.
+
+		Requests using `GET` should only retrieve data and should have no other effect.
+		(This is also true of some other HTTP methods.) The W3C has published guidance
+		principles on this distinction, saying, _"Web application design should be informed
+		by the above principles, but also by the relevant limitations."_
+
+		See safe methods below.
+	**/
+	var Get = 'GET';
+
+	/**
+		The `HEAD` method asks for a response identical to that of a `GET` request,
+		but without the response body. This is useful for retrieving meta-information
+		written in response headers, without having to transport the entire content.
+	**/
+	var Head = 'HEAD';
+
+	/**
+		The `PUT` method requests that the enclosed entity be stored under the supplied URI.
+		If the URI refers to an already existing resource, it is modified; if the URI does
+		not point to an existing resource, then the server can create the resource with that URI.
+	**/
+	var Put = 'PUT';
+
+	/**
+		The `DELETE` method deletes the specified resource.
+	**/
+	var Delete = 'DELETE';
+
+	/**
+		The `TRACE` method echoes the received request so that a client can see
+		what (if any) changes or additions have been made by intermediate servers.
+	**/
+	var Trace = 'TRACE';
+
+	/**
+		The `OPTIONS` method returns the HTTP methods that the server supports for the
+		specified URL. This can be used to check the functionality of a web server by
+		requesting `*` instead of a specific resource.
+	**/
+	var Options = 'OPTIONS';
+
+	/**
+		The `CONNECT` method converts the request connection to a transparent TCP/IP tunnel,
+		usually to facilitate SSL-encrypted communication (HTTPS) through an unencrypted HTTP proxy.
+	**/
+	var Connect = 'CONNECT';
+
+	/**
+		The `PATCH` method applies partial modifications to a resource.
+	**/
+	var Patch = 'PATCH';
+}
diff --git a/std/haxe/http/HttpNodeJs.hx b/std/haxe/http/HttpNodeJs.hx
new file mode 100644
index 0000000000000000000000000000000000000000..50e0d45c415d0c948bd3c6b3422602004f87ab78
--- /dev/null
+++ b/std/haxe/http/HttpNodeJs.hx
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.http;
+
+#if nodejs
+import js.node.Buffer;
+import haxe.io.Bytes;
+
+class HttpNodeJs extends haxe.http.HttpBase {
+	var req:js.node.http.ClientRequest;
+
+	public function new(url:String) {
+		super(url);
+	}
+
+	/**
+		Cancels `this` Http request if `request` has been called and a response
+		has not yet been received.
+	**/
+	public function cancel() {
+		if (req == null)
+			return;
+		req.abort();
+		req = null;
+	}
+
+	public override function request(?post:Bool) {
+		responseAsString = null;
+		responseBytes = null;
+		var parsedUrl = js.node.Url.parse(url);
+		var secure = (parsedUrl.protocol == "https:");
+		var host = parsedUrl.hostname;
+		var path = parsedUrl.path;
+		var port = if (parsedUrl.port != null) Std.parseInt(parsedUrl.port) else (secure ? 443 : 80);
+		var h:Dynamic = {};
+		for (i in headers) {
+			var arr = Reflect.field(h, i.name);
+			if (arr == null) {
+				arr = new Array<String>();
+				Reflect.setField(h, i.name, arr);
+			}
+
+			arr.push(i.value);
+		}
+		if (postData != null || postBytes != null)
+			post = true;
+		var uri = null;
+		for (p in params) {
+			if (uri == null)
+				uri = "";
+			else
+				uri += "&";
+			uri += StringTools.urlEncode(p.name) + "=" + StringTools.urlEncode(p.value);
+		}
+		var question = path.split("?").length <= 1;
+		if (uri != null)
+			path += (if (question) "?" else "&") + uri;
+
+		var opts = {
+			protocol: parsedUrl.protocol,
+			hostname: host,
+			port: port,
+			method: post ? 'POST' : 'GET',
+			path: path,
+			headers: h
+		};
+		function httpResponse(res) {
+			res.setEncoding('binary');
+			var s = res.statusCode;
+			if (s != null)
+				onStatus(s);
+			var data = [];
+			res.on('data', function(chunk:String) {
+				data.push(Buffer.from(chunk, 'binary'));
+			});
+			res.on('end', function(_) {
+				var buf = (data.length == 1 ? data[0] : Buffer.concat(data));
+				responseBytes = Bytes.ofData(buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength));
+				req = null;
+				if (s != null && s >= 200 && s < 400) {
+					success(responseBytes);
+				} else {
+					onError("Http Error #" + s);
+				}
+			});
+		}
+		req = secure ? js.node.Https.request(untyped opts, httpResponse) : js.node.Http.request(untyped opts, httpResponse);
+		if (post)
+			if (postData != null) {
+				req.write(postData);
+			} else if(postBytes != null) {
+				req.setHeader("Content-Length", '${postBytes.length}');
+				req.write(Buffer.from(postBytes.getData()));
+			}
+
+		req.end();
+	}
+}
+#end
diff --git a/std/haxe/http/HttpStatus.hx b/std/haxe/http/HttpStatus.hx
new file mode 100644
index 0000000000000000000000000000000000000000..65008177ba3878f1bb545fb753dd8062b2dc01fd
--- /dev/null
+++ b/std/haxe/http/HttpStatus.hx
@@ -0,0 +1,68 @@
+package haxe.http;
+
+/**
+	HTTP Request Status
+**/
+enum abstract HttpStatus(Int) from Int to Int {
+	var Continue = 100;
+	var SwitchingProtocols = 101;
+	var Processing = 102;
+	var OK = 200;
+	var Created = 201;
+	var Accepted = 202;
+	var NonAuthoritativeInformation = 203;
+	var NoContent = 204;
+	var ResetContent = 205;
+	var PartialContent = 206;
+	var MultiStatus = 207;
+	var AlreadyReported = 208;
+	var IMUsed = 226;
+	var MultipleChoices = 300;
+	var MovedPermanently = 301;
+	var Found = 302;
+	var SeeOther = 303;
+	var NotModified = 304;
+	var UseProxy = 305;
+	var SwitchProxy = 306;
+	var TemporaryRedirect = 307;
+	var PermanentRedirect = 308;
+	var BadRequest = 400;
+	var Unauthorized = 401;
+	var PaymentRequired = 402;
+	var Forbidden = 403;
+	var NotFound = 404;
+	var MethodNotAllowed = 405;
+	var NotAcceptable = 406;
+	var ProxyAuthenticationRequired = 407;
+	var RequestTimeout = 408;
+	var Conflict = 409;
+	var Gone = 410;
+	var LengthRequired = 411;
+	var PreconditionFailed = 412;
+	var PayloadTooLarge = 413;
+	var URITooLong = 414;
+	var UnsupportedMediaType = 415;
+	var RangeNotSatisfiable = 416;
+	var ExpectationFailed = 417;
+	var ImATeapot = 418;
+	var MisdirectedRequest = 421;
+	var UnprocessableEntity = 422;
+	var Locked = 423;
+	var FailedDependency = 424;
+	var UpgradeRequired = 426;
+	var PreconditionRequired = 428;
+	var TooManyRequests = 429;
+	var RequestHeaderFieldsTooLarge = 431;
+	var UnavailableForLegalReasons = 451;
+	var InternalServerError = 500;
+	var NotImplemented = 501;
+	var BadGateway = 502;
+	var ServiceUnavailable = 503;
+	var GatewayTimeout = 504;
+	var HTTPVersionNotSupported = 505;
+	var VariantAlsoNegotiates = 506;
+	var InsufficientStorage = 507;
+	var LoopDetected = 508;
+	var NotExtended = 510;
+	var NetworkAuthenticationRequired = 511;
+}
diff --git a/std/haxe/io/ArrayBufferView.hx b/std/haxe/io/ArrayBufferView.hx
index 475775be68ac65213bcd383e410ec26fb9c88448..b65a46b7bd2e522d5648cf1a7e682c6b544d9579 100644
--- a/std/haxe/io/ArrayBufferView.hx
+++ b/std/haxe/io/ArrayBufferView.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,76 +19,78 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package haxe.io;
+
+package haxe.io;
 
 typedef ArrayBufferViewData = ArrayBufferViewImpl;
 
 class ArrayBufferViewImpl {
-	public var bytes : haxe.io.Bytes;
-	public var byteOffset : Int;
-	public var byteLength : Int;
+	public var bytes:haxe.io.Bytes;
+	public var byteOffset:Int;
+	public var byteLength:Int;
+
 	public function new(bytes, pos, length) {
 		this.bytes = bytes;
 		this.byteOffset = pos;
 		this.byteLength = length;
 	}
-	public function sub( begin : Int, ?length : Int ) {
-		if( length == null ) length = byteLength - begin;
-		if( begin < 0 || length < 0 || begin + length > byteLength ) throw Error.OutsideBounds;
+
+	public function sub(begin:Int, ?length:Int) {
+		if (length == null)
+			length = byteLength - begin;
+		if (begin < 0 || length < 0 || begin + length > byteLength)
+			throw Error.OutsideBounds;
 		return new ArrayBufferViewImpl(bytes, byteOffset + begin, length);
 	}
-	public function subarray( ?begin : Int, ?end : Int ) {
-		if( begin == null ) begin = 0;
-		if( end == null ) end = byteLength - begin;
+
+	public function subarray(?begin:Int, ?end:Int) {
+		if (begin == null)
+			begin = 0;
+		if (end == null)
+			end = byteLength - begin;
 		return sub(begin, end - begin);
 	}
 }
 
 abstract ArrayBufferView(ArrayBufferViewData) {
+	public var buffer(get, never):haxe.io.Bytes;
+	public var byteOffset(get, never):Int;
+	public var byteLength(get, never):Int;
 
-	/**
-		On some platforms configurations (for instance JS with no TypedArray support as in IE8-), Haxe will
-		try to emulate the array buffers API. However in that case memory sharing will not be supported :
-		each typed array or will copy its own data set. This flag allows users to detect if we are doing such emulation.
-		At the moment only JavaScript is concerned.
-	**/
-	public static var EMULATED(get,never) : Bool;
-	static inline function get_EMULATED() : Bool {
-		return false;
+	public inline function new(size:Int) {
+		this = new ArrayBufferViewData(haxe.io.Bytes.alloc(size), 0, size);
 	}
 
-	public var buffer(get,never) : haxe.io.Bytes;
-	public var byteOffset(get, never) : Int;
-	public var byteLength(get, never) : Int;
+	inline function get_byteOffset():Int
+		return this.byteOffset;
 
-	public inline function new( size : Int ) {
-		this = new ArrayBufferViewData(haxe.io.Bytes.alloc(size), 0, size);
-	}
+	inline function get_byteLength():Int
+		return this.byteLength;
 
-	inline function get_byteOffset() : Int return this.byteOffset;
-	inline function get_byteLength() : Int return this.byteLength;
-	inline function get_buffer() : haxe.io.Bytes return this.bytes;
+	inline function get_buffer():haxe.io.Bytes
+		return this.bytes;
 
-	public inline function sub( begin : Int, ?length : Int ) : ArrayBufferView {
-		return fromData(this.sub(begin,length));
+	public inline function sub(begin:Int, ?length:Int):ArrayBufferView {
+		return fromData(this.sub(begin, length));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : ArrayBufferView {
-		return fromData(this.subarray(begin,end));
+	public inline function subarray(?begin:Int, ?end:Int):ArrayBufferView {
+		return fromData(this.subarray(begin, end));
 	}
 
-	public inline function getData() : ArrayBufferViewData {
+	public inline function getData():ArrayBufferViewData {
 		return this;
 	}
 
-	public static inline function fromData( a : ArrayBufferViewData ) : ArrayBufferView {
+	public static inline function fromData(a:ArrayBufferViewData):ArrayBufferView {
 		return cast a;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, pos = 0, ?length : Int ) : ArrayBufferView {
-		if( length == null ) length = bytes.length - pos;
-		if( pos < 0 || length < 0 || pos + length > bytes.length ) throw Error.OutsideBounds;
+	public static function fromBytes(bytes:haxe.io.Bytes, pos = 0, ?length:Int):ArrayBufferView {
+		if (length == null)
+			length = bytes.length - pos;
+		if (pos < 0 || length < 0 || pos + length > bytes.length)
+			throw Error.OutsideBounds;
 		return fromData(new ArrayBufferViewData(bytes, pos, length));
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/haxe/io/BufferInput.hx b/std/haxe/io/BufferInput.hx
index 4802f553b64c67d10b7bce5eccee61af7a2350b7..a60e08ae654c3369a9e6a7fd0efb792d3d122e93 100644
--- a/std/haxe/io/BufferInput.hx
+++ b/std/haxe/io/BufferInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 class BufferInput extends haxe.io.Input {
-
-	public var i : haxe.io.Input;
-	public var buf : haxe.io.Bytes;
-	public var available : Int;
-	public var pos : Int;
+	public var i:haxe.io.Input;
+	public var buf:haxe.io.Bytes;
+	public var available:Int;
+	public var pos:Int;
 
 	public function new(i, buf, ?pos = 0, ?available = 0) {
 		this.i = i;
@@ -36,7 +36,7 @@ class BufferInput extends haxe.io.Input {
 	}
 
 	public function refill() {
-		if( pos > 0 ) {
+		if (pos > 0) {
 			buf.blit(0, buf, pos, available);
 			pos = 0;
 		}
@@ -44,20 +44,21 @@ class BufferInput extends haxe.io.Input {
 	}
 
 	override function readByte() {
-		if( available == 0 ) refill();
+		if (available == 0)
+			refill();
 		var c = buf.get(pos);
 		pos++;
 		available--;
 		return c;
 	}
 
-	override function readBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) {
-		if( available == 0 ) refill();
-		var size = if( len > available ) available else len;
+	override function readBytes(buf:haxe.io.Bytes, pos:Int, len:Int) {
+		if (available == 0)
+			refill();
+		var size = if (len > available) available else len;
 		buf.blit(pos, this.buf, this.pos, size);
 		this.pos += size;
 		this.available -= size;
 		return size;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/haxe/io/Bytes.hx b/std/haxe/io/Bytes.hx
index a70b1adcd28545bea3bfc0c182946d09bfe05cce..74443cf5f3a524626f41d5637c9cfe5ce508af48 100644
--- a/std/haxe/io/Bytes.hx
+++ b/std/haxe/io/Bytes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 #if cpp
@@ -26,11 +27,11 @@ using cpp.NativeArray;
 #end
 
 class Bytes {
+	public var length(default, null):Int;
 
-	public var length(default,null) : Int;
-	var b : BytesData;
+	var b:BytesData;
 
-	function new(length,b) {
+	function new(length, b) {
 		this.length = length;
 		this.b = b;
 		#if flash
@@ -38,13 +39,14 @@ class Bytes {
 		#end
 	}
 
-	public inline function get( pos : Int ) : Int {
+	/**
+		Returns the byte at index `pos`.
+	**/
+	public inline function get(pos:Int):Int {
 		#if neko
-		return untyped $sget(b,pos);
+		return untyped $sget(b, pos);
 		#elseif flash
 		return b[pos];
-		#elseif php
-		return b.get(pos);
 		#elseif cpp
 		return untyped b[pos];
 		#elseif java
@@ -56,13 +58,14 @@ class Bytes {
 		#end
 	}
 
-	public inline function set( pos : Int, v : Int ) : Void {
+	/**
+		Stores the given byte `v` at the given position `pos`.
+	**/
+	public inline function set(pos:Int, v:Int):Void {
 		#if neko
-		untyped $sset(b,pos,v);
+		untyped $sset(b, pos, v);
 		#elseif flash
 		b[pos] = v;
-		#elseif php
-		b.set(pos, v);
 		#elseif cpp
 		untyped b[pos] = v;
 		#elseif java
@@ -76,73 +79,91 @@ class Bytes {
 		#end
 	}
 
-	public function blit( pos : Int, src : Bytes, srcpos : Int, len : Int ) : Void {
+	/**
+		Copies `len` bytes from `src` into this instance.
+		@param pos Zero-based location in `this` instance at which to start writing
+			bytes.
+		@param src Source `Bytes` instance from which to copy bytes.
+		@param srcpos Zero-based location at `src` from which bytes will be copied.
+		@param len Number of bytes to be copied.
+	**/
+	public function blit(pos:Int, src:Bytes, srcpos:Int, len:Int):Void {
 		#if !neko
-		if( pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length ) throw Error.OutsideBounds;
+		if (pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length)
+			throw Error.OutsideBounds;
 		#end
 		#if neko
-		try untyped $sblit(b,pos,src.b,srcpos,len) catch( e : Dynamic ) throw Error.OutsideBounds;
-		#elseif php
-		b.blit(pos, src.b, srcpos, len);
+		try
+			untyped $sblit(b, pos, src.b, srcpos, len)
+		catch (e:Dynamic)
+			throw Error.OutsideBounds;
 		#elseif flash
 		b.position = pos;
-		if( len > 0 ) b.writeBytes(src.b,srcpos,len);
+		if (len > 0)
+			b.writeBytes(src.b, srcpos, len);
 		#elseif java
 		java.lang.System.arraycopy(src.b, srcpos, b, pos, len);
 		#elseif cs
 		cs.system.Array.Copy(src.b, srcpos, b, pos, len);
 		#elseif python
-		python.Syntax.pythonCode("self.b[{0}:{0}+{1}] = src.b[srcpos:srcpos+{1}]", pos, len);
+		python.Syntax.code("self.b[{0}:{0}+{1}] = src.b[srcpos:srcpos+{1}]", pos, len);
 		#elseif cpp
 		b.blit(pos, src.b, srcpos, len);
 		#else
 		var b1 = b;
 		var b2 = src.b;
-		if( b1 == b2 && pos > srcpos ) {
+		if (b1 == b2 && pos > srcpos) {
 			var i = len;
-			while( i > 0 ) {
+			while (i > 0) {
 				i--;
 				b1[i + pos] = b2[i + srcpos];
 			}
 			return;
 		}
-		for( i in 0...len )
-			b1[i+pos] = b2[i+srcpos];
+		for (i in 0...len)
+			b1[i + pos] = b2[i + srcpos];
 		#end
 	}
 
-	public function fill( pos : Int, len : Int, value : Int ) {
+	/**
+		Sets `len` consecutive bytes starting from index `pos` of `this` instance
+		to `value`.
+	**/
+	public function fill(pos:Int, len:Int, value:Int) {
 		#if flash
-		var v4 = value&0xFF;
-		v4 |= v4<<8;
-		v4 |= v4<<16;
+		var v4 = value & 0xFF;
+		v4 |= v4 << 8;
+		v4 |= v4 << 16;
 		b.position = pos;
-		for( i in 0...len>>2 )
+		for (i in 0...len >> 2)
 			b.writeUnsignedInt(v4);
-		pos += len&~3;
-		for( i in 0...len&3 )
-			set(pos++,value);
+		pos += len & ~3;
+		for (i in 0...len & 3)
+			set(pos++, value);
 		#elseif cpp
-		untyped __global__.__hxcpp_memory_memset(b,pos,len,value);
+		untyped __global__.__hxcpp_memory_memset(b, pos, len, value);
 		#else
-		for( i in 0...len )
+		for (i in 0...len)
 			set(pos++, value);
 		#end
 	}
 
-	public function sub( pos : Int, len : Int ) : Bytes {
+	/**
+		Returns a new `Bytes` instance that contains a copy of `len` bytes of
+		`this` instance, starting at index `pos`.
+	**/
+	public function sub(pos:Int, len:Int):Bytes {
 		#if !neko
-		if( pos < 0 || len < 0 || pos + len > length ) throw Error.OutsideBounds;
+		if (pos < 0 || len < 0 || pos + len > length)
+			throw Error.OutsideBounds;
 		#end
 		#if neko
-		return try new Bytes(len,untyped __dollar__ssub(b,pos,len)) catch( e : Dynamic ) throw Error.OutsideBounds;
+		return try new Bytes(len, untyped __dollar__ssub(b, pos, len)) catch (e:Dynamic) throw Error.OutsideBounds;
 		#elseif flash
 		b.position = pos;
 		var b2 = new flash.utils.ByteArray();
-		b.readBytes(b2,0,len);
-		return new Bytes(len,b2);
-		#elseif php
-		return new Bytes(len, b.sub(pos, len));
+		b.readBytes(b2, 0, len);
+		return new Bytes(len, b2);
 		#elseif java
 		var newarr = new java.NativeArray(len);
 		java.lang.System.arraycopy(b, pos, newarr, 0, len);
@@ -152,15 +173,27 @@ class Bytes {
 		cs.system.Array.Copy(b, pos, newarr, 0, len);
 		return new Bytes(len, newarr);
 		#elseif python
-		return new Bytes(len, python.Syntax.arrayAccess(b, pos, pos+len) );
+		return new Bytes(len, python.Syntax.arrayAccess(b, pos, pos + len));
 		#else
-		return new Bytes(len,b.slice(pos,pos+len));
+		return new Bytes(len, b.slice(pos, pos + len));
 		#end
 	}
+	
+	/**
+		Returns `0` if the bytes of `this` instance and the bytes of `other` are
+		identical.
+
+		Returns a negative value if the `length` of `this` instance is less than
+		the `length` of `other`, or a positive value if the `length` of `this`
+		instance is greater than the `length` of `other`.
 
-	public function compare( other : Bytes ) : Int {
+		In case of equal `length`s, returns a negative value if the first different
+		value in `other` is greater than the corresponding value in `this`
+		instance; otherwise returns a positive value.
+	**/
+	public function compare(other:Bytes):Int {
 		#if neko
-		return untyped __dollar__compare(b,other.b);
+		return untyped __dollar__compare(b, other.b);
 		#elseif flash
 		var len = (length < other.length) ? length : other.length;
 		var b1 = b;
@@ -169,8 +202,8 @@ class Bytes {
 		b2.position = 0;
 		b1.endian = flash.utils.Endian.BIG_ENDIAN;
 		b2.endian = flash.utils.Endian.BIG_ENDIAN;
-		for( i in 0...len>>2 )
-			if( b1.readUnsignedInt() != b2.readUnsignedInt() ) {
+		for (i in 0...len >> 2)
+			if (b1.readUnsignedInt() != b2.readUnsignedInt()) {
 				b1.position -= 4;
 				b2.position -= 4;
 				var d = b1.readUnsignedInt() - b2.readUnsignedInt();
@@ -178,88 +211,96 @@ class Bytes {
 				b2.endian = flash.utils.Endian.LITTLE_ENDIAN;
 				return d;
 			}
-		for( i in 0...len & 3 )
-			if( b1.readUnsignedByte() != b2.readUnsignedByte() ) {
+		for (i in 0...len & 3)
+			if (b1.readUnsignedByte() != b2.readUnsignedByte()) {
 				b1.endian = flash.utils.Endian.LITTLE_ENDIAN;
 				b2.endian = flash.utils.Endian.LITTLE_ENDIAN;
-				return b1[b1.position-1] - b2[b2.position-1];
+				return b1[b1.position - 1] - b2[b2.position - 1];
 			}
 		b1.endian = flash.utils.Endian.LITTLE_ENDIAN;
 		b2.endian = flash.utils.Endian.LITTLE_ENDIAN;
 		return length - other.length;
-		#elseif php
-		return b.compare(other.b);
-		//#elseif cs
-		//TODO: memcmp if unsafe flag is on
+		// #elseif cs
+		// TODO: memcmp if unsafe flag is on
 		#elseif cpp
 		return b.memcmp(other.b);
 		#else
 		var b1 = b;
 		var b2 = other.b;
 		var len = (length < other.length) ? length : other.length;
-		for( i in 0...len )
-			if( b1[i] != b2[i] )
-				return untyped b1[i] - untyped b2[i];
+		for (i in 0...len)
+			if (b1[i] != b2[i])
+				return untyped b1[i] - b2[i];
 		return length - other.length;
 		#end
 	}
 
-
 	/**
-		Returns the IEEE double precision value at given position (in low endian encoding).
-		Result is unspecified if reading outside of the bounds
+		Returns the IEEE double-precision value at the given position `pos` (in
+		little-endian encoding). Result is unspecified if `pos` is outside the
+		bounds.
 	**/
-	#if (neko_v21 || (cpp && !cppia) || flash) inline #end
-	public function getDouble( pos : Int ) : Float {
+	#if (neko_v21 || (cpp && !cppia) || flash)
+	inline
+	#end
+	public function getDouble(pos:Int):Float {
 		#if neko_v21
 		return untyped $sgetd(b, pos, false);
 		#elseif flash
 		b.position = pos;
 		return b.readDouble();
 		#elseif cpp
-		if( pos < 0 || pos + 8 > length ) throw Error.OutsideBounds;
-		return untyped __global__.__hxcpp_memory_get_double(b,pos);
+		if (pos < 0 || pos + 8 > length)
+			throw Error.OutsideBounds;
+		return untyped __global__.__hxcpp_memory_get_double(b, pos);
 		#else
-		return FPHelper.i64ToDouble(getInt32(pos),getInt32(pos+4));
+		return FPHelper.i64ToDouble(getInt32(pos), getInt32(pos + 4));
 		#end
 	}
 
 	/**
-		Returns the IEEE single precision value at given position (in low endian encoding).
-		Result is unspecified if reading outside of the bounds
+		Returns the IEEE single-precision value at the given position `pos` (in
+		little-endian encoding). Result is unspecified if `pos` is outside the
+		bounds.
 	**/
-	#if (neko_v21 || (cpp && !cppia) || flash) inline #end
-	public function getFloat( pos : Int ) : Float {
+	#if (neko_v21 || (cpp && !cppia) || flash)
+	inline
+	#end
+	public function getFloat(pos:Int):Float {
 		#if neko_v21
 		return untyped $sgetf(b, pos, false);
 		#elseif flash
 		b.position = pos;
 		return b.readFloat();
 		#elseif cpp
-		if( pos < 0 || pos + 4 > length ) throw Error.OutsideBounds;
-		return untyped __global__.__hxcpp_memory_get_float(b,pos);
+		if (pos < 0 || pos + 4 > length)
+			throw Error.OutsideBounds;
+		return untyped __global__.__hxcpp_memory_get_float(b, pos);
 		#else
-		var b = new haxe.io.BytesInput(this,pos,4);
-		return b.readFloat();
+		return FPHelper.i32ToFloat(getInt32(pos));
 		#end
 	}
 
 	/**
-		Store the IEEE double precision value at given position in low endian encoding.
-		Result is unspecified if writing outside of the bounds.
+		Stores the given IEEE double-precision value `v` at the given position
+		`pos` in little-endian encoding. Result is unspecified if writing outside
+		of bounds.
 	**/
-	#if (neko_v21 || flash) inline #end
-	public function setDouble( pos : Int, v : Float ) : Void {
+	#if (neko_v21 || flash)
+	inline
+	#end
+	public function setDouble(pos:Int, v:Float):Void {
 		#if neko_v21
 		untyped $ssetd(b, pos, v, false);
 		#elseif neko
-		untyped $sblit(b, pos, FPHelper._double_bytes(v,false), 0, 8);
+		untyped $sblit(b, pos, FPHelper._double_bytes(v, false), 0, 8);
 		#elseif flash
 		b.position = pos;
 		b.writeDouble(v);
 		#elseif cpp
-		if( pos < 0 || pos + 8 > length ) throw Error.OutsideBounds;
-		untyped __global__.__hxcpp_memory_set_double(b,pos,v);
+		if (pos < 0 || pos + 8 > length)
+			throw Error.OutsideBounds;
+		untyped __global__.__hxcpp_memory_set_double(b, pos, v);
 		#else
 		var i = FPHelper.doubleToI64(v);
 		setInt32(pos, i.low);
@@ -268,30 +309,35 @@ class Bytes {
 	}
 
 	/**
-		Store the IEEE single precision value at given position in low endian encoding.
-		Result is unspecified if writing outside of the bounds.
+		Stores the given IEEE single-precision value `v` at the given position
+		`pos` in little-endian encoding. Result is unspecified if writing outside
+		of bounds.
 	**/
-	#if (neko_v21 || flash) inline #end
-	public function setFloat( pos : Int, v : Float ) : Void {
+	#if (neko_v21 || flash)
+	inline
+	#end
+	public function setFloat(pos:Int, v:Float):Void {
 		#if neko_v21
 		untyped $ssetf(b, pos, v, false);
 		#elseif neko
-		untyped $sblit(b, pos, FPHelper._float_bytes(v,false), 0, 4);
+		untyped $sblit(b, pos, FPHelper._float_bytes(v, false), 0, 4);
 		#elseif flash
 		b.position = pos;
 		b.writeFloat(v);
 		#elseif cpp
-		if( pos < 0 || pos + 4 > length ) throw Error.OutsideBounds;
-		untyped __global__.__hxcpp_memory_set_float(b,pos,v);
+		if (pos < 0 || pos + 4 > length)
+			throw Error.OutsideBounds;
+		untyped __global__.__hxcpp_memory_set_float(b, pos, v);
 		#else
 		setInt32(pos, FPHelper.floatToI32(v));
 		#end
 	}
 
 	/**
-		Returns the 16 bit unsigned integer at given position (in low endian encoding).
+		Returns the 16-bit unsigned integer at the given position `pos` (in
+		little-endian encoding).
 	**/
-	public inline function getUInt16( pos : Int ) : Int {
+	public inline function getUInt16(pos:Int):Int {
 		#if neko_v21
 		return untyped $sget16(b, pos, false);
 		#else
@@ -300,9 +346,10 @@ class Bytes {
 	}
 
 	/**
-		Store the 16 bit unsigned integer at given position (in low endian encoding).
+		Stores the given 16-bit unsigned integer `v` at the given position `pos`
+		(in little-endian encoding).
 	**/
-	public inline function setUInt16( pos : Int, v : Int ) : Void {
+	public inline function setUInt16(pos:Int, v:Int):Void {
 		#if neko_v21
 		untyped $sset16(b, pos, v, false);
 		#else
@@ -312,33 +359,36 @@ class Bytes {
 	}
 
 	/**
-		Returns the 32 bit integer at given position (in low endian encoding).
+		Returns the 32-bit integer at the given position `pos` (in little-endian
+		encoding).
 	**/
-	public inline function getInt32( pos : Int ) : Int {
+	public inline function getInt32(pos:Int):Int {
 		#if neko_v21
 		return untyped $sget32(b, pos, false);
-		#elseif (php || python)
-		var v = get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos+3) << 24);
-		return if( v & 0x80000000 != 0 ) v | 0x80000000 else v;
+		#elseif python
+		var v = get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos + 3) << 24);
+		return if (v & 0x80000000 != 0) v | 0x80000000 else v;
 		#elseif lua
-		var v = get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos+3) << 24);
-		return lua.Boot.clamp(if( v & 0x80000000 != 0 ) v | 0x80000000 else v);
+		var v = get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos + 3) << 24);
+		return lua.Boot.clampInt32(if (v & 0x80000000 != 0) v | 0x80000000 else v);
 		#else
-		return get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos+3) << 24);
+		return get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos + 3) << 24);
 		#end
 	}
 
 	/**
-		Returns the 64 bit integer at given position (in low endian encoding).
+		Returns the 64-bit integer at the given position `pos` (in little-endian
+		encoding).
 	**/
-	public inline function getInt64( pos : Int ) : haxe.Int64 {
-		return haxe.Int64.make(getInt32(pos+4),getInt32(pos));
+	public inline function getInt64(pos:Int):haxe.Int64 {
+		return haxe.Int64.make(getInt32(pos + 4), getInt32(pos));
 	}
 
 	/**
-		Store the 32 bit integer at given position (in low endian encoding).
+		Stores the given 32-bit integer `v` at the given position `pos` (in
+		little-endian encoding).
 	**/
-	public inline function setInt32( pos : Int, v : Int ) : Void {
+	public inline function setInt32(pos:Int, v:Int):Void {
 		#if neko_v21
 		untyped $sset32(b, pos, v, false);
 		#else
@@ -350,64 +400,90 @@ class Bytes {
 	}
 
 	/**
-		Store the 64 bit integer at given position (in low endian encoding).
+		Stores the given 64-bit integer `v` at the given position `pos` (in
+		little-endian encoding).
 	**/
-	public inline function setInt64( pos : Int, v : haxe.Int64 ) : Void {
+	public inline function setInt64(pos:Int, v:haxe.Int64):Void {
 		setInt32(pos, v.low);
 		setInt32(pos + 4, v.high);
 	}
 
-	public function getString( pos : Int, len : Int ) : String {
+	/**
+		Returns the `len`-bytes long string stored at the given position `pos`,
+		interpreted with the given `encoding` (UTF-8 by default).
+	**/
+	public function getString(pos:Int, len:Int, ?encoding:Encoding):String {
+		if (encoding == null)
+			encoding == UTF8;
 		#if !neko
-		if( pos < 0 || len < 0 || pos + len > length ) throw Error.OutsideBounds;
+		if (pos < 0 || len < 0 || pos + len > length)
+			throw Error.OutsideBounds;
 		#end
 		#if neko
-		return try new String(untyped __dollar__ssub(b,pos,len)) catch( e : Dynamic ) throw Error.OutsideBounds;
+		return try new String(untyped __dollar__ssub(b, pos, len)) catch (e:Dynamic) throw Error.OutsideBounds;
 		#elseif flash
 		b.position = pos;
-		return b.readUTFBytes(len);
-		#elseif php
-		return b.getString(pos, len);
+		return encoding == RawNative ? b.readMultiByte(len, "unicode") : b.readUTFBytes(len);
 		#elseif cpp
-		var result:String="";
-		untyped __global__.__hxcpp_string_of_bytes(b,result,pos,len);
+		var result:String = "";
+		untyped __global__.__hxcpp_string_of_bytes(b, result, pos, len);
 		return result;
 		#elseif cs
-		return cs.system.text.Encoding.UTF8.GetString(b, pos, len);
+		switch (encoding) {
+			case UTF8 | null:
+				return cs.system.text.Encoding.UTF8.GetString(b, pos, len);
+			case RawNative:
+				return cs.system.text.Encoding.Unicode.GetString(b, pos, len);
+		}
 		#elseif java
-		try
-			return new String(b, pos, len, "UTF-8")
-		catch (e:Dynamic) throw e;
+		try {
+			switch (encoding) {
+				case UTF8 | null:
+					return new String(b, pos, len, "UTF-8");
+				case RawNative:
+					return new String(b, pos, len, "UTF-16LE");
+			}
+		} catch (e:Dynamic) {
+			throw e;
+		}
 		#elseif python
-		return python.Syntax.pythonCode("self.b[{0}:{0}+{1}].decode('UTF-8','replace')", pos, len);
+		return python.Syntax.code("self.b[{0}:{0}+{1}].decode('UTF-8','replace')", pos, len);
 		#elseif lua
-		var begin = cast(Math.min(pos,b.length),Int);
-		var end = cast(Math.min(pos+len,b.length),Int);
-		return [for (i in begin...end) String.fromCharCode(b[i])].join("");
+		if (b.length - pos <= lua.Boot.MAXSTACKSIZE) {
+			var end:Int = cast Math.min(b.length, pos + len) - 1;
+			return lua.NativeStringTools.char(lua.TableTools.unpack(untyped b, pos, end));
+		} else {
+			var tbl:lua.Table<Int, String> = lua.Table.create();
+			for (idx in pos...pos + len) {
+				lua.Table.insert(tbl, lua.NativeStringTools.char(b[idx]));
+			}
+			return lua.Table.concat(tbl, '');
+		}
 		#else
 		var s = "";
 		var b = b;
 		var fcc = String.fromCharCode;
 		var i = pos;
-		var max = pos+len;
+		var max = pos + len;
 		// utf8-decode and utf16-encode
-		while( i < max ) {
+		while (i < max) {
 			var c = b[i++];
-			if( c < 0x80 ) {
-				if( c == 0 ) break;
+			if (c < 0x80) {
+				if (c == 0)
+					break;
 				s += fcc(c);
-			} else if( c < 0xE0 )
-				s += fcc( ((c & 0x3F) << 6) | (b[i++] & 0x7F) );
-			else if( c < 0xF0 ) {
+			} else if (c < 0xE0)
+				s += fcc(((c & 0x3F) << 6) | (b[i++] & 0x7F));
+			else if (c < 0xF0) {
 				var c2 = b[i++];
-				s += fcc( ((c & 0x1F) << 12) | ((c2 & 0x7F) << 6) | (b[i++] & 0x7F) );
+				s += fcc(((c & 0x1F) << 12) | ((c2 & 0x7F) << 6) | (b[i++] & 0x7F));
 			} else {
 				var c2 = b[i++];
 				var c3 = b[i++];
 				var u = ((c & 0x0F) << 18) | ((c2 & 0x7F) << 12) | ((c3 & 0x7F) << 6) | (b[i++] & 0x7F);
 				// surrogate pair
-				s += fcc( (u >> 10) + 0xD7C0 );
-				s += fcc( (u & 0x3FF) | 0xDC00 );
+				s += fcc((u >> 10) + 0xD7C0);
+				s += fcc((u & 0x3FF) | 0xDC00);
 			}
 		}
 		return s;
@@ -420,34 +496,38 @@ class Bytes {
 		return getString(pos, len);
 	}
 
-	public function toString() : String {
+	/**
+		Returns a `String` representation of the bytes interpreted as UTF-8.
+	**/
+	public function toString():String {
 		#if neko
-		return new String(untyped __dollar__ssub(b,0,length));
+		return new String(untyped __dollar__ssub(b, 0, length));
 		#elseif flash
 		b.position = 0;
-		return b.readUTFBytes(length);
-		#elseif php
 		return b.toString();
 		#elseif cs
 		return cs.system.text.Encoding.UTF8.GetString(b, 0, length);
 		#elseif java
-		try
-		{
+		try {
 			return new String(b, 0, length, "UTF-8");
-		}
-		catch (e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 		#else
-		return getString(0,length);
+		return getString(0, length);
 		#end
 	}
 
-	public function toHex() : String {
+	/**
+		Returns a hexadecimal `String` representation of the bytes of `this`
+		instance.
+	**/
+	public function toHex():String {
 		var s = new StringBuf();
 		var chars = [];
 		var str = "0123456789abcdef";
-		for( i in 0...str.length )
+		for (i in 0...str.length)
 			chars.push(str.charCodeAt(i));
-		for( i in 0...length ) {
+		for (i in 0...length) {
 			var c = get(i);
 			s.addChar(chars[c >> 4]);
 			s.addChar(chars[c & 15]);
@@ -455,22 +535,28 @@ class Bytes {
 		return s.toString();
 	}
 
-	public inline function getData() : BytesData {
+	/**
+		Returns the bytes of `this` instance as `BytesData`.
+	**/
+	public inline function getData():BytesData {
 		return b;
 	}
 
-	public static function alloc( length : Int ) : Bytes {
+	/**
+		Returns a new `Bytes` instance with the given `length`. The values of the
+		bytes are not initialized and may not be zero.
+	**/
+	public static function alloc(length:Int):Bytes {
 		#if neko
-		return new Bytes(length,untyped __dollar__smake(length));
+		return new Bytes(length, untyped __dollar__smake(length));
 		#elseif flash
 		var b = new flash.utils.ByteArray();
 		b.length = length;
-		return new Bytes(length,b);
-		#elseif php
-		return new Bytes(length, BytesData.alloc(length));
+		return new Bytes(length, b);
 		#elseif cpp
 		var a = new BytesData();
-		if (length>0) cpp.NativeArray.setSize(a, length);
+		if (length > 0)
+			cpp.NativeArray.setSize(a, length);
 		return new Bytes(length, a);
 		#elseif cs
 		return new Bytes(length, new cs.NativeArray(length));
@@ -480,99 +566,136 @@ class Bytes {
 		return new Bytes(length, new python.Bytearray(length));
 		#else
 		var a = new Array();
-		for( i in 0...length )
+		for (i in 0...length)
 			a.push(0);
-		return new Bytes(length,a);
+		return new Bytes(length, a);
 		#end
 	}
 
+	/**
+		Returns the `Bytes` representation of the given `String`, using the
+		specified encoding (UTF-8 by default).
+	**/
 	@:pure
-	public static function ofString( s : String ) : Bytes {
+	public static function ofString(s:String, ?encoding:Encoding):Bytes {
 		#if neko
-		return new Bytes(s.length,untyped __dollar__ssub(s.__s,0,s.length));
+		return new Bytes(s.length, untyped __dollar__ssub(s.__s, 0, s.length));
 		#elseif flash
 		var b = new flash.utils.ByteArray();
-		b.writeUTFBytes(s);
-		return new Bytes(b.length,b);
-		#elseif php
-		var x = BytesData.ofString(s);
-		return new Bytes(x.length, x);
+		if (encoding == RawNative)
+			b.writeMultiByte(s, "unicode")
+		else
+			b.writeUTFBytes(s);
+		return new Bytes(b.length, b);
 		#elseif cpp
 		var a = new BytesData();
-		untyped __global__.__hxcpp_bytes_of_string(a,s);
+		untyped __global__.__hxcpp_bytes_of_string(a, s);
 		return new Bytes(a.length, a);
 		#elseif cs
-		var b = cs.system.text.Encoding.UTF8.GetBytes(s);
+		var b = switch (encoding) {
+			case UTF8 | null:
+				cs.system.text.Encoding.UTF8.GetBytes(s);
+			case RawNative:
+				cs.system.text.Encoding.Unicode.GetBytes(s);
+		};
 		return new Bytes(b.Length, b);
 		#elseif java
-		try
-		{
-			var b:BytesData = untyped s.getBytes("UTF-8");
+		try {
+			var b:BytesData = switch (encoding) {
+				case UTF8 | null:
+					@:privateAccess s.getBytes("UTF-8");
+				case RawNative:
+					@:privateAccess s.getBytes("UTF-16LE");
+			};
 			return new Bytes(b.length, b);
+		} catch (e:Dynamic) {
+			throw e;
 		}
-		catch (e:Dynamic) throw e;
-
 		#elseif python
-			var b:BytesData = new python.Bytearray(s, "UTF-8");
-			return new Bytes(b.length, b);
-
+		var b:BytesData = new python.Bytearray(s, "UTF-8");
+		return new Bytes(b.length, b);
 		#elseif lua
-			var bytes = [for (c in 0...s.length) StringTools.fastCodeAt(s,c)];
-			return new Bytes(bytes.length, bytes);
+		var bytes = [
+			for (i in 0...lua.NativeStringTools.len(s)) {
+				lua.NativeStringTools.byte(s, i + 1);
+			}
+		];
+		return new Bytes(bytes.length, bytes);
 		#else
 		var a = new Array();
 		// utf16-decode and utf8-encode
 		var i = 0;
-		while( i < s.length ) {
-			var c : Int = StringTools.fastCodeAt(s,i++);
+		while (i < s.length) {
+			var c:Int = StringTools.fastCodeAt(s, i++);
 			// surrogate pair
-			if( 0xD800 <= c && c <= 0xDBFF )
-			       c = (c - 0xD7C0 << 10) | (StringTools.fastCodeAt(s,i++) & 0x3FF);
-			if( c <= 0x7F )
+			if (0xD800 <= c && c <= 0xDBFF)
+				c = (c - 0xD7C0 << 10) | (StringTools.fastCodeAt(s, i++) & 0x3FF);
+			if (c <= 0x7F)
 				a.push(c);
-			else if( c <= 0x7FF ) {
-				a.push( 0xC0 | (c >> 6) );
-				a.push( 0x80 | (c & 63) );
-			} else if( c <= 0xFFFF ) {
-				a.push( 0xE0 | (c >> 12) );
-				a.push( 0x80 | ((c >> 6) & 63) );
-				a.push( 0x80 | (c & 63) );
+			else if (c <= 0x7FF) {
+				a.push(0xC0 | (c >> 6));
+				a.push(0x80 | (c & 63));
+			} else if (c <= 0xFFFF) {
+				a.push(0xE0 | (c >> 12));
+				a.push(0x80 | ((c >> 6) & 63));
+				a.push(0x80 | (c & 63));
 			} else {
-				a.push( 0xF0 | (c >> 18) );
-				a.push( 0x80 | ((c >> 12) & 63) );
-				a.push( 0x80 | ((c >> 6) & 63) );
-				a.push( 0x80 | (c & 63) );
+				a.push(0xF0 | (c >> 18));
+				a.push(0x80 | ((c >> 12) & 63));
+				a.push(0x80 | ((c >> 6) & 63));
+				a.push(0x80 | (c & 63));
 			}
 		}
-		return new Bytes(a.length,a);
+		return new Bytes(a.length, a);
 		#end
 	}
 
-	public static function ofData( b : BytesData ) {
+	/**
+		Returns the `Bytes` representation of the given `BytesData`.
+	**/
+	public static function ofData(b:BytesData) {
 		#if flash
-		return new Bytes(b.length,b);
-		#elseif neko
-		return new Bytes(untyped __dollar__ssize(b),b);
-		#elseif php
 		return new Bytes(b.length, b);
+		#elseif neko
+		return new Bytes(untyped __dollar__ssize(b), b);
 		#elseif cs
-		return new Bytes(b.Length,b);
+		return new Bytes(b.Length, b);
 		#else
-		return new Bytes(b.length,b);
+		return new Bytes(b.length, b);
 		#end
 	}
 
 	/**
-		Read the most efficiently possible the n-th byte of the data.
-		Behavior when reading outside of the available data is unspecified.
+		Converts the given hexadecimal `String` to `Bytes`. `s` must be a string of
+		even length consisting only of hexadecimal digits. For example:
+		`"0FDA14058916052309"`.
 	**/
-	public inline static function fastGet( b : BytesData, pos : Int ) : Int {
+	public static function ofHex(s:String):Bytes {
+		var len:Int = s.length;
+		if ((len & 1) != 0)
+			throw "Not a hex string (odd number of digits)";
+		var ret:Bytes = Bytes.alloc(len >> 1);
+		for (i in 0...ret.length) {
+			var high = StringTools.fastCodeAt(s, i * 2);
+			var low = StringTools.fastCodeAt(s, i * 2 + 1);
+			high = (high & 0xF) + ((high & 0x40) >> 6) * 9;
+			low = (low & 0xF) + ((low & 0x40) >> 6) * 9;
+			ret.set(i, ((high << 4) | low) & 0xFF);
+		}
+
+		return ret;
+	}
+
+	/**
+		Reads the `pos`-th byte of the given `b` bytes, in the most efficient way
+		possible. Behavior when reading outside of the available data is
+		unspecified.
+	**/
+	public inline static function fastGet(b:BytesData, pos:Int):Int {
 		#if neko
-		return untyped __dollar__sget(b,pos);
+		return untyped __dollar__sget(b, pos);
 		#elseif flash
 		return b[pos];
-		#elseif php
-		return b.get(pos);
 		#elseif cpp
 		return untyped b.unsafeGet(pos);
 		#elseif java
@@ -581,5 +704,4 @@ class Bytes {
 		return b[pos];
 		#end
 	}
-
 }
diff --git a/std/haxe/io/BytesBuffer.hx b/std/haxe/io/BytesBuffer.hx
index 88c69735a3b9afff844917bcf869441fa0ec36f7..e7c878e4fefefc18d24dbac51bb836e0d13f7b23 100644
--- a/std/haxe/io/BytesBuffer.hx
+++ b/std/haxe/io/BytesBuffer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,28 +19,28 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 class BytesBuffer {
-
 	#if neko
-	var b : Dynamic; // neko string buffer
+	var b:Dynamic; // neko string buffer
 	#elseif flash
-	var b : flash.utils.ByteArray;
-	#elseif php
-	var b : String;
+	var b:flash.utils.ByteArray;
 	#elseif cpp
-	var b : BytesData;
+	var b:BytesData;
 	#elseif cs
-	var b : cs.system.io.MemoryStream;
+	var b:cs.system.io.MemoryStream;
 	#elseif java
-	var b : java.io.ByteArrayOutputStream;
+	var b:java.io.ByteArrayOutputStream;
+	#elseif python
+	var b:python.Bytearray;
 	#else
-	var b : Array<Int>;
+	var b:Array<Int>;
 	#end
 
 	/** The length of the buffer in bytes. **/
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
 	public function new() {
 		#if neko
@@ -48,24 +48,24 @@ class BytesBuffer {
 		#elseif flash
 		b = new flash.utils.ByteArray();
 		b.endian = flash.utils.Endian.LITTLE_ENDIAN;
-		#elseif php
-		b = "";
 		#elseif cpp
 		b = new BytesData();
 		#elseif cs
 		b = new cs.system.io.MemoryStream();
 		#elseif java
 		b = new java.io.ByteArrayOutputStream();
+		#elseif python
+		b = new python.Bytearray();
 		#else
 		b = new Array();
 		#end
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		#if neko
-		return untyped __dollar__ssize( StringBuf.__to_string(b) );
+		return untyped __dollar__ssize(StringBuf.__to_string(b));
 		#elseif cs
-		return haxe.Int64.toInt( b.Length );
+		return haxe.Int64.toInt(b.Length);
 		#elseif java
 		return b.size();
 		#else
@@ -73,31 +73,29 @@ class BytesBuffer {
 		#end
 	}
 
-	public inline function addByte( byte : Int ) {
+	public inline function addByte(byte:Int) {
 		#if neko
-		untyped StringBuf.__add_char(b,byte);
+		untyped StringBuf.__add_char(b, byte);
 		#elseif flash
 		b.writeByte(byte);
-		#elseif php
-		b += untyped __call__("chr", byte);
 		#elseif cpp
 		b.push(untyped byte);
 		#elseif cs
 		b.WriteByte(cast byte);
 		#elseif java
 		b.write(byte);
+		#elseif python
+		b.append(byte);
 		#else
 		b.push(byte);
 		#end
 	}
 
-	public inline function add( src : Bytes ) {
+	public inline function add(src:Bytes) {
 		#if neko
-		untyped StringBuf.__add(b,src.getData());
+		untyped StringBuf.__add(b, src.getData());
 		#elseif flash
 		b.writeBytes(src.getData());
-		#elseif php
-		b += src.getData().toString();
 		#elseif cs
 		b.Write(src.getData(), 0, src.length);
 		#elseif java
@@ -105,43 +103,50 @@ class BytesBuffer {
 		#elseif js
 		var b1 = b;
 		var b2 = @:privateAccess src.b;
-		for( i in 0...src.length )
+		for (i in 0...src.length)
 			b.push(b2[i]);
+		#elseif python
+		b.extend(src.getData());
 		#else
 		var b1 = b;
 		var b2 = src.getData();
-		for( i in 0...src.length )
+		for (i in 0...src.length)
 			b.push(b2[i]);
 		#end
 	}
 
-	public inline function addString( v : String ) {
+	public inline function addString(v:String, ?encoding:Encoding) {
 		#if neko
 		untyped StringBuf.__add(b, v.__s);
 		#elseif flash
-		b.writeUTFBytes(v);
+		if (encoding == RawNative)
+			b.writeMultiByte(v, "unicode")
+		else
+			b.writeUTFBytes(v);
+		#elseif python
+		b.extend(new python.Bytearray(v, "UTF-8"));
 		#else
-		add(Bytes.ofString(v));
+		add(Bytes.ofString(v, encoding));
 		#end
 	}
 
-	public #if flash inline #end function addInt32( v : Int ) {
+	public #if flash inline #end function addInt32(v:Int) {
 		#if flash
 		b.writeUnsignedInt(v);
 		#else
-		addByte(v&0xFF);
-		addByte((v>>8)&0xFF);
-		addByte((v>>16)&0xFF);
-		addByte(v>>>24);
+		addByte(v & 0xFF);
+		addByte((v >> 8) & 0xFF);
+		addByte((v >> 16) & 0xFF);
+		addByte(v >>> 24);
 		#end
 	}
 
-	public #if flash inline #end function addInt64( v : haxe.Int64 ) {
+	public #if flash inline #end function addInt64(v:haxe.Int64) {
 		addInt32(v.low);
 		addInt32(v.high);
 	}
 
-	public inline function addFloat( v : Float ) {
+	public inline function addFloat(v:Float) {
 		#if flash
 		b.writeFloat(v);
 		#else
@@ -149,7 +154,7 @@ class BytesBuffer {
 		#end
 	}
 
-	public inline function addDouble( v : Float ) {
+	public inline function addDouble(v:Float) {
 		#if flash
 		b.writeDouble(v);
 		#else
@@ -157,16 +162,19 @@ class BytesBuffer {
 		#end
 	}
 
-	public inline function addBytes( src : Bytes, pos : Int, len : Int ) {
+	public inline function addBytes(src:Bytes, pos:Int, len:Int) {
 		#if !neko
-		if( pos < 0 || len < 0 || pos + len > src.length ) throw Error.OutsideBounds;
+		if (pos < 0 || len < 0 || pos + len > src.length)
+			throw Error.OutsideBounds;
 		#end
 		#if neko
-		try untyped StringBuf.__add_sub(b,src.getData(),pos,len) catch( e : Dynamic ) throw Error.OutsideBounds;
+		try
+			untyped StringBuf.__add_sub(b, src.getData(), pos, len)
+		catch (e:Dynamic)
+			throw Error.OutsideBounds;
 		#elseif flash
-		if( len > 0 ) b.writeBytes(src.getData(),pos,len);
-		#elseif php
-		b += src.getData().sub(pos, len).toString() ;
+		if (len > 0)
+			b.writeBytes(src.getData(), pos, len);
 		#elseif cs
 		b.Write(src.getData(), pos, len);
 		#elseif java
@@ -174,45 +182,44 @@ class BytesBuffer {
 		#elseif js
 		var b1 = b;
 		var b2 = @:privateAccess src.b;
-		for( i in pos...pos+len )
+		for (i in pos...pos + len)
 			b.push(b2[i]);
+		#elseif python
+		b.extend(python.Syntax.code("{0}[{1}:{2}]", src.getData(), pos, pos + len));
 		#else
 		var b1 = b;
 		var b2 = src.getData();
-		for( i in pos...pos+len )
+		for (i in pos...pos + len)
 			b.push(b2[i]);
 		#end
 	}
 
 	/**
 		Returns either a copy or a reference of the current bytes.
-		Once called, the buffer can no longer be used.
+		Once called, the buffer should no longer be used.
 	**/
-	public function getBytes() : Bytes untyped {
-		#if neko
-		var str = StringBuf.__to_string(b);
-		var bytes = new Bytes(__dollar__ssize(str),str);
-		#elseif flash
-		var bytes = new Bytes(b.length,b);
-		b.position = 0;
-		#elseif php
-		var bytes = new Bytes(b.length, BytesData.ofString(b));
-		#elseif cs
-		var buf = b.GetBuffer();
-		var bytes = new Bytes(cast b.Length, buf);
-		#elseif java
-		var buf = b.toByteArray();
-		var bytes = new Bytes(buf.length, buf);
-		#elseif python
-		var buf = new python.Bytearray(b);
-		var bytes = new Bytes(buf.length, buf);
-		#elseif js
-		var bytes = new Bytes(new js.html.Uint8Array(b).buffer);
-		#else
-		var bytes = new Bytes(b.length,b);
-		#end
-		b = null;
-		return bytes;
-	}
-
+	public function getBytes():Bytes
+		untyped {
+			#if neko
+			var str = StringBuf.__to_string(b);
+			var bytes = new Bytes(__dollar__ssize(str), str);
+			#elseif flash
+			var bytes = new Bytes(b.length, b);
+			b.position = 0;
+			#elseif cs
+			var buf = b.GetBuffer();
+			var bytes = new Bytes(cast b.Length, buf);
+			#elseif java
+			var buf = b.toByteArray();
+			var bytes = new Bytes(buf.length, buf);
+			#elseif python
+			var bytes = new Bytes(b.length, b);
+			#elseif js
+			var bytes = new Bytes(new js.lib.Uint8Array(b).buffer);
+			#else
+			var bytes = new Bytes(b.length, b);
+			#end
+			b = null;
+			return bytes;
+		}
 }
diff --git a/std/haxe/io/BytesData.hx b/std/haxe/io/BytesData.hx
index 4e1f61ae3e54829ff193b844bb351af155e08bfe..a7a443c713f8537838e7202b4531ef601ef09b38 100644
--- a/std/haxe/io/BytesData.hx
+++ b/std/haxe/io/BytesData.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,45 +19,52 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 #if neko
-	typedef BytesData =	neko.NativeString;
+typedef BytesData = neko.NativeString;
 #elseif flash
-	typedef BytesData =	flash.utils.ByteArray;
-#elseif php
-	typedef BytesData = php.BytesData;
+typedef BytesData = flash.utils.ByteArray;
 #elseif cpp
-	typedef BytesData = Array< cpp.UInt8 >;
+typedef BytesData = Array<cpp.UInt8>;
 #elseif java
-	typedef BytesData = java.NativeArray<java.StdTypes.Int8>;
+typedef BytesData = java.NativeArray<java.StdTypes.Int8>;
 #elseif cs
-	typedef BytesData = cs.NativeArray<cs.StdTypes.UInt8>;
+typedef BytesData = cs.NativeArray<cs.StdTypes.UInt8>;
 #elseif python
-	typedef BytesData = python.Bytearray;
+typedef BytesData = python.Bytearray;
 #elseif js
-	typedef BytesData = js.html.ArrayBuffer;
+typedef BytesData = js.lib.ArrayBuffer;
 #elseif hl
-	class BytesDataImpl {
-		public var bytes : hl.Bytes;
-		public var length : Int;
-		public function new(b,length) {
-			this.bytes = b;
-			this.length = length;
-		}
+class BytesDataImpl {
+	public var bytes:hl.Bytes;
+	public var length:Int;
+
+	public function new(b, length) {
+		this.bytes = b;
+		this.length = length;
+	}
+}
+
+@:forward(bytes, length)
+abstract BytesDataAbstract(BytesDataImpl) {
+	public inline function new(b, length) {
+		this = new BytesDataImpl(b, length);
 	}
-	@:forward(bytes,length)
-	abstract BytesDataAbstract(BytesDataImpl) {
-		public inline function new(b, length) {
-			this = new BytesDataImpl(b, length);
-		}
-		@:arrayAccess inline function get(i:Int) return this.bytes[i];
-		@:arrayAccess inline function set(i:Int,v:Int) return this.bytes[i] = v;
-		@:to inline function toBytes() : hl.Bytes {
-			return this == null ? null : this.bytes;
-		}
+
+	@:arrayAccess inline function get(i:Int)
+		return this.bytes[i];
+
+	@:arrayAccess inline function set(i:Int, v:Int)
+		return this.bytes[i] = v;
+
+	@:to inline function toBytes():hl.Bytes {
+		return this == null ? null : this.bytes;
 	}
-	typedef BytesData = BytesDataAbstract;
+}
+
+typedef BytesData = BytesDataAbstract;
 #else
-	typedef BytesData = Array<Int>;
+typedef BytesData = Array<Int>;
 #end
diff --git a/std/haxe/io/BytesInput.hx b/std/haxe/io/BytesInput.hx
index 3ca2a6c211c5b7c0abe15ef776002031379c6441..9d63d365855b5adef52ef98118ad879adbf1b2b6 100644
--- a/std/haxe/io/BytesInput.hx
+++ b/std/haxe/io/BytesInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,33 +19,37 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 class BytesInput extends Input {
-	var b : #if js js.html.Uint8Array #elseif hl hl.Bytes #else BytesData #end;
+	var b:#if js js.lib.Uint8Array #elseif hl hl.Bytes #else BytesData #end;
 	#if !flash
-	var pos : Int;
-	var len : Int;
-	var totlen : Int;
+	var pos:Int;
+	var len:Int;
+	var totlen:Int;
 	#end
 
 	/** The current position in the stream in bytes. */
-	public var position(get,set) : Int;
+	public var position(get, set):Int;
 
 	/** The length of the stream in bytes. */
-	public var length(get,never) : Int;
-
-	public function new( b : Bytes, ?pos : Int, ?len : Int ) {
-		if( pos == null ) pos = 0;
-		if( len == null ) len = b.length - pos;
-		if( pos < 0 || len < 0 || pos + len > b.length ) throw Error.OutsideBounds;
+	public var length(get, never):Int;
+
+	public function new(b:Bytes, ?pos:Int, ?len:Int) {
+		if (pos == null)
+			pos = 0;
+		if (len == null)
+			len = b.length - pos;
+		if (pos < 0 || len < 0 || pos + len > b.length)
+			throw Error.OutsideBounds;
 		#if flash
 		var ba = b.getData();
 		ba.position = pos;
-		if( len != ba.bytesAvailable ) {
+		if (len != ba.bytesAvailable) {
 			// truncate
 			this.b = new flash.utils.ByteArray();
-			ba.readBytes(this.b,0,len);
+			ba.readBytes(this.b, 0, len);
 		} else
 			this.b = ba;
 		this.b.endian = flash.utils.Endian.LITTLE_ENDIAN;
@@ -60,7 +64,7 @@ class BytesInput extends Input {
 		#end
 	}
 
-	inline function get_position() : Int {
+	inline function get_position():Int {
 		#if flash
 		return b.position;
 		#else
@@ -68,7 +72,7 @@ class BytesInput extends Input {
 		#end
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		#if flash
 		return b.length;
 		#else
@@ -76,9 +80,11 @@ class BytesInput extends Input {
 		#end
 	}
 
-	function set_position( p : Int ) : Int {
-		if( p < 0 ) p = 0;
-		else if( p > length ) p = length;
+	function set_position(p:Int):Int {
+		if (p < 0)
+			p = 0;
+		else if (p > length)
+			p = length;
 		#if flash
 		return b.position = p;
 		#else
@@ -87,71 +93,80 @@ class BytesInput extends Input {
 		#end
 	}
 
-	public override function readByte() : Int {
+	public override function readByte():Int {
 		#if flash
-			return try b.readUnsignedByte() catch( e : Dynamic ) throw new Eof();
+		return try b.readUnsignedByte() catch (e:Dynamic) throw new Eof();
 		#else
-			if( this.len == 0 )
-				throw new Eof();
-			len--;
-			#if neko
-			return untyped __dollar__sget(b,pos++);
-			#elseif php
-			return b.get(pos++);
-			#elseif cpp
-			return untyped b[pos++];
-			#elseif java
-			return untyped b[pos++] & 0xFF;
-			#else
-			return b[pos++];
-			#end
+		if (this.len == 0)
+			throw new Eof();
+		len--;
+		#if neko
+		return untyped __dollar__sget(b, pos++);
+		#elseif cpp
+		return untyped b[pos++];
+		#elseif java
+		return untyped b[pos++] & 0xFF;
+		#elseif python // dodge https://github.com/HaxeFoundation/haxe/issues/5080
+		var b = b[pos];
+		pos++;
+		return b;
+		#else
+		return b[pos++];
+		#end
 		#end
 	}
 
-	public override function readBytes( buf : Bytes, pos, len ) : Int {
+	public override function readBytes(buf:Bytes, pos:Int, len:Int):Int {
 		#if !neko
-			if( pos < 0 || len < 0 || pos + len > buf.length )
-				throw Error.OutsideBounds;
+		if (pos < 0 || len < 0 || pos + len > buf.length)
+			throw Error.OutsideBounds;
 		#end
 		#if flash
-			var avail : Int = b.bytesAvailable;
-			if( len > avail && avail > 0 ) len = avail;
-			try b.readBytes(buf.getData(),pos,len) catch( e : Dynamic ) throw new Eof();
+		var avail:Int = b.bytesAvailable;
+		if (len > avail && avail > 0)
+			len = avail;
+		try
+			b.readBytes(buf.getData(), pos, len)
+		catch (e:Dynamic)
+			throw new Eof();
 		#elseif java
-			var avail : Int = this.len;
-			if ( len > avail ) len = avail;
-			if (len == 0)
-				throw new Eof();
-			java.lang.System.arraycopy(this.b, this.pos, buf.getData(), pos, len);
-			this.pos += len;
-			this.len -= len;
+		var avail:Int = this.len;
+		if (len > avail)
+			len = avail;
+		if (len == 0)
+			throw new Eof();
+		java.lang.System.arraycopy(this.b, this.pos, buf.getData(), pos, len);
+		this.pos += len;
+		this.len -= len;
 		#elseif cs
-			var avail : Int = this.len;
-			if ( len > avail ) len = avail;
-			if (len == 0)
-				throw new Eof();
-			cs.system.Array.Copy(this.b,this.pos, buf.getData(), pos, len);
-			this.pos += len;
-			this.len -= len;
+		var avail:Int = this.len;
+		if (len > avail)
+			len = avail;
+		if (len == 0)
+			throw new Eof();
+		cs.system.Array.Copy(this.b, this.pos, buf.getData(), pos, len);
+		this.pos += len;
+		this.len -= len;
 		#else
-			if( this.len == 0 && len > 0 )
-				throw new Eof();
-			if( this.len < len )
-				len = this.len;
-			#if neko
-			try untyped __dollar__sblit(buf.getData(),pos,b,this.pos,len) catch( e : Dynamic ) throw Error.OutsideBounds;
-			#elseif php
-			buf.getData().blit(pos, b, this.pos, len);
-			#elseif hl
-			@:privateAccess buf.b.blit(pos, b, this.pos, len);
-			#else
-			var b1 = b;
-			var b2 = #if js @:privateAccess buf.b #else buf.getData() #end;
-			for( i in 0...len )
-				b2[pos+i] = b1[this.pos+i];
-			#end
-			this.pos += len;
-			this.len -= len;
+		if (this.len == 0 && len > 0)
+			throw new Eof();
+		if (this.len < len)
+			len = this.len;
+		#if neko
+		try
+			untyped __dollar__sblit(buf.getData(), pos, b, this.pos, len)
+		catch (e:Dynamic)
+			throw Error.OutsideBounds;
+		#elseif hl
+		@:privateAccess buf.b.blit(pos, b, this.pos, len);
+		#else
+		var b1 = b;
+		var b2 = #if js @:privateAccess buf.b #else buf.getData() #end;
+		for (i in 0...len)
+			b2[pos + i] = b1[this.pos + i];
+		#end
+		this.pos += len;
+		this.len -= len;
 		#end
 		return len;
 	}
@@ -166,39 +181,37 @@ class BytesInput extends Input {
 
 	@:dox(hide)
 	override function readFloat() {
-		return try b.readFloat() catch( e : Dynamic ) throw new Eof();
+		return try b.readFloat() catch (e:Dynamic) throw new Eof();
 	}
 
 	@:dox(hide)
 	override function readDouble() {
-		return try b.readDouble() catch( e : Dynamic ) throw new Eof();
+		return try b.readDouble() catch (e:Dynamic) throw new Eof();
 	}
 
 	@:dox(hide)
 	override function readInt8() {
-		return try b.readByte() catch( e : Dynamic ) throw new Eof();
+		return try b.readByte() catch (e:Dynamic) throw new Eof();
 	}
 
 	@:dox(hide)
 	override function readInt16() {
-		return try b.readShort() catch( e : Dynamic ) throw new Eof();
+		return try b.readShort() catch (e:Dynamic) throw new Eof();
 	}
 
 	@:dox(hide)
-	override function readUInt16() : Int {
-		return try b.readUnsignedShort() catch( e : Dynamic ) throw new Eof();
+	override function readUInt16():Int {
+		return try b.readUnsignedShort() catch (e:Dynamic) throw new Eof();
 	}
 
 	@:dox(hide)
-	override function readInt32() : Int {
-		return try b.readInt() catch( e : Dynamic ) throw new Eof();
+	override function readInt32():Int {
+		return try b.readInt() catch (e:Dynamic) throw new Eof();
 	}
 
 	@:dox(hide)
-	override function readString( len : Int ) {
-		return try b.readUTFBytes(len) catch( e : Dynamic ) throw new Eof();
+	override function readString(len:Int, ?encoding:Encoding) {
+		return try encoding == RawNative ? b.readMultiByte(len, "unicode") : b.readUTFBytes(len) catch (e:Dynamic) throw new Eof();
 	}
-
 	#end
-
 }
diff --git a/std/haxe/io/BytesOutput.hx b/std/haxe/io/BytesOutput.hx
index 8f5ea7fa0d3bdcd36df316ebe1f328c10d5ea6b8..f6391615e29edc3956ff8563d7bcead77af6110b 100644
--- a/std/haxe/io/BytesOutput.hx
+++ b/std/haxe/io/BytesOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,18 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 class BytesOutput extends Output {
-
 	#if flash
-	var b : flash.utils.ByteArray;
+	var b:flash.utils.ByteArray;
 	#else
-	var b : BytesBuffer;
+	var b:BytesBuffer;
 	#end
 
 	/** The length of the stream in bytes. **/
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
 	public function new() {
 		#if flash
@@ -44,7 +44,7 @@ class BytesOutput extends Output {
 		#end
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return b.length;
 	}
 
@@ -56,12 +56,13 @@ class BytesOutput extends Output {
 		#end
 	}
 
-	override function writeBytes( buf : Bytes, pos, len ) : Int {
+	override function writeBytes(buf:Bytes, pos, len):Int {
 		#if flash
-		if( pos < 0 || len < 0 || pos + len > buf.length ) throw Error.OutsideBounds;
-		b.writeBytes(buf.getData(),pos,len);
+		if (pos < 0 || len < 0 || pos + len > buf.length)
+			throw Error.OutsideBounds;
+		b.writeBytes(buf.getData(), pos, len);
 		#else
-		b.addBytes(buf,pos,len);
+		b.addBytes(buf, pos, len);
 		#end
 		return len;
 	}
@@ -77,49 +78,54 @@ class BytesOutput extends Output {
 	}
 
 	@:dox(hide)
-	override function writeFloat( f : Float ) {
+	override function writeFloat(f:Float) {
 		b.writeFloat(f);
 	}
 
 	@:dox(hide)
-	override function writeDouble( f : Float ) {
+	override function writeDouble(f:Float) {
 		b.writeDouble(f);
 	}
 
 	@:dox(hide)
-	override function writeInt8( x : Int ) {
-		if( x < -0x80 || x >= 0x80 )
+	override function writeInt8(x:Int) {
+		if (x < -0x80 || x >= 0x80)
 			throw Error.Overflow;
 		b.writeByte(x);
 	}
 
 	@:dox(hide)
-	override function writeInt16( x : Int ) {
-		if( x < -0x8000 || x >= 0x8000 ) throw Error.Overflow;
+	override function writeInt16(x:Int) {
+		if (x < -0x8000 || x >= 0x8000)
+			throw Error.Overflow;
 		b.writeShort(x);
 	}
 
 	@:dox(hide)
-	override function writeUInt16( x : Int ) {
-		if( x < 0 || x >= 0x10000 ) throw Error.Overflow;
+	override function writeUInt16(x:Int) {
+		if (x < 0 || x >= 0x10000)
+			throw Error.Overflow;
 		b.writeShort(x);
 	}
 
 	@:dox(hide)
-	override function writeInt32( x : Int ) {
+	override function writeInt32(x:Int) {
 		b.writeInt(x);
 	}
 
 	@:dox(hide)
-	override function prepare( size : Int ) {
-		if( size > 0 ) b[size-1] = b[size-1];
+	override function prepare(size:Int) {
+		if (size > 0)
+			b[size - 1] = b[size - 1];
 	}
 
 	@:dox(hide)
-	override function writeString( s : String ) {
-		b.writeUTFBytes(s);
+	override function writeString(s:String, ?encoding:Encoding) {
+		if (encoding == RawNative)
+			b.writeMultiByte(s, "unicode");
+		else
+			b.writeUTFBytes(s);
 	}
-
 	#end
 
 	/**
@@ -128,14 +134,13 @@ class BytesOutput extends Output {
 		This function should not be called more than once on a given
 		`BytesOutput` instance.
 	**/
-	public function getBytes() : Bytes {
+	public function getBytes():Bytes {
 		#if flash
 		var bytes = b;
 		b = null;
-		return untyped new Bytes(bytes.length,bytes);
+		return untyped new Bytes(bytes.length, bytes);
 		#else
 		return b.getBytes();
 		#end
 	}
-
 }
diff --git a/std/lua/lib/environ/Environ.hx b/std/haxe/io/Encoding.hx
similarity index 79%
rename from std/lua/lib/environ/Environ.hx
rename to std/haxe/io/Encoding.hx
index 769287f6d25fded1bc07fc5b936c161964f9045c..d51cdd65b441af7c4c9cafb1860be72b6fe4c3f9 100644
--- a/std/lua/lib/environ/Environ.hx
+++ b/std/haxe/io/Encoding.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,11 +20,16 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package lua.lib.environ;
-@:luaRequire("environ.process")
-extern class Environ {
-	static function getenv(arg : String) : String;
-	static function setenv(arg : String, value : String) : Bool;
-	static var ENV : Table<String, String>;
-}
+package haxe.io;
+
+/**
+	String binary encoding supported by Haxe I/O
+**/
+enum Encoding {
+	UTF8;
 
+	/**
+		Output the string the way the platform represent it in memory. This is the most efficient but is platform-specific
+	**/
+	RawNative;
+}
diff --git a/std/haxe/io/Eof.hx b/std/haxe/io/Eof.hx
index 1fe3ac7a990df243a3211e9b1010f6327b8e720a..75dea4098cc3155aa15a245ab815bc28ef184354 100644
--- a/std/haxe/io/Eof.hx
+++ b/std/haxe/io/Eof.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,17 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 /**
 	This exception is raised when reading while data is no longer available in the `haxe.io.Input`.
 **/
 class Eof {
-	public function new() {
-	}
-	@:keep function toString() {
+	public function new() {}
+
+	@:ifFeature("haxe.io.Eof.*")
+	function toString() {
 		return "Eof";
 	}
 }
diff --git a/std/haxe/io/Error.hx b/std/haxe/io/Error.hx
index 86c9dc5951eed39d919f476cc049803f1898623e..7dece351d33a1fb81d1344c07e1a0a11ad62c84e 100644
--- a/std/haxe/io/Error.hx
+++ b/std/haxe/io/Error.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 /**
@@ -27,10 +28,13 @@ package haxe.io;
 enum Error {
 	/** The IO is set into nonblocking mode and some data cannot be read or written **/
 	Blocked;
+
 	/** An integer value is outside its allowed range **/
 	Overflow;
+
 	/** An operation on Bytes is outside of its valid range **/
 	OutsideBounds;
+
 	/** Other errors **/
-	Custom( e : Dynamic );
+	Custom(e:Dynamic);
 }
diff --git a/std/haxe/io/FPHelper.hx b/std/haxe/io/FPHelper.hx
index 17a04c35e3441f76eb21d7205a5a3355f6fb6ec9..0d7af0e8722ca0f8b13dde883c8778768b82ab22 100644
--- a/std/haxe/io/FPHelper.hx
+++ b/std/haxe/io/FPHelper.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 /**
@@ -26,188 +27,236 @@ package haxe.io;
 	Always works in low-endian encoding.
 **/
 class FPHelper {
-
 	#if neko_v21
 	// stored in helper
 	#elseif neko
-	static var i64tmp = new neko.vm.Tls<Int64>();
-	#elseif !(java || cs)
+	static var i64tmp = new sys.thread.Tls<Int64>();
+	#elseif !(java || cs || cpp)
 	static var i64tmp = Int64.ofInt(0);
+
+	static inline var LN2 = 0.6931471805599453; // Math.log(2)
+
+	static inline function _i32ToFloat(i:Int):Float {
+		var sign = 1 - ((i >>> 31) << 1);
+		var e = (i >> 23) & 0xff;
+		if (e == 255)
+			return i & 0x7fffff == 0 ? (sign > 0 ? Math.POSITIVE_INFINITY : Math.NEGATIVE_INFINITY) : Math.NaN;
+		var m = e == 0 ? (i & 0x7fffff) << 1 : (i & 0x7fffff) | 0x800000;
+		return sign * m * Math.pow(2, e - 150);
+	}
+
+	static inline function _i64ToDouble(lo:Int, hi:Int):Float {
+		var sign = 1 - ((hi >>> 31) << 1);
+		var e = (hi >> 20) & 0x7ff;
+		if (e == 2047)
+			return lo == 0 && (hi & 0xFFFFF) == 0 ? (sign > 0 ? Math.POSITIVE_INFINITY : Math.NEGATIVE_INFINITY) : Math.NaN;
+		var m = 2.220446049250313e-16 * ((hi & 0xFFFFF) * 4294967296. + (lo >>> 31) * 2147483648. + (lo & 0x7FFFFFFF));
+		m = e == 0 ? m * 2.0 : m + 1.0;
+		return sign * m * Math.pow(2, e - 1023);
+	}
+
+	static inline function _floatToI32(f:Float):Int {
+		if (f == 0)
+			return 0;
+		var af = f < 0 ? -f : f;
+		var exp = Math.floor(Math.log(af) / LN2);
+		if (exp > 127) {
+			return 0x7F800000;
+		} else {
+			if (exp <= -127) {
+				exp = -127;
+				af *= 7.1362384635298e+44; // af * 0.5 * 0x800000 / Math.pow(2, -127)
+			} else {
+				af = (af / Math.pow(2, exp) - 1.0) * 0x800000;
+			}
+			return (f < 0 ? 0x80000000 : 0) | ((exp + 127) << 23) | Math.round(af);
+		}
+	}
+
+	static inline function _doubleToI64(v:Float):Int64@:privateAccess {
+		var i64 = i64tmp;
+		if (v == 0) {
+			i64.set_low(0);
+			i64.set_high(0);
+		} else if (!Math.isFinite(v)) {
+			i64.set_low(0);
+			i64.set_high(v > 0 ? 0x7FF00000 : 0xFFF00000);
+		} else {
+			var av = v < 0 ? -v : v;
+			var exp = Math.floor(Math.log(av) / LN2);
+			if (exp > 1023) {
+				i64.set_low(0xFFFFFFFF);
+				i64.set_high(0x7FEFFFFF);
+			} else {
+				if (exp <= -1023) {
+					exp = -1023;
+					av = av / 2.2250738585072014e-308;
+				} else {
+					av = av / Math.pow(2, exp) - 1.0;
+				}
+				var sig = Math.fround(av * 4503599627370496.); // 2^52
+				// Note: If "sig" is outside of the signed Int32 range, the result is unspecified in HL, C#, Java and Neko,
+				var sig_l = Std.int(sig);
+				var sig_h = Std.int(sig / 4294967296.0);
+				i64.set_low(sig_l);
+				i64.set_high((v < 0 ? 0x80000000 : 0) | ((exp + 1023) << 20) | sig_h);
+			}
+		}
+		return i64;
+	}
 	#end
 
 	#if neko
-		#if neko_v21
-		static var helpers = new neko.vm.Tls<neko.NativeArray<Dynamic>>();
-		#else
-		static var helperf = new neko.vm.Tls<neko.NativeString>();
-		static var helperd = new neko.vm.Tls<neko.NativeString>();
-		static var _float_of_bytes = neko.Lib.load("std","float_of_bytes",2);
-		static var _double_of_bytes = neko.Lib.load("std","double_of_bytes",2);
-		static var _float_bytes = neko.Lib.load("std","float_bytes",2);
-		static var _double_bytes = neko.Lib.load("std","double_bytes",2);
-		#end
-	#elseif flash
-		static var helper = {
-			var b = new flash.utils.ByteArray();
-			b.endian = flash.utils.Endian.LITTLE_ENDIAN;
-			b;
-		}
-	#elseif php
-		static var isLittleEndian : Bool = untyped __call__('unpack','S','\x01\x00')[1] == 1;
+	#if neko_v21
+	static var helpers = new sys.thread.Tls<neko.NativeArray<Dynamic>>();
 	#else
-		static inline var LN2 = 0.6931471805599453; // Math.log(2)
+	static var helperf = new sys.thread.Tls<neko.NativeString>();
+	static var helperd = new sys.thread.Tls<neko.NativeString>();
+	static var _float_of_bytes = neko.Lib.load("std", "float_of_bytes", 2);
+	static var _double_of_bytes = neko.Lib.load("std", "double_of_bytes", 2);
+	static var _float_bytes = neko.Lib.load("std", "float_bytes", 2);
+	static var _double_bytes = neko.Lib.load("std", "double_bytes", 2);
+	#end
+	#elseif flash
+	static var helper = {
+		var b = new flash.utils.ByteArray();
+		b.endian = flash.utils.Endian.LITTLE_ENDIAN;
+		b;
+	}
+	#elseif js
+	static var helper = new js.lib.DataView(new js.lib.ArrayBuffer(8));
 	#end
 
-	#if neko_v21 inline #end
-	public static function i32ToFloat( i : Int ) : Float {
+	#if neko_v21
+	inline
+	#end
+	public static function i32ToFloat(i:Int):Float {
 		#if neko
-			#if neko_v21
-			return untyped $itof(i,false);
-			#else
-			var helper = helperf.value;
-			if( helper == null )
-				helperf.value = helper = neko.NativeString.alloc(4);
-			untyped $sset(helper,0,i&0xFF);
-			untyped $sset(helper,1,(i>>8)&0xFF);
-			untyped $sset(helper,2,(i>>16)&0xFF);
-			untyped $sset(helper,3,i>>>24);
-			return _float_of_bytes(helper,false);
-			#end
+		#if neko_v21
+		return untyped $itof(i, false);
+		#else
+		var helper = helperf.value;
+		if (helper == null)
+			helperf.value = helper = neko.NativeString.alloc(4);
+		untyped $sset(helper, 0, i & 0xFF);
+		untyped $sset(helper, 1, (i >> 8) & 0xFF);
+		untyped $sset(helper, 2, (i >> 16) & 0xFF);
+		untyped $sset(helper, 3, i >>> 24);
+		return _float_of_bytes(helper, false);
+		#end
 		#elseif cpp
-			return untyped __global__.__hxcpp_reinterpret_le_int32_as_float32(i);
+		return untyped __global__.__hxcpp_reinterpret_le_int32_as_float32(i);
 		#elseif cs
-			var helper = new SingleHelper(0);
-			if( cs.system.BitConverter.IsLittleEndian )
-			{
-				helper.i = i;
-			} else {
-				helper.i = ((i >>> 24) & 0xFF) | (((i >> 16) & 0xFF) << 8) | (((i >> 8) & 0xFF) << 16) | ((i & 0xFF) << 24);
-			}
+		var helper = new SingleHelper(0);
+		if (cs.system.BitConverter.IsLittleEndian) {
+			helper.i = i;
+		} else {
+			helper.i = ((i >>> 24) & 0xFF) | (((i >> 16) & 0xFF) << 8) | (((i >> 8) & 0xFF) << 16) | ((i & 0xFF) << 24);
+		}
 
-			return helper.f;
+		return helper.f;
 		#elseif java
-			return java.lang.Float.FloatClass.intBitsToFloat(i);
-		#elseif php
-			return untyped  __call__('unpack', 'f', __call__('pack', 'l', i))[1];
+		return java.lang.Float.FloatClass.intBitsToFloat(i);
 		#elseif flash
-			var helper = helper;
-			helper.position = 0;
-			helper.writeUnsignedInt(i);
-			helper.position = 0;
-			return helper.readFloat();
+		var helper = helper;
+		helper.position = 0;
+		helper.writeUnsignedInt(i);
+		helper.position = 0;
+		return helper.readFloat();
+		#elseif js
+		helper.setInt32(0, i, true);
+		return helper.getFloat32(0, true);
 		#else
-			var sign = 1 - ((i >>> 31) << 1);
-			var exp = (i >>> 23) & 0xFF;
-			var sig = i & 0x7FFFFF;
-			if( sig == 0 && exp == 0 )
-				return 0.0;
-			return sign*(1 + Math.pow(2, -23)*sig) * Math.pow(2, exp-127);
+		return _i32ToFloat(i);
 		#end
 	}
 
-	#if neko_v21 inline #end
-	public static function floatToI32( f : Float ) : Int {
+	#if neko_v21
+	inline
+	#end
+	public static function floatToI32(f:Float):Int {
 		#if neko
-			#if neko_v21
-			return untyped $ftoi(f,false);
-			#else
-			var r = _float_bytes(f,false);
-			return untyped $sget(r,0) | ($sget(r,1)<<8) | ($sget(r,2)<<16) | ($sget(r,3)<<24);
-			#end
+		#if neko_v21
+		return untyped $ftoi(f, false);
+		#else
+		var r = _float_bytes(f, false);
+		return untyped $sget(r, 0) | ($sget(r, 1) << 8) | ($sget(r, 2) << 16) | ($sget(r, 3) << 24);
+		#end
 		#elseif cpp
-			return untyped __global__.__hxcpp_reinterpret_float32_as_le_int32(f);
+		return untyped __global__.__hxcpp_reinterpret_float32_as_le_int32(f);
 		#elseif cs
-			var helper = new SingleHelper(f);
-			if( cs.system.BitConverter.IsLittleEndian )
-			{
-				return helper.i;
-			} else {
-				var i = helper.i;
-				return ((i >>> 24) & 0xFF) | (((i >> 16) & 0xFF) << 8) | (((i >> 8) & 0xFF) << 16) | ((i & 0xFF) << 24);
-			}
+		var helper = new SingleHelper(f);
+		if (cs.system.BitConverter.IsLittleEndian) {
+			return helper.i;
+		} else {
+			var i = helper.i;
+			return ((i >>> 24) & 0xFF) | (((i >> 16) & 0xFF) << 8) | (((i >> 8) & 0xFF) << 16) | ((i & 0xFF) << 24);
+		}
 		#elseif java
-			return java.lang.Float.FloatClass.floatToRawIntBits(f);
+		return java.lang.Float.FloatClass.floatToRawIntBits(f);
 		#elseif flash
-			var helper = helper;
-			helper.position = 0;
-			helper.writeFloat(f);
-			helper.position = 0;
-			return helper.readUnsignedInt();
-		#elseif php
-			return untyped __call__('unpack','l',__call__('pack', 'f', f))[1];
+		var helper = helper;
+		helper.position = 0;
+		helper.writeFloat(f);
+		helper.position = 0;
+		return helper.readUnsignedInt();
+		#elseif js
+		helper.setFloat32(0, f, true);
+		return helper.getInt32(0, true);
 		#else
-			if( f == 0 ) return 0;
-			var af = f < 0 ? -f : f;
-			var exp = Math.floor(Math.log(af) / LN2);
-			if( exp < -127 ) exp = -127 else if( exp > 128 ) exp = 128;
-			var sig = Math.round((af / Math.pow(2, exp) - 1) * 0x800000);
-			if( sig == 0x800000 && exp < 128 ){
-				sig = 0;
-				exp++;
-			}
-			return (f < 0 ? 0x80000000 : 0) | ((exp + 127) << 23) | sig;
+		return _floatToI32(f);
 		#end
 	}
 
-	#if neko_v21 inline #end
-	public static function i64ToDouble( low : Int, high : Int ) : Float {
+	#if neko_v21
+	inline
+	#end
+	public static function i64ToDouble(low:Int, high:Int):Float {
 		#if neko
-			#if neko_v21
-			return untyped $itod(low,high,false);
-			#else
-			var helper = helperd.value;
-			if( helper == null )
-				helperd.value = helper = neko.NativeString.alloc(8);
-			untyped $sset(helper,0,low&0xFF);
-			untyped $sset(helper,1,(low>>8)&0xFF);
-			untyped $sset(helper,2,(low>>16)&0xFF);
-			untyped $sset(helper,3,low>>>24);
-			untyped $sset(helper,4,high&0xFF);
-			untyped $sset(helper,5,(high>>8)&0xFF);
-			untyped $sset(helper,6,(high>>16)&0xFF);
-			untyped $sset(helper,7,high>>>24);
-			return _double_of_bytes(helper,false);
-			#end
+		#if neko_v21
+		return untyped $itod(low, high, false);
+		#else
+		var helper = helperd.value;
+		if (helper == null)
+			helperd.value = helper = neko.NativeString.alloc(8);
+		untyped $sset(helper, 0, low & 0xFF);
+		untyped $sset(helper, 1, (low >> 8) & 0xFF);
+		untyped $sset(helper, 2, (low >> 16) & 0xFF);
+		untyped $sset(helper, 3, low >>> 24);
+		untyped $sset(helper, 4, high & 0xFF);
+		untyped $sset(helper, 5, (high >> 8) & 0xFF);
+		untyped $sset(helper, 6, (high >> 16) & 0xFF);
+		untyped $sset(helper, 7, high >>> 24);
+		return _double_of_bytes(helper, false);
+		#end
 		#elseif cpp
-			return untyped __global__.__hxcpp_reinterpret_le_int32s_as_float64(low,high);
+		return untyped __global__.__hxcpp_reinterpret_le_int32s_as_float64(low, high);
 		#elseif cs
-			var helper = new FloatHelper(0);
-			if( cs.system.BitConverter.IsLittleEndian )
-			{
-				helper.i = haxe.Int64.make(high,low);
-			} else {
-				var i1 = high,
-				    i2 = low;
-				var j2 = ((i1 >>> 24) & 0xFF) | (((i1 >> 16) & 0xFF) << 8) | (((i1 >> 8) & 0xFF) << 16) | ((i1 & 0xFF) << 24);
-				var j1 = ((i2 >>> 24) & 0xFF) | (((i2 >> 16) & 0xFF) << 8) | (((i2 >> 8) & 0xFF) << 16) | ((i2 & 0xFF) << 24);
-				helper.i = haxe.Int64.make(j1,j2);
-			}
-			return helper.f;
+		var helper = new FloatHelper(0);
+		if (cs.system.BitConverter.IsLittleEndian) {
+			helper.i = haxe.Int64.make(high, low);
+		} else {
+			var i1 = high, i2 = low;
+			var j2 = ((i1 >>> 24) & 0xFF) | (((i1 >> 16) & 0xFF) << 8) | (((i1 >> 8) & 0xFF) << 16) | ((i1 & 0xFF) << 24);
+			var j1 = ((i2 >>> 24) & 0xFF) | (((i2 >> 16) & 0xFF) << 8) | (((i2 >> 8) & 0xFF) << 16) | ((i2 & 0xFF) << 24);
+			helper.i = haxe.Int64.make(j1, j2);
+		}
+		return helper.f;
 		#elseif java
-			return java.lang.Double.DoubleClass.longBitsToDouble( Int64.make(high,low) );
+		return java.lang.Double.DoubleClass.longBitsToDouble(Int64.make(high, low));
 		#elseif flash
-			var helper = helper;
-			helper.position = 0;
-			helper.writeUnsignedInt(low);
-			helper.writeUnsignedInt(high);
-			helper.position = 0;
-			return helper.readDouble();
-		#elseif php
-			return untyped  __call__('unpack', 'd', __call__('pack', 'ii', isLittleEndian ? low : high, isLittleEndian ? high : low))[1];
+		var helper = helper;
+		helper.position = 0;
+		helper.writeUnsignedInt(low);
+		helper.writeUnsignedInt(high);
+		helper.position = 0;
+		return helper.readDouble();
+		#elseif js
+		helper.setInt32(0, low, true);
+		helper.setInt32(4, high, true);
+		return helper.getFloat64(0, true);
 		#else
-			#if python
-			if (low == 0 && high == 2146435072) {
-				return Math.POSITIVE_INFINITY;
-			} else if (low == 0 && high == -1048576 ) {
-				return Math.NEGATIVE_INFINITY;
-			}
-			#end
-			var sign = 1 - ((high >>> 31) << 1);
-			var exp = ((high >> 20) & 0x7FF) - 1023;
-			var sig = (high&0xFFFFF) * 4294967296. + (low>>>31) * 2147483648. + (low&0x7FFFFFFF);
-			if( sig == 0 && exp == -1023 )
-				return 0.0;
-			return sign*(1.0 + Math.pow(2, -52)*sig) * Math.pow(2, exp);
+		return _i64ToDouble(low, high);
 		#end
 	}
 
@@ -216,131 +265,98 @@ class FPHelper {
 		WARNING : for performance reason, the same Int64 value might be reused every time. Copy its low/high values before calling again.
 		We still ensure that this is safe to use in a multithread environment
 	**/
-	public static function doubleToI64( v : Float ) : Int64 {
+	public static function doubleToI64(v:Float):Int64 {
 		#if neko
-			#if neko_v21
-			var helper = helpers.value;
-			if( helper == null ) {
-				helpers.value = helper = neko.NativeArray.alloc(2);
-				helper[0] = neko.NativeArray.alloc(2);
-				helper[1] = haxe.Int64.ofInt(0);
-			}
-			var i64 : haxe.Int64 = helper[1], int2 = helper[0];
-			untyped $dtoi(v,int2,false);
-			@:privateAccess {
-				i64.set_low(int2[0]);
-				i64.set_high(int2[1]);
-			}
-			return i64;
-			#else
-			var r = _double_bytes(v,false), i64 = i64tmp.value;
-			if( i64 == null )
-				i64 = i64tmp.value = haxe.Int64.ofInt(0);
-			@:privateAccess {
-				i64.set_low(untyped $sget(r,0) | ($sget(r,1)<<8) | ($sget(r,2)<<16) | ($sget(r,3)<<24));
-				i64.set_high(untyped $sget(r,4) | ($sget(r,5)<<8) | ($sget(r,6)<<16) | ($sget(r,7)<<24));
-			}
-			return i64;
-			#end
+		#if neko_v21
+		var helper = helpers.value;
+		if (helper == null) {
+			helpers.value = helper = neko.NativeArray.alloc(2);
+			helper[0] = neko.NativeArray.alloc(2);
+			helper[1] = haxe.Int64.ofInt(0);
+		}
+		var i64:haxe.Int64 = helper[1], int2 = helper[0];
+		untyped $dtoi(v, int2, false);
+		@:privateAccess {
+			i64.set_low(int2[0]);
+			i64.set_high(int2[1]);
+		}
+		return i64;
+		#else
+		var r = _double_bytes(v, false), i64 = i64tmp.value;
+		if (i64 == null)
+			i64 = i64tmp.value = haxe.Int64.ofInt(0);
+		@:privateAccess {
+			i64.set_low(untyped $sget(r, 0) | ($sget(r, 1) << 8) | ($sget(r, 2) << 16) | ($sget(r, 3) << 24));
+			i64.set_high(untyped $sget(r, 4) | ($sget(r, 5) << 8) | ($sget(r, 6) << 16) | ($sget(r, 7) << 24));
+		}
+		return i64;
+		#end
 		#elseif cpp
-			return Int64.make(untyped __global__.__hxcpp_reinterpret_float64_as_le_int32_high(v),
-				               untyped __global__.__hxcpp_reinterpret_float64_as_le_int32_low(v) );
+		return Int64.make(untyped __global__.__hxcpp_reinterpret_float64_as_le_int32_high(v),
+			untyped __global__.__hxcpp_reinterpret_float64_as_le_int32_low(v));
 		#elseif java
-			return java.lang.Double.DoubleClass.doubleToRawLongBits(v);
+		return java.lang.Double.DoubleClass.doubleToRawLongBits(v);
 		#elseif cs
-			var helper = new FloatHelper(v);
-			if( cs.system.BitConverter.IsLittleEndian )
-			{
-				return helper.i;
-			} else {
-				var i = helper.i;
-				var i1 = haxe.Int64.getHigh(i),
-				    i2 = haxe.Int64.getLow(i);
-				var j2 = ((i1 >>> 24) & 0xFF) | (((i1 >> 16) & 0xFF) << 8) | (((i1 >> 8) & 0xFF) << 16) | ((i1 & 0xFF) << 24);
-				var j1 = ((i2 >>> 24) & 0xFF) | (((i2 >> 16) & 0xFF) << 8) | (((i2 >> 8) & 0xFF) << 16) | ((i2 & 0xFF) << 24);
+		var helper = new FloatHelper(v);
+		if (cs.system.BitConverter.IsLittleEndian) {
+			return helper.i;
+		} else {
+			var i = helper.i;
+			var i1 = haxe.Int64.getHigh(i), i2 = haxe.Int64.getLow(i);
+			var j2 = ((i1 >>> 24) & 0xFF) | (((i1 >> 16) & 0xFF) << 8) | (((i1 >> 8) & 0xFF) << 16) | ((i1 & 0xFF) << 24);
+			var j1 = ((i2 >>> 24) & 0xFF) | (((i2 >> 16) & 0xFF) << 8) | (((i2 >> 8) & 0xFF) << 16) | ((i2 & 0xFF) << 24);
 
-				return haxe.Int64.make(j1,j2);
-			}
+			return haxe.Int64.make(j1, j2);
+		}
 		#elseif flash
-			var helper = helper;
-			helper.position = 0;
-			helper.writeDouble(v);
-			helper.position = 0;
-			var i64 = i64tmp;
-			@:privateAccess {
-				i64.set_low(cast helper.readUnsignedInt());
-				i64.set_high(cast helper.readUnsignedInt());
-			}
-			return i64;
-		#elseif php
-			var a = untyped __call__('unpack',isLittleEndian ? 'V2' : 'N2',__call__('pack', 'd', v));
-			var i64 = i64tmp;
-			@:privateAccess {
-				i64.set_low(a[isLittleEndian ? 1 : 2]);
-				i64.set_high(a[isLittleEndian ? 2 : 1]);
-			}
-			return i64;
+		var helper = helper;
+		helper.position = 0;
+		helper.writeDouble(v);
+		helper.position = 0;
+		var i64 = i64tmp;
+		@:privateAccess {
+			i64.set_low(cast helper.readUnsignedInt());
+			i64.set_high(cast helper.readUnsignedInt());
+		}
+		return i64;
+		#elseif js
+		var i64 = i64tmp;
+		helper.setFloat64(0, v, true);
+		@:privateAccess {
+			i64.set_low(helper.getInt32(0, true));
+			i64.set_high(helper.getInt32(4, true));
+		}
+		return i64;
 		#else
-			var i64 = i64tmp;
-			if( v == 0 ) {
-				@:privateAccess {
-					i64.set_low(0);
-					i64.set_high(0);
-				}
-			} else if (!Math.isFinite(v)) @:privateAccess {
-				if (v > 0) {
-					i64.set_low(0);
-					i64.set_high(2146435072);
-				} else {
-					i64.set_low(0);
-					i64.set_high(-1048576);
-				}
-			} else {
-				var av = v < 0 ? -v : v;
-				var exp = Math.floor(Math.log(av) / LN2);
-				var sig = Math.fround(((av / Math.pow(2, exp)) - 1) * 4503599627370496.); // 2^52
-				var sig_l = Std.int(sig);
-				var sig_h = Std.int(sig / 4294967296.0);
-				@:privateAccess {
-					i64.set_low(sig_l);
-					i64.set_high((v < 0 ? 0x80000000 : 0) | ((exp + 1023) << 20) | sig_h);
-				}
-			}
-			return i64;
+		return _doubleToI64(v);
 		#end
 	}
-
 }
 
 #if cs
 @:meta(System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Explicit))
-@:nativeGen @:struct private class SingleHelper
-{
+@:nativeGen @:struct private class SingleHelper {
 	@:meta(System.Runtime.InteropServices.FieldOffset(0))
 	public var i:Int;
 	@:meta(System.Runtime.InteropServices.FieldOffset(0))
 	public var f:Single;
 
-	public function new(f:Single)
-	{
+	public function new(f:Single) {
 		this.i = 0;
 		this.f = f;
 	}
 }
 
 @:meta(System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Explicit))
-@:nativeGen @:struct private class FloatHelper
-{
+@:nativeGen @:struct private class FloatHelper {
 	@:meta(System.Runtime.InteropServices.FieldOffset(0))
 	public var i:haxe.Int64;
 	@:meta(System.Runtime.InteropServices.FieldOffset(0))
 	public var f:Float;
 
-	public function new(f:Float)
-	{
+	public function new(f:Float) {
 		this.i = haxe.Int64.ofInt(0);
 		this.f = f;
 	}
 }
-
 #end
diff --git a/std/haxe/io/Float32Array.hx b/std/haxe/io/Float32Array.hx
index 2fb078b743359e59649392e00068fb14e20d9b44..e7e086ff36526ed6db09807b5160fd5c27148556 100644
--- a/std/haxe/io/Float32Array.hx
+++ b/std/haxe/io/Float32Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 typedef Float32ArrayData = ArrayBufferView.ArrayBufferViewData;
 
 abstract Float32Array(Float32ArrayData) {
-
 	public static inline var BYTES_PER_ELEMENT = 4;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
 
-	public inline function new( elements : Int ) {
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
+
+	public inline function new(elements:Int) {
 		this = new ArrayBufferView(elements * BYTES_PER_ELEMENT).getData();
 	}
 
@@ -37,49 +38,50 @@ abstract Float32Array(Float32ArrayData) {
 		return this.byteLength >> 2;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : Float {
-		return this.bytes.getFloat((index<<2) + this.byteOffset);
+	@:arrayAccess public inline function get(index:Int):Float {
+		return this.bytes.getFloat((index << 2) + this.byteOffset);
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : Float ) : Float {
-		if( index >= 0 && index < length ) {
-			this.bytes.setFloat((index<<2) + this.byteOffset, value);
+	@:arrayAccess public inline function set(index:Int, value:Float):Float {
+		if (index >= 0 && index < length) {
+			this.bytes.setFloat((index << 2) + this.byteOffset, value);
 			return value;
 		}
 		return 0;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : Float32Array {
-		return fromData(this.sub(begin<<2,length == null ? null : length<<2));
+	public inline function sub(begin:Int, ?length:Int):Float32Array {
+		return fromData(this.sub(begin << 2, length == null ? null : length << 2));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : Float32Array {
-		return fromData(this.subarray(begin==null?null:begin<<2,end==null?null:end<<2));
+	public inline function subarray(?begin:Int, ?end:Int):Float32Array {
+		return fromData(this.subarray(begin == null ? null : begin << 2, end == null ? null : end << 2));
 	}
 
-	public inline function getData() : Float32ArrayData {
+	public inline function getData():Float32ArrayData {
 		return this;
 	}
 
-	public static function fromData( d : Float32ArrayData ) : Float32Array {
+	public static function fromData(d:Float32ArrayData):Float32Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<Float>, pos = 0, ?length : Int ) : Float32Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
+	public static function fromArray(a:Array<Float>, pos = 0, ?length:Int):Float32Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
 		var i = new Float32Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos = 0, ?length : Int ) : Float32Array {
-		return fromData(ArrayBufferView.fromBytes(bytes,bytePos,(length == null ? (bytes.length - bytePos)>>2 : length)<<2).getData());
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos = 0, ?length:Int):Float32Array {
+		return fromData(ArrayBufferView.fromBytes(bytes, bytePos, (length == null ? (bytes.length - bytePos) >> 2 : length) << 2).getData());
 	}
 }
-
diff --git a/std/haxe/io/Float64Array.hx b/std/haxe/io/Float64Array.hx
index 8f5314fe6ebcc675317973ddb5e85d2e6bb87a4a..7221883ce5b7be972aa39832b570ac843a97afb1 100644
--- a/std/haxe/io/Float64Array.hx
+++ b/std/haxe/io/Float64Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 typedef Float64ArrayData = ArrayBufferView.ArrayBufferViewData;
 
 abstract Float64Array(Float64ArrayData) {
-
 	public static inline var BYTES_PER_ELEMENT = 8;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
 
-	public inline function new( elements : Int ) {
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
+
+	public inline function new(elements:Int) {
 		this = new ArrayBufferView(elements * BYTES_PER_ELEMENT).getData();
 	}
 
@@ -37,49 +38,50 @@ abstract Float64Array(Float64ArrayData) {
 		return this.byteLength >> 3;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : Float {
-		return this.bytes.getFloat((index<<3) + this.byteOffset);
+	@:arrayAccess public inline function get(index:Int):Float {
+		return this.bytes.getFloat((index << 3) + this.byteOffset);
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : Float ) : Float {
-		if( index >= 0 && index < length ) {
-			this.bytes.setFloat((index<<3) + this.byteOffset, value);
+	@:arrayAccess public inline function set(index:Int, value:Float):Float {
+		if (index >= 0 && index < length) {
+			this.bytes.setFloat((index << 3) + this.byteOffset, value);
 			return value;
 		}
 		return 0;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : Float64Array {
-		return fromData(this.sub(begin<<3,length == null ? null : length<<3));
+	public inline function sub(begin:Int, ?length:Int):Float64Array {
+		return fromData(this.sub(begin << 3, length == null ? null : length << 3));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : Float64Array {
-		return fromData(this.subarray(begin==null?null:begin<<3,end==null?null:end<<3));
+	public inline function subarray(?begin:Int, ?end:Int):Float64Array {
+		return fromData(this.subarray(begin == null ? null : begin << 3, end == null ? null : end << 3));
 	}
 
-	public inline function getData() : Float64ArrayData {
+	public inline function getData():Float64ArrayData {
 		return this;
 	}
 
-	public static function fromData( d : Float64ArrayData ) : Float64Array {
+	public static function fromData(d:Float64ArrayData):Float64Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<Float>, pos = 0, ?length : Int ) : Float64Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
+	public static function fromArray(a:Array<Float>, pos = 0, ?length:Int):Float64Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
 		var i = new Float64Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos = 0, ?length : Int ) : Float64Array {
-		return fromData(ArrayBufferView.fromBytes(bytes,bytePos,(length == null ? (bytes.length - bytePos)>>3 : length)<<3).getData());
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos = 0, ?length:Int):Float64Array {
+		return fromData(ArrayBufferView.fromBytes(bytes, bytePos, (length == null ? (bytes.length - bytePos) >> 3 : length) << 3).getData());
 	}
 }
-
diff --git a/std/haxe/io/Input.hx b/std/haxe/io/Input.hx
index 158b79560b604d25d603f52d60b7f141ba5df030..ccc09fb16a6b3fae54b611a09cb6910bec02ed47 100644
--- a/std/haxe/io/Input.hx
+++ b/std/haxe/io/Input.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 /**
@@ -29,13 +30,12 @@ package haxe.io;
 	is reached.
 **/
 class Input {
-
 	/**
 		Endianness (word byte order) used when reading numbers.
 
 		If `true`, big-endian is used, otherwise `little-endian` is used.
 	**/
-	public var bigEndian(default,set) : Bool;
+	public var bigEndian(default, set):Bool;
 
 	#if cs
 	private var helper:BytesData;
@@ -46,12 +46,12 @@ class Input {
 	/**
 		Read and return one byte.
 	**/
-	public function readByte() : Int {
-	#if cpp
+	public function readByte():Int {
+		#if cpp
 		throw "Not implemented";
-	#else
+		#else
 		return throw "Not implemented";
-	#end
+		#end
 	}
 
 	/**
@@ -61,27 +61,27 @@ class Input {
 
 		See `readFullBytes` that tries to read the exact amount of specified bytes.
 	**/
-	public function readBytes( s : Bytes, pos : Int, len : Int ) : Int {
+	public function readBytes(s:Bytes, pos:Int, len:Int):Int {
 		var k = len;
 		var b = #if (js || hl) @:privateAccess s.b #else s.getData() #end;
-		if( pos < 0 || len < 0 || pos + len > s.length )
+		if (pos < 0 || len < 0 || pos + len > s.length)
 			throw Error.OutsideBounds;
 		try {
-			while( k > 0 ) {
+			while (k > 0) {
 				#if neko
-					untyped __dollar__sset(b,pos,readByte());
+				untyped __dollar__sset(b, pos, readByte());
 				#elseif php
-					b.set(pos, readByte());
+				b.set(pos, readByte());
 				#elseif cpp
-					b[pos] = untyped readByte();
+				b[pos] = untyped readByte();
 				#else
-					b[pos] = cast readByte();
+				b[pos] = cast readByte();
 				#end
 				pos++;
 				k--;
 			}
-		} catch (eof: haxe.io.Eof){}
-		return len-k;
+		} catch (eof:haxe.io.Eof) {}
+		return len - k;
 	}
 
 	/**
@@ -89,40 +89,38 @@ class Input {
 
 		Behaviour while reading after calling this method is unspecified.
 	**/
-	public function close() : Void {
-	}
+	public function close():Void {}
 
-	function set_bigEndian( b : Bool ) : Bool {
+	function set_bigEndian(b:Bool):Bool {
 		bigEndian = b;
 		return b;
 	}
 
 	/* ------------------ API ------------------ */
-
 	/**
 		Read and return all available data.
 
 		The `bufsize` optional argument specifies the size of chunks by
 		which data is read. Its default value is target-specific.
 	**/
-	public function readAll( ?bufsize : Int ) : Bytes {
-		if( bufsize == null )
-		#if php
+	public function readAll(?bufsize:Int):Bytes {
+		if (bufsize == null)
+			#if php
 			bufsize = 8192; // default value for PHP and max under certain circumstances
-		#else
+			#else
 			bufsize = (1 << 14); // 16 Ko
-		#end
+			#end
 
 		var buf = Bytes.alloc(bufsize);
 		var total = new haxe.io.BytesBuffer();
 		try {
-			while( true ) {
-				var len = readBytes(buf,0,bufsize);
-				if( len == 0 )
+			while (true) {
+				var len = readBytes(buf, 0, bufsize);
+				if (len == 0)
 					throw Error.Blocked;
-				total.addBytes(buf,0,len);
+				total.addBytes(buf, 0, len);
 			}
-		} catch( e : Eof ) { }
+		} catch (e:Eof) {}
 		return total.getBytes();
 	}
 
@@ -131,9 +129,9 @@ class Input {
 
 		Unlike `readBytes`, this method tries to read the exact `len` amount of bytes.
 	**/
-	public function readFullBytes( s : Bytes, pos : Int, len : Int ) : Void {
-		while( len > 0 ) {
-			var k = readBytes(s,pos,len);
+	public function readFullBytes(s:Bytes, pos:Int, len:Int):Void {
+		while (len > 0) {
+			var k = readBytes(s, pos, len);
 			if (k == 0)
 				throw Error.Blocked;
 			pos += k;
@@ -144,12 +142,13 @@ class Input {
 	/**
 		Read and return `nbytes` bytes.
 	**/
-	public function read( nbytes : Int ) : Bytes {
+	public function read(nbytes:Int):Bytes {
 		var s = Bytes.alloc(nbytes);
 		var p = 0;
-		while( nbytes > 0 ) {
-			var k = readBytes(s,p,nbytes);
-			if( k == 0 ) throw Error.Blocked;
+		while (nbytes > 0) {
+			var k = readBytes(s, p, nbytes);
+			if (k == 0)
+				throw Error.Blocked;
 			p += k;
 			nbytes -= k;
 		}
@@ -161,11 +160,11 @@ class Input {
 
 		The final character is not included in the resulting string.
 	**/
-	public function readUntil( end : Int ) : String {
+	public function readUntil(end:Int):String {
 		var buf = new BytesBuffer();
-		var last : Int;
-		while( (last = readByte()) != end )
-			buf.addByte( last );
+		var last:Int;
+		while ((last = readByte()) != end)
+			buf.addByte(last);
 		return buf.getBytes().toString();
 	}
 
@@ -174,18 +173,19 @@ class Input {
 
 		The CR/LF characters are not included in the resulting string.
 	**/
-	public function readLine() : String {
+	public function readLine():String {
 		var buf = new BytesBuffer();
-		var last : Int;
+		var last:Int;
 		var s;
 		try {
-			while( (last = readByte()) != 10 )
-				buf.addByte( last );
+			while ((last = readByte()) != 10)
+				buf.addByte(last);
 			s = buf.getBytes().toString();
-			if( s.charCodeAt(s.length-1) == 13 ) s = s.substr(0,-1);
-		} catch( e : Eof ) {
+			if (s.charCodeAt(s.length - 1) == 13)
+				s = s.substr(0, -1);
+		} catch (e:Eof) {
 			s = buf.getBytes().toString();
-			if( s.length == 0 )
+			if (s.length == 0)
 				#if neko neko.Lib.rethrow #else throw #end (e);
 		}
 		return s;
@@ -196,7 +196,7 @@ class Input {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function readFloat() : Float {
+	public function readFloat():Float {
 		return FPHelper.i32ToFloat(readInt32());
 	}
 
@@ -205,18 +205,18 @@ class Input {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function readDouble() : Float {
+	public function readDouble():Float {
 		var i1 = readInt32();
 		var i2 = readInt32();
-		return bigEndian ? FPHelper.i64ToDouble(i2,i1) : FPHelper.i64ToDouble(i1,i2);
+		return bigEndian ? FPHelper.i64ToDouble(i2, i1) : FPHelper.i64ToDouble(i1, i2);
 	}
 
 	/**
 		Read a 8-bit signed integer.
 	**/
-	public function readInt8() : Int {
+	public function readInt8():Int {
 		var n = readByte();
-		if( n >= 128 )
+		if (n >= 128)
 			return n - 256;
 		return n;
 	}
@@ -226,11 +226,11 @@ class Input {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function readInt16() : Int {
+	public function readInt16():Int {
 		var ch1 = readByte();
 		var ch2 = readByte();
 		var n = bigEndian ? ch2 | (ch1 << 8) : ch1 | (ch2 << 8);
-		if( n & 0x8000 != 0 )
+		if (n & 0x8000 != 0)
 			return n - 0x10000;
 		return n;
 	}
@@ -240,7 +240,7 @@ class Input {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function readUInt16() : Int {
+	public function readUInt16():Int {
 		var ch1 = readByte();
 		var ch2 = readByte();
 		return bigEndian ? ch2 | (ch1 << 8) : ch1 | (ch2 << 8);
@@ -251,12 +251,12 @@ class Input {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function readInt24() : Int {
+	public function readInt24():Int {
 		var ch1 = readByte();
 		var ch2 = readByte();
 		var ch3 = readByte();
 		var n = bigEndian ? ch3 | (ch2 << 8) | (ch1 << 16) : ch1 | (ch2 << 8) | (ch3 << 16);
-		if( n & 0x800000 != 0 )
+		if (n & 0x800000 != 0)
 			return n - 0x1000000;
 		return n;
 	}
@@ -266,7 +266,7 @@ class Input {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function readUInt24() : Int {
+	public function readUInt24():Int {
 		var ch1 = readByte();
 		var ch2 = readByte();
 		var ch3 = readByte();
@@ -278,53 +278,54 @@ class Input {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function readInt32() : Int {
+	public function readInt32():Int {
 		var ch1 = readByte();
 		var ch2 = readByte();
 		var ch3 = readByte();
 		var ch4 = readByte();
-#if (php || python)
+		#if (php || python)
 		// php will overflow integers.  Convert them back to signed 32-bit ints.
 		var n = bigEndian ? ch4 | (ch3 << 8) | (ch2 << 16) | (ch1 << 24) : ch1 | (ch2 << 8) | (ch3 << 16) | (ch4 << 24);
 		if (n & 0x80000000 != 0)
-			return ( n | 0x80000000);
-		else return n;
-#elseif lua
+			return (n | 0x80000000);
+		else
+			return n;
+		#elseif lua
 		var n = bigEndian ? ch4 | (ch3 << 8) | (ch2 << 16) | (ch1 << 24) : ch1 | (ch2 << 8) | (ch3 << 16) | (ch4 << 24);
-		return lua.Boot.clamp(n);
-#else
+		return lua.Boot.clampInt32(n);
+		#else
 		return bigEndian ? ch4 | (ch3 << 8) | (ch2 << 16) | (ch1 << 24) : ch1 | (ch2 << 8) | (ch3 << 16) | (ch4 << 24);
-#end
+		#end
 	}
 
 	/**
 		Read and `len` bytes as a string.
 	**/
-	public function readString( len : Int ) : String {
+	public function readString(len:Int, ?encoding:Encoding):String {
 		var b = Bytes.alloc(len);
-		readFullBytes(b,0,len);
+		readFullBytes(b, 0, len);
 		#if neko
 		return neko.Lib.stringReference(b);
 		#else
-		return b.toString();
+		return b.getString(0, len, encoding);
 		#end
 	}
 
-#if neko
-	static var _float_of_bytes = neko.Lib.load("std","float_of_bytes",2);
-	static var _double_of_bytes = neko.Lib.load("std","double_of_bytes",2);
-	static function __init__() untyped {
-		Input.prototype.bigEndian = false;
-	}
-#end
-
-#if (flash || js || python)
-	function getDoubleSig(bytes:Array<Int>)
-	{
-		return (((bytes[1]&0xF) << 16) | (bytes[2] << 8) | bytes[3] ) * 4294967296. +
-			(bytes[4] >> 7) * 2147483648 +
-			(((bytes[4]&0x7F) << 24) | (bytes[5] << 16) | (bytes[6] << 8) | bytes[7]);
-	}
-#end
+	#if neko
+	static var _float_of_bytes = neko.Lib.load("std", "float_of_bytes", 2);
+	static var _double_of_bytes = neko.Lib.load("std", "double_of_bytes", 2);
 
+	static function __init__()
+		untyped {
+			Input.prototype.bigEndian = false;
+		}
+	#end
+
+	#if (flash || js || python)
+	function getDoubleSig(bytes:Array<Int>) {
+		return (((bytes[1] & 0xF) << 16) | (bytes[2] << 8) | bytes[3]) * 4294967296.
+			+ (bytes[4] >> 7) * 2147483648
+			+ (((bytes[4] & 0x7F) << 24) | (bytes[5] << 16) | (bytes[6] << 8) | bytes[7]);
+	}
+	#end
 }
diff --git a/std/haxe/io/Int32Array.hx b/std/haxe/io/Int32Array.hx
index 56131f81a07db5538ef7fb2284e8d6b9b39b68ec..26543246ce5d9328435871d6e880a782507624d5 100644
--- a/std/haxe/io/Int32Array.hx
+++ b/std/haxe/io/Int32Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 typedef Int32ArrayData = ArrayBufferView.ArrayBufferViewData;
 
 abstract Int32Array(Int32ArrayData) {
-
 	public static inline var BYTES_PER_ELEMENT = 4;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
 
-	public inline function new( elements : Int ) {
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
+
+	public inline function new(elements:Int) {
 		this = new ArrayBufferView(elements * BYTES_PER_ELEMENT).getData();
 	}
 
@@ -37,49 +38,50 @@ abstract Int32Array(Int32ArrayData) {
 		return this.byteLength >> 2;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : Int {
-		return this.bytes.getInt32((index<<2) + this.byteOffset);
+	@:arrayAccess public inline function get(index:Int):Int {
+		return this.bytes.getInt32((index << 2) + this.byteOffset);
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : Int ) : Int {
-		if( index >= 0 && index < length ) {
-			this.bytes.setInt32((index<<2) + this.byteOffset, value);
+	@:arrayAccess public inline function set(index:Int, value:Int):Int {
+		if (index >= 0 && index < length) {
+			this.bytes.setInt32((index << 2) + this.byteOffset, value);
 			return value;
 		}
 		return 0;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : Int32Array {
-		return fromData(this.sub(begin<<2,length == null ? null : length<<2));
+	public inline function sub(begin:Int, ?length:Int):Int32Array {
+		return fromData(this.sub(begin << 2, length == null ? null : length << 2));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : Int32Array {
-		return fromData(this.subarray(begin==null?null:begin<<2,end==null?null:end<<2));
+	public inline function subarray(?begin:Int, ?end:Int):Int32Array {
+		return fromData(this.subarray(begin == null ? null : begin << 2, end == null ? null : end << 2));
 	}
 
-	public inline function getData() : Int32ArrayData {
+	public inline function getData():Int32ArrayData {
 		return this;
 	}
 
-	public static function fromData( d : Int32ArrayData ) : Int32Array {
+	public static function fromData(d:Int32ArrayData):Int32Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<Int>, pos = 0, ?length : Int ) : Int32Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
+	public static function fromArray(a:Array<Int>, pos = 0, ?length:Int):Int32Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
 		var i = new Int32Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos = 0, ?length : Int ) : Int32Array {
-		return fromData(ArrayBufferView.fromBytes(bytes,bytePos,(length == null ? (bytes.length - bytePos)>>2 : length)<<2).getData());
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos = 0, ?length:Int):Int32Array {
+		return fromData(ArrayBufferView.fromBytes(bytes, bytePos, (length == null ? (bytes.length - bytePos) >> 2 : length) << 2).getData());
 	}
 }
-
diff --git a/std/haxe/io/Mime.hx b/std/haxe/io/Mime.hx
new file mode 100644
index 0000000000000000000000000000000000000000..82a10b35a958c1fbfebe6cca571e789c5af2fd71
--- /dev/null
+++ b/std/haxe/io/Mime.hx
@@ -0,0 +1,321 @@
+package haxe.io;
+
+/**
+	HTML MimeType Enum
+	@see http://www.sitepoint.com/web-foundations/mime-types-complete-list/
+**/
+enum abstract Mime(String) from String to String {
+	var XWorldX3dmf = 'x-world/x-3dmf';
+	var ApplicationOctetStream = 'application/octet-stream';
+	var ApplicationXAuthorwareBin = 'application/x-authorware-bin';
+	var ApplicationXAuthorwareMap = 'application/x-authorware-map';
+	var ApplicationXAuthorwareSeg = 'application/x-authorware-seg';
+	var TextVndAbc = 'text/vnd.abc';
+	var TextHtml = 'text/html';
+	var VideoAnimaflex = 'video/animaflex';
+	var ApplicationPostscript = 'application/postscript';
+	var AudioAiff = 'audio/aiff';
+	var AudioXAiff = 'audio/x-aiff';
+	var ApplicationXAim = 'application/x-aim';
+	var TextXAudiosoftIntra = 'text/x-audiosoft-intra';
+	var ApplicationXNaviAnimation = 'application/x-navi-animation';
+	var ApplicationXNokia9000CommunicatorAddOnSoftware = 'application/x-nokia-9000-communicator-add-on-software';
+	var ApplicationMime = 'application/mime';
+	var ApplicationArj = 'application/arj';
+	var ImageXJg = 'image/x-jg';
+	var VideoXMsAsf = 'video/x-ms-asf';
+	var TextXAsm = 'text/x-asm';
+	var TextAsp = 'text/asp';
+	var ApplicationXMplayer2 = 'application/x-mplayer2';
+	var AudioBasic = 'audio/basic';
+	var ApplicationXTroffMsvideo = 'application/x-troff-msvideo';
+	var VideoAvi = 'video/avi';
+	var VideoMsvideo = 'video/msvideo';
+	var VideoXMsvideo = 'video/x-msvideo';
+	var VideoAvsVideo = 'video/avs-video';
+	var ApplicationXBcpio = 'application/x-bcpio';
+	var ApplicationMacBinary = 'application/mac-binary';
+	var ApplicationMacbinary = 'application/macbinary';
+	var ApplicationXBinary = 'application/x-binary';
+	var ApplicationXMacbinary = 'application/x-macbinary';
+	var ImageBmp = 'image/bmp';
+	var ImageXWindowsBmp = 'image/x-windows-bmp';
+	var ApplicationBook = 'application/book';
+	var ApplicationXBzip2 = 'application/x-bzip2';
+	var ApplicationXBsh = 'application/x-bsh';
+	var ApplicationXBzip = 'application/x-bzip';
+	var TextPlain = 'text/plain';
+	var TextXC = 'text/x-c';
+	var ApplicationVndMsPkiSeccat = 'application/vnd.ms-pki.seccat';
+	var ApplicationClariscad = 'application/clariscad';
+	var ApplicationXCocoa = 'application/x-cocoa';
+	var ApplicationCdf = 'application/cdf';
+	var ApplicationXCdf = 'application/x-cdf';
+	var ApplicationXNetcdf = 'application/x-netcdf';
+	var ApplicationPkixCert = 'application/pkix-cert';
+	var ApplicationXX509CaCert = 'application/x-x509-ca-cert';
+	var ApplicationXChat = 'application/x-chat';
+	var ApplicationJava = 'application/java';
+	var ApplicationJavaByteCode = 'application/java-byte-code';
+	var ApplicationXJavaClass = 'application/x-java-class';
+	var ApplicationXCpio = 'application/x-cpio';
+	var ApplicationMacCompactpro = 'application/mac-compactpro';
+	var ApplicationPkcsCrl = 'application/pkcs-crl';
+	var ApplicationXCsh = 'application/x-csh';
+	var TextCss = 'text/css';
+	var ApplicationXDirector = 'application/x-director';
+	var ApplicationXDeepv = 'application/x-deepv';
+	var VideoXDv = 'video/x-dv';
+	var VideoDl = 'video/dl';
+	var ApplicationMsword = 'application/msword';
+	var ApplicationCommonground = 'application/commonground';
+	var ApplicationDrafting = 'application/drafting';
+	var ApplicationXDvi = 'application/x-dvi';
+	var DrawingXDwf = 'drawing/x-dwf (old)';
+	var ApplicationAcad = 'application/acad';
+	var ApplicationDxf = 'application/dxf';
+	var TextXScriptElisp = 'text/x-script.elisp';
+	var ApplicationXBytecodeElisp = 'application/x-bytecode.elisp (compiled elisp)';
+	var ApplicationXEnvoy = 'application/x-envoy';
+	var ApplicationXEsrehber = 'application/x-esrehber';
+	var TextXSetext = 'text/x-setext';
+	var ApplicationEnvoy = 'application/envoy';
+	var TextXFortran = 'text/x-fortran';
+	var ApplicationVndFdf = 'application/vnd.fdf';
+	var ImageFif = 'image/fif';
+	var VideoFli = 'video/fli';
+	var ImageFlorian = 'image/florian';
+	var TextVndFmiFlexstor = 'text/vnd.fmi.flexstor';
+	var VideoXAtomic3dFeature = 'video/x-atomic3d-feature';
+	var ImageVndFpx = 'image/vnd.fpx';
+	var ApplicationFreeloader = 'application/freeloader';
+	var AudioMake = 'audio/make';
+	var ImageG3fax = 'image/g3fax';
+	var ImageGif = 'image/gif';
+	var VideoGl = 'video/gl';
+	var AudioXGsm = 'audio/x-gsm';
+	var ApplicationXGsp = 'application/x-gsp';
+	var ApplicationXGss = 'application/x-gss';
+	var ApplicationXGtar = 'application/x-gtar';
+	var ApplicationXCompressed = 'application/x-compressed';
+	var ApplicationXGzip = 'application/x-gzip';
+	var ApplicationXHdf = 'application/x-hdf';
+	var ApplicationXHelpfile = 'application/x-helpfile';
+	var TextXScript = 'text/x-script';
+	var ApplicationHlp = 'application/hlp';
+	var ApplicationVndHpHpgl = 'application/vnd.hp-hpgl';
+	var ApplicationBinhex = 'application/binhex';
+	var ApplicationHta = 'application/hta';
+	var TextXComponent = 'text/x-component';
+	var TextWebviewhtml = 'text/webviewhtml';
+	var XConferenceXCooltalk = 'x-conference/x-cooltalk';
+	var ImageXIcon = 'image/x-icon';
+	var ImageIef = 'image/ief';
+	var ApplicationIges = 'application/iges';
+	var ApplicationXIma = 'application/x-ima';
+	var ApplicationXHttpdImap = 'application/x-httpd-imap';
+	var ApplicationInf = 'application/inf';
+	var ApplicationXInternettSignup = 'application/x-internett-signup';
+	var ApplicationXIp2 = 'application/x-ip2';
+	var VideoXIsvideo = 'video/x-isvideo';
+	var AudioIt = 'audio/it';
+	var ApplicationXInventor = 'application/x-inventor';
+	var IWorldIVrml = 'i-world/i-vrml';
+	var ApplicationXLivescreen = 'application/x-livescreen';
+	var AudioXJam = 'audio/x-jam';
+	var ApplicationXJavaCommerce = 'application/x-java-commerce';
+	var ImageJpeg = 'image/jpeg';
+	var ImageXJps = 'image/x-jps';
+	var TextJavascript = 'text/javascript';
+	var ApplicationJson = 'application/json';
+	var ApplicationJavascript = 'application/javascript';
+	var ImageJutvision = 'image/jutvision';
+	var AudioMidi = 'audio/midi';
+	var ApplicationXKsh = 'application/x-ksh';
+	var AudioNspaudio = 'audio/nspaudio';
+	var AudioXLiveaudio = 'audio/x-liveaudio';
+	var ApplicationXLatex = 'application/x-latex';
+	var ApplicationXLisp = 'application/x-lisp';
+	var TextXLaAsf = 'text/x-la-asf';
+	var ApplicationLzx = 'application/lzx';
+	var VideoMpeg = 'video/mpeg';
+	var AudioMpeg = 'audio/mpeg';
+	var AudioXMpequrl = 'audio/x-mpequrl';
+	var ApplicationXTroffMan = 'application/x-troff-man';
+	var ApplicationXNavimap = 'application/x-navimap';
+	var ApplicationMbedlet = 'application/mbedlet';
+	var ApplicationXMagicCapPackage10 = 'application/x-magic-cap-package-1.0';
+	var ApplicationMcad = 'application/mcad';
+	var ImageVasa = 'image/vasa';
+	var ApplicationNetmc = 'application/netmc';
+	var ApplicationXTroffMe = 'application/x-troff-me';
+	var MessageRfc822 = 'message/rfc822';
+	var ApplicationXMif = 'application/x-mif';
+	var WwwMime = 'www/mime';
+	var AudioXVndAudioexplosionMjuicemediafile = 'audio/x-vnd.audioexplosion.mjuicemediafile';
+	var VideoXMotionJpeg = 'video/x-motion-jpeg';
+	var ApplicationBase64 = 'application/base64';
+	var AudioMod = 'audio/mod';
+	var VideoQuicktime = 'video/quicktime';
+	var VideoXSgiMovie = 'video/x-sgi-movie';
+	var AudioMpeg3 = 'audio/mpeg3';
+	var ApplicationXProject = 'application/x-project';
+	var ApplicationVndMsProject = 'application/vnd.ms-project';
+	var ApplicationMarc = 'application/marc';
+	var ApplicationXTroffMs = 'application/x-troff-ms';
+	var ApplicationXVndAudioexplosionMzz = 'application/x-vnd.audioexplosion.mzz';
+	var ImageNaplps = 'image/naplps';
+	var ApplicationVndNokiaConfigurationMessage = 'application/vnd.nokia.configuration-message';
+	var ImageXNiff = 'image/x-niff';
+	var ApplicationXMixTransfer = 'application/x-mix-transfer';
+	var ApplicationXConference = 'application/x-conference';
+	var ApplicationXNavidoc = 'application/x-navidoc';
+	var ApplicationOda = 'application/oda';
+	var ApplicationXOmc = 'application/x-omc';
+	var ApplicationXOmcdatamaker = 'application/x-omcdatamaker';
+	var ApplicationXOmcregerator = 'application/x-omcregerator';
+	var TextXPascal = 'text/x-pascal';
+	var ApplicationPkcs10 = 'application/pkcs10';
+	var ApplicationPkcs12 = 'application/pkcs-12';
+	var ApplicationXPkcs7Signature = 'application/x-pkcs7-signature';
+	var ApplicationPkcs7Mime = 'application/pkcs7-mime';
+	var ApplicationXPkcs7Certreqresp = 'application/x-pkcs7-certreqresp';
+	var ApplicationPkcs7Signature = 'application/pkcs7-signature';
+	var ApplicationPro_eng = 'application/pro_eng';
+	var TextPascal = 'text/pascal';
+	var ImageXPortableBitmap = 'image/x-portable-bitmap';
+	var ApplicationVndHpPcl = 'application/vnd.hp-pcl';
+	var ImageXPict = 'image/x-pict';
+	var ImageXPcx = 'image/x-pcx';
+	var ChemicalXPdb = 'chemical/x-pdb';
+	var ApplicationPdf = 'application/pdf';
+	var ImageXPortableGraymap = 'image/x-portable-graymap';
+	var ImagePict = 'image/pict';
+	var ApplicationXNewtonCompatiblePkg = 'application/x-newton-compatible-pkg';
+	var ApplicationVndMsPkiPko = 'application/vnd.ms-pki.pko';
+	var ApplicationXPixclscript = 'application/x-pixclscript';
+	var ImageXXpixmap = 'image/x-xpixmap';
+	var ApplicationXPagemaker = 'application/x-pagemaker';
+	var ImagePng = 'image/png';
+	var ApplicationXPortableAnymap = 'application/x-portable-anymap';
+	var ApplicationMspowerpoint = 'application/mspowerpoint';
+	var ModelXPov = 'model/x-pov';
+	var ApplicationVndMsPowerpoint = 'application/vnd.ms-powerpoint';
+	var ImageXPortablePixmap = 'image/x-portable-pixmap';
+	var ApplicationXFreelance = 'application/x-freelance';
+	var PaleovuXPv = 'paleovu/x-pv';
+	var TextXScriptPhyton = 'text/x-script.phyton';
+	var ApplicationXBytecodePython = 'application/x-bytecode.python';
+	var AudioVndQcelp = 'audio/vnd.qcelp';
+	var ImageXQuicktime = 'image/x-quicktime';
+	var VideoXQtc = 'video/x-qtc';
+	var AudioXPnRealaudio = 'audio/x-pn-realaudio';
+	var ApplicationXCmuRaster = 'application/x-cmu-raster';
+	var ImageCmuRaster = 'image/cmu-raster';
+	var TextXScriptRexx = 'text/x-script.rexx';
+	var ImageVndRnRealflash = 'image/vnd.rn-realflash';
+	var ImageXRgb = 'image/x-rgb';
+	var ApplicationVndRnRealmedia = 'application/vnd.rn-realmedia';
+	var AudioMid = 'audio/mid';
+	var ApplicationRingingTones = 'application/ringing-tones';
+	var ApplicationVndRnRealplayer = 'application/vnd.rn-realplayer';
+	var ApplicationXTroff = 'application/x-troff';
+	var ImageVndRnRealpix = 'image/vnd.rn-realpix';
+	var AudioXPnRealaudioPlugin = 'audio/x-pn-realaudio-plugin';
+	var TextRichtext = 'text/richtext';
+	var ApplicationRtf = 'application/rtf';
+	var VideoVndRnRealvideo = 'video/vnd.rn-realvideo';
+	var AudioS3m = 'audio/s3m';
+	var ApplicationXTbook = 'application/x-tbook';
+	var ApplicationXLotusscreencam = 'application/x-lotusscreencam';
+	var ApplicationSdp = 'application/sdp';
+	var ApplicationSounder = 'application/sounder';
+	var ApplicationSea = 'application/sea';
+	var ApplicationSet = 'application/set';
+	var AudioXPsid = 'audio/x-psid';
+	var ApplicationXSit = 'application/x-sit';
+	var ApplicationXKoan = 'application/x-koan';
+	var ApplicationXSeelogo = 'application/x-seelogo';
+	var ApplicationSmil = 'application/smil';
+	var ApplicationSolids = 'application/solids';
+	var ApplicationXPkcs7Certificates = 'application/x-pkcs7-certificates';
+	var ApplicationFuturesplash = 'application/futuresplash';
+	var ApplicationXSprite = 'application/x-sprite';
+	var ApplicationXWaisSource = 'application/x-wais-source';
+	var TextXServerParsedHtml = 'text/x-server-parsed-html';
+	var ApplicationStreamingmedia = 'application/streamingmedia';
+	var ApplicationVndMsPkiCertstore = 'application/vnd.ms-pki.certstore';
+	var ApplicationStep = 'application/step';
+	var ApplicationSla = 'application/sla';
+	var ApplicationXSv4cpio = 'application/x-sv4cpio';
+	var ApplicationXSv4crc = 'application/x-sv4crc';
+	var ImageVndDwg = 'image/vnd.dwg';
+	var ApplicationXWorld = 'application/x-world';
+	var ApplicationXShockwaveFlash = 'application/x-shockwave-flash';
+	var TextXSpeech = 'text/x-speech';
+	var ApplicationXTar = 'application/x-tar';
+	var ApplicationToolbook = 'application/toolbook';
+	var ApplicationXTcl = 'application/x-tcl';
+	var TextXScriptTcsh = 'text/x-script.tcsh';
+	var ApplicationXTex = 'application/x-tex';
+	var ApplicationXTexinfo = 'application/x-texinfo';
+	var ApplicationGnutar = 'application/gnutar';
+	var ImageTiff = 'image/tiff';
+	var AudioTspAudio = 'audio/tsp-audio';
+	var ApplicationDsptype = 'application/dsptype';
+	var TextTabSeparatedValues = 'text/tab-separated-values';
+	var TextXUil = 'text/x-uil';
+	var TextUriList = 'text/uri-list';
+	var ApplicationIDeas = 'application/i-deas';
+	var ApplicationXUstar = 'application/x-ustar';
+	var TextXUuencode = 'text/x-uuencode';
+	var ApplicationXCdlink = 'application/x-cdlink';
+	var TextXVcalendar = 'text/x-vcalendar';
+	var ApplicationVda = 'application/vda';
+	var VideoVdo = 'video/vdo';
+	var ApplicationGroupwise = 'application/groupwise';
+	var VideoVivo = 'video/vivo';
+	var ApplicationVocaltecMediaDesc = 'application/vocaltec-media-desc';
+	var ApplicationVocaltecMediaFile = 'application/vocaltec-media-file';
+	var AudioVoc = 'audio/voc';
+	var VideoVosaic = 'video/vosaic';
+	var AudioVoxware = 'audio/voxware';
+	var AudioXTwinvqPlugin = 'audio/x-twinvq-plugin';
+	var AudioXTwinvq = 'audio/x-twinvq';
+	var ApplicationXVrml = 'application/x-vrml';
+	var XWorldXVrt = 'x-world/x-vrt';
+	var ApplicationXVisio = 'application/x-visio';
+	var ApplicationWordperfect60 = 'application/wordperfect6.0';
+	var ApplicationWordperfect61 = 'application/wordperfect6.1';
+	var AudioWav = 'audio/wav';
+	var ApplicationXQpro = 'application/x-qpro';
+	var ImageVndWapWbmp = 'image/vnd.wap.wbmp';
+	var ApplicationVndXara = 'application/vnd.xara';
+	var ImageWebp = 'image/webp';
+	var ApplicationX123 = 'application/x-123';
+	var WindowsMetafile = 'windows/metafile';
+	var TextVndWapWml = 'text/vnd.wap.wml';
+	var ApplicationVndWapWmlc = 'application/vnd.wap.wmlc';
+	var TextVndWapWmlscript = 'text/vnd.wap.wmlscript';
+	var ApplicationVndWapWmlscriptc = 'application/vnd.wap.wmlscriptc';
+	var ApplicationWordperfect = 'application/wordperfect';
+	var ApplicationXLotus = 'application/x-lotus';
+	var ApplicationMswrite = 'application/mswrite';
+	var ModelVrml = 'model/vrml';
+	var TextScriplet = 'text/scriplet';
+	var ApplicationXWintalk = 'application/x-wintalk';
+	var ImageXXbitmap = 'image/x-xbitmap';
+	var VideoXAmtDemorun = 'video/x-amt-demorun';
+	var XglDrawing = 'xgl/drawing';
+	var ImageVndXiff = 'image/vnd.xiff';
+	var ApplicationExcel = 'application/excel';
+	var AudioXm = 'audio/xm';
+	var ApplicationXml = 'application/xml';
+	var XglMovie = 'xgl/movie';
+	var ApplicationXVndLsXpix = 'application/x-vnd.ls-xpix';
+	var VideoXAmtShowrun = 'video/x-amt-showrun';
+	var ImageXXwd = 'image/x-xwd';
+	var ApplicationXCompress = 'application/x-compress';
+	var MultipartXZip = 'multipart/x-zip';
+	var TextXScriptZsh = 'text/x-script.zsh';
+}
diff --git a/std/haxe/io/Output.hx b/std/haxe/io/Output.hx
index 3a830ecb350a2890116d907ffefef92180b4bd11..b6ea6351d547a771690c3f104989f7cc0fd6dbfb 100644
--- a/std/haxe/io/Output.hx
+++ b/std/haxe/io/Output.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 /**
@@ -28,13 +29,12 @@ package haxe.io;
 	Output.
 **/
 class Output {
-
 	/**
 		Endianness (word byte order) used when writing numbers.
 
 		If `true`, big-endian is used, otherwise `little-endian` is used.
 	**/
-	public var bigEndian(default, set) : Bool;
+	public var bigEndian(default, set):Bool;
 
 	#if java
 	private var helper:java.nio.ByteBuffer;
@@ -43,7 +43,7 @@ class Output {
 	/**
 		Write one byte.
 	**/
-	public function writeByte( c : Int ) : Void {
+	public function writeByte(c:Int):Void {
 		throw "Not implemented";
 	}
 
@@ -54,24 +54,24 @@ class Output {
 
 		See `writeFullBytes` that tries to write the exact amount of specified bytes.
 	**/
-	public function writeBytes( s : Bytes, pos : Int, len : Int ) : Int {
+	public function writeBytes(s:Bytes, pos:Int, len:Int):Int {
 		#if !neko
-		if( pos < 0 || len < 0 || pos + len > s.length )
+		if (pos < 0 || len < 0 || pos + len > s.length)
 			throw Error.OutsideBounds;
 		#end
 		var b = #if js @:privateAccess s.b #else s.getData() #end;
 		var k = len;
-		while( k > 0 ) {
+		while (k > 0) {
 			#if neko
-				writeByte(untyped __dollar__sget(b,pos));
+			writeByte(untyped __dollar__sget(b, pos));
 			#elseif php
-				writeByte(b.get(pos));
+			writeByte(b.get(pos));
 			#elseif cpp
-				writeByte(untyped b[pos]);
+			writeByte(untyped b[pos]);
 			#elseif hl
-				writeByte(b[pos]);
+			writeByte(b[pos]);
 			#else
-				writeByte(untyped b[pos]);
+			writeByte(untyped b[pos]);
 			#end
 			pos++;
 			k--;
@@ -82,33 +82,31 @@ class Output {
 	/**
 		Flush any buffered data.
 	**/
-	public function flush() {
-	}
+	public function flush() {}
 
 	/**
 		Close the output.
 
 		Behaviour while writing after calling this method is unspecified.
 	**/
-	public function close() {
-	}
+	public function close() {}
 
-	function set_bigEndian( b ) {
+	function set_bigEndian(b) {
 		bigEndian = b;
 		return b;
 	}
 
 	/* ------------------ API ------------------ */
-
 	/**
 		Write all bytes stored in `s`.
 	**/
-	public function write( s : Bytes ) : Void {
+	public function write(s:Bytes):Void {
 		var l = s.length;
 		var p = 0;
-		while( l > 0 ) {
-			var k = writeBytes(s,p,l);
-			if( k == 0 ) throw Error.Blocked;
+		while (l > 0) {
+			var k = writeBytes(s, p, l);
+			if (k == 0)
+				throw Error.Blocked;
 			p += k;
 			l -= k;
 		}
@@ -119,9 +117,9 @@ class Output {
 
 		Unlike `writeBytes`, this method tries to write the exact `len` amount of bytes.
 	**/
-	public function writeFullBytes( s : Bytes, pos : Int, len : Int ) {
-		while( len > 0 ) {
-			var k = writeBytes(s,pos,len);
+	public function writeFullBytes(s:Bytes, pos:Int, len:Int) {
+		while (len > 0) {
+			var k = writeBytes(s, pos, len);
 			pos += k;
 			len -= k;
 		}
@@ -132,7 +130,7 @@ class Output {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function writeFloat( x : Float ) {
+	public function writeFloat(x:Float) {
 		writeInt32(FPHelper.floatToI32(x));
 	}
 
@@ -141,9 +139,9 @@ class Output {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function writeDouble( x : Float ) {
+	public function writeDouble(x:Float) {
 		var i64 = FPHelper.doubleToI64(x);
-		if( bigEndian ) {
+		if (bigEndian) {
 			writeInt32(i64.high);
 			writeInt32(i64.low);
 		} else {
@@ -155,8 +153,8 @@ class Output {
 	/**
 		Write `x` as 8-bit signed integer.
 	**/
-	public function writeInt8( x : Int ) {
-		if( x < -0x80 || x >= 0x80 )
+	public function writeInt8(x:Int) {
+		if (x < -0x80 || x >= 0x80)
 			throw Error.Overflow;
 		writeByte(x & 0xFF);
 	}
@@ -166,8 +164,9 @@ class Output {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function writeInt16( x : Int ) {
-		if( x < -0x8000 || x >= 0x8000 ) throw Error.Overflow;
+	public function writeInt16(x:Int) {
+		if (x < -0x8000 || x >= 0x8000)
+			throw Error.Overflow;
 		writeUInt16(x & 0xFFFF);
 	}
 
@@ -176,9 +175,10 @@ class Output {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function writeUInt16( x : Int ) {
-		if( x < 0 || x >= 0x10000 ) throw Error.Overflow;
-		if( bigEndian ) {
+	public function writeUInt16(x:Int) {
+		if (x < 0 || x >= 0x10000)
+			throw Error.Overflow;
+		if (bigEndian) {
 			writeByte(x >> 8);
 			writeByte(x & 0xFF);
 		} else {
@@ -192,8 +192,9 @@ class Output {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function writeInt24( x : Int ) {
-		if( x < -0x800000 || x >= 0x800000 ) throw Error.Overflow;
+	public function writeInt24(x:Int) {
+		if (x < -0x800000 || x >= 0x800000)
+			throw Error.Overflow;
 		writeUInt24(x & 0xFFFFFF);
 	}
 
@@ -202,9 +203,10 @@ class Output {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function writeUInt24( x : Int ) {
-		if( x < 0 || x >= 0x1000000 ) throw Error.Overflow;
-		if( bigEndian ) {
+	public function writeUInt24(x:Int) {
+		if (x < 0 || x >= 0x1000000)
+			throw Error.Overflow;
+		if (bigEndian) {
 			writeByte(x >> 16);
 			writeByte((x >> 8) & 0xFF);
 			writeByte(x & 0xFF);
@@ -220,17 +222,17 @@ class Output {
 
 		Endianness is specified by the `bigEndian` property.
 	**/
-	public function writeInt32( x : Int ) {
-		if( bigEndian ) {
-			writeByte( x >>> 24 );
-			writeByte( (x >> 16) & 0xFF );
-			writeByte( (x >> 8) & 0xFF );
-			writeByte( x & 0xFF );
+	public function writeInt32(x:Int) {
+		if (bigEndian) {
+			writeByte(x >>> 24);
+			writeByte((x >> 16) & 0xFF);
+			writeByte((x >> 8) & 0xFF);
+			writeByte(x & 0xFF);
 		} else {
-			writeByte( x & 0xFF );
-			writeByte( (x >> 8) & 0xFF );
-			writeByte( (x >> 16) & 0xFF );
-			writeByte( x >>> 24 );
+			writeByte(x & 0xFF);
+			writeByte((x >> 8) & 0xFF);
+			writeByte((x >> 16) & 0xFF);
+			writeByte(x >>> 24);
 		}
 	}
 
@@ -241,8 +243,7 @@ class Output {
 		on this information, or simply ignore it. This is not a mandatory call
 		but a tip and is only used in some specific cases.
 	**/
-	public function prepare( nbytes : Int ) {
-	}
+	public function prepare(nbytes:Int) {}
 
 	/**
 		Read all available data from `i` and write it.
@@ -250,44 +251,43 @@ class Output {
 		The `bufsize` optional argument specifies the size of chunks by
 		which data is read and written. Its default value is 4096.
 	**/
-	public function writeInput( i : Input, ?bufsize : Int ) {
-		if( bufsize == null )
+	public function writeInput(i:Input, ?bufsize:Int) {
+		if (bufsize == null)
 			bufsize = 4096;
 		var buf = Bytes.alloc(bufsize);
 		try {
-			while( true ) {
-				var len = i.readBytes(buf,0,bufsize);
-				if( len == 0 )
+			while (true) {
+				var len = i.readBytes(buf, 0, bufsize);
+				if (len == 0)
 					throw Error.Blocked;
 				var p = 0;
-				while( len > 0 ) {
-					var k = writeBytes(buf,p,len);
-					if( k == 0 )
+				while (len > 0) {
+					var k = writeBytes(buf, p, len);
+					if (k == 0)
 						throw Error.Blocked;
 					p += k;
 					len -= k;
 				}
 			}
-		} catch( e : Eof ) {
-		}
+		} catch (e:Eof) {}
 	}
 
 	/**
 		Write `s` string.
 	**/
-	public function writeString( s : String ) {
+	public function writeString(s:String, ?encoding:Encoding) {
 		#if neko
-		var b = untyped new Bytes(s.length,s.__s);
+		var b = untyped new Bytes(s.length, s.__s);
 		#else
-		var b = Bytes.ofString(s);
+		var b = Bytes.ofString(s, encoding);
 		#end
-		writeFullBytes(b,0,b.length);
+		writeFullBytes(b, 0, b.length);
 	}
 
-#if neko
-	static function __init__() untyped {
-		Output.prototype.bigEndian = false;
-	}
-#end
-
+	#if neko
+	static function __init__()
+		untyped {
+			Output.prototype.bigEndian = false;
+		}
+	#end
 }
diff --git a/std/haxe/io/Path.hx b/std/haxe/io/Path.hx
index 48ad19c1123d4c44fd67a501ab616757e32fa93f..1bf672514659d7f40d1a23e61ce89eb8a73aef54 100644
--- a/std/haxe/io/Path.hx
+++ b/std/haxe/io/Path.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,17 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 /**
 	This class provides a convenient way of working with paths. It supports the
 	common path formats:
 
-	- directory1/directory2/filename.extension
-	- directory1\directory2\filename.extension
+	- `directory1/directory2/filename.extension`
+	- `directory1\directory2\filename.extension`
 **/
 class Path {
-
 	/**
 		The directory.
 
@@ -38,19 +38,19 @@ class Path {
 
 		Does not end with a `/` or `\` separator.
 
-		If the path has no directory, the value is null.
+		If the path has no directory, the value is `null`.
 	**/
-	public var dir : String;
+	public var dir:Null<String>;
 
 	/**
 		The file name.
 
 		This is the part of the part between the directory and the extension.
 
-		If there is no file name, e.g. for ".htaccess" or "/dir/", the value
-		is the empty String "".
+		If there is no file name, e.g. for `".htaccess"` or `"/dir/"`, the value
+		is the empty String `""`.
 	**/
-	public var file : String;
+	public var file:String;
 
 	/**
 		The file extension.
@@ -58,22 +58,22 @@ class Path {
 		It is separated from the file name by a dot. This dot is not part of
 		the extension.
 
-		If the path has no extension, the value is null.
+		If the path has no extension, the value is `null`.
 	**/
-	public var ext : String;
+	public var ext:Null<String>;
 
 	/**
-		True if the last directory separator is a backslash, false otherwise.
+		`true` if the last directory separator is a backslash, `false` otherwise.
 	**/
-	public var backslash : Bool;
+	public var backslash:Bool;
 
 	/**
-		Creates a new Path instance by parsing `path`.
+		Creates a new `Path` instance by parsing `path`.
 
-		Path information can be retrieved by accessing the dir, file and ext
+		Path information can be retrieved by accessing the `dir`, `file` and `ext`
 		properties.
 	**/
-	public function new( path : String ) {
+	public function new(path:String) {
 		switch (path) {
 			case "." | "..":
 				dir = path;
@@ -82,19 +82,19 @@ class Path {
 		}
 		var c1 = path.lastIndexOf("/");
 		var c2 = path.lastIndexOf("\\");
-		if( c1 < c2 ) {
-			dir = path.substr(0,c2);
-			path = path.substr(c2+1);
+		if (c1 < c2) {
+			dir = path.substr(0, c2);
+			path = path.substr(c2 + 1);
 			backslash = true;
-		} else if( c2 < c1 ) {
-			dir = path.substr(0,c1);
-			path = path.substr(c1+1);
+		} else if (c2 < c1) {
+			dir = path.substr(0, c1);
+			path = path.substr(c1 + 1);
 		} else
 			dir = null;
 		var cp = path.lastIndexOf(".");
-		if( cp != -1 ) {
-			ext = path.substr(cp+1);
-			file = path.substr(0,cp);
+		if (cp != -1) {
+			ext = path.substr(cp + 1);
+			file = path.substr(0, cp);
 		} else {
 			ext = null;
 			file = path;
@@ -104,23 +104,23 @@ class Path {
 	/**
 		Returns a String representation of `this` path.
 
-		If `this.backslash` is true, backslash is used as directory separator,
+		If `this.backslash` is `true`, backslash is used as directory separator,
 		otherwise slash is used. This only affects the separator between
 		`this.dir` and `this.file`.
 
-		If `this.directory` or `this.extension` is null, their representation
-		is the empty String "".
+		If `this.directory` or `this.extension` is `null`, their representation
+		is the empty String `""`.
 	**/
-	public function toString() : String {
-		return (if( dir == null ) "" else dir + if( backslash ) "\\" else "/") + file + (if( ext == null ) "" else "." + ext);
+	public function toString():String {
+		return (if (dir == null) "" else dir + if (backslash) "\\" else "/") + file + (if (ext == null) "" else "." + ext);
 	}
 
 	/**
 		Returns the String representation of `path` without the file extension.
 
-		If `path` is null, the result is unspecified.
+		If `path` is `null`, the result is unspecified.
 	**/
-	public static function withoutExtension( path : String ) : String {
+	public static function withoutExtension(path:String):String {
 		var s = new Path(path);
 		s.ext = null;
 		return s.toString();
@@ -129,9 +129,9 @@ class Path {
 	/**
 		Returns the String representation of `path` without the directory.
 
-		If `path` is null, the result is unspecified.
+		If `path` is `null`, the result is unspecified.
 	**/
-	public static function withoutDirectory( path ) : String {
+	public static function withoutDirectory(path):String {
 		var s = new Path(path);
 		s.dir = null;
 		return s.toString();
@@ -140,13 +140,13 @@ class Path {
 	/**
 		Returns the directory of `path`.
 
-		If the directory is null, the empty String `""` is returned.
+		If the directory is `null`, the empty String `""` is returned.
 
-		If `path` is null, the result is unspecified.
+		If `path` is `null`, the result is unspecified.
 	**/
-	public static function directory( path ) : String {
+	public static function directory(path):String {
 		var s = new Path(path);
-		if( s.dir == null )
+		if (s.dir == null)
 			return "";
 		return s.dir;
 	}
@@ -154,13 +154,13 @@ class Path {
 	/**
 		Returns the extension of `path`.
 
-		If the extension is null, the empty String `""` is returned.
+		If `path` has no extension, the empty String `""` is returned.
 
-		If `path` is null, the result is unspecified.
+		If `path` is `null`, the result is unspecified.
 	**/
-	public static function extension( path ) : String {
+	public static function extension(path):String {
 		var s = new Path(path);
-		if( s.ext == null )
+		if (s.ext == null)
 			return "";
 		return s.ext;
 	}
@@ -170,9 +170,9 @@ class Path {
 
 		If `path` has no extension, `ext` is added as extension.
 
-		If `path` or `ext` are null, the result is unspecified.
+		If `path` or `ext` are `null`, the result is unspecified.
 	**/
-	public static function withExtension( path, ext ) : String {
+	public static function withExtension(path, ext):String {
 		var s = new Path(path);
 		s.ext = ext;
 		return s.toString();
@@ -184,9 +184,9 @@ class Path {
 		If `paths` is empty, the empty String `""` is returned. Otherwise the
 		paths are joined with a slash between them.
 
-		If `paths` is null, the result is unspecified.
+		If `paths` is `null`, the result is unspecified.
 	**/
-	public static function join(paths:Array<String>) : String {
+	public static function join(paths:Array<String>):String {
 		var paths = paths.filter(function(s) return s != null && s != "");
 		if (paths.length == 0) {
 			return "";
@@ -200,42 +200,50 @@ class Path {
 	}
 
 	/**
-		Normalize a given `path` (e.g. make '/usr/local/../lib' to '/usr/lib').
+		Normalize a given `path` (e.g. turn `'/usr/local/../lib'` into `'/usr/lib'`).
 
-		Also replaces backslashes \ with slashes / and afterwards turns
+		Also replaces backslashes `\` with slashes `/` and afterwards turns
 		multiple slashes into a single one.
 
-		If `path` is null, the result is unspecified.
+		If `path` is `null`, the result is unspecified.
 	**/
-	public static function normalize(path : String) : String {
+	public static function normalize(path:String):String {
 		var slash = "/";
 		path = path.split("\\").join(slash);
-		if (path == slash) return slash;
+		if (path == slash)
+			return slash;
 
 		var target = [];
 
-		for( token in path.split(slash) ) {
-			if(token == '..' && target.length > 0 && target[target.length-1] != "..") {
+		for (token in path.split(slash)) {
+			if (token == '..' && target.length > 0 && target[target.length - 1] != "..") {
 				target.pop();
-			} else if(token != '.') {
+			} else if (token == '') {
+				if (target.length > 0 || path.charCodeAt(0) == '/'.code) {
+					target.push(token);
+				}
+			} else if (token != '.') {
 				target.push(token);
 			}
 		}
 
 		var tmp = target.join(slash);
-		var regex = ~/([^:])\/+/g;
-		var result = regex.replace(tmp, "$1" +slash);
 		var acc = new StringBuf();
 		var colon = false;
 		var slashes = false;
+		#if utf16
+		for (c in haxe.iterators.StringIteratorUnicode.unicodeIterator(tmp)) {
+			switch (c) {
+		#else
 		for (i in 0...tmp.length) {
 			switch (StringTools.fastCodeAt(tmp, i)) {
+		#end
 				case ":".code:
 					acc.add(":");
 					colon = true;
 				case "/".code if (!colon):
 					slashes = true;
-				case i:
+				case var i:
 					colon = false;
 					if (slashes) {
 						acc.add("/");
@@ -244,6 +252,7 @@ class Path {
 					acc.addChar(i);
 			}
 		}
+
 		return acc.toString();
 	}
 
@@ -257,19 +266,23 @@ class Path {
 		is appended to `path`. In particular, this applies to the empty String
 		`""`.
 
-		If `path` is null, the result is unspecified.
+		If `path` is `null`, the result is unspecified.
 	**/
-	public static function addTrailingSlash( path : String ) : String {
+	public static function addTrailingSlash(path:String):String {
 		if (path.length == 0)
 			return "/";
 		var c1 = path.lastIndexOf("/");
 		var c2 = path.lastIndexOf("\\");
-		return if ( c1 < c2 ) {
-			if (c2 != path.length - 1) path + "\\";
-			else path;
+		return if (c1 < c2) {
+			if (c2 != path.length - 1)
+				path + "\\";
+			else
+				path;
 		} else {
-			if (c1 != path.length - 1) path + "/";
-			else path;
+			if (c1 != path.length - 1)
+				path + "/";
+			else
+				path;
 		}
 	}
 
@@ -281,36 +294,39 @@ class Path {
 		Otherwise the substring of `path` excluding the trailing slashes or
 		backslashes is returned.
 
-		If `path` is null, the result is unspecified.
+		If `path` is `null`, the result is unspecified.
 	**/
-	@:require(haxe_ver >= 3.1)
-	public static function removeTrailingSlashes ( path : String ) : String {
+	public static function removeTrailingSlashes(path:String):String {
 		while (true) {
-			switch(path.charCodeAt(path.length - 1)) {
-				case '/'.code | '\\'.code: path = path.substr(0, -1);
-				case _: break;
+			switch (path.charCodeAt(path.length - 1)) {
+				case '/'.code | '\\'.code:
+					path = path.substr(0, -1);
+				case _:
+					break;
 			}
 		}
 		return path;
 	}
 
 	/**
-		Returns true if the path is an absolute path, and false otherwise.
+		Returns `true` if the path is an absolute path, and `false` otherwise.
 	**/
-	@:require(haxe_ver >= 3.2)
-	public static function isAbsolute ( path : String ) : Bool {
-		if (StringTools.startsWith(path, '/')) return true;
-		if (path.charAt(1) == ':') return true;
-		if (StringTools.startsWith(path, '\\\\')) return true;
+	public static function isAbsolute(path:String):Bool {
+		if (StringTools.startsWith(path, '/'))
+			return true;
+		if (path.charAt(1) == ':')
+			return true;
+		if (StringTools.startsWith(path, '\\\\'))
+			return true;
 		return false;
 	}
 
-	private static function unescape( path : String ) : String {
+	private static function unescape(path:String):String {
 		var regex = ~/-x([0-9][0-9])/g;
 		return regex.map(path, function(regex) return String.fromCharCode(Std.parseInt(regex.matched(1))));
 	}
 
-	private static function escape( path : String, allowSlashes : Bool = false ) : String {
+	private static function escape(path:String, allowSlashes:Bool = false):String {
 		var regex = allowSlashes ? ~/[^A-Za-z0-9_\/\\\.]/g : ~/[^A-Za-z0-9_\.]/g;
 		return regex.map(path, function(v) return '-x' + v.matched(0).charCodeAt(0));
 	}
diff --git a/std/haxe/io/Scheme.hx b/std/haxe/io/Scheme.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e5acdcfea11e74ce1632aa68600114aacb767e54
--- /dev/null
+++ b/std/haxe/io/Scheme.hx
@@ -0,0 +1,18 @@
+package haxe.io;
+
+/**
+	A scheme consists of a sequence of characters beginning with a letter and followed
+	by any combination of letters, digits, plus (`+`, period (`.`), or hyphen (`-`).
+
+	Although schemes are case-insensitive, the canonical form is lowercase
+	and documents that specify schemes must do so with lowercase letters.
+	It is followed by a colon (`:`).
+**/
+enum abstract Scheme(String) from String to String {
+	var Http = 'http';
+	var Https = 'https';
+	var Ftp = 'ftp';
+	var MailTo = 'mailto';
+	var File = 'file';
+	var Data = 'data';
+}
diff --git a/std/haxe/io/StringInput.hx b/std/haxe/io/StringInput.hx
index 95b0416b407a437755ba35f3728f45c597feb25c..7d058a4497a7ad383145022a674cfa3d9b9077c6 100644
--- a/std/haxe/io/StringInput.hx
+++ b/std/haxe/io/StringInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 class StringInput extends BytesInput {
-
-	public function new( s : String ) {
+	public function new(s:String) {
 		#if neko
 		// don't copy the string
-		super( neko.Lib.bytesReference(s) );
+		super(neko.Lib.bytesReference(s));
 		#else
-		super( haxe.io.Bytes.ofString(s) );
+		super(haxe.io.Bytes.ofString(s));
 		#end
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/haxe/io/UInt16Array.hx b/std/haxe/io/UInt16Array.hx
index 978e406c5b3b87b6338557ed3640717e4c4118e6..bad0aefdccabe71486ff6f48b80b55c7871fe588 100644
--- a/std/haxe/io/UInt16Array.hx
+++ b/std/haxe/io/UInt16Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 typedef UInt16ArrayData = ArrayBufferView.ArrayBufferViewData;
 
 abstract UInt16Array(UInt16ArrayData) {
-
 	public static inline var BYTES_PER_ELEMENT = 2;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
 
-	public inline function new( elements : Int ) {
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
+
+	public inline function new(elements:Int) {
 		this = new ArrayBufferView(elements * BYTES_PER_ELEMENT).getData();
 	}
 
@@ -37,49 +38,50 @@ abstract UInt16Array(UInt16ArrayData) {
 		return this.byteLength >> 1;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : Int {
-		return this.bytes.getUInt16((index<<1) + this.byteOffset);
+	@:arrayAccess public inline function get(index:Int):Int {
+		return this.bytes.getUInt16((index << 1) + this.byteOffset);
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : Int ) : Int {
-		if( index >= 0 && index < length ) {
-			this.bytes.setUInt16((index<<1) + this.byteOffset, value);
+	@:arrayAccess public inline function set(index:Int, value:Int):Int {
+		if (index >= 0 && index < length) {
+			this.bytes.setUInt16((index << 1) + this.byteOffset, value);
 			return value;
 		}
 		return 0;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : UInt16Array {
-		return fromData(this.sub(begin<<1,length == null ? null : length<<1));
+	public inline function sub(begin:Int, ?length:Int):UInt16Array {
+		return fromData(this.sub(begin << 1, length == null ? null : length << 1));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : UInt16Array {
-		return fromData(this.subarray(begin==null?null:begin<<1,end==null?null:end<<1));
+	public inline function subarray(?begin:Int, ?end:Int):UInt16Array {
+		return fromData(this.subarray(begin == null ? null : begin << 1, end == null ? null : end << 1));
 	}
 
-	public inline function getData() : UInt16ArrayData {
+	public inline function getData():UInt16ArrayData {
 		return this;
 	}
 
-	public static function fromData( d : UInt16ArrayData ) : UInt16Array {
+	public static function fromData(d:UInt16ArrayData):UInt16Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<Int>, pos = 0, ?length : Int ) : UInt16Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
+	public static function fromArray(a:Array<Int>, pos = 0, ?length:Int):UInt16Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
 		var i = new UInt16Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos = 0, ?length : Int ) : UInt16Array {
-		return fromData(ArrayBufferView.fromBytes(bytes,bytePos,(length == null ? (bytes.length - bytePos)>>1 : length)<<1).getData());
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos = 0, ?length:Int):UInt16Array {
+		return fromData(ArrayBufferView.fromBytes(bytes, bytePos, (length == null ? (bytes.length - bytePos) >> 1 : length) << 1).getData());
 	}
 }
-
diff --git a/std/haxe/io/UInt32Array.hx b/std/haxe/io/UInt32Array.hx
index 128a39bf8124d40b5071d0a2580209ecea45a4a6..b433f445822285843628688abceacf548d66b0dd 100644
--- a/std/haxe/io/UInt32Array.hx
+++ b/std/haxe/io/UInt32Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 typedef UInt32ArrayData = ArrayBufferView.ArrayBufferViewData;
 
 abstract UInt32Array(UInt32ArrayData) {
-
 	public static inline var BYTES_PER_ELEMENT = 4;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
 
-	public inline function new( elements : Int ) {
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
+
+	public inline function new(elements:Int) {
 		this = new ArrayBufferView(elements * BYTES_PER_ELEMENT).getData();
 	}
 
@@ -37,49 +38,50 @@ abstract UInt32Array(UInt32ArrayData) {
 		return this.byteLength >> 2;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : UInt {
-		return this.bytes.getInt32((index<<2) + this.byteOffset);
+	@:arrayAccess public inline function get(index:Int):UInt {
+		return this.bytes.getInt32((index << 2) + this.byteOffset);
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : UInt ) : UInt {
-		if( index >= 0 && index < length ) {
-			this.bytes.setInt32((index<<2) + this.byteOffset, value);
+	@:arrayAccess public inline function set(index:Int, value:UInt):UInt {
+		if (index >= 0 && index < length) {
+			this.bytes.setInt32((index << 2) + this.byteOffset, value);
 			return value;
 		}
 		return 0;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : UInt32Array {
-		return fromData(this.sub(begin<<2,length == null ? null : length<<2));
+	public inline function sub(begin:Int, ?length:Int):UInt32Array {
+		return fromData(this.sub(begin << 2, length == null ? null : length << 2));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : UInt32Array {
-		return fromData(this.subarray(begin==null?null:begin<<2,end==null?null:end<<2));
+	public inline function subarray(?begin:Int, ?end:Int):UInt32Array {
+		return fromData(this.subarray(begin == null ? null : begin << 2, end == null ? null : end << 2));
 	}
 
-	public inline function getData() : UInt32ArrayData {
+	public inline function getData():UInt32ArrayData {
 		return this;
 	}
 
-	public static function fromData( d : UInt32ArrayData ) : UInt32Array {
+	public static function fromData(d:UInt32ArrayData):UInt32Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<UInt>, pos = 0, ?length : Int ) : UInt32Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
+	public static function fromArray(a:Array<UInt>, pos = 0, ?length:Int):UInt32Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
 		var i = new UInt32Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos = 0, ?length : Int ) : UInt32Array {
-		return fromData(ArrayBufferView.fromBytes(bytes,bytePos,(length == null ? (bytes.length - bytePos)>>2 : length)<<2).getData());
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos = 0, ?length:Int):UInt32Array {
+		return fromData(ArrayBufferView.fromBytes(bytes, bytePos, (length == null ? (bytes.length - bytePos) >> 2 : length) << 2).getData());
 	}
 }
-
diff --git a/std/haxe/io/UInt8Array.hx b/std/haxe/io/UInt8Array.hx
index 5f5f64c6a74b6f6080f22b809a118673e3baf829..696808d2a811d78ea52e52582ed8340f3616e752 100644
--- a/std/haxe/io/UInt8Array.hx
+++ b/std/haxe/io/UInt8Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 typedef UInt8ArrayData = ArrayBufferView.ArrayBufferViewData;
 
 abstract UInt8Array(UInt8ArrayData) {
-
 	public static inline var BYTES_PER_ELEMENT = 1;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
 
-	public inline function new( elements : Int ) {
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
+
+	public inline function new(elements:Int) {
 		this = new ArrayBufferView(elements * BYTES_PER_ELEMENT).getData();
 	}
 
@@ -37,50 +38,50 @@ abstract UInt8Array(UInt8ArrayData) {
 		return this.byteLength;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) {
+	@:arrayAccess public inline function get(index:Int) {
 		return this.bytes.get(index + this.byteOffset);
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : Int ) : Int {
-		if( index >= 0 && index < length ) {
+	@:arrayAccess public inline function set(index:Int, value:Int):Int {
+		if (index >= 0 && index < length) {
 			this.bytes.set(index + this.byteOffset, value);
 			return value;
 		}
 		return 0;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : UInt8Array {
-		return fromData(this.sub(begin,length));
+	public inline function sub(begin:Int, ?length:Int):UInt8Array {
+		return fromData(this.sub(begin, length));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : UInt8Array {
-		return fromData(this.subarray(begin,end));
+	public inline function subarray(?begin:Int, ?end:Int):UInt8Array {
+		return fromData(this.subarray(begin, end));
 	}
 
-	public inline function getData() : UInt8ArrayData {
+	public inline function getData():UInt8ArrayData {
 		return this;
 	}
 
-	public static function fromData( d : UInt8ArrayData ) : UInt8Array {
+	public static function fromData(d:UInt8ArrayData):UInt8Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<Int>, pos = 0, ?length : Int ) : UInt8Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
+	public static function fromArray(a:Array<Int>, pos = 0, ?length:Int):UInt8Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
 		var i = new UInt8Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos : Int = 0, ?length : Int ) : UInt8Array {
-		return fromData(ArrayBufferView.fromBytes(bytes,bytePos,length).getData());
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos:Int = 0, ?length:Int):UInt8Array {
+		return fromData(ArrayBufferView.fromBytes(bytes, bytePos, length).getData());
 	}
-
 }
-
diff --git a/std/haxe/iterators/DynamicAccessIterator.hx b/std/haxe/iterators/DynamicAccessIterator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..abf0a6a2926612d9dde181a727a584784a407e5d
--- /dev/null
+++ b/std/haxe/iterators/DynamicAccessIterator.hx
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.iterators;
+
+/**
+	This iterator can be used to iterate over the values of `haxe.DynamicAccess`.
+**/
+class DynamicAccessIterator<T> {
+	final access:DynamicAccess<T>;
+	final keys:Array<String>;
+	var index:Int;
+
+	public inline function new(access:DynamicAccess<T>) {
+		this.access = access;
+		this.keys = access.keys();
+		index = 0;
+	}
+
+	/**
+		See `Iterator.hasNext`
+	**/
+	public inline function hasNext():Bool {
+		return index < keys.length;
+	}
+
+	/**
+		See `Iterator.next`
+	**/
+	public inline function next():T {
+		return access[keys[index++]];
+	}
+}
diff --git a/std/haxe/iterators/DynamicAccessKeyValueIterator.hx b/std/haxe/iterators/DynamicAccessKeyValueIterator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..08fcde6ab83af689c67353dc8f7f518c4c0cff32
--- /dev/null
+++ b/std/haxe/iterators/DynamicAccessKeyValueIterator.hx
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.iterators;
+
+/**
+	This Key/Value iterator can be used to iterate over `haxe.DynamicAccess`.
+**/
+class DynamicAccessKeyValueIterator<T> {
+	final access:DynamicAccess<T>;
+	final keys:Array<String>;
+	var index:Int;
+
+	public inline function new(access:DynamicAccess<T>) {
+		this.access = access;
+		this.keys = access.keys();
+		index = 0;
+	}
+
+	/**
+		See `Iterator.hasNext`
+	**/
+	public inline function hasNext():Bool {
+		return index < keys.length;
+	}
+
+	/**
+		See `Iterator.next`
+	**/
+	public inline function next():{key:String, value:T} {
+		var key = keys[index++];
+		return {value: access[key], key: key};
+	}
+}
diff --git a/std/haxe/iterators/MapKeyValueIterator.hx b/std/haxe/iterators/MapKeyValueIterator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fa9b7c479206d2e0ff9ec4f3cb891d64b886649d
--- /dev/null
+++ b/std/haxe/iterators/MapKeyValueIterator.hx
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.iterators;
+
+import haxe.ds.IntMap;
+
+/**
+	This Key/Value iterator can be used to iterate across maps.
+**/
+@:ifFeature("anon_read.keyValueIterator", "dynamic_read.keyValueIterator")
+class MapKeyValueIterator<K, V> {
+	var map:haxe.Constraints.IMap<K, V>;
+	var keys:Iterator<K>;
+
+	public inline function new(map:haxe.Constraints.IMap<K, V>) {
+		this.map = map;
+		this.keys = map.keys();
+	}
+
+	/**
+		See `Iterator.hasNext`
+	**/
+	public inline function hasNext():Bool {
+		return keys.hasNext();
+	}
+
+	/**
+		See `Iterator.next`
+	**/
+	public inline function next():{key:K, value:V} {
+		var key = keys.next();
+		return {value: map.get(key), key: key};
+	}
+}
diff --git a/std/haxe/iterators/StringIterator.hx b/std/haxe/iterators/StringIterator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7d7005db22adb49bed6e765441b4195cd11a0baf
--- /dev/null
+++ b/std/haxe/iterators/StringIterator.hx
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C)2005-2018 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 haxe.iterators;
+
+/**
+	This iterator can be used to iterate over char codes in a string.
+
+	Note that char codes may differ across platforms because of different
+	internal encoding of strings in different of runtimes.
+**/
+class StringIterator {
+	var offset = 0;
+	var s:String;
+
+	/**
+		Create a new `StringIterator` over String `s`.
+	**/
+	public inline function new(s:String) {
+		this.s = s;
+	}
+
+	/**
+		See `Iterator.hasNext`
+	**/
+	public inline function hasNext() {
+		return offset < s.length;
+	}
+
+	/**
+		See `Iterator.next`
+	**/
+	public inline function next() {
+		return StringTools.fastCodeAt(s, offset++);
+	}
+}
diff --git a/std/haxe/iterators/StringIteratorUnicode.hx b/std/haxe/iterators/StringIteratorUnicode.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ca73609c721b29bd5b042f5aafc96e1fe9c1572d
--- /dev/null
+++ b/std/haxe/iterators/StringIteratorUnicode.hx
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.iterators;
+
+/**
+	This iterator can be used to iterate across strings in a cross-platform
+	way. It handles surrogate pairs on platforms that require it. On each
+	iteration, it returns the next character code.
+
+	Note that this has different semantics than a standard for-loop over the
+	String's length due to the fact that it deals with surrogate pairs.
+**/
+class StringIteratorUnicode {
+	var offset = 0;
+	var s:String;
+
+	/**
+		Create a new `StringIteratorUnicode` over String `s`.
+	**/
+	public inline function new(s:String) {
+		this.s = s;
+	}
+
+	/**
+		See `Iterator.hasNext`
+	**/
+	public inline function hasNext() {
+		return offset < s.length;
+	}
+
+	/**
+		See `Iterator.next`
+	**/
+	@:access(StringTools)
+	public inline function next() {
+		#if utf16
+		var c = StringTools.utf16CodePointAt(s, offset++);
+		if (c >= StringTools.MIN_SURROGATE_CODE_POINT) {
+			offset++;
+		}
+		return c;
+		#else
+		return StringTools.fastCodeAt(s, offset++);
+		#end
+	}
+
+	/**
+		Convenience function which can be used as a static extension.
+	**/
+	static public inline function unicodeIterator(s:String) {
+		return new StringIteratorUnicode(s);
+	}
+}
diff --git a/std/haxe/iterators/StringKeyValueIterator.hx b/std/haxe/iterators/StringKeyValueIterator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8a690789fb644afa90a1edbfa941b0a673f84bfa
--- /dev/null
+++ b/std/haxe/iterators/StringKeyValueIterator.hx
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C)2005-2018 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 haxe.iterators;
+
+/**
+	This iterator can be used to iterate over char indexes and char codes in a string.
+
+	Note that char codes may differ across platforms because of different
+	internal encoding of strings in different runtimes.
+**/
+class StringKeyValueIterator {
+	var offset = 0;
+	var s:String;
+
+	/**
+		Create a new `StringKeyValueIterator` over String `s`.
+	**/
+	public inline function new(s:String) {
+		this.s = s;
+	}
+
+	/**
+		See `KeyValueIterator.hasNext`
+	**/
+	public inline function hasNext() {
+		return offset < s.length;
+	}
+
+	/**
+		See `KeyValueIterator.next`
+	**/
+	public inline function next() {
+		return {key: offset, value: StringTools.fastCodeAt(s, offset++)};
+	}
+}
diff --git a/std/haxe/iterators/StringKeyValueIteratorUnicode.hx b/std/haxe/iterators/StringKeyValueIteratorUnicode.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3647c6d76f1f95f36f8775deb913e281e9a219d1
--- /dev/null
+++ b/std/haxe/iterators/StringKeyValueIteratorUnicode.hx
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.iterators;
+
+/**
+	This iterator can be used to iterate across strings in a cross-platform
+	way. It handles surrogate pairs on platforms that require it. On each
+	iteration, it returns the next character offset as key and the next
+	character code as value.
+
+	Note that in the general case, because of surrogate pairs, the key values
+	should not be used as offsets for various String API operations. For the
+	same reason, the last key value returned might be less than `s.length - 1`.
+**/
+class StringKeyValueIteratorUnicode {
+	var byteOffset = 0;
+	var charOffset = 0;
+	var s:String;
+
+	/**
+		Create a new `StringKeyValueIteratorUnicode` over String `s`.
+	**/
+	public inline function new(s:String) {
+		this.s = s;
+	}
+
+	/**
+		See `Iterator.hasNext`
+	**/
+	public inline function hasNext() {
+		return byteOffset < s.length;
+	}
+
+	/**
+		See `Iterator.next`
+	**/
+	@:access(StringTools)
+	public inline function next() {
+		#if utf16
+		var c = StringTools.utf16CodePointAt(s, byteOffset++);
+		if (c >= StringTools.MIN_SURROGATE_CODE_POINT) {
+			byteOffset++;
+		}
+		return {key: charOffset++, value: c};
+		#else
+		return {key: charOffset++, value: StringTools.fastCodeAt(s, byteOffset++)};
+		#end
+	}
+
+	/**
+		Convenience function which can be used as a static extension.
+	**/
+	static public inline function unicodeKeyValueIterator(s:String) {
+		return new StringKeyValueIteratorUnicode(s);
+	}
+}
diff --git a/std/haxe/macro/CompilationServer.hx b/std/haxe/macro/CompilationServer.hx
index a30ced04a32c6d7040cea049bac3ec77513e4d5f..fe58998c52fc2592d3708b24c529a37276e3d331 100644
--- a/std/haxe/macro/CompilationServer.hx
+++ b/std/haxe/macro/CompilationServer.hx
@@ -1,9 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.macro;
 
 import haxe.macro.Compiler;
 
-@:enum
-abstract ModuleCheckPolicy(Int) {
+enum abstract ModuleCheckPolicy(Int) {
 	/**
 		Disables file modification checks, avoiding some filesystem operations.
 	**/
@@ -17,6 +38,11 @@ abstract ModuleCheckPolicy(Int) {
 
 	/**
 		Disables dependency checks of the module.
+
+		This should only be used for modules that don't depend on any module that
+		might change. It is effectively a promise to the compiler that the module
+		is unaffected by changes made to other modules. If that promise is broken,
+		the compiler is sad and things probably stop working.
 	**/
 	var NoCheckDependencies = 2;
 
@@ -28,7 +54,7 @@ abstract ModuleCheckPolicy(Int) {
 	var NoCheckShadowing = 3;
 }
 
-@:enum abstract ContextOptions(Int) {
+enum abstract ContextOptions(Int) {
 	/**
 		Affects only the normal context.
 	**/
@@ -50,8 +76,7 @@ abstract ModuleCheckPolicy(Int) {
 	`--macro server.field(args)`.
 **/
 class CompilationServer {
-	#if macro
-
+	#if (macro || display)
 	/**
 		Sets the `ModuleCheckPolicy` of all files whose dot-path matches an
 		element of `pathFilters`.
@@ -70,7 +95,8 @@ class CompilationServer {
 		If a call to this function is added to the compilation parameters, the
 		compilation server should be restarted to ensure it takes effect.
 	**/
-	static public function setModuleCheckPolicy(pathFilters:Array<String>, policy:Array<ModuleCheckPolicy>, ?recursive = true, ?contextOptions:ContextOptions = NormalContext) {
+	static public function setModuleCheckPolicy(pathFilters:Array<String>, policy:Array<ModuleCheckPolicy>, ?recursive = true,
+			?contextOptions:ContextOptions = NormalContext) {
 		@:privateAccess Compiler.load("server_add_module_check_policy", 4)(pathFilters, policy, recursive, contextOptions);
 	}
 
@@ -81,4 +107,4 @@ class CompilationServer {
 		@:privateAccess Compiler.load("server_invalidate_files", 1)(filePaths);
 	}
 	#end
-}
\ No newline at end of file
+}
diff --git a/std/haxe/macro/Compiler.hx b/std/haxe/macro/Compiler.hx
index ae170e8dc0d3328ab80ccf5aa4c23f04e98103c8..a4a9e6e9bebca4c1aeb1932398acca7ca85d3d5c 100644
--- a/std/haxe/macro/Compiler.hx
+++ b/std/haxe/macro/Compiler.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.macro;
+
 import haxe.macro.Expr;
 
 /**
@@ -30,7 +32,7 @@ import haxe.macro.Expr;
 #end
 class Compiler {
 	/**
-		A conditional compiler flag can be set command line using
+		A conditional compilation flag can be set on the command line using
 		`-D key=value`.
 
 		Returns the value of a compiler flag.
@@ -41,49 +43,54 @@ class Compiler {
 		If the compiler flag is not defined, `Compiler.getDefine` returns
 		`null`.
 
+		Note: This is a macro and cannot be called from within other macros. Refer
+		to `haxe.macro.Context.definedValue` to obtain defined values in macro context.
+
 		@see https://haxe.org/manual/lf-condition-compilation.html
 	**/
-	macro static public function getDefine( key : String ) {
+	macro /* <-- ! */ static public function getDefine(key:String) {
 		return macro $v{haxe.macro.Context.definedValue(key)};
 	}
 
-#if (neko || (macro && hl))
-
+	#if (neko || (macro && hl) || (macro && eval))
 	static var ident = ~/^[A-Za-z_][A-Za-z0-9_]*$/;
 	static var path = ~/^[A-Za-z_][A-Za-z0-9_.]*$/;
 
-	public static function allowPackage( v : String ) {
-		#if neko
+	public static function allowPackage(v:String) {
+		#if (neko || eval)
 		load("allow_package", 1)(v);
 		#end
 	}
 
 	/**
 		Set a conditional compiler flag.
+
+		Usage of this function outside of initialization macros is deprecated and may cause compilation server issues.
 	**/
-	public static function define( flag : String, ?value : String ) {
-		#if neko
-		load("define", 2)(flag,value);
+	public static function define(flag:String, ?value:String) {
+		#if (neko || eval)
+		load("define", 2)(flag, value);
 		#end
 	}
 
-	#if !neko
-	private static function typePatch( cl : String, f : String, stat : Bool, t : String ) {
-	}
-	private static function metaPatch( meta : String, cl : String, f : String, stat : Bool ) {
-	}
-	private static function addGlobalMetadataImpl(pathFilter:String, meta:String, recursive:Bool, toTypes:Bool, toFields:Bool) {
-	}
+	#if (!neko && !eval)
+	private static function typePatch(cl:String, f:String, stat:Bool, t:String) {}
+
+	private static function metaPatch(meta:String, cl:String, f:String, stat:Bool) {}
+
+	private static function addGlobalMetadataImpl(pathFilter:String, meta:String, recursive:Bool, toTypes:Bool, toFields:Bool) {}
 	#end
 
 	/**
 		Removes a (static) field from a given class by name.
 		An error is thrown when `className` or `field` is invalid.
 	**/
-	public static function removeField( className : String, field : String, ?isStatic : Bool ) {
-		if( !path.match(className) ) throw "Invalid "+className;
-		if( !ident.match(field) ) throw "Invalid " + field;
-		#if neko
+	public static function removeField(className:String, field:String, ?isStatic:Bool) {
+		if (!path.match(className))
+			throw "Invalid " + className;
+		if (!ident.match(field))
+			throw "Invalid " + field;
+		#if (neko || eval)
 		load("type_patch", 4)(className, field, isStatic == true, null);
 		#else
 		typePatch(className, field, isStatic == true, null);
@@ -94,10 +101,12 @@ class Compiler {
 		Set the type of a (static) field at a given class by name.
 		An error is thrown when `className` or `field` is invalid.
 	**/
-	public static function setFieldType( className : String, field : String, type : String, ?isStatic : Bool ) {
-		if( !path.match(className) ) throw "Invalid "+className;
-		if( !ident.match((field.charAt(0) == "$") ? field.substr(1) : field) ) throw "Invalid "+field;
-		#if neko
+	public static function setFieldType(className:String, field:String, type:String, ?isStatic:Bool) {
+		if (!path.match(className))
+			throw "Invalid " + className;
+		if (!ident.match((field.charAt(0) == "$") ? field.substr(1) : field))
+			throw "Invalid " + field;
+		#if (neko || eval)
 		load("type_patch", 4)(className, field, isStatic == true, type);
 		#else
 		typePatch(className, field, isStatic == true, type);
@@ -108,38 +117,45 @@ class Compiler {
 		Add metadata to a (static) field or class by name.
 		An error is thrown when `className` or `field` is invalid.
 	**/
-	public static function addMetadata( meta : String, className : String, ?field : String, ?isStatic : Bool ) {
-		if( !path.match(className) ) throw "Invalid "+className;
-		if( field != null && !ident.match(field) ) throw "Invalid "+field;
-		#if neko
+	public static function addMetadata(meta:String, className:String, ?field:String, ?isStatic:Bool) {
+		if (!path.match(className))
+			throw "Invalid " + className;
+		if (field != null && !ident.match(field))
+			throw "Invalid " + field;
+		#if (neko || eval)
 		load("meta_patch", 4)(meta, className, field, isStatic == true);
 		#else
 		metaPatch(meta, className, field, isStatic == true);
 		#end
 	}
 
-	public static function addClassPath( path : String ) {
-		#if neko
+	/**
+		Add a class path where ".hx" source files or packages (sub-directories) can be found.
+
+		Usage of this function outside of initialization macros is deprecated and may cause compilation server issues.
+	**/
+	public static function addClassPath(path:String) {
+		#if (neko || eval)
 		load("add_class_path", 1)(path);
 		#end
 	}
 
-	public static function getOutput() : String {
-		#if neko
+	public static function getOutput():String {
+		#if (neko || eval)
 		return load("get_output", 0)();
 		#else
 		return null;
 		#end
 	}
 
-	public static function setOutput( fileOrDir : String ) {
-		#if neko
+	public static function setOutput(fileOrDir:String) {
+		#if (neko || eval)
 		load("set_output", 1)(fileOrDir);
 		#end
 	}
 
-	public static function getDisplayPos() : Null<{ file : String, pos : Int }> {
-		#if neko
+	public static function getDisplayPos():Null<{file:String, pos:Int}> {
+		#if (neko || eval)
 		return load("get_display_pos", 0)();
 		#else
 		return null;
@@ -148,18 +164,20 @@ class Compiler {
 
 	/**
 		Adds a native library depending on the platform (e.g. `-swf-lib` for Flash).
+
+		Usage of this function outside of initialization macros is deprecated and may cause compilation server issues.
 	**/
-	public static function addNativeLib( name : String ) {
-		#if neko
+	public static function addNativeLib(name:String) {
+		#if (neko || eval)
 		load("add_native_lib", 1)(name);
 		#end
 	}
 
 	/**
 		Adds an argument to be passed to the native compiler (e.g. `-javac-arg` for Java).
-	 **/
-	public static function addNativeArg( argument : String ) {
-		#if neko
+	**/
+	public static function addNativeArg(argument:String) {
+		#if (neko || eval)
 		load("add_native_arg", 1)(argument);
 		#end
 	}
@@ -176,49 +194,70 @@ class Compiler {
 
 		@param rec If true, recursively adds all sub-packages.
 		@param ignore Array of module names to ignore for inclusion.
+			   You can use `module*` with a * at the end for Wildcard matching
 		@param classPaths An alternative array of paths (directory names) to use to search for modules to include.
-		       Note that if you pass this argument, only the specified paths will be used for inclusion.
+			   Note that if you pass this argument, only the specified paths will be used for inclusion.
 		@param strict If true and given package wasn't found in any of class paths, fail with an error.
 	**/
-	public static function include( pack : String, ?rec = true, ?ignore : Array<String>, ?classPaths : Array<String>, strict = false ) {
-		var skip = if( ignore == null ) {
+	public static function include(pack:String, ?rec = true, ?ignore:Array<String>, ?classPaths:Array<String>, strict = false) {
+		var ignoreWildcard:Array<String> = [];
+		var ignoreString:Array<String> = [];
+		if (ignore != null) {
+			for (ignoreRule in ignore) {
+				if (StringTools.endsWith(ignoreRule, "*")) {
+					ignoreWildcard.push(ignoreRule.substr(0, ignoreRule.length - 1));
+				} else {
+					ignoreString.push(ignoreRule);
+				}
+			}
+		}
+		var skip = if (ignore == null) {
 			function(c) return false;
 		} else {
-			function(c) return Lambda.has(ignore, c);
+			function(c:String) {
+				if (Lambda.has(ignoreString, c))
+					return true;
+				for (ignoreRule in ignoreWildcard)
+					if (StringTools.startsWith(c, ignoreRule))
+						return true;
+				return false;
+			}
 		}
 		var displayValue = Context.definedValue("display");
-		if( classPaths == null ) {
+		if (classPaths == null) {
 			classPaths = Context.getClassPath();
 			// do not force inclusion when using completion
 			switch (displayValue) {
 				case null:
 				case "usage":
-				case _: return;
+				case _:
+					return;
 			}
 			// normalize class path
-			for( i in 0...classPaths.length ) {
+			for (i in 0...classPaths.length) {
 				var cp = StringTools.replace(classPaths[i], "\\", "/");
-				if(StringTools.endsWith(cp, "/"))
+				if (StringTools.endsWith(cp, "/"))
 					cp = cp.substr(0, -1);
-				if( cp == "" )
+				if (cp == "")
 					cp = ".";
 				classPaths[i] = cp;
 			}
 		}
 		var prefix = pack == '' ? '' : pack + '.';
 		var found = false;
-		for( cp in classPaths ) {
+		for (cp in classPaths) {
 			var path = pack == '' ? cp : cp + "/" + pack.split(".").join("/");
-			if( !sys.FileSystem.exists(path) || !sys.FileSystem.isDirectory(path) )
+			if (!sys.FileSystem.exists(path) || !sys.FileSystem.isDirectory(path))
 				continue;
 			found = true;
-			for( file in sys.FileSystem.readDirectory(path) ) {
-				if( StringTools.endsWith(file, ".hx") && file.substr(0, file.length - 3).indexOf(".") < 0 ) {
+			for (file in sys.FileSystem.readDirectory(path)) {
+				if (StringTools.endsWith(file, ".hx") && file.substr(0, file.length - 3).indexOf(".") < 0) {
+					if( file == "import.hx" ) continue;
 					var cl = prefix + file.substr(0, file.length - 3);
-					if( skip(cl) )
+					if (skip(cl))
 						continue;
 					Context.getModule(cl);
-				} else if( rec && sys.FileSystem.isDirectory(path + "/" + file) && !skip(prefix + file) )
+				} else if (rec && sys.FileSystem.isDirectory(path + "/" + file) && !skip(prefix + file))
 					include(prefix + file, true, ignore, classPaths);
 			}
 		}
@@ -229,7 +268,7 @@ class Compiler {
 	/**
 		Exclude a class or an enum without changing it to `@:nativeGen`.
 	**/
-	static function excludeBaseType( baseType : Type.BaseType ) : Void {
+	static function excludeBaseType(baseType:Type.BaseType):Void {
 		if (!baseType.isExtern) {
 			var meta = baseType.meta;
 			if (!meta.has(":nativeGen")) {
@@ -245,48 +284,52 @@ class Compiler {
 
 		@param rec If true, recursively excludes all sub-packages.
 	**/
-	public static function exclude( pack : String, ?rec = true ) {
+	public static function exclude(pack:String, ?rec = true) {
 		Context.onGenerate(function(types) {
-			for( t in types ) {
-				var b : Type.BaseType, name;
-				switch( t ) {
-				case TInst(c, _):
-					name = c.toString();
-					b = c.get();
-				case TEnum(e, _):
-					name = e.toString();
-					b = e.get();
-				default: continue;
+			for (t in types) {
+				var b:Type.BaseType, name;
+				switch (t) {
+					case TInst(c, _):
+						name = c.toString();
+						b = c.get();
+					case TEnum(e, _):
+						name = e.toString();
+						b = e.get();
+					default:
+						continue;
 				}
 				var p = b.pack.join(".");
-				if( (p == pack || name == pack) || (rec && StringTools.startsWith(p, pack + ".")) )
+				if ((p == pack || name == pack) || (rec && StringTools.startsWith(p, pack + ".")))
 					excludeBaseType(b);
 			}
-		});
+		}, false);
 	}
 
 	/**
 		Exclude classes and enums listed in an extern file (one per line) from being generated.
 	**/
-	public static function excludeFile( fileName : String ) {
+	public static function excludeFile(fileName:String) {
 		fileName = Context.resolvePath(fileName);
-		var f = sys.io.File.read(fileName,true);
+		var f = sys.io.File.read(fileName, true);
 		var classes = new haxe.ds.StringMap();
 		try {
-			while( true ) {
+			while (true) {
 				var l = StringTools.trim(f.readLine());
-				if( l == "" || !~/[A-Za-z0-9._]/.match(l) )
+				if (l == "" || !~/[A-Za-z0-9._]/.match(l))
 					continue;
-				classes.set(l,true);
+				classes.set(l, true);
 			}
-		} catch( e : haxe.io.Eof ) {
-		}
+		} catch (e:haxe.io.Eof) {}
 		Context.onGenerate(function(types) {
-			for( t in types ) {
-				switch( t ) {
-				case TInst(c, _): if( classes.exists(c.toString()) ) excludeBaseType(c.get());
-				case TEnum(e, _): if( classes.exists(e.toString()) ) excludeBaseType(e.get());
-				default:
+			for (t in types) {
+				switch (t) {
+					case TInst(c, _):
+						if (classes.exists(c.toString()))
+							excludeBaseType(c.get());
+					case TEnum(e, _):
+						if (classes.exists(e.toString()))
+							excludeBaseType(e.get());
+					default:
 				}
 			}
 		});
@@ -295,52 +338,56 @@ class Compiler {
 	/**
 		Load a type patch file that can modify the field types within declared classes and enums.
 	**/
-	public static function patchTypes( file : String ) : Void {
+	public static function patchTypes(file:String):Void {
 		var file = Context.resolvePath(file);
 		var f = sys.io.File.read(file, true);
 		try {
-			while( true ) {
+			while (true) {
 				var r = StringTools.trim(f.readLine());
-				if( r == "" || r.substr(0,2) == "//" ) continue;
-				if( StringTools.endsWith(r,";") ) r = r.substr(0,-1);
-				if( r.charAt(0) == "-" ) {
+				if (r == "" || r.substr(0, 2) == "//")
+					continue;
+				if (StringTools.endsWith(r, ";"))
+					r = r.substr(0, -1);
+				if (r.charAt(0) == "-") {
 					r = r.substr(1);
-					var isStatic = StringTools.startsWith(r,"static ");
-					if( isStatic ) r = r.substr(7);
+					var isStatic = StringTools.startsWith(r, "static ");
+					if (isStatic)
+						r = r.substr(7);
 					var p = r.split(".");
 					var field = p.pop();
-					removeField(p.join("."),field,isStatic);
+					removeField(p.join("."), field, isStatic);
 					continue;
 				}
-				if( r.charAt(0) == "@" ) {
+				if (r.charAt(0) == "@") {
 					var rp = r.split(" ");
 					var type = rp.pop();
 					var isStatic = rp[rp.length - 1] == "static";
-					if( isStatic ) rp.pop();
+					if (isStatic)
+						rp.pop();
 					var meta = rp.join(" ");
 					var p = type.split(".");
-					var field = if( p.length > 1 && p[p.length-2].charAt(0) >= "a" ) null else p.pop();
-					addMetadata(meta,p.join("."),field,isStatic);
+					var field = if (p.length > 1 && p[p.length - 2].charAt(0) >= "a") null else p.pop();
+					addMetadata(meta, p.join("."), field, isStatic);
 					continue;
 				}
-				if( StringTools.startsWith(r, "enum ") ) {
-					define("fakeEnum:" + r.substr(5));
+				if (StringTools.startsWith(r, "enum ")) {
+					define("enumAbstract:" + r.substr(5));
 					continue;
 				}
 				var rp = r.split(" : ");
-				if( rp.length > 1 ) {
+				if (rp.length > 1) {
 					r = rp.shift();
-					var isStatic = StringTools.startsWith(r,"static ");
-					if( isStatic ) r = r.substr(7);
+					var isStatic = StringTools.startsWith(r, "static ");
+					if (isStatic)
+						r = r.substr(7);
 					var p = r.split(".");
 					var field = p.pop();
-					setFieldType(p.join("."),field,rp.join(" : "),isStatic);
+					setFieldType(p.join("."), field, rp.join(" : "), isStatic);
 					continue;
 				}
-				throw "Invalid type patch "+r;
+				throw "Invalid type patch " + r;
 			}
-		} catch( e : haxe.io.Eof ) {
-		}
+		} catch (e:haxe.io.Eof) {}
 	}
 
 	/**
@@ -359,7 +406,7 @@ class Compiler {
 		@param paths An Array of package, module or sub-type dot paths to keep.
 		@param recursive If true, recurses into sub-packages for package paths.
 	**/
-	public static function keep(?path : String, ?paths : Array<String>, ?recursive:Bool = true) {
+	public static function keep(?path:String, ?paths:Array<String>, ?recursive:Bool = true) {
 		if (null == paths)
 			paths = [];
 		if (null != path)
@@ -369,6 +416,16 @@ class Compiler {
 		}
 	}
 
+	/**
+		Enables null safety for a type or a package.
+
+		@param path A package, module or sub-type dot path to keep.
+		@param recursive If true, recurses into sub-packages for package paths.
+	**/
+	public static function nullSafety(path:String, mode:NullSafetyMode = Loose, recursive:Bool = true) {
+		addGlobalMetadata(path, '@:nullSafety($mode)', recursive);
+	}
+
 	/**
 		Adds metadata `meta` to all types (if `toTypes = true`) or fields (if
 		`toFields = true`) whose dot-path matches `pathFilter`.
@@ -384,7 +441,7 @@ class Compiler {
 		through `Context.getType`.
 	**/
 	public static function addGlobalMetadata(pathFilter:String, meta:String, ?recursive:Bool = true, ?toTypes:Bool = true, ?toFields:Bool = false) {
-		#if neko
+		#if (neko || eval)
 		load("add_global_metadata_impl", 5)(pathFilter, meta, recursive, toTypes, toFields);
 		#else
 		addGlobalMetadataImpl(pathFilter, meta, recursive, toTypes, toFields);
@@ -394,33 +451,43 @@ class Compiler {
 	/**
 		Change the default JS output by using a custom generator callback
 	**/
-	public static function setCustomJSGenerator( callb : JSGenApi -> Void ) {
-		#if neko
+	public static function setCustomJSGenerator(callb:JSGenApi->Void) {
+		#if (neko || eval)
 		load("set_custom_js_generator", 1)(callb);
 		#end
 	}
 
-	#if neko
-	static inline function load( f, nargs ) : Dynamic {
+	#if (neko || eval)
+	static inline function load(f, nargs):Dynamic {
 		return @:privateAccess Context.load(f, nargs);
 	}
 	#end
 
-#end
+	/**
+		Clears cached results of file lookups
+	**/
+	public static function flushDiskCache() {
+		#if (neko || eval)
+		load("flush_disk_cache", 0)();
+		#end
+	}
+
+	#end
 
 	#if (js || lua || macro)
 	/**
-		Embed a JavaScript file at compile time (can be called by `--macro` or within an `__init__` method).
+		Embed a JavaScript or Lua file at compile time (can be called by `--macro` or within an `__init__` method).
 	**/
-	public static #if !macro macro #end function includeFile( file : String, position:IncludePosition = Top ) {
-		return switch ((position:String).toLowerCase()) {
+	public static #if !macro macro #end function includeFile(file:String, position:IncludePosition = Top) {
+		return switch ((position : String).toLowerCase()) {
 			case Inline:
 				if (Context.getLocalModule() == "")
 					Context.error("Cannot use inline mode when includeFile is called by `--macro`", Context.currentPos());
 
-				var f = try sys.io.File.getContent(Context.resolvePath(file)) catch( e : Dynamic ) Context.error(Std.string(e), Context.currentPos());
+				var f = try sys.io.File.getContent(Context.resolvePath(file)) catch (e:Dynamic) Context.error(Std.string(e), Context.currentPos());
 				var p = Context.currentPos();
-				{ expr : EUntyped( { expr : ECall( { expr : EConst(CIdent("__js__")), pos : p }, [ { expr : EConst(CString(f)), pos : p } ]), pos : p } ), pos : p };
+				var magic = if (Context.defined("js")) "__js__" else "__lua__";
+				{expr: EUntyped({expr: ECall({expr: EConst(CIdent(magic)), pos: p}, [{expr: EConst(CString(f)), pos: p}]), pos: p}), pos: p};
 			case Top | Closure:
 				@:privateAccess Context.includeFile(file, position);
 				macro {};
@@ -428,24 +495,55 @@ class Compiler {
 				Context.error("unknown includeFile position: " + position, Context.currentPos());
 		}
 	}
-
 	#end
-
 }
 
-@:enum abstract IncludePosition(String) from String to String {
+enum abstract IncludePosition(String) from String to String {
 	/**
 		Prepend the file content to the output file.
-	*/
+	**/
 	var Top = "top";
+
 	/**
 		Prepend the file content to the body of the top-level closure.
 
 		Since the closure is in strict-mode, there may be run-time error if the input is not strict-mode-compatible.
-	*/
+	**/
 	var Closure = "closure";
+
 	/**
 		Directly inject the file content at the call site.
-	*/
+	**/
 	var Inline = "inline";
 }
+
+enum abstract NullSafetyMode(String) to String {
+	/**
+		Disable null safety.
+	**/
+	var Off;
+
+	/**
+		Full scale null safety.
+	**/
+	var Strict;
+
+	/**
+		Loose safety.
+		If an expression is checked ` != null`, then it's considered safe even if it could be modified after the check.
+		E.g.
+		```haxe
+		function example(o:{field:Null<String>}) {
+			if(o.field != null) {
+				mutate(o);
+				var notNullable:String = o.field; //no error
+			}
+		}
+
+		function mutate(o:{field:Null<String>}) {
+			o.field = null;
+		}
+		```
+	**/
+	var Loose;
+}
diff --git a/std/haxe/macro/ComplexTypeTools.hx b/std/haxe/macro/ComplexTypeTools.hx
index cb546f15a192f91e1b01538fe14482fae6756fbe..efe5144ca67ecd5951bbf1510d876d22c3830c3c 100644
--- a/std/haxe/macro/ComplexTypeTools.hx
+++ b/std/haxe/macro/ComplexTypeTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,25 +30,22 @@ import haxe.macro.Expr;
 	additional methods on `haxe.macro.ComplexType` instances.
 **/
 class ComplexTypeTools {
-
 	/**
 		Converts type `c` to a human-readable `String` representation.
 
 		The result is guaranteed to be valid Haxe code, but there may be
 		differences from the original lexical syntax.
 	**/
-	static public function toString( c : ComplexType ) : String
+	static public function toString(c:ComplexType):String
 		return new Printer().printComplexType(c);
 
-	#if macro
-
+	#if (macro || display)
 	/**
 		Returns a type corresponding to `c`.
 
 		If `c` is null, the result is null.
 	**/
-	static public function toType( c : ComplexType ) : Null<Type>
-		return c == null ? null : Context.resolveType(c,Context.currentPos());
-
+	static public function toType(c:ComplexType):Null<Type>
+		return c == null ? null : Context.resolveType(c, Context.currentPos());
 	#end
 }
diff --git a/std/haxe/macro/Context.hl.hx b/std/haxe/macro/Context.hl.hx
deleted file mode 100644
index 2437d9b7684edf3b41d6cc64af2a7b0ed9cddf17..0000000000000000000000000000000000000000
--- a/std/haxe/macro/Context.hl.hx
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (C)2005-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 haxe.macro;
-
-import haxe.macro.Expr;
-import haxe.macro.Type.TypedExpr;
-
-@:noDoc @:hlNative("macro")
-class Context {
-
-#if macro
-
-	public static function error( msg : String, pos : Position ) : Dynamic {
-		return null;
-	}
-
-	public static function fatalError( msg : String, pos : Position ) : Dynamic {
-		return null;
-	}
-
-	public static function warning( msg : String, pos : Position ) : Void {
-	}
-
-	public static function resolvePath( file : String ) : String {
-		return null;
-	}
-
-	public static function getClassPath() : Array<String> {
-		return null;
-	}
-
-	public static function currentPos() : Position {
-		return null;
-	}
-
-	@:require(haxe_ver >= 3.1)
-	public static function getExpectedType():Null<Type> {
-		return null;
-	}
-
-	@:require(haxe_ver >= 3.2)
-	public static function getCallArguments():Null<Array<Expr>> {
-		return null;
-	}
-
-	public static function getLocalClass() : Null<Type.Ref<Type.ClassType>> {
-		var l = getLocalType();
-		if( l == null ) return null;
-		return switch( l ) {
-		case TInst(c,_): c;
-		default: null;
-		}
-	}
-
-	public static function getLocalModule() : String {
-		return null;
-	}
-
-	public static function getLocalType() : Null<Type> {
-		return null;
-	}
-
-	public static function getLocalMethod() : Null<String> {
-		return null;
-	}
-
-	public static function getLocalUsing() :  Array<Type.Ref<Type.ClassType>> {
-		return null;
-	}
-
-	public static function getLocalImports() :  Array<ImportExpr> {
-		return null;
-	}
-
-	private static function localVars(b:Bool) : Map<String,Dynamic> {
-		return null;
-	}
-
-	@:deprecated("Use Context.getLocalTVars() instead")
-	public static function getLocalVars() : Map<String,Type> {
-		return cast localVars(false);
-	}
-
-	@:require(haxe_ver >= 3.102)
-	public static function getLocalTVars() : Map<String,Type.TVar> {
-		return cast localVars(true);
-	}
-
-	public static function defined( s : String ) : Bool {
-		return null;
-	}
-
-	public static function definedValue( key : String ) : String {
-		return null;
-	}
-
-	public static function getDefines() : Map<String,String> {
-		return null;
-	}
-
-	public static function getType( name : String ) : Type {
-		return null;
-	}
-
-	public static function getModule( name : String ) : Array<Type> {
-		return null;
-	}
-
-	static function doParse( expr : String, pos : Position, isInline : Bool ) : Expr {
-		return null;
-	}
-
-	public static function parse( expr : String, pos : Position ) : Expr {
-		return doParse(expr,pos,false);
-	}
-
-	public static function parseInlineString( expr : String, pos : Position ) : Expr {
-		return doParse(expr,pos,true);
-	}
-
-	public static function makeExpr( v : Dynamic, pos : Position ) : Expr {
-		return null;
-	}
-
-	public static function signature( v : Dynamic ) : String {
-		return null;
-	}
-
-	public static function onGenerate( callback : Array<Type> -> Void ) : Void  {
-	}
-
-	@:require(haxe_ver >= 3.1)
-	public static function onAfterGenerate( callback : Void -> Void ) : Void {
-	}
-
-	public static function onAfterTyping( callback : Array<haxe.macro.Type.ModuleType> -> Void ) : Void {
-	}
-
-	public static function onTypeNotFound ( callback : String -> TypeDefinition ) : Void {
-	}
-
-	public static function typeof( e : Expr ) : Type {
-		return null;
-	}
-
-	@:require(haxe_ver >= 3.1)
-	public static function typeExpr( e : Expr ) : TypedExpr {
-		return null;
-	}
-
-	@:require(haxe_ver >= 3.3)
-	public static function resolveType( t : ComplexType, p : Position ) : Type {
-		return null;
-	}
-
-	public static function toComplexType( t : Type ) : Null<ComplexType> {
-		return null;
-	}
-
-	public static function unify( t1 : Type, t2 : Type) : Bool {
-		return false;
-	}
-
-	public static function follow( t : Type, ?once : Bool ) : Type {
-		return null;
-	}
-
-	public static function followWithAbstracts(t : Type, once : Bool = false ) : Type {
-		return null;
-	}
-
-	public static function getPosInfos( p : Position ) : { min : Int, max : Int, file : String } {
-		return null;
-	}
-
-	public static function makePosition( inf : { min : Int, max : Int, file : String } ) : Position {
-		return null;
-	}
-
-	public static function getResources():Map<String,haxe.io.Bytes> {
-		return null;
-	}
-
-	public static function addResource( name : String, data : haxe.io.Bytes ) : Void {
-	}
-
-	public static function getBuildFields() : Array<Field> {
-		return null;
-	}
-
-	public static function defineType( t : TypeDefinition ) : Void {
-	}
-
-	public static function defineModule( modulePath : String, types : Array<TypeDefinition>, ?imports: Array<ImportExpr>, ?usings : Array<TypePath> ) : Void {
-	}
-
-	public static function getTypedExpr( t : Type.TypedExpr ) : Expr {
-		return null;
-	}
-
-	@:require(haxe_ver >= 3.2)
-	public static function storeTypedExpr( t : Type.TypedExpr ) : Expr {
-		return null;
-	}
-
-	public static function registerModuleDependency( modulePath : String, externFile : String ) : Void {
-	}
-
-	public static function registerModuleReuseCall( modulePath : String, macroCall : String ) : Void {
-	}
-
-	public static function onMacroContextReused( callb : Void -> Bool ) : Void {
-	}
-
-	private static function includeFile( file : String, position : String ) {
-	}
-
-	private static function sExpr( e : TypedExpr, pretty : Bool ) : String {
-		return null;
-	}
-
-#end
-
-}
diff --git a/std/haxe/macro/Context.hx b/std/haxe/macro/Context.hx
index 1a0cad57a90f4d32ea2212bac73d7827d2970742..c97d8aae6004880556054bbd40908519c1a55c8e 100644
--- a/std/haxe/macro/Context.hx
+++ b/std/haxe/macro/Context.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,17 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.macro;
 
 import haxe.macro.Expr;
 import haxe.macro.Type.TypedExpr;
 
+enum Message {
+	Info(msg:String, pos:Position);
+	Warning(msg:String, pos:Position);
+}
+
 /**
 	Context provides an API for macro programming.
 
@@ -35,31 +41,51 @@ import haxe.macro.Type.TypedExpr;
 	- `haxe.macro.ExprTools`
 	- `haxe.macro.TypeTools`
 **/
-#if !neko @:noDoc #end
 class Context {
-
-#if neko
+	#if (neko || eval || display)
 	/**
 		Displays a compilation error `msg` at the given `Position` `pos`
 		and aborts the current macro call.
 	**/
-	public static function error( msg : String, pos : Position ) : Dynamic {
-		return load("error",2)(msg, pos);
+	public static function error(msg:String, pos:Position):Dynamic {
+		return load("error", 2)(msg, pos);
 	}
 
 	/**
 		Displays a compilation error `msg` at the given `Position` `pos`
 		and aborts the compilation.
 	**/
-	public static function fatalError( msg : String, pos : Position ) : Dynamic {
-		return load("fatal_error",2)(msg, pos);
+	public static function fatalError(msg:String, pos:Position):Dynamic {
+		return load("fatal_error", 2)(msg, pos);
 	}
 
 	/**
 		Displays a compilation warning `msg` at the given `Position` `pos`.
 	**/
-	public static function warning( msg : String, pos : Position ) {
-		load("warning",2)(msg, pos);
+	public static function warning(msg:String, pos:Position) {
+		load("warning", 2)(msg, pos);
+	}
+
+	/**
+		Displays a compilation info `msg` at the given `Position` `pos`.
+	**/
+	public static function info(msg:String, pos:Position) {
+		load("info", 2)(msg, pos);
+	}
+
+	/**
+		Gets a list of all current compilation info/warning messages.
+	**/
+	public static function getMessages() : Array<Message> {
+		return load("get_messages",0)();
+	}
+
+	/**
+		Filters all current info/warning messages. Filtered out messages will
+		not be displayed by the compiler.
+	**/
+	public static function filterMessages( predicate : Message -> Bool ) {
+		load("filter_messages",1)(predicate);
 	}
 
 	/**
@@ -71,8 +97,8 @@ class Context {
 		If a class path was declared relative, this method returns the relative
 		file path. Otherwise it returns the absolute file path.
 	**/
-	public static function resolvePath( file : String ) : String {
-		return load("resolve_path",1)(file);
+	public static function resolvePath(file:String):String {
+		return load("resolve_path", 1)(file);
 	}
 
 	/**
@@ -82,14 +108,14 @@ class Context {
 		Modifying the returned array has no effect on the compiler. Class paths
 		can be added using `haxe.macro.Compiler.addClassPath`.
 	**/
-	public static function getClassPath() : Array<String> {
-		return load("class_path",0)();
+	public static function getClassPath():Array<String> {
+		return load("class_path", 0)();
 	}
 
 	/**
 		Returns the position at which the macro was called.
 	**/
-	public static function currentPos() : Position {
+	public static function currentPos():Position {
 		return load("current_pos", 0)();
 	}
 
@@ -97,12 +123,11 @@ class Context {
 		Returns the type which is expected at the place the macro is called.
 
 		This affects usages such as `var x:Int = macroCall()`, where the
-		expected type will be reported as Int.
+		expected type will be reported as `Int`.
 
-		Might return null if no specific type is expected or if the calling
+		Might return `null` if no specific type is expected or if the calling
 		macro is not an expression-macro.
 	**/
-	@:require(haxe_ver >= 3.1)
 	public static function getExpectedType():Null<Type> {
 		return load("get_expected_type", 0)();
 	}
@@ -113,7 +138,6 @@ class Context {
 
 		Returns `null` if the current macro is not a `@:genericBuild` macro.
 	**/
-	@:require(haxe_ver >= 3.2)
 	public static function getCallArguments():Null<Array<Expr>> {
 		return load("get_call_arguments", 0)();
 	}
@@ -121,39 +145,40 @@ class Context {
 	/**
 		Returns the current class in which the macro was called.
 
-		If no such class exists, null is returned.
+		If no such class exists, `null` is returned.
 	**/
-	public static function getLocalClass() : Null<Type.Ref<Type.ClassType>> {
-		var l : Type = load("get_local_type", 0)();
-		if( l == null ) return null;
-		return switch( l ) {
-		case TInst(c,_): c;
-		default: null;
+	public static function getLocalClass():Null<Type.Ref<Type.ClassType>> {
+		var l:Type = load("get_local_type", 0)();
+		if (l == null)
+			return null;
+		return switch (l) {
+			case TInst(c, _): c;
+			default: null;
 		}
 	}
 
 	/**
 		Returns the current module path in/on which the macro was called.
 	**/
-	public static function getLocalModule() : String {
+	public static function getLocalModule():String {
 		return load("get_local_module", 0)();
 	}
 
 	/**
 		Returns the current type in/on which the macro was called.
 
-		If no such type exists, null is returned.
+		If no such type exists, `null` is returned.
 	**/
-	public static function getLocalType() : Null<Type> {
+	public static function getLocalType():Null<Type> {
 		return load("get_local_type", 0)();
 	}
 
 	/**
 		Returns the name of the method from which the macro was called.
 
-		If no such method exists, null is returned.
+		If no such method exists, `null` is returned.
 	**/
-	public static function getLocalMethod() : Null<String> {
+	public static function getLocalMethod():Null<String> {
 		return load("get_local_method", 0)();
 	}
 
@@ -163,7 +188,7 @@ class Context {
 
 		Modifying the returned array has no effect on the compiler.
 	**/
-	public static function getLocalUsing() : Array<Type.Ref<Type.ClassType>> {
+	public static function getLocalUsing():Array<Type.Ref<Type.ClassType>> {
 		return load("get_local_using", 0)();
 	}
 
@@ -172,7 +197,7 @@ class Context {
 
 		Modifying the returned array has no effect on the compiler.
 	**/
-	public static function getLocalImports() : Array<ImportExpr> {
+	public static function getLocalImports():Array<ImportExpr> {
 		return load("get_local_imports", 0)();
 	}
 
@@ -186,7 +211,7 @@ class Context {
 		Modifying the returned map has no effect on the compiler.
 	**/
 	@:deprecated("Use Context.getLocalTVars() instead")
-	public static function getLocalVars() : Map<String,Type> {
+	public static function getLocalVars():Map<String, Type> {
 		return load("local_vars", 1)(false);
 	}
 
@@ -194,44 +219,49 @@ class Context {
 		Similar to `getLocalVars`, but returns elements of type `TVar` instead
 		of `Type`.
 	**/
-	@:require(haxe_ver >= 3.102)
-	public static function getLocalTVars() : Map<String,Type.TVar> {
+	public static function getLocalTVars():Map<String, Type.TVar> {
 		return load("local_vars", 1)(true);
 	}
 
 	/**
-		Tells if compiler directive `s` has been set.
+		Tells if the conditional compilation flag `s` has been set.
 
-		Compiler directives are set using the `-D` command line parameter, or
+		Compiler flags are set using the `-D` command line parameter, or
 		by calling `haxe.macro.Compiler.define`.
+
+		@see https://haxe.org/manual/lf-condition-compilation.html
 	**/
-	public static function defined( s : String ) : Bool {
+	public static function defined(s:String):Bool {
 		return load("defined", 1)(s);
 	}
 
 	/**
-		Returns the value defined for compiler directive `key`.
+		Returns the value defined for the conditional compilation flag `key`.
 
-		If no value is defined for `key`, null is returned.
+		If no value is defined for `key`, `null` is returned.
 
-		Compiler directive values are set using the `-D key=value` command line
+		Compiler flags values are set using the `-D key=value` command line
 		parameter, or by calling `haxe.macro.Compiler.define`.
 
 		The default value is `"1"`.
+
+		@see https://haxe.org/manual/lf-condition-compilation.html
 	**/
-	public static function definedValue( key : String ) : String {
+	public static function definedValue(key:String):String {
 		return load("defined_value", 1)(key);
 	}
 
 	/**
-		Returns a map of all compiler directives that have been set.
+		Returns a map of all conditional compilation flags that have been set.
 
-		Compiler directives are set using the `-D` command line parameter, or
+		Compiler flags are set using the `-D` command line parameter, or
 		by calling `haxe.macro.Compiler.define`.
 
 		Modifying the returned map has no effect on the compiler.
-	 */
-	public static function getDefines() : Map<String,String> {
+
+		@see https://haxe.org/manual/lf-condition-compilation.html
+	**/
+	public static function getDefines():Map<String, String> {
 		return load("get_defines", 0)();
 	}
 
@@ -243,7 +273,7 @@ class Context {
 
 		If no type can be found, an exception of type `String` is thrown.
 	**/
-	public static function getType( name : String ) : Type {
+	public static function getType(name:String):Type {
 		return load("get_type", 1)(name);
 	}
 
@@ -254,9 +284,9 @@ class Context {
 		The resolution follows the usual class path rules where the last
 		declared class path has priority.
 
-		If no module can be found, null is returned.
+		If no module can be found, `null` is returned.
 	**/
-	public static function getModule( name : String ) : Array<Type> {
+	public static function getModule(name:String):Array<Type> {
 		return load("get_module", 1)(name);
 	}
 
@@ -268,7 +298,7 @@ class Context {
 
 		The provided `Position` `pos` is used for all generated inner AST nodes.
 	**/
-	public static function parse( expr : String, pos : Position ) : Expr {
+	public static function parse(expr:String, pos:Position):Expr {
 		return load("do_parse", 3)(expr, pos, false);
 	}
 
@@ -276,7 +306,7 @@ class Context {
 		Similar to `parse`, but error positions are reported within the provided
 		String `expr`.
 	**/
-	public static function parseInlineString( expr : String, pos : Position ) : Expr {
+	public static function parseInlineString(expr:String, pos:Position):Expr {
 		return load("do_parse", 3)(expr, pos, true);
 	}
 
@@ -289,14 +319,14 @@ class Context {
 
 		The provided `Position` `pos` is used for all generated inner AST nodes.
 	**/
-	public static function makeExpr( v : Dynamic, pos : Position ) : Expr {
+	public static function makeExpr(v:Dynamic, pos:Position):Expr {
 		return load("make_expr", 2)(v, pos);
 	}
 
 	/**
 		Returns a hashed MD5 signature of value `v`.
 	**/
-	public static function signature( v : Dynamic ) : String {
+	public static function signature(v:Dynamic):String {
 		return load("signature", 1)(v);
 	}
 
@@ -307,9 +337,17 @@ class Context {
 		The callback receives an `Array` containing all types which are about
 		to be generated. Modifications are limited to metadata, it is mainly
 		intended to obtain information.
+
+		By default, the callback is made before types are stored in the compilation
+		server, if active. This means that any effect persists for the next compilation.
+		If `persistent` is set to `false`, changes to types made by the callback only
+		affect the current compilation. If no compilation server is used, this flag has
+		no effect.
+
+		*Note*: the callback is still invoked when generation is disabled with  `--no-output`.
 	**/
-	public static function onGenerate( callback : Array<Type> -> Void ) {
-		load("on_generate",1)(callback);
+	public static function onGenerate(callback:Array<Type>->Void, persistent:Bool = true) {
+		load("on_generate", 2)(callback, persistent);
 	}
 
 	/**
@@ -318,10 +356,11 @@ class Context {
 
 		Compilation has completed at this point and cannot be influenced
 		anymore. However, contextual information is still available.
+
+		*Note*: the callback is still invoked when generation is disabled with  `--no-output`.
 	**/
-	@:require(haxe_ver >= 3.1)
-	public static function onAfterGenerate( callback : Void -> Void ) {
-		load("on_after_generate",1)(callback);
+	public static function onAfterGenerate(callback:Void->Void) {
+		load("on_after_generate", 1)(callback);
 	}
 
 	/**
@@ -332,8 +371,8 @@ class Context {
 		It is possible to define new types in the callback, in which case it
 		will be called again with the new types as argument.
 	**/
-	public static function onAfterTyping( callback : Array<haxe.macro.Type.ModuleType> -> Void ) {
-		load("on_after_typing",1)(callback);
+	public static function onAfterTyping(callback:Array<haxe.macro.Type.ModuleType>->Void) {
+		load("on_after_typing", 1)(callback);
 	}
 
 	/**
@@ -341,11 +380,11 @@ class Context {
 		cannot be resolved.
 
 		The callback may return a type definition, which is then used for the
-		expected type. If it returns null, the type is considered to still not
+		expected type. If it returns `null`, the type is considered to still not
 		exist.
 	**/
-	public static function onTypeNotFound ( callback : String -> TypeDefinition ) {
-		load("on_type_not_found",1)(callback);
+	public static function onTypeNotFound(callback:String->TypeDefinition) {
+		load("on_type_not_found", 1)(callback);
 	}
 
 	/**
@@ -354,7 +393,7 @@ class Context {
 		Typing the expression may result in a compiler error which can be
 		caught using `try ... catch`.
 	**/
-	public static function typeof( e : Expr ) : Type {
+	public static function typeof(e:Expr):Type {
 		return load("typeof", 1)(e);
 	}
 
@@ -364,8 +403,7 @@ class Context {
 		Typing the expression may result in a compiler error which can be
 		caught using `try ... catch`.
 	**/
-	@:require(haxe_ver >= 3.1)
-	public static function typeExpr( e : Expr ) : TypedExpr {
+	public static function typeExpr(e:Expr):TypedExpr {
 		return load("type_expr", 1)(e);
 	}
 
@@ -376,9 +414,8 @@ class Context {
 		caught using `try ... catch`.
 		Resolution is performed based on the current context in which the macro is called.
 	**/
-	@:require(haxe_ver >= 3.3)
-	public static function resolveType( t : ComplexType, p : Position ) : Type {
-		return load("resolve_type", 2)(t,p);
+	public static function resolveType(t:ComplexType, p:Position):Type {
+		return load("resolve_type", 2)(t, p);
 	}
 
 	/**
@@ -386,14 +423,14 @@ class Context {
 
 		See `haxe.macro.TypeTools.toComplexType` for details.
 	**/
-	public static function toComplexType( t : Type ) : Null<ComplexType> {
+	public static function toComplexType(t:Type):Null<ComplexType> {
 		return load("to_complex_type", 1)(t);
 	}
 
 	/**
 		Tries to unify `t1` and `t2` and returns `true` if successful.
 	**/
-	public static function unify( t1 : Type, t2 : Type) : Bool {
+	public static function unify(t1:Type, t2:Type):Bool {
 		return load("unify", 2)(t1, t2);
 	}
 
@@ -402,8 +439,8 @@ class Context {
 
 		See `haxe.macro.TypeTools.follow` for details.
 	**/
-	public static function follow( t : Type, ?once : Bool ) : Type {
-		return load("follow", 2)(t,once);
+	public static function follow(t:Type, ?once:Bool):Type {
+		return load("follow", 2)(t, once);
 	}
 
 	/**
@@ -411,22 +448,22 @@ class Context {
 
 		See `haxe.macro.TypeTools.followWithAbstracts` for details.
 	**/
-	public static function followWithAbstracts(t : Type, once : Bool = false ) : Type {
-		return load("follow_with_abstracts", 2)(t,once);
+	public static function followWithAbstracts(t:Type, once:Bool = false):Type {
+		return load("follow_with_abstracts", 2)(t, once);
 	}
 
 	/**
 		Returns the information stored in `Position` `p`.
 	**/
-	public static function getPosInfos( p : Position ) : { min : Int, max : Int, file : String } {
-		return load("get_pos_infos",1)(p);
+	public static function getPosInfos(p:Position):{min:Int, max:Int, file:String} {
+		return load("get_pos_infos", 1)(p);
 	}
 
 	/**
 		Builds a `Position` from `inf`.
 	**/
-	public static function makePosition( inf : { min : Int, max : Int, file : String } ) : Position {
-		return load("make_position",3)(inf.min,inf.max,inf.file);
+	public static function makePosition(inf:{min:Int, max:Int, file:String}):Position {
+		return load("make_position", 3)(inf.min, inf.max, inf.file);
 	}
 
 	/**
@@ -435,8 +472,8 @@ class Context {
 		Modifying the returned map has no effect on the compilation, use
 		`haxe.macro.Context.addResource` to add new resources to the compilation unit.
 	**/
-	public static function getResources():Map<String,haxe.io.Bytes> {
-		return load("get_resources",0)();
+	public static function getResources():Map<String, haxe.io.Bytes> {
+		return load("get_resources", 0)();
 	}
 
 	/**
@@ -449,10 +486,10 @@ class Context {
 		Compilation server : when using the compilation server, the resource is bound
 		to the Haxe module which calls the macro, so it will be included again if
 		that module is reused. If this resource concerns several modules, prefix its
-		name with a $ sign, this will bind it to the macro module instead.
+		name with a `$` sign, this will bind it to the macro module instead.
 	**/
-	public static function addResource( name : String, data : haxe.io.Bytes ) {
-		load("add_resource",2)(name,data);
+	public static function addResource(name:String, data:haxe.io.Bytes) {
+		load("add_resource", 2)(name, data);
 	}
 
 	/**
@@ -460,15 +497,19 @@ class Context {
 
 		This is only defined for `@:build/@:autoBuild` macros.
 	**/
-	public static function getBuildFields() : Array<Field> {
+	public static function getBuildFields():Array<Field> {
 		return load("get_build_fields", 0)();
 	}
 
 	/**
 		Defines a new type from `TypeDefinition` `t`.
+
+		If `moduleDependency` is given and is not `null`, it should contain
+		a module path that will be used as a dependency for the newly defined module
+		instead of the current module.
 	**/
-	public static function defineType( t : TypeDefinition ) : Void {
-		load("define_type", 1)(t);
+	public static function defineType(t:TypeDefinition, ?moduleDependency:String):Void {
+		load("define_type", 2)(t, moduleDependency);
 	}
 
 	/**
@@ -477,11 +518,13 @@ class Context {
 
 		The individual `types` can reference each other and any identifier
 		respects the `imports` and `usings` as usual, expect that imports are
-		not allowed to have `.*` wildcards or `in s` shorthands.
+		not allowed to have `.*` wildcards or `as s` shorthands.
 	**/
-	public static function defineModule( modulePath : String, types : Array<TypeDefinition>, ?imports: Array<ImportExpr>, ?usings : Array<TypePath> ) : Void {
-		if( imports == null ) imports = [];
-		if( usings == null ) usings = [];
+	public static function defineModule(modulePath:String, types:Array<TypeDefinition>, ?imports:Array<ImportExpr>, ?usings:Array<TypePath>):Void {
+		if (imports == null)
+			imports = [];
+		if (usings == null)
+			usings = [];
 		load("define_module", 4)(modulePath, types, imports, usings);
 	}
 
@@ -490,55 +533,44 @@ class Context {
 
 		This process may lose some information.
 	**/
-	public static function getTypedExpr( t : Type.TypedExpr ) : Expr {
-		return load("get_typed_expr",1)(t);
+	public static function getTypedExpr(t:Type.TypedExpr):Expr {
+		return load("get_typed_expr", 1)(t);
 	}
 
-
 	/**
 		Store typed expression `t` internally and give a syntax-level expression
 		that can be returned from a macro and will be replaced by the stored
 		typed expression.
 
-		If `t` is null or invalid, an exception is thrown.
+		If `t` is `null` or invalid, an exception is thrown.
 
 		NOTE: the returned value references an internally stored typed expression
 		that is reset between compilations, so care should be taken when storing
 		the expression returned by this method in a static variable and using the
 		compilation server.
 	**/
-	@:require(haxe_ver >= 3.2)
-	public static function storeTypedExpr( t : Type.TypedExpr ) : Expr {
-		return load("store_typed_expr",1)(t);
+	public static function storeTypedExpr(t:Type.TypedExpr):Expr {
+		return load("store_typed_expr", 1)(t);
 	}
 
 	/**
-		Evaluates `e` as macro code.
-
-		Any call to this function takes effect when the macro is executed, not
-		during typing. As a consequence, this function can not introduce new
-		local variables into the macro context and may have other restrictions.
-
-		Usage example:
+		Types expression `e`, stores the resulting typed expression internally and
+		returns a syntax-level expression that can be returned from a macro and
+		will be replaced by the stored typed expression.
 
-		```haxe
-		var e = macro function(i) return i * 2;
-		var f:Int -> Int = haxe.macro.Context.eval(e);
-		trace(f(2)); // 4
-		```
+		If `e` is `null` or invalid, an exception is thrown.
 
-		Code passed in from outside the macro cannot reference anything in its
-		context, such as local variables. However, it is possible to reference
-		static methods.
+		A call to `storeExpr(e)` is equivalent to `storeTypedExpr(typeExpr(e))` without
+		the overhead of encoding and decoding between regular and macro runtime.
 
-		This method should be considered experimental.
-
-		If `e` is null, the result is unspecified.
+		NOTE: the returned value references an internally stored typed expression
+		that is reset between compilations, so care should be taken when storing
+		the expression returned by this method in a static variable and using the
+		compilation server.
 	**/
-	//@:require(haxe_ver >= 3.3)
-	//public static function eval( e : Expr ) : Dynamic {
-		//return load("eval",1)(e);
-	//}
+	public static function storeExpr(e:Expr):Expr {
+		return load("store_expr", 1)(e);
+	}
 
 	/**
 		Manually adds a dependency between module `modulePath` and an external
@@ -549,55 +581,40 @@ class Context {
 
 		Has no effect if the compilation cache is not used.
 	**/
-	public static function registerModuleDependency( modulePath : String, externFile : String ) {
-		load("register_module_dependency", 2)(modulePath,externFile);
+	public static function registerModuleDependency(modulePath:String, externFile:String) {
+		load("register_module_dependency", 2)(modulePath, externFile);
 	}
 
-	/**
-		Register a macro call to be performed every time the module `modulePath` is reused by the compilation cache,
-		meaning that neither the module itself nor its dependencies was changed since last compilation.
-
-		The `macroCall` should be a String containing valid Haxe expression, similar to `--init` macros (see https://haxe.org/manual/macro-initialization.html).
-		Multiple calls with the exact same `macroCall` value will only register the callback once.
-
-		This also triggers loading of given module and its dependencies, if it's not yet loaded,
-		but given macro call will not be called on the first module load.
-
-		If the compilation cache is not used, `macroCall` expressions will not be called,
-		but calling this function will still trigger loading of given `modulePath`.
-	**/
-	public static function registerModuleReuseCall( modulePath : String, macroCall : String ) {
-		load("register_module_reuse_call", 2)(modulePath,macroCall);
+	@:deprecated
+	public static function registerModuleReuseCall(modulePath:String, macroCall:String) {
+		throw "This method is no longer supported. See https://github.com/HaxeFoundation/haxe/issues/5746";
 	}
 
-	/**
-		Register a callback function that will be called every time the macro context cached is reused with a new
-		compilation. This enable to reset some static vars since the code might have been changed. If the callback
-		returns false, the macro context is discarded and another one is created.
-	**/
-	public static function onMacroContextReused( callb : Void -> Bool ) {
-		load("on_macro_context_reused", 1)(callb);
+	@:deprecated
+	public static function onMacroContextReused(callb:Void->Bool) {
+		throw "This method is no longer supported. See https://github.com/HaxeFoundation/haxe/issues/5746";
 	}
 
 	@:allow(haxe.macro.TypeTools)
 	@:allow(haxe.macro.MacroStringTools)
 	@:allow(haxe.macro.TypedExprTools)
-	static function load( f, nargs ) : Dynamic {
-		#if macro
+	@:allow(haxe.macro.PositionTools)
+	static function load(f:String, nargs:Int):Dynamic {
+		#if neko
 		return neko.Lib.load("macro", f, nargs);
+		#elseif eval
+		return eval.vm.Context.callMacroApi(f);
 		#else
 		return Reflect.makeVarArgs(function(_) return throw "Can't be called outside of macro");
 		#end
 	}
 
-	private static function includeFile( file : String, position : String ) {
+	private static function includeFile(file:String, position:String) {
 		load("include_file", 2)(file, position);
 	}
 
-	private static function sExpr( e : TypedExpr, pretty : Bool ) : String {
+	private static function sExpr(e:TypedExpr, pretty:Bool):String {
 		return haxe.macro.Context.load("s_expr", 2)(e, pretty);
 	}
-
-#end
-
+	#end
 }
diff --git a/std/haxe/macro/ExampleJSGenerator.hx b/std/haxe/macro/ExampleJSGenerator.hx
index f6c0a388c81981039d47b6e08151600099c051b5..0468db75dc09255f7feef2e76e6ccfa85109eca0 100644
--- a/std/haxe/macro/ExampleJSGenerator.hx
+++ b/std/haxe/macro/ExampleJSGenerator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,19 +19,21 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.macro;
+
 import haxe.macro.Type;
 import haxe.macro.Expr;
+
 using Lambda;
 
 class ExampleJSGenerator {
-
-	var api : JSGenApi;
-	var buf : StringBuf;
-	var inits : List<TypedExpr>;
-	var statics : List<{ c : ClassType, f : ClassField }>;
-	var packages : haxe.ds.StringMap<Bool>;
-	var forbidden : haxe.ds.StringMap<Bool>;
+	var api:JSGenApi;
+	var buf:StringBuf;
+	var inits:List<TypedExpr>;
+	var statics:List<{c:ClassType, f:ClassField}>;
+	var packages:haxe.ds.StringMap<Bool>;
+	var forbidden:haxe.ds.StringMap<Bool>;
 
 	public function new(api) {
 		this.api = api;
@@ -40,13 +42,13 @@ class ExampleJSGenerator {
 		statics = new List();
 		packages = new haxe.ds.StringMap();
 		forbidden = new haxe.ds.StringMap();
-		for( x in ["prototype", "__proto__", "constructor"] )
+		for (x in ["prototype", "__proto__", "constructor"])
 			forbidden.set(x, true);
 		api.setTypeAccessor(getType);
 	}
 
-	function getType( t : Type ) {
-		return switch(t) {
+	function getType(t:Type) {
+		return switch (t) {
 			case TInst(c, _): getPath(c.get());
 			case TEnum(e, _): getPath(e.get());
 			case TAbstract(a, _): getPath(a.get());
@@ -54,7 +56,7 @@ class ExampleJSGenerator {
 		};
 	}
 
-	inline function print(str) {
+	inline function print(str:String) {
 		buf.add(str);
 	}
 
@@ -70,15 +72,18 @@ class ExampleJSGenerator {
 		return api.isKeyword(p) ? '["' + p + '"]' : "." + p;
 	}
 
-	function genPackage( p : Array<String> ) {
+	function genPackage(p:Array<String>) {
 		var full = null;
-		for( x in p ) {
+		for (x in p) {
 			var prev = full;
-			if( full == null ) full = x else full += "." + x;
-			if( packages.exists(full) )
+			if (full == null)
+				full = x
+			else
+				full += "." + x;
+			if (packages.exists(full))
 				continue;
 			packages.set(full, true);
-			if( prev == null )
+			if (prev == null)
 				print('if(typeof $x==\'undefined\') $x = {}');
 			else {
 				var p = prev + field(x);
@@ -88,21 +93,21 @@ class ExampleJSGenerator {
 		}
 	}
 
-	function getPath( t : BaseType ) {
+	function getPath(t:BaseType) {
 		return (t.pack.length == 0) ? t.name : t.pack.join(".") + "." + t.name;
 	}
 
-	function checkFieldName( c : ClassType, f : ClassField ) {
-		if( forbidden.exists(f.name) )
+	function checkFieldName(c:ClassType, f:ClassField) {
+		if (forbidden.exists(f.name))
 			Context.error("The field " + f.name + " is not allowed in JS", c.pos);
 	}
 
-	function genClassField( c : ClassType, p : String, f : ClassField ) {
+	function genClassField(c:ClassType, p:String, f:ClassField) {
 		checkFieldName(c, f);
 		var field = field(f.name);
 		print('$p.prototype$field = ');
 		var e = f.expr();
-		if( e == null )
+		if (e == null)
 			print("null");
 		else {
 			genExpr(e);
@@ -110,56 +115,57 @@ class ExampleJSGenerator {
 		newline();
 	}
 
-	function genStaticField( c : ClassType, p : String, f : ClassField ) {
+	function genStaticField(c:ClassType, p:String, f:ClassField) {
 		checkFieldName(c, f);
 		var field = field(f.name);
 		var e = f.expr();
-		if( e == null ) {
+		if (e == null) {
 			print('$p$field = null');
 			newline();
-		} else switch( f.kind ) {
-		case FMethod(_):
-			print('$p$field = ');
-			genExpr(e);
-			newline();
-		default:
-			statics.add( { c : c, f : f } );
-		}
+		} else
+			switch (f.kind) {
+				case FMethod(_):
+					print('$p$field = ');
+					genExpr(e);
+					newline();
+				default:
+					statics.add({c: c, f: f});
+			}
 	}
 
-	function genClass( c : ClassType ) {
+	function genClass(c:ClassType) {
 		genPackage(c.pack);
 		api.setCurrentClass(c);
 		var p = getPath(c);
 		print('$p = $$hxClasses[\'$p\'] = ');
-		if( c.constructor != null )
+		if (c.constructor != null)
 			genExpr(c.constructor.get().expr());
 		else
 			print("function() { }");
 		newline();
-		var name = p.split(".").map(api.quoteString).join(",");
-		print('$p.__name__ = [$name]');
+		print('$p.__name__ = "$p"');
 		newline();
-		if( c.superClass != null ) {
+		if (c.superClass != null) {
 			var psup = getPath(c.superClass.t.get());
 			print('$p.__super__ = $psup');
 			newline();
 			print('for(var k in $psup.prototype ) $p.prototype[k] = $psup.prototype[k]');
 			newline();
 		}
-		for( f in c.statics.get() )
+		for (f in c.statics.get())
 			genStaticField(c, p, f);
-		for( f in c.fields.get() ) {
-			switch( f.kind ) {
-			case FVar(r, _):
-				if( r == AccResolve ) continue;
-			default:
+		for (f in c.fields.get()) {
+			switch (f.kind) {
+				case FVar(r, _):
+					if (r == AccResolve)
+						continue;
+				default:
 			}
 			genClassField(c, p, f);
 		}
 		print('$p.prototype.__class__ = $p');
 		newline();
-		if( c.interfaces.length > 0 ) {
+		if (c.interfaces.length > 0) {
 			var me = this;
 			var inter = c.interfaces.map(function(i) return me.getPath(i.t.get())).join(",");
 			print('$p.__interfaces__ = [$inter]');
@@ -167,40 +173,38 @@ class ExampleJSGenerator {
 		}
 	}
 
-	function genEnum( e : EnumType ) {
+	function genEnum(e:EnumType) {
 		genPackage(e.pack);
 		var p = getPath(e);
-		var names = p.split(".").map(api.quoteString).join(",");
 		var constructs = e.names.map(api.quoteString).join(",");
-		print('$p = $$hxClasses[\'$p\'] = { __ename__ : [$names], __constructs__ : [$constructs] }');
+		print('$p = $$hxClasses[\'$p\'] = { __ename__ : \'$p\', __constructs__ : [$constructs] }');
 		newline();
-		for( c in e.constructs.keys() ) {
+		for (c in e.constructs.keys()) {
 			var c = e.constructs.get(c);
 			var f = field(c.name);
 			print('$p$f = ');
-			switch( c.type ) {
-			case TFun(args, _):
-				var sargs = args.map(function(a) return a.name).join(",");
-				print('function($sargs) { var $$x = ["${c.name}",${c.index},$sargs]; $$x.__enum__ = $p; $$x.toString = $$estr; return $$x; }');
-			default:
-				print("[" + api.quoteString(c.name) + "," + c.index + "]");
-				newline();
-				print('$p$f.toString = $$estr');
-				newline();
-				print('$p$f.__enum__ = $p');
+			switch (c.type) {
+				case TFun(args, _):
+					var sargs = args.map(function(a) return a.name).join(",");
+					print('function($sargs) { var $$x = ["${c.name}",${c.index},$sargs]; $$x.__enum__ = $p; $$x.toString = $$estr; return $$x; }');
+				default:
+					print("[" + api.quoteString(c.name) + "," + c.index + "]");
+					newline();
+					print('$p$f.toString = $$estr');
+					newline();
+					print('$p$f.__enum__ = $p');
 			}
 			newline();
 		}
 		var meta = api.buildMetaData(e);
-		if( meta != null ) {
+		if (meta != null) {
 			print('$p.__meta__ = ');
 			genExpr(meta);
 			newline();
 		}
 	}
 
-
-	function genStaticValue( c : ClassType, cf : ClassField ) {
+	function genStaticValue(c:ClassType, cf:ClassField) {
 		var p = getPath(c);
 		var f = field(cf.name);
 		print('$p$f = ');
@@ -208,17 +212,19 @@ class ExampleJSGenerator {
 		newline();
 	}
 
-	function genType( t : Type ) {
-		switch( t ) {
-		case TInst(c, _):
-			var c = c.get();
-			if( c.init != null )
-				inits.add(c.init);
-			if( !c.isExtern ) genClass(c);
-		case TEnum(r, _):
-			var e = r.get();
-			if( !e.isExtern ) genEnum(e);
-		default:
+	function genType(t:Type) {
+		switch (t) {
+			case TInst(c, _):
+				var c = c.get();
+				if (c.init != null)
+					inits.add(c.init);
+				if (!c.isExtern)
+					genClass(c);
+			case TEnum(r, _):
+				var e = r.get();
+				if (!e.isExtern)
+					genEnum(e);
+			default:
 		}
 	}
 
@@ -227,27 +233,26 @@ class ExampleJSGenerator {
 		newline();
 		print("function $bind(o,m) { var f = function(){ return f.method.apply(f.scope, arguments); }; f.scope = o; f.method = m; return f; };");
 		newline();
-		for( t in api.types )
+		for (t in api.types)
 			genType(t);
-		for( e in inits ) {
+		for (e in inits) {
 			print(api.generateStatement(e));
 			newline();
 		}
-		for( s in statics ) {
-			genStaticValue(s.c,s.f);
+		for (s in statics) {
+			genStaticValue(s.c, s.f);
 			newline();
 		}
-		if( api.main != null ) {
+		if (api.main != null) {
 			genExpr(api.main);
 			newline();
 		}
 		sys.io.File.saveContent(api.outputFile, buf.toString());
 	}
 
-	#if macro
+	#if (macro || display)
 	public static function use() {
 		Compiler.setCustomJSGenerator(function(api) new ExampleJSGenerator(api).generate());
 	}
 	#end
-
 }
diff --git a/std/haxe/macro/Expr.hx b/std/haxe/macro/Expr.hx
index cfc522e7fda396b6b416d1c5c34caa08cc9bacad..98212bd4926034a7de3f005972d207e768bf6ada 100644
--- a/std/haxe/macro/Expr.hx
+++ b/std/haxe/macro/Expr.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.macro;
 
 #if (macro && !doc_gen)
-@:coreType abstract Position {
-}
+@:coreType abstract Position {}
 #else
+
 /**
 	Represents a position in a file.
 **/
@@ -32,20 +33,25 @@ typedef Position = {
 	/**
 		Reference to the filename.
 	**/
-	var file : String;
+	var file:String;
 
 	/**
 		Position of the first character.
 	**/
-	var min : Int;
+	var min:Int;
 
 	/**
 		Position of the last character.
 	**/
-	var max : Int;
+	var max:Int;
 }
 #end
 
+enum StringLiteralKind {
+	DoubleQuotes;
+	SingleQuotes;
+}
+
 /**
 	Represents a constant.
 	@see https://haxe.org/manual/expression-constants.html
@@ -54,33 +60,33 @@ enum Constant {
 	/**
 		Represents an integer literal.
 	**/
-	CInt( v : String );
+	CInt(v:String);
 
 	/**
 		Represents a float literal.
 	**/
-	CFloat( f : String );
+	CFloat(f:String);
 
 	/**
 		Represents a string literal.
 	**/
-	CString( s : String );
+	CString(s:String, ?kind:StringLiteralKind);
 
 	/**
 		Represents an identifier.
 	**/
-	CIdent( s : String );
+	CIdent(s:String);
 
 	/**
 		Represents a regular expression literal.
 
 		Example: `~/haxe/i`
-		 * The first argument _haxe_ is a string with regular expression pattern.
-		 * The second argument _i_ is a string with regular expression flags.
+		* The first argument _haxe_ is a string with regular expression pattern.
+		* The second argument _i_ is a string with regular expression flags.
 
 		@see https://haxe.org/manual/std-regex.html
 	**/
-	CRegexp( r : String, opt : String );
+	CRegexp(r:String, opt:String);
 }
 
 /**
@@ -201,7 +207,7 @@ enum Binop {
 		`^=`
 		`%=`
 	**/
-	OpAssignOp( op : Binop );
+	OpAssignOp(op:Binop);
 
 	/**
 		`...`
@@ -212,6 +218,11 @@ enum Binop {
 		`=>`
 	**/
 	OpArrow;
+
+	/**
+		`in`
+	**/
+	OpIn;
 }
 
 /**
@@ -253,12 +264,12 @@ typedef Expr = {
 	/**
 		The expression kind.
 	**/
-	var expr : ExprDef;
+	var expr:ExprDef;
 
 	/**
 		The position of the expression.
 	**/
-	var pos : Position;
+	var pos:Position;
 }
 
 /**
@@ -276,17 +287,17 @@ typedef Case = {
 	/**
 		The value expressions of the case.
 	**/
-	var values : Array<Expr>;
+	var values:Array<Expr>;
 
 	/**
 		The optional guard expressions of the case, if available.
 	**/
-	@:optional var guard : Null<Expr>;
+	var ?guard:Null<Expr>;
 
 	/**
 		The expression of the case, if available.
 	**/
-	var expr: Null<Expr>;
+	var expr:Null<Expr>;
 }
 
 /**
@@ -297,17 +308,22 @@ typedef Var = {
 	/**
 		The name of the variable.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		The type-hint of the variable, if available.
 	**/
-	var type : Null<ComplexType>;
+	var type:Null<ComplexType>;
 
 	/**
 		The expression of the variable, if available.
 	**/
-	var expr : Null<Expr>;
+	var expr:Null<Expr>;
+
+	/**
+		Whether or not the variable can be assigned to.
+	**/
+	var ?isFinal:Bool;
 }
 
 /**
@@ -318,17 +334,70 @@ typedef Catch = {
 	/**
 		The name of the catch variable.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		The type of the catch.
 	**/
-	var type : ComplexType;
+	var type:ComplexType;
 
 	/**
 		The expression of the catch.
 	**/
-	var expr : Expr;
+	var expr:Expr;
+}
+
+/**
+	Represents the way something is quoted.
+**/
+enum QuoteStatus {
+	/**
+		No quotes
+	**/
+	Unquoted;
+
+	/**
+		Double quotes `"`
+	**/
+	Quoted;
+}
+
+/**
+	Represents the field of an object declaration.
+**/
+typedef ObjectField = {
+	/**
+		The name of the field.
+	**/
+	var field:String;
+
+	/**
+		The field expression.
+	**/
+	var expr:Expr;
+
+	/**
+		How the field name is quoted.
+	**/
+	var ?quotes:QuoteStatus;
+}
+
+/**
+	Represents function kind in the AST
+**/
+enum FunctionKind {
+	/**
+		Anonymous function
+	**/
+	FAnonymous;
+	/**
+		Named function
+	**/
+	FNamed(name:String, ?inlined:Bool);
+	/**
+		Arrow function
+	**/
+	FArrow;
 }
 
 /**
@@ -338,47 +407,47 @@ enum ExprDef {
 	/**
 		A constant.
 	**/
-	EConst( c : Constant );
+	EConst(c:Constant);
 
 	/**
 		Array access `e1[e2]`.
 	**/
-	EArray( e1 : Expr, e2 : Expr );
+	EArray(e1:Expr, e2:Expr);
 
 	/**
 		Binary operator `e1 op e2`.
 	**/
-	EBinop( op : Binop, e1 : Expr, e2 : Expr );
+	EBinop(op:Binop, e1:Expr, e2:Expr);
 
 	/**
 		Field access on `e.field`.
 	**/
-	EField( e : Expr, field : String );
+	EField(e:Expr, field:String);
 
 	/**
 		Parentheses `(e)`.
 	**/
-	EParenthesis( e : Expr );
+	EParenthesis(e:Expr);
 
 	/**
 		An object declaration.
 	**/
-	EObjectDecl( fields : Array<{ field : String, expr : Expr }> );
+	EObjectDecl(fields:Array<ObjectField>);
 
 	/**
 		An array declaration `[el]`.
 	**/
-	EArrayDecl( values : Array<Expr> );
+	EArrayDecl(values:Array<Expr>);
 
 	/**
 		A call `e(params)`.
 	**/
-	ECall( e : Expr, params : Array<Expr> );
+	ECall(e:Expr, params:Array<Expr>);
 
 	/**
 		A constructor call `new t(params)`.
 	**/
-	ENew( t : TypePath, params : Array<Expr> );
+	ENew(t:TypePath, params:Array<Expr>);
 
 	/**
 		An unary operator `op` on `e`:
@@ -391,60 +460,55 @@ enum ExprDef {
 		* !e (op = OpNot, postFix = false)
 		* ~e (op = OpNegBits, postFix = false)
 	**/
-	EUnop( op : Unop, postFix : Bool, e : Expr );
+	EUnop(op:Unop, postFix:Bool, e:Expr);
 
 	/**
 		Variable declarations.
 	**/
-	EVars( vars : Array<Var> );
+	EVars(vars:Array<Var>);
 
 	/**
 		A function declaration.
 	**/
-	EFunction( name : Null<String>, f : Function );
+	EFunction(kind:Null<FunctionKind>, f:Function);
 
 	/**
 		A block of expressions `{exprs}`.
 	**/
-	EBlock( exprs : Array<Expr> );
+	EBlock(exprs:Array<Expr>);
 
 	/**
 		A `for` expression.
 	**/
-	EFor( it : Expr, expr : Expr );
-
-	/**
-		A `(e1 in e2)` expression.
-	**/
-	EIn( e1 : Expr, e2 : Expr );
+	EFor(it:Expr, expr:Expr);
 
 	/**
 		An `if(econd) eif` or `if(econd) eif else eelse` expression.
 	**/
-	EIf( econd : Expr, eif : Expr, eelse : Null<Expr> );
+	EIf(econd:Expr, eif:Expr, eelse:Null<Expr>);
 
 	/**
 		Represents a `while` expression.
 		When `normalWhile` is `true` it is `while (...)`.
 		When `normalWhile` is `false` it is `do {...} while (...)`.
 	**/
-	EWhile( econd : Expr, e : Expr, normalWhile : Bool );
+	EWhile(econd:Expr, e:Expr, normalWhile:Bool);
 
 	/**
 		Represents a `switch` expression with related cases and an optional.
 		`default` case if edef != null.
 	**/
-	ESwitch( e : Expr, cases : Array<Case>, edef : Null<Expr> );
+	ESwitch(e:Expr, cases:Array<Case>, edef:Null<Expr>);
 
 	/**
 		Represents a `try`-expression with related catches.
 	**/
-	ETry( e : Expr, catches : Array<Catch> );
+	ETry(e:Expr, catches:Array<Catch>);
 
 	/**
 		A `return` or `return e` expression.
 	**/
-	EReturn( ?e : Null<Expr> );
+	EReturn(?e:Null<Expr>);
 
 	/**
 		A `break` expression.
@@ -459,42 +523,50 @@ enum ExprDef {
 	/**
 		An `untyped e` source code.
 	**/
-	EUntyped( e : Expr );
+	EUntyped(e:Expr);
 
 	/**
 		A `throw e` expression.
 	**/
-	EThrow( e : Expr );
+	EThrow(e:Expr);
 
 	/**
 		A `cast e` or `cast (e, m)` expression.
 	**/
-	ECast( e : Expr, t : Null<ComplexType> );
+	ECast(e:Expr, t:Null<ComplexType>);
 
 	/**
 		Internally used to provide completion.
 	**/
-	EDisplay( e : Expr, isCall : Bool );
+	EDisplay(e:Expr, displayKind:DisplayKind);
 
 	/**
 		Internally used to provide completion.
 	**/
-	EDisplayNew( t : TypePath );
+	EDisplayNew(t:TypePath);
 
 	/**
 		A `(econd) ? eif : eelse` expression.
 	**/
-	ETernary( econd : Expr, eif : Expr, eelse : Expr );
+	ETernary(econd:Expr, eif:Expr, eelse:Expr);
 
 	/**
 		A `(e:t)` expression.
 	**/
-	ECheckType( e : Expr, t : ComplexType );
+	ECheckType(e:Expr, t:ComplexType);
 
 	/**
 		A `@m e` expression.
 	**/
-	EMeta( s : MetadataEntry, e : Expr );
+	EMeta(s:MetadataEntry, e:Expr);
+}
+
+enum DisplayKind {
+	DKCall;
+	DKDot;
+	DKStructure;
+	DKMarked;
+	DKPattern(outermost:Bool);
 }
 
 /**
@@ -504,37 +576,47 @@ enum ComplexType {
 	/**
 		Represents the type path.
 	**/
-	TPath( p : TypePath );
+	TPath(p:TypePath);
 
 	/**
 		Represents a function type.
 		@see https://haxe.org/manual/types-function.html
 	**/
-	TFunction( args : Array<ComplexType>, ret : ComplexType );
+	TFunction(args:Array<ComplexType>, ret:ComplexType);
 
 	/**
 		Represents an anonymous structure type.
 		@see https://haxe.org/manual/types-anonymous-structure.html
 	**/
-	TAnonymous( fields : Array<Field> );
+	TAnonymous(fields:Array<Field>);
 
 	/**
 		Represents parentheses around a type, e.g. the `(Int -> Void)` part in
 		`(Int -> Void) -> String`.
 	**/
-	TParent( t : ComplexType );
+	TParent(t:ComplexType);
 
 	/**
 		Represents typedef extensions `> Iterable<T>`.
 		The array `p` holds the type paths to the given types.
 		@see https://haxe.org/manual/type-system-extensions.html
 	**/
-	TExtend( p : Array<TypePath>, fields : Array<Field> );
+	TExtend(p:Array<TypePath>, fields:Array<Field>);
 
 	/**
 		Represents an optional type.
 	**/
-	TOptional( t : ComplexType );
+	TOptional(t:ComplexType);
+
+	/**
+		Represents a type with a name.
+	**/
+	TNamed(n:String, t:ComplexType);
+
+	/**
+		Represents an intersection type `T1 & T2 & ... & TN`.
+	**/
+	TIntersection(tl:Array<ComplexType>);
 }
 
 /**
@@ -544,23 +626,23 @@ typedef TypePath = {
 	/**
 		Represents the package of the type path.
 	**/
-	var pack : Array<String>;
+	var pack:Array<String>;
 
 	/**
 		The name of the type path.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		Optional parameters of the type path.
 	**/
-	@:optional var params : Array<TypeParam>;
+	var ?params:Array<TypeParam>;
 
 	/**
 		Sub is set on module sub-type access:
 		`pack.Module.Type` has name = Module, sub = Type, if available.
 	**/
-	@:optional var sub : Null<String>;
+	var ?sub:Null<String>;
 }
 
 /**
@@ -574,12 +656,12 @@ enum TypeParam {
 	/**
 
 	**/
-	TPType( t : ComplexType );
+	TPType(t:ComplexType);
 
 	/**
 
 	**/
-	TPExpr( e : Expr );
+	TPExpr(e:Expr);
 }
 
 /**
@@ -589,22 +671,22 @@ typedef TypeParamDecl = {
 	/**
 		The name of the type parameter.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		The optional constraints of the type parameter.
 	**/
-	@:optional var constraints : Array<ComplexType>;
+	var ?constraints:Array<ComplexType>;
 
 	/**
 		The optional parameters of the type parameter.
 	**/
-	@:optional var params : Array<TypeParamDecl>;
+	var ?params:Array<TypeParamDecl>;
 
 	/**
 		The metadata of the type parameter.
 	**/
-	@:optional var meta : Metadata;
+	var ?meta:Metadata;
 }
 
 /**
@@ -614,22 +696,22 @@ typedef Function = {
 	/**
 		A list of function arguments.
 	**/
-	var args : Array<FunctionArg>;
+	var args:Array<FunctionArg>;
 
 	/**
 		The return type-hint of the function, if available.
 	**/
-	var ret : Null<ComplexType>;
+	var ret:Null<ComplexType>;
 
 	/**
 		The expression of the function body, if available.
 	**/
-	var expr : Null<Expr>;
+	var expr:Null<Expr>;
 
 	/**
 		An optional list of function parameter type declarations.
 	**/
-	@:optional var params : Array<TypeParamDecl>;
+	var ?params:Array<TypeParamDecl>;
 }
 
 /**
@@ -639,27 +721,27 @@ typedef FunctionArg = {
 	/**
 		The name of the function argument.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		Whether or not the function argument is optional.
 	**/
-	@:optional var opt : Bool;
+	var ?opt:Bool;
 
 	/**
 		The type-hint of the function argument, if available.
 	**/
-	var type : Null<ComplexType>;
+	var type:Null<ComplexType>;
 
 	/**
 		The optional value of the function argument, if available.
 	**/
-	@:optional var value : Null<Expr>;
+	var ?value:Null<Expr>;
 
 	/**
 		The metadata of the function argument.
 	**/
-	@:optional var meta : Metadata;
+	var ?meta:Metadata;
 }
 
 /**
@@ -669,17 +751,17 @@ typedef MetadataEntry = {
 	/**
 		The name of the metadata entry.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		The optional parameters of the metadata entry.
 	**/
-	@:optional var params : Array<Expr>;
+	var ?params:Array<Expr>;
 
 	/**
 		The position of the metadata entry.
 	**/
-	var pos : Position;
+	var pos:Position;
 }
 
 /**
@@ -694,34 +776,34 @@ typedef Field = {
 	/**
 		The name of the field.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		The documentation of the field, if available. If the field has no
 		documentation, the value is `null`.
 	**/
-	@:optional var doc : Null<String>;
+	var ?doc:Null<String>;
 
 	/**
 		The access modifiers of the field. By default fields have private access.
 		@see https://haxe.org/manual/class-field-access-modifier.html
 	**/
-	@:optional var access : Array<Access>;
+	var ?access:Array<Access>;
 
 	/**
 		The kind of the field.
 	**/
-	var kind : FieldType;
+	var kind:FieldType;
 
 	/**
 		The position of the field.
 	**/
-	var pos : Position;
+	var pos:Position;
 
 	/**
 		The optional metadata of the field.
 	**/
-	@:optional var meta : Metadata;
+	var ?meta:Metadata;
 }
 
 /**
@@ -729,7 +811,6 @@ typedef Field = {
 	@see https://haxe.org/manual/class-field-access-modifier.html
 **/
 enum Access {
-
 	/**
 		Public access modifier, grants access from anywhere.
 		@see https://haxe.org/manual/class-field-visibility.html
@@ -772,6 +853,17 @@ enum Access {
 		normal functions which are executed as soon as they are typed.
 	**/
 	AMacro;
+
+	/**
+		Final access modifier. For functions, they can not be overridden. For
+		variables, it means they can be assigned to only once.
+	**/
+	AFinal;
+
+	/**
+		Extern access modifier.
+	**/
+	AExtern;
 }
 
 /**
@@ -781,17 +873,17 @@ enum FieldType {
 	/**
 		Represents a variable field type.
 	**/
-	FVar( t : Null<ComplexType>, ?e : Null<Expr> );
+	FVar(t:Null<ComplexType>, ?e:Null<Expr>);
 
 	/**
 		Represents a function field type.
 	**/
-	FFun( f : Function );
+	FFun(f:Function);
 
 	/**
 		Represents a property with getter and setter field type.
 	**/
-	FProp( get : String, set : String, ?t : Null<ComplexType>, ?e : Null<Expr> );
+	FProp(get:String, set:String, ?t:Null<ComplexType>, ?e:Null<Expr>);
 }
 
 /**
@@ -801,42 +893,48 @@ typedef TypeDefinition = {
 	/**
 		The package of the type definition.
 	**/
-	var pack : Array<String>;
+	var pack:Array<String>;
 
 	/**
 		The name of the type definition.
 	**/
-	var name : String;
+	var name:String;
+
+	/**
+		The documentation of the type, if available. If the type has no
+		documentation, the value is `null`.
+	**/
+	var ?doc:Null<String>;
 
 	/**
 		The position to the type definition.
 	**/
-	var pos : Position;
+	var pos:Position;
 
 	/**
 		The optional metadata of the type definition.
 	**/
-	@:optional var meta : Metadata;
+	var ?meta:Metadata;
 
 	/**
 		The parameter type declarations of the type definition.
 	**/
-	@:optional var params : Array<TypeParamDecl>;
+	var ?params:Array<TypeParamDecl>;
 
 	/**
 		Whether or not the type is extern.
 	**/
-	@:optional var isExtern : Bool;
+	var ?isExtern:Bool;
 
 	/**
 		The kind of the type definition.
 	**/
-	var kind : TypeDefKind;
+	var kind:TypeDefKind;
 
 	/**
 		The fields of the type definition.
 	**/
-	var fields : Array<Field>;
+	var fields:Array<Field>;
 }
 
 /**
@@ -856,38 +954,37 @@ enum TypeDefKind {
 	/**
 		Represents a class kind.
 	**/
-	TDClass( ?superClass : TypePath, ?interfaces : Array<TypePath>, ?isInterface : Bool );
+	TDClass(?superClass:TypePath, ?interfaces:Array<TypePath>, ?isInterface:Bool, ?isFinal:Bool);
 
 	/**
 		Represents an alias/typedef kind.
 	**/
-	TDAlias( t : ComplexType ); // ignore TypeDefinition.fields
+	TDAlias(t:ComplexType); // ignore TypeDefinition.fields
 
 	/**
 		Represents an abstract kind.
 	**/
-	TDAbstract( tthis : Null<ComplexType>, ?from : Array<ComplexType>, ?to: Array<ComplexType> );
+	TDAbstract(tthis:Null<ComplexType>, ?from:Array<ComplexType>, ?to:Array<ComplexType>);
 }
 
 /**
 	This error can be used to handle or produce compilation errors in macros.
 **/
 class Error {
-
 	/**
 		The error message.
 	**/
-	public var message : String;
+	public var message:String;
 
 	/**
 		The position of the error.
 	**/
-	public var pos : Expr.Position;
+	public var pos:Expr.Position;
 
 	/**
 		Instantiates an error with given message and position.
 	**/
-	public function new(m,p) {
+	public function new(m, p) {
 		this.message = m;
 		this.pos = p;
 	}
@@ -928,10 +1025,10 @@ typedef ImportExpr = {
 	/**
 		The path to the import expression.
 	**/
-	var path: Array< { pos: Position, name: String } >;
+	var path:Array<{pos:Position, name:String}>;
 
 	/**
 		The mode of the import expression.
 	**/
-	var mode: ImportMode;
+	var mode:ImportMode;
 }
diff --git a/std/haxe/macro/ExprTools.hx b/std/haxe/macro/ExprTools.hx
index b801b05b13febaaaa61b67a7ee215027e6f92fce..747e6077fb93b47ff68d5dc07698abcf62d69e20 100644
--- a/std/haxe/macro/ExprTools.hx
+++ b/std/haxe/macro/ExprTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,6 +23,7 @@
 package haxe.macro;
 
 import haxe.macro.Expr;
+
 using Lambda;
 
 /**
@@ -34,14 +35,13 @@ using Lambda;
 	well.
 **/
 class ExprTools {
-
 	/**
 		Converts expression `e` to a human-readable String representation.
 
 		The result is guaranteed to be valid Haxe code, but there may be
 		differences from the original lexical syntax.
 	**/
-	static public function toString( e : Expr ) : String
+	static public function toString(e:Expr):String
 		return new Printer().printExpr(e);
 
 	/**
@@ -68,29 +68,14 @@ class ExprTools {
 		}
 		```
 	**/
-	static public function iter( e : Expr, f : Expr -> Void ) : Void {
-		switch(e.expr) {
-			case EConst(_),
-				EContinue,
-				EBreak,
-				EDisplayNew(_):
-			case EField(e, _),
-				EParenthesis(e),
-				EUntyped(e),
-				EThrow(e),
-				EDisplay(e, _),
-				ECheckType(e, _),
-				EUnop(_, _, e),
-				ECast(e, _),
-				EMeta(_, e):
-					f(e);
-			case EArray(e1, e2),
-				EWhile(e1, e2, _),
-				EBinop(_, e1, e2),
-				EFor(e1, e2),
-				EIn(e1, e2):
-					f(e1);
-					f(e2);
+	static public function iter(e:Expr, f:Expr->Void):Void {
+		switch (e.expr) {
+			case EConst(_), EContinue, EBreak, EDisplayNew(_):
+			case EField(e, _), EParenthesis(e), EUntyped(e), EThrow(e), EDisplay(e, _), ECheckType(e, _), EUnop(_, _, e), ECast(e, _), EMeta(_, e):
+				f(e);
+			case EArray(e1, e2), EWhile(e1, e2, _), EBinop(_, e1, e2), EFor(e1, e2):
+				f(e1);
+				f(e2);
 			case EVars(vl):
 				for (v in vl)
 					opt2(v.expr, f);
@@ -98,15 +83,12 @@ class ExprTools {
 				f(e);
 				for (c in cl)
 					f(c.expr);
-			case ETernary(e1, e2, e3)
-			| EIf(e1, e2, e3):
+			case ETernary(e1, e2, e3) | EIf(e1, e2, e3):
 				f(e1);
 				f(e2);
 				opt2(e3, f);
-			case EArrayDecl(el),
-				ENew(_, el),
-				EBlock(el):
-					ExprArrayTools.iter(el, f);
+			case EArrayDecl(el), ENew(_, el), EBlock(el):
+				ExprArrayTools.iter(el, f);
 			case EObjectDecl(fl):
 				for (fd in fl)
 					f(fd.expr);
@@ -153,62 +135,76 @@ class ExprTools {
 					ExprTools.map(e, capitalizeStrings);
 			}
 		}
-		```haxe
+		```
 	**/
-	static public function map( e : Expr, f : Expr -> Expr ) : Expr {
-		return {pos: e.pos, expr: switch(e.expr) {
-			case EConst(_): e.expr;
-			case EArray(e1, e2): EArray(f(e1), f(e2));
-			case EBinop(op, e1, e2): EBinop(op, f(e1), f(e2));
-			case EField(e, field): EField(f(e), field);
-			case EParenthesis(e): EParenthesis(f(e));
-			case EObjectDecl(fields):
-				var ret = [];
-				for (field in fields)
-					ret.push( { field: field.field, expr: f(field.expr) } );
-				EObjectDecl(ret);
-			case EArrayDecl(el): EArrayDecl(ExprArrayTools.map(el, f));
-			case ECall(e, params): ECall(f(e), ExprArrayTools.map(params, f));
-			case ENew(tp, params): ENew(tp, ExprArrayTools.map(params, f));
-			case EUnop(op, postFix, e): EUnop(op, postFix, f(e));
-			case EVars(vars):
-				var ret = [];
-				for (v in vars)
-					ret.push( { name: v.name, type:v.type, expr: opt(v.expr, f) } );
-				EVars(ret);
-			case EBlock(el): EBlock(ExprArrayTools.map(el, f));
-			case EFor(it, expr): EFor(f(it), f(expr));
-			case EIn(e1, e2): EIn(f(e1), f(e2));
-			case EIf(econd, eif, eelse): EIf(f(econd), f(eif), opt(eelse, f));
-			case EWhile(econd, e, normalWhile): EWhile(f(econd), f(e), normalWhile);
-			case EReturn(e): EReturn(opt(e,f));
-			case EUntyped(e): EUntyped(f(e));
-			case EThrow(e): EThrow(f(e));
-			case ECast(e, t): ECast(f(e), t);
-			case EDisplay(e, isCall): EDisplay(f(e), isCall);
-			case ETernary(econd, eif, eelse): ETernary(f(econd), f(eif), f(eelse));
-			case ECheckType(e, t): ECheckType(f(e), t);
-			case EDisplayNew(_),
-				EContinue,
-				EBreak:
+	static public function map(e:Expr, f:Expr->Expr):Expr {
+		return {
+			pos: e.pos,
+			expr: switch (e.expr) {
+				case EConst(_): e.expr;
+				case EArray(e1, e2): EArray(f(e1), f(e2));
+				case EBinop(op, e1, e2): EBinop(op, f(e1), f(e2));
+				case EField(e, field): EField(f(e), field);
+				case EParenthesis(e): EParenthesis(f(e));
+				case EObjectDecl(fields):
+					var ret = [];
+					for (field in fields)
+						ret.push({field: field.field, expr: f(field.expr), quotes: field.quotes});
+					EObjectDecl(ret);
+				case EArrayDecl(el): EArrayDecl(ExprArrayTools.map(el, f));
+				case ECall(e, params): ECall(f(e), ExprArrayTools.map(params, f));
+				case ENew(tp, params): ENew(tp, ExprArrayTools.map(params, f));
+				case EUnop(op, postFix, e): EUnop(op, postFix, f(e));
+				case EVars(vars):
+					var ret = [];
+					for (v in vars) {
+						var v2:Var = {name: v.name, type: v.type, expr: opt(v.expr, f)};
+						if (v.isFinal != null)
+							v2.isFinal = v.isFinal;
+						ret.push(v2);
+					}
+					EVars(ret);
+				case EBlock(el): EBlock(ExprArrayTools.map(el, f));
+				case EFor(it, expr): EFor(f(it), f(expr));
+				case EIf(econd, eif, eelse): EIf(f(econd), f(eif), opt(eelse, f));
+				case EWhile(econd, e, normalWhile): EWhile(f(econd), f(e), normalWhile);
+				case EReturn(e): EReturn(opt(e, f));
+				case EUntyped(e): EUntyped(f(e));
+				case EThrow(e): EThrow(f(e));
+				case ECast(e, t): ECast(f(e), t);
+				case EDisplay(e, dk): EDisplay(f(e), dk);
+				case ETernary(econd, eif, eelse): ETernary(f(econd), f(eif), f(eelse));
+				case ECheckType(e, t): ECheckType(f(e), t);
+				case EDisplayNew(_), EContinue, EBreak:
 					e.expr;
-			case ETry(e, catches):
-				var ret = [];
-				for (c in catches)
-					ret.push( { name:c.name, type:c.type, expr:f(c.expr) } );
-				ETry(f(e), ret);
-			case ESwitch(e, cases, edef):
-				var ret = [];
-				for (c in cases)
-					ret.push( { expr: opt (c.expr, f), guard: opt(c.guard, f), values: ExprArrayTools.map(c.values, f) } );
-				ESwitch(f(e), ret, edef == null || edef.expr == null ? edef : f(edef));
-			case EFunction(name, func):
-				var ret = [];
-				for (arg in func.args)
-					ret.push( { name: arg.name, opt: arg.opt, type: arg.type, value: opt(arg.value, f) } );
-				EFunction(name, { args: ret, ret: func.ret, params: func.params, expr: f(func.expr) } );
-			case EMeta(m, e): EMeta(m, f(e));
-		}};
+				case ETry(e, catches):
+					var ret = [];
+					for (c in catches)
+						ret.push({name: c.name, type: c.type, expr: f(c.expr)});
+					ETry(f(e), ret);
+				case ESwitch(e, cases, edef):
+					var ret = [];
+					for (c in cases)
+						ret.push({expr: opt(c.expr, f), guard: opt(c.guard, f), values: ExprArrayTools.map(c.values, f)});
+					ESwitch(f(e), ret, edef == null || edef.expr == null ? edef : f(edef));
+				case EFunction(kind, func):
+					var ret = [];
+					for (arg in func.args)
+						ret.push({
+							name: arg.name,
+							opt: arg.opt,
+							type: arg.type,
+							value: opt(arg.value, f)
+						});
+					EFunction(kind, {
+						args: ret,
+						ret: func.ret,
+						params: func.params,
+						expr: f(func.expr)
+					});
+				case EMeta(m, e): EMeta(m, f(e));
+			}
+		};
 	}
 
 	/**
@@ -290,26 +286,27 @@ class ExprTools {
 		}
 	}
 
-	static inline function opt(e:Null<Expr>, f : Expr -> Expr):Expr
+	static inline function opt(e:Null<Expr>, f:Expr->Expr):Expr
 		return e == null ? null : f(e);
 
-	static inline function opt2(e:Null<Expr>, f : Expr -> Void):Void
-		if (e != null) f(e);
+	static inline function opt2(e:Null<Expr>, f:Expr->Void):Void
+		if (e != null)
+			f(e);
 }
 
 /**
 	This class provides functions on expression arrays for convenience. For a
 	detailed reference on each method, see the documentation of ExprTools.
- */
+**/
 class ExprArrayTools {
-	static public function map( el : Array<Expr>, f : Expr -> Expr):Array<Expr> {
+	static public function map(el:Array<Expr>, f:Expr->Expr):Array<Expr> {
 		var ret = [];
 		for (e in el)
 			ret.push(f(e));
 		return ret;
 	}
 
-	static public function iter( el : Array<Expr>, f : Expr -> Void):Void {
+	static public function iter(el:Array<Expr>, f:Expr->Void):Void {
 		for (e in el)
 			f(e);
 	}
diff --git a/std/haxe/macro/Format.hx b/std/haxe/macro/Format.hx
index 9ec9f8360fa9933b595858735f72e5ef676385b6..afcb06906435533cf43a70d5b2831ee785e71ad5 100644
--- a/std/haxe/macro/Format.hx
+++ b/std/haxe/macro/Format.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.macro;
+
 import haxe.macro.Expr;
 import haxe.macro.Context;
 
@@ -27,14 +29,16 @@ import haxe.macro.Context;
 	The actual macro implemented for Std.format
 **/
 class Format {
-
-	#if macro
-	public static function format( estr : Expr ) {
-		var str = switch( estr.expr ) {
-			case EConst(c): switch(c) { case CString(s): s; default: null; }
+	#if (macro || display)
+	public static function format(estr:Expr) {
+		var str = switch (estr.expr) {
+			case EConst(c): switch (c) {
+					case CString(s): s;
+					default: null;
+				}
 			default: null;
 		};
-		if( str == null )
+		if (str == null)
 			Context.error("Constant string required", estr.pos);
 		var pos = Context.getPosInfos(estr.pos);
 		var min = pos.min;
@@ -47,34 +51,35 @@ class Format {
 			return p;
 		}
 		function add(e) {
-			if( expr == null )
+			if (expr == null)
 				expr = e;
 			else
-				expr = { expr : EBinop(OpAdd,expr,e), pos : Context.makePosition({ min : min, max : pos.min, file : pos.file }) };
+				expr = {expr: EBinop(OpAdd, expr, e), pos: Context.makePosition({min: min, max: pos.min, file: pos.file})};
 		}
 		var i = 0, start = 0;
 		var max = str.length;
-		while( i < max ) {
-			if( StringTools.fastCodeAt(str,i++) != '$'.code )
+		while (i < max) {
+			if (StringTools.fastCodeAt(str, i++) != '$'.code)
 				continue;
 			var len = i - start - 1;
-			if( len > 0 || expr == null )
-				add({ expr : EConst(CString(str.substr(start,len))), pos : make(len) });
+			if (len > 0 || expr == null)
+				add({expr: EConst(CString(str.substr(start, len))), pos: make(len)});
 			pos.min++;
 			start = i;
 			var c = StringTools.fastCodeAt(str, i);
-			if( c == '{'.code ) {
+			if (c == '{'.code) {
 				var count = 1;
 				i++;
-				while( i < max ) {
-					var c = StringTools.fastCodeAt(str,i++);
-					if( c == "}".code ) {
-						if( --count == 0 ) break;
-					} else if( c == "{".code )
+				while (i < max) {
+					var c = StringTools.fastCodeAt(str, i++);
+					if (c == "}".code) {
+						if (--count == 0)
+							break;
+					} else if (c == "{".code)
 						count++;
 				}
-				if( count > 0 )
-					Context.error("Closing brace not found",make(1));
+				if (count > 0)
+					Context.error("Closing brace not found", make(1));
 				pos.min++;
 				start++;
 				var len = i - start - 1;
@@ -82,19 +87,19 @@ class Format {
 				add(Context.parseInlineString(expr, make(len)));
 				pos.min++;
 				start++;
-			} else if( (c >= 'a'.code && c <= 'z'.code) || (c >= 'A'.code && c <= 'Z'.code) || c == '_'.code ) {
+			} else if ((c >= 'a'.code && c <= 'z'.code) || (c >= 'A'.code && c <= 'Z'.code) || c == '_'.code) {
 				i++;
-				while( true ) {
+				while (true) {
 					var c = StringTools.fastCodeAt(str, i);
-					if( (c >= 'a'.code && c <= 'z'.code) || (c >= 'A'.code && c <= 'Z'.code) || (c >= '0'.code && c <= '9'.code) || c == '_'.code )
+					if ((c >= 'a'.code && c <= 'z'.code) || (c >= 'A'.code && c <= 'Z'.code) || (c >= '0'.code && c <= '9'.code) || c == '_'.code)
 						i++;
 					else
 						break;
 				}
 				var len = i - start;
 				var ident = str.substr(start, len);
-				add( { expr : EConst(CIdent(ident)), pos : make(len) } );
-			} else if( c == '$'.code ) {
+				add({expr: EConst(CIdent(ident)), pos: make(len)});
+			} else if (c == '$'.code) {
 				start = i++;
 				continue;
 			} else {
@@ -104,12 +109,11 @@ class Format {
 			start = i;
 		}
 		var len = i - start;
-		if( len > 0 )
-			add({ expr : EConst(CString(str.substr(start,len))), pos : make(len) });
-		if( expr == null )
-			expr = { expr : EConst(CString("")), pos : make(0) };
-		return { expr : ECheckType(expr,TPath({ pack : [], name : "String", params : [] })), pos : expr.pos };
+		if (len > 0)
+			add({expr: EConst(CString(str.substr(start, len))), pos: make(len)});
+		if (expr == null)
+			expr = {expr: EConst(CString("")), pos: make(0)};
+		return {expr: ECheckType(expr, TPath({pack: [], name: "String", params: []})), pos: expr.pos};
 	}
 	#end
-
 }
diff --git a/std/haxe/macro/JSGenApi.hx b/std/haxe/macro/JSGenApi.hx
index 4fbb1f52a4d617819424bc8835835a45a0da0779..9f1fa1709308b53d14dc5bc805bfc0563af9197a 100644
--- a/std/haxe/macro/JSGenApi.hx
+++ b/std/haxe/macro/JSGenApi.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.macro;
+
 import haxe.macro.Type;
 
 /**
@@ -27,27 +29,38 @@ import haxe.macro.Type;
 **/
 typedef JSGenApi = {
 	/** the file in which the JS code can be generated **/
-	var outputFile : String;
+	var outputFile:String;
+
 	/** all the types that were compiled by Haxe **/
-	var types : Array<Type>;
+	var types:Array<Type>;
+
 	/** the main call expression, if a -main class is defined **/
-	var main : Null<TypedExpr>;
+	var main:Null<TypedExpr>;
+
 	/** generate the JS code for any given typed expression **/
-	function generateStatement( e : TypedExpr ) : String;
+	function generateStatement(e:TypedExpr):String;
+
 	/** generate the JS code for a given typed expression-value **/
-	function generateValue( e : TypedExpr ) : String;
+	function generateValue(e:TypedExpr):String;
+
 	/** define the JS code that gets generated when a class or enum is accessed in a typed expression **/
-	function setTypeAccessor( callb : Type -> String ) : Void;
+	function setTypeAccessor(callb:Type->String):Void;
+
 	/** tells if the given identifier is a JS keyword **/
-	function isKeyword( ident : String ) : Bool;
+	function isKeyword(ident:String):Bool;
+
 	/** add a feature **/
-	function addFeature( f : String ) : Bool;
+	function addFeature(f:String):Bool;
+
 	/** check if a feature is used **/
-	function hasFeature( f : String ) : Bool;
+	function hasFeature(f:String):Bool;
+
 	/** quote and escape the given string constant **/
-	function quoteString( s : String ) : String;
+	function quoteString(s:String):String;
+
 	/** create the metadata expression for the given type **/
-	function buildMetaData( t : BaseType ) : Null<TypedExpr>;
+	function buildMetaData(t:BaseType):Null<TypedExpr>;
+
 	/** select the current classe **/
-	function setCurrentClass( c : ClassType ) : Void;
+	function setCurrentClass(c:ClassType):Void;
 }
diff --git a/std/haxe/macro/MacroStringTools.hx b/std/haxe/macro/MacroStringTools.hx
index 4af3b5efb82fecfe7a2523cd847a29167b3ce35e..8e6375a437c1b44515579d4d53f415ff7f003887 100644
--- a/std/haxe/macro/MacroStringTools.hx
+++ b/std/haxe/macro/MacroStringTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,11 +28,11 @@ import haxe.macro.Expr;
 	This class provides some utility methods to work with strings in macro
 	context.
 **/
-#if hl @:hlNative("macro") #end
+#if hl
+@:hlNative("macro")
+#end
 class MacroStringTools {
-	#if macro
-
-
+	#if (macro || display)
 	/**
 		Formats `String` `s` using the usual interpolation rules.
 
@@ -40,7 +40,7 @@ class MacroStringTools {
 		elements.
 	**/
 	static public function formatString(s:String, pos:Position) {
-		#if neko
+		#if (neko || eval)
 		return Context.load("format_string", 2)(s, pos);
 		#end
 	}
@@ -55,8 +55,8 @@ class MacroStringTools {
 
 		This operation depends on the position of `e`.
 	**/
-	static public function isFormatExpr(e:ExprOf<String>) : Bool {
-		#if neko
+	static public function isFormatExpr(e:ExprOf<String>):Bool {
+		#if (neko || eval)
 		return Context.load("is_fmt_string", 1)(e.pos);
 		#else
 		return isFmtString(e.pos);
@@ -64,11 +64,10 @@ class MacroStringTools {
 	}
 
 	#if !neko
-	static function isFmtString(p:Position) : Bool {
+	static function isFmtString(p:Position):Bool {
 		return false;
 	}
 	#end
-
 	#end
 
 	/**
@@ -82,8 +81,16 @@ class MacroStringTools {
 
 		If `sl` is null, the result is unspecified.
 	**/
-	static public function toFieldExpr(sl:Array<String>):Expr {
-		return Lambda.fold(sl, function(s, e) return e == null ? (macro $i{s}) : (macro $e.$s), null);
+	static public function toFieldExpr(sl:Array<String>, ?pos):Expr {
+		if (pos == null)
+			return Lambda.fold(sl, function(s, e) return e == null ? (macro $i{s}) : (macro $e.$s), null);
+		var e = null;
+		for (v in sl)
+			if (e == null)
+				e = {expr: EConst(CIdent(v)), pos: pos};
+			else
+				e = {expr: EField(e, v), pos: pos};
+		return e;
 	}
 
 	/**
@@ -98,12 +105,11 @@ class MacroStringTools {
 		an appended dot separating the result from `name`.
 	**/
 	static public function toDotPath(pack:Array<String>, name:String):String {
-		return if (pack.length == 0) name else pack.join(".") + "." +name;
+		return if (pack.length == 0) name else pack.join(".") + "." + name;
 	}
 
-	static public function toComplex( path : String ) : ComplexType {
+	static public function toComplex(path:String):ComplexType {
 		var pack = path.split(".");
-		return TPath( { pack : pack, name : pack.pop(), params : [] } );
+		return TPath({pack: pack, name: pack.pop(), params: []});
 	}
-
 }
diff --git a/std/haxe/macro/MacroType.hx b/std/haxe/macro/MacroType.hx
index a1befdd1d14485235917e3a2214b53d00d78ea05..c9340e52f5ea65e0255a2f87242521b5fca87069 100644
--- a/std/haxe/macro/MacroType.hx
+++ b/std/haxe/macro/MacroType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.macro;
 
 /**
 	This type is meant to be used to generate custom types using a macro.
 	For instance by doing MacroType<[my.Class.myMacro(55)]>
 **/
-extern class MacroType<Const> {
-}
\ No newline at end of file
+extern class MacroType<Const> {}
diff --git a/std/haxe/macro/PositionTools.hx b/std/haxe/macro/PositionTools.hx
index 1307cb023915badbbbe10f2d4fd3ab3036f0d2d3..8c4d6f62b7afddd48e5758511eee1e21d0214f6b 100644
--- a/std/haxe/macro/PositionTools.hx
+++ b/std/haxe/macro/PositionTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package haxe.macro;
 
+package haxe.macro;
+
+import haxe.display.Position.Location;
 import haxe.macro.Expr;
 
 class PositionTools {
-
 	/**
 		Returns the `Position` where the caller of `here` is.
 	**/
@@ -40,7 +41,7 @@ class PositionTools {
 	/**
 		Like `Context.getPosInfos`, except this method is available on all platforms.
 	**/
-	public static function getInfos( p : Position ) : { min : Int, max : Int, file : String } {
+	public static function getInfos(p:Position):{min:Int, max:Int, file:String} {
 		#if macro
 		return Context.getPosInfos(p);
 		#else
@@ -51,7 +52,7 @@ class PositionTools {
 	/**
 		Like `Context.makePosition`, except this method is available on all platforms.
 	**/
-	public static function make( inf : { min : Int, max : Int, file : String } ) : Position {
+	public static function make(inf:{min:Int, max:Int, file:String}):Position {
 		#if macro
 		return Context.makePosition(inf);
 		#else
@@ -59,4 +60,15 @@ class PositionTools {
 		#end
 	}
 
+	#if (macro || display)
+	/**
+		Converts a `haxe.macro.Position` to a `haxe.display.Position.Location`.
+
+		This operation requires the source file the be known to the Haxe lexer in order
+		to determine line breaks. It is thus only available in macro context.
+	**/
+	public static function toLocation(p:Position):Location {
+		return Context.load("position_to_range", 1)(p);
+	}
+	#end
 }
diff --git a/std/haxe/macro/Printer.hx b/std/haxe/macro/Printer.hx
index 99481b742e813361ed516904448cef6d0a39aadc..4c73ed9c0cd5dab4a3b6df8125e6fc3bcb63b77a 100644
--- a/std/haxe/macro/Printer.hx
+++ b/std/haxe/macro/Printer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,13 +23,14 @@
 package haxe.macro;
 
 import haxe.macro.Expr;
+
 using Lambda;
 using StringTools;
 
 /**
 	This class provides some utility methods to convert elements from the
 	macro context to a human-readable String representation.
-*/
+ */
 class Printer {
 	var tabs:String;
 	var tabString:String;
@@ -39,281 +40,484 @@ class Printer {
 		this.tabString = tabString;
 	}
 
-	public function printUnop(op:Unop) return switch(op) {
-		case OpIncrement: "++";
-		case OpDecrement: "--";
-		case OpNot: "!";
-		case OpNeg: "-";
-		case OpNegBits: "~";
-	}
+	public function printUnop(op:Unop)
+		return switch (op) {
+			case OpIncrement: "++";
+			case OpDecrement: "--";
+			case OpNot: "!";
+			case OpNeg: "-";
+			case OpNegBits: "~";
+		}
 
-	public function printBinop(op:Binop) return switch(op) {
-		case OpAdd: "+";
-		case OpMult: "*";
-		case OpDiv: "/";
-		case OpSub: "-";
-		case OpAssign: "=";
-		case OpEq: "==";
-		case OpNotEq: "!=";
-		case OpGt: ">";
-		case OpGte: ">=";
-		case OpLt: "<";
-		case OpLte: "<=";
-		case OpAnd: "&";
-		case OpOr: "|";
-		case OpXor: "^";
-		case OpBoolAnd: "&&";
-		case OpBoolOr: "||";
-		case OpShl: "<<";
-		case OpShr: ">>";
-		case OpUShr: ">>>";
-		case OpMod: "%";
-		case OpInterval: "...";
-		case OpArrow: "=>";
-		case OpAssignOp(op):
-			printBinop(op)
-			+ "=";
-	}
+	public function printBinop(op:Binop)
+		return switch (op) {
+			case OpAdd: "+";
+			case OpMult: "*";
+			case OpDiv: "/";
+			case OpSub: "-";
+			case OpAssign: "=";
+			case OpEq: "==";
+			case OpNotEq: "!=";
+			case OpGt: ">";
+			case OpGte: ">=";
+			case OpLt: "<";
+			case OpLte: "<=";
+			case OpAnd: "&";
+			case OpOr: "|";
+			case OpXor: "^";
+			case OpBoolAnd: "&&";
+			case OpBoolOr: "||";
+			case OpShl: "<<";
+			case OpShr: ">>";
+			case OpUShr: ">>>";
+			case OpMod: "%";
+			case OpInterval: "...";
+			case OpArrow: "=>";
+			case OpIn: "in";
+			case OpAssignOp(op):
+				printBinop(op) + "=";
+		}
 
-	function escapeString(s:String,delim:String) {
-		return delim + s.replace("\n","\\n").replace("\t","\\t").replace("'","\\'").replace('"',"\\\"") #if sys .replace("\x00","\\x00") #end + delim;
+	function escapeString(s:String, delim:String) {
+		return delim
+			+ s.replace("\n", "\\n")
+				.replace("\t", "\\t")
+				.replace("\r", "\\r")
+				.replace("'", "\\'")
+				.replace('"', "\\\"") #if sys .replace("\x00", "\\x00") #end + delim;
 	}
 
 	public function printFormatString(s:String) {
-		return escapeString(s,"'");
+		return escapeString(s, "'");
 	}
 
 	public function printString(s:String) {
-		return escapeString(s,'"');
+		return escapeString(s, '"');
 	}
 
-	public function printConstant(c:Constant) return switch(c) {
-		case CString(s): printString(s);
-		case CIdent(s),
-			CInt(s),
-			CFloat(s):
+	public function printConstant(c:Constant)
+		return switch (c) {
+			case CString(s): printString(s);
+			case CIdent(s), CInt(s), CFloat(s):
 				s;
-		case CRegexp(s,opt): '~/$s/$opt';
-	}
+			case CRegexp(s, opt): '~/$s/$opt';
+		}
 
-	public function printTypeParam(param:TypeParam) return switch(param) {
-		case TPType(ct): printComplexType(ct);
-		case TPExpr(e): printExpr(e);
-	}
+	public function printTypeParam(param:TypeParam)
+		return switch (param) {
+			case TPType(ct): printComplexType(ct);
+			case TPExpr(e): printExpr(e);
+		}
 
-	public function printTypePath(tp:TypePath) return
-		(tp.pack.length > 0 ? tp.pack.join(".") + "." : "")
-		+ tp.name
-		+ (tp.sub != null ? '.${tp.sub}' : "")
-		+ (tp.params == null ? "" : tp.params.length > 0 ? "<" + tp.params.map(printTypeParam).join(", ") + ">" : "");
+	public function printTypePath(tp:TypePath)
+		return (tp.pack.length > 0 ? tp.pack.join(".") + "." : "")
+			+ tp.name
+			+ (tp.sub != null ? '.${tp.sub}' : "")
+			+ (tp.params == null ? "" : tp.params.length > 0 ? "<" + tp.params.map(printTypeParam).join(", ") + ">" : "");
 
 	// TODO: check if this can cause loops
-	public function printComplexType(ct:ComplexType) return switch(ct) {
-		case TPath(tp): printTypePath(tp);
-		case TFunction(args, ret):
-			function printArg(ct) return switch ct {
-				case TFunction(_): "(" + printComplexType(ct) + ")";
-				default: printComplexType(ct);
-			};
-			(args.length>0 ? args.map(printArg).join(" -> ") :"Void") + " -> " + printComplexType(ret);
-		case TAnonymous(fields): "{ " + [for (f in fields) printField(f) + "; "].join("") + "}";
-		case TParent(ct): "(" + printComplexType(ct) + ")";
-		case TOptional(ct): "?" + printComplexType(ct);
-		case TExtend(tpl, fields): '{> ${tpl.map(printTypePath).join(" >, ")}, ${fields.map(printField).join(", ")} }';
-	}
+	public function printComplexType(ct:ComplexType)
+		return switch (ct) {
+			case TPath(tp): printTypePath(tp);
+			case TFunction(args, ret):
+				if (args.length == 1 && !(args[0].match(TNamed(_, _)) || args[0].match(TFunction(_, _)))) {
+					// This special case handles an ambigity between the old function syntax and the new
+					// (T) -> T parses as `TFunction([TParent(TPath)], ...`, rather than `TFunction([TPath], ...`
+					// We forgo patenthesis in this case so that (T) -> T doesn't get round-tripped to ((T)) -> T
+					printComplexType(args[0]) + " -> " + printComplexType(ret);
+				} else {
+					'(${args.map(printComplexType).join(", ")})' + " -> " + printComplexType(ret);
+				}
+			case TAnonymous(fields): "{ " + [for (f in fields) printField(f) + "; "].join("") + "}";
+			case TParent(ct): "(" + printComplexType(ct) + ")";
+			case TOptional(ct): "?" + printComplexType(ct);
+			case TNamed(n, ct): n + ":" + printComplexType(ct);
+			case TExtend(tpl, fields): '{> ${tpl.map(printTypePath).join(" >, ")}, ${fields.map(printField).join(", ")} }';
+			case TIntersection(tl): tl.map(printComplexType).join(" & ");
+		}
 
-	public function printMetadata(meta:MetadataEntry) return
-		'@${meta.name}'
-		+ ((meta.params != null && meta.params.length > 0) ? '(${printExprs(meta.params,", ")})' : "");
-
-	public function printAccess(access:Access) return switch(access) {
-		case AStatic: "static";
-		case APublic: "public";
-		case APrivate: "private";
-		case AOverride: "override";
-		case AInline: "inline";
-		case ADynamic: "dynamic";
-		case AMacro: "macro";
-	}
+	public function printMetadata(meta:MetadataEntry)
+		return '@${meta.name}' + ((meta.params != null && meta.params.length > 0) ? '(${printExprs(meta.params, ", ")})' : "");
 
-	public function printField(field:Field) return
-		(field.doc != null && field.doc != "" ? "/**\n" + tabs + tabString + StringTools.replace(field.doc, "\n", "\n" + tabs + tabString) + "\n" + tabs + "**/\n" + tabs : "")
-		+ (field.meta != null && field.meta.length > 0 ? field.meta.map(printMetadata).join('\n$tabs') + '\n$tabs' : "")
-		+ (field.access != null && field.access.length > 0 ? field.access.map(printAccess).join(" ") + " " : "")
-		+ switch(field.kind) {
-		  case FVar(t, eo): 'var ${field.name}' + opt(t, printComplexType, " : ") + opt(eo, printExpr, " = ");
-		  case FProp(get, set, t, eo): 'var ${field.name}($get, $set)' + opt(t, printComplexType, " : ") + opt(eo, printExpr, " = ");
-		  case FFun(func): 'function ${field.name}' + printFunction(func);
+	public function printAccess(access:Access)
+		return switch (access) {
+			case AStatic: "static";
+			case APublic: "public";
+			case APrivate: "private";
+			case AOverride: "override";
+			case AInline: "inline";
+			case ADynamic: "dynamic";
+			case AMacro: "macro";
+			case AFinal: "final";
+			case AExtern: "extern";
 		}
 
-	public function printTypeParamDecl(tpd:TypeParamDecl) return
-		tpd.name
-		+ (tpd.params != null && tpd.params.length > 0 ? "<" + tpd.params.map(printTypeParamDecl).join(", ") + ">" : "")
-		+ (tpd.constraints != null && tpd.constraints.length > 0 ? ":(" + tpd.constraints.map(printComplexType).join(", ") + ")" : "");
-
-	public function printFunctionArg(arg:FunctionArg) return
-		(arg.opt ? "?" : "")
-		+ arg.name
-		+ opt(arg.type, printComplexType, ":")
-		+ opt(arg.value, printExpr, " = ");
-
-	public function printFunction(func:Function) return
-		(func.params == null ? "" : func.params.length > 0 ? "<" + func.params.map(printTypeParamDecl).join(", ") + ">" : "")
-		+ "(" + func.args.map(printFunctionArg).join(", ") + ")"
-		+ opt(func.ret, printComplexType, ":")
-		+ opt(func.expr, printExpr, " ");
-
-	public function printVar(v:Var) return
-		v.name
-		+ opt(v.type, printComplexType, ":")
-		+ opt(v.expr, printExpr, " = ");
-
-
-	public function printExpr(e:Expr) return e == null ? "#NULL" : switch(e.expr) {
-		#if macro
-		case EConst(CString(s)): haxe.macro.MacroStringTools.isFormatExpr(e) ? printFormatString(s) : printString(s);
-		#end
-		case EConst(c): printConstant(c);
-		case EArray(e1, e2): '${printExpr(e1)}[${printExpr(e2)}]';
-		case EBinop(op, e1, e2): '${printExpr(e1)} ${printBinop(op)} ${printExpr(e2)}';
-		case EField(e1, n): '${printExpr(e1)}.$n';
-		case EParenthesis(e1): '(${printExpr(e1)})';
-		case EObjectDecl(fl):
-			"{ " + fl.map(function(fld) return '${fld.field} : ${printExpr(fld.expr)}').join(", ") + " }";
-		case EArrayDecl(el): '[${printExprs(el, ", ")}]';
-		case ECall(e1, el): '${printExpr(e1)}(${printExprs(el,", ")})';
-		case ENew(tp, el): 'new ${printTypePath(tp)}(${printExprs(el,", ")})';
-		case EUnop(op, true, e1): printExpr(e1) + printUnop(op);
-		case EUnop(op, false, e1): printUnop(op) + printExpr(e1);
-		case EFunction(no, func) if (no != null): 'function $no' + printFunction(func);
-		case EFunction(_, func): "function" +printFunction(func);
-		case EVars(vl): "var " +vl.map(printVar).join(", ");
-		case EBlock([]): '{ }';
-		case EBlock(el):
-			var old = tabs;
-			tabs += tabString;
-			var s = '{\n$tabs' + printExprs(el, ';\n$tabs');
-			tabs = old;
-			s + ';\n$tabs}';
-		case EFor(e1, e2): 'for (${printExpr(e1)}) ${printExpr(e2)}';
-		case EIn(e1, e2): '${printExpr(e1)} in ${printExpr(e2)}';
-		case EIf(econd, eif, null): 'if (${printExpr(econd)}) ${printExpr(eif)}';
-		case EIf(econd, eif, eelse): 'if (${printExpr(econd)}) ${printExpr(eif)} else ${printExpr(eelse)}';
-		case EWhile(econd, e1, true): 'while (${printExpr(econd)}) ${printExpr(e1)}';
-		case EWhile(econd, e1, false): 'do ${printExpr(e1)} while (${printExpr(econd)})';
-		case ESwitch(e1, cl, edef):
-			var old = tabs;
-			tabs += tabString;
-			var s = 'switch ${printExpr(e1)} {\n$tabs' +
-				cl.map(function(c)
-					return 'case ${printExprs(c.values, ", ")}'
-						+ (c.guard != null ? ' if (${printExpr(c.guard)}):' : ":")
-						+ (c.expr != null ? (opt(c.expr, printExpr)) + ";" : ""))
-				.join('\n$tabs');
-			if (edef != null)
-				s += '\n${tabs}default:' + (edef.expr == null ? "" : printExpr(edef) + ";");
-			tabs = old;
-			s + '\n$tabs}';
-		case ETry(e1, cl):
-			'try ${printExpr(e1)}'
-			+ cl.map(function(c) return ' catch(${c.name}:${printComplexType(c.type)}) ${printExpr(c.expr)}').join("");
-		case EReturn(eo): "return" + opt(eo, printExpr, " ");
-		case EBreak: "break";
-		case EContinue: "continue";
-		case EUntyped(e1): "untyped " +printExpr(e1);
-		case EThrow(e1): "throw " +printExpr(e1);
-		case ECast(e1, cto) if (cto != null): 'cast(${printExpr(e1)}, ${printComplexType(cto)})';
-		case ECast(e1, _): "cast " +printExpr(e1);
-		case EDisplay(e1, _): '#DISPLAY(${printExpr(e1)})';
-		case EDisplayNew(tp): '#DISPLAY(${printTypePath(tp)})';
-		case ETernary(econd, eif, eelse): '${printExpr(econd)} ? ${printExpr(eif)} : ${printExpr(eelse)}';
-		case ECheckType(e1, ct): '(${printExpr(e1)} : ${printComplexType(ct)})';
-		case EMeta(meta, e1): printMetadata(meta) + " " +printExpr(e1);
+	public function printField(field:Field)
+		return (field.doc != null
+			&& field.doc != "" ? "/**\n"
+				+ tabs
+				+ tabString
+				+ StringTools.replace(field.doc, "\n", "\n" + tabs + tabString)
+				+ "\n"
+				+ tabs
+				+ "**/\n"
+				+ tabs : "")
+			+ (field.meta != null && field.meta.length > 0 ? field.meta.map(printMetadata).join('\n$tabs') + '\n$tabs' : "")
+			+ (field.access != null && field.access.length > 0 ? field.access.map(printAccess).join(" ") + " " : "")
+			+ switch (field.kind) {
+				case FVar(t, eo): ((field.access != null && field.access.has(AFinal)) ? '' : 'var ') + '${field.name}' + opt(t, printComplexType, " : ") + opt(eo, printExpr, " = ");
+				case FProp(get, set, t, eo): 'var ${field.name}($get, $set)' + opt(t, printComplexType, " : ") + opt(eo, printExpr, " = ");
+				case FFun(func): 'function ${field.name}' + printFunction(func);
+			}
+
+	public function printTypeParamDecl(tpd:TypeParamDecl)
+		return tpd.name
+			+ (tpd.params != null && tpd.params.length > 0 ? "<" + tpd.params.map(printTypeParamDecl).join(", ") + ">" : "")
+			+ (tpd.constraints != null && tpd.constraints.length > 0 ? ":(" + tpd.constraints.map(printComplexType).join(", ") + ")" : "");
+
+	public function printFunctionArg(arg:FunctionArg)
+		return (arg.opt ? "?" : "") + arg.name + opt(arg.type, printComplexType, ":") + opt(arg.value, printExpr, " = ");
+
+	public function printFunction(func:Function)
+		return (func.params == null ? "" : func.params.length > 0 ? "<" + func.params.map(printTypeParamDecl).join(", ") + ">" : "")
+			+ "("
+			+ func.args.map(printFunctionArg).join(", ")
+			+ ")"
+			+ opt(func.ret, printComplexType, ":")
+			+ opt(func.expr, printExpr, " ");
+
+	public function printVar(v:Var)
+		return v.name + opt(v.type, printComplexType, ":") + opt(v.expr, printExpr, " = ");
+
+	public function printObjectFieldKey(of:ObjectField) {
+		return switch (of.quotes) {
+			case null | Unquoted: of.field;
+			case Quoted: '"${of.field}"'; // TODO: Have to escape that?
+		}
 	}
 
+	public function printObjectField(of:ObjectField) {
+		return '${printObjectFieldKey(of)} : ${printExpr(of.expr)}';
+	}
+
+	public function printExpr(e:Expr)
+		return e == null ? "#NULL" : switch (e.expr) {
+			#if macro
+			case EConst(CString(s)): haxe.macro.MacroStringTools.isFormatExpr(e) ? printFormatString(s) : printString(s);
+			#end
+			case EConst(c): printConstant(c);
+			case EArray(e1, e2): '${printExpr(e1)}[${printExpr(e2)}]';
+			case EBinop(op, e1, e2): '${printExpr(e1)} ${printBinop(op)} ${printExpr(e2)}';
+			case EField(e1, n): '${printExpr(e1)}.$n';
+			case EParenthesis(e1): '(${printExpr(e1)})';
+			case EObjectDecl(fl):
+				"{ " + fl.map(function(fld) return printObjectField(fld)).join(", ") + " }";
+			case EArrayDecl(el): '[${printExprs(el, ", ")}]';
+			case ECall(e1, el): '${printExpr(e1)}(${printExprs(el, ", ")})';
+			case ENew(tp, el): 'new ${printTypePath(tp)}(${printExprs(el, ", ")})';
+			case EUnop(op, true, e1): printExpr(e1) + printUnop(op);
+			case EUnop(op, false, e1): printUnop(op) + printExpr(e1);
+			case EFunction(FNamed(no,inlined), func): (inlined ? 'inline ' : '') + 'function $no' + printFunction(func);
+			case EFunction(_, func): "function" + printFunction(func);
+			case EVars(vl): "var " + vl.map(printVar).join(", ");
+			case EBlock([]): '{ }';
+			case EBlock(el):
+				var old = tabs;
+				tabs += tabString;
+				var s = '{\n$tabs' + printExprs(el, ';\n$tabs');
+				tabs = old;
+				s + ';\n$tabs}';
+			case EFor(e1, e2): 'for (${printExpr(e1)}) ${printExpr(e2)}';
+			case EIf(econd, eif, null): 'if (${printExpr(econd)}) ${printExpr(eif)}';
+			case EIf(econd, eif, eelse): 'if (${printExpr(econd)}) ${printExpr(eif)} else ${printExpr(eelse)}';
+			case EWhile(econd, e1, true): 'while (${printExpr(econd)}) ${printExpr(e1)}';
+			case EWhile(econd, e1, false): 'do ${printExpr(e1)} while (${printExpr(econd)})';
+			case ESwitch(e1, cl, edef):
+				var old = tabs;
+				tabs += tabString;
+				var s = 'switch ${printExpr(e1)} {\n$tabs'
+					+ cl.map(function(c) return 'case ${printExprs(c.values, ", ")}' + (c.guard != null ? ' if (${printExpr(c.guard)}):' : ":")
+						+ (c.expr != null ? (opt(c.expr, printExpr)) + ";" : ""))
+						.join('\n$tabs');
+				if (edef != null)
+					s += '\n${tabs}default:' + (edef.expr == null ? "" : printExpr(edef) + ";");
+				tabs = old;
+				s + '\n$tabs}';
+			case ETry(e1, cl):
+				'try ${printExpr(e1)}' + cl.map(function(c) return ' catch(${c.name}:${printComplexType(c.type)}) ${printExpr(c.expr)}').join("");
+			case EReturn(eo): "return" + opt(eo, printExpr, " ");
+			case EBreak: "break";
+			case EContinue: "continue";
+			case EUntyped(e1): "untyped " + printExpr(e1);
+			case EThrow(e1): "throw " + printExpr(e1);
+			case ECast(e1, cto) if (cto != null): 'cast(${printExpr(e1)}, ${printComplexType(cto)})';
+			case ECast(e1, _): "cast " + printExpr(e1);
+			case EDisplay(e1, _): '#DISPLAY(${printExpr(e1)})';
+			case EDisplayNew(tp): '#DISPLAY(${printTypePath(tp)})';
+			case ETernary(econd, eif, eelse): '${printExpr(econd)} ? ${printExpr(eif)} : ${printExpr(eelse)}';
+			case ECheckType(e1, ct): '(${printExpr(e1)} : ${printComplexType(ct)})';
+			case EMeta(meta, e1): printMetadata(meta) + " " + printExpr(e1);
+		}
+
 	public function printExprs(el:Array<Expr>, sep:String) {
 		return el.map(printExpr).join(sep);
 	}
 
-	function printExtension(tpl:Array<TypePath>, fields: Array<Field>) {
-		return '{\n$tabs>' + tpl.map(printTypePath).join(',\n$tabs>') + ","
-		    + (fields.length > 0 ? ('\n$tabs' + fields.map(printField).join(';\n$tabs') + ";\n}") : ("\n}"));
+	function printExtension(tpl:Array<TypePath>, fields:Array<Field>) {
+		return '{\n$tabs>'
+			+ tpl.map(printTypePath).join(',\n$tabs>')
+			+ ","
+			+ (fields.length > 0 ? ('\n$tabs' + fields.map(printField).join(';\n$tabs') + ";\n}") : ("\n}"));
 	}
 
 	function printStructure(fields:Array<Field>) {
-		return fields.length == 0 ? "{ }" :
-			'{\n$tabs' + fields.map(printField).join(';\n$tabs') + ";\n}";
+		return fields.length == 0 ? "{ }" : '{\n$tabs' + fields.map(printField).join(';\n$tabs') + ";\n}";
 	}
 
 	public function printTypeDefinition(t:TypeDefinition, printPackage = true):String {
 		var old = tabs;
 		tabs = tabString;
 
-		var str = t == null ? "#NULL" :
-			(printPackage && t.pack.length > 0 && t.pack[0] != "" ? "package " + t.pack.join(".") + ";\n" : "") +
-			(t.meta != null && t.meta.length > 0 ? t.meta.map(printMetadata).join(" ") + " " : "") + (t.isExtern ? "extern " : "") + switch (t.kind) {
+		var str = t == null ? "#NULL" : (printPackage && t.pack.length > 0 && t.pack[0] != "" ? "package " + t.pack.join(".") + ";\n" : "")
+			+ (t.doc != null && t.doc != "" ? "/**\n" + tabString + StringTools.replace(t.doc, "\n", "\n" + tabString) + "\n**/\n" : "")
+			+ (t.meta != null && t.meta.length > 0 ? t.meta.map(printMetadata).join(" ") + " " : "")
+			+ (t.isExtern ? "extern " : "")
+			+ switch (t.kind) {
 				case TDEnum:
-					"enum " + t.name + ((t.params != null && t.params.length > 0) ? "<" + t.params.map(printTypeParamDecl).join(", ") + ">" : "") + " {\n"
-					+ [for (field in t.fields)
-						tabs + (field.doc != null && field.doc != "" ? "/**\n" + tabs + tabString + StringTools.replace(field.doc, "\n", "\n" + tabs + tabString) + "\n" + tabs + "**/\n" + tabs : "")
-						+ (field.meta != null && field.meta.length > 0 ? field.meta.map(printMetadata).join(" ") + " " : "")
-						+ (switch(field.kind) {
-							case FVar(t, _): field.name + opt(t, printComplexType, ":");
-							case FProp(_, _, _, _): throw "FProp is invalid for TDEnum.";
-							case FFun(func): field.name + printFunction(func);
-						}) + ";"
-					].join("\n")
+					"enum "
+					+ t.name
+					+ ((t.params != null && t.params.length > 0) ? "<" + t.params.map(printTypeParamDecl).join(", ") + ">" : "")
+					+ " {\n"
+					+ [
+						for (field in t.fields)
+							tabs
+							+ (field.doc != null
+								&& field.doc != "" ? "/**\n"
+									+ tabs
+									+ tabString
+									+ StringTools.replace(field.doc, "\n", "\n" + tabs + tabString)
+									+ "\n"
+									+ tabs
+									+ "**/\n"
+									+ tabs : "")
+							+ (field.meta != null && field.meta.length > 0 ? field.meta.map(printMetadata).join(" ") + " " : "")
+							+ (switch (field.kind) {
+								case FVar(t, _): field.name + opt(t, printComplexType, ":");
+								case FProp(_, _, _, _): throw "FProp is invalid for TDEnum.";
+								case FFun(func): field.name + printFunction(func);
+							})
+							+ ";"].join("\n")
 					+ "\n}";
 				case TDStructure:
-					"typedef " + t.name + ((t.params != null && t.params.length > 0) ? "<" + t.params.map(printTypeParamDecl).join(", ") + ">" : "") + " = {\n"
-					+ [for (f in t.fields) {
-						tabs + printField(f) + ";";
-					}].join("\n")
-					+ "\n}";
-				case TDClass(superClass, interfaces, isInterface):
-					(isInterface ? "interface " : "class ") + t.name + (t.params != null && t.params.length > 0 ? "<" + t.params.map(printTypeParamDecl).join(", ") + ">" : "")
-					+ (superClass != null ? " extends " + printTypePath(superClass) : "")
-					+ (interfaces != null ? (isInterface ? [for (tp in interfaces) " extends " + printTypePath(tp)] : [for (tp in interfaces) " implements " + printTypePath(tp)]).join("") : "")
-					+ " {\n"
-					+ [for (f in t.fields) {
-						tabs + printFieldWithDelimiter(f);
-					}].join("\n")
+					"typedef "
+					+ t.name
+					+ ((t.params != null && t.params.length > 0) ? "<" + t.params.map(printTypeParamDecl).join(", ") + ">" : "")
+					+ " = {\n"
+					+ [
+						for (f in t.fields) {
+							tabs + printField(f) + ";";
+						}
+					].join("\n")
 					+ "\n}";
+				case TDClass(superClass, interfaces, isInterface, isFinal):
+					(isFinal ? "final " : "")
+						+ (isInterface ? "interface " : "class ")
+						+ t.name
+						+ (t.params != null && t.params.length > 0 ? "<" + t.params.map(printTypeParamDecl).join(", ") + ">" : "")
+						+ (superClass != null ? " extends " + printTypePath(superClass) : "")
+						+ (interfaces != null ? (isInterface ? [for (tp in interfaces) " extends " + printTypePath(tp)] : [
+							for (tp in interfaces)
+								" implements " + printTypePath(tp)
+						]).join("") : "")
+						+ " {\n"
+						+ [
+							for (f in t.fields) {
+								tabs + printFieldWithDelimiter(f);
+							}
+						].join("\n")
+						+ "\n}";
 				case TDAlias(ct):
-					"typedef " + t.name + ((t.params != null && t.params.length > 0) ? "<" + t.params.map(printTypeParamDecl).join(", ") + ">" : "") + " = "
-					+ (switch(ct) {
+					"typedef "
+					+ t.name
+					+ ((t.params != null && t.params.length > 0) ? "<" + t.params.map(printTypeParamDecl).join(", ") + ">" : "")
+					+ " = "
+					+ (switch (ct) {
 						case TExtend(tpl, fields): printExtension(tpl, fields);
 						case TAnonymous(fields): printStructure(fields);
 						case _: printComplexType(ct);
 					})
 					+ ";";
 				case TDAbstract(tthis, from, to):
-					"abstract " + t.name
+					"abstract "
+					+ t.name
 					+ ((t.params != null && t.params.length > 0) ? "<" + t.params.map(printTypeParamDecl).join(", ") + ">" : "")
 					+ (tthis == null ? "" : "(" + printComplexType(tthis) + ")")
 					+ (from == null ? "" : [for (f in from) " from " + printComplexType(f)].join(""))
 					+ (to == null ? "" : [for (t in to) " to " + printComplexType(t)].join(""))
 					+ " {\n"
-					+ [for (f in t.fields) {
-						tabs + printFieldWithDelimiter(f);
-					}].join("\n")
+					+ [
+						for (f in t.fields) {
+							tabs + printFieldWithDelimiter(f);
+						}
+					].join("\n")
 					+ "\n}";
-			}
+			} tabs = old;
 
-		tabs = old;
 		return str;
 	}
 
-	function printFieldWithDelimiter(f:Field):String
-	{
-		return printField(f) + switch(f.kind) {
+	function printFieldWithDelimiter(f:Field):String {
+		return printField(f) + switch (f.kind) {
 			case FVar(_, _), FProp(_, _, _, _): ";";
-			case FFun({expr:null}): ";";
-			case FFun({expr:{expr:EBlock(_)}}): "";
+			case FFun({expr: null}): ";";
+			case FFun({expr: {expr: EBlock(_)}}): "";
 			case FFun(_): ";";
 			case _: "";
 		};
 	}
 
-	function opt<T>(v:T, f:T->String, prefix = "") return v == null ? "" : (prefix + f(v));
+	function opt<T>(v:T, f:T->String, prefix = "")
+		return v == null ? "" : (prefix + f(v));
+
+	public function printExprWithPositions(e:Expr) {
+		var buffer = new StringBuf();
+		function format4(i:Int) {
+			return StringTools.lpad(Std.string(i), " ", 4);
+		}
+		function loop(tabs:String, e:Expr) {
+			function add(s:String, ?p = null) {
+				if (p == null) {
+					p = e.pos;
+				}
+				var p = #if macro haxe.macro.Context.getPosInfos(p) #else e.pos #end;
+				buffer.add('${format4(p.min)}-${format4(p.max)} $tabs$s\n');
+			}
+			function loopI(e:Expr)
+				loop(tabs + tabString, e);
+			switch (e.expr) {
+				case EConst(c):
+					add(printConstant(c));
+				case EArray(e1, e2):
+					add("EArray");
+					loopI(e1);
+					loopI(e2);
+				case EBinop(op, e1, e2):
+					add("EBinop " + printBinop(op));
+					loopI(e1);
+					loopI(e2);
+				case EField(e, field):
+					add("EField " + field);
+					loopI(e);
+				case EParenthesis(e):
+					add("EParenthesis");
+					loopI(e);
+				case EObjectDecl(fields):
+					add("EObjectDecl");
+					for (field in fields) {
+						add(field.field); // TODO: we don't have the field pos?
+						loopI(field.expr);
+					}
+				case EArrayDecl(values):
+					add("EArrayDecl");
+					values.iter(loopI);
+				case ECall(e, params):
+					add("ECall");
+					loopI(e);
+					params.iter(loopI);
+				case ENew(tp, params):
+					add("ENew " + printTypePath(tp));
+					params.iter(loopI);
+				case EUnop(op, postFix, e):
+					add("EUnop " + printUnop(op));
+					loopI(e);
+				case EVars(vars):
+					add("EVars");
+					for (v in vars) {
+						if (v.expr != null) {
+							add(v.name);
+							loopI(v.expr);
+						}
+					}
+				case EFunction(_, f):
+					add("EFunction");
+					if (f.expr != null) {
+						loopI(f.expr);
+					}
+				case EBlock(exprs):
+					add("EBlock");
+					exprs.iter(loopI);
+				case EFor(it, expr):
+					add("EFor");
+					loopI(it);
+					loopI(expr);
+				case EIf(econd, eif, eelse):
+					add("EIf");
+					loopI(econd);
+					loopI(eif);
+					if (eelse != null) {
+						loopI(eelse);
+					}
+				case EWhile(econd, e, normalWhile):
+					add("EWhile");
+					loopI(econd);
+					loopI(e);
+				case ESwitch(e, cases, edef):
+					add("ESwitch");
+					loopI(e);
+					for (c in cases) {
+						for (pat in c.values) {
+							loop(tabs + tabString + tabString, pat);
+						}
+						if (c.expr != null) {
+							loop(tabs + tabString + tabString + tabString, c.expr);
+						}
+					}
+					if (edef != null) {
+						loop(tabs + tabString + tabString + tabString, edef);
+					}
+				case ETry(e, catches):
+					add("ETry");
+					loopI(e);
+					for (c in catches) {
+						loop(tabs + tabString + tabString, c.expr);
+					}
+				case EReturn(e):
+					add("EReturn");
+					if (e != null) {
+						loopI(e);
+					}
+				case EBreak:
+					add("EBreak");
+				case EContinue:
+					add("EContinue");
+				case EUntyped(e):
+					add("EUntyped");
+					loopI(e);
+				case EThrow(e):
+					add("EThrow");
+					loopI(e);
+				case ECast(e, t):
+					add("ECast");
+					loopI(e);
+				case EDisplay(e, displayKind):
+					add("EDisplay");
+					loopI(e);
+				case EDisplayNew(t):
+					add("EDisplayNew");
+				case ETernary(econd, eif, eelse):
+					add("ETernary");
+					loopI(econd);
+					loopI(eif);
+					loopI(eelse);
+				case ECheckType(e, t):
+					add("ECheckType");
+					loopI(e);
+				case EMeta(s, e):
+					add("EMeta " + printMetadata(s));
+					loopI(e);
+			}
+		}
+		loop("", e);
+		return buffer.toString();
+	}
 }
diff --git a/std/haxe/macro/Tools.hx b/std/haxe/macro/Tools.hx
index 56d1e4f5dcc775d9318c68720ac44091f24c147e..89f8beb5a091aedc9f5a712d2de3e8dc9533760a 100644
--- a/std/haxe/macro/Tools.hx
+++ b/std/haxe/macro/Tools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.macro;
 
 /**
@@ -31,8 +32,8 @@ package haxe.macro;
 	- `haxe.macro.MacroStringTools`
 	- `haxe.macro.TypedExprTools`
 	- `haxe.macro.PositionTools`
-  
-  @see <https://haxe.org/manual/lf-static-extension.html>
+
+	  @see <https://haxe.org/manual/lf-static-extension.html>
 **/
 @:dox(hide)
 typedef TExprTools = ExprTools;
diff --git a/std/haxe/macro/Type.hx b/std/haxe/macro/Type.hx
index 9c8bf976bea865f2d0d518947519159afc4009a3..85e4f9cc8cf19b61d8ffd5191929148365e5a39c 100644
--- a/std/haxe/macro/Type.hx
+++ b/std/haxe/macro/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,103 +19,104 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.macro;
 
 /*
-    Warning: Some of these types correspond to compiler-internal data structures
-    and might change in minor Haxe releases in order to adapt to internal changes.
-*/
-
+	Warning: Some of these types correspond to compiler-internal data structures
+	and might change in minor Haxe releases in order to adapt to internal changes.
+ */
 /**
 	Represents a reference to internal compiler structure. It exists to avoid
 	expensive encoding if it is not required and to ensure that physical
 	equality remains intact.
 
 	A structure is only encoded when user requests it through `ref.get()`.
-*/
+ */
 typedef Ref<T> = {
-	public function get() : T;
-	public function toString() : String;
+	public function get():T;
+	public function toString():String;
 }
 
 /**
 	Represents a type.
-*/
+ */
 enum Type {
 	/**
 		Represents a monomorph.
 
 		@see https://haxe.org/manual/types-monomorph.html
 	**/
-	TMono( t : Ref<Null<Type>> );
+	TMono(t:Ref<Null<Type>>);
 
 	/**
 		Represents an enum instance.
 
 		@see https://haxe.org/manual/types-enum-instance.html
 	**/
-	TEnum( t : Ref<EnumType>, params : Array<Type> );
+	TEnum(t:Ref<EnumType>, params:Array<Type>);
 
 	/**
 		Represents a class instance.
 
 		@see https://haxe.org/manual/types-class-instance.html
 	**/
-	TInst( t : Ref<ClassType>, params : Array<Type> );
+	TInst(t:Ref<ClassType>, params:Array<Type>);
 
 	/**
 		Represents a typedef.
 
 		@see https://haxe.org/manual/type-system-typedef.html
 	**/
-	TType( t : Ref<DefType>, params : Array<Type> );
+	TType(t:Ref<DefType>, params:Array<Type>);
 
 	/**
 		Represents a function type.
 
 		@see https://haxe.org/manual/types-function.html
 	**/
-	TFun( args : Array<{ name : String, opt : Bool, t : Type }>, ret : Type );
+	TFun(args:Array<{name:String, opt:Bool, t:Type}>, ret:Type);
 
 	/**
 		Represents an anonymous structure type.
 
 		@see https://haxe.org/manual/types-anonymous-structure.html
 	**/
-	TAnonymous( a : Ref<AnonType> );
+	TAnonymous(a:Ref<AnonType>);
 
 	/**
 		Represents Dynamic.
 
 		@see https://haxe.org/manual/types-dynamic.html
 	**/
-	TDynamic( t : Null<Type> );
+	TDynamic(t:Null<Type>);
 
 	/**
 		Used internally by the compiler to delay some typing.
 	**/
-	TLazy( f : Void -> Type );
+	TLazy(f:Void->Type);
 
 	/**
 		Represents an abstract type.
 
 		@see https://haxe.org/manual/types-abstract.html
 	**/
-	TAbstract( t : Ref<AbstractType>, params : Array<Type> );
+	TAbstract(t:Ref<AbstractType>, params:Array<Type>);
 }
 
 /**
 	Represents information for anonymous structure types.
-*/
+ */
 typedef AnonType = {
 	/**
 		The class fields of the structure.
 	**/
-	var fields : Array<ClassField>;
+	var fields:Array<ClassField>;
+
 	/**
 		The status/kind of the structure.
 	**/
-	var status : AnonStatus;
+	var status:AnonStatus;
 }
 
 /**
@@ -147,140 +148,149 @@ enum AnonStatus {
 
 		@see https://haxe.org/manual/type-system-extensions.html
 	**/
-	AExtend( tl:Ref<Array<Type>> );
+	AExtend(tl:Ref<Array<Type>>);
 
 	/**
 		A structure that represents the static fields of a class.
 	**/
-	AClassStatics( t : Ref<ClassType> );
+	AClassStatics(t:Ref<ClassType>);
 
 	/**
 		A structure that represents the constructors of an enum.
 	**/
-	AEnumStatics( t : Ref<EnumType> );
+	AEnumStatics(t:Ref<EnumType>);
 
 	/**
 		A structure that represents the static fields of an abstract.
 	**/
-	AAbstractStatics( t : Ref<AbstractType> );
+	AAbstractStatics(t:Ref<AbstractType>);
 }
 
 /**
 	Represents the declaration of type parameters.
-*/
+ */
 typedef TypeParameter = {
 	/**
 		The name of the type parameter.
 	**/
-	var name: String;
+	var name:String;
 
 	/**
 		The type of the type parameter. It is guaranteed to be a `TInst` with a
 		`KTypeParameter` kind.
 	**/
-	var t: Type;
+	var t:Type;
 }
 
 /**
 	Represents a class field.
-*/
+ */
 typedef ClassField = {
 	/**
 		The name of the class field.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		The type of the class field.
 	**/
-	var type : Type;
+	var type:Type;
 
 	/**
 		Whether or not the class field is public.
 	**/
-	var isPublic : Bool;
+	var isPublic:Bool;
+
+	/**
+		Whether or not the class field is extern.
+	**/
+	var isExtern:Bool;
+
+	/**
+		Whether or not the class field is final.
+	**/
+	var isFinal:Bool;
 
 	/**
 		The type parameters of the class field.
 	**/
-	var params : Array<TypeParameter>;
+	var params:Array<TypeParameter>;
 
 	/**
 		The metadata of the class field.
 	**/
-	var meta : MetaAccess;
+	var meta:MetaAccess;
 
 	/**
 		The class field kind.
 	**/
-	var kind : FieldKind;
+	var kind:FieldKind;
 
 	/**
 		Returns the typed expression of the class field.
 	**/
-	function expr() : Null<TypedExpr>;
+	function expr():Null<TypedExpr>;
 
 	/**
 		The position of the class field.
 	**/
-	var pos : Expr.Position;
+	var pos:Expr.Position;
 
 	/**
 		The associated documentation of the class field.
 	**/
-	var doc : Null<String>;
+	var doc:Null<String>;
 
 	/**
 		The overload fields of the class field.
 	**/
-	var overloads : Ref<Array<ClassField>>;
+	var overloads:Ref<Array<ClassField>>;
 }
 
 /**
 	Represents an enum constructor.
-*/
+ */
 typedef EnumField = {
 	/**
 		The name of the enum constructor.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		The type of the enum constructor.
 	**/
-	var type : Type;
+	var type:Type;
 
 	/**
 		The position of the enum constructor.
 	**/
-	var pos : Expr.Position;
+	var pos:Expr.Position;
 
 	/**
 		The metadata of the enum constructor.
 	**/
-	var meta : MetaAccess;
+	var meta:MetaAccess;
 
 	/**
 		The index of the enum constructor, i.e. in which position it appears
 		in the syntax.
 	**/
-	var index : Int;
+	var index:Int;
 
 	/**
 		The associated documentation of the enum constructor.
 	**/
-	var doc : Null<String>;
+	var doc:Null<String>;
 
 	/**
 		The type parameters of the enum constructor.
 	**/
-	var params : Array<TypeParameter>;
+	var params:Array<TypeParameter>;
 }
 
-
 /**
 	Represents the kind of a class.
-*/
+ */
 enum ClassKind {
 	/**
 		A normal class.
@@ -342,180 +352,189 @@ typedef BaseType = {
 	/**
 		The package of the type.
 	**/
-	var pack : Array<String>;
+	var pack:Array<String>;
 
 	/**
 		The name of the type.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		The module name of the type, which might be different.
 	**/
-	var module : String;
+	var module:String;
 
 	/**
 		The position of the type.
 	**/
-	var pos : Expr.Position;
+	var pos:Expr.Position;
 
 	/**
 		Whether or not the type is private.
 	**/
-	var isPrivate : Bool;
+	var isPrivate:Bool;
 
 	/**
 		Whether or not the type is extern.
 	**/
-	var isExtern : Bool;
+	var isExtern:Bool;
 
 	/**
 		The type parameters of the type.
 	**/
-	var params : Array<TypeParameter>;
+	var params:Array<TypeParameter>;
 
 	/**
 		The metadata of the type.
 	**/
-	var meta : MetaAccess;
+	var meta:MetaAccess;
 
 	/**
 		The associated documentation of the class field.
 	**/
-	var doc : Null<String>;
+	var doc:Null<String>;
 
 	/**
 		Allows excluding the type from compilation.
 	**/
-	function exclude() : Void;
+	function exclude():Void;
 }
 
 /**
 	Represents a class type.
-*/
-typedef ClassType = {> BaseType,
+ */
+typedef ClassType = BaseType & {
 	/**
 		The kind of the class.
 	**/
-	var kind : ClassKind;
+	var kind:ClassKind;
 
 	/**
 		If true the type is an interface, otherwise it is a class.
 	**/
-	var isInterface : Bool;
+	var isInterface:Bool;
+
+	/**
+		If true the class is final and cannot be extended.
+	**/
+	var isFinal:Bool;
 
 	/**
 		The parent class and its type parameters, if available.
 	**/
-	var superClass : Null<{ t : Ref<ClassType>, params : Array<Type> }>;
+	var superClass:Null<{t:Ref<ClassType>, params:Array<Type>}>;
 
 	/**
 		The implemented interfaces and their type parameters.
 	**/
-	var interfaces : Array<{ t : Ref<ClassType>, params : Array<Type> }>;
+	var interfaces:Array<{t:Ref<ClassType>, params:Array<Type>}>;
 
 	/**
 		The member fields of the class.
 	**/
-	var fields : Ref<Array<ClassField>>;
+	var fields:Ref<Array<ClassField>>;
 
 	/**
 		The static fields of the class.
 	**/
-	var statics : Ref<Array<ClassField>>;
+	var statics:Ref<Array<ClassField>>;
 
-	//var dynamic : Null<Type>;
-	//var arrayAccess : Null<Type>;
+	// var dynamic : Null<Type>;
+	// var arrayAccess : Null<Type>;
 
 	/**
 		The constructor of the class, if available.
 	**/
-	var constructor : Null<Ref<ClassField>>;
+	var constructor:Null<Ref<ClassField>>;
 
 	/**
 		The `__init__` expression of the class, if available.
 	**/
-	var init : Null<TypedExpr>;
+	var init:Null<TypedExpr>;
 
 	/**
 		The list of fields that have override status.
 	**/
-	var overrides : Array<Ref<ClassField>>;
+	var overrides:Array<Ref<ClassField>>;
 }
 
 /**
 	Represents an enum type.
-*/
-typedef EnumType = {> BaseType,
+ */
+typedef EnumType = BaseType & {
 	/**
 		The available enum constructors.
 	**/
-	var constructs : Map<String, EnumField>;
+	var constructs:Map<String, EnumField>;
 
 	/**
 		An ordered list of enum constructor names.
 	**/
-	var names : Array<String>;
+	var names:Array<String>;
 }
 
 /**
 	Represents a typedef.
-*/
-typedef DefType = {> BaseType,
+ */
+typedef DefType = BaseType & {
 	/**
 		The target type of the typedef.
 	**/
-	var type : Type;
+	var type:Type;
 }
 
 /**
 	Represents an abstract type.
-*/
-typedef AbstractType = {>BaseType,
+ */
+typedef AbstractType = BaseType & {
 	/**
 		The underlying type of the abstract.
 	**/
-	var type : Type;
+	var type:Type;
 
 	/**
 		The implementation class of the abstract, if available.
 	**/
-	var impl : Null<Ref<ClassType>>;
+	var impl:Null<Ref<ClassType>>;
 
 	/**
 		The defined binary operators of the abstract.
 	**/
-	var binops : Array<{op:Expr.Binop, field:ClassField}>;
+	var binops:Array<{op:Expr.Binop, field:ClassField}>;
 
 	/**
 		The defined unary operators of the abstract.
 	**/
-	var unops : Array<{op:Expr.Unop, postFix:Bool, field:ClassField}>;
+	var unops:Array<{op:Expr.Unop, postFix:Bool, field:ClassField}>;
 
 	/**
 		The available implicit from-casts of the abstract.
 
 		@see https://haxe.org/manual/types-abstract-implicit-casts.html
 	**/
-	var from : Array<{t:Type, field:Null<ClassField>}>;
+	var from:Array<{t:Type, field:Null<ClassField>}>;
 
 	/**
 		The available implicit to-casts of the abstract.
 
 		@see https://haxe.org/manual/types-abstract-implicit-casts.html
 	**/
-	var to : Array<{t:Type, field:Null<ClassField>}>;
+	var to:Array<{t:Type, field:Null<ClassField>}>;
 
 	/**
 		The defined array-access fields of the abstract.
 	**/
-	var array : Array<ClassField>;
+	var array:Array<ClassField>;
 
 	/**
 		The method used for resolving unknown field access, if available.
 	**/
-	@:require(haxe_ver >= 3.3)
-	var resolve : Null<ClassField>;
+	var resolve:Null<ClassField>;
+
+	/**
+		The method used for resolving unknown field access, if available.
+	**/
+	var resolveWrite:Null<ClassField>;
 }
 
 /**
@@ -529,7 +548,7 @@ typedef MetaAccess = {
 		Modifying this array has no effect on the origin of `this` MetaAccess.
 		The `add` and `remove` methods can be used for that.
 	**/
-	function get() : Expr.Metadata;
+	function get():Expr.Metadata;
 
 	/**
 		Extract metadata entries by given `name`.
@@ -538,7 +557,7 @@ typedef MetaAccess = {
 
 		If `name` is null, compilation fails with an error.
 	**/
-	function extract( name : String ) : Array<Expr.MetadataEntry>;
+	function extract(name:String):Array<Expr.MetadataEntry>;
 
 	/**
 		Adds the metadata specified by `name`, `params` and `pos` to the origin
@@ -552,7 +571,7 @@ typedef MetaAccess = {
 
 		If any argument is null, compilation fails with an error.
 	**/
-	function add( name : String, params : Array<Expr>, pos : Expr.Position ) : Void;
+	function add(name:String, params:Array<Expr>, pos:Expr.Position):Void;
 
 	/**
 		Removes all `name` metadata entries from the origin of `this`
@@ -565,34 +584,34 @@ typedef MetaAccess = {
 
 		If `name` is null, compilation fails with an error.
 	**/
-	function remove( name : String ) : Void;
+	function remove(name:String):Void;
 
 	/**
 		Tells if the origin of `this` MetaAccess has a `name` metadata entry.
 
 		If `name` is null, compilation fails with an error.
 	**/
-	function has( name : String ) : Bool;
+	function has(name:String):Bool;
 }
 
 /**
 	Represents a field kind.
-*/
+ */
 enum FieldKind {
 	/**
 		A variable of property, depending on the `read` and `write` values.
 	**/
-	FVar( read : VarAccess, write : VarAccess );
+	FVar(read:VarAccess, write:VarAccess);
 
 	/**
 		A method
 	**/
-	FMethod( k : MethodKind );
+	FMethod(k:MethodKind);
 }
 
 /**
 	Represents the variable accessor.
-*/
+ */
 enum VarAccess {
 	/**
 		Normal access (`default`).
@@ -627,12 +646,17 @@ enum VarAccess {
 	/**
 		Failed access due to a `@:require` metadata.
 	**/
-	AccRequire( r : String, ?msg : String );
+	AccRequire(r:String, ?msg:String);
+
+	/**
+		Access is only allowed from the constructor.
+	**/
+	AccCtor;
 }
 
 /**
 	Represents the method kind.
-*/
+ */
 enum MethodKind {
 	/**
 		A normal method.
@@ -661,7 +685,7 @@ enum MethodKind {
 
 /**
 	Represents typed constant.
-*/
+ */
 enum TConstant {
 	/**
 		An `Int` literal.
@@ -701,7 +725,7 @@ enum TConstant {
 
 /**
 	Represents a variable in the typed AST.
-*/
+ */
 typedef TVar = {
 	/**
 		The unique ID of the variable.
@@ -727,18 +751,18 @@ typedef TVar = {
 		Special information which is internally used to keep track of closure.
 		information
 	**/
-	public var extra(default,never):Null<{params: Array<TypeParameter>, expr: Null<TypedExpr>}>;
+	public var extra(default, never):Null<{params:Array<TypeParameter>, expr:Null<TypedExpr>}>;
 
 	/**
 		The metadata of the variable.
 	**/
-	public var meta(default,never):Null<MetaAccess>;
+	public var meta(default, never):Null<MetaAccess>;
 }
 
 /**
 	Represents a module type. These are the types that can be declared in a Haxe
 	module and which are passed to the generators (except `TTypeDecl`).
-*/
+ */
 enum ModuleType {
 	/**
 		A class.
@@ -763,28 +787,28 @@ enum ModuleType {
 
 /**
 	Represents a function in the typed AST.
-*/
+ */
 typedef TFunc = {
 	/**
 		A list of function arguments identified by an argument variable `v` and
 		an optional initialization `value`.
 	**/
-	var args: Array<{v:TVar, value:Null<TConstant>}>;
+	var args:Array<{v:TVar, value:Null<TypedExpr>}>;
 
 	/**
 		The return type of the function.
 	**/
-	var t: Type;
+	var t:Type;
 
 	/**
 		The expression of the function body.
 	**/
-	var expr: TypedExpr;
+	var expr:TypedExpr;
 }
 
 /**
 	Represents the kind of field access in the typed AST.
-*/
+ */
 enum FieldAccess {
 	/**
 		Access of field `cf` on a class instance `c` with type parameters
@@ -821,7 +845,7 @@ enum FieldAccess {
 
 /**
 	Represents kind of a node in the typed AST.
-*/
+ */
 enum TypedExprDef {
 	/**
 		A constant.
@@ -841,7 +865,6 @@ enum TypedExprDef {
 	/**
 		Binary operator `e1 op e2`.
 	**/
-
 	TBinop(op:Expr.Binop, e1:TypedExpr, e2:TypedExpr);
 
 	/**
@@ -877,7 +900,7 @@ enum TypedExprDef {
 	/**
 		A constructor call `new c<params>(el)`.
 	**/
-	TNew(c:Ref<ClassType>, params: Array<Type>, el:Array<TypedExpr>);
+	TNew(c:Ref<ClassType>, params:Array<Type>, el:Array<TypedExpr>);
 
 	/**
 		An unary operator `op` on `e`:
@@ -969,24 +992,34 @@ enum TypedExprDef {
 		Access to an enum parameter (generated by the pattern matcher).
 	**/
 	TEnumParameter(e1:TypedExpr, ef:EnumField, index:Int);
+
+	/**
+		Access to an enum index (generated by the pattern matcher).
+	**/
+	TEnumIndex(e1:TypedExpr);
+
+	/**
+		An unknown identifier.
+	**/
+	TIdent(s:String);
 }
 
 /**
 	Represents a typed AST node.
-*/
+ */
 typedef TypedExpr = {
 	/**
 		The expression kind.
 	**/
-	var expr: TypedExprDef;
+	var expr:TypedExprDef;
 
 	/**
 		The position of the expression.
 	**/
-	var pos: Expr.Position;
+	var pos:Expr.Position;
 
 	/**
 		The type of the expression.
 	**/
-	var t: Type;
+	var t:Type;
 }
diff --git a/std/haxe/macro/TypeTools.hx b/std/haxe/macro/TypeTools.hx
index 6bcd4e50bb009778f43be8bce4563b60bab4164b..eadf70149416a7685939632d994e9853770562f1 100644
--- a/std/haxe/macro/TypeTools.hx
+++ b/std/haxe/macro/TypeTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,54 +37,57 @@ using Lambda;
 @:hlNative("macro")
 #end
 class TypeTools {
-
-	static function nullable(complexType : ComplexType) : ComplexType return macro : Null<$complexType>;
-
-	static function toField(cf : ClassField) : Field return {
-		function varAccessToString(va : VarAccess, getOrSet : String) : String return {
-			switch (va) {
-				case AccNormal: "default";
-				case AccNo: "null";
-				case AccNever: "never";
-				case AccResolve: throw "Invalid TAnonymous";
-				case AccCall: getOrSet;
-				case AccInline: "default";
-				case AccRequire(_, _): "default";
+	static function nullable(complexType:ComplexType):ComplexType
+		return macro:Null<$complexType>;
+
+	static function toField(cf:ClassField):Field
+		return {
+			function varAccessToString(va:VarAccess, getOrSet:String):String
+				return {
+					switch (va) {
+						case AccNormal | AccCtor: "default";
+						case AccNo: "null";
+						case AccNever: "never";
+						case AccResolve: throw "Invalid TAnonymous";
+						case AccCall: getOrSet;
+						case AccInline: "default";
+						case AccRequire(_, _): "default";
+					}
+				}
+			var access = cf.isPublic ? [APublic] : [APrivate];
+			if (cf.meta.has(":final")) {
+				access.push(AFinal);
+			}
+			if (cf.params.length == 0)
+				{
+					name: cf.name,
+					doc: cf.doc,
+					access: access,
+					kind: switch ([cf.kind, cf.type]) {
+						case [FVar(read, write), ret]:
+							FProp(varAccessToString(read, "get"), varAccessToString(write, "set"), toComplexType(ret), null);
+						case [FMethod(_), TFun(args, ret)]:
+							FFun({
+								args: [
+									for (a in args)
+										{
+											name: a.name,
+											opt: a.opt,
+											type: toComplexType(a.t),
+										}
+								],
+								ret: toComplexType(ret),
+								expr: null,
+							});
+						default:
+							throw "Invalid TAnonymous";
+					},
+					pos: cf.pos,
+					meta: cf.meta.get(),
+				} else {
+				throw "Invalid TAnonymous";
 			}
 		}
-		if (cf.params.length == 0) {
-			name: cf.name,
-			doc: cf.doc,
-			access: cf.isPublic ? [ APublic ] : [ APrivate ],
-			kind: switch([ cf.kind, cf.type ]) {
-				case [ FVar(read, write), ret ]:
-					FProp(
-						varAccessToString(read, "get"),
-						varAccessToString(write, "set"),
-						toComplexType(ret),
-						null);
-				case [ FMethod(_), TFun(args, ret) ]:
-					FFun({
-						args: [
-							for (a in args) {
-								name: a.name,
-								opt: a.opt,
-								type: toComplexType(a.t),
-							}
-						],
-						ret: toComplexType(ret),
-						expr: null,
-					});
-				default:
-					throw "Invalid TAnonymous";
-			},
-			pos: cf.pos,
-			meta: cf.meta.get(),
-		} else {
-			throw "Invalid TAnonymous";
-		}
-	}
-
 
 	/**
 		Returns a syntax-level type corresponding to Type `t`.
@@ -95,66 +98,71 @@ class TypeTools {
 
 		If `t` is null, an internal exception is thrown.
 	**/
-	public static function toComplexType(type : Null<Type>) : Null<ComplexType> return
-	{
-		#if macro
-		Context.toComplexType(type);
-		#else
-		switch (type) {
-			case null:
-				null;
-			case TMono(_.get() => t):
-				t == null ? null : toComplexType(t);
-			case TEnum(_.get() => baseType, params):
-				TPath(toTypePath(baseType, params));
-			case TInst(_.get() => classType, params):
-				switch (classType.kind) {
-					case KTypeParameter(_):
-						TPath({
-							name: classType.name,
-							pack: [],
-						});
-					default:
-						TPath(toTypePath(classType, params));
-				}
-			case TType(_.get() => baseType, params):
-				TPath(toTypePath(baseType, params));
-			case TFun(args, ret):
-				TFunction(
-					[ for (a in args) a.opt ? nullable(toComplexType(a.t)) : toComplexType(a.t) ],
-					toComplexType(ret));
-			case TAnonymous(_.get() => { fields: fields }):
-				TAnonymous([ for (cf in fields) toField(cf) ]);
-			case TDynamic(t):
-				if (t == null) {
-					macro : Dynamic;
-				} else {
-					var ct = toComplexType(t);
-					macro : Dynamic<$ct>;
-				}
-			case TLazy(f):
-				toComplexType(f());
-			case TAbstract(_.get() => baseType, params):
-				TPath(toTypePath(baseType, params));
-			default:
-				throw "Invalid type";
+	public static function toComplexType(type:Null<Type>):Null<ComplexType>
+		return {
+			#if macro
+			Context.toComplexType(type);
+			#else
+			switch (type) {
+				case null:
+					null;
+				case TMono(_.get() => t):
+					t == null ? null : toComplexType(t);
+				case TEnum(_.get() => baseType, params):
+					TPath(toTypePath(baseType, params));
+				case TInst(_.get() => classType, params):
+					switch (classType.kind) {
+						case KTypeParameter(_):
+							TPath({
+								name: classType.name,
+								pack: [],
+							});
+						default:
+							TPath(toTypePath(classType, params));
+					}
+				case TType(_.get() => baseType, params):
+					TPath(toTypePath(baseType, params));
+				case TFun(args, ret):
+					TFunction([for (a in args) a.opt ? nullable(toComplexType(a.t)) : toComplexType(a.t)], toComplexType(ret));
+				case TAnonymous(_.get() => {fields: fields}):
+					TAnonymous([for (cf in fields) toField(cf)]);
+				case TDynamic(t):
+					if (t == null) {
+						macro:Dynamic;
+					} else {
+						var ct = toComplexType(t);
+						macro:Dynamic<$ct>;
+					}
+				case TLazy(f):
+					toComplexType(f());
+				case TAbstract(_.get() => baseType, params):
+					TPath(toTypePath(baseType, params));
+				default:
+					throw "Invalid type";
+			}
+			#end
 		}
-		#end
-	}
 
-	static function toTypePath(baseType : BaseType, params : Array<Type>) : TypePath return {
-		var module = baseType.module;
-		{
-			pack: baseType.pack,
-			name: module.substring(module.lastIndexOf(".") + 1),
-			sub: baseType.name,
-			params: [ for (t in params) TPType(toComplexType(t)) ],
+	static function toTypeParam(type:Type):TypeParam
+		return {
+			switch (type) {
+				case TInst(_.get() => {kind: KExpr(e)}, _): TPExpr(e);
+				case _: TPType(toComplexType(type));
+			}
 		}
-	}
-
 
-	#if macro
+	static function toTypePath(baseType:BaseType, params:Array<Type>):TypePath
+		return {
+			var module = baseType.module;
+			{
+				pack: baseType.pack,
+				name: module.substring(module.lastIndexOf(".") + 1),
+				sub: baseType.name,
+				params: [for (t in params) toTypeParam(t)],
+			}
+		}
 
+	#if (macro || display)
 	/**
 		Follows all typedefs of `t` to reach the actual type.
 
@@ -173,7 +181,7 @@ class TypeTools {
 			trace(t); // TMono(<mono>)
 			trace(t.follow()); //TInst(String,[])
 	**/
-	static public inline function follow( t : Type, ?once : Bool ) : Type
+	static public inline function follow(t:Type, ?once:Bool):Type
 		return Context.follow(t, once);
 
 	/**
@@ -189,13 +197,13 @@ class TypeTools {
 			trace(t); // TAbstract(Map,[TInst(String,[]),TInst(String,[])])
 			trace(t.followWithAbstracts()); // TInst(haxe.ds.StringMap, [TInst(String,[])])
 	**/
-	static public inline function followWithAbstracts( t : Type, once : Bool = false ) : Type
+	static public inline function followWithAbstracts(t:Type, once:Bool = false):Type
 		return Context.followWithAbstracts(t, once);
 
 	/**
 		Returns true if `t1` and `t2` unify, false otherwise.
 	**/
-	static public inline function unify( t1 : Type, t2:Type ) : Bool
+	static public inline function unify(t1:Type, t2:Type):Bool
 		return Context.unify(t1, t2);
 
 	/**
@@ -207,10 +215,11 @@ class TypeTools {
 
 		If `t` is null, the result is null.
 	**/
-	static public function getClass( t : Type ) return t == null ? null : switch(follow(t)) {
-		case TInst(c, _): c.get();
-		case _: throw "Class instance expected";
-	}
+	static public function getClass(t:Type)
+		return t == null ? null : switch (follow(t)) {
+			case TInst(c, _): c.get();
+			case _: throw "Class instance expected";
+		}
 
 	/**
 		Tries to extract the enum instance stored inside `t`.
@@ -221,10 +230,11 @@ class TypeTools {
 
 		If `t` is null, the result is null.
 	**/
-	static public function getEnum( t : Type ) return t == null ? null : switch(follow(t)) {
-		case TEnum(e, _): e.get();
-		case _: throw "Enum instance expected";
-	}
+	static public function getEnum(t:Type)
+		return t == null ? null : switch (follow(t)) {
+			case TEnum(e, _): e.get();
+			case _: throw "Enum instance expected";
+		}
 
 	/**
 		Applies the type parameters `typeParameters` to type `t` with the given
@@ -246,7 +256,7 @@ class TypeTools {
 			throw 'Incompatible arguments: ${typeParameters.length} type parameters and ${concreteTypes.length} concrete types';
 		else if (typeParameters.length == 0)
 			return t;
-		#if neko
+		#if (neko || eval)
 		return Context.load("apply_params", 3)(typeParameters, concreteTypes, t);
 		#else
 		return applyParams(typeParameters, concreteTypes, t);
@@ -254,12 +264,11 @@ class TypeTools {
 	}
 
 	#if !neko
-	private static function applyParams( typeParameters:Array<TypeParameter>, concreteTypes:Array<Type>, t:Type ) : Type {
+	private static function applyParams(typeParameters:Array<TypeParameter>, concreteTypes:Array<Type>, t:Type):Type {
 		return null;
 	}
 	#end
 
-
 	/**
 		Transforms `t` by calling `f` on each of its subtypes.
 
@@ -274,12 +283,12 @@ class TypeTools {
 
 		If `t` or `f` are null, the result is unspecified.
 	**/
-	static public function map(t:Type, f:Type -> Type):Type {
-		return switch(t) {
+	static public function map(t:Type, f:Type->Type):Type {
+		return switch (t) {
 			case TMono(tm):
-				switch(tm.get()) {
+				switch (tm.get()) {
 					case null: t;
-					case t: f(t);
+					case var t: f(t);
 				}
 			case TEnum(_, []) | TInst(_, []) | TType(_, []):
 				t;
@@ -320,21 +329,26 @@ class TypeTools {
 
 		If `t` or `f` are null, the result is unspecified.
 	**/
-	static public function iter(t:Type, f:Type -> Void):Void {
+	static public function iter(t:Type, f:Type->Void):Void {
 		switch (t) {
 			case TMono(tm):
 				var t = tm.get();
-				if (t != null) f(t);
+				if (t != null)
+					f(t);
 			case TEnum(_, tl) | TInst(_, tl) | TType(_, tl) | TAbstract(_, tl):
-				for (t in tl) f(t);
+				for (t in tl)
+					f(t);
 			case TDynamic(t2):
-				if (t != t2) f(t2);
+				if (t != t2)
+					f(t2);
 			case TLazy(ft):
 				f(ft());
 			case TAnonymous(an):
-				for (field in an.get().fields) f(field.type);
+				for (field in an.get().fields)
+					f(field.type);
 			case TFun(args, ret):
-				for (arg in args) f(arg.t);
+				for (arg in args)
+					f(arg.t);
 				f(ret);
 		}
 	}
@@ -342,14 +356,13 @@ class TypeTools {
 	/**
 		Converts type `t` to a human-readable String representation.
 	**/
-	static public function toString( t : Type ) : String {
-		#if neko
+	static public function toString(t:Type):String {
+		#if (neko || eval)
 		return Context.load("s_type", 1)(t);
 		#else
 		return null;
 		#end
 	}
-
 	#end
 
 	/**
@@ -366,8 +379,6 @@ class TypeTools {
 	**/
 	static public function findField(c:ClassType, name:String, isStatic:Bool = false):Null<ClassField> {
 		var field = (isStatic ? c.statics : c.fields).get().find(function(field) return field.name == name);
-		return if(field != null) field;
-			else if (c.superClass != null) findField(c.superClass.t.get(), name, isStatic);
-			else null;
+		return if (field != null) field; else if (c.superClass != null) findField(c.superClass.t.get(), name, isStatic); else null;
 	}
 }
diff --git a/std/haxe/macro/TypedExprTools.hx b/std/haxe/macro/TypedExprTools.hx
index b2a2c88dd5708e43cb48816acb64cbc4a84894ac..d0f81bf5dbc5cbb0d78b1ae86e49fbd4bc935c9c 100644
--- a/std/haxe/macro/TypedExprTools.hx
+++ b/std/haxe/macro/TypedExprTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -45,28 +45,30 @@ class TypedExprTools {
 		general. This function works the same way, but with a different data
 		structure.
 	**/
-	static public function map(e:TypedExpr, f:TypedExpr -> TypedExpr):TypedExpr {
-		return switch(e.expr) {
-			case TConst(_) | TLocal(_) | TBreak | TContinue | TTypeExpr(_): e;
+	static public function map(e:TypedExpr, f:TypedExpr->TypedExpr):TypedExpr {
+		return switch (e.expr) {
+			case TConst(_) | TLocal(_) | TBreak | TContinue | TTypeExpr(_) | TIdent(_): e;
 			case TArray(e1, e2): with(e, TArray(f(e1), f(e2)));
 			case TBinop(op, e1, e2): with(e, TBinop(op, f(e1), f(e2)));
 			case TFor(v, e1, e2): with(e, TFor(v, f(e1), f(e2)));
 			case TWhile(e1, e2, flag): with(e, TWhile(f(e1), f(e2), flag));
 			case TThrow(e1): with(e, TThrow(f(e1)));
 			case TEnumParameter(e1, ef, i): with(e, TEnumParameter(f(e1), ef, i));
+			case TEnumIndex(e1): with(e, TEnumIndex(f(e1)));
 			case TField(e1, fa): with(e, TField(f(e1), fa));
 			case TParenthesis(e1): with(e, TParenthesis(f(e1)));
 			case TUnop(op, pre, e1): with(e, TUnop(op, pre, f(e1)));
 			case TArrayDecl(el): with(e, TArrayDecl(el.map(f)));
 			case TNew(t, pl, el): with(e, TNew(t, pl, el.map(f)));
 			case TBlock(el): with(e, TBlock(el.map(f)));
-			case TObjectDecl(fl): with(e, TObjectDecl(fl.map(function(field) return { name: field.name, expr: f(field.expr) })));
+			case TObjectDecl(fl): with(e, TObjectDecl(fl.map(function(field) return {name: field.name, expr: f(field.expr)})));
 			case TCall(e1, el): with(e, TCall(f(e1), el.map(f)));
-			case TVar(v,eo): with(e, TVar(v, eo == null ? null : f(eo)));
-			case TFunction(fu): with(e, TFunction({ t: fu.t, args: fu.args, expr: f(fu.expr)}));
+			case TVar(v, eo): with(e, TVar(v, eo == null ? null : f(eo)));
+			case TFunction(fu): with(e, TFunction({t: fu.t, args: fu.args, expr: f(fu.expr)}));
 			case TIf(e1, e2, e3): with(e, TIf(f(e1), f(e2), e3 == null ? null : f(e3)));
-			case TSwitch(e1, cases, e2): with(e, TSwitch(f(e1), cases.map(function(c) return { values: c.values.map(f), expr: f(c.expr) }), e2 == null ? null : f(e2)));
-			case TTry(e1, catches): with(e, TTry(f(e1), catches.map(function(c) return { v:c.v, expr: f(c.expr) })));
+			case TSwitch(e1, cases,
+				e2): with(e, TSwitch(f(e1), cases.map(function(c) return {values: c.values.map(f), expr: f(c.expr)}), e2 == null ? null : f(e2)));
+			case TTry(e1, catches): with(e, TTry(f(e1), catches.map(function(c) return {v: c.v, expr: f(c.expr)})));
 			case TReturn(e1): with(e, TReturn(e1 == null ? null : f(e1)));
 			case TCast(e1, mt): with(e, TCast(f(e1), mt));
 			case TMeta(m, e1): with(e, TMeta(m, f(e1)));
@@ -80,39 +82,47 @@ class TypedExprTools {
 		general. This function works the same way, but with a different data
 		structure.
 	**/
-	static public function iter(e:TypedExpr, f:TypedExpr -> Void):Void {
-		switch(e.expr) {
-			case TConst(_) | TLocal(_) | TBreak | TContinue | TTypeExpr(_):
+	static public function iter(e:TypedExpr, f:TypedExpr->Void):Void {
+		switch (e.expr) {
+			case TConst(_) | TLocal(_) | TBreak | TContinue | TTypeExpr(_) | TIdent(_):
 			case TArray(e1, e2) | TBinop(_, e1, e2) | TFor(_, e1, e2) | TWhile(e1, e2, _):
 				f(e1);
 				f(e2);
-			case TThrow(e1) | TEnumParameter(e1, _, _) | TField(e1, _) | TParenthesis(e1) | TUnop(_, _, e1) | TCast(e1, _) | TMeta(_, e1):
+			case TThrow(e1) | TEnumParameter(e1, _, _) | TEnumIndex(e1) | TField(e1, _) | TParenthesis(e1) | TUnop(_, _, e1) | TCast(e1, _) | TMeta(_, e1):
 				f(e1);
 			case TArrayDecl(el) | TNew(_, _, el) | TBlock(el):
-				for (e in el) f(e);
+				for (e in el)
+					f(e);
 			case TObjectDecl(fl):
-				for (field in fl) f(field.expr);
+				for (field in fl)
+					f(field.expr);
 			case TCall(e1, el):
 				f(e1);
-				for (e in el) f(e);
+				for (e in el)
+					f(e);
 			case TVar(_, e1) | TReturn(e1):
-				if (e1 != null) f(e1);
+				if (e1 != null)
+					f(e1);
 			case TFunction(fu):
 				f(fu.expr);
 			case TIf(e1, e2, e3):
 				f(e1);
 				f(e2);
-				if (e3 != null) f(e3);
+				if (e3 != null)
+					f(e3);
 			case TSwitch(e1, cases, e2):
 				f(e1);
 				for (c in cases) {
-					for (v in c.values) f(v);
+					for (v in c.values)
+						f(v);
 					f(c.expr);
 				}
-				if (e2 != null) f(e2);
+				if (e2 != null)
+					f(e2);
 			case TTry(e1, catches):
 				f(e1);
-				for (c in catches) f(c.expr);
+				for (c in catches)
+					f(c.expr);
 		}
 	}
 
@@ -125,9 +135,9 @@ class TypedExprTools {
 		general. This function works the same way, but with a different data
 		structure.
 	**/
-	static public function mapWithType(e:TypedExpr, f:TypedExpr -> TypedExpr, ft:Type -> Type, fv:TVar -> TVar):TypedExpr {
-		return switch(e.expr) {
-			case TConst(_) | TBreak | TContinue | TTypeExpr(_): with(e, ft(e.t));
+	static public function mapWithType(e:TypedExpr, f:TypedExpr->TypedExpr, ft:Type->Type, fv:TVar->TVar):TypedExpr {
+		return switch (e.expr) {
+			case TConst(_) | TBreak | TContinue | TTypeExpr(_) | TIdent(_): with(e, ft(e.t));
 			case TLocal(v): with(e, TLocal(fv(v)), ft(e.t));
 			case TArray(e1, e2): with(e, TArray(f(e1), f(e2)), ft(e.t));
 			case TBinop(op, e1, e2): with(e, TBinop(op, f(e1), f(e2)), ft(e.t));
@@ -135,26 +145,29 @@ class TypedExprTools {
 			case TWhile(e1, e2, flag): with(e, TWhile(f(e1), f(e2), flag), ft(e.t));
 			case TThrow(e1): with(e, TThrow(f(e1)), ft(e.t));
 			case TEnumParameter(e1, ef, i): with(e, TEnumParameter(f(e1), ef, i), ft(e.t));
+			case TEnumIndex(e1): with(e, TEnumIndex(f(e1)), ft(e.t));
 			case TField(e1, fa): with(e, TField(f(e1), fa), ft(e.t));
 			case TParenthesis(e1): with(e, TParenthesis(e1), ft(e.t));
 			case TUnop(op, pre, e1): with(e, TUnop(op, pre, f(e1)), ft(e.t));
 			case TArrayDecl(el): with(e, TArrayDecl(el.map(f)), ft(e.t));
 			case TNew(t, pl, el): with(e, TNew(t, pl, el.map(f)), ft(e.t));
 			case TBlock(el): with(e, TBlock(el.map(f)), ft(e.t));
-			case TObjectDecl(fl): with(e, TObjectDecl(fl.map(function(field) return { name: field.name, expr: f(field.expr) })), ft(e.t));
+			case TObjectDecl(fl): with(e, TObjectDecl(fl.map(function(field) return {name: field.name, expr: f(field.expr)})), ft(e.t));
 			case TCall(e1, el): with(e, TCall(f(e1), el.map(f)), ft(e.t));
-			case TVar(v,eo): with(e, TVar(fv(v), eo == null ? null : f(eo)), ft(e.t));
-			case TFunction(fu): with(e, TFunction({ t: ft(fu.t), args: fu.args.map(function(arg) return { v: fv(arg.v), value: arg.value }), expr: f(fu.expr)}), ft(e.t));
+			case TVar(v, eo): with(e, TVar(fv(v), eo == null ? null : f(eo)), ft(e.t));
+			case TFunction(fu): with(e, TFunction({t: ft(fu.t), args: fu.args.map(function(arg) return {v: fv(arg.v), value: arg.value}), expr: f(fu.expr)}),
+					ft(e.t));
 			case TIf(e1, e2, e3): with(e, TIf(f(e1), f(e2), e3 == null ? null : f(e3)), ft(e.t));
-			case TSwitch(e1, cases, e2): with(e, TSwitch(f(e1), cases.map(function(c) return { values: c.values.map(f), expr: f(c.expr) }), e2 == null ? null : f(e2)), ft(e.t));
-			case TTry(e1, catches): with(e, TTry(f(e1), catches.map(function(c) return { v:fv(c.v), expr: f(c.expr) })), ft(e.t));
+			case TSwitch(e1, cases,
+				e2): with(e, TSwitch(f(e1), cases.map(function(c) return {values: c.values.map(f), expr: f(c.expr)}), e2 == null ? null : f(e2)), ft(e.t));
+			case TTry(e1, catches): with(e, TTry(f(e1), catches.map(function(c) return {v: fv(c.v), expr: f(c.expr)})), ft(e.t));
 			case TReturn(e1): with(e, TReturn(e1 == null ? null : f(e1)), ft(e.t));
 			case TCast(e1, mt): with(e, TCast(f(e1), mt), ft(e.t));
 			case TMeta(m, e1): with(e, TMeta(m, f(e1)), ft(e.t));
 		}
 	}
 
-	#if macro
+	#if (macro || display)
 	static public function toString(t:TypedExpr, ?pretty = false):String {
 		return @:privateAccess haxe.macro.Context.sExpr(t, pretty);
 	}
diff --git a/std/haxe/rtti/CType.hx b/std/haxe/rtti/CType.hx
index 175785632192e188efc7da3b4c80965949e79e06..e2e4ecbd4eb22aa696b3828bf9c091c5ab40ee44 100644
--- a/std/haxe/rtti/CType.hx
+++ b/std/haxe/rtti/CType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,35 +19,38 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.rtti;
 
+import haxe.ds.List;
+
 /**
 	The (dot-)path of the runtime type.
 **/
-typedef Path = String
+typedef Path = String;
 
 /**
 	A list of strings representing the targets where the type is available.
 **/
-typedef Platforms = List<String>
+typedef Platforms = Array<String>;
 
 /**
 	The function argument runtime type information.
 **/
-typedef FunctionArgument = { name : String, opt : Bool, t : CType, ?value:String }
+typedef FunctionArgument = {name:String, opt:Bool, t:CType, ?value:String};
 
 /**
 	The runtime member types.
 **/
 enum CType {
 	CUnknown;
-	CEnum( name : Path, params : List<CType> );
-	CClass( name : Path, params : List<CType> );
-	CTypedef( name : Path, params : List<CType> );
-	CFunction( args : List<FunctionArgument>, ret : CType );
-	CAnonymous( fields : List<ClassField> );
-	CDynamic( ?t : CType );
-	CAbstract( name : Path, params : List<CType> );
+	CEnum(name:Path, params:Array<CType>);
+	CClass(name:Path, params:Array<CType>);
+	CTypedef(name:Path, params:Array<CType>);
+	CFunction(args:Array<FunctionArgument>, ret:CType);
+	CAnonymous(fields:Array<ClassField>);
+	CDynamic(?t:CType);
+	CAbstract(name:Path, params:Array<CType>);
 }
 
 /**
@@ -57,19 +60,19 @@ typedef PathParams = {
 	/**
 		The path of the type.
 	**/
-	var path : Path;
+	var path:Path;
 
 	/**
-		The list of parameters types.
+		The array of parameters types.
 	**/
-	var params : List<CType>;
-}
+	var params:Array<CType>;
+};
 
 /**
-	An array of strings representing the names of the type parameters the type 
+	An array of strings representing the names of the type parameters the type
 	has. As of Haxe 3.2.0, this does not include the constraints.
 **/
-typedef TypeParams = Array<String> // no constraints
+typedef TypeParams = Array<String>; // no constraints
 
 /**
 	Represents the runtime rights of a type.
@@ -77,7 +80,7 @@ typedef TypeParams = Array<String> // no constraints
 enum Rights {
 	RNormal;
 	RNo;
-	RCall( m : String );
+	RCall(m:String);
 	RMethod;
 	RDynamic;
 	RInline;
@@ -86,87 +89,92 @@ enum Rights {
 /**
 	The list of runtime metadata.
 **/
-typedef MetaData = Array<{ name : String, params : Array<String> }>;
+typedef MetaData = Array<{name:String, params:Array<String>}>;
 
 /**
 	The runtime class field information.
-	
+
 	@see <https://haxe.org/manual/cr-rtti-structure.html#class-field-information>
 **/
 typedef ClassField = {
 	/**
 		The name of the field.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
 		The type of the field.
 	**/
-	var type : CType;
+	var type:CType;
 
 	/**
 		Whether or not the field is public.
 	**/
-	var isPublic : Bool;
+	var isPublic:Bool;
+
+	/**
+		Whether or not the field is final.
+	**/
+	var isFinal:Bool;
 
 	/**
 		Whether or not the field overrides another field.
 	**/
-	var isOverride : Bool;
+	var isOverride:Bool;
 
 	/**
-		The documentation of the field. This information is only available 
-		if the compiler flag `-D use_rtti_doc` was in place. Otherwise, or 
+		The documentation of the field. This information is only available
+		if the compiler flag `-D use_rtti_doc` was in place. Otherwise, or
 		if the field has no documentation, the value is `null`.
 	**/
-	var doc : Null<String>;
+	var doc:Null<String>;
 
 	/**
-		The [read access](https://haxe.org/manual/dictionary.html#define-read-access) 
+		The [read access](https://haxe.org/manual/dictionary.html#define-read-access)
 		behavior of the field.
 	**/
-	var get : Rights;
+	var get:Rights;
 
 	/**
 		The [write access](https://haxe.org/manual/dictionary.html#define-write-access)
 		behavior of the field.
 	**/
-	var set : Rights;
+	var set:Rights;
 
 	/**
-		An array of strings representing the names of the type parameters 
-		the field has. 
+		An array of strings representing the names of the type parameters
+		the field has.
 	**/
-	var params : TypeParams;
+	var params:TypeParams;
 
 	/**
 		A list of strings representing the targets where the field is available.
 	**/
-	var platforms : Platforms;
+	var platforms:Platforms;
 
 	/**
 		The meta data the field was annotated with.
 	**/
-	var meta : MetaData;
+	var meta:MetaData;
 
 	/**
-		The line number where the field is defined. This information is only 
-		available if the field has an expression. 
+		The line number where the field is defined. This information is only
+		available if the field has an expression.
 		Otherwise the value is `null`.
 	**/
-	var line : Null<Int>;
+	var line:Null<Int>;
 
 	/**
-		The list of available overloads for the fields or `null` if no overloads 
+		The list of available overloads for the fields or `null` if no overloads
 		exists.
 	**/
-	var overloads : Null<List<ClassField>>;
+	var overloads:Null<Array<ClassField>>;
 
 	/**
-		The actual expression of the field or `null` if there is no expression. 
+		The actual expression of the field or `null` if there is no expression.
 	**/
-	var expr : Null<String>;
-}
+	var expr:Null<String>;
+};
 
 /**
 	The general runtime type information.
@@ -175,202 +183,207 @@ typedef TypeInfos = {
 	/**
 		The type path of the type.
 	**/
-	var path : Path;
+	var path:Path;
 
 	/**
 		The type path of the module containing the type.
 	**/
-	var module : Path;
+	var module:Path;
 
 	/**
-		The full slash path of the .hx file containing the type. 
+		The full slash path of the .hx file containing the type.
 		This might be `null` in case there is no such file, e.g. if the
 		type is defined through a macro.
 	**/
-	var file : Null<String>;
+	var file:Null<String>;
 
 	/**
-		An array of strings representing the names of the type parameters the 
-		type has. 
+		An array of strings representing the names of the type parameters the
+		type has.
 	**/
-	var params : TypeParams;
+	var params:TypeParams;
 
 	/**
 		The documentation of the type. This information is only available
 		if the compiler flag `-D use_rtti_doc` was in place. Otherwise, or if
 		the constructor has no documentation, the value is `null`.
 	**/
-	var doc : Null<String>;
+	var doc:Null<String>;
 
 	/**
 		Whether or not the type is [private](https://haxe.org/manual/dictionary.html#define-private-type).
 	**/
-	var isPrivate : Bool;
+	var isPrivate:Bool;
 
 	/**
 		A list of strings representing the targets where the type is available.
 	**/
-	var platforms : Platforms;
+	var platforms:Platforms;
 
 	/**
-		The [metadata](https://haxe.org/manual/lf-metadata.html) the type was 
+		The [metadata](https://haxe.org/manual/lf-metadata.html) the type was
 		annotated with.
 	**/
-	var meta : MetaData;
-}
+	var meta:MetaData;
+};
 
 /**
 	The runtime class definition information.
 **/
-typedef Classdef = {> TypeInfos,
+typedef Classdef = TypeInfos & {
 	/**
 		Whether or not the class is [extern](https://haxe.org/manual/lf-externs.html).
 	**/
-	var isExtern : Bool;
+	var isExtern:Bool;
 
 	/**
 		Whether or not the class is actually an [interface](https://haxe.org/manual/types-interfaces.html).
 	**/
-	var isInterface : Bool;
+	var isInterface:Bool;
 
 	/**
-		The class' parent class defined by its type path and list of type 
+		The class' parent class defined by its type path and list of type
 		parameters.
 	**/
-	var superClass : Null<PathParams>;
+	var superClass:Null<PathParams>;
 
 	/**
-		The list of interfaces defined by their type path and list of type 
+		The list of interfaces defined by their type path and list of type
 		parameters.
 	**/
-	var interfaces : List<PathParams>;
+	var interfaces:Array<PathParams>;
 
 	/**
 		The list of member [class fields](https://haxe.org/manual/class-field.html).
 	**/
-	var fields : List<ClassField>;
+	var fields:Array<ClassField>;
 
 	/**
 		The list of static class fields.
 	**/
-	var statics : List<ClassField>;
+	var statics:Array<ClassField>;
 
 	/**
 		The type which is dynamically implemented by the class or `null` if no
 		such type exists.
 	**/
-	var tdynamic : Null<CType>;
-}
+	var tdynamic:Null<CType>;
+};
 
 /**
 	The runtime enum constructor information.
-	
+
 	@see <https://haxe.org/manual/cr-rtti-structure.html#enum-constructor-information>
 **/
 typedef EnumField = {
 	/**
 		The name of the constructor.
 	**/
-	var name : String;
+	var name:String;
 
 	/**
-		The list of arguments the constructor has or `null` if no arguments are 
+		The list of arguments the constructor has or `null` if no arguments are
 		available.
 	**/
-	var args : Null<List<{ name : String, opt : Bool, t : CType }>>;
+	var args:Null<Array<{name:String, opt:Bool, t:CType}>>;
 
 	/**
 		The documentation of the constructor. This information is only available
 		if the compiler flag `-D use_rtti_doc` was in place. Otherwise, or if
 		the constructor has no documentation, the value is `null`.
 	**/
-	var doc : String;
+	var doc:String;
 
 	/**
 		A list of strings representing the targets where the constructor is
 		available.
 	**/
-	var platforms : Platforms;
+	var platforms:Platforms;
 
 	/**
 		The meta data the constructor was annotated with.
 	**/
-	var meta : MetaData;
-}
+	var meta:MetaData;
+};
 
 /**
 	The enum runtime type information.
-	
+
 	@see <https://haxe.org/manual/cr-rtti-structure.html#enum-type-information>
 **/
-typedef Enumdef = {> TypeInfos,
+typedef Enumdef = TypeInfos & {
 	/**
 		Whether or not the enum is [extern](https://haxe.org/manual/lf-externs.html).
 	**/
-	var isExtern : Bool;
+	var isExtern:Bool;
 
 	/**
 		The list of enum constructors.
 	**/
-	var constructors : List<EnumField>;
-}
+	var constructors:Array<EnumField>;
+};
 
 /**
 	The typedef runtime information.
 **/
-typedef Typedef = {> TypeInfos,
+typedef Typedef = TypeInfos & {
 	/**
 		The type of the typedef.
 	**/
-	var type : CType;
+	var type:CType;
 
 	/**
 		The types of the typedef, by platform.
 	**/
-	var types : Map<String,CType>; // by platform
-}
+	var types:Map<String, CType>; // by platform
+
+};
 
 /**
 	The abstract type runtime information.
-	
+
 	@see <https://haxe.org/manual/cr-rtti-structure.html#abstract-type-information>
 **/
-typedef Abstractdef = {> TypeInfos,
-	var to : Array<{t:CType, field:Null<String>}>;
-	var from : Array<{t:CType, field:Null<String>}>;
-	var impl : Classdef;
-	var athis : CType;
-}
+typedef Abstractdef = TypeInfos & {
+	var to:Array<{t:CType, field:Null<String>}>;
+	var from:Array<{t:CType, field:Null<String>}>;
+	var impl:Classdef;
+	var athis:CType;
+};
 
 /**
 	The tree types of the runtime type.
 **/
 enum TypeTree {
-	TPackage( name : String, full : String, subs : Array<TypeTree> );
-	TClassdecl( c : Classdef );
-	TEnumdecl( e : Enumdef );
-	TTypedecl( t : Typedef );
-	TAbstractdecl( a : Abstractdef );
+	TPackage(name:String, full:String, subs:Array<TypeTree>);
+	TClassdecl(c:Classdef);
+	TEnumdecl(e:Enumdef);
+	TTypedecl(t:Typedef);
+	TAbstractdecl(a:Abstractdef);
 }
 
 /**
-	List of `TypeTree`.
+	Array of `TypeTree`.
 **/
-typedef TypeRoot = Array<TypeTree>
+typedef TypeRoot = Array<TypeTree>;
 
 /**
 	Contains type and equality checks functionalities for RTTI.
 **/
 class TypeApi {
-
-	public static function typeInfos( t : TypeTree ) : TypeInfos {
-		var inf : TypeInfos;
-		switch( t ) {
-		case TClassdecl(c): inf = c;
-		case TEnumdecl(e): inf = e;
-		case TTypedecl(t): inf = t;
-		case TAbstractdecl(a): inf = a;
-		case TPackage(_,_,_): throw "Unexpected Package";
+	public static function typeInfos(t:TypeTree):TypeInfos {
+		var inf:TypeInfos;
+		switch (t) {
+			case TClassdecl(c):
+				inf = c;
+			case TEnumdecl(e):
+				inf = e;
+			case TTypedecl(t):
+				inf = t;
+			case TAbstractdecl(a):
+				inf = a;
+			case TPackage(_, _, _):
+				throw "Unexpected Package";
 		}
 		return inf;
 	}
@@ -379,151 +392,153 @@ class TypeApi {
 		Returns `true` if the given `CType` is a variable or `false` if it is a
 		function.
 	**/
-	public static function isVar( t : CType ) {
-		return switch( t ) {
-		case CFunction(_,_): false;
-		default: true;
+	public static function isVar(t:CType) {
+		return switch (t) {
+			case CFunction(_, _): false;
+			default: true;
 		}
 	}
 
-	static function leq<T>( f : T -> T -> Bool, l1 : List<T>, l2 : List<T> ) {
+	static function leq<T>(f:T->T->Bool, l1:Array<T>, l2:Array<T>) {
 		var it = l2.iterator();
-		for( e1 in l1 ) {
-			if( !it.hasNext() )
+		for (e1 in l1) {
+			if (!it.hasNext())
 				return false;
 			var e2 = it.next();
-			if( !f(e1,e2) )
+			if (!f(e1, e2))
 				return false;
 		}
-		if( it.hasNext() )
+		if (it.hasNext())
 			return false;
 		return true;
 	}
 
 	/**
-		Unlike `r1 == r2`, this function performs a deep equality check on 
+		Unlike `r1 == r2`, this function performs a deep equality check on
 		the given `Rights` instances.
 
 		If `r1` or `r2` are `null`, the result is unspecified.
 	**/
-	public static function rightsEq( r1 : Rights, r2 : Rights ) {
-		if( r1 == r2 )
+	public static function rightsEq(r1:Rights, r2:Rights) {
+		if (r1 == r2)
 			return true;
-		switch( r1 ) {
-		case RCall(m1):
-			switch( r2 ) {
-			case RCall(m2):
-				return m1 == m2;
+		switch (r1) {
+			case RCall(m1):
+				switch (r2) {
+					case RCall(m2):
+						return m1 == m2;
+					default:
+				}
 			default:
-			}
-		default:
 		}
 		return false;
 	}
 
 	/**
-		Unlike `t1 == t2`, this function performs a deep equality check on 
+		Unlike `t1 == t2`, this function performs a deep equality check on
 		the given `CType` instances.
 
 		If `t1` or `t2` are `null`, the result is unspecified.
 	**/
-	public static function typeEq( t1 : CType, t2 : CType ) {
-		switch( t1 ) {
-		case CUnknown: return t2 == CUnknown;
-		case CEnum(name,params):
-			switch( t2 ) {
-			case CEnum(name2,params2):
-				return name == name2 && leq(typeEq,params,params2);
-			default:
-			}
-		case CClass(name,params):
-			switch( t2 ) {
-			case CClass(name2,params2):
-				return name == name2 && leq(typeEq,params,params2);
-			default:
-			}
-		case CAbstract(name,params):
-			switch( t2 ) {
-			case CAbstract(name2,params2):
-				return name == name2 && leq(typeEq,params,params2);
-			default:
-			}
-		case CTypedef(name,params):
-			switch( t2 ) {
-			case CTypedef(name2,params2):
-				return name == name2 && leq(typeEq,params,params2);
-			default:
-			}
-		case CFunction(args,ret):
-			switch( t2 ) {
-			case CFunction(args2,ret2):
-				return leq(function(a:FunctionArgument,b:FunctionArgument) {
-					return a.name == b.name && a.opt == b.opt && typeEq(a.t,b.t);
-				},args,args2) && typeEq(ret,ret2);
-			default:
-			}
-		case CAnonymous(fields):
-			switch( t2 ) {
-			case CAnonymous(fields2):
-				return leq(function(a,b) return fieldEq(a,b),fields,fields2);
-			default:
-			}
-		case CDynamic(t):
-			switch( t2 ) {
-			case CDynamic(t2):
-				if( (t == null) != (t2 == null) )
-					return false;
-				return t == null || typeEq(t,t2);
-			default:
-			}
+	public static function typeEq(t1:CType, t2:CType) {
+		switch (t1) {
+			case CUnknown:
+				return t2 == CUnknown;
+			case CEnum(name, params):
+				switch (t2) {
+					case CEnum(name2, params2):
+						return name == name2 && leq(typeEq, params, params2);
+					default:
+				}
+			case CClass(name, params):
+				switch (t2) {
+					case CClass(name2, params2):
+						return name == name2 && leq(typeEq, params, params2);
+					default:
+				}
+			case CAbstract(name, params):
+				switch (t2) {
+					case CAbstract(name2, params2):
+						return name == name2 && leq(typeEq, params, params2);
+					default:
+				}
+			case CTypedef(name, params):
+				switch (t2) {
+					case CTypedef(name2, params2):
+						return name == name2 && leq(typeEq, params, params2);
+					default:
+				}
+			case CFunction(args, ret):
+				switch (t2) {
+					case CFunction(args2, ret2):
+						return leq(function(a:FunctionArgument, b:FunctionArgument) {
+							return a.name == b.name && a.opt == b.opt && typeEq(a.t, b.t);
+						}, args, args2) && typeEq(ret, ret2);
+					default:
+				}
+			case CAnonymous(fields):
+				switch (t2) {
+					case CAnonymous(fields2):
+						return leq(function(a, b) return fieldEq(a, b), fields, fields2);
+					default:
+				}
+			case CDynamic(t):
+				switch (t2) {
+					case CDynamic(t2):
+						if ((t == null) != (t2 == null))
+							return false;
+						return t == null || typeEq(t, t2);
+					default:
+				}
 		}
 		return false;
 	}
 
 	/**
-		Unlike `f1 == f2`, this function performs a deep equality check on 
+		Unlike `f1 == f2`, this function performs a deep equality check on
 		the given `ClassField` instances.
 
 		If `f1` or `f2` are `null`, the result is unspecified.
 	**/
-	public static function fieldEq( f1 : ClassField, f2 : ClassField ) {
-		if( f1.name != f2.name )
+	public static function fieldEq(f1:ClassField, f2:ClassField) {
+		if (f1.name != f2.name)
 			return false;
-		if( !typeEq(f1.type,f2.type) )
+		if (!typeEq(f1.type, f2.type))
 			return false;
-		if( f1.isPublic != f2.isPublic )
+		if (f1.isPublic != f2.isPublic)
 			return false;
-		if( f1.doc != f2.doc )
+		if (f1.doc != f2.doc)
 			return false;
-		if( !rightsEq(f1.get,f2.get) )
+		if (!rightsEq(f1.get, f2.get))
 			return false;
-		if( !rightsEq(f1.set,f2.set) )
+		if (!rightsEq(f1.set, f2.set))
 			return false;
-		if( (f1.params == null) != (f2.params == null) )
+		if ((f1.params == null) != (f2.params == null))
 			return false;
-		if( f1.params != null && f1.params.join(":") != f2.params.join(":") )
+		if (f1.params != null && f1.params.join(":") != f2.params.join(":"))
 			return false;
 		return true;
 	}
 
 	/**
-		Unlike `c1 == c2`, this function performs a deep equality check on 
+		Unlike `c1 == c2`, this function performs a deep equality check on
 		the arguments of the enum constructors, if exists.
 
 		If `c1` or `c2` are `null`, the result is unspecified.
 	**/
-	public static function constructorEq( c1 : EnumField, c2: EnumField ) {
-		if( c1.name != c2.name )
+	public static function constructorEq(c1:EnumField, c2:EnumField) {
+		if (c1.name != c2.name)
 			return false;
-		if( c1.doc != c2.doc )
+		if (c1.doc != c2.doc)
 			return false;
-		if( (c1.args == null) != (c2.args == null) )
+		if ((c1.args == null) != (c2.args == null))
 			return false;
-		if( c1.args != null && !leq(function(a,b) { return a.name == b.name && a.opt == b.opt && typeEq(a.t,b.t); },c1.args,c2.args) )
+		if (c1.args != null && !leq(function(a, b) {
+			return a.name == b.name && a.opt == b.opt && typeEq(a.t, b.t);
+		}, c1.args, c2.args))
 			return false;
 		return true;
 	}
-
 }
 
 /**
@@ -542,9 +557,9 @@ class CTypeTools {
 				nameWithParams(name, params);
 			case CFunction(args, ret):
 				if (args.length == 0) {
-					"Void -> " +toString(ret);
+					"Void -> " + toString(ret);
 				} else {
-					args.map(functionArgumentName).join(" -> ")+" -> "+toString(ret);
+					args.map(functionArgumentName).join(" -> ") + " -> " + toString(ret);
 				}
 			case CDynamic(d):
 				if (d == null) {
@@ -553,11 +568,11 @@ class CTypeTools {
 					"Dynamic<" + toString(d) + ">";
 				}
 			case CAnonymous(fields):
-				"{ " + fields.map(classField).join(", ");
+				"{ " + fields.map(classField).join(", ") + "}";
 		}
 	}
 
-	static function nameWithParams(name:String, params:List<CType>) {
+	static function nameWithParams(name:String, params:Array<CType>) {
 		if (params.length == 0) {
 			return name;
 		}
@@ -565,10 +580,13 @@ class CTypeTools {
 	}
 
 	static function functionArgumentName(arg:FunctionArgument) {
-		return (arg.opt ? "?" : "") + (arg.name == "" ? "" : arg.name + ":") + toString(arg.t) + (arg.value == null ? "" : " = " +arg.value);
+		return (arg.opt ? "?" : "")
+			+ (arg.name == "" ? "" : arg.name + ":")
+			+ toString(arg.t)
+			+ (arg.value == null ? "" : " = " + arg.value);
 	}
 
 	static function classField(cf:ClassField) {
-		return cf.name + ":" +toString(cf.type);
+		return cf.name + ":" + toString(cf.type);
 	}
-}
\ No newline at end of file
+}
diff --git a/std/haxe/rtti/Meta.hx b/std/haxe/rtti/Meta.hx
index ec0cac982330bd0867e747f6c5aa2f23e21764d1..adca8dc0c239ad62686bcba877c600f28f2271f3 100644
--- a/std/haxe/rtti/Meta.hx
+++ b/std/haxe/rtti/Meta.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.rtti;
 
 private typedef MetaObject = {
 	?fields:Dynamic<Dynamic<Null<Array<Dynamic>>>>,
 	?statics:Dynamic<Dynamic<Null<Array<Dynamic>>>>,
-	?obj:Dynamic<Null<Array<Dynamic>>>,
-}
+	?obj:Dynamic<Null<Array<Dynamic>>>
+};
 
 /**
 	An API to access classes and enums metadata at runtime.
@@ -33,11 +34,10 @@ private typedef MetaObject = {
 	@see <https://haxe.org/manual/cr-rtti.html>
 **/
 class Meta {
-
 	/**
 		Returns the metadata that were declared for the given type (class or enum)
 	**/
-	public static function getType( t : Dynamic ) : Dynamic<Array<Dynamic>> {
+	public static function getType(t:Dynamic):Dynamic<Array<Dynamic>> {
 		var meta = getMeta(t);
 		return (meta == null || meta.obj == null) ? {} : meta.obj;
 	}
@@ -45,50 +45,42 @@ class Meta {
 	// Could move this to Type.hx?
 	private static function isInterface(t:Dynamic):Bool {
 		#if java
-			return java.Lib.toNativeType(t).isInterface();
-	#elseif cs
-			return cs.Lib.toNativeType(t).IsInterface;
+		return java.Lib.toNativeType(t).isInterface();
+		#elseif cs
+		return cs.Lib.toNativeType(t).IsInterface;
 		#elseif (flash && as3)
-			return untyped flash.Lib.describeType(t).factory.extendsClass.length() == 0;
-		#elseif (php && !php7)
-			return untyped __php__("{0} instanceof _hx_interface", t);
+		return untyped flash.Lib.describeType(t).factory.extendsClass.length() == 0;
 		#else
-			throw "Something went wrong";
+		throw "Something went wrong";
 		#end
 	}
 
-	private static function getMeta(t:Dynamic):MetaObject
-	{
-#if (php && php7)
-		return php.Boot.getMeta(t.phpClassName);
-#elseif (java || cs || php || (flash && as3))
+	private static function getMeta(t:Dynamic):MetaObject {
 		#if php
-		t.__ensureMeta__();
-		#end
+		return php.Boot.getMeta(t.phpClassName);
+		#elseif (java || cs || (flash && as3))
 		var ret = Reflect.field(t, "__meta__");
-		if (ret == null && Std.is(t,Class))
-		{
-			if (isInterface(t))
-			{
+		if (ret == null && Std.is(t, Class)) {
+			if (isInterface(t)) {
 				var name = Type.getClassName(t),
-				    cls = Type.resolveClass(name + '_HxMeta');
+					cls = Type.resolveClass(name + '_HxMeta');
 				if (cls != null)
 					return Reflect.field(cls, "__meta__");
 			}
 		}
 		return ret;
-#elseif hl
-		var t : hl.BaseType = t;
+		#elseif hl
+		var t:hl.BaseType = t;
 		return t.__meta__;
-#else
+		#else
 		return untyped t.__meta__;
-#end
+		#end
 	}
 
 	/**
 		Returns the metadata that were declared for the given class static fields
 	**/
-	public static function getStatics( t : Dynamic ) : Dynamic<Dynamic<Array<Dynamic>>> {
+	public static function getStatics(t:Dynamic):Dynamic<Dynamic<Array<Dynamic>>> {
 		var meta = getMeta(t);
 		return (meta == null || meta.statics == null) ? {} : meta.statics;
 	}
@@ -96,9 +88,8 @@ class Meta {
 	/**
 		Returns the metadata that were declared for the given class fields or enum constructors
 	**/
-	public static function getFields( t : Dynamic ) : Dynamic<Dynamic<Array<Dynamic>>> {
+	public static function getFields(t:Dynamic):Dynamic<Dynamic<Array<Dynamic>>> {
 		var meta = getMeta(t);
 		return (meta == null || meta.fields == null) ? {} : meta.fields;
 	}
-
 }
diff --git a/std/haxe/rtti/Rtti.hx b/std/haxe/rtti/Rtti.hx
index c7c0e432b699de6b7d43d34852f02a5651c60370..958e28c076c4faa0e7e65cddc242f8a85e944bcf 100644
--- a/std/haxe/rtti/Rtti.hx
+++ b/std/haxe/rtti/Rtti.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,22 +21,22 @@
  */
 
 package haxe.rtti;
+
 import haxe.rtti.CType;
 
 /**
 	Rtti is a helper class which supplements the `@:rtti` metadata.
-	
+
 	@see <https://haxe.org/manual/cr-rtti.html>
 **/
 class Rtti {
-
 	/**
 		Returns the `haxe.rtti.CType.Classdef` corresponding to class `c`.
 
-		If `c` has no runtime type information, e.g. because no `@:rtti@` was
-		added, `null` is returned.
+		If `c` has no runtime type information, e.g. because no `@:rtti` was
+		added, an exception of type `String` is thrown.
 
-		If `c` is null, the result is unspecified.
+		If `c` is `null`, the result is unspecified.
 	**/
 	static public function getRtti<T>(c:Class<T>):Classdef {
 		var rtti = Reflect.field(c, "__rtti");
@@ -46,17 +46,19 @@ class Rtti {
 		var x = Xml.parse(rtti).firstElement();
 		var infos = new haxe.rtti.XmlParser().processElement(x);
 		switch (infos) {
-			case TClassdecl(c): return c;
-			case t: throw 'Enum mismatch: expected TClassDecl but found $t';
+			case TClassdecl(c):
+				return c;
+			case var t:
+				throw 'Enum mismatch: expected TClassDecl but found $t';
 		}
 	}
 
 	/**
 		Tells if `c` has runtime type information.
 
-		If `c` is null, the result is unspecified.
+		If `c` is `null`, the result is unspecified.
 	**/
 	static public function hasRtti<T>(c:Class<T>):Bool {
 		return Lambda.has(Type.getClassFields(c), "__rtti");
 	}
-}
\ No newline at end of file
+}
diff --git a/std/haxe/rtti/XmlParser.hx b/std/haxe/rtti/XmlParser.hx
index 70af7628e694c224dd9c51ed6353d07b7ecf9a36..7773fbef7f0bc718b0a567747303ea4708c5f44b 100644
--- a/std/haxe/rtti/XmlParser.hx
+++ b/std/haxe/rtti/XmlParser.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,80 +19,82 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.rtti;
+
 import haxe.rtti.CType;
-import haxe.xml.Fast;
+import haxe.xml.Access;
 
 /**
 	XmlParser processes the runtime type information (RTTI) which
 	is stored as a XML string in a static field `__rtti`.
-	
+
 	@see <https://haxe.org/manual/cr-rtti.html>
 **/
 class XmlParser {
+	public var root:TypeRoot;
 
-	public var root : TypeRoot;
-	var curplatform : String;
+	var curplatform:String;
 
 	public function new() {
 		root = new Array();
 	}
 
-	public function sort( ?l ) {
-		if( l == null ) l = root;
-		l.sort(function(e1,e2) {
+	public function sort(?l:TypeRoot) {
+		if (l == null)
+			l = root;
+		l.sort(function(e1, e2) {
 			var n1 = switch e1 {
-				case TPackage(p,_,_) : " "+p;
+				case TPackage(p, _, _): " " + p;
 				default: TypeApi.typeInfos(e1).path;
 			};
 			var n2 = switch e2 {
-				case TPackage(p,_,_) : " "+p;
+				case TPackage(p, _, _): " " + p;
 				default: TypeApi.typeInfos(e2).path;
 			};
-			if( n1 > n2 )
+			if (n1 > n2)
 				return 1;
 			return -1;
 		});
-		for( x in l )
-			switch( x ) {
-			case TPackage(_,_,l): sort(l);
-			case TClassdecl(c):
-				c.fields = sortFields(c.fields);
-				c.statics = sortFields(c.statics);
-			case TEnumdecl(_):
-			case TAbstractdecl(_):
-			case TTypedecl(_):
+		for (x in l)
+			switch (x) {
+				case TPackage(_, _, l):
+					sort(l);
+				case TClassdecl(c):
+					sortFields(c.fields);
+					sortFields(c.statics);
+				case TEnumdecl(_):
+				case TAbstractdecl(_):
+				case TTypedecl(_):
 			}
 	}
 
-	function sortFields(fl) {
-		var a = Lambda.array(fl);
-		a.sort(function(f1 : ClassField,f2 : ClassField) {
+	function sortFields(a:Array<ClassField>) {
+		a.sort(function(f1:ClassField, f2:ClassField) {
 			var v1 = TypeApi.isVar(f1.type);
 			var v2 = TypeApi.isVar(f2.type);
-			if( v1 && !v2 )
+			if (v1 && !v2)
 				return -1;
-			if( v2 && !v1 )
+			if (v2 && !v1)
 				return 1;
-			if( f1.name == "new" )
+			if (f1.name == "new")
 				return -1;
-			if( f2.name == "new" )
+			if (f2.name == "new")
 				return 1;
-			if( f1.name > f2.name )
+			if (f1.name > f2.name)
 				return 1;
 			return -1;
 		});
-		return Lambda.list(a);
 	}
 
-	public function process( x : Xml, platform ) {
+	public function process(x:Xml, platform:String) {
 		curplatform = platform;
-		xroot(new Fast(x));
+		xroot(new Access(x));
 	}
 
 	// merge inline and not inline
-	function mergeRights( f1 : ClassField, f2 : ClassField ) {
-		if( f1.get == RInline && f1.set == RNo && f2.get == RNormal && f2.set == RMethod ) {
+	function mergeRights(f1:ClassField, f2:ClassField) {
+		if (f1.get == RInline && f1.set == RNo && f2.get == RNormal && f2.set == RMethod) {
 			f1.get = RNormal;
 			f1.set = RMethod;
 			return true;
@@ -100,525 +102,530 @@ class XmlParser {
 		return Type.enumEq(f1.get, f2.get) && Type.enumEq(f1.set, f2.set);
 	}
 
-	function mergeDoc( f1 : ClassField, f2 : ClassField ) {
-		if( f1.doc == null )
+	function mergeDoc(f1:ClassField, f2:ClassField) {
+		if (f1.doc == null)
 			f1.doc = f2.doc;
-		else if( f2.doc == null )
+		else if (f2.doc == null)
 			f2.doc = f1.doc;
 		return true;
 	}
 
-	function mergeFields( f : ClassField, f2 : ClassField ) {
-		return TypeApi.fieldEq(f,f2) || (f.name == f2.name && (mergeRights(f,f2) || mergeRights(f2,f)) && mergeDoc(f,f2) && TypeApi.fieldEq(f,f2));
+	function mergeFields(f:ClassField, f2:ClassField) {
+		return TypeApi.fieldEq(f, f2)
+			|| (f.name == f2.name && (mergeRights(f, f2) || mergeRights(f2, f)) && mergeDoc(f, f2) && TypeApi.fieldEq(f, f2));
 	}
 
-	public dynamic function newField( c : Classdef, f : ClassField ) {
-	}
+	public dynamic function newField(c:Classdef, f:ClassField) {}
 
-	function mergeClasses( c : Classdef, c2 : Classdef ) {
+	function mergeClasses(c:Classdef, c2:Classdef) {
 		// todo : compare supers & interfaces
-		if( c.isInterface != c2.isInterface )
+		if (c.isInterface != c2.isInterface)
 			return false;
-		if( curplatform != null )
-			c.platforms.add(curplatform);
-		if( c.isExtern != c2.isExtern )
+		if (curplatform != null)
+			c.platforms.push(curplatform);
+		if (c.isExtern != c2.isExtern)
 			c.isExtern = false;
 
-		for( f2 in c2.fields ) {
+		for (f2 in c2.fields) {
 			var found = null;
-			for( f in c.fields )
-				if( mergeFields(f,f2) ) {
+			for (f in c.fields)
+				if (mergeFields(f, f2)) {
 					found = f;
 					break;
 				}
-			if( found == null ) {
-				newField(c,f2);
-				c.fields.add(f2);
-			} else if( curplatform != null )
-				found.platforms.add(curplatform);
+			if (found == null) {
+				newField(c, f2);
+				c.fields.push(f2);
+			} else if (curplatform != null)
+				found.platforms.push(curplatform);
 		}
-		for( f2 in c2.statics ) {
+		for (f2 in c2.statics) {
 			var found = null;
-			for( f in c.statics )
-				if( mergeFields(f,f2) ) {
+			for (f in c.statics)
+				if (mergeFields(f, f2)) {
 					found = f;
 					break;
 				}
-			if( found == null ) {
-				newField(c,f2);
-				c.statics.add(f2);
-			} else if( curplatform != null )
-				found.platforms.add(curplatform);
+			if (found == null) {
+				newField(c, f2);
+				c.statics.push(f2);
+			} else if (curplatform != null)
+				found.platforms.push(curplatform);
 		}
 		return true;
 	}
 
-	function mergeEnums( e : Enumdef, e2 : Enumdef ) {
-		if( e.isExtern != e2.isExtern )
+	function mergeEnums(e:Enumdef, e2:Enumdef) {
+		if (e.isExtern != e2.isExtern)
 			return false;
-		if( curplatform != null )
-			e.platforms.add(curplatform);
-		for( c2 in e2.constructors ) {
+		if (curplatform != null)
+			e.platforms.push(curplatform);
+		for (c2 in e2.constructors) {
 			var found = null;
-			for( c in e.constructors )
-				if( TypeApi.constructorEq(c,c2) ) {
+			for (c in e.constructors)
+				if (TypeApi.constructorEq(c, c2)) {
 					found = c;
 					break;
 				}
-			if( found == null )
+			if (found == null)
 				return false; // don't allow by-platform constructor ?
-			if( curplatform != null )
-				found.platforms.add(curplatform);
+			if (curplatform != null)
+				found.platforms.push(curplatform);
 		}
 		return true;
 	}
 
-	function mergeTypedefs( t : Typedef, t2 : Typedef ) {
-		if( curplatform == null )
+	function mergeTypedefs(t:Typedef, t2:Typedef) {
+		if (curplatform == null)
 			return false;
-		t.platforms.add(curplatform);
-		t.types.set(curplatform,t2.type);
+		t.platforms.push(curplatform);
+		t.types.set(curplatform, t2.type);
 		return true;
 	}
 
-	function mergeAbstracts( a : Abstractdef, a2 : Abstractdef ) {
-		if( curplatform == null )
+	function mergeAbstracts(a:Abstractdef, a2:Abstractdef) {
+		if (curplatform == null)
 			return false;
-		if( a.to.length != a2.to.length || a.from.length != a2.from.length )
+		if (a.to.length != a2.to.length || a.from.length != a2.from.length)
 			return false;
-		for( i in 0...a.to.length )
-			if( !TypeApi.typeEq(a.to[i].t,a2.to[i].t) )
+		for (i in 0...a.to.length)
+			if (!TypeApi.typeEq(a.to[i].t, a2.to[i].t))
 				return false;
-		for( i in 0...a.from.length )
-			if( !TypeApi.typeEq(a.from[i].t,a2.from[i].t) )
+		for (i in 0...a.from.length)
+			if (!TypeApi.typeEq(a.from[i].t, a2.from[i].t))
 				return false;
-		if (a2.impl != null) mergeClasses(a.impl, a2.impl);
-		a.platforms.add(curplatform);
+		if (a2.impl != null)
+			mergeClasses(a.impl, a2.impl);
+		a.platforms.push(curplatform);
 		return true;
 	}
 
-	function merge( t : TypeTree ) {
+	function merge(t:TypeTree) {
 		var inf = TypeApi.typeInfos(t);
 		var pack = inf.path.split(".");
 		var cur = root;
 		var curpack = new Array();
 		pack.pop();
-		for( p in pack ) {
+		for (p in pack) {
 			var found = false;
-			for( pk in cur )
-				switch( pk ) {
-				case TPackage(pname,_,subs):
-					if( pname == p ) {
-						found = true;
-						cur = subs;
-						break;
-					}
-				default:
+			for (pk in cur)
+				switch (pk) {
+					case TPackage(pname, _, subs):
+						if (pname == p) {
+							found = true;
+							cur = subs;
+							break;
+						}
+					default:
 				}
 			curpack.push(p);
-			if( !found ) {
+			if (!found) {
 				var pk = new Array();
-				cur.push(TPackage(p,curpack.join("."),pk));
+				cur.push(TPackage(p, curpack.join("."), pk));
 				cur = pk;
 			}
 		}
-		var prev = null;
-		for( ct in cur ) {
-			var tinf;
-			try
-				tinf = TypeApi.typeInfos(ct)
-			catch( e : Dynamic )
+		for (ct in cur) {
+			if (ct.match(TPackage(_)))
 				continue;
+			var tinf = TypeApi.typeInfos(ct);
+
 			// compare params ?
-			if( tinf.path == inf.path ) {
+			if (tinf.path == inf.path) {
 				var sameType = true;
-				if( (tinf.doc == null) != (inf.doc == null) ) {
-					if( inf.doc == null )
+				if ((tinf.doc == null) != (inf.doc == null)) {
+					if (inf.doc == null)
 						inf.doc = tinf.doc;
 					else
 						tinf.doc = inf.doc;
 				}
-				if (tinf.path == "haxe._Int64.NativeInt64") continue;
-				if( tinf.module == inf.module && tinf.doc == inf.doc && tinf.isPrivate == inf.isPrivate )
-					switch( ct ) {
-					case TClassdecl(c):
-						switch( t ) {
-						case TClassdecl(c2):
-							if( mergeClasses(c,c2) )
-								return;
-						default:
-							sameType = false;
-						}
-					case TEnumdecl(e):
-						switch( t ) {
-						case TEnumdecl(e2):
-							if( mergeEnums(e,e2) )
-								return;
-						default:
+				if (tinf.path == "haxe._Int64.NativeInt64")
+					continue;
+				if (tinf.module == inf.module && tinf.doc == inf.doc && tinf.isPrivate == inf.isPrivate)
+					switch (ct) {
+						case TClassdecl(c):
+							switch (t) {
+								case TClassdecl(c2):
+									if (mergeClasses(c, c2))
+										return;
+								default:
+									sameType = false;
+							}
+						case TEnumdecl(e):
+							switch (t) {
+								case TEnumdecl(e2):
+									if (mergeEnums(e, e2))
+										return;
+								default:
+									sameType = false;
+							}
+						case TTypedecl(td):
+							switch (t) {
+								case TTypedecl(td2):
+									if (mergeTypedefs(td, td2))
+										return;
+								default:
+							}
+						case TAbstractdecl(a):
+							switch (t) {
+								case TAbstractdecl(a2):
+									if (mergeAbstracts(a, a2))
+										return;
+								default:
+									sameType = false;
+							}
+						case TPackage(_, _, _):
 							sameType = false;
-						}
-					case TTypedecl(td):
-						switch( t ) {
-						case TTypedecl(td2):
-							if( mergeTypedefs(td,td2) )
-								return;
-						default:
-						}
-					case TAbstractdecl(a):
-						switch( t ) {
-						case TAbstractdecl(a2):
-							if( mergeAbstracts(a,a2) )
-								return;
-						default:
-							sameType = false;
-						}
-					case TPackage(_,_,_):
-						sameType = false;
 					}
 				// we already have a mapping, but which is incompatible
-				var msg = if( tinf.module != inf.module ) "module "+inf.module+" should be "+tinf.module;
-					else if( tinf.doc != inf.doc ) "documentation is different";
-					else if( tinf.isPrivate != inf.isPrivate ) "private flag is different";
-					else if( !sameType ) "type kind is different";
-					else "could not merge definition";
-				throw "Incompatibilities between "+tinf.path+" in "+tinf.platforms.join(",")+" and "+curplatform+" ("+msg+")";
+				var msg = if (tinf.module != inf.module) "module " + inf.module + " should be " + tinf.module; else if (tinf.doc != inf.doc)
+					"documentation is different";
+				else if (tinf.isPrivate != inf.isPrivate)
+					"private flag is different";
+				else if (!sameType)
+					"type kind is different";
+				else
+					"could not merge definition";
+				throw "Incompatibilities between " + tinf.path + " in " + tinf.platforms.join(",") + " and " + curplatform + " (" + msg + ")";
 			}
 		}
 		cur.push(t);
 	}
 
-	function mkPath( p : String ) : Path {
+	function mkPath(p:String):Path {
 		return p;
 	}
 
-	function mkTypeParams( p : String ) : TypeParams {
+	function mkTypeParams(p:String):TypeParams {
 		var pl = p.split(":");
-		if( pl[0] == "" )
+		if (pl[0] == "")
 			return new Array();
 		return pl;
 	}
 
-	function mkRights( r : String ) : Rights {
-		return switch( r ) {
-		case "null": RNo;
-		case "method": RMethod;
-		case "dynamic": RDynamic;
-		case "inline": RInline;
-		default: RCall(r);
+	function mkRights(r:String):Rights {
+		return switch (r) {
+			case "null": RNo;
+			case "method": RMethod;
+			case "dynamic": RDynamic;
+			case "inline": RInline;
+			default: RCall(r);
 		}
 	}
 
-	function xerror( c : Fast ) : Dynamic {
-		return throw "Invalid "+c.name;
+	function xerror(c:Access):Dynamic {
+		return throw "Invalid " + c.name;
 	}
 
-	function xroot( x : Fast ) {
-		for( c in x.x.elements() )
+	function xroot(x:Access) {
+		for (c in x.x.elements())
 			merge(processElement(c));
-
 	}
 
-	public function processElement( x : Xml ) {
-		var c = new haxe.xml.Fast(x);
-		return switch( c.name ) {
-		case "class": TClassdecl(xclass(c));
-		case "enum": TEnumdecl(xenum(c));
-		case "typedef": TTypedecl(xtypedef(c));
-		case "abstract": TAbstractdecl(xabstract(c));
-		default: xerror(c);
+	public function processElement(x:Xml) {
+		var c = new haxe.xml.Access(x);
+		return switch (c.name) {
+			case "class": TClassdecl(xclass(c));
+			case "enum": TEnumdecl(xenum(c));
+			case "typedef": TTypedecl(xtypedef(c));
+			case "abstract": TAbstractdecl(xabstract(c));
+			default: xerror(c);
 		}
 	}
 
-	function xmeta( x : Fast ) : MetaData {
+	function xmeta(x:Access):MetaData {
 		var ml = [];
-		for( m in x.nodes.m ) {
+		for (m in x.nodes.m) {
 			var pl = [];
-			for( p in m.nodes.e )
+			for (p in m.nodes.e)
 				pl.push(p.innerHTML);
-			ml.push({ name : m.att.n, params : pl });
+			ml.push({name: m.att.n, params: pl});
 		}
 		return ml;
 	}
 
-	function xoverloads( x : Fast ) : List<ClassField> {
-		var l = new List();
-		for ( m in x.elements ) {
-			l.add(xclassfield(m));
+	function xoverloads(x:Access):Array<ClassField> {
+		var l = new Array();
+		for (m in x.elements) {
+			l.push(xclassfield(m));
 		}
 		return l;
 	}
 
-	function xpath( x : Fast ) : PathParams {
+	function xpath(x:Access):PathParams {
 		var path = mkPath(x.att.path);
-		var params = new List();
-		for( c in x.elements )
-			params.add(xtype(c));
+		var params = new Array();
+		for (c in x.elements)
+			params.push(xtype(c));
 		return {
-			path : path,
-			params : params,
+			path: path,
+			params: params,
 		};
 	}
 
-	function xclass( x : Fast ) : Classdef {
+	function xclass(x:Access):Classdef {
 		var csuper = null;
 		var doc = null;
 		var tdynamic = null;
-		var interfaces = new List();
-		var fields = new List();
-		var statics = new List();
+		var interfaces = new Array();
+		var fields = new Array();
+		var statics = new Array();
 		var meta = [];
-		for( c in x.elements )
-			switch( c.name ) {
-			case "haxe_doc": doc = c.innerData;
-			case "extends": csuper = xpath(c);
-			case "implements": interfaces.add(xpath(c));
-			case "haxe_dynamic": tdynamic = xtype(new Fast(c.x.firstElement()));
-			case "meta": meta = xmeta(c);
-			default:
-				if( c.x.exists("static") )
-					statics.add(xclassfield(c));
-				else
-					fields.add(xclassfield(c));
+		for (c in x.elements)
+			switch (c.name) {
+				case "haxe_doc":
+					doc = c.innerData;
+				case "extends":
+					csuper = xpath(c);
+				case "implements":
+					interfaces.push(xpath(c));
+				case "haxe_dynamic":
+					tdynamic = xtype(new Access(c.x.firstElement()));
+				case "meta":
+					meta = xmeta(c);
+				default:
+					if (c.x.exists("static"))
+						statics.push(xclassfield(c));
+					else
+						fields.push(xclassfield(c));
 			}
 		return {
-			file : if(x.has.file) x.att.file else null,
-			path : mkPath(x.att.path),
-			module : if( x.has.module ) mkPath(x.att.module) else null,
-			doc : doc,
-			isPrivate : x.x.exists("private"),
-			isExtern : x.x.exists("extern"),
-			isInterface : x.x.exists("interface"),
-			params : mkTypeParams(x.att.params),
-			superClass : csuper,
-			interfaces : interfaces,
-			fields : fields,
-			statics : statics,
-			tdynamic : tdynamic,
-			platforms : defplat(),
-			meta : meta,
+			file: if (x.has.file) x.att.file else null,
+			path: mkPath(x.att.path),
+			module: if (x.has.module) mkPath(x.att.module) else null,
+			doc: doc,
+			isPrivate: x.x.exists("private"),
+			isExtern: x.x.exists("extern"),
+			isInterface: x.x.exists("interface"),
+			params: mkTypeParams(x.att.params),
+			superClass: csuper,
+			interfaces: interfaces,
+			fields: fields,
+			statics: statics,
+			tdynamic: tdynamic,
+			platforms: defplat(),
+			meta: meta,
 		};
 	}
 
-	function xclassfield( x : Fast, ?defPublic = false ) : ClassField {
+	function xclassfield(x:Access, ?defPublic = false):ClassField {
 		var e = x.elements;
 		var t = xtype(e.next());
 		var doc = null;
 		var meta = [];
 		var overloads = null;
-		for( c in e )
-			switch( c.name ) {
-			case "haxe_doc": doc = c.innerData;
-			case "meta": meta = xmeta(c);
-			case "overloads": overloads = xoverloads(c);
-			default: xerror(c);
+		for (c in e)
+			switch (c.name) {
+				case "haxe_doc":
+					doc = c.innerData;
+				case "meta":
+					meta = xmeta(c);
+				case "overloads":
+					overloads = xoverloads(c);
+				default:
+					xerror(c);
 			}
 		return {
-			name : x.name,
-			type : t,
-			isPublic : x.x.exists("public") || defPublic,
-			isOverride : x.x.exists("override"),
-			line : if( x.has.line ) Std.parseInt(x.att.line) else null,
-			doc : doc,
-			get : if( x.has.get ) mkRights(x.att.get) else RNormal,
-			set : if( x.has.set ) mkRights(x.att.set) else RNormal,
-			params : if( x.has.params ) mkTypeParams(x.att.params) else [],
-			platforms : defplat(),
-			meta : meta,
-			overloads: overloads,
-			expr : if( x.has.expr ) x.att.expr else null
+			name:x.name, type:t, isPublic:x.x.exists("public") || defPublic, isFinal:x.x.exists("final"), isOverride:x.x.exists("override"),
+			line:if (x.has.line) Std.parseInt(x.att.line) else null, doc:doc, get:if (x.has.get) mkRights(x.att.get) else RNormal, set:if (x.has.set)
+				mkRights(x.att.set)
+			else
+				RNormal, params:if (x.has.params) mkTypeParams(x.att.params) else [], platforms:defplat(), meta:meta, overloads:overloads, expr:if (x.has.expr)
+				x.att.expr
+			else
+				null
 		};
 	}
 
-	function xenum( x : Fast ) : Enumdef {
-		var cl = new List();
+	function xenum(x:Access):Enumdef {
+		var cl = new Array();
 		var doc = null;
 		var meta = [];
-		for( c in x.elements )
-			if( c.name == "haxe_doc" )
+		for (c in x.elements)
+			if (c.name == "haxe_doc")
 				doc = c.innerData;
-			else if ( c.name == "meta" )
+			else if (c.name == "meta")
 				meta = xmeta(c);
 			else
-				cl.add(xenumfield(c));
+				cl.push(xenumfield(c));
 		return {
-			file : if(x.has.file) x.att.file else null,
-			path : mkPath(x.att.path),
-			module : if( x.has.module ) mkPath(x.att.module) else null,
-			doc : doc,
-			isPrivate : x.x.exists("private"),
-			isExtern : x.x.exists("extern"),
-			params : mkTypeParams(x.att.params),
-			constructors : cl,
-			platforms : defplat(),
-			meta : meta,
+			file: if (x.has.file) x.att.file else null,
+			path: mkPath(x.att.path),
+			module: if (x.has.module) mkPath(x.att.module) else null,
+			doc: doc,
+			isPrivate: x.x.exists("private"),
+			isExtern: x.x.exists("extern"),
+			params: mkTypeParams(x.att.params),
+			constructors: cl,
+			platforms: defplat(),
+			meta: meta,
 		};
 	}
 
-	function xenumfield( x : Fast ) : EnumField {
+	function xenumfield(x:Access):EnumField {
 		var args = null;
-		var xdoc = x.x.elementsNamed("haxe_doc").next();
-		var meta = if( x.hasNode.meta ) xmeta(x.node.meta) else [];
-		if( x.has.a ) {
+		var docElements = x.x.elementsNamed("haxe_doc");
+		var xdoc = if (docElements.hasNext()) docElements.next() else null;
+		var meta = if (x.hasNode.meta) xmeta(x.node.meta) else [];
+		if (x.has.a) {
 			var names = x.att.a.split(":");
 			var elts = x.elements;
-			args = new List();
-			for( c in names ) {
+			args = new Array();
+			for (c in names) {
 				var opt = false;
-				if( c.charAt(0) == "?" ) {
+				if (c.charAt(0) == "?") {
 					opt = true;
 					c = c.substr(1);
 				}
-				args.add({
-					name : c,
-					opt : opt,
-					t : xtype(elts.next()),
+				args.push({
+					name: c,
+					opt: opt,
+					t: xtype(elts.next()),
 				});
 			}
 		}
 		return {
-			name : x.name,
-			args : args,
-			doc : if( xdoc == null ) null else new Fast(xdoc).innerData,
-			meta : meta,
-			platforms : defplat(),
+			name: x.name,
+			args: args,
+			doc: if (xdoc == null) null else new Access(xdoc).innerData,
+			meta: meta,
+			platforms: defplat(),
 		};
 	}
 
-	function xabstract( x : Fast ) : Abstractdef {
+	function xabstract(x:Access):Abstractdef {
 		var doc = null, impl = null, athis = null;
 		var meta = [], to = [], from = [];
-		for( c in x.elements )
-			switch( c.name ) {
-			case "haxe_doc":
-				doc = c.innerData;
-			case "meta":
-				meta = xmeta(c);
-			case "to":
-				for( t in c.elements )
-					to.push({t: xtype(new Fast(t.x.firstElement())), field: t.has.field ? t.att.field : null});
-			case "from":
-				for( t in c.elements )
-					from.push({t: xtype(new Fast(t.x.firstElement())), field: t.has.field ? t.att.field : null});
-			case "impl":
-				impl = xclass(c.node.resolve("class"));
-			case "this":
-				athis = xtype(new Fast(c.x.firstElement()));
-			default:
-				xerror(c);
+		for (c in x.elements)
+			switch (c.name) {
+				case "haxe_doc":
+					doc = c.innerData;
+				case "meta":
+					meta = xmeta(c);
+				case "to":
+					for (t in c.elements)
+						to.push({t: xtype(new Access(t.x.firstElement())), field: t.has.field ? t.att.field : null});
+				case "from":
+					for (t in c.elements)
+						from.push({t: xtype(new Access(t.x.firstElement())), field: t.has.field ? t.att.field : null});
+				case "impl":
+					impl = xclass(c.node.resolve("class"));
+				case "this":
+					athis = xtype(new Access(c.x.firstElement()));
+				default:
+					xerror(c);
 			}
 		return {
-			file : if(x.has.file) x.att.file else null,
-			path : mkPath(x.att.path),
-			module : if( x.has.module ) mkPath(x.att.module) else null,
-			doc : doc,
-			isPrivate : x.x.exists("private"),
-			params : mkTypeParams(x.att.params),
-			platforms : defplat(),
-			meta : meta,
-			athis : athis,
-			to : to,
-			from : from,
+			file: if (x.has.file) x.att.file else null,
+			path: mkPath(x.att.path),
+			module: if (x.has.module) mkPath(x.att.module) else null,
+			doc: doc,
+			isPrivate: x.x.exists("private"),
+			params: mkTypeParams(x.att.params),
+			platforms: defplat(),
+			meta: meta,
+			athis: athis,
+			to: to,
+			from: from,
 			impl: impl
 		};
 	}
 
-
-	function xtypedef( x : Fast ) : Typedef {
+	function xtypedef(x:Access):Typedef {
 		var doc = null;
 		var t = null;
 		var meta = [];
-		for( c in x.elements )
-			if( c.name == "haxe_doc" )
+		for (c in x.elements)
+			if (c.name == "haxe_doc")
 				doc = c.innerData;
-			else if ( c.name == "meta" )
+			else if (c.name == "meta")
 				meta = xmeta(c);
 			else
 				t = xtype(c);
 		var types = new haxe.ds.StringMap();
-		if( curplatform != null )
-			types.set(curplatform,t);
+		if (curplatform != null)
+			types.set(curplatform, t);
 		return {
-			file : if(x.has.file) x.att.file else null,
-			path : mkPath(x.att.path),
-			module : if( x.has.module ) mkPath(x.att.module) else null,
-			doc : doc,
-			isPrivate : x.x.exists("private"),
-			params : mkTypeParams(x.att.params),
-			type : t,
-			types : types,
-			platforms : defplat(),
-			meta : meta,
+			file: if (x.has.file) x.att.file else null,
+			path: mkPath(x.att.path),
+			module: if (x.has.module) mkPath(x.att.module) else null,
+			doc: doc,
+			isPrivate: x.x.exists("private"),
+			params: mkTypeParams(x.att.params),
+			type: t,
+			types: types,
+			platforms: defplat(),
+			meta: meta,
 		};
 	}
 
-	function xtype( x : Fast ) : CType {
-		return switch( x.name ) {
-		case "unknown":
-			CUnknown;
-		case "e":
-			CEnum(mkPath(x.att.path),xtypeparams(x));
-		case "c":
-			CClass(mkPath(x.att.path),xtypeparams(x));
-		case "t":
-			CTypedef(mkPath(x.att.path),xtypeparams(x));
-		case "x":
-			CAbstract(mkPath(x.att.path),xtypeparams(x));
-		case "f":
-			var args = new List();
-			var aname = x.att.a.split(":");
-			var eargs = aname.iterator();
-			var evalues = x.has.v ? x.att.v.split(":").iterator() : null;
-			for( e in x.elements ) {
-				var opt = false;
-				var a = eargs.next();
-				if( a == null )
-					a = "";
-				if( a.charAt(0) == "?" ) {
-					opt = true;
-					a = a.substr(1);
+	function xtype(x:Access):CType {
+		return switch (x.name) {
+			case "unknown":
+				CUnknown;
+			case "e":
+				CEnum(mkPath(x.att.path), xtypeparams(x));
+			case "c":
+				CClass(mkPath(x.att.path), xtypeparams(x));
+			case "t":
+				CTypedef(mkPath(x.att.path), xtypeparams(x));
+			case "x":
+				CAbstract(mkPath(x.att.path), xtypeparams(x));
+			case "f":
+				var args = new Array();
+				var aname = x.att.a.split(":");
+				var eargs = aname.iterator();
+				var evalues = x.has.v ? x.att.v.split(":").iterator() : null;
+				for (e in x.elements) {
+					var opt = false;
+					var a = eargs.hasNext() ? eargs.next() : null;
+					if (a == null)
+						a = "";
+					if (a.charAt(0) == "?") {
+						opt = true;
+						a = a.substr(1);
+					}
+					var v = evalues == null || !evalues.hasNext() ? null : evalues.next();
+					args.push({
+						name: a,
+						opt: opt,
+						t: xtype(e),
+						value: v == "" ? null : v
+					});
 				}
-				var v = evalues == null ? null : evalues.next();
-				args.add({
-					name : a,
-					opt : opt,
-					t : xtype(e),
-					value : v == "" ? null : v
-				});
-			}
-			var ret = args.last();
-			args.remove(ret);
-			CFunction(args,ret.t);
-		case "a":
-			var fields = new List();
-			for( f in x.elements ) {
-				var f = xclassfield(f,true);
-				f.platforms = new List(); // platforms selection are on the type itself, not on fields
-				fields.add(f);
-			}
-			CAnonymous(fields);
-		case "d":
-			var t = null;
-			var tx = x.x.firstElement();
-			if( tx != null )
-				t = xtype(new Fast(tx));
-			CDynamic(t);
-		default:
-			xerror(x);
+				var ret = args[args.length - 1];
+				args.remove(ret);
+				CFunction(args, ret.t);
+			case "a":
+				var fields = new Array();
+				for (f in x.elements) {
+					var f = xclassfield(f, true);
+					f.platforms = new Array(); // platforms selection are on the type itself, not on fields
+					fields.push(f);
+				}
+				CAnonymous(fields);
+			case "d":
+				var t = null;
+				var tx = x.x.firstElement();
+				if (tx != null)
+					t = xtype(new Access(tx));
+				CDynamic(t);
+			default:
+				xerror(x);
 		}
 	}
 
-	function xtypeparams( x : Fast ) : List<CType> {
-		var p = new List();
-		for( c in x.elements )
-			p.add(xtype(c));
+	function xtypeparams(x:Access):Array<CType> {
+		var p = new Array();
+		for (c in x.elements)
+			p.push(xtype(c));
 		return p;
 	}
 
 	function defplat() {
-		var l = new List();
-		if( curplatform != null )
-			l.add(curplatform);
+		var l = new Array();
+		if (curplatform != null)
+			l.push(curplatform);
 		return l;
 	}
-
 }
diff --git a/std/haxe/xml/Access.hx b/std/haxe/xml/Access.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b97b7f639b84edf645216a89f536187e17000a0f
--- /dev/null
+++ b/std/haxe/xml/Access.hx
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.xml;
+
+private abstract NodeAccess(Xml) from Xml {
+	@:op(a.b)
+	public function resolve(name:String):Access {
+		var x = this.elementsNamed(name).next();
+		if (x == null) {
+			var xname = if (this.nodeType == Xml.Document) "Document" else this.nodeName;
+			throw xname + " is missing element " + name;
+		}
+		return new Access(x);
+	}
+}
+
+private abstract AttribAccess(Xml) from Xml {
+	@:op(a.b)
+	public function resolve(name:String):String {
+		if (this.nodeType == Xml.Document)
+			throw "Cannot access document attribute " + name;
+		var v = this.get(name);
+		if (v == null)
+			throw this.nodeName + " is missing attribute " + name;
+		return v;
+	}
+
+	@:op(a.b)
+	function _hx_set(name:String, value:String):String {
+		if (this.nodeType == Xml.Document)
+			throw "Cannot access document attribute " + name;
+		this.set(name, value);
+		return value;
+	}
+}
+
+private abstract HasAttribAccess(Xml) from Xml {
+	@:op(a.b)
+	public function resolve(name:String):Bool {
+		if (this.nodeType == Xml.Document)
+			throw "Cannot access document attribute " + name;
+		return this.exists(name);
+	}
+}
+
+private abstract HasNodeAccess(Xml) from Xml {
+	@:op(a.b)
+	public function resolve(name:String):Bool {
+		return this.elementsNamed(name).hasNext();
+	}
+}
+
+private abstract NodeListAccess(Xml) from Xml {
+	@:op(a.b)
+	public function resolve(name:String):Array<Access> {
+		var l = [];
+		for (x in this.elementsNamed(name))
+			l.push(new Access(x));
+		return l;
+	}
+}
+
+/**
+	The `haxe.xml.Access` API helps providing a fast dot-syntax access to the
+	most common `Xml` methods.
+**/
+abstract Access(Xml) {
+	public var x(get, never):Xml;
+
+	public inline function get_x()
+		return this;
+
+	/**
+		The name of the current element. This is the same as `Xml.nodeName`.
+	**/
+	public var name(get, never):String;
+
+	inline function get_name() {
+		return if (this.nodeType == Xml.Document) "Document" else this.nodeName;
+	}
+
+	/**
+		The inner PCDATA or CDATA of the node.
+
+		An exception is thrown if there is no data or if there not only data
+		but also other nodes.
+	**/
+	public var innerData(get, never):String;
+
+	/**
+		The XML string built with all the sub nodes, excluding the current one.
+	**/
+	public var innerHTML(get, never):String;
+
+	/**
+		Access to the first sub element with the given name.
+
+		An exception is thrown if the element doesn't exists.
+		Use `hasNode` to check the existence of a node.
+
+		```haxe
+		var access = new haxe.xml.Access(Xml.parse("<user><name>John</name></user>"));
+		var user = access.node.user;
+		var name = user.node.name;
+		trace(name.innerData); // John
+
+		// Uncaught Error: Document is missing element password
+		var password = user.node.password;
+		```
+	**/
+	public var node(get, never):NodeAccess;
+
+	inline function get_node():NodeAccess
+		return x;
+
+	/**
+		Access to the List of elements with the given name.
+		```haxe
+		var fast = new haxe.xml.Access(Xml.parse("
+			<users>
+				<user name='John'/>
+				<user name='Andy'/>
+				<user name='Dan'/>
+			</users>"
+		));
+
+		var users = fast.node.users;
+		for (user in users.nodes.user) {
+			trace(user.att.name);
+		}
+		```
+	**/
+	public var nodes(get, never):NodeListAccess;
+
+	inline function get_nodes():NodeListAccess
+		return this;
+
+	/**
+		Access to a given attribute.
+
+		An exception is thrown if the attribute doesn't exists.
+		Use `has` to check the existence of an attribute.
+
+		```haxe
+		var f = new haxe.xml.Access(Xml.parse("<user name='Mark'></user>"));
+		var user = f.node.user;
+		if (user.has.name) {
+			trace(user.att.name); // Mark
+		}
+		```
+	**/
+	public var att(get, never):AttribAccess;
+
+	inline function get_att():AttribAccess
+		return this;
+
+	/**
+		Check the existence of an attribute with the given name.
+	**/
+	public var has(get, never):HasAttribAccess;
+
+	inline function get_has():HasAttribAccess
+		return this;
+
+	/**
+		Check the existence of a sub node with the given name.
+
+		```haxe
+		var f = new haxe.xml.Access(Xml.parse("<user><age>31</age></user>"));
+		var user = f.node.user;
+		if (user.hasNode.age) {
+			trace(user.node.age.innerData); // 31
+		}
+		```
+	**/
+	public var hasNode(get, never):HasNodeAccess;
+
+	inline function get_hasNode():HasNodeAccess
+		return x;
+
+	/**
+		The list of all sub-elements which are the nodes with type `Xml.Element`.
+	**/
+	public var elements(get, never):Iterator<Access>;
+
+	inline function get_elements():Iterator<Access>
+		return cast this.elements();
+
+	public inline function new(x:Xml) {
+		if (x.nodeType != Xml.Document && x.nodeType != Xml.Element)
+			throw "Invalid nodeType " + x.nodeType;
+		this = x;
+	}
+
+	function get_innerData() {
+		var it = this.iterator();
+		if (!it.hasNext())
+			throw name + " does not have data";
+		var v = it.next();
+		if (it.hasNext()) {
+			var n = it.next();
+			// handle <spaces>CDATA<spaces>
+			if (v.nodeType == Xml.PCData && n.nodeType == Xml.CData && StringTools.trim(v.nodeValue) == "") {
+				if (!it.hasNext())
+					return n.nodeValue;
+				var n2 = it.next();
+				if (n2.nodeType == Xml.PCData && StringTools.trim(n2.nodeValue) == "" && !it.hasNext())
+					return n.nodeValue;
+			}
+			throw name + " does not only have data";
+		}
+		if (v.nodeType != Xml.PCData && v.nodeType != Xml.CData)
+			throw name + " does not have data";
+		return v.nodeValue;
+	}
+
+	function get_innerHTML() {
+		var s = new StringBuf();
+		for (x in this)
+			s.add(x.toString());
+		return s.toString();
+	}
+}
diff --git a/std/haxe/xml/Check.hx b/std/haxe/xml/Check.hx
index d16b5184394cf59ca3e0c3bcd175c320e947dd38..94c5e75b9567ad3ed20329c4006ed5ee49708b18 100644
--- a/std/haxe/xml/Check.hx
+++ b/std/haxe/xml/Check.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,303 +19,311 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.xml;
 
 enum Filter {
 	FInt;
 	FBool;
-	FEnum( values : Array<String> );
-	FReg( matcher : EReg );
+	FEnum(values:Array<String>);
+	FReg(matcher:EReg);
 }
 
 enum Attrib {
-	Att( name : String, ?filter : Filter, ?defvalue : String );
+	Att(name:String, ?filter:Filter, ?defvalue:String);
 }
 
 enum Rule {
-	RNode( name : String, ?attribs : Array<Attrib>, ?childs : Rule );
-	RData( ?filter : Filter );
-	RMulti( rule : Rule, ?atLeastOne : Bool );
-	RList( rules : Array<Rule>, ?ordered : Bool );
-	RChoice( choices : Array<Rule> );
-	ROptional( rule : Rule );
+	RNode(name:String, ?attribs:Array<Attrib>, ?childs:Rule);
+	RData(?filter:Filter);
+	RMulti(rule:Rule, ?atLeastOne:Bool);
+	RList(rules:Array<Rule>, ?ordered:Bool);
+	RChoice(choices:Array<Rule>);
+	ROptional(rule:Rule);
 }
 
 private enum CheckResult {
 	CMatch;
-	CMissing( r : Rule );
-	CExtra( x : Xml );
-	CElementExpected( name : String, x : Xml );
-	CDataExpected( x : Xml );
-	CExtraAttrib( att : String, x : Xml );
-	CMissingAttrib( att : String, x : Xml );
-	CInvalidAttrib( att : String, x : Xml, f : Filter );
-	CInvalidData( x : Xml, f : Filter );
-	CInElement( x : Xml, r : CheckResult );
+	CMissing(r:Rule);
+	CExtra(x:Xml);
+	CElementExpected(name:String, x:Xml);
+	CDataExpected(x:Xml);
+	CExtraAttrib(att:String, x:Xml);
+	CMissingAttrib(att:String, x:Xml);
+	CInvalidAttrib(att:String, x:Xml, f:Filter);
+	CInvalidData(x:Xml, f:Filter);
+	CInElement(x:Xml, r:CheckResult);
 }
 
 class Check {
-
 	static var blanks = ~/^[ \r\n\t]*$/;
 
-	static function isBlank( x : Xml ) {
-		return( x.nodeType == Xml.PCData && blanks.match(x.nodeValue) ) || x.nodeType == Xml.Comment;
+	static function isBlank(x:Xml) {
+		return (x.nodeType == Xml.PCData && blanks.match(x.nodeValue)) || x.nodeType == Xml.Comment;
 	}
 
-	static function filterMatch( s : String, f : Filter ) {
-		switch( f ) {
-		case FInt: return filterMatch(s,FReg(~/[0-9]+/));
-		case FBool: return filterMatch(s,FEnum(["true","false","0","1"]));
-		case FEnum(values):
-			for( v in values )
-				if( s == v )
-					return true;
-			return false;
-		case FReg(r):
-			return r.match(s);
+	static function filterMatch(s:String, f:Filter) {
+		switch (f) {
+			case FInt:
+				return filterMatch(s, FReg(~/[0-9]+/));
+			case FBool:
+				return filterMatch(s, FEnum(["true", "false", "0", "1"]));
+			case FEnum(values):
+				for (v in values)
+					if (s == v)
+						return true;
+				return false;
+			case FReg(r):
+				return r.match(s);
 		}
 	}
 
-	static function isNullable( r : Rule ) {
-		switch( r ) {
-		case RMulti(r,one):
-			return( one != true || isNullable(r) );
-		case RList(rl,_):
-			for( r in rl )
-				if( !isNullable(r) )
-					return false;
-			return true;
-		case RChoice(rl):
-			for( r in rl )
-				if( isNullable(r) )
-					return true;
-			return false;
-		case RData(_):
-			return false;
-		case RNode(_,_,_):
-			return false;
-		case ROptional(_):
-			return true;
+	static function isNullable(r:Rule) {
+		switch (r) {
+			case RMulti(r, one):
+				return (one != true || isNullable(r));
+			case RList(rl, _):
+				for (r in rl)
+					if (!isNullable(r))
+						return false;
+				return true;
+			case RChoice(rl):
+				for (r in rl)
+					if (isNullable(r))
+						return true;
+				return false;
+			case RData(_):
+				return false;
+			case RNode(_, _, _):
+				return false;
+			case ROptional(_):
+				return true;
 		}
 	}
 
-	static function check( x : Xml, r : Rule ) {
-		switch( r ) {
-		// check the node validity
-		case RNode(name,attribs,childs):
-			if( x.nodeType != Xml.Element || x.nodeName != name )
-				return CElementExpected(name,x);
-			var attribs = if( attribs == null ) new Array() else attribs.copy();
-			// check defined attributes
-			for( xatt in x.attributes() ) {
-				var found = false;
-				for( att in attribs )
-					switch( att ) {
-					case Att(name,filter,_):
-						if( xatt != name )
-							continue;
-						if( filter != null && !filterMatch(x.get(xatt),filter) )
-							return CInvalidAttrib(name,x,filter);
-						attribs.remove(att);
-						found = true;
-					}
-				if( !found )
-					return CExtraAttrib(xatt,x);
-			}
-			// check remaining unchecked attributes
-			for( att in attribs )
-				switch( att ) {
-				case Att(name,_,defvalue):
-					if( defvalue == null )
-						return CMissingAttrib(name,x);
-				}
-			// check childs
-			if( childs == null )
-				childs = RList([]);
-			var m = checkList(x.iterator(),childs);
-			if( m != CMatch )
-				return CInElement(x,m);
-			// set default attribs values
-			for( att in attribs )
-				switch( att ) {
-				case Att(name,_,defvalue):
-					x.set(name,defvalue);
+	static function check(x:Xml, r:Rule) {
+		switch (r) {
+			// check the node validity
+			case RNode(name, attribs, childs):
+				if (x.nodeType != Xml.Element || x.nodeName != name)
+					return CElementExpected(name, x);
+				var attribs = if (attribs == null) new Array() else attribs.copy();
+				// check defined attributes
+				for (xatt in x.attributes()) {
+					var found = false;
+					for (att in attribs)
+						switch (att) {
+							case Att(name, filter, _):
+								if (xatt != name)
+									continue;
+								if (filter != null && !filterMatch(x.get(xatt), filter))
+									return CInvalidAttrib(name, x, filter);
+								attribs.remove(att);
+								found = true;
+						}
+					if (!found)
+						return CExtraAttrib(xatt, x);
 				}
-			return CMatch;
-		// check the data validity
-		case RData(filter):
-			if( x.nodeType != Xml.PCData && x.nodeType != Xml.CData )
-				return CDataExpected(x);
-			if( filter != null && !filterMatch(x.nodeValue,filter) )
-				return CInvalidData(x,filter);
-			return CMatch;
-		// several choices
-		case RChoice(choices):
-			if( choices.length == 0 )
-				throw "No choice possible";
-			for( c in choices )
-				if( check(x,c) == CMatch )
-					return CMatch;
-			return check(x,choices[0]);
-		case ROptional(r):
-			return check(x,r);
-		default:
-			throw "Unexpected "+Std.string(r);
+				// check remaining unchecked attributes
+				for (att in attribs)
+					switch (att) {
+						case Att(name, _, defvalue):
+							if (defvalue == null)
+								return CMissingAttrib(name, x);
+					}
+				// check childs
+				if (childs == null)
+					childs = RList([]);
+				var m = checkList(x.iterator(), childs);
+				if (m != CMatch)
+					return CInElement(x, m);
+				// set default attribs values
+				for (att in attribs)
+					switch (att) {
+						case Att(name, _, defvalue):
+							x.set(name, defvalue);
+					}
+				return CMatch;
+			// check the data validity
+			case RData(filter):
+				if (x.nodeType != Xml.PCData && x.nodeType != Xml.CData)
+					return CDataExpected(x);
+				if (filter != null && !filterMatch(x.nodeValue, filter))
+					return CInvalidData(x, filter);
+				return CMatch;
+			// several choices
+			case RChoice(choices):
+				if (choices.length == 0)
+					throw "No choice possible";
+				for (c in choices)
+					if (check(x, c) == CMatch)
+						return CMatch;
+				return check(x, choices[0]);
+			case ROptional(r):
+				return check(x, r);
+			default:
+				throw "Unexpected " + Std.string(r);
 		}
 	}
 
-	static function checkList( it : Iterator<Xml>, r : Rule ) {
-		switch( r ) {
-		case RList(rules,ordered):
-			var rules = rules.copy();
-			for( x in it ) {
-				if( isBlank(x) )
-					continue;
-				var found = false;
-				for( r in rules ) {
-					var m = checkList([x].iterator(),r);
-					if( m == CMatch ) {
-						found = true;
-						switch(r) {
-						case RMulti(rsub,one):
-							if( one ) {
-								var i;
-								for( i in 0...rules.length )
-									if( rules[i] == r )
-										rules[i] = RMulti(rsub);
+	static function checkList(it:Iterator<Xml>, r:Rule) {
+		switch (r) {
+			case RList(rules, ordered):
+				var rules = rules.copy();
+				for (x in it) {
+					if (isBlank(x))
+						continue;
+					var found = false;
+					for (r in rules) {
+						var m = checkList([x].iterator(), r);
+						if (m == CMatch) {
+							found = true;
+							switch (r) {
+								case RMulti(rsub, one):
+									if (one) {
+										var i;
+										for (i in 0...rules.length)
+											if (rules[i] == r)
+												rules[i] = RMulti(rsub);
+									}
+								default:
+									rules.remove(r);
 							}
-						default:
-							rules.remove(r);
-						}
-						break;
-					} else if( ordered && !isNullable(r) )
+							break;
+						} else if (ordered && !isNullable(r))
+							return m;
+					}
+					if (!found)
+						return CExtra(x);
+				}
+				for (r in rules)
+					if (!isNullable(r))
+						return CMissing(r);
+				return CMatch;
+			case RMulti(r, one):
+				var found = false;
+				for (x in it) {
+					if (isBlank(x))
+						continue;
+					var m = checkList([x].iterator(), r);
+					if (m != CMatch)
 						return m;
+					found = true;
 				}
-				if( !found )
-					return CExtra(x);
-			}
-			for( r in rules )
-				if( !isNullable(r) )
+				if (one && !found)
 					return CMissing(r);
-			return CMatch;
-		case RMulti(r,one):
-			var found = false;
-			for( x in it ) {
-				if( isBlank(x) )
-					continue;
-				var m = checkList([x].iterator(),r);
-				if( m != CMatch )
-					return m;
-				found = true;
-			}
-			if( one && !found )
-				return CMissing(r);
-			return CMatch;
-		default:
-			var found = false;
-			for( x in it ) {
-				if( isBlank(x) )
-					continue;
-				var m = check(x,r);
-				if( m != CMatch )
-					return m;
-				found = true;
-				break;
-			}
-			if( !found ) {
-				switch(r) {
-				case ROptional(_):
-				default: return CMissing(r);
+				return CMatch;
+			default:
+				var found = false;
+				for (x in it) {
+					if (isBlank(x))
+						continue;
+					var m = check(x, r);
+					if (m != CMatch)
+						return m;
+					found = true;
+					break;
 				}
-			}
-			for( x in it ) {
-				if( isBlank(x) )
-					continue;
-				return CExtra(x);
-			}
-			return CMatch;
+				if (!found) {
+					switch (r) {
+						case ROptional(_):
+						default: return CMissing(r);
+					}
+				}
+				for (x in it) {
+					if (isBlank(x))
+						continue;
+					return CExtra(x);
+				}
+				return CMatch;
 		}
 	}
 
-	static function makeWhere( path : Array<Xml> ) {
-		if( path.length == 0 )
+	static function makeWhere(path:Array<Xml>) {
+		if (path.length == 0)
 			return "";
 		var s = "In ";
 		var first = true;
-		for( x in path ) {
-			if( first )
+		for (x in path) {
+			if (first)
 				first = false;
 			else
 				s += ".";
 			s += x.nodeName;
 		}
-		return s+": ";
+		return s + ": ";
 	}
 
-	static function makeString( x : Xml ) {
-		if( x.nodeType == Xml.Element )
-			return "element "+x.nodeName;
+	static function makeString(x:Xml) {
+		if (x.nodeType == Xml.Element)
+			return "element " + x.nodeName;
 		var s = x.nodeValue.split("\r").join("\\r").split("\n").join("\\n").split("\t").join("\\t");
-		if( s.length > 20 )
-			return s.substr(0,17)+"...";
+		if (s.length > 20)
+			return s.substr(0, 17) + "...";
 		return s;
 	}
 
-	static function makeRule( r : Rule ) {
-		switch( r ) {
-		case RNode(name,_,_): return "element "+name;
-		case RData(_): return "data";
-		case RMulti(r,_): return makeRule(r);
-		case RList(rules,_): return makeRule(rules[0]);
-		case RChoice(choices): return makeRule(choices[0]);
-		case ROptional(r): return makeRule(r);
+	static function makeRule(r:Rule) {
+		switch (r) {
+			case RNode(name, _, _):
+				return "element " + name;
+			case RData(_):
+				return "data";
+			case RMulti(r, _):
+				return makeRule(r);
+			case RList(rules, _):
+				return makeRule(rules[0]);
+			case RChoice(choices):
+				return makeRule(choices[0]);
+			case ROptional(r):
+				return makeRule(r);
 		}
 	}
 
-	static function makeError(m,?path) {
-		if( path == null )
+	static function makeError(m, ?path) {
+		if (path == null)
 			path = new Array();
-		switch( m ) {
-		case CMatch: throw "assert";
-		case CMissing(r):
-			return makeWhere(path)+"Missing "+makeRule(r);
-		case CExtra(x):
-			return makeWhere(path)+"Unexpected "+makeString(x);
-		case CElementExpected(name,x):
-			return makeWhere(path)+makeString(x)+" while expected element "+name;
-		case CDataExpected(x):
-			return makeWhere(path)+makeString(x)+" while data expected";
-		case CExtraAttrib(att,x):
-			path.push(x);
-			return makeWhere(path)+"unexpected attribute "+att;
-		case CMissingAttrib(att,x):
-			path.push(x);
-			return makeWhere(path)+"missing required attribute "+att;
-		case CInvalidAttrib(att,x,_):
-			path.push(x);
-			return makeWhere(path)+"invalid attribute value for "+att;
-		case CInvalidData(x,_):
-			return makeWhere(path)+"invalid data format for "+makeString(x);
-		case CInElement(x,m):
-			path.push(x);
-			return makeError(m,path);
+		switch (m) {
+			case CMatch:
+				throw "assert";
+			case CMissing(r):
+				return makeWhere(path) + "Missing " + makeRule(r);
+			case CExtra(x):
+				return makeWhere(path) + "Unexpected " + makeString(x);
+			case CElementExpected(name, x):
+				return makeWhere(path) + makeString(x) + " while expected element " + name;
+			case CDataExpected(x):
+				return makeWhere(path) + makeString(x) + " while data expected";
+			case CExtraAttrib(att, x):
+				path.push(x);
+				return makeWhere(path) + "unexpected attribute " + att;
+			case CMissingAttrib(att, x):
+				path.push(x);
+				return makeWhere(path) + "missing required attribute " + att;
+			case CInvalidAttrib(att, x, _):
+				path.push(x);
+				return makeWhere(path) + "invalid attribute value for " + att;
+			case CInvalidData(x, _):
+				return makeWhere(path) + "invalid data format for " + makeString(x);
+			case CInElement(x, m):
+				path.push(x);
+				return makeError(m, path);
 		}
 	}
 
-	public static function checkNode( x : Xml, r : Rule ) {
-		var m = checkList([x].iterator(),r);
-		if( m == CMatch )
+	public static function checkNode(x:Xml, r:Rule) {
+		var m = checkList([x].iterator(), r);
+		if (m == CMatch)
 			return;
 		throw makeError(m);
 	}
 
-	public static function checkDocument( x : Xml, r : Rule ) {
-		if( x.nodeType != Xml.Document )
+	public static function checkDocument(x:Xml, r:Rule) {
+		if (x.nodeType != Xml.Document)
 			throw "Document expected";
-		var m = checkList(x.iterator(),r);
-		if( m == CMatch )
+		var m = checkList(x.iterator(), r);
+		if (m == CMatch)
 			return;
 		throw makeError(m);
 	}
-
 }
diff --git a/std/haxe/xml/Fast.hx b/std/haxe/xml/Fast.hx
index 4fac79fedc50f8f7ace8752172a2257e06b08e6b..97a70065e7a0dd5e057e3d0405b8ab6a540a6310 100644
--- a/std/haxe/xml/Fast.hx
+++ b/std/haxe/xml/Fast.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,249 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.xml;
-
-private class NodeAccess implements Dynamic<Fast> {
-
-	var __x : Xml;
-
-	public function new( x : Xml ) {
-		__x = x;
-	}
-
-	public function resolve( name : String ) : Fast {
-		var x = __x.elementsNamed(name).next();
-		if( x == null ) {
-			var xname = if( __x.nodeType == Xml.Document ) "Document" else __x.nodeName;
-			throw xname+" is missing element "+name;
-		}
-		return new Fast(x);
-	}
-
-}
-
-private class AttribAccess implements Dynamic<String> {
-
-	var __x : Xml;
-
-	public function new( x : Xml ) {
-		__x = x;
-	}
-
-	public function resolve( name : String ) : String {
-		if( __x.nodeType == Xml.Document )
-			throw "Cannot access document attribute "+name;
-		var v = __x.get(name);
-		if( v == null )
-			throw __x.nodeName+" is missing attribute "+name;
-		return v;
-	}
-
-}
-
-private class HasAttribAccess implements Dynamic<Bool> {
-
-	var __x : Xml;
-
-	public function new( x : Xml ) {
-		__x = x;
-	}
-
-	public function resolve( name : String ) : Bool {
-		if( __x.nodeType == Xml.Document )
-			throw "Cannot access document attribute "+name;
-		return __x.exists(name);
-	}
-
-}
-
-private class HasNodeAccess implements Dynamic<Bool> {
-
-	var __x : Xml;
-
-	public function new( x : Xml ) {
-		__x = x;
-	}
-
-	public function resolve( name : String ) : Bool {
-		return __x.elementsNamed(name).hasNext();
-	}
-
-}
-
-private class NodeListAccess implements Dynamic<List<Fast>> {
-
-	var __x : Xml;
-
-	public function new( x : Xml ) {
-		__x = x;
-	}
 
-	public function resolve( name : String ) : List<Fast> {
-		var l = new List();
-		for( x in __x.elementsNamed(name) )
-			l.add(new Fast(x));
-		return l;
-	}
-
-}
-
-/**
-	The `haxe.xml.Fast` API helps providing a fast dot-syntax access to the
-	most common `Xml` methods.
-**/
-class Fast {
-	/**
-		The current corresponding `Xml` node.
-	**/
-	public var x(default, null) : Xml;
-
-	/**
-		The name of the current element. This is the same as `Xml.nodeName`.
-	**/
-	public var name(get,null) : String;
-
-	/**
-		The inner PCDATA or CDATA of the node.
-
-		An exception is thrown if there is no data or if there not only data
-		but also other nodes.
-	**/
-	public var innerData(get,null) : String;
-
-	/**
-		The XML string built with all the sub nodes, excluding the current one.
-	**/
-	public var innerHTML(get,null) : String;
-
-	/**
-		Access to the first sub element with the given name.
-
-		An exception is thrown if the element doesn't exists.
-		Use `hasNode` to check the existence of a node.
-
-		```haxe
-		var fast = new haxe.xml.Fast(Xml.parse("<user><name>John</name></user>"));
-		var user = fast.node.user;
-		var name = user.node.name;
-		trace(name.innerData); // John
-
-		// Uncaught Error: Document is missing element password
-		var password = user.node.password;
-		```
-	**/
-	public var node(default,null) : NodeAccess;
-
-	/**
-		Access to the List of elements with the given name.
-		```haxe
-		var fast = new haxe.xml.Fast(Xml.parse("<users>
-				<user name='John'/>
-				<user name='Andy'/>
-				<user name='Dan'/>
-		</users>"));
-
-		var users = fast.node.users;
-		for(user in users.nodes.user) {
-				trace(user.att.name);
-		}
-		```
-	**/
-	public var nodes(default,null) : NodeListAccess;
-
-	/**
-		Access to a given attribute.
-
-		An exception is thrown if the attribute doesn't exists.
-		Use `has` to check the existence of an attribute.
-
-		```haxe
-		var f = new haxe.xml.Fast(Xml.parse("<user name='Mark'></user>"));
-		var user = f.node.user;
-		if (user.has.name) {
-			trace(user.att.name); // Mark
-		}
-		```
-	**/
-	public var att(default,null) : AttribAccess;
-
-	/**
-		Check the existence of an attribute with the given name.
-	**/
-	public var has(default,null) : HasAttribAccess;
-
-	/**
-		Check the existence of a sub node with the given name.
-
-		```haxe
-		var f = new haxe.xml.Fast(Xml.parse("<user><age>31</age></user>"));
-		var user = f.node.user;
-		if (user.hasNode.age) {
-			trace(user.node.age.innerData); // 31
-		}
-		```
-	**/
-	public var hasNode(default,null) : HasNodeAccess;
-
-	/**
-		The list of all sub-elements which are the nodes with type `Xml.Element`.
-	**/
-	public var elements(get,null) : Iterator<Fast>;
-
-	public function new( x : Xml ) {
-		if( x.nodeType != Xml.Document && x.nodeType != Xml.Element )
-			throw "Invalid nodeType "+x.nodeType;
-		this.x = x;
-		node = new NodeAccess(x);
-		nodes = new NodeListAccess(x);
-		att = new AttribAccess(x);
-		has = new HasAttribAccess(x);
-		hasNode = new HasNodeAccess(x);
-	}
-
-	function get_name() {
-		return if( x.nodeType == Xml.Document ) "Document" else x.nodeName;
-	}
-
-	function get_innerData() {
-		var it = x.iterator();
-		if( !it.hasNext() )
-			throw name+" does not have data";
-		var v = it.next();
-		if( it.hasNext() ) {
-			var n = it.next();
-			// handle <spaces>CDATA<spaces>
-			if( v.nodeType == Xml.PCData && n.nodeType == Xml.CData && StringTools.trim(v.nodeValue) == "" ) {
-				if( !it.hasNext() )
-					return n.nodeValue;
-				var n2 = it.next();
-				if( n2.nodeType == Xml.PCData && StringTools.trim(n2.nodeValue) == "" && !it.hasNext() )
-					return n.nodeValue;
-			}
-			throw name+" does not only have data";
-		}
-		if( v.nodeType != Xml.PCData && v.nodeType != Xml.CData )
-			throw name+" does not have data";
-		return v.nodeValue;
-	}
-
-	function get_innerHTML() {
-		var s = new StringBuf();
-		for( x in x )
-			s.add(x.toString());
-		return s.toString();
-	}
+package haxe.xml;
 
-	function get_elements() {
-		var it = x.elements();
-		return {
-			hasNext : it.hasNext,
-			next : function() {
-				var x = it.next();
-				if( x == null )
-					return null;
-				return new Fast(x);
-			}
-		};
-	}
-}
+@:deprecated typedef Fast = haxe.xml.Access;
diff --git a/std/haxe/xml/Parser.hx b/std/haxe/xml/Parser.hx
index 38e3bc200fd770073b0f33552d03aac7e129139f..f02765cc485d8f28dbdc013fd3618c574dcf000a 100644
--- a/std/haxe/xml/Parser.hx
+++ b/std/haxe/xml/Parser.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,88 +19,84 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.xml;
 
 using StringTools;
 
-/* poor'man enum : reduce code size + a bit faster since inlined */
-extern private class S {
-	public static inline var IGNORE_SPACES 	= 0;
-	public static inline var BEGIN			= 1;
-	public static inline var BEGIN_NODE		= 2;
-	public static inline var TAG_NAME		= 3;
-	public static inline var BODY			= 4;
-	public static inline var ATTRIB_NAME	= 5;
-	public static inline var EQUALS			= 6;
-	public static inline var ATTVAL_BEGIN	= 7;
-	public static inline var ATTRIB_VAL		= 8;
-	public static inline var CHILDS			= 9;
-	public static inline var CLOSE			= 10;
-	public static inline var WAIT_END		= 11;
-	public static inline var WAIT_END_RET	= 12;
-	public static inline var PCDATA			= 13;
-	public static inline var HEADER			= 14;
-	public static inline var COMMENT		= 15;
-	public static inline var DOCTYPE		= 16;
-	public static inline var CDATA			= 17;
-	public static inline var ESCAPE			= 18;
+private enum abstract S(Int) {
+	var IGNORE_SPACES;
+	var BEGIN;
+	var BEGIN_NODE;
+	var TAG_NAME;
+	var BODY;
+	var ATTRIB_NAME;
+	var EQUALS;
+	var ATTVAL_BEGIN;
+	var ATTRIB_VAL;
+	var CHILDS;
+	var CLOSE;
+	var WAIT_END;
+	var WAIT_END_RET;
+	var PCDATA;
+	var HEADER;
+	var COMMENT;
+	var DOCTYPE;
+	var CDATA;
+	var ESCAPE;
 }
 
-class XmlParserException
-{
+class XmlParserException {
 	/**
-	 * the XML parsing error message
-	 */
+		the XML parsing error message
+	**/
 	public var message:String;
 
 	/**
-	 * the line number at which the XML parsing error occurred
-	 */
+		the line number at which the XML parsing error occurred
+	**/
 	public var lineNumber:Int;
 
 	/**
-	 * the character position in the reported line at which the parsing error occurred
-	 */
+		the character position in the reported line at which the parsing error occurred
+	**/
 	public var positionAtLine:Int;
 
 	/**
-	 * the character position in the XML string at which the parsing error occurred
-	 */
+		the character position in the XML string at which the parsing error occurred
+	**/
 	public var position:Int;
 
 	/**
-	 * the invalid XML string
-	 */
+		the invalid XML string
+	**/
 	public var xml:String;
 
-	public function new(message:String, xml:String, position:Int)
-	{
+	public function new(message:String, xml:String, position:Int) {
 		this.xml = xml;
 		this.message = message;
 		this.position = position;
 		lineNumber = 1;
 		positionAtLine = 0;
 
-		for( i in 0...position)
-		{
+		for (i in 0...position) {
 			var c = xml.fastCodeAt(i);
 			if (c == '\n'.code) {
 				lineNumber++;
 				positionAtLine = 0;
 			} else {
-				if (c != '\r'.code) positionAtLine++;
+				if (c != '\r'.code)
+					positionAtLine++;
 			}
 		}
 	}
 
-	public function toString():String
-	{
+	public function toString():String {
 		return Type.getClassName(Type.getClass(this)) + ": " + message + " at line " + lineNumber + " char " + positionAtLine;
 	}
 }
 
-class Parser
-{
+class Parser {
 	static var escapes = {
 		var h = new haxe.ds.StringMap();
 		h.set("lt", "<");
@@ -112,19 +108,17 @@ class Parser
 	}
 
 	/**
-	 * Parses the String into an XML Document. Set strict parsing to true in order to enable a strict check of XML attributes and entities.
-	 *
-	 * @throws haxe.xml.XmlParserException
-	 */
-	static public function parse(str:String, strict = false)
-	{
+		Parses the String into an XML Document. Set strict parsing to true in order to enable a strict check of XML attributes and entities.
+
+		@throws haxe.xml.XmlParserException
+	**/
+	static public function parse(str:String, strict = false) {
 		var doc = Xml.createDocument();
 		doParse(str, strict, 0, doc);
 		return doc;
 	}
 
-	static function doParse(str:String, strict:Bool, p:Int = 0, ?parent:Xml):Int
-	{
+	static function doParse(str:String, strict:Bool, p:Int = 0, ?parent:Xml):Int {
 		var xml:Xml = null;
 		var state = S.BEGIN;
 		var next = S.BEGIN;
@@ -141,25 +135,17 @@ class Parser
 			parent.addChild(xml);
 			nsubs++;
 		}
-		while (!StringTools.isEof(c))
-		{
-			switch(state)
-			{
+		while (!StringTools.isEof(c)) {
+			switch (state) {
 				case S.IGNORE_SPACES:
-					switch(c)
-					{
-						case
-							'\n'.code,
-							'\r'.code,
-							'\t'.code,
-							' '.code:
+					switch (c) {
+						case '\n'.code, '\r'.code, '\t'.code, ' '.code:
 						default:
 							state = next;
 							continue;
 					}
 				case S.BEGIN:
-					switch(c)
-					{
+					switch (c) {
 						case '<'.code:
 							state = S.IGNORE_SPACES;
 							next = S.BEGIN_NODE;
@@ -169,8 +155,7 @@ class Parser
 							continue;
 					}
 				case S.PCDATA:
-					if (c == '<'.code)
-					{
+					if (c == '<'.code) {
 						buf.addSub(str, start, p - start);
 						var child = Xml.createPCData(buf.toString());
 						buf = new StringBuf();
@@ -184,38 +169,31 @@ class Parser
 						start = p + 1;
 					}
 				case S.CDATA:
-					if (c == ']'.code && str.fastCodeAt(p + 1) == ']'.code && str.fastCodeAt(p + 2) == '>'.code)
-					{
+					if (c == ']'.code && str.fastCodeAt(p + 1) == ']'.code && str.fastCodeAt(p + 2) == '>'.code) {
 						var child = Xml.createCData(str.substr(start, p - start));
 						addChild(child);
 						p += 2;
 						state = S.BEGIN;
 					}
 				case S.BEGIN_NODE:
-					switch(c)
-					{
+					switch (c) {
 						case '!'.code:
-							if (str.fastCodeAt(p + 1) == '['.code)
-							{
+							if (str.fastCodeAt(p + 1) == '['.code) {
 								p += 2;
 								if (str.substr(p, 6).toUpperCase() != "CDATA[")
 									throw new XmlParserException("Expected <![CDATA[", str, p);
 								p += 5;
 								state = S.CDATA;
 								start = p + 1;
-							}
-							else if (str.fastCodeAt(p + 1) == 'D'.code || str.fastCodeAt(p + 1) == 'd'.code)
-							{
-								if(str.substr(p + 2, 6).toUpperCase() != "OCTYPE")
+							} else if (str.fastCodeAt(p + 1) == 'D'.code || str.fastCodeAt(p + 1) == 'd'.code) {
+								if (str.substr(p + 2, 6).toUpperCase() != "OCTYPE")
 									throw new XmlParserException("Expected <!DOCTYPE", str, p);
 								p += 8;
 								state = S.DOCTYPE;
 								start = p + 1;
-							}
-							else if( str.fastCodeAt(p + 1) != '-'.code || str.fastCodeAt(p + 2) != '-'.code )
+							} else if (str.fastCodeAt(p + 1) != '-'.code || str.fastCodeAt(p + 2) != '-'.code)
 								throw new XmlParserException("Expected <!--", str, p);
-							else
-							{
+							else {
 								p += 2;
 								state = S.COMMENT;
 								start = p + 1;
@@ -224,7 +202,7 @@ class Parser
 							state = S.HEADER;
 							start = p;
 						case '/'.code:
-							if( parent == null )
+							if (parent == null)
 								throw new XmlParserException("Expected node name", str, p);
 							start = p + 1;
 							state = S.IGNORE_SPACES;
@@ -235,9 +213,8 @@ class Parser
 							continue;
 					}
 				case S.TAG_NAME:
-					if (!isValidChar(c))
-					{
-						if( p == start )
+					if (!isValidChar(c)) {
+						if (p == start)
 							throw new XmlParserException("Expected node name", str, p);
 						xml = Xml.createElement(str.substr(start, p - start));
 						addChild(xml);
@@ -246,8 +223,7 @@ class Parser
 						continue;
 					}
 				case S.BODY:
-					switch(c)
-					{
+					switch (c) {
 						case '/'.code:
 							state = S.WAIT_END;
 						case '>'.code:
@@ -258,22 +234,20 @@ class Parser
 							continue;
 					}
 				case S.ATTRIB_NAME:
-					if (!isValidChar(c))
-					{
+					if (!isValidChar(c)) {
 						var tmp;
-						if( start == p )
+						if (start == p)
 							throw new XmlParserException("Expected attribute name", str, p);
-						tmp = str.substr(start,p-start);
+						tmp = str.substr(start, p - start);
 						aname = tmp;
-						if( xml.exists(aname) )
+						if (xml.exists(aname))
 							throw new XmlParserException("Duplicate attribute [" + aname + "]", str, p);
 						state = S.IGNORE_SPACES;
 						next = S.EQUALS;
 						continue;
 					}
 				case S.EQUALS:
-					switch(c)
-					{
+					switch (c) {
 						case '='.code:
 							state = S.IGNORE_SPACES;
 							next = S.ATTVAL_BEGIN;
@@ -281,8 +255,7 @@ class Parser
 							throw new XmlParserException("Expected =", str, p);
 					}
 				case S.ATTVAL_BEGIN:
-					switch(c)
-					{
+					switch (c) {
 						case '"'.code | '\''.code:
 							buf = new StringBuf();
 							state = S.ATTRIB_VAL;
@@ -298,7 +271,7 @@ class Parser
 							state = S.ESCAPE;
 							escapeNext = S.ATTRIB_VAL;
 							start = p + 1;
-						case '>'.code | '<'.code if( strict ):
+						case '>'.code | '<'.code if (strict):
 							// HTML allows these in attributes values
 							throw new XmlParserException("Invalid unescaped " + String.fromCharCode(c) + " in attribute value", str, p);
 						case _ if (c == attrValQuote):
@@ -314,81 +287,75 @@ class Parser
 					start = p;
 					state = S.BEGIN;
 				case S.WAIT_END:
-					switch(c)
-					{
+					switch (c) {
 						case '>'.code:
 							state = S.BEGIN;
-						default :
+						default:
 							throw new XmlParserException("Expected >", str, p);
 					}
 				case S.WAIT_END_RET:
-					switch(c)
-					{
+					switch (c) {
 						case '>'.code:
-							if( nsubs == 0 )
+							if (nsubs == 0)
 								parent.addChild(Xml.createPCData(""));
 							return p;
-						default :
+						default:
 							throw new XmlParserException("Expected >", str, p);
 					}
 				case S.CLOSE:
-					if (!isValidChar(c))
-					{
-						if( start == p )
+					if (!isValidChar(c)) {
+						if (start == p)
 							throw new XmlParserException("Expected node name", str, p);
 
-						var v = str.substr(start,p - start);
+						var v = str.substr(start, p - start);
+						if (parent == null || parent.nodeType != Element) {
+							throw new XmlParserException('Unexpected </$v>, tag is not open', str, p);
+						}
 						if (v != parent.nodeName)
-							throw new XmlParserException("Expected </" +parent.nodeName + ">", str, p);
+							throw new XmlParserException("Expected </" + parent.nodeName + ">", str, p);
 
 						state = S.IGNORE_SPACES;
 						next = S.WAIT_END_RET;
 						continue;
 					}
 				case S.COMMENT:
-					if (c == '-'.code && str.fastCodeAt(p +1) == '-'.code && str.fastCodeAt(p + 2) == '>'.code)
-					{
+					if (c == '-'.code && str.fastCodeAt(p + 1) == '-'.code && str.fastCodeAt(p + 2) == '>'.code) {
 						addChild(Xml.createComment(str.substr(start, p - start)));
 						p += 2;
 						state = S.BEGIN;
 					}
 				case S.DOCTYPE:
-					if(c == '['.code)
+					if (c == '['.code)
 						nbrackets++;
-					else if(c == ']'.code)
+					else if (c == ']'.code)
 						nbrackets--;
-					else if (c == '>'.code && nbrackets == 0)
-					{
+					else if (c == '>'.code && nbrackets == 0) {
 						addChild(Xml.createDocType(str.substr(start, p - start)));
 						state = S.BEGIN;
 					}
 				case S.HEADER:
-					if (c == '?'.code && str.fastCodeAt(p + 1) == '>'.code)
-					{
+					if (c == '?'.code && str.fastCodeAt(p + 1) == '>'.code) {
 						p++;
 						var str = str.substr(start + 1, p - start - 2);
 						addChild(Xml.createProcessingInstruction(str));
 						state = S.BEGIN;
 					}
 				case S.ESCAPE:
-					if (c == ';'.code)
-					{
+					if (c == ';'.code) {
 						var s = str.substr(start, p - start);
 						if (s.fastCodeAt(0) == '#'.code) {
-							var c = s.fastCodeAt(1) == 'x'.code
-								? Std.parseInt("0" +s.substr(1, s.length - 1))
-								: Std.parseInt(s.substr(1, s.length - 1));
-							#if (neko || cpp || php || lua)
-							if( c >= 128 ) {
+							var c = s.fastCodeAt(1) == 'x'.code ? Std.parseInt("0" + s.substr(1, s.length - 1)) : Std.parseInt(s.substr(1, s.length - 1));
+							#if !(target.unicode)
+							if (c >= 128) {
 								// UTF8-encode it
-								if( c <= 0x7FF ) {
+								if (c <= 0x7FF) {
 									buf.addChar(0xC0 | (c >> 6));
 									buf.addChar(0x80 | (c & 63));
-								} else if( c <= 0xFFFF ) {
+								} else if (c <= 0xFFFF) {
 									buf.addChar(0xE0 | (c >> 12));
 									buf.addChar(0x80 | ((c >> 6) & 63));
 									buf.addChar(0x80 | (c & 63));
-								} else if( c <= 0x10FFFF ) {
+								} else if (c <= 0x10FFFF) {
 									buf.addChar(0xF0 | (c >> 18));
 									buf.addChar(0x80 | ((c >> 12) & 63));
 									buf.addChar(0x80 | ((c >> 6) & 63));
@@ -399,7 +366,7 @@ class Parser
 							#end
 							buf.addChar(c);
 						} else if (!escapes.exists(s)) {
-							if( strict )
+							if (strict)
 								throw new XmlParserException("Undefined entity: " + s, str, p);
 							buf.add('&$s;');
 						} else {
@@ -408,7 +375,7 @@ class Parser
 						start = p + 1;
 						state = escapeNext;
 					} else if (!isValidChar(c) && c != "#".code) {
-						if( strict )
+						if (strict)
 							throw new XmlParserException("Invalid character in entity: " + String.fromCharCode(c), str, p);
 						buf.addChar("&".code);
 						buf.addSub(str, start, p - start);
@@ -420,22 +387,23 @@ class Parser
 			c = str.fastCodeAt(++p);
 		}
 
-		if (state == S.BEGIN)
-		{
+		if (state == S.BEGIN) {
 			start = p;
 			state = S.PCDATA;
 		}
 
-		if (state == S.PCDATA)
-		{
+		if (state == S.PCDATA) {
+			if (parent.nodeType == Element) {
+				throw new XmlParserException("Unclosed node <" + parent.nodeName + ">", str, p);
+			}
 			if (p != start || nsubs == 0) {
-				buf.addSub(str, start, p-start);
+				buf.addSub(str, start, p - start);
 				addChild(Xml.createPCData(buf.toString()));
 			}
 			return p;
 		}
 
-		if( !strict && state == S.ESCAPE && escapeNext == S.PCDATA ) {
+		if (!strict && state == S.ESCAPE && escapeNext == S.PCDATA) {
 			buf.addChar("&".code);
 			buf.addSub(str, start, p - start);
 			addChild(Xml.createPCData(buf.toString()));
@@ -446,6 +414,7 @@ class Parser
 	}
 
 	static inline function isValidChar(c) {
-		return (c >= 'a'.code && c <= 'z'.code) || (c >= 'A'.code && c <= 'Z'.code) || (c >= '0'.code && c <= '9'.code) || c == ':'.code || c == '.'.code || c == '_'.code || c == '-'.code;
+		return (c >= 'a'.code && c <= 'z'.code) || (c >= 'A'.code && c <= 'Z'.code) || (c >= '0'.code && c <= '9'.code) || c == ':'.code || c == '.'.code
+			|| c == '_'.code || c == '-'.code;
 	}
 }
diff --git a/std/haxe/xml/Printer.hx b/std/haxe/xml/Printer.hx
index aa47d1e2ace652221f312ae89a2f32c7ea34a06f..d64661888a6920fbfefcb8cb669f5b118236c8d2 100644
--- a/std/haxe/xml/Printer.hx
+++ b/std/haxe/xml/Printer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,13 +23,13 @@
 package haxe.xml;
 
 /**
-	This class provides utility methods to convert Xml instances to 
+	This class provides utility methods to convert Xml instances to
 	String representation.
 **/
 class Printer {
 	/**
 		Convert `Xml` to string representation.
-		
+
 		Set `pretty` to `true` to prettify the result.
 	**/
 	static public function print(xml:Xml, ?pretty = false) {
@@ -50,7 +50,7 @@ class Printer {
 		switch (value.nodeType) {
 			case CData:
 				write(tabs + "<![CDATA[");
-				write(StringTools.trim(value.nodeValue));
+				write(value.nodeValue);
 				write("]]>");
 				newline();
 			case Comment:
diff --git a/std/haxe/xml/Proxy.hx b/std/haxe/xml/Proxy.hx
index b607e6128a2fa1936a5f4b288d4721bd5281c376..f897a15b09aaf1e15c6ad408c144d5a60add128d 100644
--- a/std/haxe/xml/Proxy.hx
+++ b/std/haxe/xml/Proxy.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.xml;
 
 /**
@@ -29,7 +30,7 @@ package haxe.xml;
 	```haxe
 	class MyXml extends haxe.xml.Proxy<"my.xml", MyStructure> {
 	}
-	
+
 	var h = new haxe.ds.StringMap<MyStructure>();
 	// ... fill h with "my.xml" content
 	var m = new MyXml(h.get);
@@ -38,9 +39,8 @@ package haxe.xml;
 	// in your XML, and completion works as well.
 	```
 **/
-class Proxy<Const,T> {
-
-	var __f : String -> T;
+class Proxy<Const, T> {
+	var __f:String->T;
 
 	public function new(f) {
 		this.__f = f;
@@ -49,5 +49,4 @@ class Proxy<Const,T> {
 	public function resolve(k) {
 		return __f(k);
 	}
-
 }
diff --git a/std/haxe/zip/Compress.hx b/std/haxe/zip/Compress.hx
index d87535b5302a4c9329e374ad5d4239a4ce007d87..b6bb2b44b03fdf8fa1a3e8b7d89fcb9c27c05b67 100644
--- a/std/haxe/zip/Compress.hx
+++ b/std/haxe/zip/Compress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,27 +19,24 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 class Compress {
-
-	public function new( level : Int ) {
+	public function new(level:Int) {
 		throw "Not implemented for this platform";
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
 		return null;
 	}
 
-	public function setFlushMode( f : FlushMode ) {
-	}
+	public function setFlushMode(f:FlushMode) {}
 
-	public function close() {
-	}
+	public function close() {}
 
-	public static function run( s : haxe.io.Bytes, level : Int ) : haxe.io.Bytes {
+	public static function run(s:haxe.io.Bytes, level:Int):haxe.io.Bytes {
 		throw "Not implemented for this platform";
 		return null;
 	}
-
 }
diff --git a/std/haxe/zip/Entry.hx b/std/haxe/zip/Entry.hx
index 4ca3cf4e8a3625bdfbc09cdcce4501f173b70e22..cb8c2d55020470d3576ebae7a73bacdd960650bf 100644
--- a/std/haxe/zip/Entry.hx
+++ b/std/haxe/zip/Entry.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,22 +19,24 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
+import haxe.ds.List;
+
 enum ExtraField {
-	FUnknown( tag : Int, bytes : haxe.io.Bytes );
-	FInfoZipUnicodePath( name : String, crc : Int );
+	FUnknown(tag:Int, bytes:haxe.io.Bytes);
+	FInfoZipUnicodePath(name:String, crc:Int);
 	FUtf8;
 }
 
-typedef Entry =  {
-	var fileName : String;
-	var fileSize : Int;
-	var fileTime : Date;
-	var compressed : Bool;
-	var dataSize : Int;
-	var data : Null<haxe.io.Bytes>;
-	var crc32 : Null<Int>;
-	@:optional var extraFields : Null<List<ExtraField>>;
+typedef Entry = {
+	var fileName:String;
+	var fileSize:Int;
+	var fileTime:Date;
+	var compressed:Bool;
+	var dataSize:Int;
+	var data:Null<haxe.io.Bytes>;
+	var crc32:Null<Int>;
+	var ?extraFields:Null<List<ExtraField>>;
 }
-
diff --git a/std/haxe/zip/FlushMode.hx b/std/haxe/zip/FlushMode.hx
index 9a529f7b4cc4575b31c50f90ab98b269a05de970..8e47a69a105c50da9f32376024dee209f1c95e92 100644
--- a/std/haxe/zip/FlushMode.hx
+++ b/std/haxe/zip/FlushMode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 enum FlushMode {
diff --git a/std/haxe/zip/Huffman.hx b/std/haxe/zip/Huffman.hx
index b1e87443c2bf34e8bc28aa6735148ea70ef2c6f7..fb3368b9dc64e4eca36faab8a039c474a2d11ea2 100644
--- a/std/haxe/zip/Huffman.hx
+++ b/std/haxe/zip/Huffman.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,97 +19,99 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 enum Huffman {
-	Found( i : Int );
-	NeedBit( left : Huffman, right : Huffman );
-	NeedBits( n : Int, table : Array<Huffman> );
+	Found(i:Int);
+	NeedBit(left:Huffman, right:Huffman);
+	NeedBits(n:Int, table:Array<Huffman>);
 }
 
 class HuffTools {
-
-	public function new() {
-	}
+	public function new() {}
 
 	function treeDepth(t) {
-		return switch(t) {
-		case Found(_): 0;
-		case NeedBits(_,_): throw "assert";
-		case NeedBit(a,b):
-			var da = treeDepth(a);
-			var db = treeDepth(b);
-			1 + ((da < db) ? da : db);
+		return switch (t) {
+			case Found(_): 0;
+			case NeedBits(_, _): throw "assert";
+			case NeedBit(a, b):
+				var da = treeDepth(a);
+				var db = treeDepth(b);
+				1 + ((da < db) ? da : db);
 		}
 	}
 
 	function treeCompress(t) {
 		var d = treeDepth(t);
-		if( d == 0 )
+		if (d == 0)
 			return t;
-		if( d == 1 )
-			return switch( t ) {
-			case NeedBit(a,b): NeedBit(treeCompress(a),treeCompress(b));
-			default: throw "assert";
+		if (d == 1)
+			return switch (t) {
+				case NeedBit(a, b): NeedBit(treeCompress(a), treeCompress(b));
+				default: throw "assert";
 			}
 		var size = 1 << d;
 		var table = new Array();
-		for( i in 0...size )
+		for (i in 0...size)
 			table.push(Found(-1));
-		treeWalk(table,0,0,d,t);
-		return NeedBits(d,table);
+		treeWalk(table, 0, 0, d, t);
+		return NeedBits(d, table);
 	}
 
-	function treeWalk(table,p,cd,d,t) {
-		switch( t ) {
-		case NeedBit(a,b):
-			if( d > 0 ) {
-				treeWalk(table,p,cd+1,d-1,a);
-				treeWalk(table,p|(1<<cd),cd+1,d-1,b);
-			} else
+	function treeWalk(table, p, cd, d, t) {
+		switch (t) {
+			case NeedBit(a, b):
+				if (d > 0) {
+					treeWalk(table, p, cd + 1, d - 1, a);
+					treeWalk(table, p | (1 << cd), cd + 1, d - 1, b);
+				} else
+					table[p] = treeCompress(t);
+			default:
 				table[p] = treeCompress(t);
-		default:
-			table[p] = treeCompress(t);
 		}
 	}
 
-	function treeMake( bits : haxe.ds.IntMap<Int>, maxbits : Int, v : Int, len : Int ) {
-		if( len > maxbits ) throw "Invalid huffman";
+	function treeMake(bits:haxe.ds.IntMap<Int>, maxbits:Int, v:Int, len:Int) {
+		if (len > maxbits)
+			throw "Invalid huffman";
 		var idx = (v << 5) | len;
-		if( bits.exists(idx) )
+		if (bits.exists(idx))
 			return Found(bits.get(idx));
 		v <<= 1;
 		len += 1;
-		return NeedBit(treeMake(bits,maxbits,v,len),treeMake(bits,maxbits,v|1,len));
+		return NeedBit(treeMake(bits, maxbits, v, len), treeMake(bits, maxbits, v | 1, len));
 	}
 
-	public function make(lengths,pos,nlengths,maxbits) {
+	public function make(lengths, pos, nlengths, maxbits) {
 		var counts = new Array();
 		var tmp = new Array();
-		if( maxbits > 32 ) throw "Invalid huffman";
-		for( i in 0...maxbits ) {
+		if (maxbits > 32)
+			throw "Invalid huffman";
+		for (i in 0...maxbits) {
 			counts.push(0);
 			tmp.push(0);
 		}
-		for( i in 0...nlengths ) {
-			var p = lengths[i+pos];
-			if( p >= maxbits ) throw "Invalid huffman";
+		for (i in 0...nlengths) {
+			var p = lengths[i + pos];
+			if (p >= maxbits)
+				throw "Invalid huffman";
 			counts[p]++;
 		}
 		var code = 0;
-		for( i in 1...maxbits-1 ) {
+		for (i in 1...maxbits - 1) {
 			code = (code + counts[i]) << 1;
 			tmp[i] = code;
 		}
 		var bits = new haxe.ds.IntMap();
-		for( i in 0...nlengths ) {
+		for (i in 0...nlengths) {
 			var l = lengths[i + pos];
-			if( l != 0 ) {
-				var n = tmp[l-1];
-				tmp[l-1] = n + 1;
-				bits.set((n << 5) | l,i);
+			if (l != 0) {
+				var n = tmp[l - 1];
+				tmp[l - 1] = n + 1;
+				bits.set((n << 5) | l, i);
 			}
 		}
-		return treeCompress(NeedBit(treeMake(bits,maxbits,0,1),treeMake(bits,maxbits,1,1)));
+		return treeCompress(NeedBit(treeMake(bits, maxbits, 0, 1), treeMake(bits, maxbits, 1, 1)));
 	}
 }
diff --git a/std/haxe/zip/InflateImpl.hx b/std/haxe/zip/InflateImpl.hx
index f77ff0fb33771996ea18e4cd348bd90258165d43..8cf99921c2282a066202b33403b1d445493e13e4 100644
--- a/std/haxe/zip/InflateImpl.hx
+++ b/std/haxe/zip/InflateImpl.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,42 +19,48 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
+
 import haxe.zip.Huffman;
 import haxe.crypto.Adler32;
 
 private class Window {
-
 	public static inline var SIZE = 1 << 15;
 	public static inline var BUFSIZE = 1 << 16;
 
-	public var buffer : haxe.io.Bytes;
-	public var pos : Int;
-	var crc : Adler32;
+	public var buffer:haxe.io.Bytes;
+	public var pos:Int;
+
+	var crc:Adler32;
 
 	public function new(hasCrc) {
 		buffer = haxe.io.Bytes.alloc(BUFSIZE);
 		pos = 0;
-		if( hasCrc ) crc = new Adler32();
+		if (hasCrc)
+			crc = new Adler32();
 	}
 
 	public function slide() {
-		if( crc != null ) crc.update(buffer,0,SIZE);
+		if (crc != null)
+			crc.update(buffer, 0, SIZE);
 		var b = haxe.io.Bytes.alloc(BUFSIZE);
 		pos -= SIZE;
-		b.blit(0,buffer,SIZE,pos);
+		b.blit(0, buffer, SIZE, pos);
 		buffer = b;
 	}
 
-	public function addBytes(b,p,len) {
-		if( pos + len > BUFSIZE ) slide();
-		buffer.blit(pos,b,p,len);
+	public function addBytes(b, p, len) {
+		if (pos + len > BUFSIZE)
+			slide();
+		buffer.blit(pos, b, p, len);
 		pos += len;
 	}
 
 	public function addByte(c) {
-		if( pos == BUFSIZE ) slide();
-		buffer.set(pos,c);
+		if (pos == BUFSIZE)
+			slide();
+		buffer.set(pos, c);
 		pos++;
 	}
 
@@ -67,10 +73,10 @@ private class Window {
 	}
 
 	public function checksum() {
-		if( crc != null ) crc.update(buffer,0,pos);
+		if (crc != null)
+			crc.update(buffer, 0, pos);
 		return crc;
 	}
-
 }
 
 private enum State {
@@ -88,33 +94,40 @@ private enum State {
 	A pure Haxe implementation of the ZLIB Inflate algorithm which allows reading compressed data without any platform-specific support.
 **/
 class InflateImpl {
-
-	static var LEN_EXTRA_BITS_TBL = [0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,-1,-1];
-	static var LEN_BASE_VAL_TBL = [3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258];
-	static var DIST_EXTRA_BITS_TBL = [0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,-1,-1];
-	static var DIST_BASE_VAL_TBL = [1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577];
-	static var CODE_LENGTHS_POS = [16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];
-
-	var nbits : Int;
-	var bits : Int;
-	var state : State;
-	var final : Bool;
-	var huffman : Huffman;
-	var huffdist : Null<Huffman>;
-	var htools : HuffTools;
-	var len : Int;
-	var dist : Int;
-	var needed : Int;
-	var output : haxe.io.Bytes;
-	var outpos : Int;
-	var input : haxe.io.Input;
-	var lengths : Array<Int>;
-	var window : Window;
+	static var LEN_EXTRA_BITS_TBL = [
+		0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, -1, -1
+	];
+	static var LEN_BASE_VAL_TBL = [
+		3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258
+	];
+	static var DIST_EXTRA_BITS_TBL = [
+		0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, -1, -1
+	];
+	static var DIST_BASE_VAL_TBL = [
+		1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577
+	];
+	static var CODE_LENGTHS_POS = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15];
+
+	var nbits:Int;
+	var bits:Int;
+	var state:State;
+	var isFinal:Bool;
+	var huffman:Huffman;
+	var huffdist:Null<Huffman>;
+	var htools:HuffTools;
+	var len:Int;
+	var dist:Int;
+	var needed:Int;
+	var output:haxe.io.Bytes;
+	var outpos:Int;
+	var input:haxe.io.Input;
+	var lengths:Array<Int>;
+	var window:Window;
 
 	static var FIXED_HUFFMAN = null;
 
-	public function new( i, ?header = true, ?crc = true ) {
-		final = false;
+	public function new(i, ?header = true, ?crc = true) {
+		isFinal = false;
 		htools = new HuffTools();
 		huffman = buildFixedHuffman();
 		huffdist = null;
@@ -128,33 +141,32 @@ class InflateImpl {
 		output = null;
 		outpos = 0;
 		lengths = new Array();
-		for( i in 0...19 )
+		for (i in 0...19)
 			lengths.push(-1);
 		window = new Window(crc);
 	}
 
 	function buildFixedHuffman() {
-		if( FIXED_HUFFMAN != null )
+		if (FIXED_HUFFMAN != null)
 			return FIXED_HUFFMAN;
 		var a = new Array();
-		for( n in 0...288 )
-			a.push(if( n <= 143 ) 8 else if( n <= 255 ) 9 else if( n <= 279 ) 7 else 8);
-		FIXED_HUFFMAN = htools.make(a,0,288,10);
+		for (n in 0...288)
+			a.push(if (n <= 143) 8 else if (n <= 255) 9 else if (n <= 279) 7 else 8);
+		FIXED_HUFFMAN = htools.make(a, 0, 288, 10);
 		return FIXED_HUFFMAN;
 	}
 
-	public function readBytes(b,pos,len) {
+	public function readBytes(b, pos, len) {
 		needed = len;
 		outpos = pos;
 		output = b;
-		if( len > 0 )
-			while( inflateLoop() ) {
-			}
+		if (len > 0)
+			while (inflateLoop()) {}
 		return len - needed;
 	}
 
 	function getBits(n) {
-		while( nbits < n ) {
+		while (nbits < n) {
 			bits |= input.readByte() << nbits;
 			nbits += 8;
 		}
@@ -165,7 +177,7 @@ class InflateImpl {
 	}
 
 	function getBit() {
-		if( nbits == 0 ) {
+		if (nbits == 0) {
 			nbits = 8;
 			bits = input.readByte();
 		}
@@ -176,12 +188,12 @@ class InflateImpl {
 	}
 
 	function getRevBits(n) {
-		return if( n == 0 )
+		return if (n == 0)
 			0
-		else if( getBit() )
-			(1 << (n - 1)) | getRevBits(n-1)
+		else if (getBit())
+			(1 << (n - 1)) | getRevBits(n - 1)
 		else
-			getRevBits(n-1);
+			getRevBits(n - 1);
 	}
 
 	function resetBits() {
@@ -189,188 +201,200 @@ class InflateImpl {
 		nbits = 0;
 	}
 
-	function addBytes(b,p,len) {
-		window.addBytes(b,p,len);
-		output.blit(outpos,b,p,len);
+	function addBytes(b, p, len) {
+		window.addBytes(b, p, len);
+		output.blit(outpos, b, p, len);
 		needed -= len;
 		outpos += len;
 	}
 
 	function addByte(b) {
 		window.addByte(b);
-		output.set(outpos,b);
+		output.set(outpos, b);
 		needed--;
 		outpos++;
 	}
 
 	function addDistOne(n) {
 		var c = window.getLastChar();
-		for( i in 0...n )
+		for (i in 0...n)
 			addByte(c);
 	}
 
-	function addDist(d,len) {
-		addBytes(window.buffer,window.pos - d,len);
+	function addDist(d, len) {
+		addBytes(window.buffer, window.pos - d, len);
 	}
 
 	function applyHuffman(h) {
-		return switch(h) {
-		case Found(n): n;
-		case NeedBit(a,b): applyHuffman(getBit()?b:a);
-		case NeedBits(n,tbl): applyHuffman(tbl[getBits(n)]);
+		return switch (h) {
+			case Found(n): n;
+			case NeedBit(a, b): applyHuffman(getBit() ? b : a);
+			case NeedBits(n, tbl): applyHuffman(tbl[getBits(n)]);
 		}
 	}
 
-	function inflateLengths(a,max) {
+	function inflateLengths(a, max) {
 		var i = 0;
 		var prev = 0;
-		while( i < max ) {
+		while (i < max) {
 			var n = applyHuffman(huffman);
-			switch( n ) {
-			case 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15:
-				prev = n;
-				a[i] = n;
-				i++;
-			case 16:
-				var end = i + 3 + getBits(2);
-				if( end > max ) throw "Invalid data";
-				while( i < end ) {
-					a[i] = prev;
+			switch (n) {
+				case 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15:
+					prev = n;
+					a[i] = n;
 					i++;
-				}
-			case 17:
-				i += 3 + getBits(3);
-				if( i > max ) throw "Invalid data";
-			case 18:
-				i += 11 + getBits(7);
-				if( i > max ) throw "Invalid data";
-			default:
-				throw "Invalid data";
+				case 16:
+					var end = i + 3 + getBits(2);
+					if (end > max)
+						throw "Invalid data";
+					while (i < end) {
+						a[i] = prev;
+						i++;
+					}
+				case 17:
+					i += 3 + getBits(3);
+					if (i > max)
+						throw "Invalid data";
+				case 18:
+					i += 11 + getBits(7);
+					if (i > max)
+						throw "Invalid data";
+				default:
+					throw "Invalid data";
 			}
 		}
 	}
 
 	function inflateLoop() {
-		switch( state ) {
-		case Head:
-			var cmf = input.readByte();
-			var cm = cmf & 15;
-			var cinfo = cmf >> 4;
-			if( cm != 8 ) throw "Invalid data";
-			var flg = input.readByte();
-			//var fcheck = flg & 31;
-			var fdict = flg & 32 != 0;
-			//var flevel = flg >> 6;
-			if( ((cmf << 8) + flg) % 31 != 0 ) throw "Invalid data";
-			if( fdict ) throw "Unsupported dictionary";
-			state = Block;
-			return true;
-		case Crc:
-			var calc = window.checksum();
-			if( calc == null ) {
-				state = Done;
+		switch (state) {
+			case Head:
+				var cmf = input.readByte();
+				var cm = cmf & 15;
+				var cinfo = cmf >> 4;
+				if (cm != 8)
+					throw "Invalid data";
+				var flg = input.readByte();
+				// var fcheck = flg & 31;
+				var fdict = flg & 32 != 0;
+				// var flevel = flg >> 6;
+				if (((cmf << 8) + flg) % 31 != 0)
+					throw "Invalid data";
+				if (fdict)
+					throw "Unsupported dictionary";
+				state = Block;
 				return true;
-			}
-			var crc = Adler32.read(input);
-			if( !calc.equals(crc) ) throw "Invalid CRC";
-			state = Done;
-			return true;
-		case Done:
-			// nothing
-			return false;
-		case Block:
-			final = getBit();
-			switch( getBits(2) ) {
-			case 0: // no compression
-				len = input.readUInt16();
-				var nlen = input.readUInt16();
-				if( nlen != 0xFFFF - len ) throw "Invalid data";
-				state = Flat;
-				var r = inflateLoop();
-				resetBits();
-				return r;
-			case 1: // fixed Huffman
-				huffman = buildFixedHuffman();
-				huffdist = null;
-				state = CData;
-				return true;
-			case 2: // dynamic Huffman
-				var hlit = getBits(5) + 257;
-				var hdist = getBits(5) + 1;
-				var hclen = getBits(4) + 4;
-				for( i in 0...hclen )
-					lengths[CODE_LENGTHS_POS[i]] = getBits(3);
-				for( i in hclen...19 )
-					lengths[CODE_LENGTHS_POS[i]] = 0;
-				huffman = htools.make(lengths,0,19,8);
-				var lengths = new Array();
-				for( i in 0...hlit + hdist )
-					lengths.push(0);
-				inflateLengths(lengths,hlit + hdist);
-				huffdist = htools.make(lengths,hlit,hdist,16);
-				huffman = htools.make(lengths,0,hlit,16);
-				state = CData;
+			case Crc:
+				var calc = window.checksum();
+				if (calc == null) {
+					state = Done;
+					return true;
+				}
+				var crc = Adler32.read(input);
+				if (!calc.equals(crc))
+					throw "Invalid CRC";
+				state = Done;
 				return true;
-			default:
-				throw "Invalid data";
-			}
-		case Flat:
-			var rlen = (len < needed) ? len : needed;
-			var bytes = input.read(rlen);
-			len -= rlen;
-			addBytes(bytes,0,rlen);
-			if( len == 0 ) state = final ? Crc : Block;
-			return needed > 0;
-		case DistOne:
-			var rlen = (len < needed) ? len : needed;
-			addDistOne(rlen);
-			len -= rlen;
-			if( len == 0 ) state = CData;
-			return needed > 0;
-		case Dist:
-			while( len > 0 && needed > 0 ) {
-				var rdist = (len < dist) ? len : dist;
-				var rlen = (needed < rdist) ? needed : rdist;
-				addDist(dist,rlen);
+			case Done:
+				// nothing
+				return false;
+			case Block:
+				isFinal = getBit();
+				switch (getBits(2)) {
+					case 0: // no compression
+						len = input.readUInt16();
+						var nlen = input.readUInt16();
+						if (nlen != 0xFFFF - len) throw "Invalid data";
+						state = Flat;
+						var r = inflateLoop();
+						resetBits();
+						return r;
+					case 1: // fixed Huffman
+						huffman = buildFixedHuffman();
+						huffdist = null;
+						state = CData;
+						return true;
+					case 2: // dynamic Huffman
+						var hlit = getBits(5) + 257;
+						var hdist = getBits(5) + 1;
+						var hclen = getBits(4) + 4;
+						for (i in 0...hclen)
+							lengths[CODE_LENGTHS_POS[i]] = getBits(3);
+						for (i in hclen...19)
+							lengths[CODE_LENGTHS_POS[i]] = 0;
+						huffman = htools.make(lengths, 0, 19, 8);
+						var lengths = new Array();
+						for (i in 0...hlit + hdist)
+							lengths.push(0);
+						inflateLengths(lengths, hlit + hdist);
+						huffdist = htools.make(lengths, hlit, hdist, 16);
+						huffman = htools.make(lengths, 0, hlit, 16);
+						state = CData;
+						return true;
+					default:
+						throw "Invalid data";
+				}
+			case Flat:
+				var rlen = (len < needed) ? len : needed;
+				var bytes = input.read(rlen);
 				len -= rlen;
-			}
-			if( len == 0 ) state = CData;
-			return needed > 0;
-		case CData:
-			var n = applyHuffman(huffman);
-			if( n < 256 ) {
-				addByte(n);
+				addBytes(bytes, 0, rlen);
+				if (len == 0)
+					state = isFinal ? Crc : Block;
 				return needed > 0;
-			} else if( n == 256 ) {
-				state = final ? Crc : Block;
-				return true;
-			} else {
-				n -= 257;
-				var extra_bits = LEN_EXTRA_BITS_TBL[n];
-				if( extra_bits == -1 ) throw "Invalid data";
-				len = LEN_BASE_VAL_TBL[n] + getBits(extra_bits);
-				var dist_code = if( huffdist == null ) getRevBits(5) else applyHuffman(huffdist);
-				extra_bits = DIST_EXTRA_BITS_TBL[dist_code];
-				if( extra_bits == -1 ) throw "Invalid data";
-				dist = DIST_BASE_VAL_TBL[dist_code] + getBits(extra_bits);
-				if( dist > window.available() ) throw "Invalid data";
-				state = (dist == 1) ? DistOne : Dist;
-				return true;
-			}
+			case DistOne:
+				var rlen = (len < needed) ? len : needed;
+				addDistOne(rlen);
+				len -= rlen;
+				if (len == 0)
+					state = CData;
+				return needed > 0;
+			case Dist:
+				while (len > 0 && needed > 0) {
+					var rdist = (len < dist) ? len : dist;
+					var rlen = (needed < rdist) ? needed : rdist;
+					addDist(dist, rlen);
+					len -= rlen;
+				}
+				if (len == 0)
+					state = CData;
+				return needed > 0;
+			case CData:
+				var n = applyHuffman(huffman);
+				if (n < 256) {
+					addByte(n);
+					return needed > 0;
+				} else if (n == 256) {
+					state = isFinal ? Crc : Block;
+					return true;
+				} else {
+					n -= 257;
+					var extra_bits = LEN_EXTRA_BITS_TBL[n];
+					if (extra_bits == -1)
+						throw "Invalid data";
+					len = LEN_BASE_VAL_TBL[n] + getBits(extra_bits);
+					var dist_code = if (huffdist == null) getRevBits(5) else applyHuffman(huffdist);
+					extra_bits = DIST_EXTRA_BITS_TBL[dist_code];
+					if (extra_bits == -1)
+						throw "Invalid data";
+					dist = DIST_BASE_VAL_TBL[dist_code] + getBits(extra_bits);
+					if (dist > window.available())
+						throw "Invalid data";
+					state = (dist == 1) ? DistOne : Dist;
+					return true;
+				}
 		}
 	}
 
-	public static function run( i : haxe.io.Input, ?bufsize = 65536 ) {
+	public static function run(i:haxe.io.Input, ?bufsize = 65536) {
 		var buf = haxe.io.Bytes.alloc(bufsize);
 		var output = new haxe.io.BytesBuffer();
 		var inflate = new InflateImpl(i);
-		while( true ) {
-			var len = inflate.readBytes(buf,0,bufsize);
-			output.addBytes(buf,0,len);
-			if( len < bufsize )
+		while (true) {
+			var len = inflate.readBytes(buf, 0, bufsize);
+			output.addBytes(buf, 0, len);
+			if (len < bufsize)
 				break;
 		}
 		return output.getBytes();
 	}
-
 }
diff --git a/std/haxe/zip/Reader.hx b/std/haxe/zip/Reader.hx
index f25be4d1b98c5eb5f6665b5ec46b7ee05b3928dd..cdb6115a432895ac2f46b5f0081399b7dbce60d1 100644
--- a/std/haxe/zip/Reader.hx
+++ b/std/haxe/zip/Reader.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
+
 import haxe.zip.Entry;
+import haxe.ds.List;
 
 // see http://www.pkware.com/documents/casestudies/APPNOTE.TXT
-
 class Reader {
-
-	var i : haxe.io.Input;
+	var i:haxe.io.Input;
 
 	public function new(i) {
 		this.i = i;
@@ -41,98 +42,100 @@ class Reader {
 		var year = d >> 9;
 		var month = (d >> 5) & 15;
 		var day = d & 31;
-		return new Date(year + 1980, month-1, day, hour, min, sec << 1);
+		return new Date(year + 1980, month - 1, day, hour, min, sec << 1);
 	}
 
 	function readExtraFields(length) {
 		var fields = new List();
-		while( length > 0 ) {
-			if( length < 4 ) throw "Invalid extra fields data";
+		while (length > 0) {
+			if (length < 4)
+				throw "Invalid extra fields data";
 			var tag = i.readUInt16();
 			var len = i.readUInt16();
-			if( length < len ) throw "Invalid extra fields data";
-			switch( tag ) {
-			case 0x7075:
-				var version = i.readByte();
-				if( version != 1 ) {
-					var data = new haxe.io.BytesBuffer();
-					data.addByte(version);
-					data.add(i.read(len-1));
-					fields.add(FUnknown(tag,data.getBytes()));
-				} else {
-					var crc = i.readInt32();
-					var name = i.read(len - 5).toString();
-					fields.add(FInfoZipUnicodePath(name,crc));
-				}
-			default:
-				fields.add(FUnknown(tag,i.read(len)));
+			if (length < len)
+				throw "Invalid extra fields data";
+			switch (tag) {
+				case 0x7075:
+					var version = i.readByte();
+					if (version != 1) {
+						var data = new haxe.io.BytesBuffer();
+						data.addByte(version);
+						data.add(i.read(len - 1));
+						fields.add(FUnknown(tag, data.getBytes()));
+					} else {
+						var crc = i.readInt32();
+						var name = i.read(len - 5).toString();
+						fields.add(FInfoZipUnicodePath(name, crc));
+					}
+				default:
+					fields.add(FUnknown(tag, i.read(len)));
 			}
 			length -= 4 + len;
 		}
 		return fields;
 	}
 
-	public function readEntryHeader() : Entry {
+	public function readEntryHeader():Entry {
 		var i = this.i;
 		var h = i.readInt32();
-		if( h == 0x02014B50 || h == 0x06054B50 )
+		if (h == 0x02014B50 || h == 0x06054B50)
 			return null;
-		if( h != 0x04034B50 )
+		if (h != 0x04034B50)
 			throw "Invalid Zip Data";
 		var version = i.readUInt16();
 		var flags = i.readUInt16();
 		var utf8 = flags & 0x800 != 0;
-		if( (flags & 0xF7F1) != 0 )
-			throw "Unsupported flags "+flags;
+		if ((flags & 0xF7F1) != 0)
+			throw "Unsupported flags " + flags;
 		var compression = i.readUInt16();
 		var compressed = (compression != 0);
-		if( compressed && compression != 8 )
-			throw "Unsupported compression "+compression;
+		if (compressed && compression != 8)
+			throw "Unsupported compression " + compression;
 		var mtime = readZipDate();
-		var crc32 : Null<Int> = i.readInt32();
+		var crc32:Null<Int> = i.readInt32();
 		var csize = i.readInt32();
 		var usize = i.readInt32();
 		var fnamelen = i.readInt16();
 		var elen = i.readInt16();
 		var fname = i.readString(fnamelen);
 		var fields = readExtraFields(elen);
-		if( utf8 )
+		if (utf8)
 			fields.push(FUtf8);
 		var data = null;
 		// we have a data descriptor that store the real crc/sizes
 		// after the compressed data, let's wait for it
-		if( (flags & 8) != 0 )
+		if ((flags & 8) != 0)
 			crc32 = null;
 		return {
-			fileName : fname,
-			fileSize : usize,
-			fileTime : mtime,
-			compressed : compressed,
-			dataSize : csize,
-			data : data,
-			crc32 : crc32,
-			extraFields : fields,
+			fileName: fname,
+			fileSize: usize,
+			fileTime: mtime,
+			compressed: compressed,
+			dataSize: csize,
+			data: data,
+			crc32: crc32,
+			extraFields: fields,
 		};
 	}
 
-	public function read() : List<Entry> {
+	public function read():List<Entry> {
 		var l = new List();
 		var buf = null;
 		var tmp = null;
-		while( true ) {
+		while (true) {
 			var e = readEntryHeader();
-			if( e == null )
+			if (e == null)
 				break;
 			// do we have a data descriptor? (see readEntryHeader)
-			if( e.crc32 == null ) {
-				if( e.compressed ) {
+			if (e.crc32 == null) {
+				if (e.compressed) {
 					#if neko
 					// enter progressive mode : we use a different input which has
 					// a temporary buffer, this is necessary since we have to uncompress
 					// progressively, and after that we might have pending read data
 					// that needs to be processed
 					var bufSize = 65536;
-					if( buf == null ) {
+					if (buf == null) {
 						buf = new haxe.io.BufferInput(i, haxe.io.Bytes.alloc(bufSize));
 						tmp = haxe.io.Bytes.alloc(bufSize);
 						i = buf;
@@ -140,11 +143,11 @@ class Reader {
 					var out = new haxe.io.BytesBuffer();
 					var z = new neko.zip.Uncompress(-15);
 					z.setFlushMode(neko.zip.Flush.SYNC);
-					while( true ) {
-						if( buf.available == 0 )
+					while (true) {
+						if (buf.available == 0)
 							buf.refill();
 						var p = bufSize - buf.available;
-						if( p != buf.pos ) {
+						if (p != buf.pos) {
 							// because of lack of "srcLen" in zip api, we need to always be stuck to the buffer end
 							buf.buf.blit(p, buf.buf, buf.pos, buf.available);
 							buf.pos = p;
@@ -153,19 +156,20 @@ class Reader {
 						out.addBytes(tmp, 0, r.write);
 						buf.pos += r.read;
 						buf.available -= r.read;
-						if( r.done ) break;
+						if (r.done)
+							break;
 					}
 					e.data = out.getBytes();
 					#else
 					var bufSize = 65536;
-					if( tmp == null )
+					if (tmp == null)
 						tmp = haxe.io.Bytes.alloc(bufSize);
 					var out = new haxe.io.BytesBuffer();
 					var z = new InflateImpl(i, false, false);
-					while( true ) {
+					while (true) {
 						var n = z.readBytes(tmp, 0, bufSize);
 						out.addBytes(tmp, 0, n);
-						if( n < bufSize )
+						if (n < bufSize)
 							break;
 					}
 					e.data = out.getBytes();
@@ -173,7 +177,7 @@ class Reader {
 				} else
 					e.data = i.read(e.dataSize);
 				e.crc32 = i.readInt32();
-				if( e.crc32 == 0x08074b50 )
+				if (e.crc32 == 0x08074b50)
 					e.crc32 = i.readInt32();
 				e.dataSize = i.readInt32();
 				e.fileSize = i.readInt32();
@@ -187,24 +191,23 @@ class Reader {
 		return l;
 	}
 
-	public static function readZip( i : haxe.io.Input ) {
+	public static function readZip(i:haxe.io.Input) {
 		var r = new Reader(i);
 		return r.read();
 	}
 
-	public static function unzip( f : Entry ) {
-		if( !f.compressed )
+	public static function unzip(f:Entry) {
+		if (!f.compressed)
 			return f.data;
 		var c = new haxe.zip.Uncompress(-15);
 		var s = haxe.io.Bytes.alloc(f.fileSize);
-		var r = c.execute(f.data,0,s,0);
+		var r = c.execute(f.data, 0, s, 0);
 		c.close();
-		if( !r.done || r.read != f.data.length || r.write != f.fileSize )
-			throw "Invalid compressed data for "+f.fileName;
+		if (!r.done || r.read != f.data.length || r.write != f.fileSize)
+			throw "Invalid compressed data for " + f.fileName;
 		f.compressed = false;
 		f.dataSize = f.fileSize;
 		f.data = s;
 		return f.data;
 	}
-
 }
diff --git a/std/haxe/zip/Tools.hx b/std/haxe/zip/Tools.hx
index c180332af8763bb55072a7f20c27bef06b1d9344..373f3ade8b663e119bf578905d0ca302a10224cc 100644
--- a/std/haxe/zip/Tools.hx
+++ b/std/haxe/zip/Tools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,20 +19,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 class Tools {
-
-	public static function compress( f : Entry, level : Int ) {
-		if( f.compressed )
+	public static function compress(f:Entry, level:Int) {
+		if (f.compressed)
 			return;
 		// this should be optimized with a temp buffer
 		// that would discard the first two bytes
 		// (in order to prevent 2x mem usage for large files)
-		var data = haxe.zip.Compress.run( f.data, level );
+		var data = haxe.zip.Compress.run(f.data, level);
 		f.compressed = true;
-		f.data = data.sub(2,data.length-6);
+		f.data = data.sub(2, data.length - 6);
 		f.dataSize = f.data.length;
 	}
-
 }
diff --git a/std/haxe/zip/Uncompress.hx b/std/haxe/zip/Uncompress.hx
index 3e792b06f56c7b696f24889feca019663cb17cb4..55c27d8c06d66a6275ab047b02054683c0dc3925 100644
--- a/std/haxe/zip/Uncompress.hx
+++ b/std/haxe/zip/Uncompress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,26 +19,23 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 class Uncompress {
-
-	public function new( ?windowBits : Int ) {
+	public function new(?windowBits:Int) {
 		throw "Not implemented for this platform";
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
 		return null;
 	}
 
-	public function setFlushMode( f : FlushMode ) {
-	}
+	public function setFlushMode(f:FlushMode) {}
 
-	public function close() {
-	}
+	public function close() {}
 
-	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
-		return InflateImpl.run(new haxe.io.BytesInput(src),bufsize);
+	public static function run(src:haxe.io.Bytes, ?bufsize:Int):haxe.io.Bytes {
+		return InflateImpl.run(new haxe.io.BytesInput(src), bufsize);
 	}
-
 }
diff --git a/std/haxe/zip/Writer.hx b/std/haxe/zip/Writer.hx
index 6b33b8dad680a2ecbe2ed7ecc310caac25dd10ba..c340a45758dc1a1e410b13c5defa93133bfa95e4 100644
--- a/std/haxe/zip/Writer.hx
+++ b/std/haxe/zip/Writer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,74 +19,86 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
-class Writer {
+import haxe.ds.List;
 
-	/*
-	* The next constant is required for computing the Central
-	* Directory Record(CDR) size. CDR consists of some fields
-	* of constant size and a filename. Constant represents
-	* total length of all fields with constant size for each
-	* file in archive
-	*/
+class Writer {
+	/**
+		The next constant is required for computing the Central
+		Directory Record(CDR) size. CDR consists of some fields
+		of constant size and a filename. Constant represents
+		total length of all fields with constant size for each
+		file in archive
+	**/
 	inline static var CENTRAL_DIRECTORY_RECORD_FIELDS_SIZE = 46;
 
-	/*
-	* The following constant is the total size of all fields
-	* of Local File Header. It's required for calculating
-	* offset of start of central directory record
-	*/
+	/**
+		The following constant is the total size of all fields
+		of Local File Header. It's required for calculating
+		offset of start of central directory record
+	**/
 	inline static var LOCAL_FILE_HEADER_FIELDS_SIZE = 30;
 
-	var o : haxe.io.Output;
-	var files : List<{ name : String, compressed : Bool, clen : Int, size : Int, crc : Int, date : Date, fields : haxe.io.Bytes }>;
+	var o:haxe.io.Output;
+	var files:List<{
+		name:String,
+		compressed:Bool,
+		clen:Int,
+		size:Int,
+		crc:Int,
+		date:Date,
+		fields:haxe.io.Bytes
+	}>;
 
-	public function new( o : haxe.io.Output ) {
+	public function new(o:haxe.io.Output) {
 		this.o = o;
 		files = new List();
 	}
 
-	function writeZipDate( date : Date ) {
+	function writeZipDate(date:Date) {
 		var hour = date.getHours();
 		var min = date.getMinutes();
 		var sec = date.getSeconds() >> 1;
-		o.writeUInt16( (hour << 11) | (min << 5) | sec );
+		o.writeUInt16((hour << 11) | (min << 5) | sec);
 		var year = date.getFullYear() - 1980;
 		var month = date.getMonth() + 1;
 		var day = date.getDate();
-		o.writeUInt16( (year << 9) | (month << 5) | day );
+		o.writeUInt16((year << 9) | (month << 5) | day);
 	}
 
-	public function writeEntryHeader( f : Entry ) {
+	public function writeEntryHeader(f:Entry) {
 		var o = this.o;
 		var flags = 0;
 		if (f.extraFields != null) {
-			for( e in f.extraFields )
-				switch( e ) {
-				case FUtf8: flags |= 0x800;
-				default:
+			for (e in f.extraFields)
+				switch (e) {
+					case FUtf8:
+						flags |= 0x800;
+					default:
 				}
 		}
 		o.writeInt32(0x04034B50);
 		o.writeUInt16(0x0014); // version
 		o.writeUInt16(flags); // flags
-		if( f.data == null ) {
+		if (f.data == null) {
 			f.fileSize = 0;
 			f.dataSize = 0;
 			f.crc32 = 0;
 			f.compressed = false;
 			f.data = haxe.io.Bytes.alloc(0);
 		} else {
-			if( f.crc32 == null ) {
-				if( f.compressed ) throw "CRC32 must be processed before compression";
+			if (f.crc32 == null) {
+				if (f.compressed)
+					throw "CRC32 must be processed before compression";
 				f.crc32 = haxe.crypto.Crc32.make(f.data);
 			}
-			if( !f.compressed )
+			if (!f.compressed)
 				f.fileSize = f.data.length;
 			f.dataSize = f.data.length;
 		}
-		o.writeUInt16(f.compressed?8:0);
+		o.writeUInt16(f.compressed ? 8 : 0);
 		writeZipDate(f.fileTime);
 		o.writeInt32(f.crc32);
 		o.writeInt32(f.dataSize);
@@ -94,34 +106,42 @@ class Writer {
 		o.writeUInt16(f.fileName.length);
 		var e = new haxe.io.BytesOutput();
 		if (f.extraFields != null) {
-			for( f in f.extraFields )
-				switch( f ) {
-				case FInfoZipUnicodePath(name,crc):
-					var namebytes = haxe.io.Bytes.ofString(name);
-					e.writeUInt16(0x7075);
-					e.writeUInt16(namebytes.length + 5);
-					e.writeByte(1); // version
-					e.writeInt32(crc);
-					e.write(namebytes);
-				case FUnknown(tag,bytes):
-					e.writeUInt16(tag);
-					e.writeUInt16(bytes.length);
-					e.write(bytes);
-				case FUtf8:
-					// nothing
+			for (f in f.extraFields)
+				switch (f) {
+					case FInfoZipUnicodePath(name, crc):
+						var namebytes = haxe.io.Bytes.ofString(name);
+						e.writeUInt16(0x7075);
+						e.writeUInt16(namebytes.length + 5);
+						e.writeByte(1); // version
+						e.writeInt32(crc);
+						e.write(namebytes);
+					case FUnknown(tag, bytes):
+						e.writeUInt16(tag);
+						e.writeUInt16(bytes.length);
+						e.write(bytes);
+					case FUtf8:
+						// nothing
 				}
 		}
 		var ebytes = e.getBytes();
 		o.writeUInt16(ebytes.length);
 		o.writeString(f.fileName);
 		o.write(ebytes);
-		files.add({ name : f.fileName, compressed : f.compressed, clen : f.data.length, size : f.fileSize, crc : f.crc32, date : f.fileTime, fields : ebytes });
+		files.add({
+			name: f.fileName,
+			compressed: f.compressed,
+			clen: f.data.length,
+			size: f.fileSize,
+			crc: f.crc32,
+			date: f.fileTime,
+			fields: ebytes
+		});
 	}
 
-	public function write( files : List<Entry> ) {
-		for( f in files ) {
+	public function write(files:List<Entry>) {
+		for (f in files) {
 			writeEntryHeader(f);
-			o.writeFullBytes(f.data,0,f.data.length);
+			o.writeFullBytes(f.data, 0, f.data.length);
 		}
 		writeCDR();
 	}
@@ -129,46 +149,45 @@ class Writer {
 	public function writeCDR() {
 		var cdr_size = 0;
 		var cdr_offset = 0;
-		for ( f in files ) {
+		for (f in files) {
 			var namelen = f.name.length;
 			var extraFieldsLength = f.fields.length;
 			o.writeInt32(0x02014B50); // header
 			o.writeUInt16(0x0014); // version made-by
 			o.writeUInt16(0x0014); // version
 			o.writeUInt16(0); // flags
-			o.writeUInt16(f.compressed?8:0);
+			o.writeUInt16(f.compressed ? 8 : 0);
 			writeZipDate(f.date);
 			o.writeInt32(f.crc);
 			o.writeInt32(f.clen);
 			o.writeInt32(f.size);
 			o.writeUInt16(namelen);
 			o.writeUInt16(extraFieldsLength);
-			o.writeUInt16(0); //comment length always 0
-			o.writeUInt16(0); //disk number start
-			o.writeUInt16(0); //internal file attributes
-			o.writeInt32(0); //external file attributes
-			o.writeInt32(cdr_offset); //relative offset of local header
+			o.writeUInt16(0); // comment length always 0
+			o.writeUInt16(0); // disk number start
+			o.writeUInt16(0); // internal file attributes
+			o.writeInt32(0); // external file attributes
+			o.writeInt32(cdr_offset); // relative offset of local header
 			o.writeString(f.name);
 			o.write(f.fields);
 			cdr_size += CENTRAL_DIRECTORY_RECORD_FIELDS_SIZE + namelen + extraFieldsLength;
 			cdr_offset += LOCAL_FILE_HEADER_FIELDS_SIZE + namelen + extraFieldsLength + f.clen;
 		}
-		//end of central dir signature
+		// end of central dir signature
 		o.writeInt32(0x06054B50);
-		//number of this disk
+		// number of this disk
 		o.writeUInt16(0);
-		//number of the disk with the start of the central directory
+		// number of the disk with the start of the central directory
 		o.writeUInt16(0);
-		//total number of entries in the central directory on this disk
+		// total number of entries in the central directory on this disk
 		o.writeUInt16(files.length);
-		//total number of entries in the central directory
+		// total number of entries in the central directory
 		o.writeUInt16(files.length);
-		//size of the central directory record
+		// size of the central directory record
 		o.writeInt32(cdr_size);
-		//offset of start of central directory with respect to the starting disk number
+		// offset of start of central directory with respect to the starting disk number
 		o.writeInt32(cdr_offset);
 		// .ZIP file comment length
 		o.writeUInt16(0);
 	}
-
 }
diff --git a/std/hl/Abstract.hx b/std/hl/Abstract.hx
index b3b99d7ad6433e794b8e2c47dfc880f69d6221d7..c02f0c5b4b296b0c5fd72cf1b943ae3804deec37 100644
--- a/std/hl/Abstract.hx
+++ b/std/hl/Abstract.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
-extern class Abstract<Const> {
-}
\ No newline at end of file
+extern class Abstract<Const> {}
diff --git a/std/hl/Api.hx b/std/hl/Api.hx
index f79f6d77a1cdf8f2009af94f4c2b4ac04f76652f..9949ec656aaa77cb33514d541a5cea431785b905 100644
--- a/std/hl/Api.hx
+++ b/std/hl/Api.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,23 +19,26 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 extern class Api {
-
-	static inline function rethrow( v : Dynamic ) : Void { untyped $rethrow(v); }
-	@:hlNative("std","obj_get_field") static function getField( obj : Dynamic, hash : Int ) : Dynamic;
-	@:hlNative("std","obj_set_field") static function setField( obj : Dynamic, hash : Int, value : Dynamic ) : Void;
-	@:hlNative("std","obj_has_field") static function hasField( obj : Dynamic, hash : Int ) : Bool;
-	@:hlNative("std","obj_delete_field") static function deleteField( obj : Dynamic, hash : Int ) : Bool;
-	@:hlNative("std","call_method") static function callMethod( f : haxe.Constraints.Function, args : NativeArray<Dynamic> ) : Dynamic;
-	@:hlNative("std","get_closure_value") static function getClosureValue( f : haxe.Constraints.Function ) : Dynamic;
-	@:hlNative("std","no_closure") static function noClosure( f : haxe.Constraints.Function ) : haxe.Constraints.Function;
-	@:hlNative("std", "value_cast") static function safeCast( v : Dynamic, t : Type ) : Dynamic;
-	@:hlNative("std", "make_var_args") static function makeVarArgs( v : NativeArray<Dynamic> -> Dynamic ) : haxe.Constraints.Function;
-	@:hlNative("std", "get_virtual_value") static function getVirtualValue( v : Dynamic ) : Dynamic;
-	@:hlNative("std", "set_error_handler") static function setErrorHandler( v : Dynamic -> Void ) : Void;
-	@:hlNative("std", "breakpoint") static function breakPoint() : Void;
-	@:hlNative("std", "sys_is64") static function is64() : Bool;
-
+	static inline function rethrow(v:Dynamic):Void {
+		untyped $rethrow(v);
+	}
+	@:hlNative("std", "obj_get_field") static function getField(obj:Dynamic, hash:Int):Dynamic;
+	@:hlNative("std", "obj_set_field") static function setField(obj:Dynamic, hash:Int, value:Dynamic):Void;
+	@:hlNative("std", "obj_has_field") static function hasField(obj:Dynamic, hash:Int):Bool;
+	@:hlNative("std", "obj_delete_field") static function deleteField(obj:Dynamic, hash:Int):Bool;
+	@:hlNative("std", "call_method") static function callMethod(f:haxe.Constraints.Function, args:NativeArray<Dynamic>):Dynamic;
+	@:hlNative("std", "get_closure_value") static function getClosureValue(f:haxe.Constraints.Function):Dynamic;
+	@:hlNative("std", "make_closure") static function makeClosure(f:haxe.Constraints.Function, v:Dynamic):Dynamic;
+	@:hlNative("std", "no_closure") static function noClosure(f:haxe.Constraints.Function):haxe.Constraints.Function;
+	@:hlNative("std", "value_cast") static function safeCast(v:Dynamic, t:Type):Dynamic;
+	@:hlNative("std", "make_var_args") static function makeVarArgs(v:NativeArray<Dynamic>->Dynamic):haxe.Constraints.Function;
+	@:hlNative("std", "get_virtual_value") static function getVirtualValue(v:Dynamic):Dynamic;
+	@:hlNative("std", "set_error_handler") static function setErrorHandler(v:Dynamic->Void):Void;
+	@:hlNative("std", "breakpoint") static function breakPoint():Void;
+	@:hlNative("std", "sys_is64") static function is64():Bool;
+	@:hlNative("std", "ptr_compare") static function comparePointer(a:Dynamic, b:Dynamic):Int;
 }
diff --git a/std/hl/BaseType.hx b/std/hl/BaseType.hx
index 76eee600bd99315210f4eca497a2b3340a6da2dc..80ead1c8a0412e2cf8ded182453e4e459bae6c2e 100644
--- a/std/hl/BaseType.hx
+++ b/std/hl/BaseType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,26 +19,29 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 @:keep
 class BaseType {
-	public var __type__ : Type;
-	public var __meta__ : Dynamic;
-	public var __implementedBy__ : NativeArray<Type>;
-	public function check( v : Dynamic ) {
+	public var __type__:Type;
+	public var __meta__:Dynamic;
+	public var __implementedBy__:NativeArray<Type>;
+
+	public function check(v:Dynamic) {
 		var t = Type.getDynamic(v);
-		if( t.kind == HVirtual ) {
+		if (t.kind == HVirtual) {
 			var v2 = hl.Api.getVirtualValue(v);
-			if( v2 != null ) t = Type.getDynamic(v2);
+			if (v2 != null)
+				t = Type.getDynamic(v2);
 		}
-		if( __implementedBy__ == null ) {
-			if( t.safeCast(__type__) )
+		if (__implementedBy__ == null) {
+			if (t.safeCast(__type__))
 				return true;
 			return false;
 		}
-		for( i in __implementedBy__ )
-			if( t.safeCast(i) )
+		for (i in __implementedBy__)
+			if (t.safeCast(i))
 				return true;
 		return false;
 	}
@@ -46,22 +49,20 @@ class BaseType {
 
 @:keep
 class Class extends BaseType {
-	public var __name__ : String;
-	public var __constructor__ : Dynamic;
+	public var __name__:String;
+	public var __constructor__:Dynamic;
 }
 
 @:keep
 class Enum extends BaseType {
-	public var __ename__ : String;
-	public var __emap__ : hl.types.BytesMap;
-	public var __constructs__ : Array<String>;
-	public var __evalues__ : NativeArray<Dynamic>;
+	public var __ename__:String;
+	public var __emap__:hl.types.BytesMap;
+	public var __constructs__:Array<String>;
+	public var __evalues__:NativeArray<Dynamic>;
 }
 
 @:keep
-class CoreType extends Class {
-}
+class CoreType extends Class {}
 
 @:keep
-class CoreEnum extends Enum {
-}
+class CoreEnum extends Enum {}
diff --git a/std/hl/Boot.hx b/std/hl/Boot.hx
index 680e2239cdd9d6729de3076b5e0dbccc803cabb3..ca16c51ce5e6f921b912a1d8abde1fc57bdb2f91 100644
--- a/std/hl/Boot.hx
+++ b/std/hl/Boot.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 import hl.types.ArrayDyn;
 import hl.BaseType;
 
 @:dox(hide)
-extern class Boot {
-}
+extern class Boot {}
diff --git a/std/hl/Bytes.hx b/std/hl/Bytes.hx
index 0e502ccfc6116ea9efd46aaedc1714212155abdc..cfd85305642fcdc7d61fe964b36a12fff97d5199 100644
--- a/std/hl/Bytes.hx
+++ b/std/hl/Bytes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,198 +19,204 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 @:coreType abstract Bytes {
-
-	@:extern public inline function new( v : Int ) {
+	extern public inline function new(v:Int) {
 		this = alloc(v);
 	}
 
-	@:hlNative("std","bytes_blit") public function blit( pos : Int, src : Bytes, srcPos : Int, len : Int ) : Void {
-	}
+	@:hlNative("std", "bytes_blit") public function blit(pos:Int, src:Bytes, srcPos:Int, len:Int):Void {}
 
-	@:extern @:arrayAccess public inline function getUI8( pos : Int ) : Int {
-		return untyped $bgetui8(this,pos);
+	@:arrayAccess extern public inline function getUI8(pos:Int):Int {
+		return untyped $bgetui8(this, pos);
 	}
 
-	@:extern @:arrayAccess public inline function setUI8( pos : Int, value : Int ) : Int {
-		untyped $bsetui8(this,pos,value);
+	@:arrayAccess extern public inline function setUI8(pos:Int, value:Int):Int {
+		untyped $bsetui8(this, pos, value);
 		return value;
 	}
 
-	@:extern public inline function getI32( pos : Int ) : Int {
-		return untyped $bgeti32(this,pos);
+	extern public inline function getI32(pos:Int):Int {
+		return untyped $bgeti32(this, pos);
 	}
 
-	public inline function getUI16( pos : Int ) : Int {
+	public inline function getUI16(pos:Int):Int {
 		return untyped $bgetui16(this, pos);
 	}
 
-	public inline function setUI16( pos : Int, v : Int ) {
-		untyped $bsetui16(this,pos,v);
+	public inline function setUI16(pos:Int, v:Int) {
+		untyped $bsetui16(this, pos, v);
 	}
 
-	@:extern public inline function getF32( pos : Int ) : F32 {
-		return untyped $bgetf32(this,pos);
+	extern public inline function getF32(pos:Int):F32 {
+		return untyped $bgetf32(this, pos);
 	}
 
-	@:extern public inline function getF64( pos : Int ) : Float {
-		return untyped $bgetf64(this,pos);
+	extern public inline function getF64(pos:Int):Float {
+		return untyped $bgetf64(this, pos);
 	}
 
-	@:extern public inline function setI32( pos : Int, value : Int ) : Void {
+	extern public inline function setI32(pos:Int, value:Int):Void {
 		untyped $bseti32(this, pos, value);
 	}
 
-	@:extern public inline function setF32( pos : Int, value : F32 ) : Void {
+	extern public inline function setF32(pos:Int, value:F32):Void {
 		untyped $bsetf32(this, pos, value);
 	}
 
-	@:extern public inline function setF64( pos : Int, value : Float ) : Void {
+	extern public inline function setF64(pos:Int, value:Float):Void {
 		untyped $bsetf64(this, pos, value);
 	}
 
-	@:hlNative("std","alloc_bytes")
-	static function alloc( size : Int ) : Bytes {
+	@:hlNative("std", "alloc_bytes")
+	static function alloc(size:Int):Bytes {
 		return null;
 	}
 
-	@:hlNative("std","parse_int")
-	public function parseInt( pos : Int, size : Int ) : Null<Int> {
+	@:hlNative("std", "parse_int")
+	public function parseInt(pos:Int, size:Int):Null<Int> {
 		return null;
 	}
 
-	@:hlNative("std","parse_float")
-	public function parseFloat( pos : Int, size : Int ) : Float {
+	@:hlNative("std", "parse_float")
+	public function parseFloat(pos:Int, size:Int):Float {
 		return 0.;
 	}
 
-	@:hlNative("std","bytes_compare")
-	public function compare( pos : Int, bytes : Bytes, bytesPos : Int, size : Int ) : Int {
+	@:hlNative("std", "bytes_compare")
+	public function compare(pos:Int, bytes:Bytes, bytesPos:Int, size:Int):Int {
 		return 0;
 	}
 
-	@:hlNative("std","bytes_find")
-	public function find( pos : Int, size : Int, bytes : Bytes, bytesPos : Int, bytesSize : Int ) : Int {
+	#if (hl_ver >= version("1.10.0"))
+	@:hlNative("std", "bytes_compare16")
+	public function compare16(bytes:Bytes, size:Int):Int {
 		return 0;
 	}
+	#end
 
-	@:hlNative("std","bytes_fill")
-	public function fill( pos : Int, size : Int, v : Int ) : Void {
+	@:hlNative("std", "bytes_find")
+	public function find(pos:Int, size:Int, bytes:Bytes, bytesPos:Int, bytesSize:Int):Int {
+		return 0;
 	}
 
-	@:hlNative("std","bsort_i32")
-	public function sortI32( pos : Int, length : Int, f : Int->Int->Int ) : Void {
-	}
+	@:hlNative("std", "bytes_fill")
+	public function fill(pos:Int, size:Int, v:Int):Void {}
 
-	@:hlNative("std","bsort_f64")
-	public function sortF64( pos : Int, length : Int, f : Float->Float->Int ) : Void {
-	}
+	@:hlNative("std", "bsort_i32")
+	public function sortI32(pos:Int, length:Int, f:Int->Int->Int):Void {}
 
+	@:hlNative("std", "bsort_f64")
+	public function sortF64(pos:Int, length:Int, f:Float->Float->Int):Void {}
 
 	/**
 		Please note that you need to retain the original unoffset'ed Bytes so it does not get garbage collected, unless the pointer was not GC allocated.
 	**/
-	@:hlNative("std","bytes_offset")
-	public function offset( delta : Int ) : Bytes {
+	@:hlNative("std", "bytes_offset")
+	public function offset(delta:Int):Bytes {
 		return null;
 	}
 
 	/**
 		Returns an offset between the two pointers. This might overflow in 64 bits if the addresses of the two pointers differs by more than 4GB
 	**/
-	@:hlNative("std","bytes_subtract")
-	public function subtract( other : Bytes ) : Int {
+	@:hlNative("std", "bytes_subtract")
+	public function subtract(other:Bytes):Int {
 		return 0;
 	}
 
 	@:hlNative("std", "bytes_address")
-	static function get_address( b : Bytes, high : Ref<Int> ) : Int {
+	static function get_address(b:Bytes, high:Ref<Int>):Int {
 		return 0;
 	}
 
 	@:hlNative("std", "bytes_from_address")
-	static function from_address( low : Int, high : Int ) : Bytes {
+	static function from_address(low:Int, high:Int):Bytes {
 		return null;
 	}
 
 	/**
 		Creates an pointer at a given memory address (highly unsafe)
 	**/
-	public static inline function fromAddress( h : haxe.Int64 ) : Bytes {
+	public static inline function fromAddress(h:haxe.Int64):Bytes {
 		return from_address(h.low, h.high);
 	}
 
 	/**
 		Returns the address value of the bytes. On 32 bit system the upper 32 bits will always be 0
 	**/
-	public function address() : haxe.Int64 {
+	public function address():haxe.Int64 {
 		var high = 0;
 		var low = get_address(this, high);
-		return haxe.Int64.make(high,low);
+		return haxe.Int64.make(high, low);
 	}
 
-	public function sub( pos : Int, size : Int ) {
+	public function sub(pos:Int, size:Int) {
 		var b = new Bytes(size);
 		b.blit(0, this, pos, size);
 		return b;
 	}
 
 	@:hlNative("std", "ucs2length")
-	public function ucs2Length( bytePos : Int ) : Int {
+	public function ucs2Length(bytePos:Int):Int {
 		return 0;
 	}
 
-	@:hlNative("std","hash")
-	function hash() : Int {
+	@:hlNative("std", "hash")
+	function hash():Int {
 		return 0;
 	}
 
-	@:hlNative("std","utf8_to_utf16")
-	public function utf8ToUtf16( bytePos : Int, outSize : Ref<Int> ) : Bytes {
+	@:hlNative("std", "utf8_to_utf16")
+	public function utf8ToUtf16(bytePos:Int, outSize:Ref<Int>):Bytes {
 		return null;
 	}
 
 	@:hlNative("std","utf16_to_utf8")
-	public function utf16ToUtf8( bytePos : Int, outSize : Ref<Int> ) : Bytes {
+	public function utf16ToUtf8(len:Int, outSize:Ref<Int>) : Bytes {
 		return null;
 	}
 
 	@:hlNative("std", "ucs2_upper")
-	function ucs2Upper( bytePos : Int, size : Int ) : Bytes {
+	function ucs2Upper(bytePos:Int, size:Int):Bytes {
 		return null;
 	}
 
 	@:hlNative("std", "ucs2_lower")
-	function ucs2Lower( bytePos : Int, size : Int ) : Bytes {
+	function ucs2Lower(bytePos:Int, size:Int):Bytes {
 		return null;
 	}
 
 	@:hlNative("std", "url_encode")
-	function urlEncode( outSize : Ref<Int> ) : Bytes {
+	function urlEncode(outSize:Ref<Int>):Bytes {
 		return null;
 	}
 
 	@:hlNative("std", "url_decode")
-	function urlDecode( outSize : Ref<Int> ) : Bytes {
+	function urlDecode(outSize:Ref<Int>):Bytes {
 		return null;
 	}
 
-	@:hlNative("std","value_to_string")
-	public static function fromValue( v : Dynamic, length : Ref<Int> ) : Bytes {
+	@:hlNative("std", "value_to_string")
+	public static function fromValue(v:Dynamic, length:Ref<Int>):Bytes {
 		return null;
 	}
 
 	/**
 		Get the bytes reference from an array of basic types (no copy occurs)
 	**/
-	@:extern public static inline function getArray<T>( a : Array<T> ) : Bytes {
+	extern public static inline function getArray<T>(a:Array<T>):Bytes {
 		return untyped $abytes(a);
 	}
 
 	@:from
-	public static inline function fromBytes( bytes : haxe.io.Bytes ) {
+	public static inline function fromBytes(bytes:haxe.io.Bytes) {
 		return @:privateAccess bytes.b;
 	}
-}
\ No newline at end of file
+
+	public inline function toBytes(len:Int) {
+		return @:privateAccess new haxe.io.Bytes(this, len);
+	}
+}
diff --git a/std/hl/BytesAccess.hx b/std/hl/BytesAccess.hx
index b0c8e32660724622ba932d147be603c9173ceaa7..980d8b179e185d438b6111c4f625b694be080ba8 100644
--- a/std/hl/BytesAccess.hx
+++ b/std/hl/BytesAccess.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,33 +19,31 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 @:coreType abstract BytesAccess<T> from Bytes to Bytes {
+	public var sizeBits(get, never):Int;
+	public var nullValue(get, never):T;
 
-	public var sizeBits(get, never) : Int;
-	public var nullValue(get, never) : T;
-
-
-	@:extern inline function get_sizeBits() {
+	extern inline function get_sizeBits():Int {
 		return untyped $bytes_sizebits(this);
 	}
 
-	@:extern inline function get_nullValue() {
+	extern inline function get_nullValue():T {
 		return untyped $bytes_nullvalue(this);
 	}
 
-	@:extern public inline function blit( pos : Int, src : BytesAccess<T>, srcPos : Int, len : Int ) : Void {
-		(this:Bytes).blit(pos << sizeBits, src, srcPos << sizeBits, len << sizeBits);
+	extern public inline function blit(pos:Int, src:BytesAccess<T>, srcPos:Int, len:Int):Void {
+		(this : Bytes).blit(pos << sizeBits, src, srcPos << sizeBits, len << sizeBits);
 	}
 
-	@:extern @:arrayAccess public inline function get( pos : Int ) : T {
-		return untyped $bget(this,pos);
+	@:arrayAccess extern public inline function get(pos:Int):T {
+		return untyped $bget(this, pos);
 	}
 
-	@:extern @:arrayAccess public inline function set( pos : Int, value : T ) : T {
-		untyped $bset(this,pos,value);
+	@:arrayAccess extern public inline function set(pos:Int, value:T):T {
+		untyped $bset(this, pos, value);
 		return value;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/hl/F32.hx b/std/hl/F32.hx
index 8cca901c59d37bed234d2843e66e6de7ceb20803..78cb04dad2c8a5358643a62057569056e873cc2a 100644
--- a/std/hl/F32.hx
+++ b/std/hl/F32.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
-typedef F32 = Single;
\ No newline at end of file
+typedef F32 = Single;
diff --git a/std/hl/F64.hx b/std/hl/F64.hx
index 02b74c385fadee867a0b04186b36da323a60b537..ea633bcf2d05d7098ba79a014856da411ab73bda 100644
--- a/std/hl/F64.hx
+++ b/std/hl/F64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 typedef F64 = Float;
diff --git a/std/hl/Format.hx b/std/hl/Format.hx
index c57d2278256b53fee6dc05ad571c1d3a0c2401ea..6090898077ec01642d5dabd134ed72eb69fde001 100644
--- a/std/hl/Format.hx
+++ b/std/hl/Format.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,50 +19,91 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
-@:enum abstract PixelFormat(Int) {
-  var RGB = 0;
-  var BGR = 1;
-  var RGBX = 2;
-  var BGRX = 3;
-  var XBGR = 4;
-  var XRGB = 5;
-  var GRAY = 6;
-  var RGBA = 7;
-  var BGRA = 8;
-  var ABGR = 9;
-  var ARGB = 10;
-  var CMYK = 11;
+enum abstract PixelFormat(Int) {
+	var RGB = 0;
+	var BGR = 1;
+	var RGBX = 2;
+	var BGRX = 3;
+	var XBGR = 4;
+	var XRGB = 5;
+	var GRAY = 6;
+	var RGBA = 7;
+	var BGRA = 8;
+	var ABGR = 9;
+	var ARGB = 10;
+	var CMYK = 11;
 }
 
 /**
 	These are the bindings for the HL `fmt.hdll` library, which contains various low level formats handling.
 **/
 class Format {
-
 	/**
 		Decode JPG data into the target buffer.
 	**/
-	@:hlNative("fmt","jpg_decode")
-	public static function decodeJPG( src : hl.Bytes, srcLen : Int, dst : hl.Bytes, width : Int, height : Int, stride : Int, format : PixelFormat, flags : Int ) : Bool {
+	@:hlNative("fmt", "jpg_decode")
+	public static function decodeJPG(src:hl.Bytes, srcLen:Int, dst:hl.Bytes, width:Int, height:Int, stride:Int, format:PixelFormat, flags:Int):Bool {
 		return false;
 	}
 
 	/**
 		Decode PNG data into the target buffer.
 	**/
-	@:hlNative("fmt","png_decode")
-	public static function decodePNG( src : hl.Bytes, srcLen : Int, dst : hl.Bytes, width : Int, height : Int, stride : Int, format : PixelFormat, flags : Int ) : Bool {
+	@:hlNative("fmt", "png_decode")
+	public static function decodePNG(src:hl.Bytes, srcLen:Int, dst:hl.Bytes, width:Int, height:Int, stride:Int, format:PixelFormat, flags:Int):Bool {
 		return false;
 	}
 
+	/**
+		Decode any image data into ARGB pixels
+	**/
+	#if (hl_ver >= version("1.10.0"))
+	@:hlNative("fmt", "dxt_decode")
+	public static function decodeDXT(src:hl.Bytes, dst:hl.Bytes, width:Int, height:Int, dxtFormat:Int):Bool {
+		return false;
+	}
+	#end
+
 	/**
 		Upscale/downscale an image.
 		Currently supported flag bits: 1 = bilinear filtering
 	**/
-	@:hlNative("fmt","img_scale")
-	public static function scaleImage( out : hl.Bytes, outPos : Int,  outStride : Int, outWidth : Int, outHeight : Int, _in : hl.Bytes, inPos : Int,  inStride : Int, inWidth : Int, inHeight : Int, flags : Int ) {
+	@:hlNative("fmt", "img_scale")
+	public static function scaleImage(out:hl.Bytes, outPos:Int, outStride:Int, outWidth:Int, outHeight:Int, _in:hl.Bytes, inPos:Int, inStride:Int,
+		inWidth:Int, inHeight:Int, flags:Int) {}
+
+	/**
+		Performs a cryptographic digest of some bytes.
+		0 = Md5 , 1 = Sha1 , 2 = Crc32, 3 = Adler32
+		Set 256 flag to tell the src are String bytes.
+	**/
+	@:hlNative("fmt", "digest")
+	public static function digest(out:hl.Bytes, src:hl.Bytes, srcLen:Int, algorithm:Int) {}
+}
+
+class Mikktspace {
+	public var buffer:hl.BytesAccess<Single>;
+	public var stride:Int;
+	public var xPos:Int;
+	public var normalPos:Int;
+	public var uvPos:Int;
+	public var tangents:hl.BytesAccess<Single>;
+	public var tangentStride:Int;
+	public var tangentPos:Int;
+	public var indexes:hl.BytesAccess<Int>;
+	public var indices:Int;
+
+	public function new() {}
+
+	public function compute(threshold = 180.) {
+		if (!_compute(this, threshold))
+			throw "assert";
 	}
 
-}
\ No newline at end of file
+	@:hlNative("fmt", "compute_mikkt_tangents") static function _compute(m:Dynamic, threshold:Float):Bool {
+		return false;
+	}
+}
diff --git a/std/hl/Gc.hx b/std/hl/Gc.hx
index 0fd1a55f86594af36ebbde24335f9a2e04ea85a2..03df18e2f08c925fa0133124381b5b9798eda33f 100644
--- a/std/hl/Gc.hx
+++ b/std/hl/Gc.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 enum GcFlag {
@@ -26,76 +27,66 @@ enum GcFlag {
 		Activate profiling: regularly print on stdout gc allocation stats
 	**/
 	Profile;
+
 	/**
-		Allows to dump a hlmemory.dump file when HL runs out of memory to be examined with hl memory inspector tool.
+		Allows one to dump a hlmemory.dump file when HL runs out of memory to be examined with hl memory inspector tool.
 	**/
 	DumpMem;
+
 	/**
-		Enable block tracking (see Gc.track API)
+		Disable GC locking for multithreads
 	**/
-	Track;
+	NoThreads;
+
+	/**
+		Force major GC on each allocation
+	**/
+	ForceMajor;
 }
 
 class Gc {
-
-	public static var flags(get,set) : haxe.EnumFlags<GcFlag>;
+	public static var flags(get, set):haxe.EnumFlags<GcFlag>;
 
 	public static function stats() {
 		var tot = 0., count = 0., mem = 0.;
 		_stats(tot, count, mem);
-		return { totalAllocated : tot, allocationCount : count, currentMemory : mem };
-	}
-
-	/**
-		Start tracking an object field change.
-		The check will be performed every allocation and the callback function triggered everytime
-		a change has been performed since last check. The callback parameter is true if the object was collected.
-		It is necessary to enable the Track flag in Gc.flags
-	**/
-	public static function track( obj : Dynamic, field : String, callb : Dynamic -> Bytes -> Void ) {
-		var oval = if( Reflect.isFunction(obj) ) Api.getClosureValue(obj) else obj;
-		var fid = if( ~/^[0-9]+$/.match(field) ) Std.parseInt(field) else @:privateAccess field.bytes.hash();
-		if( !_track(oval, fid, callb) )
-			throw "Could not track "+obj+"."+field;
-	}
-
-	public static function untrack( obj : Dynamic ) {
-		var oval = if( Reflect.isFunction(obj) ) Api.getClosureValue(obj) else obj;
-		return _untrack(oval);
-	}
-
-	@:hlNative("std", "gc_untrack_all") public static function untrackAll() : Void {
-	}
-
-	@:hlNative("std", "gc_track_count") public static function trackCount() : Int {
-		return 0;
+		return {totalAllocated: tot, allocationCount: count, currentMemory: mem};
 	}
 
 	/**
 		Dump whole memory into target filename for analysis.
 	**/
-	public static function dumpMemory( ?fileName : String = "hlmemory.dump" ) {
+	public static function dumpMemory(?fileName:String = "hlmemory.dump") {
 		_dump(@:privateAccess fileName.toUtf8());
 	}
 
-	static function get_flags() : haxe.EnumFlags<GcFlag> {
+	static function get_flags():haxe.EnumFlags<GcFlag> {
 		return haxe.EnumFlags.ofInt(_get_flags());
 	}
 
-	static function set_flags(v : haxe.EnumFlags<GcFlag>) {
+	static function set_flags(v:haxe.EnumFlags<GcFlag>) {
 		_set_flags(v.toInt());
 		return v;
 	}
 
-	@:hlNative("std", "gc_dump_memory") static function _dump( b : hl.Bytes ) : Void {}
+	/**
+		Enter/leave a blocking section: when in a blocking section the thread cannot
+		allocate any memory but other threads will not wait for it for collecting memory.
+	**/
+	@:hlNative("std", "blocking")
+	public static function blocking(b:Bool) {}
+
+	@:hlNative("std", "gc_dump_memory") static function _dump(b:hl.Bytes):Void {}
+
+	@:hlNative("std", "gc_enable") public static function enable(b:Bool):Void {}
 
-	@:hlNative("std", "gc_enable") public static function enable( b : Bool ) : Void {}
-	@:hlNative("std", "gc_major") public static function major() : Void {}
-	@:hlNative("std", "gc_stats") static function _stats( totalAllocated : hl.Ref<Float>, allocationCount : hl.Ref<Float>, currentMemory : hl.Ref<Float> ) : Void {}
-	@:hlNative("std", "gc_track") static function _track( obj : Dynamic, fid : Int, callb : Dynamic -> Bytes -> Void ) : Bool { return false; }
-	@:hlNative("std", "gc_untrack") static function _untrack( obj : Dynamic ) : Bool { return false; }
+	@:hlNative("std", "gc_major") public static function major():Void {}
 
-	@:hlNative("std", "gc_get_flags") static function _get_flags() : Int { return 0; }
-	@:hlNative("std", "gc_set_flags") static function _set_flags( v : Int ) {}
+	@:hlNative("std", "gc_stats") static function _stats(totalAllocated:hl.Ref<Float>, allocationCount:hl.Ref<Float>, currentMemory:hl.Ref<Float>):Void {}
+
+	@:hlNative("std", "gc_get_flags") static function _get_flags():Int {
+		return 0;
+	}
 
+	@:hlNative("std", "gc_set_flags") static function _set_flags(v:Int) {}
 }
diff --git a/std/hl/I64.hx b/std/hl/I64.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c447d04af45b3983fd39a1ae60a8862454925bfe
--- /dev/null
+++ b/std/hl/I64.hx
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 hl;
+
+@:coreType @:notNull @:runtimeValue abstract I64 to Int from Int {}
diff --git a/std/hl/NativeArray.hx b/std/hl/NativeArray.hx
index d1756caa5c3cc63e16613bc69b7526ba5739135c..18d3173f552425f86642482d338f2661e1e2be00 100644
--- a/std/hl/NativeArray.hx
+++ b/std/hl/NativeArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 @:generic class NativeArrayIterator<T> {
-	var arr : NativeArray<T>;
-	var pos : Int;
-	var length : Int;
+	var arr:NativeArray<T>;
+	var pos:Int;
+	var length:Int;
 
 	public inline function new(arr:NativeArray<T>) {
 		this.arr = arr;
@@ -42,37 +43,38 @@ package hl;
 }
 
 @:coreType abstract NativeArray<T> {
+	public var length(get, never):Int;
 
-	public var length(get,never):Int;
-
-	@:extern public inline function new( length : Int ) {
+	extern public inline function new(length:Int) {
 		this = untyped $aalloc(length);
 	}
 
-	@:extern inline function get_length() : Int {
+	extern inline function get_length():Int {
 		return untyped $asize(this);
 	}
 
-	@:extern @:arrayAccess inline function get( pos : Int ) : T {
-		return untyped ($aget(this,pos):T);
+	@:arrayAccess extern inline function get(pos:Int):T {
+		return untyped ($aget(this, pos) : T);
 	}
 
-	@:extern @:arrayAccess inline function set( pos : Int, value : T ) : T {
-		untyped $aset(this,pos,value);
+	@:arrayAccess extern inline function set(pos:Int, value:T):T {
+		untyped $aset(this, pos, value);
 		return value;
 	}
 
-	@:extern public inline function sub( pos : Int, len : Int ) {
+	extern public inline function sub(pos:Int, len:Int) {
 		var n = new NativeArray<T>(len);
 		n.blit(0, this, pos, len);
 		return n;
 	}
 
-	@:hlNative("std","array_type") public function getType() : Type {
-		return null;
+	@:to extern public inline function getRef():Ref<T> {
+		return untyped $refdata(this);
 	}
 
- 	@:hlNative("std","array_blit") public function blit( pos : Int, src : NativeArray<T>, srcPos : Int, srcLen : Int ) : Void {
+	@:hlNative("std", "array_type") public function getType():Type {
+		return null;
 	}
 
-}
\ No newline at end of file
+	@:hlNative("std", "array_blit") public function blit(pos:Int, src:NativeArray<T>, srcPos:Int, srcLen:Int):Void {}
+}
diff --git a/std/hl/Profile.hx b/std/hl/Profile.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6d4039a9dc4883414767404959ccbc8e0332a928
--- /dev/null
+++ b/std/hl/Profile.hx
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C)2005-2019 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 hl;
+
+typedef Symbol = hl.Abstract<"hl_symbol">;
+
+enum TrackKind {
+	Alloc;
+	Cast;
+	DynField;
+	DynCall;
+}
+
+class Result {
+	public var t:hl.Type;
+	public var kind:TrackKind;
+	public var count:Int;
+	public var info:Int;
+	public var stack:Array<String>;
+
+	public function new(t, count, info) {
+		this.t = t;
+		this.count = count;
+		this.info = info;
+	}
+
+	@:keep public function toString() {
+		return t + "(" + count + ")";
+	}
+}
+
+@:hlNative("std")
+class Profile {
+	public static var threadBits(get, set):haxe.EnumFlags<TrackKind>;
+	public static var globalBits(get, set):haxe.EnumFlags<TrackKind>;
+
+	static var KINDS = null;
+
+	public static function getData(sortBySize = false, reset = true) {
+		var old = globalBits;
+		globalBits = new haxe.EnumFlags();
+		if (buf == null)
+			buf = new hl.Bytes(BUFSIZE * 2);
+		track_lock(true);
+		var maxDepth = 0;
+		var count = track_count(maxDepth);
+		var arr = new hl.NativeArray<Symbol>(maxDepth);
+		var out = [];
+		if (KINDS == null)
+			KINDS = TrackKind.createAll();
+		for (i in 0...count) {
+			var t:hl.Type = null, count = 0, info = 0;
+			var k = track_entry(i, t, count, info, arr);
+			if (count == 0)
+				continue;
+			var a = new Result(t, count, info);
+			a.kind = KINDS[k];
+			a.stack = [for (a in arr) resolveSymbol(a)];
+			out.push(a);
+		}
+		out.sort(function(a1, a2) {
+			if (a1.kind != a2.kind)
+				return a1.kind.getIndex() - a2.kind.getIndex();
+			if (sortBySize && a1.kind == Alloc)
+				return a2.info - a1.info;
+			return a2.count - a1.count;
+		});
+		track_lock(false);
+		if (reset)
+			Profile.reset();
+		globalBits = old;
+		return out;
+	}
+
+	public static function dump(fileName = "track.dump", sortBySize = false, reset = true) {
+		var old = globalBits;
+		globalBits = new haxe.EnumFlags();
+		var f = sys.io.File.write(fileName);
+		var data = getData(sortBySize, reset);
+		var allocCount = 0, allocSize = 0, castCount = 0, dynCount = 0;
+		for (o in data) {
+			switch (o.kind) {
+				case Alloc:
+					allocCount += o.count;
+					allocSize += o.info;
+				case Cast:
+					castCount += o.count;
+				case DynCall, DynField:
+					dynCount += o.count;
+			}
+		}
+		if (data.length == 0)
+			f.writeString("Nothing\n");
+		if (allocCount > 0)
+			f.writeString(allocCount + " total allocs (" + allocSize + " bytes)\n");
+		if (castCount > 0)
+			f.writeString(castCount + " total casts\n");
+		if (dynCount > 0)
+			f.writeString(dynCount + " total dynamic accesses/calls\n");
+		for (o in data) {
+			var pcount = StringTools.lpad("" + o.count, " ", 5);
+			switch (o.kind) {
+				case Alloc:
+					f.writeString("alloc    " + pcount + " " + o.t + " (" + o.info + " bytes)\n");
+				case Cast:
+					f.writeString("cast     " + pcount + " " + o.t + "\n");
+				case DynCall:
+					f.writeString("dyncall  " + pcount + " " + o.t + "." + getFieldName(o.info) + "()\n");
+				case DynField:
+					f.writeString("dynfield " + pcount + " " + o.t + "." + getFieldName(o.info) + "\n");
+			}
+			for (s in o.stack)
+				f.writeString("\t\t\t\t" + s + "\n");
+		}
+		f.close();
+		globalBits = old;
+	}
+
+	/**
+		Reset accumulated tracked data.
+	**/
+	@:hlNative("std", "track_reset") public static function reset() {}
+
+	/**
+		Restart tracking after being stopped.
+	**/
+	@:hlNative("std", "track_init") public static function restart() {}
+
+	/**
+		Stop tracking for all threads.
+	**/
+	public static function stop() {
+		globalBits = new haxe.EnumFlags();
+	}
+
+	/**
+		Set maximum stack depth for reports (default = 10)
+	**/
+	@:hlNative("std", "track_set_depth") public static function setMaxDepth(v:Int) {}
+
+	static function get_threadBits()
+		return new haxe.EnumFlags(track_get_bits(true));
+
+	static function set_threadBits(v:haxe.EnumFlags<TrackKind>) {
+		track_set_bits(v.toInt(), true);
+		return v;
+	}
+
+	static function get_globalBits()
+		return new haxe.EnumFlags(track_get_bits(false));
+
+	static function set_globalBits(v:haxe.EnumFlags<TrackKind>) {
+		track_set_bits(v.toInt(), false);
+		return v;
+	}
+
+	static var BUFSIZE = 512;
+	static var buf:hl.Bytes;
+
+	static function resolveSymbol(s:Symbol) {
+		var size = BUFSIZE;
+		if (buf == null)
+			buf = new hl.Bytes(BUFSIZE * 2);
+		var bytes = resolve_symbol(s, buf, size);
+		if (bytes == null)
+			return "<???>";
+		return @:privateAccess String.fromUCS2(bytes.sub(0, (size + 1) * 2));
+	}
+
+	static function resolve_symbol(s:Symbol, buf:hl.Bytes, bufSize:hl.Ref<Int>):hl.Bytes {
+		return null;
+	}
+
+	static function track_count(maxDepth:hl.Ref<Int>):Int {
+		return 0;
+	}
+
+	static function track_entry(id:Int, type:hl.Ref<hl.Type>, count:hl.Ref<Int>, info:hl.Ref<Int>, stack:NativeArray<Symbol>):Int {
+		return 0;
+	}
+
+	static function track_init():Void {}
+
+	static function track_lock(b:Bool):Void {}
+
+	static function track_get_bits(thread:Bool):Int {
+		return 0;
+	}
+
+	static function track_set_bits(bits:Int, thread:Bool):Void {}
+
+	static function __init__()
+		track_init();
+
+	// todo : move later to hl.Bytes
+
+	@:hlNative("std", "field_name")
+	public static function getFieldName(hash:Int):Bytes {
+		return null;
+	}
+}
diff --git a/std/hl/Ref.hx b/std/hl/Ref.hx
index b75e7f5664a1e5fb99d63716b9664e85c0361fbb..1d08f23eab147263c46cd2496a24cb352be35df4 100644
--- a/std/hl/Ref.hx
+++ b/std/hl/Ref.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,28 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
+@:semantics(reference)
 @:coreType abstract Ref<T> {
-
-	@:extern @:from public static inline function make<T>( v : T ) {
+	@:from extern public static inline function make<T>(v:T) {
 		return new Ref<T>(v);
 	}
 
-	@:extern public inline function new( v : T ) {
+	extern public inline function new(v:T) {
 		this = untyped $ref(v);
 	}
-	@:extern public inline function get() : T {
+
+	extern public inline function get():T {
 		return untyped $unref(this);
 	}
-	@:extern public inline function set( v : T ) : Void {
-		return untyped $setref(this,v);
+
+	extern public inline function set(v:T):Void {
+		return untyped $setref(this, v);
+	}
+
+	extern public inline function offset(v:Int):Ref<T> {
+		return untyped $refoffset(this, v);
 	}
-}
\ No newline at end of file
+}
diff --git a/std/hl/Type.hx b/std/hl/Type.hx
index c34a77960dc092d17b82fa02d3744f382d6cc0dc..c3f1ac345e61de1b0d6d67ad290dfdde41b351e8 100644
--- a/std/hl/Type.hx
+++ b/std/hl/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,94 +19,99 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
-@:enum
-abstract TypeKind(Int) {
+enum abstract TypeKind(Int) {
 	public var HVoid = 0;
 	public var HUI8 = 1;
 	public var HUI16 = 2;
 	public var HI32 = 3;
-	public var HF32 = 4;
-	public var HF64 = 5;
-	public var HBool = 6;
-	public var HBytes = 7;
-	public var HDyn = 8;
-	public var HFun = 9;
-	public var HObj = 10;
-	public var HArray = 11;
-	public var HType = 12;
-	public var HRef = 13;
-	public var HVirtual = 14;
-	public var HDynObj = 15;
-	public var HAbstract = 16;
-	public var HEnum = 17;
-	public var HNull = 18;
+	public var HI64 = 4;
+	public var HF32 = 5;
+	public var HF64 = 6;
+	public var HBool = 7;
+	public var HBytes = 8;
+	public var HDyn = 9;
+	public var HFun = 10;
+	public var HObj = 11;
+	public var HArray = 12;
+	public var HType = 13;
+	public var HRef = 14;
+	public var HVirtual = 15;
+	public var HDynObj = 16;
+	public var HAbstract = 17;
+	public var HEnum = 18;
+	public var HNull = 19;
 }
 
 @:coreType abstract Type {
+	public var kind(get, never):TypeKind;
 
-	public var kind(get,never) : TypeKind;
-
-	@:extern inline function get_kind() : TypeKind {
+	extern inline function get_kind():TypeKind {
 		return untyped $tkind(this);
 	}
 
-	@:hlNative("std","type_name") function getNameBytes() : Bytes {
+	@:hlNative("std", "type_name") function getNameBytes():Bytes {
 		return null;
 	}
 
-	@:extern public static inline function getDynamic( v : Dynamic ) : Type {
+	extern public static inline function getDynamic(v:Dynamic):Type {
 		return untyped $tdyntype(v);
 	}
 
-	@:extern public static inline function get<T>( v : T ) : Type {
+	extern public static inline function get<T>(v:T):Type {
 		return untyped $ttype(v);
 	}
 
-	@:extern public inline function getName() : String {
+	extern public static inline function void():Type {
+		return untyped $ttype((null:Void));
+	}
+
+	extern public inline function getTypeName():String {
 		var s = getNameBytes();
+		if (s == null)
+			return null;
 		return @:privateAccess String.fromUCS2(s);
 	}
 
-	@:hlNative("std", "type_safe_cast") public function safeCast( t : Type ) : Bool {
+	@:hlNative("std", "type_safe_cast") public function safeCast(t:Type):Bool {
 		return false;
 	}
 
-	@:hlNative("std","type_instance_fields") public function getInstanceFields() : NativeArray<Bytes> {
+	@:hlNative("std", "type_instance_fields") public function getInstanceFields():NativeArray<Bytes> {
 		return null;
 	}
 
-	@:hlNative("std","type_get_global") public function getGlobal() : Dynamic {
+	@:hlNative("std", "type_get_global") public function getGlobal():Dynamic {
 		return null;
 	}
 
-	@:hlNative("std","type_set_global") public function setGlobal( v : Dynamic ) : Bool {
+	@:hlNative("std", "type_set_global") public function setGlobal(v:Dynamic):Bool {
 		return false;
 	}
 
-	@:hlNative("std","type_args_count") public function getArgsCount() : Int {
+	@:hlNative("std", "type_args_count") public function getArgsCount():Int {
 		return 0;
 	}
 
-	@:hlNative("std","type_super") public function getSuper() : Type {
+	@:hlNative("std", "type_super") public function getSuper():Type {
 		return null;
 	}
 
-	@:hlNative("std","type_enum_fields") public function getEnumFields() : NativeArray<Bytes> {
+	@:hlNative("std", "type_enum_fields") public function getEnumFields():NativeArray<Bytes> {
 		return null;
 	}
 
-	@:hlNative("std","type_enum_values") public function getEnumValues() : NativeArray<Dynamic> {
+	@:hlNative("std", "type_enum_values") public function getEnumValues():NativeArray<Dynamic> {
 		return null;
 	}
 
-	@:hlNative("std","alloc_obj") public function allocObject() : Dynamic {
+	@:hlNative("std", "alloc_obj") public function allocObject():Dynamic {
 		return null;
 	}
 
-	@:hlNative("std", "alloc_enum") public function allocEnum( index : Int, args : NativeArray<Dynamic>, nargs : Int ) : Dynamic {
+	@:hlNative("std", "alloc_enum_dyn") public function allocEnum(index:Int, args:NativeArray<Dynamic>, nargs:Int):Dynamic {
 		return null;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/hl/UI.hx b/std/hl/UI.hx
index 4c3f7fa96dafc207c9f80278b530be64d101498c..82735e75ff9be8b92fd62a62d3ab7925061f6c37 100644
--- a/std/hl/UI.hx
+++ b/std/hl/UI.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,44 +19,54 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 typedef SentinelHandle = hl.Abstract<"ui_sentinel">;
 
 abstract Sentinel(SentinelHandle) {
+	public var pause(get, set):Bool;
+
+	public function new(timeout, callback) {
+		this = create_sentinel(timeout, callback);
+	}
 
-	public function new( timeout, callback ) {
-		this = create_sentinel(timeout,callback);
+	function get_pause() {
+		return is_paused(this);
 	}
-	
-	public function setPause( p : Bool ) {
+
+	function set_pause(p:Bool) {
 		_pause(this, p);
+		return p;
 	}
 
 	public function tick() {
 		_tick(this);
 	}
 
-	@:hlNative("ui", "ui_start_sentinel") static function create_sentinel( timeout : Float, callb : Void -> Void ) : SentinelHandle {
+	@:hlNative("ui", "ui_start_sentinel") static function create_sentinel(timeout:Float, callb:Void->Void):SentinelHandle {
 		return null;
 	}
 
-	@:hlNative("ui","ui_sentinel_tick") static function _tick( h : SentinelHandle ) : Void {}
-	@:hlNative("ui","ui_sentinel_pause") static function _pause( h : SentinelHandle, b : Bool ) : Void {}
+	@:hlNative("ui", "ui_sentinel_tick") static function _tick(h:SentinelHandle):Void {}
 
+	@:hlNative("ui", "ui_sentinel_pause") static function _pause(h:SentinelHandle, b:Bool):Void {}
+
+	@:hlNative("ui", "ui_sentinel_is_paused") static function is_paused(h:SentinelHandle):Bool {
+		return false;
+	}
 }
 
 typedef WinHandle = hl.Abstract<"ui_window">;
 
 class Window {
+	var h:WinHandle;
 
-	var h : WinHandle;
-
-	public function setText( text : String ) {
+	public function setText(text:String) {
 		win_set_text(h, @:privateAccess text.bytes);
 	}
 
-	public function setEnable( b : Bool ) {
+	public function setEnable(b:Bool) {
 		win_set_enable(h, b);
 	}
 
@@ -64,58 +74,45 @@ class Window {
 		win_destroy(h);
 	}
 
+	@:hlNative("ui", "ui_win_destroy")
+	static function win_destroy(win:WinHandle):Void {}
 
-	@:hlNative("ui","ui_win_destroy")
-	static function win_destroy( win : WinHandle ) : Void {
-	}
-
-	@:hlNative("ui","ui_win_set_text")
-	static function win_set_text( win : WinHandle, text : hl.Bytes ) : Void {
-	}
-
-	@:hlNative("ui","ui_win_set_enable")
-	static function win_set_enable( win : WinHandle, enable : Bool ) : Void {
-	}
-
+	@:hlNative("ui", "ui_win_set_text")
+	static function win_set_text(win:WinHandle, text:hl.Bytes):Void {}
 
+	@:hlNative("ui", "ui_win_set_enable")
+	static function win_set_enable(win:WinHandle, enable:Bool):Void {}
 }
 
 class Button extends Window {
-
-	public function new( parent : Window, text : String ) {
+	public function new(parent:Window, text:String) {
 		h = button_new(parent.h, @:privateAccess text.bytes, function() this.onClick());
 	}
 
-	public dynamic function onClick() {
-	}
+	public dynamic function onClick() {}
 
 	@:hlNative("ui", "ui_button_new")
-	static function button_new( parent : WinHandle, text : hl.Bytes, onClick : Void -> Void ) : WinHandle {
+	static function button_new(parent:WinHandle, text:hl.Bytes, onClick:Void->Void):WinHandle {
 		return null;
 	}
-
 }
 
 class WinLog extends Window {
-
-	public function new( title : String, width, height ) {
-		h = winlog_new(@:privateAccess title.bytes,width, height);
+	public function new(title:String, width, height) {
+		h = winlog_new(@:privateAccess title.bytes, width, height);
 	}
 
-	public function setTextContent( text : String, autoScroll = false ) {
-		winlog_set_text(h, @:privateAccess text.bytes,autoScroll);
+	public function setTextContent(text:String, autoScroll = false) {
+		winlog_set_text(h, @:privateAccess text.bytes, autoScroll);
 	}
 
-
-	@:hlNative("ui","ui_winlog_new")
-	static function winlog_new( text : hl.Bytes, width : Int, height : Int ) : WinHandle {
+	@:hlNative("ui", "ui_winlog_new")
+	static function winlog_new(text:hl.Bytes, width:Int, height:Int):WinHandle {
 		return null;
 	}
 
-	@:hlNative("ui","ui_winlog_set_text")
-	static function winlog_set_text( win : WinHandle, text : hl.Bytes, autoScroll : Bool ) : Void {
-	}
-
+	@:hlNative("ui", "ui_winlog_set_text")
+	static function winlog_set_text(win:WinHandle, text:hl.Bytes, autoScroll:Bool):Void {}
 }
 
 enum DialogFlags {
@@ -123,43 +120,98 @@ enum DialogFlags {
 	IsError;
 }
 
-@:enum abstract LoopResult(Int) {
+enum abstract LoopResult(Int) {
 	var NoMessage = 0;
 	var HandledMessage = 1;
 	var Quit = 2;
 }
 
+typedef FileOptions = {
+	var ?window:Window;
+	var ?filters:Array<{name:String, exts:Array<String>}>;
+	var ?filterIndex:Int;
+	var ?fileName:String;
+	var ?title:String;
+}
+
 /**
 	These are the bindings for the HL `ui.hdll` library, which contains some low level system access.
 **/
 class UI {
-
-	@:hlNative("ui","ui_init") static function init() {}
+	@:hlNative("ui", "ui_init") static function init() {}
 
 	static function __init__() {
 		init();
 	}
 
-	@:hlNative("ui","ui_dialog")
-	static function _dialog( title : hl.Bytes, text : hl.Bytes, flags : Int ) : Int {
+	@:hlNative("ui", "ui_dialog")
+	static function _dialog(title:hl.Bytes, text:hl.Bytes, flags:Int):Int {
 		return 0;
 	}
 
-	public static function dialog( title : String, text : String, flags : haxe.EnumFlags<DialogFlags> ) {
-		@:privateAccess _dialog(title.bytes,text.bytes,flags.toInt());
+	public static function dialog(title:String, text:String, flags:haxe.EnumFlags<DialogFlags>) {
+		@:privateAccess _dialog(title.bytes, text.bytes, flags.toInt());
 	}
 
-	@:hlNative("ui","ui_loop")
-	public static function loop( blocking : Bool ) : LoopResult {
+	@:hlNative("ui", "ui_loop")
+	public static function loop(blocking:Bool):LoopResult {
 		return Quit;
 	}
 
-	@:hlNative("ui","ui_stop_loop")
-	public static function stopLoop() : Void {
-	}
-
-	@:hlNative("ui","ui_close_console")
-	public static function closeConsole() : Void {
+	@:hlNative("ui", "ui_stop_loop")
+	public static function stopLoop():Void {}
+
+	@:hlNative("ui", "ui_close_console")
+	public static function closeConsole():Void {}
+
+	public static function loadFile(opts:FileOptions) {
+		return chooseFile(false, opts);
+	}
+
+	public static function saveFile(opts:FileOptions) {
+		return chooseFile(true, opts);
+	}
+
+	static function chooseFile(save:Bool, opts:FileOptions) @:privateAccess {
+		var out:Dynamic = {};
+		if (opts.fileName != null) {
+			var file = sys.FileSystem.absolutePath(opts.fileName);
+			if (Sys.systemName() == "Windows")
+				file = file.split("/").join("\\");
+			var dir = null;
+			if (sys.FileSystem.isDirectory(file)) {
+				dir = file;
+				file = null;
+			} else {
+				var path = new haxe.io.Path(file);
+				dir = path.dir;
+				file = path.file + (path.ext == null ? "" : "." + path.ext);
+			}
+			if (file != null)
+				out.fileName = file.bytes;
+			if (dir != null)
+				out.directory = dir.bytes;
+		}
+		if (opts.title != null)
+			out.title = opts.title.bytes;
+		if (opts.filters != null) {
+			var filters = new hl.NativeArray<hl.Bytes>(opts.filters.length * 2);
+			var i = 0;
+			for (f in opts.filters) {
+				filters[i++] = f.name.bytes;
+				filters[i++] = [for (e in f.exts) "*." + e].join(";").bytes;
+			}
+			out.filters = filters;
+			out.filterIndex = opts.filterIndex;
+		}
+		if (opts.window != null)
+			out.window = opts.window.h;
+		var str = _chooseFile(save, out);
+		return str == null ? null : String.fromUCS2(str);
+	}
+
+	@:hlNative("ui", "ui_choose_file")
+	static function _chooseFile(forSave:Bool, obj:Dynamic):hl.Bytes {
+		return null;
 	}
-	
-}
\ No newline at end of file
+}
diff --git a/std/hl/UI16.hx b/std/hl/UI16.hx
index 0b77920e13623cf36a066060ca3e94de30c62e6c..23f4e97e42c8bd92f0a2ea15fcbb35840286d681 100644
--- a/std/hl/UI16.hx
+++ b/std/hl/UI16.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 @:coreType @:notNull @:runtimeValue abstract UI16 to Int from Int {}
diff --git a/std/hl/UI8.hx b/std/hl/UI8.hx
index e3acda17267487662b7bf8331012654b8eb29092..d53c915eb4307af2208baf0b7a18185221472425 100644
--- a/std/hl/UI8.hx
+++ b/std/hl/UI8.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl;
 
 @:coreType @:notNull @:runtimeValue abstract UI8 to Int from Int {}
diff --git a/std/hl/_std/Date.hx b/std/hl/_std/Date.hx
index acb923457ea580f1620315ea3ab1da7ea0f6c49e..e0a52c5c6cf082eeea5080a34e7e8dd7a5565e6a 100644
--- a/std/hl/_std/Date.hx
+++ b/std/hl/_std/Date.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,126 +19,178 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-import hl.Ref;
 
-@:coreApi @:final class Date {
+import hl.Ref;
 
-	private var t : Int;
+@:coreApi final class Date {
+	private var t:Int;
 
-	public function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void {
+	public function new(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Void {
 		t = date_new(year, month, day, hour, min, sec);
 	}
 
-	public function getTime() : Float {
+	public function getTime():Float {
 		return date_get_time(t);
 	}
 
-	public function getFullYear() : Int {
+	public function getFullYear():Int {
 		var v = 0;
 		date_get_inf(t, v, null, null, null, null, null, null);
 		return v;
 	}
 
-	public function getMonth() : Int {
+	public function getMonth():Int {
 		var v = 0;
 		date_get_inf(t, null, v, null, null, null, null, null);
 		return v;
 	}
 
-	public function getDate() : Int {
+	public function getDate():Int {
 		var v = 0;
 		date_get_inf(t, null, null, v, null, null, null, null);
 		return v;
 	}
 
-	public function getHours() : Int {
+	public function getHours():Int {
 		var v = 0;
 		date_get_inf(t, null, null, null, v, null, null, null);
 		return v;
 	}
 
-	public function getMinutes() : Int {
+	public function getMinutes():Int {
 		var v = 0;
 		date_get_inf(t, null, null, null, null, v, null, null);
 		return v;
 	}
 
-	public function getSeconds() : Int {
+	public function getSeconds():Int {
 		var v = 0;
 		date_get_inf(t, null, null, null, null, null, v, null);
 		return v;
 	}
 
-	public function getDay() : Int {
+	public function getDay():Int {
 		var v = 0;
 		date_get_inf(t, null, null, null, null, null, null, v);
 		return v;
 	}
 
+	public function getUTCFullYear():Int {
+		var v = 0;
+		date_get_utc_inf(t, v, null, null, null, null, null, null);
+		return v;
+	}
+
+	public function getUTCMonth():Int {
+		var v = 0;
+		date_get_utc_inf(t, null, v, null, null, null, null, null);
+		return v;
+	}
+
+	public function getUTCDate():Int {
+		var v = 0;
+		date_get_utc_inf(t, null, null, v, null, null, null, null);
+		return v;
+	}
+
+	public function getUTCHours():Int {
+		var v = 0;
+		date_get_utc_inf(t, null, null, null, v, null, null, null);
+		return v;
+	}
+
+	public function getUTCMinutes():Int {
+		var v = 0;
+		date_get_utc_inf(t, null, null, null, null, v, null, null);
+		return v;
+	}
+
+	public function getUTCSeconds():Int {
+		var v = 0;
+		date_get_utc_inf(t, null, null, null, null, null, v, null);
+		return v;
+	}
+
+	public function getUTCDay():Int {
+		var v = 0;
+		date_get_utc_inf(t, null, null, null, null, null, null, v);
+		return v;
+	}
+
+	public function getTimezoneOffset():Int {
+		var y = 0;
+		var mo = 0;
+		var d = 0;
+		var h = 0;
+		var m = 0;
+		var s = 0;
+		date_get_utc_inf(t, y, mo, d, h, m, s, null);
+		return Std.int((date_new(y, mo, d, h, m, s) - t) / 60);
+	}
+
 	@:keep public function toString():String {
 		var outLen = 0;
 		var bytes = date_to_string(t, outLen);
-		return @:privateAccess String.__alloc__(bytes,outLen);
+		return @:privateAccess String.__alloc__(bytes, outLen);
 	}
 
-	public static function now() : Date {
-		var d : Date = untyped $new(Date);
+	public static function now():Date {
+		var d:Date = untyped $new(Date);
 		d.t = date_now();
 		return d;
 	}
 
-	static function fromInt( t : Int ) : Date {
-		var d : Date = untyped $new(Date);
+	static function fromInt(t:Int):Date {
+		var d:Date = untyped $new(Date);
 		d.t = t;
 		return d;
 	}
 
-	public static function fromTime( t : Float ) : Date {
-		var d : Date = untyped $new(Date);
+	public static function fromTime(t:Float):Date {
+		var d:Date = untyped $new(Date);
 		d.t = date_from_time(t);
 		return d;
 	}
 
-	public static function fromString( s : String ) : Date {
-		var d : Date = untyped $new(Date);
-		d.t = date_from_string(@:privateAccess s.bytes, s.length<<1);
+	public static function fromString(s:String):Date {
+		var d:Date = untyped $new(Date);
+		d.t = date_from_string(@:privateAccess s.bytes, s.length << 1);
 		return d;
 	}
 
 	@:hlNative
-	static function date_new( year : Int, month : Int, day : Int, hours : Int, minutes : Int, seconds : Int ) : Int {
+	static function date_new(year:Int, month:Int, day:Int, hours:Int, minutes:Int, seconds:Int):Int {
 		return 0;
 	}
 
 	@:hlNative
-	static function date_now() : Int {
+	static function date_now():Int {
 		return 0;
 	}
 
 	@:hlNative
-	static function date_from_time( t : Float ) : Int {
+	static function date_from_time(t:Float):Int {
 		return 0;
 	}
 
 	@:hlNative
-	static function date_from_string( b : hl.Bytes, len : Int ) : Int {
+	static function date_from_string(b:hl.Bytes, len:Int):Int {
 		return 0;
 	}
 
 	@:hlNative
-	static function date_get_time( t : Int ) : Float {
+	static function date_get_time(t:Int):Float {
 		return 0.;
 	}
 
 	@:hlNative
-	static function date_get_inf( t : Int, year : Ref<Int>, month : Ref<Int>, day : Ref<Int>, hours : Ref<Int>, minutes : Ref<Int>, seconds : Ref<Int>, wday : Ref<Int> ) : Void {
-	}
+	static function date_get_inf(t:Int, year:Ref<Int>, month:Ref<Int>, day:Ref<Int>, hours:Ref<Int>, minutes:Ref<Int>, seconds:Ref<Int>, wday:Ref<Int>):Void {}
+
+	@:hlNative(1.11)
+	static function date_get_utc_inf(t:Int, year:Ref<Int>, month:Ref<Int>, day:Ref<Int>, hours:Ref<Int>, minutes:Ref<Int>, seconds:Ref<Int>, wday:Ref<Int>):Void {}
 
 	@:hlNative
-	static function date_to_string( t : Int, outLen : Ref<Int> ) : hl.Bytes {
+	static function date_to_string(t:Int, outLen:Ref<Int>):hl.Bytes {
 		return null;
 	}
-
 }
-
-
diff --git a/std/hl/_std/EReg.hx b/std/hl/_std/EReg.hx
index f04a23e73da63916394003718314123e00557a7b..c066161ba8a7e1abfa82c5b9b87a3e1e807b1f62 100644
--- a/std/hl/_std/EReg.hx
+++ b/std/hl/_std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,145 +19,145 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 private typedef ERegValue = hl.Abstract<"ereg">;
 
 @:access(String)
-@:coreApi @:final class EReg {
-
-	var r : ERegValue;
-	var last : String;
-	var global : Bool;
+@:coreApi final class EReg {
+	var r:ERegValue;
+	var last:String;
+	var global:Bool;
 
-	public function new( r : String, opt : String ) : Void {
+	public function new(r:String, opt:String):Void {
 		var a = opt.split("g");
 		global = a.length > 1;
-		if( global )
+		if (global)
 			opt = a.join("");
 		this.r = regexp_new_options(r.bytes, opt.bytes);
 	}
 
-	public function match( s : String ) : Bool {
-		var p = regexp_match(r,s.bytes,0,s.length);
-		if( p )
+	public function match(s:String):Bool {
+		var p = regexp_match(r, s.bytes, 0, s.length);
+		if (p)
 			last = s;
 		else
 			last = null;
 		return p;
 	}
 
-	public function matched( n : Int ) : String {
+	public function matched(n:Int):String {
 		var len = 0;
-		var m = regexp_matched_pos(r,n,len);
+		var m = regexp_matched_pos(r, n, len);
 		return m < 0 ? null : last.substr(m, len);
 	}
 
-	public function matchedLeft() : String {
-		var p = regexp_matched_pos(r,0,null);
-		return last.substr(0,p);
+	public function matchedLeft():String {
+		var p = regexp_matched_pos(r, 0, null);
+		return last.substr(0, p);
 	}
 
-	public function matchedRight() : String {
+	public function matchedRight():String {
 		var len = 0;
-		var p = regexp_matched_pos(r,0,len);
+		var p = regexp_matched_pos(r, 0, len);
 		return last.substr(p + len);
 	}
 
-	public function matchedPos() : { pos : Int, len : Int } {
+	public function matchedPos():{pos:Int, len:Int} {
 		var len = 0;
 		var p = regexp_matched_pos(r, 0, len);
-		if( p < 0 ) return null;
-		return { pos : p, len : len };
+		if (p < 0)
+			return null;
+		return {pos: p, len: len};
 	}
 
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
 		var p = regexp_match(r, s.bytes, pos, len < 0 ? s.length - pos : len);
-		if( p )
+		if (p)
 			last = s;
 		else
 			last = null;
 		return p;
 	}
 
-	public function split( s : String ) : Array<String> {
+	public function split(s:String):Array<String> {
 		var pos = 0;
 		var len = s.length;
 		var a = new Array();
 		var first = true;
 		do {
-			if( !regexp_match(r,s.bytes,pos,len) )
+			if (!regexp_match(r, s.bytes, pos, len))
 				break;
 			var plen = 0;
-			var p = regexp_matched_pos(r,0,plen);
-			if( plen == 0 && !first ) {
-				if( p == s.length )
+			var p = regexp_matched_pos(r, 0, plen);
+			if (plen == 0 && !first) {
+				if (p == s.length)
 					break;
 				p++;
 			}
-			a.push(s.substr(pos,p - pos));
+			a.push(s.substr(pos, p - pos));
 			var tot = p + plen - pos;
 			pos += tot;
 			len -= tot;
 			first = false;
-		} while( global );
-		a.push(s.substr(pos,len));
+		} while (global);
+		a.push(s.substr(pos, len));
 		return a;
 	}
 
-	public function replace( s : String, by : String ) : String {
+	public function replace(s:String, by:String):String {
 		var b = new StringBuf();
 		var pos = 0;
 		var len = s.length;
 		var a = by.split("$");
 		var first = true;
 		do {
-			if( !regexp_match(r,s.bytes,pos,len) )
+			if (!regexp_match(r, s.bytes, pos, len))
 				break;
 			var plen = 0;
-			var p = regexp_matched_pos(r,0, plen);
-			if( plen == 0 && !first ) {
-				if( p == s.length )
+			var p = regexp_matched_pos(r, 0, plen);
+			if (plen == 0 && !first) {
+				if (p == s.length)
 					break;
 				p++;
 			}
-			b.addSub(s,pos,p-pos);
-			if( a.length > 0 )
+			b.addSub(s, pos, p - pos);
+			if (a.length > 0)
 				b.add(a[0]);
 			var i = 1;
-			while( i < a.length ) {
+			while (i < a.length) {
 				var k = a[i];
 				var c = StringTools.fastCodeAt(k, 0);
 				// 1...9
-				if( c >= 49 && c <= 57 ) {
+				if (c >= 49 && c <= 57) {
 					var plen = 0;
-					var p = try regexp_matched_pos(r,Std.int(c)-48,plen) catch( e : String ) -1;
-					if( p < 0 ){
+					var p = try regexp_matched_pos(r, Std.int(c) - 48, plen) catch (e:String) -1;
+					if (p < 0) {
 						b.add("$");
 						b.add(k);
 					} else {
-						if( p >= 0 ) b.addSub(s,p,plen);
-						b.addSub(k,1,k.length - 1);
+						if (p >= 0)
+							b.addSub(s, p, plen);
+						b.addSub(k, 1, k.length - 1);
 					}
-				} else if( c == 0 ) {
+				} else if (c == 0) {
 					b.add("$");
 					i++;
 					var k2 = a[i];
-					if( k2 != null && k2.length > 0 )
+					if (k2 != null && k2.length > 0)
 						b.add(k2);
 				} else
-					b.add("$"+k);
+					b.add("$" + k);
 				i++;
 			}
 			var tot = p + plen - pos;
 			pos += tot;
 			len -= tot;
 			first = false;
-		} while( global );
-		b.addSub(s,pos,len);
+		} while (global);
+		b.addSub(s, pos, len);
 		return b.toString();
 	}
 
-	public function map( s : String, f : EReg -> String ) : String {
+	public function map(s:String, f:EReg->String):String {
 		var offset = 0;
 		var buf = new StringBuf();
 		do {
@@ -168,14 +168,13 @@ private typedef ERegValue = hl.Abstract<"ereg">;
 				break;
 			}
 			var plen = 0;
-			var p = regexp_matched_pos(r,0,plen);
+			var p = regexp_matched_pos(r, 0, plen);
 			buf.add(s.substr(offset, p - offset));
 			buf.add(f(this));
 			if (plen == 0) {
 				buf.add(s.substr(p, 1));
 				offset = p + 1;
-			}
-			else
+			} else
 				offset = p + plen;
 		} while (global);
 		if (!global && offset > 0 && offset < s.length)
@@ -183,18 +182,21 @@ private typedef ERegValue = hl.Abstract<"ereg">;
 		return buf.toString();
 	}
 
+	public static function escape(s:String):String {
+		return escapeRegExpRe.map(s, function(r) return "\\" + r.matched(0));
+	}
+
+	static var escapeRegExpRe = ~/[\[\]{}()*+?.\\\^$|]/g;
 
-	@:hlNative("std", "regexp_new_options") static function regexp_new_options( bytes : hl.Bytes, options : hl.Bytes ) : ERegValue {
+	@:hlNative("std", "regexp_new_options") static function regexp_new_options(bytes:hl.Bytes, options:hl.Bytes):ERegValue {
 		return null;
 	}
 
-	@:hlNative("std", "regexp_match") static function regexp_match( r : ERegValue, str : hl.Bytes, pos : Int, size : Int ) : Bool {
+	@:hlNative("std", "regexp_match") static function regexp_match(r:ERegValue, str:hl.Bytes, pos:Int, size:Int):Bool {
 		return false;
 	}
 
-	@:hlNative("std", "regexp_matched_pos") static function regexp_matched_pos( r : ERegValue, n : Int, size : hl.Ref<Int> ) : Int {
+	@:hlNative("std", "regexp_matched_pos") static function regexp_matched_pos(r:ERegValue, n:Int, size:hl.Ref<Int>):Int {
 		return 0;
 	}
-
-
 }
diff --git a/std/hl/_std/Math.hx b/std/hl/_std/Math.hx
index 031a8672aa62334b22d9cf56530d694e79ef24d9..2c76ba8335dc30f67efc9221d7d1cbe6848be2f8 100644
--- a/std/hl/_std/Math.hx
+++ b/std/hl/_std/Math.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,45 +21,84 @@
  */
 @:coreApi
 class Math {
+	@:hlNative("std", "math_sqrt") public static function sqrt(v:Float):Float
+		return 0.;
 
-	@:hlNative("std","math_sqrt") public static function sqrt( v : Float ) : Float 			return 0.;
-	@:hlNative("std","math_abs") public static function abs( v : Float ) : Float 			return 0.;
-	@:hlNative("std","math_floor") public static function floor( v : Float ) : Int 			return 0;
-	@:hlNative("std","math_round") public static function round( v : Float ) : Int 			return 0;
-	@:hlNative("std","math_ceil") public static function ceil( v : Float ) : Int 			return 0;
-	@:hlNative("std","math_isfinite") public static function isFinite( f : Float ) : Bool 	return true;
-	@:hlNative("std","math_isnan") public static function isNaN( f : Float ) : Bool 		return false;
-
-	@:hlNative("std","math_ffloor") public static function ffloor( v : Float ) : Float 		return 0.;
-	@:hlNative("std","math_fround") public static function fround( v : Float ) : Float 		return 0.;
-	@:hlNative("std","math_fceil") public static function fceil( v : Float ) : Float 		return 0.;
-
-	@:hlNative("std","math_cos") public static function cos( v : Float ) : Float 			return 0.;
-	@:hlNative("std","math_sin") public static function sin( v : Float ) : Float 			return 0.;
-	@:hlNative("std","math_exp") public static function exp( v : Float ) : Float 			return 0.;
-	@:hlNative("std","math_log") public static function log( v : Float ) : Float 			return 0.;
-	@:hlNative("std","math_tan") public static function tan( v : Float ) : Float 			return 0.;
-	@:hlNative("std","math_atan") public static function atan( v : Float ) : Float 			return 0.;
-	@:hlNative("std","math_acos") public static function acos( v : Float ) : Float 			return 0.;
-	@:hlNative("std","math_asin") public static function asin( v : Float ) : Float 			return 0.;
-	@:hlNative("std","math_pow") public static function pow( v : Float, exp : Float ) : Float 				return 0.;
-	@:hlNative("std","math_atan2") public static function atan2( y : Float, x : Float ) : Float 			return 0.;
-
-	public static function random() : Float return @:privateAccess Std.rnd_float(Std.rnd);
-
-	public static function min( a : Float, b : Float ) : Float 			return a < b || isNaN(a) ? a : b;
-	public static function max( a : Float, b : Float ) : Float 			return a < b || isNaN(b) ? b : a;
-
-	public static var PI(default,null) : Float;
-	public static var NaN(default,null) : Float;
-	public static var POSITIVE_INFINITY(default,null) : Float;
-	public static var NEGATIVE_INFINITY(default,null) : Float;
-
-	static function __init__() : Void {
+	@:hlNative("std", "math_abs") public static function abs(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_floor") public static function floor(v:Float):Int
+		return 0;
+
+	@:hlNative("std", "math_round") public static function round(v:Float):Int
+		return 0;
+
+	@:hlNative("std", "math_ceil") public static function ceil(v:Float):Int
+		return 0;
+
+	@:hlNative("std", "math_isfinite") public static function isFinite(f:Float):Bool
+		return true;
+
+	@:hlNative("std", "math_isnan") public static function isNaN(f:Float):Bool
+		return false;
+
+	@:hlNative("std", "math_ffloor") public static function ffloor(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_fround") public static function fround(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_fceil") public static function fceil(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_cos") public static function cos(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_sin") public static function sin(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_exp") public static function exp(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_log") public static function log(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_tan") public static function tan(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_atan") public static function atan(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_acos") public static function acos(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_asin") public static function asin(v:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_pow") public static function pow(v:Float, exp:Float):Float
+		return 0.;
+
+	@:hlNative("std", "math_atan2") public static function atan2(y:Float, x:Float):Float
+		return 0.;
+
+	public static function random():Float
+		return @:privateAccess Std.rnd_float(Std.rnd);
+
+	public static function min(a:Float, b:Float):Float
+		return a < b || isNaN(a) ? a : b;
+
+	public static function max(a:Float, b:Float):Float
+		return a < b || isNaN(b) ? b : a;
+
+	public static var PI(default, null):Float;
+	public static var NaN(default, null):Float;
+	public static var POSITIVE_INFINITY(default, null):Float;
+	public static var NEGATIVE_INFINITY(default, null):Float;
+
+	static function __init__():Void {
 		PI = 3.1415926535897932384626433832795;
 		NaN = 0. / 0.;
 		POSITIVE_INFINITY = 1. / 0.;
 		NEGATIVE_INFINITY = -1. / 0.;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/hl/_std/Reflect.hx b/std/hl/_std/Reflect.hx
index 14e199429b8b812c398f0e7eedb49e407a0d5640..7768660fa915885980d64fcc50c80d63fbf77485 100644
--- a/std/hl/_std/Reflect.hx
+++ b/std/hl/_std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,125 +19,126 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 @:coreApi
 class Reflect {
-
-	public static function hasField( o : Dynamic, field : String ) : Bool {
-		if( field == null ) return false;
+	public static function hasField(o:Dynamic, field:String):Bool {
+		if (field == null)
+			return false;
 		var hash = @:privateAccess field.bytes.hash();
-		return hl.Api.hasField(o,hash);
+		return hl.Api.hasField(o, hash);
 	}
 
-	public static function field( o : Dynamic, field : String ) : Dynamic {
-		if( field == null ) return null;
+	public static function field(o:Dynamic, field:String):Dynamic {
+		if (field == null)
+			return null;
 		var hash = @:privateAccess field.bytes.hash();
-		return hl.Api.getField(o,hash);
+		return hl.Api.getField(o, hash);
 	}
 
-	public static function setField( o : Dynamic, field : String, value : Dynamic ) : Void {
+	public static function setField(o:Dynamic, field:String, value:Dynamic):Void {
 		var hash = @:privateAccess field.bytes.hash();
-		hl.Api.setField(o,hash,value);
+		hl.Api.setField(o, hash, value);
 	}
 
-	public static function getProperty( o : Dynamic, field : String ) : Dynamic {
-		var f : Dynamic = Reflect.field(o, "get_" + field);
-		if( f != null )
+	public static function getProperty(o:Dynamic, field:String):Dynamic {
+		var f:Dynamic = Reflect.field(o, "get_" + field);
+		if (f != null)
 			return f();
-		return Reflect.field(o,field);
+		return Reflect.field(o, field);
 	}
 
-	public static function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void {
-		var f : Dynamic = Reflect.field(o, "set_" + field);
-		if( f != null )
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void {
+		var f:Dynamic = Reflect.field(o, "set_" + field);
+		if (f != null)
 			f(value);
 		else
 			setField(o, field, value);
 	}
 
-	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic {
-		var args : hl.types.ArrayDyn = cast args;
-		var count = args.length;
+	public static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic {
+		var args:hl.types.ArrayDyn = cast args;
 
 		var ft = hl.Type.getDynamic(func);
-		if( ft.kind != HFun )
+		if (ft.kind != HFun)
 			throw "Invalid function " + func;
+
+		var count = args.length;
 		var need = ft.getArgsCount();
-		var cval = hl.Api.getClosureValue(func);
-		var isClosure = cval != null && need >= 0;
-		if( o == null )
-			o = cval;
-		else if( !isClosure && count == need )
-			o = null;
-		var nargs = o == null ? count : count + 1;
-		if( isClosure ) need++;
-		if( nargs < need ) nargs = need;
+		var nargs = count < need ? need : count;
+		var cval:Dynamic = hl.Api.getClosureValue(func);
+		if (cval != null) {
+			func = hl.Api.noClosure(func);
+			nargs++;
+		}
+
 		var a = new hl.NativeArray<Dynamic>(nargs);
-		if( o == null || need < 0 ) {
-			for( i in 0...count )
+		if (cval == null) {
+			for (i in 0...count)
 				a[i] = args.getDyn(i);
 		} else {
-			func = hl.Api.noClosure(func);
-			a[0] = o;
-			for( i in 0...count )
-				a[i+1] = args.getDyn(i);
+			a[0] = cval;
+			for (i in 0...count)
+				a[i + 1] = args.getDyn(i);
 		}
-		return hl.Api.callMethod(func,a);
+		return hl.Api.callMethod(func, a);
 	}
 
-	@:hlNative("std","obj_fields") static function getObjectFields( v : Dynamic ) : hl.NativeArray<hl.Bytes> {
+	@:hlNative("std", "obj_fields") static function getObjectFields(v:Dynamic):hl.NativeArray<hl.Bytes> {
 		return null;
 	}
 
-	public static function fields( o : Dynamic ) : Array<String> {
+	public static function fields(o:Dynamic):Array<String> {
 		var fields = getObjectFields(o);
-		if( fields == null ) return [];
-		return [for( f in fields ) @:privateAccess String.fromUCS2(f)];
+		if (fields == null)
+			return [];
+		return [for (f in fields) @:privateAccess String.fromUCS2(f)];
 	}
 
-	public static inline function isFunction( f : Dynamic ) : Bool {
+	public static inline function isFunction(f:Dynamic):Bool {
 		return hl.Type.getDynamic(f).kind == HFun;
 	}
 
-	@:hlNative("std","dyn_compare")
-	public static function compare<T>( a : T, b : T ) : Int {
+	@:hlNative("std", "dyn_compare")
+	public static function compare<T>(a:T, b:T):Int {
 		return 0;
 	}
 
-	@:hlNative("std","fun_compare")
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool {
+	@:hlNative("std", "fun_compare")
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
 		return false;
 	}
 
-	public static function isObject( v : Dynamic ) : Bool {
+	public static function isObject(v:Dynamic):Bool {
 		var t = hl.Type.getDynamic(v);
-		return switch( t.kind ) { case HObj, HDynObj, HVirtual: true; default: false; }
+		return switch (t.kind) {
+			case HObj, HDynObj, HVirtual: true;
+			default: false;
+		}
 	}
 
-	public static function isEnumValue( v : Dynamic ) : Bool {
+	public static function isEnumValue(v:Dynamic):Bool {
 		var t = hl.Type.getDynamic(v);
 		return t.kind == HEnum;
 	}
 
-	public static function deleteField( o : Dynamic, field : String ) : Bool {
-		return hl.Api.deleteField(o,@:privateAccess field.bytes.hash());
+	public static function deleteField(o:Dynamic, field:String):Bool {
+		return hl.Api.deleteField(o, @:privateAccess field.bytes.hash());
 	}
 
-	@:hlNative("std","obj_copy")
-	public static function copy<T>( o : T ) : T {
+	@:hlNative("std", "obj_copy")
+	public static function copy<T>(o:Null<T>):Null<T> {
 		return null;
 	}
 
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	@:extern public inline static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	extern public inline static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
 		return _makeVarArgs(f);
 	}
 
-	static function _makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
+	static function _makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
 		return hl.Api.makeVarArgs(function(args:hl.NativeArray<Dynamic>) {
 			var arr = hl.types.ArrayDyn.alloc(hl.types.ArrayObj.alloc(args), true);
 			return f(cast arr);
 		});
 	}
-
 }
diff --git a/std/hl/_std/Std.hx b/std/hl/_std/Std.hx
index e4d417d0a26d11876aecbe386bcc728dfac62e96..ff9a70272375d7bd51ac5511063ecb9875f967d1 100644
--- a/std/hl/_std/Std.hx
+++ b/std/hl/_std/Std.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,102 +19,123 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import hl.Boot;
 
 private typedef Rand = hl.Abstract<"hl_random">;
 
 @:coreApi
 class Std {
+	static var rnd:Rand;
+	static var toStringDepth:Int = 0;
 
-	static var rnd : Rand;
-
-	static function __init__() : Void {
+	static function __init__():Void {
 		rnd = rnd_sys();
 	}
 
-	@:hlNative("std","rnd_init_system") static function rnd_sys() : Rand { return null; }
-	@:hlNative("std","rnd_int") static function rnd_int( r : Rand ) : Int { return 0; }
-	@:hlNative("std","rnd_float") static function rnd_float( r : Rand ) : Float { return 0.; }
+	@:hlNative("std", "rnd_init_system") static function rnd_sys():Rand {
+		return null;
+	}
+
+	@:hlNative("std", "rnd_int") static function rnd_int(r:Rand):Int {
+		return 0;
+	}
+
+	@:hlNative("std", "rnd_float") static function rnd_float(r:Rand):Float {
+		return 0.;
+	}
 
-	public static function random( x : Int ) : Int {
+	public static function random(x:Int):Int {
 		return x <= 0 ? 0 : (rnd_int(rnd) & 0x3FFFFFFF) % x;
 	}
 
-	public static function is( v : Dynamic, t : Dynamic ) : Bool {
-		var t : hl.BaseType = t;
-		if( t == null ) return false;
-		switch( t.__type__.kind ) {
-		case HDyn:
-			return true;
-		case HF64:
-			switch( hl.Type.getDynamic(v).kind ) {
-			case HUI8, HUI16, HI32:
-				return true;
-			default:
-			}
-		case HI32:
-			switch( hl.Type.getDynamic(v).kind ) {
-			case HF32, HF64:
-				var v : Float = v;
-				return Std.int(v) == v;
+	public static function is(v:Dynamic, t:Dynamic):Bool {
+		var t:hl.BaseType = t;
+		if (t == null)
+			return false;
+		switch (t.__type__.kind) {
+			case HDyn:
+				return v != null;
+			case HF64:
+				switch (hl.Type.getDynamic(v).kind) {
+					case HUI8, HUI16, HI32:
+						return true;
+					default:
+				}
+			case HI32:
+				switch (hl.Type.getDynamic(v).kind) {
+					case HF32, HF64:
+						var v:Float = v;
+						return Std.int(v) == v;
+					default:
+				}
 			default:
-			}
-		default:
 		}
 		return t.check(v);
 	}
 
-	@:extern public inline static function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
-		var t : hl.BaseType = cast c;
-		return t.check(value) ? cast value : null;
+	extern public static function downcast<T:{}, S:T>(value:T, c:Class<S>):S;
+
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	public static inline function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return downcast(value, c);
 	}
 
-	@:extern public static inline function int( x : Float ) : Int {
+	extern public static inline function int(x:Float):Int {
 		return untyped $int(x);
 	}
 
-	@:keep public static function string( s : Dynamic ) : String {
+	@:keep public static function string(s:Dynamic):String {
 		var len = 0;
-		var bytes = hl.Bytes.fromValue(s,new hl.Ref(len));
-		return @:privateAccess String.__alloc__(bytes,len);
+		var bytes = hl.Bytes.fromValue(s, new hl.Ref(len));
+		return @:privateAccess String.__alloc__(bytes, len);
 	}
 
-	public static function parseInt( x : String ) : Null<Int> {
-		if( x == null ) return null;
-		return @:privateAccess x.bytes.parseInt(0, x.length<<1);
+	public static function parseInt(x:String):Null<Int> {
+		if (x == null)
+			return null;
+		return @:privateAccess x.bytes.parseInt(0, x.length << 1);
 	}
 
-	public static function parseFloat( x : String ) : Float {
-		if( x == null ) return Math.NaN;
-		return @:privateAccess x.bytes.parseFloat(0, x.length<<1);
+	public static function parseFloat(x:String):Float {
+		if (x == null)
+			return Math.NaN;
+		return @:privateAccess x.bytes.parseFloat(0, x.length << 1);
 	}
 
-	@:keep static function __add__( a : Dynamic, b : Dynamic ) : Dynamic {
+	@:keep static function __add__(a:Dynamic, b:Dynamic):Dynamic {
 		var ta = hl.Type.getDynamic(a);
 		var tb = hl.Type.getDynamic(b);
-		if( ta == hl.Type.get("") )
+		if (ta == hl.Type.get(""))
 			return (a : String) + b;
-		if( tb == hl.Type.get("") )
+		if (tb == hl.Type.get(""))
 			return a + (b : String);
-		switch(ta.kind) {
-		case HUI8, HUI16, HI32:
-			var a : Int = a;
-			switch( tb.kind ) {
-			case HUI8, HUI16, HI32: return a + (b:Int);
-			case HF32, HF64: return a + (b:Float);
-			default:
-			}
-		case HF32, HF64:
-			var a : Float = a;
-			switch( tb.kind ) {
-			case HUI8, HUI16, HI32: return a + (b:Int);
-			case HF32, HF64: return a + (b:Float);
+		switch (ta.kind) {
+			case HUI8, HUI16, HI32:
+				var a:Int = a;
+				switch (tb.kind) {
+					case HUI8, HUI16, HI32: return a + (b : Int);
+					case HF32, HF64: return a + (b : Float);
+					case HVoid: return a;
+					default:
+				}
+			case HF32, HF64:
+				var a:Float = a;
+				switch (tb.kind) {
+					case HUI8, HUI16, HI32: return a + (b : Int);
+					case HF32, HF64: return a + (b : Float);
+					case HVoid: return a;
+					default:
+				}
+			case HVoid:
+				switch (tb.kind) {
+					case HUI8, HUI16, HI32, HF32, HF64: return b;
+					case HVoid: return 0.;
+					default:
+				}
 			default:
-			}
-		default:
 		}
-		throw "Can't add "+a+"("+ta+") and "+b+"("+tb+")";
+		throw "Can't add " + a + "(" + ta + ") and " + b + "(" + tb + ")";
 		return null;
 	}
-
 }
diff --git a/std/hl/_std/String.hx b/std/hl/_std/String.hx
index 880722deb8b24fc9a3836b16fb90ec87c25d236d..20a33423251269225f29ebe0c8fa73627f02292d 100644
--- a/std/hl/_std/String.hx
+++ b/std/hl/_std/String.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,82 +21,99 @@
  */
 @:coreApi
 class String {
+	var bytes:hl.Bytes;
 
-	var bytes : hl.Bytes;
-	public var length(default,null) : Int;
+	public var length(default, null):Int;
 
-	public function new(string:String) : Void {
+	public function new(string:String):Void {
 		bytes = string.bytes;
 		length = string.length;
 	}
 
-	public function toUpperCase() : String {
-		return __alloc__(@:privateAccess bytes.ucs2Upper(0,length), length);
+	public function toUpperCase():String {
+		return __alloc__(@:privateAccess bytes.ucs2Upper(0, length), length);
 	}
 
-	public function toLowerCase() : String {
-		return __alloc__(@:privateAccess bytes.ucs2Lower(0,length), length);
+	public function toLowerCase():String {
+		return __alloc__(@:privateAccess bytes.ucs2Lower(0, length), length);
 	}
 
-	public function charAt(index : Int) : String {
-		if( (index:UInt) >= (length:UInt) ) return "";
+	public function charAt(index:Int):String {
+		if ((index : UInt) >= (length : UInt))
+			return "";
 		var b = new hl.Bytes(4);
-		b.setUI16(0, bytes.getUI16(index<<1));
-		b.setUI16(2,0);
-		return __alloc__(b,1);
+		b.setUI16(0, bytes.getUI16(index << 1));
+		b.setUI16(2, 0);
+		return __alloc__(b, 1);
 	}
 
-	public function charCodeAt( index : Int) : Null<Int> {
-		var idx : UInt = index;
-		if( idx >= (length:UInt) )
+	public function charCodeAt(index:Int):Null<Int> {
+		var idx:UInt = index;
+		if (idx >= (length : UInt))
 			return null;
 		return bytes.getUI16(index << 1);
 	}
 
-	public function indexOf( str : String, ?startIndex : Int ) : Int {
+	inline function findChar(start:Int, len:Int, src:hl.Bytes, srcLen:Int):Int {
+		var p = 0;
+		while (true) {
+			p = bytes.find(start, len - start, src, 0, srcLen);
+			if (p < 0 || p & 1 == 0)
+				break;
+			start = p + 1;
+		}
+		return p;
+	}
+
+	public function indexOf(str:String, ?startIndex:Int):Int {
 		var startByte = 0;
-		if( startIndex != null && startIndex > 0 ) {
-			if( startIndex >= length )
+		if (startIndex != null && startIndex > 0) {
+			if (startIndex >= length)
 				return -1;
 			startByte = startIndex << 1;
 		}
-		var p = bytes.find(startByte, (length << 1) - startByte, str.bytes, 0, str.length << 1);
-		if( p > 0 ) p >>= 1;
+		var p = findChar(startByte, length << 1, str.bytes, str.length << 1);
+		if (p > 0)
+			p >>= 1;
 		return p;
 	}
 
-	public function lastIndexOf( str : String, ?startIndex : Int ) : Int {
-		var last = 0;
-		var start = this.length;
-		if( startIndex != null )
-			start = startIndex;
-		start <<= 1;
-		while( true ) {
-			var p = bytes.find(last, (length << 1) - last, str.bytes, 0, str.length << 1);
-			if( p < 0 || p > start )
-				return (last >> 1) - 1;
-			last = p + 2;
+	public function lastIndexOf(str:String, ?startIndex:Int):Int {
+		var max = this.length;
+		if (startIndex != null) {
+			max = startIndex + str.length;
+			if (max < 0)
+				max = 0;
+			if (max > this.length)
+				max = this.length;
+		}
+		var pos = max - str.length;
+		var slen = str.length << 1;
+		while (pos >= 0) {
+			if (bytes.compare(pos << 1, str.bytes, 0, slen) == 0)
+				return pos;
+			pos--;
 		}
 		return -1;
 	}
 
-	public function split( delimiter : String ) : Array<String> {
+	public function split(delimiter:String):Array<String> {
 		var out = [];
-		if( length == 0 ) {
+		if (length == 0) {
 			out.push("");
 			return out;
 		}
-		if( delimiter.length == 0 ) {
-			for( i in 0...length )
-				out.push(substr(i,1));
+		if (delimiter.length == 0) {
+			for (i in 0...length)
+				out.push(substr(i, 1));
 			return out;
 		}
 		var pos = 0;
 		var dlen = delimiter.length;
-		while( true ) {
-			var p = bytes.find(pos << 1, (length - pos) << 1, delimiter.bytes, 0, dlen << 1);
-			if( p < 0 ) {
-				out.push(substr(pos, length-pos));
+		while (true) {
+			var p = findChar(pos << 1, length << 1, delimiter.bytes, dlen << 1);
+			if (p < 0) {
+				out.push(substr(pos, length - pos));
 				break;
 			}
 			p >>= 1;
@@ -106,64 +123,69 @@ class String {
 		return out;
 	}
 
-	public function substr( pos : Int, ?len : Int ) : String @:privateAccess {
+	public function substr(pos:Int, ?len:Int):String@:privateAccess {
 		var sl = length;
-		var len : Int = if( len == null ) sl else len;
-		if( len == 0 ) return "";
-		if( pos != 0 && len < 0 )
+		var len:Int = if (len == null) sl else len;
+		if (len == 0)
 			return "";
-		if( pos < 0 ) {
+		if (pos != 0 && len < 0)
+			return "";
+		if (pos < 0) {
 			pos = sl + pos;
-			if( pos < 0 ) pos = 0;
-		} else if( len < 0 ) {
+			if (pos < 0)
+				pos = 0;
+		} else if (len < 0) {
 			len = sl + len - pos;
-			if( len < 0 ) return "";
+			if (len < 0)
+				return "";
 		}
-		if( ((pos + len) : UInt) > (sl:UInt) )
+		if (((pos + len) : UInt) > (sl : UInt))
 			len = sl - pos;
-		if( pos < 0 || len <= 0 ) return "";
+		if (pos < 0 || len <= 0)
+			return "";
 
 		var b = new hl.Bytes((len + 1) << 1);
-		b.blit(0, bytes, pos<<1, len << 1);
-		b.setUI16(len<<1,0);
+		b.blit(0, bytes, pos << 1, len << 1);
+		b.setUI16(len << 1, 0);
 		return __alloc__(b, len);
 	}
 
-	public function substring( startIndex : Int, ?endIndex : Int ) : String {
-		var end : Int;
-		if( endIndex == null )
+	public function substring(startIndex:Int, ?endIndex:Int):String {
+		var end:Int;
+		if (endIndex == null)
 			end = length;
 		else {
 			end = endIndex;
-			if( end < 0 )
+			if (end < 0)
 				end = 0;
-			else if ( end > length )
+			else if (end > length)
 				end = length;
 		}
-		if( startIndex < 0 )
+		if (startIndex < 0)
 			startIndex = 0;
-		else if ( startIndex > length )
+		else if (startIndex > length)
 			startIndex = length;
-		if( startIndex > end ) {
+		if (startIndex > end) {
 			var tmp = startIndex;
 			startIndex = end;
 			end = tmp;
 		}
-		return substr( startIndex, end - startIndex );
+		return substr(startIndex, end - startIndex);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		return this;
 	}
 
-	public static function fromCharCode( code : Int ) : String {
-		if( code >= 0 && code < 0x10000 ) {
-			if( code >= 0xD800 && code <= 0xDFFF ) throw "Invalid unicode char " + code;
+	public static function fromCharCode(code:Int):String {
+		if (code >= 0 && code < 0x10000) {
+			if (code >= 0xD800 && code <= 0xDFFF)
+				throw "Invalid unicode char " + code;
 			var b = new hl.Bytes(4);
 			b.setUI16(0, code);
 			b.setUI16(2, 0);
 			return __alloc__(b, 1);
-		} else if( code < 0x110000 ) {
+		} else if (code < 0x110000) {
 			var b = new hl.Bytes(6);
 			code -= 0x10000;
 			b.setUI16(0, (code >> 10) + 0xD800);
@@ -174,52 +196,61 @@ class String {
 			throw "Invalid unicode char " + code;
 	}
 
-	function toUtf8() : hl.Bytes {
+	function toUtf8():hl.Bytes {
 		return bytes.utf16ToUtf8(0, null);
 	}
 
-	@:keep function __string() : hl.Bytes {
+	@:keep function __string():hl.Bytes {
 		return bytes;
 	}
 
-	@:keep function __compare( s : String ) : Int {
+	@:keep function __compare(v:Dynamic):Int {
+		var s = Std.downcast(v, String);
+		if (s == null)
+			return hl.Api.comparePointer(this, v);
+		#if (hl_ver >= version("1.10.0"))
+		var v = bytes.compare16(s.bytes, length < s.length ? length : s.length);
+		#else
 		var v = bytes.compare(0, s.bytes, 0, (length < s.length ? length : s.length) << 1);
+		#end
 		return v == 0 ? length - s.length : v;
 	}
 
-	@:keep static inline function __alloc__( b : hl.Bytes, length : Int ) : String {
-		var s : String = untyped $new(String);
+	@:keep static inline function __alloc__(b:hl.Bytes, length:Int):String {
+		var s:String = untyped $new(String);
 		s.bytes = b;
 		s.length = length;
 		return s;
 	}
 
-	@:keep static function call_toString( v : Dynamic ) : hl.Bytes {
-		var s : String = v.toString();
+	@:keep static function call_toString(v:Dynamic):hl.Bytes {
+		var s:String = v.toString();
 		return s.bytes;
 	}
 
-	inline static function fromUCS2( b : hl.Bytes ) : String {
-		var s : String = untyped $new(String);
+	inline static function fromUCS2(b:hl.Bytes):String {
+		var s:String = untyped $new(String);
 		s.bytes = b;
 		s.length = @:privateAccess b.ucs2Length(0);
 		return s;
 	}
 
-	@:keep static function fromUTF8( b : hl.Bytes ) : String {
+	@:keep static function fromUTF8(b:hl.Bytes):String {
 		var outLen = 0;
 		var b2 = @:privateAccess b.utf8ToUtf16(0, outLen);
-		return __alloc__(b2, outLen>>1);
+		return __alloc__(b2, outLen >> 1);
 	}
 
-	@:keep static function __add__( a : String, b : String ) : String {
-		if( a == null ) a = "null";
-		if( b == null ) b = "null";
+	@:keep static function __add__(a:String, b:String):String {
+		if (a == null)
+			a = "null";
+		if (b == null)
+			b = "null";
 		var asize = a.length << 1, bsize = b.length << 1, tot = asize + bsize;
-		var bytes = new hl.Bytes(tot+2);
+		var bytes = new hl.Bytes(tot + 2);
 		bytes.blit(0, a.bytes, 0, asize);
-		bytes.blit(asize,b.bytes,0,bsize);
+		bytes.blit(asize, b.bytes, 0, bsize);
 		bytes.setUI16(tot, 0);
-		return __alloc__(bytes, tot>>1);
+		return __alloc__(bytes, tot >> 1);
 	}
 }
diff --git a/std/hl/_std/StringBuf.hx b/std/hl/_std/StringBuf.hx
index 52a5cb715963926fb008da1e448c3112ff96a905..794237cd945fc854e75ef8583f125f8323cb8f7f 100644
--- a/std/hl/_std/StringBuf.hx
+++ b/std/hl/_std/StringBuf.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,63 +20,74 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi class StringBuf {
+	var b:hl.Bytes;
+	var size:Int;
+	var pos:Int;
 
-	var b : hl.Bytes;
-	var size : Int;
-	var pos : Int;
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
-	public function new() : Void {
+	public function new():Void {
 		pos = 0;
 		size = 8; // ensure 4 bytes expand for addChar()
 		b = new hl.Bytes(size);
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return pos >> 1;
 	}
 
-	inline function __expand( need : Int ) : Void {
+	inline function __expand(need:Int):Void {
 		var nsize = (size * 3) >> 1;
-		if( need > nsize ) nsize = need;
+		if (need > nsize)
+			nsize = need;
 		var b2 = new hl.Bytes(nsize);
 		b2.blit(0, b, 0, pos);
 		b = b2;
 		size = nsize;
 	}
 
-	inline function __add( bytes : hl.Bytes, spos : Int, ssize : Int ) : Void {
-		if( pos + ssize > size ) __expand(pos + ssize);
+	inline function __add(bytes:hl.Bytes, spos:Int, ssize:Int):Void {
+		if (pos + ssize > size)
+			__expand(pos + ssize);
 		b.blit(pos, bytes, spos, ssize);
 		pos += ssize;
 	}
 
-	public function add<T>( x : T ) : Void {
+	public function add<T>(x:T):Void {
 		var slen = 0;
 		var sbytes = hl.Bytes.fromValue(x, new hl.Ref(slen));
-		__add(sbytes, 0, slen<<1);
+		__add(sbytes, 0, slen << 1);
 	}
 
-	public function addSub( s : String, pos : Int, ?len : Int ) : Void @:privateAccess {
-		if( pos < 0 ) pos = 0;
-		if( pos >= s.length ) return;
-		var slen : Int;
-		if( len == null ) slen = s.length - pos else {
+	public function addSub(s:String, pos:Int, ?len:Int):Void@:privateAccess {
+		if (pos < 0)
+			pos = 0;
+		if (pos >= s.length)
+			return;
+		var slen:Int;
+		if (len == null)
+			slen = s.length - pos
+		else {
 			slen = len;
-			if( pos + slen > s.length ) slen = s.length - pos;
-			if( slen <= 0 ) return;
+			if (pos + slen > s.length)
+				slen = s.length - pos;
+			if (slen <= 0)
+				return;
 		}
 		__add(s.bytes, pos << 1, slen << 1);
 	}
 
-	public function addChar( c : Int ) : Void {
-		if( c >= 0 && c < 0x10000 ) {
-			if( c >= 0xD800 && c <= 0xDFFF ) throw "Invalid unicode char " + c;
-			if( pos + 2 > size ) __expand(0);
+	public function addChar(c:Int):Void {
+		if (c >= 0 && c < 0x10000) {
+			if (c >= 0xD800 && c <= 0xDFFF)
+				throw "Invalid unicode char " + c;
+			if (pos + 2 > size)
+				__expand(0);
 			b.setUI16(pos, c);
 			pos += 2;
-		} else if( c < 0x110000 ) {
-			if( pos + 4 > size ) __expand(0);
+		} else if (c < 0x110000) {
+			if (pos + 4 > size)
+				__expand(0);
 			c -= 0x10000;
 			b.setUI16(pos, (c >> 10) + 0xD800);
 			b.setUI16(pos + 2, (c & 1023) + 0xDC00);
@@ -85,10 +96,10 @@
 			throw "Invalid unicode char " + c;
 	}
 
-	public function toString() : String {
-		if( pos+2 > size ) __expand(0);
-		b.setUI16(pos,0);
-		return @:privateAccess String.__alloc__(b, pos>>1);
+	public function toString():String {
+		if (pos + 2 > size)
+			__expand(0);
+		b.setUI16(pos, 0);
+		return @:privateAccess String.__alloc__(b, pos >> 1);
 	}
-
 }
diff --git a/std/hl/_std/Sys.hx b/std/hl/_std/Sys.hx
index b98f1779567239a4f94102352304222b66e8a628..feae9d03e7cef81b88197a3c2b2bcaa5d147e04b 100644
--- a/std/hl/_std/Sys.hx
+++ b/std/hl/_std/Sys.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
+import haxe.SysTools;
+
 class SysError {
-	public var msg : String;
+	public var msg:String;
+
 	public function new(msg) {
 		this.msg = msg;
 	}
+
 	@:keep public function toString() {
-		return "SysError("+msg+")";
+		return "SysError(" + msg + ")";
 	}
 }
 
@@ -33,86 +38,90 @@ class SysError {
 @:keepInit
 @:access(String)
 class Sys {
+	static var utf8Path:Bool;
 
-	static var utf8Path : Bool;
-	static function __init__() : Void {
+	static function __init__():Void {
 		utf8Path = sys_utf8_path();
 	}
-	static function getPath( s : String ) : hl.Bytes {
+
+	static function getPath(s:String):hl.Bytes {
 		return utf8Path ? s.bytes.utf16ToUtf8(0, null) : s.bytes;
 	}
-	static function makePath( b : hl.Bytes ) : String {
-		if( b == null ) return null;
+
+	static function makePath(b:hl.Bytes):String {
+		if (b == null)
+			return null;
 		return utf8Path ? String.fromUTF8(b) : String.fromUCS2(b);
 	}
 
-	public static function print( v : Dynamic ) : Void {
+	public static function print(v:Dynamic):Void {
 		sys_print(Std.string(v).bytes);
 	}
 
-	public static function println( v : Dynamic ) : Void {
+	public static function println(v:Dynamic):Void {
 		sys_print(Std.string(v).bytes);
 		sys_print("\n".bytes);
 	}
 
-	public static function args() : Array<String> {
-		return [for( a in sys_args() ) makePath(a)];
+	public static function args():Array<String> {
+		return [for (a in sys_args()) makePath(a)];
 	}
 
-	public static function stdin() : haxe.io.Input {
+	public static function stdin():haxe.io.Input {
 		return @:privateAccess new sys.io.FileInput(file_stdin());
 	}
 
-	public static function stdout() : haxe.io.Output {
+	public static function stdout():haxe.io.Output {
 		return @:privateAccess new sys.io.FileOutput(file_stdout());
 	}
 
-	public static function stderr() : haxe.io.Output {
+	public static function stderr():haxe.io.Output {
 		return @:privateAccess new sys.io.FileOutput(file_stderr());
 	}
 
-	public static function getEnv( s : String ) : String {
+	public static function getEnv(s:String):String {
 		var v = get_env(getPath(s));
-		if( v == null )
+		if (v == null)
 			return null;
 		return makePath(v);
 	}
 
-	public static function putEnv( s : String, v : String ) : Void {
-		if( !put_env(getPath(s), if( v == null ) null else getPath(v)) ) throw "putEnv() failure";
+	public static function putEnv(s:String, v:String):Void {
+		if (!put_env(getPath(s), if (v == null) null else getPath(v)))
+			throw "putEnv() failure";
 	}
 
-	public static function environment() : Map<String,String> {
+	public static function environment():Map<String, String> {
 		var env = sys_env();
 		var h = new haxe.ds.StringMap();
-		for( i in 0...env.length >> 1 ) {
+		for (i in 0...env.length >> 1) {
 			var p = i << 1;
 			h.set(makePath(env[p]), makePath(env[p + 1]));
 		}
 		return h;
 	}
 
-	@:hlNative("std","sys_sleep")
-	public static function sleep( seconds : Float ) : Void {
-	}
+	@:hlNative("std", "sys_sleep")
+	public static function sleep(seconds:Float):Void {}
 
-	public static function setTimeLocale( loc : String ) : Bool {
-		return set_time_locale(loc.bytes.utf16ToUtf8(0,null));
+	public static function setTimeLocale(loc:String):Bool {
+		return set_time_locale(loc.bytes.utf16ToUtf8(0, null));
 	}
 
-	public static function getCwd() : String {
+	public static function getCwd():String {
 		return makePath(get_cwd());
 	}
 
-	public static function setCwd( s : String ) : Void {
-		if( !set_cwd(getPath(s)) ) throw new SysError("Failed to set path to " + s);
+	public static function setCwd(s:String):Void {
+		if (!set_cwd(getPath(s)))
+			throw new SysError("Failed to set path to " + s);
 	}
 
-	public static function systemName() : String {
+	public static function systemName():String {
 		return String.fromUCS2(sys_string());
 	}
 
-	public static function command( cmd : String, ?args : Array<String> ) : Int {
+	public static function command(cmd:String, ?args:Array<String>):Int {
 		var code = 0;
 		if (args == null) {
 			code = sys_command(getPath(cmd));
@@ -121,53 +130,106 @@ class Sys {
 				case "Windows":
 					cmd = [
 						for (a in [StringTools.replace(cmd, "/", "\\")].concat(args))
-						StringTools.quoteWinArg(a, true)
+							SysTools.quoteWinArg(a, true)
 					].join(" ");
 					code = sys_command(getPath(cmd));
 				case _:
-					cmd = [cmd].concat(args).map(StringTools.quoteUnixArg).join(" ");
+					cmd = [cmd].concat(args).map(SysTools.quoteUnixArg).join(" ");
 					code = sys_command(getPath(cmd));
 			}
 		}
 		return code;
 	}
 
-	@:deprecated("Use programPath instead") public static function executablePath() : String {
+	@:deprecated("Use programPath instead") public static function executablePath():String {
 		return makePath(sys_exe_path());
 	}
 
-	public static function programPath() : String {
+	public static function programPath():String {
 		return sys_program_path;
 	}
+
 	private static var sys_program_path = {
 		var hlFile = sys_hl_file();
-		if( hlFile == null )
-			makePath( sys_exe_path() );
+		if (hlFile == null)
+			makePath(sys_exe_path());
 		else
-			sys.FileSystem.fullPath( makePath(hlFile) );
-	}
-
-	@:hlNative("std", "sys_utf8_path") static function sys_utf8_path() : Bool { return false; }
-
-	@:hlNative("std","sys_time") public static function time() : Float { return 0.; };
-	@:hlNative("std","sys_exit") public static function exit( code : Int ) : Void {};
-	@:hlNative("std", "sys_cpu_time") public static function cpuTime() : Float { return 0.; };
-	@:hlNative("std", "sys_get_char") public static function getChar( echo : Bool ) : Int { return 0; }
-
-	@:hlNative("std","sys_print") static function sys_print( v : hl.Bytes ) : Void {};
-	@:hlNative("std", "file_stdin") static function file_stdin() : sys.io.File.FileHandle { return null; }
-	@:hlNative("std", "file_stdout") static function file_stdout() : sys.io.File.FileHandle { return null; }
-	@:hlNative("std", "file_stderr") static function file_stderr() : sys.io.File.FileHandle { return null; }
-	@:hlNative("std", "sys_args") static function sys_args() : hl.NativeArray<hl.Bytes> { return null; }
-	@:hlNative("std", "sys_get_env") static function get_env( key : hl.Bytes ) : hl.Bytes { return null; }
-	@:hlNative("std", "sys_put_env") static function put_env( key : hl.Bytes, val : hl.Bytes ) : Bool { return false; }
-	@:hlNative("std", "sys_env") static function sys_env() : hl.NativeArray<hl.Bytes> { return null; }
-	@:hlNative("std", "sys_set_time_locale") static function set_time_locale( loc : hl.Bytes ) : Bool { return true; }
-	@:hlNative("std", "sys_get_cwd") static function get_cwd() : hl.Bytes { return null; }
-	@:hlNative("std", "sys_set_cwd") static function set_cwd( path : hl.Bytes ) : Bool { return true; }
-	@:hlNative("std", "sys_command") static function sys_command( cmd : hl.Bytes ) : Int { return 0; }
-	@:hlNative("std", "sys_exe_path") static function sys_exe_path() : hl.Bytes { return null; }
-	@:hlNative("std", "sys_hl_file") static function sys_hl_file() : hl.Bytes { return null; }
-	@:hlNative("std", "sys_string") static function sys_string() : hl.Bytes { return null; }
-
-}
\ No newline at end of file
+			sys.FileSystem.fullPath(makePath(hlFile));
+	}
+
+	@:hlNative("std", "sys_utf8_path") static function sys_utf8_path():Bool {
+		return false;
+	}
+
+	@:hlNative("std", "sys_time") public static function time():Float {
+		return 0.;
+	};
+
+	@:hlNative("std", "sys_exit") public static function exit(code:Int):Void {};
+
+	@:hlNative("std", "sys_cpu_time") public static function cpuTime():Float {
+		return 0.;
+	};
+
+	@:hlNative("std", "sys_get_char") public static function getChar(echo:Bool):Int {
+		return 0;
+	}
+
+	@:hlNative("std", "sys_print") static function sys_print(v:hl.Bytes):Void {};
+
+	@:hlNative("std", "file_stdin") static function file_stdin():sys.io.File.FileHandle {
+		return null;
+	}
+
+	@:hlNative("std", "file_stdout") static function file_stdout():sys.io.File.FileHandle {
+		return null;
+	}
+
+	@:hlNative("std", "file_stderr") static function file_stderr():sys.io.File.FileHandle {
+		return null;
+	}
+
+	@:hlNative("std", "sys_args") static function sys_args():hl.NativeArray<hl.Bytes> {
+		return null;
+	}
+
+	@:hlNative("std", "sys_get_env") static function get_env(key:hl.Bytes):hl.Bytes {
+		return null;
+	}
+
+	@:hlNative("std", "sys_put_env") static function put_env(key:hl.Bytes, val:hl.Bytes):Bool {
+		return false;
+	}
+
+	@:hlNative("std", "sys_env") static function sys_env():hl.NativeArray<hl.Bytes> {
+		return null;
+	}
+
+	@:hlNative("std", "sys_set_time_locale") static function set_time_locale(loc:hl.Bytes):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "sys_get_cwd") static function get_cwd():hl.Bytes {
+		return null;
+	}
+
+	@:hlNative("std", "sys_set_cwd") static function set_cwd(path:hl.Bytes):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "sys_command") static function sys_command(cmd:hl.Bytes):Int {
+		return 0;
+	}
+
+	@:hlNative("std", "sys_exe_path") static function sys_exe_path():hl.Bytes {
+		return null;
+	}
+
+	@:hlNative("std", "sys_hl_file") static function sys_hl_file():hl.Bytes {
+		return null;
+	}
+
+	@:hlNative("std", "sys_string") static function sys_string():hl.Bytes {
+		return null;
+	}
+}
diff --git a/std/hl/_std/Type.hx b/std/hl/_std/Type.hx
index a7ffe06ff3df0637ea59d3f8667392bfd07cee45..10196f87c1c3d5e32892a173dba5dce22fb021b2 100644
--- a/std/hl/_std/Type.hx
+++ b/std/hl/_std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 enum ValueType {
 	TNull;
 	TInt;
@@ -27,23 +26,24 @@ enum ValueType {
 	TBool;
 	TObject;
 	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
 	TUnknown;
 }
 
 @:coreApi
 class Type {
+	static var allTypes(get, never):hl.types.BytesMap;
 
-	static var allTypes(get,never) : hl.types.BytesMap;
-	static inline function get_allTypes() : hl.types.BytesMap return untyped $allTypes();
+	static inline function get_allTypes():hl.types.BytesMap
+		return untyped $allTypes();
 
-	@:keep static function init() : Void {
+	@:keep static function init():Void {
 		untyped $allTypes(new hl.types.BytesMap());
 	}
 
-	@:keep static function initClass( ct : hl.Type, t : hl.Type, name : hl.Bytes ) : hl.BaseType.Class @:privateAccess {
-		var c : hl.BaseType.Class = ct.allocObject();
+	@:keep static function initClass(ct:hl.Type, t:hl.Type, name:hl.Bytes):hl.BaseType.Class@:privateAccess {
+		var c:hl.BaseType.Class = ct.allocObject();
 		t.setGlobal(c);
 		c.__type__ = t;
 		c.__name__ = String.fromUCS2(name);
@@ -51,127 +51,140 @@ class Type {
 		return c;
 	}
 
-	@:keep static function initEnum( et : hl.Type, t : hl.Type ) : hl.BaseType.Enum @:privateAccess {
-		var e : hl.BaseType.Enum = et.allocObject();
+	@:keep static function initEnum(et:hl.Type, t:hl.Type):hl.BaseType.Enum@:privateAccess {
+		var e:hl.BaseType.Enum = et.allocObject();
 		e.__type__ = t;
 		e.__evalues__ = t.getEnumValues();
-		e.__ename__ = t.getName();
+		e.__ename__ = t.getTypeName();
 		e.__emap__ = new hl.types.BytesMap();
 		e.__constructs__ = new Array();
 		var cl = t.getEnumFields();
-		for( i in 0...cl.length ) {
+		for (i in 0...cl.length) {
 			var name = cl[i];
 			e.__emap__.set(name, i);
 			e.__constructs__.push(String.fromUCS2(name));
 		}
-		register(e.__ename__.bytes,e);
+		register(e.__ename__.bytes, e);
 		t.setGlobal(e);
 		return e;
 	}
 
-	@:keep static function register( b : hl.Bytes, t : hl.BaseType ) : Void {
+	@:keep static function register(b:hl.Bytes, t:hl.BaseType):Void {
 		allTypes.set(b, t);
 	}
 
-	public static function getClass<T>( o : T ) : Class<T> {
+	public static function getClass<T>(o:T):Class<T> {
 		var t = hl.Type.getDynamic(o);
-		if( t.kind == HObj )
+		if (t.kind == HVirtual) {
+			o = hl.Api.getVirtualValue(o);
+			t = hl.Type.getDynamic(o);
+		}
+		if (t.kind == HObj)
 			return t.getGlobal();
 		return null;
 	}
 
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic> {
+	public static function getEnum(o:EnumValue):Enum<Dynamic> {
 		var t = hl.Type.getDynamic(o);
-		if( t.kind == HEnum )
+		if (t.kind == HEnum)
 			return t.getGlobal();
 		return null;
 	}
 
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic> @:privateAccess {
-		var c : hl.BaseType.Class = cast c;
+	public static function getSuperClass(c:Class<Dynamic>):Class<Dynamic>@:privateAccess {
+		var c:hl.BaseType.Class = cast c;
 		var t = c.__type__.getSuper();
-		return t == hl.Type.get((null : Void)) ? null : t.getGlobal();
+		return t == hl.Type.void() ? null : t.getGlobal();
 	}
 
-	public static function getClassName( c : Class<Dynamic> ) : String {
-		var c : hl.BaseType.Class = cast c;
+	public static function getClassName(c:Class<Dynamic>):String {
+		var c:hl.BaseType.Class = cast c;
 		return c.__name__;
 	}
 
-	public static function getEnumName( e : Enum<Dynamic> ) : String {
-		var e : hl.BaseType.Enum = cast e;
+	public static function getEnumName(e:Enum<Dynamic>):String {
+		var e:hl.BaseType.Enum = cast e;
 		return e.__ename__;
 	}
 
-	public static function resolveClass( name : String ) : Class<Dynamic> {
-		var t : hl.BaseType = allTypes.get(@:privateAccess name.bytes);
-		if( t == null || !Std.is(t, hl.BaseType.Class) )
+	public static function resolveClass(name:String):Class<Dynamic> {
+		var t:hl.BaseType = allTypes.get(@:privateAccess name.bytes);
+		if (t == null || !Std.is(t, hl.BaseType.Class))
 			return null;
 		return cast t;
 	}
 
-	public static function resolveEnum( name : String ) : Enum<Dynamic> {
-		var t : hl.BaseType = allTypes.get(@:privateAccess name.bytes);
-		if( t == null || !Std.is(t, hl.BaseType.Enum) )
+	public static function resolveEnum(name:String):Enum<Dynamic> {
+		var t:hl.BaseType = allTypes.get(@:privateAccess name.bytes);
+		if (t == null || !Std.is(t, hl.BaseType.Enum))
 			return null;
 		return cast t;
 	}
 
-	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T {
-		var c : hl.BaseType.Class = cast cl;
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T {
+		var c:hl.BaseType.Class = cast cl;
 		var t = c.__type__;
-		if( t == hl.Type.get((null : hl.types.ArrayBase.ArrayAccess)) )
+		if (t == hl.Type.get((null : hl.types.ArrayBase.ArrayAccess)))
 			return cast new Array<Dynamic>();
 		var o = t.allocObject();
-		if( c.__constructor__ != null ) Reflect.callMethod(o, c.__constructor__, args);
+		if (c.__constructor__ != null) {
+			var v:Dynamic = hl.Api.noClosure(c.__constructor__);
+			var args = args.copy();
+			args.unshift(o);
+			Reflect.callMethod(null, v, args);
+		}
 		return o;
 	}
 
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T {
-		var c : hl.BaseType.Class = cast cl;
+	public static function createEmptyInstance<T>(cl:Class<T>):T {
+		var c:hl.BaseType.Class = cast cl;
 		return c.__type__.allocObject();
 	}
 
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		var en : hl.BaseType.Enum = cast e;
-		var idx : Null<Int> = en.__emap__.get(@:privateAccess constr.bytes);
-		if( idx == null ) throw "Unknown enum constructor " + en.__ename__ +"." + constr;
-		return createEnumIndex(e,idx,params);
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T {
+		var en:hl.BaseType.Enum = cast e;
+		var idx:Null<Int> = en.__emap__.get(@:privateAccess constr.bytes);
+		if (idx == null)
+			throw "Unknown enum constructor " + en.__ename__ + "." + constr;
+		return createEnumIndex(e, idx, params);
 	}
 
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
-		var e : hl.BaseType.Enum = cast e;
-		if( index < 0 || index >= e.__constructs__.length ) throw "Invalid enum index " + e.__ename__ +"." + index;
-		if( params == null || params.length == 0 ) {
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T {
+		var e:hl.BaseType.Enum = cast e;
+		if (index < 0 || index >= e.__constructs__.length)
+			throw "Invalid enum index " + e.__ename__ + "." + index;
+		if (params == null || params.length == 0) {
 			var v = index >= e.__evalues__.length ? null : e.__evalues__[index];
-			if( v == null ) throw "Constructor " + e.__ename__ +"." + e.__constructs__[index] + " takes parameters";
+			if (v == null)
+				throw "Constructor " + e.__ename__ + "." + e.__constructs__[index] + " takes parameters";
 			return v;
 		}
-		var a : hl.types.ArrayDyn = cast params;
+		var a:hl.types.ArrayDyn = cast params;
 		var narr;
-		if( @:privateAccess !a.array.isArrayObj() ) {
+		if (@:privateAccess !a.array.isArrayObj()) {
 			narr = new hl.NativeArray<Dynamic>(a.length);
-			for( i in 0...a.length )
+			for (i in 0...a.length)
 				narr[i] = @:privateAccess a.array.getDyn(i);
 		} else {
-			var aobj : hl.types.ArrayObj<Dynamic> = cast @:privateAccess a.array;
+			var aobj:hl.types.ArrayObj<Dynamic> = cast @:privateAccess a.array;
 			narr = @:privateAccess aobj.array;
 		}
 		var v = @:privateAccess e.__type__.allocEnum(index, narr, a.length);
-		if( v == null ) throw "Constructor " + e.__ename__ +"." + e.__constructs__[index] + " does not takes " + narr.length + " parameters";
+		if (v == null)
+			throw "Constructor " + e.__ename__ + "." + e.__constructs__[index] + " does not takes " + narr.length + " parameters";
 		return v;
 	}
 
-	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String> @:privateAccess {
-		var c : hl.BaseType.Class = cast c;
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String>@:privateAccess {
+		var c:hl.BaseType.Class = cast c;
 		var fields = c.__type__.getInstanceFields();
-		return [for( f in fields ) String.fromUCS2(f)];
+		return [for (f in fields) String.fromUCS2(f)];
 	}
 
-	public static function getClassFields( c : Class<Dynamic> ) : Array<String> {
-		var c : hl.BaseType.Class = cast c;
+	public static function getClassFields(c:Class<Dynamic>):Array<String> {
+		var c:hl.BaseType.Class = cast c;
 		var fields = @:privateAccess Reflect.getObjectFields(c);
-		var fields = [for( f in fields ) @:privateAccess String.fromUCS2(f)];
+		var fields = [for (f in fields) @:privateAccess String.fromUCS2(f)];
 		fields.remove("__constructor__");
 		fields.remove("__meta__");
 		fields.remove("__name__");
@@ -180,75 +193,75 @@ class Type {
 		return fields;
 	}
 
-	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> {
-		var e : hl.BaseType.Enum = cast e;
+	public static function getEnumConstructs(e:Enum<Dynamic>):Array<String> {
+		var e:hl.BaseType.Enum = cast e;
 		return e.__constructs__.copy();
 	}
 
-	public static function typeof( v : Dynamic ) : ValueType {
+	public static function typeof(v:Dynamic):ValueType {
 		var t = hl.Type.getDynamic(v);
-		switch( t.kind ) {
-		case HVoid:
-			return TNull;
-		case HUI8, HUI16, HI32:
-			return TInt;
-		case HF32, HF64:
-			return TFloat;
-		case HBool:
-			return TBool;
-		case HDynObj:
-			return TObject;
-		case HObj:
-			var c : Dynamic = Type.getClass(v);
-			if( c == Class || c == null )
+		switch (t.kind) {
+			case HVoid:
+				return TNull;
+			case HUI8, HUI16, HI32:
+				return TInt;
+			case HF32, HF64:
+				return (v : Int) == (v:Float) ? TInt : TFloat;
+			case HBool:
+				return TBool;
+			case HDynObj:
 				return TObject;
-			return TClass(c);
-		case HEnum:
-			return TEnum(Type.getEnum(v));
-		case HFun:
-			return TFunction;
-		case HVirtual:
-			var v = hl.Api.getVirtualValue(v);
-			if( v == null )
-				return TObject;
-			return typeof(v);
-		default:
-			return TUnknown;
+			case HObj:
+				var c:Dynamic = Type.getClass(v);
+				if (c == Class || c == null)
+					return TObject;
+				return TClass(c);
+			case HEnum:
+				return TEnum(Type.getEnum(v));
+			case HFun:
+				return TFunction;
+			case HVirtual:
+				var v = hl.Api.getVirtualValue(v);
+				if (v == null)
+					return TObject;
+				return typeof(v);
+			default:
+				return TUnknown;
 		}
 	}
 
-	@:hlNative("std","type_enum_eq")
-	public static function enumEq<T:EnumValue>( a : T, b : T ) : Bool {
+	@:hlNative("std", "type_enum_eq")
+	public static function enumEq<T:EnumValue>(a:T, b:T):Bool {
 		return false;
 	}
 
-	public static function enumConstructor( e : EnumValue ) : String {
-		var en : hl.BaseType.Enum = cast getEnum(e);
+	public static function enumConstructor(e:EnumValue):String {
+		var en:hl.BaseType.Enum = cast getEnum(e);
 		return en.__constructs__[Type.enumIndex(e)];
 	}
 
-	@:hlNative("std","enum_parameters")
-	static function _enumParameters( e : EnumValue ) : hl.NativeArray<Dynamic> {
+	@:hlNative("std", "enum_parameters")
+	static function _enumParameters(e:EnumValue):hl.NativeArray<Dynamic> {
 		return null;
 	}
 
-	public static function enumParameters( e : EnumValue ) : Array<Dynamic> {
+	public static function enumParameters(e:EnumValue):Array<Dynamic> {
 		var arr = _enumParameters(e);
 		return cast hl.types.ArrayObj.alloc(arr);
 	}
 
-	@:extern public inline static function enumIndex( e : EnumValue ) : Int {
+	public static function enumIndex(e:EnumValue):Int {
 		return untyped $enumIndex(e);
 	}
 
-	public static function allEnums<T>( e : Enum<T> ) : Array<T> {
-		var en : hl.BaseType.Enum = cast e;
+	public static function allEnums<T>(e:Enum<T>):Array<T> {
+		var en:hl.BaseType.Enum = cast e;
 		var out = [];
-		for( i in 0...en.__evalues__.length ) {
+		for (i in 0...en.__evalues__.length) {
 			var v = en.__evalues__[i];
-			if( v != null ) out.push(v);
+			if (v != null)
+				out.push(v);
 		}
 		return out;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/hl/_std/UInt.hx b/std/hl/_std/UInt.hx
index c6a12a448a0bfac7261bdaaef3cf6edbd449f709..8a404e7104be53e0fd865403dd335cdacd1800e8 100644
--- a/std/hl/_std/UInt.hx
+++ b/std/hl/_std/UInt.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,10 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 @:coreApi
 abstract UInt(Int) from Int to Int {
-
 	@:op(A + B) private static inline function add(a:UInt, b:UInt):UInt {
 		return a.toInt() + b.toInt();
 	}
@@ -101,27 +99,18 @@ abstract UInt(Int) from Int to Int {
 		return a.toFloat() > b;
 	}
 
-	@:commutative @:op(A == B) private static inline function equalsInt<T:Int>(a:UInt, b:T):Bool {
-		return a.toInt() == b;
-	}
+	@:commutative @:op(A == B) private static function equalsInt<T:Int>(a:UInt, b:T):Bool;
 
-	@:commutative @:op(A != B) private static inline function notEqualsInt<T:Int>(a:UInt, b:T):Bool {
-		return a.toInt() != b;
-	}
+	@:commutative @:op(A != B) private static function notEqualsInt<T:Int>(a:UInt, b:T):Bool;
 
-	@:commutative @:op(A == B) private static inline function equalsFloat<T:Float>(a:UInt, b:T):Bool {
-        return a.toFloat() == b;
-    }
+	@:commutative @:op(A == B) private static function equalsFloat<T:Float>(a:UInt, b:T):Bool;
 
-    @:commutative @:op(A != B) private static inline function notEqualsFloat<T:Float>(a:UInt, b:T):Bool {
-        return a.toFloat() != b;
-    }
+	@:commutative @:op(A != B) private static function notEqualsFloat<T:Float>(a:UInt, b:T):Bool;
 
 	@:op(A >= B) private static inline function gteFloat(a:UInt, b:Float):Bool {
 		return a.toFloat() >= b;
 	}
 
-
 	@:op(A > B) private static inline function floatGt(a:Float, b:UInt):Bool {
 		return a > b.toFloat();
 	}
@@ -184,7 +173,6 @@ abstract UInt(Int) from Int to Int {
 	}
 
 	@:to private inline function toFloat():Float {
-		return cast (this:UInt);
+		return cast(this : UInt);
 	}
 }
-
diff --git a/std/hl/_std/haxe/Resource.hx b/std/hl/_std/haxe/Resource.hx
index cc22a5173bd2ef1245e8fe7c93b9962e6d1d28cd..1601578905c37a5d29735128f229462e4741244a 100644
--- a/std/hl/_std/haxe/Resource.hx
+++ b/std/hl/_std/haxe/Resource.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,39 +19,38 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 private class ResourceContent {
-	public var name : hl.Bytes;
-	public var data : hl.Bytes;
-	public var dataLen : Int;
+	public var name:hl.Bytes;
+	public var data:hl.Bytes;
+	public var dataLen:Int;
 }
 
 @:coreApi
 class Resource {
+	static var content:hl.NativeArray<ResourceContent>;
 
-	static var content : hl.NativeArray<ResourceContent>;
-
-	public static function listNames() : Array<String> {
+	public static function listNames():Array<String> {
 		return [for (x in content) @:privateAccess String.fromUCS2(x.name)];
 	}
 
-	public static function getString( name : String ) : String {
-		for( x in content )
-			if( x.name.compare(0,@:privateAccess name.bytes,0,(name.length+1)<<1) == 0 )
+	public static function getString(name:String):String {
+		for (x in content)
+			if (x.name.compare(0, @:privateAccess name.bytes, 0, (name.length + 1) << 1) == 0)
 				return @:privateAccess String.fromUTF8(x.data);
 		return null;
 	}
 
-	public static function getBytes( name : String ) : haxe.io.Bytes {
-		for( x in content )
-			if( x.name.compare(0,@:privateAccess name.bytes,0,(name.length+1)<<1) == 0 )
+	public static function getBytes(name:String):haxe.io.Bytes {
+		for (x in content)
+			if (x.name.compare(0, @:privateAccess name.bytes, 0, (name.length + 1) << 1) == 0)
 				return @:privateAccess new haxe.io.Bytes(x.data, x.dataLen);
 		return null;
 	}
 
-	static function __init__() : Void {
+	static function __init__():Void {
 		content = untyped $resources();
 	}
-
 }
diff --git a/std/hl/_std/haxe/crypto/Md5.hx b/std/hl/_std/haxe/crypto/Md5.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b30278bba06bcad42197838fa8a58a318cc501f9
--- /dev/null
+++ b/std/hl/_std/haxe/crypto/Md5.hx
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.crypto;
+
+class Md5 {
+	public static function encode(s:String):String {
+		var out = haxe.io.Bytes.alloc(16);
+		@:privateAccess hl.Format.digest(out.b, s.bytes, s.length, 256);
+		return out.toHex();
+	}
+
+	public static function make(b:haxe.io.Bytes):haxe.io.Bytes {
+		var out = haxe.io.Bytes.alloc(16);
+		@:privateAccess hl.Format.digest(out.b, b.b, b.length, 0);
+		return out;
+	}
+}
diff --git a/std/hl/_std/haxe/crypto/Sha1.hx b/std/hl/_std/haxe/crypto/Sha1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d614993ad73cdce872afd259bd58fa2f387cfa05
--- /dev/null
+++ b/std/hl/_std/haxe/crypto/Sha1.hx
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.crypto;
+
+class Sha1 {
+	public static function encode(s:String):String {
+		var out = haxe.io.Bytes.alloc(20);
+		@:privateAccess hl.Format.digest(out.b, s.bytes, s.length, 256 | 1);
+		return out.toHex();
+	}
+
+	public static function make(b:haxe.io.Bytes):haxe.io.Bytes {
+		var out = haxe.io.Bytes.alloc(20);
+		@:privateAccess hl.Format.digest(out.b, b.b, b.length, 1);
+		return out;
+	}
+}
diff --git a/std/hl/_std/haxe/ds/IntMap.hx b/std/hl/_std/haxe/ds/IntMap.hx
index 7e7f66fb24cbcdf0f2d49d2e2f6888ce0d2a0bce..f98fb5e3fccdde862681f2dc820f5af1921bdd7a 100644
--- a/std/hl/_std/haxe/ds/IntMap.hx
+++ b/std/hl/_std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,45 +23,55 @@
 package haxe.ds;
 
 @:coreApi
-class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
+class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
+	var h:hl.types.IntMap;
 
-	var h : hl.types.IntMap;
-
-	public function new() : Void {
+	public function new():Void {
 		h = new hl.types.IntMap();
 	}
 
-	public function set( key : Int, value : T ) : Void {
-		@:privateAccess h.set(key,value);
+	public function set(key:Int, value:T):Void {
+		@:privateAccess h.set(key, value);
 	}
 
-	public function get( key : Int ) : Null<T> {
+	public function get(key:Int):Null<T> {
 		return @:privateAccess h.get(key);
 	}
 
-	public function exists( key : Int ) : Bool {
+	public function exists(key:Int):Bool {
 		return @:privateAccess h.exists(key);
 	}
 
-	public function remove( key : Int ) : Bool {
+	public function remove(key:Int):Bool {
 		return @:privateAccess h.remove(key);
 	}
 
-	public function keys() : Iterator<Int> {
+	public function keys():Iterator<Int> {
 		return new hl.NativeArray.NativeArrayIterator<Int>(h.keysArray());
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return h.iterator();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():IntMap<T> {
+		var copied = new IntMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		var keys = h.keysArray();
 		var values = h.valuesArray();
 		s.addChar('{'.code);
-		for( i in 0...keys.length ) {
-			if( i > 0 )
+		for (i in 0...keys.length) {
+			if (i > 0)
 				s.add(", ");
 			s.add(keys[i]);
 			s.add(" => ");
@@ -71,4 +81,11 @@ class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
 		return s.toString();
 	}
 
+	public function clear():Void {
+		#if (hl_ver >= version("1.11.0"))
+		@:privateAccess h.clear();
+		#else
+		h = new hl.types.IntMap();
+		#end
+	}
 }
diff --git a/std/hl/_std/haxe/ds/ObjectMap.hx b/std/hl/_std/haxe/ds/ObjectMap.hx
index 810ca4a4c540f51444a7b38a8d4f393990e5e2fe..432475267cd29fd312ec44fdc005108819ec2282 100644
--- a/std/hl/_std/haxe/ds/ObjectMap.hx
+++ b/std/hl/_std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,45 +23,55 @@
 package haxe.ds;
 
 @:coreApi
-class ObjectMap<K:{},T> implements haxe.Constraints.IMap<K,T> {
+class ObjectMap<K:{}, T> implements haxe.Constraints.IMap<K, T> {
+	var h:hl.types.ObjectMap;
 
-	var h : hl.types.ObjectMap;
-
-	public function new() : Void {
+	public function new():Void {
 		h = new hl.types.ObjectMap();
 	}
 
-	public function set( key : K, value : T ) : Void {
-		@:privateAccess h.set(key,value);
+	public function set(key:K, value:T):Void {
+		@:privateAccess h.set(key, value);
 	}
 
-	public function get( key : K ) : Null<T> {
+	public function get(key:K):Null<T> {
 		return @:privateAccess h.get(key);
 	}
 
-	public function exists( key : K ) : Bool {
+	public function exists(key:K):Bool {
 		return @:privateAccess h.exists(key);
 	}
 
-	public function remove( key : K ) : Bool {
+	public function remove(key:K):Bool {
 		return @:privateAccess h.remove(key);
 	}
 
-	public function keys() : Iterator<K> {
+	public function keys():Iterator<K> {
 		return new hl.NativeArray.NativeArrayIterator<K>(cast h.keysArray());
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return h.iterator();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<K, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():ObjectMap<K, T> {
+		var copied = new ObjectMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		var keys = h.keysArray();
 		var values = h.valuesArray();
 		s.addChar('{'.code);
-		for( i in 0...keys.length ) {
-			if( i > 0 )
+		for (i in 0...keys.length) {
+			if (i > 0)
 				s.add(", ");
 			s.add(keys[i]);
 			s.add(" => ");
@@ -71,4 +81,11 @@ class ObjectMap<K:{},T> implements haxe.Constraints.IMap<K,T> {
 		return s.toString();
 	}
 
+	public function clear():Void {
+		#if (hl_ver >= version("1.11.0"))
+		@:privateAccess h.clear();
+		#else
+		h = new hl.types.ObjectMap();
+		#end
+	}
 }
diff --git a/std/hl/_std/haxe/ds/StringMap.hx b/std/hl/_std/haxe/ds/StringMap.hx
index 9562db1d01f22f6d1035987c0dd0d02a02c2ef2c..eda9c62b4751ee691dcb29d1f1623142500b6aa1 100644
--- a/std/hl/_std/haxe/ds/StringMap.hx
+++ b/std/hl/_std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,9 +23,9 @@
 package haxe.ds;
 
 private class StringMapKeysIterator {
-	var arr : hl.NativeArray<hl.Bytes>;
-	var pos : Int;
-	var length : Int;
+	var arr:hl.NativeArray<hl.Bytes>;
+	var pos:Int;
+	var length:Int;
 
 	public inline function new(h:hl.types.BytesMap) {
 		this.arr = h.keysArray();
@@ -41,55 +41,67 @@ private class StringMapKeysIterator {
 		var b = arr[pos++];
 		return String.fromUCS2(b);
 	}
-
 }
 
 @:coreApi
-class StringMap<T> implements haxe.Constraints.IMap<String,T> {
-
-	var h : hl.types.BytesMap;
+class StringMap<T> implements haxe.Constraints.IMap<String, T> {
+	var h:hl.types.BytesMap;
 
-	public function new() : Void {
+	public function new():Void {
 		h = new hl.types.BytesMap();
 	}
 
-	public function set( key : String, value : T ) : Void {
-		@:privateAccess h.set(key.bytes,value);
+	public function set(key:String, value:T):Void {
+		@:privateAccess h.set(key.bytes, value);
 	}
 
-	public function get( key : String ) : Null<T> {
-		if( key == null ) return null;
+	public function get(key:String):Null<T> {
+		if (key == null)
+			return null;
 		return @:privateAccess h.get(key.bytes);
 	}
 
-	public function exists( key : String ) : Bool {
-		if( key == null ) return false;
+	public function exists(key:String):Bool {
+		if (key == null)
+			return false;
 		return @:privateAccess h.exists(key.bytes);
 	}
 
-	public function remove( key : String ) : Bool {
-		if( key == null ) return false;
+	public function remove(key:String):Bool {
+		if (key == null)
+			return false;
 		return @:privateAccess h.remove(key.bytes);
 	}
 
-	public function keys() : Iterator<String> {
+	public function keys():Iterator<String> {
 		return new StringMapKeysIterator(h);
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return h.iterator();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():StringMap<T> {
+		var copied = new StringMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		var keys = h.keysArray();
 		var values = h.valuesArray();
 		s.addChar('{'.code);
-		for( i in 0...keys.length ) {
-			if( i > 0 )
+		for (i in 0...keys.length) {
+			if (i > 0)
 				s.add(", ");
 			var k = keys[i];
-			@:privateAccess s.__add(k,0,(@:privateAccess k.ucs2Length(0)) << 1);
+			@:privateAccess s.__add(k, 0, (@:privateAccess k.ucs2Length(0)) << 1);
 			s.add(" => ");
 			s.add(values[i]);
 		}
@@ -97,4 +109,11 @@ class StringMap<T> implements haxe.Constraints.IMap<String,T> {
 		return s.toString();
 	}
 
+	public function clear():Void {
+		#if (hl_ver >= version("1.11.0"))
+		@:privateAccess h.clear();
+		#else
+		h = new hl.types.BytesMap();
+		#end
+	}
 }
diff --git a/std/hl/_std/haxe/ds/Vector.hx b/std/hl/_std/haxe/ds/Vector.hx
index 44815ff33b18c45cc40f3f29121607570fb7a0aa..d56f1e5a3e3561d4c592f277041256ec62186c00 100644
--- a/std/hl/_std/haxe/ds/Vector.hx
+++ b/std/hl/_std/haxe/ds/Vector.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,16 +19,17 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 private typedef VectorData<T> = Array<T>
 
 @:coreApi
 abstract Vector<T>(VectorData<T>) {
-
 	public inline function new(length:Int) {
 		this = [];
-		if( length > 0 ) this[length-1] = cast null;
+		if (length > 0)
+			this[length - 1] = cast null;
 	}
 
 	@:op([]) public inline function get(index:Int):T {
@@ -46,7 +47,7 @@ abstract Vector<T>(VectorData<T>) {
 	}
 
 	public static inline function blit<T>(src:Vector<T>, srcPos:Int, dest:Vector<T>, destPos:Int, len:Int):Void {
-		(cast dest : hl.types.ArrayBase.ArrayAccess).blit(destPos,(cast src : hl.types.ArrayBase.ArrayAccess),srcPos,len);
+		(cast dest : hl.types.ArrayBase.ArrayAccess).blit(destPos, (cast src : hl.types.ArrayBase.ArrayAccess), srcPos, len);
 	}
 
 	public inline function toArray():Array<T> {
@@ -80,7 +81,7 @@ abstract Vector<T>(VectorData<T>) {
 		var r = new Vector<S>(length);
 		var i = 0;
 		var len = length;
-		for(i in 0...len) {
+		for (i in 0...len) {
 			var v = f(get(i));
 			r.set(i, v);
 		}
diff --git a/std/hl/_std/haxe/io/Bytes.hx b/std/hl/_std/haxe/io/Bytes.hx
index e93ab5f168c3b4cb406522cf3391940009b02e68..33a60030dbe771c7c9ef62a327fd93f0437609f7 100644
--- a/std/hl/_std/haxe/io/Bytes.hx
+++ b/std/hl/_std/haxe/io/Bytes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,113 +19,164 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 @:coreApi
 class Bytes {
+	public var length(default, null):Int;
 
-	public var length(default,null) : Int;
-	var b : hl.Bytes;
+	var b:hl.Bytes;
 
-	function new(b:hl.Bytes,length:Int) : Void {
+	function new(b:hl.Bytes, length:Int):Void {
 		this.b = b;
 		this.length = length;
 	}
 
-	inline function out(pos:Int) : Bool {
-		return (pos:UInt) >= (length : UInt);
+	inline function out(pos:Int):Bool {
+		return (pos : UInt) >= (length : UInt);
 	}
 
-	inline function outRange(pos:Int,len:Int) : Bool {
-		return pos < 0 || len < 0 || ((pos+len):UInt) > (length : UInt);
+	inline function outRange(pos:Int, len:Int):Bool {
+		return pos < 0 || len < 0 || ((pos + len) : UInt) > (length : UInt);
 	}
 
-	public function get( pos : Int ) : Int {
-		return if( out(pos) ) 0 else b[pos];
+	public function get(pos:Int):Int {
+		return if (out(pos)) 0 else b[pos];
 	}
 
-	public function set( pos : Int, v : Int ) : Void {
-		if( out(pos) ) throw Error.OutsideBounds;
+	public function set(pos:Int, v:Int):Void {
+		if (out(pos))
+			throw Error.OutsideBounds;
 		b[pos] = v;
 	}
 
-	public function blit( pos : Int, src : Bytes, srcpos : Int, len : Int ) : Void {
-		if( outRange(pos, len) || src.outRange(srcpos,len) ) throw Error.OutsideBounds;
+	public function blit(pos:Int, src:Bytes, srcpos:Int, len:Int):Void {
+		if (outRange(pos, len) || src.outRange(srcpos, len))
+			throw Error.OutsideBounds;
 		b.blit(pos, src.b, srcpos, len);
 	}
 
-	public function fill( pos : Int, len : Int, value : Int ) : Void {
-		if( outRange(pos,len) ) throw Error.OutsideBounds;
+	public function fill(pos:Int, len:Int, value:Int):Void {
+		if (outRange(pos, len))
+			throw Error.OutsideBounds;
 		b.fill(pos, len, value);
 	}
 
-	public function sub( pos : Int, len : Int ) : Bytes {
-		if( outRange(pos,len) ) throw Error.OutsideBounds;
+	public function sub(pos:Int, len:Int):Bytes {
+		if (outRange(pos, len))
+			throw Error.OutsideBounds;
 		return new Bytes(b.sub(pos, len), len);
 	}
 
-	public function compare( other : Bytes ) : Int {
+	public function compare(other:Bytes):Int {
 		var len = length < other.length ? length : other.length;
 		var r = b.compare(0, other.b, 0, len);
-		if( r == 0 )
+		if (r == 0)
 			r = length - other.length;
 		return r;
 	}
 
-	public function getDouble( pos : Int ) : Float {
-		return if( out(pos + 7) ) 0. else b.getF64(pos);
-	}
-
-	public function getFloat( pos : Int ) : Float {
-		return if( out(pos + 3) ) 0. else b.getF32(pos);
-	}
+	#if hl_check_align
+	static var alignBuffer:hl.Bytes = new hl.Bytes(8);
+	#end
 
-	public function setDouble( pos : Int, v : Float ) : Void {
-		if( out(pos + 7) ) throw Error.OutsideBounds;
+	public function getDouble(pos:Int):Float {
+		if (out(pos + 7))
+			return 0.;
+		#if hl_check_align
+		return if (pos & 3 == 0) b.getF64(pos) else {
+			alignBuffer.blit(0, b, pos, 8);
+			alignBuffer.getF64(0);
+		}
+		#else
+		return b.getF64(pos);
+		#end
+	}
+
+	public function getFloat(pos:Int):Float {
+		if (out(pos + 3))
+			return 0.;
+		#if hl_check_align
+		return if (pos & 3 == 0) b.getF32(pos) else {
+			alignBuffer.blit(0, b, pos, 4);
+			alignBuffer.getF32(0);
+		}
+		#else
+		return b.getF32(pos);
+		#end
+	}
+
+	public function setDouble(pos:Int, v:Float):Void {
+		if (out(pos + 7))
+			throw Error.OutsideBounds;
+		#if hl_check_align
+		if (pos & 7 == 0)
+			b.setF64(pos, v);
+		else {
+			alignBuffer.setF64(0, v);
+			b.blit(pos, alignBuffer, 0, 8);
+		}
+		#else
 		b.setF64(pos, v);
-	}
-
-	public function setFloat( pos : Int, v : Float ) : Void {
-		if( out(pos + 3) ) throw Error.OutsideBounds;
+		#end
+	}
+
+	public function setFloat(pos:Int, v:Float):Void {
+		if (out(pos + 3))
+			throw Error.OutsideBounds;
+		#if hl_check_align
+		if (pos & 3 == 0)
+			b.setF32(pos, v);
+		else {
+			alignBuffer.setF32(0, v);
+			b.blit(pos, alignBuffer, 0, 4);
+		}
+		#else
 		b.setF32(pos, v);
+		#end
 	}
 
-	public inline function getUInt16( pos : Int ) : Int {
-		return if( out(pos + 1) ) 0 else b.getUI16(pos);
+	public inline function getUInt16(pos:Int):Int {
+		return if (out(pos + 1)) 0 else b.getUI16(pos);
 	}
 
-	public inline function setUInt16( pos : Int, v : Int ) : Void {
-		if( out(pos + 1) ) throw Error.OutsideBounds;
+	public inline function setUInt16(pos:Int, v:Int):Void {
+		if (out(pos + 1))
+			throw Error.OutsideBounds;
 		b.setUI16(pos, v);
 	}
 
-	public function getInt32( pos : Int ) : Int {
-		return if( out(pos + 3) ) 0 else b.getI32(pos);
+	public function getInt32(pos:Int):Int {
+		return if (out(pos + 3)) 0 else b.getI32(pos);
 	}
 
-	public function getInt64( pos : Int ) : haxe.Int64 {
-		if( out(pos + 7) )
+	public function getInt64(pos:Int):haxe.Int64 {
+		if (out(pos + 7))
 			return haxe.Int64.ofInt(0);
-		return haxe.Int64.make(b.getI32(pos+4), b.getI32(pos));
+		return haxe.Int64.make(b.getI32(pos + 4), b.getI32(pos));
 	}
 
-	public function setInt32( pos : Int, v : Int ) : Void {
-		if( out(pos + 3) ) throw Error.OutsideBounds;
+	public function setInt32(pos:Int, v:Int):Void {
+		if (out(pos + 3))
+			throw Error.OutsideBounds;
 		b.setI32(pos, v);
 	}
 
-	public inline function setInt64( pos : Int, v : haxe.Int64 ) : Void {
+	public inline function setInt64(pos:Int, v:haxe.Int64):Void {
 		setInt32(pos + 4, v.high);
 		setInt32(pos, v.low);
 	}
 
-	public function getString( pos : Int, len : Int ) : String {
-		if( outRange(pos,len) ) throw Error.OutsideBounds;
+	public function getString(pos:Int, len:Int, ?encoding:Encoding):String {
+		if (outRange(pos, len))
+			throw Error.OutsideBounds;
 
-		var b = new hl.Bytes(len + 1);
+		var b = new hl.Bytes(len + 2);
 		b.blit(0, this.b, pos, len);
 		b[len] = 0;
-		return @:privateAccess String.fromUTF8(b);
+		b[len + 1] = 0;
+		return @:privateAccess (encoding == RawNative ? String.fromUCS2(b) : String.fromUTF8(b));
 	}
 
 	@:deprecated("readString is deprecated, use getString instead")
@@ -134,17 +185,17 @@ class Bytes {
 		return getString(pos, len);
 	}
 
-	public function toString() : String {
-		return getString(0,length);
+	public function toString():String {
+		return getString(0, length);
 	}
 
-	public function toHex() : String {
+	public function toHex():String {
 		var s = new StringBuf();
 		var chars = [];
 		var str = "0123456789abcdef";
-		for( i in 0...str.length )
+		for (i in 0...str.length)
 			chars.push(str.charCodeAt(i));
-		for( i in 0...length ) {
+		for (i in 0...length) {
 			var c = get(i);
 			s.addChar(chars[c >> 4]);
 			s.addChar(chars[c & 15]);
@@ -152,28 +203,51 @@ class Bytes {
 		return s.toString();
 	}
 
-	public inline function getData() : BytesData {
-		return new haxe.io.BytesData(b,length);
+	public inline function getData():BytesData {
+		return new haxe.io.BytesData(b, length);
 	}
 
-	public static function alloc( length : Int ) : Bytes {
+	public static function alloc(length:Int):Bytes {
 		var b = new hl.Bytes(length);
 		b.fill(0, length, 0);
-		return new Bytes(b,length);
+		return new Bytes(b, length);
+	}
+
+	public static function ofString(s:String, ?encoding:Encoding):Bytes@:privateAccess {
+		if (encoding == null)
+			encoding = UTF8;
+		return switch (encoding) {
+			case RawNative:
+				return new Bytes(s.bytes.sub(0, s.length << 1), s.length << 1);
+			case UTF8:
+				var size = 0;
+				var b = s.bytes.utf16ToUtf8(s.length, size);
+				return new Bytes(b, size);
+		}
 	}
 
-	public static function ofString( s : String ) : Bytes @:privateAccess {
-		var size = 0;
-		var b = s.bytes.utf16ToUtf8(0, size);
-		return new Bytes(b,size);
+	public static function ofData(b:BytesData):Bytes {
+		return new Bytes(b.bytes, b.length);
 	}
 
-	public static function ofData( b : BytesData ) : Bytes {
-		return new Bytes(b.bytes,b.length);
+	public static function ofHex(s:String):Bytes {
+		var len = s.length;
+		if ((len & 1) != 0)
+			throw "Not a hex string (odd number of digits)";
+		var l = len >> 1;
+		var b = new hl.Bytes(l);
+		for (i in 0...l) {
+			var high = s.charCodeAt(i * 2);
+			var low = s.charCodeAt(i * 2 + 1);
+			high = (high & 0xf) + ((high & 0x40) >> 6) * 9;
+			low = (low & 0xf) + ((low & 0x40) >> 6) * 9;
+			b.setUI8(i, ((high << 4) | low) & 0xff);
+		}
+
+		return new Bytes(b, l);
 	}
 
-	public inline static function fastGet( b : BytesData, pos : Int ) : Int {
+	public inline static function fastGet(b:BytesData, pos:Int):Int {
 		return b[pos];
 	}
-
 }
diff --git a/std/hl/_std/haxe/io/BytesBuffer.hx b/std/hl/_std/haxe/io/BytesBuffer.hx
index c0bd1744b208c899d1203c89f97d5c0bc3306ece..12893eed0b23354bd408880793ca5a97b36b7c68 100644
--- a/std/hl/_std/haxe/io/BytesBuffer.hx
+++ b/std/hl/_std/haxe/io/BytesBuffer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,16 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 @:coreApi
 class BytesBuffer {
+	var b:hl.Bytes;
+	var pos:Int;
+	var size:Int;
 
-	var b : hl.Bytes;
-	var pos : Int;
-	var size : Int;
-
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
 	public function new() {
 		pos = 0;
@@ -36,71 +36,96 @@ class BytesBuffer {
 		b = new hl.Bytes(size);
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return pos;
 	}
 
-	public inline function addByte( byte : Int ) : Void {
-		if( pos == size ) __expand(0);
+	public inline function addByte(byte:Int):Void {
+		if (pos == size)
+			__expand(0);
 		b[pos++] = byte;
 	}
 
-	function __expand( req : Int ) : Void {
+	function __expand(req:Int):Void {
 		var nsize = (size * 3) >> 1;
-		if( nsize < req ) nsize = req;
+		if (nsize < req)
+			nsize = req;
 		var b2 = new hl.Bytes(nsize);
 		b2.blit(0, b, 0, pos);
 		b = b2;
 		size = nsize;
 	}
 
-	function __add( b : hl.Bytes, bpos : Int, blen : Int ) : Void {
-		if( pos + blen > size ) __expand(pos+blen);
+	function __add(b:hl.Bytes, bpos:Int, blen:Int):Void {
+		if (pos + blen > size)
+			__expand(pos + blen);
 		this.b.blit(pos, b, bpos, blen);
 		pos += blen;
 	}
 
-	public inline function add( src : Bytes ) : Void {
+	public inline function add(src:Bytes):Void {
 		__add(@:privateAccess src.b, 0, src.length);
 	}
 
-	public inline function addString( v : String ) : Void {
+	public inline function addString(v:String, ?encoding:Encoding):Void {
 		var len = 0;
-		@:privateAccess __add(v.bytes.utf16ToUtf8(0, len), 0, len);
+		@:privateAccess (encoding == RawNative ? __add(v.bytes, 0, v.length << 1) : __add(v.bytes.utf16ToUtf8(0, len), 0, len));
 	}
 
-	public inline function addInt32( v : Int ) : Void {
-		if( pos + 4 > size ) __expand(0);
+	public inline function addInt32(v:Int):Void {
+		if (pos + 4 > size)
+			__expand(0);
 		b.setI32(pos, v);
 		pos += 4;
 	}
 
-	public inline function addInt64( v : haxe.Int64 ) : Void {
-		if( pos + 8 > size ) __expand(0);
+	public inline function addInt64(v:haxe.Int64):Void {
+		if (pos + 8 > size)
+			__expand(0);
 		b.setI32(pos, v.low);
 		b.setI32(pos + 4, v.high);
 		pos += 8;
 	}
 
-	public inline function addFloat( v : Float ) : Void {
-		if( pos + 4 > size ) __expand(0);
+	public inline function addFloat(v:Float):Void {
+		if (pos + 4 > size)
+			__expand(0);
+		#if hl_check_align
+		if (pos & 3 == 0)
+			b.setF32(pos, v);
+		else @:privateAccess {
+			haxe.io.Bytes.alignBuffer.setF32(0, v);
+			b.blit(pos, haxe.io.Bytes.alignBuffer, 0, 4);
+		}
+		#else
 		b.setF32(pos, v);
+		#end
 		pos += 4;
 	}
 
-	public inline function addDouble( v : Float ) : Void {
-		if( pos + 8 > size ) __expand(0);
+	public inline function addDouble(v:Float):Void {
+		if (pos + 8 > size)
+			__expand(0);
+		#if hl_check_align
+		if (pos & 7 == 0)
+			b.setF64(pos, v);
+		else @:privateAccess {
+			haxe.io.Bytes.alignBuffer.setF64(0, v);
+			b.blit(pos, haxe.io.Bytes.alignBuffer, 0, 8);
+		}
+		#else
 		b.setF64(pos, v);
+		#end
 		pos += 8;
 	}
 
-	public inline function addBytes( src : Bytes, pos : Int, len : Int ) : Void {
-		if( pos < 0 || len < 0 || pos + len > src.length ) throw Error.OutsideBounds;
+	public inline function addBytes(src:Bytes, pos:Int, len:Int):Void {
+		if (pos < 0 || len < 0 || pos + len > src.length)
+			throw Error.OutsideBounds;
 		__add(@:privateAccess src.b, pos, len);
 	}
 
-	public function getBytes() : Bytes {
+	public function getBytes():Bytes {
 		return @:privateAccess new haxe.io.Bytes(b, pos);
 	}
-
 }
diff --git a/std/hl/_std/haxe/io/FPHelper.hx b/std/hl/_std/haxe/io/FPHelper.hx
index f9494247afd1f2f698b74544e7d405b3b15d2691..2d5389c28b2a624936eee36abc504f3dbe1e41fc 100644
--- a/std/hl/_std/haxe/io/FPHelper.hx
+++ b/std/hl/_std/haxe/io/FPHelper.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,32 +19,32 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 class FPHelper {
-
 	// note : this is not thread safe, use TLS when available
 	static var i64tmp = Int64.ofInt(0);
 	static var helper = new hl.Bytes(8);
 
-	public static function i32ToFloat( i : Int ) : Single {
-		helper.setI32(0,i);
+	public static function i32ToFloat(i:Int):Single {
+		helper.setI32(0, i);
 		return helper.getF32(0);
 	}
 
-	public static function floatToI32( f : Single ) : Int {
-		helper.setF32(0,f);
+	public static function floatToI32(f:Single):Int {
+		helper.setF32(0, f);
 		return helper.getI32(0);
 	}
 
-	public static function i64ToDouble( low : Int, high : Int ) : Float {
-		helper.setI32(0,low);
-		helper.setI32(4,high);
+	public static function i64ToDouble(low:Int, high:Int):Float {
+		helper.setI32(0, low);
+		helper.setI32(4, high);
 		return helper.getF64(0);
 	}
 
-	public static function doubleToI64( v : Float ) : Int64 {
-		helper.setF64(0,v);
+	public static function doubleToI64(v:Float):Int64 {
+		helper.setF64(0, v);
 		var i64 = i64tmp;
 		@:privateAccess {
 			i64.set_low(helper.getI32(0));
@@ -52,5 +52,4 @@ class FPHelper {
 		}
 		return i64;
 	}
-
 }
diff --git a/std/hl/_std/haxe/zip/Compress.hx b/std/hl/_std/haxe/zip/Compress.hx
index e4dbebf5ca98a485a44d98ec5d108bb53c38fdb7..416b0ab433f5473be2feb7e1e7139eb51692df57 100644
--- a/std/hl/_std/haxe/zip/Compress.hx
+++ b/std/hl/_std/haxe/zip/Compress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,51 +19,57 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 private typedef Deflater = hl.Abstract<"fmt_zip">;
 
 @:coreApi @:hlNative("fmt")
 class Compress {
+	var s:Deflater;
 
-	var s : Deflater;
-
-	public function new( level : Int ) : Void {
+	public function new(level:Int):Void {
 		s = deflate_init(level);
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
 		var read = 0, write = 0;
-		var done = deflate_buffer(s,src.getData(),srcPos,src.length,dst.getData(),dstPos,dst.length,read,write);
-		return { done : done, read : read, write : write };
+		var done = deflate_buffer(s, src.getData(), srcPos, src.length, dst.getData(), dstPos, dst.length, read, write);
+		return {done: done, read: read, write: write};
 	}
 
-	public function setFlushMode( f : FlushMode ) : Void {
-		@:privateAccess Uncompress.zip_flush_mode(cast s,f.getIndex());
+	public function setFlushMode(f:FlushMode):Void {
+		@:privateAccess Uncompress.zip_flush_mode(cast s, f.getIndex());
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		@:privateAccess Uncompress.zip_end(cast s);
 	}
 
-	public static function run( s : haxe.io.Bytes, level : Int ) : haxe.io.Bytes {
+	public static function run(s:haxe.io.Bytes, level:Int):haxe.io.Bytes {
 		var c = new Compress(level);
 		c.setFlushMode(FlushMode.FINISH);
-		var out = haxe.io.Bytes.alloc(deflate_bound(c.s,s.length));
-		var r = c.execute(s,0,out,0);
+		var out = haxe.io.Bytes.alloc(deflate_bound(c.s, s.length));
+		var r = c.execute(s, 0, out, 0);
 		c.close();
-		if( !r.done || r.read != s.length )
+		if (!r.done || r.read != s.length)
 			throw "Compression failed";
-		if( r.write < out.length*0.66 )
+		if (r.write < out.length * 0.66)
 			return out.sub(0, r.write);
 		@:privateAccess out.length = r.write;
 		return out;
 	}
 
-	static function deflate_init( level : Int ) : Deflater { return null; }
-	static function deflate_buffer( i : Deflater, bytes : hl.Bytes, bytesPos : Int, bytesLen : Int, dst : hl.Bytes, dstPos : Int, dstLen : Int, read : hl.Ref<Int>, write : hl.Ref<Int>) : Bool {
+	static function deflate_init(level:Int):Deflater {
+		return null;
+	}
+
+	static function deflate_buffer(i:Deflater, bytes:hl.Bytes, bytesPos:Int, bytesLen:Int, dst:hl.Bytes, dstPos:Int, dstLen:Int, read:hl.Ref<Int>,
+			write:hl.Ref<Int>):Bool {
 		return false;
 	}
-	static function deflate_bound( i : Deflater, length : Int ) : Int { return 0; }
 
+	static function deflate_bound(i:Deflater, length:Int):Int {
+		return 0;
+	}
 }
diff --git a/std/hl/_std/haxe/zip/Uncompress.hx b/std/hl/_std/haxe/zip/Uncompress.hx
index 94f19dc8270304ec7496d6f0e35f925b7aa865bf..1d13565914bb8a8a25a9ef8996dc6da06a7915c4 100644
--- a/std/hl/_std/haxe/zip/Uncompress.hx
+++ b/std/hl/_std/haxe/zip/Uncompress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,56 +19,62 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 private typedef Inflater = hl.Abstract<"fmt_zip">;
 
 @:coreApi @:hlNative("fmt")
 class Uncompress {
+	var s:Inflater;
 
-	var s : Inflater;
-
-	public function new( ?windowBits : Int ) : Void {
+	public function new(?windowBits:Int):Void {
 		s = inflate_init(windowBits);
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
 		var read = 0, write = 0;
-		var done = inflate_buffer(s,src.getData(),srcPos,src.length,dst.getData(),dstPos,dst.length,read,write);
-		return { done : done, read : read, write : write };
+		var done = inflate_buffer(s, src.getData(), srcPos, src.length, dst.getData(), dstPos, dst.length, read, write);
+		return {done: done, read: read, write: write};
 	}
 
-	public function setFlushMode( f : FlushMode ) : Void {
-		zip_flush_mode(s,f.getIndex());
+	public function setFlushMode(f:FlushMode):Void {
+		zip_flush_mode(s, f.getIndex());
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		zip_end(s);
 	}
 
-	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
+	public static function run(src:haxe.io.Bytes, ?bufsize:Int):haxe.io.Bytes {
 		var u = new Uncompress(null);
-		if( bufsize == null ) bufsize = 1 << 16; // 64K
+		if (bufsize == null)
+			bufsize = 1 << 16; // 64K
 		var tmp = haxe.io.Bytes.alloc(bufsize);
 		var b = new haxe.io.BytesBuffer();
 		var pos = 0;
 		u.setFlushMode(FlushMode.SYNC);
-		while( true ) {
-			var r = u.execute(src,pos,tmp,0);
-			b.addBytes(tmp,0,r.write);
+		while (true) {
+			var r = u.execute(src, pos, tmp, 0);
+			b.addBytes(tmp, 0, r.write);
 			pos += r.read;
-			if( r.done )
+			if (r.done)
 				break;
 		}
 		u.close();
 		return b.getBytes();
 	}
 
-	static function inflate_init( bits : Int ) : Inflater { return null; }
-	static function inflate_buffer( i : Inflater, bytes : hl.Bytes, bytesPos : Int, bytesLen : Int, dst : hl.Bytes, dstPos : Int, dstLen : Int, read : hl.Ref<Int>, write : hl.Ref<Int>) : Bool {
+	static function inflate_init(bits:Int):Inflater {
+		return null;
+	}
+
+	static function inflate_buffer(i:Inflater, bytes:hl.Bytes, bytesPos:Int, bytesLen:Int, dst:hl.Bytes, dstPos:Int, dstLen:Int, read:hl.Ref<Int>,
+			write:hl.Ref<Int>):Bool {
 		return false;
 	}
-	static function zip_end( i : Inflater ) : Void { }
-	static function zip_flush_mode( i : Inflater, flush : Int ) : Void {}
 
+	static function zip_end(i:Inflater):Void {}
+
+	static function zip_flush_mode(i:Inflater, flush:Int):Void {}
 }
diff --git a/std/hl/_std/sys/FileSystem.hx b/std/hl/_std/sys/FileSystem.hx
index 20fdf585e4d65e2b587060992977f4f919d1672a..f325e303d88314875221505f251bb2aa061e62fe 100644
--- a/std/hl/_std/sys/FileSystem.hx
+++ b/std/hl/_std/sys/FileSystem.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,52 +19,55 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys;
 
 @:coreApi
 @:access(Sys)
 class FileSystem {
-
-	public static function exists( path : String ) : Bool {
-		return sys_exists( Sys.getPath(makeCompatiblePath(path)) );
+	public static function exists(path:String):Bool {
+		return sys_exists(Sys.getPath(makeCompatiblePath(path)));
 	}
 
-	public static function rename( path : String, newPath : String ) : Void {
-		if( !sys_rename( Sys.getPath(path), Sys.getPath(newPath) ) ) throw new Sys.SysError("Failed to rename " + path + " to " + newPath);
+	public static function rename(path:String, newPath:String):Void {
+		if (!sys_rename(Sys.getPath(path), Sys.getPath(newPath)))
+			throw new Sys.SysError("Failed to rename " + path + " to " + newPath);
 	}
 
-	public static function stat( path : String ) : FileStat {
-		var values = sys_stat( Sys.getPath(makeCompatiblePath(path)) );
-		if( values == null ) throw new Sys.SysError("Failed to stat " + path);
+	public static function stat(path:String):FileStat {
+		var values = sys_stat(Sys.getPath(makeCompatiblePath(path)));
+		if (values == null)
+			throw new Sys.SysError("Failed to stat " + path);
 		return {
-			gid : values[0],
-			uid : values[1],
-			atime : @:privateAccess Date.fromInt(values[2]),
-			mtime : @:privateAccess Date.fromInt(values[3]),
-			ctime : @:privateAccess Date.fromInt(values[4]),
-			size : values[5],
-			dev : values[6],
-			ino : values[7],
-			nlink : values[8],
-			rdev : values[9],
-			mode : values[10],
+			gid: values[0],
+			uid: values[1],
+			atime: @:privateAccess Date.fromInt(values[2]),
+			mtime: @:privateAccess Date.fromInt(values[3]),
+			ctime: @:privateAccess Date.fromInt(values[4]),
+			size: values[5],
+			dev: values[6],
+			ino: values[7],
+			nlink: values[8],
+			rdev: values[9],
+			mode: values[10],
 		};
 	}
 
-	public static function fullPath( relPath : String ) : String {
-		return Sys.makePath( sys_full_path(Sys.getPath(relPath)) );
+	public static function fullPath(relPath:String):String {
+		return Sys.makePath(sys_full_path(Sys.getPath(relPath)));
 	}
 
-	public static function absolutePath ( relPath : String ) : String {
-		if (haxe.io.Path.isAbsolute(relPath)) return relPath;
+	public static function absolutePath(relPath:String):String {
+		if (haxe.io.Path.isAbsolute(relPath))
+			return relPath;
 		return haxe.io.Path.join([Sys.getCwd(), relPath]);
 	}
 
-	public static function isDirectory( path : String ) : Bool {
+	public static function isDirectory(path:String):Bool {
 		return sys_is_dir(Sys.getPath(makeCompatiblePath(path)));
 	}
 
-	public static function createDirectory( path : String ) : Void {
+	public static function createDirectory(path:String):Void {
 		var path = haxe.io.Path.addTrailingSlash(path);
 		var _p = null;
 		var parts = [];
@@ -74,42 +77,71 @@ class FileSystem {
 		}
 		for (part in parts) {
 			if (part.charCodeAt(part.length - 1) != ":".code && !exists(part))
-				if( !sys_create_dir(Sys.getPath(part), 493) )
+				if (!sys_create_dir(Sys.getPath(part), 493))
 					throw new Sys.SysError("Failed to create directory " + part);
 		}
 	}
 
-	public static function deleteFile( path : String ) : Void {
-		if( !sys_delete(Sys.getPath(path)) ) throw new Sys.SysError("Can't delete file " + path);
+	public static function deleteFile(path:String):Void {
+		if (!sys_delete(Sys.getPath(path)))
+			throw new Sys.SysError("Can't delete file " + path);
 	}
 
-	public static function deleteDirectory( path : String ) : Void {
-		if( !sys_remove_dir(Sys.getPath(path)) ) throw new Sys.SysError("Can't delete directory " + path);
+	public static function deleteDirectory(path:String):Void {
+		if (!sys_remove_dir(Sys.getPath(path)))
+			throw new Sys.SysError("Can't delete directory " + path);
 	}
 
-	public static function readDirectory( path : String ) : Array<String> {
+	public static function readDirectory(path:String):Array<String> {
 		var content = sys_read_dir(Sys.getPath(path));
-		if( content == null )
+		if (content == null)
 			throw new Sys.SysError("Failed to read directory " + path);
-		return [for( c in content ) Sys.makePath(c)];
+		return [for (c in content) Sys.makePath(c)];
 	}
 
 	private static inline function makeCompatiblePath(path:String):String {
 		return if (path.charCodeAt(1) == ":".code && path.length <= 3) {
 			haxe.io.Path.addTrailingSlash(path);
+		} else if (path == "/") {
+			"/";
 		} else {
 			haxe.io.Path.removeTrailingSlashes(path);
 		}
 	}
 
-	@:hlNative("std", "sys_read_dir") static function sys_read_dir( path : hl.Bytes ) : hl.NativeArray<hl.Bytes> { return null; }
-	@:hlNative("std", "sys_create_dir") static function sys_create_dir( path : hl.Bytes, rights : Int ) : Bool { return false; }
-	@:hlNative("std", "sys_is_dir") static function sys_is_dir( path : hl.Bytes ) : Bool { return false; }
-	@:hlNative("std", "sys_stat") static function sys_stat( path : hl.Bytes ) : hl.NativeArray<Int> { return null; }
-	@:hlNative("std", "sys_rename") static function sys_rename( path : hl.Bytes, to : hl.Bytes ) : Bool { return true; }
-	@:hlNative("std", "sys_delete") static function sys_delete( path : hl.Bytes ) : Bool { return true; };
-	@:hlNative("std", "sys_full_path") static function sys_full_path( path : hl.Bytes ) : hl.Bytes { return null; }
-	@:hlNative("std", "sys_remove_dir") static function sys_remove_dir( path : hl.Bytes ) : Bool { return true; }
-	@:hlNative("std", "sys_exists") static function sys_exists( path : hl.Bytes ) : Bool { return true; }
+	@:hlNative("std", "sys_read_dir") static function sys_read_dir(path:hl.Bytes):hl.NativeArray<hl.Bytes> {
+		return null;
+	}
+
+	@:hlNative("std", "sys_create_dir") static function sys_create_dir(path:hl.Bytes, rights:Int):Bool {
+		return false;
+	}
+
+	@:hlNative("std", "sys_is_dir") static function sys_is_dir(path:hl.Bytes):Bool {
+		return false;
+	}
+
+	@:hlNative("std", "sys_stat") static function sys_stat(path:hl.Bytes):hl.NativeArray<Int> {
+		return null;
+	}
 
+	@:hlNative("std", "sys_rename") static function sys_rename(path:hl.Bytes, to:hl.Bytes):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "sys_delete") static function sys_delete(path:hl.Bytes):Bool {
+		return true;
+	};
+
+	@:hlNative("std", "sys_full_path") static function sys_full_path(path:hl.Bytes):hl.Bytes {
+		return null;
+	}
+
+	@:hlNative("std", "sys_remove_dir") static function sys_remove_dir(path:hl.Bytes):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "sys_exists") static function sys_exists(path:hl.Bytes):Bool {
+		return true;
+	}
 }
diff --git a/std/hl/_std/sys/db/Connection.hx b/std/hl/_std/sys/db/Connection.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d7331f5d5a42b53c6aba3c06709b0aa81d985105
--- /dev/null
+++ b/std/hl/_std/sys/db/Connection.hx
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C)2005-2019 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 sys.db;
+
+interface Connection {
+	function request(s:String):ResultSet;
+	function close():Void;
+	function escape(s:String):String;
+	function quote(s:String):String;
+	function addValue(s:StringBuf, v:Dynamic):Void;
+	function lastInsertId():Int;
+	function dbName():String;
+	function startTransaction():Void;
+	function commit():Void;
+	function rollback():Void;
+}
diff --git a/std/hl/_std/sys/db/Mysql.hx b/std/hl/_std/sys/db/Mysql.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b3d9fd4962ddbd73389e867489b5b7af870de6ec
--- /dev/null
+++ b/std/hl/_std/sys/db/Mysql.hx
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C)2005-2019 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 sys.db;
+
+private class MysqlParams {
+	public var host:hl.Bytes;
+	public var user:hl.Bytes;
+	public var pass:hl.Bytes;
+	public var socket:hl.Bytes;
+	public var port:Int;
+
+	public function new() {}
+}
+
+private typedef ConnectionHandler = hl.Abstract<"mysql_cnx">;
+private typedef ResultHandler = hl.Abstract<"mysql_result">;
+
+@:hlNative("mysql")
+private class MysqlResultSet implements sys.db.ResultSet {
+	public var length(get, null):Int;
+	public var nfields(get, null):Int;
+
+	private var r:ResultHandler;
+	private var cache:Dynamic;
+
+	function new(r) {
+		this.r = r;
+	}
+
+	private function get_length() {
+		return result_get_length(r);
+	}
+
+	private function get_nfields() {
+		return result_get_nfields(r);
+	}
+
+	public function hasNext() {
+		if (cache == null)
+			cache = next();
+		return (cache != null);
+	}
+
+	public function next():Dynamic {
+		var c = cache;
+		if (c != null) {
+			cache = null;
+			return c;
+		}
+		c = result_next(r);
+		return c;
+	}
+
+	public function results():List<Dynamic> {
+		var l = new List();
+		while (hasNext())
+			l.add(next());
+		return l;
+	}
+
+	public function getResult(n:Int) {
+		var v = result_get(r, n);
+		if (v == null)
+			return null;
+		return @:privateAccess String.fromUTF8(v);
+	}
+
+	public function getIntResult(n:Int):Int {
+		return result_get_int(r, n);
+	}
+
+	public function getFloatResult(n:Int):Float {
+		return result_get_float(r, n);
+	}
+
+	public function getFieldsNames():Array<String> {
+		var a = result_get_fields_names(r);
+		return [for (v in a) @:privateAccess String.fromUTF8(v)];
+	}
+
+	static function result_get_length(r:ResultHandler):Int {
+		return 0;
+	}
+
+	static function result_get_nfields(r:ResultHandler):Int {
+		return 0;
+	}
+
+	static function result_next(r:ResultHandler):Dynamic {
+		return null;
+	}
+
+	static function result_get(r:ResultHandler, n:Int):hl.Bytes {
+		return null;
+	}
+
+	static function result_get_int(r:ResultHandler, n:Int):Int {
+		return 0;
+	}
+
+	static function result_get_float(r:ResultHandler, n:Int):Float {
+		return 0.;
+	}
+
+	static function result_get_fields_names(r:ResultHandler):hl.NativeArray<hl.Bytes> {
+		return null;
+	}
+}
+
+@:hlNative("mysql")
+private class MysqlConnection implements Connection {
+	var h:ConnectionHandler;
+
+	function new(h) {
+		this.h = h;
+	}
+
+	public function close() {
+		if (h != null)
+			close_wrap(h);
+		h = null;
+	}
+
+	public function request(s:String) @:privateAccess {
+		var len = 0;
+		var b = s.bytes.utf16ToUtf8(0, len);
+		return new MysqlResultSet(request_wrap(h, b, len));
+	}
+
+	public function escape(s:String) @:privateAccess {
+		var len = 0;
+		var utf = s.bytes.utf16ToUtf8(0, len);
+		return String.fromUTF8(escape_wrap(h, utf, len));
+	}
+
+	public function quote(s:String) {
+		return "'" + escape(s) + "'";
+	}
+
+	public function addValue(s:StringBuf, v:Dynamic) {
+		if (v == null) {
+			s.add(null);
+			return;
+		}
+		var t = hl.Type.getDynamic(v).kind;
+		if (t == HI32 || t == HF64)
+			s.add(v);
+		else if (t == HBool)
+			s.addChar(if (v) "1".code else "0".code);
+		else {
+			s.addChar("'".code);
+			s.add(escape(Std.string(v)));
+			s.addChar("'".code);
+		}
+	}
+
+	public function lastInsertId() {
+		return request("SELECT LAST_INSERT_ID()").getIntResult(0);
+	}
+
+	public function dbName() {
+		return "MySQL";
+	}
+
+	public function startTransaction() {
+		request("START TRANSACTION");
+	}
+
+	public function commit() {
+		request("COMMIT");
+	}
+
+	public function rollback() {
+		request("ROLLBACK");
+	}
+
+	static function close_wrap(h:ConnectionHandler) {}
+
+	static function connect_wrap(p:MysqlParams):ConnectionHandler {
+		return null;
+	}
+
+	static function select_db_wrap(h:ConnectionHandler, db:hl.Bytes):Bool {
+		return false;
+	}
+
+	@:hlNative("mysql", "request")
+	static function request_wrap(h:ConnectionHandler, rq:hl.Bytes, rqLen:Int):ResultHandler {
+		return null;
+	}
+
+	@:hlNative("mysql", "escape")
+	static function escape_wrap(h:ConnectionHandler, str:hl.Bytes, len:Int):hl.Bytes {
+		return null;
+	}
+
+	static function setConvFuns(fstring:Dynamic, fbytes:Dynamic, fdate:Dynamic, fjson:Dynamic) {};
+}
+
+class Mysql {
+	static var INIT_DONE = false;
+
+	public static function connect(params:{
+		host:String,
+		?port:Int,
+		user:String,
+		pass:String,
+		?socket:String,
+		?database:String
+	}):sys.db.Connection@:privateAccess {
+		if (!INIT_DONE) {
+			INIT_DONE = true;
+			MysqlConnection.setConvFuns(function(v:hl.Bytes) return @:privateAccess String.fromUTF8(v),
+			function(v:hl.Bytes, len:Int) return new haxe.io.Bytes(v, len), function(t) return Date.fromTime(1000. * t),
+			function(v:hl.Bytes) return haxe.Json.parse(@:privateAccess String.fromUTF8(v)));
+		}
+		var p = new MysqlParams();
+		p.host = params.host == null ? null : params.host.toUtf8();
+		p.user = params.user.toUtf8();
+		p.pass = params.pass.toUtf8();
+		p.socket = params.socket == null ? null : params.socket.toUtf8();
+		p.port = params.port == null ? 3306 : params.port;
+		var cnx = new MysqlConnection(MysqlConnection.connect_wrap(p));
+		if (params.database != null && !MysqlConnection.select_db_wrap(cnx.h, params.database.toUtf8())) {
+			cnx.close();
+			throw "Failed to select database " + params.database;
+		}
+		return cnx;
+	}
+}
diff --git a/std/hl/_std/sys/db/ResultSet.hx b/std/hl/_std/sys/db/ResultSet.hx
new file mode 100644
index 0000000000000000000000000000000000000000..49f689994e810ee0f074a02222266bf0e80a7b85
--- /dev/null
+++ b/std/hl/_std/sys/db/ResultSet.hx
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C)2005-2019 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 sys.db;
+
+interface ResultSet {
+	var length(get, null):Int;
+	var nfields(get, null):Int;
+
+	function hasNext():Bool;
+	function next():Dynamic;
+	function results():List<Dynamic>;
+	function getResult(n:Int):String;
+	function getIntResult(n:Int):Int;
+	function getFloatResult(n:Int):Float;
+	function getFieldsNames():Null<Array<String>>;
+}
diff --git a/std/hl/_std/sys/db/Sqlite.hx b/std/hl/_std/sys/db/Sqlite.hx
index d4bd0c706e8fd64c617e7325dcc0a00683a1fdbd..57df2197d0f26cc3f8da36fde5d7df81792729c6 100644
--- a/std/hl/_std/sys/db/Sqlite.hx
+++ b/std/hl/_std/sys/db/Sqlite.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,194 +19,196 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
+
 import haxe.crypto.BaseCode;
 
 private typedef SqliteConnectionHandle = hl.Abstract<"sqlite_database">;
 private typedef SqliteResultHandle = hl.Abstract<"sqlite_result">;
 
 @:hlNative("sqlite")
-private class SqliteLib
-{
-	public static function connect( path : hl.Bytes ) : SqliteConnectionHandle { return null; }
-	public static function close( c : SqliteConnectionHandle ) : Void { }
-	public static function request( c : SqliteConnectionHandle, sql : hl.Bytes ) : SqliteResultHandle { return null; }
-	public static function last_id( c : SqliteConnectionHandle ) : Int { return 0; }
-	
-	public static function result_next( c : SqliteResultHandle ) : hl.NativeArray<Dynamic> { return null; }
-	
-	public static function result_get( c : SqliteResultHandle, n : Int ) : Null<hl.Bytes> { return null; }
-	public static function result_get_int( c : SqliteResultHandle, n : Int ) : Null<Int> { return 0; }
-	public static function result_get_float( c : SqliteResultHandle, n : Int ) : Null<Float> { return .0; }
-	public static function result_get_length( c : SqliteResultHandle ) : Null<Int> { return 0; }
-	public static function result_get_nfields( c : SqliteResultHandle ) : Int { return 0; }
-	public static function result_get_fields( c : SqliteResultHandle ) : hl.NativeArray<hl.Bytes> { return null; }
-}
+private class SqliteLib {
+	public static function connect(path:hl.Bytes):SqliteConnectionHandle {
+		return null;
+	}
+
+	public static function close(c:SqliteConnectionHandle):Void {}
+
+	public static function request(c:SqliteConnectionHandle, sql:hl.Bytes):SqliteResultHandle {
+		return null;
+	}
+
+	public static function last_id(c:SqliteConnectionHandle):Int {
+		return 0;
+	}
+
+	public static function result_next(c:SqliteResultHandle):hl.NativeArray<Dynamic> {
+		return null;
+	}
+
+	public static function result_get(c:SqliteResultHandle, n:Int):Null<hl.Bytes> {
+		return null;
+	}
+
+	public static function result_get_int(c:SqliteResultHandle, n:Int):Null<Int> {
+		return 0;
+	}
+
+	public static function result_get_float(c:SqliteResultHandle, n:Int):Null<Float> {
+		return .0;
+	}
+
+	public static function result_get_length(c:SqliteResultHandle):Null<Int> {
+		return 0;
+	}
 
+	public static function result_get_nfields(c:SqliteResultHandle):Int {
+		return 0;
+	}
+
+	public static function result_get_fields(c:SqliteResultHandle):hl.NativeArray<hl.Bytes> {
+		return null;
+	}
+}
 
 @:access(Sys)
 @:access(String)
-private class SqliteConnection implements Connection
-{
-	
-	var c : SqliteConnectionHandle;
-
-	public function new( file : String )
-	{
-		c = SqliteLib.connect(Sys.getPath(file));
-	}
-	
-	public function close( ) : Void
-	{
+private class SqliteConnection implements Connection {
+	var c:SqliteConnectionHandle;
+
+	public function new(file:String) {
+		c = SqliteLib.connect(file.bytes);
+	}
+
+	public function close():Void {
 		SqliteLib.close(c);
 	}
-	
-	public function request( s : String ) : ResultSet
-	{
-		try
-		{
-			var r : SqliteResultHandle = SqliteLib.request(c, s.bytes);
-			
+
+	public function request(s:String):ResultSet {
+		try {
+			var r:SqliteResultHandle = SqliteLib.request(c, s.bytes);
+
 			return new SqliteResultSet(r);
-		}
-		catch ( e : String )
-		{
+		} catch (e:String) {
 			throw 'Error while executing $s ($e)';
 		}
-		
+
 		return null;
 	}
-	
-	public function escape( s : String ) : String
-	{
+
+	public function escape(s:String):String {
 		return s.split("'").join("''");
 	}
-	
-	public function quote( s : String ) : String
-	{
-		if( s.indexOf("\000") >= 0 )
+
+	public function quote(s:String):String {
+		if (s.indexOf("\000") >= 0)
 			return "x'" + BaseCode.encode(s, "0123456789ABCDEF") + "'";
-		
+
 		return "'" + s.split("'").join("''") + "'";
 	}
-	
-	public function addValue( s : StringBuf, v : Dynamic ) : Void
-	{
-		switch( Type.typeof(v) )
-		{
-			case TNull, TInt: s.add(v);
-			case TBool: s.add( v ? 1 : 0);
-			case _: s.add(quote(Std.string(v)));
+
+	public function addValue(s:StringBuf, v:Dynamic):Void {
+		switch (Type.typeof(v)) {
+			case TNull, TInt:
+				s.add(v);
+			case TBool:
+				s.add(v ? 1 : 0);
+			case _:
+				s.add(quote(Std.string(v)));
 		}
 	}
-	
-	public function lastInsertId( ) : Int
-	{
+
+	public function lastInsertId():Int {
 		return SqliteLib.last_id(c);
 	}
-	
-	public function dbName( ) : String
-	{
+
+	public function dbName():String {
 		return "SQLite";
 	}
-	
-	public function startTransaction( ) : Void
-	{
+
+	public function startTransaction():Void {
 		request("BEGIN TRANSACTION");
 	}
-	
-	public function commit( ) : Void
-	{
+
+	public function commit():Void {
 		request("COMMIT");
 		startTransaction(); // match mysql usage
 	}
-	
-	public function rollback( ) : Void
-	{
+
+	public function rollback():Void {
 		request("ROLLBACK");
 		startTransaction(); // match mysql usage
 	}
 }
 
+@:access(String)
+private class SqliteResultSet implements ResultSet {
+	public var length(get, null):Int;
+	public var nfields(get, null):Int;
+
+	var names:Array<String>;
+	var cache:List<Dynamic>;
 
+	var r:SqliteResultHandle;
 
-@:access(String)
-private class SqliteResultSet implements ResultSet
-{
-	public var length(get,null) : Int;
-	public var nfields(get,null) : Int;
-	
-	var names : Array<String>;
-	var cache : List<Dynamic>;
-	
-	var r : SqliteResultHandle;
-	
-	public function new( r : SqliteResultHandle )
-	{
+	public function new(r:SqliteResultHandle) {
 		cache = new List();
 		this.r = r;
 		hasNext(); // execute the request
 	}
-	
-	function get_length( ) : Int
-	{
-		if ( nfields != 0 )
-		{
-			while ( true )
-			{
+
+	function get_length():Int {
+		if (nfields != 0) {
+			while (true) {
 				var c = doNext();
-				if( c == null )
+				if (c == null)
 					break;
-				
+
 				cache.add(c);
 			}
-			
+
 			return cache.length;
 		}
-		
+
 		return SqliteLib.result_get_length(r);
 	}
-	
-	function get_nfields( ) : Int
-	{
+
+	function get_nfields():Int {
 		return SqliteLib.result_get_nfields(r);
 	}
-	
-	public function hasNext( ) : Bool
-	{
+
+	public function hasNext():Bool {
 		var c = next();
-		if( c == null )
+		if (c == null)
 			return false;
-		
+
 		cache.push(c);
-		
+
 		return true;
 	}
-	
-	public function next( ) : Dynamic
-	{
+
+	public function next():Dynamic {
 		var c = cache.pop();
-		if( c != null )
+		if (c != null)
 			return c;
-		
+
 		return doNext();
 	}
-	
-	private function doNext( ) : Dynamic
-	{
-		var o : Dynamic = {};
+
+	private function doNext():Dynamic {
+		var o:Dynamic = {};
 		var a = SqliteLib.result_next(r);
-		if( a == null )
+		if (a == null)
 			return null;
-		
+
 		var names = getFieldsNames();
-		var i = 0 ;
+		var i = 0;
 		var l = names.length;
-		while ( i < l )
-		{
-			var n : String = names[i];
-			var v : Dynamic = a[i];
-			if ( hl.Type.getDynamic(v).kind == hl.Type.TypeKind.HBytes )
+		while (i < l) {
+			var n:String = names[i];
+			var v:Dynamic = a[i];
+			if (hl.Type.getDynamic(v).kind == hl.Type.TypeKind.HBytes)
 				Reflect.setField(o, n, String.fromUCS2(v));
 			else
 				Reflect.setField(o, n, v);
@@ -214,65 +216,56 @@ private class SqliteResultSet implements ResultSet
 		}
 		return o;
 	}
-	
-	public function results( ) : List<Dynamic>
-	{
+
+	public function results():List<Dynamic> {
 		var l = new List();
-		while ( true )
-		{
+		while (true) {
 			var c = next();
-			if( c == null )
+			if (c == null)
 				break;
-			
+
 			l.add(c);
 		}
-		
+
 		return l;
 	}
-	
-	public function getResult( n : Int ) : String
-	{
+
+	public function getResult(n:Int):String {
 		var bytes = SqliteLib.result_get(r, n);
-		if ( bytes == null )
+		if (bytes == null)
 			return null;
-		
+
 		return String.fromUCS2(bytes);
 	}
-	
-	public function getIntResult( n : Int ) : Int
-	{
-		return SqliteLib.result_get_int(r,n);
+
+	public function getIntResult(n:Int):Int {
+		return SqliteLib.result_get_int(r, n);
 	}
-	
-	public function getFloatResult( n : Int ) : Float
-	{
-		return SqliteLib.result_get_float(r,n);
+
+	public function getFloatResult(n:Int):Float {
+		return SqliteLib.result_get_float(r, n);
 	}
-	
-	public function getFieldsNames( ) : Array<String>
-	{
-		if ( this.names != null )
+
+	public function getFieldsNames():Array<String> {
+		if (this.names != null)
 			return this.names;
-		
+
 		this.names = [];
 		var names = SqliteLib.result_get_fields(r);
 		var i = 0;
 		var l = names.length;
-		while ( i < l )
-		{
+		while (i < l) {
 			var name = String.fromUCS2(names[i]);
 			this.names.push(name);
 			i++;
 		}
-		
+
 		return this.names;
 	}
 }
 
-@:coreApi class Sqlite
-{
-	public static function open( file : String ) : Connection
-	{
+@:coreApi class Sqlite {
+	public static function open(file:String):Connection {
 		return new SqliteConnection(file);
 	}
-}
\ No newline at end of file
+}
diff --git a/std/hl/_std/sys/io/File.hx b/std/hl/_std/sys/io/File.hx
index 74168e032531e267b82efe4e0e063227ffc482b8..1a5c7a167bfec42cf298eaa7eb1d9876b48b5f4f 100644
--- a/std/hl/_std/sys/io/File.hx
+++ b/std/hl/_std/sys/io/File.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,69 +19,88 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 #if doc_gen
-enum FileHandle { }
+enum FileHandle {}
 #else
 typedef FileHandle = hl.Abstract<"hl_fdesc">;
 #end
 
 @:access(Sys)
 @:coreApi class File {
-
-	public static function getContent( path : String ) : String {
+	public static function getContent(path:String):String {
 		var bytes = file_contents(Sys.getPath(path), null);
-		if( bytes == null ) throw new Sys.SysError("Can't read "+path);
+		if (bytes == null)
+			throw new Sys.SysError("Can't read " + path);
 		return @:privateAccess String.fromUTF8(bytes);
 	}
 
-	public static function getBytes( path : String ) : haxe.io.Bytes {
+	public static function getBytes(path:String):haxe.io.Bytes {
 		var size = 0;
 		var bytes = file_contents(Sys.getPath(path), size);
-		if( bytes == null ) throw new Sys.SysError("Can't read "+path);
+		if (bytes == null)
+			throw new Sys.SysError("Can't read " + path);
 		return @:privateAccess new haxe.io.Bytes(bytes, size);
 	}
 
-	public static function saveContent( path : String, content : String ) : Void {
+	public static function saveContent(path:String, content:String):Void {
 		var f = write(path);
 		f.writeString(content);
 		f.close();
 	}
 
-	public static function saveBytes( path : String, bytes : haxe.io.Bytes ) : Void {
+	public static function saveBytes(path:String, bytes:haxe.io.Bytes):Void {
 		var f = write(path);
 		f.write(bytes);
 		f.close();
 	}
 
-	public static function read( path : String, binary : Bool = true ) : FileInput {
-		var f = file_open(Sys.getPath(path),0,binary);
-		if( f == null ) throw new Sys.SysError("Can't open "+path);
+	public static function read(path:String, binary:Bool = true):FileInput {
+		var f = file_open(Sys.getPath(path), 0, binary);
+		if (f == null)
+			throw new Sys.SysError("Can't open " + path);
 		return @:privateAccess new FileInput(f);
 	}
 
-	public static function write( path : String, binary : Bool = true ) : FileOutput {
-		var f = file_open(Sys.getPath(path),1,binary);
-		if( f == null ) throw new Sys.SysError("Can't open "+path+" for writing");
+	public static function write(path:String, binary:Bool = true):FileOutput {
+		var f = file_open(Sys.getPath(path), 1, binary);
+		if (f == null)
+			throw new Sys.SysError("Can't open " + path + " for writing");
 		return @:privateAccess new FileOutput(f);
 	}
 
-	public static function append( path : String, binary : Bool = true ) : FileOutput {
-		var f = file_open(Sys.getPath(path),2,binary);
-		if( f == null ) throw new Sys.SysError("Can't open "+path+" for append");
+	public static function append(path:String, binary:Bool = true):FileOutput {
+		var f = file_open(Sys.getPath(path), 2, binary);
+		if (f == null)
+			throw new Sys.SysError("Can't open " + path + " for append");
 		return @:privateAccess new FileOutput(f);
 	}
 
-	public static function copy( srcPath : String, dstPath : String ) : Void {
-		var s = read(srcPath,true);
-		var d = write(dstPath,true);
+	public static function update(path:String, binary:Bool = true):FileOutput {
+		if (!FileSystem.exists(path)) {
+			write(path).close();
+		}
+		var f = file_open(Sys.getPath(path), 3, binary);
+		if (f == null)
+			throw new Sys.SysError("Can't open " + path + " for update");
+		return @:privateAccess new FileOutput(f);
+	}
+
+	public static function copy(srcPath:String, dstPath:String):Void {
+		var s = read(srcPath, true);
+		var d = write(dstPath, true);
 		d.writeInput(s);
 		s.close();
 		d.close();
 	}
 
-	@:hlNative("std", "file_open") static function file_open( path : hl.Bytes, mode : Int, binary : Bool ) : FileHandle { return null; }
-	@:hlNative("std", "file_contents") static function file_contents( path : hl.Bytes, size : hl.Ref<Int> ) : hl.Bytes { return null; }
+	@:hlNative("std", "file_open") static function file_open(path:hl.Bytes, mode:Int, binary:Bool):FileHandle {
+		return null;
+	}
 
+	@:hlNative("std", "file_contents") static function file_contents(path:hl.Bytes, size:hl.Ref<Int>):hl.Bytes {
+		return null;
+	}
 }
diff --git a/std/hl/_std/sys/io/FileInput.hx b/std/hl/_std/sys/io/FileInput.hx
index f9db2a21135ea0aba58ed64d314f8887f000ddcf..a766697be0bf749ddef7fe3889da3a6f82a777d3 100644
--- a/std/hl/_std/sys/io/FileInput.hx
+++ b/std/hl/_std/sys/io/FileInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,56 +19,79 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
+
 import sys.io.File;
 
 @:coreApi class FileInput extends haxe.io.Input {
+	private var __f:FileHandle;
 
-	private var __f : FileHandle;
-
-	function new(f:FileHandle) : Void {
+	function new(f:FileHandle):Void {
 		__f = f;
 	}
 
-	public override function readByte() : Int {
+	public override function readByte():Int {
 		var c = file_read_char(__f);
-		if( c < 0 ) throw new haxe.io.Eof();
+		if (c < 0)
+			throw new haxe.io.Eof();
 		return c;
 	}
 
-	public override function readBytes( s : haxe.io.Bytes, p : Int, l : Int ) : Int {
-		if( p < 0 || l < 0 || p + l > s.length ) throw haxe.io.Error.OutsideBounds;
+	public override function readBytes(s:haxe.io.Bytes, p:Int, l:Int):Int {
+		if (p < 0 || l < 0 || p + l > s.length)
+			throw haxe.io.Error.OutsideBounds;
 		var v = file_read(__f, s.getData(), p, l);
-		if( v <= 0 ) throw new haxe.io.Eof();
+		if (v <= 0)
+			throw new haxe.io.Eof();
 		return v;
 	}
 
-	public override function close() : Void {
+	public override function close():Void {
 		super.close();
 		file_close(__f);
 		__f = null;
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void {
-		if( !file_seek(__f,p,switch( pos ) { case SeekBegin: 0; case SeekCur: 1; case SeekEnd: 2; }) )
+	public function seek(p:Int, pos:FileSeek):Void {
+		if (!file_seek(__f, p, switch (pos) {
+			case SeekBegin: 0;
+			case SeekCur: 1;
+			case SeekEnd: 2;
+		}))
 			throw haxe.io.Error.Custom("seek() failure");
 	}
 
-	public function tell() : Int {
+	public function tell():Int {
 		var p = file_tell(__f);
-		if( p < 0 )  throw haxe.io.Error.Custom("tell() failure");
+		if (p < 0)
+			throw haxe.io.Error.Custom("tell() failure");
 		return p;
 	}
 
-	public function eof() : Bool {
+	public function eof():Bool {
 		return file_eof(__f);
 	}
 
-	@:hlNative("std", "file_eof") static function file_eof( f : FileHandle ) : Bool { return false; }
-	@:hlNative("std", "file_read") static function file_read( f : FileHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
-	@:hlNative("std", "file_read_char") static function file_read_char( f : FileHandle ) : Int { return 0; }
-	@:hlNative("std", "file_close") static function file_close( f : FileHandle ) : Void { }
-	@:hlNative("std", "file_seek") static function file_seek( f : FileHandle, pos : Int, from : Int ) : Bool { return true; }
-	@:hlNative("std", "file_tell") static function file_tell( f : FileHandle ) : Int { return 0; }
+	@:hlNative("std", "file_eof") static function file_eof(f:FileHandle):Bool {
+		return false;
+	}
+
+	@:hlNative("std", "file_read") static function file_read(f:FileHandle, bytes:hl.Bytes, pos:Int, len:Int):Int {
+		return 0;
+	}
+
+	@:hlNative("std", "file_read_char") static function file_read_char(f:FileHandle):Int {
+		return 0;
+	}
+
+	@:hlNative("std", "file_close") static function file_close(f:FileHandle):Void {}
 
+	@:hlNative("std", "file_seek") static function file_seek(f:FileHandle, pos:Int, from:Int):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "file_tell") static function file_tell(f:FileHandle):Int {
+		return 0;
+	}
 }
diff --git a/std/hl/_std/sys/io/FileOutput.hx b/std/hl/_std/sys/io/FileOutput.hx
index 87f9085f72d26285b5d4fb5673506f642613165a..34a8ff5c428f1d43acf511bf8e28f7c6843639e5 100644
--- a/std/hl/_std/sys/io/FileOutput.hx
+++ b/std/hl/_std/sys/io/FileOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,51 +19,68 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
+
 import sys.io.File;
 
 @:coreApi class FileOutput extends haxe.io.Output {
+	private var __f:FileHandle;
 
-	private var __f : FileHandle;
-
-	function new(f:FileHandle) : Void {
+	function new(f:FileHandle):Void {
 		__f = f;
 	}
 
-	public override function writeByte( c : Int ) : Void {
-		if( !file_write_char(__f, c) ) throw new haxe.io.Eof();
+	public override function writeByte(c:Int):Void {
+		if (!file_write_char(__f, c))
+			throw new haxe.io.Eof();
 	}
 
-	public override function writeBytes( s : haxe.io.Bytes, p : Int, l : Int ) : Int {
-		if( p < 0 || l < 0 || p + l > s.length ) throw haxe.io.Error.OutsideBounds;
+	public override function writeBytes(s:haxe.io.Bytes, p:Int, l:Int):Int {
+		if (p < 0 || l < 0 || p + l > s.length)
+			throw haxe.io.Error.OutsideBounds;
 		var v = file_write(__f, s.getData(), p, l);
-		if( v <= 0 ) throw new haxe.io.Eof();
+		if (v <= 0)
+			throw new haxe.io.Eof();
 		return v;
 	}
 
-	public override function flush() : Void {
-		if( !file_flush(__f) ) throw haxe.io.Error.Custom("flush() failure");
+	public override function flush():Void {
+		if (!file_flush(__f))
+			throw haxe.io.Error.Custom("flush() failure");
 	}
 
-	public override function close() : Void {
+	public override function close():Void {
 		super.close();
 		@:privateAccess FileInput.file_close(__f);
 		__f = null;
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void {
-		if( @:privateAccess !FileInput.file_seek(__f,p,switch( pos ) { case SeekBegin: 0; case SeekCur: 1; case SeekEnd: 2; }) )
+	public function seek(p:Int, pos:FileSeek):Void {
+		if (@:privateAccess !FileInput.file_seek(__f, p, switch (pos) {
+			case SeekBegin: 0;
+			case SeekCur: 1;
+			case SeekEnd: 2;
+		}))
 			throw haxe.io.Error.Custom("seek() failure");
 	}
 
-	public function tell() : Int {
+	public function tell():Int {
 		var p = @:privateAccess FileInput.file_tell(__f);
-		if( p < 0 )  throw haxe.io.Error.Custom("tell() failure");
+		if (p < 0)
+			throw haxe.io.Error.Custom("tell() failure");
 		return p;
 	}
 
-	@:hlNative("std","file_flush") static function file_flush( f : FileHandle ) : Bool { return true; }
-	@:hlNative("std", "file_write") static function file_write( f : FileHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
-	@:hlNative("std", "file_write_char") static function file_write_char( f : FileHandle, v : Int ) : Bool { return true; }
+	@:hlNative("std", "file_flush") static function file_flush(f:FileHandle):Bool {
+		return true;
+	}
 
+	@:hlNative("std", "file_write") static function file_write(f:FileHandle, bytes:hl.Bytes, pos:Int, len:Int):Int {
+		return 0;
+	}
+
+	@:hlNative("std", "file_write_char") static function file_write_char(f:FileHandle, v:Int):Bool {
+		return true;
+	}
 }
diff --git a/std/hl/_std/sys/io/Process.hx b/std/hl/_std/sys/io/Process.hx
index 7b7c4460f796e89add10a846d3f16878b5ad2119..0cbbc4dcef69e388988023006546ddbcf4edabd8 100644
--- a/std/hl/_std/sys/io/Process.hx
+++ b/std/hl/_std/sys/io/Process.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 private typedef ProcessHandle = hl.Abstract<"hl_process">;
 
 private class Stdin extends haxe.io.Output {
-
-	var p : Dynamic;
-	var buf : haxe.io.Bytes;
+	var p:Dynamic;
+	var buf:haxe.io.Bytes;
 
 	public function new(p) {
 		this.p = p;
@@ -39,67 +39,77 @@ private class Stdin extends haxe.io.Output {
 	}
 
 	public override function writeByte(c) {
-		buf.set(0,c);
-		writeBytes(buf,0,1);
+		buf.set(0, c);
+		writeBytes(buf, 0, 1);
 	}
 
-	public override function writeBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) : Int {
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
 		var v = _stdin_write(p, buf.getData().bytes, pos, len);
-		if( v < 0 ) throw new haxe.io.Eof();
+		if (v < 0)
+			throw new haxe.io.Eof();
 		return v;
 	}
 
-	@:hlNative("std","process_stdin_write") static function _stdin_write( p : ProcessHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
-	@:hlNative("std", "process_stdin_close") static function _stdin_close( p : ProcessHandle ) : Bool { return false; }
+	@:hlNative("std", "process_stdin_write") static function _stdin_write(p:ProcessHandle, bytes:hl.Bytes, pos:Int, len:Int):Int {
+		return 0;
+	}
 
+	@:hlNative("std", "process_stdin_close") static function _stdin_close(p:ProcessHandle):Bool {
+		return false;
+	}
 }
 
 private class Stdout extends haxe.io.Input {
+	var p:ProcessHandle;
+	var out:Bool;
+	var buf:haxe.io.Bytes;
 
-	var p : ProcessHandle;
-	var out : Bool;
-	var buf : haxe.io.Bytes;
-
-	public function new(p,out) {
+	public function new(p, out) {
 		this.p = p;
 		this.out = out;
 		buf = haxe.io.Bytes.alloc(1);
 	}
 
 	public override function readByte() {
-		if( readBytes(buf,0,1) == 0 )
+		if (readBytes(buf, 0, 1) == 0)
 			throw haxe.io.Error.Blocked;
 		return buf.get(0);
 	}
 
-	public override function readBytes( str : haxe.io.Bytes, pos : Int, len : Int ) : Int {
-		var v = out ? _stdout_read(p,str.getData().bytes,pos,len) : _stderr_read(p,str.getData().bytes,pos,len);
-		if( v < 0 ) throw new haxe.io.Eof();
+	public override function readBytes(str:haxe.io.Bytes, pos:Int, len:Int):Int {
+		var v = out ? _stdout_read(p, str.getData().bytes, pos, len) : _stderr_read(p, str.getData().bytes, pos, len);
+		if (v < 0)
+			throw new haxe.io.Eof();
 		return v;
 	}
 
-	@:hlNative("std","process_stdout_read") static function _stdout_read( p : ProcessHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
-	@:hlNative("std","process_stderr_read") static function _stderr_read( p : ProcessHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
+	@:hlNative("std", "process_stdout_read") static function _stdout_read(p:ProcessHandle, bytes:hl.Bytes, pos:Int, len:Int):Int {
+		return 0;
+	}
 
+	@:hlNative("std", "process_stderr_read") static function _stderr_read(p:ProcessHandle, bytes:hl.Bytes, pos:Int, len:Int):Int {
+		return 0;
+	}
 }
 
 @:access(Sys)
 @:coreApi class Process {
+	var p:ProcessHandle;
 
-	var p : ProcessHandle;
-	public var stdout(default,null) : haxe.io.Input;
-	public var stderr(default,null) : haxe.io.Input;
-	public var stdin(default, null) : haxe.io.Output;
+	public var stdout(default, null):haxe.io.Input;
+	public var stderr(default, null):haxe.io.Input;
+	public var stdin(default, null):haxe.io.Output;
 
 	static var isWin = Sys.systemName() == "Windows";
 
-	public function new( cmd : String, ?args : Array<String> ) : Void {
+	public function new(cmd:String, ?args:Array<String>, ?detached:Bool):Void {
 		var runCmd = cmd;
-		if( isWin ) {
+		if (isWin) {
 			var b = new StringBuf();
-			if( args == null ) {
+			if (args == null) {
 				var exe = Sys.getEnv("COMSPEC");
-				if( exe == null ) exe = "cmd.exe";
+				if (exe == null)
+					exe = "cmd.exe";
 				b.add("\"");
 				b.add(exe);
 				b.add("\" /C \"");
@@ -109,27 +119,27 @@ private class Stdout extends haxe.io.Input {
 				b.addChar('"'.code);
 				b.add(cmd);
 				b.addChar('"'.code);
-				for( a in args ) {
+				for (a in args) {
 					b.add(" \"");
 					var bsCount = 0;
-					for( i in 0...a.length ) {
-						switch( StringTools.fastCodeAt(a, i) ) {
-						case '"'.code:
-							for( i in 0...bsCount * 2 )
-								b.addChar('\\'.code);
-							bsCount = 0;
-							b.add("\\\"");
-						case '\\'.code:
-							bsCount++;
-						case c:
-							for( i in 0...bsCount )
-								b.addChar('\\'.code);
-							bsCount = 0;
-							b.addChar(c);
+					for (i in 0...a.length) {
+						switch (StringTools.fastCodeAt(a, i)) {
+							case '"'.code:
+								for (i in 0...bsCount * 2)
+									b.addChar('\\'.code);
+								bsCount = 0;
+								b.add("\\\"");
+							case '\\'.code:
+								bsCount++;
+							case c:
+								for (i in 0...bsCount)
+									b.addChar('\\'.code);
+								bsCount = 0;
+								b.addChar(c);
 						}
 					}
 					// Add remaining backslashes, if any.
-					for( i in 0...bsCount * 2 )
+					for (i in 0...bsCount * 2)
 						b.addChar('\\'.code);
 					b.addChar('"'.code);
 				}
@@ -139,44 +149,53 @@ private class Stdout extends haxe.io.Input {
 		}
 		@:privateAccess {
 			var aargs = null;
-			if( args != null ) {
+			if (args != null) {
 				aargs = new hl.NativeArray<hl.Bytes>(args.length);
-				for( i in 0...args.length )
+				for (i in 0...args.length)
 					aargs[i] = Sys.getPath(args[i]);
 			}
-			p = _run(Sys.getPath(runCmd), aargs);
+			p = _run(Sys.getPath(runCmd), aargs, detached);
 		}
-		if( p == null )
-			throw new Sys.SysError("Process creation failure : "+cmd);
+		if (p == null)
+			throw new Sys.SysError("Process creation failure : " + cmd);
 		stdin = new Stdin(p);
-		stdout = new Stdout(p,true);
-		stderr = new Stdout(p,false);
+		stdout = new Stdout(p, true);
+		stderr = new Stdout(p, false);
 	}
 
-	public function getPid() : Int {
+	public function getPid():Int {
 		return _pid(p);
 	}
 
-	public function exitCode( block : Bool = true ) : Null<Int> {
+	public function exitCode(block:Bool = true):Null<Int> {
 		var running = false;
 		var code = _exit(p, block == false ? new hl.Ref(running) : null);
-		if( block == false )
+		if (block == false)
 			return running ? null : code;
 		return code;
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		_close(p);
 	}
 
-	public function kill() : Void {
+	public function kill():Void {
 		_kill(p);
 	}
 
-	@:hlNative("std","process_run")	static function _run( cmd : hl.Bytes, args : hl.NativeArray<hl.Bytes> ) : ProcessHandle { return null; }
-	@:hlNative("std", "process_exit") static function _exit( p : ProcessHandle, running : hl.Ref<Bool> ) : Int { return 0; }
-	@:hlNative("std", "process_pid") static function _pid( p : ProcessHandle ) : Int { return 0; }
-	@:hlNative("std","process_close") static function _close( p : ProcessHandle ) : Void { }
-	@:hlNative("std","process_kill") static function _kill( p : ProcessHandle ) : Void { }
+	@:hlNative("std", "process_run") static function _run(cmd:hl.Bytes, args:hl.NativeArray<hl.Bytes>, detached:Bool):ProcessHandle {
+		return null;
+	}
+
+	@:hlNative("std", "process_exit") static function _exit(p:ProcessHandle, running:hl.Ref<Bool>):Int {
+		return 0;
+	}
 
-}
\ No newline at end of file
+	@:hlNative("std", "process_pid") static function _pid(p:ProcessHandle):Int {
+		return 0;
+	}
+
+	@:hlNative("std", "process_close") static function _close(p:ProcessHandle):Void {}
+
+	@:hlNative("std", "process_kill") static function _kill(p:ProcessHandle):Void {}
+}
diff --git a/std/hl/_std/sys/net/Host.hx b/std/hl/_std/sys/net/Host.hx
index 6f953f5cc9cca21687552bd5aa0b7505d9fb4d34..ed737c045de293fe3469d5694fdbc5b26d8753b0 100644
--- a/std/hl/_std/sys/net/Host.hx
+++ b/std/hl/_std/sys/net/Host.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,36 +19,47 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
 @:coreApi
 class Host {
+	public var host(default, null):String;
 
-	public var host(default,null) : String;
-
-	public var ip(default,null) : Int;
+	public var ip(default, null):Int;
 
-	public function new( name : String ) : Void {
+	public function new(name:String):Void {
 		host = name;
-		ip = host_resolve(@:privateAccess name.bytes.utf16ToUtf8(0,null));
-		if( ip == -1 ) throw new Sys.SysError("Unresolved host " + name);
+		ip = host_resolve(@:privateAccess name.bytes.utf16ToUtf8(0, null));
+		if (ip == -1)
+			throw new Sys.SysError("Unresolved host " + name);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		return @:privateAccess String.fromUTF8(host_to_string(ip));
 	}
 
-	public function reverse() : String {
+	public function reverse():String {
 		return @:privateAccess String.fromUTF8(host_reverse(ip));
 	}
 
-	public static function localhost() : String {
+	public static function localhost():String {
 		return @:privateAccess String.fromUTF8(host_local());
 	}
 
-	@:hlNative("std","host_resolve") static function host_resolve( name : hl.Bytes ) : Int { return 0; }
-	@:hlNative("std","host_reverse") static function host_reverse( host : Int ) : hl.Bytes { return null; }
-	@:hlNative("std","host_to_string") static function host_to_string( host : Int ) : hl.Bytes { return null; }
-	@:hlNative("std","host_local") static function host_local() : hl.Bytes { return null; }
+	@:hlNative("std", "host_resolve") static function host_resolve(name:hl.Bytes):Int {
+		return 0;
+	}
+
+	@:hlNative("std", "host_reverse") static function host_reverse(host:Int):hl.Bytes {
+		return null;
+	}
+
+	@:hlNative("std", "host_to_string") static function host_to_string(host:Int):hl.Bytes {
+		return null;
+	}
 
+	@:hlNative("std", "host_local") static function host_local():hl.Bytes {
+		return null;
+	}
 }
diff --git a/std/hl/_std/sys/net/Socket.hx b/std/hl/_std/sys/net/Socket.hx
index 41579ed094a7fa97a01b9d0841d816ff97a0979e..0cd7113089c940614392f8fa435b58149b2a5b4b 100644
--- a/std/hl/_std/sys/net/Socket.hx
+++ b/std/hl/_std/sys/net/Socket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,36 +19,40 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
+
 import haxe.io.Error;
 
 #if doc_gen
-@:noDoc enum SocketHandle { }
+@:noDoc enum SocketHandle {}
 #else
 @:noDoc typedef SocketHandle = hl.Abstract<"hl_socket">;
 #end
 
 private class SocketOutput extends haxe.io.Output {
-
-	var sock : Socket;
+	var sock:Socket;
 
 	public function new(s) {
 		this.sock = s;
 	}
 
-	public override function writeByte( c : Int ) {
+	public override function writeByte(c:Int) {
 		var k = socket_send_char(@:privateAccess sock.__s, c);
-		if( k < 0 ) {
-			if( k == -1 ) throw Blocked;
+		if (k < 0) {
+			if (k == -1)
+				throw Blocked;
 			throw new haxe.io.Eof();
 		}
 	}
 
-	public override function writeBytes( buf : haxe.io.Bytes, pos : Int, len : Int) : Int {
-		if( pos < 0 || len < 0 || pos + len > buf.length ) throw haxe.io.Error.OutsideBounds;
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
+		if (pos < 0 || len < 0 || pos + len > buf.length)
+			throw haxe.io.Error.OutsideBounds;
 		var n = socket_send(@:privateAccess sock.__s, buf.getData().bytes, pos, len);
-		if( n < 0 ) {
-			if( n == -1 ) throw Blocked;
+		if (n < 0) {
+			if (n == -1)
+				throw Blocked;
 			throw new haxe.io.Eof();
 		}
 		return n;
@@ -58,34 +62,39 @@ private class SocketOutput extends haxe.io.Output {
 		sock.close();
 	}
 
+	@:hlNative("std", "socket_send_char") static function socket_send_char(s:SocketHandle, c:Int):Int {
+		return 0;
+	}
 
-	@:hlNative("std","socket_send_char") static function socket_send_char( s : SocketHandle, c : Int ) : Int { return 0; }
-	@:hlNative("std","socket_send") static function socket_send( s : SocketHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
-
+	@:hlNative("std", "socket_send") static function socket_send(s:SocketHandle, bytes:hl.Bytes, pos:Int, len:Int):Int {
+		return 0;
+	}
 }
 
 private class SocketInput extends haxe.io.Input {
-
-	var sock : Socket;
+	var sock:Socket;
 
 	public function new(s) {
 		sock = s;
 	}
 
-	public override function readByte() : Int {
+	public override function readByte():Int {
 		var c = socket_recv_char(@:privateAccess sock.__s);
-		if( c < 0 ) {
-			if( c == -1 ) throw Blocked;
+		if (c < 0) {
+			if (c == -1)
+				throw Blocked;
 			throw new haxe.io.Eof();
 		}
 		return c;
 	}
 
-	public override function readBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) : Int {
-		if( pos < 0 || len < 0 || pos + len > buf.length ) throw haxe.io.Error.OutsideBounds;
-		var r = socket_recv(@:privateAccess sock.__s,buf.getData().bytes,pos,len);
-		if( r < 0 ) {
-			if( r == -1 ) throw Blocked;
+	public override function readBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
+		if (pos < 0 || len < 0 || pos + len > buf.length)
+			throw haxe.io.Error.OutsideBounds;
+		var r = socket_recv(@:privateAccess sock.__s, buf.getData().bytes, pos, len);
+		if (r <= 0) {
+			if (r == -1)
+				throw Blocked;
 			throw new haxe.io.Eof();
 		}
 		return r;
@@ -95,176 +104,231 @@ private class SocketInput extends haxe.io.Input {
 		sock.close();
 	}
 
-	@:hlNative("std","socket_recv") static function socket_recv( s : SocketHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
-	@:hlNative("std","socket_recv_char") static function socket_recv_char( s : SocketHandle ) : Int { return 0; }
+	@:hlNative("std", "socket_recv") static function socket_recv(s:SocketHandle, bytes:hl.Bytes, pos:Int, len:Int):Int {
+		return 0;
+	}
 
+	@:hlNative("std", "socket_recv_char") static function socket_recv_char(s:SocketHandle):Int {
+		return 0;
+	}
 }
 
 @:coreApi
 @:keepInit
 class Socket {
+	private var __s:SocketHandle;
 
-	private var __s : SocketHandle;
-	public var input(default,null) : haxe.io.Input;
-	public var output(default,null) : haxe.io.Output;
-	public var custom : Dynamic;
+	public var input(default, null):haxe.io.Input;
+	public var output(default, null):haxe.io.Output;
+	public var custom:Dynamic;
 
-	static function __init__() : Void {
+	static function __init__():Void {
 		socket_init();
 	}
 
-	public function new() : Void {
+	public function new():Void {
 		init();
 	}
 
-	function init() : Void {
-		__s = socket_new(false);
+	function init():Void {
+		if (__s == null)
+			__s = socket_new(false);
 		input = new SocketInput(this);
 		output = new SocketOutput(this);
 	}
 
-	public function close() : Void {
-		if( __s != null ) {
+	public function close():Void {
+		if (__s != null) {
 			socket_close(__s);
 			__s = null;
 		}
 	}
 
-	public function read() : String {
+	public function read():String {
 		return input.readAll().toString();
 	}
 
-	public function write( content : String ) : Void {
+	public function write(content:String):Void {
 		output.writeString(content);
 	}
 
-	public function connect(host : Host, port : Int) : Void {
-		if( !socket_connect(__s, host.ip, port) )
-			throw new Sys.SysError("Failed to connect on "+host.toString()+":"+port);
+	public function connect(host:Host, port:Int):Void {
+		if (!socket_connect(__s, host.ip, port))
+			throw new Sys.SysError("Failed to connect on " + host.toString() + ":" + port);
 	}
 
-	public function listen( connections : Int ) : Void {
-		if( !socket_listen(__s, connections) )
+	public function listen(connections:Int):Void {
+		if (!socket_listen(__s, connections))
 			throw new Sys.SysError("listen() failure");
 	}
 
-	public function shutdown( read : Bool, write : Bool ) : Void {
-		if( !socket_shutdown(__s, read, write) )
+	public function shutdown(read:Bool, write:Bool):Void {
+		if (!socket_shutdown(__s, read, write))
 			throw new Sys.SysError("shutdown() failure");
 	}
 
-	public function bind(host : Host, port : Int) : Void {
-		if( !socket_bind(__s, host.ip, port) )
+	public function bind(host:Host, port:Int):Void {
+		if (!socket_bind(__s, host.ip, port))
 			throw new Sys.SysError("Cannot bind socket on " + host + ":" + port);
 	}
 
-	public function accept() : Socket {
+	public function accept():Socket {
 		var c = socket_accept(__s);
-		if( c == null )
+		if (c == null)
 			return null;
-		var s : Socket = untyped $new(Socket);
+		var s:Socket = untyped $new(Socket);
 		s.__s = c;
 		s.input = new SocketInput(s);
 		s.output = new SocketOutput(s);
 		return s;
 	}
 
-	public function peer() : { host : Host, port : Int } {
+	public function peer():{host:Host, port:Int} {
 		var ip = 0, port = 0;
-		if( !socket_peer(__s, ip, port) )
+		if (!socket_peer(__s, ip, port))
 			return null;
-		var h : Host = untyped $new(Host);
+		var h:Host = untyped $new(Host);
 		@:privateAccess h.ip = ip;
-		return { host : h, port : port };
+		return {host: h, port: port};
 	}
 
-	public function host() : { host : Host, port : Int } {
+	public function host():{host:Host, port:Int} {
 		var ip = 0, port = 0;
-		if( !socket_host(__s, ip, port) )
+		if (!socket_host(__s, ip, port))
 			return null;
-		var h : Host = untyped $new(Host);
+		var h:Host = untyped $new(Host);
 		@:privateAccess h.ip = ip;
-		return { host : h, port : port };
+		return {host: h, port: port};
 	}
 
-	public function setTimeout( timeout : Float ) : Void {
-		if( !socket_set_timeout(__s, timeout) ) throw new Sys.SysError("setTimeout() failure");
+	public function setTimeout(timeout:Float):Void {
+		if (!socket_set_timeout(__s, timeout))
+			throw new Sys.SysError("setTimeout() failure");
 	}
 
-	public function waitForRead() : Void {
-		select([this],null,null,null);
+	public function waitForRead():Void {
+		select([this], null, null, null);
 	}
 
-	public function setBlocking( b : Bool ) : Void {
-		if( !socket_set_blocking(__s, b) ) throw new Sys.SysError("setBlocking() failure");
+	public function setBlocking(b:Bool):Void {
+		if (!socket_set_blocking(__s, b))
+			throw new Sys.SysError("setBlocking() failure");
 	}
 
-	public function setFastSend( b : Bool ) : Void {
-		if( !socket_set_fast_send(__s,b) ) throw new Sys.SysError("setFastSend() failure");
+	public function setFastSend(b:Bool):Void {
+		if (!socket_set_fast_send(__s, b))
+			throw new Sys.SysError("setFastSend() failure");
 	}
 
 	// TODO : use TLS when multithread added
-	static var tmp : hl.Bytes = null;
+	static var tmp:hl.Bytes = null;
 	static var curTmpSize = 0;
 
-	static function makeArray( a : Array<Socket> ) : hl.NativeArray<SocketHandle> {
-		if( a == null ) return null;
+	static function makeArray(a:Array<Socket>):hl.NativeArray<SocketHandle> {
+		if (a == null)
+			return null;
 		var arr = new hl.NativeArray(a.length);
-		for( i in 0...a.length )
+		for (i in 0...a.length)
 			arr[i] = a[i].__s;
 		return arr;
 	}
 
-	static function outArray( a : hl.NativeArray<SocketHandle>, original : Array<Socket> ) : Array<Socket> {
+	static function outArray(a:hl.NativeArray<SocketHandle>, original:Array<Socket>):Array<Socket> {
 		var out = [];
-		if( a == null ) return out;
+		if (a == null)
+			return out;
 		var i = 0, p = 0;
 		var max = original.length;
-		while( i < max ) {
+		while (i < max) {
 			var sh = a[i++];
-			if( sh == null ) break;
-			while( original[p].__s != sh ) p++;
+			if (sh == null)
+				break;
+			while (original[p].__s != sh)
+				p++;
 			out.push(original[p++]);
 		}
 		return out;
 	}
 
-	public static function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float) : {read: Array<Socket>, write: Array<Socket>, others: Array<Socket>} {
+	public static function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+			?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>} {
 		var sread = makeArray(read);
 		var swrite = makeArray(write);
 		var sothers = makeArray(others);
 		var tmpSize = 0;
-		if( sread != null ) tmpSize += socket_fd_size(sread.length);
-		if( swrite != null ) tmpSize += socket_fd_size(swrite.length);
-		if( sothers != null ) tmpSize += socket_fd_size(sothers.length);
-		if( tmpSize > curTmpSize ) {
+		if (sread != null)
+			tmpSize += socket_fd_size(sread.length);
+		if (swrite != null)
+			tmpSize += socket_fd_size(swrite.length);
+		if (sothers != null)
+			tmpSize += socket_fd_size(sothers.length);
+		if (tmpSize > curTmpSize) {
 			tmp = new hl.Bytes(tmpSize);
 			curTmpSize = tmpSize;
 		}
-		if( !socket_select(sread, swrite, sothers, tmp, curTmpSize, timeout == null ? -1 : timeout) )
+		if (!socket_select(sread, swrite, sothers, tmp, curTmpSize, timeout == null ? -1 : timeout))
 			throw "Error while waiting on socket";
 		return {
-			read : outArray(sread,read),
-			write : outArray(swrite,write),
-			others : outArray(sothers,others),
+			read: outArray(sread, read),
+			write: outArray(swrite, write),
+			others: outArray(sothers, others),
 		};
 	}
 
-	@:hlNative("std", "socket_init") static function socket_init() : Void {}
-	@:hlNative("std", "socket_new") static function socket_new( udp : Bool ) : SocketHandle { return null; }
-	@:hlNative("std", "socket_close") static function socket_close( s : SocketHandle ) : Void { }
-	@:hlNative("std", "socket_connect") static function socket_connect( s : SocketHandle, host : Int, port : Int ) : Bool { return true; }
-	@:hlNative("std", "socket_listen") static function socket_listen( s : SocketHandle, count : Int ) : Bool { return true; }
-	@:hlNative("std", "socket_bind") static function socket_bind( s : SocketHandle, host : Int, port : Int ) : Bool { return true; }
-	@:hlNative("std", "socket_accept") static function socket_accept( s : SocketHandle ) : SocketHandle { return null; }
-	@:hlNative("std", "socket_peer") static function socket_peer( s : SocketHandle, host : hl.Ref<Int>, port : hl.Ref<Int> ) : Bool { return true; }
-	@:hlNative("std", "socket_host") static function socket_host( s : SocketHandle, host : hl.Ref<Int>, port : hl.Ref<Int> ) : Bool { return true; }
-	@:hlNative("std", "socket_set_timeout") static function socket_set_timeout( s : SocketHandle, timeout : Float ) : Bool { return true; }
-	@:hlNative("std", "socket_shutdown") static function socket_shutdown( s : SocketHandle, read : Bool, write : Bool ) : Bool { return true; }
-	@:hlNative("std", "socket_set_blocking") static function socket_set_blocking( s : SocketHandle, b : Bool ) : Bool { return true; }
-	@:hlNative("std", "socket_set_fast_send") static function socket_set_fast_send( s : SocketHandle, b : Bool ) : Bool { return true; }
+	@:hlNative("std", "socket_init") static function socket_init():Void {}
+
+	@:hlNative("std", "socket_new") static function socket_new(udp:Bool):SocketHandle {
+		return null;
+	}
 
-	@:hlNative("std", "socket_fd_size") static function socket_fd_size( count : Int) : Int { return 0; }
-	@:hlNative("std", "socket_select") static function socket_select( read : hl.NativeArray<SocketHandle>, write : hl.NativeArray<SocketHandle>, other : hl.NativeArray<SocketHandle>, tmpData : hl.Bytes, tmpSize : Int, timeout : Float ) : Bool { return false; }
+	@:hlNative("std", "socket_close") static function socket_close(s:SocketHandle):Void {}
+
+	@:hlNative("std", "socket_connect") static function socket_connect(s:SocketHandle, host:Int, port:Int):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "socket_listen") static function socket_listen(s:SocketHandle, count:Int):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "socket_bind") static function socket_bind(s:SocketHandle, host:Int, port:Int):Bool {
+		return true;
+	}
 
+	@:hlNative("std", "socket_accept") static function socket_accept(s:SocketHandle):SocketHandle {
+		return null;
+	}
+
+	@:hlNative("std", "socket_peer") static function socket_peer(s:SocketHandle, host:hl.Ref<Int>, port:hl.Ref<Int>):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "socket_host") static function socket_host(s:SocketHandle, host:hl.Ref<Int>, port:hl.Ref<Int>):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "socket_set_timeout") static function socket_set_timeout(s:SocketHandle, timeout:Float):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "socket_shutdown") static function socket_shutdown(s:SocketHandle, read:Bool, write:Bool):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "socket_set_blocking") static function socket_set_blocking(s:SocketHandle, b:Bool):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "socket_set_fast_send") static function socket_set_fast_send(s:SocketHandle, b:Bool):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "socket_fd_size") static function socket_fd_size(count:Int):Int {
+		return 0;
+	}
+
+	@:hlNative("std", "socket_select") static function socket_select(read:hl.NativeArray<SocketHandle>, write:hl.NativeArray<SocketHandle>,
+			other:hl.NativeArray<SocketHandle>, tmpData:hl.Bytes, tmpSize:Int, timeout:Float):Bool {
+		return false;
+	}
 }
diff --git a/std/hl/_std/sys/net/UdpSocket.hx b/std/hl/_std/sys/net/UdpSocket.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d29f326f2bfe78a666d8872cd5166d345db624c9
--- /dev/null
+++ b/std/hl/_std/sys/net/UdpSocket.hx
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C)2005-2019 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 sys.net;
+
+import sys.net.Socket;
+import haxe.io.Error;
+
+class UdpSocket extends Socket {
+	public function new() {
+		super();
+	}
+
+	override function init():Void {
+		__s = Socket.socket_new(true);
+		super.init();
+	}
+
+	public function sendTo(buf:haxe.io.Bytes, pos:Int, len:Int, addr:Address):Int {
+		if (pos < 0 || len < 0 || pos + len > buf.length)
+			throw OutsideBounds;
+		var ret = socket_send_to(__s, (buf : hl.Bytes).offset(pos), len, addr.host, addr.port);
+		if (ret < 0) {
+			if (ret == -1)
+				throw Blocked;
+			throw new haxe.io.Eof();
+		}
+		return ret;
+	}
+
+	public function readFrom(buf:haxe.io.Bytes, pos:Int, len:Int, addr:Address):Int {
+		var host = 0, port = 0;
+		if (pos < 0 || len < 0 || pos + len > buf.length)
+			throw OutsideBounds;
+		var ret = socket_recv_from(__s, (buf : hl.Bytes).offset(pos), len, host, port);
+		if (ret <= 0) {
+			if (ret == -1)
+				throw Blocked;
+			throw new haxe.io.Eof();
+		}
+		addr.host = host;
+		addr.port = port;
+		return ret;
+	}
+
+	public function setBroadcast(b:Bool):Void {
+		if (!socket_set_broadcast(__s, b))
+			throw new Sys.SysError("setBroadcast() failure");
+	}
+
+	@:hlNative("std", "socket_send_to") static function socket_send_to(s:SocketHandle, bytes:hl.Bytes, len:Int, host:Int, port:Int):Int {
+		return 0;
+	}
+
+	@:hlNative("std", "socket_set_broadcast") static function socket_set_broadcast(s:SocketHandle, b:Bool):Bool {
+		return true;
+	}
+
+	@:hlNative("std", "socket_recv_from") static function socket_recv_from(s:SocketHandle, bytes:hl.Bytes, len:Int, host:hl.Ref<Int>, port:hl.Ref<Int>):Int {
+		return 0;
+	}
+}
diff --git a/std/hl/_std/sys/ssl/Certificate.hx b/std/hl/_std/sys/ssl/Certificate.hx
index b2db5575967b8914364b8efc88390853d3648924..b15e3ec6396fffae4ab97a0b7b1a42f0b961ee79 100644
--- a/std/hl/_std/sys/ssl/Certificate.hx
+++ b/std/hl/_std/sys/ssl/Certificate.hx
@@ -1,4 +1,27 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
+
 import sys.ssl.Lib;
 
 @:noDoc
@@ -6,58 +29,57 @@ typedef CertificatePtr = hl.Abstract<"hl_ssl_cert">;
 
 @:coreApi
 class Certificate {
-	
-	var __h : Null<Certificate>;
-	var __x : CertificatePtr;
+	var __h:Null<Certificate>;
+	var __x:CertificatePtr;
 
 	@:allow(sys.ssl.Socket)
-	function new( x : CertificatePtr, ?h: Null<Certificate> ){
+	function new(x:CertificatePtr, ?h:Null<Certificate>) {
 		__x = x;
 		__h = h;
 	}
 
-	public static function loadFile( file : String ) : Certificate {
-		return new Certificate( cert_load_file( @:privateAccess file.toUtf8() ) );
+	public static function loadFile(file:String):Certificate {
+		return new Certificate(cert_load_file(@:privateAccess file.toUtf8()));
 	}
-	
-	public static function loadPath( path : String ) : Certificate {
-		return new Certificate( cert_load_path( @:privateAccess path.toUtf8() ) );
+
+	public static function loadPath(path:String):Certificate {
+		return new Certificate(cert_load_path(@:privateAccess path.toUtf8()));
 	}
 
-	public static function fromString( str : String ) : Certificate {
-		return new Certificate( cert_add_pem(null, @:privateAccess str.toUtf8() ) );
+	public static function fromString(str:String):Certificate {
+		return new Certificate(cert_add_pem(null, @:privateAccess str.toUtf8()));
 	}
-	
-	public static function loadDefaults() : Certificate {
+
+	public static function loadDefaults():Certificate {
 		var x = cert_load_defaults();
-		if ( x != null )
-			return new Certificate( x );
-		
+		if (x != null)
+			return new Certificate(x);
+
 		var defPaths = null;
-		switch( Sys.systemName() ){
+		switch (Sys.systemName()) {
 			case "Linux":
 				defPaths = [
 					"/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc.
-					"/etc/pki/tls/certs/ca-bundle.crt",   // Fedora/RHEL
-					"/etc/ssl/ca-bundle.pem",             // OpenSUSE
-					"/etc/pki/tls/cacert.pem",            // OpenELEC
-					"/etc/ssl/certs",                     // SLES10/SLES11
-					"/system/etc/security/cacerts"        // Android
+					"/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL
+					"/etc/ssl/ca-bundle.pem", // OpenSUSE
+					"/etc/pki/tls/cacert.pem", // OpenELEC
+					"/etc/ssl/certs", // SLES10/SLES11
+					"/system/etc/security/cacerts" // Android
 				];
 			case "BSD":
 				defPaths = [
 					"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
-					"/etc/ssl/cert.pem",                      // OpenBSD
-					"/etc/openssl/certs/ca-certificates.crt", // NetBSD	
+					"/etc/ssl/cert.pem", // OpenBSD
+					"/etc/openssl/certs/ca-certificates.crt", // NetBSD
 				];
 			case "Android":
 				defPaths = ["/system/etc/security/cacerts"];
 			default:
 		}
-		if( defPaths != null ){
-			for( path in defPaths ){
-				if( sys.FileSystem.exists(path) ){
-					if( sys.FileSystem.isDirectory(path) )
+		if (defPaths != null) {
+			for (path in defPaths) {
+				if (sys.FileSystem.exists(path)) {
+					if (sys.FileSystem.isDirectory(path))
 						return loadPath(path);
 					else
 						return loadFile(path);
@@ -67,64 +89,94 @@ class Certificate {
 		return null;
 	}
 
-	public var commonName(get,null) : Null<String>;
-	public var altNames(get, null) : Array<String>;
-	public var notBefore(get,null) : Date;
-	public var notAfter(get,null) : Date;
+	public var commonName(get, null):Null<String>;
+	public var altNames(get, null):Array<String>;
+	public var notBefore(get, null):Date;
+	public var notAfter(get, null):Date;
 
-	function get_commonName() : Null<String> {
+	function get_commonName():Null<String> {
 		return subject("CN");
 	}
 
-	function get_altNames() : Array<String> {
+	function get_altNames():Array<String> {
 		var a = cert_get_altnames(__x);
-		return [for( e in a ) @:privateAccess String.fromUTF8(e)];
+		return [for (e in a) @:privateAccess String.fromUCS2(e)];
 	}
-	
-	public function subject( field : String ) : Null<String> {
-		var s = cert_get_subject(__x, @:privateAccess field.toUtf8() );
-		return s==null ? null : new String( cast s );
+
+	public function subject(field:String):Null<String> {
+		var s = cert_get_subject(__x, @:privateAccess field.toUtf8());
+		return s == null ? null : @:privateAccess String.fromUCS2(cast s);
 	}
-	
-	public function issuer( field : String ) : Null<String> {
+
+	public function issuer(field:String):Null<String> {
 		var s = cert_get_issuer(__x, @:privateAccess field.toUtf8());
-		return s==null ? null : new String( cast s );
+		return s == null ? null : @:privateAccess String.fromUCS2(cast s);
 	}
 
-	function get_notBefore() : Date {
-		var a = cert_get_notbefore( __x );
-		return new Date( a[0], a[1] - 1, a[2], a[3], a[4], a[5] );
+	function get_notBefore():Date {
+		var a = cert_get_notbefore(__x);
+		return new Date(a[0], a[1] - 1, a[2], a[3], a[4], a[5]);
 	}
 
-	function get_notAfter() : Date {
-		var a = cert_get_notafter( __x );
-		return new Date( a[0], a[1] - 1, a[2], a[3], a[4], a[5] );
+	function get_notAfter():Date {
+		var a = cert_get_notafter(__x);
+		return new Date(a[0], a[1] - 1, a[2], a[3], a[4], a[5]);
 	}
-	
-	public function next() : Null<Certificate> {
+
+	public function next():Null<Certificate> {
 		var n = cert_get_next(__x);
-		return n == null ? null : new Certificate( n, __h==null ? this : __h );
+		return n == null ? null : new Certificate(n, __h == null ? this : __h);
 	}
 
-	public function add( pem : String ) : Void {
+	public function add(pem:String):Void {
 		cert_add_pem(__x, @:privateAccess pem.toUtf8());
 	}
 
-	public function addDER( der : haxe.io.Bytes ) : Void {
+	public function addDER(der:haxe.io.Bytes):Void {
 		cert_add_der(__x, @:privateAccess der.b, @:privateAccess der.length);
 	}
 
-	@:hlNative("ssl","cert_load_defaults") static function cert_load_defaults() : CertificatePtr { return null; }
-	@:hlNative("ssl","cert_load_file") static function cert_load_file( file : hl.Bytes ) : CertificatePtr { return null; }
-	@:hlNative("ssl","cert_load_path") static function cert_load_path( path : hl.Bytes ) : CertificatePtr { return null; }
-	@:hlNative("ssl","cert_get_subject") static function cert_get_subject( cert : CertificatePtr, obj : hl.Bytes ) : hl.Bytes { return null; }
-	@:hlNative("ssl","cert_get_issuer") static function cert_get_issuer( cert : CertificatePtr, obj : hl.Bytes ) : hl.Bytes { return null; }
-	@:hlNative("ssl","cert_get_altnames") static function cert_get_altnames( cert : CertificatePtr ) : hl.NativeArray<hl.Bytes> { return null; }
-	@:hlNative("ssl","cert_get_notbefore") static function cert_get_notbefore( cert : CertificatePtr ) : hl.NativeArray<Int> { return null; }
-	@:hlNative("ssl","cert_get_notafter") static function cert_get_notafter( cert : CertificatePtr ) : hl.NativeArray<Int> { return null; }
-	@:hlNative("ssl","cert_get_next") static function cert_get_next( cert : CertificatePtr ) : Null<CertificatePtr> { return null; }
-	@:hlNative("ssl","cert_add_pem") static function cert_add_pem( cert : Null<CertificatePtr>, data : hl.Bytes ) : CertificatePtr { return null; }
-	@:hlNative("ssl","cert_add_der") static function cert_add_der( cert : Null<CertificatePtr>, data : hl.Bytes, len : Int ) : CertificatePtr { return null; }
-	
+	@:hlNative("ssl", "cert_load_defaults") static function cert_load_defaults():CertificatePtr {
+		return null;
+	}
+
+	@:hlNative("ssl", "cert_load_file") static function cert_load_file(file:hl.Bytes):CertificatePtr {
+		return null;
+	}
+
+	@:hlNative("ssl", "cert_load_path") static function cert_load_path(path:hl.Bytes):CertificatePtr {
+		return null;
+	}
+
+	@:hlNative("ssl", "cert_get_subject") static function cert_get_subject(cert:CertificatePtr, obj:hl.Bytes):hl.Bytes {
+		return null;
+	}
 
+	@:hlNative("ssl", "cert_get_issuer") static function cert_get_issuer(cert:CertificatePtr, obj:hl.Bytes):hl.Bytes {
+		return null;
+	}
+
+	@:hlNative("ssl", "cert_get_altnames") static function cert_get_altnames(cert:CertificatePtr):hl.NativeArray<hl.Bytes> {
+		return null;
+	}
+
+	@:hlNative("ssl", "cert_get_notbefore") static function cert_get_notbefore(cert:CertificatePtr):hl.NativeArray<Int> {
+		return null;
+	}
+
+	@:hlNative("ssl", "cert_get_notafter") static function cert_get_notafter(cert:CertificatePtr):hl.NativeArray<Int> {
+		return null;
+	}
+
+	@:hlNative("ssl", "cert_get_next") static function cert_get_next(cert:CertificatePtr):Null<CertificatePtr> {
+		return null;
+	}
+
+	@:hlNative("ssl", "cert_add_pem") static function cert_add_pem(cert:Null<CertificatePtr>, data:hl.Bytes):CertificatePtr {
+		return null;
+	}
+
+	@:hlNative("ssl", "cert_add_der") static function cert_add_der(cert:Null<CertificatePtr>, data:hl.Bytes, len:Int):CertificatePtr {
+		return null;
+	}
 }
diff --git a/std/hl/_std/sys/ssl/Context.hx b/std/hl/_std/sys/ssl/Context.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0109e715af2f148bb7c35d08e90bf58d53c78e1f
--- /dev/null
+++ b/std/hl/_std/sys/ssl/Context.hx
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
+
+private typedef ConfigPtr = hl.Abstract<"mbedtls_ssl_config">;
+private typedef ContextPtr = hl.Abstract<"mbedtls_ssl_context">;
+
+@:keep class SNICbResult {
+	public var cert:Certificate.CertificatePtr;
+	public var key:Key.KeyPtr;
+
+	public function new(cert:Certificate, key:Key) {
+		this.cert = @:privateAccess cert.__x;
+		this.key = @:privateAccess key.__k;
+	}
+}
+
+@:hlNative("ssl", "ssl_")
+abstract Context(ContextPtr) {
+	public function new(config) {
+		this = ssl_new(config);
+	}
+
+	public function close():Void {}
+
+	public function handshake():Int {
+		return 0;
+	}
+
+	public function recvChar():Int {
+		return 0;
+	}
+
+	public function sendChar(c:Int):Int {
+		return 0;
+	}
+
+	public function getPeerCertificate():Certificate.CertificatePtr {
+		return null;
+	}
+
+	public function recv(bytes:hl.Bytes, pos:Int, len:Int):Int {
+		return 0;
+	}
+
+	public function send(bytes:hl.Bytes, pos:Int, len:Int):Int {
+		return 0;
+	}
+
+	public function setSocket(socket:sys.net.Socket.SocketHandle):Void {}
+
+	public function setHostname(name:hl.Bytes):Void {}
+
+	@:hlNative("ssl", "ssl_new") static function ssl_new(conf:Config):ContextPtr {
+		return null;
+	}
+}
+
+@:hlNative("ssl", "conf_")
+abstract Config(ConfigPtr) {
+	public function new(server:Bool) {
+		this = conf_new(server);
+	}
+
+	public function setCert(cert:Certificate.CertificatePtr, pkey:Key.KeyPtr):Void {}
+
+	public function setCa(ca:Certificate.CertificatePtr):Void {}
+
+	public function close():Void {}
+
+	public function setVerify(mode:Int):Void {}
+
+	public function setServernameCallback(cb:hl.Bytes->SNICbResult):Void {}
+
+	@:hlNative("ssl", "conf_new") static function conf_new(server:Bool):ConfigPtr {
+		return null;
+	}
+}
diff --git a/std/hl/_std/sys/ssl/Digest.hx b/std/hl/_std/sys/ssl/Digest.hx
index 2b121e68b51530bef311dd8f1cf89a0fcb95a2b3..4578cae46ffecbcaed3a90737cb6aa29b424b76d 100644
--- a/std/hl/_std/sys/ssl/Digest.hx
+++ b/std/hl/_std/sys/ssl/Digest.hx
@@ -1,27 +1,56 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
+
 import sys.ssl.Lib;
 
 @:coreApi
 class Digest {
-	
-	public static function make( data : haxe.io.Bytes, alg : DigestAlgorithm ) : haxe.io.Bytes {
+	public static function make(data:haxe.io.Bytes, alg:DigestAlgorithm):haxe.io.Bytes {
 		var size = 0;
-		var b = @:privateAccess dgst_make( data.b, data.length, (alg:String).toUtf8(), size );
-		return @:privateAccess new haxe.io.Bytes(b,size);
+		var b = @:privateAccess dgst_make(data.b, data.length, (alg : String).toUtf8(), size);
+		return @:privateAccess new haxe.io.Bytes(b, size);
 	}
-	
-	public static function sign( data : haxe.io.Bytes, privKey : Key, alg : DigestAlgorithm ) : haxe.io.Bytes {
+
+	public static function sign(data:haxe.io.Bytes, privKey:Key, alg:DigestAlgorithm):haxe.io.Bytes {
 		var size = 0;
-		var b = @:privateAccess dgst_sign( data.b, data.length, privKey.__k, (alg:String).toUtf8(), size );
-		return @:privateAccess new haxe.io.Bytes(b,size);
+		var b = @:privateAccess dgst_sign(data.b, data.length, privKey.__k, (alg : String).toUtf8(), size);
+		return @:privateAccess new haxe.io.Bytes(b, size);
 	}
-	
-	public static function verify( data : haxe.io.Bytes, signature : haxe.io.Bytes, pubKey : Key, alg : DigestAlgorithm ) : Bool{
-		return @:privateAccess dgst_verify( data.b, data.length, signature.b, signature.length, pubKey.__k, (alg:String).toUtf8() );
+
+	public static function verify(data:haxe.io.Bytes, signature:haxe.io.Bytes, pubKey:Key, alg:DigestAlgorithm):Bool {
+		return @:privateAccess dgst_verify(data.b, data.length, signature.b, signature.length, pubKey.__k, (alg : String).toUtf8());
 	}
 
-	@:hlNative("ssl","dgst_make") static function dgst_make( data : hl.Bytes, len : Int, alg : hl.Bytes, size : hl.Ref<Int> ) : hl.Bytes { return null; }
-	@:hlNative("ssl","dgst_sign") static function dgst_sign( data : hl.Bytes, len : Int, key : sys.ssl.Key.KeyPtr, alg : hl.Bytes, size : hl.Ref<Int> ) : hl.Bytes { return null; }
-	@:hlNative("ssl","dgst_verify") static function dgst_verify( data : hl.Bytes, dlen : Int, sign : hl.Bytes, slen : Int, key : sys.ssl.Key.KeyPtr, alg : hl.Bytes ) : Bool { return false; }
-	
+	@:hlNative("ssl", "dgst_make") static function dgst_make(data:hl.Bytes, len:Int, alg:hl.Bytes, size:hl.Ref<Int>):hl.Bytes {
+		return null;
+	}
+
+	@:hlNative("ssl", "dgst_sign") static function dgst_sign(data:hl.Bytes, len:Int, key:sys.ssl.Key.KeyPtr, alg:hl.Bytes, size:hl.Ref<Int>):hl.Bytes {
+		return null;
+	}
+
+	@:hlNative("ssl", "dgst_verify") static function dgst_verify(data:hl.Bytes, dlen:Int, sign:hl.Bytes, slen:Int, key:sys.ssl.Key.KeyPtr, alg:hl.Bytes):Bool {
+		return false;
+	}
 }
diff --git a/std/hl/_std/sys/ssl/Key.hx b/std/hl/_std/sys/ssl/Key.hx
index 1d62628fbe7df1acbbcaabdf7b936e068e3b5ac5..240d82d44fd4f97cacd3d8e972ec1b2be12e181e 100644
--- a/std/hl/_std/sys/ssl/Key.hx
+++ b/std/hl/_std/sys/ssl/Key.hx
@@ -1,4 +1,27 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
+
 import sys.ssl.Lib;
 
 @:noDoc
@@ -6,31 +29,34 @@ typedef KeyPtr = hl.Abstract<"hl_ssl_pkey">;
 
 @:coreApi
 class Key {
-	
-	private var __k : KeyPtr;
+	private var __k:KeyPtr;
 
-	private function new( k : KeyPtr ){
+	private function new(k:KeyPtr) {
 		__k = k;
 	}
-	
-	public static function loadFile( file : String, ?isPublic : Bool, ?pass : String ) : Key {
-		var data = sys.io.File.getBytes( file );
-		var start = data.getString(0,11);
-		if( start == "-----BEGIN " )
-			return readPEM( data.toString(), isPublic==true, pass );
+
+	public static function loadFile(file:String, ?isPublic:Bool, ?pass:String):Key {
+		var data = sys.io.File.getBytes(file);
+		var start = data.getString(0, 11);
+		if (start == "-----BEGIN ")
+			return readPEM(data.toString(), isPublic == true, pass);
 		else
-			return readDER( data, isPublic==true );
+			return readDER(data, isPublic == true);
 	}
-	
-	public static function readPEM( data : String, isPublic : Bool, ?pass : String ) : Key {
-		return new Key( key_from_pem( @:privateAccess data.toUtf8(), isPublic, pass == null ? null : @:privateAccess pass.toUtf8() ) );
+
+	public static function readPEM(data:String, isPublic:Bool, ?pass:String):Key {
+		return new Key(key_from_pem(@:privateAccess data.toUtf8(), isPublic, pass == null ? null : @:privateAccess pass.toUtf8()));
 	}
 
-	public static function readDER( data : haxe.io.Bytes, isPublic : Bool ) : Key {
-		return new Key( key_from_der( @:privateAccess data.b, @:privateAccess data.length, isPublic ) );
+	public static function readDER(data:haxe.io.Bytes, isPublic:Bool):Key {
+		return new Key(key_from_der(@:privateAccess data.b, @:privateAccess data.length, isPublic));
 	}
 
-	@:hlNative("ssl","key_from_pem") static function key_from_pem( data : hl.Bytes, pub : Bool, pass : Null<hl.Bytes> ) : KeyPtr { return null; }
-	@:hlNative("ssl","key_from_der") static function key_from_der( data : hl.Bytes, len : Int, pub : Bool ) : KeyPtr { return null; }
+	@:hlNative("ssl", "key_from_pem") static function key_from_pem(data:hl.Bytes, pub:Bool, pass:Null<hl.Bytes>):KeyPtr {
+		return null;
+	}
 
+	@:hlNative("ssl", "key_from_der") static function key_from_der(data:hl.Bytes, len:Int, pub:Bool):KeyPtr {
+		return null;
+	}
 }
diff --git a/std/hl/_std/sys/ssl/Lib.hx b/std/hl/_std/sys/ssl/Lib.hx
index c501b64736ff37022c710c47857183fbfd13b15c..5e6fc0543602f55e9cc0c5a50d13de51fbc38c1d 100644
--- a/std/hl/_std/sys/ssl/Lib.hx
+++ b/std/hl/_std/sys/ssl/Lib.hx
@@ -1,10 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
 
 @:noDoc @:keep
 class Lib {
-	static function __init__() : Void{
+	static function __init__():Void {
 		ssl_init();
 	}
-	
-	@:hlNative("ssl","ssl_init") static function ssl_init(){};
+
+	@:hlNative("ssl", "ssl_init") static function ssl_init() {};
 }
diff --git a/std/hl/_std/sys/ssl/Socket.hx b/std/hl/_std/sys/ssl/Socket.hx
index 70f9f5a632b071dd6846566c21dd45621e674d15..c232fc233925bd060676b8f618e2ae9063ee7004 100644
--- a/std/hl/_std/sys/ssl/Socket.hx
+++ b/std/hl/_std/sys/ssl/Socket.hx
@@ -1,197 +1,215 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
+
 import sys.ssl.Lib;
 import sys.ssl.Key.KeyPtr;
 import sys.ssl.Certificate.CertificatePtr;
 import sys.net.Socket.SocketHandle;
 
-private typedef ConfigPtr = hl.Abstract<"mbedtls_ssl_config">;
-private typedef ContextPtr = hl.Abstract<"mbedtls_ssl_context">;
-
-@:keep
-private class SNICbResult {
-	public var cert : CertificatePtr;
-	public var key : KeyPtr; 
-	public function new( cert : Certificate, key : Key ){
-		this.cert = @:privateAccess cert.__x;
-		this.key = @:privateAccess key.__k;
-	}
-}
-
 private class SocketInput extends haxe.io.Input {
-	@:allow(sys.ssl.Socket) private var __s : Socket;
+	@:allow(sys.ssl.Socket) private var __s:Socket;
 
-	public function new( s : Socket ) {
+	public function new(s:Socket) {
 		this.__s = s;
 	}
 
 	public override function readByte() {
 		__s.handshake();
-		var r = ssl_recv_char( @:privateAccess __s.ssl );
-		if( r == -1 )
+		var r = @:privateAccess __s.ssl.recvChar();
+		if (r == -1)
 			throw haxe.io.Error.Blocked;
-		else if( r < 0 )
+		else if (r < 0)
 			throw new haxe.io.Eof();
 		return r;
 	}
 
-	public override function readBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) : Int {
+	public override function readBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
+		if (pos < 0 || len < 0 || ((pos + len) : UInt) > (buf.length : UInt))
+			throw haxe.io.Error.OutsideBounds;
 		__s.handshake();
-		var r = ssl_recv(  @:privateAccess __s.ssl, @:privateAccess buf.b, pos, len );
-		if( r == -1 )
+		var r = @:privateAccess __s.ssl.recv(buf, pos, len);
+		if (r == -1)
 			throw haxe.io.Error.Blocked;
-		else if( r < 0 )
+		else if (r <= 0)
 			throw new haxe.io.Eof();
 		return r;
 	}
 
 	public override function close() {
 		super.close();
-		if( __s != null ) __s.close();
+		if (__s != null)
+			__s.close();
 	}
-	
-	@:hlNative("ssl","ssl_recv") static function ssl_recv( ssl : ContextPtr, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return -1; }
-	@:hlNative("ssl","ssl_recv_char") static function ssl_recv_char( ssl : ContextPtr ) : Int { return -1; }
 }
 
 private class SocketOutput extends haxe.io.Output {
-	@:allow(sys.ssl.Socket) private var __s : Socket;
+	@:allow(sys.ssl.Socket) private var __s:Socket;
 
-	public function new( s : Socket ) {
+	public function new(s:Socket) {
 		this.__s = s;
 	}
 
-	public override function writeByte( c : Int ) {
+	public override function writeByte(c:Int) {
 		__s.handshake();
-		var r = ssl_send_char( @:privateAccess __s.ssl, c);
-		if( r == -1 )
+		var r = @:privateAccess __s.ssl.sendChar(c);
+		if (r == -1)
 			throw haxe.io.Error.Blocked;
-		else if( r < 0 )
+		else if (r < 0)
 			throw new haxe.io.Eof();
 	}
 
-	public override function writeBytes( buf : haxe.io.Bytes, pos : Int, len : Int) : Int {
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
+		if (pos < 0 || len < 0 || ((pos + len) : UInt) > (buf.length : UInt))
+			throw haxe.io.Error.OutsideBounds;
 		__s.handshake();
-		var r = ssl_send( @:privateAccess __s.ssl, @:privateAccess buf.b, pos, len);
-		if( r == -1 )
+		var r = @:privateAccess __s.ssl.send(buf, pos, len);
+		if (r == -1)
 			throw haxe.io.Error.Blocked;
-		else if( r < 0 )
+		else if (r < 0)
 			throw new haxe.io.Eof();
 		return r;
 	}
 
 	public override function close() {
 		super.close();
-		if( __s != null ) __s.close();
+		if (__s != null)
+			__s.close();
 	}
-
-	@:hlNative("ssl","ssl_send") static function ssl_send( ssl : ContextPtr, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return -1; }
-	@:hlNative("ssl","ssl_send_char") static function ssl_send_char( ssl : ContextPtr, c : Int ) : Int { return -1; }
-
 }
 
 @:coreApi @:access(sys.net.Socket)
 class Socket extends sys.net.Socket {
-	
-	public static var DEFAULT_VERIFY_CERT : Null<Bool> = true;
-
-	public static var DEFAULT_CA : Null<Certificate>;
-	
-	private var conf : ConfigPtr;
-	private var ssl : ContextPtr;
-	
-	public var verifyCert : Null<Bool>;
-	private var caCert : Null<Certificate>;
-	private var hostname : String;
-
-	private var ownCert : Null<Certificate>;
-	private var ownKey : Null<Key>;
-	private var altSNIContexts : Null<Array<{match: String->Bool, key: Key, cert: Certificate}>>;
-	private var sniCallback : hl.Bytes -> SNICbResult;
-	private var handshakeDone : Bool;
-
-	private override function init() : Void {
-		__s = sys.net.Socket.socket_new( false );
-		input = new SocketInput( this );
-		output = new SocketOutput( this );
-		if( DEFAULT_VERIFY_CERT && DEFAULT_CA == null ){
+	public static var DEFAULT_VERIFY_CERT:Null<Bool> = true;
+
+	public static var DEFAULT_CA:Null<Certificate>;
+
+	private var conf:Context.Config;
+	private var ssl:Context;
+
+	public var verifyCert:Null<Bool>;
+
+	private var caCert:Null<Certificate>;
+	private var hostname:String;
+
+	private var ownCert:Null<Certificate>;
+	private var ownKey:Null<Key>;
+	private var altSNIContexts:Null<Array<{match:String->Bool, key:Key, cert:Certificate}>>;
+	private var sniCallback:hl.Bytes->Context.SNICbResult;
+	private var handshakeDone:Bool;
+	private var isBlocking:Bool = true;
+
+	private override function init():Void {
+		__s = sys.net.Socket.socket_new(false);
+		input = new SocketInput(this);
+		output = new SocketOutput(this);
+		if (DEFAULT_VERIFY_CERT && DEFAULT_CA == null) {
 			try {
 				DEFAULT_CA = Certificate.loadDefaults();
-			}catch( e : Dynamic ){}
+			} catch (e:Dynamic) {}
 		}
 		verifyCert = DEFAULT_VERIFY_CERT;
 		caCert = DEFAULT_CA;
 	}
 
-	public override function connect(host : sys.net.Host, port : Int) : Void {
-		conf = buildConfig( false );
-		ssl = ssl_new( conf );
-		ssl_set_socket( ssl, __s );
+	public override function connect(host:sys.net.Host, port:Int):Void {
+		conf = buildConfig(false);
+		ssl = new Context(conf);
+		ssl.setSocket(__s);
 		handshakeDone = false;
-		if( hostname == null )
+		if (hostname == null)
 			hostname = host.host;
-		if( hostname != null )
-			ssl_set_hostname( ssl, @:privateAccess hostname.toUtf8() );
-		if( !sys.net.Socket.socket_connect( __s, host.ip, port ) )
-			throw new Sys.SysError("Failed to connect on "+host.toString()+":"+port);
-		handshake();
-	}
-
-	public function handshake() : Void {
-		if( !handshakeDone ){
-			var r = ssl_handshake( ssl );
-			if( r == 0 )
+		if (hostname != null)
+			ssl.setHostname(@:privateAccess hostname.toUtf8());
+		if (!sys.net.Socket.socket_connect(__s, host.ip, port))
+			throw new Sys.SysError("Failed to connect on " + host.toString() + ":" + port);
+		if (isBlocking)
+			handshake();
+	}
+
+	public function handshake():Void {
+		if (!handshakeDone) {
+			var r = ssl.handshake();
+			if (r == 0)
 				handshakeDone = true;
-			else if( r == -1 )
+			else if (r == -1)
 				throw haxe.io.Error.Blocked;
 			else
 				throw new haxe.io.Eof();
 		}
 	}
 
-	public function setCA( cert : Certificate ) : Void {
+	override function setBlocking(b:Bool):Void {
+		super.setBlocking(b);
+		isBlocking = b;
+	}
+
+	public function setCA(cert:Certificate):Void {
 		caCert = cert;
 	}
 
-	public function setHostname( name : String ) : Void {
+	public function setHostname(name:String):Void {
 		hostname = name;
 	}
 
-	public function setCertificate( cert : Certificate, key : Key ) : Void {
+	public function setCertificate(cert:Certificate, key:Key):Void {
 		ownCert = cert;
 		ownKey = key;
 	}
 
-	public override function close() : Void {
-		if( ssl != null ) ssl_close( ssl );
-		if( conf != null ) conf_close( conf );
-		if( altSNIContexts != null )
+	public override function close():Void {
+		if (ssl != null)
+			ssl.close();
+		if (conf != null)
+			conf.close();
+		if (altSNIContexts != null)
 			sniCallback = null;
-		sys.net.Socket.socket_close( __s );
-		var input : SocketInput = cast input;
-		var output : SocketOutput = cast output;
+		sys.net.Socket.socket_close(__s);
+		var input:SocketInput = cast input;
+		var output:SocketOutput = cast output;
 		@:privateAccess input.__s = output.__s = null;
 		input.close();
 		output.close();
 	}
 
-	public function addSNICertificate( cbServernameMatch : String->Bool, cert : Certificate, key : Key ) : Void {
-		if( altSNIContexts == null )
+	public function addSNICertificate(cbServernameMatch:String->Bool, cert:Certificate, key:Key):Void {
+		if (altSNIContexts == null)
 			altSNIContexts = [];
-		altSNIContexts.push( {match: cbServernameMatch, cert: cert, key: key} );
+		altSNIContexts.push({match: cbServernameMatch, cert: cert, key: key});
 	}
 
-	public override function bind( host : sys.net.Host, port : Int ) : Void {
-		conf = buildConfig( true );
+	public override function bind(host:sys.net.Host, port:Int):Void {
+		conf = buildConfig(true);
 
-		sys.net.Socket.socket_bind( __s, host.ip, port );
+		sys.net.Socket.socket_bind(__s, host.ip, port);
 	}
 
-	public override function accept() : Socket {
-		var c = sys.net.Socket.socket_accept( __s );
-		var cssl = ssl_new( conf );
-		ssl_set_socket( cssl, c );
+	public override function accept():Socket {
+		var c = sys.net.Socket.socket_accept(__s);
+		var cssl = new Context(conf);
+		cssl.setSocket(c);
 
-		var s = Type.createEmptyInstance( sys.ssl.Socket );
+		var s = Type.createEmptyInstance(sys.ssl.Socket);
 		s.__s = c;
 		s.ssl = cssl;
 		s.input = new SocketInput(s);
@@ -201,51 +219,35 @@ class Socket extends sys.net.Socket {
 		return s;
 	}
 
-	public function peerCertificate() : sys.ssl.Certificate {
-		var x = ssl_get_peer_certificate( ssl );
-		return x==null ? null : new sys.ssl.Certificate( x );
+	public function peerCertificate():sys.ssl.Certificate {
+		var x = ssl.getPeerCertificate();
+		return x == null ? null : new sys.ssl.Certificate(x);
 	}
 
-	private function buildConfig( server : Bool ) : ConfigPtr {
-		var conf = conf_new( server );
+	private function buildConfig(server:Bool):Context.Config {
+		var conf = new Context.Config(server);
 
-		if( ownCert != null && ownKey != null )
-			conf_set_cert( conf, @:privateAccess ownCert.__x, @:privateAccess ownKey.__k );
+		if (ownCert != null && ownKey != null)
+			conf.setCert(@:privateAccess ownCert.__x, @:privateAccess ownKey.__k);
 
-		if ( altSNIContexts != null ) {
-			sniCallback = function(servername:hl.Bytes) : SNICbResult {
+		if (altSNIContexts != null) {
+			sniCallback = function(servername:hl.Bytes):Context.SNICbResult {
 				var servername = @:privateAccess String.fromUTF8(servername);
-				for( c in altSNIContexts ){
-					if( c.match(servername) )
-						return new SNICbResult(c.cert, c.key);
+				for (c in altSNIContexts) {
+					if (c.match(servername))
+						return new Context.SNICbResult(c.cert, c.key);
 				}
-				if( ownKey != null && ownCert != null )
-					return new SNICbResult(ownCert, ownKey);
+				if (ownKey != null && ownCert != null)
+					return new Context.SNICbResult(ownCert, ownKey);
 				return null;
 			}
-			conf_set_servername_callback( conf, sniCallback );
+			conf.setServernameCallback(sniCallback);
 		}
 
-		if ( caCert != null ) 
-			conf_set_ca( conf, caCert == null ? null : @:privateAccess caCert.__x  );
-		conf_set_verify( conf, if( verifyCert ) 1 else if( verifyCert==null ) 2 else 0 );
-		
+		if (caCert != null)
+			conf.setCa(caCert == null ? null : @:privateAccess caCert.__x);
+		conf.setVerify(if (verifyCert) 1 else if (verifyCert == null) 2 else 0);
+
 		return conf;
 	}
-	
-	
-	@:hlNative("ssl","ssl_new") static function ssl_new( conf : ConfigPtr ) : ContextPtr { return null; }
-	@:hlNative("ssl","ssl_close") static function ssl_close( ssl : ContextPtr ) : Void {}
-	@:hlNative("ssl","ssl_handshake") static function ssl_handshake( ssl : ContextPtr ) : Int { return -1; }
-	@:hlNative("ssl","ssl_set_socket") static function ssl_set_socket( ssl : ContextPtr, socket : SocketHandle ) : Void { }
-	@:hlNative("ssl","ssl_set_hostname") static function ssl_set_hostname( ssl : ContextPtr, name : hl.Bytes ) : Void { }
-	@:hlNative("ssl","ssl_get_peer_certificate") static function ssl_get_peer_certificate( ssl : ContextPtr ) : CertificatePtr { return null; }
-	
-	@:hlNative("ssl","conf_new") static function conf_new( server : Bool ) : ConfigPtr { return null; }
-	@:hlNative("ssl","conf_close") static function conf_close( conf : ConfigPtr ) : Void { }
-	@:hlNative("ssl","conf_set_ca") static function conf_set_ca( conf : ConfigPtr, ca : CertificatePtr ) : Void { }
-	@:hlNative("ssl","conf_set_verify") static function conf_set_verify( conf : ConfigPtr, mode : Int ) : Void { }
-	@:hlNative("ssl","conf_set_cert") static function conf_set_cert( conf : ConfigPtr, cert : CertificatePtr, pkey : KeyPtr ) : Void { }
-	@:hlNative("ssl","conf_set_servername_callback") static function conf_set_servername_callback( conf : ConfigPtr, cb : hl.Bytes -> SNICbResult ) : Void { }
-	
 }
diff --git a/std/hl/_std/sys/thread/Deque.hx b/std/hl/_std/sys/thread/Deque.hx
new file mode 100644
index 0000000000000000000000000000000000000000..eb71312e91df6f3c7a5b30b263f0e7dbe3dce6de
--- /dev/null
+++ b/std/hl/_std/sys/thread/Deque.hx
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+#if doc_gen
+@:coreApi extern class Deque<T> {
+	public function new():Void;
+	public function add(i:T):Void;
+	public function push(i:T):Void;
+	public function pop(block:Bool):Null<T>;
+}
+#else
+
+@:hlNative("std", "deque_")
+abstract Deque<T>(hl.Abstract<"hl_deque">) {
+	public function new() {
+		this = alloc();
+	}
+
+	public function add(i:T) {}
+
+	public function push(i:T) {}
+
+	public function pop(block:Bool):Null<T> {
+		return null;
+	}
+
+	static function alloc() {
+		return null;
+	}
+}
+#end
diff --git a/std/hl/_std/sys/thread/Lock.hx b/std/hl/_std/sys/thread/Lock.hx
new file mode 100644
index 0000000000000000000000000000000000000000..372719ab057cf5c287a3a62e3a92a2a3f6574422
--- /dev/null
+++ b/std/hl/_std/sys/thread/Lock.hx
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:coreApi
+class Lock {
+	var deque:sys.thread.Deque<Bool>;
+
+	public function new():Void {
+		deque = new Deque<Null<Bool>>();
+	}
+
+	public function wait(?timeout:Float):Bool {
+		if (timeout == null) {
+			deque.pop(true);
+			return true;
+		}
+		var targetTime = haxe.Timer.stamp() + timeout;
+		do {
+			if (deque.pop(false) != null) {
+				return true;
+			}
+		} while (haxe.Timer.stamp() < targetTime);
+		return false;
+	}
+
+	public function release():Void {
+		deque.push(true);
+	}
+}
diff --git a/std/hl/_std/sys/thread/Mutex.hx b/std/hl/_std/sys/thread/Mutex.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cc37e1aca7188ebcb4a79b88dcb0dfae924af63a
--- /dev/null
+++ b/std/hl/_std/sys/thread/Mutex.hx
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+#if doc_gen
+@:coreApi
+extern class Mutex {
+	public function new():Void;
+	public function acquire():Void;
+	public function tryAcquire():Bool;
+	public function release():Void;
+}
+#else
+
+abstract Mutex(hl.Abstract<"hl_mutex">) {
+	public function new() {
+		this = alloc(true);
+	}
+
+	@:hlNative("std", "mutex_acquire") public function acquire() {}
+
+	@:hlNative("std", "mutex_try_acquire") public function tryAcquire():Bool {
+		return false;
+	}
+
+	@:hlNative("std", "mutex_release") public function release() {}
+
+	@:hlNative("std", "mutex_alloc") public static function alloc(b:Bool) {
+		return null;
+	}
+}
+#end
diff --git a/std/hl/_std/sys/thread/Thread.hx b/std/hl/_std/sys/thread/Thread.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4e34dc82534eccbbf4f0f1e0cd7aac23d75b2e2f
--- /dev/null
+++ b/std/hl/_std/sys/thread/Thread.hx
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+typedef ThreadHandle = hl.Abstract<"hl_thread">;
+
+abstract Thread(ThreadHandle) {
+	public function sendMessage(msg:Dynamic) {
+		getQueue(this).add(msg);
+	}
+
+	public static function readMessage(block = true):Dynamic {
+		return getQueue(cast current()).pop(block);
+	}
+
+	static var queue_mutex:Mutex = null;
+	static var threads_queues:Array<{t:ThreadHandle, q:Deque<Dynamic>}> = null;
+
+	static function getQueue(t:ThreadHandle) {
+		if (queue_mutex == null) {
+			queue_mutex = new Mutex();
+			threads_queues = [];
+		}
+		queue_mutex.acquire();
+		var q = null;
+		for (tq in threads_queues)
+			if (tq.t == t) {
+				q = tq.q;
+				break;
+			}
+		if (q == null) {
+			q = new Deque<Dynamic>();
+			threads_queues.push({t: t, q: q});
+		}
+		queue_mutex.release();
+		return q;
+	}
+
+	@:hlNative("std", "thread_create")
+	public static function create(callb:Void->Void):Thread {
+		return null;
+	}
+
+	@:hlNative("std", "thread_current")
+	public static function current():Thread {
+		return null;
+	}
+}
diff --git a/std/php7/_std/haxe/zip/Uncompress.hx b/std/hl/_std/sys/thread/Tls.hx
similarity index 66%
rename from std/php7/_std/haxe/zip/Uncompress.hx
rename to std/hl/_std/sys/thread/Tls.hx
index 1a16bcb2cce906f03999da92775fd780c25b57cc..bfc894ce2cd08279b70df507db76f3ed8a1b0af2 100644
--- a/std/php7/_std/haxe/zip/Uncompress.hx
+++ b/std/hl/_std/sys/thread/Tls.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2012 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,27 +19,40 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.zip;
 
-class Uncompress {
+package sys.thread;
 
-	public function new( ?windowBits : Int ) {
-		throw "Not implemented for this platform";
-	}
+#if doc_gen
+@:coreApi
+extern class Tls<T> {
+	public var value(get, set):T;
+	public function new():Void;
+}
+#else
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
-		return null;
-	}
+@:hlNative("std")
+abstract Tls<T>(hl.Abstract<"hl_tls">) {
+	public var value(get, set):T;
 
-	public function setFlushMode( f : FlushMode ) {
+	public function new() {
+		this = tls_alloc(true);
 	}
 
-	public function close() {
+	function get_value():T {
+		return tls_get(this);
 	}
 
-	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
-		var c = untyped __call__("gzuncompress", src.toString());
-		return haxe.io.Bytes.ofString(c);
+	function set_value(v:T) {
+		tls_set(this, v);
+		return v;
 	}
 
+	static function tls_alloc(gcValue:Bool)
+		return null;
+
+	static function tls_get(t):Dynamic
+		return null;
+
+	static function tls_set(t, v:Dynamic) {}
 }
+#end
diff --git a/std/hl/hl_version b/std/hl/hl_version
new file mode 100644
index 0000000000000000000000000000000000000000..ed21137ee1970b2255c60274f8dcecbe63794ba1
--- /dev/null
+++ b/std/hl/hl_version
@@ -0,0 +1 @@
+1.10.0
\ No newline at end of file
diff --git a/std/hl/types/ArrayBase.hx b/std/hl/types/ArrayBase.hx
index 1683850fe5fa25b6b727ed2d745e6c100e675c43..5b89e2954a70a4f6958586d370c7aa4997834ad4 100644
--- a/std/hl/types/ArrayBase.hx
+++ b/std/hl/types/ArrayBase.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,75 +19,72 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl.types;
 
 @:keep
 class ArrayAccess {
-
-	public function getDyn( pos : Int ) : Dynamic {
+	public function getDyn(pos:Int):Dynamic {
 		throw "Not implemented";
 		return 0;
 	}
 
-	public function setDyn( pos : Int, v : Dynamic ) {
+	public function setDyn(pos:Int, v:Dynamic) {
 		throw "Not implemented";
 	}
 
-	public function blit( pos : Int, src : ArrayAccess, srcpos : Int, len : Int ) : Void {
+	public function blit(pos:Int, src:ArrayAccess, srcpos:Int, len:Int):Void {
 		throw "Not implemented";
 	}
-
 }
 
 @:keep
 class ArrayBase extends ArrayAccess {
+	public var length(default, null):Int;
 
-	public var length(default,null) : Int;
-
-
-	public function pushDyn( v : Dynamic ) : Int {
+	public function pushDyn(v:Dynamic):Int {
 		throw "Not implemented";
 		return 0;
 	}
 
-	public function popDyn() : Null<Dynamic> {
+	public function popDyn():Null<Dynamic> {
 		throw "Not implemented";
 		return null;
 	}
 
-	public function shiftDyn() : Null<Dynamic> {
+	public function shiftDyn():Null<Dynamic> {
 		throw "Not implemented";
 		return null;
 	}
 
-	public function unshiftDyn( v : Dynamic ) : Void {
+	public function unshiftDyn(v:Dynamic):Void {
 		throw "Not implemented";
 	}
 
-	public function insertDyn( pos : Int, v : Dynamic ) : Void {
+	public function insertDyn(pos:Int, v:Dynamic):Void {
 		throw "Not implemented";
 	}
 
-	public function removeDyn( v : Dynamic ) : Bool {
+	public function removeDyn(v:Dynamic):Bool {
 		throw "Not implemented";
 		return false;
 	}
 
-	public function sortDyn( f : Dynamic -> Dynamic -> Int ) : Void {
+	public function sortDyn(f:Dynamic->Dynamic->Int):Void {
 		throw "Not implemented";
 	}
 
-	public function slice( pos : Int, ?end : Int ) : ArrayBase{
+	public function slice(pos:Int, ?end:Int):ArrayBase {
 		throw "Not implemented";
 		return null;
 	}
 
-	public function splice( pos : Int, len : Int ) : ArrayBase{
+	public function splice(pos:Int, len:Int):ArrayBase {
 		throw "Not implemented";
 		return null;
 	}
 
-	public function join( sep : String ) : String {
+	public function join(sep:String):String {
 		throw "Not implemented";
 		return null;
 	}
@@ -96,13 +93,17 @@ class ArrayBase extends ArrayAccess {
 		throw "Not implemented";
 	}
 
-	public function toString() : String {
+	public function resize(len:Int) {
+		throw "Not implemented";
+	}
+
+	public function toString():String {
 		throw "Not implemented";
 		return null;
 	}
 
-	function __cast( t : Type ) : Dynamic {
-		if( t == Type.get(new ArrayDyn()) )
+	function __cast(t:Type):Dynamic {
+		if (t == Type.get((null : ArrayDyn)))
 			return ArrayDyn.alloc(this, false);
 		return null;
 	}
@@ -111,36 +112,35 @@ class ArrayBase extends ArrayAccess {
 		return false;
 	}
 
-	public static function allocI32( bytes : BytesAccess<Int>, length : Int ) @:privateAccess {
-		var a : ArrayBytes.ArrayI32 = untyped $new(ArrayBytes.ArrayI32);
+	public static function allocI32(bytes:BytesAccess<Int>, length:Int) @:privateAccess {
+		var a:ArrayBytes.ArrayI32 = untyped $new(ArrayBytes.ArrayI32);
 		a.length = length;
 		a.bytes = bytes;
 		a.size = length;
 		return a;
 	}
 
-	public static function allocUI16( bytes : BytesAccess<UI16>, length : Int ) @:privateAccess {
-		var a : ArrayBytes.ArrayUI16 = untyped $new(ArrayBytes.ArrayUI16);
+	public static function allocUI16(bytes:BytesAccess<UI16>, length:Int) @:privateAccess {
+		var a:ArrayBytes.ArrayUI16 = untyped $new(ArrayBytes.ArrayUI16);
 		a.length = length;
 		a.bytes = bytes;
 		a.size = length;
 		return a;
 	}
 
-	public static function allocF32( bytes : BytesAccess<F32>, length : Int ) @:privateAccess {
-		var a : ArrayBytes.ArrayF32 = untyped $new(ArrayBytes.ArrayF32);
+	public static function allocF32(bytes:BytesAccess<F32>, length:Int) @:privateAccess {
+		var a:ArrayBytes.ArrayF32 = untyped $new(ArrayBytes.ArrayF32);
 		a.length = length;
 		a.bytes = bytes;
 		a.size = length;
 		return a;
 	}
 
-	public static function allocF64( bytes : BytesAccess<Float>, length : Int ) @:privateAccess {
-		var a : ArrayBytes.ArrayF64 = untyped $new(ArrayBytes.ArrayF64);
+	public static function allocF64(bytes:BytesAccess<Float>, length:Int) @:privateAccess {
+		var a:ArrayBytes.ArrayF64 = untyped $new(ArrayBytes.ArrayF64);
 		a.length = length;
 		a.bytes = bytes;
 		a.size = length;
 		return a;
 	}
-
 }
diff --git a/std/hl/types/ArrayBytes.hx b/std/hl/types/ArrayBytes.hx
index 197434fd0c05b3d9b89f04a36a50e446b606333f..20cf96c0068132c223ab61418cd74a46b5506375 100644
--- a/std/hl/types/ArrayBytes.hx
+++ b/std/hl/types/ArrayBytes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,64 +19,68 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl.types;
 
 @:keep
 @:generic
 class BytesIterator<T> {
-	var pos : Int;
-	var a : ArrayBytes<T>;
+	var pos:Int;
+	var a:ArrayBytes<T>;
+
 	public function new(a) {
 		this.a = a;
 	}
+
 	public function hasNext() {
 		return pos < a.length;
 	}
-	public function next() : T {
+
+	public function next():T {
 		return @:privateAccess a.bytes.get(pos++);
 	}
 }
 
 @:keep
 @:generic class ArrayBytes<T> extends ArrayBase {
-
-	var bytes : hl.BytesAccess<T>;
-	var size : Int;
+	var bytes:hl.BytesAccess<T>;
+	var size:Int;
 
 	public function new() {
 		size = length = 0;
 		bytes = null;
 	}
 
-	public function concat( a : ArrayBytes<T> ) : ArrayBytes<T> {
+	public function concat(a:ArrayBytes<T>):ArrayBytes<T> {
 		var ac = new ArrayBytes<T>();
 		ac.length = ac.size = length + a.length;
 		ac.bytes = new Bytes(ac.length << bytes.sizeBits);
 		var offset = length << bytes.sizeBits;
-		(ac.bytes:Bytes).blit(0, this.bytes, 0, offset);
-		(ac.bytes:Bytes).blit(offset, a.bytes, 0, a.length << bytes.sizeBits);
+		(ac.bytes : Bytes).blit(0, this.bytes, 0, offset);
+		(ac.bytes : Bytes).blit(offset, a.bytes, 0, a.length << bytes.sizeBits);
 		return ac;
 	}
 
-	override function join( sep : String ) : String {
+	override function join(sep:String):String {
 		var s = new StringBuf();
-		for( i in 0...length ) {
-			if( i > 0 ) s.add(sep);
+		for (i in 0...length) {
+			if (i > 0)
+				s.add(sep);
 			s.add(bytes[i]);
 		}
 		return s.toString();
 	}
 
-	public function pop() : Null<T> {
-		if( length == 0 )
+	public function pop():Null<T> {
+		if (length == 0)
 			return null;
 		length--;
 		return bytes[length];
 	}
 
-	public function push(x : T) : Int {
+	public function push(x:T):Int {
 		var len = length;
-		if( size == len )
+		if (size == len)
 			__expand(len);
 		else
 			length++;
@@ -84,8 +88,8 @@ class BytesIterator<T> {
 		return length;
 	}
 
-	override function reverse() : Void {
-		for( i in 0...length >> 1 ) {
+	override function reverse():Void {
+		for (i in 0...length >> 1) {
 			var k = length - 1 - i;
 			var tmp = bytes[i];
 			bytes[i] = bytes[k];
@@ -93,199 +97,238 @@ class BytesIterator<T> {
 		}
 	}
 
-	public function shift() : Null<T> {
-		if( length == 0 )
+	public function shift():Null<T> {
+		if (length == 0)
 			return null;
 		var v = bytes[0];
 		length--;
-		(bytes:Bytes).blit(0, bytes, 1 << bytes.sizeBits, length << bytes.sizeBits);
+		(bytes : Bytes).blit(0, bytes, 1 << bytes.sizeBits, length << bytes.sizeBits);
 		return v;
 	}
 
-	override function blit( pos : Int, src : ArrayBase.ArrayAccess, srcpos : Int, len : Int ) : Void {
+	override function blit(pos:Int, src:ArrayBase.ArrayAccess, srcpos:Int, len:Int):Void {
 		var src = (cast src : ArrayBytes<T>);
-		if( pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length ) throw haxe.io.Error.OutsideBounds;
-		(bytes:Bytes).blit(pos << bytes.sizeBits,src.bytes,srcpos<<bytes.sizeBits,len<<bytes.sizeBits);
+		if (pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length)
+			throw haxe.io.Error.OutsideBounds;
+		(bytes : Bytes).blit(pos << bytes.sizeBits, src.bytes, srcpos << bytes.sizeBits, len << bytes.sizeBits);
 	}
 
-	override function slice( pos : Int, ?end : Int ) : ArrayBytes<T> {
-		if( pos < 0 ) {
+	override function slice(pos:Int, ?end:Int):ArrayBytes<T> {
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 )
+			if (pos < 0)
 				pos = 0;
 		}
-		var pend : Int;
-		if( end == null )
+		var pend:Int;
+		if (end == null)
 			pend = this.length;
 		else {
 			pend = end;
-			if( pend < 0 )
+			if (pend < 0)
 				pend += this.length;
-			if( pend > this.length )
+			if (pend > this.length)
 				pend = this.length;
 		}
 		var len = pend - pos;
-		if( len < 0 )
+		if (len < 0)
 			return new ArrayBytes<T>();
 		var a = new ArrayBytes<T>();
 		a.length = a.size = len;
-		a.bytes = (bytes:Bytes).sub(pos << bytes.sizeBits, len << bytes.sizeBits);
+		a.bytes = (bytes : Bytes).sub(pos << bytes.sizeBits, len << bytes.sizeBits);
 		return a;
 	}
 
-	public function sort( f : T -> T -> Int ) : Void {
-		if( Type.get((cast null : T)) == Type.get(0) )
-			(bytes:Bytes).sortI32(0, length, cast f);
+	public function sort(f:T->T->Int):Void {
+		if (Type.get((cast null : T)) == Type.get(0))
+			(bytes : Bytes).sortI32(0, length, cast f);
 		else
-			(bytes:Bytes).sortF64(0, length, cast f);
+			(bytes : Bytes).sortF64(0, length, cast f);
 	}
 
-	override function splice( pos : Int, len : Int ) : ArrayBytes<T> {
-		if( len < 0 )
+	override function splice(pos:Int, len:Int):ArrayBytes<T> {
+		if (len < 0)
 			return new ArrayBytes<T>();
-		if( pos < 0 ){
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 ) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
-		if( pos > this.length ) {
+		if (pos > this.length) {
 			pos = 0;
 			len = 0;
-		} else if( pos + len > this.length ) {
+		} else if (pos + len > this.length) {
 			len = this.length - pos;
-			if( len < 0 ) len = 0;
+			if (len < 0)
+				len = 0;
 		}
-		if( len == 0 )
+		if (len == 0)
 			return new ArrayBytes<T>();
 		var ret = new ArrayBytes<T>();
-		ret.bytes = (bytes:Bytes).sub(pos << bytes.sizeBits, len << bytes.sizeBits);
+		ret.bytes = (bytes : Bytes).sub(pos << bytes.sizeBits, len << bytes.sizeBits);
 		ret.size = ret.length = len;
 		var end = pos + len;
-		(bytes:Bytes).blit(pos << bytes.sizeBits, bytes, end << bytes.sizeBits, (length - end) << bytes.sizeBits);
+		(bytes : Bytes).blit(pos << bytes.sizeBits, bytes, end << bytes.sizeBits, (length - end) << bytes.sizeBits);
 		length -= len;
 		return ret;
 	}
 
-	override function toString() : String {
+	override function toString():String {
 		var b = new StringBuf();
 		b.addChar("[".code);
-		for( i in 0...length ) {
-			if( i > 0 ) b.addChar(",".code);
+		for (i in 0...length) {
+			if (i > 0)
+				b.addChar(",".code);
 			b.add(bytes[i]);
 		}
 		b.addChar("]".code);
 		return b.toString();
 	}
 
-	public function unshift( x : T ) : Void {
-		if( length == size ) __expand(length) else length++;
-		(bytes:Bytes).blit(1<<bytes.sizeBits, bytes, 0, (length - 1) << bytes.sizeBits);
+	public function unshift(x:T):Void {
+		if (length == size)
+			__expand(length)
+		else
+			length++;
+		(bytes : Bytes).blit(1 << bytes.sizeBits, bytes, 0, (length - 1) << bytes.sizeBits);
 		bytes[0] = x;
 	}
 
-	public function insert( pos : Int, x : T ) : Void {
-		if( pos < 0 ) {
+	public function insert(pos:Int, x:T):Void {
+		if (pos < 0) {
 			pos = length + pos;
-			if( pos < 0 ) pos = 0;
-		} else if( pos > length ) pos = length;
-		if( length == size ) __expand(length) else length++;
-		(bytes:Bytes).blit((pos + 1)<<bytes.sizeBits, bytes, pos<<bytes.sizeBits, (length - pos - 1) << bytes.sizeBits);
+			if (pos < 0)
+				pos = 0;
+		} else if (pos > length)
+			pos = length;
+		if (length == size)
+			__expand(length)
+		else
+			length++;
+		(bytes : Bytes).blit((pos + 1) << bytes.sizeBits, bytes, pos << bytes.sizeBits, (length - pos - 1) << bytes.sizeBits);
 		bytes[pos] = x;
 	}
 
-	public function remove( x : T ) : Bool {
+	public function remove(x:T):Bool {
 		var idx = indexOf(x);
-		if( idx < 0 )
+		if (idx < 0)
 			return false;
 		length--;
-		(bytes : hl.Bytes).blit(idx<<bytes.sizeBits,bytes,(idx + 1)<<bytes.sizeBits,(length - idx)<<bytes.sizeBits);
+		(bytes : hl.Bytes).blit(idx << bytes.sizeBits, bytes, (idx + 1) << bytes.sizeBits, (length - idx) << bytes.sizeBits);
 		return true;
 	}
 
-	public function indexOf( x : T, ?fromIndex:Int ) : Int {
-		var idx : Int = fromIndex == null ? 0 : fromIndex;
-		if( idx < 0 ) {
+	public function indexOf(x:T, ?fromIndex:Int):Int {
+		var idx:Int = fromIndex == null ? 0 : fromIndex;
+		if (idx < 0) {
 			idx += length;
-			if( idx < 0 ) idx = 0;
+			if (idx < 0)
+				idx = 0;
 		}
-		for( i in idx...length )
-			if( bytes[i] == x )
+		for (i in idx...length)
+			if (bytes[i] == x)
 				return i;
 		return -1;
 	}
 
-	public function lastIndexOf( x : T, ?fromIndex:Int ) : Int {
+	public function lastIndexOf(x:T, ?fromIndex:Int):Int {
 		var len = length;
 		var i:Int = fromIndex != null ? fromIndex : len - 1;
-		if( i >= len )
+		if (i >= len)
 			i = len - 1;
-		else if( i  < 0 )
+		else if (i < 0)
 			i += len;
-		while( i >= 0 ) {
-			if( bytes[i] == x )
+		while (i >= 0) {
+			if (bytes[i] == x)
 				return i;
 			i--;
 		}
 		return -1;
 	}
 
-	public function copy() : ArrayBytes<T> {
+	public function copy():ArrayBytes<T> {
 		var a = new ArrayBytes<T>();
 		a.length = a.size = length;
 		a.bytes = new Bytes(length << bytes.sizeBits);
-		(a.bytes:Bytes).blit(0, bytes, 0, length << bytes.sizeBits);
+		(a.bytes : Bytes).blit(0, bytes, 0, length << bytes.sizeBits);
 		return a;
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return new BytesIterator(this);
 	}
 
-	public function map<S>( f : T -> S ) : ArrayDyn @:privateAccess {
+	public function map<S>(f:T->S):ArrayDyn@:privateAccess {
 		var a = new ArrayObj();
-		if( length > 0 ) a.__expand(length - 1);
-		for( i in 0...length )
+		if (length > 0)
+			a.__expand(length - 1);
+		for (i in 0...length)
 			a.array[i] = f(bytes[i]);
-		return ArrayDyn.alloc(a,true);
+		return ArrayDyn.alloc(a, true);
 	}
 
-	public function filter( f : T -> Bool ) : ArrayBytes<T> {
+	public function filter(f:T->Bool):ArrayBytes<T> {
 		var a = new ArrayBytes<T>();
-		for( i in 0...length ) {
+		for (i in 0...length) {
 			var v = bytes[i];
-			if( f(v) ) a.push(v);
+			if (f(v))
+				a.push(v);
 		}
 		return a;
 	}
 
-	override function getDyn( pos : Int ) : Dynamic {
-		var pos : UInt = pos;
-		if( pos >= length )
+	override public function resize(len:Int):Void {
+		if (length < len) {
+			__expand(len - 1);
+		} else if (length > len) {
+			(bytes : Bytes).fill(len << bytes.sizeBits, (length - len) << bytes.sizeBits, 0);
+			this.length = len;
+		}
+	}
+
+	override function getDyn(pos:Int):Dynamic {
+		var pos:UInt = pos;
+		if (pos >= length)
 			return bytes.nullValue;
 		return bytes[pos];
 	}
 
-	override function setDyn( pos : Int, v : Dynamic ) {
-		var pos : UInt = pos;
-		if( pos >= length )
+	override function setDyn(pos:Int, v:Dynamic) {
+		var pos:UInt = pos;
+		if (pos >= length)
 			__expand(pos);
 		bytes[pos] = v;
 	}
 
-	override function pushDyn( v : Dynamic ) return push(v);
-	override function popDyn() : Null<Dynamic> return pop();
-	override function shiftDyn() : Null<Dynamic> return shift();
-	override function unshiftDyn( v : Dynamic ) unshift(v);
-	override function insertDyn( pos : Int, v : Dynamic ) insert(pos, v);
-	override function removeDyn( v : Dynamic ) return remove(v);
-	override function sortDyn( f : Dynamic -> Dynamic -> Int ) sort(f);
+	override function pushDyn(v:Dynamic)
+		return push(v);
+
+	override function popDyn():Null<Dynamic>
+		return pop();
+
+	override function shiftDyn():Null<Dynamic>
+		return shift();
+
+	override function unshiftDyn(v:Dynamic)
+		unshift(v);
+
+	override function insertDyn(pos:Int, v:Dynamic)
+		insert(pos, v);
+
+	override function removeDyn(v:Dynamic)
+		return remove(v);
+
+	override function sortDyn(f:Dynamic->Dynamic->Int)
+		sort(f);
 
 	// called by compiler when accessing the array outside of its bounds, might trigger resize
-	function __expand( index : Int ) {
-		if( index < 0 ) throw "Invalid array index "+index;
+	function __expand(index:Int) {
+		if (index < 0)
+			throw "Invalid array index " + index;
 		var newlen = index + 1;
-		if( newlen > size ) {
+		if (newlen > size) {
 			var next = (size * 3) >> 1;
-			if( next < newlen ) next = newlen;
+			if (next < newlen)
+				next = newlen;
 			var bytes2 = new hl.Bytes(next << bytes.sizeBits);
 			var bsize = length << bytes.sizeBits;
 			bytes2.blit(0, bytes, 0, bsize);
@@ -295,7 +338,6 @@ class BytesIterator<T> {
 		}
 		length = newlen;
 	}
-
 }
 
 typedef ArrayI32 = ArrayBytes<Int>;
diff --git a/std/hl/types/ArrayDyn.hx b/std/hl/types/ArrayDyn.hx
index f0b20306e4bba878581b58ac52083b09e946935c..0244574b12ccd892e1ecf6f0986c90274de53d72 100644
--- a/std/hl/types/ArrayDyn.hx
+++ b/std/hl/types/ArrayDyn.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,26 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl.types;
+
 import hl.types.ArrayBase;
 
 class ArrayDynIterator {
-	var a : ArrayBase;
-	var len : Int;
-	var pos : Int;
+	var a:ArrayBase;
+	var len:Int;
+	var pos:Int;
+
 	public function new(a) {
 		this.a = a;
 		this.len = a.length;
 		this.pos = 0;
 	}
+
 	public function hasNext() {
 		return pos < len;
 	}
+
 	public function next() {
 		return a.getDyn(pos++);
 	}
@@ -41,17 +46,18 @@ class ArrayDynIterator {
 
 @:keep
 class ArrayDyn extends ArrayAccess {
+	public var length(get, never):Int;
 
-	public var length(get,never) : Int;
-	var array : ArrayBase;
-	var allowReinterpret : Bool;
+	var array:ArrayBase;
+	var allowReinterpret:Bool;
 
 	public function new() {
 		array = new ArrayObj<Dynamic>();
 		allowReinterpret = true;
 	}
 
-	inline function get_length() return array.length;
+	inline function get_length()
+		return array.length;
 
 	override function getDyn(i) {
 		return array.getDyn(i);
@@ -61,149 +67,154 @@ class ArrayDyn extends ArrayAccess {
 		array.setDyn(pos, value);
 	}
 
-	override function blit( pos : Int, src : ArrayAccess, srcpos : Int, len : Int ) : Void {
+	override function blit(pos:Int, src:ArrayAccess, srcpos:Int, len:Int):Void {
 		array.blit(pos, src, srcpos, len);
 	}
 
-	public function concat( a : ArrayDyn ) : ArrayDyn {
+	public function concat(a:ArrayDyn):ArrayDyn {
 		var a1 = array;
 		var a2 = a.array;
 		var alen = a1.length;
 		var anew = new NativeArray<Dynamic>(alen + a2.length);
-		for( i in 0...alen )
+		for (i in 0...alen)
 			anew[i] = a1.getDyn(i);
-		for( i in 0...a2.length )
-			anew[i+alen] = a2.getDyn(i);
-		return alloc(ArrayObj.alloc(anew),true);
+		for (i in 0...a2.length)
+			anew[i + alen] = a2.getDyn(i);
+		return alloc(ArrayObj.alloc(anew), true);
 	}
 
-	public function join( sep : String ) : String {
+	public function join(sep:String):String {
 		return array.join(sep);
 	}
 
-	public function pop() : Null<Dynamic> {
+	public function pop():Null<Dynamic> {
 		return array.popDyn();
 	}
 
-	public function push(x : Dynamic) : Int {
+	public function push(x:Dynamic):Int {
 		return array.pushDyn(x);
 	}
 
-	public function reverse() : Void {
+	public function reverse():Void {
 		array.reverse();
 	}
 
-	public function shift() : Null<Dynamic> {
+	public function resize(len:Int) {
+		array.resize(len);
+	}
+
+	public function shift():Null<Dynamic> {
 		return array.shiftDyn();
 	}
 
-	public function slice( pos : Int, ?end : Int ) : ArrayDyn {
-		return alloc(array.slice(pos,end),true);
+	public function slice(pos:Int, ?end:Int):ArrayDyn {
+		return alloc(array.slice(pos, end), true);
 	}
 
-	public function sort( f : Dynamic -> Dynamic -> Int ) : Void {
+	public function sort(f:Dynamic->Dynamic->Int):Void {
 		array.sortDyn(f);
 	}
 
-	public function splice( pos : Int, len : Int ) : ArrayDyn {
-		return alloc(array.splice(pos,len),true);
+	public function splice(pos:Int, len:Int):ArrayDyn {
+		return alloc(array.splice(pos, len), true);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		return array.toString();
 	}
 
-	public function unshift( x : Dynamic ) : Void {
+	public function unshift(x:Dynamic):Void {
 		array.unshiftDyn(x);
 	}
 
-	public function insert( pos : Int, x : Dynamic ) : Void {
-		array.insertDyn(pos,x);
+	public function insert(pos:Int, x:Dynamic):Void {
+		array.insertDyn(pos, x);
 	}
 
-	public function remove( x : Dynamic ) : Bool {
+	public function remove(x:Dynamic):Bool {
 		return array.removeDyn(x);
 	}
 
-	public function indexOf( x : Dynamic, ?fromIndex:Int ) : Int {
-		var i : Int = fromIndex;
+	public function indexOf(x:Dynamic, ?fromIndex:Int):Int {
+		var i:Int = fromIndex;
 		var length = length;
 		var array = array;
-		while( i < length ) {
-			if( array.getDyn(i) == x )
+		while (i < length) {
+			if (array.getDyn(i) == x)
 				return i;
 			i++;
 		}
 		return -1;
 	}
 
-	public function lastIndexOf( x : Dynamic, ?fromIndex:Int ) : Int {
+	public function lastIndexOf(x:Dynamic, ?fromIndex:Int):Int {
 		var len = length;
 		var i:Int = fromIndex != null ? fromIndex : len - 1;
-		if( i >= len )
+		if (i >= len)
 			i = len - 1;
-		else if( i  < 0 )
+		else if (i < 0)
 			i += len;
-		while( i >= 0 ) {
-			if( array.getDyn(i) == x )
+		while (i >= 0) {
+			if (array.getDyn(i) == x)
 				return i;
 			i--;
 		}
 		return -1;
 	}
 
-	public function copy() : ArrayDyn {
+	public function copy():ArrayDyn {
 		var a = new NativeArray<Dynamic>(length);
-		for( i in 0...length )
+		for (i in 0...length)
 			a[i] = array.getDyn(i);
-		return alloc(ArrayObj.alloc(a),true);
+		return alloc(ArrayObj.alloc(a), true);
 	}
 
-	public function iterator() : Iterator<Dynamic> {
+	public function iterator():Iterator<Dynamic> {
 		return new ArrayDynIterator(array);
 	}
 
-	public function map( f : Dynamic -> Dynamic ) : ArrayDyn {
+	public function map(f:Dynamic->Dynamic):ArrayDyn {
 		var a = new NativeArray<Dynamic>(length);
-		for( i in 0...length )
+		for (i in 0...length)
 			a[i] = f(array.getDyn(i));
-		return alloc(ArrayObj.alloc(a),true);
+		return alloc(ArrayObj.alloc(a), true);
 	}
 
-	public function filter( f : Dynamic -> Bool ) : ArrayDyn {
+	public function filter(f:Dynamic->Bool):ArrayDyn {
 		var a = new ArrayObj<Dynamic>();
-		for( i in 0...length ) {
+		for (i in 0...length) {
 			var v = array.getDyn(i);
-			if( f(v) ) a.push(v);
+			if (f(v))
+				a.push(v);
 		}
-		return alloc(a,true);
+		return alloc(a, true);
 	}
 
-	function __get_field( fid : Int ) : Dynamic {
-		if( fid == untyped $hash("length") )
+	function __get_field(fid:Int):Dynamic {
+		if (fid == untyped $hash("length"))
 			return length;
 		return null;
 	}
 
-	function __cast( t : Type ) : Dynamic {
-		if( t == Type.getDynamic(array) )
+	function __cast(t:Type):Dynamic {
+		if (t == Type.getDynamic(array))
 			return array;
-		if( !allowReinterpret )
+		if (!allowReinterpret)
 			return null;
-		if( t == Type.get(new ArrayBytes.ArrayI32()) ) {
-			var a : BytesAccess<Int> = null;
+		if (t == Type.get((null : ArrayBytes.ArrayI32))) {
+			var a:BytesAccess<Int> = null;
 			a = new Bytes(array.length << a.sizeBits);
-			for( i in 0...array.length )
+			for (i in 0...array.length)
 				a[i] = array.getDyn(i);
 			var arr = ArrayBase.allocI32(a, array.length);
 			array = arr;
 			allowReinterpret = false;
 			return arr;
 		}
-		if( t == Type.get(new ArrayBytes.ArrayF64()) ) {
-			var a : BytesAccess<Float> = null;
+		if (t == Type.get((null : ArrayBytes.ArrayF64))) {
+			var a:BytesAccess<Float> = null;
 			a = new Bytes(array.length << a.sizeBits);
-			for( i in 0...array.length )
+			for (i in 0...array.length)
 				a[i] = array.getDyn(i);
 			var arr = ArrayBase.allocF64(a, array.length);
 			array = arr;
@@ -213,11 +224,14 @@ class ArrayDyn extends ArrayAccess {
 		return null;
 	}
 
-	public static function alloc( a : ArrayBase, allowReinterpret = false ) : ArrayDyn {
-		var arr : ArrayDyn = untyped $new(ArrayDyn);
+	@:keep function __compare(a:Dynamic):Int {
+		return a == array ? 0 : hl.Api.comparePointer(this, a);
+	}
+
+	public static function alloc(a:ArrayBase, allowReinterpret = false):ArrayDyn {
+		var arr:ArrayDyn = untyped $new(ArrayDyn);
 		arr.array = a;
 		arr.allowReinterpret = allowReinterpret;
 		return arr;
 	}
-
 }
diff --git a/std/hl/types/ArrayObj.hx b/std/hl/types/ArrayObj.hx
index de36c3ebdc6fe9dba16f91aff06898e84c41c72f..ce36921741d54f70b4e4b77258fbd5cd03e8b6bd 100644
--- a/std/hl/types/ArrayObj.hx
+++ b/std/hl/types/ArrayObj.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,29 +19,30 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl.types;
 
 @:keep
 class ArrayObj<T> extends ArrayBase {
-
-	var array : hl.NativeArray<Dynamic>;
+	var array:hl.NativeArray<Dynamic>;
 
 	public function new() {
 		length = 0;
 		array = new NativeArray<Dynamic>(0);
 	}
 
-	public function concat( a : ArrayObj<T> ) : ArrayObj<T> {
+	public function concat(a:ArrayObj<T>):ArrayObj<T> {
 		var arr = new hl.NativeArray(length + a.length);
 		arr.blit(0, array, 0, length);
 		arr.blit(length, a.array, 0, a.length);
 		return alloc(cast arr);
 	}
 
-	override function join( sep : String ) : String {
+	override function join(sep:String):String {
 		var b = new StringBuf();
-		for( i in 0...length ) {
-			if( i > 0 ) b.add(sep);
+		for (i in 0...length) {
+			if (i > 0)
+				b.add(sep);
 			b.add(array[i]);
 		}
 		return b.toString();
@@ -51,8 +52,8 @@ class ArrayObj<T> extends ArrayBase {
 		return true;
 	}
 
-	public function pop() : Null<T> {
-		if( length == 0 )
+	public function pop():Null<T> {
+		if (length == 0)
 			return null;
 		length--;
 		var v = array[length];
@@ -60,9 +61,9 @@ class ArrayObj<T> extends ArrayBase {
 		return v;
 	}
 
-	public function push(x : T) : Int {
+	public function push(x:T):Int {
 		var len = length;
-		if( array.length == len )
+		if (array.length == len)
 			__expand(len);
 		else
 			length++;
@@ -70,8 +71,8 @@ class ArrayObj<T> extends ArrayBase {
 		return length;
 	}
 
-	override function reverse() : Void {
-		for( i in 0...length >> 1 ) {
+	override function reverse():Void {
+		for (i in 0...length >> 1) {
 			var k = length - 1 - i;
 			var tmp = array[i];
 			array[i] = array[k];
@@ -79,8 +80,8 @@ class ArrayObj<T> extends ArrayBase {
 		}
 	}
 
-	public function shift() : Null<T> {
-		if( length == 0 )
+	public function shift():Null<T> {
+		if (length == 0)
 			return null;
 		length--;
 		var v = array[0];
@@ -89,200 +90,252 @@ class ArrayObj<T> extends ArrayBase {
 		return v;
 	}
 
-	override function slice( pos : Int, ?end : Int ) : ArrayObj<T> {
-		if( pos < 0 ) {
+	override function slice(pos:Int, ?end:Int):ArrayObj<T> {
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 )
+			if (pos < 0)
 				pos = 0;
 		}
-		var pend : Int;
-		if( end == null )
+		var pend:Int;
+		if (end == null)
 			pend = this.length;
 		else {
 			pend = end;
-			if( pend < 0 )
+			if (pend < 0)
 				pend += this.length;
-			if( pend > this.length )
+			if (pend > this.length)
 				pend = this.length;
 		}
 		var len = pend - pos;
-		if( len < 0 )
+		if (len < 0)
 			return new ArrayObj();
-		return alloc(array.sub(pos,len));
+		return alloc(array.sub(pos, len));
 	}
 
-	public function sort( f : T -> T -> Int ) : Void {
+	public function sort(f:T->T->Int):Void {
 		// TODO : use native call ?
 		haxe.ds.ArraySort.sort(cast this, f);
 	}
 
-	override function splice( pos : Int, len : Int ) : ArrayObj<T> {
-		if( len < 0 ) return new ArrayObj();
-		if( pos < 0 ){
+	override function splice(pos:Int, len:Int):ArrayObj<T> {
+		if (len < 0)
+			return new ArrayObj();
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 ) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
-		if( pos > this.length ) {
+		if (pos > this.length) {
 			pos = 0;
 			len = 0;
-		} else if( pos + len > this.length ) {
+		} else if (pos + len > this.length) {
 			len = this.length - pos;
-			if( len < 0 ) len = 0;
+			if (len < 0)
+				len = 0;
 		}
 		var a = this.array;
-		var ret : ArrayObj<T> = alloc(cast a.sub(pos,len));
+		var ret:ArrayObj<T> = alloc(cast a.sub(pos, len));
 		var end = pos + len;
-		a.blit(pos,a,end,this.length-end);
+		a.blit(pos, a, end, this.length - end);
 		this.length -= len;
-		while( --len >= 0 )
+		while (--len >= 0)
 			a[this.length + len] = null;
 		return ret;
 	}
 
-	override function toString() : String {
+	@:access(Std.toStringDepth)
+	override function toString():String {
+		if (Std.toStringDepth >= 5)
+			return "...";
+		Std.toStringDepth++;
 		var b = new StringBuf();
 		b.addChar("[".code);
-		for( i in 0...length ) {
-			if( i > 0 ) b.addChar(",".code);
-			b.add(array[i]);
+		try {
+			for (i in 0...length) {
+				if (i > 0)
+					b.addChar(",".code);
+				b.add(array[i]);
+			}
+		} catch (e:Dynamic) {
+			Std.toStringDepth--;
+			hl.Api.rethrow(e);
 		}
 		b.addChar("]".code);
+		Std.toStringDepth--;
 		return b.toString();
 	}
 
-	public function unshift( x : T ) : Void {
-		if( length == array.length ) __expand(length) else length++;
+	public function unshift(x:T):Void {
+		if (length == array.length)
+			__expand(length)
+		else
+			length++;
 		array.blit(1, array, 0, length - 1);
 		array[0] = x;
 	}
 
-	public function insert( pos : Int, x : T ) : Void {
-		if( pos < 0 ) {
+	public function insert(pos:Int, x:T):Void {
+		if (pos < 0) {
 			pos = length + pos;
-			if( pos < 0 ) pos = 0;
-		} else if( pos > length ) pos = length;
-		if( length == array.length ) __expand(length) else length++;
+			if (pos < 0)
+				pos = 0;
+		} else if (pos > length)
+			pos = length;
+		if (length == array.length)
+			__expand(length)
+		else
+			length++;
 		array.blit(pos + 1, array, pos, length - pos - 1);
 		array[pos] = x;
 	}
 
-	public function remove( x : T ) : Bool {
+	public function remove(x:T):Bool {
 		var i = indexOf(x);
-		if( i < 0 ) return false;
+		if (i < 0)
+			return false;
 		length--;
-		array.blit(i,array,i+1,length - i);
+		array.blit(i, array, i + 1, length - i);
 		array[length] = null;
 		return true;
 	}
 
-	public function indexOf( x : T, ?fromIndex:Int ) : Int {
-		var i : Int = fromIndex;
-		if( i < 0 ) {
+	public function indexOf(x:T, ?fromIndex:Int):Int {
+		var i:Int = fromIndex;
+		if (i < 0) {
 			i += length;
-			if( i < 0 ) i = 0;
+			if (i < 0)
+				i = 0;
 		}
 		var length = length;
 		var array = array;
-		while( i < length ) {
-			if( array[i] == x )
+		while (i < length) {
+			if (array[i] == x)
 				return i;
 			i++;
 		}
 		return -1;
 	}
 
-	override function blit( pos : Int, src : ArrayBase.ArrayAccess, srcpos : Int, len : Int ) : Void {
+	override function blit(pos:Int, src:ArrayBase.ArrayAccess, srcpos:Int, len:Int):Void {
 		var src = (cast src : ArrayObj<T>);
-		if( pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length ) throw haxe.io.Error.OutsideBounds;
+		if (pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length)
+			throw haxe.io.Error.OutsideBounds;
 		array.blit(pos, src.array, srcpos, len);
 	}
 
-	public function lastIndexOf( x : T, ?fromIndex:Int ) : Int {
+	public function lastIndexOf(x:T, ?fromIndex:Int):Int {
 		var len = length;
 		var i:Int = fromIndex != null ? fromIndex : len - 1;
-		if( i >= len )
+		if (i >= len)
 			i = len - 1;
-		else if( i  < 0 )
+		else if (i < 0)
 			i += len;
-		while( i >= 0 ) {
-			if( array[i] == x )
+		while (i >= 0) {
+			if (array[i] == x)
 				return i;
 			i--;
 		}
 		return -1;
 	}
 
-	public function copy() : ArrayObj<T> {
+	public function copy():ArrayObj<T> {
 		var n = new NativeArray<Dynamic>(length);
 		n.blit(0, array, 0, length);
 		return alloc(n);
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		var n = new NativeArray.NativeArrayIterator<T>(cast array);
 		@:privateAccess n.length = length;
 		return n;
 	}
 
-	public function map<S>( f : T -> S ) : ArrayDyn {
+	public function map<S>(f:T->S):ArrayDyn {
 		var a = new ArrayObj();
-		if( length > 0 ) a.__expand(length - 1);
-		for( i in 0...length )
+		if (length > 0)
+			a.__expand(length - 1);
+		for (i in 0...length)
 			a.array[i] = f(array[i]);
-		return ArrayDyn.alloc(a,true);
+		return ArrayDyn.alloc(a, true);
 	}
 
-	public function filter( f : T -> Bool ) : ArrayObj<T> {
+	public function filter(f:T->Bool):ArrayObj<T> {
 		var a = new ArrayObj();
-		for( i in 0...length ) {
+		for (i in 0...length) {
 			var v = array[i];
-			if( f(v) ) a.push(v);
+			if (f(v))
+				a.push(v);
 		}
 		return a;
 	}
 
+	override public function resize(len:Int):Void {
+		if (length < len) {
+			__expand(len - 1);
+		} else if (length > len) {
+			for (i in length...len) {
+				array[i] = null;
+			}
+			this.length = len;
+		}
+	}
+
 	// called by compiler when accessing the array outside of its bounds, might trigger resize
-	function __expand( index : Int ) {
-		if( index < 0 ) throw "Invalid array index " + index;
+	function __expand(index:Int) {
+		if (index < 0)
+			throw "Invalid array index " + index;
 		var newlen = index + 1;
-		var size : Int = array.length;
-		if( newlen > size ) {
+		var size:Int = array.length;
+		if (newlen > size) {
 			var next = (size * 3) >> 1;
-			if( next < newlen ) next = newlen;
+			if (next < newlen)
+				next = newlen;
 			var arr2 = new hl.NativeArray<Dynamic>(next);
-			arr2.blit(0,array,0,length);
+			arr2.blit(0, array, 0, length);
 			array = arr2;
 		}
 		length = newlen;
 	}
 
-	override function getDyn( pos : Int ) : Dynamic {
-		var pos : UInt = pos;
-		if( pos >= length )
+	override function getDyn(pos:Int):Dynamic {
+		var pos:UInt = pos;
+		if (pos >= length)
 			return null;
 		return array[pos];
 	}
 
-	override function setDyn( pos : Int, v : Dynamic ) {
-		var pos : UInt = pos;
-		if( pos >= length )
+	override function setDyn(pos:Int, v:Dynamic) {
+		var pos:UInt = pos;
+		if (pos >= length)
 			__expand(pos);
-		array[pos] = Api.safeCast(v,array.getType());
+		array[pos] = Api.safeCast(v, array.getType());
 	}
 
-	override function pushDyn( v : Dynamic ) return push(v);
-	override function popDyn() : Null<Dynamic> return pop();
-	override function shiftDyn() : Null<Dynamic> return shift();
-	override function unshiftDyn( v : Dynamic ) unshift(v);
-	override function insertDyn( pos : Int, v : Dynamic ) insert(pos, v);
-	override function removeDyn( v : Dynamic ) return remove(v);
-	override function sortDyn( f : Dynamic -> Dynamic -> Int ) sort(f);
+	override function pushDyn(v:Dynamic)
+		return push(v);
+
+	override function popDyn():Null<Dynamic>
+		return pop();
+
+	override function shiftDyn():Null<Dynamic>
+		return shift();
 
-	public static function alloc<T>( a : hl.NativeArray<T> ) : ArrayObj<T> {
-		var arr : ArrayObj<T> = untyped $new(ArrayObj);
+	override function unshiftDyn(v:Dynamic)
+		unshift(v);
+
+	override function insertDyn(pos:Int, v:Dynamic)
+		insert(pos, v);
+
+	override function removeDyn(v:Dynamic)
+		return remove(v);
+
+	override function sortDyn(f:Dynamic->Dynamic->Int)
+		sort(f);
+
+	public static function alloc<T>(a:hl.NativeArray<T>):ArrayObj<T> {
+		var arr:ArrayObj<T> = untyped $new(ArrayObj);
 		arr.array = a;
 		arr.length = a.length;
 		return arr;
 	}
-
 }
diff --git a/std/hl/types/BytesMap.hx b/std/hl/types/BytesMap.hx
index ea947d91d89159cb9003da27867a3045981666be..4aceff7bf1b8baf2c3050a598f51f26b65918bc1 100644
--- a/std/hl/types/BytesMap.hx
+++ b/std/hl/types/BytesMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,51 +19,54 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl.types;
 
 typedef BytesMapData = Abstract<"hl_bytes_map">;
 
 abstract BytesMap(BytesMapData) {
-
-	@:extern public inline function new() {
+	extern public inline function new() {
 		this = alloc();
 	}
 
-	@:hlNative("std","hballoc") static function alloc() : BytesMapData {
+	@:hlNative("std", "hballoc") static function alloc():BytesMapData {
 		return null;
 	}
 
-	@:hlNative("std","hbset")
-	public function set( key : Bytes, value : Dynamic ) {
-	}
+	@:hlNative("std", "hbset")
+	public function set(key:Bytes, value:Dynamic) {}
 
-	@:hlNative("std","hbexists")
-	public function exists( key : Bytes ) : Bool {
+	@:hlNative("std", "hbexists")
+	public function exists(key:Bytes):Bool {
 		return false;
 	}
 
-	@:hlNative("std","hbget")
-	public function get( key : Bytes ) : Dynamic {
+	@:hlNative("std", "hbget")
+	public function get(key:Bytes):Dynamic {
 		return null;
 	}
 
-	@:hlNative("std","hbremove")
-	public function remove( key : Bytes ) : Bool {
+	@:hlNative("std", "hbremove")
+	public function remove(key:Bytes):Bool {
 		return false;
 	}
 
-	@:hlNative("std","hbkeys")
-	public function keysArray() : NativeArray<Bytes> {
+	@:hlNative("std", "hbkeys")
+	public function keysArray():NativeArray<Bytes> {
 		return null;
 	}
 
-	@:hlNative("std","hbvalues")
-	public function valuesArray() : NativeArray<Dynamic> {
+	@:hlNative("std", "hbvalues")
+	public function valuesArray():NativeArray<Dynamic> {
 		return null;
 	}
 
-	@:extern public inline function iterator() {
+	#if (hl_ver >= version("1.11.0"))
+	@:hlNative("std", "hbclear")
+	public function clear():Void {}
+	#end
+
+	extern public inline function iterator() {
 		return new NativeArray.NativeArrayIterator<Dynamic>(valuesArray());
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/hl/types/IntMap.hx b/std/hl/types/IntMap.hx
index f07674a428c398938e4407c5df26030b0eb99134..e60fd4b0c2a1c19dece3e87e2811b1c70312db16 100644
--- a/std/hl/types/IntMap.hx
+++ b/std/hl/types/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,51 +19,54 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl.types;
 
 typedef IntMapData = Abstract<"hl_int_map">;
 
 abstract IntMap(IntMapData) {
-
-	@:extern public inline function new() {
+	extern public inline function new() {
 		this = alloc();
 	}
 
-	@:hlNative("std","hialloc") static function alloc() : IntMapData {
+	@:hlNative("std", "hialloc") static function alloc():IntMapData {
 		return null;
 	}
 
-	@:hlNative("std","hiset")
-	public function set( key : Int, value : Dynamic ) {
-	}
+	@:hlNative("std", "hiset")
+	public function set(key:Int, value:Dynamic) {}
 
-	@:hlNative("std","hiexists")
-	public function exists( key : Int ) : Bool {
+	@:hlNative("std", "hiexists")
+	public function exists(key:Int):Bool {
 		return false;
 	}
 
-	@:hlNative("std","higet")
-	public function get( key : Int ) : Dynamic {
+	@:hlNative("std", "higet")
+	public function get(key:Int):Dynamic {
 		return null;
 	}
 
-	@:hlNative("std","hiremove")
-	public function remove( key : Int ) : Bool {
+	@:hlNative("std", "hiremove")
+	public function remove(key:Int):Bool {
 		return false;
 	}
 
-	@:hlNative("std","hikeys")
-	public function keysArray() : NativeArray<Int> {
+	@:hlNative("std", "hikeys")
+	public function keysArray():NativeArray<Int> {
 		return null;
 	}
 
-	@:hlNative("std","hivalues")
-	public function valuesArray() : NativeArray<Dynamic> {
+	@:hlNative("std", "hivalues")
+	public function valuesArray():NativeArray<Dynamic> {
 		return null;
 	}
 
-	@:extern public inline function iterator() {
+	#if (hl_ver >= version("1.11.0"))
+	@:hlNative("std", "hiclear")
+	public function clear():Void {}
+	#end
+
+	extern public inline function iterator() {
 		return new NativeArray.NativeArrayIterator<Dynamic>(valuesArray());
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/hl/types/ObjectMap.hx b/std/hl/types/ObjectMap.hx
index 5a342fba14d0538939397fc6e186bc03c5ecf213..038ea08d00079545937a9e76edb42fd72cadd8e9 100644
--- a/std/hl/types/ObjectMap.hx
+++ b/std/hl/types/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,51 +19,54 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package hl.types;
 
 typedef ObjectMapData = Abstract<"hl_obj_map">;
 
 abstract ObjectMap(ObjectMapData) {
-
-	@:extern public inline function new() {
+	extern public inline function new() {
 		this = alloc();
 	}
 
-	@:hlNative("std","hoalloc") static function alloc() : ObjectMapData {
+	@:hlNative("std", "hoalloc") static function alloc():ObjectMapData {
 		return null;
 	}
 
-	@:hlNative("std","hoset")
-	public function set( key : Dynamic, value : Dynamic ) {
-	}
+	@:hlNative("std", "hoset")
+	public function set(key:Dynamic, value:Dynamic) {}
 
-	@:hlNative("std","hoexists")
-	public function exists( key : Dynamic ) : Bool {
+	@:hlNative("std", "hoexists")
+	public function exists(key:Dynamic):Bool {
 		return false;
 	}
 
-	@:hlNative("std","hoget")
-	public function get( key : Dynamic ) : Dynamic {
+	@:hlNative("std", "hoget")
+	public function get(key:Dynamic):Dynamic {
 		return null;
 	}
 
-	@:hlNative("std","horemove")
-	public function remove( key : Dynamic ) : Bool {
+	@:hlNative("std", "horemove")
+	public function remove(key:Dynamic):Bool {
 		return false;
 	}
 
-	@:hlNative("std","hokeys")
-	public function keysArray() : NativeArray<Dynamic> {
+	@:hlNative("std", "hokeys")
+	public function keysArray():NativeArray<Dynamic> {
 		return null;
 	}
 
-	@:hlNative("std","hovalues")
-	public function valuesArray() : NativeArray<Dynamic> {
+	@:hlNative("std", "hovalues")
+	public function valuesArray():NativeArray<Dynamic> {
 		return null;
 	}
 
-	@:extern public inline function iterator() {
+	#if (hl_ver >= version("1.11.0"))
+	@:hlNative("std", "hoclear")
+	public function clear():Void {}
+	#end
+
+	extern public inline function iterator() {
 		return new NativeArray.NativeArrayIterator<Dynamic>(valuesArray());
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/hl/uv/Handle.hx b/std/hl/uv/Handle.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0d1d3078583feebfe2752ef64dbf6f578e411fcc
--- /dev/null
+++ b/std/hl/uv/Handle.hx
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C)2005-2019 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 hl.uv;
+
+@:hlNative("uv")
+class Handle {
+	public var handle:HandleData;
+
+	function new(h) {
+		handle = h;
+	}
+
+	public function close(?callb) {
+		if (handle != null)
+			close_handle(handle, callb);
+		handle = null;
+	}
+
+	static function close_handle(h:HandleData, callb:Void->Void):Void {}
+}
diff --git a/std/hl/uv/HandleData.hx b/std/hl/uv/HandleData.hx
new file mode 100644
index 0000000000000000000000000000000000000000..020970f36757119f08a4ece7911dfc7537d95354
--- /dev/null
+++ b/std/hl/uv/HandleData.hx
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 hl.uv;
+
+typedef HandleData = hl.Abstract<"uv_handle">;
diff --git a/std/hl/uv/Loop.hx b/std/hl/uv/Loop.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4276c33b1d82710a0c399397d29d518269741e3b
--- /dev/null
+++ b/std/hl/uv/Loop.hx
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C)2005-2019 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 hl.uv;
+
+enum abstract LoopRunMode(Int) {
+	var Default = 0;
+	var Once = 1;
+	var NoWait = 2;
+}
+
+abstract Loop(hl.Abstract<"uv_loop">) {
+	@:hlNative("uv", "loop_close") public function close():Int {
+		return 0;
+	}
+
+	@:hlNative("uv", "run") public function run(mode:LoopRunMode):Int {
+		return 0;
+	}
+
+	@:hlNative("uv", "loop_alive") public function alive():Int {
+		return 0;
+	}
+
+	@:hlNative("uv", "stop") public function stop():Void {}
+
+	public static function getDefault():Loop {
+		var def = default_loop();
+		if (loopEvent == null)
+			loopEvent = haxe.MainLoop.add(function() {
+				// if no more things to process, stop
+				if (def.run(NoWait) == 0) {
+					loopEvent.stop();
+					loopEvent = null;
+				}
+			});
+		return def;
+	}
+
+	@:hlNative("uv", "default_loop") static function default_loop():Loop {
+		return null;
+	}
+
+	static var loopEvent:haxe.MainLoop.MainEvent;
+}
diff --git a/std/hl/uv/Stream.hx b/std/hl/uv/Stream.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5a96fd0bdcf04b818b6703c0e1ec70a0c59d905d
--- /dev/null
+++ b/std/hl/uv/Stream.hx
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C)2005-2019 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 hl.uv;
+
+@:hlNative("uv")
+class Stream extends Handle {
+	public function write(bytes:haxe.io.Bytes, ?onWrite:Bool->Void, pos = 0, len = -1) {
+		if (len < 0)
+			len = bytes.length - pos;
+		if (pos < 0 || len < 0 || pos + len > bytes.length)
+			throw haxe.io.Error.OutsideBounds;
+		if (handle == null || !stream_write(handle, (bytes : hl.Bytes).offset(pos), len, onWrite))
+			throw new haxe.io.Eof();
+	}
+
+	public function readStartRaw(onData:hl.Bytes->Int->Void) {
+		if (handle == null || !stream_read_start(handle, onData))
+			throw new haxe.io.Eof();
+	}
+
+	public function readStart(onData:haxe.io.Bytes->Void) {
+		readStartRaw(function(b, len) onData(if (len < 0) null else b.toBytes(len)));
+	}
+
+	public function readStop() {
+		if (handle != null)
+			stream_read_stop(handle);
+	}
+
+	public function listen(n:Int, onConnect:Void->Void) {
+		if (handle == null || !stream_listen(handle, n, onConnect))
+			throw new haxe.io.Eof();
+	}
+
+	// --
+
+	static function stream_write(handle:HandleData, bytes:hl.Bytes, len:Int, callb:Bool->Void):Bool {
+		return false;
+	}
+
+	static function stream_read_start(handle:HandleData, callb:hl.Bytes->Int->Void) {
+		return false;
+	}
+
+	static function stream_read_stop(handle:HandleData) {}
+
+	static function stream_listen(handle:HandleData, n:Int, callb:Void->Void) {
+		return false;
+	}
+}
diff --git a/std/hl/uv/Tcp.hx b/std/hl/uv/Tcp.hx
new file mode 100644
index 0000000000000000000000000000000000000000..34ba038c38cb472de7e4281121e5ae9adbd65b0e
--- /dev/null
+++ b/std/hl/uv/Tcp.hx
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C)2005-2019 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 hl.uv;
+
+@:hlNative("uv")
+class Tcp extends Stream {
+	public function new(?loop:Loop) {
+		if (loop == null)
+			loop = Loop.getDefault();
+		super(tcp_init_wrap(loop));
+	}
+
+	public function connect(host:sys.net.Host, port:Int, onConnected:Bool->Void) {
+		var h = tcp_connect_wrap(handle, host.ip, port, onConnected);
+		if (h == null)
+			throw haxe.io.Error.Custom("Failed to connect to " + host + ":" + port);
+	}
+
+	public function bind(host:sys.net.Host, port:Int) {
+		if (!tcp_bind_wrap(handle, host.ip, port))
+			throw haxe.io.Error.Custom("Failed to bind socket to " + host + ":" + port);
+	}
+
+	public function accept() {
+		var client = handle == null ? null : tcp_accept_wrap(handle);
+		if (client == null)
+			throw new haxe.io.Eof();
+		return new Stream(client);
+	}
+
+	public function noDelay(b:Bool) {
+		tcp_nodelay_wrap(handle, b);
+	}
+
+	static function tcp_init_wrap(loop:Loop):HandleData {
+		return null;
+	}
+
+	static function tcp_connect_wrap(h:HandleData, host:Int, port:Int, onConnected:Bool->Void):HandleData {
+		return null;
+	}
+
+	static function tcp_bind_wrap(h:HandleData, host:Int, port:Int):Bool {
+		return false;
+	}
+
+	static function tcp_accept_wrap(h:HandleData):HandleData {
+		return null;
+	}
+
+	static function tcp_nodelay_wrap(h:HandleData, b:Bool):Void {}
+}
diff --git a/std/java/Boot.hx b/std/java/Boot.hx
index 3dc116a83e2b4910dce2508911104abbc3dc9666..6e641eb52125920d073a3a6eeb4778c6ceb2b357 100644
--- a/std/java/Boot.hx
+++ b/std/java/Boot.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java;
+
 import java.internal.Exceptions;
 import java.internal.Function;
 import java.internal.HxObject;
 import java.internal.Runtime;
-// TODO (see Gencommon.IteratorsInterfaceModf)
-//import java.internal.Iterator;
 import java.Lib;
-//import java.internal.StringExt;
+import java.Init;
+// import java.internal.StringExt;
 import java.StdTypes;
 import Reflect;
 import Map;
@@ -47,9 +48,4 @@ import java.internal.StringExt;
 import java.internal.FieldLookup;
 
 @:dox(hide)
-extern class Boot
-{
-
-
-
-}
+extern class Boot {}
diff --git a/std/java/Init.hx b/std/java/Init.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f54f49af7409f1a9be5381dbdd366270f1aa849f
--- /dev/null
+++ b/std/java/Init.hx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2019 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 java;
+
+@:native("haxe.java.Init") @:keep class Init {
+	public static function init():Void {
+		#if std_encoding_utf8
+		try {
+			java.lang.System.setOut(new java.io.PrintStream(java.lang.System.out, true, "utf-8"));
+			java.lang.System.setErr(new java.io.PrintStream(java.lang.System.err, true, "utf-8"));
+		} catch (e:java.io.UnsupportedEncodingException) {}
+		#end
+	}
+}
diff --git a/std/java/Lib.hx b/std/java/Lib.hx
index d544732734f7e42ccab5d3d884b75ef565dbe789..88e7e2b3d21c46b956fb78ed312cb41f4181ba4f 100644
--- a/std/java/Lib.hx
+++ b/std/java/Lib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,28 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java;
 
 /**
 	Platform-specific Java Library. Provides some platform-specific functions for the Java target,
 	such as conversion from Haxe types to native types and vice-versa.
 **/
-//we cannot use the java package for custom classes, so we're redefining it as "haxe.java.Lib"
-@:native('haxe.java.Lib') class Lib
-{
+// we cannot use the java package for custom classes, so we're redefining it as "haxe.java.Lib"
+@:native('haxe.java.Lib') class Lib {
+	/**
+		Print the specified value on the default output.
+	**/
+	inline public static function print(v:Dynamic):Void {
+		Sys.print(v);
+	}
+
+	/**
+		Print the specified value on the default output followed by a newline character.
+	**/
+	inline public static function println(v:Dynamic):Void {
+		Sys.println(v);
+	}
 
 	/**
 		Returns a native array from the supplied Array. This native array is unsafe to be written on,
@@ -35,11 +48,9 @@ package java;
 
 		If `equalLengthRequired` is true, the result might be a copy of an array with the correct size.
 	**/
-	inline public static function nativeArray<T>(arr:Array<T>, equalLengthRequired:Bool):NativeArray<T>
-	{
+	inline public static function nativeArray<T>(arr:Array<T>, equalLengthRequired:Bool):NativeArray<T> {
 		var ret = new NativeArray(arr.length);
-		for (i in 0...arr.length)
-		{
+		for (i in 0...arr.length) {
 			ret[i] = arr[i];
 		}
 		return ret;
@@ -50,40 +61,35 @@ package java;
 		[deprecated] - use `getNativeType` instead
 	**/
 	@:deprecated('The function `nativeType` is deprecated and will be removed in later versions. Please use `getNativeType` instead')
-	inline public static function nativeType<T>(obj:T):java.lang.Class<T>
-	{
+	inline public static function nativeType<T>(obj:T):java.lang.Class<T> {
 		return untyped obj.getClass();
 	}
 
 	/**
 		Gets the native `java.lang.Class` from the supplied object. Will throw an exception in case of null being passed.
 	**/
-	inline public static function getNativeType<T>(obj:T):java.lang.Class<T>
-	{
+	inline public static function getNativeType<T>(obj:T):java.lang.Class<T> {
 		return untyped obj.getClass();
 	}
 
 	/**
 		Returns a Class<> equivalent to the native java.lang.Class type.
 	**/
-	public static inline function fromNativeType<T>(t:java.lang.Class<T>):Class<T>
-	{
+	public static inline function fromNativeType<T>(t:java.lang.Class<T>):Class<T> {
 		return untyped t;
 	}
 
 	/**
 		Returns a java.lang.Class equivalent to the Haxe Class<> type.
 	**/
-	public static inline function toNativeType<T>(cl:Class<T>):java.lang.Class<T>
-	{
+	public static inline function toNativeType<T>(cl:Class<T>):java.lang.Class<T> {
 		return untyped cl;
 	}
 
 	/**
 		Returns a java.lang.Class equivalent to the Haxe Enum<> type.
 	**/
-	public static inline function toNativeEnum<T>(cl:Enum<T>):java.lang.Class<T>
-	{
+	public static inline function toNativeEnum<T>(cl:Enum<T>):java.lang.Class<T> {
 		return untyped cl;
 	}
 
@@ -92,66 +98,54 @@ package java;
 		Unless `copy` is true, it won't copy the contents of the native array,
 		so unless any operation triggers an array resize, all changes made to the Haxe array will affect the native array argument.
 	**/
-	@:generic public static function array<T>(native:java.NativeArray<T>):Array<T>
-	{
+	@:generic public static function array<T>(native:java.NativeArray<T>):Array<T> {
 		return untyped Array.ofNative(native);
 	}
 
-	@:extern inline private static function doArray<T>(native:java.NativeArray<T>):Array<T>
-	{
+	extern inline private static function doArray<T>(native:java.NativeArray<T>):Array<T> {
 		var ret:NativeArray<Dynamic> = new NativeArray(native.length);
-		for (i in 0...native.length)
-		{
+		for (i in 0...native.length) {
 			ret[i] = native[i];
 		}
 		return untyped Array.ofNative(ret);
 	}
 
-	public static function array_Int(native:java.NativeArray<Int>):Array<Int>
-	{
+	public static function array_Int(native:java.NativeArray<Int>):Array<Int> {
 		return doArray(native);
 	}
 
-	public static function array_Float(native:java.NativeArray<Float>):Array<Float>
-	{
+	public static function array_Float(native:java.NativeArray<Float>):Array<Float> {
 		return doArray(native);
 	}
 
-	public static function array_Bool(native:java.NativeArray<Bool>):Array<Bool>
-	{
+	public static function array_Bool(native:java.NativeArray<Bool>):Array<Bool> {
 		return doArray(native);
 	}
 
-	public static function array_java_Int8(native:java.NativeArray<java.StdTypes.Int8>):Array<java.StdTypes.Int8>
-	{
+	public static function array_java_Int8(native:java.NativeArray<java.StdTypes.Int8>):Array<java.StdTypes.Int8> {
 		return doArray(native);
 	}
 
-	public static function array_java_Int16(native:java.NativeArray<java.StdTypes.Int16>):Array<java.StdTypes.Int16>
-	{
+	public static function array_java_Int16(native:java.NativeArray<java.StdTypes.Int16>):Array<java.StdTypes.Int16> {
 		return doArray(native);
 	}
 
-	public static function array_java_Char16(native:java.NativeArray<java.StdTypes.Char16>):Array<java.StdTypes.Char16>
-	{
+	public static function array_java_Char16(native:java.NativeArray<java.StdTypes.Char16>):Array<java.StdTypes.Char16> {
 		return doArray(native);
 	}
 
-	public static function array_Single(native:java.NativeArray<Single>):Array<Single>
-	{
+	public static function array_Single(native:java.NativeArray<Single>):Array<Single> {
 		return doArray(native);
 	}
 
-	public static function array_haxe_Int64(native:java.NativeArray<haxe.Int64>):Array<haxe.Int64>
-	{
+	public static function array_haxe_Int64(native:java.NativeArray<haxe.Int64>):Array<haxe.Int64> {
 		return doArray(native);
 	}
 
 	/**
 		Allocates a new Haxe Array with a predetermined size
 	**/
-	public static function arrayAlloc<T>(size:Int):Array<T>
-	{
+	public static function arrayAlloc<T>(size:Int):Array<T> {
 		return untyped Array.alloc(size);
 	}
 
@@ -163,8 +157,7 @@ package java;
 
 		This method only exists at compile-time, so it can't be called via reflection.
 	**/
-	@:extern public static inline function lock<T>(obj:Dynamic, block:T):Void
-	{
+	extern public static inline function lock<T>(obj:Dynamic, block:T):Void {
 		untyped __lock__(obj, block);
 	}
 }
diff --git a/std/java/NativeArray.hx b/std/java/NativeArray.hx
index c427450ba4344914660bfa5ea8883108caaa08bb..6c9054db5f9fa85b87eeedd37f922ed2d25d6952 100644
--- a/std/java/NativeArray.hx
+++ b/std/java/NativeArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java;
 
 import haxe.extern.Rest;
@@ -26,8 +27,7 @@ import haxe.extern.Rest;
 /**
 	Represents a java fixed-size Array (`T[]`)
 **/
-@:nativeGen extern class NativeArray<T> implements ArrayAccess<T>
-{
+@:nativeGen extern class NativeArray<T> implements ArrayAccess<T> {
 	/**
 		Creates a new array with the specified elements.
 
@@ -35,16 +35,16 @@ import haxe.extern.Rest;
 		```haxe
 		var elements = NativeArray.make(1,2,3,4,5,6);
 		```
-	 **/
+	**/
 	public static function make<T>(elements:Rest<T>):NativeArray<T>;
 
 	/**
 		The length of the array
-	 **/
+	**/
 	public var length(default, null):Int;
 
 	/**
 		Allocates a new array with size `len`
-	 **/
+	**/
 	public function new(len:Int):Void;
 }
diff --git a/std/java/NativeString.hx b/std/java/NativeString.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3cf50a5e6ce49f1cfbe2874a1d1f0a361ab3a351
--- /dev/null
+++ b/std/java/NativeString.hx
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C)2005-2019 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 java;
+
+import haxe.Int64;
+import haxe.extern.Rest;
+import java.StdTypes.Int8;
+import java.StdTypes.Char16;
+import java.lang.CharSequence;
+import java.util.Locale;
+
+@:native("java.lang.String")
+extern class NativeString {
+	function charAt(index:Int):Char16;
+	function codePointAt(index:Int):Int;
+	function codePointBefore(index:Int):Int;
+	function codePointCount(beginIndex:Int, endIndex:Int):Int;
+	function compareTo(anotherString:String):Int;
+	function compareToIgnoreCase(str:String):Int;
+	function concat(str:String):String;
+	function contains(s:CharSequence):Bool;
+	@:overload function contentEquals(cs:CharSequence):Bool;
+	@:overload function contentEquals(sb:java.lang.StringBuffer):Bool;
+	@:overload static function copyValueOf(data:NativeArray<Char16>):String;
+	@:overload static function copyValueOf(data:NativeArray<Char16>, offset:Int, count:Int):String;
+	function endsWith(suffix:String):Bool;
+	function equals(anObject:Dynamic):Bool;
+	function equalsIgnoreCase(anotherString:String):Bool;
+	@:overload static function format(l:Locale, format:String, args:Rest<Dynamic>):String;
+	@:overload static function format(format:String, args:Rest<Dynamic>):String;
+	@:overload function getBytes():NativeArray<Int8>;
+	@:overload function getBytes(charset:java.nio.charset.Charset):NativeArray<Int8>;
+	@:deprecated @:overload function getBytes(srcBegin:Int, srcEnd:Int, dst:NativeArray<Int8>, dstBegin:Int):Void;
+	@:overload function getBytes(charsetName:String):NativeArray<Int8>;
+	function getChars(srcBegin:Int, srcEnd:Int, dst:NativeArray<Char16>, dstBegin:Int):Void;
+	function hashCode():Int;
+	@:overload function indexOf(ch:Int):Int;
+	@:overload function indexOf(ch:Int, fromIndex:Int):Int;
+	@:overload function indexOf(str:String):Int;
+	@:overload function indexOf(str:String, fromIndex:Int):Int;
+	function intern():String;
+	function isEmpty():Bool;
+	@:overload function lastIndexOf(ch:Int):Int;
+	@:overload function lastIndexOf(ch:Int, fromIndex:Int):Int;
+	@:overload function lastIndexOf(str:String):Int;
+	@:overload function lastIndexOf(str:String, fromIndex:Int):Int;
+	function length():Int;
+	function matches(regex:String):Bool;
+	function offsetByCodePoints(index:Int, codePointOffset:Int):Int;
+	@:overload function regionMatches(ignoreCase:Bool, toffset:Int, other:String, ooffset:Int, len:Int):Bool;
+	@:overload function regionMatches(toffset:Int, other:String, ooffset:Int, len:Int):Bool;
+	@:overload function replace(oldChar:Char16, newChar:Char16):String;
+	@:overload function replace(target:CharSequence, replacement:CharSequence):String;
+	function replaceAll(regex:String, replacement:String):String;
+	function replaceFirst(regex:String, replacement:String):String;
+	@:overload function split(regex:String):NativeArray<String>;
+	@:overload function split(regex:String, limit:Int):NativeArray<String>;
+	@:overload function startsWith(prefix:String):Bool;
+	@:overload function startsWith(prefix:String, toffset:Int):Bool;
+	function subSequence(beginIndex:Int, endIndex:Int):CharSequence;
+	@:overload function substring(beginIndex:Int):String;
+	@:overload function substring(beginIndex:Int, endIndex:Int):String;
+	function toCharArray():NativeArray<Char16>;
+	@:overload function toLowerCase():String;
+	@:overload function toLowerCase(locale:Locale):String;
+	function toString():String;
+	@:overload function toUpperCase():String;
+	@:overload function toUpperCase(locale:Locale):String;
+	function trim():String;
+	@:overload static function valueOf(b:Bool):String;
+	@:overload static function valueOf(c:Char16):String;
+	@:overload static function valueOf(data:NativeArray<Char16>):String;
+	@:overload static function valueOf(data:NativeArray<Char16>, offset:Int, count:Int):String;
+	@:overload static function valueOf(d:Float):String;
+	@:overload static function valueOf(f:String):String;
+	@:overload static function valueOf(i:Int):String;
+	@:overload static function valueOf(l:haxe.Int64):String;
+	@:overload static function valueOf(obj:java.lang.Object):String;
+}
diff --git a/std/java/StdTypes.hx b/std/java/StdTypes.hx
index 8d39212e9c96687c7d1a39d4b05e0b555afa80b1..060571b9de03b0a132b1369783a2e658c09ff195 100644
--- a/std/java/StdTypes.hx
+++ b/std/java/StdTypes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,46 +19,75 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java;
 
 @:notNull @:runtimeValue @:coreType extern abstract Int8 from Int {}
 @:notNull @:runtimeValue @:coreType extern abstract Int16 from Int {}
 @:notNull @:runtimeValue @:coreType extern abstract Char16 from Int {}
-@:notNull @:runtimeValue @:coreType extern abstract Int64 from Int from Float
-{
-	@:op(A+B) public static function addI(lhs:Int64, rhs:Int):Int64;
-	@:op(A+B) public static function add(lhs:Int64, rhs:Int64):Int64;
-	@:op(A*B) public static function mulI(lhs:Int64, rhs:Int):Int64;
-	@:op(A*B) public static function mul(lhs:Int64, rhs:Int64):Int64;
-	@:op(A%B) public static function modI(lhs:Int64, rhs:Int):Int64;
-	@:op(A%B) public static function mod(lhs:Int64, rhs:Int64):Int64;
-	@:op(A-B) public static function subI(lhs:Int64, rhs:Int):Int64;
-	@:op(A-B) public static function sub(lhs:Int64, rhs:Int64):Int64;
-	@:op(A/B) public static function divI(lhs:Int64, rhs:Int):Int64;
-	@:op(A/B) public static function div(lhs:Int64, rhs:Int64):Int64;
-	@:op(A|B) public static function orI(lhs:Int64, rhs:Int):Int64;
-	@:op(A|B) public static function or(lhs:Int64, rhs:Int64):Int64;
-	@:op(A^B) public static function xorI(lhs:Int64, rhs:Int):Int64;
-	@:op(A^B) public static function xor(lhs:Int64, rhs:Int64):Int64;
-	@:op(A&B) public static function andI(lhs:Int64, rhs:Int):Int64;
-	@:op(A&B) public static function and(lhs:Int64, rhs:Int64):Int64;
-	@:op(A<<B) public static function shlI(lhs:Int64, rhs:Int):Int64;
-	@:op(A<<B) public static function shl(lhs:Int64, rhs:Int64):Int64;
-	@:op(A>>B) public static function shrI(lhs:Int64, rhs:Int):Int64;
-	@:op(A>>B) public static function shr(lhs:Int64, rhs:Int64):Int64;
-	@:op(A>>>B) public static function ushrI(lhs:Int64, rhs:Int):Int64;
-	@:op(A>>>B) public static function ushr(lhs:Int64, rhs:Int64):Int64;
-
-	@:op(A>B) public static function gt(lhs:Int64, rhs:Int64):Bool;
-	@:op(A>=B) public static function gte(lhs:Int64, rhs:Int64):Bool;
-	@:op(A<B) public static function lt(lhs:Int64, rhs:Int64):Bool;
-	@:op(A<=B) public static function lte(lhs:Int64, rhs:Int64):Bool;
+
+@:notNull @:runtimeValue @:coreType extern abstract Int64 from Int from Float {
+	@:op(A + B) public static function addI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A + B) public static function add(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A * B) public static function mulI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A * B) public static function mul(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A % B) public static function modI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A % B) public static function mod(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A - B) public static function subI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A - B) public static function sub(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A / B) public static function divI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A / B) public static function div(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A | B) public static function orI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A | B) public static function or(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A ^ B) public static function xorI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A ^ B) public static function xor(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A & B) public static function andI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A & B) public static function and(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A << B) public static function shlI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A << B) public static function shl(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A >> B) public static function shrI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A >> B) public static function shr(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A >>> B) public static function ushrI(lhs:Int64, rhs:Int):Int64;
+
+	@:op(A >>> B) public static function ushr(lhs:Int64, rhs:Int64):Int64;
+
+	@:op(A > B) public static function gt(lhs:Int64, rhs:Int64):Bool;
+
+	@:op(A >= B) public static function gte(lhs:Int64, rhs:Int64):Bool;
+
+	@:op(A < B) public static function lt(lhs:Int64, rhs:Int64):Bool;
+
+	@:op(A <= B) public static function lte(lhs:Int64, rhs:Int64):Bool;
 
 	@:op(~A) public static function bneg(t:Int64):Int64;
+
 	@:op(-A) public static function neg(t:Int64):Int64;
 
 	@:op(++A) public static function preIncrement(t:Int64):Int64;
+
 	@:op(A++) public static function postIncrement(t:Int64):Int64;
+
 	@:op(--A) public static function preDecrement(t:Int64):Int64;
+
 	@:op(A--) public static function postDecrement(t:Int64):Int64;
 }
diff --git a/std/java/_std/Array.hx b/std/java/_std/Array.hx
index cac869ead1186375191658b88ee57974a283e0cc..12ed28a18b68af2347e10397dfebe96bd86d9171 100644
--- a/std/java/_std/Array.hx
+++ b/std/java/_std/Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import java.lang.System;
 import java.NativeArray;
 
@@ -29,36 +30,48 @@ import java.NativeArray;
 		this.length = _native.length;
 	}
 ')
-@:final @:coreApi class Array<T> implements ArrayAccess<T> {
-
-	public var length(default,null) : Int;
+@:coreApi final class Array<T> implements ArrayAccess<T> {
+	public var length(default, null):Int;
 
 	private var __a:NativeArray<T>;
 
+	@:skipReflection static var __hx_toString_depth = 0;
+	@:skipReflection static inline final __hx_defaultCapacity = 4;
+
 	@:functionCode('
 			return new Array<X>(_native);
 	')
-	private static function ofNative<X>(native:NativeArray<X>):Array<X>
-	{
-		return null;
+	private static function ofNative<X>(native:NativeArray<X>):Array<X> {
+		var a = new Array();
+		a.length = native.length;
+		a.__a = native;
+		return a;
 	}
 
 	@:functionCode('
 			return new Array<Y>((Y[]) ((java.lang.Object)new java.lang.Object[size]));
 	')
-	private static function alloc<Y>(size:Int):Array<Y>
-	{
-		return null;
+	private static function alloc<Y>(size:Int):Array<Y> {
+		var a = new Array();
+		a.length = size;
+		a.__a = new java.NativeArray(size);
+		return a;
 	}
 
-	public function new() : Void
-	{
+	#if jvm
+	function getNative():NativeArray<T> {
+		var a = new NativeArray(length);
+		System.arraycopy(__a, 0, a, 0, length);
+		return a;
+	}
+	#end
+
+	public function new():Void {
 		this.length = 0;
 		this.__a = new NativeArray(0);
 	}
 
-	public function concat( a : Array<T> ) : Array<T>
-	{
+	public function concat(a:Array<T>):Array<T> {
 		var length = length;
 		var len = length + a.length;
 		var retarr = new NativeArray(len);
@@ -68,13 +81,11 @@ import java.NativeArray;
 		return ofNative(retarr);
 	}
 
-	private function concatNative( a : NativeArray<T> ) : Void
-	{
+	private function concatNative(a:NativeArray<T>):Void {
 		var __a = __a;
 		var length = length;
 		var len = length + a.length;
-		if (__a.length >= len)
-		{
+		if (__a.length >= len) {
 			System.arraycopy(a, 0, __a, length, length);
 		} else {
 			var newarr = new NativeArray(len);
@@ -87,15 +98,13 @@ import java.NativeArray;
 		this.length = len;
 	}
 
-	public function join( sep : String ) : String
-	{
+	public function join(sep:String):String {
 		var buf = new StringBuf();
 		var i = -1;
 
 		var first = true;
 		var length = length;
-		while (++i < length)
-		{
+		while (++i < length) {
 			if (first)
 				first = false;
 			else
@@ -106,12 +115,10 @@ import java.NativeArray;
 		return buf.toString();
 	}
 
-	public function pop() : Null<T>
-	{
+	public function pop():Null<T> {
 		var __a = __a;
 		var length = length;
-		if (length > 0)
-		{
+		if (length > 0) {
 			var val = __a[--length];
 			__a[length] = null;
 			this.length = length;
@@ -122,12 +129,10 @@ import java.NativeArray;
 		}
 	}
 
-	public function push(x : T) : Int
-	{
+	public function push(x:T):Int {
 		var length = length;
-		if (length >= __a.length)
-		{
-			var newLen = (length << 1) + 1;
+		if (length >= __a.length) {
+			var newLen = length == 0 ? __hx_defaultCapacity : (length << 1);
 			var newarr = new NativeArray(newLen);
 			System.arraycopy(__a, 0, newarr, 0, __a.length);
 
@@ -138,53 +143,50 @@ import java.NativeArray;
 		return ++this.length;
 	}
 
-	public function reverse() : Void
-	{
+	public function reverse():Void {
 		var i = 0;
 		var l = this.length;
 		var a = this.__a;
 		var half = l >> 1;
 		l -= 1;
-		while ( i < half )
-		{
+		while (i < half) {
 			var tmp = a[i];
-			a[i] = a[l-i];
-			a[l-i] = tmp;
+			a[i] = a[l - i];
+			a[l - i] = tmp;
 			i += 1;
 		}
 	}
 
-	public function shift() : Null<T>
-	{
+	public function shift():Null<T> {
 		var l = this.length;
-		if( l == 0 )
+		if (l == 0)
 			return null;
 
 		var a = this.__a;
 		var x = a[0];
 		l -= 1;
-		System.arraycopy(a, 1, a, 0, length-1);
+		System.arraycopy(a, 1, a, 0, length - 1);
 		a[l] = null;
 		this.length = l;
 
 		return x;
 	}
 
-	public function slice( pos : Int, ?end : Int ) : Array<T>
-	{
-		if( pos < 0 ){
+	public function slice(pos:Int, ?end:Int):Array<T> {
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 )
+			if (pos < 0)
 				pos = 0;
 		}
-		if( end == null )
+		if (end == null)
 			end = this.length;
-		else if( end < 0 )
+		else if (end < 0)
 			end = this.length + end;
-		if( end > this.length )
+		if (end > this.length)
 			end = this.length;
 		var len = end - pos;
-		if ( len < 0 ) return new Array();
+		if (len < 0)
+			return new Array();
 
 		var newarr = new NativeArray(len);
 		System.arraycopy(__a, pos, newarr, 0, len);
@@ -192,47 +194,49 @@ import java.NativeArray;
 		return ofNative(newarr);
 	}
 
-	public function sort( f : T -> T -> Int ) : Void
-	{
+	public function sort(f:T->T->Int):Void {
 		if (length == 0)
 			return;
 		quicksort(0, length - 1, f);
 	}
 
-	private function quicksort( lo : Int, hi : Int, f : T -> T -> Int ) : Void
-	{
+	private function quicksort(lo:Int, hi:Int, f:T->T->Int):Void {
 		var buf = __a;
 		var i = lo, j = hi;
 		var p = buf[(i + j) >> 1];
-		while ( i <= j )
-		{
-			while ( i < hi && f(buf[i], p) < 0 ) i++;
-			while ( j > lo && f(buf[j], p) > 0 ) j--;
-			if ( i <= j )
-			{
+		while (i <= j) {
+			while (i < hi && f(buf[i], p) < 0)
+				i++;
+			while (j > lo && f(buf[j], p) > 0)
+				j--;
+			if (i <= j) {
 				var t = buf[i];
 				buf[i++] = buf[j];
 				buf[j--] = t;
 			}
 		}
 
-		if( lo < j ) quicksort( lo, j, f );
-		if( i < hi ) quicksort( i, hi, f );
+		if (lo < j)
+			quicksort(lo, j, f);
+		if (i < hi)
+			quicksort(i, hi, f);
 	}
 
-	public function splice( pos : Int, len : Int ) : Array<T>
-	{
-		if( len < 0 ) return new Array();
-		if( pos < 0 ) {
+	public function splice(pos:Int, len:Int):Array<T> {
+		if (len < 0)
+			return new Array();
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 ) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
-		if( pos > this.length ) {
+		if (pos > this.length) {
 			pos = 0;
 			len = 0;
-		} else if( pos + len > this.length ) {
+		} else if (pos + len > this.length) {
 			len = this.length - pos;
-			if( len < 0 ) len = 0;
+			if (len < 0)
+				len = 0;
 		}
 		var a = this.__a;
 
@@ -243,42 +247,57 @@ import java.NativeArray;
 		var end = pos + len;
 		System.arraycopy(a, end, a, pos, this.length - end);
 		this.length -= len;
-		while( --len >= 0 )
+		while (--len >= 0)
 			a[this.length + len] = null;
 		return ret;
 	}
 
-	private function spliceVoid( pos : Int, len : Int ) : Void
-	{
-		if( len < 0 ) return;
-		if( pos < 0 ) {
+	private function spliceVoid(pos:Int, len:Int):Void {
+		if (len < 0)
+			return;
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 ) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
-		if( pos > this.length ) {
+		if (pos > this.length) {
 			pos = 0;
 			len = 0;
-		} else if( pos + len > this.length ) {
+		} else if (pos + len > this.length) {
 			len = this.length - pos;
-			if( len < 0 ) len = 0;
+			if (len < 0)
+				len = 0;
 		}
 		var a = this.__a;
 
 		var end = pos + len;
 		System.arraycopy(a, end, a, pos, this.length - end);
 		this.length -= len;
-		while( --len >= 0 )
+		while (--len >= 0)
 			a[this.length + len] = null;
 	}
 
-	public function toString() : String
-	{
+	public function toString():String {
+		if (__hx_toString_depth >= 5) {
+			return "...";
+		}
+		++__hx_toString_depth;
+		try {
+			var s = __hx_toString();
+			--__hx_toString_depth;
+			return s;
+		} catch (e:Dynamic) {
+			--__hx_toString_depth;
+			throw(e);
+		}
+	}
+
+	function __hx_toString():String {
 		var ret = new StringBuf();
 		var a = __a;
 		ret.add("[");
 		var first = true;
-		for (i in 0...length)
-		{
+		for (i in 0...length) {
 			if (first)
 				first = false;
 			else
@@ -290,12 +309,10 @@ import java.NativeArray;
 		return ret.toString();
 	}
 
-	public function unshift( x : T ) : Void
-	{
+	public function unshift(x:T):Void {
 		var __a = __a;
 		var length = length;
-		if (length >= __a.length)
-		{
+		if (length >= __a.length) {
 			var newLen = (length << 1) + 1;
 			var newarr = new NativeArray(newLen);
 			System.arraycopy(__a, 0, newarr, 1, length);
@@ -309,14 +326,14 @@ import java.NativeArray;
 		++this.length;
 	}
 
-	public function insert( pos : Int, x : T ) : Void
-	{
+	public function insert(pos:Int, x:T):Void {
 		var l = this.length;
-		if( pos < 0 ) {
+		if (pos < 0) {
 			pos = l + pos;
-			if( pos < 0 ) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
-		if ( pos >= l ) {
+		if (pos >= l) {
 			this.push(x);
 			return;
 		} else if (pos == 0) {
@@ -324,8 +341,7 @@ import java.NativeArray;
 			return;
 		}
 
-		if (l >= __a.length)
-		{
+		if (l >= __a.length) {
 			var newLen = (length << 1) + 1;
 			var newarr = new NativeArray(newLen);
 			System.arraycopy(__a, 0, newarr, 0, pos);
@@ -343,15 +359,12 @@ import java.NativeArray;
 		}
 	}
 
-	public function remove( x : T ) : Bool
-	{
+	public function remove(x:T):Bool {
 		var __a = __a;
 		var i = -1;
 		var length = length;
-		while (++i < length)
-		{
-			if (__a[i] == x)
-			{
+		while (++i < length) {
+			if (__a[i] == x) {
 				System.arraycopy(__a, i + 1, __a, i, length - i - 1);
 				__a[--this.length] = null;
 
@@ -362,15 +375,14 @@ import java.NativeArray;
 		return false;
 	}
 
-	public function indexOf(x : T, ?fromIndex:Int) : Int {
+	public function indexOf(x:T, ?fromIndex:Int):Int {
 		var len = length, a = __a, i:Int = (fromIndex == null) ? 0 : fromIndex;
-		if (i < 0)
-		{
+		if (i < 0) {
 			i += len;
-			if (i < 0) i = 0;
+			if (i < 0)
+				i = 0;
 		}
-		while (i < len)
-		{
+		while (i < len) {
 			if (a[i] == x)
 				return i;
 			i++;
@@ -378,14 +390,15 @@ import java.NativeArray;
 		return -1;
 	}
 
-	public function lastIndexOf(x : T, ?fromIndex:Int) : Int {
-		var len = length, a = __a, i:Int = (fromIndex == null) ? len - 1 : fromIndex;
+	public function lastIndexOf(x:T, ?fromIndex:Int):Int {
+		var len = length,
+			a = __a,
+			i:Int = (fromIndex == null) ? len - 1 : fromIndex;
 		if (i >= len)
 			i = len - 1;
 		else if (i < 0)
 			i += len;
-		while (i >= 0)
-		{
+		while (i >= 0) {
 			if (a[i] == x)
 				return i;
 			i--;
@@ -393,8 +406,7 @@ import java.NativeArray;
 		return -1;
 	}
 
-	public function copy() : Array<T>
-	{
+	public function copy():Array<T> {
 		var len = length;
 		var __a = __a;
 		var newarr = new NativeArray(len);
@@ -402,28 +414,42 @@ import java.NativeArray;
 		return ofNative(newarr);
 	}
 
-	public inline function iterator() : Iterator<T>
-	{
+	public inline function iterator():Iterator<T> {
 		return new ArrayIterator<T>(this);
 	}
 
-	public function map<S>( f : T -> S ) : Array<S> {
-		var ret = [];
-		for (elt in this)
-			ret.push(f(elt));
+	public function resize(len:Int):Void {
+		if (length < len) {
+			if (__a.length < len) {
+				var newArr = new NativeArray<T>(len);
+				if (length > 0)
+					System.arraycopy(__a, 0, newArr, 0, length);
+				this.__a = __a = newArr;
+			}
+			this.length = len;
+		} else if (length > len) {
+			spliceVoid(len, length - len);
+		}
+	}
+
+	public inline function map<S>(f:T->S):Array<S> {
+		var ret = alloc(length);
+		for (i in 0...length)
+			ret.__set(i, f(__get(i)));
 		return ret;
 	}
 
-	public function filter( f : T -> Bool ) : Array<T> {
+	public inline function filter(f:T->Bool):Array<T> {
 		var ret = [];
-		for (elt in this)
+		for (i in 0...length) {
+			var elt = __get(i);
 			if (f(elt))
 				ret.push(elt);
+		}
 		return ret;
 	}
 
-	private function __get(idx:Int):T
-	{
+	private function __get(idx:Int):T {
 		var __a = __a;
 		if (idx >= __a.length || idx < 0)
 			return null;
@@ -431,11 +457,10 @@ import java.NativeArray;
 		return __a[idx];
 	}
 
-	private function __set(idx:Int, v:T):T
+	private function __set(idx:Int, v:T):#if jvm Void #else T #end
 	{
 		var __a = __a;
-		if (idx >= __a.length)
-		{
+		if (idx >= __a.length) {
 			var newl = idx + 1;
 			if (idx == __a.length)
 				newl = (idx << 1) + 1;
@@ -448,34 +473,32 @@ import java.NativeArray;
 		if (idx >= length)
 			this.length = idx + 1;
 
-		return __a[idx] = v;
+		#if !jvm return #end __a[idx] = v;
 	}
 
-	private inline function __unsafe_get(idx:Int):T
-	{
+	private inline function __unsafe_get(idx:Int):T {
 		return __a[idx];
 	}
 
-	private inline function __unsafe_set(idx:Int, val:T):T
-	{
+	private inline function __unsafe_set(idx:Int, val:T):T {
 		return __a[idx] = val;
 	}
 }
 
-@:final
-private class ArrayIterator<T>
-{
+private final class ArrayIterator<T> {
 	var arr:Array<T>;
 	var len:Int;
 	var i:Int;
 
-	public inline function new(a:Array<T>)
-	{
+	public inline function new(a:Array<T>) {
 		arr = a;
 		len = a.length;
 		i = 0;
 	}
 
-	public inline function hasNext():Bool return i < len;
-	public inline function next():T return arr[i++];
+	public inline function hasNext():Bool
+		return i < len;
+
+	public inline function next():T
+		return arr[i++];
 }
diff --git a/std/java/_std/Date.hx b/std/java/_std/Date.hx
index 03609efc872430260875c153e2d6170d4bb1ea1f..a1a42cc2bcca45fc37ac53567f2176b00555131f 100644
--- a/std/java/_std/Date.hx
+++ b/std/java/_std/Date.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,106 +19,127 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package;
+
 import haxe.Int64;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+@:coreApi class Date {
+	private var date:Calendar;
+	private var dateUTC:Calendar;
+
+	public function new(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Void {
+		date = new GregorianCalendar(year, month, day, hour, min, sec);
+		dateUTC = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+		dateUTC.setTimeInMillis(date.getTimeInMillis());
+	}
+
+	public inline function getTime():Float {
+		return cast date.getTimeInMillis();
+	}
+
+	public inline function getHours():Int {
+		return date.get(Calendar.HOUR_OF_DAY);
+	}
 
-@:SuppressWarnings("deprecation")
-@:coreApi class Date
-{
-	private var date:java.util.Date;
+	public inline function getMinutes():Int {
+		return date.get(Calendar.MINUTE);
+	}
+
+	public inline function getSeconds():Int {
+		return date.get(Calendar.SECOND);
+	}
+
+	public inline function getFullYear():Int {
+		return date.get(Calendar.YEAR);
+	}
+
+	public inline function getMonth():Int {
+		return date.get(Calendar.MONTH);
+	}
+
+	public inline function getDate():Int {
+		return date.get(Calendar.DAY_OF_MONTH);
+	}
 
-	public function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void
-	{
-		//issue #1769
-		year = year != 0 ? year - 1900 : 0;
-		date = new java.util.Date(year, month, day, hour, min, sec);
+	public inline function getDay():Int {
+		// SUNDAY in Java == 1, MONDAY == 2, ...
+		return cast date.get(Calendar.DAY_OF_WEEK) - 1;
 	}
 
-	public inline function getTime() : Float
-	{
-		return cast date.getTime();
+	public inline function getUTCHours():Int {
+		return dateUTC.get(Calendar.HOUR_OF_DAY);
 	}
 
-	public inline function getHours() : Int
-	{
-		return date.getHours();
+	public inline function getUTCMinutes():Int {
+		return dateUTC.get(Calendar.MINUTE);
 	}
 
-	public inline function getMinutes() : Int
-	{
-		return date.getMinutes();
+	public inline function getUTCSeconds():Int {
+		return dateUTC.get(Calendar.SECOND);
 	}
 
-	public inline function getSeconds() : Int
-	{
-		return date.getSeconds();
+	public inline function getUTCFullYear():Int {
+		return dateUTC.get(Calendar.YEAR);
 	}
 
-	public inline function getFullYear() : Int
-	{
-		return date.getYear() + 1900;
+	public inline function getUTCMonth():Int {
+		return dateUTC.get(Calendar.MONTH);
 	}
 
-	public inline function getMonth() : Int
-	{
-		return date.getMonth();
+	public inline function getUTCDate():Int {
+		return dateUTC.get(Calendar.DAY_OF_MONTH);
 	}
 
-	public inline function getDate() : Int
-	{
-		return date.getDate();
+	public inline function getUTCDay():Int {
+		// SUNDAY in Java == 1, MONDAY == 2, ...
+		return cast dateUTC.get(Calendar.DAY_OF_WEEK) - 1;
 	}
 
-	public inline function getDay() : Int
-	{
-		return date.getDay();
+	public inline function getTimezoneOffset():Int {
+		return -Std.int(date.get(Calendar.ZONE_OFFSET) / 60000);
 	}
 
-	public function toString():String
-	{
-		var m = date.getMonth() + 1;
-		var d = date.getDate();
-		var h = date.getHours();
-		var mi = date.getMinutes();
-		var s = date.getSeconds();
-		return (date.getYear() + 1900)
-			+"-"+(if( m < 10 ) "0"+m else ""+m)
-			+"-"+(if( d < 10 ) "0"+d else ""+d)
-			+" "+(if( h < 10 ) "0"+h else ""+h)
-			+":"+(if( mi < 10 ) "0"+mi else ""+mi)
-			+":"+(if( s < 10 ) "0"+s else ""+s);
+	public function toString():String {
+		var m = getMonth() + 1;
+		var d = getDate();
+		var h = getHours();
+		var mi = getMinutes();
+		var s = getSeconds();
+		return getFullYear() + "-" + (if (m < 10) "0" + m else "" + m) + "-" + (if (d < 10) "0" + d else "" + d) + " "
+			+ (if (h < 10) "0" + h else "" + h) + ":" + (if (mi < 10) "0" + mi else "" + mi) + ":" + (if (s < 10) "0" + s else "" + s);
 	}
 
-	static public function now() : Date
-	{
+	static public function now():Date {
 		var d = new Date(0, 0, 0, 0, 0, 0);
-		d.date = new java.util.Date();
+		d.date = Calendar.getInstance();
+		d.dateUTC.setTimeInMillis(d.date.getTimeInMillis());
 		return d;
 	}
 
-	static public function fromTime( t : Float ) : Date
-	{
+	static public function fromTime(t:Float):Date {
 		var d = new Date(0, 0, 0, 0, 0, 0);
-		d.date = new java.util.Date(cast(t, Int64));
+		d.date.setTimeInMillis(cast t);
+		d.dateUTC.setTimeInMillis(cast t);
 		return d;
 	}
 
-	static public function fromString( s : String ) : Date
-	{
-		switch( s.length )
-		{
+	static public function fromString(s:String):Date {
+		switch (s.length) {
 			case 8: // hh:mm:ss
 				var k = s.split(":");
-				var d : Date = new Date(0, 0, 0, Std.parseInt(k[0]), Std.parseInt(k[1]), Std.parseInt(k[2]));
-				return d;
+				return Date.fromTime(Std.parseInt(k[0]) * 3600000. + Std.parseInt(k[1]) * 60000. + Std.parseInt(k[2]) * 1000.);
 			case 10: // YYYY-MM-DD
 				var k = s.split("-");
-				return new Date(Std.parseInt(k[0]),Std.parseInt(k[1]) - 1,Std.parseInt(k[2]),0,0,0);
+				return new Date(Std.parseInt(k[0]), Std.parseInt(k[1]) - 1, Std.parseInt(k[2]), 0, 0, 0);
 			case 19: // YYYY-MM-DD hh:mm:ss
 				var k = s.split(" ");
 				var y = k[0].split("-");
 				var t = k[1].split(":");
-				return new Date(Std.parseInt(y[0]),Std.parseInt(y[1]) - 1,Std.parseInt(y[2]),Std.parseInt(t[0]),Std.parseInt(t[1]),Std.parseInt(t[2]));
+				return new Date(Std.parseInt(y[0]), Std.parseInt(y[1]) - 1, Std.parseInt(y[2]), Std.parseInt(t[0]), Std.parseInt(t[1]), Std.parseInt(t[2]));
 			default:
 				throw "Invalid date format : " + s;
 		}
diff --git a/std/java/_std/EReg.hx b/std/java/_std/EReg.hx
index 7f13c9a798d5c48c5a123b3c073840dffdde0b11..d4d18494a2327e85fbdb684171e5de0ad31fa267 100644
--- a/std/java/_std/EReg.hx
+++ b/std/java/_std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,21 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import java.util.regex.*;
 
-@:coreApi class EReg {
+using StringTools;
 
+@:coreApi class EReg {
 	private var pattern:String;
 	private var matcher:Matcher;
 	private var cur:String;
 	private var isGlobal:Bool;
 
-	public function new( r : String, opt : String ) {
+	public function new(r:String, opt:String) {
 		var flags = 0;
-		for (i in 0...opt.length)
-		{
-			switch(StringTools.fastCodeAt(opt, i))
-			{
+		for (i in 0...opt.length) {
+			switch (StringTools.fastCodeAt(opt, i)) {
 				case 'i'.code:
 					flags |= Pattern.CASE_INSENSITIVE;
 				case 'm'.code:
@@ -45,80 +45,78 @@ import java.util.regex.*;
 			}
 		}
 
+		flags |= Pattern.UNICODE_CASE;
+		#if !android // see https://github.com/HaxeFoundation/haxe/issues/7632
+		flags |= Pattern.UNICODE_CHARACTER_CLASS;
+		#end
 		matcher = Pattern.compile(convert(r), flags).matcher("");
 		pattern = r;
 	}
 
-	private static function convert(r:String):String
-	{
-		//some references of the implementation:
-		//http://stackoverflow.com/questions/809647/java-vs-javascript-regex-problem
-		//http://stackoverflow.com/questions/4788413/how-to-convert-javascript-regex-to-safe-java-regex
-		//Some necessary changes:
+	private static function convert(r:String):String {
+		// some references of the implementation:
+		// http://stackoverflow.com/questions/809647/java-vs-javascript-regex-problem
+		// http://stackoverflow.com/questions/4788413/how-to-convert-javascript-regex-to-safe-java-regex
+		// Some necessary changes:
 		//
 		// \0  -> \x00
 		// \v  -> \x0b
 		// [^] -> [\s\S]
 		// unescaped ', " -> \', \"
 		/* FIXME
-		var pat = new StringBuf();
-		var len = r.length;
-		var i = 0;
-		while (i < len)
-		{
-			var c = StringTools.fastCodeAt(r, i++);
-			switch(c)
+			var pat = new StringBuf();
+			var len = r.length;
+			var i = 0;
+			while (i < len)
 			{
-				case '\\'.code: //escape-sequence
+				var c = StringTools.fastCodeAt(r, i++);
+				switch(c)
+				{
+					case '\\'.code: //escape-sequence
 
+				}
 			}
-		}
-		*/
+		 */
+
 		return r;
 	}
 
-	public function match( s : String ) : Bool {
+	public function match(s:String):Bool {
 		cur = s;
 		matcher = matcher.reset(s);
 		return matcher.find();
 	}
 
-	public function matched( n : Int ) : String
-	{
+	public function matched(n:Int):String {
 		if (n == 0)
 			return matcher.group();
 		else
 			return matcher.group(n);
 	}
 
-	public function matchedLeft() : String
-	{
+	public function matchedLeft():String {
 		return untyped cur.substring(0, matcher.start());
 	}
 
-	public function matchedRight() : String
-	{
+	public function matchedRight():String {
 		return untyped cur.substring(matcher.end(), cur.length);
 	}
 
-	public function matchedPos() : { pos : Int, len : Int } {
+	public function matchedPos():{pos:Int, len:Int} {
 		var start = matcher.start();
-		return { pos : start, len : matcher.end() - start };
+		return {pos: start, len: matcher.end() - start};
 	}
 
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
-		matcher = matcher.reset(len < 0 ? s : s.substr(0,pos + len));
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
+		matcher = matcher.reset(len < 0 ? s : s.substr(0, pos + len));
 		cur = s;
 		return matcher.find(pos);
 	}
 
-	public function split( s : String ) : Array<String>
-	{
-		if (isGlobal)
-		{
+	public function split(s:String):Array<String> {
+		if (isGlobal) {
 			var ret = [];
-			while(this.match(s))
-			{
+			while (this.match(s)) {
 				ret.push(matchedLeft());
 				s = matchedRight();
 			}
@@ -127,8 +125,7 @@ import java.util.regex.*;
 		} else {
 			var m = matcher;
 			m.reset(s);
-			if (m.find())
-			{
+			if (m.find()) {
 				return untyped [s.substring(0, m.start()), s.substring(m.end(), s.length)];
 			} else {
 				return [s];
@@ -136,24 +133,21 @@ import java.util.regex.*;
 		}
 	}
 
-	inline function start(group:Int) : Int
-	{
+	inline function start(group:Int):Int {
 		return matcher.start(group);
 	}
 
-	inline function len(group:Int) : Int
-	{
+	inline function len(group:Int):Int {
 		return matcher.end(group) - matcher.start(group);
 	}
 
-	public function replace( s : String, by : String ) : String
-	{
-      matcher.reset(s);
-			by = by.split("$$").join("\\$");
-			return isGlobal ? matcher.replaceAll(by) : matcher.replaceFirst(by);
+	public function replace(s:String, by:String):String {
+		matcher.reset(s);
+		by = by.replace("\\", "\\\\").replace("$$", "\\$");
+		return isGlobal ? matcher.replaceAll(by) : matcher.replaceFirst(by);
 	}
 
-	public function map( s : String, f : EReg -> String ) : String {
+	public function map(s:String, f:EReg->String):String {
 		var offset = 0;
 		var buf = new StringBuf();
 		do {
@@ -169,12 +163,15 @@ import java.util.regex.*;
 			if (p.len == 0) {
 				buf.add(s.substr(p.pos, 1));
 				offset = p.pos + 1;
-			}
-			else
+			} else
 				offset = p.pos + p.len;
 		} while (isGlobal);
 		if (!isGlobal && offset > 0 && offset < s.length)
 			buf.add(s.substr(offset));
 		return buf.toString();
 	}
+
+	public static inline function escape(s:String):String {
+		return Pattern.quote(s);
+	}
 }
diff --git a/std/java/_std/Math.hx b/std/java/_std/Math.hx
index 13f4487150a711bea48b3e0a07aea056adad829b..4e6662704cb02cc1f9d4b4ba9378e5028f016999 100644
--- a/std/java/_std/Math.hx
+++ b/std/java/_std/Math.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 @:coreApi
-@:native("java.lang.Math") extern class Math
-{
-	static var PI(default,null) : Float;
-	static var NaN(default,null) : Float;
-	static var NEGATIVE_INFINITY(default,null) : Float;
-	static var POSITIVE_INFINITY(default,null) : Float;
+@:native("java.lang.Math") extern class Math {
+	static var PI(default, null):Float;
+	static var NaN(default, null):Float;
+	static var NEGATIVE_INFINITY(default, null):Float;
+	static var POSITIVE_INFINITY(default, null):Float;
 
 	static function abs(v:Float):Float;
-	static function min(a:Float,b:Float):Float;
-	static function max(a:Float,b:Float):Float;
+	static function min(a:Float, b:Float):Float;
+	static function max(a:Float, b:Float):Float;
 	static function sin(v:Float):Float;
 	static function cos(v:Float):Float;
-	static function atan2(y:Float,x:Float):Float;
+	static function atan2(y:Float, x:Float):Float;
 	static function tan(v:Float):Float;
 	static function exp(v:Float):Float;
 	static function log(v:Float):Float;
@@ -49,11 +47,9 @@
 	static function fceil(v:Float):Float;
 	static function asin(v:Float):Float;
 	static function acos(v:Float):Float;
-	static function pow(v:Float,exp:Float):Float;
-	static function random() : Float;
+	static function pow(v:Float, exp:Float):Float;
+	static function random():Float;
 
-	static function isFinite( f : Float ) : Bool;
-	static function isNaN( f : Float ) : Bool;
+	static function isFinite(f:Float):Bool;
+	static function isNaN(f:Float):Bool;
 }
-
-
diff --git a/std/java/_std/Reflect.hx b/std/java/_std/Reflect.hx
index a9395fd63fc649db234417595ca5800ba16aaa6d..6389300387f664dcbc92d23fe50bc828f084eae2 100644
--- a/std/java/_std/Reflect.hx
+++ b/std/java/_std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,9 +26,7 @@ import java.internal.Runtime;
 import java.Boot;
 
 @:coreApi class Reflect {
-
-	public static function hasField( o : Dynamic, field : String ) : Bool
-	{
+	public static function hasField(o:Dynamic, field:String):Bool {
 		if (Std.is(o, IHxObject)) {
 			return untyped (o : IHxObject).__hx_getField(field, false, true, false) != Runtime.undefined;
 		}
@@ -36,8 +34,7 @@ import java.Boot;
 	}
 
 	@:keep
-	public static function field( o : Dynamic, field : String ) : Dynamic
-	{
+	public static function field(o:Dynamic, field:String):Dynamic {
 		if (Std.is(o, IHxObject)) {
 			return untyped (o : IHxObject).__hx_getField(field, false, false, false);
 		}
@@ -45,8 +42,7 @@ import java.Boot;
 	}
 
 	@:keep
-	public static function setField( o : Dynamic, field : String, value : Dynamic ) : Void
-	{
+	public static function setField(o:Dynamic, field:String, value:Dynamic):Void {
 		if (Std.is(o, IHxObject)) {
 			untyped (o : IHxObject).__hx_setField(field, value, false);
 		} else {
@@ -54,8 +50,10 @@ import java.Boot;
 		}
 	}
 
-	public static function getProperty( o : Dynamic, field : String ) : Dynamic
-	{
+	public static function getProperty(o:Dynamic, field:String):Dynamic {
+		if (o == null || field == null) {
+			return null;
+		}
 		if (Std.is(o, IHxObject)) {
 			return untyped (o : IHxObject).__hx_getField(field, false, false, true);
 		}
@@ -65,25 +63,23 @@ import java.Boot;
 		return Runtime.slowGetField(o, field, false);
 	}
 
-	public static function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void
-	{
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void {
 		if (Std.is(o, IHxObject)) {
 			untyped (o : IHxObject).__hx_setField(field, value, true);
 		} else if (Runtime.slowHasField(o, "set_" + field)) {
-			Runtime.slowCallField(o, "set_" + field, [value]);
+			Runtime.slowCallField(o, "set_" + field, java.NativeArray.make(value));
 		} else {
 			Runtime.slowSetField(o, field, value);
 		}
 	}
 
-	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic
-	{
+	public static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic {
+		var args = java.Lib.nativeArray(args, true);
 		return untyped (func : Function).__hx_invokeDynamic(args);
 	}
 
 	@:keep
-	public static function fields( o : Dynamic ) : Array<String>
-	{
+	public static function fields(o:Dynamic):Array<String> {
 		if (Std.is(o, IHxObject)) {
 			var ret:Array<String> = [];
 			untyped (o : IHxObject).__hx_getFields(ret);
@@ -95,19 +91,16 @@ import java.Boot;
 		}
 	}
 
-	public static function isFunction( f : Dynamic ) : Bool
-	{
+	public static function isFunction(f:Dynamic):Bool {
 		return Std.is(f, Function);
 	}
 
-	public static function compare<T>( a : T, b : T ) : Int
-	{
+	public static function compare<T>(a:T, b:T):Int {
 		return Runtime.compare(a, b);
 	}
 
 	@:access(java.internal.Closure)
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool
-	{
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
 		if (f1 == f2) {
 			return true;
 		}
@@ -119,33 +112,34 @@ import java.Boot;
 		return false;
 	}
 
-	public static function isObject( v : Dynamic ) : Bool
-	{
-		return v != null && !(Std.is(v, HxEnum) || Std.is(v, Function) || Std.is(v, java.lang.Enum) || Std.is(v, java.lang.Number) || Std.is(v, java.lang.Boolean.BooleanClass));
+	public static function isObject(v:Dynamic):Bool {
+		return v != null
+			&& !(Std.is(v, HxEnum)
+				|| Std.is(v, Function)
+				|| Std.is(v, java.lang.Enum)
+				|| Std.is(v, java.lang.Number)
+				|| Std.is(v, java.lang.Boolean.BooleanClass));
 	}
 
-	public static function isEnumValue( v : Dynamic ) : Bool {
+	public static function isEnumValue(v:Dynamic):Bool {
 		return v != null && (Std.is(v, HxEnum) || Std.is(v, java.lang.Enum));
 	}
 
-	public static function deleteField( o : Dynamic, field : String ) : Bool
-	{
+	public static function deleteField(o:Dynamic, field:String):Bool {
 		return (Std.is(o, DynamicObject) && (o : DynamicObject).__hx_deleteField(field));
 	}
 
-	public static function copy<T>( o : T ) : T
-	{
-		var o2 : Dynamic = {};
-		for( f in Reflect.fields(o) )
-			Reflect.setField(o2,f,Reflect.field(o,f));
+	public static function copy<T>(o:Null<T>):Null<T> {
+		if (o == null)
+			return null;
+		var o2:Dynamic = {};
+		for (f in Reflect.fields(o))
+			Reflect.setField(o2, f, Reflect.field(o, f));
 		return cast o2;
 	}
 
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic
-	{
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
 		return new VarArgsFunction(f);
 	}
-
-
 }
diff --git a/std/java/_std/Std.hx b/std/java/_std/Std.hx
index 4556baf285a661d27a52aee0f6483b2d395e20fc..d4f933304809cf5208891d32dc7ff4314eed99a0 100644
--- a/std/java/_std/Std.hx
+++ b/std/java/_std/Std.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,10 +25,9 @@ import java.Lib;
 import java.internal.Exceptions;
 
 @:coreApi @:nativeGen class Std {
-	public static function is( v : Dynamic, t : Dynamic ) : Bool
-	{
+	public static function is(v:Dynamic, t:Dynamic):Bool {
 		if (v == null)
-			return t == Dynamic;
+			return false;
 		if (t == null)
 			return false;
 		var clt:java.lang.Class<Dynamic> = cast t;
@@ -36,8 +35,7 @@ import java.internal.Exceptions;
 			return false;
 		var name:String = clt.getName();
 
-		switch(name)
-		{
+		switch (name) {
 			case "double", "java.lang.Double":
 				return untyped __java__('haxe.lang.Runtime.isDouble(v)');
 			case "int", "java.lang.Integer":
@@ -53,11 +51,11 @@ import java.internal.Exceptions;
 		return clt.isAssignableFrom(clv);
 	}
 
-	public static function string( s : Dynamic ) : String {
+	public static function string(s:Dynamic):String {
 		return cast(s, String) + "";
 	}
 
-	public static function int( x : Float ) : Int {
+	public static function int(x:Float):Int {
 		return cast x;
 	}
 
@@ -131,65 +129,69 @@ import java.internal.Exceptions;
 		else
 			return null;
 	')
-	public static function parseInt( x : String ) : Null<Int> {
+	public static function parseInt(x:String):Null<Int> {
 		return null;
 	}
 
-	public static function parseFloat( x : String ) : Float {
-		if (x == null) return Math.NaN;
+	public static function parseFloat(x:String):Float {
+		if (x == null)
+			return Math.NaN;
 		x = StringTools.ltrim(x);
-		var found = false, hasDot = false, hasSign = false,
-		    hasE = false, hasESign = false, hasEData = false;
+		var found = false,
+			hasDot = false,
+			hasSign = false,
+			hasE = false,
+			hasESign = false,
+			hasEData = false;
 		var i = -1;
-		inline function getch(i:Int):Int return cast (untyped x._charAt(i) : java.StdTypes.Char16);
+		inline function getch(i:Int):Int
+			return cast(untyped x._charAt(i) : java.StdTypes.Char16);
 
-		while (++i < x.length)
-		{
+		while (++i < x.length) {
 			var chr = getch(i);
-			if (chr >= '0'.code && chr <= '9'.code)
-			{
-				if (hasE)
-				{
+			if (chr >= '0'.code && chr <= '9'.code) {
+				if (hasE) {
 					hasEData = true;
 				}
 				found = true;
-			} else switch (chr) {
-				case 'e'.code | 'E'.code if(!hasE):
-					hasE = true;
-				case '.'.code if (!hasDot):
-					hasDot = true;
-				case '-'.code, '+'.code if (!found && !hasSign):
-					hasSign = true;
-				case '-'.code | '+'.code if (found && !hasESign && hasE && !hasEData):
-					hasESign = true;
-				case _:
-					break;
-			}
+			} else
+				switch (chr) {
+					case 'e'.code | 'E'.code if (!hasE):
+						hasE = true;
+					case '.'.code if (!hasDot):
+						hasDot = true;
+					case '-'.code, '+'.code if (!found && !hasSign):
+						hasSign = true;
+					case '-'.code | '+'.code if (found && !hasESign && hasE && !hasEData):
+						hasESign = true;
+					case _:
+						break;
+				}
 		}
-		if (hasE && !hasEData)
-		{
+		if (hasE && !hasEData) {
 			i--;
 			if (hasESign)
 				i--;
 		}
 
-		if (i != x.length)
-		{
-			x = x.substr(0,i);
+		if (i != x.length) {
+			x = x.substr(0, i);
 		}
-		return try
-			java.lang.Double.DoubleClass.parseDouble(x)
-		catch(e:Dynamic)
-			Math.NaN;
+		return try java.lang.Double.DoubleClass.parseDouble(x) catch (e:Dynamic) Math.NaN;
 	}
 
-	inline public static function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
+	inline public static function downcast<T:{}, S:T>(value:T, c:Class<S>):S {
 		return Std.is(value, c) ? cast value : null;
 	}
 
-	public static function random( x : Int ) : Int {
-		if (x <= 0) return 0;
-		return Std.int(Math.random() * x);
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	inline public static function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return downcast(value, c);
 	}
 
+	public static function random(x:Int):Int {
+		if (x <= 0)
+			return 0;
+		return Std.int(Math.random() * x);
+	}
 }
diff --git a/std/java/_std/String.hx b/std/java/_std/String.hx
index c51ee32ac17fde6ff5cfc7deb1db12e6b9a48573..1cf2eb0b6f66fa042c98ec6ba4a3e6405a5b7c1d 100644
--- a/std/java/_std/String.hx
+++ b/std/java/_std/String.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,42 +19,40 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 @:coreApi extern class String implements java.lang.CharSequence {
+	var length(default, null):Int;
 
-	var length(default,null) : Int;
-
-	@:overload(function(b:haxe.io.BytesData, offset:Int, length:Int, charsetName:String):Void { })
-	@:overload(function(b:haxe.io.BytesData, offset:Int, length:Int):Void { })
-	function new(string:String) : Void;
-
-	function toUpperCase() : String;
+	@:overload(function(b:haxe.io.BytesData, offset:Int, length:Int, charsetName:String):Void {})
+	@:overload(function(b:haxe.io.BytesData, offset:Int, length:Int):Void {})
+	@:overload(function(b:java.NativeArray<java.StdTypes.Char16>):Void {})
+	function new(string:String):Void;
 
-	function toLowerCase() : String;
+	function toUpperCase():String;
 
-	function charAt( index : Int) : String;
+	function toLowerCase():String;
 
-	function charCodeAt( index : Int) : Null<Int>;
+	function charAt(index:Int):String;
 
-	function indexOf( str : String, ?startIndex : Int ) : Int;
+	function charCodeAt(index:Int):Null<Int>;
 
-	function lastIndexOf( str : String, ?startIndex : Int ) : Int;
+	function indexOf(str:String, ?startIndex:Int):Int;
 
-	function split( delimiter : String ) : Array<String>;
+	function lastIndexOf(str:String, ?startIndex:Int):Int;
 
-	function substr( pos : Int, ?len : Int ) : String;
+	function split(delimiter:String):Array<String>;
 
-	function substring( startIndex : Int, ?endIndex : Int ) : String;
+	function substr(pos:Int, ?len:Int):String;
 
-	function toString() : String;
+	function substring(startIndex:Int, ?endIndex:Int):String;
 
-	private function compareTo( anotherString : String ) : Int;
+	function toString():String;
 
-	private function codePointAt( idx : Int ) : Int;
+	private function compareTo(anotherString:String):Int;
 
-	@:overload(function() : haxe.io.BytesData { })
-	private function getBytes(encoding:String) : haxe.io.BytesData;
+	private function codePointAt(idx:Int):Int;
 
-	static function fromCharCode( code : Int ) : String;
+	@:overload(function():haxe.io.BytesData {})
+	private function getBytes(encoding:String):haxe.io.BytesData;
 
+	static function fromCharCode(code:Int):String;
 }
diff --git a/std/java/_std/StringBuf.hx b/std/java/_std/StringBuf.hx
index bb03d30ae13fbcc21fe0ff952174bdc4ff1e9096..d695dfe996ec3ebafaf8c06942e39375a2a12af3 100644
--- a/std/java/_std/StringBuf.hx
+++ b/std/java/_std/StringBuf.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,25 +19,31 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 @:coreApi
 class StringBuf {
+	private var b:java.lang.StringBuilder;
 
-	private var b : java.lang.StringBuilder;
-
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
-	public function new() : Void {
+	public function new():Void {
 		b = new java.lang.StringBuilder();
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return b.length();
 	}
 
-	public function add<T>( x : T ) : Void {
-		if (Std.is(x, Int))
-		{
+	#if jvm
+	public function add<T>(x:T):Void {
+		if (jvm.Jvm.instanceof(x, java.lang.Double.DoubleClass)) {
+			b.append(jvm.Jvm.toString(cast x));
+		} else {
+			b.append(x);
+		}
+	}
+	#else
+	public function add<T>(x:T):Void {
+		if (Std.is(x, Int)) {
 			var x:Int = cast x;
 			var xd:Dynamic = x;
 			b.append(xd);
@@ -45,18 +51,19 @@ class StringBuf {
 			b.append(x);
 		}
 	}
+	#end
 
-	public function addSub( s : String, pos : Int, ?len : Int ) : Void {
+	public function addSub(s:String, pos:Int, ?len:Int):Void {
 		var l:Int = (len == null) ? s.length - pos : len;
 		b.append(s, pos, pos + l);
 	}
 
-	public function addChar( c : Int ) : Void untyped {
-		b.append(cast(c, java.StdTypes.Char16));
-	}
+	public function addChar(c:Int):Void
+		untyped {
+			b.appendCodePoint(c);
+		}
 
-	public function toString() : String {
+	public function toString():String {
 		return b.toString();
 	}
-
 }
diff --git a/std/java/_std/Sys.hx b/std/java/_std/Sys.hx
index dde0f25119e16ca8953b365689b9f706e65e5fd8..da79ffba600ae9085ad9c1055e6242b1f812192d 100644
--- a/std/java/_std/Sys.hx
+++ b/std/java/_std/Sys.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,6 +22,7 @@
 
 import java.lang.System;
 import sys.io.Process;
+
 using haxe.Int64;
 
 @:coreApi class Sys {
@@ -29,74 +30,63 @@ using haxe.Int64;
 	private static var _env:haxe.ds.StringMap<String>;
 	private static var _sysName:String;
 
-	public static inline function print( v : Dynamic ) : Void
-	{
+	public static inline function print(v:Dynamic):Void {
 		java.lang.System.out.print(v);
 	}
 
-	public static inline function println( v : Dynamic ) : Void
-	{
+	public static inline function println(v:Dynamic):Void {
 		java.lang.System.out.println(v);
 	}
 
-	public static function args() : Array<String>
-	{
+	public static function args():Array<String> {
 		if (_args == null)
 			return [];
 		return java.Lib.array(_args);
 	}
 
-	public static function getEnv( s : String ) : String
-	{
+	public static function getEnv(s:String):String {
 		return java.lang.System.getenv(s);
 	}
 
-	public static function putEnv( s : String, v : String ) : Void
-	{
-		//java offers no support for it (!)
+	public static function putEnv(s:String, v:String):Void {
+		// java offers no support for it (!)
 		throw "Not implemented in this platform";
 	}
 
-	public static function environment() : Map<String,String>
-	{
+	public static function environment():Map<String, String> {
 		if (_env != null)
 			return _env;
 		var _env = _env = new haxe.ds.StringMap();
-		for (mv in java.lang.System.getenv().entrySet())
-		{
+		for (mv in java.lang.System.getenv().entrySet()) {
 			_env.set(mv.getKey(), mv.getValue());
 		}
 
 		return _env;
 	}
 
-	public static function sleep( seconds : Float ) : Void
-	{
+	public static function sleep(seconds:Float):Void {
 		try
 			java.lang.Thread.sleep(cast seconds * 1000)
 		catch (e:Dynamic)
 			throw e;
 	}
 
-	public static function setTimeLocale( loc : String ) : Bool
-	{
+	public static function setTimeLocale(loc:String):Bool {
 		return false;
 	}
 
-	public static function getCwd() : String
-	{
-		return new java.io.File(".").getAbsolutePath().substr(0,-1);
+	public static function getCwd():String {
+		return new java.io.File(".").getAbsolutePath().substr(0, -1);
 	}
 
-	public static function setCwd( s : String ) : Void
-	{
-		//java offers no support for it (!)
+	public static function setCwd(s:String):Void {
+		// java offers no support for it (!)
 		throw "not implemented";
 	}
 
-	public static function systemName() : String
-	{
-		if (_sysName != null) return _sysName;
+	public static function systemName():String {
+		if (_sysName != null)
+			return _sysName;
 		var sname = System.getProperty("os.name").toLowerCase();
 		if (sname.indexOf("win") >= 0)
 			return _sysName = "Windows";
@@ -110,79 +100,65 @@ using haxe.Int64;
 		return _sysName = System.getProperty("os.name");
 	}
 
-	public static function command( cmd : String, ?args : Array<String> ) : Int
-	{
+	public static function command(cmd:String, ?args:Array<String>):Int {
 		var pb = Process.createProcessBuilder(cmd, args);
-#if java6
+		#if java6
 		pb.redirectErrorStream(true);
-#else
+		#else
 		pb.redirectOutput(java.lang.ProcessBuilder.ProcessBuilder_Redirect.INHERIT);
 		pb.redirectError(java.lang.ProcessBuilder.ProcessBuilder_Redirect.INHERIT);
-#end
+		#end
 		var proc = pb.start();
-#if java6
+		#if java6
 		var reader = new java.io.NativeInput(proc.getInputStream());
-		try
-		{
-			while(true) {
+		try {
+			while (true) {
 				var ln = reader.readLine();
 				Sys.println(ln);
 			}
-		}
-		catch(e:haxe.io.Eof) {}
-#end
+		} catch (e:haxe.io.Eof) {}
+		#end
 		proc.waitFor();
 		var exitCode = proc.exitValue();
 		proc.destroy();
 		return exitCode;
 	}
 
-	public static function exit( code : Int ) : Void
-	{
+	public static function exit(code:Int):Void {
 		System.exit(code);
 	}
 
-	public static function time() : Float
-	{
+	public static function time():Float {
 		return cast(System.currentTimeMillis(), Float) / 1000;
 	}
 
-	public static function cpuTime() : Float
-	{
+	public static function cpuTime():Float {
 		return cast(System.nanoTime(), Float) / 1000000000;
 	}
 
-	@:deprecated("Use programPath instead") public static function executablePath() : String
-	{
+	@:deprecated("Use programPath instead") public static function executablePath():String {
 		return getCwd();
 	}
 
-	public static function programPath() : String {
-		return java.Lib.toNativeType(Sys)
-			.getProtectionDomain()
-			.getCodeSource()
-			.getLocation().toURI().getPath();
+	public static function programPath():String {
+		return java.Lib.toNativeType(Sys).getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
 	}
 
-	public static function getChar( echo : Bool ) : Int
-	{
-		//TODO
+	public static function getChar(echo:Bool):Int {
+		// TODO
 		return throw "Not implemented";
 	}
 
-	public static function stdin() : haxe.io.Input
-	{
+	public static function stdin():haxe.io.Input {
 		var _in:java.io.InputStream = Reflect.field(System, "in");
 		return new java.io.NativeInput(_in);
 	}
 
-	public static function stdout() : haxe.io.Output
-	{
+	public static function stdout():haxe.io.Output {
 		return new java.io.NativeOutput(System.out);
 	}
 
-	public static function stderr() : haxe.io.Output
-	{
+	public static function stderr():haxe.io.Output {
 		return new java.io.NativeOutput(System.err);
 	}
 }
diff --git a/std/java/_std/Type.hx b/std/java/_std/Type.hx
index c92832c07a244b594c4e870553d7ad6ad60bc602..2205edb43f3c8519f98a1cd82ac1052d4b351824 100644
--- a/std/java/_std/Type.hx
+++ b/std/java/_std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,31 +31,27 @@ enum ValueType {
 	TBool;
 	TObject;
 	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
 	TUnknown;
 }
 
 @:coreApi class Type {
-
-	public static function getClass<T>( o : T ) : Class<T>
-	{
+	public static function getClass<T>(o:T):Class<T> {
 		if (o == null || Std.is(o, DynamicObject) || Std.is(o, java.lang.Class)) {
 			return null;
 		}
 		return cast java.Lib.getNativeType(o);
 	}
 
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic>
-	{
+	public static function getEnum(o:EnumValue):Enum<Dynamic> {
 		if (Std.is(o, java.lang.Enum) || Std.is(o, HxEnum)) {
 			return untyped o.getClass();
 		}
 		return null;
 	}
 
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic>
-	{
+	public static function getSuperClass(c:Class<Dynamic>):Class<Dynamic> {
 		var c = java.Lib.toNativeType(c);
 		var cl:java.lang.Class<Dynamic> = c == null ? null : untyped c.getSuperclass();
 		if (cl != null && cl.getName() != "haxe.lang.HxObject" && cl.getName() != "java.lang.Object") {
@@ -64,16 +60,15 @@ enum ValueType {
 		return null;
 	}
 
-	public static function getClassName( c : Class<Dynamic> ) : String {
-		var c : java.lang.Class<Dynamic> = cast c;
+	public static function getClassName(c:Class<Dynamic>):String {
+		var c:java.lang.Class<Dynamic> = cast c;
 		var name:String = c.getName();
 		if (name.startsWith("haxe.root."))
 			return name.substr(10);
 		if (name.startsWith("java.lang"))
 			name = name.substr(10);
 
-		return switch(name)
-		{
+		return switch (name) {
 			case "int", "Integer": "Int";
 			case "double", "Double": "Float";
 			case "Object": "Dynamic";
@@ -81,22 +76,19 @@ enum ValueType {
 		}
 	}
 
-	public static function getEnumName( e : Enum<Dynamic> ) : String {
-		var c : java.lang.Class<Dynamic> = cast e;
+	public static function getEnumName(e:Enum<Dynamic>):String {
+		var c:java.lang.Class<Dynamic> = cast e;
 		var ret:String = c.getName();
 		if (ret.startsWith("haxe.root."))
 			return ret.substr(10);
-		else if (ret == "boolean" || ret == "java.lang.Boolean")
-			return "Bool";
 
 		return ret;
 	}
 
-	public static function resolveClass( name : String ) : Class<Dynamic>
-	{
+	public static function resolveClass(name:String):Class<Dynamic> {
 		try {
 			if (name.indexOf(".") == -1) {
-				name = "haxe.root." +name;
+				name = "haxe.root." + name;
 			}
 			return cast java.lang.Class.forName(name);
 		} catch (e:java.lang.ClassNotFoundException) {
@@ -112,7 +104,6 @@ enum ValueType {
 		}
 	}
 
-
 	@:functionCode('
 		if ("Bool".equals(name)) return boolean.class;
 		Class r = resolveClass(name);
@@ -120,134 +111,76 @@ enum ValueType {
 			return r;
 		return null;
 	')
-	public static function resolveEnum( name : String ) : Enum<Dynamic> untyped
-	{
-		if (name == "Bool") return Bool;
-		return resolveClass(name);
-	}
-
-	@:functionCode('
-			int len = args.length;
-			java.lang.Class[] cls = new java.lang.Class[len];
-			java.lang.Object[] objs = new java.lang.Object[len];
-
-			java.lang.reflect.Constructor[] ms = cl.getConstructors();
-			int msl = ms.length;
-			int realMsl = 0;
-			for(int i =0; i < msl; i++)
-			{
-				if (!ms[i].isVarArgs() && ms[i].getParameterTypes().length != len)
-				{
-					ms[i] = null;
-				} else {
-					ms[realMsl] = ms[i];
-					if (realMsl != i)
-						ms[i] = null;
-					realMsl++;
-				}
-			}
-
-			boolean hasNumber = false;
-
-			for (int i = 0; i < len; i++)
-			{
-				Object o = args.__get(i);
-				objs[i]= o;
-				cls[i] = o.getClass();
-				boolean isNum = false;
+	public static function resolveEnum(name:String):Enum<Dynamic>
+		untyped {
+			if (name == "Bool")
+				return Bool;
+			return resolveClass(name);
+		}
 
-				if (o instanceof java.lang.Number)
-				{
-					cls[i] = java.lang.Number.class;
-					isNum = hasNumber = true;
-				}
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T {
+		var nargs = args.length,
+			callArguments = new java.NativeArray<Dynamic>(nargs);
 
-				msl = realMsl;
-				realMsl = 0;
-
-				for (int j = 0; j < msl; j++)
-				{
-					java.lang.Class[] allcls = ms[j].getParameterTypes();
-					if (i < allcls.length)
-					{
-						if (! ((isNum && allcls[i].isPrimitive()) || allcls[i].isAssignableFrom(cls[i])) )
-						{
-							ms[j] = null;
-						} else {
-							ms[realMsl] = ms[j];
-							if (realMsl != j)
-								ms[j] = null;
-							realMsl++;
-						}
-					}
-				}
+		var ctors = java.Lib.toNativeType(cl).getConstructors(),
+			totalCtors = ctors.length,
+			validCtors = 0;
 
+		for (i in 0...totalCtors) {
+			var ctor = ctors[i];
+			var ptypes = ctor.getParameterTypes();
+			if (ptypes.length != nargs && !ctor.isVarArgs()) {
+				continue;
 			}
 
-			java.lang.reflect.Constructor found = ms[0];
-
-			if (hasNumber)
-			{
-				java.lang.Class[] allcls = found.getParameterTypes();
-
-				for (int i = 0; i < len; i++)
-				{
-					java.lang.Object o = objs[i];
-					if (o instanceof java.lang.Number)
-					{
-						java.lang.Class curCls = null;
-						if (i < allcls.length)
-						{
-							curCls = allcls[i];
-							if (!curCls.isAssignableFrom(o.getClass()))
-							{
-								String name = curCls.getName();
-								if (name.equals("double") || name.equals("java.lang.Double"))
-								{
-									objs[i] = ((java.lang.Number)o).doubleValue();
-								} else if (name.equals("int") || name.equals("java.lang.Integer"))
-								{
-									objs[i] = ((java.lang.Number)o).intValue();
-								} else if (name.equals("float") || name.equals("java.lang.Float"))
-								{
-									objs[i] = ((java.lang.Number)o).floatValue();
-								} else if (name.equals("byte") || name.equals("java.lang.Byte"))
-								{
-									objs[i] = ((java.lang.Number)o).byteValue();
-								} else if (name.equals("short") || name.equals("java.lang.Short"))
-								{
-									objs[i] = ((java.lang.Number)o).shortValue();
-								}
-							}
-						} //else varargs not handled TODO
+			var argNum = -1, valid = true;
+			for (arg in args) {
+				argNum++;
+				var expectedType = argNum < ptypes.length ? ptypes[argNum] : ptypes[ptypes.length - 1]; // varags
+				var isDynamic = Std.is(arg, DynamicObject) && expectedType.isAssignableFrom(java.Lib.getNativeType(arg));
+				var argType = Type.getClass(arg);
+
+				if (arg == null || isDynamic || (argType != null && expectedType.isAssignableFrom(java.Lib.toNativeType(argType)))) {
+					callArguments[argNum] = arg;
+				} else if (Std.is(arg, java.lang.Number)) {
+					var name = expectedType.getName();
+					switch (name) {
+						case 'double' | 'java.lang.Double':
+							callArguments[argNum] = (cast arg : java.lang.Number).doubleValue();
+						case 'int' | 'java.lang.Integer':
+							callArguments[argNum] = (cast arg : java.lang.Number).intValue();
+						case 'float' | 'java.lang.Float':
+							callArguments[argNum] = (cast arg : java.lang.Number).floatValue();
+						case 'byte' | 'java.lang.Byte':
+							callArguments[argNum] = (cast arg : java.lang.Number).byteValue();
+						case 'short' | 'java.lang.Short':
+							callArguments[argNum] = (cast arg : java.lang.Number).shortValue();
+						case _:
+							valid = false;
+							break;
 					}
+				} else {
+					valid = false;
+					break;
 				}
 			}
+			if (!valid) {
+				continue;
+			}
 
-		try {
-			found.setAccessible(true);
-			return (T) found.newInstance(objs);
-		}
-		catch (java.lang.reflect.InvocationTargetException e)
-		{
-			throw haxe.lang.HaxeException.wrap(e.getCause());
+			// the current constructor was found and it is valid - call it
+			ctor.setAccessible(true);
+			return cast ctor.newInstance(callArguments);
 		}
 
-		catch (Throwable t)
-		{
-			throw haxe.lang.HaxeException.wrap(t);
-		}
-	')
-	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T untyped
-	{
-		return null;
+		throw 'Could not find any constructor that matches the provided arguments for class $cl';
 	}
 
 	// cache empty constructor arguments so we don't allocate it on each createEmptyInstance call
 	@:protected @:readOnly static var __createEmptyInstance_EMPTY_TYPES = java.NativeArray.make(java.Lib.toNativeEnum(java.internal.Runtime.EmptyObject));
 	@:protected @:readOnly static var __createEmptyInstance_EMPTY_ARGS = java.NativeArray.make(java.internal.Runtime.EmptyObject.EMPTY);
 
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T {
+	public static function createEmptyInstance<T>(cl:Class<T>):T {
 		var t = java.Lib.toNativeType(cl);
 		try {
 			var ctor = t.getConstructor(__createEmptyInstance_EMPTY_TYPES);
@@ -257,23 +190,20 @@ enum ValueType {
 		}
 	}
 
-	@:functionCode('
-		if (params == null || params.length == 0)
-		{
-			java.lang.Object ret = haxe.lang.Runtime.slowGetField(e, constr, true);
-			if (ret instanceof haxe.lang.Function)
-				throw haxe.lang.HaxeException.wrap("Constructor " + constr + " needs parameters");
-			return (T) ret;
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T {
+		if (params == null || params.length == 0) {
+			var ret:Dynamic = java.internal.Runtime.slowGetField(e, constr, true);
+			if (Std.is(ret, java.internal.Function)) {
+				throw "Constructor " + constr + " needs parameters";
+			}
+			return ret;
 		} else {
-			return (T) haxe.lang.Runtime.slowCallField(e, constr, params);
+			var params = java.Lib.nativeArray(params, true);
+			return java.internal.Runtime.slowCallField(e, constr, params);
 		}
-	')
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T
-	{
-		return null;
 	}
 
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T {
 		var constr = getEnumConstructs(e);
 		return createEnum(e, constr[index], params);
 	}
@@ -303,7 +233,7 @@ enum ValueType {
 
 		return ret;
 	')
-	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String> {
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String> {
 		return null;
 	}
 
@@ -333,17 +263,17 @@ enum ValueType {
 
 		return ret;
 	')
-	public static function getClassFields( c : Class<Dynamic> ) : Array<String> {
+	public static function getClassFields(c:Class<Dynamic>):Array<String> {
 		return null;
 	}
 
-	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> {
-		if (Reflect.hasField(e, "__hx_constructs"))
-		{
+	public static function getEnumConstructs(e:Enum<Dynamic>):Array<String> {
+		if (Reflect.hasField(e, "__hx_constructs")) {
 			var ret:Array<String> = java.Lib.array(untyped e.__hx_constructs);
 			return ret.copy();
 		}
-		var vals:java.NativeArray<java.lang.Enum<Dynamic>> = untyped e.values(), ret = [];
+		var vals:java.NativeArray<java.lang.Enum<Dynamic>> = untyped e.values(),
+			ret = [];
 		for (i in 0...vals.length)
 			ret[i] = vals[i].name();
 		return ret;
@@ -377,10 +307,10 @@ enum ValueType {
 			return ValueType.TClass(v.getClass());
 		}
 	')
-	public static function typeof( v : Dynamic ) : ValueType untyped
-	{
-		return null;
-	}
+	public static function typeof(v:Dynamic):ValueType
+		untyped {
+			return null;
+		}
 
 	@:functionCode('
 			if (a instanceof haxe.lang.Enum)
@@ -388,10 +318,10 @@ enum ValueType {
 			else
 				return haxe.lang.Runtime.eq(a, b);
 	')
-	public static function enumEq<T>( a : T, b : T ) : Bool untyped
-	{
-		return a == b;
-	}
+	public static function enumEq<T>(a:T, b:T):Bool
+		untyped {
+			return a == b;
+		}
 
 	@:functionCode('
 		if (e instanceof java.lang.Enum)
@@ -399,36 +329,35 @@ enum ValueType {
 		else
 			return ((haxe.lang.Enum) e).getTag();
 	')
-	public static function enumConstructor( e : EnumValue ) : String untyped
-	{
-		return null;
-	}
+	public static function enumConstructor(e:EnumValue):String
+		untyped {
+			return null;
+		}
 
 	@:functionCode('
 		return ( e instanceof java.lang.Enum ) ? new haxe.root.Array() : ((haxe.lang.Enum) e).getParams();
 	')
-	public static function enumParameters( e : EnumValue ) : Array<Dynamic> untyped
-	{
-		return null;
-	}
+	public static function enumParameters(e:EnumValue):Array<Dynamic>
+		untyped {
+			return null;
+		}
 
+	@:ifFeature("has_enum")
 	@:functionCode('
 		if (e instanceof java.lang.Enum)
 			return ((java.lang.Enum) e).ordinal();
 		else
 			return ((haxe.lang.Enum) e).index;
 	')
-	public static function enumIndex( e : EnumValue ) : Int untyped
-	{
-		return e.index;
-	}
+	public static function enumIndex(e:EnumValue):Int
+		untyped {
+			return e.index;
+		}
 
-	public static function allEnums<T>( e : Enum<T> ) : Array<T>
-	{
+	public static function allEnums<T>(e:Enum<T>):Array<T> {
 		var ctors = getEnumConstructs(e);
 		var ret = [];
-		for (ctor in ctors)
-		{
+		for (ctor in ctors) {
 			var v = Reflect.field(e, ctor);
 			if (Std.is(v, e))
 				ret.push(v);
@@ -436,5 +365,4 @@ enum ValueType {
 
 		return ret;
 	}
-
 }
diff --git a/std/java/_std/haxe/Int64.hx b/std/java/_std/haxe/Int64.hx
index 5d2d2a54812c2a376c099abc5f78a485a9ee3264..5f6ac934f6521e91cab44097d9cd71e194fddfc9 100644
--- a/std/java/_std/haxe/Int64.hx
+++ b/std/java/_std/haxe/Int64.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
+
 using haxe.Int64;
 
 import haxe.Int64Helper;
@@ -27,203 +29,214 @@ import haxe.Int64Helper;
 private typedef __Int64 = java.StdTypes.Int64;
 
 @:coreApi
-abstract Int64(__Int64) from __Int64 to __Int64
-{
+abstract Int64(__Int64) from __Int64 to __Int64 {
+	#if jvm
+	extern public static function make(high:Int32, low:Int32):Int64;
+	#else
+	public static inline function make(high:Int32, low:Int32):Int64
+		return new Int64(((cast high : __Int64) << 32) | ((cast low : __Int64) & (untyped __java__('0xffffffffL') : Int64)));
+	#end
+
+	private inline function new(x:__Int64)
+		this = x;
 
-	public static inline function make( high : Int32, low : Int32 ) : Int64
-		return new Int64( (cast(high, __Int64) << 32) | (cast(low, __Int64)& (untyped __java__('0xffffffffL') : Int64)) );
+	private var val(get, set):__Int64;
 
-	private inline function new(x : __Int64)
-		this = x;
+	inline function get_val():__Int64
+		return this;
+
+	inline function set_val(x:__Int64):__Int64
+		return this = x;
+
+	public var high(get, never):Int32;
 
-	private var val( get, set ) : __Int64;
-	inline function get_val() : __Int64 return this;
-	inline function set_val( x : __Int64 ) : __Int64 return this = x;
+	public inline function get_high():Int32
+		return cast(this >> 32);
 
-	public var high( get, never ):Int32;
-	public inline function get_high():Int32 return cast(this >> 32);
+	public var low(get, never):Int32;
 
-	public var low( get, never ):Int32;
-	public inline function get_low():Int32 return cast this;
+	public inline function get_low():Int32
+		return cast this;
 
 	public inline function copy():Int64
-		return new Int64( this );
+		return new Int64(this);
 
-	@:from public static inline function ofInt( x : Int ) : Int64
+	@:from public static inline function ofInt(x:Int):Int64
 		return cast x;
 
-	inline public static function is( val : Dynamic ) : Bool
-		return Std.is(val,java.lang.Long.LongClass);
+	inline public static function is(val:Dynamic):Bool
+		return Std.is(val, java.lang.Long.LongClass);
 
-	public static inline function toInt( x : Int64 ) : Int {
-		if( x.val < 0x80000000 || x.val > 0x7FFFFFFF )
+	public static inline function toInt(x:Int64):Int {
+		if (x.val < 0x80000000 || x.val > 0x7FFFFFFF)
 			throw "Overflow";
 		return cast x.val;
 	}
 
-	public static inline function getHigh( x : Int64 ) : Int32
-		return cast( x.val >> 32 );
+	public static inline function getHigh(x:Int64):Int32
+		return cast(x.val >> 32);
 
-	public static inline function getLow( x : Int64 ) : Int32
-		return cast( x.val );
+	public static inline function getLow(x:Int64):Int32
+		return cast(x.val);
 
-	public static inline function isNeg( x : Int64 ) : Bool
+	public static inline function isNeg(x:Int64):Bool
 		return x.val < 0;
 
-	public static inline function isZero( x : Int64 ) : Bool
+	public static inline function isZero(x:Int64):Bool
 		return x.val == 0;
 
-	public static inline function compare( a : Int64, b : Int64 ) : Int
-	{
-		if( a.val < b.val ) return -1;
-		if( a.val > b.val ) return 1;
+	public static inline function compare(a:Int64, b:Int64):Int {
+		if (a.val < b.val)
+			return -1;
+		if (a.val > b.val)
+			return 1;
 		return 0;
 	}
 
-	public static inline function ucompare( a : Int64, b : Int64 ) : Int {
-		if( a.val < 0 )
-			return ( b.val < 0 ) ? compare( a, b ) : 1;
-		return ( b.val < 0 ) ? -1 : compare( a, b );
+	public static inline function ucompare(a:Int64, b:Int64):Int {
+		if (a.val < 0)
+			return (b.val < 0) ? compare(a, b) : 1;
+		return (b.val < 0) ? -1 : compare(a, b);
 	}
 
-	public static inline function toStr( x : Int64 ) : String
+	public static inline function toStr(x:Int64):String
 		return '${x.val}';
 
-	public static inline function divMod( dividend : Int64, divisor : Int64 ) : { quotient : Int64, modulus : Int64 }
-		return { quotient: dividend / divisor, modulus: dividend % divisor };
+	public static inline function divMod(dividend:Int64, divisor:Int64):{quotient:Int64, modulus:Int64}
+		return {quotient: dividend / divisor, modulus: dividend % divisor};
 
-	private inline function toString() : String
+	private inline function toString():String
 		return '$this';
 
-	public static function parseString( sParam : String ) : Int64 {
+	public static function parseString(sParam:String):Int64 {
 		// can this be done?: return new Int64( java.lang.Long.LongClass.parseLong( sParam ) );
-		return Int64Helper.parseString( sParam );
+		return Int64Helper.parseString(sParam);
 	}
 
-	public static function fromFloat( f : Float ) : Int64 {
-		return Int64Helper.fromFloat( f );
+	public static function fromFloat(f:Float):Int64 {
+		return Int64Helper.fromFloat(f);
 	}
 
-	@:op(-A) public static function neg( x : Int64 ) : Int64
+	@:op(-A) public static function neg(x:Int64):Int64
 		return -x.val;
 
-	@:op(++A) private inline function preIncrement() : Int64
+	@:op(++A) private inline function preIncrement():Int64
 		return ++this;
 
-	@:op(A++) private inline function postIncrement() : Int64
+	@:op(A++) private inline function postIncrement():Int64
 		return this++;
 
-	@:op(--A) private inline function preDecrement() : Int64
+	@:op(--A) private inline function preDecrement():Int64
 		return --this;
 
-	@:op(A--) private inline function postDecrement() : Int64
+	@:op(A--) private inline function postDecrement():Int64
 		return this--;
 
-	@:op(A + B) public static inline function add( a : Int64, b : Int64 ) : Int64
+	@:op(A + B) public static inline function add(a:Int64, b:Int64):Int64
 		return a.val + b.val;
 
-	@:op(A + B) @:commutative private static inline function addInt( a : Int64, b : Int ) : Int64
+	@:op(A + B) @:commutative private static inline function addInt(a:Int64, b:Int):Int64
 		return a.val + b;
 
-	@:op(A - B) public static inline function sub( a : Int64, b : Int64 ) : Int64
+	@:op(A - B) public static inline function sub(a:Int64, b:Int64):Int64
 		return a.val - b.val;
 
-	@:op(A - B) private static inline function subInt( a : Int64, b : Int ) : Int64
+	@:op(A - B) private static inline function subInt(a:Int64, b:Int):Int64
 		return a.val - b;
 
-	@:op(A - B) private static inline function intSub( a : Int, b : Int64 ) : Int64
+	@:op(A - B) private static inline function intSub(a:Int, b:Int64):Int64
 		return a - b.val;
 
-	@:op(A * B) public static inline function mul( a : Int64, b : Int64 ) : Int64
+	@:op(A * B) public static inline function mul(a:Int64, b:Int64):Int64
 		return a.val * b.val;
 
-	@:op(A * B) @:commutative private static inline function mulInt( a : Int64, b : Int ) : Int64
+	@:op(A * B) @:commutative private static inline function mulInt(a:Int64, b:Int):Int64
 		return a.val * b;
 
-	@:op(A / B) public static inline function div( a : Int64, b : Int64 ) : Int64
+	@:op(A / B) public static inline function div(a:Int64, b:Int64):Int64
 		return a.val / b.val;
 
-	@:op(A / B) private static inline function divInt( a : Int64, b : Int ) : Int64
+	@:op(A / B) private static inline function divInt(a:Int64, b:Int):Int64
 		return a.val / b;
 
-	@:op(A / B) private static inline function intDiv( a : Int, b : Int64 ) : Int64
+	@:op(A / B) private static inline function intDiv(a:Int, b:Int64):Int64
 		return a / b.val;
 
-	@:op(A % B) public static inline function mod( a : Int64, b : Int64 ) : Int64
+	@:op(A % B) public static inline function mod(a:Int64, b:Int64):Int64
 		return a.val % b.val;
 
-	@:op(A % B) private static inline function modInt( a : Int64, b : Int ) : Int64
+	@:op(A % B) private static inline function modInt(a:Int64, b:Int):Int64
 		return a.val % b;
 
-	@:op(A % B) private static inline function intMod( a : Int, b : Int64 ) : Int64
+	@:op(A % B) private static inline function intMod(a:Int, b:Int64):Int64
 		return a % b.val;
 
-	@:op(A == B) public static inline function eq( a : Int64, b : Int64 ) : Bool
+	@:op(A == B) public static inline function eq(a:Int64, b:Int64):Bool
 		return a.val == b.val;
 
-	@:op(A == B) @:commutative private static inline function eqInt( a : Int64, b : Int ) : Bool
+	@:op(A == B) @:commutative private static inline function eqInt(a:Int64, b:Int):Bool
 		return a.val == b;
 
-	@:op(A != B) public static inline function neq( a : Int64, b : Int64 ) : Bool
+	@:op(A != B) public static inline function neq(a:Int64, b:Int64):Bool
 		return a.val != b.val;
 
-	@:op(A != B) @:commutative private static inline function neqInt( a : Int64, b : Int ) : Bool
+	@:op(A != B) @:commutative private static inline function neqInt(a:Int64, b:Int):Bool
 		return a.val != b;
 
-	@:op(A < B) private static inline function lt( a : Int64, b : Int64 ) : Bool
+	@:op(A < B) private static inline function lt(a:Int64, b:Int64):Bool
 		return a.val < b.val;
 
-	@:op(A < B) private static inline function ltInt( a : Int64, b : Int ) : Bool
+	@:op(A < B) private static inline function ltInt(a:Int64, b:Int):Bool
 		return a.val < b;
 
-	@:op(A < B) private static inline function intLt( a : Int, b : Int64 ) : Bool
+	@:op(A < B) private static inline function intLt(a:Int, b:Int64):Bool
 		return a < b.val;
 
-	@:op(A <= B) private static inline function lte( a : Int64, b : Int64 ) : Bool
+	@:op(A <= B) private static inline function lte(a:Int64, b:Int64):Bool
 		return a.val <= b.val;
 
-	@:op(A <= B) private static inline function lteInt( a : Int64, b : Int ) : Bool
+	@:op(A <= B) private static inline function lteInt(a:Int64, b:Int):Bool
 		return a.val <= b;
 
-	@:op(A <= B) private static inline function intLte( a : Int, b : Int64 ) : Bool
+	@:op(A <= B) private static inline function intLte(a:Int, b:Int64):Bool
 		return a <= b.val;
 
-	@:op(A > B) private static inline function gt( a : Int64, b : Int64 ) : Bool
+	@:op(A > B) private static inline function gt(a:Int64, b:Int64):Bool
 		return a.val > b.val;
 
-	@:op(A > B) private static inline function gtInt( a : Int64, b : Int ) : Bool
+	@:op(A > B) private static inline function gtInt(a:Int64, b:Int):Bool
 		return a.val > b;
 
-	@:op(A > B) private static inline function intGt( a : Int, b : Int64 ) : Bool
+	@:op(A > B) private static inline function intGt(a:Int, b:Int64):Bool
 		return a > b.val;
 
-	@:op(A >= B) private static inline function gte( a : Int64, b : Int64 ) : Bool
+	@:op(A >= B) private static inline function gte(a:Int64, b:Int64):Bool
 		return a.val >= b.val;
 
-	@:op(A >= B) private static inline function gteInt( a : Int64, b : Int ) : Bool
+	@:op(A >= B) private static inline function gteInt(a:Int64, b:Int):Bool
 		return a.val >= b;
 
-	@:op(A >= B) private static inline function intGte( a : Int, b : Int64 ) : Bool
+	@:op(A >= B) private static inline function intGte(a:Int, b:Int64):Bool
 		return a >= b.val;
 
-	@:op(~A) private static inline function complement( x : Int64 ) : Int64
+	@:op(~A) private static inline function complement(x:Int64):Int64
 		return ~x.val;
 
-	@:op(A & B) public static inline function and( a : Int64, b : Int64 ) : Int64
+	@:op(A & B) public static inline function and(a:Int64, b:Int64):Int64
 		return a.val & b.val;
 
-	@:op(A | B) public static inline function or( a : Int64, b : Int64 ) : Int64
+	@:op(A | B) public static inline function or(a:Int64, b:Int64):Int64
 		return a.val | b.val;
 
-	@:op(A ^ B) public static inline function xor( a : Int64, b : Int64 ) : Int64
+	@:op(A ^ B) public static inline function xor(a:Int64, b:Int64):Int64
 		return a.val ^ b.val;
 
-	@:op(A << B) public static inline function shl( a : Int64, b : Int ) : Int64
+	@:op(A << B) public static inline function shl(a:Int64, b:Int):Int64
 		return a.val << b;
 
-	@:op(A >> B) public static inline function shr( a : Int64, b : Int ) : Int64
+	@:op(A >> B) public static inline function shr(a:Int64, b:Int):Int64
 		return a.val >> b;
 
-	@:op(A >>> B) public static inline function ushr( a : Int64, b : Int ) : Int64
+	@:op(A >>> B) public static inline function ushr(a:Int64, b:Int):Int64
 		return a.val >>> b;
 }
diff --git a/std/java/_std/haxe/Resource.hx b/std/java/_std/haxe/Resource.hx
index 38a243220f9167c8f9378e7d24c1f210f747aad5..525e84aaea96c2eb53713edd51655543d7191f2f 100644
--- a/std/java/_std/haxe/Resource.hx
+++ b/std/java/_std/haxe/Resource.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,18 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 @:coreApi class Resource {
+	@:keep static var content:Array<String>;
 
-	@:keep static var content : Array<String>;
-
-	public static inline function listNames() : Array<String> {
+	public static inline function listNames():Array<String> {
 		return content.copy();
 	}
 
 	@:access(haxe.io.Path.escape)
-	public static function getString( name : String ) : String {
+	public static function getString(name:String):String {
 		name = haxe.io.Path.escape(name, true);
 		var stream = cast(Resource, java.lang.Class<Dynamic>).getResourceAsStream("/" + name);
 		if (stream == null)
@@ -40,7 +40,7 @@ package haxe;
 	}
 
 	@:access(haxe.io.Path.escape)
-	public static function getBytes( name : String ) : haxe.io.Bytes {
+	public static function getBytes(name:String):haxe.io.Bytes {
 		name = haxe.io.Path.escape(name, true);
 		var stream = cast(Resource, java.lang.Class<Dynamic>).getResourceAsStream("/" + name);
 		if (stream == null)
diff --git a/std/java/_std/haxe/ds/IntMap.hx b/std/java/_std/haxe/ds/IntMap.hx
index 9dc4a85eb3d1841b1dacb184a1e0e329f78fdb48..75053a2ccbab176e298bc3137cfbba6f6f2ec32c 100644
--- a/std/java/_std/haxe/ds/IntMap.hx
+++ b/std/java/_std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 import java.NativeArray;
@@ -30,9 +31,7 @@ import java.NativeArray;
  * Thanks also to Jonas Malaco Filho for his Haxe-written IntMap code inspired by Python tables.
  * (https://jonasmalaco.com/fossil/test/jonas-haxe/artifact/887b53126e237d6c68951111d594033403889304)
  */
-
-@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int,T>
-{
+@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
 	private static inline var HASH_UPPER = 0.7;
 
 	private var flags:NativeArray<Int>;
@@ -44,152 +43,160 @@ import java.NativeArray;
 	private var nOccupied:Int;
 	private var upperBound:Int;
 
+	#if !no_map_cache
 	private var cachedKey:Int;
 	private var cachedIndex:Int;
+	#end
 
-	public function new() : Void
-	{
+	public function new():Void {
+		#if !no_map_cache
 		cachedIndex = -1;
+		#end
 	}
 
-	public function set( key : Int, value : T ) : Void
-	{
-		var x:Int;
-		if (nOccupied >= upperBound)
-		{
-			if (nBuckets > (size << 1))
-				resize(nBuckets - 1); //clear "deleted" elements
-			else
+	public function set(key:Int, value:T):Void {
+		var targetIndex:Int;
+		if (nOccupied >= upperBound) {
+			if (nBuckets > (size << 1)) {
+				resize(nBuckets - 1); // clear "deleted" elements
+			} else {
 				resize(nBuckets + 1);
+			}
 		}
 
 		var flags = flags, _keys = _keys;
 		{
-			var mask = nBuckets - 1;
-			var site = x = nBuckets;
-			var k = hash(key);
-			var i = k & mask;
-
-			var delKey = -1;
-			//for speed up
-			if (flagIsEmpty(flags, i)) {
-				x = i;
+			var mask = nBuckets - 1,
+				hashedKey = hash(key),
+				curIndex = hashedKey & mask;
+
+			var delKey = -1, curFlag = 0;
+			// to speed things up, don't loop if the first bucket is already free
+			if (isEmpty(getFlag(flags, curIndex))) {
+				targetIndex = curIndex;
 			} else {
-				var inc = getInc(k, mask);
-				var last = i;
-				while (! (flagIsEmpty(flags, i) || _keys[i] == key) )
-				{
-					if (flagIsDel(flags,i) && delKey == -1)
-						delKey = i;
-					i = (i + inc) & mask;
-#if DEBUG_HASHTBL
-					if (i == last)
-					{
-						throw "assert";
+				var inc = getInc(hashedKey, mask), last = curIndex;
+				while (!(_keys[curIndex] == key || isEmpty(curFlag = getFlag(flags, curIndex)))) {
+					if (delKey == -1 && isDel(curFlag)) {
+						delKey = curIndex;
 					}
-#end
+					curIndex = (curIndex + inc) & mask;
+					#if debug
+					assert(curIndex != last);
+					#end
 				}
 
-				if (flagIsEmpty(flags, i) && delKey != -1)
-					x = delKey;
-				else
-					x = i;
+				if (delKey != -1 && isEmpty(getFlag(flags, curIndex))) {
+					targetIndex = delKey;
+				} else {
+					targetIndex = curIndex;
+				}
 			}
 		}
 
-		if (flagIsEmpty(flags, x))
-		{
-			_keys[x] = key;
-			vals[x] = value;
-			setIsBothFalse(flags, x);
+		var flag = getFlag(flags, targetIndex);
+		if (isEmpty(flag)) {
+			_keys[targetIndex] = key;
+			vals[targetIndex] = value;
+			setIsBothFalse(flags, targetIndex);
 			size++;
 			nOccupied++;
-		} else if (flagIsDel(flags, x)) {
-			_keys[x] = key;
-			vals[x] = value;
-			setIsBothFalse(flags, x);
+		} else if (isDel(flag)) {
+			_keys[targetIndex] = key;
+			vals[targetIndex] = value;
+			setIsBothFalse(flags, targetIndex);
 			size++;
 		} else {
-			assert(_keys[x] == key);
-			vals[x] = value;
+			#if debug
+			assert(_keys[targetIndex] == key);
+			#end
+			vals[targetIndex] = value;
 		}
 	}
 
-	@:final private function lookup( key : Int ) : Int
-	{
-		if (nBuckets != 0)
-		{
+	private final function lookup(key:Int):Int {
+		if (nBuckets != 0) {
 			var flags = flags, _keys = _keys;
 
-			var mask = nBuckets - 1, k = hash(key);
-			var i = k & mask;
-			var inc = getInc(k, mask); /* inc == 1 for linear probing */
-			var last = i;
-			while (!flagIsEmpty(flags, i) && (flagIsDel(flags, i) || _keys[i] != key))
-			{
-				i = (i + inc) & mask;
-				if (i == last)
-					return -1;
-			}
-			return isEither(flags, i) ? -1 : i;
+			var mask = nBuckets - 1,
+				k = hash(key),
+				index = k & mask,
+				curFlag = -1,
+				inc = getInc(k, mask), /* inc == 1 for linear probing */
+				last = index;
+			do {
+				if (_keys[index] == key) {
+					if (isEmpty(curFlag = getFlag(flags, index))) {
+						index = (index + inc) & mask;
+						continue;
+					} else if (isDel(curFlag)) {
+						return -1;
+					} else {
+						return index;
+					}
+				} else {
+					index = (index + inc) & mask;
+				}
+			} while (index != last);
 		}
 
 		return -1;
 	}
 
-	public function get( key : Int ) : Null<T>
-	{
+	public function get(key:Int):Null<T> {
 		var idx = -1;
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-
+			#end
 			return vals[idx];
 		}
 
 		return null;
 	}
 
-	private function getDefault( key : Int, def : T ) : T
-	{
+	private function getDefault(key:Int, def:T):T {
 		var idx = -1;
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-
+			#end
 			return vals[idx];
 		}
 
 		return def;
 	}
 
-	public function exists( key : Int ) : Bool
-	{
+	public function exists(key:Int):Bool {
 		var idx = -1;
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return true;
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
+			#end
 
 			return true;
 		}
@@ -197,100 +204,110 @@ import java.NativeArray;
 		return false;
 	}
 
-	public function remove( key : Int ) : Bool
-	{
+	public function remove(key:Int):Bool {
 		var idx = -1;
-		if (! (cachedKey == key && ( (idx = cachedIndex) != -1 )))
+		#if !no_map_cache
+		if (!(cachedKey == key && ((idx = cachedIndex) != -1)))
+		#end
 		{
 			idx = lookup(key);
 		}
 
-		if (idx == -1)
-		{
+		if (idx == -1) {
 			return false;
 		} else {
-			if (cachedKey == key)
+			#if !no_map_cache
+			if (cachedKey == key) {
 				cachedIndex = -1;
-
-			if (!isEither(flags, idx))
-			{
+			}
+			#end
+			if (!isEither(getFlag(flags, idx))) {
 				setIsDelTrue(flags, idx);
 				--size;
 
 				vals[idx] = null;
-				_keys[idx] = 0;
+				// we do NOT reset the keys here, as unlike StringMap, we check for keys equality
+				// and stop if we find a key that is equal to the one we're looking for
+				// setting this to 0 will allow the hash to contain duplicate `0` keys
+				// (see #6457)
+				// _keys[idx] = 0;
 			}
 
 			return true;
 		}
 	}
 
-	@:final private function resize(newNBuckets:Int) : Void
-	{
-		//This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
+	private final function resize(newNBuckets:Int):Void {
+		// This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
 		var newFlags = null;
 		var j = 1;
 		{
 			newNBuckets = roundUp(newNBuckets);
-			if (newNBuckets < 4) newNBuckets = 4;
-			if (size >= (newNBuckets * HASH_UPPER + 0.5)) /* requested size is too small */
-			{
+			if (newNBuckets < 4)
+				newNBuckets = 4;
+			if (size >= (newNBuckets * HASH_UPPER + 0.5))
+				/* requested size is too small */ {
 				j = 0;
 			} else { /* hash table size to be changed (shrink or expand); rehash */
 				var nfSize = flagsSize(newNBuckets);
-				newFlags = new NativeArray( nfSize );
-				for (i in 0...nfSize)
-					newFlags[i] = 0xaaaaaaaa;
-				if (nBuckets < newNBuckets) //expand
+				newFlags = new NativeArray(nfSize);
+				for (i in 0...nfSize) {
+					newFlags[i] = 0xaaaaaaaa; // isEmpty = true; isDel = false
+				}
+				if (nBuckets < newNBuckets) // expand
 				{
 					var k = new NativeArray(newNBuckets);
-					if (_keys != null)
+					if (_keys != null) {
 						arrayCopy(_keys, 0, k, 0, nBuckets);
+					}
 					_keys = k;
 
 					var v = new NativeArray(newNBuckets);
-					if (vals != null)
+					if (vals != null) {
 						arrayCopy(vals, 0, v, 0, nBuckets);
+					}
 					vals = v;
-				} //otherwise shrink
+				} // otherwise shrink
 			}
 		}
 
-		if (j != 0)
-		{ //rehashing is required
-			//resetting cache
+		if (j != 0) { // rehashing is required
+			#if !no_map_cache
+			// resetting cache
 			cachedKey = 0;
 			cachedIndex = -1;
+			#end
 
 			j = -1;
 			var nBuckets = nBuckets, _keys = _keys, vals = vals, flags = flags;
 
 			var newMask = newNBuckets - 1;
-			while (++j < nBuckets)
-			{
-				if (!isEither(flags, j))
-				{
+			while (++j < nBuckets) {
+				if (!isEither(getFlag(flags, j))) {
 					var key = _keys[j];
 					var val = vals[j];
 
+					// do not set keys as 0 - see comment about #6457
+					// _keys[j] = 0;
+					vals[j] = cast null;
 					setIsDelTrue(flags, j);
-					while (true) /* kick-out process; sort of like in Cuckoo hashing */
-					{
+					while (true)
+						/* kick-out process; sort of like in Cuckoo hashing */ {
 						var k = hash(key);
 						var inc = getInc(k, newMask);
 						var i = k & newMask;
-						while (!flagIsEmpty(newFlags, i))
+						while (!isEmpty(getFlag(newFlags, i))) {
 							i = (i + inc) & newMask;
+						}
 						setIsEmptyFalse(newFlags, i);
 
-						if (i < nBuckets && !isEither(flags, i)) /* kick out the existing element */
-						{
+						if (i < nBuckets && !isEither(getFlag(flags, i)))
+							/* kick out the existing element */ {
 							{
 								var tmp = _keys[i];
 								_keys[i] = key;
 								key = tmp;
-							}
-							{
+							} {
 								var tmp = vals[i];
 								vals[i] = val;
 								val = tmp;
@@ -306,14 +323,13 @@ import java.NativeArray;
 				}
 			}
 
-			if (nBuckets > newNBuckets) /* shrink the hash table */
-			{
+			if (nBuckets > newNBuckets)
+				/* shrink the hash table */ {
 				{
 					var k = new NativeArray(newNBuckets);
 					arrayCopy(_keys, 0, k, 0, newNBuckets);
 					this._keys = k;
-				}
-				{
+				} {
 					var v = new NativeArray(newNBuckets);
 					arrayCopy(vals, 0, v, 0, newNBuckets);
 					this.vals = v;
@@ -327,92 +343,63 @@ import java.NativeArray;
 		}
 	}
 
-	/**
-		Returns an iterator of all keys in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function keys() : Iterator<Int>
-	{
-		var i = 0;
-		var len = nBuckets;
-		return {
-			hasNext: function() {
-				for (j in i...len)
-				{
-					if (!isEither(flags, j))
-					{
-						i = j;
-						return true;
-					}
-				}
-				return false;
-			},
-			next: function() {
-				var ret = _keys[i];
-				cachedIndex = i;
-				cachedKey = ret;
-
-				i = i + 1;
-				return ret;
-			}
-		};
+	public inline function keys():Iterator<Int> {
+		return new IntMapKeyIterator(this);
 	}
 
-	/**
-		Returns an iterator of all values in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function iterator() : Iterator<T>
-	{
-		var i = 0;
-		var len = nBuckets;
-		return {
-			hasNext: function() {
-				for (j in i...len)
-				{
-					if (!isEither(flags, j))
-					{
-						i = j;
-						return true;
-					}
-				}
-				return false;
-			},
-			next: function() {
-				var ret = vals[i];
-				i = i + 1;
-				return ret;
-			}
-		};
+	public inline function iterator():Iterator<T> {
+		return new IntMapValueIterator(this);
 	}
 
-	/**
-		Returns an displayable representation of the hashtable content.
-	**/
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():IntMap<T> {
+		var copied = new IntMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
 
-	public function toString() : String {
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
-	private static inline function assert(x:Bool):Void
-	{
+	public function clear():Void {
+		flags = null;
+		_keys = null;
+		vals = null;
+		nBuckets = 0;
+		size = 0;
+		nOccupied = 0;
+		upperBound = 0;
+		#if !no_map_cache
+		cachedKey = 0;
+		cachedIndex = -1;
+		#end
+	}
+
+	private static inline function assert(x:Bool):Void {
 		#if debug
-		if (!x) throw "assert failed";
+		if (!x)
+			throw "assert failed";
 		#end
 	}
 
-	private static inline function defaultK():Int return 0;
+	private static inline function defaultK():Int
+		return 0;
 
 	private static inline function arrayCopy(sourceArray:Dynamic, sourceIndex:Int, destinationArray:Dynamic, destinationIndex:Int, length:Int):Void
 		java.lang.System.arraycopy(sourceArray, sourceIndex, destinationArray, destinationIndex, length);
@@ -423,29 +410,45 @@ import java.NativeArray;
 	private static inline function hash(i:Int):Int
 		return i;
 
-	private static inline function flagIsEmpty(flag:NativeArray<Int>, i:Int):Bool
-		return ( (flag[i >> 4] >>> ((i & 0xf) << 1)) & 2 ) != 0;
+	// flags represents a bit array with 2 significant bits for each index
+	// one bit for deleted (1), one for empty (2)
+	// so what this function does is:
+	//  * gets the integer with (flags / 16)
+	//  * shifts those bits to the right ((flags % 16) * 2) places
+	//  * masks it with 0b11
+	private static inline function getFlag(flags:NativeArray<Int>, i:Int):Int {
+		return ((flags[i >> 4] >>> ((i & 0xf) << 1)) & 3);
+	}
 
-	private static inline function flagIsDel(flag:NativeArray<Int>, i:Int):Bool
-		return ((flag[i >> 4] >>> ((i & 0xf) << 1)) & 1) != 0;
+	private static inline function isDel(flag:Int):Bool {
+		return (flag & 1) != 0;
+	}
 
-	private static inline function isEither(flag:NativeArray<Int>, i:Int):Bool
-		return ((flag[i >> 4] >>> ((i & 0xf) << 1)) & 3) != 0;
+	private static inline function isEmpty(flag:Int):Bool {
+		return (flag & 2) != 0;
+	}
 
-	private static inline function setIsDelFalse(flag:NativeArray<Int>, i:Int):Void
-		flag[i >> 4] &= ~(1 << ((i & 0xf) << 1));
+	private static inline function isEither(flag:Int):Bool {
+		return flag != 0;
+	}
+
+	private static inline function setIsDelFalse(flags:NativeArray<Int>, i:Int):Void {
+		flags[i >> 4] &= ~(1 << ((i & 0xf) << 1));
+	}
 
-	private static inline function setIsEmptyFalse(flag:NativeArray<Int>, i:Int):Void
-		flag[i >> 4] &= ~(2 << ((i & 0xf) << 1));
+	private static inline function setIsEmptyFalse(flags:NativeArray<Int>, i:Int):Void {
+		flags[i >> 4] &= ~(2 << ((i & 0xf) << 1));
+	}
 
-	private static inline function setIsBothFalse(flag:NativeArray<Int>, i:Int):Void
-		flag[i >> 4] &= ~(3 << ((i & 0xf) << 1));
+	private static inline function setIsBothFalse(flags:NativeArray<Int>, i:Int):Void {
+		flags[i >> 4] &= ~(3 << ((i & 0xf) << 1));
+	}
 
-	private static inline function setIsDelTrue(flag:NativeArray<Int>, i:Int):Void
-		flag[i >> 4] |= 1 << ((i & 0xf) << 1);
+	private static inline function setIsDelTrue(flags:NativeArray<Int>, i:Int):Void {
+		flags[i >> 4] |= 1 << ((i & 0xf) << 1);
+	}
 
-	private static inline function roundUp(x:Int):Int
-	{
+	private static inline function roundUp(x:Int):Int {
 		--x;
 		x |= (x) >>> 1;
 		x |= (x) >>> 2;
@@ -456,5 +459,65 @@ import java.NativeArray;
 	}
 
 	private static inline function flagsSize(m:Int):Int
-		return ((m) < 16? 1 : (m) >> 4);
+		return ((m) < 16 ? 1 : (m) >> 4);
+}
+
+@:access(haxe.ds.IntMap)
+private final class IntMapKeyIterator<T> {
+	var m:IntMap<T>;
+	var i:Int;
+	var len:Int;
+
+	public function new(m:IntMap<T>) {
+		this.i = 0;
+		this.m = m;
+		this.len = m.nBuckets;
+	}
+
+	public function hasNext():Bool {
+		for (j in i...len) {
+			if (!IntMap.isEither(IntMap.getFlag(m.flags, j))) {
+				i = j;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public function next():Int {
+		var ret = m._keys[i];
+		#if !no_map_cache
+		m.cachedIndex = i;
+		m.cachedKey = ret;
+		#end
+		i++;
+		return ret;
+	}
+}
+
+@:access(haxe.ds.IntMap)
+private final class IntMapValueIterator<T> {
+	var m:IntMap<T>;
+	var i:Int;
+	var len:Int;
+
+	public function new(m:IntMap<T>) {
+		this.i = 0;
+		this.m = m;
+		this.len = m.nBuckets;
+	}
+
+	public function hasNext():Bool {
+		for (j in i...len) {
+			if (!IntMap.isEither(IntMap.getFlag(m.flags, j))) {
+				i = j;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public inline function next():T {
+		return m.vals[i++];
+	}
 }
diff --git a/std/java/_std/haxe/ds/ObjectMap.hx b/std/java/_std/haxe/ds/ObjectMap.hx
index 7e7c6c1be121f8db7b250b368796cd46b8ce2a21..d01b4f63f15f0a70a3f0a8dd332c99e156bd6caf 100644
--- a/std/java/_std/haxe/ds/ObjectMap.hx
+++ b/std/java/_std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 import java.NativeArray;
 
-@:coreApi class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K,V>
-{
-	@:extern private static inline var HASH_UPPER = 0.77;
-	@:extern private static inline var FLAG_EMPTY = 0;
-	@:extern private static inline var FLAG_DEL = 1;
+@:coreApi class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
+	extern private static inline var HASH_UPPER = 0.77;
+	extern private static inline var FLAG_EMPTY = 0;
+	extern private static inline var FLAG_DEL = 1;
 
 	/**
 	 * This is the most important structure here and the reason why it's so fast.
@@ -38,6 +38,7 @@ import java.NativeArray;
 	 * The insertion algorithm will do the same but will also break when FLAG_DEL is found;
 	 */
 	private var hashes:NativeArray<HashType>;
+
 	private var _keys:NativeArray<K>;
 	private var vals:NativeArray<V>;
 
@@ -46,28 +47,29 @@ import java.NativeArray;
 	private var nOccupied:Int;
 	private var upperBound:Int;
 
+	#if !no_map_cache
 	private var cachedKey:K;
 	private var cachedIndex:Int;
+	#end
 
-#if DEBUG_HASHTBL
+	#if DEBUG_HASHTBL
 	private var totalProbes:Int;
 	private var probeTimes:Int;
 	private var sameHash:Int;
 	private var maxProbe:Int;
-#end
+	#end
 
-	public function new() : Void
-	{
+	public function new():Void {
+		#if !no_map_cache
 		cachedIndex = -1;
+		#end
 	}
 
-	public function set( key : K, value : V ) : Void
-	{
+	public function set(key:K, value:V):Void {
 		var x:Int, k:Int;
-		if (nOccupied >= upperBound)
-		{
+		if (nOccupied >= upperBound) {
 			if (nBuckets > (size << 1))
-				resize(nBuckets - 1); //clear "deleted" elements
+				resize(nBuckets - 1); // clear "deleted" elements
 			else
 				resize(nBuckets + 2);
 		}
@@ -80,22 +82,21 @@ import java.NativeArray;
 			var i = k & mask, nProbes = 0;
 
 			var delKey = -1;
-			//for speed up
+			// for speed up
 			if (isEmpty(hashes[i])) {
 				x = i;
 			} else {
-				//var inc = getInc(k, mask);
+				// var inc = getInc(k, mask);
 				var last = i, flag;
-				while(! (isEmpty(flag = hashes[i]) || (flag == k && untyped keys[i].equals(key))) )
-				{
+				while (!(isEmpty(flag = hashes[i]) || (flag == k && (cast keys[i] : java.lang.Object).equals(key)))) {
 					if (isDel(flag) && delKey == -1)
 						delKey = i;
 					i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
+					#if DEBUG_HASHTBL
 					probeTimes++;
 					if (i == last)
 						throw "assert";
-#end
+					#end
 				}
 
 				if (isEmpty(flag) && delKey != -1)
@@ -104,16 +105,15 @@ import java.NativeArray;
 					x = i;
 			}
 
-#if DEBUG_HASHTBL
+			#if DEBUG_HASHTBL
 			if (nProbes > maxProbe)
 				maxProbe = nProbes;
 			totalProbes++;
-#end
+			#end
 		}
 
 		var flag = hashes[x];
-		if (isEmpty(flag))
-		{
+		if (isEmpty(flag)) {
 			keys[x] = key;
 			vals[x] = value;
 			hashes[x] = k;
@@ -129,56 +129,55 @@ import java.NativeArray;
 			vals[x] = value;
 		}
 
+		#if !no_map_cache
 		cachedIndex = x;
 		cachedKey = key;
+		#end
 	}
 
-	@:final private function lookup( key : K ) : Int
-	{
-		if (nBuckets != 0)
-		{
+	private final function lookup(key:K):Int {
+		if (nBuckets != 0) {
 			var hashes = hashes, keys = _keys;
 
 			var mask = nBuckets - 1, hash = hash(key), k = hash, nProbes = 0;
 			var i = k & mask;
 			var last = i, flag;
-			//var inc = getInc(k, mask);
-			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || !(untyped keys[i].equals(key))))
-			{
+			// var inc = getInc(k, mask);
+			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || !((cast keys[i] : java.lang.Object).equals(key)))) {
 				i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
+				#if DEBUG_HASHTBL
 				probeTimes++;
 				if (i == last)
 					throw "assert";
-#end
+				#end
 			}
 
-#if DEBUG_HASHTBL
+			#if DEBUG_HASHTBL
 			if (nProbes > maxProbe)
 				maxProbe = nProbes;
 			totalProbes++;
-#end
+			#end
 			return isEither(flag) ? -1 : i;
 		}
 
 		return -1;
 	}
 
-	@:final @:private function resize(newNBuckets:Int) : Void
-	{
-		//This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
+	@:private final function resize(newNBuckets:Int):Void {
+		// This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
 		var newHash = null;
 		var j = 1;
 		{
 			newNBuckets = roundUp(newNBuckets);
-			if (newNBuckets < 4) newNBuckets = 4;
-			if (size >= (newNBuckets * HASH_UPPER + 0.5)) /* requested size is too small */
-			{
+			if (newNBuckets < 4)
+				newNBuckets = 4;
+			if (size >= (newNBuckets * HASH_UPPER + 0.5))
+				/* requested size is too small */ {
 				j = 0;
 			} else { /* hash table size to be changed (shrink or expand); rehash */
 				var nfSize = newNBuckets;
-				newHash = new NativeArray( nfSize );
-				if (nBuckets < newNBuckets) //expand
+				newHash = new NativeArray(nfSize);
+				if (nBuckets < newNBuckets) // expand
 				{
 					var k = new NativeArray(newNBuckets);
 					if (_keys != null)
@@ -189,33 +188,37 @@ import java.NativeArray;
 					if (vals != null)
 						arrayCopy(vals, 0, v, 0, nBuckets);
 					vals = v;
-				} //otherwise shrink
+				} // otherwise shrink
 			}
 		}
 
-		if (j != 0)
-		{ //rehashing is required
-			//resetting cache
+		if (j != 0) { // rehashing is required
+			// resetting cache
+			#if !no_map_cache
 			cachedKey = null;
 			cachedIndex = -1;
+			#end
 
 			j = -1;
-			var nBuckets = nBuckets, _keys = _keys, vals = vals, hashes = hashes;
+			var nBuckets = nBuckets,
+				_keys = _keys,
+				vals = vals,
+				hashes = hashes;
 
 			var newMask = newNBuckets - 1;
-			while (++j < nBuckets)
-			{
+			while (++j < nBuckets) {
 				var k;
-				if (!isEither(k = hashes[j]))
-				{
+				if (!isEither(k = hashes[j])) {
 					var key = _keys[j];
 					var val = vals[j];
 
+					_keys[j] = null;
+					vals[j] = cast null;
 					hashes[j] = FLAG_DEL;
-					while (true) /* kick-out process; sort of like in Cuckoo hashing */
-					{
+					while (true)
+						/* kick-out process; sort of like in Cuckoo hashing */ {
 						var nProbes = 0;
-						//var inc = getInc(k, newMask);
+						// var inc = getInc(k, newMask);
 						var i = k & newMask;
 
 						while (!isEmpty(newHash[i]))
@@ -223,14 +226,13 @@ import java.NativeArray;
 
 						newHash[i] = k;
 
-						if (i < nBuckets && !isEither(k = hashes[i])) /* kick out the existing element */
-						{
+						if (i < nBuckets && !isEither(k = hashes[i]))
+							/* kick out the existing element */ {
 							{
 								var tmp = _keys[i];
 								_keys[i] = key;
 								key = tmp;
-							}
-							{
+							} {
 								var tmp = vals[i];
 								vals[i] = val;
 								val = tmp;
@@ -246,14 +248,13 @@ import java.NativeArray;
 				}
 			}
 
-			if (nBuckets > newNBuckets) /* shrink the hash table */
-			{
+			if (nBuckets > newNBuckets)
+				/* shrink the hash table */ {
 				{
 					var k = new NativeArray(newNBuckets);
 					arrayCopy(_keys, 0, k, 0, newNBuckets);
 					this._keys = k;
-				}
-				{
+				} {
 					var v = new NativeArray(newNBuckets);
 					arrayCopy(vals, 0, v, 0, newNBuckets);
 					this.vals = v;
@@ -267,19 +268,20 @@ import java.NativeArray;
 		}
 	}
 
-	public function get( key : K ) : Null<V>
-	{
+	public function get(key:K):Null<V> {
 		var idx = -1;
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
+			#end
 
 			return vals[idx];
 		}
@@ -287,19 +289,20 @@ import java.NativeArray;
 		return null;
 	}
 
-	private function getDefault( key : K, def : V ) : V
-	{
+	private function getDefault(key:K, def:V):V {
 		var idx = -1;
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
+			#end
 
 			return vals[idx];
 		}
@@ -307,19 +310,20 @@ import java.NativeArray;
 		return def;
 	}
 
-	public function exists( key : K ) : Bool
-	{
+	public function exists(key:K):Bool {
 		var idx = -1;
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return true;
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
+			#end
 
 			return true;
 		}
@@ -327,20 +331,22 @@ import java.NativeArray;
 		return false;
 	}
 
-	public function remove( key : K ) : Bool
-	{
+	public function remove(key:K):Bool {
 		var idx = -1;
-		if (! (cachedKey == key && ( (idx = cachedIndex) != -1 )))
+		#if !no_map_cache
+		if (!(cachedKey == key && ((idx = cachedIndex) != -1)))
+		#end
 		{
 			idx = lookup(key);
 		}
 
-		if (idx == -1)
-		{
+		if (idx == -1) {
 			return false;
 		} else {
+			#if !no_map_cache
 			if (cachedKey == key)
 				cachedIndex = -1;
+			#end
 
 			hashes[idx] = FLAG_DEL;
 			_keys[idx] = null;
@@ -351,86 +357,61 @@ import java.NativeArray;
 		}
 	}
 
-	/**
-		Returns an iterator of all keys in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function keys() : Iterator<K>
-	{
-		var i = 0;
-		var len = nBuckets;
-		return {
-			hasNext: function() {
-				for (j in i...len)
-				{
-					if (!isEither(hashes[j]))
-					{
-						i = j;
-						return true;
-					}
-				}
-				return false;
-			},
-			next: function() {
-				var ret = _keys[i];
-				cachedIndex = i;
-				cachedKey = ret;
-
-				i = i + 1;
-				return ret;
-			}
-		};
+	public function keys():Iterator<K> {
+		return new ObjectMapKeyIterator(this);
 	}
 
-	/**
-		Returns an iterator of all values in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function iterator() : Iterator<V>
-	{
-		var i = 0;
-		var len = nBuckets;
-		return {
-			hasNext: function() {
-				for (j in i...len)
-				{
-					if (!isEither(hashes[j]))
-					{
-						i = j;
-						return true;
-					}
-				}
-				return false;
-			},
-			next: function() {
-				var ret = vals[i];
-				i = i + 1;
-				return ret;
-			}
-		};
+	public function iterator():Iterator<V> {
+		return new ObjectMapValueIterator(this);
 	}
 
-	/**
-		Returns an displayable representation of the hashtable content.
-	**/
+	@:runtime public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():ObjectMap<K, V> {
+		var copied = new ObjectMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
 
-	public function toString() : String {
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(Std.string(i));
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
-	@:extern private static inline function roundUp(x:Int):Int
-	{
+	public function clear():Void {
+		hashes = null;
+		_keys = null;
+		vals = null;
+		nBuckets = 0;
+		size = 0;
+		nOccupied = 0;
+		upperBound = 0;
+		#if !no_map_cache
+		cachedKey = null;
+		cachedIndex = -1;
+		#end
+		#if DEBUG_HASHTBL
+		totalProbes = 0;
+		probeTimes = 0;
+		sameHash = 0;
+		maxProbe = 0;
+		#end
+	}
+
+	extern private static inline function roundUp(x:Int):Int {
 		--x;
 		x |= (x) >>> 1;
 		x |= (x) >>> 2;
@@ -440,38 +421,36 @@ import java.NativeArray;
 		return ++x;
 	}
 
-	@:extern private static inline function getInc(k:Int, mask:Int):Int //return 1 for linear probing
+	extern private static inline function getInc(k:Int, mask:Int):Int // return 1 for linear probing
 		return (((k) >> 3 ^ (k) << 3) | 1) & (mask);
 
-	@:extern private static inline function isEither(v:HashType):Bool
+	extern private static inline function isEither(v:HashType):Bool
 		return (v & 0xFFFFFFFE) == 0;
 
-	@:extern private static inline function isEmpty(v:HashType):Bool
+	extern private static inline function isEmpty(v:HashType):Bool
 		return v == FLAG_EMPTY;
 
-	@:extern private static inline function isDel(v:HashType):Bool
+	extern private static inline function isDel(v:HashType):Bool
 		return v == FLAG_DEL;
 
-	//guarantee: Whatever this function is, it will never return 0 nor 1
-	@:extern private static inline function hash(s:Dynamic):HashType
-	{
-		var k:Int = untyped s.hashCode();
-		//k *= 357913941;
-		//k ^= k << 24;
-		//k += ~357913941;
-		//k ^= k >> 31;
-		//k ^= k << 31;
-
-		k = (k+0x7ed55d16) + (k<<12);
-		k = (k^0xc761c23c) ^ (k>>19);
-		k = (k+0x165667b1) + (k<<5);
-		k = (k+0xd3a2646c) ^ (k<<9);
-		k = (k+0xfd7046c5) + (k<<3);
-		k = (k^0xb55a4f09) ^ (k>>16);
+	// guarantee: Whatever this function is, it will never return 0 nor 1
+	extern private static inline function hash(s:Dynamic):HashType {
+		var k:Int = (cast s : java.lang.Object).hashCode();
+		// k *= 357913941;
+		// k ^= k << 24;
+		// k += ~357913941;
+		// k ^= k >> 31;
+		// k ^= k << 31;
+
+		k = (k + 0x7ed55d16) + (k << 12);
+		k = (k ^ 0xc761c23c) ^ (k >> 19);
+		k = (k + 0x165667b1) + (k << 5);
+		k = (k + 0xd3a2646c) ^ (k << 9);
+		k = (k + 0xfd7046c5) + (k << 3);
+		k = (k ^ 0xb55a4f09) ^ (k >> 16);
 
 		var ret = k;
-		if (isEither(ret))
-		{
+		if (isEither(ret)) {
 			if (ret == 0)
 				ret = 2;
 			else
@@ -481,14 +460,78 @@ import java.NativeArray;
 		return ret;
 	}
 
-	@:extern private static inline function arrayCopy(sourceArray:Dynamic, sourceIndex:Int, destinationArray:Dynamic, destinationIndex:Int, length:Int):Void
+	extern private static inline function arrayCopy(sourceArray:Dynamic, sourceIndex:Int, destinationArray:Dynamic, destinationIndex:Int, length:Int):Void
 		java.lang.System.arraycopy(sourceArray, sourceIndex, destinationArray, destinationIndex, length);
 
-	@:extern private static inline function assert(x:Bool):Void
-	{
-#if DEBUG_HASHTBL
-		if (!x) throw "assert failed";
-#end
+	extern private static inline function assert(x:Bool):Void {
+		#if DEBUG_HASHTBL
+		if (!x)
+			throw "assert failed";
+		#end
+	}
+}
+
+@:access(haxe.ds.ObjectMap)
+private final class ObjectMapKeyIterator<T:{}, V> {
+	var m:ObjectMap<T, V>;
+	var i:Int;
+	var len:Int;
+
+	public function new(m:ObjectMap<T, V>) {
+		this.i = 0;
+		this.m = m;
+		this.len = m.nBuckets;
+	}
+
+	public function hasNext():Bool {
+		for (j in i...len) {
+			if (!ObjectMap.isEither(m.hashes[j])) {
+				i = j;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public function next():T {
+		var ret = m._keys[i];
+
+		#if !no_map_cache
+		m.cachedIndex = i;
+		m.cachedKey = ret;
+		#end
+
+		i = i + 1;
+		return ret;
+	}
+}
+
+@:access(haxe.ds.ObjectMap)
+private final class ObjectMapValueIterator<K:{}, T> {
+	var m:ObjectMap<K, T>;
+	var i:Int;
+	var len:Int;
+
+	public function new(m:ObjectMap<K, T>) {
+		this.i = 0;
+		this.m = m;
+		this.len = m.nBuckets;
+	}
+
+	public function hasNext():Bool {
+		for (j in i...len) {
+			if (!ObjectMap.isEither(m.hashes[j])) {
+				i = j;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public inline function next():T {
+		var ret = m.vals[i];
+		i = i + 1;
+		return ret;
 	}
 }
 
diff --git a/std/java/_std/haxe/ds/StringMap.hx b/std/java/_std/haxe/ds/StringMap.hx
index ddc8115631f533a3f08aa419287e281cfa81e5e9..f0d44e2c533e59caca909cfa623644fa702217de 100644
--- a/std/java/_std/haxe/ds/StringMap.hx
+++ b/std/java/_std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 import java.NativeArray;
 
-@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String,T>
-{
-	@:extern private static inline var HASH_UPPER = 0.77;
-	@:extern private static inline var FLAG_EMPTY = 0;
-	@:extern private static inline var FLAG_DEL = 1;
+@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String, T> {
+	extern private static inline var HASH_UPPER = 0.77;
+	extern private static inline var FLAG_EMPTY = 0;
+	extern private static inline var FLAG_DEL = 1;
 
 	/**
 	 * This is the most important structure here and the reason why it's so fast.
@@ -38,6 +38,7 @@ import java.NativeArray;
 	 * The insertion algorithm will do the same but will also break when FLAG_DEL is found;
 	 */
 	private var hashes:NativeArray<HashType>;
+
 	private var _keys:NativeArray<String>;
 	private var vals:NativeArray<T>;
 
@@ -46,30 +47,32 @@ import java.NativeArray;
 	private var nOccupied:Int;
 	private var upperBound:Int;
 
+	#if !no_map_cache
 	private var cachedKey:String;
 	private var cachedIndex:Int;
+	#end
 
-#if DEBUG_HASHTBL
+	#if DEBUG_HASHTBL
 	private var totalProbes:Int;
 	private var probeTimes:Int;
 	private var sameHash:Int;
 	private var maxProbe:Int;
-#end
+	#end
 
-	public function new() : Void
-	{
+	public function new():Void {
+		#if !no_map_cache
 		cachedIndex = -1;
+		#end
 	}
 
-	public function set( key : String, value : T ) : Void
-	{
+	public function set(key:String, value:T):Void {
 		var x:Int, k:Int;
-		if (nOccupied >= upperBound)
-		{
-			if (nBuckets > (size << 1))
-				resize(nBuckets - 1); //clear "deleted" elements
-			else
+		if (nOccupied >= upperBound) {
+			if (nBuckets > (size << 1)) {
+				resize(nBuckets - 1); // clear "deleted" elements
+			} else {
 				resize(nBuckets + 2);
+			}
 		}
 
 		var hashes = hashes, keys = _keys, hashes = hashes;
@@ -80,40 +83,39 @@ import java.NativeArray;
 			var i = k & mask, nProbes = 0;
 
 			var delKey = -1;
-			//for speed up
+			// to speed things up, don't loop if the first bucket is already free
 			if (isEmpty(hashes[i])) {
 				x = i;
 			} else {
-				//var inc = getInc(k, mask);
 				var last = i, flag;
-				while(! (isEmpty(flag = hashes[i]) || (flag == k && _keys[i] == key)) )
-				{
-					if (isDel(flag) && delKey == -1)
+				while (!(isEmpty(flag = hashes[i]) || (flag == k && _keys[i] == key))) {
+					if (isDel(flag) && delKey == -1) {
 						delKey = i;
+					}
 					i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
+					#if DEBUG_HASHTBL
 					probeTimes++;
 					if (i == last)
 						throw "assert";
-#end
+					#end
 				}
 
-				if (isEmpty(flag) && delKey != -1)
+				if (isEmpty(flag) && delKey != -1) {
 					x = delKey;
-				else
+				} else {
 					x = i;
+				}
 			}
 
-#if DEBUG_HASHTBL
+			#if DEBUG_HASHTBL
 			if (nProbes > maxProbe)
 				maxProbe = nProbes;
 			totalProbes++;
-#end
+			#end
 		}
 
 		var flag = hashes[x];
-		if (isEmpty(flag))
-		{
+		if (isEmpty(flag)) {
 			keys[x] = key;
 			vals[x] = value;
 			hashes[x] = k;
@@ -129,56 +131,55 @@ import java.NativeArray;
 			vals[x] = value;
 		}
 
+		#if !no_map_cache
 		cachedIndex = x;
 		cachedKey = key;
+		#end
 	}
 
-	@:final private function lookup( key : String ) : Int
-	{
-		if (nBuckets != 0)
-		{
+	private final function lookup(key:String):Int {
+		if (nBuckets != 0) {
 			var hashes = hashes, keys = _keys;
 
 			var mask = nBuckets - 1, hash = hash(key), k = hash, nProbes = 0;
 			var i = k & mask;
 			var last = i, flag;
-			//var inc = getInc(k, mask);
-			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || keys[i] != key))
-			{
+			// if we hit an empty bucket, it means we're done
+			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || keys[i] != key)) {
 				i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
+				#if DEBUG_HASHTBL
 				probeTimes++;
 				if (i == last)
 					throw "assert";
-#end
+				#end
 			}
 
-#if DEBUG_HASHTBL
+			#if DEBUG_HASHTBL
 			if (nProbes > maxProbe)
 				maxProbe = nProbes;
 			totalProbes++;
-#end
+			#end
 			return isEither(flag) ? -1 : i;
 		}
 
 		return -1;
 	}
 
-	@:final @:private function resize(newNBuckets:Int) : Void
-	{
-		//This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
+	@:private final function resize(newNBuckets:Int):Void {
+		// This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
 		var newHash = null;
 		var j = 1;
 		{
 			newNBuckets = roundUp(newNBuckets);
-			if (newNBuckets < 4) newNBuckets = 4;
-			if (size >= (newNBuckets * HASH_UPPER + 0.5)) /* requested size is too small */
-			{
+			if (newNBuckets < 4)
+				newNBuckets = 4;
+			if (size >= (newNBuckets * HASH_UPPER + 0.5))
+				/* requested size is too small */ {
 				j = 0;
 			} else { /* hash table size to be changed (shrink or expand); rehash */
 				var nfSize = newNBuckets;
-				newHash = new NativeArray( nfSize );
-				if (nBuckets < newNBuckets) //expand
+				newHash = new NativeArray(nfSize);
+				if (nBuckets < newNBuckets) // expand
 				{
 					var k = new NativeArray(newNBuckets);
 					if (_keys != null)
@@ -189,48 +190,51 @@ import java.NativeArray;
 					if (vals != null)
 						arrayCopy(vals, 0, v, 0, nBuckets);
 					vals = v;
-				} //otherwise shrink
+				} // otherwise shrink
 			}
 		}
 
-		if (j != 0)
-		{ //rehashing is required
-			//resetting cache
+		if (j != 0) { // rehashing is required
+			// resetting cache
+			#if !no_map_cache
 			cachedKey = null;
 			cachedIndex = -1;
+			#end
 
 			j = -1;
-			var nBuckets = nBuckets, _keys = _keys, vals = vals, hashes = hashes;
+			var nBuckets = nBuckets,
+				_keys = _keys,
+				vals = vals,
+				hashes = hashes;
 
 			var newMask = newNBuckets - 1;
-			while (++j < nBuckets)
-			{
+			while (++j < nBuckets) {
 				var k;
-				if (!isEither(k = hashes[j]))
-				{
+				if (!isEither(k = hashes[j])) {
 					var key = _keys[j];
 					var val = vals[j];
 
+					_keys[j] = null;
+					vals[j] = cast null;
 					hashes[j] = FLAG_DEL;
-					while (true) /* kick-out process; sort of like in Cuckoo hashing */
-					{
+					while (true)
+						/* kick-out process; sort of like in Cuckoo hashing */ {
 						var nProbes = 0;
-						//var inc = getInc(k, newMask);
 						var i = k & newMask;
 
-						while (!isEmpty(newHash[i]))
+						while (!isEmpty(newHash[i])) {
 							i = (i + ++nProbes) & newMask;
+						}
 
 						newHash[i] = k;
 
-						if (i < nBuckets && !isEither(k = hashes[i])) /* kick out the existing element */
-						{
+						if (i < nBuckets && !isEither(k = hashes[i]))
+							/* kick out the existing element */ {
 							{
 								var tmp = _keys[i];
 								_keys[i] = key;
 								key = tmp;
-							}
-							{
+							} {
 								var tmp = vals[i];
 								vals[i] = val;
 								val = tmp;
@@ -246,14 +250,13 @@ import java.NativeArray;
 				}
 			}
 
-			if (nBuckets > newNBuckets) /* shrink the hash table */
-			{
+			if (nBuckets > newNBuckets)
+				/* shrink the hash table */ {
 				{
 					var k = new NativeArray(newNBuckets);
 					arrayCopy(_keys, 0, k, 0, newNBuckets);
 					this._keys = k;
-				}
-				{
+				} {
 					var v = new NativeArray(newNBuckets);
 					arrayCopy(vals, 0, v, 0, newNBuckets);
 					this.vals = v;
@@ -267,39 +270,39 @@ import java.NativeArray;
 		}
 	}
 
-	public function get( key : String ) : Null<T>
-	{
+	public function get(key:String):Null<T> {
 		var idx = -1;
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
-
+		#end
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-
+			#end
 			return vals[idx];
 		}
 
 		return null;
 	}
 
-	private function getDefault( key : String, def : T ) : T
-	{
+	private function getDefault(key:String, def:T):T {
 		var idx = -1;
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return vals[idx];
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
+			#end
 
 			return vals[idx];
 		}
@@ -307,41 +310,43 @@ import java.NativeArray;
 		return def;
 	}
 
-	public function exists( key : String ) : Bool
-	{
+	public function exists(key:String):Bool {
 		var idx = -1;
-		if (cachedKey == key && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedKey == key && ((idx = cachedIndex) != -1)) {
 			return true;
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
+			#if !no_map_cache
 			cachedKey = key;
 			cachedIndex = idx;
-
+			#end
 			return true;
 		}
 
 		return false;
 	}
 
-	public function remove( key : String ) : Bool
-	{
+	public function remove(key:String):Bool {
 		var idx = -1;
-		if (! (cachedKey == key && ( (idx = cachedIndex) != -1 )))
+		#if !no_map_cache
+		if (!(cachedKey == key && ((idx = cachedIndex) != -1)))
+		#end
 		{
 			idx = lookup(key);
 		}
 
-		if (idx == -1)
-		{
+		if (idx == -1) {
 			return false;
 		} else {
-			if (cachedKey == key)
+			#if !no_map_cache
+			if (cachedKey == key) {
 				cachedIndex = -1;
-
+			}
+			#end
 			hashes[idx] = FLAG_DEL;
 			_keys[idx] = null;
 			vals[idx] = null;
@@ -351,86 +356,61 @@ import java.NativeArray;
 		}
 	}
 
-	/**
-		Returns an iterator of all keys in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function keys() : Iterator<String>
-	{
-		var i = 0;
-		var len = nBuckets;
-		return {
-			hasNext: function() {
-				for (j in i...len)
-				{
-					if (!isEither(hashes[j]))
-					{
-						i = j;
-						return true;
-					}
-				}
-				return false;
-			},
-			next: function() {
-				var ret = _keys[i];
-				cachedIndex = i;
-				cachedKey = ret;
-
-				i = i + 1;
-				return ret;
-			}
-		};
+	public inline function keys():Iterator<String> {
+		return new StringMapKeyIterator(this);
 	}
 
-	/**
-		Returns an iterator of all values in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function iterator() : Iterator<T>
-	{
-		var i = 0;
-		var len = nBuckets;
-		return {
-			hasNext: function() {
-				for (j in i...len)
-				{
-					if (!isEither(hashes[j]))
-					{
-						i = j;
-						return true;
-					}
-				}
-				return false;
-			},
-			next: function() {
-				var ret = vals[i];
-				i = i + 1;
-				return ret;
-			}
-		};
+	@:runtime public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
 	}
 
-	/**
-		Returns an displayable representation of the hashtable content.
-	**/
+	public inline function iterator():Iterator<T> {
+		return new StringMapValueIterator(this);
+	}
+
+	public function copy():StringMap<T> {
+		var copied = new StringMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
 
-	public function toString() : String {
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
-	@:extern private static inline function roundUp(x:Int):Int
-	{
+	public function clear():Void {
+		hashes = null;
+		_keys = null;
+		vals = null;
+		nBuckets = 0;
+		size = 0;
+		nOccupied = 0;
+		upperBound = 0;
+		#if !no_map_cache
+		cachedKey = null;
+		cachedIndex = -1;
+		#end
+		#if DEBUG_HASHTBL
+		totalProbes = 0;
+		probeTimes = 0;
+		sameHash = 0;
+		maxProbe = 0;
+		#end
+	}
+
+	extern private static inline function roundUp(x:Int):Int {
 		--x;
 		x |= (x) >>> 1;
 		x |= (x) >>> 2;
@@ -440,38 +420,36 @@ import java.NativeArray;
 		return ++x;
 	}
 
-	@:extern private static inline function getInc(k:Int, mask:Int):Int //return 1 for linear probing
+	extern private static inline function getInc(k:Int, mask:Int):Int // return 1 for linear probing
 		return (((k) >> 3 ^ (k) << 3) | 1) & (mask);
 
-	@:extern private static inline function isEither(v:HashType):Bool
+	extern private static inline function isEither(v:HashType):Bool
 		return (v & 0xFFFFFFFE) == 0;
 
-	@:extern private static inline function isEmpty(v:HashType):Bool
+	extern private static inline function isEmpty(v:HashType):Bool
 		return v == FLAG_EMPTY;
 
-	@:extern private static inline function isDel(v:HashType):Bool
+	extern private static inline function isDel(v:HashType):Bool
 		return v == FLAG_DEL;
 
-	//guarantee: Whatever this function is, it will never return 0 nor 1
-	@:extern private static inline function hash(s:String):HashType
-	{
-		var k:Int = untyped s.hashCode();
-		//k *= 357913941;
-		//k ^= k << 24;
-		//k += ~357913941;
-		//k ^= k >> 31;
-		//k ^= k << 31;
-
-		k = (k+0x7ed55d16) + (k<<12);
-		k = (k^0xc761c23c) ^ (k>>19);
-		k = (k+0x165667b1) + (k<<5);
-		k = (k+0xd3a2646c) ^ (k<<9);
-		k = (k+0xfd7046c5) + (k<<3);
-		k = (k^0xb55a4f09) ^ (k>>16);
+	// guarantee: Whatever this function is, it will never return 0 nor 1
+	extern private static inline function hash(s:String):HashType {
+		var k:Int = (cast s : java.NativeString).hashCode();
+		// k *= 357913941;
+		// k ^= k << 24;
+		// k += ~357913941;
+		// k ^= k >> 31;
+		// k ^= k << 31;
+
+		k = (k + 0x7ed55d16) + (k << 12);
+		k = (k ^ 0xc761c23c) ^ (k >> 19);
+		k = (k + 0x165667b1) + (k << 5);
+		k = (k + 0xd3a2646c) ^ (k << 9);
+		k = (k + 0xfd7046c5) + (k << 3);
+		k = (k ^ 0xb55a4f09) ^ (k >> 16);
 
 		var ret = k;
-		if (isEither(ret))
-		{
+		if (isEither(ret)) {
 			if (ret == 0)
 				ret = 2;
 			else
@@ -481,15 +459,75 @@ import java.NativeArray;
 		return ret;
 	}
 
-	@:extern private static inline function arrayCopy(sourceArray:Dynamic, sourceIndex:Int, destinationArray:Dynamic, destinationIndex:Int, length:Int):Void
+	extern private static inline function arrayCopy(sourceArray:Dynamic, sourceIndex:Int, destinationArray:Dynamic, destinationIndex:Int, length:Int):Void
 		java.lang.System.arraycopy(sourceArray, sourceIndex, destinationArray, destinationIndex, length);
 
-	@:extern private static inline function assert(x:Bool):Void
-	{
-#if DEBUG_HASHTBL
-		if (!x) throw "assert failed";
-#end
+	extern private static inline function assert(x:Bool):Void {
+		#if DEBUG_HASHTBL
+		if (!x)
+			throw "assert failed";
+		#end
 	}
 }
 
 private typedef HashType = Int;
+
+@:access(haxe.ds.StringMap)
+private final class StringMapKeyIterator<T> {
+	var m:StringMap<T>;
+	var i:Int;
+	var len:Int;
+
+	public function new(m:StringMap<T>) {
+		this.m = m;
+		this.i = 0;
+		this.len = m.nBuckets;
+	}
+
+	public function hasNext():Bool {
+		for (j in i...len) {
+			if (!StringMap.isEither(m.hashes[j])) {
+				i = j;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public function next():String {
+		var ret = m._keys[i];
+		#if !no_map_cache
+		m.cachedIndex = i;
+		m.cachedKey = ret;
+		#end
+		i++;
+		return ret;
+	}
+}
+
+@:access(haxe.ds.StringMap)
+private final class StringMapValueIterator<T> {
+	var m:StringMap<T>;
+	var i:Int;
+	var len:Int;
+
+	public function new(m:StringMap<T>) {
+		this.m = m;
+		this.i = 0;
+		this.len = m.nBuckets;
+	}
+
+	public function hasNext():Bool {
+		for (j in i...len) {
+			if (!StringMap.isEither(m.hashes[j])) {
+				i = j;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public inline function next():T {
+		return m.vals[i++];
+	}
+}
diff --git a/std/java/_std/haxe/ds/WeakMap.hx b/std/java/_std/haxe/ds/WeakMap.hx
index 17f747042000ce45af20a57dc36f823b220582d3..7fe55c744c52d914c1a0406d7b7c40056041df3f 100644
--- a/std/java/_std/haxe/ds/WeakMap.hx
+++ b/std/java/_std/haxe/ds/WeakMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,17 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 import java.NativeArray;
 import java.lang.ref.WeakReference;
 import java.lang.ref.ReferenceQueue;
 
-@:coreApi class WeakMap<K:{}, V> implements haxe.Constraints.IMap<K,V>
-{
-	@:extern private static inline var HASH_UPPER = 0.77;
-	@:extern private static inline var FLAG_EMPTY = 0;
-	@:extern private static inline var FLAG_DEL = 1;
+@:coreApi class WeakMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
+	extern private static inline var HASH_UPPER = 0.77;
+	extern private static inline var FLAG_EMPTY = 0;
+	extern private static inline var FLAG_DEL = 1;
 
 	/**
 	 * This is the most important structure here and the reason why it's so fast.
@@ -40,9 +40,10 @@ import java.lang.ref.ReferenceQueue;
 	 * The insertion algorithm will do the same but will also break when FLAG_DEL is found;
 	 */
 	private var hashes:NativeArray<HashType>;
-	private var entries:NativeArray<Entry<K,V>>;
 
-  //weak map specific
+	private var entries:NativeArray<Entry<K, V>>;
+
+	// weak map specific
 	private var queue:ReferenceQueue<K>;
 
 	private var nBuckets:Int;
@@ -50,50 +51,49 @@ import java.lang.ref.ReferenceQueue;
 	private var nOccupied:Int;
 	private var upperBound:Int;
 
-	private var cachedEntry:Entry<K,V>;
+	#if !no_map_cache
+	private var cachedEntry:Entry<K, V>;
 	private var cachedIndex:Int;
+	#end
 
-#if DEBUG_HASHTBL
+	#if DEBUG_HASHTBL
 	private var totalProbes:Int;
 	private var probeTimes:Int;
 	private var sameHash:Int;
 	private var maxProbe:Int;
-#end
+	#end
 
-	public function new() : Void
-	{
+	public function new():Void {
+		#if !no_map_cache
 		cachedIndex = -1;
+		#end
 		queue = new ReferenceQueue();
 	}
 
 	@:analyzer(ignore)
-	private function cleanupRefs():Void
-	{
+	private function cleanupRefs():Void {
 		var x:Dynamic = null, nOccupied = nOccupied;
-		while (( x = queue.poll()) != null)
-		{
-			//even if not found on hashtable (already removed), release value
-			var x:Entry<K,V> = cast x;
+		while ((x = queue.poll()) != null) {
+			// even if not found on hashtable (already removed), release value
+			var x:Entry<K, V> = cast x;
 			x.value = null;
 
-			//lookup index
-			if (nOccupied != 0)
-			{
+			// lookup index
+			if (nOccupied != 0) {
 				var mask = nBuckets - 1, hash = x.hash, nProbes = 0;
 				var i = hash & mask;
 				var last = i, flag;
-				while(!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != hash || entries[i] != x))
-				{
+				while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != hash || entries[i] != x)) {
 					i = (i + ++nProbes) & mask;
 				}
 
-				if (entries[i] == x)
-				{
-					if (cachedIndex == i)
-					{
+				if (entries[i] == x) {
+					#if !no_map_cache
+					if (cachedIndex == i) {
 						cachedIndex = -1;
 						cachedEntry = null;
 					}
+					#end
 					entries[i] = null;
 					hashes[i] = FLAG_DEL;
 					--size;
@@ -102,14 +102,12 @@ import java.lang.ref.ReferenceQueue;
 		}
 	}
 
-	public function set( key : K, value : V ) : Void
-	{
+	public function set(key:K, value:V):Void {
 		cleanupRefs();
 		var x:Int, k:Int;
-		if (nOccupied >= upperBound)
-		{
+		if (nOccupied >= upperBound) {
 			if (nBuckets > (size << 1))
-				resize(nBuckets - 1); //clear "deleted" elements
+				resize(nBuckets - 1); // clear "deleted" elements
 			else
 				resize(nBuckets + 2);
 		}
@@ -122,22 +120,21 @@ import java.lang.ref.ReferenceQueue;
 			var i = k & mask, nProbes = 0;
 
 			var delKey = -1;
-			//for speed up
+			// for speed up
 			if (isEmpty(hashes[i])) {
 				x = i;
 			} else {
-				//var inc = getInc(k, mask);
+				// var inc = getInc(k, mask);
 				var last = i, flag;
-				while(! (isEmpty(flag = hashes[i]) || (flag == k && entries[i].keyEquals(key) )) )
-				{
+				while (!(isEmpty(flag = hashes[i]) || (flag == k && entries[i].keyEquals(key)))) {
 					if (delKey == -1 && isDel(flag))
 						delKey = i;
 					i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
+					#if DEBUG_HASHTBL
 					probeTimes++;
 					if (i == last)
 						throw "assert";
-#end
+					#end
 				}
 
 				if (isEmpty(flag) && delKey != -1)
@@ -146,16 +143,15 @@ import java.lang.ref.ReferenceQueue;
 					x = i;
 			}
 
-#if DEBUG_HASHTBL
+			#if DEBUG_HASHTBL
 			if (nProbes > maxProbe)
 				maxProbe = nProbes;
 			totalProbes++;
-#end
+			#end
 		}
 
-		var flag = hashes[x], entry = new Entry(key,value,k,queue);
-		if (isEmpty(flag))
-		{
+		var flag = hashes[x], entry = new Entry(key, value, k, queue);
+		if (isEmpty(flag)) {
 			entries[x] = entry;
 			hashes[x] = k;
 			size++;
@@ -169,85 +165,84 @@ import java.lang.ref.ReferenceQueue;
 			entries[x] = entry;
 		}
 
+		#if !no_map_cache
 		cachedIndex = x;
 		cachedEntry = entry;
+		#end
 	}
 
-	@:final private function lookup( key : K ) : Int
-	{
-		if (nBuckets != 0)
-		{
+	private final function lookup(key:K):Int {
+		if (nBuckets != 0) {
 			var hashes = hashes, entries = entries;
 
 			var mask = nBuckets - 1, hash = hash(key), k = hash, nProbes = 0;
 			var i = k & mask;
 			var last = i, flag;
-			//var inc = getInc(k, mask);
-			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || !entries[i].keyEquals(key)))
-			{
+			// var inc = getInc(k, mask);
+			while (!isEmpty(flag = hashes[i]) && (isDel(flag) || flag != k || !entries[i].keyEquals(key))) {
 				i = (i + ++nProbes) & mask;
-#if DEBUG_HASHTBL
+				#if DEBUG_HASHTBL
 				probeTimes++;
 				if (i == last)
 					throw "assert";
-#end
+				#end
 			}
 
-#if DEBUG_HASHTBL
+			#if DEBUG_HASHTBL
 			if (nProbes > maxProbe)
 				maxProbe = nProbes;
 			totalProbes++;
-#end
+			#end
 			return isEither(flag) ? -1 : i;
 		}
 
 		return -1;
 	}
 
-	@:final @:private function resize(newNBuckets:Int) : Void
-	{
-		//This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
+	@:private final function resize(newNBuckets:Int):Void {
+		// This function uses 0.25*n_bucktes bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets.
 		var newHash = null;
 		var j = 1;
 		{
 			newNBuckets = roundUp(newNBuckets);
-			if (newNBuckets < 4) newNBuckets = 4;
-			if (size >= (newNBuckets * HASH_UPPER + 0.5)) /* requested size is too small */
-			{
+			if (newNBuckets < 4)
+				newNBuckets = 4;
+			if (size >= (newNBuckets * HASH_UPPER + 0.5))
+				/* requested size is too small */ {
 				j = 0;
 			} else { /* hash table size to be changed (shrink or expand); rehash */
 				var nfSize = newNBuckets;
-				newHash = new NativeArray( nfSize );
-				if (nBuckets < newNBuckets) //expand
+				newHash = new NativeArray(nfSize);
+				if (nBuckets < newNBuckets) // expand
 				{
 					var e = new NativeArray(newNBuckets);
 					if (entries != null)
 						arrayCopy(entries, 0, e, 0, nBuckets);
 					entries = e;
-				} //otherwise shrink
+				} // otherwise shrink
 			}
 		}
 
-		if (j != 0)
-		{ //rehashing is required
-			//resetting cache
+		if (j != 0) { // rehashing is required
+			// resetting cache
+			#if !no_map_cache
 			cachedEntry = null;
 			cachedIndex = -1;
+			#end
 
 			j = -1;
 			var nBuckets = nBuckets, entries = entries, hashes = hashes;
 
 			var newMask = newNBuckets - 1;
-			while (++j < nBuckets)
-			{
+			while (++j < nBuckets) {
 				var k;
-				if (!isEither(k = hashes[j]))
-				{
+				if (!isEither(k = hashes[j])) {
 					var entry = entries[j];
 
+					entries[j] = null;
 					hashes[j] = FLAG_DEL;
-					while (true) /* kick-out process; sort of like in Cuckoo hashing */
-					{
+					while (true)
+						/* kick-out process; sort of like in Cuckoo hashing */ {
 						var nProbes = 0;
 						var i = k & newMask;
 
@@ -256,8 +251,8 @@ import java.lang.ref.ReferenceQueue;
 
 						newHash[i] = k;
 
-						if (i < nBuckets && !isEither(k = hashes[i])) /* kick out the existing element */
-						{
+						if (i < nBuckets && !isEither(k = hashes[i]))
+							/* kick out the existing element */ {
 							{
 								var tmp = entries[i];
 								entries[i] = entry;
@@ -273,8 +268,8 @@ import java.lang.ref.ReferenceQueue;
 				}
 			}
 
-			if (nBuckets > newNBuckets) /* shrink the hash table */
-			{
+			if (nBuckets > newNBuckets)
+				/* shrink the hash table */ {
 				{
 					var e = new NativeArray(newNBuckets);
 					arrayCopy(entries, 0, e, 0, newNBuckets);
@@ -289,21 +284,22 @@ import java.lang.ref.ReferenceQueue;
 		}
 	}
 
-	public function get( key : K ) : Null<V>
-	{
+	public function get(key:K):Null<V> {
 		cleanupRefs();
 		var idx = -1;
-		if (cachedEntry != null && cachedEntry.keyEquals(key) && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedEntry != null && cachedEntry.keyEquals(key) && ((idx = cachedIndex) != -1)) {
 			return cachedEntry.value;
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
 			var entry = entries[idx];
+			#if !no_map_cache
 			cachedEntry = entry;
 			cachedIndex = idx;
+			#end
 
 			return entry.value;
 		}
@@ -311,21 +307,22 @@ import java.lang.ref.ReferenceQueue;
 		return null;
 	}
 
-	private function getDefault( key : K, def : V ) : V
-	{
+	private function getDefault(key:K, def:V):V {
 		cleanupRefs();
 		var idx = -1;
-		if (cachedEntry != null && cachedEntry.keyEquals(key) && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedEntry != null && cachedEntry.keyEquals(key) && ((idx = cachedIndex) != -1)) {
 			return cachedEntry.value;
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
 			var entry = entries[idx];
+			#if !no_map_cache
 			cachedEntry = entry;
 			cachedIndex = idx;
+			#end
 
 			return entry.value;
 		}
@@ -333,21 +330,22 @@ import java.lang.ref.ReferenceQueue;
 		return def;
 	}
 
-	public function exists( key : K ) : Bool
-	{
+	public function exists(key:K):Bool {
 		cleanupRefs();
 		var idx = -1;
-		if (cachedEntry != null && cachedEntry.keyEquals(key) && ( (idx = cachedIndex) != -1 ))
-		{
+		#if !no_map_cache
+		if (cachedEntry != null && cachedEntry.keyEquals(key) && ((idx = cachedIndex) != -1)) {
 			return true;
 		}
+		#end
 
 		idx = lookup(key);
-		if (idx != -1)
-		{
+		if (idx != -1) {
 			var entry = entries[idx];
+			#if !no_map_cache
 			cachedEntry = entry;
 			cachedIndex = idx;
+			#end
 
 			return true;
 		}
@@ -355,24 +353,25 @@ import java.lang.ref.ReferenceQueue;
 		return false;
 	}
 
-	public function remove( key : K ) : Bool
-	{
+	public function remove(key:K):Bool {
 		cleanupRefs();
 		var idx = -1;
-		if ( !(cachedEntry != null && cachedEntry.keyEquals(key) && ( (idx = cachedIndex) != -1 )) )
+		#if !no_map_cache
+		if (!(cachedEntry != null && cachedEntry.keyEquals(key) && ((idx = cachedIndex) != -1)))
+		#end
 		{
 			idx = lookup(key);
 		}
 
-		if (idx == -1)
-		{
+		if (idx == -1) {
 			return false;
 		} else {
-			if (cachedEntry != null && cachedEntry.keyEquals(key))
-			{
+			#if !no_map_cache
+			if (cachedEntry != null && cachedEntry.keyEquals(key)) {
 				cachedIndex = -1;
 				cachedEntry = null;
 			}
+			#end
 
 			hashes[idx] = FLAG_DEL;
 			entries[idx] = null;
@@ -382,93 +381,63 @@ import java.lang.ref.ReferenceQueue;
 		}
 	}
 
-	/**
-		Returns an iterator of all keys in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function keys() : Iterator<K>
-	{
+	public inline function keys():Iterator<K> {
 		cleanupRefs();
-		var i = 0;
-		var len = nBuckets;
-		var lastKey = null; //keep a strong reference to the key while iterating, so it can't be collected while iterating
-		return {
-			hasNext: function() {
-				for (j in i...len)
-				{
-					if (!isEither(hashes[j]))
-					{
-						var entry = entries[j];
-						var last = entry.get();
-						if (last != null)
-						{
-							lastKey = last;
-							cachedIndex = i;
-							cachedEntry = entry;
-							i = j;
-							return true;
-						}
-					}
-				}
-				return false;
-			},
-			next: function() {
-				i = i + 1;
-				return lastKey;
-			}
-		};
+		return new WeakMapKeyIterator(this);
 	}
 
-	/**
-		Returns an iterator of all values in the hashtable.
-		Implementation detail: Do not set() any new value while iterating, as it may cause a resize, which will break iteration
-	**/
-	public function iterator() : Iterator<V>
-	{
+	public inline function iterator():Iterator<V> {
 		cleanupRefs();
-		var i = 0;
-		var len = nBuckets;
-		return {
-			hasNext: function() {
-				for (j in i...len)
-				{
-					if (!isEither(hashes[j]))
-					{
-						i = j;
-						return true;
-					}
-				}
-				return false;
-			},
-			next: function() {
-				var ret = entries[i].value;
-				i = i + 1;
-				return ret;
-			}
-		};
+		return new WeakMapValueIterator(this);
 	}
 
-	/**
-		Returns an displayable representation of the hashtable content.
-	**/
+	public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
 
-	public function toString() : String {
+	public function copy():WeakMap<K, V> {
+		var copied = new WeakMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(Std.string(i));
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
-	@:extern private static inline function roundUp(x:Int):Int
-	{
+	public function clear():Void {
+		hashes = null;
+		entries = null;
+		queue = new ReferenceQueue();
+		nBuckets = 0;
+		size = 0;
+		nOccupied = 0;
+		upperBound = 0;
+		#if !no_map_cache
+		cachedEntry = null;
+		cachedIndex = -1;
+		#end
+		#if DEBUG_HASHTBL
+		totalProbes = 0;
+		probeTimes = 0;
+		sameHash = 0;
+		maxProbe = 0;
+		#end
+	}
+
+	extern private static inline function roundUp(x:Int):Int {
 		--x;
 		x |= (x) >>> 1;
 		x |= (x) >>> 2;
@@ -478,38 +447,36 @@ import java.lang.ref.ReferenceQueue;
 		return ++x;
 	}
 
-	@:extern private static inline function getInc(k:Int, mask:Int):Int //return 1 for linear probing
+	extern private static inline function getInc(k:Int, mask:Int):Int // return 1 for linear probing
 		return (((k) >> 3 ^ (k) << 3) | 1) & (mask);
 
-	@:extern private static inline function isEither(v:HashType):Bool
+	extern private static inline function isEither(v:HashType):Bool
 		return (v & 0xFFFFFFFE) == 0;
 
-	@:extern private static inline function isEmpty(v:HashType):Bool
+	extern private static inline function isEmpty(v:HashType):Bool
 		return v == FLAG_EMPTY;
 
-	@:extern private static inline function isDel(v:HashType):Bool
+	extern private static inline function isDel(v:HashType):Bool
 		return v == FLAG_DEL;
 
-	//guarantee: Whatever this function is, it will never return 0 nor 1
-	@:extern private static inline function hash(s:Dynamic):HashType
-	{
+	// guarantee: Whatever this function is, it will never return 0 nor 1
+	extern private static inline function hash(s:Dynamic):HashType {
 		var k:Int = untyped s.hashCode();
-		//k *= 357913941;
-		//k ^= k << 24;
-		//k += ~357913941;
-		//k ^= k >> 31;
-		//k ^= k << 31;
-
-		k = (k+0x7ed55d16) + (k<<12);
-		k = (k^0xc761c23c) ^ (k>>19);
-		k = (k+0x165667b1) + (k<<5);
-		k = (k+0xd3a2646c) ^ (k<<9);
-		k = (k+0xfd7046c5) + (k<<3);
-		k = (k^0xb55a4f09) ^ (k>>16);
+		// k *= 357913941;
+		// k ^= k << 24;
+		// k += ~357913941;
+		// k ^= k >> 31;
+		// k ^= k << 31;
+
+		k = (k + 0x7ed55d16) + (k << 12);
+		k = (k ^ 0xc761c23c) ^ (k >> 19);
+		k = (k + 0x165667b1) + (k << 5);
+		k = (k + 0xd3a2646c) ^ (k << 9);
+		k = (k + 0xfd7046c5) + (k << 3);
+		k = (k ^ 0xb55a4f09) ^ (k >> 16);
 
 		var ret = k;
-		if (isEither(ret))
-		{
+		if (isEither(ret)) {
 			if (ret == 0)
 				ret = 2;
 			else
@@ -519,32 +486,97 @@ import java.lang.ref.ReferenceQueue;
 		return ret;
 	}
 
-	@:extern private static inline function arrayCopy(sourceArray:Dynamic, sourceIndex:Int, destinationArray:Dynamic, destinationIndex:Int, length:Int):Void
+	extern private static inline function arrayCopy(sourceArray:Dynamic, sourceIndex:Int, destinationArray:Dynamic, destinationIndex:Int, length:Int):Void
 		java.lang.System.arraycopy(sourceArray, sourceIndex, destinationArray, destinationIndex, length);
 
-	@:extern private static inline function assert(x:Bool):Void
-	{
-#if DEBUG_HASHTBL
-		if (!x) throw "assert failed";
-#end
+	extern private static inline function assert(x:Bool):Void {
+		#if DEBUG_HASHTBL
+		if (!x)
+			throw "assert failed";
+		#end
 	}
 }
 
-private class Entry<K,V> extends WeakReference<K>
-{
+private class Entry<K, V> extends WeakReference<K> {
 	public var value:V;
 	public var hash(default, null):Int;
-	public function new(key:K, value:V, hash:Int, queue:ReferenceQueue<K>)
-	{
+
+	public function new(key:K, value:V, hash:Int, queue:ReferenceQueue<K>) {
 		super(key, queue);
 		this.value = value;
 		this.hash = hash;
 	}
 
-	@:final inline public function keyEquals(k:K):Bool
-	{
+	final inline public function keyEquals(k:K):Bool {
 		return k != null && untyped k.equals(get());
 	}
 }
 
+@:access(haxe.ds.WeakMap)
+private final class WeakMapKeyIterator<T:{}, V> {
+	var m:WeakMap<T, V>;
+	var i:Int;
+	var len:Int;
+	var lastKey:T;
+
+	public function new(m:WeakMap<T, V>) {
+		this.i = 0;
+		this.m = m;
+		this.len = m.nBuckets;
+	}
+
+	public function hasNext():Bool {
+		for (j in i...len) {
+			if (!WeakMap.isEither(m.hashes[j])) {
+				var entry = m.entries[j], last = entry.get();
+				if (last != null) {
+					#if !no_map_cache
+					m.cachedIndex = i;
+					m.cachedEntry = entry;
+					#end
+					lastKey = last; // keep a strong reference to the key while iterating, so it doesn't get collected
+					i = j;
+					return true;
+				}
+			}
+		}
+		lastKey = null;
+		return false;
+	}
+
+	public function next():T {
+		i = i + 1;
+		return lastKey;
+	}
+}
+
+@:access(haxe.ds.WeakMap)
+private final class WeakMapValueIterator<K:{}, T> {
+	var m:WeakMap<K, T>;
+	var i:Int;
+	var len:Int;
+
+	public function new(m:WeakMap<K, T>) {
+		this.i = 0;
+		this.m = m;
+		this.len = m.nBuckets;
+	}
+
+	public function hasNext():Bool {
+		for (j in i...len) {
+			if (!WeakMap.isEither(m.hashes[j]) && m.entries[j].get() != null) {
+				i = j;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public inline function next():T {
+		var ret = m.entries[i];
+		i = i + 1;
+		return ret.value;
+	}
+}
+
 private typedef HashType = Int;
diff --git a/std/java/_std/haxe/zip/Compress.hx b/std/java/_std/haxe/zip/Compress.hx
index 41050626d74160e7ccc3f73f40048aa72d0b45bc..b77a513abe9f572f04e83ea68bf8c0ea68a5b564 100644
--- a/std/java/_std/haxe/zip/Compress.hx
+++ b/std/java/_std/haxe/zip/Compress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,24 +19,23 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
+
 import java.util.zip.Deflater;
 
-class Compress
-{
+class Compress {
 	var deflater:Deflater;
 	var mode:Int;
 	var finish:Bool = false;
 
-	public function new( level : Int )
-	{
-		throw "Not implemented for this platform"; //FIXME: Add unit tests for Compress/Uncompress and check current implementation
+	public function new(level:Int) {
+		throw "Not implemented for this platform"; // FIXME: Add unit tests for Compress/Uncompress and check current implementation
 		this.deflater = new Deflater(level);
 		this.mode = Deflater.NO_FLUSH;
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int }
-	{
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
 		deflater.setInput(src.getData(), srcPos, src.length - srcPos);
 		if (finish)
 			deflater.finish();
@@ -44,11 +43,10 @@ class Compress
 
 		var written = deflater.deflate(dst.getData(), dstPos, dst.length - dstPos);
 		var read = deflater.getTotalIn();
-		return { done: deflater.finished(), read: read, write: written };
+		return {done: deflater.finished(), read: read, write: written};
 	}
 
-	public function setFlushMode( f : FlushMode )
-	{
+	public function setFlushMode(f:FlushMode) {
 		this.mode = switch (f) {
 			case NO:
 				Deflater.NO_FLUSH;
@@ -64,13 +62,11 @@ class Compress
 		}
 	}
 
-	public function close()
-	{
+	public function close() {
 		deflater.end();
 	}
 
-	public static function run( s : haxe.io.Bytes, level : Int ) : haxe.io.Bytes
-	{
+	public static function run(s:haxe.io.Bytes, level:Int):haxe.io.Bytes {
 		var deflater = new java.util.zip.Deflater(level);
 		deflater.setInput(s.getData());
 		var outputStream = new java.io.ByteArrayOutputStream(s.length);
diff --git a/std/java/_std/haxe/zip/Uncompress.hx b/std/java/_std/haxe/zip/Uncompress.hx
index e6c1f1f59b7356b9578d64f9949409022e434ded..b7012002692907448b5adf61bebb803b79ca3a52 100644
--- a/std/java/_std/haxe/zip/Uncompress.hx
+++ b/std/java/_std/haxe/zip/Uncompress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,40 +19,46 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
-class Uncompress
-{
-	public function new( ?windowBits : Int ) {
-		throw "Not implemented for this platform";
-	}
+import java.util.zip.Inflater;
+
+class Uncompress {
+	final inflater:Inflater;
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
-		return null;
+	public function new(?windowBits:Int) {
+		inflater = new Inflater(windowBits != null && windowBits < 0);
 	}
 
-	public function setFlushMode( f : FlushMode ) {
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
+		inflater.setInput(src.getData(), srcPos, src.length - srcPos);
+		inflater.inflate(dst.getData(), dstPos, dst.length - dstPos);
+		return {
+			done: inflater.finished(),
+			read: Int64.toInt(inflater.getBytesRead()),
+			write: Int64.toInt(inflater.getBytesWritten())
+		};
 	}
 
+	public function setFlushMode(f:FlushMode) {}
+
 	public function close() {
+		inflater.end();
 	}
 
-	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes
-	{
+	public static function run(src:haxe.io.Bytes, ?bufsize:Int):haxe.io.Bytes {
 		var decompresser = new java.util.zip.Inflater();
 		var buf = haxe.io.Bytes.alloc(bufsize == null ? src.length : bufsize).getData();
 
 		var out = new java.io.ByteArrayOutputStream(src.length);
 		decompresser.setInput(src.getData(), 0, src.length);
 
-		while (!decompresser.finished())
-		{
+		while (!decompresser.finished()) {
 			var count = decompresser.inflate(buf);
 			out.write(buf, 0, count);
 		}
 		out.close();
 		return haxe.io.Bytes.ofData(out.toByteArray());
 	}
-
 }
-
diff --git a/std/java/_std/sys/FileSystem.hx b/std/java/_std/sys/FileSystem.hx
index 366ac0a9bddf8b6f4ed6e6be9223432a5682d7dc..1c45f687fc9e77a326c750377530d7c19ccdd364 100644
--- a/std/java/_std/sys/FileSystem.hx
+++ b/std/java/_std/sys/FileSystem.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,91 +19,84 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys;
+
 import java.io.File;
 import java.Lib;
 
 @:coreApi
 class FileSystem {
-
-	public static function exists( path : String ) : Bool
-	{
+	public static function exists(path:String):Bool {
 		return new File(path).exists();
 	}
 
-	public static function rename( path : String, newPath : String ) : Void
-	{
-		if (!new File(path).renameTo(new File(newPath)))
-		{
+	public static function rename(path:String, newPath:String):Void {
+		if (!new File(path).renameTo(new File(newPath))) {
 			throw "Cannot rename " + path + " to " + newPath;
 		}
 	}
 
-	public static function stat( path : String ) : FileStat
-	{
+	public static function stat(path:String):FileStat {
 		var f = new File(path);
 		if (!f.exists())
 			throw "Path " + path + " doesn't exist";
 		return {
-			gid: 0, //java doesn't let you get this info
-			uid: 0, //same
-			atime: Date.now(), //same
+			gid: 0, // java doesn't let you get this info
+			uid: 0, // same
+			atime: Date.now(), // same
 			mtime: Date.fromTime(cast(f.lastModified(), Float)),
-			ctime: Date.fromTime(cast(f.lastModified(), Float)), //same
-			size: cast(f.length(), Int), //TODO: maybe change to Int64 for Haxe 3?
-			dev: 0, //FIXME: not sure what that is
-			ino: 0, //FIXME: not sure what that is
-			nlink: 0, //FIXME: not sure what that is
-			rdev: 0, //FIXME: not sure what that is
-			mode: 0 //FIXME: not sure what that is
+			ctime: Date.fromTime(cast(f.lastModified(), Float)), // same
+			size: cast(f.length(), Int), // TODO: maybe change to Int64 for Haxe 3?
+			dev: 0, // FIXME: not sure what that is
+			ino: 0, // FIXME: not sure what that is
+			nlink: 0, // FIXME: not sure what that is
+			rdev: 0, // FIXME: not sure what that is
+			mode: 0 // FIXME: not sure what that is
 		};
 	}
 
-	public static function fullPath( relPath : String ) : String
-	{
+	public static function fullPath(relPath:String):String {
 		try {
 			return new File(relPath).getCanonicalPath();
-		} catch (e: java.io.IOException) {
+		} catch (e:java.io.IOException) {
 			throw new java.lang.RuntimeException(e);
 		}
 	}
 
-	public static function absolutePath ( relPath : String ) : String {
-		if (haxe.io.Path.isAbsolute(relPath)) return relPath;
+	public static function absolutePath(relPath:String):String {
+		if (haxe.io.Path.isAbsolute(relPath))
+			return relPath;
 		return haxe.io.Path.join([Sys.getCwd(), relPath]);
 	}
 
-	public static function isDirectory( path : String ) : Bool
-	{
+	public static function isDirectory(path:String):Bool {
 		var f = new File(path);
 		if (!f.exists())
 			throw "Path " + path + " doesn't exist";
 		return f.isDirectory();
 	}
 
-	public static function createDirectory( path : String ) : Void
-	{
-		if (!new File(path).mkdirs())
+	public static function createDirectory(path:String):Void {
+		var f = new File(path);
+		if (!f.isDirectory() && !f.mkdirs())
 			throw "Cannot create dir " + path;
 	}
 
-	public static function deleteFile( path : String ) : Void
-	{
+	public static function deleteFile(path:String):Void {
 		if (!new File(path).delete())
 			throw "Cannot delete file " + path;
 	}
 
-	public static function deleteDirectory( path : String ) : Void
-	{
+	public static function deleteDirectory(path:String):Void {
 		if (!new File(path).delete())
 			throw "Cannot delete directory " + path;
 	}
 
-	public static function readDirectory( path : String ) : Array<String>
-	{
+	public static function readDirectory(path:String):Array<String> {
 		var f = new File(path);
 		if (!f.exists())
 			throw "Path " + path + " doesn't exist";
-		return Lib.array( f.list() );
+		return Lib.array(f.list());
 	}
 }
diff --git a/std/java/_std/sys/db/Mysql.hx b/std/java/_std/sys/db/Mysql.hx
index 5984291f1422ffecdf9887cee2a66eace1de24b5..6dfabe52e5449df35edac6fb16a83c6e64ea3db4 100644
--- a/std/java/_std/sys/db/Mysql.hx
+++ b/std/java/_std/sys/db/Mysql.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,29 +19,27 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
 class Mysql {
-
 	static var init = false;
 
-	public static function connect( params : {
-		host : String,
-		?port : Int,
-		user : String,
-		pass : String,
-		?socket : String,
-		database : String
-	} ) : sys.db.Connection {
-		if (!init)
-		{
+	public static function connect(params:{
+		host:String,
+		?port:Int,
+		user:String,
+		pass:String,
+		?socket:String,
+		?database:String
+	}):sys.db.Connection {
+		if (!init) {
 			java.lang.Class.forName("com.mysql.jdbc.Driver");
 			init = true;
 		}
 		var url = new StringBuf();
 		url.add('jdbc:mysql:');
-		if (params.socket != null)
-		{
+		if (params.socket != null) {
 			url.add(params.socket);
 		} else {
 			url.add('//');
@@ -49,9 +47,10 @@ class Mysql {
 			if (params.port != null)
 				url.add(':${params.port}');
 		}
-		url.add('/${params.database}');
+		if (params.database != null) {
+			url.add('/${params.database}');
+		}
 		var cnx = java.sql.DriverManager.getConnection(url.toString(), params.user, params.pass);
 		return java.db.Jdbc.create(cnx);
 	}
-
 }
diff --git a/std/java/_std/sys/db/Sqlite.hx b/std/java/_std/sys/db/Sqlite.hx
index 21e6b903804de08a22b9851f15d3e2f605a01a8e..378f8190eb7b2114b7d5cca49765f52f49919d0e 100644
--- a/std/java/_std/sys/db/Sqlite.hx
+++ b/std/java/_std/sys/db/Sqlite.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,26 +19,24 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package sys.db;
 
-class Sqlite
-{
+package sys.db;
+
+class Sqlite {
 	static var init = false;
-	/**
-		Opens a new SQLite connection on the specified path.
-		Note that you will need a SQLite JDBC driver (like https://bitbucket.org/xerial/sqlite-jdbc).
-	**/
-	public static function open(file:String):sys.db.Connection
-	{
-		if (!init)
-		{
-			try java.lang.Class.forName("org.sqlite.JDBC") catch(e:Dynamic) throw e;
+
+	public static function open(file:String):sys.db.Connection {
+		if (!init) {
+			try
+				java.lang.Class.forName("org.sqlite.JDBC")
+			catch (e:Dynamic)
+				throw e;
 			init = true;
 		}
-		try
-		{
+		try {
 			var cnx = java.sql.DriverManager.getConnection("jdbc:sqlite:" + file);
 			return java.db.Jdbc.create(cnx);
-		} catch(e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 	}
 }
diff --git a/std/java/_std/sys/io/File.hx b/std/java/_std/sys/io/File.hx
index 179f99cb694d94b18159db58c67167af8d4f02d5..3ce9a33cd71a8a9d40857c713449b395f07682a1 100644
--- a/std/java/_std/sys/io/File.hx
+++ b/std/java/_std/sys/io/File.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,108 +19,102 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 @:coreApi
 class File {
-
-	public static function getContent( path : String ) : String
-	{
+	public static function getContent(path:String):String {
 		var f = read(path, false);
 		var ret = f.readAll().toString();
 		f.close();
 		return ret;
 	}
 
-	public static function saveContent( path : String, content : String ) : Void
-	{
+	public static function saveContent(path:String, content:String):Void {
 		var f = write(path, false);
 		f.writeString(content);
 		f.close();
 	}
 
-	public static function getBytes( path : String ) : haxe.io.Bytes
-	{
+	public static function getBytes(path:String):haxe.io.Bytes {
 		var f = read(path, true);
 		var ret = f.readAll();
 		f.close();
 		return ret;
 	}
 
-	public static function saveBytes( path : String, bytes : haxe.io.Bytes ) : Void
-	{
+	public static function saveBytes(path:String, bytes:haxe.io.Bytes):Void {
 		var f = write(path, true);
 		f.writeBytes(bytes, 0, bytes.length);
 		f.close();
 	}
 
-	public static function read( path : String, binary : Bool = true ) : FileInput
-	{
-		try
-		{
-			return new FileInput( new java.io.RandomAccessFile(new java.io.File(path), "r") );
-		}
-		catch (e:Dynamic) //swallow checked exceptions
+	public static function read(path:String, binary:Bool = true):FileInput {
+		try {
+			return new FileInput(new java.io.RandomAccessFile(new java.io.File(path), "r"));
+		} catch (e:Dynamic) // swallow checked exceptions
 		{
 			throw e;
 		}
 	}
 
-	public static function write( path : String, binary : Bool = true ) : FileOutput
-	{
+	public static function write(path:String, binary:Bool = true):FileOutput {
 		var f = new java.io.File(path);
-		if (f.exists())
-		{
+		if (f.exists()) {
 			f.delete();
 		}
 
-		try
-		{
-			return new FileOutput( new java.io.RandomAccessFile(f, "rw") );
-		}
-		catch (e:Dynamic) //swallow checked exceptions
+		try {
+			return new FileOutput(new java.io.RandomAccessFile(f, "rw"));
+		} catch (e:Dynamic) // swallow checked exceptions
 		{
 			throw e;
 		}
 	}
 
-	public static function append( path : String, binary : Bool = true ) : FileOutput
-	{
+	public static function append(path:String, binary:Bool = true):FileOutput {
 		var f = new java.io.File(path);
 
-		try
-		{
+		try {
 			var ra = new java.io.RandomAccessFile(f, "rw");
-			if (f.exists())
-			{
+			if (f.exists()) {
 				ra.seek(f.length());
 			}
-			return new FileOutput( ra );
+			return new FileOutput(ra);
+		} catch (e:Dynamic) // swallow checked exceptions
+		{
+			throw e;
 		}
-		catch (e:Dynamic) //swallow checked exceptions
+	}
+
+	public static function update(path:String, binary:Bool = true):FileOutput {
+		var f = new java.io.File(path);
+
+		try {
+			var ra = new java.io.RandomAccessFile(f, "rw");
+			return new FileOutput(ra);
+		} catch (e:Dynamic) // swallow checked exceptions
 		{
 			throw e;
 		}
 	}
 
-	public static function copy( srcPath : String, dstPath : String ) : Void
-	{
+	public static function copy(srcPath:String, dstPath:String):Void {
 		var r:FileInput = null;
 		var w:FileOutput = null;
-		try
-		{
+		try {
 			r = read(srcPath);
 			w = write(dstPath);
 			w.writeInput(r);
 			r.close();
 			w.close();
-		}
-
-		catch (e:Dynamic)
-		{
-			if (r != null) r.close();
-			if (w != null) w.close();
+		} catch (e:Dynamic) {
+			if (r != null)
+				r.close();
+			if (w != null)
+				w.close();
 			throw e;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/std/java/_std/sys/io/FileInput.hx b/std/java/_std/sys/io/FileInput.hx
index 9cb37473d9088b30f7eef93b4e5fdae46c40fa7c..3905cad459b2e41f9f4373bdaae20f03f6c65c4a 100644
--- a/std/java/_std/sys/io/FileInput.hx
+++ b/std/java/_std/sys/io/FileInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
+
 import haxe.Int64;
 import haxe.io.Bytes;
 import haxe.io.Eof;
@@ -30,48 +32,40 @@ import java.io.IOException;
 class FileInput extends Input {
 	var f:java.io.RandomAccessFile;
 	var _eof:Bool;
-	public function new(f)
-	{
+
+	public function new(f) {
 		this.f = f;
 		this._eof = false;
 	}
 
-	override public function close()
-	{
-		try f.close() catch(e:Dynamic) throw e;
+	override public function close() {
+		try
+			f.close()
+		catch (e:Dynamic)
+			throw e;
 	}
 
-	override public function readByte():Int
-	{
-		try
-		{
+	override public function readByte():Int {
+		try {
 			return f.readUnsignedByte();
-		}
+		} catch (e:EOFException) {
 
-		catch (e:EOFException) {
 			_eof = true;
 			throw new Eof();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	override public function readBytes(s:Bytes, pos:Int, len:Int):Int
-	{
+	override public function readBytes(s:Bytes, pos:Int, len:Int):Int {
 		var ret = 0;
-		try
-		{
+		try {
 			ret = f.read(s.getData(), pos, len);
-		}
+		} catch (e:EOFException) {
 
-		catch (e:EOFException) {
 			_eof = true;
 			throw new Eof();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 
@@ -83,43 +77,35 @@ class FileInput extends Input {
 		return ret;
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void
-	{
+	public function seek(p:Int, pos:FileSeek):Void {
 		_eof = false;
-		try
-		{
-			switch(pos)
-			{
-				case SeekBegin: f.seek(cast p);
-				case SeekCur: f.seek(haxe.Int64.add(f.getFilePointer(), cast(p, Int64)));
-				case SeekEnd: f.seek(haxe.Int64.add(f.length(), cast p));
+		try {
+			switch (pos) {
+				case SeekBegin:
+					f.seek(cast p);
+				case SeekCur:
+					f.seek(haxe.Int64.add(f.getFilePointer(), cast(p, Int64)));
+				case SeekEnd:
+					f.seek(haxe.Int64.add(f.length(), cast p));
 			}
-		}
+		} catch (e:EOFException) {
 
-		catch (e:EOFException) {
 			_eof = true;
 			throw new Eof();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	public function tell() : Int
-	{
-		try
-		{
+	public function tell():Int {
+		try {
 			return cast f.getFilePointer();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	public inline function eof() : Bool
-	{
+	public inline function eof():Bool {
 		return _eof;
 	}
 }
diff --git a/std/java/_std/sys/io/FileOutput.hx b/std/java/_std/sys/io/FileOutput.hx
index d42818646e72e14269cc41283ffbbe1e0da82bf8..ae75449117f3b4af74267db1d891414d1831a16e 100644
--- a/std/java/_std/sys/io/FileOutput.hx
+++ b/std/java/_std/sys/io/FileOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
+
 import haxe.io.Bytes;
 import haxe.io.Eof;
 import haxe.io.Output;
@@ -28,81 +30,64 @@ import java.io.IOException;
 
 class FileOutput extends Output {
 	var f:java.io.RandomAccessFile;
-	public function new(f)
-	{
+
+	public function new(f) {
 		this.f = f;
 	}
 
-	override public function close()
-	{
-		try f.close() catch(e:Dynamic) throw e;
+	override public function close() {
+		try
+			f.close()
+		catch (e:Dynamic)
+			throw e;
 	}
 
-	override public function writeByte(c:Int):Void
-	{
-		try
-		{
+	override public function writeByte(c:Int):Void {
+		try {
 			this.f.write(c);
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	override public function write(s:Bytes):Void
-	{
-		try
-		{
+	override public function write(s:Bytes):Void {
+		try {
 			this.f.write(s.getData());
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	override public function writeBytes(s:Bytes, pos:Int, len:Int):Int
-	{
-		try
-		{
+	override public function writeBytes(s:Bytes, pos:Int, len:Int):Int {
+		try {
 			this.f.write(s.getData(), pos, len);
 			return len;
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void
-	{
-		try
-		{
-			switch(pos)
-			{
-				case SeekBegin: f.seek(cast p);
-				case SeekCur: f.seek(haxe.Int64.add(f.getFilePointer(), cast(p, haxe.Int64)));
-				case SeekEnd: f.seek(haxe.Int64.add(f.length(), cast p));
+	public function seek(p:Int, pos:FileSeek):Void {
+		try {
+			switch (pos) {
+				case SeekBegin:
+					f.seek(cast p);
+				case SeekCur:
+					f.seek(haxe.Int64.add(f.getFilePointer(), cast(p, haxe.Int64)));
+				case SeekEnd:
+					f.seek(haxe.Int64.add(f.length(), cast p));
 			}
-		}
-		catch (e:EOFException) {
+		} catch (e:EOFException) {
 			throw new Eof();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	public function tell() : Int
-	{
-		try
-		{
+	public function tell():Int {
+		try {
 			return cast f.getFilePointer();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
diff --git a/std/java/_std/sys/io/Process.hx b/std/java/_std/sys/io/Process.hx
index 70a2a8b1379896727aa37473e87e62a0f1a5e08c..73a8f740d49217054cb26d79412944da4ad5968c 100644
--- a/std/java/_std/sys/io/Process.hx
+++ b/std/java/_std/sys/io/Process.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
+
+import haxe.SysTools;
 import haxe.io.Bytes;
 import haxe.io.BytesInput;
 import haxe.io.Eof;
@@ -29,12 +32,12 @@ import java.NativeArray;
 
 @:coreApi
 class Process {
-
-	public var stdout(default,null) : haxe.io.Input;
-	public var stderr(default,null) : haxe.io.Input;
-	public var stdin(default, null) : haxe.io.Output;
+	public var stdout(default, null):haxe.io.Input;
+	public var stderr(default, null):haxe.io.Input;
+	public var stdin(default, null):haxe.io.Output;
 
 	private var proc:java.lang.Process;
+
 	@:allow(Sys)
 	private static function createProcessBuilder(cmd:String, ?args:Array<String>):java.lang.ProcessBuilder {
 		var sysName = Sys.systemName();
@@ -46,7 +49,7 @@ class Process {
 					pargs = new NativeArray(3);
 					pargs[0] = cmd = switch (Sys.getEnv("COMSPEC")) {
 						case null: "cmd.exe";
-						case comspec: comspec;
+						case var comspec: comspec;
 					}
 					pargs[1] = '/C';
 					pargs[2] = '"$cmdStr"';
@@ -60,15 +63,13 @@ class Process {
 			pargs = new NativeArray(args.length + 1);
 			switch (sysName) {
 				case "Windows":
-					pargs[0] = StringTools.quoteWinArg(cmd, false);
-					for (i in 0...args.length)
-					{
-						pargs[i + 1] = StringTools.quoteWinArg(args[i], false);
+					pargs[0] = SysTools.quoteWinArg(cmd, false);
+					for (i in 0...args.length) {
+						pargs[i + 1] = SysTools.quoteWinArg(args[i], false);
 					}
 				case _:
 					pargs[0] = cmd;
-					for (i in 0...args.length)
-					{
+					for (i in 0...args.length) {
 						pargs[i + 1] = args[i];
 					}
 			}
@@ -77,98 +78,84 @@ class Process {
 		return new java.lang.ProcessBuilder(pargs);
 	}
 
-	public function new( cmd : String, ?args : Array<String> ) : Void
-	{
+	public function new(cmd:String, ?args:Array<String>, ?detached:Bool):Void {
+		if (detached)
+			throw "Detached process is not supported on this platform";
 		var p = proc = createProcessBuilder(cmd, args).start();
 		stderr = new ProcessInput(p.getErrorStream());
 		stdout = new ProcessInput(p.getInputStream());
 		stdin = new java.io.NativeOutput(p.getOutputStream());
 	}
 
-	public function getPid() : Int
-	{
+	public function getPid():Int {
 		if (Reflect.hasField(proc, "pid"))
 			return Reflect.field(proc, "pid");
 		return -1;
 	}
 
-	public function exitCode( block : Bool = true ) : Null<Int>
-	{
-		if( block == false ) {
+	public function exitCode(block:Bool = true):Null<Int> {
+		if (block == false) {
 			try {
 				return proc.exitValue();
-			} catch( e : Dynamic ) {
+			} catch (e:Dynamic) {
 				return null;
 			}
 		}
-		
+
 		cast(stdout, ProcessInput).bufferContents();
 		cast(stderr, ProcessInput).bufferContents();
-		try
-		{
+		try {
 			proc.waitFor();
+		} catch (e:Dynamic) {
+			throw e;
 		}
-		catch (e:Dynamic) { throw e; }
 		return proc.exitValue();
 	}
 
-	public function close() : Void
-	{
+	public function close():Void {
 		proc.destroy();
 	}
 
-	public function kill() : Void
-	{
+	public function kill():Void {
 		proc.destroy();
 	}
-
 }
 
-
-private class ProcessInput extends java.io.NativeInput
-{
+private class ProcessInput extends java.io.NativeInput {
 	private var chained:BytesInput;
 
-	public function bufferContents():Void
-	{
-		if (chained != null) return;
+	public function bufferContents():Void {
+		if (chained != null)
+			return;
 		var b = this.readAll();
 		chained = new BytesInput(b);
 	}
 
-	override public function readByte():Int
-	{
+	override public function readByte():Int {
 		if (chained != null)
 			return chained.readByte();
 		var ret = 0;
-		try
-		{
+		try {
 			ret = stream.read();
-		}
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
-		if ( ret == -1 )
+		if (ret == -1)
 			throw new Eof();
 		return ret;
 	}
 
-	override public function readBytes(s:Bytes, pos:Int, len:Int):Int
-	{
+	override public function readBytes(s:Bytes, pos:Int, len:Int):Int {
 		if (chained != null)
 			return chained.readBytes(s, pos, len);
 
 		var ret = -1;
-		try
-		{
+		try {
 			ret = stream.read(s.getData(), pos, len);
-		}
+		} catch (e:EOFException) {
 
-		catch (e:EOFException) {
 			throw new Eof();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 
@@ -177,16 +164,12 @@ private class ProcessInput extends java.io.NativeInput
 		return ret;
 	}
 
-	override public function close():Void
-	{
+	override public function close():Void {
 		if (chained != null)
 			chained.close();
-		try
-		{
+		try {
 			stream.close();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
diff --git a/std/java/_std/sys/net/Host.hx b/std/java/_std/sys/net/Host.hx
index 665776bc268491ff7a3970fe36aa85c89302c78c..320b69e317a0ff626899a269105fa35e5090eb35 100644
--- a/std/java/_std/sys/net/Host.hx
+++ b/std/java/_std/sys/net/Host.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,43 +19,40 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
+
 import java.net.InetAddress;
 
 class Host {
-	public var host(default,null) : String;
-	public var ip(default,null) : Int;
+	public var host(default, null):String;
+	public var ip(default, null):Int;
 
 	@:allow(sys.net) private var wrapped:InetAddress;
 
-	public function new( name : String ) : Void
-	{
+	public function new(name:String):Void {
 		host = name;
 		try
 			this.wrapped = InetAddress.getByName(name)
-		catch(e:Dynamic) throw e;
+		catch (e:Dynamic)
+			throw e;
 		var rawIp = wrapped.getAddress();
-		//network byte order assumed
+		// network byte order assumed
 		this.ip = cast(rawIp[3], Int) | (cast(rawIp[2], Int) << 8) | (cast(rawIp[1], Int) << 16) | (cast(rawIp[0], Int) << 24);
 	}
 
-	public function toString() : String
-	{
+	public function toString():String {
 		return wrapped.getHostAddress();
 	}
 
-	public function reverse() : String
-	{
+	public function reverse():String {
 		return wrapped.getHostName();
 	}
 
-	public static function localhost() : String
-	{
-		try
-		{
+	public static function localhost():String {
+		try {
 			return InetAddress.getLocalHost().getHostName();
-		}
-		catch(e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 	}
-
 }
diff --git a/std/java/_std/sys/net/Socket.hx b/std/java/_std/sys/net/Socket.hx
index a1462e56a369199a2c265d2883ef47ca83681615..ae288c438b47ff64b2a7620e86f09c81cccc488d 100644
--- a/std/java/_std/sys/net/Socket.hx
+++ b/std/java/_std/sys/net/Socket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,100 +19,90 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
+
 import java.net.InetSocketAddress;
 
 @:coreApi
 class Socket {
+	public var input(default, null):haxe.io.Input;
+	public var output(default, null):haxe.io.Output;
 
-	public var input(default,null) : haxe.io.Input;
-	public var output(default,null) : haxe.io.Output;
-
-	public var custom : Dynamic;
+	public var custom:Dynamic;
 
 	private var sock:java.net.Socket;
 	private var server:java.net.ServerSocket;
 	private var boundAddr:java.net.SocketAddress;
 
-	public function new() : Void
-	{
+	public function new():Void {
 		create();
 	}
 
-	private function create():Void
-	{
+	private function create():Void {
 		this.sock = new java.net.Socket();
-		try
-		{
+		try {
 			this.server = new java.net.ServerSocket();
-		} catch(e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 	}
 
-	public function close() : Void
-	{
-		try
-		{
+	public function close():Void {
+		try {
 			if (sock != null)
 				this.sock.close();
 			if (server != null)
 				this.server.close();
-		}
-		catch(e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 	}
 
-	public function read() : String
-	{
+	public function read():String {
 		return input.readAll().toString();
 	}
 
-	public function write( content : String ) : Void
-	{
+	public function write(content:String):Void {
 		output.writeString(content);
 	}
 
-	public function connect( host : Host, port : Int ) : Void
-	{
-		try
-		{
-			sock.connect(new InetSocketAddress( host.wrapped, port));
+	public function connect(host:Host, port:Int):Void {
+		try {
+			sock.connect(new InetSocketAddress(host.wrapped, port));
 			this.output = new java.io.NativeOutput(sock.getOutputStream());
 			this.input = new java.io.NativeInput(sock.getInputStream());
-		}
-		catch(e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 	}
 
-	public function listen( connections : Int ) : Void
-	{
-		if (boundAddr == null) throw "You must bind the Socket to an address!";
+	public function listen(connections:Int):Void {
+		if (boundAddr == null)
+			throw "You must bind the Socket to an address!";
 		try
-			server.bind(boundAddr,connections)
-		catch(e:Dynamic) throw e;
+			server.bind(boundAddr, connections)
+		catch (e:Dynamic)
+			throw e;
 	}
 
-	public function shutdown( read : Bool, write : Bool ) : Void
-	{
-		try
-		{
+	public function shutdown(read:Bool, write:Bool):Void {
+		try {
 			if (read)
 				sock.shutdownInput();
 			if (write)
 				sock.shutdownOutput();
-		}
-		catch(e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 	}
 
-	public function bind( host : Host, port : Int ) : Void
-	{
-		if (boundAddr != null)
-		{
-			if (server.isBound()) throw "Already bound";
+	public function bind(host:Host, port:Int):Void {
+		if (boundAddr != null) {
+			if (server.isBound())
+				throw "Already bound";
 		}
 		this.boundAddr = new java.net.InetSocketAddress(host.wrapped, port);
 	}
 
-	public function accept() : Socket
-	{
-		var ret = try server.accept() catch(e:Dynamic) throw e;
+	public function accept():Socket {
+		var ret = try server.accept() catch (e:Dynamic) throw e;
 
 		var s = new Socket();
 		s.sock = ret;
@@ -122,56 +112,52 @@ class Socket {
 		return s;
 	}
 
-	public function peer() : { host : Host, port : Int }
-	{
+	public function peer():{host:Host, port:Int} {
 		var rem = sock.getInetAddress();
-		if (rem == null) return null;
+		if (rem == null)
+			return null;
 
 		var host = new Host(null);
 		host.wrapped = rem;
-		return { host: host, port: sock.getPort() };
+		return {host: host, port: sock.getPort()};
 	}
 
-	public function host() : { host : Host, port : Int }
-	{
+	public function host():{host:Host, port:Int} {
 		var local = sock.getLocalAddress();
 		var host = new Host(null);
 		host.wrapped = local;
- 
-		if (boundAddr != null)
-		{
-			return { host: host, port: server.getLocalPort() };
+
+		if (boundAddr != null) {
+			return {host: host, port: server.getLocalPort()};
 		}
 
-		return { host: host, port: sock.getLocalPort() };
+		return {host: host, port: sock.getLocalPort()};
 	}
 
-	public function setTimeout( timeout : Float ) : Void
-	{
+	public function setTimeout(timeout:Float):Void {
 		try
-			sock.setSoTimeout( Std.int(timeout * 1000) )
-		catch(e:Dynamic) throw e;
+			sock.setSoTimeout(Std.int(timeout * 1000))
+		catch (e:Dynamic)
+			throw e;
 	}
 
-	public function waitForRead() : Void
-	{
+	public function waitForRead():Void {
 		throw "Not implemented";
 	}
 
-	public function setBlocking( b : Bool ) : Void
-	{
+	public function setBlocking(b:Bool):Void {
 		throw "Not implemented";
 	}
 
-	public function setFastSend( b : Bool ) : Void
-	{
+	public function setFastSend(b:Bool):Void {
 		try
 			sock.setTcpNoDelay(b)
-		catch(e:Dynamic) throw e;
+		catch (e:Dynamic)
+			throw e;
 	}
 
-	public static function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float) : { read: Array<Socket>,write: Array<Socket>,others: Array<Socket> }
-	{
+	public static function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+			?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>} {
 		throw "Not implemented";
 		return null;
 	}
diff --git a/std/java/_std/sys/thread/Deque.hx b/std/java/_std/sys/thread/Deque.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dc7b0fdbefe84a6d8c56b18bc56cf6549afcfbbb
--- /dev/null
+++ b/std/java/_std/sys/thread/Deque.hx
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+import java.Lib;
+
+@:coreApi
+@:native('haxe.java.vm.Deque')
+@:nativeGen class Deque<T> {
+	var lbd:java.util.concurrent.LinkedBlockingDeque<T>;
+
+	public function new() {
+		lbd = new java.util.concurrent.LinkedBlockingDeque<T>();
+	}
+
+	public function add(i:T):Void {
+		lbd.add(i);
+	}
+
+	public function push(i:T):Void {
+		lbd.push(i);
+	}
+
+	public inline function pop(block:Bool):Null<T> {
+		return if (block) {
+			lbd.take();
+		} else {
+			lbd.poll();
+		}
+	}
+}
diff --git a/std/java/_std/sys/thread/Lock.hx b/std/java/_std/sys/thread/Lock.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fdba7e758536a89e1acf84c2b9e7f97a9a377fea
--- /dev/null
+++ b/std/java/_std/sys/thread/Lock.hx
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+import java.Lib;
+import java.lang.System;
+
+using haxe.Int64;
+
+@:coreApi
+@:native('haxe.java.vm.Lock') class Lock {
+	@:private @:volatile var releasedCount = 0;
+
+	public function new() {}
+
+	public function wait(?timeout:Float):Bool {
+		var ret = false;
+		java.Lib.lock(this, {
+			if (--releasedCount < 0) {
+				if (timeout == null) {
+					// since .notify() is asynchronous, this `while` is needed
+					// because there is a very remote possibility of release() awaking a thread,
+					// but before it releases, another thread calls wait - and since the release count
+					// is still positive, it will get the lock.
+					while (releasedCount < 0) {
+						try {
+							(cast this : java.lang.Object).wait();
+						} catch (e:java.lang.InterruptedException) {}
+					}
+				} else {
+					var timeout:haxe.Int64 = cast timeout * 1000;
+					var cur = System.currentTimeMillis(),
+						max = cur.add(timeout);
+					// see above comment about this while loop
+					while (releasedCount < 0 && cur.compare(max) < 0) {
+						try {
+							var t = max.sub(cur);
+							(cast this : java.lang.Object).wait(t);
+							cur = System.currentTimeMillis();
+						} catch (e:java.lang.InterruptedException) {}
+					}
+				}
+			}
+			ret = this.releasedCount >= 0;
+			if (!ret)
+				this.releasedCount++; // timed out
+		});
+		return ret;
+	}
+
+	public function release():Void {
+		untyped __lock__(this, {
+			if (++releasedCount >= 0) {
+				untyped this.notify();
+			}
+		});
+	}
+}
diff --git a/std/java/_std/sys/thread/Mutex.hx b/std/java/_std/sys/thread/Mutex.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8f0a81308c4f5769ed524734d945c51a78e7da1e
--- /dev/null
+++ b/std/java/_std/sys/thread/Mutex.hx
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+import java.util.concurrent.locks.ReentrantLock;
+
+@:coreApi
+@:native('haxe.java.vm.Mutex') class Mutex {
+	@:private var lock:ReentrantLock;
+
+	public function new() {
+		this.lock = new ReentrantLock();
+	}
+
+	public function tryAcquire():Bool {
+		return this.lock.tryLock();
+	}
+
+	public function acquire():Void {
+		this.lock.lock();
+	}
+
+	public function release():Void {
+		this.lock.unlock();
+	}
+}
diff --git a/std/java/_std/sys/thread/Thread.hx b/std/java/_std/sys/thread/Thread.hx
new file mode 100644
index 0000000000000000000000000000000000000000..47c0641ef77a8bc7b034e4836f65cbf81b476437
--- /dev/null
+++ b/std/java/_std/sys/thread/Thread.hx
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+import java.Lib;
+
+abstract Thread(NativeThread) {
+	inline function new(t:NativeThread) {
+		this = t;
+	}
+
+	public static function create(callb:Void->Void):Thread {
+		var ret = new NativeThread();
+		var t = new HaxeThread(ret, callb);
+		t.start();
+		return new Thread(ret);
+	}
+
+	public static function current():Thread {
+		return new Thread(NativeThread.getThread(java.lang.Thread.currentThread()));
+	}
+
+	public static function readMessage(block:Bool):Dynamic {
+		return current().getHandle().messages.pop(block);
+	}
+
+	public inline function sendMessage(msg:Dynamic):Void {
+		this.sendMessage(msg);
+	}
+
+	private inline function getHandle():NativeThread {
+		return this;
+	}
+}
+
+@:native('haxe.java.vm.Thread') private class NativeThread {
+	@:private static var javaThreadToHaxe = new haxe.ds.WeakMap<java.lang.Thread, NativeThread>();
+	@:private static var mainJavaThread = java.lang.Thread.currentThread();
+	@:private static var mainHaxeThread = {
+		var ret = new NativeThread();
+		javaThreadToHaxe.set(mainJavaThread, ret);
+		ret;
+	};
+
+	public static function getThread(jt:java.lang.Thread):NativeThread {
+		if (Std.is(jt, HaxeThread)) {
+			var t:HaxeThread = cast jt;
+			return t.threadObject;
+		} else if (jt == mainJavaThread) {
+			return mainHaxeThread;
+		} else {
+			var ret = null;
+			untyped __lock__(javaThreadToHaxe, {
+				ret = javaThreadToHaxe.get(jt);
+				if (ret == null) {
+					ret = new NativeThread();
+					javaThreadToHaxe.set(jt, ret);
+				}
+			});
+			return ret;
+		}
+	}
+
+	public var messages:Deque<Dynamic>;
+
+	public function new() {
+		this.messages = new Deque();
+	}
+
+	public function sendMessage(msg:Dynamic):Void {
+		messages.add(msg);
+	}
+}
+
+@:native('haxe.java.vm.HaxeThread')
+private class HaxeThread extends java.lang.Thread {
+	public var threadObject(default, null):NativeThread;
+
+	private var runFunction:Void->Void;
+
+	@:overload override public function run():Void {
+		runFunction();
+	}
+
+	public function new(hxThread:NativeThread, run:Void->Void) {
+		super();
+		threadObject = hxThread;
+		runFunction = run;
+		setDaemon(true);
+	}
+}
diff --git a/std/java/_std/sys/thread/Tls.hx b/std/java/_std/sys/thread/Tls.hx
new file mode 100644
index 0000000000000000000000000000000000000000..54ec7d1b383451912f40358cbbf2827bf654c9c7
--- /dev/null
+++ b/std/java/_std/sys/thread/Tls.hx
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+// @:coreApi // causes some overload error...
+@:native('haxe.java.vm.Tls') class Tls<T> {
+	var t:java.lang.ThreadLocal<T>;
+
+	public var value(get, set):T;
+
+	public function new() {
+		this.t = new java.lang.ThreadLocal();
+	}
+
+	inline private function get_value():T {
+		return t.get();
+	}
+
+	inline private function set_value(v:T):T {
+		t.set(v);
+		return v;
+	}
+}
diff --git a/std/java/db/Jdbc.hx b/std/java/db/Jdbc.hx
index 0f3aae53e3dc2272a7b42abbfcb743888c0e43a6..1c9811e1cc66fa3ddc981583b0a9603af0d1f97a 100644
--- a/std/java/db/Jdbc.hx
+++ b/std/java/db/Jdbc.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,63 +19,56 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.db;
+
+package java.db;
+
 import java.util.concurrent.atomic.AtomicInteger;
 import haxe.io.Bytes;
 import java.sql.Types;
 
 @:native('haxe.java.db.Jdbc')
-class Jdbc
-{
-
-	public static function create(cnx:java.sql.Connection):sys.db.Connection
-	{
+class Jdbc {
+	public static function create(cnx:java.sql.Connection):sys.db.Connection {
 		return new JdbcConnection(cnx);
 	}
-
 }
 
 @:native('haxe.java.db.JdbcConnection')
-private class JdbcConnection implements sys.db.Connection
-{
+private class JdbcConnection implements sys.db.Connection {
 	private static var ids = new AtomicInteger(0);
+
 	private var id:Int;
 
 	private var cnx:java.sql.Connection;
 	private var _lastInsertId:Int;
-	//escape handling
+	// escape handling
 	private var escapeRegex:EReg;
 	private var escapes:Array<Dynamic>;
 
-	public function new(cnx)
-	{
+	public function new(cnx) {
 		this.id = ids.getAndIncrement();
 		this.cnx = cnx;
 		this.escapes = [];
 		this.escapeRegex = ~/@@HX_ESCAPE(\d+)_(\d+)@@/;
 	}
 
-	public function close()
-	{
+	public function close() {
 		try
 			this.cnx.close()
-		catch(e:Dynamic) throw e;
+		catch (e:Dynamic)
+			throw e;
 	}
 
-	public function escape(s:String):String
-	{
-		return "@@HX_ESCAPE" + id + "_" +escapes.push(s) + "@@";
+	public function escape(s:String):String {
+		return "@@HX_ESCAPE" + id + "_" + escapes.push(s) + "@@";
 	}
 
-	public function quote(s:String):String
-	{
-		return "@@HX_ESCAPE" + id + "_" +escapes.push(s) + "@@";
+	public function quote(s:String):String {
+		return "@@HX_ESCAPE" + id + "_" + escapes.push(s) + "@@";
 	}
 
-	public function addValue(s:StringBuf, v:Dynamic)
-	{
-		if (Std.is(v, Date))
-		{
+	public function addValue(s:StringBuf, v:Dynamic) {
+		if (Std.is(v, Date)) {
 			v = Std.string(v);
 		} else if (Std.is(v, Bytes)) {
 			var bt:Bytes = v;
@@ -88,13 +81,11 @@ private class JdbcConnection implements sys.db.Connection
 		s.add("@@");
 	}
 
-	public function lastInsertId():Int
-	{
+	public function lastInsertId():Int {
 		return _lastInsertId;
 	}
 
-	public function dbName():String
-	{
+	public function dbName():String {
 		try {
 			var ret = cnx.getMetaData().getDriverName();
 			var retc = ret.toLowerCase();
@@ -103,51 +94,45 @@ private class JdbcConnection implements sys.db.Connection
 			else if (retc.indexOf("sqlite") != -1)
 				return "SQLite";
 			return ret;
-		} catch(e:Dynamic) { throw e; }
+		} catch (e:Dynamic) {
+			throw e;
+		}
 	}
 
-	public function startTransaction()
-	{
-		try
-		{
+	public function startTransaction() {
+		try {
 			cnx.setAutoCommit(false);
-		}
-		catch(e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 	}
 
-	public function commit()
-	{
-		try
-		{
+	public function commit() {
+		try {
 			cnx.commit();
-		}
-		catch(e:Dynamic)
-		{
+		} catch (e:Dynamic) {
 			throw e;
 		}
 	}
 
-	public function rollback()
-	{
+	public function rollback() {
 		try
 			cnx.rollback()
-		catch(e:Dynamic) throw e;
+		catch (e:Dynamic)
+			throw e;
 	}
 
-	public function request(s:String):sys.db.ResultSet
-	{
+	public function request(s:String):sys.db.ResultSet {
 		var newst = new StringBuf();
 		var sentArray = [];
 
-		//cycle through the request string, adding any @@HX_ESCAPE@@ reference to the sentArray
+		// cycle through the request string, adding any @@HX_ESCAPE@@ reference to the sentArray
 		var r = escapeRegex;
 		var myid = id + "", escapes = escapes, elen = escapes.length;
-		try
-		{
-			while (r.match(s))
-			{
+		try {
+			while (r.match(s)) {
 				var id = r.matched(1);
-				if (id != myid) throw "Request quotes are only valid for one single request; They can't be cached.";
+				if (id != myid)
+					throw "Request quotes are only valid for one single request; They can't be cached.";
 
 				newst.add(r.matchedLeft());
 				var eid = Std.parseInt(r.matched(2));
@@ -159,52 +144,44 @@ private class JdbcConnection implements sys.db.Connection
 			}
 			newst.add(s);
 			var stmt = cnx.prepareStatement(newst.toString(), java.sql.Statement.Statement_Statics.RETURN_GENERATED_KEYS);
-			for (i in 0...sentArray.length)
-			{
+			for (i in 0...sentArray.length) {
 				stmt.setObject(i + 1, sentArray[i]);
 			}
 
 			var ret = null, dbName = dbName();
-			if (stmt.execute())
-			{
-				//is a result set
+			if (stmt.execute()) {
+				// is a result set
 				var rs = stmt.getResultSet();
 				ret = new JdbcResultSet(rs, dbName, stmt.getMetaData());
 			} else {
-				//is an update
+				// is an update
 				var affected = stmt.getUpdateCount();
-				if (affected == 1)
-				{
+				if (affected == 1) {
 					var autogen = stmt.getGeneratedKeys();
-					if (autogen.next())
-					{
+					if (autogen.next()) {
 						this._lastInsertId = autogen.getInt(1);
 					}
 				}
-				ret = new JdbcResultSet(null, dbName,null);
+				ret = new JdbcResultSet(null, dbName, null);
 			}
 
 			if (escapes.length != 0)
 				escapes = [];
 			this.id = ids.getAndIncrement();
 			return ret;
-		}
-		catch(e:Dynamic)
-		{
+		} catch (e:Dynamic) {
 			if (escapes.length != 0)
 				escapes = [];
 			this.id = ids.getAndIncrement();
 			throw e;
 		}
 	}
-
 }
 
 @:native('haxe.java.db.JdbcResultSet')
-private class JdbcResultSet implements sys.db.ResultSet
-{
-	@:isVar public var length(get,null) : Int;
-	public var nfields(get,null) : Int;
+private class JdbcResultSet implements sys.db.ResultSet {
+	@:isVar public var length(get, null):Int;
+	public var nfields(get, null):Int;
 
 	private var rs:java.sql.ResultSet;
 	private var names:Array<String>;
@@ -212,143 +189,129 @@ private class JdbcResultSet implements sys.db.ResultSet
 	private var dbName:String;
 	private var didNext:Bool;
 
-	public function new(rs, dbName, meta:java.sql.ResultSetMetaData)
-	{
+	public function new(rs, dbName, meta:java.sql.ResultSetMetaData) {
 		this.dbName = dbName;
 		this.rs = rs;
-		if (meta != null)
-		{
+		if (meta != null) {
 			try {
 				var count = meta.getColumnCount();
 				var names = [], types = new NativeArray(count);
-				for (i in 0...count)
-				{
-					names.push(meta.getColumnName(i+1));
-					types[i] = meta.getColumnType(i+1);
+				for (i in 0...count) {
+					names.push(meta.getColumnName(i + 1));
+					types[i] = meta.getColumnType(i + 1);
 				}
 				this.types = types;
 				this.names = names;
-			} catch(e:Dynamic) throw e;
+			} catch (e:Dynamic)
+				throw e;
 		}
 	}
 
-	private function get_length():Int
-	{
-		if (length == 0)
-		{
-      try
-      {
-  			var cur = rs.getRow();
-  			rs.last();
-  			this.length = rs.getRow();
-  			rs.absolute(cur);
-      } catch(e:Dynamic) throw e;
+	private function get_length():Int {
+		if (length == 0) {
+			try {
+				var cur = rs.getRow();
+				rs.last();
+				this.length = rs.getRow();
+				rs.absolute(cur);
+			} catch (e:Dynamic)
+				throw e;
 		}
 		return length;
 	}
 
-	private function get_nfields():Int
-	{
+	private function get_nfields():Int {
 		return names == null ? 0 : names.length;
 	}
 
-	public function hasNext() : Bool
-	{
-		try
-		{
+	public function hasNext():Bool {
+		try {
 			didNext = true;
 			return rs != null && rs.next();
+		} catch (e:Dynamic) {
+			return throw e;
 		}
-		catch(e:Dynamic) { return throw e; }
 	}
 
-	public function next() : Dynamic
-	{
+	public function next():Dynamic {
 		try {
-			if (rs == null) return null;
-			if (didNext)
-			{
+			if (rs == null)
+				return null;
+			if (didNext) {
 				didNext = false;
 			} else {
-				if (!rs.next())
-				{
+				if (!rs.next()) {
 					return null;
 				}
 			}
 			var ret = {}, names = names, types = types;
-			for (i in 0...names.length)
-			{
+			for (i in 0...names.length) {
 				var name = names[i], t = types[i], val:Dynamic = null;
-				if (t == Types.FLOAT)
-				{
-					val = rs.getDouble(i+1);
+				if (t == Types.FLOAT) {
+					val = rs.getDouble(i + 1);
 				} else if (t == Types.DATE || t == Types.TIME) {
-					if (dbName == "SQLite")
-					{
-						var str = rs.getString(i+1);
-						if (str != null)
-						{
+					if (dbName == "SQLite") {
+						var str = rs.getString(i + 1);
+						if (str != null) {
 							var d:Date = Date.fromString(str);
 							val = d;
 						}
 					} else {
-						var d:java.sql.Date = rs.getDate(i+1);
+						var d:java.sql.Date = rs.getDate(i + 1);
 						if (d != null)
 							val = Date.fromTime(cast d.getTime());
 					}
 				} else if (t == Types.LONGVARBINARY || t == Types.VARBINARY || t == Types.BINARY || t == Types.BLOB) {
-					var b = rs.getBytes(i+1);
+					var b = rs.getBytes(i + 1);
 					if (b != null)
 						val = Bytes.ofData(b);
 				} else {
-					untyped __java__("val = rs.getObject(i + 1)"); //type parameter constraint + overloads
+					untyped __java__("val = rs.getObject(i + 1)"); // type parameter constraint + overloads
 				}
 				Reflect.setField(ret, name, val);
 			}
 			return ret;
-		} catch(e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 	}
 
-	public function results() : List<Dynamic>
-	{
+	public function results():List<Dynamic> {
 		var l = new List();
-		if (rs == null) return l;
+		if (rs == null)
+			return l;
 
-		try
-		{
-			while(hasNext())
+		try {
+			while (hasNext())
 				l.add(next());
-		} catch(e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 		return l;
 	}
 
-	public function getResult( n : Int ) : String
-	{
-    try
-    {
-  		return rs.getString(n);
-    } catch(e:Dynamic) throw e;
+	public function getResult(n:Int):String {
+		try {
+			return rs.getString(n);
+		} catch (e:Dynamic)
+			throw e;
 	}
 
-	public function getIntResult( n : Int ) : Int
-	{
-		try
-		{
+	public function getIntResult(n:Int):Int {
+		try {
 			return rs.getInt(n);
-		}
-		catch(e:Dynamic) { return throw e; };
+		} catch (e:Dynamic) {
+			return throw e;
+		};
 	}
 
-	public function getFloatResult( n : Int ) : Float
-	{
-    try
-    {
-  		return rs.getFloat(n);
-    } catch(e:Dynamic) { return throw e; };
+	public function getFloatResult(n:Int):Float {
+		try {
+			return rs.getFloat(n);
+		} catch (e:Dynamic) {
+			return throw e;
+		};
 	}
 
-	public function getFieldsNames() : Null<Array<String>>
-	{
+	public function getFieldsNames():Null<Array<String>> {
 		return this.names;
 	}
 }
diff --git a/std/java/internal/Exceptions.hx b/std/java/internal/Exceptions.hx
index 34cd57d152cccd43c987e068302d70935d6fb5a8..7e54fbcdef3098c904613cf93be00590b2358877 100644
--- a/std/java/internal/Exceptions.hx
+++ b/std/java/internal/Exceptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java.internal;
+
 import java.lang.Throwable;
 import java.lang.RuntimeException;
 import java.lang.Exception;
@@ -28,28 +30,23 @@ import java.lang.Exception;
 class Exceptions {
 	private static var exception = new java.lang.ThreadLocal<java.lang.Throwable>();
 
-	@:keep private static function setException(exc:Throwable)
-	{
+	@:keep private static function setException(exc:Throwable) {
 		exception.set(exc);
 	}
 
-	public static function currentException()
-	{
+	public static function currentException() {
 		return exception.get();
 	}
 }
 
 @:classCode("public static final long serialVersionUID = 5956463319488556322L;")
-@:nativeGen @:keep @:native("haxe.lang.HaxeException") private class HaxeException extends RuntimeException
-{
+@:nativeGen @:keep @:native("haxe.lang.HaxeException") private class HaxeException extends RuntimeException {
 	private var obj:Dynamic;
 
-	public function new(obj:Dynamic, msg:String, cause:Throwable)
-	{
+	public function new(obj:Dynamic, msg:String, cause:Throwable) {
 		super(msg, cause);
 
-		if (Std.is(obj, HaxeException))
-		{
+		if (Std.is(obj, HaxeException)) {
 			var _obj:HaxeException = cast obj;
 			obj = _obj.getObject();
 		}
@@ -57,40 +54,34 @@ class Exceptions {
 		this.obj = obj;
 	}
 
-	public function getObject():Dynamic
-	{
+	public function getObject():Dynamic {
 		return obj;
 	}
 
-#if !debug
-	@:overload override public function fillInStackTrace():Throwable
-	{
+	#if !debug
+	@:overload override public function fillInStackTrace():Throwable {
 		return this;
 	}
-#end
+	#end
 
-	@:overload override public function toString():String
-	{
+	@:overload override public function toString():String {
 		return "Haxe Exception: " + obj;
 	}
-	
-	@:overload override public function getMessage():String
-	{
-		return switch (super.getMessage())
-		{
+
+	@:overload override public function getMessage():String {
+		return switch (super.getMessage()) {
 			case null: Std.string(obj);
-			case message: message;
+			case var message: message;
 		}
 	}
 
-	public static function wrap(obj:Dynamic):RuntimeException
-	{
+	public static function wrap(obj:Dynamic):RuntimeException {
 		var ret:RuntimeException = null;
- 		if (Std.is(obj, RuntimeException))
+		if (Std.is(obj, RuntimeException))
 			ret = obj;
 		else if (Std.is(obj, String))
 			ret = new HaxeException(obj, obj, null);
- 		else if (Std.is(obj, Throwable))
+		else if (Std.is(obj, Throwable))
 			ret = new HaxeException(obj, Std.string(obj), obj);
 		else
 			ret = new HaxeException(obj, Std.string(obj), null);
diff --git a/std/java/internal/FieldLookup.hx b/std/java/internal/FieldLookup.hx
index 9018cce83f9f91a6a0035a8ac28ded21c53a479e..04a4d8a3b243ce5f9eb4e9fa7e3af599393d516b 100644
--- a/std/java/internal/FieldLookup.hx
+++ b/std/java/internal/FieldLookup.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,34 +19,29 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java.internal;
 
 import java.lang.System;
 
 @:native('haxe.lang.FieldLookup')
 @:keep
-@:static private class FieldLookup
-{
-
+@:static class FieldLookup {
 	@:functionCode('
 		return s.hashCode();
 	')
-	public static function hash(s:String):Int
-	{
+	public static function hash(s:String):Int {
 		return 0;
 	}
 
-	public static function findHash(hash:String, hashs:java.NativeArray<String>, length:Int):Int
-	{
+	public static function findHash(hash:String, hashs:java.NativeArray<String>, length:Int):Int {
 		var min = 0;
 		var max = length;
 
-		while (min < max)
-		{
-			var mid = Std.int((max + min) / 2); //overflow safe
+		while (min < max) {
+			var mid = Std.int((max + min) / 2); // overflow safe
 			var classify = untyped hash.compareTo(hashs[mid]);
-			if (classify < 0)
-			{
+			if (classify < 0) {
 				max = mid;
 			} else if (classify > 0) {
 				min = mid + 1;
@@ -54,62 +49,48 @@ import java.lang.System;
 				return mid;
 			}
 		}
-		//if not found, return a negative value of where it should be inserted
+		// if not found, return a negative value of where it should be inserted
 		return ~min;
 	}
 
-	static function removeString(a:java.NativeArray<String>, length:Int, pos:Int) {
+	public static function removeString(a:java.NativeArray<String>, length:Int, pos:Int) {
 		System.arraycopy(a, pos + 1, a, pos, length - pos - 1);
 		a[length - 1] = null;
 	}
 
-	static function removeFloat(a:java.NativeArray<Float>, length:Int, pos:Int) {
+	public static function removeFloat(a:java.NativeArray<Float>, length:Int, pos:Int) {
 		System.arraycopy(a, pos + 1, a, pos, length - pos - 1);
 		a[length - 1] = 0;
 	}
 
-	static function removeDynamic(a:java.NativeArray<Dynamic>, length:Int, pos:Int) {
+	public static function removeDynamic(a:java.NativeArray<Dynamic>, length:Int, pos:Int) {
 		System.arraycopy(a, pos + 1, a, pos, length - pos - 1);
 		a[length - 1] = null;
 	}
 
-	@:extern
-	static inline function __insert<T>(a:java.NativeArray<T>, length:Int, pos:Int, x:T):java.NativeArray<T>
-	{
+	extern static inline function __insert<T>(a:java.NativeArray<T>, length:Int, pos:Int, x:T):java.NativeArray<T> {
 		var capacity = a.length;
-		if (pos == length)
-		{
-			if (capacity == length)
-			{
+		if (pos == length) {
+			if (capacity == length) {
 				var newarr = new NativeArray((length << 1) + 1);
 				System.arraycopy(a, 0, newarr, 0, a.length);
 				a = newarr;
 			}
-		}
-		else if (pos == 0)
-		{
-			if (capacity == length)
-			{
+		} else if (pos == 0) {
+			if (capacity == length) {
 				var newarr = new NativeArray((length << 1) + 1);
 				System.arraycopy(a, 0, newarr, 1, length);
 				a = newarr;
-			}
-			else
-			{
+			} else {
 				System.arraycopy(a, 0, a, 1, length);
 			}
-		}
-		else
-		{
-			if (capacity == length)
-			{
+		} else {
+			if (capacity == length) {
 				var newarr = new NativeArray((length << 1) + 1);
 				System.arraycopy(a, 0, newarr, 0, pos);
 				System.arraycopy(a, pos, newarr, pos + 1, length - pos);
 				a = newarr;
-			}
-			else
-			{
+			} else {
 				System.arraycopy(a, pos, a, pos + 1, length - pos);
 				System.arraycopy(a, 0, a, 0, pos);
 			}
@@ -118,7 +99,12 @@ import java.lang.System;
 		return a;
 	}
 
-	static function insertString(a:java.NativeArray<String>, length:Int, pos:Int, x:String):java.NativeArray<String> return __insert(a, length, pos, x);
-	static function insertFloat(a:java.NativeArray<Float>, length:Int, pos:Int, x:Float):java.NativeArray<Float> return __insert(a, length, pos, x);
-	static function insertDynamic(a:java.NativeArray<Dynamic>, length:Int, pos:Int, x:Dynamic):java.NativeArray<Dynamic> return __insert(a, length, pos, x);
+	public static function insertString(a:java.NativeArray<String>, length:Int, pos:Int, x:String):java.NativeArray<String>
+		return __insert(a, length, pos, x);
+
+	public static function insertFloat(a:java.NativeArray<Float>, length:Int, pos:Int, x:Float):java.NativeArray<Float>
+		return __insert(a, length, pos, x);
+
+	public static function insertDynamic(a:java.NativeArray<Dynamic>, length:Int, pos:Int, x:Dynamic):java.NativeArray<Dynamic>
+		return __insert(a, length, pos, x);
 }
diff --git a/std/java/internal/Function.hx b/std/java/internal/Function.hx
index 25d6bd174bab31734f36fd250d06455da957db62..0cce7a10c4de1733661af094c92fa603a6fb4113 100644
--- a/std/java/internal/Function.hx
+++ b/std/java/internal/Function.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java.internal;
+
 import java.internal.Runtime;
 
 /**
@@ -29,57 +31,44 @@ import java.internal.Runtime;
  *
  * @author waneck
  */
-@:abstract @:nativeGen @:native("haxe.lang.Function") @:keep class Function
-{
-	function new(arity:Int, type:Int)
-	{
-
-	}
+@:abstract @:nativeGen @:native("haxe.lang.Function") @:keep class Function {
+	function new(arity:Int, type:Int) {}
 }
 
-@:nativeGen @:native("haxe.lang.VarArgsBase") @:keep private class VarArgsBase extends Function
-{
-	public function __hx_invokeDynamic(dynArgs:Array<Dynamic>):Dynamic
-	{
+@:nativeGen @:native("haxe.lang.VarArgsBase") @:keep private class VarArgsBase extends Function {
+	public function __hx_invokeDynamic(dynArgs:java.NativeArray<Dynamic>):Dynamic {
 		throw "Abstract implementation";
 	}
 }
 
-@:nativeGen @:native('haxe.lang.VarArgsFunction') @:keep class VarArgsFunction extends VarArgsBase
-{
+@:nativeGen @:native('haxe.lang.VarArgsFunction') @:keep class VarArgsFunction extends VarArgsBase {
 	private var fun:Array<Dynamic>->Dynamic;
 
-	public function new(fun)
-	{
+	public function new(fun) {
 		super(-1, -1);
 		this.fun = fun;
 	}
 
-	override public function __hx_invokeDynamic(dynArgs:Array<Dynamic>):Dynamic
-	{
-		return fun(dynArgs);
+	override public function __hx_invokeDynamic(dynArgs:java.NativeArray<Dynamic>):Dynamic {
+		return fun(@:privateAccess Array.ofNative(dynArgs));
 	}
 }
 
-@:nativeGen @:native('haxe.lang.Closure') @:keep class Closure extends VarArgsBase
-{
+@:nativeGen @:native('haxe.lang.Closure') @:keep class Closure extends VarArgsBase {
 	private var obj:Dynamic;
 	private var field:String;
 
-	public function new(obj:Dynamic, field)
-	{
+	public function new(obj:Dynamic, field) {
 		super(-1, -1);
 		this.obj = obj;
 		this.field = field;
 	}
 
-	override public function __hx_invokeDynamic(dynArgs:Array<Dynamic>):Dynamic
-	{
+	override public function __hx_invokeDynamic(dynArgs:java.NativeArray<Dynamic>):Dynamic {
 		return Runtime.callField(obj, field, dynArgs);
 	}
 
-	public function equals(obj:Dynamic):Bool
-	{
+	public function equals(obj:Dynamic):Bool {
 		if (obj == null)
 			return false;
 
@@ -87,8 +76,7 @@ import java.internal.Runtime;
 		return (c.obj == this.obj && c.field == this.field);
 	}
 
-	public function hashCode():Int
-	{
+	public function hashCode():Int {
 		return obj.hashCode() ^ untyped field.hashCode();
 	}
 }
diff --git a/std/java/internal/HxObject.hx b/std/java/internal/HxObject.hx
index c6bcf82a1625f14e617d53591bfa8ac96eb65224..d8f4d795c4c97e6a84afd18cf664ee06923c7330 100644
--- a/std/java/internal/HxObject.hx
+++ b/std/java/internal/HxObject.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java.internal;
+
 import java.internal.IEquatable;
 import haxe.ds.Vector;
 
@@ -27,94 +29,231 @@ private typedef StdType = Type;
 
 @:native('haxe.lang.HxObject')
 @:keep
-private class HxObject implements IHxObject
-{
-}
+private class HxObject implements IHxObject {}
 
 @:native('haxe.lang.IHxObject')
 @:keep
-interface IHxObject
-{
-}
+interface IHxObject {}
 
 @:native('haxe.lang.DynamicObject')
 @:keep
-class DynamicObject extends HxObject implements Dynamic
-{
-	@:skipReflection public function toString():String
-	{
-		var ts = Reflect.field(this, "toString");
+class DynamicObject extends HxObject {
+	@:skipReflection var __hx_fields:java.NativeArray<String>;
+	@:skipReflection var __hx_dynamics:java.NativeArray<Dynamic>;
+
+	@:skipReflection var __hx_fields_f:java.NativeArray<String>;
+	@:skipReflection var __hx_dynamics_f:java.NativeArray<Float>;
+
+	@:skipReflection var __hx_length:Int;
+	@:skipReflection var __hx_length_f:Int;
+
+	@:skipReflection static var __hx_toString_depth = 0;
+
+	@:overload public function new() {
+		this.__hx_fields = new java.NativeArray(0);
+		this.__hx_dynamics = new java.NativeArray(0);
+		this.__hx_fields_f = new java.NativeArray(0);
+		this.__hx_dynamics_f = new java.NativeArray(0);
+	}
+
+	@:overload public function new(fields:NativeArray<String>, dynamics:NativeArray<Dynamic>, fields_f:NativeArray<String>, dynamics_f:NativeArray<Float>) {
+		this.__hx_fields = fields;
+		this.__hx_dynamics = dynamics;
+		this.__hx_fields_f = fields_f;
+		this.__hx_dynamics_f = dynamics_f;
+		this.__hx_length = fields.length;
+		this.__hx_length_f = fields_f.length;
+	}
+
+	public function __hx_deleteField(field:String):Bool {
+		var res = FieldLookup.findHash(field, this.__hx_fields, this.__hx_length);
+		if (res >= 0) {
+			FieldLookup.removeString(this.__hx_fields, this.__hx_length, res);
+			FieldLookup.removeDynamic(this.__hx_dynamics, this.__hx_length, res);
+			this.__hx_length--;
+			return true;
+		}
+		var res = FieldLookup.findHash(field, this.__hx_fields_f, this.__hx_length_f);
+		if (res >= 0) {
+			FieldLookup.removeString(this.__hx_fields_f, this.__hx_length_f, res);
+			FieldLookup.removeFloat(this.__hx_dynamics_f, this.__hx_length_f, res);
+			this.__hx_length_f--;
+			return true;
+		}
+		return false;
+	}
+
+	public function __hx_getField(field:String, throwErrors:Bool, isCheck:Bool, handleProperties:Bool):Dynamic {
+		var res = FieldLookup.findHash(field, this.__hx_fields, this.__hx_length);
+		if (res >= 0) {
+			return this.__hx_dynamics[res];
+		}
+		res = FieldLookup.findHash(field, this.__hx_fields_f, this.__hx_length_f);
+		if (res >= 0) {
+			return this.__hx_dynamics_f[res];
+		}
+
+		return isCheck ? Runtime.undefined : null;
+	}
+
+	public function __hx_setField(field:String, value:Dynamic, handleProperties:Bool):Dynamic {
+		var res = FieldLookup.findHash(field, this.__hx_fields, this.__hx_length);
+		if (res >= 0) {
+			return this.__hx_dynamics[res] = value;
+		} else {
+			var res = FieldLookup.findHash(field, this.__hx_fields_f, this.__hx_length_f);
+			if (res >= 0) {
+				if (Std.is(value, Float)) {
+					return this.__hx_dynamics_f[res] = value;
+				}
+
+				FieldLookup.removeString(this.__hx_fields_f, this.__hx_length_f, res);
+				FieldLookup.removeFloat(this.__hx_dynamics_f, this.__hx_length_f, res);
+				this.__hx_length_f--;
+			}
+		}
+
+		this.__hx_fields = FieldLookup.insertString(this.__hx_fields, this.__hx_length, ~(res), field);
+		this.__hx_dynamics = FieldLookup.insertDynamic(this.__hx_dynamics, this.__hx_length, ~(res), value);
+		this.__hx_length++;
+		return value;
+	}
+
+	public function __hx_getField_f(field:String, throwErrors:Bool, handleProperties:Bool):Float {
+		var res = FieldLookup.findHash(field, this.__hx_fields_f, this.__hx_length_f);
+		if (res >= 0) {
+			return this.__hx_dynamics_f[res];
+		}
+		res = FieldLookup.findHash(field, this.__hx_fields, this.__hx_length);
+		if (res >= 0) {
+			return this.__hx_dynamics[res];
+		}
+
+		return 0.0;
+	}
+
+	public function __hx_setField_f(field:String, value:Float, handleProperties:Bool):Float {
+		var res = FieldLookup.findHash(field, this.__hx_fields_f, this.__hx_length_f);
+		if (res >= 0) {
+			return this.__hx_dynamics_f[res] = value;
+		} else {
+			var res = FieldLookup.findHash(field, this.__hx_fields, this.__hx_length);
+			if (res >= 0) {
+				// return this.__hx_dynamics[res] = value;
+				FieldLookup.removeString(this.__hx_fields, this.__hx_length, res);
+				FieldLookup.removeDynamic(this.__hx_dynamics, this.__hx_length, res);
+				this.__hx_length--;
+			}
+		}
+
+		this.__hx_fields_f = FieldLookup.insertString(this.__hx_fields_f, this.__hx_length_f, ~(res), field);
+		this.__hx_dynamics_f = FieldLookup.insertFloat(this.__hx_dynamics_f, this.__hx_length_f, ~(res), value);
+		this.__hx_length_f++;
+		return value;
+	}
+
+	public function __hx_getFields(baseArr:Array<String>):Void {
+		for (i in 0...this.__hx_length) {
+			baseArr.push(this.__hx_fields[i]);
+		}
+		for (i in 0...this.__hx_length_f) {
+			baseArr.push(this.__hx_fields_f[i]);
+		}
+	}
+
+	public function __hx_invokeField(field:String, dynargs:NativeArray<Dynamic>):Dynamic {
+		if (field == "toString") {
+			return this.toString();
+		}
+		var fn:Function = this.__hx_getField(field, false, false, false);
+		if (fn == null) {
+			throw 'Cannot invoke field $field: It does not exist';
+		}
+
+		return untyped fn.__hx_invokeDynamic(dynargs);
+	}
+
+	public function toString():String {
+		if (__hx_toString_depth >= 5) {
+			return "...";
+		}
+		++__hx_toString_depth;
+		try {
+			var s = __hx_toString();
+			--__hx_toString_depth;
+			return s;
+		} catch (e:Dynamic) {
+			--__hx_toString_depth;
+			throw(e);
+		}
+	}
+
+	function __hx_toString() {
+		var ts = this.__hx_getField("toString", false, false, false);
 		if (ts != null)
 			return ts();
 		var ret = new StringBuf();
 		ret.add("{");
 		var first = true;
-		for (f in Reflect.fields(this))
-		{
-			if( first )
+		for (f in Reflect.fields(this)) {
+			if (first)
 				first = false;
 			else
 				ret.add(",");
-			ret.add(" "); ret.add(f);
+			ret.add(" ");
+			ret.add(f);
 			ret.add(" : ");
 			ret.add(Reflect.field(this, f));
 		}
-		if (!first) ret.add(" ");
+		if (!first)
+			ret.add(" ");
 		ret.add("}");
 		return ret.toString();
 	}
 }
 
 @:keep @:native('haxe.lang.Enum') @:nativeGen
-class HxEnum
-{
-	@:readOnly private var index(default,never):Int;
+class HxEnum {
+	@:readOnly private var index(default, never):Int;
 
-	public function new(index:Int)
-	{
+	public function new(index:Int) {
 		untyped this.index = index;
 	}
 
-	public function getTag():String
-	{
+	public function getTag():String {
 		return throw 'Not Implemented';
 	}
 
-	public function getParams():Array<{}>
-	{
+	public function getParams():Array<{}> {
 		return [];
 	}
 
-	public function toString():String
-	{
+	public function toString():String {
 		return getTag();
 	}
 }
 
 @:keep @:native('haxe.lang.ParamEnum') @:nativeGen
-private class ParamEnum extends HxEnum
-{
-	@:readOnly private var params(default,never):Vector<Dynamic>;
+private class ParamEnum extends HxEnum {
+	@:readOnly private var params(default, never):Vector<Dynamic>;
 
-	public function new(index:Int, params:Vector<Dynamic>)
-	{
+	public function new(index:Int, params:Vector<Dynamic>) {
 		super(index);
 		untyped this.params = params;
 	}
 
-	override public function getParams():Array<{}>
-	{
+	override public function getParams():Array<{}> {
 		return params == null ? [] : cast params.toArray();
 	}
 
-	override public function toString():String
-	{
-		if (params == null || params.length == 0) return getTag();
+	override public function toString():String {
+		if (params == null || params.length == 0)
+			return getTag();
 		var ret = new StringBuf();
-		ret.add(getTag()); ret.add("(");
+		ret.add(getTag());
+		ret.add("(");
 		var first = true;
-		for (p in params)
-		{
+		for (p in params) {
 			if (first)
 				first = false;
 			else
@@ -125,11 +264,10 @@ private class ParamEnum extends HxEnum
 		return ret.toString();
 	}
 
-	public function equals(obj:Dynamic)
-	{
-		if (obj == this) //we cannot use == as .Equals !
+	public function equals(obj:Dynamic) {
+		if (obj == this) // we cannot use == as .Equals !
 			return true;
-		var obj:ParamEnum = Std.is(obj,ParamEnum) ? cast obj : null;
+		var obj:ParamEnum = Std.is(obj, ParamEnum) ? cast obj : null;
 		var ret = obj != null && Std.is(obj, StdType.getEnum(cast this)) && obj.index == this.index;
 		if (!ret)
 			return false;
@@ -138,23 +276,21 @@ private class ParamEnum extends HxEnum
 		var len = 0;
 		if (obj.params == null || this.params == null || (len = this.params.length) != obj.params.length)
 			return false;
-		for (i in 0...len)
-		{
+		for (i in 0...len) {
 			if (!StdType.enumEq(obj.params[i], this.params[i]))
 				return false;
 		}
 		return true;
 	}
 
-	public function hashCode():Int
-	{
+	public function hashCode():Int {
 		var h = 19;
-		if (params != null) for (p in params)
-		{
-			h = h * 31;
-			if (p != null)
-				untyped h += p.hashCode();
-		}
+		if (params != null)
+			for (p in params) {
+				h = h * 31;
+				if (p != null)
+					untyped h += p.hashCode();
+			}
 		h += index;
 		return h;
 	}
diff --git a/std/java/internal/IEquatable.hx b/std/java/internal/IEquatable.hx
index 699ddd4e21e0a77f695e1eee47f8c427fefbd122..f557a19a76dec673c723478051888963ba7eac72 100644
--- a/std/java/internal/IEquatable.hx
+++ b/std/java/internal/IEquatable.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java.internal;
 
 @:native('haxe.lang.IEquatable')
 @:keep
 @:nativeGen
-interface IEquatable
-{
-
+interface IEquatable {
 	public function equals(to:Dynamic):Bool;
-
 }
diff --git a/std/java/internal/Runtime.hx b/std/java/internal/Runtime.hx
index a29542c5cee66a9c882a776c8db677f43a2a003d..104ef34923c6e6690f34fcf792e11867eb990616 100644
--- a/std/java/internal/Runtime.hx
+++ b/std/java/internal/Runtime.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java.internal;
 
 /**
- This class is meant for internal compiler use only. It provides the Haxe runtime
- compatibility to the host language. Do not access it directly.
+	This class is meant for internal compiler use only. It provides the Haxe runtime
+	compatibility to the host language. Do not access it directly.
 **/
-
 @:native('haxe.lang.Runtime')
 @:nativeGen
 @:classCode('
@@ -51,20 +51,18 @@ package java.internal;
 		return obj.__hx_setField_f(field, value, false);
 	}
 
-	public static java.lang.Object callField(haxe.lang.IHxObject obj, java.lang.String field, Array<?> args)
+	public static java.lang.Object callField(haxe.lang.IHxObject obj, java.lang.String field, java.lang.Object[] args)
 	{
 		return obj.__hx_invokeField(field, args);
 	}
 ')
-@:keep class Runtime
-{
-	public static var undefined:Dynamic = { };
+@:keep class Runtime {
+	public static var undefined:Dynamic = {};
 
 	@:functionCode('
 	return new haxe.lang.Closure(obj, field);
 	')
-	public static function closure(obj:Dynamic, field:String):Dynamic
-	{
+	public static function closure(obj:Dynamic, field:String):Dynamic {
 		return null;
 	}
 
@@ -90,8 +88,7 @@ package java.internal;
 
 			return false;
 	')
-	public static function eq(v1:Dynamic, v2:Dynamic):Bool
-	{
+	public static function eq(v1:Dynamic, v2:Dynamic):Bool {
 		return false;
 	}
 
@@ -106,45 +103,36 @@ package java.internal;
 			return v1 == v2;
 		}
 	')
-	public static function refEq(v1: { }, v2: { } ):Bool
-	{
+	public static function refEq(v1:{}, v2:{}):Bool {
 		return false;
 	}
 
 	@:functionCode('
 		return v1 == v2 || (v1 != null && v1.equals(v2));
 	')
-	public static function valEq(v1: { }, v2: { } ):Bool
-	{
+	public static function valEq(v1:{}, v2:{}):Bool {
 		return false;
 	}
 
 	@:functionCode('
 		return (obj == null) ? 0.0 : ((java.lang.Number) obj).doubleValue();
 	')
-	public static function toDouble(obj:Dynamic):Float
-	{
+	public static function toDouble(obj:Dynamic):Float {
 		return 0.0;
 	}
 
-	@:functionCode('
-		return (obj == null) ? false : ((java.lang.Boolean) obj).booleanValue();
-	')
-	public static function toBool(obj:Dynamic):Bool
-	{
-		return false;
+	public static function toBool(obj:java.lang.Boolean):Bool {
+		return obj == null ? false : obj.booleanValue();
 	}
 
 	@:functionCode('
 		return (obj == null) ? 0 : ((java.lang.Number) obj).intValue();
 	')
-	public static function toInt(obj:Dynamic):Int
-	{
+	public static function toInt(obj:Dynamic):Int {
 		return 0;
 	}
 
-	public static function toLong(obj:Dynamic):haxe.Int64
-	{
+	public static function toLong(obj:Dynamic):haxe.Int64 {
 		return obj == null ? 0 : (obj : java.lang.Number).longValue();
 	}
 
@@ -156,13 +144,11 @@ package java.internal;
 			return false;
 		}
 	')
-	public static function isDouble(obj:Dynamic):Bool
-	{
+	public static function isDouble(obj:Dynamic):Bool {
 		return false;
 	}
 
-	@:overload public static function isInt(obj:Dynamic):Bool
-	{
+	@:overload public static function isInt(obj:Dynamic):Bool {
 		if (Std.is(obj, java.lang.Number)) {
 			var n:java.lang.Number = obj;
 			return n.doubleValue() == n.intValue();
@@ -208,8 +194,7 @@ package java.internal;
 
 		return false;
 	')
-	public static function slowHasField(o:Dynamic, field:String):Bool
-	{
+	public static function slowHasField(o:Dynamic, field:String):Bool {
 		return false;
 	}
 
@@ -239,8 +224,7 @@ package java.internal;
 			//if it\'s not a number it must be a String
 			return ((java.lang.String) v1).compareTo((java.lang.String) v2);
 	')
-	public static function compare(v1:Dynamic, v2:Dynamic):Int
-	{
+	public static function compare(v1:Dynamic, v2:Dynamic):Int {
 		return 0;
 	}
 
@@ -261,8 +245,7 @@ package java.internal;
 
 			throw new java.lang.IllegalArgumentException("Cannot dynamically add " + v1 + " and " + v2);
 	')
-	public static function plus(v1:Dynamic, v2:Dynamic):Dynamic
-	{
+	public static function plus(v1:Dynamic, v2:Dynamic):Dynamic {
 		return null;
 	}
 
@@ -317,8 +300,7 @@ package java.internal;
 	}
 
 	')
-	public static function slowGetField(obj:Dynamic, field:String, throwErrors:Bool):Dynamic
-	{
+	public static function slowGetField(obj:Dynamic, field:String, throwErrors:Bool):Dynamic {
 		return null;
 	}
 
@@ -352,8 +334,7 @@ package java.internal;
 			throw HaxeException.wrap(t);
 		}
 	')
-	public static function slowSetField(obj:Dynamic, field:String, value:Dynamic):Dynamic
-	{
+	public static function slowSetField(obj:Dynamic, field:String, value:Dynamic):Dynamic {
 		return null;
 	}
 
@@ -362,7 +343,7 @@ package java.internal;
 		if (obj instanceof java.lang.Class)
 		{
 			if (obj == java.lang.String.class && field.equals("fromCharCode"))
-				return haxe.lang.StringExt.fromCharCode(toInt(args.__get(0)));
+				return haxe.lang.StringExt.fromCharCode(toInt(args[0]));
 
 			cl = (java.lang.Class) obj;
 			obj = null;
@@ -372,7 +353,7 @@ package java.internal;
 			cl = obj.getClass();
 		}
 
-		if (args == null) args = new Array();
+		if (args == null) args = new java.lang.Object[0];
 
 		int len = args.length;
 		java.lang.Class[] cls = new java.lang.Class[len];
@@ -398,7 +379,7 @@ package java.internal;
 
 		for (int i = 0; i < len; i++)
 		{
-			Object o = args.__get(i);
+			Object o = args[i];
 			if (o == null)
 			{
 				continue; //can be anything
@@ -498,8 +479,7 @@ package java.internal;
 			throw haxe.lang.HaxeException.wrap(t);
 		}
 	')
-	public static function slowCallField(obj:Dynamic, field:String, args:Array<Dynamic>):Dynamic
-	{
+	public static function slowCallField(obj:Dynamic, field:String, args:java.NativeArray<Dynamic>):Dynamic {
 		return null;
 	}
 
@@ -511,8 +491,7 @@ package java.internal;
 
 		return slowCallField(obj, field, args);
 	')
-	public static function callField(obj:Dynamic, field:String, args:Array<Dynamic>):Dynamic
-	{
+	public static function callField(obj:Dynamic, field:String, args:java.NativeArray<Dynamic>):Dynamic {
 		return null;
 	}
 
@@ -524,8 +503,7 @@ package java.internal;
 		return slowGetField(obj, field, throwErrors);
 
 	')
-	public static function getField(obj:Dynamic, field:String, throwErrors:Bool):Dynamic
-	{
+	public static function getField(obj:Dynamic, field:String, throwErrors:Bool):Dynamic {
 		return null;
 	}
 
@@ -537,8 +515,7 @@ package java.internal;
 		return toDouble(slowGetField(obj, field, throwErrors));
 
 	')
-	public static function getField_f(obj:Dynamic, field:String, throwErrors:Bool):Float
-	{
+	public static function getField_f(obj:Dynamic, field:String, throwErrors:Bool):Float {
 		return 0.0;
 	}
 
@@ -550,8 +527,7 @@ package java.internal;
 		return slowSetField(obj, field, value);
 
 	')
-	public static function setField(obj:Dynamic, field:String, value:Dynamic):Dynamic
-	{
+	public static function setField(obj:Dynamic, field:String, value:Dynamic):Dynamic {
 		return null;
 	}
 
@@ -563,28 +539,60 @@ package java.internal;
 		return toDouble(slowSetField(obj, field, value));
 
 	')
-	public static function setField_f(obj:Dynamic, field:String, value:Float):Float
-	{
+	public static function setField_f(obj:Dynamic, field:String, value:Float):Float {
 		return 0.0;
 	}
 
-	public static function toString(obj:Dynamic):String
-	{
+	public static function toString(obj:Dynamic):String {
 		if (obj == null)
 			return null;
 
-		if (Std.is(obj, java.lang.Number) && !Std.is(obj, java.lang.Integer.IntegerClass) && isInt( (obj : java.lang.Number) ))
+		if (Std.is(obj, java.lang.Number) && !Std.is(obj, java.lang.Integer.IntegerClass) && isInt((obj : java.lang.Number)))
 			return java.lang.Integer._toString(toInt(obj));
 		return untyped obj.toString();
 	}
 
-	public static function isFinite(v:Float):Bool
-	{
+	public static function isFinite(v:Float):Bool {
 		return (v == v) && !java.lang.Double.DoubleClass._isInfinite(v);
 	}
+
+	public static function getIntFromNumber(n:java.lang.Number):Int {
+		return n == null ? 0 : n.intValue();
+	}
+
+	public static function getFloatFromNumber(n:java.lang.Number):Float {
+		return n == null ? 0.0 : n.doubleValue();
+	}
+
+	public static function getInt64FromNumber(n:java.lang.Number):java.StdTypes.Int64 {
+		return n == null ? 0.0 : n.longValue();
+	}
+
+	public static function numToInteger(num:java.lang.Number):java.lang.Integer {
+		return num == null ? null : (Std.is(num, java.lang.Integer.IntegerClass) ? cast num : java.lang.Integer.valueOf(num.intValue()));
+	}
+
+	public static function numToDouble(num:java.lang.Number):java.lang.Double {
+		return num == null ? null : (Std.is(num, java.lang.Double.DoubleClass) ? cast num : java.lang.Double.valueOf(num.doubleValue()));
+	}
+
+	public static function numToFloat(num:java.lang.Number):java.lang.Float {
+		return num == null ? null : (Std.is(num, java.lang.Float.FloatClass) ? cast num : java.lang.Float.valueOf(num.floatValue()));
+	}
+
+	public static function numToByte(num:java.lang.Number):java.lang.Byte {
+		return num == null ? null : (Std.is(num, java.lang.Byte.ByteClass) ? cast num : java.lang.Byte.valueOf(num.byteValue()));
+	}
+
+	public static function numToLong(num:java.lang.Number):java.lang.Long {
+		return num == null ? null : (Std.is(num, java.lang.Long.LongClass) ? cast num : java.lang.Long.valueOf(num.longValue()));
+	}
+
+	public static function numToShort(num:java.lang.Number):java.lang.Short {
+		return num == null ? null : (Std.is(num, java.lang.Short.ShortClass) ? cast num : java.lang.Short.valueOf(num.shortValue()));
+	}
 }
 
-@:keep @:native("haxe.lang.EmptyObject") enum EmptyObject
-{
+@:keep @:native("haxe.lang.EmptyObject") enum EmptyObject {
 	EMPTY;
 }
diff --git a/std/java/internal/StringExt.hx b/std/java/internal/StringExt.hx
index 0b65ea2ca5baed6a4eca9828a66cbfc1e8359b12..95cc03a5f1614de8b05ce350aac25bd1cae4c6d7 100644
--- a/std/java/internal/StringExt.hx
+++ b/std/java/internal/StringExt.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,22 +19,21 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java.internal;
+
 import java.internal.Function;
 
 private typedef NativeString = String;
 
-@:keep @:nativeGen @:native("haxe.lang.StringExt") private class StringExt
-{
-
+@:keep @:nativeGen @:native("haxe.lang.StringExt") private class StringExt {
 	@:functionCode('
 			if ( index >= me.length() || index < 0 )
 				return "";
 			else
 				return java.lang.Character.toString(me.charAt(index));
 	')
-	public static function charAt(me:NativeString, index:Int):NativeString
-	{
+	public static function charAt(me:NativeString, index:Int):NativeString {
 		return null;
 	}
 
@@ -44,8 +43,7 @@ private typedef NativeString = String;
 			else
 				return (int) me.charAt(index);
 	')
-	public static function charCodeAt(me:NativeString, index:Int):Null<Int>
-	{
+	public static function charCodeAt(me:NativeString, index:Int):Null<Int> {
 		return null;
 	}
 
@@ -55,8 +53,7 @@ private typedef NativeString = String;
 				return -1;
 			return me.indexOf(str, sIndex);
 	')
-	public static function indexOf(me:NativeString, str:NativeString, ?startIndex:Int):Int
-	{
+	public static function indexOf(me:NativeString, str:NativeString, ?startIndex:Int):Int {
 		return -1;
 	}
 
@@ -68,8 +65,7 @@ private typedef NativeString = String;
 				return -1;
 			return me.lastIndexOf(str, sIndex);
 	')
-	public static function lastIndexOf(me:NativeString, str:NativeString, ?startIndex:Int):Int
-	{
+	public static function lastIndexOf(me:NativeString, str:NativeString, ?startIndex:Int):Int {
 		return -1;
 	}
 
@@ -100,8 +96,7 @@ private typedef NativeString = String;
 			}
 			return ret;
 	')
-	public static function split(me:NativeString, delimiter:NativeString):Array<NativeString>
-	{
+	public static function split(me:NativeString, delimiter:NativeString):Array<NativeString> {
 		return null;
 	}
 
@@ -133,8 +128,7 @@ private typedef NativeString = String;
 
 			return me.substring(pos, pos + targetLen);
 	')
-	public static function substr(me:NativeString, pos:Int, ?len:Int):NativeString
-	{
+	public static function substr(me:NativeString, pos:Int, ?len:Int):NativeString {
 		return null;
 	}
 
@@ -164,55 +158,46 @@ private typedef NativeString = String;
 		return me.substring(startIndex, endIdx);
 
 	')
-	public static function substring(me:NativeString, startIndex:Int, ?endIndex:Int):NativeString
-	{
+	public static function substring(me:NativeString, startIndex:Int, ?endIndex:Int):NativeString {
 		return null;
 	}
 
-	public static function toString(me:NativeString):NativeString
-	{
+	public static function toString(me:NativeString):NativeString {
 		return me;
 	}
 
 	@:functionCode('
 			return me.toLowerCase();
 	')
-	public static function toLowerCase(me:NativeString):NativeString
-	{
+	public static function toLowerCase(me:NativeString):NativeString {
 		return null;
 	}
 
 	@:functionCode('
 			return me.toUpperCase();
 	')
-	public static function toUpperCase(me:NativeString):NativeString
-	{
+	public static function toUpperCase(me:NativeString):NativeString {
 		return null;
 	}
 
-	public static function toNativeString(me:NativeString):NativeString
-	{
+	public static function toNativeString(me:NativeString):NativeString {
 		return me;
 	}
 
-	@:functionCode('
-		return java.lang.Character.toString( (char) code );
-	')
-	public static function fromCharCode(code:Int):NativeString
-	{
-		return null;
+	public static function fromCharCode(code:Int):String {
+		return new String(java.lang.Character.toChars(code));
 	}
 }
 
-@:keep @:nativeGen @:native('haxe.lang.StringRefl') private class StringRefl
-{
-	public static var fields = ["length", "toUpperCase", "toLowerCase", "charAt", "charCodeAt", "indexOf", "lastIndexOf", "split", "substr", "substring"];
+@:keep @:nativeGen @:native('haxe.lang.StringRefl') private class StringRefl {
+	public static var fields = [
+		"length", "toUpperCase", "toLowerCase", "charAt", "charCodeAt", "indexOf", "lastIndexOf", "split", "substr", "substring"
+	];
 
-	public static function handleGetField(str:NativeString, f:NativeString, throwErrors:Bool):Dynamic
-	{
-		switch(f)
-		{
-			case "length": return str.length;
+	public static function handleGetField(str:NativeString, f:NativeString, throwErrors:Bool):Dynamic {
+		switch (f) {
+			case "length":
+				return str.length;
 			case "toUpperCase", "toLowerCase", "charAt", "charCodeAt", "indexOf", "lastIndexOf", "split", "substr", "substring":
 				return new Closure(str, f);
 			default:
@@ -223,21 +208,22 @@ private typedef NativeString = String;
 		}
 	}
 
-	public static function handleCallField(str:NativeString, f:NativeString, args:Array<Dynamic>):Dynamic
-	{
-		var _args:Array<Dynamic> = [str];
-		if (args == null)
-			args = _args;
-		else
-			args = _args.concat(args);
-
-		return Runtime.slowCallField(StringExt, f, args);
+	public static function handleCallField(str:NativeString, f:NativeString, args:java.NativeArray<Dynamic>):Dynamic {
+		var _args:java.NativeArray<Dynamic>;
+		if (args == null) {
+			_args = java.NativeArray.make(str);
+		} else {
+			_args = new java.NativeArray(args.length + 1);
+			_args[0] = str;
+			for (i in 0...args.length)
+				_args[i + 1] = args[i];
+		}
+		return Runtime.slowCallField(StringExt, f, _args);
 	}
 }
 
-@:keep @:native('haxe.lang.NativeString') private extern class JavaString
-{
-	//name collides with Haxe's
+@:keep @:native('haxe.lang.NativeString') private extern class JavaString {
+	// name collides with Haxe's
 	function _charAt(idx:Int):java.StdTypes.Char16;
 	function codePointAt(idx:Int):Int;
 	function codePointBefore(idx:Int):Int;
@@ -245,7 +231,6 @@ private typedef NativeString = String;
 	function offsetByCodePoints(index:Int, codePointOffset:Int):Int;
 	function getChars(srcBegin:Int, srcEnd:Int, dst:java.NativeArray<java.StdTypes.Char16>, dstBegin:Int):Void;
 
-
 	function startsWith(prefix:String):Bool;
 	function endsWith(suffix:String):Bool;
 	function _indexOf(str:String, fromIndex:Int):Int;
diff --git a/std/java/io/NativeInput.hx b/std/java/io/NativeInput.hx
index 4343bb338c29625b141f828e3aec6a8765874671..d6f34c3ecfa70382c26ad8cdf181d929f2f0820f 100644
--- a/std/java/io/NativeInput.hx
+++ b/std/java/io/NativeInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java.io;
+
 import haxe.Int64;
 import haxe.io.Bytes;
 import haxe.io.Eof;
@@ -27,42 +29,33 @@ import haxe.io.Input;
 import java.io.IOException;
 import java.io.EOFException;
 
-@:native('haxe.java.io.NativeInput') class NativeInput extends Input
-{
+@:native('haxe.java.io.NativeInput') class NativeInput extends Input {
 	var stream:java.io.InputStream;
-	public function new(stream)
-	{
+
+	public function new(stream) {
 		this.stream = stream;
 	}
 
-	override public function readByte():Int
-	{
+	override public function readByte():Int {
 		var ret = 0;
-		try
-		{
+		try {
 			ret = stream.read();
-		}
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
-		if ( ret == -1 )
+		if (ret == -1)
 			throw new Eof();
 		return ret;
 	}
 
-	override public function readBytes(s:Bytes, pos:Int, len:Int):Int
-	{
+	override public function readBytes(s:Bytes, pos:Int, len:Int):Int {
 		var ret = 0;
-		try
-		{
+		try {
 			ret = stream.read(s.getData(), pos, len);
-		}
+		} catch (e:EOFException) {
 
-		catch (e:EOFException) {
 			throw new Eof();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 
@@ -71,14 +64,10 @@ import java.io.EOFException;
 		return ret;
 	}
 
-	override public function close():Void
-	{
-		try
-		{
+	override public function close():Void {
+		try {
 			stream.close();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
diff --git a/std/java/io/NativeOutput.hx b/std/java/io/NativeOutput.hx
index daa9f72e4a43d1d4022c23485657dff5206d2d9f..cdf693c8e3fef5c789e036f1b8cc75f5bafc02c8 100644
--- a/std/java/io/NativeOutput.hx
+++ b/std/java/io/NativeOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java.io;
+
 import haxe.Int64;
 import haxe.io.Bytes;
 import haxe.io.Eof;
@@ -27,50 +29,36 @@ import haxe.io.Output;
 import java.io.IOException;
 import java.io.EOFException;
 
-@:native('haxe.java.io.NativeOutput') class NativeOutput extends Output
-{
+@:native('haxe.java.io.NativeOutput') class NativeOutput extends Output {
 	var stream:java.io.OutputStream;
-	public function new(stream)
-	{
+
+	public function new(stream) {
 		this.stream = stream;
 	}
 
-	override public function writeByte(c:Int):Void
-	{
-		try
-		{
+	override public function writeByte(c:Int):Void {
+		try {
 			stream.write(c);
-		}
+		} catch (e:EOFException) {
 
-		catch (e:EOFException) {
 			throw new Eof();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	override public function close():Void
-	{
-		try
-		{
+	override public function close():Void {
+		try {
 			stream.close();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	override public function flush():Void
-	{
-		try
-		{
+	override public function flush():Void {
+		try {
 			stream.flush();
-		}
-
-		catch (e:IOException) {
+		} catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
 	}
diff --git a/std/java/lang/Boolean.hx b/std/java/lang/Boolean.hx
index 01f631a13fbaaf514ec7fbab15a3ce29aa5ea2b9..150afde2aa660e28d91ea0f50891f9f116c9cc09 100644
--- a/std/java/lang/Boolean.hx
+++ b/std/java/lang/Boolean.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,35 +19,35 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.lang;
+
+package java.lang;
 
 @:native("") // make sure the generator won't see this
 @:forward
-@:forwardStatics abstract Boolean(BooleanClass) from BooleanClass to BooleanClass
-{
-	@:to @:extern inline public function toBool():Bool
+@:forwardStatics abstract Boolean(BooleanClass) from BooleanClass to BooleanClass {
+	@:to extern inline public function toBool():Bool
 		return this.booleanValue();
-	@:from @:extern inline public static function fromBool(b:Bool):Boolean
+
+	@:from extern inline public static function fromBool(b:Bool):Boolean
 		return BooleanClass.valueOf(b);
 }
 
-@:native("java.lang.Boolean") extern class BooleanClass extends Number implements Comparable<Boolean>
-{
-	@:overload public function new(bool:Bool):Void;
-	@:overload public function new(string:String):Void;
-	@:overload public function booleanValue() : Bool;
-	@:overload public function compareTo(param1 : Boolean) : Int;
-	@:overload public function compareTo(param1 : Dynamic) : Int;
-	@:overload public function equals(param1 : Dynamic) : Bool;
-	@:overload public function hashCode() : Int;
-	@:overload public function toString() : String;
-	@:final public static var FALSE : Boolean;
-	@:final public static var TRUE : Boolean;
-	@:final public static var TYPE : Class<Boolean>;
-	@:overload public static function compare(param1 : Bool, param2 : Bool) : Int;
-	@:overload public static function getBoolean(param1 : String) : Bool;
-	@:overload public static function parseBoolean(param1 : String) : Bool;
-	@:native("toString") @:overload public static function _toString(param1 : Bool) : String;
-	@:overload public static function valueOf(param1 : Bool) : Boolean;
-	@:overload public static function valueOf(param1 : String) : Boolean;
+@:native("java.lang.Boolean") extern class BooleanClass extends Number implements Comparable<Boolean> {
+	@:overload function new(bool:Bool):Void;
+	@:overload function new(string:String):Void;
+	@:overload function booleanValue():Bool;
+	@:overload function compareTo(param1:Boolean):Int;
+	@:overload function compareTo(param1:Dynamic):Int;
+	@:overload function equals(param1:Dynamic):Bool;
+	@:overload function hashCode():Int;
+	@:overload function toString():String;
+	static final FALSE:Boolean;
+	static final TRUE:Boolean;
+	static final TYPE:Class<Boolean>;
+	@:overload static function compare(param1:Bool, param2:Bool):Int;
+	@:overload static function getBoolean(param1:String):Bool;
+	@:overload static function parseBoolean(param1:String):Bool;
+	@:native("toString") @:overload static function _toString(param1:Bool):String;
+	@:overload static function valueOf(param1:Bool):Boolean;
+	@:overload static function valueOf(param1:String):Boolean;
 }
diff --git a/std/java/lang/Byte.hx b/std/java/lang/Byte.hx
index 54a943a2b263abe583553af1f9728e27a4f816da..84cf4651f8ec01ac7b376553bb052f30d27c6380 100644
--- a/std/java/lang/Byte.hx
+++ b/std/java/lang/Byte.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,40 +19,40 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.lang;
+
+package java.lang;
 
 @:native("") // make sure the generator won't see this
 @:forwardStatics
-@:forward abstract Byte(ByteClass) from ByteClass to ByteClass
-{
-	@:to @:extern inline public function toByte():java.types.Int8
+@:forward abstract Byte(ByteClass) from ByteClass to ByteClass {
+	@:to extern inline public function toByte():java.types.Int8
 		return this.byteValue();
-	@:from @:extern inline public static function fromByte(b:java.types.Int8):Byte
+
+	@:from extern inline public static function fromByte(b:java.types.Int8):Byte
 		return ByteClass.valueOf(b);
 }
 
-@:native("java.lang.Byte") extern class ByteClass extends Number implements Comparable<Byte>
-{
-	@:overload function new(param1 : java.types.Int8) : Void;
-	@:overload @:throws("java.lang.NumberFormatException") function new(param1 : String) : Void;
-	@:overload function compareTo(param1 : Byte) : Int;
-	@:overload function compareTo(param1 : Dynamic) : Int;
-	@:overload function equals(param1 : Dynamic) : Bool;
-	@:overload function hashCode() : Int;
-	@:overload function toString() : String;
-	@:final static var MAX_VALUE(default,null) : java.types.Int8;
-	@:final static var MIN_VALUE(default,null) : java.types.Int8;
-	@:final static var SIZE(default,null) : Int;
-	@:final static var TYPE : Class<Byte>;
-	@:overload static function compare(param1 : java.types.Int8, param2 : java.types.Int8) : Int;
-	@:overload @:throws("java.lang.NumberFormatException") static function decode(param1 : String) : Byte;
-	@:overload @:throws("java.lang.NumberFormatException") static function parseByte(param1 : String, param2 : Int) : java.types.Int8;
-	@:overload @:throws("java.lang.NumberFormatException") static function parseByte(param1 : String) : java.types.Int8;
-	@:native("toString") @:overload static function _toString(param1 : java.types.Int8) : String;
-	@:overload static function valueOf(param1 : java.types.Int8) : Byte;
-	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1 : String) : Byte;
-	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1 : String, param2 : Int) : Byte;
+@:native("java.lang.Byte") extern class ByteClass extends Number implements Comparable<Byte> {
+	@:overload function new(param1:java.types.Int8):Void;
+	@:overload @:throws("java.lang.NumberFormatException") function new(param1:String):Void;
+	@:overload function compareTo(param1:Byte):Int;
+	@:overload function compareTo(param1:Dynamic):Int;
+	@:overload function equals(param1:Dynamic):Bool;
+	@:overload function hashCode():Int;
+	@:overload function toString():String;
+	static final MAX_VALUE:java.types.Int8;
+	static final MIN_VALUE:java.types.Int8;
+	static final SIZE:Int;
+	static final TYPE:Class<Byte>;
+	@:overload static function compare(param1:java.types.Int8, param2:java.types.Int8):Int;
+	@:overload @:throws("java.lang.NumberFormatException") static function decode(param1:String):Byte;
+	@:overload @:throws("java.lang.NumberFormatException") static function parseByte(param1:String, param2:Int):java.types.Int8;
+	@:overload @:throws("java.lang.NumberFormatException") static function parseByte(param1:String):java.types.Int8;
+	@:native("toString") @:overload static function _toString(param1:java.types.Int8):String;
+	@:overload static function valueOf(param1:java.types.Int8):Byte;
+	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1:String):Byte;
+	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1:String, param2:Int):Byte;
 }
 
-@:realPath("java.lang.Byte_ByteCache") @:javaNative @:native("java.lang.Byte$ByteCache") @:javaCanonical("java.lang","Byte.ByteCache") extern class Byte_ByteCache {
-}
+@:realPath("java.lang.Byte_ByteCache") @:javaNative @:native("java.lang.Byte$ByteCache") @:javaCanonical("java.lang",
+	"Byte.ByteCache") extern class Byte_ByteCache {}
diff --git a/std/java/lang/Character.hx b/std/java/lang/Character.hx
index 0856a4dc20b55dfb0a784ce9ad30973eb37033ff..678ea2a5a7547ee359de89b36b9c8567d2bde164 100644
--- a/std/java/lang/Character.hx
+++ b/std/java/lang/Character.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,400 +19,403 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.lang;
+
+package java.lang;
 
 @:native("") // make sure the generator won't see this
 @:forwardStatics
-@:forward abstract Character(CharacterClass) from CharacterClass to CharacterClass
-{
-	@:to @:extern inline public function toCharacter():java.types.Char16
+@:forward abstract Character(CharacterClass) from CharacterClass to CharacterClass {
+	@:to extern inline public function toCharacter():java.types.Char16
 		return this.charValue();
-	@:from @:extern inline public static function fromCharacter(b:java.types.Char16):Character
+
+	@:from extern inline public static function fromCharacter(b:java.types.Char16):Character
 		return CharacterClass.valueOf(b);
 }
 
-@:native("java.lang.Character") extern class CharacterClass implements Comparable<Character>
-{
-	@:overload function new(param1 : java.types.Char16) : Void;
-	@:overload function charValue() : java.types.Char16;
-	@:overload function compareTo(param1 : Character) : Int;
-	@:overload function compareTo(param1 : Dynamic) : Int;
-	@:overload function equals(param1 : Dynamic) : Bool;
-	@:overload function hashCode() : Int;
-	@:overload function toString() : String;
-	@:final static var COMBINING_SPACING_MARK(default,null) : java.types.Char16;
-	@:final static var CONNECTOR_PUNCTUATION(default,null) : java.types.Char16;
-	@:final static var CONTROL(default,null) : java.types.Char16;
-	@:final static var CURRENCY_SYMBOL(default,null) : java.types.Char16;
-	@:final static var DASH_PUNCTUATION(default,null) : java.types.Char16;
-	@:final static var DECIMAL_DIGIT_NUMBER(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_ARABIC_NUMBER(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_BOUNDARY_NEUTRAL(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_COMMON_NUMBER_SEPARATOR(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_EUROPEAN_NUMBER(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_LEFT_TO_RIGHT(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_NONSPACING_MARK(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_OTHER_NEUTRALS(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_PARAGRAPH_SEPARATOR(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_POP_DIRECTIONAL_FORMAT(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_RIGHT_TO_LEFT(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_SEGMENT_SEPARATOR(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_UNDEFINED(default,null) : java.types.Char16;
-	@:final static var DIRECTIONALITY_WHITESPACE(default,null) : java.types.Char16;
-	@:final static var ENCLOSING_MARK(default,null) : java.types.Char16;
-	@:final static var END_PUNCTUATION(default,null) : java.types.Char16;
-	@:final static var FINAL_QUOTE_PUNCTUATION(default,null) : java.types.Char16;
-	@:final static var FORMAT(default,null) : java.types.Char16;
-	@:final static var INITIAL_QUOTE_PUNCTUATION(default,null) : java.types.Char16;
-	@:final static var LETTER_NUMBER(default,null) : java.types.Char16;
-	@:final static var LINE_SEPARATOR(default,null) : java.types.Char16;
-	@:final static var LOWERCASE_LETTER(default,null) : java.types.Char16;
-	@:final static var MATH_SYMBOL(default,null) : java.types.Char16;
-	@:final static var MAX_CODE_POINT(default,null) : Int;
-	@:final static var MAX_HIGH_SURROGATE(default,null) : java.types.Char16;
-	@:final static var MAX_LOW_SURROGATE(default,null) : java.types.Char16;
-	@:final static var MAX_RADIX(default,null) : Int;
-	@:final static var MAX_SURROGATE(default,null) : java.types.Char16;
-	@:final static var MAX_VALUE(default,null) : java.types.Char16;
-	@:final static var MIN_CODE_POINT(default,null) : Int;
-	@:final static var MIN_HIGH_SURROGATE(default,null) : java.types.Char16;
-	@:final static var MIN_LOW_SURROGATE(default,null) : java.types.Char16;
-	@:final static var MIN_RADIX(default,null) : Int;
-	@:final static var MIN_SUPPLEMENTARY_CODE_POINT(default,null) : Int;
-	@:final static var MIN_SURROGATE(default,null) : java.types.Char16;
-	@:final static var MIN_VALUE(default,null) : java.types.Char16;
-	@:final static var MODIFIER_LETTER(default,null) : java.types.Char16;
-	@:final static var MODIFIER_SYMBOL(default,null) : java.types.Char16;
-	@:final static var NON_SPACING_MARK(default,null) : java.types.Char16;
-	@:final static var OTHER_LETTER(default,null) : java.types.Char16;
-	@:final static var OTHER_NUMBER(default,null) : java.types.Char16;
-	@:final static var OTHER_PUNCTUATION(default,null) : java.types.Char16;
-	@:final static var OTHER_SYMBOL(default,null) : java.types.Char16;
-	@:final static var PARAGRAPH_SEPARATOR(default,null) : java.types.Char16;
-	@:final static var PRIVATE_USE(default,null) : java.types.Char16;
-	@:final static var SIZE(default,null) : Int;
-	@:final static var SPACE_SEPARATOR(default,null) : java.types.Char16;
-	@:final static var START_PUNCTUATION(default,null) : java.types.Char16;
-	@:final static var SURROGATE(default,null) : java.types.Char16;
-	@:final static var TITLECASE_LETTER(default,null) : java.types.Char16;
-	@:final static var TYPE : Class<Character>;
-	@:final static var UNASSIGNED(default,null) : java.types.Char16;
-	@:final static var UPPERCASE_LETTER(default,null) : java.types.Char16;
-	@:overload static function charCount(param1 : Int) : Int;
-	@:overload static function codePointAt(param1 : CharSequence, param2 : Int) : Int;
-	@:overload static function codePointAt(param1 : java.NativeArray<java.types.Char16>, param2 : Int, param3 : Int) : Int;
-	@:overload static function codePointAt(param1 : java.NativeArray<java.types.Char16>, param2 : Int) : Int;
-	@:overload static function codePointBefore(param1 : CharSequence, param2 : Int) : Int;
-	@:overload static function codePointBefore(param1 : java.NativeArray<java.types.Char16>, param2 : Int, param3 : Int) : Int;
-	@:overload static function codePointBefore(param1 : java.NativeArray<java.types.Char16>, param2 : Int) : Int;
-	@:overload static function codePointCount(param1 : CharSequence, param2 : Int, param3 : Int) : Int;
-	@:overload static function codePointCount(param1 : java.NativeArray<java.types.Char16>, param2 : Int, param3 : Int) : Int;
-	@:overload static function compare(param1 : java.types.Char16, param2 : java.types.Char16) : Int;
-	@:overload static function digit(param1 : java.types.Char16, param2 : Int) : Int;
-	@:overload static function digit(param1 : Int, param2 : Int) : Int;
-	@:overload static function forDigit(param1 : Int, param2 : Int) : java.types.Char16;
-	@:overload static function getDirectionality(param1 : java.types.Char16) : java.types.Char16;
-	@:overload static function getDirectionality(param1 : Int) : java.types.Char16;
-	@:overload static function getName(param1 : Int) : String;
-	@:overload static function getNumericValue(param1 : java.types.Char16) : Int;
-	@:overload static function getNumericValue(param1 : Int) : Int;
-	@:overload static function getType(param1 : java.types.Char16) : Int;
-	@:overload static function getType(param1 : Int) : Int;
-	@:overload static function highSurrogate(param1 : Int) : java.types.Char16;
-	@:overload static function isAlphabetic(param1 : Int) : Bool;
-	@:overload static function isBmpCodePoint(param1 : Int) : Bool;
-	@:overload static function isDefined(param1 : java.types.Char16) : Bool;
-	@:overload static function isDefined(param1 : Int) : Bool;
-	@:overload static function isDigit(param1 : java.types.Char16) : Bool;
-	@:overload static function isDigit(param1 : Int) : Bool;
-	@:overload static function isHighSurrogate(param1 : java.types.Char16) : Bool;
-	@:overload static function isISOControl(param1 : java.types.Char16) : Bool;
-	@:overload static function isISOControl(param1 : Int) : Bool;
-	@:overload static function isIdentifierIgnorable(param1 : java.types.Char16) : Bool;
-	@:overload static function isIdentifierIgnorable(param1 : Int) : Bool;
-	@:overload static function isIdeographic(param1 : Int) : Bool;
-	@:overload static function isJavaIdentifierPart(param1 : java.types.Char16) : Bool;
-	@:overload static function isJavaIdentifierPart(param1 : Int) : Bool;
-	@:overload static function isJavaIdentifierStart(param1 : java.types.Char16) : Bool;
-	@:overload static function isJavaIdentifierStart(param1 : Int) : Bool;
-	@:overload @:deprecated static function isJavaLetter(param1 : java.types.Char16) : Bool;
-	@:overload @:deprecated static function isJavaLetterOrDigit(param1 : java.types.Char16) : Bool;
-	@:overload static function isLetter(param1 : java.types.Char16) : Bool;
-	@:overload static function isLetter(param1 : Int) : Bool;
-	@:overload static function isLetterOrDigit(param1 : java.types.Char16) : Bool;
-	@:overload static function isLetterOrDigit(param1 : Int) : Bool;
-	@:overload static function isLowSurrogate(param1 : java.types.Char16) : Bool;
-	@:overload static function isLowerCase(param1 : java.types.Char16) : Bool;
-	@:overload static function isLowerCase(param1 : Int) : Bool;
-	@:overload static function isMirrored(param1 : java.types.Char16) : Bool;
-	@:overload static function isMirrored(param1 : Int) : Bool;
-	@:overload @:deprecated static function isSpace(param1 : java.types.Char16) : Bool;
-	@:overload static function isSpaceChar(param1 : java.types.Char16) : Bool;
-	@:overload static function isSpaceChar(param1 : Int) : Bool;
-	@:overload static function isSupplementaryCodePoint(param1 : Int) : Bool;
-	@:overload static function isSurrogate(param1 : java.types.Char16) : Bool;
-	@:overload static function isSurrogatePair(param1 : java.types.Char16, param2 : java.types.Char16) : Bool;
-	@:overload static function isTitleCase(param1 : java.types.Char16) : Bool;
-	@:overload static function isTitleCase(param1 : Int) : Bool;
-	@:overload static function isUnicodeIdentifierPart(param1 : java.types.Char16) : Bool;
-	@:overload static function isUnicodeIdentifierPart(param1 : Int) : Bool;
-	@:overload static function isUnicodeIdentifierStart(param1 : java.types.Char16) : Bool;
-	@:overload static function isUnicodeIdentifierStart(param1 : Int) : Bool;
-	@:overload static function isUpperCase(param1 : java.types.Char16) : Bool;
-	@:overload static function isUpperCase(param1 : Int) : Bool;
-	@:overload static function isValidCodePoint(param1 : Int) : Bool;
-	@:overload static function isWhitespace(param1 : java.types.Char16) : Bool;
-	@:overload static function isWhitespace(param1 : Int) : Bool;
-	@:overload static function lowSurrogate(param1 : Int) : java.types.Char16;
-	@:overload static function offsetByCodePoints(param1 : CharSequence, param2 : Int, param3 : Int) : Int;
-	@:overload static function offsetByCodePoints(param1 : java.NativeArray<java.types.Char16>, param2 : Int, param3 : Int, param4 : Int, param5 : Int) : Int;
-	@:overload static function reverseBytes(param1 : java.types.Char16) : java.types.Char16;
-	@:overload static function toChars(param1 : Int, param2 : java.NativeArray<java.types.Char16>, param3 : Int) : Int;
-	@:overload static function toChars(param1 : Int) : java.NativeArray<java.types.Char16>;
-	@:overload static function toCodePoint(param1 : java.types.Char16, param2 : java.types.Char16) : Int;
-	@:overload static function toLowerCase(param1 : java.types.Char16) : java.types.Char16;
-	@:overload static function toLowerCase(param1 : Int) : Int;
-	@:native("toString") @:overload static function _toString(param1 : java.types.Char16) : String;
-	@:overload static function toTitleCase(param1 : java.types.Char16) : java.types.Char16;
-	@:overload static function toTitleCase(param1 : Int) : Int;
-	@:overload static function toUpperCase(param1 : java.types.Char16) : java.types.Char16;
-	@:overload static function toUpperCase(param1 : Int) : Int;
-	@:overload static function valueOf(param1 : java.types.Char16) : Character;
+@:native("java.lang.Character") extern class CharacterClass implements Comparable<Character> {
+	@:overload function new(param1:java.types.Char16):Void;
+	@:overload function charValue():java.types.Char16;
+	@:overload function compareTo(param1:Character):Int;
+	@:overload function compareTo(param1:Dynamic):Int;
+	@:overload function equals(param1:Dynamic):Bool;
+	@:overload function hashCode():Int;
+	@:overload function toString():String;
+	static final COMBINING_SPACING_MARK:java.types.Char16;
+	static final CONNECTOR_PUNCTUATION:java.types.Char16;
+	static final CONTROL:java.types.Char16;
+	static final CURRENCY_SYMBOL:java.types.Char16;
+	static final DASH_PUNCTUATION:java.types.Char16;
+	static final DECIMAL_DIGIT_NUMBER:java.types.Char16;
+	static final DIRECTIONALITY_ARABIC_NUMBER:java.types.Char16;
+	static final DIRECTIONALITY_BOUNDARY_NEUTRAL:java.types.Char16;
+	static final DIRECTIONALITY_COMMON_NUMBER_SEPARATOR:java.types.Char16;
+	static final DIRECTIONALITY_EUROPEAN_NUMBER:java.types.Char16;
+	static final DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR:java.types.Char16;
+	static final DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR:java.types.Char16;
+	static final DIRECTIONALITY_LEFT_TO_RIGHT:java.types.Char16;
+	static final DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING:java.types.Char16;
+	static final DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE:java.types.Char16;
+	static final DIRECTIONALITY_NONSPACING_MARK:java.types.Char16;
+	static final DIRECTIONALITY_OTHER_NEUTRALS:java.types.Char16;
+	static final DIRECTIONALITY_PARAGRAPH_SEPARATOR:java.types.Char16;
+	static final DIRECTIONALITY_POP_DIRECTIONAL_FORMAT:java.types.Char16;
+	static final DIRECTIONALITY_RIGHT_TO_LEFT:java.types.Char16;
+	static final DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC:java.types.Char16;
+	static final DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING:java.types.Char16;
+	static final DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE:java.types.Char16;
+	static final DIRECTIONALITY_SEGMENT_SEPARATOR:java.types.Char16;
+	static final DIRECTIONALITY_UNDEFINED:java.types.Char16;
+	static final DIRECTIONALITY_WHITESPACE:java.types.Char16;
+	static final ENCLOSING_MARK:java.types.Char16;
+	static final END_PUNCTUATION:java.types.Char16;
+	static final FINAL_QUOTE_PUNCTUATION:java.types.Char16;
+	static final FORMAT:java.types.Char16;
+	static final INITIAL_QUOTE_PUNCTUATION:java.types.Char16;
+	static final LETTER_NUMBER:java.types.Char16;
+	static final LINE_SEPARATOR:java.types.Char16;
+	static final LOWERCASE_LETTER:java.types.Char16;
+	static final MATH_SYMBOL:java.types.Char16;
+	static final MAX_CODE_POINT:Int;
+	static final MAX_HIGH_SURROGATE:java.types.Char16;
+	static final MAX_LOW_SURROGATE:java.types.Char16;
+	static final MAX_RADIX:Int;
+	static final MAX_SURROGATE:java.types.Char16;
+	static final MAX_VALUE:java.types.Char16;
+	static final MIN_CODE_POINT:Int;
+	static final MIN_HIGH_SURROGATE:java.types.Char16;
+	static final MIN_LOW_SURROGATE:java.types.Char16;
+	static final MIN_RADIX:Int;
+	static final MIN_SUPPLEMENTARY_CODE_POINT:Int;
+	static final MIN_SURROGATE:java.types.Char16;
+	static final MIN_VALUE:java.types.Char16;
+	static final MODIFIER_LETTER:java.types.Char16;
+	static final MODIFIER_SYMBOL:java.types.Char16;
+	static final NON_SPACING_MARK:java.types.Char16;
+	static final OTHER_LETTER:java.types.Char16;
+	static final OTHER_NUMBER:java.types.Char16;
+	static final OTHER_PUNCTUATION:java.types.Char16;
+	static final OTHER_SYMBOL:java.types.Char16;
+	static final PARAGRAPH_SEPARATOR:java.types.Char16;
+	static final PRIVATE_USE:java.types.Char16;
+	static final SIZE:Int;
+	static final SPACE_SEPARATOR:java.types.Char16;
+	static final START_PUNCTUATION:java.types.Char16;
+	static final SURROGATE:java.types.Char16;
+	static final TITLECASE_LETTER:java.types.Char16;
+	static final TYPE:Class<Character>;
+	static final UNASSIGNED:java.types.Char16;
+	static final UPPERCASE_LETTER:java.types.Char16;
+	@:overload static function charCount(param1:Int):Int;
+	@:overload static function codePointAt(param1:CharSequence, param2:Int):Int;
+	@:overload static function codePointAt(param1:java.NativeArray<java.types.Char16>, param2:Int, param3:Int):Int;
+	@:overload static function codePointAt(param1:java.NativeArray<java.types.Char16>, param2:Int):Int;
+	@:overload static function codePointBefore(param1:CharSequence, param2:Int):Int;
+	@:overload static function codePointBefore(param1:java.NativeArray<java.types.Char16>, param2:Int, param3:Int):Int;
+	@:overload static function codePointBefore(param1:java.NativeArray<java.types.Char16>, param2:Int):Int;
+	@:overload static function codePointCount(param1:CharSequence, param2:Int, param3:Int):Int;
+	@:overload static function codePointCount(param1:java.NativeArray<java.types.Char16>, param2:Int, param3:Int):Int;
+	@:overload static function compare(param1:java.types.Char16, param2:java.types.Char16):Int;
+	@:overload static function digit(param1:java.types.Char16, param2:Int):Int;
+	@:overload static function digit(param1:Int, param2:Int):Int;
+	@:overload static function forDigit(param1:Int, param2:Int):java.types.Char16;
+	@:overload static function getDirectionality(param1:java.types.Char16):java.types.Char16;
+	@:overload static function getDirectionality(param1:Int):java.types.Char16;
+	@:overload static function getName(param1:Int):String;
+	@:overload static function getNumericValue(param1:java.types.Char16):Int;
+	@:overload static function getNumericValue(param1:Int):Int;
+	@:overload static function getType(param1:java.types.Char16):Int;
+	@:overload static function getType(param1:Int):Int;
+	@:overload static function highSurrogate(param1:Int):java.types.Char16;
+	@:overload static function isAlphabetic(param1:Int):Bool;
+	@:overload static function isBmpCodePoint(param1:Int):Bool;
+	@:overload static function isDefined(param1:java.types.Char16):Bool;
+	@:overload static function isDefined(param1:Int):Bool;
+	@:overload static function isDigit(param1:java.types.Char16):Bool;
+	@:overload static function isDigit(param1:Int):Bool;
+	@:overload static function isHighSurrogate(param1:java.types.Char16):Bool;
+	@:overload static function isISOControl(param1:java.types.Char16):Bool;
+	@:overload static function isISOControl(param1:Int):Bool;
+	@:overload static function isIdentifierIgnorable(param1:java.types.Char16):Bool;
+	@:overload static function isIdentifierIgnorable(param1:Int):Bool;
+	@:overload static function isIdeographic(param1:Int):Bool;
+	@:overload static function isJavaIdentifierPart(param1:java.types.Char16):Bool;
+	@:overload static function isJavaIdentifierPart(param1:Int):Bool;
+	@:overload static function isJavaIdentifierStart(param1:java.types.Char16):Bool;
+	@:overload static function isJavaIdentifierStart(param1:Int):Bool;
+	@:overload @:deprecated static function isJavaLetter(param1:java.types.Char16):Bool;
+	@:overload @:deprecated static function isJavaLetterOrDigit(param1:java.types.Char16):Bool;
+	@:overload static function isLetter(param1:java.types.Char16):Bool;
+	@:overload static function isLetter(param1:Int):Bool;
+	@:overload static function isLetterOrDigit(param1:java.types.Char16):Bool;
+	@:overload static function isLetterOrDigit(param1:Int):Bool;
+	@:overload static function isLowSurrogate(param1:java.types.Char16):Bool;
+	@:overload static function isLowerCase(param1:java.types.Char16):Bool;
+	@:overload static function isLowerCase(param1:Int):Bool;
+	@:overload static function isMirrored(param1:java.types.Char16):Bool;
+	@:overload static function isMirrored(param1:Int):Bool;
+	@:overload @:deprecated static function isSpace(param1:java.types.Char16):Bool;
+	@:overload static function isSpaceChar(param1:java.types.Char16):Bool;
+	@:overload static function isSpaceChar(param1:Int):Bool;
+	@:overload static function isSupplementaryCodePoint(param1:Int):Bool;
+	@:overload static function isSurrogate(param1:java.types.Char16):Bool;
+	@:overload static function isSurrogatePair(param1:java.types.Char16, param2:java.types.Char16):Bool;
+	@:overload static function isTitleCase(param1:java.types.Char16):Bool;
+	@:overload static function isTitleCase(param1:Int):Bool;
+	@:overload static function isUnicodeIdentifierPart(param1:java.types.Char16):Bool;
+	@:overload static function isUnicodeIdentifierPart(param1:Int):Bool;
+	@:overload static function isUnicodeIdentifierStart(param1:java.types.Char16):Bool;
+	@:overload static function isUnicodeIdentifierStart(param1:Int):Bool;
+	@:overload static function isUpperCase(param1:java.types.Char16):Bool;
+	@:overload static function isUpperCase(param1:Int):Bool;
+	@:overload static function isValidCodePoint(param1:Int):Bool;
+	@:overload static function isWhitespace(param1:java.types.Char16):Bool;
+	@:overload static function isWhitespace(param1:Int):Bool;
+	@:overload static function lowSurrogate(param1:Int):java.types.Char16;
+	@:overload static function offsetByCodePoints(param1:CharSequence, param2:Int, param3:Int):Int;
+	@:overload static function offsetByCodePoints(param1:java.NativeArray<java.types.Char16>, param2:Int, param3:Int, param4:Int, param5:Int):Int;
+	@:overload static function reverseBytes(param1:java.types.Char16):java.types.Char16;
+	@:overload static function toChars(param1:Int, param2:java.NativeArray<java.types.Char16>, param3:Int):Int;
+	@:overload static function toChars(param1:Int):java.NativeArray<java.types.Char16>;
+	@:overload static function toCodePoint(param1:java.types.Char16, param2:java.types.Char16):Int;
+	@:overload static function toLowerCase(param1:java.types.Char16):java.types.Char16;
+	@:overload static function toLowerCase(param1:Int):Int;
+	@:native("toString") @:overload static function _toString(param1:java.types.Char16):String;
+	@:overload static function toTitleCase(param1:java.types.Char16):java.types.Char16;
+	@:overload static function toTitleCase(param1:Int):Int;
+	@:overload static function toUpperCase(param1:java.types.Char16):java.types.Char16;
+	@:overload static function toUpperCase(param1:Int):Int;
+	@:overload static function valueOf(param1:java.types.Char16):Character;
 }
 
-@:realPath("java.lang.Character_CharacterCache") @:javaNative @:native("java.lang.Character$CharacterCache") @:javaCanonical("java.lang","Character.CharacterCache") extern class Character_CharacterCache {
-}
+@:realPath("java.lang.Character_CharacterCache") @:javaNative @:native("java.lang.Character$CharacterCache") @:javaCanonical("java.lang",
+	"Character.CharacterCache") extern class Character_CharacterCache {}
 
-@:realPath("java.lang.Character_Subset") @:javaNative @:native("java.lang.Character$Subset") @:javaCanonical("java.lang","Character.Subset") extern class Character_Subset {
-	@:overload @:final function equals(param1 : Dynamic) : Bool;
-	@:overload @:final function hashCode() : Int;
-	@:overload @:final function toString() : String;
+@:realPath("java.lang.Character_Subset") @:javaNative @:native("java.lang.Character$Subset") @:javaCanonical("java.lang",
+	"Character.Subset") extern class Character_Subset {
+	@:overload final function equals(param1:Dynamic):Bool;
+	@:overload final function hashCode():Int;
+	@:overload final function toString():String;
 }
 
-@:realPath("java.lang.Character_UnicodeBlock") @:final @:javaNative @:native("java.lang.Character$UnicodeBlock") @:javaCanonical("java.lang","Character.UnicodeBlock") extern class Character_UnicodeBlock extends Character_Subset {
-	@:final static var AEGEAN_NUMBERS : Character_UnicodeBlock;
-	@:final static var ALCHEMICAL_SYMBOLS : Character_UnicodeBlock;
-	@:final static var ALPHABETIC_PRESENTATION_FORMS : Character_UnicodeBlock;
-	@:final static var ANCIENT_GREEK_MUSICAL_NOTATION : Character_UnicodeBlock;
-	@:final static var ANCIENT_GREEK_NUMBERS : Character_UnicodeBlock;
-	@:final static var ANCIENT_SYMBOLS : Character_UnicodeBlock;
-	@:final static var ARABIC : Character_UnicodeBlock;
-	@:final static var ARABIC_PRESENTATION_FORMS_A : Character_UnicodeBlock;
-	@:final static var ARABIC_PRESENTATION_FORMS_B : Character_UnicodeBlock;
-	@:final static var ARABIC_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var ARMENIAN : Character_UnicodeBlock;
-	@:final static var ARROWS : Character_UnicodeBlock;
-	@:final static var AVESTAN : Character_UnicodeBlock;
-	@:final static var BALINESE : Character_UnicodeBlock;
-	@:final static var BAMUM : Character_UnicodeBlock;
-	@:final static var BAMUM_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var BASIC_LATIN : Character_UnicodeBlock;
-	@:final static var BATAK : Character_UnicodeBlock;
-	@:final static var BENGALI : Character_UnicodeBlock;
-	@:final static var BLOCK_ELEMENTS : Character_UnicodeBlock;
-	@:final static var BOPOMOFO : Character_UnicodeBlock;
-	@:final static var BOPOMOFO_EXTENDED : Character_UnicodeBlock;
-	@:final static var BOX_DRAWING : Character_UnicodeBlock;
-	@:final static var BRAHMI : Character_UnicodeBlock;
-	@:final static var BRAILLE_PATTERNS : Character_UnicodeBlock;
-	@:final static var BUGINESE : Character_UnicodeBlock;
-	@:final static var BUHID : Character_UnicodeBlock;
-	@:final static var BYZANTINE_MUSICAL_SYMBOLS : Character_UnicodeBlock;
-	@:final static var CARIAN : Character_UnicodeBlock;
-	@:final static var CHAM : Character_UnicodeBlock;
-	@:final static var CHEROKEE : Character_UnicodeBlock;
-	@:final static var CJK_COMPATIBILITY : Character_UnicodeBlock;
-	@:final static var CJK_COMPATIBILITY_FORMS : Character_UnicodeBlock;
-	@:final static var CJK_COMPATIBILITY_IDEOGRAPHS : Character_UnicodeBlock;
-	@:final static var CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var CJK_RADICALS_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var CJK_STROKES : Character_UnicodeBlock;
-	@:final static var CJK_SYMBOLS_AND_PUNCTUATION : Character_UnicodeBlock;
-	@:final static var CJK_UNIFIED_IDEOGRAPHS : Character_UnicodeBlock;
-	@:final static var CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A : Character_UnicodeBlock;
-	@:final static var CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B : Character_UnicodeBlock;
-	@:final static var CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C : Character_UnicodeBlock;
-	@:final static var CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D : Character_UnicodeBlock;
-	@:final static var COMBINING_DIACRITICAL_MARKS : Character_UnicodeBlock;
-	@:final static var COMBINING_DIACRITICAL_MARKS_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var COMBINING_HALF_MARKS : Character_UnicodeBlock;
-	@:final static var COMBINING_MARKS_FOR_SYMBOLS : Character_UnicodeBlock;
-	@:final static var COMMON_INDIC_NUMBER_FORMS : Character_UnicodeBlock;
-	@:final static var CONTROL_PICTURES : Character_UnicodeBlock;
-	@:final static var COPTIC : Character_UnicodeBlock;
-	@:final static var COUNTING_ROD_NUMERALS : Character_UnicodeBlock;
-	@:final static var CUNEIFORM : Character_UnicodeBlock;
-	@:final static var CUNEIFORM_NUMBERS_AND_PUNCTUATION : Character_UnicodeBlock;
-	@:final static var CURRENCY_SYMBOLS : Character_UnicodeBlock;
-	@:final static var CYPRIOT_SYLLABARY : Character_UnicodeBlock;
-	@:final static var CYRILLIC : Character_UnicodeBlock;
-	@:final static var CYRILLIC_EXTENDED_A : Character_UnicodeBlock;
-	@:final static var CYRILLIC_EXTENDED_B : Character_UnicodeBlock;
-	@:final static var CYRILLIC_SUPPLEMENTARY : Character_UnicodeBlock;
-	@:final static var DESERET : Character_UnicodeBlock;
-	@:final static var DEVANAGARI : Character_UnicodeBlock;
-	@:final static var DEVANAGARI_EXTENDED : Character_UnicodeBlock;
-	@:final static var DINGBATS : Character_UnicodeBlock;
-	@:final static var DOMINO_TILES : Character_UnicodeBlock;
-	@:final static var EGYPTIAN_HIEROGLYPHS : Character_UnicodeBlock;
-	@:final static var EMOTICONS : Character_UnicodeBlock;
-	@:final static var ENCLOSED_ALPHANUMERICS : Character_UnicodeBlock;
-	@:final static var ENCLOSED_ALPHANUMERIC_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var ENCLOSED_CJK_LETTERS_AND_MONTHS : Character_UnicodeBlock;
-	@:final static var ENCLOSED_IDEOGRAPHIC_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var ETHIOPIC : Character_UnicodeBlock;
-	@:final static var ETHIOPIC_EXTENDED : Character_UnicodeBlock;
-	@:final static var ETHIOPIC_EXTENDED_A : Character_UnicodeBlock;
-	@:final static var ETHIOPIC_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var GENERAL_PUNCTUATION : Character_UnicodeBlock;
-	@:final static var GEOMETRIC_SHAPES : Character_UnicodeBlock;
-	@:final static var GEORGIAN : Character_UnicodeBlock;
-	@:final static var GEORGIAN_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var GLAGOLITIC : Character_UnicodeBlock;
-	@:final static var GOTHIC : Character_UnicodeBlock;
-	@:final static var GREEK : Character_UnicodeBlock;
-	@:final static var GREEK_EXTENDED : Character_UnicodeBlock;
-	@:final static var GUJARATI : Character_UnicodeBlock;
-	@:final static var GURMUKHI : Character_UnicodeBlock;
-	@:final static var HALFWIDTH_AND_FULLWIDTH_FORMS : Character_UnicodeBlock;
-	@:final static var HANGUL_COMPATIBILITY_JAMO : Character_UnicodeBlock;
-	@:final static var HANGUL_JAMO : Character_UnicodeBlock;
-	@:final static var HANGUL_JAMO_EXTENDED_A : Character_UnicodeBlock;
-	@:final static var HANGUL_JAMO_EXTENDED_B : Character_UnicodeBlock;
-	@:final static var HANGUL_SYLLABLES : Character_UnicodeBlock;
-	@:final static var HANUNOO : Character_UnicodeBlock;
-	@:final static var HEBREW : Character_UnicodeBlock;
-	@:final static var HIGH_PRIVATE_USE_SURROGATES : Character_UnicodeBlock;
-	@:final static var HIGH_SURROGATES : Character_UnicodeBlock;
-	@:final static var HIRAGANA : Character_UnicodeBlock;
-	@:final static var IDEOGRAPHIC_DESCRIPTION_CHARACTERS : Character_UnicodeBlock;
-	@:final static var IMPERIAL_ARAMAIC : Character_UnicodeBlock;
-	@:final static var INSCRIPTIONAL_PAHLAVI : Character_UnicodeBlock;
-	@:final static var INSCRIPTIONAL_PARTHIAN : Character_UnicodeBlock;
-	@:final static var IPA_EXTENSIONS : Character_UnicodeBlock;
-	@:final static var JAVANESE : Character_UnicodeBlock;
-	@:final static var KAITHI : Character_UnicodeBlock;
-	@:final static var KANA_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var KANBUN : Character_UnicodeBlock;
-	@:final static var KANGXI_RADICALS : Character_UnicodeBlock;
-	@:final static var KANNADA : Character_UnicodeBlock;
-	@:final static var KATAKANA : Character_UnicodeBlock;
-	@:final static var KATAKANA_PHONETIC_EXTENSIONS : Character_UnicodeBlock;
-	@:final static var KAYAH_LI : Character_UnicodeBlock;
-	@:final static var KHAROSHTHI : Character_UnicodeBlock;
-	@:final static var KHMER : Character_UnicodeBlock;
-	@:final static var KHMER_SYMBOLS : Character_UnicodeBlock;
-	@:final static var LAO : Character_UnicodeBlock;
-	@:final static var LATIN_1_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var LATIN_EXTENDED_A : Character_UnicodeBlock;
-	@:final static var LATIN_EXTENDED_ADDITIONAL : Character_UnicodeBlock;
-	@:final static var LATIN_EXTENDED_B : Character_UnicodeBlock;
-	@:final static var LATIN_EXTENDED_C : Character_UnicodeBlock;
-	@:final static var LATIN_EXTENDED_D : Character_UnicodeBlock;
-	@:final static var LEPCHA : Character_UnicodeBlock;
-	@:final static var LETTERLIKE_SYMBOLS : Character_UnicodeBlock;
-	@:final static var LIMBU : Character_UnicodeBlock;
-	@:final static var LINEAR_B_IDEOGRAMS : Character_UnicodeBlock;
-	@:final static var LINEAR_B_SYLLABARY : Character_UnicodeBlock;
-	@:final static var LISU : Character_UnicodeBlock;
-	@:final static var LOW_SURROGATES : Character_UnicodeBlock;
-	@:final static var LYCIAN : Character_UnicodeBlock;
-	@:final static var LYDIAN : Character_UnicodeBlock;
-	@:final static var MAHJONG_TILES : Character_UnicodeBlock;
-	@:final static var MALAYALAM : Character_UnicodeBlock;
-	@:final static var MANDAIC : Character_UnicodeBlock;
-	@:final static var MATHEMATICAL_ALPHANUMERIC_SYMBOLS : Character_UnicodeBlock;
-	@:final static var MATHEMATICAL_OPERATORS : Character_UnicodeBlock;
-	@:final static var MEETEI_MAYEK : Character_UnicodeBlock;
-	@:final static var MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A : Character_UnicodeBlock;
-	@:final static var MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B : Character_UnicodeBlock;
-	@:final static var MISCELLANEOUS_SYMBOLS : Character_UnicodeBlock;
-	@:final static var MISCELLANEOUS_SYMBOLS_AND_ARROWS : Character_UnicodeBlock;
-	@:final static var MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS : Character_UnicodeBlock;
-	@:final static var MISCELLANEOUS_TECHNICAL : Character_UnicodeBlock;
-	@:final static var MODIFIER_TONE_LETTERS : Character_UnicodeBlock;
-	@:final static var MONGOLIAN : Character_UnicodeBlock;
-	@:final static var MUSICAL_SYMBOLS : Character_UnicodeBlock;
-	@:final static var MYANMAR : Character_UnicodeBlock;
-	@:final static var MYANMAR_EXTENDED_A : Character_UnicodeBlock;
-	@:final static var NEW_TAI_LUE : Character_UnicodeBlock;
-	@:final static var NKO : Character_UnicodeBlock;
-	@:final static var NUMBER_FORMS : Character_UnicodeBlock;
-	@:final static var OGHAM : Character_UnicodeBlock;
-	@:final static var OLD_ITALIC : Character_UnicodeBlock;
-	@:final static var OLD_PERSIAN : Character_UnicodeBlock;
-	@:final static var OLD_SOUTH_ARABIAN : Character_UnicodeBlock;
-	@:final static var OLD_TURKIC : Character_UnicodeBlock;
-	@:final static var OL_CHIKI : Character_UnicodeBlock;
-	@:final static var OPTICAL_CHARACTER_RECOGNITION : Character_UnicodeBlock;
-	@:final static var ORIYA : Character_UnicodeBlock;
-	@:final static var OSMANYA : Character_UnicodeBlock;
-	@:final static var PHAGS_PA : Character_UnicodeBlock;
-	@:final static var PHAISTOS_DISC : Character_UnicodeBlock;
-	@:final static var PHOENICIAN : Character_UnicodeBlock;
-	@:final static var PHONETIC_EXTENSIONS : Character_UnicodeBlock;
-	@:final static var PHONETIC_EXTENSIONS_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var PLAYING_CARDS : Character_UnicodeBlock;
-	@:final static var PRIVATE_USE_AREA : Character_UnicodeBlock;
-	@:final static var REJANG : Character_UnicodeBlock;
-	@:final static var RUMI_NUMERAL_SYMBOLS : Character_UnicodeBlock;
-	@:final static var RUNIC : Character_UnicodeBlock;
-	@:final static var SAMARITAN : Character_UnicodeBlock;
-	@:final static var SAURASHTRA : Character_UnicodeBlock;
-	@:final static var SHAVIAN : Character_UnicodeBlock;
-	@:final static var SINHALA : Character_UnicodeBlock;
-	@:final static var SMALL_FORM_VARIANTS : Character_UnicodeBlock;
-	@:final static var SPACING_MODIFIER_LETTERS : Character_UnicodeBlock;
-	@:final static var SPECIALS : Character_UnicodeBlock;
-	@:final static var SUNDANESE : Character_UnicodeBlock;
-	@:final static var SUPERSCRIPTS_AND_SUBSCRIPTS : Character_UnicodeBlock;
-	@:final static var SUPPLEMENTAL_ARROWS_A : Character_UnicodeBlock;
-	@:final static var SUPPLEMENTAL_ARROWS_B : Character_UnicodeBlock;
-	@:final static var SUPPLEMENTAL_MATHEMATICAL_OPERATORS : Character_UnicodeBlock;
-	@:final static var SUPPLEMENTAL_PUNCTUATION : Character_UnicodeBlock;
-	@:final static var SUPPLEMENTARY_PRIVATE_USE_AREA_A : Character_UnicodeBlock;
-	@:final static var SUPPLEMENTARY_PRIVATE_USE_AREA_B : Character_UnicodeBlock;
-	@:deprecated @:final static var SURROGATES_AREA : Character_UnicodeBlock;
-	@:final static var SYLOTI_NAGRI : Character_UnicodeBlock;
-	@:final static var SYRIAC : Character_UnicodeBlock;
-	@:final static var TAGALOG : Character_UnicodeBlock;
-	@:final static var TAGBANWA : Character_UnicodeBlock;
-	@:final static var TAGS : Character_UnicodeBlock;
-	@:final static var TAI_LE : Character_UnicodeBlock;
-	@:final static var TAI_THAM : Character_UnicodeBlock;
-	@:final static var TAI_VIET : Character_UnicodeBlock;
-	@:final static var TAI_XUAN_JING_SYMBOLS : Character_UnicodeBlock;
-	@:final static var TAMIL : Character_UnicodeBlock;
-	@:final static var TELUGU : Character_UnicodeBlock;
-	@:final static var THAANA : Character_UnicodeBlock;
-	@:final static var THAI : Character_UnicodeBlock;
-	@:final static var TIBETAN : Character_UnicodeBlock;
-	@:final static var TIFINAGH : Character_UnicodeBlock;
-	@:final static var TRANSPORT_AND_MAP_SYMBOLS : Character_UnicodeBlock;
-	@:final static var UGARITIC : Character_UnicodeBlock;
-	@:final static var UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS : Character_UnicodeBlock;
-	@:final static var UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED : Character_UnicodeBlock;
-	@:final static var VAI : Character_UnicodeBlock;
-	@:final static var VARIATION_SELECTORS : Character_UnicodeBlock;
-	@:final static var VARIATION_SELECTORS_SUPPLEMENT : Character_UnicodeBlock;
-	@:final static var VEDIC_EXTENSIONS : Character_UnicodeBlock;
-	@:final static var VERTICAL_FORMS : Character_UnicodeBlock;
-	@:final static var YIJING_HEXAGRAM_SYMBOLS : Character_UnicodeBlock;
-	@:final static var YI_RADICALS : Character_UnicodeBlock;
-	@:final static var YI_SYLLABLES : Character_UnicodeBlock;
-	@:overload @:final static function forName(param1 : String) : Character_UnicodeBlock;
-	@:overload static function of(param1 : java.types.Char16) : Character_UnicodeBlock;
-	@:overload static function of(param1 : Int) : Character_UnicodeBlock;
+@:realPath("java.lang.Character_UnicodeBlock") @:javaNative @:native("java.lang.Character$UnicodeBlock") @:javaCanonical("java.lang",
+	"Character.UnicodeBlock") extern final class Character_UnicodeBlock extends Character_Subset {
+	static final AEGEAN_NUMBERS:Character_UnicodeBlock;
+	static final ALCHEMICAL_SYMBOLS:Character_UnicodeBlock;
+	static final ALPHABETIC_PRESENTATION_FORMS:Character_UnicodeBlock;
+	static final ANCIENT_GREEK_MUSICAL_NOTATION:Character_UnicodeBlock;
+	static final ANCIENT_GREEK_NUMBERS:Character_UnicodeBlock;
+	static final ANCIENT_SYMBOLS:Character_UnicodeBlock;
+	static final ARABIC:Character_UnicodeBlock;
+	static final ARABIC_PRESENTATION_FORMS_A:Character_UnicodeBlock;
+	static final ARABIC_PRESENTATION_FORMS_B:Character_UnicodeBlock;
+	static final ARABIC_SUPPLEMENT:Character_UnicodeBlock;
+	static final ARMENIAN:Character_UnicodeBlock;
+	static final ARROWS:Character_UnicodeBlock;
+	static final AVESTAN:Character_UnicodeBlock;
+	static final BALINESE:Character_UnicodeBlock;
+	static final BAMUM:Character_UnicodeBlock;
+	static final BAMUM_SUPPLEMENT:Character_UnicodeBlock;
+	static final BASIC_LATIN:Character_UnicodeBlock;
+	static final BATAK:Character_UnicodeBlock;
+	static final BENGALI:Character_UnicodeBlock;
+	static final BLOCK_ELEMENTS:Character_UnicodeBlock;
+	static final BOPOMOFO:Character_UnicodeBlock;
+	static final BOPOMOFO_EXTENDED:Character_UnicodeBlock;
+	static final BOX_DRAWING:Character_UnicodeBlock;
+	static final BRAHMI:Character_UnicodeBlock;
+	static final BRAILLE_PATTERNS:Character_UnicodeBlock;
+	static final BUGINESE:Character_UnicodeBlock;
+	static final BUHID:Character_UnicodeBlock;
+	static final BYZANTINE_MUSICAL_SYMBOLS:Character_UnicodeBlock;
+	static final CARIAN:Character_UnicodeBlock;
+	static final CHAM:Character_UnicodeBlock;
+	static final CHEROKEE:Character_UnicodeBlock;
+	static final CJK_COMPATIBILITY:Character_UnicodeBlock;
+	static final CJK_COMPATIBILITY_FORMS:Character_UnicodeBlock;
+	static final CJK_COMPATIBILITY_IDEOGRAPHS:Character_UnicodeBlock;
+	static final CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT:Character_UnicodeBlock;
+	static final CJK_RADICALS_SUPPLEMENT:Character_UnicodeBlock;
+	static final CJK_STROKES:Character_UnicodeBlock;
+	static final CJK_SYMBOLS_AND_PUNCTUATION:Character_UnicodeBlock;
+	static final CJK_UNIFIED_IDEOGRAPHS:Character_UnicodeBlock;
+	static final CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A:Character_UnicodeBlock;
+	static final CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B:Character_UnicodeBlock;
+	static final CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C:Character_UnicodeBlock;
+	static final CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D:Character_UnicodeBlock;
+	static final COMBINING_DIACRITICAL_MARKS:Character_UnicodeBlock;
+	static final COMBINING_DIACRITICAL_MARKS_SUPPLEMENT:Character_UnicodeBlock;
+	static final COMBINING_HALF_MARKS:Character_UnicodeBlock;
+	static final COMBINING_MARKS_FOR_SYMBOLS:Character_UnicodeBlock;
+	static final COMMON_INDIC_NUMBER_FORMS:Character_UnicodeBlock;
+	static final CONTROL_PICTURES:Character_UnicodeBlock;
+	static final COPTIC:Character_UnicodeBlock;
+	static final COUNTING_ROD_NUMERALS:Character_UnicodeBlock;
+	static final CUNEIFORM:Character_UnicodeBlock;
+	static final CUNEIFORM_NUMBERS_AND_PUNCTUATION:Character_UnicodeBlock;
+	static final CURRENCY_SYMBOLS:Character_UnicodeBlock;
+	static final CYPRIOT_SYLLABARY:Character_UnicodeBlock;
+	static final CYRILLIC:Character_UnicodeBlock;
+	static final CYRILLIC_EXTENDED_A:Character_UnicodeBlock;
+	static final CYRILLIC_EXTENDED_B:Character_UnicodeBlock;
+	static final CYRILLIC_SUPPLEMENTARY:Character_UnicodeBlock;
+	static final DESERET:Character_UnicodeBlock;
+	static final DEVANAGARI:Character_UnicodeBlock;
+	static final DEVANAGARI_EXTENDED:Character_UnicodeBlock;
+	static final DINGBATS:Character_UnicodeBlock;
+	static final DOMINO_TILES:Character_UnicodeBlock;
+	static final EGYPTIAN_HIEROGLYPHS:Character_UnicodeBlock;
+	static final EMOTICONS:Character_UnicodeBlock;
+	static final ENCLOSED_ALPHANUMERICS:Character_UnicodeBlock;
+	static final ENCLOSED_ALPHANUMERIC_SUPPLEMENT:Character_UnicodeBlock;
+	static final ENCLOSED_CJK_LETTERS_AND_MONTHS:Character_UnicodeBlock;
+	static final ENCLOSED_IDEOGRAPHIC_SUPPLEMENT:Character_UnicodeBlock;
+	static final ETHIOPIC:Character_UnicodeBlock;
+	static final ETHIOPIC_EXTENDED:Character_UnicodeBlock;
+	static final ETHIOPIC_EXTENDED_A:Character_UnicodeBlock;
+	static final ETHIOPIC_SUPPLEMENT:Character_UnicodeBlock;
+	static final GENERAL_PUNCTUATION:Character_UnicodeBlock;
+	static final GEOMETRIC_SHAPES:Character_UnicodeBlock;
+	static final GEORGIAN:Character_UnicodeBlock;
+	static final GEORGIAN_SUPPLEMENT:Character_UnicodeBlock;
+	static final GLAGOLITIC:Character_UnicodeBlock;
+	static final GOTHIC:Character_UnicodeBlock;
+	static final GREEK:Character_UnicodeBlock;
+	static final GREEK_EXTENDED:Character_UnicodeBlock;
+	static final GUJARATI:Character_UnicodeBlock;
+	static final GURMUKHI:Character_UnicodeBlock;
+	static final HALFWIDTH_AND_FULLWIDTH_FORMS:Character_UnicodeBlock;
+	static final HANGUL_COMPATIBILITY_JAMO:Character_UnicodeBlock;
+	static final HANGUL_JAMO:Character_UnicodeBlock;
+	static final HANGUL_JAMO_EXTENDED_A:Character_UnicodeBlock;
+	static final HANGUL_JAMO_EXTENDED_B:Character_UnicodeBlock;
+	static final HANGUL_SYLLABLES:Character_UnicodeBlock;
+	static final HANUNOO:Character_UnicodeBlock;
+	static final HEBREW:Character_UnicodeBlock;
+	static final HIGH_PRIVATE_USE_SURROGATES:Character_UnicodeBlock;
+	static final HIGH_SURROGATES:Character_UnicodeBlock;
+	static final HIRAGANA:Character_UnicodeBlock;
+	static final IDEOGRAPHIC_DESCRIPTION_CHARACTERS:Character_UnicodeBlock;
+	static final IMPERIAL_ARAMAIC:Character_UnicodeBlock;
+	static final INSCRIPTIONAL_PAHLAVI:Character_UnicodeBlock;
+	static final INSCRIPTIONAL_PARTHIAN:Character_UnicodeBlock;
+	static final IPA_EXTENSIONS:Character_UnicodeBlock;
+	static final JAVANESE:Character_UnicodeBlock;
+	static final KAITHI:Character_UnicodeBlock;
+	static final KANA_SUPPLEMENT:Character_UnicodeBlock;
+	static final KANBUN:Character_UnicodeBlock;
+	static final KANGXI_RADICALS:Character_UnicodeBlock;
+	static final KANNADA:Character_UnicodeBlock;
+	static final KATAKANA:Character_UnicodeBlock;
+	static final KATAKANA_PHONETIC_EXTENSIONS:Character_UnicodeBlock;
+	static final KAYAH_LI:Character_UnicodeBlock;
+	static final KHAROSHTHI:Character_UnicodeBlock;
+	static final KHMER:Character_UnicodeBlock;
+	static final KHMER_SYMBOLS:Character_UnicodeBlock;
+	static final LAO:Character_UnicodeBlock;
+	static final LATIN_1_SUPPLEMENT:Character_UnicodeBlock;
+	static final LATIN_EXTENDED_A:Character_UnicodeBlock;
+	static final LATIN_EXTENDED_ADDITIONAL:Character_UnicodeBlock;
+	static final LATIN_EXTENDED_B:Character_UnicodeBlock;
+	static final LATIN_EXTENDED_C:Character_UnicodeBlock;
+	static final LATIN_EXTENDED_D:Character_UnicodeBlock;
+	static final LEPCHA:Character_UnicodeBlock;
+	static final LETTERLIKE_SYMBOLS:Character_UnicodeBlock;
+	static final LIMBU:Character_UnicodeBlock;
+	static final LINEAR_B_IDEOGRAMS:Character_UnicodeBlock;
+	static final LINEAR_B_SYLLABARY:Character_UnicodeBlock;
+	static final LISU:Character_UnicodeBlock;
+	static final LOW_SURROGATES:Character_UnicodeBlock;
+	static final LYCIAN:Character_UnicodeBlock;
+	static final LYDIAN:Character_UnicodeBlock;
+	static final MAHJONG_TILES:Character_UnicodeBlock;
+	static final MALAYALAM:Character_UnicodeBlock;
+	static final MANDAIC:Character_UnicodeBlock;
+	static final MATHEMATICAL_ALPHANUMERIC_SYMBOLS:Character_UnicodeBlock;
+	static final MATHEMATICAL_OPERATORS:Character_UnicodeBlock;
+	static final MEETEI_MAYEK:Character_UnicodeBlock;
+	static final MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A:Character_UnicodeBlock;
+	static final MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B:Character_UnicodeBlock;
+	static final MISCELLANEOUS_SYMBOLS:Character_UnicodeBlock;
+	static final MISCELLANEOUS_SYMBOLS_AND_ARROWS:Character_UnicodeBlock;
+	static final MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS:Character_UnicodeBlock;
+	static final MISCELLANEOUS_TECHNICAL:Character_UnicodeBlock;
+	static final MODIFIER_TONE_LETTERS:Character_UnicodeBlock;
+	static final MONGOLIAN:Character_UnicodeBlock;
+	static final MUSICAL_SYMBOLS:Character_UnicodeBlock;
+	static final MYANMAR:Character_UnicodeBlock;
+	static final MYANMAR_EXTENDED_A:Character_UnicodeBlock;
+	static final NEW_TAI_LUE:Character_UnicodeBlock;
+	static final NKO:Character_UnicodeBlock;
+	static final NUMBER_FORMS:Character_UnicodeBlock;
+	static final OGHAM:Character_UnicodeBlock;
+	static final OLD_ITALIC:Character_UnicodeBlock;
+	static final OLD_PERSIAN:Character_UnicodeBlock;
+	static final OLD_SOUTH_ARABIAN:Character_UnicodeBlock;
+	static final OLD_TURKIC:Character_UnicodeBlock;
+	static final OL_CHIKI:Character_UnicodeBlock;
+	static final OPTICAL_CHARACTER_RECOGNITION:Character_UnicodeBlock;
+	static final ORIYA:Character_UnicodeBlock;
+	static final OSMANYA:Character_UnicodeBlock;
+	static final PHAGS_PA:Character_UnicodeBlock;
+	static final PHAISTOS_DISC:Character_UnicodeBlock;
+	static final PHOENICIAN:Character_UnicodeBlock;
+	static final PHONETIC_EXTENSIONS:Character_UnicodeBlock;
+	static final PHONETIC_EXTENSIONS_SUPPLEMENT:Character_UnicodeBlock;
+	static final PLAYING_CARDS:Character_UnicodeBlock;
+	static final PRIVATE_USE_AREA:Character_UnicodeBlock;
+	static final REJANG:Character_UnicodeBlock;
+	static final RUMI_NUMERAL_SYMBOLS:Character_UnicodeBlock;
+	static final RUNIC:Character_UnicodeBlock;
+	static final SAMARITAN:Character_UnicodeBlock;
+	static final SAURASHTRA:Character_UnicodeBlock;
+	static final SHAVIAN:Character_UnicodeBlock;
+	static final SINHALA:Character_UnicodeBlock;
+	static final SMALL_FORM_VARIANTS:Character_UnicodeBlock;
+	static final SPACING_MODIFIER_LETTERS:Character_UnicodeBlock;
+	static final SPECIALS:Character_UnicodeBlock;
+	static final SUNDANESE:Character_UnicodeBlock;
+	static final SUPERSCRIPTS_AND_SUBSCRIPTS:Character_UnicodeBlock;
+	static final SUPPLEMENTAL_ARROWS_A:Character_UnicodeBlock;
+	static final SUPPLEMENTAL_ARROWS_B:Character_UnicodeBlock;
+	static final SUPPLEMENTAL_MATHEMATICAL_OPERATORS:Character_UnicodeBlock;
+	static final SUPPLEMENTAL_PUNCTUATION:Character_UnicodeBlock;
+	static final SUPPLEMENTARY_PRIVATE_USE_AREA_A:Character_UnicodeBlock;
+	static final SUPPLEMENTARY_PRIVATE_USE_AREA_B:Character_UnicodeBlock;
+	@:deprecated static var SURROGATES_AREA:Character_UnicodeBlock;
+	static final SYLOTI_NAGRI:Character_UnicodeBlock;
+	static final SYRIAC:Character_UnicodeBlock;
+	static final TAGALOG:Character_UnicodeBlock;
+	static final TAGBANWA:Character_UnicodeBlock;
+	static final TAGS:Character_UnicodeBlock;
+	static final TAI_LE:Character_UnicodeBlock;
+	static final TAI_THAM:Character_UnicodeBlock;
+	static final TAI_VIET:Character_UnicodeBlock;
+	static final TAI_XUAN_JING_SYMBOLS:Character_UnicodeBlock;
+	static final TAMIL:Character_UnicodeBlock;
+	static final TELUGU:Character_UnicodeBlock;
+	static final THAANA:Character_UnicodeBlock;
+	static final THAI:Character_UnicodeBlock;
+	static final TIBETAN:Character_UnicodeBlock;
+	static final TIFINAGH:Character_UnicodeBlock;
+	static final TRANSPORT_AND_MAP_SYMBOLS:Character_UnicodeBlock;
+	static final UGARITIC:Character_UnicodeBlock;
+	static final UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS:Character_UnicodeBlock;
+	static final UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED:Character_UnicodeBlock;
+	static final VAI:Character_UnicodeBlock;
+	static final VARIATION_SELECTORS:Character_UnicodeBlock;
+	static final VARIATION_SELECTORS_SUPPLEMENT:Character_UnicodeBlock;
+	static final VEDIC_EXTENSIONS:Character_UnicodeBlock;
+	static final VERTICAL_FORMS:Character_UnicodeBlock;
+	static final YIJING_HEXAGRAM_SYMBOLS:Character_UnicodeBlock;
+	static final YI_RADICALS:Character_UnicodeBlock;
+	static final YI_SYLLABLES:Character_UnicodeBlock;
+	@:overload final static function forName(param1:String):Character_UnicodeBlock;
+	@:overload static function of(param1:java.types.Char16):Character_UnicodeBlock;
+	@:overload static function of(param1:Int):Character_UnicodeBlock;
 }
 
-@:realPath("java.lang.Character_UnicodeScript") @:javaCanonical("java.lang","Character.UnicodeScript") @:native("java.lang.Character$UnicodeScript") extern enum Character_UnicodeScript {
+@:realPath("java.lang.Character_UnicodeScript") @:javaCanonical("java.lang",
+	"Character.UnicodeScript") @:native("java.lang.Character$UnicodeScript") extern enum Character_UnicodeScript {
 	COMMON;
 	LATIN;
 	GREEK;
diff --git a/std/java/lang/Double.hx b/std/java/lang/Double.hx
index 06f7c69045a598d7a56b39ac5e1d4c22ca05a43b..61d83ab6fec443682469844579e1c2ffa7de1591 100644
--- a/std/java/lang/Double.hx
+++ b/std/java/lang/Double.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,48 +19,48 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.lang;
+
+package java.lang;
 
 @:native("") // make sure the generator won't see this
 @:forwardStatics
-@:forward abstract Double(DoubleClass) from DoubleClass to DoubleClass
-{
-	@:to @:extern inline public function toFloat():Float
+@:forward abstract Double(DoubleClass) from DoubleClass to DoubleClass {
+	@:to extern inline public function toFloat():Float
 		return this.doubleValue();
-	@:from @:extern inline public static function fromFloat(b:Float):Double
+
+	@:from extern inline public static function fromFloat(b:Float):Double
 		return DoubleClass.valueOf(b);
 }
 
-@:native("java.lang.Double") extern class DoubleClass extends Number implements Comparable<Double>
-{
-	@:overload function new(param1 : Float) : Void;
-	@:overload @:throws("java.lang.NumberFormatException") function new(param1 : String) : Void;
-	@:overload function compareTo(param1 : Double) : Int;
-	@:overload function compareTo(param1 : Dynamic) : Int;
-	@:overload function equals(param1 : Dynamic) : Bool;
-	@:overload function hashCode() : Int;
-	@:overload function isInfinite() : Bool;
-	@:overload function isNaN() : Bool;
-	@:overload function toString() : String;
-	@:final static var MAX_EXPONENT(default,null) : Int;
-	@:final static var MAX_VALUE(default,null) : Float;
-	@:final static var MIN_EXPONENT(default,null) : Int;
-	@:final static var MIN_NORMAL(default,null) : Float;
-	@:final static var MIN_VALUE(default,null) : Float;
-	@:final static var NEGATIVE_INFINITY(default,null) : Float;
-	@:final static var NaN(default,null) : Float;
-	@:final static var POSITIVE_INFINITY(default,null) : Float;
-	@:final static var SIZE(default,null) : Int;
-	@:final static var TYPE : Class<Double>;
-	@:overload static function compare(param1 : Float, param2 : Float) : Int;
-	@:overload static function doubleToLongBits(param1 : Float) : haxe.Int64;
-	@:overload static function doubleToRawLongBits(param1 : Float) : haxe.Int64;
-	@:native("isInfinite") @:overload static function _isInfinite(param1 : Float) : Bool;
-	@:native("isNaN") @:overload static function _isNaN(param1 : Float) : Bool;
-	@:overload static function longBitsToDouble(param1 : haxe.Int64) : Float;
-	@:overload @:throws("java.lang.NumberFormatException") static function parseDouble(param1 : String) : Float;
-	@:overload static function toHexString(param1 : Float) : String;
-	@:native("toString") @:overload static function _toString(param1 : Float) : String;
-	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1 : String) : Double;
-	@:overload static function valueOf(param1 : Float) : Double;
+@:native("java.lang.Double") extern class DoubleClass extends Number implements Comparable<Double> {
+	@:overload function new(param1:Float):Void;
+	@:overload @:throws("java.lang.NumberFormatException") function new(param1:String):Void;
+	@:overload function compareTo(param1:Double):Int;
+	@:overload function compareTo(param1:Dynamic):Int;
+	@:overload function equals(param1:Dynamic):Bool;
+	@:overload function hashCode():Int;
+	@:overload function isInfinite():Bool;
+	@:overload function isNaN():Bool;
+	@:overload function toString():String;
+	static final MAX_EXPONENT:Int;
+	static final MAX_VALUE:Float;
+	static final MIN_EXPONENT:Int;
+	static final MIN_NORMAL:Float;
+	static final MIN_VALUE:Float;
+	static final NEGATIVE_INFINITY:Float;
+	static final NaN:Float;
+	static final POSITIVE_INFINITY:Float;
+	static final SIZE:Int;
+	static final TYPE:Class<Double>;
+	@:overload static function compare(param1:Float, param2:Float):Int;
+	@:overload static function doubleToLongBits(param1:Float):haxe.Int64;
+	@:overload static function doubleToRawLongBits(param1:Float):haxe.Int64;
+	@:native("isInfinite") @:overload static function _isInfinite(param1:Float):Bool;
+	@:native("isNaN") @:overload static function _isNaN(param1:Float):Bool;
+	@:overload static function longBitsToDouble(param1:haxe.Int64):Float;
+	@:overload @:throws("java.lang.NumberFormatException") static function parseDouble(param1:String):Float;
+	@:overload static function toHexString(param1:Float):String;
+	@:native("toString") @:overload static function _toString(param1:Float):String;
+	@:overload static function valueOf(param1:Float):Double;
+	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1:String):Double;
 }
diff --git a/std/java/lang/Float.hx b/std/java/lang/Float.hx
index c3adcc5fe530867ca55dfc4e48b3a0741c7a5c31..8a7f4c206f46c6248508c74f4d3ad2261840c9c6 100644
--- a/std/java/lang/Float.hx
+++ b/std/java/lang/Float.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,51 +19,49 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.lang;
+
+package java.lang;
 
 @:native("") // make sure the generator won't see this
 @:forwardStatics
-@:forward abstract Float(FloatClass) from FloatClass to FloatClass
-{
-	@:to @:extern inline public function toFloat():std.StdTypes.Float
+@:forward abstract Float(FloatClass) from FloatClass to FloatClass {
+	@:to extern inline public function toFloat():std.StdTypes.Float
 		return this.floatValue();
-	@:from @:extern inline public static function fromFloat(b:std.StdTypes.Single):Float
+
+	@:from extern inline public static function fromFloat(b:std.StdTypes.Single):Float
 		return FloatClass.valueOf(b);
 }
 
-@:native("java.lang.Float") extern class FloatClass extends Number implements Comparable<Float>
-{
-	@:overload function new(param1 : Single) : Void;
-	@:overload @:throws("java.lang.NumberFormatException") function new(param1 : String) : Void;
-	@:overload function new(param1 : std.StdTypes.Float) : Void;
-	@:overload function compareTo(param1 : Float) : Int;
-	@:overload function compareTo(param1 : Dynamic) : Int;
-	@:overload function equals(param1 : Dynamic) : Bool;
-	@:overload function hashCode() : Int;
-	@:overload function isInfinite() : Bool;
-	@:overload function isNaN() : Bool;
-	@:overload function toString() : String;
-	@:final static var MAX_EXPONENT(default,null) : Int;
-	@:final static var MAX_VALUE(default,null) : Single;
-	@:final static var MIN_EXPONENT(default,null) : Int;
-	@:final static var MIN_NORMAL(default,null) : Single;
-	@:final static var MIN_VALUE(default,null) : Single;
-	@:final static var NEGATIVE_INFINITY(default,null) : Single;
-	@:final static var NaN(default,null) : Single;
-	@:final static var POSITIVE_INFINITY(default,null) : Single;
-	@:final static var SIZE(default,null) : Int;
-	@:final static var TYPE : Class<std.StdTypes.Float>;
-	@:overload static function compare(param1 : Single, param2 : Single) : Int;
-	@:overload static function floatToIntBits(param1 : Single) : Int;
-	@:overload static function floatToRawIntBits(param1 : Single) : Int;
-	@:overload static function intBitsToFloat(param1 : Int) : Single;
-	@:native("isInfinite") @:overload static function _isInfinite(param1 : Single) : Bool;
-	@:native("isNaN") @:overload static function _isNaN(param1 : Single) : Bool;
-	@:overload @:throws("java.lang.NumberFormatException") static function parseFloat(param1 : String) : Single;
-	@:overload static function toHexString(param1 : Single) : String;
-	@:native("toString") @:overload static function _toString(param1 : Single) : String;
-	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1 : String) : Float;
-	@:overload static function valueOf(param1 : Single) : Float;
-
+@:native("java.lang.Float") extern class FloatClass extends Number implements Comparable<Float> {
+	@:overload function new(param1:Single):Void;
+	@:overload @:throws("java.lang.NumberFormatException") function new(param1:String):Void;
+	@:overload function new(param1:std.StdTypes.Float):Void;
+	@:overload function compareTo(param1:Float):Int;
+	@:overload function compareTo(param1:Dynamic):Int;
+	@:overload function equals(param1:Dynamic):Bool;
+	@:overload function hashCode():Int;
+	@:overload function isInfinite():Bool;
+	@:overload function isNaN():Bool;
+	@:overload function toString():String;
+	static final MAX_EXPONENT:Int;
+	static final MAX_VALUE:Single;
+	static final MIN_EXPONENT:Int;
+	static final MIN_NORMAL:Single;
+	static final MIN_VALUE:Single;
+	static final NEGATIVE_INFINITY:Single;
+	static final NaN:Single;
+	static final POSITIVE_INFINITY:Single;
+	static final SIZE:Int;
+	static final TYPE:Class<std.StdTypes.Float>;
+	@:overload static function compare(param1:Single, param2:Single):Int;
+	@:overload static function floatToIntBits(param1:Single):Int;
+	@:overload static function floatToRawIntBits(param1:Single):Int;
+	@:overload static function intBitsToFloat(param1:Int):Single;
+	@:native("isInfinite") @:overload static function _isInfinite(param1:Single):Bool;
+	@:native("isNaN") @:overload static function _isNaN(param1:Single):Bool;
+	@:overload @:throws("java.lang.NumberFormatException") static function parseFloat(param1:String):Single;
+	@:overload static function toHexString(param1:Single):String;
+	@:native("toString") @:overload static function _toString(param1:Single):String;
+	@:overload static function valueOf(param1:Single):Float;
+	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1:String):Float;
 }
-
diff --git a/std/java/lang/Integer.hx b/std/java/lang/Integer.hx
index 51a28372230be0bd6e8fb9b71cc98be02a2982cf..402c0584f7b8b12b8c93eccf23e4bcb75b1f7286 100644
--- a/std/java/lang/Integer.hx
+++ b/std/java/lang/Integer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,57 +19,57 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.lang;
+
+package java.lang;
 
 @:native("") // make sure the generator won't see this
 @:forwardStatics
-@:forward abstract Integer(IntegerClass) from IntegerClass to IntegerClass
-{
-	@:to @:extern inline public function toInt():Int
+@:forward abstract Integer(IntegerClass) from IntegerClass to IntegerClass {
+	@:to extern inline public function toInt():Int
 		return this.intValue();
-	@:from @:extern inline public static function fromInt(b:Int):Integer
+
+	@:from extern inline public static function fromInt(b:Int):Integer
 		return IntegerClass.valueOf(b);
 }
 
-@:native("java.lang.Integer") extern class IntegerClass extends Number implements Comparable<Integer>
-{
-	@:overload function new(param1 : Int) : Void;
-	@:overload @:throws("java.lang.NumberFormatException") function new(param1 : String) : Void;
-	@:overload function compareTo(param1 : Integer) : Int;
-	@:overload function compareTo(param1 : Dynamic) : Int;
-	@:overload function equals(param1 : Dynamic) : Bool;
-	@:overload function hashCode() : Int;
-	@:overload function toString() : String;
-	@:final static var MAX_VALUE(default,null) : Int;
-	@:final static var MIN_VALUE(default,null) : Int;
-	@:final static var SIZE(default,null) : Int;
-	@:final static var TYPE : Class<Integer>;
-	@:overload static function bitCount(param1 : Int) : Int;
-	@:overload static function compare(param1 : Int, param2 : Int) : Int;
-	@:overload @:throws("java.lang.NumberFormatException") static function decode(param1 : String) : Integer;
-	@:overload static function getInteger(param1 : String) : Integer;
-	@:overload static function getInteger(param1 : String, param2 : Integer) : Integer;
-	@:overload static function getInteger(param1 : String, param2 : Int) : Integer;
-	@:overload static function highestOneBit(param1 : Int) : Int;
-	@:overload static function lowestOneBit(param1 : Int) : Int;
-	@:overload static function numberOfLeadingZeros(param1 : Int) : Int;
-	@:overload static function numberOfTrailingZeros(param1 : Int) : Int;
-	@:overload @:throws("java.lang.NumberFormatException") static function parseInt(param1 : String, param2 : Int) : Int;
-	@:overload @:throws("java.lang.NumberFormatException") static function parseInt(param1 : String) : Int;
-	@:overload static function reverse(param1 : Int) : Int;
-	@:overload static function reverseBytes(param1 : Int) : Int;
-	@:overload static function rotateLeft(param1 : Int, param2 : Int) : Int;
-	@:overload static function rotateRight(param1 : Int, param2 : Int) : Int;
-	@:overload static function signum(param1 : Int) : Int;
-	@:overload static function toBinaryString(param1 : Int) : String;
-	@:overload static function toHexString(param1 : Int) : String;
-	@:overload static function toOctalString(param1 : Int) : String;
-	@:native("toString") @:overload static function _toString(param1 : Int, param2 : Int) : String;
-	@:native("toString") @:overload static function _toString(param1 : Int) : String;
-	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1 : String, param2 : Int) : Integer;
-	@:overload static function valueOf(param1 : Int) : Integer;
-	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1 : String) : Integer;
+@:native("java.lang.Integer") extern class IntegerClass extends Number implements Comparable<Integer> {
+	@:overload function new(param1:Int):Void;
+	@:overload @:throws("java.lang.NumberFormatException") function new(param1:String):Void;
+	@:overload function compareTo(param1:Integer):Int;
+	@:overload function compareTo(param1:Dynamic):Int;
+	@:overload function equals(param1:Dynamic):Bool;
+	@:overload function hashCode():Int;
+	@:overload function toString():String;
+	static final MAX_VALUE:Int;
+	static final MIN_VALUE:Int;
+	static final SIZE:Int;
+	static final TYPE:Class<Integer>;
+	@:overload static function bitCount(param1:Int):Int;
+	@:overload static function compare(param1:Int, param2:Int):Int;
+	@:overload @:throws("java.lang.NumberFormatException") static function decode(param1:String):Integer;
+	@:overload static function getInteger(param1:String):Integer;
+	@:overload static function getInteger(param1:String, param2:Integer):Integer;
+	@:overload static function getInteger(param1:String, param2:Int):Integer;
+	@:overload static function highestOneBit(param1:Int):Int;
+	@:overload static function lowestOneBit(param1:Int):Int;
+	@:overload static function numberOfLeadingZeros(param1:Int):Int;
+	@:overload static function numberOfTrailingZeros(param1:Int):Int;
+	@:overload @:throws("java.lang.NumberFormatException") static function parseInt(param1:String, param2:Int):Int;
+	@:overload @:throws("java.lang.NumberFormatException") static function parseInt(param1:String):Int;
+	@:overload static function reverse(param1:Int):Int;
+	@:overload static function reverseBytes(param1:Int):Int;
+	@:overload static function rotateLeft(param1:Int, param2:Int):Int;
+	@:overload static function rotateRight(param1:Int, param2:Int):Int;
+	@:overload static function signum(param1:Int):Int;
+	@:overload static function toBinaryString(param1:Int):String;
+	@:overload static function toHexString(param1:Int):String;
+	@:overload static function toOctalString(param1:Int):String;
+	@:native("toString") @:overload static function _toString(param1:Int, param2:Int):String;
+	@:native("toString") @:overload static function _toString(param1:Int):String;
+	@:overload static function valueOf(param1:Int):Integer;
+	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1:String, param2:Int):Integer;
+	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1:String):Integer;
 }
 
-@:realPath("java.lang.Integer_IntegerCache") @:javaNative @:native("java.lang.Integer$IntegerCache") @:javaCanonical("java.lang","Integer.IntegerCache") extern class Integer_IntegerCache {
-}
+@:realPath("java.lang.Integer_IntegerCache") @:javaNative @:native("java.lang.Integer$IntegerCache") @:javaCanonical("java.lang",
+	"Integer.IntegerCache") extern class Integer_IntegerCache {}
diff --git a/std/java/lang/Long.hx b/std/java/lang/Long.hx
index 4ff65e1311819dc0297047b951d5b02c0bf9a2b5..5f798224e939afff05f44cd0dc23de7bb79ba4d1 100644
--- a/std/java/lang/Long.hx
+++ b/std/java/lang/Long.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,57 +19,57 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.lang;
+
+package java.lang;
 
 @:native("") // make sure the generator won't see this
 @:forwardStatics
-@:forward abstract Long(LongClass) from LongClass to LongClass
-{
-	@:to @:extern inline public function toLong():haxe.Int64
+@:forward abstract Long(LongClass) from LongClass to LongClass {
+	@:to extern inline public function toLong():haxe.Int64
 		return this.longValue();
-	@:from @:extern inline public static function fromLong(b:haxe.Int64):Long
+
+	@:from extern inline public static function fromLong(b:haxe.Int64):Long
 		return LongClass.valueOf(b);
 }
 
-@:native("java.lang.Long") extern class LongClass extends Number implements Comparable<Long>
-{
-	@:overload @:throws("java.lang.NumberFormatException") function new(param1 : String) : Void;
-	@:overload function new(param1 : haxe.Int64) : Void;
-	@:overload function compareTo(param1 : Dynamic) : Int;
-	@:overload function compareTo(param1 : Long) : Int;
-	@:overload function equals(param1 : Dynamic) : Bool;
-	@:overload function hashCode() : Int;
-	@:overload function toString() : String;
-	@:final static var MAX_VALUE(default,null) : haxe.Int64;
-	@:final static var MIN_VALUE(default,null) : haxe.Int64;
-	@:final static var SIZE(default,null) : Int;
-	@:final static var TYPE : Class<Long>;
-	@:overload static function bitCount(param1 : haxe.Int64) : Int;
-	@:overload static function compare(param1 : haxe.Int64, param2 : haxe.Int64) : Int;
-	@:overload @:throws("java.lang.NumberFormatException") static function decode(param1 : String) : Long;
-	@:overload static function getLong(param1 : String, param2 : Long) : Long;
-	@:overload static function getLong(param1 : String) : Long;
-	@:overload static function getLong(param1 : String, param2 : haxe.Int64) : Long;
-	@:overload static function highestOneBit(param1 : haxe.Int64) : haxe.Int64;
-	@:overload static function lowestOneBit(param1 : haxe.Int64) : haxe.Int64;
-	@:overload static function numberOfLeadingZeros(param1 : haxe.Int64) : Int;
-	@:overload static function numberOfTrailingZeros(param1 : haxe.Int64) : Int;
-	@:overload @:throws("java.lang.NumberFormatException") static function parseLong(param1 : String) : haxe.Int64;
-	@:overload @:throws("java.lang.NumberFormatException") static function parseLong(param1 : String, param2 : Int) : haxe.Int64;
-	@:overload static function reverse(param1 : haxe.Int64) : haxe.Int64;
-	@:overload static function reverseBytes(param1 : haxe.Int64) : haxe.Int64;
-	@:overload static function rotateLeft(param1 : haxe.Int64, param2 : Int) : haxe.Int64;
-	@:overload static function rotateRight(param1 : haxe.Int64, param2 : Int) : haxe.Int64;
-	@:overload static function signum(param1 : haxe.Int64) : Int;
-	@:overload static function toBinaryString(param1 : haxe.Int64) : String;
-	@:overload static function toHexString(param1 : haxe.Int64) : String;
-	@:overload static function toOctalString(param1 : haxe.Int64) : String;
-	@:native("toString") @:overload static function _toString(param1 : haxe.Int64) : String;
-	@:native("toString") @:overload static function _toString(param1 : haxe.Int64, param2 : Int) : String;
-	@:overload static function valueOf(param1 : haxe.Int64) : Long;
-	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1 : String, param2 : Int) : Long;
-	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1 : String) : Long;
+@:native("java.lang.Long") extern class LongClass extends Number implements Comparable<Long> {
+	@:overload @:throws("java.lang.NumberFormatException") function new(param1:String):Void;
+	@:overload function new(param1:haxe.Int64):Void;
+	@:overload function compareTo(param1:Dynamic):Int;
+	@:overload function compareTo(param1:Long):Int;
+	@:overload function equals(param1:Dynamic):Bool;
+	@:overload function hashCode():Int;
+	@:overload function toString():String;
+	static final MAX_VALUE:haxe.Int64;
+	static final MIN_VALUE:haxe.Int64;
+	static final SIZE:Int;
+	static final TYPE:Class<Long>;
+	@:overload static function bitCount(param1:haxe.Int64):Int;
+	@:overload static function compare(param1:haxe.Int64, param2:haxe.Int64):Int;
+	@:overload @:throws("java.lang.NumberFormatException") static function decode(param1:String):Long;
+	@:overload static function getLong(param1:String, param2:Long):Long;
+	@:overload static function getLong(param1:String):Long;
+	@:overload static function getLong(param1:String, param2:haxe.Int64):Long;
+	@:overload static function highestOneBit(param1:haxe.Int64):haxe.Int64;
+	@:overload static function lowestOneBit(param1:haxe.Int64):haxe.Int64;
+	@:overload static function numberOfLeadingZeros(param1:haxe.Int64):Int;
+	@:overload static function numberOfTrailingZeros(param1:haxe.Int64):Int;
+	@:overload @:throws("java.lang.NumberFormatException") static function parseLong(param1:String):haxe.Int64;
+	@:overload @:throws("java.lang.NumberFormatException") static function parseLong(param1:String, param2:Int):haxe.Int64;
+	@:overload static function reverse(param1:haxe.Int64):haxe.Int64;
+	@:overload static function reverseBytes(param1:haxe.Int64):haxe.Int64;
+	@:overload static function rotateLeft(param1:haxe.Int64, param2:Int):haxe.Int64;
+	@:overload static function rotateRight(param1:haxe.Int64, param2:Int):haxe.Int64;
+	@:overload static function signum(param1:haxe.Int64):Int;
+	@:overload static function toBinaryString(param1:haxe.Int64):String;
+	@:overload static function toHexString(param1:haxe.Int64):String;
+	@:overload static function toOctalString(param1:haxe.Int64):String;
+	@:native("toString") @:overload static function _toString(param1:haxe.Int64):String;
+	@:native("toString") @:overload static function _toString(param1:haxe.Int64, param2:Int):String;
+	@:overload static function valueOf(param1:haxe.Int64):Long;
+	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1:String, param2:Int):Long;
+	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1:String):Long;
 }
 
-@:realPath("java.lang.Long_LongCache") @:javaNative @:native("java.lang.Long$LongCache") @:javaCanonical("java.lang","Long.LongCache") extern class Long_LongCache {
-}
+@:realPath("java.lang.Long_LongCache") @:javaNative @:native("java.lang.Long$LongCache") @:javaCanonical("java.lang",
+	"Long.LongCache") extern class Long_LongCache {}
diff --git a/std/java/lang/Short.hx b/std/java/lang/Short.hx
index d61fadaf8207e6911c853d71f6e265b26f54c88b..ff688a907783e686cb6a6da31687c0c8c2a42e64 100644
--- a/std/java/lang/Short.hx
+++ b/std/java/lang/Short.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,41 +19,41 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.lang;
+
+package java.lang;
 
 @:native("") // make sure the generator won't see this
 @:forwardStatics
-@:forward abstract Short(ShortClass) from ShortClass to ShortClass
-{
-	@:to @:extern inline public function toShort():java.types.Int16
+@:forward abstract Short(ShortClass) from ShortClass to ShortClass {
+	@:to extern inline public function toShort():java.types.Int16
 		return this.shortValue();
-	@:from @:extern inline public static function fromShort(b:java.types.Int16):Short
+
+	@:from extern inline public static function fromShort(b:java.types.Int16):Short
 		return ShortClass.valueOf(b);
 }
 
-@:native("java.lang.Short") extern class ShortClass extends Number implements Comparable<Short>
-{
-	@:overload function new(param1 : java.types.Int16) : Void;
-	@:overload @:throws("java.lang.NumberFormatException") function new(param1 : String) : Void;
-	@:overload function compareTo(param1 : Short) : Int;
-	@:overload function compareTo(param1 : Dynamic) : Int;
-	@:overload function equals(param1 : Dynamic) : Bool;
-	@:overload function hashCode() : Int;
-	@:overload function toString() : String;
-	@:final static var MAX_VALUE(default,null) : java.types.Int16;
-	@:final static var MIN_VALUE(default,null) : java.types.Int16;
-	@:final static var SIZE(default,null) : Int;
-	@:final static var TYPE : Class<Short>;
-	@:overload static function compare(param1 : java.types.Int16, param2 : java.types.Int16) : Int;
-	@:overload @:throws("java.lang.NumberFormatException") static function decode(param1 : String) : Short;
-	@:overload @:throws("java.lang.NumberFormatException") static function parseShort(param1 : String, param2 : Int) : java.types.Int16;
-	@:overload @:throws("java.lang.NumberFormatException") static function parseShort(param1 : String) : java.types.Int16;
-	@:overload static function reverseBytes(param1 : java.types.Int16) : java.types.Int16;
-	@:native("toString") @:overload static function _toString(param1 : java.types.Int16) : String;
-	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1 : String, param2 : Int) : Short;
-	@:overload static function valueOf(param1 : java.types.Int16) : Short;
-	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1 : String) : Short;
+@:native("java.lang.Short") extern class ShortClass extends Number implements Comparable<Short> {
+	@:overload function new(param1:java.types.Int16):Void;
+	@:overload @:throws("java.lang.NumberFormatException") function new(param1:String):Void;
+	@:overload function compareTo(param1:Short):Int;
+	@:overload function compareTo(param1:Dynamic):Int;
+	@:overload function equals(param1:Dynamic):Bool;
+	@:overload function hashCode():Int;
+	@:overload function toString():String;
+	static final MAX_VALUE:java.types.Int16;
+	static final MIN_VALUE:java.types.Int16;
+	static final SIZE:Int;
+	static final TYPE:Class<Short>;
+	@:overload static function compare(param1:java.types.Int16, param2:java.types.Int16):Int;
+	@:overload @:throws("java.lang.NumberFormatException") static function decode(param1:String):Short;
+	@:overload @:throws("java.lang.NumberFormatException") static function parseShort(param1:String, param2:Int):java.types.Int16;
+	@:overload @:throws("java.lang.NumberFormatException") static function parseShort(param1:String):java.types.Int16;
+	@:overload static function reverseBytes(param1:java.types.Int16):java.types.Int16;
+	@:native("toString") @:overload static function _toString(param1:java.types.Int16):String;
+	@:overload static function valueOf(param1:java.types.Int16):Short;
+	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1:String, param2:Int):Short;
+	@:overload @:throws("java.lang.NumberFormatException") static function valueOf(param1:String):Short;
 }
 
-@:realPath("java.lang.Short_ShortCache") @:javaNative @:native("java.lang.Short$ShortCache") @:javaCanonical("java.lang","Short.ShortCache") extern class Short_ShortCache {
-}
+@:realPath("java.lang.Short_ShortCache") @:javaNative @:native("java.lang.Short$ShortCache") @:javaCanonical("java.lang",
+	"Short.ShortCache") extern class Short_ShortCache {}
diff --git a/std/java/net/SslSocket.hx b/std/java/net/SslSocket.hx
index 60e543a8a6d5080a001012260d2f94786ba7c68a..f2116afc2e795db255266a0312dc41f87f79f570 100644
--- a/std/java/net/SslSocket.hx
+++ b/std/java/net/SslSocket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package java.net;
 
 @:native('haxe.java.net.SslSocket') class SslSocket extends sys.net.Socket {
-
-	override private function create() : Void
-	{
-		try
-		{
+	override private function create():Void {
+		try {
 			this.sock = java.javax.net.ssl.SSLSocketFactory.getDefault().createSocket();
 			this.server = java.javax.net.ssl.SSLServerSocketFactory.getDefault().createServerSocket();
-		} catch(e:Dynamic) throw e;
+		} catch (e:Dynamic)
+			throw e;
 	}
-
 }
diff --git a/std/java/types/Char16.hx b/std/java/types/Char16.hx
index 893366d5b273d3ae7eb1f1abe09f74e4dd8cb069..3f0f9eb9ed0341d2ae6ce9e11ddd5caaa86688d5 100644
--- a/std/java/types/Char16.hx
+++ b/std/java/types/Char16.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.types;
+
+package java.types;
 
 typedef Char16 = java.StdTypes.Char16;
diff --git a/std/java/types/Int16.hx b/std/java/types/Int16.hx
index a28857a77a67c26c32fcccb8aeaace1f8bc362dd..1f264aa6d2d1b5afc7b0be38b8da52883b6264ac 100644
--- a/std/java/types/Int16.hx
+++ b/std/java/types/Int16.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.types;
+
+package java.types;
 
 typedef Int16 = java.StdTypes.Int16;
diff --git a/std/java/types/Int8.hx b/std/java/types/Int8.hx
index e5b50b17bb817dbe15f03bef6b328876e1fd1170..baccb6c96297b8f98f769ad30134de177656575a 100644
--- a/std/java/types/Int8.hx
+++ b/std/java/types/Int8.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.types;
+
+package java.types;
 
 typedef Int8 = java.StdTypes.Int8;
diff --git a/std/java/vm/AtomicList.hx b/std/java/vm/AtomicList.hx
index 29671dd7117ef9a416e9daed582aef7ff82983bb..f61dc27933824d418227ab5f1ab2108a4bf2131e 100644
--- a/std/java/vm/AtomicList.hx
+++ b/std/java/vm/AtomicList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.vm;
+
+package java.vm;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -27,67 +28,56 @@ import java.util.concurrent.atomic.AtomicReference;
 	A lock-free queue implementation
 **/
 @:native('haxe.java.vm.AtomicList')
-@:nativeGen class AtomicList<T>
-{
+@:nativeGen class AtomicList<T> {
 	@:volatile @:private var head:AtomicNode<T>;
 	@:volatile @:private var tail:AtomicReference<AtomicNode<T>>;
 
-	public function new()
-	{
+	public function new() {
 		this.head = new AtomicNode(null);
 		this.head.set(new AtomicNode(null));
 		this.tail = new AtomicReference(head);
 	}
 
-	public function add(v:T)
-	{
+	public function add(v:T) {
 		var n = new AtomicNode(v), tail = this.tail;
 		var p = null;
-		while( !((p = tail.get()).compareAndSet(null, n)) )
-		{
+		while (!((p = tail.get()).compareAndSet(null, n))) {
 			tail.compareAndSet(p, p.get());
 		}
 		tail.compareAndSet(p, n);
 	}
 
-	public function pop():Null<T>
-	{
+	public function pop():Null<T> {
 		var p = null, pget = null, head = head;
-		do
-		{
+		do {
 			p = head.get();
-			if ( (pget = p.get()) == null)
-				return null; //empty
-		} while(!head.compareAndSet(p, pget));
+			if ((pget = p.get()) == null)
+				return null; // empty
+		} while (!head.compareAndSet(p, pget));
 
 		var ret = pget.value;
 		pget.value = null;
 		return ret;
 	}
 
-	public function peek()
-	{
+	public function peek() {
 		var ret = head.get();
-		if (ret == null) return null; //empty
+		if (ret == null)
+			return null; // empty
 		return ret.value;
 	}
 
-	public function peekLast()
-	{
+	public function peekLast() {
 		return tail.get().value;
 	}
-
 }
 
 @:native('haxe.java.vm.AtomicNode')
-@:nativeGen class AtomicNode<T> extends AtomicReference<AtomicNode<T>>
-{
+@:nativeGen class AtomicNode<T> extends AtomicReference<AtomicNode<T>> {
 	public var value:T;
 
-	public function new(value)
-	{
+	public function new(value) {
 		super();
 		this.value = value;
 	}
-
 }
diff --git a/std/java/vm/Deque.hx b/std/java/vm/Deque.hx
index b85cbfe5ac1609e2e4c24bd842d502f898a321b0..004c27e5b4544e55ce89a79403735284b95e6ad3 100644
--- a/std/java/vm/Deque.hx
+++ b/std/java/vm/Deque.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,76 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.vm;
-import java.Lib;
 
-/**
-	A Lock-free Queue implementation
-**/
-@:native('haxe.java.vm.Deque')
-@:nativeGen class Deque<T>
-{
-	@:private var head:Node<T>;
-	@:private var tail:Node<T>;
+package java.vm;
 
-	public function new()
-	{
-		this.head = this.tail = new Node(null);
-	}
-
-	public function add(i : T)
-	{
-		var n = new Node(i);
-		untyped __lock__(this,
-		{
-			tail.next = n;
-			tail = n;
-			try { untyped this.notify(); } catch(e:Dynamic) { throw e; }
-		});
-	}
-
-	public function push(i : T)
-	{
-		var n = new Node(i);
-		untyped __lock__(this,
-		{
-			n.next = head.next;
-			head.next = n;
-			try { untyped this.notify(); } catch(e:Dynamic) { throw e; }
-		});
-	}
-
-	public function pop(block : Bool) : Null<T>
-	{
-		var ret = null;
-		untyped __lock__(this, {
-			var n = null;
-			do {
-				n = head.next;
-				if (n != null)
-				{
-					ret = n.value;
-					n.value = null;
-					head = n;
-				} else if (block) {
-					//block
-					try { untyped this.wait(); } catch(e:Dynamic) { throw e; }
-				}
-			} while( block && n == null );
-		});
-		return ret;
-	}
-}
-
-@:native('haxe.java.vm.DequeNode')
-@:nativeGen
-class Node<T>
-{
-	public var value:T;
-	public var next:Node<T>;
-
-	public function new(val)
-	{
-		this.value = val;
-	}
-}
+@:deprecated typedef Deque<T> = sys.thread.Deque<T>;
diff --git a/std/java/vm/Gc.hx b/std/java/vm/Gc.hx
index afa2f578884cf4b5170a4b5cdd24a5fd6c712f8c..11423660f8c8057b20a729ef7262dd727504ffd6 100644
--- a/std/java/vm/Gc.hx
+++ b/std/java/vm/Gc.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,18 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.vm;
 
-@:native('haxe.java.vm.Gc') class Gc
-{
-	public static function run( major : Bool )
-	{
+package java.vm;
+
+@:native('haxe.java.vm.Gc') class Gc {
+	public static function run(major:Bool) {
 		java.lang.System.gc();
 	}
 
-	public static function stats() : { heap : Int, free : Int }
-	{
+	public static function stats():{heap:Int, free:Int} {
 		var r = java.lang.Runtime.getRuntime();
-		return { heap : cast r.totalMemory(), free : cast r.freeMemory() };
+		return {heap: cast r.totalMemory(), free: cast r.freeMemory()};
 	}
 }
diff --git a/std/java/vm/Lock.hx b/std/java/vm/Lock.hx
index fc4128d72270790dcf740b178e0e115964f7701a..65286ff7a72e9b18bb24d5b197b241cbbf08375a 100644
--- a/std/java/vm/Lock.hx
+++ b/std/java/vm/Lock.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,87 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.vm;
-import java.Lib;
-import java.lang.System;
-using haxe.Int64;
 
-@:native('haxe.java.vm.Lock') class Lock
-{
-	@:private @:volatile var releasedCount = 0;
+package java.vm;
 
-	/**
-		Creates a new lock, which is initially locked
-	**/
-	public function new()
-	{
-	}
-
-	/**
-		Waits for a lock to be released and acquire it.
-		If `timeout` (in seconds) is not null and expires then the returned value is false
-	**/
-	public function wait(?timeout : Float) : Bool
-	{
-		var ret = false;
-		java.Lib.lock(this,
-		{
-			if (--releasedCount < 0)
-			{
-				if (timeout == null)
-				{
-					// since .notify() is asynchronous, this `while` is needed
-					// because there is a very remote possibility of release() awaking a thread,
-					// but before it releases, another thread calls wait - and since the release count
-					// is still positive, it will get the lock.
-					while( releasedCount < 0 )
-					{
-						try
-						{
-							untyped __java__("this.wait()");
-						}
-						catch(e:java.lang.InterruptedException)
-						{
-						}
-					}
-				} else {
-					var timeout:haxe.Int64 = cast timeout * 1000;
-					var cur = System.currentTimeMillis(),
-					    max = cur.add(timeout);
-					// see above comment about this while loop
-					while ( releasedCount < 0 && cur.compare(max) < 0 )
-					{
-						try
-						{
-							var t = max.sub(cur);
-							untyped __java__("this.wait({0})",t);
-							cur = System.currentTimeMillis();
-						}
-						catch(e:java.lang.InterruptedException)
-						{
-						}
-					}
-				}
-			}
-			ret = this.releasedCount >= 0;
-			if (!ret)
-				this.releasedCount++; //timed out
-		});
-		return ret;
-	}
-
-	/**
-		Release a lock. The thread does not need to own the lock to be able to release it.
-		If a lock is released several times, it can be acquired as many times
-	**/
-	public function release()
-	{
-		untyped __lock__(this,
-		{
-			if (++releasedCount >= 0)
-			{
-				untyped this.notify();
-			}
-		});
-	}
-}
+@:deprecated typedef Lock = sys.thread.Lock;
diff --git a/std/java/vm/Mutex.hx b/std/java/vm/Mutex.hx
index 6077bda1671a369921af889f926e283f6d5e310f..ae0900cff3c94eae2efddce06c5347aa0eb18df1 100644
--- a/std/java/vm/Mutex.hx
+++ b/std/java/vm/Mutex.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,44 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.vm;
-import java.util.concurrent.locks.ReentrantLock;
 
-@:native('haxe.java.vm.Mutex') class Mutex
-{
-	@:private var lock:ReentrantLock;
+package java.vm;
 
-	/**
-		Creates a mutex, which can be used to acquire a temporary lock to access some resource.
-		The main difference with a lock is that a mutex must always be released by the owner thread
-	**/
-	public function new()
-	{
-		this.lock = new ReentrantLock();
-	}
-
-	/**
-		Try to acquire the mutex, returns true if acquire or false if it's already locked by another thread.
-	**/
-	public function tryAcquire():Bool
-	{
-		return this.lock.tryLock();
-	}
-
-	/**
-		The current thread acquire the mutex or wait if not available.
-		The same thread can acquire several times the same mutex, but must release it as many times it has been acquired.
-	**/
-	public function acquire():Void
-	{
-		this.lock.lock();
-	}
-
-	/**
-		Release a mutex that has been acquired by the current thread. If the current thread does not own the mutex, an exception will be thrown
-	**/
-	public function release():Void
-	{
-		this.lock.unlock();
-	}
-}
+@:deprecated typedef Mutex = sys.thread.Mutex;
diff --git a/std/java/vm/Thread.hx b/std/java/vm/Thread.hx
index 84bb1dae1d89e0f243bb7463dd1346f0bbd02436..e1a1dcc9543acfc9b452d684cf3de18a9401393c 100644
--- a/std/java/vm/Thread.hx
+++ b/std/java/vm/Thread.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,93 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.vm;
-import java.Lib;
 
-@:native('haxe.java.vm.Thread') class Thread
-{
+package java.vm;
 
-	@:private static var javaThreadToHaxe = new haxe.ds.WeakMap<java.lang.Thread, java.vm.Thread>();
-	@:private static var mainJavaThread = java.lang.Thread.currentThread();
-	@:private static var mainHaxeThread = {
-		var ret = new Thread();
-		javaThreadToHaxe.set(mainJavaThread, ret);
-		ret;
-	};
-
-
-	private static function getThread(jt:java.lang.Thread):Thread
-	{
-		if (Std.is(jt, HaxeThread))
-		{
-			var t:HaxeThread = cast jt;
-			return t.threadObject;
-		}
-		else if (jt == mainJavaThread)
-		{
-			return mainHaxeThread;
-		}
-		else
-		{
-			var ret = null;
-			untyped __lock__(javaThreadToHaxe, {
-				ret = javaThreadToHaxe.get(jt);
-				if (ret == null)
-				{
-					ret = new Thread();
-					javaThreadToHaxe.set(jt, ret);
-				}
-
-			});
-			return ret;
-		}
-	}
-
-	private var messages:Deque<Dynamic>;
-
-  function new()
-	{
-		this.messages = new Deque();
-	}
-
-	public function sendMessage(obj:Dynamic)
-	{
-		messages.add(obj);
-	}
-
-	public static function current():Thread
-	{
-		return getThread( java.lang.Thread.currentThread() );
-	}
-
-	public static function readMessage(block : Bool) : Dynamic
-	{
-		return current().messages.pop(block);
-	}
-
-	public static function create(fn:Void->Void):Thread
-	{
-		var ret = new Thread();
-		var t = new HaxeThread(ret, fn);
-		t.start();
-		return ret;
-	}
-}
-
-@:native('haxe.java.vm.HaxeThread')
-private class HaxeThread extends java.lang.Thread
-{
-	public var threadObject(default, null):Thread;
-	private var runFunction:Void->Void;
-	@:overload override public function run():Void
-	{
-		runFunction();
-	}
-	public function new(hxThread:Thread, run:Void->Void)
-	{
-		super();
-		threadObject = hxThread;
-		runFunction = run;
-		setDaemon(true);
-	}
-}
+@:deprecated typedef Thread = sys.thread.Thread;
diff --git a/std/java/vm/Tls.hx b/std/java/vm/Tls.hx
index 375b4778227f17ff724d50630a9ca1634935a0fd..2bb6f1bc004f4a3a33721ad6d7279df8b86dbc60 100644
--- a/std/java/vm/Tls.hx
+++ b/std/java/vm/Tls.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,30 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package java.vm;
 
-/**
-	Thread-local Storage implementation
-**/
-@:native('haxe.java.vm.Tls') class Tls<T>
-{
-	var t : java.lang.ThreadLocal<T>;
-	public var value(get,set):T;
+package java.vm;
 
-	public function new()
-	{
-		this.t = new java.lang.ThreadLocal();
-	}
-
-	inline private function get_value():T
-	{
-		return t.get();
-	}
-
-	inline private function set_value(v:T):T
-	{
-		t.set(v);
-		return v;
-	}
-
-}
+@:deprecated typedef Tls<T> = sys.thread.Tls<T>;
diff --git a/std/js/Boot.hx b/std/js/Boot.hx
index de0bfa8727f644c3e76556f16096c8f15f57a570..e27b52f07524843ae898ad8546176d000127e103 100644
--- a/std/js/Boot.hx
+++ b/std/js/Boot.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,75 +19,51 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package js;
 
-private class HaxeError extends js.Error {
+import js.Syntax; // import it here so it's always available in the compiler
 
+private class HaxeError extends js.lib.Error {
 	var val:Dynamic;
 
-	public function new(val:Dynamic) untyped {
+	@:pure
+	public function new(val:Dynamic) {
 		super();
-		this.val = __define_feature__("js.Boot.HaxeError", val);
-		this.message = String(val);
-		if (js.Error.captureStackTrace) js.Error.captureStackTrace(this, HaxeError);
+		this.val = val;
+		if ((cast js.lib.Error).captureStackTrace)
+			(cast js.lib.Error).captureStackTrace(this, HaxeError);
+	}
+
+	public static function wrap(val:Dynamic):js.lib.Error {
+		return if (js.Syntax.instanceof(val, js.lib.Error)) val else new HaxeError(val);
 	}
 
-	public static function wrap(val:Dynamic):Dynamic untyped {
-		return if (__instanceof__(val, js.Error)) val else new HaxeError(val);
+	static function __init__() {
+		js.lib.Object.defineProperty((cast HaxeError).prototype, "message", {get: () -> (cast String)(js.Lib.nativeThis.val)});
 	}
 }
 
 @:dox(hide)
 class Boot {
-
-	private static function __unhtml(s : String) {
-		return s.split("&").join("&amp;").split("<").join("&lt;").split(">").join("&gt;");
-	}
-
-	private static function __trace(v,i : haxe.PosInfos) {
-		untyped {
-			var msg = if( i != null ) i.fileName+":"+i.lineNumber+": " else "";
-			#if jsfl
-			msg += __string_rec(v,"");
-			fl.trace(msg);
-			#else
-			msg += __string_rec(v, "");
-			if( i != null && i.customParams != null )
-				for( v in i.customParams )
-					msg += "," + __string_rec(v, "");
-			var d;
-			if( __js__("typeof")(document) != "undefined" && (d = document.getElementById("haxe:trace")) != null )
-				d.innerHTML += __unhtml(msg)+"<br/>";
-			else if( __js__("typeof console") != "undefined" && __js__("console").log != null )
-				__js__("console").log(msg);
-			#end
-		}
-	}
-
-	private static function __clear_trace() {
-		untyped {
-			#if jsfl
-			fl.outputPanel.clear();
-			#else
-			var d = document.getElementById("haxe:trace");
-			if( d != null )
-				d.innerHTML = "";
-			#end
-		}
+	static inline function isClass(o:Dynamic):Bool {
+		return untyped __define_feature__("js.Boot.isClass", o.__name__);
 	}
 
-	static inline function isClass(o:Dynamic) : Bool {
-		return untyped __define_feature__("js.Boot.isClass", o.__name__);
+	static inline function isInterface(o:Class<Dynamic>):Bool {
+		return untyped __define_feature__("js.Boot.isInterface", o.__isInterface__);
 	}
 
-	static inline function isEnum(e:Dynamic) : Bool {
+	static inline function isEnum(e:Dynamic):Bool {
 		return untyped __define_feature__("js.Boot.isEnum", e.__ename__);
 	}
 
-	static function getClass(o:Dynamic) : Dynamic {
-		if (Std.is(o, Array))
+	@:pure static function getClass(o:Null<Dynamic>):Null<Dynamic> {
+		if (o == null) {
+			return null;
+		} else if (Std.is(o, Array)) {
 			return Array;
-		else {
+		} else {
 			var cl = untyped __define_feature__("js.Boot.getClass", o.__class__);
 			if (cl != null)
 				return cl;
@@ -99,141 +75,175 @@ class Boot {
 	}
 
 	@:ifFeature("has_enum")
-	private static function __string_rec(o,s:String) {
+	private static function __string_rec(o, s:String) {
 		untyped {
-			if( o == null )
-			    return "null";
-			if( s.length >= 5 )
+			if (o == null)
+				return "null";
+			if (s.length >= 5)
 				return "<...>"; // too much deep recursion
-			var t = __js__("typeof(o)");
-			if( t == "function" && (isClass(o) || isEnum(o)) )
+			var t = js.Syntax.typeof(o);
+			if (t == "function" && (isClass(o) || isEnum(o)))
 				t = "object";
-			switch( t ) {
-			case "object":
-				if( __js__("o instanceof Array") ) {
-					if( o.__enum__ ) {
-						if( o.length == 2 )
-							return o[0];
-						var str = o[0]+"(";
-						s += "\t";
-						for( i in 2...o.length ) {
-							if( i != 2 )
-								str += "," + __string_rec(o[i],s);
-							else
-								str += __string_rec(o[i],s);
+			switch (t) {
+				case "object":
+					#if !js_enums_as_arrays
+					__feature__("has_enum", if (o.__enum__) {
+						var e = $hxEnums[o.__enum__];
+						var n = e.__constructs__[o._hx_index];
+						var con = e[n];
+						if (con.__params__) {
+							s += "\t";
+							return n + "(" + [for (p in (con.__params__ : Array<String>)) __string_rec(o[p], s)].join(",") + ")";
+						} else {
+							return n;
 						}
-						return str + ")";
+					});
+					#end
+					if (js.Syntax.instanceof(o, Array)) {
+						#if js_enums_as_arrays
+						__feature__("has_enum", if (o.__enum__) {
+							if (o.length == 2)
+								return o[0];
+							var str = o[0] + "(";
+							s += "\t";
+							for (i in 2...o.length) {
+								if (i != 2)
+									str += "," + __string_rec(o[i], s);
+								else
+									str += __string_rec(o[i], s);
+							}
+							return str + ")";
+						});
+						#end
+						var str = "[";
+						s += "\t";
+						for (i in 0...o.length)
+							str += (if (i > 0) "," else "") + __string_rec(o[i], s);
+						str += "]";
+						return str;
+					}
+					var tostr;
+					try {
+						tostr = untyped o.toString;
+					} catch (e:Dynamic) {
+						// strange error on IE
+						return "???";
 					}
-					var l = o.length;
-					var i;
-					var str = "[";
+					if (tostr != null && tostr != __js__("Object.toString") && js.Syntax.typeof(tostr) == "function") {
+						var s2 = o.toString();
+						if (s2 != "[object Object]")
+							return s2;
+					}
+					var str = "{\n";
 					s += "\t";
-					for( i in 0...l )
-						str += (if (i > 0) "," else "")+__string_rec(o[i],s);
-					str += "]";
-					return str;
-				}
-				var tostr;
-				try {
-					tostr = untyped o.toString;
-				} catch( e : Dynamic ) {
-					// strange error on IE
-					return "???";
-				}
-				if( tostr != null && tostr != __js__("Object.toString") && __typeof__(tostr) == "function" ) {
-					var s2 = o.toString();
-					if( s2 != "[object Object]")
-						return s2;
-				}
-				var k : String = null;
-				var str = "{\n";
-				s += "\t";
-				var hasp = (o.hasOwnProperty != null);
-				__js__("for( var k in o ) {");
-					if( hasp && !o.hasOwnProperty(k) )
+					var hasp = (o.hasOwnProperty != null);
+					var k:String = null;
+					__js__("for( {0} in {1} ) {", k, o);
+					if (hasp && !o.hasOwnProperty(k))
 						__js__("continue");
-					if( k == "prototype" || k == "__class__" || k == "__super__" || k == "__interfaces__" || k == "__properties__" )
+					if (k == "prototype" || k == "__class__" || k == "__super__" || k == "__interfaces__" || k == "__properties__")
 						__js__("continue");
-					if( str.length != 2 )
+					if (str.length != 2)
 						str += ", \n";
-					str += s + k + " : "+__string_rec(o[k],s);
-				__js__("}");
-				s = s.substring(1);
-				str += "\n" + s + "}";
-				return str;
-			case "function":
-				return "<function>";
-			case "string":
-				return o;
-			default:
-				return String(o);
+					str += s + k + " : " + __string_rec(o[k], s);
+					__js__("}");
+					s = s.substring(1);
+					str += "\n" + s + "}";
+					return str;
+				case "function":
+					return "<function>";
+				case "string":
+					return o;
+				default:
+					return String(o);
 			}
 		}
 	}
 
-	private static function __interfLoop(cc : Dynamic,cl : Dynamic) {
-		if( cc == null )
+	@:pure private static function __interfLoop(cc:Dynamic, cl:Dynamic) {
+		if (cc == null)
 			return false;
-		if( cc == cl )
+		if (cc == cl)
 			return true;
-		var intf : Dynamic = cc.__interfaces__;
-		if( intf != null )
-			for( i in 0...intf.length ) {
-				var i : Dynamic = intf[i];
-				if( i == cl || __interfLoop(i,cl) )
+		if (js.lib.Object.prototype.hasOwnProperty.call(cc, "__interfaces__")) {
+			var intf:Dynamic = cc.__interfaces__;
+			for (i in 0...intf.length) {
+				var i:Dynamic = intf[i];
+				if (i == cl || __interfLoop(i, cl))
 					return true;
 			}
-		return __interfLoop(cc.__super__,cl);
+		}
+		return __interfLoop(cc.__super__, cl);
 	}
 
-	@:ifFeature("typed_catch") private static function __instanceof(o : Dynamic,cl : Dynamic) {
-		if( cl == null )
+	@:ifFeature("typed_catch") @:pure private static function __instanceof(o:Dynamic, cl:Dynamic) {
+		if (cl == null)
 			return false;
-		switch( cl ) {
-		case Int:
-			return (untyped __js__("typeof"))(o) == "number" && untyped __js__("(o|0) === o");
-		case Float:
-			return (untyped __js__("typeof"))(o) == "number";
-		case Bool:
-			return (untyped __js__("typeof"))(o) == "boolean";
-		case String:
-			return (untyped __js__("typeof"))(o) == "string";
-		case Array:
-			return (untyped __js__("(o instanceof Array)")) && o.__enum__ == null;
-		case Dynamic:
-			return true;
-		default:
-			if( o != null ) {
-				// Check if o is an instance of a Haxe class or a native JS object
-				if( (untyped __js__("typeof"))(cl) == "function" ) {
-					if( untyped __js__("o instanceof cl") )
-						return true;
-					if( __interfLoop(getClass(o),cl) )
-						return true;
-				}
-				else if ( (untyped __js__("typeof"))(cl) == "object" && __isNativeObj(cl) ) {
-					if( untyped __js__("o instanceof cl") )
-						return true;
+		switch (cl) {
+			case Int:
+				return js.Syntax.typeof(o) == "number" && js.Syntax.strictEq(o | 0, o);
+			case Float:
+				return js.Syntax.typeof(o) == "number";
+			case Bool:
+				return js.Syntax.typeof(o) == "boolean";
+			case String:
+				return js.Syntax.typeof(o) == "string";
+			case Array:
+				return js.Syntax.instanceof(o, Array) #if js_enums_as_arrays && o.__enum__ == null #end;
+			case Dynamic:
+				return o != null;
+			default:
+				if (o != null) {
+					// Check if o is an instance of a Haxe class or a native JS object
+					if (js.Syntax.typeof(cl) == "function") {
+						if (__downcastCheck(o, cl))
+							return true;
+					} else if (js.Syntax.typeof(cl) == "object" && __isNativeObj(cl)) {
+						if (js.Syntax.instanceof(o, cl))
+							return true;
+					}
+				} else {
+					return false;
 				}
-			} else {
-				return false;
-			}
-			// do not use isClass/isEnum here
-			untyped __feature__("Class.*",if( cl == Class && o.__name__ != null ) return true);
-			untyped __feature__("Enum.*",if( cl == Enum && o.__ename__ != null ) return true);
-			return o.__enum__ == cl;
+				// do not use isClass/isEnum here
+				untyped __feature__("Class.*", if (cl == Class && o.__name__ != null) return true);
+				untyped __feature__("Enum.*", if (cl == Enum && o.__ename__ != null) return true);
+				#if js_enums_as_arrays
+				return o.__enum__ == cl;
+				#else
+				return untyped __feature__(
+					"has_enum",
+					if (o.__enum__ != null) ($hxEnums[o.__enum__]) == cl else false,
+					false
+				);
+				#end
 		}
 	}
 
-	@:ifFeature("typed_cast") private static function __cast(o : Dynamic, t : Dynamic) {
-		if (__instanceof(o, t)) return o;
-		else throw "Cannot cast " +Std.string(o) + " to " +Std.string(t);
+	static function __downcastCheck(o:Dynamic, cl:Class<Dynamic>):Bool {
+		return js.Syntax.instanceof(o, cl) || (isInterface(cl) && inline __implements(o, cl));
+	}
+
+	static function __implements(o:Dynamic, iface:Class<Dynamic>):Bool {
+		return __interfLoop(getClass(o), iface);
+	}
+
+	@:ifFeature("typed_cast") private static function __cast(o:Dynamic, t:Dynamic) {
+		if (o == null || __instanceof(o, t))
+			return o;
+		else
+			throw "Cannot cast " + Std.string(o) + " to " + Std.string(t);
+	}
+
+	static var __toStr:js.lib.Function;
+
+	static function __init__() {
+		Boot.__toStr = (cast {}).toString;
 	}
 
-	static var __toStr = untyped ({}).toString;
 	// get native JS [[Class]]
 	static function __nativeClassName(o:Dynamic):String {
-		var name = untyped __toStr.call(o).slice(8, -1);
+		var name:String = __toStr.call(o).slice(8, -1);
 		// exclude general Object and Function
 		// also exclude Math and JSON, because instanceof cannot be called on them
 		if (name == "Object" || name == "Function" || name == "Math" || name == "JSON")
@@ -248,7 +258,6 @@ class Boot {
 
 	// resolve native JS class in the global scope:
 	static function __resolveNativeClass(name:String) {
-		return untyped js.Lib.global[name];
+		return js.Lib.global[cast name];
 	}
-
 }
diff --git a/std/js/Browser.hx b/std/js/Browser.hx
index aaf01421a5bfa74e94479393f55ecade04d7c085..0a1afcd1b846f6396c301009a5dddc18aa1d0b77 100644
--- a/std/js/Browser.hx
+++ b/std/js/Browser.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package js;
 
 import js.html.Storage;
@@ -27,23 +28,33 @@ import js.html.XMLHttpRequest;
 class Browser {
 	/** The global window object. */
 	public static var window(get, never):js.html.Window;
-	inline static function get_window() return untyped __js__("window");
+
+	extern inline static function get_window()
+		return untyped __js__("window");
 
 	/** Shortcut to Window.document. */
 	public static var document(get, never):js.html.HTMLDocument;
-	inline static function get_document() return untyped __js__("window.document");
+
+	extern inline static function get_document()
+		return window.document;
 
 	/** Shortcut to Window.location. */
 	public static var location(get, never):js.html.Location;
-	inline static function get_location() return untyped __js__("window.location");
+
+	extern inline static function get_location()
+		return window.location;
 
 	/** Shortcut to Window.navigator. */
 	public static var navigator(get, never):js.html.Navigator;
-	inline static function get_navigator() return untyped __js__("window.navigator");
+
+	extern inline static function get_navigator()
+		return window.navigator;
 
 	/** Shortcut to Window.console. */
-	public static var console(get, never):js.html.Console;
-	inline static function get_console() return untyped __js__("window.console");
+	public static var console(get, never):js.html.ConsoleInstance;
+
+	extern inline static function get_console()
+		return window.console;
 
 	/**
 	 * True if a window object exists, false otherwise.
@@ -52,19 +63,25 @@ class Browser {
 	 * environment such as node.js.
 	 */
 	public static var supported(get, never):Bool;
-	inline static function get_supported() return untyped __typeof__(window) != "undefined";
+
+	extern inline static function get_supported()
+		return js.Syntax.typeof(window) != "undefined";
 
 	/**
 	 * Safely gets the browser's local storage, or returns null if localStorage is unsupported or
 	 * disabled.
 	 */
-	public static function getLocalStorage() : Storage
-	{
+	public static function getLocalStorage():Storage {
 		try {
 			var s = window.localStorage;
 			s.getItem("");
+			if (s.length == 0) {
+				var key = "_hx_" + Math.random();
+				s.setItem(key, key);
+				s.removeItem(key);
+			}
 			return s;
-		} catch( e : Dynamic ) {
+		} catch (e:Dynamic) {
 			return null;
 		}
 	}
@@ -73,13 +90,17 @@ class Browser {
 	 * Safely gets the browser's session storage, or returns null if sessionStorage is unsupported
 	 * or disabled.
 	 */
-	public static function getSessionStorage() : Storage
-	{
+	public static function getSessionStorage():Storage {
 		try {
 			var s = window.sessionStorage;
 			s.getItem("");
+			if (s.length == 0) {
+				var key = "_hx_" + Math.random();
+				s.setItem(key, key);
+				s.removeItem(key);
+			}
 			return s;
-		} catch( e : Dynamic ) {
+		} catch (e:Dynamic) {
 			return null;
 		}
 	}
@@ -88,13 +109,12 @@ class Browser {
 	 * Creates an XMLHttpRequest, with a fallback to ActiveXObject for ancient versions of Internet
 	 * Explorer.
 	 */
-	public static function createXMLHttpRequest() : XMLHttpRequest
-	{
-		if( untyped __js__("typeof XMLHttpRequest") != "undefined" ) {
+	public static function createXMLHttpRequest():XMLHttpRequest {
+		if (untyped __js__("typeof XMLHttpRequest") != "undefined") {
 			return new XMLHttpRequest();
 		}
-		if( untyped __js__("typeof ActiveXObject") != "undefined" ) {
-			return untyped __new__("ActiveXObject","Microsoft.XMLHTTP");
+		if (untyped __js__("typeof ActiveXObject") != "undefined") {
+			return js.Syntax.construct("ActiveXObject", "Microsoft.XMLHTTP");
 		}
 		throw "Unable to create XMLHttpRequest object.";
 	}
@@ -102,7 +122,7 @@ class Browser {
 	/**
 		Display an alert message box containing the given message. See also `Window.alert()`.
 	**/
-	public static function alert( v : Dynamic ) {
-		@:privateAccess window.alert(Boot.__string_rec(v,""));
+	public static inline function alert(v:Dynamic) {
+		window.alert(Std.string(v));
 	}
 }
diff --git a/std/js/Cookie.hx b/std/js/Cookie.hx
index 0b0cc4f92e8a621cb857e1cfc5f0a7d164ce0065..3520c2d8357f18c4ace25025a35a4c25218283c3 100644
--- a/std/js/Cookie.hx
+++ b/std/js/Cookie.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,24 +19,27 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package js;
 
+import Date;
+
 class Cookie {
 	/**
 		Create or update a cookie.
 		@param  expireDelay  In seconds. If null, the cookie expires at end of session.
 	**/
-	public static function set( name : String, value : String, ?expireDelay : Int, ?path : String, ?domain : String ){
-		var s = name+"="+StringTools.urlEncode(value);
-		if( expireDelay != null ){
-			var d = DateTools.delta(Date.now(),expireDelay*1000);
+	public static function set(name:String, value:String, ?expireDelay:Int, ?path:String, ?domain:String) {
+		var s = name + "=" + StringTools.urlEncode(value);
+		if (expireDelay != null) {
+			var d = DateTools.delta(Date.now(), expireDelay * 1000);
 			s += ";expires=" + untyped d.toGMTString();
 		}
-		if( path != null ){
-			s += ";path="+path;
+		if (path != null) {
+			s += ";path=" + path;
 		}
-		if( domain != null ){
-			s += ";domain="+domain;
+		if (domain != null) {
+			s += ";domain=" + domain;
 		}
 		Browser.document.cookie = s;
 	}
@@ -44,15 +47,15 @@ class Cookie {
 	/**
 		Returns all cookies.
 	**/
-	public static function all(){
+	public static function all() {
 		var h = new haxe.ds.StringMap();
 		var a = Browser.document.cookie.split(";");
-		for( e in a ){
+		for (e in a) {
 			e = StringTools.ltrim(e);
 			var t = e.split("=");
-			if( t.length < 2 )
+			if (t.length < 2)
 				continue;
-			h.set(t[0],StringTools.urlDecode(t[1]));
+			h.set(t[0], StringTools.urlDecode(t[1]));
 		}
 		return h;
 	}
@@ -60,21 +63,21 @@ class Cookie {
 	/**
 		Returns value of a cookie.
 	**/
-	public static function get( name : String ){
+	public static function get(name:String) {
 		return all().get(name);
 	}
 
 	/**
 		Returns true if a cookie `name` exists.
 	**/
-	public static function exists( name : String ){
+	public static function exists(name:String) {
 		return all().exists(name);
 	}
 
 	/**
 		Remove a cookie.
 	**/
-	public static function remove( name : String, ?path : String, ?domain : String ){
-		set(name,"",-10,path,domain);
+	public static function remove(name:String, ?path:String, ?domain:String) {
+		set(name, "", -10, path, domain);
 	}
 }
diff --git a/std/js/Error.hx b/std/js/Error.hx
index e960866cb8aa0f282d92038de544ae054e5ef56c..b0241a819a414d4b3950977f28da1e7b6320bb9e 100644
--- a/std/js/Error.hx
+++ b/std/js/Error.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,50 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package js;
-
-@:native("Error")
-extern class Error
-{
-	var message : String;
-	var name : String;
-	var stack(default,null) : String;
-
-	function new(?message : String) : Void;
-}
-
-@:native("EvalError")
-extern class EvalError extends Error
-{
-	function new(?message : String) : Void;
-}
 
-@:native("RangeError")
-extern class RangeError extends Error
-{
-	function new(?message : String) : Void;
-}
-
-@:native("ReferenceError")
-extern class ReferenceError extends Error
-{
-	function new(?message : String) : Void;
-}
-
-@:native("SyntaxError")
-extern class SyntaxError extends Error
-{
-	function new(?message : String) : Void;
-}
-
-@:native("TypeError")
-extern class TypeError extends Error
-{
-	function new(?message : String) : Void;
-}
+package js;
 
-@:native("URIError")
-extern class URIError extends Error
-{
-	function new(?message : String) : Void;
-}
+@:deprecated typedef Error = js.lib.Error;
+@:deprecated typedef EvalError = js.lib.Error.EvalError;
+@:deprecated typedef RangeError = js.lib.Error.RangeError;
+@:deprecated typedef ReferenceError = js.lib.Error.ReferenceError;
+@:deprecated typedef SyntaxError = js.lib.Error.SyntaxError;
+@:deprecated typedef TypeError = js.lib.Error.TypeError;
+@:deprecated typedef URIError = js.lib.Error.URIError;
diff --git a/std/js/Function.hx b/std/js/Function.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ef9d035d611b9f03e36d2a96c1c2c4704bda9ef3
--- /dev/null
+++ b/std/js/Function.hx
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 js;
+
+@:deprecated typedef Function = js.lib.Function;
diff --git a/std/js/JsIterator.hx b/std/js/JsIterator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c56a2410a6ded21dcd9df89a4d4c07164a6af486
--- /dev/null
+++ b/std/js/JsIterator.hx
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C)2005-2019 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 js;
+
+@:deprecated typedef JsIterator<T> = js.lib.Iterator<T>;
+@:deprecated typedef JsIteratorStep<T> = js.lib.Iterator.IteratorStep<T>;
diff --git a/std/js/Lib.hx b/std/js/Lib.hx
index 45499e358e446f654b56ad6121f11a503fcd1875..06dc543c3c6585460e778eb77bdd34ca1ea01432 100644
--- a/std/js/Lib.hx
+++ b/std/js/Lib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package js;
 
 /**
-	Platform-specific JavaScript Library. Provides some platform-specific functions 
+	Platform-specific JavaScript Library. Provides some platform-specific functions
 	for the JavaScript target.
 **/
 class Lib {
-
 	/**
 		Inserts a 'debugger' statement that will make a breakpoint if a debugger is available.
 	**/
@@ -39,11 +39,11 @@ class Lib {
 		@deprecated Use Browser.alert() instead.
 	**/
 	@:deprecated("Lib.alert() is deprecated, use Browser.alert() instead")
-	public static function alert( v : Dynamic ) {
-		untyped __js__("alert")(js.Boot.__string_rec(v,""));
+	public static function alert(v:Dynamic) {
+		untyped __js__("alert")(js.Boot.__string_rec(v, ""));
 	}
 
-	public static inline function eval( code : String ) : Dynamic {
+	public static inline function eval(code:String):Dynamic {
 		return untyped __js__("eval")(code);
 	}
 
@@ -54,7 +54,7 @@ class Lib {
 		This is only supported in environments where `require` function
 		is available, such as Node.js or RequireJS.
 	**/
-	@:extern public static inline function require( module:String ) : Dynamic {
+	extern public static inline function require(module:String):Dynamic {
 		return untyped __js__("require")(module);
 	}
 
@@ -65,8 +65,9 @@ class Lib {
 
 		In Haxe, `null` is used to represent the absence of a value.
 	**/
-	public static var undefined(get,never) : Dynamic;
-	static inline function get_undefined() : Dynamic {
+	public static var undefined(get, never):Dynamic;
+
+	static inline function get_undefined():Dynamic {
 		return untyped __js__("undefined");
 	}
 
@@ -82,11 +83,21 @@ class Lib {
 
 		Read more at https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/this
 	**/
-	public static var nativeThis(get,never) : Dynamic;
-	@:extern static inline function get_nativeThis() : Dynamic {
+	public static var nativeThis(get, never):Dynamic;
+
+	extern static inline function get_nativeThis():Dynamic {
 		return untyped __js__("this");
 	}
 
+	/**
+		Call JavaScript `typeof` operator on the `o` value
+		and return a string representing the JavaScript type of a value.
+
+		Read more at https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/typeof
+	**/
+	extern public static inline function typeof(o:Dynamic):String {
+		return js.Syntax.typeof(o);
+	}
 
 	/**
 		An alias of the JS "global" object.
@@ -94,23 +105,37 @@ class Lib {
 		Concretely, it is set as the first defined value in the list of
 		`window`, `global`, `self`, and `this` in the top-level of the compiled output.
 	**/
-	#if (haxe_ver >= 3.3)
-		public
-	#else
-		// hide it since we should not add new feature in 3.2.1
-		@:allow(js) private
-	#end
-	static var global(get,never) : Dynamic;
-	@:extern static inline function get_global() : Dynamic {
+	public static var global(get, never):Dynamic;
+
+	extern static inline function get_global():Dynamic {
 		return untyped __define_feature__("js.Lib.global", __js__("$global")); // $global is generated by the compiler
 	}
 
 	/**
 		Re-throw last cathed exception, preserving original stack information.
 
-		Calling this only makes sense inside a catch statement.
+		Calling this is only possible inside a catch statement.
+	**/
+	@:pure(false) public static function rethrow() {
+		// function is implemented in the compiler
+	}
+
+	/**
+		Get original caught exception object, before unwrapping the `js.Boot.HaxeError`.
+
+		Can be useful if we want to redirect the original error into some external API (e.g. Promise or node.js callbacks).
+
+		Calling this is only possible inside a catch statement.
+	**/
+	public static function getOriginalException():Dynamic {
+		return null; // function is implemented in the compiler
+	}
+
+	/**
+		Generate next unique id
 	**/
-	@:extern public static inline function rethrow() {
-		untyped __define_feature__("js.Lib.rethrow", __rethrow__());
+	@:allow(haxe.ds.ObjectMap.assignId)
+	static inline function getNextHaxeUID():Int {
+		return js.Syntax.code("{0}.$haxeUID++", untyped __define_feature__("$global.$haxeUID", global));
 	}
 }
diff --git a/std/js/Object.hx b/std/js/Object.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7da188a7248f9803ad4ff4e5af719044e771c8a3
--- /dev/null
+++ b/std/js/Object.hx
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C)2005-2019 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 js;
+
+@:deprecated typedef Object = js.lib.Object;
+@:deprecated typedef ObjectPrototype = js.lib.Object.ObjectPrototype;
+@:deprecated typedef ObjectPropertyDescriptor = js.lib.Object.ObjectPropertyDescriptor;
diff --git a/std/js/Promise.hx b/std/js/Promise.hx
index ff8272973edc8abeed2acdc8c0f46cba765d5b9c..5de240ba9dee4492be198ab13e71663ae03a119b 100644
--- a/std/js/Promise.hx
+++ b/std/js/Promise.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,32 +22,7 @@
 
 package js;
 
-import haxe.extern.EitherType;
-
-@:native("Promise")
-extern class Promise<T>
-{
-	@:overload(function<T>(promise : Promise<T>) : Promise<T> {})
-	@:overload(function<T>(thenable : Thenable<T>) : Promise<T> {})
-	static function resolve<T>( ?value : T ) : Promise<T>;
-
-	static function reject<T>( ?value : Dynamic ) : Promise<T>;
-
-	static function all( iterable : Array<Dynamic> ) : Promise<Array<Dynamic>>;
-
-	static function race( iterable : Array<Dynamic> ) : Promise<Dynamic>;
-
-	/** @throws DOMError */
-	function new( init : (T -> Void) -> (Dynamic -> Void) -> Void ) : Void;
-
-	function then<TOut>( fulfillCallback : Null<PromiseCallback<T, TOut>>, ?rejectCallback : EitherType<Dynamic -> Void, PromiseCallback<Dynamic, TOut>> ) : Promise<TOut>;
-
-	@:native("catch")
-	function catchError<TOut>( rejectCallback : EitherType<Dynamic -> Void, PromiseCallback<Dynamic, TOut>> ) : Promise<TOut>;
-}
-
-typedef PromiseCallback<T, TOut> = EitherType<T -> TOut, T -> Promise<TOut>>;
-
-typedef Thenable<T> = {
-	function then(resolve:T->Void, ?reject:Dynamic->Void):Void;
-}
+@:deprecated typedef Promise<T> = js.lib.Promise<T>;
+@:deprecated typedef PromiseHandler<T, TOut> = js.lib.Promise.PromiseHandler<T, TOut>;
+@:deprecated typedef Thenable<T> = js.lib.Promise.Thenable<T>;
+@:deprecated typedef ThenableStruct<T> = js.lib.Promise.ThenableStruct<T>;
diff --git a/std/js/RegExp.hx b/std/js/RegExp.hx
index b34014c0932fd51d382aada9fb47aa6cf1084818..80df24e1f5980fc4cfc5fe1225be75bf3e22f371 100644
--- a/std/js/RegExp.hx
+++ b/std/js/RegExp.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,28 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package js;
 
-/**
-    Native JavaScript regular expressions.
+package js;
 
-    For cross-platform regular expressions, use Haxe `EReg` class or 
-    [regexp literals](https://haxe.org/manual/std-regex.html).
-**/
-@:native("RegExp")
-extern class RegExp {
-    var global(default,null):Bool;
-    var ignoreCase(default,null):Bool;
-    var multiline(default,null):Bool;
-    var source(default,null):String;
-    var lastIndex:Int;
-    function new(pattern:String, ?flags:String);
-    function exec(str:String):Null<RegExpMatch>;
-    function test(str:String):Bool;
-    function toString():String;
-}
-
-extern class RegExpMatch extends Array<String> {
-    var index:Int;
-    var input:String;
-}
+@:deprecated typedef RegExp = js.lib.RegExp;
+@:deprecated typedef RegExpMatch = js.lib.RegExp.RegExpMatch;
diff --git a/std/js/Selection.hx b/std/js/Selection.hx
index 83c03b0944afcc48495a475e4cde586a3874d479..6731e3d1fa1d68a2a8a20a8a4d4cd406d641eb41 100644
--- a/std/js/Selection.hx
+++ b/std/js/Selection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,71 +19,73 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package js;
 
 import js.html.TextAreaElement;
 
 class Selection {
+	var doc:Dynamic;
 
-	var doc : Dynamic;
-
-	public function new( doc : TextAreaElement ) {
+	public function new(doc:TextAreaElement) {
 		this.doc = doc;
 	}
 
 	public function get() {
 		// Mozilla
-		if( doc.selectionStart != null )
-			return doc.value.substring(doc.selectionStart,doc.selectionEnd);
+		if (doc.selectionStart != null)
+			return doc.value.substring(doc.selectionStart, doc.selectionEnd);
 		// IE
 		var range = untyped js.Lib.document.selection.createRange();
-		if( range.parentElement() != doc )
+		if (range.parentElement() != doc)
 			return "";
 		return range.text;
 	}
 
-	public function select( start : Int, end : Int ) {
+	public function select(start:Int, end:Int) {
 		doc.focus();
 		// Mozilla
-		if( doc.selectionStart != null ) {
+		if (doc.selectionStart != null) {
 			doc.selectionStart = start;
 			doc.selectionEnd = end;
 			return;
 		}
 		// FIX : IE count \r\n as one single char for selection
 		// operations, we must then deal with it
-		var value : String = doc.value;
+		var value:String = doc.value;
 		var p = 0, delta = 0;
-		while( true ) {
+		while (true) {
 			var i = value.indexOf("\r\n", p);
-			if( i < 0 || i > start ) break;
+			if (i < 0 || i > start)
+				break;
 			delta++;
 			p = i + 2;
 		}
 		start -= delta;
-		while( true ) {
+		while (true) {
 			var i = value.indexOf("\r\n", p);
-			if( i < 0 || i > end ) break;
+			if (i < 0 || i > end)
+				break;
 			delta++;
 			p = i + 2;
 		}
 		end -= delta;
 		// IE
 		var r = doc.createTextRange();
-        r.moveEnd('textedit',-1);
-        r.moveStart('character',start);
-        r.moveEnd('character',end - start);
-        r.select();
+		r.moveEnd('textedit', -1);
+		r.moveStart('character', start);
+		r.moveEnd('character', end - start);
+		r.select();
 	}
 
-	public function insert( left : String, text : String, right : String ) {
+	public function insert(left:String, text:String, right:String) {
 		doc.focus();
 		// Mozilla
-		if( doc.selectionStart != null ) {
+		if (doc.selectionStart != null) {
 			var top = doc.scrollTop;
 			var start = doc.selectionStart;
 			var end = doc.selectionEnd;
-			doc.value = doc.value.substr(0,start) + left + text + right + doc.value.substr(end);
+			doc.value = doc.value.substr(0, start) + left + text + right + doc.value.substr(end);
 			doc.selectionStart = start + left.length;
 			doc.selectionEnd = start + left.length + text.length;
 			doc.scrollTop = top;
@@ -92,9 +94,8 @@ class Selection {
 		// IE
 		var range = untyped js.Lib.document.selection.createRange();
 		range.text = left + text + right;
-		range.moveStart('character',-text.length-right.length);
-		range.moveEnd('character',-right.length);
+		range.moveStart('character', -text.length - right.length);
+		range.moveEnd('character', -right.length);
 		range.select();
 	}
-
 }
diff --git a/std/js/Set.hx b/std/js/Set.hx
new file mode 100644
index 0000000000000000000000000000000000000000..42e1d3e6fc03d1c3243a97ba1ad01f01994d5b49
--- /dev/null
+++ b/std/js/Set.hx
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 js;
+
+@:deprecated typedef Set<T> = js.lib.Set<T>;
diff --git a/std/js/Symbol.hx b/std/js/Symbol.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4f811ac36bf2000875a55e087759f4e8b62db007
--- /dev/null
+++ b/std/js/Symbol.hx
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 js;
+
+@:deprecated typedef Symbol = js.lib.Symbol;
diff --git a/std/js/Syntax.hx b/std/js/Syntax.hx
new file mode 100644
index 0000000000000000000000000000000000000000..83f3fd347abcd67b446b1ff8fee64d1f4d0c7391
--- /dev/null
+++ b/std/js/Syntax.hx
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C)2005-2019 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 js;
+
+import haxe.extern.Rest;
+
+/**
+	Generate JavaScript syntax not directly supported by Haxe.
+	Use only at low-level when specific target-specific code-generation is required.
+**/
+@:noClosure
+extern class Syntax {
+	/**
+		Inject `code` directly into generated source.
+
+		`code` must be a string constant.
+
+		Additional `args` are supported to provide code interpolation, for example:
+		```haxe
+		Syntax.code("console.log({0}, {1})", "hi", 42);
+		```
+		will generate
+		```haxe
+		console.log("hi", 42);
+		```
+	**/
+	static function code(code:String, args:Rest<Dynamic>):Dynamic;
+
+	/**
+		Generate `new cl(...args)` expression.
+	**/
+	@:overload(function(cl:String, args:Rest<Dynamic>):Dynamic {})
+	static function construct<T>(cl:Class<T>, args:Rest<Dynamic>):T;
+
+	/**
+		Generate `v instanceof cl` expression.
+	**/
+	@:pure static function instanceof(v:Dynamic, cl:Class<Dynamic>):Bool;
+
+	/**
+		Generate `typeof o` expression.
+	**/
+	@:pure static function typeof(o:Dynamic):String;
+
+	/**
+		Genearte `a === b` expression.
+	**/
+	@:pure static function strictEq(a:Dynamic, b:Dynamic):Bool;
+
+	/**
+		Genearte `a !== b` expression.
+	**/
+	@:pure static function strictNeq(a:Dynamic, b:Dynamic):Bool;
+
+	/**
+		Generate `delete o[f]` expression.
+	**/
+	@:overload(function(o:Dynamic, f:Int):Bool {})
+	static function delete(o:Dynamic, f:String):Bool;
+
+	/**
+		Generate `o.f` expression, if `f` is a constant string,
+		or `o[f]` if it's any other expression.
+	**/
+	static function field(o:Dynamic, f:String):Dynamic;
+}
diff --git a/std/js/_std/Array.hx b/std/js/_std/Array.hx
index 45b642ac15c5834058c84b3e5891f6ce4cd3166d..787ad51bf84dbad78cb854d28079b2293d8f1376 100644
--- a/std/js/_std/Array.hx
+++ b/std/js/_std/Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,53 +21,64 @@
  */
 @:coreApi
 extern class Array<T> {
+	var length(default, null):Int;
 
-	var length(default,null) : Int;
+	function new():Void;
+	function concat(a:Array<T>):Array<T>;
+	function join(sep:String):String;
+	function pop():Null<T>;
+	function push(x:T):Int;
+	function reverse():Void;
+	function shift():Null<T>;
+	function slice(pos:Int, ?end:Int):Array<T>;
+	function sort(f:T->T->Int):Void;
+	function splice(pos:Int, len:Int):Array<T>;
+	function toString():String;
+	function unshift(x:T):Void;
 
-	function new() : Void;
-	function concat( a : Array<T> ) : Array<T>;
-	function join( sep : String ) : String;
-	function pop() : Null<T>;
-	function push(x : T) : Int;
-	function reverse() : Void;
-	function shift() : Null<T>;
-	function slice( pos : Int, ?end : Int ) : Array<T>;
-	function sort( f : T -> T -> Int ) : Void;
-	function splice( pos : Int, len : Int ) : Array<T>;
-	function toString() : String;
-	function unshift( x : T ) : Void;
-
-	inline function insert( pos : Int, x : T ) : Void {
-		(untyped this).splice(pos,0,x);
+	inline function insert(pos:Int, x:T):Void {
+		(cast this).splice(pos, 0, x);
 	}
 
-	inline function remove( x : T ) : Bool {
-		return @:privateAccess HxOverrides.remove(this,x);
+	inline function remove(x:T):Bool {
+		return @:privateAccess HxOverrides.remove(this, x);
 	}
 
-#if (js_es >= 5)
-	function indexOf( x : T, ?fromIndex:Int ) : Int;
-	function lastIndexOf( x : T, ?fromIndex:Int ) : Int;
+	#if (js_es >= 5)
+	@:pure function indexOf(x:T, ?fromIndex:Int):Int;
+	@:pure function lastIndexOf(x:T, ?fromIndex:Int):Int;
+	#else
+	inline function indexOf(x:T, ?fromIndex:Int):Int {
+		return @:privateAccess HxOverrides.indexOf(this, x, (fromIndex != null) ? fromIndex : 0);
+	}
 
-#else
-	inline function indexOf( x : T, ?fromIndex:Int ) : Int {
-		return @:privateAccess HxOverrides.indexOf(this,x,(fromIndex!=null)?fromIndex:0);
+	inline function lastIndexOf(x:T, ?fromIndex:Int):Int {
+		return @:privateAccess HxOverrides.lastIndexOf(this, x, (fromIndex != null) ? fromIndex : length - 1);
 	}
+	#end
 
-	inline function lastIndexOf( x : T, ?fromIndex:Int ) : Int {
-		return @:privateAccess HxOverrides.lastIndexOf(this,x,(fromIndex!=null)?fromIndex:length-1);
+	@:pure
+	inline function copy():Array<T> {
+		return (cast this).slice();
 	}
-#end
 
-	inline function copy() : Array<T> {
-		return (untyped this).slice();
+	@:runtime inline function map<S>(f:T->S):Array<S> {
+		var result:Array<S> = js.Syntax.construct(Array, length);
+		for(i in 0...length) {
+			result[i] = f(this[i]);
+		}
+		return result;
 	}
 
-	function map<S>(f:T->S):Array<S>;
-	function filter(f:T->Bool):Array<T>;
+	@:runtime inline function filter(f:T->Bool):Array<T> {
+		return [for (v in this) if (f(v)) v];
+	}
 
-	@:runtime inline function iterator() : Iterator<T> {
-		return untyped HxOverrides.iter(this);
+	@:runtime inline function iterator():Iterator<T> {
+		return @:privateAccess HxOverrides.iter(this);
 	}
 
+	inline function resize(len:Int):Void {
+		this.length = len;
+	}
 }
diff --git a/std/js/_std/Date.hx b/std/js/_std/Date.hx
index 5a7c7ff7232fbfeb3a49f8dece2c7a799ff707b9..699da1deb332dd8262af89413a8e56fd71762e0c 100644
--- a/std/js/_std/Date.hx
+++ b/std/js/_std/Date.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,30 +20,38 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi extern class Date {
+	@:pure function new(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Void;
+	@:pure function getTime():Float;
+	@:pure function getHours():Int;
+	@:pure function getMinutes():Int;
+	@:pure function getSeconds():Int;
+	@:pure function getFullYear():Int;
+	@:pure function getMonth():Int;
+	@:pure function getDate():Int;
+	@:pure function getDay():Int;
 
-	@:pure function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void;
-	@:pure function getTime() : Float;
-	@:pure function getHours() : Int;
-	@:pure function getMinutes() : Int;
-	@:pure function getSeconds() : Int;
-	@:pure function getFullYear() : Int;
-	@:pure function getMonth() : Int;
-	@:pure function getDate() : Int;
-	@:pure function getDay() : Int;
+	@:pure function getUTCHours():Int;
+	@:pure function getUTCMinutes():Int;
+	@:pure function getUTCSeconds():Int;
+	@:pure function getUTCFullYear():Int;
+	@:pure function getUTCMonth():Int;
+	@:pure function getUTCDate():Int;
+	@:pure function getUTCDay():Int;
+	@:pure function getTimezoneOffset():Int;
 
-	@:pure inline function toString() : String {
-		return untyped HxOverrides.dateStr(this);
+	@:pure inline function toString():String {
+		return @:privateAccess HxOverrides.dateStr(this);
 	}
 
-	@:pure static inline function now() : Date {
-		return untyped __new__(Date);
+	@:pure static inline function now():Date {
+		return js.Syntax.construct(Date);
 	}
 
-	@:pure static inline function fromTime( t : Float ) : Date {
-		return untyped __new__(Date, t);
+	@:pure static inline function fromTime(t:Float):Date {
+		return js.Syntax.construct(Date, t);
 	}
 
-	@:pure static inline function fromString( s : String ) : Date {
-		return untyped HxOverrides.strDate(s);
+	@:pure static inline function fromString(s:String):Date {
+		return @:privateAccess HxOverrides.strDate(s);
 	}
 }
diff --git a/std/js/_std/EReg.hx b/std/js/_std/EReg.hx
index e4b8951d4953a21901122837b58db7eafd7fc5e7..ae91f2ff697ead5ba65f48491cb932e1e84c9fc7 100644
--- a/std/js/_std/EReg.hx
+++ b/std/js/_std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,41 +20,44 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi class EReg {
+	var r:HaxeRegExp;
 
-	var r : HaxeRegExp;
-
-	public inline function new( r : String, opt : String ) : Void {
+	public inline function new(r:String, opt:String):Void {
 		this.r = new HaxeRegExp(r, opt.split("u").join("")); // 'u' (utf8) depends on page encoding
 	}
 
-	public function match( s : String ) : Bool {
-		if( r.global ) r.lastIndex = 0;
+	public function match(s:String):Bool {
+		if (r.global)
+			r.lastIndex = 0;
 		r.m = r.exec(s);
 		r.s = s;
 		return (r.m != null);
 	}
 
-	public function matched( n : Int ) : String {
-		return if( r.m != null && n >= 0 && n < r.m.length ) r.m[n] else throw "EReg::matched";
+	public function matched(n:Int):String {
+		return if (r.m != null && n >= 0 && n < r.m.length) r.m[n] else throw "EReg::matched";
 	}
 
-	public function matchedLeft() : String {
-		if( r.m == null ) throw "No string matched";
-		return r.s.substr(0,r.m.index);
+	public function matchedLeft():String {
+		if (r.m == null)
+			throw "No string matched";
+		return r.s.substr(0, r.m.index);
 	}
 
-	public function matchedRight() : String {
-		if( r.m == null ) throw "No string matched";
-		var sz = r.m.index+r.m[0].length;
-		return r.s.substr(sz,r.s.length-sz);
+	public function matchedRight():String {
+		if (r.m == null)
+			throw "No string matched";
+		var sz = r.m.index + r.m[0].length;
+		return r.s.substr(sz, r.s.length - sz);
 	}
 
-	public function matchedPos() : { pos : Int, len : Int } {
-		if( r.m == null ) throw "No string matched";
-		return { pos : r.m.index, len : r.m[0].length };
+	public function matchedPos():{pos:Int, len:Int} {
+		if (r.m == null)
+			throw "No string matched";
+		return {pos: r.m.index, len: r.m[0].length};
 	}
 
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
 		return if (r.global) {
 			r.lastIndex = pos;
 			r.m = r.exec(len < 0 ? s : s.substr(0, pos + len));
@@ -65,7 +68,7 @@
 			b;
 		} else {
 			// TODO: check some ^/$ related corner cases
-			var b = match( len < 0 ? s.substr(pos) : s.substr(pos,len) );
+			var b = match(len < 0 ? s.substr(pos) : s.substr(pos, len));
 			if (b) {
 				r.s = s;
 				r.m.index += pos;
@@ -74,17 +77,17 @@
 		}
 	}
 
-	public function split( s : String ) : Array<String> {
+	public function split(s:String):Array<String> {
 		// we can't use directly s.split because it's ignoring the 'g' flag
 		var d = "#__delim__#";
-		return untyped s.replace(r,d).split(d);
+		return replace(s, d).split(d);
 	}
 
-	public inline function replace( s : String, by : String ) : String {
-		return untyped s.replace(r,by);
+	public inline function replace(s:String, by:String):String {
+		return (cast s).replace(r, by);
 	}
 
-	public function map( s : String, f : EReg -> String ) : String {
+	public function map(s:String, f:EReg->String):String {
 		var offset = 0;
 		var buf = new StringBuf();
 		do {
@@ -100,18 +103,23 @@
 			if (p.len == 0) {
 				buf.add(s.substr(p.pos, 1));
 				offset = p.pos + 1;
-			}
-			else
+			} else
 				offset = p.pos + p.len;
 		} while (r.global);
 		if (!r.global && offset > 0 && offset < s.length)
 			buf.add(s.substr(offset));
 		return buf.toString();
 	}
+
+	public static inline function escape(s:String):String {
+		return (cast s).replace(escapeRe, "\\$&");
+	}
+
+	static var escapeRe = new js.lib.RegExp("[.*+?^${}()|[\\]\\\\]", "g");
 }
 
 @:native("RegExp")
-private extern class HaxeRegExp extends js.RegExp {
-	var m:js.RegExp.RegExpMatch;
+private extern class HaxeRegExp extends js.lib.RegExp {
+	var m:js.lib.RegExp.RegExpMatch;
 	var s:String;
 }
diff --git a/std/js/_std/HxOverrides.hx b/std/js/_std/HxOverrides.hx
index 8b0d9fe866c38c365c428e9b2ba18a5fa63b5aff..348cd4174acf38245c0b80f12a9321949b9b0696 100644
--- a/std/js/_std/HxOverrides.hx
+++ b/std/js/_std/HxOverrides.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,52 +21,49 @@
  */
 @:noDoc
 class HxOverrides {
-
-	static function dateStr( date :Date ) : String {
+	static function dateStr(date:Date):String {
 		var m = date.getMonth() + 1;
 		var d = date.getDate();
 		var h = date.getHours();
 		var mi = date.getMinutes();
 		var s = date.getSeconds();
-		return date.getFullYear()
-			+"-"+(if( m < 10 ) "0"+m else ""+m)
-			+"-"+(if( d < 10 ) "0"+d else ""+d)
-			+" "+(if( h < 10 ) "0"+h else ""+h)
-			+":"+(if( mi < 10 ) "0"+mi else ""+mi)
-			+":"+(if( s < 10 ) "0"+s else ""+s);
+		return date.getFullYear() + "-" + (if (m < 10) "0" + m else "" + m) + "-" + (if (d < 10) "0" + d else "" + d) + " "
+			+ (if (h < 10) "0" + h else "" + h) + ":" + (if (mi < 10) "0" + mi else "" + mi) + ":" + (if (s < 10) "0" + s else "" + s);
 	}
 
-	static function strDate( s : String ) : Date {
-		switch( s.length ) {
-		case 8: // hh:mm:ss
-			var k = s.split(":");
-			var d : Date = untyped __new__(Date);
-			untyped d["setTime"](0);
-			untyped d["setUTCHours"](k[0]);
-			untyped d["setUTCMinutes"](k[1]);
-			untyped d["setUTCSeconds"](k[2]);
-			return d;
-		case 10: // YYYY-MM-DD
-			var k = s.split("-");
-			return new Date(cast k[0],cast untyped k[1] - 1,cast k[2],0,0,0);
-		case 19: // YYYY-MM-DD hh:mm:ss
-			var k = s.split(" ");
-			var y = k[0].split("-");
-			var t = k[1].split(":");
-			return new Date(cast y[0],cast untyped y[1] - 1,cast y[2],cast t[0],cast t[1],cast t[2]);
-		default:
-			throw "Invalid date format : " + s;
+	static function strDate(s:String):Date {
+		switch (s.length) {
+			case 8: // hh:mm:ss
+				var k = s.split(":");
+				var d = js.Syntax.construct(Date);
+				(cast d)[cast "setTime"](0);
+				(cast d)[cast "setUTCHours"](k[0]);
+				(cast d)[cast "setUTCMinutes"](k[1]);
+				(cast d)[cast "setUTCSeconds"](k[2]);
+				return d;
+			case 10: // YYYY-MM-DD
+				var k = s.split("-");
+				return new Date(cast k[0], (cast k[1]) - 1, cast k[2], 0, 0, 0);
+			case 19: // YYYY-MM-DD hh:mm:ss
+				var k = s.split(" ");
+				var y = k[0].split("-");
+				var t = k[1].split(":");
+				return new Date(cast y[0], (cast y[1]) - 1, cast y[2], cast t[0], cast t[1], cast t[2]);
+			default:
+				throw "Invalid date format : " + s;
 		}
 	}
 
-	static function cca( s : String, index : Int ) : Null<Int> {
+	@:pure
+	static function cca(s:String, index:Int):Null<Int> {
 		var x = (cast s).charCodeAt(index);
-		if( x != x ) // fast isNaN
+		if (x != x) // fast isNaN
 			return js.Lib.undefined; // isNaN will still return true
 		return x;
 	}
 
-	static function substr( s : String, pos : Int, ?len : Int ) : String {
+	@:pure
+	static function substr(s:String, pos:Int, ?len:Int):String {
 		if (len == null) {
 			len = s.length;
 		} else if (len < 0) {
@@ -84,64 +81,70 @@ class HxOverrides {
 		}
 		#end
 
-		return (untyped s).substr(pos, len);
+		return (cast s).substr(pos, len);
 	}
 
-	static function indexOf<T>( a : Array<T>, obj : T, i : Int) {
+	@:pure
+	static function indexOf<T>(a:Array<T>, obj:T, i:Int) {
 		var len = a.length;
 		if (i < 0) {
 			i += len;
-			if (i < 0) i = 0;
+			if (i < 0)
+				i = 0;
 		}
-		while (i < len)
-		{
-			if (untyped __js__("a[i] === obj"))
+		while (i < len) {
+			if (js.Syntax.strictEq(a[i], obj))
 				return i;
 			i++;
 		}
 		return -1;
 	}
 
-	static function lastIndexOf<T>( a : Array<T>, obj : T, i : Int) {
+	@:pure
+	static function lastIndexOf<T>(a:Array<T>, obj:T, i:Int) {
 		var len = a.length;
 		if (i >= len)
 			i = len - 1;
 		else if (i < 0)
 			i += len;
-		while (i >= 0)
-		{
-			if (untyped __js__("a[i] === obj"))
+		while (i >= 0) {
+			if (js.Syntax.strictEq(a[i], obj))
 				return i;
 			i--;
 		}
 		return -1;
 	}
 
-	static function remove<T>( a : Array<T>, obj : T ) {
+	static function remove<T>(a:Array<T>, obj:T) {
 		var i = a.indexOf(obj);
-		if( i == -1 ) return false;
-		a.splice(i,1);
+		if (i == -1)
+			return false;
+		a.splice(i, 1);
 		return true;
 	}
 
-	static function iter<T>( a : Array<T> ) : Iterator<T> untyped {
-		return {
-			cur : 0,
-			arr : a,
-			hasNext : function() {
-				return __this__.cur < __this__.arr.length;
-			},
-			next : function() {
-				return __this__.arr[__this__.cur++];
-			}
-		};
-	}
-
-	static function __init__() untyped {
-#if (js_es < 5)
-		__feature__('HxOverrides.indexOf', if( Array.prototype.indexOf ) __js__("HxOverrides").indexOf = function(a,o,i) return Array.prototype.indexOf.call(a, o, i));
-		__feature__('HxOverrides.lastIndexOf', if( Array.prototype.lastIndexOf ) __js__("HxOverrides").lastIndexOf = function(a,o,i) return Array.prototype.lastIndexOf.call(a, o, i));
-#end
-	}
+	@:pure
+	static function iter<T>(a:Array<T>):Iterator<T>
+		untyped {
+			return {
+				cur: 0,
+				arr: a,
+				hasNext: function() {
+					return __this__.cur < __this__.arr.length;
+				},
+				next: function() {
+					return __this__.arr[__this__.cur++];
+				}
+			};
+		}
 
+	static function __init__()
+		untyped {
+			#if (js_es < 5)
+			__feature__('HxOverrides.indexOf',
+				if (Array.prototype.indexOf) __js__("HxOverrides").indexOf = function(a, o, i) return Array.prototype.indexOf.call(a, o, i));
+			__feature__('HxOverrides.lastIndexOf',
+				if (Array.prototype.lastIndexOf) __js__("HxOverrides").lastIndexOf = function(a, o, i) return Array.prototype.lastIndexOf.call(a, o, i));
+			#end
+		}
 }
diff --git a/std/js/_std/Math.hx b/std/js/_std/Math.hx
index 659344fe9ae4d74983fb3e720a18cbbed1b54bcf..9e41b88ce4fb60891b4963a8704b0f83f872af92 100644
--- a/std/js/_std/Math.hx
+++ b/std/js/_std/Math.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,27 +19,24 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package;
-
 // Can't enable @:coreApi because some fields are now inline getters
 // @:coreApi
 @:keepInit
-extern class Math
-{
-	static var PI(default,null) : Float;
+extern class Math {
+	static var PI(default, null):Float;
 
-	static var NEGATIVE_INFINITY(get, null) : Float;
-	@:pure private static inline function get_NEGATIVE_INFINITY () : Float {
+	static var NEGATIVE_INFINITY(get, null):Float;
+	@:pure private static inline function get_NEGATIVE_INFINITY():Float {
 		return -(untyped __js__("Infinity"));
 	}
 
-	static var POSITIVE_INFINITY(get,null) : Float;
-	@:pure private static inline function get_POSITIVE_INFINITY () : Float {
+	static var POSITIVE_INFINITY(get, null):Float;
+	@:pure private static inline function get_POSITIVE_INFINITY():Float {
 		return (untyped __js__("Infinity"));
 	}
 
-	static var NaN(get, null) : Float;
-	@:pure private static inline function get_NaN () : Float {
+	static var NaN(get, null):Float;
+	@:pure private static inline function get_NaN():Float {
 		return (untyped __js__("NaN"));
 	}
 
@@ -56,33 +53,33 @@ extern class Math
 	@:pure static function max(a:Float, b:Float):Float;
 	@:pure static function min(a:Float, b:Float):Float;
 	@:pure static function pow(v:Float, exp:Float):Float;
-	static function random() : Float;
+	static function random():Float;
 	@:pure static function round(v:Float):Int;
 	@:pure static function sin(v:Float):Float;
 	@:pure static function sqrt(v:Float):Float;
 	@:pure static function tan(v:Float):Float;
 
-	@:pure static inline function ffloor( v : Float ) : Float {
+	@:pure static inline function ffloor(v:Float):Float {
 		return floor(v);
 	}
 
-	@:pure static inline function fceil( v : Float ) : Float {
+	@:pure static inline function fceil(v:Float):Float {
 		return ceil(v);
 	}
 
-	@:pure static inline function fround( v : Float ) : Float {
+	@:pure static inline function fround(v:Float):Float {
 		return round(v);
 	}
 
-	@:pure static inline function isFinite( f : Float ) : Bool {
+	@:pure static inline function isFinite(f:Float):Bool {
 		return (untyped __js__("isFinite"))(f);
 	}
 
-	@:pure static inline function isNaN( f : Float ) : Bool {
+	@:pure static inline function isNaN(f:Float):Bool {
 		return (untyped __js__("isNaN"))(f);
 	}
 
-	static function __init__() : Void {
+	static function __init__():Void {
 		untyped __feature__("Type.resolveClass", $hxClasses["Math"] = Math);
 	}
 }
diff --git a/std/js/_std/Reflect.hx b/std/js/_std/Reflect.hx
index f7c6f23c118f8ccc3966449a338e50f6d9b2afb0..69dda1e4a36cb1298d43d1b4980fdca64f1d5186 100644
--- a/std/js/_std/Reflect.hx
+++ b/std/js/_std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,91 +20,107 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi class Reflect {
-
 	@:pure
-	public inline static function hasField( o : Dynamic, field : String ) : Bool {
-		return untyped __js__('Object').prototype.hasOwnProperty.call(o, field);
+	public inline static function hasField(o:Dynamic, field:String):Bool {
+		return js.lib.Object.prototype.hasOwnProperty.call(o, field);
 	}
 
-	public static function field( o : Dynamic, field : String ) : Dynamic {
-		try return untyped o[field] catch( e : Dynamic ) return null;
+	@:pure
+	public static function field(o:Dynamic, field:String):Dynamic {
+		try
+			return o[cast field]
+		catch (e:Dynamic)
+			return null;
 	}
 
-	public inline static function setField( o : Dynamic, field : String, value : Dynamic ) : Void untyped {
-		o[field] = value;
+	public inline static function setField(o:Dynamic, field:String, value:Dynamic):Void {
+		o[cast field] = value;
 	}
 
-	public static function getProperty( o : Dynamic, field : String ) : Dynamic untyped {
-		var tmp;
-		return if( o == null ) __define_feature__("Reflect.getProperty",null) else if( o.__properties__ && (tmp=o.__properties__["get_"+field]) ) o[tmp]() else o[field];
-	}
+	public static function getProperty(o:Dynamic, field:String):Dynamic
+		untyped {
+			var tmp;
+			return if (o == null) __define_feature__("Reflect.getProperty",
+				null) else if (o.__properties__ && (tmp = o.__properties__["get_" + field])) o[tmp]() else o[field];
+		}
 
-	public static function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void untyped {
-		var tmp;
-		if( o.__properties__ && (tmp=o.__properties__["set_"+field]) ) o[tmp](value) else o[field] = __define_feature__("Reflect.setProperty",value);
-	}
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void
+		untyped {
+			var tmp;
+			if (o.__properties__ && (tmp = o.__properties__["set_" + field]))
+				o[tmp](value)
+			else
+				o[field] = __define_feature__("Reflect.setProperty", value);
+		}
 
-	public inline static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
-		return func.apply(o,args);
+	public inline static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic {
+		return (cast func : js.lib.Function).apply(o, args);
 	}
 
-	public static function fields( o : Dynamic ) : Array<String> {
+	public static function fields(o:Dynamic):Array<String> {
 		var a = [];
-		if (o != null) untyped {
-			var hasOwnProperty = __js__('Object').prototype.hasOwnProperty;
-			__js__("for( var f in o ) {");
-			if( f != "__id__" && f != "hx__closures__" && hasOwnProperty.call(o, f) ) a.push(f);
-			__js__("}");
-		}
+		if (o != null)
+			untyped {
+				var hasOwnProperty = js.lib.Object.prototype.hasOwnProperty;
+				__js__("for( var f in o ) {");
+				if (f != "__id__" && f != "hx__closures__" && hasOwnProperty.call(o, f))
+					a.push(f);
+				__js__("}");
+			}
 		return a;
 	}
 
-	public static function isFunction( f : Dynamic ) : Bool untyped {
-		return __js__("typeof(f)") == "function" && !(js.Boot.isClass(f) || js.Boot.isEnum(f));
+	@:access(js.Boot)
+	public static function isFunction(f:Dynamic):Bool {
+		return js.Syntax.typeof(f) == "function" && !(js.Boot.isClass(f) || js.Boot.isEnum(f));
 	}
 
-	public static function compare<T>( a : T, b : T ) : Int {
-		return ( a == b ) ? 0 : (((cast a) > (cast b)) ? 1 : -1);
+	public static function compare<T>(a:T, b:T):Int {
+		return (a == b) ? 0 : (((cast a) > (cast b)) ? 1 : -1);
 	}
 
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool {
-		if( f1 == f2 )
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
+		if (f1 == f2)
 			return true;
-		if( !isFunction(f1) || !isFunction(f2) )
+		if (!isFunction(f1) || !isFunction(f2))
 			return false;
 		return f1.scope == f2.scope && f1.method == f2.method && f1.method != null;
 	}
 
-	public static function isObject( v : Dynamic ) : Bool untyped {
-		if( v == null )
+	@:access(js.Boot)
+	public static function isObject(v:Dynamic):Bool {
+		if (v == null)
 			return false;
-		var t = __js__("typeof(v)");
-		return (t == "string" || (t == "object" && v.__enum__ == null)) || (t == "function" && (js.Boot.isClass(v) || js.Boot.isEnum(v)) != null);
+		var t = js.Syntax.typeof(v);
+		return (t == "string" || (t == "object" && v.__enum__ == null))
+			|| (t == "function" && (js.Boot.isClass(v) || js.Boot.isEnum(v)) != null);
 	}
 
-	public static function isEnumValue( v : Dynamic ) : Bool {
+	public static function isEnumValue(v:Dynamic):Bool {
 		return v != null && v.__enum__ != null;
 	}
 
-	public static function deleteField( o : Dynamic, field : String ) : Bool untyped {
-		if( !hasField(o,field) ) return false;
-		__js__("delete")(o[field]);
+	public static function deleteField(o:Dynamic, field:String):Bool {
+		if (!hasField(o, field))
+			return false;
+		js.Syntax.delete(o, field);
 		return true;
 	}
 
-	public static function copy<T>( o : T ) : T {
-		var o2 : Dynamic = {};
-		for( f in Reflect.fields(o) )
-			Reflect.setField(o2,f,Reflect.field(o,f));
+	public static function copy<T>(o:Null<T>):Null<T> {
+		if (o == null)
+			return null;
+		var o2:Dynamic = {};
+		for (f in Reflect.fields(o))
+			Reflect.setField(o2, f, Reflect.field(o, f));
 		return o2;
 	}
 
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
 		return function() {
 			var a = untyped Array.prototype.slice.call(__js__("arguments"));
 			return f(a);
 		};
 	}
-
 }
diff --git a/std/js/_std/Std.hx b/std/js/_std/Std.hx
index 9dbcb96813ebe1b54aa966c857b605503cf26b97..c0d2b4ca000308b235a3fbd5b39be6cbc9ca0dc6 100644
--- a/std/js/_std/Std.hx
+++ b/std/js/_std/Std.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,102 +19,82 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import js.Boot;
 
 @:keepInit
 @:coreApi class Std {
+	public static inline function is(v:Dynamic, t:Dynamic):Bool {
+		return @:privateAccess js.Boot.__instanceof(v, t);
+	}
 
-	public static inline function is( v : Dynamic, t : Dynamic ) : Bool {
-		return untyped js.Boot.__instanceof(v,t);
+	public static inline function downcast<T:{}, S:T>(value:T, c:Class<S>):S@:privateAccess {
+		return if (js.Boot.__downcastCheck(value, c)) cast value else null;
 	}
 
-	public static inline function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
-		return untyped __instanceof__(value, c) ? cast value : null;
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	public static inline function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return downcast(value, c);
 	}
 
 	@:pure
-	public static function string( s : Dynamic ) : String {
-		return untyped js.Boot.__string_rec(s,"");
+	public static function string(s:Dynamic):String {
+		return @:privateAccess js.Boot.__string_rec(s, "");
 	}
 
-	public static inline function int( x : Float ) : Int {
+	public static inline function int(x:Float):Int {
 		return (cast x) | 0;
 	}
 
 	@:pure
-	public static function parseInt( x : String ) : Null<Int> {
-		var v = untyped __js__("parseInt")(x, 10);
-		// parse again if hexadecimal
-		if( v == 0 && (x.charCodeAt(1) == 'x'.code || x.charCodeAt(1) == 'X'.code) )
-			v = untyped __js__("parseInt")(x);
-		if( untyped __js__("isNaN")(v) )
+	public static function parseInt(x:String):Null<Int> {
+		var v = untyped __js__('parseInt({0}, {0} && {0}[0]=="0" && ({0}[1]=="x" || {0}[1]=="X") ? 16 : 10)', x);
+		if (untyped __js__("isNaN")(v))
 			return null;
 		return cast v;
 	}
 
-	public static inline function parseFloat( x : String ) : Float {
+	public static inline function parseFloat(x:String):Float {
 		return untyped __js__("parseFloat")(x);
 	}
 
-	public static function random( x : Int ) : Int {
-		return x <= 0 ? 0 : Math.floor(Math.random()*x);
+	public static function random(x:Int):Int {
+		return x <= 0 ? 0 : Math.floor(Math.random() * x);
 	}
 
-	static function __init__() : Void untyped {
-		__feature__("js.Boot.getClass",String.prototype.__class__ = __feature__("Type.resolveClass",$hxClasses["String"] = String,String));
-		__feature__("js.Boot.isClass",String.__name__ = __feature__("Type.getClassName",["String"],true));
-		__feature__("Type.resolveClass",$hxClasses["Array"] = Array);
-		__feature__("js.Boot.isClass",Array.__name__ = __feature__("Type.getClassName",["Array"],true));
-		__feature__("Date.*", {
-			__feature__("js.Boot.getClass",__js__('Date').prototype.__class__ = __feature__("Type.resolveClass",$hxClasses["Date"] = __js__('Date'),__js__('Date')));
-			__feature__("js.Boot.isClass",__js__('Date').__name__ = ["Date"]);
-		});
-		__feature__("Int.*",{
-			var Int = __feature__("Type.resolveClass", $hxClasses["Int"] = { __name__ : ["Int"] }, { __name__ : ["Int"] });
-		});
-		__feature__("Dynamic.*",{
-			var Dynamic = __feature__("Type.resolveClass", $hxClasses["Dynamic"] = { __name__ : ["Dynamic"] }, { __name__ : ["Dynamic"] });
-		});
-		__feature__("Float.*",{
-			var Float = __feature__("Type.resolveClass", $hxClasses["Float"] = __js__("Number"), __js__("Number"));
-			Float.__name__ = ["Float"];
-		});
-		__feature__("Bool.*",{
-			var Bool = __feature__("Type.resolveEnum",$hxClasses["Bool"] = __js__("Boolean"), __js__("Boolean"));
-			Bool.__ename__ = ["Bool"];
-		});
-		__feature__("Class.*",{
-			var Class = __feature__("Type.resolveClass", $hxClasses["Class"] = { __name__ : ["Class"] }, { __name__ : ["Class"] });
-		});
-		__feature__("Enum.*",{
-			var Enum = {};
-		});
-		__feature__("Void.*",{
-			var Void = __feature__("Type.resolveEnum", $hxClasses["Void"] = { __ename__ : ["Void"] }, { __ename__ : ["Void"] });
-		});
-
-#if (js_es < 5)
-		__feature__("Array.map",
-			if( Array.prototype.map == null )
-				Array.prototype.map = function(f) {
-					var a = [];
-					for( i in 0...__this__.length )
-						a[i] = f(__this__[i]);
-					return a;
+	static function __init__():Void
+		untyped {
+			__feature__("js.Boot.getClass", String.prototype.__class__ = __feature__("Type.resolveClass", $hxClasses["String"] = String, String));
+			__feature__("js.Boot.isClass", String.__name__ = __feature__("Type.getClassName", "String", true));
+			__feature__("Type.resolveClass", $hxClasses["Array"] = Array);
+			__feature__("js.Boot.isClass", Array.__name__ = __feature__("Type.getClassName", "Array", true));
+			__feature__("Date.*", {
+				__feature__("js.Boot.getClass",
+					__js__('Date').prototype.__class__ = __feature__("Type.resolveClass", $hxClasses["Date"] = __js__('Date'), __js__('Date')));
+				__feature__("js.Boot.isClass", __js__('Date').__name__ = "Date");
+			});
+			__feature__("Int.*", __js__('var Int = { };'));
+			__feature__("Dynamic.*", __js__('var Dynamic = { };'));
+			__feature__("Float.*", __js__('var Float = Number'));
+			__feature__("Bool.*", __js__('var Bool = Boolean'));
+			__feature__("Class.*", __js__('var Class = { };'));
+			__feature__("Enum.*", __js__('var Enum = { };'));
+			#if (js_es < 5)
+			__feature__("Array.map", if (Array.prototype.map == null) Array.prototype.map = function(f) {
+				var a = [];
+				for (i in 0...__this__.length)
+					a[i] = f(__this__[i]);
+				return a;
+			});
+			__feature__("Array.filter", if (Array.prototype.filter == null) Array.prototype.filter = function(f) {
+				var a = [];
+				for (i in 0...__this__.length) {
+					var e = __this__[i];
+					if (f(e))
+						a.push(e);
 				}
-		);
-		__feature__("Array.filter",
-			if( Array.prototype.filter == null )
-				Array.prototype.filter = function(f) {
-					var a = [];
-					for( i in 0...__this__.length ) {
-						var e = __this__[i];
-						if( f(e) ) a.push(e);
-					}
-					return a;
-				}
-		);
-#end
-	}
-
+				return a;
+			});
+			#end
+		}
 }
diff --git a/std/js/_std/String.hx b/std/js/_std/String.hx
index e3c53178aee9ee2b003ddfd3fda1ef66ff09b092..da897547a505e593afaa78c72892154b3c7c1777 100644
--- a/std/js/_std/String.hx
+++ b/std/js/_std/String.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,25 +20,32 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi extern class String {
-	var length(default,null) : Int;
+	var length(default, null):Int;
 
-	function new(string:String) : Void;
-	function toUpperCase() : String;
-	function toLowerCase() : String;
-	function charAt( index : Int) : String;
-	function indexOf( str : String, ?startIndex : Int ) : Int;
-	function lastIndexOf( str : String, ?startIndex : Int ) : Int;
-	function split( delimiter : String ) : Array<String>;
-	function toString() : String;
-	function substring( startIndex : Int, ?endIndex : Int ) : String;
+	@:pure function new(string:String):Void;
+	@:pure function toUpperCase():String;
+	@:pure function toLowerCase():String;
+	@:pure function charAt(index:Int):String;
+	@:pure function indexOf(str:String, ?startIndex:Int):Int;
+	@:pure function lastIndexOf(str:String, ?startIndex:Int):Int;
+	@:pure function split(delimiter:String):Array<String>;
+	@:pure function toString():String;
+	@:pure function substring(startIndex:Int, ?endIndex:Int):String;
 
-	inline function charCodeAt( index : Int) : Null<Int> {
-		return untyped HxOverrides.cca(this, index);
+	@:pure inline function charCodeAt(index:Int):Null<Int> {
+		return @:privateAccess HxOverrides.cca(this, index);
 	}
 
-	inline function substr( pos : Int, ?len : Int ) : String {
-		return untyped HxOverrides.substr(this, pos, len);
+	@:pure inline function substr(pos:Int, ?len:Int):String {
+		return @:privateAccess HxOverrides.substr(this, pos, len);
 	}
 
-	static function fromCharCode( code : Int ) : String;
+	@:pure static inline function fromCharCode(code:Int):String {
+		return untyped __define_feature__('String.fromCharCode', js.Syntax.code("String.fromCodePoint({0})", code));
+	}
+
+	static function __init__():Void {
+		untyped __feature__('String.fromCharCode',
+			js.Syntax.code("if( String.fromCodePoint == null ) String.fromCodePoint = function(c) { return c < 0x10000 ? String.fromCharCode(c) : String.fromCharCode((c>>10)+0xD7C0)+String.fromCharCode((c&0x3FF)+0xDC00); }"));
+	}
 }
diff --git a/std/js/_std/Type.hx b/std/js/_std/Type.hx
index 45634a0a45ee019552f3f683969bc61650571458..5bf6602ccb4e1df1ddc78a46e6bdb00001de13e2 100644
--- a/std/js/_std/Type.hx
+++ b/std/js/_std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 enum ValueType {
 	TNull;
 	TInt;
@@ -27,117 +26,180 @@ enum ValueType {
 	TBool;
 	TObject;
 	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
 	TUnknown;
 }
 
 @:coreApi class Type {
+	public static inline function getClass<T>(o:T):Class<T> {
+		return @:privateAccess js.Boot.getClass(o);
+	}
 
-	public static inline function getClass<T>( o : T ) : Class<T> {
-		return if (o == null) null else @:privateAccess js.Boot.getClass(o);
-	}
-
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic> untyped {
-		if( o == null )
-			return null;
-		return o.__enum__;
-	}
-
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic> untyped {
-		return c.__super__;
-	}
-
-
-	public static function getClassName( c : Class<Dynamic> ) : String {
-		var a : Array<String> = untyped c.__name__;
-		if (a == null)
-			return null;
-		return a.join(".");
-	}
-
-	public static function getEnumName( e : Enum<Dynamic> ) : String {
-		var a : Array<String> = untyped e.__ename__;
-		return a.join(".");
-	}
-
-	public static function resolveClass( name : String ) : Class<Dynamic> untyped {
-		var cl : Class<Dynamic> = $hxClasses[name];
-		// ensure that this is a class
-		if( cl == null || !js.Boot.isClass(cl) )
-			return null;
-		return cl;
-	}
-
-	public static function resolveEnum( name : String ) : Enum<Dynamic> untyped {
-		var e : Dynamic = $hxClasses[name];
-		// ensure that this is an enum
-		if( e == null || !js.Boot.isEnum(e) )
-			return null;
-		return e;
-	}
-
-	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T untyped {
-		switch( args.length ) {
-		case 0:
-			return __new__(cl);
-		case 1:
-			return __new__(cl,args[0]);
-		case 2:
-			return __new__(cl,args[0],args[1]);
-		case 3:
-			return __new__(cl,args[0],args[1],args[2]);
-		case 4:
-			return __new__(cl,args[0],args[1],args[2],args[3]);
-		case 5:
-			return __new__(cl,args[0],args[1],args[2],args[3],args[4]);
-		case 6:
-			return __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5]);
-		case 7:
-			return __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6]);
-		case 8:
-			return __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]);
-		case 9:
-			return __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8]);
-		case 10:
-			return __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9]);
-		case 11:
-			return __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10]);
-		case 12:
-			return __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11]);
-		case 13:
-			return __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12]);
-		case 14:
-			return __new__(cl,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13]);
-		default:
-			throw "Too many arguments";
+	public static function getEnum(o:EnumValue):Enum<Dynamic>
+		untyped {
+			if (o == null)
+				return null;
+			#if js_enums_as_arrays
+			return o.__enum__;
+			#else
+			return $hxEnums[o.__enum__];
+			#end
 		}
+
+	public static inline function getSuperClass(c:Class<Dynamic>):Class<Dynamic> {
+		return untyped __define_feature__("Type.getSuperClass", c.__super__);
 	}
 
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T untyped {
-		__js__("function empty() {}; empty.prototype = cl.prototype");
-		return __js__("new empty()");
+	public static inline function getClassName(c:Class<Dynamic>):String {
+		return untyped __define_feature__("Type.getClassName", c.__name__);
 	}
 
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		var f:Dynamic = Reflect.field(e,constr);
-		if( f == null ) throw "No such constructor "+constr;
-		if( Reflect.isFunction(f) ) {
-			if( params == null ) throw "Constructor "+constr+" need parameters";
-			return Reflect.callMethod(e,f,params);
+	public static inline function getEnumName(e:Enum<Dynamic>):String {
+		return untyped __define_feature__("Type.getEnumName", e.__ename__);
+	}
+
+	#if js_enums_as_arrays
+	public static function resolveClass(name:String):Class<Dynamic>
+		untyped {
+			var cl:Class<Dynamic> = $hxClasses[name];
+			// ensure that this is a class
+			if (cl == null || !js.Boot.isClass(cl))
+				return null;
+			return cl;
 		}
-		if( params != null && params.length != 0 )
-			throw "Constructor "+constr+" does not need parameters";
+
+	public static function resolveEnum(name:String):Enum<Dynamic>
+		untyped {
+			var e:Dynamic = $hxClasses[name];
+			// ensure that this is an enum
+			if (e == null || !js.Boot.isEnum(e))
+				return null;
+			return e;
+		}
+	#else
+	public static inline function resolveClass(name:String):Class<Dynamic> {
+		return untyped __define_feature__("Type.resolveClass", $hxClasses[name]);
+	}
+
+	public static inline function resolveEnum(name:String):Enum<Dynamic> {
+		return untyped __define_feature__("Type.resolveEnum", $hxEnums[name]);
+	}
+	#end
+
+	#if (js_es < 5)
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T {
+		switch (args.length) {
+			case 0:
+				return js.Syntax.construct(cl);
+			case 1:
+				return js.Syntax.construct(cl, args[0]);
+			case 2:
+				return js.Syntax.construct(cl, args[0], args[1]);
+			case 3:
+				return js.Syntax.construct(cl, args[0], args[1], args[2]);
+			case 4:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3]);
+			case 5:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3], args[4]);
+			case 6:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3], args[4], args[5]);
+			case 7:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
+			case 8:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
+			case 9:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+			case 10:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
+			case 11:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10]);
+			case 12:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11]);
+			case 13:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11],
+					args[12]);
+			case 14:
+				return js.Syntax.construct(cl, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11],
+					args[12], args[13]);
+			default:
+				throw "Too many arguments";
+		}
+	}
+
+	public static function createEmptyInstance<T>(cl:Class<T>):T
+		untyped {
+			__js__("function empty() {}; empty.prototype = cl.prototype");
+			return __js__("new empty()");
+		}
+	#else
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T
+		untyped {
+			return untyped __js__("new ({0})", Function.prototype.bind.apply(cl, [null].concat(args)));
+		}
+
+	public static inline function createEmptyInstance<T>(cl:Class<T>):T {
+		return js.lib.Object.create((cast cl).prototype);
+	}
+	#end
+
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T {
+		var f:Dynamic = Reflect.field(e, constr);
+		if (f == null)
+			throw "No such constructor " + constr;
+		if (Reflect.isFunction(f)) {
+			if (params == null)
+				throw "Constructor " + constr + " need parameters";
+			return Reflect.callMethod(e, f, params);
+		}
+		if (params != null && params.length != 0)
+			throw "Constructor " + constr + " does not need parameters";
 		return f;
 	}
 
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
-		var c : String = (untyped e.__constructs__)[index];
-		if( c == null ) throw index+" is not a valid enum constructor index";
-		return createEnum(e,c,params);
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T {
+		var c:String = (untyped e.__constructs__)[index];
+		if (c == null)
+			throw index + " is not a valid enum constructor index";
+		return createEnum(e, c, params);
+	}
+
+	#if (js_es >= 6)
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String> {
+		var result = [];
+		while (c != null) {
+			for (name in js.lib.Object.getOwnPropertyNames((cast c).prototype)) {
+				switch name {
+					case "constructor" | "__class__" | "__properties__":
+					// skip special names
+					case _:
+						if (result.indexOf(name) == -1)
+							result.push(name);
+				}
+			}
+			c = getSuperClass(c);
+		}
+		return result;
 	}
 
-	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String> {
+	public static function getClassFields(c:Class<Dynamic>):Array<String> {
+		var a = js.lib.Object.getOwnPropertyNames(cast c);
+		a.remove("__id__");
+		a.remove("hx__closures__");
+		a.remove("__name__");
+		a.remove("__interfaces__");
+		a.remove("__isInterface__");
+		a.remove("__properties__");
+		a.remove("__instanceFields__");
+		a.remove("__super__");
+		a.remove("__meta__");
+		a.remove("prototype");
+		a.remove("name");
+		a.remove("length");
+		return a;
+	}
+	#else
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String> {
 		var a = [];
 		untyped __js__("for(var i in c.prototype) a.push(i)");
 		a.remove("__class__");
@@ -145,7 +207,7 @@ enum ValueType {
 		return a;
 	}
 
-	public static function getClassFields( c : Class<Dynamic> ) : Array<String> {
+	public static function getClassFields(c:Class<Dynamic>):Array<String> {
 		var a = Reflect.fields(c);
 		a.remove("__name__");
 		a.remove("__interfaces__");
@@ -155,74 +217,113 @@ enum ValueType {
 		a.remove("prototype");
 		return a;
 	}
+	#end
 
-	public static inline function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> {
+	public static inline function getEnumConstructs(e:Enum<Dynamic>):Array<String> {
 		return ((cast e).__constructs__ : Array<String>).copy();
 	}
 
-	public static function typeof( v : Dynamic ) : ValueType untyped {
-		switch( __js__("typeof")(v) ) {
-		case "boolean": return TBool;
-		case "string": return TClass(String);
-		case "number":
-			// this should handle all cases : NaN, +/-Inf and Floats outside range
-			if( Math.ceil(v) == v%2147483648.0 )
-				return TInt;
-			return TFloat;
-		case "object":
-			if( v == null )
-				return TNull;
-			var e = v.__enum__;
-			if( e != null )
-				return TEnum(e);
-			var c = js.Boot.getClass(v);
-			if( c != null )
-				return TClass(c);
-			return TObject;
-		case "function":
-			if( js.Boot.isClass(v) || js.Boot.isEnum(v) )
+	@:access(js.Boot)
+	public static function typeof(v:Dynamic):ValueType {
+		switch (js.Syntax.typeof(v)) {
+			case "boolean":
+				return TBool;
+			case "string":
+				return TClass(String);
+			case "number":
+				// this should handle all cases : NaN, +/-Inf and Floats outside range
+				if (Math.ceil(v) == v % 2147483648.0)
+					return TInt;
+				return TFloat;
+			case "object":
+				if (v == null)
+					return TNull;
+				var e = v.__enum__;
+				if (e != null) {
+					#if js_enums_as_arrays
+					return TEnum(e);
+					#else
+					return TEnum(untyped $hxEnums[e]);
+					#end
+				}
+				var c = js.Boot.getClass(v);
+				if (c != null)
+					return TClass(c);
 				return TObject;
-			return TFunction;
-		case "undefined":
-			return TNull;
-		default:
-			return TUnknown;
+			case "function":
+				if (js.Boot.isClass(v) || js.Boot.isEnum(v))
+					return TObject;
+				return TFunction;
+			case "undefined":
+				return TNull;
+			default:
+				return TUnknown;
 		}
 	}
 
-	public static function enumEq<T>( a : T, b : T ) : Bool untyped {
-		if( a == b )
-			return true;
-		try {
-			if( a[0] != b[0] )
-				return false;
-			for( i in 2...a.length )
-				if( !enumEq(a[i],b[i]) )
+	public static function enumEq<T:EnumValue>(a:T, b:T):Bool
+		untyped {
+			if (a == b)
+				return true;
+			try {
+				var e = a.__enum__;
+				if (e == null || e != b.__enum__)
+					return false;
+				#if js_enums_as_arrays
+				if (a[0] != b[0])
+					return false;
+				for (i in 2...a.length)
+					if (!enumEq(a[i], b[i]))
+						return false;
+				#else
+				if (a._hx_index != b._hx_index)
 					return false;
-			var e = a.__enum__;
-			if( e != b.__enum__ || e == null )
+				var enm = $hxEnums[e];
+				var ctorName = enm.__constructs__[a._hx_index];
+				var params:Array<String> = enm[ctorName].__params__;
+				for (f in params) {
+					if (!enumEq(a[f], b[f])) {
+						return false;
+					}
+				}
+				#end
+			} catch (e:Dynamic) {
 				return false;
-		} catch( e : Dynamic ) {
-			return false;
+			}
+			return true;
 		}
-		return true;
-	}
 
-	public inline static function enumConstructor( e : EnumValue ) : String {
+	public inline static function enumConstructor(e:EnumValue):String {
+		#if js_enums_as_arrays
 		return untyped e[0];
+		#else
+		return untyped $hxEnums[e.__enum__].__constructs__[e._hx_index];
+		#end
 	}
 
-	public inline static function enumParameters( e : EnumValue ) : Array<Dynamic> {
+	#if js_enums_as_arrays
+	public inline static function enumParameters(e:EnumValue):Array<Dynamic> {
 		return untyped e.slice(2);
 	}
+	#else
+	public static function enumParameters(e:EnumValue):Array<Dynamic>
+		untyped {
+			var enm:Enum<Dynamic> = $hxEnums[e.__enum__];
+			var ctorName:String = enm.__constructs__[e._hx_index];
+			var params:Array<String> = enm[ctorName].__params__;
+			return params != null ? [for (p in params) e[p]] : [];
+		}
+	#end
 
-	public inline static function enumIndex( e : EnumValue ) : Int {
+	public inline static function enumIndex(e:EnumValue):Int {
+		#if !js_enums_as_arrays
+		return untyped e._hx_index;
+		#else
 		return untyped e[1];
+		#end
 	}
 
-	public inline static function allEnums<T>( e : Enum<T> ) : Array<T> {
-		return untyped __define_feature__("Type.allEnums", e.__empty_constructs__);
+	public inline static function allEnums<T>(e:Enum<T>):Array<T> {
+		return untyped __define_feature__("Type.allEnums", e.__empty_constructs__.slice());
 	}
-
 }
-
diff --git a/std/js/_std/haxe/Json.hx b/std/js/_std/haxe/Json.hx
index fa4148407b1540fe6f65e734ab7a95a7468f227a..6e04714c263f607187c98eadd6dd90ddf372e88a 100644
--- a/std/js/_std/haxe/Json.hx
+++ b/std/js/_std/haxe/Json.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,29 +19,28 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 @:coreApi
-#if (!haxeJSON && !old_browser)
-@:native("JSON") extern
+#if !haxeJSON
+@:native("JSON")
+extern
 #end
 class Json {
-
-	#if haxeJSON inline #end
-	public static function parse( text : String ) : Dynamic {
-		return haxe.format.JsonParser.parse(text);
-	}
-
-	#if haxeJSON inline #end
-	public static function stringify( value : Dynamic, ?replacer:Dynamic -> Dynamic -> Dynamic, ?space:String ) : String {
-		return haxe.format.JsonPrinter.print(value, replacer, space);
-	}
-
-	#if (!haxeJSON && old_browser)
-	static function __init__():Void untyped {
-		if( __js__('typeof(JSON)') != 'undefined' )
-			Json = __js__('JSON');
-	}
+	#if haxeJSON
+	inline
 	#end
+	public static function parse(text:String):Dynamic
+		#if !haxeJSON; #else {
+			return haxe.format.JsonParser.parse(text);
+		} #end
 
+	#if haxeJSON
+	inline
+	#end
+	public static function stringify(value:Dynamic, ?replacer:(key:Dynamic, value:Dynamic) -> Dynamic, ?space:String):String
+		#if !haxeJSON; #else {
+			return haxe.format.JsonPrinter.print(value, replacer, space);
+		} #end
 }
diff --git a/std/js/_std/haxe/ds/IntMap.hx b/std/js/_std/haxe/ds/IntMap.hx
index 795b1936665c8f4cddfa85f1680f87c0af9a8444..d72c4e455990e7bfc764945ac8a813b2dcdce7fd 100644
--- a/std/js/_std/haxe/ds/IntMap.hx
+++ b/std/js/_std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,62 +19,82 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.ds;
 
-@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
+package haxe.ds;
 
-	private var h : Dynamic;
+@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
+	private var h:Dynamic;
 
-	public inline function new() : Void {
+	public inline function new():Void {
 		h = {};
 	}
 
-	public inline function set( key : Int, value : T ) : Void {
-		untyped h[key] = value;
+	public inline function set(key:Int, value:T):Void {
+		h[key] = value;
 	}
 
-	public inline function get( key : Int ) : Null<T> {
-		return untyped h[key];
+	public inline function get(key:Int):Null<T> {
+		return h[key];
 	}
 
-	public inline function exists( key : Int ) : Bool {
-		return untyped h.hasOwnProperty(key);
+	public inline function exists(key:Int):Bool {
+		return (cast h).hasOwnProperty(key);
 	}
 
-	public function remove( key : Int ) : Bool {
-		if( untyped !h.hasOwnProperty(key) ) return false;
-		untyped  __js__("delete")(h[key]);
+	public function remove(key:Int):Bool {
+		if (!(cast h).hasOwnProperty(key))
+			return false;
+		js.Syntax.delete(h, key);
 		return true;
 	}
 
-	public function keys() : Iterator<Int> {
+	public function keys():Iterator<Int> {
 		var a = [];
-		untyped __js__("for( var key in {0} ) {1}", h, if( h.hasOwnProperty(key) ) a.push(key|0));
+		untyped __js__("for( var key in {0} ) {1}", h, if (h.hasOwnProperty(key)) a.push(key | 0));
 		return a.iterator();
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return untyped {
-			ref : h,
-			it : keys(),
-			hasNext : function() { return __this__.it.hasNext(); },
-			next : function() { var i = __this__.it.next(); return __this__.ref[i]; }
+			ref: h,
+			it: keys(),
+			hasNext: function() {
+				return __this__.it.hasNext();
+			},
+			next: function() {
+				var i = __this__.it.next();
+				return __this__.ref[i];
+			}
 		};
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():IntMap<T> {
+		var copied = new IntMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
+	public inline function clear():Void {
+		h = {};
+	}
 }
diff --git a/std/js/_std/haxe/ds/ObjectMap.hx b/std/js/_std/haxe/ds/ObjectMap.hx
index ee103cd3ba03010eacb33581138ba0271ed28b3f..1a6f56bc8ff216a7698213d4002b40c85bf6a61f 100644
--- a/std/js/_std/haxe/ds/ObjectMap.hx
+++ b/std/js/_std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of h software and associated documentation files (the "Software"),
@@ -22,30 +22,39 @@
 
 package haxe.ds;
 
+import js.Syntax;
+import js.Lib;
+
 @:coreApi
-class ObjectMap<K:{ }, V> implements haxe.Constraints.IMap<K,V> {
+class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
+	static var count:Int;
 
-	static var count = 0;
+	// initialize count through __init__ magic, because these are generated
+	// before normal static initializations for which ObjectMap should be ready to use
+	// see https://github.com/HaxeFoundation/haxe/issues/6792
+	static inline function __init__():Void
+		count = 0;
 
-	static inline function assignId(obj: { } ):Int {
-		return untyped obj.__id__ = ++count;
+	static inline function assignId(obj:{}):Int {
+		return Syntax.code('({0}.__id__ = {1})', obj, Lib.getNextHaxeUID());
 	}
 
-	static inline function getId(obj: { } ):Int {
+	static inline function getId(obj:{}):Int {
 		return untyped obj.__id__;
 	}
 
-	var h : { };
+	var h:{};
 
-	public function new() : Void {
-		h = { __keys__: {} };
+	public function new():Void {
+		h = {__keys__: {}};
 	}
 
-	public function set(key:K, value:V):Void untyped {
-		var id : Int = getId(key) || assignId(key);
-		h[id] = value;
-		h.__keys__[id] = key;
-	}
+	public function set(key:K, value:V):Void
+		untyped {
+			var id:Int = getId(key) || assignId(key);
+			h[id] = value;
+			h.__keys__[id] = key;
+		}
 
 	public inline function get(key:K):Null<V> {
 		return untyped h[getId(key)];
@@ -55,46 +64,67 @@ class ObjectMap<K:{ }, V> implements haxe.Constraints.IMap<K,V> {
 		return untyped h.__keys__[getId(key)] != null;
 	}
 
-	public function remove( key : K ) : Bool {
+	public function remove(key:K):Bool {
 		var id = getId(key);
-		if ( untyped h.__keys__[id] == null ) return false;
-		untyped  __js__("delete")(h[id]);
-		untyped  __js__("delete")(h.__keys__[id]);
+		if (untyped h.__keys__[id] == null)
+			return false;
+		untyped __js__("delete")(h[id]);
+		untyped __js__("delete")(h.__keys__[id]);
 		return true;
 	}
 
-	public function keys() : Iterator<K> {
+	public function keys():Iterator<K> {
 		var a = [];
 		untyped {
 			__js__("for( var key in this.h.__keys__ ) {");
-				if( h.hasOwnProperty(key) )
-					a.push(h.__keys__[key]);
+			if (h.hasOwnProperty(key))
+				a.push(h.__keys__[key]);
 			__js__("}");
 		}
 		return a.iterator();
 	}
 
-	public function iterator() : Iterator<V> {
+	public function iterator():Iterator<V> {
 		return untyped {
-			ref : h,
-			it : keys(),
-			hasNext : function() { return __this__.it.hasNext(); },
-			next : function() { var i = __this__.it.next(); return __this__.ref[getId(i)]; }
+			ref: h,
+			it: keys(),
+			hasNext: function() {
+				return __this__.it.hasNext();
+			},
+			next: function() {
+				var i = __this__.it.next();
+				return __this__.ref[getId(i)];
+			}
 		};
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():ObjectMap<K, V> {
+		var copied = new ObjectMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(Std.string(i));
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
-}
\ No newline at end of file
+
+	public inline function clear():Void {
+		h = {__keys__: {}};
+	}
+}
diff --git a/std/js/_std/haxe/ds/StringMap.hx b/std/js/_std/haxe/ds/StringMap.hx
index b195328b116ef3b11e014dba002d1fa240b8d4c0..8af195dd9f689403927fdeb9f238bab3a746b730 100644
--- a/std/js/_std/haxe/ds/StringMap.hx
+++ b/std/js/_std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,130 +19,152 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 private class StringMapIterator<T> {
-	var map : StringMap<T>;
-	var keys : Array<String>;
-	var index : Int;
-	var count : Int;
+	var map:StringMap<T>;
+	var keys:Array<String>;
+	var index:Int;
+	var count:Int;
+
 	public inline function new(map:StringMap<T>, keys:Array<String>) {
 		this.map = map;
 		this.keys = keys;
 		this.index = 0;
 		this.count = keys.length;
 	}
+
 	public inline function hasNext() {
 		return index < count;
 	}
+
 	public inline function next() {
 		return map.get(keys[index++]);
 	}
 }
 
-@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String,T> {
-
-	private var h : Dynamic;
-	private var rh : Dynamic;
+@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String, T> {
+	private var h:Dynamic;
+	private var rh:Dynamic;
 
-	public inline function new() : Void {
+	public inline function new():Void {
 		h = {};
 	}
 
-	inline function isReserved(key:String) : Bool {
+	inline function isReserved(key:String):Bool {
 		return untyped __js__("__map_reserved")[key] != null;
 	}
 
-	public inline function set( key : String, value : T ) : Void {
-		if( isReserved(key) )
+	public inline function set(key:String, value:T):Void {
+		if (isReserved(key))
 			setReserved(key, value);
 		else
 			h[cast key] = value;
 	}
 
-	public inline function get( key : String ) : Null<T> {
-		if( isReserved(key) )
+	public inline function get(key:String):Null<T> {
+		if (isReserved(key))
 			return getReserved(key);
 		return h[cast key];
 	}
 
-	public inline function exists( key : String ) : Bool {
-		if( isReserved(key) )
+	public inline function exists(key:String):Bool {
+		if (isReserved(key))
 			return existsReserved(key);
 		return h.hasOwnProperty(key);
 	}
 
-	function setReserved( key : String, value : T ) : Void {
-		if( rh == null ) rh = {};
-		rh[cast "$"+key] = value;
+	function setReserved(key:String, value:T):Void {
+		if (rh == null)
+			rh = {};
+		rh[cast "$" + key] = value;
 	}
 
-	function getReserved( key : String ) : Null<T> {
-		return rh == null ? null : rh[cast "$"+key];
+	function getReserved(key:String):Null<T> {
+		return rh == null ? null : rh[cast "$" + key];
 	}
 
-	function existsReserved( key : String ) : Bool {
-		if( rh == null ) return false;
-		return untyped rh.hasOwnProperty("$"+key);
+	function existsReserved(key:String):Bool {
+		if (rh == null)
+			return false;
+		return (cast rh).hasOwnProperty("$" + key);
 	}
 
-	public function remove( key : String ) : Bool {
-		if( isReserved(key) ) {
+	public function remove(key:String):Bool {
+		if (isReserved(key)) {
 			key = "$" + key;
-			if( rh == null || !rh.hasOwnProperty(key) ) return false;
-			untyped __js__("delete")(rh[key]);
+			if (rh == null || !rh.hasOwnProperty(key))
+				return false;
+			js.Syntax.delete(rh, key);
 			return true;
 		} else {
-			if( !h.hasOwnProperty(key) )
+			if (!h.hasOwnProperty(key))
 				return false;
-			untyped __js__("delete")(h[key]);
+			js.Syntax.delete(h, key);
 			return true;
 		}
 	}
 
-	public function keys() : Iterator<String> {
+	public function keys():Iterator<String> {
 		return arrayKeys().iterator();
 	}
-	
-	function arrayKeys() : Array<String> {
+
+	function arrayKeys():Array<String> {
 		var out = [];
 		untyped {
 			__js__("for( var key in this.h ) {");
-				if( h.hasOwnProperty(key) )
-					out.push(key);
+			if (h.hasOwnProperty(key))
+				out.push(key);
 			__js__("}");
 		}
-		if( rh != null ) untyped {
-			__js__("for( var key in this.rh ) {");
-				if( key.charCodeAt(0) == "$".code )
+		if (rh != null)
+			untyped {
+				__js__("for( var key in this.rh ) {");
+				if (key.charCodeAt(0) == "$".code)
 					out.push(key.substr(1));
-			__js__("}");
-		}
+				__js__("}");
+			}
 		return out;
 	}
 
-	public inline function iterator() : Iterator<T> {
+	public inline function iterator():Iterator<T> {
 		return new StringMapIterator(this, arrayKeys());
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():StringMap<T> {
+		var copied = new StringMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var keys = arrayKeys();
-		for( i in 0...keys.length ) {
+		for (i in 0...keys.length) {
 			var k = keys[i];
 			s.add(k);
 			s.add(" => ");
 			s.add(Std.string(get(k)));
-			if( i < keys.length-1 )
+			if (i < keys.length - 1)
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
-	static function __init__() : Void {
-		untyped __js__("var __map_reserved = {};");
+	public inline function clear():Void {
+		h = {};
+		rh = null;
 	}
 
+	static function __init__():Void {
+		untyped __js__("var __map_reserved = {};");
+	}
 }
diff --git a/std/js/_std/haxe/io/ArrayBufferView.hx b/std/js/_std/haxe/io/ArrayBufferView.hx
index 0026057af28f5c4b17530758448be5fa3ee33188..058fa23f578a20273e65cf240977efc9570bf70e 100644
--- a/std/js/_std/haxe/io/ArrayBufferView.hx
+++ b/std/js/_std/haxe/io/ArrayBufferView.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,45 +19,39 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package haxe.io;
 
-typedef ArrayBufferViewData = js.html.ArrayBufferView;
+package haxe.io;
+
+typedef ArrayBufferViewData = js.lib.ArrayBufferView;
 
 abstract ArrayBufferView(ArrayBufferViewData) {
+	public var buffer(get, never):haxe.io.Bytes;
+	public var byteOffset(get, never):Int;
+	public var byteLength(get, never):Int;
 
-	public static var EMULATED(get,never) : Bool;
-	static inline function get_EMULATED() {
-		#if nodejs
-		return false;
-		#else
-		return (cast js.html.ArrayBuffer) == js.html.compat.ArrayBuffer;
-		#end
+	public inline function new(size:Int) {
+		this = new js.lib.Uint8Array(size);
 	}
 
-	public var buffer(get,never) : haxe.io.Bytes;
-	public var byteOffset(get, never) : Int;
-	public var byteLength(get, never) : Int;
+	inline function get_byteOffset()
+		return this.byteOffset;
 
-	public inline function new( size : Int ) {
-		this = new js.html.Uint8Array(size);
-	}
+	inline function get_byteLength()
+		return this.byteLength;
 
-	inline function get_byteOffset() return this.byteOffset;
-	inline function get_byteLength() return this.byteLength;
-	inline function get_buffer() : haxe.io.Bytes {
+	inline function get_buffer():haxe.io.Bytes {
 		return haxe.io.Bytes.ofData(this.buffer);
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) {
-		return fromData(new js.html.Uint8Array(this.buffer.slice(begin, length == null ? null : begin+length)));
+	public inline function sub(begin:Int, ?length:Int) {
+		return fromData(new js.lib.Uint8Array(this.buffer.slice(begin, length == null ? null : begin + length)));
 	}
 
-	public inline function getData() : ArrayBufferViewData {
+	public inline function getData():ArrayBufferViewData {
 		return this;
 	}
 
-	public static inline function fromData( a : ArrayBufferViewData ) : ArrayBufferView {
+	public static inline function fromData(a:ArrayBufferViewData):ArrayBufferView {
 		return cast a;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/js/_std/haxe/io/Bytes.hx b/std/js/_std/haxe/io/Bytes.hx
index 0f67ad8bc2966a9a129a8f31e85d82d5820f2c2f..b15e2af5c89c508079a7444ba9269595ea4ae6c3 100644
--- a/std/js/_std/haxe/io/Bytes.hx
+++ b/std/js/_std/haxe/io/Bytes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,23 +19,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.io;
 
-#if !nodejs
-import js.html.compat.Uint8Array;
-import js.html.compat.DataView;
-#end
+package haxe.io;
 
 @:coreApi
 class Bytes {
+	public var length(default, null):Int;
 
-	public var length(default,null) : Int;
-	var b : js.html.Uint8Array;
-	var data : js.html.DataView;
+	var b:js.lib.Uint8Array;
+	var data:js.lib.DataView;
 
 	function new(data:BytesData) {
 		this.length = data.byteLength;
-		this.b = new js.html.Uint8Array(data);
+		this.b = new js.lib.Uint8Array(data);
 		untyped {
 			b.bufferValue = data; // some impl does not return the same instance in .buffer
 			data.hxBytes = this;
@@ -43,121 +39,134 @@ class Bytes {
 		}
 	}
 
-	public inline function get( pos : Int ) : Int {
+	public inline function get(pos:Int):Int {
 		return b[pos];
 	}
 
-	public inline function set( pos : Int, v : Int ) : Void {
-		b[pos] = v & 0xFF; // the &0xFF is necessary for js.html.compat support
+	public inline function set(pos:Int, v:Int):Void {
+		b[pos] = v;
 	}
 
-	public function blit( pos : Int, src : Bytes, srcpos : Int, len : Int ) : Void {
-		if( pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length ) throw Error.OutsideBounds;
-		if( srcpos == 0 && len == src.b.byteLength )
-			b.set(src.b,pos);
+	public function blit(pos:Int, src:Bytes, srcpos:Int, len:Int):Void {
+		if (pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length)
+			throw Error.OutsideBounds;
+		if (srcpos == 0 && len == src.b.byteLength)
+			b.set(src.b, pos);
 		else
-			b.set(src.b.subarray(srcpos,srcpos+len),pos);
+			b.set(src.b.subarray(srcpos, srcpos + len), pos);
 	}
 
-	public function fill( pos : Int, len : Int, value : Int ) : Void {
-		for( i in 0...len )
+	public function fill(pos:Int, len:Int, value:Int):Void {
+		for (i in 0...len)
 			set(pos++, value);
 	}
 
-	public function sub( pos : Int, len : Int ) : Bytes {
-		if( pos < 0 || len < 0 || pos + len > length ) throw Error.OutsideBounds;
-		return new Bytes(b.buffer.slice(pos+b.byteOffset,pos+b.byteOffset+len));
+	public function sub(pos:Int, len:Int):Bytes {
+		if (pos < 0 || len < 0 || pos + len > length)
+			throw Error.OutsideBounds;
+		return new Bytes(b.buffer.slice(pos + b.byteOffset, pos + b.byteOffset + len));
 	}
 
-	public function compare( other : Bytes ) : Int {
+	public function compare(other:Bytes):Int {
 		var b1 = b;
 		var b2 = other.b;
 		var len = (length < other.length) ? length : other.length;
-		for( i in 0...len )
-			if( b1[i] != b2[i] )
+		for (i in 0...len)
+			if (b1[i] != b2[i])
 				return b1[i] - b2[i];
 		return length - other.length;
 	}
 
-	inline function initData() : Void {
-		if( data == null ) data = new js.html.DataView(b.buffer, b.byteOffset, b.byteLength);
+	inline function initData():Void {
+		if (data == null)
+			data = new js.lib.DataView(b.buffer, b.byteOffset, b.byteLength);
 	}
 
-	public function getDouble( pos : Int ) : Float {
+	public function getDouble(pos:Int):Float {
 		initData();
 		return data.getFloat64(pos, true);
 	}
 
-	public function getFloat( pos : Int ) : Float {
+	public function getFloat(pos:Int):Float {
 		initData();
 		return data.getFloat32(pos, true);
 	}
 
-	public function setDouble( pos : Int, v : Float ) : Void {
+	public function setDouble(pos:Int, v:Float):Void {
 		initData();
 		data.setFloat64(pos, v, true);
 	}
 
-	public function setFloat( pos : Int, v : Float ) : Void {
+	public function setFloat(pos:Int, v:Float):Void {
 		initData();
 		data.setFloat32(pos, v, true);
 	}
 
-	public function getUInt16( pos : Int ) : Int {
+	public function getUInt16(pos:Int):Int {
 		initData();
 		return data.getUint16(pos, true);
 	}
 
-	public function setUInt16( pos : Int, v : Int ) : Void {
+	public function setUInt16(pos:Int, v:Int):Void {
 		initData();
 		data.setUint16(pos, v, true);
 	}
 
-	public function getInt32( pos : Int ) : Int {
+	public function getInt32(pos:Int):Int {
 		initData();
 		return data.getInt32(pos, true);
 	}
 
-	public function setInt32( pos : Int, v : Int ) : Void {
+	public function setInt32(pos:Int, v:Int):Void {
 		initData();
 		data.setInt32(pos, v, true);
 	}
 
-	public function getInt64( pos : Int ) : haxe.Int64 {
-		return Int64.make(getInt32(pos + 4),getInt32(pos));
+	public function getInt64(pos:Int):haxe.Int64 {
+		return Int64.make(getInt32(pos + 4), getInt32(pos));
 	}
 
-	public function setInt64( pos : Int, v : haxe.Int64 ) : Void {
+	public function setInt64(pos:Int, v:haxe.Int64):Void {
 		setInt32(pos, v.low);
 		setInt32(pos + 4, v.high);
 	}
 
-	public function getString( pos : Int, len : Int ) : String {
-		if( pos < 0 || len < 0 || pos + len > length ) throw Error.OutsideBounds;
+	public function getString(pos:Int, len:Int, ?encoding:Encoding):String {
+		if (pos < 0 || len < 0 || pos + len > length)
+			throw Error.OutsideBounds;
+		if (encoding == null)
+			encoding = UTF8;
 		var s = "";
 		var b = b;
-		var fcc = String.fromCharCode;
 		var i = pos;
-		var max = pos+len;
-		// utf8-decode and utf16-encode
-		while( i < max ) {
-			var c = b[i++];
-			if( c < 0x80 ) {
-				if( c == 0 ) break;
-				s += fcc(c);
-			} else if( c < 0xE0 )
-				s += fcc( ((c & 0x3F) << 6) | (b[i++] & 0x7F) );
-			else if( c < 0xF0 ) {
-				var c2 = b[i++];
-				s += fcc( ((c & 0x1F) << 12) | ((c2 & 0x7F) << 6) | (b[i++] & 0x7F) );
-			} else {
-				var c2 = b[i++];
-				var c3 = b[i++];
-				var u = ((c & 0x0F) << 18) | ((c2 & 0x7F) << 12) | ((c3 & 0x7F) << 6) | (b[i++] & 0x7F);
-				// surrogate pair
-				s += fcc( (u >> 10) + 0xD7C0 );
-				s += fcc( (u & 0x3FF) | 0xDC00 );
-			}
+		var max = pos + len;
+		switch (encoding) {
+			case UTF8:
+				var debug = pos > 0;
+				// utf8-decode and utf16-encode
+				while (i < max) {
+					var c = b[i++];
+					if (c < 0x80) {
+						if (c == 0)
+							break;
+						s += String.fromCharCode(c);
+					} else if (c < 0xE0)
+						s += String.fromCharCode(((c & 0x3F) << 6) | (b[i++] & 0x7F));
+					else if (c < 0xF0) {
+						var c2 = b[i++];
+						s += String.fromCharCode(((c & 0x1F) << 12) | ((c2 & 0x7F) << 6) | (b[i++] & 0x7F));
+					} else {
+						var c2 = b[i++];
+						var c3 = b[i++];
+						var u = ((c & 0x0F) << 18) | ((c2 & 0x7F) << 12) | ((c3 & 0x7F) << 6) | (b[i++] & 0x7F);
+						s += String.fromCharCode(u);
+					}
+				}
+			case RawNative:
+				while (i < max) {
+					var c = b[i++] | (b[i++] << 8);
+					s += String.fromCharCode(c);
+				}
 		}
 		return s;
 	}
@@ -168,17 +177,17 @@ class Bytes {
 		return getString(pos, len);
 	}
 
-	public function toString() : String {
-		return getString(0,length);
+	public function toString():String {
+		return getString(0, length);
 	}
 
-	public function toHex() : String {
+	public function toHex():String {
 		var s = new StringBuf();
 		var chars = [];
 		var str = "0123456789abcdef";
-		for( i in 0...str.length )
+		for (i in 0...str.length)
 			chars.push(str.charCodeAt(i));
-		for( i in 0...length ) {
+		for (i in 0...length) {
 			var c = get(i);
 			s.addChar(chars[c >> 4]);
 			s.addChar(chars[c & 15]);
@@ -186,51 +195,78 @@ class Bytes {
 		return s.toString();
 	}
 
-	public inline function getData() : BytesData {
+	public inline function getData():BytesData {
 		return untyped b.bufferValue;
 	}
 
-	public static inline function alloc( length : Int ) : Bytes {
+	public static inline function alloc(length:Int):Bytes {
 		return new Bytes(new BytesData(length));
 	}
 
-	public static function ofString( s : String ) : Bytes {
+	public static function ofString(s:String, ?encoding:Encoding):Bytes {
+		if (encoding == RawNative) {
+			var buf = new js.lib.Uint8Array(s.length << 1);
+			for (i in 0...s.length) {
+				var c:Int = StringTools.fastCodeAt(s, i);
+				buf[i << 1] = c & 0xFF;
+				buf[(i << 1) | 1] = c >> 8;
+			}
+			return new Bytes(buf.buffer);
+		}
 		var a = new Array();
 		// utf16-decode and utf8-encode
 		var i = 0;
-		while( i < s.length ) {
-			var c : Int = StringTools.fastCodeAt(s,i++);
+		while (i < s.length) {
+			var c:Int = StringTools.fastCodeAt(s, i++);
 			// surrogate pair
-			if( 0xD800 <= c && c <= 0xDBFF )
-			    c = (c - 0xD7C0 << 10) | (StringTools.fastCodeAt(s,i++) & 0x3FF);
-			if( c <= 0x7F )
+			if (0xD800 <= c && c <= 0xDBFF)
+				c = (c - 0xD7C0 << 10) | (StringTools.fastCodeAt(s, i++) & 0x3FF);
+			if (c <= 0x7F)
 				a.push(c);
-			else if( c <= 0x7FF ) {
-				a.push( 0xC0 | (c >> 6) );
-				a.push( 0x80 | (c & 63) );
-			} else if( c <= 0xFFFF ) {
-				a.push( 0xE0 | (c >> 12) );
-				a.push( 0x80 | ((c >> 6) & 63) );
-				a.push( 0x80 | (c & 63) );
+			else if (c <= 0x7FF) {
+				a.push(0xC0 | (c >> 6));
+				a.push(0x80 | (c & 63));
+			} else if (c <= 0xFFFF) {
+				a.push(0xE0 | (c >> 12));
+				a.push(0x80 | ((c >> 6) & 63));
+				a.push(0x80 | (c & 63));
 			} else {
-				a.push( 0xF0 | (c >> 18) );
-				a.push( 0x80 | ((c >> 12) & 63) );
-				a.push( 0x80 | ((c >> 6) & 63) );
-				a.push( 0x80 | (c & 63) );
+				a.push(0xF0 | (c >> 18));
+				a.push(0x80 | ((c >> 12) & 63));
+				a.push(0x80 | ((c >> 6) & 63));
+				a.push(0x80 | (c & 63));
 			}
 		}
-		return new Bytes(new js.html.Uint8Array(a).buffer);
+		return new Bytes(new js.lib.Uint8Array(a).buffer);
 	}
 
-	public static function ofData( b : BytesData ) : Bytes {
+	public static function ofData(b:BytesData):Bytes {
 		var hb = untyped b.hxBytes;
-		if( hb != null ) return hb;
+		if (hb != null)
+			return hb;
 		return new Bytes(b);
 	}
 
-	public inline static function fastGet( b : BytesData, pos : Int ) : Int {
+	public static function ofHex(s:String):Bytes {
+		if ((s.length & 1) != 0)
+			throw "Not a hex string (odd number of digits)";
+		var a = new Array();
+		var i = 0;
+		var len = s.length >> 1;
+		while (i < len) {
+			var high = StringTools.fastCodeAt(s, i * 2);
+			var low = StringTools.fastCodeAt(s, i * 2 + 1);
+			high = (high & 0xF) + ((high & 0x40) >> 6) * 9;
+			low = (low & 0xF) + ((low & 0x40) >> 6) * 9;
+			a.push(((high << 4) | low) & 0xFF);
+			i++;
+		}
+
+		return new Bytes(new js.lib.Uint8Array(a).buffer);
+	}
+
+	public inline static function fastGet(b:BytesData, pos:Int):Int {
 		// this requires that we have wrapped it with haxe.io.Bytes beforehand
 		return untyped b.bytes[pos];
 	}
-
 }
diff --git a/std/js/_std/haxe/io/BytesBuffer.hx b/std/js/_std/haxe/io/BytesBuffer.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5945943dd6a2c786a34dac4c607fc76aa44faeb8
--- /dev/null
+++ b/std/js/_std/haxe/io/BytesBuffer.hx
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.io;
+
+@:coreApi
+class BytesBuffer {
+	var buffer:js.lib.ArrayBuffer;
+	var view:js.lib.DataView;
+	var u8:js.lib.Uint8Array;
+	var pos:Int;
+	var size:Int;
+
+	public var length(get, never):Int;
+
+	public function new() {
+		pos = 0;
+		size = 0;
+	}
+
+	inline function get_length():Int {
+		return pos;
+	}
+
+	public function addByte(byte:Int):Void {
+		if (pos == size)
+			grow(1);
+		view.setUint8(pos++, byte);
+	}
+
+	public function add(src:Bytes):Void {
+		if (pos + src.length > size)
+			grow(src.length);
+		if (size == 0)
+			return;
+		var sub = new js.lib.Uint8Array(@:privateAccess src.b.buffer, @:privateAccess src.b.byteOffset, src.length);
+		u8.set(sub, pos);
+		pos += src.length;
+	}
+
+	public function addString(v:String, ?encoding:Encoding):Void {
+		add(Bytes.ofString(v, encoding));
+	}
+
+	public function addInt32(v:Int):Void {
+		if (pos + 4 > size)
+			grow(4);
+		view.setInt32(pos, v, true);
+		pos += 4;
+	}
+
+	public function addInt64(v:haxe.Int64):Void {
+		if (pos + 8 > size)
+			grow(8);
+		view.setInt32(pos, v.low, true);
+		view.setInt32(pos + 4, v.high, true);
+		pos += 8;
+	}
+
+	public function addFloat(v:Float):Void {
+		if (pos + 4 > size)
+			grow(4);
+		view.setFloat32(pos, v, true);
+		pos += 4;
+	}
+
+	public function addDouble(v:Float):Void {
+		if (pos + 8 > size)
+			grow(8);
+		view.setFloat64(pos, v, true);
+		pos += 8;
+	}
+
+	public function addBytes(src:Bytes, pos:Int, len:Int):Void {
+		if (pos < 0 || len < 0 || pos + len > src.length)
+			throw Error.OutsideBounds;
+		if (this.pos + len > size)
+			grow(len);
+		if (size == 0)
+			return;
+		var sub = new js.lib.Uint8Array(@:privateAccess src.b.buffer, @:privateAccess src.b.byteOffset + pos, len);
+		u8.set(sub, this.pos);
+		this.pos += len;
+	}
+
+	function grow(delta:Int):Void {
+		var req = pos + delta;
+		var nsize = size == 0 ? 16 : size;
+		while (nsize < req)
+			nsize = (nsize * 3) >> 1;
+		var nbuf = new js.lib.ArrayBuffer(nsize);
+		var nu8 = new js.lib.Uint8Array(nbuf);
+		if (size > 0)
+			nu8.set(u8);
+		size = nsize;
+		buffer = nbuf;
+		u8 = nu8;
+		view = new js.lib.DataView(buffer);
+	}
+
+	public function getBytes():Bytes@:privateAccess {
+		if (size == 0)
+			return haxe.io.Bytes.alloc(0);
+		var b = new Bytes(buffer);
+		b.length = pos;
+		return b;
+	}
+}
diff --git a/std/js/_std/haxe/io/Float32Array.hx b/std/js/_std/haxe/io/Float32Array.hx
index fb065ef08d2193b813b11ad4efd1468fd5f93287..96ff04049819441e858650302fe812e59c32b39d 100644
--- a/std/js/_std/haxe/io/Float32Array.hx
+++ b/std/js/_std/haxe/io/Float32Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,71 +19,70 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.io;
 
-#if !nodejs
-import js.html.compat.Float32Array;
-#end
+package haxe.io;
 
-typedef Float32ArrayData = js.html.Float32Array;
+typedef Float32ArrayData = js.lib.Float32Array;
 
 @:coreApi
 abstract Float32Array(Float32ArrayData) {
-
 	public static inline var BYTES_PER_ELEMENT = 4;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
 
-	public inline function new( elements : Int ) : Void {
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
+
+	public inline function new(elements:Int):Void {
 		this = new Float32ArrayData(elements);
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return this.length;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : Float {
+	@:arrayAccess public inline function get(index:Int):Float {
 		return this[index];
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : Float ) : Float {
+	@:arrayAccess public inline function set(index:Int, value:Float):Float {
 		return this[index] = value;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : Float32Array {
-		return fromData(this.subarray(begin, length == null ? this.length : begin+length));
+	public inline function sub(begin:Int, ?length:Int):Float32Array {
+		return fromData(this.subarray(begin, length == null ? this.length : begin + length));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : Float32Array {
+	public inline function subarray(?begin:Int, ?end:Int):Float32Array {
 		return fromData(this.subarray(begin, end));
 	}
 
-	public inline function getData() : Float32ArrayData {
+	public inline function getData():Float32ArrayData {
 		return this;
 	}
 
-	public inline static function fromData( d : Float32ArrayData ) : Float32Array {
+	public inline static function fromData(d:Float32ArrayData):Float32Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<Float>, pos : Int = 0, ?length : Int ) : Float32Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
-		if( pos == 0 && length == a.length )
+	public static function fromArray(a:Array<Float>, pos:Int = 0, ?length:Int):Float32Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
+		if (pos == 0 && length == a.length)
 			return fromData(new Float32ArrayData(a));
 		var i = new Float32Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos : Int = 0, ?length : Int ) : Float32Array {
-		if( length == null ) length = (bytes.length - bytePos) >> 2;
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos:Int = 0, ?length:Int):Float32Array {
+		if (length == null)
+			length = (bytes.length - bytePos) >> 2;
 		return fromData(new Float32ArrayData(bytes.getData(), bytePos, length));
 	}
 }
-
diff --git a/std/js/_std/haxe/io/Float64Array.hx b/std/js/_std/haxe/io/Float64Array.hx
index bf0fd36ba4428b66316cbcaa70488b8a43bc79a0..a363a43d6578a4c39d0fb2fc4844646d62a9762d 100644
--- a/std/js/_std/haxe/io/Float64Array.hx
+++ b/std/js/_std/haxe/io/Float64Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,71 +19,70 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.io;
 
-#if !nodejs
-import js.html.compat.Float64Array;
-#end
+package haxe.io;
 
-typedef Float64ArrayData = js.html.Float64Array;
+typedef Float64ArrayData = js.lib.Float64Array;
 
 @:coreApi
 abstract Float64Array(Float64ArrayData) {
+	public static inline var BYTES_PER_ELEMENT = 8;
 
-	public static inline var BYTES_PER_ELEMENT = 4;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
 
-	public inline function new( elements : Int ) : Void {
+	public inline function new(elements:Int):Void {
 		this = new Float64ArrayData(elements);
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return this.length;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : Float {
+	@:arrayAccess public inline function get(index:Int):Float {
 		return this[index];
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : Float ) : Float {
+	@:arrayAccess public inline function set(index:Int, value:Float):Float {
 		return this[index] = value;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : Float64Array {
-		return fromData(this.subarray(begin, length == null ? this.length : begin+length));
+	public inline function sub(begin:Int, ?length:Int):Float64Array {
+		return fromData(this.subarray(begin, length == null ? this.length : begin + length));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : Float64Array {
+	public inline function subarray(?begin:Int, ?end:Int):Float64Array {
 		return fromData(this.subarray(begin, end));
 	}
 
-	public inline function getData() : Float64ArrayData {
+	public inline function getData():Float64ArrayData {
 		return this;
 	}
 
-	public static inline function fromData( d : Float64ArrayData ) : Float64Array {
+	public static inline function fromData(d:Float64ArrayData):Float64Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<Float>, pos : Int = 0, ?length : Int ) : Float64Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
-		if( pos == 0 && length == a.length )
+	public static function fromArray(a:Array<Float>, pos:Int = 0, ?length:Int):Float64Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
+		if (pos == 0 && length == a.length)
 			return fromData(new Float64ArrayData(a));
 		var i = new Float64Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos : Int = 0, ?length : Int ) : Float64Array {
-		if( length == null ) length = (bytes.length - bytePos) >> 3;
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos:Int = 0, ?length:Int):Float64Array {
+		if (length == null)
+			length = (bytes.length - bytePos) >> 3;
 		return fromData(new Float64ArrayData(bytes.getData(), bytePos, length));
 	}
 }
-
diff --git a/std/js/_std/haxe/io/Int32Array.hx b/std/js/_std/haxe/io/Int32Array.hx
index dc0f045ba4b2adfe4a75d99de09fe1db206be8ec..6a982c864d014c6f33d3221edacfb9da0308b9e1 100644
--- a/std/js/_std/haxe/io/Int32Array.hx
+++ b/std/js/_std/haxe/io/Int32Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,68 +19,70 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
-typedef Int32ArrayData = js.html.Int32Array;
+typedef Int32ArrayData = js.lib.Int32Array;
 
 @:coreApi
 abstract Int32Array(Int32ArrayData) {
+	public static inline var BYTES_PER_ELEMENT = 4;
 
-	public static inline var BYTES_PER_ELEMENT = 1;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
 
-	public inline function new( elements : Int ) {
-		this = new Int32ArrayData(elements * BYTES_PER_ELEMENT);
+	public inline function new(elements:Int) {
+		this = new Int32ArrayData(elements);
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return this.length;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : Int {
+	@:arrayAccess public inline function get(index:Int):Int {
 		return this[index];
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : Int ) : Int {
-		return this[index] = value | 0; // necessary for html compat
+	@:arrayAccess public inline function set(index:Int, value:Int):Int {
+		return this[index] = value;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : Int32Array {
-		return fromData(this.subarray(begin, length == null ? this.length : begin+length));
+	public inline function sub(begin:Int, ?length:Int):Int32Array {
+		return fromData(this.subarray(begin, length == null ? this.length : begin + length));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : Int32Array {
+	public inline function subarray(?begin:Int, ?end:Int):Int32Array {
 		return fromData(this.subarray(begin, end));
 	}
 
-	public inline function getData() : Int32ArrayData {
+	public inline function getData():Int32ArrayData {
 		return this;
 	}
 
-	public static inline function fromData( d : Int32ArrayData ) : Int32Array {
+	public static inline function fromData(d:Int32ArrayData):Int32Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<Int>, pos : Int = 0, ?length : Int ) : Int32Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
-		if( pos == 0 && length == a.length )
+	public static function fromArray(a:Array<Int>, pos:Int = 0, ?length:Int):Int32Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
+		if (pos == 0 && length == a.length)
 			return fromData(new Int32ArrayData(a));
 		var i = new Int32Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos : Int = 0, ?length : Int ) : Int32Array {
-		if( length == null ) length = (bytes.length - bytePos) >> 2;
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos:Int = 0, ?length:Int):Int32Array {
+		if (length == null)
+			length = (bytes.length - bytePos) >> 2;
 		return fromData(new Int32ArrayData(bytes.getData(), bytePos, length));
 	}
-
 }
-
diff --git a/std/js/_std/haxe/io/UInt16Array.hx b/std/js/_std/haxe/io/UInt16Array.hx
index 62eb8be3673e2b1834933e45bb4173eb47659eea..3d14faf7437f213ba2c205faffc721a18ef34c23 100644
--- a/std/js/_std/haxe/io/UInt16Array.hx
+++ b/std/js/_std/haxe/io/UInt16Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,68 +19,70 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
-typedef UInt16ArrayData = js.html.Uint16Array;
+typedef UInt16ArrayData = js.lib.Uint16Array;
 
 @:coreApi
 abstract UInt16Array(UInt16ArrayData) {
-
 	public static inline var BYTES_PER_ELEMENT = 2;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
 
-	public inline function new( elements : Int ) {
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
+
+	public inline function new(elements:Int) {
 		this = new UInt16ArrayData(elements);
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return this.length;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : Int {
+	@:arrayAccess public inline function get(index:Int):Int {
 		return this[index];
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : Int ) : Int {
-		return this[index] = value & 0xFFFF; // &0xFFFF necessary for html compat
+	@:arrayAccess public inline function set(index:Int, value:Int):Int {
+		return this[index] = value;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : UInt16Array {
-		return fromData(this.subarray(begin, length == null ? this.length : begin+length));
+	public inline function sub(begin:Int, ?length:Int):UInt16Array {
+		return fromData(this.subarray(begin, length == null ? this.length : begin + length));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : UInt16Array {
+	public inline function subarray(?begin:Int, ?end:Int):UInt16Array {
 		return fromData(this.subarray(begin, end));
 	}
 
-	public inline function getData() : UInt16ArrayData {
+	public inline function getData():UInt16ArrayData {
 		return this;
 	}
 
-	public static inline function fromData( d : UInt16ArrayData ) : UInt16Array {
+	public static inline function fromData(d:UInt16ArrayData):UInt16Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<Int>, pos : Int = 0, ?length : Int ) : UInt16Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
-		if( pos == 0 && length == a.length )
+	public static function fromArray(a:Array<Int>, pos:Int = 0, ?length:Int):UInt16Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
+		if (pos == 0 && length == a.length)
 			return fromData(new UInt16ArrayData(a));
 		var i = new UInt16Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos : Int = 0, ?length : Int ) : UInt16Array {
-		if( length == null ) length = (bytes.length - bytePos) >> 1;
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos:Int = 0, ?length:Int):UInt16Array {
+		if (length == null)
+			length = (bytes.length - bytePos) >> 1;
 		return fromData(new UInt16ArrayData(bytes.getData(), bytePos, length));
 	}
-
 }
-
diff --git a/std/js/_std/haxe/io/UInt32Array.hx b/std/js/_std/haxe/io/UInt32Array.hx
index 87c9a910a3083ecc08d49144f6af8ce6dfdfcf9b..dde9ef191758328f61709de3bca0f19fe2a78bec 100644
--- a/std/js/_std/haxe/io/UInt32Array.hx
+++ b/std/js/_std/haxe/io/UInt32Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,68 +19,70 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
-typedef UInt32ArrayData = js.html.Uint32Array;
+typedef UInt32ArrayData = js.lib.Uint32Array;
 
 @:coreApi
 abstract UInt32Array(UInt32ArrayData) {
-
 	public static inline var BYTES_PER_ELEMENT = 4;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
 
-	public inline function new( elements : Int ) {
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
+
+	public inline function new(elements:Int) {
 		this = new UInt32ArrayData(elements);
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return this.length;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : UInt {
+	@:arrayAccess public inline function get(index:Int):UInt {
 		return this[index];
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : UInt ) : UInt {
-		return this[index] = value | 0; // necessary for html compat
+	@:arrayAccess public inline function set(index:Int, value:UInt):UInt {
+		return this[index] = value;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : UInt32Array {
-		return fromData(this.subarray(begin, length == null ? this.length : begin+length));
+	public inline function sub(begin:Int, ?length:Int):UInt32Array {
+		return fromData(this.subarray(begin, length == null ? this.length : begin + length));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : UInt32Array {
+	public inline function subarray(?begin:Int, ?end:Int):UInt32Array {
 		return fromData(this.subarray(begin, end));
 	}
 
-	public inline function getData() : UInt32ArrayData {
+	public inline function getData():UInt32ArrayData {
 		return this;
 	}
 
-	public static inline function fromData( d : UInt32ArrayData ) : UInt32Array {
+	public static inline function fromData(d:UInt32ArrayData):UInt32Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<UInt>, pos : Int = 0, ?length : Int ) : UInt32Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
-		if( pos == 0 && length == a.length )
+	public static function fromArray(a:Array<UInt>, pos:Int = 0, ?length:Int):UInt32Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
+		if (pos == 0 && length == a.length)
 			return fromData(new UInt32ArrayData(a));
 		var i = new UInt32Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos : Int = 0, ?length : Int ) : UInt32Array {
-		if( length == null ) length = (bytes.length - bytePos) >> 2;
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos:Int = 0, ?length:Int):UInt32Array {
+		if (length == null)
+			length = (bytes.length - bytePos) >> 2;
 		return fromData(new UInt32ArrayData(bytes.getData(), bytePos, length));
 	}
-
 }
-
diff --git a/std/js/_std/haxe/io/UInt8Array.hx b/std/js/_std/haxe/io/UInt8Array.hx
index cc781fc2af18cc2a305a7c2035875ebbbee1eacb..1503ff76c17875ba5b9bf611e753f8747bc94241 100644
--- a/std/js/_std/haxe/io/UInt8Array.hx
+++ b/std/js/_std/haxe/io/UInt8Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,68 +19,70 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
-typedef UInt8ArrayData = js.html.Uint8Array;
+typedef UInt8ArrayData = js.lib.Uint8Array;
 
 @:coreApi
 abstract UInt8Array(UInt8ArrayData) {
-
 	public static inline var BYTES_PER_ELEMENT = 1;
-	public var length(get,never) : Int;
-	public var view(get,never) : ArrayBufferView;
 
-	public inline function new( elements : Int ) {
+	public var length(get, never):Int;
+	public var view(get, never):ArrayBufferView;
+
+	public inline function new(elements:Int) {
 		this = new UInt8ArrayData(elements);
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return this.length;
 	}
 
-	public inline function get_view() : ArrayBufferView {
+	public inline function get_view():ArrayBufferView {
 		return ArrayBufferView.fromData(this);
 	}
 
-	@:arrayAccess public inline function get( index : Int ) : Int {
+	@:arrayAccess public inline function get(index:Int):Int {
 		return this[index];
 	}
 
-	@:arrayAccess public inline function set( index : Int, value : Int ) : Int {
-		return this[index] = value & 0xFF; // &0xFF necessary for html compat
+	@:arrayAccess public inline function set(index:Int, value:Int):Int {
+		return this[index] = value;
 	}
 
-	public inline function sub( begin : Int, ?length : Int ) : UInt8Array {
-		return fromData(this.subarray(begin, length == null ? this.length : begin+length));
+	public inline function sub(begin:Int, ?length:Int):UInt8Array {
+		return fromData(this.subarray(begin, length == null ? this.length : begin + length));
 	}
 
-	public inline function subarray( ?begin : Int, ?end : Int ) : UInt8Array {
+	public inline function subarray(?begin:Int, ?end:Int):UInt8Array {
 		return fromData(this.subarray(begin, end));
 	}
 
-	public inline function getData() : UInt8ArrayData {
+	public inline function getData():UInt8ArrayData {
 		return this;
 	}
 
-	public static inline function fromData( d : UInt8ArrayData ) : UInt8Array {
+	public static inline function fromData(d:UInt8ArrayData):UInt8Array {
 		return cast d;
 	}
 
-	public static function fromArray( a : Array<Int>, pos : Int = 0, ?length : Int ) : UInt8Array {
-		if( length == null ) length = a.length - pos;
-		if( pos < 0 || length < 0 || pos + length > a.length ) throw Error.OutsideBounds;
-		if( pos == 0 && length == a.length )
+	public static function fromArray(a:Array<Int>, pos:Int = 0, ?length:Int):UInt8Array {
+		if (length == null)
+			length = a.length - pos;
+		if (pos < 0 || length < 0 || pos + length > a.length)
+			throw Error.OutsideBounds;
+		if (pos == 0 && length == a.length)
 			return fromData(new UInt8ArrayData(a));
 		var i = new UInt8Array(a.length);
-		for( idx in 0...length )
+		for (idx in 0...length)
 			i[idx] = a[idx + pos];
 		return i;
 	}
 
-	public static function fromBytes( bytes : haxe.io.Bytes, bytePos : Int = 0, ?length : Int ) : UInt8Array {
-		if( length == null ) length = bytes.length - bytePos;
+	public static function fromBytes(bytes:haxe.io.Bytes, bytePos:Int = 0, ?length:Int):UInt8Array {
+		if (length == null)
+			length = bytes.length - bytePos;
 		return fromData(new UInt8ArrayData(bytes.getData(), bytePos, length));
 	}
-
 }
-
diff --git a/std/js/html/AbortController.hx b/std/js/html/AbortController.hx
new file mode 100644
index 0000000000000000000000000000000000000000..86e60a23ac15d326acdb33e3886637c0c1016d12
--- /dev/null
+++ b/std/js/html/AbortController.hx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\AbortController.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `AbortController` interface represents a controller object that allows you to abort one or more DOM requests as and when desired.
+
+	Documentation [AbortController](https://developer.mozilla.org/en-US/docs/Web/API/AbortController) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AbortController$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/AbortController>
+**/
+@:native("AbortController")
+extern class AbortController {
+	
+	/**
+		Returns a `AbortSignal` object instance, which can be used to communicate with/abort a DOM request.
+	**/
+	var signal(default,null) : AbortSignal;
+	
+	/** @throws DOMError */
+	function new() : Void;
+	
+	/**
+		Aborts a DOM request before it has completed. This is able to abort fetch requests, consumption of any response `Body`, and streams.
+	**/
+	function abort() : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/AbortSignal.hx b/std/js/html/AbortSignal.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d7cadb477bb1b4e660e4774c33b366db8c32fe1f
--- /dev/null
+++ b/std/js/html/AbortSignal.hx
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\AbortSignal.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `AbortSignal` interface represents a signal object that allows you to communicate with a DOM request (such as a Fetch) and abort it if required via an `AbortController` object.
+
+	Documentation [AbortSignal](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal>
+**/
+@:native("AbortSignal")
+extern class AbortSignal extends EventTarget {
+	
+	/**
+		A `Boolean` that indicates whether the request(s) the signal is communicating with is/are aborted (`true`) or not (`false`).
+	**/
+	var aborted(default,null) : Bool;
+	
+	/**
+		Invoked when an `abort_(dom_abort_api)` event fires, i.e. when the DOM request(s) the signal is communicating with is/are aborted.
+	**/
+	var onabort : haxe.Constraints.Function;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/AddEventListenerOptions.hx b/std/js/html/AddEventListenerOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..edabb701f0f86eca69bd865255e150728221a062
--- /dev/null
+++ b/std/js/html/AddEventListenerOptions.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\EventTarget.webidl. Do not edit!
+
+package js.html;
+
+typedef AddEventListenerOptions = EventListenerOptions & {
+	var ?once : Bool;
+	var ?passive : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/AlignSetting.hx b/std/js/html/AlignSetting.hx
index 8f7ed57742b875532f93918f4ee83a80e8ea3744..b21c8f414c3f95989ae8df336ae14b30b55dfeae 100644
--- a/std/js/html/AlignSetting.hx
+++ b/std/js/html/AlignSetting.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,9 @@
 
 package js.html;
 
-@:enum abstract AlignSetting(String)
-{
+enum abstract AlignSetting(String) {
 	var START = "start";
-	var MIDDLE = "middle";
+	var CENTER = "center";
 	var END = "end";
 	var LEFT = "left";
 	var RIGHT = "right";
diff --git a/std/js/html/AnchorElement.hx b/std/js/html/AnchorElement.hx
index 951c3115f075b93a014943355386718209a8c12c..4903c4109160e7f790e89c0b421b8632c9cd0e67 100644
--- a/std/js/html/AnchorElement.hx
+++ b/std/js/html/AnchorElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `HTMLAnchorElement` interface represents hyperlink elements and provides special properties and methods (beyond those of the regular `HTMLElement` object interface they also have available to them by inheritance) for manipulating the layout and presentation of such elements.
+	The `HTMLAnchorElement` interface represents hyperlink elements and provides special properties and methods (beyond those of the regular `HTMLElement` object interface that they inherit from) for manipulating the layout and presentation of such elements.
 
 	Documentation [HTMLAnchorElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement>
 **/
 @:native("HTMLAnchorElement")
-extern class AnchorElement extends Element
-{
+extern class AnchorElement extends Element {
 	
 	/**
 		Is a `DOMString` that reflects the `target` HTML attribute, indicating where to display the linked resource.
@@ -41,7 +40,7 @@ extern class AnchorElement extends Element
 	var target : String;
 	
 	/**
-		Is a `DOMString` indicating that the linked resource is intended to be downloaded rather than displayed in the browser. The value represent the proposed name of the file. If the name is not a valid filename of the underlying OS, browser will adapt it. The value is a URL with a scheme like `http:`, `file:`, `data:` or even `blob:` (created with `URL.createObjectURL`).
+		Is a `DOMString` indicating that the linked resource is intended to be downloaded rather than displayed in the browser. The value represent the proposed name of the file. If the name is not a valid filename of the underlying OS, browser will adapt it.
 	**/
 	var download : String;
 	var ping : String;
@@ -51,6 +50,11 @@ extern class AnchorElement extends Element
 	**/
 	var rel : String;
 	
+	/**
+		Is a `DOMString` that reflects the `referrerpolicy` HTML attribute indicating which referrer to use.
+	**/
+	var referrerPolicy : String;
+	
 	/**
 		Returns a `DOMTokenList` that reflects the `rel` HTML attribute, as a list of tokens.
 	**/
@@ -88,6 +92,8 @@ extern class AnchorElement extends Element
 	
 	/**
 		Is a `DOMString` representing that the `rev` HTML attribute, specifying the relationship of the link object to the target object.
+		 Note: Currently the W3C HTML 5.2 spec states that `rev` is no longer obsolete, whereas the WHATWG living standard still has it labeled obsolete. Until this discrepancy is resolved, you should still assume it is obsolete.
+		 
 	**/
 	var rev : String;
 	
diff --git a/std/js/html/Animation.hx b/std/js/html/Animation.hx
index ca489992a8904f7bb1af15840ea78c5112722e81..fbaab563fb4b5f729ad8a75b9f56e433702e0044 100644
--- a/std/js/html/Animation.hx
+++ b/std/js/html/Animation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `Animation` interface of the Web Animations API represents a single animation player and provides playback controls and a timeline for an animation node or source.
 
@@ -32,93 +34,102 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Animation>
 **/
 @:native("Animation")
-extern class Animation extends EventTarget
-{
-	
+extern class Animation extends EventTarget {
+
 	/**
 		Gets and sets the `String` used to identify the animation.
 	**/
 	var id : String;
-	
+
 	/**
 		Gets and sets the `AnimationEffectReadOnly` associated with this animation. This will usually be a `KeyframeEffect` object.
 	**/
-	var effect(default,null) : AnimationEffectReadOnly;
-	
+	var effect : AnimationEffect;
+
 	/**
 		Gets or sets the `AnimationTimeline` associated with this animation.
 	**/
-	var timeline(default,null) : AnimationTimeline;
-	
+	var timeline : AnimationTimeline;
+
 	/**
 		Gets or sets the scheduled time when an animation's playback should begin.
 	**/
 	var startTime : Float;
-	
+
 	/**
 		The current time value of the animation in milliseconds, whether running or paused. If the animation lacks a `AnimationTimeline`, is inactive or hasn't been played yet, its value is `null`.
 	**/
 	var currentTime : Float;
-	
+
 	/**
 		Gets or sets the playback rate of the animation.
 	**/
 	var playbackRate : Float;
-	
+
 	/**
 		Returns an enumerated value describing the playback state of an animation.
 	**/
 	var playState(default,null) : AnimationPlayState;
-	
+
+	/**
+		Indicates whether the animation is currently waiting for an asynchronous operation such as initiating playback or pausing a running animation.
+	**/
+	var pending(default,null) : Bool;
+
 	/**
 		Returns the current ready Promise for this animation.
 	**/
 	var ready(default,null) : Promise<Animation>;
-	
+
 	/**
 		Returns the current finished Promise for this animation.
 	**/
 	var finished(default,null) : Promise<Animation>;
-	
+
 	/**
 		Gets and sets the event handler for the `finish` event.
 	**/
 	var onfinish : haxe.Constraints.Function;
-	
+
 	/**
 		Gets and sets the event handler for the `cancel` event.
 	**/
 	var oncancel : haxe.Constraints.Function;
-	
+
 	/** @throws DOMError */
-	function new( ?effect : KeyframeEffectReadOnly, ?timeline : AnimationTimeline ) : Void;
-	
+	function new( ?effect : AnimationEffect, ?timeline : AnimationTimeline ) : Void;
+
 	/**
 		Clears all `KeyframeEffect` caused by this animation and aborts its playback.
 	**/
 	function cancel() : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Seeks either end of an animation, depending on whether the animation is playing or reversing.
+		@throws DOMError
 	**/
 	function finish() : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Starts or resumes playing of an animation, or begins the animation again if it previously finished.
+		@throws DOMError
 	**/
 	function play() : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Suspends playing of an animation.
+		@throws DOMError
 	**/
 	function pause() : Void;
-	/** @throws DOMError */
-	
+
+	/**
+		Sets the speed of an animation after first synchronizing its playback position.
+	**/
+	function updatePlaybackRate( playbackRate : Float ) : Void;
+
 	/**
 		Reverses playback direction, stopping at the start of the animation. If the animation is finished or unplayed, it will play from end to beginning.
+		@throws DOMError
 	**/
 	function reverse() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/AnimationEffect.hx b/std/js/html/AnimationEffect.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fb28106ef9ef567e24973abedec2eeaf7bf71c7b
--- /dev/null
+++ b/std/js/html/AnimationEffect.hx
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\AnimationEffect.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `AnimationEffect` interface of the Web Animations API defines current and future animation effects like `KeyframeEffect`, which can be passed to `Animation` objects for playing, and `KeyframeEffectReadOnly` (which is used by CSS Animations and Transitions).
+
+	Documentation [AnimationEffect](https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffect) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffect$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffect>
+**/
+@:native("AnimationEffect")
+extern class AnimationEffect {
+	function getTiming() : EffectTiming;
+	function getComputedTiming() : ComputedEffectTiming;
+	/** @throws DOMError */
+	function updateTiming( ?timing : OptionalEffectTiming ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/AnimationEffectTimingReadOnly.hx b/std/js/html/AnimationEffectTimingReadOnly.hx
deleted file mode 100644
index c278f13ecdec138c2e2eae54feec3ffe29ec8106..0000000000000000000000000000000000000000
--- a/std/js/html/AnimationEffectTimingReadOnly.hx
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-// This file is generated from mozilla\AnimationEffectTimingReadOnly.webidl. Do not edit!
-
-package js.html;
-
-/**
-	The `AnimationEffectTimingReadOnly` interface of the Web Animations API is comprised of timing properties.
-
-	Documentation [AnimationEffectTimingReadOnly](https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectTimingReadOnly) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectTimingReadOnly$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
-
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectTimingReadOnly>
-**/
-@:native("AnimationEffectTimingReadOnly")
-extern class AnimationEffectTimingReadOnly
-{
-	
-	/**
-		The number of milliseconds to delay the start of the animation. Defaults to `0`.
-	**/
-	var delay(default,null) : Float;
-	
-	/**
-		The number of milliseconds to delay after the end of an animation. This is primarily of use when sequencing animations based on the end time of another animation. Defaults to `0`.
-	**/
-	var endDelay(default,null) : Float;
-	
-	/**
-		Dictates whether the animation's effects should be reflected by the element(s) state prior to playing (`backwards`), retained after the animation has completed playing (`forwards`), or `both`. Defaults to `none`.
-	**/
-	var fill(default,null) : FillMode;
-	
-	/**
-		A number representing which repetition the animation begins at and its progress through it.
-	**/
-	var iterationStart(default,null) : Float;
-	
-	/**
-		The number of times the animation should repeat. Defaults to `1`, and can also take a value of infinity to make it repeat infinitely.
-	**/
-	var iterations(default,null) : Float;
-	
-	/**
-		The number of milliseconds each iteration of the animation takes to complete. Defaults to `0`.
-	**/
-	var duration(default,null) : haxe.extern.EitherType<Float,String>;
-	
-	/**
-		Whether the animation runs forwards (`normal`), backwards (`reverse`), switches direction after each iteration (`alternate`), or runs backwards and switches direction after each iteration (`alternate-reverse`). Defaults to `normal`.
-	**/
-	var direction(default,null) : PlaybackDirection;
-	
-	/**
-		The rate of the animation's change over time. Accepts the pre-defined values `linear`, `ease`, `ease-in`, `ease-out`, and `ease-in-out`, or a custom cubic-bezier value like `cubic-bezier(0.42, 0, 0.58, 1)`. Defaults to `linear`.
-	**/
-	var easing(default,null) : String;
-	
-}
\ No newline at end of file
diff --git a/std/js/html/AnimationEvent.hx b/std/js/html/AnimationEvent.hx
index 3d5dcc76d2da78492f50c22beb00506951fe2cf0..7d3e83f5cba32778b140efa93b51c723d282a2c8 100644
--- a/std/js/html/AnimationEvent.hx
+++ b/std/js/html/AnimationEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AnimationEvent>
 **/
 @:native("AnimationEvent")
-extern class AnimationEvent extends Event
-{
+extern class AnimationEvent extends Event {
 	
 	/**
 		Is a `DOMString` containing the value of the `animation-name` CSS property associated with the transition.
diff --git a/std/js/html/AnimationEventInit.hx b/std/js/html/AnimationEventInit.hx
index 25c284e09d1aa1705824335c22c4cc9300a6a4b7..107ffe5855314714be453c5ddbaca2b5f7e910f2 100644
--- a/std/js/html/AnimationEventInit.hx
+++ b/std/js/html/AnimationEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,8 @@
 
 package js.html;
 
-typedef AnimationEventInit =
-{
-	> EventInit,
-	@:optional var animationName : String;
-	@:optional var elapsedTime : Float;
-	@:optional var pseudoElement : String;
+typedef AnimationEventInit = EventInit & {
+	var ?animationName : String;
+	var ?elapsedTime : Float;
+	var ?pseudoElement : String;
 }
\ No newline at end of file
diff --git a/std/js/html/CSSUnknownRule.hx b/std/js/html/AnimationFilter.hx
similarity index 86%
rename from std/js/html/CSSUnknownRule.hx
rename to std/js/html/AnimationFilter.hx
index f093ea419d589c600a74c6b3813bb501bb4e2ce6..471cec222dfe84ccd054d6269e029999a47a1688 100644
--- a/std/js/html/CSSUnknownRule.hx
+++ b/std/js/html/AnimationFilter.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,11 +20,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from cssrule.webidl. Do not edit!
+// This file is generated from mozilla\Animatable.webidl. Do not edit!
 
 package js.html;
 
-@:native("CSSUnknownRule")
-extern class CSSUnknownRule extends CSSRule
-{
+typedef AnimationFilter = {
+	var ?subtree : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/AnimationPlayState.hx b/std/js/html/AnimationPlayState.hx
index 243a7b97047a928f7491446fee75f2c7d793f163..46b995c88e6c03a257054facf17e34939ec64c39 100644
--- a/std/js/html/AnimationPlayState.hx
+++ b/std/js/html/AnimationPlayState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,8 @@
 
 package js.html;
 
-@:enum abstract AnimationPlayState(String)
-{
+enum abstract AnimationPlayState(String) {
 	var IDLE = "idle";
-	var PENDING = "pending";
 	var RUNNING = "running";
 	var PAUSED = "paused";
 	var FINISHED = "finished";
diff --git a/std/js/html/AnimationEffectTiming.hx b/std/js/html/AnimationPlaybackEvent.hx
similarity index 59%
rename from std/js/html/AnimationEffectTiming.hx
rename to std/js/html/AnimationPlaybackEvent.hx
index 2a29b116142798d3675ce2dcf3e41d5442eb9a1a..0541c2191a6e57d921f13c6ee48820e2bf32e326 100644
--- a/std/js/html/AnimationEffectTiming.hx
+++ b/std/js/html/AnimationPlaybackEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,18 +20,22 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\AnimationEffectTiming.webidl. Do not edit!
+// This file is generated from mozilla\AnimationPlaybackEvent.webidl. Do not edit!
 
 package js.html;
 
 /**
-	The `AnimationEffectTiming` interface of the Web Animations API is comprised of timing properties. It is returned by the `timing` attribute of a `KeyframeEffect`.
+	The AnimationPlaybackEvent interface of the Web Animations API represents animation events.
 
-	Documentation [AnimationEffectTiming](https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectTiming) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectTiming$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [AnimationPlaybackEvent](https://developer.mozilla.org/en-US/docs/Web/API/AnimationPlaybackEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AnimationPlaybackEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectTiming>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/AnimationPlaybackEvent>
 **/
-@:native("AnimationEffectTiming")
-extern class AnimationEffectTiming extends AnimationEffectTimingReadOnly
-{
+@:native("AnimationPlaybackEvent")
+extern class AnimationPlaybackEvent extends Event {
+	var currentTime(default,null) : Float;
+	var timelineTime(default,null) : Float;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : AnimationPlaybackEventInit ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/AnimationPlaybackEventInit.hx b/std/js/html/AnimationPlaybackEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..91fd2f1c3a0d65123e05cbd3043574b9a7485d67
--- /dev/null
+++ b/std/js/html/AnimationPlaybackEventInit.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\AnimationPlaybackEvent.webidl. Do not edit!
+
+package js.html;
+
+typedef AnimationPlaybackEventInit = EventInit & {
+	var ?currentTime : Float;
+	var ?timelineTime : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/AnimationTimeline.hx b/std/js/html/AnimationTimeline.hx
index a52c2622f58d810dca57f835fefef481568b11c3..c7b7e634810270c5ee6535ae464b24f7b3e162ce 100644
--- a/std/js/html/AnimationTimeline.hx
+++ b/std/js/html/AnimationTimeline.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AnimationTimeline>
 **/
 @:native("AnimationTimeline")
-extern class AnimationTimeline
-{
+extern class AnimationTimeline {
 	
 	/**
 		Returns the time value in milliseconds for this timeline or `null` if this timeline is inactive.
diff --git a/std/js/html/AreaElement.hx b/std/js/html/AreaElement.hx
index 8885f48c74ea970d37e4a6249e2918e416eb696a..569cce41b80cfe437db82d11f92f286d385e30fb 100644
--- a/std/js/html/AreaElement.hx
+++ b/std/js/html/AreaElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLAreaElement>
 **/
 @:native("HTMLAreaElement")
-extern class AreaElement extends Element
-{
+extern class AreaElement extends Element {
 	
 	/**
 		Is a `DOMString` that reflects the `alt` HTML attribute, containing alternative text for the element.
@@ -66,6 +65,11 @@ extern class AreaElement extends Element
 	**/
 	var rel : String;
 	
+	/**
+		Is a `DOMString` that reflects the `referrerpolicy` HTML attribute indicating which referrer to use when fetching the linked resource.
+	**/
+	var referrerPolicy : String;
+	
 	/**
 		Returns a `DOMTokenList` that reflects the `rel` HTML attribute, indicating relationships of the current document to the linked resource, as a list of tokens.
 	**/
diff --git a/std/js/html/ArrayBuffer.hx b/std/js/html/ArrayBuffer.hx
index 9ee2b246d1fd68bf83ac6993fce526ac822a137e..f526251fdf163ab2acfb5f8cad63f6c99d3b773a 100644
--- a/std/js/html/ArrayBuffer.hx
+++ b/std/js/html/ArrayBuffer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,20 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-// Explicitly include the compatibility class
-import js.html.compat.ArrayBuffer;
-
-@:native("ArrayBuffer")
-extern class ArrayBuffer
-{
-	static function isView( value : Dynamic ) : Bool;
-	var byteLength(default,null) : Int;
-	
-	/** @throws DOMError */
-	function new( length : Int ) : Void;
-	function slice( begin : Int, ?end : Int ) : ArrayBuffer;
-}
\ No newline at end of file
+@:deprecated typedef ArrayBuffer = js.lib.ArrayBuffer;
diff --git a/std/js/html/ArrayBufferView.hx b/std/js/html/ArrayBufferView.hx
index 51eacc96d00ba1d0a0e95980f87624330a6bd16b..6f7dfb77199737352d98031c0a0d45e82fab25ff 100644
--- a/std/js/html/ArrayBufferView.hx
+++ b/std/js/html/ArrayBufferView.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,22 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-/**
-	`ArrayBufferView` is a helper type representing any of the following JavaScript `TypedArray` types:
-
-	Documentation [ArrayBufferView](https://developer.mozilla.org/en-US/docs/Web/API/ArrayBufferView) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/ArrayBufferView$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
-
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/ArrayBufferView>
-**/
-@:native("ArrayBufferView")
-extern class ArrayBufferView
-{
-	var buffer(default,null) : ArrayBuffer;
-	var byteOffset(default,null) : Int;
-	var byteLength(default,null) : Int;
-	
-}
\ No newline at end of file
+@:deprecated typedef ArrayBufferView = js.lib.ArrayBufferView;
diff --git a/std/js/html/AssignedNodesOptions.hx b/std/js/html/AssignedNodesOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..076f6371cab76219a8efdeafa70e6f80d7098bec
--- /dev/null
+++ b/std/js/html/AssignedNodesOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\HTMLSlotElement.webidl. Do not edit!
+
+package js.html;
+
+typedef AssignedNodesOptions = {
+	var ?flatten : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/Attr.hx b/std/js/html/Attr.hx
index 75c944cddd20da19a6dec4d73e2e7907106c8c71..39c4a918e3307aef8b2f0497447697042e5bafe3 100644
--- a/std/js/html/Attr.hx
+++ b/std/js/html/Attr.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,51 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Attr>
 **/
 @:native("Attr")
-extern class Attr extends Node
-{
+extern class Attr extends Node {
+	
+	/**
+		A `DOMString` representing the local part of the qualified name of the attribute.
+	**/
+	var localName(default,null) : String;
+	
+	/**
+		The attribute's value.
+	**/
 	var value : String;
+	
+	/**
+		The attribute's name.
+	**/
 	var name(default,null) : String;
+	
+	/**
+		A `DOMString` representing the namespace URI of the attribute, or `null` if there is no namespace.
+	**/
+	var namespaceURI(default,null) : String;
+	
+	/**
+		A `DOMString` representing the namespace prefix of the attribute, or `null` if no prefix is specified.
+	**/
+	var prefix(default,null) : String;
+	
+	/**
+		This property always returns `true`. Originally, it returned `true `if the attribute was explicitly specified in the source code or by a script, and `false` if its value came from the default one defined in the document's DTD.
+	**/
 	var specified(default,null) : Bool;
+	
+	/**
+		
+			The element holding the attribute.
+		
+			
+			Note: DOM Level 4 removed this property. The assumption was that since you get an `Attr` object from an `Element`, you should already know the associated element.
+		
+			As that doesn't hold true in cases like `Attr` objects being returned by `Document.evaluate`, the DOM Living Standard reintroduced the property.
+		
+			Gecko outputs a deprecation note starting from Gecko 7.0 `7.0`. This note was removed again in Gecko 49.0 `49.0`.
+			
+			
+	**/
 	var ownerElement(default,null) : Element;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/Audio.hx b/std/js/html/Audio.hx
index 75f98f5b553d5e60a68d6bbce16736d89fe46884..5c065fd3953851a425b10a8b793e6b57d5a0d4c5 100644
--- a/std/js/html/Audio.hx
+++ b/std/js/html/Audio.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("Audio")
-extern class Audio extends AudioElement
-{
+extern class Audio extends AudioElement {
 	/** @throws DOMError */
 	function new( ?src : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/AudioElement.hx b/std/js/html/AudioElement.hx
index c9aaf1f54ef58fe2714a3451b2abe52790c9918b..0c684ff895311aba8e68009e7b00fdff3b51a26c 100644
--- a/std/js/html/AudioElement.hx
+++ b/std/js/html/AudioElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLAudioElement>
 **/
 @:native("HTMLAudioElement")
-extern class AudioElement extends MediaElement
-{
+extern class AudioElement extends MediaElement {
 }
\ No newline at end of file
diff --git a/std/js/html/AudioStreamTrack.hx b/std/js/html/AudioStreamTrack.hx
index 0aecfe183e3ccd9c0d8c74ee746e697f0565fefc..cbd5348ac99a75cc58954d094aba8a478648824d 100644
--- a/std/js/html/AudioStreamTrack.hx
+++ b/std/js/html/AudioStreamTrack.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,5 @@
 package js.html;
 
 @:native("AudioStreamTrack")
-extern class AudioStreamTrack extends MediaStreamTrack
-{
+extern class AudioStreamTrack extends MediaStreamTrack {
 }
\ No newline at end of file
diff --git a/std/js/html/AudioTrack.hx b/std/js/html/AudioTrack.hx
index f421d6475251b29dd1d0c10c03022e9d32c5541b..13dfd60108351f2b8ed319b1559177526334a0d5 100644
--- a/std/js/html/AudioTrack.hx
+++ b/std/js/html/AudioTrack.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,39 @@
 
 package js.html;
 
+/**
+	The `AudioTrack` interface represents a single audio track from one of the HTML media elements, `audio` or `video`. 
+
+	Documentation [AudioTrack](https://developer.mozilla.org/en-US/docs/Web/API/AudioTrack) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AudioTrack$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioTrack>
+**/
 @:native("AudioTrack")
-extern class AudioTrack
-{
+extern class AudioTrack {
+	
+	/**
+		A `DOMString` which uniquely identifies the track within the media. This ID can be used to locate a specific track within an audio track list by calling `AudioTrackList.getTrackById()`. The ID can also be used as the fragment part of the URL if the media supports seeking by media fragment per the Media Fragments URI specification.
+	**/
 	var id(default,null) : String;
+	
+	/**
+		A `DOMString` specifying the category into which the track falls. For example, the main audio track would have a `kind` of `"main"`.
+	**/
 	var kind(default,null) : String;
+	
+	/**
+		A `DOMString` providing a human-readable label for the track. For example, an audio commentary track for a movie might have a `label` of `"Commentary with director John Q. Public and actors John Doe and Jane Eod."` This string is empty if no label is provided.
+	**/
 	var label(default,null) : String;
+	
+	/**
+		A `DOMString` specifying the audio track's primary language, or an empty string if unknown. The language is specified as a BCP 47 ({{RFC(5646)}}) language code, such as `"en-US"` or `"pt-BR"`.
+	**/
 	var language(default,null) : String;
+	
+	/**
+		A Boolean value which controls whether or not the audio track's sound is enabled. Setting this value to `false` mutes the track's audio.
+	**/
 	var enabled : Bool;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/AudioTrackList.hx b/std/js/html/AudioTrackList.hx
index 1bd14237a0188938131fc1a7e3f79dbef4255433..b8fc4affbddd4bc351693519565b26c9adfd449d 100644
--- a/std/js/html/AudioTrackList.hx
+++ b/std/js/html/AudioTrackList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,19 @@
 
 package js.html;
 
+/**
+	The `AudioTrackList` interface is used to represent a list of the audio tracks contained within a given HTML media element, with each track represented by a separate `AudioTrack` object in the list.
+
+	Documentation [AudioTrackList](https://developer.mozilla.org/en-US/docs/Web/API/AudioTrackList) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AudioTrackList$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioTrackList>
+**/
 @:native("AudioTrackList")
-extern class AudioTrackList extends EventTarget implements ArrayAccess<AudioTrack>
-{
+extern class AudioTrackList extends EventTarget implements ArrayAccess<AudioTrack> {
+	
+	/**
+		The number of tracks in the list.
+	**/
 	var length(default,null) : Int;
 	var onchange : haxe.Constraints.Function;
 	var onaddtrack : haxe.Constraints.Function;
diff --git a/std/js/html/AutoKeyword.hx b/std/js/html/AutoKeyword.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c9f7135c65136836ec13df60cbbb61226ef71601
--- /dev/null
+++ b/std/js/html/AutoKeyword.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\VTTCue.webidl. Do not edit!
+
+package js.html;
+
+enum abstract AutoKeyword(String) {
+	var AUTO = "auto";
+}
\ No newline at end of file
diff --git a/std/js/html/BRElement.hx b/std/js/html/BRElement.hx
index 904076259140ecd7699bc926a19174d5b0afe4e7..e987052cc4b428395fc4fb4e8506669241efc53a 100644
--- a/std/js/html/BRElement.hx
+++ b/std/js/html/BRElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLBRElement>
 **/
 @:native("HTMLBRElement")
-extern class BRElement extends Element
-{
+extern class BRElement extends Element {
 	
 	/**
 		Is a `DOMString` indicating the flow of text around floating objects.
diff --git a/std/js/html/BarProp.hx b/std/js/html/BarProp.hx
index ed75b50e07170e0e0201e3c4b05905523e439bc7..9ba95a6b71465ab3a492663751f00d12759009df 100644
--- a/std/js/html/BarProp.hx
+++ b/std/js/html/BarProp.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("BarProp")
-extern class BarProp
-{
+extern class BarProp {
 	var visible : Bool;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/BaseElement.hx b/std/js/html/BaseElement.hx
index 02c63de3ca0075009ed03ad40c4b981baefc7787..bb4118a7ab786dc4dfb1838d88c365a44de5b813 100644
--- a/std/js/html/BaseElement.hx
+++ b/std/js/html/BaseElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLBaseElement>
 **/
 @:native("HTMLBaseElement")
-extern class BaseElement extends Element
-{
+extern class BaseElement extends Element {
 	
 	/**
 		Is a `DOMString` that reflects the `href` HTML attribute, containing a base URL for relative URLs in the document.
diff --git a/std/js/html/BatteryManager.hx b/std/js/html/BatteryManager.hx
index 82a7d2cf5784e571e90569d659b6bd31787bf323..e554d5d40d55793737bd0bf8bd25d44f1988ae53 100644
--- a/std/js/html/BatteryManager.hx
+++ b/std/js/html/BatteryManager.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/BatteryManager>
 **/
 @:native("BatteryManager")
-extern class BatteryManager extends EventTarget
-{
+extern class BatteryManager extends EventTarget {
 	
 	/**
 		A Boolean value indicating whether or not the battery is currently being charged.
diff --git a/std/js/html/BeforeUnloadEvent.hx b/std/js/html/BeforeUnloadEvent.hx
index 6492726313d3b3b577d19b1aca1fffeb5604301a..463dc369576cacf1a9d26a2802a107b7fc35f73c 100644
--- a/std/js/html/BeforeUnloadEvent.hx
+++ b/std/js/html/BeforeUnloadEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,5 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/BeforeUnloadEvent>
 **/
 @:native("BeforeUnloadEvent")
-extern class BeforeUnloadEvent extends Event
-{
-	var returnValue : String;
-	
+extern class BeforeUnloadEvent extends Event {
 }
\ No newline at end of file
diff --git a/std/js/html/BinaryType.hx b/std/js/html/BinaryType.hx
index 337e2c92c19b7716c31fc94e73041262607256c5..fac33af9c557f8f96531ebd34674c5f992ffb96d 100644
--- a/std/js/html/BinaryType.hx
+++ b/std/js/html/BinaryType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract BinaryType(String)
-{
+enum abstract BinaryType(String) {
 	var BLOB = "blob";
 	var ARRAYBUFFER = "arraybuffer";
 }
\ No newline at end of file
diff --git a/std/js/html/Blob.hx b/std/js/html/Blob.hx
index 543cc4d9b0527e6f282587af009ce686175cd102..4d75860c0eb355e04d8b9b96a42548854d674ae8 100644
--- a/std/js/html/Blob.hx
+++ b/std/js/html/Blob.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -46,12 +46,11 @@ extern class Blob
 	var type(default,null) : String;
 	
 	/** @throws DOMError */
-	@:overload( function() : Void {} )
-	function new( blobParts : Array<haxe.extern.EitherType<ArrayBuffer,haxe.extern.EitherType<ArrayBufferView,haxe.extern.EitherType<Blob,String>>>>, ?options : BlobPropertyBag ) : Void;
-	/** @throws DOMError */
+	function new( ?blobParts : Array<haxe.extern.EitherType<js.lib.ArrayBuffer,haxe.extern.EitherType<js.lib.ArrayBufferView,haxe.extern.EitherType<Blob,String>>>>, ?options : BlobPropertyBag ) : Void;
 	
 	/**
 		Returns a new `Blob` object containing the data in the specified range of bytes of the source `Blob`.
+		@throws DOMError
 	**/
-	function slice( ?start : Int, ?end : Int, ?contentType : String = "" ) : Blob;
-}
\ No newline at end of file
+	function slice( ?start : Int, ?end : Int, ?contentType : String ) : Blob;
+}
diff --git a/std/js/html/BlobEvent.hx b/std/js/html/BlobEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ae0ec58224220026bba516b09d04c0816ab430eb
--- /dev/null
+++ b/std/js/html/BlobEvent.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\BlobEvent.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `BlobEvent` interface represents events associated with a `Blob`. These blobs are typically, but not necessarily,  associated with media content.
+
+	Documentation [BlobEvent](https://developer.mozilla.org/en-US/docs/Web/API/BlobEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/BlobEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/BlobEvent>
+**/
+@:native("BlobEvent")
+extern class BlobEvent extends Event {
+	
+	/**
+		A `Blob` representing the data associated with the event. The event was fired on the `EventTarget` because of something happening on that specific `Blob`.
+	**/
+	var data(default,null) : Blob;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : BlobEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/BlobEventInit.hx b/std/js/html/BlobEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fea08ce7be46efe79fa3647764eaf0e96b401755
--- /dev/null
+++ b/std/js/html/BlobEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\BlobEvent.webidl. Do not edit!
+
+package js.html;
+
+typedef BlobEventInit = EventInit & {
+	var ?data : Blob;
+}
\ No newline at end of file
diff --git a/std/js/html/BlobPropertyBag.hx b/std/js/html/BlobPropertyBag.hx
index b1111dd3a3ec8728327b3129c8cb4ba153ace147..f9083df35745397a0952bbdf9d44eb50d2befe73 100644
--- a/std/js/html/BlobPropertyBag.hx
+++ b/std/js/html/BlobPropertyBag.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-typedef BlobPropertyBag =
-{
-	@:optional var endings : Dynamic/*MISSING EndingTypes*/;
-	@:optional var type : String;
+typedef BlobPropertyBag = {
+	var ?endings : EndingTypes;
+	var ?type : String;
 }
\ No newline at end of file
diff --git a/std/js/html/BodyElement.hx b/std/js/html/BodyElement.hx
index e38b050f68cdcdf105a8d79ee4f067ecc290e5d9..6d01e708f1d53b03332856bbb265f46ed72fff46 100644
--- a/std/js/html/BodyElement.hx
+++ b/std/js/html/BodyElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLBodyElement>
 **/
 @:native("HTMLBodyElement")
-extern class BodyElement extends Element
-{
+extern class BodyElement extends Element {
 	
 	/**
 		Is a `DOMString` that represents the foreground color of text.
@@ -66,10 +65,11 @@ extern class BodyElement extends Element
 	var background : String;
 	var onafterprint : haxe.Constraints.Function;
 	var onbeforeprint : haxe.Constraints.Function;
-	var onbeforeunload : Event -> String;
+	var onbeforeunload : Event -> Null<String>;
 	var onhashchange : haxe.Constraints.Function;
 	var onlanguagechange : haxe.Constraints.Function;
 	var onmessage : haxe.Constraints.Function;
+	var onmessageerror : haxe.Constraints.Function;
 	var onoffline : haxe.Constraints.Function;
 	var ononline : haxe.Constraints.Function;
 	var onpagehide : haxe.Constraints.Function;
diff --git a/std/js/html/BroadcastChannel.hx b/std/js/html/BroadcastChannel.hx
index c9cac75bdbfc6b02d0004d3140239a1439a6253e..fedc0edd7591ab23e44ae5f0d95a1bb280eb29d9 100644
--- a/std/js/html/BroadcastChannel.hx
+++ b/std/js/html/BroadcastChannel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/BroadcastChannel>
 **/
 @:native("BroadcastChannel")
-extern class BroadcastChannel extends EventTarget
-{
+extern class BroadcastChannel extends EventTarget {
 	
 	/**
 		Returns a `DOMString`, the name of the channel.
@@ -41,16 +40,21 @@ extern class BroadcastChannel extends EventTarget
 	var name(default,null) : String;
 	
 	/**
-		Is an `EventHandler` property that specifies the function to execute when a `message` event is fired on this object.
+		An `EventHandler` property that specifies the function to execute when a `message` event is fired on this object.
 	**/
 	var onmessage : haxe.Constraints.Function;
 	
+	/**
+		An `EventHandler` called when a `MessageEvent` of type `MessageError` is fired—that is, when it receives a message that cannot be deserialized.
+	**/
+	var onmessageerror : haxe.Constraints.Function;
+	
 	/** @throws DOMError */
 	function new( channel : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Sends the message, of any type of object, to each `BroadcastChannel` object listening to the same channel.
+		@throws DOMError
 	**/
 	function postMessage( message : Dynamic ) : Void;
 	
diff --git a/std/js/html/ButtonElement.hx b/std/js/html/ButtonElement.hx
index 61524fb2a52b4a9f7f849d0a60cb30f6974bbf2e..85859da9acc1d15bc0931e4ea135d64b612bb1fd 100644
--- a/std/js/html/ButtonElement.hx
+++ b/std/js/html/ButtonElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLButtonElement>
 **/
 @:native("HTMLButtonElement")
-extern class ButtonElement extends Element
-{
+extern class ButtonElement extends Element {
 	
 	/**
 		Is a `Boolean` indicating whether or not the control should have input focus when the page loads, unless the user overrides it, for example by typing in a different control. Only one form-associated element in a document can have this attribute specified.
@@ -48,7 +47,7 @@ extern class ButtonElement extends Element
 	/**
 		Is a `HTMLFormElement` reflecting the form that this button is associated with. If the button is a descendant of a form element, then this attribute is the ID of that form element.
 		
-		 If the button is not a descendant of a form element, then the attribute can be the ID of any form element in the same document it is related to, or the `null` value if none matches.
+			If the button is not a descendant of a form element, then the attribute can be the ID of any form element in the same document it is related to, or the `null` value if none matches.
 	**/
 	var form(default,null) : FormElement;
 	
@@ -56,6 +55,10 @@ extern class ButtonElement extends Element
 		Is a `DOMString` reflecting the URI of a resource that processes information submitted by the button. If specified, this attribute overrides the `action` attribute of the `form` element that owns this element.
 	**/
 	var formAction : String;
+	
+	/**
+		Is a `DOMString` reflecting the type of content that is used to submit the form to the server. If specified, this attribute overrides the `enctype` attribute of the `form` element that owns this element.
+	**/
 	var formEnctype : String;
 	
 	/**
@@ -80,13 +83,13 @@ extern class ButtonElement extends Element
 	
 	/**
 		Is a `DOMString` indicating the behavior of the button. This is an enumerated attribute with the following possible values:
-		 
-		  `"submit"`: The button submits the form. This is the default value if the attribute is not specified, {{HTMLVersionInline(5)}} or if it is dynamically changed to an empty or invalid value.
-		  `"reset"`: The button resets the form.
-		  `"button"`: The button does nothing.
-		  `"menu"`: The button displays a menu. <em>(experimental)</em>
-		 
-		 
+			
+				`"submit"`: The button submits the form. This is the default value if the attribute is not specified, {{HTMLVersionInline(5)}} or if it is dynamically changed to an empty or invalid value.
+				`"reset"`: The button resets the form.
+				`"button"`: The button does nothing.
+				`"menu"`: The button displays a menu. <em>(experimental)</em>
+			
+			
 	**/
 	var type : String;
 	
@@ -110,6 +113,12 @@ extern class ButtonElement extends Element
 	**/
 	var validationMessage(default,null) : String;
 	
+	/**
+		Is a `NodeList` that represents a list of `label` elements that are labels for this button.
+	**/
+	var labels(default,null) : NodeList;
+	
 	function checkValidity() : Bool;
+	function reportValidity() : Bool;
 	function setCustomValidity( error : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/CDATASection.hx b/std/js/html/CDATASection.hx
index 481d0c7b8523c416a26d24e80ff39a36b0419e91..30ee463ddc364ab26f2f21e52e0e63e2338aff41 100644
--- a/std/js/html/CDATASection.hx
+++ b/std/js/html/CDATASection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,13 +25,12 @@
 package js.html;
 
 /**
-	The `CDATASection` interface represents a CDATA section that can be used within XML to include extended portions of unescaped text, such that the symbols  and &amp; do not need escaping as they normally do within XML when used as text.
+	The `CDATASection` interface represents a CDATA section that can be used within XML to include extended portions of unescaped text. The symbols `` and `&amp;` don’t need escaping as they normally do when inside a CDATA section.
 
 	Documentation [CDATASection](https://developer.mozilla.org/en-US/docs/Web/API/CDATASection) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CDATASection$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CDATASection>
 **/
 @:native("CDATASection")
-extern class CDATASection extends Text
-{
+extern class CDATASection extends Text {
 }
\ No newline at end of file
diff --git a/std/js/html/CSS.hx b/std/js/html/CSS.hx
index 8796002430c89d4ba40495a425ce4ba0ef199c8e..ced1466e8841062fd0bb68ad6af23c7d94641fd0 100644
--- a/std/js/html/CSS.hx
+++ b/std/js/html/CSS.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,10 +32,17 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSS>
 **/
 @:native("CSS")
-extern class CSS
-{
-	/** @throws DOMError */
+extern class CSS {
+	
+	/**
+		Returns a `Boolean` indicating if the pair property-value, or the condition, given in parameter is supported.
+		@throws DOMError
+	**/
 	@:overload( function( property : String, value : String ) : Bool {} )
 	static function supports( conditionText : String ) : Bool;
+	
+	/**
+		Can be used to escape a string mostly for use as part of a CSS selector.
+	**/
 	static function escape( ident : String ) : String;
 }
\ No newline at end of file
diff --git a/std/js/html/CSSAnimation.hx b/std/js/html/CSSAnimation.hx
index 1d9d90fcebecbd87d90db254b63bcfc01443a207..7a5e9a6492821ec89193bb62f487b10b912eca60 100644
--- a/std/js/html/CSSAnimation.hx
+++ b/std/js/html/CSSAnimation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("CSSAnimation")
-extern class CSSAnimation extends Animation
-{
+extern class CSSAnimation extends Animation {
 	var animationName(default,null) : String;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/ElementRegistrationOptions.hx b/std/js/html/CSSBoxType.hx
similarity index 82%
rename from std/js/html/ElementRegistrationOptions.hx
rename to std/js/html/CSSBoxType.hx
index e522066f09111a5fadbf3e2a2871722e45bfe709..9fde554f6be68e9cfac114835e7951b049a6ac60 100644
--- a/std/js/html/ElementRegistrationOptions.hx
+++ b/std/js/html/CSSBoxType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\WebComponents.webidl. Do not edit!
+// This file is generated from mozilla\GeometryUtils.webidl. Do not edit!
 
 package js.html;
 
-typedef ElementRegistrationOptions =
-{
-	@:native("extends")
-	@:optional var extends_ : String;
-	@:optional var prototype : Dynamic;
+enum abstract CSSBoxType(String) {
+	var MARGIN = "margin";
+	var BORDER = "border";
+	var PADDING = "padding";
+	var CONTENT = "content";
 }
\ No newline at end of file
diff --git a/std/js/html/CSSConditionRule.hx b/std/js/html/CSSConditionRule.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cf7622d2940c8d61dd756d1f66e9bd42cabac688
--- /dev/null
+++ b/std/js/html/CSSConditionRule.hx
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CSSConditionRule.webidl. Do not edit!
+
+package js.html;
+
+/**
+	An object implementing the `CSSConditionRule` interface represents a single condition CSS at-rule, which consists of a condition and a statement block. It is a child of `CSSGroupingRule`.
+
+	Documentation [CSSConditionRule](https://developer.mozilla.org/en-US/docs/Web/API/CSSConditionRule) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CSSConditionRule$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSConditionRule>
+**/
+@:native("CSSConditionRule")
+extern class CSSConditionRule extends CSSGroupingRule {
+	
+	/**
+		Represents the text of the condition of the rule.
+	**/
+	var conditionText : String;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/CSSCounterStyleRule.hx b/std/js/html/CSSCounterStyleRule.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c55e320252271fcd9ea679c652807f88ac2c1720
--- /dev/null
+++ b/std/js/html/CSSCounterStyleRule.hx
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CSSCounterStyleRule.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `CSSCounterStyleRule` interface represents an `@counter-style` at-rule.
+
+	Documentation [CSSCounterStyleRule](https://developer.mozilla.org/en-US/docs/Web/API/CSSCounterStyleRule) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CSSCounterStyleRule$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSCounterStyleRule>
+**/
+@:native("CSSCounterStyleRule")
+extern class CSSCounterStyleRule extends CSSRule {
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `counter-style-name` defined for the associated rule.
+	**/
+	var name : String;
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `@counter-style/system` descriptor defined for the associated rule. If the descriptor was not specified in the associated rule, the attribute returns an empty string.
+	**/
+	var system : String;
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `@counter-style/symbols` descriptor defined for the associated rule. If the descriptor was not specified in the associated rule, the attribute returns an empty string.
+	**/
+	var symbols : String;
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `@counter-style/additive-symbols` descriptor defined for the associated rule. If the descriptor was not specified in the associated rule, the attribute returns an empty string.
+	**/
+	var additiveSymbols : String;
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `@counter-style/negative` descriptor defined for the associated rule. If the descriptor was not specified in the associated rule, the attribute returns an empty string.
+	**/
+	var negative : String;
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `@counter-style/prefix` descriptor defined for the associated rule. If the descriptor was not specified in the associated rule, the attribute returns an empty string.
+	**/
+	var prefix : String;
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `@counter-style/suffix` descriptor defined for the associated rule. If the descriptor was not specified in the associated rule, the attribute returns an empty string.
+	**/
+	var suffix : String;
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `@counter-style/range` descriptor defined for the associated rule. If the descriptor was not specified in the associated rule, the attribute returns an empty string.
+	**/
+	var range : String;
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `@counter-style/pad` descriptor defined for the associated rule. If the descriptor was not specified in the associated rule, the attribute returns an empty string.
+	**/
+	var pad : String;
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `@counter-style/speak-as` descriptor defined for the associated rule. If the descriptor was not specified in the associated rule, the attribute returns an empty string.
+	**/
+	var speakAs : String;
+	
+	/**
+		Is a `DOMString` object that contains the serialization of the `@counter-style/fallback` descriptor defined for the associated rule. If the descriptor was not specified in the associated rule, the attribute returns an empty string.
+	**/
+	var fallback : String;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/CSSFontFaceRule.hx b/std/js/html/CSSFontFaceRule.hx
index 68b154b1cf8ba6fa97252c71c33aee7de1d03e7d..489b8883b96ac21c547f87587e70428d327b764f 100644
--- a/std/js/html/CSSFontFaceRule.hx
+++ b/std/js/html/CSSFontFaceRule.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from cssrule.webidl. Do not edit!
+// This file is generated from mozilla\CSSFontFaceRule.webidl. Do not edit!
 
 package js.html;
 
 @:native("CSSFontFaceRule")
-extern class CSSFontFaceRule extends CSSRule
-{
+extern class CSSFontFaceRule extends CSSRule {
 	var style(default,null) : CSSStyleDeclaration;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/CSSFontFeatureValuesRule.hx b/std/js/html/CSSFontFeatureValuesRule.hx
new file mode 100644
index 0000000000000000000000000000000000000000..967e00b761413247da8df63d872b9e614dc5f846
--- /dev/null
+++ b/std/js/html/CSSFontFeatureValuesRule.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CSSFontFeatureValuesRule.webidl. Do not edit!
+
+package js.html;
+
+@:native("CSSFontFeatureValuesRule")
+extern class CSSFontFeatureValuesRule extends CSSRule {
+	var fontFamily : String;
+	var valueText : String;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/CSSGroupingRule.hx b/std/js/html/CSSGroupingRule.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f1db4da5a81f3ca5e81dc06d9610e44944b7ee43
--- /dev/null
+++ b/std/js/html/CSSGroupingRule.hx
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CSSGroupingRule.webidl. Do not edit!
+
+package js.html;
+
+/**
+	An object implementing the `CSSGroupingRule` interface represents any CSS at-rule that contains other rules nested within it.
+
+	Documentation [CSSGroupingRule](https://developer.mozilla.org/en-US/docs/Web/API/CSSGroupingRule) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CSSGroupingRule$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSGroupingRule>
+**/
+@:native("CSSGroupingRule")
+extern class CSSGroupingRule extends CSSRule {
+	var cssRules(default,null) : CSSRuleList;
+	
+	/** @throws DOMError */
+	function insertRule( rule : String, index : Int = 0 ) : Int;
+	/** @throws DOMError */
+	function deleteRule( index : Int ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/CSSImportRule.hx b/std/js/html/CSSImportRule.hx
index 217e4afe6413a8619f7a640ffdc696541535a8d6..ce003b88fb28e0a116ac007e6963940fedf9b3a5 100644
--- a/std/js/html/CSSImportRule.hx
+++ b/std/js/html/CSSImportRule.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from cssrule.webidl. Do not edit!
+// This file is generated from mozilla\CSSImportRule.webidl. Do not edit!
 
 package js.html;
 
 @:native("CSSImportRule")
-extern class CSSImportRule extends CSSRule
-{
+extern class CSSImportRule extends CSSRule {
 	var href(default,null) : String;
 	var media(default,null) : MediaList;
 	var styleSheet(default,null) : CSSStyleSheet;
diff --git a/std/js/html/Rect.hx b/std/js/html/CSSKeyframeRule.hx
similarity index 55%
rename from std/js/html/Rect.hx
rename to std/js/html/CSSKeyframeRule.hx
index b928fbd8017cf410bb5e269e247ea686fb7f79cc..fa1573629b870de3a5f696a2caa8d8fd216d7c78 100644
--- a/std/js/html/Rect.hx
+++ b/std/js/html/CSSKeyframeRule.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,16 +20,20 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\Rect.webidl. Do not edit!
+// This file is generated from mozilla\CSSKeyframeRule.webidl. Do not edit!
 
 package js.html;
 
-@:native("Rect")
-extern class Rect
-{
-	var top(default,null) : CSSPrimitiveValue;
-	var right(default,null) : CSSPrimitiveValue;
-	var bottom(default,null) : CSSPrimitiveValue;
-	var left(default,null) : CSSPrimitiveValue;
+/**
+	The `CSSKeyframeRule` interface describes an object representing a set of style for a given keyframe. It corresponds to the contains of a single keyframe of a `@keyframes` at-rule. It implements the `CSSRule` interface with a type value of `8` (`CSSRule.KEYFRAME_RULE`).
+
+	Documentation [CSSKeyframeRule](https://developer.mozilla.org/en-US/docs/Web/API/CSSKeyframeRule) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CSSKeyframeRule$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSKeyframeRule>
+**/
+@:native("CSSKeyframeRule")
+extern class CSSKeyframeRule extends CSSRule {
+	var keyText : String;
+	var style(default,null) : CSSStyleDeclaration;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/CSSKeyframesRule.hx b/std/js/html/CSSKeyframesRule.hx
new file mode 100644
index 0000000000000000000000000000000000000000..94b02ac0b668d0fb6ab3d1af8dca7c1b1e0c7efc
--- /dev/null
+++ b/std/js/html/CSSKeyframesRule.hx
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CSSKeyframesRule.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `CSSKeyframesRule` interface describes an object representing a complete set of keyframes for a CSS animation. It corresponds to the contains of a whole `@keyframes` at-rule. It implements the `CSSRule` interface with a type value of `7` (`CSSRule.KEYFRAMES_RULE`).
+
+	Documentation [CSSKeyframesRule](https://developer.mozilla.org/en-US/docs/Web/API/CSSKeyframesRule) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CSSKeyframesRule$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSKeyframesRule>
+**/
+@:native("CSSKeyframesRule")
+extern class CSSKeyframesRule extends CSSRule {
+	
+	/**
+		Represents the name of the animation, used by the `animation-name` property.
+	**/
+	var name : String;
+	
+	/**
+		Returns a `CSSRuleList` of the CSS rules in the media rule.
+	**/
+	var cssRules(default,null) : CSSRuleList;
+	
+	
+	/**
+		Inserts a new keyframe rule into the current CSSKeyframesRule. The parameter is a `DOMString` containing a keyframe in the same format as an entry of a `@keyframes` at-rule. If it contains more than one keyframe rule, a `DOMException` with a `SYNTAX_ERR` is thrown.
+	**/
+	function appendRule( rule : String ) : Void;
+	
+	/**
+		Deletes a keyframe rule from the current CSSKeyframesRule. The parameter is the index of the keyframe to be deleted, expressed as a `DOMString` resolving as a number between `0%` and `100%`.
+	**/
+	function deleteRule( select : String ) : Void;
+	
+	/**
+		Returns a keyframe rule corresponding to the given key. The key is a `DOMString` containing an index of the keyframe to be returned, resolving to a percentage between `0%` and `100%`. If no such keyframe exists, `findRule` returns `null`.
+	**/
+	function findRule( select : String ) : CSSKeyframeRule;
+}
\ No newline at end of file
diff --git a/std/js/html/CSSMediaRule.hx b/std/js/html/CSSMediaRule.hx
index 99ff0843590d12a4a4f3b68da43dbbc46612b02a..3b43e3a629b4c7c2606f8b62a5b40cec0551edaa 100644
--- a/std/js/html/CSSMediaRule.hx
+++ b/std/js/html/CSSMediaRule.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from cssrule.webidl. Do not edit!
+// This file is generated from mozilla\CSSMediaRule.webidl. Do not edit!
 
 package js.html;
 
@@ -32,15 +32,11 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSMediaRule>
 **/
 @:native("CSSMediaRule")
-extern class CSSMediaRule extends CSSRule
-{
+extern class CSSMediaRule extends CSSConditionRule {
 	
 	/**
 		Specifies a `MediaList` representing the intended destination medium for style information.
 	**/
 	var media(default,null) : MediaList;
-	var cssRules(default,null) : CSSRuleList;
 	
-	function insertRule( rule : String, index : Int ) : Int;
-	function deleteRule( index : Int ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/CSSMozDocumentRule.hx b/std/js/html/CSSMozDocumentRule.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8d786d5ecdd4ed3a3fb2b8b46fab37da3c776ebc
--- /dev/null
+++ b/std/js/html/CSSMozDocumentRule.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CSSMozDocumentRule.webidl. Do not edit!
+
+package js.html;
+
+@:native("CSSMozDocumentRule")
+extern class CSSMozDocumentRule extends CSSConditionRule {
+}
\ No newline at end of file
diff --git a/std/js/html/CSSNamespaceRule.hx b/std/js/html/CSSNamespaceRule.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4d8c293bb9c1a390fad2622f64e965a6797c73f2
--- /dev/null
+++ b/std/js/html/CSSNamespaceRule.hx
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CSSNamespaceRule.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `CSSNamespaceRule` interface describes an object representing a single CSS `@namespace` at-rule. It implements the `CSSRule` interface, with a type value of `10` (`CSSRule.NAMESPACE_RULE`).
+
+	Documentation [CSSNamespaceRule](https://developer.mozilla.org/en-US/docs/Web/API/CSSNamespaceRule) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CSSNamespaceRule$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSNamespaceRule>
+**/
+@:native("CSSNamespaceRule")
+extern class CSSNamespaceRule extends CSSRule {
+	
+	/**
+		Returns a `DOMString` containing the text of the URI of the given namespace.
+	**/
+	var namespaceURI(default,null) : String;
+	
+	/**
+		Returns a `DOMString` with the name of the prefix associated to this namespace. If there is no such prefix, returns  `null`.
+	**/
+	var prefix(default,null) : String;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/CSSPageRule.hx b/std/js/html/CSSPageRule.hx
index 082ec61e3dfba8919cc298b2a70d6cf916ceba5a..1352d8b05ebd971afab404cafe2f63ab3b479041 100644
--- a/std/js/html/CSSPageRule.hx
+++ b/std/js/html/CSSPageRule.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from cssrule.webidl. Do not edit!
+// This file is generated from mozilla\CSSPageRule.webidl. Do not edit!
 
 package js.html;
 
@@ -32,13 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSPageRule>
 **/
 @:native("CSSPageRule")
-extern class CSSPageRule extends CSSRule
-{
-	
-	/**
-		Represents the text of the page selector associated with the at-rule.
-	**/
-	var selectorText : String;
+extern class CSSPageRule extends CSSRule {
 	
 	/**
 		Returns the declaration block associated with the at-rule.
diff --git a/std/js/html/CSSPrimitiveValue.hx b/std/js/html/CSSPrimitiveValue.hx
deleted file mode 100644
index 7eaf4db7510f86418829d672785681a40ba1ae3c..0000000000000000000000000000000000000000
--- a/std/js/html/CSSPrimitiveValue.hx
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-// This file is generated from mozilla\CSSPrimitiveValue.webidl. Do not edit!
-
-package js.html;
-
-/**
-	The `CSSPrimitiveValue` interface derives from the `CSSValue` interface and represents the current computed value of a CSS property.
-
-	Documentation [CSSPrimitiveValue](https://developer.mozilla.org/en-US/docs/Web/API/CSSPrimitiveValue) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CSSPrimitiveValue$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
-
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSPrimitiveValue>
-**/
-@:native("CSSPrimitiveValue")
-extern class CSSPrimitiveValue extends CSSValue
-{
-	static inline var CSS_UNKNOWN : Int = 0;
-	static inline var CSS_NUMBER : Int = 1;
-	static inline var CSS_PERCENTAGE : Int = 2;
-	static inline var CSS_EMS : Int = 3;
-	static inline var CSS_EXS : Int = 4;
-	static inline var CSS_PX : Int = 5;
-	static inline var CSS_CM : Int = 6;
-	static inline var CSS_MM : Int = 7;
-	static inline var CSS_IN : Int = 8;
-	static inline var CSS_PT : Int = 9;
-	static inline var CSS_PC : Int = 10;
-	static inline var CSS_DEG : Int = 11;
-	static inline var CSS_RAD : Int = 12;
-	static inline var CSS_GRAD : Int = 13;
-	static inline var CSS_MS : Int = 14;
-	static inline var CSS_S : Int = 15;
-	static inline var CSS_HZ : Int = 16;
-	static inline var CSS_KHZ : Int = 17;
-	static inline var CSS_DIMENSION : Int = 18;
-	static inline var CSS_STRING : Int = 19;
-	static inline var CSS_URI : Int = 20;
-	static inline var CSS_IDENT : Int = 21;
-	static inline var CSS_ATTR : Int = 22;
-	static inline var CSS_COUNTER : Int = 23;
-	static inline var CSS_RECT : Int = 24;
-	static inline var CSS_RGBCOLOR : Int = 25;
-	
-	
-	/**
-		An <code>unsigned short</code> representing the type of the value. Possible values are:
-		 <table class="standard-table">
-		  
-		   <tr>
-		    <td class="header">Constant</td>
-		    <td class="header">Description</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_ATTR</code></td>
-		    <td>The value is an <code>attr()</code> function. The value can be obtained by using the <code>getStringValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_CM</code></td>
-		    <td>The value is a <code>length</code> in centimeters. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_COUNTER</code></td>
-		    <td>The value is a counter or counters function. The value can be obtained by using the <code>getCounterValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_DEG</code></td>
-		    <td>The value is an <code>angle</code> in degrees. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_DIMENSION</code></td>
-		    <td>The value is a <code>number</code> with an unknown dimension. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_EMS</code></td>
-		    <td>The value is a <code>length</code> in em units. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_EXS</code></td>
-		    <td>The value is a <code>length</code> in ex units. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_GRAD</code></td>
-		    <td>The value is an <code>angle</code> in grads. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_HZ</code></td>
-		    <td>The value is a <code>frequency</code> in Hertz. The value can be obtained by using the getFloatValue method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_IDENT</code></td>
-		    <td>The value is an identifier. The value can be obtained by using the <code>getStringValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_IN</code></td>
-		    <td>The value is a <code>length</code> in inches. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_KHZ</code></td>
-		    <td>The value is a <code>frequency</code> in Kilohertz. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_MM</code></td>
-		    <td>The value is a <code>length</code> in millimeters. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_MS</code></td>
-		    <td>The value is a <code>time</code> in milliseconds. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_NUMBER</code></td>
-		    <td>The value is a simple <code>number</code>. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_PC</code></td>
-		    <td>The value is a <code>length</code> in picas. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_PERCENTAGE</code></td>
-		    <td>The value is a <code>percentage</code>. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_PT</code></td>
-		    <td>The value is a <code>length</code> in points. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_PX</code></td>
-		    <td>The value is a <code>length</code> in pixels. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_RAD</code></td>
-		    <td>The value is an <code>angle</code> in radians. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_RECT</code></td>
-		    <td>The value is a <code>shape</code> function. The value can be obtained by using the <code>getRectValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_RGBCOLOR</code></td>
-		    <td>The value is an <code>color</code>. The value can be obtained by using the <code>getRGBColorValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_S</code></td>
-		    <td>The value is a <code>time</code> in seconds. The value can be obtained by using the <code>getFloatValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_STRING</code></td>
-		    <td>The value is a <code>string</code>. The value can be obtained by using the <code>getStringValue()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_UNKNOWN</code></td>
-		    <td>The value is not a recognized CSS2 value. The value can only be obtained by using the <code>CSSValue.cssText</code> attribute.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_URI</code></td>
-		    <td>The value is a <code>uri</code>. The value can be obtained by using the <code>getStringValue()</code> method.</td>
-		   </tr>
-		  
-		 </table>
-		 
-	**/
-	var primitiveType(default,null) : Int;
-	
-	/** @throws DOMError */
-	
-	/**
-		A method to set the float value with a specified unit. If the property attached with this value can not accept the specified unit or the float value, the value will be unchanged and a `DOMException` will be raised.
-	**/
-	function setFloatValue( unitType : Int, floatValue : Float ) : Void;
-	/** @throws DOMError */
-	
-	/**
-		This method is used to get a float value in a specified unit. If this CSS value doesn't contain a float value or can't be converted into the specified unit, a `DOMException` is raised.
-	**/
-	function getFloatValue( unitType : Int ) : Float;
-	/** @throws DOMError */
-	
-	/**
-		A method to set the string value with the specified unit. If the property attached to this value can't accept the specified unit or the string value, the value will be unchanged and a `DOMException` will be raised.
-	**/
-	function setStringValue( stringType : Int, stringValue : String ) : Void;
-	/** @throws DOMError */
-	
-	/**
-		This method is used to get the string value. If the CSS value doesn't contain a string value, a `DOMException` is raised.
-	**/
-	function getStringValue() : String;
-	/** @throws DOMError */
-	
-	/**
-		This method is used to get the counter value. If this CSS value doesn't contain a counter value, a `DOMException` is raised. Modification to the corresponding style property can be achieved using the `Counter` interface.
-	**/
-	function getCounterValue() : Dynamic/*MISSING Counter*/;
-	/** @throws DOMError */
-	
-	/**
-		This method is used to get the Rect value. If this CSS value doesn't contain a rect value, a `DOMException` is raised. Modification to the corresponding style property can be achieved using the `Rect` interface.
-	**/
-	function getRectValue() : Rect;
-	/** @throws DOMError */
-	
-	/**
-		This method is used to get the RGB color. If this CSS value doesn't contain a RGB color value, a `DOMException` is raised. Modification to the corresponding style property can be achieved using the `RGBColor` interface.
-	**/
-	function getRGBColorValue() : RGBColor;
-}
\ No newline at end of file
diff --git a/std/js/html/CSSPseudoElement.hx b/std/js/html/CSSPseudoElement.hx
index 5a72edc0592b6f1d9e556767c6731af6b4c6e603..0ac3c8ea81fc4d63a820511f151cf4a0421f00c2 100644
--- a/std/js/html/CSSPseudoElement.hx
+++ b/std/js/html/CSSPseudoElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,12 +25,12 @@
 package js.html;
 
 @:native("CSSPseudoElement")
-extern class CSSPseudoElement
-{
+extern class CSSPseudoElement {
 	var type(default,null) : String;
 	var parentElement(default,null) : Element;
 	
 	/** @throws DOMError */
-	function animate( frames : Dynamic, ?options : haxe.extern.EitherType<Float,Dynamic/*MISSING KeyframeAnimationOptions*/> ) : Animation;
-	function getAnimations() : Array<Animation>;
+	@:overload( function( keyframes : Dynamic, ?options : KeyframeAnimationOptions) : Animation {} )
+	function animate( keyframes : Dynamic, ?options : Float ) : Animation;
+	function getAnimations( ?filter : AnimationFilter ) : Array<Animation>;
 }
\ No newline at end of file
diff --git a/std/js/html/CSSRule.hx b/std/js/html/CSSRule.hx
index fefc8aab81d104913bb5658e4e99e3719590b290..acd7e888538a7a7996b60c09747acca0ad5cf4d2 100644
--- a/std/js/html/CSSRule.hx
+++ b/std/js/html/CSSRule.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from cssrule.webidl. Do not edit!
+// This file is generated from mozilla\CSSRule.webidl. Do not edit!
 
 package js.html;
 
@@ -32,19 +32,23 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSRule>
 **/
 @:native("CSSRule")
-extern class CSSRule
-{
-	static inline var UNKNOWN_RULE : Int = 0;
+extern class CSSRule {
 	static inline var STYLE_RULE : Int = 1;
 	static inline var CHARSET_RULE : Int = 2;
 	static inline var IMPORT_RULE : Int = 3;
 	static inline var MEDIA_RULE : Int = 4;
 	static inline var FONT_FACE_RULE : Int = 5;
 	static inline var PAGE_RULE : Int = 6;
+	static inline var NAMESPACE_RULE : Int = 10;
+	static inline var KEYFRAMES_RULE : Int = 7;
+	static inline var KEYFRAME_RULE : Int = 8;
+	static inline var COUNTER_STYLE_RULE : Int = 11;
+	static inline var SUPPORTS_RULE : Int = 12;
+	static inline var FONT_FEATURE_VALUES_RULE : Int = 14;
 	
 	var type(default,null) : Int;
 	var cssText : String;
-	var parentStyleSheet(default,null) : CSSStyleSheet;
 	var parentRule(default,null) : CSSRule;
+	var parentStyleSheet(default,null) : CSSStyleSheet;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/CSSRuleList.hx b/std/js/html/CSSRuleList.hx
index 9f77b36af0d755b1c7b47e55fc19bfcb0c29616a..78a6f47700d98ad409a0c8e27d69384a219ac408 100644
--- a/std/js/html/CSSRuleList.hx
+++ b/std/js/html/CSSRuleList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSRuleList>
 **/
 @:native("CSSRuleList")
-extern class CSSRuleList implements ArrayAccess<CSSRule>
-{
+extern class CSSRuleList implements ArrayAccess<CSSRule> {
 	var length(default,null) : Int;
 	
 	function item( index : Int ) : CSSRule;
diff --git a/std/js/html/CSSStyleDeclaration.hx b/std/js/html/CSSStyleDeclaration.hx
index b44b68bdcb95c8ae1bc95a9ca9db89e3c997f56a..22a1cc071aa1fb055ea87374e71b984d121035ce 100644
--- a/std/js/html/CSSStyleDeclaration.hx
+++ b/std/js/html/CSSStyleDeclaration.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSStyleDeclaration>
 **/
 @:native("CSSStyleDeclaration")
-extern class CSSStyleDeclaration implements ArrayAccess<String>
-{
+extern class CSSStyleDeclaration implements ArrayAccess<String> {
 	var cssText : String;
 	var length(default,null) : Int;
 	var parentRule(default,null) : CSSRule;
@@ -78,6 +77,8 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var background :String;
 	/** Shorthand for the "background-attachment" CSS property. */
 	var backgroundAttachment :String;
+	/** Shorthand for the "background-blend-mode" CSS property. */
+	var backgroundBlendMode :String;
 	/** Shorthand for the "background-clip" CSS property. */
 	var backgroundClip :String;
 	/** Shorthand for the "background-color" CSS property. */
@@ -88,8 +89,16 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var backgroundOrigin :String;
 	/** Shorthand for the "background-position" CSS property. */
 	var backgroundPosition :String;
+	/** Shorthand for the "background-position-x" CSS property. */
+	var backgroundPositionX :String;
+	/** Shorthand for the "background-position-y" CSS property. */
+	var backgroundPositionY :String;
 	/** Shorthand for the "background-repeat" CSS property. */
 	var backgroundRepeat :String;
+	/** Shorthand for the "background-repeat-x" CSS property. */
+	var backgroundRepeatX :String;
+	/** Shorthand for the "background-repeat-y" CSS property. */
+	var backgroundRepeatY :String;
 	/** Shorthand for the "background-size" CSS property. */
 	var backgroundSize :String;
 	/** Shorthand for the "baseline-shift" CSS property. */
@@ -98,6 +107,8 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var binding :String;
 	/** Shorthand for the "bleed" CSS property. */
 	var bleed :String;
+	/** Shorthand for the "block-size" CSS property. */
+	var blockSize :String;
 	/** Shorthand for the "bookmark-label" CSS property. */
 	var bookmarkLabel :String;
 	/** Shorthand for the "bookmark-level" CSS property. */
@@ -106,6 +117,22 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var bookmarkState :String;
 	/** Shorthand for the "border" CSS property. */
 	var border :String;
+	/** Shorthand for the "border-block-end" CSS property. */
+	var borderBlockEnd :String;
+	/** Shorthand for the "border-block-end-color" CSS property. */
+	var borderBlockEndColor :String;
+	/** Shorthand for the "border-block-end-style" CSS property. */
+	var borderBlockEndStyle :String;
+	/** Shorthand for the "border-block-end-width" CSS property. */
+	var borderBlockEndWidth :String;
+	/** Shorthand for the "border-block-start" CSS property. */
+	var borderBlockStart :String;
+	/** Shorthand for the "border-block-start-color" CSS property. */
+	var borderBlockStartColor :String;
+	/** Shorthand for the "border-block-start-style" CSS property. */
+	var borderBlockStartStyle :String;
+	/** Shorthand for the "border-block-start-width" CSS property. */
+	var borderBlockStartWidth :String;
 	/** Shorthand for the "border-bottom" CSS property. */
 	var borderBottom :String;
 	/** Shorthand for the "border-bottom-color" CSS property. */
@@ -134,6 +161,22 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var borderImageSource :String;
 	/** Shorthand for the "border-image-width" CSS property. */
 	var borderImageWidth :String;
+	/** Shorthand for the "border-inline-end" CSS property. */
+	var borderInlineEnd :String;
+	/** Shorthand for the "border-inline-end-color" CSS property. */
+	var borderInlineEndColor :String;
+	/** Shorthand for the "border-inline-end-style" CSS property. */
+	var borderInlineEndStyle :String;
+	/** Shorthand for the "border-inline-end-width" CSS property. */
+	var borderInlineEndWidth :String;
+	/** Shorthand for the "border-inline-start" CSS property. */
+	var borderInlineStart :String;
+	/** Shorthand for the "border-inline-start-color" CSS property. */
+	var borderInlineStartColor :String;
+	/** Shorthand for the "border-inline-start-style" CSS property. */
+	var borderInlineStartStyle :String;
+	/** Shorthand for the "border-inline-start-width" CSS property. */
+	var borderInlineStartWidth :String;
 	/** Shorthand for the "border-left" CSS property. */
 	var borderLeft :String;
 	/** Shorthand for the "border-left-color" CSS property. */
@@ -188,8 +231,12 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var breakBefore :String;
 	/** Shorthand for the "break-inside" CSS property. */
 	var breakInside :String;
+	/** Shorthand for the "buffered-rendering" CSS property. */
+	var bufferedRendering :String;
 	/** Shorthand for the "caption-side" CSS property. */
 	var captionSide :String;
+	/** Shorthand for the "caret-color" CSS property. */
+	var caretColor :String;
 	/** Shorthand for the "chains" CSS property. */
 	var chains :String;
 	/** Shorthand for the "clear" CSS property. */
@@ -202,8 +249,14 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var clipRule :String;
 	/** Shorthand for the "color" CSS property. */
 	var color :String;
+	/** Shorthand for the "color-adjust" CSS property. */
+	var colorAdjust :String;
+	/** Shorthand for the "color-interpolation" CSS property. */
+	var colorInterpolation :String;
 	/** Shorthand for the "color-interpolation-filters" CSS property. */
 	var colorInterpolationFilters :String;
+	/** Shorthand for the "color-rendering" CSS property. */
+	var colorRendering :String;
 	/** Shorthand for the "column-count" CSS property. */
 	var columnCount :String;
 	/** Shorthand for the "column-fill" CSS property. */
@@ -236,6 +289,8 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var counterSet :String;
 	/** Shorthand for the "crop" CSS property. */
 	var crop :String;
+	/** Shorthand for the "css-float" CSS property. */
+	var cssFloat :String;
 	/** Shorthand for the "cue" CSS property. */
 	var cue :String;
 	/** Shorthand for the "cue-after" CSS property. */
@@ -244,6 +299,12 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var cueBefore :String;
 	/** Shorthand for the "cursor" CSS property. */
 	var cursor :String;
+	/** Shorthand for the "cx" CSS property. */
+	var cx :String;
+	/** Shorthand for the "cy" CSS property. */
+	var cy :String;
+	/** Shorthand for the "d" CSS property. */
+	var d :String;
 	/** Shorthand for the "direction" CSS property. */
 	var direction :String;
 	/** Shorthand for the "display" CSS property. */
@@ -260,6 +321,12 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var elevation :String;
 	/** Shorthand for the "empty-cells" CSS property. */
 	var emptyCells :String;
+	/** Shorthand for the "fill" CSS property. */
+	var fill :String;
+	/** Shorthand for the "fill-opacity" CSS property. */
+	var fillOpacity :String;
+	/** Shorthand for the "fill-rule" CSS property. */
+	var fillRule :String;
 	/** Shorthand for the "filter" CSS property. */
 	var filter :String;
 	/** Shorthand for the "flex" CSS property. */
@@ -290,6 +357,8 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var flowInto :String;
 	/** Shorthand for the "font" CSS property. */
 	var font :String;
+	/** Shorthand for the "font-display" CSS property. */
+	var fontDisplay :String;
 	/** Shorthand for the "font-family" CSS property. */
 	var fontFamily :String;
 	/** Shorthand for the "font-feature-settings" CSS property. */
@@ -298,6 +367,8 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var fontKerning :String;
 	/** Shorthand for the "font-language-override" CSS property. */
 	var fontLanguageOverride :String;
+	/** Shorthand for the "font-optical-sizing" CSS property. */
+	var fontOpticalSizing :String;
 	/** Shorthand for the "font-size" CSS property. */
 	var fontSize :String;
 	/** Shorthand for the "font-size-adjust" CSS property. */
@@ -322,8 +393,12 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var fontVariantNumeric :String;
 	/** Shorthand for the "font-variant-position" CSS property. */
 	var fontVariantPosition :String;
+	/** Shorthand for the "font-variation-settings" CSS property. */
+	var fontVariationSettings :String;
 	/** Shorthand for the "font-weight" CSS property. */
 	var fontWeight :String;
+	/** Shorthand for the "gap" CSS property. */
+	var gap :String;
 	/** Shorthand for the "grid" CSS property. */
 	var grid :String;
 	/** Shorthand for the "grid-area" CSS property. */
@@ -338,12 +413,18 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var gridColumn :String;
 	/** Shorthand for the "grid-column-end" CSS property. */
 	var gridColumnEnd :String;
+	/** Shorthand for the "grid-column-gap" CSS property. */
+	var gridColumnGap :String;
 	/** Shorthand for the "grid-column-start" CSS property. */
 	var gridColumnStart :String;
+	/** Shorthand for the "grid-gap" CSS property. */
+	var gridGap :String;
 	/** Shorthand for the "grid-row" CSS property. */
 	var gridRow :String;
 	/** Shorthand for the "grid-row-end" CSS property. */
 	var gridRowEnd :String;
+	/** Shorthand for the "grid-row-gap" CSS property. */
+	var gridRowGap :String;
 	/** Shorthand for the "grid-row-start" CSS property. */
 	var gridRowStart :String;
 	/** Shorthand for the "grid-template" CSS property. */
@@ -364,6 +445,8 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var icon :String;
 	/** Shorthand for the "image-orientation" CSS property. */
 	var imageOrientation :String;
+	/** Shorthand for the "image-rendering" CSS property. */
+	var imageRendering :String;
 	/** Shorthand for the "image-resolution" CSS property. */
 	var imageResolution :String;
 	/** Shorthand for the "ime-mode" CSS property. */
@@ -372,6 +455,10 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var initialLetters :String;
 	/** Shorthand for the "inline-box-align" CSS property. */
 	var inlineBoxAlign :String;
+	/** Shorthand for the "inline-size" CSS property. */
+	var inlineSize :String;
+	/** Shorthand for the "isolation" CSS property. */
+	var isolation :String;
 	/** Shorthand for the "justify-content" CSS property. */
 	var justifyContent :String;
 	/** Shorthand for the "justify-items" CSS property. */
@@ -412,18 +499,34 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var listStyleType :String;
 	/** Shorthand for the "margin" CSS property. */
 	var margin :String;
+	/** Shorthand for the "margin-block-end" CSS property. */
+	var marginBlockEnd :String;
+	/** Shorthand for the "margin-block-start" CSS property. */
+	var marginBlockStart :String;
 	/** Shorthand for the "margin-bottom" CSS property. */
 	var marginBottom :String;
+	/** Shorthand for the "margin-inline-end" CSS property. */
+	var marginInlineEnd :String;
+	/** Shorthand for the "margin-inline-start" CSS property. */
+	var marginInlineStart :String;
 	/** Shorthand for the "margin-left" CSS property. */
 	var marginLeft :String;
 	/** Shorthand for the "margin-right" CSS property. */
 	var marginRight :String;
 	/** Shorthand for the "margin-top" CSS property. */
 	var marginTop :String;
+	/** Shorthand for the "marker" CSS property. */
+	var marker :String;
+	/** Shorthand for the "marker-end" CSS property. */
+	var markerEnd :String;
+	/** Shorthand for the "marker-mid" CSS property. */
+	var markerMid :String;
 	/** Shorthand for the "marker-offset" CSS property. */
 	var markerOffset :String;
 	/** Shorthand for the "marker-side" CSS property. */
 	var markerSide :String;
+	/** Shorthand for the "marker-start" CSS property. */
+	var markerStart :String;
 	/** Shorthand for the "marks" CSS property. */
 	var marks :String;
 	/** Shorthand for the "mask" CSS property. */
@@ -442,12 +545,20 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var maskBoxWidth :String;
 	/** Shorthand for the "mask-clip" CSS property. */
 	var maskClip :String;
+	/** Shorthand for the "mask-composite" CSS property. */
+	var maskComposite :String;
 	/** Shorthand for the "mask-image" CSS property. */
 	var maskImage :String;
+	/** Shorthand for the "mask-mode" CSS property. */
+	var maskMode :String;
 	/** Shorthand for the "mask-origin" CSS property. */
 	var maskOrigin :String;
 	/** Shorthand for the "mask-position" CSS property. */
 	var maskPosition :String;
+	/** Shorthand for the "mask-position-x" CSS property. */
+	var maskPositionX :String;
+	/** Shorthand for the "mask-position-y" CSS property. */
+	var maskPositionY :String;
 	/** Shorthand for the "mask-repeat" CSS property. */
 	var maskRepeat :String;
 	/** Shorthand for the "mask-size" CSS property. */
@@ -456,16 +567,30 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var maskSourceType :String;
 	/** Shorthand for the "mask-type" CSS property. */
 	var maskType :String;
+	/** Shorthand for the "max-block-size" CSS property. */
+	var maxBlockSize :String;
 	/** Shorthand for the "max-height" CSS property. */
 	var maxHeight :String;
+	/** Shorthand for the "max-inline-size" CSS property. */
+	var maxInlineSize :String;
 	/** Shorthand for the "max-lines" CSS property. */
 	var maxLines :String;
 	/** Shorthand for the "max-width" CSS property. */
 	var maxWidth :String;
+	/** Shorthand for the "max-zoom" CSS property. */
+	var maxZoom :String;
+	/** Shorthand for the "min-block-size" CSS property. */
+	var minBlockSize :String;
 	/** Shorthand for the "min-height" CSS property. */
 	var minHeight :String;
+	/** Shorthand for the "min-inline-size" CSS property. */
+	var minInlineSize :String;
 	/** Shorthand for the "min-width" CSS property. */
 	var minWidth :String;
+	/** Shorthand for the "min-zoom" CSS property. */
+	var minZoom :String;
+	/** Shorthand for the "mix-blend-mode" CSS property. */
+	var mixBlendMode :String;
 	/** Shorthand for the "move-to" CSS property. */
 	var moveTo :String;
 	/** Shorthand for the "nav-down" CSS property. */
@@ -482,10 +607,28 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var objectFit :String;
 	/** Shorthand for the "object-position" CSS property. */
 	var objectPosition :String;
+	/** Shorthand for the "offset" CSS property. */
+	var offset :String;
+	/** Shorthand for the "offset-block-end" CSS property. */
+	var offsetBlockEnd :String;
+	/** Shorthand for the "offset-block-start" CSS property. */
+	var offsetBlockStart :String;
+	/** Shorthand for the "offset-distance" CSS property. */
+	var offsetDistance :String;
+	/** Shorthand for the "offset-inline-end" CSS property. */
+	var offsetInlineEnd :String;
+	/** Shorthand for the "offset-inline-start" CSS property. */
+	var offsetInlineStart :String;
+	/** Shorthand for the "offset-path" CSS property. */
+	var offsetPath :String;
+	/** Shorthand for the "offset-rotate" CSS property. */
+	var offsetRotate :String;
 	/** Shorthand for the "opacity" CSS property. */
 	var opacity :String;
 	/** Shorthand for the "order" CSS property. */
 	var order :String;
+	/** Shorthand for the "orientation" CSS property. */
+	var orientation :String;
 	/** Shorthand for the "orphans" CSS property. */
 	var orphans :String;
 	/** Shorthand for the "outline" CSS property. */
@@ -500,16 +643,32 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var outlineWidth :String;
 	/** Shorthand for the "overflow" CSS property. */
 	var overflow :String;
+	/** Shorthand for the "overflow-anchor" CSS property. */
+	var overflowAnchor :String;
 	/** Shorthand for the "overflow-wrap" CSS property. */
 	var overflowWrap :String;
 	/** Shorthand for the "overflow-x" CSS property. */
 	var overflowX :String;
 	/** Shorthand for the "overflow-y" CSS property. */
 	var overflowY :String;
+	/** Shorthand for the "overscroll-behavior" CSS property. */
+	var overscrollBehavior :String;
+	/** Shorthand for the "overscroll-behavior-x" CSS property. */
+	var overscrollBehaviorX :String;
+	/** Shorthand for the "overscroll-behavior-y" CSS property. */
+	var overscrollBehaviorY :String;
 	/** Shorthand for the "padding" CSS property. */
 	var padding :String;
+	/** Shorthand for the "padding-block-end" CSS property. */
+	var paddingBlockEnd :String;
+	/** Shorthand for the "padding-block-start" CSS property. */
+	var paddingBlockStart :String;
 	/** Shorthand for the "padding-bottom" CSS property. */
 	var paddingBottom :String;
+	/** Shorthand for the "padding-inline-end" CSS property. */
+	var paddingInlineEnd :String;
+	/** Shorthand for the "padding-inline-start" CSS property. */
+	var paddingInlineStart :String;
 	/** Shorthand for the "padding-left" CSS property. */
 	var paddingLeft :String;
 	/** Shorthand for the "padding-right" CSS property. */
@@ -526,6 +685,8 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var pageBreakInside :String;
 	/** Shorthand for the "page-policy" CSS property. */
 	var pagePolicy :String;
+	/** Shorthand for the "paint-order" CSS property. */
+	var paintOrder :String;
 	/** Shorthand for the "pause" CSS property. */
 	var pause :String;
 	/** Shorthand for the "pause-after" CSS property. */
@@ -540,14 +701,24 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var pitch :String;
 	/** Shorthand for the "pitch-range" CSS property. */
 	var pitchRange :String;
+	/** Shorthand for the "place-content" CSS property. */
+	var placeContent :String;
+	/** Shorthand for the "place-items" CSS property. */
+	var placeItems :String;
+	/** Shorthand for the "place-self" CSS property. */
+	var placeSelf :String;
 	/** Shorthand for the "play-during" CSS property. */
 	var playDuring :String;
+	/** Shorthand for the "pointer-events" CSS property. */
+	var pointerEvents :String;
 	/** Shorthand for the "position" CSS property. */
 	var position :String;
 	/** Shorthand for the "presentation-level" CSS property. */
 	var presentationLevel :String;
 	/** Shorthand for the "quotes" CSS property. */
 	var quotes :String;
+	/** Shorthand for the "r" CSS property. */
+	var r :String;
 	/** Shorthand for the "region-fragment" CSS property. */
 	var regionFragment :String;
 	/** Shorthand for the "resize" CSS property. */
@@ -566,18 +737,42 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var rotation :String;
 	/** Shorthand for the "rotation-point" CSS property. */
 	var rotationPoint :String;
+	/** Shorthand for the "row-gap" CSS property. */
+	var rowGap :String;
 	/** Shorthand for the "ruby-align" CSS property. */
 	var rubyAlign :String;
 	/** Shorthand for the "ruby-merge" CSS property. */
 	var rubyMerge :String;
 	/** Shorthand for the "ruby-position" CSS property. */
 	var rubyPosition :String;
+	/** Shorthand for the "rx" CSS property. */
+	var rx :String;
+	/** Shorthand for the "ry" CSS property. */
+	var ry :String;
+	/** Shorthand for the "scroll-behavior" CSS property. */
+	var scrollBehavior :String;
+	/** Shorthand for the "scroll-snap-coordinate" CSS property. */
+	var scrollSnapCoordinate :String;
+	/** Shorthand for the "scroll-snap-destination" CSS property. */
+	var scrollSnapDestination :String;
+	/** Shorthand for the "scroll-snap-points-x" CSS property. */
+	var scrollSnapPointsX :String;
+	/** Shorthand for the "scroll-snap-points-y" CSS property. */
+	var scrollSnapPointsY :String;
+	/** Shorthand for the "scroll-snap-type" CSS property. */
+	var scrollSnapType :String;
+	/** Shorthand for the "scroll-snap-type-x" CSS property. */
+	var scrollSnapTypeX :String;
+	/** Shorthand for the "scroll-snap-type-y" CSS property. */
+	var scrollSnapTypeY :String;
 	/** Shorthand for the "shape-image-threshold" CSS property. */
 	var shapeImageThreshold :String;
-	/** Shorthand for the "shape-outside" CSS property. */
-	var shapeOutside :String;
 	/** Shorthand for the "shape-margin" CSS property. */
 	var shapeMargin :String;
+	/** Shorthand for the "shape-outside" CSS property. */
+	var shapeOutside :String;
+	/** Shorthand for the "shape-rendering" CSS property. */
+	var shapeRendering :String;
 	/** Shorthand for the "size" CSS property. */
 	var size :String;
 	/** Shorthand for the "speak" CSS property. */
@@ -592,10 +787,32 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var speakPunctuation :String;
 	/** Shorthand for the "speech-rate" CSS property. */
 	var speechRate :String;
+	/** Shorthand for the "src" CSS property. */
+	var src :String;
+	/** Shorthand for the "stop-color" CSS property. */
+	var stopColor :String;
+	/** Shorthand for the "stop-opacity" CSS property. */
+	var stopOpacity :String;
 	/** Shorthand for the "stress" CSS property. */
 	var stress :String;
 	/** Shorthand for the "string-set" CSS property. */
 	var stringSet :String;
+	/** Shorthand for the "stroke" CSS property. */
+	var stroke :String;
+	/** Shorthand for the "stroke-dasharray" CSS property. */
+	var strokeDasharray :String;
+	/** Shorthand for the "stroke-dashoffset" CSS property. */
+	var strokeDashoffset :String;
+	/** Shorthand for the "stroke-linecap" CSS property. */
+	var strokeLinecap :String;
+	/** Shorthand for the "stroke-linejoin" CSS property. */
+	var strokeLinejoin :String;
+	/** Shorthand for the "stroke-miterlimit" CSS property. */
+	var strokeMiterlimit :String;
+	/** Shorthand for the "stroke-opacity" CSS property. */
+	var strokeOpacity :String;
+	/** Shorthand for the "stroke-width" CSS property. */
+	var strokeWidth :String;
 	/** Shorthand for the "tab-size" CSS property. */
 	var tabSize :String;
 	/** Shorthand for the "table-layout" CSS property. */
@@ -604,6 +821,8 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var textAlign :String;
 	/** Shorthand for the "text-align-last" CSS property. */
 	var textAlignLast :String;
+	/** Shorthand for the "text-anchor" CSS property. */
+	var textAnchor :String;
 	/** Shorthand for the "text-combine-upright" CSS property. */
 	var textCombineUpright :String;
 	/** Shorthand for the "text-decoration" CSS property. */
@@ -614,6 +833,8 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var textDecorationLine :String;
 	/** Shorthand for the "text-decoration-skip" CSS property. */
 	var textDecorationSkip :String;
+	/** Shorthand for the "text-decoration-skip-ink" CSS property. */
+	var textDecorationSkipInk :String;
 	/** Shorthand for the "text-decoration-style" CSS property. */
 	var textDecorationStyle :String;
 	/** Shorthand for the "text-emphasis" CSS property. */
@@ -634,8 +855,12 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var textOrientation :String;
 	/** Shorthand for the "text-overflow" CSS property. */
 	var textOverflow :String;
+	/** Shorthand for the "text-rendering" CSS property. */
+	var textRendering :String;
 	/** Shorthand for the "text-shadow" CSS property. */
 	var textShadow :String;
+	/** Shorthand for the "text-size-adjust" CSS property. */
+	var textSizeAdjust :String;
 	/** Shorthand for the "text-space-collapse" CSS property. */
 	var textSpaceCollapse :String;
 	/** Shorthand for the "text-transform" CSS property. */
@@ -646,8 +871,12 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var textWrap :String;
 	/** Shorthand for the "top" CSS property. */
 	var top :String;
+	/** Shorthand for the "touch-action" CSS property. */
+	var touchAction :String;
 	/** Shorthand for the "transform" CSS property. */
 	var transform :String;
+	/** Shorthand for the "transform-box" CSS property. */
+	var transformBox :String;
 	/** Shorthand for the "transform-origin" CSS property. */
 	var transformOrigin :String;
 	/** Shorthand for the "transform-style" CSS property. */
@@ -664,6 +893,14 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var transitionTimingFunction :String;
 	/** Shorthand for the "unicode-bidi" CSS property. */
 	var unicodeBidi :String;
+	/** Shorthand for the "unicode-range" CSS property. */
+	var unicodeRange :String;
+	/** Shorthand for the "user-select" CSS property. */
+	var userSelect :String;
+	/** Shorthand for the "user-zoom" CSS property. */
+	var userZoom :String;
+	/** Shorthand for the "vector-effect" CSS property. */
+	var vectorEffect :String;
 	/** Shorthand for the "vertical-align" CSS property. */
 	var verticalAlign :String;
 	/** Shorthand for the "visibility" CSS property. */
@@ -706,17 +943,21 @@ extern class CSSStyleDeclaration implements ArrayAccess<String>
 	var wrapThrough :String;
 	/** Shorthand for the "writing-mode" CSS property. */
 	var writingMode :String;
+	/** Shorthand for the "x" CSS property. */
+	var x :String;
+	/** Shorthand for the "y" CSS property. */
+	var y :String;
 	/** Shorthand for the "z-index" CSS property. */
 	var zIndex :String;
+	/** Shorthand for the "zoom" CSS property. */
+	var zoom :String;
 	
 	function item( index : Int ) : String;
 	/** @throws DOMError */
 	function getPropertyValue( property : String ) : String;
-	/** @throws DOMError */
-	function getPropertyCSSValue( property : String ) : CSSValue;
 	function getPropertyPriority( property : String ) : String;
 	/** @throws DOMError */
-	function setProperty( property : String, value : String, ?priority : String = "" ) : Void;
+	function setProperty( property : String, value : String, priority : String = "" ) : Void;
 	/** @throws DOMError */
 	function removeProperty( property : String ) : String;
 }
\ No newline at end of file
diff --git a/std/js/html/CSSStyleRule.hx b/std/js/html/CSSStyleRule.hx
index f94707ef0bf7c7afb6639f7788db98e1d403a058..1fc1d7c92694c6f3d69d8f96831adc81ecbd14ef 100644
--- a/std/js/html/CSSStyleRule.hx
+++ b/std/js/html/CSSStyleRule.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from cssrule.webidl. Do not edit!
+// This file is generated from mozilla\CSSStyleRule.webidl. Do not edit!
 
 package js.html;
 
@@ -32,9 +32,16 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSStyleRule>
 **/
 @:native("CSSStyleRule")
-extern class CSSStyleRule extends CSSRule
-{
+extern class CSSStyleRule extends CSSRule {
+	
+	/**
+		Gets the textual representation of the selector for this rule, e.g. `"h1,h2"`.
+	**/
 	var selectorText : String;
+	
+	/**
+		Returns the `CSSStyleDeclaration` object for the rule.
+	**/
 	var style(default,null) : CSSStyleDeclaration;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/CSSStyleSheet.hx b/std/js/html/CSSStyleSheet.hx
index d6a03461b94a826ce02d66aa5995a629b55b310c..6ed72d4474b5d9449a6c618c85482b7bb33ff654 100644
--- a/std/js/html/CSSStyleSheet.hx
+++ b/std/js/html/CSSStyleSheet.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,34 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSStyleSheet>
 **/
 @:native("CSSStyleSheet")
-extern class CSSStyleSheet extends StyleSheet
-{
+extern class CSSStyleSheet extends StyleSheet {
+	
+	/**
+		If this style sheet is imported into the document using an `@import` rule, the `ownerRule` property will return that `CSSImportRule`, otherwise it returns `null`.
+	**/
 	var ownerRule(default,null) : CSSRule;
+	
+	/**
+		Returns a live `CSSRuleList`, listing the `CSSRule` objects in the style sheet.
+		
+		 This is normally used to access individual rules like this:
+		
+		 `   styleSheet.cssRules[i] // where i = 0..cssRules.length-1`
+		
+		 To add or remove items in `cssRules`, use the `CSSStyleSheet`'s `deleteRule()` and `insertRule()` methods, described below.
+	**/
 	var cssRules(default,null) : CSSRuleList;
 	
-	/** @throws DOMError */
-	function insertRule( rule : String, index : Int ) : Int;
-	/** @throws DOMError */
+	
+	/**
+		Inserts a new rule at the specified position in the style sheet, given the textual representation of the rule.
+		@throws DOMError
+	**/
+	function insertRule( rule : String, index : Int = 0 ) : Int;
+	
+	/**
+		Deletes a rule at the specified position from the style sheet.
+		@throws DOMError
+	**/
 	function deleteRule( index : Int ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/CSSSupportsRule.hx b/std/js/html/CSSSupportsRule.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e708dd47dcac06d46c73bd91e819dd2fe610ce79
--- /dev/null
+++ b/std/js/html/CSSSupportsRule.hx
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CSSSupportsRule.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `CSSSupportsRule` interface describes an object representing a single CSS `@supports` at-rule. It implements the `CSSConditionRule` interface, and therefore the `CSSRule` and `CSSGroupingRule` interfaces with a type value of `12` (`CSSRule.SUPPORTS_RULE`).
+
+	Documentation [CSSSupportsRule](https://developer.mozilla.org/en-US/docs/Web/API/CSSSupportsRule) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CSSSupportsRule$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSSupportsRule>
+**/
+@:native("CSSSupportsRule")
+extern class CSSSupportsRule extends CSSConditionRule {
+}
\ No newline at end of file
diff --git a/std/js/html/CSSTransition.hx b/std/js/html/CSSTransition.hx
index 0fc880834d40b85ac1e2effa1bfcdbecbd3620af..336547aa2ac9a612972e2d0166029df0649ab749 100644
--- a/std/js/html/CSSTransition.hx
+++ b/std/js/html/CSSTransition.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("CSSTransition")
-extern class CSSTransition extends Animation
-{
+extern class CSSTransition extends Animation {
 	var transitionProperty(default,null) : String;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/CSSValue.hx b/std/js/html/CSSValue.hx
deleted file mode 100644
index 0f3aea68306919dfeddf541223c8cf0cd6a930b2..0000000000000000000000000000000000000000
--- a/std/js/html/CSSValue.hx
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-// This file is generated from mozilla\CSSValue.webidl. Do not edit!
-
-package js.html;
-
-/**
-	The `CSSValue` interface represents the current computed value of a CSS property.
-
-	Documentation [CSSValue](https://developer.mozilla.org/en-US/docs/Web/API/CSSValue) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CSSValue$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
-
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSValue>
-**/
-@:native("CSSValue")
-extern class CSSValue
-{
-	static inline var CSS_INHERIT : Int = 0;
-	static inline var CSS_PRIMITIVE_VALUE : Int = 1;
-	static inline var CSS_VALUE_LIST : Int = 2;
-	static inline var CSS_CUSTOM : Int = 3;
-	
-	
-	/**
-		A `DOMString` representing the current value.
-	**/
-	var cssText : String;
-	
-	/**
-		An <code>unsigned short</code> representing a code defining the type of the value. Possible values are:
-		 <table class="standard-table">
-		  
-		   <tr>
-		    <td class="header">Constant</td>
-		    <td class="header">Description</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_CUSTOM</code></td>
-		    <td>The value is a custom value.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_INHERIT</code></td>
-		    <td>The value is inherited and the <code>cssText</code> contains <code>"inherit"</code>.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_PRIMITIVE_VALUE</code></td>
-		    <td>The value is a primitive value and an instance of the <code>CSSPrimitiveValue</code> interface can be obtained by using binding-specific casting methods on this instance of the <code>CSSValue</code> interface.</td>
-		   </tr>
-		   <tr>
-		    <td><code>CSS_VALUE_LIST</code></td>
-		    <td>The value is a <code>CSSValue</code> list and an instance of the <code>CSSValueList</code> interface can be obtained by using binding-specific casting methods on this instance of the <code>CSSValue</code> interface.</td>
-		   </tr>
-		  
-		 </table>
-		 
-	**/
-	var cssValueType(default,null) : Int;
-	
-}
\ No newline at end of file
diff --git a/std/js/html/Cache.hx b/std/js/html/Cache.hx
new file mode 100644
index 0000000000000000000000000000000000000000..93b9bd6d39d7f5402790e9ebb256625bdcc47298
--- /dev/null
+++ b/std/js/html/Cache.hx
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Cache.webidl. Do not edit!
+
+package js.html;
+
+import js.lib.Promise;
+
+/**
+	The `Cache` interface provides a storage mechanism for `Request` / `Response` object pairs that are cached, for example as part of the `ServiceWorker` life cycle. Note that the `Cache` interface is exposed to windowed scopes as well as workers. You don't have to use it in conjunction with service workers, even though it is defined in the service worker spec.
+
+	Documentation [Cache](https://developer.mozilla.org/en-US/docs/Web/API/Cache) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Cache$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/Cache>
+**/
+@:native("Cache")
+extern class Cache {
+	@:overload( function( request : String, ?options : CacheQueryOptions) : Promise<Response> {} )
+	function match( request : Request, ?options : CacheQueryOptions ) : Promise<Response>;
+	@:overload( function( ?request : String, ?options : CacheQueryOptions) : Promise<Array<Response>> {} )
+	function matchAll( ?request : Request, ?options : CacheQueryOptions ) : Promise<Array<Response>>;
+	@:overload( function( request : String) : Promise<Void> {} )
+	function add( request : Request ) : Promise<Void>;
+	function addAll( requests : Array<haxe.extern.EitherType<Request,String>> ) : Promise<Void>;
+	@:overload( function( request : String, response : Response) : Promise<Void> {} )
+	function put( request : Request, response : Response ) : Promise<Void>;
+	@:overload( function( request : String, ?options : CacheQueryOptions) : Promise<Bool> {} )
+	function delete( request : Request, ?options : CacheQueryOptions ) : Promise<Bool>;
+	@:overload( function( ?request : String, ?options : CacheQueryOptions) : Promise<Array<Request>> {} )
+	function keys( ?request : Request, ?options : CacheQueryOptions ) : Promise<Array<Request>>;
+}
\ No newline at end of file
diff --git a/std/js/html/CacheQueryOptions.hx b/std/js/html/CacheQueryOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..95ff29369809853e74cd25f0d2eef41d41835cd7
--- /dev/null
+++ b/std/js/html/CacheQueryOptions.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Cache.webidl. Do not edit!
+
+package js.html;
+
+typedef CacheQueryOptions = {
+	var ?cacheName : String;
+	var ?ignoreMethod : Bool;
+	var ?ignoreSearch : Bool;
+	var ?ignoreVary : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/CacheStorage.hx b/std/js/html/CacheStorage.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8a7546b07f062d1579e028577a2bded832761e23
--- /dev/null
+++ b/std/js/html/CacheStorage.hx
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CacheStorage.webidl. Do not edit!
+
+package js.html;
+
+import js.lib.Promise;
+
+/**
+	The `CacheStorage` interface represents the storage for `Cache` objects.
+
+	Documentation [CacheStorage](https://developer.mozilla.org/en-US/docs/Web/API/CacheStorage) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CacheStorage$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/CacheStorage>
+**/
+@:native("CacheStorage")
+extern class CacheStorage {
+	/** @throws DOMError */
+	function new( namespace : CacheStorageNamespace, principal : Dynamic/*MISSING Principal*/ ) : Void;
+
+	/**
+		Checks if a given `Request` is a key in any of the `Cache` objects that the `CacheStorage` object tracks, and returns a `Promise` that resolves to that match.
+	**/
+	@:overload( function( request : String, ?options : CacheQueryOptions) : Promise<Response> {} )
+	function match( request : Request, ?options : CacheQueryOptions ) : Promise<Response>;
+
+	/**
+		Returns a `Promise` that resolves to `true` if a `Cache` object matching the `cacheName` exists.
+	**/
+	function has( cacheName : String ) : Promise<Bool>;
+
+	/**
+		Returns a `Promise` that resolves to the `Cache` object matching the `cacheName` (a new cache is created if it doesn't already exist.)
+	**/
+	function open( cacheName : String ) : Promise<Cache>;
+
+	/**
+		Finds the `Cache` object matching the `cacheName`, and if found, deletes the `Cache` object and returns a `Promise` that resolves to `true`. If no `Cache` object is found, it returns `false`.
+	**/
+	function delete( cacheName : String ) : Promise<Bool>;
+
+	/**
+		Returns a `Promise` that will resolve with an array containing strings corresponding to all of the named `Cache` objects tracked by the `CacheStorage`. Use this method to iterate over a list of all the `Cache` objects.
+	**/
+	function keys() : Promise<Array<String>>;
+}
\ No newline at end of file
diff --git a/std/js/html/CacheStorageNamespace.hx b/std/js/html/CacheStorageNamespace.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4a5ed31e90e3bf4f780df2e12a36cbd71b2c1061
--- /dev/null
+++ b/std/js/html/CacheStorageNamespace.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CacheStorage.webidl. Do not edit!
+
+package js.html;
+
+enum abstract CacheStorageNamespace(String) {
+	var CONTENT = "content";
+	var CHROME = "chrome";
+}
\ No newline at end of file
diff --git a/std/js/html/CanvasCaptureMediaStream.hx b/std/js/html/CanvasCaptureMediaStream.hx
new file mode 100644
index 0000000000000000000000000000000000000000..935314fbe7aaa0723dcf0b47777a5aaee696c32e
--- /dev/null
+++ b/std/js/html/CanvasCaptureMediaStream.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\CanvasCaptureMediaStream.webidl. Do not edit!
+
+package js.html;
+
+@:native("CanvasCaptureMediaStream")
+extern class CanvasCaptureMediaStream extends MediaStream {
+	var canvas(default,null) : CanvasElement;
+	
+	function requestFrame() : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/CanvasElement.hx b/std/js/html/CanvasElement.hx
index ca6b006a449dd3e1ca54e2e155d7c03fa9c57937..205485fce294b5f189d1514d0b34d5849117ce9a 100644
--- a/std/js/html/CanvasElement.hx
+++ b/std/js/html/CanvasElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement>
 **/
 @:native("HTMLCanvasElement")
-extern class CanvasElement extends Element
-{
+extern class CanvasElement extends Element {
 	
 	/**
 		Is a positive `integer` reflecting the `width` HTML attribute of the `canvas` element interpreted in CSS pixels. When the attribute is not specified, or if it is set to an invalid value, like a negative, the default value of `300` is used.
@@ -45,24 +44,30 @@ extern class CanvasElement extends Element
 	**/
 	var height : Int;
 	
-	/** @throws DOMError */
 	
 	/**
-		Returns a drawing context on the canvas, or null if the context ID is not supported. A drawing context lets you draw on the canvas. Calling getContext with `"2d"` returns a `CanvasRenderingContext2D` object, whereas calling it with `"experimental-webgl"` (or `"webgl"`) returns a `WebGLRenderingContext` object. This context is only available on browsers that implement WebGL.
+		Returns a drawing context on the canvas, or null if the context ID is not supported. A drawing context lets you draw on the canvas. Calling getContext with `"2d"` returns a `CanvasRenderingContext2D` object, whereas calling it with `"webgl"` (or `"experimental-webgl"`) returns a `WebGLRenderingContext` object. This context is only available on browsers that implement WebGL.
+		@throws DOMError
 	**/
-	function getContext( contextId : String, ?contextOptions : Dynamic ) : Dynamic/*MISSING nsISupports*/;
-	/** @throws DOMError */
+	function getContext( contextId : String, ?contextOptions : Dynamic ) : Dynamic;
 	
 	/**
 		Returns a data-URL containing a representation of the image in the format specified by the `type` parameter (defaults to `png`). The returned image is in a resolution of 96dpi.
+		@throws DOMError
 	**/
-	function toDataURL( ?type : String = "", ?encoderOptions : Dynamic ) : String;
-	/** @throws DOMError */
+	function toDataURL( type : String = "", ?encoderOptions : Dynamic ) : String;
 	
 	/**
 		Creates a `Blob` object representing the image contained in the canvas; this file may be cached on the disk or stored in memory at the discretion of the user agent.
+		@throws DOMError
 	**/
-	function toBlob( callback : Blob -> Void, ?type : String = "", ?encoderOptions : Dynamic ) : Void;
+	function toBlob( callback : Blob -> Void, type : String = "", ?encoderOptions : Dynamic ) : Void;
+	
+	/**
+		Returns a `CanvasCaptureMediaStream` that is a real-time video capture of the surface of the canvas.
+		@throws DOMError
+	**/
+	function captureStream( ?frameRate : Float ) : CanvasCaptureMediaStream;
 	
 	/** Shorthand for getting a CanvasRenderingContext2D. */
 	inline function getContext2d( ?attribs : {} ) : CanvasRenderingContext2D {
@@ -72,6 +77,10 @@ extern class CanvasElement extends Element
 	inline function getContextWebGL( ?attribs : js.html.webgl.ContextAttributes ) : js.html.webgl.RenderingContext {
 		return CanvasUtil.getContextWebGL(this, attribs);
 	}
+	/** Shorthand for getting a js.html.webgl.WebGL2RenderingContext. */
+	inline function getContextWebGL2( ?attribs : js.html.webgl.ContextAttributes ) : js.html.webgl.WebGL2RenderingContext {
+		return this.getContext('webgl2', attribs);
+	}
 }
 
 private class CanvasUtil {
diff --git a/std/js/html/CanvasGradient.hx b/std/js/html/CanvasGradient.hx
index 55e9da094dbdf27c5eca586337890ee06c8f3e4e..7934def18dc40ed860f7ba86c594dbeeec9ca3f5 100644
--- a/std/js/html/CanvasGradient.hx
+++ b/std/js/html/CanvasGradient.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,12 +32,11 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CanvasGradient>
 **/
 @:native("CanvasGradient")
-extern class CanvasGradient
-{
-	/** @throws DOMError */
+extern class CanvasGradient {
 	
 	/**
 		Adds a new stop, defined by an `offset` and a `color`, to the gradient. If the offset is not between `0` and `1` an `INDEX_SIZE_ERR` is raised, if the color can't be parsed as a CSS `color`, a `SYNTAX_ERR` is raised.
+		@throws DOMError
 	**/
 	function addColorStop( offset : Float, color : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/CanvasPattern.hx b/std/js/html/CanvasPattern.hx
index b7f4bcecd86bd05aba08fae8dc949adb77dac87d..560b10dfebdc0711d29888bcd3c8ce10eef2feea 100644
--- a/std/js/html/CanvasPattern.hx
+++ b/std/js/html/CanvasPattern.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `CanvasPattern` interface represents an opaque object describing a pattern, based on an image, a canvas or a video, created by the `CanvasRenderingContext2D.createPattern()` method.
+	The `CanvasPattern` interface represents an opaque object describing a pattern, based on an image, a canvas, or a video, created by the `CanvasRenderingContext2D.createPattern()` method.
 
 	Documentation [CanvasPattern](https://developer.mozilla.org/en-US/docs/Web/API/CanvasPattern) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CanvasPattern$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CanvasPattern>
 **/
 @:native("CanvasPattern")
-extern class CanvasPattern
-{
+extern class CanvasPattern {
 	
 	/**
 		Applies an `SVGMatrix` representing a linear transform to the pattern.
diff --git a/std/js/html/CanvasRenderingContext2D.hx b/std/js/html/CanvasRenderingContext2D.hx
index 2f57327e227dcc6485c99abb8e26456526ad6bba..810444c00044b02da63ffd2eabfffda52ae09586 100644
--- a/std/js/html/CanvasRenderingContext2D.hx
+++ b/std/js/html/CanvasRenderingContext2D.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,17 +32,12 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D>
 **/
 @:native("CanvasRenderingContext2D")
-extern class CanvasRenderingContext2D
-{
+extern class CanvasRenderingContext2D {
 	var canvas(default,null) : CanvasElement;
 	var globalAlpha : Float;
 	var globalCompositeOperation : String;
 	var strokeStyle : haxe.extern.EitherType<String,haxe.extern.EitherType<CanvasGradient,CanvasPattern>>;
 	var fillStyle : haxe.extern.EitherType<String,haxe.extern.EitherType<CanvasGradient,CanvasPattern>>;
-	var shadowOffsetX : Float;
-	var shadowOffsetY : Float;
-	var shadowBlur : Float;
-	var shadowColor : String;
 	var filter : String;
 	var imageSmoothingEnabled : Bool;
 	var lineWidth : Float;
@@ -50,56 +45,50 @@ extern class CanvasRenderingContext2D
 	var lineJoin : String;
 	var miterLimit : Float;
 	var lineDashOffset : Float;
+	var shadowOffsetX : Float;
+	var shadowOffsetY : Float;
+	var shadowBlur : Float;
+	var shadowColor : String;
 	var font : String;
 	var textAlign : String;
 	var textBaseline : String;
 	
-	function save() : Void;
-	function restore() : Void;
-	/** @throws DOMError */
-	function scale( x : Float, y : Float ) : Void;
-	/** @throws DOMError */
-	function rotate( angle : Float ) : Void;
-	/** @throws DOMError */
-	function translate( x : Float, y : Float ) : Void;
 	/** @throws DOMError */
-	function transform( a : Float, b : Float, c : Float, d : Float, e : Float, f : Float ) : Void;
-	/** @throws DOMError */
-	function setTransform( a : Float, b : Float, c : Float, d : Float, e : Float, f : Float ) : Void;
-	/** @throws DOMError */
-	function resetTransform() : Void;
-	function createLinearGradient( x0 : Float, y0 : Float, x1 : Float, y1 : Float ) : CanvasGradient;
-	/** @throws DOMError */
-	function createRadialGradient( x0 : Float, y0 : Float, r0 : Float, x1 : Float, y1 : Float, r1 : Float ) : CanvasGradient;
-	/** @throws DOMError */
-	function createPattern( image : haxe.extern.EitherType<ImageElement,haxe.extern.EitherType<CanvasElement,haxe.extern.EitherType<VideoElement,ImageBitmap>>>, repetition : String ) : CanvasPattern;
-	function clearRect( x : Float, y : Float, w : Float, h : Float ) : Void;
-	function fillRect( x : Float, y : Float, w : Float, h : Float ) : Void;
-	function strokeRect( x : Float, y : Float, w : Float, h : Float ) : Void;
+	@:overload( function( image : js.html.svg.ImageElement, dx : Float, dy : Float) : Void {} )
+	@:overload( function( image : CanvasElement, dx : Float, dy : Float) : Void {} )
+	@:overload( function( image : VideoElement, dx : Float, dy : Float) : Void {} )
+	@:overload( function( image : ImageBitmap, dx : Float, dy : Float) : Void {} )
+	@:overload( function( image : js.html.svg.ImageElement, dx : Float, dy : Float, dw : Float, dh : Float) : Void {} )
+	@:overload( function( image : CanvasElement, dx : Float, dy : Float, dw : Float, dh : Float) : Void {} )
+	@:overload( function( image : VideoElement, dx : Float, dy : Float, dw : Float, dh : Float) : Void {} )
+	@:overload( function( image : ImageBitmap, dx : Float, dy : Float, dw : Float, dh : Float) : Void {} )
+	@:overload( function( image : js.html.svg.ImageElement, sx : Float, sy : Float, sw : Float, sh : Float, dx : Float, dy : Float, dw : Float, dh : Float) : Void {} )
+	@:overload( function( image : CanvasElement, sx : Float, sy : Float, sw : Float, sh : Float, dx : Float, dy : Float, dw : Float, dh : Float) : Void {} )
+	@:overload( function( image : VideoElement, sx : Float, sy : Float, sw : Float, sh : Float, dx : Float, dy : Float, dw : Float, dh : Float) : Void {} )
+	@:overload( function( image : ImageBitmap, sx : Float, sy : Float, sw : Float, sh : Float, dx : Float, dy : Float, dw : Float, dh : Float) : Void {} )
+	@:overload( function( image : ImageElement, dx : Float, dy : Float ) : Void {} )
+	@:overload( function( image : ImageElement, dx : Float, dy : Float, dw : Float, dh : Float ) : Void {} )
+	function drawImage( image : ImageElement, sx : Float, sy : Float, sw : Float, sh : Float, dx : Float, dy : Float, dw : Float, dh : Float ) : Void;
 	function beginPath() : Void;
-	@:overload( function( ?winding : CanvasWindingRule = "nonzero" ) : Void {} )
-	function fill( path : Path2D, ?winding : CanvasWindingRule = "nonzero" ) : Void;
+	@:overload( function( winding : CanvasWindingRule = NONZERO ) : Void {} )
+	function fill( path : Path2D, winding : CanvasWindingRule = NONZERO ) : Void;
 	@:overload( function() : Void {} )
 	function stroke( path : Path2D ) : Void;
-	/** @throws DOMError */
-	function drawFocusIfNeeded( element : Element ) : Void;
-	function drawCustomFocusRing( element : Element ) : Bool;
-	@:overload( function( ?winding : CanvasWindingRule = "nonzero" ) : Void {} )
-	function clip( path : Path2D, ?winding : CanvasWindingRule = "nonzero" ) : Void;
-	@:overload( function( x : Float, y : Float, ?winding : CanvasWindingRule = "nonzero" ) : Bool {} )
-	function isPointInPath( path : Path2D, x : Float, y : Float, ?winding : CanvasWindingRule = "nonzero" ) : Bool;
+	@:overload( function( winding : CanvasWindingRule = NONZERO ) : Void {} )
+	function clip( path : Path2D, winding : CanvasWindingRule = NONZERO ) : Void;
+	@:overload( function( x : Float, y : Float, winding : CanvasWindingRule = NONZERO ) : Bool {} )
+	function isPointInPath( path : Path2D, x : Float, y : Float, winding : CanvasWindingRule = NONZERO ) : Bool;
 	@:overload( function( x : Float, y : Float ) : Bool {} )
 	function isPointInStroke( path : Path2D, x : Float, y : Float ) : Bool;
+	function createLinearGradient( x0 : Float, y0 : Float, x1 : Float, y1 : Float ) : CanvasGradient;
 	/** @throws DOMError */
-	function fillText( text : String, x : Float, y : Float, ?maxWidth : Float ) : Void;
-	/** @throws DOMError */
-	function strokeText( text : String, x : Float, y : Float, ?maxWidth : Float ) : Void;
-	/** @throws DOMError */
-	function measureText( text : String ) : TextMetrics;
+	function createRadialGradient( x0 : Float, y0 : Float, r0 : Float, x1 : Float, y1 : Float, r1 : Float ) : CanvasGradient;
 	/** @throws DOMError */
-	@:overload( function( image : haxe.extern.EitherType<ImageElement,haxe.extern.EitherType<CanvasElement,haxe.extern.EitherType<VideoElement,ImageBitmap>>>, dx : Float, dy : Float ) : Void {} )
-	@:overload( function( image : haxe.extern.EitherType<ImageElement,haxe.extern.EitherType<CanvasElement,haxe.extern.EitherType<VideoElement,ImageBitmap>>>, dx : Float, dy : Float, dw : Float, dh : Float ) : Void {} )
-	function drawImage( image : haxe.extern.EitherType<ImageElement,haxe.extern.EitherType<CanvasElement,haxe.extern.EitherType<VideoElement,ImageBitmap>>>, sx : Float, sy : Float, sw : Float, sh : Float, dx : Float, dy : Float, dw : Float, dh : Float ) : Void;
+	@:overload( function( image : js.html.svg.ImageElement, repetition : String) : CanvasPattern {} )
+	@:overload( function( image : CanvasElement, repetition : String) : CanvasPattern {} )
+	@:overload( function( image : VideoElement, repetition : String) : CanvasPattern {} )
+	@:overload( function( image : ImageBitmap, repetition : String) : CanvasPattern {} )
+	function createPattern( image : ImageElement, repetition : String ) : CanvasPattern;
 	/** @throws DOMError */
 	function addHitRegion( ?options : HitRegionOptions ) : Void;
 	function removeHitRegion( id : String ) : Void;
@@ -124,7 +113,33 @@ extern class CanvasRenderingContext2D
 	function arcTo( x1 : Float, y1 : Float, x2 : Float, y2 : Float, radius : Float ) : Void;
 	function rect( x : Float, y : Float, w : Float, h : Float ) : Void;
 	/** @throws DOMError */
-	function arc( x : Float, y : Float, radius : Float, startAngle : Float, endAngle : Float, ?anticlockwise : Bool = false ) : Void;
+	function arc( x : Float, y : Float, radius : Float, startAngle : Float, endAngle : Float, anticlockwise : Bool = false ) : Void;
+	/** @throws DOMError */
+	function ellipse( x : Float, y : Float, radiusX : Float, radiusY : Float, rotation : Float, startAngle : Float, endAngle : Float, anticlockwise : Bool = false ) : Void;
+	function clearRect( x : Float, y : Float, w : Float, h : Float ) : Void;
+	function fillRect( x : Float, y : Float, w : Float, h : Float ) : Void;
+	function strokeRect( x : Float, y : Float, w : Float, h : Float ) : Void;
+	function save() : Void;
+	function restore() : Void;
+	/** @throws DOMError */
+	function fillText( text : String, x : Float, y : Float, ?maxWidth : Float ) : Void;
+	/** @throws DOMError */
+	function strokeText( text : String, x : Float, y : Float, ?maxWidth : Float ) : Void;
+	/** @throws DOMError */
+	function measureText( text : String ) : TextMetrics;
+	/** @throws DOMError */
+	function scale( x : Float, y : Float ) : Void;
+	/** @throws DOMError */
+	function rotate( angle : Float ) : Void;
+	/** @throws DOMError */
+	function translate( x : Float, y : Float ) : Void;
+	/** @throws DOMError */
+	function transform( a : Float, b : Float, c : Float, d : Float, e : Float, f : Float ) : Void;
+	/** @throws DOMError */
+	function setTransform( a : Float, b : Float, c : Float, d : Float, e : Float, f : Float ) : Void;
+	/** @throws DOMError */
+	function resetTransform() : Void;
 	/** @throws DOMError */
-	function ellipse( x : Float, y : Float, radiusX : Float, radiusY : Float, rotation : Float, startAngle : Float, endAngle : Float, ?anticlockwise : Bool = false ) : Void;
+	function drawFocusIfNeeded( element : Element ) : Void;
+	function drawCustomFocusRing( element : Element ) : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/CanvasWindingRule.hx b/std/js/html/CanvasWindingRule.hx
index c0b6c6c26b29f7d79865c058ff077261179bade2..4d7c643746acec624616227c0740c8e7bc588902 100644
--- a/std/js/html/CanvasWindingRule.hx
+++ b/std/js/html/CanvasWindingRule.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract CanvasWindingRule(String)
-{
+enum abstract CanvasWindingRule(String) {
 	var NONZERO = "nonzero";
 	var EVENODD = "evenodd";
 }
\ No newline at end of file
diff --git a/std/js/html/CaretPosition.hx b/std/js/html/CaretPosition.hx
index 45f5fede00341a4c100953570501a9f94d7ffa5e..aaa5d77eae49b1988441a391e9f69f30d8ce12d3 100644
--- a/std/js/html/CaretPosition.hx
+++ b/std/js/html/CaretPosition.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CaretPosition>
 **/
 @:native("CaretPosition")
-extern class CaretPosition
-{
+extern class CaretPosition {
 	
 	/**
 		Returns a `Node` containing the found node at the caret's position.
diff --git a/std/js/html/ChannelPixelLayout.hx b/std/js/html/ChannelPixelLayout.hx
new file mode 100644
index 0000000000000000000000000000000000000000..62671b1f5402804409b17abef8bf871b176f69b2
--- /dev/null
+++ b/std/js/html/ChannelPixelLayout.hx
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ImageBitmap.webidl. Do not edit!
+
+package js.html;
+
+typedef ChannelPixelLayout = {
+	var dataType : ChannelPixelLayoutDataType;
+	var height : Int;
+	var offset : Int;
+	var skip : Int;
+	var stride : Int;
+	var width : Int;
+}
\ No newline at end of file
diff --git a/std/js/html/CommandEvent.hx b/std/js/html/ChannelPixelLayoutDataType.hx
similarity index 75%
rename from std/js/html/CommandEvent.hx
rename to std/js/html/ChannelPixelLayoutDataType.hx
index 39b76356e9fcf5764911ef371a77997f29f3a362..66d6cb77dd30fcccfcf2694cb67cb8435f3a9426 100644
--- a/std/js/html/CommandEvent.hx
+++ b/std/js/html/ChannelPixelLayoutDataType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,14 +20,17 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\CommandEvent.webidl. Do not edit!
+// This file is generated from mozilla\ImageBitmap.webidl. Do not edit!
 
 package js.html;
 
-@:native("CommandEvent")
-extern class CommandEvent extends Event
-{
-	var command(default,null) : String;
-	
-	function initCommandEvent( type : String, canBubble : Bool, cancelable : Bool, command : String ) : Void;
+enum abstract ChannelPixelLayoutDataType(String) {
+	var UINT8 = "uint8";
+	var INT8 = "int8";
+	var UINT16 = "uint16";
+	var INT16 = "int16";
+	var UINT32 = "uint32";
+	var INT32 = "int32";
+	var FLOAT32 = "float32";
+	var FLOAT64 = "float64";
 }
\ No newline at end of file
diff --git a/std/js/html/CharacterData.hx b/std/js/html/CharacterData.hx
index a74569586f0f8f7769486aeb230849ef589a525e..a6ba5aa189964794d1bcb1d6ba8884c93bc362fb 100644
--- a/std/js/html/CharacterData.hx
+++ b/std/js/html/CharacterData.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `CharacterData` abstract interface represents a `Node` object that contains characters. This is an abstract interface, meaning there aren't any object of type `CharacterData`: it is implemented by other interfaces, like `Text`, `Comment`, or `ProcessingInstruction` which aren't abstract.
+	The `CharacterData` abstract interface represents a `Node` object that contains characters. This is an abstract interface, meaning there aren't any object of type `CharacterData`: it is implemented by other interfaces, like `Text`, '. In XML, the character sequence '--' cannot be used within a comment.">`Comment`, or `ProcessingInstruction` which aren't abstract.
 
 	Documentation [CharacterData](https://developer.mozilla.org/en-US/docs/Web/API/CharacterData) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CharacterData$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CharacterData>
 **/
 @:native("CharacterData")
-extern class CharacterData extends Node
-{
+extern class CharacterData extends Node {
 	
 	/**
 		Is a `DOMString` representing the textual data contained in this object.
@@ -47,35 +46,44 @@ extern class CharacterData extends Node
 	var previousElementSibling(default,null) : Element;
 	var nextElementSibling(default,null) : Element;
 	
-	/** @throws DOMError */
 	
 	/**
 		Returns a `DOMString` containing the part of `CharacterData.data` of the specified length and starting at the specified offset.
+		@throws DOMError
 	**/
 	function substringData( offset : Int, count : Int ) : String;
-	/** @throws DOMError */
 	
 	/**
 		Appends the given `DOMString` to the `CharacterData.data` string; when this method returns, `data` contains the concatenated `DOMString`.
+		@throws DOMError
 	**/
 	function appendData( data : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Inserts the specified characters, at the specified offset, in the `CharacterData.data` string; when this method returns, `data` contains the modified `DOMString`.
+		@throws DOMError
 	**/
 	function insertData( offset : Int, data : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Removes the specified amount of characters, starting at the specified offset, from the `CharacterData.data` string; when this method returns, `data` contains the shortened `DOMString`.
+		@throws DOMError
 	**/
 	function deleteData( offset : Int, count : Int ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Replaces the specified amount of characters, starting at the specified offset, with the specified `DOMString`; when this method returns, `data` contains the modified `DOMString`.
+		@throws DOMError
 	**/
 	function replaceData( offset : Int, count : Int, data : String ) : Void;
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function before( nodes : haxe.extern.Rest<Node> ) : Void;
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function after( nodes : haxe.extern.Rest<Node> ) : Void;
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function replaceWith( nodes : haxe.extern.Rest<Node> ) : Void;
 	function remove() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/Client.hx b/std/js/html/Client.hx
index 3018a17cfbdb067d27f9285c3a55188be16421e0..7074b7cf37a70ff80aff99b5cd229f366ae0d089 100644
--- a/std/js/html/Client.hx
+++ b/std/js/html/Client.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,35 +25,35 @@
 package js.html;
 
 /**
-	The `Client` interface of the ServiceWorker API represents the scope of a service worker client. A service worker client is either a document in a browser context or a `SharedWorker`, which is controlled by an active worker. A client object acts as a snapshot representation of its associated service worker client in the scope of a service worker.
+	The `Client` interface represents an executable context such as a `Worker`, or a `SharedWorker`. `Window` clients are represented by the more-specific `WindowClient`. You can get `Client`/`WindowClient` objects from methods such as `Clients.matchAll()` and `Clients.get()`.
 
 	Documentation [Client](https://developer.mozilla.org/en-US/docs/Web/API/Client) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Client$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Client>
 **/
 @:native("Client")
-extern class Client
-{
+extern class Client {
 	
 	/**
-		The URL of the current service worker client.
+		The URL of the client as a string.
 	**/
 	var url(default,null) : String;
+	var frameType(default,null) : FrameType;
 	
 	/**
-		Indicates the type of browsing context of the current client. This value can be one of `auxiliary`, `top-level`, `nested`, or `none`.
+		The client's type as a string. It can be "`window"`, "`worker"`, or "`sharedworker"`.
 	**/
-	var frameType(default,null) : FrameType;
+	var type(default,null) : ClientType;
 	
 	/**
-		Returns the universally unique identifier of the `Client` object.
+		The universally unique identifier of the client as a string.
 	**/
 	var id(default,null) : String;
 	
-	/** @throws DOMError */
 	
 	/**
-		Allows a service worker to send a message to a `ServiceWorkerClient`.
+		Sends a message to the client.
+		@throws DOMError
 	**/
 	function postMessage( message : Dynamic, ?transfer : Array<Dynamic> ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ClientQueryOptions.hx b/std/js/html/ClientQueryOptions.hx
index cea59eb22aff7cbe8d1b2b66f960901b31fd18aa..9bccf19ab0046ae24bd732f8e9be8acde5eee091 100644
--- a/std/js/html/ClientQueryOptions.hx
+++ b/std/js/html/ClientQueryOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-typedef ClientQueryOptions =
-{
-	@:optional var includeUncontrolled : Bool;
-	@:optional var type : Dynamic/*MISSING ClientType*/;
+typedef ClientQueryOptions = {
+	var ?includeUncontrolled : Bool;
+	var ?type : ClientType;
 }
\ No newline at end of file
diff --git a/std/js/html/ClientType.hx b/std/js/html/ClientType.hx
new file mode 100644
index 0000000000000000000000000000000000000000..444f2510b40895b64fa3fd54621e02140b4430a8
--- /dev/null
+++ b/std/js/html/ClientType.hx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Clients.webidl. Do not edit!
+
+package js.html;
+
+enum abstract ClientType(String) {
+	var WINDOW = "window";
+	var WORKER = "worker";
+	var SHAREDWORKER = "sharedworker";
+	var SERVICEWORKER = "serviceworker";
+	var ALL = "all";
+}
\ No newline at end of file
diff --git a/std/js/html/Clients.hx b/std/js/html/Clients.hx
index ba9535c14142fcab397b4f51f5a6c0bad5a80ea0..2d5d53099e7456982dbfa9baa5ca2e593e4d8c32 100644
--- a/std/js/html/Clients.hx
+++ b/std/js/html/Clients.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,29 +24,35 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
-	The `Clients` interface of the Service Workers API represents a container for a list of `Client` objects.
+	The `Clients` interface provides access to `Client` objects. Access it via ``self`.clients` within a service worker.
 
 	Documentation [Clients](https://developer.mozilla.org/en-US/docs/Web/API/Clients) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Clients$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Clients>
 **/
 @:native("Clients")
-extern class Clients
-{
-	
+extern class Clients {
+
 	/**
-		Gets a service worker client matching a given `id` and returns it in a `Promise`.
+		Returns a `Promise` for a `Client` matching a given `Client.id`.
 	**/
 	function get( id : String ) : Promise<Dynamic>;
-	
+
 	/**
-		Gets a list of service worker clients and returns them in a `Promise`. Include the `options` parameter to return all service worker clients whose origin is the same as the associated service worker's origin. If `options` are not included, the method returns only the service worker clients controlled by the service worker. 
+		Returns a `Promise` for an array of `Client` objects. An options argument allows you to control the types of clients returned. 
 	**/
 	function matchAll( ?options : ClientQueryOptions ) : Promise<Array<Client>>;
-	
+
+	/**
+		Opens a new browser window for a given url and returns a `Promise` for the new `WindowClient`.
+	**/
+	function openWindow( url : String ) : Promise<WindowClient>;
+
 	/**
-		Allows an active Service Worker to set itself as the active worker for a client page when the worker and the page are in the same scope. 
+		Allows an active service worker to set itself as the `ServiceWorkerContainer.controller` for all clients within its `ServiceWorkerRegistration.scope`. 
 	**/
 	function claim() : Promise<Void>;
 }
\ No newline at end of file
diff --git a/std/js/html/Clipboard.hx b/std/js/html/Clipboard.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ee00461d1be98a9c1aa97858eb62e29903f36289
--- /dev/null
+++ b/std/js/html/Clipboard.hx
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Clipboard.webidl. Do not edit!
+
+package js.html;
+
+import js.lib.Promise;
+
+/**
+	The `Clipboard` interface implements the Clipboard API, providing—if the user grants permission—both read and write access to the contents of the system clipboard.
+
+	Documentation [Clipboard](https://developer.mozilla.org/en-US/docs/Web/API/Clipboard) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Clipboard$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/Clipboard>
+**/
+@:native("Clipboard")
+extern class Clipboard extends EventTarget {
+	
+	/**
+		Requests arbitrary data (such as images) from the clipboard, returning a `Promise`. When the data has been retrieved, the promise is resolved with a `DataTransfer` object that provides the data.
+		@throws DOMError
+	**/
+	function read() : Promise<DataTransfer>;
+	
+	/**
+		Requests text from the system clipboard; returns a `Promise` which is resolved with a `DOMString` containing the clipboard's text once it's available.
+		@throws DOMError
+	**/
+	function readText() : Promise<String>;
+	
+	/**
+		Writes arbitrary data to the system clipboard. This asynchronous operation signals that it's finished by resolving the returned `Promise`.
+		@throws DOMError
+	**/
+	function write( data : DataTransfer ) : Promise<Void>;
+	
+	/**
+		Writes text to the system clipboard, returning a `Promise` which is resolved once the text is fully copied into the clipboard.
+		@throws DOMError
+	**/
+	function writeText( data : String ) : Promise<Void>;
+}
\ No newline at end of file
diff --git a/std/js/html/ClipboardEvent.hx b/std/js/html/ClipboardEvent.hx
index da5f9c61bcb30f3ec6f6fc7d3f912aec8237c07c..6e52531a24882044fcdc189ad2929e0a2d7b4c0e 100644
--- a/std/js/html/ClipboardEvent.hx
+++ b/std/js/html/ClipboardEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ClipboardEvent>
 **/
 @:native("ClipboardEvent")
-extern class ClipboardEvent extends Event
-{
+extern class ClipboardEvent extends Event {
 	
 	/**
 		Is a `DataTransfer` object containing the data affected by the user-initiated `cut`, `copy`, or `paste` operation, along with its MIME type.
diff --git a/std/js/html/ClipboardEventInit.hx b/std/js/html/ClipboardEventInit.hx
index 87ffbc32f8c97b47aa3d0eac42a2e4a3a7057e42..07cece3fd76ba1fb2791fc5c8d8876b6202e9580 100644
--- a/std/js/html/ClipboardEventInit.hx
+++ b/std/js/html/ClipboardEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-typedef ClipboardEventInit =
-{
-	> EventInit,
-	@:optional var data : String;
-	@:optional var dataType : String;
+typedef ClipboardEventInit = EventInit & {
+	var ?data : String;
+	var ?dataType : String;
 }
\ No newline at end of file
diff --git a/std/js/html/CloseEvent.hx b/std/js/html/CloseEvent.hx
index 752e41facdd09a728d5a4ea2dc96033e6fcf35cb..0ee0a7e24fff9b7248a00f4224d1a0ceea8d9e79 100644
--- a/std/js/html/CloseEvent.hx
+++ b/std/js/html/CloseEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent>
 **/
 @:native("CloseEvent")
-extern class CloseEvent extends Event
-{
+extern class CloseEvent extends Event {
 	
 	/**
 		Returns a `Boolean` that Indicates whether or not the connection was cleanly closed.
@@ -41,122 +40,122 @@ extern class CloseEvent extends Event
 	var wasClean(default,null) : Bool;
 	
 	/**
-		Returns an <code>unsigned short</code> containing the close code send by the server. The following values are permitted status codes.
-		 <table id="Status_codes" class="standard-table">
-		  
-		   <tr>
-		    <td class="header">Status code</td>
-		    <td class="header">Name</td>
-		    <td class="header">Description</td>
-		   </tr>
-		   <tr>
-		    <td><code>0</code>–<code>999</code></td>
-		    <td> </td>
-		    <td>Reserved and not used.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1000</code></td>
-		    <td><code>CLOSE_NORMAL</code></td>
-		    <td>Normal closure; the connection successfully completed whatever purpose for which it was created.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1001</code></td>
-		    <td><code>CLOSE_GOING_AWAY</code></td>
-		    <td>The endpoint is going away, either because of a server failure or because the browser is navigating away from the page that opened the connection.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1002</code></td>
-		    <td><code>CLOSE_PROTOCOL_ERROR</code></td>
-		    <td>The endpoint is terminating the connection due to a protocol error.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1003</code></td>
-		    <td><code>CLOSE_UNSUPPORTED</code></td>
-		    <td>The connection is being terminated because the endpoint received data of a type it cannot accept (for example, a text-only endpoint received binary data).</td>
-		   </tr>
-		   <tr>
-		    <td><code>1004</code></td>
-		    <td> </td>
-		    <td>Reserved. A meaning might be defined in the future.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1005</code></td>
-		    <td><code>CLOSE_NO_STATUS</code></td>
-		    <td>Reserved.  Indicates that no status code was provided even though one was expected.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1006</code></td>
-		    <td><code>CLOSE_ABNORMAL</code></td>
-		    <td>Reserved. Used to indicate that a connection was closed abnormally (that is, with no close frame being sent) when a status code is expected.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1007</code></td>
-		    <td>Unsupported Data</td>
-		    <td>The endpoint is terminating the connection because a message was received that contained inconsistent data (e.g., non-UTF-8 data within a text message).</td>
-		   </tr>
-		   <tr>
-		    <td><code>1008</code></td>
-		    <td>Policy Violation</td>
-		    <td>The endpoint is terminating the connection because it received a message that violates its policy. This is a generic status code, used when codes 1003 and 1009 are not suitable.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1009</code></td>
-		    <td><code>CLOSE_TOO_LARGE</code></td>
-		    <td>The endpoint is terminating the connection because a data frame was received that is too large.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1010</code></td>
-		    <td>Missing Extension</td>
-		    <td>The client is terminating the connection because it expected the server to negotiate one or more extension, but the server didn't.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1011</code></td>
-		    <td>Internal Error</td>
-		    <td>The server is terminating the connection because it encountered an unexpected condition that prevented it from fulfilling the request.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1012</code></td>
-		    <td>Service Restart</td>
-		    <td>The server is terminating the connection because it is restarting. [Ref]</td>
-		   </tr>
-		   <tr>
-		    <td><code>1013</code></td>
-		    <td>Try Again Later</td>
-		    <td>The server is terminating the connection due to a temporary condition, e.g. it is overloaded and is casting off some of its clients. [Ref]</td>
-		   </tr>
-		   <tr>
-		    <td><code>1014</code></td>
-		    <td> </td>
-		    <td>Reserved for future use by the WebSocket standard.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1015</code></td>
-		    <td>TLS Handshake</td>
-		    <td>Reserved. Indicates that the connection was closed due to a failure to perform a TLS handshake (e.g., the server certificate can't be verified).</td>
-		   </tr>
-		   <tr>
-		    <td><code>1016</code>–<code>1999</code></td>
-		    <td> </td>
-		    <td>Reserved for future use by the WebSocket standard.</td>
-		   </tr>
-		   <tr>
-		    <td><code>2000</code>–<code>2999</code></td>
-		    <td> </td>
-		    <td>Reserved for use by WebSocket extensions.</td>
-		   </tr>
-		   <tr>
-		    <td><code>3000</code>–<code>3999</code></td>
-		    <td> </td>
-		    <td>Available for use by libraries and frameworks. May not be used by applications. Available for registration at the IANA via first-come, first-serve.</td>
-		   </tr>
-		   <tr>
-		    <td><code>4000</code>–<code>4999</code></td>
-		    <td> </td>
-		    <td>Available for use by applications.</td>
-		   </tr>
-		  
-		 </table>
-		 
+		Returns an <code>unsigned short</code> containing the close code send by the server. The following values are permitted status codes. The following definitions are sourced from the IANA website [Ref]. Note that the 1xxx codes are only WebSocket-internal and not for the same meaning by the transported data (like when the application-layer protocol is invalid). The only permitted codes to be specified in Firefox are 1000 and 3000 to 4999 [Source, Bug].
+			<table id="Status_codes" class="standard-table">
+				
+					<tr>
+						<td class="header">Status code</td>
+						<td class="header">Name</td>
+						<td class="header">Description</td>
+					</tr>
+					<tr>
+						<td><code>0</code>–<code>999</code></td>
+						<td> </td>
+						<td>Reserved and not used.</td>
+					</tr>
+					<tr>
+						<td><code>1000</code></td>
+						<td>Normal Closure</td>
+						<td>Normal closure; the connection successfully completed whatever purpose for which it was created.</td>
+					</tr>
+					<tr>
+						<td><code>1001</code></td>
+						<td>Going Away</td>
+						<td>The endpoint is going away, either because of a server failure or because the browser is navigating away from the page that opened the connection.</td>
+					</tr>
+					<tr>
+						<td><code>1002</code></td>
+						<td>Protocol Error</td>
+						<td>The endpoint is terminating the connection due to a protocol error.</td>
+					</tr>
+					<tr>
+						<td><code>1003</code></td>
+						<td>Unsupported Data</td>
+						<td>The connection is being terminated because the endpoint received data of a type it cannot accept (for example, a text-only endpoint received binary data).</td>
+					</tr>
+					<tr>
+						<td><code>1004</code></td>
+						<td> </td>
+						<td>Reserved. A meaning might be defined in the future.</td>
+					</tr>
+					<tr>
+						<td><code>1005</code></td>
+						<td>No Status Recvd</td>
+						<td>Reserved.  Indicates that no status code was provided even though one was expected.</td>
+					</tr>
+					<tr>
+						<td><code>1006</code></td>
+						<td>Abnormal Closure</td>
+						<td>Reserved. Used to indicate that a connection was closed abnormally (that is, with no close frame being sent) when a status code is expected.</td>
+					</tr>
+					<tr>
+						<td><code>1007</code></td>
+						<td>Invalid frame payload data</td>
+						<td>The endpoint is terminating the connection because a message was received that contained inconsistent data (e.g., non-UTF-8 data within a text message).</td>
+					</tr>
+					<tr>
+						<td><code>1008</code></td>
+						<td>Policy Violation</td>
+						<td>The endpoint is terminating the connection because it received a message that violates its policy. This is a generic status code, used when codes 1003 and 1009 are not suitable.</td>
+					</tr>
+					<tr>
+						<td><code>1009</code></td>
+						<td>Message too big</td>
+						<td>The endpoint is terminating the connection because a data frame was received that is too large.</td>
+					</tr>
+					<tr>
+						<td><code>1010</code></td>
+						<td>Missing Extension</td>
+						<td>The client is terminating the connection because it expected the server to negotiate one or more extension, but the server didn't.</td>
+					</tr>
+					<tr>
+						<td><code>1011</code></td>
+						<td>Internal Error</td>
+						<td>The server is terminating the connection because it encountered an unexpected condition that prevented it from fulfilling the request.</td>
+					</tr>
+					<tr>
+						<td><code>1012</code></td>
+						<td>Service Restart</td>
+						<td>The server is terminating the connection because it is restarting. [Ref]</td>
+					</tr>
+					<tr>
+						<td><code>1013</code></td>
+						<td>Try Again Later</td>
+						<td>The server is terminating the connection due to a temporary condition, e.g. it is overloaded and is casting off some of its clients. [Ref]</td>
+					</tr>
+					<tr>
+						<td><code>1014</code></td>
+						<td>Bad Gateway</td>
+						<td>The server was acting as a gateway or proxy and received an invalid response from the upstream server. This is similar to 502 HTTP Status Code.</td>
+					</tr>
+					<tr>
+						<td><code>1015</code></td>
+						<td>TLS Handshake</td>
+						<td>Reserved. Indicates that the connection was closed due to a failure to perform a TLS handshake (e.g., the server certificate can't be verified).</td>
+					</tr>
+					<tr>
+						<td><code>1016</code>–<code>1999</code></td>
+						<td> </td>
+						<td>Reserved for future use by the WebSocket standard.</td>
+					</tr>
+					<tr>
+						<td><code>2000</code>–<code>2999</code></td>
+						<td> </td>
+						<td>Reserved for use by WebSocket extensions.</td>
+					</tr>
+					<tr>
+						<td><code>3000</code>–<code>3999</code></td>
+						<td> </td>
+						<td>Available for use by libraries and frameworks. May not be used by applications. Available for registration at the IANA via first-come, first-serve.</td>
+					</tr>
+					<tr>
+						<td><code>4000</code>–<code>4999</code></td>
+						<td> </td>
+						<td>Available for use by applications.</td>
+					</tr>
+				
+			</table>
+			
 	**/
 	var code(default,null) : Int;
 	
diff --git a/std/js/html/CloseEventInit.hx b/std/js/html/CloseEventInit.hx
index 11bcd080cfa0263a383f5f2ba97c4bfc6792b80c..7a33c7e50702212469667ce31d7d4664a5f11551 100644
--- a/std/js/html/CloseEventInit.hx
+++ b/std/js/html/CloseEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,8 @@
 
 package js.html;
 
-typedef CloseEventInit =
-{
-	> EventInit,
-	@:optional var code : Int;
-	@:optional var reason : String;
-	@:optional var wasClean : Bool;
+typedef CloseEventInit = EventInit & {
+	var ?code : Int;
+	var ?reason : String;
+	var ?wasClean : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/Comment.hx b/std/js/html/Comment.hx
index 675e435a46b36873216aea3ee054a8b3ca749090..4042b115ed1c58073de09671b014f37f70b0b418 100644
--- a/std/js/html/Comment.hx
+++ b/std/js/html/Comment.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Comment>
 **/
 @:native("Comment")
-extern class Comment extends CharacterData
-{
+extern class Comment extends CharacterData {
 	/** @throws DOMError */
-	function new( ?data : String = "" ) : Void;
+	function new( data : String = "" ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/CompositeOperation.hx b/std/js/html/CompositeOperation.hx
index 4190eadb470643ef540ea5b11e7acf3fb70f1517..5dcdb0bd9860b76588065f4fe5ed416f6111f90b 100644
--- a/std/js/html/CompositeOperation.hx
+++ b/std/js/html/CompositeOperation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\Keyframe.webidl. Do not edit!
+// This file is generated from mozilla\BaseKeyframeTypes.webidl. Do not edit!
 
 package js.html;
 
-@:enum abstract CompositeOperation(String)
-{
+enum abstract CompositeOperation(String) {
 	var REPLACE = "replace";
 	var ADD = "add";
 	var ACCUMULATE = "accumulate";
diff --git a/std/js/html/CompositionEvent.hx b/std/js/html/CompositionEvent.hx
index c09a9ede880fa64744c00395652111ac9eab9cd8..77f24ef7dd0b89d9e65b0d4089e353ae8da07ffa 100644
--- a/std/js/html/CompositionEvent.hx
+++ b/std/js/html/CompositionEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,10 +32,23 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent>
 **/
 @:native("CompositionEvent")
-extern class CompositionEvent extends UIEvent
-{
+extern class CompositionEvent extends UIEvent {
+	
+	/**
+		Returns the characters generated by the input method that raised the event; its varies depending on the type of event that generated the `CompositionEvent` object.
+	**/
 	var data(default,null) : String;
+	
+	/**
+		Returns the locale of current input method (for example, the keyboard layout locale if the composition is associated with IME).
+	**/
 	var locale(default,null) : String;
 	
-	function initCompositionEvent( typeArg : String, canBubbleArg : Bool, cancelableArg : Bool, viewArg : Window, dataArg : String, localeArg : String ) : Void;
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : CompositionEventInit ) : Void;
+	
+	/**
+		Initializes the attributes of a `CompositionEvent` object.
+	**/
+	function initCompositionEvent( typeArg : String, canBubbleArg : Bool = false, cancelableArg : Bool = false, ?viewArg : Window, ?dataArg : String, localeArg : String = "" ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/RecordErrorEventInit.hx b/std/js/html/CompositionEventInit.hx
similarity index 85%
rename from std/js/html/RecordErrorEventInit.hx
rename to std/js/html/CompositionEventInit.hx
index fafd0143e8fa92b5d82f2d7887c5c1116115453e..37134c2607087915ca5136fa5d0ec036734a6ee4 100644
--- a/std/js/html/RecordErrorEventInit.hx
+++ b/std/js/html/CompositionEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\RecordErrorEvent.webidl. Do not edit!
+// This file is generated from mozilla\CompositionEvent.webidl. Do not edit!
 
 package js.html;
 
-typedef RecordErrorEventInit =
-{
-	> EventInit,
-	@:optional var name : String;
+typedef CompositionEventInit = UIEventInit & {
+	var ?data : String;
 }
\ No newline at end of file
diff --git a/std/js/html/MessagePortList.hx b/std/js/html/ComputedEffectTiming.hx
similarity index 79%
rename from std/js/html/MessagePortList.hx
rename to std/js/html/ComputedEffectTiming.hx
index 7982e9a1ace69e0fc3e87d758a53f44c2c3879d9..ba542df6121bbc68deafd6655a22eeb2ae4241fb 100644
--- a/std/js/html/MessagePortList.hx
+++ b/std/js/html/ComputedEffectTiming.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,14 +20,14 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\MessagePortList.webidl. Do not edit!
+// This file is generated from mozilla\AnimationEffect.webidl. Do not edit!
 
 package js.html;
 
-@:native("MessagePortList")
-extern class MessagePortList implements ArrayAccess<MessagePort>
-{
-	var length(default,null) : Int;
-	
-	function item( index : Int ) : MessagePort;
+typedef ComputedEffectTiming = EffectTiming & {
+	var ?activeDuration : Float;
+	var ?currentIteration : Float;
+	var ?endTime : Float;
+	var ?localTime : Float;
+	var ?progress : Float;
 }
\ No newline at end of file
diff --git a/std/js/html/Console.hx b/std/js/html/Console.hx
index 893c25a7b0bce4a8bc6be9942763c5e7dec47dc3..4f265ad1e55120ab036eb655ae7ea74aa5428af0 100644
--- a/std/js/html/Console.hx
+++ b/std/js/html/Console.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,123 +25,131 @@
 package js.html;
 
 /**
-	The `Console` object provides access to the browser's debugging console (e.g., the Web Console in Firefox). The specifics of how it works vary from browser to browser, but there is a de facto set of features that are typically provided.
+	The `Console` object provides access to the browser's debugging console (e.g. the Web Console in Firefox). The specifics of how it works varies from browser to browser, but there is a de facto set of features that are typically provided.
 
-	Documentation [Console](https://developer.mozilla.org/en-US/docs/Web/API/Console) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Console$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [console](https://developer.mozilla.org/en-US/docs/Web/API/console) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/console$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/Console>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/console>
 **/
-@:native("Console")
-extern class Console
-{
+@:native("console")
+extern class Console {
 	
 	/**
-		For general output of logging information. You may use string substitution and additional arguments with this method.
+		Log a message and stack trace to console if the first argument is `false`.
 	**/
-	function log( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function assert( condition : Bool = false, data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
-		Informative logging information. You may use string substitution and additional arguments with this method.
+		Clear the console.
 	**/
-	function info( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function clear() : Void;
 	
 	/**
-		Outputs a warning message. You may use string substitution and additional arguments with this method.
+		Log the number of times this line has been called with the given label.
+	**/
+	static function count( label : String = "default" ) : Void;
+	
+	/**
+		Resets the value of the counter with the given label.
 	**/
-	function warn( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function countReset( label : String = "default" ) : Void;
+	
+	/**
+		Outputs a message to the console with the log level `"debug"`.
+		 Note: Starting with Chromium 58 this method only appears in Chromium browser consoles when level "Verbose" is selected.
+		 
+	**/
+	static function debug( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
 		Outputs an error message. You may use string substitution and additional arguments with this method.
 	**/
-	function error( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function error( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
-		An alias for `error()`
+		Informative logging of information. You may use string substitution and additional arguments with this method.
 	**/
-	function exception( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function info( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
-		An alias for `log()`
+		For general output of logging information. You may use string substitution and additional arguments with this method.
 	**/
-	function debug( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function log( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
 		Displays tabular data as a table.
 	**/
-	function table( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function table( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
 		Outputs a stack trace.
 	**/
-	function trace() : Void;
+	static function trace( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Outputs a warning message. You may use string substitution and additional arguments with this method.
+	**/
+	static function warn( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
 		Displays an interactive listing of the properties of a specified JavaScript object. This listing lets you use disclosure triangles to examine the contents of child objects.
 	**/
-	function dir( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function dir( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
 		
-		 Displays an XML/HTML Element representation of the specified object if possible or the JavaScript Object view if it is not.
+		 Displays an XML/HTML Element representation of the specified object if possible or the JavaScript Object view if it is not possible.
 		 
 	**/
-	function dirxml( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function dirxml( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
 		Creates a new inline group, indenting all following output by another level. To move back out a level, call `groupEnd()`.
 	**/
-	function group( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function group( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
-		Creates a new inline group, indenting all following output by another level; unlike `group()`, this starts with the inline group collapsed, requiring the use of a disclosure button to expand it. To move back out a level, call `groupEnd()`.
+		Creates a new inline group, indenting all following output by another level. However, unlike `group()` this starts with the inline group collapsed requiring the use of a disclosure button to expand it. To move back out a level, call `groupEnd()`.
 	**/
-	function groupCollapsed( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function groupCollapsed( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
 		Exits the current inline group.
 	**/
-	function groupEnd( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function groupEnd() : Void;
 	
 	/**
 		Starts a timer with a name specified as an input parameter. Up to 10,000 simultaneous timers can run on a given page.
 	**/
-	function time( ?time : Dynamic ) : Void;
-	
-	/**
-		Stops the specified timer and logs the elapsed time in seconds since its start.
-	**/
-	function timeEnd( ?time : Dynamic ) : Void;
+	static function time( label : String = "default" ) : Void;
 	
 	/**
-		Adds a marker to the browser's Timeline or Waterfall tool.
+		Logs the value of the specified timer to the console.
 	**/
-	function timeStamp( ?data : Dynamic ) : Void;
+	static function timeLog( label : String = "default", data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
-		Starts the browser's build-in profiler (for example, the Firefox performance tool). You can specify an optional name for the profile.
+		Stops the specified timer and logs the elapsed time in seconds since it started.
 	**/
-	function profile( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function timeEnd( label : String = "default" ) : Void;
 	
 	/**
-		Stops the profiler. You can see the resulting profile in the browser's performance tool (for example, the Firefox performance tool).
+		An alias for `error()`.
 	**/
-	function profileEnd( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function exception( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
-		Log a message and stack trace to console if first argument is `false`.
+		Adds a marker to the browser's Timeline or Waterfall tool.
 	**/
-	function assert( condition : Bool, data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function timeStamp( ?data : Dynamic ) : Void;
 	
 	/**
-		Log the number of times this line has been called with the given label.
+		Starts the browser's built-in profiler (for example, the Firefox performance tool). You can specify an optional name for the profile.
 	**/
-	function count( data : haxe.extern.Rest<Dynamic> ) : Void;
+	static function profile( data : haxe.extern.Rest<Dynamic> ) : Void;
 	
 	/**
-		Clear the console.
+		Stops the profiler. You can see the resulting profile in the browser's performance tool (for example, the Firefox performance tool).
 	**/
-	function clear() : Void;
-	function markTimeline() : Void;
-	function timeline() : Void;
-	function timelineEnd() : Void;
+	static function profileEnd( data : haxe.extern.Rest<Dynamic> ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ConsoleInstance.hx b/std/js/html/ConsoleInstance.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cded8ec89f9ffb0a718d902849377ef54b70470b
--- /dev/null
+++ b/std/js/html/ConsoleInstance.hx
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Console.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `Console` object provides access to the browser's debugging console (e.g. the Web Console in Firefox). The specifics of how it works varies from browser to browser, but there is a de facto set of features that are typically provided.
+
+	Documentation [Console](https://developer.mozilla.org/en-US/docs/Web/API/Console) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Console$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/Console>
+**/
+extern interface ConsoleInstance {
+	
+	/**
+		Log a message and stack trace to console if the first argument is `false`.
+	**/
+	function assert( condition : Bool = false, data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Clear the console.
+	**/
+	function clear() : Void;
+	
+	/**
+		Log the number of times this line has been called with the given label.
+	**/
+	function count( label : String = "default" ) : Void;
+	
+	/**
+		Resets the value of the counter with the given label.
+	**/
+	function countReset( label : String = "default" ) : Void;
+	
+	/**
+		Outputs a message to the console with the log level `"debug"`.
+		 Note: Starting with Chromium 58 this method only appears in Chromium browser consoles when level "Verbose" is selected.
+		 
+	**/
+	function debug( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Outputs an error message. You may use string substitution and additional arguments with this method.
+	**/
+	function error( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Informative logging of information. You may use string substitution and additional arguments with this method.
+	**/
+	function info( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		For general output of logging information. You may use string substitution and additional arguments with this method.
+	**/
+	function log( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Displays tabular data as a table.
+	**/
+	function table( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Outputs a stack trace.
+	**/
+	function trace( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Outputs a warning message. You may use string substitution and additional arguments with this method.
+	**/
+	function warn( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Displays an interactive listing of the properties of a specified JavaScript object. This listing lets you use disclosure triangles to examine the contents of child objects.
+	**/
+	function dir( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		
+		 Displays an XML/HTML Element representation of the specified object if possible or the JavaScript Object view if it is not possible.
+		 
+	**/
+	function dirxml( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Creates a new inline group, indenting all following output by another level. To move back out a level, call `groupEnd()`.
+	**/
+	function group( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Creates a new inline group, indenting all following output by another level. However, unlike `group()` this starts with the inline group collapsed requiring the use of a disclosure button to expand it. To move back out a level, call `groupEnd()`.
+	**/
+	function groupCollapsed( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Exits the current inline group.
+	**/
+	function groupEnd() : Void;
+	
+	/**
+		Starts a timer with a name specified as an input parameter. Up to 10,000 simultaneous timers can run on a given page.
+	**/
+	function time( label : String = "default" ) : Void;
+	
+	/**
+		Logs the value of the specified timer to the console.
+	**/
+	function timeLog( label : String = "default", data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Stops the specified timer and logs the elapsed time in seconds since it started.
+	**/
+	function timeEnd( label : String = "default" ) : Void;
+	
+	/**
+		An alias for `error()`.
+	**/
+	function exception( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Adds a marker to the browser's Timeline or Waterfall tool.
+	**/
+	function timeStamp( ?data : Dynamic ) : Void;
+	
+	/**
+		Starts the browser's built-in profiler (for example, the Firefox performance tool). You can specify an optional name for the profile.
+	**/
+	function profile( data : haxe.extern.Rest<Dynamic> ) : Void;
+	
+	/**
+		Stops the profiler. You can see the resulting profile in the browser's performance tool (for example, the Firefox performance tool).
+	**/
+	function profileEnd( data : haxe.extern.Rest<Dynamic> ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/ConstrainBooleanParameters.hx b/std/js/html/ConstrainBooleanParameters.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c1c731337f9c1b697bd49a13a731fdedd60a4c26
--- /dev/null
+++ b/std/js/html/ConstrainBooleanParameters.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaTrackConstraintSet.webidl. Do not edit!
+
+package js.html;
+
+typedef ConstrainBooleanParameters = {
+	var ?exact : Bool;
+	var ?ideal : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/ConstrainDOMStringParameters.hx b/std/js/html/ConstrainDOMStringParameters.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9bc81a67f9af26e9f7e5095d88d242594c04e4fa
--- /dev/null
+++ b/std/js/html/ConstrainDOMStringParameters.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaTrackConstraintSet.webidl. Do not edit!
+
+package js.html;
+
+typedef ConstrainDOMStringParameters = {
+	var ?exact : haxe.extern.EitherType<String,Array<String>>;
+	var ?ideal : haxe.extern.EitherType<String,Array<String>>;
+}
\ No newline at end of file
diff --git a/std/js/html/ConstrainDoubleRange.hx b/std/js/html/ConstrainDoubleRange.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7b96869918c5d9c71be284b20f46f3c34ae32dd4
--- /dev/null
+++ b/std/js/html/ConstrainDoubleRange.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaTrackConstraintSet.webidl. Do not edit!
+
+package js.html;
+
+typedef ConstrainDoubleRange = {
+	var ?exact : Float;
+	var ?ideal : Float;
+	var ?max : Float;
+	var ?min : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/ConstrainLongRange.hx b/std/js/html/ConstrainLongRange.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a83229a4d6692a8c6d3801a22ef205a509f25bb1
--- /dev/null
+++ b/std/js/html/ConstrainLongRange.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaTrackConstraintSet.webidl. Do not edit!
+
+package js.html;
+
+typedef ConstrainLongRange = {
+	var ?exact : Int;
+	var ?ideal : Int;
+	var ?max : Int;
+	var ?min : Int;
+}
\ No newline at end of file
diff --git a/std/js/html/ConvertCoordinateOptions.hx b/std/js/html/ConvertCoordinateOptions.hx
index 438ff08069b57b4220eaf543c1c99819aade6337..f620587c143f756956a7cc8f74c0fbb1da4a1ddd 100644
--- a/std/js/html/ConvertCoordinateOptions.hx
+++ b/std/js/html/ConvertCoordinateOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-typedef ConvertCoordinateOptions =
-{
-	@:optional var fromBox : Dynamic/*MISSING CSSBoxType*/;
-	@:optional var toBox : Dynamic/*MISSING CSSBoxType*/;
+typedef ConvertCoordinateOptions = {
+	var ?fromBox : CSSBoxType;
+	var ?toBox : CSSBoxType;
 }
\ No newline at end of file
diff --git a/std/js/html/Coordinates.hx b/std/js/html/Coordinates.hx
index a8e23a028f628d5e49affb2c3b0390ce33753aa6..e0d3677b13691c812ff61ca64674748d57cae1e7 100644
--- a/std/js/html/Coordinates.hx
+++ b/std/js/html/Coordinates.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,9 +31,7 @@ package js.html;
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Coordinates>
 **/
-@:native("Coordinates")
-extern class Coordinates
-{
+typedef Coordinates = {
 	
 	/**
 		Returns a `double` representing the position's latitude in decimal degrees.
@@ -46,7 +44,7 @@ extern class Coordinates
 	var longitude(default,null) : Float;
 	
 	/**
-		Returns a `double` representing the position's altitude in metres, relative to sea level. This value can be `null` if the implementation cannot provide the data.
+		Returns a `double` representing the position's altitude in meters, relative to sea level. This value can be `null` if the implementation cannot provide the data.
 	**/
 	var altitude(default,null) : Float;
 	
diff --git a/std/js/html/Crypto.hx b/std/js/html/Crypto.hx
index 5ab5ababa245659294bcfb6a53f2f8d57473fec9..ad52941e37e5a77b1aca641f3f60ddca60902823 100644
--- a/std/js/html/Crypto.hx
+++ b/std/js/html/Crypto.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,14 +32,17 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Crypto>
 **/
 @:native("Crypto")
-extern class Crypto
-{
+extern class Crypto {
 	
 	/**
 		Returns a `SubtleCrypto` object providing access to common cryptographic primitives, like hashing, signing, encryption or decryption.
 	**/
 	var subtle(default,null) : SubtleCrypto;
 	
-	/** @throws DOMError */
-	function getRandomValues( array : ArrayBufferView ) : ArrayBufferView;
+	
+	/**
+		Fills the passed `TypedArray` with cryptographically sound random values.
+		@throws DOMError
+	**/
+	function getRandomValues( array : js.lib.ArrayBufferView ) : js.lib.ArrayBufferView;
 }
\ No newline at end of file
diff --git a/std/js/html/CryptoKey.hx b/std/js/html/CryptoKey.hx
index ba143b1c7ab932c6b6a06b754e04a388b8e20e7c..9ad095cca5a34d1b8f1dc0168164dd64ab36270b 100644
--- a/std/js/html/CryptoKey.hx
+++ b/std/js/html/CryptoKey.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CryptoKey>
 **/
 @:native("CryptoKey")
-extern class CryptoKey
-{
+extern class CryptoKey {
 	
 	/**
 		Returns an enumerated value representing the type of the key, a secret key (for symmetric algorithm), a public or a private key (for an asymmetric algorithm)
diff --git a/std/js/html/CustomEvent.hx b/std/js/html/CustomEvent.hx
index 9d74ae097d939a247a8b0cf6a1a39400ccbc1352..665a10993d3b5c32b354dee95570abe93c9ca331 100644
--- a/std/js/html/CustomEvent.hx
+++ b/std/js/html/CustomEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent>
 **/
 @:native("CustomEvent")
-extern class CustomEvent extends Event
-{
+extern class CustomEvent extends Event {
 	
 	/**
 		Any data passed when initializing the event.
@@ -42,12 +41,11 @@ extern class CustomEvent extends Event
 	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : CustomEventInit ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		
 		 Initializes a `CustomEvent` object. If the event has already being dispatched, this method does nothing.
 		 
 	**/
-	function initCustomEvent( type : String, canBubble : Bool, cancelable : Bool, detail : Dynamic ) : Void;
+	function initCustomEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?detail : Dynamic ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/CustomEventInit.hx b/std/js/html/CustomEventInit.hx
index 381f111c4bb0246b65d93f0d248fb8e4d0479b92..f7300598bb608b40b1de8976968c617c81844b95 100644
--- a/std/js/html/CustomEventInit.hx
+++ b/std/js/html/CustomEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
 
 package js.html;
 
-typedef CustomEventInit =
-{
-	> EventInit,
-	@:optional var detail : Dynamic;
+typedef CustomEventInit = EventInit & {
+	var ?detail : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/DListElement.hx b/std/js/html/DListElement.hx
index 05a76ec29a5ecf5cf88d1c3123a1de64b0eabd33..540a6411fc7e834a4579e0cab40cf02a4eca8be7 100644
--- a/std/js/html/DListElement.hx
+++ b/std/js/html/DListElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLDListElement>
 **/
 @:native("HTMLDListElement")
-extern class DListElement extends Element
-{
+extern class DListElement extends Element {
 	
 	/**
 		Is a `Boolean` indicating that spacing between list items should be reduced.
diff --git a/std/js/html/DOMElement.hx b/std/js/html/DOMElement.hx
index eb6dd65b12aa5d671fda1aac1592e9d9c36ffc9b..8b3c31e9ad7bd02544acbd085f7988811b432455 100644
--- a/std/js/html/DOMElement.hx
+++ b/std/js/html/DOMElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,21 +25,58 @@
 package js.html;
 
 /**
-	The `Element` interface represents an object of a `Document`. This interface describes methods and properties common to all kinds of elements. Specific behaviors are described in interfaces which inherit from `Element` but add additional functionality.
+	`Element` is the most general base class from which all objects in a `Document` inherit. It only has methods and properties common to all kinds of elements. More specific classes inherit from `Element`.
 
 	Documentation [Element](https://developer.mozilla.org/en-US/docs/Web/API/Element) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Element$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Element>
 **/
 @:native("Element")
-extern class DOMElement extends Node
-{
+extern class DOMElement extends Node {
+	
+	/**
+		The namespace URI of the element, or `null` if it is no namespace.
+		 
+		 Note: In Firefox 3.5 and earlier, HTML elements are in no namespace. In later versions, HTML elements are in the `http://www.w3.org/1999/xhtml` namespace in both HTML and XML trees. `1.9.2`
+		 
+		 
+	**/
+	var namespaceURI(default,null) : String;
+	
+	/**
+		A `DOMString` representing the namespace prefix of the element, or `null` if no prefix is specified.
+	**/
+	var prefix(default,null) : String;
+	
+	/**
+		A `DOMString` representing the local part of the qualified name of the element.
+	**/
+	var localName(default,null) : String;
+	
+	/**
+		Returns a `String` with the name of the tag for the given element.
+	**/
 	var tagName(default,null) : String;
+	
+	/**
+		Is a `DOMString` representing the id of the element.
+	**/
 	var id : String;
+	
+	/**
+		Is a `DOMString` representing the class of the element.
+	**/
 	var className : String;
+	
+	/**
+		Returns a `DOMTokenList` containing the list of class attributes.
+	**/
 	var classList(default,null) : DOMTokenList;
+	
+	/**
+		Returns a `NamedNodeMap` object containing the assigned attributes of the corresponding HTML element.
+	**/
 	var attributes(default,null) : NamedNodeMap;
-	var onwheel : haxe.Constraints.Function;
 	var title : String;
 	var lang : String;
 	var dir : String;
@@ -70,31 +107,92 @@ extern class DOMElement extends Node
 	var offsetLeft(default,null) : Int;
 	var offsetWidth(default,null) : Int;
 	var offsetHeight(default,null) : Int;
+	
+	/**
+		A `Number` representing number of pixels the top of the document is scrolled vertically.
+	**/
 	var scrollTop : Int;
+	
+	/**
+		Is a `Number` representing the left scroll offset of the element.
+	**/
 	var scrollLeft : Int;
+	
+	/**
+		Returns a `Number` representing the scroll view width of the element.
+	**/
 	var scrollWidth(default,null) : Int;
+	
+	/**
+		Returns a `Number` representing the scroll view height of an element.
+	**/
 	var scrollHeight(default,null) : Int;
+	
+	/**
+		Returns a `Number` representing the width of the top border of the element.
+	**/
 	var clientTop(default,null) : Int;
+	
+	/**
+		Returns a `Number` representing the width of the left border of the element.
+	**/
 	var clientLeft(default,null) : Int;
+	
+	/**
+		Returns a `Number` representing the inner width of the element.
+	**/
 	var clientWidth(default,null) : Int;
+	
+	/**
+		Returns a `Number` representing the inner height of the element.
+	**/
 	var clientHeight(default,null) : Int;
+	
+	/**
+		Returns a `Number` representing the maximum top scroll offset possible for the element.
+	**/
 	var scrollTopMax(default,null) : Int;
+	
+	/**
+		Returns a `Number` representing the maximum left scroll offset possible for the element.
+	**/
 	var scrollLeftMax(default,null) : Int;
+	
+	/**
+		Is a `DOMString` representing the markup of the element's content.
+	**/
 	var innerHTML : String;
+	
+	/**
+		Is a `DOMString` representing the markup of the element including its content. When used as a setter, replaces the element with nodes parsed from the given string.
+	**/
 	var outerHTML : String;
+	
+	/**
+		Returns the open shadow root that is hosted by the element, or null if no open shadow root is present.
+	**/
 	var shadowRoot(default,null) : ShadowRoot;
+	var assignedSlot(default,null) : SlotElement;
+	
+	/**
+		Returns the name of the shadow DOM slot the element is inserted in.
+	**/
+	var slot : String;
 	var onabort : haxe.Constraints.Function;
 	var onblur : haxe.Constraints.Function;
 	var onfocus : haxe.Constraints.Function;
+	var onauxclick : haxe.Constraints.Function;
 	var oncanplay : haxe.Constraints.Function;
 	var oncanplaythrough : haxe.Constraints.Function;
 	var onchange : haxe.Constraints.Function;
 	var onclick : haxe.Constraints.Function;
+	var onclose : haxe.Constraints.Function;
 	var oncontextmenu : haxe.Constraints.Function;
 	var ondblclick : haxe.Constraints.Function;
 	var ondrag : haxe.Constraints.Function;
 	var ondragend : haxe.Constraints.Function;
 	var ondragenter : haxe.Constraints.Function;
+	var ondragexit : haxe.Constraints.Function;
 	var ondragleave : haxe.Constraints.Function;
 	var ondragover : haxe.Constraints.Function;
 	var ondragstart : haxe.Constraints.Function;
@@ -110,6 +208,7 @@ extern class DOMElement extends Node
 	var onload : haxe.Constraints.Function;
 	var onloadeddata : haxe.Constraints.Function;
 	var onloadedmetadata : haxe.Constraints.Function;
+	var onloadend : haxe.Constraints.Function;
 	var onloadstart : haxe.Constraints.Function;
 	var onmousedown : haxe.Constraints.Function;
 	var onmouseenter : haxe.Constraints.Function;
@@ -118,6 +217,11 @@ extern class DOMElement extends Node
 	var onmouseout : haxe.Constraints.Function;
 	var onmouseover : haxe.Constraints.Function;
 	var onmouseup : haxe.Constraints.Function;
+	
+	/**
+		Returns the event handling code for the `wheel` event. This is now implemented on `GlobalEventHandlers.onwheel`.
+	**/
+	var onwheel : haxe.Constraints.Function;
 	var onpause : haxe.Constraints.Function;
 	var onplay : haxe.Constraints.Function;
 	var onplaying : haxe.Constraints.Function;
@@ -136,6 +240,8 @@ extern class DOMElement extends Node
 	var ontimeupdate : haxe.Constraints.Function;
 	var onvolumechange : haxe.Constraints.Function;
 	var onwaiting : haxe.Constraints.Function;
+	var onselectstart : haxe.Constraints.Function;
+	var ontoggle : haxe.Constraints.Function;
 	var onpointercancel : haxe.Constraints.Function;
 	var onpointerdown : haxe.Constraints.Function;
 	var onpointerup : haxe.Constraints.Function;
@@ -144,12 +250,28 @@ extern class DOMElement extends Node
 	var onpointerover : haxe.Constraints.Function;
 	var onpointerenter : haxe.Constraints.Function;
 	var onpointerleave : haxe.Constraints.Function;
+	
+	/**
+		Returns the event handler for the `gotpointercapture` event type.
+	**/
 	var ongotpointercapture : haxe.Constraints.Function;
+	
+	/**
+		Returns the event handler for the `lostpointercapture` event type.
+	**/
 	var onlostpointercapture : haxe.Constraints.Function;
-	var onfullscreenchange : haxe.Constraints.Function;
-	var onfullscreenerror : haxe.Constraints.Function;
-	var onpointerlockchange : haxe.Constraints.Function;
-	var onpointerlockerror : haxe.Constraints.Function;
+	var onanimationcancel : haxe.Constraints.Function;
+	var onanimationend : haxe.Constraints.Function;
+	var onanimationiteration : haxe.Constraints.Function;
+	var onanimationstart : haxe.Constraints.Function;
+	var ontransitioncancel : haxe.Constraints.Function;
+	var ontransitionend : haxe.Constraints.Function;
+	var ontransitionrun : haxe.Constraints.Function;
+	var ontransitionstart : haxe.Constraints.Function;
+	var onwebkitanimationend : haxe.Constraints.Function;
+	var onwebkitanimationiteration : haxe.Constraints.Function;
+	var onwebkitanimationstart : haxe.Constraints.Function;
+	var onwebkittransitionend : haxe.Constraints.Function;
 	var previousElementSibling(default,null) : Element;
 	var nextElementSibling(default,null) : Element;
 	var onerror : haxe.Constraints.Function;
@@ -162,95 +284,270 @@ extern class DOMElement extends Node
 	var ontouchmove : haxe.Constraints.Function;
 	var ontouchcancel : haxe.Constraints.Function;
 	
+	
+	/**
+		Returns an array of attribute names from the current element.
+	**/
+	@:pure
 	function getAttributeNames() : Array<String>;
+	
+	/**
+		Retrieves the value of the named attribute from the current node and returns it as an `Object`.
+	**/
+	@:pure
 	function getAttribute( name : String ) : String;
-	function getAttributeNS( namespace_ : String, localName : String ) : String;
-	/** @throws DOMError */
+	
+	/**
+		Retrieves the value of the attribute with the specified name and namespace, from the current node and returns it as an `Object`.
+	**/
+	@:pure
+	function getAttributeNS( namespace : String, localName : String ) : String;
+	
+	/**
+		Toggles a boolean attribute, removing it if it is present and adding it if it is not present, on the specified element.
+		@throws DOMError
+	**/
+	function toggleAttribute( name : String, ?force : Bool ) : Bool;
+	
+	/**
+		Sets the value of a named attribute of the current node.
+		@throws DOMError
+	**/
 	function setAttribute( name : String, value : String ) : Void;
-	/** @throws DOMError */
-	function setAttributeNS( namespace_ : String, name : String, value : String ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Sets the value of the attribute with the specified name and namespace, from the current node.
+		@throws DOMError
+	**/
+	function setAttributeNS( namespace : String, name : String, value : String ) : Void;
+	
+	/**
+		Removes the named attribute from the current node.
+		@throws DOMError
+	**/
 	function removeAttribute( name : String ) : Void;
-	/** @throws DOMError */
-	function removeAttributeNS( namespace_ : String, localName : String ) : Void;
+	
+	/**
+		Removes the attribute with the specified name and namespace, from the current node.
+		@throws DOMError
+	**/
+	function removeAttributeNS( namespace : String, localName : String ) : Void;
+	
+	/**
+		Returns a `Boolean` indicating if the element has the specified attribute or not.
+	**/
+	@:pure
 	function hasAttribute( name : String ) : Bool;
-	function hasAttributeNS( namespace_ : String, localName : String ) : Bool;
+	
+	/**
+		Returns a `Boolean` indicating if the element has the specified attribute, in the specified namespace, or not.
+	**/
+	@:pure
+	function hasAttributeNS( namespace : String, localName : String ) : Bool;
+	
+	/**
+		Returns a `Boolean` indicating if the element has one or more HTML attributes present.
+	**/
+	@:pure
 	function hasAttributes() : Bool;
-	/** @throws DOMError */
+	
+	/**
+		Returns the `Element` which is the closest ancestor of the current element (or the current element itself) which matches the selectors given in parameter.
+		@throws DOMError
+	**/
+	@:pure
 	function closest( selector : String ) : Element;
-	/** @throws DOMError */
+	
+	/**
+		Returns a `Boolean` indicating whether or not the element would be selected by the specified selector string.
+		@throws DOMError
+	**/
+	@:pure
 	function matches( selector : String ) : Bool;
 	/** @throws DOMError */
+	@:pure
 	function webkitMatchesSelector( selector : String ) : Bool;
+	
+	/**
+		Returns a live `HTMLCollection` containing all descendant elements, of a particular tag name, from the current element.
+	**/
+	@:pure
 	function getElementsByTagName( localName : String ) : HTMLCollection;
-	/** @throws DOMError */
-	function getElementsByTagNameNS( namespace_ : String, localName : String ) : HTMLCollection;
+	
+	/**
+		Returns a live `HTMLCollection` containing all descendant elements, of a particular tag name and namespace, from the current element.
+		@throws DOMError
+	**/
+	@:pure
+	function getElementsByTagNameNS( namespace : String, localName : String ) : HTMLCollection;
+	
+	/**
+		Returns a live `HTMLCollection` that contains all descendants of the current element that possess the list of classes given in the parameter.
+	**/
+	@:pure
 	function getElementsByClassName( classNames : String ) : HTMLCollection;
-	/** @throws DOMError */
 	
 	/**
-		Designates a specific element as the capture target of future `PointerEvent`.
+		Inserts a given element node at a given position relative to the element it is invoked upon.
+		@throws DOMError
+	**/
+	@:pure
+	function insertAdjacentElement( where : String, element : Element ) : Element;
+	
+	/**
+		Inserts a given text node at a given position relative to the element it is invoked upon.
+		@throws DOMError
+	**/
+	function insertAdjacentText( where : String, data : String ) : Void;
+	
+	/**
+		Designates a specific element as the capture target of future pointer events.
+		@throws DOMError
 	**/
 	function setPointerCapture( pointerId : Int ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Releases (stops) pointer capture that was previously set for a specific `PointerEvent`.
+		@throws DOMError
+	**/
 	function releasePointerCapture( pointerId : Int ) : Void;
-	function setCapture( ?retargetToElement : Bool = false ) : Void;
+	function hasPointerCapture( pointerId : Int ) : Bool;
+	
+	/**
+		Sets up mouse event capture, redirecting all mouse events to this element.
+	**/
+	function setCapture( retargetToElement : Bool = false ) : Void;
 	function releaseCapture() : Void;
-	function requestPointerLock() : Void;
+	
+	/**
+		Retrieves the node representation of the named attribute from the current node and returns it as an `Attr`.
+	**/
 	function getAttributeNode( name : String ) : Attr;
-	/** @throws DOMError */
+	
+	/**
+		Sets the node representation of the named attribute from the current node.
+		@throws DOMError
+	**/
 	function setAttributeNode( newAttr : Attr ) : Attr;
-	/** @throws DOMError */
+	
+	/**
+		Removes the node representation of the named attribute from the current node.
+		@throws DOMError
+	**/
 	function removeAttributeNode( oldAttr : Attr ) : Attr;
+	
+	/**
+		Retrieves the node representation of the attribute with the specified name and namespace, from the current node and returns it as an `Attr`.
+	**/
 	function getAttributeNodeNS( namespaceURI : String, localName : String ) : Attr;
-	/** @throws DOMError */
+	
+	/**
+		Sets the node representation of the attribute with the specified name and namespace, from the current node.
+		@throws DOMError
+	**/
 	function setAttributeNodeNS( newAttr : Attr ) : Attr;
 	function click() : Void;
 	/** @throws DOMError */
 	function focus() : Void;
 	/** @throws DOMError */
 	function blur() : Void;
+	
+	/**
+		Returns a collection of rectangles that indicate the bounding rectangles for each line of text in a client.
+	**/
 	function getClientRects() : DOMRectList;
+	
+	/**
+		Returns the size of an element and its position relative to the viewport.
+	**/
 	function getBoundingClientRect() : DOMRect;
-	@:overload( function( top : Bool ) : Void {} )
-	function scrollIntoView( ?options : ScrollIntoViewOptions ) : Void;
+	
+	/**
+		Scrolls the page until the element gets into the view.
+	**/
+	@:overload( function( ?arg : ScrollIntoViewOptions) : Void {} )
+	function scrollIntoView( ?arg : Bool ) : Void;
 	@:overload( function( x : Float, y : Float ) : Void {} )
 	function scroll( ?options : ScrollToOptions ) : Void;
 	@:overload( function( x : Float, y : Float ) : Void {} )
 	function scrollTo( ?options : ScrollToOptions ) : Void;
 	@:overload( function( x : Float, y : Float ) : Void {} )
 	function scrollBy( ?options : ScrollToOptions ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Parses the text as HTML or XML and inserts the resulting nodes into the tree in the position given.
+		@throws DOMError
+	**/
 	function insertAdjacentHTML( position : String, text : String ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Returns the first `Node` which matches the specified selector string relative to the element.
+		@throws DOMError
+	**/
+	@:pure
 	function querySelector( selectors : String ) : Element;
-	/** @throws DOMError */
+	
+	/**
+		Returns a `NodeList` of nodes which match the specified selector string relative to the element.
+		@throws DOMError
+	**/
+	@:pure
 	function querySelectorAll( selectors : String ) : NodeList;
-	/** @throws DOMError */
-	function createShadowRoot() : ShadowRoot;
 	
 	/**
-		…
+		Attatches a shadow DOM tree to the specified element and returns a reference to its `ShadowRoot`.
+		@throws DOMError
 	**/
-	function getDestinationInsertionPoints() : NodeList;
-	/** @throws DOMError */
-	function requestFullscreen( ?options : Dynamic ) : Void;
-	/** @throws DOMError */
+	function attachShadow( shadowRootInitDict : ShadowRootInit ) : ShadowRoot;
+	
+	/**
+		Asynchronously asks the browser to make the element full-screen.
+		@throws DOMError
+	**/
+	function requestFullscreen() : Void;
+	
+	/**
+		Allows to asynchronously ask for the pointer to be locked on the given element.
+	**/
+	function requestPointerLock() : Void;
 	
 	/**
 		A shortcut method to create and run an animation on an element. Returns the created Animation object instance.
+		@throws DOMError
 	**/
-	function animate( frames : Dynamic, ?options : haxe.extern.EitherType<Float,Dynamic/*MISSING KeyframeAnimationOptions*/> ) : Animation;
+	@:overload( function( keyframes : Dynamic, ?options : KeyframeAnimationOptions) : Animation {} )
+	function animate( keyframes : Dynamic, ?options : Float ) : Animation;
 	
 	/**
 		Returns an array of Animation objects currently active on the element.
 	**/
-	function getAnimations() : Array<Animation>;
+	function getAnimations( ?filter : AnimationFilter ) : Array<Animation>;
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function before( nodes : haxe.extern.Rest<Node> ) : Void;
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function after( nodes : haxe.extern.Rest<Node> ) : Void;
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function replaceWith( nodes : haxe.extern.Rest<Node> ) : Void;
 	function remove() : Void;
 	/** @throws DOMError */
-	function convertQuadFromNode( quad : DOMQuad, from : haxe.extern.EitherType<Text,haxe.extern.EitherType<Element,HTMLDocument>>, ?options : ConvertCoordinateOptions ) : DOMQuad;
+	@:overload( function( quad : DOMQuad, from : Element, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	@:overload( function( quad : DOMQuad, from : HTMLDocument, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	function convertQuadFromNode( quad : DOMQuad, from : Text, ?options : ConvertCoordinateOptions ) : DOMQuad;
+	/** @throws DOMError */
+	@:overload( function( rect : DOMRectReadOnly, from : Element, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	@:overload( function( rect : DOMRectReadOnly, from : HTMLDocument, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	function convertRectFromNode( rect : DOMRectReadOnly, from : Text, ?options : ConvertCoordinateOptions ) : DOMQuad;
+	/** @throws DOMError */
+	@:overload( function( point : DOMPointInit, from : Element, ?options : ConvertCoordinateOptions) : DOMPoint {} )
+	@:overload( function( point : DOMPointInit, from : HTMLDocument, ?options : ConvertCoordinateOptions) : DOMPoint {} )
+	function convertPointFromNode( point : DOMPointInit, from : Text, ?options : ConvertCoordinateOptions ) : DOMPoint;
 	/** @throws DOMError */
-	function convertRectFromNode( rect : DOMRectReadOnly, from : haxe.extern.EitherType<Text,haxe.extern.EitherType<Element,HTMLDocument>>, ?options : ConvertCoordinateOptions ) : DOMQuad;
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function prepend( nodes : haxe.extern.Rest<Node> ) : Void;
 	/** @throws DOMError */
-	function convertPointFromNode( point : DOMPointInit, from : haxe.extern.EitherType<Text,haxe.extern.EitherType<Element,HTMLDocument>>, ?options : ConvertCoordinateOptions ) : DOMPoint;
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function append( nodes : haxe.extern.Rest<Node> ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMError.hx b/std/js/html/DOMError.hx
index 620d181d5b57a858fd6f496fa367f6fd980040aa..d2d100a38872ddc9f9d02af0757c7db50bfd2568 100644
--- a/std/js/html/DOMError.hx
+++ b/std/js/html/DOMError.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,15 +32,18 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMError>
 **/
 @:native("DOMError")
-extern class DOMError
-{
+extern class DOMError {
 	
 	/**
 		Returns a `DOMString` representing one of the error type names (see below).
 	**/
 	var name(default,null) : String;
+	
+	/**
+		Returns a `DOMString` representing a message or description associated with the given error type name.
+	**/
 	var message(default,null) : String;
 	
 	/** @throws DOMError */
-	function new( name : String, ?message : String = "" ) : Void;
+	function new( name : String, message : String = "" ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMException.hx b/std/js/html/DOMException.hx
index f916d101df83df82786a52fb21033350ce6d051a..5729e027d9f0d7a2b19befe77b81bd88dcfaf244 100644
--- a/std/js/html/DOMException.hx
+++ b/std/js/html/DOMException.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `DOMException` interface represents an abnormal event (called an exception) which occurs as a result of calling a method or accessing a property of a web API. This is basically how error conditions are described in web APIs.
+	The `DOMException` interface represents an abnormal event (called an exception) which occurs as a result of calling a method or accessing a property of a web API.
 
 	Documentation [DOMException](https://developer.mozilla.org/en-US/docs/Web/API/DOMException) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DOMException$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMException>
 **/
 @:native("DOMException")
-extern class DOMException
-{
+extern class DOMException {
 	static inline var INDEX_SIZE_ERR : Int = 1;
 	static inline var DOMSTRING_SIZE_ERR : Int = 2;
 	static inline var HIERARCHY_REQUEST_ERR : Int = 3;
@@ -60,16 +59,28 @@ extern class DOMException
 	static inline var INVALID_NODE_TYPE_ERR : Int = 24;
 	static inline var DATA_CLONE_ERR : Int = 25;
 	
-	var code(default,null) : Int;
+	
+	/**
+		Returns a `DOMString` that contains one of the strings associated with an error name.
+	**/
+	var name(default,null) : String;
+	
+	/**
+		Returns a `DOMString` representing a message or description associated with the given error name.
+	**/
 	var message(default,null) : String;
+	
+	/**
+		Returns a `short` that contains one of the `Error codes`, or `0` if none match. This field is used for historical reasons. New DOM exceptions don't use this anymore: they put this info in the `DOMException.name` attribute.
+	**/
+	var code(default,null) : Int;
 	var result(default,null) : Int;
-	var name(default,null) : String;
 	var filename(default,null) : String;
 	var lineNumber(default,null) : Int;
 	var columnNumber(default,null) : Int;
-	var data(default,null) : Dynamic/*MISSING nsISupports*/;
+	var data(default,null) : Dynamic;
 	var stack(default,null) : String;
 	
 	/** @throws DOMError */
-	function new( ?message : String = "", ?name : String ) : Void;
+	function new( message : String = "", ?name : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMImplementation.hx b/std/js/html/DOMImplementation.hx
index 23b8178d2932dbd76dd254008c1fb374de840dbf..ae021c85f65cc6b27ee9283a37f82b21549e651d 100644
--- a/std/js/html/DOMImplementation.hx
+++ b/std/js/html/DOMImplementation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,29 +32,28 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMImplementation>
 **/
 @:native("DOMImplementation")
-extern class DOMImplementation
-{
+extern class DOMImplementation {
 	
 	/**
 		Returns a `Boolean` indicating if a given feature is supported or not. This function is unreliable and kept for compatibility purpose alone: except for SVG-related queries, it always returns `true`. Old browsers are very inconsistent in their behavior.
 	**/
-	function hasFeature( feature : String, version : String ) : Bool;
-	/** @throws DOMError */
+	function hasFeature() : Bool;
 	
 	/**
 		Creates and returns a `DocumentType`.
+		@throws DOMError
 	**/
 	function createDocumentType( qualifiedName : String, publicId : String, systemId : String ) : DocumentType;
-	/** @throws DOMError */
 	
 	/**
 		Creates and returns an `XMLDocument`.
+		@throws DOMError
 	**/
-	function createDocument( namespace_ : String, qualifiedName : String, ?doctype : DocumentType ) : HTMLDocument;
-	/** @throws DOMError */
+	function createDocument( namespace : String, qualifiedName : String, ?doctype : DocumentType ) : HTMLDocument;
 	
 	/**
 		Creates and returns an HTML `Document`.
+		@throws DOMError
 	**/
 	function createHTMLDocument( ?title : String ) : HTMLDocument;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMMatrix.hx b/std/js/html/DOMMatrix.hx
index 2382e8b08bd6e65e75ada6f08793252f9974b29a..988908c430c5d69910a3b9a8b57e4ef53ebc95b8 100644
--- a/std/js/html/DOMMatrix.hx
+++ b/std/js/html/DOMMatrix.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,14 +32,13 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMMatrix>
 **/
 @:native("DOMMatrix")
-extern class DOMMatrix extends DOMMatrixReadOnly
-{
+extern class DOMMatrix extends DOMMatrixReadOnly {
 	/** @throws DOMError */
 	@:overload( function() : Void {} )
 	@:overload( function( transformList : String ) : Void {} )
 	@:overload( function( other : DOMMatrixReadOnly ) : Void {} )
-	@:overload( function( array32 : Float32Array ) : Void {} )
-	@:overload( function( array64 : Float64Array ) : Void {} )
+	@:overload( function( array32 : js.lib.Float32Array ) : Void {} )
+	@:overload( function( array64 : js.lib.Float64Array ) : Void {} )
 	function new( numberSequence : Array<Float> ) : Void;
 	function multiplySelf( other : DOMMatrix ) : DOMMatrix;
 	function preMultiplySelf( other : DOMMatrix ) : DOMMatrix;
@@ -47,27 +46,27 @@ extern class DOMMatrix extends DOMMatrixReadOnly
 	/**
 		Returns itself, a `DOMMatrix`, with its new content being the result of the matrix being translated by the given vector.
 	**/
-	function translateSelf( tx : Float, ty : Float, ?tz : Float = 0.0 ) : DOMMatrix;
+	function translateSelf( tx : Float, ty : Float, tz : Float = 0.0 ) : DOMMatrix;
 	
 	/**
 		Returns itself, a `DOMMatrix`, with its new content being the result of the matrix x and y dimensions being scaled by the given factor, centered on the origin given.
 	**/
-	function scaleSelf( scale : Float, ?originX : Float = 0.0, ?originY : Float = 0.0 ) : DOMMatrix;
+	function scaleSelf( scale : Float, originX : Float = 0.0, originY : Float = 0.0 ) : DOMMatrix;
 	
 	/**
 		Returns itself, a `DOMMatrix`, with its new content being the result of the matrix x, y and z dimension being scaled by the given factor, centered on the origin given.
 	**/
-	function scale3dSelf( scale : Float, ?originX : Float = 0.0, ?originY : Float = 0.0, ?originZ : Float = 0.0 ) : DOMMatrix;
+	function scale3dSelf( scale : Float, originX : Float = 0.0, originY : Float = 0.0, originZ : Float = 0.0 ) : DOMMatrix;
 	
 	/**
 		Returns itself, a `DOMMatrix`, with its new content being the result of the matrix x, y and z dimension being scaled by the given factor for each dimension, centered on the origin given.
 	**/
-	function scaleNonUniformSelf( scaleX : Float, ?scaleY : Float = 1.0, ?scaleZ : Float = 1.0, ?originX : Float = 0.0, ?originY : Float = 0.0, ?originZ : Float = 0.0 ) : DOMMatrix;
+	function scaleNonUniformSelf( scaleX : Float, scaleY : Float = 1.0, scaleZ : Float = 1.0, originX : Float = 0.0, originY : Float = 0.0, originZ : Float = 0.0 ) : DOMMatrix;
 	
 	/**
 		Returns itself, a `DOMMatrix`, with its new content being the result of the original matrix being rotated by the given angle, with the rotation centered on the origin given.
 	**/
-	function rotateSelf( angle : Float, ?originX : Float = 0.0, ?originY : Float = 0.0 ) : DOMMatrix;
+	function rotateSelf( angle : Float, originX : Float = 0.0, originY : Float = 0.0 ) : DOMMatrix;
 	
 	/**
 		Returns itself, a `DOMMatrix`, with its new content being the result of the original matrix being rotated by the angle between the given vector and (1,0), centered on the origin given.
@@ -93,10 +92,10 @@ extern class DOMMatrix extends DOMMatrixReadOnly
 		Returns itself,  a `DOMMatrix`, with its new content being the result of the original matrix being inverted. If the matrix cannot be inverted, all its components are set to `NaN` and `is2D()` returns `false`.
 	**/
 	function invertSelf() : DOMMatrix;
-	/** @throws DOMError */
 	
 	/**
 		Returns itself, a `DOMMatrix`, with its describing the matrix representing the same transformation as the CSS `transform` functions given in parameter.
+		@throws DOMError
 	**/
 	function setMatrixValue( transformList : String ) : DOMMatrix;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMMatrixReadOnly.hx b/std/js/html/DOMMatrixReadOnly.hx
index 840621a43010b5a35a66e02c575a6d922323992c..9d53f6584e235ca93091c8f86ae38d7e04141d0e 100644
--- a/std/js/html/DOMMatrixReadOnly.hx
+++ b/std/js/html/DOMMatrixReadOnly.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,46 +32,45 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMMatrixReadOnly>
 **/
 @:native("DOMMatrixReadOnly")
-extern class DOMMatrixReadOnly
-{
+extern class DOMMatrixReadOnly {
 	
 	/**
 		Are <code>double</code> representing each component of a 4x4 matrix needed for 2D rotations and translations. They are aliases for some components of the 4x4 matrix:
-		 <table class="standard-table">
-		  
-		   <tr>
-		    2D
-		    3D equivalent
-		   </tr>
-		  
-		  
-		   <tr>
-		    <td><code>a</code></td>
-		    <td><code>m11</code></td>
-		   </tr>
-		   <tr>
-		    <td><code>b</code></td>
-		    <td><code>m12</code></td>
-		   </tr>
-		   <tr>
-		    <td><code>c</code></td>
-		    <td><code>m21</code></td>
-		   </tr>
-		   <tr>
-		    <td><code>d</code></td>
-		    <td><code>m22</code></td>
-		   </tr>
-		   <tr>
-		    <td><code>e</code></td>
-		    <td><code>m41</code></td>
-		   </tr>
-		   <tr>
-		    <td><code>f</code></td>
-		    <td><code>m42</code></td>
-		   </tr>
-		  
-		 </table>
-		 They are read-only, but their counterpart, with the same name, in <code>DOMMatrix</code> aren't.
+			<table class="standard-table">
+				
+					<tr>
+						2D
+						3D equivalent
+					</tr>
+				
+				
+					<tr>
+						<td><code>a</code></td>
+						<td><code>m11</code></td>
+					</tr>
+					<tr>
+						<td><code>b</code></td>
+						<td><code>m12</code></td>
+					</tr>
+					<tr>
+						<td><code>c</code></td>
+						<td><code>m21</code></td>
+					</tr>
+					<tr>
+						<td><code>d</code></td>
+						<td><code>m22</code></td>
+					</tr>
+					<tr>
+						<td><code>e</code></td>
+						<td><code>m41</code></td>
+					</tr>
+					<tr>
+						<td><code>f</code></td>
+						<td><code>m42</code></td>
+					</tr>
+				
+			</table>
+			They are read-only, but their counterpart, with the same name, in <code>DOMMatrix</code> aren't.
 	**/
 	var a(default,null) : Float;
 	var b(default,null) : Float;
@@ -104,33 +103,40 @@ extern class DOMMatrixReadOnly
 		Is a `Boolean` indicating if the matrix contains a 2D matrix and only accept 2D transformations.
 	**/
 	var is2D(default,null) : Bool;
-	var identity(default,null) : Bool;
 	
+	/**
+		Is a `Boolean` indincating if the matrix identity, that is a matrix with `1` on the components of its diagonal, and `0` elsewhere.
+	**/
+	var isIdentity(default,null) : Bool;
+	
+	/** @throws DOMError */
+	@:overload( function( ?init : Array<Float>) : DOMMatrixReadOnly {} )
+	function new( ?init : String ) : Void;
 	
 	/**
 		Returns a `DOMMatrix` containing a new matrix being the result of the matrix being translated by the given vector. The original matrix is not modified.
 	**/
-	function translate( tx : Float, ty : Float, ?tz : Float = 0.0 ) : DOMMatrix;
+	function translate( tx : Float, ty : Float, tz : Float = 0.0 ) : DOMMatrix;
 	
 	/**
 		Returns a `DOMMatrix` containing a new matrix being the result of the matrix x and y dimensions being scaled by the given factor, centered on the origin given. The original matrix is not modified.
 	**/
-	function scale( scale : Float, ?originX : Float = 0.0, ?originY : Float = 0.0 ) : DOMMatrix;
+	function scale( scale : Float, originX : Float = 0.0, originY : Float = 0.0 ) : DOMMatrix;
 	
 	/**
 		Returns a `DOMMatrix` containing a new matrix being the result of the matrix x, y and z dimension being scaled by the given factor, centered on the origin given. The original matrix is not modified.
 	**/
-	function scale3d( scale : Float, ?originX : Float = 0.0, ?originY : Float = 0.0, ?originZ : Float = 0.0 ) : DOMMatrix;
+	function scale3d( scale : Float, originX : Float = 0.0, originY : Float = 0.0, originZ : Float = 0.0 ) : DOMMatrix;
 	
 	/**
 		Returns a `DOMMatrix` containing a new matrix being the result of the matrix x, y and z dimension being scaled by the given factor for each dimension, centered on the origin given. The original matrix is not modified.
 	**/
-	function scaleNonUniform( scaleX : Float, ?scaleY : Float = 1.0, ?scaleZ : Float = 1.0, ?originX : Float = 0.0, ?originY : Float = 0.0, ?originZ : Float = 0.0 ) : DOMMatrix;
+	function scaleNonUniform( scaleX : Float, scaleY : Float = 1.0, scaleZ : Float = 1.0, originX : Float = 0.0, originY : Float = 0.0, originZ : Float = 0.0 ) : DOMMatrix;
 	
 	/**
 		Returns a `DOMMatrix` containing a new matrix being the result of the original matrix being rotated by the given angle, with the rotation centered on the origin given. The original matrix is not modified.
 	**/
-	function rotate( angle : Float, ?originX : Float = 0.0, ?originY : Float = 0.0 ) : DOMMatrix;
+	function rotate( angle : Float, originX : Float = 0.0, originY : Float = 0.0 ) : DOMMatrix;
 	
 	/**
 		Returns a `DOMMatrix` containing a new matrix being the result of the original matrix being rotated by the angle between the given vector and (1,0), centered on the origin given. The original matrix is not modified.
@@ -138,7 +144,7 @@ extern class DOMMatrixReadOnly
 	function rotateFromVector( x : Float, y : Float ) : DOMMatrix;
 	
 	/**
-		Returns a `DOMMatrix` containing a new matrix being the result of the original matrix being rotated by the given angle and the give vector. The original matrix is not modified.
+		Returns a `DOMMatrix` containing a new matrix being the result of the original matrix being rotated by the given angle and the given vector. The original matrix is not modified.
 	**/
 	function rotateAxisAngle( x : Float, y : Float, z : Float, angle : Float ) : DOMMatrix;
 	
@@ -166,22 +172,31 @@ extern class DOMMatrixReadOnly
 		Returns a `DOMMatrix` containing a new matrix being the result of the original matrix being flipped around the y-axis, that is multiplied by the `DOMMatrix(1, 0, 0, -1, 0, 0)`. The original matrix is not modified.
 	**/
 	function flipY() : DOMMatrix;
+	
+	/**
+		Returns a `DOMMatrix` containing a new matrix being the result of the original matrix being inverted. The original matrix is not modified. If the matrix cannot be inverted, all its components are set to `NaN` and `is2D()` returns `false`.
+	**/
 	function inverse() : DOMMatrix;
 	
 	/**
-		Returns a `DOMPoint` that is the point given in parameter multiplied by the matrix. Bot the original point and the matrix aren't modified.
+		Returns a `DOMPoint` that is the point given in parameter multiplied by the matrix. But the original point and the matrix aren't modified.
 	**/
 	function transformPoint( ?point : DOMPointInit ) : DOMPoint;
-	/** @throws DOMError */
 	
 	/**
 		Returns a `Float32Array` containing the 6 components (`a`, `b`, `c`, `d`, `e`, `f`) in the case of a 2D matrix or the 16 components (`m11`, `m12`, `m13`, `m14`, `m21`, `m22`, `m23`, `m24`, `m31`, `m32`, `m33`, `m34`, `m41`, `m42`, `m43`, `m44`) for a 3D matrix.
+		@throws DOMError
 	**/
-	function toFloat32Array() : Float32Array;
-	/** @throws DOMError */
+	function toFloat32Array() : js.lib.Float32Array;
 	
 	/**
 		Returns a `Float64Array` containing the 6 components (`a`, `b`, `c`, `d`, `e`, `f`) in the case of a 2D matrix or the 16 components (`m11`, `m12`, `m13`, `m14`, `m21`, `m22`, `m23`, `m24`, `m31`, `m32`, `m33`, `m34`, `m41`, `m42`, `m43`, `m44`) for a 3D matrix.
+		@throws DOMError
+	**/
+	function toFloat64Array() : js.lib.Float64Array;
+	
+	/**
+		Returns a JSON representation of the `DOMMatrixReadOnly` object.
 	**/
-	function toFloat64Array() : Float64Array;
+	function toJSON() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMParser.hx b/std/js/html/DOMParser.hx
index c194a513938c14964059539e92067c282765b4e5..23ac2fa4723ff4614769dac5be9a98cc96d996d1 100644
--- a/std/js/html/DOMParser.hx
+++ b/std/js/html/DOMParser.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,18 +25,16 @@
 package js.html;
 
 /**
-	`DOMParser` can parse XML or HTML source stored in a string into a DOM Document. `DOMParser` is specified in DOM Parsing and Serialization.
+	The `DOMParser` interface provides the ability to parse XML or HTML source code from a string into a DOM `Document`.
 
 	Documentation [DOMParser](https://developer.mozilla.org/en-US/docs/Web/API/DOMParser) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DOMParser$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMParser>
 **/
 @:native("DOMParser")
-extern class DOMParser
-{
+extern class DOMParser {
 	/** @throws DOMError */
-	@:overload( function() : Void {} )
-	function new( prin : Dynamic/*MISSING Principal*/, ?documentURI : Dynamic/*MISSING URI*/, ?baseURI : Dynamic/*MISSING URI*/ ) : Void;
+	function new() : Void;
 	/** @throws DOMError */
 	function parseFromString( str : String, type : SupportedType ) : HTMLDocument;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMPoint.hx b/std/js/html/DOMPoint.hx
index 6608b2bb5493d7958ba5fb7c70dac925f532d0cc..efc7962ca7103c5cc02a4f63edd3357f8cb4836f 100644
--- a/std/js/html/DOMPoint.hx
+++ b/std/js/html/DOMPoint.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,16 +25,15 @@
 package js.html;
 
 /**
-	A `DOMPoint` represents a 2D or 3D point in a coordinate system.
+	A `DOMPoint` object represents a 2D or 3D point in a coordinate system; it includes values for the coordinates in up to three dimensions, as well as an optional perspective value.
 
 	Documentation [DOMPoint](https://developer.mozilla.org/en-US/docs/Web/API/DOMPoint) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DOMPoint$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMPoint>
 **/
 @:native("DOMPoint")
-extern class DOMPoint extends DOMPointReadOnly
-{
+extern class DOMPoint extends DOMPointReadOnly {
+	static function fromPoint( ?other : DOMPointInit ) : DOMPoint;
 	/** @throws DOMError */
-	@:overload( function( ?point : DOMPointInit ) : Void {} )
-	function new( x : Float, y : Float, ?z : Float = 0.0, ?w : Float = 1.0 ) : Void;
+	function new( x : Float = 0.0, y : Float = 0.0, z : Float = 0.0, w : Float = 1.0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMPointInit.hx b/std/js/html/DOMPointInit.hx
index 54dee931c2ed3b84bb432f1c1e65fb1352644488..0c013b6d0cf276030edbefa422058d2a9ca2eaa8 100644
--- a/std/js/html/DOMPointInit.hx
+++ b/std/js/html/DOMPointInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,32 @@
 
 package js.html;
 
-typedef DOMPointInit =
-{
-	@:optional var w : Float;
-	@:optional var x : Float;
-	@:optional var y : Float;
-	@:optional var z : Float;
+/**
+	The `DOMPointInit` dictionary is used to provide the values of the coordinates and perspective when creating and JSONifying a `DOMPoint` or `DOMPointReadOnly` object.
+
+	Documentation [DOMPointInit](https://developer.mozilla.org/en-US/docs/Web/API/DOMPointInit) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DOMPointInit$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMPointInit>
+**/
+typedef DOMPointInit = {
+	
+	/**
+		The point's w perspective value given as an unrestricted floating-point number. The default is 1.
+	**/
+	var ?w : Float;
+	
+	/**
+		An unrestricted floating-point value indicating the x-coordinate of the point in space. This is generally the horizontal coordinate, with positive values being to the right and negative values to the left. The default value is 0.
+	**/
+	var ?x : Float;
+	
+	/**
+		An unrestricted floating-point number providing the point's y-coordinate. This is the vertical coordinate, and barring any transforms applied to the coordinate system, positive values are downward and negative values upward toward the top of the screen. The default is 0.
+	**/
+	var ?y : Float;
+	
+	/**
+		An unrestricted floating-point value which gives the point's z-coordinate, which is (assuming no transformations that alter the situation) the depth coordinate; positive values are closer to the user and negative values retreat back into the screen. The default value is 0.
+	**/
+	var ?z : Float;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMPointReadOnly.hx b/std/js/html/DOMPointReadOnly.hx
index 9a4f7c882dfe9b3ea8fd920bcbd50aeba22ba15b..ea0d32ab852e6bd11886f62f3e60a68709cc9673 100644
--- a/std/js/html/DOMPointReadOnly.hx
+++ b/std/js/html/DOMPointReadOnly.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,34 +25,41 @@
 package js.html;
 
 /**
-	The `DOMPointReadOnly` interface specifies the standard properties used by `DOMPoint` to define a 2D or 3D point in a coordinate system.
+	The `DOMPointReadOnly` interface specifies the coordinate and perspective fields used by `DOMPoint` to define a 2D or 3D point in a coordinate system.
 
 	Documentation [DOMPointReadOnly](https://developer.mozilla.org/en-US/docs/Web/API/DOMPointReadOnly) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DOMPointReadOnly$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMPointReadOnly>
 **/
 @:native("DOMPointReadOnly")
-extern class DOMPointReadOnly
-{
+extern class DOMPointReadOnly {
+	static function fromPoint( ?other : DOMPointInit ) : DOMPointReadOnly;
 	
 	/**
-		The x coordinate of the `DOMPoint`.
+		The point's horizontal coordinate, `x`.
 	**/
 	var x(default,null) : Float;
 	
 	/**
-		The y coordinate of the `DOMPoint`.
+		The point's vertical coordinate, `y`.
 	**/
 	var y(default,null) : Float;
 	
 	/**
-		The z coordinate of the `DOMPoint`.
+		The point's depth coordinate, `z`.
 	**/
 	var z(default,null) : Float;
 	
 	/**
-		The perspective value of the `DOMPoint`.
+		The point's perspective value, `w`.
 	**/
 	var w(default,null) : Float;
 	
+	/** @throws DOMError */
+	function new( x : Float = 0.0, y : Float = 0.0, z : Float = 0.0, w : Float = 1.0 ) : Void;
+	
+	/**
+		Returns a JSON representation of the `DOMPointReadOnly` object.
+	**/
+	function toJSON() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMQuad.hx b/std/js/html/DOMQuad.hx
index 9915a5d748f2f8f3e7406efd4180fadb071a0e25..003bf1f20465baf1dc153fd97fff208779434fa0 100644
--- a/std/js/html/DOMQuad.hx
+++ b/std/js/html/DOMQuad.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,19 @@
 
 package js.html;
 
+/**
+	A `DOMQuad` is a collection of four `DOMPoint`s defining the corners of an arbitrary quadrilateral. Returning `DOMQuad`s lets `getBoxQuads()` return accurate information even when arbitrary 2D or 3D transforms are present. It has a handy `bounds` attribute returning a `DOMRectReadOnly` for those cases where you just want an axis-aligned bounding rectangle.
+
+	Documentation [DOMQuad](https://developer.mozilla.org/en-US/docs/Web/API/DOMQuad) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DOMQuad$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMQuad>
+**/
 @:native("DOMQuad")
-extern class DOMQuad
-{
+extern class DOMQuad {
+	
+	/**
+		are `DOMPoint` objects for each of the `DOMQuad` object's four corners.
+	**/
 	var p1(default,null) : DOMPoint;
 	var p2(default,null) : DOMPoint;
 	var p3(default,null) : DOMPoint;
@@ -36,4 +46,14 @@ extern class DOMQuad
 	/** @throws DOMError */
 	@:overload( function( ?p1 : DOMPointInit, ?p2 : DOMPointInit, ?p3 : DOMPointInit, ?p4 : DOMPointInit ) : Void {} )
 	function new( rect : DOMRectReadOnly ) : Void;
+	
+	/**
+		Returns a `DOMRect` object with the coordinates and dimensions of the `DOMQuad` object.
+	**/
+	function getBounds() : DOMRectReadOnly;
+	
+	/**
+		Returns a JSON representation of the `DOMQuad` object.
+	**/
+	function toJSON() : DOMQuadJSON;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMQuadJSON.hx b/std/js/html/DOMQuadJSON.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7f934fe77fa1fb7a1af8ec55fe3ca5c42633fea6
--- /dev/null
+++ b/std/js/html/DOMQuadJSON.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\DOMQuad.webidl. Do not edit!
+
+package js.html;
+
+typedef DOMQuadJSON = {
+	var ?p1 : DOMPoint;
+	var ?p2 : DOMPoint;
+	var ?p3 : DOMPoint;
+	var ?p4 : DOMPoint;
+}
\ No newline at end of file
diff --git a/std/js/html/DOMRect.hx b/std/js/html/DOMRect.hx
index 5e3de87d4834b099279519ef3aa0f49d00f8cc7d..ee6a154a2d090c54af37525ede55cfab2470a712 100644
--- a/std/js/html/DOMRect.hx
+++ b/std/js/html/DOMRect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,9 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMRect>
 **/
 @:native("DOMRect")
-extern class DOMRect extends DOMRectReadOnly
-{
+extern class DOMRect extends DOMRectReadOnly {
 	/** @throws DOMError */
-	@:overload( function() : Void {} )
-	function new( x : Float, y : Float, width : Float, height : Float ) : Void;
+	function new( x : Float = 0.0, y : Float = 0.0, width : Float = 0.0, height : Float = 0.0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMRectList.hx b/std/js/html/DOMRectList.hx
index 01be0eb5b71993bcdeaf4530a4e9a77e8c70334a..582a84973dfcfaaafbdd2677ac23d90dbbbc4838 100644
--- a/std/js/html/DOMRectList.hx
+++ b/std/js/html/DOMRectList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("DOMRectList")
-extern class DOMRectList implements ArrayAccess<DOMRect>
-{
+extern class DOMRectList implements ArrayAccess<DOMRect> {
 	var length(default,null) : Int;
 	
 	function item( index : Int ) : DOMRect;
diff --git a/std/js/html/DOMRectReadOnly.hx b/std/js/html/DOMRectReadOnly.hx
index 66f743e3ba14eaf9d26883488753300c70c5cf4a..f12cbe65b6630deb000fb3fa52ac76e70da20727 100644
--- a/std/js/html/DOMRectReadOnly.hx
+++ b/std/js/html/DOMRectReadOnly.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMRectReadOnly>
 **/
 @:native("DOMRectReadOnly")
-extern class DOMRectReadOnly
-{
+extern class DOMRectReadOnly {
 	
 	/**
 		The x coordinate of the `DOMRect`'s origin.
@@ -75,4 +74,7 @@ extern class DOMRectReadOnly
 	**/
 	var left(default,null) : Float;
 	
+	/** @throws DOMError */
+	function new( x : Float = 0.0, y : Float = 0.0, width : Float = 0.0, height : Float = 0.0 ) : Void;
+	function toJSON() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMRequest.hx b/std/js/html/DOMRequest.hx
index 21b498227102ac7548a8b20ac8143146e7696948..630bc86fb90143dec23bcb899dd40660bf119691 100644
--- a/std/js/html/DOMRequest.hx
+++ b/std/js/html/DOMRequest.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,11 +25,10 @@
 package js.html;
 
 @:native("DOMRequest")
-extern class DOMRequest extends EventTarget
-{
+extern class DOMRequest extends EventTarget {
 	var readyState(default,null) : DOMRequestReadyState;
 	var result(default,null) : Dynamic;
-	var error(default,null) : DOMError;
+	var error(default,null) : DOMException;
 	var onsuccess : haxe.Constraints.Function;
 	var onerror : haxe.Constraints.Function;
 	
diff --git a/std/js/html/DOMRequestReadyState.hx b/std/js/html/DOMRequestReadyState.hx
index 6935f2302ce16b4c45c83fa4f031a138089e1cf8..0fbe5ccaf9b28ebd75b48eb0ea143335f92fb1fc 100644
--- a/std/js/html/DOMRequestReadyState.hx
+++ b/std/js/html/DOMRequestReadyState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract DOMRequestReadyState(String)
-{
+enum abstract DOMRequestReadyState(String) {
 	var PENDING = "pending";
 	var DONE = "done";
 }
\ No newline at end of file
diff --git a/std/js/html/DOMStringList.hx b/std/js/html/DOMStringList.hx
index 2b8c6bd9f3f13a641eda048f8d006ac906e46b79..199603a5166e1b586ae101b82f327e55c7eb00d7 100644
--- a/std/js/html/DOMStringList.hx
+++ b/std/js/html/DOMStringList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMStringList>
 **/
 @:native("DOMStringList")
-extern class DOMStringList implements ArrayAccess<String>
-{
+extern class DOMStringList implements ArrayAccess<String> {
 	
 	/**
 		Returns the length of the list,
diff --git a/std/js/html/DOMStringMap.hx b/std/js/html/DOMStringMap.hx
index b4fed2b3acc4f9b770e460eea65492eeaae5aa4e..d80115f9ee0ddf02b526a146f5cb26293bd16f8b 100644
--- a/std/js/html/DOMStringMap.hx
+++ b/std/js/html/DOMStringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMStringMap>
 **/
 @:native("DOMStringMap")
-extern class DOMStringMap implements Dynamic<String>
-{
+extern class DOMStringMap implements Dynamic<String> {
 }
\ No newline at end of file
diff --git a/std/js/html/DOMTokenList.hx b/std/js/html/DOMTokenList.hx
index 438d4fff6a7e6f45748942708d6816c0385577aa..4c2423cf379e9d5d9f5f5acbd1af827bfa23bd9f 100644
--- a/std/js/html/DOMTokenList.hx
+++ b/std/js/html/DOMTokenList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,49 +25,63 @@
 package js.html;
 
 /**
-	The `DOMTokenList` interface represents a set of space-separated tokens. Such a set is returned by `Element.classList`, `HTMLLinkElement.relList`, `HTMLAnchorElement.relList` or `HTMLAreaElement.relList`. It is indexed beginning with `0` as with JavaScript `Array` objects. `DOMTokenList` is always case-sensitive.
+	The `DOMTokenList` interface represents a set of space-separated tokens. Such a set is returned by `Element.classList`, `HTMLLinkElement.relList`, `HTMLAnchorElement.relList`, `HTMLAreaElement.relList`, `HTMLIframeElement.sandbox`, or `HTMLOutputElement.htmlFor`. It is indexed beginning with `0` as with JavaScript `Array` objects. `DOMTokenList` is always case-sensitive.
 
 	Documentation [DOMTokenList](https://developer.mozilla.org/en-US/docs/Web/API/DOMTokenList) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DOMTokenList$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DOMTokenList>
 **/
 @:native("DOMTokenList")
-extern class DOMTokenList implements ArrayAccess<String>
-{
+extern class DOMTokenList implements ArrayAccess<String> {
 	
 	/**
 		Is an `integer` representing the number of objects stored in the object.
 	**/
 	var length(default,null) : Int;
+	
+	/**
+		The value of the list as a `DOMString`.
+	**/
 	var value : String;
 	
 	
 	/**
-		Returns an item in the list by its index (or undefined if the number is greater than or equal to the length of the list, prior to `7.0` returned null)
+		Returns an item in the list by its index (returns undefined if the number is greater than or equal to the length of the list).
 	**/
 	function item( index : Int ) : String;
-	/** @throws DOMError */
 	
 	/**
-		Returns `true` if the underlying string contains token, otherwise `false`
+		Returns `true` if the list contains the given token, otherwise `false`.
 	**/
 	function contains( token : String ) : Bool;
-	/** @throws DOMError */
 	
 	/**
-		Adds token to the underlying string
+		Adds the given token to the list.
+		@throws DOMError
 	**/
 	function add( tokens : haxe.extern.Rest<String> ) : Void;
-	/** @throws DOMError */
 	
 	/**
-		Removes token from the underlying string
+		Removes the specified token from the list.
+		@throws DOMError
 	**/
 	function remove( tokens : haxe.extern.Rest<String> ) : Void;
-	/** @throws DOMError */
 	
 	/**
-		Removes token from string and returns false. If token doesn't exist it's added and the function returns true
+		Replaces an existing token with a new token.
+		@throws DOMError
+	**/
+	function replace( token : String, newToken : String ) : Bool;
+	
+	/**
+		Removes a given token from the list and returns false. If token doesn't exist it's added and the function returns `true`.
+		@throws DOMError
 	**/
 	function toggle( token : String, ?force : Bool ) : Bool;
+	
+	/**
+		Returns `true` if a given token is in the associated attribute's supported tokens.
+		@throws DOMError
+	**/
+	function supports( token : String ) : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/DataElement.hx b/std/js/html/DataElement.hx
index 2ee7b221b9f0ead3cec1b15e4788476efba08b5a..ac53859ae69646869fdee6b0f95bbd55b92edcef 100644
--- a/std/js/html/DataElement.hx
+++ b/std/js/html/DataElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLDataElement>
 **/
 @:native("HTMLDataElement")
-extern class DataElement extends Element
-{
+extern class DataElement extends Element {
 	
 	/**
 		Is a `DOMString` reflecting the `value` HTML attribute, containing a machine-readable form of the element's value.
diff --git a/std/js/html/DataListElement.hx b/std/js/html/DataListElement.hx
index fa26bd177b1da18955beb40b1af482bf5bcf999c..f29888d35baccc1efe2c22dd3cce70383f9f1f95 100644
--- a/std/js/html/DataListElement.hx
+++ b/std/js/html/DataListElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLDataListElement>
 **/
 @:native("HTMLDataListElement")
-extern class DataListElement extends Element
-{
+extern class DataListElement extends Element {
 	
 	/**
 		Is a `HTMLCollection` representing a collection of the contained option elements.
diff --git a/std/js/html/DataTransfer.hx b/std/js/html/DataTransfer.hx
index 22ae84110c1a60a1baedc651ffa816669eccae50..c296a87ede93cb76240d0e4e426b3d005322a73e 100644
--- a/std/js/html/DataTransfer.hx
+++ b/std/js/html/DataTransfer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DataTransfer>
 **/
 @:native("DataTransfer")
-extern class DataTransfer
-{
+extern class DataTransfer {
 	
 	/**
 		Gets the type of drag-and-drop operation currently selected or sets the operation to a new type. The value must be `none`, `copy`, `link` or `move`.
@@ -45,10 +44,15 @@ extern class DataTransfer
 	**/
 	var effectAllowed : String;
 	
+	/**
+		Gives a `DataTransferItemList` object which is a list of all of the drag data.
+	**/
+	var items(default,null) : DataTransferItemList;
+	
 	/**
 		An array of `DOMString` giving the formats that were set in the `dragstart` event.
 	**/
-	var types(default,null) : DOMStringList;
+	var types(default,null) : Array<String>;
 	
 	/**
 		Contains a list of all the local files available on the data transfer. If the drag operation doesn't involve dragging files, this property is an empty list.
@@ -56,35 +60,34 @@ extern class DataTransfer
 	var files(default,null) : FileList;
 	
 	/** @throws DOMError */
-	function new( eventType : String, isExternal : Bool ) : Void;
-	/** @throws DOMError */
+	function new() : Void;
 	
 	/**
 		Set the image to be used for dragging if a custom one is desired.
 	**/
 	function setDragImage( image : Element, x : Int, y : Int ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Retrieves the data for a given type, or an empty string if data for that type does not exist or the data transfer contains no data.
+		@throws DOMError
 	**/
 	function getData( format : String ) : String;
-	/** @throws DOMError */
 	
 	/**
 		Set the data for a given type. If data for the type does not exist, it is added at the end, such that the last item in the types list will be the new format. If data for the type already exists, the existing data is replaced in the same position.
+		@throws DOMError
 	**/
 	function setData( format : String, data : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Remove the data associated with a given type. The type argument is optional. If the type is empty or not specified, the data associated with all types is removed. If data for the specified type does not exist, or the data transfer contains no data, this method will have no effect.
+		@throws DOMError
 	**/
 	function clearData( ?format : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Sets the drag source to the given element.
+		@throws DOMError
 	**/
 	function addElement( element : Element ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DataTransferItem.hx b/std/js/html/DataTransferItem.hx
new file mode 100644
index 0000000000000000000000000000000000000000..294fbf0cb7c882222a67994d8d509847c0993fe6
--- /dev/null
+++ b/std/js/html/DataTransferItem.hx
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\DataTransferItem.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `DataTransferItem` object represents one drag data item. During a drag operation, each `drag event` has a `dataTransfer` property which contains a `list` of drag data items. Each item in the list is a `DataTransferItem` object.
+
+	Documentation [DataTransferItem](https://developer.mozilla.org/en-US/docs/Web/API/DataTransferItem) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DataTransferItem$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/DataTransferItem>
+**/
+@:native("DataTransferItem")
+extern class DataTransferItem {
+	
+	/**
+		The kind of drag data item, `string` or `file`.
+	**/
+	var kind(default,null) : String;
+	
+	/**
+		The drag data item's type, typically a MIME type.
+	**/
+	var type(default,null) : String;
+	
+	
+	/**
+		Invokes the specified callback with the drag data item string as its argument.
+		@throws DOMError
+	**/
+	function getAsString( callback : String -> Void ) : Void;
+	
+	/**
+		Returns the `File` object associated with the drag data item (or null if the drag item is not a file).
+		@throws DOMError
+	**/
+	function getAsFile() : File;
+}
\ No newline at end of file
diff --git a/std/js/html/DataTransferItemList.hx b/std/js/html/DataTransferItemList.hx
new file mode 100644
index 0000000000000000000000000000000000000000..74ca82687a281e09a1cead933121bfecd8bab96b
--- /dev/null
+++ b/std/js/html/DataTransferItemList.hx
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\DataTransferItemList.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `DataTransferItemList` object is a list of `DataTransferItem` objects representing items being dragged. During a drag operation, each `DragEvent` has a `dataTransfer` property and that property is a `DataTransferItemList`.
+
+	Documentation [DataTransferItemList](https://developer.mozilla.org/en-US/docs/Web/API/DataTransferItemList) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DataTransferItemList$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/DataTransferItemList>
+**/
+@:native("DataTransferItemList")
+extern class DataTransferItemList implements ArrayAccess<DataTransferItem> {
+	
+	/**
+		An `unsigned long` that is the number of drag items in the list.
+	**/
+	var length(default,null) : Int;
+	
+	
+	/**
+		Adds an item (either a `File` object or a `DOMString`) to the drag item list and returns a `DataTransferItem` object for the new item.
+		@throws DOMError
+	**/
+	@:overload( function( data : String, type : String ) : DataTransferItem {} )
+	function add( data : File ) : DataTransferItem;
+	
+	/**
+		Removes the drag item from the list at the given index.
+		@throws DOMError
+	**/
+	function remove( index : Int ) : Void;
+	
+	/**
+		Removes all of the drag items from the list.
+		@throws DOMError
+	**/
+	function clear() : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/DataView.hx b/std/js/html/DataView.hx
index 5e7643db4f156035da36a3d85418c71072b9a015..9c7af11538bc5827c63319347fbaef4f7b34fc4f 100644
--- a/std/js/html/DataView.hx
+++ b/std/js/html/DataView.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,32 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-// Explicitly include the compatibility class
-import js.html.compat.DataView;
-
-@:native("DataView")
-extern class DataView extends ArrayBufferView
-{
-	/** @throws DOMError */
-	function new( buffer : ArrayBuffer, ?byteOffset : Int, ?byteLength : Int ) : Void;
-	@:pure function getInt8( byteOffset : Int ) : Int;
-	@:pure function getUint8( byteOffset : Int ) : Int;
-	@:pure function getInt16( byteOffset : Int, ?littleEndian : Bool ) : Int;
-	@:pure function getUint16( byteOffset : Int, ?littleEndian : Bool ) : Int;
-	@:pure function getInt32( byteOffset : Int, ?littleEndian : Bool ) : Int;
-	@:pure function getUint32( byteOffset : Int, ?littleEndian : Bool ) : Int;
-	@:pure function getFloat32( byteOffset : Int, ?littleEndian : Bool ) : Float;
-	@:pure function getFloat64( byteOffset : Int, ?littleEndian : Bool ) : Float;
-	function setInt8( byteOffset : Int, value : Int ) : Void;
-	function setUint8( byteOffset : Int, value : Int ) : Void;
-	function setInt16( byteOffset : Int, value : Int, ?littleEndian : Bool ) : Void;
-	function setUint16( byteOffset : Int, value : Int, ?littleEndian : Bool ) : Void;
-	function setInt32( byteOffset : Int, value : Int, ?littleEndian : Bool ) : Void;
-	function setUint32( byteOffset : Int, value : Int, ?littleEndian : Bool ) : Void;
-	function setFloat32( byteOffset : Int, value : Float, ?littleEndian : Bool ) : Void;
-	function setFloat64( byteOffset : Int, value : Float, ?littleEndian : Bool ) : Void;
-}
\ No newline at end of file
+@:deprecated typedef DataView = js.lib.DataView;
diff --git a/std/js/html/DedicatedWorkerGlobalScope.hx b/std/js/html/DedicatedWorkerGlobalScope.hx
index 944cb1d5157bcd59c1f66349f01389a4f5bc93a0..fc9e709457c8586c29f8cd51463a57776e1cb3d9 100644
--- a/std/js/html/DedicatedWorkerGlobalScope.hx
+++ b/std/js/html/DedicatedWorkerGlobalScope.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,14 +32,32 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DedicatedWorkerGlobalScope>
 **/
 @:native("DedicatedWorkerGlobalScope")
-extern class DedicatedWorkerGlobalScope extends WorkerGlobalScope
-{
+extern class DedicatedWorkerGlobalScope extends WorkerGlobalScope {
+	
+	/**
+		The name that the `Worker` was (optionally) given when it was created using the `Worker.Worker` constructor. This is mainly useful for debugging purposes.
+	**/
+	var name(default,null) : String;
 	
 	/**
 		Is an `EventHandler` representing the code to be called when the `message` event is raised. These events are of type `MessageEvent` and will be called when the worker receives a message from the document that started it (i.e. from the `Worker.postMessage` method.)
 	**/
 	var onmessage : haxe.Constraints.Function;
 	
-	/** @throws DOMError */
+	/**
+		Is an `EventHandler` representing the code to be called when the `messageerror` event is raised.
+	**/
+	var onmessageerror : haxe.Constraints.Function;
+	
+	
+	/**
+		Sends a message — which can consist of `any` JavaScript object — to the parent document that first spawned the worker.
+		@throws DOMError
+	**/
 	function postMessage( message : Dynamic, ?transfer : Array<Dynamic> ) : Void;
+	
+	/**
+		Discards any tasks queued in the `WorkerGlobalScope`'s event loop, effectively closing this particular scope.
+	**/
+	function close() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ContentElement.hx b/std/js/html/DetailsElement.hx
similarity index 57%
rename from std/js/html/ContentElement.hx
rename to std/js/html/DetailsElement.hx
index eaade2108c14491d752f976487b68bca40035da5..6f2461188498cc0aefa2fb01ff24f459f9db8e0e 100644
--- a/std/js/html/ContentElement.hx
+++ b/std/js/html/DetailsElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,29 +20,23 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\HTMLContentElement.webidl. Do not edit!
+// This file is generated from mozilla\HTMLDetailsElement.webidl. Do not edit!
 
 package js.html;
 
 /**
-	The `HTMLContentElement` interface represents a `content` HTML Element, which is used in Shadow DOM.
+	The `HTMLDetailsElement` interface provides special properties (beyond the regular `HTMLElement` interface it also has available to it by inheritance) for manipulating `details` elements.
 
-	Documentation [HTMLContentElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLContentElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLContentElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [HTMLDetailsElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLDetailsElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLDetailsElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLContentElement>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLDetailsElement>
 **/
-@:native("HTMLContentElement")
-extern class ContentElement extends Element
-{
+@:native("HTMLDetailsElement")
+extern class DetailsElement extends Element {
 	
 	/**
-		Is a `DOMString` that reflects the `select` HTML attribute. The value is a comma-separated list of CSS selectors that select the content to insert in place of the `content` element.
+		Is a `boolean` reflecting the `open` HTML attribute, indicating whether or not the element’s contents (not counting the `summary`) is to be shown to the user.
 	**/
-	var select : String;
+	var open : Bool;
 	
-	
-	/**
-		Returns a static `NodeList` of the `distributed nodes` associated with this `content` element. 
-	**/
-	function getDistributedNodes() : NodeList;
 }
\ No newline at end of file
diff --git a/std/js/html/DeviceAcceleration.hx b/std/js/html/DeviceAcceleration.hx
index ae83f1ac40a7c69a3477c4d347db78025cc75b9f..9b82d24d18a868b92c49bebacb86ee62560c8a7a 100644
--- a/std/js/html/DeviceAcceleration.hx
+++ b/std/js/html/DeviceAcceleration.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,9 +31,7 @@ package js.html;
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DeviceAcceleration>
 **/
-@:native("DeviceAcceleration")
-extern class DeviceAcceleration
-{
+typedef DeviceAcceleration = {
 	
 	/**
 		The amount of acceleration along the X axis. Read only.
diff --git a/std/js/html/DeviceAccelerationInit.hx b/std/js/html/DeviceAccelerationInit.hx
index 3f9043392368ca044923fc953458a307deff2647..6407388b82a08cfb210223a1901476c16a254819 100644
--- a/std/js/html/DeviceAccelerationInit.hx
+++ b/std/js/html/DeviceAccelerationInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,8 @@
 
 package js.html;
 
-typedef DeviceAccelerationInit =
-{
-	@:optional var x : Float;
-	@:optional var y : Float;
-	@:optional var z : Float;
+typedef DeviceAccelerationInit = {
+	var ?x : Float;
+	var ?y : Float;
+	var ?z : Float;
 }
\ No newline at end of file
diff --git a/std/js/html/DeviceMotionEvent.hx b/std/js/html/DeviceMotionEvent.hx
index 6be1a83e831d190d676527ea26fc7b107917981a..9b2fd0ee02224cb27d0b4fee828ebc18b66ebf54 100644
--- a/std/js/html/DeviceMotionEvent.hx
+++ b/std/js/html/DeviceMotionEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DeviceMotionEvent>
 **/
 @:native("DeviceMotionEvent")
-extern class DeviceMotionEvent extends Event
-{
+extern class DeviceMotionEvent extends Event {
 	
 	/**
 		An object giving the acceleration of the device on the three axis X, Y and Z. Acceleration is expressed in m/s2.
@@ -46,7 +45,7 @@ extern class DeviceMotionEvent extends Event
 	var accelerationIncludingGravity(default,null) : DeviceAcceleration;
 	
 	/**
-		An object giving the rate of change of the device's orientation on the three orientation axis alpha, beta and gamma. Rotation rate is express in degrees per seconds.
+		An object giving the rate of change of the device's orientation on the three orientation axis alpha, beta and gamma. Rotation rate is expressed in degrees per seconds.
 	**/
 	var rotationRate(default,null) : DeviceRotationRate;
 	
@@ -57,5 +56,5 @@ extern class DeviceMotionEvent extends Event
 	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : DeviceMotionEventInit ) : Void;
-	function initDeviceMotionEvent( type : String, canBubble : Bool, cancelable : Bool, acceleration : DeviceAccelerationInit, accelerationIncludingGravity : DeviceAccelerationInit, rotationRate : DeviceRotationRateInit, interval : Float ) : Void;
+	function initDeviceMotionEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?acceleration : DeviceAccelerationInit, ?accelerationIncludingGravity : DeviceAccelerationInit, ?rotationRate : DeviceRotationRateInit, ?interval : Float ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DeviceMotionEventInit.hx b/std/js/html/DeviceMotionEventInit.hx
index ba1c89a0412a7e73c97b1dc74048ccdf87fe6a21..a12ba420adb547dd89ec6c3f3d201615f736ea88 100644
--- a/std/js/html/DeviceMotionEventInit.hx
+++ b/std/js/html/DeviceMotionEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,9 @@
 
 package js.html;
 
-typedef DeviceMotionEventInit =
-{
-	> EventInit,
-	@:optional var acceleration : DeviceAccelerationInit;
-	@:optional var accelerationIncludingGravity : DeviceAccelerationInit;
-	@:optional var interval : Float;
-	@:optional var rotationRate : DeviceRotationRateInit;
+typedef DeviceMotionEventInit = EventInit & {
+	var ?acceleration : DeviceAccelerationInit;
+	var ?accelerationIncludingGravity : DeviceAccelerationInit;
+	var ?interval : Float;
+	var ?rotationRate : DeviceRotationRateInit;
 }
\ No newline at end of file
diff --git a/std/js/html/DeviceOrientationEvent.hx b/std/js/html/DeviceOrientationEvent.hx
index 31c6735da1808b035a9d8a70b9cb98b2ad16d4a9..abd17758ce3528ae3ecdf5b49a3d7d61611fdf0b 100644
--- a/std/js/html/DeviceOrientationEvent.hx
+++ b/std/js/html/DeviceOrientationEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,10 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DeviceOrientationEvent>
 **/
 @:native("DeviceOrientationEvent")
-extern class DeviceOrientationEvent extends Event
-{
+extern class DeviceOrientationEvent extends Event {
 	
 	/**
-		A number representing the motion of the device around the z axis, express in degrees with values ranging from 0 to 360
+		A number representing the motion of the device around the z axis, express in degrees with values ranging from 0 to 360.
 	**/
 	var alpha(default,null) : Float;
 	
@@ -57,5 +56,5 @@ extern class DeviceOrientationEvent extends Event
 	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : DeviceOrientationEventInit ) : Void;
-	function initDeviceOrientationEvent( type : String, canBubble : Bool, cancelable : Bool, alpha : Float, beta : Float, gamma : Float, absolute : Bool ) : Void;
+	function initDeviceOrientationEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?alpha : Float, ?beta : Float, ?gamma : Float, absolute : Bool = false ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DeviceOrientationEventInit.hx b/std/js/html/DeviceOrientationEventInit.hx
index a47d594902ce40cdfca8b3cf36149f7674d886ab..34d7f7b0c966fe6d0c69a61051a4d3af8f2b28cd 100644
--- a/std/js/html/DeviceOrientationEventInit.hx
+++ b/std/js/html/DeviceOrientationEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,9 @@
 
 package js.html;
 
-typedef DeviceOrientationEventInit =
-{
-	> EventInit,
-	@:optional var absolute : Bool;
-	@:optional var alpha : Float;
-	@:optional var beta : Float;
-	@:optional var gamma : Float;
+typedef DeviceOrientationEventInit = EventInit & {
+	var ?absolute : Bool;
+	var ?alpha : Float;
+	var ?beta : Float;
+	var ?gamma : Float;
 }
\ No newline at end of file
diff --git a/std/js/html/DeviceRotationRate.hx b/std/js/html/DeviceRotationRate.hx
index 17d6d18355aac45182ddd2d2e6d7108426c108a5..dd6d6f5d4718d532c2423c65617a2815b549e0ba 100644
--- a/std/js/html/DeviceRotationRate.hx
+++ b/std/js/html/DeviceRotationRate.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,11 +31,21 @@ package js.html;
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DeviceRotationRate>
 **/
-@:native("DeviceRotationRate")
-extern class DeviceRotationRate
-{
+typedef DeviceRotationRate = {
+	
+	/**
+		The amount of rotation around the Z axis, in degrees per second.
+	**/
 	var alpha(default,null) : Float;
+	
+	/**
+		The amount of rotation around the X axis, in degrees per second.
+	**/
 	var beta(default,null) : Float;
+	
+	/**
+		The amount of rotation around the Y axis, in degrees per second.
+	**/
 	var gamma(default,null) : Float;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/DeviceRotationRateInit.hx b/std/js/html/DeviceRotationRateInit.hx
index 180cb1023a30c35f3e81bbaeca2ec36c35aaa3b1..1cc295efd3c9a7ea629f6b43119dde7b1804c636 100644
--- a/std/js/html/DeviceRotationRateInit.hx
+++ b/std/js/html/DeviceRotationRateInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,8 @@
 
 package js.html;
 
-typedef DeviceRotationRateInit =
-{
-	@:optional var alpha : Float;
-	@:optional var beta : Float;
-	@:optional var gamma : Float;
+typedef DeviceRotationRateInit = {
+	var ?alpha : Float;
+	var ?beta : Float;
+	var ?gamma : Float;
 }
\ No newline at end of file
diff --git a/std/js/html/DirectionSetting.hx b/std/js/html/DirectionSetting.hx
index b9027c701581b60b17516a865b25a30a29051478..8a4cb3eec3762620154e214e3fc2d34717d2175d 100644
--- a/std/js/html/DirectionSetting.hx
+++ b/std/js/html/DirectionSetting.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract DirectionSetting(String)
-{
+enum abstract DirectionSetting(String) {
 	var NONE = "";
 	var RL = "rl";
 	var LR = "lr";
diff --git a/std/js/html/Directory.hx b/std/js/html/Directory.hx
index 149e7cb1c817f24fca7b6271c870ba2413cf33f7..719d35597271bca24cb811742e27b836e87a1d0d 100644
--- a/std/js/html/Directory.hx
+++ b/std/js/html/Directory.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,17 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 @:native("Directory")
-extern class Directory
-{
+extern class Directory {
 	var name(default,null) : String;
 	var path(default,null) : String;
-	
+
+	/** @throws DOMError */
+	function new( path : String ) : Void;
+	/** @throws DOMError */
 	function getFilesAndDirectories() : Promise<Array<haxe.extern.EitherType<File,Directory>>>;
+	/** @throws DOMError */
+	function getFiles( recursiveFlag : Bool = false ) : Promise<Array<File>>;
 }
\ No newline at end of file
diff --git a/std/js/html/DirectoryElement.hx b/std/js/html/DirectoryElement.hx
index 0e54e1dc455b1ae71fd2437718093305cab59490..35b993f0495542f785c9b73413ff010eaae37093 100644
--- a/std/js/html/DirectoryElement.hx
+++ b/std/js/html/DirectoryElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("HTMLDirectoryElement")
-extern class DirectoryElement extends Element
-{
+extern class DirectoryElement extends Element {
 	var compact : Bool;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/DisplayNameOptions.hx b/std/js/html/DisplayNameOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b91e0e11cc6e1c75c97b0a50f10c164524005e41
--- /dev/null
+++ b/std/js/html/DisplayNameOptions.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\IntlUtils.webidl. Do not edit!
+
+package js.html;
+
+typedef DisplayNameOptions = {
+	var ?keys : Array<String>;
+	var ?style : String;
+}
\ No newline at end of file
diff --git a/std/js/html/DisplayNameResult.hx b/std/js/html/DisplayNameResult.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d5e8a60ff43ec4bbdbfa627fe3775da497fb8ee5
--- /dev/null
+++ b/std/js/html/DisplayNameResult.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\IntlUtils.webidl. Do not edit!
+
+package js.html;
+
+typedef DisplayNameResult = {
+	var ?locale : String;
+	var ?style : String;
+	var ?values : haxe.DynamicAccess<String>;
+}
\ No newline at end of file
diff --git a/std/js/html/DivElement.hx b/std/js/html/DivElement.hx
index 85598fa3bb5efd7e8792bbb59a95441b28bf1232..ac1adbaf7c8cc7a3e8a04342ac6dc15df3ddf07f 100644
--- a/std/js/html/DivElement.hx
+++ b/std/js/html/DivElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLDivElement>
 **/
 @:native("HTMLDivElement")
-extern class DivElement extends Element
-{
+extern class DivElement extends Element {
 	
 	/**
 		Is a `DOMString` representing an enumerated property indicating alignment of the element's contents with respect to the surrounding context. The possible values are `"left"`, `"right"`, `"justify"`, and `"center"`.
diff --git a/std/js/html/Document.hx b/std/js/html/Document.hx
index c1362995fcd12f1307f6c60f00354db5116e3fd9..8085da99d97212a40b52ffe88457a6d4fe410dd4 100644
--- a/std/js/html/Document.hx
+++ b/std/js/html/Document.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `Document` interface represents any web page loaded in the browser and serves as an entry point into the web page's content, which is the DOM tree. The DOM tree includes elements such as `body` and `table`, among many others. It provides functionality global to the document, like how to obtain the page's URL and create new elements in the document.
+	The `Document` interface represents any web page loaded in the browser and serves as an entry point into the web page's content, which is the DOM tree.`HTMLElement`
 
 	Documentation [Document](https://developer.mozilla.org/en-US/docs/Web/API/Document) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Document$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Document>
 **/
 @:native("Document")
-extern class Document extends Node
-{
+extern class Document extends Node {
 	
 	/**
 		Returns the DOM implementation associated with the current document.
@@ -81,7 +80,7 @@ extern class Document extends Node
 	var doctype(default,null) : DocumentType;
 	
 	/**
-		Returns the `Element` that is a direct child of the document. For HTML documents, this is normally the `html` element.
+		Returns the `Element` that is a direct child of the document. For HTML documents, this is normally the `HTMLElement` element.
 	**/
 	var documentElement(default,null) : Element;
 	
@@ -106,7 +105,7 @@ extern class Document extends Node
 	var readyState(default,null) : String;
 	
 	/**
-		Sets or gets title of the current document.
+		Sets or gets the title of the current document.
 	**/
 	var title : String;
 	
@@ -116,39 +115,54 @@ extern class Document extends Node
 	var dir : String;
 	
 	/**
-		Returns a reference to the window object.
+		Returns the `body` or `frameset` node of the current document.
 	**/
-	var defaultView(default,null) : Window;
+	var body : Element;
 	
 	/**
-		Returns the currently focused element.
+		Returns the `head` element of the current document.
 	**/
-	var activeElement(default,null) : Element;
+	var head(default,null) : HeadElement;
 	
 	/**
-		Represents the event handling code for the `readystatechange` event.
+		Returns a list of the images in the current document.
 	**/
-	var onreadystatechange : haxe.Constraints.Function;
+	var images(default,null) : HTMLCollection;
 	
 	/**
-		Represents the event handling code for the `wheel` event.
+		Returns a list of the embedded `embed` elements within the current document.
 	**/
-	var onwheel : haxe.Constraints.Function;
+	var embeds(default,null) : HTMLCollection;
 	
 	/**
-		Represents the event handling code for the `copy` event.
+		Returns a list of the available plugins.
 	**/
-	var oncopy : haxe.Constraints.Function;
+	var plugins(default,null) : HTMLCollection;
 	
 	/**
-		Represents the event handling code for the `cut` event.
+		Returns a list of all the hyperlinks in the document.
 	**/
-	var oncut : haxe.Constraints.Function;
+	var links(default,null) : HTMLCollection;
 	
 	/**
-		Represents the event handling code for the `paste` event.
+		Returns a list of the `form` elements within the current document.
 	**/
-	var onpaste : haxe.Constraints.Function;
+	var forms(default,null) : HTMLCollection;
+	
+	/**
+		Returns all the `script` elements on the document.
+	**/
+	var scripts(default,null) : HTMLCollection;
+	
+	/**
+		Returns a reference to the window object.
+	**/
+	var defaultView(default,null) : Window;
+	
+	/**
+		Represents the event handling code for the `readystatechange` event.
+	**/
+	var onreadystatechange : haxe.Constraints.Function;
 	
 	/**
 		Represents the event handling code for the `beforescriptexecute` event.
@@ -159,14 +173,48 @@ extern class Document extends Node
 		Represents the event handling code for the `afterscriptexecute` event.
 	**/
 	var onafterscriptexecute : haxe.Constraints.Function;
+	
+	/**
+		Is an `EventHandler` representing the code to be called when the `selectionchange` event is raised.
+	**/
+	var onselectionchange : haxe.Constraints.Function;
 	var currentScript(default,null) : Element;
+	
+	/**
+		Returns a list of all of the anchors in the document.
+	**/
+	var anchors(default,null) : HTMLCollection;
+	
+	/**
+		Returns an ordered list of the applets within a document.
+	**/
+	var applets(default,null) : HTMLCollection;
+	
+	/**
+		`true` when the document is in `Using_full-screen_mode`.
+	**/
+	var fullscreen(default,null) : Bool;
 	var fullscreenEnabled(default,null) : Bool;
-	var fullscreenElement(default,null) : Element;
 	
 	/**
-		Returns the element set as the target for mouse events while the pointer is locked. `null` if lock is pending, pointer is unlocked, or if the target is in another document.
+		Is an `EventHandler` representing the code to be called when the `fullscreenchange` event is raised.
 	**/
-	var pointerLockElement(default,null) : Element;
+	var onfullscreenchange : haxe.Constraints.Function;
+	
+	/**
+		Is an `EventHandler` representing the code to be called when the `fullscreenerror` event is raised.
+	**/
+	var onfullscreenerror : haxe.Constraints.Function;
+	
+	/**
+		Represents the event handling code for the `pointerlockchange` event.
+	**/
+	var onpointerlockchange : haxe.Constraints.Function;
+	
+	/**
+		Represents the event handling code for the `pointerlockerror` event.
+	**/
+	var onpointerlockerror : haxe.Constraints.Function;
 	
 	/**
 		…
@@ -174,16 +222,14 @@ extern class Document extends Node
 	var hidden(default,null) : Bool;
 	
 	/**
-		
-		 Returns a `string` denoting the visibility state of the document. Possible values are `visible`,  `hidden`,  `prerender`, and `unloaded`.
-		 
+		Returns a `string` denoting the visibility state of the document. Possible values are `visible`,  `hidden`,  `prerender`, and `unloaded`.
 	**/
 	var visibilityState(default,null) : VisibilityState;
 	
 	/**
-		Returns a list of the style sheet objects on the current document.
+		Is an `EventHandler` representing the code to be called when the `visibilitychange` event is raised.
 	**/
-	var styleSheets(default,null) : StyleSheetList;
+	var onvisibilitychange : haxe.Constraints.Function;
 	
 	/**
 		Returns which style sheet set is currently in use.
@@ -205,23 +251,55 @@ extern class Document extends Node
 	**/
 	var styleSheetSets(default,null) : DOMStringList;
 	
+	/**
+		Returns a reference to the `Element` that scrolls the document.
+	**/
+	var scrollingElement(default,null) : Element;
+	
 	/**
 		…
 	**/
 	var timeline(default,null) : DocumentTimeline;
+	var rootElement(default,null) : js.html.svg.SVGElement;
+	
+	/**
+		Represents the event handling code for the `copy` event.
+	**/
+	var oncopy : haxe.Constraints.Function;
+	
+	/**
+		Represents the event handling code for the `cut` event.
+	**/
+	var oncut : haxe.Constraints.Function;
+	
+	/**
+		Represents the event handling code for the `paste` event.
+	**/
+	var onpaste : haxe.Constraints.Function;
+	var activeElement(default,null) : Element;
+	var styleSheets(default,null) : StyleSheetList;
+	var pointerLockElement(default,null) : Element;
+	
+	/**
+		The element that's currently in full screen mode for this document.
+	**/
+	var fullscreenElement(default,null) : Element;
 	var fonts(default,null) : FontFaceSet;
 	var onabort : haxe.Constraints.Function;
 	var onblur : haxe.Constraints.Function;
 	var onfocus : haxe.Constraints.Function;
+	var onauxclick : haxe.Constraints.Function;
 	var oncanplay : haxe.Constraints.Function;
 	var oncanplaythrough : haxe.Constraints.Function;
 	var onchange : haxe.Constraints.Function;
 	var onclick : haxe.Constraints.Function;
+	var onclose : haxe.Constraints.Function;
 	var oncontextmenu : haxe.Constraints.Function;
 	var ondblclick : haxe.Constraints.Function;
 	var ondrag : haxe.Constraints.Function;
 	var ondragend : haxe.Constraints.Function;
 	var ondragenter : haxe.Constraints.Function;
+	var ondragexit : haxe.Constraints.Function;
 	var ondragleave : haxe.Constraints.Function;
 	var ondragover : haxe.Constraints.Function;
 	var ondragstart : haxe.Constraints.Function;
@@ -237,6 +315,7 @@ extern class Document extends Node
 	var onload : haxe.Constraints.Function;
 	var onloadeddata : haxe.Constraints.Function;
 	var onloadedmetadata : haxe.Constraints.Function;
+	var onloadend : haxe.Constraints.Function;
 	var onloadstart : haxe.Constraints.Function;
 	var onmousedown : haxe.Constraints.Function;
 	var onmouseenter : haxe.Constraints.Function;
@@ -245,6 +324,11 @@ extern class Document extends Node
 	var onmouseout : haxe.Constraints.Function;
 	var onmouseover : haxe.Constraints.Function;
 	var onmouseup : haxe.Constraints.Function;
+	
+	/**
+		Represents the event handling code for the `wheel` event.
+	**/
+	var onwheel : haxe.Constraints.Function;
 	var onpause : haxe.Constraints.Function;
 	var onplay : haxe.Constraints.Function;
 	var onplaying : haxe.Constraints.Function;
@@ -263,6 +347,8 @@ extern class Document extends Node
 	var ontimeupdate : haxe.Constraints.Function;
 	var onvolumechange : haxe.Constraints.Function;
 	var onwaiting : haxe.Constraints.Function;
+	var onselectstart : haxe.Constraints.Function;
+	var ontoggle : haxe.Constraints.Function;
 	var onpointercancel : haxe.Constraints.Function;
 	var onpointerdown : haxe.Constraints.Function;
 	var onpointerup : haxe.Constraints.Function;
@@ -273,26 +359,18 @@ extern class Document extends Node
 	var onpointerleave : haxe.Constraints.Function;
 	var ongotpointercapture : haxe.Constraints.Function;
 	var onlostpointercapture : haxe.Constraints.Function;
-	
-	/**
-		Is an `EventHandler` representing the code to be called when the `fullscreenchange` event is raised.
-	**/
-	var onfullscreenchange : haxe.Constraints.Function;
-	
-	/**
-		Is an `EventHandler` representing the code to be called when the `fullscreenerror` event is raised.
-	**/
-	var onfullscreenerror : haxe.Constraints.Function;
-	
-	/**
-		Represents the event handling code for the `pointerlockchange` event.
-	**/
-	var onpointerlockchange : haxe.Constraints.Function;
-	
-	/**
-		Represetnts the event handling code for the `pointerlockerror` event.
-	**/
-	var onpointerlockerror : haxe.Constraints.Function;
+	var onanimationcancel : haxe.Constraints.Function;
+	var onanimationend : haxe.Constraints.Function;
+	var onanimationiteration : haxe.Constraints.Function;
+	var onanimationstart : haxe.Constraints.Function;
+	var ontransitioncancel : haxe.Constraints.Function;
+	var ontransitionend : haxe.Constraints.Function;
+	var ontransitionrun : haxe.Constraints.Function;
+	var ontransitionstart : haxe.Constraints.Function;
+	var onwebkitanimationend : haxe.Constraints.Function;
+	var onwebkitanimationiteration : haxe.Constraints.Function;
+	var onwebkitanimationstart : haxe.Constraints.Function;
+	var onwebkittransitionend : haxe.Constraints.Function;
 	var onerror : haxe.Constraints.Function;
 	var children(default,null) : HTMLCollection;
 	var firstElementChild(default,null) : Element;
@@ -309,33 +387,37 @@ extern class Document extends Node
 	/**
 		Returns a list of elements with the given tag name.
 	**/
+	@:pure
 	function getElementsByTagName( localName : String ) : HTMLCollection;
-	/** @throws DOMError */
 	
 	/**
 		Returns a list of elements with the given tag name and namespace.
+		@throws DOMError
 	**/
-	function getElementsByTagNameNS( namespace_ : String, localName : String ) : HTMLCollection;
+	@:pure
+	function getElementsByTagNameNS( namespace : String, localName : String ) : HTMLCollection;
 	
 	/**
 		Returns a list of elements with the given class name.
 	**/
+	@:pure
 	function getElementsByClassName( classNames : String ) : HTMLCollection;
+	@:pure
 	function getElementById( elementId : String ) : Element;
-	/** @throws DOMError */
-	@:overload( function( localName : String ) : Element {} )
 	
 	/**
 		Creates a new element with the given tag name.
+		@throws DOMError
 	**/
-	function createElement( localName : String, typeExtension : String ) : Element;
-	/** @throws DOMError */
-	@:overload( function( namespace_ : String, qualifiedName : String ) : Element {} )
+	@:overload( function( localName : String, ?options : String) : Element {} )
+	function createElement( localName : String, ?options : ElementCreationOptions ) : Element;
 	
 	/**
 		Creates a new element with the given tag name and namespace URI.
+		@throws DOMError
 	**/
-	function createElementNS( namespace_ : String, qualifiedName : String, typeExtension : String ) : Element;
+	@:overload( function( namespace : String, qualifiedName : String, ?options : String) : Element {} )
+	function createElementNS( namespace : String, qualifiedName : String, ?options : ElementCreationOptions ) : Element;
 	
 	/**
 		Creates a new document fragment.
@@ -351,67 +433,77 @@ extern class Document extends Node
 		Creates a new comment node and returns it.
 	**/
 	function createComment( data : String ) : Comment;
-	/** @throws DOMError */
 	
 	/**
 		Creates a new `ProcessingInstruction` object.
+		@throws DOMError
 	**/
 	function createProcessingInstruction( target : String, data : String ) : ProcessingInstruction;
-	/** @throws DOMError */
 	
 	/**
 		Returns a clone of a node from an external document.
+		@throws DOMError
 	**/
-	function importNode( node : Node, ?deep : Bool = false ) : Node;
-	/** @throws DOMError */
+	function importNode( node : Node, deep : Bool = false ) : Node;
 	
 	/**
 		Adopt node from an external document.
+		@throws DOMError
 	**/
 	function adoptNode( node : Node ) : Node;
-	/** @throws DOMError */
 	
 	/**
 		Creates an event object.
+		@throws DOMError
 	**/
 	function createEvent( interface_ : String ) : Event;
-	/** @throws DOMError */
 	
 	/**
 		Creates a `Range` object.
+		@throws DOMError
 	**/
 	function createRange() : Range;
-	/** @throws DOMError */
 	
 	/**
 		Creates a `NodeIterator` object.
+		@throws DOMError
 	**/
-	function createNodeIterator( root : Node, ?whatToShow : Int = cast 4294967295, ?filter : NodeFilter ) : NodeIterator;
-	/** @throws DOMError */
+	@:overload( function( root : Node, whatToShow : Int = cast 4294967295, ?filter : haxe.Constraints.Function) : NodeIterator {} )
+	@:overload( function( root : Node, whatToShow : Int = cast 4294967295, ?filter : NodeFilter) : NodeIterator {} )
+	function createNodeIterator( root : Node, whatToShow : Int = cast 4294967295, ?filter : Node -> Int ) : NodeIterator;
 	
 	/**
 		Creates a `TreeWalker` object.
+		@throws DOMError
 	**/
-	function createTreeWalker( root : Node, ?whatToShow : Int = cast 4294967295, ?filter : NodeFilter ) : TreeWalker;
-	/** @throws DOMError */
+	@:overload( function( root : Node, whatToShow : Int = cast 4294967295, ?filter : haxe.Constraints.Function) : TreeWalker {} )
+	@:overload( function( root : Node, whatToShow : Int = cast 4294967295, ?filter : NodeFilter) : TreeWalker {} )
+	function createTreeWalker( root : Node, whatToShow : Int = cast 4294967295, ?filter : Node -> Int ) : TreeWalker;
 	
 	/**
 		Creates a new CDATA node and returns it.
+		@throws DOMError
 	**/
 	function createCDATASection( data : String ) : CDATASection;
-	/** @throws DOMError */
 	
 	/**
 		Creates a new `Attr` object and returns it.
+		@throws DOMError
 	**/
 	function createAttribute( name : String ) : Attr;
-	/** @throws DOMError */
 	
 	/**
 		Creates a new attribute node in a given namespace and returns it.
+		@throws DOMError
+	**/
+	function createAttributeNS( namespace : String, name : String ) : Attr;
+	@:pure
+	function getElementsByName( elementName : String ) : NodeList;
+	
+	/**
+		Returns `true` if the focus is currently located anywhere inside the specified document.
+		@throws DOMError
 	**/
-	function createAttributeNS( namespace_ : String, name : String ) : Attr;
-	/** @throws DOMError */
 	function hasFocus() : Bool;
 	
 	/**
@@ -424,62 +516,65 @@ extern class Document extends Node
 		Release the pointer lock.
 	**/
 	function exitPointerLock() : Void;
-	/** @throws DOMError */
-	
-	/**
-		Registers a web component.
-	**/
-	function registerElement( name : String, ?options : ElementRegistrationOptions ) : Dynamic;
 	
 	/**
 		Enables the style sheets for the specified style sheet set.
 	**/
 	function enableStyleSheetsForSet( name : String ) : Void;
-	
-	/**
-		Returns the topmost element at the specified coordinates. 
-	**/
-	function elementFromPoint( x : Float, y : Float ) : Element;
-	
-	/**
-		Returns an array of all elements at the specified coordinates.
-	**/
-	function elementsFromPoint( x : Float, y : Float ) : Array<Element>;
-	
-	/**
-		Gets the `CaretPosition` at or near the specified coordinates.
-	**/
 	function caretPositionFromPoint( x : Float, y : Float ) : CaretPosition;
 	/** @throws DOMError */
+	@:pure
 	function querySelector( selectors : String ) : Element;
 	/** @throws DOMError */
+	@:pure
 	function querySelectorAll( selectors : String ) : NodeList;
 	
 	/**
-		Returns an array of all `Animation` objects currently in effect whose target elements are descendants of the `document`.
+		Returns an array of all `Animation` objects currently in effect, whose target elements are descendants of the `document`.
 	**/
 	function getAnimations() : Array<Animation>;
 	
 	/**
 		Creates a `Touch` object.
 	**/
-	function createTouch( ?view : Window, ?target : EventTarget, ?identifier : Int = 0, ?pageX : Int = 0, ?pageY : Int = 0, ?screenX : Int = 0, ?screenY : Int = 0, ?clientX : Int = 0, ?clientY : Int = 0, ?radiusX : Int = 0, ?radiusY : Int = 0, ?rotationAngle : Float = 0.0, ?force : Float = 0.0 ) : Touch;
-	@:overload( function( touch : Touch, touches : haxe.extern.Rest<Touch> ) : TouchList {} )
-	@:overload( function() : TouchList {} )
+	function createTouch( ?view : Window, ?target : EventTarget, identifier : Int = 0, pageX : Int = 0, pageY : Int = 0, screenX : Int = 0, screenY : Int = 0, clientX : Int = 0, clientY : Int = 0, radiusX : Int = 0, radiusY : Int = 0, rotationAngle : Float = 0.0, force : Float = 0.0 ) : Touch;
 	
 	/**
 		Creates a `TouchList` object.
 	**/
+	@:overload( function( touch : Touch, touches : haxe.extern.Rest<Touch> ) : TouchList {} )
+	@:overload( function() : TouchList {} )
 	function createTouchList( touches : Array<Touch> ) : TouchList;
 	/** @throws DOMError */
-	function convertQuadFromNode( quad : DOMQuad, from : haxe.extern.EitherType<Text,haxe.extern.EitherType<Element,HTMLDocument>>, ?options : ConvertCoordinateOptions ) : DOMQuad;
+	function getSelection() : Selection;
+	function elementFromPoint( x : Float, y : Float ) : Element;
+	function elementsFromPoint( x : Float, y : Float ) : Array<Element>;
+	/** @throws DOMError */
+	@:overload( function( quad : DOMQuad, from : Element, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	@:overload( function( quad : DOMQuad, from : HTMLDocument, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	function convertQuadFromNode( quad : DOMQuad, from : Text, ?options : ConvertCoordinateOptions ) : DOMQuad;
+	/** @throws DOMError */
+	@:overload( function( rect : DOMRectReadOnly, from : Element, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	@:overload( function( rect : DOMRectReadOnly, from : HTMLDocument, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	function convertRectFromNode( rect : DOMRectReadOnly, from : Text, ?options : ConvertCoordinateOptions ) : DOMQuad;
+	/** @throws DOMError */
+	@:overload( function( point : DOMPointInit, from : Element, ?options : ConvertCoordinateOptions) : DOMPoint {} )
+	@:overload( function( point : DOMPointInit, from : HTMLDocument, ?options : ConvertCoordinateOptions) : DOMPoint {} )
+	function convertPointFromNode( point : DOMPointInit, from : Text, ?options : ConvertCoordinateOptions ) : DOMPoint;
 	/** @throws DOMError */
-	function convertRectFromNode( rect : DOMRectReadOnly, from : haxe.extern.EitherType<Text,haxe.extern.EitherType<Element,HTMLDocument>>, ?options : ConvertCoordinateOptions ) : DOMQuad;
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function prepend( nodes : haxe.extern.Rest<Node> ) : Void;
 	/** @throws DOMError */
-	function convertPointFromNode( point : DOMPointInit, from : haxe.extern.EitherType<Text,haxe.extern.EitherType<Element,HTMLDocument>>, ?options : ConvertCoordinateOptions ) : DOMPoint;
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function append( nodes : haxe.extern.Rest<Node> ) : Void;
 	/** @throws DOMError */
-	function createExpression( expression : String, resolver : XPathNSResolver ) : XPathExpression;
+	@:overload( function( expression : String, ?resolver : haxe.Constraints.Function) : XPathExpression {} )
+	@:overload( function( expression : String, ?resolver : XPathNSResolver) : XPathExpression {} )
+	function createExpression( expression : String, ?resolver : String -> Null<String> ) : XPathExpression;
+	@:pure
 	function createNSResolver( nodeResolver : Node ) : Node;
 	/** @throws DOMError */
-	function evaluate( expression : String, contextNode : Node, resolver : XPathNSResolver, type : Int, result : Dynamic ) : XPathResult;
+	@:overload( function( expression : String, contextNode : Node, ?resolver : haxe.Constraints.Function, type : Int = 0, ?result : Dynamic) : XPathResult {} )
+	@:overload( function( expression : String, contextNode : Node, ?resolver : XPathNSResolver, type : Int = 0, ?result : Dynamic) : XPathResult {} )
+	function evaluate( expression : String, contextNode : Node, ?resolver : String -> Null<String>, type : Int = 0, ?result : Dynamic ) : XPathResult;
 }
\ No newline at end of file
diff --git a/std/js/html/DocumentFragment.hx b/std/js/html/DocumentFragment.hx
index 9b070b880fe8a5e52d513aee2cdf312b1bc86a85..9919b323844c114fdaf88e97569611dfaa938846 100644
--- a/std/js/html/DocumentFragment.hx
+++ b/std/js/html/DocumentFragment.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `DocumentFragment` interface represents a minimal document object that has no parent. It is used as a light-weight version of `Document` to store well-formed or potentially non-well-formed fragments of XML.
+	The `DocumentFragment` interface represents a minimal document object that has no parent. It is used as a lightweight version of `Document` that stores a segment of a document structure comprised of nodes just like a standard document. The key difference is that because the document fragment isn't part of the active document tree structure, changes made to the fragment don't affect the document, cause reflow, or incur any performance impact that can occur when changes are made.
 
 	Documentation [DocumentFragment](https://developer.mozilla.org/en-US/docs/Web/API/DocumentFragment) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DocumentFragment$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DocumentFragment>
 **/
 @:native("DocumentFragment")
-extern class DocumentFragment extends Node
-{
+extern class DocumentFragment extends Node {
 	var children(default,null) : HTMLCollection;
 	var firstElementChild(default,null) : Element;
 	var lastElementChild(default,null) : Element;
@@ -46,16 +45,22 @@ extern class DocumentFragment extends Node
 		Returns the first `Element` node within the DocumentFragment`, in document order, that matches the specified ID.
 	**/
 	function getElementById( elementId : String ) : Element;
-	/** @throws DOMError */
 	
 	/**
 		Returns the first `Element` node within the `DocumentFragment`, in document order, that matches the specified selectors.
+		@throws DOMError
 	**/
 	function querySelector( selectors : String ) : Element;
-	/** @throws DOMError */
 	
 	/**
 		Returns a `NodeList` of all the `Element` nodes within the `DocumentFragment` that match the specified selectors.
+		@throws DOMError
 	**/
 	function querySelectorAll( selectors : String ) : NodeList;
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function prepend( nodes : haxe.extern.Rest<Node> ) : Void;
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function append( nodes : haxe.extern.Rest<Node> ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DocumentTimeline.hx b/std/js/html/DocumentTimeline.hx
index b804bdaf5af4d19a7f49af8683118f00cb035007..d2fdae952d1d8dccba4872acd4a0ff1f91e9fba7 100644
--- a/std/js/html/DocumentTimeline.hx
+++ b/std/js/html/DocumentTimeline.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DocumentTimeline>
 **/
 @:native("DocumentTimeline")
-extern class DocumentTimeline extends AnimationTimeline
-{
+extern class DocumentTimeline extends AnimationTimeline {
+	/** @throws DOMError */
+	function new( ?options : DocumentTimelineOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DocumentTimelineOptions.hx b/std/js/html/DocumentTimelineOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5edd9968eedeaccc37986dbaa86e0aa386c4ef9e
--- /dev/null
+++ b/std/js/html/DocumentTimelineOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\DocumentTimeline.webidl. Do not edit!
+
+package js.html;
+
+typedef DocumentTimelineOptions = {
+	var ?originTime : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/DocumentType.hx b/std/js/html/DocumentType.hx
index 7c341350c52ff151f5c97b077743f1ecabcf6c83..5c17b217a01e2c6346b1805ea7a7fe785a4bf572 100644
--- a/std/js/html/DocumentType.hx
+++ b/std/js/html/DocumentType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,23 +32,31 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DocumentType>
 **/
 @:native("DocumentType")
-extern class DocumentType extends Node
-{
+extern class DocumentType extends Node {
 	
 	/**
-		...
+		A `DOMString`, eg `"html"` for `!DOCTYPE HTML`.
 	**/
 	var name(default,null) : String;
 	
 	/**
-		...
+		A `DOMString`, eg `"-//W3C//DTD HTML 4.01//EN"`, empty string for HTML5.
 	**/
 	var publicId(default,null) : String;
 	
 	/**
-		...
+		A `DOMString`, eg `"http://www.w3.org/TR/html4/strict.dtd"`, empty string for HTML5.
 	**/
 	var systemId(default,null) : String;
 	
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function before( nodes : haxe.extern.Rest<Node> ) : Void;
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function after( nodes : haxe.extern.Rest<Node> ) : Void;
+	/** @throws DOMError */
+	@:overload( function( nodes : haxe.extern.Rest<String>) : Void {} )
+	function replaceWith( nodes : haxe.extern.Rest<Node> ) : Void;
 	function remove() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DragEvent.hx b/std/js/html/DragEvent.hx
index 424bec01c4f80c5c9c95988dde88daaa84396aa2..775c60ccaf17d2037a18c4a360cf3f6f1ca80937 100644
--- a/std/js/html/DragEvent.hx
+++ b/std/js/html/DragEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,14 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DragEvent>
 **/
 @:native("DragEvent")
-extern class DragEvent extends MouseEvent
-{
+extern class DragEvent extends MouseEvent {
+	
+	/**
+		The data that is transferred during a drag and drop interaction.
+	**/
 	var dataTransfer(default,null) : DataTransfer;
 	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : DragEventInit ) : Void;
-	function initDragEvent( type : String, canBubble : Bool, cancelable : Bool, aView : Window, aDetail : Int, aScreenX : Int, aScreenY : Int, aClientX : Int, aClientY : Int, aCtrlKey : Bool, aAltKey : Bool, aShiftKey : Bool, aMetaKey : Bool, aButton : Int, aRelatedTarget : EventTarget, aDataTransfer : DataTransfer ) : Void;
+	function initDragEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?aView : Window, aDetail : Int = 0, aScreenX : Int = 0, aScreenY : Int = 0, aClientX : Int = 0, aClientY : Int = 0, aCtrlKey : Bool = false, aAltKey : Bool = false, aShiftKey : Bool = false, aMetaKey : Bool = false, aButton : Int = 0, ?aRelatedTarget : EventTarget, ?aDataTransfer : DataTransfer ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DragEventInit.hx b/std/js/html/DragEventInit.hx
index 4dce79cce3646cc3d5b82dcd04f3cb4f206677fe..77c25e41ce9a6fee63f1e63ced5ee53996bad8b8 100644
--- a/std/js/html/DragEventInit.hx
+++ b/std/js/html/DragEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
 
 package js.html;
 
-typedef DragEventInit =
-{
-	> MouseEventInit,
-	@:optional var dataTransfer : DataTransfer;
+typedef DragEventInit = MouseEventInit & {
+	var ?dataTransfer : DataTransfer;
 }
\ No newline at end of file
diff --git a/std/js/html/EffectTiming.hx b/std/js/html/EffectTiming.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b23e0ff12d87ba6f5958ecf531ba4a2d656bf119
--- /dev/null
+++ b/std/js/html/EffectTiming.hx
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\AnimationEffect.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `EffectTiming` dictionary, part of the Web Animations API, is used by `Element.animate()`, `KeyframeEffectReadOnly()`, and `KeyframeEffect()` to describe timing properties for animation effects. These properties are all optional, although without setting a `duration` the animation will not play.
+
+	Documentation [EffectTiming](https://developer.mozilla.org/en-US/docs/Web/API/EffectTiming) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/EffectTiming$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/EffectTiming>
+**/
+typedef EffectTiming = {
+	
+	/**
+		The number of milliseconds to delay the start of the animation. Defaults to 0.
+	**/
+	var ?delay : Float;
+	
+	/**
+		Whether the animation runs forwards (`normal`), backwards (`reverse`), switches direction after each iteration (`alternate`), or runs backwards and switches direction after each iteration (`alternate-reverse`). Defaults to `"normal"`.
+	**/
+	var ?direction : PlaybackDirection;
+	
+	/**
+		The number of milliseconds each iteration of the animation takes to complete. Defaults to 0. Although this is technically optional, keep in mind that your animation will not run if this value is 0.
+	**/
+	var ?duration : haxe.extern.EitherType<Float,String>;
+	
+	/**
+		The rate of the animation's change over time. Accepts the pre-defined values `"linear"`, `"ease"`, `"ease-in"`, `"ease-out"`, and `"ease-in-out"`, or a custom `"cubic-bezier"` value like `"cubic-bezier(0.42, 0, 0.58, 1)"`. Defaults to `"linear"`.
+	**/
+	var ?easing : String;
+	
+	/**
+		The number of milliseconds to delay after the end of an animation. This is primarily of use when sequencing animations based on the end time of another animation. Defaults to 0. 
+	**/
+	var ?endDelay : Float;
+	
+	/**
+		Dictates whether the animation's effects should be reflected by the element(s) prior to playing (`"backwards"`), retained after the animation has completed playing (`"forwards"`), or `both`. Defaults to `"none"`.
+	**/
+	var ?fill : FillMode;
+	
+	/**
+		Describes at what point in the iteration the animation should start. 0.5 would indicate starting halfway through the first iteration for example, and with this value set, an animation with 2 iterations would end halfway through a third iteration. Defaults to 0.0.
+	**/
+	var ?iterationStart : Float;
+	
+	/**
+		The number of times the animation should repeat. Defaults to `1`, and can also take a value of `Infinity` to make it repeat for as long as the element exists.
+	**/
+	var ?iterations : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/Element.hx b/std/js/html/Element.hx
index ac44555cfecc5c88b098d677afcac213084ee26b..e50498bd7df26f9432576f2c7612087afa70276d 100644
--- a/std/js/html/Element.hx
+++ b/std/js/html/Element.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,22 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement>
 **/
 @:native("HTMLElement")
-extern class Element extends DOMElement
-{
+extern class Element extends DOMElement {
+	
+	/**
+		Sends a mouse click event to the element.
+	**/
+	function click() : Void;
+	
+	/**
+		Makes the element the current keyboard focus.
+		@throws DOMError
+	**/
+	function focus() : Void;
+	
+	/**
+		Removes keyboard focus from the currently focused element.
+		@throws DOMError
+	**/
+	function blur() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ElementCreationOptions.hx b/std/js/html/ElementCreationOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d9ced8054bf362529c11f46c44d217d7b3ec0241
--- /dev/null
+++ b/std/js/html/ElementCreationOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Document.webidl. Do not edit!
+
+package js.html;
+
+typedef ElementCreationOptions = {
+	var ?is : String;
+}
\ No newline at end of file
diff --git a/std/js/html/EmbedElement.hx b/std/js/html/EmbedElement.hx
index e05f22868d8126f895ddb6250d2195d1cc5cb28f..3512746679e053d4865f9fb85775f8bfa9711454 100644
--- a/std/js/html/EmbedElement.hx
+++ b/std/js/html/EmbedElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLEmbedElement>
 **/
 @:native("HTMLEmbedElement")
-extern class EmbedElement extends Element
-{
+extern class EmbedElement extends Element {
 	
 	/**
 		Is a `DOMString` that reflects the `src` HTML attribute, containing the address of the resource.
@@ -51,12 +50,12 @@ extern class EmbedElement extends Element
 	var width : String;
 	
 	/**
-		Is a `DOMString` representing an enumerated property indicating alignment of the element's contents with respect to the surrounding context. The possible values are `"left"`, `"right"`, `"center"`, and `"justify"`.
+		Is a `DOMString` reflecting the `height` HTML attribute, containing the displayed height of the resource.
 	**/
 	var height : String;
 	
 	/**
-		Is a `DOMString` reflecting the `height` HTML attribute, containing the displayed height of the resource.
+		Is a `DOMString` representing an enumerated property indicating alignment of the element's contents with respect to the surrounding context. The possible values are `"left"`, `"right"`, `"center"`, and `"justify"`.
 	**/
 	var align : String;
 	
diff --git a/std/js/html/CSSCharsetRule.hx b/std/js/html/EndingTypes.hx
similarity index 84%
rename from std/js/html/CSSCharsetRule.hx
rename to std/js/html/EndingTypes.hx
index b8066e426289e3b83780f6ce5a42c9a8c48d8c8e..ea6f6f1300553bd178606af4d80bb1a69590d797 100644
--- a/std/js/html/CSSCharsetRule.hx
+++ b/std/js/html/EndingTypes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from cssrule.webidl. Do not edit!
+// This file is generated from mozilla\Blob.webidl. Do not edit!
 
 package js.html;
 
-@:native("CSSCharsetRule")
-extern class CSSCharsetRule extends CSSRule
-{
-	var encoding : String;
-	
+enum abstract EndingTypes(String) {
+	var TRANSPARENT = "transparent";
+	var NATIVE = "native";
 }
\ No newline at end of file
diff --git a/std/js/html/ErrorCallback.hx b/std/js/html/ErrorCallback.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ca229f8c46e917c905e512d376c8453156350432
--- /dev/null
+++ b/std/js/html/ErrorCallback.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FileSystem.webidl. Do not edit!
+
+package js.html;
+
+typedef ErrorCallback = {
+	function handleEvent( err : DOMException ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/ErrorEvent.hx b/std/js/html/ErrorEvent.hx
index 1221553bda2b5374bb7e1ff6a83d152140f13aab..193aa6a379f19840b7964d530c0f20f2b530182b 100644
--- a/std/js/html/ErrorEvent.hx
+++ b/std/js/html/ErrorEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent>
 **/
 @:native("ErrorEvent")
-extern class ErrorEvent extends Event
-{
+extern class ErrorEvent extends Event {
 	
 	/**
 		Is a `DOMString` containing a human-readable error message describing the problem.
diff --git a/std/js/html/ErrorEventInit.hx b/std/js/html/ErrorEventInit.hx
index 7c3711923e5d2361602e86cd324185ecbabb161a..adc9889acfba561e7564642283e3b53e99db8320 100644
--- a/std/js/html/ErrorEventInit.hx
+++ b/std/js/html/ErrorEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,12 +24,10 @@
 
 package js.html;
 
-typedef ErrorEventInit =
-{
-	> EventInit,
-	@:optional var colno : Int;
-	@:optional var error : Dynamic;
-	@:optional var filename : String;
-	@:optional var lineno : Int;
-	@:optional var message : String;
+typedef ErrorEventInit = EventInit & {
+	var ?colno : Int;
+	var ?error : Dynamic;
+	var ?filename : String;
+	var ?lineno : Int;
+	var ?message : String;
 }
\ No newline at end of file
diff --git a/std/js/html/Event.hx b/std/js/html/Event.hx
index 6c29755dc019107176d3029c7eb9ae6e8eea7d2f..4a3a9ecd63a132312d830e04c40e2d494d742883 100644
--- a/std/js/html/Event.hx
+++ b/std/js/html/Event.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `Event` interface represents any event which takes place in the DOM; some are user-generated (such as mouse or keyboard events), while others are generated by APIs (such as events that indicate an animation has finished running, a video has been paused, and so forth). There are many types of event, some of which use are other interfaces based on the main `Event` interface. `Event` itself contains the properties and methods which are common to all events.
+	The `Event` interface represents any event which takes place in the DOM; some are user-generated (such as mouse or keyboard events), while others are generated by APIs (such as events that indicate an animation has finished running, a video has been paused, and so forth). There are many types of events, some of which use other interfaces based on the main `Event` interface. `Event` itself contains the properties and methods which are common to all events.
 
 	Documentation [Event](https://developer.mozilla.org/en-US/docs/Web/API/Event) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Event$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Event>
 **/
 @:native("Event")
-extern class Event
-{
+extern class Event {
 	static inline var NONE : Int = 0;
 	static inline var CAPTURING_PHASE : Int = 1;
 	static inline var AT_TARGET : Int = 2;
@@ -55,7 +54,7 @@ extern class Event
 	var target(default,null) : EventTarget;
 	
 	/**
-		A reference to the currently registered target for the event. This is the object to which the event is currently slated to be sent to; it's possible this has been changed along the way through retargeting.
+		A reference to the currently registered target for the event. This is the object to which the event is currently slated to be sent; it's possible this has been changed along the way through retargeting.
 	**/
 	var currentTarget(default,null) : EventTarget;
 	
@@ -74,21 +73,36 @@ extern class Event
 	**/
 	var cancelable(default,null) : Bool;
 	
+	/**
+		A historical property introduced by Internet Explorer and eventually adopted into the DOM specification in order to ensure existing sites continue to work. Ideally, you should try to use `Event.preventDefault()` and `Event.defaultPrevented` instead, but you can use `returnValue` if you choose to do so.
+	**/
+	var returnValue : Bool;
+	
 	/**
 		Indicates whether or not `event.preventDefault()` has been called on the event.
 	**/
 	var defaultPrevented(default,null) : Bool;
 	
 	/**
-		Indicates whether or not the event was initiated by the browser (after a user click for instance) or by a script (using an event creation method, like event.initEvent)
+		A Boolean value indicating whether or not the event can bubble across the boundary between the shadow DOM and the regular DOM.
+	**/
+	var composed(default,null) : Bool;
+	
+	/**
+		Indicates whether or not the event was initiated by the browser (after a user click for instance) or by a script (using an event creation method, like event.initEvent).
 	**/
 	var isTrusted(default,null) : Bool;
 	
 	/**
-		The time at which the event was created, in milliseconds. By specification, this value is time since epoch, but in reality browsers' definitions vary; in addition, work is underway to change this to be a `DOMHighResTimeStamp` instead.
+		The time at which the event was created (in milliseconds). By specification, this value is time since epoch, but in reality browsers' definitions vary; in addition, work is underway to change this to be a `DOMHighResTimeStamp` instead.
 	**/
 	var timeStamp(default,null) : Float;
 	
+	/**
+		A historical alias to `Event.stopPropagation()`. Setting its value to `true` before returning from an event handler prevents propagation of the event.
+	**/
+	var cancelBubble : Bool;
+	
 	/**
 		The original target of the event, before any retargetings (Mozilla-specific).
 	**/
@@ -102,6 +116,11 @@ extern class Event
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : EventInit ) : Void;
 	
+	/**
+		Returns the event’s path (objects on which listeners will be invoked). This does not include nodes in shadow trees if the shadow root was created with its `ShadowRoot.mode` closed.
+	**/
+	function composedPath() : Array<EventTarget>;
+	
 	/**
 		Stops the propagation of events further along in the DOM.
 	**/
@@ -120,10 +139,5 @@ extern class Event
 	/**
 		Initializes the value of an Event created. If the event has already being dispatched, this method does nothing.
 	**/
-	function initEvent( type : String, bubbles : Bool, cancelable : Bool ) : Void;
-	
-	/**
-		Non-standard. Returns the value of `Event.defaultPrevented`. Use `Event.defaultPrevented` instead.
-	**/
-	function getPreventDefault() : Bool;
+	function initEvent( type : String, bubbles : Bool = false, cancelable : Bool = false ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/EventInit.hx b/std/js/html/EventInit.hx
index 48d932555bd66691f7119a97a8d348602085d36f..0b8d1f28daf7758c108e12df17e658dd23545e13 100644
--- a/std/js/html/EventInit.hx
+++ b/std/js/html/EventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,8 @@
 
 package js.html;
 
-typedef EventInit =
-{
-	@:optional var bubbles : Bool;
-	@:optional var cancelable : Bool;
+typedef EventInit = {
+	var ?bubbles : Bool;
+	var ?cancelable : Bool;
+	var ?composed : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/EventListener.hx b/std/js/html/EventListener.hx
index 09ff04ac200f132fa7300325fc2bb9f37e843610..c8e2e85b4c8c9e2f4c213865f10a4080090bea08 100644
--- a/std/js/html/EventListener.hx
+++ b/std/js/html/EventListener.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,19 +20,21 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from events.webidl. Do not edit!
+// This file is generated from mozilla\EventListener.webidl. Do not edit!
 
 package js.html;
 
 /**
-	This method is called whenever an event occurs of the type for which the `EventListener` interface was registered.
+	The `EventListener` interface represents an object that can handle an event dispatched by an `EventTarget` object.
 
 	Documentation [EventListener](https://developer.mozilla.org/en-US/docs/Web/API/EventListener) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/EventListener$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/EventListener>
 **/
-@:native("EventListener")
-extern class EventListener
-{
+typedef EventListener = {
+	
+	/**
+		A function that is called whenever an event of the specified type occurs.
+	**/
 	function handleEvent( event : Event ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/EventListenerOptions.hx b/std/js/html/EventListenerOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6cedd9db14079242090a329953334e20141e982d
--- /dev/null
+++ b/std/js/html/EventListenerOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\EventTarget.webidl. Do not edit!
+
+package js.html;
+
+typedef EventListenerOptions = {
+	var ?capture : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/EventModifierInit.hx b/std/js/html/EventModifierInit.hx
index 8f83f27401b0ded78b97843e5880316b808540bb..8cef40a20eacb21f11cb1bea8040e5d35d0d19f7 100644
--- a/std/js/html/EventModifierInit.hx
+++ b/std/js/html/EventModifierInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,20 +24,18 @@
 
 package js.html;
 
-typedef EventModifierInit =
-{
-	> UIEventInit,
-	@:optional var altKey : Bool;
-	@:optional var ctrlKey : Bool;
-	@:optional var metaKey : Bool;
-	@:optional var modifierAltGraph : Bool;
-	@:optional var modifierCapsLock : Bool;
-	@:optional var modifierFn : Bool;
-	@:optional var modifierFnLock : Bool;
-	@:optional var modifierNumLock : Bool;
-	@:optional var modifierOS : Bool;
-	@:optional var modifierScrollLock : Bool;
-	@:optional var modifierSymbol : Bool;
-	@:optional var modifierSymbolLock : Bool;
-	@:optional var shiftKey : Bool;
+typedef EventModifierInit = UIEventInit & {
+	var ?altKey : Bool;
+	var ?ctrlKey : Bool;
+	var ?metaKey : Bool;
+	var ?modifierAltGraph : Bool;
+	var ?modifierCapsLock : Bool;
+	var ?modifierFn : Bool;
+	var ?modifierFnLock : Bool;
+	var ?modifierNumLock : Bool;
+	var ?modifierOS : Bool;
+	var ?modifierScrollLock : Bool;
+	var ?modifierSymbol : Bool;
+	var ?modifierSymbolLock : Bool;
+	var ?shiftKey : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/EventSource.hx b/std/js/html/EventSource.hx
index a56297b46947f3328fe9da40394c86fe6b5a66fe..d688283ef0e98fd3c8ed57a121e7566fccf162ed 100644
--- a/std/js/html/EventSource.hx
+++ b/std/js/html/EventSource.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `EventSource` interface is used to receive server-sent events. It connects to a server over HTTP and receives events in `text/event-stream` format without closing the connection.
+	The `EventSource` interface is web content's interface to server-sent events. An `EventSource` instance opens a persistent connection to an HTTP server, which sends events in `text/event-stream` format.
 
 	Documentation [EventSource](https://developer.mozilla.org/en-US/docs/Web/API/EventSource) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/EventSource$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/EventSource>
 **/
 @:native("EventSource")
-extern class EventSource extends EventTarget
-{
+extern class EventSource extends EventTarget {
 	static inline var CONNECTING : Int = 0;
 	static inline var OPEN : Int = 1;
 	static inline var CLOSED : Int = 2;
@@ -43,25 +42,29 @@ extern class EventSource extends EventTarget
 		A `DOMString` representing the URL of the source.
 	**/
 	var url(default,null) : String;
+	
+	/**
+		A `Boolean` indicating whether the `EventSource` object was instantiated with cross-origin (CORS) credentials set (`true`), or not (`false`, the default).
+	**/
 	var withCredentials(default,null) : Bool;
 	
 	/**
-		An `unsigned short` representing the state of the connection. Possible values are `CONNECTING` (`0`), `OPEN` (`1`), or `CLOSED` (`2`).
+		A number representing the state of the connection. Possible values are `CONNECTING` (`0`), `OPEN` (`1`), or `CLOSED` (`2`).
 	**/
 	var readyState(default,null) : Int;
 	
 	/**
-		Is an `EventHandler` being called when an `open` event is received, that is when the connection was just opened.
+		Is an `EventHandler` called when an `open` event is received, that is when the connection was just opened.
 	**/
 	var onopen : haxe.Constraints.Function;
 	
 	/**
-		Is an `EventHandler` being called when a `message` event is received, that is when a message is coming from the source.
+		Is an `EventHandler` called when a `message` event is received, that is when a message is coming from the source.
 	**/
 	var onmessage : haxe.Constraints.Function;
 	
 	/**
-		Is an `EventHandler` being called when an error occurs and the `error` event is dispatched on this object.
+		Is an `EventHandler` called when an error occurs and the `error` event is dispatched on an `EventSource` object.
 	**/
 	var onerror : haxe.Constraints.Function;
 	
diff --git a/std/js/html/EventSourceInit.hx b/std/js/html/EventSourceInit.hx
index f3fd6bc38d239bf19e70b12e33a08d4d6bb04e30..1013710002d67eda59567742f1cb394e852a8d93 100644
--- a/std/js/html/EventSourceInit.hx
+++ b/std/js/html/EventSourceInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,6 @@
 
 package js.html;
 
-typedef EventSourceInit =
-{
-	@:optional var withCredentials : Bool;
+typedef EventSourceInit = {
+	var ?withCredentials : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/EventTarget.hx b/std/js/html/EventTarget.hx
index f2e6d949058e4d79c581881350aea39c3362caab..8e70448ff863f8dc93779bcd21f03718f8ee44b1 100644
--- a/std/js/html/EventTarget.hx
+++ b/std/js/html/EventTarget.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,26 +32,27 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/EventTarget>
 **/
 @:native("EventTarget")
-extern class EventTarget
-{
+extern class EventTarget {
 	/** @throws DOMError */
-	@:overload( function( type : String, listener : EventListener, ?capture : Bool = false, ?wantsUntrusted : Bool ) : Void {} )
+	function new() : Void;
 	
 	/**
 		Register an event handler of a specific event type on the `EventTarget`.
+		@throws DOMError
 	**/
-	function addEventListener( type : String, listener : haxe.Constraints.Function, ?capture : Bool = false ) : Void;
-	/** @throws DOMError */
-	@:overload( function( type : String, listener : EventListener, ?capture : Bool = false ) : Void {} )
+	@:overload( function( type : String, listener : EventListener, ?options : haxe.extern.EitherType<AddEventListenerOptions,Bool>, ?wantsUntrusted : Bool ) : Void {} )
+	function addEventListener( type: String, listener: haxe.Constraints.Function, ?options : haxe.extern.EitherType<AddEventListenerOptions,Bool>, ?wantsUntrusted : Bool ) : Void;
 	
 	/**
 		Removes an event listener from the `EventTarget`.
+		@throws DOMError
 	**/
-	function removeEventListener( type : String, listener : haxe.Constraints.Function, ?capture : Bool = false ) : Void;
-	/** @throws DOMError */
+	@:overload( function( type : String, listener : EventListener, ?options : haxe.extern.EitherType<EventListenerOptions,Bool>) : Void {} )
+	function removeEventListener( type : String, listener : haxe.Constraints.Function, ?options : haxe.extern.EitherType<EventListenerOptions,Bool> ) : Void;
 	
 	/**
 		Dispatch an event to this `EventTarget`.
+		@throws DOMError
 	**/
 	function dispatchEvent( event : Event ) : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/Exception.hx b/std/js/html/Exception.hx
index aeeb454519a63eec87153827eb3c9fb46702cfd6..8462ae0f97efcd9b0296492aaf22d2f62250628b 100644
--- a/std/js/html/Exception.hx
+++ b/std/js/html/Exception.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,16 +24,14 @@
 
 package js.html;
 
-@:native("Exception")
-extern class Exception
-{
+typedef Exception = {
+	var name(default,null) : String;
 	var message(default,null) : String;
 	var result(default,null) : Int;
-	var name(default,null) : String;
 	var filename(default,null) : String;
 	var lineNumber(default,null) : Int;
 	var columnNumber(default,null) : Int;
-	var data(default,null) : Dynamic/*MISSING nsISupports*/;
+	var data(default,null) : Dynamic;
 	var stack(default,null) : String;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/ExtendableEvent.hx b/std/js/html/ExtendableEvent.hx
index a99f2cc2d0f85a78c675840af1b5a3c0013eb97b..903e0eaad9ca9f739effc81beaf2607a74461ed0 100644
--- a/std/js/html/ExtendableEvent.hx
+++ b/std/js/html/ExtendableEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `ExtendableEvent` interface extends the lifetime of the `install` and `activate` events dispatched on the global scope as part of the service worker lifecycle. This ensures that any functional events (like `FetchEvent`) are not dispatched until it upgrades database schemas and deletes the outdated cache entries.
 
@@ -32,8 +34,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ExtendableEvent>
 **/
 @:native("ExtendableEvent")
-extern class ExtendableEvent extends Event
-{
+extern class ExtendableEvent extends Event {
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : ExtendableEventInit ) : Void;
 	/** @throws DOMError */
diff --git a/std/js/html/ExtendableEventInit.hx b/std/js/html/ExtendableEventInit.hx
index 826fda5bc241d427a55d5a2958df021edbe1f7c5..825c6ee2a395a6eebfe5475dd85d1baa2bd1bb02 100644
--- a/std/js/html/ExtendableEventInit.hx
+++ b/std/js/html/ExtendableEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,5 @@
 
 package js.html;
 
-typedef ExtendableEventInit =
-{
-	> EventInit,
+typedef ExtendableEventInit = EventInit & {
 }
\ No newline at end of file
diff --git a/std/js/html/ExtendableMessageEvent.hx b/std/js/html/ExtendableMessageEvent.hx
index a269066a79b26fbfd3b5d511cdb3785d1bb0224f..59b1d07dbb672a0f4a741d7ec99af01f0db09d93 100644
--- a/std/js/html/ExtendableMessageEvent.hx
+++ b/std/js/html/ExtendableMessageEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ExtendableMessageEvent>
 **/
 @:native("ExtendableMessageEvent")
-extern class ExtendableMessageEvent extends ExtendableEvent
-{
+extern class ExtendableMessageEvent extends ExtendableEvent {
 	
 	/**
 		Returns the event's data. It can be any data type.
@@ -58,7 +57,7 @@ extern class ExtendableMessageEvent extends ExtendableEvent
 	/**
 		Returns the array containing the `MessagePort` objects representing the ports of the associated message channel.
 	**/
-	var ports(default,null) : MessagePortList;
+	var ports(default,null) : Array<MessagePort>;
 	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : ExtendableMessageEventInit ) : Void;
diff --git a/std/js/html/ExtendableMessageEventInit.hx b/std/js/html/ExtendableMessageEventInit.hx
index 9bf184e0e98782abe09ff52569c39ba2863721df..309541255964a364eb44371c3523b8333429d9da 100644
--- a/std/js/html/ExtendableMessageEventInit.hx
+++ b/std/js/html/ExtendableMessageEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,12 +24,10 @@
 
 package js.html;
 
-typedef ExtendableMessageEventInit =
-{
-	> ExtendableEventInit,
-	@:optional var data : Dynamic;
-	@:optional var lastEventId : String;
-	@:optional var origin : String;
-	@:optional var ports : Array<MessagePort>;
-	@:optional var source : haxe.extern.EitherType<Client,haxe.extern.EitherType<ServiceWorker,MessagePort>>;
+typedef ExtendableMessageEventInit = ExtendableEventInit & {
+	var ?data : Dynamic;
+	var ?lastEventId : String;
+	var ?origin : String;
+	var ?ports : Array<MessagePort>;
+	var ?source : haxe.extern.EitherType<Client,haxe.extern.EitherType<ServiceWorker,MessagePort>>;
 }
\ No newline at end of file
diff --git a/std/js/html/External.hx b/std/js/html/External.hx
index b5f8f20795f2d77fa063a5a8e3645b16cb5273ab..85470c248910f96ea7eaaa5ba77dd968e641ec22 100644
--- a/std/js/html/External.hx
+++ b/std/js/html/External.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,7 @@
 
 package js.html;
 
-@:native("External")
-extern class External
-{
+typedef External = {
 	function AddSearchProvider( aDescriptionURL : String ) : Void;
 	function IsSearchProviderInstalled( aSearchURL : String ) : Int;
-	function addSearchEngine( engineURL : String, iconURL : String, suggestedTitle : String, suggestedCategory : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/FetchEvent.hx b/std/js/html/FetchEvent.hx
index 6682fc09f8817603a51df036075ce42eb29cdee3..7abb7db9cef5227c6f7d60502743ec5fcb889c36 100644
--- a/std/js/html/FetchEvent.hx
+++ b/std/js/html/FetchEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,38 +24,35 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
-	The parameter passed into the `ServiceWorkerGlobalScope.onfetch` handler, `FetchEvent` represents a fetch action that is dispatched on the `ServiceWorkerGlobalScope` of a `ServiceWorker`. It contains information about the request and resulting response, and provides the `FetchEvent.respondWith()` method, which allows us to provide an arbitrary response back to the controlled page.
+	This is the event type for `fetch` events dispatched on the service worker global scope. It contains information about the fetch, including the request and how the receiver will treat the response. It provides the `event.respondWith()` method, which allows us to provide a response to this fetch.
 
 	Documentation [FetchEvent](https://developer.mozilla.org/en-US/docs/Web/API/FetchEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/FetchEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/FetchEvent>
 **/
 @:native("FetchEvent")
-extern class FetchEvent extends ExtendableEvent
-{
-	
+extern class FetchEvent extends ExtendableEvent {
+
 	/**
-		Returns the `Request` that triggered the event handler.
+		The `Request` the browser intends to make.
 	**/
 	var request(default,null) : Request;
-	
+
 	/**
-		Returns the id of the client that the current service worker is controlling.
+		The `Client.id` of the same-origin `Client` that initiated the fetch.
 	**/
 	var clientId(default,null) : String;
-	
-	/**
-		Returns a `Boolean` that is `true` if the event was dispatched with the user's intention for the page to reload, and `false` otherwise. Typically, pressing the refresh button in a browser is a reload, while clicking a link and pressing the back button is not.
-	**/
 	var isReload(default,null) : Bool;
-	
+
 	/** @throws DOMError */
 	function new( type : String, eventInitDict : FetchEventInit ) : Void;
-	/** @throws DOMError */
-	
+
 	/**
-		Resolves by returning a `Response` or a network error  to Fetch`.
+		Prevent the browser's default fetch handling, and provide (a promise for) a response yourself.
+		@throws DOMError
 	**/
 	function respondWith( r : Promise<Response> ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/FetchEventInit.hx b/std/js/html/FetchEventInit.hx
index 9592ae473b60a0e980b686ad9c080bb46457c99d..1bf3aac2fca422fe40876de98794e35b81c114b9 100644
--- a/std/js/html/FetchEventInit.hx
+++ b/std/js/html/FetchEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,8 @@
 
 package js.html;
 
-typedef FetchEventInit =
-{
-	> EventInit,
-	@:optional var clientId : String;
-	@:optional var isReload : Bool;
+typedef FetchEventInit = EventInit & {
+	var ?clientId : String;
+	var ?isReload : Bool;
 	var request : Request;
 }
\ No newline at end of file
diff --git a/std/js/html/LifecycleCallbacks.hx b/std/js/html/FetchObserver.hx
similarity index 74%
rename from std/js/html/LifecycleCallbacks.hx
rename to std/js/html/FetchObserver.hx
index cc0d09a9e762f1ecc2b96a44b30e4b934aa3153c..e3379442588c0821c69d8c6ac4c7549d974ee6c0 100644
--- a/std/js/html/LifecycleCallbacks.hx
+++ b/std/js/html/FetchObserver.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,14 +20,15 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\WebComponents.webidl. Do not edit!
+// This file is generated from mozilla\FetchObserver.webidl. Do not edit!
 
 package js.html;
 
-typedef LifecycleCallbacks =
-{
-	@:optional var attachedCallback : Void -> Void;
-	@:optional var attributeChangedCallback : String -> String -> String -> Void;
-	@:optional var createdCallback : Void -> Void;
-	@:optional var detachedCallback : Void -> Void;
+@:native("FetchObserver")
+extern class FetchObserver extends EventTarget {
+	var state(default,null) : FetchState;
+	var onstatechange : haxe.Constraints.Function;
+	var onrequestprogress : haxe.Constraints.Function;
+	var onresponseprogress : haxe.Constraints.Function;
+	
 }
\ No newline at end of file
diff --git a/std/js/html/FetchState.hx b/std/js/html/FetchState.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a8ae5c3831f3519cdabe2b87b088a40b3d291348
--- /dev/null
+++ b/std/js/html/FetchState.hx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FetchObserver.webidl. Do not edit!
+
+package js.html;
+
+enum abstract FetchState(String) {
+	var REQUESTING = "requesting";
+	var RESPONDING = "responding";
+	var ABORTED = "aborted";
+	var ERRORED = "errored";
+	var COMPLETE = "complete";
+}
\ No newline at end of file
diff --git a/std/js/html/FieldSetElement.hx b/std/js/html/FieldSetElement.hx
index c5251b81f91a307e136ec4b9e0da5bd6901fc17b..75a2d7034031dc6bb930165e7cdb651b1364af4a 100644
--- a/std/js/html/FieldSetElement.hx
+++ b/std/js/html/FieldSetElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,17 +32,59 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLFieldSetElement>
 **/
 @:native("HTMLFieldSetElement")
-extern class FieldSetElement extends Element
-{
+extern class FieldSetElement extends Element {
+	
+	/**
+		A `Boolean` reflecting the `disabled` HTML attribute, indicating whether the user can interact with the control.
+	**/
 	var disabled : Bool;
+	
+	/**
+		An `HTMLFormControlsCollection` or `HTMLCollection` referencing the containing form element, if this element is in a form.
+		
+		 If the field set is not a descendant of a form element, then the attribute can be the ID of any form element in the same document it is related to, or the `null` value if none matches.
+	**/
 	var form(default,null) : FormElement;
+	
+	/**
+		A `DOMString` reflecting the `name` HTML attribute, containing the name of the field set, used for submitting the form.
+	**/
 	var name : String;
+	
+	/**
+		The `DOMString` `"fieldset"`.
+	**/
 	var type(default,null) : String;
+	
+	/**
+		The elements belonging to this field set. The type of this property depends on the version of the spec that is implemented by the browser.
+	**/
 	var elements(default,null) : HTMLCollection;
+	
+	/**
+		A `Boolean` `false`, because `fieldset` objects are never candidates for constraint validation.
+	**/
 	var willValidate(default,null) : Bool;
+	
+	/**
+		A `ValidityState` representing the validity states that this element is in.
+	**/
 	var validity(default,null) : ValidityState;
+	
+	/**
+		A `DOMString` representing a localized message that describes the validation constraints that the element does not satisfy (if any). This is the empty string if the element is not a candidate for constraint validation (`willValidate` is `false`), or it satisfies its constraints.
+	**/
 	var validationMessage(default,null) : String;
 	
+	
+	/**
+		Always returns `true` because `fieldset` objects are never candidates for constraint validation.
+	**/
 	function checkValidity() : Bool;
+	function reportValidity() : Bool;
+	
+	/**
+		Sets a custom validity message for the field set. If this message is not the empty string, then the field set is suffering from a custom validity error, and does not validate.
+	**/
 	function setCustomValidity( error : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/File.hx b/std/js/html/File.hx
index 7e7b2c7cdf654c7abfdc47987f2d7ac20e302ed9..addade816114c2d5a8f3a63feb5ef9e786557262 100644
--- a/std/js/html/File.hx
+++ b/std/js/html/File.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/File>
 **/
 @:native("File")
-extern class File extends Blob
-{
+extern class File extends Blob {
 	
 	/**
 		Returns the name of the file referenced by the `File` object.
@@ -45,14 +44,6 @@ extern class File extends Blob
 	**/
 	var lastModified(default,null) : Int;
 	
-	/**
-		Returns the last modified `Date` of the file referenced by the `File` object.
-	**/
-	var lastModifiedDate(default,null) : Date;
-	
 	/** @throws DOMError */
-	@:overload( function( fileBits : Array<haxe.extern.EitherType<ArrayBuffer,haxe.extern.EitherType<ArrayBufferView,haxe.extern.EitherType<Blob,String>>>>, fileName : String, ?options : FilePropertyBag ) : Void {} )
-	@:overload( function( fileBits : Blob, ?options : ChromeFilePropertyBag ) : Void {} )
-	@:overload( function( fileBits : Dynamic/*MISSING nsIFile*/, ?options : ChromeFilePropertyBag ) : Void {} )
-	function new( fileBits : String, ?options : ChromeFilePropertyBag ) : Void;
+	function new( fileBits : Array<haxe.extern.EitherType<haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer>,haxe.extern.EitherType<Blob,String>>>, fileName : String, ?options : FilePropertyBag ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DOMTransactionEventInit.hx b/std/js/html/FileCallback.hx
similarity index 85%
rename from std/js/html/DOMTransactionEventInit.hx
rename to std/js/html/FileCallback.hx
index fa6c9f4f7aa43940e81a061fce578ff4bc84f9e4..85e46311053a874601167fc756d08b4f084c7871 100644
--- a/std/js/html/DOMTransactionEventInit.hx
+++ b/std/js/html/FileCallback.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DOMTransactionEvent.webidl. Do not edit!
+// This file is generated from mozilla\FileSystemFileEntry.webidl. Do not edit!
 
 package js.html;
 
-typedef DOMTransactionEventInit =
-{
-	> EventInit,
-	@:optional var transactions : Dynamic;
+typedef FileCallback = {
+	function handleEvent( file : File ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/FileList.hx b/std/js/html/FileList.hx
index 558bafbeae68c2048411b7406e2b09717bed22af..f30481e78ae281792fde314452644f6d1d013a84 100644
--- a/std/js/html/FileList.hx
+++ b/std/js/html/FileList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/FileList>
 **/
 @:native("FileList")
-extern class FileList implements ArrayAccess<File>
-{
+extern class FileList implements ArrayAccess<File> {
 	var length(default,null) : Int;
 	
 	function item( index : Int ) : File;
diff --git a/std/js/html/FileMode.hx b/std/js/html/FileMode.hx
index 9452e3506560ed0d57a5ea0fc3cc783431caa8f4..61dee0136228c46af264dfe1febe3807a4b5efc2 100644
--- a/std/js/html/FileMode.hx
+++ b/std/js/html/FileMode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract FileMode(String)
-{
+enum abstract FileMode(String) {
 	var READONLY = "readonly";
 	var READWRITE = "readwrite";
 }
\ No newline at end of file
diff --git a/std/js/html/FilePropertyBag.hx b/std/js/html/FilePropertyBag.hx
index 6a1af2adbda0f248d4a22d85841c45c6b2ace8fa..a3994d96a15c212e0e1612fa3e660e4836f70615 100644
--- a/std/js/html/FilePropertyBag.hx
+++ b/std/js/html/FilePropertyBag.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-typedef FilePropertyBag =
-{
-	@:optional var lastModified : Int;
-	@:optional var type : String;
+typedef FilePropertyBag = {
+	var ?lastModified : Int;
+	var ?type : String;
 }
\ No newline at end of file
diff --git a/std/js/html/FileReader.hx b/std/js/html/FileReader.hx
index c9002b789f39fd25ec999ee2dce7fd546a8c794a..261c3de7fcc2032c9cd7d6975510fba074af729d 100644
--- a/std/js/html/FileReader.hx
+++ b/std/js/html/FileReader.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/FileReader>
 **/
 @:native("FileReader")
-extern class FileReader extends EventTarget
-{
+extern class FileReader extends EventTarget {
 	static inline var EMPTY : Int = 0;
 	static inline var LOADING : Int = 1;
 	static inline var DONE : Int = 2;
@@ -70,9 +69,9 @@ extern class FileReader extends EventTarget
 	var result(default,null) : Dynamic;
 	
 	/**
-		A `DOMError` representing the error that occurred while reading the file.
+		A `DOMException` representing the error that occurred while reading the file.
 	**/
-	var error(default,null) : DOMError;
+	var error(default,null) : DOMException;
 	
 	/**
 		A handler for the `loadstart` event. This event is triggered each time the reading is starting.
@@ -106,34 +105,33 @@ extern class FileReader extends EventTarget
 	
 	/** @throws DOMError */
 	function new() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Starts reading the contents of the specified `Blob`, once finished, the `result` attribute contains an `ArrayBuffer` representing the file's data.
+		@throws DOMError
 	**/
 	function readAsArrayBuffer( blob : Blob ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Starts reading the contents of the specified `Blob`, once finished, the `result` attribute contains the raw binary data from the file as a string.
+		@throws DOMError
+	**/
+	function readAsBinaryString( filedata : Blob ) : Void;
 	
 	/**
 		Starts reading the contents of the specified `Blob`, once finished, the `result` attribute contains the contents of the file as a text string.
+		@throws DOMError
 	**/
-	function readAsText( blob : Blob, ?label : String = "" ) : Void;
-	/** @throws DOMError */
+	function readAsText( blob : Blob, ?label : String ) : Void;
 	
 	/**
 		Starts reading the contents of the specified `Blob`, once finished, the `result` attribute contains a `data:` URL representing the file's data.
+		@throws DOMError
 	**/
 	function readAsDataURL( blob : Blob ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Aborts the read operation. Upon return, the `readyState` will be `DONE`.
 	**/
 	function abort() : Void;
-	/** @throws DOMError */
-	
-	/**
-		Starts reading the contents of the specified `Blob`, once finished, the `result` attribute contains the raw binary data from the file as a string.
-	**/
-	function readAsBinaryString( filedata : Blob ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/FileReaderSync.hx b/std/js/html/FileReaderSync.hx
index 986dc54295f58363e6a132bb3cde44ecaedf0a51..a5c0f4541fdf00d238e35b78781216056f074ab9 100644
--- a/std/js/html/FileReaderSync.hx
+++ b/std/js/html/FileReaderSync.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,12 +32,11 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/FileReaderSync>
 **/
 @:native("FileReaderSync")
-extern class FileReaderSync
-{
+extern class FileReaderSync {
 	/** @throws DOMError */
 	function new() : Void;
 	/** @throws DOMError */
-	function readAsArrayBuffer( blob : Blob ) : ArrayBuffer;
+	function readAsArrayBuffer( blob : Blob ) : js.lib.ArrayBuffer;
 	/** @throws DOMError */
 	function readAsBinaryString( blob : Blob ) : String;
 	/** @throws DOMError */
diff --git a/std/js/html/FileSystem.hx b/std/js/html/FileSystem.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c23ee3ff41dd87fcab853562d9926767c22f3ccf
--- /dev/null
+++ b/std/js/html/FileSystem.hx
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FileSystem.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The File and Directory Entries API interface `FileSystem` is used to represent a file system. These objects can be obtained from the `filesystem` property on any file system entry. Some browsers offer additional APIs to create and manage file systems, such as Chrome's `requestFileSystem()` method.
+
+	Documentation [FileSystem](https://developer.mozilla.org/en-US/docs/Web/API/FileSystem) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/FileSystem$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/FileSystem>
+**/
+@:native("FileSystem")
+extern class FileSystem {
+	
+	/**
+		A `USVString` representing the file system's name. This name is unique among the entire list of exposed file systems.
+	**/
+	var name(default,null) : String;
+	
+	/**
+		A `FileSystemDirectoryEntry` object which represents the file system's root directory. Through this object, you can gain access to all files and directories in the file system.
+	**/
+	var root(default,null) : FileSystemDirectoryEntry;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/FileSystemDirectoryEntry.hx b/std/js/html/FileSystemDirectoryEntry.hx
new file mode 100644
index 0000000000000000000000000000000000000000..675448bf1bcd6ff2d4f00b3f68bd24f3047ecd81
--- /dev/null
+++ b/std/js/html/FileSystemDirectoryEntry.hx
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FileSystemDirectoryEntry.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `FileSystemDirectoryEntry` interface of the File and Directory Entries API represents a directory in a file system. It provides methods which make it possible to access and manipulate the files in a directory, as well as to access the entries within the directory.
+
+	Documentation [FileSystemDirectoryEntry](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemDirectoryEntry) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemDirectoryEntry$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/FileSystemDirectoryEntry>
+**/
+@:native("FileSystemDirectoryEntry")
+extern class FileSystemDirectoryEntry extends FileSystemEntry {
+	function createReader() : FileSystemDirectoryReader;
+	@:overload( function( ?path : String, ?options : FileSystemFlags, ?successCallback : haxe.Constraints.Function, ?errorCallback : haxe.Constraints.Function) : Void {} )
+	@:overload( function( ?path : String, ?options : FileSystemFlags, ?successCallback : FileSystemEntryCallback, ?errorCallback : ErrorCallback) : Void {} )
+	function getFile( ?path : String, ?options : FileSystemFlags, ?successCallback : FileSystemEntry -> Void, ?errorCallback : DOMException -> Void ) : Void;
+	@:overload( function( ?path : String, ?options : FileSystemFlags, ?successCallback : haxe.Constraints.Function, ?errorCallback : haxe.Constraints.Function) : Void {} )
+	@:overload( function( ?path : String, ?options : FileSystemFlags, ?successCallback : FileSystemEntryCallback, ?errorCallback : ErrorCallback) : Void {} )
+	function getDirectory( ?path : String, ?options : FileSystemFlags, ?successCallback : FileSystemEntry -> Void, ?errorCallback : DOMException -> Void ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/FileSystemDirectoryReader.hx b/std/js/html/FileSystemDirectoryReader.hx
new file mode 100644
index 0000000000000000000000000000000000000000..097468b714f7ac2f9043c7ce155cbb91de5d9493
--- /dev/null
+++ b/std/js/html/FileSystemDirectoryReader.hx
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FileSystemDirectoryReader.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `FileSystemDirectoryReader` interface of the File and Directory Entries API lets you access the `FileEntry`-based objects (generally `FileSystemFileEntry` or `FileSystemDirectoryEntry`) representing each entry in a directory.
+
+	Documentation [FileSystemDirectoryReader](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemDirectoryReader) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemDirectoryReader$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/FileSystemDirectoryReader>
+**/
+@:native("FileSystemDirectoryReader")
+extern class FileSystemDirectoryReader {
+	/** @throws DOMError */
+	@:overload( function( successCallback : haxe.Constraints.Function, ?errorCallback : haxe.Constraints.Function) : Void {} )
+	@:overload( function( successCallback : FileSystemEntriesCallback, ?errorCallback : ErrorCallback) : Void {} )
+	function readEntries( successCallback : Array<FileSystemEntry> -> Void, ?errorCallback : DOMException -> Void ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/FileSystemEntriesCallback.hx b/std/js/html/FileSystemEntriesCallback.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8ff8dd3695fb0245f8115d341398b39389b7f3b5
--- /dev/null
+++ b/std/js/html/FileSystemEntriesCallback.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FileSystemDirectoryReader.webidl. Do not edit!
+
+package js.html;
+
+typedef FileSystemEntriesCallback = {
+	function handleEvent( entries : Array<FileSystemEntry> ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/FileSystemEntry.hx b/std/js/html/FileSystemEntry.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1dbfc34de886751d62976e426b660c331da89e75
--- /dev/null
+++ b/std/js/html/FileSystemEntry.hx
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FileSystemEntry.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `FileSystemEntry` interface of the File and Directory Entries API represents a single in a file system. The entry can be a file or a directory (directories are represented by the `DirectoryEntry` interface). It includes methods for working with files—including copying, moving, removing, and reading files—as well as information about a file it points to—including the file name and its path from the root to the entry.
+
+	Documentation [FileSystemEntry](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemEntry) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemEntry$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/FileSystemEntry>
+**/
+@:native("FileSystemEntry")
+extern class FileSystemEntry {
+	
+	/**
+		A Boolean which is `true` if the entry represents a file. If it's not a file, this value is `false`.
+	**/
+	var isFile(default,null) : Bool;
+	
+	/**
+		A `Boolean` which is `true` if the entry represents a directory; otherwise, it's `false`.
+	**/
+	var isDirectory(default,null) : Bool;
+	
+	/**
+		A `USVString` containing the name of the entry (the final part of the path, after the last "/" character).
+	**/
+	var name(default,null) : String;
+	
+	/**
+		A `USVString` object which provides the full, absolute path from the file system's root to the entry; it can also be thought of as a path which is relative to the root directory, prepended with a "/" character.
+	**/
+	var fullPath(default,null) : String;
+	
+	/**
+		A `FileSystem` object representing the file system in which the entry is located.
+	**/
+	var filesystem(default,null) : FileSystem;
+	
+	@:overload( function( ?successCallback : haxe.Constraints.Function, ?errorCallback : haxe.Constraints.Function) : Void {} )
+	@:overload( function( ?successCallback : FileSystemEntryCallback, ?errorCallback : ErrorCallback) : Void {} )
+	function getParent( ?successCallback : FileSystemEntry -> Void, ?errorCallback : DOMException -> Void ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/FileSystemEntryCallback.hx b/std/js/html/FileSystemEntryCallback.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ee0e494118612eb2ec024c02b86896a54f129848
--- /dev/null
+++ b/std/js/html/FileSystemEntryCallback.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FileSystem.webidl. Do not edit!
+
+package js.html;
+
+typedef FileSystemEntryCallback = {
+	function handleEvent( entry : FileSystemEntry ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/FileSystemFileEntry.hx b/std/js/html/FileSystemFileEntry.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8fb5e40be5a0b38d60c3b68e98ef260aa0c112c7
--- /dev/null
+++ b/std/js/html/FileSystemFileEntry.hx
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FileSystemFileEntry.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `FileSystemFileEntry` interface of the File System API represents a file in a file system. It offers properties describing the file's attributes, as well as the `file()` method, which creates a `File` object that can be used to read the file.
+
+	Documentation [FileSystemFileEntry](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemFileEntry) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemFileEntry$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/FileSystemFileEntry>
+**/
+@:native("FileSystemFileEntry")
+extern class FileSystemFileEntry extends FileSystemEntry {
+	@:overload( function( successCallback : haxe.Constraints.Function, ?errorCallback : haxe.Constraints.Function) : Void {} )
+	@:overload( function( successCallback : FileCallback, ?errorCallback : ErrorCallback) : Void {} )
+	function file( successCallback : File -> Void, ?errorCallback : DOMException -> Void ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/FileSystemFlags.hx b/std/js/html/FileSystemFlags.hx
new file mode 100644
index 0000000000000000000000000000000000000000..979d8247dddad368ef6707c3709fc6d5ff19a1f4
--- /dev/null
+++ b/std/js/html/FileSystemFlags.hx
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FileSystem.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `FileSystemFlags` dictionary defines a set of values which are used when specifying option flags when calling certain methods in the File and Directory Entries API. Methods which accept an options parameter of this type may specify zero or more of these flags as fields in an object, like this:
+
+	Documentation [FileSystemFlags](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemFlags) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemFlags$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/FileSystemFlags>
+**/
+typedef FileSystemFlags = {
+	
+	/**
+		If this property is `true`, and the requested file or directory doesn't exist, the user agent should create it. The default is `false`. The parent directory must already exist.
+	**/
+	var ?create : Bool;
+	
+	/**
+		If `true`, and the `create` option is also `true`, the file must not exist prior to issuing the call. Instead, it must be possible for it to be created newly at call time. The default is `false`.
+	**/
+	var ?exclusive : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/FillMode.hx b/std/js/html/FillMode.hx
index 19b8ba1c7b64415fc78d3005742ecd76818c3677..57b14a9295c92b1ae778078baa877ab36391bc3e 100644
--- a/std/js/html/FillMode.hx
+++ b/std/js/html/FillMode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\AnimationEffectReadOnly.webidl. Do not edit!
+// This file is generated from mozilla\AnimationEffect.webidl. Do not edit!
 
 package js.html;
 
-@:enum abstract FillMode(String)
-{
+enum abstract FillMode(String) {
 	var NONE = "none";
 	var FORWARDS = "forwards";
 	var BACKWARDS = "backwards";
diff --git a/std/js/html/Float32Array.hx b/std/js/html/Float32Array.hx
index 6f8336c0498db058cf65bf7acd624acb6e3aa8fb..3a9b21c5022fb382c8dad991f989af3165f5ef05 100644
--- a/std/js/html/Float32Array.hx
+++ b/std/js/html/Float32Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,26 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-// Explicitly include the compatibility class
-import js.html.compat.Float32Array;
-
-@:native("Float32Array")
-extern class Float32Array extends ArrayBufferView implements ArrayAccess<Float>
-{
-	static inline var BYTES_PER_ELEMENT : Int = 4;
-	
-	var length(default,null) : Int;
-	
-	/** @throws DOMError */
-	@:overload( function( length : Int ) : Void {} )
-	@:overload( function( array : Float32Array ) : Void {} )
-	@:overload( function( array : Array<Float> ) : Void {} )
-	function new( buffer : ArrayBuffer, ?byteOffset : Int, ?length : Int ) : Void;
-	@:overload( function( array : Float32Array, ?offset : Int ) : Void {} )
-	function set( array : Array<Float>, ?offset : Int ) : Void;
-	function subarray( start : Int, ?end : Int ) : Float32Array;
-}
\ No newline at end of file
+@:deprecated typedef Float32Array = js.lib.Float32Array;
diff --git a/std/js/html/Float64Array.hx b/std/js/html/Float64Array.hx
index 0fa72c2ff9774bc884fab0897b4d808a047a6732..e1249aa1712969d59e8f13328da9721a46ea0632 100644
--- a/std/js/html/Float64Array.hx
+++ b/std/js/html/Float64Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,26 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-// Explicitly include the compatibility class
-import js.html.compat.Float64Array;
-
-@:native("Float64Array")
-extern class Float64Array extends ArrayBufferView implements ArrayAccess<Float>
-{
-	static inline var BYTES_PER_ELEMENT : Int = 8;
-	
-	var length(default,null) : Int;
-	
-	/** @throws DOMError */
-	@:overload( function( length : Int ) : Void {} )
-	@:overload( function( array : Float64Array ) : Void {} )
-	@:overload( function( array : Array<Float> ) : Void {} )
-	function new( buffer : ArrayBuffer, ?byteOffset : Int, ?length : Int ) : Void;
-	@:overload( function( array : Float64Array, ?offset : Int ) : Void {} )
-	function set( array : Array<Float>, ?offset : Int ) : Void;
-	function subarray( start : Int, ?end : Int ) : Float64Array;
-}
\ No newline at end of file
+@:deprecated typedef Float64Array = js.lib.Float64Array;
diff --git a/std/js/html/FocusEvent.hx b/std/js/html/FocusEvent.hx
index 5193ceaf53915fc6423c42592720d72abc78ddfd..33bf935752f7fad9a15c7f54e19e712769e2b07a 100644
--- a/std/js/html/FocusEvent.hx
+++ b/std/js/html/FocusEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/FocusEvent>
 **/
 @:native("FocusEvent")
-extern class FocusEvent extends UIEvent
-{
+extern class FocusEvent extends UIEvent {
 	
 	/**
 		Is an `EventTarget` representing a secondary target for this event. As in some cases (like when tabbing in or out a page), this property may be set to `null` for security reasons.
diff --git a/std/js/html/FocusEventInit.hx b/std/js/html/FocusEventInit.hx
index ae2dd7ad7444bce6ab3199ba68f261bf84497f36..3e6d60c0f897112b2000221d1635502c9e39ca20 100644
--- a/std/js/html/FocusEventInit.hx
+++ b/std/js/html/FocusEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
 
 package js.html;
 
-typedef FocusEventInit =
-{
-	> UIEventInit,
-	@:optional var relatedTarget : EventTarget;
+typedef FocusEventInit = UIEventInit & {
+	var ?relatedTarget : EventTarget;
 }
\ No newline at end of file
diff --git a/std/js/html/FontElement.hx b/std/js/html/FontElement.hx
index 1e669db035d84ee2cd787325db346d17f0d43d4b..15d7ffbfae195097552fca679e174da6c33ccce1 100644
--- a/std/js/html/FontElement.hx
+++ b/std/js/html/FontElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,29 @@
 
 package js.html;
 
+/**
+	Implements the document object model (DOM) representation of the font element. The HTML Font Element `font` defines the font size, font face and color of text.
+
+	Documentation [HTMLFontElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLFontElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLFontElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLFontElement>
+**/
 @:native("HTMLFontElement")
-extern class FontElement extends Element
-{
+extern class FontElement extends Element {
+	
+	/**
+		Is a `DOMString` that reflects the `color` HTML attribute, containing either a named color or a color specified in the hexadecimal #RRGGBB format.
+	**/
 	var color : String;
+	
+	/**
+		Is a `DOMString` that reflects the `face` HTML attribute, containing a comma-separated list of one or more font names.
+	**/
 	var face : String;
+	
+	/**
+		Is a `DOMString` that reflects the `size` HTML attribute, containing either a font size number ranging from 1 to 7 or a relative size to the `size` attribute of the `basefont` element, for example -2 or +1.
+	**/
 	var size : String;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/FontFace.hx b/std/js/html/FontFace.hx
index 953a5d7049614b1cbc685ca272b762f6ffc2516d..7110e6a38455031db21f396aa8b0447222894e93 100644
--- a/std/js/html/FontFace.hx
+++ b/std/js/html/FontFace.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `FontFace` interface represents a single usable font face. It allows control of the source of the font face, being a URL to an external resource, or a buffer; it also allows control of when the font face is loaded and its current status.
 
@@ -32,60 +34,61 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/FontFace>
 **/
 @:native("FontFace")
-extern class FontFace
-{
-	
+extern class FontFace {
+
 	/**
-		Is a `DOMString` that contains the family of the font. It is equivalent to the `@font-face/family` descriptor.
+		Is a `CSSOMString` that contains the family of the font. It is equivalent to the `@font-face/font-family` descriptor.
 	**/
 	var family : String;
-	
+
 	/**
-		Is a `DOMString` that contains the style of the font. It is equivalent to the `@font-face/style` descriptor.
+		Is a `CSSOMString` that contains the style of the font. It is equivalent to the `@font-face/font-style` descriptor.
 	**/
 	var style : String;
-	
+
 	/**
-		Is a `DOMString` that contains the weight of the font. It is equivalent to the `@font-face/weight` descriptor.
+		Is a `CSSOMString` that contains the weight of the font. It is equivalent to the `@font-face/font-weight` descriptor.
 	**/
 	var weight : String;
-	
+
 	/**
-		Is a `DOMString` that contains how the font stretches. It is equivalent to the `@font-face/stretch` descriptor.
+		Is a `CSSOMString` that contains how the font stretches. It is equivalent to the `@font-face/font-stretch` descriptor.
 	**/
 	var stretch : String;
-	
+
 	/**
-		Is a `DOMString` that contains the range of code encompassed the font. It is equivalent to the `@font-face/unicode-range` descriptor.
+		Is a `CSSOMString` that contains the range of code encompassed the font. It is equivalent to the `@font-face/unicode-range` descriptor.
 	**/
 	var unicodeRange : String;
-	
+
 	/**
-		Is a `DOMString` that contains the variant of the font. It is equivalent to the `@font-face/range` descriptor.
+		Is a `CSSOMString` that contains the variant of the font. It is equivalent to the `@font-face/font-variant` descriptor.
 	**/
 	var variant : String;
-	
+
 	/**
-		Is a `DOMString` that contains the features of the font. It is equivalent to the `@font-face/feature-settings` descriptor.
+		Is a `CSSOMString` that contains the features of the font. It is equivalent to the `@font-face/font-feature-settings`descriptor.
 	**/
 	var featureSettings : String;
-	
+
 	/**
 		Returns an enumerated value indicating the status of the font. It can be one of the following: `"unloaded"`, `"loading"`, `"loaded"`, or `"error"`.
 	**/
 	var status(default,null) : FontFaceLoadStatus;
-	
+
 	/**
 		Returns a `Promise` to a `FontFace` that fulfills when the font is completely loaded and rejects when an error happens.
 	**/
 	var loaded(default,null) : Promise<FontFace>;
-	
-	/** @throws DOMError */
-	function new( family : String, source : haxe.extern.EitherType<String,haxe.extern.EitherType<ArrayBuffer,ArrayBufferView>>, ?descriptors : FontFaceDescriptors ) : Void;
+
 	/** @throws DOMError */
-	
+	@:overload( function( family : String, source : js.lib.ArrayBuffer, ?descriptors : FontFaceDescriptors) : FontFace {} )
+	@:overload( function( family : String, source : js.lib.ArrayBufferView, ?descriptors : FontFaceDescriptors) : FontFace {} )
+	function new( family : String, source : String, ?descriptors : FontFaceDescriptors ) : Void;
+
 	/**
 		Loads the font, returning a `Promise` to a `FontFace` that fulfills when the font is completely loaded and rejects when an error happens.
+		@throws DOMError
 	**/
 	function load() : Promise<FontFace>;
 }
\ No newline at end of file
diff --git a/std/js/html/FontFaceDescriptors.hx b/std/js/html/FontFaceDescriptors.hx
index 609299f2eeab3c6ba5d23970f25acbf40488ff91..d42f979d0ae8225b0b6c75cd704c2d3e88712c3e 100644
--- a/std/js/html/FontFaceDescriptors.hx
+++ b/std/js/html/FontFaceDescriptors.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,13 @@
 
 package js.html;
 
-typedef FontFaceDescriptors =
-{
-	@:optional var display : String;
-	@:optional var featureSettings : String;
-	@:optional var stretch : String;
-	@:optional var style : String;
-	@:optional var unicodeRange : String;
-	@:optional var variant : String;
-	@:optional var weight : String;
+typedef FontFaceDescriptors = {
+	var ?display : String;
+	var ?featureSettings : String;
+	var ?stretch : String;
+	var ?style : String;
+	var ?unicodeRange : String;
+	var ?variant : String;
+	var ?variationSettings : String;
+	var ?weight : String;
 }
\ No newline at end of file
diff --git a/std/js/html/FontFaceLoadStatus.hx b/std/js/html/FontFaceLoadStatus.hx
index 178e14e648be272d1f6aa39f7031e23fbeaf6cbd..5fec36d2817edcbeef6795b3bffd6748b40e5c81 100644
--- a/std/js/html/FontFaceLoadStatus.hx
+++ b/std/js/html/FontFaceLoadStatus.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract FontFaceLoadStatus(String)
-{
+enum abstract FontFaceLoadStatus(String) {
 	var UNLOADED = "unloaded";
 	var LOADING = "loading";
 	var LOADED = "loaded";
diff --git a/std/js/html/FontFaceSet.hx b/std/js/html/FontFaceSet.hx
index 2f8bf66965e70f62714ecb4d6e1a34317427f7af..85f5de5169055e1648e44626a5ec7a008543df51 100644
--- a/std/js/html/FontFaceSet.hx
+++ b/std/js/html/FontFaceSet.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,50 +24,50 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
-	The `FontFaceSet` interface of the CSS Font Loading API is an interface for loading font faces and checking their download statuses.
+	The `FontFaceSet` interface of the CSS Font Loading API manages the loading of font-faces and querying of their download status.
 
 	Documentation [FontFaceSet](https://developer.mozilla.org/en-US/docs/Web/API/FontFaceSet) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/FontFaceSet$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/FontFaceSet>
 **/
 @:native("FontFaceSet")
-extern class FontFaceSet extends EventTarget
-{
+extern class FontFaceSet extends EventTarget {
 	var size(default,null) : Int;
-	
+
 	/**
-		An `EventListener` property called whenever an event of type `loading` is fired, indicating that a font face set has started to load.
+		An `EventListener` called whenever an event of type `loading` is fired, indicating a font-face set has started loading.
 	**/
 	var onloading : haxe.Constraints.Function;
-	
+
 	/**
-		An `EventListener` property called whenever an event of type `loadingdone` is fired, indicating that a font face set has finished loading.
+		An `EventListener` called whenever an event of type `loadingdone` is fired, indicating that a font face set has finished loading.
 	**/
 	var onloadingdone : haxe.Constraints.Function;
-	
+
 	/**
-		An `EventListener` property called whenever an event of type `loadingerror` is fired, indicating that an error occurred during the loading of a font face set.
+		An `EventListener` called whenever an event of type `loadingerror` is fired, indicating that an error occurred whilst loading a font-face set.
 	**/
 	var onloadingerror : haxe.Constraints.Function;
 	var ready(default,null) : Promise<Void>;
-	
+
 	/**
-		Indicates the font face's loading status. It will be one of `'loading'` or `'loaded'`.
+		Indicates the font-face's loading status. It will be one of `'loading'` or `'loaded'`.
 	**/
 	var status(default,null) : FontFaceSetLoadStatus;
-	
+
 	/** @throws DOMError */
 	function add( font : FontFace ) : Void;
 	function has( font : FontFace ) : Bool;
-	@:native("delete")
-	function delete_( font : FontFace ) : Bool;
+	function delete( font : FontFace ) : Bool;
 	function clear() : Void;
 	function entries() : FontFaceSetIterator;
 	function values() : FontFaceSetIterator;
 	/** @throws DOMError */
 	function forEach( cb : FontFace -> FontFace -> FontFaceSet -> Void, ?thisArg : Dynamic ) : Void;
-	function load( font : String, ?text : String = " " ) : Promise<Array<FontFace>>;
+	function load( font : String, text : String = " " ) : Promise<Array<FontFace>>;
 	/** @throws DOMError */
-	function check( font : String, ?text : String = " " ) : Bool;
+	function check( font : String, text : String = " " ) : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/FontFaceSetIterator.hx b/std/js/html/FontFaceSetIterator.hx
index 2ecf87aa5e947cb44d885e882bc58daef2dc9c2b..972b78ffffa3b1e1e58dc2899215f3e8ac2d68ef 100644
--- a/std/js/html/FontFaceSetIterator.hx
+++ b/std/js/html/FontFaceSetIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-@:native("FontFaceSetIterator")
-extern class FontFaceSetIterator
-{
+typedef FontFaceSetIterator = {
 	/** @throws DOMError */
 	function next() : FontFaceSetIteratorResult;
 }
\ No newline at end of file
diff --git a/std/js/html/FontFaceSetIteratorResult.hx b/std/js/html/FontFaceSetIteratorResult.hx
index 686f4613a32a192d7320ef640607a477487f0af6..219b0ff1e657e0ea7a85aa4f66a4fecb44f92fee 100644
--- a/std/js/html/FontFaceSetIteratorResult.hx
+++ b/std/js/html/FontFaceSetIteratorResult.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-typedef FontFaceSetIteratorResult =
-{
+typedef FontFaceSetIteratorResult = {
 	var done : Bool;
 	var value : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/FontFaceSetLoadEvent.hx b/std/js/html/FontFaceSetLoadEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c445f1c8cf8a6e469f5502686dcb81be5f8d8225
--- /dev/null
+++ b/std/js/html/FontFaceSetLoadEvent.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FontFaceSetLoadEvent.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `FontFaceSetLoadEvent` interface of the the Css Font Loading API is fired whenever a `FontFaceSet` loads.
+
+	Documentation [FontFaceSetLoadEvent](https://developer.mozilla.org/en-US/docs/Web/API/FontFaceSetLoadEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/FontFaceSetLoadEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/FontFaceSetLoadEvent>
+**/
+@:native("FontFaceSetLoadEvent")
+extern class FontFaceSetLoadEvent extends Event {
+	
+	/**
+		Returns an array of `FontFace` instances each of which represents a single usable font.
+	**/
+	var fontfaces(default,null) : Array<FontFace>;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : FontFaceSetLoadEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/FontFaceSetLoadEventInit.hx b/std/js/html/FontFaceSetLoadEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5cfe37a23edc391a142093b8d3903e260e1dffd4
--- /dev/null
+++ b/std/js/html/FontFaceSetLoadEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FontFaceSetLoadEvent.webidl. Do not edit!
+
+package js.html;
+
+typedef FontFaceSetLoadEventInit = EventInit & {
+	var ?fontfaces : Array<FontFace>;
+}
\ No newline at end of file
diff --git a/std/js/html/FontFaceSetLoadStatus.hx b/std/js/html/FontFaceSetLoadStatus.hx
index c2fbc3178c38a9b9594334356e200ccc1e509305..9180e1fdbcc31e333704e0864892d93af97b0ca8 100644
--- a/std/js/html/FontFaceSetLoadStatus.hx
+++ b/std/js/html/FontFaceSetLoadStatus.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract FontFaceSetLoadStatus(String)
-{
+enum abstract FontFaceSetLoadStatus(String) {
 	var LOADING = "loading";
 	var LOADED = "loaded";
 }
\ No newline at end of file
diff --git a/std/js/html/FormData.hx b/std/js/html/FormData.hx
index 80f6966aa6b70d0e01e7ddd57c5b7448c7b2ef12..0ac334cff00feecbdf89f89b87e850f6f4312073 100644
--- a/std/js/html/FormData.hx
+++ b/std/js/html/FormData.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,57 +32,59 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/FormData>
 **/
 @:native("FormData")
-extern class FormData
-{
+extern class FormData {
 	/** @throws DOMError */
 	function new( ?form : FormElement ) : Void;
-	/** @throws DOMError */
-	@:overload( function( name : String, value : Blob, ?filename : String ) : Void {} )
 	
 	/**
 		Appends a new value onto an existing key inside a `FormData` object, or adds the key if it does not already exist.
+		@throws DOMError
 	**/
+	@:overload( function( name : String, value : Blob, ?filename : String ) : Void {} )
 	function append( name : String, value : String ) : Void;
-	@:native("delete")
-	function delete_( name : String ) : Void;
+	
+	/**
+		Deletes a key/value pair from a `FormData` object.
+	**/
+	function delete( name : String ) : Void;
 	
 	/**
 		Returns the first value associated with a given key from within a `FormData` object.
 	**/
-	function get( name : String ) : haxe.extern.EitherType<Blob,String>;
+	function get( name : String ) : haxe.extern.EitherType<Blob,haxe.extern.EitherType<Directory,String>>;
 	
 	/**
 		Returns an array of all the values associated with a given key from within a `FormData`.
 	**/
-	function getAll( name : String ) : Array<haxe.extern.EitherType<Blob,String>>;
+	function getAll( name : String ) : Array<haxe.extern.EitherType<Blob,haxe.extern.EitherType<Directory,String>>>;
 	
 	/**
 		Returns a boolean stating whether a `FormData` object contains a certain key/value pair.
 	**/
 	function has( name : String ) : Bool;
-	/** @throws DOMError */
-	@:overload( function( name : String, value : Blob, ?filename : String ) : Void {} )
 	
 	/**
 		Sets a new value for an existing key inside a `FormData `object, or adds the key/value if it does not already exist.
+		@throws DOMError
 	**/
+	@:overload( function( name : String, value : Blob, ?filename : String ) : Void {} )
 	function set( name : String, value : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `Iteration_protocols` allowing to go through all key/value pairs contained in this object.
+		@throws DOMError
 	**/
 	function entries() : FormDataIterator;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `Iteration_protocols` allowing to go through all keys of the key/value pairs contained in this object.
+		@throws DOMError
 	**/
 	function keys() : FormDataIterator;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `Iteration_protocols` allowing to go through all values of the key/value pairs contained in this object.
+		@throws DOMError
 	**/
 	function values() : FormDataIterator;
 	/** @throws DOMError */
diff --git a/std/js/html/FormDataIterator.hx b/std/js/html/FormDataIterator.hx
index 2738acda31651c182e941267a014ce8095fb3b60..1af87400fd4501ee0e672105ceadf3753ef2d9ff 100644
--- a/std/js/html/FormDataIterator.hx
+++ b/std/js/html/FormDataIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-@:native("FormDataIterator")
-extern class FormDataIterator
-{
+typedef FormDataIterator = {
 	/** @throws DOMError */
 	function next() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/FormElement.hx b/std/js/html/FormElement.hx
index 062e78b26e13f4e55b44cc738e549b9d22b9339f..bfc9d015b434cec87d35618b01e12e5c2f444ae2 100644
--- a/std/js/html/FormElement.hx
+++ b/std/js/html/FormElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,33 +25,89 @@
 package js.html;
 
 /**
-	The `HTMLFormElement` interface provides methods to create and modify `form` elements.
-		document.forms - returns an array of HTMLFormElement objects referencing all forms on the page.
-		document.forms[index] - returns an HTMLFormElement object referencing the form at the specified index.
-		document.forms['id'] - returns an HTMLFormElement object referencing the form with the specified id.
-		document.forms['name'] - returns an HTMLFormElement object referencing the form with the specified name.
+	The `HTMLFormElement` interface represents a `form` element in the DOM; it allows access to and in some cases modification of aspects of the form, as well as access to its component elements.
 
 	Documentation [HTMLFormElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement>
 **/
 @:native("HTMLFormElement")
-extern class FormElement extends Element implements ArrayAccess<Element>
-{
+extern class FormElement extends Element implements ArrayAccess<Element> {
+	
+	/**
+		A `DOMString` reflecting the value of the form's `accept-charset` HTML attribute, representing the character encoding that the server accepts.
+	**/
 	var acceptCharset : String;
+	
+	/**
+		A `DOMString` reflecting the value of the form's `action` HTML attribute, containing the URI of a program that processes the information submitted by the form.
+	**/
 	var action : String;
+	
+	/**
+		A `DOMString` reflecting the value of the form's `autocomplete` HTML attribute, indicating whether the controls in this form can have their values automatically populated by the browser.
+	**/
 	var autocomplete : String;
+	
+	/**
+		A `DOMString` reflecting the value of the form's `enctype` HTML attribute, indicating the type of content that is used to transmit the form to the server. Only specified values can be set. The two properties are synonyms.
+	**/
 	var enctype : String;
+	
+	/**
+		A `DOMString` reflecting the value of the form's `enctype` HTML attribute, indicating the type of content that is used to transmit the form to the server. Only specified values can be set. The two properties are synonyms.
+	**/
 	var encoding : String;
+	
+	/**
+		A `DOMString` reflecting the value of the form's `method` HTML attribute, indicating the HTTP method used to submit the form. Only specified values can be set.
+	**/
 	var method : String;
+	
+	/**
+		A `DOMString` reflecting the value of the form's `name` HTML attribute, containing the name of the form.
+	**/
 	var name : String;
+	
+	/**
+		A `Boolean` reflecting the value of the form's  `novalidate` HTML attribute, indicating whether the form should not be validated.
+	**/
 	var noValidate : Bool;
+	
+	/**
+		A `DOMString` reflecting the value of the form's `target` HTML attribute, indicating where to display the results received from submitting the form.
+	**/
 	var target : String;
+	
+	/**
+		A `HTMLFormControlsCollection` holding all form controls belonging to this form element.
+	**/
 	var elements(default,null) : HTMLCollection;
+	
+	/**
+		A `long` reflecting  the number of controls in the form.
+	**/
 	var length(default,null) : Int;
 	
-	/** @throws DOMError */
+	
+	/**
+		Submits the form to the server.
+		@throws DOMError
+	**/
 	function submit() : Void;
+	
+	/**
+		Resets the form to its initial state.
+	**/
 	function reset() : Void;
+	
+	/**
+		Returns `true` if the element's child controls are subject to constraint validation and satisfy those contraints; returns `false` if some controls do not satisfy their constraints. Fires an event named `invalid` at any control that does not satisfy its constraints; such controls are considered invalid if the event is not canceled. It is up to the programmer to decide how to respond to `false`.
+	**/
 	function checkValidity() : Bool;
+	
+	/**
+		Returns `true` if the element's child controls satisfy their validation constraints. When `false` is returned, cancelable `invalid` events are fired for each invalid child and validation problems are reported to the user.
+	**/
+	function reportValidity() : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/FrameElement.hx b/std/js/html/FrameElement.hx
index 204f617c423b89749e7ed36118c3937419666fc3..f4844c9ef8842613b40210e73a2401a7d1c6d206 100644
--- a/std/js/html/FrameElement.hx
+++ b/std/js/html/FrameElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("HTMLFrameElement")
-extern class FrameElement extends Element
-{
+extern class FrameElement extends Element {
 	var name : String;
 	var scrolling : String;
 	var src : String;
diff --git a/std/js/html/FrameSetElement.hx b/std/js/html/FrameSetElement.hx
index 7ddbb9a7979ba501a7f5826f4d3d8c0e7484eb35..b9732572d95b8dfc9ddeb1ddee9ca95235afb75a 100644
--- a/std/js/html/FrameSetElement.hx
+++ b/std/js/html/FrameSetElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,24 +32,24 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLFrameSetElement>
 **/
 @:native("HTMLFrameSetElement")
-extern class FrameSetElement extends Element
-{
+extern class FrameSetElement extends Element {
 	
 	/**
-		Is a `DOMString` that represents the foreground color of text.
+		Is a `DOMString` structured as a comma-seperated list specifing the width of each column inside a frameset.
 	**/
 	var cols : String;
 	
 	/**
-		Is a `DOMString` that represents the color of visited links.
+		Is a `DOMString` structured as a comma-seperated list specifing the height of each column inside a frameset.
 	**/
 	var rows : String;
 	var onafterprint : haxe.Constraints.Function;
 	var onbeforeprint : haxe.Constraints.Function;
-	var onbeforeunload : Event -> String;
+	var onbeforeunload : Event -> Null<String>;
 	var onhashchange : haxe.Constraints.Function;
 	var onlanguagechange : haxe.Constraints.Function;
 	var onmessage : haxe.Constraints.Function;
+	var onmessageerror : haxe.Constraints.Function;
 	var onoffline : haxe.Constraints.Function;
 	var ononline : haxe.Constraints.Function;
 	var onpagehide : haxe.Constraints.Function;
diff --git a/std/js/html/FrameType.hx b/std/js/html/FrameType.hx
index e196fccb4871f799dc28821e364b0cad927f2b3d..9d1860084a6e1974137c6ea58ae5b66cabfd24fc 100644
--- a/std/js/html/FrameType.hx
+++ b/std/js/html/FrameType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract FrameType(String)
-{
+enum abstract FrameType(String) {
 	var AUXILIARY = "auxiliary";
 	var TOP_LEVEL = "top-level";
 	var NESTED = "nested";
diff --git a/std/js/html/Gamepad.hx b/std/js/html/Gamepad.hx
index 0036ee3ba18f98cfcb66ef0b98d9b1a9f3e81aae..47b9cba5e819aab90ce4820ba87b8cfc429b96c4 100644
--- a/std/js/html/Gamepad.hx
+++ b/std/js/html/Gamepad.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Gamepad>
 **/
 @:native("Gamepad")
-extern class Gamepad
-{
+extern class Gamepad {
 	
 	/**
 		A `DOMString` containing identifying information about the controller.
@@ -66,7 +65,7 @@ extern class Gamepad
 	var axes(default,null) : Array<Float>;
 	
 	/**
-		A `DOMHighResTimeStamp` representing the last time the data for this gamepad was updated. Note that this property is not currently supported anywhere.
+		A `DOMHighResTimeStamp` representing the last time the data for this gamepad was updated.
 	**/
 	var timestamp(default,null) : Float;
 	
diff --git a/std/js/html/GamepadButton.hx b/std/js/html/GamepadButton.hx
index 1aa6f3dfbd8a22faa0908317ac3897d774ccb926..2511dd78df1edf8b0f82705f3add8e33256009e7 100644
--- a/std/js/html/GamepadButton.hx
+++ b/std/js/html/GamepadButton.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,13 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/GamepadButton>
 **/
 @:native("GamepadButton")
-extern class GamepadButton
-{
+extern class GamepadButton {
 	
 	/**
 		A boolean value indicating whether the button is currently pressed (`true`) or unpressed (`false`).
 	**/
 	var pressed(default,null) : Bool;
+	var touched(default,null) : Bool;
 	
 	/**
 		A double value used to represent the current state of analog buttons, such as the triggers on many modern gamepads. The values are normalized to the range 0.0 —1.0, with 0.0 representing a button that is not pressed, and 1.0 representing a button that is fully pressed.
diff --git a/std/js/html/CSSValueList.hx b/std/js/html/GamepadEvent.hx
similarity index 54%
rename from std/js/html/CSSValueList.hx
rename to std/js/html/GamepadEvent.hx
index dac04577373e0e88f2fe670497625b8446f71b4f..b6d927d4a44314eeb29a7d71e19bf71dbb8a5ce4 100644
--- a/std/js/html/CSSValueList.hx
+++ b/std/js/html/GamepadEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,29 +20,25 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\CSSValueList.webidl. Do not edit!
+// This file is generated from mozilla\GamepadEvent.webidl. Do not edit!
 
 package js.html;
 
 /**
-	The `CSSValueList` interface derives from the `CSSValue` interface and provides the abstraction of an ordered collection of CSS values.
+	The GamepadEvent interface of the Gamepad API contains references to gamepads connected to the system, which is what the gamepad events `Window.gamepadconnected` and `Window.gamepaddisconnected` are fired in response to.
 
-	Documentation [CSSValueList](https://developer.mozilla.org/en-US/docs/Web/API/CSSValueList) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/CSSValueList$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [GamepadEvent](https://developer.mozilla.org/en-US/docs/Web/API/GamepadEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/GamepadEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/CSSValueList>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/GamepadEvent>
 **/
-@:native("CSSValueList")
-extern class CSSValueList extends CSSValue implements ArrayAccess<CSSValue>
-{
+@:native("GamepadEvent")
+extern class GamepadEvent extends Event {
 	
 	/**
-		An `unsigned long` representing the number of `CSSValues` in the list.
+		Returns a `Gamepad` object, providing access to the associated gamepad data for the event fired.
 	**/
-	var length(default,null) : Int;
+	var gamepad(default,null) : Gamepad;
 	
-	
-	/**
-		This method is used to retrieve a `CSSValue` by ordinal index. The order in this collection represents the order of the values in the CSS style property. If index is greater than or equal to the number of values in the list, this returns `null`.
-	**/
-	function item( index : Int ) : CSSValue;
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : GamepadEventInit ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/DummyInterfaceWorkers.hx b/std/js/html/GamepadEventInit.hx
similarity index 86%
rename from std/js/html/DummyInterfaceWorkers.hx
rename to std/js/html/GamepadEventInit.hx
index a1a298611d17762166e05a300fe06854e6a64c6e..25769491dadd82c711acd1b7baf2d25da17de9ff 100644
--- a/std/js/html/DummyInterfaceWorkers.hx
+++ b/std/js/html/GamepadEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,11 +20,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DummyBinding.webidl. Do not edit!
+// This file is generated from mozilla\GamepadEvent.webidl. Do not edit!
 
 package js.html;
 
-@:native("DummyInterfaceWorkers")
-extern class DummyInterfaceWorkers
-{
+typedef GamepadEventInit = EventInit & {
+	var ?gamepad : Gamepad;
 }
\ No newline at end of file
diff --git a/std/js/html/GamepadMappingType.hx b/std/js/html/GamepadMappingType.hx
index 28c6e77cffe90bf75d4dfb4e0779d4274f03ea3e..60fc84fe08fd46f45b6b2bc18b7593b914640e40 100644
--- a/std/js/html/GamepadMappingType.hx
+++ b/std/js/html/GamepadMappingType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract GamepadMappingType(String)
-{
+enum abstract GamepadMappingType(String) {
 	var NONE = "";
 	var STANDARD = "standard";
 }
\ No newline at end of file
diff --git a/std/js/html/Geolocation.hx b/std/js/html/Geolocation.hx
index 7da368a13b8331c2c89cde69b0d94c42afc741c0..5697251e87cdc5c04b092038ef90ca20380658d3 100644
--- a/std/js/html/Geolocation.hx
+++ b/std/js/html/Geolocation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,19 +31,17 @@ package js.html;
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Geolocation>
 **/
-@:native("Geolocation")
-extern class Geolocation
-{
-	/** @throws DOMError */
+typedef Geolocation = {
 	
 	/**
 		Determines the device's current location and gives back a `Position` object with the data.
+		@throws DOMError
 	**/
 	function getCurrentPosition( successCallback : Position -> Void, ?errorCallback : PositionError -> Void, ?options : PositionOptions ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Returns a `long` value representing the newly established callback function to be invoked whenever the device location changes.
+		@throws DOMError
 	**/
 	function watchPosition( successCallback : Position -> Void, ?errorCallback : PositionError -> Void, ?options : PositionOptions ) : Int;
 	
diff --git a/std/js/html/GetNotificationOptions.hx b/std/js/html/GetNotificationOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..313c924928d0ecbe59b1730383f320dac2723e5c
--- /dev/null
+++ b/std/js/html/GetNotificationOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Notification.webidl. Do not edit!
+
+package js.html;
+
+typedef GetNotificationOptions = {
+	var ?tag : String;
+}
\ No newline at end of file
diff --git a/std/js/html/GetRootNodeOptions.hx b/std/js/html/GetRootNodeOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1547721d836ae7a4bea193643c7aa5b7553ad442
--- /dev/null
+++ b/std/js/html/GetRootNodeOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Node.webidl. Do not edit!
+
+package js.html;
+
+typedef GetRootNodeOptions = {
+	var ?composed : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/GetUserMediaRequest.hx b/std/js/html/GetUserMediaRequest.hx
index ab01b4c38d51e4b4999582cecd73c4602338fecc..34b30f133f8b72cf76f186a1c1384c078cb4b31e 100644
--- a/std/js/html/GetUserMediaRequest.hx
+++ b/std/js/html/GetUserMediaRequest.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,14 @@
 
 package js.html;
 
-@:native("GetUserMediaRequest")
-extern class GetUserMediaRequest
-{
+typedef GetUserMediaRequest = {
 	var windowID(default,null) : Int;
 	var innerWindowID(default,null) : Int;
 	var callID(default,null) : String;
+	var rawID(default,null) : String;
+	var mediaSource(default,null) : String;
 	var isSecure(default,null) : Bool;
+	var isHandlingUserInput(default,null) : Bool;
 	
 	function getConstraints() : MediaStreamConstraints;
 }
\ No newline at end of file
diff --git a/std/js/html/HRElement.hx b/std/js/html/HRElement.hx
index a2309eac1aa4e0362cc07af2d80caa5c350ce5dd..b3ad0f67f7826426fb831c352d66e79195c87309 100644
--- a/std/js/html/HRElement.hx
+++ b/std/js/html/HRElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLHRElement>
 **/
 @:native("HTMLHRElement")
-extern class HRElement extends Element
-{
+extern class HRElement extends Element {
 	var align : String;
 	var color : String;
 	var noShade : Bool;
diff --git a/std/js/html/HTMLAllCollection.hx b/std/js/html/HTMLAllCollection.hx
index 466b12dd81fdcc23496f954ed5368fe3c91445ec..93eace7d0c9296f65f4dabac82cb19a809583e68 100644
--- a/std/js/html/HTMLAllCollection.hx
+++ b/std/js/html/HTMLAllCollection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("HTMLAllCollection")
-extern class HTMLAllCollection implements ArrayAccess<Node>
-{
+extern class HTMLAllCollection implements ArrayAccess<Node> {
 	var length(default,null) : Int;
 	
 	@:overload( function( index : Int ) : Node {} )
diff --git a/std/js/html/HTMLCollection.hx b/std/js/html/HTMLCollection.hx
index 756e731d310b54dd5afa1d03ff71868cb4617dd9..50ad111aed90f7d6bb93663700038e5c02e72259 100644
--- a/std/js/html/HTMLCollection.hx
+++ b/std/js/html/HTMLCollection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLCollection>
 **/
 @:native("HTMLCollection")
-extern class HTMLCollection implements ArrayAccess<Element>
-{
+extern class HTMLCollection implements ArrayAccess<Element> {
 	
 	/**
 		Returns the number of items in the collection.
diff --git a/std/js/html/HTMLDocument.hx b/std/js/html/HTMLDocument.hx
index eb88f85cbb7bea4a6f420fe2e6d61364ba08e345..8d9d04868c10c7764eb0ec9f921df273601a5573 100644
--- a/std/js/html/HTMLDocument.hx
+++ b/std/js/html/HTMLDocument.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,40 +25,27 @@
 package js.html;
 
 /**
-	`HTMLDocument` is an abstract interface of the DOM which provides access to special properties and methods not present by default on a regular (XML) document.
+	`HTMLDocument` is an abstract interface which extends the `Document` interface to add HTML-specific features to the document object. It represents the root of the HTML document, within which its entire DOM hierarchy resides.
 
 	Documentation [HTMLDocument](https://developer.mozilla.org/en-US/docs/Web/API/HTMLDocument) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLDocument$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLDocument>
 **/
 @:native("HTMLDocument")
-extern class HTMLDocument extends Document
-{
+extern class HTMLDocument extends Document {
 	var domain : String;
 	var cookie : String;
-	var body : BodyElement;
-	var head(default,null) : HeadElement;
-	var images(default,null) : HTMLCollection;
-	var embeds(default,null) : HTMLCollection;
-	var plugins(default,null) : HTMLCollection;
-	var links(default,null) : HTMLCollection;
-	var forms(default,null) : HTMLCollection;
-	var scripts(default,null) : HTMLCollection;
 	var designMode : String;
 	var fgColor : String;
 	var linkColor : String;
 	var vlinkColor : String;
 	var alinkColor : String;
 	var bgColor : String;
-	var anchors(default,null) : HTMLCollection;
-	var applets(default,null) : HTMLCollection;
 	var all(default,null) : HTMLAllCollection;
 	
-	function getElementsByName( elementName : String ) : NodeList;
-	function getItems( ?typeNames : String = "" ) : NodeList;
 	/** @throws DOMError */
-	@:overload( function( ?type : String = "text/html", ?replace : String = "" ) : HTMLDocument {} )
-	function open( url : String, name : String, features : String, ?replace : Bool = false ) : Window;
+	@:overload( function( ?type : String, replace : String = "" ) : HTMLDocument {} )
+	function open( url : String, name : String, features : String, replace : Bool = false ) : Window;
 	/** @throws DOMError */
 	function close() : Void;
 	/** @throws DOMError */
@@ -66,7 +53,7 @@ extern class HTMLDocument extends Document
 	/** @throws DOMError */
 	function writeln( text : haxe.extern.Rest<String> ) : Void;
 	/** @throws DOMError */
-	function execCommand( commandId : String, ?showUI : Bool = false, ?value : String = "" ) : Bool;
+	function execCommand( commandId : String, showUI : Bool = false, value : String = "" ) : Bool;
 	/** @throws DOMError */
 	function queryCommandEnabled( commandId : String ) : Bool;
 	/** @throws DOMError */
@@ -77,80 +64,38 @@ extern class HTMLDocument extends Document
 	/** @throws DOMError */
 	function queryCommandValue( commandId : String ) : String;
 	function clear() : Void;
-	/** @throws DOMError */
-	function getSelection() : Selection;
 	function captureEvents() : Void;
 	function releaseEvents() : Void;
 	/** Shorthand for creating an HTML `<td>` element. */
 	inline function createTableCellElement() : TableCellElement { return cast createElement("td"); }
-	/** Shorthand for creating an HTML `<hr>` element. */
-	inline function createHRElement() : HRElement { return cast createElement("hr"); }
 	/** Shorthand for creating an HTML `<select>` element. */
 	inline function createSelectElement() : SelectElement { return cast createElement("select"); }
-	/** Shorthand for creating an HTML `<map>` element. */
-	inline function createMapElement() : MapElement { return cast createElement("map"); }
-	/** Shorthand for creating an HTML `<form>` element. */
-	inline function createFormElement() : FormElement { return cast createElement("form"); }
-	/** Shorthand for creating an HTML `<option>` element. */
-	inline function createOptionElement() : OptionElement { return cast createElement("option"); }
-	/** Shorthand for creating an HTML `<label>` element. */
-	inline function createLabelElement() : LabelElement { return cast createElement("label"); }
-	/** Shorthand for creating an HTML `<meta>` element. */
-	inline function createMetaElement() : MetaElement { return cast createElement("meta"); }
-	/** Shorthand for creating an HTML `<img>` element. */
-	inline function createImageElement() : ImageElement { return cast createElement("img"); }
+	/** Shorthand for creating an HTML `<font>` element. */
+	inline function createFontElement() : FontElement { return cast createElement("font"); }
 	/** Shorthand for creating an HTML `<dl>` element. */
 	inline function createDListElement() : DListElement { return cast createElement("dl"); }
 	/** Shorthand for creating an HTML `<frame>` element. */
 	inline function createFrameElement() : FrameElement { return cast createElement("frame"); }
-	/** Shorthand for creating an HTML `<mod>` element. */
-	inline function createModElement() : ModElement { return cast createElement("mod"); }
-	/** Shorthand for creating an HTML `<ul>` element. */
-	inline function createUListElement() : UListElement { return cast createElement("ul"); }
-	/** Shorthand for creating an HTML `<output>` element. */
-	inline function createOutputElement() : OutputElement { return cast createElement("output"); }
 	/** Shorthand for creating an HTML `<ol>` element. */
 	inline function createOListElement() : OListElement { return cast createElement("ol"); }
-	/** Shorthand for creating an HTML `<shadow>` element. */
-	inline function createShadowElement() : ShadowElement { return cast createElement("shadow"); }
 	/** Shorthand for creating an HTML `<li>` element. */
 	inline function createLIElement() : LIElement { return cast createElement("li"); }
-	/** Shorthand for creating an HTML `<datalist>` element. */
-	inline function createDataListElement() : DataListElement { return cast createElement("datalist"); }
+	/** Shorthand for creating an HTML `<hr>` element. */
+	inline function createHRElement() : HRElement { return cast createElement("hr"); }
 	/** Shorthand for creating an HTML `<param>` element. */
 	inline function createParamElement() : ParamElement { return cast createElement("param"); }
-	/** Shorthand for creating an HTML `<font>` element. */
-	inline function createFontElement() : FontElement { return cast createElement("font"); }
+	/** Shorthand for creating an HTML `<label>` element. */
+	inline function createLabelElement() : LabelElement { return cast createElement("label"); }
 	/** Shorthand for creating an HTML `<track>` element. */
 	inline function createTrackElement() : TrackElement { return cast createElement("track"); }
-	/** Shorthand for creating an HTML `<applet>` element. */
-	inline function createAppletElement() : AppletElement { return cast createElement("applet"); }
-	/** Shorthand for creating an HTML `<area>` element. */
-	inline function createAreaElement() : AreaElement { return cast createElement("area"); }
-	/** Shorthand for creating an HTML `<link>` element. */
-	inline function createLinkElement() : LinkElement { return cast createElement("link"); }
 	/** Shorthand for creating an HTML `<div>` element. */
 	inline function createDivElement() : DivElement { return cast createElement("div"); }
 	/** Shorthand for creating an HTML `<title>` element. */
 	inline function createTitleElement() : TitleElement { return cast createElement("title"); }
-	/** Shorthand for creating an HTML `<style>` element. */
-	inline function createStyleElement() : StyleElement { return cast createElement("style"); }
-	/** Shorthand for creating an HTML `<progress>` element. */
-	inline function createProgressElement() : ProgressElement { return cast createElement("progress"); }
-	/** Shorthand for creating an HTML `<button>` element. */
-	inline function createButtonElement() : ButtonElement { return cast createElement("button"); }
-	/** Shorthand for creating an HTML `<fieldset>` element. */
-	inline function createFieldSetElement() : FieldSetElement { return cast createElement("fieldset"); }
 	/** Shorthand for creating an HTML `<a>` element. */
 	inline function createAnchorElement() : AnchorElement { return cast createElement("a"); }
-	/** Shorthand for creating an HTML `<iframe>` element. */
-	inline function createIFrameElement() : IFrameElement { return cast createElement("iframe"); }
-	/** Shorthand for creating an HTML `<span>` element. */
-	inline function createSpanElement() : SpanElement { return cast createElement("span"); }
-	/** Shorthand for creating an HTML `<body>` element. */
-	inline function createBodyElement() : BodyElement { return cast createElement("body"); }
-	/** Shorthand for creating an HTML `<input>` element. */
-	inline function createInputElement() : InputElement { return cast createElement("input"); }
+	/** Shorthand for creating an HTML `<style>` element. */
+	inline function createStyleElement() : StyleElement { return cast createElement("style"); }
 	/** Shorthand for creating an HTML `<embed>` element. */
 	inline function createEmbedElement() : EmbedElement { return cast createElement("embed"); }
 	/** Shorthand for creating an HTML `<meter>` element. */
@@ -163,20 +108,78 @@ extern class HTMLDocument extends Document
 	inline function createTableSectionElement() : TableSectionElement { return cast createElement("thead"); }
 	/** Shorthand for creating an HTML `<head>` element. */
 	inline function createHeadElement() : HeadElement { return cast createElement("head"); }
-	/** Shorthand for creating an HTML `<base>` element. */
-	inline function createBaseElement() : BaseElement { return cast createElement("base"); }
 	/** Shorthand for creating an HTML `<optgroup>` element. */
 	inline function createOptGroupElement() : OptGroupElement { return cast createElement("optgroup"); }
-	/** Shorthand for creating an HTML `<quote>` element. */
-	inline function createQuoteElement() : QuoteElement { return cast createElement("quote"); }
 	/** Shorthand for creating an HTML `<audio>` element. */
 	inline function createAudioElement() : AudioElement { return cast createElement("audio"); }
 	/** Shorthand for creating an HTML `<video>` element. */
 	inline function createVideoElement() : VideoElement { return cast createElement("video"); }
 	/** Shorthand for creating an HTML `<legend>` element. */
 	inline function createLegendElement() : LegendElement { return cast createElement("legend"); }
+	/** Shorthand for creating an HTML `<ul>` element. */
+	inline function createUListElement() : UListElement { return cast createElement("ul"); }
+	/** Shorthand for creating an HTML `<dir>` element. */
+	inline function createDirectoryElement() : DirectoryElement { return cast createElement("dir"); }
+	/** Shorthand for creating an HTML `<table>` element. */
+	inline function createTableElement() : TableElement { return cast createElement("table"); }
+	/** Shorthand for creating an HTML `<slot>` element. */
+	inline function createSlotElement() : SlotElement { return cast createElement("slot"); }
+	/** Shorthand for creating an HTML `<source>` element. */
+	inline function createSourceElement() : SourceElement { return cast createElement("source"); }
+	/** Shorthand for creating an HTML `<link>` element. */
+	inline function createLinkElement() : LinkElement { return cast createElement("link"); }
+	/** Shorthand for creating an HTML `<iframe>` element. */
+	inline function createIFrameElement() : IFrameElement { return cast createElement("iframe"); }
+	/** Shorthand for creating an HTML `<media>` element. */
+	inline function createMediaElement() : MediaElement { return cast createElement("media"); }
+	/** Shorthand for creating an HTML `<map>` element. */
+	inline function createMapElement() : MapElement { return cast createElement("map"); }
+	/** Shorthand for creating an HTML `<form>` element. */
+	inline function createFormElement() : FormElement { return cast createElement("form"); }
+	/** Shorthand for creating an HTML `<option>` element. */
+	inline function createOptionElement() : OptionElement { return cast createElement("option"); }
+	/** Shorthand for creating an HTML `<meta>` element. */
+	inline function createMetaElement() : MetaElement { return cast createElement("meta"); }
+	/** Shorthand for creating an HTML `<object>` element. */
+	inline function createObjectElement() : ObjectElement { return cast createElement("object"); }
+	/** Shorthand for creating an HTML `<caption>` element. */
+	inline function createTableCaptionElement() : TableCaptionElement { return cast createElement("caption"); }
+	/** Shorthand for creating an HTML `<img>` element. */
+	inline function createImageElement() : ImageElement { return cast createElement("img"); }
+	/** Shorthand for creating an HTML `<textarea>` element. */
+	inline function createTextAreaElement() : TextAreaElement { return cast createElement("textarea"); }
+	/** Shorthand for creating an HTML `<script>` element. */
+	inline function createScriptElement() : ScriptElement { return cast createElement("script"); }
+	/** Shorthand for creating an HTML `<datalist>` element. */
+	inline function createDataListElement() : DataListElement { return cast createElement("datalist"); }
+	/** Shorthand for creating an HTML `<mod>` element. */
+	inline function createModElement() : ModElement { return cast createElement("mod"); }
+	/** Shorthand for creating an HTML `<output>` element. */
+	inline function createOutputElement() : OutputElement { return cast createElement("output"); }
+	/** Shorthand for creating an HTML `<area>` element. */
+	inline function createAreaElement() : AreaElement { return cast createElement("area"); }
+	/** Shorthand for creating an HTML `<progress>` element. */
+	inline function createProgressElement() : ProgressElement { return cast createElement("progress"); }
+	/** Shorthand for creating an HTML `<button>` element. */
+	inline function createButtonElement() : ButtonElement { return cast createElement("button"); }
+	/** Shorthand for creating an HTML `<fieldset>` element. */
+	inline function createFieldSetElement() : FieldSetElement { return cast createElement("fieldset"); }
 	/** Shorthand for creating an HTML `<menu>` element. */
 	inline function createMenuElement() : MenuElement { return cast createElement("menu"); }
+	/** Shorthand for creating an HTML `<br>` element. */
+	inline function createBRElement() : BRElement { return cast createElement("br"); }
+	/** Shorthand for creating an HTML `<span>` element. */
+	inline function createSpanElement() : SpanElement { return cast createElement("span"); }
+	/** Shorthand for creating an HTML `<details>` element. */
+	inline function createDetailsElement() : DetailsElement { return cast createElement("details"); }
+	/** Shorthand for creating an HTML `<body>` element. */
+	inline function createBodyElement() : BodyElement { return cast createElement("body"); }
+	/** Shorthand for creating an HTML `<input>` element. */
+	inline function createInputElement() : InputElement { return cast createElement("input"); }
+	/** Shorthand for creating an HTML `<base>` element. */
+	inline function createBaseElement() : BaseElement { return cast createElement("base"); }
+	/** Shorthand for creating an HTML `<quote>` element. */
+	inline function createQuoteElement() : QuoteElement { return cast createElement("quote"); }
 	/** Shorthand for creating an HTML `<frameset>` element. */
 	inline function createFrameSetElement() : FrameSetElement { return cast createElement("frameset"); }
 	/** Shorthand for creating an HTML `<canvas>` element. */
@@ -185,29 +188,9 @@ extern class HTMLDocument extends Document
 	inline function createParagraphElement() : ParagraphElement { return cast createElement("p"); }
 	/** Shorthand for creating an HTML `<col>` element. */
 	inline function createTableColElement() : TableColElement { return cast createElement("col"); }
-	/** Shorthand for creating an HTML `<dir>` element. */
-	inline function createDirectoryElement() : DirectoryElement { return cast createElement("dir"); }
-	/** Shorthand for creating an HTML `<table>` element. */
-	inline function createTableElement() : TableElement { return cast createElement("table"); }
 	/** Shorthand for creating an HTML `<tr>` element. */
 	inline function createTableRowElement() : TableRowElement { return cast createElement("tr"); }
-	/** Shorthand for creating an HTML `<script>` element. */
-	inline function createScriptElement() : ScriptElement { return cast createElement("script"); }
-	/** Shorthand for creating an HTML `<source>` element. */
-	inline function createSourceElement() : SourceElement { return cast createElement("source"); }
-	/** Shorthand for creating an HTML `<content>` element. */
-	inline function createContentElement() : ContentElement { return cast createElement("content"); }
-	/** Shorthand for creating an HTML `<br>` element. */
-	inline function createBRElement() : BRElement { return cast createElement("br"); }
 	/** Shorthand for creating an HTML `<html>` element. */
 	inline function createHtmlElement() : HtmlElement { return cast createElement("html"); }
-	/** Shorthand for creating an HTML `<textarea>` element. */
-	inline function createTextAreaElement() : TextAreaElement { return cast createElement("textarea"); }
-	/** Shorthand for creating an HTML `<media>` element. */
-	inline function createMediaElement() : MediaElement { return cast createElement("media"); }
-	/** Shorthand for creating an HTML `<object>` element. */
-	inline function createObjectElement() : ObjectElement { return cast createElement("object"); }
-	/** Shorthand for creating an HTML `<caption>` element. */
-	inline function createTableCaptionElement() : TableCaptionElement { return cast createElement("caption"); }
 	
 }
\ No newline at end of file
diff --git a/std/js/html/HTMLFormControlsCollection.hx b/std/js/html/HTMLFormControlsCollection.hx
index e65a34372d40a4470f93b7dd3cc2099c5c10ba4c..c13c64d2db3955634db509c7fb10b672e5a11908 100644
--- a/std/js/html/HTMLFormControlsCollection.hx
+++ b/std/js/html/HTMLFormControlsCollection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,13 +25,17 @@
 package js.html;
 
 /**
-	The `HTMLFormControlsCollection` interface represents a collection of HTML form control elements. It replaces one method of `HTMLCollection`.
+	The `HTMLFormControlsCollection` interface represents a collection of HTML form control elements. 
 
 	Documentation [HTMLFormControlsCollection](https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormControlsCollection) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormControlsCollection$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormControlsCollection>
 **/
 @:native("HTMLFormControlsCollection")
-extern class HTMLFormControlsCollection extends HTMLCollection
-{
+extern class HTMLFormControlsCollection extends HTMLCollection {
+	
+	/**
+		Returns the `RadioNodeList` or the `Element` in the collection whose `name` or `id` match the specified name, or `null` if no nodes match. Note that this version of `namedItem()` hide the one inherited from `HTMLCollection`. Like that one, in JavaScript, using the array bracket syntax with a `String`, like `collection["value"]` is equivalent to `collection.namedItem("value")`.
+	**/
+	function namedItem( name : String ) : haxe.extern.EitherType<RadioNodeList,Element>;
 }
\ No newline at end of file
diff --git a/std/js/html/HTMLOptionsCollection.hx b/std/js/html/HTMLOptionsCollection.hx
index 1e2a03de68a71d84dbb454bea12fe79a847682be..b590f4c9dfea06cfa58f5b56c535737d1db0ba6e 100644
--- a/std/js/html/HTMLOptionsCollection.hx
+++ b/std/js/html/HTMLOptionsCollection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLOptionsCollection>
 **/
 @:native("HTMLOptionsCollection")
-extern class HTMLOptionsCollection extends HTMLCollection
-{
+extern class HTMLOptionsCollection extends HTMLCollection {
 	var selectedIndex : Int;
 	
 	/** @throws DOMError */
diff --git a/std/js/html/HTMLPropertiesCollection.hx b/std/js/html/HTMLPropertiesCollection.hx
index 9b2125c8da64d9990b29fc2be94fcf00f7d61745..9c802bbd2e3cf960a53f4e5d082cabbf1745c29e 100644
--- a/std/js/html/HTMLPropertiesCollection.hx
+++ b/std/js/html/HTMLPropertiesCollection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\HTMLPropertiesCollection.webidl. Do not edit!
+// This file is generated from HTMLPropertiesCollection.webidl. Do not edit!
 
 package js.html;
 
 @:native("HTMLPropertiesCollection")
-extern class HTMLPropertiesCollection extends HTMLCollection
-{
+extern class HTMLPropertiesCollection extends HTMLCollection {
 	var names(default,null) : DOMStringList;
 	
+	function namedItem( name : String ) : PropertyNodeList;
 }
\ No newline at end of file
diff --git a/std/js/html/HashChangeEvent.hx b/std/js/html/HashChangeEvent.hx
index 68d549517e21c32c40cacdffb6190e2ee0807611..f2d72b17d31ce5cc5fdf2634561424f2b45c3b8a 100644
--- a/std/js/html/HashChangeEvent.hx
+++ b/std/js/html/HashChangeEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,19 +25,26 @@
 package js.html;
 
 /**
-	The `hashchange` event is fired when the fragment identifier of the URL has changed (the part of the URL that follows the # symbol, including the # symbol).
+	The `HashChangeEvent` event is fired when the fragment identifier of the URL has changed (the part of the URL that follows the # symbol, including the # symbol).
 
 	Documentation [HashChangeEvent](https://developer.mozilla.org/en-US/docs/Web/API/HashChangeEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HashChangeEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HashChangeEvent>
 **/
 @:native("HashChangeEvent")
-extern class HashChangeEvent extends Event
-{
+extern class HashChangeEvent extends Event {
+	
+	/**
+		The previous URL from which the window was navigated.
+	**/
 	var oldURL(default,null) : String;
+	
+	/**
+		The new URL to which the window is navigating.
+	**/
 	var newURL(default,null) : String;
 	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : HashChangeEventInit ) : Void;
-	function initHashChangeEvent( typeArg : String, canBubbleArg : Bool, cancelableArg : Bool, oldURLArg : String, newURLArg : String ) : Void;
+	function initHashChangeEvent( typeArg : String, canBubbleArg : Bool = false, cancelableArg : Bool = false, oldURLArg : String = "", newURLArg : String = "" ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/HashChangeEventInit.hx b/std/js/html/HashChangeEventInit.hx
index b3d918e7f0213f9859e9ec5c4485b61487be3063..4fbad217178acb9f2bc737117b9c658bec48fedd 100644
--- a/std/js/html/HashChangeEventInit.hx
+++ b/std/js/html/HashChangeEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-typedef HashChangeEventInit =
-{
-	> EventInit,
-	@:optional var newURL : String;
-	@:optional var oldURL : String;
+typedef HashChangeEventInit = EventInit & {
+	var ?newURL : String;
+	var ?oldURL : String;
 }
\ No newline at end of file
diff --git a/std/js/html/HeadElement.hx b/std/js/html/HeadElement.hx
index c1f1e8b1b267ea2214663d545db2b067368612ed..d15a526747195c83a358e8698894010fa44dc627 100644
--- a/std/js/html/HeadElement.hx
+++ b/std/js/html/HeadElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLHeadElement>
 **/
 @:native("HTMLHeadElement")
-extern class HeadElement extends Element
-{
+extern class HeadElement extends Element {
 }
\ No newline at end of file
diff --git a/std/js/html/Headers.hx b/std/js/html/Headers.hx
index a93c36d6cae7a163ae5078f05121b6388e38611a..c37dcc72849fc1ef3c421f00cecbb255a095029e 100644
--- a/std/js/html/Headers.hx
+++ b/std/js/html/Headers.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,61 +32,63 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Headers>
 **/
 @:native("Headers")
-extern class Headers
-{
-	/** @throws DOMError */
-	function new( ?init : haxe.extern.EitherType<Headers,haxe.extern.EitherType<Array<Array<String>>,Dynamic/*MISSING ByteStringMozMap*/>> ) : Void;
+extern class Headers {
 	/** @throws DOMError */
+	@:overload( function( ?init : Array<Array<String>>) : Headers {} )
+	@:overload( function( ?init : haxe.DynamicAccess<String>) : Headers {} )
+	function new( ?init : Headers ) : Void;
 	
 	/**
 		Appends a new value onto an existing header inside a `Headers` object, or adds the header if it does not already exist.
+		@throws DOMError
 	**/
 	function append( name : String, value : String ) : Void;
-	/** @throws DOMError */
-	@:native("delete")
-	function delete_( name : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
-		Returns the first value of a given header from within a `Headers` object.
+		Deletes a header from a `Headers` object.
+		@throws DOMError
 	**/
-	function get( name : String ) : String;
-	/** @throws DOMError */
+	function delete( name : String ) : Void;
 	
 	/**
-		Returns an array of all the values of a header within a `Headers` object with a given name.
+		Returns a `ByteString` sequence of all the values of a header within a `Headers` object with a given name.
+		@throws DOMError
 	**/
-	function getAll( name : String ) : Array<String>;
-	/** @throws DOMError */
+	function get( name : String ) : String;
 	
 	/**
 		Returns a boolean stating whether a `Headers` object contains a certain header.
+		@throws DOMError
 	**/
 	function has( name : String ) : Bool;
-	/** @throws DOMError */
 	
 	/**
 		Sets a new value for an existing header inside a `Headers` object, or adds the header if it does not already exist.
+		@throws DOMError
 	**/
 	function set( name : String, value : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `Iteration_protocols` allowing to go through all key/value pairs contained in this object.
+		@throws DOMError
 	**/
 	function entries() : HeadersIterator;
-	/** @throws DOMError */
 	
 	/**
-		Returns an `Iteration_protocols` allowing to go through all keys f the key/value pairs contained in this object.
+		Returns an `Iteration_protocols` allowing you to go through all keys of the key/value pairs contained in this object.
+		@throws DOMError
 	**/
 	function keys() : HeadersIterator;
-	/** @throws DOMError */
 	
 	/**
-		Returns an `Iteration_protocols` allowing to go through all values of the key/value pairs contained in this object.
+		Returns an `Iteration_protocols` allowing you to go through all values of the key/value pairs contained in this object.
+		@throws DOMError
 	**/
 	function values() : HeadersIterator;
-	/** @throws DOMError */
+	
+	/**
+		Executes a provided function once for each array element.
+		@throws DOMError
+	**/
 	function forEach( callback : Dynamic, ?thisArg : Dynamic ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/HeadersIterator.hx b/std/js/html/HeadersIterator.hx
index 258e329a2246c6d027270176774cc1528c6dab95..170dc505ef5339aa972d194d1be6b6ad5e9fb0d6 100644
--- a/std/js/html/HeadersIterator.hx
+++ b/std/js/html/HeadersIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-@:native("HeadersIterator")
-extern class HeadersIterator
-{
+typedef HeadersIterator = {
 	/** @throws DOMError */
 	function next() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/HeadingElement.hx b/std/js/html/HeadingElement.hx
index e954f2c866367586c37409bf45c07d746807720d..29e941ad1adf0a13a109df3157f0896226fb2d1a 100644
--- a/std/js/html/HeadingElement.hx
+++ b/std/js/html/HeadingElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,10 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLHeadingElement>
 **/
 @:native("HTMLHeadingElement")
-extern class HeadingElement extends Element
-{
+extern class HeadingElement extends Element {
 	
 	/**
-		Is a `DOMString` representing an enumerated attribute indicating alignment of the heading with respect to the surrounding context.
+		Is a `DOMString` representing an enumerated attribute indicating alignment of the heading with respect to the surrounding context. The possible values are `"left"`, `"right"`, `"justify"`, and `"center"`.
 	**/
 	var align : String;
 	
diff --git a/std/js/html/History.hx b/std/js/html/History.hx
index 86612d8cc90d180e2df3aca18760b361b1e1afdf..78309cfc256783a135928b0968d93da5dd3d40a1 100644
--- a/std/js/html/History.hx
+++ b/std/js/html/History.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `History` interface allows to manipulate the browser session history, that is the pages visited in the tab or frame that the current page is loaded in.
+	The `History` interface allows manipulation of the browser session history, that is the pages visited in the tab or frame that the current page is loaded in.
 
 	Documentation [History](https://developer.mozilla.org/en-US/docs/Web/API/History) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/History$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/History>
 **/
 @:native("History")
-extern class History
-{
+extern class History {
 	
 	/**
 		Returns an `Integer` representing the number of elements in the session history, including the currently loaded page. For example, for a page loaded in a new tab this property returns `1`.
@@ -50,40 +49,38 @@ extern class History
 	**/
 	var state(default,null) : Dynamic;
 	
-	/** @throws DOMError */
 	
 	/**
-		Loads a page from the session history, identified by its relative location to the current page, for example -1 for the previous page or 1  for the next page. If you specify an out-of-bounds value (for instance, specifying -1 when there are no previously-visited pages in the session history), this method silently has no effect. Calling `go()` without parameters or a value of 0 reloads the current page.
-		 Internet Explorer lets you specify a string to go to a specific page in the history list; you should avoid this feature because it is non-standard.
-		 
+		Loads a page from the session history, identified by its relative location to the current page, for example -1 for the previous page or 1  for the next page. If you specify an out-of-bounds value (for instance, specifying -1 when there are no previously-visited pages in the session history), this method silently has no effect. Calling `go()` without parameters or a value of 0 reloads the current page. Internet Explorer lets you also specify a string to go to a specific page in the history list.
+		@throws DOMError
 	**/
-	function go( ?delta : Int = 0 ) : Void;
-	/** @throws DOMError */
+	function go( delta : Int = 0 ) : Void;
 	
 	/**
 		Goes to the previous page in session history, the same action as when the user clicks the browser's Back button. Equivalent to `history.go(-1)`.
 		 Calling this method to go back beyond the first page in the session history has no effect and doesn't raise an exception.
 		 
+		@throws DOMError
 	**/
 	function back() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Goes to the next page in session history, the same action as when the user clicks the browser's Forward button; this is equivalent to `history.go(1)`.
 		 Calling this method to go forward beyond the most recent page in the session history has no effect and doesn't raise an exception.
 		 
+		@throws DOMError
 	**/
 	function forward() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Pushes the given data onto the session history stack with the specified title and, if provided, URL. The data is treated as opaque by the DOM; you may specify any JavaScript object that can be serialized.  Note that Firefox currently ignores the title parameter; for more information, see manipulating the browser history.
+		@throws DOMError
 	**/
 	function pushState( data : Dynamic, title : String, ?url : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Updates the most recent entry on the history stack to have the specified data, title, and, if provided, URL. The data is treated as opaque by the DOM; you may specify any JavaScript object that can be serialized.  Note that Firefox currently ignores the title parameter; for more information, see manipulating the browser history.
+		@throws DOMError
 	**/
 	function replaceState( data : Dynamic, title : String, ?url : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/HitRegionOptions.hx b/std/js/html/HitRegionOptions.hx
index 698cffa8afa7ec0311997d4717652988944b5c00..642bc9ac8a4a88a5c644336d851ef32d2e747bd1 100644
--- a/std/js/html/HitRegionOptions.hx
+++ b/std/js/html/HitRegionOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,8 @@
 
 package js.html;
 
-typedef HitRegionOptions =
-{
-	@:optional var control : Element;
-	@:optional var id : String;
-	@:optional var path : Path2D;
+typedef HitRegionOptions = {
+	var ?control : Element;
+	var ?id : String;
+	var ?path : Path2D;
 }
\ No newline at end of file
diff --git a/std/js/html/HtmlElement.hx b/std/js/html/HtmlElement.hx
index bf7eb56ebed4d8d13aba45358333dae9e7f24cae..ac35ece686ed6c5f39c55ba766f524fb6bc00c01 100644
--- a/std/js/html/HtmlElement.hx
+++ b/std/js/html/HtmlElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLHtmlElement>
 **/
 @:native("HTMLHtmlElement")
-extern class HtmlElement extends Element
-{
+extern class HtmlElement extends Element {
 	
 	/**
 		Is a `DOMString` representing the version of the HTML Document Type Definition (DTD) that governs this document. This property should not be used any more as it is non-conforming. Simply omit it.
diff --git a/std/js/html/IFrameElement.hx b/std/js/html/IFrameElement.hx
index 70bafa1e8fb2cb46d8f63d96d698e0a396bf564c..6e1ad2f087ee1017c02f2daa87adc25636f1d7ca 100644
--- a/std/js/html/IFrameElement.hx
+++ b/std/js/html/IFrameElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement>
 **/
 @:native("HTMLIFrameElement")
-extern class IFrameElement extends Element
-{
+extern class IFrameElement extends Element {
 	
 	/**
 		Is a `DOMString` that reflects the `src` HTML attribute, containing the address of the content to be embedded.
@@ -54,8 +53,17 @@ extern class IFrameElement extends Element
 		Is a `DOMSettableTokenList` that reflects the `sandbox` HTML attribute, indicating extra restrictions on the behavior of the nested content.
 	**/
 	var sandbox(default,null) : DOMTokenList;
+	
+	/**
+		Is a `Boolean` indicating whether the inline frame is willing to be placed into full screen mode. See Using full-screen mode for details.
+	**/
 	var allowFullscreen : Bool;
 	
+	/**
+		Is a `Boolean` indicating whether the Payment Request API may be invoked inside a cross-origin iframe.
+	**/
+	var allowPaymentRequest : Bool;
+	
 	/**
 		Is a `DOMString` that reflects the `width` HTML attribute, indicating the width of the frame.
 	**/
@@ -66,6 +74,11 @@ extern class IFrameElement extends Element
 	**/
 	var height : String;
 	
+	/**
+		Is a `DOMString` that reflects the `referrerPolicy` HTML attribute indicating which referrer to use when fetching the linked resource.
+	**/
+	var referrerPolicy : String;
+	
 	/**
 		Returns a `Document`, the active document in the inline frame's nested browsing context.
 	**/
diff --git a/std/js/html/Image.hx b/std/js/html/Image.hx
index f0e71f927494a02e1dc261fa0fffccd17bcea14c..1e28613510717081489c5ca814f590c54a3faeb4 100644
--- a/std/js/html/Image.hx
+++ b/std/js/html/Image.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("Image")
-extern class Image extends ImageElement
-{
+extern class Image extends ImageElement {
 	/** @throws DOMError */
 	function new( ?width : Int, ?height : Int ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ImageBitmap.hx b/std/js/html/ImageBitmap.hx
index 501ca2b4a07db3009f267d917ab6640f61aa318a..046330caab72f930f74c46d54b92d8f513cf5a3c 100644
--- a/std/js/html/ImageBitmap.hx
+++ b/std/js/html/ImageBitmap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ImageBitmap>
 **/
 @:native("ImageBitmap")
-extern class ImageBitmap
-{
+extern class ImageBitmap {
 	
 	/**
 		Is an `unsigned` `long` representing the width, in CSS pixels, of the `ImageData`.
diff --git a/std/js/html/ImageBitmapFormat.hx b/std/js/html/ImageBitmapFormat.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2a200b8c1eef486cb14362001d53d277c2a27609
--- /dev/null
+++ b/std/js/html/ImageBitmapFormat.hx
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ImageBitmap.webidl. Do not edit!
+
+package js.html;
+
+enum abstract ImageBitmapFormat(String) {
+	var RGBA32 = "RGBA32";
+	var BGRA32 = "BGRA32";
+	var RGB24 = "RGB24";
+	var BGR24 = "BGR24";
+	var GRAY8 = "GRAY8";
+	var YUV444P = "YUV444P";
+	var YUV422P = "YUV422P";
+	var YUV420P = "YUV420P";
+	var YUV420SP_NV12 = "YUV420SP_NV12";
+	var YUV420SP_NV21 = "YUV420SP_NV21";
+	var HSV = "HSV";
+	var LAB = "Lab";
+	var DEPTH = "DEPTH";
+}
\ No newline at end of file
diff --git a/std/js/html/ImageBitmapRenderingContext.hx b/std/js/html/ImageBitmapRenderingContext.hx
index 4ec411000ef9294972a162a61edd78498b30b2cb..5c8a92d96a99201560a8a2bee2f88a7e030c1916 100644
--- a/std/js/html/ImageBitmapRenderingContext.hx
+++ b/std/js/html/ImageBitmapRenderingContext.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,13 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ImageBitmapRenderingContext>
 **/
 @:native("ImageBitmapRenderingContext")
-extern class ImageBitmapRenderingContext
-{
+extern class ImageBitmapRenderingContext {
 	
 	/**
 		
-		 Displays the given `ImageBitmap` in the canvas associated with this rendering context. Ownership of the `ImageBitmap` is transferred to the canvas.
+		 Displays the given `ImageBitmap` in the canvas associated with this rendering context. Ownership of the `ImageBitmap` is transferred to the canvas. This was previously named `transferImageBitmap()`, but was renamed in a spec change. The old name is being kept as an alias to avoid code breakage.
 		 
 	**/
+	function transferFromImageBitmap( bitmap : ImageBitmap ) : Void;
 	function transferImageBitmap( bitmap : ImageBitmap ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ImageCapture.hx b/std/js/html/ImageCapture.hx
index ba0cd404f38d1991edd31d74b75b1989b45b9a15..9264464f35e738a2be6708d5597dafaae2c767f0 100644
--- a/std/js/html/ImageCapture.hx
+++ b/std/js/html/ImageCapture.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,15 +24,25 @@
 
 package js.html;
 
+/**
+	The `ImageCapture` interface of the MediaStream Image Capture API provides an interface for capturing images from a photographic device referenced through a valid `MediaStreamTrack`.
+
+	Documentation [ImageCapture](https://developer.mozilla.org/en-US/docs/Web/API/ImageCapture) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/ImageCapture$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/ImageCapture>
+**/
 @:native("ImageCapture")
-extern class ImageCapture extends EventTarget
-{
+extern class ImageCapture extends EventTarget {
 	var videoStreamTrack(default,null) : VideoStreamTrack;
 	var onphoto : haxe.Constraints.Function;
 	var onerror : haxe.Constraints.Function;
 	
 	/** @throws DOMError */
 	function new( track : VideoStreamTrack ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Takes a single exposure using the video capture device sourcing a `MediaStreamTrack` and returns a `Promise` that resolves with a `Blob` containing the data.
+		@throws DOMError
+	**/
 	function takePhoto() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/AppletElement.hx b/std/js/html/ImageCaptureError.hx
similarity index 71%
rename from std/js/html/AppletElement.hx
rename to std/js/html/ImageCaptureError.hx
index 11d8a17858913f72022405a0c27233557d80fa9a..d5c34d8e7f7044234bc39707cfe61253c2b43768 100644
--- a/std/js/html/AppletElement.hx
+++ b/std/js/html/ImageCaptureError.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,23 +20,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\HTMLAppletElement.webidl. Do not edit!
+// This file is generated from mozilla\ImageCaptureErrorEvent.webidl. Do not edit!
 
 package js.html;
 
-@:native("HTMLAppletElement")
-extern class AppletElement extends Element
-{
-	var align : String;
-	var alt : String;
-	var archive : String;
-	var code : String;
-	var codeBase : String;
-	var height : String;
-	var hspace : Int;
-	var name : String;
-	var object : String;
-	var vspace : Int;
-	var width : String;
+@:native("ImageCaptureError")
+extern class ImageCaptureError {
+	static inline var FRAME_GRAB_ERROR : Int = 1;
+	static inline var SETTINGS_ERROR : Int = 2;
+	static inline var PHOTO_ERROR : Int = 3;
+	static inline var ERROR_UNKNOWN : Int = 4;
+	
+	var code(default,null) : Int;
+	var message(default,null) : String;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/DOMTransaction.hx b/std/js/html/ImageCaptureErrorEvent.hx
similarity index 73%
rename from std/js/html/DOMTransaction.hx
rename to std/js/html/ImageCaptureErrorEvent.hx
index 834ffecad5293a6a15d14bc63f5cf1c31db49ecf..12cba449a4c61cce2db727a3df86cb2933cb8b53 100644
--- a/std/js/html/DOMTransaction.hx
+++ b/std/js/html/ImageCaptureErrorEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,17 +20,14 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DOMTransaction.webidl. Do not edit!
+// This file is generated from mozilla\ImageCaptureErrorEvent.webidl. Do not edit!
 
 package js.html;
 
-@:native("DOMTransaction")
-extern class DOMTransaction
-{
-	var label(default,null) : String;
-	var executeAutomatic(default,null) : Void -> Void;
-	var execute(default,null) : Void -> Void;
-	var undo(default,null) : Void -> Void;
-	var redo(default,null) : Void -> Void;
+@:native("ImageCaptureErrorEvent")
+extern class ImageCaptureErrorEvent extends Event {
+	var imageCaptureError(default,null) : ImageCaptureError;
 	
+	/** @throws DOMError */
+	function new( type : String, ?imageCaptureErrorInitDict : ImageCaptureErrorEventInit ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ImageCaptureErrorEventInit.hx b/std/js/html/ImageCaptureErrorEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..03042809c7a6b1ce8b2bbb3cf85c53ea747074ef
--- /dev/null
+++ b/std/js/html/ImageCaptureErrorEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ImageCaptureErrorEvent.webidl. Do not edit!
+
+package js.html;
+
+typedef ImageCaptureErrorEventInit = EventInit & {
+	var ?imageCaptureError : ImageCaptureError;
+}
\ No newline at end of file
diff --git a/std/js/html/ImageData.hx b/std/js/html/ImageData.hx
index c29546b11217df367146156eb0596ffd53a8696d..1633a051ab5e89aeb1e6aef7105707818cad0454 100644
--- a/std/js/html/ImageData.hx
+++ b/std/js/html/ImageData.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ImageData>
 **/
 @:native("ImageData")
-extern class ImageData
-{
+extern class ImageData {
 	
 	/**
 		Is an `unsigned` `long` representing the actual width, in pixels, of the `ImageData`.
@@ -48,9 +47,9 @@ extern class ImageData
 	/**
 		Is a `Uint8ClampedArray` representing a one-dimensional array containing the data in the RGBA order, with integer values between `0` and `255` (included).
 	**/
-	var data(default,null) : Uint8ClampedArray;
+	var data(default,null) : js.lib.Uint8ClampedArray;
 	
 	/** @throws DOMError */
 	@:overload( function( sw : Int, sh : Int ) : Void {} )
-	function new( data : Uint8ClampedArray, sw : Int, ?sh : Int ) : Void;
+	function new( data : js.lib.Uint8ClampedArray, sw : Int, ?sh : Int ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ImageElement.hx b/std/js/html/ImageElement.hx
index eedc09035002eba3180dd2aaa4615da456ab8553..2f2220b99ae7ea61f33b29491af04a95ad6ec78a 100644
--- a/std/js/html/ImageElement.hx
+++ b/std/js/html/ImageElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement>
 **/
 @:native("HTMLImageElement")
-extern class ImageElement extends Element
-{
+extern class ImageElement extends Element {
 	
 	/**
 		Is a `DOMString` that reflects the `alt` HTML attribute,  thus indicating fallback context for the image.
@@ -60,6 +59,11 @@ extern class ImageElement extends Element
 	**/
 	var useMap : String;
 	
+	/**
+		Is a `DOMString` that reflects the `referrerpolicy` HTML attribute indicating which referrer to use in order to fetch the image.
+	**/
+	var referrerPolicy : String;
+	
 	/**
 		Is a `Boolean` that reflects the `ismap` HTML attribute, indicating that the image is part of a server-side image map.
 	**/
@@ -75,6 +79,11 @@ extern class ImageElement extends Element
 	**/
 	var height : Int;
 	
+	/**
+		Returns a `DOMString` representing a hint given to the browser on how it should decode the image.
+	**/
+	var decoding : String;
+	
 	/**
 		Returns a `unsigned long` representing the intrinsic width of the image in CSS pixels, if it is available; otherwise, it will show `0`.
 	**/
@@ -96,7 +105,7 @@ extern class ImageElement extends Element
 	var name : String;
 	
 	/**
-		Is a `DOMString` indicating the alignment of the image with respect to the surrounding context.
+		Is a `DOMString` indicating the alignment of the image with respect to the surrounding context. The possible values are `"left"`, `"right"`, `"justify"`, and `"center"`.
 	**/
 	var align : String;
 	
@@ -129,6 +138,10 @@ extern class ImageElement extends Element
 		Returns a `DOMString` representing the URL to the currently displayed image (which may change, for example in response to media queries).
 	**/
 	var currentSrc(default,null) : String;
+	
+	/**
+		Is a `DOMString` that refers to a low-quality (but faster to load) copy of the image.
+	**/
 	var lowsrc : String;
 	
 	/**
diff --git a/std/js/html/InputElement.hx b/std/js/html/InputElement.hx
index 59b821ca72e9128ea8a79487273e76e1aaed7cfb..b1c4c3ca560e9d38aa152128ab5fd242406553f0 100644
--- a/std/js/html/InputElement.hx
+++ b/std/js/html/InputElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement>
 **/
 @:native("HTMLInputElement")
-extern class InputElement extends Element
-{
+extern class InputElement extends Element {
 	var accept : String;
 	var alt : String;
 	var autocomplete : String;
@@ -42,7 +41,7 @@ extern class InputElement extends Element
 	var checked : Bool;
 	var disabled : Bool;
 	var form(default,null) : FormElement;
-	var files(default,null) : FileList;
+	var files : FileList;
 	var formAction : String;
 	var formEnctype : String;
 	var formMethod : String;
@@ -54,6 +53,7 @@ extern class InputElement extends Element
 	var max : String;
 	var maxLength : Int;
 	var min : String;
+	var minLength : Int;
 	var multiple : Bool;
 	var name : String;
 	var pattern : String;
@@ -66,11 +66,13 @@ extern class InputElement extends Element
 	var type : String;
 	var defaultValue : String;
 	var value : String;
+	var valueAsDate : Date;
 	var valueAsNumber : Float;
 	var width : Int;
 	var willValidate(default,null) : Bool;
 	var validity(default,null) : ValidityState;
 	var validationMessage(default,null) : String;
+	var labels(default,null) : NodeList;
 	var selectionStart : Int;
 	var selectionEnd : Int;
 	var selectionDirection : String;
@@ -86,7 +88,6 @@ extern class InputElement extends Element
 	var useMap : String;
 	var textLength(default,null) : Int;
 	
-	/** @throws DOMError */
 	
 	/**
 		Increments the `value` by (`step` * n), where n defaults to 1 if not specified. Throws an INVALID_STATE_ERR exception:
@@ -97,9 +98,9 @@ extern class InputElement extends Element
 		  if the resulting value is above the `max` or below the `min`.
 		 
 		 
+		@throws DOMError
 	**/
-	function stepUp( ?n : Int = 1 ) : Void;
-	/** @throws DOMError */
+	function stepUp( n : Int = 1 ) : Void;
 	
 	/**
 		Decrements the `value` by (`step` * n), where n defaults to 1 if not specified. Throws an INVALID_STATE_ERR exception:
@@ -110,14 +111,16 @@ extern class InputElement extends Element
 		  if the resulting value is above the `max` or below the `min`. 
 		 
 		 
+		@throws DOMError
 	**/
-	function stepDown( ?n : Int = 1 ) : Void;
+	function stepDown( n : Int = 1 ) : Void;
 	function checkValidity() : Bool;
+	function reportValidity() : Bool;
 	function setCustomValidity( error : String ) : Void;
 	function select() : Void;
 	/** @throws DOMError */
 	@:overload( function( replacement : String ) : Void {} )
-	function setRangeText( replacement : String, start : Int, end : Int, ?selectionMode : SelectionMode = "preserve" ) : Void;
+	function setRangeText( replacement : String, start : Int, end : Int, selectionMode : SelectionMode = PRESERVE ) : Void;
 	/** @throws DOMError */
 	function setSelectionRange( start : Int, end : Int, ?direction : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/InputEvent.hx b/std/js/html/InputEvent.hx
index e2be4261562893fcba3dfae39387c7b242dd973b..61cc903a31063fdb8e5968bc71068aa810f56880 100644
--- a/std/js/html/InputEvent.hx
+++ b/std/js/html/InputEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/InputEvent>
 **/
 @:native("InputEvent")
-extern class InputEvent extends UIEvent
-{
+extern class InputEvent extends UIEvent {
 	
 	/**
 		Returns a `Boolean` value indicating if the event is fired after `compositionstart` and before `compositionend`.
diff --git a/std/js/html/InputEventInit.hx b/std/js/html/InputEventInit.hx
index ecde91eb864e00ea11929a38d80991a587f060d7..71dfde2466044fcbc1a204b16bd5a03fd0a7a3e7 100644
--- a/std/js/html/InputEventInit.hx
+++ b/std/js/html/InputEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
 
 package js.html;
 
-typedef InputEventInit =
-{
-	> UIEventInit,
-	@:optional var isComposing : Bool;
+typedef InputEventInit = UIEventInit & {
+	var ?isComposing : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/Int16Array.hx b/std/js/html/Int16Array.hx
index ef0c92bd76af7a165e487288c70c39872ceb39c6..c656f9c5890aba0d6e61acb742db0553a94b351e 100644
--- a/std/js/html/Int16Array.hx
+++ b/std/js/html/Int16Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,23 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-@:native("Int16Array")
-extern class Int16Array extends ArrayBufferView implements ArrayAccess<Int>
-{
-	static inline var BYTES_PER_ELEMENT : Int = 2;
-	
-	var length(default,null) : Int;
-	
-	/** @throws DOMError */
-	@:overload( function( length : Int ) : Void {} )
-	@:overload( function( array : Int16Array ) : Void {} )
-	@:overload( function( array : Array<Int> ) : Void {} )
-	function new( buffer : ArrayBuffer, ?byteOffset : Int, ?length : Int ) : Void;
-	@:overload( function( array : Int16Array, ?offset : Int ) : Void {} )
-	function set( array : Array<Int>, ?offset : Int ) : Void;
-	function subarray( start : Int, ?end : Int ) : Int16Array;
-}
\ No newline at end of file
+@:deprecated typedef Int16Array = js.lib.Int16Array;
diff --git a/std/js/html/Int32Array.hx b/std/js/html/Int32Array.hx
index 5bb64340d865851653c8f8ed48d7606e4e3a4505..d69dad96a9b60c5799480fe3d6ce86a4a268e403 100644
--- a/std/js/html/Int32Array.hx
+++ b/std/js/html/Int32Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,23 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-@:native("Int32Array")
-extern class Int32Array extends ArrayBufferView implements ArrayAccess<Int>
-{
-	static inline var BYTES_PER_ELEMENT : Int = 4;
-	
-	var length(default,null) : Int;
-	
-	/** @throws DOMError */
-	@:overload( function( length : Int ) : Void {} )
-	@:overload( function( array : Int32Array ) : Void {} )
-	@:overload( function( array : Array<Int> ) : Void {} )
-	function new( buffer : ArrayBuffer, ?byteOffset : Int, ?length : Int ) : Void;
-	@:overload( function( array : Int32Array, ?offset : Int ) : Void {} )
-	function set( array : Array<Int>, ?offset : Int ) : Void;
-	function subarray( start : Int, ?end : Int ) : Int32Array;
-}
\ No newline at end of file
+@:deprecated typedef Int32Array = js.lib.Int32Array;
diff --git a/std/js/html/Int8Array.hx b/std/js/html/Int8Array.hx
index 777a31cbbd7e00b82b5a357b9bf67a154cec810d..e70098a763d4a50aa1b49d1fc0441c2a6468bec3 100644
--- a/std/js/html/Int8Array.hx
+++ b/std/js/html/Int8Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,23 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-@:native("Int8Array")
-extern class Int8Array extends ArrayBufferView implements ArrayAccess<Int>
-{
-	static inline var BYTES_PER_ELEMENT : Int = 1;
-	
-	var length(default,null) : Int;
-	
-	/** @throws DOMError */
-	@:overload( function( length : Int ) : Void {} )
-	@:overload( function( array : Int8Array ) : Void {} )
-	@:overload( function( array : Array<Int> ) : Void {} )
-	function new( buffer : ArrayBuffer, ?byteOffset : Int, ?length : Int ) : Void;
-	@:overload( function( array : Int8Array, ?offset : Int ) : Void {} )
-	function set( array : Array<Int>, ?offset : Int ) : Void;
-	function subarray( start : Int, ?end : Int ) : Int8Array;
-}
\ No newline at end of file
+@:deprecated typedef Int8Array = js.lib.Int8Array;
diff --git a/std/js/html/IntersectionObserver.hx b/std/js/html/IntersectionObserver.hx
new file mode 100644
index 0000000000000000000000000000000000000000..271e52fbb9c1079e487df2e4860a3308c7c1d4f3
--- /dev/null
+++ b/std/js/html/IntersectionObserver.hx
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\IntersectionObserver.webidl. Do not edit!
+
+package js.html;
+
+/**
+	provides a way to asynchronously observe changes in the intersection of a target element with an ancestor element or with a top-level document's viewport.
+
+	Documentation [IntersectionObserver](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver>
+**/
+@:native("IntersectionObserver")
+extern class IntersectionObserver {
+	
+	/**
+		A specific ancestor of the target `element` being observed. If no value was passed to the constructor or this is `null`, the top-level document's viewport is used.
+	**/
+	var root(default,null) : Element;
+	
+	/**
+		An offset rectangle applied to the root's `bounding box` when calculating intersections, effectively shrinking or growing the root for calculation purposes. The value returned by this property may not be the same as the one specified when calling the constructor as it may be changed to match internal requirements. Each offset can be expressed in pixels (`px`) or as a percentage (`%`). The default is "0px 0px 0px 0px".
+	**/
+	var rootMargin(default,null) : String;
+	
+	/**
+		A list of thresholds, sorted in increasing numeric order, where each threshold is a ratio of intersection area to bounding box area of an observed target. Notifications for a target are generated when any of the thresholds are crossed for that target. If no value was passed to the constructor, 0 is used.
+	**/
+	var thresholds(default,null) : Array<Float>;
+	
+	/** @throws DOMError */
+	function new( intersectionCallback : Array<IntersectionObserverEntry> -> IntersectionObserver -> Void, ?options : IntersectionObserverInit ) : Void;
+	
+	/**
+		Tells the `IntersectionObserver` a target element to observe.
+	**/
+	function observe( target : Element ) : Void;
+	
+	/**
+		Tells the `IntersectionObserver` to stop observing a particular target element.
+	**/
+	function unobserve( target : Element ) : Void;
+	
+	/**
+		Stops the `IntersectionObserver` object from observing any target.
+	**/
+	function disconnect() : Void;
+	
+	/**
+		Returns an array of `IntersectionObserverEntry` objects for all observed targets.
+	**/
+	function takeRecords() : Array<IntersectionObserverEntry>;
+}
\ No newline at end of file
diff --git a/std/js/html/IntersectionObserverEntry.hx b/std/js/html/IntersectionObserverEntry.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ac9d5726e45c03695d8bdb4240ac07b8385ad19f
--- /dev/null
+++ b/std/js/html/IntersectionObserverEntry.hx
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\IntersectionObserver.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `IntersectionObserverEntry` interface of the Intersection Observer API describes the intersection between the target element and its root container at a specific moment of transition.
+
+	Documentation [IntersectionObserverEntry](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserverEntry) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserverEntry$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserverEntry>
+**/
+@:native("IntersectionObserverEntry")
+extern class IntersectionObserverEntry {
+	
+	/**
+		A `DOMHighResTimeStamp` indicating the time at which the intersection was recorded, relative to the `IntersectionObserver`'s time origin.
+	**/
+	var time(default,null) : Float;
+	
+	/**
+		Returns a `DOMRectReadOnly` for the intersection observer's root.
+	**/
+	var rootBounds(default,null) : DOMRectReadOnly;
+	
+	/**
+		Returns the bounds rectangle of the target element as a `DOMRectReadOnly`. The bounds are computed as described in the documentation for `Element.getBoundingClientRect()`.
+	**/
+	var boundingClientRect(default,null) : DOMRectReadOnly;
+	
+	/**
+		Returns a `DOMRectReadOnly` representing the target's visible area.
+	**/
+	var intersectionRect(default,null) : DOMRectReadOnly;
+	
+	/**
+		A Boolean value which is `true` if the target element intersects with the intersection observer's root. If this is `true`, then, the `IntersectionObserverEntry` describes a transition into a state of intersection; if it's `false`, then you know the transition is from intersecting to not-intersecting.
+	**/
+	var isIntersecting(default,null) : Bool;
+	
+	/**
+		Returns the ratio of the `intersectionRect` to the `boundingClientRect`.
+	**/
+	var intersectionRatio(default,null) : Float;
+	
+	/**
+		The `Element` whose intersection with the root changed.
+	**/
+	var target(default,null) : Element;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/IntersectionObserverInit.hx b/std/js/html/IntersectionObserverInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..709f0634dd2f5e316a0542b910100a043ab85c0a
--- /dev/null
+++ b/std/js/html/IntersectionObserverInit.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\IntersectionObserver.webidl. Do not edit!
+
+package js.html;
+
+typedef IntersectionObserverInit = {
+	var ?root : Element;
+	var ?rootMargin : String;
+	var ?threshold : haxe.extern.EitherType<Float,Array<Float>>;
+}
\ No newline at end of file
diff --git a/std/js/html/DOMTransactionEvent.hx b/std/js/html/IntlUtils.hx
similarity index 77%
rename from std/js/html/DOMTransactionEvent.hx
rename to std/js/html/IntlUtils.hx
index 73417bf4839dc88c6a62631321a0ac22789444bb..5297079d3caffe6a88a56632caf6c02fa4c9fbf6 100644
--- a/std/js/html/DOMTransactionEvent.hx
+++ b/std/js/html/IntlUtils.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,15 +20,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DOMTransactionEvent.webidl. Do not edit!
+// This file is generated from mozilla\IntlUtils.webidl. Do not edit!
 
 package js.html;
 
-@:native("DOMTransactionEvent")
-extern class DOMTransactionEvent extends Event
-{
-	var transactions(default,null) : Dynamic;
-	
+typedef IntlUtils = {
 	/** @throws DOMError */
-	function new( type : String, ?eventInitDict : DOMTransactionEventInit ) : Void;
+	function getDisplayNames( locales : Array<String>, ?options : DisplayNameOptions ) : DisplayNameResult;
+	/** @throws DOMError */
+	function getLocaleInfo( locales : Array<String> ) : LocaleInfo;
 }
\ No newline at end of file
diff --git a/std/js/html/IterationCompositeOperation.hx b/std/js/html/IterationCompositeOperation.hx
index ffeaea4f55df74e4fb2123e68e13bc9ee076892d..5743f9dc354b62a0e6379df63521d0a46589e9f2 100644
--- a/std/js/html/IterationCompositeOperation.hx
+++ b/std/js/html/IterationCompositeOperation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract IterationCompositeOperation(String)
-{
+enum abstract IterationCompositeOperation(String) {
 	var REPLACE = "replace";
 	var ACCUMULATE = "accumulate";
 }
\ No newline at end of file
diff --git a/std/js/html/KeyEvent.hx b/std/js/html/KeyEvent.hx
index 163e2106d6661130c29d5796f8c117a86dc4b854..b1c81ff5fb410edbdb535cdf4146e9c3be9d606f 100644
--- a/std/js/html/KeyEvent.hx
+++ b/std/js/html/KeyEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("KeyEvent")
-extern class KeyEvent
-{
+extern class KeyEvent {
 	static inline var DOM_VK_CANCEL : Int = 3;
 	static inline var DOM_VK_HELP : Int = 6;
 	static inline var DOM_VK_BACK_SPACE : Int = 8;
@@ -190,6 +189,7 @@ extern class KeyEvent
 	static inline var DOM_VK_ALTGR : Int = 225;
 	static inline var DOM_VK_WIN_ICO_HELP : Int = 227;
 	static inline var DOM_VK_WIN_ICO_00 : Int = 228;
+	static inline var DOM_VK_PROCESSKEY : Int = 229;
 	static inline var DOM_VK_WIN_ICO_CLEAR : Int = 230;
 	static inline var DOM_VK_WIN_OEM_RESET : Int = 233;
 	static inline var DOM_VK_WIN_OEM_JUMP : Int = 234;
@@ -213,5 +213,5 @@ extern class KeyEvent
 	static inline var DOM_VK_PA1 : Int = 253;
 	static inline var DOM_VK_WIN_OEM_CLEAR : Int = 254;
 	
-	function initKeyEvent( type : String, canBubble : Bool, cancelable : Bool, view : Window, ctrlKey : Bool, altKey : Bool, shiftKey : Bool, metaKey : Bool, keyCode : Int, charCode : Int ) : Void;
+	function initKeyEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?view : Window, ctrlKey : Bool = false, altKey : Bool = false, shiftKey : Bool = false, metaKey : Bool = false, keyCode : Int = 0, charCode : Int = 0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/KeyboardEvent.hx b/std/js/html/KeyboardEvent.hx
index 3ac8d4fc5695d9adace09f2efcd63f6e0f290a2e..9585d6c4e61b690f7482ecabc905535ee38042c3 100644
--- a/std/js/html/KeyboardEvent.hx
+++ b/std/js/html/KeyboardEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	`KeyboardEvent` objects describe a user interaction with the keyboard. Each event describes a key; the event type (`keydown`, `keypress`, or `keyup`) identifies what kind of activity was performed.
+	`KeyboardEvent` objects describe a user interaction with the keyboard; each event describes a single interaction between the user and a key (or combination of a key with modifier keys) on the keyboard.
 
 	Documentation [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent>
 **/
 @:native("KeyboardEvent")
-extern class KeyboardEvent extends UIEvent
-{
+extern class KeyboardEvent extends UIEvent {
 	static inline var DOM_KEY_LOCATION_STANDARD : Int = 0;
 	static inline var DOM_KEY_LOCATION_LEFT : Int = 1;
 	static inline var DOM_KEY_LOCATION_RIGHT : Int = 2;
@@ -201,6 +200,7 @@ extern class KeyboardEvent extends UIEvent
 	static inline var DOM_VK_ALTGR : Int = 225;
 	static inline var DOM_VK_WIN_ICO_HELP : Int = 227;
 	static inline var DOM_VK_WIN_ICO_00 : Int = 228;
+	static inline var DOM_VK_PROCESSKEY : Int = 229;
 	static inline var DOM_VK_WIN_ICO_CLEAR : Int = 230;
 	static inline var DOM_VK_WIN_OEM_RESET : Int = 233;
 	static inline var DOM_VK_WIN_OEM_JUMP : Int = 234;
@@ -279,16 +279,27 @@ extern class KeyboardEvent extends UIEvent
 	**/
 	var key(default,null) : String;
 	
+	/**
+		Returns a `DOMString` with the code value of the key represented by the event.
+	**/
+	var code(default,null) : String;
+	
 	/** @throws DOMError */
 	function new( typeArg : String, ?keyboardEventInitDict : KeyboardEventInit ) : Void;
 	
 	/**
-		Returns a `Boolean` indicating if the modifier key, like Alt, Shift, Ctrl, or Meta, was pressed when the event was created.
+		Returns a `Boolean` indicating if a modifier key such as Alt, Shift, Ctrl, or Meta, was pressed when the event was created.
 	**/
 	function getModifierState( key : String ) : Bool;
 	
 	/**
-		Initializes a `KeyboardEvent` object. This has only been implemented by Gecko (others used `KeyboardEvent.initKeyboardEvent()`) and should not be used any more. The standard modern way is to use the `KeyboardEvent.KeyboardEvent` constructor.
+		Initializes a `KeyboardEvent` object. This is now deprecated. You should instead use the `KeyboardEvent.KeyboardEvent` constructor.
+		@throws DOMError
+	**/
+	function initKeyboardEvent( typeArg : String, bubblesArg : Bool = false, cancelableArg : Bool = false, ?viewArg : Window, keyArg : String = "", locationArg : Int = 0, ctrlKey : Bool = false, altKey : Bool = false, shiftKey : Bool = false, metaKey : Bool = false ) : Void;
+	
+	/**
+		Initializes a `KeyboardEvent` object. This was implemented only by Firefox, and is no longer supported even there; instead, you should use the `KeyboardEvent.KeyboardEvent` constructor.
 	**/
-	function initKeyEvent( type : String, canBubble : Bool, cancelable : Bool, view : Window, ctrlKey : Bool, altKey : Bool, shiftKey : Bool, metaKey : Bool, keyCode : Int, charCode : Int ) : Void;
+	function initKeyEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?view : Window, ctrlKey : Bool = false, altKey : Bool = false, shiftKey : Bool = false, metaKey : Bool = false, keyCode : Int = 0, charCode : Int = 0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/KeyboardEventInit.hx b/std/js/html/KeyboardEventInit.hx
index cc0d151df705a5b50c2419fab54eca4f48dd5415..522040f4d151ab38bc7bb9ab946a02aa38489658 100644
--- a/std/js/html/KeyboardEventInit.hx
+++ b/std/js/html/KeyboardEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,15 +24,13 @@
 
 package js.html;
 
-typedef KeyboardEventInit =
-{
-	> EventModifierInit,
-	@:optional var charCode : Int;
-	@:optional var code : String;
-	@:optional var isComposing : Bool;
-	@:optional var key : String;
-	@:optional var keyCode : Int;
-	@:optional var location : Int;
-	@:optional var repeat : Bool;
-	@:optional var which : Int;
+typedef KeyboardEventInit = EventModifierInit & {
+	var ?charCode : Int;
+	var ?code : String;
+	var ?isComposing : Bool;
+	var ?key : String;
+	var ?keyCode : Int;
+	var ?location : Int;
+	var ?repeat : Bool;
+	var ?which : Int;
 }
\ No newline at end of file
diff --git a/std/js/html/KeyframeAnimationOptions.hx b/std/js/html/KeyframeAnimationOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ad2abe89fc944a6f735d08ea26fc9d8019aa22a4
--- /dev/null
+++ b/std/js/html/KeyframeAnimationOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Animatable.webidl. Do not edit!
+
+package js.html;
+
+typedef KeyframeAnimationOptions = KeyframeEffectOptions & {
+	var ?id : String;
+}
\ No newline at end of file
diff --git a/std/js/html/KeyframeEffect.hx b/std/js/html/KeyframeEffect.hx
index 7463cf95a1616a2fbaf93af37faafeab5726dc60..4325964821644cede03f8c9c2b7ebdaf07cd9877 100644
--- a/std/js/html/KeyframeEffect.hx
+++ b/std/js/html/KeyframeEffect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,26 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/KeyframeEffect>
 **/
 @:native("KeyframeEffect")
-extern class KeyframeEffect extends KeyframeEffectReadOnly
-{
+extern class KeyframeEffect extends AnimationEffect {
+	
+	/**
+		Gets and sets the element or pseudo-element being animated by this object. This may be `null` for animations that do not target a specific element.
+	**/
+	var target : haxe.extern.EitherType<Element,CSSPseudoElement>;
+	
 	/** @throws DOMError */
-	function new( target : haxe.extern.EitherType<Element,CSSPseudoElement>, frames : Dynamic, ?options : haxe.extern.EitherType<Float,Dynamic/*MISSING KeyframeEffectOptions*/> ) : Void;
+	@:overload( function( target : haxe.extern.EitherType<Element,CSSPseudoElement>, keyframes : Dynamic, ?options : haxe.extern.EitherType<Float,KeyframeEffectOptions> ) : Void {} )
+	function new( source : KeyframeEffect ) : Void;
+	
+	/**
+		Returns the computed keyframes that make up this effect along with their computed keyframe offsets.
+		@throws DOMError
+	**/
+	function getKeyframes() : Array<Dynamic>;
+	
+	/**
+		Replaces the set of keyframes that make up this effect.
+		@throws DOMError
+	**/
+	function setKeyframes( keyframes : Dynamic ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/KeyframeEffectOptions.hx b/std/js/html/KeyframeEffectOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e95f1d2769942d5caedcfcbbda10fb14db395a03
--- /dev/null
+++ b/std/js/html/KeyframeEffectOptions.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\KeyframeEffect.webidl. Do not edit!
+
+package js.html;
+
+typedef KeyframeEffectOptions = EffectTiming & {
+	var ?composite : CompositeOperation;
+	var ?iterationComposite : IterationCompositeOperation;
+}
\ No newline at end of file
diff --git a/std/js/html/KeyframeEffectReadOnly.hx b/std/js/html/KeyframeEffectReadOnly.hx
deleted file mode 100644
index 1601473c00f1312ec4166bb97f36145cb30de37e..0000000000000000000000000000000000000000
--- a/std/js/html/KeyframeEffectReadOnly.hx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-// This file is generated from mozilla\KeyframeEffect.webidl. Do not edit!
-
-package js.html;
-
-/**
-	The `KeyframeEffectReadOnly` interface of the Web Animations API describes sets of animatable properties and values that can be played using the `Animation.Animation()` constructor, and which are inherited by `KeyframeEffect`.
-
-	Documentation [KeyframeEffectReadOnly](https://developer.mozilla.org/en-US/docs/Web/API/KeyframeEffectReadOnly) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/KeyframeEffectReadOnly$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
-
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/KeyframeEffectReadOnly>
-**/
-@:native("KeyframeEffectReadOnly")
-extern class KeyframeEffectReadOnly extends AnimationEffectReadOnly
-{
-	
-	/**
-		The element or pseudo-element being animated by this object. This may be `null` for animations that do not target a specific element.
-	**/
-	var target(default,null) : haxe.extern.EitherType<Element,CSSPseudoElement>;
-	
-	/**
-		The iteration composite operation for resolving the property value changes of this keyframe effect.
-	**/
-	var iterationComposite(default,null) : IterationCompositeOperation;
-	
-	/**
-		The composite operation property for resolving the property value changes between this and other keyframe effects.
-	**/
-	var composite(default,null) : CompositeOperation;
-	
-	/**
-		The temporal spacing of the keyframe effect's iterations
-	**/
-	var spacing(default,null) : String;
-	
-	/** @throws DOMError */
-	function new( target : haxe.extern.EitherType<Element,CSSPseudoElement>, frames : Dynamic, ?options : haxe.extern.EitherType<Float,Dynamic/*MISSING KeyframeEffectOptions*/> ) : Void;
-	/** @throws DOMError */
-	function getFrames() : Array<Dynamic>;
-}
\ No newline at end of file
diff --git a/std/js/html/LIElement.hx b/std/js/html/LIElement.hx
index 6f2d582c89c14f90d42d9404c5d6e7fc7ce99d8c..e7111bb55a4c13ba8e65f964fd85e0ab15f5a1c1 100644
--- a/std/js/html/LIElement.hx
+++ b/std/js/html/LIElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `HTMLLIElement` interface expose specific properties and methods (beyond those defined by regular `HTMLElement` interface it also has available to it by inheritance) for manipulating list elements.
+	The `HTMLLIElement` interface exposes specific properties and methods (beyond those defined by regular `HTMLElement` interface it also has available to it by inheritance) for manipulating list elements.
 
 	Documentation [HTMLLIElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLIElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLIElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLLIElement>
 **/
 @:native("HTMLLIElement")
-extern class LIElement extends Element
-{
+extern class LIElement extends Element {
 	
 	/**
 		Is a `long` indicating the ordinal position of the list element inside a given `ol`. It reflects the `value` attribute of the HTML `li` element, and can be smaller than `0`. If the `li` element is not a child of an `ol` element, the property has no meaning.
diff --git a/std/js/html/LabelElement.hx b/std/js/html/LabelElement.hx
index 1dbcff2ba796675821ed3ca5a482719ae2028e7c..0a59417952f863a7db27edc670556ef38c0253d9 100644
--- a/std/js/html/LabelElement.hx
+++ b/std/js/html/LabelElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement>
 **/
 @:native("HTMLLabelElement")
-extern class LabelElement extends Element
-{
+extern class LabelElement extends Element {
 	
 	/**
 		Is a `HTMLFormElement` object representing the form with which the labeled control is associated, or `null` if there is no associated control, or if that control isn't associated with a form. In other words, this is just a shortcut for `HTMLLabelElement.control.form`.
diff --git a/std/js/html/LegendElement.hx b/std/js/html/LegendElement.hx
index fb9de63549b7f4078f0cd9d72bc9e0ef69c1790f..c515f47dc405e293c05aa06f1d303c9d166d2129 100644
--- a/std/js/html/LegendElement.hx
+++ b/std/js/html/LegendElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLLegendElement>
 **/
 @:native("HTMLLegendElement")
-extern class LegendElement extends Element
-{
+extern class LegendElement extends Element {
 	var form(default,null) : FormElement;
 	var align : String;
 	
diff --git a/std/js/html/LineAlignSetting.hx b/std/js/html/LineAlignSetting.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1c564b661a2f3203d3cf0f7f3d1cb1706542c581
--- /dev/null
+++ b/std/js/html/LineAlignSetting.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\VTTCue.webidl. Do not edit!
+
+package js.html;
+
+enum abstract LineAlignSetting(String) {
+	var START = "start";
+	var CENTER = "center";
+	var END = "end";
+}
\ No newline at end of file
diff --git a/std/js/html/LinkElement.hx b/std/js/html/LinkElement.hx
index 20edd9ce20b81d18fde8780ee38b5f2ed760f96f..f8eaba10d1b8562edee2978f2837f9ce6f7d55d8 100644
--- a/std/js/html/LinkElement.hx
+++ b/std/js/html/LinkElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLLinkElement>
 **/
 @:native("HTMLLinkElement")
-extern class LinkElement extends Element
-{
+extern class LinkElement extends Element {
 	
 	/**
 		Is a `Boolean` which represents whether the link is disabled; currently only used with style sheet links.
@@ -75,6 +74,11 @@ extern class LinkElement extends Element
 	**/
 	var type : String;
 	
+	/**
+		Is a `DOMString` that reflects the `referrerpolicy` HTML attribute indicating which referrer to use.
+	**/
+	var referrerPolicy : String;
+	
 	/**
 		Is a `DOMSettableTokenList` that reflects the `sizes` HTML attribute, as a list of tokens.
 	**/
@@ -87,6 +91,8 @@ extern class LinkElement extends Element
 	
 	/**
 		Is a `DOMString` representing the reverse relationship of the linked resource from the resource to the document.
+		 Note: Currently the W3C HTML 5.2 spec states that `rev` is no longer obsolete, whereas the WHATWG living standard still has it labeled obsolete. Until this discrepancy is resolved, you should still assume it is obsolete.
+		 
 	**/
 	var rev : String;
 	
@@ -94,9 +100,12 @@ extern class LinkElement extends Element
 		Is a `DOMString` representing the name of the target frame to which the resource applies.
 	**/
 	var target : String;
-	@:native("import")
-	var import_(default,null) : HTMLDocument;
 	var integrity : String;
+	
+	/**
+		Is a `DOMString` representing the type of content being loaded by the HTML link.
+	**/
+	var as : String;
 	var sheet(default,null) : StyleSheet;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/LocalMediaStream.hx b/std/js/html/LocalMediaStream.hx
index a046321fcd2889fd70629f5e5cec4115c39e6dd6..924f7a1d0a2ee5975ca1897ade63cc9f68ce8473 100644
--- a/std/js/html/LocalMediaStream.hx
+++ b/std/js/html/LocalMediaStream.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,18 +25,13 @@
 package js.html;
 
 /**
-	The `LocalMediaStream` interface represents a stream of media content fetched from a local data source. This is the interface returned by `getUserMedia()`.
+	The `LocalMediaStream` interface was part of the Media Capture and Streams API, representing a stream of data being generated locally (such as by `getUserMedia()`. However, `getUserMedia()` now returns a `MediaStream` instead, and this interface has been removed from the specification.
 
 	Documentation [LocalMediaStream](https://developer.mozilla.org/en-US/docs/Web/API/LocalMediaStream) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/LocalMediaStream$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/LocalMediaStream>
 **/
 @:native("LocalMediaStream")
-extern class LocalMediaStream extends MediaStream
-{
-	
-	/**
-		Stops the stream. When the source of the stream is a connected device (such as a camera or microphone), stops capture on the device.
-	**/
+extern class LocalMediaStream extends MediaStream {
 	function stop() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/LocaleInfo.hx b/std/js/html/LocaleInfo.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3d2bd0219256ade8185368f0b2fe1a376a34548c
--- /dev/null
+++ b/std/js/html/LocaleInfo.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\IntlUtils.webidl. Do not edit!
+
+package js.html;
+
+typedef LocaleInfo = {
+	var ?direction : String;
+	var ?locale : String;
+}
\ No newline at end of file
diff --git a/std/js/html/Location.hx b/std/js/html/Location.hx
index 8686bcf46cfecaac4364d3e87c9ca230212e5e0f..ed71687ad63c73d58ec3f5eb5ca480d909c6ab28 100644
--- a/std/js/html/Location.hx
+++ b/std/js/html/Location.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Location>
 **/
 @:native("Location")
-extern class Location
-{
+extern class Location {
 	
 	/**
 		Is a `DOMString` containing the entire URL. If changed, the associated document navigates to the new page. It can be set from a different origin than the associated document.
@@ -71,7 +70,7 @@ extern class Location
 	var pathname : String;
 	
 	/**
-		Is a `DOMString` containing a `'?'` followed by the parameters of the URL. Also known as "querystring".
+		Is a `DOMString` containing a `'?'` followed by the parameters or "querystring" of the URL. Modern browsers provide URLSearchParams and URL.searchParams to make it easy to parse out the parameters from the querystring.
 	**/
 	var search : String;
 	
@@ -80,22 +79,22 @@ extern class Location
 	**/
 	var hash : String;
 	
-	/** @throws DOMError */
 	
 	/**
 		Loads the resource at the URL provided in parameter.
+		@throws DOMError
 	**/
 	function assign( url : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Replaces the current resource with the one at the provided URL. The difference from the `assign()` method is that after using `replace()` the current page will not be saved in session `History`, meaning the user won't be able to use the back button to navigate to it.
+		@throws DOMError
 	**/
 	function replace( url : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Reloads the resource from the current URL. Its optional unique parameter is a `Boolean`, which, when it is `true`, causes the page to always be reloaded from the server. If it is `false` or not specified, the browser may reload the page from its cache.
+		@throws DOMError
 	**/
-	function reload( ?forceget : Bool = false ) : Void;
+	function reload( forceget : Bool = false ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/MapElement.hx b/std/js/html/MapElement.hx
index 672e2581511e881fbe73a3d6f782dd3c40d5291d..4cf811d296695f0c42e80fa8404ac8836d0973ae 100644
--- a/std/js/html/MapElement.hx
+++ b/std/js/html/MapElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLMapElement>
 **/
 @:native("HTMLMapElement")
-extern class MapElement extends Element
-{
+extern class MapElement extends Element {
 	
 	/**
 		Is a `DOMString` representing the `map` element for referencing it other context. If the `id` attribute is set, this must have the same value; and it cannot be `null` or empty.
diff --git a/std/js/html/MediaDeviceInfo.hx b/std/js/html/MediaDeviceInfo.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bdca8ed487466ef97a194ada6fbf13fd373c801e
--- /dev/null
+++ b/std/js/html/MediaDeviceInfo.hx
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaDeviceInfo.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `MediaDevicesInfo` interface contains information that describes a single media input or output device.
+
+	Documentation [MediaDeviceInfo](https://developer.mozilla.org/en-US/docs/Web/API/MediaDeviceInfo) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaDeviceInfo$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaDeviceInfo>
+**/
+@:native("MediaDeviceInfo")
+extern class MediaDeviceInfo {
+	
+	/**
+		Returns a `DOMString` that is an identifier for the represented device that is persisted across sessions. It is un-guessable by other applications and unique to the origin of the calling application. It is reset when the user clears cookies (for Private Browsing, a different identifier is used that is not persisted across sessions).
+	**/
+	var deviceId(default,null) : String;
+	
+	/**
+		Returns an enumerated value that is either `"videoinput"`, `"audioinput"` or `"audiooutput"`.
+	**/
+	var kind(default,null) : MediaDeviceKind;
+	
+	/**
+		Returns a `DOMString` that is a label describing this device (for example "External USB Webcam").
+	**/
+	var label(default,null) : String;
+	
+	/**
+		Returns a `DOMString` that is a group identifier. Two devices have the same group identifier if they belong to the same physical device — for example a monitor with both a built-in camera and a microphone.
+	**/
+	var groupId(default,null) : String;
+	
+	function toJSON() : Dynamic;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaDeviceKind.hx b/std/js/html/MediaDeviceKind.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6bd25bc56795188b4f9daa3f33282c4252c52fd6
--- /dev/null
+++ b/std/js/html/MediaDeviceKind.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaDeviceInfo.webidl. Do not edit!
+
+package js.html;
+
+enum abstract MediaDeviceKind(String) {
+	var AUDIOINPUT = "audioinput";
+	var AUDIOOUTPUT = "audiooutput";
+	var VIDEOINPUT = "videoinput";
+}
\ No newline at end of file
diff --git a/std/js/html/MediaDevices.hx b/std/js/html/MediaDevices.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2bdef74379a2f011ecf4eaf4a56bdfb2b10d67dd
--- /dev/null
+++ b/std/js/html/MediaDevices.hx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaDevices.webidl. Do not edit!
+
+package js.html;
+
+import js.lib.Promise;
+
+/**
+	The `MediaDevices` interface provides access to connected media input devices like cameras and microphones, as well as screen sharing. In essence, it lets you obtain access to any hardware source of media data.
+
+	Documentation [MediaDevices](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices>
+**/
+@:native("MediaDevices")
+extern class MediaDevices extends EventTarget {
+
+	/**
+		The event handler for the `devicechange` event. This event is delivered to the `MediaDevices` object when a media input or output device is attached to or removed from the user's computer.
+	**/
+	var ondevicechange : haxe.Constraints.Function;
+
+	function getSupportedConstraints() : MediaTrackSupportedConstraints;
+	/** @throws DOMError */
+	function enumerateDevices() : Promise<Array<MediaDeviceInfo>>;
+	/** @throws DOMError */
+	function getUserMedia( ?constraints : MediaStreamConstraints ) : Promise<MediaStream>;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaElement.hx b/std/js/html/MediaElement.hx
index 21fb1b0a2d4d8cdcdb09365ba30914047f84b588..9ef5ac739572c95bff1a280d3f031ac9e6424511 100644
--- a/std/js/html/MediaElement.hx
+++ b/std/js/html/MediaElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,16 +24,17 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
-	The `HTMLMediaElement` interface adds to `HTMLElement` the properties and methods needed to support basic media-related capabilities that are common to audio and video. The `HTMLVideoElement` and `HTMLAudioElement` elements both inherit this interface.
+	The `HTMLMediaElement` interface adds to `HTMLElement` the properties and methods needed to support basic media-related capabilities that are common to audio and video.
 
 	Documentation [HTMLMediaElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement>
 **/
 @:native("HTMLMediaElement")
-extern class MediaElement extends Element
-{
+extern class MediaElement extends Element {
 	static inline var NETWORK_EMPTY : Int = 0;
 	static inline var NETWORK_IDLE : Int = 1;
 	static inline var NETWORK_LOADING : Int = 2;
@@ -43,178 +44,200 @@ extern class MediaElement extends Element
 	static inline var HAVE_CURRENT_DATA : Int = 2;
 	static inline var HAVE_FUTURE_DATA : Int = 3;
 	static inline var HAVE_ENOUGH_DATA : Int = 4;
-	
-	
+
+
 	/**
 		Returns a `MediaError` object for the most recent error, or `null` if there has not been an error.
 	**/
 	var error(default,null) : MediaError;
-	
+
 	/**
 		Is a `DOMString` that reflects the `src` HTML attribute, which contains the URL of a media resource to use.
 	**/
 	var src : String;
-	
+
 	/**
 		Returns a `DOMString` with the absolute URL of the chosen media resource.
 	**/
 	var currentSrc(default,null) : String;
-	
+
 	/**
 		Is a `DOMString` indicating the CORS setting for this media element.
 	**/
 	var crossOrigin : String;
-	
+
 	/**
 		Returns a `unsigned short` (enumeration) indicating the current state of fetching the media over the network.
 	**/
 	var networkState(default,null) : Int;
-	
+
 	/**
 		Is a `DOMString` that reflects the `preload` HTML attribute, indicating what data should be preloaded, if any. Possible values are: `none`, `metadata`, `auto`.
 	**/
 	var preload : String;
-	
+
 	/**
 		Returns a `TimeRanges` object that indicates the ranges of the media source that the browser has buffered (if any) at the moment the `buffered` property is accessed.
 	**/
 	var buffered(default,null) : TimeRanges;
-	
+
 	/**
 		Returns a `unsigned short` (enumeration) indicating the readiness state of the media.
 	**/
 	var readyState(default,null) : Int;
-	
+
 	/**
 		Returns a `Boolean` that indicates whether the media is in the process of seeking to a new position.
 	**/
 	var seeking(default,null) : Bool;
-	
+
 	/**
 		Is a `double` indicating the current playback time in seconds. Setting this value seeks the media to the new time.
 	**/
 	var currentTime : Float;
-	
+
 	/**
 		Returns a `double` indicating the length of the media in seconds, or 0 if no media data is available.
 	**/
 	var duration(default,null) : Float;
-	
+
 	/**
 		Returns a `Boolean` that indicates whether the media element is paused.
 	**/
 	var paused(default,null) : Bool;
-	
+
 	/**
 		Is a `double` indicating the default playback rate for the media.
 	**/
 	var defaultPlaybackRate : Float;
-	
+
 	/**
 		Is a `double` that indicates the rate at which the media is being played back. 
 	**/
 	var playbackRate : Float;
-	
+
 	/**
 		Returns a `TimeRanges` object that contains the ranges of the media source that the browser has played, if any.
 	**/
 	var played(default,null) : TimeRanges;
-	
+
 	/**
 		Returns a `TimeRanges` object that contains the time ranges that the user is able to seek to, if any.
 	**/
 	var seekable(default,null) : TimeRanges;
-	
+
 	/**
 		Returns a `Boolean` that indicates whether the media element has finished playing.
 	**/
 	var ended(default,null) : Bool;
-	
+
 	/**
-		Is a `Boolean` that reflects the `autoplay` HTML attribute, indicating whether playback should automatically begin as soon as enough media is available to do so without interruption.
+		A `Boolean` that reflects the `autoplay` HTML attribute, indicating whether playback should automatically begin as soon as enough media is available to do so without interruption.
+		 Sites which automatically play audio (or videos with an audio track) can be an unpleasant experience for users, so it should be avoided when possible. If you must offer autoplay functionality, you should make it opt-in (requiring a user to specifically enable it). However, this can be useful when creating media elements whose source will be set at a later time, under user control.
+
 	**/
 	var autoplay : Bool;
-	
+
 	/**
 		Is a `Boolean` that reflects the `loop` HTML attribute, which indicates whether the media element should start over when it reaches the end.
 	**/
 	var loop : Bool;
-	
+
 	/**
 		Is a `Boolean` that reflects the `controls` HTML attribute, indicating whether user interface items for controlling the resource should be displayed.
 	**/
 	var controls : Bool;
-	
+
 	/**
 		Is a `double` indicating the audio volume, from 0.0 (silent) to 1.0 (loudest).
 	**/
 	var volume : Float;
-	
+
 	/**
 		Is a `Boolean` that determines whether audio is muted. `true` if the audio is muted and `false` otherwise.
 	**/
 	var muted : Bool;
-	
+
 	/**
 		Is a `Boolean` that reflects the `muted` HTML attribute, which indicates whether the media element's audio output should be muted by default.
 	**/
 	var defaultMuted : Bool;
-	
+
 	/**
-		Is a `AudioTrackList` that lists the `AudioTrack` objects contained in the element.
+		A `AudioTrackList` that lists the `AudioTrack` objects contained in the element.
 	**/
 	var audioTracks(default,null) : AudioTrackList;
-	
+
 	/**
 		Returns the list of `VideoTrack` objects contained in the element.
-		 
-		 Note: Gecko supports only single track playback, and the parsing of tracks' metadata is only available for media with the Ogg container format.
-		 
-		 
+
+		 Gecko supports only single track playback, and the parsing of tracks' metadata is only available for media with the Ogg container format.
+
+
 	**/
 	var videoTracks(default,null) : VideoTrackList;
-	
+
 	/**
 		Returns the list of `TextTrack` objects contained in the element.
 	**/
 	var textTracks(default,null) : TextTrackList;
-	
+
 	/**
-		Is a `MediaStream` representing the media to play or that has played in the current `HTMLMediaElement`.
+		Is a `MediaStream` representing the media to play or that has played in the current `HTMLMediaElement`, or `null` if not assigned.
 	**/
 	var srcObject : MediaStream;
-	
-	
+
+	/**
+		Returns a `MediaKeys` object or `null`. MediaKeys is a set of keys that an associated HTMLMediaElement can use for decryption of media data during playback.
+	**/
+	var mediaKeys(default,null) : js.html.eme.MediaKeys;
+
+	/**
+		Sets the `EventHandler` called when the media is encrypted.
+	**/
+	var onencrypted : haxe.Constraints.Function;
+
+	/**
+		Sets the `EventHandler` called when playback is blocked while waiting for an encryption key.
+	**/
+	var onwaitingforkey : haxe.Constraints.Function;
+
+
 	/**
 		Resets the media element and restarts the media resource. Any pending events are discarded. How much media data is fetched is still affected by the `preload` attribute. This method can be useful for releasing resources after any `src` attribute and `source` element descendants have been removed. Otherwise, it is usually unnecessary to use this method, unless required to rescan `source` element children after dynamic changes.
 	**/
 	function load() : Void;
-	
+
 	/**
 		Determines whether the specified media type can be played back.
 	**/
 	function canPlayType( type : String ) : String;
-	/** @throws DOMError */
-	
+
 	/**
 		Directly seeks to the given time.
+		@throws DOMError
 	**/
 	function fastSeek( time : Float ) : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Begins playback of the media.
+		@throws DOMError
 	**/
-	function play() : Void;
-	/** @throws DOMError */
-	
+	function play() : Promise<Void>;
+
 	/**
 		Pauses the media playback.
+		@throws DOMError
 	**/
 	function pause() : Void;
-	
+
 	/**
 		Adds a text track (such as a track for subtitles) to a media element.
 	**/
-	function addTextTrack( kind : TextTrackKind, ?label : String = "", ?language : String = "" ) : TextTrack;
+	function addTextTrack( kind : TextTrackKind, label : String = "", language : String = "" ) : TextTrack;
+
+	/**
+		Returns `Promise`. Sets the `MediaKeys` keys to use when decrypting media during playback.
+	**/
+	function setMediaKeys( mediaKeys : js.html.eme.MediaKeys ) : Promise<Void>;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaError.hx b/std/js/html/MediaError.hx
index 44436096d832435dfaef9ca87235a28ae0c4bc89..4946424809875e23eee8d8dba4e2b3e60f692cf3 100644
--- a/std/js/html/MediaError.hx
+++ b/std/js/html/MediaError.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `MediaError` interface represents an error associated to a media, like a `HTMLMediaElement`.
+	The `MediaError` interface represents an error which occurred while handling media in an HTML media element based on `HTMLMediaElement`, such as `audio` or `video`.
 
 	Documentation [MediaError](https://developer.mozilla.org/en-US/docs/Web/API/MediaError) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaError$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaError>
 **/
 @:native("MediaError")
-extern class MediaError
-{
+extern class MediaError {
 	static inline var MEDIA_ERR_ABORTED : Int = 1;
 	static inline var MEDIA_ERR_NETWORK : Int = 2;
 	static inline var MEDIA_ERR_DECODE : Int = 3;
@@ -41,40 +40,13 @@ extern class MediaError
 	
 	
 	/**
-		An <code>unsigned short </code> that represents the error:
-		 <table class="standard-table">
-		  
-		   <tr>
-		    Name
-		    Value
-		    Description
-		   </tr>
-		  
-		  
-		   <tr>
-		    <td><code>MEDIA_ERR_ABORTED</code></td>
-		    <td><code>1</code></td>
-		    <td>The fetching of the associated ressource has been aborted by the user</td>
-		   </tr>
-		   <tr>
-		    <td><code>MEDIA_ERR_NETWORK</code></td>
-		    <td><code>2</code></td>
-		    <td>A network error caused the ressource to stop being fetched.</td>
-		   </tr>
-		   <tr>
-		    <td><code>MEDIA_ERR_DECODE</code></td>
-		    <td><code>3</code></td>
-		    <td>A decoding error caused the ressource to stop being fetched.</td>
-		   </tr>
-		   <tr>
-		    <td><code>MEDIA_ERR_SRC_NOT_SUPPORTED</code></td>
-		    <td><code>4</code></td>
-		    <td>The associated ressource has been detected to be not suitable.</td>
-		   </tr>
-		  
-		 </table>
-		 
+		A number which represents the general type of error that occurred, as follows: `/en-US/docs/Web/API/MediaError/code`
 	**/
 	var code(default,null) : Int;
 	
+	/**
+		A `DOMString` object containing a human-readable string which provides specific diagnostic information to help the reader understand the error condition which occurred; specifically, it isn't simply a summary of what the error code means, but actual diagnostic information to help in understanding what exactly went wrong. This text and its format is not defined by the specification and will vary from one `user agent` to another. If no diagnostics are available, or no explanation can be provided, this value is an empty string (`""`).
+	**/
+	var message(default,null) : String;
+	
 }
\ No newline at end of file
diff --git a/std/js/html/MediaKeyStatusMapIterator.hx b/std/js/html/MediaKeyStatusMapIterator.hx
index 22e9ed07fe7c3f864ed7a323578e4216f3ba45f7..c74b7672bc59750845c92e96cccf34c003b63896 100644
--- a/std/js/html/MediaKeyStatusMapIterator.hx
+++ b/std/js/html/MediaKeyStatusMapIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-@:native("MediaKeyStatusMapIterator")
-extern class MediaKeyStatusMapIterator
-{
+typedef MediaKeyStatusMapIterator = {
 	/** @throws DOMError */
 	function next() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaList.hx b/std/js/html/MediaList.hx
index 2c9632cf72d0f7eb9ef9dfb53aedc824c147e274..3dfdc77b8ace33b1bf717f5d49d086511b18ffb0 100644
--- a/std/js/html/MediaList.hx
+++ b/std/js/html/MediaList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("MediaList")
-extern class MediaList implements ArrayAccess<String>
-{
+extern class MediaList implements ArrayAccess<String> {
 	var mediaText : String;
 	var length(default,null) : Int;
 	
diff --git a/std/js/html/MediaQueryList.hx b/std/js/html/MediaQueryList.hx
index 43a24b1298ca62dca815b9f6c87cfe8bd6487d29..258c218488322af1f1888026e5063d1d25f9d0f7 100644
--- a/std/js/html/MediaQueryList.hx
+++ b/std/js/html/MediaQueryList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,18 +25,44 @@
 package js.html;
 
 /**
-	A `MediaQueryList` object maintains a list of media queries on a `document`, and handles sending notifications to listeners when the media queries on the document change.
+	A `MediaQueryList` object stores information on a media query applied to a document, and handles sending notifications to listeners when the media query state change (i.e. when the media query test starts or stops evaluating to `true`).
 
 	Documentation [MediaQueryList](https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryList) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryList$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryList>
 **/
 @:native("MediaQueryList")
-extern class MediaQueryList
-{
+extern class MediaQueryList extends EventTarget {
+	
+	/**
+		 A `DOMString` representing a serialized media query.
+	**/
 	var media(default,null) : String;
+	
+	/**
+		 A `Boolean` that returns `true` if the `document` currently matches the media query list, or `false` if not.
+	**/
 	var matches(default,null) : Bool;
 	
-	function addListener( listener : MediaQueryList -> Void ) : Void;
-	function removeListener( listener : MediaQueryList -> Void ) : Void;
+	/**
+		 An event handler property representing a function that is invoked when the `change` event fires, i.e when the status of media query support changes. The event object is a `MediaQueryListEvent` instance, which is recognised as a `MediaListQuery` instance in older browsers, for backwards compatibility purposes.
+	**/
+	var onchange : haxe.Constraints.Function;
+	
+	
+	/**
+		 Adds a listener to the `MediaQueryListener` that will run a custom callback function in response to the media query status changing. This is basically an alias for `EventTarget.addEventListener()`, for backwards compatibility purposes.
+		@throws DOMError
+	**/
+	@:overload( function( listener : haxe.Constraints.Function) : Void {} )
+	@:overload( function( listener : EventListener) : Void {} )
+	function addListener( listener : Event -> Void ) : Void;
+	
+	/**
+		 Removes a listener from the `MediaQueryListener`. This is basically an alias for `EventTarget.removeEventListener()`, for backwards compatibility purposes.
+		@throws DOMError
+	**/
+	@:overload( function( listener : haxe.Constraints.Function) : Void {} )
+	@:overload( function( listener : EventListener) : Void {} )
+	function removeListener( listener : Event -> Void ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaQueryListEvent.hx b/std/js/html/MediaQueryListEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c159e9ebdceddc5139307d9bbf8c99e67687d3e0
--- /dev/null
+++ b/std/js/html/MediaQueryListEvent.hx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaQueryListEvent.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `MediaQueryListEvent` object stores information on the changes that have happened to a `MediaQueryList` object — instances are available as the event object on a function referenced by a `MediaQueryList.onchange` property or `MediaQueryList.addEvent()` call.
+
+	Documentation [MediaQueryListEvent](https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryListEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryListEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryListEvent>
+**/
+@:native("MediaQueryListEvent")
+extern class MediaQueryListEvent extends Event {
+	
+	/**
+		 A `DOMString` representing a serialized media query.
+	**/
+	var media(default,null) : String;
+	
+	/**
+		 A `Boolean` that returns `true` if the `document` currently matches the media query list, or `false` if not.
+	**/
+	var matches(default,null) : Bool;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : MediaQueryListEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaQueryListEventInit.hx b/std/js/html/MediaQueryListEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..75d898f312e45996346a2857d4b3e824d903228d
--- /dev/null
+++ b/std/js/html/MediaQueryListEventInit.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaQueryListEvent.webidl. Do not edit!
+
+package js.html;
+
+typedef MediaQueryListEventInit = EventInit & {
+	var ?matches : Bool;
+	var ?media : String;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaRecorder.hx b/std/js/html/MediaRecorder.hx
index 5f79ea5bdf42cbb002094b51ebb3322604255268..8d98fa980aaffafc3dcd49639e9f7aa06231eaaf 100644
--- a/std/js/html/MediaRecorder.hx
+++ b/std/js/html/MediaRecorder.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,20 +25,15 @@
 package js.html;
 
 /**
-	The `MediaRecorder` interface of the MediaStream Recording API provides functionality to easily record media. It is created by the invocation of the `MediaRecorder()` constructor.
+	The `MediaRecorder` interface of the MediaStream Recording API provides functionality to easily record media. It is created using the `MediaRecorder()` constructor.
 
 	Documentation [MediaRecorder](https://developer.mozilla.org/en-US/docs/Web/API/MediaRecorder) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaRecorder$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaRecorder>
 **/
 @:native("MediaRecorder")
-extern class MediaRecorder extends EventTarget
-{
-	static 
-	/**
-		 Returns a `Boolean` value indicating if the given MIME type is supported by the current user agent . 
-	**/
-	function isTypeSupported( type : String ) : Bool;
+extern class MediaRecorder extends EventTarget {
+	static function isTypeSupported( type : String ) : Bool;
 	
 	/**
 		Returns the stream that was passed into the constructor when the `MediaRecorder` was created.
@@ -62,35 +57,35 @@ extern class MediaRecorder extends EventTarget
 	
 	/** @throws DOMError */
 	@:overload( function( stream : MediaStream, ?options : MediaRecorderOptions ) : Void {} )
-	function new( node : js.html.audio.AudioNode, ?output : Int = 0, ?options : MediaRecorderOptions ) : Void;
-	/** @throws DOMError */
+	function new( node : js.html.audio.AudioNode, output : Int = 0, ?options : MediaRecorderOptions ) : Void;
 	
 	/**
 		Begins recording media; this method can optionally be passed a `timeslice` argument with a value in milliseconds. If this is specified, the media will be captured in separate chunks of that duration, rather than the default behavior of recording the media in a single large chunk.
+		@throws DOMError
 	**/
 	function start( ?timeSlice : Int ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Stops recording, at which point a `dataavailable` event containing the final `Blob` of saved data is fired. No more recording occurs.
+		@throws DOMError
 	**/
 	function stop() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Pauses the recording of media.
+		@throws DOMError
 	**/
 	function pause() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Resumes recording of media after having been paused.
+		@throws DOMError
 	**/
 	function resume() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Requests a `Blob` containing the saved data received thus far (or since the last time `requestData()` was called. After calling this method, recording continues, but in a new `Blob`.
+		@throws DOMError
 	**/
 	function requestData() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaRecorderErrorEvent.hx b/std/js/html/MediaRecorderErrorEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d68bab313849220c1e4d6b2af9e5604ce873a704
--- /dev/null
+++ b/std/js/html/MediaRecorderErrorEvent.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaRecorderErrorEvent.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `MediaRecorderErrorEvent` interface represents errors returned by the MediaStream Recording API. It is an `Event` object that encapsulates a reference to a `DOMException` describing the error that occurred.
+
+	Documentation [MediaRecorderErrorEvent](https://developer.mozilla.org/en-US/docs/Web/API/MediaRecorderErrorEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaRecorderErrorEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaRecorderErrorEvent>
+**/
+@:native("MediaRecorderErrorEvent")
+extern class MediaRecorderErrorEvent extends Event {
+	
+	/**
+		A `DOMException` containing information about the error that occurred. Read only.
+	**/
+	var error(default,null) : DOMException;
+	
+	/** @throws DOMError */
+	function new( type : String, eventInitDict : MediaRecorderErrorEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaRecorderErrorEventInit.hx b/std/js/html/MediaRecorderErrorEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6f345f9c0f0efe0c29ba70cacb8fcba3aca27b3e
--- /dev/null
+++ b/std/js/html/MediaRecorderErrorEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaRecorderErrorEvent.webidl. Do not edit!
+
+package js.html;
+
+typedef MediaRecorderErrorEventInit = EventInit & {
+	var error : DOMException;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaRecorderOptions.hx b/std/js/html/MediaRecorderOptions.hx
index 1884f3e894028666a7d921987691584b8c320fc8..ef206cd6441707798ba8ecc1bd08f035e4cb9bde 100644
--- a/std/js/html/MediaRecorderOptions.hx
+++ b/std/js/html/MediaRecorderOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,9 @@
 
 package js.html;
 
-typedef MediaRecorderOptions =
-{
-	@:optional var audioBitsPerSecond : Int;
-	@:optional var bitsPerSecond : Int;
-	@:optional var mimeType : String;
-	@:optional var videoBitsPerSecond : Int;
+typedef MediaRecorderOptions = {
+	var ?audioBitsPerSecond : Int;
+	var ?bitsPerSecond : Int;
+	var ?mimeType : String;
+	var ?videoBitsPerSecond : Int;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaSource.hx b/std/js/html/MediaSource.hx
index 525540058dff96495542e6cfa612460129296df7..9368a407bd05f43a77aa3b4659997402e29ec98d 100644
--- a/std/js/html/MediaSource.hx
+++ b/std/js/html/MediaSource.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,20 +25,15 @@
 package js.html;
 
 /**
-	The `MediaSource` interface represents a source of media data for an `HTMLMediaElement` object. A `MediaSource` object can be attached to a `HTMLMediaElement` to be played in the user agent.
+	The `MediaSource` interface of the Media Source Extensions API represents a source of media data for an `HTMLMediaElement` object. A `MediaSource` object can be attached to a `HTMLMediaElement` to be played in the user agent.
 
 	Documentation [MediaSource](https://developer.mozilla.org/en-US/docs/Web/API/MediaSource) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaSource$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaSource>
 **/
 @:native("MediaSource")
-extern class MediaSource extends EventTarget
-{
-	static 
-	/**
-		Returns a `Boolean` value indicating if the given MIME type is supported by the current user agent — this is, if it can successfully create `SourceBuffer` objects for that MIME type.
-	**/
-	function isTypeSupported( type : String ) : Bool;
+extern class MediaSource extends EventTarget {
+	static function isTypeSupported( type : String ) : Bool;
 	
 	/**
 		Returns a `SourceBufferList` object containing the list of `SourceBuffer` objects associated with this `MediaSource`.
@@ -46,7 +41,7 @@ extern class MediaSource extends EventTarget
 	var sourceBuffers(default,null) : SourceBufferList;
 	
 	/**
-		Returns a `SourceBufferList` object containing a subset of the `SourceBuffer` objects contained within `SourceBuffers` — the list of objects providing the selected video track,  enabled audio tracks, and shown/hidden text tracks.
+		Returns a `SourceBufferList` object containing a subset of the `SourceBuffer` objects contained within `MediaSource.sourceBuffers` — the list of objects providing the selected video track,  enabled audio tracks, and shown/hidden text tracks.
 	**/
 	var activeSourceBuffers(default,null) : SourceBufferList;
 	
@@ -60,24 +55,47 @@ extern class MediaSource extends EventTarget
 	**/
 	var duration : Float;
 	
+	/**
+		The event handler for the `sourceopen` event.
+	**/
+	var onsourceopen : haxe.Constraints.Function;
+	
+	/**
+		The event handler for the `sourceended` event.
+	**/
+	var onsourceended : haxe.Constraints.Function;
+	var onsourceclosed : haxe.Constraints.Function;
+	
 	/** @throws DOMError */
 	function new() : Void;
-	/** @throws DOMError */
 	
 	/**
-		Creates a new `SourceBuffer` of the given MIME type and adds it to the `MediaSource`'s `SourceBuffers` list.
+		Creates a new `SourceBuffer` of the given MIME type and adds it to the `MediaSource.sourceBuffers` list.
+		@throws DOMError
 	**/
 	function addSourceBuffer( type : String ) : SourceBuffer;
-	/** @throws DOMError */
 	
 	/**
-		Removes the given `SourceBuffer` from the `SourceBuffers` list associated with this `MediaSource` object.
+		Removes the given `SourceBuffer` from the `MediaSource.sourceBuffers` list.
+		@throws DOMError
 	**/
 	function removeSourceBuffer( sourceBuffer : SourceBuffer ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Signals the end of the stream.
+		@throws DOMError
 	**/
 	function endOfStream( ?error : MediaSourceEndOfStreamError ) : Void;
+	
+	/**
+		Sets the range that the user can seek to in the media element.
+		@throws DOMError
+	**/
+	function setLiveSeekableRange( start : Float, end : Float ) : Void;
+	
+	/**
+		Clears a seekable range privious set with a call to `setLiveSeekableRange()`.
+		@throws DOMError
+	**/
+	function clearLiveSeekableRange() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaSourceEndOfStreamError.hx b/std/js/html/MediaSourceEndOfStreamError.hx
index 6c4f437bbdbe25aabc12fbd30d1083b49fde9845..c39d7c45310edc1003ffe6b834d4d2f8b811fb5c 100644
--- a/std/js/html/MediaSourceEndOfStreamError.hx
+++ b/std/js/html/MediaSourceEndOfStreamError.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract MediaSourceEndOfStreamError(String)
-{
+enum abstract MediaSourceEndOfStreamError(String) {
 	var NETWORK = "network";
 	var DECODE = "decode";
 }
\ No newline at end of file
diff --git a/std/js/html/MediaSourceReadyState.hx b/std/js/html/MediaSourceReadyState.hx
index 73af387f3f1152acc4d7dd43716d48707c00517d..671e2ec7b994b5612e6fc4a401a6248a1dee4aee 100644
--- a/std/js/html/MediaSourceReadyState.hx
+++ b/std/js/html/MediaSourceReadyState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract MediaSourceReadyState(String)
-{
+enum abstract MediaSourceReadyState(String) {
 	var CLOSED = "closed";
 	var OPEN = "open";
 	var ENDED = "ended";
diff --git a/std/js/html/MediaStream.hx b/std/js/html/MediaStream.hx
index 83db10f91eeb10b339c369a3ef78a95eae1c224f..8bc80ea40741196817a4d4ce1806e4266dacb1d1 100644
--- a/std/js/html/MediaStream.hx
+++ b/std/js/html/MediaStream.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,19 +32,37 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaStream>
 **/
 @:native("MediaStream")
-extern class MediaStream extends EventTarget
-{
+extern class MediaStream extends EventTarget {
 	
 	/**
 		A `DOMString` containing 36 characters denoting a universally unique identifier (UUID) for the object.
 	**/
 	var id(default,null) : String;
+	
+	/**
+		A Boolean value that returns `true` if the `MediaStream` is active, or `false` otherwise.
+	**/
+	var active(default,null) : Bool;
+	
+	/**
+		An `EventHandler` containing the action to perform when an `addtrack` event is fired when a new `MediaStreamTrack` object is added.
+	**/
+	var onaddtrack : haxe.Constraints.Function;
+	
+	/**
+		An `EventHandler` containing the action to perform when a `removetrack` event is fired when a  `MediaStreamTrack` object is removed from it.
+	**/
+	var onremovetrack : haxe.Constraints.Function;
 	var currentTime(default,null) : Float;
 	
 	/** @throws DOMError */
 	@:overload( function() : Void {} )
 	@:overload( function( stream : MediaStream ) : Void {} )
 	function new( tracks : Array<MediaStreamTrack> ) : Void;
+	
+	/**
+		Returns a list of the `MediaStreamTrack` objects stored in the MediaStream` object that have their kind` attribute set to "audio"`. The order is not defined, and may not only vary from one browser to another, but also from one call to another.
+	**/
 	function getAudioTracks() : Array<AudioStreamTrack>;
 	
 	/**
@@ -57,6 +75,11 @@ extern class MediaStream extends EventTarget
 	**/
 	function getTracks() : Array<MediaStreamTrack>;
 	
+	/**
+		Returns the track whose ID corresponds to the one given in parameters, trackid`. If no parameter is given, or if no track with that ID does exist, it returns null`. If several tracks have the same ID, it returns the first one.
+	**/
+	function getTrackById( trackId : String ) : MediaStreamTrack;
+	
 	/**
 		Stores a copy of the `MediaStreamTrack` given as argument. If the track has already been added to the `MediaStream` object, nothing happens.
 	**/
@@ -66,4 +89,9 @@ extern class MediaStream extends EventTarget
 		Removes the `MediaStreamTrack` given as argument. If the track is not part of the MediaStream` object, nothing happens.
 	**/
 	function removeTrack( track : MediaStreamTrack ) : Void;
+	
+	/**
+		Returns a clone of the `MediaStream` object. The clone will, however, have a unique value for `MediaStream.id`.
+	**/
+	function clone() : MediaStream;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaStreamConstraints.hx b/std/js/html/MediaStreamConstraints.hx
index e270f6efa7f3a57d7b80c9850ab7ee13c011d5f0..98bf916bfc98376e2083bcb3777ce76d92df5fe8 100644
--- a/std/js/html/MediaStreamConstraints.hx
+++ b/std/js/html/MediaStreamConstraints.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,12 +31,22 @@ package js.html;
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamConstraints>
 **/
-typedef MediaStreamConstraints =
-{
-	@:optional var audio : haxe.extern.EitherType<Bool,MediaTrackConstraints>;
-	@:optional var fake : Bool;
-	@:optional var fakeTracks : Bool;
-	@:optional var peerIdentity : String;
-	@:optional var picture : Bool;
-	@:optional var video : haxe.extern.EitherType<Bool,MediaTrackConstraints>;
+typedef MediaStreamConstraints = {
+	
+	/**
+		Either a Boolean (which indicates whether or not an audio track is requested) or a `MediaTrackConstraints` object providing the constraints which must be met by the audio track included in the returned `MediaStream`. If constraints are specified, an audio track is inherently requested.
+	**/
+	var ?audio : haxe.extern.EitherType<Bool,MediaTrackConstraints>;
+	var ?fake : Bool;
+	
+	/**
+		A `DOMString` identifying the peer who has sole access to the stream. If this property is specified, only the indicated peer can receive and use the stream. Streams isolated in this way can only be displayed in a media element (`audio` or `video`) where the content is protected just as if `CORS` cross-origin rules were in effect. When a peer identity is set, `MediaStreamTrack`s from that peer have their `MediaStreamTrack.isolated` flag set to `true`.
+	**/
+	var ?peerIdentity : String;
+	var ?picture : Bool;
+	
+	/**
+		Either a Boolean (which indicates whether or not a video track is requested) or a `MediaTrackConstraints` object providing the constraints which must be met by the video track included in the returned `MediaStream`. If constraints are specified, a video track is inherently requested.
+	**/
+	var ?video : haxe.extern.EitherType<Bool,MediaTrackConstraints>;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaStreamError.hx b/std/js/html/MediaStreamError.hx
index 5ddb4144d87d0012f6d537f328165d460155e86b..fe4de441df1ee1cecfbfb600f2dd9ff75c7b70bd 100644
--- a/std/js/html/MediaStreamError.hx
+++ b/std/js/html/MediaStreamError.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-@:native("MediaStreamError")
-extern class MediaStreamError
-{
+typedef MediaStreamError = {
 	var name(default,null) : String;
 	var message(default,null) : String;
 	var constraint(default,null) : String;
diff --git a/std/js/html/MediaStreamEvent.hx b/std/js/html/MediaStreamEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b61233fdb07c834cd2f9fce9035005b20677cff1
--- /dev/null
+++ b/std/js/html/MediaStreamEvent.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaStreamEvent.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `MediaStreamEvent` interface represents events that occurs in relation to a `MediaStream`. Two events of this type can be thrown: `addstream` and `removestream`.
+
+	Documentation [MediaStreamEvent](https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamEvent>
+**/
+@:native("MediaStreamEvent")
+extern class MediaStreamEvent extends Event {
+	
+	/**
+		Contains the `MediaStream` containing the stream associated with the event.
+	**/
+	var stream(default,null) : MediaStream;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : MediaStreamEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaStreamEventInit.hx b/std/js/html/MediaStreamEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b3a5eed7273b0c562d113f2373d1623dce6822ad
--- /dev/null
+++ b/std/js/html/MediaStreamEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaStreamEvent.webidl. Do not edit!
+
+package js.html;
+
+typedef MediaStreamEventInit = EventInit & {
+	var ?stream : MediaStream;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaStreamTrack.hx b/std/js/html/MediaStreamTrack.hx
index c275ed3b4420575da4a8b6de458828df9b5d82f6..255bfc10fec9636021f691d441323ea635b889a0 100644
--- a/std/js/html/MediaStreamTrack.hx
+++ b/std/js/html/MediaStreamTrack.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `MediaStreamTrack` interface represents a single media track within a stream; typically, these are audio or video tracks, but other track types may exist as well.
 
@@ -32,30 +34,86 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamTrack>
 **/
 @:native("MediaStreamTrack")
-extern class MediaStreamTrack extends EventTarget
-{
-	
+extern class MediaStreamTrack extends EventTarget {
+
 	/**
 		Returns a `DOMString` set to `"audio"` if the track is an audio track and to `"video"`, if it is a video track. It doesn't change if the track is deassociated from its source.
 	**/
 	var kind(default,null) : String;
-	
+
 	/**
 		Returns a `DOMString` containing a unique identifier (GUID) for the track; it is generated by the browser.
 	**/
 	var id(default,null) : String;
-	
+
 	/**
 		Returns a `DOMString` containing a user agent-assigned label that identifies the track source, as in `"internal microphone"`. The string may be left empty and is empty as long as no source has been connected. When the track is deassociated from its source, the label is not changed.
 	**/
 	var label(default,null) : String;
-	
+
 	/**
-		A Boolean value with a value of `true` if the track is enabled, that is allowed to render the media source stream; or `false` if it is disabled, that is not rendering the media source stream but silence and blackness. If the track has been disconnected, this value can be changed but has no more effect.
+		A Boolean whose value of `true` if the track is enabled, that is allowed to render the media source stream; or `false` if it is disabled, that is not rendering the media source stream but silence and blackness. If the track has been disconnected, this value can be changed but has no more effect.
+		 Note: You can implement standard "mute" functionality by setting `enabled` to `false`. The `muted` property refers to a condition in which there's no media because of a technical issue.
+
 	**/
 	var enabled : Bool;
-	
+
+	/**
+		Returns a Boolean value indicating whether the track is unable to provide media data due to a technical issue.
+		 Note: You can implement standard "mute" functionality by setting `enabled` to `false`, and unmute the media by setting it back to `true` again.
+
+	**/
+	var muted(default,null) : Bool;
+
+	/**
+		An `EventHandler` containing the action to perform when an `mute` event is fired on the object, that is when the streaming is terminating.
+	**/
+	var onmute : haxe.Constraints.Function;
+
+	/**
+		An `EventHandler` containing the action to perform when an `unmute` event is fired on the object, that is when a  `MediaStreamTrack` object is removed from it.
+	**/
+	var onunmute : haxe.Constraints.Function;
+
+	/**
+		Returns an enumerated value giving the status of the track. This will be one of the following values:
+
+		  `"live"` which indicates that an input is connected and does its best-effort in providing real-time data. In that case, the output of data can be switched on or off using the `MediaStreamTrack.enabled` attribute.
+		  `"ended"` which indicates that the input is not giving any more data and will never provide new data.
+
+
+	**/
+	var readyState(default,null) : MediaStreamTrackState;
+
+	/**
+		An `EventHandler` containing the action to perform when an `ended_(MediaStream)` event is fired on the object, that is when a  `MediaStreamTrack` object is removed from it.
+	**/
+	var onended : haxe.Constraints.Function;
+
+
+	/**
+		Returns a duplicate of the `MediaStreamTrack`.
+	**/
+	function clone() : MediaStreamTrack;
+
+	/**
+		Stops playing the source associated to the track, both the source and the track are deassociated. The track state is set to `ended`.
+	**/
 	function stop() : Void;
-	/** @throws DOMError */
+
+	/**
+		Returns a `MediaTrackConstraints` object containing the currently set constraints for the track; the returned value matches the constraints last set using `MediaStreamTrack.applyConstraints`.
+	**/
+	function getConstraints() : MediaTrackConstraints;
+
+	/**
+		Returns a `MediaTrackSettings` object containing the current values of each of the `MediaStreamTrack`'s constrainable properties.
+	**/
+	function getSettings() : MediaTrackSettings;
+
+	/**
+		Lets the application specify the ideal and/or ranges of acceptable values for any number of the available constrainable properties of the `MediaStreamTrack`.
+		@throws DOMError
+	**/
 	function applyConstraints( ?constraints : MediaTrackConstraints ) : Promise<Void>;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaStreamTrackEvent.hx b/std/js/html/MediaStreamTrackEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b1445f31cab314c0974138a4d4de87d14adcd69a
--- /dev/null
+++ b/std/js/html/MediaStreamTrackEvent.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaStreamTrackEvent.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `MediaStreamTrackEvent` interface represents events which indicate that a `MediaStream` has had tracks added to or removed from the stream through calls to Media Stream API methods. These events are sent to the stream when these changes occur.
+
+	Documentation [MediaStreamTrackEvent](https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamTrackEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamTrackEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamTrackEvent>
+**/
+@:native("MediaStreamTrackEvent")
+extern class MediaStreamTrackEvent extends Event {
+	
+	/**
+		A `MediaStreamTrack` object representing the track which was added to the stream.
+	**/
+	var track(default,null) : MediaStreamTrack;
+	
+	/** @throws DOMError */
+	function new( type : String, eventInitDict : MediaStreamTrackEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaStreamTrackEventInit.hx b/std/js/html/MediaStreamTrackEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b461dddb3955bb2f215a0f7917221cfd26ff7370
--- /dev/null
+++ b/std/js/html/MediaStreamTrackEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaStreamTrackEvent.webidl. Do not edit!
+
+package js.html;
+
+typedef MediaStreamTrackEventInit = EventInit & {
+	var track : MediaStreamTrack;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaStreamTrackState.hx b/std/js/html/MediaStreamTrackState.hx
new file mode 100644
index 0000000000000000000000000000000000000000..67a81801dc9aa0633b93222e1917078ac2e7b2aa
--- /dev/null
+++ b/std/js/html/MediaStreamTrackState.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaStreamTrack.webidl. Do not edit!
+
+package js.html;
+
+enum abstract MediaStreamTrackState(String) {
+	var LIVE = "live";
+	var ENDED = "ended";
+}
\ No newline at end of file
diff --git a/std/js/html/MediaTrackConstraintSet.hx b/std/js/html/MediaTrackConstraintSet.hx
index e3a1237a02dc163730654d848291eef9526811ae..5fd80a44c3bb9b57d142928f2bbdf1a8aceff30a 100644
--- a/std/js/html/MediaTrackConstraintSet.hx
+++ b/std/js/html/MediaTrackConstraintSet.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,19 +24,21 @@
 
 package js.html;
 
-typedef MediaTrackConstraintSet =
-{
-	@:optional var browserWindow : Int;
-	@:optional var deviceId : haxe.extern.EitherType<String,haxe.extern.EitherType<Array<String>,Dynamic/*MISSING ConstrainDOMStringParameters*/>>;
-	@:optional var echoCancellation : haxe.extern.EitherType<Bool,Dynamic/*MISSING ConstrainBooleanParameters*/>;
-	@:optional var facingMode : haxe.extern.EitherType<String,haxe.extern.EitherType<Array<String>,Dynamic/*MISSING ConstrainDOMStringParameters*/>>;
-	@:optional var frameRate : haxe.extern.EitherType<Float,Dynamic/*MISSING ConstrainDoubleRange*/>;
-	@:optional var height : haxe.extern.EitherType<Int,Dynamic/*MISSING ConstrainLongRange*/>;
-	@:optional var mediaSource : String;
-	@:optional var scrollWithPage : Bool;
-	@:optional var viewportHeight : haxe.extern.EitherType<Int,Dynamic/*MISSING ConstrainLongRange*/>;
-	@:optional var viewportOffsetX : haxe.extern.EitherType<Int,Dynamic/*MISSING ConstrainLongRange*/>;
-	@:optional var viewportOffsetY : haxe.extern.EitherType<Int,Dynamic/*MISSING ConstrainLongRange*/>;
-	@:optional var viewportWidth : haxe.extern.EitherType<Int,Dynamic/*MISSING ConstrainLongRange*/>;
-	@:optional var width : haxe.extern.EitherType<Int,Dynamic/*MISSING ConstrainLongRange*/>;
+typedef MediaTrackConstraintSet = {
+	var ?autoGainControl : haxe.extern.EitherType<Bool,ConstrainBooleanParameters>;
+	var ?browserWindow : Int;
+	var ?channelCount : haxe.extern.EitherType<Int,ConstrainLongRange>;
+	var ?deviceId : haxe.extern.EitherType<String,haxe.extern.EitherType<Array<String>,ConstrainDOMStringParameters>>;
+	var ?echoCancellation : haxe.extern.EitherType<Bool,ConstrainBooleanParameters>;
+	var ?facingMode : haxe.extern.EitherType<String,haxe.extern.EitherType<Array<String>,ConstrainDOMStringParameters>>;
+	var ?frameRate : haxe.extern.EitherType<Float,ConstrainDoubleRange>;
+	var ?height : haxe.extern.EitherType<Int,ConstrainLongRange>;
+	var ?mediaSource : String;
+	var ?noiseSuppression : haxe.extern.EitherType<Bool,ConstrainBooleanParameters>;
+	var ?scrollWithPage : Bool;
+	var ?viewportHeight : haxe.extern.EitherType<Int,ConstrainLongRange>;
+	var ?viewportOffsetX : haxe.extern.EitherType<Int,ConstrainLongRange>;
+	var ?viewportOffsetY : haxe.extern.EitherType<Int,ConstrainLongRange>;
+	var ?viewportWidth : haxe.extern.EitherType<Int,ConstrainLongRange>;
+	var ?width : haxe.extern.EitherType<Int,ConstrainLongRange>;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaTrackConstraints.hx b/std/js/html/MediaTrackConstraints.hx
index 78555138658cc2fa77b01573d0c9f6c4390d1ab3..8d5edc8077c036c905f9ff50743439b6fd0668df 100644
--- a/std/js/html/MediaTrackConstraints.hx
+++ b/std/js/html/MediaTrackConstraints.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,8 +31,6 @@ package js.html;
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackConstraints>
 **/
-typedef MediaTrackConstraints =
-{
-	> MediaTrackConstraintSet,
-	@:optional var advanced : Array<MediaTrackConstraintSet>;
+typedef MediaTrackConstraints = MediaTrackConstraintSet & {
+	var ?advanced : Array<MediaTrackConstraintSet>;
 }
\ No newline at end of file
diff --git a/std/js/html/MediaTrackSettings.hx b/std/js/html/MediaTrackSettings.hx
new file mode 100644
index 0000000000000000000000000000000000000000..89b9ebb602a15698c826c86894d010f8934af011
--- /dev/null
+++ b/std/js/html/MediaTrackSettings.hx
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaTrackSettings.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `MediaTrackSettings` dictionary is used to return the current values configured for each of a `MediaStreamTrack`'s settings. These values will adhere as closely as possible to any constraints previously described using a `MediaTrackConstraints` object and set using `applyConstraints()`, and will adhere to the default constraints for any properties whose constraints haven't been changed, or whose customized constraints couldn't be matched.
+
+	Documentation [MediaTrackSettings](https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackSettings) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackSettings$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackSettings>
+**/
+typedef MediaTrackSettings = {
+	
+	/**
+		A Boolean which indicates the current value of the `MediaTrackConstraints.autoGainControl` property, which is `true` if automatic gain control is enabled and is `false` otherwise.
+	**/
+	var ?autoGainControl : Bool;
+	var ?browserWindow : Int;
+	
+	/**
+		A long integer value indicating the current value of the ``MediaTrackConstraints.channelCount`` property, specifying the number of audio channels present on the track (therefore indicating how many audio samples exist in each audio frame). This is 1 for mono, 2 for stereo, and so forth.
+	**/
+	var ?channelCount : Int;
+	
+	/**
+		A `DOMString` indicating the current value of the ``MediaTrackConstraints.deviceId`` property. The device ID is a origin-unique string identifying the source of the track; this is usually a `GUID`. This value is specific to the source of the track's data and is not usable for setting constraints; it can, however, be used for initially selecting media when calling `MediaDevices.getUserMedia()`.
+	**/
+	var ?deviceId : String;
+	
+	/**
+		A Boolean indicating the current value of the ``MediaTrackConstraints.echoCancellation`` property, specifying `true` if echo cancellation is enabled, otherwise `false`.
+	**/
+	var ?echoCancellation : Bool;
+	
+	/**
+		
+	**/
+	var ?facingMode : String;
+	
+	/**
+		A double-precision floating point value indicating the current value of the ``MediaTrackConstraints.frameRate`` property, specifying how many frames of video per second the track includes. If the value can't be determined for any reason, the value will match the vertical sync rate of the device the user agent is running on.
+	**/
+	var ?frameRate : Float;
+	
+	/**
+		A long integer value indicating the current value of the ``MediaTrackConstraints.height`` property, specifying the height of the track's video data in pixels.
+	**/
+	var ?height : Int;
+	var ?mediaSource : String;
+	
+	/**
+		A Boolean which indicates the current value of the `MediaTrackConstraints.noiseSuppression` property, which is `true` if noise suppression is enabled and is `false` otherwise.
+	**/
+	var ?noiseSuppression : Bool;
+	var ?scrollWithPage : Bool;
+	var ?viewportHeight : Int;
+	var ?viewportOffsetX : Int;
+	var ?viewportOffsetY : Int;
+	var ?viewportWidth : Int;
+	
+	/**
+		A long integer value indicating the current value of the `MediaTrackSettings.width` property, specifying the width of the track's video data in pixels.
+	**/
+	var ?width : Int;
+}
\ No newline at end of file
diff --git a/std/js/html/MediaTrackSupportedConstraints.hx b/std/js/html/MediaTrackSupportedConstraints.hx
new file mode 100644
index 0000000000000000000000000000000000000000..77760b00612894efd6d3eaf7dec211b9cdd435fb
--- /dev/null
+++ b/std/js/html/MediaTrackSupportedConstraints.hx
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaTrackSupportedConstraints.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `MediaTrackSupportedConstraints` dictionary establishes the list of constrainable properties recognized by the user agent or browser in its implementation of the `MediaStreamTrack` object. An object conforming to `MediaTrackSupportedConstraints` is returned by `MediaDevices.getSupportedConstraints()`.
+
+	Documentation [MediaTrackSupportedConstraints](https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackSupportedConstraints) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackSupportedConstraints$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackSupportedConstraints>
+**/
+typedef MediaTrackSupportedConstraints = {
+	
+	/**
+		A Boolean value whose value is `true` if the `aspectRatio` constraint is supported in the current environment.
+	**/
+	var ?aspectRatio : Bool;
+	
+	/**
+		A Boolean whose value is `true` if the `autoGainControl` constraint is supported in the current environment.
+	**/
+	var ?autoGainControl : Bool;
+	var ?browserWindow : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `channelCount` constraint is supported in the current environment.
+	**/
+	var ?channelCount : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `deviceId` constraint is supported in the current environment.
+	**/
+	var ?deviceId : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `echoCancellation` constraint is supported in the current environment.
+	**/
+	var ?echoCancellation : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `facingMode` constraint is supported in the current environment.
+	**/
+	var ?facingMode : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `frameRate` constraint is supported in the current environment.
+	**/
+	var ?frameRate : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `groupId` constraint is supported in the current environment.
+	**/
+	var ?groupId : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `height` constraint is supported in the current environment.
+	**/
+	var ?height : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `latency` constraint is supported in the current environment.
+	**/
+	var ?latency : Bool;
+	var ?mediaSource : Bool;
+	
+	/**
+		A Boolean whose value is `true` if the `noiseSuppression` constraint is supported in the current environment.
+	**/
+	var ?noiseSuppression : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `sampleRate` constraint is supported in the current environment.
+	**/
+	var ?sampleRate : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `sampleSize` constraint is supported in the current environment.
+	**/
+	var ?sampleSize : Bool;
+	var ?scrollWithPage : Bool;
+	var ?viewportHeight : Bool;
+	var ?viewportOffsetX : Bool;
+	var ?viewportOffsetY : Bool;
+	var ?viewportWidth : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `volume` constraint is supported in the current environment.
+	**/
+	var ?volume : Bool;
+	
+	/**
+		A Boolean value whose value is `true` if the `width` constraint is supported in the current environment.
+	**/
+	var ?width : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/MenuElement.hx b/std/js/html/MenuElement.hx
index 34fa3c40f74abe10638aeeaa71c9179587ddefbe..a86c68b8a58c9c6d88862e125ae6f2949d03a097 100644
--- a/std/js/html/MenuElement.hx
+++ b/std/js/html/MenuElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("HTMLMenuElement")
-extern class MenuElement extends Element
-{
+extern class MenuElement extends Element {
 	var type : String;
 	var label : String;
 	var compact : Bool;
diff --git a/std/js/html/MenuItemElement.hx b/std/js/html/MenuItemElement.hx
index 1801ad8e6e8aa8a14c8941c70b083c7b422eb698..060ae4e746c603406194110e2cc2a1ae41ebb7b1 100644
--- a/std/js/html/MenuItemElement.hx
+++ b/std/js/html/MenuItemElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("HTMLMenuItemElement")
-extern class MenuItemElement extends Element
-{
+extern class MenuItemElement extends Element {
 	var type : String;
 	var label : String;
 	var icon : String;
diff --git a/std/js/html/MessageChannel.hx b/std/js/html/MessageChannel.hx
index ab0dae15f5a957cda9f3a17c00d847d2e0a871f9..c43ba2d9ee241e3db98af12ec50062abb6989cb1 100644
--- a/std/js/html/MessageChannel.hx
+++ b/std/js/html/MessageChannel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel>
 **/
 @:native("MessageChannel")
-extern class MessageChannel
-{
+extern class MessageChannel {
 	
 	/**
 		Returns port1 of the channel.
diff --git a/std/js/html/MessageEvent.hx b/std/js/html/MessageEvent.hx
index d27fcaf8ddb3535ad6a9f00e6d39571be018f51a..4b9a1d2175d41f33f0d99a2b03adc777a77299c4 100644
--- a/std/js/html/MessageEvent.hx
+++ b/std/js/html/MessageEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,42 +25,47 @@
 package js.html;
 
 /**
-	A `MessageEvent` is the interface representing a message received by a target, being a `WebSocket` or a WebRTC `RTCDataChannel`
+	The `MessageEvent` interface represents a message received by a target object.
 
 	Documentation [MessageEvent](https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent>
 **/
 @:native("MessageEvent")
-extern class MessageEvent extends Event
-{
+extern class MessageEvent extends Event {
 	
 	/**
-		Returns a `DOMString`, `Blob` or an `ArrayBuffer` containing the data send by the emitter.
+		The data sent by the message emitter.
 	**/
 	var data(default,null) : Dynamic;
 	
 	/**
-		Is a `DOMString` …
+		A `USVString` representing the origin of the message emitter.
 	**/
 	var origin(default,null) : String;
+	
+	/**
+		A `DOMString` representing a unique ID for the event.
+	**/
 	var lastEventId(default,null) : String;
 	
 	/**
-		…
+		A `MessageEventSource` (which can be a `WindowProxy`, `MessagePort`, or `ServiceWorker` object) representing the message emitter.
 	**/
-	var source(default,null) : haxe.extern.EitherType<Window,MessagePort>;
+	var source(default,null) : haxe.extern.EitherType<Window,haxe.extern.EitherType<MessagePort,ServiceWorker>>;
 	
 	/**
-		…
+		An array of `MessagePort` objects representing the ports associated with the channel the message is being sent through (where appropriate, e.g. in channel messaging or when sending a message to a shared worker).
 	**/
-	var ports(default,null) : MessagePortList;
+	var ports(default,null) : Array<MessagePort>;
 	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : MessageEventInit ) : Void;
 	
 	/**
-		… Do not use this anymore: use the `MessageEvent.MessageEvent` constructor instead.
+		Initializes a message event. Do not use this anymore — use the `MessageEvent.MessageEvent` constructor instead.
 	**/
-	function initMessageEvent( type : String, bubbles : Bool, cancelable : Bool, data : Dynamic, origin : String, lastEventId : String, source : haxe.extern.EitherType<Window,MessagePort>, ports : Array<MessagePort> ) : Void;
+	@:overload( function( type : String, bubbles : Bool = false, cancelable : Bool = false, ?data : Dynamic, origin : String = "", lastEventId : String = "", ?source : MessagePort, ?ports : Array<MessagePort>) : Void {} )
+	@:overload( function( type : String, bubbles : Bool = false, cancelable : Bool = false, ?data : Dynamic, origin : String = "", lastEventId : String = "", ?source : ServiceWorker, ?ports : Array<MessagePort>) : Void {} )
+	function initMessageEvent( type : String, bubbles : Bool = false, cancelable : Bool = false, ?data : Dynamic, origin : String = "", lastEventId : String = "", ?source : Window, ?ports : Array<MessagePort> ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/MessageEventInit.hx b/std/js/html/MessageEventInit.hx
index 34eb0f35838cc6e4cb7feeef9378482847f64933..f974b3fe07a06e375937f2488a90465ae399800a 100644
--- a/std/js/html/MessageEventInit.hx
+++ b/std/js/html/MessageEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,12 +24,10 @@
 
 package js.html;
 
-typedef MessageEventInit =
-{
-	> EventInit,
-	@:optional var data : Dynamic;
-	@:optional var lastEventId : String;
-	@:optional var origin : String;
-	@:optional var ports : Array<MessagePort>;
-	@:optional var source : haxe.extern.EitherType<Window,MessagePort>;
+typedef MessageEventInit = EventInit & {
+	var ?data : Dynamic;
+	var ?lastEventId : String;
+	var ?origin : String;
+	var ?ports : Array<MessagePort>;
+	var ?source : haxe.extern.EitherType<Window,haxe.extern.EitherType<MessagePort,ServiceWorker>>;
 }
\ No newline at end of file
diff --git a/std/js/html/MessagePort.hx b/std/js/html/MessagePort.hx
index 7eb33a8f1be9c454ae2eaad42c598ab772e33337..58df21bcb424cc60e014788a70c1fd2bcb42ba0d 100644
--- a/std/js/html/MessagePort.hx
+++ b/std/js/html/MessagePort.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,16 +25,16 @@
 package js.html;
 
 /**
-	The `MessagePort` interface of the Channel Messaging API represents one of the two ports of a `MessageChannel`, allowing sending of messages from one port and listening out for them arriving at the other.
+	The `MessagePort` interface of the Channel Messaging API represents one of the two ports of a `MessageChannel`, allowing messages to be sent from one port and listening out for them arriving at the other.
 
 	Documentation [MessagePort](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MessagePort>
 **/
 @:native("MessagePort")
-extern class MessagePort extends EventTarget
-{
+extern class MessagePort extends EventTarget {
 	var onmessage : haxe.Constraints.Function;
+	var onmessageerror : haxe.Constraints.Function;
 	
 	/** @throws DOMError */
 	function postMessage( message : Dynamic, ?transferable : Array<Dynamic> ) : Void;
diff --git a/std/js/html/MetaElement.hx b/std/js/html/MetaElement.hx
index 4dbac3f9a576ff6d1b7baec2e41b162ceef88f4c..3fca456d5b7a223a3211c8a7b7aafef2d94a3d84 100644
--- a/std/js/html/MetaElement.hx
+++ b/std/js/html/MetaElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLMetaElement>
 **/
 @:native("HTMLMetaElement")
-extern class MetaElement extends Element
-{
+extern class MetaElement extends Element {
 	var name : String;
 	var httpEquiv : String;
 	var content : String;
diff --git a/std/js/html/MeterElement.hx b/std/js/html/MeterElement.hx
index 0cc1ac5f356ac2af4522b4a5c153ba066cc51638..1aab520d8834d1f56630377dcf50a76dca0f639a 100644
--- a/std/js/html/MeterElement.hx
+++ b/std/js/html/MeterElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,41 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLMeterElement>
 **/
 @:native("HTMLMeterElement")
-extern class MeterElement extends Element
-{
+extern class MeterElement extends Element {
+	
+	/**
+		A `double` representing the currrent value, reflecting the `value` attribute.
+	**/
 	var value : Float;
+	
+	/**
+		A `double` representing the minimum value, reflecting the `min` attribute.
+	**/
 	var min : Float;
+	
+	/**
+		A `double` representing the maximum value, reflecting the `max` attribute.
+	**/
 	var max : Float;
+	
+	/**
+		A `double` representing the value of the low boundary, reflecting the `low`attribute.
+	**/
 	var low : Float;
+	
+	/**
+		A `double` representing the value of the high boundary, reflecting the `high` attribute.
+	**/
 	var high : Float;
+	
+	/**
+		A `double` representing the optimum, reflecting the `optimum` attribute.
+	**/
 	var optimum : Float;
 	
+	/**
+		A `NodeList` of `label` elements that are associated with the element.
+	**/
+	var labels(default,null) : NodeList;
+	
 }
\ No newline at end of file
diff --git a/std/js/html/MimeType.hx b/std/js/html/MimeType.hx
index 66ab2d74750b28965d177c923cac65998ad0b76f..8029ad31bf17cb064e00d1d8af26107cdfbd646a 100644
--- a/std/js/html/MimeType.hx
+++ b/std/js/html/MimeType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,12 +24,34 @@
 
 package js.html;
 
+/**
+	The `MimeType` interface provides contains information about a MIME type associated with a particular plugin. `NavigatorPlugins.mimeTypes` returns an array of this object.
+
+	Documentation [MimeType](https://developer.mozilla.org/en-US/docs/Web/API/MimeType) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MimeType$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MimeType>
+**/
 @:native("MimeType")
-extern class MimeType
-{
+extern class MimeType {
+	
+	/**
+		Returns a description of the associated plugin or an empty string if there is none.
+	**/
 	var description(default,null) : String;
+	
+	/**
+		Returns an instance of `Plugin` containing information about the plugin itself.
+	**/
 	var enabledPlugin(default,null) : Plugin;
+	
+	/**
+		A string containing valid file extensions for the data displayed by the plugin, or an empty string if an extension is not valid for the particular module. For example, a browser's content decryption module may appear in the plugin list, but support more file extenions than can be anticipated. It might therefore return an empty string.
+	**/
 	var suffixes(default,null) : String;
+	
+	/**
+		Returns the MIME type of the associated plugin.
+	**/
 	var type(default,null) : String;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/MimeTypeArray.hx b/std/js/html/MimeTypeArray.hx
index 4914a8af0a08d8e9e87be48d756978053646bfb6..81c0b31450c7f5f975fe98bfb3182e97394c9b66 100644
--- a/std/js/html/MimeTypeArray.hx
+++ b/std/js/html/MimeTypeArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,29 @@
 
 package js.html;
 
+/**
+	The `MimeTypeArray` interface returns an array of `MimeType` instances, each of which contains information about a supported browser plugins. This object is returned by `NavigatorPlugins.mimeTypes`.
+
+	Documentation [MimeTypeArray](https://developer.mozilla.org/en-US/docs/Web/API/MimeTypeArray) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MimeTypeArray$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MimeTypeArray>
+**/
 @:native("MimeTypeArray")
-extern class MimeTypeArray implements ArrayAccess<MimeType>
-{
+extern class MimeTypeArray implements ArrayAccess<MimeType> {
+	
+	/**
+		The number of items in the array.
+	**/
 	var length(default,null) : Int;
 	
+	
+	/**
+		Returns the `MimeType` object with the specified index.
+	**/
 	function item( index : Int ) : MimeType;
+	
+	/**
+		Returns the `MimeType` object with the specified name.
+	**/
 	function namedItem( name : String ) : MimeType;
 }
\ No newline at end of file
diff --git a/std/js/html/ModElement.hx b/std/js/html/ModElement.hx
index d0d78c66ba09f16101c5fa5a1ffeddec4c5b1560..ed8a7a57b6d8e6f848e24a0ecb3f342a397e2258 100644
--- a/std/js/html/ModElement.hx
+++ b/std/js/html/ModElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,16 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLModElement>
 **/
 @:native("HTMLModElement")
-extern class ModElement extends Element
-{
+extern class ModElement extends Element {
 	
 	/**
 		Is a `DOMString` reflecting the `cite` HTML attribute, containing a URI of a resource explaining the change.
 	**/
 	var cite : String;
+	
+	/**
+		Is a `DOMString` reflecting the `datetime` HTML attribute, containing a date-and-time string representing a timestamp for the change.
+	**/
 	var dateTime : String;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/MouseEvent.hx b/std/js/html/MouseEvent.hx
index 9d415b5dde9d77f3f68f57d7b339c0847f4cd2e4..ed57f1cb6775e50afb8e7b528e3ad4cd3f3c732c 100644
--- a/std/js/html/MouseEvent.hx
+++ b/std/js/html/MouseEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `MouseEvent` interface represents events that occur due to the user interacting with a pointing device (such as a mouse). Common events using this interface include `click`, `dblclick`, `mouseup`, `mousedown`.
+	The `MouseEvent` interface represents events that occur due to the user interacting with a pointing device (such as a mouse). Common events using this interface include `click`, `dblclick`, `mouseup`, `mousedown`.
 
 	Documentation [MouseEvent](https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent>
 **/
 @:native("MouseEvent")
-extern class MouseEvent extends UIEvent
-{
+extern class MouseEvent extends UIEvent {
 	
 	/**
 		The X coordinate of the mouse pointer in global (screen) coordinates.
@@ -55,6 +54,16 @@ extern class MouseEvent extends UIEvent
 	**/
 	var clientY(default,null) : Int;
 	
+	/**
+		Alias for `MouseEvent.clientX`.
+	**/
+	var x(default,null) : Int;
+	
+	/**
+		Alias for `MouseEvent.clientY`
+	**/
+	var y(default,null) : Int;
+	
 	/**
 		The X coordinate of the mouse pointer relative to the position of the padding edge of the target node.
 	**/
@@ -86,13 +95,13 @@ extern class MouseEvent extends UIEvent
 	var metaKey(default,null) : Bool;
 	
 	/**
-		The button number that was pressed when the mouse event was fired. 
+		The button number that was pressed (if applicable) when the mouse event was fired.
 	**/
 	var button(default,null) : Int;
 	
 	/**
 		
-		 The buttons being pressed when the mouse event was fired
+		 The buttons being depressed (if any) when the mouse event was fired.
 		 
 	**/
 	var buttons(default,null) : Int;
@@ -125,11 +134,11 @@ extern class MouseEvent extends UIEvent
 	/**
 		Initializes the value of a `MouseEvent` created. If the event has already being dispatched, this method does nothing.
 	**/
-	function initMouseEvent( typeArg : String, canBubbleArg : Bool, cancelableArg : Bool, viewArg : Window, detailArg : Int, screenXArg : Int, screenYArg : Int, clientXArg : Int, clientYArg : Int, ctrlKeyArg : Bool, altKeyArg : Bool, shiftKeyArg : Bool, metaKeyArg : Bool, buttonArg : Int, relatedTargetArg : EventTarget ) : Void;
+	function initMouseEvent( typeArg : String, canBubbleArg : Bool = false, cancelableArg : Bool = false, ?viewArg : Window, detailArg : Int = 0, screenXArg : Int = 0, screenYArg : Int = 0, clientXArg : Int = 0, clientYArg : Int = 0, ctrlKeyArg : Bool = false, altKeyArg : Bool = false, shiftKeyArg : Bool = false, metaKeyArg : Bool = false, buttonArg : Int = 0, ?relatedTargetArg : EventTarget ) : Void;
 	
 	/**
 		Returns the current state of the specified modifier key. See the `KeyboardEvent.getModifierState`() for details.
 	**/
 	function getModifierState( keyArg : String ) : Bool;
-	function initNSMouseEvent( typeArg : String, canBubbleArg : Bool, cancelableArg : Bool, viewArg : Window, detailArg : Int, screenXArg : Int, screenYArg : Int, clientXArg : Int, clientYArg : Int, ctrlKeyArg : Bool, altKeyArg : Bool, shiftKeyArg : Bool, metaKeyArg : Bool, buttonArg : Int, relatedTargetArg : EventTarget, pressure : Float, inputSourceArg : Int ) : Void;
+	function initNSMouseEvent( typeArg : String, canBubbleArg : Bool = false, cancelableArg : Bool = false, ?viewArg : Window, detailArg : Int = 0, screenXArg : Int = 0, screenYArg : Int = 0, clientXArg : Int = 0, clientYArg : Int = 0, ctrlKeyArg : Bool = false, altKeyArg : Bool = false, shiftKeyArg : Bool = false, metaKeyArg : Bool = false, buttonArg : Int = 0, ?relatedTargetArg : EventTarget, pressure : Float = 0.0, inputSourceArg : Int = 0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/MouseEventInit.hx b/std/js/html/MouseEventInit.hx
index 2f9893c47851d1dfb9ae970f1421c5efad7e91b8..e4c872d07895db5d242de67b598730fa1d13d56f 100644
--- a/std/js/html/MouseEventInit.hx
+++ b/std/js/html/MouseEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,16 +24,14 @@
 
 package js.html;
 
-typedef MouseEventInit =
-{
-	> EventModifierInit,
-	@:optional var button : Int;
-	@:optional var buttons : Int;
-	@:optional var clientX : Int;
-	@:optional var clientY : Int;
-	@:optional var movementX : Int;
-	@:optional var movementY : Int;
-	@:optional var relatedTarget : EventTarget;
-	@:optional var screenX : Int;
-	@:optional var screenY : Int;
+typedef MouseEventInit = EventModifierInit & {
+	var ?button : Int;
+	var ?buttons : Int;
+	var ?clientX : Int;
+	var ?clientY : Int;
+	var ?movementX : Int;
+	var ?movementY : Int;
+	var ?relatedTarget : EventTarget;
+	var ?screenX : Int;
+	var ?screenY : Int;
 }
\ No newline at end of file
diff --git a/std/js/html/MouseScrollEvent.hx b/std/js/html/MouseScrollEvent.hx
index 537027244978dd440914a33cd877fea928907f76..28e3a8df95f1a0c42bd6733acdafeb594229ed63 100644
--- a/std/js/html/MouseScrollEvent.hx
+++ b/std/js/html/MouseScrollEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,12 +32,11 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MouseScrollEvent>
 **/
 @:native("MouseScrollEvent")
-extern class MouseScrollEvent extends MouseEvent
-{
+extern class MouseScrollEvent extends MouseEvent {
 	static inline var HORIZONTAL_AXIS : Int = 1;
 	static inline var VERTICAL_AXIS : Int = 2;
 	
 	var axis(default,null) : Int;
 	
-	function initMouseScrollEvent( type : String, canBubble : Bool, cancelable : Bool, view : Window, detail : Int, screenX : Int, screenY : Int, clientX : Int, clientY : Int, ctrlKey : Bool, altKey : Bool, shiftKey : Bool, metaKey : Bool, button : Int, relatedTarget : EventTarget, axis : Int ) : Void;
+	function initMouseScrollEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?view : Window, detail : Int = 0, screenX : Int = 0, screenY : Int = 0, clientX : Int = 0, clientY : Int = 0, ctrlKey : Bool = false, altKey : Bool = false, shiftKey : Bool = false, metaKey : Bool = false, button : Int = 0, ?relatedTarget : EventTarget, axis : Int = 0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/MutationEvent.hx b/std/js/html/MutationEvent.hx
index cf174e517e0cfb399018c508ea759c11563ed378..fa0c72faa350e9c3a24bb678c143f3c015c3fb55 100644
--- a/std/js/html/MutationEvent.hx
+++ b/std/js/html/MutationEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MutationEvent>
 **/
 @:native("MutationEvent")
-extern class MutationEvent extends Event
-{
+extern class MutationEvent extends Event {
 	static inline var MODIFICATION : Int = 1;
 	static inline var ADDITION : Int = 2;
 	static inline var REMOVAL : Int = 3;
@@ -45,5 +44,5 @@ extern class MutationEvent extends Event
 	var attrChange(default,null) : Int;
 	
 	/** @throws DOMError */
-	function initMutationEvent( type : String, canBubble : Bool, cancelable : Bool, relatedNode : Node, prevValue : String, newValue : String, attrName : String, attrChange : Int ) : Void;
+	function initMutationEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?relatedNode : Node, prevValue : String = "", newValue : String = "", attrName : String = "", attrChange : Int = 0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/MutationObserver.hx b/std/js/html/MutationObserver.hx
index 4c5c2ce325012e73f6d4413ccf7503c899838e37..7de1b48194c7f5f4784ede7f50a916849a18a600 100644
--- a/std/js/html/MutationObserver.hx
+++ b/std/js/html/MutationObserver.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	`MutationObserver` provides developers a way to react to changes in a DOM. It is designed as a replacement for Mutation Events defined in the DOM3 Events specification.
+	The `MutationObserver` interface provides the ability to watch for changes being made to the DOM tree. It is designed as a replacement for the older Mutation Events feature which was part of the DOM3 Events specification.
 
 	Documentation [MutationObserver](https://developer.mozilla.org/en-US/docs/Web/API/MutationObserver) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MutationObserver$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MutationObserver>
 **/
 @:native("MutationObserver")
-extern class MutationObserver
-{
+extern class MutationObserver {
 	/** @throws DOMError */
 	function new( mutationCallback : Array<MutationRecord> -> MutationObserver -> Void ) : Void;
 	/** @throws DOMError */
diff --git a/std/js/html/MutationObserverInit.hx b/std/js/html/MutationObserverInit.hx
index 99b4efa9dfbbcfebcc474e20c5e26d9691d7727d..319798794afcd87a617804e863d3d118b1577123 100644
--- a/std/js/html/MutationObserverInit.hx
+++ b/std/js/html/MutationObserverInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,15 +24,47 @@
 
 package js.html;
 
-typedef MutationObserverInit =
-{
-	@:optional var animations : Bool;
-	@:optional var attributeFilter : Array<String>;
-	@:optional var attributeOldValue : Bool;
-	@:optional var attributes : Bool;
-	@:optional var characterData : Bool;
-	@:optional var characterDataOldValue : Bool;
-	@:optional var childList : Bool;
-	@:optional var nativeAnonymousChildList : Bool;
-	@:optional var subtree : Bool;
+/**
+	The `MutationObserverInit` dictionary describes the configuration of a mutation observer. As such, it's primarily used as the type of the `options` parameter on the `MutationObserver.observe()` method.
+
+	Documentation [MutationObserverInit](https://developer.mozilla.org/en-US/docs/Web/API/MutationObserverInit) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MutationObserverInit$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MutationObserverInit>
+**/
+typedef MutationObserverInit = {
+	
+	/**
+		An array of specific attribute names to be monitored. If this property isn't included, changes to all attributes cause mutation notifications. No default value.
+	**/
+	var ?attributeFilter : Array<String>;
+	
+	/**
+		Set to `true` to record the previous value of any attribute that changes when monitoring the node or nodes for attribute changes; see `/en-US/docs/Web/API/MutationObserver` for details on watching for attribute changes and value recording. No default value.
+	**/
+	var ?attributeOldValue : Bool;
+	
+	/**
+		Set to `true` to watch for changes to the value of attributes on the node or nodes being monitored. The default value is `false`.
+	**/
+	var ?attributes : Bool;
+	
+	/**
+		Set to `true` to monitor the specified target node or subtree for changes to the character data contained within the node or nodes. No default value.
+	**/
+	var ?characterData : Bool;
+	
+	/**
+		Set to `true` to record the previous value of a node's text whenever the text changes on nodes being monitored. For details and an example, see `/en-US/docs/Web/API/MutationObserver`. No default value.
+	**/
+	var ?characterDataOldValue : Bool;
+	
+	/**
+		Set to `true` to monitor the target node (and, if `subtree` is `true`, its descendants) for the addition or removal of new child nodes. The default is `false`.
+	**/
+	var ?childList : Bool;
+	
+	/**
+		Set to `true` to extend monitoring to the entire subtree of nodes rooted at `target`. All of the other `MutationObserverInit` properties are then extended to all of the nodes in the subtree instead of applying solely to the `target` node. The default value is `false`.
+	**/
+	var ?subtree : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/MutationRecord.hx b/std/js/html/MutationRecord.hx
index 00f70549b10f6125b027a8879685c1e22e516f8f..abfcc08096020026704565d0448a38720ad99dfc 100644
--- a/std/js/html/MutationRecord.hx
+++ b/std/js/html/MutationRecord.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MutationRecord>
 **/
 @:native("MutationRecord")
-extern class MutationRecord
-{
+extern class MutationRecord {
 	var type(default,null) : String;
 	var target(default,null) : Node;
 	var addedNodes(default,null) : NodeList;
diff --git a/std/js/html/NamedNodeMap.hx b/std/js/html/NamedNodeMap.hx
index 3710f83e082aaa7a58de7dc3673558f631ec8ca1..b9daa42783589f18709df2ee30414f121e758b77 100644
--- a/std/js/html/NamedNodeMap.hx
+++ b/std/js/html/NamedNodeMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/NamedNodeMap>
 **/
 @:native("NamedNodeMap")
-extern class NamedNodeMap implements ArrayAccess<Attr>
-{
+extern class NamedNodeMap implements ArrayAccess<Attr> {
 	
 	/**
 		Returns the amount of objects in the map.
@@ -45,16 +44,16 @@ extern class NamedNodeMap implements ArrayAccess<Attr>
 		Returns a `Attr`, corresponding to the given name.
 	**/
 	function getNamedItem( name : String ) : Attr;
-	/** @throws DOMError */
 	
 	/**
 		Replaces, or adds, the `Attr` identified in the map by the given name.
+		@throws DOMError
 	**/
 	function setNamedItem( arg : Attr ) : Attr;
-	/** @throws DOMError */
 	
 	/**
 		Removes the `Attr` identified by the given map.
+		@throws DOMError
 	**/
 	function removeNamedItem( name : String ) : Attr;
 	
@@ -67,16 +66,16 @@ extern class NamedNodeMap implements ArrayAccess<Attr>
 		Returns a `Attr` identified by a namespace and related local name.
 	**/
 	function getNamedItemNS( namespaceURI : String, localName : String ) : Attr;
-	/** @throws DOMError */
 	
 	/**
 		Replaces, or adds, the `Attr` identified in the map by the given namespace and related local name.
+		@throws DOMError
 	**/
 	function setNamedItemNS( arg : Attr ) : Attr;
-	/** @throws DOMError */
 	
 	/**
 		Removes the `Attr` identified by the given namespace and related local name.
+		@throws DOMError
 	**/
 	function removeNamedItemNS( namespaceURI : String, localName : String ) : Attr;
 }
\ No newline at end of file
diff --git a/std/js/html/NavigationType.hx b/std/js/html/NavigationType.hx
new file mode 100644
index 0000000000000000000000000000000000000000..254c4bb36e58511f3ba358bdf85bc03d7ff3104d
--- /dev/null
+++ b/std/js/html/NavigationType.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PerformanceNavigationTiming.webidl. Do not edit!
+
+package js.html;
+
+enum abstract NavigationType(String) {
+	var NAVIGATE = "navigate";
+	var RELOAD = "reload";
+	var BACK_FORWARD = "back_forward";
+	var PRERENDER = "prerender";
+}
\ No newline at end of file
diff --git a/std/js/html/Navigator.hx b/std/js/html/Navigator.hx
index ae288284d6a51e9dfe5983804182006784d155f8..a192bad3016f83938adf83031d0b5af17babfd45 100644
--- a/std/js/html/Navigator.hx
+++ b/std/js/html/Navigator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `Navigator` interface represents the state and the identity of the user agent. It allows scripts to query it and to register themselves to carry on some activities.
 
@@ -32,54 +34,63 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Navigator>
 **/
 @:native("Navigator")
-extern class Navigator
-{
-	
+extern class Navigator {
+
 	/**
 		Returns a `Permissions` object that can be used to query and update permission status of APIs covered by the Permissions API.
 	**/
 	var permissions(default,null) : Permissions;
 	var mimeTypes(default,null) : MimeTypeArray;
 	var plugins(default,null) : PluginArray;
-	
+
 	/**
 		Reports the value of the user's do-not-track preference. When this value is "yes", your web site or application should not track the user.
 	**/
 	var doNotTrack(default,null) : String;
-	
-	/**
-		Returns a `BatteryManager` object you can use to get information about the battery charging status.
-	**/
-	var battery(default,null) : BatteryManager;
 	var maxTouchPoints(default,null) : Int;
-	
+
 	/**
 		Returns a string that represents the current operating system.
 	**/
 	var oscpu(default,null) : String;
-	
+
 	/**
 		Returns the vendor name of the current browser (e.g., "Netscape6").
 	**/
 	var vendor(default,null) : String;
-	
+
 	/**
 		Returns the vendor version number (e.g. "6.1").
 	**/
 	var vendorSub(default,null) : String;
-	
+
 	/**
 		Returns the build number of the current browser (e.g., "20060909").
 	**/
 	var productSub(default,null) : String;
-	
+
 	/**
-		Returns a boolean indicating whether cookies are enabled in the browser or not.
+		Returns false if setting a cookie will be ignored and true otherwise.
 	**/
 	var cookieEnabled(default,null) : Bool;
+
+	/**
+		Returns the build identifier of the browser (e.g., "2006090803").
+	**/
 	var buildID(default,null) : String;
+
+	/**
+		Returns a reference to a `MediaDevices` object which can then be used to get information about available media devices (`MediaDevices.enumerateDevices()`), find out what constrainable properties are supported for media on the user's computer and user agent (`MediaDevices.getSupportedConstraints()`), and to request access to media using `MediaDevices.getUserMedia()`.
+	**/
+	var mediaDevices(default,null) : MediaDevices;
+
+	/**
+		Returns a `ServiceWorkerContainer` object, which provides access to registration, removal, upgrade, and communication with the `ServiceWorker` objects for the associated document.
+	**/
+	var serviceWorker(default,null) : ServiceWorkerContainer;
+	var clipboard(default,null) : Clipboard;
 	var hardwareConcurrency(default,null) : Int;
-	
+
 	/**
 		Returns a `Geolocation` object allowing accessing the location of the device.
 	**/
@@ -93,20 +104,22 @@ extern class Navigator
 	var language(default,null) : String;
 	var languages(default,null) : Array<String>;
 	var onLine(default,null) : Bool;
-	
-	/** @throws DOMError */
-	function getBattery() : Promise<BatteryManager>;
+	var storage(default,null) : StorageManager;
+
 	@:overload( function( duration : Int ) : Bool {} )
 	function vibrate( pattern : Array<Int> ) : Bool;
-	/** @throws DOMError */
 	function javaEnabled() : Bool;
 	/** @throws DOMError */
 	function getGamepads() : Array<Gamepad>;
 	/** @throws DOMError */
-	function sendBeacon( url : String, ?data : haxe.extern.EitherType<ArrayBufferView,haxe.extern.EitherType<Blob,haxe.extern.EitherType<String,FormData>>> ) : Bool;
-	/** @throws DOMError */
-	function registerProtocolHandler( scheme : String, url : String, title : String ) : Void;
+	function requestMIDIAccess( ?options : js.html.midi.MIDIOptions ) : Promise<js.html.midi.MIDIAccess>;
 	/** @throws DOMError */
-	function registerContentHandler( mimeType : String, url : String, title : String ) : Void;
+	@:overload( function( url : String, ?data : js.lib.ArrayBufferView) : Bool {} )
+	@:overload( function( url : String, ?data : js.lib.ArrayBuffer) : Bool {} )
+	@:overload( function( url : String, ?data : FormData) : Bool {} )
+	@:overload( function( url : String, ?data : URLSearchParams) : Bool {} )
+	@:overload( function( url : String, ?data : String) : Bool {} )
+	function sendBeacon( url : String, ?data : Blob ) : Bool;
+	function requestMediaKeySystemAccess( keySystem : String, supportedConfigurations : Array<js.html.eme.MediaKeySystemConfiguration> ) : Promise<js.html.eme.MediaKeySystemAccess>;
 	function taintEnabled() : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/Node.hx b/std/js/html/Node.hx
index b1c8e110e98373d950f3aad7308f3d3824c7cbe4..5551c66ed9dcea6316190c7cd403054eb12de063 100644
--- a/std/js/html/Node.hx
+++ b/std/js/html/Node.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	A `Node` is an interface from which a number of DOM types inherit, and allows these various types to be treated (or tested) similarly.
+	`Node` is an interface from which a number of DOM API object types inherit. It allows those types to be treated similarly; for example, inheriting the same set of methods, or being tested in the same way.
 
 	Documentation [Node](https://developer.mozilla.org/en-US/docs/Web/API/Node) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Node$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Node>
 **/
 @:native("Node")
-extern class Node extends EventTarget
-{
+extern class Node extends EventTarget {
 	static inline var ELEMENT_NODE : Int = 1;
 	static inline var ATTRIBUTE_NODE : Int = 2;
 	static inline var TEXT_NODE : Int = 3;
@@ -117,7 +116,7 @@ extern class Node extends EventTarget
 	var nodeType(default,null) : Int;
 	
 	/**
-		Returns a `DOMString` containing the name of the `Node`. The structure of the name will differ with the name type. E.g. An `HTMLElement` will contain the name of the corresponding tag, like `'audio'` for an `HTMLAudioElement`, a `Text` node will have the `'#text'` string, or a `Document` node will have the `'#document'` string.
+		Returns a `DOMString` containing the name of the `Node`. The structure of the name will differ with the node type. E.g. An `HTMLElement` will contain the name of the corresponding tag, like `'audio'` for an `HTMLAudioElement`, a `Text` node will have the `'#text'` string, or a `Document` node will have the `'#document'` string.
 	**/
 	var nodeName(default,null) : String;
 	
@@ -127,7 +126,12 @@ extern class Node extends EventTarget
 	var baseURI(default,null) : String;
 	
 	/**
-		Returns the `Document` that this node belongs to. If no document is associated with it, returns `null`.
+		Returns a boolean indicating whether or not the Node is connected (directly or indirectly) to the context object, e.g. the `Document` object in the case of the normal DOM, or the `ShadowRoot` in the case of a shadow DOM.
+	**/
+	var isConnected(default,null) : Bool;
+	
+	/**
+		Returns the `Document` that this node belongs to. If the node is itself a document, returns `null`.
 	**/
 	var ownerDocument(default,null) : HTMLDocument;
 	
@@ -176,58 +180,42 @@ extern class Node extends EventTarget
 	**/
 	var textContent : String;
 	
-	/**
-		The namespace URI of this node, or `null` if it is no namespace.
-		 
-		 Note: In Firefox 3.5 and earlier, HTML elements are in no namespace. In later versions, HTML elements are in the `https://www.w3.org/1999/xhtml/` namespace in both HTML and XML trees. `1.9.2`
-		 
-		 
-	**/
-	var namespaceURI(default,null) : String;
 	
 	/**
-		Is a `DOMString` representing the namespace prefix of the node, or `null` if no prefix is specified.
+		Returns the context object's root which optionally includes the shadow root if it is available. 
 	**/
-	var prefix(default,null) : String;
-	
-	/**
-		Returns a `DOMString` representing the local part of the qualified name of an element.
-		 
-		 Note: In Firefox 3.5 and earlier, the property upper-cases the local name for HTML elements (but not XHTML elements). In later versions, this does not happen, so the property is in lower case for both HTML and XHTML. `1.9.2`
-		 
-		 
-	**/
-	var localName(default,null) : String;
-	
+	@:pure
+	function getRootNode( ?options : GetRootNodeOptions ) : Node;
 	
 	/**
 		Returns a `Boolean` indicating if the element has any child nodes, or not.
 	**/
+	@:pure
 	function hasChildNodes() : Bool;
-	/** @throws DOMError */
 	
 	/**
-		Inserts the first `Node` given in a parameter immediately before the second, child of this element, `Node`.
+		Inserts a `Node` before the reference node as a child of a specified parent node.
+		@throws DOMError
 	**/
 	function insertBefore( node : Node, child : Node ) : Node;
-	/** @throws DOMError */
 	
 	/**
 		Adds the specified childNode argument as the last child to the current node.
 		
 		 If the argument referenced an existing node on the DOM tree, the node will be detached from its current position and attached at the new position.
+		@throws DOMError
 	**/
 	function appendChild( node : Node ) : Node;
-	/** @throws DOMError */
 	
 	/**
 		Replaces one child `Node` of the current one with the second one given in parameter.
+		@throws DOMError
 	**/
 	function replaceChild( node : Node, child : Node ) : Node;
-	/** @throws DOMError */
 	
 	/**
 		Removes a child node from the current element, which must be a child of the current node.
+		@throws DOMError
 	**/
 	function removeChild( child : Node ) : Node;
 	
@@ -235,40 +223,52 @@ extern class Node extends EventTarget
 		Clean up all the text nodes under this element (merge adjacent, remove empty).
 	**/
 	function normalize() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Clone a `Node`, and optionally, all of its contents. By default, it clones the content of the node.
+		@throws DOMError
+	**/
+	function cloneNode( deep : Bool = false ) : Node;
+	
+	/**
+		Returns a `Boolean` value indicating whether or not the two nodes are the same (that is, they reference the same object).
 	**/
-	function cloneNode( ?deep : Bool = false ) : Node;
+	@:pure
+	function isSameNode( node : Node ) : Bool;
 	
 	/**
 		Returns a `Boolean` which indicates whether or not two nodes are of the same type and all their defining data points match.
 	**/
+	@:pure
 	function isEqualNode( node : Node ) : Bool;
 	
 	/**
-		Returns the context objects root which optionally includes the shadow root if it is available. 
+		Compares the position of the current node against another node in any other document.
 	**/
+	@:pure
 	function compareDocumentPosition( other : Node ) : Int;
 	
 	/**
-		Returns the context objects root which optionally includes the shadow root if it is available. 
+		Returns a `Boolean` value indicating whether a node is a descendant of a given node or not.
 	**/
+	@:pure
 	function contains( other : Node ) : Bool;
 	
 	/**
-		Clean up all the text nodes under this element (merge adjacent, remove empty).
+		Returns a `DOMString` containing the prefix for a given namespace URI, if present, and `null` if not. When multiple prefixes are possible, the result is implementation-dependent.
 	**/
-	function lookupPrefix( namespace_ : String ) : String;
+	@:pure
+	function lookupPrefix( namespace : String ) : String;
 	
 	/**
-		Clean up all the text nodes under this element (merge adjacent, remove empty).
+		Accepts a prefix and returns the namespace URI associated with it on the given node if found (and `null` if not). Supplying `null` for the prefix will return the default namespace.
 	**/
+	@:pure
 	function lookupNamespaceURI( prefix : String ) : String;
 	
 	/**
-		Returns a `Boolean` which indicates whether or not two nodes are of the same type and all their defining data points match.
+		Accepts a namespace URI as an argument and returns a `Boolean` with a value of `true` if the namespace is the default namespace on the given node or `false` if not.
 	**/
-	function isDefaultNamespace( namespace_ : String ) : Bool;
+	@:pure
+	function isDefaultNamespace( namespace : String ) : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/NodeFilter.hx b/std/js/html/NodeFilter.hx
index 9384f059cd90889ae1f8caf858e54d42a1d2285c..ae93074075c225d7063d8399ec5fbd5414886543 100644
--- a/std/js/html/NodeFilter.hx
+++ b/std/js/html/NodeFilter.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/NodeFilter>
 **/
 @:native("NodeFilter")
-extern class NodeFilter
-{
+extern class NodeFilter {
 	static inline var FILTER_ACCEPT : Int = 1;
 	static inline var FILTER_REJECT : Int = 2;
 	static inline var FILTER_SKIP : Int = 3;
@@ -54,27 +53,27 @@ extern class NodeFilter
 	
 	/**
 		Returns an <code>unsigned short</code> that will be used to tell if a given <code>Node</code> must be accepted or not by the <code>NodeIterator</code> or <code>TreeWalker</code> iteration algorithm. This method is expected to be written by the user of a <code>NodeFilter</code>. Possible return values are:
-		 <table class="standard-table">
-		  
-		   <tr>
-		    <td class="header">Constant</td>
-		    <td class="header">Description</td>
-		   </tr>
-		   <tr>
-		    <td><code>FILTER_ACCEPT</code></td>
-		    <td>Value returned by the <code>NodeFilter.acceptNode()</code> method when a node should be accepted.</td>
-		   </tr>
-		   <tr>
-		    <td><code>FILTER_REJECT</code></td>
-		    <td>Value to be returned by the <code>NodeFilter.acceptNode()</code> method when a node should be rejected. For <code>TreeWalker</code>, child nodes are also rejected. For <code>NodeIterator</code>, this flag is synonymous with FILTER_SKIP.</td>
-		   </tr>
-		   <tr>
-		    <td><code>FILTER_SKIP</code></td>
-		    <td>Value to be returned by <code>NodeFilter.acceptNode()</code> for nodes to be skipped by the <code>NodeIterator</code> or <code>TreeWalker</code> object. The children of skipped nodes are still considered. This is treated as "skip this node but not its children".</td>
-		   </tr>
-		  
-		 </table>
-		 
+			<table class="standard-table">
+				
+					<tr>
+						<td class="header">Constant</td>
+						<td class="header">Description</td>
+					</tr>
+					<tr>
+						<td><code>FILTER_ACCEPT</code></td>
+						<td>Value returned by the <code>NodeFilter.acceptNode()</code> method when a node should be accepted.</td>
+					</tr>
+					<tr>
+						<td><code>FILTER_REJECT</code></td>
+						<td>Value to be returned by the <code>NodeFilter.acceptNode()</code> method when a node should be rejected. For <code>TreeWalker</code>, child nodes are also rejected. For <code>NodeIterator</code>, this flag is synonymous with FILTER_SKIP.</td>
+					</tr>
+					<tr>
+						<td><code>FILTER_SKIP</code></td>
+						<td>Value to be returned by <code>NodeFilter.acceptNode()</code> for nodes to be skipped by the <code>NodeIterator</code> or <code>TreeWalker</code> object. The children of skipped nodes are still considered. This is treated as "skip this node but not its children".</td>
+					</tr>
+				
+			</table>
+			
 	**/
 	function acceptNode( node : Node ) : Int;
 }
\ No newline at end of file
diff --git a/std/js/html/NodeIterator.hx b/std/js/html/NodeIterator.hx
index 436b43dde9411d84894930b3c448d751b31269e6..262525fbaa76644e1646694652e137b15737d491 100644
--- a/std/js/html/NodeIterator.hx
+++ b/std/js/html/NodeIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/NodeIterator>
 **/
 @:native("NodeIterator")
-extern class NodeIterator
-{
+extern class NodeIterator {
 	
 	/**
 		Returns a `Node` representing the root node as specified when the `NodeIterator` was created.
@@ -52,99 +51,99 @@ extern class NodeIterator
 	
 	/**
 		Returns an <code>unsigned long</code> being a bitmask made of constants describing the types of <code>Node</code> that must to be presented. Non-matching nodes are skipped, but their children may be included, if relevant. The possible values are:
-		 <table class="standard-table">
-		  
-		   <tr>
-		    <td class="header">Constant</td>
-		    <td class="header">Numerical value</td>
-		    <td class="header">Description</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_ALL</code></td>
-		    <td><code>-1</code> (that is the max value of <code>unsigned long</code>)</td>
-		    <td>Shows all nodes.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_ATTRIBUTE</code> <em>(deprecated)</em></td>
-		    <td><code>2</code></td>
-		    <td>Shows attribute <code>Attr</code> nodes. This is meaningful only when creating a <code>NodeIterator</code> with an <code>Attr</code> node as its root; in this case, it means that the attribute node will appear in the first position of the iteration or traversal. Since attributes are never children of other nodes, they do not appear when traversing over the document tree.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_CDATA_SECTION</code> <em>(deprecated)</em></td>
-		    <td><code>8</code></td>
-		    <td>Shows <code>CDATASection</code> nodes.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_COMMENT</code></td>
-		    <td><code>128</code></td>
-		    <td>Shows <code>Comment</code> nodes.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_DOCUMENT</code></td>
-		    <td><code>256</code></td>
-		    <td>Shows <code>Document</code> nodes.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_DOCUMENT_FRAGMENT</code></td>
-		    <td><code>1024</code></td>
-		    <td>Shows <code>DocumentFragment</code> nodes.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_DOCUMENT_TYPE</code></td>
-		    <td><code>512</code></td>
-		    <td>Shows <code>DocumentType</code> nodes.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_ELEMENT</code></td>
-		    <td><code>1</code></td>
-		    <td>Shows <code>Element</code> nodes.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_ENTITY</code> <em>(deprecated)</em></td>
-		    <td><code>32</code></td>
-		    <td>Shows <code>Entity</code> nodes. This is meaningful only when creating a <code>NodeIterator</code> with an <code>Entity</code> node as its root; in this case, it means that the <code>Entity</code> node will appear in the first position of the traversal. Since entities are not part of the document tree, they do not appear when traversing over the document tree.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_ENTITY_REFERENCE</code> <em>(deprecated)</em></td>
-		    <td><code>16</code></td>
-		    <td>Shows <code>EntityReference</code> nodes.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_NOTATION</code> <em>(deprecated)</em></td>
-		    <td><code>2048</code></td>
-		    <td>Shows <code>Notation</code> nodes. This is meaningful only when creating a <code>NodeIterator</code> with a <code>Notation</code> node as its root; in this case, it means that the <code>Notation</code> node will appear in the first position of the traversal. Since entities are not part of the document tree, they do not appear when traversing over the document tree.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_PROCESSING_INSTRUCTION</code></td>
-		    <td><code>64</code></td>
-		    <td>Shows <code>ProcessingInstruction</code> nodes.</td>
-		   </tr>
-		   <tr>
-		    <td><code>NodeFilter.SHOW_TEXT</code></td>
-		    <td><code>4</code></td>
-		    <td>Shows <code>Text</code> nodes.</td>
-		   </tr>
-		  
-		 </table>
-		 
+			<table class="standard-table">
+				
+					<tr>
+						<td class="header">Constant</td>
+						<td class="header">Numerical value</td>
+						<td class="header">Description</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_ALL</code></td>
+						<td><code>-1</code> (that is the max value of <code>unsigned long</code>)</td>
+						<td>Shows all nodes.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_ATTRIBUTE</code> <em>(deprecated)</em></td>
+						<td><code>2</code></td>
+						<td>Shows attribute <code>Attr</code> nodes. This is meaningful only when creating a <code>NodeIterator</code> with an <code>Attr</code> node as its root; in this case, it means that the attribute node will appear in the first position of the iteration or traversal. Since attributes are never children of other nodes, they do not appear when traversing over the document tree.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_CDATA_SECTION</code> <em>(deprecated)</em></td>
+						<td><code>8</code></td>
+						<td>Shows <code>CDATASection</code> nodes.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_COMMENT</code></td>
+						<td><code>128</code></td>
+						<td>Shows <code>Comment</code> nodes.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_DOCUMENT</code></td>
+						<td><code>256</code></td>
+						<td>Shows <code>Document</code> nodes.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_DOCUMENT_FRAGMENT</code></td>
+						<td><code>1024</code></td>
+						<td>Shows <code>DocumentFragment</code> nodes.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_DOCUMENT_TYPE</code></td>
+						<td><code>512</code></td>
+						<td>Shows <code>DocumentType</code> nodes.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_ELEMENT</code></td>
+						<td><code>1</code></td>
+						<td>Shows <code>Element</code> nodes.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_ENTITY</code> <em>(deprecated)</em></td>
+						<td><code>32</code></td>
+						<td>Shows <code>Entity</code> nodes. This is meaningful only when creating a <code>NodeIterator</code> with an <code>Entity</code> node as its root; in this case, it means that the <code>Entity</code> node will appear in the first position of the traversal. Since entities are not part of the document tree, they do not appear when traversing over the document tree.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_ENTITY_REFERENCE</code> <em>(deprecated)</em></td>
+						<td><code>16</code></td>
+						<td>Shows <code>EntityReference</code> nodes.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_NOTATION</code> <em>(deprecated)</em></td>
+						<td><code>2048</code></td>
+						<td>Shows <code>Notation</code> nodes. This is meaningful only when creating a <code>NodeIterator</code> with a <code>Notation</code> node as its root; in this case, it means that the <code>Notation</code> node will appear in the first position of the traversal. Since entities are not part of the document tree, they do not appear when traversing over the document tree.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_PROCESSING_INSTRUCTION</code></td>
+						<td><code>64</code></td>
+						<td>Shows <code>ProcessingInstruction</code> nodes.</td>
+					</tr>
+					<tr>
+						<td><code>NodeFilter.SHOW_TEXT</code></td>
+						<td><code>4</code></td>
+						<td>Shows <code>Text</code> nodes.</td>
+					</tr>
+				
+			</table>
+			
 	**/
 	var whatToShow(default,null) : Int;
 	
 	/**
 		Returns a `NodeFilter` used to select the relevant nodes.
 	**/
-	var filter(default,null) : NodeFilter;
+	var filter(default,null) : haxe.extern.EitherType<Node -> Int, NodeFilter>;
 	
-	/** @throws DOMError */
 	
 	/**
 		Returns the next `Node` in the document, or `null` if there are none.
+		@throws DOMError
 	**/
 	function nextNode() : Node;
-	/** @throws DOMError */
 	
 	/**
 		Returns the previous `Node` in the document, or `null` if there are none.
+		@throws DOMError
 	**/
 	function previousNode() : Node;
 	
diff --git a/std/js/html/NodeList.hx b/std/js/html/NodeList.hx
index a15e9e0fb44336c92219dcb53c01898897e979ef..8466cd848d8c23763bbc2b1b797f35a049a53e8e 100644
--- a/std/js/html/NodeList.hx
+++ b/std/js/html/NodeList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	`NodeList` objects are collections of nodes such as those returned by `Node.childNodes` and the `document.querySelectorAll` method.
+	`NodeList` objects are collections of nodes such as those returned by properties such as `Node.childNodes` and the `document.querySelectorAll()` method.
 
 	Documentation [NodeList](https://developer.mozilla.org/en-US/docs/Web/API/NodeList) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/NodeList$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/NodeList>
 **/
 @:native("NodeList")
-extern class NodeList implements ArrayAccess<Node>
-{
+extern class NodeList implements ArrayAccess<Node> {
 	
 	/**
 		The number of nodes in the `NodeList`.
diff --git a/std/js/html/Notification.hx b/std/js/html/Notification.hx
index 5a311fb51719a98bef6d155fb881290c16a76766..659aff220b92f7a5cc4f318cb18c2674ab2d012f 100644
--- a/std/js/html/Notification.hx
+++ b/std/js/html/Notification.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,18 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Notification>
 **/
 @:native("Notification")
-extern class Notification extends EventTarget
-{
-	static 
+extern class Notification extends EventTarget {
+	
 	/**
-		A string representing the current permission to display notifications. Possible value are: `denied` (the user refuses to have notifications displayed), `granted` (the user accepts having notifications displayed), or `default` (the user choice is unknown and therefore the browser will act as if the value were denied).
+		A string representing the current permission to display notifications. Possible values are:
+		 
+		  `denied` — The user refuses to have notifications displayed.
+		  `granted` — The user accepts having notifications displayed.
+		  `default` — The user choice is unknown and therefore the browser will act as if the value were denied.
+		 
+		 
 	**/
-	var permission(default,null) : NotificationPermission;
+	static var permission(default,null) : NotificationPermission;
 	
 	
 	/**
@@ -67,27 +72,27 @@ extern class Notification extends EventTarget
 	var title(default,null) : String;
 	
 	/**
-		The text direction of the notification as specified in the options parameter of the constructor.
+		The text direction of the notification as specified in the constructor's `options` parameter.
 	**/
 	var dir(default,null) : NotificationDirection;
 	
 	/**
-		The language code of the notification as specified in the options parameter of the constructor.
+		The language code of the notification as specified in the constructor's `options` parameter.
 	**/
 	var lang(default,null) : String;
 	
 	/**
-		The body string of the notification as specified in the options parameter of the constructor.
+		The body string of the notification as specified in the constructor's `options` parameter.
 	**/
 	var body(default,null) : String;
 	
 	/**
-		The ID of the notification (if any) as specified in the options parameter of the constructor.
+		The ID of the notification (if any) as specified in the constructor's `options` parameter.
 	**/
 	var tag(default,null) : String;
 	
 	/**
-		The URL of the image used as an icon of the notification as specified in the options parameter of the constructor.
+		The URL of the image used as an icon of the notification as specified in the constructor's `options` parameter.
 	**/
 	var icon(default,null) : String;
 	
diff --git a/std/js/html/NotificationDirection.hx b/std/js/html/NotificationDirection.hx
index b8d5713dd7a2926b8ea1ea138ecc75dd7b0472b7..e20ab002ded64db317a96811e85285894b025031 100644
--- a/std/js/html/NotificationDirection.hx
+++ b/std/js/html/NotificationDirection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract NotificationDirection(String)
-{
+enum abstract NotificationDirection(String) {
 	var AUTO = "auto";
 	var LTR = "ltr";
 	var RTL = "rtl";
diff --git a/std/js/html/NotificationEvent.hx b/std/js/html/NotificationEvent.hx
index 3aebae36cc2a73ff6b0564621ed9b12ae61ee5dc..f4da66cc08fa59ea74a52b5f43f86f0760c9a1fd 100644
--- a/std/js/html/NotificationEvent.hx
+++ b/std/js/html/NotificationEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,19 @@
 
 package js.html;
 
+/**
+	The parameter passed into the `onnotificationclick` handler, the `NotificationEvent` interface represents a notification click event that is dispatched on the `ServiceWorkerGlobalScope` of a `ServiceWorker`.
+
+	Documentation [NotificationEvent](https://developer.mozilla.org/en-US/docs/Web/API/NotificationEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/NotificationEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/NotificationEvent>
+**/
 @:native("NotificationEvent")
-extern class NotificationEvent extends ExtendableEvent
-{
+extern class NotificationEvent extends ExtendableEvent {
+	
+	/**
+		Returns a `Notification` object representing the notification that was clicked to fire the event.
+	**/
 	var notification(default,null) : Notification;
 	
 	/** @throws DOMError */
diff --git a/std/js/html/NotificationEventInit.hx b/std/js/html/NotificationEventInit.hx
index 81f88ae2a85e541ac21d4f35fafdc61233952a5d..9e6ff6708a3c6912552b4183306a1116e525e099 100644
--- a/std/js/html/NotificationEventInit.hx
+++ b/std/js/html/NotificationEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
 
 package js.html;
 
-typedef NotificationEventInit =
-{
-	> ExtendableEventInit,
+typedef NotificationEventInit = ExtendableEventInit & {
 	var notification : Notification;
 }
\ No newline at end of file
diff --git a/std/js/html/NotificationOptions.hx b/std/js/html/NotificationOptions.hx
index f517f7312cabe27727d37192a7fc4e3a1595a046..2f1c68e8f45fcf0debfcaa0c91426cc7f1eab665 100644
--- a/std/js/html/NotificationOptions.hx
+++ b/std/js/html/NotificationOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,12 +24,12 @@
 
 package js.html;
 
-typedef NotificationOptions =
-{
-	@:optional var body : String;
-	@:optional var data : Dynamic;
-	@:optional var dir : NotificationDirection;
-	@:optional var icon : String;
-	@:optional var lang : String;
-	@:optional var tag : String;
+typedef NotificationOptions = {
+	var ?body : String;
+	var ?data : Dynamic;
+	var ?dir : NotificationDirection;
+	var ?icon : String;
+	var ?lang : String;
+	var ?requireInteraction : Bool;
+	var ?tag : String;
 }
\ No newline at end of file
diff --git a/std/js/html/NotificationPermission.hx b/std/js/html/NotificationPermission.hx
index 7f73684d7481c0cab596a8daed4c93d23dfdd6a5..5d8d58bb149a98764f79dfa0af9c7d39ecb88094 100644
--- a/std/js/html/NotificationPermission.hx
+++ b/std/js/html/NotificationPermission.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,8 @@
 
 package js.html;
 
-@:enum abstract NotificationPermission(String)
-{
-	var DEFAULT_ = "default";
+enum abstract NotificationPermission(String) {
+	var DEFAULT = "default";
 	var DENIED = "denied";
 	var GRANTED = "granted";
 }
\ No newline at end of file
diff --git a/std/js/html/OListElement.hx b/std/js/html/OListElement.hx
index bff816e6a223ce57d72870551359b5e0ae73de86..2063ea6792227e12a2e920dfd6240e399dd16e83 100644
--- a/std/js/html/OListElement.hx
+++ b/std/js/html/OListElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLOListElement>
 **/
 @:native("HTMLOListElement")
-extern class OListElement extends Element
-{
+extern class OListElement extends Element {
 	
 	/**
 		Is a `Boolean` value reflecting the `reversed` and defining if the numbering is descending, that is its value is `true`, or ascending (`false`).
diff --git a/std/js/html/ObjectElement.hx b/std/js/html/ObjectElement.hx
index 8e27581fa00a0f0a26dd8986b94b7e86ee98e79e..4ec5a23e751ba73210853451f3f1d16311539ee4 100644
--- a/std/js/html/ObjectElement.hx
+++ b/std/js/html/ObjectElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLObjectElement>
 **/
 @:native("HTMLObjectElement")
-extern class ObjectElement extends Element
-{
+extern class ObjectElement extends Element {
 	
 	/**
 		Is a `DOMString` that reflects the `data` HTML attribute, specifying the address of a resource's data.
@@ -155,6 +154,7 @@ extern class ObjectElement extends Element
 		Retuns a `Boolean` that always is `true`, because `object` objects are never candidates for constraint validation.
 	**/
 	function checkValidity() : Bool;
+	function reportValidity() : Bool;
 	
 	/**
 		Sets a custom validity message for the element. If this message is not the empty string, then the element is suffering from a custom validity error, and does not validate.
diff --git a/std/js/html/ObserverCallback.hx b/std/js/html/ObserverCallback.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5b285b201b7f75a0ea948f93570e0d3baaf6b939
--- /dev/null
+++ b/std/js/html/ObserverCallback.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\FetchObserver.webidl. Do not edit!
+
+package js.html;
+
+typedef ObserverCallback = {
+	function handleEvent( observer : FetchObserver ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/OfflineAudioCompletionEventInit.hx b/std/js/html/OfflineAudioCompletionEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..690a14e6763c7f0475fe1fc768cb5456ca05c60b
--- /dev/null
+++ b/std/js/html/OfflineAudioCompletionEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\OfflineAudioCompletionEvent.webidl. Do not edit!
+
+package js.html;
+
+typedef OfflineAudioCompletionEventInit = EventInit & {
+	var renderedBuffer : js.html.audio.AudioBuffer;
+}
\ No newline at end of file
diff --git a/std/js/html/OptGroupElement.hx b/std/js/html/OptGroupElement.hx
index 685ed40df336a70747aea34dad6e63bbd0e0097a..1f9f7ce68922f6d323d34128350662abb7b73b13 100644
--- a/std/js/html/OptGroupElement.hx
+++ b/std/js/html/OptGroupElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLOptGroupElement>
 **/
 @:native("HTMLOptGroupElement")
-extern class OptGroupElement extends Element
-{
+extern class OptGroupElement extends Element {
 	
 	/**
 		Is a `boolean` representing whether or not the whole list of children `option` is disabled (true) or not (false).
diff --git a/std/js/html/RecordErrorEvent.hx b/std/js/html/Option.hx
similarity index 78%
rename from std/js/html/RecordErrorEvent.hx
rename to std/js/html/Option.hx
index 982a5acca4c3ada3f5c35797adb52e9ee19d62d6..a3e729b42b9e6f603d76ed0de7efd2ac12aae637 100644
--- a/std/js/html/RecordErrorEvent.hx
+++ b/std/js/html/Option.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,15 +20,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\RecordErrorEvent.webidl. Do not edit!
+// This file is generated from namedConstructors.webidl. Do not edit!
 
 package js.html;
 
-@:native("RecordErrorEvent")
-extern class RecordErrorEvent extends Event
-{
-	var name(default,null) : String;
-	
+@:native("Option")
+extern class Option extends OptionElement {
 	/** @throws DOMError */
-	function new( type : String, ?eventInitDict : RecordErrorEventInit ) : Void;
+	function new( text : String = "", ?value : String, defaultSelected : Bool = false, selected : Bool = false ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/OptionElement.hx b/std/js/html/OptionElement.hx
index 87791e78e338080735ee20966ff68c1d66b99652..c5ac1dee540c8c9bf9fcf1b77088e338c633e9fb 100644
--- a/std/js/html/OptionElement.hx
+++ b/std/js/html/OptionElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLOptionElement>
 **/
 @:native("HTMLOptionElement")
-extern class OptionElement extends Element
-{
+extern class OptionElement extends Element {
 	var disabled : Bool;
 	var form(default,null) : FormElement;
 	var label : String;
diff --git a/std/js/html/OptionalEffectTiming.hx b/std/js/html/OptionalEffectTiming.hx
new file mode 100644
index 0000000000000000000000000000000000000000..53d998106bc7e49f7fe50481cbed6783c093f032
--- /dev/null
+++ b/std/js/html/OptionalEffectTiming.hx
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\AnimationEffect.webidl. Do not edit!
+
+package js.html;
+
+typedef OptionalEffectTiming = {
+	var ?delay : Float;
+	var ?direction : PlaybackDirection;
+	var ?duration : haxe.extern.EitherType<Float,String>;
+	var ?easing : String;
+	var ?endDelay : Float;
+	var ?fill : FillMode;
+	var ?iterationStart : Float;
+	var ?iterations : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/OrientationLockType.hx b/std/js/html/OrientationLockType.hx
index 036fe7d94619bc4c6ed14d3afb529e210a897e7c..3643785358e89531b9cb356401c6b3e09eb2a1c7 100644
--- a/std/js/html/OrientationLockType.hx
+++ b/std/js/html/OrientationLockType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract OrientationLockType(String)
-{
+enum abstract OrientationLockType(String) {
 	var ANY = "any";
 	var NATURAL = "natural";
 	var LANDSCAPE = "landscape";
diff --git a/std/js/html/OrientationType.hx b/std/js/html/OrientationType.hx
index 719bb9f59b9bee45acd64fb498f83347ed774311..158406b7962604e7ffa0454038c2ff4414164109 100644
--- a/std/js/html/OrientationType.hx
+++ b/std/js/html/OrientationType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract OrientationType(String)
-{
+enum abstract OrientationType(String) {
 	var PORTRAIT_PRIMARY = "portrait-primary";
 	var PORTRAIT_SECONDARY = "portrait-secondary";
 	var LANDSCAPE_PRIMARY = "landscape-primary";
diff --git a/std/js/html/OutputElement.hx b/std/js/html/OutputElement.hx
index e2d496b48d2a966a89126db3e0027e3c2f68aa26..8899c50b060affabb1d08f78b6eba054bdc806f7 100644
--- a/std/js/html/OutputElement.hx
+++ b/std/js/html/OutputElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,18 +32,71 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLOutputElement>
 **/
 @:native("HTMLOutputElement")
-extern class OutputElement extends Element
-{
+extern class OutputElement extends Element {
+	
+	/**
+		A `DOMTokenList` reflecting the `for` HTML attribute, containing a list of IDs of other elements in the same document that contribute to (or otherwise affect) the calculated `value`.
+	**/
 	var htmlFor(default,null) : DOMTokenList;
+	
+	/**
+		An `HTMLFormElement` indicating the form associated with the control, reflecting the `form` HTML attribute if it is defined.
+	**/
 	var form(default,null) : FormElement;
+	
+	/**
+		A `DOMString` reflecting the `name` HTML attribute, containing the name for the control that is submitted with form data.
+	**/
 	var name : String;
+	
+	/**
+		The `DOMString` `"output"`.
+	**/
 	var type(default,null) : String;
+	
+	/**
+		A `DOMString` representing the default value of the element, initially the empty string.
+	**/
 	var defaultValue : String;
+	
+	/**
+		A `DOMString` representing the value of the contents of the elements. Behaves like the `Node.textContent` property.
+	**/
 	var value : String;
+	
+	/**
+		A `Boolean` indicating whether the element is a candidate for constraint validation.
+	**/
 	var willValidate(default,null) : Bool;
+	
+	/**
+		A `ValidityState` representing the validity states that this element is in.
+	**/
 	var validity(default,null) : ValidityState;
+	
+	/**
+		A `DOMString` representing a localized message that describes the validation constraints that the control does not satisfy (if any). This is the empty string if the control is not a candidate for constraint validation (`willValidate` is `false`), or it satisfies its constraints.
+	**/
 	var validationMessage(default,null) : String;
 	
+	/**
+		A `NodeList` of `label` elements associated with the element.
+	**/
+	var labels(default,null) : NodeList;
+	
+	
+	/**
+		Checks the validity of the element and returns a `Boolean` holding the check result.
+	**/
 	function checkValidity() : Bool;
+	
+	/**
+		Triggers an `invalid` event and evaluates its result. if the result is `true`, then the problems with the constraints of this element are reported to the user. When the problem is reported, the user agent may focus the element and change the scrolling position of the document or perform some other action that brings the element to the user's attention. User agents may report more than one constraint violation if this element suffers from multiple problems at once. If the element is not rendered, then the user agent may report the error for the running script instead of notifying the user.
+	**/
+	function reportValidity() : Bool;
+	
+	/**
+		Sets a custom validity message for the element. If this message is not the empty string, then the element is suffering from a custom validity error, and does not validate.
+	**/
 	function setCustomValidity( error : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/PageTransitionEvent.hx b/std/js/html/PageTransitionEvent.hx
index 8b6d56a24670a15bf6d9f6bfa601cf3db3077e17..f8c91f9a9bc29f66ed3f55b3aeb1ada3181744d3 100644
--- a/std/js/html/PageTransitionEvent.hx
+++ b/std/js/html/PageTransitionEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,18 @@
 package js.html;
 
 /**
-	Page transition events fire when a webpage is being loaded or unloaded.
+	The `PageTransitionEvent` is fired when a document is being loaded or unloaded.
 
 	Documentation [PageTransitionEvent](https://developer.mozilla.org/en-US/docs/Web/API/PageTransitionEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PageTransitionEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PageTransitionEvent>
 **/
 @:native("PageTransitionEvent")
-extern class PageTransitionEvent extends Event
-{
+extern class PageTransitionEvent extends Event {
+	
+	/**
+		Indicates if the document is loading from a cache.
+	**/
 	var persisted(default,null) : Bool;
 	
 	/** @throws DOMError */
diff --git a/std/js/html/PageTransitionEventInit.hx b/std/js/html/PageTransitionEventInit.hx
index 80bf178e7b378b0e13dc2cdf2c01cddf01384da8..1f6b2919bdb647549dc5abd51452150f9937399c 100644
--- a/std/js/html/PageTransitionEventInit.hx
+++ b/std/js/html/PageTransitionEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-typedef PageTransitionEventInit =
-{
-	> EventInit,
-	@:optional var persisted : Bool;
+typedef PageTransitionEventInit = EventInit & {
+	var ?inFrameSwap : Bool;
+	var ?persisted : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/PaintRequest.hx b/std/js/html/PaintRequest.hx
index 3a2833003ae1dd2ef42f79fbc683b7d0bb35d733..d9fd406e9afec247ff62900a65708535b8571069 100644
--- a/std/js/html/PaintRequest.hx
+++ b/std/js/html/PaintRequest.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("PaintRequest")
-extern class PaintRequest
-{
+extern class PaintRequest {
 	var clientRect(default,null) : DOMRect;
 	var reason(default,null) : String;
 	
diff --git a/std/js/html/PaintRequestList.hx b/std/js/html/PaintRequestList.hx
index 4ec1466bf5a45d241e1e4efb80ac385fd4c311aa..1491dbd7919754053bc157d6df3723f32a2e171a 100644
--- a/std/js/html/PaintRequestList.hx
+++ b/std/js/html/PaintRequestList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("PaintRequestList")
-extern class PaintRequestList implements ArrayAccess<PaintRequest>
-{
+extern class PaintRequestList implements ArrayAccess<PaintRequest> {
 	var length(default,null) : Int;
 	
 	function item( index : Int ) : PaintRequest;
diff --git a/std/js/html/PaintWorkletGlobalScope.hx b/std/js/html/PaintWorkletGlobalScope.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1eb6d61e06a2f6fca83020e6b097745d75213b15
--- /dev/null
+++ b/std/js/html/PaintWorkletGlobalScope.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PaintWorkletGlobalScope.webidl. Do not edit!
+
+package js.html;
+
+@:native("PaintWorkletGlobalScope")
+extern class PaintWorkletGlobalScope extends WorkletGlobalScope {
+	function registerPaint( name : String, paintCtor : Void -> Void ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/ParagraphElement.hx b/std/js/html/ParagraphElement.hx
index 9c7e232249249d22bda6a3e5823d33ef1e69b9cd..d6f2d7cb9e9696a551d21e8b540535f5d6fa497d 100644
--- a/std/js/html/ParagraphElement.hx
+++ b/std/js/html/ParagraphElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,11 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLParagraphElement>
 **/
 @:native("HTMLParagraphElement")
-extern class ParagraphElement extends Element
-{
+extern class ParagraphElement extends Element {
+	
+	/**
+		A `DOMString` representing an enumerated property indicating alignment of the element's contents with respect to the surrounding context. The possible values are `"left"`, `"right"`, `"justify"`, and `"center"`.
+	**/
 	var align : String;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/ParamElement.hx b/std/js/html/ParamElement.hx
index b2afaef5ebdb82979aab62db96d06b90d10ff17c..ed69ddea0783490074eb95744f271e8098a92a2d 100644
--- a/std/js/html/ParamElement.hx
+++ b/std/js/html/ParamElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLParamElement>
 **/
 @:native("HTMLParamElement")
-extern class ParamElement extends Element
-{
+extern class ParamElement extends Element {
 	
 	/**
 		Is a `DOMString` representing the name of the parameter. It reflects the `name` attribute.
diff --git a/std/js/html/Path2D.hx b/std/js/html/Path2D.hx
index 9ffbcb230c2c5b8c363df5d0a8d514f77394d2ba..ddf753fd30cd4bbb35fc951a3650fef9c8cf351c 100644
--- a/std/js/html/Path2D.hx
+++ b/std/js/html/Path2D.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Path2D>
 **/
 @:native("Path2D")
-extern class Path2D
-{
+extern class Path2D {
 	/** @throws DOMError */
 	@:overload( function() : Void {} )
 	@:overload( function( other : Path2D ) : Void {} )
@@ -52,7 +51,7 @@ extern class Path2D
 	function arcTo( x1 : Float, y1 : Float, x2 : Float, y2 : Float, radius : Float ) : Void;
 	function rect( x : Float, y : Float, w : Float, h : Float ) : Void;
 	/** @throws DOMError */
-	function arc( x : Float, y : Float, radius : Float, startAngle : Float, endAngle : Float, ?anticlockwise : Bool = false ) : Void;
+	function arc( x : Float, y : Float, radius : Float, startAngle : Float, endAngle : Float, anticlockwise : Bool = false ) : Void;
 	/** @throws DOMError */
-	function ellipse( x : Float, y : Float, radiusX : Float, radiusY : Float, rotation : Float, startAngle : Float, endAngle : Float, ?anticlockwise : Bool = false ) : Void;
+	function ellipse( x : Float, y : Float, radiusX : Float, radiusY : Float, rotation : Float, startAngle : Float, endAngle : Float, anticlockwise : Bool = false ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/Performance.hx b/std/js/html/Performance.hx
index 67db12f280af65ce6c4e0fdb8fdbcf1a403ee346..e5f110ddb58a0795599ce72bcdb6d6c3bbc2adc9 100644
--- a/std/js/html/Performance.hx
+++ b/std/js/html/Performance.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,29 +25,90 @@
 package js.html;
 
 /**
-	The `Performance` interface represents timing-related performance information for the given page.
+	The `Performance` interface provides access to performance-related information for the current page. It's part of the High Resolution Time API, but is enhanced by the Performance Timeline API, the Navigation Timing API, the User Timing API, and the Resource Timing API.
 
 	Documentation [Performance](https://developer.mozilla.org/en-US/docs/Web/API/Performance) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Performance$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Performance>
 **/
 @:native("Performance")
-extern class Performance
-{
+extern class Performance extends EventTarget {
 	
 	/**
-		Is a `PerformanceTiming` object containing latency-related performance information.
+		Returns the high resolution timestamp of the start time of the performance measurement.
+	**/
+	var timeOrigin(default,null) : Float;
+	
+	/**
+		A `PerformanceTiming` object containing latency-related performance information
 	**/
 	var timing(default,null) : PerformanceTiming;
 	
 	/**
-		Is a `PerformanceNavigation` object representing the type of navigation that occurs in the given browsing context, like the amount of redirections needed to fetch the resource.
+		A `PerformanceNavigation` object that provides useful context about the operations included in the times listed in `timing`, including whether the page was a load or a refresh, how many redirections occurred, and so forth.
 	**/
 	var navigation(default,null) : PerformanceNavigation;
 	
+	/**
+		An `EventTarget` which is a callback that will be called when the `resourcetimingbufferfull` event is fired.
+	**/
+	var onresourcetimingbufferfull : haxe.Constraints.Function;
+	
 	
 	/**
-		Returns a `DOMHighResTimeStamp` representing the amount of milliseconds elapsed since a reference instant.
+		Returns a `DOMHighResTimeStamp` representing the number of milliseconds elapsed since a reference instant.
 	**/
 	function now() : Float;
+	
+	/**
+		Is a jsonizer returning a json object representing the `Performance` object.
+	**/
+	function toJSON() : Dynamic;
+	
+	/**
+		Returns a list of `PerformanceEntry` objects based on the given filter.
+	**/
+	function getEntries() : Array<PerformanceEntry>;
+	
+	/**
+		Returns a list of `PerformanceEntry` objects of the given entry type.
+	**/
+	function getEntriesByType( entryType : String ) : Array<PerformanceEntry>;
+	
+	/**
+		Returns a list of `PerformanceEntry` objects based on the given name and entry type.
+	**/
+	function getEntriesByName( name : String, ?entryType : String ) : Array<PerformanceEntry>;
+	
+	/**
+		Removes all `PerformanceEntry` with a `PerformanceEntry.entryType` of "`resource`" from the browser's performance data buffer.
+	**/
+	function clearResourceTimings() : Void;
+	
+	/**
+		Sets the browser's resource timing buffer size to the specified number of "`resource`" `PerformanceEntry.entryType` `PerformanceEntry` objects.
+	**/
+	function setResourceTimingBufferSize( maxSize : Int ) : Void;
+	
+	/**
+		Creates a `DOMHighResTimeStamp` in the browser's performance entry buffer with the given name.
+		@throws DOMError
+	**/
+	function mark( markName : String ) : Void;
+	
+	/**
+		Removes the given mark from the browser's performance entry buffer.
+	**/
+	function clearMarks( ?markName : String ) : Void;
+	
+	/**
+		Creates a named `DOMHighResTimeStamp` in the browser's performance entry buffer between two specified marks (known as the start mark and end mark, respectively).
+		@throws DOMError
+	**/
+	function measure( measureName : String, ?startMark : String, ?endMark : String ) : Void;
+	
+	/**
+		Removes the given measure from the browser's performance entry buffer.
+	**/
+	function clearMeasures( ?measureName : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/PerformanceEntry.hx b/std/js/html/PerformanceEntry.hx
index 8b1579ff10aa7fdc071ff1d0e18af4dbc8ed0e40..4f9eafa799f69e4f6dfbc7d5a2b2686668b29e41 100644
--- a/std/js/html/PerformanceEntry.hx
+++ b/std/js/html/PerformanceEntry.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,16 +32,15 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PerformanceEntry>
 **/
 @:native("PerformanceEntry")
-extern class PerformanceEntry
-{
+extern class PerformanceEntry {
 	
 	/**
-		A `DOMString` representing the name of a performance entry when the metric was created.
+		A value that further specifies the value returned by the `PerformanceEntry.entryType` property. The value of both depends on the subtype. See property page for valid values.
 	**/
 	var name(default,null) : String;
 	
 	/**
-		A `DOMString` representing the type of performance metric such as "`mark`". See `PerformanceEntry.entryType` for a list of valid values.
+		A `DOMString` representing the type of performance metric such as, for example, "`mark`". See property page for valid values.
 	**/
 	var entryType(default,null) : String;
 	
@@ -55,4 +54,5 @@ extern class PerformanceEntry
 	**/
 	var duration(default,null) : Float;
 	
+	function toJSON() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/PerformanceEntryFilterOptions.hx b/std/js/html/PerformanceEntryFilterOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c6e74f83d60791a2715c9093ca3c108bb1a42629
--- /dev/null
+++ b/std/js/html/PerformanceEntryFilterOptions.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PerformanceObserverEntryList.webidl. Do not edit!
+
+package js.html;
+
+typedef PerformanceEntryFilterOptions = {
+	var ?entryType : String;
+	var ?initiatorType : String;
+	var ?name : String;
+}
\ No newline at end of file
diff --git a/std/js/html/PerformanceMark.hx b/std/js/html/PerformanceMark.hx
index 52705bdd5120118ede1d2c6b7cc8cbb31bbda1b4..338f17ee9d6a2708cbf5b042c5c6024da714a8a6 100644
--- a/std/js/html/PerformanceMark.hx
+++ b/std/js/html/PerformanceMark.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,13 +25,12 @@
 package js.html;
 
 /**
-	`PerformanceMark` is an abstract interface for `performance entries` with an `entry type` of "`mark`". Entries of this type are created by calling `performance.mark()` to add a named `DOMHighResTimeStamp` (the mark) to the browser's performance timeline.
+	`PerformanceMark` is an abstract interface for `PerformanceEntry` objects with an `entryType` of "`mark`". Entries of this type are created by calling `performance.mark()` to add a named `DOMHighResTimeStamp` (the mark) to the browser's performance timeline.
 
 	Documentation [PerformanceMark](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceMark) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceMark$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PerformanceMark>
 **/
 @:native("PerformanceMark")
-extern class PerformanceMark extends PerformanceEntry
-{
+extern class PerformanceMark extends PerformanceEntry {
 }
\ No newline at end of file
diff --git a/std/js/html/PerformanceMeasure.hx b/std/js/html/PerformanceMeasure.hx
index b7fc26953cd454304fa55c6a44fd4e1391c78484..eb833e199faff508b3fe22785cec59c4cdeccc23 100644
--- a/std/js/html/PerformanceMeasure.hx
+++ b/std/js/html/PerformanceMeasure.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,13 +25,12 @@
 package js.html;
 
 /**
-	`PerformanceMeasure` is an abstract interface for `performance entries` with an `entry type` of "`measure`". Entries of this type are created by calling `performance.measure()` to add a named `DOMHighResTimeStamp` (the measure) between two marks to the browser's performance timeline.
+	`PerformanceMeasure` is an abstract interface for `PerformanceEntry` objects with an `entryType` of "`measure`". Entries of this type are created by calling `performance.measure()` to add a named `DOMHighResTimeStamp` (the measure) between two marks to the browser's performance timeline.
 
 	Documentation [PerformanceMeasure](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceMeasure) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceMeasure$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PerformanceMeasure>
 **/
 @:native("PerformanceMeasure")
-extern class PerformanceMeasure extends PerformanceEntry
-{
+extern class PerformanceMeasure extends PerformanceEntry {
 }
\ No newline at end of file
diff --git a/std/js/html/PerformanceNavigation.hx b/std/js/html/PerformanceNavigation.hx
index b8fad9bfd42b4dd7a576376688e3e255a555d560..405e748c647ae961ceddf47fb93d95267f708b99 100644
--- a/std/js/html/PerformanceNavigation.hx
+++ b/std/js/html/PerformanceNavigation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,61 +25,60 @@
 package js.html;
 
 /**
-	The `PerformanceNavigation` interface represents information about how the navigation to the current document was done.
+	The legacy `PerformanceNavigation` interface represents information about how the navigation to the current document was done.
 
 	Documentation [PerformanceNavigation](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceNavigation) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceNavigation$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PerformanceNavigation>
 **/
 @:native("PerformanceNavigation")
-extern class PerformanceNavigation
-{
-	static inline var TYPE_NAVIGATE : Int = 0;
-	static inline var TYPE_RELOAD : Int = 1;
-	static inline var TYPE_BACK_FORWARD : Int = 2;
-	static inline var TYPE_RESERVED : Int = 255;
+extern class PerformanceNavigation {
+	static inline 
+	/**
+		
+	**/
+	var TYPE_NAVIGATE : Int = 0;
+	static inline 
+	/**
+		
+	**/
+	var TYPE_RELOAD : Int = 1;
+	static inline 
+	/**
+		
+	**/
+	var TYPE_BACK_FORWARD : Int = 2;
+	static inline 
+	/**
+		An `unsigned short` which indicates how the navigation to this page was done. Possible values are:
+		 
+		  `TYPE_NAVIGATE` (0)
+		  The page was accessed by following a link, a bookmark, a form submission, or a script, or by typing the URL in the address bar.
+		  `TYPE_RELOAD` (1)
+		  The page was accessed by clicking the Reload button or via the `Location.reload()` method.
+		  `TYPE_BACK_FORWARD` (2)
+		  The page was accessed by navigating into the history.
+		  `TYPE_RESERVED` (255)
+		  Any other way.
+		 
+		 
+	**/
+	var TYPE_RESERVED : Int = 255;
 	
 	
 	/**
-		Is an <code>unsigned short</code> containing a constant describing how the navigation to this page was done. Possible values are:
-		 <table class="standard-table">
-		  
-		   <tr>
-		    Value
-		    Constant name
-		    Meaning
-		   </tr>
-		  
-		  
-		   <tr>
-		    <td><code>0</code></td>
-		    <td><code>TYPE_NAVIGATE</code></td>
-		    <td>The page was accessed by following a link, a bookmark, a form submission, a script, or typing the URL in the address bar.</td>
-		   </tr>
-		   <tr>
-		    <td><code>1</code></td>
-		    <td><code>TYPE_RELOAD</code></td>
-		    <td>The page was accessed by clicking the Reload button or via the <code>Location.reload()</code> method.</td>
-		   </tr>
-		   <tr>
-		    <td><code>2</code></td>
-		    <td><code>TYPE_BACK_FORWARD</code></td>
-		    <td>The page was accessed by navigating into the history.</td>
-		   </tr>
-		   <tr>
-		    <td><code>255</code></td>
-		    <td><code>TYPE_RESERVED</code></td>
-		    <td>Any other way.</td>
-		   </tr>
-		  
-		 </table>
-		 
+		
 	**/
 	var type(default,null) : Int;
 	
 	/**
-		Is an `unsigned short` representing the number of REDIRECTs done before reaching the page.
+		An `unsigned short` representing the number of REDIRECTs done before reaching the page.
 	**/
 	var redirectCount(default,null) : Int;
 	
+	
+	/**
+		Is a jsonizer returning a json object representing the `PerformanceNavigation` object.
+	**/
+	function toJSON() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/PerformanceNavigationTiming.hx b/std/js/html/PerformanceNavigationTiming.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2c10d66195fae70eab51a887372ca86af71c6efd
--- /dev/null
+++ b/std/js/html/PerformanceNavigationTiming.hx
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PerformanceNavigationTiming.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `PerformanceNavigationTiming` interface provides methods and properties to store and retrieve metrics regarding the browser's document navigation events. For example, this interface can be used to determine how much time it takes to load or unload a document.
+
+	Documentation [PerformanceNavigationTiming](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceNavigationTiming) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceNavigationTiming$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/PerformanceNavigationTiming>
+**/
+@:native("PerformanceNavigationTiming")
+extern class PerformanceNavigationTiming extends PerformanceResourceTiming {
+	
+	/**
+		A `DOMHighResTimeStamp` representing the time value equal to the time immediately before the user agent starts the unload event of the previous document.
+	**/
+	var unloadEventStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` representing the time value equal to the time immediately after the user agent finishes the unload event of the previous document.
+	**/
+	var unloadEventEnd(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` representing a `DOMHighResTimeStamp` representing the time value equal to the time immediately before the user agent sets the current document readiness of the current document to interactive.
+	**/
+	var domInteractive(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` representing the time value equal to the time immediately before the user agent fires the DOMContentLoaded event at the current document.
+	**/
+	var domContentLoadedEventStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` representing the time value equal to the time immediately after the current document's DOMContentLoaded event completes.
+	**/
+	var domContentLoadedEventEnd(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` representing a time value equal to the time immediately before the browser sets the current document readiness of the current document to complete.
+	**/
+	var domComplete(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` representing the time value equal to the time immediately before the load event of the current document is fired.
+	**/
+	var loadEventStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` representing the time when the load event of the current document is completed.
+	**/
+	var loadEventEnd(default,null) : Float;
+	
+	/**
+		A `DOMString` representing the navigation type. Must be: "`navigate`", "`reload`", "`back_forward`" or "`prerender`".
+	**/
+	var type(default,null) : NavigationType;
+	
+	/**
+		A number representing the number of redirects since the last non-redirect navigation under the current browsing context.
+	**/
+	var redirectCount(default,null) : Int;
+	
+	
+	/**
+		Returns a `DOMString` that is the JSON representation of the `PerformanceNavigationTiming` object.
+	**/
+	function toJSON() : Dynamic;
+}
\ No newline at end of file
diff --git a/std/js/html/PerformanceObserver.hx b/std/js/html/PerformanceObserver.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8520199baf11835592486bee50ceace9c1d420e3
--- /dev/null
+++ b/std/js/html/PerformanceObserver.hx
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PerformanceObserver.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `PerformanceObserver` interface is used to observe performance measurement events and be notified of new performance entries as they are recorded in the browser's performance timeline.
+
+	Documentation [PerformanceObserver](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceObserver) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceObserver$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/PerformanceObserver>
+**/
+@:native("PerformanceObserver")
+extern class PerformanceObserver {
+	/** @throws DOMError */
+	function new( callback : PerformanceObserverEntryList -> PerformanceObserver -> Void ) : Void;
+	function observe( options : PerformanceObserverInit ) : Void;
+	function disconnect() : Void;
+	function takeRecords() : Array<PerformanceEntry>;
+}
\ No newline at end of file
diff --git a/std/js/html/PerformanceObserverEntryList.hx b/std/js/html/PerformanceObserverEntryList.hx
new file mode 100644
index 0000000000000000000000000000000000000000..38c775cd976af714c0f74ddd7b4af73b0d125855
--- /dev/null
+++ b/std/js/html/PerformanceObserverEntryList.hx
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PerformanceObserverEntryList.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `PerformanceObserverEntryList` interface is a list of peformance events that were explicitly observed via the `observe()` method.
+
+	Documentation [PerformanceObserverEntryList](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceObserverEntryList) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceObserverEntryList$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/PerformanceObserverEntryList>
+**/
+@:native("PerformanceObserverEntryList")
+extern class PerformanceObserverEntryList {
+	function getEntries( ?filter : PerformanceEntryFilterOptions ) : Array<PerformanceEntry>;
+	function getEntriesByType( entryType : String ) : Array<PerformanceEntry>;
+	function getEntriesByName( name : String, ?entryType : String ) : Array<PerformanceEntry>;
+}
\ No newline at end of file
diff --git a/std/js/html/PerformanceObserverInit.hx b/std/js/html/PerformanceObserverInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5ef8289bfd219312484868095e5ce6b06894f095
--- /dev/null
+++ b/std/js/html/PerformanceObserverInit.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PerformanceObserver.webidl. Do not edit!
+
+package js.html;
+
+typedef PerformanceObserverInit = {
+	var ?buffered : Bool;
+	var entryTypes : Array<String>;
+}
\ No newline at end of file
diff --git a/std/js/html/PerformanceResourceTiming.hx b/std/js/html/PerformanceResourceTiming.hx
index 77bf68adfad935822b83ba27f60bb8dd62b8413f..3f4e13898a23f0414f46d72e57e2b8e143a4f430 100644
--- a/std/js/html/PerformanceResourceTiming.hx
+++ b/std/js/html/PerformanceResourceTiming.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,30 +25,108 @@
 package js.html;
 
 /**
-	The `PerformanceResourceTiming` interface enables retrieving and analyzing detailed network timing data regarding the loading of an application's resources. An application can use the timing metrics to determine, for example, the length of time it takes to fetch a specific resource, such as an `XMLHttpRequest`, `SVG`, image, or script.
+	The `PerformanceResourceTiming` interface enables retrieval and analysis of detailed network timing data regarding the loading of an application's resources. An application can use the timing metrics to determine, for example, the length of time it takes to fetch a specific resource, such as an `XMLHttpRequest`, `SVG`, image, or script.
 
 	Documentation [PerformanceResourceTiming](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming>
 **/
 @:native("PerformanceResourceTiming")
-extern class PerformanceResourceTiming extends PerformanceEntry
-{
+extern class PerformanceResourceTiming extends PerformanceEntry {
+	
+	/**
+		A `DOMString` representing the type of resource that initiated the performance entry, as specified in `PerformanceResourceTiming.initiatorType`.
+	**/
 	var initiatorType(default,null) : String;
+	
+	/**
+		A `DOMString` representing the network protocol used to fetch the resource, as identified by the ALPN Protocol ID (RFC7301).
+	**/
 	var nextHopProtocol(default,null) : String;
+	
+	/**
+		Returns a `DOMHighResTimeStamp` immediately before dispatching the `FetchEvent` if a Service Worker thread is already running, or immediately before starting the Service Worker thread if it is not already running. If the resource is not intercepted by a Service Worker the property will always return 0.
+	**/
+	var workerStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` that represents the start time of the fetch which initiates the redirect.
+	**/
 	var redirectStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` immediately after receiving the last byte of the response of the last redirect.
+	**/
 	var redirectEnd(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` immediately before the browser starts to fetch the resource.
+	**/
 	var fetchStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` immediately before the browser starts the domain name lookup for the resource.
+	**/
 	var domainLookupStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` representing the time immediately after the browser finishes the domain name lookup for the resource.
+	**/
 	var domainLookupEnd(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` immediately before the browser starts to establish the connection to the server to retrieve the resource.
+	**/
 	var connectStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` immediately after the browser finishes establishing the connection to the server to retrieve the resource.
+	**/
 	var connectEnd(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` immediately before the browser starts the handshake process to secure the current connection.
+	**/
 	var secureConnectionStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` immediately before the browser starts requesting the resource from the server.
+	**/
 	var requestStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` immediately after the browser receives the first byte of the response from the server.
+	**/
 	var responseStart(default,null) : Float;
+	
+	/**
+		A `DOMHighResTimeStamp` immediately after the browser receives the last byte of the resource or immediately before the transport connection is closed, whichever comes first.
+	**/
 	var responseEnd(default,null) : Float;
+	
+	/**
+		A `number` representing the size (in octets) of the fetched resource. The size includes the response header fields plus the response payload body.
+	**/
 	var transferSize(default,null) : Int;
+	
+	/**
+		A `number` representing the size (in octets) received from the fetch (HTTP or cache), of the payload body, before removing any applied content-codings.
+	**/
 	var encodedBodySize(default,null) : Int;
+	
+	/**
+		A `number` that is the size (in octets) received from the fetch (HTTP or cache) of the message body, after removing any applied content-codings.
+	**/
 	var decodedBodySize(default,null) : Int;
 	
+	/**
+		An array of `PerformanceServerTiming` entries containing server timing metrics.
+	**/
+	var serverTiming(default,null) : Array<PerformanceServerTiming>;
+	
+	
+	/**
+		Returns a `DOMString` that is the JSON representation of the `PerformanceResourceTiming` object.
+	**/
+	function toJSON() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/AnimationEffectReadOnly.hx b/std/js/html/PerformanceServerTiming.hx
similarity index 52%
rename from std/js/html/AnimationEffectReadOnly.hx
rename to std/js/html/PerformanceServerTiming.hx
index 23a6007c05f6d41139cae73d3f6928413ea629e0..f54d4de2a16b5703fde2c2557a25e19bacfeb875 100644
--- a/std/js/html/AnimationEffectReadOnly.hx
+++ b/std/js/html/PerformanceServerTiming.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,29 +20,34 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\AnimationEffectReadOnly.webidl. Do not edit!
+// This file is generated from mozilla\PerformanceServerTiming.webidl. Do not edit!
 
 package js.html;
 
 /**
-	The `AnimationEffectReadOnly` interface of the Web Animations API defines current and future animation effects like `KeyframeEffect`, which can be passed to `Animation` objects for playing, and `KeyframeEffectReadOnly` (which is used by CSS Animations and Transitions).
+	The `PerformanceServerTiming` interface surfaces server metrics that are sent with the response in the `Server-Timing` HTTP header.
 
-	Documentation [AnimationEffectReadOnly](https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectReadOnly) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectReadOnly$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [PerformanceServerTiming](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceServerTiming) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceServerTiming$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectReadOnly>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/PerformanceServerTiming>
 **/
-@:native("AnimationEffectReadOnly")
-extern class AnimationEffectReadOnly
-{
+@:native("PerformanceServerTiming")
+extern class PerformanceServerTiming {
 	
 	/**
-		The `AnimationEffectTimingReadOnly` object associated with the animation containing all the animation's timing values.
+		A `DOMString` value of the server-specified metric name.
 	**/
-	var timing(default,null) : AnimationEffectTimingReadOnly;
+	var name(default,null) : String;
 	
+	/**
+		A double that contains the server-specified metric duration, or value `0.0`.
+	**/
+	var duration(default,null) : Float;
 	
 	/**
-		Returns the calculated timing properties for this Animation Effect.
+		A `DOMString` value of the server-specified metric description, or an empty string.
 	**/
-	function getComputedTiming() : ComputedTimingProperties;
+	var description(default,null) : String;
+	
+	function toJSON() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/PerformanceTiming.hx b/std/js/html/PerformanceTiming.hx
index 69329f148fac5250e90ada033af38856232688a4..a96e2f85c0cfd596723641fc63bf21e489ed6945 100644
--- a/std/js/html/PerformanceTiming.hx
+++ b/std/js/html/PerformanceTiming.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,114 +25,124 @@
 package js.html;
 
 /**
-	The `PerformanceTiming` interface represents timing-related performance information for the given page.
+	The `PerformanceTiming` interface is a legacy interface kept for backwards compatibility and contains properties that offer performance timing information for various events which occur during the loading and use of the current page. You get a `PerformanceTiming` object describing your page using the `window.performance.timing` property.
 
 	Documentation [PerformanceTiming](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceTiming) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceTiming$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PerformanceTiming>
 **/
+@:deprecated("PerformanceTiming is deprecated, use the PerformanceNavigationTiming interface instead")
 @:native("PerformanceTiming")
-extern class PerformanceTiming
-{
+extern class PerformanceTiming {
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, right after the prompt for unload terminates on the previous document in the same browsing context. If there is no previous document, this value will be the same as `PerformanceTiming.fetchStart`.
+		When the prompt for unload terminates on the previous document in the same browsing context. If there is no previous document, this value will be the same as `PerformanceTiming.fetchStart`.
 	**/
 	var navigationStart(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, the `unload` event has been thrown. If there is no previous document, or if the previous document, or one of the needed redirects, is not of the same origin, the value returned is `0`.
+		When the `unload` event has been thrown, indicating the time at which the previous document in the window began to unload. If there is no previous document, or if the previous document or one of the needed redirects is not of the same origin, the value returned is `0`.
 	**/
 	var unloadEventStart(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, the `unload` event handler finishes. If there is no previous document, or if the previous document, or one of the needed redirects, is not of the same origin, the value returned is `0`.
+		When the `unload` event handler finishes. If there is no previous document, or if the previous document, or one of the needed redirects, is not of the same origin, the value returned is `0`.
 	**/
 	var unloadEventEnd(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, the first HTTP redirect starts. If there is no redirect, or if one of the redirects is not of the same origin, the value returned is `0`.
+		When the first HTTP redirect starts. If there is no redirect, or if one of the redirects is not of the same origin, the value returned is `0`.
 	**/
 	var redirectStart(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, the last HTTP redirect is completed, that is when the last byte of the HTTP response has been received. If there is no redirect, or if one of the redirect is not of the same origin, the value returned is `0`.
+		When the last HTTP redirect is completed, that is when the last byte of the HTTP response has been received. If there is no redirect, or if one of the redirects is not of the same origin, the value returned is `0`.
 	**/
 	var redirectEnd(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, the browser is ready to fetch the document using an HTTP request. This moment is before the check to any application cache.
+		When the browser is ready to fetch the document using an HTTP request. This moment is before the check to any application cache.
 	**/
 	var fetchStart(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, where the domain lookup starts. If a persistent connection is used, or the information is stored in a cache or a local resource, the value will be the same as `PerformanceTiming.fetchStart`.
+		When the domain lookup starts. If a persistent connection is used, or the information is stored in a cache or a local resource, the value will be the same as `PerformanceTiming.fetchStart`.
 	**/
 	var domainLookupStart(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, where the domain lookup is finished. If a persistent connection is used, or the information is stored in a cache or a local resource, the value will be the same as `PerformanceTiming.fetchStart`.
+		When the domain lookup is finished. If a persistent connection is used, or the information is stored in a cache or a local resource, the value will be the same as `PerformanceTiming.fetchStart`.
 	**/
 	var domainLookupEnd(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, where the request to open a connection is sent to the network. If the transport layer reports an error and the connection establishment is started again, the last connection establisment start time is given. If a persistent connection is used, the value will be the same as `PerformanceTiming.fetchStart`.
+		When the request to open a connection is sent to the network. If the transport layer reports an error and the connection establishment is started again, the last connection establishment start time is given. If a persistent connection is used, the value will be the same as `PerformanceTiming.fetchStart`.
 	**/
 	var connectStart(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, where the connection is opened network. If the transport layer reports an error and the connection establishment is started again, the last connection establisment end time is given. If a persistent connection is used, the value will be the same as `PerformanceTiming.fetchStart`. A connection is considered as opened when all secure connection handshake, or SOCKS authentication, is terminated.
+		When the connection is opened network. If the transport layer reports an error and the connection establishment is started again, the last connection establishment end time is given. If a persistent connection is used, the value will be the same as `PerformanceTiming.fetchStart`. A connection is considered as opened when all secure connection handshake, or SOCKS authentication, is terminated.
 	**/
 	var connectEnd(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, when the browser sent the request to obtain the actual document, from the server or from a cache. If the transport layer fails after the start of the request and the connection is reopened, this property will be set to the time corresponding to the new request.
+		When the secure connection handshake starts. If no such connection is requested, it returns `0`.
+	**/
+	var secureConnectionStart(default,null) : Int;
+	
+	/**
+		When the browser sent the request to obtain the actual document, from the server or from a cache. If the transport layer fails after the start of the request and the connection is reopened, this property will be set to the time corresponding to the new request.
 	**/
 	var requestStart(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, when the browser received the first byte of the response, from the server from a cache, of from a local resource.
+		When the browser received the first byte of the response, from the server from a cache, or from a local resource.
 	**/
 	var responseStart(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, when the browser received the last byte of the response, or when the connection is closed if this happened first, from the server from a cache, of from a local resource.
+		When the browser received the last byte of the response, or when the connection is closed if this happened first, from the server, the cache, or from a local resource.
 	**/
 	var responseEnd(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, when the parser started its work, that is when its `Document.readyState` changes to `'loading'` and the corresponding `readystatechange` event is thrown.
+		When the parser started its work, that is when its `Document.readyState` changes to `'loading'` and the corresponding `readystatechange` event is thrown.
 	**/
 	var domLoading(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, when the parser finished its work on the main document, that is when its `Document.readyState` changes to `'interactive'` and the corresponding `readystatechange` event is thrown.
+		When the parser finished its work on the main document, that is when its `Document.readyState` changes to `'interactive'` and the corresponding `readystatechange` event is thrown.
 	**/
 	var domInteractive(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, right before the parser sent the `DOMContentLoaded` event, that is right after all the scripts that need to be executed right after parsing has been executed.
+		Right before the parser sent the `DOMContentLoaded` event, that is right after all the scripts that need to be executed right after parsing have been executed.
 	**/
 	var domContentLoadedEventStart(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, right after all the scripts that need to be executed as soon as possible, in order or not, has been executed.
+		Right after all the scripts that need to be executed as soon as possible, in order or not, have been executed.
 	**/
 	var domContentLoadedEventEnd(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, when the parser finished its work on the main document, that is when its `Document.readyState` changes to `'complete'` and the corresponding `readystatechange` event is thrown.
+		When the parser finished its work on the main document, that is when its `Document.readyState` changes to `'complete'` and the corresponding `readystatechange` event is thrown.
 	**/
 	var domComplete(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, when the `load` event was sent for the current document. If this event has not yet been sent, it returns `0.`
+		When the `load` event was sent for the current document. If this event has not yet been sent, it returns `0.`
 	**/
 	var loadEventStart(default,null) : Int;
 	
 	/**
-		Is an `unsigned long long` representing the moment, in miliseconds since the UNIX epoch, when the `load` event handler terminated, that is when the load event is completed. If this event has not yet been sent, or is not yet completed, it returns `0.`
+		When the `load` event handler terminated, that is when the load event is completed. If this event has not yet been sent, or is not yet completed, it returns `0.`
 	**/
 	var loadEventEnd(default,null) : Int;
 	
+	
+	/**
+		Returns a JSON object representing this `PerformanceTiming` object.
+	**/
+	function toJSON() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/PermissionState.hx b/std/js/html/PermissionState.hx
index 1b32bb5026bb7a1c5a4a643305cb87366f99b741..b459001742aee153afb962ea8ab770f695e6d188 100644
--- a/std/js/html/PermissionState.hx
+++ b/std/js/html/PermissionState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract PermissionState(String)
-{
+enum abstract PermissionState(String) {
 	var GRANTED = "granted";
 	var DENIED = "denied";
 	var PROMPT = "prompt";
diff --git a/std/js/html/PermissionStatus.hx b/std/js/html/PermissionStatus.hx
index a04711c59fa349a8843a8003959e64af257e0777..6355f0d4bdf38218eeca5f51419fa155ea06533b 100644
--- a/std/js/html/PermissionStatus.hx
+++ b/std/js/html/PermissionStatus.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PermissionStatus>
 **/
 @:native("PermissionStatus")
-extern class PermissionStatus extends EventTarget
-{
+extern class PermissionStatus extends EventTarget {
 	
 	/**
 		Returns the state of a requested permission; one of `'granted'`, `'denied'`, or `'prompt'`.
diff --git a/std/js/html/Permissions.hx b/std/js/html/Permissions.hx
index b73a5c34855213d13184a63a61c5382f59a9889e..52a61226fb35cfc6aa8036b13c3e3c3c8a99a595 100644
--- a/std/js/html/Permissions.hx
+++ b/std/js/html/Permissions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,24 +24,19 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	Documentation [Permissions](https://developer.mozilla.org/en-US/docs/Web/API/Permissions) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Permissions$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Permissions>
 **/
 @:native("Permissions")
-extern class Permissions
-{
-	/** @throws DOMError */
-	
+extern class Permissions {
+
 	/**
 		Returns the user permission status for a given API.
+		@throws DOMError
 	**/
 	function query( permission : Dynamic ) : Promise<PermissionStatus>;
-	/** @throws DOMError */
-	
-	/**
-		Revokes the permission currently set on a given API.
-	**/
-	function revoke( permission : Dynamic ) : Promise<PermissionStatus>;
 }
\ No newline at end of file
diff --git a/std/js/html/PictureElement.hx b/std/js/html/PictureElement.hx
index c59af13e45a08796a34936538c794918bb2ffa92..28a350d769a2bf08959a1d6c555afafa4c575c43 100644
--- a/std/js/html/PictureElement.hx
+++ b/std/js/html/PictureElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLPictureElement>
 **/
 @:native("HTMLPictureElement")
-extern class PictureElement extends Element
-{
+extern class PictureElement extends Element {
 }
\ No newline at end of file
diff --git a/std/js/html/PlaybackDirection.hx b/std/js/html/PlaybackDirection.hx
index 25a780f5a0e9f8ba34114f78aa360c0dc9c2df30..1bf137a6afbf1a45ad3630ab044ab3e825963838 100644
--- a/std/js/html/PlaybackDirection.hx
+++ b/std/js/html/PlaybackDirection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\AnimationEffectReadOnly.webidl. Do not edit!
+// This file is generated from mozilla\AnimationEffect.webidl. Do not edit!
 
 package js.html;
 
-@:enum abstract PlaybackDirection(String)
-{
+enum abstract PlaybackDirection(String) {
 	var NORMAL = "normal";
 	var REVERSE = "reverse";
 	var ALTERNATE = "alternate";
diff --git a/std/js/html/Plugin.hx b/std/js/html/Plugin.hx
index bda6b165755fb8f45439f79d493b86aa552680e1..4fad562408e6faf665cec50dd396cc05f9c1157c 100644
--- a/std/js/html/Plugin.hx
+++ b/std/js/html/Plugin.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,26 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Plugin>
 **/
 @:native("Plugin")
-extern class Plugin implements ArrayAccess<MimeType>
-{
+extern class Plugin implements ArrayAccess<MimeType> {
+	
+	/**
+		A human readable description of the plugin.
+	**/
 	var description(default,null) : String;
+	
+	/**
+		The filename of the plugin file.
+	**/
 	var filename(default,null) : String;
+	
+	/**
+		The plugin's version number string.
+	**/
 	var version(default,null) : String;
+	
+	/**
+		The name of the plugin.
+	**/
 	var name(default,null) : String;
 	var length(default,null) : Int;
 	
diff --git a/std/js/html/PluginArray.hx b/std/js/html/PluginArray.hx
index 4e10f4d42e38ba8f4c28c69a5cbf5224d34caa93..db672fb46786bb26df2f24df92730484eab503da 100644
--- a/std/js/html/PluginArray.hx
+++ b/std/js/html/PluginArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,14 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PluginArray>
 **/
 @:native("PluginArray")
-extern class PluginArray implements ArrayAccess<Plugin>
-{
+extern class PluginArray implements ArrayAccess<Plugin> {
+	
+	/**
+		The number of plugins in the array.
+	**/
 	var length(default,null) : Int;
 	
 	function item( index : Int ) : Plugin;
 	function namedItem( name : String ) : Plugin;
-	function refresh( ?reloadDocuments : Bool = false ) : Void;
+	function refresh( reloadDocuments : Bool = false ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/PointerEvent.hx b/std/js/html/PointerEvent.hx
index b777a117a0ea7f851160653499cc80c9b07ff93b..86bea54246612dc740f8b829f6a37aaf73b56ff1 100644
--- a/std/js/html/PointerEvent.hx
+++ b/std/js/html/PointerEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,17 +32,63 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent>
 **/
 @:native("PointerEvent")
-extern class PointerEvent extends MouseEvent
-{
+extern class PointerEvent extends MouseEvent {
+	
+	/**
+		A unique identifier for the pointer causing the event.
+	**/
 	var pointerId(default,null) : Int;
+	
+	/**
+		The width (magnitude on the X axis), in CSS pixels, of the contact geometry of the pointer.
+	**/
 	var width(default,null) : Int;
+	
+	/**
+		The height (magnitude on the Y axis), in CSS pixels, of the contact geometry of the pointer.
+	**/
 	var height(default,null) : Int;
+	
+	/**
+		The normalized pressure of the pointer input in the range 0 to 1, where 0 and 1 represent the minimum and maximum pressure the hardware is capable of detecting, respectively.
+	**/
 	var pressure(default,null) : Float;
+	
+	/**
+		The normalized tangential pressure of the pointer input (also known as barrel pressure or cylinder stress) in the range -1 to 1, where 0 is the neutral position of the control.
+	**/
+	var tangentialPressure(default,null) : Float;
+	
+	/**
+		The plane angle (in degrees, in the range of -90 to 90) between the Y-Z plane and the plane containing both the transducer (e.g. pen stylus) axis and the Y axis.
+	**/
 	var tiltX(default,null) : Int;
+	
+	/**
+		The plane angle (in degrees, in the range of -90 to 90) between the X-Z plane and the plane containing both the transducer (e.g. pen stylus) axis and the X axis.
+	**/
 	var tiltY(default,null) : Int;
+	
+	/**
+		The clockwise rotation of the transducer (e.g. pen stylus) around its major axis in degrees, with a value in the range 0 to 359.
+	**/
+	var twist(default,null) : Int;
+	
+	/**
+		Indicates the device type that caused the event (mouse, pen, touch, etc.)
+	**/
 	var pointerType(default,null) : String;
+	
+	/**
+		Indicates if the pointer represents the primary pointer of this pointer type.
+	**/
 	var isPrimary(default,null) : Bool;
 	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : PointerEventInit ) : Void;
+	
+	/**
+		Returns a sequence of all `PointerEvent` instances that were coalesced into the dispatched `pointermove` event.
+	**/
+	function getCoalescedEvents() : Array<PointerEvent>;
 }
\ No newline at end of file
diff --git a/std/js/html/PointerEventInit.hx b/std/js/html/PointerEventInit.hx
index 9e12ec2ff4714bc1ae25dea8d9c4098737107f69..30e8b011f6cb61d9897e52d7005930a878a25295 100644
--- a/std/js/html/PointerEventInit.hx
+++ b/std/js/html/PointerEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,15 +24,16 @@
 
 package js.html;
 
-typedef PointerEventInit =
-{
-	> MouseEventInit,
-	@:optional var height : Int;
-	@:optional var isPrimary : Bool;
-	@:optional var pointerId : Int;
-	@:optional var pointerType : String;
-	@:optional var pressure : Float;
-	@:optional var tiltX : Int;
-	@:optional var tiltY : Int;
-	@:optional var width : Int;
+typedef PointerEventInit = MouseEventInit & {
+	var ?coalescedEvents : Array<PointerEvent>;
+	var ?height : Int;
+	var ?isPrimary : Bool;
+	var ?pointerId : Int;
+	var ?pointerType : String;
+	var ?pressure : Float;
+	var ?tangentialPressure : Float;
+	var ?tiltX : Int;
+	var ?tiltY : Int;
+	var ?twist : Int;
+	var ?width : Int;
 }
\ No newline at end of file
diff --git a/std/js/html/PopStateEvent.hx b/std/js/html/PopStateEvent.hx
index 76c12269bad30c345afd2139230740c5f39ff6ee..8ebff66f831cbe75d147ae5e10c862052a9ecfcb 100644
--- a/std/js/html/PopStateEvent.hx
+++ b/std/js/html/PopStateEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PopStateEvent>
 **/
 @:native("PopStateEvent")
-extern class PopStateEvent extends Event
-{
+extern class PopStateEvent extends Event {
 	var state(default,null) : Dynamic;
 	
 	/** @throws DOMError */
diff --git a/std/js/html/PopStateEventInit.hx b/std/js/html/PopStateEventInit.hx
index a7ee176d1c807fb2acc19ae26f833275d824f046..a7b96c5239f48c47af57194cb10af36675421609 100644
--- a/std/js/html/PopStateEventInit.hx
+++ b/std/js/html/PopStateEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
 
 package js.html;
 
-typedef PopStateEventInit =
-{
-	> EventInit,
-	@:optional var state : Dynamic;
+typedef PopStateEventInit = EventInit & {
+	var ?state : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/PopupBlockedEvent.hx b/std/js/html/PopupBlockedEvent.hx
index a98d95e7d290cdbaa26fd00a26aa648fb7ab6319..0a368db74d6d4b5245a7a81c3047e3f84c7e48bd 100644
--- a/std/js/html/PopupBlockedEvent.hx
+++ b/std/js/html/PopupBlockedEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("PopupBlockedEvent")
-extern class PopupBlockedEvent extends Event
-{
+extern class PopupBlockedEvent extends Event {
 	var requestingWindow(default,null) : Window;
 	var popupWindowURI(default,null) : Dynamic/*MISSING URI*/;
 	var popupWindowName(default,null) : String;
diff --git a/std/js/html/PopupBlockedEventInit.hx b/std/js/html/PopupBlockedEventInit.hx
index 138d56503760a64ac53aca78f1dcce008633631e..a18174d43fc1ce609e8ffbd87395672164fb335e 100644
--- a/std/js/html/PopupBlockedEventInit.hx
+++ b/std/js/html/PopupBlockedEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,9 @@
 
 package js.html;
 
-typedef PopupBlockedEventInit =
-{
-	> EventInit,
-	@:optional var popupWindowFeatures : String;
-	@:optional var popupWindowName : String;
-	@:optional var popupWindowURI : Dynamic/*MISSING URI*/;
-	@:optional var requestingWindow : Window;
+typedef PopupBlockedEventInit = EventInit & {
+	var ?popupWindowFeatures : String;
+	var ?popupWindowName : String;
+	var ?popupWindowURI : Dynamic/*MISSING URI*/;
+	var ?requestingWindow : Window;
 }
\ No newline at end of file
diff --git a/std/js/html/Position.hx b/std/js/html/Position.hx
index a93ca6a59ed82c9c2a3f23a683859e6568896a5b..563cdc2e84dc564fbaef6dd18a7fd295c973a9bf 100644
--- a/std/js/html/Position.hx
+++ b/std/js/html/Position.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,9 +31,7 @@ package js.html;
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Position>
 **/
-@:native("Position")
-extern class Position
-{
+typedef Position = {
 	
 	/**
 		Returns a `Coordinates` object defining the current location.
diff --git a/std/js/html/PositionAlignSetting.hx b/std/js/html/PositionAlignSetting.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1c3c15348d74812df0eaa4d7968b119d63b2f4f0
--- /dev/null
+++ b/std/js/html/PositionAlignSetting.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\VTTCue.webidl. Do not edit!
+
+package js.html;
+
+enum abstract PositionAlignSetting(String) {
+	var LINE_LEFT = "line-left";
+	var CENTER = "center";
+	var LINE_RIGHT = "line-right";
+	var AUTO = "auto";
+}
\ No newline at end of file
diff --git a/std/js/html/PositionError.hx b/std/js/html/PositionError.hx
index d2756f41071788165464b6b441943a45171b12f8..8deafa79b65d801f7b81b960526c9288b8b9b3d1 100644
--- a/std/js/html/PositionError.hx
+++ b/std/js/html/PositionError.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PositionError>
 **/
 @:native("PositionError")
-extern class PositionError
-{
+extern class PositionError {
 	static inline var PERMISSION_DENIED : Int = 1;
 	static inline var POSITION_UNAVAILABLE : Int = 2;
 	static inline var TIMEOUT : Int = 3;
diff --git a/std/js/html/PositionOptions.hx b/std/js/html/PositionOptions.hx
index 46946e5d582e04a580524bd8c92ab713d8a65e58..6ff191a52d6338dfd760fba9bc6f4a23c8533273 100644
--- a/std/js/html/PositionOptions.hx
+++ b/std/js/html/PositionOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,21 +31,20 @@ package js.html;
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PositionOptions>
 **/
-typedef PositionOptions =
-{
-	@:optional 
+typedef PositionOptions = {
+	
 	/**
 		Is a `Boolean` that indicates the application would like to receive the best possible results. If `true` and if the device is able to provide a more accurate position, it will do so. Note that this can result in slower response times or increased power consumption (with a GPS chip on a mobile device for example). On the other hand, if `false`, the device can take the liberty to save resources by responding more quickly and/or using less power. Default: `false`.
 	**/
-	var enableHighAccuracy : Bool;
-	@:optional 
+	var ?enableHighAccuracy : Bool;
+	
 	/**
 		Is a positive `long` value indicating the maximum age in milliseconds of a possible cached position that is acceptable to return. If set to `0`, it means that the device cannot use a cached position and must attempt to retrieve the real current position. If set to `Infinity` the device must return a cached position regardless of its age. Default: 0.
 	**/
-	var maximumAge : Int;
-	@:optional 
+	var ?maximumAge : Int;
+	
 	/**
 		Is a positive `long` value representing the maximum length of time (in milliseconds) the device is allowed to take in order to return a position. The default value is `Infinity`, meaning that `getCurrentPosition()` won't return until the position is available.
 	**/
-	var timeout : Int;
+	var ?timeout : Int;
 }
\ No newline at end of file
diff --git a/std/js/html/PreElement.hx b/std/js/html/PreElement.hx
index 06addf101562c09eff9d4068a4d8dd87f6dc2ce0..fdbc167abe1eed5634517186f85a00221ab308a2 100644
--- a/std/js/html/PreElement.hx
+++ b/std/js/html/PreElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLPreElement>
 **/
 @:native("HTMLPreElement")
-extern class PreElement extends Element
-{
+extern class PreElement extends Element {
 	
 	/**
 		Is a `long` value reflecting the obsolete `width` attribute, containing a fixed-size length for the `pre` element.
diff --git a/std/js/html/ProcessingInstruction.hx b/std/js/html/ProcessingInstruction.hx
index 917f1f4c881f96a19556cba38d30c99c4ff25e45..fbe057308652e7386bc202dd62bdd53565f6d91e 100644
--- a/std/js/html/ProcessingInstruction.hx
+++ b/std/js/html/ProcessingInstruction.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,15 @@
 package js.html;
 
 /**
-	A processing instruction provides an opportunity for application-specific instructions to be embedded within XML and which can be ignored by XML processors which do not support processing their instructions (outside of their having a place in the DOM).
+	A processing instruction embeds application-specific instructions in XML which can be ignored by other applications that don't recognize them.
 
 	Documentation [ProcessingInstruction](https://developer.mozilla.org/en-US/docs/Web/API/ProcessingInstruction) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/ProcessingInstruction$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ProcessingInstruction>
 **/
 @:native("ProcessingInstruction")
-extern class ProcessingInstruction extends CharacterData
-{
+extern class ProcessingInstruction extends CharacterData {
 	var target(default,null) : String;
+	var sheet(default,null) : StyleSheet;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/ProgressElement.hx b/std/js/html/ProgressElement.hx
index ec57f46d6f498a7e1af2a413a2039653f2f8220c..3ec3d00022a378fe0ab7acfdee4b6bb1daf5baae 100644
--- a/std/js/html/ProgressElement.hx
+++ b/std/js/html/ProgressElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLProgressElement>
 **/
 @:native("HTMLProgressElement")
-extern class ProgressElement extends Element
-{
+extern class ProgressElement extends Element {
 	
 	/**
 		Is a `double` value that reflects the current value; if the progress bar is an indeterminate progress bar, it returns `0`.
@@ -50,4 +49,9 @@ extern class ProgressElement extends Element
 	**/
 	var position(default,null) : Float;
 	
+	/**
+		Returns `NodeList` containing the list of `label` elements that are labels for this element.
+	**/
+	var labels(default,null) : NodeList;
+	
 }
\ No newline at end of file
diff --git a/std/js/html/ProgressEvent.hx b/std/js/html/ProgressEvent.hx
index 289532919a636a05e4b6f6f432c0825de6f3fff6..1ac556955338a23598b7298950d778a5520d6ab1 100644
--- a/std/js/html/ProgressEvent.hx
+++ b/std/js/html/ProgressEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ProgressEvent>
 **/
 @:native("ProgressEvent")
-extern class ProgressEvent extends Event
-{
+extern class ProgressEvent extends Event {
 	
 	/**
 		Is a `Boolean` flag indicating if the total work to be done, and the amount of work already done, by the underlying process is calculable. In other words, it tells if the progress is measurable or not.
diff --git a/std/js/html/ProgressEventInit.hx b/std/js/html/ProgressEventInit.hx
index be916a48a173173c4b00117144af9e33b4faffb2..49c74d32984c6de3619db1a8d47b90e112eb739d 100644
--- a/std/js/html/ProgressEventInit.hx
+++ b/std/js/html/ProgressEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,8 @@
 
 package js.html;
 
-typedef ProgressEventInit =
-{
-	> EventInit,
-	@:optional var lengthComputable : Bool;
-	@:optional var loaded : Int;
-	@:optional var total : Int;
+typedef ProgressEventInit = EventInit & {
+	var ?lengthComputable : Bool;
+	var ?loaded : Int;
+	var ?total : Int;
 }
\ No newline at end of file
diff --git a/std/js/html/ObjectURLOptions.hx b/std/js/html/PromiseNativeHandler.hx
similarity index 88%
rename from std/js/html/ObjectURLOptions.hx
rename to std/js/html/PromiseNativeHandler.hx
index ee990a34a47c1b76dde6e2c6bd4a98f284c3d6f8..28dae4ee8d6ad4c333e83a083e127d367da3970c 100644
--- a/std/js/html/ObjectURLOptions.hx
+++ b/std/js/html/PromiseNativeHandler.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,10 +20,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\URL.webidl. Do not edit!
+// This file is generated from mozilla\Promise.webidl. Do not edit!
 
 package js.html;
 
-typedef ObjectURLOptions =
-{
+typedef PromiseNativeHandler = {
 }
\ No newline at end of file
diff --git a/std/js/html/PropertyNodeList.hx b/std/js/html/PropertyNodeList.hx
index a1537f91fdec91be0e036399cc2229e5446434d1..0953b4e2921f5f8e76d30bfa8c090979a5c28203 100644
--- a/std/js/html/PropertyNodeList.hx
+++ b/std/js/html/PropertyNodeList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\HTMLPropertiesCollection.webidl. Do not edit!
+// This file is generated from HTMLPropertiesCollection.webidl. Do not edit!
 
 package js.html;
 
 @:native("PropertyNodeList")
-extern class PropertyNodeList extends NodeList
-{
+extern class PropertyNodeList extends NodeList {
 	/** @throws DOMError */
 	function getValues() : Array<Dynamic>;
 }
\ No newline at end of file
diff --git a/std/js/html/QuoteElement.hx b/std/js/html/QuoteElement.hx
index 25a0f42a63750e2825711cdad5686db75dfdb828..d060ece70ff493916fbf23406343e4b63a28b720 100644
--- a/std/js/html/QuoteElement.hx
+++ b/std/js/html/QuoteElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLQuoteElement>
 **/
 @:native("HTMLQuoteElement")
-extern class QuoteElement extends Element
-{
+extern class QuoteElement extends Element {
 	
 	/**
 		Is a `DOMString` reflecting the `cite` HTML attribute, containing a URL for the source of the quotation.
diff --git a/std/js/html/RadioNodeList.hx b/std/js/html/RadioNodeList.hx
index 017a54dce448f12ccebc7c42cafe84368e74413a..208263ee4c74a21ed951348484ccf2bc12fb8ab1 100644
--- a/std/js/html/RadioNodeList.hx
+++ b/std/js/html/RadioNodeList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/RadioNodeList>
 **/
 @:native("RadioNodeList")
-extern class RadioNodeList extends NodeList
-{
+extern class RadioNodeList extends NodeList {
 	
 	/**
 		If the underlying element collection contains radio buttons, the `value` property represents the checked radio button. On retrieving the `value` property, the `value` of the currently `checked` radio button is returned as a string. If the collection does not contain any radio buttons or none of the radio buttons in the collection is in `checked` state, the empty string is returned. On setting the `value` property, the first radio button input element whose `value` property is equal to the new value will be set to `checked`.
diff --git a/std/js/html/Range.hx b/std/js/html/Range.hx
index fae6c7eb443b5b4a192058fd240d8d8cb52f6c05..fe331878d7ba286fdbaf5d77a224acdafcbb8114 100644
--- a/std/js/html/Range.hx
+++ b/std/js/html/Range.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Range>
 **/
 @:native("Range")
-extern class Range
-{
+extern class Range {
 	static inline var START_TO_START : Int = 0;
 	static inline var START_TO_END : Int = 1;
 	static inline var END_TO_END : Int = 2;
@@ -72,45 +71,137 @@ extern class Range
 	
 	/** @throws DOMError */
 	function new() : Void;
-	/** @throws DOMError */
+	
+	/**
+		Sets the start position of a `Range`.
+		@throws DOMError
+	**/
 	function setStart( refNode : Node, offset : Int ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Sets the end position of a `Range`.
+		@throws DOMError
+	**/
 	function setEnd( refNode : Node, offset : Int ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Sets the start position of a `Range` relative to another `Node`.
+		@throws DOMError
+	**/
 	function setStartBefore( refNode : Node ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Sets the start position of a `Range` relative to another `Node`.
+		@throws DOMError
+	**/
 	function setStartAfter( refNode : Node ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Sets the end position of a `Range` relative to another `Node`.
+		@throws DOMError
+	**/
 	function setEndBefore( refNode : Node ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Sets the end position of a `Range` relative to another `Node`.
+		@throws DOMError
+	**/
 	function setEndAfter( refNode : Node ) : Void;
-	function collapse( ?toStart : Bool = false ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Collapses the `Range` to one of its boundary points.
+	**/
+	function collapse( toStart : Bool = false ) : Void;
+	
+	/**
+		Sets the `Range` to contain the `Node` and its contents.
+		@throws DOMError
+	**/
 	function selectNode( refNode : Node ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Sets the `Range` to contain the contents of a `Node`.
+		@throws DOMError
+	**/
 	function selectNodeContents( refNode : Node ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Compares the boundary points of the `Range` with another `Range`.
+		@throws DOMError
+	**/
 	function compareBoundaryPoints( how : Int, sourceRange : Range ) : Int;
-	/** @throws DOMError */
+	
+	/**
+		Removes the contents of a `Range` from the `Document`.
+		@throws DOMError
+	**/
 	function deleteContents() : Void;
-	/** @throws DOMError */
+	
+	/**
+		Moves contents of a `Range` from the document tree into a `DocumentFragment`.
+		@throws DOMError
+	**/
 	function extractContents() : DocumentFragment;
-	/** @throws DOMError */
+	
+	/**
+		Returns a `DocumentFragment` copying the nodes of a `Range`.
+		@throws DOMError
+	**/
 	function cloneContents() : DocumentFragment;
-	/** @throws DOMError */
+	
+	/**
+		Insert a `Node` at the start of a `Range`.
+		@throws DOMError
+	**/
 	function insertNode( node : Node ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Moves content of a `Range` into a new `Node`.
+		@throws DOMError
+	**/
 	function surroundContents( newParent : Node ) : Void;
+	
+	/**
+		Returns a `Range` object with boundary points identical to the cloned `Range`.
+	**/
 	function cloneRange() : Range;
+	
+	/**
+		Releases the `Range` from use to improve performance.
+	**/
 	function detach() : Void;
-	/** @throws DOMError */
+	
+	/**
+		Returns a `boolean` indicating whether the given point is in the `Range`.
+		@throws DOMError
+	**/
 	function isPointInRange( node : Node, offset : Int ) : Bool;
-	/** @throws DOMError */
+	
+	/**
+		Returns -1, 0, or 1 indicating whether the point occurs before, inside, or after the `Range`.
+		@throws DOMError
+	**/
 	function comparePoint( node : Node, offset : Int ) : Int;
-	/** @throws DOMError */
+	
+	/**
+		Returns a `boolean` indicating whether the given node intersects the `Range`.
+		@throws DOMError
+	**/
 	function intersectsNode( node : Node ) : Bool;
-	/** @throws DOMError */
+	
+	/**
+		Returns a `DocumentFragment` created from a given string of code.
+		@throws DOMError
+	**/
 	function createContextualFragment( fragment : String ) : DocumentFragment;
+	
+	/**
+		Returns a list of `DOMRect` objects that aggregates the results of `Element.getClientRects()` for all the elements in the `Range`.
+	**/
 	function getClientRects() : DOMRectList;
+	
+	/**
+		Returns a `DOMRect` object which bounds the entire contents of the `Range`; this would be the union of all the rectangles returned by `range.getClientRects()`.
+	**/
 	function getBoundingClientRect() : DOMRect;
 }
\ No newline at end of file
diff --git a/std/js/html/RecordingState.hx b/std/js/html/RecordingState.hx
index e30d6810196d7fee100062f90dee4bc694ddf2ff..5892b50793262191a28ec6709396470f03463447 100644
--- a/std/js/html/RecordingState.hx
+++ b/std/js/html/RecordingState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract RecordingState(String)
-{
+enum abstract RecordingState(String) {
 	var INACTIVE = "inactive";
 	var RECORDING = "recording";
 	var PAUSED = "paused";
diff --git a/std/js/html/ReferrerPolicy.hx b/std/js/html/ReferrerPolicy.hx
index 0ee8287907cf697ea2ad2981b06bfed77be482c4..e80e5cdf4a465e0b57d5954e6de59d747ff5e02b 100644
--- a/std/js/html/ReferrerPolicy.hx
+++ b/std/js/html/ReferrerPolicy.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,12 +24,14 @@
 
 package js.html;
 
-@:enum abstract ReferrerPolicy(String)
-{
+enum abstract ReferrerPolicy(String) {
 	var NONE = "";
 	var NO_REFERRER = "no-referrer";
 	var NO_REFERRER_WHEN_DOWNGRADE = "no-referrer-when-downgrade";
-	var ORIGIN_ONLY = "origin-only";
+	var ORIGIN = "origin";
 	var ORIGIN_WHEN_CROSS_ORIGIN = "origin-when-cross-origin";
 	var UNSAFE_URL = "unsafe-url";
+	var SAME_ORIGIN = "same-origin";
+	var STRICT_ORIGIN = "strict-origin";
+	var STRICT_ORIGIN_WHEN_CROSS_ORIGIN = "strict-origin-when-cross-origin";
 }
\ No newline at end of file
diff --git a/std/js/html/RegistrationOptions.hx b/std/js/html/RegistrationOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7b5c3a92f06f896b0d488737304c2bceece50660
--- /dev/null
+++ b/std/js/html/RegistrationOptions.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ServiceWorkerContainer.webidl. Do not edit!
+
+package js.html;
+
+typedef RegistrationOptions = {
+	var ?scope : String;
+	var ?updateViaCache : ServiceWorkerUpdateViaCache;
+}
\ No newline at end of file
diff --git a/std/js/html/Request.hx b/std/js/html/Request.hx
index 321a35a011d5512bed81ffa9d0a05f844a4a6e8c..3c0f7abf9212055125341110f7dab200c2e074f1 100644
--- a/std/js/html/Request.hx
+++ b/std/js/html/Request.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `Request` interface of the Fetch API represents a resource request.
 
@@ -32,65 +34,76 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Request>
 **/
 @:native("Request")
-extern class Request
-{
-	
+extern class Request {
+
 	/**
 		Contains the request's method (`GET`, `POST`, etc.)
 	**/
 	var method(default,null) : String;
-	
+
 	/**
 		Contains the URL of the request.
 	**/
 	var url(default,null) : String;
-	
+
 	/**
 		Contains the associated `Headers` object of the request.
 	**/
 	var headers(default,null) : Headers;
-	
+
+	/**
+		Returns a string from the `RequestDestination` enum describing the request's destination. This is a string indicating the type of content being requested.
+	**/
+	var destination(default,null) : RequestDestination;
+
 	/**
 		Contains the referrer of the request (e.g., `client`).
 	**/
 	var referrer(default,null) : String;
-	
+
 	/**
 		Contains the referrer policy of the request (e.g., `no-referrer`).
 	**/
 	var referrerPolicy(default,null) : ReferrerPolicy;
-	
+
 	/**
 		Contains the mode of the request (e.g., `cors`, `no-cors`, `same-origin`, `navigate`.)
 	**/
 	var mode(default,null) : RequestMode;
-	
+
 	/**
-		Contains the credentials of the request (e.g., `omit`, `same-origin`).
+		Contains the credentials of the request (e.g., `"omit"`, `"same-origin"`, `"include"`). The default is `"same-origin"`.
 	**/
 	var credentials(default,null) : RequestCredentials;
-	
+
 	/**
 		Contains the cache mode of the request (e.g., `default`, `reload`, `no-cache`).
 	**/
 	var cache(default,null) : RequestCache;
-	
+
 	/**
 		Contains the mode for how redirects are handled. It may be one of `follow`, `error`, or `manual`.
 	**/
 	var redirect(default,null) : RequestRedirect;
+
+	/**
+		Contains the subresource integrity value of the request (e.g., `sha256-BpfBw7ivV8q2jLiT13fxDYAe2tJllusRSZ273h2nFSE=`).
+	**/
+	var integrity(default,null) : String;
+	var signal(default,null) : AbortSignal;
 	var bodyUsed(default,null) : Bool;
-	
-	/** @throws DOMError */
-	function new( input : haxe.extern.EitherType<Request,String>, ?init : RequestInit ) : Void;
+
 	/** @throws DOMError */
-	
+	@:overload( function( input : String, ?init : RequestInit) : Request {} )
+	function new( input : Request, ?init : RequestInit ) : Void;
+
 	/**
 		Creates a copy of the current `Request` object.
+		@throws DOMError
 	**/
 	function clone() : Request;
 	/** @throws DOMError */
-	function arrayBuffer() : Promise<ArrayBuffer>;
+	function arrayBuffer() : Promise<js.lib.ArrayBuffer>;
 	/** @throws DOMError */
 	function blob() : Promise<Blob>;
 	/** @throws DOMError */
diff --git a/std/js/html/RequestCache.hx b/std/js/html/RequestCache.hx
index a0b5c781753db7c64dece2542a67f703a885d7ed..e3bedb3f324d93c46e64193160510c2214198f88 100644
--- a/std/js/html/RequestCache.hx
+++ b/std/js/html/RequestCache.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,11 @@
 
 package js.html;
 
-@:enum abstract RequestCache(String)
-{
-	var DEFAULT_ = "default";
+enum abstract RequestCache(String) {
+	var DEFAULT = "default";
 	var NO_STORE = "no-store";
 	var RELOAD = "reload";
 	var NO_CACHE = "no-cache";
 	var FORCE_CACHE = "force-cache";
+	var ONLY_IF_CACHED = "only-if-cached";
 }
\ No newline at end of file
diff --git a/std/js/html/RequestCredentials.hx b/std/js/html/RequestCredentials.hx
index b6857fbf277b4d2222db11b945ff7a27ad09d052..cdbce04546d550403667d6dd1a7a7dc316f4f011 100644
--- a/std/js/html/RequestCredentials.hx
+++ b/std/js/html/RequestCredentials.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract RequestCredentials(String)
-{
+enum abstract RequestCredentials(String) {
 	var OMIT = "omit";
 	var SAME_ORIGIN = "same-origin";
 	var INCLUDE = "include";
diff --git a/std/js/html/RequestDestination.hx b/std/js/html/RequestDestination.hx
new file mode 100644
index 0000000000000000000000000000000000000000..02243d9017273659d3c8a30cadf720912b68754e
--- /dev/null
+++ b/std/js/html/RequestDestination.hx
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Request.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `RequestDestination` enumerated type contains the permitted values for a request's `destination`. These string values indicate potential types of content that a request may try to retrieve.
+
+	Documentation [RequestDestination](https://developer.mozilla.org/en-US/docs/Web/API/RequestDestination) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RequestDestination$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/RequestDestination>
+**/
+enum abstract RequestDestination(String) {
+	var NONE = "";
+	var AUDIO = "audio";
+	var AUDIOWORKLET = "audioworklet";
+	var DOCUMENT = "document";
+	var EMBED = "embed";
+	var FONT = "font";
+	var IMAGE = "image";
+	var MANIFEST = "manifest";
+	var OBJECT = "object";
+	var PAINTWORKLET = "paintworklet";
+	var REPORT = "report";
+	var SCRIPT = "script";
+	var SHAREDWORKER = "sharedworker";
+	var STYLE = "style";
+	var TRACK = "track";
+	var VIDEO = "video";
+	var WORKER = "worker";
+	var XSLT = "xslt";
+}
\ No newline at end of file
diff --git a/std/js/html/RequestInit.hx b/std/js/html/RequestInit.hx
index beb7a58720f48b4480c216d46644580c63ec745c..2a3d77d19d406e34a777ff52ccc4ed5c1a2bcfcb 100644
--- a/std/js/html/RequestInit.hx
+++ b/std/js/html/RequestInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,15 +24,17 @@
 
 package js.html;
 
-typedef RequestInit =
-{
-	@:optional var body : haxe.extern.EitherType<ArrayBuffer,haxe.extern.EitherType<ArrayBufferView,haxe.extern.EitherType<Blob,haxe.extern.EitherType<FormData,haxe.extern.EitherType<String,URLSearchParams>>>>>;
-	@:optional var cache : RequestCache;
-	@:optional var credentials : RequestCredentials;
-	@:optional var headers : haxe.extern.EitherType<Headers,haxe.extern.EitherType<Array<Array<String>>,Dynamic/*MISSING ByteStringMozMap*/>>;
-	@:optional var method : String;
-	@:optional var mode : RequestMode;
-	@:optional var redirect : RequestRedirect;
-	@:optional var referrer : String;
-	@:optional var referrerPolicy : ReferrerPolicy;
+typedef RequestInit = {
+	var ?body : haxe.extern.EitherType<Blob,haxe.extern.EitherType<haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer>,haxe.extern.EitherType<FormData,haxe.extern.EitherType<URLSearchParams,String>>>>;
+	var ?cache : RequestCache;
+	var ?credentials : RequestCredentials;
+	var ?headers : haxe.extern.EitherType<Headers,haxe.extern.EitherType<Array<Array<String>>,haxe.DynamicAccess<String>>>;
+	var ?integrity : String;
+	var ?method : String;
+	var ?mode : RequestMode;
+	var ?observe : haxe.extern.EitherType<FetchObserver -> Void, ObserverCallback>;
+	var ?redirect : RequestRedirect;
+	var ?referrer : String;
+	var ?referrerPolicy : ReferrerPolicy;
+	var ?signal : AbortSignal;
 }
\ No newline at end of file
diff --git a/std/js/html/RequestMode.hx b/std/js/html/RequestMode.hx
index d625aa8386a91662bd21db75e9ad7e20397ae397..074303fdb8cf1dc4305fa80304477451c2d14c67 100644
--- a/std/js/html/RequestMode.hx
+++ b/std/js/html/RequestMode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract RequestMode(String)
-{
+enum abstract RequestMode(String) {
 	var SAME_ORIGIN = "same-origin";
 	var NO_CORS = "no-cors";
 	var CORS = "cors";
diff --git a/std/js/html/RequestRedirect.hx b/std/js/html/RequestRedirect.hx
index 0f13da35e51c536c7cc03d0298dd18d9934fbe5f..0463248ad57760eca71caebb5175c1042147c4a0 100644
--- a/std/js/html/RequestRedirect.hx
+++ b/std/js/html/RequestRedirect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract RequestRedirect(String)
-{
+enum abstract RequestRedirect(String) {
 	var FOLLOW = "follow";
 	var ERROR = "error";
 	var MANUAL = "manual";
diff --git a/std/js/html/Response.hx b/std/js/html/Response.hx
index 7a1d0e0225623714844f64b39cd1fe50d309526d..006bf5fdd06a011e0742800af876568732dfcce6 100644
--- a/std/js/html/Response.hx
+++ b/std/js/html/Response.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `Response` interface of the Fetch API represents the response to a request.
 
@@ -32,61 +34,71 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Response>
 **/
 @:native("Response")
-extern class Response
-{
-	static 
+extern class Response {
+
 	/**
 		Returns a new `Response` object associated with a network error.
 	**/
-	function error() : Response;
-	/** @throws DOMError */
-	static 
+	static function error() : Response;
+
 	/**
 		Creates a new response with a different URL.
+		@throws DOMError
 	**/
-	function redirect( url : String, ?status : Int = 302 ) : Response;
-	
+	static function redirect( url : String, status : Int = 302 ) : Response;
+
 	/**
 		Contains the type of the response (e.g., `basic`, `cors`).
 	**/
 	var type(default,null) : ResponseType;
-	
+
 	/**
 		Contains the URL of the response.
 	**/
 	var url(default,null) : String;
-	
+
+	/**
+		Indicates whether or not the response is the result of a redirect; that is, its URL list has more than one entry.
+	**/
+	var redirected(default,null) : Bool;
+
 	/**
 		Contains the status code of the response (e.g., `200` for a success).
 	**/
 	var status(default,null) : Int;
-	
+
 	/**
 		Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
 	**/
 	var ok(default,null) : Bool;
-	
+
 	/**
 		Contains the status message corresponding to the status code (e.g., `OK` for `200`).
 	**/
 	var statusText(default,null) : String;
-	
+
 	/**
 		Contains the `Headers` object associated with the response.
 	**/
 	var headers(default,null) : Headers;
 	var bodyUsed(default,null) : Bool;
-	
-	/** @throws DOMError */
-	function new( ?body : haxe.extern.EitherType<ArrayBuffer,haxe.extern.EitherType<ArrayBufferView,haxe.extern.EitherType<Blob,haxe.extern.EitherType<FormData,haxe.extern.EitherType<String,URLSearchParams>>>>>, ?init : ResponseInit ) : Void;
+
 	/** @throws DOMError */
-	
+	@:overload( function( ?body : js.lib.ArrayBufferView, ?init : ResponseInit) : Response {} )
+	@:overload( function( ?body : js.lib.ArrayBuffer, ?init : ResponseInit) : Response {} )
+	@:overload( function( ?body : FormData, ?init : ResponseInit) : Response {} )
+	@:overload( function( ?body : URLSearchParams, ?init : ResponseInit) : Response {} )
+	@:overload( function( ?body : Dynamic/*MISSING ReadableStream*/, ?init : ResponseInit) : Response {} )
+	@:overload( function( ?body : String, ?init : ResponseInit) : Response {} )
+	function new( ?body : Blob, ?init : ResponseInit ) : Void;
+
 	/**
 		Creates a clone of a `Response` object.
+		@throws DOMError
 	**/
 	function clone() : Response;
 	/** @throws DOMError */
-	function arrayBuffer() : Promise<ArrayBuffer>;
+	function arrayBuffer() : Promise<js.lib.ArrayBuffer>;
 	/** @throws DOMError */
 	function blob() : Promise<Blob>;
 	/** @throws DOMError */
diff --git a/std/js/html/ResponseInit.hx b/std/js/html/ResponseInit.hx
index 28177a502f8b71f0f02662f75f8c8fd873e3123e..6af5a2005359924b72b95b989e3a3805ba498aed 100644
--- a/std/js/html/ResponseInit.hx
+++ b/std/js/html/ResponseInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,8 @@
 
 package js.html;
 
-typedef ResponseInit =
-{
-	@:optional var headers : haxe.extern.EitherType<Headers,haxe.extern.EitherType<Array<Array<String>>,Dynamic/*MISSING ByteStringMozMap*/>>;
-	@:optional var status : Int;
-	@:optional var statusText : String;
+typedef ResponseInit = {
+	var ?headers : haxe.extern.EitherType<Headers,haxe.extern.EitherType<Array<Array<String>>,haxe.DynamicAccess<String>>>;
+	var ?status : Int;
+	var ?statusText : String;
 }
\ No newline at end of file
diff --git a/std/js/html/ResponseType.hx b/std/js/html/ResponseType.hx
index f920563d3c8e5e009ddfbc3c690cc8df6baa6000..fd463d289d2d85cc80aa3bced343b45c924de86f 100644
--- a/std/js/html/ResponseType.hx
+++ b/std/js/html/ResponseType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,10 @@
 
 package js.html;
 
-@:enum abstract ResponseType(String)
-{
+enum abstract ResponseType(String) {
 	var BASIC = "basic";
 	var CORS = "cors";
-	var DEFAULT_ = "default";
+	var DEFAULT = "default";
 	var ERROR = "error";
 	var OPAQUE = "opaque";
 	var OPAQUEREDIRECT = "opaqueredirect";
diff --git a/std/js/html/Screen.hx b/std/js/html/Screen.hx
index 31cd640e0983b3e23ca0c5ee6d2c4cb9e06a47fa..ac5353d02f6d08e699836825ffdcbdd06ad11c2d 100644
--- a/std/js/html/Screen.hx
+++ b/std/js/html/Screen.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `Screen` interface represents a screen, usually the one on which the current window is being rendered.
+	The `Screen` interface represents a screen, usually the one on which the current window is being rendered, and is obtained using `window.screen`.
 
 	Documentation [Screen](https://developer.mozilla.org/en-US/docs/Web/API/Screen) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Screen$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Screen>
 **/
 @:native("Screen")
-extern class Screen extends EventTarget
-{
+extern class Screen extends EventTarget {
 	var availWidth(default,null) : Int;
 	var availHeight(default,null) : Int;
 	var width(default,null) : Int;
diff --git a/std/js/html/ScreenOrientation.hx b/std/js/html/ScreenOrientation.hx
index 41dfcad7fd72e31a40975618f9124eced442869d..10a580e511dac168f23db95121c1b725c34b45d5 100644
--- a/std/js/html/ScreenOrientation.hx
+++ b/std/js/html/ScreenOrientation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,15 +24,43 @@
 
 package js.html;
 
+import js.lib.Promise;
+
+/**
+	The `ScreenOrientation` interface of the the Screen Orientation API provides information about the current orientation of the document.
+
+	Documentation [ScreenOrientation](https://developer.mozilla.org/en-US/docs/Web/API/ScreenOrientation) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/ScreenOrientation$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/ScreenOrientation>
+**/
 @:native("ScreenOrientation")
-extern class ScreenOrientation extends EventTarget
-{
+extern class ScreenOrientation extends EventTarget {
+
+	/**
+		Returns the document's current orientation type, one of "portrait-primary", "portrait-secondary", "landscape-primary", or "landscape-secondary".
+	**/
 	var type(default,null) : OrientationType;
+
+	/**
+		Returns the document's current orientation angle.
+	**/
 	var angle(default,null) : Int;
+
+	/**
+		Fired whenever is the `EventHandler` called when the screen changes orientation.
+	**/
 	var onchange : haxe.Constraints.Function;
-	
-	/** @throws DOMError */
+
+
+	/**
+		Locks the orientation of the containing document to its default orientation and returns a `Promise`. 
+		@throws DOMError
+	**/
 	function lock( orientation : OrientationLockType ) : Promise<Void>;
-	/** @throws DOMError */
+
+	/**
+		Unlocks the orientation of the containing document from its default orientation.
+		@throws DOMError
+	**/
 	function unlock() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ScriptElement.hx b/std/js/html/ScriptElement.hx
index de2734889d7dd759f3eaaa937aa1ebfc5b485c08..56cce25f1720b6bd31d48e9aaa4b066fec731cd8 100644
--- a/std/js/html/ScriptElement.hx
+++ b/std/js/html/ScriptElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	HTML script elements expose the `HTMLScriptElement` interface, which provides special properties and methods (beyond the regular `HTMLElement` object interface they also have available to them by inheritance) for manipulating the layout and presentation of `script` elements.
+	HTML `script` elements expose the `HTMLScriptElement` interface, which provides special properties and methods for manipulating the behavior and execution of `script` elements (beyond the inherited `HTMLElement` interface).
 
 	Documentation [HTMLScriptElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLScriptElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLScriptElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLScriptElement>
 **/
 @:native("HTMLScriptElement")
-extern class ScriptElement extends Element
-{
+extern class ScriptElement extends Element {
 	var src : String;
 	var type : String;
 	var charset : String;
diff --git a/std/js/html/ScrollAreaEvent.hx b/std/js/html/ScrollAreaEvent.hx
index 6fb50c6ef7cfb2dfaf6c86de7ef425eab4d38896..7274fbc8b661bd9bb83e77d5c8208fd615e6de71 100644
--- a/std/js/html/ScrollAreaEvent.hx
+++ b/std/js/html/ScrollAreaEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,12 +25,11 @@
 package js.html;
 
 @:native("ScrollAreaEvent")
-extern class ScrollAreaEvent extends UIEvent
-{
+extern class ScrollAreaEvent extends UIEvent {
 	var x(default,null) : Float;
 	var y(default,null) : Float;
 	var width(default,null) : Float;
 	var height(default,null) : Float;
 	
-	function initScrollAreaEvent( type : String, canBubble : Bool, cancelable : Bool, view : Window, detail : Int, x : Float, y : Float, width : Float, height : Float ) : Void;
+	function initScrollAreaEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?view : Window, detail : Int = 0, x : Float = 0.0, y : Float = 0.0, width : Float = 0.0, height : Float = 0.0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ScrollBehavior.hx b/std/js/html/ScrollBehavior.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6428b14403e499163683cd3be4cb4a46ae3b2f55
--- /dev/null
+++ b/std/js/html/ScrollBehavior.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Window.webidl. Do not edit!
+
+package js.html;
+
+enum abstract ScrollBehavior(String) {
+	var AUTO = "auto";
+	var INSTANT = "instant";
+	var SMOOTH = "smooth";
+}
\ No newline at end of file
diff --git a/std/js/html/ScrollIntoViewOptions.hx b/std/js/html/ScrollIntoViewOptions.hx
index 8843fe0bb720ad8d250ac5082629e2ed86d2555c..cfeef9301626783e4b03e796a04c139c600772a3 100644
--- a/std/js/html/ScrollIntoViewOptions.hx
+++ b/std/js/html/ScrollIntoViewOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,8 @@
 
 package js.html;
 
-typedef ScrollIntoViewOptions =
-{
-	> ScrollOptions,
-	@:optional var block : Dynamic/*MISSING ScrollLogicalPosition*/;
+typedef ScrollIntoViewOptions = ScrollOptions & {
+	var ?block : ScrollLogicalPosition;
+	@:native("inline")
+	var ?inline_ : ScrollLogicalPosition;
 }
\ No newline at end of file
diff --git a/std/js/html/ScrollLogicalPosition.hx b/std/js/html/ScrollLogicalPosition.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bba2765f8bae53a1c517182f91abd59a3ce6840d
--- /dev/null
+++ b/std/js/html/ScrollLogicalPosition.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Element.webidl. Do not edit!
+
+package js.html;
+
+enum abstract ScrollLogicalPosition(String) {
+	var START = "start";
+	var CENTER = "center";
+	var END = "end";
+	var NEAREST = "nearest";
+}
\ No newline at end of file
diff --git a/std/js/html/ScrollOptions.hx b/std/js/html/ScrollOptions.hx
index 032c623e4271aeb57f58b1185786f8a66e4b9143..9fda97f893f3e99b23a3021aa643b620e5524f43 100644
--- a/std/js/html/ScrollOptions.hx
+++ b/std/js/html/ScrollOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,6 @@
 
 package js.html;
 
-typedef ScrollOptions =
-{
-	@:optional var behavior : Dynamic/*MISSING ScrollBehavior*/;
+typedef ScrollOptions = {
+	var ?behavior : ScrollBehavior;
 }
\ No newline at end of file
diff --git a/std/js/html/ScrollRestoration.hx b/std/js/html/ScrollRestoration.hx
index f060d7de630a5939e74162b45fb94fab6545c0a8..05371241e673fd51adcf4ee0471add8e448b5915 100644
--- a/std/js/html/ScrollRestoration.hx
+++ b/std/js/html/ScrollRestoration.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract ScrollRestoration(String)
-{
+enum abstract ScrollRestoration(String) {
 	var AUTO = "auto";
 	var MANUAL = "manual";
 }
\ No newline at end of file
diff --git a/std/js/html/ScrollSetting.hx b/std/js/html/ScrollSetting.hx
new file mode 100644
index 0000000000000000000000000000000000000000..076110a25f9f8eb5b4c942a8f119fcddbf2a88f9
--- /dev/null
+++ b/std/js/html/ScrollSetting.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\VTTRegion.webidl. Do not edit!
+
+package js.html;
+
+enum abstract ScrollSetting(String) {
+	var NONE = "";
+	var UP = "up";
+}
\ No newline at end of file
diff --git a/std/js/html/ScrollToOptions.hx b/std/js/html/ScrollToOptions.hx
index f7b842b4a3df61d12c17c927942129e84d22a669..30344201e9181ba668f9e592d8d02531c57d146b 100644
--- a/std/js/html/ScrollToOptions.hx
+++ b/std/js/html/ScrollToOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-typedef ScrollToOptions =
-{
-	> ScrollOptions,
-	@:optional var left : Float;
-	@:optional var top : Float;
+typedef ScrollToOptions = ScrollOptions & {
+	var ?left : Float;
+	var ?top : Float;
 }
\ No newline at end of file
diff --git a/std/js/html/SecurityPolicyViolationEvent.hx b/std/js/html/SecurityPolicyViolationEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..78ba5e45420c3bb00a7472a3addab423b43360f4
--- /dev/null
+++ b/std/js/html/SecurityPolicyViolationEvent.hx
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\SecurityPolicyViolationEvent.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `SecurityPolicyViolationEvent` interface inherits from `Event`, and represents the event object of an event sent on a document or worker when its content security policy is violated.
+
+	Documentation [SecurityPolicyViolationEvent](https://developer.mozilla.org/en-US/docs/Web/API/SecurityPolicyViolationEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SecurityPolicyViolationEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SecurityPolicyViolationEvent>
+**/
+@:native("SecurityPolicyViolationEvent")
+extern class SecurityPolicyViolationEvent extends Event {
+	
+	/**
+		A `USVString` representing the URI of the document or worker in which the violation was found.
+	**/
+	var documentURI(default,null) : String;
+	
+	/**
+		A `USVString` representing the referrer of the resources whose policy was violated. This will be a URL or `null`.
+	**/
+	var referrer(default,null) : String;
+	
+	/**
+		A `USVString` representing the URI of the resource that was blocked because it violates a policy.
+	**/
+	var blockedURI(default,null) : String;
+	
+	/**
+		A `DOMString` representing the directive whose enforcement uncovered the violation.
+	**/
+	var violatedDirective(default,null) : String;
+	
+	/**
+		A `DOMString` representing the directive whose enforcement uncovered the violation.
+	**/
+	var effectiveDirective(default,null) : String;
+	
+	/**
+		A `DOMString` containing the policy whose enforcement uncovered the violation.
+	**/
+	var originalPolicy(default,null) : String;
+	
+	/**
+		A `USVString` representing the URI of the document or worker in which the violation was found.
+	**/
+	var sourceFile(default,null) : String;
+	
+	/**
+		A `DOMString` representing a sample of the resource that caused the violation, usually the first 40 characters. This will only be populated if the resource is an inline script, event handler, or style — external resources causing a violation will not generate a sample.
+	**/
+	var sample(default,null) : String;
+	
+	/**
+		Indicates how the violated policy is configured to be treated by the user agent. This will be `"enforce"` or `"report"`.
+	**/
+	var disposition(default,null) : SecurityPolicyViolationEventDisposition;
+	
+	/**
+		A number representing the HTTP status code of the document or worker in which the violation occurred.
+	**/
+	var statusCode(default,null) : Int;
+	
+	/**
+		The line number in the document or worker at which the violation occurred.
+	**/
+	var lineNumber(default,null) : Int;
+	
+	/**
+		The column number in the document or worker at which the violation occurred.
+	**/
+	var columnNumber(default,null) : Int;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : SecurityPolicyViolationEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/SecurityPolicyViolationEventDisposition.hx b/std/js/html/SecurityPolicyViolationEventDisposition.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8999d55a262b28bbec97b15a76619d3219af4c6e
--- /dev/null
+++ b/std/js/html/SecurityPolicyViolationEventDisposition.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\SecurityPolicyViolationEvent.webidl. Do not edit!
+
+package js.html;
+
+enum abstract SecurityPolicyViolationEventDisposition(String) {
+	var ENFORCE = "enforce";
+	var REPORT = "report";
+}
\ No newline at end of file
diff --git a/std/js/html/AnimationEffectTimingProperties.hx b/std/js/html/SecurityPolicyViolationEventInit.hx
similarity index 66%
rename from std/js/html/AnimationEffectTimingProperties.hx
rename to std/js/html/SecurityPolicyViolationEventInit.hx
index a3f851074eab50d48560463860cc3ab880f748cd..324676d2cd7f320f12a2e69e80a1fe4e067188f8 100644
--- a/std/js/html/AnimationEffectTimingProperties.hx
+++ b/std/js/html/SecurityPolicyViolationEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,18 +20,21 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\AnimationEffectReadOnly.webidl. Do not edit!
+// This file is generated from mozilla\SecurityPolicyViolationEvent.webidl. Do not edit!
 
 package js.html;
 
-typedef AnimationEffectTimingProperties =
-{
-	@:optional var delay : Float;
-	@:optional var direction : PlaybackDirection;
-	@:optional var duration : haxe.extern.EitherType<Float,String>;
-	@:optional var easing : String;
-	@:optional var endDelay : Float;
-	@:optional var fill : FillMode;
-	@:optional var iterationStart : Float;
-	@:optional var iterations : Float;
+typedef SecurityPolicyViolationEventInit = EventInit & {
+	var ?blockedURI : String;
+	var ?columnNumber : Int;
+	var ?disposition : SecurityPolicyViolationEventDisposition;
+	var ?documentURI : String;
+	var ?effectiveDirective : String;
+	var ?lineNumber : Int;
+	var ?originalPolicy : String;
+	var ?referrer : String;
+	var ?sample : String;
+	var ?sourceFile : String;
+	var ?statusCode : Int;
+	var ?violatedDirective : String;
 }
\ No newline at end of file
diff --git a/std/js/html/SelectElement.hx b/std/js/html/SelectElement.hx
index eff6b77a08687655182b9be505b0fdb20714f27e..1d3f8db378f6de9ef2041cff1e1d8fc8408201cc 100644
--- a/std/js/html/SelectElement.hx
+++ b/std/js/html/SelectElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,89 +32,94 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLSelectElement>
 **/
 @:native("HTMLSelectElement")
-extern class SelectElement extends Element implements ArrayAccess<Element>
-{
+extern class SelectElement extends Element implements ArrayAccess<Element> {
 	
 	/**
-		Is a `Boolean` that reflects the `autofocus` HTML attribute, which indicates whether the control should have input focus when the page loads, unless the user overrides it, for example by typing in a different control. Only one form-associated element in a document can have this attribute specified. `2.0`
+		A `Boolean` reflecting the `autofocus` HTML attribute, which indicates whether the control should have input focus when the page loads, unless the user overrides it, for example by typing in a different control. Only one form-associated element in a document can have this attribute specified. `2.0`
 	**/
 	var autofocus : Bool;
+	var autocomplete : String;
 	
 	/**
-		Is a `Boolean` that reflects the `disabled` HTML attribute, which indicates whether the control is disabled. If it is disabled, it does not accept clicks.
+		A `Boolean` reflecting the `disabled` HTML attribute, which indicates whether the control is disabled. If it is disabled, it does not accept clicks.
 	**/
 	var disabled : Bool;
 	
 	/**
-		Returns a `HTMLFormElement` representing the form that this element is associated with. If the element is not associated with of a `form` element, then it returns `null`.
+		An `HTMLFormElement` referencing the form that this element is associated with. If the element is not associated with of a `form` element, then it returns `null`.
 	**/
 	var form(default,null) : FormElement;
 	
 	/**
-		Is a `Boolean` that reflects the `multiple` HTML attribute, which indicates whether multiple items can be selected.
+		A `Boolean` reflecting the `multiple` HTML attribute, which indicates whether multiple items can be selected.
 	**/
 	var multiple : Bool;
 	
 	/**
-		Is a `DOMString` that reflects the `name` HTML attribute, containing the name of this control used by servers and DOM search functions.
+		A `DOMString` reflecting the `name` HTML attribute, containing the name of this control used by servers and DOM search functions.
 	**/
 	var name : String;
 	
 	/**
-		Is a `Boolean` that reflects the `required` HTML attribute, which indicates whether the user is required to select a value before submitting the form. `2.0`
+		A `Boolean` reflecting the `required` HTML attribute, which indicates whether the user is required to select a value before submitting the form. `2.0`
 	**/
 	var required : Bool;
 	
 	/**
-		Is a `long` that reflects the `size` HTML attribute, which contains the number of visible items in the control. The default is 1, unless `multiple` is true, in which case it is 4.
+		A `long` reflecting the `size` HTML attribute, which contains the number of visible items in the control. The default is 1, unless `multiple` is true, in which case it is 4.
 	**/
 	var size : Int;
 	
 	/**
-		Returns a `DOMString` the form control's type. When `multiple` is `true`, it returns `"select-multiple"`; otherwise, it returns `"select-one"`.
+		A `DOMString` represeting the form control's type. When `multiple` is `true`, it returns `"select-multiple"`; otherwise, it returns `"select-one"`.
 	**/
 	var type(default,null) : String;
 	
 	/**
-		Returns a `HTMLOptionsCollection` containing the set of `option` elements contained by this element.
+		An `HTMLOptionsCollection` representing the set of `option` elements contained by this element.
 	**/
 	var options(default,null) : HTMLOptionsCollection;
 	
 	/**
-		Is a `unsigned long` representing the number of `option` elements in this `select` element.
+		An `unsigned long `The number of `option` elements in this `select` element.
 	**/
 	var length : Int;
 	
 	/**
-		Returns a live `HTMLCollection` containing the set of options that are selected.
+		An `HTMLCollection` representing the set of `option` elements that are selected.
 	**/
 	var selectedOptions(default,null) : HTMLCollection;
 	
 	/**
-		Is a `long` that reflects the index of the first selected `option` element. The value `-1` indicates no element is selected.
+		A `long` reflecting the index of the first selected `option` element. The value `-1` indicates no element is selected.
 	**/
 	var selectedIndex : Int;
 	
 	/**
-		Is a `DOMString` representing the value of the form control (the first selected option).
+		A `DOMString` reflecting the value of the form control (the first selected option). Returns the value attribute of the option element or if it is missing, the text attribute.
 	**/
 	var value : String;
 	
 	/**
-		Is a `Boolean` that indicates whether the button is a candidate for constraint validation. It is false if any conditions bar it from constraint validation.
+		A `Boolean` that indicates whether the button is a candidate for constraint validation. It is false if any conditions bar it from constraint validation.
 	**/
 	var willValidate(default,null) : Bool;
 	
 	/**
-		Returns a `ValidityState` representing the validity state that this control is in.
+		A `ValidityState` reflecting the validity state that this control is in.
 	**/
 	var validity(default,null) : ValidityState;
 	
 	/**
-		Returns a `DOMString` containing a localized message that describes the validation constraints that the control does not satisfy (if any). This attribute is the empty string if the control is not a candidate for constraint validation (`willValidate` is false), or it satisfies its constraints.
+		A `DOMString` representing a localized message that describes the validation constraints that the control does not satisfy (if any). This attribute is the empty string if the control is not a candidate for constraint validation (`willValidate` is false), or it satisfies its constraints.
 	**/
 	var validationMessage(default,null) : String;
 	
+	/**
+		A `NodeList` of `label` elements associated with the element.
+	**/
+	var labels(default,null) : NodeList;
+	
 	
 	/**
 		Gets an item from the options collection for this `select` element. You can also access an item by specifying the index in array-style brackets or parentheses, without calling this method explicitly.
@@ -125,17 +130,24 @@ extern class SelectElement extends Element implements ArrayAccess<Element>
 		Gets the item in the options collection with the specified name. The name string can match either the `id` or the `name` attribute of an option node. You can also access an item by specifying the name in array-style brackets or parentheses, without calling this method explicitly.
 	**/
 	function namedItem( name : String ) : OptionElement;
-	/** @throws DOMError */
 	
 	/**
 		Adds an element to the collection of `option` elements for this `select` element.
+		@throws DOMError
 	**/
 	function add( element : haxe.extern.EitherType<OptionElement,OptGroupElement>, ?before : haxe.extern.EitherType<Element,Int> ) : Void;
 	
+	/**
+		Removes the element at the specified index from the options collection for this select element.
+	**/
+	@:overload( function( index : Int ) : Void {} )
+	function remove() : Void;
+	
 	/**
 		Checks whether the element has any constraints and whether it satisfies them. If the element fails its constraints, the browser fires a cancelable `invalid` event at the element (and returns `false`).
 	**/
 	function checkValidity() : Bool;
+	function reportValidity() : Bool;
 	
 	/**
 		Sets the custom validity message for the selection element to the specified message. Use the empty string to indicate that the element does not have a custom validity error.
diff --git a/std/js/html/Selection.hx b/std/js/html/Selection.hx
index 65ddaf4a2f7a114aad67a8a368a4de742b059712..5d579adf437b4573380aa8a26e2342ff2fff135f 100644
--- a/std/js/html/Selection.hx
+++ b/std/js/html/Selection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	Calling the `Selection.toString()` method returns the text contained in the selection, e.g.:
+	A `Selection` object represents the range of text selected by the user or the current position of the caret. To obtain a Selection object for examination or modification, call `window.getSelection()`.
 
 	Documentation [Selection](https://developer.mozilla.org/en-US/docs/Web/API/Selection) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Selection$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Selection>
 **/
 @:native("Selection")
-extern class Selection
-{
+extern class Selection {
 	
 	/**
 		Returns the `Node` in which the selection begins.
@@ -64,78 +63,93 @@ extern class Selection
 		Returns the number of ranges in the selection.
 	**/
 	var rangeCount(default,null) : Int;
+	
+	/**
+		Returns a `DOMString` describing the type of the current selection.
+	**/
+	var type(default,null) : String;
 	var caretBidiLevel : Int;
 	
-	/** @throws DOMError */
 	
 	/**
-		Collapses the current selection to a single point.
+		Returns a `Range` object representing one of the ranges currently selected.
+		@throws DOMError
 	**/
-	function collapse( node : Node, offset : Int ) : Void;
-	/** @throws DOMError */
+	function getRangeAt( index : Int ) : Range;
 	
 	/**
-		Collapses the selection to the start of the first range in the selection.
+		A `Range` object that will be added to the selection.
+		@throws DOMError
 	**/
-	function collapseToStart() : Void;
-	/** @throws DOMError */
+	function addRange( range : Range ) : Void;
 	
 	/**
-		Collapses the selection to the end of the last range in the selection.
+		Removes a range from the selection.
+		@throws DOMError
 	**/
-	function collapseToEnd() : Void;
-	/** @throws DOMError */
+	function removeRange( range : Range ) : Void;
 	
 	/**
-		Moves the focus of the selection to a specified point.
+		Removes all ranges from the selection.
+		@throws DOMError
 	**/
-	function extend( node : Node, offset : Int ) : Void;
+	function removeAllRanges() : Void;
 	/** @throws DOMError */
+	function empty() : Void;
 	
 	/**
-		Adds all the children of the specified node to the selection.
+		Collapses the current selection to a single point.
+		@throws DOMError
 	**/
-	function selectAllChildren( node : Node ) : Void;
+	function collapse( node : Node, offset : Int = 0 ) : Void;
 	/** @throws DOMError */
+	function setPosition( node : Node, offset : Int = 0 ) : Void;
 	
 	/**
-		Deletes the selection's content from the document.
+		Collapses the selection to the start of the first range in the selection.
+		@throws DOMError
 	**/
-	function deleteFromDocument() : Void;
-	/** @throws DOMError */
+	function collapseToStart() : Void;
 	
 	/**
-		Returns a `Range` object representing one of the ranges currently selected.
+		Collapses the selection to the end of the last range in the selection.
+		@throws DOMError
 	**/
-	function getRangeAt( index : Int ) : Range;
-	/** @throws DOMError */
+	function collapseToEnd() : Void;
 	
 	/**
-		A `Range` object that will be added to the selection.
+		Moves the focus of the selection to a specified point.
+		@throws DOMError
 	**/
-	function addRange( range : Range ) : Void;
-	/** @throws DOMError */
+	function extend( node : Node, offset : Int = 0 ) : Void;
 	
 	/**
-		Removes a range from the selection.
+		Sets the selection to be a range including all or parts of two specified DOM nodes, and any content located between them.
+		@throws DOMError
 	**/
-	function removeRange( range : Range ) : Void;
-	/** @throws DOMError */
+	function setBaseAndExtent( anchorNode : Node, anchorOffset : Int, focusNode : Node, focusOffset : Int ) : Void;
 	
 	/**
-		Removes all ranges from the selection.
+		Adds all the children of the specified node to the selection.
+		@throws DOMError
 	**/
-	function removeAllRanges() : Void;
-	/** @throws DOMError */
+	function selectAllChildren( node : Node ) : Void;
+	
+	/**
+		Deletes the selection's content from the document.
+		@throws DOMError
+	**/
+	function deleteFromDocument() : Void;
 	
 	/**
 		Indicates if a certain node is part of the selection.
+		@throws DOMError
 	**/
-	function containsNode( node : Node, allowPartialContainment : Bool ) : Bool;
-	/** @throws DOMError */
+	function containsNode( node : Node, allowPartialContainment : Bool = false ) : Bool;
 	
 	/**
 		Changes the current selection.
+		@throws DOMError
 	**/
 	function modify( alter : String, direction : String, granularity : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/SelectionMode.hx b/std/js/html/SelectionMode.hx
index d1a0b2591bc578c72eba2004a20c8baa8c98090d..50d00148b1bc963635f4f5c84c05321514d0e221 100644
--- a/std/js/html/SelectionMode.hx
+++ b/std/js/html/SelectionMode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract SelectionMode(String)
-{
+enum abstract SelectionMode(String) {
 	var SELECT = "select";
 	var START = "start";
 	var END = "end";
diff --git a/std/js/html/ServiceWorker.hx b/std/js/html/ServiceWorker.hx
index b4d18a4c1429edd1d9cffa185b1d21dc4e4dcaeb..a2661d21330e30617d63e76ce137ef0c5b026463 100644
--- a/std/js/html/ServiceWorker.hx
+++ b/std/js/html/ServiceWorker.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorker>
 **/
 @:native("ServiceWorker")
-extern class ServiceWorker extends EventTarget
-{
+extern class ServiceWorker extends EventTarget {
 	
 	/**
 		Returns the `ServiceWorker` serialized script URL defined as part of `ServiceWorkerRegistration`. The URL must be on the same origin as the document that registers the `ServiceWorker`.
diff --git a/std/js/html/ServiceWorkerContainer.hx b/std/js/html/ServiceWorkerContainer.hx
new file mode 100644
index 0000000000000000000000000000000000000000..af1cdde5f4d99d860dd2ac9b0ca2e34fa8e56301
--- /dev/null
+++ b/std/js/html/ServiceWorkerContainer.hx
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ServiceWorkerContainer.webidl. Do not edit!
+
+package js.html;
+
+import js.lib.Promise;
+
+/**
+	The `ServiceWorkerContainer` interface of the ServiceWorker API provides an object representing the service worker as an overall unit in the network ecosystem, including facilities to register, unregister and update service workers, and access the state of service workers and their registrations.
+
+	Documentation [ServiceWorkerContainer](https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerContainer) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerContainer$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerContainer>
+**/
+@:native("ServiceWorkerContainer")
+extern class ServiceWorkerContainer extends EventTarget {
+
+	/**
+		Returns a `ServiceWorker` object if its state is `activated` (the same object returned by `ServiceWorkerRegistration.active`). This property returns `null` during a force-refresh request (Shift + refresh) or if there is no active worker.
+	**/
+	var controller(default,null) : ServiceWorker;
+
+	/**
+		Provides a way of delaying code execution until a service worker is active. It returns a `Promise` that will never reject, and which waits indefinitely until the `ServiceWorkerRegistration` associated with the current page has an `ServiceWorkerRegistration.active` worker. Once that condition is met, it resolves with the `ServiceWorkerRegistration`.
+	**/
+	var ready(default,null) : Promise<ServiceWorkerRegistration>;
+
+	/**
+		Fired whenever a `controllerchange` event occurs — when the document's associated `ServiceWorkerRegistration` acquires a new `ServiceWorkerRegistration.active` worker.
+	**/
+	var oncontrollerchange : haxe.Constraints.Function;
+
+	/**
+		Fired whenever an `error` event occurs in the associated service workers.
+	**/
+	var onerror : haxe.Constraints.Function;
+
+	/**
+		Fired whenever a `message` event occurs — when incoming messages are received to the `ServiceWorkerContainer` object (e.g. via a `MessagePort.postMessage()` call.)
+	**/
+	var onmessage : haxe.Constraints.Function;
+
+	function register( scriptURL : String, ?options : RegistrationOptions ) : Promise<ServiceWorkerRegistration>;
+
+	/**
+		Gets a `ServiceWorkerRegistration` object whose scope matches the provided document URL.  If the method can't return a `ServiceWorkerRegistration`, it returns a `Promise`. 
+	**/
+	function getRegistration( documentURL : String = "" ) : Promise<Dynamic>;
+
+	/**
+		Returns all `ServiceWorkerRegistration` objects associated with a `ServiceWorkerContainer` in an array.  If the method can't return `ServiceWorkerRegistration` objects, it returns a `Promise`. 
+	**/
+	function getRegistrations() : Promise<Array<ServiceWorkerRegistration>>;
+}
\ No newline at end of file
diff --git a/std/js/html/ServiceWorkerGlobalScope.hx b/std/js/html/ServiceWorkerGlobalScope.hx
index 6a05b4f65602c1aa08795e2301ea1ad87eef5f89..fcac80c841c30b1cacf8863b271bc8cc87e93433 100644
--- a/std/js/html/ServiceWorkerGlobalScope.hx
+++ b/std/js/html/ServiceWorkerGlobalScope.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `ServiceWorkerGlobalScope` interface of the ServiceWorker API represents the global execution context of a service worker.
 
@@ -32,58 +34,62 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerGlobalScope>
 **/
 @:native("ServiceWorkerGlobalScope")
-extern class ServiceWorkerGlobalScope extends WorkerGlobalScope
-{
-	
+extern class ServiceWorkerGlobalScope extends WorkerGlobalScope {
+
 	/**
 		Contains the `Clients` object associated with the service worker.
 	**/
 	var clients(default,null) : Clients;
-	
+
 	/**
 		Contains the `ServiceWorkerRegistration` object that represents the service worker's registration.
 	**/
 	var registration(default,null) : ServiceWorkerRegistration;
-	
+
 	/**
 		An event handler fired whenever an `install` event occurs — when a `ServiceWorkerRegistration` acquires a new `ServiceWorkerRegistration.installing` worker.
 	**/
 	var oninstall : haxe.Constraints.Function;
-	
+
 	/**
 		An event handler fired whenever an `activate` event occurs — when a `ServiceWorkerRegistration` acquires a new `ServiceWorkerRegistration.active` worker.
 	**/
 	var onactivate : haxe.Constraints.Function;
-	
+
 	/**
 		An event handler fired whenever a `fetch` event occurs — when a `GlobalFetch.fetch` is called.
 	**/
 	var onfetch : haxe.Constraints.Function;
-	
+
 	/**
 		An event handler fired whenever a `message` event occurs — when incoming messages are received. Controlled pages can use the `MessagePort.postMessage()` method to send messages to service workers. The service worker can optionally send a response back via the `MessagePort` exposed in `event.data.port`, corresponding to the controlled page.
 	**/
 	var onmessage : haxe.Constraints.Function;
-	
+
 	/**
 		An event handler fired whenever a `push` event occurs — when a server push notification is received.
 	**/
 	var onpush : haxe.Constraints.Function;
-	
+
 	/**
 		An event handler fired whenever a `pushsubscriptionchange` event occurs — when a push subscription has been invalidated, or is about to be invalidated (e.g. when a push service sets an expiration time.)
 	**/
 	var onpushsubscriptionchange : haxe.Constraints.Function;
-	
+
 	/**
 		An event handler fired whenever a `notificationclick` event occurs — when a user clicks on a displayed notification.
 	**/
 	var onnotificationclick : haxe.Constraints.Function;
-	
-	/** @throws DOMError */
-	
+
+	/**
+		An event handler fired whenever a `notificationclose` event occurs — when a user closes a displayed notification.
+	**/
+	var onnotificationclose : haxe.Constraints.Function;
+
+
 	/**
 		Allows the current service worker registration to progress from waiting to active state while service worker clients are using it.
+		@throws DOMError
 	**/
 	function skipWaiting() : Promise<Void>;
 }
\ No newline at end of file
diff --git a/std/js/html/ServiceWorkerRegistration.hx b/std/js/html/ServiceWorkerRegistration.hx
index 921343e3f61d27e696669795aad87bd51cddbd50..f431d128afd2968f89a5a0b2aa50dcd61f2339cc 100644
--- a/std/js/html/ServiceWorkerRegistration.hx
+++ b/std/js/html/ServiceWorkerRegistration.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `ServiceWorkerRegistration` interface of the ServiceWorker API represents the service worker registration. You register a service worker to control one or more pages that share the same origin.
 
@@ -32,44 +34,61 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration>
 **/
 @:native("ServiceWorkerRegistration")
-extern class ServiceWorkerRegistration extends EventTarget
-{
-	
+extern class ServiceWorkerRegistration extends EventTarget {
+
 	/**
 		Returns a service worker whose state is `installing`. This is initially set to `null`.
 	**/
 	var installing(default,null) : ServiceWorker;
-	
+
 	/**
-		Returns a service worker whose state is `installed`. This is initially set to `null`.
+		Returns a service worker whose state is `waiting`. This is initially set to `null`.
 	**/
 	var waiting(default,null) : ServiceWorker;
-	
+
 	/**
 		Returns a service worker whose state is either `activating` or `activated`. This is initially set to `null`. An active worker will control a `ServiceWorkerClient` if the client's URL falls within the scope of the registration (the `scope` option set when `ServiceWorkerContainer.register` is first called.)
 	**/
 	var active(default,null) : ServiceWorker;
-	
+
 	/**
 		Returns a unique identifier for a service worker registration. This must be on the same origin as the document that registers the `ServiceWorker`.
 	**/
 	var scope(default,null) : String;
-	
+	var updateViaCache(default,null) : ServiceWorkerUpdateViaCache;
+
 	/**
 		An `EventListener` property called whenever an event of type `updatefound` is fired; it is fired any time the `ServiceWorkerRegistration.installing` property acquires a new service worker.
 	**/
 	var onupdatefound : haxe.Constraints.Function;
-	
-	/** @throws DOMError */
-	
+
+	/**
+		Returns a reference to the `PushManager` interface for managing push subscriptions including subscribing, getting an active subscription, and accessing push permission status.
+	**/
+	var pushManager(default,null) : js.html.push.PushManager;
+
+
 	/**
 		Checks the server for an updated version of the service worker without consulting caches.
+		@throws DOMError
 	**/
 	function update() : Promise<Void>;
-	/** @throws DOMError */
-	
+
 	/**
-		Unregisters the service worker registration and returns a promise (see `Promise`). The service worker will finish any ongoing operations before it is unregistered.
+		Unregisters the service worker registration and returns a `Promise`. The service worker will finish any ongoing operations before it is unregistered.
+		@throws DOMError
 	**/
 	function unregister() : Promise<Bool>;
+
+	/**
+		Displays the notification with the requested title.
+		@throws DOMError
+	**/
+	function showNotification( title : String, ?options : NotificationOptions ) : Promise<Void>;
+
+	/**
+		Returns a `Promise` that resolves to an array of `Notification` objects.
+		@throws DOMError
+	**/
+	function getNotifications( ?filter : GetNotificationOptions ) : Promise<Array<Notification>>;
 }
\ No newline at end of file
diff --git a/std/js/html/ServiceWorkerState.hx b/std/js/html/ServiceWorkerState.hx
index 29c7469da464cc126389584b16012bce4e4180e9..38c9bcbf913b8789db4010e47a886fc5945c6093 100644
--- a/std/js/html/ServiceWorkerState.hx
+++ b/std/js/html/ServiceWorkerState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,8 +31,8 @@ package js.html;
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerState>
 **/
-@:enum abstract ServiceWorkerState(String)
-{
+enum abstract ServiceWorkerState(String) {
+	var PARSED = "parsed";
 	var INSTALLING = "installing";
 	var INSTALLED = "installed";
 	var ACTIVATING = "activating";
diff --git a/std/js/html/ServiceWorkerUpdateViaCache.hx b/std/js/html/ServiceWorkerUpdateViaCache.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2ebb5188e62bdaf1722da534b72176feba1fd23d
--- /dev/null
+++ b/std/js/html/ServiceWorkerUpdateViaCache.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ServiceWorkerRegistration.webidl. Do not edit!
+
+package js.html;
+
+enum abstract ServiceWorkerUpdateViaCache(String) {
+	var IMPORTS = "imports";
+	var ALL = "all";
+	var NONE = "none";
+}
\ No newline at end of file
diff --git a/std/js/html/ShadowRoot.hx b/std/js/html/ShadowRoot.hx
index 8e42ae61c53f7486615517c72da3fa5687daed0a..18766f891d29c07eeb4a89204171e9b1392825ed 100644
--- a/std/js/html/ShadowRoot.hx
+++ b/std/js/html/ShadowRoot.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,23 +32,31 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ShadowRoot>
 **/
 @:native("ShadowRoot")
-extern class ShadowRoot extends DocumentFragment
-{
+extern class ShadowRoot extends DocumentFragment {
 	
 	/**
-		The DOM tree inside the `ShadowRoot`.
+		The mode of the `ShadowRoot` — either `open` or `closed`. This defines whether or not the shadow root's internal features are accessible from JavaScript.
 	**/
-	var innerHTML : String;
+	var mode(default,null) : ShadowRootMode;
 	
 	/**
-		A DOM element to which the `ShadowRoot` is attatched.
+		Returns a reference to the DOM element the `ShadowRoot` is attached to.
 	**/
 	var host(default,null) : Element;
-	var olderShadowRoot(default,null) : ShadowRoot;
-	var applyAuthorStyles : Bool;
+	
+	/**
+		Sets or returns a reference to the DOM tree inside the `ShadowRoot`.
+	**/
+	var innerHTML : String;
+	var activeElement(default,null) : Element;
 	var styleSheets(default,null) : StyleSheetList;
+	var pointerLockElement(default,null) : Element;
+	var fullscreenElement(default,null) : Element;
 	
+	function getElementById( elementId : String ) : Element;
 	function getElementsByTagName( localName : String ) : HTMLCollection;
-	function getElementsByTagNameNS( namespace_ : String, localName : String ) : HTMLCollection;
+	function getElementsByTagNameNS( namespace : String, localName : String ) : HTMLCollection;
 	function getElementsByClassName( classNames : String ) : HTMLCollection;
+	function elementFromPoint( x : Float, y : Float ) : Element;
+	function elementsFromPoint( x : Float, y : Float ) : Array<Element>;
 }
\ No newline at end of file
diff --git a/std/js/html/ShadowRootInit.hx b/std/js/html/ShadowRootInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..54476b9eaea719b3c5178cc110cc0e6f9a2cae32
--- /dev/null
+++ b/std/js/html/ShadowRootInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Element.webidl. Do not edit!
+
+package js.html;
+
+typedef ShadowRootInit = {
+	var mode : ShadowRootMode;
+}
\ No newline at end of file
diff --git a/std/js/html/ShadowRootMode.hx b/std/js/html/ShadowRootMode.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b8022fe100c091e2e7c574b14080b8e0727d9f10
--- /dev/null
+++ b/std/js/html/ShadowRootMode.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ShadowRoot.webidl. Do not edit!
+
+package js.html;
+
+enum abstract ShadowRootMode(String) {
+	var OPEN = "open";
+	var CLOSED = "closed";
+}
\ No newline at end of file
diff --git a/std/js/html/SharedWorker.hx b/std/js/html/SharedWorker.hx
index 77c92404fa0907706e06db75b01dee01d3ec7c67..84ddcc3a7c44d0669f3b633a728cfead93af554e 100644
--- a/std/js/html/SharedWorker.hx
+++ b/std/js/html/SharedWorker.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SharedWorker>
 **/
 @:native("SharedWorker")
-extern class SharedWorker extends EventTarget
-{
+extern class SharedWorker extends EventTarget {
 	
 	/**
 		Returns a `MessagePort` object used to communicate and control the shared worker.
@@ -42,5 +41,6 @@ extern class SharedWorker extends EventTarget
 	var onerror : haxe.Constraints.Function;
 	
 	/** @throws DOMError */
-	function new( scriptURL : String, ?name : String ) : Void;
+	@:overload( function( scriptURL : String, ?options : WorkerOptions) : SharedWorker {} )
+	function new( scriptURL : String, ?options : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/SharedWorkerGlobalScope.hx b/std/js/html/SharedWorkerGlobalScope.hx
index fab9857a9f8fdadb8187d63480d42b6ca5739115..8f4551ef210cdca37da17bc244b81e0f40911992 100644
--- a/std/js/html/SharedWorkerGlobalScope.hx
+++ b/std/js/html/SharedWorkerGlobalScope.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,10 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SharedWorkerGlobalScope>
 **/
 @:native("SharedWorkerGlobalScope")
-extern class SharedWorkerGlobalScope extends WorkerGlobalScope
-{
+extern class SharedWorkerGlobalScope extends WorkerGlobalScope {
 	
 	/**
-		The name that the `SharedWorker` was (optionally) given when it was created. This is the name that the `SharedWorker.SharedWorker` constructor can pass to get a reference to the `SharedWorkerGlobalScope`.
+		The name that the `SharedWorker` was (optionally) given when it was created using the `SharedWorker.SharedWorker` constructor. This is mainly useful for debugging purposes.
 	**/
 	var name(default,null) : String;
 	
@@ -45,4 +44,9 @@ extern class SharedWorkerGlobalScope extends WorkerGlobalScope
 	**/
 	var onconnect : haxe.Constraints.Function;
 	
+	
+	/**
+		Discards any tasks queued in the `SharedWorkerGlobalScope`'s event loop, effectively closing this particular scope.
+	**/
+	function close() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/SimpleGestureEvent.hx b/std/js/html/SimpleGestureEvent.hx
deleted file mode 100644
index 84ee6eb5e0dbcd63e865ca6c45f361149b459832..0000000000000000000000000000000000000000
--- a/std/js/html/SimpleGestureEvent.hx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-// This file is generated from mozilla\SimpleGestureEvent.webidl. Do not edit!
-
-package js.html;
-
-@:native("SimpleGestureEvent")
-extern class SimpleGestureEvent extends MouseEvent
-{
-	static inline var DIRECTION_UP : Int = 1;
-	static inline var DIRECTION_DOWN : Int = 2;
-	static inline var DIRECTION_LEFT : Int = 4;
-	static inline var DIRECTION_RIGHT : Int = 8;
-	static inline var ROTATION_COUNTERCLOCKWISE : Int = 1;
-	static inline var ROTATION_CLOCKWISE : Int = 2;
-	
-	var allowedDirections : Int;
-	var direction(default,null) : Int;
-	var delta(default,null) : Float;
-	var clickCount(default,null) : Int;
-	
-	function initSimpleGestureEvent( typeArg : String, canBubbleArg : Bool, cancelableArg : Bool, viewArg : Window, detailArg : Int, screenXArg : Int, screenYArg : Int, clientXArg : Int, clientYArg : Int, ctrlKeyArg : Bool, altKeyArg : Bool, shiftKeyArg : Bool, metaKeyArg : Bool, buttonArg : Int, relatedTargetArg : EventTarget, allowedDirectionsArg : Int, directionArg : Int, deltaArg : Float, clickCount : Int ) : Void;
-}
\ No newline at end of file
diff --git a/std/js/html/SlotElement.hx b/std/js/html/SlotElement.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e3b99f5a84561cb7f0c06eb009832bc071d6dacb
--- /dev/null
+++ b/std/js/html/SlotElement.hx
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\HTMLSlotElement.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `HTMLSlotElement` interface of the Shadow DOM API enables access to the name and assigned nodes of an HTML `slot` element.
+
+	Documentation [HTMLSlotElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLSlotElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLSlotElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLSlotElement>
+**/
+@:native("HTMLSlotElement")
+extern class SlotElement extends Element {
+	
+	/**
+		`DOMString`: Can be used to get and set the slot's name.
+	**/
+	var name : String;
+	
+	
+	/**
+		Returns the sequence of elements assigned to this slot, or alternatively the slot's fallback content.
+	**/
+	function assignedNodes( ?options : AssignedNodesOptions ) : Array<Node>;
+}
\ No newline at end of file
diff --git a/std/js/html/SourceBuffer.hx b/std/js/html/SourceBuffer.hx
index 5e0cafb49b7c7923ad0575d0c13c09b051633cc3..49c4bb6b0117fa701cbb8edec3491555bd80fcf2 100644
--- a/std/js/html/SourceBuffer.hx
+++ b/std/js/html/SourceBuffer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `SourceBuffer` interface represents a chunk of media to be passed into an `HTMLMediaElement` and played, via a `MediaSource` object. This can be made up of one or several media segments.
+	The `SourceBuffer` interface represents a chunk of media to be passed into an `HTMLMediaElement` and played, via a `MediaSource` object. This can be made up of one or several media segments.
 
 	Documentation [SourceBuffer](https://developer.mozilla.org/en-US/docs/Web/API/SourceBuffer) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SourceBuffer$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SourceBuffer>
 **/
 @:native("SourceBuffer")
-extern class SourceBuffer extends EventTarget
-{
+extern class SourceBuffer extends EventTarget {
 	
 	/**
 		Controls how the order of media segments in the `SourceBuffer` is handled, in terms of whether they can be appended in any order, or they have to be kept in a strict sequence.
@@ -41,7 +40,7 @@ extern class SourceBuffer extends EventTarget
 	var mode : SourceBufferAppendMode;
 	
 	/**
-		Indicates whether the `SourceBuffer` is currently being updated — i.e. whether an `SourceBuffer.appendBuffer()`, `SourceBuffer.appendStream()`, or `SourceBuffer.remove()` operation is currently in progress.
+		A boolean indicating whether the `SourceBuffer` is currently being updated — i.e. whether an `SourceBuffer.appendBuffer()`, `SourceBuffer.appendStream()`, or `SourceBuffer.remove()` operation is currently in progress.
 	**/
 	var updating(default,null) : Bool;
 	
@@ -56,7 +55,7 @@ extern class SourceBuffer extends EventTarget
 	var timestampOffset : Float;
 	
 	/**
-		Controls the timestamp for the start of the append window. This is a timestamp range that can be used to filter what media data is appended to the `SourceBuffer`. Coded media frames with timestamps wthin this range will be appended, whereas those outside the range will be filtered out.
+		Controls the timestamp for the start of the append window. This is a timestamp range that can be used to filter what media data is appended to the `SourceBuffer`. Coded media frames with timestamps within this range will be appended, whereas those outside the range will be filtered out.
 	**/
 	var appendWindowStart : Float;
 	
@@ -65,23 +64,54 @@ extern class SourceBuffer extends EventTarget
 	**/
 	var appendWindowEnd : Float;
 	
-	/** @throws DOMError */
-	@:overload( function( data : ArrayBuffer ) : Void {} )
+	/**
+		Fired whenever the value of `SourceBuffer.updating` transitions from `false` to `true`.
+	**/
+	var onupdatestart : haxe.Constraints.Function;
+	
+	/**
+		Fired whenever `SourceBuffer.appendBuffer()` method or the `SourceBuffer.remove()` completes. `SourceBuffer.updating` changes from `true` to `false`. This event is fired before `onupdateend`.
+	**/
+	var onupdate : haxe.Constraints.Function;
+	
+	/**
+		Fired whenever `SourceBuffer.appendBuffer()` method or the `SourceBuffer.remove()` has ended. This event is fired after `onupdate`.
+	**/
+	var onupdateend : haxe.Constraints.Function;
+	
+	/**
+		Fired whenever an error occurs during `SourceBuffer.appendBuffer()` or `SourceBuffer.appendStream()`. `SourceBuffer.updating` changes from `true` to `false`.
+	**/
+	var onerror : haxe.Constraints.Function;
+	
+	/**
+		Fired whenever `SourceBuffer.appendBuffer()` or `SourceBuffer.appendStream()` is ended by a call to `SourceBuffer.abort()`. `SourceBuffer.updating` changes from `true` to `false`.
+	**/
+	var onabort : haxe.Constraints.Function;
+	
 	
 	/**
 		Appends media segment data from an `ArrayBuffer` or `ArrayBufferView` object to the `SourceBuffer`.
+		@throws DOMError
 	**/
-	function appendBuffer( data : ArrayBufferView ) : Void;
-	/** @throws DOMError */
+	@:overload( function( data : js.lib.ArrayBuffer ) : Void {} )
+	function appendBuffer( data : js.lib.ArrayBufferView ) : Void;
 	
 	/**
 		Aborts the current segment and resets the segment parser.
+		@throws DOMError
 	**/
 	function abort() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Removes media segments within a specific time range from the `SourceBuffer`.
+		@throws DOMError
 	**/
 	function remove( start : Float, end : Float ) : Void;
+	
+	/**
+		Changes the `MIME type` that future calls to `SourceBuffer.appendBuffer` will expect the new data to conform to.
+		@throws DOMError
+	**/
+	function changeType( type : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/SourceBufferAppendMode.hx b/std/js/html/SourceBufferAppendMode.hx
index b592a0d2d75e1114c1a668b711e65ef03a566993..f132b12b22e8bd9b321654881d5d114ccebf0507 100644
--- a/std/js/html/SourceBufferAppendMode.hx
+++ b/std/js/html/SourceBufferAppendMode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract SourceBufferAppendMode(String)
-{
+enum abstract SourceBufferAppendMode(String) {
 	var SEGMENTS = "segments";
 	var SEQUENCE = "sequence";
 }
\ No newline at end of file
diff --git a/std/js/html/SourceBufferList.hx b/std/js/html/SourceBufferList.hx
index fe441b4700677bbf197f676a2fbe408f389b371b..08f9b9b542f97c8042b6ad3c66c8955f3037243a 100644
--- a/std/js/html/SourceBufferList.hx
+++ b/std/js/html/SourceBufferList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,12 +32,21 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SourceBufferList>
 **/
 @:native("SourceBufferList")
-extern class SourceBufferList extends EventTarget implements ArrayAccess<SourceBuffer>
-{
+extern class SourceBufferList extends EventTarget implements ArrayAccess<SourceBuffer> {
 	
 	/**
 		Returns the number of `SourceBuffer` objects in the list.
 	**/
 	var length(default,null) : Int;
 	
+	/**
+		The event handler for the `addsourcebuffer` event.
+	**/
+	var onaddsourcebuffer : haxe.Constraints.Function;
+	
+	/**
+		The event handler for the `removesourcebuffer` event.
+	**/
+	var onremovesourcebuffer : haxe.Constraints.Function;
+	
 }
\ No newline at end of file
diff --git a/std/js/html/SourceElement.hx b/std/js/html/SourceElement.hx
index 3d34656df783f987ad05211ebaf610ed52366b36..80fcaca1deff2d7f5bcb158b05eb884f48fda361 100644
--- a/std/js/html/SourceElement.hx
+++ b/std/js/html/SourceElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,12 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLSourceElement>
 **/
 @:native("HTMLSourceElement")
-extern class SourceElement extends Element
-{
+extern class SourceElement extends Element {
 	
 	/**
-		Is a `DOMString` reflecting the `src` HTML attribute, containing the URL for the media resource. The `HTMLSourceElement.src` property has a meaning only when the associated `source` element is nested in a media element that is a `video` or an `audio` element. It has no meaning and is ignored when it is nested in a `picture` element.
+		Is a `DOMString` reflecting the `src` HTML attribute, containing the URL for the media resource. The `HTMLSourceElement.src` property has a meaning only when the associated `source` element is nested in a media element that is a `video` or an `audio` element. It has no meaning and is ignored when it is nested in a `picture` element. 
+		 Note: If the `src` property is updated (along with any siblings), the parent `HTMLMediaElement`'s `load` method should be called when done, since `source` elements are not re-scanned automatically.
+		 
 	**/
 	var src : String;
 	
diff --git a/std/js/html/SpanElement.hx b/std/js/html/SpanElement.hx
index 943039f24785b4f6ca926770917961889875a9b5..6d402ab6c272909c3a3079b6af754e95de0d98ca 100644
--- a/std/js/html/SpanElement.hx
+++ b/std/js/html/SpanElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLSpanElement>
 **/
 @:native("HTMLSpanElement")
-extern class SpanElement extends Element
-{
+extern class SpanElement extends Element {
 }
\ No newline at end of file
diff --git a/std/js/html/SpeechGrammar.hx b/std/js/html/SpeechGrammar.hx
index fe445aa02b1f8a36a41c039456a535e1e8975af2..81cc5085d9978b9834e6b278685639f1188ad9db 100644
--- a/std/js/html/SpeechGrammar.hx
+++ b/std/js/html/SpeechGrammar.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechGrammar>
 **/
 @:native("SpeechGrammar")
-extern class SpeechGrammar
-{
+extern class SpeechGrammar {
 	
 	/**
 		Sets and returns a string containing the grammar from within in the `SpeechGrammar` object instance.
diff --git a/std/js/html/SpeechGrammarList.hx b/std/js/html/SpeechGrammarList.hx
index 11518754e30451c98df14fb4b8ef452d6b617bf8..d1bd7e87a7b88ae8ee3c1fcc80a699a710b65527 100644
--- a/std/js/html/SpeechGrammarList.hx
+++ b/std/js/html/SpeechGrammarList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechGrammarList>
 **/
 @:native("SpeechGrammarList")
-extern class SpeechGrammarList implements ArrayAccess<SpeechGrammar>
-{
+extern class SpeechGrammarList implements ArrayAccess<SpeechGrammar> {
 	
 	/**
 		Returns the number of `SpeechGrammar` objects contained in the `SpeechGrammarList`.
@@ -42,22 +41,22 @@ extern class SpeechGrammarList implements ArrayAccess<SpeechGrammar>
 	
 	/** @throws DOMError */
 	function new() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Standard getter — allows individual `SpeechGrammar` objects to be retrieved from the `SpeechGrammarList` using array syntax.
+		@throws DOMError
 	**/
 	function item( index : Int ) : SpeechGrammar;
-	/** @throws DOMError */
 	
 	/**
 		Takes a grammar present at a specific URI and adds it to the `SpeechGrammarList` as a new `SpeechGrammar` object.
+		@throws DOMError
 	**/
 	function addFromURI( src : String, ?weight : Float ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Takes a grammar present in a specific `DOMString` within the code base (e.g. stored in a variable) and adds it to the `SpeechGrammarList` as a new `SpeechGrammar` object.
+		@throws DOMError
 	**/
 	function addFromString( string : String, ?weight : Float ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/SpeechRecognition.hx b/std/js/html/SpeechRecognition.hx
index 5c117b1d1a12ecbe4deead2f25d5b7f37dfcb4c7..7be526966665ab4175ccfe55b5a2282b18db52be 100644
--- a/std/js/html/SpeechRecognition.hx
+++ b/std/js/html/SpeechRecognition.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechRecognition>
 **/
 @:native("SpeechRecognition")
-extern class SpeechRecognition extends EventTarget
-{
+extern class SpeechRecognition extends EventTarget {
 	
 	/**
 		Returns and sets a collection of `SpeechGrammar` objects that represent the grammars that will be understood by the current `SpeechRecognition`.
@@ -122,10 +121,10 @@ extern class SpeechRecognition extends EventTarget
 	
 	/** @throws DOMError */
 	function new() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Starts the speech recognition service listening to incoming audio with intent to recognize grammars associated with the current `SpeechRecognition`.
+		@throws DOMError
 	**/
 	function start( ?stream : MediaStream ) : Void;
 	
diff --git a/std/js/html/SpeechRecognitionAlternative.hx b/std/js/html/SpeechRecognitionAlternative.hx
index 9bb83f5b0a5c87cf70911056502a0c0676b11483..4f632b17dca0392bec63ed0ccbc913d0bdad5723 100644
--- a/std/js/html/SpeechRecognitionAlternative.hx
+++ b/std/js/html/SpeechRecognitionAlternative.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechRecognitionAlternative>
 **/
 @:native("SpeechRecognitionAlternative")
-extern class SpeechRecognitionAlternative
-{
+extern class SpeechRecognitionAlternative {
 	
 	/**
 		Returns a string containing the transcript of the recognised word.
diff --git a/std/js/html/SpeechRecognitionError.hx b/std/js/html/SpeechRecognitionError.hx
index 073dd5173c12ad9b011d5261174081cdea4faf6e..1bedaa20f181548c8aa64661f93fb65d75fb0a1c 100644
--- a/std/js/html/SpeechRecognitionError.hx
+++ b/std/js/html/SpeechRecognitionError.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechRecognitionError>
 **/
 @:native("SpeechRecognitionError")
-extern class SpeechRecognitionError extends Event
-{
+extern class SpeechRecognitionError extends Event {
 	
 	/**
 		Returns the type of error raised.
diff --git a/std/js/html/SpeechRecognitionErrorCode.hx b/std/js/html/SpeechRecognitionErrorCode.hx
index 23a9ed8b1f7843a4564316034ddd81e1353abc62..bf3a504728b10e983c8bf982a2a2b823b91d5873 100644
--- a/std/js/html/SpeechRecognitionErrorCode.hx
+++ b/std/js/html/SpeechRecognitionErrorCode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract SpeechRecognitionErrorCode(String)
-{
+enum abstract SpeechRecognitionErrorCode(String) {
 	var NO_SPEECH = "no-speech";
 	var ABORTED = "aborted";
 	var AUDIO_CAPTURE = "audio-capture";
diff --git a/std/js/html/SpeechRecognitionErrorInit.hx b/std/js/html/SpeechRecognitionErrorInit.hx
index a4a7690ee0abed1dbd109c131bbdd9232ae42dc7..50c1ed3243508a6140245bf58288210bc0a00053 100644
--- a/std/js/html/SpeechRecognitionErrorInit.hx
+++ b/std/js/html/SpeechRecognitionErrorInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-typedef SpeechRecognitionErrorInit =
-{
-	> EventInit,
-	@:optional var error : SpeechRecognitionErrorCode;
-	@:optional var message : String;
+typedef SpeechRecognitionErrorInit = EventInit & {
+	var ?error : SpeechRecognitionErrorCode;
+	var ?message : String;
 }
\ No newline at end of file
diff --git a/std/js/html/SpeechRecognitionEvent.hx b/std/js/html/SpeechRecognitionEvent.hx
index 7ccb126dabb99ac19012bb3e157bfedc3d941aba..69fb923dc748da0e8b2929405936323fa2625b12 100644
--- a/std/js/html/SpeechRecognitionEvent.hx
+++ b/std/js/html/SpeechRecognitionEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechRecognitionEvent>
 **/
 @:native("SpeechRecognitionEvent")
-extern class SpeechRecognitionEvent extends Event
-{
+extern class SpeechRecognitionEvent extends Event {
 	
 	/**
 		Returns the lowest index value result in the `SpeechRecognitionResultList` "array" that has actually changed.
diff --git a/std/js/html/SpeechRecognitionEventInit.hx b/std/js/html/SpeechRecognitionEventInit.hx
index 687729fb2e27f049b54320e2987ef846b5f86686..4154a7fc812460f81660fa1e84409df2f0f66c33 100644
--- a/std/js/html/SpeechRecognitionEventInit.hx
+++ b/std/js/html/SpeechRecognitionEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,9 @@
 
 package js.html;
 
-typedef SpeechRecognitionEventInit =
-{
-	> EventInit,
-	@:optional var emma : HTMLDocument;
-	@:optional var interpretation : Dynamic;
-	@:optional var resultIndex : Int;
-	@:optional var results : SpeechRecognitionResultList;
+typedef SpeechRecognitionEventInit = EventInit & {
+	var ?emma : HTMLDocument;
+	var ?interpretation : Dynamic;
+	var ?resultIndex : Int;
+	var ?results : SpeechRecognitionResultList;
 }
\ No newline at end of file
diff --git a/std/js/html/SpeechRecognitionResult.hx b/std/js/html/SpeechRecognitionResult.hx
index 61420e4fbf5504ca6b6a962c144fee2b42526612..a6f2e5b44efc4b0efc3e439c2fd1a00f80931c30 100644
--- a/std/js/html/SpeechRecognitionResult.hx
+++ b/std/js/html/SpeechRecognitionResult.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechRecognitionResult>
 **/
 @:native("SpeechRecognitionResult")
-extern class SpeechRecognitionResult implements ArrayAccess<SpeechRecognitionAlternative>
-{
+extern class SpeechRecognitionResult implements ArrayAccess<SpeechRecognitionAlternative> {
 	
 	/**
 		Returns the length of the "array" — the number of `SpeechRecognitionAlternative` objects contained in the result (also referred to as "n-best alternatives".)
diff --git a/std/js/html/SpeechRecognitionResultList.hx b/std/js/html/SpeechRecognitionResultList.hx
index 99c8732ea8a0bd93751778140b8b8d824c113d56..2c15033667b2322ee79ed11d86670a7ebcae1fcc 100644
--- a/std/js/html/SpeechRecognitionResultList.hx
+++ b/std/js/html/SpeechRecognitionResultList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechRecognitionResultList>
 **/
 @:native("SpeechRecognitionResultList")
-extern class SpeechRecognitionResultList implements ArrayAccess<SpeechRecognitionResult>
-{
+extern class SpeechRecognitionResultList implements ArrayAccess<SpeechRecognitionResult> {
 	
 	/**
 		Returns the length of the "array" — the number of `SpeechRecognitionResult` objects in the list.
diff --git a/std/js/html/SpeechSynthesis.hx b/std/js/html/SpeechSynthesis.hx
index bed2b1ccc361bfaeb5d8bddebc1cd0991e66ec02..776bed357b36158b55367b2dac0cb7871ef7f6df 100644
--- a/std/js/html/SpeechSynthesis.hx
+++ b/std/js/html/SpeechSynthesis.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechSynthesis>
 **/
 @:native("SpeechSynthesis")
-extern class SpeechSynthesis
-{
+extern class SpeechSynthesis extends EventTarget {
 	
 	/**
 		A `Boolean` that returns `true` if the utterance queue contains as-yet-unspoken utterances.
@@ -50,6 +49,11 @@ extern class SpeechSynthesis
 	**/
 	var paused(default,null) : Bool;
 	
+	/**
+		Fired when the list of `SpeechSynthesisVoice` objects that would be returned by the `SpeechSynthesis.getVoices()` method has changed.
+	**/
+	var onvoiceschanged : haxe.Constraints.Function;
+	
 	
 	/**
 		Adds an `SpeechSynthesisUtterance` to the utterance queue; it will be spoken when any other utterances queued before it have been spoken.
diff --git a/std/js/html/SpeechSynthesisErrorCode.hx b/std/js/html/SpeechSynthesisErrorCode.hx
index 43f0500495771c8deaab5c297354431556a6c803..8cf262c52f68277d17e02b299d6278fe60706bb4 100644
--- a/std/js/html/SpeechSynthesisErrorCode.hx
+++ b/std/js/html/SpeechSynthesisErrorCode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract SpeechSynthesisErrorCode(String)
-{
+enum abstract SpeechSynthesisErrorCode(String) {
 	var CANCELED = "canceled";
 	var INTERRUPTED = "interrupted";
 	var AUDIO_BUSY = "audio-busy";
diff --git a/std/js/html/SpeechSynthesisErrorEvent.hx b/std/js/html/SpeechSynthesisErrorEvent.hx
index 61bb98a0a4cb6d3c92d35e6d2adbbaf12c9c8d75..5e07b64a344477d86f80af711f648903b5852080 100644
--- a/std/js/html/SpeechSynthesisErrorEvent.hx
+++ b/std/js/html/SpeechSynthesisErrorEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechSynthesisErrorEvent>
 **/
 @:native("SpeechSynthesisErrorEvent")
-extern class SpeechSynthesisErrorEvent extends SpeechSynthesisEvent
-{
+extern class SpeechSynthesisErrorEvent extends SpeechSynthesisEvent {
 	
 	/**
 		Returns an error code indicating what has gone wrong with a speech synthesis attempt.
diff --git a/std/js/html/SpeechSynthesisErrorEventInit.hx b/std/js/html/SpeechSynthesisErrorEventInit.hx
index abd5eda3a5e23e332bac32180766da756def5c89..87d9ab0412dd8711fb642406f781a8f4dc7ff10e 100644
--- a/std/js/html/SpeechSynthesisErrorEventInit.hx
+++ b/std/js/html/SpeechSynthesisErrorEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
 
 package js.html;
 
-typedef SpeechSynthesisErrorEventInit =
-{
-	> SpeechSynthesisEventInit,
+typedef SpeechSynthesisErrorEventInit = SpeechSynthesisEventInit & {
 	var error : SpeechSynthesisErrorCode;
 }
\ No newline at end of file
diff --git a/std/js/html/SpeechSynthesisEvent.hx b/std/js/html/SpeechSynthesisEvent.hx
index 735277eb9f9200a374e42bcc8759b20962b2b9fc..c88425f6340e5d1d47624ff97bd0105d3826fecc 100644
--- a/std/js/html/SpeechSynthesisEvent.hx
+++ b/std/js/html/SpeechSynthesisEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechSynthesisEvent>
 **/
 @:native("SpeechSynthesisEvent")
-extern class SpeechSynthesisEvent extends Event
-{
+extern class SpeechSynthesisEvent extends Event {
 	
 	/**
 		Returns the `SpeechSynthesisUtterance` instance that the event was triggered on.
@@ -44,6 +43,7 @@ extern class SpeechSynthesisEvent extends Event
 		Returns the index position of the character in the `SpeechSynthesisUtterance.text` that was being spoken when the event was triggered.
 	**/
 	var charIndex(default,null) : Int;
+	var charLength(default,null) : Int;
 	
 	/**
 		Returns the elapsed time in milliseconds after the `SpeechSynthesisUtterance.text` started being spoken that the event was triggered at.
@@ -51,7 +51,7 @@ extern class SpeechSynthesisEvent extends Event
 	var elapsedTime(default,null) : Float;
 	
 	/**
-		Returns the name associated with certain types of events occurring as the `SpeechSynthesisUtterance.text` is being spoken: the name of the SSML marker reached in the case of a `mark` event, or the type of boundary reached in the case of a `boundary` event.
+		Returns the name associated with certain types of events occuring as the `SpeechSynthesisUtterance.text` is being spoken: the name of the SSML marker reached in the case of a `mark` event, or the type of boundary reached in the case of a `boundary` event.
 	**/
 	var name(default,null) : String;
 	
diff --git a/std/js/html/SpeechSynthesisEventInit.hx b/std/js/html/SpeechSynthesisEventInit.hx
index b816d7e9466f63e25caad2c44f84cb28c340f0af..9c8614d75c76677d5256882b72928811ef7a5303 100644
--- a/std/js/html/SpeechSynthesisEventInit.hx
+++ b/std/js/html/SpeechSynthesisEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,10 @@
 
 package js.html;
 
-typedef SpeechSynthesisEventInit =
-{
-	> EventInit,
-	@:optional var charIndex : Int;
-	@:optional var elapsedTime : Float;
-	@:optional var name : String;
+typedef SpeechSynthesisEventInit = EventInit & {
+	var ?charIndex : Int;
+	var ?charLength : Int;
+	var ?elapsedTime : Float;
+	var ?name : String;
 	var utterance : SpeechSynthesisUtterance;
 }
\ No newline at end of file
diff --git a/std/js/html/SpeechSynthesisUtterance.hx b/std/js/html/SpeechSynthesisUtterance.hx
index 2b52844875a5eff41c61b1ea5ea8cfc42a64c82c..5e6117ed30b2777434d5a1cb7f4637d1f4a81335 100644
--- a/std/js/html/SpeechSynthesisUtterance.hx
+++ b/std/js/html/SpeechSynthesisUtterance.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechSynthesisUtterance>
 **/
 @:native("SpeechSynthesisUtterance")
-extern class SpeechSynthesisUtterance extends EventTarget
-{
+extern class SpeechSynthesisUtterance extends EventTarget {
 	
 	/**
 		Gets and sets the text that will be synthesised when the utterance is spoken.
diff --git a/std/js/html/SpeechSynthesisVoice.hx b/std/js/html/SpeechSynthesisVoice.hx
index 4ab3a938c44818d46bee26e210540c98c6a428a8..f718f47bc900759c7de45c5da7671f2ba8f02ec7 100644
--- a/std/js/html/SpeechSynthesisVoice.hx
+++ b/std/js/html/SpeechSynthesisVoice.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SpeechSynthesisVoice>
 **/
 @:native("SpeechSynthesisVoice")
-extern class SpeechSynthesisVoice
-{
+extern class SpeechSynthesisVoice {
 	
 	/**
 		Returns the type of URI and location of the speech synthesis service for this voice.
@@ -54,6 +53,10 @@ extern class SpeechSynthesisVoice
 		A `Boolean` indicating whether the voice is supplied by a local speech synthesizer service (`true`), or a remote speech synthesizer service (`false`.)
 	**/
 	var localService(default,null) : Bool;
+	
+	/**
+		A `Boolean` indicating whether the voice is the default voice for the current app language (`true`), or not (`false`.)
+	**/
 	@:native("default")
 	var default_(default,null) : Bool;
 	
diff --git a/std/js/html/Storage.hx b/std/js/html/Storage.hx
index 2aae03849694e2b8b2cf064d9b395f5d4036e3c4..b18a4ba4be8a99ad76c8b5195765d59523799b7f 100644
--- a/std/js/html/Storage.hx
+++ b/std/js/html/Storage.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,49 +25,48 @@
 package js.html;
 
 /**
-	The `Storage` interface of the Web Storage API provides access to the session storage or local storage for a particular domain, allowing you to for example add, modify or delete stored data items.
+	The `Storage` interface of the Web Storage API provides access to a particular domain's session or local storage. It allows, for example, the addition, modification, or deletion of stored data items.
 
 	Documentation [Storage](https://developer.mozilla.org/en-US/docs/Web/API/Storage) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Storage$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Storage>
 **/
 @:native("Storage")
-extern class Storage
-{
+extern class Storage {
 	
 	/**
 		Returns an integer representing the number of data items stored in the `Storage` object.
 	**/
 	var length(default,null) : Int;
 	
-	/** @throws DOMError */
 	
 	/**
 		When passed a number n, this method will return the name of the nth key in the storage.
+		@throws DOMError
 	**/
 	function key( index : Int ) : String;
-	/** @throws DOMError */
 	
 	/**
 		When passed a key name, will return that key's value.
+		@throws DOMError
 	**/
 	function getItem( key : String ) : String;
-	/** @throws DOMError */
 	
 	/**
 		When passed a key name and value, will add that key to the storage, or update that key's value if it already exists.
+		@throws DOMError
 	**/
 	function setItem( key : String, value : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		When passed a key name, will remove that key from the storage.
+		@throws DOMError
 	**/
 	function removeItem( key : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		When invoked, will empty all keys out of the storage.
+		@throws DOMError
 	**/
 	function clear() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/StorageEstimate.hx b/std/js/html/StorageEstimate.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0fe14d30aeb78129c2cc5b994f3c81a128f4eb0c
--- /dev/null
+++ b/std/js/html/StorageEstimate.hx
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\StorageManager.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `StorageEstimate` dictionary is used by the `StorageManager` to provide estimates of the size of a site's or application's data store and how much of it is in use. The `estimate()` method returns an object that conforms to this dictionary when its `Promise` resolves.
+
+	Documentation [StorageEstimate](https://developer.mozilla.org/en-US/docs/Web/API/StorageEstimate) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/StorageEstimate$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/StorageEstimate>
+**/
+typedef StorageEstimate = {
+	
+	/**
+		A numeric value which provides a conservative approximation of the total storage the user's device or computer has available for the site origin or Web app. It's possible that there's more than this amount of space available though you can't rely on that being the case.
+	**/
+	var ?quota : Int;
+	
+	/**
+		A numeric value approximating the amount of storage space currently being used by the site or Web app, out of the available space as indicated by `quota`.
+	**/
+	var ?usage : Int;
+}
\ No newline at end of file
diff --git a/std/js/html/StorageEvent.hx b/std/js/html/StorageEvent.hx
index 52eaa22a3d8d81281119d885d5f7de27e67a2546..861ba51dad3a0c9eed0d10d4df8ff52e4025923a 100644
--- a/std/js/html/StorageEvent.hx
+++ b/std/js/html/StorageEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	A `StorageEvent` is sent to a window when a storage area changes.
+	A `StorageEvent` is sent to a window when a storage area it has access to is changed within the context of another document.
 
 	Documentation [StorageEvent](https://developer.mozilla.org/en-US/docs/Web/API/StorageEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/StorageEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/StorageEvent>
 **/
 @:native("StorageEvent")
-extern class StorageEvent extends Event
-{
+extern class StorageEvent extends Event {
 	var key(default,null) : String;
 	var oldValue(default,null) : String;
 	var newValue(default,null) : String;
@@ -42,5 +41,5 @@ extern class StorageEvent extends Event
 	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : StorageEventInit ) : Void;
-	function initStorageEvent( type : String, canBubble : Bool, cancelable : Bool, key : String, oldValue : String, newValue : String, url : String, storageArea : Storage ) : Void;
+	function initStorageEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?key : String, ?oldValue : String, ?newValue : String, ?url : String, ?storageArea : Storage ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/StorageEventInit.hx b/std/js/html/StorageEventInit.hx
index 286df44d10146f78602905f9d13cfbba42190f59..627b693bd8276668e279ca783821cff376b6e1be 100644
--- a/std/js/html/StorageEventInit.hx
+++ b/std/js/html/StorageEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,12 +24,10 @@
 
 package js.html;
 
-typedef StorageEventInit =
-{
-	> EventInit,
-	@:optional var key : String;
-	@:optional var newValue : String;
-	@:optional var oldValue : String;
-	@:optional var storageArea : Storage;
-	@:optional var url : String;
+typedef StorageEventInit = EventInit & {
+	var ?key : String;
+	var ?newValue : String;
+	var ?oldValue : String;
+	var ?storageArea : Storage;
+	var ?url : String;
 }
\ No newline at end of file
diff --git a/std/js/html/StorageManager.hx b/std/js/html/StorageManager.hx
new file mode 100644
index 0000000000000000000000000000000000000000..27fc26ec4b733300f751fa85471cd03b3a29ed30
--- /dev/null
+++ b/std/js/html/StorageManager.hx
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\StorageManager.webidl. Do not edit!
+
+package js.html;
+
+import js.lib.Promise;
+
+/**
+	The `StorageManager` interface of the the Storage API provides an interface for managing persistance permissions and estimating available storage. You can get a reference to this interface using either `navigator.storage` or `WorkerNavigator.storage`.
+
+	Documentation [StorageManager](https://developer.mozilla.org/en-US/docs/Web/API/StorageManager) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/StorageManager$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/StorageManager>
+**/
+@:native("StorageManager")
+extern class StorageManager {
+
+	/**
+		Returns a `Promise` that resolves to `true` if persistence has already been granted for your site's storage.
+		@throws DOMError
+	**/
+	function persisted() : Promise<Bool>;
+
+	/**
+		Returns a `Promise` that resolves to `true` if the user agent is able to persist your site's storage.
+		@throws DOMError
+	**/
+	function persist() : Promise<Bool>;
+
+	/**
+		Returns a `StorageEstimate` object containing usage and quota numbers for your origin.
+		@throws DOMError
+	**/
+	function estimate() : Promise<StorageEstimate>;
+}
\ No newline at end of file
diff --git a/std/js/html/StorageType.hx b/std/js/html/StorageType.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c15cd94fabdea920eb83d63600a190f1b0c29c1f
--- /dev/null
+++ b/std/js/html/StorageType.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\StorageType.webidl. Do not edit!
+
+package js.html;
+
+enum abstract StorageType(String) {
+	var PERSISTENT = "persistent";
+	var TEMPORARY = "temporary";
+	var DEFAULT = "default";
+}
\ No newline at end of file
diff --git a/std/js/html/StyleElement.hx b/std/js/html/StyleElement.hx
index 78e957e89430b874fd7792e8b931591f13d5a19c..a6bdb25433beaad14b0d75d4d3c8fff480868714 100644
--- a/std/js/html/StyleElement.hx
+++ b/std/js/html/StyleElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLStyleElement>
 **/
 @:native("HTMLStyleElement")
-extern class StyleElement extends Element
-{
+extern class StyleElement extends Element {
 	
 	/**
 		Is a `Boolean` value representing whether or not the stylesheet is disabled (true) or not (false).
@@ -49,11 +48,6 @@ extern class StyleElement extends Element
 		Is a `DOMString` representing the type of style being applied by this statement.
 	**/
 	var type : String;
-	
-	/**
-		Is a `Boolean` value indicating if the element applies to the whole document (`false`) or only to the parent's sub-tree (`true`).
-	**/
-	var scoped : Bool;
 	var sheet(default,null) : StyleSheet;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/StyleSheet.hx b/std/js/html/StyleSheet.hx
index 3250327c9b149da067f930302d4560dc09b0980a..9ea29edaa8d0b5d8aa4788b20de23a46b79e8b4d 100644
--- a/std/js/html/StyleSheet.hx
+++ b/std/js/html/StyleSheet.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/StyleSheet>
 **/
 @:native("StyleSheet")
-extern class StyleSheet
-{
+extern class StyleSheet {
 	
 	/**
 		Returns a `DOMString` representing the style sheet language for this style sheet.
diff --git a/std/js/html/StyleSheetList.hx b/std/js/html/StyleSheetList.hx
index b6c8321c7128e70af6f9427de53b9b5390ffb83f..6fc9c30180ca16f0c077ef83356292aae22bf537 100644
--- a/std/js/html/StyleSheetList.hx
+++ b/std/js/html/StyleSheetList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/StyleSheetList>
 **/
 @:native("StyleSheetList")
-extern class StyleSheetList implements ArrayAccess<StyleSheet>
-{
+extern class StyleSheetList implements ArrayAccess<StyleSheet> {
 	var length(default,null) : Int;
 	
 	function item( index : Int ) : StyleSheet;
diff --git a/std/js/html/SubtleCrypto.hx b/std/js/html/SubtleCrypto.hx
index a5e47995a41d2d64e45e7118441ac060b50c139c..0771ca6e06008a34e4534698c206dea7cba19086 100644
--- a/std/js/html/SubtleCrypto.hx
+++ b/std/js/html/SubtleCrypto.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `SubtleCrypto` interface represents a set of cryptographic primitives. It is available via the `Crypto.subtle` properties available in a window context (via `Window.crypto`).
 
@@ -32,78 +34,81 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto>
 **/
 @:native("SubtleCrypto")
-extern class SubtleCrypto
-{
-	/** @throws DOMError */
-	
+extern class SubtleCrypto {
+
 	/**
 		Returns a `Promise` of the encrypted data corresponding to the clear text, algorithm and key given as parameters.
+		@throws DOMError
 	**/
-	function encrypt( algorithm : haxe.extern.EitherType<Dynamic,String>, key : CryptoKey, data : haxe.extern.EitherType<ArrayBufferView,ArrayBuffer> ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+	function encrypt( algorithm : haxe.extern.EitherType<Dynamic,String>, key : CryptoKey, data : haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer> ) : Promise<Dynamic>;
+
 	/**
 		Returns a `Promise` of the clear data corresponding to the encrypted text, algorithm and key given as parameters.
+		@throws DOMError
 	**/
-	function decrypt( algorithm : haxe.extern.EitherType<Dynamic,String>, key : CryptoKey, data : haxe.extern.EitherType<ArrayBufferView,ArrayBuffer> ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+	function decrypt( algorithm : haxe.extern.EitherType<Dynamic,String>, key : CryptoKey, data : haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer> ) : Promise<Dynamic>;
+
 	/**
 		Returns a `Promise` of the signature corresponding to the text, algorithm and key given as parameters.
+		@throws DOMError
 	**/
-	function sign( algorithm : haxe.extern.EitherType<Dynamic,String>, key : CryptoKey, data : haxe.extern.EitherType<ArrayBufferView,ArrayBuffer> ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+	function sign( algorithm : haxe.extern.EitherType<Dynamic,String>, key : CryptoKey, data : haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer> ) : Promise<Dynamic>;
+
 	/**
 		Returns a `Promise` of a `Boolean` value indicating if the signature given as parameter matches the text, algorithm and key also given as parameters.
+		@throws DOMError
 	**/
-	function verify( algorithm : haxe.extern.EitherType<Dynamic,String>, key : CryptoKey, signature : haxe.extern.EitherType<ArrayBufferView,ArrayBuffer>, data : haxe.extern.EitherType<ArrayBufferView,ArrayBuffer> ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+	function verify( algorithm : haxe.extern.EitherType<Dynamic,String>, key : CryptoKey, signature : haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer>, data : haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer> ) : Promise<Dynamic>;
+
 	/**
 		Returns a `Promise` of a digest generated from the algorithm and text given as parameters.
+		@throws DOMError
 	**/
-	function digest( algorithm : haxe.extern.EitherType<Dynamic,String>, data : haxe.extern.EitherType<ArrayBufferView,ArrayBuffer> ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+	function digest( algorithm : haxe.extern.EitherType<Dynamic,String>, data : haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer> ) : Promise<Dynamic>;
+
 	/**
 		Returns a `Promise` of a newly generated `CryptoKey`, for symmetrical algorithms, or a `CryptoKeyPair`, containing two newly generated keys, for asymmetrical algorithm, that matches the algorithm, the usages and the extractability given as parameters.
+		@throws DOMError
 	**/
-	function generateKey( algorithm : haxe.extern.EitherType<Dynamic,String>, extractable : Bool, keyUsages : Array<String> ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+	@:overload( function( algorithm : String, extractable : Bool, keyUsages : Array<String>) : Promise<Dynamic> {} )
+	function generateKey( algorithm : Dynamic, extractable : Bool, keyUsages : Array<String> ) : Promise<Dynamic>;
+
 	/**
 		Returns a `Promise` of a newly generated `CryptoKey` derived from a master key and a specific algorithm given as parameters.
+		@throws DOMError
 	**/
 	function deriveKey( algorithm : haxe.extern.EitherType<Dynamic,String>, baseKey : CryptoKey, derivedKeyType : haxe.extern.EitherType<Dynamic,String>, extractable : Bool, keyUsages : Array<String> ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+
 	/**
 		Returns a `Promise` of a newly generated buffer of pseudo-random bits derived from a master key and a specific algorithm given as parameters.
+		@throws DOMError
 	**/
-	function deriveBits( algorithm : haxe.extern.EitherType<Dynamic,String>, baseKey : CryptoKey, length : Int ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+	@:overload( function( algorithm : String, baseKey : CryptoKey, length : Int) : Promise<Dynamic> {} )
+	function deriveBits( algorithm : Dynamic, baseKey : CryptoKey, length : Int ) : Promise<Dynamic>;
+
 	/**
 		Returns a `Promise` of a `CryptoKey` corresponding to the format, the algorithm, the raw key data, the usages and the extractability given as parameters.
+		@throws DOMError
 	**/
-	function importKey( format : String, keyData : Dynamic, algorithm : haxe.extern.EitherType<Dynamic,String>, extractable : Bool, keyUsages : Array<String> ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+	@:overload( function( format : String, keyData : Dynamic, algorithm : String, extractable : Bool, keyUsages : Array<String>) : Promise<Dynamic> {} )
+	function importKey( format : String, keyData : Dynamic, algorithm : Dynamic, extractable : Bool, keyUsages : Array<String> ) : Promise<Dynamic>;
+
 	/**
 		Returns a `Promise` of a buffer containing the key in the format requested.
+		@throws DOMError
 	**/
 	function exportKey( format : String, key : CryptoKey ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+
 	/**
 		Returns a `Promise` of a wrapped symmetric key for usage (transfer, storage) in insecure environments. The wrapped buffer returned is in the format given in parameters, and contains the key wrapped by the given wrapping key with the given algorithm.
+		@throws DOMError
 	**/
-	function wrapKey( format : String, key : CryptoKey, wrappingKey : CryptoKey, wrapAlgorithm : haxe.extern.EitherType<Dynamic,String> ) : Promise<Dynamic>;
-	/** @throws DOMError */
-	
+	@:overload( function( format : String, key : CryptoKey, wrappingKey : CryptoKey, wrapAlgorithm : String) : Promise<Dynamic> {} )
+	function wrapKey( format : String, key : CryptoKey, wrappingKey : CryptoKey, wrapAlgorithm : Dynamic ) : Promise<Dynamic>;
+
 	/**
 		Returns a `Promise` of a `CryptoKey` corresponding to the wrapped key given in parameter.
+		@throws DOMError
 	**/
-	function unwrapKey( format : String, wrappedKey : haxe.extern.EitherType<ArrayBufferView,ArrayBuffer>, unwrappingKey : CryptoKey, unwrapAlgorithm : haxe.extern.EitherType<Dynamic,String>, unwrappedKeyAlgorithm : haxe.extern.EitherType<Dynamic,String>, extractable : Bool, keyUsages : Array<String> ) : Promise<Dynamic>;
+	function unwrapKey( format : String, wrappedKey : haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer>, unwrappingKey : CryptoKey, unwrapAlgorithm : haxe.extern.EitherType<Dynamic,String>, unwrappedKeyAlgorithm : haxe.extern.EitherType<Dynamic,String>, extractable : Bool, keyUsages : Array<String> ) : Promise<Dynamic>;
 }
\ No newline at end of file
diff --git a/std/js/html/SupportedType.hx b/std/js/html/SupportedType.hx
index 202899566218dd681fba1d71fadaf55d21fc6887..4cc2206818290fa8eff9109ec0feab05c9a804a0 100644
--- a/std/js/html/SupportedType.hx
+++ b/std/js/html/SupportedType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract SupportedType(String)
-{
+enum abstract SupportedType(String) {
 	var TEXT_HTML = "text/html";
 	var TEXT_XML = "text/xml";
 	var APPLICATION_XML = "application/xml";
diff --git a/std/js/html/TableCaptionElement.hx b/std/js/html/TableCaptionElement.hx
index 57d6d0e0fe486bfbaf3195caccff61e65f6ee02e..c200cdc3b4ffb96dc46fb359f1fc6e5392aa1238 100644
--- a/std/js/html/TableCaptionElement.hx
+++ b/std/js/html/TableCaptionElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableCaptionElement>
 **/
 @:native("HTMLTableCaptionElement")
-extern class TableCaptionElement extends Element
-{
+extern class TableCaptionElement extends Element {
 	
 	/**
 		Is a `DOMString` which represents an enumerated attribute indicating alignment of the caption with respect to the table.
diff --git a/std/js/html/TableCellElement.hx b/std/js/html/TableCellElement.hx
index 06ab4a0908af055e9143addf9700958be07a69ca..4d41119dcc4499c227c620bf7006923db6f9e374 100644
--- a/std/js/html/TableCellElement.hx
+++ b/std/js/html/TableCellElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,16 +32,15 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableCellElement>
 **/
 @:native("HTMLTableCellElement")
-extern class TableCellElement extends Element
-{
+extern class TableCellElement extends Element {
 	
 	/**
-		Is a `unsigned` `long` that represents the number of columns this cell must span. It reflects the `colspan` attribute.
+		An unsigned long integer indicating the number of columns this cell must span; this lets the cell occupy space across multiple columns of the table. It reflects the `colspan` attribute.
 	**/
 	var colSpan : Int;
 	
 	/**
-		Is a `unsigned` `long` that represents the number of rows this cell must span. It reflects the `rowspan` attribute.
+		An unsigned long integer indicating the number of rows this cell must span; this lets a cell occupy space across multiple rows of the table. It reflects the `rowspan` attribute.
 	**/
 	var rowSpan : Int;
 	
@@ -51,55 +50,27 @@ extern class TableCellElement extends Element
 	var headers : String;
 	
 	/**
-		Is a `long` representing the cell position in the cells collection of the `tr` it belongs to. If the cell doesn't belong to a `tr`, it returns `-1`.
+		A long integer representing the cell's position in the `HTMLTableRowElement.cells` collection of the `tr` the cell is contained within. If the cell doesn't belong to a `tr`, it returns `-1`.
 	**/
 	var cellIndex(default,null) : Int;
-	var abbr : String;
-	var scope : String;
 	
 	/**
-		Is a `DOMString` containing an enumerated value reflecting the `align` attribute. It indicates the alignment of the element's contents with respect to the surrounding context. The possible values are `"left"`, `"right"`, and `"center"`.
+		A `DOMString` which can be used on `th` elements (not on `td`), specifying an alternative label for the header cell.. This alternate label can be used in other contexts, such as when describing the headers that apply to a data cell. This is used to offer a shorter term for use by screen readers in particular, and is a valuable accessibility tool. Usually the value of `abbr` is an abbreviation or acronym, but can be any text that's appropriate contextually.
 	**/
-	var align : String;
+	var abbr : String;
 	
 	/**
-		Is a `DOMString` containing a name grouping cells in virtual. It reflects the obsolete `axis` attribute.
+		
 	**/
+	var scope : String;
+	var align : String;
 	var axis : String;
-	
-	/**
-		Is a `DOMString` containing a length of pixel of the hinted height of the cell. It reflects the obsolete `height` attribute.
-	**/
 	var height : String;
-	
-	/**
-		Is a `DOMString` containing a length of pixel of the hinted width of the cell. It reflects the obsolete `width` attribute.
-	**/
 	var width : String;
-	
-	/**
-		Is a `DOMString` containing one single chararcter. This character is the one to align all the cell of a column on. It reflects the `char` and default to the decimal points associated with the language, e.g. `'.'` for English, or `','` for French. This property was optional and was not very well supported.
-	**/
 	var ch : String;
-	
-	/**
-		Is a `DOMString` containing a integer indicating how many characters must be left at the right (for left-to-right scripts; or at the left for right-to-left scripts) of the character defined by `HTMLTableCellElement.ch`. This property was optional and was not very well supported.
-	**/
 	var chOff : String;
-	
-	/**
-		Is a `Boolean` value reflecting the `nowrap` attribute and indicating if cell content can be broken in several lines.
-	**/
 	var noWrap : Bool;
-	
-	/**
-		Is a `DOMString` representing an enumerated value indicating how the content of the cell must be vertically aligned. It reflects the `valign` attribute and can have one of the following values: `"top"`, `"middle"`, `"bottom"`, or `"baseline"`.
-	**/
 	var vAlign : String;
-	
-	/**
-		Is a `DOMString` containing the background color of the cells. It reflects the obsolete `bgColor` attribute.
-	**/
 	var bgColor : String;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/TableColElement.hx b/std/js/html/TableColElement.hx
index 54bc8c1a1c4679466e9bf7d09d87a94a69cf8bc4..40028d898fa52eca6b293a1ef31f7e90070dbb13 100644
--- a/std/js/html/TableColElement.hx
+++ b/std/js/html/TableColElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableColElement>
 **/
 @:native("HTMLTableColElement")
-extern class TableColElement extends Element
-{
+extern class TableColElement extends Element {
 	var span : Int;
 	var align : String;
 	var ch : String;
diff --git a/std/js/html/TableElement.hx b/std/js/html/TableElement.hx
index 3ecc5b80d44274a5239feff1f0c3691648f2a888..6bc7e2ff45b60d03bc4a652469d1b74dfaa0135d 100644
--- a/std/js/html/TableElement.hx
+++ b/std/js/html/TableElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableElement>
 **/
 @:native("HTMLTableElement")
-extern class TableElement extends Element
-{
+extern class TableElement extends Element {
 	
 	/**
 		Is a `HTMLTableCaptionElement` representing the first `caption` that is a child of the element, or `null` if none is found. When set, if the object doesn't represent a `caption`, a `DOMException` with the `HierarchyRequestError` name is thrown. If a correct object is given, it is inserted in the tree as the first child of this element and the first `caption` that is a child of this element is removed from the tree, if any.
@@ -136,16 +135,16 @@ extern class TableElement extends Element
 	**/
 	function deleteTFoot() : Void;
 	function createTBody() : Element;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `HTMLTableRowElement` representing a new row of the table. It inserts it in the rows collection immediately before the `tr` element at the given `index` position. If necessary a `tbody` is created. If the `index` is `-1`, the new row is appended to the collection. If the `index` is smaller than `-1` or greater than the number of rows in the collection, a `DOMException` with the value `IndexSizeError` is raised.
+		@throws DOMError
 	**/
-	function insertRow( ?index : Int = -1 ) : Element;
-	/** @throws DOMError */
+	function insertRow( index : Int = -1 ) : Element;
 	
 	/**
 		Removes the row corresponding to the `index` given in parameter. If the `index` value is `-1` the last row is removed; if it smaller than `-1` or greater than the amount of rows in the collection, a `DOMException` with the value `IndexSizeError` is raised.
+		@throws DOMError
 	**/
 	function deleteRow( index : Int ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/TableRowElement.hx b/std/js/html/TableRowElement.hx
index 512f170167a221e3113a3a2e012b9f0c3aeb8e95..a789aad6ee61f5cca949fdf765469b274e7c6ebd 100644
--- a/std/js/html/TableRowElement.hx
+++ b/std/js/html/TableRowElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableRowElement>
 **/
 @:native("HTMLTableRowElement")
-extern class TableRowElement extends Element
-{
+extern class TableRowElement extends Element {
 	
 	/**
 		Returns a `long` value which gives the logical position of the row within the entire table. If the row is not part of a table, returns `-1`.
@@ -75,16 +74,16 @@ extern class TableRowElement extends Element
 	**/
 	var bgColor : String;
 	
-	/** @throws DOMError */
 	
 	/**
 		Inserts a new cell just before the given position in the row. If the given position is not given or is `-1`, it appends the cell to the row. If the given position is greater (or equal as it starts at zero) than the amount of cells in the row, or is smaller than `-1`, it raises a `DOMException` with the `IndexSizeError` value. Returns a reference to a HTMLTableCellElement [en-US].
+		@throws DOMError
 	**/
-	function insertCell( ?index : Int = -1 ) : Element;
-	/** @throws DOMError */
+	function insertCell( index : Int = -1 ) : Element;
 	
 	/**
 		Removes the cell at the given position in the row. If the given position is greater (or equal as it starts at zero) than the amount of cells in the row, or is smaller than `0`, it raises a `DOMException` with the `IndexSizeError` value.
+		@throws DOMError
 	**/
 	function deleteCell( index : Int ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/TableSectionElement.hx b/std/js/html/TableSectionElement.hx
index 77b7a9d205aadc6321de2cb8a7632d7f74f443bb..2ad5eb16f6e3d76856f82b2fd69880f0624f71ba 100644
--- a/std/js/html/TableSectionElement.hx
+++ b/std/js/html/TableSectionElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableSectionElement>
 **/
 @:native("HTMLTableSectionElement")
-extern class TableSectionElement extends Element
-{
+extern class TableSectionElement extends Element {
 	
 	/**
 		Returns a live `HTMLCollection` containing the rows in the section. The `HTMLCollection` is live and is automatically updated when rows are added or removed.
@@ -60,16 +59,16 @@ extern class TableSectionElement extends Element
 	**/
 	var vAlign : String;
 	
-	/** @throws DOMError */
 	
 	/**
 		Inserts a new row just before the given position in the section. If the given position is not given or is `-1`, it appends the row to the end of section. If the given position is greater (or equal as it starts at zero) than the amount of rows in the section, or is smaller than `-1`, it raises a `DOMException` with the `IndexSizeError` value.
+		@throws DOMError
 	**/
-	function insertRow( ?index : Int = -1 ) : Element;
-	/** @throws DOMError */
+	function insertRow( index : Int = -1 ) : Element;
 	
 	/**
 		Removes the cell at the given position in the section. If the given position is greater (or equal as it starts at zero) than the amount of rows in the section, or is smaller than `0`, it raises a `DOMException` with the `IndexSizeError` value.
+		@throws DOMError
 	**/
 	function deleteRow( index : Int ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/TemplateElement.hx b/std/js/html/TemplateElement.hx
index 5f4a8de17922f46ece7a0d9e84dd4618cbf7bde7..c9789c61f121c119f01179445673daa6ff1a60fa 100644
--- a/std/js/html/TemplateElement.hx
+++ b/std/js/html/TemplateElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,19 @@
 
 package js.html;
 
+/**
+	The `HTMLTemplateElement` interface enables access to the contents of an HTML `template` element.
+
+	Documentation [HTMLTemplateElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLTemplateElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLTemplateElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTemplateElement>
+**/
 @:native("HTMLTemplateElement")
-extern class TemplateElement extends Element
-{
+extern class TemplateElement extends Element {
+	
+	/**
+		`DocumentFragment`: Returns the `template` element's template contents.
+	**/
 	var content(default,null) : DocumentFragment;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/Text.hx b/std/js/html/Text.hx
index 987e38dbdc7d181fa7bf06e923a8e203cfba6bab..71f77dbacf9867b933ab500afbdb45b4418bf3cf 100644
--- a/std/js/html/Text.hx
+++ b/std/js/html/Text.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Text>
 **/
 @:native("Text")
-extern class Text extends CharacterData
-{
+extern class Text extends CharacterData {
 	
 	/**
 		Returns a `DOMString` containing the text of all `Text` nodes logically adjacent to this `Node`, concatenated in document order.
@@ -41,13 +40,19 @@ extern class Text extends CharacterData
 	var wholeText(default,null) : String;
 	
 	/** @throws DOMError */
-	function new( ?data : String = "" ) : Void;
+	function new( data : String = "" ) : Void;
 	/** @throws DOMError */
 	function splitText( offset : Int ) : Text;
 	/** @throws DOMError */
-	function convertQuadFromNode( quad : DOMQuad, from : haxe.extern.EitherType<Text,haxe.extern.EitherType<Element,HTMLDocument>>, ?options : ConvertCoordinateOptions ) : DOMQuad;
+	@:overload( function( quad : DOMQuad, from : Element, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	@:overload( function( quad : DOMQuad, from : HTMLDocument, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	function convertQuadFromNode( quad : DOMQuad, from : Text, ?options : ConvertCoordinateOptions ) : DOMQuad;
 	/** @throws DOMError */
-	function convertRectFromNode( rect : DOMRectReadOnly, from : haxe.extern.EitherType<Text,haxe.extern.EitherType<Element,HTMLDocument>>, ?options : ConvertCoordinateOptions ) : DOMQuad;
+	@:overload( function( rect : DOMRectReadOnly, from : Element, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	@:overload( function( rect : DOMRectReadOnly, from : HTMLDocument, ?options : ConvertCoordinateOptions) : DOMQuad {} )
+	function convertRectFromNode( rect : DOMRectReadOnly, from : Text, ?options : ConvertCoordinateOptions ) : DOMQuad;
 	/** @throws DOMError */
-	function convertPointFromNode( point : DOMPointInit, from : haxe.extern.EitherType<Text,haxe.extern.EitherType<Element,HTMLDocument>>, ?options : ConvertCoordinateOptions ) : DOMPoint;
+	@:overload( function( point : DOMPointInit, from : Element, ?options : ConvertCoordinateOptions) : DOMPoint {} )
+	@:overload( function( point : DOMPointInit, from : HTMLDocument, ?options : ConvertCoordinateOptions) : DOMPoint {} )
+	function convertPointFromNode( point : DOMPointInit, from : Text, ?options : ConvertCoordinateOptions ) : DOMPoint;
 }
\ No newline at end of file
diff --git a/std/js/html/TextAreaElement.hx b/std/js/html/TextAreaElement.hx
index 7e28ead22dd21bbbcdf055d6d3319299d7182b3d..6919af1f45d69433083122b3ea8efe1b6b69a5dd 100644
--- a/std/js/html/TextAreaElement.hx
+++ b/std/js/html/TextAreaElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,14 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTextAreaElement>
 **/
 @:native("HTMLTextAreaElement")
-extern class TextAreaElement extends Element
-{
+extern class TextAreaElement extends Element {
+	var autocomplete : String;
 	var autofocus : Bool;
 	var cols : Int;
 	var disabled : Bool;
 	var form(default,null) : FormElement;
 	var maxLength : Int;
+	var minLength : Int;
 	var name : String;
 	var placeholder : String;
 	var readOnly : Bool;
@@ -52,16 +53,18 @@ extern class TextAreaElement extends Element
 	var willValidate(default,null) : Bool;
 	var validity(default,null) : ValidityState;
 	var validationMessage(default,null) : String;
+	var labels(default,null) : NodeList;
 	var selectionStart : Int;
 	var selectionEnd : Int;
 	var selectionDirection : String;
 	
 	function checkValidity() : Bool;
+	function reportValidity() : Bool;
 	function setCustomValidity( error : String ) : Void;
 	function select() : Void;
 	/** @throws DOMError */
 	@:overload( function( replacement : String ) : Void {} )
-	function setRangeText( replacement : String, start : Int, end : Int, ?selectionMode : SelectionMode = "preserve" ) : Void;
+	function setRangeText( replacement : String, start : Int, end : Int, selectionMode : SelectionMode = PRESERVE ) : Void;
 	/** @throws DOMError */
 	function setSelectionRange( start : Int, end : Int, ?direction : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/TextDecodeOptions.hx b/std/js/html/TextDecodeOptions.hx
index 941d74b776f8deffccb1242527cfb2c7674ea33e..c75981b61b33604e6cc8983fb2b599d609cfe155 100644
--- a/std/js/html/TextDecodeOptions.hx
+++ b/std/js/html/TextDecodeOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,6 @@
 
 package js.html;
 
-typedef TextDecodeOptions =
-{
-	@:optional var stream : Bool;
+typedef TextDecodeOptions = {
+	var ?stream : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/TextDecoder.hx b/std/js/html/TextDecoder.hx
index c51802ea2fd5dbb89eb556081281aeaa20856108..c5feedd783c9cdc35654325aabad5622f7945932 100644
--- a/std/js/html/TextDecoder.hx
+++ b/std/js/html/TextDecoder.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `TextDecoder` interface represents a decoder for a specific method, that is a specific character encoding, like `utf-8`, `iso-8859-2`, `koi8`, `cp1261`, `gbk`, ... A decoder takes a stream of bytes as input and emits a stream of code points. For a more scalable, non-native library, see `StringView` – a C-like representation of strings based on typed arrays.
+	The `TextDecoder` interface represents a decoder for a specific method, that is a specific character encoding, like `utf-8`, `iso-8859-2`, `koi8`, `cp1261`, `gbk`, etc. A decoder takes a stream of bytes as input and emits a stream of code points. For a more scalable, non-native library, see `StringView` – a C-like representation of strings based on typed arrays.
 
 	Documentation [TextDecoder](https://developer.mozilla.org/en-US/docs/Web/API/TextDecoder) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/TextDecoder$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/TextDecoder>
 **/
 @:native("TextDecoder")
-extern class TextDecoder
-{
+extern class TextDecoder {
 	
 	/**
 		Is a `DOMString` containing the name of the decoder, that is a string describing the method the `TextDecoder` will use.
@@ -45,12 +44,18 @@ extern class TextDecoder
 	**/
 	var fatal(default,null) : Bool;
 	
+	/**
+		Is a `Boolean` indicating whether the byte order marker is ignored.
+	**/
+	var ignoreBOM(default,null) : Bool;
+	
 	/** @throws DOMError */
-	function new( ?label : String = "utf-8", ?options : TextDecoderOptions ) : Void;
-	/** @throws DOMError */
+	function new( label : String = "utf-8", ?options : TextDecoderOptions ) : Void;
 	
 	/**
 		Returns a `DOMString` containing the text decoded with the method of the specific `TextDecoder` object.
+		@throws DOMError
 	**/
-	function decode( ?input : haxe.extern.EitherType<ArrayBufferView,ArrayBuffer>, ?options : TextDecodeOptions ) : String;
+	@:overload( function( ?input : js.lib.ArrayBuffer, ?options : TextDecodeOptions) : String {} )
+	function decode( ?input : js.lib.ArrayBufferView, ?options : TextDecodeOptions ) : String;
 }
\ No newline at end of file
diff --git a/std/js/html/TextDecoderOptions.hx b/std/js/html/TextDecoderOptions.hx
index 0a84709dc2c7dd4297b6119077580973638e1cee..6385971e6976a3562c4bbebe76fb4f3016254ba4 100644
--- a/std/js/html/TextDecoderOptions.hx
+++ b/std/js/html/TextDecoderOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
 
 package js.html;
 
-typedef TextDecoderOptions =
-{
-	@:optional var fatal : Bool;
+typedef TextDecoderOptions = {
+	var ?fatal : Bool;
+	var ?ignoreBOM : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/TextEncoder.hx b/std/js/html/TextEncoder.hx
index 6d227ccf9c9e48b84f7d94ce7a5131222a3db827..de36b805dbb6029c226ce9c60b922a3e29a442c2 100644
--- a/std/js/html/TextEncoder.hx
+++ b/std/js/html/TextEncoder.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/TextEncoder>
 **/
 @:native("TextEncoder")
-extern class TextEncoder
-{
+extern class TextEncoder {
 	
 	/**
 		Is a `DOMString` containing the name of the encoder, that is a string describing the method the `TextEncoder` will use.
@@ -41,10 +40,10 @@ extern class TextEncoder
 	var encoding(default,null) : String;
 	
 	/** @throws DOMError */
-	function new( ?utfLabel : String = "utf-8" ) : Void;
+	function new() : Void;
 	
 	/**
 		Returns a `Uint8Array` containing utf-8 encoded text.
 	**/
-	function encode( ?input : String = "" ) : Uint8Array;
+	function encode( input : String = "" ) : js.lib.Uint8Array;
 }
\ No newline at end of file
diff --git a/std/js/html/TextMetrics.hx b/std/js/html/TextMetrics.hx
index 423e1bf2c01a6dc48655200b8f433537d7875a26..02ca904e1f2676e490296cbc6e06706d8fc1cb12 100644
--- a/std/js/html/TextMetrics.hx
+++ b/std/js/html/TextMetrics.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/TextMetrics>
 **/
 @:native("TextMetrics")
-extern class TextMetrics
-{
+extern class TextMetrics {
 	
 	/**
 		Is a `double` giving the calculated width of a segment of inline text in CSS pixels. It takes into account the current font of the context.
diff --git a/std/js/html/TextTrack.hx b/std/js/html/TextTrack.hx
index 3db8841ecca3867c1b1e27366961920cf82faebb..f953ec852a3b5851de49bfc181ca7fac611c6b44 100644
--- a/std/js/html/TextTrack.hx
+++ b/std/js/html/TextTrack.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,17 +24,59 @@
 
 package js.html;
 
+/**
+	This interface also inherits properties from `EventTarget`.
+
+	Documentation [TextTrack](https://developer.mozilla.org/en-US/docs/Web/API/TextTrack) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/TextTrack$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/TextTrack>
+**/
 @:native("TextTrack")
-extern class TextTrack extends EventTarget
-{
+extern class TextTrack extends EventTarget {
+	
+	/**
+		Returns a `DOMString` indicating what kind of text track the `TextTrack` describes. The value must be one of those in the TextTrackKind enum.
+	**/
 	var kind(default,null) : TextTrackKind;
+	
+	/**
+		A human-readable `DOMString` which contains the text track's label, if one is present; otherwise, this is an empty string (`""`), in which case a custom label may need to be generated by your code using other attributes of the track, if the track's label needs to be exposed to the user.
+	**/
 	var label(default,null) : String;
+	
+	/**
+		A `DOMString` which specifies the text language in which the text track's contents is written. The value must adhere to the format specified in the Tags for Identifying Languages (BCP 47) document from the IETF, just like the HTML `lang` attribute. For example, this can be `"en-US"` for United States English or `"pt-BR"` for Brazilian Portuguese.
+	**/
 	var language(default,null) : String;
+	
+	/**
+		A `DOMString` which identifies the track, if it has one. If it doesn't have an ID, then this value is an empty string (`""`). If the `TextTrack` is associated with a `track` element, then the track's ID matches the element's ID.
+	**/
 	var id(default,null) : String;
+	
+	/**
+		Returns a `DOMString` which indicates the track's in-band metadata track dispatch type. needs details
+	**/
 	var inBandMetadataTrackDispatchType(default,null) : String;
+	
+	/**
+		A `DOMString` specifying the track's current mode. Changing this property's value changes the track's current mode to match. Permitted values are listed under Text track mode constants.
+	**/
 	var mode : TextTrackMode;
+	
+	/**
+		A `TextTrackCueList` which contains all of the track's cues.
+	**/
 	var cues(default,null) : TextTrackCueList;
+	
+	/**
+		A `TextTrackCueList` object listing the currently active set of text track cues. Track cues are active if the current playback position of the media is between the cues' start and end times.
+	**/
 	var activeCues(default,null) : TextTrackCueList;
+	
+	/**
+		A `EventHandler` specifying a function to be called when a `cuechange` event occurs. Handling these events lets you know when cues are entered and exited. A given text cue appears when the cue is entered and disappears when the cue is exited.
+	**/
 	var oncuechange : haxe.Constraints.Function;
 	
 	function addCue( cue : VTTCue ) : Void;
diff --git a/std/js/html/TextTrackCue.hx b/std/js/html/TextTrackCue.hx
index 2ab3f4a256bf0173e4f4edfe510fe24f24ddb628..3af00754381849a97679266a800b030ffc310e62 100644
--- a/std/js/html/TextTrackCue.hx
+++ b/std/js/html/TextTrackCue.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("TextTrackCue")
-extern class TextTrackCue extends EventTarget
-{
+extern class TextTrackCue extends EventTarget {
 	var track(default,null) : TextTrack;
 	var id : String;
 	var startTime : Float;
diff --git a/std/js/html/TextTrackCueList.hx b/std/js/html/TextTrackCueList.hx
index 3004438c1803ac1cf3ff7c2639963afb01de3654..1242754e48c230b7fd6dddb10f585146aceaeded 100644
--- a/std/js/html/TextTrackCueList.hx
+++ b/std/js/html/TextTrackCueList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("TextTrackCueList")
-extern class TextTrackCueList implements ArrayAccess<VTTCue>
-{
+extern class TextTrackCueList implements ArrayAccess<VTTCue> {
 	var length(default,null) : Int;
 	
 	function getCueById( id : String ) : VTTCue;
diff --git a/std/js/html/TextTrackKind.hx b/std/js/html/TextTrackKind.hx
index d90d800ce853f763eed570461512177b17b8c815..fced99eeb9ae2c75b228873449cb4d7bb3ec1c95 100644
--- a/std/js/html/TextTrackKind.hx
+++ b/std/js/html/TextTrackKind.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract TextTrackKind(String)
-{
+enum abstract TextTrackKind(String) {
 	var SUBTITLES = "subtitles";
 	var CAPTIONS = "captions";
 	var DESCRIPTIONS = "descriptions";
diff --git a/std/js/html/TextTrackList.hx b/std/js/html/TextTrackList.hx
index b6aad2235166c0df0938ac4e32b3f6522d42d3ef..880e71f509529b15e9b38c77e65179dfda9ab6a7 100644
--- a/std/js/html/TextTrackList.hx
+++ b/std/js/html/TextTrackList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("TextTrackList")
-extern class TextTrackList extends EventTarget implements ArrayAccess<TextTrack>
-{
+extern class TextTrackList extends EventTarget implements ArrayAccess<TextTrack> {
 	var length(default,null) : Int;
 	var onchange : haxe.Constraints.Function;
 	var onaddtrack : haxe.Constraints.Function;
diff --git a/std/js/html/TextTrackMode.hx b/std/js/html/TextTrackMode.hx
index 169d53a2ac6ba75eac8f50f6fece5553254197e7..37e3e048294cc4dd089d13f4d30ea23e7407aa7d 100644
--- a/std/js/html/TextTrackMode.hx
+++ b/std/js/html/TextTrackMode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract TextTrackMode(String)
-{
+enum abstract TextTrackMode(String) {
 	var DISABLED = "disabled";
 	var HIDDEN = "hidden";
 	var SHOWING = "showing";
diff --git a/std/js/html/TimeElement.hx b/std/js/html/TimeElement.hx
index 763df07e9986bdf291557016da63070ab3e0488c..3f96415b4ecd35726f85e8ded112b2c9d06159b3 100644
--- a/std/js/html/TimeElement.hx
+++ b/std/js/html/TimeElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTimeElement>
 **/
 @:native("HTMLTimeElement")
-extern class TimeElement extends Element
-{
+extern class TimeElement extends Element {
 	
 	/**
 		Is a `DOMString` that reflects the `datetime` HTML attribute, containing a machine-readable form of the element's date and time value.
diff --git a/std/js/html/TimeEvent.hx b/std/js/html/TimeEvent.hx
index 81262789e83009d7b3d7ef6fcde2a367ca41cdc7..1de34aee667f20654225b5facf5749596a61132f 100644
--- a/std/js/html/TimeEvent.hx
+++ b/std/js/html/TimeEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,10 +32,9 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/TimeEvent>
 **/
 @:native("TimeEvent")
-extern class TimeEvent extends Event
-{
+extern class TimeEvent extends Event {
 	var detail(default,null) : Int;
 	var view(default,null) : Window;
 	
-	function initTimeEvent( aType : String, aView : Window, aDetail : Int ) : Void;
+	function initTimeEvent( aType : String, ?aView : Window, aDetail : Int = 0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/TimeRanges.hx b/std/js/html/TimeRanges.hx
index 50575a8ac0de8987ec10d2c65d9d512932549d77..9330d0e8a24e3ec4023fc0e372618d6647e64c83 100644
--- a/std/js/html/TimeRanges.hx
+++ b/std/js/html/TimeRanges.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,24 +32,23 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/TimeRanges>
 **/
 @:native("TimeRanges")
-extern class TimeRanges
-{
+extern class TimeRanges {
 	
 	/**
 		Returns an `unsigned long` representing the number of time ranges represented by the time range object.
 	**/
 	var length(default,null) : Int;
 	
-	/** @throws DOMError */
 	
 	/**
 		Returns the time for the start of the range with the specified index.
+		@throws DOMError
 	**/
 	function start( index : Int ) : Float;
-	/** @throws DOMError */
 	
 	/**
 		Returns the time for the end of the specified range.
+		@throws DOMError
 	**/
 	function end( index : Int ) : Float;
 }
\ No newline at end of file
diff --git a/std/js/html/TitleElement.hx b/std/js/html/TitleElement.hx
index 731f6c7988b31bec978e6ad9e107b28c3251c922..3abe5dac700c31f843d095b83bbd9d5807b0244c 100644
--- a/std/js/html/TitleElement.hx
+++ b/std/js/html/TitleElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTitleElement>
 **/
 @:native("HTMLTitleElement")
-extern class TitleElement extends Element
-{
+extern class TitleElement extends Element {
 	
 	/**
 		Is a `DOMString` representing the text of the document's title.
diff --git a/std/js/html/Touch.hx b/std/js/html/Touch.hx
index 04839b61ebe6afe29d88c8dcbe38f1c35d94f287..c54eb4ca1bda5d9a79daf8a55b8a9d0d31c40c48 100644
--- a/std/js/html/Touch.hx
+++ b/std/js/html/Touch.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,19 +32,66 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Touch>
 **/
 @:native("Touch")
-extern class Touch
-{
+extern class Touch {
+	
+	/**
+		Returns a unique identifier for this `Touch` object. A given touch point (say, by a finger) will have the same identifier for the duration of its movement around the surface. This lets you ensure that you're tracking the same touch all the time.
+	**/
 	var identifier(default,null) : Int;
+	
+	/**
+		Returns the `Element` on which the touch point started when it was first placed on the surface, even if the touch point has since moved outside the interactive area of that element or even been removed from the document.
+	**/
 	var target(default,null) : EventTarget;
+	
+	/**
+		Returns the X coordinate of the touch point relative to the left edge of the screen.
+	**/
 	var screenX(default,null) : Int;
+	
+	/**
+		Returns the Y coordinate of the touch point relative to the top edge of the screen.
+	**/
 	var screenY(default,null) : Int;
+	
+	/**
+		Returns the X coordinate of the touch point relative to the left edge of the browser viewport, not including any scroll offset.
+	**/
 	var clientX(default,null) : Int;
+	
+	/**
+		Returns the Y coordinate of the touch point relative to the top edge of the browser viewport, not including any scroll offset.
+	**/
 	var clientY(default,null) : Int;
+	
+	/**
+		Returns the X coordinate of the touch point relative to the left edge of the document. Unlike `clientX`, this value includes the horizontal scroll offset, if any.
+	**/
 	var pageX(default,null) : Int;
+	
+	/**
+		Returns the Y coordinate of the touch point relative to the top of the document. Unlike `clientY,` this value includes the vertical scroll offset, if any.
+	**/
 	var pageY(default,null) : Int;
+	
+	/**
+		Returns the X radius of the ellipse that most closely circumscribes the area of contact with the screen. The value is in pixels of the same scale as `screenX`.
+	**/
 	var radiusX(default,null) : Int;
+	
+	/**
+		Returns the Y radius of the ellipse that most closely circumscribes the area of contact with the screen. The value is in pixels of the same scale as `screenY`.
+	**/
 	var radiusY(default,null) : Int;
+	
+	/**
+		Returns the angle (in degrees) that the ellipse described by radiusX and radiusY must be rotated, clockwise, to most accurately cover the area of contact between the user and the surface.
+	**/
 	var rotationAngle(default,null) : Float;
+	
+	/**
+		Returns the amount of pressure being applied to the surface by the user, as a `float` between `0.0` (no pressure) and `1.0` (maximum pressure).
+	**/
 	var force(default,null) : Float;
 	
 	/** @throws DOMError */
diff --git a/std/js/html/TouchEvent.hx b/std/js/html/TouchEvent.hx
index 1b89a5e60c8ca92540f0a14040a528c82f1b2706..03c8c942c74aaa5bf992fa8fa7ce368957d0c914 100644
--- a/std/js/html/TouchEvent.hx
+++ b/std/js/html/TouchEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,17 +32,44 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent>
 **/
 @:native("TouchEvent")
-extern class TouchEvent extends UIEvent
-{
+extern class TouchEvent extends UIEvent {
+	
+	/**
+		A `TouchList` of all the `Touch` objects representing all current points of contact with the surface, regardless of target or changed status.
+	**/
 	var touches(default,null) : TouchList;
+	
+	/**
+		A `TouchList` of all the `Touch` objects that are both currently in contact with the touch surface and were also started on the same element that is the target of the event.
+	**/
 	var targetTouches(default,null) : TouchList;
+	
+	/**
+		A `TouchList` of all the `Touch` objects representing individual points of contact whose states changed between the previous touch event and this one.
+	**/
 	var changedTouches(default,null) : TouchList;
+	
+	/**
+		A Boolean value indicating whether or not the alt key was down when the touch event was fired.
+	**/
 	var altKey(default,null) : Bool;
+	
+	/**
+		A Boolean value indicating whether or not the meta key was down when the touch event was fired.
+	**/
 	var metaKey(default,null) : Bool;
+	
+	/**
+		A Boolean value indicating whether or not the control key was down when the touch event was fired.
+	**/
 	var ctrlKey(default,null) : Bool;
+	
+	/**
+		A Boolean value indicating whether or not the shift key was down when the touch event was fired.
+	**/
 	var shiftKey(default,null) : Bool;
 	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : TouchEventInit ) : Void;
-	function initTouchEvent( type : String, canBubble : Bool, cancelable : Bool, view : Window, detail : Int, ctrlKey : Bool, altKey : Bool, shiftKey : Bool, metaKey : Bool, touches : TouchList, targetTouches : TouchList, changedTouches : TouchList ) : Void;
+	function initTouchEvent( type : String, canBubble : Bool = false, cancelable : Bool = false, ?view : Window, detail : Int = 0, ctrlKey : Bool = false, altKey : Bool = false, shiftKey : Bool = false, metaKey : Bool = false, ?touches : TouchList, ?targetTouches : TouchList, ?changedTouches : TouchList ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/TouchEventInit.hx b/std/js/html/TouchEventInit.hx
index 29da8bfdc60d750879ecf6b3c733d53e4c0a3b1d..f846277c3495994721ff202871fd8b599f57e473 100644
--- a/std/js/html/TouchEventInit.hx
+++ b/std/js/html/TouchEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,8 @@
 
 package js.html;
 
-typedef TouchEventInit =
-{
-	> EventModifierInit,
-	@:optional var changedTouches : Array<Touch>;
-	@:optional var targetTouches : Array<Touch>;
-	@:optional var touches : Array<Touch>;
+typedef TouchEventInit = EventModifierInit & {
+	var ?changedTouches : Array<Touch>;
+	var ?targetTouches : Array<Touch>;
+	var ?touches : Array<Touch>;
 }
\ No newline at end of file
diff --git a/std/js/html/TouchInit.hx b/std/js/html/TouchInit.hx
index 73bb7cf5b7702a12ef260b397a2d6efb004421da..7a56d88c2b3ce1569b5cb43ccf5bf61b124621d9 100644
--- a/std/js/html/TouchInit.hx
+++ b/std/js/html/TouchInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,18 +24,17 @@
 
 package js.html;
 
-typedef TouchInit =
-{
-	@:optional var clientX : Int;
-	@:optional var clientY : Int;
-	@:optional var force : Float;
+typedef TouchInit = {
+	var ?clientX : Int;
+	var ?clientY : Int;
+	var ?force : Float;
 	var identifier : Int;
-	@:optional var pageX : Int;
-	@:optional var pageY : Int;
-	@:optional var radiusX : Float;
-	@:optional var radiusY : Float;
-	@:optional var rotationAngle : Float;
-	@:optional var screenX : Int;
-	@:optional var screenY : Int;
+	var ?pageX : Int;
+	var ?pageY : Int;
+	var ?radiusX : Float;
+	var ?radiusY : Float;
+	var ?rotationAngle : Float;
+	var ?screenX : Int;
+	var ?screenY : Int;
 	var target : EventTarget;
 }
\ No newline at end of file
diff --git a/std/js/html/TouchList.hx b/std/js/html/TouchList.hx
index 66a749b43b80ca980ae2dd1ecbcf029f327041bd..892934bb41ba8cc07c3072502bb170459aef0ec8 100644
--- a/std/js/html/TouchList.hx
+++ b/std/js/html/TouchList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/TouchList>
 **/
 @:native("TouchList")
-extern class TouchList implements ArrayAccess<Touch>
-{
+extern class TouchList implements ArrayAccess<Touch> {
 	
 	/**
 		The number of `Touch` objects in the `TouchList`.
@@ -45,9 +44,4 @@ extern class TouchList implements ArrayAccess<Touch>
 		Returns the `Touch` object at the specified index in the list.
 	**/
 	function item( index : Int ) : Touch;
-	
-	/**
-		Returns the first `Touch` item in the list whose identifier matches a specified value.
-	**/
-	function identifiedTouch( identifier : Int ) : Touch;
 }
\ No newline at end of file
diff --git a/std/js/html/TrackElement.hx b/std/js/html/TrackElement.hx
index 843b1739ada05d8365cefbdec568085a81f45569..269638a4076d2cb087cd8b43d91cafba9cadecbd 100644
--- a/std/js/html/TrackElement.hx
+++ b/std/js/html/TrackElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The HTMLTrackElement` interface provides access to the properties of `track` elements, as well as methods to manipulate them.
+	The `HTMLTrackElement`
 
 	Documentation [HTMLTrackElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLTrackElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLTrackElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLTrackElement>
 **/
 @:native("HTMLTrackElement")
-extern class TrackElement extends Element
-{
+extern class TrackElement extends Element {
 	static inline var NONE : Int = 0;
 	static inline var LOADING : Int = 1;
 	static inline var LOADED : Int = 2;
@@ -59,12 +58,16 @@ extern class TrackElement extends Element
 		Is a `DOMString` that reflects the `label` HTML attribute, indicating a user-readable title for the track.
 	**/
 	var label : String;
+	
+	/**
+		Is a `Boolean` reflects the `default` HTML attribute, indicating that the track is to be enabled if the user's preferences do not indicate that another track would be more appropriate.
+	**/
 	@:native("default")
 	var default_ : Bool;
 	
 	/**
-		Returns  an <code>unsigned short</code><code> </code>that show the readiness state of the track:
-		 <table style="margin: 0px 0px 1.286em;" class="standard-table">
+		Returns  an <code>unsigned short</code> that show the readiness state of the track:
+		 <table class="standard-table">
 		  
 		   <tr>
 		    <td class="header">Constant</td>
@@ -72,22 +75,22 @@ extern class TrackElement extends Element
 		    <td class="header">Description</td>
 		   </tr>
 		   <tr>
-		    <td><code style="font-size: 14px;">NONE</code></td>
+		    <td><code>NONE</code></td>
 		    <td>0</td>
 		    <td>Indicates that the text track's cues have not been obtained.</td>
 		   </tr>
 		   <tr>
-		    <td><code style="font-size: 14px;">LOADING</code></td>
+		    <td><code>LOADING</code></td>
 		    <td>1</td>
 		    <td>Indicates that the text track is loading and there have been no fatal errors encountered so far. Further cues might still be added to the track by the parser.</td>
 		   </tr>
 		   <tr>
-		    <td><code style="font-size: 14px;">LOADED</code></td>
+		    <td><code>LOADED</code></td>
 		    <td>2</td>
 		    <td>Indicates that the text track has been loaded with no fatal errors.</td>
 		   </tr>
 		   <tr>
-		    <td><code style="font-size: 14px;">ERROR</code></td>
+		    <td><code>ERROR</code></td>
 		    <td>3</td>
 		    <td>Indicates that the text track was enabled, but when the user agent attempted to obtain it, this failed in some way. Some or all of the cues are likely missing and will not be obtained.</td>
 		   </tr>
diff --git a/std/js/html/TrackEvent.hx b/std/js/html/TrackEvent.hx
index 03dfd6d2c65ad5f49b6f78092b5d2ccb9c372185..5893d92e31dca17610ca3074bb613fb4280346df 100644
--- a/std/js/html/TrackEvent.hx
+++ b/std/js/html/TrackEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("TrackEvent")
-extern class TrackEvent extends Event
-{
+extern class TrackEvent extends Event {
 	var track(default,null) : haxe.extern.EitherType<VideoTrack,haxe.extern.EitherType<AudioTrack,TextTrack>>;
 	
 	/** @throws DOMError */
diff --git a/std/js/html/TrackEventInit.hx b/std/js/html/TrackEventInit.hx
index c082224d36b54d12d37c8780126e07969e6a9916..5e29ef7692c3e727b8a7ed4a63ddf3260955f3fa 100644
--- a/std/js/html/TrackEventInit.hx
+++ b/std/js/html/TrackEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
 
 package js.html;
 
-typedef TrackEventInit =
-{
-	> EventInit,
-	@:optional var track : haxe.extern.EitherType<VideoTrack,haxe.extern.EitherType<AudioTrack,TextTrack>>;
+typedef TrackEventInit = EventInit & {
+	var ?track : haxe.extern.EitherType<VideoTrack,haxe.extern.EitherType<AudioTrack,TextTrack>>;
 }
\ No newline at end of file
diff --git a/std/js/html/TransitionEvent.hx b/std/js/html/TransitionEvent.hx
index e055d5e676c5a70024dfb1ccba59b7b3e615c470..78e8d6fae8ed6b58108386b8ccbe12ebb4bb1953 100644
--- a/std/js/html/TransitionEvent.hx
+++ b/std/js/html/TransitionEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/TransitionEvent>
 **/
 @:native("TransitionEvent")
-extern class TransitionEvent extends Event
-{
+extern class TransitionEvent extends Event {
 	
 	/**
 		Is a `DOMString` containing the name CSS property associated with the transition.
@@ -41,7 +40,7 @@ extern class TransitionEvent extends Event
 	var propertyName(default,null) : String;
 	
 	/**
-		Is a `float` giving the amount of time the transtion has been running, in seconds, when this event fired. This value is not affected by the `transition-delay` property.
+		Is a `float` giving the amount of time the transition has been running, in seconds, when this event fired. This value is not affected by the `transition-delay` property.
 	**/
 	var elapsedTime(default,null) : Float;
 	
diff --git a/std/js/html/TransitionEventInit.hx b/std/js/html/TransitionEventInit.hx
index 9cc31ff300da0bcd8462151b8ba6245029d58021..cbb6d581f062106a12b7af30b192d61fe8fd8020 100644
--- a/std/js/html/TransitionEventInit.hx
+++ b/std/js/html/TransitionEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,8 @@
 
 package js.html;
 
-typedef TransitionEventInit =
-{
-	> EventInit,
-	@:optional var elapsedTime : Float;
-	@:optional var propertyName : String;
-	@:optional var pseudoElement : String;
+typedef TransitionEventInit = EventInit & {
+	var ?elapsedTime : Float;
+	var ?propertyName : String;
+	var ?pseudoElement : String;
 }
\ No newline at end of file
diff --git a/std/js/html/TreeWalker.hx b/std/js/html/TreeWalker.hx
index 0f40f3f274a5c2ac642d611beaf75793ae2ac8da..8373a87e2d55d2b8b285bd72bec2567a466d4d50 100644
--- a/std/js/html/TreeWalker.hx
+++ b/std/js/html/TreeWalker.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/TreeWalker>
 **/
 @:native("TreeWalker")
-extern class TreeWalker
-{
+extern class TreeWalker {
 	
 	/**
 		Returns a `Node` representing the root node as specified when the `TreeWalker` was created.
@@ -41,7 +40,7 @@ extern class TreeWalker
 	var root(default,null) : Node;
 	
 	/**
-		Returns an <code>unsigned long</code> being a bitmask made of constants describing the types of <code>Node</code> that must to be presented. Non-matching nodes are skipped, but their children may be included, if relevant. The possible values are:
+		Returns an <code>unsigned long</code> being a bitmask made of constants describing the types of <code>Node</code> that must be presented. Non-matching nodes are skipped, but their children may be included, if relevant. The possible values are:
 		 <table class="standard-table">
 		  
 		   <tr>
@@ -57,7 +56,7 @@ extern class TreeWalker
 		   <tr>
 		    <td><code>NodeFilter.SHOW_ATTRIBUTE</code> {{deprecated_inline}}</td>
 		    <td><code>2</code></td>
-		    <td>Shows attribute <code>Attr</code> nodes. This is meaningful only when creating a <code>TreeWalker</code> with an <code>Attr</code> node as its root; in this case, it means that the attribute node will appear in the first position of the iteration or traversal. Since attributes are never children of other nodes, they do not appear when traversing over the document tree.</td>
+		    <td>Shows attribute <code>Attr</code> nodes. This is meaningful only when creating a <code>TreeWalker</code> with an <code>Attr</code> node as its root. In this case, it means that the attribute node will appear in the first position of the iteration or traversal. Since attributes are never children of other nodes, they do not appear when traversing over the document tree.</td>
 		   </tr>
 		   <tr>
 		    <td><code>NodeFilter.SHOW_CDATA_SECTION</code> {{deprecated_inline}}</td>
@@ -123,53 +122,53 @@ extern class TreeWalker
 	/**
 		Returns a `NodeFilter` used to select the relevant nodes.
 	**/
-	var filter(default,null) : NodeFilter;
+	var filter(default,null) : haxe.extern.EitherType<Node -> Int, NodeFilter>;
 	
 	/**
 		Is the `Node` on which the `TreeWalker` is currently pointing at.
 	**/
 	var currentNode : Node;
 	
-	/** @throws DOMError */
 	
 	/**
 		Moves the current `Node` to the first visible ancestor node in the document order, and returns the found node. It also moves the current node to this one. If no such node exists, or if it is before that the root node defined at the object construction, returns `null` and the current node is not changed.
+		@throws DOMError
 	**/
 	function parentNode() : Node;
-	/** @throws DOMError */
 	
 	/**
 		Moves the current `Node` to the first visible child of the current node, and returns the found child. It also moves the current node to this child. If no such child exists, returns `null` and the current node is not changed.
+		@throws DOMError
 	**/
 	function firstChild() : Node;
-	/** @throws DOMError */
 	
 	/**
-		Moves the current `Node` to the last visible child of the current node, and returns the found child. It also moves the current node to this child. If no such child exists, returns `null` and the current node is not changed.
+		Moves the current `Node` to the last visible child of the current node, and returns the found child. It also moves the current node to this child. If no such child exists, `null` is returned and the current node is not changed.
+		@throws DOMError
 	**/
 	function lastChild() : Node;
-	/** @throws DOMError */
 	
 	/**
 		Moves the current `Node` to its previous sibling, if any, and returns the found sibling. If there is no such node, return `null` and the current node is not changed.
+		@throws DOMError
 	**/
 	function previousSibling() : Node;
-	/** @throws DOMError */
 	
 	/**
-		Moves the current `Node` to its next sibling, if any, and returns the found sibling. If there is no such node, return `null` and the current node is not changed.
+		Moves the current `Node` to its next sibling, if any, and returns the found sibling. If there is no such node, `null` is returned and the current node is not changed.
+		@throws DOMError
 	**/
 	function nextSibling() : Node;
-	/** @throws DOMError */
 	
 	/**
-		Moves the current `Node` to the previous visible node in the document order, and returns the found node. It also moves the current node to this one. If no such node exists,or if it is before that the root node defined at the object construction, returns `null` and the current node is not changed.
+		Moves the current `Node` to the previous visible node in the document order, and returns the found node. It also moves the current node to this one. If no such node exists, or if it is before that the root node defined at the object construction, returns `null` and the current node is not changed.
+		@throws DOMError
 	**/
 	function previousNode() : Node;
-	/** @throws DOMError */
 	
 	/**
 		Moves the current `Node` to the next visible node in the document order, and returns the found node. It also moves the current node to this one. If no such node exists, returns `null` and the current node is not changed.
+		@throws DOMError
 	**/
 	function nextNode() : Node;
 }
\ No newline at end of file
diff --git a/std/js/html/UIEvent.hx b/std/js/html/UIEvent.hx
index 314c938cb9d9668dcb54fa526b9337d41e99d7a1..6b9537b5a57ac0c7cacfd6bb3fc8f62a9983f29c 100644
--- a/std/js/html/UIEvent.hx
+++ b/std/js/html/UIEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/UIEvent>
 **/
 @:native("UIEvent")
-extern class UIEvent extends Event
-{
+extern class UIEvent extends Event {
 	static inline var SCROLL_PAGE_UP : Int = -32768;
 	static inline var SCROLL_PAGE_DOWN : Int = 32768;
 	
@@ -75,21 +74,11 @@ extern class UIEvent extends Event
 	var rangeParent(default,null) : Node;
 	var rangeOffset(default,null) : Int;
 	
-	/**
-		Is a `Boolean` indicating whether the bubbling of the event has been canceled or not.
-	**/
-	var cancelBubble : Bool;
-	
-	/**
-		Returns a `Boolean` indicating whether the event produced a key character or not.
-	**/
-	var isChar(default,null) : Bool;
-	
 	/** @throws DOMError */
 	function new( type : String, ?eventInitDict : UIEventInit ) : Void;
 	
 	/**
 		Initializes a `UIEvent` object. If the event has already being dispatched, this method does nothing.
 	**/
-	function initUIEvent( aType : String, aCanBubble : Bool, aCancelable : Bool, aView : Window, aDetail : Int ) : Void;
+	function initUIEvent( aType : String, aCanBubble : Bool = false, aCancelable : Bool = false, ?aView : Window, aDetail : Int = 0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/UIEventInit.hx b/std/js/html/UIEventInit.hx
index ed92a27f0a34659f21485c80497b1db8b5e88770..10bb766c2c1baf182f35bdc25382acff5b7201d9 100644
--- a/std/js/html/UIEventInit.hx
+++ b/std/js/html/UIEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-typedef UIEventInit =
-{
-	> EventInit,
-	@:optional var detail : Int;
-	@:optional var view : Window;
+typedef UIEventInit = EventInit & {
+	var ?detail : Int;
+	var ?view : Window;
 }
\ No newline at end of file
diff --git a/std/js/html/UListElement.hx b/std/js/html/UListElement.hx
index 4fde9929e153d305b534d2b6110b509a0f4f5502..d5f4b933797f206f5a459644e2026046cb72c4a7 100644
--- a/std/js/html/UListElement.hx
+++ b/std/js/html/UListElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLUListElement>
 **/
 @:native("HTMLUListElement")
-extern class UListElement extends Element
-{
+extern class UListElement extends Element {
 	
 	/**
 		Is a `Boolean` indicating that spacing between list items should be reduced. This property reflects the `compact` attribute only, it doesn't consider the `line-height` CSS property used for that behavior in modern pages.
diff --git a/std/js/html/URL.hx b/std/js/html/URL.hx
index 4e08be4a30207628e9838af7602b20ffe1aed6c8..a1dcd8e451990eab16e07b3ed113428497b1c17b 100644
--- a/std/js/html/URL.hx
+++ b/std/js/html/URL.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,19 +25,17 @@
 package js.html;
 
 /**
-	The `URL` interface represent an object providing static methods used for creating object URLs.
+	The URL interface represents an object providing static methods used for creating object URLs.
 
 	Documentation [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/URL$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/URL>
 **/
 @:native("URL")
-extern class URL
-{
+extern class URL {
 	/** @throws DOMError */
-	@:overload( function( blob : Blob, ?options : ObjectURLOptions ) : String {} )
-	@:overload( function( stream : MediaStream, ?options : ObjectURLOptions ) : String {} )
-	static function createObjectURL( source : MediaSource, ?options : ObjectURLOptions ) : String;
+	@:overload( function( blob : Blob ) : String {} )
+	static function createObjectURL( source : MediaSource ) : String;
 	/** @throws DOMError */
 	static function revokeObjectURL( url : String ) : Void;
 	
@@ -67,7 +65,7 @@ extern class URL
 	var password : String;
 	
 	/**
-		Is a `DOMString` containing the host, that is the hostname, a `':'`, and the port of the URL.
+		Is a `DOMString` containing the domain (that is the hostname) followed by (if a port was specified) a `':'` and the port of the URL.
 	**/
 	var host : String;
 	
@@ -102,6 +100,6 @@ extern class URL
 	var hash : String;
 	
 	/** @throws DOMError */
-	@:overload( function( url : String, base : URL ) : Void {} )
 	function new( url : String, ?base : String ) : Void;
+	function toJSON() : String;
 }
\ No newline at end of file
diff --git a/std/js/html/URLSearchParams.hx b/std/js/html/URLSearchParams.hx
index 066fa2ab6e87c8990ef62a6104ea7d135d864cc0..8aaa40bb7663b842623b8221a4d99ec645e074dd 100644
--- a/std/js/html/URLSearchParams.hx
+++ b/std/js/html/URLSearchParams.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,18 +32,21 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams>
 **/
 @:native("URLSearchParams")
-extern class URLSearchParams
-{
+extern class URLSearchParams {
 	/** @throws DOMError */
-	@:overload( function( ?init : String = "" ) : Void {} )
-	function new( init : URLSearchParams ) : Void;
+	@:overload( function( ?init : haxe.DynamicAccess<String>) : URLSearchParams {} )
+	@:overload( function( init : String = "") : URLSearchParams {} )
+	function new( ?init : Array<Array<String>> ) : Void;
 	
 	/**
 		Appends a specified key/value pair as a new search parameter.
 	**/
 	function append( name : String, value : String ) : Void;
-	@:native("delete")
-	function delete_( name : String ) : Void;
+	
+	/**
+		Deletes the given search parameter, and its associated value, from the list of all search parameters.
+	**/
+	function delete( name : String ) : Void;
 	
 	/**
 		Returns the first value associated to the given search parameter.
@@ -51,7 +54,7 @@ extern class URLSearchParams
 	function get( name : String ) : String;
 	
 	/**
-		Returns all the values association with a given search parameter.
+		Returns all the values associated with a given search parameter.
 	**/
 	function getAll( name : String ) : Array<String>;
 	
@@ -64,22 +67,28 @@ extern class URLSearchParams
 		Sets the value associated to a given search parameter to the given value. If there were several values, delete the others.
 	**/
 	function set( name : String, value : String ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Sorts all key/value pairs, if any, by their keys.
+		@throws DOMError
+	**/
+	function sort() : Void;
 	
 	/**
 		Returns an `Iteration_protocols` allowing to go through all key/value pairs contained in this object.
+		@throws DOMError
 	**/
 	function entries() : URLSearchParamsIterator;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `Iteration_protocols` allowing to go through all keys of the key/value pairs contained in this object.
+		@throws DOMError
 	**/
 	function keys() : URLSearchParamsIterator;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `Iteration_protocols` allowing to go through all values of the key/value pairs contained in this object.
+		@throws DOMError
 	**/
 	function values() : URLSearchParamsIterator;
 	/** @throws DOMError */
diff --git a/std/js/html/URLSearchParamsIterator.hx b/std/js/html/URLSearchParamsIterator.hx
index c57d93f721defc708269029f9ee578ecad851db8..a003691462f5f06aa820a1c4693452ca70dd5b0c 100644
--- a/std/js/html/URLSearchParamsIterator.hx
+++ b/std/js/html/URLSearchParamsIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html;
 
-@:native("URLSearchParamsIterator")
-extern class URLSearchParamsIterator
-{
+typedef URLSearchParamsIterator = {
 	/** @throws DOMError */
 	function next() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/Uint16Array.hx b/std/js/html/Uint16Array.hx
index 0530f77eb254f31a2c864b0734d3a879f3d3455b..d47d2175c2e0005230acf65aad54e65bfec7b12d 100644
--- a/std/js/html/Uint16Array.hx
+++ b/std/js/html/Uint16Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,23 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-@:native("Uint16Array")
-extern class Uint16Array extends ArrayBufferView implements ArrayAccess<Int>
-{
-	static inline var BYTES_PER_ELEMENT : Int = 2;
-	
-	var length(default,null) : Int;
-	
-	/** @throws DOMError */
-	@:overload( function( length : Int ) : Void {} )
-	@:overload( function( array : Uint16Array ) : Void {} )
-	@:overload( function( array : Array<Int> ) : Void {} )
-	function new( buffer : ArrayBuffer, ?byteOffset : Int, ?length : Int ) : Void;
-	@:overload( function( array : Uint16Array, ?offset : Int ) : Void {} )
-	function set( array : Array<Int>, ?offset : Int ) : Void;
-	function subarray( start : Int, ?end : Int ) : Uint16Array;
-}
\ No newline at end of file
+@:deprecated typedef Uint16Array = js.lib.Uint16Array;
diff --git a/std/js/html/Uint32Array.hx b/std/js/html/Uint32Array.hx
index 4c32bf8dff896c08530e8acc55fe8d233f74adf0..c67f792fdd828b7c434eb2831277eae04907aeca 100644
--- a/std/js/html/Uint32Array.hx
+++ b/std/js/html/Uint32Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,23 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-@:native("Uint32Array")
-extern class Uint32Array extends ArrayBufferView implements ArrayAccess<Int>
-{
-	static inline var BYTES_PER_ELEMENT : Int = 4;
-	
-	var length(default,null) : Int;
-	
-	/** @throws DOMError */
-	@:overload( function( length : Int ) : Void {} )
-	@:overload( function( array : Uint32Array ) : Void {} )
-	@:overload( function( array : Array<Int> ) : Void {} )
-	function new( buffer : ArrayBuffer, ?byteOffset : Int, ?length : Int ) : Void;
-	@:overload( function( array : Uint32Array, ?offset : Int ) : Void {} )
-	function set( array : Array<Int>, ?offset : Int ) : Void;
-	function subarray( start : Int, ?end : Int ) : Uint32Array;
-}
\ No newline at end of file
+@:deprecated typedef Uint32Array = js.lib.Uint32Array;
diff --git a/std/js/html/Uint8Array.hx b/std/js/html/Uint8Array.hx
index 9e572bfbe5717e1cdfe41559f9d756fec987d4ee..b9b5d994bc80f68c49150b81abc8a41cbe3ab93a 100644
--- a/std/js/html/Uint8Array.hx
+++ b/std/js/html/Uint8Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,26 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-// Explicitly include the compatibility class
-import js.html.compat.Uint8Array;
-
-@:native("Uint8Array")
-extern class Uint8Array extends ArrayBufferView implements ArrayAccess<Int>
-{
-	static inline var BYTES_PER_ELEMENT : Int = 1;
-	
-	var length(default,null) : Int;
-	
-	/** @throws DOMError */
-	@:overload( function( length : Int ) : Void {} )
-	@:overload( function( array : Uint8Array ) : Void {} )
-	@:overload( function( array : Array<Int> ) : Void {} )
-	function new( buffer : ArrayBuffer, ?byteOffset : Int, ?length : Int ) : Void;
-	@:overload( function( array : Uint8Array, ?offset : Int ) : Void {} )
-	function set( array : Array<Int>, ?offset : Int ) : Void;
-	function subarray( start : Int, ?end : Int ) : Uint8Array;
-}
\ No newline at end of file
+@:deprecated typedef Uint8Array = js.lib.Uint8Array;
diff --git a/std/js/html/Uint8ClampedArray.hx b/std/js/html/Uint8ClampedArray.hx
index 6c7d9813c7100c74ccb15835f1047d75fb2e5c28..e0ce017ec147a2d775b269404f518142ffebf7c7 100644
--- a/std/js/html/Uint8ClampedArray.hx
+++ b/std/js/html/Uint8ClampedArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,23 +20,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from typedarray.webidl. Do not edit!
-
 package js.html;
 
-@:native("Uint8ClampedArray")
-extern class Uint8ClampedArray extends ArrayBufferView implements ArrayAccess<Int>
-{
-	static inline var BYTES_PER_ELEMENT : Int = 1;
-	
-	var length(default,null) : Int;
-	
-	/** @throws DOMError */
-	@:overload( function( length : Int ) : Void {} )
-	@:overload( function( array : Uint8ClampedArray ) : Void {} )
-	@:overload( function( array : Array<Int> ) : Void {} )
-	function new( buffer : ArrayBuffer, ?byteOffset : Int, ?length : Int ) : Void;
-	@:overload( function( array : Uint8ClampedArray, ?offset : Int ) : Void {} )
-	function set( array : Array<Int>, ?offset : Int ) : Void;
-	function subarray( start : Int, ?end : Int ) : Uint8ClampedArray;
-}
\ No newline at end of file
+@:deprecated typedef Uint8ClampedArray = js.lib.Uint8ClampedArray;
diff --git a/std/js/html/UnknownElement.hx b/std/js/html/UnknownElement.hx
index 46e0e178c3fd4664749a71527085dee5b58cfe0a..aaea44a245c777ab8af2459d1efe44f2a795aff9 100644
--- a/std/js/html/UnknownElement.hx
+++ b/std/js/html/UnknownElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLUnknownElement>
 **/
 @:native("HTMLUnknownElement")
-extern class UnknownElement extends Element
-{
+extern class UnknownElement extends Element {
 }
\ No newline at end of file
diff --git a/std/js/html/VTTCue.hx b/std/js/html/VTTCue.hx
index 5c57b65fb3dd818c47bed5e6e17e7707550bae9b..1989a6229d1c9a4ff9d9ca2a6924c5a08cad1bfa 100644
--- a/std/js/html/VTTCue.hx
+++ b/std/js/html/VTTCue.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,17 +24,23 @@
 
 package js.html;
 
+/**
+	VTTCues represent a cue in a text track.
+
+	Documentation [VTTCue](https://developer.mozilla.org/en-US/docs/Web/API/VTTCue) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/VTTCue$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/VTTCue>
+**/
 @:native("VTTCue")
-extern class VTTCue extends TextTrackCue
-{
+extern class VTTCue extends TextTrackCue {
 	var region : VTTRegion;
 	var vertical : DirectionSetting;
 	var snapToLines : Bool;
-	var line : haxe.extern.EitherType<Int,Dynamic/*MISSING AutoKeyword*/>;
-	var lineAlign : AlignSetting;
-	var position : Int;
-	var positionAlign : AlignSetting;
-	var size : Int;
+	var line : haxe.extern.EitherType<Float,AutoKeyword>;
+	var lineAlign : LineAlignSetting;
+	var position : haxe.extern.EitherType<Float,AutoKeyword>;
+	var positionAlign : PositionAlignSetting;
+	var size : Float;
 	var align : AlignSetting;
 	var text : String;
 	
diff --git a/std/js/html/VTTRegion.hx b/std/js/html/VTTRegion.hx
index 3660883263732007bdced753c98dce29f20fbb70..2a587c70905e6c48b51c3f0418005a4fb6f5385a 100644
--- a/std/js/html/VTTRegion.hx
+++ b/std/js/html/VTTRegion.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,15 @@
 package js.html;
 
 @:native("VTTRegion")
-extern class VTTRegion
-{
+extern class VTTRegion {
+	var id : String;
 	var width : Float;
 	var lines : Int;
 	var regionAnchorX : Float;
 	var regionAnchorY : Float;
 	var viewportAnchorX : Float;
 	var viewportAnchorY : Float;
-	var scroll : String;
+	var scroll : ScrollSetting;
 	
 	/** @throws DOMError */
 	function new() : Void;
diff --git a/std/js/html/ValidityState.hx b/std/js/html/ValidityState.hx
index 96e6afb4d4360b093a9eaa551e8f85dea2d2ca87..58b332faf5280dff213ab3727682d58c355f7f34 100644
--- a/std/js/html/ValidityState.hx
+++ b/std/js/html/ValidityState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ValidityState>
 **/
 @:native("ValidityState")
-extern class ValidityState
-{
+extern class ValidityState {
 	
 	/**
 		Is a `Boolean` indicating the element has a `required` attribute, but no value.
@@ -55,6 +54,11 @@ extern class ValidityState
 	**/
 	var tooLong(default,null) : Bool;
 	
+	/**
+		Is a `Boolean` indicating the value fails to meet the specified `minlength` for `HTMLInputElement` or `HTMLTextAreaElement` objects.
+	**/
+	var tooShort(default,null) : Bool;
+	
 	/**
 		Is a `Boolean` indicating the value is less than the minimum specified by the `min` attribute.
 	**/
diff --git a/std/js/html/VideoElement.hx b/std/js/html/VideoElement.hx
index 5e97108bc8476f7b48c82a8fa097ec3fe4d3a64e..7fe1884cc0225c051e6b16cf15f37d918f6fdcc9 100644
--- a/std/js/html/VideoElement.hx
+++ b/std/js/html/VideoElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLVideoElement>
 **/
 @:native("HTMLVideoElement")
-extern class VideoElement extends MediaElement
-{
+extern class VideoElement extends MediaElement {
 	
 	/**
 		Is a `DOMString` that reflects the `width` HTML attribute, which specifies the width of the display area, in CSS pixels.
diff --git a/std/js/html/VideoPlaybackQuality.hx b/std/js/html/VideoPlaybackQuality.hx
index 22cd2e2bcc6f803214339766c4434d92f03969a8..6b0dc6f28a8b9aa17f125da3bdd190c6e5fae5a8 100644
--- a/std/js/html/VideoPlaybackQuality.hx
+++ b/std/js/html/VideoPlaybackQuality.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/VideoPlaybackQuality>
 **/
 @:native("VideoPlaybackQuality")
-extern class VideoPlaybackQuality
-{
+extern class VideoPlaybackQuality {
 	
 	/**
 		A `DOMHighResTimeStamp` containing the time in miliseconds since the start of the navigation and the creation of the object.
diff --git a/std/js/html/VideoStreamTrack.hx b/std/js/html/VideoStreamTrack.hx
index 631f4998feb652ef483a05ec7a647f9e45f4b7a5..15ef3deac9242cc00156a57a76dddb39ee2b134e 100644
--- a/std/js/html/VideoStreamTrack.hx
+++ b/std/js/html/VideoStreamTrack.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,5 @@
 package js.html;
 
 @:native("VideoStreamTrack")
-extern class VideoStreamTrack extends MediaStreamTrack
-{
+extern class VideoStreamTrack extends MediaStreamTrack {
 }
\ No newline at end of file
diff --git a/std/js/html/VideoTrack.hx b/std/js/html/VideoTrack.hx
index d9da4fd1ba46e2b93e26630ec7b4388e1080a1d7..3663993918986fbc6acde9111237a98a7843071c 100644
--- a/std/js/html/VideoTrack.hx
+++ b/std/js/html/VideoTrack.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("VideoTrack")
-extern class VideoTrack
-{
+extern class VideoTrack {
 	var id(default,null) : String;
 	var kind(default,null) : String;
 	var label(default,null) : String;
diff --git a/std/js/html/VideoTrackList.hx b/std/js/html/VideoTrackList.hx
index 1a90c9b58b6bbf1912bc61506ff20b3b89eb396d..23b505a22de6ac313da9bbb779c2d8e0c72d2301 100644
--- a/std/js/html/VideoTrackList.hx
+++ b/std/js/html/VideoTrackList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html;
 
 @:native("VideoTrackList")
-extern class VideoTrackList extends EventTarget implements ArrayAccess<VideoTrack>
-{
+extern class VideoTrackList extends EventTarget implements ArrayAccess<VideoTrack> {
 	var length(default,null) : Int;
 	var selectedIndex(default,null) : Int;
 	var onchange : haxe.Constraints.Function;
diff --git a/std/js/html/VisibilityState.hx b/std/js/html/VisibilityState.hx
index 43a94c5624c56932c010407c70fad6adfc516746..8651e0d63feb9a8d224f77cec2229a6a9ea82a81 100644
--- a/std/js/html/VisibilityState.hx
+++ b/std/js/html/VisibilityState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html;
 
-@:enum abstract VisibilityState(String)
-{
+enum abstract VisibilityState(String) {
 	var HIDDEN = "hidden";
 	var VISIBLE = "visible";
 }
\ No newline at end of file
diff --git a/std/js/html/VisualViewport.hx b/std/js/html/VisualViewport.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3c63cc9a33fc618960e78b0c163e8d38fd8e9427
--- /dev/null
+++ b/std/js/html/VisualViewport.hx
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\VisualViewport.webidl. Do not edit!
+
+package js.html;
+
+/**
+	The `VisualViewport` interface of the the Visual Viewport API represents the visual viewport for a given window. For a page containing iframes, each iframe, as well as the containing page, will have a unique window object. Each window on a page will have a unique `VisualViewport` representing the properties associated with that window.
+
+	Documentation [VisualViewport](https://developer.mozilla.org/en-US/docs/Web/API/VisualViewport) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/VisualViewport$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/VisualViewport>
+**/
+@:native("VisualViewport")
+extern class VisualViewport extends EventTarget {
+	
+	/**
+		Returns the offset of the left edge of the visual viewport from the left edge of the layout viewport in CSS pixels.
+	**/
+	var offsetLeft(default,null) : Float;
+	
+	/**
+		Returns the offset of the top edge of the visual viewport from the top edge of the layout viewport in CSS pixels.
+	**/
+	var offsetTop(default,null) : Float;
+	
+	/**
+		Returns the x coordinate relative to the initial containing block origin of the top edge of the visual viewport in CSS pixels.
+	**/
+	var pageLeft(default,null) : Float;
+	
+	/**
+		Returns the y coordinate relative to the initial containing block origin of the top edge of the visual viewport in CSS pixels.
+	**/
+	var pageTop(default,null) : Float;
+	
+	/**
+		Returns the width of the visual viewport in CSS pixels.
+	**/
+	var width(default,null) : Float;
+	
+	/**
+		Returns the height of the visual viewport in CSS pixels.
+	**/
+	var height(default,null) : Float;
+	
+	/**
+		Returns the pinch-zoom scaling factor applied to the visual viewport.
+	**/
+	var scale(default,null) : Float;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/WebSocket.hx b/std/js/html/WebSocket.hx
index 8385f278bde590cb83390abb76c21b2696ceed49..3e2966453f66c66cf6f0bdd975504e20779bc8c5 100644
--- a/std/js/html/WebSocket.hx
+++ b/std/js/html/WebSocket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,22 +32,61 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebSocket>
 **/
 @:native("WebSocket")
-extern class WebSocket extends EventTarget
-{
+extern class WebSocket extends EventTarget {
 	static inline var CONNECTING : Int = 0;
 	static inline var OPEN : Int = 1;
 	static inline var CLOSING : Int = 2;
 	static inline var CLOSED : Int = 3;
 	
+	
+	/**
+		The absolute URL of the WebSocket.
+	**/
 	var url(default,null) : String;
+	
+	/**
+		The current state of the connection.
+	**/
 	var readyState(default,null) : Int;
+	
+	/**
+		The number of bytes of queued data.
+	**/
 	var bufferedAmount(default,null) : Int;
+	
+	/**
+		An event listener to be called when the connection is opened.
+	**/
 	var onopen : haxe.Constraints.Function;
+	
+	/**
+		An event listener to be called when an error occurs.
+	**/
 	var onerror : haxe.Constraints.Function;
+	
+	/**
+		An event listener to be called when the connection is closed.
+	**/
 	var onclose : haxe.Constraints.Function;
+	
+	/**
+		The extensions selected by the server.
+	**/
 	var extensions(default,null) : String;
+	
+	/**
+		The sub-protocol selected by the server.
+	**/
 	var protocol(default,null) : String;
+	
+	/**
+		An event listener to be called when a message is received from the server.
+	**/
 	var onmessage : haxe.Constraints.Function;
+	
+	/**
+		The binary data type used by the connection.
+	**/
 	var binaryType : BinaryType;
 	
 	/** @throws DOMError */
@@ -59,6 +98,6 @@ extern class WebSocket extends EventTarget
 	/** @throws DOMError */
 	@:overload( function( data : String ) : Void {} )
 	@:overload( function( data : Blob ) : Void {} )
-	@:overload( function( data : ArrayBuffer ) : Void {} )
-	function send( data : ArrayBufferView ) : Void;
+	@:overload( function( data : js.lib.ArrayBuffer ) : Void {} )
+	function send( data : js.lib.ArrayBufferView ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/WheelEvent.hx b/std/js/html/WheelEvent.hx
index 3fc512cb9a9a72f3c96d30ad651ec51c65ae6e26..207481a7f6895d49afae76f517194957e8749a43 100644
--- a/std/js/html/WheelEvent.hx
+++ b/std/js/html/WheelEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent>
 **/
 @:native("WheelEvent")
-extern class WheelEvent extends MouseEvent
-{
+extern class WheelEvent extends MouseEvent {
 	static inline var DOM_DELTA_PIXEL : Int = 0;
 	static inline var DOM_DELTA_LINE : Int = 1;
 	static inline var DOM_DELTA_PAGE : Int = 2;
diff --git a/std/js/html/WheelEventInit.hx b/std/js/html/WheelEventInit.hx
index 222763df3ebd8f250812917e42e5935d972aee15..ec711f1234062447d814894e16cb868c50132e76 100644
--- a/std/js/html/WheelEventInit.hx
+++ b/std/js/html/WheelEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,9 @@
 
 package js.html;
 
-typedef WheelEventInit =
-{
-	> MouseEventInit,
-	@:optional var deltaMode : Int;
-	@:optional var deltaX : Float;
-	@:optional var deltaY : Float;
-	@:optional var deltaZ : Float;
+typedef WheelEventInit = MouseEventInit & {
+	var ?deltaMode : Int;
+	var ?deltaX : Float;
+	var ?deltaY : Float;
+	var ?deltaZ : Float;
 }
\ No newline at end of file
diff --git a/std/js/html/Window.hx b/std/js/html/Window.hx
index d6708192dc5a4c348bedb6f2b65c61151c9c25a8..84837b92c0a3bd83257328375146bafa5818844d 100644
--- a/std/js/html/Window.hx
+++ b/std/js/html/Window.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,217 +24,230 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
-	The `window` object represents a window containing a DOM document; the `document` property points to the DOM document loaded in that window.
+	The `Window` interface represents a window containing a DOM document; the `document` property points to the DOM document loaded in that window.
 
 	Documentation [Window](https://developer.mozilla.org/en-US/docs/Web/API/Window) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/Window$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Window>
 **/
 @:native("Window")
-extern class Window extends EventTarget
-{
-	
+extern class Window extends EventTarget {
+
 	/**
 		Returns a reference to the current window.
 	**/
 	var window(default,null) : Window;
-	
+
 	/**
 		Returns an object reference to the window object itself.
 	**/
 	var self(default,null) : Window;
-	
+
 	/**
 		Returns a reference to the document that the window contains.
 	**/
 	var document(default,null) : HTMLDocument;
-	
+
 	/**
 		Gets/sets the name of the window.
 	**/
 	var name : String;
-	
+
 	/**
 		Gets/sets the location, or current URL, of the window object.
 	**/
 	var location(default,null) : Location;
-	
+
 	/**
 		Returns a reference to the history object.
 	**/
 	var history(default,null) : History;
-	
+
 	/**
 		Returns the locationbar object, whose visibility can be toggled in the window.
 	**/
 	var locationbar(default,null) : BarProp;
-	
+
 	/**
 		Returns the menubar object, whose visibility can be toggled in the window.
 	**/
 	var menubar(default,null) : BarProp;
-	
+
 	/**
 		Returns the personalbar object, whose visibility can be toggled in the window.
 	**/
 	var personalbar(default,null) : BarProp;
-	
+
 	/**
 		Returns the scrollbars object, whose visibility can be toggled in the window.
 	**/
 	var scrollbars(default,null) : BarProp;
-	
+
 	/**
 		Returns the statusbar object, whose visibility can be toggled in the window.
 	**/
 	var statusbar(default,null) : BarProp;
-	
+
 	/**
 		Returns the toolbar object, whose visibility can be toggled in the window.
 	**/
 	var toolbar(default,null) : BarProp;
-	
+
 	/**
 		Gets/sets the text in the statusbar at the bottom of the browser.
 	**/
 	var status : String;
-	
+
 	/**
 		This property indicates whether the current window is closed or not.
 	**/
 	var closed(default,null) : Bool;
-	
+
+	/**
+		Returns the current event, which is the event currently being handled by the JavaScript code's context, or `undefined` if no event is currently being handled. The `Event` object passed directly to event handlers should be used instead whenever possible.
+	**/
+	var event(default,null) : Dynamic;
+
 	/**
 		Returns an array of the subframes in the current window.
 	**/
 	var frames(default,null) : Window;
-	
+
 	/**
 		Returns the number of frames in the window. See also `window.frames`.
 	**/
 	var length(default,null) : Int;
-	
+
 	/**
 		Returns a reference to the topmost window in the window hierarchy. This property is read only.
 	**/
 	var top(default,null) : Window;
-	
+
 	/**
 		Returns a reference to the window that opened this current window.
 	**/
 	var opener : Dynamic;
-	
+
 	/**
 		Returns a reference to the parent of the current window or subframe.
 	**/
 	var parent(default,null) : Window;
-	
+
 	/**
 		Returns the element in which the window is embedded, or null if the window is not embedded.
 	**/
 	var frameElement(default,null) : Element;
-	
+
 	/**
 		Returns a reference to the navigator object.
 	**/
 	var navigator(default,null) : Navigator;
-	
+
 	/**
-		Returns the orientation in degrees (in 90 degree increments) of the viewport relative to the device's natural orientation.
+		Returns a reference to the console object which provides access to the browser's debugging console.
 	**/
-	var orientation(default,null) : Int;
-	var onorientationchange : haxe.Constraints.Function;
-	
+	var console(default,null) : ConsoleInstance;
+
 	/**
 		Returns a reference to the screen object associated with the window.
 	**/
 	var screen(default,null) : Screen;
-	
+
 	/**
 		Gets the width of the content area of the browser window including, if rendered, the vertical scrollbar.
 	**/
 	var innerWidth : Dynamic;
-	
+
 	/**
 		Gets the height of the content area of the browser window including, if rendered, the horizontal scrollbar.
 	**/
 	var innerHeight : Dynamic;
-	
+
 	/**
 		Returns the number of pixels that the document has already been scrolled horizontally.
 	**/
-	var scrollX(default,null) : Int;
-	var pageXOffset(default,null) : Int;
-	
+	var scrollX(default,null) : Float;
+
+	/**
+		An alias for `window.scrollX`.
+	**/
+	var pageXOffset(default,null) : Float;
+
 	/**
 		Returns the number of pixels that the document has already been scrolled vertically.
 	**/
-	var scrollY(default,null) : Int;
-	var pageYOffset(default,null) : Int;
-	
+	var scrollY(default,null) : Float;
+
+	/**
+		An alias for `window.scrollY`
+	**/
+	var pageYOffset(default,null) : Float;
+
 	/**
 		Returns the horizontal distance of the left border of the user's browser from the left side of the screen.
 	**/
 	var screenX : Dynamic;
-	
+
 	/**
 		Returns the vertical distance of the top border of the user's browser from the top side of the screen.
 	**/
 	var screenY : Dynamic;
-	
+
 	/**
 		Gets the width of the outside of the browser window.
 	**/
 	var outerWidth : Dynamic;
-	
+
 	/**
 		Gets the height of the outside of the browser window.
 	**/
 	var outerHeight : Dynamic;
-	
+
 	/**
-		Provides a hosting area for performance related attributes.
+		Returns a `Performance` object, which includes the `Performance.timing` and `Performance.navigation` attributes, each of which is an object providing performance-related data. See also Using Navigation Timing for additional information and examples.
 	**/
 	var performance(default,null) : Performance;
-	
+
 	/**
 		Returns the ratio between physical pixels and device independent pixels in the current display.
 	**/
 	var devicePixelRatio(default,null) : Float;
-	
+
 	/**
 		The maximum offset that the window can be scrolled to horizontally, that is the document width minus the viewport width.
 	**/
 	var scrollMaxX(default,null) : Int;
-	
+
 	/**
 		The maximum offset that the window can be scrolled to vertically (i.e., the document height minus the viewport height).
 	**/
 	var scrollMaxY(default,null) : Int;
-	
+
 	/**
 		This property indicates whether the window is displayed in full screen or not.
 	**/
 	var fullScreen : Bool;
-	var onwheel : haxe.Constraints.Function;
 	var ondevicemotion : haxe.Constraints.Function;
 	var ondeviceorientation : haxe.Constraints.Function;
 	var onabsolutedeviceorientation : haxe.Constraints.Function;
 	var ondeviceproximity : haxe.Constraints.Function;
 	var onuserproximity : haxe.Constraints.Function;
 	var ondevicelight : haxe.Constraints.Function;
-	
+
 	/**
-		Returns a reference to the content element in the current window. The obsolete variant with underscore is no longer available from Web content.
+		Returns a reference to the content element in the current window. Since Firefox 57 (initially Nightly-only), both versions are only available from chrome (privileged) code, and not available to the web anymore.
 	**/
 	var content(default,null) : Dynamic;
-	
+
 	/**
-		Returns a reference to the console object which provides access to the browser's debugging console.
+		Returns the orientation in degrees (in 90 degree increments) of the viewport relative to the device's natural orientation.
 	**/
-	var console(default,null) : Console;
-	
+	var orientation(default,null) : Int;
+	var onorientationchange : haxe.Constraints.Function;
+
 	/**
 		Returns the browser crypto object.
 	**/
@@ -242,15 +255,18 @@ extern class Window extends EventTarget
 	var onabort : haxe.Constraints.Function;
 	var onblur : haxe.Constraints.Function;
 	var onfocus : haxe.Constraints.Function;
+	var onauxclick : haxe.Constraints.Function;
 	var oncanplay : haxe.Constraints.Function;
 	var oncanplaythrough : haxe.Constraints.Function;
 	var onchange : haxe.Constraints.Function;
 	var onclick : haxe.Constraints.Function;
+	var onclose : haxe.Constraints.Function;
 	var oncontextmenu : haxe.Constraints.Function;
 	var ondblclick : haxe.Constraints.Function;
 	var ondrag : haxe.Constraints.Function;
 	var ondragend : haxe.Constraints.Function;
 	var ondragenter : haxe.Constraints.Function;
+	var ondragexit : haxe.Constraints.Function;
 	var ondragleave : haxe.Constraints.Function;
 	var ondragover : haxe.Constraints.Function;
 	var ondragstart : haxe.Constraints.Function;
@@ -266,6 +282,7 @@ extern class Window extends EventTarget
 	var onload : haxe.Constraints.Function;
 	var onloadeddata : haxe.Constraints.Function;
 	var onloadedmetadata : haxe.Constraints.Function;
+	var onloadend : haxe.Constraints.Function;
 	var onloadstart : haxe.Constraints.Function;
 	var onmousedown : haxe.Constraints.Function;
 	var onmouseenter : haxe.Constraints.Function;
@@ -274,6 +291,7 @@ extern class Window extends EventTarget
 	var onmouseout : haxe.Constraints.Function;
 	var onmouseover : haxe.Constraints.Function;
 	var onmouseup : haxe.Constraints.Function;
+	var onwheel : haxe.Constraints.Function;
 	var onpause : haxe.Constraints.Function;
 	var onplay : haxe.Constraints.Function;
 	var onplaying : haxe.Constraints.Function;
@@ -292,6 +310,8 @@ extern class Window extends EventTarget
 	var ontimeupdate : haxe.Constraints.Function;
 	var onvolumechange : haxe.Constraints.Function;
 	var onwaiting : haxe.Constraints.Function;
+	var onselectstart : haxe.Constraints.Function;
+	var ontoggle : haxe.Constraints.Function;
 	var onpointercancel : haxe.Constraints.Function;
 	var onpointerdown : haxe.Constraints.Function;
 	var onpointerup : haxe.Constraints.Function;
@@ -302,13 +322,20 @@ extern class Window extends EventTarget
 	var onpointerleave : haxe.Constraints.Function;
 	var ongotpointercapture : haxe.Constraints.Function;
 	var onlostpointercapture : haxe.Constraints.Function;
-	var onfullscreenchange : haxe.Constraints.Function;
-	var onfullscreenerror : haxe.Constraints.Function;
-	var onpointerlockchange : haxe.Constraints.Function;
-	var onpointerlockerror : haxe.Constraints.Function;
-	var indexedDB(default,null) : js.html.idb.Factory;
-	var onerror : haxe.extern.EitherType<Event,String> -> String -> Int -> Int -> Dynamic -> Bool;
-	
+	var onanimationcancel : haxe.Constraints.Function;
+	var onanimationend : haxe.Constraints.Function;
+	var onanimationiteration : haxe.Constraints.Function;
+	var onanimationstart : haxe.Constraints.Function;
+	var ontransitioncancel : haxe.Constraints.Function;
+	var ontransitionend : haxe.Constraints.Function;
+	var ontransitionrun : haxe.Constraints.Function;
+	var ontransitionstart : haxe.Constraints.Function;
+	var onwebkitanimationend : haxe.Constraints.Function;
+	var onwebkitanimationiteration : haxe.Constraints.Function;
+	var onwebkitanimationstart : haxe.Constraints.Function;
+	var onwebkittransitionend : haxe.Constraints.Function;
+	var onerror : haxe.extern.EitherType<Event,String> -> String -> Int -> Int -> Dynamic -> Dynamic;
+
 	/**
 		Returns a `SpeechSynthesis` object, which is the entry point into using Web Speech API speech synthesis functionality.
 	**/
@@ -319,10 +346,11 @@ extern class Window extends EventTarget
 	var ontouchcancel : haxe.Constraints.Function;
 	var onafterprint : haxe.Constraints.Function;
 	var onbeforeprint : haxe.Constraints.Function;
-	var onbeforeunload : Event -> String;
+	var onbeforeunload : Event -> Null<String>;
 	var onhashchange : haxe.Constraints.Function;
 	var onlanguagechange : haxe.Constraints.Function;
 	var onmessage : haxe.Constraints.Function;
+	var onmessageerror : haxe.Constraints.Function;
 	var onoffline : haxe.Constraints.Function;
 	var ononline : haxe.Constraints.Function;
 	var onpagehide : haxe.Constraints.Function;
@@ -330,210 +358,251 @@ extern class Window extends EventTarget
 	var onpopstate : haxe.Constraints.Function;
 	var onstorage : haxe.Constraints.Function;
 	var onunload : haxe.Constraints.Function;
-	
+
 	/**
 		Returns a reference to the local storage object used to store data that may only be accessed by the origin that created it.
 	**/
 	var localStorage(default,null) : Storage;
-	
+	var origin(default,null) : String;
+
+	/**
+		Indicates whether a context is capable of using features that require secure contexts.
+	**/
+	var isSecureContext(default,null) : Bool;
+	var indexedDB(default,null) : js.html.idb.Factory;
+	var caches(default,null) : CacheStorage;
+
 	/**
-		Returns a storage object for storing data within a single page session.
+		Returns a reference to the session storage object used to store data that may only be accessed by the origin that created it.
 	**/
 	var sessionStorage(default,null) : Storage;
-	
-	/** @throws DOMError */
-	
+
+
 	/**
 		Closes the current window.
+		@throws DOMError
 	**/
 	function close() : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		This method stops window loading.
+		@throws DOMError
 	**/
 	function stop() : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Sets focus on the current window.
+		@throws DOMError
 	**/
 	function focus() : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Sets focus away from the window.
+		@throws DOMError
 	**/
 	function blur() : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Opens a new window.
+		@throws DOMError
 	**/
-	function open( ?url : String = "", ?target : String = "", ?features : String = "" ) : Window;
-	/** @throws DOMError */
-	@:overload( function() : Void {} )
-	
+	function open( url : String = "", target : String = "", features : String = "" ) : Window;
+
 	/**
 		Displays an alert dialog.
+		@throws DOMError
 	**/
+	@:overload( function() : Void {} )
 	function alert( message : String ) : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Displays a dialog with a message that the user needs to respond to.
+		@throws DOMError
 	**/
-	function confirm( ?message : String = "" ) : Bool;
-	/** @throws DOMError */
-	
+	function confirm( message : String = "" ) : Bool;
+
 	/**
 		Returns the text entered by the user in a prompt dialog.
+		@throws DOMError
 	**/
-	function prompt( ?message : String = "", ?default_ : String = "" ) : String;
-	/** @throws DOMError */
-	
+	function prompt( message : String = "", default_ : String = "" ) : String;
+
 	/**
 		Opens the Print Dialog to print the current document.
+		@throws DOMError
 	**/
 	function print() : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Provides a secure means for one window to send a string of data to another window, which need not be within the same domain as the first.
+		@throws DOMError
 	**/
 	function postMessage( message : Dynamic, targetOrigin : String, ?transfer : Array<Dynamic> ) : Void;
-	
+
 	/**
 		Registers the window to capture all events of the specified type.
 	**/
 	function captureEvents() : Void;
-	
+
 	/**
 		Releases the window from trapping events of a specific type.
 	**/
 	function releaseEvents() : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Returns the selection object representing the selected item(s).
+		@throws DOMError
 	**/
 	function getSelection() : Selection;
-	/** @throws DOMError */
-	
+
 	/**
 		Gets computed style for the specified element. Computed style indicates the computed values of all CSS properties of the element.
+		@throws DOMError
 	**/
-	function getComputedStyle( elt : Element, ?pseudoElt : String = "" ) : CSSStyleDeclaration;
-	/** @throws DOMError */
-	
+	function getComputedStyle( elt : Element, pseudoElt : String = "" ) : CSSStyleDeclaration;
+
 	/**
 		Returns a `MediaQueryList` object representing the specified media query string.
+		@throws DOMError
 	**/
 	function matchMedia( query : String ) : MediaQueryList;
-	/** @throws DOMError */
-	
+
 	/**
 		Moves the window to the specified coordinates.
+		@throws DOMError
 	**/
 	function moveTo( x : Int, y : Int ) : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Moves the current window by a specified amount.
+		@throws DOMError
 	**/
 	function moveBy( x : Int, y : Int ) : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Dynamically resizes window.
+		@throws DOMError
 	**/
 	function resizeTo( x : Int, y : Int ) : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Resizes the current window by a certain amount.
+		@throws DOMError
 	**/
 	function resizeBy( x : Int, y : Int ) : Void;
-	@:overload( function( x : Float, y : Float ) : Void {} )
-	
+
 	/**
 		Scrolls the window to a particular place in the document.
 	**/
-	function scroll( ?options : ScrollToOptions ) : Void;
 	@:overload( function( x : Float, y : Float ) : Void {} )
-	
+	function scroll( ?options : ScrollToOptions ) : Void;
+
 	/**
 		Scrolls to a particular set of coordinates in the document.
 	**/
-	function scrollTo( ?options : ScrollToOptions ) : Void;
 	@:overload( function( x : Float, y : Float ) : Void {} )
-	
+	function scrollTo( ?options : ScrollToOptions ) : Void;
+
 	/**
 		Scrolls the document in the window by the given amount.
 	**/
+	@:overload( function( x : Float, y : Float ) : Void {} )
 	function scrollBy( ?options : ScrollToOptions ) : Void;
-	/** @throws DOMError */
+
+	/**
+		Tells the browser that an animation is in progress, requesting that the browser schedule a repaint of the window for the next animation frame.
+		@throws DOMError
+	**/
 	function requestAnimationFrame( callback : Float -> Void ) : Int;
-	/** @throws DOMError */
+
+	/**
+		Enables you to cancel a callback previously scheduled with `Window.requestAnimationFrame`.
+		@throws DOMError
+	**/
 	function cancelAnimationFrame( handle : Int ) : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Gets default computed style for the specified element, ignoring author stylesheets.
+		@throws DOMError
 	**/
-	function getDefaultComputedStyle( elt : Element, ?pseudoElt : String = "" ) : CSSStyleDeclaration;
-	
+	function getDefaultComputedStyle( elt : Element, pseudoElt : String = "" ) : CSSStyleDeclaration;
+
 	/**
 		Scrolls the document by the given number of lines.
 	**/
 	function scrollByLines( numLines : Int, ?options : ScrollOptions ) : Void;
-	
+
 	/**
 		Scrolls the current document by the specified number of pages.
 	**/
 	function scrollByPages( numPages : Int, ?options : ScrollOptions ) : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Sizes the window according to its content.
+		@throws DOMError
 	**/
 	function sizeToContent() : Void;
-	
+
 	/**
 		Updates the state of commands of the current chrome window (UI).
 	**/
-	function updateCommands( action : String, ?sel : Selection, ?reason : Int = 0 ) : Void;
-	/** @throws DOMError */
-	
+	function updateCommands( action : String, ?sel : Selection, reason : Int = 0 ) : Void;
+
 	/**
 		Searches for a given string in a window.
+		@throws DOMError
 	**/
-	function find( ?str : String = "", ?caseSensitive : Bool = false, ?backwards : Bool = false, ?wrapAround : Bool = false, ?wholeWord : Bool = false, ?searchInFrames : Bool = false, ?showDialog : Bool = false ) : Bool;
-	
+	function find( str : String = "", caseSensitive : Bool = false, backwards : Bool = false, wrapAround : Bool = false, wholeWord : Bool = false, searchInFrames : Bool = false, showDialog : Bool = false ) : Bool;
+
 	/**
 		Writes a message to the console.
 	**/
 	function dump( str : String ) : Void;
-	
+
 	/**
 		Toggles a user's ability to resize a window.
 	**/
 	function setResizable( resizable : Bool ) : Void;
 	/** @throws DOMError */
-	function fetch( input : haxe.extern.EitherType<Request,String>, ?init : RequestInit ) : Promise<Response>;
-	/** @throws DOMError */
-	@:overload( function( aImage : haxe.extern.EitherType<ImageElement,haxe.extern.EitherType<VideoElement,haxe.extern.EitherType<CanvasElement,haxe.extern.EitherType<Blob,haxe.extern.EitherType<ImageData,haxe.extern.EitherType<CanvasRenderingContext2D,ImageBitmap>>>>>> ) : Promise<ImageBitmap> {} )
-	function createImageBitmap( aImage : haxe.extern.EitherType<ImageElement,haxe.extern.EitherType<VideoElement,haxe.extern.EitherType<CanvasElement,haxe.extern.EitherType<Blob,haxe.extern.EitherType<ImageData,haxe.extern.EitherType<CanvasRenderingContext2D,ImageBitmap>>>>>>, aSx : Int, aSy : Int, aSw : Int, aSh : Int ) : Promise<ImageBitmap>;
-	/** @throws DOMError */
 	function btoa( btoa : String ) : String;
 	/** @throws DOMError */
 	function atob( atob : String ) : String;
 	/** @throws DOMError */
-	@:overload( function( handler : haxe.Constraints.Function, ?timeout : Int = 0, arguments : haxe.extern.Rest<Dynamic> ) : Int {} )
-	function setTimeout( handler : String, ?timeout : Int = 0, unused : haxe.extern.Rest<Dynamic> ) : Int;
-	function clearTimeout( ?handle : Int = 0 ) : Void;
+	@:overload( function( handler : haxe.Constraints.Function, timeout : Float = 0, arguments : haxe.extern.Rest<Dynamic> ) : Int {} )
+	function setTimeout( handler : String, timeout : Float = 0, unused : haxe.extern.Rest<Dynamic> ) : Int;
+	function clearTimeout( handle : Int = 0 ) : Void;
+	/** @throws DOMError */
+	@:overload( function( handler : haxe.Constraints.Function, timeout : Float = 0, arguments : haxe.extern.Rest<Dynamic> ) : Int {} )
+	function setInterval( handler : String, timeout : Float = 0, unused : haxe.extern.Rest<Dynamic> ) : Int;
+	function clearInterval( handle : Int = 0 ) : Void;
 	/** @throws DOMError */
-	@:overload( function( handler : haxe.Constraints.Function, ?timeout : Int, arguments : haxe.extern.Rest<Dynamic> ) : Int {} )
-	function setInterval( handler : String, ?timeout : Int, unused : haxe.extern.Rest<Dynamic> ) : Int;
-	function clearInterval( ?handle : Int = 0 ) : Void;
+	@:overload( function( aImage : VideoElement) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasElement) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : Blob) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageData) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasRenderingContext2D) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageBitmap) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBufferView) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBuffer) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : VideoElement, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasElement, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : Blob, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageData, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasRenderingContext2D, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageBitmap, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBufferView, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBuffer, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : VideoElement, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasElement, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : Blob, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageData, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasRenderingContext2D, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageBitmap, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBufferView, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBuffer, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageElement ) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageElement, aSx : Int, aSy : Int, aSw : Int, aSh : Int ) : Promise<ImageBitmap> {} )
+	function createImageBitmap( aImage : ImageElement, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout> ) : Promise<ImageBitmap>;
+	@:overload( function( input : String, ?init : RequestInit) : Promise<Response> {} )
+	function fetch( input : Request, ?init : RequestInit ) : Promise<Response>;
 }
\ No newline at end of file
diff --git a/std/js/html/WindowClient.hx b/std/js/html/WindowClient.hx
index f1921835c4643f6694575bbc8cc0a2e51999025b..59acce503f5f745c1955973aea42bfe0e4c445aa 100644
--- a/std/js/html/WindowClient.hx
+++ b/std/js/html/WindowClient.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `WindowClient` interface of the ServiceWorker API represents the scope of a service worker client that is a document in a browser context, controlled by an active worker. The service worker client independently selects and uses a service worker for its own loading and sub-resources.
 
@@ -32,23 +34,28 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WindowClient>
 **/
 @:native("WindowClient")
-extern class WindowClient extends Client
-{
-	
+extern class WindowClient extends Client {
+
 	/**
 		Indicates the visibility of the current client. This value can be one of `hidden`, `visible`, `prerender`, or `unloaded`.
 	**/
 	var visibilityState(default,null) : VisibilityState;
-	
+
 	/**
 		A boolean that indicates whether the current client has focus.
 	**/
 	var focused(default,null) : Bool;
-	
-	/** @throws DOMError */
-	
+
+
 	/**
 		Gives user input focus to the current client. 
+		@throws DOMError
 	**/
 	function focus() : Promise<WindowClient>;
+
+	/**
+		Loads a specified URL into a controlled client page.
+		@throws DOMError
+	**/
+	function navigate( url : String ) : Promise<WindowClient>;
 }
\ No newline at end of file
diff --git a/std/js/html/Worker.hx b/std/js/html/Worker.hx
index 708e975ae77ead62f1cd7ac5ac15d4e22929c8bf..0359a702742f54579d5005cf3753b2cdc0ed35eb 100644
--- a/std/js/html/Worker.hx
+++ b/std/js/html/Worker.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,26 +32,30 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/Worker>
 **/
 @:native("Worker")
-extern class Worker extends EventTarget
-{
+extern class Worker extends EventTarget {
 	
 	/**
 		An `EventListener` called whenever a `MessageEvent` of type `message` bubbles through the worker — i.e. when a message is sent to the parent document from the worker via `DedicatedWorkerGlobalScope.postMessage`. The message is stored in the event's `MessageEvent.data` property.
 	**/
 	var onmessage : haxe.Constraints.Function;
+	
+	/**
+		Is an `EventHandler` representing the code to be called when the `messageerror` event is raised.
+	**/
+	var onmessageerror : haxe.Constraints.Function;
 	var onerror : haxe.Constraints.Function;
 	
 	/** @throws DOMError */
-	function new( scriptURL : String ) : Void;
+	function new( scriptURL : String, ?options : WorkerOptions ) : Void;
 	
 	/**
 		Immediately terminates the worker. This does not offer the worker an opportunity to finish its operations; it is simply stopped at once. ServiceWorker instances do not support this method.
 	**/
 	function terminate() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Sends a message — which can consist of `any` JavaScript object — to the worker's inner scope.
+		@throws DOMError
 	**/
 	function postMessage( message : Dynamic, ?transfer : Array<Dynamic> ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/WorkerDebuggerGlobalScope.hx b/std/js/html/WorkerDebuggerGlobalScope.hx
index ed70dca1f44f98d7e40e373e61a37a88509840ba..62a34e7545fd91520df92d6a03dbfe04092fc9be 100644
--- a/std/js/html/WorkerDebuggerGlobalScope.hx
+++ b/std/js/html/WorkerDebuggerGlobalScope.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,12 +25,11 @@
 package js.html;
 
 @:native("WorkerDebuggerGlobalScope")
-extern class WorkerDebuggerGlobalScope extends EventTarget
-{
+extern class WorkerDebuggerGlobalScope extends EventTarget {
 	var global(default,null) : Dynamic;
 	var onmessage : haxe.Constraints.Function;
-	var console(default,null) : Console;
 	
+	/** @throws DOMError */
 	function createSandbox( name : String, prototype : Dynamic ) : Dynamic;
 	/** @throws DOMError */
 	function loadSubScript( url : String, ?sandbox : Dynamic ) : Void;
@@ -40,5 +39,9 @@ extern class WorkerDebuggerGlobalScope extends EventTarget
 	/** @throws DOMError */
 	function setImmediate( handler : haxe.Constraints.Function ) : Void;
 	function reportError( message : String ) : Void;
+	/** @throws DOMError */
+	function retrieveConsoleEvents() : Array<Dynamic>;
+	/** @throws DOMError */
+	function setConsoleEventHandler( handler : haxe.Constraints.Function ) : Void;
 	function dump( ?string : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/WorkerGlobalScope.hx b/std/js/html/WorkerGlobalScope.hx
index 721fb6eae2779781810c19ab3029ebda315f377d..6750412fb761a276a0126ea3273c611064864d46 100644
--- a/std/js/html/WorkerGlobalScope.hx
+++ b/std/js/html/WorkerGlobalScope.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html;
 
+import js.lib.Promise;
+
 /**
 	The `WorkerGlobalScope` interface of the Web Workers API is an interface representing the scope of any worker. Workers have no browsing context; this scope contains the information usually conveyed by `Window` objects — in this case event handlers, the console or the associated `WorkerNavigator` object. Each `WorkerGlobalScope` has its own event loop.
 
@@ -32,87 +34,95 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope>
 **/
 @:native("WorkerGlobalScope")
-extern class WorkerGlobalScope extends EventTarget
-{
-	
+extern class WorkerGlobalScope extends EventTarget {
+
 	/**
 		Returns a reference to the `WorkerGlobalScope` itself. Most of the time it is a specific scope like `DedicatedWorkerGlobalScope`,  `SharedWorkerGlobalScope` or `ServiceWorkerGlobalScope`.
 	**/
 	var self(default,null) : WorkerGlobalScope;
-	
-	/**
-		Returns the `Console` associated with the worker.
-	**/
-	var console(default,null) : Console;
-	
+
 	/**
 		Returns the `WorkerLocation` associated with the worker. It is a specific location object, mostly a subset of the `Location` for browsing scopes, but adapted to workers.
 	**/
 	var location(default,null) : WorkerLocation;
-	
+	var navigator(default,null) : WorkerNavigator;
+
 	/**
 		Is an `EventHandler` representing the code to be called when the `error` event is raised.
 	**/
-	var onerror : haxe.extern.EitherType<Event,String> -> String -> Int -> Int -> Dynamic -> Bool;
-	
+	var onerror : haxe.extern.EitherType<Event,String> -> String -> Int -> Int -> Dynamic -> Dynamic;
+
 	/**
 		Is an `EventHandler` representing the code to be called when the `offline` event is raised.
 	**/
 	var onoffline : haxe.Constraints.Function;
-	
+
 	/**
 		Is an `EventHandler` representing the code to be called when the `online` event is raised.
 	**/
 	var ononline : haxe.Constraints.Function;
-	
-	/**
-		Returns the `WorkerNavigator` associated with the worker. It is a specific navigator object, mostly a subset of the `Navigator` for browsing scopes, but adapted to workers.
-	**/
-	var navigator(default,null) : WorkerNavigator;
-	
-	/**
-		Is an `EventHandler` representing the code to be called when the `close` event is raised.
-	**/
-	var onclose : haxe.Constraints.Function;
-	
+
 	/**
 		Returns the `Performance` associated with the worker. It is a regular performance object, except that only a subset of its property and methods are available to workers.
 	**/
 	var performance(default,null) : Performance;
+	var crypto(default,null) : Crypto;
+	var origin(default,null) : String;
+	var isSecureContext(default,null) : Bool;
 	var indexedDB(default,null) : js.html.idb.Factory;
-	
-	/** @throws DOMError */
-	
-	/**
-		Discards any tasks queued in the `WorkerGlobalScope`'s event loop, effectively closing this particular scope.
-	**/
-	function close() : Void;
-	/** @throws DOMError */
-	
+	var caches(default,null) : CacheStorage;
+
+
 	/**
 		Imports one or more scripts into the worker's scope. You can specify as many as you'd like, separated by commas. For example:` importScripts('foo.js', 'bar.js');`
+		@throws DOMError
 	**/
 	function importScripts( urls : haxe.extern.Rest<String> ) : Void;
-	
+
 	/**
 		Allows you to write a message to stdout — i.e. in your terminal. This is the same as Firefox's `window.dump`, but for workers.
 	**/
 	function dump( ?str : String ) : Void;
 	/** @throws DOMError */
-	function fetch( input : haxe.extern.EitherType<Request,String>, ?init : RequestInit ) : Promise<Response>;
-	/** @throws DOMError */
-	@:overload( function( aImage : haxe.extern.EitherType<ImageElement,haxe.extern.EitherType<VideoElement,haxe.extern.EitherType<CanvasElement,haxe.extern.EitherType<Blob,haxe.extern.EitherType<ImageData,haxe.extern.EitherType<CanvasRenderingContext2D,ImageBitmap>>>>>> ) : Promise<ImageBitmap> {} )
-	function createImageBitmap( aImage : haxe.extern.EitherType<ImageElement,haxe.extern.EitherType<VideoElement,haxe.extern.EitherType<CanvasElement,haxe.extern.EitherType<Blob,haxe.extern.EitherType<ImageData,haxe.extern.EitherType<CanvasRenderingContext2D,ImageBitmap>>>>>>, aSx : Int, aSy : Int, aSw : Int, aSh : Int ) : Promise<ImageBitmap>;
-	/** @throws DOMError */
 	function btoa( btoa : String ) : String;
 	/** @throws DOMError */
 	function atob( atob : String ) : String;
 	/** @throws DOMError */
-	@:overload( function( handler : haxe.Constraints.Function, ?timeout : Int = 0, arguments : haxe.extern.Rest<Dynamic> ) : Int {} )
-	function setTimeout( handler : String, ?timeout : Int = 0, unused : haxe.extern.Rest<Dynamic> ) : Int;
-	function clearTimeout( ?handle : Int = 0 ) : Void;
+	@:overload( function( handler : haxe.Constraints.Function, timeout : Int = 0, arguments : haxe.extern.Rest<Dynamic> ) : Int {} )
+	function setTimeout( handler : String, timeout : Int = 0, unused : haxe.extern.Rest<Dynamic> ) : Int;
+	function clearTimeout( handle : Int = 0 ) : Void;
+	/** @throws DOMError */
+	@:overload( function( handler : haxe.Constraints.Function, timeout : Int = 0, arguments : haxe.extern.Rest<Dynamic> ) : Int {} )
+	function setInterval( handler : String, timeout : Int = 0, unused : haxe.extern.Rest<Dynamic> ) : Int;
+	function clearInterval( handle : Int = 0 ) : Void;
 	/** @throws DOMError */
-	@:overload( function( handler : haxe.Constraints.Function, ?timeout : Int, arguments : haxe.extern.Rest<Dynamic> ) : Int {} )
-	function setInterval( handler : String, ?timeout : Int, unused : haxe.extern.Rest<Dynamic> ) : Int;
-	function clearInterval( ?handle : Int = 0 ) : Void;
+	@:overload( function( aImage : VideoElement) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasElement) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : Blob) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageData) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasRenderingContext2D) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageBitmap) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBufferView) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBuffer) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : VideoElement, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasElement, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : Blob, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageData, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasRenderingContext2D, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageBitmap, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBufferView, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBuffer, aSx : Int, aSy : Int, aSw : Int, aSh : Int) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : VideoElement, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasElement, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : Blob, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageData, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : CanvasRenderingContext2D, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageBitmap, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBufferView, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : js.lib.ArrayBuffer, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout>) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageElement ) : Promise<ImageBitmap> {} )
+	@:overload( function( aImage : ImageElement, aSx : Int, aSy : Int, aSw : Int, aSh : Int ) : Promise<ImageBitmap> {} )
+	function createImageBitmap( aImage : ImageElement, aOffset : Int, aLength : Int, aFormat : ImageBitmapFormat, aLayout : Array<ChannelPixelLayout> ) : Promise<ImageBitmap>;
+	@:overload( function( input : String, ?init : RequestInit) : Promise<Response> {} )
+	function fetch( input : Request, ?init : RequestInit ) : Promise<Response>;
 }
\ No newline at end of file
diff --git a/std/js/html/WorkerLocation.hx b/std/js/html/WorkerLocation.hx
index 9371395138d9320fcb0632436e783ca31e61ebb9..5fcc91d654629e4ef63ed80fed45eea71309a059 100644
--- a/std/js/html/WorkerLocation.hx
+++ b/std/js/html/WorkerLocation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html;
 
 /**
-	The `WorkerLocation` interface defines the absolute location of the script executed by the `Worker`. Such an object is initialized for each worker and is available via the `WorkerGlobalScope.location` property obtained by calling `window.self.location`.
+	The `WorkerLocation` interface defines the absolute location of the script executed by the `Worker`. Such an object is initialized for each worker and is available via the `WorkerGlobalScope.location` property obtained by calling `self.location`.
 
 	Documentation [WorkerLocation](https://developer.mozilla.org/en-US/docs/Web/API/WorkerLocation) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WorkerLocation$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WorkerLocation>
 **/
 @:native("WorkerLocation")
-extern class WorkerLocation
-{
+extern class WorkerLocation {
 	var href(default,null) : String;
 	var origin(default,null) : String;
 	var protocol(default,null) : String;
diff --git a/std/js/html/WorkerNavigator.hx b/std/js/html/WorkerNavigator.hx
index 3e0e277bae694259a234ad62f855c0ca0570d643..cfbe027ad2d3007a5e9d7bececed5d2806da66c9 100644
--- a/std/js/html/WorkerNavigator.hx
+++ b/std/js/html/WorkerNavigator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WorkerNavigator>
 **/
 @:native("WorkerNavigator")
-extern class WorkerNavigator
-{
+extern class WorkerNavigator {
 	var hardwareConcurrency(default,null) : Int;
 	var appCodeName(default,null) : String;
 	var appName(default,null) : String;
@@ -44,6 +43,7 @@ extern class WorkerNavigator
 	var language(default,null) : String;
 	var languages(default,null) : Array<String>;
 	var onLine(default,null) : Bool;
+	var storage(default,null) : StorageManager;
 	
 	function taintEnabled() : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/WorkerOptions.hx b/std/js/html/WorkerOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a2ae014e5292b8eb0bff1d5e486a68580f98b3c6
--- /dev/null
+++ b/std/js/html/WorkerOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\Worker.webidl. Do not edit!
+
+package js.html;
+
+typedef WorkerOptions = {
+	var ?name : String;
+}
\ No newline at end of file
diff --git a/std/js/html/ChromeFilePropertyBag.hx b/std/js/html/WorkletGlobalScope.hx
similarity index 82%
rename from std/js/html/ChromeFilePropertyBag.hx
rename to std/js/html/WorkletGlobalScope.hx
index e8efadc64b150eb0c20135e0ff0d8bf646531a81..0ec3e2dbb8c991282fbb9c5943d14e566e2650ec 100644
--- a/std/js/html/ChromeFilePropertyBag.hx
+++ b/std/js/html/WorkletGlobalScope.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\File.webidl. Do not edit!
+// This file is generated from mozilla\WorkletGlobalScope.webidl. Do not edit!
 
 package js.html;
 
-typedef ChromeFilePropertyBag =
-{
-	> FilePropertyBag,
-	@:optional var name : String;
-	@:optional var temporary : Bool;
+@:native("WorkletGlobalScope")
+extern class WorkletGlobalScope {
+	function dump( ?str : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/XMLDocument.hx b/std/js/html/XMLDocument.hx
index 0662cfc0aa7a45243dd1a2f82c333310ba525f61..21e68a9826dceb996d8a69d7301cf86418e19752 100644
--- a/std/js/html/XMLDocument.hx
+++ b/std/js/html/XMLDocument.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,14 +32,13 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/XMLDocument>
 **/
 @:native("XMLDocument")
-extern class XMLDocument extends Document
-{
+extern class XMLDocument extends Document {
 	var async : Bool;
 	
-	/** @throws DOMError */
 	
 	/**
 		Loads an XML document.
+		@throws DOMError
 	**/
 	function load( url : String ) : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/XMLHttpRequest.hx b/std/js/html/XMLHttpRequest.hx
index 87d2870eb8fb0f5294308827ccf7b794004476ba..891e3e5f97a10d6d08f21ada033eda72017b2a59 100644
--- a/std/js/html/XMLHttpRequest.hx
+++ b/std/js/html/XMLHttpRequest.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,89 +25,131 @@
 package js.html;
 
 /**
-	`XMLHttpRequest` is an API that provides client functionality for transferring data between a client and a server. It provides an easy way to retrieve data from a URL without having to do a full page refresh. This enables a Web page to update just a part of the page without disrupting what the user is doing.
+	Use `XMLHttpRequest` (XHR) objects to interact with servers. You can retrieve data from a URL without having to do a full page refresh. This enables a Web page to update just part of a page without disrupting what the user is doing.
 
 	Documentation [XMLHttpRequest](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest>
 **/
 @:native("XMLHttpRequest")
-extern class XMLHttpRequest extends XMLHttpRequestEventTarget
-{
+extern class XMLHttpRequest extends XMLHttpRequestEventTarget {
 	static inline var UNSENT : Int = 0;
 	static inline var OPENED : Int = 1;
 	static inline var HEADERS_RECEIVED : Int = 2;
 	static inline var LOADING : Int = 3;
 	static inline var DONE : Int = 4;
 	
+	
+	/**
+		An `EventHandler` that is called whenever the `readyState` attribute changes.
+	**/
 	var onreadystatechange : haxe.Constraints.Function;
+	
+	/**
+		Returns an `unsigned short`, the state of the request.
+	**/
 	var readyState(default,null) : Int;
+	
+	/**
+		Is an `unsigned long` representing the number of milliseconds a request can take before automatically being terminated.
+	**/
 	var timeout : Int;
+	
+	/**
+		Is a `Boolean` that indicates whether or not cross-site `Access-Control` requests should be made using credentials such as cookies or authorization headers.
+	**/
 	var withCredentials : Bool;
+	
+	/**
+		Is an `XMLHttpRequestUpload`, representing the upload process.
+	**/
 	var upload(default,null) : XMLHttpRequestUpload;
+	
+	/**
+		Returns the serialized URL of the response or the empty string if the URL is null.
+	**/
 	var responseURL(default,null) : String;
+	
+	/**
+		Returns an `unsigned short` with the status of the response of the request.
+	**/
 	var status(default,null) : Int;
+	
+	/**
+		Returns a `DOMString` containing the response string returned by the HTTP server. Unlike `XMLHTTPRequest.status`, this includes the entire text of the response message ("`200 OK`", for example).
+	**/
 	var statusText(default,null) : String;
+	
+	/**
+		Is an enumerated value that defines the response type.
+	**/
 	var responseType : XMLHttpRequestResponseType;
 	
 	/**
 		Returns an `ArrayBuffer`, `Blob`, `Document`, JavaScript object, or a `DOMString`, depending on the value of `XMLHttpRequest.responseType`. that contains the response entity body.
 	**/
 	var response(default,null) : Dynamic;
+	
+	/**
+		Returns a `DOMString` that contains the response to the request as text, or `null` if the request was unsuccessful or has not yet been sent.
+	**/
 	var responseText(default,null) : String;
+	
+	/**
+		Returns a `Document` containing the response to the request, or `null` if the request was unsuccessful, has not yet been sent, or cannot be parsed as XML or HTML.
+	**/
 	var responseXML(default,null) : HTMLDocument;
 	
 	/** @throws DOMError */
 	@:overload( function( ?params : Dynamic/*MISSING MozXMLHttpRequestParameters*/ ) : Void {} )
 	function new( ignored : String ) : Void;
-	/** @throws DOMError */
-	@:overload( function( method : String, url : String ) : Void {} )
 	
 	/**
 		Initializes a request. This method is to be used from JavaScript code; to initialize a request from native code, use `openRequest()` instead.
+		@throws DOMError
 	**/
+	@:overload( function( method : String, url : String ) : Void {} )
 	function open( method : String, url : String, async : Bool, ?user : String, ?password : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Sets the value of an HTTP request header. You must call `setRequestHeader()`after `open()`, but before `send()`.
+		@throws DOMError
 	**/
 	function setRequestHeader( header : String, value : String ) : Void;
-	/** @throws DOMError */
-	@:overload( function() : Void {} )
-	@:overload( function( data : ArrayBuffer ) : Void {} )
-	@:overload( function( data : ArrayBufferView ) : Void {} )
-	@:overload( function( data : Blob ) : Void {} )
-	@:overload( function( data : HTMLDocument ) : Void {} )
-	@:overload( function( data : String ) : Void {} )
-	@:overload( function( data : FormData ) : Void {} )
 	
 	/**
 		Sends the request. If the request is asynchronous (which is the default), this method returns as soon as the request is sent.
+		@throws DOMError
 	**/
-	function send( data : Dynamic/*MISSING InputStream*/ ) : Void;
-	/** @throws DOMError */
+	@:overload( function( ?body : Blob) : Void {} )
+	@:overload( function( ?body : js.lib.ArrayBufferView) : Void {} )
+	@:overload( function( ?body : js.lib.ArrayBuffer) : Void {} )
+	@:overload( function( ?body : FormData) : Void {} )
+	@:overload( function( ?body : URLSearchParams) : Void {} )
+	@:overload( function( ?body : String) : Void {} )
+	function send( ?body : HTMLDocument ) : Void;
 	
 	/**
 		Aborts the request if it has already been sent.
+		@throws DOMError
 	**/
 	function abort() : Void;
-	/** @throws DOMError */
 	
 	/**
 		Returns the string containing the text of the specified header, or `null` if either the response has not yet been received or the header doesn't exist in the response.
+		@throws DOMError
 	**/
 	function getResponseHeader( header : String ) : String;
-	/** @throws DOMError */
 	
 	/**
-		Returns all the response headers, separated by CRLF, as a string, or `null` if no response has been received. 
+		Returns all the response headers, separated by CRLF, as a string, or `null` if no response has been received.
+		@throws DOMError
 	**/
 	function getAllResponseHeaders() : String;
-	/** @throws DOMError */
 	
 	/**
 		Overrides the MIME type returned by the server.
+		@throws DOMError
 	**/
 	function overrideMimeType( mime : String ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/XMLHttpRequestEventTarget.hx b/std/js/html/XMLHttpRequestEventTarget.hx
index ff007bddab1cc23b8e425c18ba0bbb49f12a69e7..13aaca4b0430bfade8a20dbbce87c09e10b0d8ed 100644
--- a/std/js/html/XMLHttpRequestEventTarget.hx
+++ b/std/js/html/XMLHttpRequestEventTarget.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,16 +24,8 @@
 
 package js.html;
 
-/**
-	`XMLHttpRequestEventTarget` is the interface that describes the event handlers you can implement in an object that will handle events for an `XMLHttpRequest`.
-
-	Documentation [XMLHttpRequestEventTarget](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequestEventTarget) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequestEventTarget$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
-
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequestEventTarget>
-**/
 @:native("XMLHttpRequestEventTarget")
-extern class XMLHttpRequestEventTarget extends EventTarget
-{
+extern class XMLHttpRequestEventTarget extends EventTarget {
 	var onloadstart : haxe.Constraints.Function;
 	var onprogress : haxe.Constraints.Function;
 	var onabort : haxe.Constraints.Function;
diff --git a/std/js/html/XMLHttpRequestResponseType.hx b/std/js/html/XMLHttpRequestResponseType.hx
index b677415ad6326d40f5b2ceeba3cbfbfe7c529e13..fa2b8bcd484f9bcf8a0a69498c7456512a3c5a51 100644
--- a/std/js/html/XMLHttpRequestResponseType.hx
+++ b/std/js/html/XMLHttpRequestResponseType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,14 @@
 
 package js.html;
 
-@:enum abstract XMLHttpRequestResponseType(String)
-{
+/**
+	The `XMLHttpRequestResponseType` type is an enumerated set of strings which are used to specify the type of data contained in the `response` of an `XMLHttpRequest`.
+
+	Documentation [XMLHttpRequestResponseType](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequestResponseType) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequestResponseType$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequestResponseType>
+**/
+enum abstract XMLHttpRequestResponseType(String) {
 	var NONE = "";
 	var ARRAYBUFFER = "arraybuffer";
 	var BLOB = "blob";
diff --git a/std/js/html/XMLHttpRequestUpload.hx b/std/js/html/XMLHttpRequestUpload.hx
index ac31b5a5432459098e23fddf83607556f05dc1ec..6eac6f1927e4f52480b2787df95930ea165a4932 100644
--- a/std/js/html/XMLHttpRequestUpload.hx
+++ b/std/js/html/XMLHttpRequestUpload.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,5 @@
 package js.html;
 
 @:native("XMLHttpRequestUpload")
-extern class XMLHttpRequestUpload extends XMLHttpRequestEventTarget
-{
+extern class XMLHttpRequestUpload extends XMLHttpRequestEventTarget {
 }
\ No newline at end of file
diff --git a/std/js/html/XMLSerializer.hx b/std/js/html/XMLSerializer.hx
index 1da7304c456fcc4dba26d3fee7a7284169a650ee..1187e6e195c00e5306bb96d4a8fb51b7bdd4bc1b 100644
--- a/std/js/html/XMLSerializer.hx
+++ b/std/js/html/XMLSerializer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,15 @@
 
 package js.html;
 
+/**
+	The `XMLSerializer` interface provides the `serializeToString()` method to construct an XML string representing a DOM tree.
+
+	Documentation [XMLSerializer](https://developer.mozilla.org/en-US/docs/Web/API/XMLSerializer) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/XMLSerializer$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/XMLSerializer>
+**/
 @:native("XMLSerializer")
-extern class XMLSerializer
-{
+extern class XMLSerializer {
 	/** @throws DOMError */
 	function new() : Void;
 	/** @throws DOMError */
diff --git a/std/js/html/XPathEvaluator.hx b/std/js/html/XPathEvaluator.hx
index c1e6fed16e0bc4fb73d57e9d74784f6372792992..b1270a6a25bce6c4a93684cb674adace21f7bff8 100644
--- a/std/js/html/XPathEvaluator.hx
+++ b/std/js/html/XPathEvaluator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,13 +25,17 @@
 package js.html;
 
 @:native("XPathEvaluator")
-extern class XPathEvaluator
-{
+extern class XPathEvaluator {
 	/** @throws DOMError */
 	function new() : Void;
 	/** @throws DOMError */
-	function createExpression( expression : String, resolver : XPathNSResolver ) : XPathExpression;
+	@:overload( function( expression : String, ?resolver : haxe.Constraints.Function) : XPathExpression {} )
+	@:overload( function( expression : String, ?resolver : XPathNSResolver) : XPathExpression {} )
+	function createExpression( expression : String, ?resolver : String -> Null<String> ) : XPathExpression;
+	@:pure
 	function createNSResolver( nodeResolver : Node ) : Node;
 	/** @throws DOMError */
-	function evaluate( expression : String, contextNode : Node, resolver : XPathNSResolver, type : Int, result : Dynamic ) : XPathResult;
+	@:overload( function( expression : String, contextNode : Node, ?resolver : haxe.Constraints.Function, type : Int = 0, ?result : Dynamic) : XPathResult {} )
+	@:overload( function( expression : String, contextNode : Node, ?resolver : XPathNSResolver, type : Int = 0, ?result : Dynamic) : XPathResult {} )
+	function evaluate( expression : String, contextNode : Node, ?resolver : String -> Null<String>, type : Int = 0, ?result : Dynamic ) : XPathResult;
 }
\ No newline at end of file
diff --git a/std/js/html/XPathExpression.hx b/std/js/html/XPathExpression.hx
index 604453edde60ae43b768799413098437b60d7a8a..514d272c264248c35070abc173d4e80e7f053f42 100644
--- a/std/js/html/XPathExpression.hx
+++ b/std/js/html/XPathExpression.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,11 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/XPathExpression>
 **/
 @:native("XPathExpression")
-extern class XPathExpression
-{
-	/** @throws DOMError */
-	function evaluate( contextNode : Node, type : Int, result : Dynamic ) : XPathResult;
+extern class XPathExpression {
+	
+	/**
+		provide a context node/document, `XPathResult` constant, and `XPathResult` to store the query or null to return a new XPathResult.
+		@throws DOMError
+	**/
+	function evaluate( contextNode : Node, type : Int = 0, ?result : Dynamic ) : XPathResult;
 }
\ No newline at end of file
diff --git a/std/js/html/XPathNSResolver.hx b/std/js/html/XPathNSResolver.hx
index f7cad4a98465840c2f9c7fbb63ae4066a182ebc0..2e4a44d9730d51dc8f740b4987a907bdf0f60ba6 100644
--- a/std/js/html/XPathNSResolver.hx
+++ b/std/js/html/XPathNSResolver.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
 
 package js.html;
 
-@:native("XPathNSResolver")
-extern class XPathNSResolver
-{
+typedef XPathNSResolver = {
 	function lookupNamespaceURI( prefix : String ) : String;
 }
\ No newline at end of file
diff --git a/std/js/html/XPathResult.hx b/std/js/html/XPathResult.hx
index a108a10fdcbd11b81e4a76cf88d2e88d6f3f50aa..26fe259e1d4efc6c7009d7e05cd1be453a373db6 100644
--- a/std/js/html/XPathResult.hx
+++ b/std/js/html/XPathResult.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,15 @@
 
 package js.html;
 
+/**
+	The `XPathResult` interface represents the results generated by evaluating an XPath 1.0 expression within the context of a given node.
+
+	Documentation [XPathResult](https://developer.mozilla.org/en-US/docs/Web/API/XPathResult) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/XPathResult$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/XPathResult>
+**/
 @:native("XPathResult")
-extern class XPathResult
-{
+extern class XPathResult {
 	static inline var ANY_TYPE : Int = 0;
 	static inline var NUMBER_TYPE : Int = 1;
 	static inline var STRING_TYPE : Int = 2;
@@ -40,50 +46,50 @@ extern class XPathResult
 	
 	
 	/**
-		readonly integer (short)
+		integer (short)
 	**/
 	var resultType(default,null) : Int;
 	
 	/**
-		readonly float
+		float
 	**/
 	var numberValue(default,null) : Float;
 	
 	/**
-		readonly String
+		String
 	**/
 	var stringValue(default,null) : String;
 	
 	/**
-		readonly boolean
+		boolean
 	**/
 	var booleanValue(default,null) : Bool;
 	
 	/**
-		readonly Node
+		Node
 	**/
 	var singleNodeValue(default,null) : Node;
 	
 	/**
-		readonly boolean
+		boolean
 	**/
 	var invalidIteratorState(default,null) : Bool;
 	
 	/**
-		readonly Integer
+		Integer
 	**/
 	var snapshotLength(default,null) : Int;
 	
-	/** @throws DOMError */
 	
 	/**
 		...
+		@throws DOMError
 	**/
 	function iterateNext() : Node;
-	/** @throws DOMError */
 	
 	/**
 		...
+		@throws DOMError
 	**/
 	function snapshotItem( index : Int ) : Node;
 }
\ No newline at end of file
diff --git a/std/js/html/XSLTProcessor.hx b/std/js/html/XSLTProcessor.hx
index 7b8554fa817fd8e44a6d3cb24e0b37532c1eeb1d..c93064042043dd86effaec09ba23b69bd0144372 100644
--- a/std/js/html/XSLTProcessor.hx
+++ b/std/js/html/XSLTProcessor.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/XSLTProcessor>
 **/
 @:native("XSLTProcessor")
-extern class XSLTProcessor
-{
+extern class XSLTProcessor {
 	/** @throws DOMError */
 	function new() : Void;
 	/** @throws DOMError */
@@ -45,9 +44,17 @@ extern class XSLTProcessor
 	/** @throws DOMError */
 	function setParameter( namespaceURI : String, localName : String, value : Dynamic ) : Void;
 	/** @throws DOMError */
-	function getParameter( namespaceURI : String, localName : String ) : Dynamic/*MISSING nsIVariant*/;
+	function getParameter( namespaceURI : String, localName : String ) : Dynamic;
 	/** @throws DOMError */
 	function removeParameter( namespaceURI : String, localName : String ) : Void;
+	
+	/**
+		Removes all set parameters from the `XSLTProcessor`. The `XSLTProcessor` will then use the defaults specified in the XSLT stylesheet.
+	**/
 	function clearParameters() : Void;
+	
+	/**
+		Removes all parameters and stylesheets from the `XSLTProcessor`.
+	**/
 	function reset() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/AnalyserNode.hx b/std/js/html/audio/AnalyserNode.hx
index 9f0d5894566a971cdab0069415e5a067a3ca0f74..33f44fe435e5f1e89934c0c6a52966a1506135b2 100644
--- a/std/js/html/audio/AnalyserNode.hx
+++ b/std/js/html/audio/AnalyserNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AnalyserNode>
 **/
 @:native("AnalyserNode")
-extern class AnalyserNode extends AudioNode
-{
+extern class AnalyserNode extends AudioNode {
 	
 	/**
 		Is an unsigned long value representing the size of the FFT (Fast Fourier Transform) to be used to determine the frequency domain.
@@ -60,24 +59,26 @@ extern class AnalyserNode extends AudioNode
 	**/
 	var smoothingTimeConstant : Float;
 	
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : AnalyserOptions ) : Void;
 	
 	/**
 		Copies the current frequency data into a `Float32Array` array passed into it.
 	**/
-	function getFloatFrequencyData( array : js.html.Float32Array ) : Void;
+	function getFloatFrequencyData( array : js.lib.Float32Array ) : Void;
 	
 	/**
 		Copies the current frequency data into a `Uint8Array` (unsigned byte array) passed into it.
 	**/
-	function getByteFrequencyData( array : js.html.Uint8Array ) : Void;
+	function getByteFrequencyData( array : js.lib.Uint8Array ) : Void;
 	
 	/**
 		Copies the current waveform, or time-domain, data into a `Float32Array` array passed into it.
 	**/
-	function getFloatTimeDomainData( array : js.html.Float32Array ) : Void;
+	function getFloatTimeDomainData( array : js.lib.Float32Array ) : Void;
 	
 	/**
 		Copies the current waveform, or time-domain, data into a `Uint8Array` (unsigned byte array) passed into it.
 	**/
-	function getByteTimeDomainData( array : js.html.Uint8Array ) : Void;
+	function getByteTimeDomainData( array : js.lib.Uint8Array ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/AnalyserOptions.hx b/std/js/html/audio/AnalyserOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c91d0e9c40f231ab05113368a4e00c24434b154a
--- /dev/null
+++ b/std/js/html/audio/AnalyserOptions.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\AnalyserNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef AnalyserOptions = AudioNodeOptions & {
+	var ?fftSize : Int;
+	var ?maxDecibels : Float;
+	var ?minDecibels : Float;
+	var ?smoothingTimeConstant : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/AudioBuffer.hx b/std/js/html/audio/AudioBuffer.hx
index 20f1ca0a4ddc1a69f9120857bb028659a4de0486..3ca95d0ce74e3fe3e9d9d9f17f70a2260a9f7001 100644
--- a/std/js/html/audio/AudioBuffer.hx
+++ b/std/js/html/audio/AudioBuffer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioBuffer>
 **/
 @:native("AudioBuffer")
-extern class AudioBuffer
-{
+extern class AudioBuffer {
 	
 	/**
 		Returns a float representing the sample rate, in samples per second, of the PCM data stored in the buffer.
@@ -56,21 +55,23 @@ extern class AudioBuffer
 	var numberOfChannels(default,null) : Int;
 	
 	/** @throws DOMError */
+	function new( options : AudioBufferOptions ) : Void;
 	
 	/**
 		Returns a `Float32Array` containing the PCM data associated with the channel, defined by the `channel` parameter (with `0` representing the first channel).
+		@throws DOMError
 	**/
-	function getChannelData( channel : Int ) : js.html.Float32Array;
-	/** @throws DOMError */
+	function getChannelData( channel : Int ) : js.lib.Float32Array;
 	
 	/**
 		Copies the samples from the specified channel of the `AudioBuffer` to the `destination` array.
+		@throws DOMError
 	**/
-	function copyFromChannel( destination : js.html.Float32Array, channelNumber : Int, ?startInChannel : Int = 0 ) : Void;
-	/** @throws DOMError */
+	function copyFromChannel( destination : js.lib.Float32Array, channelNumber : Int, startInChannel : Int = 0 ) : Void;
 	
 	/**
 		Copies the samples to the specified channel of the `AudioBuffer`, from the `source` array.
+		@throws DOMError
 	**/
-	function copyToChannel( source : js.html.Float32Array, channelNumber : Int, ?startInChannel : Int = 0 ) : Void;
+	function copyToChannel( source : js.lib.Float32Array, channelNumber : Int, startInChannel : Int = 0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/AudioBufferOptions.hx b/std/js/html/audio/AudioBufferOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2567e90aacacd400b5403e282327b61b9dbbe9df
--- /dev/null
+++ b/std/js/html/audio/AudioBufferOptions.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\AudioBuffer.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef AudioBufferOptions = {
+	var length : Int;
+	var ?numberOfChannels : Int;
+	var sampleRate : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/AudioBufferSourceNode.hx b/std/js/html/audio/AudioBufferSourceNode.hx
index e036952fcf67216861078889c844f53c37e253d0..37574148e37b993b204ca34b8e59720a73ba92e5 100644
--- a/std/js/html/audio/AudioBufferSourceNode.hx
+++ b/std/js/html/audio/AudioBufferSourceNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,61 +25,51 @@
 package js.html.audio;
 
 /**
-	The `AudioBufferSourceNode` interface represents an audio source consisting of in-memory audio data, stored in an `AudioBuffer`. It is an `AudioNode` that acts as an audio source`.`
+	The `AudioBufferSourceNode` interface is an `AudioScheduledSourceNode` which represents an audio source consisting of in-memory audio data, stored in an `AudioBuffer`. It's especially useful for playing back audio which has particularly stringent timing accuracy requirements, such as for sounds that must match a specific rhythm and can be kept in memory rather than being played from disk or the network.
 
 	Documentation [AudioBufferSourceNode](https://developer.mozilla.org/en-US/docs/Web/API/AudioBufferSourceNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AudioBufferSourceNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioBufferSourceNode>
 **/
 @:native("AudioBufferSourceNode")
-extern class AudioBufferSourceNode extends AudioNode
-{
+extern class AudioBufferSourceNode extends AudioScheduledSourceNode {
 	
 	/**
-		Is an `AudioBuffer` that defines the audio asset to be played, or when set to the value `null`, defines a single channel of silence. 
+		An `AudioBuffer` that defines the audio asset to be played, or when set to the value `null`, defines a single channel of silence (in which every sample is 0.0).
 	**/
 	var buffer : AudioBuffer;
 	
 	/**
-		Is an a-rate `AudioParam` that defines the speed factor at which the audio asset will be played. Since no pitch correction is applied on the output, this can be used to change the pitch of the sample.
+		An a-rate `AudioParam` that defines the speed factor at which the audio asset will be played, where a value of 1.0 is the sound's natural sampling rate. Since no pitch correction is applied on the output, this can be used to change the pitch of the sample. This value is compounded with `detune` to determine the final playback rate.
 	**/
 	var playbackRate(default,null) : AudioParam;
 	
 	/**
-		Is a `AudioParam` representing detuning of oscillation in cents. Its default value is `0`.
+		Is a k-rate `AudioParam` representing detuning of playback in cents. This value is compounded with `playbackRate` to determine the speed at which the sound is played. Its default value is `0` (meaning no detuning), and its nominal range is -∞ to ∞.
 	**/
 	var detune(default,null) : AudioParam;
 	
 	/**
-		Is a Boolean attribute indicating if the audio asset must be replayed when the end of the `AudioBuffer` is reached. Its default value is `false`.
+		A Boolean attribute indicating if the audio asset must be replayed when the end of the `AudioBuffer` is reached. Its default value is `false`.
 	**/
 	var loop : Bool;
 	
 	/**
-		Is a double value indicating, in seconds, where in the `AudioBuffer` the restart of the play must happen. Its default value is `0`.
+		A floating-point value indicating the time, in seconds, at which playback of the `AudioBuffer` must begin when `loop` is `true`. Its default value is `0` (meaning that at the beginning of each loop, playback begins at the start of the audio buffer).
 	**/
 	var loopStart : Float;
 	
 	/**
-		Is a double value indicating, in seconds, where in the `AudioBuffer` the replay of the play must stop (and eventually loop again). Its default value is `0`.
+		A floating-point number indicating the time, in seconds, at which playback of the `AudioBuffer` stops and loops back to the time indicated by `loopStart`, if `loop` is `true`. The default value is `0`.
 	**/
 	var loopEnd : Float;
 	
-	/**
-		Is an `EventHandler` containing the callback associated with the `ended_(Web_Audio)` event.
-	**/
-	var onended : haxe.Constraints.Function;
-	
-	/** @throws DOMError */
-	
-	/**
-		Schedules the start of the playback of the audio asset.
-	**/
-	function start( ?when : Float = 0.0, ?grainOffset : Float = 0.0, ?grainDuration : Float ) : Void;
 	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : AudioBufferSourceOptions ) : Void;
 	
 	/**
-		Schedules the end of the playback of an audio asset.
+		Used to schedule playback of the audio data contained in the buffer, or to begin playback immediately.
+		@throws DOMError
 	**/
-	function stop( ?when : Float = 0.0 ) : Void;
+	function start( when : Float = 0.0, grainOffset : Float = 0.0, ?grainDuration : Float ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/AudioBufferSourceOptions.hx b/std/js/html/audio/AudioBufferSourceOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..90f559e43320eff3056a777465b951f3f6971337
--- /dev/null
+++ b/std/js/html/audio/AudioBufferSourceOptions.hx
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\AudioBufferSourceNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef AudioBufferSourceOptions = {
+	var ?buffer : AudioBuffer;
+	var ?detune : Float;
+	var ?loop : Bool;
+	var ?loopEnd : Float;
+	var ?loopStart : Float;
+	var ?playbackRate : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/AudioContext.hx b/std/js/html/audio/AudioContext.hx
index f551d53565f36feb3522e5502112c7dc1b40b705..ded97681e50f2faa21d88b17b53c669b72ecb81b 100644
--- a/std/js/html/audio/AudioContext.hx
+++ b/std/js/html/audio/AudioContext.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,186 +24,47 @@
 
 package js.html.audio;
 
+import js.lib.Promise;
+
 /**
-	An `AudioContext` can be a target of events, therefore it implements the `EventTarget` interface.
+	The `AudioContext` interface represents an audio-processing graph built from audio modules linked together, each represented by an `AudioNode`.
 
 	Documentation [AudioContext](https://developer.mozilla.org/en-US/docs/Web/API/AudioContext) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AudioContext$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioContext>
 **/
 @:native("AudioContext")
-extern class AudioContext extends js.html.EventTarget
-{
-	
-	/**
-		Returns an `AudioDestinationNode` representing the final destination of all audio in the context. It can be thought of as the audio-rendering device.
-	**/
-	var destination(default,null) : AudioDestinationNode;
-	
-	/**
-		Returns a float representing the sample rate (in samples per second) used by all nodes in this context. The sample-rate of an `AudioContext` cannot be changed.
-	**/
-	var sampleRate(default,null) : Float;
-	
-	/**
-		Returns a double representing an ever-increasing hardware time in seconds used for scheduling. It starts at `0`.
-	**/
-	var currentTime(default,null) : Float;
-	
-	/**
-		Returns the `AudioListener` object, used for 3D spatialization.
-	**/
-	var listener(default,null) : AudioListener;
-	
-	/**
-		Returns the current state of the `AudioContext`.
-	**/
-	var state(default,null) : js.html.AudioContextState;
-	
-	/**
-		An event handler that runs when an event of type `statechange` has fired. This occurs when the `AudioContext`'s state changes, due to the calling of one of the state change methods (`AudioContext.suspend`, `AudioContext.resume`, or `AudioContext.close`).
-	**/
-	var onstatechange : haxe.Constraints.Function;
-	
-	/** @throws DOMError */
-	@:overload( function() : Void {} )
-	function new( audioChannelType : js.html.AudioChannel ) : Void;
+extern class AudioContext extends BaseAudioContext {
 	/** @throws DOMError */
-	
+	function new( ?contextOptions : AudioContextOptions ) : Void;
+
 	/**
 		Suspends the progression of time in the audio context, temporarily halting audio hardware access and reducing CPU/battery usage in the process.
+		@throws DOMError
 	**/
 	function suspend() : Promise<Void>;
-	/** @throws DOMError */
-	
-	/**
-		Resumes the progression of time in an audio context that has previously been suspended.
-	**/
-	function resume() : Promise<Void>;
-	/** @throws DOMError */
-	
+
 	/**
 		Closes the audio context, releasing any system audio resources that it uses.
+		@throws DOMError
 	**/
 	function close() : Promise<Void>;
-	/** @throws DOMError */
-	
-	/**
-		Creates a new, empty `AudioBuffer` object, which can then be populated by data and played via an `AudioBufferSourceNode`.
-	**/
-	function createBuffer( numberOfChannels : Int, length : Int, sampleRate : Float ) : AudioBuffer;
-	/** @throws DOMError */
-	
-	/**
-		Asynchronously decodes audio file data contained in an `ArrayBuffer`. In this case, the ArrayBuffer is usually loaded from an `XMLHttpRequest`'s `response` attribute after setting the `responseType` to `arraybuffer`. This method only works on complete files, not fragments of audio files.
-	**/
-	function decodeAudioData( audioData : js.html.ArrayBuffer, ?successCallback : AudioBuffer -> Void, ?errorCallback : Void -> Void ) : Promise<AudioBuffer>;
-	/** @throws DOMError */
-	
-	/**
-		Creates an `AudioBufferSourceNode`, which can be used to play and manipulate audio data contained within an `AudioBuffer` object. `AudioBuffer`s are created using `AudioContext.createBuffer` or returned by `AudioContext.decodeAudioData` when it successfully decodes an audio track.
-	**/
-	function createBufferSource() : AudioBufferSourceNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `MediaStreamAudioDestinationNode` associated with a `MediaStream` representing an audio stream which may be stored in a local file or sent to another computer.
-	**/
-	function createMediaStreamDestination() : MediaStreamAudioDestinationNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `ScriptProcessorNode`, which can be used for direct audio processing via JavaScript.
-	**/
-	function createScriptProcessor( ?bufferSize : Int = 0, ?numberOfInputChannels : Int = 2, ?numberOfOutputChannels : Int = 2 ) : ScriptProcessorNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `StereoPannerNode`, which can be used to apply stereo panning to an audio source.
-	**/
-	function createStereoPanner() : StereoPannerNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates an `AnalyserNode`, which can be used to expose audio time and frequency data and for example to create data visualisations.
-	**/
-	function createAnalyser() : AnalyserNode;
-	/** @throws DOMError */
-	
+
 	/**
 		Creates a `MediaElementAudioSourceNode` associated with an `HTMLMediaElement`. This can be used to play and manipulate audio from `video` or `audio` elements.
+		@throws DOMError
 	**/
 	function createMediaElementSource( mediaElement : js.html.MediaElement ) : MediaElementAudioSourceNode;
-	/** @throws DOMError */
-	
+
 	/**
 		Creates a `MediaStreamAudioSourceNode` associated with a `MediaStream` representing an audio stream which may come from the local computer microphone or other sources.
+		@throws DOMError
 	**/
 	function createMediaStreamSource( mediaStream : js.html.MediaStream ) : MediaStreamAudioSourceNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `GainNode`, which can be used to control the overall volume of the audio graph.
-	**/
-	function createGain() : GainNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `DelayNode`, which is used to delay the incoming audio signal by a certain amount. This node is also useful to create feedback loops in a Web Audio API graph.
-	**/
-	function createDelay( ?maxDelayTime : Float = 1.0 ) : DelayNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `BiquadFilterNode`, which represents a second order filter configurable as several different common filter types: high-pass, low-pass, band-pass, etc.
-	**/
-	function createBiquadFilter() : BiquadFilterNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `WaveShaperNode`, which is used to implement non-linear distortion effects.
-	**/
-	function createWaveShaper() : WaveShaperNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `PannerNode`, which is used to spatialise an incoming audio stream in 3D space.
-	**/
-	function createPanner() : PannerNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `ConvolverNode`, which can be used to apply convolution effects to your audio graph, for example a reverberation effect.
-	**/
-	function createConvolver() : ConvolverNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `ChannelSplitterNode`, which is used to access the individual channels of an audio stream and process them separately.
-	**/
-	function createChannelSplitter( ?numberOfOutputs : Int = 6 ) : ChannelSplitterNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `ChannelMergerNode`, which is used to combine channels from multiple audio streams into a single audio stream.
-	**/
-	function createChannelMerger( ?numberOfInputs : Int = 6 ) : ChannelMergerNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates a `DynamicsCompressorNode`, which can be used to apply acoustic compression to an audio signal.
-	**/
-	function createDynamicsCompressor() : DynamicsCompressorNode;
-	/** @throws DOMError */
-	
-	/**
-		Creates an `OscillatorNode`, a source representing a periodic waveform. It basically generates a tone.
-	**/
-	function createOscillator() : OscillatorNode;
-	/** @throws DOMError */
-	
+
 	/**
-		Creates a `PeriodicWave`, used to define a periodic waveform that can be used to determine the output of an `OscillatorNode`.
+		Creates a `MediaStreamAudioDestinationNode` associated with a `MediaStream` representing an audio stream which may be stored in a local file or sent to another computer.
+		@throws DOMError
 	**/
-	function createPeriodicWave( real : js.html.Float32Array, imag : js.html.Float32Array ) : PeriodicWave;
+	function createMediaStreamDestination() : MediaStreamAudioDestinationNode;
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionDebugShaders.hx b/std/js/html/audio/AudioContextOptions.hx
similarity index 54%
rename from std/js/html/webgl/ExtensionDebugShaders.hx
rename to std/js/html/audio/AudioContextOptions.hx
index 35ff37fc2270876da012f57c6d4c0b16f4c36ebb..17ace2ac46d1de5ba3af839c85b3d373962a5454 100644
--- a/std/js/html/webgl/ExtensionDebugShaders.hx
+++ b/std/js/html/audio/AudioContextOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,23 +20,21 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+// This file is generated from mozilla\AudioContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.audio;
 
 /**
-	The `WEBGL_debug_shaders` extension is part of the WebGL API and exposes a method to debug shaders from privileged contexts.
+	The `AudioContextOptions` dictionary is used to specify configuration options when constructing a new `AudioContext` object to represent a graph of web audio nodes.
 
-	Documentation [WEBGL_debug_shaders](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_debug_shaders) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_debug_shaders$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [AudioContextOptions](https://developer.mozilla.org/en-US/docs/Web/API/AudioContextOptions) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AudioContextOptions$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_debug_shaders>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioContextOptions>
 **/
-@:native("WEBGL_debug_shaders")
-extern class ExtensionDebugShaders
-{
+typedef AudioContextOptions = {
 	
 	/**
-		Returns the translated shader source.
+		The `BaseAudioContext.sampleRate` to be used by the `AudioContext`, specified in samples per second. The value may be any value supported by `AudioBuffer`. If not specified, the preferred sample rate for the context's output device is used by default.
 	**/
-	function getTranslatedShaderSource( shader : Shader ) : String;
+	var ?sampleRate : Float;
 }
\ No newline at end of file
diff --git a/std/js/html/AudioContextState.hx b/std/js/html/audio/AudioContextState.hx
similarity index 86%
rename from std/js/html/AudioContextState.hx
rename to std/js/html/audio/AudioContextState.hx
index cc5aada0e32f392f58f7d2f8a6afb98828cdaf5d..3b0df8cc62b498b4e687a144e1d3678d9f6043e3 100644
--- a/std/js/html/AudioContextState.hx
+++ b/std/js/html/audio/AudioContextState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\AudioContext.webidl. Do not edit!
+// This file is generated from mozilla\BaseAudioContext.webidl. Do not edit!
 
-package js.html;
+package js.html.audio;
 
-@:enum abstract AudioContextState(String)
-{
+enum abstract AudioContextState(String) {
 	var SUSPENDED = "suspended";
 	var RUNNING = "running";
 	var CLOSED = "closed";
diff --git a/std/js/html/audio/AudioDestinationNode.hx b/std/js/html/audio/AudioDestinationNode.hx
index 81714de2c42420cd8263b027e82b825e9c816c18..3d7533599228b0586e4e0babe4fc4424d12e7134 100644
--- a/std/js/html/audio/AudioDestinationNode.hx
+++ b/std/js/html/audio/AudioDestinationNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,18 +25,17 @@
 package js.html.audio;
 
 /**
-	`AudioDestinationNode` has no output (as it is the output, no more `AudioNode` can be linked after it in the audio graph) and one input. The amount of channels in the input must be between `0` and the `maxChannelCount` value or an exception is raised.
+	`AudioDestinationNode` has no output (as it is the output, no more `AudioNode` can be linked after it in the audio graph) and one input. The number of channels in the input must be between `0` and the `maxChannelCount` value or an exception is raised.
 
 	Documentation [AudioDestinationNode](https://developer.mozilla.org/en-US/docs/Web/API/AudioDestinationNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AudioDestinationNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioDestinationNode>
 **/
 @:native("AudioDestinationNode")
-extern class AudioDestinationNode extends AudioNode
-{
+extern class AudioDestinationNode extends AudioNode {
 	
 	/**
-		Is an `unsigned long` defining the maximum amount of channels that the physical device can handle.
+		Is an `unsigned long` defining the maximum number of channels that the physical device can handle.
 	**/
 	var maxChannelCount(default,null) : Int;
 	
diff --git a/std/js/html/audio/AudioListener.hx b/std/js/html/audio/AudioListener.hx
index 3e8fd020d416df2ccc678d07474e8a1e71765d13..cb2515825732a249dfb9ffe8d0577619cf6b06cc 100644
--- a/std/js/html/audio/AudioListener.hx
+++ b/std/js/html/audio/AudioListener.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,20 +32,7 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioListener>
 **/
 @:native("AudioListener")
-extern class AudioListener
-{
-	var dopplerFactor : Float;
-	var speedOfSound : Float;
-	
-	
-	/**
-		Sets the position of the listener. See `Deprecated features` to learn why this method was removed.
-	**/
+extern class AudioListener {
 	function setPosition( x : Float, y : Float, z : Float ) : Void;
-	
-	/**
-		Sets the orientation of the listener.
-	**/
 	function setOrientation( x : Float, y : Float, z : Float, xUp : Float, yUp : Float, zUp : Float ) : Void;
-	function setVelocity( x : Float, y : Float, z : Float ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/AudioNode.hx b/std/js/html/audio/AudioNode.hx
index 0368fe0b9a2c9d2d9f341294b7fc391ab125436c..ec15d0a5937541009ccf9cba0fdbf2ad9cda612e 100644
--- a/std/js/html/audio/AudioNode.hx
+++ b/std/js/html/audio/AudioNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,20 +25,19 @@
 package js.html.audio;
 
 /**
-	The `AudioNode` interface is a generic interface for representing an audio processing module like an audio source (e.g. an HTML `audio` or `video` element, an `OscillatorNode`, etc.), the audio destination, intermediate processing module (e.g. a filter like `BiquadFilterNode` or `ConvolverNode`), or volume control (like `GainNode`).
+	The `AudioNode` interface is a generic interface for representing an audio processing module. Examples include:
 
 	Documentation [AudioNode](https://developer.mozilla.org/en-US/docs/Web/API/AudioNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AudioNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioNode>
 **/
 @:native("AudioNode")
-extern class AudioNode extends js.html.EventTarget
-{
+extern class AudioNode extends js.html.EventTarget {
 	
 	/**
-		Returns the associated `AudioContext`, that is the object representing the processing graph the node is participating in.
+		Returns the associated `BaseAudioContext`, that is the object representing the processing graph the node is participating in.
 	**/
-	var context(default,null) : AudioContext;
+	var context(default,null) : BaseAudioContext;
 	
 	/**
 		Returns the number of inputs feeding the node. Source nodes are defined as nodes having a `numberOfInputs` property with a value of `0`.
@@ -67,17 +66,23 @@ extern class AudioNode extends js.html.EventTarget
 	**/
 	var channelInterpretation : ChannelInterpretation;
 	
-	/** @throws DOMError */
-	@:overload( function( destination : AudioNode, ?output : Int = 0, ?input : Int = 0 ) : AudioNode {} )
 	
 	/**
-		Allows us to connect one output of this node to one input of an audio parameter.
+		Allows us to connect the output of this node to be input into another node, either as audio data or as the value of an `AudioParam`.
+		@throws DOMError
 	**/
-	function connect( destination : AudioParam, ?output : Int = 0 ) : Void;
-	/** @throws DOMError */
+	@:overload( function( destination : AudioNode, output : Int = 0, input : Int = 0 ) : AudioNode {} )
+	function connect( destination : AudioParam, output : Int = 0 ) : Void;
 	
 	/**
 		Allows us to disconnect the current node from another one it is already connected to.
+		@throws DOMError
 	**/
-	function disconnect( ?output : Int = 0 ) : Void;
+	@:overload( function() : Void {} )
+	@:overload( function( output : Int ) : Void {} )
+	@:overload( function( destination : AudioNode ) : Void {} )
+	@:overload( function( destination : AudioNode, output : Int ) : Void {} )
+	@:overload( function( destination : AudioNode, output : Int, input : Int ) : Void {} )
+	@:overload( function( destination : AudioParam ) : Void {} )
+	function disconnect( destination : AudioParam, output : Int ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/AudioNodeOptions.hx b/std/js/html/audio/AudioNodeOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a563531b9c41905eac4f6318a325d9478f9c1652
--- /dev/null
+++ b/std/js/html/audio/AudioNodeOptions.hx
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\AudioNode.webidl. Do not edit!
+
+package js.html.audio;
+
+/**
+	The `AudioNodeOptions` dictionary of the Web Audio API specifies options that can be used when creating new `AudioNode` objects.
+
+	Documentation [AudioNodeOptions](https://developer.mozilla.org/en-US/docs/Web/API/AudioNodeOptions) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AudioNodeOptions$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioNodeOptions>
+**/
+typedef AudioNodeOptions = {
+	
+	/**
+		Represents an integer used to determine how many channels are used when up-mixing and down-mixing connections to any inputs to the node. (See `AudioNode.channelCount` for more information.) Its usage and precise definition depend on the value of `AudioNodeOptions.channelCountMode`.
+	**/
+	var ?channelCount : Int;
+	
+	/**
+		Represents an enumerated value describing the way channels must be matched between the node's inputs and outputs. (See `AudioNode.channelCountMode` for more information including default values.)
+	**/
+	var ?channelCountMode : ChannelCountMode;
+	
+	/**
+		Represents an enumerated value describing the meaning of the channels. This interpretation will define how audio up-mixing and down-mixing will happen.
+		
+			The possible values are `"speakers"` or `"discrete"`. (See `AudioNode.channelCountMode` for more information including default values.)
+	**/
+	var ?channelInterpretation : ChannelInterpretation;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/AudioParam.hx b/std/js/html/audio/AudioParam.hx
index b93947d83949480c6be4ec924efeb1a2009eb6df..dec4a04ae31e0c69497cabee310ced28037781ae 100644
--- a/std/js/html/audio/AudioParam.hx
+++ b/std/js/html/audio/AudioParam.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html.audio;
 
 /**
-	There are two kinds of `AudioParam`, a-rate and k-rate parameters:
+	The Web Audio API's `AudioParam` interface represents an audio-related parameter, usually a parameter of an `AudioNode` (such as `GainNode.gain`).
 
 	Documentation [AudioParam](https://developer.mozilla.org/en-US/docs/Web/API/AudioParam) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AudioParam$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioParam>
 **/
 @:native("AudioParam")
-extern class AudioParam
-{
+extern class AudioParam {
 	
 	/**
 		Represents the parameter's current volume as a floating point value; initially set to the value of `AudioParam.defaultValue`. Though it can be set, any modifications happening while there are automation events scheduled — that is events scheduled using the methods of the `AudioParam` — are ignored, without raising any exception.
@@ -45,40 +44,50 @@ extern class AudioParam
 	**/
 	var defaultValue(default,null) : Float;
 	
-	/** @throws DOMError */
+	/**
+		Represents the minimum possible value for the parameter's nominal (effective) range. 
+	**/
+	var minValue(default,null) : Float;
+	
+	/**
+		Represents the maximum possible value for the parameter's nominal (effective) range. 
+	**/
+	var maxValue(default,null) : Float;
+	
 	
 	/**
-		Schedules an instant change to the value of the `AudioParam` at a precise time, as measured against `AudioContext.currentTime`. The new value is given in the `value` parameter.
+		Schedules an instant change to the value of the `AudioParam` at a precise time, as measured against `AudioContext.currentTime`. The new value is given by the `value` parameter.
+		@throws DOMError
 	**/
-	function setValueAtTime( value : Float, startTime : Float ) : Void;
-	/** @throws DOMError */
+	function setValueAtTime( value : Float, startTime : Float ) : AudioParam;
 	
 	/**
 		Schedules a gradual linear change in the value of the `AudioParam`. The change starts at the time specified for the previous event, follows a linear ramp to the new value given in the `value` parameter, and reaches the new value at the time given in the `endTime` parameter.
+		@throws DOMError
 	**/
-	function linearRampToValueAtTime( value : Float, endTime : Float ) : Void;
-	/** @throws DOMError */
+	function linearRampToValueAtTime( value : Float, endTime : Float ) : AudioParam;
 	
 	/**
 		Schedules a gradual exponential change in the value of the `AudioParam`. The change starts at the time specified for the previous event, follows an exponential ramp to the new value given in the `value` parameter, and reaches the new value at the time given in the `endTime` parameter.
+		@throws DOMError
 	**/
-	function exponentialRampToValueAtTime( value : Float, endTime : Float ) : Void;
-	/** @throws DOMError */
+	function exponentialRampToValueAtTime( value : Float, endTime : Float ) : AudioParam;
 	
 	/**
 		Schedules the start of a change to the value of the `AudioParam`. The change starts at the time specified in `startTime` and exponentially moves towards the value given by the `target` parameter. The exponential decay rate is defined by the `timeConstant` parameter, which is a time measured in seconds.
+		@throws DOMError
 	**/
-	function setTargetAtTime( target : Float, startTime : Float, timeConstant : Float ) : Void;
-	/** @throws DOMError */
+	function setTargetAtTime( target : Float, startTime : Float, timeConstant : Float ) : AudioParam;
 	
 	/**
-		Schedules the values of the `AudioParam` to follow a set of values, defined by the `values` `Float32Array` scaled to fit into the given interval, starting at `startTime`, and having a specific `duration`.
+		Schedules the values of the `AudioParam` to follow a set of values, defined by an array of floating-point numbers scaled to fit into the given interval, starting at a given start time and spanning a given duration of time.
+		@throws DOMError
 	**/
-	function setValueCurveAtTime( values : js.html.Float32Array, startTime : Float, duration : Float ) : Void;
-	/** @throws DOMError */
+	function setValueCurveAtTime( values : Array<Float>, startTime : Float, duration : Float ) : AudioParam;
 	
 	/**
 		Cancels all scheduled future changes to the `AudioParam`.
+		@throws DOMError
 	**/
-	function cancelScheduledValues( startTime : Float ) : Void;
+	function cancelScheduledValues( startTime : Float ) : AudioParam;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/AudioProcessingEvent.hx b/std/js/html/audio/AudioProcessingEvent.hx
index 76811cda2c7e2e896c7c59a691ca69f478484dae..b9ee9f7cebe7c196aeaedf2449bbcb9f2e4df0db 100644
--- a/std/js/html/audio/AudioProcessingEvent.hx
+++ b/std/js/html/audio/AudioProcessingEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioProcessingEvent>
 **/
 @:native("AudioProcessingEvent")
-extern class AudioProcessingEvent extends js.html.Event
-{
+extern class AudioProcessingEvent extends js.html.Event {
 	var playbackTime(default,null) : Float;
 	var inputBuffer(default,null) : AudioBuffer;
 	var outputBuffer(default,null) : AudioBuffer;
diff --git a/std/js/html/webgl/ExtensionTextureFloatLinear.hx b/std/js/html/audio/AudioScheduledSourceNode.hx
similarity index 51%
rename from std/js/html/webgl/ExtensionTextureFloatLinear.hx
rename to std/js/html/audio/AudioScheduledSourceNode.hx
index ac4ddf3c48f600d5455d6f09981eb154ea8f7479..7aa5956b352ed646ce2557ce89775296ae7df49f 100644
--- a/std/js/html/webgl/ExtensionTextureFloatLinear.hx
+++ b/std/js/html/audio/AudioScheduledSourceNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,18 +20,27 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+// This file is generated from mozilla\AudioScheduledSourceNode.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.audio;
 
 /**
-	The `OES_texture_float_linear` extension is part of the WebGL API and allows linear filtering with floating-point pixel types for textures.
+	The `AudioScheduledSourceNode` interface—part of the Web Audio API—is a parent interface for several types of audio source node interfaces which share the ability to be started and stopped, optionally at specified times. Specifically, this interface defines the `start()` and `stop()` methods, as well as the `onended` event handler.
 
-	Documentation [OES_texture_float_linear](https://developer.mozilla.org/en-US/docs/Web/API/OES_texture_float_linear) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/OES_texture_float_linear$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [AudioScheduledSourceNode](https://developer.mozilla.org/en-US/docs/Web/API/AudioScheduledSourceNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/AudioScheduledSourceNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/OES_texture_float_linear>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/AudioScheduledSourceNode>
 **/
-@:native("OES_texture_float_linear")
-extern class ExtensionTextureFloatLinear
-{
+@:native("AudioScheduledSourceNode")
+extern class AudioScheduledSourceNode extends AudioNode {
+	
+	/**
+		A function to be called when the `ended` event is fired, indicating that the node has finished playing.
+	**/
+	var onended : haxe.Constraints.Function;
+	
+	/** @throws DOMError */
+	function start( when : Float = 0.0 ) : Void;
+	/** @throws DOMError */
+	function stop( when : Float = 0.0 ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ComputedTimingProperties.hx b/std/js/html/audio/AudioWorkletGlobalScope.hx
similarity index 71%
rename from std/js/html/ComputedTimingProperties.hx
rename to std/js/html/audio/AudioWorkletGlobalScope.hx
index df1ca05b6a8c1fa4496ae56877bf3ea5d9ad6430..ca45d0d7e7a35e8ddea0c0c58b7b02c53363ebfe 100644
--- a/std/js/html/ComputedTimingProperties.hx
+++ b/std/js/html/audio/AudioWorkletGlobalScope.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,16 +20,15 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\AnimationEffectReadOnly.webidl. Do not edit!
+// This file is generated from mozilla\AudioWorkletGlobalScope.webidl. Do not edit!
 
-package js.html;
+package js.html.audio;
 
-typedef ComputedTimingProperties =
-{
-	> AnimationEffectTimingProperties,
-	@:optional var activeDuration : Float;
-	@:optional var currentIteration : Float;
-	@:optional var endTime : Float;
-	@:optional var localTime : Float;
-	@:optional var progress : Float;
+@:native("AudioWorkletGlobalScope")
+extern class AudioWorkletGlobalScope extends js.html.WorkletGlobalScope {
+	var currentFrame(default,null) : Int;
+	var currentTime(default,null) : Float;
+	var sampleRate(default,null) : Float;
+	
+	function registerProcessor( name : String, processorCtor : Void -> Void ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/NotifyPaintEvent.hx b/std/js/html/audio/AudioWorkletNodeOptions.hx
similarity index 75%
rename from std/js/html/NotifyPaintEvent.hx
rename to std/js/html/audio/AudioWorkletNodeOptions.hx
index f95a7d478d989ee1945d1d3b5ea4842b7c49b59c..fbf2d89f3faee29bccd5482b05441c14611d3648 100644
--- a/std/js/html/NotifyPaintEvent.hx
+++ b/std/js/html/audio/AudioWorkletNodeOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,15 +20,14 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\NotifyPaintEvent.webidl. Do not edit!
+// This file is generated from mozilla\AudioWorkletNode.webidl. Do not edit!
 
-package js.html;
+package js.html.audio;
 
-@:native("NotifyPaintEvent")
-extern class NotifyPaintEvent extends Event
-{
-	var clientRects(default,null) : DOMRectList;
-	var boundingClientRect(default,null) : DOMRect;
-	var paintRequests(default,null) : PaintRequestList;
-	
+typedef AudioWorkletNodeOptions = AudioNodeOptions & {
+	var ?numberOfInputs : Int;
+	var ?numberOfOutputs : Int;
+	var ?outputChannelCount : Array<Int>;
+	var ?parameterData : haxe.DynamicAccess<Float>;
+	var ?processorOptions : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/DesktopNotification.hx b/std/js/html/audio/AudioWorkletProcessor.hx
similarity index 76%
rename from std/js/html/DesktopNotification.hx
rename to std/js/html/audio/AudioWorkletProcessor.hx
index c6ba12e62effaa33160615a09e6114405d1ed8ef..b1e7c413493077261bcc263e5d16d0c027323c81 100644
--- a/std/js/html/DesktopNotification.hx
+++ b/std/js/html/audio/AudioWorkletProcessor.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,16 +20,14 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DesktopNotification.webidl. Do not edit!
+// This file is generated from mozilla\AudioWorkletProcessor.webidl. Do not edit!
 
-package js.html;
+package js.html.audio;
 
-@:native("DesktopNotification")
-extern class DesktopNotification extends EventTarget
-{
-	var onclick : haxe.Constraints.Function;
-	var onclose : haxe.Constraints.Function;
+@:native("AudioWorkletProcessor")
+extern class AudioWorkletProcessor {
+	var port(default,null) : js.html.MessagePort;
 	
 	/** @throws DOMError */
-	function show() : Void;
+	function new( ?options : AudioWorkletNodeOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/BaseAudioContext.hx b/std/js/html/audio/BaseAudioContext.hx
new file mode 100644
index 0000000000000000000000000000000000000000..44654a7e942463c503256297370257256217913d
--- /dev/null
+++ b/std/js/html/audio/BaseAudioContext.hx
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\BaseAudioContext.webidl. Do not edit!
+
+package js.html.audio;
+
+import js.lib.Promise;
+
+/**
+	The `BaseAudioContext` interface acts as a base definition for online and offline audio-processing graphs, as represented by `AudioContext` and `OfflineAudioContext` respectively.
+
+	Documentation [BaseAudioContext](https://developer.mozilla.org/en-US/docs/Web/API/BaseAudioContext) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/BaseAudioContext$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/BaseAudioContext>
+**/
+@:native("BaseAudioContext")
+extern class BaseAudioContext extends js.html.EventTarget {
+
+	/**
+		Returns an `AudioDestinationNode` representing the final destination of all audio in the context. It can be thought of as the audio-rendering device.
+	**/
+	var destination(default,null) : AudioDestinationNode;
+
+	/**
+		Returns a float representing the sample rate (in samples per second) used by all nodes in this context. The sample-rate of an `AudioContext` cannot be changed.
+	**/
+	var sampleRate(default,null) : Float;
+
+	/**
+		Returns a double representing an ever-increasing hardware time in seconds used for scheduling. It starts at `0`.
+	**/
+	var currentTime(default,null) : Float;
+
+	/**
+		Returns the `AudioListener` object, used for 3D spatialization.
+	**/
+	var listener(default,null) : AudioListener;
+
+	/**
+		Returns the current state of the `AudioContext`.
+	**/
+	var state(default,null) : AudioContextState;
+
+	/**
+		An event handler that runs when an event of type `statechange` has fired. This occurs when the `AudioContext`'s state changes, due to the calling of one of the state change methods (`AudioContext.suspend`, `AudioContext.resume`, or `AudioContext.close`).
+	**/
+	var onstatechange : haxe.Constraints.Function;
+
+
+	/**
+		Resumes the progression of time in an audio context that has previously been suspended/paused.
+		@throws DOMError
+	**/
+	function resume() : Promise<Void>;
+
+	/**
+		Creates a new, empty `AudioBuffer` object, which can then be populated by data and played via an `AudioBufferSourceNode`.
+		@throws DOMError
+	**/
+	function createBuffer( numberOfChannels : Int, length : Int, sampleRate : Float ) : AudioBuffer;
+
+	/**
+		Asynchronously decodes audio file data contained in an `ArrayBuffer`. In this case, the ArrayBuffer is usually loaded from an `XMLHttpRequest`'s `response` attribute after setting the `responseType` to `arraybuffer`. This method only works on complete files, not fragments of audio files.
+		@throws DOMError
+	**/
+	@:overload( function( audioData : js.lib.ArrayBuffer, ?successCallback : AudioBuffer -> Void, ?errorCallback : Void -> Void ) : Promise<AudioBuffer> {} )
+	function decodeAudioData( audioData : js.lib.ArrayBuffer, ?successCallback : AudioBuffer -> Void, ?errorCallback : js.html.DOMException -> Void ) : Promise<AudioBuffer>;
+
+	/**
+		Creates an `AudioBufferSourceNode`, which can be used to play and manipulate audio data contained within an `AudioBuffer` object. `AudioBuffer`s are created using `AudioContext.createBuffer` or returned by `AudioContext.decodeAudioData` when it successfully decodes an audio track.
+		@throws DOMError
+	**/
+	function createBufferSource() : AudioBufferSourceNode;
+
+	/**
+		Creates a `ConstantSourceNode` object, which is an audio source that continuously outputs a monaural (one-channel) sound signal whose samples all have the same value.
+		@throws DOMError
+	**/
+	function createConstantSource() : ConstantSourceNode;
+
+	/**
+		Creates a `ScriptProcessorNode`, which can be used for direct audio processing via JavaScript.
+		@throws DOMError
+	**/
+	function createScriptProcessor( bufferSize : Int = 0, numberOfInputChannels : Int = 2, numberOfOutputChannels : Int = 2 ) : ScriptProcessorNode;
+
+	/**
+		Creates an `AnalyserNode`, which can be used to expose audio time and frequency data and for example to create data visualisations.
+		@throws DOMError
+	**/
+	function createAnalyser() : AnalyserNode;
+
+	/**
+		Creates a `GainNode`, which can be used to control the overall volume of the audio graph.
+		@throws DOMError
+	**/
+	function createGain() : GainNode;
+
+	/**
+		Creates a `DelayNode`, which is used to delay the incoming audio signal by a certain amount. This node is also useful to create feedback loops in a Web Audio API graph.
+		@throws DOMError
+	**/
+	function createDelay( maxDelayTime : Float = 1.0 ) : DelayNode;
+
+	/**
+		Creates a `BiquadFilterNode`, which represents a second order filter configurable as several different common filter types: high-pass, low-pass, band-pass, etc
+		@throws DOMError
+	**/
+	function createBiquadFilter() : BiquadFilterNode;
+
+	/**
+		Creates an `IIRFilterNode`, which represents a second order filter configurable as several different common filter types.
+		@throws DOMError
+	**/
+	function createIIRFilter( feedforward : Array<Float>, feedback : Array<Float> ) : IIRFilterNode;
+
+	/**
+		Creates a `WaveShaperNode`, which is used to implement non-linear distortion effects.
+		@throws DOMError
+	**/
+	function createWaveShaper() : WaveShaperNode;
+
+	/**
+		Creates a `PannerNode`, which is used to spatialise an incoming audio stream in 3D space.
+		@throws DOMError
+	**/
+	function createPanner() : PannerNode;
+
+	/**
+		Creates a `StereoPannerNode`, which can be used to apply stereo panning to an audio source.
+		@throws DOMError
+	**/
+	function createStereoPanner() : StereoPannerNode;
+
+	/**
+		Creates a `ConvolverNode`, which can be used to apply convolution effects to your audio graph, for example a reverberation effect.
+		@throws DOMError
+	**/
+	function createConvolver() : ConvolverNode;
+
+	/**
+		Creates a `ChannelSplitterNode`, which is used to access the individual channels of an audio stream and process them separately.
+		@throws DOMError
+	**/
+	function createChannelSplitter( numberOfOutputs : Int = 6 ) : ChannelSplitterNode;
+
+	/**
+		Creates a `ChannelMergerNode`, which is used to combine channels from multiple audio streams into a single audio stream.
+		@throws DOMError
+	**/
+	function createChannelMerger( numberOfInputs : Int = 6 ) : ChannelMergerNode;
+
+	/**
+		Creates a `DynamicsCompressorNode`, which can be used to apply acoustic compression to an audio signal.
+		@throws DOMError
+	**/
+	function createDynamicsCompressor() : DynamicsCompressorNode;
+
+	/**
+		Creates an `OscillatorNode`, a source representing a periodic waveform. It basically generates a tone.
+		@throws DOMError
+	**/
+	function createOscillator() : OscillatorNode;
+
+	/**
+		Creates a `PeriodicWave`, used to define a periodic waveform that can be used to determine the output of an `OscillatorNode`.
+		@throws DOMError
+	**/
+	function createPeriodicWave( real : js.lib.Float32Array, imag : js.lib.Float32Array, ?constraints : PeriodicWaveConstraints ) : PeriodicWave;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/BiquadFilterNode.hx b/std/js/html/audio/BiquadFilterNode.hx
index 67dabe8e779c23a473cbe6cb552c74416885f32e..5fcce9abf481cb7cb8fc2810ee070cd5120d8b34 100644
--- a/std/js/html/audio/BiquadFilterNode.hx
+++ b/std/js/html/audio/BiquadFilterNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,83 +32,82 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/BiquadFilterNode>
 **/
 @:native("BiquadFilterNode")
-extern class BiquadFilterNode extends AudioNode
-{
+extern class BiquadFilterNode extends AudioNode {
 	
 	/**
 		Is a string value defining the kind of filtering algorithm the node is implementing.<br>
-		  
-		 <table class="standard-table">
-		  The meaning of the different parameters depending of the type of the filter (detune has the same meaning regardless, so isn't listed below)
-		  
-		   <tr>
-		    <code>type</code>
-		    Description
-		    <code>frequency</code>
-		    <code>Q</code>
-		    <code>gain</code>
-		   </tr>
-		  
-		  
-		   <tr>
-		    <code>lowpass</code>
-		    <td>Standard second-order resonant lowpass filter with 12dB/octave rolloff. Frequencies below the cutoff pass through; frequencies above it are attenuated.</td>
-		    <td>The cutoff frequency.</td>
-		    <td>Indicates how peaked the frequency is around the cutoff. The greater the value is, the greater is the peak.</td>
-		    <td>Not used</td>
-		   </tr>
-		   <tr>
-		    <code>highpass</code>
-		    <td>Standard second-order resonant highpass filter with 12dB/octave rolloff. Frequencies below the cutoff are attenuated; frequencies above it pass through.</td>
-		    <td>The cutoff frequency.</td>
-		    <td>Indicates how peaked the frequency is around the cutoff. The greater the value, the greater the peak.</td>
-		    <td>Not used</td>
-		   </tr>
-		   <tr>
-		    <code>bandpass</code>
-		    <td>Standard second-order bandpass filter. Frequencies outside the given range of frequencies are attenuated; the frequencies inside it pass through.</td>
-		    <td>The center of the range of frequencies.</td>
-		    <td>Controls the width of the frequency band. The greater the <code>Q</code> value, the smaller the frequency band.</td>
-		    <td>Not used</td>
-		   </tr>
-		   <tr>
-		    <code>lowshelf</code>
-		    <td>Standard second-order lowshelf filer. Frequencies lower than the frequency get a boost, or an attenuation; frequencies over it are unchanged.</td>
-		    <td>The upper limit of the frequencies getting a boost or an attenuation.</td>
-		    <td>Not used</td>
-		    <td>The boost, in dB, to be applied; if negative, it will be an attenuation.</td>
-		   </tr>
-		   <tr>
-		    <code>highshelf</code>
-		    <td>Standard second-order highshelf filer. Frequencies higher than the frequency get a boost or an attenuation; frequencies lower than it are unchanged.</td>
-		    <td>The lower limit of the frequencies getting a boost or an attenuation.</td>
-		    <td>Not used</td>
-		    <td>The boost, in dB, to be applied; if negative, it will be an attenuation.</td>
-		   </tr>
-		   <tr>
-		    <code>peaking</code>
-		    <td>Frequencies inside the range get a boost or an attenuation; frequencies outside it are unchanged.</td>
-		    <td>The middle of the frequency range getting a boost or an attenuation.</td>
-		    <td>Controls the width of the frequency band. The greater the <code>Q</code> value, the smaller the frequency band.</td>
-		    <td>The boost, in dB, to be applied; if negative, it will be an attenuation.</td>
-		   </tr>
-		   <tr>
-		    <code>notch</code>
-		    <td>Standard notch filter, also called a band-stop or band-rejection filter. It is the opposite of a bandpass filter: frequencies outside the give range of frequencies pass through; frequencies inside it are attenuated.</td>
-		    <td>The center of the range of frequencies.</td>
-		    <td>Controls the width of the frequency band. The greater the <code>Q</code> value, the smaller the frequency band.</td>
-		    <td>Not used</td>
-		   </tr>
-		   <tr>
-		    <code>allpass</code>
-		    <td>Standard second-order allpass filter. It lets all frequencies through, but changes the phase-relationship between the various frequencies.</td>
-		    <td>The frequency with the maximal group delay, that is, the frequency where the center of the phase transition occurs.</td>
-		    <td>Controls how sharp the transition is at the medium frequency. The larger this parameter is, the sharper and larger the transition will be.</td>
-		    <td>Not used</td>
-		   </tr>
-		  
-		 </table>
-		 
+			 
+			<table class="standard-table">
+				The meaning of the different parameters depending of the type of the filter (detune has the same meaning regardless, so isn't listed below)
+				
+					<tr>
+						<code>type</code>
+						Description
+						<code>frequency</code>
+						<code>Q</code>
+						<code>gain</code>
+					</tr>
+				
+				
+					<tr>
+						<code>lowpass</code>
+						<td>Standard second-order resonant lowpass filter with 12dB/octave rolloff. Frequencies below the cutoff pass through; frequencies above it are attenuated.</td>
+						<td>The cutoff frequency.</td>
+						<td>Indicates how peaked the frequency is around the cutoff. The greater the value is, the greater is the peak.</td>
+						<td>Not used</td>
+					</tr>
+					<tr>
+						<code>highpass</code>
+						<td>Standard second-order resonant highpass filter with 12dB/octave rolloff. Frequencies below the cutoff are attenuated; frequencies above it pass through.</td>
+						<td>The cutoff frequency.</td>
+						<td>Indicates how peaked the frequency is around the cutoff. The greater the value, the greater the peak.</td>
+						<td>Not used</td>
+					</tr>
+					<tr>
+						<code>bandpass</code>
+						<td>Standard second-order bandpass filter. Frequencies outside the given range of frequencies are attenuated; the frequencies inside it pass through.</td>
+						<td>The center of the range of frequencies.</td>
+						<td>Controls the width of the frequency band. The greater the <code>Q</code> value, the smaller the frequency band.</td>
+						<td>Not used</td>
+					</tr>
+					<tr>
+						<code>lowshelf</code>
+						<td>Standard second-order lowshelf filter. Frequencies lower than the frequency get a boost, or an attenuation; frequencies over it are unchanged.</td>
+						<td>The upper limit of the frequencies getting a boost or an attenuation.</td>
+						<td>Not used</td>
+						<td>The boost, in dB, to be applied; if negative, it will be an attenuation.</td>
+					</tr>
+					<tr>
+						<code>highshelf</code>
+						<td>Standard second-order highshelf filter. Frequencies higher than the frequency get a boost or an attenuation; frequencies lower than it are unchanged.</td>
+						<td>The lower limit of the frequencies getting a boost or an attenuation.</td>
+						<td>Not used</td>
+						<td>The boost, in dB, to be applied; if negative, it will be an attenuation.</td>
+					</tr>
+					<tr>
+						<code>peaking</code>
+						<td>Frequencies inside the range get a boost or an attenuation; frequencies outside it are unchanged.</td>
+						<td>The middle of the frequency range getting a boost or an attenuation.</td>
+						<td>Controls the width of the frequency band. The greater the <code>Q</code> value, the smaller the frequency band.</td>
+						<td>The boost, in dB, to be applied; if negative, it will be an attenuation.</td>
+					</tr>
+					<tr>
+						<code>notch</code>
+						<td>Standard notch filter, also called a band-stop or band-rejection filter. It is the opposite of a bandpass filter: frequencies outside the give range of frequencies pass through; frequencies inside it are attenuated.</td>
+						<td>The center of the range of frequencies.</td>
+						<td>Controls the width of the frequency band. The greater the <code>Q</code> value, the smaller the frequency band.</td>
+						<td>Not used</td>
+					</tr>
+					<tr>
+						<code>allpass</code>
+						<td>Standard second-order allpass filter. It lets all frequencies through, but changes the phase-relationship between the various frequencies.</td>
+						<td>The frequency with the maximal group delay, that is, the frequency where the center of the phase transition occurs.</td>
+						<td>Controls how sharp the transition is at the medium frequency. The larger this parameter is, the sharper and larger the transition will be.</td>
+						<td>Not used</td>
+					</tr>
+				
+			</table>
+			
 	**/
 	var type : BiquadFilterType;
 	
@@ -132,9 +131,11 @@ extern class BiquadFilterNode extends AudioNode
 	**/
 	var gain(default,null) : AudioParam;
 	
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : BiquadFilterOptions ) : Void;
 	
 	/**
 		From the current filter parameter settings this method calculates the frequency response for frequencies specified in the provided array of frequencies.
 	**/
-	function getFrequencyResponse( frequencyHz : js.html.Float32Array, magResponse : js.html.Float32Array, phaseResponse : js.html.Float32Array ) : Void;
+	function getFrequencyResponse( frequencyHz : js.lib.Float32Array, magResponse : js.lib.Float32Array, phaseResponse : js.lib.Float32Array ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/BiquadFilterOptions.hx b/std/js/html/audio/BiquadFilterOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7894f06665c4e68d6128a3b9430de17c9ffa289d
--- /dev/null
+++ b/std/js/html/audio/BiquadFilterOptions.hx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\BiquadFilterNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef BiquadFilterOptions = AudioNodeOptions & {
+	var ?Q : Float;
+	var ?detune : Float;
+	var ?frequency : Float;
+	var ?gain : Float;
+	var ?type : BiquadFilterType;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/BiquadFilterType.hx b/std/js/html/audio/BiquadFilterType.hx
index 4d92c38f16386b505fe9114a4ad222fae1110b9b..9a0eadb3c2cc270b680106dde49cc02e5a10462c 100644
--- a/std/js/html/audio/BiquadFilterType.hx
+++ b/std/js/html/audio/BiquadFilterType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.audio;
 
-@:enum abstract BiquadFilterType(String)
-{
+enum abstract BiquadFilterType(String) {
 	var LOWPASS = "lowpass";
 	var HIGHPASS = "highpass";
 	var BANDPASS = "bandpass";
diff --git a/std/js/html/audio/ChannelCountMode.hx b/std/js/html/audio/ChannelCountMode.hx
index 1a204c702a87c6808956af24ab606dc6b45487be..a4c43af7d1fa7007809c2758d8b3c76bfb4a1f27 100644
--- a/std/js/html/audio/ChannelCountMode.hx
+++ b/std/js/html/audio/ChannelCountMode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.audio;
 
-@:enum abstract ChannelCountMode(String)
-{
+enum abstract ChannelCountMode(String) {
 	var MAX = "max";
 	var CLAMPED_MAX = "clamped-max";
 	var EXPLICIT = "explicit";
diff --git a/std/js/html/audio/ChannelInterpretation.hx b/std/js/html/audio/ChannelInterpretation.hx
index 2c5d6309368a9c7d1ffe44fe0be90e6e0bea595e..2e6ea22c288dc6bc8a56429d21b7ef1a8adc071f 100644
--- a/std/js/html/audio/ChannelInterpretation.hx
+++ b/std/js/html/audio/ChannelInterpretation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.audio;
 
-@:enum abstract ChannelInterpretation(String)
-{
+enum abstract ChannelInterpretation(String) {
 	var SPEAKERS = "speakers";
 	var DISCRETE = "discrete";
 }
\ No newline at end of file
diff --git a/std/js/html/audio/ChannelMergerNode.hx b/std/js/html/audio/ChannelMergerNode.hx
index 52c01d001272da1af00597644d0d2c02d6735313..d90c019b589ac99821b9902e182813aa3cf3656f 100644
--- a/std/js/html/audio/ChannelMergerNode.hx
+++ b/std/js/html/audio/ChannelMergerNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,7 @@
 package js.html.audio;
 
 @:native("ChannelMergerNode")
-extern class ChannelMergerNode extends AudioNode
-{
+extern class ChannelMergerNode extends AudioNode {
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : ChannelMergerOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/ChannelMergerOptions.hx b/std/js/html/audio/ChannelMergerOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b1e6f29859cb937435070bca577f785cffcfe106
--- /dev/null
+++ b/std/js/html/audio/ChannelMergerOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ChannelMergerNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef ChannelMergerOptions = AudioNodeOptions & {
+	var ?numberOfInputs : Int;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/ChannelSplitterNode.hx b/std/js/html/audio/ChannelSplitterNode.hx
index abde628f4bea49810496f3f2afbb064e87af61e6..908abe78f2a70f26d9f9d77829e783137f6853d5 100644
--- a/std/js/html/audio/ChannelSplitterNode.hx
+++ b/std/js/html/audio/ChannelSplitterNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,7 @@
 package js.html.audio;
 
 @:native("ChannelSplitterNode")
-extern class ChannelSplitterNode extends AudioNode
-{
+extern class ChannelSplitterNode extends AudioNode {
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : ChannelSplitterOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/ChannelSplitterOptions.hx b/std/js/html/audio/ChannelSplitterOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..78efb5afbe931ef2ddc3028def2403a641a6e29d
--- /dev/null
+++ b/std/js/html/audio/ChannelSplitterOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ChannelSplitterNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef ChannelSplitterOptions = AudioNodeOptions & {
+	var ?numberOfOutputs : Int;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/ConstantSourceNode.hx b/std/js/html/audio/ConstantSourceNode.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6cd2806c46b1082a95448b3311090b277cea4009
--- /dev/null
+++ b/std/js/html/audio/ConstantSourceNode.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ConstantSourceNode.webidl. Do not edit!
+
+package js.html.audio;
+
+/**
+	The `ConstantSourceNode` interface—part of the Web Audio API—represents an audio source (based upon `AudioScheduledSourceNode`) whose output is single unchanging value. This makes it useful for cases in which you need a constant value coming in from an audio source. In addition, it can be used like a constructible `AudioParam` by automating the value of its `offset` or by connecting another node to it; see Controlling multiple parameters with ConstantSourceNode.
+
+	Documentation [ConstantSourceNode](https://developer.mozilla.org/en-US/docs/Web/API/ConstantSourceNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/ConstantSourceNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/ConstantSourceNode>
+**/
+@:native("ConstantSourceNode")
+extern class ConstantSourceNode extends AudioScheduledSourceNode {
+	
+	/**
+		An `AudioParam` which specifies the value that this source continuously outputs. The default value is 1.0.
+	**/
+	var offset(default,null) : AudioParam;
+	
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : ConstantSourceOptions ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/ConstantSourceOptions.hx b/std/js/html/audio/ConstantSourceOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..da9d67ed3fd130d58cc247902475b9d014cf3b2c
--- /dev/null
+++ b/std/js/html/audio/ConstantSourceOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ConstantSourceNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef ConstantSourceOptions = {
+	var ?offset : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/ConvolverNode.hx b/std/js/html/audio/ConvolverNode.hx
index d6bc0b8520990c7aed4ec8387b6f5aca1e552fc6..cc5bdc6d47f84f79520a6eff9069877e99b481e8 100644
--- a/std/js/html/audio/ConvolverNode.hx
+++ b/std/js/html/audio/ConvolverNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html.audio;
 
 /**
-	The `ConvolverNode` interface is an `AudioNode` that performs a Linear Convolution on a given `AudioBuffer`, often used to achieve a reverb effect. A `ConvolverNode` always has exactly one input and one output.
+	The `ConvolverNode` interface is an `AudioNode` that performs a Linear Convolution on a given `AudioBuffer`, often used to achieve a reverb effect. A `ConvolverNode` always has exactly one input and one output.
 
 	Documentation [ConvolverNode](https://developer.mozilla.org/en-US/docs/Web/API/ConvolverNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/ConvolverNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ConvolverNode>
 **/
 @:native("ConvolverNode")
-extern class ConvolverNode extends AudioNode
-{
+extern class ConvolverNode extends AudioNode {
 	
 	/**
 		A mono, stereo, or 4-channel `AudioBuffer` containing the (possibly multichannel) impulse response used by the `ConvolverNode` to create the reverb effect.
@@ -45,4 +44,6 @@ extern class ConvolverNode extends AudioNode
 	**/
 	var normalize : Bool;
 	
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : ConvolverOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/ConvolverOptions.hx b/std/js/html/audio/ConvolverOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9b6faf0695cfd390023890c167aba3f7bf834b5e
--- /dev/null
+++ b/std/js/html/audio/ConvolverOptions.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\ConvolverNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef ConvolverOptions = AudioNodeOptions & {
+	var ?buffer : AudioBuffer;
+	var ?disableNormalization : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/DelayNode.hx b/std/js/html/audio/DelayNode.hx
index 13e4308301bd059bf5c44a479e011d5b4f75c8dc..1a57db6bc0c99463fc4161f822173084a9eeee29 100644
--- a/std/js/html/audio/DelayNode.hx
+++ b/std/js/html/audio/DelayNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,17 +25,20 @@
 package js.html.audio;
 
 /**
+	The `DelayNode` interface represents a delay-line; an `AudioNode` audio-processing module that causes a delay between the arrival of an input data and its propagation to the output.
+
 	Documentation [DelayNode](https://developer.mozilla.org/en-US/docs/Web/API/DelayNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/DelayNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DelayNode>
 **/
 @:native("DelayNode")
-extern class DelayNode extends AudioNode
-{
+extern class DelayNode extends AudioNode {
 	
 	/**
 		Is an a-rate `AudioParam` representing the amount of delay to apply.
 	**/
 	var delayTime(default,null) : AudioParam;
 	
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : DelayOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/DelayOptions.hx b/std/js/html/audio/DelayOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..71ab0e949cdc17f0654cd217d2892ac30fb22fdd
--- /dev/null
+++ b/std/js/html/audio/DelayOptions.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\DelayNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef DelayOptions = AudioNodeOptions & {
+	var ?delayTime : Float;
+	var ?maxDelayTime : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/DistanceModelType.hx b/std/js/html/audio/DistanceModelType.hx
index e4d74ed4775b74c7dd5c676e0face73cc7f9eea4..0c9db14e9d69bda0a6f4adf3b01aedddc034dfb2 100644
--- a/std/js/html/audio/DistanceModelType.hx
+++ b/std/js/html/audio/DistanceModelType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.audio;
 
-@:enum abstract DistanceModelType(String)
-{
+enum abstract DistanceModelType(String) {
 	var LINEAR = "linear";
 	var INVERSE = "inverse";
 	var EXPONENTIAL = "exponential";
diff --git a/std/js/html/audio/DynamicsCompressorNode.hx b/std/js/html/audio/DynamicsCompressorNode.hx
index 35c9434c32e8b25317fd5553018a4a2234f29de0..745b5226f772d557c2669b71c0c7357f87b96e89 100644
--- a/std/js/html/audio/DynamicsCompressorNode.hx
+++ b/std/js/html/audio/DynamicsCompressorNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,37 +32,38 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/DynamicsCompressorNode>
 **/
 @:native("DynamicsCompressorNode")
-extern class DynamicsCompressorNode extends AudioNode
-{
+extern class DynamicsCompressorNode extends AudioNode {
 	
 	/**
-		Is a `AudioParam` representing the decibel value above which the compression will start taking effect.
+		Is a k-rate `AudioParam` representing the decibel value above which the compression will start taking effect.
 	**/
 	var threshold(default,null) : AudioParam;
 	
 	/**
-		Is a `AudioParam` containing a decibel value representing the range above the threshold where the curve smoothly transitions to the compressed portion.
+		Is a k-rate `AudioParam` containing a decibel value representing the range above the threshold where the curve smoothly transitions to the compressed portion.
 	**/
 	var knee(default,null) : AudioParam;
 	
 	/**
-		Is a `AudioParam` representing the amount of change, in dB, needed in the input for a 1 dB change in the output.
+		Is a k-rate `AudioParam` representing the amount of change, in dB, needed in the input for a 1 dB change in the output.
 	**/
 	var ratio(default,null) : AudioParam;
 	
 	/**
-		Is a `float `representing the amount of gain reduction currently applied by the compressor to the signal.
+		Is a `float` representing the amount of gain reduction currently applied by the compressor to the signal.
 	**/
 	var reduction(default,null) : Float;
 	
 	/**
-		Is a `AudioParam` representing the amount of time, in seconds, required to reduce the gain by 10 dB.
+		Is a k-rate `AudioParam` representing the amount of time, in seconds, required to reduce the gain by 10 dB.
 	**/
 	var attack(default,null) : AudioParam;
 	
 	/**
-		Is a `AudioParam` representing the amount of time, in seconds, required to increase the gain by 10 dB.
+		Is a k-rate `AudioParam` representing the amount of time, in seconds, required to increase the gain by 10 dB.
 	**/
 	var release(default,null) : AudioParam;
 	
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : DynamicsCompressorOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/DynamicsCompressorOptions.hx b/std/js/html/audio/DynamicsCompressorOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8583e190ea14f39ed437c20266b5199ee97b20f3
--- /dev/null
+++ b/std/js/html/audio/DynamicsCompressorOptions.hx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\DynamicsCompressorNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef DynamicsCompressorOptions = AudioNodeOptions & {
+	var ?attack : Float;
+	var ?knee : Float;
+	var ?ratio : Float;
+	var ?release : Float;
+	var ?threshold : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/GainNode.hx b/std/js/html/audio/GainNode.hx
index e40561f301acd42fbf006721beab0b3dc7043110..bd75f2499fc186b2ef8b61feafed34dc42c6e320 100644
--- a/std/js/html/audio/GainNode.hx
+++ b/std/js/html/audio/GainNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,19 +25,20 @@
 package js.html.audio;
 
 /**
-	The gain is a unitless value, changing with time, that is multiplied to each corresponding sample of all input channels. If modified, the new gain is applied using a de-zippering algorithm in order to prevent unaesthetic 'clicks' from appearing in the resulting audio.
+	The `GainNode` interface represents a change in volume. It is an `AudioNode` audio-processing module that causes a given gain to be applied to the input data before its propagation to the output. A `GainNode` always has exactly one input and one output, both with the same number of channels.
 
 	Documentation [GainNode](https://developer.mozilla.org/en-US/docs/Web/API/GainNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/GainNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/GainNode>
 **/
 @:native("GainNode")
-extern class GainNode extends AudioNode
-{
+extern class GainNode extends AudioNode {
 	
 	/**
-		Is an a-rate `AudioParam` representing the amount of gain to apply.
+		Is an a-rate `AudioParam` representing the amount of gain to apply. You have to set `AudioParam.value` or use the methods of `AudioParam` to change the effect of gain.
 	**/
 	var gain(default,null) : AudioParam;
 	
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : GainOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/GainOptions.hx b/std/js/html/audio/GainOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5606134c707fe82cc428840a27d5009a5b298ecd
--- /dev/null
+++ b/std/js/html/audio/GainOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\GainNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef GainOptions = AudioNodeOptions & {
+	var ?gain : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/IIRFilterNode.hx b/std/js/html/audio/IIRFilterNode.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a16d14563c7928e62cec34c6566c2c9ce8778e4b
--- /dev/null
+++ b/std/js/html/audio/IIRFilterNode.hx
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\IIRFilterNode.webidl. Do not edit!
+
+package js.html.audio;
+
+/**
+	The `IIRFilterNode` interface of the Web Audio API is a `AudioNode` processor which implements a general infinite impulse response (IIR)  filter; this type of filter can be used to implement tone control devices and graphic equalizers as well. It lets the parameters of the filter response be specified, so that it can be tuned as needed.
+
+	Documentation [IIRFilterNode](https://developer.mozilla.org/en-US/docs/Web/API/IIRFilterNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/IIRFilterNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/IIRFilterNode>
+**/
+@:native("IIRFilterNode")
+extern class IIRFilterNode extends AudioNode {
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, options : IIRFilterOptions ) : Void;
+	function getFrequencyResponse( frequencyHz : js.lib.Float32Array, magResponse : js.lib.Float32Array, phaseResponse : js.lib.Float32Array ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/IIRFilterOptions.hx b/std/js/html/audio/IIRFilterOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5bbbf4de0b3cda9fa229be268c3ff6df06a3aff1
--- /dev/null
+++ b/std/js/html/audio/IIRFilterOptions.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\IIRFilterNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef IIRFilterOptions = AudioNodeOptions & {
+	var feedback : Array<Float>;
+	var feedforward : Array<Float>;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/MediaElementAudioSourceNode.hx b/std/js/html/audio/MediaElementAudioSourceNode.hx
index c82325e7629c8c49cf31d39eb57bc6e079599847..1eef5ba94df3baefd37f8b9f865d0a0510d650bd 100644
--- a/std/js/html/audio/MediaElementAudioSourceNode.hx
+++ b/std/js/html/audio/MediaElementAudioSourceNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,7 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaElementAudioSourceNode>
 **/
 @:native("MediaElementAudioSourceNode")
-extern class MediaElementAudioSourceNode extends AudioNode
-{
+extern class MediaElementAudioSourceNode extends AudioNode {
+	/** @throws DOMError */
+	function new( context : AudioContext, options : MediaElementAudioSourceOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/MediaElementAudioSourceOptions.hx b/std/js/html/audio/MediaElementAudioSourceOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..50c262a0b5b44126310531fd47c9da1fbd5e0c0d
--- /dev/null
+++ b/std/js/html/audio/MediaElementAudioSourceOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaElementAudioSourceNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef MediaElementAudioSourceOptions = {
+	var mediaElement : js.html.MediaElement;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/MediaStreamAudioDestinationNode.hx b/std/js/html/audio/MediaStreamAudioDestinationNode.hx
index 5e77a997ddaac184f1718eba6182c356f9785515..ac04889c0cfe014546463d62915f995cb96a4026 100644
--- a/std/js/html/audio/MediaStreamAudioDestinationNode.hx
+++ b/std/js/html/audio/MediaStreamAudioDestinationNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,12 +32,13 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamAudioDestinationNode>
 **/
 @:native("MediaStreamAudioDestinationNode")
-extern class MediaStreamAudioDestinationNode extends AudioNode
-{
+extern class MediaStreamAudioDestinationNode extends AudioNode {
 	
 	/**
 		Is a `MediaStream` containing a single `AudioMediaStreamTrack` with the same number of channels as the node itself. You can use this property to get a stream out of the audio graph and feed it into another construct, such as a Media Recorder.
 	**/
 	var stream(default,null) : js.html.MediaStream;
 	
+	/** @throws DOMError */
+	function new( context : AudioContext, ?options : AudioNodeOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/MediaStreamAudioSourceNode.hx b/std/js/html/audio/MediaStreamAudioSourceNode.hx
index 938054214c280616c44ec452fd8e486098b6d5bd..555cb76e1467f4f107853bf5cce0217f6ba04aaf 100644
--- a/std/js/html/audio/MediaStreamAudioSourceNode.hx
+++ b/std/js/html/audio/MediaStreamAudioSourceNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,13 +25,14 @@
 package js.html.audio;
 
 /**
-	A `MediaElementSourceNode` has no inputs and exactly one output, and is created using the `AudioContext.createMediaStreamSource` method. The amount of channels in the output equals the number of channels in `AudioMediaStreamTrack`. If there is no valid media stream, then the number of output channels will be one silent channel.
+	A `MediaStreamAudioSourceNode` has no inputs and exactly one output, and is created using the `AudioContext.createMediaStreamSource` method. The number of channels in the output equals the number of channels in `AudioMediaStreamTrack`. If there is no valid media stream, then the number of output channels will be one silent channel.
 
 	Documentation [MediaStreamAudioSourceNode](https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamAudioSourceNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamAudioSourceNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaStreamAudioSourceNode>
 **/
 @:native("MediaStreamAudioSourceNode")
-extern class MediaStreamAudioSourceNode extends AudioNode
-{
+extern class MediaStreamAudioSourceNode extends AudioNode {
+	/** @throws DOMError */
+	function new( context : AudioContext, options : MediaStreamAudioSourceOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/MediaStreamAudioSourceOptions.hx b/std/js/html/audio/MediaStreamAudioSourceOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b05e4e319ebd87e91c6de851004e011fb18b8865
--- /dev/null
+++ b/std/js/html/audio/MediaStreamAudioSourceOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaStreamAudioSourceNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef MediaStreamAudioSourceOptions = {
+	var mediaStream : js.html.MediaStream;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/OfflineAudioCompletionEvent.hx b/std/js/html/audio/OfflineAudioCompletionEvent.hx
index 1d9e69a15ad9a8a04fdfd1b6092e7f7b6d595683..15edf423cdfe73c15e87238a6f6cd695a8e2f399 100644
--- a/std/js/html/audio/OfflineAudioCompletionEvent.hx
+++ b/std/js/html/audio/OfflineAudioCompletionEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,9 +31,15 @@ package js.html.audio;
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/OfflineAudioCompletionEvent>
 **/
+@:deprecated("OfflineAudioCompletionEvent is deprecated")
 @:native("OfflineAudioCompletionEvent")
-extern class OfflineAudioCompletionEvent extends js.html.Event
-{
+extern class OfflineAudioCompletionEvent extends js.html.Event {
+	
+	/**
+		An `AudioBuffer` containing the result of processing an `OfflineAudioContext`.
+	**/
 	var renderedBuffer(default,null) : AudioBuffer;
 	
+	/** @throws DOMError */
+	function new( type : String, eventInitDict : js.html.OfflineAudioCompletionEventInit ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/OfflineAudioContext.hx b/std/js/html/audio/OfflineAudioContext.hx
index fd31663ca145455e74629b3dcc38ecb02aeef59b..0bbc8262440d0789817a75f9bf5ad05558eb2c9f 100644
--- a/std/js/html/audio/OfflineAudioContext.hx
+++ b/std/js/html/audio/OfflineAudioContext.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html.audio;
 
+import js.lib.Promise;
+
 /**
 	The `OfflineAudioContext` interface is an `AudioContext` interface representing an audio-processing graph built from linked together `AudioNode`s. In contrast with a standard `AudioContext`, an `OfflineAudioContext` doesn't render the audio to the device hardware; instead, it generates it, as fast as it can, and outputs the result to an `AudioBuffer`.
 
@@ -32,20 +34,25 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/OfflineAudioContext>
 **/
 @:native("OfflineAudioContext")
-extern class OfflineAudioContext extends AudioContext
-{
-	
+extern class OfflineAudioContext extends BaseAudioContext {
+
+	/**
+		An integer representing the size of the buffer in sample-frames.
+	**/
+	var length(default,null) : Int;
+
 	/**
 		Is an `EventHandler` called when processing is terminated, that is when the `complete` event (of type `OfflineAudioCompletionEvent`) is raised, after the event-based version of `OfflineAudioContext.startRendering()` is used.
 	**/
 	var oncomplete : haxe.Constraints.Function;
-	
+
 	/** @throws DOMError */
+	@:overload( function( contextOptions : OfflineAudioContextOptions ) : Void {} )
 	function new( numberOfChannels : Int, length : Int, sampleRate : Float ) : Void;
-	/** @throws DOMError */
-	
+
 	/**
 		Starts rendering the audio, taking into account the current connections and the current scheduled changes. This page covers both the event-based version and the promise-based version.
+		@throws DOMError
 	**/
 	function startRendering() : Promise<AudioBuffer>;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/OfflineAudioContextOptions.hx b/std/js/html/audio/OfflineAudioContextOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c141e6e93f57a1b6f40eade2d5e00c55427c49aa
--- /dev/null
+++ b/std/js/html/audio/OfflineAudioContextOptions.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\OfflineAudioContext.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef OfflineAudioContextOptions = {
+	var length : Int;
+	var ?numberOfChannels : Int;
+	var sampleRate : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/OscillatorNode.hx b/std/js/html/audio/OscillatorNode.hx
index 4b12ee46eb505843c751cccd9361b56b62b7d3b5..b27081e14a63a023e56ac7098303d2d816d77f53 100644
--- a/std/js/html/audio/OscillatorNode.hx
+++ b/std/js/html/audio/OscillatorNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,47 +25,35 @@
 package js.html.audio;
 
 /**
-	The `OscillatorNode` interface represents a periodic waveform, like a sine wave. It is an `AudioNode` audio-processing module that causes a given frequency of sine wave to be created — in effect, a constant tone.
+	The `OscillatorNode` interface represents a periodic waveform, such as a sine wave. It is an `AudioScheduledSourceNode` audio-processing module that causes a specified frequency of a given wave to be created—in effect, a constant tone.
 
 	Documentation [OscillatorNode](https://developer.mozilla.org/en-US/docs/Web/API/OscillatorNode) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/OscillatorNode$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/OscillatorNode>
 **/
 @:native("OscillatorNode")
-extern class OscillatorNode extends AudioNode
-{
+extern class OscillatorNode extends AudioScheduledSourceNode {
 	
 	/**
-		Represents the shape of the oscillator wave generated. Different waves will produce different tones.
+		A string which specifies the shape of waveform to play; this can be one of a number of standard values, or `custom` to use a `PeriodicWave` to describe a custom waveform. Different waves will produce different tones. Standard values are `"sine"`, `"square"`, `"sawtooth"`, `"triangle"` and `"custom"`. The default is `"sine"`.
 	**/
 	var type : OscillatorType;
 	
 	/**
-		An a-rate `AudioParam` representing the frequency of oscillation in hertz (though the AudioParam` returned is read-only, the value it represents is not.)
+		An a-rate `AudioParam` representing the frequency of oscillation in hertz (though the AudioParam` returned is read-only, the value it represents is not). The default value is 440 Hz (a standard middle-A note).
 	**/
 	var frequency(default,null) : AudioParam;
 	
 	/**
-		An a-rate `AudioParam` representing detuning of oscillation in cents (though the AudioParam` returned is read-only, the value it represents is not.)
+		An a-rate `AudioParam` representing detuning of oscillation in cents (though the AudioParam` returned is read-only, the value it represents is not). The default value is 0.
 	**/
 	var detune(default,null) : AudioParam;
-	var onended : haxe.Constraints.Function;
 	
 	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : OscillatorOptions ) : Void;
 	
 	/**
-		This method specifies the exact time to start playing the tone.
-	**/
-	function start( ?when : Float = 0.0 ) : Void;
-	/** @throws DOMError */
-	
-	/**
-		This method specifies the exact time to stop playing the tone.
-	**/
-	function stop( ?when : Float = 0.0 ) : Void;
-	
-	/**
-		Used to point to a `PeriodicWave` defining a periodic waveform that can be used to shape the oscillator's output, when `type = "custom"` is used. This replaces the now-obsolete `OscillatorNode.setWaveTable`.
+		Sets a `PeriodicWave` which describes a periodic waveform to be used instead of one of the standard waveforms; calling this sets the `type` to `custom`. This replaces the now-obsolete `OscillatorNode.setWaveTable()` method.
 	**/
 	function setPeriodicWave( periodicWave : PeriodicWave ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/OscillatorOptions.hx b/std/js/html/audio/OscillatorOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..87eff78bdcf8d42b2eeba96c0ffeba30cd867727
--- /dev/null
+++ b/std/js/html/audio/OscillatorOptions.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\OscillatorNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef OscillatorOptions = AudioNodeOptions & {
+	var ?detune : Float;
+	var ?frequency : Float;
+	var ?periodicWave : PeriodicWave;
+	var ?type : OscillatorType;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/OscillatorType.hx b/std/js/html/audio/OscillatorType.hx
index c6aae962d775bc0505b8a94375966c50a1f8cca3..3f65aa0ab42696fc7c27eb1360944950fef10102 100644
--- a/std/js/html/audio/OscillatorType.hx
+++ b/std/js/html/audio/OscillatorType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.audio;
 
-@:enum abstract OscillatorType(String)
-{
+enum abstract OscillatorType(String) {
 	var SINE = "sine";
 	var SQUARE = "square";
 	var SAWTOOTH = "sawtooth";
diff --git a/std/js/html/audio/OverSampleType.hx b/std/js/html/audio/OverSampleType.hx
index 3abd7dc055192b8e0f05504cd78e89687df42391..5ef69548e287457d30b0c63c238adfb46d2949ef 100644
--- a/std/js/html/audio/OverSampleType.hx
+++ b/std/js/html/audio/OverSampleType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.audio;
 
-@:enum abstract OverSampleType(String)
-{
+enum abstract OverSampleType(String) {
 	var NONE = "none";
 	var _2X = "2x";
 	var _4X = "4x";
diff --git a/std/js/html/audio/PannerNode.hx b/std/js/html/audio/PannerNode.hx
index 2e228b57c40ff2b1eacd2f572fab3081e61798a1..ce56c40bf5dc526c38d0100ec6d16098e38896d0 100644
--- a/std/js/html/audio/PannerNode.hx
+++ b/std/js/html/audio/PannerNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,14 +32,43 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PannerNode>
 **/
 @:native("PannerNode")
-extern class PannerNode extends AudioNode
-{
+extern class PannerNode extends AudioNode {
 	
 	/**
 		An enumerated value determining which spatialisation algorithm to use to position the audio in 3D space.
 	**/
 	var panningModel : PanningModelType;
 	
+	/**
+		Represents the horizontal position of the audio in a right-hand cartesian coordinate sytem. The default is 0. While this `AudioParam` cannot be directly changed, its value can be altered using its `AudioParam.value` property. The default is value is 0.
+	**/
+	var positionX(default,null) : AudioParam;
+	
+	/**
+		Represents the vertical position of the audio in a right-hand cartesian coordinate sytem. The default is 0. While this `AudioParam` cannot be directly changed, its value can be altered using its `AudioParam.value` property. The default is value is 0.
+	**/
+	var positionY(default,null) : AudioParam;
+	
+	/**
+		Represents the longitudinal (back and forth) position of the audio in a right-hand cartesian coordinate sytem. The default is 0. While this `AudioParam` cannot be directly changed, its value can be altered using its `AudioParam.value` property. The default is value is 0.
+	**/
+	var positionZ(default,null) : AudioParam;
+	
+	/**
+		Represents the horizontal position of the audio source's vector in a right-hand cartesian coordinate sytem. While this `AudioParam` cannot be directly changed, its value can be altered using its `AudioParam.value` property. The default is value is 1.
+	**/
+	var orientationX(default,null) : AudioParam;
+	
+	/**
+		Represents the vertical position of the audio source's vector in a right-hand cartesian coordinate sytem. The default is 0. While this `AudioParam` cannot be directly changed, its value can be altered using its `AudioParam.value` property. The default is value is 0.
+	**/
+	var orientationY(default,null) : AudioParam;
+	
+	/**
+		Represents the longitudinal (back and forth) position of the audio source's vector in a right-hand cartesian coordinate sytem. The default is 0. While this `AudioParam` cannot be directly changed, its value can be altered using its `AudioParam.value` property. The default is value is 0.
+	**/
+	var orientationZ(default,null) : AudioParam;
+	
 	/**
 		An enumerated value determining which algorithm to use to reduce the volume of the audio source as it moves away from the listener.
 	**/
@@ -75,6 +104,8 @@ extern class PannerNode extends AudioNode
 	**/
 	var coneOuterGain : Float;
 	
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : PannerOptions ) : Void;
 	
 	/**
 		Defines the position of the audio source relative to the listener (represented by an `AudioListener` object stored in the `AudioContext.listener` attribute.)
@@ -85,9 +116,4 @@ extern class PannerNode extends AudioNode
 		Defines the direction the audio source is playing in.
 	**/
 	function setOrientation( x : Float, y : Float, z : Float ) : Void;
-	
-	/**
-		Defines the velocity vector of the audio source — how fast it is moving and in what direction. In a previous version of the specification, the `PannerNode` had a velocity that could pitch up or down `AudioBufferSourceNode`s connected downstream. This feature was not clearly specified and had a number of issues, so it was removed from the specification.
-	**/
-	function setVelocity( x : Float, y : Float, z : Float ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/PannerOptions.hx b/std/js/html/audio/PannerOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..503175deb53f43ca832d9192e92a4d80d8e143cb
--- /dev/null
+++ b/std/js/html/audio/PannerOptions.hx
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PannerNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef PannerOptions = AudioNodeOptions & {
+	var ?coneInnerAngle : Float;
+	var ?coneOuterAngle : Float;
+	var ?coneOuterGain : Float;
+	var ?distanceModel : DistanceModelType;
+	var ?maxDistance : Float;
+	var ?orientationX : Float;
+	var ?orientationY : Float;
+	var ?orientationZ : Float;
+	var ?panningModel : PanningModelType;
+	var ?positionX : Float;
+	var ?positionY : Float;
+	var ?positionZ : Float;
+	var ?refDistance : Float;
+	var ?rolloffFactor : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/PanningModelType.hx b/std/js/html/audio/PanningModelType.hx
index 790ef0387cd8d402795b5a311b29f57accf24aff..594253f95a4b1d41125c8256d46fb836d01698f4 100644
--- a/std/js/html/audio/PanningModelType.hx
+++ b/std/js/html/audio/PanningModelType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.audio;
 
-@:enum abstract PanningModelType(String)
-{
+enum abstract PanningModelType(String) {
 	var EQUALPOWER = "equalpower";
 	var HRTF = "HRTF";
 }
\ No newline at end of file
diff --git a/std/js/html/audio/PeriodicWave.hx b/std/js/html/audio/PeriodicWave.hx
index e3f8421e4f5657a80de9d74c443e9a5e2ed1dcc7..080b81532e790e5073344c939c35836f5be65ef3 100644
--- a/std/js/html/audio/PeriodicWave.hx
+++ b/std/js/html/audio/PeriodicWave.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,13 +25,14 @@
 package js.html.audio;
 
 /**
-	`PeriodicWave` has no inputs or outputs; it is used to create custom oscillators via `OscillatorNode.setPeriodicWave`. The `PeriodicWave` itself is created/returned by `AudioContext.createPeriodicWave`.
+	`PeriodicWave` has no inputs or outputs; it is used to define custom oscillators when calling `OscillatorNode.setPeriodicWave()`. The `PeriodicWave` itself is created/returned by `AudioContext.createPeriodicWave()`.
 
 	Documentation [PeriodicWave](https://developer.mozilla.org/en-US/docs/Web/API/PeriodicWave) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PeriodicWave$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/PeriodicWave>
 **/
 @:native("PeriodicWave")
-extern class PeriodicWave
-{
+extern class PeriodicWave {
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : PeriodicWaveOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/PeriodicWaveConstraints.hx b/std/js/html/audio/PeriodicWaveConstraints.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3b79ac62ad8324ead5e59c67373c2d95558c9440
--- /dev/null
+++ b/std/js/html/audio/PeriodicWaveConstraints.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PeriodicWave.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef PeriodicWaveConstraints = {
+	var ?disableNormalization : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/PeriodicWaveOptions.hx b/std/js/html/audio/PeriodicWaveOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b19213a91cba3a0d103a41899db028bb2751e5a3
--- /dev/null
+++ b/std/js/html/audio/PeriodicWaveOptions.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PeriodicWave.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef PeriodicWaveOptions = PeriodicWaveConstraints & {
+	var ?imag : Array<Float>;
+	var ?real : Array<Float>;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/ScriptProcessorNode.hx b/std/js/html/audio/ScriptProcessorNode.hx
index 1141f09e2b0fb217003a6bd0e6f400b105bd0bf1..25a46355487a37218cd1e340d38d3215c18dc72d 100644
--- a/std/js/html/audio/ScriptProcessorNode.hx
+++ b/std/js/html/audio/ScriptProcessorNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,8 +30,7 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ScriptProcessorNode>
 **/
 @:native("ScriptProcessorNode")
-extern class ScriptProcessorNode extends AudioNode
-{
+extern class ScriptProcessorNode extends AudioNode {
 	
 	/**
 		Represents the `EventHandler` to be called.
diff --git a/std/js/html/audio/StereoPannerNode.hx b/std/js/html/audio/StereoPannerNode.hx
index 09b97558cf1048486c21c1db29a90bc093945c5a..0154b2857b6bcef677689e79915455838d706397 100644
--- a/std/js/html/audio/StereoPannerNode.hx
+++ b/std/js/html/audio/StereoPannerNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,12 +32,13 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/StereoPannerNode>
 **/
 @:native("StereoPannerNode")
-extern class StereoPannerNode extends AudioNode
-{
+extern class StereoPannerNode extends AudioNode {
 	
 	/**
 		Is an a-rate `AudioParam` representing the amount of panning to apply.
 	**/
 	var pan(default,null) : AudioParam;
 	
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : StereoPannerOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/StereoPannerOptions.hx b/std/js/html/audio/StereoPannerOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fa4c813a820bbd51e6942ae6dbb2bb6cec24b898
--- /dev/null
+++ b/std/js/html/audio/StereoPannerOptions.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\StereoPannerNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef StereoPannerOptions = AudioNodeOptions & {
+	var ?pan : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/audio/WaveShaperNode.hx b/std/js/html/audio/WaveShaperNode.hx
index 87d41e50bcb7e5a00067ca2405947c4c1bb72ecc..61ca1e032d11b5fc736b7f048f4378099482de95 100644
--- a/std/js/html/audio/WaveShaperNode.hx
+++ b/std/js/html/audio/WaveShaperNode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,17 +32,18 @@ package js.html.audio;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WaveShaperNode>
 **/
 @:native("WaveShaperNode")
-extern class WaveShaperNode extends AudioNode
-{
+extern class WaveShaperNode extends AudioNode {
 	
 	/**
 		Is a `Float32Array` of numbers describing the distortion to apply.
 	**/
-	var curve : js.html.Float32Array;
+	var curve : js.lib.Float32Array;
 	
 	/**
 		Is an enumerated value indicating if oversampling must be used. Oversampling is a technique for creating more samples (up-sampling) before applying the distortion effect to the audio signal.
 	**/
 	var oversample : OverSampleType;
 	
+	/** @throws DOMError */
+	function new( context : BaseAudioContext, ?options : WaveShaperOptions ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/audio/WaveShaperOptions.hx b/std/js/html/audio/WaveShaperOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2fdcf336ab6c82b5546b5cf37849f99691fd6a39
--- /dev/null
+++ b/std/js/html/audio/WaveShaperOptions.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WaveShaperNode.webidl. Do not edit!
+
+package js.html.audio;
+
+typedef WaveShaperOptions = AudioNodeOptions & {
+	var ?curve : Array<Float>;
+	var ?oversample : OverSampleType;
+}
\ No newline at end of file
diff --git a/std/js/html/compat/DataView.hx b/std/js/html/compat/DataView.hx
deleted file mode 100644
index df108933513a36f57ba01051a421c51fbcab19d4..0000000000000000000000000000000000000000
--- a/std/js/html/compat/DataView.hx
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C)2005-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 js.html.compat;
-
-#if !nodejs
-import haxe.io.Error;
-
-@:ifFeature("js.html.DataView.*")
-@:access(js.html.compat.ArrayBuffer)
-class DataView {
-
-	var buf : ArrayBuffer;
-	var offset : Int;
-	var length : Int;
-
-	public var byteLength(default,null):Int;
-	public var byteOffset(default,null):Int;
-	public var buffer(default,null):ArrayBuffer;
-
-	public function new( buffer : ArrayBuffer, ?byteOffset : Int, ?byteLength : Int ) : Void {
-		this.buf = buffer;
-		this.offset = byteOffset == null ? 0 : byteOffset;
-		this.length = byteLength == null ? buffer.byteLength - this.offset : byteLength;
-		if( offset < 0 || length < 0 || offset+length > buffer.byteLength )
-			throw OutsideBounds;
-		this.byteLength = length;
-		this.byteOffset = offset;
-		this.buffer = buf;
-	}
-
-	public function getInt8( byteOffset : Int ) : Int {
-		var v = buf.a[offset + byteOffset];
-		return v >= 0x80 ? v - 256 : v;
-	}
-
-	public function getUint8( byteOffset : Int ) : Int {
-		return buf.a[offset + byteOffset];
-	}
-
-	public function getInt16( byteOffset : Int, ?littleEndian : Bool ) : Int {
-		var v = getUint16(byteOffset, littleEndian);
-		return v >= 0x8000 ? v - 65536 : v;
-	}
-
-	public function getUint16( byteOffset : Int, ?littleEndian : Bool ) : Int {
-		return littleEndian ? buf.a[offset + byteOffset] | (buf.a[offset + byteOffset + 1] << 8) : (buf.a[offset + byteOffset]<<8) | buf.a[offset + byteOffset + 1];
-	}
-
-	public function getInt32( byteOffset : Int, ?littleEndian : Bool ) : Int {
-		var p = offset + byteOffset;
-		var a = buf.a[p++];
-		var b = buf.a[p++];
-		var c = buf.a[p++];
-		var d = buf.a[p++];
-		return littleEndian ? a | (b<<8) | (c<<16) | (d<<24) : d | (c << 8) | (b << 16) | (a << 24);
-	}
-
-	public function getUint32( byteOffset : Int, ?littleEndian : Bool ) : Int {
-		var v = getInt32(byteOffset, littleEndian);
-		return v < 0 ? cast (v + 4294967296.) : v;
-	}
-
-	public function getFloat32( byteOffset : Int, ?littleEndian : Bool ) : Float {
-		return haxe.io.FPHelper.i32ToFloat(getInt32(byteOffset,littleEndian));
-	}
-
-	public function getFloat64( byteOffset : Int, ?littleEndian : Bool ) : Float {
-		var a = getInt32(byteOffset, littleEndian);
-		var b = getInt32(byteOffset + 4, littleEndian);
-		return haxe.io.FPHelper.i64ToDouble(littleEndian?a:b,littleEndian?b:a);
-	}
-
-	public function setInt8( byteOffset : Int, value : Int ) : Void {
-		buf.a[byteOffset + offset] = (value < 0) ? (value + 128) & 0xFF : value & 0xFF;
-	}
-
-	public function setUint8( byteOffset : Int, value : Int ) : Void {
-		buf.a[byteOffset + offset] = value & 0xFF;
-	}
-
-	public function setInt16( byteOffset : Int, value : Int, ?littleEndian : Bool ) : Void {
-		setUint16(byteOffset, value < 0 ? value + 65536 : value, littleEndian);
-	}
-
-	public function setUint16( byteOffset : Int, value : Int, ?littleEndian : Bool ) : Void {
-		var p = byteOffset + offset;
-		if( littleEndian ) {
-			buf.a[p] = value&0xFF;
-			buf.a[p++] = (value>>8) & 0xFF;
-		} else {
-			buf.a[p++] = (value>>8) & 0xFF;
-			buf.a[p] = value&0xFF;
-		}
-	}
-
-	public function setInt32( byteOffset : Int, value : Int, ?littleEndian : Bool ) : Void {
-		setUint32(byteOffset, value, littleEndian);
-	}
-
-	public function setUint32( byteOffset : Int, value : Int, ?littleEndian : Bool ) : Void {
-		var p = byteOffset + offset;
-		if( littleEndian ) {
-			buf.a[p++] = value & 0xFF;
-			buf.a[p++] = (value>>8) & 0xFF;
-			buf.a[p++] = (value>>16) & 0xFF;
-			buf.a[p++] = value >>> 24;
-		} else {
-			buf.a[p++] = value >>> 24;
-			buf.a[p++] = (value>>16) & 0xFF;
-			buf.a[p++] = (value>>8) & 0xFF;
-			buf.a[p++] = value & 0xFF;
-		}
-	}
-
-	public function setFloat32( byteOffset : Int, value : Float, ?littleEndian : Bool ) : Void {
-		setUint32(byteOffset, haxe.io.FPHelper.floatToI32(value),littleEndian);
-	}
-
-	public function setFloat64( byteOffset : Int, value : Float, ?littleEndian : Bool ) : Void {
-		var i64 = haxe.io.FPHelper.doubleToI64(value);
-		if( littleEndian ) {
-			setUint32(byteOffset, i64.low);
-			setUint32(byteOffset, i64.high);
-		} else {
-			setUint32(byteOffset, i64.high);
-			setUint32(byteOffset, i64.low);
-		}
-	}
-
-	static function __init__() {
-		var DataView = untyped js.Lib.global.DataView || js.html.compat.DataView;
-	}
-
-}
-#end
\ No newline at end of file
diff --git a/std/js/html/compat/Float32Array.hx b/std/js/html/compat/Float32Array.hx
deleted file mode 100644
index 913ec49b8e83420985ebba3d2db7ee4ec4b4ada0..0000000000000000000000000000000000000000
--- a/std/js/html/compat/Float32Array.hx
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C)2005-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 js.html.compat;
-
-#if !nodejs
-import js.Lib.nativeThis;
-
-@:ifFeature("js.html.Float32Array.*")
-class Float32Array {
-
-	static var BYTES_PER_ELEMENT = 4;
-
-	static function _new( ?arg1 : Dynamic, ?offset : Int, ?length : Int ) : Dynamic {
-		var arr : Array<Float>;
-		if( untyped __typeof__(arg1) == 'number' ) {
-			arr = new Array();
-			for( i in 0...arg1 )
-				arr[i] = 0;
-			untyped {
-				arr.byteLength = arr.length << 2;
-				arr.byteOffset = 0;
-				arr.buffer = new ArrayBuffer([for( i in 0...arr.length << 2 ) 0]); // no sync
-			}
-		} else if( Std.is(arg1,ArrayBuffer) ) {
-			var buffer : ArrayBuffer = arg1;
-			if( offset == null ) offset = 0;
-			if( length == null ) length = (buffer.byteLength - offset) >> 2;
-			arr = [];
-			// decode buffer
-			for( i in 0...length ) {
-				var val = untyped buffer.a[offset++] | (buffer.a[offset++] << 8) | (buffer.a[offset++] << 16) | (buffer.a[offset++] << 24);
-				arr.push(haxe.io.FPHelper.i32ToFloat(val));
-			}
-			untyped {
-				arr.byteLength = arr.length<<2;
-				arr.byteOffset = offset;
-				arr.buffer = buffer;
-			}
-		} else if( Std.is(arg1, Array) ) {
-			arr = (arg1 : Array<Float>).copy();
-			// loss of memory sync between buffer and array
-			var buffer = [];
-			for( f in arr ) {
-				var i = haxe.io.FPHelper.floatToI32(f);
-				buffer.push(i&0xFF);
-				buffer.push((i>>8)&0xFF);
-				buffer.push((i>>16)&0xFF);
-				buffer.push(i>>>24);
-			}
-			untyped {
-				arr.byteLength = arr.length << 2;
-				arr.byteOffset = 0;
-				arr.buffer = new ArrayBuffer(buffer);
-			}
-		} else
-			throw "TODO "+arg1;
-		untyped {
-			arr.subarray = _subarray;
-			arr.set = _set;
-		}
-		return arr;
-	}
-
-	static function _set( ?arg : Dynamic, ?offset : Int ) {
-		if( Std.is(arg.buffer,ArrayBuffer) ) {
-			var a : Array<Int> = arg;
-			if( arg.byteLength + offset > nativeThis.byteLength )
-				throw "set() outside of range";
-			for( i in 0...arg.byteLength )
-				nativeThis[i + offset] = a[i];
-		} else if( Std.is(arg,Array) ) {
-			var a : Array<Int> = arg;
-			if( a.length + offset > nativeThis.byteLength )
-				throw "set() outside of range";
-			for( i in 0...a.length )
-				nativeThis[i + offset] = a[i];
-		} else
-			throw "TODO";
-	}
-
-	static function _subarray( start : Int, ?end : Int ) {
-		var a = _new(nativeThis.slice(start,end));
-		a.byteOffset = start * 4;
-		return a;
-	}
-
-	static function __init__() {
-		var Float32Array = untyped js.Lib.global.Float32Array || _new;
-	}
-
-}
-#end
\ No newline at end of file
diff --git a/std/js/html/compat/Float64Array.hx b/std/js/html/compat/Float64Array.hx
deleted file mode 100644
index 2873f8d66f992334b52ce2ee120707a4be60630e..0000000000000000000000000000000000000000
--- a/std/js/html/compat/Float64Array.hx
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C)2005-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 js.html.compat;
-
-#if !nodejs
-import js.Lib.nativeThis;
-
-@:ifFeature("js.html.Float64Array.*")
-class Float64Array {
-
-	static var BYTES_PER_ELEMENT = 8;
-
-	static function _new( ?arg1 : Dynamic, ?offset : Int, ?length : Int ) : Dynamic {
-		var arr : Array<Float>;
-		if( untyped __typeof__(arg1) == 'number' ) {
-			arr = new Array();
-			for( i in 0...arg1 )
-				arr[i] = 0;
-			untyped {
-				arr.byteLength = arr.length << 3;
-				arr.byteOffset = 0;
-				arr.buffer = new ArrayBuffer([for( i in 0...arr.length << 3 ) 0]); // no sync
-			}
-		} else if( Std.is(arg1,ArrayBuffer) ) {
-			var buffer : ArrayBuffer = arg1;
-			if( offset == null ) offset = 0;
-			if( length == null ) length = (buffer.byteLength - offset) >> 3;
-			arr = [];
-			// decode buffer
-			for( i in 0...length ) {
-				var val1 = untyped buffer.a[offset++] | (buffer.a[offset++] << 8) | (buffer.a[offset++] << 16) | (buffer.a[offset++] << 24);
-				var val2 = untyped buffer.a[offset++] | (buffer.a[offset++] << 8) | (buffer.a[offset++] << 16) | (buffer.a[offset++] << 24);
-				arr.push(haxe.io.FPHelper.i64ToDouble(val1,val2));
-			}
-			untyped {
-				arr.byteLength = arr.length<<3;
-				arr.byteOffset = offset;
-				arr.buffer = buffer;
-			}
-		} else if( Std.is(arg1, Array) ) {
-			arr = (arg1 : Array<Float>).copy();
-			// loss of memory sync between buffer and array
-			var buffer = [];
-			for( f in arr ) {
-				var v = haxe.io.FPHelper.doubleToI64(f);
-				var i = v.low;
-				buffer.push(i&0xFF);
-				buffer.push((i>>8)&0xFF);
-				buffer.push((i>>16)&0xFF);
-				buffer.push(i>>>24);
-				var i = v.high;
-				buffer.push(i&0xFF);
-				buffer.push((i>>8)&0xFF);
-				buffer.push((i>>16)&0xFF);
-				buffer.push(i>>>24);
-			}
-			untyped {
-				arr.byteLength = arr.length << 3;
-				arr.byteOffset = 0;
-				arr.buffer = new ArrayBuffer(buffer);
-			}
-		} else
-			throw "TODO "+arg1;
-		untyped {
-			arr.subarray = _subarray;
-			arr.set = _set;
-		}
-		return arr;
-	}
-
-	static function _set( ?arg : Dynamic, ?offset : Int ) {
-		if( Std.is(arg.buffer,ArrayBuffer) ) {
-			var a : Array<Int> = arg;
-			if( arg.byteLength + offset > nativeThis.byteLength )
-				throw "set() outside of range";
-			for( i in 0...arg.byteLength )
-				nativeThis[i + offset] = a[i];
-		} else if( Std.is(arg,Array) ) {
-			var a : Array<Int> = arg;
-			if( a.length + offset > nativeThis.byteLength )
-				throw "set() outside of range";
-			for( i in 0...a.length )
-				nativeThis[i + offset] = a[i];
-		} else
-			throw "TODO";
-	}
-
-	static function _subarray( start : Int, ?end : Int ) {
-		var a = _new(nativeThis.slice(start,end));
-		a.byteOffset = start * 8;
-		return a;
-	}
-
-	static function __init__() {
-		var Float64Array = untyped js.Lib.global.Float64Array || (js.Lib.global.Float32Array ? 'notsupported' : null) || _new;
-	}
-
-}
-#end
diff --git a/std/js/html/compat/Uint8Array.hx b/std/js/html/compat/Uint8Array.hx
deleted file mode 100644
index 210434ae2264eeff07270d5f3d9dd7c02284fcfe..0000000000000000000000000000000000000000
--- a/std/js/html/compat/Uint8Array.hx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C)2005-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 js.html.compat;
-
-#if !nodejs
-import js.Lib.nativeThis;
-
-@:ifFeature("js.html.Uint8Array.*")
-class Uint8Array {
-
-	static var BYTES_PER_ELEMENT = 1;
-
-	static function _new( ?arg1 : Dynamic, ?offset : Int, ?length : Int ) : Dynamic {
-		var arr;
-		if( untyped __typeof__(arg1) == 'number' ) {
-			arr = new Array();
-			for( i in 0...arg1 )
-				arr[i] = 0;
-			untyped {
-				arr.byteLength = arr.length;
-				arr.byteOffset = 0;
-				arr.buffer = new ArrayBuffer(arr);
-			}
-		} else if( Std.is(arg1,ArrayBuffer) ) {
-			var buffer : ArrayBuffer = arg1;
-			if( offset == null ) offset = 0;
-			if( length == null ) length = buffer.byteLength - offset;
-			if( offset == 0 )
-				arr = cast @:privateAccess buffer.a;
-			else
-				// here we are losing the fact that we should reference the same data,
-				// but I don't see another way to have this behaviour while keeping [] access
-				arr = cast @:privateAccess buffer.a.slice(offset, offset+length);
-			untyped {
-				arr.byteLength = arr.length;
-				arr.byteOffset = offset;
-				arr.buffer = buffer;
-			}
-		} else if( Std.is(arg1, Array) ) {
-			arr = (arg1 : Array<Int>).copy();
-			untyped {
-				arr.byteLength = arr.length;
-				arr.byteOffset = 0;
-				arr.buffer = new ArrayBuffer(arr);
-			}
-		} else
-			throw "TODO "+arg1;
-		untyped {
-			arr.subarray = _subarray;
-			arr.set = _set;
-		}
-		return arr;
-	}
-
-	static function _set( ?arg : Dynamic, ?offset : Int ) {
-		if( Std.is(arg.buffer,ArrayBuffer) ) {
-			var a : Array<Int> = arg;
-			if( arg.byteLength + offset > nativeThis.byteLength )
-				throw "set() outside of range";
-			for( i in 0...arg.byteLength )
-				nativeThis[i + offset] = a[i];
-		} else if( Std.is(arg,Array) ) {
-			var a : Array<Int> = arg;
-			if( a.length + offset > nativeThis.byteLength )
-				throw "set() outside of range";
-			for( i in 0...a.length )
-				nativeThis[i + offset] = a[i];
-		} else
-			throw "TODO";
-	}
-
-	static function _subarray( start : Int, ?end : Int ) {
-		var a = _new(nativeThis.slice(start,end));
-		a.byteOffset = start;
-		return a;
-	}
-
-	static function __init__() {
-		var Uint8Array = untyped js.Lib.global.Uint8Array || _new;
-	}
-
-}
-#end
\ No newline at end of file
diff --git a/std/js/html/DesktopNotificationCenter.hx b/std/js/html/eme/MediaEncryptedEvent.hx
similarity index 72%
rename from std/js/html/DesktopNotificationCenter.hx
rename to std/js/html/eme/MediaEncryptedEvent.hx
index 08e0985156eaf04376c696b2dbdf507c25724791..f074ac5dc75bf060aadde66c58cf28c5e28390cd 100644
--- a/std/js/html/DesktopNotificationCenter.hx
+++ b/std/js/html/eme/MediaEncryptedEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,15 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DesktopNotification.webidl. Do not edit!
+// This file is generated from mozilla\MediaEncryptedEvent.webidl. Do not edit!
 
-package js.html;
+package js.html.eme;
 
-@:native("DesktopNotificationCenter")
-extern class DesktopNotificationCenter
-{
-	function createNotification( title : String, description : String, ?iconURL : String = "" ) : DesktopNotification;
+@:native("MediaEncryptedEvent")
+extern class MediaEncryptedEvent extends js.html.Event {
+	var initDataType(default,null) : String;
+	var initData(default,null) : js.lib.ArrayBuffer;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : MediaKeyNeededEventInit ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeyError.hx b/std/js/html/eme/MediaKeyError.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a131a4a7d2a1fe6f4b9fe4e11b7b8349d4d2e1e0
--- /dev/null
+++ b/std/js/html/eme/MediaKeyError.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeyError.webidl. Do not edit!
+
+package js.html.eme;
+
+@:native("MediaKeyError")
+extern class MediaKeyError extends js.html.Event {
+	var systemCode(default,null) : Int;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeyMessageEvent.hx b/std/js/html/eme/MediaKeyMessageEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2bef2cf6fe83ea7de31db6cc19e9851dcf3b2101
--- /dev/null
+++ b/std/js/html/eme/MediaKeyMessageEvent.hx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeyMessageEvent.webidl. Do not edit!
+
+package js.html.eme;
+
+/**
+	The `MediaKeyMessageEvent` interface of the EncryptedMediaExtensions API contains the content and related data when the content decryption module generates a message for the session.
+
+	Documentation [MediaKeyMessageEvent](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeyMessageEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeyMessageEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaKeyMessageEvent>
+**/
+@:native("MediaKeyMessageEvent")
+extern class MediaKeyMessageEvent extends js.html.Event {
+	
+	/**
+		Indicates the type of message. May be one of `license-request`, `license-renewal`, `license-renewal`, or `individualization-request`.
+	**/
+	var messageType(default,null) : MediaKeyMessageType;
+	
+	/**
+		Returns an `ArrayBuffer` with a message from the content decryption module. Messages vary by key system.
+	**/
+	var message(default,null) : js.lib.ArrayBuffer;
+	
+	/** @throws DOMError */
+	function new( type : String, eventInitDict : MediaKeyMessageEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeyMessageEventInit.hx b/std/js/html/eme/MediaKeyMessageEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0beeac0b05d3a837a0754c27f1882ac0e1da4cac
--- /dev/null
+++ b/std/js/html/eme/MediaKeyMessageEventInit.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeyMessageEvent.webidl. Do not edit!
+
+package js.html.eme;
+
+typedef MediaKeyMessageEventInit = EventInit & {
+	var message : js.lib.ArrayBuffer;
+	var messageType : MediaKeyMessageType;
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeyMessageType.hx b/std/js/html/eme/MediaKeyMessageType.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7ef58cbce83334b8aa92b29d0521b987fa0d6323
--- /dev/null
+++ b/std/js/html/eme/MediaKeyMessageType.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeyMessageEvent.webidl. Do not edit!
+
+package js.html.eme;
+
+enum abstract MediaKeyMessageType(String) {
+	var LICENSE_REQUEST = "license-request";
+	var LICENSE_RENEWAL = "license-renewal";
+	var LICENSE_RELEASE = "license-release";
+	var INDIVIDUALIZATION_REQUEST = "individualization-request";
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeyNeededEventInit.hx b/std/js/html/eme/MediaKeyNeededEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b64068b188fbf6569f04ac77eefdb6a5d9bfb11f
--- /dev/null
+++ b/std/js/html/eme/MediaKeyNeededEventInit.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaEncryptedEvent.webidl. Do not edit!
+
+package js.html.eme;
+
+typedef MediaKeyNeededEventInit = EventInit & {
+	var ?initData : js.lib.ArrayBuffer;
+	var ?initDataType : String;
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeySession.hx b/std/js/html/eme/MediaKeySession.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ce8c74db453872b98085f814f8fea7eb3fc0751c
--- /dev/null
+++ b/std/js/html/eme/MediaKeySession.hx
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeySession.webidl. Do not edit!
+
+package js.html.eme;
+
+import js.lib.Promise;
+
+/**
+	The `MediaKeySession` interface of the EncryptedMediaExtensions API represents a context for message exchange with a content decryption module (CDM).
+
+	Documentation [MediaKeySession](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySession) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySession$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySession>
+**/
+@:native("MediaKeySession")
+extern class MediaKeySession extends js.html.EventTarget {
+	var error(default,null) : MediaKeyError;
+
+	/**
+		Contains a unique string generated by the CDM for the current media object and its associated keys or licenses.
+	**/
+	var sessionId(default,null) : String;
+
+	/**
+		The time after which the keys in the current session can no longer be used to decrypt media data, or `NaN` if no such time exists. This value is determined by the CDM and measured in milliseconds since January 1, 1970, UTC. This value may change during a session lifetime, such as when an action triggers the start of a window.
+	**/
+	var expiration(default,null) : Float;
+
+	/**
+		Returns a `Promise` signaling when a `MediaKeySession` closes. This promise can only be fulfilled and is never rejected. Closing a session means that licenses and keys associated with it are no longer valid for decrypting media data. 
+	**/
+	var closed(default,null) : Promise<Void>;
+
+	/**
+		Contains a reference to a read-only `MediaKeyStatusMap` of the current session's keys and their statuses.
+	**/
+	var keyStatuses(default,null) : MediaKeyStatusMap;
+
+	/**
+		Sets the `EventHandler` called when there has been a change in the keys in a session or their statuses.
+	**/
+	var onkeystatuseschange : haxe.Constraints.Function;
+
+	/**
+		Sets the `EventHandler` called when the content decryption module has generated a message for the session.
+	**/
+	var onmessage : haxe.Constraints.Function;
+
+
+	/**
+		Returns a `Promise` after generating a media request based on initialization data.
+	**/
+	@:overload( function( initDataType : String, initData : js.lib.ArrayBuffer) : Promise<Void> {} )
+	function generateRequest( initDataType : String, initData : js.lib.ArrayBufferView ) : Promise<Void>;
+
+	/**
+		Returns a `Promise` that resolves to a boolean value after loading data for a specified session object. 
+	**/
+	function load( sessionId : String ) : Promise<Bool>;
+
+	/**
+		Returns a `Promise` after loading messages and licenses to the CDM.
+	**/
+	@:overload( function( response : js.lib.ArrayBuffer) : Promise<Void> {} )
+	function update( response : js.lib.ArrayBufferView ) : Promise<Void>;
+
+	/**
+
+		 Returns a `Promise` after notifying the current media session is no longer needed and that the CDM should release any resources associated with this object and close it.
+
+	**/
+	function close() : Promise<Void>;
+
+	/**
+		Returns a `Promise` after removing any session data associated with the current object.
+	**/
+	function remove() : Promise<Void>;
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeySessionType.hx b/std/js/html/eme/MediaKeySessionType.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a70325f8ada6c2496065e22dbdc0d281a416c0c8
--- /dev/null
+++ b/std/js/html/eme/MediaKeySessionType.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeys.webidl. Do not edit!
+
+package js.html.eme;
+
+enum abstract MediaKeySessionType(String) {
+	var TEMPORARY = "temporary";
+	var PERSISTENT_LICENSE = "persistent-license";
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeyStatusMap.hx b/std/js/html/eme/MediaKeyStatusMap.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f3f7a99f481467d4617674818c9be6fe523851ac
--- /dev/null
+++ b/std/js/html/eme/MediaKeyStatusMap.hx
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeyStatusMap.webidl. Do not edit!
+
+package js.html.eme;
+
+/**
+	The `MediaKeyStatusMap` interface of the EncryptedMediaExtensions API is a read-only map of media key statuses by key IDs.
+
+	Documentation [MediaKeyStatusMap](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeyStatusMap) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeyStatusMap$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaKeyStatusMap>
+**/
+@:native("MediaKeyStatusMap")
+extern class MediaKeyStatusMap {
+	
+	/**
+		Returns the number of key/value pars in the status map.
+	**/
+	var size(default,null) : Int;
+	
+	
+	/**
+		Returns a boolean asserting whether a value has been associated with the given key.
+	**/
+	@:overload( function( keyId : js.lib.ArrayBuffer) : Bool {} )
+	function has( keyId : js.lib.ArrayBufferView ) : Bool;
+	
+	/**
+		Returns the value associated with the given key, or `undefined` if there is none.
+		@throws DOMError
+	**/
+	@:overload( function( keyId : js.lib.ArrayBuffer) : Dynamic {} )
+	function get( keyId : js.lib.ArrayBufferView ) : Dynamic;
+	
+	/**
+		Returns a new `Iterator` object containing an array of `[key, value]` for each element in the status map, in insertion order.
+		@throws DOMError
+	**/
+	function entries() : js.html.MediaKeyStatusMapIterator;
+	
+	/**
+		Returns a new `Iterator` object containing keys for each element in the status map, in insertion order.
+		@throws DOMError
+	**/
+	function keys() : js.html.MediaKeyStatusMapIterator;
+	
+	/**
+		Returns a new `Iterator` object containing values for each element in the status map, in insertion order.
+		@throws DOMError
+	**/
+	function values() : js.html.MediaKeyStatusMapIterator;
+	
+	/**
+		Calls `callback` once for each key-value pair in the status map, in insertion order. If `argument` is present it will be passed to the callback.
+		@throws DOMError
+	**/
+	function forEach( callback : Dynamic, ?thisArg : Dynamic ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeySystemAccess.hx b/std/js/html/eme/MediaKeySystemAccess.hx
new file mode 100644
index 0000000000000000000000000000000000000000..54b4910fbb92598852a3d9f55be7dfca90b9e209
--- /dev/null
+++ b/std/js/html/eme/MediaKeySystemAccess.hx
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeySystemAccess.webidl. Do not edit!
+
+package js.html.eme;
+
+import js.lib.Promise;
+
+/**
+	The `MediaKeySystemAccess` interface of the EncryptedMediaExtensions API provides access to a Key System for decryption and/or a content protection provider. You can request an instance of this object using the `Navigator.requestMediaKeySystemAccess` method.
+
+	Documentation [MediaKeySystemAccess](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemAccess) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemAccess$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemAccess>
+**/
+@:native("MediaKeySystemAccess")
+extern class MediaKeySystemAccess {
+
+	/**
+		Returns a `DOMString` identifying the key system being used.
+	**/
+	var keySystem(default,null) : String;
+
+
+	/**
+		Returns a `MediaKeySystemConfiguration` object with the supported combination of configuration options.
+	**/
+	function getConfiguration() : MediaKeySystemConfiguration;
+
+	/**
+		Returns a `Promise` that resolves to a new `MediaKeys` object.
+	**/
+	function createMediaKeys() : Promise<MediaKeys>;
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeySystemConfiguration.hx b/std/js/html/eme/MediaKeySystemConfiguration.hx
new file mode 100644
index 0000000000000000000000000000000000000000..02c7545e3f97f365b8e2f53b6a02a236bc44ee51
--- /dev/null
+++ b/std/js/html/eme/MediaKeySystemConfiguration.hx
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeySystemAccess.webidl. Do not edit!
+
+package js.html.eme;
+
+/**
+	The `MediaKeySystemConfiguration` interface Encrypted Media Extensions API provides configuration information about the media key system.
+
+	Documentation [MediaKeySystemConfiguration](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemConfiguration) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemConfiguration$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemConfiguration>
+**/
+typedef MediaKeySystemConfiguration = {
+	
+	/**
+		Returns a list of supported audio type and capability pairs.
+	**/
+	var ?audioCapabilities : Array<MediaKeySystemMediaCapability>;
+	
+	/**
+		Indicates whether a persistent distinctive identifier is required.
+	**/
+	var ?distinctiveIdentifier : MediaKeysRequirement;
+	
+	/**
+		Returns a list of supported initialization data type names. An initialization data type is a string indicating the format of the initialization data.
+	**/
+	var ?initDataTypes : Array<String>;
+	var ?label : String;
+	
+	/**
+		Indicates whether the ability to persist state is required.
+	**/
+	var ?persistentState : MediaKeysRequirement;
+	var ?sessionTypes : Array<String>;
+	
+	/**
+		Returns a list of supported video type and capability pairs.
+	**/
+	var ?videoCapabilities : Array<MediaKeySystemMediaCapability>;
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeySystemMediaCapability.hx b/std/js/html/eme/MediaKeySystemMediaCapability.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1a64da34282a4f72f68f67cd0dbac065fc1112ff
--- /dev/null
+++ b/std/js/html/eme/MediaKeySystemMediaCapability.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeySystemAccess.webidl. Do not edit!
+
+package js.html.eme;
+
+typedef MediaKeySystemMediaCapability = {
+	var ?contentType : String;
+	var ?robustness : String;
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeys.hx b/std/js/html/eme/MediaKeys.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b6811483fc3b0a1dc4f595d5c89ef150a36b1327
--- /dev/null
+++ b/std/js/html/eme/MediaKeys.hx
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeys.webidl. Do not edit!
+
+package js.html.eme;
+
+import js.lib.Promise;
+
+/**
+	The `MediaKeys` interface of EncryptedMediaExtensions API the represents a set of keys that an associated `HTMLMediaElement` can use for decryption of media data during playback.
+
+	Documentation [MediaKeys](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeys) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MediaKeys$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MediaKeys>
+**/
+@:native("MediaKeys")
+extern class MediaKeys {
+	var keySystem(default,null) : String;
+
+
+	/**
+		Returns a new `MediaKeySession` object, which represents a context for message exchange with a content decryption module (CDM).
+		@throws DOMError
+	**/
+	function createSession( sessionType : MediaKeySessionType = TEMPORARY ) : MediaKeySession;
+
+	/**
+		Returns a `Promise` to a server certificate to be used to encrypt messages to the license server.
+	**/
+	@:overload( function( serverCertificate : js.lib.ArrayBuffer) : Promise<Void> {} )
+	function setServerCertificate( serverCertificate : js.lib.ArrayBufferView ) : Promise<Void>;
+}
\ No newline at end of file
diff --git a/std/js/html/eme/MediaKeysRequirement.hx b/std/js/html/eme/MediaKeysRequirement.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4046a2410d90cccd2646d300ee8961bda792ac98
--- /dev/null
+++ b/std/js/html/eme/MediaKeysRequirement.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MediaKeySystemAccess.webidl. Do not edit!
+
+package js.html.eme;
+
+enum abstract MediaKeysRequirement(String) {
+	var REQUIRED = "required";
+	var OPTIONAL = "optional";
+	var NOT_ALLOWED = "not-allowed";
+}
\ No newline at end of file
diff --git a/std/js/html/idb/Cursor.hx b/std/js/html/idb/Cursor.hx
index 5736f89b0e37be09c606c81e58d172d3edbe8069..bb4e74da0590d1bd7f9ceb3586bb3061ed280a3b 100644
--- a/std/js/html/idb/Cursor.hx
+++ b/std/js/html/idb/Cursor.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.idb;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBCursor>
 **/
 @:native("IDBCursor")
-extern class Cursor
-{
+extern class Cursor {
 	
 	/**
 		Returns the `IDBObjectStore` or `IDBIndex` that the cursor is iterating. This function never returns null or throws an exception, even if the cursor is currently being iterated, has iterated past its end, or its transaction is not active.
@@ -55,22 +54,35 @@ extern class Cursor
 	**/
 	var primaryKey(default,null) : Dynamic;
 	
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object, and, in a separate thread, updates the value at the current position of the cursor in the object store. This can be used to update specific records.
+		@throws DOMError
 	**/
 	function update( value : Dynamic ) : Request;
-	/** @throws DOMError */
 	
 	/**
 		Sets the number times a cursor should move its position forward.
+		@throws DOMError
 	**/
 	function advance( count : Int ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		Advances the cursor to the next position along its direction, to the item whose key matches the optional `key` parameter.
+		@throws DOMError
+	**/
 	@:native("continue")
 	function continue_( ?key : Dynamic ) : Void;
-	/** @throws DOMError */
-	@:native("delete")
-	function delete_() : Request;
+	
+	/**
+		Sets the cursor to the given index key and primary key given as arguments.
+		@throws DOMError
+	**/
+	function continuePrimaryKey( key : Dynamic, primaryKey : Dynamic ) : Void;
+	
+	/**
+		Returns an `IDBRequest` object, and, in a separate thread, deletes the record at the cursor's position, without changing the cursor's position. This can be used to delete specific records.
+		@throws DOMError
+	**/
+	function delete() : Request;
 }
\ No newline at end of file
diff --git a/std/js/html/idb/CursorDirection.hx b/std/js/html/idb/CursorDirection.hx
index 84bfdf89f0d1f68f360ddeb87ef46353c351a53e..6b6e2e926280959bed5d5afbd4342398e5adf4e7 100644
--- a/std/js/html/idb/CursorDirection.hx
+++ b/std/js/html/idb/CursorDirection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.idb;
 
-@:enum abstract CursorDirection(String)
-{
+enum abstract CursorDirection(String) {
 	var NEXT = "next";
 	var NEXTUNIQUE = "nextunique";
 	var PREV = "prev";
diff --git a/std/js/html/idb/CursorWithValue.hx b/std/js/html/idb/CursorWithValue.hx
index e0aa2a49aae93801a93f863ad91b11ef679a1a8c..cb5eb7c2c727603eb9652de9d61a2ba5ba0b9873 100644
--- a/std/js/html/idb/CursorWithValue.hx
+++ b/std/js/html/idb/CursorWithValue.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,8 +30,7 @@ package js.html.idb;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBCursorWithValue>
 **/
 @:native("IDBCursorWithValue")
-extern class CursorWithValue extends Cursor
-{
+extern class CursorWithValue extends Cursor {
 	
 	/**
 		Returns the value of the current cursor.
diff --git a/std/js/html/idb/Database.hx b/std/js/html/idb/Database.hx
index a08091f435e08ff7fbb2ac2f1f75405045d9cee9..0aacba2f2c87b5a70113e6f25aa1a9bc3b221343 100644
--- a/std/js/html/idb/Database.hx
+++ b/std/js/html/idb/Database.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html.idb;
 
 /**
-	Inherits from: EventTarget
+	The `IDBDatabase` interface of the IndexedDB API provides a connection to a database; you can use an `IDBDatabase` object to open a transaction on your database then create, manipulate, and delete objects (data) in that database. The interface provides the only way to get and manage versions of the database.
 
 	Documentation [IDBDatabase](https://developer.mozilla.org/en-US/docs/Web/API/IDBDatabase) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/IDBDatabase$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBDatabase>
 **/
 @:native("IDBDatabase")
-extern class Database extends js.html.EventTarget
-{
+extern class Database extends js.html.EventTarget {
 	
 	/**
 		A `DOMString` that contains the name of the connected database.
@@ -55,6 +54,11 @@ extern class Database extends js.html.EventTarget
 	**/
 	var onabort : haxe.Constraints.Function;
 	
+	/**
+		Fires when the `close` event occurs; this happens when the database is unexpectedly closed, such as during application shutdown.
+	**/
+	var onclose : haxe.Constraints.Function;
+	
 	/**
 		Fires when access to the database fails.
 	**/
@@ -67,24 +71,25 @@ extern class Database extends js.html.EventTarget
 	**/
 	var onversionchange : haxe.Constraints.Function;
 	
-	/** @throws DOMError */
 	
 	/**
 		Creates and returns a new object store or index.
+		@throws DOMError
 	**/
 	function createObjectStore( name : String, ?optionalParameters : ObjectStoreParameters ) : ObjectStore;
-	/** @throws DOMError */
 	
 	/**
 		Destroys the object store with the given name in the connected database, along with any indexes that reference it.
+		@throws DOMError
 	**/
 	function deleteObjectStore( name : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Immediately returns a transaction object (`IDBTransaction`) containing the `IDBTransaction.objectStore` method, which you can use to access your object store. Runs in a separate thread.
+		@throws DOMError
 	**/
-	function transaction( storeNames : haxe.extern.EitherType<String,Array<String>>, ?mode : TransactionMode = "readonly" ) : Transaction;
+	@:overload( function( storeNames : Array<String>, mode : TransactionMode = READONLY) : Transaction {} )
+	function transaction( storeNames : String, mode : TransactionMode = READONLY ) : Transaction;
 	
 	/**
 		Returns immediately and closes the connection to a database in a separate thread.
diff --git a/std/js/html/idb/Factory.hx b/std/js/html/idb/Factory.hx
index df459eba2554adaffa79292cc99158502342016f..c22e8611ef2f405bd3b344a25ad9244325624fe4 100644
--- a/std/js/html/idb/Factory.hx
+++ b/std/js/html/idb/Factory.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.idb;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBFactory>
 **/
 @:native("IDBFactory")
-extern class Factory
-{
+extern class Factory {
 	/** @throws DOMError */
 	@:overload( function( name : String, version : Int ) : OpenDBRequest {} )
 	function open( name : String, ?options : OpenDBOptions ) : OpenDBRequest;
diff --git a/std/js/html/idb/FileHandle.hx b/std/js/html/idb/FileHandle.hx
index a5674814e60e9386b709e23cf33a2c62cb2332b7..c236fbf2f89fc9d5cd9f87850078f9876b2b9934 100644
--- a/std/js/html/idb/FileHandle.hx
+++ b/std/js/html/idb/FileHandle.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html.idb;
 
 @:native("IDBFileHandle")
-extern class FileHandle extends js.html.EventTarget
-{
+extern class FileHandle extends js.html.EventTarget {
 	var mutableFile(default,null) : MutableFile;
 	var fileHandle(default,null) : MutableFile;
 	var mode(default,null) : js.html.FileMode;
@@ -43,9 +42,15 @@ extern class FileHandle extends js.html.EventTarget
 	/** @throws DOMError */
 	function readAsText( size : Int, ?encoding : String ) : FileRequest;
 	/** @throws DOMError */
-	function write( value : haxe.extern.EitherType<String,haxe.extern.EitherType<js.html.ArrayBuffer,haxe.extern.EitherType<js.html.ArrayBufferView,js.html.Blob>>> ) : FileRequest;
+	@:overload( function( value : js.lib.ArrayBuffer) : FileRequest {} )
+	@:overload( function( value : js.lib.ArrayBufferView) : FileRequest {} )
+	@:overload( function( value : js.html.Blob) : FileRequest {} )
+	function write( value : String ) : FileRequest;
 	/** @throws DOMError */
-	function append( value : haxe.extern.EitherType<String,haxe.extern.EitherType<js.html.ArrayBuffer,haxe.extern.EitherType<js.html.ArrayBufferView,js.html.Blob>>> ) : FileRequest;
+	@:overload( function( value : js.lib.ArrayBuffer) : FileRequest {} )
+	@:overload( function( value : js.lib.ArrayBufferView) : FileRequest {} )
+	@:overload( function( value : js.html.Blob) : FileRequest {} )
+	function append( value : String ) : FileRequest;
 	/** @throws DOMError */
 	function truncate( ?size : Int ) : FileRequest;
 	/** @throws DOMError */
diff --git a/std/js/html/idb/FileMetadataParameters.hx b/std/js/html/idb/FileMetadataParameters.hx
index c5c787b9fe78c13298967f61b5d66ed7dd81e199..0814d44468332f55b9904f7361482a9c9b25e5ba 100644
--- a/std/js/html/idb/FileMetadataParameters.hx
+++ b/std/js/html/idb/FileMetadataParameters.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.idb;
 
-typedef FileMetadataParameters =
-{
-	@:optional var lastModified : Bool;
-	@:optional var size : Bool;
+typedef FileMetadataParameters = {
+	var ?lastModified : Bool;
+	var ?size : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/idb/FileRequest.hx b/std/js/html/idb/FileRequest.hx
index a4216bfd467ad81ceed469286e628fe310a6618a..e526c63c2166c83d80a3d8bd46cf602ae5e43dde 100644
--- a/std/js/html/idb/FileRequest.hx
+++ b/std/js/html/idb/FileRequest.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html.idb;
 
 @:native("IDBFileRequest")
-extern class FileRequest extends js.html.DOMRequest
-{
+extern class FileRequest extends js.html.DOMRequest {
 	var fileHandle(default,null) : FileHandle;
 	var lockedFile(default,null) : FileHandle;
 	var onprogress : haxe.Constraints.Function;
diff --git a/std/js/html/idb/Index.hx b/std/js/html/idb/Index.hx
index 9f34b9c32032ddb0a44e4b7ea7e98de573f11d9b..41496f618badc89fc76203c6b23104e928c4be6b 100644
--- a/std/js/html/idb/Index.hx
+++ b/std/js/html/idb/Index.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,12 @@ package js.html.idb;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBIndex>
 **/
 @:native("IDBIndex")
-extern class Index
-{
+extern class Index {
 	
 	/**
 		The name of this index.
 	**/
-	var name(default,null) : String;
+	var name : String;
 	
 	/**
 		The name of the object store referenced by this index.
@@ -60,46 +59,46 @@ extern class Index
 	**/
 	var unique(default,null) : Bool;
 	
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object, and, in a separate thread, creates a cursor over the specified key range.
+		@throws DOMError
 	**/
-	function openCursor( ?range : Dynamic, ?direction : CursorDirection = "next" ) : Request;
-	/** @throws DOMError */
+	function openCursor( ?range : Dynamic, direction : CursorDirection = NEXT ) : Request;
 	
 	/**
 		Returns an `IDBRequest` object, and, in a separate thread, creates a cursor over the specified key range, as arranged by this index.
+		@throws DOMError
 	**/
-	function openKeyCursor( ?range : Dynamic, ?direction : CursorDirection = "next" ) : Request;
-	/** @throws DOMError */
+	function openKeyCursor( ?range : Dynamic, direction : CursorDirection = NEXT ) : Request;
 	
 	/**
 		Returns an `IDBRequest` object, and, in a separate thread, finds either the value in the referenced object store that corresponds to the given key or the first corresponding value, if `key` is an `IDBKeyRange`.
+		@throws DOMError
 	**/
 	function get( key : Dynamic ) : Request;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object, and, in a separate thread, finds either the given key or the primary key, if `key` is an `IDBKeyRange`.
+		@throws DOMError
 	**/
 	function getKey( key : Dynamic ) : Request;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object, and in a separate thread, returns the number of records within a key range.
+		@throws DOMError
 	**/
 	function count( ?key : Dynamic ) : Request;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object, in a separate thread, finds all matching values in the referenced object store that correspond to the given key or are in range, if `key` is an `IDBKeyRange`.
+		@throws DOMError
 	**/
 	function getAll( ?key : Dynamic, ?limit : Int ) : Request;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object, in a separate thread, finds all matching keys in the referenced object store that correspond to the given key or are in range, if `key` is an `IDBKeyRange`.
+		@throws DOMError
 	**/
 	function getAllKeys( ?key : Dynamic, ?limit : Int ) : Request;
 }
\ No newline at end of file
diff --git a/std/js/html/idb/IndexParameters.hx b/std/js/html/idb/IndexParameters.hx
index 42726a694a867810cca095d042714a2851d924e1..be7ef13839174a502cf248e11e1301d7152cc6d6 100644
--- a/std/js/html/idb/IndexParameters.hx
+++ b/std/js/html/idb/IndexParameters.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,8 @@
 
 package js.html.idb;
 
-typedef IndexParameters =
-{
-	@:optional var locale : String;
-	@:optional var multiEntry : Bool;
-	@:optional var unique : Bool;
+typedef IndexParameters = {
+	var ?locale : String;
+	var ?multiEntry : Bool;
+	var ?unique : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/idb/KeyRange.hx b/std/js/html/idb/KeyRange.hx
index d248aa704ab01d80479eea1a745f439f236b4077..2785eade3fe163ea2319a750e8671339e0020e83 100644
--- a/std/js/html/idb/KeyRange.hx
+++ b/std/js/html/idb/KeyRange.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,32 +32,31 @@ package js.html.idb;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBKeyRange>
 **/
 @:native("IDBKeyRange")
-extern class KeyRange
-{
-	/** @throws DOMError */
-	static 
+extern class KeyRange {
+	
 	/**
 		Creates a new key range containing a single value.
+		@throws DOMError
 	**/
-	function only( value : Dynamic ) : KeyRange;
-	/** @throws DOMError */
-	static 
+	static function only( value : Dynamic ) : KeyRange;
+	
 	/**
 		Creates a new key range with only a lower bound.
+		@throws DOMError
 	**/
-	function lowerBound( lower : Dynamic, ?open : Bool = false ) : KeyRange;
-	/** @throws DOMError */
-	static 
+	static function lowerBound( lower : Dynamic, open : Bool = false ) : KeyRange;
+	
 	/**
 		Creates a new upper-bound key range.
+		@throws DOMError
 	**/
-	function upperBound( upper : Dynamic, ?open : Bool = false ) : KeyRange;
-	/** @throws DOMError */
-	static 
+	static function upperBound( upper : Dynamic, open : Bool = false ) : KeyRange;
+	
 	/**
 		Creates a new key range with upper and lower bounds.
+		@throws DOMError
 	**/
-	function bound( lower : Dynamic, upper : Dynamic, ?lowerOpen : Bool = false, ?upperOpen : Bool = false ) : KeyRange;
+	static function bound( lower : Dynamic, upper : Dynamic, lowerOpen : Bool = false, upperOpen : Bool = false ) : KeyRange;
 	
 	/**
 		Lower bound of the key range.
@@ -79,10 +78,10 @@ extern class KeyRange
 	**/
 	var upperOpen(default,null) : Bool;
 	
-	/** @throws DOMError */
 	
 	/**
 		Returns a boolean indicating whether a specified key is inside the key range.
+		@throws DOMError
 	**/
 	function includes( key : Dynamic ) : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/idb/MutableFile.hx b/std/js/html/idb/MutableFile.hx
index 83045c8150aacb024a0517364a108316133c69fd..dd5d7bfa1979448b01f663fed5daf5cb4b111594 100644
--- a/std/js/html/idb/MutableFile.hx
+++ b/std/js/html/idb/MutableFile.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.idb;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBMutableFile>
 **/
 @:native("IDBMutableFile")
-extern class MutableFile extends js.html.EventTarget
-{
+extern class MutableFile extends js.html.EventTarget {
 	var name(default,null) : String;
 	var type(default,null) : String;
 	var database(default,null) : Database;
@@ -41,7 +40,7 @@ extern class MutableFile extends js.html.EventTarget
 	var onerror : haxe.Constraints.Function;
 	
 	/** @throws DOMError */
-	function open( ?mode : js.html.FileMode = "readonly" ) : FileHandle;
+	function open( mode : js.html.FileMode = READONLY ) : FileHandle;
 	/** @throws DOMError */
 	function getFile() : js.html.DOMRequest;
 }
\ No newline at end of file
diff --git a/std/js/html/idb/ObjectStore.hx b/std/js/html/idb/ObjectStore.hx
index 80efefbf5412fee49978e82be24fcab743688be1..ec50645175a50e6a1fdcfdbf334a8abf3714b246 100644
--- a/std/js/html/idb/ObjectStore.hx
+++ b/std/js/html/idb/ObjectStore.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,12 @@ package js.html.idb;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore>
 **/
 @:native("IDBObjectStore")
-extern class ObjectStore
-{
+extern class ObjectStore {
 	
 	/**
 		The name of this object store.
 	**/
-	var name(default,null) : String;
+	var name : String;
 	
 	/**
 		The key path of this object store. If this attribute is `null`, the application must provide a key for each modification operation.
@@ -60,80 +59,89 @@ extern class ObjectStore
 	**/
 	var autoIncrement(default,null) : Bool;
 	
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object, and, in a separate thread, creates a structured clone of the `value`, and stores the cloned value in the object store. This is for updating existing records in an object store when the transaction's mode is `readwrite`.
+		@throws DOMError
 	**/
 	function put( value : Dynamic, ?key : Dynamic ) : Request;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object, and, in a separate thread, creates a structured clone of the `value`, and stores the cloned value in the object store. This is for adding new records to an object store.
+		@throws DOMError
 	**/
 	function add( value : Dynamic, ?key : Dynamic ) : Request;
-	/** @throws DOMError */
-	@:native("delete")
-	function delete_( key : Dynamic ) : Request;
-	/** @throws DOMError */
+	
+	/**
+		returns an `IDBRequest` object, and, in a separate thread, deletes the store object selected by the specified key. This is for deleting individual records out of an object store.
+		@throws DOMError
+	**/
+	function delete( key : Dynamic ) : Request;
 	
 	/**
 		Returns an `IDBRequest` object, and, in a separate thread, returns the store object store selected by the specified key. This is for retrieving specific records from an object store.
+		@throws DOMError
 	**/
 	function get( key : Dynamic ) : Request;
-	/** @throws DOMError */
+	
+	/**
+		Returns an `IDBRequest` object, and, in a separate thread retrieves and returns the record key for the object in the object stored matching the specified parameter.
+		@throws DOMError
+	**/
+	function getKey( key : Dynamic ) : Request;
 	
 	/**
 		Creates and immediately returns an `IDBRequest` object, and clears this object store in a separate thread. This is for deleting all current records out of an object store.
+		@throws DOMError
 	**/
 	function clear() : Request;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object, and, in a separate thread, returns a new `IDBCursorWithValue` object. Used for iterating through an object store by primary key with a cursor.
+		@throws DOMError
 	**/
-	function openCursor( ?range : Dynamic, ?direction : CursorDirection = "next" ) : Request;
-	/** @throws DOMError */
-	@:overload( function( name : String, keyPath : String, ?optionalParameters : IndexParameters ) : Index {} )
+	function openCursor( ?range : Dynamic, direction : CursorDirection = NEXT ) : Request;
 	
 	/**
 		Creates a new index during a version upgrade, returning a new `IDBIndex` object in the connected database.
+		@throws DOMError
 	**/
-	function createIndex( name : String, keyPath : Array<String>, ?optionalParameters : IndexParameters ) : Index;
-	/** @throws DOMError */
+	@:overload( function( name : String, keyPath : Array<String>, ?optionalParameters : IndexParameters) : Index {} )
+	function createIndex( name : String, keyPath : String, ?optionalParameters : IndexParameters ) : Index;
 	
 	/**
 		Opens an index from this object store after which it can, for example, be used to return a sequence of records sorted by that index using a cursor.
+		@throws DOMError
 	**/
 	function index( name : String ) : Index;
-	/** @throws DOMError */
 	
 	/**
 		Destroys the specified index in the connected database, used during a version upgrade.
+		@throws DOMError
 	**/
 	function deleteIndex( indexName : String ) : Void;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object, and, in a separate thread, returns the total number of records that match the provided key or `IDBKeyRange`. If no arguments are provided, it returns the total number of records in the store.
+		@throws DOMError
 	**/
 	function count( ?key : Dynamic ) : Request;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object retrieves all objects in the object store matching the specified parameter or all objects in the store if no parameters are given.
+		@throws DOMError
 	**/
 	function getAll( ?key : Dynamic, ?limit : Int ) : Request;
-	/** @throws DOMError */
 	
 	/**
 		Returns an `IDBRequest` object retrieves record keys for all objects in the object store matching the specified parameter or all objects in the store if no parameters are given.
+		@throws DOMError
 	**/
 	function getAllKeys( ?key : Dynamic, ?limit : Int ) : Request;
-	/** @throws DOMError */
 	
 	/**
-		Returns an `IDBRequest` object, and, in a separate thread, returns a new `IDBCursorWithValue`. Used for iterating through an object store with a key.
+		Returns an `IDBRequest` object, and, in a separate thread, returns a new `IDBCursor`. Used for iterating through an object store with a key.
+		@throws DOMError
 	**/
-	function openKeyCursor( ?range : Dynamic, ?direction : CursorDirection = "next" ) : Request;
+	function openKeyCursor( ?range : Dynamic, direction : CursorDirection = NEXT ) : Request;
 }
\ No newline at end of file
diff --git a/std/js/html/idb/ObjectStoreParameters.hx b/std/js/html/idb/ObjectStoreParameters.hx
index c475bdbb61a75df6979d94cb86657f05cfc14ba3..20c1f051ec93e7ffe8b51ce5c314147baea329d8 100644
--- a/std/js/html/idb/ObjectStoreParameters.hx
+++ b/std/js/html/idb/ObjectStoreParameters.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.idb;
 
-typedef ObjectStoreParameters =
-{
-	@:optional var autoIncrement : Bool;
-	@:optional var keyPath : haxe.extern.EitherType<String,Array<String>>;
+typedef ObjectStoreParameters = {
+	var ?autoIncrement : Bool;
+	var ?keyPath : haxe.extern.EitherType<String,Array<String>>;
 }
\ No newline at end of file
diff --git a/std/js/html/idb/OpenDBOptions.hx b/std/js/html/idb/OpenDBOptions.hx
index 9024cd7b4e101e36d3dcff6237d9caf10e7fcf65..3e98ef5810b82bee9e660f0520cf03841ba8bae8 100644
--- a/std/js/html/idb/OpenDBOptions.hx
+++ b/std/js/html/idb/OpenDBOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.idb;
 
-typedef OpenDBOptions =
-{
-	@:optional var storage : Dynamic/*MISSING StorageType*/;
-	@:optional var version : Int;
+typedef OpenDBOptions = {
+	var ?storage : js.html.StorageType;
+	var ?version : Int;
 }
\ No newline at end of file
diff --git a/std/js/html/idb/OpenDBRequest.hx b/std/js/html/idb/OpenDBRequest.hx
index 60216893494c268727c009c253b2abdaf8f6fa2f..d339541abb0bf0ea06bbdd45d1662bb935992d8c 100644
--- a/std/js/html/idb/OpenDBRequest.hx
+++ b/std/js/html/idb/OpenDBRequest.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html.idb;
 
 /**
-	No methods, but inherits methods from its parents `IDBRequest` and `EventTarget`.
+	Also inherits methods from its parents `IDBRequest` and `EventTarget`.
 
 	Documentation [IDBOpenDBRequest](https://developer.mozilla.org/en-US/docs/Web/API/IDBOpenDBRequest) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/IDBOpenDBRequest$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBOpenDBRequest>
 **/
 @:native("IDBOpenDBRequest")
-extern class OpenDBRequest extends Request
-{
+extern class OpenDBRequest extends Request {
 	
 	/**
 		The event handler for the blocked event. This event is triggered when the `upgradeneeded` event should be triggered because of a version change but the database is still in use (i.e. not closed) somewhere, even after the `versionchange` event was sent.
diff --git a/std/js/html/idb/Request.hx b/std/js/html/idb/Request.hx
index c2a8e9c49ab88e4e846470406e9c1050a8b3f727..63dbb35cba877837e947a9eb17e4bcc45be8d157 100644
--- a/std/js/html/idb/Request.hx
+++ b/std/js/html/idb/Request.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.idb;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBRequest>
 **/
 @:native("IDBRequest")
-extern class Request extends js.html.EventTarget
-{
+extern class Request extends js.html.EventTarget {
 	
 	/**
 		
@@ -43,9 +42,9 @@ extern class Request extends js.html.EventTarget
 	var result(default,null) : Dynamic;
 	
 	/**
-		Returns an error in the event of an unsuccessful request, indicating what went wrong.
+		Returns a `DOMException` in the event of an unsuccessful request, indicating what went wrong.
 	**/
-	var error(default,null) : js.html.DOMError;
+	var error(default,null) : js.html.DOMException;
 	
 	/**
 		The source of the request, such as an `IDBIndex` or an `IDBObjectStore`. If no source exists (such as when calling `IDBFactory.open`), it returns null.
diff --git a/std/js/html/idb/RequestReadyState.hx b/std/js/html/idb/RequestReadyState.hx
index 94a23a93c09652e125bc7ee8aa158aa231991ba6..ab51a048ed06bc3b0e57341a4ab01d68cfbc9be4 100644
--- a/std/js/html/idb/RequestReadyState.hx
+++ b/std/js/html/idb/RequestReadyState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.idb;
 
-@:enum abstract RequestReadyState(String)
-{
+enum abstract RequestReadyState(String) {
 	var PENDING = "pending";
 	var DONE = "done";
 }
\ No newline at end of file
diff --git a/std/js/html/idb/Transaction.hx b/std/js/html/idb/Transaction.hx
index 9a06b52410b8d309997aa926d3a0638aafe1fe38..fe61039927f49b5ac0410fb0a7374f16772e39e9 100644
--- a/std/js/html/idb/Transaction.hx
+++ b/std/js/html/idb/Transaction.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.idb;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBTransaction>
 **/
 @:native("IDBTransaction")
-extern class Transaction extends js.html.EventTarget
-{
+extern class Transaction extends js.html.EventTarget {
 	
 	/**
 		The mode for isolating access to data in the object stores that are in the scope of the transaction. For possible values, see the Constants section below. The default value is `readonly`.
@@ -46,12 +45,20 @@ extern class Transaction extends js.html.EventTarget
 	var db(default,null) : Database;
 	
 	/**
-		Returns one of several types of error when there is an unsuccessful transaction. This property is `null` if the transaction is not finished, is finished and successfully committed, or was aborted with `IDBTransaction.abort` function.
+		Returns a `DOMException` indicating the type of error that occured when there is an unsuccessful transaction. This property is `null` if the transaction is not finished, is finished and successfully committed, or was aborted with `IDBTransaction.abort` function.
 	**/
-	var error(default,null) : js.html.DOMError;
+	var error(default,null) : js.html.DOMException;
 	
 	/**
-		The event handler for the `abort` event, fired when the transaction is aborted.
+		The event handler for the `abort` event, fired when the transaction is aborted. This can happen due to:
+		 
+		  bad requests, e.g. trying to add() the same key twice, or put() with the same index key with a uniqueness constraint and there is no error handler on the request to call preventDefault() on the event,
+		  an explicit abort() call from script
+		  uncaught exception in request's success/error handler,
+		  an I/O error (actual failure to write to disk, e.g. disk detached, or other OS/hardware failure), or
+		  quota exceeded.
+		 
+		 
 	**/
 	var onabort : haxe.Constraints.Function;
 	
diff --git a/std/js/html/idb/TransactionMode.hx b/std/js/html/idb/TransactionMode.hx
index dd9cc44925d5ed897f1603337bde9b6683d5f79c..4650c148cc6b0f108e323301477606f5f784c92d 100644
--- a/std/js/html/idb/TransactionMode.hx
+++ b/std/js/html/idb/TransactionMode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.idb;
 
-@:enum abstract TransactionMode(String)
-{
+enum abstract TransactionMode(String) {
 	var READONLY = "readonly";
 	var READWRITE = "readwrite";
 	var READWRITEFLUSH = "readwriteflush";
diff --git a/std/js/html/idb/VersionChangeEvent.hx b/std/js/html/idb/VersionChangeEvent.hx
index 58ed0171c758e606d5a9799d6fb60edb6d6f716b..ff426736ea054a4d0886422212c3d2c551703e08 100644
--- a/std/js/html/idb/VersionChangeEvent.hx
+++ b/std/js/html/idb/VersionChangeEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,9 +32,16 @@ package js.html.idb;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/IDBVersionChangeEvent>
 **/
 @:native("IDBVersionChangeEvent")
-extern class VersionChangeEvent extends js.html.Event
-{
+extern class VersionChangeEvent extends js.html.Event {
+	
+	/**
+		Returns the old version of the database.
+	**/
 	var oldVersion(default,null) : Int;
+	
+	/**
+		Returns the new version of the database.
+	**/
 	var newVersion(default,null) : Int;
 	
 	/** @throws DOMError */
diff --git a/std/js/html/idb/VersionChangeEventInit.hx b/std/js/html/idb/VersionChangeEventInit.hx
index a4118a4c8344af3f455078528eeb4bb751430af4..fddd88a5f03319370e33f420f7b82efa9d71fa06 100644
--- a/std/js/html/idb/VersionChangeEventInit.hx
+++ b/std/js/html/idb/VersionChangeEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.idb;
 
-typedef VersionChangeEventInit =
-{
-	> EventInit,
-	@:optional var newVersion : Int;
-	@:optional var oldVersion : Int;
+typedef VersionChangeEventInit = EventInit & {
+	var ?newVersion : Int;
+	var ?oldVersion : Int;
 }
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIAccess.hx b/std/js/html/midi/MIDIAccess.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1c073febed761c8c6aeb066964cf990add817b10
--- /dev/null
+++ b/std/js/html/midi/MIDIAccess.hx
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIAccess.webidl. Do not edit!
+
+package js.html.midi;
+
+/**
+	The `MIDIAccess` interface of the Web MIDI API provides methods for listing MIDI input and output devices, and obtaining access to those devices.
+
+	Documentation [MIDIAccess](https://developer.mozilla.org/en-US/docs/Web/API/MIDIAccess) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MIDIAccess$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MIDIAccess>
+**/
+@:native("MIDIAccess")
+extern class MIDIAccess extends js.html.EventTarget {
+	
+	/**
+		Returns an instance of `MIDIInputMap` which provides access to any available MIDI input ports.
+	**/
+	var inputs(default,null) : MIDIInputMap;
+	
+	/**
+		Returns an instance of `MIDIOutputMap` which provides access to any available MIDI output ports.
+	**/
+	var outputs(default,null) : MIDIOutputMap;
+	
+	/**
+		Called whenever a new MIDI port is added or an existing port changes state.
+	**/
+	var onstatechange : haxe.Constraints.Function;
+	
+	/**
+		A boolean attribute indicating whether system exclusive support is enabled on the current MIDIAccess instance.
+	**/
+	var sysexEnabled(default,null) : Bool;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIConnectionEvent.hx b/std/js/html/midi/MIDIConnectionEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5608385176674138f36ec73dec5303bd6d498406
--- /dev/null
+++ b/std/js/html/midi/MIDIConnectionEvent.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIConnectionEvent.webidl. Do not edit!
+
+package js.html.midi;
+
+/**
+	The `MIDIConnectionEvent` interface of the Web MIDI API is the event passed to the `onstatechange` event of the `MIDIAccess` interface and the `onstatechange` event of the `MIDIPorts` interface. This occurs any time a new port becomes available, or when a previously available port becomes unavailable. For example, this event is fired whenever a MIDI device is either plugged in to or unplugged from a computer.
+
+	Documentation [MIDIConnectionEvent](https://developer.mozilla.org/en-US/docs/Web/API/MIDIConnectionEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MIDIConnectionEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MIDIConnectionEvent>
+**/
+@:native("MIDIConnectionEvent")
+extern class MIDIConnectionEvent extends js.html.Event {
+	
+	/**
+		Returns a reference to a `MIDIPort` instance for a port that has been connected or disconnected."
+	**/
+	var port(default,null) : MIDIPort;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : MIDIConnectionEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIConnectionEventInit.hx b/std/js/html/midi/MIDIConnectionEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..235ccda2e077642d4c500f0095dc626b03fd7771
--- /dev/null
+++ b/std/js/html/midi/MIDIConnectionEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIConnectionEvent.webidl. Do not edit!
+
+package js.html.midi;
+
+typedef MIDIConnectionEventInit = EventInit & {
+	var ?port : MIDIPort;
+}
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIInput.hx b/std/js/html/midi/MIDIInput.hx
new file mode 100644
index 0000000000000000000000000000000000000000..99d12870b17561b6f99088719a45365d18c2c176
--- /dev/null
+++ b/std/js/html/midi/MIDIInput.hx
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIInput.webidl. Do not edit!
+
+package js.html.midi;
+
+/**
+	Use the `MIDIInput` interface of the Web MIDI API to access and pass messages to a MIDI input port.
+
+	Documentation [MIDIInput](https://developer.mozilla.org/en-US/docs/Web/API/MIDIInput) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MIDIInput$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MIDIInput>
+**/
+@:native("MIDIInput")
+extern class MIDIInput extends MIDIPort {
+	
+	/**
+		When the current port receives a `MIDIMessage` it triggers a call to this event handler.
+	**/
+	var onmidimessage : haxe.Constraints.Function;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIInputMap.hx b/std/js/html/midi/MIDIInputMap.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e893a5f2277f77af7d06193ca9d11e253048757a
--- /dev/null
+++ b/std/js/html/midi/MIDIInputMap.hx
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIInputMap.webidl. Do not edit!
+
+package js.html.midi;
+
+/**
+	The `MIDIInputMap` read-only interface of the Web MIDI API provides a `Map`-like interface to the currently available MIDI input ports. Though it works generally like a map, because it is read-only it does not contain `clear()`, `delete()`, or `set()` functions.
+
+	Documentation [MIDIInputMap](https://developer.mozilla.org/en-US/docs/Web/API/MIDIInputMap) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MIDIInputMap$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MIDIInputMap>
+**/
+@:native("MIDIInputMap")
+extern class MIDIInputMap {
+	var size(default,null) : Int;
+	
+	/** @throws DOMError */
+	function entries() : Dynamic;
+	/** @throws DOMError */
+	function keys() : Dynamic;
+	/** @throws DOMError */
+	function values() : Dynamic;
+	/** @throws DOMError */
+	function forEach( callback : Dynamic, ?thisArg : Dynamic ) : Void;
+	/** @throws DOMError */
+	@:pure
+	function has( key : String ) : Bool;
+	/** @throws DOMError */
+	@:pure
+	function get( key : String ) : Dynamic;
+}
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIMessageEvent.hx b/std/js/html/midi/MIDIMessageEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..244bb63c0086ddbfc322090e3bd60932dfe8ec8a
--- /dev/null
+++ b/std/js/html/midi/MIDIMessageEvent.hx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIMessageEvent.webidl. Do not edit!
+
+package js.html.midi;
+
+@:native("MIDIMessageEvent")
+extern class MIDIMessageEvent extends js.html.Event {
+	var data(default,null) : js.lib.Uint8Array;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : MIDIMessageEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIMessageEventInit.hx b/std/js/html/midi/MIDIMessageEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b8d33c4ac14b03b3dada81e7edcdbeac868d4931
--- /dev/null
+++ b/std/js/html/midi/MIDIMessageEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIMessageEvent.webidl. Do not edit!
+
+package js.html.midi;
+
+typedef MIDIMessageEventInit = EventInit & {
+	var ?data : js.lib.Uint8Array;
+}
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIOptions.hx b/std/js/html/midi/MIDIOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fc5a70c0830e5915f46b2e64dc9a38eec54f63fc
--- /dev/null
+++ b/std/js/html/midi/MIDIOptions.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIOptions.webidl. Do not edit!
+
+package js.html.midi;
+
+typedef MIDIOptions = {
+	var ?software : Bool;
+	var ?sysex : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/XMLStylesheetProcessingInstruction.hx b/std/js/html/midi/MIDIOutput.hx
similarity index 78%
rename from std/js/html/XMLStylesheetProcessingInstruction.hx
rename to std/js/html/midi/MIDIOutput.hx
index 26a465a99c5ede5a3b7ee6e0d357ea68132b3e09..c5d2b2252f3d613d9e8bc4786c8fd5ef3e6405c6 100644
--- a/std/js/html/XMLStylesheetProcessingInstruction.hx
+++ b/std/js/html/midi/MIDIOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\XMLStylesheetProcessingInstruction.webidl. Do not edit!
+// This file is generated from mozilla\MIDIOutput.webidl. Do not edit!
 
-package js.html;
+package js.html.midi;
 
-@:native("XMLStylesheetProcessingInstruction")
-extern class XMLStylesheetProcessingInstruction extends ProcessingInstruction
-{
-	var sheet(default,null) : StyleSheet;
-	
+@:native("MIDIOutput")
+extern class MIDIOutput extends MIDIPort {
+	/** @throws DOMError */
+	function send( data : Array<Int>, ?timestamp : Float ) : Void;
+	function clear() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIOutputMap.hx b/std/js/html/midi/MIDIOutputMap.hx
new file mode 100644
index 0000000000000000000000000000000000000000..350775b34412eaaa24e11ef20593db3ba1d1075a
--- /dev/null
+++ b/std/js/html/midi/MIDIOutputMap.hx
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIOutputMap.webidl. Do not edit!
+
+package js.html.midi;
+
+/**
+	The `MIDIOutputMap` read-only interface of the Web MIDI API provides a `Map`-like interface to the currently available MIDI output ports. Although it works like a map, because it is read-only, it does not contain `clear()`, `delete()`, or `set()` functions.
+
+	Documentation [MIDIOutputMap](https://developer.mozilla.org/en-US/docs/Web/API/MIDIOutputMap) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/MIDIOutputMap$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/MIDIOutputMap>
+**/
+@:native("MIDIOutputMap")
+extern class MIDIOutputMap {
+	var size(default,null) : Int;
+	
+	/** @throws DOMError */
+	function entries() : Dynamic;
+	/** @throws DOMError */
+	function keys() : Dynamic;
+	/** @throws DOMError */
+	function values() : Dynamic;
+	/** @throws DOMError */
+	function forEach( callback : Dynamic, ?thisArg : Dynamic ) : Void;
+	/** @throws DOMError */
+	@:pure
+	function has( key : String ) : Bool;
+	/** @throws DOMError */
+	@:pure
+	function get( key : String ) : Dynamic;
+}
\ No newline at end of file
diff --git a/std/js/html/RGBColor.hx b/std/js/html/midi/MIDIPort.hx
similarity index 62%
rename from std/js/html/RGBColor.hx
rename to std/js/html/midi/MIDIPort.hx
index bc79cade0d8eec69737c0ae8477d43c7ba566476..7f3bd64758ecd05c4fcc35b67e2aab771bf01a8b 100644
--- a/std/js/html/RGBColor.hx
+++ b/std/js/html/midi/MIDIPort.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,16 +20,23 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\RGBColor.webidl. Do not edit!
+// This file is generated from mozilla\MIDIPort.webidl. Do not edit!
 
-package js.html;
+package js.html.midi;
 
-@:native("RGBColor")
-extern class RGBColor
-{
-	var red(default,null) : CSSPrimitiveValue;
-	var green(default,null) : CSSPrimitiveValue;
-	var blue(default,null) : CSSPrimitiveValue;
-	var alpha(default,null) : CSSPrimitiveValue;
-	
+import js.lib.Promise;
+
+@:native("MIDIPort")
+extern class MIDIPort extends js.html.EventTarget {
+	var id(default,null) : String;
+	var manufacturer(default,null) : String;
+	var name(default,null) : String;
+	var version(default,null) : String;
+	var type(default,null) : MIDIPortType;
+	var state(default,null) : MIDIPortDeviceState;
+	var connection(default,null) : MIDIPortConnectionState;
+	var onstatechange : haxe.Constraints.Function;
+
+	function open() : Promise<MIDIPort>;
+	function close() : Promise<MIDIPort>;
 }
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIPortConnectionState.hx b/std/js/html/midi/MIDIPortConnectionState.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f62e7185f0fdbb94351f37090ae03daa12cd33b0
--- /dev/null
+++ b/std/js/html/midi/MIDIPortConnectionState.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIPort.webidl. Do not edit!
+
+package js.html.midi;
+
+enum abstract MIDIPortConnectionState(String) {
+	var OPEN = "open";
+	var CLOSED = "closed";
+	var PENDING = "pending";
+}
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIPortDeviceState.hx b/std/js/html/midi/MIDIPortDeviceState.hx
new file mode 100644
index 0000000000000000000000000000000000000000..192b18e7597b8a1df351f2be7ac7449ec2d37992
--- /dev/null
+++ b/std/js/html/midi/MIDIPortDeviceState.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIPort.webidl. Do not edit!
+
+package js.html.midi;
+
+enum abstract MIDIPortDeviceState(String) {
+	var DISCONNECTED = "disconnected";
+	var CONNECTED = "connected";
+}
\ No newline at end of file
diff --git a/std/js/html/midi/MIDIPortType.hx b/std/js/html/midi/MIDIPortType.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bb1bd0692dc6eea9d39657699e29c17667cc6cd5
--- /dev/null
+++ b/std/js/html/midi/MIDIPortType.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\MIDIPort.webidl. Do not edit!
+
+package js.html.midi;
+
+enum abstract MIDIPortType(String) {
+	var INPUT = "input";
+	var OUTPUT = "output";
+}
\ No newline at end of file
diff --git a/std/js/html/push/PushEncryptionKeyName.hx b/std/js/html/push/PushEncryptionKeyName.hx
new file mode 100644
index 0000000000000000000000000000000000000000..20498fec827af4efb33e6d27a05198956f6ad496
--- /dev/null
+++ b/std/js/html/push/PushEncryptionKeyName.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushSubscription.webidl. Do not edit!
+
+package js.html.push;
+
+enum abstract PushEncryptionKeyName(String) {
+	var P256DH = "p256dh";
+	var AUTH = "auth";
+}
\ No newline at end of file
diff --git a/std/js/html/push/PushEvent.hx b/std/js/html/push/PushEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d7ae17a73c83f0504c1078683036e0cf014f9b9f
--- /dev/null
+++ b/std/js/html/push/PushEvent.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushEvent.webidl. Do not edit!
+
+package js.html.push;
+
+/**
+	The `PushEvent` interface of the Push API represents a push message that has been received. This event is sent to the global scope of a `ServiceWorker`. It contains the information sent from an application server to a `PushSubscription`.
+
+	Documentation [PushEvent](https://developer.mozilla.org/en-US/docs/Web/API/PushEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PushEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/PushEvent>
+**/
+@:native("PushEvent")
+extern class PushEvent extends js.html.ExtendableEvent {
+	
+	/**
+		Returns a reference to a `PushMessageData` object containing data sent to the `PushSubscription`.
+	**/
+	var data(default,null) : PushMessageData;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : PushEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/push/PushEventInit.hx b/std/js/html/push/PushEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e0adf65c0c1e3559e77dcad22d327b8713ce322c
--- /dev/null
+++ b/std/js/html/push/PushEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushEvent.webidl. Do not edit!
+
+package js.html.push;
+
+typedef PushEventInit = ExtendableEventInit & {
+	var ?data : haxe.extern.EitherType<haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer>,String>;
+}
\ No newline at end of file
diff --git a/std/js/html/push/PushManager.hx b/std/js/html/push/PushManager.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3a13e17c5cf13dfe6ea84c51f15e5aaeca77e771
--- /dev/null
+++ b/std/js/html/push/PushManager.hx
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushManager.webidl. Do not edit!
+
+package js.html.push;
+
+import js.lib.Promise;
+
+/**
+	The `PushManager` interface of the Push API provides a way to receive notifications from third-party servers as well as request URLs for push notifications.
+
+	Documentation [PushManager](https://developer.mozilla.org/en-US/docs/Web/API/PushManager) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PushManager$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/PushManager>
+**/
+@:native("PushManager")
+extern class PushManager {
+	/** @throws DOMError */
+	function new( scope : String ) : Void;
+
+	/**
+		Subscribes to a push service. It returns a `Promise` that resolves to a `PushSubscription` object containing details of a push subscription. A new push subscription is created if the current service worker does not have an existing subscription.
+		@throws DOMError
+	**/
+	function subscribe( ?options : PushSubscriptionOptionsInit ) : Promise<PushSubscription>;
+
+	/**
+		Retrieves an existing push subscription. It returns a `Promise` that resolves to a `PushSubscription` object containing details of an existing subscription. If no existing subscription exists, this resolves to a `null` value.
+		@throws DOMError
+	**/
+	function getSubscription() : Promise<PushSubscription>;
+
+	/**
+		Returns a `Promise` that resolves to the permission state of the current `PushManager`, which will be one of `'granted'`, `'denied'`, or `'prompt'`.
+		@throws DOMError
+	**/
+	function permissionState( ?options : PushSubscriptionOptionsInit ) : Promise<PushPermissionState>;
+}
\ No newline at end of file
diff --git a/std/js/html/push/PushMessageData.hx b/std/js/html/push/PushMessageData.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b2738adb3d168dd70ad02c15504329d042480140
--- /dev/null
+++ b/std/js/html/push/PushMessageData.hx
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushMessageData.webidl. Do not edit!
+
+package js.html.push;
+
+/**
+	The `PushMessageData` interface of the Push API provides methods which let you retrieve the push data sent by a server in various formats.
+
+	Documentation [PushMessageData](https://developer.mozilla.org/en-US/docs/Web/API/PushMessageData) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PushMessageData$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/PushMessageData>
+**/
+@:native("PushMessageData")
+extern class PushMessageData {
+	
+	/**
+		Extracts the data as an `ArrayBuffer` object.
+		@throws DOMError
+	**/
+	function arrayBuffer() : js.lib.ArrayBuffer;
+	
+	/**
+		Extracts the data as a `Blob` object.
+		@throws DOMError
+	**/
+	function blob() : js.html.Blob;
+	
+	/**
+		Extracts the data as a JSON object.
+		@throws DOMError
+	**/
+	function json() : Dynamic;
+	
+	/**
+		Extracts the data as a plain text string.
+	**/
+	function text() : String;
+}
\ No newline at end of file
diff --git a/std/js/html/push/PushPermissionState.hx b/std/js/html/push/PushPermissionState.hx
new file mode 100644
index 0000000000000000000000000000000000000000..951e08ebb7b779de73d3e32e3cf5cf701cb4e729
--- /dev/null
+++ b/std/js/html/push/PushPermissionState.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushManager.webidl. Do not edit!
+
+package js.html.push;
+
+enum abstract PushPermissionState(String) {
+	var GRANTED = "granted";
+	var DENIED = "denied";
+	var PROMPT = "prompt";
+}
\ No newline at end of file
diff --git a/std/js/html/push/PushSubscription.hx b/std/js/html/push/PushSubscription.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4893d414913c733dca1913d06ad183bf2a3e4042
--- /dev/null
+++ b/std/js/html/push/PushSubscription.hx
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushSubscription.webidl. Do not edit!
+
+package js.html.push;
+
+import js.lib.Promise;
+
+/**
+	The `PushSubscription` interface of the Push API provides a subcription's URL endpoint and allows unsubscription from a push service.
+
+	Documentation [PushSubscription](https://developer.mozilla.org/en-US/docs/Web/API/PushSubscription) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/PushSubscription$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/PushSubscription>
+**/
+@:native("PushSubscription")
+extern class PushSubscription {
+
+	/**
+		A `USVString` containing the endpoint associated with the push subscription.
+	**/
+	var endpoint(default,null) : String;
+
+	/**
+		An object containing the options used to create the subscription.
+	**/
+	var options(default,null) : PushSubscriptionOptions;
+
+	/** @throws DOMError */
+	function new( initDict : PushSubscriptionInit ) : Void;
+
+	/**
+		Returns an `ArrayBuffer` which contains the client's public key, which can then be sent to a server and used in encrypting push message data.
+		@throws DOMError
+	**/
+	function getKey( name : PushEncryptionKeyName ) : js.lib.ArrayBuffer;
+
+	/**
+		Starts the asynchronous process of unsubscribing from the push service, returning a `Promise` that resolves to a `Boolean` when the current subscription is successfully unregistered.
+		@throws DOMError
+	**/
+	function unsubscribe() : Promise<Bool>;
+
+	/**
+		Standard serializer — returns a JSON representation of the subscription properties.
+		@throws DOMError
+	**/
+	function toJSON() : PushSubscriptionJSON;
+}
\ No newline at end of file
diff --git a/std/js/html/push/PushSubscriptionInit.hx b/std/js/html/push/PushSubscriptionInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d0a923730c086894267f66b9c713408067bb7a47
--- /dev/null
+++ b/std/js/html/push/PushSubscriptionInit.hx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushSubscription.webidl. Do not edit!
+
+package js.html.push;
+
+typedef PushSubscriptionInit = {
+	var ?appServerKey : haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer>;
+	var ?authSecret : js.lib.ArrayBuffer;
+	var endpoint : String;
+	var ?p256dhKey : js.lib.ArrayBuffer;
+	var scope : String;
+}
\ No newline at end of file
diff --git a/std/js/html/push/PushSubscriptionJSON.hx b/std/js/html/push/PushSubscriptionJSON.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4fd4ba1cc2ce3237adc5ab7669e49ba44547b734
--- /dev/null
+++ b/std/js/html/push/PushSubscriptionJSON.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushSubscription.webidl. Do not edit!
+
+package js.html.push;
+
+typedef PushSubscriptionJSON = {
+	var ?endpoint : String;
+	var ?keys : PushSubscriptionKeys;
+}
\ No newline at end of file
diff --git a/std/js/html/push/PushSubscriptionKeys.hx b/std/js/html/push/PushSubscriptionKeys.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5883dd73ad04075a0d4ead48d5bc955ea211d651
--- /dev/null
+++ b/std/js/html/push/PushSubscriptionKeys.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushSubscription.webidl. Do not edit!
+
+package js.html.push;
+
+typedef PushSubscriptionKeys = {
+	var ?auth : String;
+	var ?p256dh : String;
+}
\ No newline at end of file
diff --git a/std/js/html/svg/Document.hx b/std/js/html/push/PushSubscriptionOptions.hx
similarity index 79%
rename from std/js/html/svg/Document.hx
rename to std/js/html/push/PushSubscriptionOptions.hx
index 2a6173d3aba5845b6664a87737b14b230c237a5f..22472ef2c12055e4e0a1e2c265a0b4eb5dff2f6f 100644
--- a/std/js/html/svg/Document.hx
+++ b/std/js/html/push/PushSubscriptionOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,14 +20,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\SVGDocument.webidl. Do not edit!
+// This file is generated from mozilla\PushSubscriptionOptions.webidl. Do not edit!
 
-package js.html.svg;
+package js.html.push;
 
-@:native("SVGDocument")
-extern class Document extends js.html.Document
-{
-	var domain(default,null) : String;
-	var rootElement(default,null) : Element;
+@:native("PushSubscriptionOptions")
+extern class PushSubscriptionOptions {
+	var applicationServerKey(default,null) : js.lib.ArrayBuffer;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/push/PushSubscriptionOptionsInit.hx b/std/js/html/push/PushSubscriptionOptionsInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c04d8bed7e38518c498f16f37e8efd88beec448f
--- /dev/null
+++ b/std/js/html/push/PushSubscriptionOptionsInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\PushManager.webidl. Do not edit!
+
+package js.html.push;
+
+typedef PushSubscriptionOptionsInit = {
+	var ?applicationServerKey : haxe.extern.EitherType<haxe.extern.EitherType<js.lib.ArrayBufferView,js.lib.ArrayBuffer>,String>;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/AnswerOptions.hx b/std/js/html/rtc/AnswerOptions.hx
index 1b617c325d75abaa917800061d636fb01bad36a3..f4f31f26de9e183c56e0bf10faf36035c2d95cef 100644
--- a/std/js/html/rtc/AnswerOptions.hx
+++ b/std/js/html/rtc/AnswerOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,5 @@
 
 package js.html.rtc;
 
-typedef AnswerOptions =
-{
-	> OfferAnswerOptions,
+typedef AnswerOptions = OfferAnswerOptions & {
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/BundlePolicy.hx b/std/js/html/rtc/BundlePolicy.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c7697d8531c20af29f8964007219f3ba4eacb1e8
--- /dev/null
+++ b/std/js/html/rtc/BundlePolicy.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCConfiguration.webidl. Do not edit!
+
+package js.html.rtc;
+
+enum abstract BundlePolicy(String) {
+	var BALANCED = "balanced";
+	var MAX_COMPAT = "max-compat";
+	var MAX_BUNDLE = "max-bundle";
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/Certificate.hx b/std/js/html/rtc/Certificate.hx
index d9f3e54975690e4305b503396c79ac5ada9d3ea8..5c57c2aec144072faa591488c89b42acddd35827 100644
--- a/std/js/html/rtc/Certificate.hx
+++ b/std/js/html/rtc/Certificate.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.rtc;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCCertificate>
 **/
 @:native("RTCCertificate")
-extern class Certificate
-{
+extern class Certificate {
 	
 	/**
 		Returns the expiration date of the certificate.
diff --git a/std/js/html/rtc/Configuration.hx b/std/js/html/rtc/Configuration.hx
index 45469db25b9024b260b171a5bf370ce39cd0d5fd..0c8709258f6eb120f95650470c1b34fc122d2413 100644
--- a/std/js/html/rtc/Configuration.hx
+++ b/std/js/html/rtc/Configuration.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,10 @@
 
 package js.html.rtc;
 
-typedef Configuration =
-{
-	@:optional var bundlePolicy : Dynamic/*MISSING RTCBundlePolicy*/;
-	@:optional var certificates : Array<Certificate>;
-	@:optional var iceServers : Array<Dynamic/*MISSING RTCIceServer*/>;
-	@:optional var iceTransportPolicy : Dynamic/*MISSING RTCIceTransportPolicy*/;
-	@:optional var peerIdentity : String;
+typedef Configuration = {
+	var ?bundlePolicy : BundlePolicy;
+	var ?certificates : Array<Certificate>;
+	var ?iceServers : Array<IceServer>;
+	var ?iceTransportPolicy : IceTransportPolicy;
+	var ?peerIdentity : String;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/DTMFSender.hx b/std/js/html/rtc/DTMFSender.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ce6b15bd2670c9a6f038a68f5fdc959cc149957d
--- /dev/null
+++ b/std/js/html/rtc/DTMFSender.hx
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCDTMFSender.webidl. Do not edit!
+
+package js.html.rtc;
+
+@:native("RTCDTMFSender")
+extern class DTMFSender extends js.html.EventTarget {
+	
+	/**
+		An `EventHandler` to handle the `tonechange` event, which is sent each time an outbound tone starts or finishes playing.
+	**/
+	var ontonechange : haxe.Constraints.Function;
+	
+	/**
+		A `DOMString` which contains the list of DTMF tones currently in the queue to be transmitted (tones which have already been played are no longer included in the string). See `RTCDTMFSender.toneBuffer` for details on the format of the tone buffer.
+	**/
+	var toneBuffer(default,null) : String;
+	
+	function insertDTMF( tones : String, duration : Int = 100, interToneGap : Int = 70 ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/DTMFToneChangeEvent.hx b/std/js/html/rtc/DTMFToneChangeEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8558e93fef428955d7f1c8838a54f19c90aab3f9
--- /dev/null
+++ b/std/js/html/rtc/DTMFToneChangeEvent.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCDTMFToneChangeEvent.webidl. Do not edit!
+
+package js.html.rtc;
+
+/**
+	The `RTCDTMFToneChangeEvent` interface represents events sent to indicate that DTMF tones have started or finished playing. This interface is used by the `tonechange` event.
+
+	Documentation [RTCDTMFToneChangeEvent](https://developer.mozilla.org/en-US/docs/Web/API/RTCDTMFToneChangeEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCDTMFToneChangeEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCDTMFToneChangeEvent>
+**/
+@:native("RTCDTMFToneChangeEvent")
+extern class DTMFToneChangeEvent extends js.html.Event {
+	
+	/**
+		A `DOMString` specifying the tone which has begun playing, or an empty string (`""`) if the previous tone has finished playing.
+	**/
+	var tone(default,null) : String;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : DTMFToneChangeEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/DTMFToneChangeEventInit.hx b/std/js/html/rtc/DTMFToneChangeEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0bcedfa57afa37ae4efdf0ba2d58b1b17db860ee
--- /dev/null
+++ b/std/js/html/rtc/DTMFToneChangeEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCDTMFToneChangeEvent.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef DTMFToneChangeEventInit = EventInit & {
+	var ?tone : String;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/DataChannel.hx b/std/js/html/rtc/DataChannel.hx
index 8a9efae50d2b1503ce64b3a902d487a8b74ae28a..14972d407a5de86f0a4832adad34657d86b84250 100644
--- a/std/js/html/rtc/DataChannel.hx
+++ b/std/js/html/rtc/DataChannel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,15 +20,23 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DataChannel.webidl. Do not edit!
+// This file is generated from mozilla\RTCDataChannel.webidl. Do not edit!
 
 package js.html.rtc;
 
-@:native("DataChannel")
-extern class DataChannel extends js.html.EventTarget
-{
+/**
+	The `RTCDataChannel` interface represents a network channel which can be used for bidirectional peer-to-peer transfers of arbitrary data. Every data channel is associated with an `RTCPeerConnection`, and each peer connection can have up to a theoretical maximum of 65,534 data channels (the actual limit may vary from browser to browser).
+
+	Documentation [RTCDataChannel](https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel>
+**/
+@:native("RTCDataChannel")
+extern class DataChannel extends js.html.EventTarget {
 	var label(default,null) : String;
 	var reliable(default,null) : Bool;
+	var maxPacketLifeTime(default,null) : Int;
+	var maxRetransmits(default,null) : Int;
 	var readyState(default,null) : DataChannelState;
 	var bufferedAmount(default,null) : Int;
 	var bufferedAmountLowThreshold : Int;
@@ -41,12 +49,11 @@ extern class DataChannel extends js.html.EventTarget
 	var protocol(default,null) : String;
 	var ordered(default,null) : Bool;
 	var id(default,null) : Int;
-	var stream(default,null) : Int;
 	
 	function close() : Void;
 	/** @throws DOMError */
 	@:overload( function( data : String ) : Void {} )
 	@:overload( function( data : js.html.Blob ) : Void {} )
-	@:overload( function( data : js.html.ArrayBuffer ) : Void {} )
-	function send( data : js.html.ArrayBufferView ) : Void;
+	@:overload( function( data : js.lib.ArrayBuffer ) : Void {} )
+	function send( data : js.lib.ArrayBufferView ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/ApplicationCache.hx b/std/js/html/rtc/DataChannelEvent.hx
similarity index 53%
rename from std/js/html/ApplicationCache.hx
rename to std/js/html/rtc/DataChannelEvent.hx
index 1267649b4beebdaea943494d56c7ea2cb5898238..f0a3ed6dea6df38e79a67743b8e970f84bb75e31 100644
--- a/std/js/html/ApplicationCache.hx
+++ b/std/js/html/rtc/DataChannelEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,32 +20,21 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\OfflineResourceList.webidl. Do not edit!
+// This file is generated from mozilla\RTCDataChannelEvent.webidl. Do not edit!
 
-package js.html;
+package js.html.rtc;
 
-@:native("ApplicationCache")
-extern class ApplicationCache extends EventTarget implements ArrayAccess<String>
-{
-	static inline var UNCACHED : Int = 0;
-	static inline var IDLE : Int = 1;
-	static inline var CHECKING : Int = 2;
-	static inline var DOWNLOADING : Int = 3;
-	static inline var UPDATEREADY : Int = 4;
-	static inline var OBSOLETE : Int = 5;
-	
-	var status(default,null) : Int;
-	var onchecking : haxe.Constraints.Function;
-	var onerror : haxe.Constraints.Function;
-	var onnoupdate : haxe.Constraints.Function;
-	var ondownloading : haxe.Constraints.Function;
-	var onprogress : haxe.Constraints.Function;
-	var onupdateready : haxe.Constraints.Function;
-	var oncached : haxe.Constraints.Function;
-	var onobsolete : haxe.Constraints.Function;
+/**
+	The `RTCDataChannelEvent()` constructor returns a new `RTCDataChannelEvent` object, which represents a `datachannel` event. These events sent to an `RTCPeerConnection` when its remote peer is asking to open an `RTCDataChannel` between the two peers.
+
+	Documentation [RTCDataChannelEvent](https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannelEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannelEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannelEvent>
+**/
+@:native("RTCDataChannelEvent")
+extern class DataChannelEvent extends js.html.Event {
+	var channel(default,null) : DataChannel;
 	
 	/** @throws DOMError */
-	function update() : Void;
-	/** @throws DOMError */
-	function swapCache() : Void;
+	function new( type : String, eventInitDict : DataChannelEventInit ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/DataChannelEventInit.hx b/std/js/html/rtc/DataChannelEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8ea8d384489220f086f3d8e3cdee0dcc7e4dac2b
--- /dev/null
+++ b/std/js/html/rtc/DataChannelEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCDataChannelEvent.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef DataChannelEventInit = EventInit & {
+	var channel : DataChannel;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/DataChannelInit.hx b/std/js/html/rtc/DataChannelInit.hx
index 0acae8c387ca7e065b3a009606df3f2bda8d560d..c1be8efa2d214e82b3f2f04967ba10520893ac23 100644
--- a/std/js/html/rtc/DataChannelInit.hx
+++ b/std/js/html/rtc/DataChannelInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,16 +24,12 @@
 
 package js.html.rtc;
 
-typedef DataChannelInit =
-{
-	@:optional var id : Int;
-	@:optional var maxRetransmitNum : Int;
-	@:optional var maxRetransmitTime : Int;
-	@:optional var maxRetransmits : Int;
-	@:optional var negotiated : Bool;
-	@:optional var ordered : Bool;
-	@:optional var outOfOrderAllowed : Bool;
-	@:optional var preset : Bool;
-	@:optional var protocol : String;
-	@:optional var stream : Int;
+typedef DataChannelInit = {
+	var ?id : Int;
+	var ?maxPacketLifeTime : Int;
+	var ?maxRetransmitTime : Int;
+	var ?maxRetransmits : Int;
+	var ?negotiated : Bool;
+	var ?ordered : Bool;
+	var ?protocol : String;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/DataChannelState.hx b/std/js/html/rtc/DataChannelState.hx
index 6599b6a417781c38e16a4006df18db47bdaeb386..c1accb6326db6b63e235dbb46ad8636100671a7d 100644
--- a/std/js/html/rtc/DataChannelState.hx
+++ b/std/js/html/rtc/DataChannelState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DataChannel.webidl. Do not edit!
+// This file is generated from mozilla\RTCDataChannel.webidl. Do not edit!
 
 package js.html.rtc;
 
-@:enum abstract DataChannelState(String)
-{
+enum abstract DataChannelState(String) {
 	var CONNECTING = "connecting";
 	var OPEN = "open";
 	var CLOSING = "closing";
diff --git a/std/js/html/rtc/DataChannelType.hx b/std/js/html/rtc/DataChannelType.hx
index 44d7c37abb8e2499107a548ae117ceece11f2ffd..431306d31f758f97c562fe7ed9835eb574a9029d 100644
--- a/std/js/html/rtc/DataChannelType.hx
+++ b/std/js/html/rtc/DataChannelType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DataChannel.webidl. Do not edit!
+// This file is generated from mozilla\RTCDataChannel.webidl. Do not edit!
 
 package js.html.rtc;
 
-@:enum abstract DataChannelType(String)
-{
+enum abstract DataChannelType(String) {
 	var ARRAYBUFFER = "arraybuffer";
 	var BLOB = "blob";
 }
\ No newline at end of file
diff --git a/std/js/html/DummyInterface.hx b/std/js/html/rtc/DegradationPreference.hx
similarity index 78%
rename from std/js/html/DummyInterface.hx
rename to std/js/html/rtc/DegradationPreference.hx
index b8bfebcc3362be8385a138d403f7e492169b310e..e65a34661900a1f8e581971a7c22305b9887685c 100644
--- a/std/js/html/DummyInterface.hx
+++ b/std/js/html/rtc/DegradationPreference.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DummyBinding.webidl. Do not edit!
+// This file is generated from mozilla\RTCRtpSender.webidl. Do not edit!
 
-package js.html;
+package js.html.rtc;
 
-@:native("DummyInterface")
-extern class DummyInterface
-{
-	function lifecycleCallbacks( ?arg : LifecycleCallbacks ) : Void;
-	function promiseJobCallback( arg : Void -> Void ) : Void;
+enum abstract DegradationPreference(String) {
+	var MAINTAIN_FRAMERATE = "maintain-framerate";
+	var MAINTAIN_RESOLUTION = "maintain-resolution";
+	var BALANCED = "balanced";
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/FecParameters.hx b/std/js/html/rtc/FecParameters.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dabbf043dbbeb32cce4d93a5ebb94bd8bd4d548c
--- /dev/null
+++ b/std/js/html/rtc/FecParameters.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpSender.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef FecParameters = {
+	var ?ssrc : Int;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/IceCandidate.hx b/std/js/html/rtc/IceCandidate.hx
index 4a2a668af3487c59554ec2c40aed441a810f053f..7faf98cb767fe30a15e2993c06cc4ff6063d35a4 100644
--- a/std/js/html/rtc/IceCandidate.hx
+++ b/std/js/html/rtc/IceCandidate.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,31 +25,31 @@
 package js.html.rtc;
 
 /**
-	The `RTCIceCandidate` interface of the the WebRTC API represents a candidate internet connectivity establishment (ICE) server for establishing an `RTCPeerConnection`.
+	The `RTCIceCandidate` interface—part of the WebRTC API—represents a candidate Internet Connectivity Establishment (ICE) configuration which may be used to establish an `RTCPeerConnection`.
 
 	Documentation [RTCIceCandidate](https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate>
 **/
 @:native("RTCIceCandidate")
-extern class IceCandidate
-{
+extern class IceCandidate {
 	
 	/**
-		Returns a transport address for the candidate that can be used for connectivity checks. The format of this address is a `candidate-attribute` as defined in RTC 5245.
+		A `DOMString` representing the transport address for the candidate that can be used for connectivity checks. The format of this address is a `candidate-attribute` as defined in {{RFC(5245)}}. This string is empty (`""`) if the `RTCIceCandidate` is an "end of candidates" indicator.
 	**/
 	var candidate : String;
 	
 	/**
-		If not `null`, this contains the identifier of the "media stream identification" (as defined in RFC 5888) for the media component this candidate is associated with.
+		A `DOMString` specifying the candidate's media stream identification tag which uniquely identifies the media stream within the component with which the candidate is associated, or `null` if no such association exists.
 	**/
 	var sdpMid : String;
 	
 	/**
-		If not `null`, this indicates the index (starting at zero) of the media description (as defined in RFC 4566) in the SDP this candidate is associated with.
+		If not `null`, `sdpMLineIndex` indicates the zero-based index number of the media description (as defined in RFC 4566) in the `SDP` with which the candidate is associated.
 	**/
 	var sdpMLineIndex : Int;
 	
 	/** @throws DOMError */
-	function new( ?candidateInitDict : IceCandidateInit ) : Void;
+	function new( candidateInitDict : IceCandidateInit ) : Void;
+	function toJSON() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/IceCandidateInit.hx b/std/js/html/rtc/IceCandidateInit.hx
index 51ade5671632d1beab252d88e72f87cbeecad842..e142db3cc1e68d49752c4d0e46ce53c0275e33a7 100644
--- a/std/js/html/rtc/IceCandidateInit.hx
+++ b/std/js/html/rtc/IceCandidateInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,8 @@
 
 package js.html.rtc;
 
-typedef IceCandidateInit =
-{
-	@:optional var candidate : String;
-	@:optional var sdpMLineIndex : Int;
-	@:optional var sdpMid : String;
+typedef IceCandidateInit = {
+	var candidate : String;
+	var ?sdpMLineIndex : Int;
+	var ?sdpMid : String;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/IceConnectionState.hx b/std/js/html/rtc/IceConnectionState.hx
index 412625067973e2339af38f981eb56ea1e1b441e2..2742ca10db5f03c325f196c2ad025275b305f3a5 100644
--- a/std/js/html/rtc/IceConnectionState.hx
+++ b/std/js/html/rtc/IceConnectionState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,8 @@
 
 package js.html.rtc;
 
-@:enum abstract IceConnectionState(String)
-{
-	var NEW_ = "new";
+enum abstract IceConnectionState(String) {
+	var NEW = "new";
 	var CHECKING = "checking";
 	var CONNECTED = "connected";
 	var COMPLETED = "completed";
diff --git a/std/js/html/rtc/IceCredentialType.hx b/std/js/html/rtc/IceCredentialType.hx
new file mode 100644
index 0000000000000000000000000000000000000000..504fdcc1998577dc832336f92e29dc06379c9594
--- /dev/null
+++ b/std/js/html/rtc/IceCredentialType.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCConfiguration.webidl. Do not edit!
+
+package js.html.rtc;
+
+enum abstract IceCredentialType(String) {
+	var PASSWORD = "password";
+	var TOKEN = "token";
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/IceGatheringState.hx b/std/js/html/rtc/IceGatheringState.hx
index 6242db81e24a47b35f94d9273634e3301f51a47a..4c6a2e8626ce43fa0f20fafd7cda917b81515013 100644
--- a/std/js/html/rtc/IceGatheringState.hx
+++ b/std/js/html/rtc/IceGatheringState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,8 @@
 
 package js.html.rtc;
 
-@:enum abstract IceGatheringState(String)
-{
-	var NEW_ = "new";
+enum abstract IceGatheringState(String) {
+	var NEW = "new";
 	var GATHERING = "gathering";
 	var COMPLETE = "complete";
 }
\ No newline at end of file
diff --git a/std/js/html/UncaughtRejectionObserver.hx b/std/js/html/rtc/IceServer.hx
similarity index 77%
rename from std/js/html/UncaughtRejectionObserver.hx
rename to std/js/html/rtc/IceServer.hx
index 0279803b758938fc0f2acd29769402e11b340160..548cd256f6e05a856fb16e8bc22f3831aaf685b7 100644
--- a/std/js/html/UncaughtRejectionObserver.hx
+++ b/std/js/html/rtc/IceServer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,14 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\PromiseDebugging.webidl. Do not edit!
+// This file is generated from mozilla\RTCConfiguration.webidl. Do not edit!
 
-package js.html;
+package js.html.rtc;
 
-@:native("UncaughtRejectionObserver")
-extern class UncaughtRejectionObserver
-{
-	function onLeftUncaught( p : Promise<Dynamic> ) : Void;
-	function onConsumed( p : Promise<Dynamic> ) : Void;
+typedef IceServer = {
+	var ?credential : String;
+	var ?credentialType : IceCredentialType;
+	var ?url : String;
+	var ?urls : haxe.extern.EitherType<String,Array<String>>;
+	var ?username : String;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/IceTransportPolicy.hx b/std/js/html/rtc/IceTransportPolicy.hx
new file mode 100644
index 0000000000000000000000000000000000000000..891a2a3797bf0e0046a0159ae363bd8fd5549e20
--- /dev/null
+++ b/std/js/html/rtc/IceTransportPolicy.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCConfiguration.webidl. Do not edit!
+
+package js.html.rtc;
+
+enum abstract IceTransportPolicy(String) {
+	var RELAY = "relay";
+	var ALL = "all";
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/IdentityAssertion.hx b/std/js/html/rtc/IdentityAssertion.hx
index f834712bde3ef1c1807d53601172457adb1252ea..d7d67c476c405fd9c685241e79253117b3ceceec 100644
--- a/std/js/html/rtc/IdentityAssertion.hx
+++ b/std/js/html/rtc/IdentityAssertion.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.rtc;
 
-typedef IdentityAssertion =
-{
-	@:optional var idp : String;
-	@:optional var name : String;
+typedef IdentityAssertion = {
+	var ?idp : String;
+	var ?name : String;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/IdentityAssertionResult.hx b/std/js/html/rtc/IdentityAssertionResult.hx
index 780d0b87d84a48f861f99bb5a5c1ed5c93f32266..e15eb67742f15d58f3466581af53a64cfa7f7cb0 100644
--- a/std/js/html/rtc/IdentityAssertionResult.hx
+++ b/std/js/html/rtc/IdentityAssertionResult.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.rtc;
 
-typedef IdentityAssertionResult =
-{
+typedef IdentityAssertionResult = {
 	var assertion : String;
-	var idp : Dynamic/*MISSING RTCIdentityProviderDetails*/;
+	var idp : IdentityProviderDetails;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/IdentityProvider.hx b/std/js/html/rtc/IdentityProvider.hx
index db38ecc79674df317e7075e42a714a533ac63b60..43c337443d506c59925a542f3208fcecf1289d39 100644
--- a/std/js/html/rtc/IdentityProvider.hx
+++ b/std/js/html/rtc/IdentityProvider.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,9 @@
 
 package js.html.rtc;
 
-@:native("RTCIdentityProvider")
-extern class IdentityProvider
-{
-	function generateAssertion( contents : String, origin : String, ?usernameHint : String ) : Promise<IdentityAssertionResult>;
-	function validateAssertion( assertion : String, origin : String ) : Promise<IdentityValidationResult>;
+import js.lib.Promise;
+
+typedef IdentityProvider = {
+	var generateAssertion : String -> String -> IdentityProviderOptions -> Promise<IdentityAssertionResult>;
+	var validateAssertion : String -> String -> Promise<IdentityValidationResult>;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/IdentityProviderDetails.hx b/std/js/html/rtc/IdentityProviderDetails.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fc9f778d28383771fd64974caaa6bc6630e2ff4d
--- /dev/null
+++ b/std/js/html/rtc/IdentityProviderDetails.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCIdentityProvider.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef IdentityProviderDetails = {
+	var domain : String;
+	var ?protocol : String;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/IdentityProviderOptions.hx b/std/js/html/rtc/IdentityProviderOptions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e2678c9d1a400344dc969293555b3f165272cdef
--- /dev/null
+++ b/std/js/html/rtc/IdentityProviderOptions.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCIdentityProvider.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef IdentityProviderOptions = {
+	var ?peerIdentity : String;
+	var ?protocol : String;
+	var ?usernameHint : String;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/IdentityProviderRegistrar.hx b/std/js/html/rtc/IdentityProviderRegistrar.hx
index 459adf2b1f2977f95d2f82c9c0efc23cc33ce283..19f85e2c6de7e48373177a0ce8cce8749bfa6461 100644
--- a/std/js/html/rtc/IdentityProviderRegistrar.hx
+++ b/std/js/html/rtc/IdentityProviderRegistrar.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
 
 package js.html.rtc;
 
-@:native("RTCIdentityProviderRegistrar")
-extern class IdentityProviderRegistrar
-{
+typedef IdentityProviderRegistrar = {
 	function register( idp : IdentityProvider ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/IdentityValidationResult.hx b/std/js/html/rtc/IdentityValidationResult.hx
index d7e374940f32b84fcb01b12853781bb2b49b8c30..9ae2a3931fa59c0f9bd8d65ccbbcb0e4f9183dde 100644
--- a/std/js/html/rtc/IdentityValidationResult.hx
+++ b/std/js/html/rtc/IdentityValidationResult.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.rtc;
 
-typedef IdentityValidationResult =
-{
+typedef IdentityValidationResult = {
 	var contents : String;
 	var identity : String;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/OfferAnswerOptions.hx b/std/js/html/rtc/OfferAnswerOptions.hx
index 11ee52e7dbffa89e523c934efb6a047cf83d17e4..7d2888fddc48633fec01e3e26d821f885d3b8de1 100644
--- a/std/js/html/rtc/OfferAnswerOptions.hx
+++ b/std/js/html/rtc/OfferAnswerOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,5 @@
 
 package js.html.rtc;
 
-typedef OfferAnswerOptions =
-{
+typedef OfferAnswerOptions = {
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/OfferOptions.hx b/std/js/html/rtc/OfferOptions.hx
index 0e1ea95a33e37baa768a0ebc264e650ef331cdc8..b977f403aa104d0548786d0df29603f0b47a8c7b 100644
--- a/std/js/html/rtc/OfferOptions.hx
+++ b/std/js/html/rtc/OfferOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,8 @@
 
 package js.html.rtc;
 
-typedef OfferOptions =
-{
-	> OfferAnswerOptions,
-	@:optional var mandatory : Dynamic/*MISSING DeprecatedRTCOfferOptionsSet*/;
-	@:optional var offerToReceiveAudio : Int;
-	@:optional var offerToReceiveVideo : Int;
-	@:optional var optional : Array<Dynamic/*MISSING DeprecatedRTCOfferOptionsSet*/>;
+typedef OfferOptions = OfferAnswerOptions & {
+	var ?iceRestart : Bool;
+	var ?offerToReceiveAudio : Bool;
+	var ?offerToReceiveVideo : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/PeerConnection.hx b/std/js/html/rtc/PeerConnection.hx
index e51ddd8c52e4fff50226f09537c1c3af47cef636..e51d1f28433d81b6e107e84b0e80d33c733f0709 100644
--- a/std/js/html/rtc/PeerConnection.hx
+++ b/std/js/html/rtc/PeerConnection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
 
 package js.html.rtc;
 
+import js.lib.Promise;
+
 /**
 	The `RTCPeerConnection` interface represents a WebRTC connection between the local computer and a remote peer. It provides methods to connect to a remote peer, maintain and monitor the connection, and close the connection once it's no longer needed.
 
@@ -32,12 +34,16 @@ package js.html.rtc;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection>
 **/
 @:native("RTCPeerConnection")
-extern class PeerConnection extends js.html.EventTarget
-{
+extern class PeerConnection extends js.html.EventTarget {
 	/** @throws DOMError */
-	static function generateCertificate( keygenAlgorithm : haxe.extern.EitherType<Dynamic,String> ) : Promise<Certificate>;
+	@:overload( function( keygenAlgorithm : String) : Promise<Certificate> {} )
+	static function generateCertificate( keygenAlgorithm : Dynamic ) : Promise<Certificate>;
 	var localDescription(default,null) : SessionDescription;
+	var currentLocalDescription(default,null) : SessionDescription;
+	var pendingLocalDescription(default,null) : SessionDescription;
 	var remoteDescription(default,null) : SessionDescription;
+	var currentRemoteDescription(default,null) : SessionDescription;
+	var pendingRemoteDescription(default,null) : SessionDescription;
 	var signalingState(default,null) : SignalingState;
 	var canTrickleIceCandidates(default,null) : Bool;
 	var iceGatheringState(default,null) : IceGatheringState;
@@ -52,34 +58,37 @@ extern class PeerConnection extends js.html.EventTarget
 	var ontrack : haxe.Constraints.Function;
 	var onremovestream : haxe.Constraints.Function;
 	var oniceconnectionstatechange : haxe.Constraints.Function;
+	var onicegatheringstatechange : haxe.Constraints.Function;
 	var ondatachannel : haxe.Constraints.Function;
-	
+
 	/** @throws DOMError */
 	function new( ?configuration : Configuration, ?constraints : Dynamic ) : Void;
-	function setIdentityProvider( provider : String, ?protocol : String, ?username : String ) : Void;
+	function setIdentityProvider( provider : String, ?options : IdentityProviderOptions ) : Void;
 	function getIdentityAssertion() : Promise<String>;
-	@:overload( function( ?options : OfferOptions ) : Promise<SessionDescription> {} )
-	function createOffer( successCallback : SessionDescription -> Void, failureCallback : js.html.DOMError -> Void, ?options : OfferOptions ) : Promise<Void>;
-	@:overload( function( ?options : AnswerOptions ) : Promise<SessionDescription> {} )
-	function createAnswer( successCallback : SessionDescription -> Void, failureCallback : js.html.DOMError -> Void ) : Promise<Void>;
-	@:overload( function( description : SessionDescription ) : Promise<Void> {} )
-	function setLocalDescription( description : SessionDescription, successCallback : Void -> Void, failureCallback : js.html.DOMError -> Void ) : Promise<Void>;
-	@:overload( function( description : SessionDescription ) : Promise<Void> {} )
-	function setRemoteDescription( description : SessionDescription, successCallback : Void -> Void, failureCallback : js.html.DOMError -> Void ) : Promise<Void>;
-	@:overload( function( candidate : IceCandidate ) : Promise<Void> {} )
-	function addIceCandidate( candidate : IceCandidate, successCallback : Void -> Void, failureCallback : js.html.DOMError -> Void ) : Promise<Void>;
+	@:overload( function( ?options : OfferOptions ) : Promise<SessionDescriptionInit> {} )
+	function createOffer( successCallback : SessionDescriptionInit -> Void, failureCallback : js.html.DOMException -> Void, ?options : OfferOptions ) : Promise<Void>;
+	@:overload( function( ?options : AnswerOptions ) : Promise<SessionDescriptionInit> {} )
+	function createAnswer( successCallback : SessionDescriptionInit -> Void, failureCallback : js.html.DOMException -> Void ) : Promise<Void>;
+	@:overload( function( description : SessionDescriptionInit ) : Promise<Void> {} )
+	function setLocalDescription( description : SessionDescriptionInit, successCallback : Void -> Void, failureCallback : js.html.DOMException -> Void ) : Promise<Void>;
+	@:overload( function( description : SessionDescriptionInit ) : Promise<Void> {} )
+	function setRemoteDescription( description : SessionDescriptionInit, successCallback : Void -> Void, failureCallback : js.html.DOMException -> Void ) : Promise<Void>;
+	@:overload( function( candidate : IceCandidate) : Promise<Void> {} )
+	@:overload( function( candidate : IceCandidateInit ) : Promise<Void> {} )
+	function addIceCandidate( candidate : IceCandidate, successCallback : Void -> Void, failureCallback : js.html.DOMException -> Void ) : Promise<Void>;
 	function getConfiguration() : Configuration;
 	function getLocalStreams() : Array<js.html.MediaStream>;
 	function getRemoteStreams() : Array<js.html.MediaStream>;
-	function getStreamById( streamId : String ) : js.html.MediaStream;
 	function addStream( stream : js.html.MediaStream ) : Void;
-	function removeStream( stream : js.html.MediaStream ) : Void;
 	function addTrack( track : js.html.MediaStreamTrack, stream : js.html.MediaStream, moreStreams : haxe.extern.Rest<js.html.MediaStream> ) : RtpSender;
 	function removeTrack( sender : RtpSender ) : Void;
+	@:overload( function( trackOrKind : String, ?init : RtpTransceiverInit) : RtpTransceiver {} )
+	function addTransceiver( trackOrKind : js.html.MediaStreamTrack, ?init : RtpTransceiverInit ) : RtpTransceiver;
 	function getSenders() : Array<RtpSender>;
 	function getReceivers() : Array<RtpReceiver>;
+	function getTransceivers() : Array<RtpTransceiver>;
 	function close() : Void;
 	@:overload( function( ?selector : js.html.MediaStreamTrack ) : Promise<StatsReport> {} )
-	function getStats( selector : js.html.MediaStreamTrack, successCallback : StatsReport -> Void, failureCallback : js.html.DOMError -> Void ) : Promise<Void>;
-	function createDataChannel( label : String, ?dataChannelDict : DataChannelInit ) : Dynamic/*MISSING RTCDataChannel*/;
+	function getStats( selector : js.html.MediaStreamTrack, successCallback : StatsReport -> Void, failureCallback : js.html.DOMException -> Void ) : Promise<Void>;
+	function createDataChannel( label : String, ?dataChannelDict : DataChannelInit ) : DataChannel;
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/VertexArrayObjectOES.hx b/std/js/html/rtc/PeerConnectionIceEvent.hx
similarity index 55%
rename from std/js/html/webgl/VertexArrayObjectOES.hx
rename to std/js/html/rtc/PeerConnectionIceEvent.hx
index 78c3252b5d6b7e5d3472724e99396e2c7a7c28a0..e85aebecbd2f2673f7bdcde1da88c8cf61d6148c 100644
--- a/std/js/html/webgl/VertexArrayObjectOES.hx
+++ b/std/js/html/rtc/PeerConnectionIceEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,18 +20,25 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+// This file is generated from mozilla\RTCPeerConnectionIceEvent.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.rtc;
 
 /**
-	The `WebGLVertexArrayObjectOES` interface is part of the WebGL `OES_vertex_array_object` extension, represents vertex array objects (VAOs) pointing to vertex array data and provides names for different sets of vertex data.
+	The `RTCPeerConnectionIceEvent` interface represents events that occurs in relation to ICE candidates with the target, usually an `RTCPeerConnection`. Only one event is of this type: `icecandidate`.
 
-	Documentation [WebGLVertexArrayObjectOES](https://developer.mozilla.org/en-US/docs/Web/API/WebGLVertexArrayObjectOES) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WebGLVertexArrayObjectOES$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [RTCPeerConnectionIceEvent](https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnectionIceEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnectionIceEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLVertexArrayObjectOES>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnectionIceEvent>
 **/
-@:native("WebGLVertexArrayObjectOES")
-extern class VertexArrayObjectOES
-{
+@:native("RTCPeerConnectionIceEvent")
+extern class PeerConnectionIceEvent extends js.html.Event {
+	
+	/**
+		Contains the `RTCIceCandidate` containing the candidate associated with the event.
+	**/
+	var candidate(default,null) : IceCandidate;
+	
+	/** @throws DOMError */
+	function new( type : String, ?eventInitDict : PeerConnectionIceEventInit ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/PeerConnectionIceEventInit.hx b/std/js/html/rtc/PeerConnectionIceEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d3f0e255c318db146744f42decc1f124aa7476d8
--- /dev/null
+++ b/std/js/html/rtc/PeerConnectionIceEventInit.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCPeerConnectionIceEvent.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef PeerConnectionIceEventInit = EventInit & {
+	var ?candidate : IceCandidate;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/PriorityType.hx b/std/js/html/rtc/PriorityType.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a826f2b90699c84f83314b769cbd31ef7915b18d
--- /dev/null
+++ b/std/js/html/rtc/PriorityType.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpSender.webidl. Do not edit!
+
+package js.html.rtc;
+
+enum abstract PriorityType(String) {
+	var VERY_LOW = "very-low";
+	var LOW = "low";
+	var MEDIUM = "medium";
+	var HIGH = "high";
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/RtcpParameters.hx b/std/js/html/rtc/RtcpParameters.hx
new file mode 100644
index 0000000000000000000000000000000000000000..48ae70fca15d3f1e3ff575c00037633fb0ae9e01
--- /dev/null
+++ b/std/js/html/rtc/RtcpParameters.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpSender.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef RtcpParameters = {
+	var ?cname : String;
+	var ?reducedSize : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/RtpCodecParameters.hx b/std/js/html/rtc/RtpCodecParameters.hx
new file mode 100644
index 0000000000000000000000000000000000000000..aefb6f414dd678b49187e8250be5f9606d88ac70
--- /dev/null
+++ b/std/js/html/rtc/RtpCodecParameters.hx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpSender.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef RtpCodecParameters = {
+	var ?channels : Int;
+	var ?clockRate : Int;
+	var ?mimeType : String;
+	var ?payloadType : Int;
+	var ?sdpFmtpLine : String;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/RtpContributingSource.hx b/std/js/html/rtc/RtpContributingSource.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6e8d7781883d31d547231a5f1485cca25bb33dde
--- /dev/null
+++ b/std/js/html/rtc/RtpContributingSource.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpSources.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef RtpContributingSource = {
+	var ?audioLevel : Float;
+	var source : Int;
+	var timestamp : Float;
+}
\ No newline at end of file
diff --git a/std/js/html/AudioChannel.hx b/std/js/html/rtc/RtpEncodingParameters.hx
similarity index 72%
rename from std/js/html/AudioChannel.hx
rename to std/js/html/rtc/RtpEncodingParameters.hx
index 4a1b45687a4a6d2a94f953d64307782022f07e82..28e250379ef518b8afa20c0474255e23d99a665c 100644
--- a/std/js/html/AudioChannel.hx
+++ b/std/js/html/rtc/RtpEncodingParameters.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,18 +20,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\AudioChannel.webidl. Do not edit!
+// This file is generated from mozilla\RTCRtpSender.webidl. Do not edit!
 
-package js.html;
+package js.html.rtc;
 
-@:enum abstract AudioChannel(String)
-{
-	var NORMAL = "normal";
-	var CONTENT = "content";
-	var NOTIFICATION = "notification";
-	var ALARM = "alarm";
-	var TELEPHONY = "telephony";
-	var RINGER = "ringer";
-	var PUBLICNOTIFICATION = "publicnotification";
-	var SYSTEM = "system";
+typedef RtpEncodingParameters = {
+	var ?active : Bool;
+	var ?degradationPreference : DegradationPreference;
+	var ?fec : FecParameters;
+	var ?maxBitrate : Int;
+	var ?priority : PriorityType;
+	var ?rid : String;
+	var ?rtx : RtxParameters;
+	var ?scaleResolutionDownBy : Float;
+	var ?ssrc : Int;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/RtpHeaderExtensionParameters.hx b/std/js/html/rtc/RtpHeaderExtensionParameters.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1c57a4574caa6c4e0c1f17500059879217f93f43
--- /dev/null
+++ b/std/js/html/rtc/RtpHeaderExtensionParameters.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpSender.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef RtpHeaderExtensionParameters = {
+	var ?encrypted : Bool;
+	var ?id : Int;
+	var ?uri : String;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/RtpParameters.hx b/std/js/html/rtc/RtpParameters.hx
index 56577816c9015f9a826a8f5f7de430399d6055a9..4074e83bfa7e7db25c34df0219b54c5a3accf991 100644
--- a/std/js/html/rtc/RtpParameters.hx
+++ b/std/js/html/rtc/RtpParameters.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,9 @@
 
 package js.html.rtc;
 
-typedef RtpParameters =
-{
-	@:optional var codecs : Array<Dynamic/*MISSING RTCRtpCodecParameters*/>;
-	@:optional var encodings : Array<Dynamic/*MISSING RTCRtpEncodingParameters*/>;
-	@:optional var headerExtensions : Array<Dynamic/*MISSING RTCRtpHeaderExtensionParameters*/>;
-	@:optional var rtcp : Dynamic/*MISSING RTCRtcpParameters*/;
+typedef RtpParameters = {
+	var ?codecs : Array<RtpCodecParameters>;
+	var ?encodings : Array<RtpEncodingParameters>;
+	var ?headerExtensions : Array<RtpHeaderExtensionParameters>;
+	var ?rtcp : RtcpParameters;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/RtpReceiver.hx b/std/js/html/rtc/RtpReceiver.hx
index ee1e3ef179c39449f6fe530dc7fd6d6eb7e99f54..bc254aeb162fe7fdd25a66858027794f7f045598 100644
--- a/std/js/html/rtc/RtpReceiver.hx
+++ b/std/js/html/rtc/RtpReceiver.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,36 @@
 
 package js.html.rtc;
 
+import js.lib.Promise;
+
+/**
+	The `RTCRtpReceiver` interface of the the WebRTC API manages the reception and decoding of data for a `MediaStreamTrack` on an `RTCPeerConnection`.
+
+	Documentation [RTCRtpReceiver](https://developer.mozilla.org/en-US/docs/Web/API/RTCRtpReceiver) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCRtpReceiver$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCRtpReceiver>
+**/
 @:native("RTCRtpReceiver")
-extern class RtpReceiver
-{
+extern class RtpReceiver {
+
+	/**
+		Returns the `MediaStreamTrack` associated with the current `RTCRtpReceiver` instance. 
+	**/
 	var track(default,null) : js.html.MediaStreamTrack;
-	
+
+
+	/**
+		Returns a `Promise` whose fulfillment handler receives a `RTCStatsReport` which contains statistics about the incoming streams and their dependencies.
+	**/
+	function getStats() : Promise<StatsReport>;
+
+	/**
+		Returns an array of `RTCRtpContributingSource` instances for each unique CSRC (contributing source) identifier received by the current `RTCRtpReceiver` in the last ten seconds.
+	**/
+	function getContributingSources() : Array<RtpContributingSource>;
+
+	/**
+		Returns an array including one `RTCRtpSynchronizationSource` instance for each unique SSRC (synchronization source) identifier received by the current `RTCRtpReceiver` in the last ten seconds.
+	**/
+	function getSynchronizationSources() : Array<RtpSynchronizationSource>;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/RtpSender.hx b/std/js/html/rtc/RtpSender.hx
index d3fee9480ced211a446a0bf7b3cec9594cddf5ef..4445a5e3495ab5bfc0c92926c8558a19eb4cddcf 100644
--- a/std/js/html/rtc/RtpSender.hx
+++ b/std/js/html/rtc/RtpSender.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,12 +24,30 @@
 
 package js.html.rtc;
 
+import js.lib.Promise;
+
+/**
+	The `RTCRtpSender` interface provides the ability to control and obtain details about how a particular `MediaStreamTrack` is encoded and sent to a remote peer.
+
+	Documentation [RTCRtpSender](https://developer.mozilla.org/en-US/docs/Web/API/RTCRtpSender) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCRtpSender$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCRtpSender>
+**/
 @:native("RTCRtpSender")
-extern class RtpSender
-{
+extern class RtpSender {
+
+	/**
+		The `MediaStreamTrack` which is being handled by the `RTCRtpSender`. If `track` is `null`, the `RTCRtpSender` doesn't transmit anything.
+	**/
 	var track(default,null) : js.html.MediaStreamTrack;
-	
+
+	/**
+		An `RTCDTMFSender` which can be used to send `DTMF` tones using `"telephone-event"` payloads on the RTP session represented by the `RTCRtpSender` object. If `null`, the track and/or the connection doesn't support DTMF. Only audio tracks can support DTMF.
+	**/
+	var dtmf(default,null) : DTMFSender;
+
 	function setParameters( ?parameters : RtpParameters ) : Promise<Void>;
 	function getParameters() : RtpParameters;
-	function replaceTrack( track : js.html.MediaStreamTrack ) : Promise<Void>;
+	function replaceTrack( withTrack : js.html.MediaStreamTrack ) : Promise<Void>;
+	function getStats() : Promise<StatsReport>;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/RtpSynchronizationSource.hx b/std/js/html/rtc/RtpSynchronizationSource.hx
new file mode 100644
index 0000000000000000000000000000000000000000..da9945232a8a3d406972280cf86f6862a00a2a61
--- /dev/null
+++ b/std/js/html/rtc/RtpSynchronizationSource.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpSources.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef RtpSynchronizationSource = RtpContributingSource & {
+	var ?voiceActivityFlag : Bool;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/RtpTransceiver.hx b/std/js/html/rtc/RtpTransceiver.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c423a935dd64916c249fd647b8bb1e5353d3f781
--- /dev/null
+++ b/std/js/html/rtc/RtpTransceiver.hx
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpTransceiver.webidl. Do not edit!
+
+package js.html.rtc;
+
+/**
+	The WebRTC interface `RTCRtpTransceiver` describes a permanent pairing of an `RTCRtpSender` and an `RTCRtpReceiver`, along with some shared state.
+
+	Documentation [RTCRtpTransceiver](https://developer.mozilla.org/en-US/docs/Web/API/RTCRtpTransceiver) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCRtpTransceiver$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCRtpTransceiver>
+**/
+@:native("RTCRtpTransceiver")
+extern class RtpTransceiver {
+	
+	/**
+		The media ID of the m-line associated with this transceiver. This association is established, when possible, whenever either a local or remote description is applied. This field is `null` if neither a local or remote description has been applied, or if its associated m-line is rejected by either a remote offer or any answer.
+	**/
+	var mid(default,null) : String;
+	
+	/**
+		The `RTCRtpSender` object responsible for encoding and sending data to the remote peer.
+	**/
+	var sender(default,null) : RtpSender;
+	
+	/**
+		The `RTCRtpReceiver` object that handles receiving and decoding incoming media.
+	**/
+	var receiver(default,null) : RtpReceiver;
+	
+	/**
+		Indicates whether or not sending and receiving using the paired `RTCRtpSender` and `RTCRtpReceiver` has been permanently disabled, either due to SDP offer/answer, or due to a call to `RTCRtpTransceiver.stop`.
+	**/
+	var stopped(default,null) : Bool;
+	
+	/**
+		A string from the enum `RTCRtpTransceiverDirection` which is used to set the transceiver's desired direction.
+	**/
+	var direction : RtpTransceiverDirection;
+	
+	/**
+		A string from the enum `RTCRtpTransceiverDirection` which indicates the transceiver's current directionality, or `null` if the transceiver is stopped or has never participated in an exchange of offers and answers.
+	**/
+	var currentDirection(default,null) : RtpTransceiverDirection;
+	
+	function stop() : Void;
+	function getRemoteTrackId() : String;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/RtpTransceiverDirection.hx b/std/js/html/rtc/RtpTransceiverDirection.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4c3d5a7a9c6292a3eae85ad6b4c566b34198ee3c
--- /dev/null
+++ b/std/js/html/rtc/RtpTransceiverDirection.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpTransceiver.webidl. Do not edit!
+
+package js.html.rtc;
+
+enum abstract RtpTransceiverDirection(String) {
+	var SENDRECV = "sendrecv";
+	var SENDONLY = "sendonly";
+	var RECVONLY = "recvonly";
+	var INACTIVE = "inactive";
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/RtpTransceiverInit.hx b/std/js/html/rtc/RtpTransceiverInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ac45de8620404792f246ba339ec598883a3f36b1
--- /dev/null
+++ b/std/js/html/rtc/RtpTransceiverInit.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpTransceiver.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef RtpTransceiverInit = {
+	var ?direction : RtpTransceiverDirection;
+	var ?streams : Array<js.html.MediaStream>;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/RtxParameters.hx b/std/js/html/rtc/RtxParameters.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9187e4433accaf7a1d279626b390a4d7eb0f20d1
--- /dev/null
+++ b/std/js/html/rtc/RtxParameters.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCRtpSender.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef RtxParameters = {
+	var ?ssrc : Int;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/SdpType.hx b/std/js/html/rtc/SdpType.hx
index 8064dd715797b4dcfbb3cc33d64659e6dca0e198..71c169001321cb67baacb6cc41353976b1bcfabd 100644
--- a/std/js/html/rtc/SdpType.hx
+++ b/std/js/html/rtc/SdpType.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.rtc;
 
-@:enum abstract SdpType(String)
-{
+enum abstract SdpType(String) {
 	var OFFER = "offer";
 	var PRANSWER = "pranswer";
 	var ANSWER = "answer";
diff --git a/std/js/html/rtc/SessionDescription.hx b/std/js/html/rtc/SessionDescription.hx
index 789792002c9d02ef1dafd959ede79d5b4054ae50..082d4017b405f1aefc8f0bd16559cf3a8d78697e 100644
--- a/std/js/html/rtc/SessionDescription.hx
+++ b/std/js/html/rtc/SessionDescription.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html.rtc;
 
 /**
-	The `RTCSessionDescription` interface represents the parameters of a session. Each `RTCSessionDescription` consists of a description `type` indicating which part of the offer/answer negotiation process it describes and of the SDP descriptor of the session.
+	The `RTCSessionDescription` interface describes one end of a connection—or potential connection—and how it's configured. Each `RTCSessionDescription` consists of a description `type` indicating which part of the offer/answer negotiation process it describes and of the SDP descriptor of the session.
 
 	Documentation [RTCSessionDescription](https://developer.mozilla.org/en-US/docs/Web/API/RTCSessionDescription) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCSessionDescription$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCSessionDescription>
 **/
 @:native("RTCSessionDescription")
-extern class SessionDescription
-{
+extern class SessionDescription {
 	
 	/**
 		An enum of type ``RTCSdpType`` describing the session description's type.
@@ -47,4 +46,9 @@ extern class SessionDescription
 	
 	/** @throws DOMError */
 	function new( ?descriptionInitDict : SessionDescriptionInit ) : Void;
+	
+	/**
+		Returns a `JSON` description of the object. The values of both properties, `RTCSessionDescription.type` and `RTCSessionDescription.sdp`, are contained in the generated JSON.
+	**/
+	function toJSON() : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/SessionDescriptionInit.hx b/std/js/html/rtc/SessionDescriptionInit.hx
index 51ff893546482fda1541f5ad60398560492606d9..a15edd83c2a11623990357e2bcc19f365399cb33 100644
--- a/std/js/html/rtc/SessionDescriptionInit.hx
+++ b/std/js/html/rtc/SessionDescriptionInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.rtc;
 
-typedef SessionDescriptionInit =
-{
-	@:optional var sdp : String;
-	@:optional var type : SdpType;
+typedef SessionDescriptionInit = {
+	var ?sdp : String;
+	var type : SdpType;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/SignalingState.hx b/std/js/html/rtc/SignalingState.hx
index 0590ac45b121466373b3267c882453f255f0d8bf..bcf416a2dced5d9f97ecec34f1d40758a8c77d1c 100644
--- a/std/js/html/rtc/SignalingState.hx
+++ b/std/js/html/rtc/SignalingState.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,7 @@
 
 package js.html.rtc;
 
-@:enum abstract SignalingState(String)
-{
+enum abstract SignalingState(String) {
 	var STABLE = "stable";
 	var HAVE_LOCAL_OFFER = "have-local-offer";
 	var HAVE_REMOTE_OFFER = "have-remote-offer";
diff --git a/std/js/html/rtc/StatsReport.hx b/std/js/html/rtc/StatsReport.hx
index aeaafeb0008ea74cc1bc071acbad7a4d98d1a4eb..29e1dac45c52b6ceb7d13c81b716dd703c8670f9 100644
--- a/std/js/html/rtc/StatsReport.hx
+++ b/std/js/html/rtc/StatsReport.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,16 +25,28 @@
 package js.html.rtc;
 
 /**
-	WebRTC provides a method—`RTCPeerConnection.getStats()`—which returns a set of statistics about the state of the connection and the data transfers which have taken place. This status report is an object of type `RTCStatsReport`, and consists of a mapping of strings identifying objects which have had statistics recorded and a dictionary containing all of the corresponding data.
+	The `RTCStatsReport` interface is used to provide statistics data about WebRTC connections as returned by the `RTCPeerConnection.getStats()`, `RTCRtpReceiver.getStats()`, and `RTCRtpSender.getStats()` methods.
 
 	Documentation [RTCStatsReport](https://developer.mozilla.org/en-US/docs/Web/API/RTCStatsReport) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCStatsReport$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCStatsReport>
 **/
 @:native("RTCStatsReport")
-extern class StatsReport
-{
-	function forEach( callbackFn : StatsReport -> Void, ?thisArg : Dynamic ) : Void;
-	function get( key : String ) : Dynamic;
+extern class StatsReport {
+	var size(default,null) : Int;
+	
+	/** @throws DOMError */
+	function entries() : Dynamic;
+	/** @throws DOMError */
+	function keys() : Dynamic;
+	/** @throws DOMError */
+	function values() : Dynamic;
+	/** @throws DOMError */
+	function forEach( callback : Dynamic, ?thisArg : Dynamic ) : Void;
+	/** @throws DOMError */
+	@:pure
 	function has( key : String ) : Bool;
+	/** @throws DOMError */
+	@:pure
+	function get( key : String ) : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/rtc/TrackEvent.hx b/std/js/html/rtc/TrackEvent.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e595f547050e146d9077268f33edef6b7cd793d8
--- /dev/null
+++ b/std/js/html/rtc/TrackEvent.hx
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCTrackEvent.webidl. Do not edit!
+
+package js.html.rtc;
+
+/**
+	The WebRTC API interface `RTCTrackEvent` represents the `track` event, which is sent when a new `MediaStreamTrack` is added to an `RTCRtpReceiver` which is part of the `RTCPeerConnection`.
+
+	Documentation [RTCTrackEvent](https://developer.mozilla.org/en-US/docs/Web/API/RTCTrackEvent) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/RTCTrackEvent$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/RTCTrackEvent>
+**/
+@:native("RTCTrackEvent")
+extern class TrackEvent extends js.html.Event {
+	
+	/**
+		The `RTCRtpReceiver` used by the track that's been added to the `RTCPeerConnection`.
+	**/
+	var receiver(default,null) : RtpReceiver;
+	
+	/**
+		The `MediaStreamTrack` which has been added to the connection.
+	**/
+	var track(default,null) : js.html.MediaStreamTrack;
+	
+	/**
+		An array of `MediaStream` objects, each representing one of the media streams which comprise the `RTCTrackEvent.track` that was added to the connection. By default, the array is empty.
+	**/
+	var streams(default,null) : Array<js.html.MediaStream>;
+	
+	/**
+		The `RTCRtpTransceiver` being used by the new track.
+	**/
+	var transceiver(default,null) : RtpTransceiver;
+	
+	/** @throws DOMError */
+	function new( type : String, eventInitDict : TrackEventInit ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/rtc/TrackEventInit.hx b/std/js/html/rtc/TrackEventInit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..74e83eb445a8a996f538bc0369caac29edcba746
--- /dev/null
+++ b/std/js/html/rtc/TrackEventInit.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\RTCTrackEvent.webidl. Do not edit!
+
+package js.html.rtc;
+
+typedef TrackEventInit = EventInit & {
+	var receiver : RtpReceiver;
+	var ?streams : Array<js.html.MediaStream>;
+	var track : js.html.MediaStreamTrack;
+	var transceiver : RtpTransceiver;
+}
\ No newline at end of file
diff --git a/std/js/html/svg/AElement.hx b/std/js/html/svg/AElement.hx
index dc5242b4c1f739629d0573a0bac7564f3bb46b5a..7aa7e30f70652b3f8c70c502a947e22d9ed26688 100644
--- a/std/js/html/svg/AElement.hx
+++ b/std/js/html/svg/AElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,14 +32,56 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAElement>
 **/
 @:native("SVGAElement")
-extern class AElement extends GraphicsElement
-{
+extern class AElement extends GraphicsElement {
 	
 	/**
-		It corresponds to attribute  `target` on the given `a` element.
+		It corresponds to the `target` attribute of the given element.
 	**/
 	var target(default,null) : AnimatedString;
+	
+	/**
+		See `HTMLAnchorElement.download`.
+	**/
 	var download : String;
+	
+	/**
+		Is a `DOMString` that reflects the ping attribute, containing a space-separated list of URLs to which, when the hyperlink is followed, `POST` requests with the body `PING` will be sent by the browser (in the background). Typically used for tracking.
+	**/
+	var ping : String;
+	
+	/**
+		See `HTMLAnchorElement.rel`.
+	**/
+	var rel : String;
+	
+	/**
+		See `HTMLAnchorElement.referrerPolicy`.
+	**/
+	var referrerPolicy : String;
+	
+	/**
+		See `HTMLAnchorElement.relList`.
+	**/
+	var relList(default,null) : js.html.DOMTokenList;
+	
+	/**
+		Is a `DOMString` that reflects the `hreflang` attribute, indicating the language of the linked resource.
+	**/
+	var hreflang : String;
+	
+	/**
+		Is a `DOMString` that reflects the `type` attribute, indicating the MIME type of the linked resource.
+	**/
+	var type : String;
+	
+	/**
+		Is a `DOMString` being a synonym for the `Node.textContent` property.
+	**/
+	var text : String;
+	
+	/**
+		See `HTMLAnchorElement.href`.
+	**/
 	var href(default,null) : AnimatedString;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/Angle.hx b/std/js/html/svg/Angle.hx
index 0533a1d035d7071bc4bda755e2bdf954bb35c239..418fd8878d8b62547f75197c87cf23399168ed62 100644
--- a/std/js/html/svg/Angle.hx
+++ b/std/js/html/svg/Angle.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,12 +32,31 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAngle>
 **/
 @:native("SVGAngle")
-extern class Angle
-{
+extern class Angle {
+	
+	/**
+		Some unknown type of value.
+	**/
 	static inline var SVG_ANGLETYPE_UNKNOWN : Int = 0;
+	
+	/**
+		A unitless `number` interpreted as a value in degrees.
+	**/
 	static inline var SVG_ANGLETYPE_UNSPECIFIED : Int = 1;
+	
+	/**
+		An `angle` with a `deg` unit.
+	**/
 	static inline var SVG_ANGLETYPE_DEG : Int = 2;
+	
+	/**
+		An `angle` with a `rad` unit.
+	**/
 	static inline var SVG_ANGLETYPE_RAD : Int = 3;
+	
+	/**
+		An `angle` with a `grad` unit.
+	**/
 	static inline var SVG_ANGLETYPE_GRAD : Int = 4;
 	
 	
diff --git a/std/js/html/svg/AnimateElement.hx b/std/js/html/svg/AnimateElement.hx
index 7817e67533d50f038c15711fe4830bf308a5f245..96614d1078ac12368061b015e5d5d83b58f0db05 100644
--- a/std/js/html/svg/AnimateElement.hx
+++ b/std/js/html/svg/AnimateElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimateElement>
 **/
 @:native("SVGAnimateElement")
-extern class AnimateElement extends AnimationElement
-{
+extern class AnimateElement extends AnimationElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/AnimateMotionElement.hx b/std/js/html/svg/AnimateMotionElement.hx
index 2d4c70f5db9cf97018c39b032de1d9b8f4fc07bd..2094b7f3e33fb3bef85df4535574f9b1b015425b 100644
--- a/std/js/html/svg/AnimateMotionElement.hx
+++ b/std/js/html/svg/AnimateMotionElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimateMotionElement>
 **/
 @:native("SVGAnimateMotionElement")
-extern class AnimateMotionElement extends AnimationElement
-{
+extern class AnimateMotionElement extends AnimationElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/AnimateTransformElement.hx b/std/js/html/svg/AnimateTransformElement.hx
index 7bf52611abd6794e869b0aecd1b77603e4a9a7fc..5c1b03c807d66b6d8cda4092c389c568044ada9b 100644
--- a/std/js/html/svg/AnimateTransformElement.hx
+++ b/std/js/html/svg/AnimateTransformElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimateTransformElement>
 **/
 @:native("SVGAnimateTransformElement")
-extern class AnimateTransformElement extends AnimationElement
-{
+extern class AnimateTransformElement extends AnimationElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/AnimatedAngle.hx b/std/js/html/svg/AnimatedAngle.hx
index 4dabf06278778fcf85506cbe954b87871eb99c30..6f40a13d891dbcb3c4e4530c52611684ede7f260 100644
--- a/std/js/html/svg/AnimatedAngle.hx
+++ b/std/js/html/svg/AnimatedAngle.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedAngle>
 **/
 @:native("SVGAnimatedAngle")
-extern class AnimatedAngle
-{
+extern class AnimatedAngle {
 	var baseVal(default,null) : Angle;
 	var animVal(default,null) : Angle;
 	
diff --git a/std/js/html/svg/AnimatedBoolean.hx b/std/js/html/svg/AnimatedBoolean.hx
index bf5efb2e2417f3c2f50f445d31b9a518dfe20ea8..937e0c7dcff14a492fdbfc8cd54b8ae4931eeea9 100644
--- a/std/js/html/svg/AnimatedBoolean.hx
+++ b/std/js/html/svg/AnimatedBoolean.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedBoolean>
 **/
 @:native("SVGAnimatedBoolean")
-extern class AnimatedBoolean
-{
+extern class AnimatedBoolean {
 	var baseVal : Bool;
 	var animVal(default,null) : Bool;
 	
diff --git a/std/js/html/svg/AnimatedEnumeration.hx b/std/js/html/svg/AnimatedEnumeration.hx
index 06e3dfaf389c893888c66d544afdf3137a37101c..da1a6b686424f933d071f2d4e18f58eb4884b78b 100644
--- a/std/js/html/svg/AnimatedEnumeration.hx
+++ b/std/js/html/svg/AnimatedEnumeration.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedEnumeration>
 **/
 @:native("SVGAnimatedEnumeration")
-extern class AnimatedEnumeration
-{
+extern class AnimatedEnumeration {
 	var baseVal : Int;
 	var animVal(default,null) : Int;
 	
diff --git a/std/js/html/svg/AnimatedInteger.hx b/std/js/html/svg/AnimatedInteger.hx
index 190803c495fb25b8f3ef9837fa4b2b06681e8584..163fce048fc2361f85f0d016649ca20abe7f590d 100644
--- a/std/js/html/svg/AnimatedInteger.hx
+++ b/std/js/html/svg/AnimatedInteger.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedInteger>
 **/
 @:native("SVGAnimatedInteger")
-extern class AnimatedInteger
-{
+extern class AnimatedInteger {
 	var baseVal : Int;
 	var animVal(default,null) : Int;
 	
diff --git a/std/js/html/svg/AnimatedLength.hx b/std/js/html/svg/AnimatedLength.hx
index 16f5fe14a06fbf65d077ddc945d250d494cfdd60..6732c3773694fde17f7b70c2459df5f1e9111d25 100644
--- a/std/js/html/svg/AnimatedLength.hx
+++ b/std/js/html/svg/AnimatedLength.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedLength>
 **/
 @:native("SVGAnimatedLength")
-extern class AnimatedLength
-{
+extern class AnimatedLength {
 	var baseVal(default,null) : Length;
 	var animVal(default,null) : Length;
 	
diff --git a/std/js/html/svg/AnimatedLengthList.hx b/std/js/html/svg/AnimatedLengthList.hx
index fb9b7fe97e1108822cae19cb66da1a56ff72d693..2b77cebb722321266446279609149091a4f99b21 100644
--- a/std/js/html/svg/AnimatedLengthList.hx
+++ b/std/js/html/svg/AnimatedLengthList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedLengthList>
 **/
 @:native("SVGAnimatedLengthList")
-extern class AnimatedLengthList
-{
+extern class AnimatedLengthList {
 	var baseVal(default,null) : LengthList;
 	var animVal(default,null) : LengthList;
 	
diff --git a/std/js/html/svg/AnimatedNumber.hx b/std/js/html/svg/AnimatedNumber.hx
index f5b89bfaf7c96b146614108083d759d68bcec0a1..78cf5571d299d5e729c3d4626eae8592f7c4b991 100644
--- a/std/js/html/svg/AnimatedNumber.hx
+++ b/std/js/html/svg/AnimatedNumber.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedNumber>
 **/
 @:native("SVGAnimatedNumber")
-extern class AnimatedNumber
-{
+extern class AnimatedNumber {
 	var baseVal : Float;
 	var animVal(default,null) : Float;
 	
diff --git a/std/js/html/svg/AnimatedNumberList.hx b/std/js/html/svg/AnimatedNumberList.hx
index 09160a8cda5963fb3727d7beca8fb09f6943d828..f91e304faf7f0a8393641633f1fe804cec7d441c 100644
--- a/std/js/html/svg/AnimatedNumberList.hx
+++ b/std/js/html/svg/AnimatedNumberList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedNumberList>
 **/
 @:native("SVGAnimatedNumberList")
-extern class AnimatedNumberList
-{
+extern class AnimatedNumberList {
 	var baseVal(default,null) : NumberList;
 	var animVal(default,null) : NumberList;
 	
diff --git a/std/js/html/svg/AnimatedPreserveAspectRatio.hx b/std/js/html/svg/AnimatedPreserveAspectRatio.hx
index 40eccf49ff3883c23a5da9a6cc9721aa8eddd121..e7c7799233b91658ffb5118862c589b9e882015f 100644
--- a/std/js/html/svg/AnimatedPreserveAspectRatio.hx
+++ b/std/js/html/svg/AnimatedPreserveAspectRatio.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedPreserveAspectRatio>
 **/
 @:native("SVGAnimatedPreserveAspectRatio")
-extern class AnimatedPreserveAspectRatio
-{
+extern class AnimatedPreserveAspectRatio {
 	var baseVal(default,null) : PreserveAspectRatio;
 	var animVal(default,null) : PreserveAspectRatio;
 	
diff --git a/std/js/html/svg/AnimatedRect.hx b/std/js/html/svg/AnimatedRect.hx
index fbcf203212acd2c725004ce1c81f67cfc9881c3a..f015505c8bb04a2690bea2f5be7d3a1e2e3bfc9d 100644
--- a/std/js/html/svg/AnimatedRect.hx
+++ b/std/js/html/svg/AnimatedRect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedRect>
 **/
 @:native("SVGAnimatedRect")
-extern class AnimatedRect
-{
+extern class AnimatedRect {
 	var baseVal(default,null) : Rect;
 	var animVal(default,null) : Rect;
 	
diff --git a/std/js/html/svg/AnimatedString.hx b/std/js/html/svg/AnimatedString.hx
index e2e3bc5805496c2012ad2d93d46c5d70d1fd68d6..d728eb7abe3f3f84e5cf421facb0f5112fd302e2 100644
--- a/std/js/html/svg/AnimatedString.hx
+++ b/std/js/html/svg/AnimatedString.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html.svg;
 
 /**
-	The` SVGAnimatedString `interface represent string attributes which can be animated from each SVG declaration. You need to create SVG attribute before doing anything else, everything should be declared inside this.
+	The `SVGAnimatedString` interface represents string attributes which can be animated from each SVG declaration. You need to create SVG attribute before doing anything else, everything should be declared inside this.
 
 	Documentation [SVGAnimatedString](https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedString) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedString$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedString>
 **/
 @:native("SVGAnimatedString")
-extern class AnimatedString
-{
+extern class AnimatedString {
 	
 	/**
 		This is a `DOMString` representing the base value. The base value of the given attribute before applying any animations. Setter throws DOMException.
diff --git a/std/js/html/svg/AnimatedTransformList.hx b/std/js/html/svg/AnimatedTransformList.hx
index c12c62b0d687f6fd297d17119f6273dce16382bd..3b8dc54859bc39c67a0f6db9016324f1ccc2d116 100644
--- a/std/js/html/svg/AnimatedTransformList.hx
+++ b/std/js/html/svg/AnimatedTransformList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimatedTransformList>
 **/
 @:native("SVGAnimatedTransformList")
-extern class AnimatedTransformList
-{
+extern class AnimatedTransformList {
 	var baseVal(default,null) : TransformList;
 	var animVal(default,null) : TransformList;
 	
diff --git a/std/js/html/svg/AnimationElement.hx b/std/js/html/svg/AnimationElement.hx
index 743d2994d0b051194d4d741182aff625452cfd76..7b2f16d7f63b17ca0d9494d48d3b5185260412a2 100644
--- a/std/js/html/svg/AnimationElement.hx
+++ b/std/js/html/svg/AnimationElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,25 +32,62 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAnimationElement>
 **/
 @:native("SVGAnimationElement")
-extern class AnimationElement extends Element
-{
+extern class AnimationElement extends Element {
+	
+	/**
+		An `SVGElement` representing the element which is being animated. If no target element is being animated (for example, because the `href` specifies an unknown element) the value returned is `null`.
+	**/
 	var targetElement(default,null) : Element;
 	var requiredFeatures(default,null) : StringList;
 	var requiredExtensions(default,null) : StringList;
 	var systemLanguage(default,null) : StringList;
 	
-	/** @throws DOMError */
+	
+	/**
+		Returns a float representing the begin time, in seconds, for this animation element's current interval, if it exists, regardless of whether the interval has begun yet. If there is no current interval, then a `DOMException` with code `INVALID_STATE_ERR` is thrown.
+		@throws DOMError
+	**/
 	function getStartTime() : Float;
+	
+	/**
+		Returns a float representing the current time in seconds relative to time zero for the given time container.
+	**/
 	function getCurrentTime() : Float;
-	/** @throws DOMError */
+	
+	/**
+		Returns a float representing the number of seconds for the simple duration for this animation. If the simple duration is undefined (e.g., the end time is indefinite), then a `DOMException` with code `NOT_SUPPORTED_ERR` is raised.
+		@throws DOMError
+	**/
 	function getSimpleDuration() : Float;
-	/** @throws DOMError */
+	
+	/**
+		Creates a begin instance time for the current time. The new instance time is added to the begin instance times list. The behavior of this method is equivalent to `beginElementAt(0)`.
+		@throws DOMError
+	**/
 	function beginElement() : Void;
-	/** @throws DOMError */
+	
+	/**
+		
+		 Creates a begin instance time for the current time plus the specified offset. The new instance time is added to the begin instance times list.
+		 
+		@throws DOMError
+	**/
 	function beginElementAt( offset : Float ) : Void;
-	/** @throws DOMError */
+	
+	/**
+		
+		 Creates an end instance time for the current time. The new instance time is added to the end instance times list. The behavior of this method is equivalent to `endElementAt(0)`.
+		 
+		@throws DOMError
+	**/
 	function endElement() : Void;
-	/** @throws DOMError */
+	
+	/**
+		
+		 Creates a end instance time for the current time plus the specified offset. The new instance time is added to the end instance times list.
+		 
+		@throws DOMError
+	**/
 	function endElementAt( offset : Float ) : Void;
 	function hasExtension( extension : String ) : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/BoundingBoxOptions.hx b/std/js/html/svg/BoundingBoxOptions.hx
index fa88458afc2d0fba0bbf7bb0ad24098e83d54fc0..35cd70dc95bfc4ed4b3266761f0c2c748314f532 100644
--- a/std/js/html/svg/BoundingBoxOptions.hx
+++ b/std/js/html/svg/BoundingBoxOptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,9 @@
 
 package js.html.svg;
 
-typedef BoundingBoxOptions =
-{
-	@:optional var clipped : Bool;
-	@:optional var fill : Bool;
-	@:optional var markers : Bool;
-	@:optional var stroke : Bool;
+typedef BoundingBoxOptions = {
+	var ?clipped : Bool;
+	var ?fill : Bool;
+	var ?markers : Bool;
+	var ?stroke : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/CircleElement.hx b/std/js/html/svg/CircleElement.hx
index d2e0c3ac66e8706fb387e0cc0bc5f106669b01fe..71561ea89cf071a6bde9251faeac0e33ac896065 100644
--- a/std/js/html/svg/CircleElement.hx
+++ b/std/js/html/svg/CircleElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,17 +25,40 @@
 package js.html.svg;
 
 /**
-	The `SVGCircleElement` interface is an interface for the `circle` element. The circle element is defined by the cx and cy attributes, that denote the coordinates of the centre of the circle. It also has a radius attribute r that denotes the radius of the circle. The radius value must be positive to allow the successful rendering of the element.
+	The `SVGCircleElement` interface is an interface for the `circle` element. The circle element is defined by the cx and cy attributes that denote the coordinates of the centre of the circle.
 
 	Documentation [SVGCircleElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGCircleElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGCircleElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGCircleElement>
 **/
 @:native("SVGCircleElement")
-extern class CircleElement extends GraphicsElement
-{
+extern class CircleElement extends GeometryElement {
+	
+	/**
+		
+		 This property defines the x-coordinate of the center of the circle element. It is denoted by the `cx` attribute of the `circle` element. If unspecified, the value of this attribute is assumed to be `0`.
+		
+		 It can be animated by SVG's animation elements.
+		 
+	**/
 	var cx(default,null) : AnimatedLength;
+	
+	/**
+		
+		 This property defines the y-coordinate of the center of the circle element. It is denoted by the `cy` attribute of the `circle` element. If unspecified, the value of this attribute is assumed to be `0`.
+		
+		 It can be animated by SVG's animation elements.
+		 
+	**/
 	var cy(default,null) : AnimatedLength;
+	
+	/**
+		
+		 This property defines the radius of the circle element. It is denoted by the `r` of the `circle` element. A negative value gives an error, while `0` disables the rendering of the element.
+		
+		 It can be animated by SVG's animation elements.
+		 
+	**/
 	var r(default,null) : AnimatedLength;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/ClipPathElement.hx b/std/js/html/svg/ClipPathElement.hx
index c8213abf93de07e853d8e5a71e600fb74e1d7c62..f93d141c70759b574e49fbfe19ea54a2e61d630e 100644
--- a/std/js/html/svg/ClipPathElement.hx
+++ b/std/js/html/svg/ClipPathElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,12 +32,11 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGClipPathElement>
 **/
 @:native("SVGClipPathElement")
-extern class ClipPathElement extends Element
-{
-	static inline var SVG_UNIT_TYPE_UNKNOWN : Int = 0;
-	static inline var SVG_UNIT_TYPE_USERSPACEONUSE : Int = 1;
-	static inline var SVG_UNIT_TYPE_OBJECTBOUNDINGBOX : Int = 2;
+extern class ClipPathElement extends Element {
 	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `clipPathUnits` attribute of the given `clipPath` element. Takes one of the constants defined in `SVGUnitTypes`.
+	**/
 	var clipPathUnits(default,null) : AnimatedEnumeration;
 	var transform(default,null) : AnimatedTransformList;
 	
diff --git a/std/js/html/svg/ComponentTransferFunctionElement.hx b/std/js/html/svg/ComponentTransferFunctionElement.hx
index fa9251bff41180ef531c157e619e93f21054723f..e2aa0255d8ee74022af0d0f7a29b5299078672c6 100644
--- a/std/js/html/svg/ComponentTransferFunctionElement.hx
+++ b/std/js/html/svg/ComponentTransferFunctionElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,15 @@
 
 package js.html.svg;
 
+/**
+	The `SVGComponentTransferFunctionElement` interface defines a base interface used by the component transfer function interfaces.
+
+	Documentation [SVGComponentTransferFunctionElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGComponentTransferFunctionElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGComponentTransferFunctionElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGComponentTransferFunctionElement>
+**/
 @:native("SVGComponentTransferFunctionElement")
-extern class ComponentTransferFunctionElement extends Element
-{
+extern class ComponentTransferFunctionElement extends Element {
 	static inline var SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN : Int = 0;
 	static inline var SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY : Int = 1;
 	static inline var SVG_FECOMPONENTTRANSFER_TYPE_TABLE : Int = 2;
@@ -34,12 +40,40 @@ extern class ComponentTransferFunctionElement extends Element
 	static inline var SVG_FECOMPONENTTRANSFER_TYPE_LINEAR : Int = 4;
 	static inline var SVG_FECOMPONENTTRANSFER_TYPE_GAMMA : Int = 5;
 	
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `type` attribute of the given element. It takes one of the `SVG_FECOMPONENTTRANSFER_TYPE_*` constants defined on this interface.
+	**/
 	var type(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedNumberList` corresponding to the `tableValues` attribute of the given element.
+	**/
 	var tableValues(default,null) : AnimatedNumberList;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `slope` attribute of the given element.
+	**/
 	var slope(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `intercept` attribute of the given element.
+	**/
 	var intercept(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `amplitude` attribute of the given element.
+	**/
 	var amplitude(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `exponent` attribute of the given element.
+	**/
 	var exponent(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `offset` attribute of the given element.
+	**/
 	var offset(default,null) : AnimatedNumber;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/DefsElement.hx b/std/js/html/svg/DefsElement.hx
index cb2dd9de173b569afa80a663d537b263af87a7b5..b3147774e2032ebbd3b2c365c3b5dcbe4c30efe2 100644
--- a/std/js/html/svg/DefsElement.hx
+++ b/std/js/html/svg/DefsElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGDefsElement>
 **/
 @:native("SVGDefsElement")
-extern class DefsElement extends GraphicsElement
-{
+extern class DefsElement extends GraphicsElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/DescElement.hx b/std/js/html/svg/DescElement.hx
index 49a69bbe5e250ba7463ee9b50843de1538f790cf..ee415e293ac9882dd35d5185216556c4f0005ecd 100644
--- a/std/js/html/svg/DescElement.hx
+++ b/std/js/html/svg/DescElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGDescElement>
 **/
 @:native("SVGDescElement")
-extern class DescElement extends Element
-{
+extern class DescElement extends Element {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/Element.hx b/std/js/html/svg/Element.hx
index e6e2d1eaf00b2d2c852925af53adec1b3f0580a0..694f6235e60e41961b7abca4ddc72f96671a63a8 100644
--- a/std/js/html/svg/Element.hx
+++ b/std/js/html/svg/Element.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,9 +32,20 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGElement>
 **/
 @:native("SVGElement")
-extern class Element extends js.html.DOMElement
-{
+extern class Element extends js.html.DOMElement {
+	
+	/**
+		An `SVGSVGElement` referring to the nearest ancestor `svg` element. `null` if the given element is the outermost `svg` element.
+	**/
 	var ownerSVGElement(default,null) : SVGElement;
+	
+	/**
+		The `SVGElement`, which established the current viewport. Often, the nearest ancestor `svg` element. `null` if the given element is the outermost `svg` element.
+	**/
 	var viewportElement(default,null) : Element;
 	
+	/** @throws DOMError */
+	function focus() : Void;
+	/** @throws DOMError */
+	function blur() : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/EllipseElement.hx b/std/js/html/svg/EllipseElement.hx
index 3265b239fd4b9a897cc04f042d8ebcf8011f4ead..dc4ff02a7dcf540e1e16c6aab3191d0294628ac2 100644
--- a/std/js/html/svg/EllipseElement.hx
+++ b/std/js/html/svg/EllipseElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,26 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGEllipseElement>
 **/
 @:native("SVGEllipseElement")
-extern class EllipseElement extends GraphicsElement
-{
+extern class EllipseElement extends GeometryElement {
+	
+	/**
+		This property returns a `SVGAnimatedLength` reflecting the `cx` attribute of the given `ellipse` element.
+	**/
 	var cx(default,null) : AnimatedLength;
+	
+	/**
+		This property returns a `SVGAnimatedLength` reflecting the `cy` attribute of the given `ellipse` element.
+	**/
 	var cy(default,null) : AnimatedLength;
+	
+	/**
+		This property returns a `SVGAnimatedLength` reflecting the `rx` attribute of the given `ellipse` element.
+	**/
 	var rx(default,null) : AnimatedLength;
+	
+	/**
+		This property returns a `SVGAnimatedLength` reflecting the `ry` attribute of the given `ellipse` element.
+	**/
 	var ry(default,null) : AnimatedLength;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FEBlendElement.hx b/std/js/html/svg/FEBlendElement.hx
index 07ae5f5f8d4fcf2cbf417ff2c4dc2f9797f3c9c6..0c8ca23316b030bfa26d10a6d6b1a41d197d327a 100644
--- a/std/js/html/svg/FEBlendElement.hx
+++ b/std/js/html/svg/FEBlendElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,15 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEBlendElement` interface corresponds to the `feBlend` element.
+
+	Documentation [SVGFEBlendElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEBlendElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEBlendElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEBlendElement>
+**/
 @:native("SVGFEBlendElement")
-extern class FEBlendElement extends Element
-{
+extern class FEBlendElement extends Element {
 	static inline var SVG_FEBLEND_MODE_UNKNOWN : Int = 0;
 	static inline var SVG_FEBLEND_MODE_NORMAL : Int = 1;
 	static inline var SVG_FEBLEND_MODE_MULTIPLY : Int = 2;
@@ -45,8 +51,20 @@ extern class FEBlendElement extends Element
 	static inline var SVG_FEBLEND_MODE_COLOR : Int = 15;
 	static inline var SVG_FEBLEND_MODE_LUMINOSITY : Int = 16;
 	
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in2` attribute of the given element.
+	**/
 	var in2(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `mode` attribute of the given element. It takes one of the `SVG_FEBLEND_MODE_*` constants defined on this interface.
+	**/
 	var mode(default,null) : AnimatedEnumeration;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FEColorMatrixElement.hx b/std/js/html/svg/FEColorMatrixElement.hx
index bcf9588094dfe3491d28da2862b687d6181f192d..c4a2bd5b5ef1e2bbabbb2e4e0d2cf71496dec9e2 100644
--- a/std/js/html/svg/FEColorMatrixElement.hx
+++ b/std/js/html/svg/FEColorMatrixElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,17 +24,35 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEColorMatrixElement` interface corresponds to the `feColorMatrix` element.
+
+	Documentation [SVGFEColorMatrixElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEColorMatrixElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEColorMatrixElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEColorMatrixElement>
+**/
 @:native("SVGFEColorMatrixElement")
-extern class FEColorMatrixElement extends Element
-{
+extern class FEColorMatrixElement extends Element {
 	static inline var SVG_FECOLORMATRIX_TYPE_UNKNOWN : Int = 0;
 	static inline var SVG_FECOLORMATRIX_TYPE_MATRIX : Int = 1;
 	static inline var SVG_FECOLORMATRIX_TYPE_SATURATE : Int = 2;
 	static inline var SVG_FECOLORMATRIX_TYPE_HUEROTATE : Int = 3;
 	static inline var SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA : Int = 4;
 	
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `type` attribute of the given element. It takes one of the `SVG_FECOLORMATRIX_TYPE_*` constants defined on this interface.
+	**/
 	var type(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedNumberList` corresponding to the `values` attribute of the given element.
+	**/
 	var values(default,null) : AnimatedNumberList;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FEComponentTransferElement.hx b/std/js/html/svg/FEComponentTransferElement.hx
index 8a5d7f7efda2c140c4b3f27bd1241c5b3ec5c2b2..ac094903782cd8c8834ec876d3dd391f7fc6754f 100644
--- a/std/js/html/svg/FEComponentTransferElement.hx
+++ b/std/js/html/svg/FEComponentTransferElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,19 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEComponentTransferElement` interface corresponds to the `feComponentTransfer` element.
+
+	Documentation [SVGFEComponentTransferElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEComponentTransferElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEComponentTransferElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEComponentTransferElement>
+**/
 @:native("SVGFEComponentTransferElement")
-extern class FEComponentTransferElement extends Element
-{
+extern class FEComponentTransferElement extends Element {
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FECompositeElement.hx b/std/js/html/svg/FECompositeElement.hx
index 433f23c2d36c58df93b20cf14d3b0054b238ed6c..4dfc2dccfdcc733ac3629dcb53884bb70fab3515 100644
--- a/std/js/html/svg/FECompositeElement.hx
+++ b/std/js/html/svg/FECompositeElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,15 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFECompositeElement` interface corresponds to the `feComposite` element.
+
+	Documentation [SVGFECompositeElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFECompositeElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFECompositeElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFECompositeElement>
+**/
 @:native("SVGFECompositeElement")
-extern class FECompositeElement extends Element
-{
+extern class FECompositeElement extends Element {
 	static inline var SVG_FECOMPOSITE_OPERATOR_UNKNOWN : Int = 0;
 	static inline var SVG_FECOMPOSITE_OPERATOR_OVER : Int = 1;
 	static inline var SVG_FECOMPOSITE_OPERATOR_IN : Int = 2;
@@ -35,9 +41,14 @@ extern class FECompositeElement extends Element
 	static inline var SVG_FECOMPOSITE_OPERATOR_XOR : Int = 5;
 	static inline var SVG_FECOMPOSITE_OPERATOR_ARITHMETIC : Int = 6;
 	
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
 	var in2(default,null) : AnimatedString;
-	var operator(default,null) : AnimatedEnumeration;
+	@:native("operator")
+	var operator_(default,null) : AnimatedEnumeration;
 	var k1(default,null) : AnimatedNumber;
 	var k2(default,null) : AnimatedNumber;
 	var k3(default,null) : AnimatedNumber;
diff --git a/std/js/html/svg/FEConvolveMatrixElement.hx b/std/js/html/svg/FEConvolveMatrixElement.hx
index 6adf7da5706aabbca9e99f3b8be7fed852b34ad1..cbba9b0d4c4f6f664c8358bc5306ff1f2b2afbab 100644
--- a/std/js/html/svg/FEConvolveMatrixElement.hx
+++ b/std/js/html/svg/FEConvolveMatrixElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,25 +24,79 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEConvolveMatrixElement` interface corresponds to the `feConvolveMatrix` element.
+
+	Documentation [SVGFEConvolveMatrixElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEConvolveMatrixElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEConvolveMatrixElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEConvolveMatrixElement>
+**/
 @:native("SVGFEConvolveMatrixElement")
-extern class FEConvolveMatrixElement extends Element
-{
+extern class FEConvolveMatrixElement extends Element {
 	static inline var SVG_EDGEMODE_UNKNOWN : Int = 0;
 	static inline var SVG_EDGEMODE_DUPLICATE : Int = 1;
 	static inline var SVG_EDGEMODE_WRAP : Int = 2;
 	static inline var SVG_EDGEMODE_NONE : Int = 3;
 	
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedInteger` corresponding to the `order` attribute of the given element.
+	**/
 	var orderX(default,null) : AnimatedInteger;
+	
+	/**
+		An `SVGAnimatedInteger` corresponding to the `order` attribute of the given element.
+	**/
 	var orderY(default,null) : AnimatedInteger;
+	
+	/**
+		An `SVGAnimatedNumberList` corresponding to the `kernelMatrix` attribute of the given element.
+	**/
 	var kernelMatrix(default,null) : AnimatedNumberList;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `divisor` attribute of the given element.
+	**/
 	var divisor(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `bias` attribute of the given element.
+	**/
 	var bias(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedInteger` corresponding to the `targetX` attribute of the given element.
+	**/
 	var targetX(default,null) : AnimatedInteger;
+	
+	/**
+		An `SVGAnimatedInteger` corresponding to the `targetY` attribute of the given element.
+	**/
 	var targetY(default,null) : AnimatedInteger;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `edgeMode` attribute of the given element. Takes one of the `SVG_EDGEMODE_*` constants defined on this interface.
+	**/
 	var edgeMode(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `kernelUnitLength` attribute of the given element.
+	**/
 	var kernelUnitLengthX(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `kernelUnitLength` attribute of the given element.
+	**/
 	var kernelUnitLengthY(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedBoolean` corresponding to the `preserveAlpha` attribute of the given element.
+	**/
 	var preserveAlpha(default,null) : AnimatedBoolean;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FEDiffuseLightingElement.hx b/std/js/html/svg/FEDiffuseLightingElement.hx
index 17181444e4f93501df716f467a1c6fac68b2ff9f..8fd7a4b49a02caa45e948c80381994daef9d430f 100644
--- a/std/js/html/svg/FEDiffuseLightingElement.hx
+++ b/std/js/html/svg/FEDiffuseLightingElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,39 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEDiffuseLightingElement` interface corresponds to the `feDiffuseLighting` element.
+
+	Documentation [SVGFEDiffuseLightingElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDiffuseLightingElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDiffuseLightingElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDiffuseLightingElement>
+**/
 @:native("SVGFEDiffuseLightingElement")
-extern class FEDiffuseLightingElement extends Element
-{
+extern class FEDiffuseLightingElement extends Element {
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `surfaceScale` attribute of the given element.
+	**/
 	var surfaceScale(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `diffuseConstant` attribute of the given element.
+	**/
 	var diffuseConstant(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the X component of the `kernelUnitLength` attribute of the given element.
+	**/
 	var kernelUnitLengthX(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the Y component of the `kernelUnitLength` attribute of the given element.
+	**/
 	var kernelUnitLengthY(default,null) : AnimatedNumber;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FEDisplacementMapElement.hx b/std/js/html/svg/FEDisplacementMapElement.hx
index 34ce601d1666339ebd44911ec3d6f0ce7e5714b6..099135b6081dd4a591cf1ec5da447d110223fa75 100644
--- a/std/js/html/svg/FEDisplacementMapElement.hx
+++ b/std/js/html/svg/FEDisplacementMapElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,19 +24,45 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEDisplacementMapElement` interface corresponds to the `feDisplacementMap` element.
+
+	Documentation [SVGFEDisplacementMapElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDisplacementMapElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDisplacementMapElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDisplacementMapElement>
+**/
 @:native("SVGFEDisplacementMapElement")
-extern class FEDisplacementMapElement extends Element
-{
+extern class FEDisplacementMapElement extends Element {
 	static inline var SVG_CHANNEL_UNKNOWN : Int = 0;
 	static inline var SVG_CHANNEL_R : Int = 1;
 	static inline var SVG_CHANNEL_G : Int = 2;
 	static inline var SVG_CHANNEL_B : Int = 3;
 	static inline var SVG_CHANNEL_A : Int = 4;
 	
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in2` attribute of the given element.
+	**/
 	var in2(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `scale` attribute of the given element.
+	**/
 	var scale(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `xChannelSelect` attribute of the given element. It takes one of the `SVG_CHANNEL_*` constants defined on this interface.
+	**/
 	var xChannelSelector(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `yChannelSelect` attribute of the given element. It takes one of the `SVG_CHANNEL_*` constants defined on this interface.
+	**/
 	var yChannelSelector(default,null) : AnimatedEnumeration;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FEDistantLightElement.hx b/std/js/html/svg/FEDistantLightElement.hx
index 4be46116d78eecec794874713b54c654e954c197..e50e74a4e9dc6c4567162f78aecdd9a7f2f0960d 100644
--- a/std/js/html/svg/FEDistantLightElement.hx
+++ b/std/js/html/svg/FEDistantLightElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,24 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEDistantLightElement` interface corresponds to the `feDistantLight` element.
+
+	Documentation [SVGFEDistantLightElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDistantLightElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDistantLightElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDistantLightElement>
+**/
 @:native("SVGFEDistantLightElement")
-extern class FEDistantLightElement extends Element
-{
+extern class FEDistantLightElement extends Element {
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `azimuth` attribute of the given element.
+	**/
 	var azimuth(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `elevation` attribute of the given element.
+	**/
 	var elevation(default,null) : AnimatedNumber;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FEDropShadowElement.hx b/std/js/html/svg/FEDropShadowElement.hx
index b57b6bdb8433ed3fd713a478692bfd83a7565ca9..b9043c057dcd4571370f815936d2126dd2a7b24e 100644
--- a/std/js/html/svg/FEDropShadowElement.hx
+++ b/std/js/html/svg/FEDropShadowElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,39 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEDropShadowElement` interface corresponds to the `feDropShadow` element.
+
+	Documentation [SVGFEDropShadowElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDropShadowElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDropShadowElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEDropShadowElement>
+**/
 @:native("SVGFEDropShadowElement")
-extern class FEDropShadowElement extends Element
-{
+extern class FEDropShadowElement extends Element {
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `dx` attribute of the given element.
+	**/
 	var dx(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `dy` attribute of the given element.
+	**/
 	var dy(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the (possibly automatically computed) X component of the `stdDeviationX` attribute of the given element.
+	**/
 	var stdDeviationX(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the (possibly automatically computed) Y component of the `stdDeviationY` attribute of the given element.
+	**/
 	var stdDeviationY(default,null) : AnimatedNumber;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
@@ -38,5 +64,9 @@ extern class FEDropShadowElement extends Element
 	var height(default,null) : AnimatedLength;
 	var result(default,null) : AnimatedString;
 	
+	
+	/**
+		Sets the values for the `stdDeviation` attribute.
+	**/
 	function setStdDeviation( stdDeviationX : Float, stdDeviationY : Float ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FEFloodElement.hx b/std/js/html/svg/FEFloodElement.hx
index 5694ff7ce3aab1684e3c0eb9ab46a064ce7e75c6..4eb51a84ebd9c0af2efac5cd4eab21a9f25e76f0 100644
--- a/std/js/html/svg/FEFloodElement.hx
+++ b/std/js/html/svg/FEFloodElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,15 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEFloodElement` interface corresponds to the `feFlood` element.
+
+	Documentation [SVGFEFloodElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFloodElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFloodElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFloodElement>
+**/
 @:native("SVGFEFloodElement")
-extern class FEFloodElement extends Element
-{
+extern class FEFloodElement extends Element {
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
 	var width(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FEFuncAElement.hx b/std/js/html/svg/FEFuncAElement.hx
index 0176d50cc60c10405f20d7b664c8ecda2ef989c9..b4a8413597472c9bcd049d5b0dcde21037fda460 100644
--- a/std/js/html/svg/FEFuncAElement.hx
+++ b/std/js/html/svg/FEFuncAElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,13 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEFuncAElement` interface corresponds to the `feFuncA` element.
+
+	Documentation [SVGFEFuncAElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncAElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncAElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncAElement>
+**/
 @:native("SVGFEFuncAElement")
-extern class FEFuncAElement extends ComponentTransferFunctionElement
-{
+extern class FEFuncAElement extends ComponentTransferFunctionElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FEFuncBElement.hx b/std/js/html/svg/FEFuncBElement.hx
index b198ac2b346a03e350bb3af7785628e91fc4a451..5dd5f7469e765bbdc0d16a3c8f694cf744edd426 100644
--- a/std/js/html/svg/FEFuncBElement.hx
+++ b/std/js/html/svg/FEFuncBElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,13 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEFuncBElement` interface corresponds to the `feFuncB` element.
+
+	Documentation [SVGFEFuncBElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncBElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncBElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncBElement>
+**/
 @:native("SVGFEFuncBElement")
-extern class FEFuncBElement extends ComponentTransferFunctionElement
-{
+extern class FEFuncBElement extends ComponentTransferFunctionElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FEFuncGElement.hx b/std/js/html/svg/FEFuncGElement.hx
index e276e7bb62845fcf4e30e899246b05b766045917..840e7e1c4ada69f694e992b9f8d1d50c39a9a448 100644
--- a/std/js/html/svg/FEFuncGElement.hx
+++ b/std/js/html/svg/FEFuncGElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,13 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEFuncGElement` interface corresponds to the `feFuncG` element.
+
+	Documentation [SVGFEFuncGElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncGElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncGElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncGElement>
+**/
 @:native("SVGFEFuncGElement")
-extern class FEFuncGElement extends ComponentTransferFunctionElement
-{
+extern class FEFuncGElement extends ComponentTransferFunctionElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FEFuncRElement.hx b/std/js/html/svg/FEFuncRElement.hx
index 2ef0e774f9780dbbe47d1d87abf56d999da494bc..6248d900aa58697b5d18e0f9b0a8dd2c3d6d253c 100644
--- a/std/js/html/svg/FEFuncRElement.hx
+++ b/std/js/html/svg/FEFuncRElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,13 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEFuncRElement` interface corresponds to the `feFuncR` element.
+
+	Documentation [SVGFEFuncRElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncRElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncRElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEFuncRElement>
+**/
 @:native("SVGFEFuncRElement")
-extern class FEFuncRElement extends ComponentTransferFunctionElement
-{
+extern class FEFuncRElement extends ComponentTransferFunctionElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FEGaussianBlurElement.hx b/std/js/html/svg/FEGaussianBlurElement.hx
index 51cd526e76a867c3339cee0aca559ef5b5abbff0..02f53a1e3be5fe8199291bcd2805bca8ddafd2a5 100644
--- a/std/js/html/svg/FEGaussianBlurElement.hx
+++ b/std/js/html/svg/FEGaussianBlurElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,29 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEGaussianBlurElement` interface corresponds to the `feGaussianBlur` element.
+
+	Documentation [SVGFEGaussianBlurElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEGaussianBlurElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEGaussianBlurElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEGaussianBlurElement>
+**/
 @:native("SVGFEGaussianBlurElement")
-extern class FEGaussianBlurElement extends Element
-{
+extern class FEGaussianBlurElement extends Element {
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the (possibly automatically computed) X component of the `stdDeviation` attribute of the given element.
+	**/
 	var stdDeviationX(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the (possibly automatically computed) Y component of the `stdDeviation` attribute of the given element.
+	**/
 	var stdDeviationY(default,null) : AnimatedNumber;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
@@ -36,5 +54,9 @@ extern class FEGaussianBlurElement extends Element
 	var height(default,null) : AnimatedLength;
 	var result(default,null) : AnimatedString;
 	
+	
+	/**
+		Sets the values for the `stdDeviation` attribute.
+	**/
 	function setStdDeviation( stdDeviationX : Float, stdDeviationY : Float ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FEImageElement.hx b/std/js/html/svg/FEImageElement.hx
index 57201dc252f83339c01fa172e65967766058b3a3..681cd5a461ccf66720b0489160298a389382884b 100644
--- a/std/js/html/svg/FEImageElement.hx
+++ b/std/js/html/svg/FEImageElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,19 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEImageElement` interface corresponds to the `feImage` element.
+
+	Documentation [SVGFEImageElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEImageElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEImageElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEImageElement>
+**/
 @:native("SVGFEImageElement")
-extern class FEImageElement extends Element
-{
+extern class FEImageElement extends Element {
+	
+	/**
+		An `SVGAnimatedPreserveAspectRatio` corresponding to the `preserveAspectRatio` attribute of the given element.
+	**/
 	var preserveAspectRatio(default,null) : AnimatedPreserveAspectRatio;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FEMergeElement.hx b/std/js/html/svg/FEMergeElement.hx
index e48247ea5ec0a92fc1463b56386aa1e575b0c9da..27ce1b986732235a50d41cd06dd45b7090349ccd 100644
--- a/std/js/html/svg/FEMergeElement.hx
+++ b/std/js/html/svg/FEMergeElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,15 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEMergeElement` interface corresponds to the `feMerge` element.
+
+	Documentation [SVGFEMergeElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEMergeElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEMergeElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEMergeElement>
+**/
 @:native("SVGFEMergeElement")
-extern class FEMergeElement extends Element
-{
+extern class FEMergeElement extends Element {
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
 	var width(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FEMergeNodeElement.hx b/std/js/html/svg/FEMergeNodeElement.hx
index e764f3a6c17529fc45260c0b248ed974b30fadcf..16e5d18b25d51a0e617da3a35264d5a966bf99fb 100644
--- a/std/js/html/svg/FEMergeNodeElement.hx
+++ b/std/js/html/svg/FEMergeNodeElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,19 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEMergeNodeElement` interface corresponds to the `feMergeNode` element.
+
+	Documentation [SVGFEMergeNodeElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEMergeNodeElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEMergeNodeElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEMergeNodeElement>
+**/
 @:native("SVGFEMergeNodeElement")
-extern class FEMergeNodeElement extends Element
-{
+extern class FEMergeNodeElement extends Element {
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FEMorphologyElement.hx b/std/js/html/svg/FEMorphologyElement.hx
index 0827a70b8075e6730d2994887e53c6fbf6d2e73b..084fbe045ec9f00e6e310f0ce3f967621adcf0bb 100644
--- a/std/js/html/svg/FEMorphologyElement.hx
+++ b/std/js/html/svg/FEMorphologyElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,16 +24,39 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEMorphologyElement` interface corresponds to the `feMorphology` element.
+
+	Documentation [SVGFEMorphologyElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEMorphologyElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEMorphologyElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEMorphologyElement>
+**/
 @:native("SVGFEMorphologyElement")
-extern class FEMorphologyElement extends Element
-{
+extern class FEMorphologyElement extends Element {
 	static inline var SVG_MORPHOLOGY_OPERATOR_UNKNOWN : Int = 0;
 	static inline var SVG_MORPHOLOGY_OPERATOR_ERODE : Int = 1;
 	static inline var SVG_MORPHOLOGY_OPERATOR_DILATE : Int = 2;
 	
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
-	var operator(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `operator` attribute of the given element. It takes one of the `SVG_MORPHOLOGY_OPERATOR_*` constants defined on this interface.
+	**/
+	@:native("operator")
+	var operator_(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the X component of the `radius` attribute of the given element.
+	**/
 	var radiusX(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the Y component of the `radius` attribute of the given element.
+	**/
 	var radiusY(default,null) : AnimatedNumber;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FEOffsetElement.hx b/std/js/html/svg/FEOffsetElement.hx
index a88ae1b00a53e7fdb0ecb114277f545af80deae3..cb0f1965d09149b1dcbf7b8250ff5bd8ce13042a 100644
--- a/std/js/html/svg/FEOffsetElement.hx
+++ b/std/js/html/svg/FEOffsetElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,29 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEOffsetElement` interface corresponds to the `feOffset` element.
+
+	Documentation [SVGFEOffsetElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEOffsetElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEOffsetElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEOffsetElement>
+**/
 @:native("SVGFEOffsetElement")
-extern class FEOffsetElement extends Element
-{
+extern class FEOffsetElement extends Element {
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `dx` attribute of the given element.
+	**/
 	var dx(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `dy` attribute of the given element.
+	**/
 	var dy(default,null) : AnimatedNumber;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FEPointLightElement.hx b/std/js/html/svg/FEPointLightElement.hx
index aa544413ca3fee0412cd940f7d443cab43504fb0..8a15c5ce2565afc4e2a35e3bbe760853e439ebad 100644
--- a/std/js/html/svg/FEPointLightElement.hx
+++ b/std/js/html/svg/FEPointLightElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,29 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFEPointLightElement` interface corresponds to the `fePointLight` element.
+
+	Documentation [SVGFEPointLightElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEPointLightElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFEPointLightElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFEPointLightElement>
+**/
 @:native("SVGFEPointLightElement")
-extern class FEPointLightElement extends Element
-{
+extern class FEPointLightElement extends Element {
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `x` attribute of the given element.
+	**/
 	var x(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `y` attribute of the given element.
+	**/
 	var y(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `z` attribute of the given element.
+	**/
 	var z(default,null) : AnimatedNumber;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FESpecularLightingElement.hx b/std/js/html/svg/FESpecularLightingElement.hx
index 4f102be3d91ae1b542cc8684054150a905541b8f..b64ce5391f1ae8af2dec3be71ff7a39e4ee4586f 100644
--- a/std/js/html/svg/FESpecularLightingElement.hx
+++ b/std/js/html/svg/FESpecularLightingElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,14 +24,44 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFESpecularLightingElement` interface corresponds to the `feSpecularLighting` element.
+
+	Documentation [SVGFESpecularLightingElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFESpecularLightingElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFESpecularLightingElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFESpecularLightingElement>
+**/
 @:native("SVGFESpecularLightingElement")
-extern class FESpecularLightingElement extends Element
-{
+extern class FESpecularLightingElement extends Element {
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `surfaceScale` attribute of the given element.
+	**/
 	var surfaceScale(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `specularConstant` attribute of the given element.
+	**/
 	var specularConstant(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `specularExponent` attribute of the given element.
+	**/
 	var specularExponent(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the X component of the `kernelUnitLength` attribute of the given element.
+	**/
 	var kernelUnitLengthX(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the Y component of the `kernelUnitLength` attribute of the given element.
+	**/
 	var kernelUnitLengthY(default,null) : AnimatedNumber;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FESpotLightElement.hx b/std/js/html/svg/FESpotLightElement.hx
index 70abc4fd3cfc9c3c573469c773e4f14b190fcaf3..3b8abbc8f7acf68af83a0900bcc54349715cce69 100644
--- a/std/js/html/svg/FESpotLightElement.hx
+++ b/std/js/html/svg/FESpotLightElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,16 +24,42 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFESpotLightElement` interface corresponds to the `feSpotLight` element.
+
+	Documentation [SVGFESpotLightElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFESpotLightElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFESpotLightElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFESpotLightElement>
+**/
 @:native("SVGFESpotLightElement")
-extern class FESpotLightElement extends Element
-{
+extern class FESpotLightElement extends Element {
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `x` attribute of the given element.
+	**/
 	var x(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `y` attribute of the given element.
+	**/
 	var y(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `z` attribute of the given element.
+	**/
 	var z(default,null) : AnimatedNumber;
 	var pointsAtX(default,null) : AnimatedNumber;
 	var pointsAtY(default,null) : AnimatedNumber;
 	var pointsAtZ(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `specularExponent` attribute of the given element.
+	**/
 	var specularExponent(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `limitingConeAngle` attribute of the given element.
+	**/
 	var limitingConeAngle(default,null) : AnimatedNumber;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/FETileElement.hx b/std/js/html/svg/FETileElement.hx
index b8c9071c0a51ca79b8dde484e87cbe6c9a307f68..da7fb46675c35d9118081c15d9e1d39c0438f5e2 100644
--- a/std/js/html/svg/FETileElement.hx
+++ b/std/js/html/svg/FETileElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,19 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFETileElement` interface corresponds to the `feTile` element.
+
+	Documentation [SVGFETileElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFETileElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFETileElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFETileElement>
+**/
 @:native("SVGFETileElement")
-extern class FETileElement extends Element
-{
+extern class FETileElement extends Element {
+	
+	/**
+		An `SVGAnimatedString` corresponding to the `in` attribute of the given element.
+	**/
 	var in1(default,null) : AnimatedString;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FETurbulenceElement.hx b/std/js/html/svg/FETurbulenceElement.hx
index c90a97ea9335a4d93952eff25ba0a759e2bad4f5..a2b9b21984dddab06c306dda103edef73c5dc858 100644
--- a/std/js/html/svg/FETurbulenceElement.hx
+++ b/std/js/html/svg/FETurbulenceElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,15 @@
 
 package js.html.svg;
 
+/**
+	The `SVGFETurbulenceElement` interface corresponds to the `feTurbulence` element.
+
+	Documentation [SVGFETurbulenceElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGFETurbulenceElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGFETurbulenceElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFETurbulenceElement>
+**/
 @:native("SVGFETurbulenceElement")
-extern class FETurbulenceElement extends Element
-{
+extern class FETurbulenceElement extends Element {
 	static inline var SVG_TURBULENCE_TYPE_UNKNOWN : Int = 0;
 	static inline var SVG_TURBULENCE_TYPE_FRACTALNOISE : Int = 1;
 	static inline var SVG_TURBULENCE_TYPE_TURBULENCE : Int = 2;
@@ -34,11 +40,35 @@ extern class FETurbulenceElement extends Element
 	static inline var SVG_STITCHTYPE_STITCH : Int = 1;
 	static inline var SVG_STITCHTYPE_NOSTITCH : Int = 2;
 	
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the X component of the `baseFrequency` attribute of the given element.
+	**/
 	var baseFrequencyX(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the Y component of the `baseFrequency` attribute of the given element.
+	**/
 	var baseFrequencyY(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedInteger` corresponding to the `numOctaves` attribute of the given element.
+	**/
 	var numOctaves(default,null) : AnimatedInteger;
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `seed` attribute of the given element.
+	**/
 	var seed(default,null) : AnimatedNumber;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `stitchTiles` attribute of the given element. It takes one of the `SVG_STITCHTYPE_*` constants defined on this interface.
+	**/
 	var stitchTiles(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `type` attribute of the given element. It takes one of the `SVG_TURBULENCE_TYPE_*` constants defined on this interface.
+	**/
 	var type(default,null) : AnimatedEnumeration;
 	var x(default,null) : AnimatedLength;
 	var y(default,null) : AnimatedLength;
diff --git a/std/js/html/svg/FilterElement.hx b/std/js/html/svg/FilterElement.hx
index b731bca8cbddfe227dcc2a325a52b69bb8856221..d826fa85a5745e1bbeaa21eb88eceb82ab229603 100644
--- a/std/js/html/svg/FilterElement.hx
+++ b/std/js/html/svg/FilterElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,17 +32,36 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGFilterElement>
 **/
 @:native("SVGFilterElement")
-extern class FilterElement extends Element
-{
-	static inline var SVG_UNIT_TYPE_UNKNOWN : Int = 0;
-	static inline var SVG_UNIT_TYPE_USERSPACEONUSE : Int = 1;
-	static inline var SVG_UNIT_TYPE_OBJECTBOUNDINGBOX : Int = 2;
+extern class FilterElement extends Element {
 	
+	/**
+		An `SVGAnimatedEnumeration` that corresponds to the `filterUnits` attribute of the given `filter` element. Takes one of the constants defined in `SVGUnitTypes`.
+	**/
 	var filterUnits(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedEnumeration` that corresponds to the `primitiveUnits` attribute of the given `filter` element. Takes one of the constants defined in `SVGUnitTypes`.
+	**/
 	var primitiveUnits(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedLength` that corresponds to the `x` attribute on the given `filter` element.
+	**/
 	var x(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` that corresponds to the `y` attribute of the given `filter` element.
+	**/
 	var y(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` that corresponds to the `width` attribute of the given `filter` element.
+	**/
 	var width(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` that corresponds to the `height` attribute of the given `filter` element.
+	**/
 	var height(default,null) : AnimatedLength;
 	var href(default,null) : AnimatedString;
 	
diff --git a/std/js/html/svg/ForeignObjectElement.hx b/std/js/html/svg/ForeignObjectElement.hx
index 19bbfb89724e3cbda0cbd687cd1adda86514e748..f9f486858f69df8eea45ae63341448a80ffeae31 100644
--- a/std/js/html/svg/ForeignObjectElement.hx
+++ b/std/js/html/svg/ForeignObjectElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,26 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGForeignObjectElement>
 **/
 @:native("SVGForeignObjectElement")
-extern class ForeignObjectElement extends GraphicsElement
-{
+extern class ForeignObjectElement extends GraphicsElement {
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `x` attribute of the given `foreignObject` element.
+	**/
 	var x(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `x` attribute of the given `foreignObject` element.
+	**/
 	var y(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `width` attribute of the given `foreignObject` element.
+	**/
 	var width(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `height` attribute of the given `foreignObject` element.
+	**/
 	var height(default,null) : AnimatedLength;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/GElement.hx b/std/js/html/svg/GElement.hx
index 053a168ec6ef7e7558b2026346b0015a4141e9c1..f27890ae842caae1ccc31ae3a58b9af3fab86b8a 100644
--- a/std/js/html/svg/GElement.hx
+++ b/std/js/html/svg/GElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGGElement>
 **/
 @:native("SVGGElement")
-extern class GElement extends GraphicsElement
-{
+extern class GElement extends GraphicsElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/AltGlyphElement.hx b/std/js/html/svg/GeometryElement.hx
similarity index 54%
rename from std/js/html/svg/AltGlyphElement.hx
rename to std/js/html/svg/GeometryElement.hx
index 443b5716a83d996d98ae5bd387719f08ed0a8fa7..50df92502a06e5bf17055533a26d7c085ed7d3fb 100644
--- a/std/js/html/svg/AltGlyphElement.hx
+++ b/std/js/html/svg/GeometryElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,30 +20,34 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\SVGAltGlyphElement.webidl. Do not edit!
+// This file is generated from mozilla\SVGGeometryElement.webidl. Do not edit!
 
 package js.html.svg;
 
 /**
-	  
+	The `SVGGeometryElement` interface represents SVG elements whose rendering is defined by geometry with an equivalent path, and which can be filled and stroked. This includes paths and the basic shapes.
 
-	Documentation [SVGAltGlyphElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGAltGlyphElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGAltGlyphElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [SVGGeometryElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGGeometryElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGGeometryElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGAltGlyphElement>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGGeometryElement>
 **/
-@:native("SVGAltGlyphElement")
-extern class AltGlyphElement extends TextPositioningElement
-{
+@:native("SVGGeometryElement")
+extern class GeometryElement extends GraphicsElement {
 	
 	/**
-		It corresponds to the attribute `glyphRef` on the given element. It's data type is 'String'. It defines the glyph identifier, whose format is dependent on the ‘format’ of the given font.
+		This property reflects the `pathLength` attribute.
 	**/
-	var glyphRef : String;
+	var pathLength(default,null) : AnimatedNumber;
+	
 	
 	/**
-		It corresponds to the attribute  `format` on the given element. It's data type is 'String'. This property specifies the format of the given font.
+		Returns the user agent's computed value for the total length of the path in user units.
 	**/
-	var format : String;
-	var href(default,null) : AnimatedString;
+	function getTotalLength() : Float;
 	
+	/**
+		Returns the point at a given distance along the path.
+		@throws DOMError
+	**/
+	function getPointAtLength( distance : Float ) : Point;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/GradientElement.hx b/std/js/html/svg/GradientElement.hx
index 0e5de17d0c7ab8505806a69b3b32c7279a0c2204..5e1172021c09dd7dafcdeee98d6f0792c304b9c6 100644
--- a/std/js/html/svg/GradientElement.hx
+++ b/std/js/html/svg/GradientElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,18 +32,26 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGGradientElement>
 **/
 @:native("SVGGradientElement")
-extern class GradientElement extends Element
-{
+extern class GradientElement extends Element {
 	static inline var SVG_SPREADMETHOD_UNKNOWN : Int = 0;
 	static inline var SVG_SPREADMETHOD_PAD : Int = 1;
 	static inline var SVG_SPREADMETHOD_REFLECT : Int = 2;
 	static inline var SVG_SPREADMETHOD_REPEAT : Int = 3;
-	static inline var SVG_UNIT_TYPE_UNKNOWN : Int = 0;
-	static inline var SVG_UNIT_TYPE_USERSPACEONUSE : Int = 1;
-	static inline var SVG_UNIT_TYPE_OBJECTBOUNDINGBOX : Int = 2;
 	
+	
+	/**
+		Returns an `SVGAnimatedEnumeration` corresponding to the `gradientUnits` attribute on the given element. Takes one of the constants defined in `SVGUnitTypes`.
+	**/
 	var gradientUnits(default,null) : AnimatedEnumeration;
+	
+	/**
+		Returns an `SVGAnimatedTransformList` corresponding to attribute `gradientTransform` on the given element.
+	**/
 	var gradientTransform(default,null) : AnimatedTransformList;
+	
+	/**
+		Returns an `SVGAnimatedEnumeration` corresponding to attribute `spreadMethod` on the given element. One of the spread method types defined on this interface.
+	**/
 	var spreadMethod(default,null) : AnimatedEnumeration;
 	var href(default,null) : AnimatedString;
 	
diff --git a/std/js/html/svg/GraphicsElement.hx b/std/js/html/svg/GraphicsElement.hx
index 96fd06ed8021513d0ccbaee021d6260dd2567c2c..c3d283eda2e39ea5a299783e4e1f2811ff2eb1c1 100644
--- a/std/js/html/svg/GraphicsElement.hx
+++ b/std/js/html/svg/GraphicsElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,19 @@
 
 package js.html.svg;
 
+/**
+	The `SVGGraphicsElement` interface represents SVG elements whose primary purpose is to directly render graphics into a group.
+
+	Documentation [SVGGraphicsElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGGraphicsElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGGraphicsElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGGraphicsElement>
+**/
 @:native("SVGGraphicsElement")
-extern class GraphicsElement extends Element
-{
+extern class GraphicsElement extends Element {
+	
+	/**
+		An `SVGAnimatedTransformList` reflecting the computed value of the `transform` property and its corresponding `transform` attribute of the given element.
+	**/
 	var transform(default,null) : AnimatedTransformList;
 	var nearestViewportElement(default,null) : Element;
 	var farthestViewportElement(default,null) : Element;
@@ -34,9 +44,21 @@ extern class GraphicsElement extends Element
 	var requiredExtensions(default,null) : StringList;
 	var systemLanguage(default,null) : StringList;
 	
-	/** @throws DOMError */
+	
+	/**
+		Returns a `DOMRect` representing the computed bounding box of the current element.
+		@throws DOMError
+	**/
 	function getBBox( ?aOptions : BoundingBoxOptions ) : Rect;
+	
+	/**
+		Returns a `DOMMatrix` representing the matrix that transforms the current element's coordinate system to its SVG viewport's coordinate system.
+	**/
 	function getCTM() : Matrix;
+	
+	/**
+		Returns a `DOMMatrix` representing the matrix that transforms the current element's coordinate system to the coordinate system of the SVG viewport for the SVG document fragment.
+	**/
 	function getScreenCTM() : Matrix;
 	/** @throws DOMError */
 	function getTransformToElement( element : GraphicsElement ) : Matrix;
diff --git a/std/js/html/svg/ImageElement.hx b/std/js/html/svg/ImageElement.hx
index 398116f2a2bc1092f3a8e496945dbe76822d9fce..aac255698c5c6ed1b031aec145a3de55d460a45f 100644
--- a/std/js/html/svg/ImageElement.hx
+++ b/std/js/html/svg/ImageElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,33 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGImageElement>
 **/
 @:native("SVGImageElement")
-extern class ImageElement extends GraphicsElement
-{
+extern class ImageElement extends GraphicsElement {
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `x` attribute of the given `image` element.
+	**/
 	var x(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `y` attribute of the given `image` element.
+	**/
 	var y(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `width` attribute of the given `image` element.
+	**/
 	var width(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `height` attribute of the given `image` element.
+	**/
 	var height(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedPreserveAspectRatio` corresponding to the `preserveAspectRatio` attribute of the given `image` element.
+	**/
 	var preserveAspectRatio(default,null) : AnimatedPreserveAspectRatio;
+	var decoding : String;
 	var href(default,null) : AnimatedString;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/Length.hx b/std/js/html/svg/Length.hx
index 82ea19893028d836caf521a2caff83ad88d74e2e..89df81a91f1aceba56a405b623f3f61eb79f4063 100644
--- a/std/js/html/svg/Length.hx
+++ b/std/js/html/svg/Length.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGLength>
 **/
 @:native("SVGLength")
-extern class Length
-{
+extern class Length {
 	static inline var SVG_LENGTHTYPE_UNKNOWN : Int = 0;
 	static inline var SVG_LENGTHTYPE_NUMBER : Int = 1;
 	static inline var SVG_LENGTHTYPE_PERCENTAGE : Int = 2;
diff --git a/std/js/html/svg/LengthList.hx b/std/js/html/svg/LengthList.hx
index 4b9ae36f3d0e39c1096be78ce75285dc519472ce..745d25e4617f48d7da7acb1b0f94275371ae496f 100644
--- a/std/js/html/svg/LengthList.hx
+++ b/std/js/html/svg/LengthList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGLengthList>
 **/
 @:native("SVGLengthList")
-extern class LengthList implements ArrayAccess<Length>
-{
+extern class LengthList implements ArrayAccess<Length> {
 	var numberOfItems(default,null) : Int;
 	var length(default,null) : Int;
 	
diff --git a/std/js/html/svg/LineElement.hx b/std/js/html/svg/LineElement.hx
index d1b4a02a418f06090a1754275596c2bbfe83f530..e01df6c60c520d0c3095f0640ff20d3fe767951d 100644
--- a/std/js/html/svg/LineElement.hx
+++ b/std/js/html/svg/LineElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,26 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGLineElement>
 **/
 @:native("SVGLineElement")
-extern class LineElement extends GraphicsElement
-{
+extern class LineElement extends GeometryElement {
+	
+	/**
+		Returns an `SVGAnimatedLength` that corresponds to attribute `x1` on the given `line` element.
+	**/
 	var x1(default,null) : AnimatedLength;
+	
+	/**
+		Returns an `SVGAnimatedLength` that corresponds to attribute `y1` on the given `line` element.
+	**/
 	var y1(default,null) : AnimatedLength;
+	
+	/**
+		Returns an `SVGAnimatedLength` that corresponds to attribute `x2` on the given `line` element.
+	**/
 	var x2(default,null) : AnimatedLength;
+	
+	/**
+		Returns an `SVGAnimatedLength` that corresponds to attribute `y2` on the given `line` element.
+	**/
 	var y2(default,null) : AnimatedLength;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/LinearGradientElement.hx b/std/js/html/svg/LinearGradientElement.hx
index ab3f4296aad981e2be866268fb6ae39e41e84f01..c2b529ba2d96fc0208d9d2c2399cc062d9a90914 100644
--- a/std/js/html/svg/LinearGradientElement.hx
+++ b/std/js/html/svg/LinearGradientElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,11 +32,26 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGLinearGradientElement>
 **/
 @:native("SVGLinearGradientElement")
-extern class LinearGradientElement extends GradientElement
-{
+extern class LinearGradientElement extends GradientElement {
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `x1` attribute of the given `linearGradient` element.
+	**/
 	var x1(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `y1` attribute of the given `linearGradient` element.
+	**/
 	var y1(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `x2` attribute of the given `linearGradient` element.
+	**/
 	var x2(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `y2` attribute of the given `linearGradient` element.
+	**/
 	var y2(default,null) : AnimatedLength;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/MPathElement.hx b/std/js/html/svg/MPathElement.hx
index f3f98e87b194fdd16cc37c9f83a3d765cd096d3a..2202ac27cae3f86a8006009515032e41f73221bf 100644
--- a/std/js/html/svg/MPathElement.hx
+++ b/std/js/html/svg/MPathElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGMPathElement>
 **/
 @:native("SVGMPathElement")
-extern class MPathElement extends Element
-{
+extern class MPathElement extends Element {
 	var href(default,null) : AnimatedString;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/MarkerElement.hx b/std/js/html/svg/MarkerElement.hx
index 078df77a9fbf135194e164035935d0d1174a5b7d..f5dd164bc7c5f40e98f5781aa9e6caf267ff8d31 100644
--- a/std/js/html/svg/MarkerElement.hx
+++ b/std/js/html/svg/MarkerElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html.svg;
 
 @:native("SVGMarkerElement")
-extern class MarkerElement extends Element
-{
+extern class MarkerElement extends Element {
 	static inline var SVG_MARKERUNITS_UNKNOWN : Int = 0;
 	static inline var SVG_MARKERUNITS_USERSPACEONUSE : Int = 1;
 	static inline var SVG_MARKERUNITS_STROKEWIDTH : Int = 2;
diff --git a/std/js/html/svg/MaskElement.hx b/std/js/html/svg/MaskElement.hx
index ab6fde099c5d023c263746b74a3523e1ed8c81c5..f445760bece18d1a46d8da7ef1c995d0d601276d 100644
--- a/std/js/html/svg/MaskElement.hx
+++ b/std/js/html/svg/MaskElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,19 +32,39 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGMaskElement>
 **/
 @:native("SVGMaskElement")
-extern class MaskElement extends Element
-{
+extern class MaskElement extends Element {
 	static inline var SVG_MASKTYPE_LUMINANCE : Int = 0;
 	static inline var SVG_MASKTYPE_ALPHA : Int = 1;
-	static inline var SVG_UNIT_TYPE_UNKNOWN : Int = 0;
-	static inline var SVG_UNIT_TYPE_USERSPACEONUSE : Int = 1;
-	static inline var SVG_UNIT_TYPE_OBJECTBOUNDINGBOX : Int = 2;
 	
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `maskUnits` attribute of the given `mask` element. Takes one of the constants defined in `SVGUnitTypes`.
+	**/
 	var maskUnits(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `maskContentUnits` attribute of the given `mask` element. Takes one of the constants defined in `SVGUnitTypes`.
+	**/
 	var maskContentUnits(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `x` attribute of the given `mask` element.
+	**/
 	var x(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `y` attribute of the given `mask` element.
+	**/
 	var y(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `width` attribute of the given `mask` element.
+	**/
 	var width(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `height` attribute of the given `mask` element.
+	**/
 	var height(default,null) : AnimatedLength;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/Matrix.hx b/std/js/html/svg/Matrix.hx
index dbe1031df7966e71b20d343095921150d6780ca9..bcf0cbc1802d638f6acc88c4d392c9e0a0d452ea 100644
--- a/std/js/html/svg/Matrix.hx
+++ b/std/js/html/svg/Matrix.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,28 +32,95 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGMatrix>
 **/
 @:native("SVGMatrix")
-extern class Matrix
-{
+extern class Matrix {
+	
+	/**
+		A float representing the a component of the matrix.
+	**/
 	var a : Float;
+	
+	/**
+		A float representing the b component of the matrix.
+	**/
 	var b : Float;
+	
+	/**
+		A float representing the c component of the matrix.
+	**/
 	var c : Float;
+	
+	/**
+		A float representing the d component of the matrix.
+	**/
 	var d : Float;
+	
+	/**
+		A float representing the e component of the matrix.
+	**/
 	var e : Float;
+	
+	/**
+		A float representing the f component of the matrix.
+	**/
 	var f : Float;
 	
+	
+	/**
+		Performs matrix multiplication. This matrix is post-multiplied by another matrix, returning the resulting new matrix as `SVGMatrix`.
+	**/
 	function multiply( secondMatrix : Matrix ) : Matrix;
-	/** @throws DOMError */
+	
+	/**
+		Returns the inverse matrix as `SVGMatrix`.
+		@throws DOMError
+	**/
 	function inverse() : Matrix;
+	
+	/**
+		Post-multiplies a translation transformation on the current matrix and returns the resulting matrix as `SVGMatrix`.
+	**/
 	function translate( x : Float, y : Float ) : Matrix;
+	
+	/**
+		Post-multiplies a uniform scale transformation on the current matrix and returns the resulting matrix as `SVGMatrix`.
+	**/
 	function scale( scaleFactor : Float ) : Matrix;
+	
+	/**
+		Post-multiplies a non-uniform scale transformation on the current matrix and returns the resulting matrix as `SVGMatrix`.
+	**/
 	function scaleNonUniform( scaleFactorX : Float, scaleFactorY : Float ) : Matrix;
+	
+	/**
+		Post-multiplies a rotation transformation on the current matrix and returns the resulting matrix as `SVGMatrix`.
+	**/
 	function rotate( angle : Float ) : Matrix;
-	/** @throws DOMError */
+	
+	/**
+		Post-multiplies a rotation transformation on the current matrix and returns the resulting matrix as `SVGMatrix`. The rotation angle is determined by taking (+/-) atan(y/x). The direction of the vector (x, y) determines whether the positive or negative angle value is used.
+		@throws DOMError
+	**/
 	function rotateFromVector( x : Float, y : Float ) : Matrix;
+	
+	/**
+		Post-multiplies the transformation [-1 0 0 1 0 0] and returns the resulting matrix as `SVGMatrix`.
+	**/
 	function flipX() : Matrix;
+	
+	/**
+		Post-multiplies the transformation [1 0 0 -1 0 0] and returns the resulting matrix as `SVGMatrix`.
+	**/
 	function flipY() : Matrix;
-	/** @throws DOMError */
+	
+	/**
+		Post-multiplies a skewX transformation on the current matrix and returns the resulting matrix as `SVGMatrix`.
+		@throws DOMError
+	**/
 	function skewX( angle : Float ) : Matrix;
-	/** @throws DOMError */
+	
+	/**
+		Post-multiplies a skewY transformation on the current matrix and returns the resulting matrix as `SVGMatrix`.
+		@throws DOMError
+	**/
 	function skewY( angle : Float ) : Matrix;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/MetadataElement.hx b/std/js/html/svg/MetadataElement.hx
index 210f1ff10791ded31375437c6e86cc8f84b858d7..1b64d595eca62a6685d4d971732f99a3c6255cdc 100644
--- a/std/js/html/svg/MetadataElement.hx
+++ b/std/js/html/svg/MetadataElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,13 @@
 
 package js.html.svg;
 
+/**
+	The `SVGMetadataElement` interface corresponds to the `metadata` element.
+
+	Documentation [SVGMetadataElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGMetadataElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGMetadataElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGMetadataElement>
+**/
 @:native("SVGMetadataElement")
-extern class MetadataElement extends Element
-{
+extern class MetadataElement extends Element {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/Number.hx b/std/js/html/svg/Number.hx
index ac4a10fa8ede75910b04a15319cf74172e5ff553..23b469a4bc300b6c46a5489702b570ecd9f4bddd 100644
--- a/std/js/html/svg/Number.hx
+++ b/std/js/html/svg/Number.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,18 +25,20 @@
 package js.html.svg;
 
 /**
-	The `SVGNumber` interface correspond to the number basic data type.
+	The `SVGNumber` interface corresponds to the `number` basic data type.
 
 	Documentation [SVGNumber](https://developer.mozilla.org/en-US/docs/Web/API/SVGNumber) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGNumber$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGNumber>
 **/
 @:native("SVGNumber")
-extern class Number
-{
+extern class Number {
+	
+	/**
+		A float representing the number.
+		 Note: If the `SVGNumber` is read-only, a `DOMException` with the code NO_MODIFICATION_ALLOWED_ERR is raised on an attempt to change the value.
+		 
+	**/
 	var value : Float;
 	
-	/** @throws DOMError */
-	@:overload( function() : Void {} )
-	function new( value : Float ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/NumberList.hx b/std/js/html/svg/NumberList.hx
index 6136c0c1f1927976fe17f6a770e715cf8b645e65..e29e29ae73760e3e88a6a35a7f778fb8694abd6c 100644
--- a/std/js/html/svg/NumberList.hx
+++ b/std/js/html/svg/NumberList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGNumberList>
 **/
 @:native("SVGNumberList")
-extern class NumberList implements ArrayAccess<Number>
-{
+extern class NumberList implements ArrayAccess<Number> {
 	var numberOfItems(default,null) : Int;
 	var length(default,null) : Int;
 	
diff --git a/std/js/html/svg/PathElement.hx b/std/js/html/svg/PathElement.hx
index 58ff35f6c33a34a21284dc080bf091af7000ce5a..378009d2cc675a6e986176403c417db0543380c9 100644
--- a/std/js/html/svg/PathElement.hx
+++ b/std/js/html/svg/PathElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,33 +32,13 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGPathElement>
 **/
 @:native("SVGPathElement")
-extern class PathElement extends GraphicsElement
-{
-	var pathLength(default,null) : AnimatedNumber;
+extern class PathElement extends GeometryElement {
 	var pathSegList(default,null) : PathSegList;
 	var animatedPathSegList(default,null) : PathSegList;
 	
-	function getTotalLength() : Float;
-	/** @throws DOMError */
-	function getPointAtLength( distance : Float ) : Point;
+	
+	/**
+		Returns an unsigned long representing the index within the `SVGAnimatedPathData.pathSegList` utilizing the user agent's distance-along-a-path algorithm.
+	**/
 	function getPathSegAtLength( distance : Float ) : Int;
-	function createSVGPathSegClosePath() : PathSegClosePath;
-	function createSVGPathSegMovetoAbs( x : Float, y : Float ) : PathSegMovetoAbs;
-	function createSVGPathSegMovetoRel( x : Float, y : Float ) : PathSegMovetoRel;
-	function createSVGPathSegLinetoAbs( x : Float, y : Float ) : PathSegLinetoAbs;
-	function createSVGPathSegLinetoRel( x : Float, y : Float ) : PathSegLinetoRel;
-	function createSVGPathSegCurvetoCubicAbs( x : Float, y : Float, x1 : Float, y1 : Float, x2 : Float, y2 : Float ) : PathSegCurvetoCubicAbs;
-	function createSVGPathSegCurvetoCubicRel( x : Float, y : Float, x1 : Float, y1 : Float, x2 : Float, y2 : Float ) : PathSegCurvetoCubicRel;
-	function createSVGPathSegCurvetoQuadraticAbs( x : Float, y : Float, x1 : Float, y1 : Float ) : PathSegCurvetoQuadraticAbs;
-	function createSVGPathSegCurvetoQuadraticRel( x : Float, y : Float, x1 : Float, y1 : Float ) : PathSegCurvetoQuadraticRel;
-	function createSVGPathSegArcAbs( x : Float, y : Float, r1 : Float, r2 : Float, angle : Float, largeArcFlag : Bool, sweepFlag : Bool ) : PathSegArcAbs;
-	function createSVGPathSegArcRel( x : Float, y : Float, r1 : Float, r2 : Float, angle : Float, largeArcFlag : Bool, sweepFlag : Bool ) : PathSegArcRel;
-	function createSVGPathSegLinetoHorizontalAbs( x : Float ) : PathSegLinetoHorizontalAbs;
-	function createSVGPathSegLinetoHorizontalRel( x : Float ) : PathSegLinetoHorizontalRel;
-	function createSVGPathSegLinetoVerticalAbs( y : Float ) : PathSegLinetoVerticalAbs;
-	function createSVGPathSegLinetoVerticalRel( y : Float ) : PathSegLinetoVerticalRel;
-	function createSVGPathSegCurvetoCubicSmoothAbs( x : Float, y : Float, x2 : Float, y2 : Float ) : PathSegCurvetoCubicSmoothAbs;
-	function createSVGPathSegCurvetoCubicSmoothRel( x : Float, y : Float, x2 : Float, y2 : Float ) : PathSegCurvetoCubicSmoothRel;
-	function createSVGPathSegCurvetoQuadraticSmoothAbs( x : Float, y : Float ) : PathSegCurvetoQuadraticSmoothAbs;
-	function createSVGPathSegCurvetoQuadraticSmoothRel( x : Float, y : Float ) : PathSegCurvetoQuadraticSmoothRel;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/PathSeg.hx b/std/js/html/svg/PathSeg.hx
index 1b515433013204c237d70e9d122bdce92115295e..db61913ff9136806f7f55b4133f568655b952e9d 100644
--- a/std/js/html/svg/PathSeg.hx
+++ b/std/js/html/svg/PathSeg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html.svg;
 
 @:native("SVGPathSeg")
-extern class PathSeg
-{
+extern class PathSeg {
 	static inline var PATHSEG_UNKNOWN : Int = 0;
 	static inline var PATHSEG_CLOSEPATH : Int = 1;
 	static inline var PATHSEG_MOVETO_ABS : Int = 2;
diff --git a/std/js/html/svg/PathSegArcAbs.hx b/std/js/html/svg/PathSegArcAbs.hx
index cdced3f854763e5fae5b9b823c9d2fea1c5037ec..5cf0f63cfe27f4f9093b9a639bb122058529df4a 100644
--- a/std/js/html/svg/PathSegArcAbs.hx
+++ b/std/js/html/svg/PathSegArcAbs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegArcAbs")
-extern class PathSegArcAbs extends PathSeg
-{
+typedef PathSegArcAbs = {
 	var x : Float;
 	var y : Float;
 	var r1 : Float;
diff --git a/std/js/html/svg/PathSegArcRel.hx b/std/js/html/svg/PathSegArcRel.hx
index 133e546b341af871c545de3096858817a427430d..f7d6975b07429b3f939733a9d5222cce941cf527 100644
--- a/std/js/html/svg/PathSegArcRel.hx
+++ b/std/js/html/svg/PathSegArcRel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegArcRel")
-extern class PathSegArcRel extends PathSeg
-{
+typedef PathSegArcRel = {
 	var x : Float;
 	var y : Float;
 	var r1 : Float;
diff --git a/std/js/html/svg/PathSegClosePath.hx b/std/js/html/svg/PathSegClosePath.hx
index 32c342111b9bb2cc0d14e3c89e16f326c5d7f0ed..dbd3cab893605bfde766d32ee56b4593c48cdfc9 100644
--- a/std/js/html/svg/PathSegClosePath.hx
+++ b/std/js/html/svg/PathSegClosePath.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,5 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegClosePath")
-extern class PathSegClosePath extends PathSeg
-{
+typedef PathSegClosePath = {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/PathSegCurvetoCubicAbs.hx b/std/js/html/svg/PathSegCurvetoCubicAbs.hx
index ad5eb8529d1489ab255a78268a1a7719c7601ed5..703afc283d751969c34afe860639b0dbdc3bc023 100644
--- a/std/js/html/svg/PathSegCurvetoCubicAbs.hx
+++ b/std/js/html/svg/PathSegCurvetoCubicAbs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegCurvetoCubicAbs")
-extern class PathSegCurvetoCubicAbs extends PathSeg
-{
+typedef PathSegCurvetoCubicAbs = {
 	var x : Float;
 	var y : Float;
 	var x1 : Float;
diff --git a/std/js/html/svg/PathSegCurvetoCubicRel.hx b/std/js/html/svg/PathSegCurvetoCubicRel.hx
index 69b3506a7def15e60a4eb5437c47ef9b17a844b4..b59101485a75d499e225f915919890c8a8022ffe 100644
--- a/std/js/html/svg/PathSegCurvetoCubicRel.hx
+++ b/std/js/html/svg/PathSegCurvetoCubicRel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegCurvetoCubicRel")
-extern class PathSegCurvetoCubicRel extends PathSeg
-{
+typedef PathSegCurvetoCubicRel = {
 	var x : Float;
 	var y : Float;
 	var x1 : Float;
diff --git a/std/js/html/svg/PathSegCurvetoCubicSmoothAbs.hx b/std/js/html/svg/PathSegCurvetoCubicSmoothAbs.hx
index c59ccc68a7a7a85d6f9b4b4edd50f21409bc2950..3336f5cb5f19e9bed8335d31b758996eebfdaad7 100644
--- a/std/js/html/svg/PathSegCurvetoCubicSmoothAbs.hx
+++ b/std/js/html/svg/PathSegCurvetoCubicSmoothAbs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegCurvetoCubicSmoothAbs")
-extern class PathSegCurvetoCubicSmoothAbs extends PathSeg
-{
+typedef PathSegCurvetoCubicSmoothAbs = {
 	var x : Float;
 	var y : Float;
 	var x2 : Float;
diff --git a/std/js/html/svg/PathSegCurvetoCubicSmoothRel.hx b/std/js/html/svg/PathSegCurvetoCubicSmoothRel.hx
index 377d62e64ebb6ccdbb27d0724c517ed159831859..01d8b7da0799076ce16b71137a78c182a6e7ce5b 100644
--- a/std/js/html/svg/PathSegCurvetoCubicSmoothRel.hx
+++ b/std/js/html/svg/PathSegCurvetoCubicSmoothRel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegCurvetoCubicSmoothRel")
-extern class PathSegCurvetoCubicSmoothRel extends PathSeg
-{
+typedef PathSegCurvetoCubicSmoothRel = {
 	var x : Float;
 	var y : Float;
 	var x2 : Float;
diff --git a/std/js/html/svg/PathSegCurvetoQuadraticAbs.hx b/std/js/html/svg/PathSegCurvetoQuadraticAbs.hx
index e834621496dda36340568856a31fe493c7fd9f7b..e39f46b3e50b748f233692a00460aa38a1e89036 100644
--- a/std/js/html/svg/PathSegCurvetoQuadraticAbs.hx
+++ b/std/js/html/svg/PathSegCurvetoQuadraticAbs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegCurvetoQuadraticAbs")
-extern class PathSegCurvetoQuadraticAbs extends PathSeg
-{
+typedef PathSegCurvetoQuadraticAbs = {
 	var x : Float;
 	var y : Float;
 	var x1 : Float;
diff --git a/std/js/html/svg/PathSegCurvetoQuadraticRel.hx b/std/js/html/svg/PathSegCurvetoQuadraticRel.hx
index 25c9bc4e68f13d456e21c95b0700f7957d6b6b2b..c9c6ac947e4f4ba46d3ef9a91e1c11be683a58b2 100644
--- a/std/js/html/svg/PathSegCurvetoQuadraticRel.hx
+++ b/std/js/html/svg/PathSegCurvetoQuadraticRel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegCurvetoQuadraticRel")
-extern class PathSegCurvetoQuadraticRel extends PathSeg
-{
+typedef PathSegCurvetoQuadraticRel = {
 	var x : Float;
 	var y : Float;
 	var x1 : Float;
diff --git a/std/js/html/svg/PathSegCurvetoQuadraticSmoothAbs.hx b/std/js/html/svg/PathSegCurvetoQuadraticSmoothAbs.hx
index 88cb91e801c4664ca1995db2c2a7305a01b8177e..a41a2fbec75a7cc7fe30665e3555bfe76c2db5ba 100644
--- a/std/js/html/svg/PathSegCurvetoQuadraticSmoothAbs.hx
+++ b/std/js/html/svg/PathSegCurvetoQuadraticSmoothAbs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegCurvetoQuadraticSmoothAbs")
-extern class PathSegCurvetoQuadraticSmoothAbs extends PathSeg
-{
+typedef PathSegCurvetoQuadraticSmoothAbs = {
 	var x : Float;
 	var y : Float;
 	
diff --git a/std/js/html/svg/PathSegCurvetoQuadraticSmoothRel.hx b/std/js/html/svg/PathSegCurvetoQuadraticSmoothRel.hx
index b9ba6b37b6aaab63b91efb4dcc3c9e6d738c65aa..93a3cb8bc3246cfcfe1cd8101d73e44df0425c15 100644
--- a/std/js/html/svg/PathSegCurvetoQuadraticSmoothRel.hx
+++ b/std/js/html/svg/PathSegCurvetoQuadraticSmoothRel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegCurvetoQuadraticSmoothRel")
-extern class PathSegCurvetoQuadraticSmoothRel extends PathSeg
-{
+typedef PathSegCurvetoQuadraticSmoothRel = {
 	var x : Float;
 	var y : Float;
 	
diff --git a/std/js/html/svg/PathSegLinetoAbs.hx b/std/js/html/svg/PathSegLinetoAbs.hx
index 9d5860476f42b81ffce746d42df6b9bf9779707c..a364e9da98eaa2852daf067ea86fadfbfc4608e3 100644
--- a/std/js/html/svg/PathSegLinetoAbs.hx
+++ b/std/js/html/svg/PathSegLinetoAbs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegLinetoAbs")
-extern class PathSegLinetoAbs extends PathSeg
-{
+typedef PathSegLinetoAbs = {
 	var x : Float;
 	var y : Float;
 	
diff --git a/std/js/html/svg/PathSegLinetoHorizontalAbs.hx b/std/js/html/svg/PathSegLinetoHorizontalAbs.hx
index 6f7f7ebac3944e475290290fc8da39e51844a2ba..9abc9b4f53047014aa02b56f536c620dd74a8a8c 100644
--- a/std/js/html/svg/PathSegLinetoHorizontalAbs.hx
+++ b/std/js/html/svg/PathSegLinetoHorizontalAbs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegLinetoHorizontalAbs")
-extern class PathSegLinetoHorizontalAbs extends PathSeg
-{
+typedef PathSegLinetoHorizontalAbs = {
 	var x : Float;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/PathSegLinetoHorizontalRel.hx b/std/js/html/svg/PathSegLinetoHorizontalRel.hx
index c8312a3b8e96fcb3494100714f09031380ee5353..86bf1df532637afa6ad13595da746208c90c4d5a 100644
--- a/std/js/html/svg/PathSegLinetoHorizontalRel.hx
+++ b/std/js/html/svg/PathSegLinetoHorizontalRel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegLinetoHorizontalRel")
-extern class PathSegLinetoHorizontalRel extends PathSeg
-{
+typedef PathSegLinetoHorizontalRel = {
 	var x : Float;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/PathSegLinetoRel.hx b/std/js/html/svg/PathSegLinetoRel.hx
index 894049f7a79a0acdf57e2f6be49fb2e80c298d48..7716b5fcdcc9ce9b068ae36fa74d5ba1ba0c3eac 100644
--- a/std/js/html/svg/PathSegLinetoRel.hx
+++ b/std/js/html/svg/PathSegLinetoRel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegLinetoRel")
-extern class PathSegLinetoRel extends PathSeg
-{
+typedef PathSegLinetoRel = {
 	var x : Float;
 	var y : Float;
 	
diff --git a/std/js/html/svg/PathSegLinetoVerticalAbs.hx b/std/js/html/svg/PathSegLinetoVerticalAbs.hx
index 0157e2ef781afbeb36d502b013bf23d6617043bc..97761fed2f12a5fb22fab231e417fd9a5b616c90 100644
--- a/std/js/html/svg/PathSegLinetoVerticalAbs.hx
+++ b/std/js/html/svg/PathSegLinetoVerticalAbs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegLinetoVerticalAbs")
-extern class PathSegLinetoVerticalAbs extends PathSeg
-{
+typedef PathSegLinetoVerticalAbs = {
 	var y : Float;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/PathSegLinetoVerticalRel.hx b/std/js/html/svg/PathSegLinetoVerticalRel.hx
index 615f730816ea8f54db499d7fe51a6b3698db3db8..a790c30efe66dcc33d295307e70504418070593a 100644
--- a/std/js/html/svg/PathSegLinetoVerticalRel.hx
+++ b/std/js/html/svg/PathSegLinetoVerticalRel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegLinetoVerticalRel")
-extern class PathSegLinetoVerticalRel extends PathSeg
-{
+typedef PathSegLinetoVerticalRel = {
 	var y : Float;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/PathSegList.hx b/std/js/html/svg/PathSegList.hx
index af79d5dc651799fd146d07439e729f5f6203dbae..b19391023aa37683f850182a397fcba8a9baf9dc 100644
--- a/std/js/html/svg/PathSegList.hx
+++ b/std/js/html/svg/PathSegList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,23 +25,10 @@
 package js.html.svg;
 
 @:native("SVGPathSegList")
-extern class PathSegList implements ArrayAccess<PathSeg>
-{
+extern class PathSegList implements ArrayAccess<PathSeg> {
 	var numberOfItems(default,null) : Int;
 	var length(default,null) : Int;
 	
-	/** @throws DOMError */
-	function clear() : Void;
-	/** @throws DOMError */
-	function initialize( newItem : PathSeg ) : PathSeg;
 	/** @throws DOMError */
 	function getItem( index : Int ) : PathSeg;
-	/** @throws DOMError */
-	function insertItemBefore( newItem : PathSeg, index : Int ) : PathSeg;
-	/** @throws DOMError */
-	function replaceItem( newItem : PathSeg, index : Int ) : PathSeg;
-	/** @throws DOMError */
-	function removeItem( index : Int ) : PathSeg;
-	/** @throws DOMError */
-	function appendItem( newItem : PathSeg ) : PathSeg;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/PathSegMovetoAbs.hx b/std/js/html/svg/PathSegMovetoAbs.hx
index e5d9edc6ca8c062c5cbfd51b49239bcfb604934b..bbc755a05be8a043c588f72f490d42fb1bbc6297 100644
--- a/std/js/html/svg/PathSegMovetoAbs.hx
+++ b/std/js/html/svg/PathSegMovetoAbs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegMovetoAbs")
-extern class PathSegMovetoAbs extends PathSeg
-{
+typedef PathSegMovetoAbs = {
 	var x : Float;
 	var y : Float;
 	
diff --git a/std/js/html/svg/PathSegMovetoRel.hx b/std/js/html/svg/PathSegMovetoRel.hx
index 90fa2b29b5795182d0cda0fa43010939d8c69c3c..df988bf98b1085ff2f008afd20e76adc3623bd9c 100644
--- a/std/js/html/svg/PathSegMovetoRel.hx
+++ b/std/js/html/svg/PathSegMovetoRel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,7 @@
 
 package js.html.svg;
 
-@:native("SVGPathSegMovetoRel")
-extern class PathSegMovetoRel extends PathSeg
-{
+typedef PathSegMovetoRel = {
 	var x : Float;
 	var y : Float;
 	
diff --git a/std/js/html/svg/PatternElement.hx b/std/js/html/svg/PatternElement.hx
index 665847bf24f837928924534bbf7b583bb035587d..fff660ce77e6baf50ba62c38a1c6b214e112554a 100644
--- a/std/js/html/svg/PatternElement.hx
+++ b/std/js/html/svg/PatternElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,18 +32,41 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGPatternElement>
 **/
 @:native("SVGPatternElement")
-extern class PatternElement extends Element
-{
-	static inline var SVG_UNIT_TYPE_UNKNOWN : Int = 0;
-	static inline var SVG_UNIT_TYPE_USERSPACEONUSE : Int = 1;
-	static inline var SVG_UNIT_TYPE_OBJECTBOUNDINGBOX : Int = 2;
+extern class PatternElement extends Element {
 	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `patternUnits` attribute of the given `pattern` element. Takes one of the constants defined in `SVGUnitTypes`.
+	**/
 	var patternUnits(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `patternContentUnits` attribute of the given `pattern` element. Takes one of the constants defined in `SVGUnitTypes`.
+	**/
 	var patternContentUnits(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedTransformList` corresponding to the `patternTransform` attribute of the given `pattern` element.
+	**/
 	var patternTransform(default,null) : AnimatedTransformList;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `x` attribute of the given `pattern` element.
+	**/
 	var x(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `y` attribute of the given `pattern` element.
+	**/
 	var y(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `width` attribute of the given `pattern` element.
+	**/
 	var width(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `height` attribute of the given `pattern` element.
+	**/
 	var height(default,null) : AnimatedLength;
 	var viewBox(default,null) : AnimatedRect;
 	var preserveAspectRatio(default,null) : AnimatedPreserveAspectRatio;
diff --git a/std/js/html/svg/Point.hx b/std/js/html/svg/Point.hx
index fe2473da6e412098c0174ab787bd79a996c8fb15..a4a2316cc565117001b170067cb4d1d3a269ea48 100644
--- a/std/js/html/svg/Point.hx
+++ b/std/js/html/svg/Point.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGPoint>
 **/
 @:native("SVGPoint")
-extern class Point
-{
+extern class Point {
 	var x : Float;
 	var y : Float;
 	
diff --git a/std/js/html/svg/PointList.hx b/std/js/html/svg/PointList.hx
index 65808c09bcb9a93da90d0c742325865148144445..1bd46275256ac58aae94a8181f722715fd2cc8ec 100644
--- a/std/js/html/svg/PointList.hx
+++ b/std/js/html/svg/PointList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@
 package js.html.svg;
 
 @:native("SVGPointList")
-extern class PointList implements ArrayAccess<Point>
-{
+extern class PointList implements ArrayAccess<Point> {
 	var numberOfItems(default,null) : Int;
 	var length(default,null) : Int;
 	
diff --git a/std/js/html/svg/PolygonElement.hx b/std/js/html/svg/PolygonElement.hx
index c0537f2091dc33e2e46b4e756a582fba6cd855f4..bf4b6bff0e3005045673797e63844cc4340da380 100644
--- a/std/js/html/svg/PolygonElement.hx
+++ b/std/js/html/svg/PolygonElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGPolygonElement>
 **/
 @:native("SVGPolygonElement")
-extern class PolygonElement extends GraphicsElement
-{
+extern class PolygonElement extends GeometryElement {
 	var points(default,null) : PointList;
 	var animatedPoints(default,null) : PointList;
 	
diff --git a/std/js/html/svg/PolylineElement.hx b/std/js/html/svg/PolylineElement.hx
index 554826624b3ce34435991fbaf5cfa018ecb2bdc1..e0b80beb9b383079decb5da192c7ec5453b07ce5 100644
--- a/std/js/html/svg/PolylineElement.hx
+++ b/std/js/html/svg/PolylineElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGPolylineElement>
 **/
 @:native("SVGPolylineElement")
-extern class PolylineElement extends GraphicsElement
-{
+extern class PolylineElement extends GeometryElement {
 	var points(default,null) : PointList;
 	var animatedPoints(default,null) : PointList;
 	
diff --git a/std/js/html/svg/PreserveAspectRatio.hx b/std/js/html/svg/PreserveAspectRatio.hx
index 84e0c2954d3bfd1533ad5eda19d46ecc56ffb800..673a004fd01d7a9727021fc5dd5ad402da221e4c 100644
--- a/std/js/html/svg/PreserveAspectRatio.hx
+++ b/std/js/html/svg/PreserveAspectRatio.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGPreserveAspectRatio>
 **/
 @:native("SVGPreserveAspectRatio")
-extern class PreserveAspectRatio
-{
+extern class PreserveAspectRatio {
 	static inline var SVG_PRESERVEASPECTRATIO_UNKNOWN : Int = 0;
 	static inline var SVG_PRESERVEASPECTRATIO_NONE : Int = 1;
 	static inline var SVG_PRESERVEASPECTRATIO_XMINYMIN : Int = 2;
diff --git a/std/js/html/svg/RadialGradientElement.hx b/std/js/html/svg/RadialGradientElement.hx
index de6a79900d10e29735bd894f479c705497e77f9a..73d973aae9eb433ef8ffc135acce1d9dcda34693 100644
--- a/std/js/html/svg/RadialGradientElement.hx
+++ b/std/js/html/svg/RadialGradientElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,19 +25,35 @@
 package js.html.svg;
 
 /**
-	The `SVGRadialGradientElement` interface corresponds to the `radialGradient` element.
+	The `SVGRadialGradientElement` interface corresponds to the `RadialGradient` element.
 
 	Documentation [SVGRadialGradientElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGRadialGradientElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGRadialGradientElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGRadialGradientElement>
 **/
 @:native("SVGRadialGradientElement")
-extern class RadialGradientElement extends GradientElement
-{
+extern class RadialGradientElement extends GradientElement {
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `cx` attribute of the given `RadialGradient` element.
+	**/
 	var cx(default,null) : AnimatedLength;
 	var cy(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `r` attribute of the given `RadialGradient` element.
+	**/
 	var r(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `fx` attribute of the given `RadialGradient` element.
+	**/
 	var fx(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `fy` attribute of the given `RadialGradient` element.
+	**/
 	var fy(default,null) : AnimatedLength;
+	var fr(default,null) : AnimatedLength;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/Rect.hx b/std/js/html/svg/Rect.hx
index 352e7b2bbc4cf0efd5650abf9a39b228c5f425c1..56f6d57f5fab71a4e1e75b907045d14886aa392a 100644
--- a/std/js/html/svg/Rect.hx
+++ b/std/js/html/svg/Rect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,17 +25,28 @@
 package js.html.svg;
 
 /**
-	The `SVGRect` represents a rectangle. Rectangles consist of codex/code and codey/code coordinate pair identifying a minimum X value, a minimum Y value, and a width and height, which are constrained to be non-negative.
+	The `SVGRect` represents a rectangle. Rectangles consist of an x and y coordinate pair identifying a minimum x value, a minimum y value, and a width and height, which are constrained to be non-negative.
 
 	Documentation [SVGRect](https://developer.mozilla.org/en-US/docs/Web/API/SVGRect) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGRect$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGRect>
 **/
 @:native("SVGRect")
-extern class Rect
-{
+extern class Rect {
+	
+	/**
+		The exact effect of this coordinate depends on each element. If the attribute is not specified, the effect is as if a value of `0` were specified.
+	**/
 	var x : Float;
+	
+	/**
+		The exact effect of this coordinate depends on each element.If the attribute is not specified, the effect is as if a value of `0` were specified.
+	**/
 	var y : Float;
+	
+	/**
+		This represents the width of the rectangle.A value that is negative results to an error. A value of zero disables rendering of the element
+	**/
 	var width : Float;
 	var height : Float;
 	
diff --git a/std/js/html/svg/RectElement.hx b/std/js/html/svg/RectElement.hx
index 47248dfed805230eb276653d1d64f6c3847ae3cd..b8c2fc193e274955aea7b0169312245ced99ff68 100644
--- a/std/js/html/svg/RectElement.hx
+++ b/std/js/html/svg/RectElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,36 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGRectElement>
 **/
 @:native("SVGRectElement")
-extern class RectElement extends GraphicsElement
-{
+extern class RectElement extends GeometryElement {
+	
+	/**
+		Returns an `SVGAnimatedLength` corresponding to the `x` attribute of the given `rect` element.
+	**/
 	var x(default,null) : AnimatedLength;
+	
+	/**
+		Returns an `SVGAnimatedLength` corresponding to the `y` attribute of the given `rect` element.
+	**/
 	var y(default,null) : AnimatedLength;
+	
+	/**
+		Returns an `SVGAnimatedLength` corresponding to the `width` attribute of the given `rect` element.
+	**/
 	var width(default,null) : AnimatedLength;
+	
+	/**
+		Returns an `SVGAnimatedLength` corresponding to the `height` attribute of the given `rect` element.
+	**/
 	var height(default,null) : AnimatedLength;
+	
+	/**
+		Returns an `SVGAnimatedLength` corresponding to the `rx` attribute of the given `rect` element.
+	**/
 	var rx(default,null) : AnimatedLength;
+	
+	/**
+		Returns an `SVGAnimatedLength` corresponding to the `ry` attribute of the given `rect` element.
+	**/
 	var ry(default,null) : AnimatedLength;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/SVGElement.hx b/std/js/html/svg/SVGElement.hx
index 05621b1184ab5751d9aca277c513b944fc61ec6d..845e0b47f101cf9d6df85fb7347503fe8a23a5dd 100644
--- a/std/js/html/svg/SVGElement.hx
+++ b/std/js/html/svg/SVGElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,44 +32,158 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGSVGElement>
 **/
 @:native("SVGSVGElement")
-extern class SVGElement extends GraphicsElement
-{
+extern class SVGElement extends GraphicsElement {
 	static inline var SVG_ZOOMANDPAN_UNKNOWN : Int = 0;
 	static inline var SVG_ZOOMANDPAN_DISABLE : Int = 1;
 	static inline var SVG_ZOOMANDPAN_MAGNIFY : Int = 2;
 	
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `x` attribute of the given `svg` element.
+	**/
 	var x(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `y` attribute of the given `svg` element.
+	**/
 	var y(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `width` attribute of the given `svg` element.
+	**/
 	var width(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `height` attribute of the given `svg` element.
+	**/
 	var height(default,null) : AnimatedLength;
-	var pixelUnitToMillimeterX(default,null) : Float;
-	var pixelUnitToMillimeterY(default,null) : Float;
-	var screenPixelToMillimeterX(default,null) : Float;
-	var screenPixelToMillimeterY(default,null) : Float;
+	
+	/**
+		The initial view (i.e., before magnification and panning) of the current innermost SVG document fragment can be either the "standard" view, i.e., based on attributes on the `svg` element such as `viewBox`) or on a "custom" view (i.e., a hyperlink into a particular `view` or other element). If the initial view is the "standard" view, then this attribute is `false`. If the initial view is a "custom" view, then this attribute is `true`.
+	**/
 	var useCurrentView(default,null) : Bool;
+	
+	/**
+		On an outermost `svg` element, this float attribute indicates the current scale factor relative to the initial view to take into account user magnification and panning operations. DOM attributes `currentScale` and `currentTranslate` are equivalent to the 2x3 matrix `[a b c d e f] = [currentScale 0 0 currentScale currentTranslate.x currentTranslate.y]`. If "magnification" is enabled (i.e., `zoomAndPan="magnify"`), then the effect is as if an extra transformation were placed at the outermost level on the SVG document fragment (i.e., outside the outermost `svg` element).
+	**/
 	var currentScale : Float;
+	
+	/**
+		An `SVGPoint` representing the translation factor that takes into account user "magnification" corresponding to an outermost `svg` element. The behavior is undefined for svg elements that are not at the outermost level.
+	**/
 	var currentTranslate(default,null) : Point;
 	var viewBox(default,null) : AnimatedRect;
 	var preserveAspectRatio(default,null) : AnimatedPreserveAspectRatio;
 	var zoomAndPan : Int;
 	
+	
+	/**
+		
+		 Takes a time-out value which indicates that redraw shall not occur until:
+		 the corresponding unsuspendRedraw() call has been made, an unsuspendRedrawAll() call has been made, or its timer has timed out.
+		
+		 In environments that do not support interactivity (e.g., print media), then redraw shall not be suspended. Calls to `suspendRedraw()` and `unsuspendRedraw()` should, but need not be, made in balanced pairs.
+		
+		 To suspend redraw actions as a collection of SVG DOM changes occur, precede the changes to the SVG DOM with a method call similar to:
+		
+		 suspendHandleID = suspendRedraw(maxWaitMilliseconds);
+		
+		 and follow the changes with a method call similar to:
+		
+		 unsuspendRedraw(suspendHandleID);
+		
+		 Note that multiple suspendRedraw calls can be used at once and that each such method call is treated independently of the other suspendRedraw method calls.
+		 
+	**/
 	function suspendRedraw( maxWaitMilliseconds : Int ) : Int;
+	
+	/**
+		Cancels a specified `suspendRedraw()` by providing a unique suspend handle ID that was returned by a previous `suspendRedraw()` call.
+	**/
 	function unsuspendRedraw( suspendHandleID : Int ) : Void;
+	
+	/**
+		Cancels all currently active `suspendRedraw()` method calls. This method is most useful at the very end of a set of SVG DOM calls to ensure that all pending `suspendRedraw()` method calls have been cancelled.
+	**/
 	function unsuspendRedrawAll() : Void;
+	
+	/**
+		In rendering environments supporting interactivity, forces the user agent to immediately redraw all regions of the viewport that require updating.
+	**/
 	function forceRedraw() : Void;
+	
+	/**
+		Suspends (i.e., pauses) all currently running animations that are defined within the SVG document fragment corresponding to this `svg` element, causing the animation clock corresponding to this document fragment to stand still until it is unpaused.
+	**/
 	function pauseAnimations() : Void;
+	
+	/**
+		Unsuspends (i.e., unpauses) currently running animations that are defined within the SVG document fragment, causing the animation clock to continue from the time at which it was suspended.
+	**/
 	function unpauseAnimations() : Void;
+	
+	/**
+		Returns true if this SVG document fragment is in a paused state.
+	**/
 	function animationsPaused() : Bool;
+	
+	/**
+		Returns the current time in seconds relative to the start time for the current SVG document fragment. If getCurrentTime is called before the document timeline has begun (for example, by script running in a `script` element before the document's SVGLoad event is dispatched), then 0 is returned.
+	**/
 	function getCurrentTime() : Float;
+	
+	/**
+		Adjusts the clock for this SVG document fragment, establishing a new current time. If `setCurrentTime` is called before the document timeline has begun (for example, by script running in a `script` element before the document's SVGLoad event is dispatched), then the value of seconds in the last invocation of the method gives the time that the document will seek to once the document timeline has begun.
+	**/
 	function setCurrentTime( seconds : Float ) : Void;
+	
+	/**
+		Unselects any selected objects, including any selections of text strings and type-in bars.
+	**/
 	function deselectAll() : Void;
+	
+	/**
+		Creates an `SVGNumber` object outside of any document trees. The object is initialized to a value of zero.
+	**/
 	function createSVGNumber() : Number;
+	
+	/**
+		Creates an `SVGLength` object outside of any document trees. The object is initialized to a value of zero user units.
+	**/
 	function createSVGLength() : Length;
+	
+	/**
+		Creates an `SVGAngle` object outside of any document trees. The object is initialized to a value of zero degrees (unitless).
+	**/
 	function createSVGAngle() : Angle;
+	
+	/**
+		Creates an `SVGPoint` object outside of any document trees. The object is initialized to the point (0,0) in the user coordinate system.
+	**/
 	function createSVGPoint() : Point;
+	
+	/**
+		Creates an `SVGMatrix` object outside of any document trees. The object is initialized to the identity matrix.
+	**/
 	function createSVGMatrix() : Matrix;
+	
+	/**
+		Creates an `SVGRect` object outside of any document trees. The object is initialized such that all values are set to 0 user units.
+	**/
 	function createSVGRect() : Rect;
+	
+	/**
+		Creates an `SVGTransform` object outside of any document trees. The object is initialized to an identity matrix transform (`SVG_TRANSFORM_MATRIX`).
+	**/
 	function createSVGTransform() : Transform;
+	
+	/**
+		Creates an `SVGTransform` object outside of any document trees. The object is initialized to the given matrix transform (i.e., `SVG_TRANSFORM_MATRIX`). The values from the parameter matrix are copied, the matrix parameter is not adopted as `SVGTransform::matrix`.
+	**/
 	function createSVGTransformFromMatrix( matrix : Matrix ) : Transform;
+	
+	/**
+		Searches this SVG document fragment (i.e., the search is restricted to a subset of the document tree) for an Element whose id is given by elementId. If an Element is found, that Element is returned. If no such element exists, returns null. Behavior is not defined if more than one element has this id.
+	**/
 	function getElementById( elementId : String ) : js.html.Element;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/ScriptElement.hx b/std/js/html/svg/ScriptElement.hx
index cf1eabc15ae4faef65937ef2aa6ebb39fbd2635f..044c823ab2409e624d5ebd98f0ba02332278c203 100644
--- a/std/js/html/svg/ScriptElement.hx
+++ b/std/js/html/svg/ScriptElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,9 +32,16 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGScriptElement>
 **/
 @:native("SVGScriptElement")
-extern class ScriptElement extends Element
-{
+extern class ScriptElement extends Element {
+	
+	/**
+		A `DOMString` corresponding to the `type` attribute of the given `script` element. A `DOMException` is raised with the code `NO_MODIFICATION_ALLOWED_ERR` on an attempt to change the value of a read only attribut.
+	**/
 	var type : String;
+	
+	/**
+		A `DOMString` corresponding to the `crossorigin` attribute of the given `script` element.
+	**/
 	var crossOrigin : String;
 	var href(default,null) : AnimatedString;
 	
diff --git a/std/js/html/svg/SetElement.hx b/std/js/html/svg/SetElement.hx
index f37b0ec875fb61eb4c4e62cbb788d3a6ccd65711..de0fb9a3f70fba2a49f60f466954ae38e9737eb6 100644
--- a/std/js/html/svg/SetElement.hx
+++ b/std/js/html/svg/SetElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGSetElement>
 **/
 @:native("SVGSetElement")
-extern class SetElement extends AnimationElement
-{
+extern class SetElement extends AnimationElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/StopElement.hx b/std/js/html/svg/StopElement.hx
index 48e3b9530c3be12488c4b214616e987b061dc486..8bb4d052edc93208fd06306ecae8f7388aea997b 100644
--- a/std/js/html/svg/StopElement.hx
+++ b/std/js/html/svg/StopElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,11 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGStopElement>
 **/
 @:native("SVGStopElement")
-extern class StopElement extends Element
-{
+extern class StopElement extends Element {
+	
+	/**
+		An `SVGAnimatedNumber` corresponding to the `offset` of the given element.
+	**/
 	var offset(default,null) : AnimatedNumber;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/StringList.hx b/std/js/html/svg/StringList.hx
index 11df3dcd3b4ac0155809d388ae978f7498f54078..444d9300928458a5c00397038954de68a249be2f 100644
--- a/std/js/html/svg/StringList.hx
+++ b/std/js/html/svg/StringList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGStringList>
 **/
 @:native("SVGStringList")
-extern class StringList implements ArrayAccess<String>
-{
+extern class StringList implements ArrayAccess<String> {
 	var length(default,null) : Int;
 	var numberOfItems(default,null) : Int;
 	
diff --git a/std/js/html/svg/StyleElement.hx b/std/js/html/svg/StyleElement.hx
index aa3cc7afbe2a2ae63ddeca785683acb4ad754e78..2fbfe4d7a43399a00ad8ad903a6549f1ab9c3c09 100644
--- a/std/js/html/svg/StyleElement.hx
+++ b/std/js/html/svg/StyleElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,12 +32,22 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGStyleElement>
 **/
 @:native("SVGStyleElement")
-extern class StyleElement extends Element
-{
+extern class StyleElement extends Element {
 	var xmlspace : String;
+	
+	/**
+		A `DOMString` corresponding to the `type` attribute of the given element.
+		 SVG 1.1 defined that a `DOMException` is raised with code `NO_MODIFICATION_ALLOWED_ERR` on an attempt to change the value of a read-only attribute. This restriction was removed in SVG 2.
+		 
+	**/
 	var type : String;
+	
+	/**
+		A `DOMString` corresponding to the `media` attribute of the given element.
+		 SVG 1.1 defined that a `DOMException` is raised with code `NO_MODIFICATION_ALLOWED_ERR` on an attempt to change the value of a read-only attribute. This restriction was removed in SVG 2.
+		 
+	**/
 	var media : String;
-	var scoped : Bool;
 	var sheet(default,null) : js.html.StyleSheet;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/SwitchElement.hx b/std/js/html/svg/SwitchElement.hx
index 5684b7f6cd53e74295fca7bc6a1e906e842dcff6..cd03c9e86e7aefa029bea7143e3f1c90641cba46 100644
--- a/std/js/html/svg/SwitchElement.hx
+++ b/std/js/html/svg/SwitchElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGSwitchElement>
 **/
 @:native("SVGSwitchElement")
-extern class SwitchElement extends GraphicsElement
-{
+extern class SwitchElement extends GraphicsElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/SymbolElement.hx b/std/js/html/svg/SymbolElement.hx
index e0083d5763b443d7ffa61170a1ea532578fc7630..be29643b54677f6f41f6697ccf6f1db6a6d51d50 100644
--- a/std/js/html/svg/SymbolElement.hx
+++ b/std/js/html/svg/SymbolElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGSymbolElement>
 **/
 @:native("SVGSymbolElement")
-extern class SymbolElement extends Element
-{
+extern class SymbolElement extends Element {
 	var viewBox(default,null) : AnimatedRect;
 	var preserveAspectRatio(default,null) : AnimatedPreserveAspectRatio;
 	var requiredFeatures(default,null) : StringList;
diff --git a/std/js/html/svg/TSpanElement.hx b/std/js/html/svg/TSpanElement.hx
index e0257255f51b2902418b4c63455d100318015853..d73a7c98e8b2d6146bf28c1f5cccc3281fabf551 100644
--- a/std/js/html/svg/TSpanElement.hx
+++ b/std/js/html/svg/TSpanElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,13 +25,12 @@
 package js.html.svg;
 
 /**
-	The `SVGTSpanElement` interface provides access to the properties of `tspan` elements, as well as methods to manipulate them.
+	The `SVGTSpanElement` interface represents a `tspan` element.
 
 	Documentation [SVGTSpanElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGTSpanElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGTSpanElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGTSpanElement>
 **/
 @:native("SVGTSpanElement")
-extern class TSpanElement extends TextPositioningElement
-{
+extern class TSpanElement extends TextPositioningElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/TextContentElement.hx b/std/js/html/svg/TextContentElement.hx
index 86d9fc8bbc6c2b04f7f0a3fa0931f5b3ea61e053..fb266c5e8454979004ba2f3e0f2a18197539956b 100644
--- a/std/js/html/svg/TextContentElement.hx
+++ b/std/js/html/svg/TextContentElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,29 +24,83 @@
 
 package js.html.svg;
 
+/**
+	The `SVGTextContentElement` interface is implemented by elements that support rendering child text content. It is inherited by various text-related interfaces, such as `SVGTextElement`, `SVGTSpanElement`, `SVGTRefElement`, `SVGAltGlyphElement` and `SVGTextPathElement`.
+
+	Documentation [SVGTextContentElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGTextContentElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGTextContentElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGTextContentElement>
+**/
 @:native("SVGTextContentElement")
-extern class TextContentElement extends GraphicsElement
-{
+extern class TextContentElement extends GraphicsElement {
 	static inline var LENGTHADJUST_UNKNOWN : Int = 0;
 	static inline var LENGTHADJUST_SPACING : Int = 1;
 	static inline var LENGTHADJUST_SPACINGANDGLYPHS : Int = 2;
 	
+	
+	/**
+		An `SVGAnimatedLength` reflecting the `textLength` attribute of the given element.
+	**/
 	var textLength(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedEnumeration` reflecting the `lengthAdjust` attribute of the given element. The numeric type values represent one of the constant values above.
+	**/
 	var lengthAdjust(default,null) : AnimatedEnumeration;
 	
+	
+	/**
+		Returns a long representing the total number of addressable characters available for rendering within the current element, regardless of whether they will be rendered.
+	**/
 	function getNumberOfChars() : Int;
+	
+	/**
+		Returns a float representing the computed length for the text within the element.
+	**/
 	function getComputedTextLength() : Float;
-	/** @throws DOMError */
+	
+	/**
+		Returns a float representing the computed length of the formatted text advance distance for a substring of text within the element. Note that this method only accounts for the widths of the glyphs in the substring and any extra spacing inserted by the CSS 'letter-spacing' and 'word-spacing' properties. Visual spacing adjustments made by the 'x' attribute is ignored.
+		@throws DOMError
+	**/
 	function getSubStringLength( charnum : Int, nchars : Int ) : Float;
-	/** @throws DOMError */
+	
+	/**
+		Returns a `DOMPoint` representing the position of a typographic character after text layout has been performed.
+		 Note: In SVG 1.1 this method returned an `SVGPoint`.
+		 
+		@throws DOMError
+	**/
 	function getStartPositionOfChar( charnum : Int ) : Point;
-	/** @throws DOMError */
+	
+	/**
+		Returns a `DOMPoint` representing the trailing position of a typographic character after text layout has been performed.
+		 Note: In SVG 1.1 this method returned an `SVGPoint`.
+		 
+		@throws DOMError
+	**/
 	function getEndPositionOfChar( charnum : Int ) : Point;
-	/** @throws DOMError */
+	
+	/**
+		Returns a `DOMRect` representing the computed tight bounding box of the glyph cell that corresponds to a given typographic character.
+		@throws DOMError
+	**/
 	function getExtentOfChar( charnum : Int ) : Rect;
-	/** @throws DOMError */
+	
+	/**
+		Returns a float representing the rotation of typographic character.
+		@throws DOMError
+	**/
 	function getRotationOfChar( charnum : Int ) : Float;
+	
+	/**
+		Returns a long representing the character which caused a text glyph to be rendered at a given position in the coordinate system. Because the relationship between characters and glyphs is not one-to-one, only the first character of the relevant typographic character is returned
+	**/
 	function getCharNumAtPosition( point : Point ) : Int;
-	/** @throws DOMError */
+	
+	/**
+		Selects text within the element.
+		@throws DOMError
+	**/
 	function selectSubString( charnum : Int, nchars : Int ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/svg/TextElement.hx b/std/js/html/svg/TextElement.hx
index 54bf487b19eefc11ca2b78b3140513c963769e05..f0fc56100819170dc36cd892cd4b35e61b06dfc5 100644
--- a/std/js/html/svg/TextElement.hx
+++ b/std/js/html/svg/TextElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGTextElement>
 **/
 @:native("SVGTextElement")
-extern class TextElement extends TextPositioningElement
-{
+extern class TextElement extends TextPositioningElement {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/TextPathElement.hx b/std/js/html/svg/TextPathElement.hx
index 3f8897271b8048a1e06a7f71bef831c44d064a0c..95e6b264ec95c0745a5224e2c84c0c1a4eb33ca3 100644
--- a/std/js/html/svg/TextPathElement.hx
+++ b/std/js/html/svg/TextPathElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,15 @@
 
 package js.html.svg;
 
+/**
+	The `SVGTextPathElement` interface corresponds to the `textPath` element.
+
+	Documentation [SVGTextPathElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGTextPathElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGTextPathElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGTextPathElement>
+**/
 @:native("SVGTextPathElement")
-extern class TextPathElement extends TextContentElement
-{
+extern class TextPathElement extends TextContentElement {
 	static inline var TEXTPATH_METHODTYPE_UNKNOWN : Int = 0;
 	static inline var TEXTPATH_METHODTYPE_ALIGN : Int = 1;
 	static inline var TEXTPATH_METHODTYPE_STRETCH : Int = 2;
@@ -34,8 +40,20 @@ extern class TextPathElement extends TextContentElement
 	static inline var TEXTPATH_SPACINGTYPE_AUTO : Int = 1;
 	static inline var TEXTPATH_SPACINGTYPE_EXACT : Int = 2;
 	
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the X component of the `startOffset` attribute of the given element.
+	**/
 	var startOffset(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `method` attribute of the given element. It takes one of the `TEXTPATH_METHODTYPE_*` constants defined on this interface.
+	**/
 	var method(default,null) : AnimatedEnumeration;
+	
+	/**
+		An `SVGAnimatedEnumeration` corresponding to the `spacing` attribute of the given element. It takes one of the `TEXTPATH_SPACINGTYPE_*` constants defined on this interface.
+	**/
 	var spacing(default,null) : AnimatedEnumeration;
 	var href(default,null) : AnimatedString;
 	
diff --git a/std/js/html/svg/TextPositioningElement.hx b/std/js/html/svg/TextPositioningElement.hx
index cf34678b26dca0d2e91c4e0123bffc1f454e96cc..4bda6ed604067419fdc8dc07ddf8738497a9f1a6 100644
--- a/std/js/html/svg/TextPositioningElement.hx
+++ b/std/js/html/svg/TextPositioningElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,19 +25,38 @@
 package js.html.svg;
 
 /**
-	The `SVGTextPositioningElement` interface is inherited by text-related interfaces: `SVGTextElement`, `SVGTSpanElement`, `SVGTRefElement` and `SVGAltGlyphElement`.
+	The `SVGTextPositioningElement` interface is implemented by elements that support attributes that position individual text glyphs. It is inherited by `SVGTextElement`, `SVGTSpanElement`, `SVGTRefElement` and `SVGAltGlyphElement`.
 
 	Documentation [SVGTextPositioningElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGTextPositioningElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGTextPositioningElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGTextPositioningElement>
 **/
 @:native("SVGTextPositioningElement")
-extern class TextPositioningElement extends TextContentElement
-{
+extern class TextPositioningElement extends TextContentElement {
+	
+	/**
+		Returns an `SVGAnimatedLengthList` reflecting the `x` attribute of the given element.
+	**/
 	var x(default,null) : AnimatedLengthList;
+	
+	/**
+		Returns an `SVGAnimatedLengthList` reflecting the `y` attribute of the given element.
+	**/
 	var y(default,null) : AnimatedLengthList;
+	
+	/**
+		Returns an `SVGAnimatedLengthList` reflecting the `dx` attribute of the given element.
+	**/
 	var dx(default,null) : AnimatedLengthList;
+	
+	/**
+		Returns an `SVGAnimatedLengthList` reflecting the `dy` attribute of the given element.
+	**/
 	var dy(default,null) : AnimatedLengthList;
+	
+	/**
+		Returns an `SVGAnimatedNumberList` reflecting the `rotate` attribute of the given element.
+	**/
 	var rotate(default,null) : AnimatedNumberList;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/TitleElement.hx b/std/js/html/svg/TitleElement.hx
index c85fbe3946e80306f975fb9f6734bde6031c2c41..973299cd4851f241364414e5d0a4b09c4436ce2e 100644
--- a/std/js/html/svg/TitleElement.hx
+++ b/std/js/html/svg/TitleElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGTitleElement>
 **/
 @:native("SVGTitleElement")
-extern class TitleElement extends Element
-{
+extern class TitleElement extends Element {
 }
\ No newline at end of file
diff --git a/std/js/html/svg/Transform.hx b/std/js/html/svg/Transform.hx
index a31da4335704bdd7e8ba78cd8ad61e628974eb02..9b8879e7094da1a8e80977b31dee169295b4f85d 100644
--- a/std/js/html/svg/Transform.hx
+++ b/std/js/html/svg/Transform.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGTransform>
 **/
 @:native("SVGTransform")
-extern class Transform
-{
+extern class Transform {
 	static inline var SVG_TRANSFORM_UNKNOWN : Int = 0;
 	static inline var SVG_TRANSFORM_MATRIX : Int = 1;
 	static inline var SVG_TRANSFORM_TRANSLATE : Int = 2;
diff --git a/std/js/html/svg/TransformList.hx b/std/js/html/svg/TransformList.hx
index 97b65ee755dba93f734b3cbbc666a1619fc1a2ea..591d2152f95a205838edf9906383ce3b65147c51 100644
--- a/std/js/html/svg/TransformList.hx
+++ b/std/js/html/svg/TransformList.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGTransformList>
 **/
 @:native("SVGTransformList")
-extern class TransformList implements ArrayAccess<Transform>
-{
+extern class TransformList implements ArrayAccess<Transform> {
 	var numberOfItems(default,null) : Int;
 	var length(default,null) : Int;
 	
diff --git a/std/js/html/svg/UnitTypes.hx b/std/js/html/svg/UnitTypes.hx
index 120b7777c1cf648747ba6ff1d84daf5486b6506e..79e33735beae90167685cae9227e13c305e199b6 100644
--- a/std/js/html/svg/UnitTypes.hx
+++ b/std/js/html/svg/UnitTypes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,15 @@
 
 package js.html.svg;
 
+/**
+	The `SVGUnitTypes` interface defines a commonly used set of constants used for reflecting `gradientUnits`, `patternContentUnits` and other similar attributes.
+
+	Documentation [SVGUnitTypes](https://developer.mozilla.org/en-US/docs/Web/API/SVGUnitTypes) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGUnitTypes$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGUnitTypes>
+**/
 @:native("SVGUnitTypes")
-extern class UnitTypes
-{
+extern class UnitTypes {
 	static inline var SVG_UNIT_TYPE_UNKNOWN : Int = 0;
 	static inline var SVG_UNIT_TYPE_USERSPACEONUSE : Int = 1;
 	static inline var SVG_UNIT_TYPE_OBJECTBOUNDINGBOX : Int = 2;
diff --git a/std/js/html/svg/UseElement.hx b/std/js/html/svg/UseElement.hx
index 1f129736b8a3e7038a928123c99bded2acb27327..3c9ef68fde497460efdb78ddb6e70f4e5962fb72 100644
--- a/std/js/html/svg/UseElement.hx
+++ b/std/js/html/svg/UseElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,18 +25,33 @@
 package js.html.svg;
 
 /**
-	The `SVGUseElement` interface provides access to the properties of `use` elements, as well as methods to manipulate them.
+	The `SVGUseElement` interface corresponds to the `use` element.
 
 	Documentation [SVGUseElement](https://developer.mozilla.org/en-US/docs/Web/API/SVGUseElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGUseElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGUseElement>
 **/
 @:native("SVGUseElement")
-extern class UseElement extends GraphicsElement
-{
+extern class UseElement extends GraphicsElement {
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `x` attribute of the given element.
+	**/
 	var x(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `y` attribute of the given element.
+	**/
 	var y(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `width` attribute of the given element.
+	**/
 	var width(default,null) : AnimatedLength;
+	
+	/**
+		An `SVGAnimatedLength` corresponding to the `height` attribute of the given element.
+	**/
 	var height(default,null) : AnimatedLength;
 	var href(default,null) : AnimatedString;
 	
diff --git a/std/js/html/svg/ViewElement.hx b/std/js/html/svg/ViewElement.hx
index 3ecaa2be8dfddabcb06f46724836eebda6e10f58..c94db5ea970fa5b3314d1c7485fce7d1f4925c07 100644
--- a/std/js/html/svg/ViewElement.hx
+++ b/std/js/html/svg/ViewElement.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,13 +32,11 @@ package js.html.svg;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGViewElement>
 **/
 @:native("SVGViewElement")
-extern class ViewElement extends Element
-{
+extern class ViewElement extends Element {
 	static inline var SVG_ZOOMANDPAN_UNKNOWN : Int = 0;
 	static inline var SVG_ZOOMANDPAN_DISABLE : Int = 1;
 	static inline var SVG_ZOOMANDPAN_MAGNIFY : Int = 2;
 	
-	var viewTarget(default,null) : StringList;
 	var viewBox(default,null) : AnimatedRect;
 	var preserveAspectRatio(default,null) : AnimatedPreserveAspectRatio;
 	var zoomAndPan : Int;
diff --git a/std/js/html/svg/ZoomAndPan.hx b/std/js/html/svg/ZoomAndPan.hx
index 27e855fa24c831b736bfe70b9e2774038492823e..1a42a9732ecbb4167b037007f40cd36cfd639923 100644
--- a/std/js/html/svg/ZoomAndPan.hx
+++ b/std/js/html/svg/ZoomAndPan.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,23 @@
 
 package js.html.svg;
 
+/**
+	The `SVGZoomAndPan` interfaceis used to reflect the `zoomAndPan` attribute, and is mixed in to other interfaces for elements that support this attribute.
+
+	Documentation [SVGZoomAndPan](https://developer.mozilla.org/en-US/docs/Web/API/SVGZoomAndPan) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/SVGZoomAndPan$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/SVGZoomAndPan>
+**/
 @:native("SVGZoomAndPan")
-extern class ZoomAndPan
-{
+extern class ZoomAndPan {
 	static inline var SVG_ZOOMANDPAN_UNKNOWN : Int = 0;
 	static inline var SVG_ZOOMANDPAN_DISABLE : Int = 1;
 	static inline var SVG_ZOOMANDPAN_MAGNIFY : Int = 2;
 	
+	
+	/**
+		An unsigned short representing the value of the `zoomAndPan` attribute.
+	**/
 	var zoomAndPan : Int;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/svg/ZoomEvent.hx b/std/js/html/svg/ZoomEvent.hx
deleted file mode 100644
index 17ae65ea742cce24086f8baff1835848df27bff2..0000000000000000000000000000000000000000
--- a/std/js/html/svg/ZoomEvent.hx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-// This file is generated from mozilla\SVGZoomEvent.webidl. Do not edit!
-
-package js.html.svg;
-
-@:native("SVGZoomEvent")
-extern class ZoomEvent extends js.html.UIEvent
-{
-	var previousScale(default,null) : Float;
-	var previousTranslate(default,null) : Point;
-	var newScale(default,null) : Float;
-	var newTranslate(default,null) : Point;
-	
-}
\ No newline at end of file
diff --git a/std/js/html/webgl/ActiveInfo.hx b/std/js/html/webgl/ActiveInfo.hx
index ceafcf6555a70fe8db292ebab4fc86ee4841e1a6..6e4e2125cc49f26b5092cc06d55a2367ab6b2610 100644
--- a/std/js/html/webgl/ActiveInfo.hx
+++ b/std/js/html/webgl/ActiveInfo.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLActiveInfo>
 **/
 @:native("WebGLActiveInfo")
-extern class ActiveInfo
-{
+extern class ActiveInfo {
 	
 	/**
 		The read-only size of the requested variable.
diff --git a/std/js/html/webgl/Buffer.hx b/std/js/html/webgl/Buffer.hx
index 551fb720f26e9a780a2494fe405865c145b4933e..2adea3409ff4122adeedf792fb896f57bf9c6d59 100644
--- a/std/js/html/webgl/Buffer.hx
+++ b/std/js/html/webgl/Buffer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLBuffer>
 **/
 @:native("WebGLBuffer")
-extern class Buffer
-{
+extern class Buffer {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ContextAttributes.hx b/std/js/html/webgl/ContextAttributes.hx
index e9fba19fc4512cd11bba79d0b626ed85ed7b63f4..fd86dd2b884518123de4c08270c44559c4e37f41 100644
--- a/std/js/html/webgl/ContextAttributes.hx
+++ b/std/js/html/webgl/ContextAttributes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,13 @@
 
 package js.html.webgl;
 
-typedef ContextAttributes =
-{
-	@:optional var alpha : Bool;
-	@:optional var antialias : Bool;
-	@:optional var depth : Bool;
-	@:optional var failIfMajorPerformanceCaveat : Bool;
-	@:optional var premultipliedAlpha : Bool;
-	@:optional var preserveDrawingBuffer : Bool;
-	@:optional var stencil : Bool;
+typedef ContextAttributes = {
+	var ?alpha : Bool;
+	var ?antialias : Bool;
+	var ?depth : Bool;
+	var ?failIfMajorPerformanceCaveat : Bool;
+	var ?powerPreference : PowerPreference;
+	var ?premultipliedAlpha : Bool;
+	var ?preserveDrawingBuffer : Bool;
+	var ?stencil : Bool;
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ContextEvent.hx b/std/js/html/webgl/ContextEvent.hx
index 59f9d67d6d9135b719162a0872acac9b3bb040d0..76323a733001d9f0576822651579a5b1f4797df5 100644
--- a/std/js/html/webgl/ContextEvent.hx
+++ b/std/js/html/webgl/ContextEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from webgl.webidl. Do not edit!
+// This file is generated from mozilla\WebGLContextEvent.webidl. Do not edit!
 
 package js.html.webgl;
 
@@ -32,8 +32,7 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLContextEvent>
 **/
 @:native("WebGLContextEvent")
-extern class ContextEvent extends js.html.Event
-{
+extern class ContextEvent extends js.html.Event {
 	
 	/**
 		A read-only property containing additional information about the event.
diff --git a/std/js/html/webgl/ContextEventInit.hx b/std/js/html/webgl/ContextEventInit.hx
index bf6eb5291ef8a7b9d76d711d80a47aac79d0b31e..109593231abd5f01ee33f0882f538f8e1a3dce51 100644
--- a/std/js/html/webgl/ContextEventInit.hx
+++ b/std/js/html/webgl/ContextEventInit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from webgl.webidl. Do not edit!
+// This file is generated from mozilla\WebGLContextEvent.webidl. Do not edit!
 
 package js.html.webgl;
 
-typedef ContextEventInit =
-{
-	> EventInit,
-	@:optional var statusMessage : String;
+typedef ContextEventInit = EventInit & {
+	var ?statusMessage : String;
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/Extension.hx b/std/js/html/webgl/Extension.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cec1165917b2287aef30e7f8fce4f58537bc1036
--- /dev/null
+++ b/std/js/html/webgl/Extension.hx
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is automatically generated. Do not edit!
+
+package js.html.webgl;
+
+import js.html.webgl.extension.*;
+
+enum abstract Extension<T>(String) from String to String {
+	var ANGLE_instanced_arrays: Extension<ANGLEInstancedArrays> = 'ANGLE_instanced_arrays';
+	var EXT_blend_minmax: Extension<EXTBlendMinmax> = 'EXT_blend_minmax';
+	var EXT_color_buffer_float: Extension<EXTColorBufferFloat> = 'EXT_color_buffer_float';
+	var EXT_color_buffer_half_float: Extension<EXTColorBufferHalfFloat> = 'EXT_color_buffer_half_float';
+	var EXT_disjoint_timer_query: Extension<EXTDisjointTimerQuery> = 'EXT_disjoint_timer_query';
+	var EXT_frag_depth: Extension<EXTFragDepth> = 'EXT_frag_depth';
+	var EXT_sRGB: Extension<EXTSrgb> = 'EXT_sRGB';
+	var EXT_shader_texture_lod: Extension<EXTShaderTextureLod> = 'EXT_shader_texture_lod';
+	var EXT_texture_filter_anisotropic: Extension<EXTTextureFilterAnisotropic> = 'EXT_texture_filter_anisotropic';
+	var OES_element_index_uint: Extension<OESElementIndexUint> = 'OES_element_index_uint';
+	var OES_standard_derivatives: Extension<OESStandardDerivatives> = 'OES_standard_derivatives';
+	var OES_texture_float: Extension<OESTextureFloat> = 'OES_texture_float';
+	var OES_texture_float_linear: Extension<OESTextureFloatLinear> = 'OES_texture_float_linear';
+	var OES_texture_half_float: Extension<OESTextureHalfFloat> = 'OES_texture_half_float';
+	var OES_texture_half_float_linear: Extension<OESTextureHalfFloatLinear> = 'OES_texture_half_float_linear';
+	var OES_vertex_array_object: Extension<OESVertexArrayObject> = 'OES_vertex_array_object';
+	var WEBGL_color_buffer_float: Extension<WEBGLColorBufferFloat> = 'WEBGL_color_buffer_float';
+	var WEBGL_compressed_texture_astc: Extension<WEBGLCompressedTextureAstc> = 'WEBGL_compressed_texture_astc';
+	var WEBGL_compressed_texture_atc: Extension<WEBGLCompressedTextureAtc> = 'WEBGL_compressed_texture_atc';
+	var WEBGL_compressed_texture_etc: Extension<WEBGLCompressedTextureEtc> = 'WEBGL_compressed_texture_etc';
+	var WEBGL_compressed_texture_etc1: Extension<WEBGLCompressedTextureEtc1> = 'WEBGL_compressed_texture_etc1';
+	var WEBGL_compressed_texture_pvrtc: Extension<WEBGLCompressedTexturePvrtc> = 'WEBGL_compressed_texture_pvrtc';
+	var WEBGL_compressed_texture_s3tc: Extension<WEBGLCompressedTextureS3tc> = 'WEBGL_compressed_texture_s3tc';
+	var WEBGL_compressed_texture_s3tc_srgb: Extension<WEBGLCompressedTextureS3tcSrgb> = 'WEBGL_compressed_texture_s3tc_srgb';
+	var WEBGL_debug_renderer_info: Extension<WEBGLDebugRendererInfo> = 'WEBGL_debug_renderer_info';
+	var WEBGL_debug_shaders: Extension<WEBGLDebugShaders> = 'WEBGL_debug_shaders';
+	var WEBGL_depth_texture: Extension<WEBGLDepthTexture> = 'WEBGL_depth_texture';
+	var WEBGL_draw_buffers: Extension<WEBGLDrawBuffers> = 'WEBGL_draw_buffers';
+	var WEBGL_lose_context: Extension<WEBGLLoseContext> = 'WEBGL_lose_context';
+}
diff --git a/std/js/html/webgl/ExtensionTextureHalfFloatLinear.hx b/std/js/html/webgl/ExtensionTextureHalfFloatLinear.hx
deleted file mode 100644
index 2a1f9806b98fdeb4869f68290b6e909711163e54..0000000000000000000000000000000000000000
--- a/std/js/html/webgl/ExtensionTextureHalfFloatLinear.hx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
-
-package js.html.webgl;
-
-/**
-	The `OES_texture_half_float_linear` extension is part of the WebGL API and allows linear filtering with half floating-point pixel types for textures.
-
-	Documentation [OES_texture_half_float_linear](https://developer.mozilla.org/en-US/docs/Web/API/OES_texture_half_float_linear) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/OES_texture_half_float_linear$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
-
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/OES_texture_half_float_linear>
-**/
-@:native("OES_texture_half_float_linear")
-extern class ExtensionTextureHalfFloatLinear
-{
-}
\ No newline at end of file
diff --git a/std/js/html/webgl/Framebuffer.hx b/std/js/html/webgl/Framebuffer.hx
index c3f5def939ea5c8a05e41db913b8e49e72e2d10c..beea392eca76f96c79f7417bc827c03f67881268 100644
--- a/std/js/html/webgl/Framebuffer.hx
+++ b/std/js/html/webgl/Framebuffer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLFramebuffer>
 **/
 @:native("WebGLFramebuffer")
-extern class Framebuffer
-{
+extern class Framebuffer {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/GL.hx b/std/js/html/webgl/GL.hx
index 477f1226ded0a8801c42dec2eaabde2a4337c50f..c4921285ab757396477dad91b68f1170bd5b4485 100644
--- a/std/js/html/webgl/GL.hx
+++ b/std/js/html/webgl/GL.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/js/html/webgl/GL2.hx b/std/js/html/webgl/GL2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4420b1be6d129f6edad3e00be1985275474c1d72
--- /dev/null
+++ b/std/js/html/webgl/GL2.hx
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C)2005-2019 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 js.html.webgl;
+
+/** An alias for accessing GL constants more naturally. */
+typedef GL2 = WebGL2RenderingContext;
diff --git a/std/js/html/webgl/PowerPreference.hx b/std/js/html/webgl/PowerPreference.hx
new file mode 100644
index 0000000000000000000000000000000000000000..206425751d256dc15443ff8fc72a634d07d0fa30
--- /dev/null
+++ b/std/js/html/webgl/PowerPreference.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl;
+
+enum abstract PowerPreference(String) {
+	var DEFAULT = "default";
+	var LOW_POWER = "low-power";
+	var HIGH_PERFORMANCE = "high-performance";
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/Program.hx b/std/js/html/webgl/Program.hx
index 072cd2e88666c24891052ac0bb7fcaf7cedabe33..b5cc0bb889773d92b5d03c3caccdbd3e4c993d98 100644
--- a/std/js/html/webgl/Program.hx
+++ b/std/js/html/webgl/Program.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLProgram>
 **/
 @:native("WebGLProgram")
-extern class Program
-{
+extern class Program {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionTextureFloat.hx b/std/js/html/webgl/Query.hx
similarity index 66%
rename from std/js/html/webgl/ExtensionTextureFloat.hx
rename to std/js/html/webgl/Query.hx
index 4993a68edb0c9615fd5034aca394f056dcf8bcd8..f5a7f9f26e1588684d703080c583d9371e4ea357 100644
--- a/std/js/html/webgl/ExtensionTextureFloat.hx
+++ b/std/js/html/webgl/Query.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,13 +25,12 @@
 package js.html.webgl;
 
 /**
-	The `OES_texture_float` extension is part of the WebGL API and exposes floating-point pixel types for textures.
+	The `WebGLQuery` interface is part of the WebGL 2 API and provides ways to asynchronously query for information. By default, occlusion queries and primitive queries are available.
 
-	Documentation [OES_texture_float](https://developer.mozilla.org/en-US/docs/Web/API/OES_texture_float) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/OES_texture_float$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [WebGLQuery](https://developer.mozilla.org/en-US/docs/Web/API/WebGLQuery) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WebGLQuery$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/OES_texture_float>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLQuery>
 **/
-@:native("OES_texture_float")
-extern class ExtensionTextureFloat
-{
+@:native("WebGLQuery")
+extern class Query {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/Renderbuffer.hx b/std/js/html/webgl/Renderbuffer.hx
index 9135ae7bfd5ad98196d4e5d8314dca5c6f08688b..7d05801c51f91c5dabee0b51ce27b82900d04c98 100644
--- a/std/js/html/webgl/Renderbuffer.hx
+++ b/std/js/html/webgl/Renderbuffer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLRenderbuffer>
 **/
 @:native("WebGLRenderbuffer")
-extern class Renderbuffer
-{
+extern class Renderbuffer {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/RenderingContext.hx b/std/js/html/webgl/RenderingContext.hx
index 07783ac6b4d0915d5f369ee152d6975de72e6d0d..0e096b868507004921b9b6bf96f5a798574a98b1 100644
--- a/std/js/html/webgl/RenderingContext.hx
+++ b/std/js/html/webgl/RenderingContext.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,15 +25,14 @@
 package js.html.webgl;
 
 /**
-	The WebGLRenderingContext interface provides the OpenGL ES 2.0 rendering context for the drawing surface of an HTML `canvas` element.
+	The `WebGLRenderingContext` interface provides the OpenGL ES 2.0 rendering context for the drawing surface of an HTML `canvas` element.
 
 	Documentation [WebGLRenderingContext](https://developer.mozilla.org/en-US/docs/Web/API/WebGLRenderingContext) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WebGLRenderingContext$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLRenderingContext>
 **/
 @:native("WebGLRenderingContext")
-extern class RenderingContext
-{
+extern class RenderingContext {
 	static inline var DEPTH_BUFFER_BIT : Int = 256;
 	static inline var STENCIL_BUFFER_BIT : Int = 1024;
 	static inline var COLOR_BUFFER_BIT : Int = 16384;
@@ -296,7 +295,6 @@ extern class RenderingContext
 	static inline var RGB5_A1 : Int = 32855;
 	static inline var RGB565 : Int = 36194;
 	static inline var DEPTH_COMPONENT16 : Int = 33189;
-	static inline var STENCIL_INDEX : Int = 6401;
 	static inline var STENCIL_INDEX8 : Int = 36168;
 	static inline var DEPTH_STENCIL : Int = 34041;
 	static inline var RENDERBUFFER_WIDTH : Int = 36162;
@@ -332,179 +330,619 @@ extern class RenderingContext
 	static inline var UNPACK_COLORSPACE_CONVERSION_WEBGL : Int = 37443;
 	static inline var BROWSER_DEFAULT_WEBGL : Int = 37444;
 	
+	
+	/**
+		A read-only back-reference to the `HTMLCanvasElement`. Might be `null` if it is not associated with a `canvas` element.
+	**/
 	var canvas(default,null) : js.html.CanvasElement;
+	
+	/**
+		The read-only width of the current drawing buffer. Should match the width of the canvas element associated with this context.
+	**/
 	var drawingBufferWidth(default,null) : Int;
+	
+	/**
+		The read-only height of the current drawing buffer. Should match the height of the canvas element associated with this context.
+	**/
 	var drawingBufferHeight(default,null) : Int;
 	
+	
+	/**
+		Updates buffer data.
+	**/
+	@:overload( function( target : Int, size : Int, usage : Int ) : Void {} )
+	@:overload( function( target : Int, data : js.lib.ArrayBuffer, usage : Int ) : Void {} )
+	function bufferData( target : Int, data : js.lib.ArrayBufferView, usage : Int ) : Void;
+	
+	/**
+		Updates buffer data starting at a passed offset.
+	**/
+	@:overload( function( target : Int, offset : Int, data : js.lib.ArrayBuffer ) : Void {} )
+	function bufferSubData( target : Int, offset : Int, data : js.lib.ArrayBufferView ) : Void;
+	
+	/**
+		Specifies a 2D texture image in a compressed format.
+	**/
+	function compressedTexImage2D( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, data : js.lib.ArrayBufferView ) : Void;
+	
+	/**
+		Specifies a 2D texture sub-image in a compressed format.
+	**/
+	function compressedTexSubImage2D( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, data : js.lib.ArrayBufferView ) : Void;
+	
+	/**
+		Reads a block of pixels from the `WebGLFrameBuffer`.
+		@throws DOMError
+	**/
+	function readPixels( x : Int, y : Int, width : Int, height : Int, format : Int, type : Int, pixels : js.lib.ArrayBufferView ) : Void;
+	
+	/**
+		Specifies a 2D texture image.
+		@throws DOMError
+	**/
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, format : Int, type : Int, pixels : js.lib.ArrayBufferView ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, pixels : js.html.ImageBitmap ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, pixels : js.html.ImageData ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, image : js.html.ImageElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, canvas : js.html.CanvasElement ) : Void {} )
+	function texImage2D( target : Int, level : Int, internalformat : Int, format : Int, type : Int, video : js.html.VideoElement ) : Void;
+	
+	/**
+		Updates a sub-rectangle of the current `WebGLTexture`.
+		@throws DOMError
+	**/
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, type : Int, pixels : js.lib.ArrayBufferView ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, pixels : js.html.ImageBitmap ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, pixels : js.html.ImageData ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, image : js.html.ImageElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, canvas : js.html.CanvasElement ) : Void {} )
+	function texSubImage2D( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, video : js.html.VideoElement ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Float>) : Void {} )
+	function uniform1fv( location : UniformLocation, data : js.lib.Float32Array ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Float>) : Void {} )
+	function uniform2fv( location : UniformLocation, data : js.lib.Float32Array ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Float>) : Void {} )
+	function uniform3fv( location : UniformLocation, data : js.lib.Float32Array ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Float>) : Void {} )
+	function uniform4fv( location : UniformLocation, data : js.lib.Float32Array ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>) : Void {} )
+	function uniform1iv( location : UniformLocation, data : js.lib.Int32Array ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>) : Void {} )
+	function uniform2iv( location : UniformLocation, data : js.lib.Int32Array ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>) : Void {} )
+	function uniform3iv( location : UniformLocation, data : js.lib.Int32Array ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>) : Void {} )
+	function uniform4iv( location : UniformLocation, data : js.lib.Int32Array ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>) : Void {} )
+	function uniformMatrix2fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>) : Void {} )
+	function uniformMatrix3fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>) : Void {} )
+	function uniformMatrix4fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array ) : Void;
+	
+	/**
+		Returns a `WebGLContextAttributes` object that contains the actual context parameters. Might return `null`, if the context is lost.
+	**/
 	function getContextAttributes() : ContextAttributes;
+	
+	/**
+		Returns `true` if the context is lost, otherwise returns `false`.
+	**/
 	function isContextLost() : Bool;
+	
+	/**
+		Returns an `Array` of `DOMString` elements with all the supported WebGL extensions.
+	**/
 	function getSupportedExtensions() : Array<String>;
-	/** @throws DOMError */
-	function getExtension( name : String ) : Dynamic;
+	
+	/**
+		Returns an extension object.
+		@throws DOMError
+	**/
+	function getExtension<T>( name : Extension<T> ) : T;
+	
+	/**
+		Selects the active texture unit.
+	**/
 	function activeTexture( texture : Int ) : Void;
+	
+	/**
+		Attaches a `WebGLShader` to a `WebGLProgram`.
+	**/
 	function attachShader( program : Program, shader : Shader ) : Void;
+	
+	/**
+		Binds a generic vertex index to a named attribute variable.
+	**/
 	function bindAttribLocation( program : Program, index : Int, name : String ) : Void;
+	
+	/**
+		Binds a `WebGLBuffer` object to a given target.
+	**/
 	function bindBuffer( target : Int, buffer : Buffer ) : Void;
+	
+	/**
+		Binds a `WebGLFrameBuffer` object to a given target.
+	**/
 	function bindFramebuffer( target : Int, framebuffer : Framebuffer ) : Void;
+	
+	/**
+		Binds a `WebGLRenderBuffer` object to a given target.
+	**/
 	function bindRenderbuffer( target : Int, renderbuffer : Renderbuffer ) : Void;
+	
+	/**
+		Binds a `WebGLTexture` object to a given target.
+	**/
 	function bindTexture( target : Int, texture : Texture ) : Void;
+	
+	/**
+		Sets the source and destination blending factors.
+	**/
 	function blendColor( red : Float, green : Float, blue : Float, alpha : Float ) : Void;
+	
+	/**
+		Sets both the RGB blend equation and alpha blend equation to a single equation.
+	**/
 	function blendEquation( mode : Int ) : Void;
+	
+	/**
+		Sets the RGB blend equation and alpha blend equation separately.
+	**/
 	function blendEquationSeparate( modeRGB : Int, modeAlpha : Int ) : Void;
+	
+	/**
+		Defines which function is used for blending pixel arithmetic.
+	**/
 	function blendFunc( sfactor : Int, dfactor : Int ) : Void;
+	
+	/**
+		Defines which function is used for blending pixel arithmetic for RGB and alpha components separately.
+	**/
 	function blendFuncSeparate( srcRGB : Int, dstRGB : Int, srcAlpha : Int, dstAlpha : Int ) : Void;
-	@:overload( function( target : Int, size : Int, usage : Int ) : Void {} )
-	@:overload( function( target : Int, data : js.html.ArrayBufferView, usage : Int ) : Void {} )
-	@:overload( function( target : Int, data : js.html.ArrayBuffer, usage : Int ) : Void {} )
-	function bufferData( target : Int, data : Dynamic/*MISSING SharedArrayBuffer*/, usage : Int ) : Void;
-	@:overload( function( target : Int, offset : Int, data : js.html.ArrayBufferView ) : Void {} )
-	@:overload( function( target : Int, offset : Int, data : js.html.ArrayBuffer ) : Void {} )
-	function bufferSubData( target : Int, offset : Int, data : Dynamic/*MISSING SharedArrayBuffer*/ ) : Void;
+	
+	/**
+		Returns the status of the framebuffer.
+	**/
 	function checkFramebufferStatus( target : Int ) : Int;
+	
+	/**
+		Clears specified buffers to preset values.
+	**/
 	function clear( mask : Int ) : Void;
+	
+	/**
+		Specifies the color values used when clearing color buffers.
+	**/
 	function clearColor( red : Float, green : Float, blue : Float, alpha : Float ) : Void;
+	
+	/**
+		Specifies the depth value used when clearing the depth buffer.
+	**/
 	function clearDepth( depth : Float ) : Void;
+	
+	/**
+		Specifies the stencil value used when clearing the stencil buffer.
+	**/
 	function clearStencil( s : Int ) : Void;
+	
+	/**
+		Sets which color components to enable or to disable when drawing or rendering to a `WebGLFramebuffer`.
+	**/
 	function colorMask( red : Bool, green : Bool, blue : Bool, alpha : Bool ) : Void;
+	
+	/**
+		Compiles a `WebGLShader`.
+	**/
 	function compileShader( shader : Shader ) : Void;
-	function compressedTexImage2D( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, data : js.html.ArrayBufferView ) : Void;
-	function compressedTexSubImage2D( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, data : js.html.ArrayBufferView ) : Void;
+	
+	/**
+		Copies a 2D texture image.
+	**/
 	function copyTexImage2D( target : Int, level : Int, internalformat : Int, x : Int, y : Int, width : Int, height : Int, border : Int ) : Void;
+	
+	/**
+		Copies a 2D texture sub-image.
+	**/
 	function copyTexSubImage2D( target : Int, level : Int, xoffset : Int, yoffset : Int, x : Int, y : Int, width : Int, height : Int ) : Void;
+	
+	/**
+		Creates a `WebGLBuffer` object.
+	**/
 	function createBuffer() : Buffer;
+	
+	/**
+		Creates a `WebGLFrameBuffer` object.
+	**/
 	function createFramebuffer() : Framebuffer;
+	
+	/**
+		Creates a `WebGLProgram`.
+	**/
 	function createProgram() : Program;
+	
+	/**
+		Creates a `WebGLRenderBuffer` object.
+	**/
 	function createRenderbuffer() : Renderbuffer;
+	
+	/**
+		Creates a `WebGLShader`.
+	**/
 	function createShader( type : Int ) : Shader;
+	
+	/**
+		Creates a `WebGLTexture` object.
+	**/
 	function createTexture() : Texture;
+	
+	/**
+		Specifies whether or not front- and/or back-facing polygons can be culled.
+	**/
 	function cullFace( mode : Int ) : Void;
+	
+	/**
+		Deletes a `WebGLBuffer` object.
+	**/
 	function deleteBuffer( buffer : Buffer ) : Void;
+	
+	/**
+		Deletes a `WebGLFrameBuffer` object.
+	**/
 	function deleteFramebuffer( framebuffer : Framebuffer ) : Void;
+	
+	/**
+		Deletes a `WebGLProgram`.
+	**/
 	function deleteProgram( program : Program ) : Void;
+	
+	/**
+		Deletes a `WebGLRenderBuffer` object.
+	**/
 	function deleteRenderbuffer( renderbuffer : Renderbuffer ) : Void;
+	
+	/**
+		Deletes a `WebGLShader`.
+	**/
 	function deleteShader( shader : Shader ) : Void;
+	
+	/**
+		Deletes a `WebGLTexture` object.
+	**/
 	function deleteTexture( texture : Texture ) : Void;
+	
+	/**
+		Specifies a function that compares incoming pixel depth to the current depth buffer value.
+	**/
 	function depthFunc( func : Int ) : Void;
+	
+	/**
+		Sets whether writing into the depth buffer is enabled or disabled.
+	**/
 	function depthMask( flag : Bool ) : Void;
+	
+	/**
+		Specifies the depth range mapping from normalized device coordinates to window or viewport coordinates.
+	**/
 	function depthRange( zNear : Float, zFar : Float ) : Void;
+	
+	/**
+		Detaches a `WebGLShader`.
+	**/
 	function detachShader( program : Program, shader : Shader ) : Void;
+	
+	/**
+		Disables specific WebGL capabilities for this context.
+	**/
 	function disable( cap : Int ) : Void;
+	
+	/**
+		Disables a vertex attribute array at a given position.
+	**/
 	function disableVertexAttribArray( index : Int ) : Void;
+	
+	/**
+		Renders primitives from array data.
+	**/
 	function drawArrays( mode : Int, first : Int, count : Int ) : Void;
+	
+	/**
+		Renders primitives from element array data.
+	**/
 	function drawElements( mode : Int, count : Int, type : Int, offset : Int ) : Void;
+	
+	/**
+		Enables specific WebGL capabilities for this context.
+	**/
 	function enable( cap : Int ) : Void;
+	
+	/**
+		Enables a vertex attribute array at a given position.
+	**/
 	function enableVertexAttribArray( index : Int ) : Void;
+	
+	/**
+		Blocks execution until all previously called commands are finished.
+	**/
 	function finish() : Void;
+	
+	/**
+		Empties different buffer commands, causing all commands to be executed as quickly as possible.
+	**/
 	function flush() : Void;
+	
+	/**
+		Attaches a `WebGLRenderingBuffer` object to a `WebGLFrameBuffer` object.
+	**/
 	function framebufferRenderbuffer( target : Int, attachment : Int, renderbuffertarget : Int, renderbuffer : Renderbuffer ) : Void;
+	
+	/**
+		Attaches a textures image to a `WebGLFrameBuffer` object.
+	**/
 	function framebufferTexture2D( target : Int, attachment : Int, textarget : Int, texture : Texture, level : Int ) : Void;
+	
+	/**
+		Specifies whether polygons are front- or back-facing by setting a winding orientation.
+	**/
 	function frontFace( mode : Int ) : Void;
+	
+	/**
+		Generates a set of mipmaps for a `WebGLTexture` object.
+	**/
 	function generateMipmap( target : Int ) : Void;
+	
+	/**
+		Returns information about an active attribute variable.
+	**/
 	function getActiveAttrib( program : Program, index : Int ) : ActiveInfo;
+	
+	/**
+		Returns information about an active uniform variable.
+	**/
 	function getActiveUniform( program : Program, index : Int ) : ActiveInfo;
+	
+	/**
+		Returns a list of `WebGLShader` objects attached to a `WebGLProgram`.
+	**/
 	function getAttachedShaders( program : Program ) : Array<Shader>;
+	
+	/**
+		Returns the location of an attribute variable.
+	**/
 	function getAttribLocation( program : Program, name : String ) : Int;
+	
+	/**
+		Returns information about the buffer.
+	**/
 	function getBufferParameter( target : Int, pname : Int ) : Dynamic;
-	/** @throws DOMError */
+	
+	/**
+		Returns a value for the passed parameter name.
+		@throws DOMError
+	**/
 	function getParameter( pname : Int ) : Dynamic;
+	
+	/**
+		Returns error information.
+	**/
 	function getError() : Int;
-	/** @throws DOMError */
+	
+	/**
+		Returns information about the framebuffer.
+		@throws DOMError
+	**/
 	function getFramebufferAttachmentParameter( target : Int, attachment : Int, pname : Int ) : Dynamic;
+	
+	/**
+		Returns information about the program.
+	**/
 	function getProgramParameter( program : Program, pname : Int ) : Dynamic;
+	
+	/**
+		Returns the information log for a `WebGLProgram` object.
+	**/
 	function getProgramInfoLog( program : Program ) : String;
+	
+	/**
+		Returns information about the renderbuffer.
+	**/
 	function getRenderbufferParameter( target : Int, pname : Int ) : Dynamic;
+	
+	/**
+		Returns information about the shader.
+	**/
 	function getShaderParameter( shader : Shader, pname : Int ) : Dynamic;
+	
+	/**
+		Returns a `WebGLShaderPrecisionFormat` object describing the precision for the numeric format of the shader.
+	**/
 	function getShaderPrecisionFormat( shadertype : Int, precisiontype : Int ) : ShaderPrecisionFormat;
+	
+	/**
+		Returns the information log for a `WebGLShader` object.
+	**/
 	function getShaderInfoLog( shader : Shader ) : String;
+	
+	/**
+		Returns the source code of a `WebGLShader` as a string.
+	**/
 	function getShaderSource( shader : Shader ) : String;
+	
+	/**
+		Returns information about the texture.
+	**/
 	function getTexParameter( target : Int, pname : Int ) : Dynamic;
+	
+	/**
+		Returns the value of a uniform variable at a given location.
+	**/
 	function getUniform( program : Program, location : UniformLocation ) : Dynamic;
+	
+	/**
+		Returns the location of a uniform variable.
+	**/
 	function getUniformLocation( program : Program, name : String ) : UniformLocation;
-	/** @throws DOMError */
+	
+	/**
+		Returns information about a vertex attribute at a given position.
+		@throws DOMError
+	**/
 	function getVertexAttrib( index : Int, pname : Int ) : Dynamic;
+	
+	/**
+		Returns the address of a given vertex attribute.
+	**/
 	function getVertexAttribOffset( index : Int, pname : Int ) : Int;
+	
+	/**
+		Specifies hints for certain behaviors. The interpretation of these hints depend on the implementation.
+	**/
 	function hint( target : Int, mode : Int ) : Void;
+	
+	/**
+		Returns a Boolean indicating if the passed buffer is valid.
+	**/
 	function isBuffer( buffer : Buffer ) : Bool;
+	
+	/**
+		Tests whether a specific WebGL capability is enabled or not for this context.
+	**/
 	function isEnabled( cap : Int ) : Bool;
+	
+	/**
+		Returns a Boolean indicating if the passed `WebGLFrameBuffer` object is valid.
+	**/
 	function isFramebuffer( framebuffer : Framebuffer ) : Bool;
+	
+	/**
+		Returns a Boolean indicating if the passed `WebGLProgram` is valid.
+	**/
 	function isProgram( program : Program ) : Bool;
+	
+	/**
+		Returns a Boolean indicating if the passed `WebGLRenderingBuffer` is valid.
+	**/
 	function isRenderbuffer( renderbuffer : Renderbuffer ) : Bool;
+	
+	/**
+		Returns a Boolean indicating if the passed `WebGLShader` is valid.
+	**/
 	function isShader( shader : Shader ) : Bool;
+	
+	/**
+		Returns a Boolean indicating if the passed `WebGLTexture` is valid.
+	**/
 	function isTexture( texture : Texture ) : Bool;
+	
+	/**
+		Sets the line width of rasterized lines.
+	**/
 	function lineWidth( width : Float ) : Void;
+	
+	/**
+		Links the passed `WebGLProgram` object.
+	**/
 	function linkProgram( program : Program ) : Void;
+	
+	/**
+		Specifies the pixel storage modes
+	**/
 	function pixelStorei( pname : Int, param : Int ) : Void;
+	
+	/**
+		Specifies the scale factors and units to calculate depth values.
+	**/
 	function polygonOffset( factor : Float, units : Float ) : Void;
-	/** @throws DOMError */
-	function readPixels( x : Int, y : Int, width : Int, height : Int, format : Int, type : Int, pixels : js.html.ArrayBufferView ) : Void;
+	
+	/**
+		Creates a renderbuffer data store.
+	**/
 	function renderbufferStorage( target : Int, internalformat : Int, width : Int, height : Int ) : Void;
+	
+	/**
+		Specifies multi-sample coverage parameters for anti-aliasing effects.
+	**/
 	function sampleCoverage( value : Float, invert : Bool ) : Void;
+	
+	/**
+		Defines the scissor box.
+	**/
 	function scissor( x : Int, y : Int, width : Int, height : Int ) : Void;
+	
+	/**
+		Sets the source code in a `WebGLShader`.
+	**/
 	function shaderSource( shader : Shader, source : String ) : Void;
+	
+	/**
+		Sets the both front and back function and reference value for stencil testing.
+	**/
 	function stencilFunc( func : Int, ref : Int, mask : Int ) : Void;
+	
+	/**
+		Sets the front and/or back function and reference value for stencil testing.
+	**/
 	function stencilFuncSeparate( face : Int, func : Int, ref : Int, mask : Int ) : Void;
+	
+	/**
+		Controls enabling and disabling of both the front and back writing of individual bits in the stencil planes.
+	**/
 	function stencilMask( mask : Int ) : Void;
+	
+	/**
+		Controls enabling and disabling of front and/or back writing of individual bits in the stencil planes.
+	**/
 	function stencilMaskSeparate( face : Int, mask : Int ) : Void;
+	
+	/**
+		Sets both the front and back-facing stencil test actions.
+	**/
 	function stencilOp( fail : Int, zfail : Int, zpass : Int ) : Void;
+	
+	/**
+		Sets the front and/or back-facing stencil test actions.
+	**/
 	function stencilOpSeparate( face : Int, fail : Int, zfail : Int, zpass : Int ) : Void;
-	/** @throws DOMError */
-	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, format : Int, type : Int, pixels : js.html.ArrayBufferView ) : Void {} )
-	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, pixels : js.html.ImageData ) : Void {} )
-	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, image : js.html.ImageElement ) : Void {} )
-	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, canvas : js.html.CanvasElement ) : Void {} )
-	function texImage2D( target : Int, level : Int, internalformat : Int, format : Int, type : Int, video : js.html.VideoElement ) : Void;
 	function texParameterf( target : Int, pname : Int, param : Float ) : Void;
 	function texParameteri( target : Int, pname : Int, param : Int ) : Void;
-	/** @throws DOMError */
-	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, type : Int, pixels : js.html.ArrayBufferView ) : Void {} )
-	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, pixels : js.html.ImageData ) : Void {} )
-	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, image : js.html.ImageElement ) : Void {} )
-	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, canvas : js.html.CanvasElement ) : Void {} )
-	function texSubImage2D( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, video : js.html.VideoElement ) : Void;
 	function uniform1f( location : UniformLocation, x : Float ) : Void;
-	@:overload( function( location : UniformLocation, v : js.html.Float32Array ) : Void {} )
-	function uniform1fv( location : UniformLocation, v : Array<Float> ) : Void;
-	function uniform1i( location : UniformLocation, x : Int ) : Void;
-	@:overload( function( location : UniformLocation, v : js.html.Int32Array ) : Void {} )
-	function uniform1iv( location : UniformLocation, v : Array<Int> ) : Void;
 	function uniform2f( location : UniformLocation, x : Float, y : Float ) : Void;
-	@:overload( function( location : UniformLocation, v : js.html.Float32Array ) : Void {} )
-	function uniform2fv( location : UniformLocation, v : Array<Float> ) : Void;
-	function uniform2i( location : UniformLocation, x : Int, y : Int ) : Void;
-	@:overload( function( location : UniformLocation, v : js.html.Int32Array ) : Void {} )
-	function uniform2iv( location : UniformLocation, v : Array<Int> ) : Void;
 	function uniform3f( location : UniformLocation, x : Float, y : Float, z : Float ) : Void;
-	@:overload( function( location : UniformLocation, v : js.html.Float32Array ) : Void {} )
-	function uniform3fv( location : UniformLocation, v : Array<Float> ) : Void;
-	function uniform3i( location : UniformLocation, x : Int, y : Int, z : Int ) : Void;
-	@:overload( function( location : UniformLocation, v : js.html.Int32Array ) : Void {} )
-	function uniform3iv( location : UniformLocation, v : Array<Int> ) : Void;
 	function uniform4f( location : UniformLocation, x : Float, y : Float, z : Float, w : Float ) : Void;
-	@:overload( function( location : UniformLocation, v : js.html.Float32Array ) : Void {} )
-	function uniform4fv( location : UniformLocation, v : Array<Float> ) : Void;
+	function uniform1i( location : UniformLocation, x : Int ) : Void;
+	function uniform2i( location : UniformLocation, x : Int, y : Int ) : Void;
+	function uniform3i( location : UniformLocation, x : Int, y : Int, z : Int ) : Void;
 	function uniform4i( location : UniformLocation, x : Int, y : Int, z : Int, w : Int ) : Void;
-	@:overload( function( location : UniformLocation, v : js.html.Int32Array ) : Void {} )
-	function uniform4iv( location : UniformLocation, v : Array<Int> ) : Void;
-	@:overload( function( location : UniformLocation, transpose : Bool, value : js.html.Float32Array ) : Void {} )
-	function uniformMatrix2fv( location : UniformLocation, transpose : Bool, value : Array<Float> ) : Void;
-	@:overload( function( location : UniformLocation, transpose : Bool, value : js.html.Float32Array ) : Void {} )
-	function uniformMatrix3fv( location : UniformLocation, transpose : Bool, value : Array<Float> ) : Void;
-	@:overload( function( location : UniformLocation, transpose : Bool, value : js.html.Float32Array ) : Void {} )
-	function uniformMatrix4fv( location : UniformLocation, transpose : Bool, value : Array<Float> ) : Void;
+	
+	/**
+		Uses the specified `WebGLProgram` as part the current rendering state.
+	**/
 	function useProgram( program : Program ) : Void;
+	
+	/**
+		Validates a `WebGLProgram`.
+	**/
 	function validateProgram( program : Program ) : Void;
 	function vertexAttrib1f( indx : Int, x : Float ) : Void;
-	@:overload( function( indx : Int, values : js.html.Float32Array ) : Void {} )
-	function vertexAttrib1fv( indx : Int, values : Array<Float> ) : Void;
+	@:overload( function( indx : Int, values : Array<Float>) : Void {} )
+	function vertexAttrib1fv( indx : Int, values : js.lib.Float32Array ) : Void;
 	function vertexAttrib2f( indx : Int, x : Float, y : Float ) : Void;
-	@:overload( function( indx : Int, values : js.html.Float32Array ) : Void {} )
-	function vertexAttrib2fv( indx : Int, values : Array<Float> ) : Void;
+	@:overload( function( indx : Int, values : Array<Float>) : Void {} )
+	function vertexAttrib2fv( indx : Int, values : js.lib.Float32Array ) : Void;
 	function vertexAttrib3f( indx : Int, x : Float, y : Float, z : Float ) : Void;
-	@:overload( function( indx : Int, values : js.html.Float32Array ) : Void {} )
-	function vertexAttrib3fv( indx : Int, values : Array<Float> ) : Void;
+	@:overload( function( indx : Int, values : Array<Float>) : Void {} )
+	function vertexAttrib3fv( indx : Int, values : js.lib.Float32Array ) : Void;
 	function vertexAttrib4f( indx : Int, x : Float, y : Float, z : Float, w : Float ) : Void;
-	@:overload( function( indx : Int, values : js.html.Float32Array ) : Void {} )
-	function vertexAttrib4fv( indx : Int, values : Array<Float> ) : Void;
+	@:overload( function( indx : Int, values : Array<Float>) : Void {} )
+	function vertexAttrib4fv( indx : Int, values : js.lib.Float32Array ) : Void;
+	
+	/**
+		Specifies the data formats and locations of vertex attributes in a vertex attributes array.
+	**/
 	function vertexAttribPointer( indx : Int, size : Int, type : Int, normalized : Bool, stride : Int, offset : Int ) : Void;
+	
+	/**
+		Sets the viewport.
+	**/
 	function viewport( x : Int, y : Int, width : Int, height : Int ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionFragDepth.hx b/std/js/html/webgl/Sampler.hx
similarity index 62%
rename from std/js/html/webgl/ExtensionFragDepth.hx
rename to std/js/html/webgl/Sampler.hx
index da80d2bddbaeb30a4e052bc0522808f7f076f9ad..6b55f1de1dd39c3950279dff233507efab654d18 100644
--- a/std/js/html/webgl/ExtensionFragDepth.hx
+++ b/std/js/html/webgl/Sampler.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,18 +20,17 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+// This file is generated from mozilla\WebGL2RenderingContext.webidl. Do not edit!
 
 package js.html.webgl;
 
 /**
-	The `EXT_frag_depth` extension is part of the WebGL API and enables to set a depth value of a fragment from within the fragment shader.
+	The `WebGLSampler` interface is part of the WebGL 2 API and stores sampling parameters for `WebGLTexture` access inside of a shader.
 
-	Documentation [EXT_frag_depth](https://developer.mozilla.org/en-US/docs/Web/API/EXT_frag_depth) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/EXT_frag_depth$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [WebGLSampler](https://developer.mozilla.org/en-US/docs/Web/API/WebGLSampler) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WebGLSampler$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/EXT_frag_depth>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLSampler>
 **/
-@:native("EXT_frag_depth")
-extern class ExtensionFragDepth
-{
+@:native("WebGLSampler")
+extern class Sampler {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/Shader.hx b/std/js/html/webgl/Shader.hx
index 9d5ae2a675d3676bb44b823e1742a3922dd086a1..88d4eb3e5efe0de1c180c5ddaf97fd17fb2d294b 100644
--- a/std/js/html/webgl/Shader.hx
+++ b/std/js/html/webgl/Shader.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLShader>
 **/
 @:native("WebGLShader")
-extern class Shader
-{
+extern class Shader {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ShaderPrecisionFormat.hx b/std/js/html/webgl/ShaderPrecisionFormat.hx
index 1e1d5932009714a608a98197f8c52cf3d75cb21f..a94d1915eb65939c0b3582fa219ef1e0dab8ed2f 100644
--- a/std/js/html/webgl/ShaderPrecisionFormat.hx
+++ b/std/js/html/webgl/ShaderPrecisionFormat.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,7 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLShaderPrecisionFormat>
 **/
 @:native("WebGLShaderPrecisionFormat")
-extern class ShaderPrecisionFormat
-{
+extern class ShaderPrecisionFormat {
 	
 	/**
 		The base 2 log of the absolute value of the minimum value that can be represented.
diff --git a/std/js/html/webgl/Sync.hx b/std/js/html/webgl/Sync.hx
new file mode 100644
index 0000000000000000000000000000000000000000..11ed57ab48673015f1d095c4088611b14770be41
--- /dev/null
+++ b/std/js/html/webgl/Sync.hx
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGL2RenderingContext.webidl. Do not edit!
+
+package js.html.webgl;
+
+/**
+	The `WebGLSync` interface is part of the WebGL 2 API and is used to synchronize activities between the GPU and the application.
+
+	Documentation [WebGLSync](https://developer.mozilla.org/en-US/docs/Web/API/WebGLSync) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WebGLSync$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLSync>
+**/
+@:native("WebGLSync")
+extern class Sync {
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/Texture.hx b/std/js/html/webgl/Texture.hx
index 7a1057e3b9fe9827df3f4d6ce9b1cac7fbc5a225..fa486ddf4dd8a33bee8d456ba6c03f0f398ced3a 100644
--- a/std/js/html/webgl/Texture.hx
+++ b/std/js/html/webgl/Texture.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLTexture>
 **/
 @:native("WebGLTexture")
-extern class Texture
-{
+extern class Texture {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/TimerQueryEXT.hx b/std/js/html/webgl/TimerQueryEXT.hx
deleted file mode 100644
index c94bc79518102ad7d9e8b11ebd1882bd4dc25a8a..0000000000000000000000000000000000000000
--- a/std/js/html/webgl/TimerQueryEXT.hx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
-
-package js.html.webgl;
-
-/**
-	The `WebGLTimerQueryEXT` interface is part of the WebGL `EXT_disjoint_timer_query` extension and exposes a timer query object.
-
-	Documentation [WebGLTimerQueryEXT](https://developer.mozilla.org/en-US/docs/Web/API/WebGLTimerQueryEXT) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WebGLTimerQueryEXT$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
-
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLTimerQueryEXT>
-**/
-@:native("WebGLTimerQueryEXT")
-extern class TimerQueryEXT
-{
-}
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionShaderTextureLod.hx b/std/js/html/webgl/TransformFeedback.hx
similarity index 58%
rename from std/js/html/webgl/ExtensionShaderTextureLod.hx
rename to std/js/html/webgl/TransformFeedback.hx
index 013bc0d7a4b634b9828db2e8c79bd99a8b5e5be6..754cdaaf66e5df51ee1e434505dac6778ff1d6cf 100644
--- a/std/js/html/webgl/ExtensionShaderTextureLod.hx
+++ b/std/js/html/webgl/TransformFeedback.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,18 +20,17 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+// This file is generated from mozilla\WebGL2RenderingContext.webidl. Do not edit!
 
 package js.html.webgl;
 
 /**
-	The `EXT_shader_texture_lod` extension is part of the WebGL API and adds additional texture functions to the OpenGL ES Shading Language which provide the shader writer with explicit control of LOD (Level of detail).
+	The `WebGLTransformFeedback` interface is part of the WebGL 2 API and enables transform feedback, which is the process of capturing primitives generated by vertex processing. It allows to preserve the post-transform rendering state of an object and resubmit this data multiple times.
 
-	Documentation [EXT_shader_texture_lod](https://developer.mozilla.org/en-US/docs/Web/API/EXT_shader_texture_lod) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/EXT_shader_texture_lod$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [WebGLTransformFeedback](https://developer.mozilla.org/en-US/docs/Web/API/WebGLTransformFeedback) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WebGLTransformFeedback$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/EXT_shader_texture_lod>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLTransformFeedback>
 **/
-@:native("EXT_shader_texture_lod")
-extern class ExtensionShaderTextureLod
-{
+@:native("WebGLTransformFeedback")
+extern class TransformFeedback {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/UniformLocation.hx b/std/js/html/webgl/UniformLocation.hx
index 64ba98097bb699f68d0f89dc29f4ae5298f6ca68..efbef04e91acd74b900a826bbfc80790e428ad4b 100644
--- a/std/js/html/webgl/UniformLocation.hx
+++ b/std/js/html/webgl/UniformLocation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,5 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLUniformLocation>
 **/
 @:native("WebGLUniformLocation")
-extern class UniformLocation
-{
+extern class UniformLocation {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionElementIndexUint.hx b/std/js/html/webgl/VertexArrayObject.hx
similarity index 66%
rename from std/js/html/webgl/ExtensionElementIndexUint.hx
rename to std/js/html/webgl/VertexArrayObject.hx
index ee6edcd86adf692b247e8f32329e44c9686425ce..c5280e3f7aa318a7466549623b85e6e255e1e6f2 100644
--- a/std/js/html/webgl/ExtensionElementIndexUint.hx
+++ b/std/js/html/webgl/VertexArrayObject.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,13 +25,12 @@
 package js.html.webgl;
 
 /**
-	The `OES_element_index_uint` extension is part of the WebGL API and adds support for `gl.UNSIGNED_INT` types to `WebGLRenderingContext.drawElements()`.
+	The `WebGLVertexArrayObject` interface is part of the WebGL 2 API, represents vertex array objects (VAOs) pointing to vertex array data, and provides names for different sets of vertex data.
 
-	Documentation [OES_element_index_uint](https://developer.mozilla.org/en-US/docs/Web/API/OES_element_index_uint) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/OES_element_index_uint$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [WebGLVertexArrayObject](https://developer.mozilla.org/en-US/docs/Web/API/WebGLVertexArrayObject) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WebGLVertexArrayObject$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/OES_element_index_uint>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGLVertexArrayObject>
 **/
-@:native("OES_element_index_uint")
-extern class ExtensionElementIndexUint
-{
+@:native("WebGLVertexArrayObject")
+extern class VertexArrayObject {
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/WebGL2RenderingContext.hx b/std/js/html/webgl/WebGL2RenderingContext.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f93bfd8e8535d5c4663592dbd7183159aae4e33a
--- /dev/null
+++ b/std/js/html/webgl/WebGL2RenderingContext.hx
@@ -0,0 +1,1180 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGL2RenderingContext.webidl. Do not edit!
+
+package js.html.webgl;
+
+/**
+	The WebGL2RenderingContext interface provides the OpenGL ES 3.0 rendering context for the drawing surface of an HTML `canvas` element.
+
+	Documentation [WebGL2RenderingContext](https://developer.mozilla.org/en-US/docs/Web/API/WebGL2RenderingContext) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WebGL2RenderingContext$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/WebGL2RenderingContext>
+**/
+@:native("WebGL2RenderingContext")
+extern class WebGL2RenderingContext extends RenderingContext {
+	static inline var READ_BUFFER : Int = 3074;
+	static inline var UNPACK_ROW_LENGTH : Int = 3314;
+	static inline var UNPACK_SKIP_ROWS : Int = 3315;
+	static inline var UNPACK_SKIP_PIXELS : Int = 3316;
+	static inline var PACK_ROW_LENGTH : Int = 3330;
+	static inline var PACK_SKIP_ROWS : Int = 3331;
+	static inline var PACK_SKIP_PIXELS : Int = 3332;
+	static inline var COLOR : Int = 6144;
+	static inline var DEPTH : Int = 6145;
+	static inline var STENCIL : Int = 6146;
+	static inline var RED : Int = 6403;
+	static inline var RGB8 : Int = 32849;
+	static inline var RGBA8 : Int = 32856;
+	static inline var RGB10_A2 : Int = 32857;
+	static inline var TEXTURE_BINDING_3D : Int = 32874;
+	static inline var UNPACK_SKIP_IMAGES : Int = 32877;
+	static inline var UNPACK_IMAGE_HEIGHT : Int = 32878;
+	static inline var TEXTURE_3D : Int = 32879;
+	static inline var TEXTURE_WRAP_R : Int = 32882;
+	static inline var MAX_3D_TEXTURE_SIZE : Int = 32883;
+	static inline var UNSIGNED_INT_2_10_10_10_REV : Int = 33640;
+	static inline var MAX_ELEMENTS_VERTICES : Int = 33000;
+	static inline var MAX_ELEMENTS_INDICES : Int = 33001;
+	static inline var TEXTURE_MIN_LOD : Int = 33082;
+	static inline var TEXTURE_MAX_LOD : Int = 33083;
+	static inline var TEXTURE_BASE_LEVEL : Int = 33084;
+	static inline var TEXTURE_MAX_LEVEL : Int = 33085;
+	static inline var MIN : Int = 32775;
+	static inline var MAX : Int = 32776;
+	static inline var DEPTH_COMPONENT24 : Int = 33190;
+	static inline var MAX_TEXTURE_LOD_BIAS : Int = 34045;
+	static inline var TEXTURE_COMPARE_MODE : Int = 34892;
+	static inline var TEXTURE_COMPARE_FUNC : Int = 34893;
+	static inline var CURRENT_QUERY : Int = 34917;
+	static inline var QUERY_RESULT : Int = 34918;
+	static inline var QUERY_RESULT_AVAILABLE : Int = 34919;
+	static inline var STREAM_READ : Int = 35041;
+	static inline var STREAM_COPY : Int = 35042;
+	static inline var STATIC_READ : Int = 35045;
+	static inline var STATIC_COPY : Int = 35046;
+	static inline var DYNAMIC_READ : Int = 35049;
+	static inline var DYNAMIC_COPY : Int = 35050;
+	static inline var MAX_DRAW_BUFFERS : Int = 34852;
+	static inline var DRAW_BUFFER0 : Int = 34853;
+	static inline var DRAW_BUFFER1 : Int = 34854;
+	static inline var DRAW_BUFFER2 : Int = 34855;
+	static inline var DRAW_BUFFER3 : Int = 34856;
+	static inline var DRAW_BUFFER4 : Int = 34857;
+	static inline var DRAW_BUFFER5 : Int = 34858;
+	static inline var DRAW_BUFFER6 : Int = 34859;
+	static inline var DRAW_BUFFER7 : Int = 34860;
+	static inline var DRAW_BUFFER8 : Int = 34861;
+	static inline var DRAW_BUFFER9 : Int = 34862;
+	static inline var DRAW_BUFFER10 : Int = 34863;
+	static inline var DRAW_BUFFER11 : Int = 34864;
+	static inline var DRAW_BUFFER12 : Int = 34865;
+	static inline var DRAW_BUFFER13 : Int = 34866;
+	static inline var DRAW_BUFFER14 : Int = 34867;
+	static inline var DRAW_BUFFER15 : Int = 34868;
+	static inline var MAX_FRAGMENT_UNIFORM_COMPONENTS : Int = 35657;
+	static inline var MAX_VERTEX_UNIFORM_COMPONENTS : Int = 35658;
+	static inline var SAMPLER_3D : Int = 35679;
+	static inline var SAMPLER_2D_SHADOW : Int = 35682;
+	static inline var FRAGMENT_SHADER_DERIVATIVE_HINT : Int = 35723;
+	static inline var PIXEL_PACK_BUFFER : Int = 35051;
+	static inline var PIXEL_UNPACK_BUFFER : Int = 35052;
+	static inline var PIXEL_PACK_BUFFER_BINDING : Int = 35053;
+	static inline var PIXEL_UNPACK_BUFFER_BINDING : Int = 35055;
+	static inline var FLOAT_MAT2x3 : Int = 35685;
+	static inline var FLOAT_MAT2x4 : Int = 35686;
+	static inline var FLOAT_MAT3x2 : Int = 35687;
+	static inline var FLOAT_MAT3x4 : Int = 35688;
+	static inline var FLOAT_MAT4x2 : Int = 35689;
+	static inline var FLOAT_MAT4x3 : Int = 35690;
+	static inline var SRGB : Int = 35904;
+	static inline var SRGB8 : Int = 35905;
+	static inline var SRGB8_ALPHA8 : Int = 35907;
+	static inline var COMPARE_REF_TO_TEXTURE : Int = 34894;
+	static inline var RGBA32F : Int = 34836;
+	static inline var RGB32F : Int = 34837;
+	static inline var RGBA16F : Int = 34842;
+	static inline var RGB16F : Int = 34843;
+	static inline var VERTEX_ATTRIB_ARRAY_INTEGER : Int = 35069;
+	static inline var MAX_ARRAY_TEXTURE_LAYERS : Int = 35071;
+	static inline var MIN_PROGRAM_TEXEL_OFFSET : Int = 35076;
+	static inline var MAX_PROGRAM_TEXEL_OFFSET : Int = 35077;
+	static inline var MAX_VARYING_COMPONENTS : Int = 35659;
+	static inline var TEXTURE_2D_ARRAY : Int = 35866;
+	static inline var TEXTURE_BINDING_2D_ARRAY : Int = 35869;
+	static inline var R11F_G11F_B10F : Int = 35898;
+	static inline var UNSIGNED_INT_10F_11F_11F_REV : Int = 35899;
+	static inline var RGB9_E5 : Int = 35901;
+	static inline var UNSIGNED_INT_5_9_9_9_REV : Int = 35902;
+	static inline var TRANSFORM_FEEDBACK_BUFFER_MODE : Int = 35967;
+	static inline var MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS : Int = 35968;
+	static inline var TRANSFORM_FEEDBACK_VARYINGS : Int = 35971;
+	static inline var TRANSFORM_FEEDBACK_BUFFER_START : Int = 35972;
+	static inline var TRANSFORM_FEEDBACK_BUFFER_SIZE : Int = 35973;
+	static inline var TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN : Int = 35976;
+	static inline var RASTERIZER_DISCARD : Int = 35977;
+	static inline var MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS : Int = 35978;
+	static inline var MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS : Int = 35979;
+	static inline var INTERLEAVED_ATTRIBS : Int = 35980;
+	static inline var SEPARATE_ATTRIBS : Int = 35981;
+	static inline var TRANSFORM_FEEDBACK_BUFFER : Int = 35982;
+	static inline var TRANSFORM_FEEDBACK_BUFFER_BINDING : Int = 35983;
+	static inline var RGBA32UI : Int = 36208;
+	static inline var RGB32UI : Int = 36209;
+	static inline var RGBA16UI : Int = 36214;
+	static inline var RGB16UI : Int = 36215;
+	static inline var RGBA8UI : Int = 36220;
+	static inline var RGB8UI : Int = 36221;
+	static inline var RGBA32I : Int = 36226;
+	static inline var RGB32I : Int = 36227;
+	static inline var RGBA16I : Int = 36232;
+	static inline var RGB16I : Int = 36233;
+	static inline var RGBA8I : Int = 36238;
+	static inline var RGB8I : Int = 36239;
+	static inline var RED_INTEGER : Int = 36244;
+	static inline var RGB_INTEGER : Int = 36248;
+	static inline var RGBA_INTEGER : Int = 36249;
+	static inline var SAMPLER_2D_ARRAY : Int = 36289;
+	static inline var SAMPLER_2D_ARRAY_SHADOW : Int = 36292;
+	static inline var SAMPLER_CUBE_SHADOW : Int = 36293;
+	static inline var UNSIGNED_INT_VEC2 : Int = 36294;
+	static inline var UNSIGNED_INT_VEC3 : Int = 36295;
+	static inline var UNSIGNED_INT_VEC4 : Int = 36296;
+	static inline var INT_SAMPLER_2D : Int = 36298;
+	static inline var INT_SAMPLER_3D : Int = 36299;
+	static inline var INT_SAMPLER_CUBE : Int = 36300;
+	static inline var INT_SAMPLER_2D_ARRAY : Int = 36303;
+	static inline var UNSIGNED_INT_SAMPLER_2D : Int = 36306;
+	static inline var UNSIGNED_INT_SAMPLER_3D : Int = 36307;
+	static inline var UNSIGNED_INT_SAMPLER_CUBE : Int = 36308;
+	static inline var UNSIGNED_INT_SAMPLER_2D_ARRAY : Int = 36311;
+	static inline var DEPTH_COMPONENT32F : Int = 36012;
+	static inline var DEPTH32F_STENCIL8 : Int = 36013;
+	static inline var FLOAT_32_UNSIGNED_INT_24_8_REV : Int = 36269;
+	static inline var FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING : Int = 33296;
+	static inline var FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE : Int = 33297;
+	static inline var FRAMEBUFFER_ATTACHMENT_RED_SIZE : Int = 33298;
+	static inline var FRAMEBUFFER_ATTACHMENT_GREEN_SIZE : Int = 33299;
+	static inline var FRAMEBUFFER_ATTACHMENT_BLUE_SIZE : Int = 33300;
+	static inline var FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE : Int = 33301;
+	static inline var FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE : Int = 33302;
+	static inline var FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE : Int = 33303;
+	static inline var FRAMEBUFFER_DEFAULT : Int = 33304;
+	static inline var UNSIGNED_INT_24_8 : Int = 34042;
+	static inline var DEPTH24_STENCIL8 : Int = 35056;
+	static inline var UNSIGNED_NORMALIZED : Int = 35863;
+	static inline var DRAW_FRAMEBUFFER_BINDING : Int = 36006;
+	static inline var READ_FRAMEBUFFER : Int = 36008;
+	static inline var DRAW_FRAMEBUFFER : Int = 36009;
+	static inline var READ_FRAMEBUFFER_BINDING : Int = 36010;
+	static inline var RENDERBUFFER_SAMPLES : Int = 36011;
+	static inline var FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER : Int = 36052;
+	static inline var MAX_COLOR_ATTACHMENTS : Int = 36063;
+	static inline var COLOR_ATTACHMENT1 : Int = 36065;
+	static inline var COLOR_ATTACHMENT2 : Int = 36066;
+	static inline var COLOR_ATTACHMENT3 : Int = 36067;
+	static inline var COLOR_ATTACHMENT4 : Int = 36068;
+	static inline var COLOR_ATTACHMENT5 : Int = 36069;
+	static inline var COLOR_ATTACHMENT6 : Int = 36070;
+	static inline var COLOR_ATTACHMENT7 : Int = 36071;
+	static inline var COLOR_ATTACHMENT8 : Int = 36072;
+	static inline var COLOR_ATTACHMENT9 : Int = 36073;
+	static inline var COLOR_ATTACHMENT10 : Int = 36074;
+	static inline var COLOR_ATTACHMENT11 : Int = 36075;
+	static inline var COLOR_ATTACHMENT12 : Int = 36076;
+	static inline var COLOR_ATTACHMENT13 : Int = 36077;
+	static inline var COLOR_ATTACHMENT14 : Int = 36078;
+	static inline var COLOR_ATTACHMENT15 : Int = 36079;
+	static inline var FRAMEBUFFER_INCOMPLETE_MULTISAMPLE : Int = 36182;
+	static inline var MAX_SAMPLES : Int = 36183;
+	static inline var HALF_FLOAT : Int = 5131;
+	static inline var RG : Int = 33319;
+	static inline var RG_INTEGER : Int = 33320;
+	static inline var R8 : Int = 33321;
+	static inline var RG8 : Int = 33323;
+	static inline var R16F : Int = 33325;
+	static inline var R32F : Int = 33326;
+	static inline var RG16F : Int = 33327;
+	static inline var RG32F : Int = 33328;
+	static inline var R8I : Int = 33329;
+	static inline var R8UI : Int = 33330;
+	static inline var R16I : Int = 33331;
+	static inline var R16UI : Int = 33332;
+	static inline var R32I : Int = 33333;
+	static inline var R32UI : Int = 33334;
+	static inline var RG8I : Int = 33335;
+	static inline var RG8UI : Int = 33336;
+	static inline var RG16I : Int = 33337;
+	static inline var RG16UI : Int = 33338;
+	static inline var RG32I : Int = 33339;
+	static inline var RG32UI : Int = 33340;
+	static inline var VERTEX_ARRAY_BINDING : Int = 34229;
+	static inline var R8_SNORM : Int = 36756;
+	static inline var RG8_SNORM : Int = 36757;
+	static inline var RGB8_SNORM : Int = 36758;
+	static inline var RGBA8_SNORM : Int = 36759;
+	static inline var SIGNED_NORMALIZED : Int = 36764;
+	static inline var COPY_READ_BUFFER : Int = 36662;
+	static inline var COPY_WRITE_BUFFER : Int = 36663;
+	static inline var COPY_READ_BUFFER_BINDING : Int = 36662;
+	static inline var COPY_WRITE_BUFFER_BINDING : Int = 36663;
+	static inline var UNIFORM_BUFFER : Int = 35345;
+	static inline var UNIFORM_BUFFER_BINDING : Int = 35368;
+	static inline var UNIFORM_BUFFER_START : Int = 35369;
+	static inline var UNIFORM_BUFFER_SIZE : Int = 35370;
+	static inline var MAX_VERTEX_UNIFORM_BLOCKS : Int = 35371;
+	static inline var MAX_FRAGMENT_UNIFORM_BLOCKS : Int = 35373;
+	static inline var MAX_COMBINED_UNIFORM_BLOCKS : Int = 35374;
+	static inline var MAX_UNIFORM_BUFFER_BINDINGS : Int = 35375;
+	static inline var MAX_UNIFORM_BLOCK_SIZE : Int = 35376;
+	static inline var MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS : Int = 35377;
+	static inline var MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS : Int = 35379;
+	static inline var UNIFORM_BUFFER_OFFSET_ALIGNMENT : Int = 35380;
+	static inline var ACTIVE_UNIFORM_BLOCKS : Int = 35382;
+	static inline var UNIFORM_TYPE : Int = 35383;
+	static inline var UNIFORM_SIZE : Int = 35384;
+	static inline var UNIFORM_BLOCK_INDEX : Int = 35386;
+	static inline var UNIFORM_OFFSET : Int = 35387;
+	static inline var UNIFORM_ARRAY_STRIDE : Int = 35388;
+	static inline var UNIFORM_MATRIX_STRIDE : Int = 35389;
+	static inline var UNIFORM_IS_ROW_MAJOR : Int = 35390;
+	static inline var UNIFORM_BLOCK_BINDING : Int = 35391;
+	static inline var UNIFORM_BLOCK_DATA_SIZE : Int = 35392;
+	static inline var UNIFORM_BLOCK_ACTIVE_UNIFORMS : Int = 35394;
+	static inline var UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES : Int = 35395;
+	static inline var UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER : Int = 35396;
+	static inline var UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER : Int = 35398;
+	static inline var INVALID_INDEX : Int = cast 4294967295;
+	static inline var MAX_VERTEX_OUTPUT_COMPONENTS : Int = 37154;
+	static inline var MAX_FRAGMENT_INPUT_COMPONENTS : Int = 37157;
+	static inline var MAX_SERVER_WAIT_TIMEOUT : Int = 37137;
+	static inline var OBJECT_TYPE : Int = 37138;
+	static inline var SYNC_CONDITION : Int = 37139;
+	static inline var SYNC_STATUS : Int = 37140;
+	static inline var SYNC_FLAGS : Int = 37141;
+	static inline var SYNC_FENCE : Int = 37142;
+	static inline var SYNC_GPU_COMMANDS_COMPLETE : Int = 37143;
+	static inline var UNSIGNALED : Int = 37144;
+	static inline var SIGNALED : Int = 37145;
+	static inline var ALREADY_SIGNALED : Int = 37146;
+	static inline var TIMEOUT_EXPIRED : Int = 37147;
+	static inline var CONDITION_SATISFIED : Int = 37148;
+	static inline var WAIT_FAILED : Int = 37149;
+	static inline var SYNC_FLUSH_COMMANDS_BIT : Int = 1;
+	static inline var VERTEX_ATTRIB_ARRAY_DIVISOR : Int = 35070;
+	static inline var ANY_SAMPLES_PASSED : Int = 35887;
+	static inline var ANY_SAMPLES_PASSED_CONSERVATIVE : Int = 36202;
+	static inline var SAMPLER_BINDING : Int = 35097;
+	static inline var RGB10_A2UI : Int = 36975;
+	static inline var INT_2_10_10_10_REV : Int = 36255;
+	static inline var TRANSFORM_FEEDBACK : Int = 36386;
+	static inline var TRANSFORM_FEEDBACK_PAUSED : Int = 36387;
+	static inline var TRANSFORM_FEEDBACK_ACTIVE : Int = 36388;
+	static inline var TRANSFORM_FEEDBACK_BINDING : Int = 36389;
+	static inline var TEXTURE_IMMUTABLE_FORMAT : Int = 37167;
+	static inline var MAX_ELEMENT_INDEX : Int = 36203;
+	static inline var TEXTURE_IMMUTABLE_LEVELS : Int = 33503;
+	static inline var TIMEOUT_IGNORED : Int = -1;
+	static inline var MAX_CLIENT_WAIT_TIMEOUT_WEBGL : Int = 37447;
+	static inline var DEPTH_BUFFER_BIT : Int = 256;
+	static inline var STENCIL_BUFFER_BIT : Int = 1024;
+	static inline var COLOR_BUFFER_BIT : Int = 16384;
+	static inline var POINTS : Int = 0;
+	static inline var LINES : Int = 1;
+	static inline var LINE_LOOP : Int = 2;
+	static inline var LINE_STRIP : Int = 3;
+	static inline var TRIANGLES : Int = 4;
+	static inline var TRIANGLE_STRIP : Int = 5;
+	static inline var TRIANGLE_FAN : Int = 6;
+	static inline var ZERO : Int = 0;
+	static inline var ONE : Int = 1;
+	static inline var SRC_COLOR : Int = 768;
+	static inline var ONE_MINUS_SRC_COLOR : Int = 769;
+	static inline var SRC_ALPHA : Int = 770;
+	static inline var ONE_MINUS_SRC_ALPHA : Int = 771;
+	static inline var DST_ALPHA : Int = 772;
+	static inline var ONE_MINUS_DST_ALPHA : Int = 773;
+	static inline var DST_COLOR : Int = 774;
+	static inline var ONE_MINUS_DST_COLOR : Int = 775;
+	static inline var SRC_ALPHA_SATURATE : Int = 776;
+	static inline var FUNC_ADD : Int = 32774;
+	static inline var BLEND_EQUATION : Int = 32777;
+	static inline var BLEND_EQUATION_RGB : Int = 32777;
+	static inline var BLEND_EQUATION_ALPHA : Int = 34877;
+	static inline var FUNC_SUBTRACT : Int = 32778;
+	static inline var FUNC_REVERSE_SUBTRACT : Int = 32779;
+	static inline var BLEND_DST_RGB : Int = 32968;
+	static inline var BLEND_SRC_RGB : Int = 32969;
+	static inline var BLEND_DST_ALPHA : Int = 32970;
+	static inline var BLEND_SRC_ALPHA : Int = 32971;
+	static inline var CONSTANT_COLOR : Int = 32769;
+	static inline var ONE_MINUS_CONSTANT_COLOR : Int = 32770;
+	static inline var CONSTANT_ALPHA : Int = 32771;
+	static inline var ONE_MINUS_CONSTANT_ALPHA : Int = 32772;
+	static inline var BLEND_COLOR : Int = 32773;
+	static inline var ARRAY_BUFFER : Int = 34962;
+	static inline var ELEMENT_ARRAY_BUFFER : Int = 34963;
+	static inline var ARRAY_BUFFER_BINDING : Int = 34964;
+	static inline var ELEMENT_ARRAY_BUFFER_BINDING : Int = 34965;
+	static inline var STREAM_DRAW : Int = 35040;
+	static inline var STATIC_DRAW : Int = 35044;
+	static inline var DYNAMIC_DRAW : Int = 35048;
+	static inline var BUFFER_SIZE : Int = 34660;
+	static inline var BUFFER_USAGE : Int = 34661;
+	static inline var CURRENT_VERTEX_ATTRIB : Int = 34342;
+	static inline var FRONT : Int = 1028;
+	static inline var BACK : Int = 1029;
+	static inline var FRONT_AND_BACK : Int = 1032;
+	static inline var CULL_FACE : Int = 2884;
+	static inline var BLEND : Int = 3042;
+	static inline var DITHER : Int = 3024;
+	static inline var STENCIL_TEST : Int = 2960;
+	static inline var DEPTH_TEST : Int = 2929;
+	static inline var SCISSOR_TEST : Int = 3089;
+	static inline var POLYGON_OFFSET_FILL : Int = 32823;
+	static inline var SAMPLE_ALPHA_TO_COVERAGE : Int = 32926;
+	static inline var SAMPLE_COVERAGE : Int = 32928;
+	static inline var NO_ERROR : Int = 0;
+	static inline var INVALID_ENUM : Int = 1280;
+	static inline var INVALID_VALUE : Int = 1281;
+	static inline var INVALID_OPERATION : Int = 1282;
+	static inline var OUT_OF_MEMORY : Int = 1285;
+	static inline var CW : Int = 2304;
+	static inline var CCW : Int = 2305;
+	static inline var LINE_WIDTH : Int = 2849;
+	static inline var ALIASED_POINT_SIZE_RANGE : Int = 33901;
+	static inline var ALIASED_LINE_WIDTH_RANGE : Int = 33902;
+	static inline var CULL_FACE_MODE : Int = 2885;
+	static inline var FRONT_FACE : Int = 2886;
+	static inline var DEPTH_RANGE : Int = 2928;
+	static inline var DEPTH_WRITEMASK : Int = 2930;
+	static inline var DEPTH_CLEAR_VALUE : Int = 2931;
+	static inline var DEPTH_FUNC : Int = 2932;
+	static inline var STENCIL_CLEAR_VALUE : Int = 2961;
+	static inline var STENCIL_FUNC : Int = 2962;
+	static inline var STENCIL_FAIL : Int = 2964;
+	static inline var STENCIL_PASS_DEPTH_FAIL : Int = 2965;
+	static inline var STENCIL_PASS_DEPTH_PASS : Int = 2966;
+	static inline var STENCIL_REF : Int = 2967;
+	static inline var STENCIL_VALUE_MASK : Int = 2963;
+	static inline var STENCIL_WRITEMASK : Int = 2968;
+	static inline var STENCIL_BACK_FUNC : Int = 34816;
+	static inline var STENCIL_BACK_FAIL : Int = 34817;
+	static inline var STENCIL_BACK_PASS_DEPTH_FAIL : Int = 34818;
+	static inline var STENCIL_BACK_PASS_DEPTH_PASS : Int = 34819;
+	static inline var STENCIL_BACK_REF : Int = 36003;
+	static inline var STENCIL_BACK_VALUE_MASK : Int = 36004;
+	static inline var STENCIL_BACK_WRITEMASK : Int = 36005;
+	static inline var VIEWPORT : Int = 2978;
+	static inline var SCISSOR_BOX : Int = 3088;
+	static inline var COLOR_CLEAR_VALUE : Int = 3106;
+	static inline var COLOR_WRITEMASK : Int = 3107;
+	static inline var UNPACK_ALIGNMENT : Int = 3317;
+	static inline var PACK_ALIGNMENT : Int = 3333;
+	static inline var MAX_TEXTURE_SIZE : Int = 3379;
+	static inline var MAX_VIEWPORT_DIMS : Int = 3386;
+	static inline var SUBPIXEL_BITS : Int = 3408;
+	static inline var RED_BITS : Int = 3410;
+	static inline var GREEN_BITS : Int = 3411;
+	static inline var BLUE_BITS : Int = 3412;
+	static inline var ALPHA_BITS : Int = 3413;
+	static inline var DEPTH_BITS : Int = 3414;
+	static inline var STENCIL_BITS : Int = 3415;
+	static inline var POLYGON_OFFSET_UNITS : Int = 10752;
+	static inline var POLYGON_OFFSET_FACTOR : Int = 32824;
+	static inline var TEXTURE_BINDING_2D : Int = 32873;
+	static inline var SAMPLE_BUFFERS : Int = 32936;
+	static inline var SAMPLES : Int = 32937;
+	static inline var SAMPLE_COVERAGE_VALUE : Int = 32938;
+	static inline var SAMPLE_COVERAGE_INVERT : Int = 32939;
+	static inline var COMPRESSED_TEXTURE_FORMATS : Int = 34467;
+	static inline var DONT_CARE : Int = 4352;
+	static inline var FASTEST : Int = 4353;
+	static inline var NICEST : Int = 4354;
+	static inline var GENERATE_MIPMAP_HINT : Int = 33170;
+	static inline var BYTE : Int = 5120;
+	static inline var UNSIGNED_BYTE : Int = 5121;
+	static inline var SHORT : Int = 5122;
+	static inline var UNSIGNED_SHORT : Int = 5123;
+	static inline var INT : Int = 5124;
+	static inline var UNSIGNED_INT : Int = 5125;
+	static inline var FLOAT : Int = 5126;
+	static inline var DEPTH_COMPONENT : Int = 6402;
+	static inline var ALPHA : Int = 6406;
+	static inline var RGB : Int = 6407;
+	static inline var RGBA : Int = 6408;
+	static inline var LUMINANCE : Int = 6409;
+	static inline var LUMINANCE_ALPHA : Int = 6410;
+	static inline var UNSIGNED_SHORT_4_4_4_4 : Int = 32819;
+	static inline var UNSIGNED_SHORT_5_5_5_1 : Int = 32820;
+	static inline var UNSIGNED_SHORT_5_6_5 : Int = 33635;
+	static inline var FRAGMENT_SHADER : Int = 35632;
+	static inline var VERTEX_SHADER : Int = 35633;
+	static inline var MAX_VERTEX_ATTRIBS : Int = 34921;
+	static inline var MAX_VERTEX_UNIFORM_VECTORS : Int = 36347;
+	static inline var MAX_VARYING_VECTORS : Int = 36348;
+	static inline var MAX_COMBINED_TEXTURE_IMAGE_UNITS : Int = 35661;
+	static inline var MAX_VERTEX_TEXTURE_IMAGE_UNITS : Int = 35660;
+	static inline var MAX_TEXTURE_IMAGE_UNITS : Int = 34930;
+	static inline var MAX_FRAGMENT_UNIFORM_VECTORS : Int = 36349;
+	static inline var SHADER_TYPE : Int = 35663;
+	static inline var DELETE_STATUS : Int = 35712;
+	static inline var LINK_STATUS : Int = 35714;
+	static inline var VALIDATE_STATUS : Int = 35715;
+	static inline var ATTACHED_SHADERS : Int = 35717;
+	static inline var ACTIVE_UNIFORMS : Int = 35718;
+	static inline var ACTIVE_ATTRIBUTES : Int = 35721;
+	static inline var SHADING_LANGUAGE_VERSION : Int = 35724;
+	static inline var CURRENT_PROGRAM : Int = 35725;
+	static inline var NEVER : Int = 512;
+	static inline var LESS : Int = 513;
+	static inline var EQUAL : Int = 514;
+	static inline var LEQUAL : Int = 515;
+	static inline var GREATER : Int = 516;
+	static inline var NOTEQUAL : Int = 517;
+	static inline var GEQUAL : Int = 518;
+	static inline var ALWAYS : Int = 519;
+	static inline var KEEP : Int = 7680;
+	static inline var REPLACE : Int = 7681;
+	static inline var INCR : Int = 7682;
+	static inline var DECR : Int = 7683;
+	static inline var INVERT : Int = 5386;
+	static inline var INCR_WRAP : Int = 34055;
+	static inline var DECR_WRAP : Int = 34056;
+	static inline var VENDOR : Int = 7936;
+	static inline var RENDERER : Int = 7937;
+	static inline var VERSION : Int = 7938;
+	static inline var NEAREST : Int = 9728;
+	static inline var LINEAR : Int = 9729;
+	static inline var NEAREST_MIPMAP_NEAREST : Int = 9984;
+	static inline var LINEAR_MIPMAP_NEAREST : Int = 9985;
+	static inline var NEAREST_MIPMAP_LINEAR : Int = 9986;
+	static inline var LINEAR_MIPMAP_LINEAR : Int = 9987;
+	static inline var TEXTURE_MAG_FILTER : Int = 10240;
+	static inline var TEXTURE_MIN_FILTER : Int = 10241;
+	static inline var TEXTURE_WRAP_S : Int = 10242;
+	static inline var TEXTURE_WRAP_T : Int = 10243;
+	static inline var TEXTURE_2D : Int = 3553;
+	static inline var TEXTURE : Int = 5890;
+	static inline var TEXTURE_CUBE_MAP : Int = 34067;
+	static inline var TEXTURE_BINDING_CUBE_MAP : Int = 34068;
+	static inline var TEXTURE_CUBE_MAP_POSITIVE_X : Int = 34069;
+	static inline var TEXTURE_CUBE_MAP_NEGATIVE_X : Int = 34070;
+	static inline var TEXTURE_CUBE_MAP_POSITIVE_Y : Int = 34071;
+	static inline var TEXTURE_CUBE_MAP_NEGATIVE_Y : Int = 34072;
+	static inline var TEXTURE_CUBE_MAP_POSITIVE_Z : Int = 34073;
+	static inline var TEXTURE_CUBE_MAP_NEGATIVE_Z : Int = 34074;
+	static inline var MAX_CUBE_MAP_TEXTURE_SIZE : Int = 34076;
+	static inline var TEXTURE0 : Int = 33984;
+	static inline var TEXTURE1 : Int = 33985;
+	static inline var TEXTURE2 : Int = 33986;
+	static inline var TEXTURE3 : Int = 33987;
+	static inline var TEXTURE4 : Int = 33988;
+	static inline var TEXTURE5 : Int = 33989;
+	static inline var TEXTURE6 : Int = 33990;
+	static inline var TEXTURE7 : Int = 33991;
+	static inline var TEXTURE8 : Int = 33992;
+	static inline var TEXTURE9 : Int = 33993;
+	static inline var TEXTURE10 : Int = 33994;
+	static inline var TEXTURE11 : Int = 33995;
+	static inline var TEXTURE12 : Int = 33996;
+	static inline var TEXTURE13 : Int = 33997;
+	static inline var TEXTURE14 : Int = 33998;
+	static inline var TEXTURE15 : Int = 33999;
+	static inline var TEXTURE16 : Int = 34000;
+	static inline var TEXTURE17 : Int = 34001;
+	static inline var TEXTURE18 : Int = 34002;
+	static inline var TEXTURE19 : Int = 34003;
+	static inline var TEXTURE20 : Int = 34004;
+	static inline var TEXTURE21 : Int = 34005;
+	static inline var TEXTURE22 : Int = 34006;
+	static inline var TEXTURE23 : Int = 34007;
+	static inline var TEXTURE24 : Int = 34008;
+	static inline var TEXTURE25 : Int = 34009;
+	static inline var TEXTURE26 : Int = 34010;
+	static inline var TEXTURE27 : Int = 34011;
+	static inline var TEXTURE28 : Int = 34012;
+	static inline var TEXTURE29 : Int = 34013;
+	static inline var TEXTURE30 : Int = 34014;
+	static inline var TEXTURE31 : Int = 34015;
+	static inline var ACTIVE_TEXTURE : Int = 34016;
+	static inline var REPEAT : Int = 10497;
+	static inline var CLAMP_TO_EDGE : Int = 33071;
+	static inline var MIRRORED_REPEAT : Int = 33648;
+	static inline var FLOAT_VEC2 : Int = 35664;
+	static inline var FLOAT_VEC3 : Int = 35665;
+	static inline var FLOAT_VEC4 : Int = 35666;
+	static inline var INT_VEC2 : Int = 35667;
+	static inline var INT_VEC3 : Int = 35668;
+	static inline var INT_VEC4 : Int = 35669;
+	static inline var BOOL : Int = 35670;
+	static inline var BOOL_VEC2 : Int = 35671;
+	static inline var BOOL_VEC3 : Int = 35672;
+	static inline var BOOL_VEC4 : Int = 35673;
+	static inline var FLOAT_MAT2 : Int = 35674;
+	static inline var FLOAT_MAT3 : Int = 35675;
+	static inline var FLOAT_MAT4 : Int = 35676;
+	static inline var SAMPLER_2D : Int = 35678;
+	static inline var SAMPLER_CUBE : Int = 35680;
+	static inline var VERTEX_ATTRIB_ARRAY_ENABLED : Int = 34338;
+	static inline var VERTEX_ATTRIB_ARRAY_SIZE : Int = 34339;
+	static inline var VERTEX_ATTRIB_ARRAY_STRIDE : Int = 34340;
+	static inline var VERTEX_ATTRIB_ARRAY_TYPE : Int = 34341;
+	static inline var VERTEX_ATTRIB_ARRAY_NORMALIZED : Int = 34922;
+	static inline var VERTEX_ATTRIB_ARRAY_POINTER : Int = 34373;
+	static inline var VERTEX_ATTRIB_ARRAY_BUFFER_BINDING : Int = 34975;
+	static inline var IMPLEMENTATION_COLOR_READ_TYPE : Int = 35738;
+	static inline var IMPLEMENTATION_COLOR_READ_FORMAT : Int = 35739;
+	static inline var COMPILE_STATUS : Int = 35713;
+	static inline var LOW_FLOAT : Int = 36336;
+	static inline var MEDIUM_FLOAT : Int = 36337;
+	static inline var HIGH_FLOAT : Int = 36338;
+	static inline var LOW_INT : Int = 36339;
+	static inline var MEDIUM_INT : Int = 36340;
+	static inline var HIGH_INT : Int = 36341;
+	static inline var FRAMEBUFFER : Int = 36160;
+	static inline var RENDERBUFFER : Int = 36161;
+	static inline var RGBA4 : Int = 32854;
+	static inline var RGB5_A1 : Int = 32855;
+	static inline var RGB565 : Int = 36194;
+	static inline var DEPTH_COMPONENT16 : Int = 33189;
+	static inline var STENCIL_INDEX8 : Int = 36168;
+	static inline var DEPTH_STENCIL : Int = 34041;
+	static inline var RENDERBUFFER_WIDTH : Int = 36162;
+	static inline var RENDERBUFFER_HEIGHT : Int = 36163;
+	static inline var RENDERBUFFER_INTERNAL_FORMAT : Int = 36164;
+	static inline var RENDERBUFFER_RED_SIZE : Int = 36176;
+	static inline var RENDERBUFFER_GREEN_SIZE : Int = 36177;
+	static inline var RENDERBUFFER_BLUE_SIZE : Int = 36178;
+	static inline var RENDERBUFFER_ALPHA_SIZE : Int = 36179;
+	static inline var RENDERBUFFER_DEPTH_SIZE : Int = 36180;
+	static inline var RENDERBUFFER_STENCIL_SIZE : Int = 36181;
+	static inline var FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE : Int = 36048;
+	static inline var FRAMEBUFFER_ATTACHMENT_OBJECT_NAME : Int = 36049;
+	static inline var FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL : Int = 36050;
+	static inline var FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE : Int = 36051;
+	static inline var COLOR_ATTACHMENT0 : Int = 36064;
+	static inline var DEPTH_ATTACHMENT : Int = 36096;
+	static inline var STENCIL_ATTACHMENT : Int = 36128;
+	static inline var DEPTH_STENCIL_ATTACHMENT : Int = 33306;
+	static inline var NONE : Int = 0;
+	static inline var FRAMEBUFFER_COMPLETE : Int = 36053;
+	static inline var FRAMEBUFFER_INCOMPLETE_ATTACHMENT : Int = 36054;
+	static inline var FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT : Int = 36055;
+	static inline var FRAMEBUFFER_INCOMPLETE_DIMENSIONS : Int = 36057;
+	static inline var FRAMEBUFFER_UNSUPPORTED : Int = 36061;
+	static inline var FRAMEBUFFER_BINDING : Int = 36006;
+	static inline var RENDERBUFFER_BINDING : Int = 36007;
+	static inline var MAX_RENDERBUFFER_SIZE : Int = 34024;
+	static inline var INVALID_FRAMEBUFFER_OPERATION : Int = 1286;
+	static inline var UNPACK_FLIP_Y_WEBGL : Int = 37440;
+	static inline var UNPACK_PREMULTIPLY_ALPHA_WEBGL : Int = 37441;
+	static inline var CONTEXT_LOST_WEBGL : Int = 37442;
+	static inline var UNPACK_COLORSPACE_CONVERSION_WEBGL : Int = 37443;
+	static inline var BROWSER_DEFAULT_WEBGL : Int = 37444;
+	
+	
+	/**
+		Initializes and creates the buffer object's data store.
+	**/
+	@:overload( function( target : Int, size : Int, usage : Int ) : Void {} )
+	@:overload( function( target : Int, srcData : js.lib.ArrayBuffer, usage : Int ) : Void {} )
+	@:overload( function( target : Int, srcData : js.lib.ArrayBufferView, usage : Int ) : Void {} )
+	function bufferData( target : Int, srcData : js.lib.ArrayBufferView, usage : Int, srcOffset : Int, length : Int = 0 ) : Void;
+	
+	/**
+		Updates a subset of a buffer object's data store.
+	**/
+	@:overload( function( target : Int, offset : Int, srcData : js.lib.ArrayBuffer ) : Void {} )
+	@:overload( function( target : Int, offset : Int, srcData : js.lib.ArrayBufferView ) : Void {} )
+	function bufferSubData( target : Int, dstByteOffset : Int, srcData : js.lib.ArrayBufferView, srcOffset : Int, length : Int = 0 ) : Void;
+	
+	/**
+		Copies part of the data of a buffer to another buffer.
+	**/
+	function copyBufferSubData( readTarget : Int, writeTarget : Int, readOffset : Int, writeOffset : Int, size : Int ) : Void;
+	
+	/**
+		Reads data from a buffer and writes them to an `ArrayBuffer` or `SharedArrayBuffer`.
+	**/
+	function getBufferSubData( target : Int, srcByteOffset : Int, dstData : js.lib.ArrayBufferView, dstOffset : Int = 0, length : Int = 0 ) : Void;
+	
+	/**
+		Transfers a block of pixels from the read framebuffer to the draw framebuffer.
+	**/
+	function blitFramebuffer( srcX0 : Int, srcY0 : Int, srcX1 : Int, srcY1 : Int, dstX0 : Int, dstY0 : Int, dstX1 : Int, dstY1 : Int, mask : Int, filter : Int ) : Void;
+	
+	/**
+		Attaches a single layer of a texture to a framebuffer.
+	**/
+	function framebufferTextureLayer( target : Int, attachment : Int, texture : Texture, level : Int, layer : Int ) : Void;
+	
+	/**
+		Invalidates the contents of attachments in a framebuffer.
+		@throws DOMError
+	**/
+	function invalidateFramebuffer( target : Int, attachments : Array<Int> ) : Void;
+	
+	/**
+		Invalidates portions of the contents of attachments in a framebuffer
+		@throws DOMError
+	**/
+	function invalidateSubFramebuffer( target : Int, attachments : Array<Int>, x : Int, y : Int, width : Int, height : Int ) : Void;
+	
+	/**
+		Selects a color buffer as the source for pixels.
+	**/
+	function readBuffer( src : Int ) : Void;
+	
+	/**
+		Returns information about implementation-dependent support for internal formats.
+		@throws DOMError
+	**/
+	function getInternalformatParameter( target : Int, internalformat : Int, pname : Int ) : Dynamic;
+	
+	/**
+		Creates and initializes a renderbuffer object's data store and allows specifying the number of samples to be used.
+	**/
+	function renderbufferStorageMultisample( target : Int, samples : Int, internalformat : Int, width : Int, height : Int ) : Void;
+	
+	/**
+		Specifies all levels of two-dimensional texture storage.
+	**/
+	function texStorage2D( target : Int, levels : Int, internalformat : Int, width : Int, height : Int ) : Void;
+	
+	/**
+		Specifies all levels of a three-dimensional texture or two-dimensional array texture.
+	**/
+	function texStorage3D( target : Int, levels : Int, internalformat : Int, width : Int, height : Int, depth : Int ) : Void;
+	/** @throws DOMError */
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, format : Int, type : Int, pixels : js.lib.ArrayBufferView ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, source : js.html.CanvasElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, source : js.html.ImageElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, source : js.html.VideoElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, source : js.html.ImageBitmap ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, format : Int, type : Int, source : js.html.ImageData ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, format : Int, type : Int, pboOffset : Int ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, format : Int, type : Int, source : js.html.CanvasElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, format : Int, type : Int, source : js.html.ImageElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, format : Int, type : Int, source : js.html.VideoElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, format : Int, type : Int, source : js.html.ImageBitmap ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, format : Int, type : Int, source : js.html.ImageData ) : Void {} )
+	function texImage2D( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, format : Int, type : Int, srcData : js.lib.ArrayBufferView, srcOffset : Int ) : Void;
+	/** @throws DOMError */
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, type : Int, pixels : js.lib.ArrayBufferView ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, source : js.html.CanvasElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, source : js.html.ImageElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, source : js.html.VideoElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, source : js.html.ImageBitmap ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, format : Int, type : Int, source : js.html.ImageData ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, type : Int, pboOffset : Int ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, type : Int, source : js.html.CanvasElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, type : Int, source : js.html.ImageElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, type : Int, source : js.html.VideoElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, type : Int, source : js.html.ImageBitmap ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, type : Int, source : js.html.ImageData ) : Void {} )
+	function texSubImage2D( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, type : Int, srcData : js.lib.ArrayBufferView, srcOffset : Int ) : Void;
+	
+	/**
+		Specifies a three-dimensional texture image.
+		@throws DOMError
+	**/
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, depth : Int, border : Int, format : Int, type : Int, pboOffset : Int ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, depth : Int, border : Int, format : Int, type : Int, source : js.html.CanvasElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, depth : Int, border : Int, format : Int, type : Int, source : js.html.ImageElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, depth : Int, border : Int, format : Int, type : Int, source : js.html.VideoElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, depth : Int, border : Int, format : Int, type : Int, source : js.html.ImageBitmap ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, depth : Int, border : Int, format : Int, type : Int, source : js.html.ImageData ) : Void {} )
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, depth : Int, border : Int, format : Int, type : Int, srcData : js.lib.ArrayBufferView ) : Void {} )
+	function texImage3D( target : Int, level : Int, internalformat : Int, width : Int, height : Int, depth : Int, border : Int, format : Int, type : Int, srcData : js.lib.ArrayBufferView, srcOffset : Int ) : Void;
+	
+	/**
+		Specifies a sub-rectangle of the current 3D texture.
+		@throws DOMError
+	**/
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, zoffset : Int, width : Int, height : Int, depth : Int, format : Int, type : Int, pboOffset : Int ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, zoffset : Int, width : Int, height : Int, depth : Int, format : Int, type : Int, source : js.html.CanvasElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, zoffset : Int, width : Int, height : Int, depth : Int, format : Int, type : Int, source : js.html.ImageElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, zoffset : Int, width : Int, height : Int, depth : Int, format : Int, type : Int, source : js.html.VideoElement ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, zoffset : Int, width : Int, height : Int, depth : Int, format : Int, type : Int, source : js.html.ImageBitmap ) : Void {} )
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, zoffset : Int, width : Int, height : Int, depth : Int, format : Int, type : Int, source : js.html.ImageData ) : Void {} )
+	function texSubImage3D( target : Int, level : Int, xoffset : Int, yoffset : Int, zoffset : Int, width : Int, height : Int, depth : Int, format : Int, type : Int, srcData : js.lib.ArrayBufferView, srcOffset : Int = 0 ) : Void;
+	
+	/**
+		Copies pixels from the current `WebGLFramebuffer` into an existing 3D texture sub-image.
+	**/
+	function copyTexSubImage3D( target : Int, level : Int, xoffset : Int, yoffset : Int, zoffset : Int, x : Int, y : Int, width : Int, height : Int ) : Void;
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, imageSize : Int, offset : Int ) : Void {} )
+	function compressedTexImage2D( target : Int, level : Int, internalformat : Int, width : Int, height : Int, border : Int, srcData : js.lib.ArrayBufferView, srcOffset : Int = 0, srcLengthOverride : Int = 0 ) : Void;
+	
+	/**
+		Specifies a three-dimensional texture image in a compressed format.
+	**/
+	@:overload( function( target : Int, level : Int, internalformat : Int, width : Int, height : Int, depth : Int, border : Int, imageSize : Int, offset : Int ) : Void {} )
+	function compressedTexImage3D( target : Int, level : Int, internalformat : Int, width : Int, height : Int, depth : Int, border : Int, srcData : js.lib.ArrayBufferView, srcOffset : Int = 0, srcLengthOverride : Int = 0 ) : Void;
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, imageSize : Int, offset : Int ) : Void {} )
+	function compressedTexSubImage2D( target : Int, level : Int, xoffset : Int, yoffset : Int, width : Int, height : Int, format : Int, srcData : js.lib.ArrayBufferView, srcOffset : Int = 0, srcLengthOverride : Int = 0 ) : Void;
+	
+	/**
+		Specifies a three-dimensional sub-rectangle for a texture image in a compressed format.
+	**/
+	@:overload( function( target : Int, level : Int, xoffset : Int, yoffset : Int, zoffset : Int, width : Int, height : Int, depth : Int, format : Int, imageSize : Int, offset : Int ) : Void {} )
+	function compressedTexSubImage3D( target : Int, level : Int, xoffset : Int, yoffset : Int, zoffset : Int, width : Int, height : Int, depth : Int, format : Int, srcData : js.lib.ArrayBufferView, srcOffset : Int = 0, srcLengthOverride : Int = 0 ) : Void;
+	
+	/**
+		Returns the binding of color numbers to user-defined varying out variables.
+	**/
+	function getFragDataLocation( program : Program, name : String ) : Int;
+	function uniform1ui( location : UniformLocation, v0 : Int ) : Void;
+	function uniform2ui( location : UniformLocation, v0 : Int, v1 : Int ) : Void;
+	function uniform3ui( location : UniformLocation, v0 : Int, v1 : Int, v2 : Int ) : Void;
+	function uniform4ui( location : UniformLocation, v0 : Int, v1 : Int, v2 : Int, v3 : Int ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform1fv( location : UniformLocation, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform2fv( location : UniformLocation, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform3fv( location : UniformLocation, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform4fv( location : UniformLocation, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform1iv( location : UniformLocation, data : js.lib.Int32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform2iv( location : UniformLocation, data : js.lib.Int32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform3iv( location : UniformLocation, data : js.lib.Int32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform4iv( location : UniformLocation, data : js.lib.Int32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform1uiv( location : UniformLocation, data : js.lib.Uint32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform2uiv( location : UniformLocation, data : js.lib.Uint32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform3uiv( location : UniformLocation, data : js.lib.Uint32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, data : Array<Int>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniform4uiv( location : UniformLocation, data : js.lib.Uint32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniformMatrix2fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniformMatrix3x2fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniformMatrix4x2fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniformMatrix2x3fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniformMatrix3fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniformMatrix4x3fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniformMatrix2x4fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniformMatrix3x4fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	@:overload( function( location : UniformLocation, transpose : Bool, data : Array<Float>, srcOffset : Int = 0, srcLength : Int = 0) : Void {} )
+	function uniformMatrix4fv( location : UniformLocation, transpose : Bool, data : js.lib.Float32Array, srcOffset : Int = 0, srcLength : Int = 0 ) : Void;
+	function vertexAttribI4i( index : Int, x : Int, y : Int, z : Int, w : Int ) : Void;
+	@:overload( function( index : Int, values : Array<Int>) : Void {} )
+	function vertexAttribI4iv( index : Int, values : js.lib.Int32Array ) : Void;
+	function vertexAttribI4ui( index : Int, x : Int, y : Int, z : Int, w : Int ) : Void;
+	@:overload( function( index : Int, values : Array<Int>) : Void {} )
+	function vertexAttribI4uiv( index : Int, values : js.lib.Uint32Array ) : Void;
+	
+	/**
+		Specifies integer data formats and locations of vertex attributes in a vertex attributes array.
+	**/
+	function vertexAttribIPointer( index : Int, size : Int, type : Int, stride : Int, offset : Int ) : Void;
+	
+	/**
+		Modifies the rate at which generic vertex attributes advance when rendering multiple instances of primitives with `WebGL2RenderingContext.drawArraysInstanced()` and `WebGL2RenderingContext.drawElementsInstanced()`.
+	**/
+	function vertexAttribDivisor( index : Int, divisor : Int ) : Void;
+	
+	/**
+		Renders primitives from array data. In addition, it can execute multiple instances of the range of elements.
+	**/
+	function drawArraysInstanced( mode : Int, first : Int, count : Int, instanceCount : Int ) : Void;
+	
+	/**
+		Renders primitives from array data. In addition, it can execute multiple instances of a set of elements.
+	**/
+	function drawElementsInstanced( mode : Int, count : Int, type : Int, offset : Int, instanceCount : Int ) : Void;
+	
+	/**
+		Renders primitives from array data in a given range.
+	**/
+	function drawRangeElements( mode : Int, start : Int, end : Int, count : Int, type : Int, offset : Int ) : Void;
+	/** @throws DOMError */
+	@:overload( function( x : Int, y : Int, width : Int, height : Int, format : Int, type : Int, dstData : js.lib.ArrayBufferView ) : Void {} )
+	@:overload( function( x : Int, y : Int, width : Int, height : Int, format : Int, type : Int, offset : Int ) : Void {} )
+	function readPixels( x : Int, y : Int, width : Int, height : Int, format : Int, type : Int, dstData : js.lib.ArrayBufferView, dstOffset : Int ) : Void;
+	
+	/**
+		Specifies a list of color buffers to be drawn into.
+	**/
+	function drawBuffers( buffers : Array<Int> ) : Void;
+	@:overload( function( buffer : Int, drawbuffer : Int, values : Array<Float>, srcOffset : Int = 0) : Void {} )
+	function clearBufferfv( buffer : Int, drawbuffer : Int, values : js.lib.Float32Array, srcOffset : Int = 0 ) : Void;
+	@:overload( function( buffer : Int, drawbuffer : Int, values : Array<Int>, srcOffset : Int = 0) : Void {} )
+	function clearBufferiv( buffer : Int, drawbuffer : Int, values : js.lib.Int32Array, srcOffset : Int = 0 ) : Void;
+	@:overload( function( buffer : Int, drawbuffer : Int, values : Array<Int>, srcOffset : Int = 0) : Void {} )
+	function clearBufferuiv( buffer : Int, drawbuffer : Int, values : js.lib.Uint32Array, srcOffset : Int = 0 ) : Void;
+	function clearBufferfi( buffer : Int, drawbuffer : Int, depth : Float, stencil : Int ) : Void;
+	
+	/**
+		Creates a new `WebGLQuery` object.
+	**/
+	function createQuery() : Query;
+	
+	/**
+		Deletes a given `WebGLQuery` object.
+	**/
+	function deleteQuery( query : Query ) : Void;
+	
+	/**
+		Returns `true` if a given object is a valid `WebGLQuery` object.
+	**/
+	function isQuery( query : Query ) : Bool;
+	
+	/**
+		Begins an asynchronous query.
+	**/
+	function beginQuery( target : Int, query : Query ) : Void;
+	
+	/**
+		Marks the end of an asynchronous query.
+	**/
+	function endQuery( target : Int ) : Void;
+	
+	/**
+		Returns a `WebGLQuery` object for a given target.
+	**/
+	function getQuery( target : Int, pname : Int ) : Dynamic;
+	
+	/**
+		Returns information about a query.
+	**/
+	function getQueryParameter( query : Query, pname : Int ) : Dynamic;
+	
+	/**
+		Creates a new `WebGLSampler` object.
+	**/
+	function createSampler() : Sampler;
+	
+	/**
+		Deletes a given `WebGLSampler` object.
+	**/
+	function deleteSampler( sampler : Sampler ) : Void;
+	
+	/**
+		Returns `true` if a given object is a valid `WebGLSampler` object.
+	**/
+	function isSampler( sampler : Sampler ) : Bool;
+	
+	/**
+		Binds a given `WebGLSampler` to a texture unit.
+	**/
+	function bindSampler( unit : Int, sampler : Sampler ) : Void;
+	function samplerParameteri( sampler : Sampler, pname : Int, param : Int ) : Void;
+	function samplerParameterf( sampler : Sampler, pname : Int, param : Float ) : Void;
+	
+	/**
+		Returns sampler parameter information.
+	**/
+	function getSamplerParameter( sampler : Sampler, pname : Int ) : Dynamic;
+	
+	/**
+		Creates a new `WebGLSync` object and inserts it into the GL command stream.
+	**/
+	function fenceSync( condition : Int, flags : Int ) : Sync;
+	
+	/**
+		Returns `true` if the passed object is a valid `WebGLSync` object.
+	**/
+	function isSync( sync : Sync ) : Bool;
+	
+	/**
+		Deletes a given `WebGLSync` object.
+	**/
+	function deleteSync( sync : Sync ) : Void;
+	
+	/**
+		
+		 Blocks and waits for a `WebGLSync` object to become signaled or a given timeout to be passed.
+		 
+	**/
+	function clientWaitSync( sync : Sync, flags : Int, timeout : Int ) : Int;
+	
+	/**
+		Returns immediately, but waits on the GL server until the given `WebGLSync` object is signaled.
+	**/
+	function waitSync( sync : Sync, flags : Int, timeout : Int ) : Void;
+	
+	/**
+		Returns parameter information of a `WebGLSync` object.
+	**/
+	function getSyncParameter( sync : Sync, pname : Int ) : Dynamic;
+	
+	/**
+		Creates and initializes `WebGLTransformFeedback` objects.
+	**/
+	function createTransformFeedback() : TransformFeedback;
+	
+	/**
+		Deletes a given `WebGLTransformFeedback` object.
+	**/
+	function deleteTransformFeedback( tf : TransformFeedback ) : Void;
+	
+	/**
+		Returns `true` if the passed object is a valid `WebGLTransformFeedback` object.
+	**/
+	function isTransformFeedback( tf : TransformFeedback ) : Bool;
+	
+	/**
+		Binds a passed `WebGLTransformFeedback` object to the current GL state.
+	**/
+	function bindTransformFeedback( target : Int, tf : TransformFeedback ) : Void;
+	
+	/**
+		Starts a transform feedback operation.
+	**/
+	function beginTransformFeedback( primitiveMode : Int ) : Void;
+	
+	/**
+		Ends a transform feedback operation.
+	**/
+	function endTransformFeedback() : Void;
+	
+	/**
+		Specifies values to record in `WebGLTransformFeedback` buffers.
+	**/
+	function transformFeedbackVaryings( program : Program, varyings : Array<String>, bufferMode : Int ) : Void;
+	
+	/**
+		Returns information about varying variables from `WebGLTransformFeedback` buffers.
+	**/
+	function getTransformFeedbackVarying( program : Program, index : Int ) : ActiveInfo;
+	
+	/**
+		Pauses a transform feedback operation.
+	**/
+	function pauseTransformFeedback() : Void;
+	
+	/**
+		Resumes a transform feedback operation.
+	**/
+	function resumeTransformFeedback() : Void;
+	
+	/**
+		Binds a given `WebGLBuffer` to a given binding point (`target`) at a given `index`.
+	**/
+	function bindBufferBase( target : Int, index : Int, buffer : Buffer ) : Void;
+	
+	/**
+		Binds a range of a given `WebGLBuffer` to a given binding point (`target`) at a given `index`.
+	**/
+	function bindBufferRange( target : Int, index : Int, buffer : Buffer, offset : Int, size : Int ) : Void;
+	
+	/**
+		Returns the indexed value for the given `target`.
+		@throws DOMError
+	**/
+	function getIndexedParameter( target : Int, index : Int ) : Dynamic;
+	
+	/**
+		
+		 Retrieves the indices of a number of uniforms within a `WebGLProgram`.
+		 
+	**/
+	function getUniformIndices( program : Program, uniformNames : Array<String> ) : Array<Int>;
+	
+	/**
+		Retrieves information about active uniforms within a `WebGLProgram`.
+	**/
+	function getActiveUniforms( program : Program, uniformIndices : Array<Int>, pname : Int ) : Dynamic;
+	
+	/**
+		Retrieves the index of a uniform block within a `WebGLProgram`.
+	**/
+	function getUniformBlockIndex( program : Program, uniformBlockName : String ) : Int;
+	
+	/**
+		Retrieves information about an active uniform block within a `WebGLProgram`.
+		@throws DOMError
+	**/
+	function getActiveUniformBlockParameter( program : Program, uniformBlockIndex : Int, pname : Int ) : Dynamic;
+	
+	/**
+		Retrieves the name of the active uniform block at a given index within a `WebGLProgram`.
+	**/
+	function getActiveUniformBlockName( program : Program, uniformBlockIndex : Int ) : String;
+	
+	/**
+		Assigns binding points for active uniform blocks.
+	**/
+	function uniformBlockBinding( program : Program, uniformBlockIndex : Int, uniformBlockBinding : Int ) : Void;
+	
+	/**
+		Creates a new `WebGLVertexArrayObject`.
+	**/
+	function createVertexArray() : VertexArrayObject;
+	
+	/**
+		Deletes a given `WebGLVertexArrayObject`.
+	**/
+	function deleteVertexArray( vertexArray : VertexArrayObject ) : Void;
+	
+	/**
+		Returns `true` if a given object is a valid `WebGLVertexArrayObject`.
+	**/
+	function isVertexArray( vertexArray : VertexArrayObject ) : Bool;
+	
+	/**
+		Binds a given `WebGLVertexArrayObject` to the buffer.
+	**/
+	function bindVertexArray( array : VertexArrayObject ) : Void;
+	function getContextAttributes() : ContextAttributes;
+	function isContextLost() : Bool;
+	function getSupportedExtensions() : Array<String>;
+	/** @throws DOMError */
+	function getExtension<T>( name : Extension<T> ) : T;
+	function activeTexture( texture : Int ) : Void;
+	function attachShader( program : Program, shader : Shader ) : Void;
+	function bindAttribLocation( program : Program, index : Int, name : String ) : Void;
+	function bindBuffer( target : Int, buffer : Buffer ) : Void;
+	function bindFramebuffer( target : Int, framebuffer : Framebuffer ) : Void;
+	function bindRenderbuffer( target : Int, renderbuffer : Renderbuffer ) : Void;
+	function bindTexture( target : Int, texture : Texture ) : Void;
+	function blendColor( red : Float, green : Float, blue : Float, alpha : Float ) : Void;
+	function blendEquation( mode : Int ) : Void;
+	function blendEquationSeparate( modeRGB : Int, modeAlpha : Int ) : Void;
+	function blendFunc( sfactor : Int, dfactor : Int ) : Void;
+	function blendFuncSeparate( srcRGB : Int, dstRGB : Int, srcAlpha : Int, dstAlpha : Int ) : Void;
+	function checkFramebufferStatus( target : Int ) : Int;
+	function clear( mask : Int ) : Void;
+	function clearColor( red : Float, green : Float, blue : Float, alpha : Float ) : Void;
+	function clearDepth( depth : Float ) : Void;
+	function clearStencil( s : Int ) : Void;
+	function colorMask( red : Bool, green : Bool, blue : Bool, alpha : Bool ) : Void;
+	function compileShader( shader : Shader ) : Void;
+	function copyTexImage2D( target : Int, level : Int, internalformat : Int, x : Int, y : Int, width : Int, height : Int, border : Int ) : Void;
+	function copyTexSubImage2D( target : Int, level : Int, xoffset : Int, yoffset : Int, x : Int, y : Int, width : Int, height : Int ) : Void;
+	function createBuffer() : Buffer;
+	function createFramebuffer() : Framebuffer;
+	function createProgram() : Program;
+	function createRenderbuffer() : Renderbuffer;
+	function createShader( type : Int ) : Shader;
+	function createTexture() : Texture;
+	function cullFace( mode : Int ) : Void;
+	function deleteBuffer( buffer : Buffer ) : Void;
+	function deleteFramebuffer( framebuffer : Framebuffer ) : Void;
+	function deleteProgram( program : Program ) : Void;
+	function deleteRenderbuffer( renderbuffer : Renderbuffer ) : Void;
+	function deleteShader( shader : Shader ) : Void;
+	function deleteTexture( texture : Texture ) : Void;
+	function depthFunc( func : Int ) : Void;
+	function depthMask( flag : Bool ) : Void;
+	function depthRange( zNear : Float, zFar : Float ) : Void;
+	function detachShader( program : Program, shader : Shader ) : Void;
+	function disable( cap : Int ) : Void;
+	function disableVertexAttribArray( index : Int ) : Void;
+	function drawArrays( mode : Int, first : Int, count : Int ) : Void;
+	function drawElements( mode : Int, count : Int, type : Int, offset : Int ) : Void;
+	function enable( cap : Int ) : Void;
+	function enableVertexAttribArray( index : Int ) : Void;
+	function finish() : Void;
+	function flush() : Void;
+	function framebufferRenderbuffer( target : Int, attachment : Int, renderbuffertarget : Int, renderbuffer : Renderbuffer ) : Void;
+	function framebufferTexture2D( target : Int, attachment : Int, textarget : Int, texture : Texture, level : Int ) : Void;
+	function frontFace( mode : Int ) : Void;
+	function generateMipmap( target : Int ) : Void;
+	function getActiveAttrib( program : Program, index : Int ) : ActiveInfo;
+	function getActiveUniform( program : Program, index : Int ) : ActiveInfo;
+	function getAttachedShaders( program : Program ) : Array<Shader>;
+	function getAttribLocation( program : Program, name : String ) : Int;
+	function getBufferParameter( target : Int, pname : Int ) : Dynamic;
+	/** @throws DOMError */
+	function getParameter( pname : Int ) : Dynamic;
+	function getError() : Int;
+	/** @throws DOMError */
+	function getFramebufferAttachmentParameter( target : Int, attachment : Int, pname : Int ) : Dynamic;
+	function getProgramParameter( program : Program, pname : Int ) : Dynamic;
+	function getProgramInfoLog( program : Program ) : String;
+	function getRenderbufferParameter( target : Int, pname : Int ) : Dynamic;
+	function getShaderParameter( shader : Shader, pname : Int ) : Dynamic;
+	function getShaderPrecisionFormat( shadertype : Int, precisiontype : Int ) : ShaderPrecisionFormat;
+	function getShaderInfoLog( shader : Shader ) : String;
+	function getShaderSource( shader : Shader ) : String;
+	function getTexParameter( target : Int, pname : Int ) : Dynamic;
+	function getUniform( program : Program, location : UniformLocation ) : Dynamic;
+	function getUniformLocation( program : Program, name : String ) : UniformLocation;
+	/** @throws DOMError */
+	function getVertexAttrib( index : Int, pname : Int ) : Dynamic;
+	function getVertexAttribOffset( index : Int, pname : Int ) : Int;
+	function hint( target : Int, mode : Int ) : Void;
+	function isBuffer( buffer : Buffer ) : Bool;
+	function isEnabled( cap : Int ) : Bool;
+	function isFramebuffer( framebuffer : Framebuffer ) : Bool;
+	function isProgram( program : Program ) : Bool;
+	function isRenderbuffer( renderbuffer : Renderbuffer ) : Bool;
+	function isShader( shader : Shader ) : Bool;
+	function isTexture( texture : Texture ) : Bool;
+	function lineWidth( width : Float ) : Void;
+	function linkProgram( program : Program ) : Void;
+	function pixelStorei( pname : Int, param : Int ) : Void;
+	function polygonOffset( factor : Float, units : Float ) : Void;
+	function renderbufferStorage( target : Int, internalformat : Int, width : Int, height : Int ) : Void;
+	function sampleCoverage( value : Float, invert : Bool ) : Void;
+	function scissor( x : Int, y : Int, width : Int, height : Int ) : Void;
+	function shaderSource( shader : Shader, source : String ) : Void;
+	function stencilFunc( func : Int, ref : Int, mask : Int ) : Void;
+	function stencilFuncSeparate( face : Int, func : Int, ref : Int, mask : Int ) : Void;
+	function stencilMask( mask : Int ) : Void;
+	function stencilMaskSeparate( face : Int, mask : Int ) : Void;
+	function stencilOp( fail : Int, zfail : Int, zpass : Int ) : Void;
+	function stencilOpSeparate( face : Int, fail : Int, zfail : Int, zpass : Int ) : Void;
+	function texParameterf( target : Int, pname : Int, param : Float ) : Void;
+	function texParameteri( target : Int, pname : Int, param : Int ) : Void;
+	function uniform1f( location : UniformLocation, x : Float ) : Void;
+	function uniform2f( location : UniformLocation, x : Float, y : Float ) : Void;
+	function uniform3f( location : UniformLocation, x : Float, y : Float, z : Float ) : Void;
+	function uniform4f( location : UniformLocation, x : Float, y : Float, z : Float, w : Float ) : Void;
+	function uniform1i( location : UniformLocation, x : Int ) : Void;
+	function uniform2i( location : UniformLocation, x : Int, y : Int ) : Void;
+	function uniform3i( location : UniformLocation, x : Int, y : Int, z : Int ) : Void;
+	function uniform4i( location : UniformLocation, x : Int, y : Int, z : Int, w : Int ) : Void;
+	function useProgram( program : Program ) : Void;
+	function validateProgram( program : Program ) : Void;
+	function vertexAttrib1f( indx : Int, x : Float ) : Void;
+	@:overload( function( indx : Int, values : Array<Float>) : Void {} )
+	function vertexAttrib1fv( indx : Int, values : js.lib.Float32Array ) : Void;
+	function vertexAttrib2f( indx : Int, x : Float, y : Float ) : Void;
+	@:overload( function( indx : Int, values : Array<Float>) : Void {} )
+	function vertexAttrib2fv( indx : Int, values : js.lib.Float32Array ) : Void;
+	function vertexAttrib3f( indx : Int, x : Float, y : Float, z : Float ) : Void;
+	@:overload( function( indx : Int, values : Array<Float>) : Void {} )
+	function vertexAttrib3fv( indx : Int, values : js.lib.Float32Array ) : Void;
+	function vertexAttrib4f( indx : Int, x : Float, y : Float, z : Float, w : Float ) : Void;
+	@:overload( function( indx : Int, values : Array<Float>) : Void {} )
+	function vertexAttrib4fv( indx : Int, values : js.lib.Float32Array ) : Void;
+	function vertexAttribPointer( indx : Int, size : Int, type : Int, normalized : Bool, stride : Int, offset : Int ) : Void;
+	function viewport( x : Int, y : Int, width : Int, height : Int ) : Void;
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionInstancedArrays.hx b/std/js/html/webgl/extension/ANGLEInstancedArrays.hx
similarity index 90%
rename from std/js/html/webgl/ExtensionInstancedArrays.hx
rename to std/js/html/webgl/extension/ANGLEInstancedArrays.hx
index 157030d87e0d1871ce660954752f022474c1cf5a..017a873afa1970995d7e1aa74eea4d50ee815dcc 100644
--- a/std/js/html/webgl/ExtensionInstancedArrays.hx
+++ b/std/js/html/webgl/extension/ANGLEInstancedArrays.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `ANGLE_instanced_arrays` extension is part of the WebGL API and allows to draw the same object, or groups of similar objects multiple times, if they share the same vertex data, primitive count and type.
@@ -32,8 +32,11 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/ANGLE_instanced_arrays>
 **/
 @:native("ANGLE_instanced_arrays")
-extern class ExtensionInstancedArrays
-{
+extern class ANGLEInstancedArrays {
+	
+	/**
+		Returns a `GLint` describing the frequency divisor used for instanced rendering when used in the `WebGLRenderingContext.getVertexAttrib()` as the `pname` parameter.
+	**/
 	static inline var VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE : Int = 35070;
 	
 	
diff --git a/std/js/html/webgl/ExtensionBlendMinMax.hx b/std/js/html/webgl/extension/EXTBlendMinmax.hx
similarity index 86%
rename from std/js/html/webgl/ExtensionBlendMinMax.hx
rename to std/js/html/webgl/extension/EXTBlendMinmax.hx
index 42b6e2ee6bda03b3de9de9e4c97b5421e3866fbc..ab98f2170ec5a233c7acf7df2bc333141f3bc879 100644
--- a/std/js/html/webgl/ExtensionBlendMinMax.hx
+++ b/std/js/html/webgl/extension/EXTBlendMinmax.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `EXT_blend_minmax` extension is part of the WebGL API and extends blending capabilities by adding two new blend equations: the minimum or maximum color components of the source and destination colors.
@@ -32,9 +32,16 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/EXT_blend_minmax>
 **/
 @:native("EXT_blend_minmax")
-extern class ExtensionBlendMinMax
-{
+extern class EXTBlendMinmax {
+	
+	/**
+		Produces the minimum color components of the source and destination colors.
+	**/
 	static inline var MIN_EXT : Int = 32775;
+	
+	/**
+		Produces the maximum color components of the source and destination colors.
+	**/
 	static inline var MAX_EXT : Int = 32776;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/extension/EXTColorBufferFloat.hx b/std/js/html/webgl/extension/EXTColorBufferFloat.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f95368db2afa51be12bc3e6a761c478f08bf020d
--- /dev/null
+++ b/std/js/html/webgl/extension/EXTColorBufferFloat.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGL2RenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+typedef EXTColorBufferFloat = {
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionColorBufferHalfFloat.hx b/std/js/html/webgl/extension/EXTColorBufferHalfFloat.hx
similarity index 87%
rename from std/js/html/webgl/ExtensionColorBufferHalfFloat.hx
rename to std/js/html/webgl/extension/EXTColorBufferHalfFloat.hx
index 90163146d730cd50d00c2fa3958b77db7f0f8fd3..008e66f78899bf6045c2f8ba0933b0a263efe2b3 100644
--- a/std/js/html/webgl/ExtensionColorBufferHalfFloat.hx
+++ b/std/js/html/webgl/extension/EXTColorBufferHalfFloat.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `EXT_color_buffer_half_float` extension is part of the WebGL API and adds the ability to render to 16-bit floating-point color buffers.
@@ -32,11 +32,26 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/EXT_color_buffer_half_float>
 **/
 @:native("EXT_color_buffer_half_float")
-extern class ExtensionColorBufferHalfFloat
-{
+extern class EXTColorBufferHalfFloat {
+	
+	/**
+		RGBA 16-bit floating-point color-renderable format.
+	**/
 	static inline var RGBA16F_EXT : Int = 34842;
+	
+	/**
+		RGB 16-bit floating-point color-renderable format.
+	**/
 	static inline var RGB16F_EXT : Int = 34843;
+	
+	/**
+		?
+	**/
 	static inline var FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT : Int = 33297;
+	
+	/**
+		?
+	**/
 	static inline var UNSIGNED_NORMALIZED_EXT : Int = 35863;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionDisjointTimerQuery.hx b/std/js/html/webgl/extension/EXTDisjointTimerQuery.hx
similarity index 69%
rename from std/js/html/webgl/ExtensionDisjointTimerQuery.hx
rename to std/js/html/webgl/extension/EXTDisjointTimerQuery.hx
index 26e3b7590c3a97a2d7696478561fedeb2b45750c..76955e40bcc4ebf31e949a7052563ca37de0008a 100644
--- a/std/js/html/webgl/ExtensionDisjointTimerQuery.hx
+++ b/std/js/html/webgl/extension/EXTDisjointTimerQuery.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The EXT_disjoint_timer_query extension is part of the WebGL API and provides a way to measure the duration of a set of GL commands, without stalling the rendering pipeline.
@@ -32,42 +32,69 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/EXT_disjoint_timer_query>
 **/
 @:native("EXT_disjoint_timer_query")
-extern class ExtensionDisjointTimerQuery
-{
+extern class EXTDisjointTimerQuery {
+	
+	/**
+		A `GLint` indicating the number of bits used to hold the query result for the given target.
+	**/
 	static inline var QUERY_COUNTER_BITS_EXT : Int = 34916;
+	
+	/**
+		A `WebGLQuery` object, which is the currently active query for the given target.
+	**/
 	static inline var CURRENT_QUERY_EXT : Int = 34917;
+	
+	/**
+		A `GLuint64EXT` containing the query result.
+	**/
 	static inline var QUERY_RESULT_EXT : Int = 34918;
+	
+	/**
+		A `GLboolean` indicating whether or not a query result is available.
+	**/
 	static inline var QUERY_RESULT_AVAILABLE_EXT : Int = 34919;
+	
+	/**
+		Elapsed time (in nanoseconds).
+	**/
 	static inline var TIME_ELAPSED_EXT : Int = 35007;
+	
+	/**
+		The current time.
+	**/
 	static inline var TIMESTAMP_EXT : Int = 36392;
+	
+	/**
+		A `GLboolean` indicating whether or not the GPU performed any disjoint operation.
+	**/
 	static inline var GPU_DISJOINT_EXT : Int = 36795;
 	
 	
 	/**
 		
-		 Creates a new `WebGLTimerQueryEXT`.
+		 Creates a new `WebGLQuery`.
 		 
 	**/
-	function createQueryEXT() : TimerQueryEXT;
+	function createQueryEXT() : js.html.webgl.Query;
 	
 	/**
 		
-		 Deletes a given `WebGLTimerQueryEXT`.
+		 Deletes a given `WebGLQuery`.
 		 
 	**/
-	function deleteQueryEXT( query : TimerQueryEXT ) : Void;
+	function deleteQueryEXT( query : js.html.webgl.Query ) : Void;
 	
 	/**
 		
-		 Returns `true` if a given object is a `WebGLTimerQueryEXT`.
+		 Returns `true` if a given object is a `WebGLQuery`.
 		 
 	**/
-	function isQueryEXT( query : TimerQueryEXT ) : Bool;
+	function isQueryEXT( query : js.html.webgl.Query ) : Bool;
 	
 	/**
 		The timer starts when all commands prior to `beginQueryEXT` have been fully executed.
 	**/
-	function beginQueryEXT( target : Int, query : TimerQueryEXT ) : Void;
+	function beginQueryEXT( target : Int, query : js.html.webgl.Query ) : Void;
 	
 	/**
 		The timer stops when all commands prior to `endQueryEXT` have been fully executed.
@@ -79,7 +106,7 @@ extern class ExtensionDisjointTimerQuery
 		 Records the current time into the corresponding query object.
 		 
 	**/
-	function queryCounterEXT( query : TimerQueryEXT, target : Int ) : Void;
+	function queryCounterEXT( query : js.html.webgl.Query, target : Int ) : Void;
 	
 	/**
 		Returns information about a query target.
@@ -89,5 +116,5 @@ extern class ExtensionDisjointTimerQuery
 	/**
 		Return the state of a query object.
 	**/
-	function getQueryObjectEXT( query : TimerQueryEXT, pname : Int ) : Dynamic;
+	function getQueryObjectEXT( query : js.html.webgl.Query, pname : Int ) : Dynamic;
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/extension/EXTFragDepth.hx b/std/js/html/webgl/extension/EXTFragDepth.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b52953bfec13b78b007d6f762a2ab0a99d2e210a
--- /dev/null
+++ b/std/js/html/webgl/extension/EXTFragDepth.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+typedef EXTFragDepth = {
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/extension/EXTShaderTextureLod.hx b/std/js/html/webgl/extension/EXTShaderTextureLod.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3ed7d64b4e93cdd1394615167a55705127270314
--- /dev/null
+++ b/std/js/html/webgl/extension/EXTShaderTextureLod.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+typedef EXTShaderTextureLod = {
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionSRGB.hx b/std/js/html/webgl/extension/EXTSrgb.hx
similarity index 83%
rename from std/js/html/webgl/ExtensionSRGB.hx
rename to std/js/html/webgl/extension/EXTSrgb.hx
index 644c3f1ec7362b5d1046bb42234becdb89f46195..40088ee0efb9b3d7ee69b114bda94348f869bfc1 100644
--- a/std/js/html/webgl/ExtensionSRGB.hx
+++ b/std/js/html/webgl/extension/EXTSrgb.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `EXT_sRGB` extension is part of the WebGL API and adds sRGB support to textures and framebuffer objects.
@@ -32,11 +32,26 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/EXT_sRGB>
 **/
 @:native("EXT_sRGB")
-extern class ExtensionSRGB
-{
+extern class EXTSrgb {
+	
+	/**
+		Unsized sRGB format that leaves the precision up to the driver.
+	**/
 	static inline var SRGB_EXT : Int = 35904;
+	
+	/**
+		Unsized sRGB format with unsized alpha component.
+	**/
 	static inline var SRGB_ALPHA_EXT : Int = 35906;
+	
+	/**
+		Sized (8-bit) sRGB and alpha formats.
+	**/
 	static inline var SRGB8_ALPHA8_EXT : Int = 35907;
+	
+	/**
+		Returns the framebuffer color encoding (`gl.LINEAR` or `ext.SRGB_EXT`).
+	**/
 	static inline var FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT : Int = 33296;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionTextureFilterAnisotropic.hx b/std/js/html/webgl/extension/EXTTextureFilterAnisotropic.hx
similarity index 79%
rename from std/js/html/webgl/ExtensionTextureFilterAnisotropic.hx
rename to std/js/html/webgl/extension/EXTTextureFilterAnisotropic.hx
index 20125b753f2a9f61825271d3b013413b234584ec..2ba38f598b1b7706224cc5af78f4acdf0d2d61ef 100644
--- a/std/js/html/webgl/ExtensionTextureFilterAnisotropic.hx
+++ b/std/js/html/webgl/extension/EXTTextureFilterAnisotropic.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `EXT_texture_filter_anisotropic` extension is part of the WebGL API and exposes two constants for anisotropic filtering (AF).
@@ -32,9 +32,16 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/EXT_texture_filter_anisotropic>
 **/
 @:native("EXT_texture_filter_anisotropic")
-extern class ExtensionTextureFilterAnisotropic
-{
+extern class EXTTextureFilterAnisotropic {
+	
+	/**
+		This is the `pname` argument to the `WebGLRenderingContext.getTexParameter` and `WebGLRenderingContext.texParameterf` / `WebGLRenderingContext.texParameteri` calls and sets the desired maximum anisotropy for a texture.
+	**/
 	static inline var TEXTURE_MAX_ANISOTROPY_EXT : Int = 34046;
+	
+	/**
+		This is the `pname` argument to the `WebGLRenderingContext.getParameter` call, and it returns the maximum available anisotropy.
+	**/
 	static inline var MAX_TEXTURE_MAX_ANISOTROPY_EXT : Int = 34047;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/extension/OESElementIndexUint.hx b/std/js/html/webgl/extension/OESElementIndexUint.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b1779503c2ab4111c5b51a52aa06ff1d56ea4aaa
--- /dev/null
+++ b/std/js/html/webgl/extension/OESElementIndexUint.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+typedef OESElementIndexUint = {
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionStandardDerivatives.hx b/std/js/html/webgl/extension/OESStandardDerivatives.hx
similarity index 87%
rename from std/js/html/webgl/ExtensionStandardDerivatives.hx
rename to std/js/html/webgl/extension/OESStandardDerivatives.hx
index 1d3edb6a7548527afc23ed9ca56b2707905ae728..9923e325360524f31d246387ba00c06197e875c4 100644
--- a/std/js/html/webgl/ExtensionStandardDerivatives.hx
+++ b/std/js/html/webgl/extension/OESStandardDerivatives.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `OES_standard_derivatives` extension is part of the WebGL API and adds the GLSL derivative functions `dFdx`, `dFdy`, and `fwidth`.
@@ -32,8 +32,11 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/OES_standard_derivatives>
 **/
 @:native("OES_standard_derivatives")
-extern class ExtensionStandardDerivatives
-{
+extern class OESStandardDerivatives {
+	
+	/**
+		A `Glenum` indicating the accuracy of the derivative calculation for the GLSL built-in functions: `dFdx`, `dFdy`, and `fwidth`.
+	**/
 	static inline var FRAGMENT_SHADER_DERIVATIVE_HINT_OES : Int = 35723;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/extension/OESTextureFloat.hx b/std/js/html/webgl/extension/OESTextureFloat.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9d7655b22ed9f87faa1376b8bf3f352d004a79eb
--- /dev/null
+++ b/std/js/html/webgl/extension/OESTextureFloat.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+typedef OESTextureFloat = {
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/extension/OESTextureFloatLinear.hx b/std/js/html/webgl/extension/OESTextureFloatLinear.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8956c0b8cd0fd65914a9fbee6a74697bfd082106
--- /dev/null
+++ b/std/js/html/webgl/extension/OESTextureFloatLinear.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+typedef OESTextureFloatLinear = {
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionTextureHalfFloat.hx b/std/js/html/webgl/extension/OESTextureHalfFloat.hx
similarity index 91%
rename from std/js/html/webgl/ExtensionTextureHalfFloat.hx
rename to std/js/html/webgl/extension/OESTextureHalfFloat.hx
index 50e3abeae9684086f71a1e039e496884b52c7d1f..bb578ae6b4bfdc918a4a1e71d431faebec6fc9b7 100644
--- a/std/js/html/webgl/ExtensionTextureHalfFloat.hx
+++ b/std/js/html/webgl/extension/OESTextureHalfFloat.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `OES_texture_half_float` extension is part of the WebGL API and adds texture formats with 16- (aka half float) and 32-bit floating-point components.
@@ -32,8 +32,11 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/OES_texture_half_float>
 **/
 @:native("OES_texture_half_float")
-extern class ExtensionTextureHalfFloat
-{
+extern class OESTextureHalfFloat {
+	
+	/**
+		Half floating-point type (16-bit).
+	**/
 	static inline var HALF_FLOAT_OES : Int = 36193;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/extension/OESTextureHalfFloatLinear.hx b/std/js/html/webgl/extension/OESTextureHalfFloatLinear.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3e3853e389fefa01ff914afcd2222978217d62af
--- /dev/null
+++ b/std/js/html/webgl/extension/OESTextureHalfFloatLinear.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+typedef OESTextureHalfFloatLinear = {
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionVertexArrayObject.hx b/std/js/html/webgl/extension/OESVertexArrayObject.hx
similarity index 70%
rename from std/js/html/webgl/ExtensionVertexArrayObject.hx
rename to std/js/html/webgl/extension/OESVertexArrayObject.hx
index f5742af567a22ce154e9aa398cbe7d6be232baca..5ed59bab6fde73e3aae06ce217d6b218f69dd1cc 100644
--- a/std/js/html/webgl/ExtensionVertexArrayObject.hx
+++ b/std/js/html/webgl/extension/OESVertexArrayObject.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The OES_vertex_array_object extension is part of the WebGL API and provides vertex array objects (VAOs) which encapsulate vertex array states. These objects keep pointers to vertex data and provide names for different sets of vertex data.
@@ -32,36 +32,39 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/OES_vertex_array_object>
 **/
 @:native("OES_vertex_array_object")
-extern class ExtensionVertexArrayObject
-{
+extern class OESVertexArrayObject {
+	
+	/**
+		Returns a `WebGLVertexArrayObject` object when used in the `WebGLRenderingContext.getParameter()` method as the `pname` parameter.
+	**/
 	static inline var VERTEX_ARRAY_BINDING_OES : Int = 34229;
 	
 	
 	/**
 		
-		 Creates a new `WebGLVertexArrayObjectOES`.
-		 
+			Creates a new `WebGLVertexArrayObject`.
+			
 	**/
-	function createVertexArrayOES() : VertexArrayObjectOES;
+	function createVertexArrayOES() : js.html.webgl.VertexArrayObject;
 	
 	/**
 		
-		 Deletes a given `WebGLVertexArrayObjectOES`.
-		 
+			Deletes a given `WebGLVertexArrayObject`.
+			
 	**/
-	function deleteVertexArrayOES( arrayObject : VertexArrayObjectOES ) : Void;
+	function deleteVertexArrayOES( arrayObject : js.html.webgl.VertexArrayObject ) : Void;
 	
 	/**
 		
-		 Returns `true` if a given object is a `WebGLVertexArrayObjectOES`.
-		 
+			Returns `true` if a given object is a `WebGLVertexArrayObject`.
+			
 	**/
-	function isVertexArrayOES( arrayObject : VertexArrayObjectOES ) : Bool;
+	function isVertexArrayOES( arrayObject : js.html.webgl.VertexArrayObject ) : Bool;
 	
 	/**
 		
-		 Binds a given `WebGLVertexArrayObjectOES` to the buffer.
-		 
+			Binds a given `WebGLVertexArrayObject` to the buffer.
+			
 	**/
-	function bindVertexArrayOES( arrayObject : VertexArrayObjectOES ) : Void;
+	function bindVertexArrayOES( arrayObject : js.html.webgl.VertexArrayObject ) : Void;
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionColorBufferFloat.hx b/std/js/html/webgl/extension/WEBGLColorBufferFloat.hx
similarity index 87%
rename from std/js/html/webgl/ExtensionColorBufferFloat.hx
rename to std/js/html/webgl/extension/WEBGLColorBufferFloat.hx
index 3ca743a88344365e6c1ebf8596bc3be208d6a14b..6c5bead4373f495049ac1014e812542c385481b2 100644
--- a/std/js/html/webgl/ExtensionColorBufferFloat.hx
+++ b/std/js/html/webgl/extension/WEBGLColorBufferFloat.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `WEBGL_color_buffer_float` extension is part of the WebGL API and adds the ability to render to 32-bit floating-point color buffers.
@@ -32,11 +32,26 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_color_buffer_float>
 **/
 @:native("WEBGL_color_buffer_float")
-extern class ExtensionColorBufferFloat
-{
+extern class WEBGLColorBufferFloat {
+	
+	/**
+		RGBA 32-bit floating-point color-renderable format.
+	**/
 	static inline var RGBA32F_EXT : Int = 34836;
+	
+	/**
+		RGB 32-bit floating-point color-renderable format.
+	**/
 	static inline var RGB32F_EXT : Int = 34837;
+	
+	/**
+		?
+	**/
 	static inline var FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT : Int = 33297;
+	
+	/**
+		?
+	**/
 	static inline var UNSIGNED_NORMALIZED_EXT : Int = 35863;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/extension/WEBGLCompressedTextureAstc.hx b/std/js/html/webgl/extension/WEBGLCompressedTextureAstc.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2c18f68c2221bc672c06e7bab3d77966ac27b29a
--- /dev/null
+++ b/std/js/html/webgl/extension/WEBGLCompressedTextureAstc.hx
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+/**
+	The `WEBGL_compressed_texture_astc` extension is part of the WebGL API and exposes Adaptive Scalable Texture Compression (ASTC) compressed texture formats to WebGL.
+
+	Documentation [WEBGL_compressed_texture_astc](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_astc) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_astc$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_astc>
+**/
+@:native("WEBGL_compressed_texture_astc")
+extern class WEBGLCompressedTextureAstc {
+	static inline var COMPRESSED_RGBA_ASTC_4x4_KHR : Int = 37808;
+	static inline var COMPRESSED_RGBA_ASTC_5x4_KHR : Int = 37809;
+	static inline var COMPRESSED_RGBA_ASTC_5x5_KHR : Int = 37810;
+	static inline var COMPRESSED_RGBA_ASTC_6x5_KHR : Int = 37811;
+	static inline var COMPRESSED_RGBA_ASTC_6x6_KHR : Int = 37812;
+	static inline var COMPRESSED_RGBA_ASTC_8x5_KHR : Int = 37813;
+	static inline var COMPRESSED_RGBA_ASTC_8x6_KHR : Int = 37814;
+	static inline var COMPRESSED_RGBA_ASTC_8x8_KHR : Int = 37815;
+	static inline var COMPRESSED_RGBA_ASTC_10x5_KHR : Int = 37816;
+	static inline var COMPRESSED_RGBA_ASTC_10x6_KHR : Int = 37817;
+	static inline var COMPRESSED_RGBA_ASTC_10x8_KHR : Int = 37818;
+	static inline var COMPRESSED_RGBA_ASTC_10x10_KHR : Int = 37819;
+	static inline var COMPRESSED_RGBA_ASTC_12x10_KHR : Int = 37820;
+	static inline var COMPRESSED_RGBA_ASTC_12x12_KHR : Int = 37821;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR : Int = 37840;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR : Int = 37841;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR : Int = 37842;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR : Int = 37843;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR : Int = 37844;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR : Int = 37845;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR : Int = 37846;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR : Int = 37847;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR : Int = 37848;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR : Int = 37849;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR : Int = 37850;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR : Int = 37851;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR : Int = 37852;
+	static inline var COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR : Int = 37853;
+	
+	function getSupportedProfiles() : Array<String>;
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionCompressedTextureATC.hx b/std/js/html/webgl/extension/WEBGLCompressedTextureAtc.hx
similarity index 83%
rename from std/js/html/webgl/ExtensionCompressedTextureATC.hx
rename to std/js/html/webgl/extension/WEBGLCompressedTextureAtc.hx
index 80a9151c4d178dd47fec45ca8c37b33918548f38..b27715f1d4e7fd8445c1dfe018b4f74bad502e36 100644
--- a/std/js/html/webgl/ExtensionCompressedTextureATC.hx
+++ b/std/js/html/webgl/extension/WEBGLCompressedTextureAtc.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `WEBGL_compressed_texture_atc` extension is part of the WebGL API and exposes 3 ATC compressed texture formats. ATC is a proprietary compression algorithm for compressing textures on handheld devices.
@@ -32,10 +32,21 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_atc>
 **/
 @:native("WEBGL_compressed_texture_atc")
-extern class ExtensionCompressedTextureATC
-{
+extern class WEBGLCompressedTextureAtc {
+	
+	/**
+		Compresses RGB textures with no alpha channel.
+	**/
 	static inline var COMPRESSED_RGB_ATC_WEBGL : Int = 35986;
+	
+	/**
+		Compresses RGBA textures using explicit alpha encoding (useful when alpha transitions are sharp).
+	**/
 	static inline var COMPRESSED_RGBA_ATC_EXPLICIT_ALPHA_WEBGL : Int = 35987;
+	
+	/**
+		Compresses RGBA textures using interpolated alpha encoding (useful when alpha transitions are gradient).
+	**/
 	static inline var COMPRESSED_RGBA_ATC_INTERPOLATED_ALPHA_WEBGL : Int = 34798;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionCompressedTextureES3.hx b/std/js/html/webgl/extension/WEBGLCompressedTextureEtc.hx
similarity index 59%
rename from std/js/html/webgl/ExtensionCompressedTextureES3.hx
rename to std/js/html/webgl/extension/WEBGLCompressedTextureEtc.hx
index 43ef12adce51836f2d17dc79ab4a6e074a18610d..1d830607587398c23b4aa616bfe5900cf60ae73a 100644
--- a/std/js/html/webgl/ExtensionCompressedTextureES3.hx
+++ b/std/js/html/webgl/extension/WEBGLCompressedTextureEtc.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,27 +22,66 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
-	The `WEBGL_compressed_texture_es3` extension is part of the WebGL API and exposes 10 ETC/EAC compressed texture formats.
+	The `WEBGL_compressed_texture_etc` extension is part of the WebGL API and exposes 10 ETC/EAC compressed texture formats.
 
-	Documentation [WEBGL_compressed_texture_es3](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_es3) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_es3$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	Documentation [WEBGL_compressed_texture_etc](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_etc) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_etc$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_es3>
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_etc>
 **/
-@:native("WEBGL_compressed_texture_es3")
-extern class ExtensionCompressedTextureES3
-{
+@:native("WEBGL_compressed_texture_etc")
+extern class WEBGLCompressedTextureEtc {
+	
+	/**
+		One-channel (red) unsigned format compression.
+	**/
 	static inline var COMPRESSED_R11_EAC : Int = 37488;
+	
+	/**
+		One-channel (red) signed format compression.
+	**/
 	static inline var COMPRESSED_SIGNED_R11_EAC : Int = 37489;
+	
+	/**
+		Two-channel (red and green) unsigned format compression.
+	**/
 	static inline var COMPRESSED_RG11_EAC : Int = 37490;
+	
+	/**
+		Two-channel (red and green) signed format compression.
+	**/
 	static inline var COMPRESSED_SIGNED_RG11_EAC : Int = 37491;
+	
+	/**
+		Compresses RGB8 data with no alpha channel.
+	**/
 	static inline var COMPRESSED_RGB8_ETC2 : Int = 37492;
+	
+	/**
+		Compresses sRGB8 data with no alpha channel.
+	**/
 	static inline var COMPRESSED_SRGB8_ETC2 : Int = 37493;
+	
+	/**
+		Similar to `RGB8_ETC`, but with ability to punch through the alpha channel, which means to make it completely opaque or transparent.
+	**/
 	static inline var COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 : Int = 37494;
+	
+	/**
+		Similar to `SRGB8_ETC`, but with ability to punch through the alpha channel, which means to make it completely opaque or transparent.
+	**/
 	static inline var COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 : Int = 37495;
+	
+	/**
+		Compresses RGBA8 data. The RGB part is encoded the same as `RGB_ETC2`, but the alpha part is encoded separately.
+	**/
 	static inline var COMPRESSED_RGBA8_ETC2_EAC : Int = 37496;
+	
+	/**
+		Compresses sRGBA8 data. The sRGB part is encoded the same as `SRGB_ETC2`, but the alpha part is encoded separately.
+	**/
 	static inline var COMPRESSED_SRGB8_ALPHA8_ETC2_EAC : Int = 37497;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionCompressedTextureETC1.hx b/std/js/html/webgl/extension/WEBGLCompressedTextureEtc1.hx
similarity index 90%
rename from std/js/html/webgl/ExtensionCompressedTextureETC1.hx
rename to std/js/html/webgl/extension/WEBGLCompressedTextureEtc1.hx
index 387a96be8c5a7ab7d10091d39ffce085e57cd0dd..01998ac62f4cc9e46f0063367a2da1bf46410f90 100644
--- a/std/js/html/webgl/ExtensionCompressedTextureETC1.hx
+++ b/std/js/html/webgl/extension/WEBGLCompressedTextureEtc1.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `WEBGL_compressed_texture_etc1` extension is part of the WebGL API and exposes the ETC1 compressed texture format.
@@ -32,8 +32,11 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_etc1>
 **/
 @:native("WEBGL_compressed_texture_etc1")
-extern class ExtensionCompressedTextureETC1
-{
+extern class WEBGLCompressedTextureEtc1 {
+	
+	/**
+		Compresses 24-bit RGB data with no alpha channel.
+	**/
 	static inline var COMPRESSED_RGB_ETC1_WEBGL : Int = 36196;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionCompressedTexturePVRTC.hx b/std/js/html/webgl/extension/WEBGLCompressedTexturePvrtc.hx
similarity index 82%
rename from std/js/html/webgl/ExtensionCompressedTexturePVRTC.hx
rename to std/js/html/webgl/extension/WEBGLCompressedTexturePvrtc.hx
index 54df7e0c63a311ea3bdc2754dc98b5857b4c89bb..11d3553c920a90a3a9ea15a8e6e488366eab78a4 100644
--- a/std/js/html/webgl/ExtensionCompressedTexturePVRTC.hx
+++ b/std/js/html/webgl/extension/WEBGLCompressedTexturePvrtc.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `WEBGL_compressed_texture_pvrtc` extension is part of the WebGL API and exposes four PVRTC compressed texture formats.
@@ -32,11 +32,26 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_pvrtc>
 **/
 @:native("WEBGL_compressed_texture_pvrtc")
-extern class ExtensionCompressedTexturePVRTC
-{
+extern class WEBGLCompressedTexturePvrtc {
+	
+	/**
+		RGB compression in 4-bit mode. One block for each 4×4 pixels.
+	**/
 	static inline var COMPRESSED_RGB_PVRTC_4BPPV1_IMG : Int = 35840;
+	
+	/**
+		RGB compression in 2-bit mode. One block for each 8×4 pixels.
+	**/
 	static inline var COMPRESSED_RGB_PVRTC_2BPPV1_IMG : Int = 35841;
+	
+	/**
+		RGBA compression in 4-bit mode. One block for each 4×4 pixels.
+	**/
 	static inline var COMPRESSED_RGBA_PVRTC_4BPPV1_IMG : Int = 35842;
+	
+	/**
+		RGBA compression in 2-bit mode. One block for each 8×4 pixels.
+	**/
 	static inline var COMPRESSED_RGBA_PVRTC_2BPPV1_IMG : Int = 35843;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionCompressedTextureS3TC.hx b/std/js/html/webgl/extension/WEBGLCompressedTextureS3tc.hx
similarity index 77%
rename from std/js/html/webgl/ExtensionCompressedTextureS3TC.hx
rename to std/js/html/webgl/extension/WEBGLCompressedTextureS3tc.hx
index 202405160f04a79224229611047bdb748d71338b..e25a75db45533c57658815ec0d28d6e8bde9d902 100644
--- a/std/js/html/webgl/ExtensionCompressedTextureS3TC.hx
+++ b/std/js/html/webgl/extension/WEBGLCompressedTextureS3tc.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `WEBGL_compressed_texture_s3tc` extension is part of the WebGL API and exposes four S3TC compressed texture formats.
@@ -32,11 +32,26 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_s3tc>
 **/
 @:native("WEBGL_compressed_texture_s3tc")
-extern class ExtensionCompressedTextureS3TC
-{
+extern class WEBGLCompressedTextureS3tc {
+	
+	/**
+		A DXT1-compressed image in an RGB image format.
+	**/
 	static inline var COMPRESSED_RGB_S3TC_DXT1_EXT : Int = 33776;
+	
+	/**
+		A DXT1-compressed image in an RGB image format with a simple on/off alpha value.
+	**/
 	static inline var COMPRESSED_RGBA_S3TC_DXT1_EXT : Int = 33777;
+	
+	/**
+		A DXT3-compressed image in an RGBA image format. Compared to a 32-bit RGBA texture, it offers 4:1 compression.
+	**/
 	static inline var COMPRESSED_RGBA_S3TC_DXT3_EXT : Int = 33778;
+	
+	/**
+		A DXT5-compressed image in an RGBA image format. It also provides a 4:1 compression, but differs to the DXT3 compression in how the alpha compression is done.
+	**/
 	static inline var COMPRESSED_RGBA_S3TC_DXT5_EXT : Int = 33779;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/extension/WEBGLCompressedTextureS3tcSrgb.hx b/std/js/html/webgl/extension/WEBGLCompressedTextureS3tcSrgb.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4f590f575ace6167f8d9d74289058fdcd134785d
--- /dev/null
+++ b/std/js/html/webgl/extension/WEBGLCompressedTextureS3tcSrgb.hx
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+/**
+	The `WEBGL_compressed_texture_s3tc_srgb` extension is part of the WebGL API and exposes four S3TC compressed texture formats for the sRGB colorspace.
+
+	Documentation [WEBGL_compressed_texture_s3tc_srgb](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_s3tc_srgb) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_s3tc_srgb$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_compressed_texture_s3tc_srgb>
+**/
+@:native("WEBGL_compressed_texture_s3tc_srgb")
+extern class WEBGLCompressedTextureS3tcSrgb {
+	
+	/**
+		A DXT1-compressed image in an sRGB image format.
+	**/
+	static inline var COMPRESSED_SRGB_S3TC_DXT1_EXT : Int = 35916;
+	
+	/**
+		A DXT1-compressed image in an sRGB image format with a simple on/off alpha value.
+	**/
+	static inline var COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT : Int = 35917;
+	
+	/**
+		A DXT3-compressed image in an sRGBA image format.
+	**/
+	static inline var COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT : Int = 35918;
+	
+	/**
+		A DXT5-compressed image in an sRGBA image format.
+	**/
+	static inline var COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT : Int = 35919;
+	
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionDebugRendererInfo.hx b/std/js/html/webgl/extension/WEBGLDebugRendererInfo.hx
similarity index 94%
rename from std/js/html/webgl/ExtensionDebugRendererInfo.hx
rename to std/js/html/webgl/extension/WEBGLDebugRendererInfo.hx
index dd6c0e1b5db12d4fab305ed7c47533c1e8a85ff2..69d69574edc546733276e6db6e58fe6304e09a3f 100644
--- a/std/js/html/webgl/ExtensionDebugRendererInfo.hx
+++ b/std/js/html/webgl/extension/WEBGLDebugRendererInfo.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `WEBGL_debug_renderer_info` extension is part of the WebGL API and exposes two constants with information about the graphics driver for debugging purposes.
@@ -32,8 +32,7 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_debug_renderer_info>
 **/
 @:native("WEBGL_debug_renderer_info")
-extern class ExtensionDebugRendererInfo
-{
+extern class WEBGLDebugRendererInfo {
 	static inline var UNMASKED_VENDOR_WEBGL : Int = 37445;
 	static inline var UNMASKED_RENDERER_WEBGL : Int = 37446;
 	
diff --git a/std/js/html/webgl/extension/WEBGLDebugShaders.hx b/std/js/html/webgl/extension/WEBGLDebugShaders.hx
new file mode 100644
index 0000000000000000000000000000000000000000..811f9ceca6a302dd968b8d58e7832c6c131af7b8
--- /dev/null
+++ b/std/js/html/webgl/extension/WEBGLDebugShaders.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+typedef WEBGLDebugShaders = {
+	function getTranslatedShaderSource( shader : js.html.webgl.Shader ) : String;
+}
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionDepthTexture.hx b/std/js/html/webgl/extension/WEBGLDepthTexture.hx
similarity index 90%
rename from std/js/html/webgl/ExtensionDepthTexture.hx
rename to std/js/html/webgl/extension/WEBGLDepthTexture.hx
index a11579feba7e14f2c77d78c3d4248db7896fc99f..4f3f9b50d134bb252781f6cd380fbcde2815c01b 100644
--- a/std/js/html/webgl/ExtensionDepthTexture.hx
+++ b/std/js/html/webgl/extension/WEBGLDepthTexture.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `WEBGL_depth_texture` extension is part of the WebGL API and defines 2D depth and depth-stencil textures.
@@ -32,8 +32,11 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_depth_texture>
 **/
 @:native("WEBGL_depth_texture")
-extern class ExtensionDepthTexture
-{
+extern class WEBGLDepthTexture {
+	
+	/**
+		Unsigned integer type for 24-bit depth texture data.
+	**/
 	static inline var UNSIGNED_INT_24_8_WEBGL : Int = 34042;
 	
 }
\ No newline at end of file
diff --git a/std/js/html/webgl/ExtensionDrawBuffers.hx b/std/js/html/webgl/extension/WEBGLDrawBuffers.hx
similarity index 91%
rename from std/js/html/webgl/ExtensionDrawBuffers.hx
rename to std/js/html/webgl/extension/WEBGLDrawBuffers.hx
index 2d160e272e55ce52f32b95936fd55f88a9e686c2..9a848f379ec3cc82d71be0c11f22500ac7821d97 100644
--- a/std/js/html/webgl/ExtensionDrawBuffers.hx
+++ b/std/js/html/webgl/extension/WEBGLDrawBuffers.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
 
 // This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
 
-package js.html.webgl;
+package js.html.webgl.extension;
 
 /**
 	The `WEBGL_draw_buffers` extension is part of the WebGL API and enables a fragment shader to write to several textures, which is useful for deferred shading, for example.
@@ -32,8 +32,11 @@ package js.html.webgl;
 	@see <https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_draw_buffers>
 **/
 @:native("WEBGL_draw_buffers")
-extern class ExtensionDrawBuffers
-{
+extern class WEBGLDrawBuffers {
+	
+	/**
+		A `GLenum` specifying a color buffer.
+	**/
 	static inline var COLOR_ATTACHMENT0_WEBGL : Int = 36064;
 	static inline var COLOR_ATTACHMENT1_WEBGL : Int = 36065;
 	static inline var COLOR_ATTACHMENT2_WEBGL : Int = 36066;
@@ -50,6 +53,10 @@ extern class ExtensionDrawBuffers
 	static inline var COLOR_ATTACHMENT13_WEBGL : Int = 36077;
 	static inline var COLOR_ATTACHMENT14_WEBGL : Int = 36078;
 	static inline var COLOR_ATTACHMENT15_WEBGL : Int = 36079;
+	
+	/**
+		A `GLenum` returning a draw buffer.
+	**/
 	static inline var DRAW_BUFFER0_WEBGL : Int = 34853;
 	static inline var DRAW_BUFFER1_WEBGL : Int = 34854;
 	static inline var DRAW_BUFFER2_WEBGL : Int = 34855;
@@ -66,7 +73,15 @@ extern class ExtensionDrawBuffers
 	static inline var DRAW_BUFFER13_WEBGL : Int = 34866;
 	static inline var DRAW_BUFFER14_WEBGL : Int = 34867;
 	static inline var DRAW_BUFFER15_WEBGL : Int = 34868;
+	
+	/**
+		A `GLint` indicating the maximum number of framebuffer color attachment points.
+	**/
 	static inline var MAX_COLOR_ATTACHMENTS_WEBGL : Int = 36063;
+	
+	/**
+		A `GLint` indicating the maximum number of draw buffers.
+	**/
 	static inline var MAX_DRAW_BUFFERS_WEBGL : Int = 34852;
 	
 	
diff --git a/std/js/html/webgl/extension/WEBGLLoseContext.hx b/std/js/html/webgl/extension/WEBGLLoseContext.hx
new file mode 100644
index 0000000000000000000000000000000000000000..92b7b5898dabb3b92325e91a7e850075c8a2ea58
--- /dev/null
+++ b/std/js/html/webgl/extension/WEBGLLoseContext.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+// This file is generated from mozilla\WebGLRenderingContext.webidl. Do not edit!
+
+package js.html.webgl.extension;
+
+typedef WEBGLLoseContext = {
+	function loseContext() : Void;
+	function restoreContext() : Void;
+}
\ No newline at end of file
diff --git a/std/js/jquery/Callbacks.hx b/std/js/jquery/Callbacks.hx
deleted file mode 100644
index a6262ebeded77700609adb90213b0461cd8e5e92..0000000000000000000000000000000000000000
--- a/std/js/jquery/Callbacks.hx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This file is generated, do not edit! Visit http://api.jquery.com/ for API documentation. */
-package js.jquery;
-@:native("$.Callbacks") extern class Callbacks {
-	/**
-		Add a callback or a collection of callbacks to a callback list.
-	**/
-	public function add(callbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Callbacks;
-	/**
-		Disable a callback list from doing anything more.
-	**/
-	public function disable():js.jquery.Callbacks;
-	/**
-		Determine if the callbacks list has been disabled.
-	**/
-	public function disabled():Bool;
-	/**
-		Remove all of the callbacks from a list.
-	**/
-	public function empty():js.jquery.Callbacks;
-	/**
-		Call all of the callbacks with the given arguments.
-	**/
-	public function fire(arguments:Dynamic):js.jquery.Callbacks;
-	/**
-		Call all callbacks in a list with the given context and arguments.
-	**/
-	public function fireWith(?context:Dynamic, ?args:Dynamic):js.jquery.Callbacks;
-	/**
-		Determine if the callbacks have already been called at least once.
-	**/
-	public function fired():Bool;
-	/**
-		Determine whether or not the list has any callbacks attached. If a callback is provided as an argument, determine whether it is in a list.
-	**/
-	public function has(?callback:haxe.Constraints.Function):Bool;
-	/**
-		Lock a callback list in its current state.
-	**/
-	public function lock():js.jquery.Callbacks;
-	/**
-		Determine if the callbacks list has been locked.
-	**/
-	public function locked():Bool;
-	/**
-		A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
-	**/
-	@:selfCall
-	public function new(flags:String):Void;
-	/**
-		Remove a callback or a collection of callbacks from a callback list.
-	**/
-	public function remove(callbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Callbacks;
-}
\ No newline at end of file
diff --git a/std/js/jquery/Deferred.hx b/std/js/jquery/Deferred.hx
deleted file mode 100644
index a8dad698a8640d7d29a223e6eb8e8a1ee8b3c0fa..0000000000000000000000000000000000000000
--- a/std/js/jquery/Deferred.hx
+++ /dev/null
@@ -1,79 +0,0 @@
-/* This file is generated, do not edit! Visit http://api.jquery.com/ for API documentation. */
-package js.jquery;
-@:native("$.Deferred") extern class Deferred {
-	/**
-		Add handlers to be called when the Deferred object is either resolved or rejected.
-	**/
-	public function always(alwaysCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?alwaysCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Deferred;
-	/**
-		Add handlers to be called when the Deferred object is resolved.
-	**/
-	public function done(doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Deferred;
-	/**
-		Add handlers to be called when the Deferred object is rejected.
-	**/
-	public function fail(failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Deferred;
-	/**
-		Determine whether a Deferred object has been rejected.
-	**/
-	@:deprecated("Deprecated since jQuery 1.7")
-	public function isRejected():Bool;
-	/**
-		Determine whether a Deferred object has been resolved.
-	**/
-	@:deprecated("Deprecated since jQuery 1.7")
-	public function isResolved():Bool;
-	/**
-		A factory function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function.
-	**/
-	@:selfCall
-	public function new(?beforeStart:js.jquery.Deferred -> Void):Void;
-	/**
-		Call the progressCallbacks on a Deferred object with the given <code>args</code>.
-	**/
-	public function notify(args:Dynamic):js.jquery.Deferred;
-	/**
-		Call the progressCallbacks on a Deferred object with the given context and <code>args</code>.
-	**/
-	public function notifyWith(context:Dynamic, ?args:Array<Dynamic>):js.jquery.Deferred;
-	/**
-		Utility method to filter and/or chain Deferreds.
-	**/
-	@:deprecated("Deprecated since jQuery 1.8")
-	@:overload(function(?doneFilter:haxe.Constraints.Function, ?failFilter:haxe.Constraints.Function, ?progressFilter:haxe.Constraints.Function):js.jquery.Promise { })
-	public function pipe(?doneFilter:haxe.Constraints.Function, ?failFilter:haxe.Constraints.Function):js.jquery.Promise;
-	/**
-		Add handlers to be called when the Deferred object generates progress notifications.
-	**/
-	public function progress(progressCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, haxe.extern.EitherType<Array<Dynamic>, Array<haxe.Constraints.Function>>>, ?progressCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, haxe.extern.EitherType<Array<Dynamic>, Array<haxe.Constraints.Function>>>):js.jquery.Deferred;
-	/**
-		Return a Deferred's Promise object.
-	**/
-	public function promise(?target:Dynamic):js.jquery.Promise;
-	/**
-		Reject a Deferred object and call any failCallbacks with the given <code>args</code>.
-	**/
-	public function reject(?args:Dynamic):js.jquery.Deferred;
-	/**
-		Reject a Deferred object and call any failCallbacks with the given <code>context</code> and <code>args</code>.
-	**/
-	public function rejectWith(context:Dynamic, ?args:Array<Dynamic>):js.jquery.Deferred;
-	/**
-		Resolve a Deferred object and call any doneCallbacks with the given <code>args</code>.
-	**/
-	public function resolve(?args:Dynamic):js.jquery.Deferred;
-	/**
-		Resolve a Deferred object and call any doneCallbacks with the given <code>context</code> and <code>args</code>.
-	**/
-	public function resolveWith(context:Dynamic, ?args:Array<Dynamic>):js.jquery.Deferred;
-	/**
-		Determine the current state of a Deferred object.
-	**/
-	public function state():String;
-	/**
-		Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-	**/
-	@:overload(function(doneFilter:haxe.Constraints.Function, ?failFilter:haxe.Constraints.Function, ?progressFilter:haxe.Constraints.Function):js.jquery.Promise { })
-	@:overload(function(doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?progressCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Promise { })
-	public function then(doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Promise;
-}
\ No newline at end of file
diff --git a/std/js/jquery/Event.hx b/std/js/jquery/Event.hx
deleted file mode 100644
index 90f2754c93e47d32a813dddaa37b9457aaaeb236..0000000000000000000000000000000000000000
--- a/std/js/jquery/Event.hx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* This file is generated, do not edit! Visit http://api.jquery.com/ for API documentation. */
-package js.jquery;
-@:native("$.Event") extern class Event extends js.html.Event {
-	/**
-		An optional object of data passed to an event method when the current executing handler is bound.
-	**/
-	public var data : Dynamic;
-	/**
-		The element where the currently-called jQuery event handler was attached.
-	**/
-	public var delegateTarget : js.html.Element;
-	/**
-		Returns whether <a href="/event.preventDefault/">event.preventDefault()</a> was ever called on this event object.
-	**/
-	public function isDefaultPrevented():Bool;
-	/**
-		Returns whether event.stopImmediatePropagation() was ever called on this event object.
-	**/
-	public function isImmediatePropagationStopped():Bool;
-	/**
-		Returns whether <a href="/event.stopPropagation/">event.stopPropagation()</a> was ever called on this event object.
-	**/
-	public function isPropagationStopped():Bool;
-	/**
-		Indicates whether the META key was pressed when the event fired.
-	**/
-	public var metaKey : Bool;
-	/**
-		The namespace specified when the event was triggered.
-	**/
-	public var namespace : String;
-	/**
-		The mouse position relative to the left edge of the document.
-	**/
-	public var pageX : Float;
-	/**
-		The mouse position relative to the top edge of the document.
-	**/
-	public var pageY : Float;
-	/**
-		The other DOM element involved in the event, if any.
-	**/
-	public var relatedTarget : js.html.Element;
-	/**
-		The last value returned by an event handler that was triggered by this event, unless the value was <code>undefined</code>.
-	**/
-	public var result : Dynamic;
-	/**
-		For key or mouse events, this property indicates the specific key or button that was pressed.
-	**/
-	public var which : Float;
-	public var altKey : Bool;
-	public var button : Int;
-	public var buttons : Int;
-	public var char : Int;
-	public var charCode : Int;
-	public var clientX : Int;
-	public var clientY : Int;
-	public var ctrlKey : Bool;
-	public var detail : Int;
-	public var key : String;
-	public var keyCode : Int;
-	public var offsetX : Int;
-	public var offsetY : Int;
-	public var screenX : Int;
-	public var screenY : Int;
-	public var shiftKey : Bool;
-	public var toElement : js.html.Element;
-	public var view : js.html.Window;
-}
\ No newline at end of file
diff --git a/std/js/jquery/Helper.hx b/std/js/jquery/Helper.hx
deleted file mode 100644
index 4e0c604184c7cdabd49686fa695e5c2062ca6627..0000000000000000000000000000000000000000
--- a/std/js/jquery/Helper.hx
+++ /dev/null
@@ -1,16 +0,0 @@
-package js.jquery;
-
-@:noPackageRestrict
-#if js extern #end class Helper {
-	macro public static function J(exprs:Array<haxe.macro.Expr>) {
-		return macro new js.jquery.JQuery($a{exprs});
-	}
-
-	#if !macro
-	public static var JTHIS(get, null) : js.jquery.JQuery;
-
-	static inline function get_JTHIS() : js.jquery.JQuery {
-		return new js.jquery.JQuery(js.Lib.nativeThis);
-	}
-	#end
-}
\ No newline at end of file
diff --git a/std/js/jquery/JQuery.hx b/std/js/jquery/JQuery.hx
deleted file mode 100644
index fdb961cef4f39092b0dd9e23520762c20a453621..0000000000000000000000000000000000000000
--- a/std/js/jquery/JQuery.hx
+++ /dev/null
@@ -1,1097 +0,0 @@
-/* This file is generated, do not edit! Visit http://api.jquery.com/ for API documentation. */
-package js.jquery;
-@:native("$") extern class JQuery implements ArrayAccess<js.html.Element> {
-	/**
-		A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
-	**/
-	static public function Callbacks(flags:String):js.jquery.Callbacks;
-	/**
-		A factory function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function.
-	**/
-	static public function Deferred(?beforeStart:js.jquery.Deferred -> Void):js.jquery.Deferred;
-	/**
-		Perform an asynchronous HTTP (Ajax) request.
-	**/
-	@:overload(function(url:String, ?settings:Dynamic):js.jquery.JqXHR { })
-	static public function ajax(?settings:Dynamic):js.jquery.JqXHR;
-	/**
-		Handle custom Ajax options or modify existing options before each request is sent and before they are processed by <code>$.ajax()</code>.
-	**/
-	static public function ajaxPrefilter(?dataTypes:String, handler:Dynamic -> Dynamic -> js.jquery.JqXHR -> Void):Void;
-	/**
-		Set default values for future Ajax requests. Its use is not recommended.
-	**/
-	static public function ajaxSetup(options:Dynamic):Void;
-	/**
-		Creates an object that handles the actual transmission of Ajax data.
-	**/
-	static public function ajaxTransport(dataType:String, handler:Dynamic -> Dynamic -> js.jquery.JqXHR -> Void):Void;
-	/**
-		States if the current page, in the user's browser, is being rendered using the <a href="http://www.w3.org/TR/REC-CSS2/box.html">W3C CSS Box Model</a>. <strong>This property was removed in jQuery 1.8</strong>. Please try to use feature detection instead.
-	**/
-	@:deprecated("Deprecated since jQuery 1.3")
-	static public var boxModel : Bool;
-	/**
-		Contains flags for the useragent, read from navigator.userAgent. <strong>This property was removed in jQuery 1.9</strong> and is available only through the jQuery.migrate plugin. Please try to use feature detection instead.
-	**/
-	@:deprecated("Deprecated since jQuery 1.3")
-	static public var browser : Dynamic;
-	/**
-		Check to see if a DOM element is a descendant of another DOM element.
-	**/
-	static public function contains(container:js.html.Element, contained:js.html.Element):Bool;
-	/**
-		Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties.
-	**/
-	static public var cssHooks : Dynamic;
-	/**
-		An object containing all CSS properties that may be used without a unit. The <a href="/css/"><code>.css()</code></a> method uses this object to see if it may append <code>px</code> to unitless values.
-	**/
-	static public var cssNumber : Dynamic;
-	/**
-		Returns value at named data store for the element, as set by <code>jQuery.data(element, name, value)</code>, or the full data store for the element.
-		OR
-		Store arbitrary data associated with the specified element. Returns the value that was set.
-	**/
-	@:overload(function(element:js.html.Element, key:String):Dynamic { })
-	@:overload(function(element:js.html.Element, key:String, value:Dynamic):Dynamic { })
-	static public function data(element:js.html.Element):Dynamic;
-	/**
-		Execute the next function on the queue for the matched element.
-	**/
-	static public function dequeue(element:js.html.Element, ?queueName:String):Void;
-	/**
-		A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
-	**/
-	@:overload(function(object:Dynamic, callback:String -> Dynamic -> Void):Dynamic { })
-	static public function each(array:Array<Dynamic>, callback:Int -> Dynamic -> Void):Dynamic;
-	/**
-		Takes a string and throws an exception containing it.
-	**/
-	static public function error(message:String):Void;
-	/**
-		Escapes any character that has a special meaning in a CSS selector.
-	**/
-	static public function escapeSelector(selector:String):String;
-	/**
-		Merge the contents of two or more objects together into the first object.
-	**/
-	@:overload(function(?deep:Bool, target:Dynamic, object1:Dynamic, ?objectN:Dynamic):Dynamic { })
-	static public function extend(target:Dynamic, ?object1:Dynamic, ?objectN:Dynamic):Dynamic;
-	/**
-		An alias to `jQuery.prototype`.
-	**/
-	static public var fn : Dynamic;
-	static public var fx : { /**
-		The rate (in milliseconds) at which animations fire.
-	**/
-	var interval : Float; /**
-		Globally disable all animations.
-	**/
-	var off : Bool; };
-	/**
-		Load data from the server using a HTTP GET request.
-	**/
-	@:overload(function(url:String, ?data:Dynamic, ?success:Dynamic -> String -> js.jquery.JqXHR -> Void, ?dataType:String):js.jquery.JqXHR { })
-	static public function get(settings:Dynamic):js.jquery.JqXHR;
-	/**
-		Load JSON-encoded data from the server using a GET HTTP request.
-	**/
-	static public function getJSON(url:String, ?data:Dynamic, ?success:Dynamic -> String -> js.jquery.JqXHR -> Void):js.jquery.JqXHR;
-	/**
-		Load a JavaScript file from the server using a GET HTTP request, then execute it.
-	**/
-	static public function getScript(url:String, ?success:String -> String -> js.jquery.JqXHR -> Void):js.jquery.JqXHR;
-	/**
-		Execute some JavaScript code globally.
-	**/
-	static public function globalEval(code:String):Void;
-	/**
-		Finds the elements of an array which satisfy a filter function. The original array is not affected.
-	**/
-	static public function grep(array:haxe.extern.EitherType<Array<Dynamic>, js.html.NodeList>, _function:Dynamic -> Int -> Bool, ?invert:Bool):Array<Dynamic>;
-	/**
-		Determine whether an element has any jQuery data associated with it.
-	**/
-	static public function hasData(element:js.html.Element):Bool;
-	/**
-		Holds or releases the execution of jQuery's ready event.
-	**/
-	static public function holdReady(hold:Bool):Void;
-	/**
-		Modify and filter HTML strings passed through <a href="/category/manipulation/">jQuery manipulation methods</a>.
-	**/
-	static public function htmlPrefilter(html:String):String;
-	/**
-		Search for a specified value within an array and return its index (or -1 if not found).
-	**/
-	static public function inArray(value:Dynamic, array:Array<Dynamic>, ?fromIndex:Float):Float;
-	/**
-		Determine whether the argument is an array.
-	**/
-	static public function isArray(obj:Dynamic):Bool;
-	/**
-		Check to see if an object is empty (contains no enumerable properties).
-	**/
-	static public function isEmptyObject(object:Dynamic):Bool;
-	/**
-		Determine if the argument passed is a JavaScript function object.
-	**/
-	static public function isFunction(obj:Dynamic):Bool;
-	/**
-		Determines whether its argument represents a JavaScript number.
-	**/
-	static public function isNumeric(value:Dynamic):Bool;
-	/**
-		Check to see if an object is a plain object (created using "{}" or "new Object").
-	**/
-	static public function isPlainObject(object:Dynamic):Bool;
-	/**
-		Determine whether the argument is a window.
-	**/
-	static public function isWindow(obj:Dynamic):Bool;
-	/**
-		Check to see if a DOM node is within an XML document (or is an XML document).
-	**/
-	static public function isXMLDoc(node:js.html.Element):Bool;
-	/**
-		Convert an array-like object into a true JavaScript array.
-	**/
-	static public function makeArray(obj:Dynamic):Array<Dynamic>;
-	/**
-		Translate all items in an array or object to new array of items.
-	**/
-	@:overload(function(object:Dynamic, callback:Dynamic -> String -> Dynamic):Array<Dynamic> { })
-	static public function map(array:Array<Dynamic>, callback:Dynamic -> Int -> Dynamic):Array<Dynamic>;
-	/**
-		Merge the contents of two arrays together into the first array.
-	**/
-	static public function merge(first:haxe.extern.EitherType<Array<Dynamic>, js.html.NodeList>, second:haxe.extern.EitherType<Array<Dynamic>, js.html.NodeList>):Array<Dynamic>;
-	/**
-		Relinquish jQuery's control of the <code>$</code> variable.
-	**/
-	static public function noConflict(?removeAll:Bool):Dynamic;
-	/**
-		An empty function.
-	**/
-	static public function noop():Void;
-	/**
-		Return a number representing the current time.
-	**/
-	static public function now():Float;
-	/**
-		Create a serialized representation of an array, a plain object, or a jQuery object suitable for use in a URL query string or Ajax request. In case a jQuery object is passed, it should contain input elements with name/value properties.
-	**/
-	@:overload(function(obj:Dynamic, traditional:Bool):String { })
-	static public function param(obj:Dynamic):String;
-	/**
-		Parses a string into an array of DOM nodes.
-	**/
-	static public function parseHTML(data:String, ?context:js.html.Element, ?keepScripts:Bool):Array<js.html.Element>;
-	/**
-		Takes a well-formed JSON string and returns the resulting JavaScript value.
-	**/
-	@:deprecated("Deprecated since jQuery 3.0")
-	static public function parseJSON(json:String):Dynamic;
-	/**
-		Parses a string into an XML document.
-	**/
-	static public function parseXML(data:String):js.html.Document;
-	/**
-		Load data from the server using a HTTP POST request.
-	**/
-	@:overload(function(url:String, ?data:Dynamic, ?success:Dynamic -> String -> js.jquery.JqXHR -> Void, ?dataType:String):js.jquery.JqXHR { })
-	static public function post(settings:Dynamic):js.jquery.JqXHR;
-	/**
-		Takes a function and returns a new one that will always have a particular context.
-	**/
-	@:overload(function(context:Dynamic, name:String):haxe.Constraints.Function { })
-	@:overload(function(_function:haxe.Constraints.Function, context:Dynamic, ?additionalArguments:Dynamic):haxe.Constraints.Function { })
-	@:overload(function(context:Dynamic, name:String, ?additionalArguments:Dynamic):haxe.Constraints.Function { })
-	static public function proxy(_function:haxe.Constraints.Function, context:Dynamic):haxe.Constraints.Function;
-	/**
-		Show the queue of functions to be executed on the matched element.
-		OR
-		Manipulate the queue of functions to be executed on the matched element.
-	**/
-	@:overload(function(element:js.html.Element, queueName:String, newQueue:Array<Void -> Void>):js.jquery.JQuery { })
-	@:overload(function(element:js.html.Element, queueName:String, callback:haxe.Constraints.Function):js.jquery.JQuery { })
-	static public function queue(element:js.html.Element, ?queueName:String):Array<Void -> Void>;
-	/**
-		Handles errors thrown synchronously in functions wrapped in <code>jQuery()</code>.
-	**/
-	static public dynamic function readyException(error:js.Error):String;
-	/**
-		Remove a previously-stored piece of data.
-	**/
-	static public function removeData(element:js.html.Element, ?name:String):js.jquery.JQuery;
-	/**
-		Creates an object containing a set of properties ready to be used in the definition of custom animations.
-	**/
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?settings:Dynamic):Dynamic { })
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):Dynamic { })
-	static public function speed(settings:Dynamic):Dynamic;
-	/**
-		Creates a new copy of jQuery whose properties and methods can be modified without affecting the original jQuery object.
-	**/
-	@:deprecated("Deprecated since jQuery 1.7")
-	static public function sub():js.jquery.JQuery;
-	/**
-		A collection of properties that represent the presence of different browser features or bugs. Intended for jQuery's internal use; specific properties may be removed when they are no longer needed internally to improve page startup performance. For your own project's feature-detection needs, we strongly recommend the use of an external library such as <a href="http://modernizr.com">Modernizr</a> instead of dependency on properties in <code>jQuery.support</code>.
-	**/
-	@:deprecated("Deprecated since jQuery 1.9")
-	static public var support : Dynamic;
-	/**
-		Remove the whitespace from the beginning and end of a string.
-	**/
-	static public function trim(str:String):String;
-	/**
-		Determine the internal JavaScript [[Class]] of an object.
-	**/
-	static public function type(obj:Dynamic):String;
-	/**
-		Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.
-	**/
-	@:deprecated("Deprecated since jQuery 3.0")
-	static public function unique(array:Array<js.html.Element>):Array<js.html.Element>;
-	/**
-		Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.
-	**/
-	static public function uniqueSort(array:Array<js.html.Element>):Array<js.html.Element>;
-	/**
-		Provides a way to execute callback functions based on zero or more objects, usually <a href="/category/deferred-object/">Deferred</a> objects that represent asynchronous events.
-	**/
-	static public function when(deferreds:haxe.extern.Rest<js.jquery.Deferred>):js.jquery.Promise;
-	/**
-		Create a new jQuery object with elements added to the set of matched elements.
-	**/
-	@:overload(function(elements:js.html.Element):js.jquery.JQuery { })
-	@:overload(function(html:String):js.jquery.JQuery { })
-	@:overload(function(selection:js.jquery.JQuery):js.jquery.JQuery { })
-	@:overload(function(selector:String, context:js.html.Element):js.jquery.JQuery { })
-	public function add(selector:String):js.jquery.JQuery;
-	/**
-		Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
-	**/
-	public function addBack(?selector:String):js.jquery.JQuery;
-	/**
-		Adds the specified class(es) to each element in the set of matched elements.
-	**/
-	@:overload(function(_function:Int -> String -> String):js.jquery.JQuery { })
-	public function addClass(className:String):js.jquery.JQuery;
-	/**
-		Insert content, specified by the parameter, after each element in the set of matched elements.
-	**/
-	@:overload(function(_function:Int -> String -> haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<String, js.jquery.JQuery>>):js.jquery.JQuery { })
-	@:overload(function(content:haxe.extern.EitherType<Array<String>, haxe.extern.EitherType<Array<js.jquery.JQuery>, haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<js.html.NodeList, haxe.extern.EitherType<String, js.jquery.JQuery>>>>>>, ?content:haxe.extern.EitherType<Array<String>, haxe.extern.EitherType<Array<js.jquery.JQuery>, haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<js.html.NodeList, haxe.extern.EitherType<String, js.jquery.JQuery>>>>>>):js.jquery.JQuery { })
-	public function after(_function:Int -> haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<String, js.jquery.JQuery>>):js.jquery.JQuery;
-	/**
-		Register a handler to be called when Ajax requests complete. This is an <a href="/Ajax_Events/">AjaxEvent</a>.
-	**/
-	public function ajaxComplete(handler:js.jquery.Event -> js.jquery.JqXHR -> Dynamic -> Void):js.jquery.JQuery;
-	/**
-		Register a handler to be called when Ajax requests complete with an error. This is an <a href="/Ajax_Events/">Ajax Event</a>.
-	**/
-	public function ajaxError(handler:js.jquery.Event -> js.jquery.JqXHR -> Dynamic -> String -> Void):js.jquery.JQuery;
-	/**
-		Attach a function to be executed before an Ajax request is sent. This is an <a href="/Ajax_Events/">Ajax Event</a>.
-	**/
-	public function ajaxSend(handler:js.jquery.Event -> js.jquery.JqXHR -> Dynamic -> Void):js.jquery.JQuery;
-	/**
-		Register a handler to be called when the first Ajax request begins. This is an <a href="/Ajax_Events/">Ajax Event</a>.
-	**/
-	public function ajaxStart(handler:haxe.Constraints.Function):js.jquery.JQuery;
-	/**
-		Register a handler to be called when all Ajax requests have completed. This is an <a href="/Ajax_Events/">Ajax Event</a>.
-	**/
-	public function ajaxStop(handler:haxe.Constraints.Function):js.jquery.JQuery;
-	/**
-		Attach a function to be executed whenever an Ajax request completes successfully. This is an <a href="/Ajax_Events/">Ajax Event</a>.
-	**/
-	public function ajaxSuccess(handler:js.jquery.Event -> js.jquery.JqXHR -> Dynamic -> Dynamic -> Void):js.jquery.JQuery;
-	/**
-		Add the previous set of elements on the stack to the current set.
-	**/
-	@:deprecated("Deprecated since jQuery 1.8")
-	public function andSelf():js.jquery.JQuery;
-	/**
-		Perform a custom animation of a set of CSS properties.
-	**/
-	@:overload(function(properties:Dynamic, ?duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function animate(properties:Dynamic, options:Dynamic):js.jquery.JQuery;
-	/**
-		Insert content, specified by the parameter, to the end of each element in the set of matched elements.
-	**/
-	@:overload(function(content:haxe.extern.EitherType<Array<String>, haxe.extern.EitherType<Array<js.jquery.JQuery>, haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<js.html.NodeList, haxe.extern.EitherType<String, js.jquery.JQuery>>>>>>, ?content:haxe.extern.EitherType<Array<String>, haxe.extern.EitherType<Array<js.jquery.JQuery>, haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<js.html.NodeList, haxe.extern.EitherType<String, js.jquery.JQuery>>>>>>):js.jquery.JQuery { })
-	public function append(_function:Int -> String -> haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<String, js.jquery.JQuery>>):js.jquery.JQuery;
-	/**
-		Insert every element in the set of matched elements to the end of the target.
-	**/
-	public function appendTo(target:haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<String, js.jquery.JQuery>>>):js.jquery.JQuery;
-	/**
-		Set one or more attributes for the set of matched elements.
-		OR
-		Get the value of an attribute for the first element in the set of matched elements.
-	**/
-	@:overload(function(attributes:Dynamic):js.jquery.JQuery { })
-	@:overload(function(attributeName:String, value:haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	@:overload(function(attributeName:String, _function:Int -> String -> haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	public function attr(attributeName:String):String;
-	/**
-		Insert content, specified by the parameter, before each element in the set of matched elements.
-	**/
-	@:overload(function(_function:Int -> String -> haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<String, js.jquery.JQuery>>):js.jquery.JQuery { })
-	@:overload(function(content:haxe.extern.EitherType<Array<String>, haxe.extern.EitherType<Array<js.jquery.JQuery>, haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<js.html.NodeList, haxe.extern.EitherType<String, js.jquery.JQuery>>>>>>, ?content:haxe.extern.EitherType<Array<String>, haxe.extern.EitherType<Array<js.jquery.JQuery>, haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<js.html.NodeList, haxe.extern.EitherType<String, js.jquery.JQuery>>>>>>):js.jquery.JQuery { })
-	public function before(_function:Int -> haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<String, js.jquery.JQuery>>):js.jquery.JQuery;
-	/**
-		Attach a handler to an event for the elements.
-	**/
-	@:overload(function(eventType:String, ?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(eventType:String, ?eventData:Dynamic, ?preventBubble:Bool):js.jquery.JQuery { })
-	public function bind(events:Dynamic):js.jquery.JQuery;
-	/**
-		Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function blur():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function change():js.jquery.JQuery;
-	/**
-		Get the children of each element in the set of matched elements, optionally filtered by a selector.
-	**/
-	public function children(?selector:String):js.jquery.JQuery;
-	/**
-		Remove from the queue all items that have not yet been run.
-	**/
-	public function clearQueue(?queueName:String):js.jquery.JQuery;
-	/**
-		Bind an event handler to the "click" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function click():js.jquery.JQuery;
-	/**
-		Create a deep copy of the set of matched elements.
-	**/
-	@:overload(function(?withDataAndEvents:Bool, ?deepWithDataAndEvents:Bool):js.jquery.JQuery { })
-	public function clone(?withDataAndEvents:Bool):js.jquery.JQuery;
-	/**
-		For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-		OR
-		Get an array of all the elements and selectors matched against the current element up through the DOM tree.
-	**/
-	@:overload(function(selection:js.jquery.JQuery):js.jquery.JQuery { })
-	@:overload(function(element:js.html.Element):js.jquery.JQuery { })
-	@:overload(function(selector:String, ?context:js.html.Element):js.jquery.JQuery { })
-	@:overload(function(selectors:haxe.extern.EitherType<Array<String>, haxe.extern.EitherType<String, js.jquery.JQuery>>, ?context:js.html.Element):Array<Dynamic> { })
-	public function closest(selector:String):js.jquery.JQuery;
-	/**
-		Get the children of each element in the set of matched elements, including text and comment nodes.
-	**/
-	public function contents():js.jquery.JQuery;
-	/**
-		The DOM node context originally passed to <code>jQuery()</code>; if none was passed then context will likely be the document.
-	**/
-	@:deprecated("Deprecated since jQuery 1.10")
-	public var context : js.html.Element;
-	/**
-		Bind an event handler to the "contextmenu" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function contextmenu():js.jquery.JQuery;
-	/**
-		Set one or more CSS properties for the set of matched elements.
-		OR
-		Get the computed style properties for the first element in the set of matched elements.
-	**/
-	@:overload(function(propertyNames:Array<String>):String { })
-	@:overload(function(properties:Dynamic):js.jquery.JQuery { })
-	@:overload(function(propertyName:String, value:haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	@:overload(function(propertyName:String, _function:Int -> String -> haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	public function css(propertyName:String):String;
-	/**
-		Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
-		OR
-		Store arbitrary data associated with the matched elements.
-	**/
-	@:overload(function(key:String):Dynamic { })
-	@:overload(function(obj:Dynamic):js.jquery.JQuery { })
-	@:overload(function(key:String, value:Dynamic):js.jquery.JQuery { })
-	public function data():Dynamic;
-	/**
-		Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function dblclick():js.jquery.JQuery;
-	/**
-		Set a timer to delay execution of subsequent items in the queue.
-	**/
-	public function delay(duration:Int, ?queueName:String):js.jquery.JQuery;
-	/**
-		Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
-	**/
-	@:overload(function(selector:String, eventType:String, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(selector:String, eventType:String, eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function delegate(selector:String, events:Dynamic):js.jquery.JQuery;
-	/**
-		Execute the next function on the queue for the matched elements.
-	**/
-	public function dequeue(?queueName:String):js.jquery.JQuery;
-	/**
-		Remove the set of matched elements from the DOM.
-	**/
-	public function detach(?selector:String):js.jquery.JQuery;
-	/**
-		Remove event handlers previously attached using <code>.live()</code> from the elements.
-	**/
-	@:deprecated("Deprecated since jQuery 1.7")
-	@:overload(function(events:Dynamic):js.jquery.JQuery { })
-	@:overload(function(eventType:String, ?handler:String):js.jquery.JQuery { })
-	public function die():js.jquery.JQuery;
-	/**
-		Iterate over a jQuery object, executing a function for each matched element.
-	**/
-	public function each(_function:Int -> js.html.Element -> Void):js.jquery.JQuery;
-	/**
-		Remove all child nodes of the set of matched elements from the DOM.
-	**/
-	public function empty():js.jquery.JQuery;
-	/**
-		End the most recent filtering operation in the current chain and return the set of matched elements to its previous state.
-	**/
-	public function end():js.jquery.JQuery;
-	/**
-		Reduce the set of matched elements to the one at the specified index.
-	**/
-	@:overload(function(indexFromEnd:Int):js.jquery.JQuery { })
-	public function eq(index:Int):js.jquery.JQuery;
-	/**
-		Bind an event handler to the "error" JavaScript event.
-	**/
-	@:deprecated("Deprecated since jQuery 1.8")
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function error(handler:js.jquery.Event -> Void):js.jquery.JQuery;
-	/**
-		Display the matched elements by fading them to opaque.
-	**/
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function fadeIn(options:Dynamic):js.jquery.JQuery;
-	/**
-		Hide the matched elements by fading them to transparent.
-	**/
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function fadeOut(options:Dynamic):js.jquery.JQuery;
-	/**
-		Adjust the opacity of the matched elements.
-	**/
-	@:overload(function(duration:haxe.extern.EitherType<Float, String>, opacity:Float, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function fadeTo(duration:haxe.extern.EitherType<Float, String>, opacity:Float, ?complete:haxe.Constraints.Function):js.jquery.JQuery;
-	/**
-		Display or hide the matched elements by animating their opacity.
-	**/
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function fadeToggle(options:Dynamic):js.jquery.JQuery;
-	/**
-		Reduce the set of matched elements to those that match the selector or pass the function's test.
-	**/
-	@:overload(function(elements:js.html.Element):js.jquery.JQuery { })
-	@:overload(function(selection:js.jquery.JQuery):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> js.html.Element -> Bool):js.jquery.JQuery { })
-	public function filter(selector:String):js.jquery.JQuery;
-	/**
-		Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
-	**/
-	@:overload(function(element:haxe.extern.EitherType<js.html.Element, js.jquery.JQuery>):js.jquery.JQuery { })
-	public function find(selector:String):js.jquery.JQuery;
-	/**
-		Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements.
-	**/
-	public function finish(?queue:String):js.jquery.JQuery;
-	/**
-		Reduce the set of matched elements to the first in the set.
-	**/
-	public function first():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "focus" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function focus():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "focusin" event.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function focusin():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "focusout" JavaScript event.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function focusout():js.jquery.JQuery;
-	/**
-		Retrieve one of the elements matched by the jQuery object.
-		OR
-		Retrieve the elements matched by the jQuery object.
-	**/
-	@:overload(function(index:Int):js.html.Element { })
-	public function get():Array<js.html.Element>;
-	/**
-		Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
-	**/
-	@:overload(function(contained:js.html.Element):js.jquery.JQuery { })
-	public function has(selector:String):js.jquery.JQuery;
-	/**
-		Determine whether any of the matched elements are assigned the given class.
-	**/
-	public function hasClass(className:String):Bool;
-	/**
-		Set the CSS height of every matched element.
-		OR
-		Get the current computed height for the first element in the set of matched elements.
-	**/
-	@:overload(function(value:haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> Int -> haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	public function height():Float;
-	/**
-		Hide the matched elements.
-	**/
-	@:overload(function(options:Dynamic):js.jquery.JQuery { })
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function hide():js.jquery.JQuery;
-	/**
-		Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.
-		OR
-		Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements.
-	**/
-	@:overload(function(handlerIn:js.jquery.Event -> Void, handlerOut:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function hover(handlerInOut:js.jquery.Event -> Void):js.jquery.JQuery;
-	/**
-		Get the HTML contents of the first element in the set of matched elements.
-		OR
-		Set the HTML contents of each element in the set of matched elements.
-	**/
-	@:overload(function(htmlString:String):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> String -> String):js.jquery.JQuery { })
-	public function html():String;
-	/**
-		Search for a given element from among the matched elements.
-	**/
-	@:overload(function(selector:String):Int { })
-	@:overload(function(element:haxe.extern.EitherType<js.html.Element, js.jquery.JQuery>):Int { })
-	public function index():Int;
-	/**
-		Set the CSS inner height of each element in the set of matched elements.
-		OR
-		Get the current computed height for the first element in the set of matched elements, including padding but not border.
-	**/
-	@:overload(function(value:haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> Float -> haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	public function innerHeight():Float;
-	/**
-		Get the current computed inner width for the first element in the set of matched elements, including padding but not border.
-		OR
-		Set the CSS inner width of each element in the set of matched elements.
-	**/
-	@:overload(function(value:haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> Float -> haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	public function innerWidth():Float;
-	/**
-		Insert every element in the set of matched elements after the target.
-	**/
-	public function insertAfter(target:haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<String, js.jquery.JQuery>>>):js.jquery.JQuery;
-	/**
-		Insert every element in the set of matched elements before the target.
-	**/
-	public function insertBefore(target:haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<String, js.jquery.JQuery>>>):js.jquery.JQuery;
-	/**
-		Check the current matched set of elements against a selector, element, or jQuery object and return <code>true</code> if at least one of these elements matches the given arguments.
-	**/
-	@:overload(function(selection:js.jquery.JQuery):Bool { })
-	@:overload(function(elements:js.html.Element):Bool { })
-	@:overload(function(_function:Int -> js.html.Element -> Bool):Bool { })
-	public function is(selector:String):Bool;
-	/**
-		A string containing the jQuery version number.
-	**/
-	public var jquery : String;
-	/**
-		Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function keydown():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function keypress():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function keyup():js.jquery.JQuery;
-	/**
-		Reduce the set of matched elements to the final one in the set.
-	**/
-	public function last():js.jquery.JQuery;
-	/**
-		The number of elements in the jQuery object.
-	**/
-	public var length(default, null) : Int;
-	/**
-		Attach an event handler for all elements which match the current selector, now and in the future.
-	**/
-	@:deprecated("Deprecated since jQuery 1.7")
-	@:overload(function(events:String, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(events:String, ?data:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function live(events:Dynamic):js.jquery.JQuery;
-	/**
-		Bind an event handler to the "load" JavaScript event.
-		OR
-		Load data from the server and place the returned HTML into the matched element.
-	**/
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(url:String, ?data:Dynamic, ?complete:String -> String -> js.jquery.JqXHR -> Void):js.jquery.JQuery { })
-	public function load(handler:js.jquery.Event -> Void):js.jquery.JQuery;
-	/**
-		Pass each element in the current matched set through a function, producing a new jQuery object containing the return values.
-	**/
-	public function map(callback:Int -> js.html.Element -> Dynamic):js.jquery.JQuery;
-	/**
-		Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function mousedown():js.jquery.JQuery;
-	/**
-		Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function mouseenter():js.jquery.JQuery;
-	/**
-		Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function mouseleave():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function mousemove():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function mouseout():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function mouseover():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function mouseup():js.jquery.JQuery;
-	/**
-		Creates DOM elements on the fly from the provided string of raw HTML.
-		OR
-		Accepts a string containing a CSS selector which is then used to match a set of elements.
-		OR
-		Binds a function to be executed when the DOM has finished loading.
-	**/
-	@:selfCall
-	@:overload(function(element:js.html.Element):Void { })
-	@:overload(function(elementArray:haxe.extern.EitherType<js.html.NodeList, Array<js.html.Element>>):Void { })
-	@:overload(function(selection:js.jquery.JQuery):Void { })
-	@:overload(function(callback:haxe.Constraints.Function):Void { })
-	@:overload(function(object:Dynamic):Void { })
-	@:overload(function(html:String, attributes:Dynamic):Void { })
-	@:overload(function(selector:String, ?context:haxe.extern.EitherType<js.html.Element, js.jquery.JQuery>):Void { })
-	@:overload(function(html:String, ?ownerDocument:js.html.Document):Void { })
-	public function new():Void;
-	/**
-		Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
-	**/
-	public function next(?selector:String):js.jquery.JQuery;
-	/**
-		Get all following siblings of each element in the set of matched elements, optionally filtered by a selector.
-	**/
-	public function nextAll(?selector:String):js.jquery.JQuery;
-	/**
-		Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
-	**/
-	@:overload(function(?element:haxe.extern.EitherType<js.html.Element, js.jquery.JQuery>, ?filter:String):js.jquery.JQuery { })
-	public function nextUntil(?selector:String, ?filter:String):js.jquery.JQuery;
-	/**
-		Remove elements from the set of matched elements.
-	**/
-	@:overload(function(selection:js.jquery.JQuery):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> js.html.Element -> Bool):js.jquery.JQuery { })
-	public function not(selector:haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, String>>):js.jquery.JQuery;
-	/**
-		Remove an event handler.
-	**/
-	@:overload(function(event:js.jquery.Event):js.jquery.JQuery { })
-	@:overload(function(events:Dynamic, ?selector:String):js.jquery.JQuery { })
-	@:overload(function(events:String, ?selector:String, ?handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function off():js.jquery.JQuery;
-	/**
-		Get the current coordinates of the first element in the set of matched elements, relative to the document.
-		OR
-		Set the current coordinates of every element in the set of matched elements, relative to the document.
-	**/
-	@:overload(function(coordinates:{ var top : Float; var left : Float; }):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> { var top : Float; var left : Float; } -> Dynamic):js.jquery.JQuery { })
-	public function offset():{ var top : Float; var left : Float; };
-	/**
-		Get the closest ancestor element that is positioned.
-	**/
-	public function offsetParent():js.jquery.JQuery;
-	/**
-		Attach an event handler function for one or more events to the selected elements.
-	**/
-	@:overload(function(events:String, ?selector:String, ?data:Dynamic, handler:js.jquery.Event -> haxe.extern.Rest<Dynamic> -> Void):js.jquery.JQuery { })
-	public function on(events:Dynamic, ?selector:String, ?data:Dynamic):js.jquery.JQuery;
-	/**
-		Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-	**/
-	@:overload(function(events:Dynamic, ?selector:String, ?data:Dynamic):js.jquery.JQuery { })
-	@:overload(function(events:String, ?selector:String, ?data:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function one(events:String, ?data:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery;
-	/**
-		Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns a number (without "px") representation of the value or null if called on an empty set of elements.
-		OR
-		Set the CSS outer Height of each element in the set of matched elements.
-	**/
-	@:overload(function(_function:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(?includeMargin:Bool):Float { })
-	public function outerHeight(value:haxe.extern.EitherType<Float, String>):js.jquery.JQuery;
-	/**
-		Get the current computed width for the first element in the set of matched elements, including padding and border.
-		OR
-		Set the CSS outer width of each element in the set of matched elements.
-	**/
-	@:overload(function(_function:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(?includeMargin:Bool):Float { })
-	public function outerWidth(value:haxe.extern.EitherType<Float, String>):js.jquery.JQuery;
-	/**
-		Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
-	**/
-	public function parent(?selector:String):js.jquery.JQuery;
-	/**
-		Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
-	**/
-	public function parents(?selector:String):js.jquery.JQuery;
-	/**
-		Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
-	**/
-	@:overload(function(?element:haxe.extern.EitherType<js.html.Element, js.jquery.JQuery>, ?filter:String):js.jquery.JQuery { })
-	public function parentsUntil(?selector:String, ?filter:String):js.jquery.JQuery;
-	/**
-		Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
-	**/
-	public function position():{ var top : Float; var left : Float; };
-	/**
-		Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
-	**/
-	@:overload(function(content:haxe.extern.EitherType<Array<String>, haxe.extern.EitherType<Array<js.jquery.JQuery>, haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<js.html.NodeList, haxe.extern.EitherType<String, js.jquery.JQuery>>>>>>, ?content:haxe.extern.EitherType<Array<String>, haxe.extern.EitherType<Array<js.jquery.JQuery>, haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<js.html.NodeList, haxe.extern.EitherType<String, js.jquery.JQuery>>>>>>):js.jquery.JQuery { })
-	public function prepend(_function:Int -> String -> haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<String, js.jquery.JQuery>>):js.jquery.JQuery;
-	/**
-		Insert every element in the set of matched elements to the beginning of the target.
-	**/
-	public function prependTo(target:haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<String, js.jquery.JQuery>>>):js.jquery.JQuery;
-	/**
-		Get the immediately preceding sibling of each element in the set of matched elements. If a selector is provided, it retrieves the previous sibling only if it matches that selector.
-	**/
-	public function prev(?selector:String):js.jquery.JQuery;
-	/**
-		Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector.
-	**/
-	public function prevAll(?selector:String):js.jquery.JQuery;
-	/**
-		Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
-	**/
-	@:overload(function(?element:haxe.extern.EitherType<js.html.Element, js.jquery.JQuery>, ?filter:String):js.jquery.JQuery { })
-	public function prevUntil(?selector:String, ?filter:String):js.jquery.JQuery;
-	/**
-		Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished.
-	**/
-	public function promise(?type:String, ?target:Dynamic):js.jquery.Promise;
-	/**
-		Set one or more properties for the set of matched elements.
-		OR
-		Get the value of a property for the first element in the set of matched elements.
-	**/
-	@:overload(function(properties:Dynamic):js.jquery.JQuery { })
-	@:overload(function(propertyName:String, _function:Int -> Dynamic -> Dynamic):js.jquery.JQuery { })
-	@:overload(function(propertyName:String, value:Dynamic):js.jquery.JQuery { })
-	public function prop(propertyName:String):Dynamic;
-	/**
-		Add a collection of DOM elements onto the jQuery stack.
-	**/
-	@:overload(function(elements:haxe.extern.EitherType<Array<js.html.Element>, js.html.NodeList>, name:String, arguments:Array<Dynamic>):js.jquery.JQuery { })
-	public function pushStack(elements:haxe.extern.EitherType<Array<js.html.Element>, js.html.NodeList>):js.jquery.JQuery;
-	/**
-		Show the queue of functions to be executed on the matched elements.
-		OR
-		Manipulate the queue of functions to be executed, once for each matched element.
-	**/
-	@:overload(function(?queueName:String, newQueue:Array<Void -> Void>):js.jquery.JQuery { })
-	@:overload(function(?queueName:String, callback:haxe.Constraints.Function -> Void):js.jquery.JQuery { })
-	public function queue(?queueName:String):Array<Void -> Void>;
-	/**
-		Specify a function to execute when the DOM is fully loaded.
-	**/
-	public function ready(handler:haxe.Constraints.Function):js.jquery.JQuery;
-	/**
-		Remove the set of matched elements from the DOM.
-	**/
-	public function remove(?selector:String):js.jquery.JQuery;
-	/**
-		Remove an attribute from each element in the set of matched elements.
-	**/
-	public function removeAttr(attributeName:String):js.jquery.JQuery;
-	/**
-		Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
-	**/
-	@:overload(function(?className:String):js.jquery.JQuery { })
-	public function removeClass(_function:Int -> String -> String):js.jquery.JQuery;
-	/**
-		Remove a previously-stored piece of data.
-	**/
-	@:overload(function(?list:haxe.extern.EitherType<Array<String>, String>):js.jquery.JQuery { })
-	public function removeData(?name:String):js.jquery.JQuery;
-	/**
-		Remove a property for the set of matched elements.
-	**/
-	public function removeProp(propertyName:String):js.jquery.JQuery;
-	/**
-		Replace each target element with the set of matched elements.
-	**/
-	public function replaceAll(target:haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<String, js.jquery.JQuery>>>):js.jquery.JQuery;
-	/**
-		Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
-	**/
-	@:overload(function(_function:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function replaceWith(newContent:haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<Array<js.html.Element>, haxe.extern.EitherType<String, js.jquery.JQuery>>>):js.jquery.JQuery;
-	/**
-		Bind an event handler to the "resize" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function resize():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function scroll():js.jquery.JQuery;
-	/**
-		Get the current horizontal position of the scroll bar for the first element in the set of matched elements.
-		OR
-		Set the current horizontal position of the scroll bar for each of the set of matched elements.
-	**/
-	@:overload(function(value:Float):js.jquery.JQuery { })
-	public function scrollLeft():Int;
-	/**
-		Set the current vertical position of the scroll bar for each of the set of matched elements.
-		OR
-		Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element.
-	**/
-	@:overload(function(value:Float):js.jquery.JQuery { })
-	public function scrollTop():Float;
-	/**
-		Bind an event handler to the "select" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function select():js.jquery.JQuery;
-	/**
-		A selector representing selector passed to jQuery(), if any, when creating the original set.
-	**/
-	@:deprecated("Deprecated since jQuery 1.7")
-	public var selector : String;
-	/**
-		Encode a set of form elements as a string for submission.
-	**/
-	public function serialize():String;
-	/**
-		Encode a set of form elements as an array of names and values.
-	**/
-	public function serializeArray():Array<Dynamic>;
-	/**
-		Display the matched elements.
-	**/
-	@:overload(function(options:Dynamic):js.jquery.JQuery { })
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function show():js.jquery.JQuery;
-	/**
-		Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
-	**/
-	public function siblings(?selector:String):js.jquery.JQuery;
-	/**
-		Return the number of elements in the jQuery object.
-	**/
-	@:deprecated("Deprecated since jQuery 1.8")
-	public function size():Int;
-	/**
-		Reduce the set of matched elements to a subset specified by a range of indices.
-	**/
-	public function slice(start:Int, ?end:Int):js.jquery.JQuery;
-	/**
-		Display the matched elements with a sliding motion.
-	**/
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function slideDown(options:Dynamic):js.jquery.JQuery;
-	/**
-		Display or hide the matched elements with a sliding motion.
-	**/
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function slideToggle(options:Dynamic):js.jquery.JQuery;
-	/**
-		Hide the matched elements with a sliding motion.
-	**/
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	public function slideUp(options:Dynamic):js.jquery.JQuery;
-	/**
-		Stop the currently-running animation on the matched elements.
-	**/
-	@:overload(function(?queue:String, ?clearQueue:Bool, ?jumpToEnd:Bool):js.jquery.JQuery { })
-	public function stop(?clearQueue:Bool, ?jumpToEnd:Bool):js.jquery.JQuery;
-	/**
-		Bind an event handler to the "submit" JavaScript event, or trigger that event on an element.
-	**/
-	@:overload(function(handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function submit():js.jquery.JQuery;
-	/**
-		Set the content of each element in the set of matched elements to the specified text.
-		OR
-		Get the combined text contents of each element in the set of matched elements, including their descendants.
-	**/
-	@:overload(function(text:haxe.extern.EitherType<Float, haxe.extern.EitherType<Bool, String>>):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> String -> String):js.jquery.JQuery { })
-	public function text():String;
-	/**
-		Retrieve all the elements contained in the jQuery set, as an array.
-	**/
-	public function toArray():Array<js.html.Element>;
-	/**
-		Bind two or more handlers to the matched elements, to be executed on alternate clicks.
-		OR
-		Display or hide the matched elements.
-	**/
-	@:overload(function(options:Dynamic):js.jquery.JQuery { })
-	@:overload(function(?duration:haxe.extern.EitherType<Float, String>, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(duration:haxe.extern.EitherType<Float, String>, ?easing:String, ?complete:haxe.Constraints.Function):js.jquery.JQuery { })
-	@:overload(function(handler:js.jquery.Event -> Void, handler:js.jquery.Event -> Void, ?handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function toggle(display:Bool):js.jquery.JQuery;
-	/**
-		Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the state argument.
-	**/
-	@:overload(function(?state:Bool):js.jquery.JQuery { })
-	@:overload(function(className:String, state:Bool):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> String -> Bool -> String, ?state:Bool):js.jquery.JQuery { })
-	public function toggleClass(className:String):js.jquery.JQuery;
-	/**
-		Execute all handlers and behaviors attached to the matched elements for the given event type.
-	**/
-	@:overload(function(event:js.jquery.Event, ?extraParameters:Dynamic):js.jquery.JQuery { })
-	public function trigger(eventType:String, ?extraParameters:Dynamic):js.jquery.JQuery;
-	/**
-		Execute all handlers attached to an element for an event.
-	**/
-	@:overload(function(event:js.jquery.Event, ?extraParameters:Dynamic):Dynamic { })
-	public function triggerHandler(eventType:String, ?extraParameters:Dynamic):Dynamic;
-	/**
-		Remove a previously-attached event handler from the elements.
-	**/
-	@:overload(function(event:js.jquery.Event):js.jquery.JQuery { })
-	@:overload(function(eventType:String, _false:Bool):js.jquery.JQuery { })
-	@:overload(function(eventType:String, ?handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function unbind():js.jquery.JQuery;
-	/**
-		Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-	**/
-	@:overload(function(namespace:String):js.jquery.JQuery { })
-	@:overload(function(selector:String, eventType:String):js.jquery.JQuery { })
-	@:overload(function(selector:String, events:Dynamic):js.jquery.JQuery { })
-	@:overload(function(selector:String, eventType:String, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function undelegate():js.jquery.JQuery;
-	/**
-		Bind an event handler to the "unload" JavaScript event.
-	**/
-	@:deprecated("Deprecated since jQuery 1.8")
-	@:overload(function(?eventData:Dynamic, handler:js.jquery.Event -> Void):js.jquery.JQuery { })
-	public function unload(handler:js.jquery.Event -> Void):js.jquery.JQuery;
-	/**
-		Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
-	**/
-	@:overload(function(?selector:String):js.jquery.JQuery { })
-	public function unwrap():js.jquery.JQuery;
-	/**
-		Set the value of each element in the set of matched elements.
-		OR
-		Get the current value of the first element in the set of matched elements.
-	**/
-	@:overload(function(value:haxe.extern.EitherType<Float, haxe.extern.EitherType<Array<String>, String>>):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> String -> String):js.jquery.JQuery { })
-	public function val():Dynamic;
-	/**
-		Set the CSS width of each element in the set of matched elements.
-		OR
-		Get the current computed width for the first element in the set of matched elements.
-	**/
-	@:overload(function(value:haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	@:overload(function(_function:Int -> Int -> haxe.extern.EitherType<Float, String>):js.jquery.JQuery { })
-	public function width():Float;
-	/**
-		Wrap an HTML structure around each element in the set of matched elements.
-	**/
-	@:overload(function(_function:Int -> haxe.extern.EitherType<String, js.jquery.JQuery>):js.jquery.JQuery { })
-	public function wrap(wrappingElement:haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<String, js.jquery.JQuery>>):js.jquery.JQuery;
-	/**
-		Wrap an HTML structure around all elements in the set of matched elements.
-	**/
-	@:overload(function(_function:Void -> haxe.extern.EitherType<String, js.jquery.JQuery>):js.jquery.JQuery { })
-	public function wrapAll(wrappingElement:haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<String, js.jquery.JQuery>>):js.jquery.JQuery;
-	/**
-		Wrap an HTML structure around the content of each element in the set of matched elements.
-	**/
-	@:overload(function(_function:Int -> String):js.jquery.JQuery { })
-	public function wrapInner(wrappingElement:haxe.extern.EitherType<js.html.Element, haxe.extern.EitherType<String, js.jquery.JQuery>>):js.jquery.JQuery;
-	/**
-		Haxe iterator.
-	**/
-	@:runtime
-	inline public function iterator():js.jquery.JqIterator return new js.jquery.JqIterator(this);
-	/**
-		Haxe iterator.
-	**/
-	@:runtime
-	inline public function elements():js.jquery.JqEltsIterator return new js.jquery.JqEltsIterator(this);
-}
\ No newline at end of file
diff --git a/std/js/jquery/JqEltsIterator.hx b/std/js/jquery/JqEltsIterator.hx
deleted file mode 100644
index e2c9e36bbad6914a7368dee562b5816b26c9e02f..0000000000000000000000000000000000000000
--- a/std/js/jquery/JqEltsIterator.hx
+++ /dev/null
@@ -1,21 +0,0 @@
-package js.jquery;
-
-class JqEltsIterator {
-	var j:JQuery;
-	var i:Int;
-	inline public function new(j:JQuery):Void {
-		this.i = 0;
-		this.j = j;
-	}
-	inline public function hasNext():Bool {
-		return i < j.length;
-	}
-	inline public function next():JQuery {
-		return new JQuery(this.j[i++]);
-	}
-
-	static function __init__() {
-		if (untyped __typeof__(JQuery) != "undefined" && JQuery.fn != null)
-			JQuery.fn.elements = function() return new JqEltsIterator(js.Lib.nativeThis);
-	}
-}
\ No newline at end of file
diff --git a/std/js/jquery/JqIterator.hx b/std/js/jquery/JqIterator.hx
deleted file mode 100644
index 725bd92df8cd1799da4718f7e8a27384106b57ec..0000000000000000000000000000000000000000
--- a/std/js/jquery/JqIterator.hx
+++ /dev/null
@@ -1,21 +0,0 @@
-package js.jquery;
-
-class JqIterator {
-	var j:JQuery;
-	var i:Int;
-	inline public function new(j:JQuery):Void {
-		this.i = 0;
-		this.j = j;
-	}
-	inline public function hasNext():Bool {
-		return i < j.length;
-	}
-	inline public function next():js.html.Element {
-		return this.j[i++];
-	}
-
-	static function __init__() {
-		if (untyped __typeof__(JQuery) != "undefined" && JQuery.fn != null)
-			JQuery.fn.iterator = function() return new JqIterator(js.Lib.nativeThis);
-	}
-}
\ No newline at end of file
diff --git a/std/js/jquery/JqXHR.hx b/std/js/jquery/JqXHR.hx
deleted file mode 100644
index aec53c07fdd386a0ac84c2c2579f2281220b57d5..0000000000000000000000000000000000000000
--- a/std/js/jquery/JqXHR.hx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file is generated, do not edit! Visit http://api.jquery.com/ for API documentation. */
-package js.jquery;
-@:native("$.JqXHR") extern class JqXHR extends js.html.XMLHttpRequest {
-	/**
-		Add handlers to be called when the Deferred object is either resolved or rejected.
-	**/
-	public function always(alwaysCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?alwaysCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Deferred;
-	/**
-		Add handlers to be called when the Deferred object is resolved.
-	**/
-	public function done(doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Deferred;
-	/**
-		Add handlers to be called when the Deferred object is rejected.
-	**/
-	public function fail(failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Deferred;
-	/**
-		Determine whether a Deferred object has been rejected.
-	**/
-	@:deprecated("Deprecated since jQuery 1.7")
-	public function isRejected():Bool;
-	/**
-		Determine whether a Deferred object has been resolved.
-	**/
-	@:deprecated("Deprecated since jQuery 1.7")
-	public function isResolved():Bool;
-	/**
-		Utility method to filter and/or chain Deferreds.
-	**/
-	@:deprecated("Deprecated since jQuery 1.8")
-	@:overload(function(?doneFilter:haxe.Constraints.Function, ?failFilter:haxe.Constraints.Function, ?progressFilter:haxe.Constraints.Function):js.jquery.Promise { })
-	public function pipe(?doneFilter:haxe.Constraints.Function, ?failFilter:haxe.Constraints.Function):js.jquery.Promise;
-	/**
-		Add handlers to be called when the Deferred object generates progress notifications.
-	**/
-	public function progress(progressCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, haxe.extern.EitherType<Array<Dynamic>, Array<haxe.Constraints.Function>>>, ?progressCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, haxe.extern.EitherType<Array<Dynamic>, Array<haxe.Constraints.Function>>>):js.jquery.Deferred;
-	/**
-		Determine the current state of a Deferred object.
-	**/
-	public function state():String;
-	/**
-		Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-	**/
-	@:overload(function(doneFilter:haxe.Constraints.Function, ?failFilter:haxe.Constraints.Function, ?progressFilter:haxe.Constraints.Function):js.jquery.Promise { })
-	@:overload(function(doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?progressCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Promise { })
-	public function then(doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Promise;
-}
\ No newline at end of file
diff --git a/std/js/jquery/Promise.hx b/std/js/jquery/Promise.hx
deleted file mode 100644
index a1b2f2dc99f7e63656b924a58d2c167b0feeb6ca..0000000000000000000000000000000000000000
--- a/std/js/jquery/Promise.hx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file is generated, do not edit! Visit http://api.jquery.com/ for API documentation. */
-package js.jquery;
-@:native("$.Promise") typedef Promise = {
-	/**
-		Add handlers to be called when the Deferred object is either resolved or rejected.
-	**/
-	public function always(alwaysCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?alwaysCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Deferred;
-	/**
-		Add handlers to be called when the Deferred object is resolved.
-	**/
-	public function done(doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Deferred;
-	/**
-		Add handlers to be called when the Deferred object is rejected.
-	**/
-	public function fail(failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Deferred;
-	/**
-		Determine whether a Deferred object has been rejected.
-	**/
-	@:deprecated("Deprecated since jQuery 1.7")
-	public function isRejected():Bool;
-	/**
-		Determine whether a Deferred object has been resolved.
-	**/
-	@:deprecated("Deprecated since jQuery 1.7")
-	public function isResolved():Bool;
-	/**
-		Utility method to filter and/or chain Deferreds.
-	**/
-	@:deprecated("Deprecated since jQuery 1.8")
-	@:overload(function(?doneFilter:haxe.Constraints.Function, ?failFilter:haxe.Constraints.Function, ?progressFilter:haxe.Constraints.Function):js.jquery.Promise { })
-	public function pipe(?doneFilter:haxe.Constraints.Function, ?failFilter:haxe.Constraints.Function):js.jquery.Promise;
-	/**
-		Add handlers to be called when the Deferred object generates progress notifications.
-	**/
-	public function progress(progressCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, haxe.extern.EitherType<Array<Dynamic>, Array<haxe.Constraints.Function>>>, ?progressCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, haxe.extern.EitherType<Array<Dynamic>, Array<haxe.Constraints.Function>>>):js.jquery.Deferred;
-	/**
-		Determine the current state of a Deferred object.
-	**/
-	public function state():String;
-	/**
-		Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-	**/
-	@:overload(function(doneFilter:haxe.Constraints.Function, ?failFilter:haxe.Constraints.Function, ?progressFilter:haxe.Constraints.Function):js.jquery.Promise { })
-	@:overload(function(doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, ?progressCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Promise { })
-	public function then(doneCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>, failCallbacks:haxe.extern.EitherType<haxe.Constraints.Function, Array<haxe.Constraints.Function>>):js.jquery.Promise;
-}
\ No newline at end of file
diff --git a/std/js/html/DOMCursor.hx b/std/js/lib/ArrayBuffer.hx
similarity index 57%
rename from std/js/html/DOMCursor.hx
rename to std/js/lib/ArrayBuffer.hx
index d44bf548d0a3ba0b793568571ad87b662094d77c..c3027311d69064976f2d57d813b2135db8cc3639 100644
--- a/std/js/html/DOMCursor.hx
+++ b/std/js/lib/ArrayBuffer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,21 +20,35 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\DOMCursor.webidl. Do not edit!
+package js.lib;
 
-package js.html;
+@:native("ArrayBuffer")
+extern class ArrayBuffer {
+	static function isView(value:Dynamic):Bool;
+
+	final byteLength:Int;
 
-@:native("DOMCursor")
-extern class DOMCursor extends EventTarget
-{
-	var done(default,null) : Bool;
-	var readyState(default,null) : DOMRequestReadyState;
-	var result(default,null) : Dynamic;
-	var error(default,null) : DOMError;
-	var onsuccess : haxe.Constraints.Function;
-	var onerror : haxe.Constraints.Function;
-	
 	/** @throws DOMError */
-	@:native("continue")
-	function continue_() : Void;
-}
\ No newline at end of file
+	function new(length:Int):Void;
+
+	function slice(begin:Int, ?end:Int):ArrayBuffer;
+}
+
+#if (js_es <= 5)
+@:ifFeature('js.lib.ArrayBuffer.slice')
+private class ArrayBufferCompat {
+	static function sliceImpl(begin, ?end) {
+		var u = new js.lib.Uint8Array(js.Lib.nativeThis, begin, end == null ? null : (end - begin));
+		var resultArray = new js.lib.Uint8Array(u.byteLength);
+		resultArray.set(u);
+		return resultArray.buffer;
+	}
+
+	static function __init__():Void
+		untyped {
+			// IE10 ArrayBuffer.slice polyfill
+			if (__js__("ArrayBuffer").prototype.slice == null)
+				__js__("ArrayBuffer").prototype.slice = sliceImpl;
+		}
+}
+#end
diff --git a/std/js/lib/ArrayBufferView.hx b/std/js/lib/ArrayBufferView.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f29c95e480e20250604d0149910083ccabe4e195
--- /dev/null
+++ b/std/js/lib/ArrayBufferView.hx
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+/**
+	`ArrayBufferView` is a helper type representing any of the following JavaScript `TypedArray` types:
+
+	Documentation [ArrayBufferView](https://developer.mozilla.org/en-US/docs/Web/API/ArrayBufferView) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/ArrayBufferView$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/ArrayBufferView>
+**/
+extern interface ArrayBufferView {
+	final buffer:ArrayBuffer;
+	final byteOffset:Int;
+	final byteLength:Int;
+}
\ No newline at end of file
diff --git a/std/js/lib/BufferSource.hx b/std/js/lib/BufferSource.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f36a0b6f3189aba151b577140bd65756a6667bc0
--- /dev/null
+++ b/std/js/lib/BufferSource.hx
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import haxe.extern.EitherType;
+
+/**
+	`BufferSource` is a typedef used to represent objects that are either themselves an [ArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer),
+	or which are a [TypedArray](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray) providing an [ArrayBufferView](https://developer.mozilla.org/en-US/docs/Web/API/ArrayBufferView).
+
+	This is a helper type to simplify the specification. It isn't an interface and there are no objects implementing it.
+
+	Documentation [BufferSource](https://developer.mozilla.org/en-US/docs/Web/API/BufferSource) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/BufferSource$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+
+	@see <https://developer.mozilla.org/en-US/docs/Web/API/BufferSource>
+ */
+@:forward
+abstract BufferSource(ArrayBuffer) to ArrayBuffer from ArrayBuffer {
+	@:from public static inline function fromBufferView(view:ArrayBufferView) {
+		return cast view.buffer;
+	}
+}
diff --git a/std/js/lib/DataView.hx b/std/js/lib/DataView.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2ab34c37f84707d931937ea97daefbfdc7e470a5
--- /dev/null
+++ b/std/js/lib/DataView.hx
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+@:native("DataView")
+extern class DataView implements ArrayBufferView {
+	final buffer:ArrayBuffer;
+	final byteOffset:Int;
+	final byteLength:Int;
+
+	/** @throws DOMError */
+	function new(buffer:ArrayBuffer, ?byteOffset:Int, ?byteLength:Int):Void;
+
+	@:pure
+	function getInt8(byteOffset:Int):Int;
+	@:pure
+	function getUint8(byteOffset:Int):Int;
+	@:pure
+	function getInt16(byteOffset:Int, ?littleEndian:Bool):Int;
+	@:pure
+	function getUint16(byteOffset:Int, ?littleEndian:Bool):Int;
+	@:pure
+	function getInt32(byteOffset:Int, ?littleEndian:Bool):Int;
+	@:pure
+	function getUint32(byteOffset:Int, ?littleEndian:Bool):Int;
+	@:pure
+	function getFloat32(byteOffset:Int, ?littleEndian:Bool):Float;
+	@:pure
+	function getFloat64(byteOffset:Int, ?littleEndian:Bool):Float;
+	function setInt8(byteOffset:Int, value:Int):Void;
+	function setUint8(byteOffset:Int, value:Int):Void;
+	function setInt16(byteOffset:Int, value:Int, ?littleEndian:Bool):Void;
+	function setUint16(byteOffset:Int, value:Int, ?littleEndian:Bool):Void;
+	function setInt32(byteOffset:Int, value:Int, ?littleEndian:Bool):Void;
+	function setUint32(byteOffset:Int, value:Int, ?littleEndian:Bool):Void;
+	function setFloat32(byteOffset:Int, value:Float, ?littleEndian:Bool):Void;
+	function setFloat64(byteOffset:Int, value:Float, ?littleEndian:Bool):Void;
+}
diff --git a/std/js/lib/Date.hx b/std/js/lib/Date.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b1aaa43925035f9179075a230ca5f91e35599669
--- /dev/null
+++ b/std/js/lib/Date.hx
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import Date in HaxeDate;
+
+/**
+	Creates a JavaScript Date instance that represents a single moment in time. Date objects are based on a time value that is the number of milliseconds since 1 January 1970 UTC.
+**/
+@:native("Date")
+extern class Date {
+	@:overload(function(value:Float):Void {})
+	@:overload(function(dateString:String):Void {})
+	@:overload(function(year:Int, month:Int, ?day:Int, ?hours:Int, ?minutes:Int, ?seconds:Int, ?milliseconds:Int):Void {})
+	function new():Void;
+
+	/**
+		Cast Haxe's Date to js.lib.Date.
+	**/
+	static public inline function fromHaxeDate(date:HaxeDate):js.lib.Date {
+		return cast date;
+	}
+
+	/**
+		Cast js.lib.Date to Haxe's Date.
+	**/
+	static public inline function toHaxeDate(date:Date):HaxeDate {
+		return cast date;
+	}
+
+	/**
+		Returns the numeric value corresponding to the current time - the number of milliseconds elapsed since January 1, 1970 00:00:00 UTC, with leap seconds ignored
+	**/
+	static function now():Float;
+
+	/**
+		Parses a string representation of a date and returns the number of milliseconds since 1 January, 1970, 00:00:00, UTC, with leap seconds ignored.
+	**/
+	static function parse(str:String):Float;
+
+	/**
+		Returns the number of milliseconds since January 1, 1970, 00:00:00 UTC, with leap seconds ignored.
+	**/
+	static function UTC(year:Int, month:Int, ?day:Int, ?hours:Int, ?minutes:Int, ?seconds:Int, ?milliseconds:Int):Float;
+
+	/**
+		Returns the day of the month (1-31) for the specified date according to local time.
+	**/
+	function getDate():Int;
+
+	/**
+		Returns the day of the week (0-6) for the specified date according to local time.
+	**/
+	function getDay():Int;
+
+	/**
+		Returns the year (4 digits for 4-digit years) of the specified date according to local time.
+	**/
+	function getFullYear():Int;
+
+	/**
+		Returns the hour (0-23) in the specified date according to local time.
+	**/
+	function getHours():Int;
+
+	/**
+		Returns the milliseconds (0-999) in the specified date according to local time.
+	**/
+	function getMilliseconds():Int;
+
+	/**
+		Returns the minutes (0-59) in the specified date according to local time.
+	**/
+	function getMinutes():Int;
+
+	/**
+		Returns the month (0-11) in the specified date according to local time.
+	**/
+	function getMonth():Int;
+
+	/**
+		Returns the seconds (0-59) in the specified date according to local time.
+	**/
+	function getSeconds():Int;
+
+	/**
+		Returns the numeric value of the specified date as the number of milliseconds since January 1, 1970, 00:00:00 UTC (negative for prior times).
+	**/
+	function getTime():Float;
+
+	/**
+		Returns the time-zone offset in minutes for the current locale.
+	**/
+	function getTimezoneOffset():Int;
+
+	/**
+		Returns the day (date) of the month (1-31) in the specified date according to universal time.
+	**/
+	function getUTCDate():Int;
+
+	/**
+		Returns the day of the week (0-6) in the specified date according to universal time.
+	**/
+	function getUTCDay():Int;
+
+	/**
+		Returns the year (4 digits for 4-digit years) in the specified date according to universal time.
+	**/
+	function getUTCFullYear():Int;
+
+	/**
+		Returns the hours (0-23) in the specified date according to universal time.
+	**/
+	function getUTCHours():Int;
+
+	/**
+		Returns the milliseconds (0-999) in the specified date according to universal time.
+	**/
+	function getUTCMilliseconds():Int;
+
+	/**
+		Returns the minutes (0-59) in the specified date according to universal time.
+	**/
+	function getUTCMinutes():Int;
+
+	/**
+		Returns the month (0-11) in the specified date according to universal time.
+	**/
+	function getUTCMonth():Int;
+
+	/**
+		Returns the seconds (0-59) in the specified date according to universal time.
+	**/
+	function getUTCSeconds():Int;
+
+	/**
+		Sets the day of the month for a specified date according to local time.
+	**/
+	function setDate(value:Int):Void;
+
+	/**
+		Sets the full year (e.g. 4 digits for 4-digit years) for a specified date according to local time.
+	**/
+	function setFullYear(value:Int):Void;
+
+	/**
+		Sets the hours for a specified date according to local time.
+	**/
+	function setHours(value:Int):Void;
+
+	/**
+		Sets the milliseconds for a specified date according to local time.
+	**/
+	function setMilliseconds(value:Int):Void;
+
+	/**
+		Sets the minutes for a specified date according to local time.
+	**/
+	function setMinutes(value:Int):Void;
+
+	/**
+		Sets the month for a specified date according to local time.
+	**/
+	function setMonth(value:Int):Void;
+
+	/**
+		Sets the seconds for a specified date according to local time.
+	**/
+	function setSeconds(value:Int):Void;
+
+	/**
+		Sets the Date object to the time represented by a number of milliseconds since January 1, 1970, 00:00:00 UTC, allowing for negative numbers for times prior.
+	**/
+	function setTime(value:Float):Void;
+
+	/**
+		Sets the day of the month for a specified date according to universal time.
+	**/
+	function setUTCDate(value:Int):Void;
+
+	/**
+		Sets the full year (e.g. 4 digits for 4-digit years) for a specified date according to universal time.
+	**/
+	function setUTCFullYear(value:Int):Void;
+
+	/**
+		Sets the hour for a specified date according to universal time.
+	**/
+	function setUTCHours(value:Int):Void;
+
+	/**
+		Sets the milliseconds for a specified date according to universal time.
+	**/
+	function setUTCMilliseconds(value:Int):Void;
+
+	/**
+		Sets the minutes for a specified date according to universal time.
+	**/
+	function setUTCMinutes(value:Int):Void;
+
+	/**
+		Sets the month for a specified date according to universal time.
+	**/
+	function setUTCMonth(value:Int):Void;
+
+	/**
+		Sets the seconds for a specified date according to universal time.
+	**/
+	function setUTCSeconds(value:Int):Void;
+
+	/**
+		Returns the "date" portion of the Date as a human-readable string.
+	**/
+	function toDateString():String;
+
+	/**
+		Converts a date to a string following the ISO 8601 Extended Format.
+	**/
+	function toISOString():String;
+
+	/**
+		Returns a string representing the Date using toISOString(). Intended for use by JSON.stringify().
+	**/
+	function toJSON():String;
+
+	/**
+		Returns a string with a locality sensitive representation of the date portion of this date based on system settings.
+	**/
+	function toLocaleDateString(?locales:String, ?options:Dynamic<Dynamic>):String;
+
+	/**
+		Converts a date to a string, using a format string.
+	**/
+	function toLocaleFormat(format:String):String;
+
+	/**
+		Returns a string with a locality sensitive representation of this date. Overrides the Object.prototype.toLocaleString() method.
+	**/
+	function toLocaleString(?locales:String, ?options:Dynamic<Dynamic>):String;
+
+	/**
+		Returns a string with a locality sensitive representation of the time portion of this date based on system settings.
+	**/
+	function toLocaleTimeString(?locales:String, ?options:Dynamic<Dynamic>):String;
+
+	/**
+		Returns a string representing the source for an equivalent Date object; you can use this value to create a new object. Overrides the Object.prototype.toSource() method.
+	**/
+	function toSource():String;
+
+	/**
+		Returns a string representing the specified Date object. Overrides the Object.prototype.toString() method.
+	**/
+	function toString():String;
+
+	/**
+		Returns the "time" portion of the Date as a human-readable string.
+	**/
+	function toTimeString():String;
+
+	/**
+		Converts a date to a string using the UTC timezone.
+	**/
+	function toUTCString():String;
+}
diff --git a/std/php7/_std/haxe/zip/Compress.hx b/std/js/lib/Error.hx
similarity index 57%
rename from std/php7/_std/haxe/zip/Compress.hx
rename to std/js/lib/Error.hx
index d1cf82368e560b785d3345a4a78df1691ee24f14..3283769f6d912fb00f02f73034837f5934dc06c5 100644
--- a/std/php7/_std/haxe/zip/Compress.hx
+++ b/std/js/lib/Error.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,37 +19,44 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.zip;
 
-@:coreApi
-class Compress {
+package js.lib;
 
-	private var level : Int;
+@:native("Error")
+extern class Error {
+	var message:String;
+	var name:String;
+	var stack(default, null):String;
 
-	public function new( level : Int ) : Void {
-		this.level = level;
-	}
+	function new(?message:String):Void;
+}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
-		var input = src.sub( srcPos , src.length - srcPos );
-		var data = run( input , level );
-		dst.blit( dstPos , data , 0 , data.length );
+@:native("EvalError")
+extern class EvalError extends Error {
+	function new(?message:String):Void;
+}
 
-		return {
-			done: true,
-			read: input.length,
-			write: data.length
-		};
-	}
+@:native("RangeError")
+extern class RangeError extends Error {
+	function new(?message:String):Void;
+}
 
-	public function setFlushMode( f : FlushMode ) : Void {
-	}
+@:native("ReferenceError")
+extern class ReferenceError extends Error {
+	function new(?message:String):Void;
+}
 
-	public function close() : Void {
-	}
+@:native("SyntaxError")
+extern class SyntaxError extends Error {
+	function new(?message:String):Void;
+}
+
+@:native("TypeError")
+extern class TypeError extends Error {
+	function new(?message:String):Void;
+}
 
-	public static function run( s : haxe.io.Bytes, level : Int ) : haxe.io.Bytes {
-		var c = untyped __call__("gzcompress", s.toString(), level);
-		return haxe.io.Bytes.ofString(c);
-	}
+@:native("URIError")
+extern class URIError extends Error {
+	function new(?message:String):Void;
 }
diff --git a/std/js/lib/Float32Array.hx b/std/js/lib/Float32Array.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3b4f13de9a45524f067d1b58e60b58c96de57ad5
--- /dev/null
+++ b/std/js/lib/Float32Array.hx
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.intl.NumberFormat.NumberFormatOptions;
+
+/**
+	The `Float32Array` typed array represents an array of 32-bit floating point numbers
+	(corresponding to the C float data type) in the platform byte order. If control over byte order is
+	needed, use `DataView` instead. The contents are initialized to `0`. Once established, you can
+	reference elements in the array using the object's methods, or using standard array index
+	syntax (that is, using bracket notation)
+
+	Documentation [Float32Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Float32Array) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Float32Array$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Float32Array")
+extern class Float32Array implements ArrayBufferView implements ArrayAccess<Float> {
+	/**
+		Returns a number value of the element size. 4 in the case of an `Float32Array`.
+	 */
+	static final BYTES_PER_ELEMENT:Int;
+
+	/**
+		Creates a new `Float32Array` from an array-like or iterable object. See also [Array.from()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from).
+	 */
+	@:overload(function(source:{}, ?mapFn:(value:Float) -> Int, ?thisArg:Any):Float32Array {})
+	@:pure static function from(source:{}, ?mapFn:(value:Float, index:Int) -> Int, ?thisArg:Any):Float32Array;
+
+	/**
+		Creates a new `Float32Array` with a variable number of arguments. See also [Array.of()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/of).
+	 */
+	@:pure static function of(elements:haxe.extern.Rest<Dynamic>):Float32Array;
+
+	/**
+		Returns a number value of the element size.
+	 */
+	@:native("BYTES_PER_ELEMENT")
+	final BYTES_PER_ELEMENT_:Int;
+
+	/**
+		Returns the `ArrayBuffer` referenced by the `Float32Array` Fixed at construction time and thus read only.
+	 */
+	final buffer:ArrayBuffer;
+
+	/**
+		Returns the length (in bytes) of the `Float32Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteLength:Int;
+
+	/**
+		Returns the offset (in bytes) of the `Float32Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteOffset:Int;
+
+	/**
+		Returns the number of elements hold in the `Float32Array`. Fixed at construction time and thus read only.
+	 */
+	final length:Int;
+
+	/** @throws DOMError */
+	@:overload(function(length:Int):Void {})
+	@:overload(function(object:{}):Void {})
+	@:pure function new(buffer:ArrayBuffer, ?byteOffset:Int, ?length:Int):Void;
+
+	/**
+		Copies a sequence of array elements within the array.
+		See also [Array.prototype.copyWithin()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin).
+	 */
+	function copyWithin(target:Int, start:Int, ?end:Int):Float32Array;
+
+	/**
+		Returns a new Array Iterator object that contains the key/value pairs for each index in the array.
+		See also [Array.prototype.entries()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/entries).
+	 */
+	@:pure function entries():Iterator<Int>;
+
+	/**
+		Tests whether all elements in the array pass the test provided by a function.
+		See also [Array.prototype.every()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every).
+	 */
+	@:overload(function(callback:(currentValue:Float) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(currentValue:Float, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function every(callback:(currentValue:Float, index:Int, array:Float32Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Fills all the elements of an array from a start index to an end index with a static value.
+		See also [Array.prototype.fill()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill).
+	 */
+	function fill(value:Float, ?start:Int, ?end:Int):Float32Array;
+
+	/**
+		Creates a new array with all of the elements of this array for which the provided filtering function returns true.
+		See also [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
+	 */
+	@:overload(function(callback:(element:Float) -> Bool, ?thisArg:Any):Float32Array {})
+	@:overload(function(callback:(element:Float, index:Int) -> Bool, ?thisArg:Any):Float32Array {})
+	function filter(callback:(element:Float, index:Int, array:Float32Array) -> Bool, ?thisArg:Any):Float32Array;
+
+	/**
+		Returns the found value in the array, if an element in the array satisfies the provided testing function or undefined if not found.
+		See also [Array.prototype.find()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find).
+	 */
+	@:overload(function(callback:(element:Float) -> Bool, ?thisArg:Any):Null<Int> {})
+	@:overload(function(callback:(element:Float, index:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	function find(callback:(element:Float, index:Int, array:Float32Array) -> Bool, ?thisArg:Any):Null<Int>;
+
+	/**
+		Returns the found index in the array, if an element in the array satisfies the provided testing function or -1 if not found.
+		See also [Array.prototype.findIndex()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex).
+	 */
+	@:overload(function(callback:(element:Float) -> Bool, ?thisArg:Any):Int {})
+	@:overload(function(callback:(element:Float, index:Int) -> Bool, ?thisArg:Any):Int {})
+	function findIndex(callback:(element:Float, index:Int, array:Float32Array) -> Bool, ?thisArg:Any):Int;
+
+	/**
+		Calls a function for each element in the array.
+		See also [Array.prototype.forEach()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach).
+	 */
+	@:overload(function(callback:(element:Float) -> Void, ?thisArg:Any):Void {})
+	@:overload(function(callback:(element:Float, index:Int) -> Void, ?thisArg:Any):Void {})
+	function forEach(callback:(element:Float, index:Int, array:Float32Array) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Determines whether a typed array includes a certain element, returning true or false as appropriate.
+		See also [Array.prototype.includes()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
+	 */
+	@:pure function includes(searchElement:Float, ?fromIndex:Int):Bool;
+
+	/**
+		Returns the first (least) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.indexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf).
+	 */
+	@:pure function indexOf(searchElement:Float, ?fromIndex:Int):Int;
+
+	/**
+		Joins all elements of an array into a string.
+		See also [Array.prototype.join()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join).
+	 */
+	@:pure function join(?separator:String):String;
+
+	/**
+		Returns a new Array Iterator that contains the keys for each index in the array.
+		See also [Array.prototype.keys()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/keys).
+	 */
+	@:pure function keys():Iterator<Int>;
+
+	/**
+		Returns the last (greatest) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.lastIndexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf).
+	 */
+	@:pure function lastIndexOf(searchElement:Float, ?fromIndex:Int):Int;
+
+	/**
+		Creates a new array with the results of calling a provided function on every element in this array.
+		See also [Array.prototype.map()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map).
+	 */
+	@:overload(function(callback:(element:Float) -> Float, ?thisArg:Any):Float32Array {})
+	@:overload(function(callback:(element:Float, index:Int) -> Float, ?thisArg:Any):Float32Array {})
+	function map(callback:(element:Float, index:Int, array:Float32Array) -> Float, ?thisArg:Any):Float32Array;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from left-to-right) as to reduce it to a single value.
+		See also [Array.prototype.reduce()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Float) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Float, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float) -> Int):Float {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float, index:Int) -> Int):Float {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float, index:Int, array:Float32Array) -> Int):Float {})
+	function reduce<T>(callback:(previousValue:T, currentValue:Float, index:Int, array:Float32Array) -> T, initialValue:T):T;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from right-to-left) as to reduce it to a single value.
+		See also [Array.prototype.reduceRight()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Float) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Float, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float) -> Int):Float {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float, index:Int) -> Int):Float {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float, index:Int, array:Float32Array) -> Int):Float {})
+	function reduceRight<T>(callback:(previousValue:T, currentValue:Float, index:Int, array:Float32Array) -> T, initialValue:T):T;
+
+	/**
+		Reverses the order of the elements of an array — the first becomes the last, and the last becomes the first.
+		See also [Array.prototype.reverse()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse).
+	 */
+	function reverse():Float32Array;
+
+	/**
+		Stores multiple values in the typed array, reading input values from a specified array.
+	 */
+	@:overload(function(array:Int8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8ClampedArray, ?offset:Int):Void {})
+	@:overload(function(array:Int16Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint16Array, ?offset:Int):Void {})
+	@:overload(function(array:Int32Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float64Array, ?offset:Int):Void {})
+	@:overload(function(array:Array<Int>, ?offset:Int):Void {})
+	function set(array:Array<Float>, ?offset:Int):Void;
+
+	/**
+		Extracts a section of an array and returns a new array.
+		See also [Array.prototype.slice()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice).
+	 */
+	@:pure function slice(?start:Int, ?end:Int):Float32Array;
+
+	/**
+		Returns true if at least one element in this array satisfies the provided testing function.
+		See also [Array.prototype.some()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some).
+	 */
+	@:overload(function(callback:(element:Float) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(element:Float, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function some(callback:(element:Float, index:Int, array:Float32Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Sorts the elements of an array in place and returns the array.
+		See also [Array.prototype.sort()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort).
+	 */
+	function sort(?compareFn:(x:Float, y:Float) -> Int):Float32Array;
+
+	/**
+		Returns a new TypedArray from the given start and end element index.
+	 */
+	@:pure function subarray(?begin:Int, ?end:Int):Float32Array;
+
+	/**
+		Returns a new Array Iterator object that contains the values for each index in the array.
+		See also [Array.prototype.values()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values).
+	 */
+	@:pure function values():Iterator<Float>;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toLocaleString(?locales:String, ?options:NumberFormatOptions):String;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toString():String;
+}
diff --git a/std/js/lib/Float64Array.hx b/std/js/lib/Float64Array.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ae0ffbddc37b251946021805b947f8949a04cc43
--- /dev/null
+++ b/std/js/lib/Float64Array.hx
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.intl.NumberFormat.NumberFormatOptions;
+
+/**
+	The `Float64Array` typed array represents an array of 64-bit floating point numbers
+	(corresponding to the C double data type) in the platform byte order. If control over byte order
+	is needed, use `DataView` instead. The contents are initialized to `0`. Once established, you can
+	reference elements in the array using the object's methods, or using standard array index
+	syntax (that is, using bracket notation).
+
+	Documentation [Float64Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Float64Array) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Float64Array$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Float64Array")
+extern class Float64Array implements ArrayBufferView implements ArrayAccess<Float> {
+	/**
+		Returns a number value of the element size. 8 in the case of an `Float64Array`.
+	 */
+	static final BYTES_PER_ELEMENT:Int;
+
+	/**
+		Creates a new `Float64Array` from an array-like or iterable object. See also [Array.from()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from).
+	 */
+	@:overload(function(source:{}, ?mapFn:(value:Float) -> Int, ?thisArg:Any):Float64Array {})
+	@:pure static function from(source:{}, ?mapFn:(value:Float, index:Int) -> Int, ?thisArg:Any):Float64Array;
+
+	/**
+		Creates a new `Float64Array` with a variable number of arguments. See also [Array.of()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/of).
+	 */
+	@:pure static function of(elements:haxe.extern.Rest<Dynamic>):Float64Array;
+
+	/**
+		Returns a number value of the element size.
+	 */
+	@:native("BYTES_PER_ELEMENT")
+	final BYTES_PER_ELEMENT_:Int;
+
+	/**
+		Returns the `ArrayBuffer` referenced by the `Float64Array` Fixed at construction time and thus read only.
+	 */
+	final buffer:ArrayBuffer;
+
+	/**
+		Returns the length (in bytes) of the `Float64Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteLength:Int;
+
+	/**
+		Returns the offset (in bytes) of the `Float64Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteOffset:Int;
+
+	/**
+		Returns the number of elements hold in the `Float64Array`. Fixed at construction time and thus read only.
+	 */
+	final length:Int;
+
+	/** @throws DOMError */
+	@:overload(function(length:Int):Void {})
+	@:overload(function(object:{}):Void {})
+	@:pure function new(buffer:ArrayBuffer, ?byteOffset:Int, ?length:Int):Void;
+
+	/**
+		Copies a sequence of array elements within the array.
+		See also [Array.prototype.copyWithin()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin).
+	 */
+	function copyWithin(target:Int, start:Int, ?end:Int):Float64Array;
+
+	/**
+		Returns a new Array Iterator object that contains the key/value pairs for each index in the array.
+		See also [Array.prototype.entries()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/entries).
+	 */
+	@:pure function entries():Iterator<Int>;
+
+	/**
+		Tests whether all elements in the array pass the test provided by a function.
+		See also [Array.prototype.every()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every).
+	 */
+	@:overload(function(callback:(currentValue:Float) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(currentValue:Float, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function every(callback:(currentValue:Float, index:Int, array:Float64Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Fills all the elements of an array from a start index to an end index with a static value.
+		See also [Array.prototype.fill()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill).
+	 */
+	function fill(value:Float, ?start:Int, ?end:Int):Float64Array;
+
+	/**
+		Creates a new array with all of the elements of this array for which the provided filtering function returns true.
+		See also [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
+	 */
+	@:overload(function(callback:(element:Float) -> Bool, ?thisArg:Any):Float64Array {})
+	@:overload(function(callback:(element:Float, index:Int) -> Bool, ?thisArg:Any):Float64Array {})
+	function filter(callback:(element:Float, index:Int, array:Float64Array) -> Bool, ?thisArg:Any):Float64Array;
+
+	/**
+		Returns the found value in the array, if an element in the array satisfies the provided testing function or undefined if not found.
+		See also [Array.prototype.find()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find).
+	 */
+	@:overload(function(callback:(element:Float) -> Bool, ?thisArg:Any):Null<Int> {})
+	@:overload(function(callback:(element:Float, index:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	function find(callback:(element:Float, index:Int, array:Float64Array) -> Bool, ?thisArg:Any):Null<Int>;
+
+	/**
+		Returns the found index in the array, if an element in the array satisfies the provided testing function or -1 if not found.
+		See also [Array.prototype.findIndex()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex).
+	 */
+	@:overload(function(callback:(element:Float) -> Bool, ?thisArg:Any):Int {})
+	@:overload(function(callback:(element:Float, index:Int) -> Bool, ?thisArg:Any):Int {})
+	function findIndex(callback:(element:Float, index:Int, array:Float64Array) -> Bool, ?thisArg:Any):Int;
+
+	/**
+		Calls a function for each element in the array.
+		See also [Array.prototype.forEach()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach).
+	 */
+	@:overload(function(callback:(element:Float) -> Void, ?thisArg:Any):Void {})
+	@:overload(function(callback:(element:Float, index:Int) -> Void, ?thisArg:Any):Void {})
+	function forEach(callback:(element:Float, index:Int, array:Float64Array) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Determines whether a typed array includes a certain element, returning true or false as appropriate.
+		See also [Array.prototype.includes()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
+	 */
+	@:pure function includes(searchElement:Float, ?fromIndex:Int):Bool;
+
+	/**
+		Returns the first (least) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.indexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf).
+	 */
+	@:pure function indexOf(searchElement:Float, ?fromIndex:Int):Int;
+
+	/**
+		Joins all elements of an array into a string.
+		See also [Array.prototype.join()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join).
+	 */
+	@:pure function join(?separator:String):String;
+
+	/**
+		Returns a new Array Iterator that contains the keys for each index in the array.
+		See also [Array.prototype.keys()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/keys).
+	 */
+	@:pure function keys():Iterator<Int>;
+
+	/**
+		Returns the last (greatest) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.lastIndexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf).
+	 */
+	@:pure function lastIndexOf(searchElement:Float, ?fromIndex:Int):Int;
+
+	/**
+		Creates a new array with the results of calling a provided function on every element in this array.
+		See also [Array.prototype.map()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map).
+	 */
+	@:overload(function(callback:(element:Float) -> Float, ?thisArg:Any):Float64Array {})
+	@:overload(function(callback:(element:Float, index:Int) -> Float, ?thisArg:Any):Float64Array {})
+	function map(callback:(element:Float, index:Int, array:Float64Array) -> Float, ?thisArg:Any):Float64Array;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from left-to-right) as to reduce it to a single value.
+		See also [Array.prototype.reduce()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Float) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Float, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float) -> Int):Float {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float, index:Int) -> Int):Float {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float, index:Int, array:Float64Array) -> Int):Float {})
+	function reduce<T>(callback:(previousValue:T, currentValue:Float, index:Int, array:Float64Array) -> T, initialValue:T):T;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from right-to-left) as to reduce it to a single value.
+		See also [Array.prototype.reduceRight()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Float) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Float, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float) -> Int):Float {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float, index:Int) -> Int):Float {})
+	@:overload(function(callbackfn:(previousValue:Float, currentValue:Float, index:Int, array:Float64Array) -> Int):Float {})
+	function reduceRight<T>(callback:(previousValue:T, currentValue:Float, index:Int, array:Float64Array) -> T, initialValue:T):T;
+
+	/**
+		Reverses the order of the elements of an array — the first becomes the last, and the last becomes the first.
+		See also [Array.prototype.reverse()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse).
+	 */
+	function reverse():Float64Array;
+
+	/**
+		Stores multiple values in the typed array, reading input values from a specified array.
+	 */
+	@:overload(function(array:Int8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8ClampedArray, ?offset:Int):Void {})
+	@:overload(function(array:Int16Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint16Array, ?offset:Int):Void {})
+	@:overload(function(array:Int32Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float64Array, ?offset:Int):Void {})
+	@:overload(function(array:Array<Int>, ?offset:Int):Void {})
+	function set(array:Array<Float>, ?offset:Int):Void;
+
+	/**
+		Extracts a section of an array and returns a new array.
+		See also [Array.prototype.slice()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice).
+	 */
+	@:pure function slice(?start:Int, ?end:Int):Float64Array;
+
+	/**
+		Returns true if at least one element in this array satisfies the provided testing function.
+		See also [Array.prototype.some()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some).
+	 */
+	@:overload(function(callback:(element:Float) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(element:Float, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function some(callback:(element:Float, index:Int, array:Float64Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Sorts the elements of an array in place and returns the array.
+		See also [Array.prototype.sort()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort).
+	 */
+	function sort(?compareFn:(x:Float, y:Float) -> Int):Float64Array;
+
+	/**
+		Returns a new TypedArray from the given start and end element index.
+	 */
+	@:pure function subarray(?begin:Int, ?end:Int):Float64Array;
+
+	/**
+		Returns a new Array Iterator object that contains the values for each index in the array.
+		See also [Array.prototype.values()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values).
+	 */
+	@:pure function values():Iterator<Float>;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toLocaleString(?locales:String, ?options:NumberFormatOptions):String;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toString():String;
+}
diff --git a/std/js/lib/Function.hx b/std/js/lib/Function.hx
new file mode 100644
index 0000000000000000000000000000000000000000..58108c7ff0f5f008ab895851903b88f22d6ab36a
--- /dev/null
+++ b/std/js/lib/Function.hx
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import haxe.extern.Rest;
+
+@:native("Function")
+extern class Function {
+	/** Specifies the number of arguments expected by the function. **/
+	var length(default, never):Int;
+
+	/** The name of the function. **/
+	var name:String;
+
+	/** Creates a new Function object. **/
+	function new(arg:String, rest:Rest<String>);
+
+	/** Calls a function and sets its this to the provided value, arguments can be passed as an Array object. **/
+	function apply(thisArg:Dynamic, argsArray:Array<Dynamic>):Dynamic;
+
+	/** Calls (executes) a function and sets its this to the provided value, arguments can be passed as they are. **/
+	function call(thisArg:Dynamic, args:Rest<Dynamic>):Dynamic;
+
+	/**
+		Creates a new function which, when called, has its this set to the provided value,
+		with a given sequence of arguments preceding any provided when the new function was called.
+	**/
+	@:pure function bind(thisArg:Dynamic, args:Rest<Dynamic>):Function;
+
+	/** Returns a string representing the source code of the function. **/
+	@:pure function toString():String;
+}
diff --git a/std/js/lib/Int16Array.hx b/std/js/lib/Int16Array.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ca4f32a4eac44b89fee3c13e99b1cbd3745459e6
--- /dev/null
+++ b/std/js/lib/Int16Array.hx
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.intl.NumberFormat.NumberFormatOptions;
+
+/**
+	The `Int16Array` typed array represents an array of twos-complement 16-bit signed integers in
+	the platform byte order. If control over byte order is needed, use `DataView` instead. The
+	contents are initialized to 0. Once established, you can reference elements in the array using
+	the object's methods, or using standard array index syntax (that is, using bracket notation).
+
+	Documentation [Int16Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Int16Array) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Int16Array$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Int16Array")
+extern class Int16Array implements ArrayBufferView implements ArrayAccess<Int> {
+	/**
+		Returns a number value of the element size. 2 in the case of an `Int16Array`.
+	 */
+	static final BYTES_PER_ELEMENT:Int;
+
+	/**
+		Creates a new `Int16Array` from an array-like or iterable object. See also [Array.from()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from).
+	 */
+	@:overload(function(source:{}, ?mapFn:(value:Int) -> Int, ?thisArg:Any):Int16Array {})
+	@:pure static function from(source:{}, ?mapFn:(value:Int, index:Int) -> Int, ?thisArg:Any):Int16Array;
+
+	/**
+		Creates a new `Int16Array` with a variable number of arguments. See also [Array.of()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/of).
+	 */
+	@:pure static function of(elements:haxe.extern.Rest<Dynamic>):Int16Array;
+
+	/**
+		Returns a number value of the element size.
+	 */
+	@:native("BYTES_PER_ELEMENT")
+	final BYTES_PER_ELEMENT_:Int;
+
+	/**
+		Returns the `ArrayBuffer` referenced by the `Int16Array` Fixed at construction time and thus read only.
+	 */
+	final buffer:ArrayBuffer;
+
+	/**
+		Returns the length (in bytes) of the `Int16Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteLength:Int;
+
+	/**
+		Returns the offset (in bytes) of the `Int16Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteOffset:Int;
+
+	/**
+		Returns the number of elements hold in the `Int16Array`. Fixed at construction time and thus read only.
+	 */
+	final length:Int;
+
+	/** @throws DOMError */
+	@:overload(function(length:Int):Void {})
+	@:overload(function(object:{}):Void {})
+	@:pure function new(buffer:ArrayBuffer, ?byteOffset:Int, ?length:Int):Void;
+
+	/**
+		Copies a sequence of array elements within the array.
+		See also [Array.prototype.copyWithin()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin).
+	 */
+	function copyWithin(target:Int, start:Int, ?end:Int):Int16Array;
+
+	/**
+		Returns a new Array Iterator object that contains the key/value pairs for each index in the array.
+		See also [Array.prototype.entries()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/entries).
+	 */
+	@:pure function entries():Iterator<Int>;
+
+	/**
+		Tests whether all elements in the array pass the test provided by a function.
+		See also [Array.prototype.every()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every).
+	 */
+	@:overload(function(callback:(currentValue:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(currentValue:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function every(callback:(currentValue:Int, index:Int, array:Int16Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Fills all the elements of an array from a start index to an end index with a static value.
+		See also [Array.prototype.fill()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill).
+	 */
+	function fill(value:Int, ?start:Int, ?end:Int):Int16Array;
+
+	/**
+		Creates a new array with all of the elements of this array for which the provided filtering function returns true.
+		See also [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Int16Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Int16Array {})
+	function filter(callback:(element:Int, index:Int, array:Int16Array) -> Bool, ?thisArg:Any):Int16Array;
+
+	/**
+		Returns the found value in the array, if an element in the array satisfies the provided testing function or undefined if not found.
+		See also [Array.prototype.find()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	function find(callback:(element:Int, index:Int, array:Int16Array) -> Bool, ?thisArg:Any):Null<Int>;
+
+	/**
+		Returns the found index in the array, if an element in the array satisfies the provided testing function or -1 if not found.
+		See also [Array.prototype.findIndex()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Int {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Int {})
+	function findIndex(callback:(element:Int, index:Int, array:Int16Array) -> Bool, ?thisArg:Any):Int;
+
+	/**
+		Calls a function for each element in the array.
+		See also [Array.prototype.forEach()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach).
+	 */
+	@:overload(function(callback:(element:Int) -> Void, ?thisArg:Any):Void {})
+	@:overload(function(callback:(element:Int, index:Int) -> Void, ?thisArg:Any):Void {})
+	function forEach(callback:(element:Int, index:Int, array:Int16Array) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Determines whether a typed array includes a certain element, returning true or false as appropriate.
+		See also [Array.prototype.includes()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
+	 */
+	@:pure function includes(searchElement:Int, ?fromIndex:Int):Bool;
+
+	/**
+		Returns the first (least) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.indexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf).
+	 */
+	@:pure function indexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Joins all elements of an array into a string.
+		See also [Array.prototype.join()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join).
+	 */
+	@:pure function join(?separator:String):String;
+
+	/**
+		Returns a new Array Iterator that contains the keys for each index in the array.
+		See also [Array.prototype.keys()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/keys).
+	 */
+	@:pure function keys():Iterator<Int>;
+
+	/**
+		Returns the last (greatest) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.lastIndexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf).
+	 */
+	@:pure function lastIndexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Creates a new array with the results of calling a provided function on every element in this array.
+		See also [Array.prototype.map()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map).
+	 */
+	@:overload(function(callback:(element:Int) -> Int, ?thisArg:Any):Int16Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Int, ?thisArg:Any):Int16Array {})
+	function map(callback:(element:Int, index:Int, array:Int16Array) -> Int, ?thisArg:Any):Int16Array;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from left-to-right) as to reduce it to a single value.
+		See also [Array.prototype.reduce()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Int16Array) -> Int):Int {})
+	function reduce<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Int16Array) -> T, initialValue:T):T;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from right-to-left) as to reduce it to a single value.
+		See also [Array.prototype.reduceRight()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Int16Array) -> Int):Int {})
+	function reduceRight<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Int16Array) -> T, initialValue:T):T;
+
+	/**
+		Reverses the order of the elements of an array — the first becomes the last, and the last becomes the first.
+		See also [Array.prototype.reverse()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse).
+	 */
+	function reverse():Int16Array;
+
+	/**
+		Stores multiple values in the typed array, reading input values from a specified array.
+	 */
+	@:overload(function(array:Int8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8ClampedArray, ?offset:Int):Void {})
+	@:overload(function(array:Int16Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint16Array, ?offset:Int):Void {})
+	@:overload(function(array:Int32Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float64Array, ?offset:Int):Void {})
+	function set(array:Array<Int>, ?offset:Int):Void;
+
+	/**
+		Extracts a section of an array and returns a new array.
+		See also [Array.prototype.slice()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice).
+	 */
+	@:pure function slice(?start:Int, ?end:Int):Int16Array;
+
+	/**
+		Returns true if at least one element in this array satisfies the provided testing function.
+		See also [Array.prototype.some()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function some(callback:(element:Int, index:Int, array:Int16Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Sorts the elements of an array in place and returns the array.
+		See also [Array.prototype.sort()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort).
+	 */
+	function sort(?compareFn:(x:Int, y:Int) -> Int):Int16Array;
+
+	/**
+		Returns a new TypedArray from the given start and end element index.
+	 */
+	@:pure function subarray(?begin:Int, ?end:Int):Int16Array;
+
+	/**
+		Returns a new Array Iterator object that contains the values for each index in the array.
+		See also [Array.prototype.values()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values).
+	 */
+	@:pure function values():Iterator<Int>;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toLocaleString(?locales:String, ?options:NumberFormatOptions):String;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toString():String;
+}
diff --git a/std/js/lib/Int32Array.hx b/std/js/lib/Int32Array.hx
new file mode 100644
index 0000000000000000000000000000000000000000..15857f086cfc637bd86e0ad53238a027077aef9a
--- /dev/null
+++ b/std/js/lib/Int32Array.hx
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.intl.NumberFormat.NumberFormatOptions;
+
+/**
+	The `Int32Array` typed array represents an array of twos-complement 32-bit signed integers in
+	the platform byte order. If control over byte order is needed, use `DataView` instead. The
+	contents are initialized to `0`. Once established, you can reference elements in the array using
+	the object's methods, or using standard array index syntax (that is, using bracket notation).
+
+	Documentation [Int32Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Int32Array) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Int32Array$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Int32Array")
+extern class Int32Array implements ArrayBufferView implements ArrayAccess<Int> {
+	/**
+		Returns a number value of the element size. 4 in the case of an `Int32Array`.
+	 */
+	static final BYTES_PER_ELEMENT:Int;
+
+	/**
+		Creates a new `Int32Array` from an array-like or iterable object. See also [Array.from()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from).
+	 */
+	@:overload(function(source:{}, ?mapFn:(value:Int) -> Int, ?thisArg:Any):Int32Array {})
+	@:pure static function from(source:{}, ?mapFn:(value:Int, index:Int) -> Int, ?thisArg:Any):Int32Array;
+
+	/**
+		Creates a new `Int32Array` with a variable number of arguments. See also [Array.of()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/of).
+	 */
+	@:pure static function of(elements:haxe.extern.Rest<Dynamic>):Int32Array;
+
+	/**
+		Returns a number value of the element size.
+	 */
+	@:native("BYTES_PER_ELEMENT")
+	final BYTES_PER_ELEMENT_:Int;
+
+	/**
+		Returns the `ArrayBuffer` referenced by the `Int32Array` Fixed at construction time and thus read only.
+	 */
+	final buffer:ArrayBuffer;
+
+	/**
+		Returns the length (in bytes) of the `Int32Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteLength:Int;
+
+	/**
+		Returns the offset (in bytes) of the `Int32Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteOffset:Int;
+
+	/**
+		Returns the number of elements hold in the `Int32Array`. Fixed at construction time and thus read only.
+	 */
+	final length:Int;
+
+	/** @throws DOMError */
+	@:overload(function(length:Int):Void {})
+	@:overload(function(object:{}):Void {})
+	@:pure function new(buffer:ArrayBuffer, ?byteOffset:Int, ?length:Int):Void;
+
+	/**
+		Copies a sequence of array elements within the array.
+		See also [Array.prototype.copyWithin()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin).
+	 */
+	function copyWithin(target:Int, start:Int, ?end:Int):Int32Array;
+
+	/**
+		Returns a new Array Iterator object that contains the key/value pairs for each index in the array.
+		See also [Array.prototype.entries()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/entries).
+	 */
+	@:pure function entries():Iterator<Int>;
+
+	/**
+		Tests whether all elements in the array pass the test provided by a function.
+		See also [Array.prototype.every()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every).
+	 */
+	@:overload(function(callback:(currentValue:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(currentValue:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function every(callback:(currentValue:Int, index:Int, array:Int32Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Fills all the elements of an array from a start index to an end index with a static value.
+		See also [Array.prototype.fill()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill).
+	 */
+	function fill(value:Int, ?start:Int, ?end:Int):Int32Array;
+
+	/**
+		Creates a new array with all of the elements of this array for which the provided filtering function returns true.
+		See also [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Int32Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Int32Array {})
+	function filter(callback:(element:Int, index:Int, array:Int32Array) -> Bool, ?thisArg:Any):Int32Array;
+
+	/**
+		Returns the found value in the array, if an element in the array satisfies the provided testing function or undefined if not found.
+		See also [Array.prototype.find()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	function find(callback:(element:Int, index:Int, array:Int32Array) -> Bool, ?thisArg:Any):Null<Int>;
+
+	/**
+		Returns the found index in the array, if an element in the array satisfies the provided testing function or -1 if not found.
+		See also [Array.prototype.findIndex()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Int {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Int {})
+	function findIndex(callback:(element:Int, index:Int, array:Int32Array) -> Bool, ?thisArg:Any):Int;
+
+	/**
+		Calls a function for each element in the array.
+		See also [Array.prototype.forEach()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach).
+	 */
+	@:overload(function(callback:(element:Int) -> Void, ?thisArg:Any):Void {})
+	@:overload(function(callback:(element:Int, index:Int) -> Void, ?thisArg:Any):Void {})
+	function forEach(callback:(element:Int, index:Int, array:Int32Array) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Determines whether a typed array includes a certain element, returning true or false as appropriate.
+		See also [Array.prototype.includes()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
+	 */
+	@:pure function includes(searchElement:Int, ?fromIndex:Int):Bool;
+
+	/**
+		Returns the first (least) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.indexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf).
+	 */
+	@:pure function indexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Joins all elements of an array into a string.
+		See also [Array.prototype.join()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join).
+	 */
+	@:pure function join(?separator:String):String;
+
+	/**
+		Returns a new Array Iterator that contains the keys for each index in the array.
+		See also [Array.prototype.keys()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/keys).
+	 */
+	@:pure function keys():Iterator<Int>;
+
+	/**
+		Returns the last (greatest) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.lastIndexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf).
+	 */
+	@:pure function lastIndexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Creates a new array with the results of calling a provided function on every element in this array.
+		See also [Array.prototype.map()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map).
+	 */
+	@:overload(function(callback:(element:Int) -> Int, ?thisArg:Any):Int32Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Int, ?thisArg:Any):Int32Array {})
+	function map(callback:(element:Int, index:Int, array:Int32Array) -> Int, ?thisArg:Any):Int32Array;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from left-to-right) as to reduce it to a single value.
+		See also [Array.prototype.reduce()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Int32Array) -> Int):Int {})
+	function reduce<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Int32Array) -> T, initialValue:T):T;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from right-to-left) as to reduce it to a single value.
+		See also [Array.prototype.reduceRight()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Int32Array) -> Int):Int {})
+	function reduceRight<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Int32Array) -> T, initialValue:T):T;
+
+	/**
+		Reverses the order of the elements of an array — the first becomes the last, and the last becomes the first.
+		See also [Array.prototype.reverse()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse).
+	 */
+	function reverse():Int32Array;
+
+	/**
+		Stores multiple values in the typed array, reading input values from a specified array.
+	 */
+	@:overload(function(array:Int8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8ClampedArray, ?offset:Int):Void {})
+	@:overload(function(array:Int16Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint16Array, ?offset:Int):Void {})
+	@:overload(function(array:Int32Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float64Array, ?offset:Int):Void {})
+	function set(array:Array<Int>, ?offset:Int):Void;
+
+	/**
+		Extracts a section of an array and returns a new array.
+		See also [Array.prototype.slice()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice).
+	 */
+	@:pure function slice(?start:Int, ?end:Int):Int32Array;
+
+	/**
+		Returns true if at least one element in this array satisfies the provided testing function.
+		See also [Array.prototype.some()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function some(callback:(element:Int, index:Int, array:Int32Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Sorts the elements of an array in place and returns the array.
+		See also [Array.prototype.sort()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort).
+	 */
+	function sort(?compareFn:(x:Int, y:Int) -> Int):Int32Array;
+
+	/**
+		Returns a new TypedArray from the given start and end element index.
+	 */
+	@:pure function subarray(?begin:Int, ?end:Int):Int32Array;
+
+	/**
+		Returns a new Array Iterator object that contains the values for each index in the array.
+		See also [Array.prototype.values()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values).
+	 */
+	@:pure function values():Iterator<Int>;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toLocaleString(?locales:String, ?options:NumberFormatOptions):String;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toString():String;
+}
diff --git a/std/js/lib/Int8Array.hx b/std/js/lib/Int8Array.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e517cea24a0a3bb5f1627c3075f6ccc5cb51c10e
--- /dev/null
+++ b/std/js/lib/Int8Array.hx
@@ -0,0 +1,263 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.intl.NumberFormat.NumberFormatOptions;
+
+/**
+	The `Int8Array` typed array represents an array of twos-complement 8-bit signed integers. The
+	contents are initialized to 0. Once established, you can reference elements in the array using
+	the object's methods, or using standard array index syntax (that is, using bracket notation).
+
+	Documentation [Int8Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Int8Array) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Int8Array$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Int8Array")
+extern class Int8Array implements ArrayBufferView implements ArrayAccess<Int> {
+	/**
+		Returns a number value of the element size. 1 in the case of an `Int8Array`.
+	 */
+	static final BYTES_PER_ELEMENT:Int;
+
+	/**
+		Creates a new `Int8Array` from an array-like or iterable object. See also [Array.from()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from).
+	 */
+	@:overload(function(source:{}, ?mapFn:(value:Int) -> Int, ?thisArg:Any):Int8Array {})
+	@:pure static function from(source:{}, ?mapFn:(value:Int, index:Int) -> Int, ?thisArg:Any):Int8Array;
+
+	/**
+		Creates a new `Int8Array` with a variable number of arguments. See also [Array.of()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/of).
+	 */
+	@:pure static function of(elements:haxe.extern.Rest<Dynamic>):Int8Array;
+
+	/**
+		Returns a number value of the element size.
+	 */
+	@:native("BYTES_PER_ELEMENT")
+	final BYTES_PER_ELEMENT_:Int;
+
+	/**
+		Returns the `ArrayBuffer` referenced by the `Int8Array` Fixed at construction time and thus read only.
+	 */
+	final buffer:ArrayBuffer;
+
+	/**
+		Returns the length (in bytes) of the `Int8Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteLength:Int;
+
+	/**
+		Returns the offset (in bytes) of the `Int8Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteOffset:Int;
+
+	/**
+		Returns the number of elements hold in the `Int8Array`. Fixed at construction time and thus read only.
+	 */
+	final length:Int;
+
+	/** @throws DOMError */
+	@:overload(function(length:Int):Void {})
+	@:overload(function(object:{}):Void {})
+	@:pure function new(buffer:ArrayBuffer, ?byteOffset:Int, ?length:Int):Void;
+
+	/**
+		Copies a sequence of array elements within the array.
+		See also [Array.prototype.copyWithin()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin).
+	 */
+	function copyWithin(target:Int, start:Int, ?end:Int):Int8Array;
+
+	/**
+		Returns a new Array Iterator object that contains the key/value pairs for each index in the array.
+		See also [Array.prototype.entries()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/entries).
+	 */
+	@:pure function entries():Iterator<Int>;
+
+	/**
+		Tests whether all elements in the array pass the test provided by a function.
+		See also [Array.prototype.every()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every).
+	 */
+	@:overload(function(callback:(currentValue:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(currentValue:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function every(callback:(currentValue:Int, index:Int, array:Int8Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Fills all the elements of an array from a start index to an end index with a static value.
+		See also [Array.prototype.fill()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill).
+	 */
+	function fill(value:Int, ?start:Int, ?end:Int):Int8Array;
+
+	/**
+		Creates a new array with all of the elements of this array for which the provided filtering function returns true.
+		See also [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Int8Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Int8Array {})
+	function filter(callback:(element:Int, index:Int, array:Int8Array) -> Bool, ?thisArg:Any):Int8Array;
+
+	/**
+		Returns the found value in the array, if an element in the array satisfies the provided testing function or undefined if not found.
+		See also [Array.prototype.find()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	function find(callback:(element:Int, index:Int, array:Int8Array) -> Bool, ?thisArg:Any):Null<Int>;
+
+	/**
+		Returns the found index in the array, if an element in the array satisfies the provided testing function or -1 if not found.
+		See also [Array.prototype.findIndex()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Int {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Int {})
+	function findIndex(callback:(element:Int, index:Int, array:Int8Array) -> Bool, ?thisArg:Any):Int;
+
+	/**
+		Calls a function for each element in the array.
+		See also [Array.prototype.forEach()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach).
+	 */
+	@:overload(function(callback:(element:Int) -> Void, ?thisArg:Any):Void {})
+	@:overload(function(callback:(element:Int, index:Int) -> Void, ?thisArg:Any):Void {})
+	function forEach(callback:(element:Int, index:Int, array:Int8Array) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Determines whether a typed array includes a certain element, returning true or false as appropriate.
+		See also [Array.prototype.includes()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
+	 */
+	@:pure function includes(searchElement:Int, ?fromIndex:Int):Bool;
+
+	/**
+		Returns the first (least) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.indexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf).
+	 */
+	@:pure function indexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Joins all elements of an array into a string.
+		See also [Array.prototype.join()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join).
+	 */
+	@:pure function join(?separator:String):String;
+
+	/**
+		Returns a new Array Iterator that contains the keys for each index in the array.
+		See also [Array.prototype.keys()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/keys).
+	 */
+	@:pure function keys():Iterator<Int>;
+
+	/**
+		Returns the last (greatest) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.lastIndexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf).
+	 */
+	@:pure function lastIndexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Creates a new array with the results of calling a provided function on every element in this array.
+		See also [Array.prototype.map()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map).
+	 */
+	@:overload(function(callback:(element:Int) -> Int, ?thisArg:Any):Int8Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Int, ?thisArg:Any):Int8Array {})
+	function map(callback:(element:Int, index:Int, array:Int8Array) -> Int, ?thisArg:Any):Int8Array;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from left-to-right) as to reduce it to a single value.
+		See also [Array.prototype.reduce()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Int8Array) -> Int):Int {})
+	function reduce<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Int8Array) -> T, initialValue:T):T;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from right-to-left) as to reduce it to a single value.
+		See also [Array.prototype.reduceRight()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Int8Array) -> Int):Int {})
+	function reduceRight<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Int8Array) -> T, initialValue:T):T;
+
+	/**
+		Reverses the order of the elements of an array — the first becomes the last, and the last becomes the first.
+		See also [Array.prototype.reverse()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse).
+	 */
+	function reverse():Int8Array;
+
+	/**
+		Stores multiple values in the typed array, reading input values from a specified array.
+	 */
+	@:overload(function(array:Int8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8ClampedArray, ?offset:Int):Void {})
+	@:overload(function(array:Int16Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint16Array, ?offset:Int):Void {})
+	@:overload(function(array:Int32Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float64Array, ?offset:Int):Void {})
+	function set(array:Array<Int>, ?offset:Int):Void;
+
+	/**
+		Extracts a section of an array and returns a new array.
+		See also [Array.prototype.slice()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice).
+	 */
+	@:pure function slice(?start:Int, ?end:Int):Int8Array;
+
+	/**
+		Returns true if at least one element in this array satisfies the provided testing function.
+		See also [Array.prototype.some()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function some(callback:(element:Int, index:Int, array:Int8Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Sorts the elements of an array in place and returns the array.
+		See also [Array.prototype.sort()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort).
+	 */
+	function sort(?compareFn:(x:Int, y:Int) -> Int):Int8Array;
+
+	/**
+		Returns a new TypedArray from the given start and end element index.
+	 */
+	@:pure function subarray(?begin:Int, ?end:Int):Int8Array;
+
+	/**
+		Returns a new Array Iterator object that contains the values for each index in the array.
+		See also [Array.prototype.values()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values).
+	 */
+	@:pure function values():Iterator<Int>;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toLocaleString(?locales:String, ?options:NumberFormatOptions):String;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toString():String;
+}
diff --git a/std/js/lib/Intl.hx b/std/js/lib/Intl.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d7d2d6f014953a6546d538a2b90ca8e9bd436613
--- /dev/null
+++ b/std/js/lib/Intl.hx
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+/**
+	The `Intl` object is the namespace for the ECMAScript Internationalization API,
+	which provides language sensitive string comparison, number formatting,and date and time formatting.
+	The INTL object provides access to several constructors as well as functionality common to
+	the internationalization constructors and other language sensitive functions.
+
+	Documentation [Intl](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Intl")
+extern class Intl {
+	/**
+		Returns canonical locale names.
+	**/
+	@:overload(function(locales:Array<String>):Array<String> {})
+	@:pure static function getCanonicalLocales(locales:String):Array<String>;
+}
diff --git a/std/js/lib/Iterator.hx b/std/js/lib/Iterator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1a9006d097c6cd9a3fb94c3c3cecc89dfaa98348
--- /dev/null
+++ b/std/js/lib/Iterator.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+typedef Iterator<T> = {
+	function next():IteratorStep<T>;
+}
+
+typedef IteratorStep<T> = {
+	done:Bool,
+	?value:T
+}
diff --git a/std/js/lib/Map.hx b/std/js/lib/Map.hx
new file mode 100644
index 0000000000000000000000000000000000000000..04822ee591ab72a83e43a718eb2db028a693a24c
--- /dev/null
+++ b/std/js/lib/Map.hx
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.Iterator;
+
+/**
+	The (native) JavaScript Map object holds key-value pairs.
+	Any value (both objects and primitive values) may be used as either a key
+	or a value.
+
+	Documentation [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Map")
+extern class Map<K, V> {
+	/**
+		The number of key/value pairs in the `js.Map` object.
+	**/
+	var size(default, null):Int;
+
+	/**
+		An Array or other iterable object whose elements are key-value pairs
+		(arrays with two elements, e.g. `[[ 1, 'one' ],[ 2, 'two' ]]`).
+		Each key-value pair is added to the new `js.Map`;
+		null values are treated as undefined.
+	**/
+	@:pure function new(?iterable:Any);
+
+	/**
+		A boolean asserting whether a value has been associated to the key in
+		the `js.Map` object or not.
+	**/
+	@:pure function has(key:K):Bool;
+
+	/**
+		The value associated to the key, or `null` if there is none.
+	**/
+	@:pure function get(key:K):Null<V>;
+
+	/**
+		Sets the value for the key in the Map object.
+		Returns the `js.Map` object.
+	**/
+	function set(key:K, value:V):Map<K, V>;
+
+	/**
+		Returns `true` if an element in the `js.Map` object existed and has been
+		removed, or `false` if the element does not exist.
+		`has(key)` will return `false` afterwards.
+	**/
+	function delete(key:K):Bool;
+
+	/**
+		Removes all key/value pairs from the Map object.
+	**/
+	function clear():Void;
+
+	/**
+		Calls `callback` once for each key-value pair present in the `js.Map`
+		object, in insertion order.
+
+		If a `thisArg` parameter is provided to forEach, it will be used as the
+		`this` value for each callback.
+	**/
+	function forEach(callback:(value:V, key:K, map:Map<K, V>) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Returns a new `Iterator` object that contains the keys for each element
+		in the `js.Map` object in insertion order.
+	**/
+	function keys():Iterator<K>;
+
+	/**
+		Returns a new `Iterator` object that contains the values for each
+		element in the `js.Map` object in insertion order.
+	**/
+	function values():Iterator<V>;
+
+	/**
+		Returns a new `Iterator` object that contains an array of `MapEntry`
+		for each element in the `js.Map` object in insertion order.
+	**/
+	function entries():Iterator<MapEntry<K, V>>;
+}
+
+/**
+	Key/value access helper for `js.Map.entries()` and `js.Set.entries()`.
+**/
+abstract MapEntry<K, V>(Array<Any>) {
+	public var key(get, never):K;
+	public var value(get, never):V;
+
+	inline function get_key():K
+		return this[0];
+
+	inline function get_value():V
+		return this[1];
+}
diff --git a/std/js/lib/Math.hx b/std/js/lib/Math.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3a5d4b42705e98a1d81708aa4d2f2a5b9a077499
--- /dev/null
+++ b/std/js/lib/Math.hx
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import haxe.extern.Rest;
+
+/**
+	Math is a built-in object that has properties and methods for mathematical constants and functions.
+	Not a function object.
+
+	Documentation [Math](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Math")
+extern class Math {
+	/**
+		Euler's constant and the base of natural logarithms, approximately 2.718.
+	**/
+	static var E(default,never):Float;
+
+	/**
+		Natural logarithm of 2, approximately 0.693.
+	**/
+	static var LN2(default,never):Float;
+	
+	/**
+		Natural logarithm of 10, approximately 2.303.
+	**/
+	static var LN10(default,never):Float;
+	
+	/**
+		Base 2 logarithm of E, approximately 1.443.
+	**/
+	static var LOG2E(default,never):Float;
+	
+	/**
+		Base 10 logarithm of E, approximately 0.434.
+	**/
+	static var LOG10E(default,never):Float;
+
+	/**
+		Ratio of the circumference of a circle to its diameter, approximately 3.14159.
+	**/
+	static var PI(default,never):Float;
+	
+	/**
+		Square root of 1/2; equivalently, 1 over the square root of 2, approximately 0.707.
+	**/
+	static var SQRT1_2(default,never):Float;
+	
+	/**
+		Square root of 2, approximately 1.414.
+	**/
+	static var SQRT2(default,never):Float;
+
+	/**
+		Returns the absolute value of a number.
+	**/
+	@:overload(function(x:Float):Float {})
+	@:pure static function abs(x:Int):Int;
+
+	/**
+		Returns the arccosine of a number.
+	**/
+	@:pure static function acos(x:Float):Float;
+
+	/**
+		Returns the hyperbolic arccosine of a number.
+	**/
+	@:pure static function acosh(x:Float):Float;
+
+	/**
+		Returns the arcsine of a number.
+	**/
+	@:pure static function asin(x:Float):Float;
+
+	/**
+		Returns the hyperbolic arcsine of a number.
+	**/
+	@:pure static function asinh(x:Float):Float;
+
+	/**
+		Returns the arctangent of a number.
+	**/
+	@:pure static function atan(x:Float):Float;
+
+	/**
+		Returns the hyperbolic arctangent of a number.
+	**/
+	@:pure static function atanh(x:Float):Float;
+
+	/**
+		Returns the arctangent of the quotient of its arguments.
+	**/
+	@:pure static function atan2(y:Float, x:Float):Float;
+
+	/**
+		Returns the cube root of a number.
+	**/
+	@:pure static function cbrt(x:Float):Float;
+
+	/**
+		Returns the smallest integer greater than or equal to a number.
+	**/
+	@:pure static function ceil(x:Float):Int;
+
+	/**
+		Returns the number of leading zeroes of a 32-bit integer.
+	**/
+	@:pure static function clz32(x:Int):Int;
+
+	/**
+		Returns the cosine of a number.
+	**/
+	@:pure static function cos(x:Float):Float;
+
+	/**
+		Returns the hyperbolic cosine of a number.
+	**/
+	@:pure static function cosh(x:Float):Float;
+
+	/**
+		Returns Ex, where x is the argument, and E is Euler's constant (2.718…), the base of the natural logarithm.
+	**/
+	@:pure static function exp(x:Float):Float;
+
+	/**
+		Returns subtracting 1 from exp(x).
+	**/
+	@:pure static function expm1(x:Float):Float;
+
+	/**
+		Returns the largest integer less than or equal to a number.
+	**/
+	@:pure static function floor(x:Float):Int;
+
+	/**
+		Returns the nearest single precision float representation of a number.
+	**/
+	@:pure static function fround(x:Float):Float;
+
+	/**
+		Returns the square root of the sum of squares of its arguments.
+	**/
+	@:pure static function hypot(args:Rest<Float>):Float;
+
+	/**
+		Returns the result of a 32-bit integer multiplication.
+	**/
+	@:pure static function imul(x:Int, y:Int):Int;
+
+	/**
+		Returns the natural logarithm (loge, also ln) of a number.
+	**/
+	@:pure static function log(x:Float):Float;
+
+	/**
+		Returns the natural logarithm (loge, also ln) of 1 + x for a number x.
+	**/
+	@:pure static function log1p(x:Float):Float;
+
+	/**
+		Returns the base 10 logarithm of a number.
+	**/
+	@:pure static function log10(x:Float):Float;
+
+	/**
+		Returns the base 2 logarithm of a number.
+	**/
+	@:pure static function log2(x:Float):Float;
+
+	/**
+		Returns the largest of zero or more numbers.
+	**/
+	@:overload(function(args:Rest<Float>):Float {})
+	@:pure static function max(args:Rest<Int>):Int;
+
+	/**
+		Returns the smallest of zero or more numbers.
+	**/
+	@:overload(function(args:Rest<Float>):Float {})
+	@:pure static function min(args:Rest<Int>):Int;
+
+	/**
+		Returns base to the exponent power, that is, baseexponent.
+	**/
+	@:pure static function pow(x:Float, y:Float):Float;
+
+	/**
+		Returns a pseudo-random number between 0 and 1.
+	**/
+	@:pure static function random():Float;
+
+	/**
+		Returns the value of a number rounded to the nearest integer.
+	**/
+	@:pure static function round(x:Float):Int;
+
+	/**
+		Returns the sign of the x, indicating whether x is positive, negative or zero.
+	**/
+	@:pure static function sign(x:Float):Int;
+
+	/**
+		Returns the sine of a number.
+	**/
+	@:pure static function sin(x:Float):Float;
+
+	/**
+		Returns the hyperbolic sine of a number.
+	**/
+	@:pure static function sinh(x:Float):Float;
+
+	/**
+		Returns the positive square root of a number.
+	**/
+	@:pure static function sqrt(x:Float):Float;
+
+	/**
+		Returns the tangent of a number.
+	**/
+	@:pure static function tan(x:Float):Float;
+
+	/**
+		Returns the hyperbolic tangent of a number.
+	**/
+	@:pure static function tanh(x:Float):Float;
+
+	/**
+		Returns the integer part of the number x, removing any fractional digits. 
+	**/
+	@:pure static function trunc(x:Float):Int;
+}
\ No newline at end of file
diff --git a/std/js/lib/Object.hx b/std/js/lib/Object.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d6b52108c825491c0b13f9a74bcaf0c798e725c1
--- /dev/null
+++ b/std/js/lib/Object.hx
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import haxe.extern.Rest;
+import haxe.DynamicAccess;
+
+/**
+	The `js.lib.Object` constructor creates an object wrapper.
+
+	Documentation [Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Object")
+extern class Object {
+	/**
+		Copies the values of all enumerable own properties from one or more
+		source objects to a target object.
+	**/
+	static function assign<T:{}>(target:T, sources:Rest<{}>):T;
+
+	/**
+		Creates a new object with the specified prototype object and properties.
+	**/
+	@:pure static function create<T>(proto:{}, ?propertiesObject:DynamicAccess<ObjectPropertyDescriptor>):T;
+
+	/**
+		Adds the named properties described by the given descriptors to an object.
+	**/
+	static function defineProperties<T:{}>(obj:T, props:DynamicAccess<ObjectPropertyDescriptor>):T;
+
+	/**
+		Adds the named property described by a given descriptor to an object.
+	**/
+	static function defineProperty<T:{}>(obj:T, prop:String, descriptor:ObjectPropertyDescriptor):T;
+
+	/**
+		Returns an array containing all of the [key, value] pairs of a given
+		object's own enumerable string properties.
+	**/
+	@:pure static function entries(obj:{}):Array<ObjectEntry>;
+
+	/**
+		Freezes an object: other code can't delete or change any properties.
+	**/
+	static function freeze<T:{}>(obj:T):T;
+
+	/**
+		Returns a new object from an iterable of key-value pairs
+		(reverses Object.entries).
+	**/
+	@:pure static function fromEntries<T:{}>(iterable:Any):T;
+
+	/**
+		Returns a property descriptor for a named property on an object.
+	**/
+	@:pure static function getOwnPropertyDescriptor(obj:{}, prop:String):Null<ObjectPropertyDescriptor>;
+
+	/**
+		Returns an array containing the names of all of the given object's own
+		enumerable and non-enumerable properties.
+	**/
+	@:pure static function getOwnPropertyNames(obj:{}):Array<String>;
+
+	/**
+		Returns an array of all symbol properties found directly upon a given object.
+	**/
+	@:pure static function getOwnPropertySymbols(obj:{}):Array<Symbol>;
+
+	/**
+		Returns the prototype of the specified object.
+	**/
+	@:pure static function getPrototypeOf<TProto:{}>(obj:{}):Null<TProto>;
+
+	/**
+		Compares if two values are the same value. Equates all NaN values
+		(which differs from both Abstract Equality Comparison and
+		Strict Equality Comparison).
+	**/
+	@:pure static function is<T>(value1:T, value2:T):Bool;
+
+	/**
+		Determines if extending of an object is allowed.
+	**/
+	@:pure static function isExtensible(obj:{}):Bool;
+
+	/**
+		Determines if an object was frozen.
+	**/
+	@:pure static function isFrozen(obj:{}):Bool;
+
+	/**
+		Determines if an object is sealed.
+	**/
+	@:pure static function isSealed(obj:{}):Bool;
+
+	/**
+		Returns an array containing the names of all of the given object's own
+		enumerable string properties.
+	**/
+	@:pure static function keys(obj:{}):Array<String>;
+
+	/**
+		Prevents any extensions of an object.
+	**/
+	static function preventExtensions<T:{}>(obj:T):T;
+
+	/**
+		Prevents other code from deleting properties of an object.
+	**/
+	static function seal<T:{}>(obj:T):T;
+
+	/**
+		Sets the prototype (i.e., the internal Prototype property).
+	**/
+	static function setPrototypeOf<T:{}>(obj:T, prototype:Null<{}>):T;
+
+	/**
+		Returns an array containing the values that correspond to all of
+		a given object's own enumerable string properties.
+	**/
+	@:pure static function values(obj:{}):Array<Any>;
+
+	/**
+		Allows the addition of properties to all objects of type Object.
+	**/
+	static var prototype(default, never):ObjectPrototype;
+
+	/**
+		The Object constructor creates an object wrapper.
+	**/
+	@:pure function new(?value:Any);
+}
+
+/**
+	Type for
+	@see <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object>
+**/
+typedef ObjectPrototype = {
+	/**
+		Returns a boolean indicating whether an object contains the specified
+		property as a direct property of that object and not inherited through
+		the prototype chain.
+	**/
+	var hasOwnProperty(default, never):Function;
+
+	/**
+		Returns a boolean indicating whether the object this method is called
+		upon is in the prototype chain of the specified object.
+	**/
+	var isPrototypeOf(default, never):Function;
+
+	/**
+		Returns a boolean indicating if the internal enumerable attribute is set.
+	**/
+	var propertyIsEnumerable(default, never):Function;
+
+	/**
+		Calls `toString()`.
+	**/
+	var toLocaleString(default, never):Function;
+
+	/**
+		Returns a string representation of the object.
+	**/
+	var toString(default, never):Function;
+
+	/**
+		Returns the primitive value of the specified object.
+	**/
+	var valueOf(default, never):Function;
+}
+
+/**
+	@see <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty>
+**/
+typedef ObjectPropertyDescriptor = {
+	/**
+		`true` if and only if the type of this property descriptor may be
+		changed and if the property may be deleted from the corresponding object.
+
+		Defaults to `false`.
+	**/
+	var ?configurable:Bool;
+
+	/**
+		`true` if and only if this property shows up during enumeration of the
+		properties on the corresponding object.
+
+		Defaults to `false`.
+	**/
+	var ?enumerable:Bool;
+
+	/**
+		The value associated with the property.
+		Can be any valid JavaScript value (number, object, function, etc).
+	**/
+	var ?value:Any;
+
+	/**
+		`true` if and only if the value associated with the property may be
+		changed with an assignment operator.
+
+		Defaults to `false`.
+	**/
+	var ?writable:Bool;
+
+	/**
+		A function which serves as a getter for the property, or `undefined` if
+		there is no getter. When the property is accessed, this function is
+		called without arguments and with `this` set to the object through which
+		the property is accessed (this may not be the object on which the
+		property is defined due to inheritance).
+		The return value will be used as the value of the property.
+	**/
+	var ?get:Void->Any;
+
+	/**
+		A function which serves as a setter for the property, or undefined if
+		there is no setter. When the property is assigned to, this function
+		is called with one argument (the value being assigned to the property)
+		and with `this` set to the object through which the property is assigned.
+	**/
+	var ?set:Any->Void;
+}
+
+/**
+	Key/value access helper for `js.lib.Object.entries()`.
+**/
+abstract ObjectEntry(Array<Any>) {
+	public var key(get, never):String;
+	public var value(get, never):Any;
+
+	inline function get_key():String
+		return this[0];
+
+	inline function get_value():Any
+		return this[1];
+}
diff --git a/std/js/lib/Promise.hx b/std/js/lib/Promise.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c4fbd4f10a370294729a2631d5cf8bdc23a0fa6d
--- /dev/null
+++ b/std/js/lib/Promise.hx
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import haxe.extern.EitherType;
+
+/**
+	The Promise object represents the eventual completion (or failure) of an
+	asynchronous operation and its resulting value.
+
+	Documentation [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Promise")
+extern class Promise<T> {
+	/**
+		Returns a Promise object that is resolved with the given value. If the
+		value is Thenable, the returned promise will "follow" that
+		thenable, adopting its eventual state;
+		otherwise the returned promise will be fulfilled with the value.
+		Generally, when it's unknown when value is a promise or not,
+		use `Promise.resolve(value)` instead and work with the return value as
+		a promise.
+	**/
+	@:overload(function<T>(?value:T):Promise<T> {})
+	static function resolve<T>(thenable:Thenable<T>):Promise<T>;
+
+	/**
+		Returns a Promise object that is rejected with the given reason.
+	**/
+	static function reject<T>(?reason:Dynamic):Promise<T>;
+
+	/**
+		Returns a promise that either fulfills when all of the promises in the
+		iterable argument have fulfilled or rejects as soon as one of the
+		promises in the iterable argument rejects. If the returned promise
+		fulfills, it is fulfilled with an array of the values from the
+		fulfilled promises in the same order as defined in the iterable.
+		If the returned promise rejects, it is rejected with the reason from
+		the first promise in the iterable that rejected. This method can be
+		useful for aggregating results of multiple promises.
+	**/
+	static function all(iterable:Array<Dynamic>):Promise<Array<Dynamic>>;
+
+	/**
+		Returns a promise that fulfills or rejects as soon as one of the
+		promises in the iterable fulfills or rejects, with the value or reason
+		from that promise.
+	**/
+	static function race(iterable:Array<Dynamic>):Promise<Dynamic>;
+
+	/** @throws DOMError */
+	function new(init:(resolve:(value:T) -> Void, reject:(reason:Dynamic) -> Void) -> Void):Void;
+
+	/**
+		Appends fulfillment and rejection handlers to the promise and returns a
+		new promise resolving to the return value of the called handler, or to
+		its original settled value if the promise was not handled
+		(i.e. if the relevant handler onFulfilled or onRejected is not a function).
+	**/
+	function then<TOut>(onFulfilled:Null<PromiseHandler<T, TOut>>, ?onRejected:PromiseHandler<Dynamic, TOut>):Promise<TOut>;
+
+	/**
+		Appends a rejection handler callback to the promise, and returns a new
+		promise resolving to the return value of the callback if it is called,
+		or to its original fulfillment value if the promise is instead fulfilled.
+	**/
+	@:native("catch")
+	function catchError<TOut>(onRejected:PromiseHandler<Dynamic, TOut>):Promise<TOut>;
+}
+
+/**
+	Handler type for the Promise object.
+**/
+abstract PromiseHandler<T, TOut>(T->Dynamic) // T->Dynamic, so the compiler always knows the type of the argument and can infer it for then/catch callbacks
+	from T->TOut // order is important, because Promise<TOut> return must have priority
+	from T->Thenable<TOut> // although the checking order seems to be reversed at the moment, see https://github.com/HaxeFoundation/haxe/issues/7656
+	from T->Promise<TOut> // support Promise explicitly as it doesn't work transitively through Thenable at the moment
+{}
+
+/**
+	A value with a `then` method.
+**/
+@:forward
+abstract Thenable<T>(ThenableStruct<T>)
+	from ThenableStruct<T> {} // abstract wrapping prevents compiler hanging, see https://github.com/HaxeFoundation/haxe/issues/5785
+
+typedef ThenableStruct<T> = {
+	function then<TOut>(onFulfilled:Null<PromiseHandler<T, TOut>>, ?onRejected:PromiseHandler<Dynamic, TOut>):Thenable<TOut>;
+}
diff --git a/std/js/lib/Proxy.hx b/std/js/lib/Proxy.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ff0f6dd5ddc7619f3f8e9b41300e32cb961c144c
--- /dev/null
+++ b/std/js/lib/Proxy.hx
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.Object;
+
+/**
+	The `Proxy` object is used to define custom behavior for fundamental operations
+	(e.g. property lookup, assignment, enumeration, function invocation, etc).
+
+	Documentation [Proxy](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Proxy")
+extern class Proxy<T:{}> {
+	@:pure function new(target:T, handler:ProxyHandler<T>);
+
+	/**
+		Creates a revocable `Proxy` object.
+	**/
+	@:pure static function revocable<T:{}>(target:T, handler:ProxyHandler<T>):RevocableProxy<T>;
+}
+
+typedef ProxyHandler<T:{}> = {
+	/**
+		A trap for `Object.getPrototypeOf`.
+	**/
+	var ?getPrototypeOf:(target:T) -> Null<{}>;
+
+	/**
+		A trap for `Object.setPrototypeOf`.
+	**/
+	var ?setPrototypeOf:(target:T, prototype:Null<{}>) -> Bool;
+
+	/**
+		A trap for `Object.isExtensible`.
+	**/
+	var ?isExtensible:(target:T) -> Bool;
+
+	/**
+		A trap for `Object.preventExtensions`.
+	**/
+	var ?preventExtensions:(target:T) -> Bool;
+
+	/**
+		A trap for `Object.getOwnPropertyDescriptor`.
+	**/
+	var ?getOwnPropertyDescriptor:(target:T, prop:String) -> Null<ObjectPropertyDescriptor>;
+
+	/**
+		A trap for `Object.defineProperty`.
+	**/
+	var ?defineProperty:(target:T, property:String, descriptor:ObjectPropertyDescriptor) -> Bool;
+
+	/**
+		A trap for the `in` operator.
+	**/
+	var ?has:(target:T, prop:String) -> Bool;
+
+	/**
+		A trap for getting property values.
+	**/
+	var ?get:(target:T, property:String, receiver:Null<{}>) -> Any;
+
+	/**
+		A trap for setting property values.
+	**/
+	var ?set:(target:T, property:String, value:Any, receiver:Null<{}>) -> Bool;
+
+	/**
+		A trap for the `delete` operator.
+	**/
+	var ?deleteProperty:(target:T, property:String) -> Bool;
+
+	/**
+		A trap for `Object.getOwnPropertyNames` and `Object.getOwnPropertySymbols`.
+	**/
+	var ?ownKeys:(target:T) -> Array<String>;
+
+	/**
+		A trap a function call.
+	**/
+	var ?apply:(target:T, thisArg:{}, argumentsList:Array<Any>) -> Any;
+
+	/**
+		A trap for the `new` operator.
+	**/
+	var ?construct:(target:Class<T>, argumentsList:Array<Any>, newTarget:Class<Any>) -> Void;
+}
+
+typedef RevocableProxy<T:{}> = {
+	/**
+		A Proxy object created with `new Proxy(target, handler)` call.
+	**/
+	final proxy:Proxy<T>;
+
+	/**
+		A function with no argument to invalidate (switch off) the `proxy`.
+	**/
+	function revoke():Void;
+}
diff --git a/std/js/lib/Reflect.hx b/std/js/lib/Reflect.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3cb7ed0d5075458997478205381954ff76b718e8
--- /dev/null
+++ b/std/js/lib/Reflect.hx
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import haxe.Constraints.Function;
+import js.lib.Object;
+
+/**
+	`Reflect` is a built-in object that provides methods for interceptable JavaScript operations.
+	The methods are the same as those of [proxy handlers](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy/handler).
+	Reflect is not a function object, so it's not constructible.
+
+	Documentation [Reflect](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Reflect")
+extern class Reflect {
+	/**
+		Calls a target function with arguments as specified by the args parameter.
+		See also `Function.prototype.apply()`.
+	 */
+	static function apply<T>(target:Function, thisArgument:{}, argumentsList:Array<Any>):T;
+
+	/**
+		The `new` operator as a function. Equivalent to calling `new target(...args)`.
+		Provides also the optional possibility to specify a different prototype.
+	 */
+	static function construct<T, S:T>(target:Class<T>, argumentsList:Array<Any>, ?newTarget:Class<S>):T;
+
+	/**
+		Similar to `Object.defineProperty()`. Returns a Bool.
+	 */
+	static function defineProperty(target:{}, propertyKey:String, attributes:ObjectPropertyDescriptor):Bool;
+
+	/**
+		The `delete` operator as a function. Equivalent to calling `delete target[name]`.
+	 */
+	@:overload(function<T>(target:Array<T>, propertyKey:Int):Bool {})
+	static function deleteProperty(target:{}, propertyKey:String):Bool;
+
+	/**
+		A function that returns the value of properties.
+	 */
+	@:overload(function<T>(target:Array<T>, propertyKey:Int, ?receiver:{}):Null<T> {})
+	@:pure static function get<T>(target:{}, propertyKey:String, ?receiver:{}):Null<T>;
+
+	/**
+		Similar to `Object.getOwnPropertyDescriptor()`.
+		Returns a property descriptor of the given property if it exists on the object,
+		`undefined` otherwise.
+	 */
+	@:pure static function getOwnPropertyDescriptor(target:{}, propertyKey:String):Null<ObjectPropertyDescriptor>;
+
+	/**
+		Same as `Object.getPrototypeOf()`.
+	 */
+	@:pure static function getPrototypeOf<TProto:{}>(target:{}):Null<TProto>;
+
+	/**
+		The `in` operator as function. Returns a boolean indicating whether an own
+		or inherited property exists.
+	 */
+	@:pure static function has(target:{}, propertyKey:String):Bool;
+
+	/**
+		Same as `Object.isExtensible()`.
+	 */
+	@:pure static function isExtensible(target:{}):Bool;
+
+	/**
+		Returns an array of the target object's own (not inherited) property keys.
+	 */
+	@:pure static function ownKeys(target:{}):Array<String>;
+
+	/**
+		Similar to `Object.preventExtensions()`. Returns a Bool.
+	 */
+	static function preventExtensions(obj:{}):Bool;
+
+	/**
+		A function that assigns values to properties. Returns a Bool that is true
+		if the update was successful.
+	 */
+	@:overload(function<T>(target:Array<T>, propertyKey:Int, value:T, ?receiver:{}):Bool {})
+	static function set<T>(target:{}, propertyKey:String, value:T, ?receiver:{}):Bool;
+
+	/**
+		A function that sets the prototype of an object.
+	 */
+	static function setPrototypeOf<TProto:{}>(target:{}, prototype:TProto):Bool;
+}
diff --git a/std/js/lib/RegExp.hx b/std/js/lib/RegExp.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1504a798973c91010f43ada9d1fd144fdc3ed656
--- /dev/null
+++ b/std/js/lib/RegExp.hx
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+/**
+	Native JavaScript regular expressions.
+
+	For cross-platform regular expressions, use Haxe `EReg` class or
+	[regexp literals](https://haxe.org/manual/std-regex.html).
+**/
+@:native("RegExp")
+extern class RegExp {
+	var global(default, null):Bool;
+	var ignoreCase(default, null):Bool;
+	var multiline(default, null):Bool;
+	var source(default, null):String;
+	var lastIndex:Int;
+	function new(pattern:String, ?flags:String);
+	function exec(str:String):Null<RegExpMatch>;
+	function test(str:String):Bool;
+	function toString():String;
+}
+
+extern class RegExpMatch extends Array<String> {
+	var index:Int;
+	var input:String;
+}
diff --git a/std/js/lib/Set.hx b/std/js/lib/Set.hx
new file mode 100644
index 0000000000000000000000000000000000000000..94fa49a117c80cd462cac61785be4fe1d0dfa270
--- /dev/null
+++ b/std/js/lib/Set.hx
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.Map.MapEntry;
+import js.lib.Iterator;
+
+/**
+	The `js.Set` object lets you store unique values of any type, whether
+	primitive values or object references.
+
+	Documentation [Set](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Set")
+extern class Set<T> {
+	/**
+		The number of values in the `js.Set` object.
+	**/
+	var size(default, null):Int;
+
+	/**
+		If an iterable object is passed, all of its elements will be added to
+		the new `js.Set`.
+	**/
+	@:pure function new(?iterable:Any);
+
+	/**
+		Returns a boolean asserting whether an element is present with the given
+		value in the `js.Set` object or not.
+	**/
+	@:pure function has(value:T):Bool;
+
+	/**
+		Appends a new element with the given value to the `js.Set` object.
+		Returns the `js.Set` object.
+	**/
+	function add(value:T):Set<T>;
+
+	/**
+		Removes the element associated to the value and returns the value that
+		`has(value)` would have previously returned.
+		`has(value)` will return `false` afterwards.
+	**/
+	function delete(value:T):Bool;
+
+	/**
+		Removes all elements from the `js.Set` object.
+	**/
+	function clear():Void;
+
+	/**
+		Calls `callback` once for each key-value pair present in the `js.Set`
+		object, in insertion order.
+
+		If a `thisArg` parameter is provided to forEach, it will be used as the
+		`this` value for each callback.
+	**/
+	function forEach(callback:(value:T, key:T, set:Set<T>) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Returns a new `js.lib.Iterator` object that contains the keys for each element
+		in the `js.Set` object in insertion order.
+	**/
+	function keys():Iterator<T>;
+
+	/**
+		Returns a new `js.lib.Iterator` object that contains the values for each
+		element in the `js.Set` object in insertion order.
+	**/
+	function values():Iterator<T>;
+
+	/**
+		Returns a new `js.lib.Iterator` object that contains an array of
+		`[value, value]` for each element in the `js.Set` object, in insertion
+		order.
+		This is kept similar to the `js.Map` object, so that each entry has the
+		same value for its key and value here.
+	**/
+	function entries():Iterator<MapEntry<T, T>>;
+}
diff --git a/std/js/lib/Symbol.hx b/std/js/lib/Symbol.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c193c42abf43a4e945cc2ad01f69a0b55fd0321a
--- /dev/null
+++ b/std/js/lib/Symbol.hx
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+@:native("Symbol")
+extern class Symbol {
+	/**
+		To create a new primitive symbol, use `new Symbol()` with an optional string as its `description`.
+
+		NOTE: Unlike in plain JavaScript, `new Symbol()` syntax is used in Haxe. This generates a `Symbol(...)`
+		expression as required by the JavaScript specification.
+	**/
+	@:pure @:selfCall function new(?description:String);
+
+	/**
+		Searches for existing symbols with the given key and returns it if found.
+		Otherwise a new symbol gets created in the global symbol registry with this key.
+	**/
+	@:native("for") static function for_(key:String):Symbol;
+
+	/**
+		Retrieves a shared symbol key from the global symbol registry for the given symbol.
+	**/
+	@:pure static function keyFor(sym:Symbol):Null<String>;
+
+	/**
+		Returns a string containing the description of the Symbol.
+	**/
+	@:pure function toString():String;
+
+	/**
+		A method returning the default iterator for an object.
+	**/
+	static var iterator(default, null):Symbol;
+
+	/**
+		Retrieve symbol from a given `object`.
+
+		NOTE: This is a Haxe-specific method that generates an `object[symbol]` expression.
+	**/
+	inline function ofObject<T>(object:{}):Null<T>
+		return (cast object)[cast this];
+}
diff --git a/std/js/lib/Uint16Array.hx b/std/js/lib/Uint16Array.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f1eec1b6b23d7a83d601f6e3e4afcaf6a550c4ca
--- /dev/null
+++ b/std/js/lib/Uint16Array.hx
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.intl.NumberFormat.NumberFormatOptions;
+
+/**
+	The `Uint16Array` typed array represents an array of 16-bit unsigned integers in the platform
+	byte order. If control over byte order is needed, use `DataView` instead. The contents are
+	initialized to `0`. Once established, you can reference elements in the array using the object's
+	methods, or using standard array index syntax (that is, using bracket notation).
+
+	Documentation [Uint16Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint16Array) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint16Array$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Uint16Array")
+extern class Uint16Array implements ArrayBufferView implements ArrayAccess<Int> {
+	/**
+		Returns a number value of the element size. 2 in the case of an `Uint16Array`.
+	 */
+	static final BYTES_PER_ELEMENT:Int;
+
+	/**
+		Creates a new `Uint16Array` from an array-like or iterable object. See also [Array.from()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from).
+	 */
+	@:overload(function(source:{}, ?mapFn:(value:Int) -> Int, ?thisArg:Any):Uint16Array {})
+	@:pure static function from(source:{}, ?mapFn:(value:Int, index:Int) -> Int, ?thisArg:Any):Uint16Array;
+
+	/**
+		Creates a new `Uint16Array` with a variable number of arguments. See also [Array.of()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/of).
+	 */
+	@:pure static function of(elements:haxe.extern.Rest<Dynamic>):Uint16Array;
+
+	/**
+		Returns a number value of the element size.
+	 */
+	@:native("BYTES_PER_ELEMENT")
+	final BYTES_PER_ELEMENT_:Int;
+
+	/**
+		Returns the `ArrayBuffer` referenced by the `Uint16Array` Fixed at construction time and thus read only.
+	 */
+	final buffer:ArrayBuffer;
+
+	/**
+		Returns the length (in bytes) of the `Uint16Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteLength:Int;
+
+	/**
+		Returns the offset (in bytes) of the `Uint16Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteOffset:Int;
+
+	/**
+		Returns the number of elements hold in the `Uint16Array`. Fixed at construction time and thus read only.
+	 */
+	final length:Int;
+
+	/** @throws DOMError */
+	@:overload(function(length:Int):Void {})
+	@:overload(function(object:{}):Void {})
+	@:pure function new(buffer:ArrayBuffer, ?byteOffset:Int, ?length:Int):Void;
+
+	/**
+		Copies a sequence of array elements within the array.
+		See also [Array.prototype.copyWithin()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin).
+	 */
+	function copyWithin(target:Int, start:Int, ?end:Int):Uint16Array;
+
+	/**
+		Returns a new Array Iterator object that contains the key/value pairs for each index in the array.
+		See also [Array.prototype.entries()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/entries).
+	 */
+	@:pure function entries():Iterator<Int>;
+
+	/**
+		Tests whether all elements in the array pass the test provided by a function.
+		See also [Array.prototype.every()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every).
+	 */
+	@:overload(function(callback:(currentValue:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(currentValue:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function every(callback:(currentValue:Int, index:Int, array:Uint16Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Fills all the elements of an array from a start index to an end index with a static value.
+		See also [Array.prototype.fill()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill).
+	 */
+	function fill(value:Int, ?start:Int, ?end:Int):Uint16Array;
+
+	/**
+		Creates a new array with all of the elements of this array for which the provided filtering function returns true.
+		See also [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Uint16Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Uint16Array {})
+	function filter(callback:(element:Int, index:Int, array:Uint16Array) -> Bool, ?thisArg:Any):Uint16Array;
+
+	/**
+		Returns the found value in the array, if an element in the array satisfies the provided testing function or undefined if not found.
+		See also [Array.prototype.find()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	function find(callback:(element:Int, index:Int, array:Uint16Array) -> Bool, ?thisArg:Any):Null<Int>;
+
+	/**
+		Returns the found index in the array, if an element in the array satisfies the provided testing function or -1 if not found.
+		See also [Array.prototype.findIndex()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Int {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Int {})
+	function findIndex(callback:(element:Int, index:Int, array:Uint16Array) -> Bool, ?thisArg:Any):Int;
+
+	/**
+		Calls a function for each element in the array.
+		See also [Array.prototype.forEach()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach).
+	 */
+	@:overload(function(callback:(element:Int) -> Void, ?thisArg:Any):Void {})
+	@:overload(function(callback:(element:Int, index:Int) -> Void, ?thisArg:Any):Void {})
+	function forEach(callback:(element:Int, index:Int, array:Uint16Array) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Determines whether a typed array includes a certain element, returning true or false as appropriate.
+		See also [Array.prototype.includes()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
+	 */
+	@:pure function includes(searchElement:Int, ?fromIndex:Int):Bool;
+
+	/**
+		Returns the first (least) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.indexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf).
+	 */
+	@:pure function indexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Joins all elements of an array into a string.
+		See also [Array.prototype.join()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join).
+	 */
+	@:pure function join(?separator:String):String;
+
+	/**
+		Returns a new Array Iterator that contains the keys for each index in the array.
+		See also [Array.prototype.keys()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/keys).
+	 */
+	@:pure function keys():Iterator<Int>;
+
+	/**
+		Returns the last (greatest) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.lastIndexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf).
+	 */
+	@:pure function lastIndexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Creates a new array with the results of calling a provided function on every element in this array.
+		See also [Array.prototype.map()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map).
+	 */
+	@:overload(function(callback:(element:Int) -> Int, ?thisArg:Any):Uint16Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Int, ?thisArg:Any):Uint16Array {})
+	function map(callback:(element:Int, index:Int, array:Uint16Array) -> Int, ?thisArg:Any):Uint16Array;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from left-to-right) as to reduce it to a single value.
+		See also [Array.prototype.reduce()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Uint16Array) -> Int):Int {})
+	function reduce<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Uint16Array) -> T, initialValue:T):T;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from right-to-left) as to reduce it to a single value.
+		See also [Array.prototype.reduceRight()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Uint16Array) -> Int):Int {})
+	function reduceRight<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Uint16Array) -> T, initialValue:T):T;
+
+	/**
+		Reverses the order of the elements of an array — the first becomes the last, and the last becomes the first.
+		See also [Array.prototype.reverse()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse).
+	 */
+	function reverse():Uint16Array;
+
+	/**
+		Stores multiple values in the typed array, reading input values from a specified array.
+	 */
+	@:overload(function(array:Int8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8ClampedArray, ?offset:Int):Void {})
+	@:overload(function(array:Int16Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint16Array, ?offset:Int):Void {})
+	@:overload(function(array:Int32Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float64Array, ?offset:Int):Void {})
+	function set(array:Array<Int>, ?offset:Int):Void;
+
+	/**
+		Extracts a section of an array and returns a new array.
+		See also [Array.prototype.slice()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice).
+	 */
+	@:pure function slice(?start:Int, ?end:Int):Uint16Array;
+
+	/**
+		Returns true if at least one element in this array satisfies the provided testing function.
+		See also [Array.prototype.some()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function some(callback:(element:Int, index:Int, array:Uint16Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Sorts the elements of an array in place and returns the array.
+		See also [Array.prototype.sort()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort).
+	 */
+	function sort(?compareFn:(x:Int, y:Int) -> Int):Uint16Array;
+
+	/**
+		Returns a new TypedArray from the given start and end element index.
+	 */
+	@:pure function subarray(?begin:Int, ?end:Int):Uint16Array;
+
+	/**
+		Returns a new Array Iterator object that contains the values for each index in the array.
+		See also [Array.prototype.values()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values).
+	 */
+	@:pure function values():Iterator<Int>;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toLocaleString(?locales:String, ?options:NumberFormatOptions):String;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toString():String;
+}
diff --git a/std/js/lib/Uint32Array.hx b/std/js/lib/Uint32Array.hx
new file mode 100644
index 0000000000000000000000000000000000000000..75536c8cdb1f12e62c50bacea5df40cfba8eff88
--- /dev/null
+++ b/std/js/lib/Uint32Array.hx
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.intl.NumberFormat.NumberFormatOptions;
+
+/**
+	The `Uint32Array` typed array represents an array of 32-bit unsigned integers in the platform
+	byte order. If control over byte order is needed, use `DataView` instead. The contents are
+	initialized to `0`. Once established, you can reference elements in the array using the object's
+	methods, or using standard array index syntax (that is, using bracket notation).
+
+	Documentation [Uint32Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint32Array) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint32Array$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Uint32Array")
+extern class Uint32Array implements ArrayBufferView implements ArrayAccess<Int> {
+	/**
+		Returns a number value of the element size. 4 in the case of an `Uint32Array`.
+	 */
+	static final BYTES_PER_ELEMENT:Int;
+
+	/**
+		Creates a new `Uint32Array` from an array-like or iterable object. See also [Array.from()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from).
+	 */
+	@:overload(function(source:{}, ?mapFn:(value:Int) -> Int, ?thisArg:Any):Uint32Array {})
+	@:pure static function from(source:{}, ?mapFn:(value:Int, index:Int) -> Int, ?thisArg:Any):Uint32Array;
+
+	/**
+		Creates a new `Uint32Array` with a variable number of arguments. See also [Array.of()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/of).
+	 */
+	@:pure static function of(elements:haxe.extern.Rest<Dynamic>):Uint32Array;
+
+	/**
+		Returns a number value of the element size.
+	 */
+	@:native("BYTES_PER_ELEMENT")
+	final BYTES_PER_ELEMENT_:Int;
+
+	/**
+		Returns the `ArrayBuffer` referenced by the `Uint32Array` Fixed at construction time and thus read only.
+	 */
+	final buffer:ArrayBuffer;
+
+	/**
+		Returns the length (in bytes) of the `Uint32Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteLength:Int;
+
+	/**
+		Returns the offset (in bytes) of the `Uint32Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteOffset:Int;
+
+	/**
+		Returns the number of elements hold in the `Uint32Array`. Fixed at construction time and thus read only.
+	 */
+	final length:Int;
+
+	/** @throws DOMError */
+	@:overload(function(length:Int):Void {})
+	@:overload(function(object:{}):Void {})
+	@:pure function new(buffer:ArrayBuffer, ?byteOffset:Int, ?length:Int):Void;
+
+	/**
+		Copies a sequence of array elements within the array.
+		See also [Array.prototype.copyWithin()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin).
+	 */
+	function copyWithin(target:Int, start:Int, ?end:Int):Uint32Array;
+
+	/**
+		Returns a new Array Iterator object that contains the key/value pairs for each index in the array.
+		See also [Array.prototype.entries()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/entries).
+	 */
+	@:pure function entries():Iterator<Int>;
+
+	/**
+		Tests whether all elements in the array pass the test provided by a function.
+		See also [Array.prototype.every()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every).
+	 */
+	@:overload(function(callback:(currentValue:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(currentValue:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function every(callback:(currentValue:Int, index:Int, array:Uint32Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Fills all the elements of an array from a start index to an end index with a static value.
+		See also [Array.prototype.fill()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill).
+	 */
+	function fill(value:Int, ?start:Int, ?end:Int):Uint32Array;
+
+	/**
+		Creates a new array with all of the elements of this array for which the provided filtering function returns true.
+		See also [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Uint32Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Uint32Array {})
+	function filter(callback:(element:Int, index:Int, array:Uint32Array) -> Bool, ?thisArg:Any):Uint32Array;
+
+	/**
+		Returns the found value in the array, if an element in the array satisfies the provided testing function or undefined if not found.
+		See also [Array.prototype.find()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	function find(callback:(element:Int, index:Int, array:Uint32Array) -> Bool, ?thisArg:Any):Null<Int>;
+
+	/**
+		Returns the found index in the array, if an element in the array satisfies the provided testing function or -1 if not found.
+		See also [Array.prototype.findIndex()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Int {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Int {})
+	function findIndex(callback:(element:Int, index:Int, array:Uint32Array) -> Bool, ?thisArg:Any):Int;
+
+	/**
+		Calls a function for each element in the array.
+		See also [Array.prototype.forEach()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach).
+	 */
+	@:overload(function(callback:(element:Int) -> Void, ?thisArg:Any):Void {})
+	@:overload(function(callback:(element:Int, index:Int) -> Void, ?thisArg:Any):Void {})
+	function forEach(callback:(element:Int, index:Int, array:Uint32Array) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Determines whether a typed array includes a certain element, returning true or false as appropriate.
+		See also [Array.prototype.includes()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
+	 */
+	@:pure function includes(searchElement:Int, ?fromIndex:Int):Bool;
+
+	/**
+		Returns the first (least) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.indexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf).
+	 */
+	@:pure function indexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Joins all elements of an array into a string.
+		See also [Array.prototype.join()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join).
+	 */
+	@:pure function join(?separator:String):String;
+
+	/**
+		Returns a new Array Iterator that contains the keys for each index in the array.
+		See also [Array.prototype.keys()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/keys).
+	 */
+	@:pure function keys():Iterator<Int>;
+
+	/**
+		Returns the last (greatest) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.lastIndexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf).
+	 */
+	@:pure function lastIndexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Creates a new array with the results of calling a provided function on every element in this array.
+		See also [Array.prototype.map()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map).
+	 */
+	@:overload(function(callback:(element:Int) -> Int, ?thisArg:Any):Uint32Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Int, ?thisArg:Any):Uint32Array {})
+	function map(callback:(element:Int, index:Int, array:Uint32Array) -> Int, ?thisArg:Any):Uint32Array;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from left-to-right) as to reduce it to a single value.
+		See also [Array.prototype.reduce()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Uint32Array) -> Int):Int {})
+	function reduce<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Uint32Array) -> T, initialValue:T):T;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from right-to-left) as to reduce it to a single value.
+		See also [Array.prototype.reduceRight()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Uint32Array) -> Int):Int {})
+	function reduceRight<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Uint32Array) -> T, initialValue:T):T;
+
+	/**
+		Reverses the order of the elements of an array — the first becomes the last, and the last becomes the first.
+		See also [Array.prototype.reverse()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse).
+	 */
+	function reverse():Uint32Array;
+
+	/**
+		Stores multiple values in the typed array, reading input values from a specified array.
+	 */
+	@:overload(function(array:Int8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8ClampedArray, ?offset:Int):Void {})
+	@:overload(function(array:Int16Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint16Array, ?offset:Int):Void {})
+	@:overload(function(array:Int32Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float64Array, ?offset:Int):Void {})
+	function set(array:Array<Int>, ?offset:Int):Void;
+
+	/**
+		Extracts a section of an array and returns a new array.
+		See also [Array.prototype.slice()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice).
+	 */
+	@:pure function slice(?start:Int, ?end:Int):Uint32Array;
+
+	/**
+		Returns true if at least one element in this array satisfies the provided testing function.
+		See also [Array.prototype.some()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function some(callback:(element:Int, index:Int, array:Uint32Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Sorts the elements of an array in place and returns the array.
+		See also [Array.prototype.sort()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort).
+	 */
+	function sort(?compareFn:(x:Int, y:Int) -> Int):Uint32Array;
+
+	/**
+		Returns a new TypedArray from the given start and end element index.
+	 */
+	@:pure function subarray(?begin:Int, ?end:Int):Uint32Array;
+
+	/**
+		Returns a new Array Iterator object that contains the values for each index in the array.
+		See also [Array.prototype.values()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values).
+	 */
+	@:pure function values():Iterator<Int>;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toLocaleString(?locales:String, ?options:NumberFormatOptions):String;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toString():String;
+}
diff --git a/std/js/lib/Uint8Array.hx b/std/js/lib/Uint8Array.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6036cb3696d4cf5a5d8ad5f1c4ad5888eece5c6d
--- /dev/null
+++ b/std/js/lib/Uint8Array.hx
@@ -0,0 +1,263 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.intl.NumberFormat.NumberFormatOptions;
+
+/**
+	The `Uint8Array` typed array represents an array of 8-bit unsigned integers. The contents
+	are initialized to 0. Once established, you can reference elements in the array using the object's
+	methods, or using standard array index syntax (that is, using bracket notation).
+
+	Documentation [Uint8Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Uint8Array")
+extern class Uint8Array implements ArrayBufferView implements ArrayAccess<Int> {
+	/**
+		Returns a number value of the element size. 1 in the case of an `Uint8Array`.
+	 */
+	static final BYTES_PER_ELEMENT:Int;
+
+	/**
+		Creates a new `Uint8Array` from an array-like or iterable object. See also [Array.from()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from).
+	 */
+	@:overload(function(source:{}, ?mapFn:(value:Int) -> Int, ?thisArg:Any):Uint8Array {})
+	@:pure static function from(source:{}, ?mapFn:(value:Int, index:Int) -> Int, ?thisArg:Any):Uint8Array;
+
+	/**
+		Creates a new `Uint8Array` with a variable number of arguments. See also [Array.of()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/of).
+	 */
+	@:pure static function of(elements:haxe.extern.Rest<Dynamic>):Uint8Array;
+
+	/**
+		Returns a number value of the element size.
+	 */
+	@:native("BYTES_PER_ELEMENT")
+	final BYTES_PER_ELEMENT_:Int;
+
+	/**
+		Returns the `ArrayBuffer` referenced by the `Uint8Array` Fixed at construction time and thus read only.
+	 */
+	final buffer:ArrayBuffer;
+
+	/**
+		Returns the length (in bytes) of the `Uint8Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteLength:Int;
+
+	/**
+		Returns the offset (in bytes) of the `Uint8Array` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteOffset:Int;
+
+	/**
+		Returns the number of elements hold in the `Uint8Array`. Fixed at construction time and thus read only.
+	 */
+	final length:Int;
+
+	/** @throws DOMError */
+	@:overload(function(length:Int):Void {})
+	@:overload(function(object:{}):Void {})
+	@:pure function new(buffer:ArrayBuffer, ?byteOffset:Int, ?length:Int):Void;
+
+	/**
+		Copies a sequence of array elements within the array.
+		See also [Array.prototype.copyWithin()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin).
+	 */
+	function copyWithin(target:Int, start:Int, ?end:Int):Uint8Array;
+
+	/**
+		Returns a new Array Iterator object that contains the key/value pairs for each index in the array.
+		See also [Array.prototype.entries()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/entries).
+	 */
+	@:pure function entries():Iterator<Int>;
+
+	/**
+		Tests whether all elements in the array pass the test provided by a function.
+		See also [Array.prototype.every()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every).
+	 */
+	@:overload(function(callback:(currentValue:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(currentValue:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function every(callback:(currentValue:Int, index:Int, array:Uint8Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Fills all the elements of an array from a start index to an end index with a static value.
+		See also [Array.prototype.fill()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill).
+	 */
+	function fill(value:Int, ?start:Int, ?end:Int):Uint8Array;
+
+	/**
+		Creates a new array with all of the elements of this array for which the provided filtering function returns true.
+		See also [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Uint8Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Uint8Array {})
+	function filter(callback:(element:Int, index:Int, array:Uint8Array) -> Bool, ?thisArg:Any):Uint8Array;
+
+	/**
+		Returns the found value in the array, if an element in the array satisfies the provided testing function or undefined if not found.
+		See also [Array.prototype.find()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	function find(callback:(element:Int, index:Int, array:Uint8Array) -> Bool, ?thisArg:Any):Null<Int>;
+
+	/**
+		Returns the found index in the array, if an element in the array satisfies the provided testing function or -1 if not found.
+		See also [Array.prototype.findIndex()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Int {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Int {})
+	function findIndex(callback:(element:Int, index:Int, array:Uint8Array) -> Bool, ?thisArg:Any):Int;
+
+	/**
+		Calls a function for each element in the array.
+		See also [Array.prototype.forEach()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach).
+	 */
+	@:overload(function(callback:(element:Int) -> Void, ?thisArg:Any):Void {})
+	@:overload(function(callback:(element:Int, index:Int) -> Void, ?thisArg:Any):Void {})
+	function forEach(callback:(element:Int, index:Int, array:Uint8Array) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Determines whether a typed array includes a certain element, returning true or false as appropriate.
+		See also [Array.prototype.includes()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
+	 */
+	@:pure function includes(searchElement:Int, ?fromIndex:Int):Bool;
+
+	/**
+		Returns the first (least) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.indexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf).
+	 */
+	@:pure function indexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Joins all elements of an array into a string.
+		See also [Array.prototype.join()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join).
+	 */
+	@:pure function join(?separator:String):String;
+
+	/**
+		Returns a new Array Iterator that contains the keys for each index in the array.
+		See also [Array.prototype.keys()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/keys).
+	 */
+	@:pure function keys():Iterator<Int>;
+
+	/**
+		Returns the last (greatest) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.lastIndexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf).
+	 */
+	@:pure function lastIndexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Creates a new array with the results of calling a provided function on every element in this array.
+		See also [Array.prototype.map()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map).
+	 */
+	@:overload(function(callback:(element:Int) -> Int, ?thisArg:Any):Uint8Array {})
+	@:overload(function(callback:(element:Int, index:Int) -> Int, ?thisArg:Any):Uint8Array {})
+	function map(callback:(element:Int, index:Int, array:Uint8Array) -> Int, ?thisArg:Any):Uint8Array;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from left-to-right) as to reduce it to a single value.
+		See also [Array.prototype.reduce()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Uint8Array) -> Int):Int {})
+	function reduce<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Uint8Array) -> T, initialValue:T):T;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from right-to-left) as to reduce it to a single value.
+		See also [Array.prototype.reduceRight()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Uint8Array) -> Int):Int {})
+	function reduceRight<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Uint8Array) -> T, initialValue:T):T;
+
+	/**
+		Reverses the order of the elements of an array — the first becomes the last, and the last becomes the first.
+		See also [Array.prototype.reverse()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse).
+	 */
+	function reverse():Uint8Array;
+
+	/**
+		Stores multiple values in the typed array, reading input values from a specified array.
+	 */
+	@:overload(function(array:Int8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8ClampedArray, ?offset:Int):Void {})
+	@:overload(function(array:Int16Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint16Array, ?offset:Int):Void {})
+	@:overload(function(array:Int32Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float64Array, ?offset:Int):Void {})
+	function set(array:Array<Int>, ?offset:Int):Void;
+
+	/**
+		Extracts a section of an array and returns a new array.
+		See also [Array.prototype.slice()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice).
+	 */
+	@:pure function slice(?start:Int, ?end:Int):Uint8Array;
+
+	/**
+		Returns true if at least one element in this array satisfies the provided testing function.
+		See also [Array.prototype.some()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function some(callback:(element:Int, index:Int, array:Uint8Array) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Sorts the elements of an array in place and returns the array.
+		See also [Array.prototype.sort()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort).
+	 */
+	function sort(?compareFn:(x:Int, y:Int) -> Int):Uint8Array;
+
+	/**
+		Returns a new TypedArray from the given start and end element index.
+	 */
+	@:pure function subarray(?begin:Int, ?end:Int):Uint8Array;
+
+	/**
+		Returns a new Array Iterator object that contains the values for each index in the array.
+		See also [Array.prototype.values()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values).
+	 */
+	@:pure function values():Iterator<Int>;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toLocaleString(?locales:String, ?options:NumberFormatOptions):String;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toString():String;
+}
diff --git a/std/js/lib/Uint8ClampedArray.hx b/std/js/lib/Uint8ClampedArray.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4a68168b9c0492fe523d65b0ff457b694996fbcd
--- /dev/null
+++ b/std/js/lib/Uint8ClampedArray.hx
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.intl.NumberFormat.NumberFormatOptions;
+
+/**
+	The `Uint8ClampedArray` typed array represents an array of 8-bit unsigned integers clamped
+	to 0-255; if you specified a value that is out of the range of [0,255], 0 or 255 will be set instead;
+	if you specify a non-integer, the nearest integer will be set. The contents are initialized to `0`.
+	Once established, you can reference elements in the array using the object's methods, or using
+	standard array index syntax (that is, using bracket notation).
+
+	Documentation [Uint8ClampedArray](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8ClampedArray) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8ClampedArray$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Uint8ClampedArray")
+extern class Uint8ClampedArray implements ArrayBufferView implements ArrayAccess<Int> {
+	/**
+		Returns a number value of the element size. 1 in the case of an `Uint8ClampedArray`.
+	 */
+	static final BYTES_PER_ELEMENT:Int;
+
+	/**
+		Creates a new `Uint8ClampedArray` from an array-like or iterable object. See also [Array.from()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from).
+	 */
+	@:overload(function(source:{}, ?mapFn:(value:Int) -> Int, ?thisArg:Any):Uint8ClampedArray {})
+	@:pure static function from(source:{}, ?mapFn:(value:Int, index:Int) -> Int, ?thisArg:Any):Uint8ClampedArray;
+
+	/**
+		Creates a new `Uint8ClampedArray` with a variable number of arguments. See also [Array.of()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/of).
+	 */
+	@:pure static function of(elements:haxe.extern.Rest<Dynamic>):Uint8ClampedArray;
+
+	/**
+		Returns a number value of the element size.
+	 */
+	@:native("BYTES_PER_ELEMENT")
+	final BYTES_PER_ELEMENT_:Int;
+
+	/**
+		Returns the `ArrayBuffer` referenced by the `Uint8ClampedArray` Fixed at construction time and thus read only.
+	 */
+	final buffer:ArrayBuffer;
+
+	/**
+		Returns the length (in bytes) of the `Uint8ClampedArray` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteLength:Int;
+
+	/**
+		Returns the offset (in bytes) of the `Uint8ClampedArray` from the start of its `ArrayBuffer`. Fixed at construction time and thus read only.
+	 */
+	final byteOffset:Int;
+
+	/**
+		Returns the number of elements hold in the `Uint8ClampedArray`. Fixed at construction time and thus read only.
+	 */
+	final length:Int;
+
+	/** @throws DOMError */
+	@:overload(function(length:Int):Void {})
+	@:overload(function(object:{}):Void {})
+	@:pure function new(buffer:ArrayBuffer, ?byteOffset:Int, ?length:Int):Void;
+
+	/**
+		Copies a sequence of array elements within the array.
+		See also [Array.prototype.copyWithin()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin).
+	 */
+	function copyWithin(target:Int, start:Int, ?end:Int):Uint8ClampedArray;
+
+	/**
+		Returns a new Array Iterator object that contains the key/value pairs for each index in the array.
+		See also [Array.prototype.entries()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/entries).
+	 */
+	@:pure function entries():Iterator<Int>;
+
+	/**
+		Tests whether all elements in the array pass the test provided by a function.
+		See also [Array.prototype.every()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every).
+	 */
+	@:overload(function(callback:(currentValue:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(currentValue:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function every(callback:(currentValue:Int, index:Int, array:Uint8ClampedArray) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Fills all the elements of an array from a start index to an end index with a static value.
+		See also [Array.prototype.fill()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill).
+	 */
+	function fill(value:Int, ?start:Int, ?end:Int):Uint8ClampedArray;
+
+	/**
+		Creates a new array with all of the elements of this array for which the provided filtering function returns true.
+		See also [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Uint8ClampedArray {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Uint8ClampedArray {})
+	function filter(callback:(element:Int, index:Int, array:Uint8ClampedArray) -> Bool, ?thisArg:Any):Uint8ClampedArray;
+
+	/**
+		Returns the found value in the array, if an element in the array satisfies the provided testing function or undefined if not found.
+		See also [Array.prototype.find()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Null<Int> {})
+	function find(callback:(element:Int, index:Int, array:Uint8ClampedArray) -> Bool, ?thisArg:Any):Null<Int>;
+
+	/**
+		Returns the found index in the array, if an element in the array satisfies the provided testing function or -1 if not found.
+		See also [Array.prototype.findIndex()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Int {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Int {})
+	function findIndex(callback:(element:Int, index:Int, array:Uint8ClampedArray) -> Bool, ?thisArg:Any):Int;
+
+	/**
+		Calls a function for each element in the array.
+		See also [Array.prototype.forEach()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach).
+	 */
+	@:overload(function(callback:(element:Int) -> Void, ?thisArg:Any):Void {})
+	@:overload(function(callback:(element:Int, index:Int) -> Void, ?thisArg:Any):Void {})
+	function forEach(callback:(element:Int, index:Int, array:Uint8ClampedArray) -> Void, ?thisArg:Any):Void;
+
+	/**
+		Determines whether a typed array includes a certain element, returning true or false as appropriate.
+		See also [Array.prototype.includes()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
+	 */
+	@:pure function includes(searchElement:Int, ?fromIndex:Int):Bool;
+
+	/**
+		Returns the first (least) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.indexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf).
+	 */
+	@:pure function indexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Joins all elements of an array into a string.
+		See also [Array.prototype.join()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join).
+	 */
+	@:pure function join(?separator:String):String;
+
+	/**
+		Returns a new Array Iterator that contains the keys for each index in the array.
+		See also [Array.prototype.keys()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/keys).
+	 */
+	@:pure function keys():Iterator<Int>;
+
+	/**
+		Returns the last (greatest) index of an element within the array equal to the specified value, or -1 if none is found.
+		See also [Array.prototype.lastIndexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf).
+	 */
+	@:pure function lastIndexOf(searchElement:Int, ?fromIndex:Int):Int;
+
+	/**
+		Creates a new array with the results of calling a provided function on every element in this array.
+		See also [Array.prototype.map()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map).
+	 */
+	@:overload(function(callback:(element:Int) -> Int, ?thisArg:Any):Uint8ClampedArray {})
+	@:overload(function(callback:(element:Int, index:Int) -> Int, ?thisArg:Any):Uint8ClampedArray {})
+	function map(callback:(element:Int, index:Int, array:Uint8ClampedArray) -> Int, ?thisArg:Any):Uint8ClampedArray;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from left-to-right) as to reduce it to a single value.
+		See also [Array.prototype.reduce()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Uint8ClampedArray) -> Int):Int {})
+	function reduce<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Uint8ClampedArray) -> T, initialValue:T):T;
+
+	/**
+		Apply a function against an accumulator and each value of the array (from right-to-left) as to reduce it to a single value.
+		See also [Array.prototype.reduceRight()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight).
+	 */
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int) -> T, initialValue:T):T {})
+	@:overload(function<T>(callback:(previousValue:T, currentValue:Int, index:Int) -> T, initialValue:T):T {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int) -> Int):Int {})
+	@:overload(function(callbackfn:(previousValue:Int, currentValue:Int, index:Int, array:Uint8ClampedArray) -> Int):Int {})
+	function reduceRight<T>(callback:(previousValue:T, currentValue:Int, index:Int, array:Uint8ClampedArray) -> T, initialValue:T):T;
+
+	/**
+		Reverses the order of the elements of an array — the first becomes the last, and the last becomes the first.
+		See also [Array.prototype.reverse()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse).
+	 */
+	function reverse():Uint8ClampedArray;
+
+	/**
+		Stores multiple values in the typed array, reading input values from a specified array.
+	 */
+	@:overload(function(array:Int8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint8ClampedArray, ?offset:Int):Void {})
+	@:overload(function(array:Int16Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint16Array, ?offset:Int):Void {})
+	@:overload(function(array:Int32Array, ?offset:Int):Void {})
+	@:overload(function(array:Uint32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float32Array, ?offset:Int):Void {})
+	@:overload(function(array:Float64Array, ?offset:Int):Void {})
+	function set(array:Array<Int>, ?offset:Int):Void;
+
+	/**
+		Extracts a section of an array and returns a new array.
+		See also [Array.prototype.slice()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice).
+	 */
+	@:pure function slice(?start:Int, ?end:Int):Uint8ClampedArray;
+
+	/**
+		Returns true if at least one element in this array satisfies the provided testing function.
+		See also [Array.prototype.some()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some).
+	 */
+	@:overload(function(callback:(element:Int) -> Bool, ?thisArg:Any):Bool {})
+	@:overload(function(callback:(element:Int, index:Int) -> Bool, ?thisArg:Any):Bool {})
+	function some(callback:(element:Int, index:Int, array:Uint8ClampedArray) -> Bool, ?thisArg:Any):Bool;
+
+	/**
+		Sorts the elements of an array in place and returns the array.
+		See also [Array.prototype.sort()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort).
+	 */
+	function sort(?compareFn:(x:Int, y:Int) -> Int):Uint8ClampedArray;
+
+	/**
+		Returns a new TypedArray from the given start and end element index.
+	 */
+	@:pure function subarray(?begin:Int, ?end:Int):Uint8ClampedArray;
+
+	/**
+		Returns a new Array Iterator object that contains the values for each index in the array.
+		See also [Array.prototype.values()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values).
+	 */
+	@:pure function values():Iterator<Int>;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toLocaleString(?locales:String, ?options:NumberFormatOptions):String;
+
+	/**
+		Returns a string representing the array and its elements.
+		See also [Array.prototype.toString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString).
+	 */
+	@:pure function toString():String;
+}
diff --git a/std/js/lib/WeakMap.hx b/std/js/lib/WeakMap.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6e92ed4a5273c0cef13ad71f46532128fbd6964b
--- /dev/null
+++ b/std/js/lib/WeakMap.hx
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+/**
+	The `WeakMap` object is a collection of key/value pairs in which the keys are weakly referenced.
+	The keys must be objects and the values can be arbitrary values.
+
+	You can learn more about WeakMaps in the section [WeakMap object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Keyed_collections#WeakMap_object)
+	in [Keyed collections](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Keyed_collections).
+
+	Documentation [WeakMap](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WeakMap) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WeakMap$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("WeakMap")
+extern class WeakMap<T> {
+	/**
+		The value of the `length` property is 0.
+	**/
+	static final length:Int;
+
+	/**
+		If an iterable object is passed, all of its elements will be added to the new WeakSet.
+		null is treated as undefined.
+	**/
+	@:pure function new(?iterable:Any);
+
+	/**
+		Removes any value associated to the `key`. `has(key)` will return `false` afterwards.
+	**/
+	function delete(key:{}):Bool;
+
+	/**
+		Returns the value associated to the `key`, or `undefined` if there is none.
+	**/
+	@:pure function get(key:{}):T;
+
+	/**
+		Returns a Boolean asserting whether a value has been associated to the `key` in the `WeakMap` object or not.
+	**/
+	@:pure function has(key:{}):Bool;
+
+	/**
+		Sets the value for the `key` in the `WeakMap` object. Returns the `WeakMap` object.
+	**/
+	function set(key:{}, value:T):WeakMap<T>;
+}
diff --git a/std/js/lib/WeakSet.hx b/std/js/lib/WeakSet.hx
new file mode 100644
index 0000000000000000000000000000000000000000..04ec6b12d915b79ce81dd9292108d34313163160
--- /dev/null
+++ b/std/js/lib/WeakSet.hx
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+/**
+	The `WeakSet` object lets you store weakly held objects in a collection.
+
+	Documentation [WeakSet](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WeakSet) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WeakSet$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("WeakSet")
+extern class WeakSet {
+	/**
+		The value of the `length` property is 0.
+	**/
+	static final length:Int;
+
+	/**
+		If an iterable object is passed, all of its elements will be added to the new WeakSet.
+		null is treated as undefined.
+	**/
+	@:pure function new(?iterable:Any);
+
+	/**
+		Appends a new object with the given value to the `WeakSet` object.
+	**/
+	function add(value:{}):WeakSet;
+
+	/**
+		Removes the element associated to the `value`.
+		`has(value)` will return `false` afterwards.
+	**/
+	function delete(value:{}):Bool;
+
+	/**
+		Returns a boolean asserting whether an element is present with the given value
+		in the `WeakSet` object or not.
+	**/
+	@:pure function has(value:{}):Bool;
+}
diff --git a/std/js/lib/WebAssembly.hx b/std/js/lib/WebAssembly.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ce913caf6d94eb562851975353a5fbdb798334a8
--- /dev/null
+++ b/std/js/lib/WebAssembly.hx
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib;
+
+import js.lib.webassembly.Module;
+import js.lib.webassembly.Instance;
+import js.html.Response;
+
+/**
+	The WebAssembly JavaScript object acts as the namespace for all WebAssembly-related functionality.
+
+	Documentation [WebAssembly](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("WebAssembly")
+extern class WebAssembly {
+	/**
+		The `WebAssembly.instantiate()` function allows you to compile and instantiate WebAssembly code.
+		This function has two overloads:
+
+		- The primary overload takes the WebAssembly binary code, in the form of a typed array or ArrayBuffer,
+		  and performs both compilation and instantiation in one step. The returned Promise resolves to both
+		  a compiled WebAssembly.Module and its first WebAssembly.Instance.
+
+		- The secondary overload takes an already-compiled WebAssembly.Module and returns a Promise that resolves
+		  to an Instance of that Module. This overload is useful if the Module has already been compiled.
+	**/
+	@:overload(function(module:Module, importObject:{}):Promise<Instance> {})
+	@:pure static function instantiate(bufferSource:BufferSource, importObject:{}):Promise<WebAssemblyInstantiatedSource>;
+
+	/**
+		The `WebAssembly.instantiateStreaming()` function compiles and instantiates a WebAssembly module
+		directly from a streamed underlying source. This is the most efficient, optimized way to load wasm code.
+	**/
+	@:pure static function instantiateStreaming(source:Response, importObject:{}):Promise<WebAssemblyInstantiatedSource>;
+
+	/**
+		The `WebAssembly.compile()` function compiles a WebAssembly `Module` from WebAssembly binary code.
+		This function is useful if it is necessary to a compile a module before it can be instantiated
+		(otherwise, the `WebAssembly.instantiate()` function should be used).
+	**/
+	@:pure static function compile(bufferSource:BufferSource):Promise<Module>;
+
+	/**
+		The `WebAssembly.compileStreaming()` function compiles a WebAssembly `Module` directly from a streamed
+		underlying source. This function is useful if it is necessary to a compile a module before it can
+		be instantiated (otherwise, the `WebAssembly.instantiateStreaming()` function should be used).
+	**/
+	@:pure static function compileStreaming(source:Response):Promise<Module>;
+
+	/**
+		The `WebAssembly.validate()` function validates a given typed array of WebAssembly binary code,
+		returning whether the bytes form a valid wasm module (`true`) or not (`false`).
+	**/
+	@:pure static function validate(bufferSource:BufferSource):Bool;
+}
+
+typedef WebAssemblyInstantiatedSource = {
+	final module:Module;
+	final instance:Instance;
+}
diff --git a/std/js/lib/intl/Collator.hx b/std/js/lib/intl/Collator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4af01a1478d1e98f3599d5405f37334b406c2ec4
--- /dev/null
+++ b/std/js/lib/intl/Collator.hx
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.intl;
+
+/**
+	The `Collator` object is a constructor for collators, objects that enable language
+	sensitive string comparison.
+
+	Documentation [Collator](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Collator) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Collator$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Intl.Collator")
+extern class Collator {
+	@:overload(function(?locales:Array<String>, ?options:CollatorOptions):Void {})
+	@:pure function new(?locales:String, ?options:CollatorOptions);
+
+	/**
+		Getter function that compares two strings according to the sort order of this `Collator` object.
+	 */
+	@:pure function compare(string1:String, string2:String):Int;
+
+	/**
+		Returns a new object with properties reflecting the locale and collation options computed
+		during initialization of the object.
+	 */
+	@:pure function resolvedOptions():CollatorResolvedOptions;
+
+	/**
+		Returns an array containing those of the provided locales that are supported
+		without having to fall back to the runtime's default locale.
+		@param locales A string with a BCP 47 language tag, or an array of such strings.
+	**/
+	@:overload(function(locales:Array<String>, ?options:CollatorSupportedLocalesOfOptions):Array<String> {})
+	@:pure static function supportedLocalesOf(locales:String, ?options:CollatorSupportedLocalesOfOptions):Array<String>;
+}
+
+typedef CollatorOptions = {
+	/**
+		The locale matching algorithm to use.
+		The default is `BestFit`.
+		For information about this option, see the [Intl page](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_negotiation).
+	**/
+	var ?localeMatcher:LocaleMatcher;
+
+	/**
+		Whether the comparison is for sorting or for searching for matching strings.
+		The default is `Sort`.
+	**/
+	var ?usage:Usage;
+
+	/**
+		Which differences in the strings should lead to non-zero result values.
+		The default is `Variant` for usage `Sort`; it's locale dependent for usage `Search`.
+	**/
+	var ?sensitivity:Sensitivity;
+
+	/**
+		Whether punctuation should be ignored.
+		The default is `false`.
+	**/
+	var ?ignorePunctuation:Bool;
+
+	/**
+		Whether numeric collation should be used, such that "1" < "2" < "10".
+		The default is `false`.
+		This option can be set through an `options` property or through a Unicode extension key;
+		if both are provided, the `options` property takes precedence.
+		Implementations are not required to support this property.
+	**/
+	var ?numeric:Bool;
+
+	/**
+		Whether upper case or lower case should sort first.
+		The default is "false".
+		This option can be set through an options property or through a Unicode extension key;
+		if both are provided, the `options` property takes precedence.
+		Implementations are not required to support this property.
+	**/
+	var ?caseFirst:String;
+}
+
+typedef CollatorResolvedOptions = {
+	/**
+		The BCP 47 language tag for the locale actually used.
+		If any Unicode extension values were requested in the input BCP 47 language tag
+		that led to this locale, the key-value pairs that were requested and are supported
+		for this locale are included in `locale`.
+	**/
+	final locale:String;
+
+	final usage:Usage;
+	final sensitivity:Sensitivity;
+
+	/**
+		The values provided for these properties in the `options` argument or filled in as defaults.
+	**/
+	final ignorePunctuation:Bool;
+
+	/**
+		he value requested using the Unicode extension key `"co"`, if it is supported for `Locale`,
+		or `Default`.
+	**/
+	final collation:Collation;
+
+	final numeric:Bool;
+
+	/**
+		The values requested for these properties in the options argument or using the
+		Unicode extension keys `"kn"` and `"kf"` or filled in as defaults.
+		If the implementation does not support these properties, they are omitted.
+	**/
+	final caseFirst:CaseFirst;
+}
+
+enum abstract Usage(String) {
+	var Sort = "sort";
+	var Search = "search";
+}
+
+enum abstract Sensitivity(String) {
+	/**
+		Only strings that differ in base letters compare as unequal.
+		Examples: a ≠ b, a = á, a = A.
+	**/
+	var Base = "base";
+
+	/**
+		Only strings that differ in base letters or accents and other diacritic marks compare as unequal.
+		Examples: a ≠ b, a ≠ á, a = A.
+	**/
+	var Accent = "accent";
+
+	/**
+		Only strings that differ in base letters or case compare as unequal.
+		Examples: a ≠ b, a = á, a ≠ A.
+	**/
+	var Case = "case";
+
+	/**
+		Strings that differ in base letters, accents and other diacritic marks, or case compare as unequal.
+		Other differences may also be taken into consideration.
+		Examples: a ≠ b, a ≠ á, a ≠ A.
+	**/
+	var Variant = "variant";
+}
+
+enum abstract CaseFirst(String) {
+	var Upper = "upper";
+	var Lower = "lower";
+	var False = "false";
+}
+
+enum abstract Collation(String) {
+	var Locale = "locale";
+	var Default = "default";
+}
+
+typedef CollatorSupportedLocalesOfOptions = {
+	/**
+		The locale matching algorithm to use.
+		The default is `BestFit`.
+	 */
+	var ?localeMatcher:LocaleMatcher;
+}
diff --git a/std/js/lib/intl/DateTimeFormat.hx b/std/js/lib/intl/DateTimeFormat.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3b13393cad3b0819c41e465cb7fa809c47bc90fc
--- /dev/null
+++ b/std/js/lib/intl/DateTimeFormat.hx
@@ -0,0 +1,386 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.intl;
+
+/**
+	The `DateTimeFormat` object is a constructor for objects that enable language-sensitive
+	date and time formatting.
+
+	Documentation [DateTimeFormat](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Intl.DateTimeFormat")
+extern class DateTimeFormat {
+	@:overload(function(?locales:Array<String>, ?options:DateTimeFormatOptions):Void {})
+	@:pure function new(?locales:String, ?options:DateTimeFormatOptions);
+
+	/**
+		Getter function that formats a date according to the locale and formatting options
+		of this `DateTimeFormat` object.
+	**/
+	@:overload(function(date:js.lib.Date):String {})
+	@:pure function format(date:Date):String;
+
+	/**
+		Returns an `Array` of objects representing the date string in parts that can be used
+		for custom locale-aware formatting.
+	**/
+	@:overload(function(date:js.lib.Date):Array<DateTimeFormatPart> {})
+	@:pure function formatToParts(date:Date):Array<DateTimeFormatPart>;
+
+	/**
+		Returns a new object with properties reflecting the locale and formatting options
+		computed during initialization of the object.
+	**/
+	@:pure function resolvedOptions():DateTimeFormatResolvedOptions;
+
+	/**
+		Returns an array containing those of the provided locales that are supported
+		without having to fall back to the runtime's default locale.
+	**/
+	@:overload(function(locales:Array<String>, ?options:DateTimeFormatSupportedLocalesOfOptions):Array<String> {})
+	@:pure static function supportedLocalesOf(locales:String, ?options:DateTimeFormatSupportedLocalesOfOptions):Array<String>;
+}
+
+typedef DateTimeFormatOptions = {
+	/**
+		The locale matching algorithm to use.
+		The default is `BestFit`.
+	**/
+	var ?localeMatcher:LocaleMatcher;
+
+	/**
+		The time zone to use. The only value implementations must recognize is `"UTC"`;
+		the default is the runtime's default time zone. Implementations may also recognize
+		the time zone names of the [IANA time zone database](https://www.iana.org/time-zones),
+		such as `"Asia/Shanghai"`, `"Asia/Kolkata"`, `"America/New_York"`.
+	**/
+	var ?timeZone:String;
+
+	/**
+		Whether to use 12-hour time (as opposed to 24-hour time).
+		The default is locale dependent.
+		This option overrides the hc language tag and/or the `hourCycle` option in case both are present.
+	**/
+	var ?hour12:Bool;
+
+	/**
+		The hour cycle to use. This option overrides the `hc` language tag, if both are present,
+		and the `Hour12` option takes precedence in case both options have been specified.
+	**/
+	var ?hourCycle:HourCycle;
+
+	/**
+		The format matching algorithm to use.
+		The default is `BestFit`.
+		See the following paragraphs for information about the use of this property.
+	**/
+	var ?formatMatcher:FormatMatcher;
+
+	/**
+		The representation of the weekday.
+	**/
+	var ?weekday:WeekdayRepresentation;
+
+	/**
+		The representation of the era.
+	**/
+	var ?era:EraRepresentation;
+
+	/**
+		The representation of the year.
+	**/
+	var ?year:YearRepresentation;
+
+	/**
+		The representation of the month.
+	**/
+	var ?month:MonthRepresentation;
+
+	/**
+		The representation of the day.
+	**/
+	var ?day:DayRepresentation;
+
+	/**
+		The representation of the hour.
+	**/
+	var ?hour:HourRepresentation;
+
+	/**
+		The representation of the minute.
+	**/
+	var ?minute:MinuteRepresentation;
+
+	/**
+		The representation of the second.
+	**/
+	var ?second:SecondRepresentation;
+
+	/**
+		The representation of the time zone name.
+	**/
+	var ?timeZoneName:TimeZoneName;
+}
+
+typedef DateTimeFormatResolvedOptions = {
+	/**
+		The BCP 47 language tag for the locale actually used.
+		If any Unicode extension values were requested in the input BCP 47 language tag that led to this locale,
+		the key-value pairs that were requested and are supported for this locale are included in `locale`.
+	**/
+	final locale:String;
+
+	/**
+		E.g. "gregory"
+	**/
+	final calendar:String;
+
+	/**
+		The values requested using the Unicode extension keys "ca" and "nu" or filled in as default values.
+	**/
+	final numberingSystem:String;
+
+	/**
+		The value provided for this property in the options argument; `undefined` (representing the runtime's
+		default time zone) if none was provided.
+		Warning: Applications should not rely on `undefined` being returned, as future versions may return
+		a String value identifying the runtime’s default time zone instead.
+	**/
+	final timeZone:Null<String>;
+
+	/**
+		The value provided for this property in the `options` argument or filled in as a default.
+	**/
+	final hour12:Bool;
+
+	final weekday:WeekdayRepresentation;
+	final era:EraRepresentation;
+	final year:YearRepresentation;
+	final month:MonthRepresentation;
+	final day:DayRepresentation;
+	final hour:HourRepresentation;
+	final minute:MinuteRepresentation;
+	final second:SecondRepresentation;
+
+	/**
+		The values resulting from format matching between the corresponding properties in the `options` argument
+		and the available combinations and representations for date-time formatting in the selected locale.
+		Some of these properties may not be present, indicating that the corresponding components will not be
+		represented in formatted output.
+	**/
+	final timeZoneName:TimeZoneName;
+}
+
+enum abstract HourCycle(String) {
+	var H11 = "h11";
+	var H12 = "h12";
+	var H23 = "h23";
+	var H24 = "h24";
+}
+
+enum abstract FormatMatcher(String) {
+	var Basic = "basic";
+	var BestFit = "best fit";
+}
+
+enum abstract WeekdayRepresentation(String) {
+	/**
+		(e.g., Thursday)
+	 */
+	var Long = "long";
+
+	/**
+		(e.g., Thu)
+	 */
+	var Short = "short";
+
+	/**
+		(e.g., T). Two weekdays may have the same narrow style for some locales (e.g. Tuesday's narrow style is also T).
+	 */
+	var Narrow = "narrow";
+}
+
+enum abstract EraRepresentation(String) {
+	/**
+		(e.g., Anno Domini)
+	 */
+	var Long = "long";
+
+	/**
+		(e.g., AD)
+	 */
+	var Short = "short";
+
+	/**
+		(e.g., A)
+	 */
+	var Narrow = "narrow";
+}
+
+enum abstract YearRepresentation(String) {
+	/**
+		(e.g., 2012)
+	**/
+	var Numeric = "numeric";
+
+	/**
+		(e.g., 12)
+	**/
+	var TwoDigit = "2-digit";
+}
+
+enum abstract MonthRepresentation(String) {
+	/**
+		(e.g., 2)
+	**/
+	var Numeric = "numeric";
+
+	/**
+		(e.g., 02)
+	**/
+	var TwoDigit = "2-digit";
+
+	/**
+		(e.g., March)
+	**/
+	var Long = "long";
+
+	/**
+		(e.g., Mar)
+	**/
+	var Short = "short";
+
+	/**
+		(e.g., M). Two months may have the same narrow style for some locales (e.g. May's narrow style is also M).
+	**/
+	var Narrow = "narrow";
+}
+
+enum abstract DayRepresentation(String) {
+	/**
+		(e.g., 1)
+	**/
+	var Numeric = "numeric";
+
+	/**
+		(e.g., 01)
+	**/
+	var TwoDigit = "2-digit";
+}
+
+enum abstract HourRepresentation(String) {
+	var Numeric = "numeric";
+	var TwoDigit = "2-digit";
+}
+
+enum abstract MinuteRepresentation(String) {
+	var Numeric = "numeric";
+	var TwoDigit = "2-digit";
+}
+
+enum abstract SecondRepresentation(String) {
+	var Numeric = "numeric";
+	var TwoDigit = "2-digit";
+}
+
+enum abstract TimeZoneName(String) {
+	/**
+		(e.g., British Summer Time)
+	**/
+	var Long = "long";
+
+	/**
+		(e.g., GMT+1)
+	**/
+	var Short = "short";
+}
+
+typedef DateTimeFormatPart = {
+	var type(default, never):DateTimeFormatPartType;
+	var value(default, never):String;
+}
+
+enum abstract DateTimeFormatPartType(String) {
+	/**
+		The string used for the day, for example "17".
+	**/
+	var Day = "day";
+
+	/**
+		The string used for the day period, for example, "AM" or "PM".
+	**/
+	var DayPeriod = "dayPeriod";
+
+	/**
+		The string used for the era, for example "BC" or "AD".
+	**/
+	var Era = "era";
+
+	/**
+		The string used for the hour, for example "3" or "03".
+	**/
+	var Hour = "hour";
+
+	/**
+		The string used for separating date and time values, for example "/", ",", "o'clock", "de", etc.
+	**/
+	var Literal = "literal";
+
+	/**
+		The string used for the minute, for example "00".
+	**/
+	var Minute = "minute";
+
+	/**
+		The string used for the month, for example "12".
+	**/
+	var Month = "month";
+
+	/**
+		The string used for the second, for example "07" or "42".
+	**/
+	var Second = "second";
+
+	/**
+		The string used for the name of the time zone, for example "UTC".
+	**/
+	var TimeZoneName = "timeZoneName";
+
+	/**
+		The string used for the weekday, for example "M", "Monday", or "Montag".
+	**/
+	var Weekday = "weekday";
+
+	/**
+		The string used for the year, for example "2012" or "96".
+	**/
+	var Year = "year";
+}
+
+typedef DateTimeFormatSupportedLocalesOfOptions = {
+	/**
+		The locale matching algorithm to use.
+		The default is `BestFit`.
+	 */
+	var ?localeMatcher:LocaleMatcher;
+}
diff --git a/std/js/lib/intl/LocaleMatcher.hx b/std/js/lib/intl/LocaleMatcher.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f5790fb931c9e3544d02f2819e33f5965467f41f
--- /dev/null
+++ b/std/js/lib/intl/LocaleMatcher.hx
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.intl;
+
+enum abstract LocaleMatcher(String) {
+    var Lookup = "lookup";
+    var BestFit = "best fit";
+}
diff --git a/std/js/lib/intl/NumberFormat.hx b/std/js/lib/intl/NumberFormat.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6d272ab8128f72c1ff72ecdbdfe80714050b6b23
--- /dev/null
+++ b/std/js/lib/intl/NumberFormat.hx
@@ -0,0 +1,283 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.intl;
+
+/**
+	The `NumberFormat` object is a constructor for objects that enable language sensitive number formatting.
+
+	Documentation [NumberFormat](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Intl.NumberFormat")
+extern class NumberFormat {
+	@:overload(function(?locales:Array<String>, ?options:NumberFormatOptions):Void {})
+	@:pure function new(?locales:String, ?options:NumberFormatOptions);
+
+	/**
+		Getter function that formats a number according to the locale
+		and formatting options of this `NumberFormat` object.
+	**/
+	@:pure function format(number:Float):String;
+
+	/**
+		Returns an `Array` of objects representing the number string in parts
+		that can be used for custom locale-aware formatting.
+	**/
+	@:pure function formatToParts(?number:Float):Array<NumberFormatPart>;
+
+	/**
+		Returns a new object with properties reflecting the locale and collation options
+		computed during initialization of the object.
+	**/
+	@:pure function resolvedOptions():NumberFormatResolvedOption;
+
+	/**
+		Returns an array containing those of the provided locales that are supported
+		without having to fall back to the runtime's default locale.
+	**/
+	@:overload(function(locales:Array<String>, ?options:NumberFormatSupportedLocalesOfOptions):Array<String> {})
+	@:pure static function supportedLocalesOf(locales:String, ?options:NumberFormatSupportedLocalesOfOptions):Array<String>;
+}
+
+typedef NumberFormatOptions = {
+	/**
+		The locale matching algorithm to use.
+		The default is `BestFit`.
+		For information about this option, see the [Intl page](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_negotiation).
+	**/
+	var ?localeMatcher:LocaleMatcher;
+
+	/**
+		The formatting style to use.
+		The default is `Decimal`.
+	**/
+	var ?style:NumberFormatStyle;
+
+	/**
+		The currency to use in currency formatting. Possible values are the ISO 4217 currency codes,
+		such as "USD" for the US dollar, "EUR" for the euro, or "CNY" for the Chinese RMB — see the
+		[Current currency & funds code list](https://www.currency-iso.org/en/home/tables/table-a1.html).
+		There is no default value; if the style is "currency", the currency property must be provided.
+	**/
+	var ?currency:String;
+
+	/**
+		How to display the currency in currency formatting.
+		The default is `Symbol`.
+	**/
+	var ?currencyDisplay:CurrencyDisplay;
+
+	/**
+		Whether to use grouping separators, such as thousands separators or thousand/lakh/crore separators.
+		The default is `true`.
+	**/
+	var ?useGrouping:Bool;
+
+	/**
+		The minimum number of integer digits to use.
+		Possible values are from 1 to 21; the default is 1.
+	**/
+	var ?minimumIntegerDigits:Int;
+
+	/**
+		The minimum number of fraction digits to use.
+		Possible values are from 0 to 20; the default for plain number and percent formatting is 0;
+		the default for currency formatting is the number of minor unit digits provided by the
+		[ISO 4217 currency code list](http://www.currency-iso.org/en/home/tables/table-a1.html)
+		(2 if the list doesn't provide that information).
+	**/
+	var ?minimumFractionDigits:Int;
+
+	/**
+		The maximum number of fraction digits to use.
+		Possible values are from 0 to 20; the default for plain number formatting is the larger of
+		minimumFractionDigits and 3; the default for currency formatting is the larger of minimumFractionDigits
+		and the number of minor unit digits provided by the [ISO 4217 currency code list](http://www.currency-iso.org/en/home/tables/table-a1.html)
+		(2 if the list doesn't provide that information); the default for percent formatting is the larger of
+		minimumFractionDigits and 0.
+	**/
+	var ?maximumFractionDigits:Int;
+
+	/**
+		The minimum number of significant digits to use.
+		Possible values are from 1 to 21; the default is 1.
+	**/
+	var ?minimumSignificantDigits:Int;
+
+	/**
+		The maximum number of significant digits to use.
+		Possible values are from 1 to 21; the default is 21.
+	**/
+	var ?maximumSignificantDigits:Int;
+}
+
+typedef NumberFormatResolvedOption = {
+	/**
+		The BCP 47 language tag for the locale actually used. If any Unicode extension values were
+		requested in the input BCP 47 language tag that led to this locale, the key-value pairs that
+		were requested and are supported for this locale are included in `locale`.
+	**/
+	final locale:String;
+
+	/**
+		The value requested using the Unicode extension key `"nu"` or filled in as a default.
+	**/
+	final numberingSystem:String;
+
+	final style:NumberFormatStyle;
+
+	/**
+		The values provided for these properties in the `options` argument or filled in as defaults.
+	**/
+	final useGrouping:String;
+
+	final currency:String;
+
+	/**
+		The values provided for these properties in the `options` argument or filled in as defaults.
+		These properties are only present if `style` is `"currency"`.
+	**/
+	final currencyDisplay:String;
+
+	final minimumIntegerDigits:Int;
+	final minimumFractionDigits:Int;
+
+	/**
+		The values provided for these properties in the `options` argument or filled in as defaults.
+		These properties are present only if neither m`inimumSignificantDigits` nor `maximumSignificantDigits`
+		was provided in the `options` argument.
+	**/
+	final maximumFractionDigits:Int;
+
+	final minimumSignificantDigits:Int;
+
+	/**
+		The values provided for these properties in the `options` argument or filled in as defaults.
+		These properties are present only if at least one of them was provided in the `options` argument.
+	**/
+	final maximumSignificantDigits:Int;
+}
+
+enum abstract NumberFormatStyle(String) {
+	/**
+		plain number formatting
+	**/
+	var Decimal = "decimal";
+
+	/**
+		currency formatting
+	**/
+	var Currency = "currency";
+
+	/**
+		percent formatting
+	**/
+	var Percent = "percent";
+}
+
+enum abstract CurrencyDisplay(String) {
+	/**
+		To use a localized currency symbol such as €.
+	**/
+	var Symbol = "symbol";
+
+	/**
+		To use the ISO currency code.
+	**/
+	var Code = "code";
+
+	/**
+		To use a localized currency name such as "dollar".
+	**/
+	var Name = "name";
+}
+
+typedef NumberFormatPart = {
+	final type:NumberFormatPartType;
+	final value:String;
+}
+
+enum abstract NumberFormatPartType(String) {
+	/**
+		The currency string, such as the symbols "$" and "€" or the name "Dollar", "Euro" depending
+		on how currencyDisplay is specified.
+	**/
+	var Currency = "currency";
+
+	/**
+		The decimal separator string (".").
+	**/
+	var Decimal = "decimal";
+
+	/**
+		The fraction number.
+	**/
+	var Fraction = "fraction";
+
+	/**
+		The group separator string (",").
+	**/
+	var group = "group";
+
+	/**
+		The Infinity string ("∞").
+	**/
+	var infinity = "infinity";
+
+	/**
+		The integer number.
+	**/
+	var integer = "integer";
+
+	/**
+		Any literal strings or whitespace in the formatted number.
+	**/
+	var literal = "literal";
+
+	/**
+		The minus sign string ("-").
+	**/
+	var minusSign = "minusSign";
+
+	/**
+		The NaN string ("NaN").
+	**/
+	var nan = "nan";
+
+	/**
+		The plus sign string ("+").
+	**/
+	var plusSign = "plusSign";
+
+	/**
+		The percent sign string ("%").
+	**/
+	var percentSign = "percentSign";
+}
+
+typedef NumberFormatSupportedLocalesOfOptions = {
+	/**
+		The locale matching algorithm to use.
+		The default is `BestFit`.
+	 */
+	var ?localeMatcher:LocaleMatcher;
+}
diff --git a/std/js/lib/intl/PluralRules.hx b/std/js/lib/intl/PluralRules.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6c0292d1f8d16190f6fc8584f9fe83e1b331b06b
--- /dev/null
+++ b/std/js/lib/intl/PluralRules.hx
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.intl;
+
+/**
+	The `PluralRules` object is a constructor for objects that enable plural sensitive formatting
+	and plural language rules.
+
+	Documentation [PluralRules](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/PluralRules) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/PluralRules$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Intl.PluralRules")
+extern class PluralRules {
+	@:overload(function(?locales:Array<String>, ?options:PluralRulesOptions):Void {})
+	@:pure function new(?locales:String, ?options:PluralRulesOptions);
+
+	/**
+		Returns a new object with properties reflecting the locale and collation options computed during initialization of the object.
+	**/
+	@:pure function resolvedOptions():PluralRulesResolvedOptions;
+
+	/**
+		Returns a String indicating which plurar rule to use for locale-aware formatting.
+	**/
+	@:pure function select(number:Int):String;
+
+	/**
+		Returns an array containing those of the provided locales that are supported
+		without having to fall back to the runtime's default locale.
+	**/
+	@:overload(function(locales:Array<String>, ?options:PluralRulesSupportedLocalesOfOptions):Array<String> {})
+	@:pure static function supportedLocalesOf(locales:String, ?options:PluralRulesSupportedLocalesOfOptions):Array<String>;
+}
+
+typedef PluralRulesOptions = {
+	/**
+		The locale matching algorithm to use.
+		The default is "best fit".
+		For information about this option, see the [Intl page](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_negotiation).
+	 */
+	var ?localeMatcher:LocaleMatcher;
+
+	/**
+		The type to use.
+		The default is `Cardinal`.
+	 */
+	var ?type:PluralRulesType;
+}
+
+typedef PluralRulesResolvedOptions = {
+	/**
+		The BCP 47 language tag for the locale actually used. If any Unicode extension values were requested in
+		the input BCP 47 language tag that led to this locale, the key-value pairs that were requested and are
+		supported for this locale are included in `locale`.
+	 */
+	final locale:String;
+
+	/**
+		An `Array` of plural rules used by the given language.
+	**/
+	final pluralCategories:Array<String>;
+
+	/**
+		The type used (cardinal or ordinal).
+	**/
+	final type:PluralRulesType;
+
+	final minimumIntegerDigits:Int;
+	final minimumFractionDigits:Int;
+
+	/**
+		The values provided for these properties in the `options` argument or filled in as defaults.
+		These properties are present only if neither `minimumSignificantDigits` nor `maximumSignificantDigits`
+		was provided in the options argument.
+	**/
+	final maximumFractionDigits:Int;
+
+	final minimumSignificantDigits:Int;
+
+	/**
+		The values provided for these properties in the `options` argument or filled in as defaults.
+		These properties are present only if at least one of them was provided in the `options` argument.
+	**/
+	final maximumSignificantDigits:Int;
+}
+
+enum abstract PluralRulesType(String) {
+	/**
+		For cardinal numbers (refering to the quantity of things).
+	 */
+	var Cardinal = "cardinal";
+
+	/**
+		For ordinal number (refering to the ordering or ranking of things, e.g. "1st", "2nd", "3rd" in English).
+	 */
+	var Ordinal = "ordinal";
+}
+
+typedef PluralRulesSupportedLocalesOfOptions = {
+	/**
+		The locale matching algorithm to use.
+		The default is `BestFit`.
+	 */
+	var ?localeMatcher:LocaleMatcher;
+}
diff --git a/std/js/lib/intl/RelativeTimeFormat.hx b/std/js/lib/intl/RelativeTimeFormat.hx
new file mode 100644
index 0000000000000000000000000000000000000000..399fc75a4fbdeedee13a04dd60876215146a1af3
--- /dev/null
+++ b/std/js/lib/intl/RelativeTimeFormat.hx
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.intl;
+
+/**
+	The `RelativeTimeFormat` object is a constructor for objects that enable language-sensitive
+	relative time formatting.
+
+	Documentation [RelativeTimeFormat](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RelativeTimeFormat) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RelativeTimeFormat$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("Intl.RelativeTimeFormat")
+extern class RelativeTimeFormat {
+	@:overload(function(?locales:Array<String>, ?options:RelativeTimeFormatOptions):Void {})
+	@:pure function new(?locales:String, ?options:RelativeTimeFormatOptions);
+
+	/**
+		Formats a value and a unit according to the locale and formatting options
+		of the given Intl.RelativeTimeFormat object.
+	**/
+	@:pure function format(value:Float, unit:RelativeTimeUnit):String;
+
+	/**
+		Returns an Array of objects representing the relative time format in parts
+		that can be used for custom locale-aware formatting.
+	**/
+	@:pure function formatToParts(value:Float, unit:RelativeTimeUnit):Array<RelativeTimeFormatPart>;
+
+	/**
+		Returns a new object with properties reflecting the locale and formatting options
+		computed during initialization of the object.
+	**/
+	@:pure function resolvedOptions():RelativeTimeFormatResolvedOptions;
+
+	/**
+		Returns an array containing those of the provided locales that are supported
+		without having to fall back to the runtime's default locale.
+	**/
+	@:overload(function(locales:Array<String>, ?options:RelativeTimeFormatSupportedLocalesOfOptions):Array<String> {})
+	@:pure static function supportedLocalesOf(locales:String, ?options:RelativeTimeFormatSupportedLocalesOfOptions):Array<String>;
+}
+
+typedef RelativeTimeFormatOptions = {
+	/**
+		The locale matching algorithm to use.
+		The default is `BestFit`.
+		For information about this option, see [Intl](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_negotiation).
+	**/
+	var ?localeMatcher:LocaleMatcher;
+
+	/**
+		The format of output message.
+		The default value is `Always`.
+		The `Auto` value allows to not always have to use numeric values in the output.
+	**/
+	var ?numeric:RelativeTimeNumeric;
+
+	/**
+		The length of the internationalized message.
+		The default value is `Long`.
+		The `Narrow` style could be similar to the short style for some locales.
+	**/
+	var ?style:RelativeTimeFormatStyle;
+}
+
+typedef RelativeTimeFormatResolvedOptions = {
+	/**
+		The BCP 47 language tag for the locale actually used. If any Unicode extension values were requested in
+		the input BCP 47 language tag that led to this locale, the key-value pairs that were requested and are
+		supported for this locale are included in `locale`.
+	**/
+	final locale:String;
+
+	/**
+		The length of the internationalized message.
+	**/
+	final style:RelativeTimeFormatStyle;
+
+	/**
+		The format of output message.
+	**/
+	final numeric:RelativeTimeNumeric;
+
+	/**
+		The value requested using the Unicode extension key `"nu"` or filled in as a default.
+	**/
+	final numberingSystem:String;
+}
+
+enum abstract RelativeTimeNumeric(String) {
+	/**
+		(e.g., 1 day ago),
+	**/
+	var Always = "always";
+
+	/**
+		(e.g., yesterday).
+	**/
+	var Auto = "auto";
+}
+
+enum abstract RelativeTimeFormatStyle(String) {
+	/**
+		(e.g., in 1 month)
+	 */
+	var Long = "long";
+
+	/**
+		(e.g., in 1 mo.)
+	 */
+	var Short = "short";
+
+	/**
+		(e.g., in 1 mo.)
+	 */
+	var Narrow = "narrow";
+}
+
+enum abstract RelativeTimeUnit(String) from String to String {
+	var Year = "year";
+	var Quarter = "quarter";
+	var Month = "month";
+	var Week = "week";
+	var Day = "day";
+	var Hour = "hour";
+	var Minute = "minute";
+	var Second = "second";
+}
+
+typedef RelativeTimeFormatPart = {
+	final type:RelativeTimeFormatPartType;
+	final value:String;
+	final ?unit:RelativeTimeUnit;
+}
+
+typedef RelativeTimeFormatPartType = NumberFormat.NumberFormatPartType;
+
+typedef RelativeTimeFormatSupportedLocalesOfOptions = {
+	/**
+		The locale matching algorithm to use.
+		The default is `BestFit`.
+	 */
+	var ?localeMatcher:LocaleMatcher;
+}
diff --git a/std/js/lib/webassembly/CompileError.hx b/std/js/lib/webassembly/CompileError.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3af60c9a4d2ea5336f687b6217f53e1a08e0da62
--- /dev/null
+++ b/std/js/lib/webassembly/CompileError.hx
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.webassembly;
+
+/**
+	A WebAssembly `CompileError` object indicates an error during WebAssembly
+	decoding or validation.
+
+	Documentation [CompileError](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/CompileError) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/CompileError$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("WebAssembly.CompileError")
+extern class CompileError extends js.lib.Error {
+	function new(?message:String):Void;
+}
diff --git a/std/js/lib/webassembly/Global.hx b/std/js/lib/webassembly/Global.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2795dd60084ef740000cfc372b97dc6a61a0bb08
--- /dev/null
+++ b/std/js/lib/webassembly/Global.hx
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.webassembly;
+
+/**
+	A WebAssembly `Global` object represents a global variable instance, accessible from
+	both JavaScript and importable/exportable across one or more WebAssembly `Module` instances.
+	This allows dynamic linking of multiple modules.
+
+	Documentation [Global](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("WebAssembly.Global")
+extern class Global {
+	/**
+		The value contained inside the global variable — this can be used to directly set
+		and get the global's value.
+	**/
+	var value:Any;
+
+	@:pure function new(descriptor:GlobalDescriptor, value:Any):Void;
+
+	/**
+		Old-style method that returns the value contained inside the global variable.
+	 */
+	@:pure function valueOf():Any;
+}
+
+typedef GlobalDescriptor = {
+	var value:ValueType;
+
+	/**
+		By default, this is false.
+	 */
+	var ?mutable:Bool;
+}
+
+enum abstract ValueType(String) {
+	var I32 = "i32";
+	var I64 = "i64";
+	var F32 = "f32";
+	var F64 = "f64";
+}
diff --git a/std/js/lib/webassembly/Instance.hx b/std/js/lib/webassembly/Instance.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b5092953df362efeeb032fc5eb27aed1309423a1
--- /dev/null
+++ b/std/js/lib/webassembly/Instance.hx
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.webassembly;
+
+import haxe.Constraints.Function;
+
+/**
+	A WebAssembly `Instance` object is a stateful, executable instance of a WebAssembly `Module`.
+	Instance objects contain all the [Exported WebAssembly functions](https://developer.mozilla.org/en-US/docs/WebAssembly/Exported_functions)
+	that allow calling into WebAssembly code from JavaScript.
+
+	Documentation [Instance](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("WebAssembly.Instance")
+extern class Instance {
+	/**
+		Returns an object containing as its members all the functions exported from
+		the WebAssembly module instance, to allow them to be accessed and used by JavaScript.
+	**/
+	var exports(default, never):Dynamic<Function>;
+
+	@:pure function new(module:Module, ?importObject:{}):Void;
+}
diff --git a/std/js/html/ShadowElement.hx b/std/js/lib/webassembly/LinkError.hx
similarity index 61%
rename from std/js/html/ShadowElement.hx
rename to std/js/lib/webassembly/LinkError.hx
index eec7102c08d9efb829a19c39ac7a11c31c3451ff..e7cd8df0186924256cd00aff3c2c2c5f4731c5c8 100644
--- a/std/js/html/ShadowElement.hx
+++ b/std/js/lib/webassembly/LinkError.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,20 +20,15 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// This file is generated from mozilla\HTMLShadowElement.webidl. Do not edit!
-
-package js.html;
+package js.lib.webassembly;
 
 /**
-	The `HTMLShadowElement` interface represents a `shadow` HTML Element, which is used in Shadow DOM.
-
-	Documentation [HTMLShadowElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLShadowElement) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/API/HTMLShadowElement$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+	A WebAssembly `LinkError` object indicates an error during module instantiation
+	(besides [traps](http://webassembly.org/docs/semantics/#traps) from the start function).
 
-	@see <https://developer.mozilla.org/en-US/docs/Web/API/HTMLShadowElement>
+	Documentation [LinkError](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/LinkError) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/LinkError$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
 **/
-@:native("HTMLShadowElement")
-extern class ShadowElement extends Element
-{
-	var olderShadowRoot(default,null) : ShadowRoot;
-	
-}
\ No newline at end of file
+@:native("WebAssembly.LinkError")
+extern class LinkError extends js.lib.Error {
+	function new(?message:String):Void;
+}
diff --git a/std/js/lib/webassembly/Memory.hx b/std/js/lib/webassembly/Memory.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9db24b6f39f211aedb00bd134ad5f6d17b4ebd6f
--- /dev/null
+++ b/std/js/lib/webassembly/Memory.hx
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.webassembly;
+
+/**
+	A new WebAssembly `Memory` object which is a resizable ArrayBuffer that holds the raw bytes of memory
+	accessed by a WebAssembly WebAssembly `Instance`.
+
+	A memory created by JavaScript or in WebAssembly code will be accessible and mutable from
+	both JavaScript and WebAssembly.
+
+	Documentation [Memory](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Memory) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Memory$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("WebAssembly.Memory")
+extern class Memory {
+	/**
+		An accessor property that returns the buffer contained in the memory.
+	**/
+	final buffer:js.lib.ArrayBuffer;
+
+	@:pure function new(memoryDescriptor:MemoryDescriptor):Void;
+
+	/**
+		Increases the size of the memory instance by a specified number of WebAssembly pages
+		(each one is 64KB in size).
+	**/
+	function grow(number:Int):Int;
+}
+
+typedef MemoryDescriptor = {
+	/**
+		The initial size of the WebAssembly Memory, in units of WebAssembly pages.
+	**/
+	var initial:Int;
+
+	/**
+		The maximum size the WebAssembly Memory is allowed to grow to, in units of WebAssembly pages.
+		When present, the `maximum` parameter acts as a hint to the engine to reserve memory up front.
+		However, the engine may ignore or clamp this reservation request.
+		In general, most WebAssembly modules shouldn't need to set a `maximum`.
+	 */
+	var ?maximum:Int;
+}
diff --git a/std/js/lib/webassembly/Module.hx b/std/js/lib/webassembly/Module.hx
new file mode 100644
index 0000000000000000000000000000000000000000..63e038d4922a9d459e27fdc82d4429f89e89ad2f
--- /dev/null
+++ b/std/js/lib/webassembly/Module.hx
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.webassembly;
+
+import js.lib.BufferSource;
+
+/**
+	A WebAssembly `Module` object contains stateless WebAssembly code that has already
+	been compiled by the browser and can be efficiently [shared with Workers](https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage),
+	and instantiated multiple times. To instantiate the module, call
+	[the secondary overload of `WebAssembly.instantiate()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/instantiate#Secondary_overload_%E2%80%94_taking_a_module_object_instance).
+
+	Documentation [Module](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Module) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Module$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("WebAssembly.Module")
+extern class Module {
+	@:pure function new(bufferSource:BufferSource):Void;
+
+	/**
+		Given a `Module` and string, returns a copy of the contents of all custom sections
+		in the module with the given string name.
+	**/
+	@:pure static function customSections(module:Module, sectionName:String):Array<ArrayBuffer>;
+
+	/**
+		Given a `Module`, returns an array containing descriptions of all the declared exports.
+	**/
+	@:pure static function exports(module:Module):Array<ModuleExportDescriptor>;
+
+	/**
+		Given a `Module`, returns an array containing descriptions of all the declared imports.
+	**/
+	@:pure static function imports(module:Module):Array<ModuleImportDescriptor>;
+}
+
+typedef ModuleExportDescriptor = {
+	var name:String;
+	var kind:ImportExportKind;
+}
+
+typedef ModuleImportDescriptor = {
+	var module:String;
+	var name:String;
+	var kind:ImportExportKind;
+}
+
+enum abstract ImportExportKind(String) {
+	var Function = "function";
+	var Table = "table";
+	var Memory = "memory";
+	var Global = "global";
+}
diff --git a/std/js/lib/webassembly/RuntimeError.hx b/std/js/lib/webassembly/RuntimeError.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2f2827cb31e58b61eb91261965480c0eda09608d
--- /dev/null
+++ b/std/js/lib/webassembly/RuntimeError.hx
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.webassembly;
+
+/**
+	A WebAssembly `RuntimeError` object is thrown whenever WebAssembly specifies a
+	[trap](http://webassembly.org/docs/semantics/#traps).
+
+	Documentation [RuntimeError](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/RuntimeError) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/RuntimeError$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("WebAssembly.RuntimeError")
+extern class RuntimeError extends js.lib.Error {
+	function new(?message:String):Void;
+}
diff --git a/std/js/lib/webassembly/Table.hx b/std/js/lib/webassembly/Table.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5199b09c62f7e30251932ce23df5298b536ceff7
--- /dev/null
+++ b/std/js/lib/webassembly/Table.hx
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C)2005-2019 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 js.lib.webassembly;
+
+import haxe.Constraints.Function;
+
+/**
+	A Table object of the given size and element type.
+
+	This is a JavaScript wrapper object — an array-like structure representing a WebAssembly Table,
+	which stores function references. A table created by JavaScript or in WebAssembly code will be
+	accessible and mutable from both JavaScript and WebAssembly.
+
+	Documentation [Table](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Table) by [Mozilla Contributors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Table$history), licensed under [CC-BY-SA 2.5](https://creativecommons.org/licenses/by-sa/2.5/).
+**/
+@:native("WebAssembly.Table")
+extern class Table {
+	/**
+		Returns the length of the table, i.e. the number of elements.
+	**/
+	var length:Int;
+
+	@:pure function new(tableDescriptor:TableDescriptor):Void;
+
+	/**
+		Accessor function — gets the element stored at a given index.
+	**/
+	@:pure function get(index:Int):Function;
+
+	/**
+		Increases the size of the Table instance by a specified number of elements.
+	**/
+	function grow(number:Int):Int;
+
+	/**
+		Sets an element stored at a given index to a given value.
+	**/
+	function set(index:Int, value:Function):Void;
+}
+
+typedef TableDescriptor = {
+	/**
+		A string representing the type of value to be stored in the table.
+		At the moment this can only have a value of `Anyfunc` (functions).
+	**/
+	var element:TableKind;
+
+	/**
+		The initial number of elements of the WebAssembly Table.
+	**/
+	var initial:Int;
+
+	/**
+		The maximum number of elements the WebAssembly Table is allowed to grow to.
+	**/
+	var ?maximum:Int;
+}
+
+enum abstract TableKind(String) {
+	var Anyfunc = "anyfunc";
+}
diff --git a/std/js/swfobject/SWFObject.hx b/std/js/swfobject/SWFObject.hx
deleted file mode 100644
index 0b350824488999e7bc191ff1270e99ae7859b477..0000000000000000000000000000000000000000
--- a/std/js/swfobject/SWFObject.hx
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C)2005-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 js.swfobject;
-
-import js.html.*;
-import haxe.extern.*;
-
-typedef SWFObjectEvent = {
-	/**
-		Boolean to indicate whether the creation of a Flash plugin-in <object> DOM was successful or not
-	*/
-	var success:Bool;
-	/**
-		String indicating the ID used in swfobject.registerObject
-	*/
-	var id:String;
-	/**
-		HTML object element reference (null when success==false)
-	*/
-	@:optional var ref:Element;
-}
-
-/**
-	For detecting the Adobe Flash Player plugin and embedding Flash (swf) files.
-*/
-@:native("swfobject")
-extern class SWFObject {
-	/**
-		Embed Flash content and alternative content using standards compliant markup (the nested-objects method with proprietary Internet Explorer conditional comments), and use JavaScript to resolve the issues that markup alone cannot solve (also called static publishing).
-	*/
-	static function registerObject(objectIdStr:String, swfVersionStr:String, xiSwfUrlStr:String, callbackFn:SWFObjectEvent->Void):Void;
-	/**
-		NOTE: For static publishing only (or: when using swfobject.registerObject() only)
-
-		Returns the active object element. One of the side-effects of the nested-objects approach is that per SWF there are two object elements available in the HTML code, however you can only use one id or name attribute, because these have to be unique within a web page.
-	*/
-	static function getObjectById(objectIdStr:String):Element;
-	/**
-		Insert alternative content using standards compliant markup and embed Flash content with unobtrusive JavaScript (also called dynamic publishing).
-	*/
-	static function embedSWF(swfUrlStr:String, replaceElemIdStr:String, widthStr:String, heightStr:String, swfVersionStr:String, xiSwfUrlStr:String, flashvarsObj:Dynamic, parObj:Dynamic, attObj:Dynamic, callbackFn:SWFObjectEvent->Void):Void;
-	/**
-		Disable SWFObject's default show/hide behavior
-	*/
-	static function switchOffAutoHideShow():Void;
-	static function enableUriEncoding(bool:Bool):Void;
-	static var ua:{
-		/**
-			a Boolean whether or not W3C DOM methods are supported
-		*/
-		var w3:Bool;
-		/**
-			an Array that contains the major, minor and release version number of the Flash Player
-		*/
-		var pv:Array<Int>;
-		/**
-			the Webkit version or false if not Webkit
-		*/
-		var wk:EitherType<Float, Bool>;
-		/**
-			a Boolean to indicate whether a visitor uses Internet Explorer on Windows or not
-		*/
-		var ie:Bool;
-		/**
-			a Boolean to indicate whether a visitor uses Mac OS or not
-		*/
-		var mac:Bool;
-	};
-	/**
-		Returns a JavaScript object containing the major version (major:Number), minor version (minor:Number) and release version (release:Number) of an installed Flash player. Please note that while Flash version numbers normally consist of major.minor.release.build, SWFObject only looks at the first 3 numbers, so both "WIN 9,0,18,0" (IE) or "Shockwave Flash 9 r18" (all other browsers) will translate to "9.0.18".
-	*/
-	static function getFlashPlayerVersion():{ major:Int, minor:Int, release:Int };
-	/**
-		Returns a Boolean to indicate whether or not a specific minimum version of the Flash plugin is installed. Please note that while Flash version numbers normally consist of major.minor.release.build, SWFObject only looks at the first 3 numbers, so both "WIN 9,0,18,0" (IE) or "Shockwave Flash 9 r18" (all other browsers) will translate to "9.0.18".
-	*/
-	static function hasFlashPlayerVersion(versionStr:String):Bool;
-	/**
-		Exposes SWFObject's internal cross-browser method to create a SWF.
-	*/
-	static function createSWF(attObj:Dynamic, parObj:Dynamic, replaceElemIdStr:String):Element;
-	/**
-		Enables developers to reuse SWFObject's internal methods to create their custom Express Install and activate it via the API
-	*/
-	static function showExpressInstall(att:Dynamic, par:Dynamic, replaceElemIdStr:String, callbackFn:SWFObjectEvent->Void):Bool;
-	/**
-		Removes a SWF from your web page. Is especially built to safely (only remove a SWF after it has been loaded, to avoid broken references) and completely (nullify references to avoid memory leaks) remove a SWF in Internet Explorer.
-	*/
-	static function removeSWF(objElemIdStr:String):Void;
-	/**
-		Exposes SWFObject's internal cross-browser method to create a dynamic stylesheet. It's most important feature is that it can be called before the DOM of a page is loaded.
-	*/
-	static function createCSS(selStr:String, declStr:String, ?mediaStr:String, ?newStyleBoolean:Bool):Void;
-	/**
-		A cross-browser method to execute a function as soon as the DOM of a web page is available. This method is supported by Gecko based browsers - like Firefox -, IE, Opera9+, and, Safari. For all other browsers the method will fall back to the addLoadEvent method. 
-	*/
-	static function addDomLoadEvent(fn:Void->Void):Void;
-	/**
-		A safe (it doesn't overwrite existing onload events) cross-browser method to execute a function on the window onload event (which will fire as soon as a web page including all of its assets are loaded).
-	*/
-	static function addLoadEvent(fn:Void->Void):Void;
-	/**
-		Utility function that returns the value of the paramStr parameter in the URL query string or hash string. Similar functionality was already available in SWFObject 1.5 and lower.
-	*/
-	static function getQueryParamValue(param:String):String;
-	/**
-		swfobject version
-	*/
-	static var version:String;
-}
\ No newline at end of file
diff --git a/std/jvm/DynamicObject.hx b/std/jvm/DynamicObject.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f855b38097f77d97af190b63b24674015b0a4bf5
--- /dev/null
+++ b/std/jvm/DynamicObject.hx
@@ -0,0 +1,93 @@
+package jvm;
+
+import haxe.ds.StringMap;
+
+@:keep
+@:native('haxe.jvm.DynamicObject')
+@:nativeGen
+class DynamicObject implements java.lang.Cloneable extends Object {
+	static var __hx_toString_depth = 0;
+
+	var _hx_fields:Null<StringMap<Dynamic>>;
+
+	public var _hx_deletedAField:Null<Bool>;
+
+	public function toString() {
+		if (__hx_toString_depth >= 5) {
+			return "...";
+		}
+		++__hx_toString_depth;
+		_hx_initReflection();
+		if (_hx_hasField("toString")) {
+			--__hx_toString_depth;
+			return _hx_getField("toString")();
+		}
+		var buf = new StringBuf();
+		buf.addChar("{".code);
+		var first = true;
+		try {
+			for (key in _hx_fields.keys()) {
+				if (first)
+					first = false
+				else
+					buf.add(", ");
+				buf.add(key);
+				buf.add(": ");
+				buf.add(_hx_fields.get(key));
+			}
+		} catch (e:Dynamic) {
+			--__hx_toString_depth;
+			throw(e);
+		}
+		--__hx_toString_depth;
+		buf.addChar("}".code);
+		return buf.toString();
+	}
+
+	final public function _hx_deleteField(name:String) {
+		_hx_initReflection();
+		_hx_deletedAField = true;
+		try {
+			Jvm.writeFieldNoObject(this, name, null);
+		} catch (_:Dynamic) {}
+		return _hx_fields.remove(name);
+	}
+
+	final public function _hx_getFields() {
+		_hx_initReflection();
+		return [for (key in _hx_fields.keys()) key];
+	}
+
+	override public function _hx_getField<T>(name:String) {
+		_hx_initReflection();
+		return _hx_fields.get(name);
+	}
+
+	final public function _hx_hasField(name:String) {
+		_hx_initReflection();
+		return _hx_fields.exists(name);
+	}
+
+	override public function _hx_setField(name:String, value:Dynamic) {
+		_hx_initReflection();
+		_hx_fields.set(name, value);
+	}
+
+	final public function _hx_clone() {
+		var clone:DynamicObject = (cast this : java.lang.Object).clone();
+		if (_hx_fields != null) {
+			clone._hx_fields = this._hx_fields.copy();
+		}
+		return clone;
+	}
+
+	final function _hx_initReflection() {
+		if (_hx_fields == null) {
+			_hx_fields = _hx_getKnownFields();
+		}
+	}
+
+	function _hx_getKnownFields():StringMap<Dynamic> {
+		return new StringMap();
+	}
+}
diff --git a/std/jvm/EmptyConstructor.hx b/std/jvm/EmptyConstructor.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2d3d9d3924b0630d246f86d702b81d7315f9360b
--- /dev/null
+++ b/std/jvm/EmptyConstructor.hx
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C)2005-2019 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 jvm;
+
+@:keep
+@:native('haxe.jvm.EmptyConstructor')
+class EmptyConstructor {}
diff --git a/std/jvm/Enum.hx b/std/jvm/Enum.hx
new file mode 100644
index 0000000000000000000000000000000000000000..70beb157a5e1dcf3f1342caa84ee569b31ec51a3
--- /dev/null
+++ b/std/jvm/Enum.hx
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C)2005-2019 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 jvm;
+
+import java.NativeArray;
+
+@:keep
+@:native('haxe.jvm.Enum')
+class Enum<T> extends java.lang.Enum<T> {
+	@:nativeGen public function new(index:Int, name:String) {
+		super(name, index);
+	}
+
+	public function _hx_getParameters() {
+		return new java.NativeArray(0);
+	}
+
+	@:overload
+	override public function toString() {
+		var baseName = Type.getEnumConstructs(Type.getEnum(cast this))[ordinal()];
+		var parameters = Type.enumParameters(cast this);
+		if (parameters.length == 0) {
+			return baseName;
+		}
+		return '$baseName(${@:privateAccess parameters.join(",")})';
+	}
+}
diff --git a/std/php7/_std/sys/net/Host.hx b/std/jvm/Exception.hx
similarity index 59%
rename from std/php7/_std/sys/net/Host.hx
rename to std/jvm/Exception.hx
index acc0ac185077f12b759b3dc4a5ee1f0c330a9eab..1a7cf5e8069822df51c5036cef669394efb7699f 100644
--- a/std/php7/_std/sys/net/Host.hx
+++ b/std/jvm/Exception.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,43 +19,42 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package sys.net;
 
-import php.Global.*;
-import php.SuperGlobal.*;
+package jvm;
 
-@:coreApi
-class Host {
+@:keep
+@:native('haxe.jvm.Exception')
+class Exception<T> extends java.lang.Exception {
+	static public var exception = new java.lang.ThreadLocal<java.lang.Throwable>();
 
-	public var host(default,null) : String;
+	static public function setException(exc:java.lang.Throwable) {
+		exception.set(exc);
+	}
 
-	private var _ip : String;
-	public var ip(default,null) : Int;
+	static public function currentException() {
+		return exception.get();
+	}
 
-	public function new( name : String ) : Void {
-		host = name;
-		if(~/^(\d{1,3}\.){3}\d{1,3}$/.match(name)) {
-		  _ip = name;
-		} else {
-			_ip = gethostbyname(name);
-			if(_ip == name) {
-				ip = 0;
-				return;
-			}
-		}
-		var p = _ip.split('.');
-		ip = intval(sprintf('%02X%02X%02X%02X', p[3], p[2], p[1], p[0]), 16);
+	public var value:T;
+
+	public function new(value:T) {
+		super();
+		this.value = value;
 	}
 
-	public function toString() : String {
-		return _ip;
+	@:overload override public function toString() {
+		return Std.string(value);
 	}
 
-	public function reverse() : String {
-		return gethostbyaddr(_ip);
+	public function unwrap() {
+		return value;
 	}
 
-	public static function localhost() : String {
-		return _SERVER['HTTP_HOST'];
+	static public function wrap<T>(t:Null<T>) {
+		if (Jvm.instanceof(t, java.lang.Exception)) {
+			return (cast t : java.lang.Exception);
+		} else {
+			return new Exception(t);
+		}
 	}
 }
diff --git a/std/jvm/Jvm.hx b/std/jvm/Jvm.hx
new file mode 100644
index 0000000000000000000000000000000000000000..65b0ff6c8f430d87464c9f65b40ffa149d5e2006
--- /dev/null
+++ b/std/jvm/Jvm.hx
@@ -0,0 +1,531 @@
+/*
+ * Copyright (C)2005-2019 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 jvm;
+
+import haxe.extern.Rest;
+import haxe.Constraints;
+import Enum;
+import jvm.DynamicObject;
+import jvm.Exception;
+import jvm.EmptyConstructor;
+import jvm.Object;
+import jvm.annotation.ClassReflectionInformation;
+import jvm.annotation.EnumReflectionInformation;
+import jvm.annotation.EnumValueReflectionInformation;
+import java.lang.invoke.*;
+import java.NativeArray;
+import java.Init;
+import haxe.ds.Vector;
+import haxe.ds.Option;
+
+@:keep
+@:native('haxe.jvm.Jvm')
+class Jvm {
+	extern static public function instanceof<S, T>(obj:S, type:T):Bool;
+
+	extern static public function referenceEquals<T>(v1:T, v2:T):Bool;
+
+	extern static public function invokedynamic<T>(bootstrapMethod:Function, fieldName:String, staticArguments:Array<Dynamic>, rest:Rest<Dynamic>):T;
+
+	static public function stringCompare(v1:String, v2:String):Int {
+		if (v1 == null) {
+			return v2 == null ? 0 : 1;
+		}
+		if (v2 == null) {
+			return -1;
+		}
+		return (cast v1 : java.NativeString).compareTo(v2);
+	}
+
+	static public function compare<T>(v1:T, v2:T):Int {
+		return Reflect.compare(v1, v2);
+	}
+
+	// calls
+
+	static public function getArgumentTypes(args:NativeArray<Dynamic>):NativeArray<java.lang.Class<Dynamic>> {
+		var argTypes:NativeArray<java.lang.Class<Dynamic>> = new NativeArray(args.length);
+		for (i in 0...args.length) {
+			var arg = (cast args[i] : java.lang.Object);
+			argTypes[i] = arg == null ? (cast java.lang.Object) : arg.getClass();
+		}
+		return argTypes;
+	}
+
+	static public function unifyCallArguments(args:NativeArray<Dynamic>, params:NativeArray<java.lang.Class<Dynamic>>,
+			allowPadding:Bool = false):Option<NativeArray<Dynamic>> {
+		var callArgs:NativeArray<Dynamic> = {
+			if (args.length < params.length) {
+				var callArgs = new NativeArray(params.length);
+				Vector.blit(cast args, 0, cast callArgs, 0, args.length);
+				callArgs;
+			} else {
+				Vector.fromData(args).copy().toData();
+			}
+		}
+		if (params.length < args.length) {
+			return None;
+		}
+		for (i in 0...params.length) {
+			var paramType = params[i];
+			if (i >= args.length) {
+				if (paramType == cast Bool) {
+					callArgs[i] = false;
+				} else if (paramType == cast Float) {
+					callArgs[i] = 0.0;
+				} else if (paramType == cast Int) {
+					callArgs[i] = 0;
+				} else {
+					if (!allowPadding) {
+						return None;
+					}
+					callArgs[i] = null;
+				}
+				continue;
+			}
+			var argValue = args[i];
+			if (argValue == null) {
+				if (paramType.isPrimitive()) {
+					if (paramType == cast Bool) {
+						callArgs[i] = false;
+					} else if (paramType == cast Float) {
+						callArgs[i] = 0.0;
+					} else if (paramType == cast Int) {
+						callArgs[i] = 0;
+					} else {
+						throw 'Unexpected basic type: $paramType';
+					}
+				} else {
+					callArgs[i] = null;
+				}
+				continue;
+			};
+			var argType = (argValue : java.lang.Object).getClass();
+			var arg = getWrapperClass(paramType);
+			if (arg.isAssignableFrom(argType)) {
+				callArgs[i] = args[i];
+				continue;
+			}
+			if (arg == (cast java.lang.Double.DoubleClass) && argType == cast java.lang.Integer.IntegerClass) {
+				callArgs[i] = nullIntToNullFloat(args[i]);
+			} else {
+				return None;
+			}
+		}
+		return Some(callArgs);
+	}
+
+	static public function call(mh:java.lang.invoke.MethodHandle, args:NativeArray<Dynamic>) {
+		var params = mh.type().parameterArray();
+		return switch (unifyCallArguments(args, params, true)) {
+			case Some(args): mh.invokeWithArguments(args);
+			case None: mh.invokeWithArguments(args);
+		}
+	}
+
+	// casts
+
+	static public function dynamicToNullFloat<T>(d:T):Null<Float> {
+		if (instanceof(d, java.lang.Integer.IntegerClass)) {
+			return nullIntToNullFloat(cast d);
+		}
+		// TODO: need a better strategy to avoid infinite recursion here
+		return cast d;
+	}
+
+	static public function nullIntToNullFloat(i:Null<Int>):Null<Float> {
+		if (i == null) {
+			return null;
+		}
+		return (cast i : java.lang.Number).intValue();
+	}
+
+	static public function toByte(d:Dynamic) {
+		return d == null ? 0 : (d : java.lang.Byte).byteValue();
+	}
+
+	static public function toChar(d:Dynamic) {
+		return d == null ? 0 : (d : java.lang.Character).charValue();
+	}
+
+	static public function toDouble(d:Dynamic) {
+		return d == null ? 0. : (d : java.lang.Number).doubleValue();
+	}
+
+	static public function toFloat(d:Dynamic):Single {
+		return d == null ? 0. : (d : java.lang.Number).floatValue();
+	}
+
+	static public function toInt(d:Dynamic) {
+		return d == null ? 0 : (d : java.lang.Number).intValue();
+	}
+
+	static public function toLong(d:Dynamic) {
+		return d == null ? 0 : (d : java.lang.Long).longValue();
+	}
+
+	static public function toShort(d:Dynamic) {
+		return d == null ? 0 : (d : java.lang.Short).shortValue();
+	}
+
+	static public function toBoolean(d:Dynamic) {
+		return d == null ? false : (d : java.lang.Boolean).booleanValue();
+	}
+
+	static public function getWrapperClass<S, T>(c:java.lang.Class<S>):java.lang.Class<S> {
+		if (!c.isPrimitive()) {
+			return c;
+		}
+		// TODO: other basic types
+		return if (c == cast Int) {
+			cast java.lang.Integer.IntegerClass;
+		} else if (c == cast Float) {
+			cast java.lang.Double.DoubleClass;
+		} else if (c == cast Bool) {
+			cast java.lang.Boolean.BooleanClass;
+		} else {
+			c;
+		}
+	}
+
+	// access
+
+	static public function arrayRead(obj:Dynamic, index:Int) {
+		if (instanceof(obj, Array)) {
+			return (obj : Array<Dynamic>)[index];
+		}
+		throw 'Cannot array-read on $obj';
+	}
+
+	static public function arrayWrite(obj:Dynamic, index:Int, value:Dynamic):Void {
+		if (instanceof(obj, Array)) {
+			(obj : Array<Dynamic>)[index] = value;
+			return;
+		}
+		throw 'Cannot array-write on $obj';
+	}
+
+	static public function bootstrap(caller:MethodHandles.MethodHandles_Lookup, name:String, type:MethodType):CallSite {
+		var handle = caller.findStatic(caller.lookupClass(), name, type);
+		return new ConstantCallSite(handle);
+	}
+
+	static public function readFieldNoObject(obj:Dynamic, name:String):Dynamic {
+		var isStatic = instanceof(obj, java.lang.Class);
+		var cl = isStatic ? obj : (obj : java.lang.Object).getClass();
+		try {
+			var field = cl.getField(name);
+			field.setAccessible(true);
+			return field.get(obj);
+		} catch (_:java.lang.NoSuchFieldException) {
+			while (cl != null) {
+				var methods = cl.getMethods();
+				for (m in methods) {
+					if (m.getName() == name) {
+						var method = java.lang.invoke.MethodHandles.lookup().unreflect(m);
+						if (!isStatic || cl == cast java.lang.Class) {
+							method = method.bindTo(obj);
+						}
+						return method;
+					}
+				}
+				if (isStatic) {
+					if (cl == cast java.lang.Class) {
+						break;
+					}
+					cl = cast java.lang.Class;
+				} else {
+					cl = cl.getSuperclass();
+				}
+			}
+			return null;
+		}
+	}
+
+	static public function readField(obj:Dynamic, name:String):Dynamic {
+		if (obj == null || name == null) {
+			return null;
+		}
+		if (instanceof(obj, jvm.Object)) {
+			return (cast obj : jvm.Object)._hx_getField(name);
+		}
+		if (instanceof(obj, java.NativeString)) {
+			switch (name) {
+				case "length":
+					return (obj : String).length;
+				case "charAt":
+					return (cast jvm.StringExt.charAt : java.lang.invoke.MethodHandle).bindTo(obj);
+				case "charCodeAt":
+					return (cast jvm.StringExt.charCodeAt : java.lang.invoke.MethodHandle).bindTo(obj);
+				case "indexOf":
+					return (cast jvm.StringExt.indexOf : java.lang.invoke.MethodHandle).bindTo(obj);
+				case "iterator":
+					return function() return new haxe.iterators.StringIterator(obj);
+				case "keyValueIterator":
+					return function() return new haxe.iterators.StringKeyValueIterator(obj);
+				case "lastIndexOf":
+					return (cast jvm.StringExt.lastIndexOf : java.lang.invoke.MethodHandle).bindTo(obj);
+				case "split":
+					return (cast jvm.StringExt.split : java.lang.invoke.MethodHandle).bindTo(obj);
+				case "substr":
+					return (cast jvm.StringExt.substr : java.lang.invoke.MethodHandle).bindTo(obj);
+				case "substring":
+					return (cast jvm.StringExt.substring : java.lang.invoke.MethodHandle).bindTo(obj);
+				case "toLowerCase":
+					return (cast jvm.StringExt.toLowerCase : java.lang.invoke.MethodHandle).bindTo(obj);
+				case "toUpperCase":
+					return (cast jvm.StringExt.toUpperCase : java.lang.invoke.MethodHandle).bindTo(obj);
+			}
+		}
+		return readFieldNoObject(obj, name);
+	}
+
+	static public function writeFieldNoObject<T>(obj:Dynamic, name:String, value:T) {
+		try {
+			var cl = (obj : java.lang.Object).getClass();
+			var field = cl.getField(name);
+			field.setAccessible(true);
+			try {
+				field.set(obj, value);
+			} catch (_:java.lang.IllegalArgumentException) {
+				if (value == null) {
+					field.setByte(obj, 0); // rely on widening
+				} else if (field.getType() == (cast Int) && instanceof(value, java.lang.Number)) {
+					// Can happen with ++ on Dynamic because that defaults to Float
+					field.setInt(obj, (cast value : java.lang.Number).intValue());
+				}
+			}
+		} catch (_:java.lang.NoSuchFieldException) {
+			return;
+		}
+	}
+
+	static public function writeField<T>(obj:Dynamic, name:String, value:T) {
+		if (obj == null || name == null) {
+			return;
+		}
+		if (instanceof(obj, Object)) {
+			return (obj : Object)._hx_setField(name, value);
+		}
+		writeFieldNoObject(obj, name, value);
+	}
+
+	// string
+
+	static public function toString<T:java.lang.Object>(obj:T):String {
+		if (obj == null) {
+			return "null";
+		} else if (instanceof(obj, java.lang.Double.DoubleClass)) {
+			var n:java.lang.Number = cast obj;
+			if (n.doubleValue() == n.intValue()) {
+				return java.lang.Integer.IntegerClass.valueOf(n.intValue()).toString();
+			}
+			return obj.toString();
+		} else {
+			return obj.toString();
+		}
+	}
+
+	static public function stringConcat<A:java.lang.Object, B:java.lang.Object>(a:A, b:B):String {
+		return (cast toString(a) : java.NativeString).concat(toString(b));
+	}
+
+	// ops
+
+	static public function opAdd<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.NativeString) || instanceof(b, java.NativeString)) {
+			return stringConcat(a, b);
+		}
+		if (instanceof(a, java.lang.Double.DoubleClass) || instanceof(b, java.lang.Double.DoubleClass)) {
+			return toDouble(a) + toDouble(b);
+		}
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) + toLong(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) + toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opSub<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.lang.Double.DoubleClass) || instanceof(b, java.lang.Double.DoubleClass)) {
+			return toDouble(a) - toDouble(b);
+		}
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) - toLong(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) - toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opMul<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.lang.Double.DoubleClass) || instanceof(b, java.lang.Double.DoubleClass)) {
+			return toDouble(a) * toDouble(b);
+		}
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) * toLong(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) * toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opDiv<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.lang.Double.DoubleClass) || instanceof(b, java.lang.Double.DoubleClass)) {
+			return toDouble(a) / toDouble(b);
+		}
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) / toLong(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) / toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opMod<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.lang.Double.DoubleClass) || instanceof(b, java.lang.Double.DoubleClass)) {
+			return toDouble(a) % toDouble(b);
+		}
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) % toLong(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) % toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opAnd<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) & toLong(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) & toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opOr<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) | toLong(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) | toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opXor<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) ^ toLong(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) ^ toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opShl<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) << toInt(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) << toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opShr<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) >> toInt(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) >> toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opUshr<T1:java.lang.Object, T2:java.lang.Object>(a:T1, b:T2):Dynamic {
+		if (instanceof(a, java.lang.Long.LongClass) || instanceof(b, java.lang.Long.LongClass)) {
+			return toLong(a) >>> toInt(b);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass) || instanceof(b, java.lang.Integer.IntegerClass)) {
+			return toInt(a) >>> toInt(b);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opIncrement<T1:java.lang.Object>(a:T1):Dynamic {
+		if (instanceof(a, java.lang.Double.DoubleClass)) {
+			return toDouble(a) + 1.;
+		}
+		if (instanceof(a, java.lang.Long.LongClass)) {
+			return toLong(a) + 1.;
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass)) {
+			return toInt(a) + 1;
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opDecrement<T1:java.lang.Object>(a:T1):Dynamic {
+		if (instanceof(a, java.lang.Double.DoubleClass)) {
+			return toDouble(a) - 1.;
+		}
+		if (instanceof(a, java.lang.Long.LongClass)) {
+			return toLong(a) - 1.;
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass)) {
+			return toInt(a) - 1;
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opNeg<T1:java.lang.Object>(a:T1):Dynamic {
+		if (instanceof(a, java.lang.Double.DoubleClass)) {
+			return -toDouble(a);
+		}
+		if (instanceof(a, java.lang.Long.LongClass)) {
+			return -toLong(a);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass)) {
+			return -toInt(a);
+		}
+		throw "Invalid operation";
+	}
+
+	static public function opNegBits<T1:java.lang.Object>(a:T1):Dynamic {
+		if (instanceof(a, java.lang.Long.LongClass)) {
+			return ~toLong(a);
+		}
+		if (instanceof(a, java.lang.Integer.IntegerClass)) {
+			return ~toInt(a);
+		}
+		throw "Invalid operation";
+	}
+}
diff --git a/std/jvm/NativeTools.hx b/std/jvm/NativeTools.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e87fd56ad6d41e7d42b24889d18cd493e5634f36
--- /dev/null
+++ b/std/jvm/NativeTools.hx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)2005-2019 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 jvm;
+
+extern class ObjectTools {
+	static public inline function object<T>(t:T):java.lang.Object {
+		return cast t;
+	}
+}
+
+extern class NativeClassTools {
+	static public inline function native<T>(c:Class<T>):java.lang.Class<T> {
+		return cast c;
+	}
+
+	static public inline function haxe<T>(c:java.lang.Class<T>):Class<T> {
+		return cast c;
+	}
+
+	static public inline function haxeEnum<T>(c:java.lang.Class<T>):std.Enum<T> {
+		return cast c;
+	}
+}
+
+extern class NativeEnumTools {
+	static public inline function native<T>(e:std.Enum<Dynamic>):java.lang.Class<T> {
+		return cast e;
+	}
+}
diff --git a/std/java/internal/Iterator.hx b/std/jvm/Object.hx
similarity index 76%
rename from std/java/internal/Iterator.hx
rename to std/jvm/Object.hx
index dca2df64fcad113d0e410c6c6a6a59aa64912a97..05f8adf94dc0093133868cc623fee32c8c3ff470 100644
--- a/std/java/internal/Iterator.hx
+++ b/std/jvm/Object.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,24 +19,20 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package java.internal;
-/* TODO (see Gencommon.IteratorsInterfaceModf)
-@:native('haxe.lang.Iterator')
-@:keep
-interface Iterator<T>
-{
-
-	public function hasNext():Bool;
 
-	public function next():T;
+package jvm;
 
-}
-
-@:native('haxe.lang.Iterable')
 @:keep
-interface Iterable<T>
-{
+@:native('haxe.jvm.Object')
+@:nativeGen
+class Object {
+	public function new() {}
 
-	public function iterator():Iterator<T>;
+	public function _hx_getField(name:String) {
+		return Jvm.readFieldNoObject(this, name);
+	}
 
-}*/
\ No newline at end of file
+	public function _hx_setField(name:String, value:Dynamic) {
+		return Jvm.writeFieldNoObject(this, name, value);
+	}
+}
diff --git a/std/jvm/StringExt.hx b/std/jvm/StringExt.hx
new file mode 100644
index 0000000000000000000000000000000000000000..69e340719cc1989f4103fea53aebc86f30d721fa
--- /dev/null
+++ b/std/jvm/StringExt.hx
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C)2005-2019 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 jvm;
+
+import java.NativeString;
+
+@:native("haxe.jvm.StringExt")
+class StringExt {
+	public static function fromCharCode(code:Int):String {
+		var a = new java.NativeArray(1);
+		a[0] = code;
+		return new String(a, 0, 1);
+	}
+
+	public static function charAt(me:String, index:Int):String {
+		if (index >= me.length || index < 0)
+			return "";
+		else
+			return java.lang.Character._toString((cast me : NativeString).charAt(index));
+	}
+
+	public static function charCodeAt(me:String, index:Int):Null<Int> {
+		if (index >= me.length || index < 0)
+			return null;
+		else
+			return cast((cast me : NativeString).charAt(index), Int);
+	}
+
+	public static function indexOf(me:String, str:String, startIndex:Null<Int>) {
+		return if (startIndex == null) (cast me : NativeString).indexOf(str) else (cast me : NativeString).indexOf(str, startIndex);
+	}
+
+	public static function lastIndexOf(me:String, str:String, ?startIndex:Int):Int {
+		if (startIndex == null || startIndex > me.length || startIndex < 0) {
+			startIndex = me.length - 1;
+		}
+		return (cast me : NativeString).lastIndexOf(str, startIndex);
+	}
+
+	public static function split(me:String, delimiter:String):Array<String> {
+		var ret = [];
+		if (delimiter.length == 0) {
+			for (i in 0...me.length) {
+				ret.push(me.charAt(i));
+			}
+		} else {
+			var start = 0;
+			var pos = me.indexOf(delimiter, start);
+			while (pos >= 0) {
+				ret.push((cast me : NativeString).substring(start, pos));
+				start = pos + delimiter.length;
+				pos = me.indexOf(delimiter, start);
+			}
+			ret.push((cast me : NativeString).substring(start));
+		}
+		return ret;
+	}
+
+	public static function substr(me:String, pos:Int, ?len:Int):String {
+		var len:Int = len == null ? me.length : len;
+		if (pos != 0 && len < 0) {
+			return "";
+		}
+		if (pos < 0) {
+			pos = me.length + pos;
+			if (pos < 0) {
+				pos = 0;
+			}
+		} else if (len < 0) {
+			len = me.length + len - pos;
+		}
+		if (pos + len > me.length) {
+			len = me.length - pos;
+		}
+		if (pos < 0 || len <= 0) {
+			return "";
+		}
+		return (cast me : NativeString).substring(pos, pos + len);
+	}
+
+	public static function substring(me:String, startIndex:Int, ?endIndex:Int):String {
+		var endIndex:Int = endIndex == null ? me.length : endIndex;
+		if (endIndex < 0) {
+			endIndex = 0;
+		} else if (endIndex > me.length) {
+			endIndex = me.length;
+		}
+		if (startIndex < 0) {
+			startIndex = 0;
+		} else if (startIndex > me.length) {
+			startIndex = me.length;
+		}
+
+		if (startIndex > endIndex) {
+			var tmp = startIndex;
+			startIndex = endIndex;
+			endIndex = tmp;
+		}
+		return (cast me : NativeString).substring(startIndex, endIndex);
+	}
+
+	public static function toLowerCase(me:String):String {
+		return me.toLowerCase();
+	}
+
+	public static function toUpperCase(me:String):String {
+		return me.toUpperCase();
+	}
+}
diff --git a/std/jvm/_std/Reflect.hx b/std/jvm/_std/Reflect.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4b587c1d60ec496bb9530df2348cc57b181fb942
--- /dev/null
+++ b/std/jvm/_std/Reflect.hx
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+import jvm.Jvm;
+
+@:coreApi
+class Reflect {
+	public static function hasField(o:Dynamic, field:String):Bool {
+		if (!Jvm.instanceof(o, jvm.DynamicObject)) {
+			var c:java.lang.Class<Dynamic> = Jvm.instanceof(o, java.lang.Class) ? cast o : (cast o : java.lang.Object).getClass();
+			try {
+				c.getField(field);
+				return true;
+			} catch (e:Dynamic) {
+				return false;
+			}
+		}
+		return (cast o : jvm.DynamicObject)._hx_hasField(field);
+	}
+
+	public static function field(o:Dynamic, field:String):Dynamic {
+		return Jvm.readField(o, field);
+	}
+
+	public static function setField(o:Dynamic, field:String, value:Dynamic):Void {
+		Jvm.writeField(o, field, value);
+	}
+
+	public static function getProperty(o:Dynamic, field:String):Dynamic {
+		var f = Reflect.field(o, "get_" + field);
+		if (f != null) {
+			return f();
+		}
+		return Reflect.field(o, field);
+	}
+
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void {
+		var f = Reflect.field(o, "set_" + field);
+		if (f != null) {
+			f(value);
+			return;
+		}
+		Reflect.setField(o, field, value);
+	}
+
+	public static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic {
+		return Jvm.call(cast func, @:privateAccess args.getNative());
+	}
+
+	public static function fields(o:Dynamic):Array<String> {
+		if (!Jvm.instanceof(o, jvm.DynamicObject)) {
+			if (Jvm.instanceof(o, java.lang.Class)) {
+				return Type.getClassFields(o);
+			}
+			var c = (o : java.lang.Object).getClass();
+			var ret = [];
+			for (f in c.getDeclaredFields()) {
+				if (java.lang.reflect.Modifier.isStatic(f.getModifiers()) == false && !f.isSynthetic()) {
+					ret.push(f.getName());
+				}
+			}
+			return ret;
+		}
+		return (cast o : jvm.DynamicObject)._hx_getFields();
+	}
+
+	public static function isFunction(f:Dynamic):Bool {
+		return Jvm.instanceof(f, java.lang.invoke.MethodHandle);
+	}
+
+	public static function compare<T>(a:T, b:T):Int {
+		if (Jvm.referenceEquals(a, b)) {
+			return 0;
+		}
+		if (a == null) {
+			return -1;
+		}
+		if (b == null) {
+			return 1;
+		}
+		if (Jvm.instanceof(a, java.lang.Number) && Jvm.instanceof(b, java.lang.Number)) {
+			return java.lang.Long.compare((cast a : java.lang.Number).longValue(), (cast b : java.lang.Number).longValue());
+		}
+		if (Jvm.instanceof(a, java.NativeString)) {
+			if (!Jvm.instanceof(b, java.NativeString)) {
+				return -1;
+			}
+			return (cast a : java.NativeString).compareTo(cast b);
+		}
+		return -1;
+	}
+
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
+		if (f1 == f2) {
+			return true;
+		}
+		if (f1 == null || f2 == null) {
+			return false;
+		}
+		var c1 = (f1 : java.lang.Object).getClass();
+		if (c1 != (f2 : java.lang.Object).getClass()) {
+			return false;
+		}
+		try {
+			var arg0 = c1.getDeclaredField("argL0");
+			arg0.setAccessible(true);
+			var arg1 = c1.getDeclaredField("argL1");
+			arg1.setAccessible(true);
+			return arg0.get(f1) == arg0.get(f2) && arg1.get(f1) == arg1.get(f2);
+		} catch (_:Dynamic) {
+			return false;
+		}
+	}
+
+	public static function isObject(v:Dynamic):Bool {
+		if (v == null) {
+			return false;
+		}
+		if (Jvm.instanceof(v, jvm.Enum)) {
+			return false;
+		}
+		if (Jvm.instanceof(v, java.lang.Number)) {
+			return false;
+		}
+		if (Jvm.instanceof(v, java.lang.Boolean.BooleanClass)) {
+			return false;
+		}
+		if (Jvm.instanceof(v, java.lang.invoke.MethodHandle)) {
+			return false;
+		}
+		return true;
+	}
+
+	public static function isEnumValue(v:Dynamic):Bool {
+		if (v == null) {
+			return false;
+		}
+		return @:privateAccess Type.isEnumValueClass((cast v : java.lang.Object).getClass());
+	}
+
+	public static function deleteField(o:Dynamic, field:String):Bool {
+		if (!Jvm.instanceof(o, jvm.DynamicObject)) {
+			return false;
+		}
+		return (cast o : jvm.DynamicObject)._hx_deleteField(field);
+	}
+
+	public static function copy<T>(o:Null<T>):Null<T> {
+		if (!Jvm.instanceof(o, jvm.DynamicObject)) {
+			return null;
+		}
+		var o = (cast o : jvm.DynamicObject);
+		return cast o._hx_clone();
+	}
+
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
+		var fAdapt = function(args:java.NativeArray<Dynamic>) {
+			return f(@:privateAccess Array.ofNative(args));
+		}
+		return (cast fAdapt : java.lang.invoke.MethodHandle).asVarargsCollector(cast java.NativeArray);
+	}
+}
diff --git a/std/jvm/_std/Std.hx b/std/jvm/_std/Std.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f72cd1ba7e16286ca171bc2cd04d1991102e026f
--- /dev/null
+++ b/std/jvm/_std/Std.hx
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+import jvm.Jvm;
+
+@:coreApi
+class Std {
+	public static function is(v:Dynamic, t:Dynamic):Bool {
+		if (v == null || t == null) {
+			return false;
+		}
+		var clt:java.lang.Class<Dynamic> = cast t;
+		if (clt == null) {
+			return false;
+		}
+		if (clt == cast java.lang.Object) {
+			return true;
+		}
+		clt = Jvm.getWrapperClass(clt);
+		if (clt == cast java.lang.Double.DoubleClass) {
+			// Haxe semantics: any number is assignable to Float
+			clt = cast java.lang.Number;
+		} else if (clt == cast java.lang.Integer.IntegerClass) {
+			if (!Jvm.instanceof(v, java.lang.Number)) {
+				return false;
+			}
+			var n = (cast v : java.lang.Number);
+			// Haxe semantics: 2.0 is an integer...
+			return n.doubleValue() == n.intValue();
+		}
+		return clt.isAssignableFrom((v : java.lang.Object).getClass());
+	}
+
+	public static function string(s:Dynamic):String {
+		return jvm.Jvm.toString(s);
+	}
+
+	public static function int(x:Float):Int {
+		return cast x;
+	}
+
+	static var integerFormatter = java.text.NumberFormat.getIntegerInstance(java.util.Locale.US);
+	static var doubleFormatter = {
+		var fmt = new java.text.DecimalFormat();
+		fmt.setParseBigDecimal(true);
+		fmt.setDecimalFormatSymbols(new java.text.DecimalFormatSymbols(java.util.Locale.US));
+		fmt;
+	};
+
+	public static function parseInt(x:String):Null<Int> {
+		try {
+			x = StringTools.trim(x);
+			if (x.length < 2) {
+				return integerFormatter.parse(x).intValue();
+			}
+			switch ((cast x : java.NativeString).codePointAt(1)) {
+				case 'x'.code | 'X'.code:
+					return java.lang.Integer.decode(x).intValue();
+				case _:
+					return integerFormatter.parse(x).intValue();
+			}
+		} catch (_:Dynamic) {
+			return null;
+		}
+	}
+
+	public static function parseFloat(x:String):Float {
+		try {
+			x = StringTools.trim(x);
+			x = x.split("+").join(""); // TODO: stupid
+			return doubleFormatter.parse(x.toUpperCase()).doubleValue();
+		} catch (_:Dynamic) {
+			return Math.NaN;
+		}
+	}
+
+	inline public static function downcast<T:{}, S:T>(value:T, c:Class<S>):S {
+		return Std.is(value, c) ? cast value : null;
+	}
+
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	inline public static function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return downcast(value, c);
+	}
+
+	public static function random(x:Int):Int {
+		if (x <= 0) {
+			return 0;
+		}
+		return Std.int(Math.random() * x);
+	}
+}
diff --git a/std/jvm/_std/String.hx b/std/jvm/_std/String.hx
new file mode 100644
index 0000000000000000000000000000000000000000..05ec6dddf687ab6fc3a84b4ce3d74c719f119b47
--- /dev/null
+++ b/std/jvm/_std/String.hx
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+@:coreApi
+@:native("java.lang.String")
+extern class String implements java.lang.CharSequence {
+	var length(default, null):Int;
+
+	@:overload(function(b:haxe.io.BytesData, offset:Int, length:Int, charsetName:String):Void {})
+	@:overload(function(b:haxe.io.BytesData, offset:Int, length:Int):Void {})
+	@:overload(function(b:java.NativeArray<java.StdTypes.Char16>):Void {})
+	@:overload(function(b:java.NativeArray<Int>, offset:Int, count:Int):Void {})
+	function new(string:String):Void;
+
+	function toUpperCase():String;
+	function toLowerCase():String;
+
+	@:runtime inline function charAt(index:Int):String {
+		return jvm.StringExt.charAt(this, index);
+	}
+
+	inline function charCodeAt(index:Int):Null<Int> {
+		return jvm.StringExt.charCodeAt(this, index);
+	}
+
+	inline function indexOf(str:String, ?startIndex:Int):Int {
+		return jvm.StringExt.indexOf(this, str, startIndex);
+	}
+
+	@:runtime inline function lastIndexOf(str:String, ?startIndex:Int):Int {
+		return jvm.StringExt.lastIndexOf(this, str, startIndex);
+	}
+
+	@:runtime inline function split(delimiter:String):Array<String> {
+		return jvm.StringExt.split(this, delimiter);
+	}
+
+	@:runtime inline function substr(pos:Int, ?len:Int):String {
+		return jvm.StringExt.substr(this, pos, len);
+	}
+
+	@:runtime inline function substring(startIndex:Int, ?endIndex:Int):String {
+		return jvm.StringExt.substring(this, startIndex, endIndex);
+	}
+
+	function toString():String;
+
+	private function compareTo(anotherString:String):Int;
+
+	private function codePointAt(idx:Int):Int;
+
+	@:overload(function():haxe.io.BytesData {})
+	private function getBytes(encoding:String):haxe.io.BytesData;
+
+	@:runtime static inline function fromCharCode(code:Int):String {
+		return jvm.StringExt.fromCharCode(code);
+	}
+}
diff --git a/std/jvm/_std/Type.hx b/std/jvm/_std/Type.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dc81f971692d6d74787d917c3d2f134ac8c81c28
--- /dev/null
+++ b/std/jvm/_std/Type.hx
@@ -0,0 +1,332 @@
+import java.lang.invoke.*;
+import java.lang.NoSuchMethodException;
+import jvm.annotation.*;
+import jvm.Jvm;
+
+using jvm.NativeTools.NativeClassTools;
+using jvm.NativeTools.NativeEnumTools;
+using jvm.NativeTools.ObjectTools;
+
+enum ValueType {
+	TNull;
+	TInt;
+	TFloat;
+	TBool;
+	TObject;
+	TFunction;
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
+	TUnknown;
+}
+
+@:coreApi
+class Type {
+	static function isEnumClass<T>(c:java.lang.Class<T>):Bool {
+		// TODO: have to be careful if we ever decide to omit EnumReflectionInformation
+		// Maybe a separate HaxeEnum annotation would be better here
+		return c.isAnnotationPresent(cast EnumReflectionInformation);
+	}
+
+	static function isEnumValueClass<T>(c:java.lang.Class<T>):Bool {
+		// TODO: have to be careful if we ever decide to omit EnumValueReflectionInformation
+		// Maybe a separate HaxeEnum annotation would be better here
+		return c.isAnnotationPresent(cast EnumValueReflectionInformation);
+	}
+
+	public static function getClass<T>(o:T):Class<T> {
+		if (o == null) {
+			return null;
+		}
+		if (Jvm.instanceof(o, Class)) {
+			return null;
+		}
+		var c = o.object().getClass();
+		if (isEnumValueClass(c)) {
+			return null;
+		}
+		if (c == jvm.DynamicObject.native() || Jvm.instanceof(o, jvm.DynamicObject)) {
+			return null;
+		}
+		return c.haxe();
+	}
+
+	public static function getEnum(o:EnumValue):Enum<Dynamic> {
+		if (o == null) {
+			return null;
+		}
+		var c = o.object().getClass().getSuperclass();
+		if (!c.isAnnotationPresent(cast EnumReflectionInformation)) {
+			return null;
+		}
+		return c.haxeEnum();
+	}
+
+	public static function getSuperClass(c:Class<Dynamic>):Class<Dynamic> {
+		if (c == String) {
+			return null;
+		}
+		var c = c.native();
+		var cSuper = c.getSuperclass();
+		if (cSuper == null) {
+			return null;
+		}
+		var annotation = c.getAnnotation((cast ClassReflectionInformation : java.lang.Class<ClassReflectionInformation>));
+		if (annotation != null && annotation.hasSuperClass() == false) {
+			return null;
+		}
+		return cSuper.haxe();
+	}
+
+	public static function getClassName(c:Class<Dynamic>):String {
+		return switch (c.native().getName()) {
+			case "java.lang.String": "String";
+			case "java.lang.Math": "Math";
+			case s if (s.indexOf("haxe.root.") == 0): s.substr(10);
+			case s: s;
+		}
+	}
+
+	public static function getEnumName(e:Enum<Dynamic>):String {
+		return e.native().getName();
+	}
+
+	public static function resolveClass(name:String):Class<Dynamic> {
+		if (name.indexOf(".") == -1) {
+			name = "haxe.root." + name;
+		}
+		return try {
+			java.lang.Class.forName(name).haxe();
+		} catch (e:java.lang.ClassNotFoundException) {
+			return switch (name) {
+				case "haxe.root.String": java.NativeString;
+				case "haxe.root.Math": java.lang.Math;
+				case _: null;
+			}
+		}
+	}
+
+	public static function resolveEnum(name:String):Enum<Dynamic> {
+		return try {
+			var c = java.lang.Class.forName(name);
+			if (!isEnumClass(c)) {
+				null;
+			} else {
+				c.haxeEnum();
+			}
+		} catch (e:java.lang.ClassNotFoundException) {
+			return null;
+		}
+	}
+
+	static final emptyArg = {
+		var a = new java.NativeArray(1);
+		a[0] = (null : jvm.EmptyConstructor);
+		a;
+	}
+
+	static final emptyClass = {
+		var a = new java.NativeArray(1);
+		a[0] = jvm.EmptyConstructor.native();
+		a;
+	}
+
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T {
+		var args = @:privateAccess args.getNative();
+		var cl = cl.native();
+		var argTypes = Jvm.getArgumentTypes(args);
+		var methodType = MethodType.methodType(cast Void, argTypes);
+		// 1. attempt: direct constructor lookup
+		try {
+			var ctor = MethodHandles.lookup().findConstructor(cl, methodType);
+			return ctor.invokeWithArguments(args);
+		} catch (_:NoSuchMethodException) {}
+
+		// 2. attempt direct new lookup
+		try {
+			var ctor = MethodHandles.lookup().findVirtual(cl, "new", methodType);
+			var obj = cl.getConstructor(emptyClass).newInstance(emptyArg);
+			ctor.bindTo(obj).invokeWithArguments(args);
+			return obj;
+		} catch (_:NoSuchMethodException) {}
+
+		// 3. attempt: unify actual constructor
+		for (ctor in cl.getDeclaredConstructors()) {
+			switch (Jvm.unifyCallArguments(args, ctor.getParameterTypes())) {
+				case Some(args):
+					return MethodHandles.lookup().unreflectConstructor(ctor).invokeWithArguments(args);
+				case None:
+			}
+		}
+
+		// 4. attempt: unify new
+		for (ctor in cl.getDeclaredMethods()) {
+			if (ctor.getName() != "new") {
+				continue;
+			}
+			switch (Jvm.unifyCallArguments(args, ctor.getParameterTypes())) {
+				case Some(args):
+					return MethodHandles.lookup().unreflect(ctor).invokeWithArguments(args);
+				case None:
+			}
+		}
+
+		return null;
+	}
+
+	public static function createEmptyInstance<T>(cl:Class<T>):T {
+		var annotation = (cl.native().getAnnotation((cast ClassReflectionInformation : java.lang.Class<ClassReflectionInformation>)));
+		if (annotation != null) {
+			return cl.native().getConstructor(emptyClass).newInstance(emptyArg);
+		} else {
+			return cl.native().newInstance();
+		}
+	}
+
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T {
+		if (params == null || params.length == 0) {
+			var v:Dynamic = Jvm.readField(e, constr);
+			if (!Std.is(v, e)) {
+				throw 'Could not create enum value ${getEnumName(e)}.$constr: Unexpected value $v';
+			}
+			return v;
+		} else {
+			return Reflect.callMethod(null, Jvm.readField(e, constr), params);
+		}
+	}
+
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T {
+		var clInfo:java.lang.Class<EnumReflectionInformation> = cast EnumReflectionInformation;
+		var annotation = e.native().getAnnotation(clInfo);
+		if (params == null || params.length == 0) {
+			return Jvm.readField(e, annotation.constructorNames()[index]);
+		} else {
+			return Reflect.callMethod(null, Jvm.readField(e, annotation.constructorNames()[index]), params);
+		}
+	}
+
+	static function getFields<T>(c:java.lang.Class<T>, statics:Bool):Array<String> {
+		var ret = [];
+		for (f in c.getDeclaredFields()) {
+			if (java.lang.reflect.Modifier.isStatic(f.getModifiers()) == statics && !f.isSynthetic()) {
+				ret.push(f.getName());
+			}
+		}
+		for (m in c.getDeclaredMethods()) {
+			if (java.lang.reflect.Modifier.isStatic(m.getModifiers()) == statics && !m.isSynthetic()) {
+				ret.push(m.getName());
+			}
+		}
+		return ret;
+	}
+
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String> {
+		var fields = [];
+		while (c != null) {
+			for (field in fields.concat(getFields(c.native(), false))) {
+				if (fields.indexOf(field) == -1) {
+					fields.push(field);
+				}
+			}
+			c = getSuperClass(c);
+		};
+		return fields;
+	}
+
+	public static function getClassFields(c:Class<Dynamic>):Array<String> {
+		return getFields(c.native(), true);
+	}
+
+	public static function getEnumConstructs(e:Enum<Dynamic>):Array<String> {
+		var clInfo:java.lang.Class<EnumReflectionInformation> = cast EnumReflectionInformation;
+		var annotation = e.native().getAnnotation(clInfo);
+		return @:privateAccess Array.ofNative(annotation.constructorNames());
+	}
+
+	public static function typeof(v:Dynamic):ValueType {
+		// could optimize this with an annotation on Haxe classes
+		if (v == null) {
+			return TNull;
+		}
+		if (Jvm.instanceof(v, java.lang.Number)) {
+			var v:java.lang.Number = cast v;
+			if (v.intValue() == v.doubleValue()) {
+				return TInt;
+			}
+			return TFloat;
+		}
+		if (Jvm.instanceof(v, java.lang.Boolean.BooleanClass)) {
+			return TBool;
+		}
+		if (Jvm.instanceof(v, jvm.DynamicObject)) {
+			return TObject;
+		}
+		if (Jvm.instanceof(v, java.lang.invoke.MethodHandle)) {
+			return TFunction;
+		}
+		var c = (cast v : java.lang.Object).getClass();
+		// TODO: native enums?
+		if (isEnumValueClass(c)) {
+			return TEnum(c.getSuperclass().haxeEnum());
+		}
+		if (Jvm.instanceof(v, java.lang.Class)) {
+			return TObject;
+		}
+		return TClass(c.haxe());
+	}
+
+	public static function enumEq<T>(a:T, b:T):Bool {
+		if (a == null) {
+			return b == null;
+		}
+		if (b == null) {
+			return false;
+		}
+		var a:jvm.Enum<Dynamic> = cast a;
+		var b:jvm.Enum<Dynamic> = cast b;
+		if (a.ordinal() != b.ordinal()) {
+			return false;
+		}
+		var params1 = a._hx_getParameters();
+		var params2 = b._hx_getParameters();
+		if (params1.length != params2.length) {
+			return false;
+		}
+		for (i in 0...params1.length) {
+			if (params1[i] != params2[i]) {
+				if (Jvm.instanceof(params1[i], jvm.Enum)) {
+					if (!enumEq(params1[i], params2[i])) {
+						return false;
+					}
+				} else {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	public static function enumConstructor(e:EnumValue):String {
+		return (cast e : java.lang.Enum<Dynamic>).name();
+	}
+
+	public static function enumParameters(e:EnumValue):Array<Dynamic> {
+		var a = (cast e : jvm.Enum<Dynamic>)._hx_getParameters();
+		return @:privateAccess Array.ofNative(a);
+	}
+
+	public static function enumIndex(e:EnumValue):Int {
+		return (cast e : java.lang.Enum<Dynamic>).ordinal();
+	}
+
+	public static function allEnums<T>(e:Enum<T>):Array<T> {
+		var all = getEnumConstructs(e);
+		var ret = [];
+		for (name in all) {
+			var v = Jvm.readField(e, name);
+			if (Jvm.instanceof(v, jvm.Enum)) {
+				ret.push(v);
+			}
+		}
+		return ret;
+	}
+}
diff --git a/std/jvm/annotation/ClassReflectionInformation.hx b/std/jvm/annotation/ClassReflectionInformation.hx
new file mode 100644
index 0000000000000000000000000000000000000000..18328be40a1680539d2e06f864f46fdef50fc0ce
--- /dev/null
+++ b/std/jvm/annotation/ClassReflectionInformation.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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 jvm.annotation;
+
+@:annotation
+@:native("haxe.jvm.annotation.ClassReflectionInformation")
+@:keep
+interface ClassReflectionInformation extends java.lang.annotation.Annotation {
+	function hasSuperClass():Bool;
+}
diff --git a/std/jvm/annotation/EnumReflectionInformation.hx b/std/jvm/annotation/EnumReflectionInformation.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0b398bcd26173253ec90de9959a716777439633e
--- /dev/null
+++ b/std/jvm/annotation/EnumReflectionInformation.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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 jvm.annotation;
+
+@:annotation
+@:native("haxe.jvm.annotation.EnumReflectionInformation")
+@:keep
+interface EnumReflectionInformation extends java.lang.annotation.Annotation {
+	function constructorNames():java.NativeArray<String>;
+}
diff --git a/std/jvm/annotation/EnumValueReflectionInformation.hx b/std/jvm/annotation/EnumValueReflectionInformation.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c283adad45ee21a4cd675f90bd74eb2122242772
--- /dev/null
+++ b/std/jvm/annotation/EnumValueReflectionInformation.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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 jvm.annotation;
+
+@:annotation
+@:native("haxe.jvm.annotation.EnumValueReflectionInformation")
+@:keep
+interface EnumValueReflectionInformation extends java.lang.annotation.Annotation {
+	function argumentNames():java.NativeArray<String>;
+}
diff --git a/std/lua/Bit.hx b/std/lua/Bit.hx
index 68c8a2a3b23f3ed7bdc6549dce61937934ed5915..83ce4c1080db89b525ad51a6b9103a677c2b634f 100644
--- a/std/lua/Bit.hx
+++ b/std/lua/Bit.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,19 +23,19 @@
 package lua;
 
 /**
-  Externs for the "bit" class that is required for Haxe lua
+	Externs for the "bit" class that is required for Haxe lua
 **/
 @:native("_hx_bit")
 extern class Bit {
-	public static function bnot(x:Float) : Int;
-	public static function band(a:Float, b:Float) : Int;
-	public static function bor(a:Float, b:Float) : Int;
-	public static function bxor(a:Float, b:Float) : Int;
-	public static function lshift(x:Float, places:Int) : Int;
-	public static function rshift(x:Float, places:Int) : Int;
-	public static function arshift(x:Float, places:Int) : Int;
-	public static function mod(numerator:Float, denominator:Float) : Int;
-	public static function __init__() : Void {
-		untyped _hx_bit = __define_feature__("use._bitop",_hx_bit);
+	public static function bnot(x:Float):Int;
+	public static function band(a:Float, b:Float):Int;
+	public static function bor(a:Float, b:Float):Int;
+	public static function bxor(a:Float, b:Float):Int;
+	public static function lshift(x:Float, places:Int):Int;
+	public static function rshift(x:Float, places:Int):Int;
+	public static function arshift(x:Float, places:Int):Int;
+	public static function mod(numerator:Float, denominator:Float):Int;
+	public static function __init__():Void {
+		untyped _hx_bit = __define_feature__("use._bitop", _hx_bit);
 	}
 }
diff --git a/std/lua/Boot.hx b/std/lua/Boot.hx
index 50d5514c730cdc4d48dfef4d9cb310bdc6ddecaa..b0e7189014fcf84e0daa0fc2b63cfb97ec0dc542 100644
--- a/std/lua/Boot.hx
+++ b/std/lua/Boot.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,63 +23,78 @@
 package lua;
 
 import haxe.Constraints.Function;
-
+import haxe.SysTools;
 
 @:dox(hide)
 class Boot {
-
 	// Used temporarily for bind()
-	static var _;
+	static var _:Dynamic;
 	static var _fid = 0;
 
-	public static var platformBigEndian = NativeStringTools.byte(NativeStringTools.dump(function(){}),7) > 0;
+	static var Max_Int32 = 2147483647;
+	static var Min_Int32 = -2147483648;
 
-	static var hiddenFields : Table<String,Bool> = untyped __lua__("{__id__=true, hx__closures=true, super=true, prototype=true, __fields__=true, __ifields__=true, __class__=true, __properties__=true}");
 
+	// A max stack size to respect for unpack operations
+	public static var MAXSTACKSIZE(default, null) = 1000;
 
+	public static var platformBigEndian = NativeStringTools.byte(NativeStringTools.dump(function() {}), 7) > 0;
 
-	static function __unhtml(s : String)
+	static var hiddenFields:Table<String,
+		Bool> = untyped __lua__("{__id__=true, hx__closures=true, super=true, prototype=true, __fields__=true, __ifields__=true, __class__=true, __properties__=true}");
+
+	static function __unhtml(s:String)
 		return s.split("&").join("&amp;").split("<").join("&lt;").split(">").join("&gt;");
 
-	/*
-	   Indicates if the given object is a class.
-	*/
-	static inline public function isClass(o:Dynamic) : Bool {
-		if (Lua.type(o) != "table") return false;
-		else return untyped __define_feature__("lua.Boot.isClass", o.__name__);
+	/**
+		Indicates if the given object is a class.
+	**/
+	static inline public function isClass(o:Dynamic):Bool {
+		if (Lua.type(o) != "table")
+			return false;
+		else
+			return untyped __define_feature__("lua.Boot.isClass", o.__name__);
 	}
 
-	/*
-	   Indicates if the given object is a enum.
-	*/
-	static inline public function isEnum(e:Dynamic) : Bool {
-		if (Lua.type(e) != "table") return false;
-		else return untyped __define_feature__("lua.Boot.isEnum", e.__ename__);
+	/**
+		Indicates if the given object is a enum.
+	**/
+	static inline public function isEnum(e:Dynamic):Bool {
+		if (Lua.type(e) != "table")
+			return false;
+		else
+			return untyped __define_feature__("lua.Boot.isEnum", e.__ename__);
 	}
 
-	/*
-	   Returns the class of a given object, and defines the getClass feature
-	   for the given class.
-	*/
-	static inline public function getClass(o:Dynamic) : Class<Dynamic> {
-		if (Std.is(o, Array)) return Array;
+	/**
+		Returns the class of a given object, and defines the getClass feature
+		for the given class.
+	**/
+	static inline public function getClass(o:Dynamic):Class<Dynamic> {
+		if (Std.is(o, Array))
+			return Array;
+		else if (Std.is(o, String))
+			return String;
 		else {
 			var cl = untyped __define_feature__("lua.Boot.getClass", o.__class__);
-			if (cl != null) return cl;
-			else return null;
+			if (cl != null)
+				return cl;
+			else
+				return null;
 		}
 	}
 
-	/*
-	   Indicates if the given object is an instance of the given Type
-	*/
+	/**
+		Indicates if the given object is an instance of the given Type
+	**/
 	@:ifFeature("typed_catch")
-	private static function __instanceof(o : Dynamic, cl : Dynamic) {
-		if( cl == null ) return false;
+	private static function __instanceof(o:Dynamic, cl:Dynamic) {
+		if (cl == null)
+			return false;
 
-		switch( cl ) {
+		switch (cl) {
 			case Int:
-				return (Lua.type(o) == "number" &&  clamp(o) == o);
+				return (Lua.type(o) == "number" && clampInt32(o) == o);
 			case Float:
 				return Lua.type(o) == "number";
 			case Bool:
@@ -95,294 +110,336 @@ class Boot {
 			case Table:
 				return Lua.type(o) == "table";
 			case Dynamic:
-				return true;
-			default: {
-				if ( o!= null &&  Lua.type(o)  == "table" && Lua.type(cl) == "table"){
-					if (extendsOrImplements(getClass(o), cl)) return true;
-					// We've exhausted standard inheritance checks.  Check for simple Class/Enum eqauality
-					// Also, do not use isClass/isEnum here, perform raw checks
-					untyped __feature__("Class.*",if( cl == Class && o.__name__ != null ) return true);
-					untyped __feature__("Enum.*",if( cl == Enum && o.__ename__ != null ) return true);
-					// last chance, is it an enum instance?
-					return o.__enum__ == cl;
-				} else {
-					return false;
+				return o != null;
+			default:
+				{
+					if (o != null && Lua.type(o) == "table" && Lua.type(cl) == "table") {
+						if (extendsOrImplements(getClass(o), cl))
+							return true;
+						// We've exhausted standard inheritance checks.  Check for simple Class/Enum eqauality
+						// Also, do not use isClass/isEnum here, perform raw checks
+						untyped __feature__("Class.*", if (cl == Class && o.__name__ != null) return true);
+						untyped __feature__("Enum.*", if (cl == Enum && o.__ename__ != null) return true);
+						// last chance, is it an enum instance?
+						return o.__enum__ == cl;
+					} else {
+						return false;
+					}
 				}
-			}
 		}
 	}
-	static function isArray(o:Dynamic) : Bool {
+
+	static function isArray(o:Dynamic):Bool {
 		return Lua.type(o) == "table"
-			&& untyped o.__enum__ == null
-			&& Lua.getmetatable(o) != null
-			&& Lua.getmetatable(o).__index == untyped Array.prototype;
+			&& untyped o.__enum__ == null && Lua.getmetatable(o) != null && Lua.getmetatable(o).__index == untyped Array.prototype;
 	}
 
-	/*
-	   Indicates if the given object inherits from the given class
-	*/
-	static function inheritsFrom(o:Dynamic, cl:Class<Dynamic>) : Bool {
-		while (Lua.getmetatable(o) != null && Lua.getmetatable(o).__index != null){
-			if (Lua.getmetatable(o).__index == untyped cl.prototype) return true;
+	/**
+		Indicates if the given object inherits from the given class
+	**/
+	static function inheritsFrom(o:Dynamic, cl:Class<Dynamic>):Bool {
+		while (Lua.getmetatable(o) != null && Lua.getmetatable(o).__index != null) {
+			if (Lua.getmetatable(o).__index == untyped cl.prototype)
+				return true;
 			o = Lua.getmetatable(o).__index;
 		}
 		return false;
 	}
 
 	@:ifFeature("typed_cast")
-	private static function __cast(o : Dynamic, t : Dynamic) {
-		if (__instanceof(o, t)) return o;
-		else throw "Cannot cast " +Std.string(o) + " to " +Std.string(t);
+	private static function __cast(o:Dynamic, t:Dynamic) {
+		if (o == null || __instanceof(o, t))
+			return o;
+		else
+			throw "Cannot cast " + Std.string(o) + " to " + Std.string(t);
 	}
 
-	/*
-	   Helper method to generate a string representation of an enum
-	*/
-	static function printEnum(o:Array<Dynamic>, s : String){
-		if (o.length == 2){
+	/**
+		Helper method to generate a string representation of an enum
+	**/
+	static function printEnum(o:Array<Dynamic>, s:String) {
+		if (o.length == 2) {
 			return o[0];
 		} else {
 			// parameterized enums are arrays
 			var str = o[0] + "(";
 			s += "\t";
-			for (i in 2...o.length){
-				if( i != 2 )
-					str += "," + __string_rec(o[i],s);
+			for (i in 2...o.length) {
+				if (i != 2)
+					str += "," + __string_rec(o[i], s);
 				else
-					str += __string_rec(o[i],s);
+					str += __string_rec(o[i], s);
 			}
 			return str + ")";
 		}
 	}
 
-	/*
-	   Helper method to generate a string representation of a class
-	*/
-	static inline function printClass(c:Table<String,Dynamic>, s : String) : String {
-		return '{${printClassRec(c,'',s)}}';
+	/**
+		Helper method to generate a string representation of a class
+	**/
+	static inline function printClass(c:Table<String, Dynamic>, s:String):String {
+		return '{${printClassRec(c, '', s)}}';
 	}
 
-	/*
-	   Helper method to generate a string representation of a class
-	*/
-	static function printClassRec(c:Table<String,Dynamic>, result='', s : String) : String {
+	/**
+		Helper method to generate a string representation of a class
+	**/
+	static function printClassRec(c:Table<String, Dynamic>, result = '', s:String):String {
 		var f = Boot.__string_rec;
 		untyped __lua__("for k,v in pairs(c) do if result ~= '' then result = result .. ', ' end result = result .. k .. ':' .. f(v, s.. '\t') end");
 		return result;
 	}
 
-	/*
-	   Generate a string representation for arbitrary object.
-	*/
+	/**
+		Generate a string representation for arbitrary object.
+	**/
 	@:ifFeature("has_enum")
-	static function __string_rec(o : Dynamic, s:String = "") {
-		return switch(untyped __type__(o)){
+	static function __string_rec(o:Dynamic, s:String = "") {
+		if (s.length >= 5)
+			return "<...>";
+		return switch (untyped __type__(o)) {
 			case "nil": "null";
-			case "number" : {
-				if (o == std.Math.POSITIVE_INFINITY) "Infinity";
-				else if (o == std.Math.NEGATIVE_INFINITY) "-Infinity";
-				else if (o != o) "NaN";
-				else untyped tostring(o);
-			}
-			case "boolean" : untyped tostring(o);
-			case "string"  : o;
-			case "userdata": "<userdata>";
+			case "number": {
+					if (o == std.Math.POSITIVE_INFINITY)
+						"Infinity";
+					else if (o == std.Math.NEGATIVE_INFINITY)
+						"-Infinity";
+					else if (o == 0)
+						"0";
+					else if (o != o)
+						"NaN";
+					else
+						untyped tostring(o);
+				}
+			case "boolean": untyped tostring(o);
+			case "string": o;
+			case "userdata": {
+					var mt = lua.Lua.getmetatable(o);
+					if (mt != null && mt.__tostring != null) {
+						lua.Lua.tostring(o);
+					} else {
+						"<userdata>";
+					}
+				}
 			case "function": "<function>";
-			case "thread"  : "<thread>";
+			case "thread": "<thread>";
 			case "table": {
-			    if (o.__enum__ != null) printEnum(o,s);
-				else if (o.toString != null && !isArray(o)) o.toString();
-				else if (isArray(o)) {
-					var o2 : Array<Dynamic> = untyped o;
-					if (s.length > 5) "[...]"
-					else '[${[for (i in o2) __string_rec(i,s+1)].join(",")}]';
-				}
-				else if (o.__class__ != null) printClass(o,s+"\t");
-				else {
-					var fields = fieldIterator(o);
-					var buffer:Table<Int,String> = Table.create();
-					var first = true;
-					Table.insert(buffer,"{ ");
-					for (f in fields){
-						if (first) first = false;
-						else Table.insert(buffer,", ");
-						Table.insert(buffer,'${Std.string(f)} : ${untyped Std.string(o[f])}');
+					if (o.__enum__ != null)
+						printEnum(o, s);
+					else if (o.toString != null && !isArray(o))
+						o.toString();
+					else if (isArray(o)) {
+						var o2:Array<Dynamic> = untyped o;
+						if (s.length > 5)
+							"[...]"
+						else
+							'[${[for (i in o2) __string_rec(i, s + 1)].join(",")}]';
+					} else if (o.__class__ != null)
+						printClass(o, s + "\t");
+					else {
+						var fields = fieldIterator(o);
+						var buffer:Table<Int, String> = Table.create();
+						var first = true;
+						Table.insert(buffer, "{ ");
+						for (f in fields) {
+							if (first)
+								first = false;
+							else
+								Table.insert(buffer, ", ");
+							Table.insert(buffer, '${Std.string(f)} : ${untyped __string_rec(o[f], s + "\t")}');
+						}
+						Table.insert(buffer, " }");
+						Table.concat(buffer, "");
 					}
-					Table.insert(buffer, " }");
-					Table.concat(buffer, "");
+				};
+			default: {
+					throw "Unknown Lua type";
+					null;
 				}
-			};
-			default : {
-				throw "Unknown Lua type";
-				null;
-			}
 		}
-
 	}
 
-	/*
-	   Define an array from the given table
-	*/
-	public inline static function defArray<T>(tab: Table<Int,T>, ?length : Int) : Array<T> {
-		if (length == null) length = TableTools.maxn(tab) + 1; // maxn doesn't count 0 index
-		return untyped _hx_tab_array(tab, length);
+	/**
+		Define an array from the given table
+	**/
+	public inline static function defArray<T>(tab:Table<Int, T>, ?length:Int):Array<T> {
+		if (length == null) {
+			length = TableTools.maxn(tab);
+			if (length > 0) {
+				var head = tab[1];
+				Table.remove(tab, 1);
+				tab[0] = head;
+				return untyped _hx_tab_array(tab, length);
+			} else {
+				return [];
+			}
+		} else {
+			return untyped _hx_tab_array(tab, length);
+		}
 	}
 
-	/*
-	   Create a Haxe object from the given table structure
-	*/
-	public inline static function tableToObject<T>(t:Table<String,T>) : Dynamic<T> {
+	/**
+		Create a Haxe object from the given table structure
+	**/
+	public inline static function tableToObject<T>(t:Table<String, T>):Dynamic<T> {
 		return untyped _hx_o(t);
 	}
 
-	/*
-	   Get Date object as string representation
-	*/
-	public static function dateStr( date : std.Date ) : String {
+	/**
+		Get Date object as string representation
+	**/
+	public static function dateStr(date:std.Date):String {
 		var m = date.getMonth() + 1;
 		var d = date.getDate();
 		var h = date.getHours();
 		var mi = date.getMinutes();
 		var s = date.getSeconds();
-		return date.getFullYear()
-			+"-"+(if( m < 10 ) "0"+m else ""+m)
-			+"-"+(if( d < 10 ) "0"+d else ""+d)
-			+" "+(if( h < 10 ) "0"+h else ""+h)
-			+":"+(if( mi < 10 ) "0"+mi else ""+mi)
-			+":"+(if( s < 10 ) "0"+s else ""+s);
+		return date.getFullYear() + "-" + (if (m < 10) "0" + m else "" + m) + "-" + (if (d < 10) "0" + d else "" + d) + " "
+			+ (if (h < 10) "0" + h else "" + h) + ":" + (if (mi < 10) "0" + mi else "" + mi) + ":" + (if (s < 10) "0" + s else "" + s);
 	}
 
-	/*
-	   A 32 bit clamp function for numbers
-	*/
-	public inline static function clamp(x:Float){
+	/**
+		A 32 bit clamp function for numbers
+	**/
+	public inline static function clampInt32(x:Float) {
+#if lua_vanilla
+		if (x < Min_Int32 ) {
+			return Min_Int32;
+		} else if (x > Max_Int32) {
+			return Max_Int32;
+		} else {
+			return Math.floor(x);
+		}
+#else
 		return untyped __define_feature__("lua.Boot.clamp", _hx_bit_clamp(x));
+#end
 	}
 
-	/*
-	   Create a standard date object from a lua string representation
-	*/
-	public static function strDate( s : String ) : std.Date {
-		switch( s.length ) {
-		case 8: // hh:mm:ss
-			var k = s.split(":");
-			var t = lua.Os.time({
-				year  : 0,
-				month : 1,
-				day   : 1,
-				hour  : Lua.tonumber(k[0]),
-				min   : Lua.tonumber(k[1]),
-				sec   : Lua.tonumber(k[2])
-			});
-			return std.Date.fromTime(t);
-		case 10: // YYYY-MM-DD
-			var k = s.split("-");
-			return new std.Date(Lua.tonumber(k[0]), Lua.tonumber(k[1]) - 1, Lua.tonumber(k[2]),0,0,0);
-		case 19: // YYYY-MM-DD hh:mm:ss
-			var k = s.split(" ");
-			var y = k[0].split("-");
-			var t = k[1].split(":");
-			return new std.Date(cast y[0],Lua.tonumber(y[1]) - 1, Lua.tonumber(y[2]),Lua.tonumber(t[0]),Lua.tonumber(t[1]),Lua.tonumber(t[2]));
-		default:
-			throw "Invalid date format : " + s;
+	/**
+		Create a standard date object from a lua string representation
+	**/
+	public static function strDate(s:String):std.Date {
+		switch (s.length) {
+			case 8: // hh:mm:ss
+				var k = s.split(":");
+				return std.Date.fromTime(Lua.tonumber(k[0]) * 3600000. + Lua.tonumber(k[1]) * 60000. + Lua.tonumber(k[2]) * 1000.);
+			case 10: // YYYY-MM-DD
+				var k = s.split("-");
+				return new std.Date(Lua.tonumber(k[0]), Lua.tonumber(k[1]) - 1, Lua.tonumber(k[2]), 0, 0, 0);
+			case 19: // YYYY-MM-DD hh:mm:ss
+				var k = s.split(" ");
+				var y = k[0].split("-");
+				var t = k[1].split(":");
+				return new std.Date(Lua.tonumber(y[0]), Lua.tonumber(y[1]) - 1, Lua.tonumber(y[2]), Lua.tonumber(t[0]), Lua.tonumber(t[1]), Lua.tonumber(t[2]));
+			default:
+				throw "Invalid date format : " + s;
 		}
 	}
 
-	/*
-	  Helper method to determine if class cl1 extends, implements, or otherwise equals cl2
-	*/
-	public static function extendsOrImplements(cl1 : Class<Dynamic>, cl2 : Class<Dynamic>) : Bool {
-		if (cl1 == null || cl2 == null) return false;
-		else if (cl1 == cl2) return true;
+	/**
+		Helper method to determine if class cl1 extends, implements, or otherwise equals cl2
+	**/
+	public static function extendsOrImplements(cl1:Class<Dynamic>, cl2:Class<Dynamic>):Bool {
+		if (cl1 == null || cl2 == null)
+			return false;
+		else if (cl1 == cl2)
+			return true;
 		else if (untyped cl1.__interfaces__ != null) {
 			var intf = untyped cl1.__interfaces__;
-			for (i in 1...( TableTools.maxn(intf) + 1)){
+			for (i in 1...(TableTools.maxn(intf) + 1)) {
 				// check each interface, including extended interfaces
-				if (extendsOrImplements(intf[i], cl2)) return true;
+				if (extendsOrImplements(intf[i], cl2))
+					return true;
 			}
 		}
 		// check standard inheritance
 		return extendsOrImplements(untyped cl1.__super__, cl2);
 	}
 
-
-	/*
+	/**
 		Returns a shell escaped version of "cmd" along with any args
-	*/
-	public static function shellEscapeCmd(cmd : String, ?args : Array<String>){
+	**/
+	public static function shellEscapeCmd(cmd:String, ?args:Array<String>) {
 		if (args != null) {
 			switch (Sys.systemName()) {
 				case "Windows":
 					cmd = [
 						for (a in [StringTools.replace(cmd, "/", "\\")].concat(args))
-						StringTools.quoteWinArg(a, true)
+							SysTools.quoteWinArg(a, true)
 					].join(" ");
 				case _:
-					cmd = [cmd].concat(args).map(StringTools.quoteUnixArg).join(" ");
+					cmd = [cmd].concat(args).map(SysTools.quoteUnixArg).join(" ");
 			}
 		}
 		return cmd;
 	}
 
-	/*
-	   Returns a temp file path that can be used for reading and writing
-	*/
-	public static function tempFile() : String {
-		switch (Sys.systemName()){
-			case "Windows" : return haxe.io.Path.join([Os.getenv("TMP"), Os.tmpname()]);
-			default : return Os.tmpname();
+	/**
+		Returns a temp file path that can be used for reading and writing
+	**/
+	public static function tempFile():String {
+		switch (Sys.systemName()) {
+			case "Windows":
+				return haxe.io.Path.join([Os.getenv("TMP"), Os.tmpname()]);
+			default:
+				return Os.tmpname();
 		}
 	}
 
-	public static function fieldIterator( o : Table<String,Dynamic>) : Iterator<String> {
-		var tbl : Table<String,String> =  cast (untyped o.__fields__ != null) ?  o.__fields__ : o;
+	public static function fieldIterator(o:Table<String, Dynamic>):Iterator<String> {
+		if (Lua.type(o) != "table") {
+			return {
+				next: function() return null,
+				hasNext: function() return false
+			}
+		}
+		var tbl:Table<String, String> = cast(untyped o.__fields__ != null) ? o.__fields__ : o;
 		var cur = Lua.pairs(tbl).next;
-		var next_valid = function(tbl, val){
-			while (hiddenFields[untyped val] != null){
+		var next_valid = function(tbl, val) {
+			while (hiddenFields[untyped val] != null) {
 				val = cur(tbl, val).index;
 			}
 			return val;
 		}
 		var cur_val = next_valid(tbl, cur(tbl, null).index);
 		return {
-			next : function(){
+			next: function() {
 				var ret = cur_val;
 				cur_val = next_valid(tbl, cur(tbl, cur_val).index);
 				return ret;
 			},
-			hasNext : function() return cur_val !=  null
+			hasNext: function() return cur_val != null
 		}
 	}
 
 	static var os_patterns = [
-		'Windows' => ['windows','^mingw','^cygwin'],
-		'Linux'   => ['linux'],
-		'Mac'     => ['mac','darwin'],
-		'BSD'     => ['bsd$'],
+		'Windows' => ['windows', '^mingw', '^cygwin'],
+		'Linux' => ['linux'],
+		'Mac' => ['mac', 'darwin', 'osx'],
+		'BSD' => ['bsd$'],
 		'Solaris' => ['SunOS']
 	];
 
-	public static function systemName() : String {
-		var os : String = null;
-		if (untyped jit != null && untyped jit.os != null ){
+	public static function systemName():String {
+		var os:String = null;
+		if (untyped jit != null && untyped jit.os != null) {
 			os = untyped jit.os;
 			os = os.toLowerCase();
 		} else {
-			var popen_status : Bool = false;
-			var popen_result : lua.FileHandle = null;
+			var popen_status:Bool = false;
+			var popen_result:lua.FileHandle = null;
 			untyped __lua__("popen_status, popen_result = pcall(_G.io.popen, '')");
 			if (popen_status) {
-				popen_result.close;
-				os = lua.Io.popen('uname -s','r').read('*l').toLowerCase();
+				popen_result.close();
+				os = lua.Io.popen('uname -s', 'r').read('*l').toLowerCase();
 			} else {
 				os = lua.Os.getenv('OS').toLowerCase();
 			}
-
 		}
 
-		for (k in os_patterns.keys()){
+		for (k in os_patterns.keys()) {
 			for (p in os_patterns.get(k)) {
-				if (lua.NativeStringTools.match(os,p) != null){
+				if (lua.NativeStringTools.match(os, p) != null) {
 					return k;
 				}
 			}
diff --git a/std/lua/Coroutine.hx b/std/lua/Coroutine.hx
index 2460a83f26c791ea82e5fc098e7954f7c77444da..db9114fc2b885f15eb7d04b6b94cbdff9e39b9be 100644
--- a/std/lua/Coroutine.hx
+++ b/std/lua/Coroutine.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,17 +33,17 @@ extern class Coroutine<T:Function> extends Thread {
 	/**
 		Creates a new coroutine, with body `f`. `f` must be a Lua function.
 	**/
-	public static function create<T:Function>(f : T)  : Coroutine<T>;
+	public static function create<T:Function>(f:T):Coroutine<T>;
 
 	/**
 		Returns the running coroutine plus a boolean, true when the running coroutine is the main one.
 	**/
-	public static function running() : CoroutineRunning;
+	public static function running():CoroutineRunning;
 
 	/**
 		Returns the status of coroutine.
 	**/
-	public static function status(c : Coroutine<Dynamic>) : CoroutineState;
+	public static function status(c:Coroutine<Dynamic>):CoroutineState;
 
 	/**
 		Starts or continues the execution of coroutine.
@@ -57,14 +57,14 @@ extern class Coroutine<T:Function> extends Thread {
 		by the body function (if the coroutine terminates). If there is any error,
 		`resume` returns `false` plus the error message.
 	**/
-	public static function resume(c : Coroutine<Dynamic>, args : Rest<Dynamic>) : CoroutineResume;
+	public static function resume<A, B>(c:Coroutine<Dynamic>, args:Rest<A>):CoroutineResume<B>;
 
 	/**
 		Suspends the execution of the calling coroutine.
 		The coroutine cannot be running a C function, a metamethod, or an iterator.
 		Any arguments to `yield` are passed as extra results to `resume`.
 	**/
-	public static function yield<T>(args : Rest<T>) : T;
+	public static function yield<T>(args:Rest<Dynamic>):T;
 
 	/**
 		Creates a new coroutine, with body `f`.
@@ -73,14 +73,13 @@ extern class Coroutine<T:Function> extends Thread {
 		Returns the same values returned by `resume`, except the first boolean.
 		In case of error, propagates the error.
 	**/
-	public static function wrap<T:Function>(f : T) : Coroutine<T>;
+	public static function wrap<T:Function>(f:T):T;
 }
 
 /**
 	A enumerator that describes the output of `Coroutine.status()`.
 **/
-@:enum
-abstract CoroutineState(String) {
+enum abstract CoroutineState(String) {
 	/**
 		If the coroutine is suspended in a call to yield, or if it has not started
 		running yet.
@@ -106,15 +105,13 @@ abstract CoroutineState(String) {
 }
 
 @:multiReturn
-extern class CoroutineResume  {
-	var success  : Bool;
-	var result : Dynamic;
+extern class CoroutineResume<T> {
+	var success:Bool;
+	var result:T;
 }
 
-
 @:multiReturn
 extern class CoroutineRunning {
-	var coroutine : Coroutine<Dynamic>;
-	var status    : Bool;
+	var coroutine:Coroutine<Dynamic>;
+	var status:Bool;
 }
-
diff --git a/std/lua/Debug.hx b/std/lua/Debug.hx
index b6f0c497839c5c7ad2257368abd08965f0c5b6f0..a9e32a8be833757a5a1e3612d591daed227e6d5d 100644
--- a/std/lua/Debug.hx
+++ b/std/lua/Debug.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,136 +21,135 @@
  */
 
 package lua;
+
 /**
-  Externs for the "debug" class for Haxe lua  
+	Externs for the "debug" class for Haxe lua
 **/
 import haxe.Constraints.Function;
-
 import lua.Table.AnyTable;
 
 @:native("debug")
 extern class Debug {
 	/**
-		This function returns the name and the value of the local variable with 
+		This function returns the name and the value of the local variable with
 		index local of the function at level level of the stack.
 	**/
-	public static function getlocal(stackLevel : Int, idx : Int) : Dynamic;
+	public static function getlocal(stackLevel:Int, idx:Int):Dynamic;
 
 	/**
-		This function assigns the value value to the local variable with index 
-		local of the function at level level of the stack. 
-		Call `getinfo` to check whether the level is valid. 
+		This function assigns the value value to the local variable with index
+		local of the function at level level of the stack.
+		Call `getinfo` to check whether the level is valid.
 	**/
-	public static function setlocal(stackLevel : Int, varName: String, value: Dynamic) : Void;
+	public static function setlocal(stackLevel:Int, varName:String, value:Dynamic):Void;
 
 	/**
-		Returns a table with information about a function. 
+		Returns a table with information about a function.
 	**/
-	public static function getinfo(stackLevel  : Int) : DebugInfo;
+	public static function getinfo(stackLevel:Int):DebugInfo;
 
 	/**
-		Sets the given function as a hook. 
+		Sets the given function as a hook.
 		When called without arguments, `Debug.sethook` turns off the hook.
 	**/
-	public static function sethook(?fun : Function, ?monitor : String) : Void;
+	public static function sethook(?fun:Function, ?monitor:String):Void;
 
 	/**
-		Enters an interactive mode with the user, running each string that the user enters. 
-		Using simple commands and other debug facilities, the user can inspect 
-		global and local variables, change their values, evaluate expressions, 
-		and so on. A line containing only the word `cont` finishes this function, 
+		Enters an interactive mode with the user, running each string that the user enters.
+		Using simple commands and other debug facilities, the user can inspect
+		global and local variables, change their values, evaluate expressions,
+		and so on. A line containing only the word `cont` finishes this function,
 		so that the caller continues its execution.
 
-		Note that commands for `Debug.debug` are not lexically nested within any 
+		Note that commands for `Debug.debug` are not lexically nested within any
 		function, and so have no direct access to local variables.
 	**/
-	public static function debug() : Void;
+	public static function debug():Void;
 
 	/**
-		Returns the current hook settings of the thread, as three values: 
-		the current hook function, the current hook mask, and the current hook count 
+		Returns the current hook settings of the thread, as three values:
+		the current hook function, the current hook mask, and the current hook count
 		(as set by the `Debug.sethook` function).
 	**/
-	public static function gethook(thread : Thread) : Function;
+	public static function gethook(thread:Thread):Function;
 
 	/**
 		Returns the registry table.
 	**/
-	public static function getregistry() : AnyTable;
+	public static function getregistry():AnyTable;
 
 	/**
 		Returns the metatable of the given `value` or `null` if it does not have a metatable.
 	**/
-	public static function getmetatable(value : AnyTable) : AnyTable;
+	public static function getmetatable(value:AnyTable):AnyTable;
 
 	/**
 		Sets the metatable for the given `value` to the given `table` (can be `null`).
 	**/
-	public static function setmetatable(value : AnyTable, table : AnyTable) : Void;
+	public static function setmetatable(value:AnyTable, table:AnyTable):Void;
 
 	/**
-		This function returns the name and the value of the upvalue with index `up` 
-		of the function `f`. The function returns `null` if there is no upvalue with 
+		This function returns the name and the value of the upvalue with index `up`
+		of the function `f`. The function returns `null` if there is no upvalue with
 		the given index.
 	**/
-	public static function getupvalue(f : Function, up : Int) : Dynamic;
+	public static function getupvalue(f:Function, up:Int):Dynamic;
 
 	/**
 		This function assigns the value value to the upvalue with index up of
 		the function `f`. The function returns `null` if there is no upvalue with
 		the given index. Otherwise, it returns the name of the upvalue.
 	**/
-	public static function setupvalue(f : Function, up : Int, val : Dynamic) : Void;
+	public static function setupvalue(f:Function, up:Int, val:Dynamic):Void;
 
 	/**
-		Returns the Lua value associated to `val`. 
+		Returns the Lua value associated to `val`.
 		If `val` is not a `UserData`, returns `null`.
 	**/
-	public static function getuservalue(val : Dynamic) : Dynamic;
+	public static function getuservalue(val:Dynamic):Dynamic;
 
 	/**
-		Sets the given value as the Lua value associated to the given udata. 
+		Sets the given value as the Lua value associated to the given udata.
 		`udata` must be a full `UserData`.
 	**/
-	public static function setuservalue(udata : Dynamic, val : Dynamic) : Void;
+	public static function setuservalue(udata:Dynamic, val:Dynamic):Void;
 
 	/**
-		Returns a string with a traceback of the call stack. 
+		Returns a string with a traceback of the call stack.
 		@param message (optional) is appended at the beginning of the traceback.
-		@param level (optional) tells at which level to start the traceback. 
-		       default is `1`, the function calling traceback.
+		@param level (optional) tells at which level to start the traceback.
+			   default is `1`, the function calling traceback.
 	**/
-	public static function traceback(?thread : Thread, ?message : String, ?level : Int) : String;
+	public static function traceback(?thread:Thread, ?message:String, ?level:Int):String;
 
 	/**
-		Returns a unique identifier (as a light userdata) for the upvalue numbered 
+		Returns a unique identifier (as a light userdata) for the upvalue numbered
 		`n` from the given function `f`.
 	**/
-	public static function upvalueid(f : Function, n : Int) : Dynamic;
+	public static function upvalueid(f:Function, n:Int):Dynamic;
 
 	/**
-		Make the `n1`-th upvalue of the Lua closure `f1` refer to the `n2`-th 
+		Make the `n1`-th upvalue of the Lua closure `f1` refer to the `n2`-th
 		upvalue of the Lua closure `f2`.
 	**/
-	public static function upvaluejoin(f1 : Function, n1 : Int, f2 : Function, n2 : Int) : Void;
+	public static function upvaluejoin(f1:Function, n1:Int, f2:Function, n2:Int):Void;
 }
 
 /**
 	A enumerator that describes the output of `Debug.getinfo()`.
 **/
-typedef DebugInfo = { 
-	currentline     : Int,
-	func            : Function,
-	istailcall      : Bool,
-	isvararg        : Bool,
-	lastlinedefined : Int,
-	linedefined     : Int,
-	name            : String,
-	namewhat        : String,
-	nparams         : Int,
-	nups            : Int,
-	short_src       : String,
-	source          : String,
-	what            : String
+typedef DebugInfo = {
+	currentline:Int,
+	func:Function,
+	istailcall:Bool,
+	isvararg:Bool,
+	lastlinedefined:Int,
+	linedefined:Int,
+	name:String,
+	namewhat:String,
+	nparams:Int,
+	nups:Int,
+	short_src:String,
+	source:String,
+	what:String
 }
-
diff --git a/std/lua/Ffi.hx b/std/lua/Ffi.hx
index ef72e8651332d56c92fc8b25988b0a44071e6126..aec03deb9e2d61b9edbe36a1d3185d6c8e14759b 100644
--- a/std/lua/Ffi.hx
+++ b/std/lua/Ffi.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,40 +24,41 @@ package lua;
 
 import haxe.Constraints.Function;
 import lua.Table;
+
 #if lua_jit
 @:luaRequire("ffi")
 extern class Ffi {
+	public function new(type:String, arg:Dynamic);
 
 	// Declaring and accessing external symbols
-	public static var C : Dynamic;
-	public static function gc(cdata : Dynamic, finalizer : Function) : Void;
-	public static function load (name : String, ?global : Bool) : Dynamic;
-	public static function metatype<T>(ct : Ctype<T>, metatable : Table<Dynamic,Dynamic>) : Ctype<T>;
-	public static function typeof(str:String) : Ctype<Dynamic>;
+	public static function cdef(def:String):Void;
+	public static var C:Dynamic;
+	public static function gc(cdata:Dynamic, finalizer:Function):Void;
+	public static function load(name:String, ?global:Bool):Dynamic;
+	public static function metatype<T>(ct:Ctype<T>, metatable:Table<Dynamic, Dynamic>):Ctype<T>;
+	public static function typeof(str:String):Ctype<Dynamic>;
 
 	// C Type functionality
-	public static function alignof<T>(ct : Ctype<T>) : Int;
-	public static function istype<T>(ct : Ctype<T>, obj:Dynamic) : Bool;
-	public static function offsetof<T>(ct : Ctype<T>, field:String) : Int;
-	public static function sizeof<T>(ct : Ctype<T>, ?nelem : Int) : Int;
-
+	public static function alignof<T>(ct:Ctype<T>):Int;
+	public static function istype<T>(ct:Ctype<T>, obj:Dynamic):Bool;
+	public static function offsetof<T>(ct:Ctype<T>, field:String):Int;
+	public static function sizeof<T>(ct:Ctype<T>, ?nelem:Int):Int;
 
 	// Utility functionality
-	public static function errno(?newerr : Int) : Int;
-	public static function fill(dst : Dynamic, len : Int, c:Int) : Void;
-	public static function string(ptr : Dynamic, ?len : Int) : String;
+	public static function errno(?newerr:Int):Int;
+	public static function fill(dst:Dynamic, len:Int, c:Int):Void;
+	public static function string(ptr:Dynamic, ?len:Int):String;
 
-	@:overload(   function     (dst : Dynamic, str : String)             : Dynamic {})
-	public static function copy(dst : Dynamic, src : Dynamic, len : Int) : String;
+	@:overload(function(dst:Dynamic, str:String):Dynamic {})
+	public static function copy(dst:Dynamic, src:Dynamic, len:Int):String;
 
 	// Target specific functionality
-	public static var os : String;
-	public static var arch : String;
-	public static function abi(param : String) : Bool;
+	public static var os:String;
+	public static var arch:String;
+	public static function abi(param:String):Bool;
 }
 
 extern class Ctype<T> {}
 
 // TODO FFI callback type (gc methods)
 #end
-
diff --git a/std/lua/FileHandle.hx b/std/lua/FileHandle.hx
index aa2e2b0f2296ccb8875723d70ba486d60499d9a2..2b99aaa2922cd0352ce31c78da89afc2a43321df 100644
--- a/std/lua/FileHandle.hx
+++ b/std/lua/FileHandle.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,20 +19,21 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package lua;
+
 import haxe.extern.EitherType;
 import haxe.extern.Rest;
 import sys.io.FileInput;
 
 extern class FileHandle extends UserData {
-	public function flush() : Void;
-	public function read(arg : Rest<EitherType<String,Int>>) : String;
-	public function close() : Void;
+	public function flush():Void;
+	public function read(arg:Rest<EitherType<String, Int>>):String;
+	public function close():Void;
 
-	public function write(str : String) : Void;
+	public function write(str:String):Void;
 
-	@:overload(function () : Int {})
-	@:overload(function (arg : String) : Int {})
-	public function seek(arg : String, pos : Int) : Void;
+	@:overload(function():Int {})
+	@:overload(function(arg:String):Int {})
+	public function seek(arg:String, pos:Int):Void;
 }
-
diff --git a/std/lua/HaxeIterator.hx b/std/lua/HaxeIterator.hx
index b0168bd95190ec6c04bb041690b7b5e1ba2c9330..9eee7effc879a92984d1037ad7e5c58c9bf8e406 100644
--- a/std/lua/HaxeIterator.hx
+++ b/std/lua/HaxeIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,20 +23,24 @@
 package lua;
 
 /**
-  An implementation of the Haxe iterator data structure needed for identical 
-  lua iterator behavior. 
- **/
+	An implementation of the Haxe iterator data structure needed for identical
+	lua iterator behavior.
+**/
 class HaxeIterator<T> {
-	var state : T;
-	var f : Void->T;
-	public function new(f:Void->T){
+	var state:T;
+	var f:Void->T;
+
+	public function new(f:Void->T) {
 		this.f = f;
 		this.state = f();
 	}
-	public function next(){
+
+	public function next() {
 		var ret = this.state;
 		this.state = this.f();
 		return ret;
 	}
-	public function hasNext() return this.state != null;
+
+	public function hasNext()
+		return this.state != null;
 }
diff --git a/std/lua/Io.hx b/std/lua/Io.hx
index d16c7328e336cbb097767ee9c7c0e3bf5812168b..6d6ecd1a39ff447b2f6bbb83a98b52bfa654f638 100644
--- a/std/lua/Io.hx
+++ b/std/lua/Io.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,27 +19,29 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package lua;
+
 import haxe.extern.Rest;
 
 /**
-		Input and Output Facilities
+	Input and Output Facilities
 **/
 @:native("_G.io")
 extern class Io {
-	public static var stdin  : FileHandle;
-	public static var stderr : FileHandle;
-	public static var stdout : FileHandle;
+	public static var stdin:FileHandle;
+	public static var stderr:FileHandle;
+	public static var stdout:FileHandle;
 
 	/**
 		Function to close regular files.
 	**/
-	public static function close(?file : FileHandle) : Void;
+	public static function close(?file:FileHandle):Void;
 
 	/**
 		Saves any written data to file.
 	**/
-	public static function flush() : Void;
+	public static function flush():Void;
 
 	/**
 		When called with a file name, it opens the named file (in text mode),
@@ -50,78 +52,78 @@ extern class Io {
 		In case of errors this function raises the error, instead of returning an
 		error code.
 	**/
-	@:overload(   function      (file : String)     : Void {})
-	public static function input(file : FileHandle) : Void;
+	@:overload(function(file:String):Void {})
+	public static function input(file:FileHandle):Void;
 
 	/**
-		Opens the given file name in read mode and returns an iterator function that, 
-		each time it is called, returns a new line from the file. 
+		Opens the given file name in read mode and returns an iterator function that,
+		each time it is called, returns a new line from the file.
 	**/
-	public static function lines(?file : String) : NativeIterator<String>;
+	public static function lines(?file:String):NativeIterator<String>;
 
 	/**
 		This function opens a file, in the mode specified in the string mode.
 		It returns a new file handle, or, in case of errors, `null` plus an error message.
-		
+
 		The mode string can be any of the following:
-		
-		 * `"r"`: read mode (the default)
-		 * `"w"`: write mode
-		 * `"a"`: append mode
-		 * `"r+"`: update mode, all previous data is preserved
-		 * `"w+"`: update mode, all previous data is erased
-		 * `"a+"`: append update mode, previous data is preserved, writing is only 
-		    allowed at the end of file
-		
-		The mode string can also have a `b` at the end, which is needed in some systems 
-		to open the file in binary mode. This string is exactly what is used in the 
+
+		* `"r"`: read mode (the default)
+		* `"w"`: write mode
+		* `"a"`: append mode
+		* `"r+"`: update mode, all previous data is preserved
+		* `"w+"`: update mode, all previous data is erased
+		* `"a+"`: append update mode, previous data is preserved, writing is only
+			allowed at the end of file
+
+		The mode string can also have a `b` at the end, which is needed in some systems
+		to open the file in binary mode. This string is exactly what is used in the
 		standard C function fopen.
 	**/
-	public static function open (filename : String, ?mode : String) : FileHandle;
+	public static function open(filename:String, ?mode:String):FileHandle;
 
 	/**
-		Starts program `command` in a separated process and returns a file handle that 
-		you can use to read data from this program (if mode is `"r"`, the default) 
+		Starts program `command` in a separated process and returns a file handle that
+		you can use to read data from this program (if mode is `"r"`, the default)
 		or to write data to this program (if mode is `"w"`).
-		
+
 		This function is system dependent and is not available on all platforms.
 	**/
-	public static function popen(command  : String, ?mode : String) : FileHandle;
+	public static function popen(command:String, ?mode:String):FileHandle;
 
-	@:overload(   function     (?count    : Int)    : String {})
-	public static function read(?filename : String) : String;
+	@:overload(function(?count:Int):String {})
+	public static function read(?filename:String):String;
 
 	/**
-		Writes the value of each of its arguments to the file. The arguments must 
-		be strings or numbers. 
+		Writes the value of each of its arguments to the file. The arguments must
+		be strings or numbers.
 		To write other values, use `Lua.tostring` or `NativeStringTools.format`
 		before write.
 	**/
-	public static function write(v : Rest<String>) : Void;
+	public static function write(v:Rest<String>):Void;
 
-	public static function output(?file : String) : FileHandle;
+	public static function output(?file:String):FileHandle;
 
 	/**
 		Returns a handle for a temporary file. This file is opened in update mode
 		and it is automatically removed when the program ends.
 	**/
-	public static function tmpfile() : FileHandle;
+	public static function tmpfile():FileHandle;
 
 	/**
-		Checks whether `obj` is a valid file handle. 
+		Checks whether `obj` is a valid file handle.
 	**/
-	public static function type(obj : FileHandle) : IoType;
+	public static function type(obj:FileHandle):IoType;
 }
 
 /**
 	A enumerator that describes the output of `Io.type()`.
 **/
-@:enum
-abstract IoType(String) {
+enum abstract IoType(String) {
 	var File = "file";
 	var ClosedFile = "closed file";
 	var NotAFile = null;
-	@:to public function toString(){
+
+	@:to public function toString() {
 		return this;
 	}
 }
diff --git a/std/lua/Jit.hx b/std/lua/Jit.hx
index b832e4f7ad98a962be5318bff85144ae90e00e23..8d93e46c7cea261b877806b6e30e3a219ee6cb52 100644
--- a/std/lua/Jit.hx
+++ b/std/lua/Jit.hx
@@ -5,17 +5,15 @@ import haxe.Constraints.Function;
 #if lua_jit
 @:native("_G.jit")
 extern class Jit {
-	public static function on(?f:Function, ?recursive:Bool) : Void;
-	public static function off(?f:Function, ?recursive:Bool) : Void;
-	public static function flush(?f:Function, ?recursive:Bool) : Void;
-	public static function status() : Bool;
-	public static var version : String;
-	public static var version_num : Int;
-	public static var os : String;
-	public static var arch : String;
-	public static var opt : { start : Function };
-	public static var util : Dynamic;
+	public static function on(?f:Function, ?recursive:Bool):Void;
+	public static function off(?f:Function, ?recursive:Bool):Void;
+	public static function flush(?f:Function, ?recursive:Bool):Void;
+	public static function status():Bool;
+	public static var version:String;
+	public static var version_num:Int;
+	public static var os:String;
+	public static var arch:String;
+	public static var opt:{start:Function};
+	public static var util:Dynamic;
 }
 #end
-
-
diff --git a/std/lua/Lib.hx b/std/lua/Lib.hx
index e84fffff6d1a9d21984dc6b33456aa46a1855d1f..48e7b6e1a32965f698f072627be6aaf285f47c28 100644
--- a/std/lua/Lib.hx
+++ b/std/lua/Lib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,60 +19,78 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package lua;
+
 import lua.Lua;
 import lua.Io;
 import lua.NativeStringTools;
 
 /**
-	Platform-specific Lua Library. Provides some platform-specific functions 
-	for the Lua target, such as conversion from Haxe types to native types 
+	Platform-specific Lua Library. Provides some platform-specific functions
+	for the Lua target, such as conversion from Haxe types to native types
 	and vice-versa.
 **/
 class Lib {
 	/**
 		Print the specified value on the default output followed by a newline character.
 	**/
-	public static inline function println( v : Dynamic ) : Void {
+	public static inline function println(v:Dynamic):Void {
 		Lua.print(Std.string(v));
 	}
 
 	/**
 		Print the specified value on the default output.
 	**/
-	public static inline function print(v:Dynamic) : Void {
+	public static inline function print(v:Dynamic):Void {
 		Io.write(Std.string(v));
 		Io.flush();
 	}
 
-	public inline static function tableToArray<T>(t:Table<Int,T>, ?length:Int) : Array<T> {
-		return Boot.defArray(t, length);
-	}
-
-	public inline static function tableToObject<T>(t:Table<String,T>) : Dynamic<T> {
-		return Boot.tableToObject(t);
+	/**
+		Copies the table argument and converts it to an Array
+	**/
+	public inline static function tableToArray<T>(t:Table<Int, T>, ?length:Int):Array<T> {
+		return Boot.defArray(PairTools.copy(t), length);
 	}
 
-	public inline static function patternQuote(str:String) : String {
-		return NativeStringTools.gsub(str, "[%(%)%.%%%+%-%*%?%[%]%^%$]", function(c:String){ return "%" + c; });
+	/**
+		Copies the table argument and converts it to an Object.
+	**/
+	public inline static function tableToObject<T>(t:Table<String, T>):Dynamic<T> {
+		return Boot.tableToObject(PairTools.copy(t));
 	}
 
-	public inline static function defArray<T>(tab: Table<Int,T>, length : Int) : Array<T> {
-		return Boot.defArray(tab, length);
+	/**
+		Perform Lua-style pattern quoting on a given string.
+	**/
+	public inline static function patternQuote(str:String):String {
+		return NativeStringTools.gsub(str, "[%(%)%.%%%+%-%*%?%[%]%^%$]", function(c:String) {
+			return "%" + c;
+		});
 	}
 
-	public static function fillArray<T>(itr:Void->T) : Array<T> {
-		var i: T = null;
-		var ret : Array<T> = [];
-		while({i = itr(); i != null;}){
+	/**
+		Fills an array with the result of a simple iterator.
+	**/
+	public static function fillArray<T>(itr:Void->T):Array<T> {
+		var i:T = null;
+		var ret:Array<T> = [];
+		while ({
+			i = itr();
+			i != null;
+		}) {
 			ret.push(i);
 		}
 		return ret;
 	}
 
-	public static function isShellAvailable() : Bool {
-		var ret : Dynamic = Os.execute();
-		if (Lua.type(ret) == "bool"){
+	/**
+		Simple test for the presence of an available shell.
+	**/
+	public static function isShellAvailable():Bool {
+		var ret:Dynamic = Os.execute();
+		if (Lua.type(ret) == "bool") {
 			return ret;
 		} else {
 			return ret != 0;
diff --git a/std/lua/LocaleCategory.hx b/std/lua/LocaleCategory.hx
index cc966c1ef7f42f73160b809a334dbbf198ff9435..a1ef25a7da1ac5bfe69c18f513542f511c33e2bb 100644
--- a/std/lua/LocaleCategory.hx
+++ b/std/lua/LocaleCategory.hx
@@ -1,10 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
-@:enum
-abstract LocaleCategory(String){
-	var All      = "all";
-	var Collate  = "collate";
-	var Ctype    = "ctype";
+
+enum abstract LocaleCategory(String) {
+	var All = "all";
+	var Collate = "collate";
+	var Ctype = "ctype";
 	var Monetary = "monetary";
-	var Numeric  = "numeric";
-	var Time     = "time";
+	var Numeric = "numeric";
+	var Time = "time";
 }
diff --git a/std/lua/Lua.hx b/std/lua/Lua.hx
index e28a3ea0ee7017a0ab326ee9fdfcd974433f87f5..cd66252f191ab504d65b81474e65b9261c5b676c 100644
--- a/std/lua/Lua.hx
+++ b/std/lua/Lua.hx
@@ -1,32 +1,54 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
+
 import haxe.extern.Rest;
 import haxe.Constraints.Function;
 import haxe.extern.Rest;
 
 /**
-  These are all global static methods within Lua.
- **/
-
+	These are all global static methods within Lua.
+**/
 @:native("_G")
 extern class Lua {
 	/**
 		A global variable that holds a string containing the current interpreter
 		version.
 	**/
-	public static var _VERSION : String;
+	public static var _VERSION:String;
 
-	public static var arg : Table<Int, String>;
+	public static var arg:Table<Int, String>;
 
 	/**
 		Pushes onto the stack the metatable in the registry.
 	**/
-	public static function getmetatable(tbl:Table<Dynamic,Dynamic>): Table<Dynamic,Dynamic>;
+	public static function getmetatable(tbl:Table<Dynamic, Dynamic>):Table<Dynamic, Dynamic>;
 
 	/**
 		Pops a table from the stack and sets it as the new metatable for the value
 		at the given acceptable index.
 	**/
-	public static function setmetatable(tbl:Table<Dynamic,Dynamic>, mtbl: Table<Dynamic, Dynamic>): Table<Dynamic, Dynamic>;
+	public static function setmetatable(tbl:Table<Dynamic, Dynamic>, mtbl:Table<Dynamic, Dynamic>):Table<Dynamic, Dynamic>;
 
 	/**
 		Pops a table from the stack and sets it as the new environment for the value
@@ -34,7 +56,7 @@ extern class Lua {
 		a thread nor a userdata, lua_setfenv returns `0`.
 		Otherwise it returns `1`.
 	**/
-	public static function setfenv(i:Int , tbl:Table<Dynamic, Dynamic>): Void;
+	public static function setfenv(i:Int, tbl:Table<Dynamic, Dynamic>):Void;
 
 	/**
 		Allows a program to traverse all fields of a table.
@@ -53,7 +75,7 @@ extern class Lua {
 		to a non-existent field in the table is assigned. Existing fields may
 		however be modified. In particular, existing fields may be cleared.
 	**/
-	public static function next<K,V>(k:Table<K, V>, ?i : V): NextResult<K,V>;
+	public static function next<K, V>(k:Table<K, V>, ?i:K):NextResult<K, V>;
 
 	/**
 		Receives an argument of any type and converts it to a string in a reasonable
@@ -61,35 +83,35 @@ extern class Lua {
 
 		For complete control of how numbers are converted, use`NativeStringTools.format`.
 	**/
-	public static function tostring(v:Dynamic): String;
+	public static function tostring(v:Dynamic):String;
 
-	public static function ipairs<T>(t:Table<Int,T>): PairsResult<Int,T>;
+	public static function ipairs<K, V>(t:Table<K, V>):IPairsResult<K, V>;
 
-	public static function pairs<K,V>(t:Table<K,V>): PairsResult<K,V> ;
+	public static function pairs<K, V>(t:Table<K, V>):PairsResult<K, V>;
 
-	public static function require(module:String) : Dynamic;
+	public static function require(module:String):Dynamic;
 
 	/**
 		Converts the Lua value at the given acceptable base to `Int`.
 		The Lua value must be a number or a string convertible to a number,
 		otherwise `tonumber` returns `0`.
 	**/
-	public static function tonumber(str:String, ?base:Int): Int;
+	public static function tonumber(str:String, ?base:Int):Int;
 
 	/**
 		Returns the Lua type of its only argument as a string.
 		The possible results of this function are:
 
-		 * `"nil"` (a string, not the Lua value nil),
-		 * `"number"`
-		 * `"string"`
-		 * `"boolean"`
-		 * `"table"`
-		 * `"function"`
-		 * `"thread"`
-		 * `"userdata"`
+		* `"nil"` (a string, not the Lua value nil),
+		* `"number"`
+		* `"string"`
+		* `"boolean"`
+		* `"table"`
+		* `"function"`
+		* `"thread"`
+		* `"userdata"`
 	**/
-	public static function type(v:Dynamic) : String;
+	public static function type(v:Dynamic):String;
 
 	/**
 		Receives any number of arguments, and prints their values to stdout,
@@ -99,54 +121,54 @@ extern class Lua {
 
 		For complete control of how numbers are converted, use `NativeStringTools.format`.
 	**/
-	public static function print(v:haxe.extern.Rest<Dynamic>) : Void;
+	public static function print(v:haxe.extern.Rest<Dynamic>):Void;
 
 	/**
 		If `n` is a number, returns all arguments after argument number `n`.
 		Otherwise, `n` must be the string `"#"`, and select returns the total
 		number of extra arguments it received.
 	**/
-	public static function select(n:Dynamic, rest:Rest<Dynamic>) : Dynamic;
+	public static function select(n:Dynamic, rest:Rest<Dynamic>):Dynamic;
 
 	/**
 		Gets the real value of `table[index]`, without invoking any metamethod.
 	**/
-	public static function rawget<K,V>(t:Table<K,V>, k:K) : V;
+	public static function rawget<K, V>(t:Table<K, V>, k:K):V;
 
 	/**
 		Sets the real value of `table[index]` to value, without invoking any metamethod.
 	**/
-	public static function rawset<K,V>(t:Table<K,V>, k:K, v:V) : Void;
+	public static function rawset<K, V>(t:Table<K, V>, k:K, v:V):Void;
 
 	/**
 		This function is a generic interface to the garbage collector.
 		It performs different functions according to its first argument.
 	**/
-	public static function collectgarbage(opt:CollectGarbageOption, ?arg:Int) : Int;
+	public static function collectgarbage(opt:CollectGarbageOption, ?arg:Int):Int;
 
 	/**
 		Issues an error when the value of its argument `v` is `false` (i.e., `null`
 		or `false`) otherwise, returns all its arguments. message is an error message.
 		when absent, it defaults to "assertion failed!"
 	**/
-	public static function assert<T>(v:T, ?message:String) : T;
+	public static function assert<T>(v:T, ?message:String):T;
 
 	/**
 		Loads and runs the given file.
 	**/
-	public static function dofile(filename:String) : Void;
+	public static function dofile(filename:String):Void;
 
 	/**
 		Generates a Lua error. The error message (which can actually be a Lua value
 		of any type) must be on the stack top. This function does a long jump,
 		and therefore never returns.
 	**/
-	public static function error(message:String, ?level:Int) : Void;
+	public static function error(message:String, ?level:Int):Void;
 
 	/**
 		Calls a function in protected mode.
 	**/
-	public static function pcall(f:Function, rest:Rest<Dynamic>) : PCallResult;
+	public static function pcall(f:Function, rest:Rest<Dynamic>):PCallResult;
 
 	/**
 		Returns `true` if the two values in acceptable indices `v1` and `v2` are
@@ -154,32 +176,30 @@ extern class Lua {
 		Otherwise returns `false`.
 		Also returns `false` if any of the indices are non valid.
 	**/
-	public static function rawequal(v1:Dynamic, v2:Dynamic) : Bool;
+	public static function rawequal(v1:Dynamic, v2:Dynamic):Bool;
 
 	/**
 		This function is similar to pcall, except that you can set a new error
 		handler.
 	**/
-	public static function xpcall(f:Function, msgh:Function, rest:Rest<Dynamic> ) : PCallResult;
+	public static function xpcall(f:Function, msgh:Function, rest:Rest<Dynamic>):PCallResult;
 
 	/**
 		Loads the chunk from file filename or from the standard input if no filename
 		is given.
 	**/
-	public static function loadfile(filename:String) : LoadResult;
+	public static function loadfile(filename:String):LoadResult;
 
 	/**
 		Loads the chunk from given string.
 	**/
-	public static function load(code:haxe.extern.EitherType<String,Void->String>) : LoadResult;
-
+	public static function load(code:haxe.extern.EitherType<String, Void->String>):LoadResult;
 }
 
 /**
 	Enum for describing garbage collection options
 **/
-@:enum
-abstract CollectGarbageOption(String) {
+enum abstract CollectGarbageOption(String) {
 	var Stop = "stop";
 	var Restart = "restart";
 	var Collect = "collect";
@@ -191,25 +211,32 @@ abstract CollectGarbageOption(String) {
 
 @:multiReturn
 extern class PCallResult {
-	var status : Bool;
-	var value : Dynamic;
+	var status:Bool;
+	var value:Dynamic;
+}
+
+@:multiReturn
+extern class NextResult<K, V> {
+	var index:K;
+	var value:V;
 }
 
 @:multiReturn
-extern class NextResult<K,V> {
-	var index : K;
-	var value : V;
+extern class IPairsResult<K, V> {
+	var next:Table<K, V>->Int->NextResult<Int, V>;
+	var table:Table<K, V>;
+	var index:Int;
 }
 
 @:multiReturn
-extern class PairsResult<K,V> {
-	var next : Table<K,V>->K->NextResult<K,V>;
-	var table : Table<K,V>;
-	var index : V;
+extern class PairsResult<K, V> {
+	var next:Table<K, V>->K->NextResult<K, V>;
+	var table:Table<K, V>;
+	var index:K;
 }
 
 @:multiReturn
 extern class LoadResult {
-	var func : Function;
-	var message : String;
+	var func:Function;
+	var message:String;
 }
diff --git a/std/lua/Math.hx b/std/lua/Math.hx
index dfe157d5d60f1468f79fdd371acdf65c0eee3432..f659c2789c3f823d8063b5a5b20b118461d3f14f 100644
--- a/std/lua/Math.hx
+++ b/std/lua/Math.hx
@@ -1,3 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
 
 import haxe.extern.Rest;
@@ -10,143 +32,143 @@ extern class Math {
 	/**
 		The value of pi.
 	**/
-	static var pi(default,never) : Float;
+	static var pi(default, never):Float;
 
 	/**
 		The value HUGE_VAL, a value larger than or equal to any other numerical value.
 	**/
-	static var huge(default,never) : Float;
+	static var huge(default, never):Float;
 
 	/**
 		Returns the absolute value of x.
 	**/
-	static function abs  (x : Float) : Float;
+	static function abs(x:Float):Float;
 
 	/**
 		Returns the smallest integer larger than or equal to x.
 	**/
-	static function ceil (x : Float) : Int;
+	static function ceil(x:Float):Int;
 
 	/**
 		Returns the largest integer smaller than or equal to x.
 	**/
-	static function floor(x : Float) : Int;
+	static function floor(x:Float):Int;
 
 	/**
 		Returns the arc cosine of x (in radians).
 	**/
-	static function acos (x : Float) : Float;
+	static function acos(x:Float):Float;
 
 	/**
 		Returns the arc sine of x (in radians).
 	**/
-	static function asin (x : Float) : Float;
+	static function asin(x:Float):Float;
 
 	/**
 		Returns the arc tangent of x (in radians).
 	**/
-	static function atan (x : Float) : Float;
+	static function atan(x:Float):Float;
 
 	/**
 		Returns the arc tangent of y/x (in radians), but uses the signs of both parameters to find the quadrant of the result.
 		(It also handles correctly the case of x being zero.)
 	**/
-	static function atan2(y : Float, x : Float) : Float;
+	static function atan2(y:Float, x:Float):Float;
 
 	/**
 		Returns the cosine of x (assumed to be in radians).
 	**/
-	static function cos  (x : Float) : Float;
+	static function cos(x:Float):Float;
 
 	/**
 		Returns the hyperbolic cosine of x.
 	**/
-	static function cosh (x : Float) : Float;
+	static function cosh(x:Float):Float;
 
 	/**
 		Returns the sine of x (assumed to be in radians).
 	**/
-	static function sin  (x : Float) : Float;
+	static function sin(x:Float):Float;
 
 	/**
 		Returns the hyperbolic sine of x.
 	**/
-	static function sinh (x : Float) : Float;
+	static function sinh(x:Float):Float;
 
 	/**
 		Returns the tangent of x (assumed to be in radians)
 	**/
-	static function tan  (x : Float) : Float;
+	static function tan(x:Float):Float;
 
 	/**
 		Returns the hyperbolic tangent of x.
 	**/
-	static function tanh (x : Float) : Float;
+	static function tanh(x:Float):Float;
 
 	/**
 		Returns the angle x (given in degrees) in radians.
 	**/
-	static function rad  (x : Float) : Float;
+	static function rad(x:Float):Float;
 
 	/**
 		Returns two numbers, the integral part of x and the fractional part of x.
 	**/
-	static function modf (x : Float) : Float;
+	static function modf(x:Float):Float;
 
 	/**
 		Returns the remainder of the division of x by y that rounds the quotient towards zero.
 	**/
-	static function fmod (x : Float) : Float;
+	static function fmod(x:Float):Float;
 
 	/**
 		Returns y-th power of x.
 	**/
-	static function pow  (x : Float, y : Float) : Float;
+	static function pow(x:Float, y:Float):Float;
 
 	/**
 		Returns the square root of x.
 	**/
-	static function sqrt (x : Float) : Float;
+	static function sqrt(x:Float):Float;
 
 	/**
 		Returns the value e^x.
 	**/
-	static function exp  (x : Float) : Float;
+	static function exp(x:Float):Float;
 
 	/**
 		Returns m and e such that x = m2^e, e is an integer and the absolute value of m is in the range [0.5, 1) (or zero when x is zero).
 	**/
-	static function frexp(x : Float) : MathFrexpResult;
+	static function frexp(x:Float):MathFrexpResult;
 
 	/**
 		Returns m2^e (e should be an integer).
 	**/
-	static function ldexp(m : Float, e : Int) : Float;
+	static function ldexp(m:Float, e:Int):Float;
 
 	/**
 		Returns the natural logarithm of x.
 	**/
-	static function log  (x : Float) : Float;
+	static function log(x:Float):Float;
 
 	/**
 		Returns the base-10 logarithm of x.
 	**/
-	static function log10(x : Float) : Float;
+	static function log10(x:Float):Float;
 
 	/**
 		Returns the maximum value among its arguments.
 	**/
-	static function max  (x : Float, numbers : Rest<Float>) : Float;
+	static function max(x:Float, numbers:Rest<Float>):Float;
 
 	/**
 		Returns the minimum value among its arguments.
 	**/
-	static function min  (x : Float, numbers : Rest<Float>) : Float;
+	static function min(x:Float, numbers:Rest<Float>):Float;
 
 	/**
 		Returns the angle x (given in radians) in degrees.
 	**/
-	static function deg  (x : Float) : Float;
+	static function deg(x:Float):Float;
 
 	/**
 		This function is an interface to the simple pseudo-random generator function rand provided by ANSI C.
@@ -156,12 +178,12 @@ extern class Math {
 		When called with an integer number `m`, returns a uniform pseudo-random integer in the range [1, m].
 		When called with two integer numbers `m` and `n`, returns a uniform pseudo-random integer in the range [m, n].
 	**/
-	static function random(?m:Float, ?n:Float) : Float;
+	static function random(?m:Float, ?n:Float):Float;
 
 	/**
 		Sets `x` as the "seed" for the pseudo-random generator: equal seeds produce equal sequences of numbers.
 	**/
-	static function randomseed(x : Float) : Float;
+	static function randomseed(x:Float):Float;
 }
 
 /**
diff --git a/std/lua/NativeIterator.hx b/std/lua/NativeIterator.hx
index 5d9866a7f0e62015b43abf4dbd7a20419fa83fb9..f306800aa63473be6769e3eb482a5f2e58e5c767 100644
--- a/std/lua/NativeIterator.hx
+++ b/std/lua/NativeIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,24 +24,22 @@ package lua;
 
 /**
 	This abstract enables easy conversion from basic lua iterators
-	(i.e., a function that is called until it returns null), and 
+	(i.e., a function that is called until it returns null), and
 	Haxe iterators, which provide a next/hasNext interface.
 **/
-
 @:callable
 abstract NativeIterator<T>(Void->T) {
-	public function new(f : Void->T) {
-		this = f; 
+	public function new(f:Void->T) {
+		this = f;
 	}
 
 	@:from
-	public static function fromF<T>(f : Void->T){
+	public static function fromF<T>(f:Void->T) {
 		return new NativeIterator(f);
 	}
 
 	@:to
-	public function toIterator() : Iterator<T> {
+	public function toIterator():Iterator<T> {
 		return new HaxeIterator(this);
 	}
 }
-
diff --git a/std/lua/NativeStringTools.hx b/std/lua/NativeStringTools.hx
index 6d4e7c6f45b773fee7bcfcb0d401f8f2bacf72ee..9ac0cfacfc77bb66e48d57ec8102673f798d0eda 100644
--- a/std/lua/NativeStringTools.hx
+++ b/std/lua/NativeStringTools.hx
@@ -1,6 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
+
 /**
-	These are all externs for the base Lua "string" class, which functions 
+	These are all externs for the base Lua "string" class, which functions
 	as an additional set of string tools.
 
 	Note that all relevant indexes are "1" based.
@@ -8,133 +31,128 @@ package lua;
 @:native("_G.string")
 extern class NativeStringTools {
 	/**
-		Receives a string and returns its length. The empty string `""` has 
+		Receives a string and returns its length. The empty string `""` has
 		length `0`. Embedded zeros are counted, so `"a\000bc\000"` has length `5`.
 	**/
-	public static function len(str : String): Int;
+	public static function len(str:String):Int;
 
 	/**
-		Receives zero or more integers. Returns a string with length equal to the 
-		number of arguments, in which each character has the internal numerical 
+		Receives zero or more integers. Returns a string with length equal to the
+		number of arguments, in which each character has the internal numerical
 		code equal to its corresponding argument.
 		Note that numerical codes are not necessarily portable across platforms.
 	**/
-	public static function char(codes: haxe.extern.Rest<Int>): String;
-
+	public static function char(codes:haxe.extern.Rest<Int>):String;
 
 	// TODO: make a note about handling matched groups with multireturn
-	/**
-		Returns the substring of `str` that starts at `start` and continues until `end`; 
-		`start` and `end` can be negative. If `end` is absent, then it is assumed to be 
-		equal to `-1` (which is the same as the string length). 
-		In particular, the call `sub(str,1,end)` returns a prefix of `str` 
-		with length `end`, and `sub(str, -end)` returns a suffix of `str` with 
-		length `start`.
-	**/
-	public static function sub(str : String, start : Int, ?end : Int): StringSub;
 
 	/**
-		Returns the character code at position `index` of `str`.
+		Returns the substring of `str` that starts at `start` and continues until `end`;
+		`start` and `end` can be negative. If `end` is absent, then it is assumed to be
+		equal to `-1` (which is the same as the string length).
+		In particular, the call `sub(str,1,end)` returns a prefix of `str`
+		with length `end`, and `sub(str, -end)` returns a suffix of `str` with
+		length `start`.
 	**/
-	public static function charCodeAt(str : String, index : Int): Int;
+	public static function sub(str:String, start:Int, ?end:Int):StringSub;
 
 	/**
-		Looks for the first match of pattern in the string `str`. 
-		If it finds a match, then `find` returns the indices of `str` where this 
+		Looks for the first match of pattern in the string `str`.
+		If it finds a match, then `find` returns the indices of `str` where this
 		occurrence starts and ends.
-		
-		@param target If the target has captures, then in a successful match the 
-		       captured values are also returned, after the two indices.
+
+		@param target If the target has captures, then in a successful match the
+			   captured values are also returned, after the two indices.
 		@param start specifies where to start the search; its default value is `1`
-		       and can be negative. 
-		@param plain turns off the pattern matching facilities, so the function does 
-		       a plain "find substring" operation, with no characters in pattern 
-		       being considered "magic". Note that if plain is given, then `start` must be given as well.
+			   and can be negative.
+		@param plain turns off the pattern matching facilities, so the function does
+			   a plain "find substring" operation, with no characters in pattern
+			   being considered "magic". Note that if plain is given, then `start` must be given as well.
 	**/
-	public static function find(str : String, target : String, ?start : Int, ?plain : Bool): StringFind;
+	public static function find(str:String, target:String, ?start:Int, ?plain:Bool):StringFind;
 
 	/**
 		Returns the internal numerical codes of the characters `str[index]`.
 		Note that numerical codes are not necessarily portable across platforms.
 	**/
-	public static function byte(str : String, ?index : Int) : Int;
+	public static function byte(str:String, ?index:Int):Int;
 
 	/**
-		Returns a formatted version of its variable number of arguments following 
-		the description given in its first argument (which must be a string). 
-		The format string follows the same rules as the printf family of standard C 
-		functions. The only differences are that the options/modifiers 
-		`*`, `l`, `L`, `n`, `p`, and `h` are not supported and that there is an 
+		Returns a formatted version of its variable number of arguments following
+		the description given in its first argument (which must be a string).
+		The format string follows the same rules as the printf family of standard C
+		functions. The only differences are that the options/modifiers
+		`*`, `l`, `L`, `n`, `p`, and `h` are not supported and that there is an
 		extra option, `q`. The `q` option formats a string in a form suitable to be
-		safely read back by the Lua interpreter: the string is written between 
-		double quotes, and all double quotes, newlines, embedded zeros, 
+		safely read back by the Lua interpreter: the string is written between
+		double quotes, and all double quotes, newlines, embedded zeros,
 		and backslashes in the string are correctly escaped when written.
 		For instance, the call
-   `string.format('%q', 'a string with "quotes" and \n new line')`
+		   `string.format('%q', 'a string with "quotes" and \n new line')`
 		will produce the string:
 		`"a string with \"quotes\" and \
-      new line"`
-		
-		The options `c`, `d` `E`, `e`, `f`, `g`, `G`, `i`, `o`, `u, `X-, and `x` all 
+			  new line"`
+
+		The options `c`, `d` `E`, `e`, `f`, `g`, `G`, `i`, `o`, `u, `X-, and `x` all
 		expect a number as argument, whereas `q` and `s` expect a string.
-		
-		This function does not accept string values containing embedded zeros, 
+
+		This function does not accept string values containing embedded zeros,
 		except as arguments to the `q` option.
 	**/
-	public static function format(str : String, ?e1 : Dynamic, ?e2 : Dynamic, ?e3 : Dynamic, ?e4 : Dynamic): String;
+	public static function format(str:String, ?e1:Dynamic, ?e2:Dynamic, ?e3:Dynamic, ?e4:Dynamic):String;
 
 	/**
-		
+
 	**/
-	@:overload(   function     (str : String, pattern : String, replace : String->Void,   ?n : Int): String {})
-	@:overload(   function     (str : String, pattern : String, replace : String->String, ?n : Int): String {})
-	public static function gsub(str : String, pattern : String, replace : String,		  ?n : Int): String;
+	@:overload(function(str:String, pattern:String, replace:String->Void, ?n:Int):String {})
+	@:overload(function(str:String, pattern:String, replace:String->String, ?n:Int):String {})
+	public static function gsub(str:String, pattern:String, replace:String, ?n:Int):String;
 
 	/**
-		Returns an iterator function that, each time it is called, returns the next 
-		captures from pattern over string `str`. If `pattern` specifies no captures, 
+		Returns an iterator function that, each time it is called, returns the next
+		captures from pattern over string `str`. If `pattern` specifies no captures,
 		then the whole match is produced in each call.
 	**/
-	@:overload(   function     (str : String, pattern : String, match : Void->String,   ?n : Int): String->Void {})
-	public static function gmatch(str : String, pattern : String): Void->String;
+	@:overload(function(str:String, pattern:String, match:Void->String, ?n:Int):String->Void {})
+	public static function gmatch(str:String, pattern:String):Void->String;
 
 	/**
-		Looks for the first match of pattern in the string s. If it finds one, 
+		Looks for the first match of pattern in the string s. If it finds one,
 		then match returns the captures from the pattern; otherwise it returns `null`.
 		If pattern specifies no captures, then the whole match is returned.
-		The optional argument `n` specifies where to start the search; 
+		The optional argument `n` specifies where to start the search;
 		its default value is `1` and can be negative.
 	**/
-	public static function match(str : String, pattern : String, ?n : Int): String;
+	public static function match(str:String, pattern:String, ?n:Int):String;
 
 	/**
-		Receives a string and returns a copy of this string with all lowercase 
-		letters changed to uppercase. All other characters are left unchanged. 
+		Receives a string and returns a copy of this string with all lowercase
+		letters changed to uppercase. All other characters are left unchanged.
 		The definition of what a lowercase letter is depends on the current locale.
 	**/
-	public static function upper(str:String) : String;
+	public static function upper(str:String):String;
 
 	/**
-		Receives a string and returns a copy of this string with all uppercase 
-		letters changed to lowercase. All other characters are left unchanged. 
+		Receives a string and returns a copy of this string with all uppercase
+		letters changed to lowercase. All other characters are left unchanged.
 		The definition of what an uppercase letter is depends on the current locale.
 	**/
-	public static function lower(str:String) : String;
+	public static function lower(str:String):String;
 
 	/**
 		Returns a string containing a binary representation of the given function,
 		so that a later loadstring on this string returns a copy of the function.
 		function must be a Lua function without upvalues.
 	**/
-	public static function dump(d:Dynamic) : Dynamic;
+	public static function dump(d:Dynamic):Dynamic;
 }
 
 @:multiReturn extern class StringFind {
-	var begin : Int;
-	var end : Int;
+	var begin:Int;
+	var end:Int;
 }
 
 @:multiReturn extern class StringSub {
-	var match : String;
-	var count : Int;
+	var match:String;
+	var count:Int;
 }
diff --git a/std/lua/Os.hx b/std/lua/Os.hx
index f5af79484ab686485ecd1600dcd91dde7f4a5ffb..8997143bf14e845c7af4cc2dd0df17e5b945be22 100644
--- a/std/lua/Os.hx
+++ b/std/lua/Os.hx
@@ -1,3 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
 
 /**
@@ -9,119 +31,120 @@ extern class Os {
 		Returns an approximation of the amount in seconds of CPU time used by the
 		program.
 	**/
-	public static function clock() : Float;
+	public static function clock():Float;
 
-	@:overload(   function     (format : String, time : Time) : DateType {})
-	@:overload(   function     (format : String) : DateType {})
-	public static function date() : DateType;
+	@:overload(function(format:String, time:Time):DateType {})
+	@:overload(function(format:String):DateType {})
+	public static function date():DateType;
 
 	/**
-		Returns the number of seconds from time `t1` to time `t2`. 
+		Returns the number of seconds from time `t1` to time `t2`.
 		In POSIX, Windows, and some other systems, this value is exactly `t2-t1`.
 	**/
-	public static function difftime(t2: Time, t1: Time) : Float;
+	public static function difftime(t2:Time, t1:Time):Float;
 
 	// TODO: multi-return
+
 	/**
-		This function is equivalent to the C function system. It passes command to 
+		This function is equivalent to the C function system. It passes command to
 		be executed by an operating system shell. It returns a status code,
-		which is system-dependent. If command is absent, then it returns 
+		which is system-dependent. If command is absent, then it returns
 		nonzero if a shell is available and zero otherwise.
 	**/
-#if (lua_ver < 5.2)
-	public static function execute(?command:String) : Int;
-#elseif (lua_ver >= 5.2)
-	public static function execute(?command:String) : OsExecute;
-#else 
-	public static function execute(?command:String) : Dynamic;
-#end
+	#if (lua_ver < 5.2)
+	public static function execute(?command:String):Int;
+	#elseif (lua_ver >= 5.2)
+	public static function execute(?command:String):OsExecute;
+	#else
+	public static function execute(?command:String):Dynamic;
+	#end
 
 	/**
-		Calls the C function exit, with an optional code, to terminate the host program. 
+		Calls the C function exit, with an optional code, to terminate the host program.
 		The default value for code is the success code.
 	**/
-	public static function exit(code: Int) : Int;
+	public static function exit(code:Int):Int;
 
 	/**
-		Returns the value of the process environment variable `varname`, or `null` 
+		Returns the value of the process environment variable `varname`, or `null`
 		if the variable is not defined.
 	**/
-	public static function getenv(varname : String) : String;
+	public static function getenv(varname:String):String;
 
 	/**
 		Deletes the file or directory with the given name.
-		Directories must be empty to be removed. 
+		Directories must be empty to be removed.
 	**/
-	public static function remove(filename : String) : OsSuccess;
+	public static function remove(filename:String):OsSuccess;
 
 	/**
 		Renames file or directory named `oldname` to `newname`.
 	**/
-	public static function rename(oldname : String, newname : String) : OsSuccess;
+	public static function rename(oldname:String, newname:String):OsSuccess;
 
 	/**
 		Sets the current locale of the program.
 	**/
-	public static function setlocale(locale : String, ?category : LocaleCategory ) : String;
+	public static function setlocale(locale:String, ?category:LocaleCategory):String;
 
 	/**
-		Returns the current time when called without arguments, or a time 
-		representing the date and time specified by the given table. 
+		Returns the current time when called without arguments, or a time
+		representing the date and time specified by the given table.
 
-		The returned value is a number, whose meaning depends on your system. 
-		In POSIX, Windows, and some other systems, this number counts the number 
-		of seconds since some given start time (the "epoch"). 
+		The returned value is a number, whose meaning depends on your system.
+		In POSIX, Windows, and some other systems, this number counts the number
+		of seconds since some given start time (the "epoch").
 		In other systems, the meaning is not specified, and the number returned
 		by time can be used only as an argument to date and difftime.
 	**/
-	public static function time(?arg : TimeParam) : Time;
+	public static function time(?arg:TimeParam):Time;
 
 	/**
-		Returns a string with a file name that can be used for a temporary file. 
+		Returns a string with a file name that can be used for a temporary file.
 		The file must be explicitly opened before its use and explicitly removed
 		when no longer needed.
-		
-		When possible, you may prefer to use `Io.tmpfile`, which automatically 
+
+		When possible, you may prefer to use `Io.tmpfile`, which automatically
 		removes the file when the program ends.
 	**/
-	public static function tmpname() : String;
+	public static function tmpname():String;
 }
 
 /**
 	A typedef that matches the date parameter `Os.time()` will accept.
 **/
 typedef TimeParam = {
-	year   : Float,
-	month  : Float,
-	day    : Float,
-	?hour  : Int,
-	?min   : Int,
-	?sec   : Int,
-	?isdst : Bool
+	year:Int,
+	month:Int,
+	day:Int,
+	?hour:Int,
+	?min:Int,
+	?sec:Int,
+	?isdst:Bool
 }
 
 /**
 	A typedef that describes the output of `Os.date()`.
 **/
 typedef DateType = {
-	hour  : Int,
-	min   : Int,
-	sec   : Int,
-	isdst : Bool,
-	year  : Int,
-	month : Int,
-	wday  : Int,
-	yday  : Int,
-	day   : Int,
+	hour:Int,
+	min:Int,
+	sec:Int,
+	isdst:Bool,
+	year:Int,
+	month:Int,
+	wday:Int,
+	yday:Int,
+	day:Int,
 }
 
 @:multiReturn extern class OsExecute {
-	var success : Bool;
-	var output  : String;
-	var status  : Int;
+	var success:Bool;
+	var output:String;
+	var status:Int;
 }
 
 @:multiReturn extern class OsSuccess {
-	var success : Bool;
-	var message : String;
+	var success:Bool;
+	var message:String;
 }
diff --git a/std/lua/Package.hx b/std/lua/Package.hx
index c1867eeb16d00757fe6e742be41f35ec0cafab5f..47573b59b53c39d2f57b4cd44a00abcbd22ccc86 100644
--- a/std/lua/Package.hx
+++ b/std/lua/Package.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,52 +19,53 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package lua;
 
 /**
-  Externs for lua package handling
- **/
+	Externs for lua package handling
+**/
 @:native("_G.package")
 extern class Package {
 	/**
-		A string describing some compile-time configurations for packages. 
+		A string describing some compile-time configurations for packages.
 	**/
-	public static var config : String;
+	public static var config:String;
 
 	/**
 		The path used by require to search for a Lua loader.
 	**/
-	public static var path : String;
+	public static var path:String;
 
 	/**
 		The path used by require to search for a C loader.
 	**/
-	public static var cpath : String;
+	public static var cpath:String;
 
 	/**
-		A table used by require to control which modules are already loaded. 
+		A table used by require to control which modules are already loaded.
 	**/
-	public static var loaded : Table<String, Bool>;
+	public static var loaded:Table<String, Bool>;
 
 	/**
 		A table to store loaders for specific modules.
 	**/
-	public static var preload : Table<String, Bool>;
+	public static var preload:Table<String, Bool>;
 
 	/**
 		A table used by require to control how to load modules.
-		Each entry in this table is a searcher function. 
+		Each entry in this table is a searcher function.
 	**/
-	public static var searchers :Table<Int,Void->Null<String>>;
+	public static var searchers:Table<Int, Void->Null<String>>;
 
 	/**
 		Searches for the given `libname` in the given path `funcname`.
-		A path is a string containing a sequence of templates separated by semicolons. 
+		A path is a string containing a sequence of templates separated by semicolons.
 	**/
-	public static function searchpath(name : String, path : String, ?sep : String, ?rep : String) : Null<String>;
+	public static function searchpath(name:String, path:String, ?sep:String, ?rep:String):Null<String>;
 
 	/**
 		Dynamically links the host program with the C library `libname`.
 	**/
-	public static function loadlib(libname : String, funcname : String) : Void;
+	public static function loadlib(libname:String, funcname:String):Void;
 }
diff --git a/std/lua/PairTools.hx b/std/lua/PairTools.hx
index df8ad945ac0bb0d0181e8b4b18eaa0a6ec2b5370..96760fd4363373483628461256017ddb165fa07c 100644
--- a/std/lua/PairTools.hx
+++ b/std/lua/PairTools.hx
@@ -1,58 +1,124 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
+
 /**
-  A set of utility methods for working with the Lua table extern.
- **/
+	A set of utility methods for working with the Lua table extern.
+**/
 class PairTools {
-	public static function ipairsEach<T>(table:Table<Dynamic,T>, func : Int->T->Void) : Void {
+	public static function ipairsEach<T>(table:Table<Dynamic, T>, func:Int->T->Void):Void {
 		untyped __lua__("for i,v in _G.ipairs(table) do func(i,v) end");
 	}
-	public static function pairsEach<A,B>(table:Table<A,B>, func : A->B->Void) : Void {
+
+	public static function pairsEach<A, B>(table:Table<A, B>, func:A->B->Void):Void {
 		untyped __lua__("for k,v in _G.pairs(table) do func(k,v) end");
 	}
-	public static function ipairsMap<A,B>(table:Table<Dynamic,A>, func : Int->A->B) : Table<Int,B>  {
-		var ret : Table<Int,B> = Table.create();
-		untyped __lua__( "for i,v in _G.ipairs(table) do ret[i] = func(i,v) end;");
+
+	public static function ipairsMap<A, B>(table:Table<Dynamic, A>, func:Int->A->B):Table<Int, B> {
+		var ret:Table<Int, B> = Table.create();
+		untyped __lua__("for i,v in _G.ipairs(table) do ret[i] = func(i,v) end;");
 		return ret;
 	}
-	public static function pairsMap<A,B,C>(table:Table<A,B>, func : A->B->C->C) : Table<A,C> {
-		var ret : Table<A,C> = Table.create();
-		untyped __lua__( "for k,v in _G.pairs(table) do ret[k] = func(k,v) end;");
+
+	public static function pairsMap<A, B, C>(table:Table<A, B>, func:A->B->C->C):Table<A, C> {
+		var ret:Table<A, C> = Table.create();
+		untyped __lua__("for k,v in _G.pairs(table) do ret[k] = func(k,v) end;");
 		return ret;
 	}
-	public static function ipairsFold<A,B>(table:Table<Int,A>, func : Int->A->B->B, seed: B) : B  {
+
+	public static function ipairsFold<A, B>(table:Table<Int, A>, func:Int->A->B->B, seed:B):B {
 		untyped __lua__("for i,v in _G.ipairs(table) do seed = func(i,v,seed) end");
 		return untyped __lua__("seed");
 	}
-	public static function pairsFold<A,B,C>(table:Table<A,B>, func : A->B->C->C, seed: C) : C {
+
+	public static function pairsFold<A, B, C>(table:Table<A, B>, func:A->B->C->C, seed:C):C {
 		untyped __lua__("for k,v in _G.pairs(table) do seed = func(k,v,seed) end");
 		return untyped __lua__("seed");
 	}
 
-	public static function ipairsConcat<T>(table1:Table<Int,T>, table2:Table<Int,T>){
-		var ret:Table<Int,T> = Table.create();
-		ipairsFold(table1, function(a,b,c:Table<Int,T>){ c[a] = b; return c;}, ret);
+	public static function ipairsConcat<T>(table1:Table<Int, T>, table2:Table<Int, T>) {
+		var ret:Table<Int, T> = Table.create();
+		ipairsFold(table1, function(a, b, c:Table<Int, T>) {
+			c[a] = b;
+			return c;
+		}, ret);
 		var size = lua.TableTools.maxn(ret);
-		ipairsFold(table2, function(a,b,c:Table<Int,T>){ c[a + size] = b; return c;}, ret);
+		ipairsFold(table2, function(a, b, c:Table<Int, T>) {
+			c[a + size] = b;
+			return c;
+		}, ret);
 		return ret;
 	}
 
-	public static function pairsMerge<A,B>(table1:Table<A,B>, table2:Table<A,B>){
+	public static function pairsMerge<A, B>(table1:Table<A, B>, table2:Table<A, B>) {
 		var ret = copy(table1);
-		pairsEach(table2, function(a,b:B) ret[cast a] = b);
+		pairsEach(table2, function(a, b:B) ret[cast a] = b);
 		return ret;
 	}
 
-	public static function ipairsExist<T>(table:Table<Int,T>, func: Int->T->Bool) {
+	public static function ipairsExist<T>(table:Table<Int, T>, func:Int->T->Bool) {
 		untyped __lua__("for k,v in _G.ipairs(table) do if func(k,v) then return true end end");
 	}
 
-	public static function pairsExist<A,B>(table:Table<A,B>, func: A->B->Bool) {
+	public static function pairsExist<A, B>(table:Table<A, B>, func:A->B->Bool) {
 		untyped __lua__("for k,v in _G.pairs(table) do if func(k,v) then return true end end");
 	}
 
-	public static function copy<A,B>(table1:Table<A,B>) : Table<A,B> {
-		var ret : Table<A,B> = Table.create();
+	public static function copy<A, B>(table1:Table<A, B>):Table<A, B> {
+		var ret:Table<A, B> = Table.create();
 		untyped __lua__("for k,v in _G.pairs(table1) do ret[k] = v end");
 		return ret;
 	}
+
+	public static function pairsIterator<A, B>(table:Table<A, B>):Iterator<{index:A, value:B}> {
+		var p = Lua.pairs(table);
+		var next = p.next;
+		var i = p.index;
+		return {
+			next: function() {
+				var res = next(table, i);
+				i = res.index;
+				return {index: res.index, value: res.value};
+			},
+			hasNext: function() {
+				return Lua.next(table, i).value != null;
+			}
+		}
+	}
+
+	public static function ipairsIterator<A, B>(table:Table<A, B>):Iterator<{index:Int, value:B}> {
+		var p = Lua.ipairs(table);
+		var next = p.next;
+		var i = p.index;
+		return {
+			next: function() {
+				var res = next(table, i);
+				i = res.index;
+				return {index: res.index, value: res.value};
+			},
+			hasNext: function() {
+				return next(table, i).value != null;
+			}
+		}
+	}
 }
diff --git a/std/lua/Result.hx b/std/lua/Result.hx
index fd396cc190e38a2452895923b6a25bcaa05fc3f2..cfb04795370b71662547f4020326175884fd634e 100644
--- a/std/lua/Result.hx
+++ b/std/lua/Result.hx
@@ -1,5 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
+
 @:multiReturn extern class Result<T> {
-	var result : T;
-	var message  : String;
+	var result:T;
+	var message:String;
 }
diff --git a/std/lua/Table.hx b/std/lua/Table.hx
index aa96960bd9abd5c2ca8b5e9954cb5cb054430c80..69dcd9996f7402749522b550aa2dc7bc3431985b 100644
--- a/std/lua/Table.hx
+++ b/std/lua/Table.hx
@@ -1,36 +1,78 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
 
 /**
 	This library provides generic functions for table manipulation.
 **/
 // TODO: use an abstract here?
+
 @:native("_G.table")
-extern class Table<A,B> implements ArrayAccess<B> implements Dynamic<B> {
+extern class Table<A, B> implements ArrayAccess<B> implements Dynamic<B> {
+	@:pure public static function create<A, B>(?arr:Array<B>, ?hsh:Dynamic):Table<A, B>;
 
-	@:analyzer(no_fusion)
-	public inline static function create<A,B>(?arr:Array<B>, ?hsh:Dynamic) : Table<A,B> {
-		return untyped __lua_table__(arr,hsh);
+	public inline static function fromArray<T>(arr:Array<T>):Table<Int, T> {
+		var ret = Table.create();
+		for (idx in 0...arr.length) {
+			ret[idx + 1] = arr[idx];
+		}
+		return ret;
 	}
 
-	@:overload(function<A,B>(table:Table<A,B>):Void{})
-	public static function concat<A,B>(table:Table<A,B>, ?sep:String) : String;
+	public inline static function fromMap<A, B>(map:Map<A, B>):Table<A, B> {
+		var ret = Table.create();
+		for (k in map.keys()) {
+			ret[untyped k] = map.get(k);
+		}
+		return ret;
+	}
+
+	public inline static function fromDynamic<A, B>(dyn:Dynamic):Table<A, B> {
+		var ret = Table.create();
+		for (f in Reflect.fields(dyn)) {
+			ret[untyped f] = Reflect.field(dyn, f);
+		}
+		return ret;
+	}
 
-	public static function foreach<A,B>(table:Table<A,B>, f:A->B->Void) : Void;
-	public static function foreachi<A,B>(table:Table<A,B>, f:A->B->Int->Void) : Void;
+	@:overload(function<A, B>(table:Table<A, B>):Void {})
+	public static function concat<A, B>(table:Table<A, B>, ?sep:String, ?i:Int, ?j:Int):String;
 
-	public static function sort<A,B>(table:Table<A,B>, ?order : A->A->Bool) : Void;
+	public static function foreach<A, B>(table:Table<A, B>, f:A->B->Void):Void;
+	public static function foreachi<A, B>(table:Table<A, B>, f:A->B->Int->Void):Void;
 
-	@:overload(function<B>(table:Table<Int,B>, value:B):Void{})
-	public static function insert<B>(table:Table<Int,B>, pos:Int, value:B) : Void;
+	public static function sort<A, B>(table:Table<A, B>, ?order:A->A->Bool):Void;
 
-	@:overload(function<B>(table:Table<Int,B>):Void{})
-	public static function remove<B>(table:Table<Int,B>, ?pos:Int) : Void;
+	@:overload(function<B>(table:Table<Int, B>, value:B):Void {})
+	public static function insert<B>(table:Table<Int, B>, pos:Int, value:B):Void;
 
-#if (lua_ver >= 5.2)
-	public static function pack<T>(args:haxe.extern.Rest<T>) : Table<Int,T>;
-	public static function unpack<Int,V>(args:lua.Table<Int,V>, ?min : Int, ?max : Int) : Dynamic;
-#end
+	@:overload(function<B>(table:Table<Int, B>):Void {})
+	public static function remove<B>(table:Table<Int, B>, ?pos:Int):Void;
 
+	#if (lua_ver >= 5.2)
+	public static function pack<T>(args:haxe.extern.Rest<T>):Table<Int, T>;
+	public static function unpack<Int, V>(args:lua.Table<Int, V>, ?min:Int, ?max:Int):Dynamic;
+	#end
 }
 
 typedef AnyTable = Table<Dynamic, Dynamic>;
diff --git a/std/lua/TableTools.hx b/std/lua/TableTools.hx
index f95fdac07283e9bd8049b75aa9d2f1f5b5ad8ffe..9275914d026e5b1451b0adf42f0df2ca3ca9dd8c 100644
--- a/std/lua/TableTools.hx
+++ b/std/lua/TableTools.hx
@@ -1,3 +1,24 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
 
@@ -6,10 +27,10 @@ package lua;
 **/
 @:native("_hx_table")
 extern class TableTools {
-	public static function pack<T>(args:haxe.extern.Rest<T>) : Table<Int,T>;
-	public static function unpack<Int,V>(args:lua.Table<Int,V>, ?min : Int, ?max : Int) : Dynamic;
-	public static function maxn(t:Table.AnyTable) : Int;
-	public static function __init__() : Void {
+	public static function pack<T>(args:haxe.extern.Rest<T>):Table<Int, T>;
+	public static function unpack<Int, V>(args:lua.Table<Int, V>, ?min:Int, ?max:Int):Dynamic;
+	public static function maxn(t:Table.AnyTable):Int;
+	public static function __init__():Void {
 		untyped __define_feature__("use._hx_table", null);
 	}
 }
diff --git a/std/lua/Thread.hx b/std/lua/Thread.hx
index 9762f7391bca8722b26095b43bba838dfb1a15d7..6aa9e36391be61b25dae2a2b57cfa64fca91949f 100644
--- a/std/lua/Thread.hx
+++ b/std/lua/Thread.hx
@@ -1,6 +1,5 @@
-
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +23,7 @@
 package lua;
 
 /**
-  The sole purpose of this extern is to provide a concrete type for 
-  basic reflection purposes.
+	The sole purpose of this extern is to provide a concrete type for
+	basic reflection purposes.
 **/
 class Thread {}
diff --git a/std/lua/Time.hx b/std/lua/Time.hx
index 035e453c5f5b074eea0e4df0a9aa1f68b1907aec..3c114a1fb9367e3d78a49216a2b575a02817f5d7 100644
--- a/std/lua/Time.hx
+++ b/std/lua/Time.hx
@@ -1,6 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
+
 /*
-   Note: Lua timestamps are usually ints. Platform differences can produce 
-   Floats in certain cases.
+	Note: Lua timestamps are usually ints. Platform differences can produce
+	Floats in certain cases.
  */
 typedef Time = Float;
diff --git a/std/lua/UserData.hx b/std/lua/UserData.hx
index 35561532a691d2e7179baeced1803184b2d69d1c..69158e477d6912c6bdc82368f6cf45c4d580143c 100644
--- a/std/lua/UserData.hx
+++ b/std/lua/UserData.hx
@@ -1,2 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 lua;
+
 class UserData {}
diff --git a/std/lua/_lua/_hx_apply.lua b/std/lua/_lua/_hx_apply.lua
deleted file mode 100644
index 007e4cf9d42fd0c965998a3f5876e5d59e99f9d2..0000000000000000000000000000000000000000
--- a/std/lua/_lua/_hx_apply.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-local function _hx_apply(f, ...)
-  return f(...)
-end
-local function _hx_apply_self(self, f, ...)
-  return self[f](self,...)
-end
diff --git a/std/lua/_lua/_hx_apply_self.lua b/std/lua/_lua/_hx_apply_self.lua
new file mode 100644
index 0000000000000000000000000000000000000000..ab14fbaed92c7a1fa5ad31622bfc8c81a5f0e775
--- /dev/null
+++ b/std/lua/_lua/_hx_apply_self.lua
@@ -0,0 +1,3 @@
+_hx_apply_self = function(self, f, ...)
+  return self[f](self,...)
+end
diff --git a/std/lua/_lua/_hx_bind.lua b/std/lua/_lua/_hx_bind.lua
new file mode 100644
index 0000000000000000000000000000000000000000..1b15ae95eae906d777add909ad6c9a7e51c7d5a3
--- /dev/null
+++ b/std/lua/_lua/_hx_bind.lua
@@ -0,0 +1,14 @@
+_hx_bind = function(o,m)
+  if m == nil then return nil end;
+  local f;
+  if o._hx__closures == nil then
+    _G.rawset(o, '_hx__closures', {});
+  else
+    f = o._hx__closures[m];
+  end
+  if (f == nil) then
+    f = function(...) return m(o, ...) end;
+    o._hx__closures[m] = f;
+  end
+  return f;
+end
diff --git a/std/lua/_lua/_hx_bit.lua b/std/lua/_lua/_hx_bit.lua
new file mode 100644
index 0000000000000000000000000000000000000000..17d33995275711533926c4440e7273cd41f9154d
--- /dev/null
+++ b/std/lua/_lua/_hx_bit.lua
@@ -0,0 +1,11 @@
+-- require this for lua 5.1
+pcall(require, 'bit')
+if bit then
+  _hx_bit = bit
+else
+  local _hx_bit_raw = _G.require('bit32')
+  _hx_bit = setmetatable({}, { __index = _hx_bit_raw });
+  -- lua 5.2 weirdness
+  _hx_bit.bnot = function(...) return _hx_bit_clamp(_hx_bit_raw.bnot(...)) end;
+  _hx_bit.bxor = function(...) return _hx_bit_clamp(_hx_bit_raw.bxor(...)) end;
+end
diff --git a/std/lua/_lua/_hx_bit_clamp.lua b/std/lua/_lua/_hx_bit_clamp.lua
new file mode 100644
index 0000000000000000000000000000000000000000..e39c024fc1e7cfa4c2ba81e797829b885a8f289e
--- /dev/null
+++ b/std/lua/_lua/_hx_bit_clamp.lua
@@ -0,0 +1,10 @@
+_hx_bit_clamp = function(v)
+  if v <= 2147483647 and v >= -2147483648 then
+    if v > 0 then return _G.math.floor(v)
+    else return _G.math.ceil(v)
+    end
+  end
+  if v > 2251798999999999 then v = v*2 end;
+  if (v ~= v or math.abs(v) == _G.math.huge) then return nil end
+  return _hx_bit.band(v, 2147483647 ) - math.abs(_hx_bit.band(v, 2147483648))
+end
diff --git a/std/lua/_lua/_hx_box_mr.lua b/std/lua/_lua/_hx_box_mr.lua
new file mode 100644
index 0000000000000000000000000000000000000000..5d299d17d56a294ecdaa52e271de129d3049cba6
--- /dev/null
+++ b/std/lua/_lua/_hx_box_mr.lua
@@ -0,0 +1,7 @@
+_hx_box_mr = function(x,nt)
+    res = _hx_o({__fields__={}})
+    for i,v in ipairs(nt) do
+      res[v] = x[i]
+    end
+    return res
+end
diff --git a/std/lua/_lua/_hx_classes.lua b/std/lua/_lua/_hx_classes.lua
index d499a18cdadac00d9b332d356fe512dfd8f01e33..720bb054fe38872e54ff844e02b876687e61ed8f 100644
--- a/std/lua/_lua/_hx_classes.lua
+++ b/std/lua/_lua/_hx_classes.lua
@@ -1,13 +1,7 @@
 local _hxClasses = {}
-Int = (function() _hxClasses.Int = _hx_o({__fields__={__name__=true},__name__={"Int"}}); return _hxClasses.Int end)();
-Dynamic = (function() 
-_hxClasses.Dynamic = _hx_o({__fields__={__name__=true},__name__={"Dynamic"}}); return _hxClasses.Dynamic end)();
-Float = (function() 
-_hxClasses.Float = _hx_e(); return _hxClasses.Float end)();
-Float.__name__ = {"Float"}
-Bool = (function() 
-_hxClasses.Bool = _hx_e(); return _hxClasses.Bool end)();
-Bool.__ename__ = {"Bool"}
-Class = (function() 
-_hxClasses.Class = _hx_o({__fields__={__name__=true},__name__={"Class"}}); return _hxClasses.Class end)();
-Enum = _hx_e();
+local Int = _hx_e();
+local Dynamic = _hx_e();
+local Float = _hx_e();
+local Bool = _hx_e();
+local Class = _hx_e();
+local Enum = _hx_e();
diff --git a/std/lua/_lua/_hx_dyn_add.lua b/std/lua/_lua/_hx_dyn_add.lua
new file mode 100644
index 0000000000000000000000000000000000000000..587e2e84b568769164bfc7fecc5ddb84cbc4837b
--- /dev/null
+++ b/std/lua/_lua/_hx_dyn_add.lua
@@ -0,0 +1,7 @@
+_hx_dyn_add = function(a,b)
+  if (_G.type(a) == 'string' or _G.type(b) == 'string') then
+    return Std.string(a)..Std.string(b)
+  else
+    return a + b;
+  end;
+end;
diff --git a/std/lua/_lua/_hx_func_to_field.lua b/std/lua/_lua/_hx_func_to_field.lua
new file mode 100644
index 0000000000000000000000000000000000000000..c7fa1f5a91f659ba808279688f5bd09f29292c40
--- /dev/null
+++ b/std/lua/_lua/_hx_func_to_field.lua
@@ -0,0 +1,9 @@
+_hx_funcToField = function(f)
+  if type(f) == 'function' then
+    return function(self,...)
+      return f(...)
+    end
+  else
+    return f
+  end
+end
diff --git a/std/lua/_lua/_hx_print.lua b/std/lua/_lua/_hx_print.lua
new file mode 100644
index 0000000000000000000000000000000000000000..9fa085ac7d9d1d262428e5d88ae638788ee42bd4
--- /dev/null
+++ b/std/lua/_lua/_hx_print.lua
@@ -0,0 +1 @@
+_hx_print = print or (function() end)
diff --git a/std/lua/_lua/_hx_random_init.lua b/std/lua/_lua/_hx_random_init.lua
new file mode 100644
index 0000000000000000000000000000000000000000..840d719a02d62ca6ce94beffb9c6e21bb180b518
--- /dev/null
+++ b/std/lua/_lua/_hx_random_init.lua
@@ -0,0 +1 @@
+_G.math.randomseed(_G.os.time());
diff --git a/std/lua/_lua/_hx_static_to_instance.lua b/std/lua/_lua/_hx_static_to_instance.lua
new file mode 100644
index 0000000000000000000000000000000000000000..a389e55759ef16a1baa9ebd528b831b59c5d9a44
--- /dev/null
+++ b/std/lua/_lua/_hx_static_to_instance.lua
@@ -0,0 +1,13 @@
+_hx_staticToInstance = function (tab)
+  return setmetatable({}, {
+    __index = function(t,k)
+      if type(rawget(tab,k)) == 'function' then
+    return function(self,...)
+      return rawget(tab,k)(...)
+    end
+      else
+    return rawget(tab,k)
+      end
+    end
+  })
+end
diff --git a/std/lua/_lua/_hx_table.lua b/std/lua/_lua/_hx_table.lua
new file mode 100644
index 0000000000000000000000000000000000000000..f3b145196578d37e17fe3ca6caa61122f7a0ab9d
--- /dev/null
+++ b/std/lua/_lua/_hx_table.lua
@@ -0,0 +1,12 @@
+_hx_table = {}
+_hx_table.pack = _G.table.pack or function(...)
+    return {...}
+end
+_hx_table.unpack = _G.table.unpack or _G.unpack
+_hx_table.maxn = _G.table.maxn or function(t)
+  local maxn=0;
+  for i in pairs(t) do
+    maxn=type(i)=='number'and i>maxn and i or maxn
+  end
+  return maxn
+end;
diff --git a/std/lua/_lua/_hx_wrap_if_string_field.lua b/std/lua/_lua/_hx_wrap_if_string_field.lua
new file mode 100644
index 0000000000000000000000000000000000000000..8b747c0950b2d30a738344f16c8a9d3a83cad9e8
--- /dev/null
+++ b/std/lua/_lua/_hx_wrap_if_string_field.lua
@@ -0,0 +1,11 @@
+_hx_wrap_if_string_field = function(o, fld)
+  if _G.type(o) == 'string' then
+    if fld == 'length' then
+      return _G.string.len(o)
+    else
+      return String.prototype[fld]
+    end
+  else
+    return o[fld]
+  end
+end
diff --git a/std/lua/_std/Array.hx b/std/lua/_std/Array.hx
index 2354c5b88bd926604b3029a76d51b3a0e4381c15..a773273f520b04bccc2a8e9010095b1d9ec9b161 100644
--- a/std/lua/_std/Array.hx
+++ b/std/lua/_std/Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,146 +21,165 @@
  */
 @:coreApi
 class Array<T> {
+	public var length(default, null):Int;
 
-	public var length(default,null) : Int;
-
-	public function new() : Void  {
+	public function new():Void {
 		untyped _hx_tab_array(this, 0);
 	}
-	public function concat( a : Array<T> ) : Array<T> {
+
+	public function concat(a:Array<T>):Array<T> {
 		var ret = this.copy();
-		for (i in a) ret.push(i);
+		for (i in a)
+			ret.push(i);
 		return ret;
 	}
-	public function join( sep : String ) : String {
-		var tbl : lua.Table<Int,String> = lua.Table.create();
-		for (i in iterator()){
-			lua.Table.insert(tbl,Std.string(i));
+
+	public function join(sep:String):String {
+		var tbl:lua.Table<Int, String> = lua.Table.create();
+		for (i in iterator()) {
+			lua.Table.insert(tbl, Std.string(i));
 		}
-		return lua.Table.concat(tbl,sep);
+		return lua.Table.concat(tbl, sep);
 	}
 
-	public function pop() : Null<T> {
-		if (length == 0 ) return null;
-		var rawlength = lua.Lua.rawget(cast this, 'length');
-		var ret = lua.Lua.rawget(cast this, rawlength-1);
-		lua.Lua.rawset(cast this, 'length', rawlength-1);
+	public function pop():Null<T> {
+		if (length == 0)
+			return null;
+		var ret = this[length - 1];
+		this[length - 1] = null;
+		length--;
 		return ret;
 	}
-	public function push(x : T) : Int {
-		lua.Lua.rawset(cast this,length,x);
-		lua.Lua.rawset(cast this,'length', length + 1);
-		return lua.Lua.rawget(cast this,'length');
+
+	public function push(x:T):Int {
+		this[this.length] = x;
+		return length;
 	}
-	public function reverse() : Void {
+
+	public function reverse():Void {
 		var tmp:T;
 		var i = 0;
-		while(i < Std.int(this.length/2)){
+		while (i < Std.int(this.length / 2)) {
 			tmp = this[i];
-			this[i] = this[this.length-i-1];
-			this[this.length-i-1] = tmp;
+			this[i] = this[this.length - i - 1];
+			this[this.length - i - 1] = tmp;
 			i++;
 		}
 	}
-	public function shift() : Null<T> {
-		if (this.length == 0) return null;
+
+	public function shift():Null<T> {
+		if (this.length == 0)
+			return null;
 		var ret = this[0];
-		for (i in 0...length){
-			this[i] = this[i+1];
+		if (this.length == 1) {
+			this[0] = null;
+		} else if (this.length > 1) {
+			this[0] = this[1];
+			lua.Table.remove(untyped this, 1);
 		}
-		this.length-=1;
+		this.length -= 1;
 		return ret;
 	}
-	public function slice( pos : Int, ?end : Int ) : Array<T> {
-		if (end == null || end > length) end = length;
-		else if (end < 0) end = (length-(-end % length)) % length; // negative pos needs to be wrapped from the end, and mod according to array length
-		if (pos < 0) pos = (length -(-pos % length)) % length;  // and here
-		if (pos > end || pos > length) return [];
+
+	public function slice(pos:Int, ?end:Int):Array<T> {
+		if (end == null || end > length)
+			end = length;
+		else if (end < 0)
+			end = (length - (-end % length)) % length; // negative pos needs to be wrapped from the end, and mod according to array length
+		if (pos < 0)
+			pos = (length - (-pos % length)) % length; // and here
+		if (pos > end || pos > length)
+			return [];
 
 		var ret = [];
-		for (i in pos...end){
+		for (i in pos...end) {
 			ret.push(this[i]);
 		}
 		return ret;
 	}
 
 	// TODO: copied from neko Array.sort, move to general util library?
-	public function sort( f : T -> T -> Int ) : Void {
+	public function sort(f:T->T->Int):Void {
 		var i = 0;
 		var l = this.length;
-		while( i < l ) {
+		while (i < l) {
 			var swap = false;
 			var j = 0;
 			var max = l - i - 1;
-			while( j < max ) {
-				if( f(this[j],this[j+1]) > 0 ) {
-					var tmp = this[j+1];
-					this[j+1] = this[j];
+			while (j < max) {
+				if (f(this[j], this[j + 1]) > 0) {
+					var tmp = this[j + 1];
+					this[j + 1] = this[j];
 					this[j] = tmp;
 					swap = true;
 				}
 				j += 1;
 			}
-			if( !swap )
+			if (!swap)
 				break;
 			i += 1;
 		}
 	}
 
-	public function splice( pos : Int, len : Int ) : Array<T> {
-		if (len < 0 || pos > length) return [];
-		else if (pos < 0) pos = length -(-pos % length);
-		len = cast Math.min(len,this.length-pos);
+	public function splice(pos:Int, len:Int):Array<T> {
+		if (len < 0 || pos > length)
+			return [];
+		else if (pos < 0)
+			pos = length - (-pos % length);
+		len = cast Math.min(len, this.length - pos);
 		var ret = [];
-		for (i in pos...(pos+len)){
+		for (i in pos...(pos + len)) {
 			ret.push(this[i]);
-			this[i] = this[i+len];
+			this[i] = this[i + len];
 		}
-		for (i in (pos+len)...length){
-			this[i] = this[i+len];
+		for (i in (pos + len)...length) {
+			this[i] = this[i + len];
 		}
-		this.length-= len;
+		this.length -= len;
 		return ret;
 	}
 
-	public function toString() : String {
-		var tbl : lua.Table<Int,String> = lua.Table.create();
+	public function toString():String {
+		var tbl:lua.Table<Int, String> = lua.Table.create();
 		lua.Table.insert(tbl, '[');
 		lua.Table.insert(tbl, join(","));
 		lua.Table.insert(tbl, ']');
-		return lua.Table.concat(tbl,"");
+		return lua.Table.concat(tbl, "");
 	}
 
-	public function unshift( x : T ) : Void {
+	public function unshift(x:T):Void {
 		var len = length;
-		for (i in 0...len) this[len - i] = this[len - i - 1];
+		for (i in 0...len)
+			this[len - i] = this[len - i - 1];
 		this[0] = x;
 	}
 
-	public inline function insert( pos : Int, x : T ) : Void {
-		if (pos > length) pos = length;
+	public inline function insert(pos:Int, x:T):Void {
+		if (pos > length)
+			pos = length;
 		if (pos < 0) {
 			pos = (length + pos);
-			if (pos < 0) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
 		var cur_len = length;
-		while (cur_len > pos){
-			this[cur_len] = this[cur_len-1];
-			cur_len -=1;
+		while (cur_len > pos) {
+			this[cur_len] = this[cur_len - 1];
+			cur_len -= 1;
 		}
 		this[pos] = x;
 	}
 
-	public function remove( x : T ) : Bool {
-		for (i in 0...length){
-			if (this[i] == x){
-				for (j in i...length-1){
-					this[j] = this[j+1];
+	public function remove(x:T):Bool {
+		for (i in 0...length) {
+			if (this[i] == x) {
+				for (j in i...length - 1) {
+					this[j] = this[j + 1];
 				}
 				// We need to decrement the length variable, and set its
 				// value to null to avoid hanging on to a reference in the
 				// underlying lua table.
-				this[length-1] = null;
+				this[length - 1] = null;
 				// Do this in two steps to avoid re-updating the __index metamethod
 				length--;
 
@@ -170,50 +189,68 @@ class Array<T> {
 		return false;
 	}
 
-	public function indexOf( x : T, ?fromIndex:Int ) : Int {
+	public function indexOf(x:T, ?fromIndex:Int):Int {
 		var end = length;
-		if (fromIndex == null) fromIndex = 0;
-		else if (fromIndex < 0 ) {
+		if (fromIndex == null)
+			fromIndex = 0;
+		else if (fromIndex < 0) {
 			fromIndex = length + fromIndex;
-			if (fromIndex < 0) fromIndex = 0;
+			if (fromIndex < 0)
+				fromIndex = 0;
 		}
-		for (i in fromIndex...end){
-			if (x == this[i]) return i;
+		for (i in fromIndex...end) {
+			if (x == this[i])
+				return i;
 		}
 		return -1;
 	}
-	public function lastIndexOf( x : T, ?fromIndex:Int ) : Int {
-		if (fromIndex == null || fromIndex >= length ) fromIndex = length-1;
+
+	public function lastIndexOf(x:T, ?fromIndex:Int):Int {
+		if (fromIndex == null || fromIndex >= length)
+			fromIndex = length - 1;
 		else if (fromIndex < 0) {
 			fromIndex = length + fromIndex;
-			if (fromIndex < 0) return -1;
+			if (fromIndex < 0)
+				return -1;
 		}
 		var i = fromIndex;
-		while(i >= 0){
-			if (this[i] == x) return i;
-			else i--;
+		while (i >= 0) {
+			if (this[i] == x)
+				return i;
+			else
+				i--;
 		}
 		return -1;
 	}
-	public inline function copy() : Array<T> {
+
+	public inline function copy():Array<T> {
 		return [for (i in this) i];
 	}
-	public function map<S>(f:T->S):Array<S> {
+
+	public inline function map<S>(f:T->S):Array<S> {
 		return [for (i in this) f(i)];
 	}
-	public function filter(f:T->Bool):Array<T> {
+
+	public inline function filter(f:T->Bool):Array<T> {
 		return [for (i in this) if (f(i)) i];
 	}
-	public inline function iterator() : Iterator<T> {
+
+	public inline function iterator():Iterator<T> {
 		var cur_length = 0;
 		return {
-			hasNext : function() return cur_length < length,
-			next : function() return this[cur_length++]
+			hasNext: function() return cur_length < length,
+			next: function() return this[cur_length++]
 		}
 	}
-	private static function __init__() : Void{
-		// table-to-array helper
-		haxe.macro.Compiler.includeFile("lua/_lua/_hx_tab_array.lua");
-	}
 
+	public function resize(len:Int):Void {
+		if (length < len) {
+			this.length = len;
+		} else if (length > len) {
+			for (i in len...length) {
+				this[i] = null;
+			}
+			this.length = len;
+		}
+	}
 }
diff --git a/std/lua/_std/Date.hx b/std/lua/_std/Date.hx
index ad4be014d09c22bb0fb35f4809b398a16e7a6b6e..79f0d603282491d557ed1149c1c391f6e4a3554d 100644
--- a/std/lua/_std/Date.hx
+++ b/std/lua/_std/Date.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,49 +20,93 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi class Date {
-	var d : lua.Os.DateType;
-	var t : lua.Time;
-
-	public function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) {
-		t =  lua.Os.time({
-			year  : year,
-			month : month+1,
-			day   : day,
-			hour  : hour,
-			min   : min,
-			sec   : sec
+	var d:lua.Os.DateType;
+	var dUTC:lua.Os.DateType;
+	var t:lua.Time;
+
+	public function new(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int) {
+		t = lua.Os.time({
+			year: year,
+			month: month + 1,
+			day: day,
+			hour: hour,
+			min: min,
+			sec: sec
 		});
-		d =lua.Os.date("*t", t);
+		d = lua.Os.date("*t", t);
+		dUTC = lua.Os.date("!*t", t);
 	};
-	public function getTime()     : Float return cast t * 1000;
-	public function getHours()    : Int return d.hour;
-	public function getMinutes()  : Int return d.min;
-	public function getSeconds()  : Int return d.sec;
-	public function getFullYear() : Int return d.year;
-	public function getMonth()    : Int return d.month-1;
-	public function getDate()     : Int return d.day;
-	public function getDay()      : Int return d.wday-1;
-
-	public inline function toString() : String {
+
+	public function getTime():Float
+		return cast t * 1000;
+
+	public function getHours():Int
+		return d.hour;
+
+	public function getMinutes():Int
+		return d.min;
+
+	public function getSeconds():Int
+		return d.sec;
+
+	public function getFullYear():Int
+		return d.year;
+
+	public function getMonth():Int
+		return d.month - 1;
+
+	public function getDate():Int
+		return d.day;
+
+	public function getDay():Int
+		return d.wday - 1;
+
+	public function getUTCHours():Int
+		return dUTC.hour;
+
+	public function getUTCMinutes():Int
+		return dUTC.min;
+
+	public function getUTCSeconds():Int
+		return dUTC.sec;
+
+	public function getUTCFullYear():Int
+		return dUTC.year;
+
+	public function getUTCMonth():Int
+		return dUTC.month - 1;
+
+	public function getUTCDate():Int
+		return dUTC.day;
+
+	public function getUTCDay():Int
+		return dUTC.wday - 1;
+
+	public function getTimezoneOffset():Int {
+		var tUTC = lua.Os.time(dUTC);
+		return Std.int((tUTC - t) / 60);
+	}
+
+	public inline function toString():String {
 		return lua.Boot.dateStr(this);
 	}
 
-	public static inline function now() : Date {
-		return fromTime(lua.Os.time()*1000);
+	public static inline function now():Date {
+		return fromTime(lua.Os.time() * 1000);
 	}
 
-	public static inline function fromTime( t : Float ) : Date {
-		var d : Dynamic = {}
+	public static inline function fromTime(t:Float):Date {
+		var d:Dynamic = {}
 		untyped {
-			lua.Lua.setmetatable(d, untyped {__index : Date.prototype});
-			d.t = t/1000;
+			lua.Lua.setmetatable(d, untyped {__index: Date.prototype});
+			d.t = t / 1000;
 			d.d = lua.Os.date("*t", Std.int(d.t));
+			d.dUTC = lua.Os.date("!*t", Std.int(d.t));
 		}
 		return d;
 	}
 
-	public static inline function fromString( s : String ) : Date {
+	public static inline function fromString(s:String):Date {
 		return lua.Boot.strDate(s);
 	}
 }
-
diff --git a/std/lua/_std/EReg.hx b/std/lua/_std/EReg.hx
index b423122eeaa3114cc553f106059e45b6c2876d29..dc4771fdecd99751821d92a83b4c21a86182b867 100644
--- a/std/lua/_std/EReg.hx
+++ b/std/lua/_std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,121 +19,169 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-import lua.lib.lrexlib.Rex;
+
 import lua.Table;
 import lua.Lib;
-import lua.NativeStringTools;
+import lua.lib.lrexlib.Rex;
+// Note - lrexlib gives ascii-based offsets.  Use native string tools.
+import lua.NativeStringTools.*;
 
 @:coreApi
 class EReg {
+	var r:Rex; // the Rex extern instance.
+	var global:Bool; // whether the regex is in global mode.
+	var s:String; // the last matched string
+	var m:Table<Int, Int>; // the [start:Int, end:Int, and submatches:String (matched groups)] as a single table.
 
-	var r : Rex; // the Rex extern instance.
-	var global : Bool;  // whether the regex is in global mode.
-	var s : String; // the last matched string
-	var m : Table<Int,Int>; // the [start:Int, end:Int, and submatches:String (matched groups)] as a single table.
-
-	static var FLAGS : Table<String,Int> = Rex.flags();
+	static var FLAGS:Table<String, Int> = Rex.flags();
 
-	public function new( r : String, opt : String ) : Void {
+	public function new(r:String, opt:String):Void {
 		var ropt = 0;
-		for (i in 0...opt.length){
-			switch(opt.charAt(i)){
-				case "i" : ropt |= FLAGS.CASELESS;
-				case "m" : ropt |= FLAGS.MULTILINE;
-				case "s" : ropt |= FLAGS.DOTALL;
-				case "u" : ropt |= FLAGS.UTF8;
-				case "g" : global = true;
-				default : null;
+		for (i in 0...opt.length) {
+			switch (opt.charAt(i)) {
+				case "i":
+					ropt |= FLAGS.CASELESS;
+				case "m":
+					ropt |= FLAGS.MULTILINE;
+				case "s":
+					ropt |= FLAGS.DOTALL;
+				case "g":
+					global = true;
+				default:
+					null;
 			}
 		}
-		if (global == null) global = false;
+
+		ropt |= FLAGS.UTF8; // always check validity of utf8 string
+		ropt |= FLAGS.UCP; // always enable utf8 character properties
+
+		if (global == null)
+			global = false;
 		this.r = Rex.create(r, ropt);
 	}
 
-	public function match( s : String ) : Bool {
-		if (s == null) return false;
-		this.m = lua.TableTools.pack(r.exec(s));
+	public function match(s:String):Bool {
+		return matchFromByte(s, 1);
+	}
+
+	inline function matchFromByte(s:String, offset:Int):Bool {
+		if (s == null)
+			return false;
+		this.m = lua.TableTools.pack(r.exec(s, offset));
 		this.s = s;
-		return  m[1] != null;
+		return m[1] != null;
 	}
 
-	public function matched( n : Int ) : String {
-		if (m[1] == null || n < 0) throw "EReg::matched";
+	public function matched(n:Int):String {
+		if (m[1] == null || n < 0)
+			throw "EReg::matched";
 		else if (n == 0) {
-			var k =  NativeStringTools.sub(s, m[1], m[2]).match;
+			var k = sub(s, m[1], m[2]).match;
 			return k;
-		} else if (Std.is(m[3], lua.Table)){
+		} else if (Std.is(m[3], lua.Table)) {
 			var mn = 2 * (n - 1);
-			if (Std.is(untyped m[3][mn+1], Bool)) return null;
-			return NativeStringTools.sub(s, untyped m[3][mn + 1], untyped m[3][mn + 2]).match;
+			if (Std.is(untyped m[3][mn + 1], Bool))
+				return null;
+			return sub(s, untyped m[3][mn + 1], untyped m[3][mn + 2]).match;
 		} else {
 			throw "EReg:matched";
 		}
 	}
 
-	public function matchedLeft() : String {
-		if( m[1] == null ) throw "No string matched";
-		return NativeStringTools.sub(s, 1, m[1]-1).match;
+	public function matchedLeft():String {
+		if (m[1] == null)
+			throw "No string matched";
+		return sub(s, 1, m[1] - 1).match;
 	}
 
-	public function matchedRight() : String {
-		if( m[1] == null ) throw "No string matched";
-		return NativeStringTools.sub(s, m[2]+1).match;
+	public function matchedRight():String {
+		if (m[1] == null)
+			throw "No string matched";
+		return sub(s, m[2] + 1).match;
 	}
 
-	public function matchedPos() : { pos : Int, len : Int } {
-		if( m[1] == null ) throw "No string matched";
+	public function matchedPos():{pos:Int, len:Int} {
+		var left = matchedLeft();
+		var matched = matched(0);
+		if (m[1] == null)
+			throw "No string matched";
 		return {
-			pos : m[1]-1,
-			len : m[2]-m[1]+ 1
+			pos: left.length,
+			len: matched.length
 		}
 	}
 
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
-
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
 		var ss = s.substr(0, len < 0 ? s.length : pos + len);
 
-		if (global){
+		if (global) {
 			m = lua.TableTools.pack(r.exec(ss, pos + 1));
 			var b = m[1] != null;
-			if (b){
+			if (b) {
 				this.s = s;
 			}
 			return b;
 		} else {
 			m = lua.TableTools.pack(r.exec(ss, pos + 1));
 			var b = m[1] != null;
-			if (b){
+			if (b) {
 				this.s = s;
 			}
 			return b;
 		}
 	}
 
-	public function split( s : String ) : Array<String> {
-		if (global){
+	public function split(s:String):Array<String> {
+		if (global) {
 			return Lib.fillArray(Rex.split(s, r));
 		} else {
 			// we can't use directly Rex.split because it's ignoring the 'g' flag
 			var d = "#__delim__#";
-			return Lib.fillArray(Rex.split(replace(s,d), d));
+			return Lib.fillArray(Rex.split(replace(s, d), d));
 		}
 	}
 
-	public function replace( s : String, by : String ) : String {
-		by = Rex.gsub(by, "\\$(\\d)", "%%%1"); // convert dollar sign matched groups to Rex equivalent
-		by = Rex.gsub(by, "\\${2}", "$"); // escape double dollar signs
-		return Rex.gsub(s,r,by, global ? null : 1);
+	public function replace(s:String, by:String):String {
+		var chunks = by.split("$$");
+		chunks = [for (chunk in chunks) Rex.gsub(chunk, "\\$(\\d)", "%%%1", 1)];
+		by = chunks.join("$");
+		return Rex.gsub(s, r, by, global ? null : 1);
 	}
 
-	public function map( s : String, f : EReg -> String ) : String {
-		var offset = 0;
+	public function map(s:String, f:EReg->String):String {
+		var bytesOffset = 1;
 		var buf = new StringBuf();
 		do {
-			if (offset >= s.length){
+			if (bytesOffset > len(s)) {
+				break;
+			} else if (!matchFromByte(s, bytesOffset)) {
+				buf.add(sub(s, bytesOffset).match);
 				break;
 			}
-			else if (!matchSub(s, offset)) {
+			var pos = m[1];
+			var length = m[2] - m[1];
+			buf.add(sub(s, bytesOffset, pos - 1).match);
+			buf.add(f(this));
+			if (length < 0) {
+				var charBytes = len(sub(s, pos).match.charAt(0));
+				buf.add(sub(s, pos, pos + charBytes - 1).match);
+				bytesOffset = pos + charBytes;
+			} else {
+				bytesOffset = m[2] + 1;
+			}
+		} while (global);
+		if (!global && bytesOffset > 1 && bytesOffset - 1 < len(s))
+			buf.add(sub(s, bytesOffset).match);
+		return buf.toString();
+	}
+
+	function map_old(s:String, f:EReg->String):String {
+		var offset = 0;
+		var buf = new StringBuf();
+		do {
+			if (offset >= s.length) {
+				break;
+			} else if (!matchSub(s, offset)) {
 				buf.add(s.substr(offset));
 				break;
 			}
@@ -144,20 +192,23 @@ class EReg {
 			if (p.len == 0) {
 				buf.add(s.substr(p.pos, 1));
 				offset = p.pos + 1;
-			}
-			else
+			} else
 				offset = p.pos + p.len;
-
 		} while (global);
 		if (!global && offset > 0 && offset < s.length)
 			buf.add(s.substr(offset));
 		return buf.toString();
 	}
 
-	static function __init__() : Void {
-		if (Rex == null){
+	public static function escape(s:String):String {
+		return escapeRegExpRe.map(s, function(r) return "\\" + r.matched(0));
+	}
+
+	static var escapeRegExpRe = ~/[\[\]{}()*+?.\\\^$|]/g;
+
+	static function __init__():Void {
+		if (Rex == null) {
 			throw "Rex is missing.  Please install lrexlib-pcre.";
 		}
 	}
 }
-
diff --git a/std/lua/_std/Math.hx b/std/lua/_std/Math.hx
index 6d5090f38718a200f8e80e9eda081fa2160aee45..ec22e932ab5ba224d4c504a963c7ed83ffb7a281 100644
--- a/std/lua/_std/Math.hx
+++ b/std/lua/_std/Math.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,59 +19,101 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package;
 
-class Math
-{
-	public static var PI(get,null) : Float;
-	static inline function get_PI () : Float return lua.Math.pi;
+class Math {
+	public static var PI(get, null):Float;
+
+	static inline function get_PI():Float
+		return lua.Math.pi;
+
+	public static var NEGATIVE_INFINITY(get, null):Float;
 
-	public static var NEGATIVE_INFINITY(get, null) : Float;
-	static inline function get_NEGATIVE_INFINITY () : Float return -lua.Math.huge;
+	static inline function get_NEGATIVE_INFINITY():Float
+		return -lua.Math.huge;
 
-	public static var POSITIVE_INFINITY(get,null) : Float;
-	static inline function get_POSITIVE_INFINITY () : Float return lua.Math.huge;
+	public static var POSITIVE_INFINITY(get, null):Float;
 
-	public static var NaN(get, null) : Float;
+	static inline function get_POSITIVE_INFINITY():Float
+		return lua.Math.huge;
+
+	public static var NaN(get, null):Float;
 
 	// Note: this has to be an untyped literal, otherwise the compiler tries
 	// to unify it to an Int, which defeats useful numeric reflection behavior.
-	static inline function get_NaN () : Float return untyped __lua__("(0/0)");
+	static inline function get_NaN():Float
+		return untyped __lua__("(0/0)");
+
+	public static function isNaN(f:Float):Bool
+		return (f != f);
 
-	public static function isNaN( f : Float ) : Bool return (f != f);
-	public static inline function isFinite( f : Float ) : Bool {
+	public static function isFinite(f:Float):Bool {
 		return (f > Math.NEGATIVE_INFINITY && f < Math.POSITIVE_INFINITY);
 	}
 
-	public static inline function abs(v:Float) :Float return lua.Math.abs(v);
-	public static inline function acos(v:Float):Float return lua.Math.acos(v);
-	public static inline function asin(v:Float):Float return lua.Math.asin(v);
-	public static inline function atan(v:Float):Float return lua.Math.atan(v);
-	public static inline function ceil(v:Float):Int   return lua.Math.ceil(v);
-	public static inline function cos(v:Float):Float  return lua.Math.cos(v);
-	public static inline function exp(v:Float):Float  return lua.Math.exp(v);
-	public static inline function sin(v:Float):Float  return lua.Math.sin(v);
-	public static inline function sqrt(v:Float):Float return lua.Math.sqrt(v);
-	public static inline function tan(v:Float):Float  return lua.Math.tan(v);
-
-	public static inline function floor(v:Float):Int  return lua.Math.floor(v);
-	public static inline function log(v:Float):Float  return lua.Math.log(v);
-
-	public static inline function random() : Float return untyped __define_feature__("Math.random", lua.Math.random());
-
-	public static inline function atan2(y:Float, x:Float):Float return lua.Math.atan2(y,x);
-	public static inline function max(a:Float, b:Float):Float {
-		return Math.isNaN(a) || Math.isNaN(b) ? Math.NaN : lua.Math.max(a,b);
+	public static inline function abs(v:Float):Float
+		return lua.Math.abs(v);
+
+	public static inline function acos(v:Float):Float
+		return lua.Math.acos(v);
+
+	public static inline function asin(v:Float):Float
+		return lua.Math.asin(v);
+
+	public static inline function atan(v:Float):Float
+		return lua.Math.atan(v);
+
+	public static inline function ceil(v:Float):Int
+		return lua.Math.ceil(v);
+
+	public static inline function cos(v:Float):Float
+		return lua.Math.cos(v);
+
+	public static inline function exp(v:Float):Float
+		return lua.Math.exp(v);
+
+	public static inline function sin(v:Float):Float
+		return lua.Math.sin(v);
+
+	public static inline function sqrt(v:Float):Float
+		return lua.Math.sqrt(v);
+
+	public static inline function tan(v:Float):Float
+		return lua.Math.tan(v);
+
+	public static inline function floor(v:Float):Int
+		return lua.Math.floor(v);
+
+	public static inline function log(v:Float):Float
+		return lua.Math.log(v);
+
+	public static inline function random():Float
+		return untyped __define_feature__("Math.random", lua.Math.random());
+
+	public static inline function atan2(y:Float, x:Float):Float
+		return lua.Math.atan2(y, x);
+
+	public static function max(a:Float, b:Float):Float {
+		return Math.isNaN(a) || Math.isNaN(b) ? Math.NaN : lua.Math.max(a, b);
 	}
-	public static inline function min(a:Float, b:Float):Float {
-		return Math.isNaN(a) || Math.isNaN(b) ? Math.NaN : lua.Math.min(a,b);
+
+	public static function min(a:Float, b:Float):Float {
+		return Math.isNaN(a) || Math.isNaN(b) ? Math.NaN : lua.Math.min(a, b);
 	}
-	public static inline function pow(v:Float, exp:Float):Float return lua.Math.pow(v,exp);
 
-	public static inline function round(v:Float):Int return Math.floor(v + 0.5);
+	public static inline function pow(v:Float, exp:Float):Float
+		return lua.Math.pow(v, exp);
+
+	public static inline function round(v:Float):Int
+		return Math.floor(v + 0.5);
+
+	public static inline function ffloor(v:Float):Float
+		return floor(v);
 
-	public static inline function ffloor( v : Float ) : Float return floor(v);
-	public static inline function fceil( v : Float ) : Float return ceil(v);
-	public static inline function fround( v : Float ) : Float return round(v);
+	public static inline function fceil(v:Float):Float
+		return ceil(v);
 
+	public static inline function fround(v:Float):Float
+		return round(v);
 }
diff --git a/std/lua/_std/Reflect.hx b/std/lua/_std/Reflect.hx
index 493431b6a38aaf69b6c1ebdf2403d8df0a324e26..9382805ab644708b583fe9287b0255f7f6c01548 100644
--- a/std/lua/_std/Reflect.hx
+++ b/std/lua/_std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,129 +19,139 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import lua.Lua;
 import lua.TableTools;
 import lua.Boot;
-@:coreApi class Reflect {
-
-	public inline static function hasField( o : Dynamic, field : String ) : Bool {
-		return untyped o.__fields__ != null ? o.__fields__[field] != null :  o[field] != null;
-	}
-
-	public static function field( o : Dynamic, field : String ) : Dynamic untyped {
-		return try o[field] catch( e : Dynamic ) null;
-	}
 
-	public inline static function setField( o : Dynamic, field : String, value : Dynamic ) : Void untyped {
-		o[field] = value;
+@:coreApi class Reflect {
+	public inline static function hasField(o:Dynamic, field:String):Bool {
+		if (Lua.type(o) == "string" && (untyped String.prototype[field] != null || field == "length")) {
+			return true;
+		} else
+			return untyped o.__fields__ != null ? o.__fields__[field] != null : o[field] != null;
 	}
 
-	public static inline function getProperty( o : Dynamic, field : String ) : Dynamic {
-		var tmp : Dynamic;
-		return if( o == null ) {
-				untyped __define_feature__("Reflect.getProperty",null);
-			} else if( o.__properties__ != null && Reflect.field(o, "get_" + field) != null){
-				callMethod(o, Reflect.field(o,"get_" + field), []);
+	public static function field(o:Dynamic, field:String):Dynamic
+		untyped {
+			if (Lua.type(o) == "string") {
+				if (field == "length") {
+					return cast(o : String).length;
+				} else
+					return untyped String.prototype[field];
 			} else {
-				Reflect.field(o,field);
+				return try o[field] catch (e:Dynamic) null;
 			}
+		}
+
+	public inline static function setField(o:Dynamic, field:String, value:Dynamic):Void
+		untyped {
+			o[field] = value;
+		}
+
+	public static function getProperty(o:Dynamic, field:String):Dynamic {
+		return if (o == null) {
+			untyped __define_feature__("Reflect.getProperty", null);
+		} else if (o.__properties__ != null && Reflect.field(o, "get_" + field) != null) {
+			callMethod(o, Reflect.field(o, "get_" + field), []);
+		} else {
+			Reflect.field(o, field);
+		}
 	}
 
-	public static inline function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void untyped {
-		var tmp : String;
-		if( o.__properties__ && o.__properties__["set_"+field]) {
-			tmp = o.__properties__["set_" + field];
-			if (o.__name__ != null){
-				callMethod(null,Reflect.field(o, tmp), [value]) ;
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void
+		untyped {
+			if (o.__properties__ != null && o.__properties__["set_" + field]) {
+				var tmp:String = o.__properties__["set_" + field];
+				callMethod(o, Reflect.field(o, tmp), [value]);
 			} else {
-				callMethod(o,Reflect.field(o, tmp), [value]) ;
+				o[field] = __define_feature__("Reflect.setProperty", value);
 			}
-		} else {
-			o[field] = __define_feature__("Reflect.setProperty",value);
 		}
-	}
 
-	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic  {
-		if (args == null || args.length == 0){
+	public static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic {
+		if (args == null || args.length == 0) {
 			return func(o);
 		} else {
 			var self_arg = false;
-			if (o != null ){
-				// if o is not null, it means we need to pass it as the "self"
-				// parameter.  However, we should also check to see if it's
-				// a valid class instance in the first place.
-				// TODO: Find a more flexible way of determining if we need
-				// self or not
+			if (o != null && o.__name__ == null) {
 				self_arg = true;
 			}
-			var new_args = lua.Table.create();
-			for (i in 0...args.length){
-				// copy args to 1-indexed table
-				new_args[i + 1] = args[i];
-			}
-			return if (self_arg){
-				// call with o as leading self param
-				func(o, lua.TableTools.unpack(new_args, 1, TableTools.maxn(new_args)));
+			return if (self_arg) {
+				func(o, lua.TableTools.unpack(cast args, 0, args.length - 1));
 			} else {
-				// call with no self param
-				func(lua.TableTools.unpack(new_args, 1,  TableTools.maxn(new_args)));
+				func(lua.TableTools.unpack(cast args, 0, args.length - 1));
 			}
 		}
 	}
 
-	public static function fields( o : Dynamic ) : Array<String> {
-		return [for (f in lua.Boot.fieldIterator(o)) f];
+	public static function fields(o:Dynamic):Array<String> {
+		if (lua.Lua.type(o) == "string") {
+			return Reflect.fields(untyped String.prototype);
+		} else {
+			return [for (f in lua.Boot.fieldIterator(o)) f];
+		}
 	}
 
-	public static function isFunction( f : Dynamic ) : Bool {
+	public static function isFunction(f:Dynamic):Bool {
 		return Lua.type(f) == "function" && !(Boot.isClass(f) || Boot.isEnum(f));
 	}
 
-	public static function compare<T>( a : T, b : T ) : Int {
-		if (a == b) return 0
-		else if (a == null) return -1
-		else if (b == null) return 1
-		else return (cast a) > (cast b) ? 1 : -1;
+	public static function compare<T>(a:T, b:T):Int {
+		if (a == b)
+			return 0
+		else if (a == null)
+			return -1
+		else if (b == null)
+			return 1
+		else
+			return (cast a) > (cast b) ? 1 : -1;
 	}
 
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool {
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
 		return f1 == f2;
 	}
 
-	public static function isObject( v : Dynamic ) : Bool untyped {
-		if( v == null )
-			return false;
-		var t = __lua__("type(v)");
-		return (t == "string" || (t == "table" && v.__enum__ == null)) || (t == "function" && (lua.Boot.isClass(v) || lua.Boot.isEnum(v)) != null);
-	}
+	public static function isObject(v:Dynamic):Bool
+		untyped {
+			if (v == null)
+				return false;
+			var t = __lua__("type(v)");
+			return (t == "string" || (t == "table" && v.__enum__ == null))
+				|| (t == "function" && (lua.Boot.isClass(v) || lua.Boot.isEnum(v)) != null);
+		}
 
-	public static function isEnumValue( v : Dynamic ) : Bool {
-		return v != null && Std.is(v,lua.Table) && v.__enum__ != null;
+	public static function isEnumValue(v:Dynamic):Bool {
+		return v != null && Std.is(v, lua.Table) && v.__enum__ != null;
 	}
 
-	public static function deleteField( o : Dynamic, field : String ) : Bool untyped {
-		if( !hasField(o,field) ) return false;
-		o[field] = null;
-		o.__fields__[field]=null;
-		return true;
-	}
+	public static function deleteField(o:Dynamic, field:String):Bool
+		untyped {
+			if (!hasField(o, field))
+				return false;
+			o[field] = null;
+			o.__fields__[field] = null;
+			return true;
+		}
 
-	public static function copy<T>( o : T ) : T {
-		var o2 : Dynamic = {};
-		for( f in Reflect.fields(o) )
-			Reflect.setField(o2,f,Reflect.field(o,f));
+	public static function copy<T>(o:Null<T>):Null<T> {
+		if (o == null)
+			return null;
+		var o2:Dynamic = {};
+		for (f in Reflect.fields(o))
+			Reflect.setField(o2, f, Reflect.field(o, f));
 		return o2;
 	}
 
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
 		/*
 			- Convert var arg to table
 			- Set indexing from zero
 			- Extract real table length
 			- Recreate as dynamic array
 			- Return function called with this array
-		*/
+		 */
 		return untyped __lua__("function(...)
 			local a = {...}
 			local b = {}
@@ -153,5 +163,4 @@ import lua.Boot;
 			return f(_hx_tab_array(b, l))
 		end");
 	}
-
 }
diff --git a/std/lua/_std/Std.hx b/std/lua/_std/Std.hx
index 941d45f53aadfb6f0815a382ea10e6ff5137c067..06cf60577ffc21e06eba2a2bfbf9e7edfc09474d 100644
--- a/std/lua/_std/Std.hx
+++ b/std/lua/_std/Std.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,38 +19,46 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import lua.Boot;
 import lua.NativeStringTools;
 
 @:keepInit
 @:coreApi class Std {
-
-	public static inline function is( v : Dynamic, t : Dynamic ) : Bool {
-		return untyped lua.Boot.__instanceof(v,t);
+	public static inline function is(v:Dynamic, t:Dynamic):Bool {
+		return untyped lua.Boot.__instanceof(v, t);
 	}
 
-	public static inline function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
+	public static inline function downcast<T:{}, S:T>(value:T, c:Class<S>):S {
 		return untyped lua.Boot.__instanceof(value, c) ? cast value : null;
 	}
 
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	public static inline function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return downcast(value, c);
+	}
+
 	@:keep
-	public static function string( s : Dynamic ) : String {
+	public static function string(s:Dynamic):String {
 		return untyped lua.Boot.__string_rec(s);
 	}
 
-	public static function int( x : Float ) : Int {
-		if (!Math.isFinite(x) || Math.isNaN(x)) return 0;
-		else return lua.Boot.clamp(x);
+	public static function int(x:Float):Int {
+		if (!Math.isFinite(x) || Math.isNaN(x))
+			return 0;
+		else
+			return lua.Boot.clampInt32(x);
 	}
 
-	public static function parseInt( x : String ) : Null<Int> {
-		if (x == null) return null;
-		var hexMatch = NativeStringTools.match(x, "^ *[%-+]*0[xX][%da-FA-F]*");
-		if (hexMatch != null){
+	public static function parseInt(x:String):Null<Int> {
+		if (x == null)
+			return null;
+		var hexMatch = NativeStringTools.match(x, "^ *[%-+]*0[xX][%da-fA-F]*");
+		if (hexMatch != null) {
 			return lua.Lua.tonumber(hexMatch.substr(2), 16);
 		} else {
 			var intMatch = NativeStringTools.match(x, "^ *[%-+]?%d*");
-			if (intMatch != null){
+			if (intMatch != null) {
 				return lua.Lua.tonumber(intMatch);
 			} else {
 				return null;
@@ -58,38 +66,35 @@ import lua.NativeStringTools;
 		}
 	}
 
-	public static function parseFloat( x : String ) : Float {
-		if (x == null || x == "") return Math.NaN;
-		var digitMatch = NativeStringTools.match(x,  "^ *[%.%-+]?[0-9]%d*");
-		if (digitMatch == null){
+	public static function parseFloat(x:String):Float {
+		if (x == null || x == "")
+			return Math.NaN;
+		var digitMatch = NativeStringTools.match(x, "^ *[%.%-+]?[0-9]%d*");
+		if (digitMatch == null) {
 			return Math.NaN;
 		}
 		x = x.substr(digitMatch.length);
 
 		var decimalMatch = NativeStringTools.match(x, "^%.%d*");
-		if (decimalMatch == null) decimalMatch = "";
+		if (decimalMatch == null)
+			decimalMatch = "";
 		x = x.substr(decimalMatch.length);
 
 		var eMatch = NativeStringTools.match(x, "^[eE][+%-]?%d+");
-		if (eMatch == null) eMatch = "";
-		var result =  lua.Lua.tonumber(digitMatch + decimalMatch + eMatch);
+		if (eMatch == null)
+			eMatch = "";
+		var result = lua.Lua.tonumber(digitMatch + decimalMatch + eMatch);
 		return result != null ? result : Math.NaN;
 	}
 
-	public static function random( x : Int ) : Int {
-		return untyped x <= 0 ? 0 : Math.floor(Math.random()*x);
-	}
-
-	static function __init__() : Void untyped {
-		// lua workarounds for basic anonymous object functionality
-		haxe.macro.Compiler.includeFile("lua/_lua/_hx_anon.lua");
-
-		// class reflection metadata
-		haxe.macro.Compiler.includeFile("lua/_lua/_hx_classes.lua");
-		__feature__("lua.Boot.getClass", String.prototype.__class__ = __feature__("Type.resolveClass",_hxClasses["String"] = String,String));
-		__feature__("lua.Boot.isClass", String.__name__ = __feature__("Type.getClassName", __lua_table__(["String"]),true));
-		__feature__("Type.resolveClass",_hxClasses["Array"] = Array);
-		__feature__("lua.Boot.isClass",Array.__name__ = __feature__("Type.getClassName",__lua_table__(["Array"]),true));
+	public static function random(x:Int):Int {
+		return untyped x <= 0 ? 0 : Math.floor(Math.random() * x);
 	}
 
+	static function __init__():Void
+		untyped {
+			__feature__("lua.Boot.isClass", String.__name__ = __feature__("Type.getClassName", "String", true));
+			__feature__("Type.resolveClass", _hxClasses["Array"] = Array);
+			__feature__("lua.Boot.isClass", Array.__name__ = __feature__("Type.getClassName", "Array", true));
+		}
 }
diff --git a/std/lua/_std/String.hx b/std/lua/_std/String.hx
index a45191a1ce8d1dbcc10bcdc57566b76543fac891..50bf3a57b9bf7ef5e74095794c70a5eab5f73695 100644
--- a/std/lua/_std/String.hx
+++ b/std/lua/_std/String.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,107 +23,137 @@
 import lua.Lua;
 import lua.Table;
 import lua.Boot;
-import lua.NativeStringTools;
+
+#if lua_vanilla
+typedef BaseString = lua.NativeStringTools;
+#else
+typedef BaseString = lua.lib.luautf8.Utf8;
+#end
 
 @:coreApi
 class String {
-	static var __oldindex : Table<Dynamic,Dynamic>;
-	public var length(default,null) : Int;
+	static var __oldindex:String->String->Dynamic;
 
+	public var length(default, null):Int;
 
-	public function new(string:String) untyped {}
+	public inline function new(string:String)
+		untyped {}
 
 	@:keep
-	static function __index(s:Dynamic, k:Dynamic) : Dynamic {
-		if (k == "length") return NativeStringTools.len(s);
-		else if (Reflect.hasField(untyped String.prototype, k)) return untyped String.prototype[k];
-		else if (__oldindex != null) return  __oldindex[k];
-		else return null;
+	static function __index(s:Dynamic, k:Dynamic):Dynamic {
+		if (k == "length")
+			return BaseString.len(s);
+		else if (Reflect.hasField(untyped String.prototype, k))
+			return untyped String.prototype[k];
+		else if (__oldindex != null) {
+			if (Lua.type(__oldindex) == "function") {
+				return __oldindex(s, k);
+			} else if (Lua.type(__oldindex) == "table") {
+				return untyped __oldindex[k];
+			}
+			return null;
+		} else
+			return null;
 	}
 
-	public function toUpperCase() : String return NativeStringTools.upper(this);
-	public function toLowerCase() : String return NativeStringTools.lower(this);
-	public function indexOf( str : String, ?startIndex : Int ) : Int {
-		if (startIndex == null) startIndex = 1;
-		else startIndex += 1;
-		var r = NativeStringTools.find(this, str, startIndex, true).begin;
-		if (r != null && r > 0) return r-1;
-		else return -1;
+	public inline function toUpperCase():String
+		return BaseString.upper(this);
+
+	public inline function toLowerCase():String
+		return BaseString.lower(this);
+
+	public inline function indexOf(str:String, ?startIndex:Int):Int {
+		if (startIndex == null)
+			startIndex = 1;
+		else
+			startIndex += 1;
+		var r = BaseString.find(this, str, startIndex, true).begin;
+		if (r != null && r > 0)
+			return r - 1;
+		else
+			return -1;
 	}
 
-	public function lastIndexOf( str : String, ?startIndex : Int ) : Int {
+	public inline function lastIndexOf(str:String, ?startIndex:Int):Int {
 		var i = 0;
 		var ret = -1;
-		if( startIndex == null ) startIndex = length;
-		while( true ) {
-			var p = indexOf(str, ret+1);
-			if( p == -1 || p > startIndex ) return ret;
+		if (startIndex == null)
+			startIndex = length;
+		while (true) {
+			var p = indexOf(str, ret + 1);
+			if (p == -1 || p > startIndex)
+				break;
 			ret = p;
 		}
+		return ret;
 	}
 
-	public function split( delimiter : String ) : Array<String> {
+	public inline function split(delimiter:String):Array<String> {
 		var idx = 1;
 		var ret = [];
 		var delim_offset = delimiter.length > 0 ? delimiter.length : 1;
-		while (idx != null){
+		while (idx != null) {
 			var newidx = 0;
-			if (delimiter.length > 0){
-				newidx = NativeStringTools.find(this, delimiter, idx, true).begin;
-			} else if (idx >= this.length){
+			if (delimiter.length > 0) {
+				newidx = BaseString.find(this, delimiter, idx, true).begin;
+			} else if (idx >= this.length) {
 				newidx = null;
 			} else {
 				newidx = idx + 1;
 			}
 
-			if (newidx != null){
-				var match = NativeStringTools.sub(this, idx, newidx-1).match;
+			if (newidx != null) {
+				var match = BaseString.sub(this, idx, newidx - 1).match;
 				ret.push(match);
 				idx = newidx + delimiter.length;
 			} else {
-				ret.push(NativeStringTools.sub(this,idx,NativeStringTools.len(this)).match);
+				ret.push(BaseString.sub(this, idx, this.length).match);
 				idx = null;
 			}
 		}
 		return ret;
 	}
 
-	public function toString() : String {
+	public inline function toString():String {
 		return this;
 	}
-	public function substring( startIndex : Int, ?endIndex : Int ) : String {
-		if (endIndex == null) endIndex = this.length;
-		if (endIndex < 0) endIndex = 0;
-		if (startIndex < 0) startIndex = 0;
+
+	public inline function substring(startIndex:Int, ?endIndex:Int):String {
+		if (endIndex == null)
+			endIndex = this.length;
+		if (endIndex < 0)
+			endIndex = 0;
+		if (startIndex < 0)
+			startIndex = 0;
 		if (endIndex < startIndex) {
 			// swap the index positions
-			return NativeStringTools.sub(this, endIndex+1, startIndex).match;
+			return BaseString.sub(this, endIndex + 1, startIndex).match;
 		} else {
-			return NativeStringTools.sub(this, startIndex+1, endIndex).match;
+			return BaseString.sub(this, startIndex + 1, endIndex).match;
 		}
 	}
 
-	function get_length() : Int {
-		return NativeStringTools.len(this);
-	}
-	public function charAt( index : Int) : String {
-		return NativeStringTools.sub(this,index+1, index+1).match;
-	}
-	public function charCodeAt( index : Int) : Null<Int> {
-		return NativeStringTools.byte(this,index+1);
+	public inline function charAt(index:Int):String {
+		return BaseString.sub(this, index + 1, index + 1).match;
 	}
 
-	public function substr( pos : Int, ?len : Int ) : String {
-		if (len == null || len > pos + this.length) len = this.length;
-		else if (len < 0) len = length + len;
-		if (pos < 0) pos = length + pos;
-		if (pos < 0) pos = 0;
-		return NativeStringTools.sub(this, pos + 1, pos+len).match;
+	public inline function charCodeAt(index:Int):Null<Int> {
+		return BaseString.byte(this, index + 1);
 	}
 
-	public inline static function fromCharCode( code : Int ) : String {
-		return NativeStringTools.char(code);
+	public inline function substr(pos:Int, ?len:Int):String {
+		if (len == null || len > pos + this.length)
+			len = this.length;
+		else if (len < 0)
+			len = length + len;
+		if (pos < 0)
+			pos = length + pos;
+		if (pos < 0)
+			pos = 0;
+		return BaseString.sub(this, pos + 1, pos + len).match;
 	}
 
+	public inline static function fromCharCode(code:Int):String {
+		return BaseString.char(code);
+	}
 }
-
diff --git a/std/lua/_std/StringBuf.hx b/std/lua/_std/StringBuf.hx
index 50529ebed9e0efd1b4af7c93f1197f3e2dc3b5e1..de33387acbb8762b5d4d1c1b7bd32bc2ca94689d 100644
--- a/std/lua/_std/StringBuf.hx
+++ b/std/lua/_std/StringBuf.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,93 +19,41 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-/**
-	A String buffer is an efficient way to build a big string by appending small
-	elements together.
 
-	Its cross-platform implementation uses String concatenation internally, but
-	StringBuf may be optimized for different targets.
-
-	Unlike String, an instance of StringBuf is not immutable in the sense that
-	it can be passed as argument to functions which modify it by appending more
-	values. However, the internal buffer cannot be modified.
-**/
 import lua.Table;
 
 class StringBuf {
+	var b:Table<Int, String>;
 
-	var b:Dynamic;
-
-	/*
-		The length of `this` StringBuf in characters.
-	**/
-	public var length(get,null) : Int;
-
-	/**
-		Creates a new StringBuf instance.
+	public var length(get, null):Int;
 
-		This may involve initialization of the internal buffer.
-	**/
 	public inline function new() {
-		b = {};
+		b = Table.create();
 		this.length = 0;
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return length;
 	}
 
-	/**
-		Appends the representation of `x` to `this` StringBuf.
-
-		The exact representation of `x` may vary per platform. To get more
-		consistent behavior, this function should be called with
-		Std.string(x).
-
-		If `x` is null, the String "null" is appended.
-	**/
-	public inline function add<T>( x : T ) : Void {
+	public inline function add<T>(x:T):Void {
 		var str = Std.string(x);
 		Table.insert(b, str);
 		length += str.length;
 	}
 
-	/**
-		Appends the character identified by `c` to `this` StringBuf.
-
-		If `c` is negative or has another invalid value, the result is
-		unspecified.
-	**/
-	public inline function addChar( c : Int ) : Void {
+	public inline function addChar(c:Int):Void {
 		Table.insert(b, String.fromCharCode(c));
 		length += 1;
 	}
 
-	/**
-		Appends a substring of `s` to `this` StringBuf.
-
-		This function expects `pos` and `len` to describe a valid substring of
-		`s`, or else the result is unspecified. To get more robust behavior,
-		`this.add(s.substr(pos,len))` can be used instead.
-
-		If `s` or `pos` are null, the result is unspecified.
-
-		If `len` is omitted or null, the substring ranges from `pos` to the end
-		of `s`.
-	**/
-	public inline function addSub( s : String, pos : Int, ?len : Int) : Void {
+	public inline function addSub(s:String, pos:Int, ?len:Int):Void {
 		var part = len == null ? s.substr(pos) : s.substr(pos, len);
 		Table.insert(b, part);
 		length += part.length;
 	}
 
-	/**
-		Returns the content of `this` StringBuf as String.
-
-		The buffer is not emptied by this operation.
-	**/
-	public inline function toString() : String {
+	public inline function toString():String {
 		return Table.concat(b);
 	}
-
 }
diff --git a/std/lua/_std/Sys.hx b/std/lua/_std/Sys.hx
index 27264030101ddcb4f091b129d36143dba4e7fa33..c7bfb350cd298217a6904b91f7056d8093d8b1ae 100644
--- a/std/lua/_std/Sys.hx
+++ b/std/lua/_std/Sys.hx
@@ -1,6 +1,5 @@
-
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,103 +20,119 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-using lua.NativeStringTools;
-import lua.Package;
+import lua.Boot;
+import lua.Io;
 import lua.Lua;
-import lua.Table;
-import lua.TableTools;
 import lua.Os;
-import lua.FileHandle;
-import lua.Io;
-import lua.Boot;
+import lua.lib.luv.Misc;
 import sys.io.FileInput;
 import sys.io.FileOutput;
 
 @:coreApi
 class Sys {
-	static var _system_name : String;
-	public static inline function print( v : Dynamic ) : Void {
+	static var _system_name:String;
+
+	public static inline function print(v:Dynamic):Void {
 		return lua.Lib.print(v);
 	}
-	public static inline function println( v : Dynamic ) : Void {
+
+	public static inline function println(v:Dynamic):Void {
 		return lua.Lib.println(v);
 	}
-	public inline static function args() : Array<String> {
-		var args = lua.Lib.tableToArray(lua.Lua.arg).copy();
-		args.shift();
+
+	public inline static function args():Array<String> {
+		var targs = lua.PairTools.copy(Lua.arg);
+		var args = lua.Lib.tableToArray(targs);
 		return args;
 	}
-	public static function command( cmd : String, ?args : Array<String> ) : Int  {
+
+	public static function command(cmd:String, ?args:Array<String>):Int {
 		var p = new sys.io.Process(cmd, args);
 		var code = p.exitCode();
 		p.close();
 		return code;
 	}
 
-
-	public inline static function cpuTime() : Float {
+	public inline static function cpuTime():Float {
 		return lua.Os.clock();
 	}
 
-	public inline static function exit(code : Int) : Void {
+	public inline static function exit(code:Int):Void {
 		lua.Os.exit(code);
 	}
 
-	public inline static function getChar(echo : Bool) : Int {
-		return lua.Io.read(1).byte();
+	public inline static function getChar(echo:Bool):Int {
+		return lua.Io.read().charCodeAt(0);
 	}
 
-	static function getSystemName() : String {
+	static function getSystemName():String {
 		return lua.Boot.systemName();
 	}
 
-	public static function systemName() : String {
-		if (_system_name == null) _system_name = getSystemName();
+	public static function systemName():String {
+		if (_system_name == null)
+			_system_name = getSystemName();
 		return _system_name;
 	}
 
-	public static function environment() : Map<String,String>  {
-		var map = new Map<String,String>();
-		var f = function(k,v) map.set(k,v);
-		untyped __lua__("for k,v in lua.lib.environ.Environ.enum() do f(k,v) end");
-		return map;
+	public static function environment():Map<String, String> {
+		var map = new Map<String, String>();
+		var cmd = switch (Sys.systemName()) {
+			case "Windows": 'SET';
+			default: 'printenv';
+		}
+		var p = new sys.io.Process(cmd, []);
+		var code = p.exitCode(true);
+		var out = p.stdout.readAll().toString();
+		p.close();
+		var lines = out.split("\n");
+		var m = new Map<String, String>();
+		for (l in lines) {
+			var parts = l.split("=");
+			m.set(parts.shift(), parts.join("="));
+		}
+		return m;
 	}
 
-	@:deprecated("Use programPath instead") public static function executablePath() : String {
-		return lua.lib.luv.Misc.exepath();
+	@:deprecated("Use programPath instead") public static function executablePath():String {
+		return Misc.exepath();
 	}
 
-	public inline static function programPath() : String {
+	public inline static function programPath():String {
 		return haxe.io.Path.join([getCwd(), Lua.arg[0]]);
 	}
 
-	public inline static function getCwd() : String
-		return lua.lib.luv.Misc.cwd();
+	public inline static function getCwd():String
+		return Misc.cwd();
 
-	public inline static function setCwd(s : String) : Void
-		lua.lib.luv.Misc.chdir(s);
+	public inline static function setCwd(s:String):Void
+		Misc.chdir(s);
 
-	public inline static function getEnv(s : String) : String {
-		return lua.Os.getenv(s);
+	public inline static function getEnv(s:String):String {
+		return Misc.os_getenv(s);
 	}
-	public inline static function putEnv(s : String, v : String ) : Void {
-		lua.lib.environ.Environ.setenv(s,v);
+
+	public inline static function putEnv(s:String, v:String):Void {
+		Misc.os_setenv(s, v);
 	}
 
-	public inline static function setTimeLocale(loc : String) : Bool  {
+	public inline static function setTimeLocale(loc:String):Bool {
 		// TODO Verify
 		return lua.Os.setlocale(loc) != null;
 	}
 
-	public static function sleep(seconds : Float) : Void
+	public static function sleep(seconds:Float):Void
 		lua.lib.luv.Thread.sleep(Math.floor(seconds * 1000));
 
+	public inline static function stderr():haxe.io.Output
+		return new FileOutput(Io.stderr);
 
-	public inline static function stderr() : haxe.io.Output return new FileOutput(Io.stderr);
-	public inline static function stdin()  : haxe.io.Input return new FileInput(Io.stdin);
-	public inline static function stdout() : haxe.io.Output return new FileOutput(Io.stdout);
+	public inline static function stdin():haxe.io.Input
+		return new FileInput(Io.stdin);
 
-	public static function time() : Float
-		return lua.lib.luasocket.Socket.gettime();
+	public inline static function stdout():haxe.io.Output
+		return new FileOutput(Io.stdout);
 
+	public static function time():Float
+		return lua.lib.luasocket.Socket.gettime();
 }
diff --git a/std/lua/_std/Type.hx b/std/lua/_std/Type.hx
index efe404f0df5e73c4cdd63696def66086669310d1..4336cf19add55177e0bd8391eb6799acf192f5cf 100644
--- a/std/lua/_std/Type.hx
+++ b/std/lua/_std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import lua.Lua;
 import lua.Table;
 
@@ -29,101 +30,112 @@ enum ValueType {
 	TBool;
 	TObject;
 	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
 	TUnknown;
 }
 
 @:coreApi class Type {
+	public static function getClass<T>(o:T):Class<T>
+		untyped {
+			if (o == null)
+				return null;
+			return lua.Boot.getClass(o);
+		}
 
-	public static function getClass<T>( o : T ) : Class<T> untyped {
-		if( o == null )
-			return null;
-		return lua.Boot.getClass(o);
-	}
-
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic> untyped {
-		if( o == null )
-			return null;
-		return o.__enum__;
-	}
-
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic> untyped {
-		return c.__super__;
-	}
-
+	public static function getEnum(o:EnumValue):Enum<Dynamic>
+		untyped {
+			if (o == null)
+				return null;
+			return o.__enum__;
+		}
 
-	public static function getClassName( c : Class<Dynamic> ) : String {
-		if (untyped c.__name__ == null) return null;
-		return lua.Table.concat(untyped c.__name__,'.');
-	}
+	public static function getSuperClass(c:Class<Dynamic>):Class<Dynamic>
+		untyped {
+			return c.__super__;
+		}
 
-	public static function getEnumName( e : Enum<Dynamic> ) : String {
-		if (untyped e.__ename__ == null) return null;
-		return lua.Table.concat(untyped e.__ename__,'.');
+	public static inline function getClassName(c:Class<Dynamic>):String {
+		return untyped __define_feature__("Type.getClassName", c.__name__);
 	}
 
-	public static function resolveClass( name : String ) : Class<Dynamic> untyped {
-		// TODO: better tmp name for _hxClasses
-		var cl : Class<Dynamic> = _hxClasses[name];
-		// ensure that this is a class
-		if( cl == null || !lua.Boot.isClass(cl) )
+	public static function getEnumName(e:Enum<Dynamic>):String {
+		if (untyped e.__ename__ == null)
 			return null;
-		return cl;
+		return untyped e.__ename__;
 	}
 
-	public static function resolveEnum( name : String ) : Enum<Dynamic> untyped {
-		// TODO: better tmp name for _hxClasses
-		var e : Dynamic = _hxClasses[name];
-		// ensure that this is an enum
-		if( e == null || !lua.Boot.isEnum(e) )
-			return null;
-		return e;
-	}
+	public static function resolveClass(name:String):Class<Dynamic>
+		untyped {
+			// TODO: better tmp name for _hxClasses
+			var cl:Class<Dynamic> = _hxClasses[name];
+			// ensure that this is a class
+			if (cl == null || !lua.Boot.isClass(cl))
+				return null;
+			return cl;
+		}
 
-	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T untyped {
-		return __new__(cl, lua.TableTools.unpack(cast args, 0));
-	}
+	public static function resolveEnum(name:String):Enum<Dynamic>
+		untyped {
+			// TODO: better tmp name for _hxClasses
+			var e:Dynamic = _hxClasses[name];
+			// ensure that this is an enum
+			if (e == null || !lua.Boot.isEnum(e))
+				return null;
+			return e;
+		}
 
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T untyped {
-		var ret = __lua_table__();
-		Lua.setmetatable(ret, untyped {__index : cl.prototype});
-		return ret;
-	}
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T
+		untyped {
+			return __new__(cl, lua.TableTools.unpack(cast args, 0));
+		}
 
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		var f:Dynamic = Reflect.field(e,constr);
-		if( f == null ) throw "No such constructor "+constr;
-		if( Reflect.isFunction(f) ) {
-			if( params == null ) throw "Constructor "+constr+" need parameters";
-			return Reflect.callMethod(null,f,params);
+	public static function createEmptyInstance<T>(cl:Class<T>):T
+		untyped {
+			var ret = __lua_table__();
+			Lua.setmetatable(ret, untyped {__index: cl.prototype});
+			return ret;
 		}
-		if( params != null && params.length != 0 )
-			throw "Constructor "+constr+" does not need parameters";
+
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T {
+		var f:Dynamic = Reflect.field(e, constr);
+		if (f == null)
+			throw "No such constructor " + constr;
+		if (Reflect.isFunction(f)) {
+			if (params == null)
+				throw "Constructor " + constr + " need parameters";
+			return Reflect.callMethod(null, f, params);
+		}
+		if (params != null && params.length != 0)
+			throw "Constructor " + constr + " does not need parameters";
 		return f;
 	}
 
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
-		var c : String = (untyped e.__constructs__)[index];
-		if( c == null ) throw index+" is not a valid enum constructor index";
-		return createEnum(e,c,params);
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T {
+		var c:String = (untyped e.__constructs__)[index];
+		if (c == null)
+			throw index + " is not a valid enum constructor index";
+		return createEnum(e, c, params);
 	}
 
-	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String> {
-		var p : Dynamic = untyped c.prototype;
-		var a :Array<String> = [];
-		while (p != null){
-			for (f in lua.Boot.fieldIterator(p)){
-				if (!Lambda.has(a,f)) a.push(f);
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String> {
+		var p:Dynamic = untyped c.prototype;
+		var a:Array<String> = [];
+		while (p != null) {
+			for (f in lua.Boot.fieldIterator(p)) {
+				if (!Lambda.has(a, f))
+					a.push(f);
 			}
 			var mt = lua.Lua.getmetatable(p);
-			if (mt != null && mt.__index != null ) p = mt.__index;
-			else p = null;
+			if (mt != null && mt.__index != null)
+				p = mt.__index;
+			else
+				p = null;
 		}
 		return a;
 	}
 
-	public static function getClassFields( c : Class<Dynamic> ) : Array<String> {
+	public static function getClassFields(c:Class<Dynamic>):Array<String> {
 		var a = Reflect.fields(c);
 		a.remove("__name__");
 		a.remove("__interfaces__");
@@ -135,73 +147,73 @@ enum ValueType {
 		return a;
 	}
 
-	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> {
-		var a : Array<String> = untyped e.__constructs__;
+	public static function getEnumConstructs(e:Enum<Dynamic>):Array<String> {
+		var a:Array<String> = untyped e.__constructs__;
 		return a.copy();
 	}
 
-	public static function typeof( v : Dynamic ) : ValueType  {
-
-		switch( Lua.type(v) ) {
-			case "boolean": return TBool;
-			case "string": return TClass(String);
+	public static function typeof(v:Dynamic):ValueType {
+		switch (Lua.type(v)) {
+			case "boolean":
+				return TBool;
+			case "string":
+				return TClass(String);
 			case "number":
-						   // this should handle all cases : NaN, +/-Inf and Floats outside range
-						   if( Math.ceil(v) == v%2147483648.0 )
-							   return TInt;
-						   return TFloat;
+				// this should handle all cases : NaN, +/-Inf and Floats outside range
+				if (Math.ceil(v) == v % 2147483648.0)
+					return TInt;
+				return TFloat;
 			case "table":
-						   var e = v.__enum__;
-						   if( e != null )
-							   return TEnum(e);
-						   var c = lua.Boot.getClass(v);
-						   if( c != null )
-							   return TClass(c);
-						   return TObject;
+				var e = v.__enum__;
+				if (e != null)
+					return TEnum(e);
+				var c = lua.Boot.getClass(v);
+				if (c != null)
+					return TClass(c);
+				return TObject;
 			case "function":
-						   if( lua.Boot.isClass(v) || lua.Boot.isEnum(v) )
-							   return TObject;
-						   return TFunction;
+				if (lua.Boot.isClass(v) || lua.Boot.isEnum(v))
+					return TObject;
+				return TFunction;
 			case "nil":
-						   return TNull;
+				return TNull;
 			default:
-						   return TUnknown;
+				return TUnknown;
 		}
 	}
 
-	public static function enumEq<T>( a : T, b : T ) : Bool untyped {
-		if( a == b )
-			return true;
-		try {
-			if( a[0] != b[0] )
-				return false;
-			for( i in 2...a.length )
-				if( !enumEq(a[i],b[i]) )
+	public static function enumEq<T>(a:T, b:T):Bool
+		untyped {
+			if (a == b)
+				return true;
+			try {
+				if (a[0] != b[0])
+					return false;
+				for (i in 2...a.length)
+					if (!enumEq(a[i], b[i]))
+						return false;
+				var e = a.__enum__;
+				if (e != b.__enum__ || e == null)
 					return false;
-			var e = a.__enum__;
-			if( e != b.__enum__ || e == null )
+			} catch (e:Dynamic) {
 				return false;
-		} catch( e : Dynamic ) {
-			return false;
+			}
+			return true;
 		}
-		return true;
-	}
 
-	public inline static function enumConstructor( e : EnumValue ) : String {
+	public inline static function enumConstructor(e:EnumValue):String {
 		return untyped e[0];
 	}
 
-	public inline static function enumParameters( e : EnumValue ) : Array<Dynamic> {
+	public inline static function enumParameters(e:EnumValue):Array<Dynamic> {
 		return (cast e : Array<Dynamic>).slice(2);
 	}
 
-	public inline static function enumIndex( e : EnumValue ) : Int {
+	public inline static function enumIndex(e:EnumValue):Int {
 		return untyped e[1];
 	}
 
-	public static function allEnums<T>( e : Enum<T> ) : Array<T> {
-		return untyped e.__empty_constructs__;
+	public static function allEnums<T>(e:Enum<T>):Array<T> {
+		return ((cast e).__empty_constructs__ : Array<T>).copy();
 	}
-
 }
-
diff --git a/std/lua/_std/haxe/Json.hx b/std/lua/_std/haxe/Json.hx
index c8e994d6196e3b3cca0dbe16d9f03611d91d1130..823505c7d01fe7e0b1d62ecd7a6d37ca6b16b4d0 100644
--- a/std/lua/_std/haxe/Json.hx
+++ b/std/lua/_std/haxe/Json.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 @:coreApi
 class Json {
-
-	public static function parse( text : String ) : Dynamic {
+	public static function parse(text:String):Dynamic {
 		return haxe.format.JsonParser.parse(text);
 	}
 
-	public static function stringify( value : Dynamic, ?replacer:Dynamic -> Dynamic -> Dynamic, ?space:String ) : String {
+	public static function stringify(value:Dynamic, ?replacer:(key:Dynamic, value:Dynamic) -> Dynamic, ?space:String):String {
 		return haxe.format.JsonPrinter.print(value, replacer, space);
 	}
-
 }
diff --git a/std/lua/_std/haxe/Utf8.hx b/std/lua/_std/haxe/Utf8.hx
deleted file mode 100644
index fd2c6ebd9d41252be4b5454aa73031b53d06c3ec..0000000000000000000000000000000000000000
--- a/std/lua/_std/haxe/Utf8.hx
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (C)2005-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 haxe;
-
-import lua.NativeStringTools;
-
-class Utf8 {
-
-    var __b : String;
-
-    public function new( ?size : Int ) {
-		__b = "";
-    }
-
-    public inline function addChar( c : Int ) : Void {
-		__b += char(c);
-    }
-
-    public inline function toString() : String {
-		return __b;
-    }
-
-    static inline function decodeChar( s : String, pos : Int, code : Int, width : Int ) {
-        return
-            if (width == 1)
-                code;
-            else if (width == 2)
-                ((code & 0x3F) << 6) |
-                (s.charCodeAt(pos+1) & 0x7F);
-            else if (width == 3)
-                ((code & 0x1F) << 12) |
-                ((s.charCodeAt(pos+1) & 0x7F) << 6) |
-                (s.charCodeAt(pos+2) & 0x7F);
-            else
-                ((code & 0x0F) << 18) |
-                ((s.charCodeAt(pos+1) & 0x7F) << 12) |
-                ((s.charCodeAt(pos+2) & 0x7F) << 6) |
-                (s.charCodeAt(pos+3) & 0x7F);
-    }
-
-    public static function iter( s : String, chars : Int -> Void ) {
-		var cur = 0;
-		while (cur < s.length){
-			var code = s.charCodeAt(cur);
-			var width = charWidth(code);
-			chars( decodeChar( s, cur, code, width ) );
-			cur += width;
-		}
-    }
-
-    public static function encode( s : String ) : String {
-		// ported from : http://phpjs.org/functions/utf8_encode/
-		if (s == null ) {
-			return '';
-		}
-		var string = (s + ''); // .replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-		var utftext = '';
-		var start = 0;
-		var end = 0;
-		var n = 0;
-		while (n < s.length) {
-			var c1 = string.charCodeAt(n);
-			var enc = null;
-
-			if (c1 < 128) {
-			end++;
-			} else if (c1 > 127 && c1 < 2048) {
-			enc = String.fromCharCode( (c1 >> 6) | 192)
-				+ String.fromCharCode( (c1 & 63) | 128);
-			} else if ((c1 & 0xF800) != 0xD800) {
-			enc = String.fromCharCode( (c1 >> 12) | 224)
-				+ String.fromCharCode( ((c1 >> 6) & 63) | 128)
-				+ String.fromCharCode( (c1 & 63) | 128);
-			} else { // surrogate pairs
-			if ((c1 & 0xFC00) != 0xD800) {
-				throw 'Unmatched trail surrogate at ' + n;
-			}
-			var c2 = string.charCodeAt(++n);
-			if ((c2 & 0xFC00) != 0xDC00) {
-				throw 'Unmatched lead surrogate at ' + (n - 1);
-			}
-			c1 = ((c1 & 0x3FF) << 10) + (c2 & 0x3FF) + 0x10000;
-			enc = String.fromCharCode( (c1 >> 18) | 240)
-				+ String.fromCharCode( ((c1 >> 12) & 63) | 128)
-				+ String.fromCharCode(((c1 >> 6) & 63) | 128)
-				+ String.fromCharCode((c1 & 63) | 128);
-			}
-			if (enc != null) {
-			if (end > start) {
-				utftext += string.substring(start, end);
-			}
-			utftext += enc;
-			start = end = n + 1;
-			}
-			n++;
-		}
-
-		if (end > start) {
-			utftext += string.substring(start, s.length);
-		}
-
-		return utftext;
-
-    }
-
-    public static function decode( s : String ) : String {
-		var ret = new StringBuf();
-		iter(s, function(c){
-			if( c == 8364 ) // euro symbol
-			c = 164;
-			else if( c > 255 ){
-			// throw new RangeError('Utf8 decode invalid character ($c)');
-			throw 'Utf8::decode invalid character ($c)';
-			}
-
-			if (c != 0xFEFF) // BOM
-			ret.add(String.fromCharCode(c));
-		});
-		return ret.toString();
-    }
-
-    public static inline function charCodeAt( s : String, index : Int ) : Int {
-		var cur_idx = 0;
-		var pos = 0;
-		for (i in 0...index){
-			pos += charWidth(s.charCodeAt(pos));
-		}
-		var ret = 0;
-		var code = s.charCodeAt(pos);
-		var bytes = charWidth(code);
-		return decodeChar( s, pos, code, bytes );
-    }
-
-    public static function validate( s : String ) : Bool {
-		if (s == null) return false;
-		var cur = 0;
-		while (cur < s.length){
-			var c1 = s.charCodeAt(cur++);
-			if (c1 < 0x80) continue;
-			if (c1 < 0xC0) return false;
-			if (s.length <= cur) return false;
-			var c2 = s.charCodeAt(cur++);
-			if (c1 < 0xE0) {
-				if ((c1 & 0x1E != 0) && (c2 & 0xC0 == 0x80)) continue;
-				return false;
-			}
-			if (s.length <= cur) return false;
-			var c3 = s.charCodeAt(cur++);
-			if (c1 < 0xF0) {
-				if (((c1 & 0x0F != 0) || (c2 & 0x20 != 0)) && (c2 & 0xC0 == 0x80) && (c3 & 0xC0 == 0x80)
-						&& !(c1 == 0xED && 0xA0 <= c2 && c2 <= 0xBF))
-					continue;
-				return false;
-			}
-			if (s.length <= cur) return false;
-			var c4 = s.charCodeAt(cur++);
-			if (c1 < 0xF8) {
-				if (((c1 & 0x07 != 0) || (c2 & 0x30 != 0)) && (c2 & 0xC0 == 0x80) && (c3 & 0xC0 == 0x80) && (c4 & 0xC0 == 0x80)
-						&& !((c1 == 0xF4 && c2 > 0x8F) || c1 > 0xF4))
-					continue;
-				return false;
-			}
-			return false;
-		}
-		return true;
-    }
-
-    public static inline function length( s : String ) : Int {
-		var pos = 0;
-		var len = 0;
-		while (pos < s.length){
-			pos += charWidth(s.charCodeAt(pos));
-			len++;
-		}
-		return len;
-    }
-
-    public static function compare( a : String, b : String ) : Int {
-		return a > b ? 1 : (a == b ? 0 : -1);
-    }
-
-    public static inline function sub( s : String, pos : Int, len : Int ) : String {
-		var startpos = 0;
-		var ret = new StringBuf();
-		for (i in 0...pos){
-			startpos += charWidth(s.charCodeAt(startpos));
-		}
-		var endpos = startpos;
-		for (i in 0...len){
-			endpos += charWidth(s.charCodeAt(endpos));
-		}
-		return s.substring(startpos, endpos);
-    }
-
-    static function charWidth(c:Int) : Int {
-		return   if (c >  0   && c <= 127) 1;
-			else if (c >= 194 && c <= 223) 2;
-			else if (c >= 224 && c <= 239) 3;
-			else if (c >= 240 && c <= 244) 4;
-			else null;
-    }
-
-    public static function char( unicode : Int ) : String {
-		if (unicode <= 0x7F) {
-			return String.fromCharCode(unicode);
-		} else if (unicode <= 0x7FF) {
-			var b0 = 0xC0 + Math.floor(unicode / 0x40);
-			var b1 = 0x80 + (unicode % 0x40);
-			return NativeStringTools.char(b0, b1);
-		} else if (unicode <= 0xFFFF) {
-			var b0 = 0xE0 +  Math.floor(unicode / 0x1000);
-			var b1 = 0x80 + (Math.floor(unicode / 0x40) % 0x40);
-			var b2 = 0x80 + (unicode % 0x40);
-			return NativeStringTools.char(b0, b1, b2);
-		} else if (unicode <= 0x10FFFF) {
-			var code = unicode;
-			var b3   = 0x80 + (code % 0x40);
-			code     = Math.floor(code / 0x40);
-			var b2   = 0x80 + (code % 0x40);
-			code     = Math.floor(code / 0x40);
-			var b1   = 0x80 + (code % 0x40);
-			code     = Math.floor(code / 0x40);
-			var b0   = 0xF0 + code;
-
-			return NativeStringTools.char(b0, b1, b2, b3);
-		} else {
-			throw 'Unicode greater than U+10FFFF';
-		}
-    }
-}
-
diff --git a/std/lua/_std/haxe/ds/IntMap.hx b/std/lua/_std/haxe/ds/IntMap.hx
index 38d5769bc5d11fabb79419195c8b446e7541bfa7..68c23db9bb715c62212403cfa823580922f9bf0b 100644
--- a/std/lua/_std/haxe/ds/IntMap.hx
+++ b/std/lua/_std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,68 +19,97 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
+
 import lua.Lua;
 
-class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
+class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
+	private var h:lua.Table<Int, T>;
 
-	private var h : Dynamic;
+	static var tnull:Dynamic = lua.Table.create();
 
-	public inline function new() : Void {
-		h = {};
+	public inline function new():Void {
+		h = lua.Table.create();
 	}
 
-	public inline function set( key : Int, value : T ) : Void {
-		 h[key] = value;
+	public inline function set(key:Int, value:T):Void {
+		if (value == null) {
+			h[key] = tnull;
+		} else {
+			h[key] = value;
+		}
 	}
 
-	public inline function get( key : Int ) : Null<T> {
-		return h[key];
+	public inline function get(key:Int):Null<T> {
+		var ret = h[key];
+		if (ret == tnull) {
+			ret = null;
+		}
+		return ret;
 	}
 
-	public inline function exists( key : Int ) : Bool {
-		return Reflect.hasField(h,cast key);
+	public inline function exists(key:Int):Bool {
+		return h[key] != null;
 	}
 
-	public function remove( key : Int ) : Bool {
-		if (!Reflect.hasField(h,cast key)) return false;
-		Reflect.deleteField(h, cast key);
-		return true;
+	public function remove(key:Int):Bool {
+		if (h[key] == null) {
+			return false;
+		} else {
+			h[key] = null;
+			return true;
+		}
 	}
 
-	public function keys() : Iterator<Int> {
-		var cur = Reflect.fields(h).iterator();
+	public function keys():Iterator<Int> {
+		var next = Lua.next;
+		var cur = next(h, null).index;
 		return {
-			next : function() {
-				var ret = cur.next();
+			next: function() {
+				var ret = cur;
+				cur = next(h, cur).index;
 				return cast ret;
 			},
-			hasNext : function() return cur.hasNext()
+			hasNext: function() return cur != null
 		}
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		var it = keys();
 		return untyped {
-			hasNext : function() return it.hasNext(),
-			next : function() return h[it.next()]
+			hasNext: function() return it.hasNext(),
+			next: function() return h[it.next()]
 		};
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():IntMap<T> {
+		var copied = new IntMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
+	public inline function clear():Void {
+		h = lua.Table.create();
+	}
 }
-
diff --git a/std/lua/_std/haxe/ds/ObjectMap.hx b/std/lua/_std/haxe/ds/ObjectMap.hx
index 79019d5b179f014c28988cf796e1b907cea9e793..3525cce4a2c81f8667c85ea12bfcdaefbe73a8a9 100644
--- a/std/lua/_std/haxe/ds/ObjectMap.hx
+++ b/std/lua/_std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,81 +19,102 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
-class ObjectMap<A,B> implements haxe.Constraints.IMap<A,B> {
 
+class ObjectMap<A, B> implements haxe.Constraints.IMap<A, B> {
 	static var count = 0;
 
-	static inline function assignId(obj: { } ):Int {
+	static inline function assignId(obj:{}):Int {
 		return untyped obj.__id__ = ++count;
 	}
 
-	static inline function getId(obj: { } ):Int {
+	static inline function getId(obj:{}):Int {
 		return untyped obj.__id__;
 	}
 
-	var h : Dynamic;
-	var k : Dynamic;
+	var h:Dynamic;
+	var k:Dynamic;
 
-	public inline function new() : Void {
+	public inline function new():Void {
 		h = lua.Table.create();
 		k = lua.Table.create();
 	}
 
-	public inline function set( key : A, value : B ) : Void untyped {
-		h[key] = value;
-		k[key] = true;
-	}
+	public inline function set(key:A, value:B):Void
+		untyped {
+			h[key] = value;
+			k[key] = true;
+		}
 
-	public inline function get( key : A ) : Null<B> untyped {
-		return h[key];
-	}
+	public inline function get(key:A):Null<B>
+		untyped {
+			return h[key];
+		}
 
-	public inline function exists( key : A ) : Bool untyped {
-		return k[key] != null;
-	}
+	public inline function exists(key:A):Bool
+		untyped {
+			return k[key] != null;
+		}
 
-	public function remove( key : A ) : Bool untyped {
-		if ( k[key] == null) return false;
-		k[key] = null;
-		h[key] = null;
-		return true;
-	}
+	public function remove(key:A):Bool
+		untyped {
+			if (k[key] == null)
+				return false;
+			k[key] = null;
+			h[key] = null;
+			return true;
+		}
 
-	public function keys() : Iterator<A> untyped {
-		var cur = next(h,null);
-		return {
-			next : function() {
-				var ret = cur;
-				cur = untyped next(k, cur);
-				return ret;
-			},
-			hasNext : function() return cur != null
+	public function keys():Iterator<A>
+		untyped {
+			var cur = next(h, null);
+			return {
+				next: function() {
+					var ret = cur;
+					cur = untyped next(k, cur);
+					return ret;
+				},
+				hasNext: function() return cur != null
+			}
 		}
-	}
 
-	public function iterator() : Iterator<B> {
+	public function iterator():Iterator<B> {
 		var itr = keys();
 		return untyped {
-			hasNext : itr.hasNext, 
-			next : function() return h[itr.next()]
+			hasNext: itr.hasNext,
+			next: function() return h[itr.next()]
 		};
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<A, B> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():ObjectMap<A, B> {
+		var copied = new ObjectMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
+	public inline function clear():Void {
+		h = lua.Table.create();
+		k = lua.Table.create();
+	}
 }
-
diff --git a/std/lua/_std/haxe/ds/StringMap.hx b/std/lua/_std/haxe/ds/StringMap.hx
index f3478aa003c3d6ee32ab6ccbdc32dd3ee521e6e5..f4b19fa080b4951d86cd6aada94c366834f66612 100644
--- a/std/lua/_std/haxe/ds/StringMap.hx
+++ b/std/lua/_std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,77 +19,101 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
+
 import lua.Lua;
 
-class StringMap<T> implements haxe.Constraints.IMap<String,T> {
+class StringMap<T> implements haxe.Constraints.IMap<String, T> {
+	private var h:lua.Table<String, T>;
 
-	private var k : Dynamic; // Is item exists
-	private var v : Dynamic; // Values table
+	static var tnull:Dynamic = lua.Table.create();
 
-	public inline function new() : Void {
-		// these need to be plain anonymous tables,
-		// so that we can set arbitrary string values.
-		v = untyped __lua__("{}");
-		k = untyped __lua__("{}");
+	public inline function new():Void {
+		h = lua.Table.create();
 	}
 
-	public inline function set( key : String, value : T ) : Void untyped {
-		untyped __lua__("{0}[{1}] = {2}", v, key, value);
-		untyped __lua__("{0}[{1}] = true", k, key);
-	}
+	public inline function set(key:String, value:T):Void
+		untyped {
+			if (value == null) {
+				h[key] = tnull;
+			} else {
+				h[key] = value;
+			}
+		}
 
-	public inline function get( key : String ) : Null<T> untyped {
-		return untyped __lua__("{0}[{1}]", v, key);
-	}
+	public inline function get(key:String):Null<T>
+		untyped {
+			var ret = h[key];
+			if (ret == tnull) {
+				ret = null;
+			}
+			return ret;
+		}
 
-	public inline function exists( key : String ) : Bool untyped {
-		return untyped __lua__("({0}[{1}] or false)", k, key);
-	}
+	public inline function exists(key:String):Bool
+		untyped {
+			return h[key] != null;
+		}
 
-	public function remove( key : String ) : Bool untyped {
-		if (untyped __lua__("not {0}[{1}]", k, key)) return false;
-		untyped __lua__("{0}[{1}] = nil", v, key);
-		untyped __lua__("{0}[{1}] = nil", k, key);
-		return true;
-	}
+	public function remove(key:String):Bool
+		untyped {
+			if (h[key] == null) {
+				return false;
+			} else {
+				h[key] = null;
+				return true;
+			}
+		}
 
-	public function keys() : Iterator<String> {
-		var cur : Array<String> = [];
-		untyped __lua__("for _k,_v in pairs({1}) do
-			if(_v)then {0}:push(_k) end
-		end", cur, k);
+	public function keys():Iterator<String> {
+		var next = Lua.next;
+		var cur = next(h, null).index;
 		return {
-			next : function() {
-				var ret = cur.pop();
-				return ret;
+			next: function() {
+				var ret = cur;
+				cur = next(h, cur).index;
+				return cast ret;
 			},
-			hasNext : function() return cur.length > 0
+			hasNext: function() return cur != null
 		}
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		var it = keys();
-		return  {
-			hasNext : function() return it.hasNext(),
-			next : function() return untyped __lua__("{0}[{1}]", v, it.next())
+		return untyped {
+			hasNext: function() return it.hasNext(),
+			next: function() return h[it.next()]
 		};
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():StringMap<T> {
+		var copied = new StringMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
+	public inline function clear():Void {
+		h = lua.Table.create();
+	}
 }
-
diff --git a/std/lua/_std/sys/FileSystem.hx b/std/lua/_std/sys/FileSystem.hx
index c2479b5a7b561b8deef76e8d46f3c2e35eadf052..0c1821f765a0ed77bc932d378076e167ce251b36 100644
--- a/std/lua/_std/sys/FileSystem.hx
+++ b/std/lua/_std/sys/FileSystem.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys;
 
 import lua.Io;
@@ -26,65 +27,67 @@ import lua.Os;
 import lua.Lib;
 import lua.Table;
 import haxe.io.Path;
-typedef LFileSystem = lua.lib.luv.fs.FileSystem;
+import lua.lib.luv.fs.FileSystem as LFileSystem;
 
 class FileSystem {
-	public static function exists( path : String ) : Bool {
-		if (path == null) return false;
-		else{
-			var f = Io.open(path);
-			if (f == null) return false;
-			else {
-				f.close();
-				return true;
-			}
+	public static function exists(path:String):Bool {
+		if (path == null)
+			return false;
+		else {
+			var res = LFileSystem.stat(path);
+			return res.result != null;
 		}
 	}
 
-	public inline static function rename( path : String, newPath : String ) : Void {
+	public inline static function rename(path:String, newPath:String):Void {
 		var ret = Os.rename(path, newPath);
-		if (!ret.success){
+		if (!ret.success) {
 			throw ret.message;
 		}
 	}
 
-	public inline static function stat( path : String ) : FileStat {
-		var ls =  LFileSystem.stat(path);
-		if (ls.result == null) throw ls.message;
+	public inline static function stat(path:String):FileStat {
+		var ls = LFileSystem.stat(path);
+		if (ls.result == null)
+			throw ls.message;
 		var l = ls.result;
 		return {
-			gid   : l.gid,
-			uid   : l.uid,
-			rdev  : l.rdev,
-			size  : l.size,
-			nlink : l.nlink,
-			mtime : Date.fromTime(l.mtime.sec + l.mtime.nsec/1000000),
-			mode  : l.mode,
-			ino   : l.ino,
-			dev   : l.dev,
-			ctime : Date.fromTime(l.ctime.sec + l.ctime.nsec/1000000),
-			atime : Date.fromTime(l.atime.sec + l.atime.nsec/1000000)
+			gid: l.gid,
+			uid: l.uid,
+			rdev: l.rdev,
+			size: l.size,
+			nlink: l.nlink,
+			mtime: Date.fromTime(l.mtime.sec + l.mtime.nsec / 1000000),
+			mode: l.mode,
+			ino: l.ino,
+			dev: l.dev,
+			ctime: Date.fromTime(l.ctime.sec + l.ctime.nsec / 1000000),
+			atime: Date.fromTime(l.atime.sec + l.atime.nsec / 1000000)
 		};
 	}
 
-	public inline static function fullPath( relPath : String ) : String {
-		return Path.normalize(absolutePath(relPath));
+	public inline static function fullPath(relPath:String):String {
+		return LFileSystem.realpath(Path.normalize(absolutePath(relPath)));
 	}
 
-	public inline static function absolutePath( relPath : String ) : String {
+	public inline static function absolutePath(relPath:String):String {
+		if (haxe.io.Path.isAbsolute(relPath)) {
+			return relPath;
+		}
 		var pwd = lua.lib.luv.Misc.cwd();
-		if (pwd == null) return relPath;
+		if (pwd == null)
+			return relPath;
 		return Path.join([pwd, relPath]);
 	}
 
-	public inline static function deleteFile( path : String ) : Void {
+	public inline static function deleteFile(path:String):Void {
 		var ret = lua.Os.remove(path);
-		if (!ret.success){
+		if (!ret.success) {
 			throw ret.message;
 		}
 	}
 
-	public inline static function readDirectory( path : String ) : Array<String> {
+	public inline static function readDirectory(path:String):Array<String> {
 		var scandir = LFileSystem.scandir(path);
 
 		var itr = function() {
@@ -94,21 +97,22 @@ class FileSystem {
 		return lua.Lib.fillArray(itr);
 	}
 
-	public inline static function isDirectory( path : String ) : Bool {
+	public inline static function isDirectory(path:String):Bool {
 		var result = LFileSystem.stat(path).result;
-		if (result == null) return false;
-		else return result.type ==  "directory";
+		if (result == null)
+			return false;
+		else
+			return result.type == "directory";
 	}
 
-	public inline static function deleteDirectory( path : String ) : Void {
+	public inline static function deleteDirectory(path:String):Void {
 		var ret = LFileSystem.rmdir(path);
-		if (ret.result == null){
+		if (ret.result == null) {
 			throw ret.message;
 		}
 	}
 
-	public inline static function createDirectory( path : String ) : Void {
-
+	public static function createDirectory(path:String):Void {
 		var path = haxe.io.Path.addTrailingSlash(path);
 		var _p = null;
 		var parts = [];
@@ -117,7 +121,7 @@ class FileSystem {
 			path = _p;
 		}
 		for (part in parts) {
-			if (part.charCodeAt(part.length - 1) != ":".code && !exists(part) && !LFileSystem.mkdir( part, 511 ).result)
+			if (part.charCodeAt(part.length - 1) != ":".code && !exists(part) && !LFileSystem.mkdir(part, 511).result)
 				throw "Could not create directory:" + part;
 		}
 	}
diff --git a/std/lua/_std/sys/io/File.hx b/std/lua/_std/sys/io/File.hx
index b9c75db798432494d7d442422b82ba158b056c9d..cc9abc3838acb0777147b8bd1fca38c64b870bd5 100644
--- a/std/lua/_std/sys/io/File.hx
+++ b/std/lua/_std/sys/io/File.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
+
+import haxe.SysTools;
 import lua.Lua;
 import lua.Io;
 import lua.Os;
@@ -28,53 +31,66 @@ import lua.Boot;
 
 @:coreApi
 class File {
-	public static function getContent( path : String ) : String {
+	public static function getContent(path:String):String {
 		var f = Io.open(path, "r");
-		if (f == null) throw 'Invalid path : $path';
+		if (f == null)
+			throw 'Invalid path : $path';
 		var s = f.read("*all");
 		f.close();
 		return s;
 	}
 
-	public static function append( path : String, binary : Bool = true ) : FileOutput {
+	public static function append(path:String, binary:Bool = true):FileOutput {
 		return new FileOutput(Io.open(path, "a"));
+	}
 
+	public static function update(path:String, binary:Bool = true):FileOutput {
+		if (!FileSystem.exists(path)) {
+			write(path).close();
+		}
+		return new FileOutput(Io.open(path, binary ? "r+b" : "r+"));
 	}
 
-	public static function copy( srcPath : String, dstPath : String ) : Void {
-		switch (Sys.systemName()) {
-			case "Windows" : Os.execute('copy ${StringTools.quoteWinArg(srcPath, true)} ${StringTools.quoteWinArg(dstPath,true)}');
-			default : Os.execute('copy ${StringTools.quoteUnixArg(srcPath)} ${StringTools.quoteUnixArg(dstPath)}');
+	public static function copy(srcPath:String, dstPath:String):Void {
+		var result = switch (Sys.systemName()) {
+			case "Windows": Os.execute('copy ${SysTools.quoteWinArg(srcPath, true)} ${SysTools.quoteWinArg(dstPath, true)}');
+			default: Os.execute('cp ${SysTools.quoteUnixArg(srcPath)} ${SysTools.quoteUnixArg(dstPath)}');
 		};
+		if (#if (lua_ver >= 5.2) !result.success #elseif (lua_ver < 5.2) result != 0 #else ((result : Dynamic) != true && (result : Dynamic) != 0) #end
+		) {
+			throw 'Failed to copy $srcPath to $dstPath';
+		}
 	}
 
-	public static function getBytes( path : String ) : haxe.io.Bytes {
+	public static function getBytes(path:String):haxe.io.Bytes {
 		var finput = read(path, true);
 		var res = finput.readAll();
 		finput.close();
 		return res;
 	}
 
-	public static function read( path : String, binary : Bool = true ) : FileInput {
+	public static function read(path:String, binary:Bool = true):FileInput {
 		var fh = Io.open(path, binary ? 'rb' : 'r');
-		if (fh == null) throw 'Invalid path : $path';
+		if (fh == null)
+			throw 'Invalid path : $path';
 		return new FileInput(fh);
 	}
 
-	public static function write( path : String, binary : Bool = true ) : FileOutput {
+	public static function write(path:String, binary:Bool = true):FileOutput {
 		var fh = Io.open(path, binary ? 'wb' : 'w');
-		if (fh == null) throw 'Invalid path : $path';
+		if (fh == null)
+			throw 'Invalid path : $path';
 		return new FileOutput(fh);
 	}
 
-	public static function saveBytes( path : String, bytes : haxe.io.Bytes ) : Void {
+	public static function saveBytes(path:String, bytes:haxe.io.Bytes):Void {
 		var f = write(path, true);
 		f.writeBytes(bytes, 0, bytes.length);
 		f.close();
 	}
 
-	public static function saveContent( path : String, content : String ) : Void {
-		var f = write(path, false);
+	public static function saveContent(path:String, content:String):Void {
+		var f = write(path, true);
 		f.writeString(content);
 		f.close();
 	}
diff --git a/std/lua/_std/sys/io/FileInput.hx b/std/lua/_std/sys/io/FileInput.hx
index 8de0767e3a5d5dd81501e34117f456706e9315a7..b1a77541f8fb25e3d815d6d39121de07812a755c 100644
--- a/std/lua/_std/sys/io/FileInput.hx
+++ b/std/lua/_std/sys/io/FileInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 import lua.FileHandle;
@@ -34,32 +35,33 @@ class FileInput extends haxe.io.Input {
 	var f:FileHandle;
 	var _eof:Bool;
 
-	public function new(f:FileHandle){
-		if (f == null) throw 'Invalid filehandle : $f';
+	public function new(f:FileHandle) {
+		if (f == null)
+			throw 'Invalid filehandle : $f';
 		this.bigEndian = Boot.platformBigEndian;
 		this.f = f;
 		this._eof = false;
 	}
 
-	inline public function seek( p : Int, pos : FileSeek ) : Void {
-		var arg = switch(pos){
-			case SeekBegin : "set";
-			case SeekCur   : "cur";
-			case SeekEnd   : "end";
+	inline public function seek(p:Int, pos:FileSeek):Void {
+		var arg = switch (pos) {
+			case SeekBegin: "set";
+			case SeekCur: "cur";
+			case SeekEnd: "end";
 		}
 		_eof = false;
 		return f.seek(arg, p);
 	}
 
-	inline public function tell() : Int {
+	inline public function tell():Int {
 		return f.seek();
 	}
 
-	inline public function eof() : Bool {
+	inline public function eof():Bool {
 		return _eof;
 	}
 
-	override inline public function readByte() : Int {
+	override inline public function readByte():Int {
 		var byte = f.read(1);
 		if (byte == null) {
 			_eof = true;
@@ -68,23 +70,31 @@ class FileInput extends haxe.io.Input {
 		return NativeStringTools.byte(byte);
 	}
 
-	override inline public function close() : Void {
+	override function readBytes(s:Bytes, pos:Int, len:Int):Int {
+		if (eof())
+			throw new haxe.io.Eof();
+		return super.readBytes(s, pos, len);
+	}
+
+	override inline public function close():Void {
 		f.close();
 	}
-	override public function readAll( ?bufsize : Int ) : Bytes {
-		if( bufsize == null )
+
+	override public function readAll(?bufsize:Int):Bytes {
+		if (bufsize == null)
 			bufsize = (1 << 14); // 16 Ko
 		var buf = Bytes.alloc(bufsize);
 		var total = new haxe.io.BytesBuffer();
 		try {
-			while( true ) {
-				var len = readBytes(buf,0,bufsize);
-				if (len == 0) break;
-				total.addBytes(buf,0,len);
+			while (true) {
+				var len = readBytes(buf, 0, bufsize);
+				if (len == 0)
+					break;
+				total.addBytes(buf, 0, len);
 			}
-		} catch( e : Eof ) _eof = true;
+		} catch (e:Eof) {
+			_eof = true;
+		}
 		return total.getBytes();
 	}
-
-
 }
diff --git a/std/lua/_std/sys/io/FileOutput.hx b/std/lua/_std/sys/io/FileOutput.hx
index 4ff494ddc177473dc26e718fdd1e2b6f3cb69777..5de715ef1d539b05ef7ef45b7b12d83fa1505dd5 100644
--- a/std/lua/_std/sys/io/FileOutput.hx
+++ b/std/lua/_std/sys/io/FileOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,37 +19,44 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 import lua.FileHandle;
+import haxe.io.Bytes;
 
 class FileOutput extends haxe.io.Output {
 	var f:FileHandle;
 
-	public function new(f:FileHandle){
-		if (f == null) throw 'Invalid filehandle : $f';
+	public function new(f:FileHandle) {
+		if (f == null)
+			throw 'Invalid filehandle : $f';
 		this.f = f;
 	}
 
-	public inline function seek( p : Int, pos : FileSeek ) : Void {
-		var arg = switch(pos){
-			case SeekBegin : "set";
-			case SeekCur : "cur";
-			case SeekEnd : "end";
+	public inline function seek(p:Int, pos:FileSeek):Void {
+		var arg = switch (pos) {
+			case SeekBegin: "set";
+			case SeekCur: "cur";
+			case SeekEnd: "end";
 		}
 		return f.seek(arg, p);
 	}
 
-	public inline function tell() : Int {
+	public inline function tell():Int {
 		return f.seek();
 	}
 
-	override inline public function writeByte(c : Int) : Void {
+	override inline public function writeByte(c:Int):Void {
 		f.write(String.fromCharCode(c));
 	}
 
+	override inline public function writeBytes(s:Bytes, pos:Int, len:Int):Int {
+		f.write(s.getString(pos, len));
+		return s.length;
+	}
+
 	override public function close() {
 		f.close();
 	}
-
 }
diff --git a/std/lua/_std/sys/io/Process.hx b/std/lua/_std/sys/io/Process.hx
index 6800ba56356c8c2540783cbda439adb5bd895758..926b45dcb2244474b922947679f986c9c50913b5 100644
--- a/std/lua/_std/sys/io/Process.hx
+++ b/std/lua/_std/sys/io/Process.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,42 +21,45 @@
  */
 
 package sys.io;
+
 import lua.Io;
 import lua.lib.luv.Pipe;
 import lua.lib.luv.Signal;
 import lua.lib.luv.Loop;
 import lua.Boot;
 import lua.Table;
-
+import lua.NativeStringTools;
+import haxe.SysTools;
 import haxe.io.Bytes;
 import haxe.io.Error;
 import haxe.io.Eof;
 
 @:coreApi
 class Process {
-	var _pid : Int;
-	var _handle  : lua.lib.luv.Process;
-	var _code : Int;
-	var closef : Int->Signal->Void;
+	var _pid:Int;
+	var _handle:lua.lib.luv.Process;
+	var _code:Int;
+	var closef:Int->Signal->Void;
 
-	public var stdout(default,null) : haxe.io.Input;
-	public var stderr(default,null) : haxe.io.Input;
-	public var  stdin(default,null) : haxe.io.Output;
+	public var stdout(default, null):haxe.io.Input;
+	public var stderr(default, null):haxe.io.Input;
+	public var stdin(default, null):haxe.io.Output;
 
-	static var argQuote = Sys.systemName() == "Windows" ? function(x) return StringTools.quoteWinArg(x,true) : StringTools.quoteUnixArg;
-	static var _shell = Sys.systemName() == "Window" ? 'cmd.exe' : '/bin/bash';
+	static var argQuote = Sys.systemName() == "Windows" ? function(x) return SysTools.quoteWinArg(x, true) : SysTools.quoteUnixArg;
+	static var _shell = Sys.systemName() == "Windows" ? 'cmd.exe' : '/bin/sh';
 
 	/**
-	  Sets the args for the shell, which will include the cmd to be executed
-	  by the shell.
+		Sets the args for the shell, which will include the cmd to be executed
+		by the shell.
 	**/
-	static function setArgs(cmd : String, ?args : Array<String>) : Table<Int,String>{
+	static function setArgs(cmd:String, ?args:Array<String>):Table<Int, String> {
 		var pargs = lua.Table.create();
 		var idx = 1;
-		if (sys.FileSystem.exists(cmd)) cmd = '"$cmd"'; // escape simple paths
+		if (sys.FileSystem.exists(cmd))
+			cmd = '"$cmd"'; // escape simple paths
 		var all = [cmd];
 		if (args != null) {
-			for (a in args){
+			for (a in args) {
 				all.push(argQuote(a));
 			}
 		}
@@ -72,115 +75,148 @@ class Process {
 		return pargs;
 	}
 
+	public function new(cmd:String, ?args:Array<String>, ?detached:Bool) {
+		if (detached)
+			throw "Detached process is not supported on this platform";
 
-	public function new( cmd : String, ?args : Array<String>){
 		var _stdout = new Pipe(false);
 		var _stderr = new Pipe(false);
-		var _stdin  = new Pipe(false);
+		var _stdin = new Pipe(false);
 		stdout = new ProcessInput(_stdout);
 		stderr = new ProcessInput(_stderr);
-		stdin  = new ProcessOutput(_stdin);
-		var stdio = untyped __lua_table__([_stdin,_stdout,_stderr]);
+		stdin = new ProcessOutput(_stdin);
+		var stdio = untyped __lua_table__([_stdin, _stdout, _stderr]);
 
-		var opt = { args: setArgs(cmd, args), stdio : stdio };
+		var opt = {args: setArgs(cmd, args), stdio: stdio};
 
-		var p : lua.lib.luv.Process.LuvSpawn;
-		p = lua.lib.luv.Process.spawn( _shell, opt, function(code : Int, signal : Signal){
+		var p:lua.lib.luv.Process.LuvSpawn;
+		p = lua.lib.luv.Process.spawn(_shell, opt, function(code:Int, signal:Signal) {
 			_code = code;
 		});
 
-		if (p.handle == null)  throw p.pid;
+		if (p.handle == null)
+			throw p.pid;
 		_pid = p.pid;
 		_handle = p.handle;
 	}
 
-
-	public function getPid() : Int {
+	public function getPid():Int {
 		return _pid;
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		stdout.close();
 		stdin.close();
 		stderr.close();
 		_handle.close();
 	}
 
-	public function exitCode( block : Bool = true ) : Null<Int> {
-		if (!block) return _code;
+	public function exitCode(block:Bool = true):Null<Int> {
+		if (!block)
+			return _code;
 		while (_handle.is_active()) {
 			Loop.run(); // process io until the handle closes (emulate blocking)
 		}
 		return _code;
 	}
 
-	public function kill() : Void {
+	public function kill():Void {
 		_handle.kill("sigterm");
 	}
 }
 
-class ProcessInput extends haxe.io.Input {
-	var b : Pipe;
-	var buf : String;
-	var idx : Int;
+private class ProcessInput extends haxe.io.Input {
+	var b:Pipe;
+	var buf:String;
+	var idx:Int;
+	var _eof:Bool;
 
 	public function new(pipe:Pipe) {
 		b = pipe;
+		_eof = false;
+	}
+
+	inline public function eof():Bool {
+		return _eof;
+	}
+
+	override function readBytes(s:Bytes, pos:Int, len:Int):Int {
+		if (eof())
+			throw new haxe.io.Eof();
+		return super.readBytes(s, pos, len);
 	}
 
 	override public function readByte() {
 		var err_str = null;
-		if (buf == null || idx >= buf.length){
+		if (buf == null || idx >= NativeStringTools.len(buf)) {
 			buf = null;
 			idx = 0;
 			var pending = true;
-			b.read_start(function(err, chunk){
-				if (chunk != null) buf = chunk;
-				if (err != null) err_str = err;
+			b.read_start(function(err, chunk) {
+				if (chunk != null) {
+					if (buf != null) {
+						buf = buf + chunk;
+					} else {
+						buf = chunk;
+					}
+				}
+				if (err != null)
+					err_str = err;
 				pending = false;
 			});
 			// process io until we read our input (emulate blocking)
-			while (pending) Loop.run();
+			while (pending)
+				Loop.run();
+		}
+		if (buf == null) {
+			_eof = true;
+			throw new haxe.io.Eof();
 		}
-		if (buf == null) throw new haxe.io.Eof();
-		if (err_str != null) throw err_str;
-		var code : Int =  cast buf.charCodeAt(idx++);
+		if (err_str != null)
+			throw err_str;
+		var code = NativeStringTools.byte(buf, ++idx);
 		return code;
 	}
 
-	override public function readAll( ?bufsize : Int ) : Bytes {
-		if( bufsize == null ) bufsize = (1 << 14); // 16 Ko
+	override public function readAll(?bufsize:Int):Bytes {
+		if (bufsize == null)
+			bufsize = (1 << 14); // 16 Ko
 
 		var buf = Bytes.alloc(bufsize);
 		var total = new haxe.io.BytesBuffer();
 		try {
-			while( true ) {
-				var len = readBytes(buf,0,bufsize);
+			while (true) {
+				var len = readBytes(buf, 0, bufsize);
 				// don't throw blocked error here
 				if (len != 0)
-					total.addBytes(buf,0,len);
-				if (len < bufsize)  break;
+					total.addBytes(buf, 0, len);
+				if (len < bufsize)
+					break;
 			}
-		} catch( e : Eof ) {}
+		} catch (e:Eof) {
+			_eof = true;
+		}
 		return total.getBytes();
 	}
 
+	override public function close() {
+		b.close();
+	}
 }
 
-class ProcessOutput extends haxe.io.Output {
-	var b : Pipe;
+private class ProcessOutput extends haxe.io.Output {
+	var b:Pipe;
 
 	public function new(pipe:Pipe) {
 		b = pipe;
 		set_bigEndian(Boot.platformBigEndian);
 	}
 
-	override public function writeByte(c : Int ) : Void {
-		b.write(String.fromCharCode(c));
+	override public function writeByte(c:Int):Void {
+		b.write(NativeStringTools.char(c));
 	}
 
-	override public function close(){
+	override public function close() {
 		b.close();
 	}
 }
-
diff --git a/std/lua/_std/sys/net/Host.hx b/std/lua/_std/sys/net/Host.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5f65e413208e2fa49b3e033a0b6fb40cd56596f1
--- /dev/null
+++ b/std/lua/_std/sys/net/Host.hx
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C)2005-2019 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 sys.net;
+
+import haxe.io.Bytes;
+import haxe.io.BytesInput;
+
+@:coreapi
+class Host {
+	public var host(default, null):String;
+
+	public var ip(default, null):Int;
+
+	var _ip:String;
+
+	public function new(name:String):Void {
+		host = name;
+		if (lua.NativeStringTools.find(name, "(%d+)%.(%d+)%.(%d+)%.(%d+)").begin != null) {
+			_ip = name;
+		} else {
+			var res = lua.lib.luv.net.Dns.getaddrinfo(name);
+			if (res.result == null)
+				throw "Unrecognized node name";
+			_ip = res.result[1].addr;
+			if (_ip == "::1")
+				_ip = "127.0.0.0";
+		}
+		var num = 0;
+		for (a in _ip.split(".")) {
+			num = num * 256 + lua.Lua.tonumber(a);
+		}
+		ip = num;
+	}
+
+	public function toString():String {
+		return _ip;
+	}
+
+	public function reverse():String {
+		return lua.lib.luv.net.Dns.getnameinfo({ip: _ip}).result;
+	}
+
+	static public function localhost():String {
+		return lua.lib.luasocket.socket.Dns.gethostname();
+	}
+}
diff --git a/std/lua/_std/sys/net/Socket.hx b/std/lua/_std/sys/net/Socket.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fe64b5c4c0b35258a53efce1b11f2d5ca86baf44
--- /dev/null
+++ b/std/lua/_std/sys/net/Socket.hx
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C)2005-2019 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 sys.net;
+
+import lua.lib.luasocket.Socket as LuaSocket;
+import lua.lib.luasocket.socket.*;
+import lua.*;
+
+import haxe.io.Bytes;
+import haxe.io.Error;
+
+class Socket {
+	public var input(default, null):haxe.io.Input;
+
+	public var output(default, null):haxe.io.Output;
+
+	var custom:Dynamic;
+
+	var _socket:LuaSocket;
+
+	var blocking = false;
+	var timeout = null;
+
+	public function new():Void {}
+
+	public function close():Void {
+		_socket.close();
+	}
+
+	public function read():String {
+		return input.readAll().toString();
+	}
+
+	public function write(content:String):Void {
+		output.writeString(content);
+	}
+
+	public function connect(host:Host, port:Int):Void {
+		var res = LuaSocket.connect(host.host, port);
+		if (res.message != null)
+			throw 'Socket Error : ${res.message}';
+		input = new SocketInput(res.result);
+		output = new SocketOutput(res.result);
+		_socket = res.result;
+		_socket.settimeout(timeout);
+	}
+
+	public function listen(connections:Int):Void {
+		var res = LuaSocket.tcp();
+		if (res.message != null)
+			throw 'Socket Listen Error : ${res.message}';
+		res.result.listen(connections);
+		_socket = res.result;
+		_socket.settimeout(timeout);
+	}
+
+	public function shutdown(read:Bool, write:Bool):Void {
+		var client:TcpClient = cast _socket;
+		switch [read, write] {
+			case [true, true]:
+				client.shutdown(Both);
+			case [true, false]:
+				client.shutdown(Receive);
+			case [false, true]:
+				client.shutdown(Send);
+			default:
+				null;
+		}
+	}
+
+	public function bind(host:Host, port:Int):Void {
+		var res = LuaSocket.bind(host.host, port);
+		if (res.message != null)
+			throw 'Socket Bind Error : ${res.message}';
+		_socket = res.result;
+	}
+
+	public function accept():Socket {
+		var server:TcpServer = cast _socket;
+		var res = server.accept();
+		if (res.message != null)
+			throw 'Error : ${res.message}';
+		var sock = new Socket();
+		sock._socket = res.result;
+		sock.input = new SocketInput(res.result);
+		sock.output = new SocketOutput(res.result);
+		return sock;
+	}
+
+	public function peer():{host:Host, port:Int} {
+		var client:TcpClient = cast _socket;
+		var res = client.getpeername();
+		var host = new Host(res.address);
+		return {host: host, port: Std.parseInt(res.port)};
+	}
+
+	public function host():{host:Host, port:Int} {
+		var server:TcpServer = cast _socket;
+		var res = server.getsockname();
+		var host = new Host(res.address);
+		return {host: host, port: Std.parseInt(res.port)};
+	}
+
+	public inline function setTimeout(timeout:Float):Void {
+		this.timeout = timeout;
+		if (_socket != null) {
+			var client:TcpClient = cast _socket;
+			client.settimeout(timeout);
+		}
+	}
+
+	public function waitForRead():Void {
+		select([this], null, null);
+	}
+
+	public function setBlocking(b:Bool):Void {
+		blocking = b;
+	}
+
+	public function setFastSend(b:Bool):Void {
+		var client:TcpClient = cast _socket;
+		client.setoption(TcpNoDelay, true);
+	}
+
+	static public function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+			?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>} {
+		var read_tbl = read == null ? Table.create() : Table.fromArray([for (r in read) cast r._socket]);
+		var write_tbl = write == null ? Table.create() : Table.fromArray(([for (r in write) cast r._socket]));
+		var res = LuaSocket.select(read_tbl, write_tbl, timeout);
+
+		var convert_socket = function(x:LuaSocket) {
+			var sock = new Socket();
+			sock.input = new SocketInput(cast x);
+			sock.output = new SocketOutput(cast x);
+			return sock;
+		}
+		var read_arr = res.read == null ? [] : lua.Lib.tableToArray(res.read).map(convert_socket);
+
+		var write_arr = res.write == null ? [] : lua.Lib.tableToArray(res.write).map(convert_socket);
+		return {read: read_arr, write: write_arr, others: []};
+	}
+}
+
+private class SocketInput extends haxe.io.Input {
+	var tcp:TcpClient;
+
+	public function new(tcp:TcpClient) {
+		this.tcp = tcp;
+	}
+
+	override public function readByte():Int {
+		var res = tcp.receive(1);
+		if (res.message == "closed"){
+			throw new haxe.io.Eof();
+		}
+		else if (res.message != null)
+			throw 'Error : ${res.message}';
+		return res.result.charCodeAt(0);
+	}
+
+	override public function readBytes(s:Bytes, pos:Int, len:Int):Int {
+		var leftToRead = len;
+		var b = s.getData();
+		if (pos < 0 || len < 0 || pos + len > s.length)
+			throw haxe.io.Error.OutsideBounds;
+		var readCount = 0;
+		try {
+			while (leftToRead > 0) {
+				b[pos] = cast readByte();
+				pos++;
+				readCount++;
+				leftToRead--;
+			}
+		} catch (e:haxe.io.Eof) {
+			if (readCount == 0) {
+				throw e;
+			}
+		}
+		return readCount;
+	}
+
+}
+
+private class SocketOutput extends haxe.io.Output {
+	var tcp:TcpClient;
+
+	public function new(tcp:TcpClient) {
+		this.tcp = tcp;
+	}
+
+	override public function writeByte(c:Int):Void {
+		var char = NativeStringTools.char(c);
+		var res = tcp.send(char);
+		if (res.message != null){
+			throw 'Error : Socket writeByte : ${res.message}';
+		}
+	}
+
+	override public function writeBytes(s:Bytes, pos:Int, len:Int):Int {
+		if (pos < 0 || len < 0 || pos + len > s.length)
+			throw Error.OutsideBounds;
+		var b = s.getData().slice(pos, pos +len).map(function(byte){
+			return lua.NativeStringTools.char(byte);
+		});
+		var encoded = Table.concat(cast b, 0);
+		var res = tcp.send(encoded);
+		if (res.message != null){
+			throw 'Error : Socket writeByte : ${res.message}';
+		}
+
+		return len;
+	}
+
+}
diff --git a/std/lua/lib/lrexlib/Rex.hx b/std/lua/lib/lrexlib/Rex.hx
index ab8c1da9d2de84815c37850ddb96d978dce9848b..438eab09cf6c395ba5a8e8d6f28b52bd196fc2da 100644
--- a/std/lua/lib/lrexlib/Rex.hx
+++ b/std/lua/lib/lrexlib/Rex.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,69 +21,66 @@
  */
 
 package lua.lib.lrexlib;
+
+import haxe.extern.EitherType;
+
 @:luaRequire("rex_pcre")
 extern class Rex {
-
-	@:overload(          function       (expr : String, flag : Int) : Rex{})
-	inline public static function create(expr : String, flag : String) : Rex{
+	inline public static function create(expr:String, flag:EitherType<Int, String>):Rex {
 		return untyped Rex['new'](expr, flag);
 	}
 
 	/**
-	  The function searches for the first match of the regexp `patt` in the
-	  string `subj`, starting from offset `init`, subject to flags `cf` and `ef`.
+		The function searches for the first match of the regexp `patt` in the
+		string `subj`, starting from offset `init`, subject to flags `cf` and `ef`.
 
-	  @return matched string, or array of strings.
-	 **/
-	public static function match(patt : String, ?init : Int, ?ef : Int) : Dynamic;
+		@return matched string, or array of strings.
+	**/
+	public static function match(patt:EitherType<Rex, String>, subj:String, ?init:Int, ?ef:Int):Dynamic;
 
 	/**
-	 The function searches for the first match of the regexp patt in the string
-	 `subj`, starting from offset `init`, subject to flags `cf` and `ef`.
-	 **/
-	public static function find(subj : String, ?init : Int, ?ef : Int) : Dynamic;
+		The function searches for the first match of the regexp patt in the string
+		`subj`, starting from offset `init`, subject to flags `cf` and `ef`.
+	**/
+	public static function find(patt:EitherType<Rex, String>, subj:String, ?init:Int, ?ef:Int):Dynamic;
 
+	/**
+		The function is intended for use in the generic for Lua construct. It is
+		used for splitting a subject string `subj` into parts (sections). The `sep`
+		parameter is a regular expression pattern representing separators between
+		the sections.
+	**/
+	public static function split(subj:String, sep:EitherType<Rex, String>, ?cf:Int, ?ef:Int):Void->String;
 
 	/**
-	 The function is intended for use in the generic for Lua construct. It is
-	 used for splitting a subject string `subj` into parts (sections). The `sep`
-	 parameter is a regular expression pattern representing separators between
-	 the sections.
-	 **/
-	@:overload(   function      (subj : String, sep : Rex,    ?cf : Int, ?ef : Int) : Void->String{})
-	public static function split(subj : String, sep : String, ?cf : Int, ?ef : Int) : Void->String;
+		This function counts matches of the pattern `patt` in the string `subj`.
+	**/
+	public static function count(subj:String, patt:EitherType<Rex, String>, cf:Int, ef:Int):Dynamic;
 
+	public static function flags(?tb:Dynamic):Dynamic;
 
 	/**
-	  This function counts matches of the pattern `patt` in the string `subj`.
+		The function searches for the first match of the regexp in the string
+		`subj`, starting from offset `init`, subject to execution flags `ef`.
 	**/
-	public static function count(subj : String, patt : String, cf : Int, ef : Int) : Dynamic;
-	public static function flags(?tb:Dynamic) : Dynamic;
-
-  /**
-    The function searches for the first match of the regexp in the string
-    `subj`, starting from offset `init`, subject to execution flags `ef`.
-  **/
-	public function tfind(subj : String, ?init : Int, ?ef : Int) : Dynamic;
+	public function tfind(subj:String, ?init:Int, ?ef:Int):Dynamic;
 
 	/**
-	  This function searches for the first match of the regexp in the string
-	  `subj`, starting from offset `init`, subject to execution flags `ef`.
+		This function searches for the first match of the regexp in the string
+		`subj`, starting from offset `init`, subject to execution flags `ef`.
 	**/
-	public function exec(subj : String, ?init : Int, ?ef : Int) : Dynamic;
+	public function exec(subj:String, ?init:Int, ?ef:Int):Dynamic;
 
 	/**
-	 The function is intended for use in the generic for Lua construct. It
-	 returns an iterator for repeated matching of the pattern patt in the
-	 string `subj`, subject to flags `cf` and `ef`.
-	 **/
-	public static function gmatch(subj : String, patt : String, ?cf : Int, ?ef : Int) : Void->String;
+		The function is intended for use in the generic for Lua construct. It
+		returns an iterator for repeated matching of the pattern patt in the
+		string `subj`, subject to flags `cf` and `ef`.
+	**/
+	public static function gmatch(subj:String, patt:EitherType<Rex, String>, ?cf:Int, ?ef:Int):Void->String;
 
 	/**
-	  This function searches for all matches of the pattern `patt` in the string
-    `subj` and replaces them according to the parameters `repl` and `n`.
-	 **/
-	@:overload(	  function     (subj : String, patt : Rex,    repl: Dynamic, ?n: Int, ?cf : Int, ?ef : Int) : String {})
-	public static function gsub(subj : String, patt : String, repl: Dynamic, ?n: Int, ?cf : Int, ?ef : Int) : String;
+		  This function searches for all matches of the pattern `patt` in the string
+		`subj` and replaces them according to the parameters `repl` and `n`.
+	**/
+	public static function gsub(subj:String, patt:EitherType<Rex, String>, repl:Dynamic, ?n:Int, ?cf:Int, ?ef:Int):String;
 }
-
diff --git a/std/lua/lib/luasocket/Socket.hx b/std/lua/lib/luasocket/Socket.hx
index c786bf70e46510655786b6847f9f974246cb3875..ce11131ddb42468eec57e30c7991d22bbcfb9e3f 100644
--- a/std/lua/lib/luasocket/Socket.hx
+++ b/std/lua/lib/luasocket/Socket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,19 @@
  */
 
 package lua.lib.luasocket;
+
+import lua.lib.luasocket.socket.*;
+
 @:luaRequire("socket")
 extern class Socket {
-	public static function gettime() : Float; // TODO : find a smaller lib for this? 
+	public static var _DEBUG:Bool;
+	public static var _VERSION:String;
+	public static function tcp():Result<TcpMaster>;
+	public static function bind(address:String, port:Int, ?backlog:Int):Result<TcpServer>;
+	public static function connect(address:String, port:Int, ?locaddr:String, ?locport:Int):Result<TcpClient>;
+	public static function gettime():Float;
+	public static function select(recvt:Table<Int, Socket>, sendt:Table<Int, Socket>, ?timeout:Float):SelectResult;
+	public function close():Void;
+	public function getsockname():AddrInfo;
+	public function settimeout(value:Float, ?mode:TimeoutMode):Void;
 }
diff --git a/std/php7/net/SslSocket.hx b/std/lua/lib/luasocket/socket/AddrInfo.hx
similarity index 86%
rename from std/php7/net/SslSocket.hx
rename to std/lua/lib/luasocket/socket/AddrInfo.hx
index c3f6a47a826e36f40a5627c35ab23c725f67443c..a1a5fb83c8b03bba358d68621787d228f98735ad 100644
--- a/std/php7/net/SslSocket.hx
+++ b/std/lua/lib/luasocket/socket/AddrInfo.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package php.net;
 
-class SslSocket extends sys.net.Socket {
-
-	public function new() : Void {
-		super();
-		protocol = "ssl";
-	}
+package lua.lib.luasocket.socket;
 
+@:multiReturn extern class AddrInfo {
+	var address:String;
+	var port:String;
 }
diff --git a/std/lua/lib/luasocket/socket/Dns.hx b/std/lua/lib/luasocket/socket/Dns.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ce26fa6c129322decfa079c4829dede9274aae9b
--- /dev/null
+++ b/std/lua/lib/luasocket/socket/Dns.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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 lua.lib.luasocket.socket;
+
+@:luaRequire("socket", "dns")
+extern class Dns {
+	public static function gethostname():String;
+}
diff --git a/std/lua/lib/luasocket/socket/ReceivePattern.hx b/std/lua/lib/luasocket/socket/ReceivePattern.hx
new file mode 100644
index 0000000000000000000000000000000000000000..11ecc6e3f4fff7c3830abcc9f910b619bd326c8b
--- /dev/null
+++ b/std/lua/lib/luasocket/socket/ReceivePattern.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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 lua.lib.luasocket.socket;
+
+enum abstract ReceivePattern(String) {
+	var All = "*a";
+	var Line = "*l";
+}
diff --git a/std/lua/lib/luasocket/socket/SelectResult.hx b/std/lua/lib/luasocket/socket/SelectResult.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e6dfbf2dd48539a8f94e9684b1db012b09bbbbc0
--- /dev/null
+++ b/std/lua/lib/luasocket/socket/SelectResult.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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 lua.lib.luasocket.socket;
+
+@:multiReturn extern class SelectResult {
+	var read:Table<Int, Socket>;
+	var write:Table<Int, Socket>;
+}
diff --git a/std/lua/lib/luasocket/socket/ShutdownMode.hx b/std/lua/lib/luasocket/socket/ShutdownMode.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d778bbbcedf37c48e5ab94c2ed1bbcc10f6ca3dc
--- /dev/null
+++ b/std/lua/lib/luasocket/socket/ShutdownMode.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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 lua.lib.luasocket.socket;
+
+enum abstract ShutdownMode(String) {
+	var Both = "both";
+	var Send = "send";
+	var Receive = "receive";
+}
diff --git a/std/lua/lib/luasocket/socket/TcpClient.hx b/std/lua/lib/luasocket/socket/TcpClient.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4e3a8c58209b5f2619083951d173b3a7031be531
--- /dev/null
+++ b/std/lua/lib/luasocket/socket/TcpClient.hx
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C)2005-2019 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 lua.lib.luasocket.socket;
+
+import haxe.extern.EitherType;
+
+extern class TcpClient extends Socket {
+	public function getpeername():AddrInfo;
+	public function receive(pattern:EitherType<ReceivePattern, Int>, ?prefix:String):Result<String>;
+	public function send(data:String, ?i:Int, ?j:Int):Result<Int>;
+	public function shutdown(mode:ShutdownMode):Result<Int>;
+	public function settimeout(value:Float, ?mode:TimeoutMode):Void;
+	public function setoption(option:TcpOption, value:EitherType<Bool, {on:Bool, timeout:Float}>):Void;
+}
diff --git a/std/lua/lib/luasocket/socket/TcpMaster.hx b/std/lua/lib/luasocket/socket/TcpMaster.hx
new file mode 100644
index 0000000000000000000000000000000000000000..77629b2a138066f859282715754ac7c2fb55cf0d
--- /dev/null
+++ b/std/lua/lib/luasocket/socket/TcpMaster.hx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2019 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 lua.lib.luasocket.socket;
+
+import haxe.extern.EitherType;
+
+extern class TcpMaster extends Socket {
+	// transforms master to TcpServer
+	public function listen(backlog:Int):Void;
+	// transforms master to TcpClient
+	public function connect(address:String, port:Int):Void;
+	public function bind(address:String, port:Int):Void;
+}
diff --git a/std/lua/lib/luasocket/socket/TcpOption.hx b/std/lua/lib/luasocket/socket/TcpOption.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1b4469dda7a664545dd73c644b127203e6d07719
--- /dev/null
+++ b/std/lua/lib/luasocket/socket/TcpOption.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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 lua.lib.luasocket.socket;
+
+enum abstract TcpOption(String) {
+	var KeepAlive = "keepalive";
+	var Linger = "linger";
+	var ReuseAddress = "reuseaddr";
+	var TcpNoDelay = "tcp-nodelay";
+}
diff --git a/std/lua/lib/luasocket/socket/TcpServer.hx b/std/lua/lib/luasocket/socket/TcpServer.hx
new file mode 100644
index 0000000000000000000000000000000000000000..da1551b216b0d0fd35acfe82f750ae7350c44b15
--- /dev/null
+++ b/std/lua/lib/luasocket/socket/TcpServer.hx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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 lua.lib.luasocket.socket;
+
+import lua.*;
+
+extern class TcpServer extends Socket {
+	public function accept():Result<TcpClient>;
+	public function settimeout(value:Int, ?mode:TimeoutMode):Void;
+	public function setoption(option:String, value:TcpOption):Void;
+}
diff --git a/std/lua/lib/luasocket/socket/TimeoutMode.hx b/std/lua/lib/luasocket/socket/TimeoutMode.hx
new file mode 100644
index 0000000000000000000000000000000000000000..945742c2daf4d9d6811bf04fefa664f102d2b674
--- /dev/null
+++ b/std/lua/lib/luasocket/socket/TimeoutMode.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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 lua.lib.luasocket.socket;
+
+enum abstract TimeoutMode(String) {
+	var Block = "b";
+	var Total = "t";
+}
diff --git a/std/lua/lib/luautf8/Utf8.hx b/std/lua/lib/luautf8/Utf8.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4b7e98307c90f944e769c8996082a0eae15464da
--- /dev/null
+++ b/std/lua/lib/luautf8/Utf8.hx
@@ -0,0 +1,115 @@
+package lua.lib.luautf8;
+
+/**
+	These are all externs for the lua-utf8 library, which functions
+	as an additional set of string tools.
+
+	Note that all relevant indexes are "1" based.
+**/
+@:luaRequire('lua-utf8')
+extern class Utf8 {
+	/**
+		Receives a string and returns its length. The empty string `""` has
+		length `0`. Embedded zeros are counted, so `"a\000bc\000"` has length `5`.
+	**/
+	public static function len(str:String):Int;
+
+	/**
+		Receives zero or more integers. Returns a string with length equal to the
+		number of arguments, in which each character has the internal numerical
+		code equal to its corresponding argument.
+		Note that numerical codes are not necessarily portable across platforms.
+	**/
+	public static function char(codes:haxe.extern.Rest<Int>):String;
+
+	/**
+		Returns the substring of `str` that starts at `start` and continues until `end`;
+		`start` and `end` can be negative. If `end` is absent, then it is assumed to be
+		equal to `-1` (which is the same as the string length).
+		In particular, the call `sub(str,1,end)` returns a prefix of `str`
+		with length `end`, and `sub(str, -end)` returns a suffix of `str` with
+		length `start`.
+	**/
+	public static function sub(str:String, start:Int, ?end:Int):StringSub;
+
+	/**
+		Returns the character code at position `index` of `str`.
+	**/
+	public static function charCodeAt(str:String, index:Int):Int;
+
+	/**
+		Looks for the first match of pattern in the string `str`.
+		If it finds a match, then `find` returns the indices of `str` where this
+		occurrence starts and ends.
+
+		@param target If the target has captures, then in a successful match the
+			   captured values are also returned, after the two indices.
+		@param start specifies where to start the search; its default value is `1`
+			   and can be negative.
+		@param plain turns off the pattern matching facilities, so the function does
+			   a plain "find substring" operation, with no characters in pattern
+			   being considered "magic". Note that if plain is given, then `start` must be given as well.
+	**/
+	public static function find(str:String, target:String, ?start:Int, ?plain:Bool):StringFind;
+
+	/**
+		Returns the internal numerical codes of the characters `str[index]`.
+		Note that numerical codes are not necessarily portable across platforms.
+	**/
+	public static function byte(str:String, ?index:Int):Int;
+
+	/**
+
+	**/
+	@:overload(function(str:String, pattern:String, replace:String->Void, ?n:Int):String {})
+	@:overload(function(str:String, pattern:String, replace:String->String, ?n:Int):String {})
+	public static function gsub(str:String, pattern:String, replace:String, ?n:Int):String;
+
+	/**
+		Returns an iterator function that, each time it is called, returns the next
+		captures from pattern over string `str`. If `pattern` specifies no captures,
+		then the whole match is produced in each call.
+	**/
+	@:overload(function(str:String, pattern:String, match:Void->String, ?n:Int):String->Void {})
+	public static function gmatch(str:String, pattern:String):Void->String;
+
+	/**
+		Looks for the first match of pattern in the string s. If it finds one,
+		then match returns the captures from the pattern; otherwise it returns `null`.
+		If pattern specifies no captures, then the whole match is returned.
+		The optional argument `n` specifies where to start the search;
+		its default value is `1` and can be negative.
+	**/
+	public static function match(str:String, pattern:String, ?n:Int):String;
+
+	/**
+		Receives a string and returns a copy of this string with all lowercase
+		letters changed to uppercase. All other characters are left unchanged.
+		The definition of what a lowercase letter is depends on the current locale.
+	**/
+	public static function upper(str:String):String;
+
+	/**
+		Receives a string and returns a copy of this string with all uppercase
+		letters changed to lowercase. All other characters are left unchanged.
+		The definition of what an uppercase letter is depends on the current locale.
+	**/
+	public static function lower(str:String):String;
+
+	public static function codes(str:String):Void->StringCodePoint;
+}
+
+@:multiReturn extern class StringFind {
+	var begin:Int;
+	var end:Int;
+}
+
+@:multiReturn extern class StringSub {
+	var match:String;
+	var count:Int;
+}
+
+@:multiReturn extern class StringCodePoint {
+	var position:Int;
+	var codepoint:Int;
+}
diff --git a/std/lua/lib/luv/Async.hx b/std/lua/lib/luv/Async.hx
index 68b1955935e540eac39fefcf179dfeea907e9202..2bdf4900c8829b37121bc4a4e6c2dbe98b40c15d 100644
--- a/std/lua/lib/luv/Async.hx
+++ b/std/lua/lib/luv/Async.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Async extends Handle {
-  static function new_async() : Async;
-  @:native("new_async") function new() : Void;
-  function send() : Int;
+	static function new_async():Async;
+	@:native("new_async") function new():Void;
+	function send():Int;
 }
diff --git a/std/lua/lib/luv/Check.hx b/std/lua/lib/luv/Check.hx
index 2f66a76e0eaad55d53158377acc85f31d94ac47e..2c74c9e023c5cecae1f2bad49eee3b25af64a930 100644
--- a/std/lua/lib/luv/Check.hx
+++ b/std/lua/lib/luv/Check.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,11 +21,12 @@
  */
 
 package lua.lib.luv;
+
 @:luaRequire("luv")
 extern class Check extends Handle {
-  static function new_check() : Check;
-  @:native("new_check") function new() : Void;
+	static function new_check():Check;
+	@:native("new_check") function new():Void;
 
-  function start(handle : Handle) : Int;
-  function stop() : Int;
+	function start(handle:Handle):Int;
+	function stop():Int;
 }
diff --git a/std/lua/lib/luv/Handle.hx b/std/lua/lib/luv/Handle.hx
index 035a9b0efd4ff7596197a669cc48f2cc03cc488a..622d0e696fd18934053633d82a99ff76dbdbee89 100644
--- a/std/lua/lib/luv/Handle.hx
+++ b/std/lua/lib/luv/Handle.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,13 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Handle {
-  function is_active() : Bool;
-  function is_closing() : Bool;
-  function close() : Void;
-  function ref() : Void;
-  function unref() : Void;
-  function has_ref() : Bool;
-  function send_buffer_size(size : Int) : Int;
-  function recv_buffer_size(size : Int) : Int;
-  function fileno() : Int;
+	function is_active():Bool;
+	function is_closing():Bool;
+	function close():Void;
+	function ref():Void;
+	function unref():Void;
+	function has_ref():Bool;
+	function send_buffer_size(size:Int):Int;
+	function recv_buffer_size(size:Int):Int;
+	function fileno():Int;
 }
diff --git a/std/lua/lib/luv/Idle.hx b/std/lua/lib/luv/Idle.hx
index abbe60b2461af9cb95b539d19e117a30b0c119e0..15063c7d446fa269f221c40110e458f58378f0f7 100644
--- a/std/lua/lib/luv/Idle.hx
+++ b/std/lua/lib/luv/Idle.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,8 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Idle extends Handle {
-  static function new_idle() : Idle;
-  @:native("new_idle") function new() : Void;
-  function start(cb : Void->Void) : Int;
-  function stop(cb : Void->Void) : Int;
+	static function new_idle():Idle;
+	@:native("new_idle") function new():Void;
+	function start(cb:Void->Void):Int;
+	function stop(cb:Void->Void):Int;
 }
diff --git a/std/lua/lib/luv/Loop.hx b/std/lua/lib/luv/Loop.hx
index e93858c4514e70b1c6e27e407ef5029beebad67b..ed71fe7f494a0d6f89b06c7b2efccc5678a52287 100644
--- a/std/lua/lib/luv/Loop.hx
+++ b/std/lua/lib/luv/Loop.hx
@@ -2,13 +2,13 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Loop {
-  static function loop_close() : Bool;
-  static function run(?mode : String) : Bool;
-  static function loop_alive() : Bool;
-  static function stop() : Void;
-  static function backend_fd() : Int;
-  static function backend_timeout() : Int;
-  static function now() : Int;
-  static function update_time() : Void;
-  static function walk(cb : Handle->Void) : Void;
+	static function loop_close():Bool;
+	static function run(?mode:String):Bool;
+	static function loop_alive():Bool;
+	static function stop():Void;
+	static function backend_fd():Int;
+	static function backend_timeout():Int;
+	static function now():Int;
+	static function update_time():Void;
+	static function walk(cb:Handle->Void):Void;
 }
diff --git a/std/lua/lib/luv/Misc.hx b/std/lua/lib/luv/Misc.hx
index 9bf93d08d9e3e7aac95806ea0c1ff433f396f9ea..e11e8b1a75cfe3cec638b14ea3d47cdcd1f52922 100644
--- a/std/lua/lib/luv/Misc.hx
+++ b/std/lua/lib/luv/Misc.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,79 +24,80 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Misc {
-  public static function chdir(path : String) : Bool;
+	public static function chdir(path:String):Bool;
 
-  public static function os_homedir() : String;
-  public static function os_tmpdir() : String;
-  public static function os_get_passwd() : String;
-  public static function cpu_info() : Table<Int,CpuInfo>;
+	public static function os_homedir():String;
+	public static function os_tmpdir():String;
+	public static function os_get_passwd():String;
+	public static function cpu_info():Table<Int, CpuInfo>;
 
-  public static function cwd() : String;
-  public static function exepath() : String;
-  public static function get_process_title() : String;
-  public static function get_total_memory() : Int;
-  public static function get_free_memory() : Int;
-  public static function getpid() : Int;
+	public static function cwd():String;
+	public static function exepath():String;
+	public static function get_process_title():String;
+	public static function get_total_memory():Int;
+	public static function get_free_memory():Int;
+	public static function getpid():Int;
 
-  // TODO Windows only?
-  public static function getuid() : Int;
-  public static function setuid(from : Int, to : Int) : String;
-  public static function getgid() : Int;
-  public static function setgid(from : Int, to : Int) : Void;
+	public static function os_getenv(env:String):String;
+	public static function os_setenv(env:String, value:String):Void;
 
-  public static function getrusage() : ResourceUsage;
-  public static function guess_handle(handle : Int) : String;
-  public static function hrtime() : Float;
+	// TODO Windows only?
+	public static function getuid():Int;
+	public static function setuid(from:Int, to:Int):String;
+	public static function getgid():Int;
+	public static function setgid(from:Int, to:Int):Void;
 
-  // TODO: implement this
-  // public static function interface_addresses() : String;
+	public static function getrusage():ResourceUsage;
+	public static function guess_handle(handle:Int):String;
+	public static function hrtime():Float;
 
-  public static function loadavg() : Float;
-  public static function resident_set_memory() : Int;
-  public static function set_process_title(title : String) : Bool;
-  public static function uptime() : Int;
-  public static function version() : Int;
-  public static function version_string() : String;
-
-  // TODO : Windows only
-  public static function print_all_handles() : Table<Int,String>;
-  public static function print_active_handles() : Table<Int,String>;
+	// TODO: implement this
+	// public static function interface_addresses() : String;
+	public static function loadavg():Float;
+	public static function resident_set_memory():Int;
+	public static function set_process_title(title:String):Bool;
+	public static function uptime():Int;
+	public static function version():Int;
+	public static function version_string():String;
 
+	// TODO : Windows only
+	public static function print_all_handles():Table<Int, String>;
+	public static function print_active_handles():Table<Int, String>;
 }
 
 typedef CpuInfo = {
-  model : String,
-  times : CpuTimes,
-  speed : Int
+	model:String,
+	times:CpuTimes,
+	speed:Int
 }
 
 typedef CpuTimes = {
-  sys  : Int,
-  idle : Int,
-  irq  : Int,
-  user : Int
+	sys:Int,
+	idle:Int,
+	irq:Int,
+	user:Int
 }
 
 typedef ResourceUsage = {
-  nivcsw   : Int,
-  maxrss   : Int,
-  msgrcv   : Int,
-  isrss    : Int,
-  inblock  : Int,
-  ixrss    : Int,
-  nvcsw    : Int,
-  nsignals : Int,
-  minflt   : Int,
-  nswap    : Int,
-  msgsnd   : Int,
-  oublock  : Int,
-  majflt   : Int,
-  stime    : MicroTimeStamp,
-  idrss    : Int,
-  utime    : MicroTimeStamp
+	nivcsw:Int,
+	maxrss:Int,
+	msgrcv:Int,
+	isrss:Int,
+	inblock:Int,
+	ixrss:Int,
+	nvcsw:Int,
+	nsignals:Int,
+	minflt:Int,
+	nswap:Int,
+	msgsnd:Int,
+	oublock:Int,
+	majflt:Int,
+	stime:MicroTimeStamp,
+	idrss:Int,
+	utime:MicroTimeStamp
 }
 
 typedef MicroTimeStamp = {
-  usec : Int,
-  sec : Int
+	usec:Int,
+	sec:Int
 }
diff --git a/std/lua/lib/luv/Pipe.hx b/std/lua/lib/luv/Pipe.hx
index e20d4a5868e247c95e7c06026c3f3368ea6b1717..9dee4b4e5029096aa7f8081dde605c9328e2ce0e 100644
--- a/std/lua/lib/luv/Pipe.hx
+++ b/std/lua/lib/luv/Pipe.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,18 +21,19 @@
  */
 
 package lua.lib.luv;
+
 import haxe.extern.EitherType;
 
 @:luaRequire("luv")
 extern class Pipe extends Stream {
-  static function new_pipe(ipc : Bool) : Pipe;
-  @:native("new_pipe") function new(ipc : Bool) : Void;
+	static function new_pipe(ipc:Bool):Pipe;
+	@:native("new_pipe") function new(ipc:Bool):Void;
 
-  function open(file : EitherType<FileHandle,Handle>) : Pipe;
-  function bind(name : String) : Pipe;
-  function connect(name : String, cb: String->Bool->Void) : Int;
-  function getsockname() : String;
-  function pending_instances(count : Int) : Int;
-  function pending_count() : Int;
-  function pending_type() : Int;
+	function open(file:EitherType<FileHandle, Handle>):Pipe;
+	function bind(name:String):Pipe;
+	function connect(name:String, cb:String->Bool->Void):Int;
+	function getsockname():String;
+	function pending_instances(count:Int):Int;
+	function pending_count():Int;
+	function pending_type():Int;
 }
diff --git a/std/lua/lib/luv/Poll.hx b/std/lua/lib/luv/Poll.hx
index ae91169918766db0458ad76b0446e0c4078e1570..fd593a7ee94c6db6c7c74a1c57f93eba8cba0868 100644
--- a/std/lua/lib/luv/Poll.hx
+++ b/std/lua/lib/luv/Poll.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,9 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Poll extends Handle {
-  static function new_poll() : Async;
-  @:native("new_poll") function new() : Void;
+	static function new_poll():Async;
+	@:native("new_poll") function new():Void;
 
-  function start(?type : Int, ?cb : Void->Void ) : Int;
-  function stop() : Int;
+	function start(?type:Int, ?cb:Void->Void):Int;
+	function stop():Int;
 }
diff --git a/std/lua/lib/luv/Prepare.hx b/std/lua/lib/luv/Prepare.hx
index 1a74ca2ae31b0a10eb2d42b659aa4112214870e9..1ee34459457eb624b8e41aa2f92413753a88a7aa 100644
--- a/std/lua/lib/luv/Prepare.hx
+++ b/std/lua/lib/luv/Prepare.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,9 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Prepare extends Handle {
-  static function new_prepare() : Prepare;
-  @:native("new_prepare") function new() : Void;
+	static function new_prepare():Prepare;
+	@:native("new_prepare") function new():Void;
 
-  function start() : Int;
-  function stop() : Int;
+	function start():Int;
+	function stop():Int;
 }
diff --git a/std/lua/lib/luv/Process.hx b/std/lua/lib/luv/Process.hx
index 17f0f09229a115146e585184f54daf215a33f3db..0fa8c626b1feaecb6f39d749ba0bbeef55e6b0dd 100644
--- a/std/lua/lib/luv/Process.hx
+++ b/std/lua/lib/luv/Process.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,17 +24,17 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Process extends Handle {
-  static function disable_stdio_inheritance() : Void;
-  static function spawn(path : String, options : Dynamic, cb : Int->Signal->Void ) : LuvSpawn;
-  function kill(sig:String) : Int;
+	static function disable_stdio_inheritance():Void;
+	static function spawn(path:String, options:Dynamic, cb:Int->Signal->Void):LuvSpawn;
+	function kill(sig:String):Int;
 }
 
 typedef ProcessOptions = {
-  args : Table<Int,String>,
-  stdio : Table<Int,Pipe>
+	args:Table<Int, String>,
+	stdio:Table<Int, Pipe>
 }
 
 @:multiReturn extern class LuvSpawn {
-  var handle : Process;
-  var pid : Int;
+	var handle:Process;
+	var pid:Int;
 }
diff --git a/std/lua/lib/luv/Request.hx b/std/lua/lib/luv/Request.hx
index d57613413e82214eda5e130260676bf6c43bb952..9f88ae062c1faa032e288c66dad12bf2860923ea 100644
--- a/std/lua/lib/luv/Request.hx
+++ b/std/lua/lib/luv/Request.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,5 +24,5 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Request {
-  function cancel() : Bool;
+	function cancel():Bool;
 }
diff --git a/std/lua/lib/luv/Signal.hx b/std/lua/lib/luv/Signal.hx
index 27e46c36c73beeb829018fe850ffaa4656b3845e..22558c7b5118b6fe5f7cd5dc565eefa416a54565 100644
--- a/std/lua/lib/luv/Signal.hx
+++ b/std/lua/lib/luv/Signal.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,10 +24,9 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Signal extends Handle {
-  static function new_signal() : Signal;
-  @:native("new_signal") function new() : Void;
-
-  function start(sigtype : haxe.extern.EitherType<Int,String>, ?cb : Void-> Void ) : Int;
-  function stop() : Int;
+	static function new_signal():Signal;
+	@:native("new_signal") function new():Void;
 
+	function start(sigtype:haxe.extern.EitherType<Int, String>, ?cb:Void->Void):Int;
+	function stop():Int;
 }
diff --git a/std/lua/lib/luv/Stream.hx b/std/lua/lib/luv/Stream.hx
index b661d38163575d1f329a14c43acfc72e800495ef..6a79d2a316234c6e57a4200f2937c7e17590018b 100644
--- a/std/lua/lib/luv/Stream.hx
+++ b/std/lua/lib/luv/Stream.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,22 +20,23 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package lua.lib.luv; 
+package lua.lib.luv;
+
 import lua.lib.luv.net.Tcp;
 
 @:luaRequire("luv")
 extern class Stream extends Handle {
-  function shutdown(?cb : Void->Void) : Int;
-  function listen(backlog : Int, cb : String->String->Void) : Int;
-  function accept(client_stream : Stream) : Int;
-  function read_start(cb : String->String->Void) : Int;
-  function read_stop() : Int;
-  function write(data : StreamData, ?cb : String->Bool->Void) : Int;
-  function write2(data : StreamData, send_handle : Tcp, cb: String->Bool->Void) : Int;
-  function try_write(data : StreamData) : Int;
-  function is_readable() : Bool;
-  function is_writable() : Bool;
-  function set_blocking(blocking : Bool) : Int;
+	function shutdown(?cb:Void->Void):Int;
+	function listen(backlog:Int, cb:String->String->Void):Int;
+	function accept(client_stream:Stream):Int;
+	function read_start(cb:String->String->Void):Int;
+	function read_stop():Int;
+	function write(data:StreamData, ?cb:String->Bool->Void):Int;
+	function write2(data:StreamData, send_handle:Tcp, cb:String->Bool->Void):Int;
+	function try_write(data:StreamData):Int;
+	function is_readable():Bool;
+	function is_writable():Bool;
+	function set_blocking(blocking:Bool):Int;
 }
 
-typedef StreamData = haxe.extern.EitherType<String,Table<Int,String>>;
+typedef StreamData = haxe.extern.EitherType<String, Table<Int, String>>;
diff --git a/std/lua/lib/luv/Thread.hx b/std/lua/lib/luv/Thread.hx
index 5a717c39429751a64e7dee8c579518a812b36586..6961829cb43b6448d59223f7346f9dd52d5adc01 100644
--- a/std/lua/lib/luv/Thread.hx
+++ b/std/lua/lib/luv/Thread.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,11 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Thread {
-  static function new_thread() : Timer;
-  @:native("new_thread") function new() : Void;
+	static function new_thread():Timer;
+	@:native("new_thread") function new():Void;
 
-  static function self() : Thread;
-  static function sleep(msec : Int) : Void;
-  function equal(t : Thread) : Bool;
-  function join(t : Thread) : Bool;
+	static function self():Thread;
+	static function sleep(msec:Int):Void;
+	function equal(t:Thread):Bool;
+	function join(t:Thread):Bool;
 }
diff --git a/std/lua/lib/luv/Timer.hx b/std/lua/lib/luv/Timer.hx
index f24c19e9517d34547ff9c7cf29a6ada86ea7149e..41d4fa18c7fbc3715305c2f4c7a6ada1d7389478 100644
--- a/std/lua/lib/luv/Timer.hx
+++ b/std/lua/lib/luv/Timer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,12 +24,12 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Timer extends Handle {
-  static function new_timer() : Timer;
-  @:native("new_timer") function new() : Void;
+	static function new_timer():Timer;
+	@:native("new_timer") function new():Void;
 
-  function start(timeout : Int, repeat : Int, cb : Void->Void) : Int;
-  function stop() : Int;
-  function again() : Int;
-  function set_repeat(repeat : Int) : Void;
-  function get_repeat() : Int;
+	function start(timeout:Int, repeat:Int, cb:Void->Void):Int;
+	function stop():Int;
+	function again():Int;
+	function set_repeat(repeat:Int):Void;
+	function get_repeat():Int;
 }
diff --git a/std/lua/lib/luv/Tty.hx b/std/lua/lib/luv/Tty.hx
index 5ef9cd09130c34d85432920cdffec851baa5d73a..ac0e79f5cfc7aa2fd9ffca81c2c4ec3a7eadc443 100644
--- a/std/lua/lib/luv/Tty.hx
+++ b/std/lua/lib/luv/Tty.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,20 +22,19 @@
 
 package lua.lib.luv;
 
-
 @:luaRequire("luv")
 extern class Tty extends Stream {
-  static function new_tty(fd : Int, readable : Bool) : Tty;
-  @:native("new_tty") function new(fd : Int, readable : Bool) : Void;
+	static function new_tty(fd:Int, readable:Bool):Tty;
+	@:native("new_tty") function new(fd:Int, readable:Bool):Void;
 
-  static function reset_mode() : Int;
+	static function reset_mode():Int;
 
-  function set_mode(mode : Int) : Int;
-  function get_winsize() : WidthHeight;
+	function set_mode(mode:Int):Int;
+	function get_winsize():WidthHeight;
 }
 
 @:multiReturn
 extern class WidthHeight {
-  var width : Int;
-  var height : Int;
+	var width:Int;
+	var height:Int;
 }
diff --git a/std/lua/lib/luv/Work.hx b/std/lua/lib/luv/Work.hx
index 450e746c82fe3180ae13d9790fd3cc864c1e2a4f..4da35c9dd4f939b7d7e2ffe213097de3b748a463 100644
--- a/std/lua/lib/luv/Work.hx
+++ b/std/lua/lib/luv/Work.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@ package lua.lib.luv;
 
 @:luaRequire("luv")
 extern class Work {
-  static function new_work() : Work;
-  @:native("new_work") function new() : Void;
-  static function queue_work(work : Work) : Bool;
+	static function new_work():Work;
+	@:native("new_work") function new():Void;
+	static function queue_work(work:Work):Bool;
 }
diff --git a/std/lua/lib/luv/fs/FileDescriptor.hx b/std/lua/lib/luv/fs/FileDescriptor.hx
index e1ad74793f8fec27ed24cb0645ee4bf55387eb74..1718e2b2c859c71b43cb64e74a24974228e7fab7 100644
--- a/std/lua/lib/luv/fs/FileDescriptor.hx
+++ b/std/lua/lib/luv/fs/FileDescriptor.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/lua/lib/luv/fs/FileSystem.hx b/std/lua/lib/luv/fs/FileSystem.hx
index 80daf2c202b5579676b3c00952154fddc15635f3..0f8e3678f1cca78a738e97f89995f75b74484cc5 100644
--- a/std/lua/lib/luv/fs/FileSystem.hx
+++ b/std/lua/lib/luv/fs/FileSystem.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,157 +21,156 @@
  */
 
 package lua.lib.luv.fs;
+
 import lua.lib.luv.fs.Open;
 import lua.Result;
 
 @:luaRequire("luv")
 extern class FileSystem {
-  @:native("fs_close")
-  @:overload(function(file : FileDescriptor, cb : String->Bool->Void) : Request {})
-  static function close(file : FileDescriptor) : Result<Bool>;
-
-  @:native("fs_open")
-  @:overload(function(path : String, flags : Open, mode : Int, ?cb : String->FileDescriptor->Void) : Request {})
-  static function open(path : String, flags : Open, mode : Int) : Result<FileDescriptor>;
-
-  @:native("fs_read")
-  @:overload(function(file : FileDescriptor, len : Int, offset : Int, ?cb : String->String->Void) : Request {} )
-  static function read(file : FileDescriptor, len : Int, offset : Int) : Result<String>;
-
-  @:native("fs_unlink")
-  @:overload(function(file : FileDescriptor, ?cb : String->String->Void) : Request {} )
-  static function unlink(file : FileDescriptor, content : String) : Result<String>;
-
-  @:native("fs_write")
-  @:overload(function(file : FileDescriptor, content : String, offset : Int, ?cb : String->Bool->Void) : Int {})
-  static function write(file : FileDescriptor, content : String, offset : Int) : Result<Bool>;
-
-  @:native("fs_mkdir")
-  @:overload(function(path : String, mode : Int, cb : String->Bool->Void) : Request {})
-  static function mkdir(path : String, mode :Int) : Result<Bool>;
-
-  @:native("fs_mkdtemp")
-  @:overload(function(data : String, cb : String->Bool->Void) : Request {})
-  static function mkdtemp(data : String) : Result<Bool>;
-
-  @:native("fs_rmdir")
-  @:overload(function(path : String, cb : String->Bool->Void) : Request {})
-  static function rmdir(path : String) : Result<Int>;
-
-  @:native("fs_scandir")
-  @:overload(function(path : String, cb : String->Bool->Void) : Request {})
-  static function scandir(path : String) : ScanDirMarker;
-
-  @:native("fs_scandir_next")
-  static function scandir_next(scandir : ScanDirMarker) : ScandirNext;
-
-  @:native("fs_stat")
-  @:overload(function(path : String, cb : String->Stat->Void) : Request {})
-  static function stat(path : String) : Result<Stat>;
-
-  @:native("fs_fstat")
-  @:overload(function(descriptor : FileDescriptor, cb : String->Stat->Void) : Request {})
-  static function fstat(descriptor : FileDescriptor) : Result<Stat>;
-
-  @:native("fs_lstat")
-  @:overload(function(path : String, cb : String->Stat->Void) : Request {})
-  static function lstat(path : String) : Result<Stat>;
-
-  @:native("fs_rename")
-  @:overload(function(path : String, newpath : String, cb : String->Bool->Void) : Request {})
-  static function rename(path : String, newpath : String) : Result<Bool>;
-
-  @:native("fs_fsync")
-  @:overload(function(descriptor : FileDescriptor, cb : String->Bool->Void) : Request {})
-  static function fsync(descriptor : FileDescriptor) : Result<Bool>;
-
-  @:native("fs_fdatasync")
-  @:overload(function(descriptor : FileDescriptor, cb : String->Bool->Void) : Request {})
-  static function fdatasync(descriptor : FileDescriptor) : Result<Bool>;
-
-  @:native("fs_ftruncate")
-  @:overload(function(descriptor : FileDescriptor, offset : Int, cb : String->Bool->Void) : Request {})
-  static function ftruncate(descriptor : FileDescriptor, offset : Int) : Result<Bool>;
-
-  @:native("fs_sendfile")
-  @:overload(function(fin : FileDescriptor, fout : FileDescriptor, cb : String->Int->Void) : Request {})
-  static function sendfile(fin : FileDescriptor, fout : FileDescriptor) : Result<Int>;
-
-  @:native("fs_access")
-  @:overload(function(path : String, mode : Int, cb : String->Bool->Void) : Request {})
-  static function access(path : String, mode :Int) : Result<Bool>;
-
-  @:native("fs_chmod")
-  @:overload(function(path : String, mode : Int, cb : String->Bool->Void) : Request {})
-  static function chmod(path : String, mode :Int) : Result<Bool>;
-
-  @:native("fs_fchmod")
-  @:overload(function(descriptor : FileDescriptor, mode : Int, cb : String->Bool->Void) : Request {})
-  static function fchmod(descriptor : FileDescriptor, mode :Int) : Result<Bool>;
-
-  @:native("fs_futime")
-  @:overload(function(descriptor : FileDescriptor, actime : Int, modtime : Int, cb : String->Bool->Void) : Request {})
-  static function futime(descriptor : FileDescriptor, actime : Int, modtime : Int) : Result<Bool>;
-
-  @:native("fs_utime")
-  @:overload(function(path : String, actime : Int, modtime : Int, cb : String->Bool->Void) : Request {})
-  static function utime(path : String, actime : Int, modtime : Int) : Result<Bool>;
-
-  @:native("fs_link")
-  @:overload(function(oldpath : String, newpath : String, cb : String->Bool->Void) : Request {})
-  static function link(oldpath : String, newpath : String) : Result<Bool>;
-
-  @:native("fs_symlink")
-  @:overload(function(oldpath : String, newpath : String, flags : Int, cb : String->Bool->Void) : Request {})
-  static function symlink(oldpath : String, newpath : String, flags : Int) : Bool;
-
-  // @:native("fs_readlink")
-  // @:overload(function(path : String, cb : String->String->Void) : Request {})
-  // static function readlink(path : String) : String;
-
-  @:native("fs_realpath")
-  @:overload(function(path : String, cb : String->String->Void) : Request{})
-  static function realpath(path : String) : String;
-
-  @:native("fs_chown")
-  @:overload(function(path : String, uid : Int, gid : Int, cb : String->Bool->Void) : Request {})
-  static function chown(path : String, uid : Int, gid : Int) : Bool;
-
-  @:native("fs_fchown")
-  @:overload(function(descriptor : FileDescriptor, uid : Int, gid : Int, cb : String->Bool->Void) : Request {})
-  static function fchown(descriptor : FileDescriptor, uid : Int, gid : Int) : Bool;
+	@:native("fs_close")
+	@:overload(function(file:FileDescriptor, cb:String->Bool->Void):Request {})
+	static function close(file:FileDescriptor):Result<Bool>;
+
+	@:native("fs_open")
+	@:overload(function(path:String, flags:Open, mode:Int, ?cb:String->FileDescriptor->Void):Request {})
+	static function open(path:String, flags:Open, mode:Int):Result<FileDescriptor>;
+
+	@:native("fs_read")
+	@:overload(function(file:FileDescriptor, len:Int, offset:Int, ?cb:String->String->Void):Request {})
+	static function read(file:FileDescriptor, len:Int, offset:Int):Result<String>;
+
+	@:native("fs_unlink")
+	@:overload(function(file:FileDescriptor, ?cb:String->String->Void):Request {})
+	static function unlink(file:FileDescriptor, content:String):Result<String>;
+
+	@:native("fs_write")
+	@:overload(function(file:FileDescriptor, content:String, offset:Int, ?cb:String->Bool->Void):Int {})
+	static function write(file:FileDescriptor, content:String, offset:Int):Result<Bool>;
+
+	@:native("fs_mkdir")
+	@:overload(function(path:String, mode:Int, cb:String->Bool->Void):Request {})
+	static function mkdir(path:String, mode:Int):Result<Bool>;
+
+	@:native("fs_mkdtemp")
+	@:overload(function(data:String, cb:String->Bool->Void):Request {})
+	static function mkdtemp(data:String):Result<Bool>;
+
+	@:native("fs_rmdir")
+	@:overload(function(path:String, cb:String->Bool->Void):Request {})
+	static function rmdir(path:String):Result<Int>;
+
+	@:native("fs_scandir")
+	@:overload(function(path:String, cb:String->Bool->Void):Request {})
+	static function scandir(path:String):ScanDirMarker;
+
+	@:native("fs_scandir_next")
+	static function scandir_next(scandir:ScanDirMarker):ScandirNext;
+
+	@:native("fs_stat")
+	@:overload(function(path:String, cb:String->Stat->Void):Request {})
+	static function stat(path:String):Result<Stat>;
+
+	@:native("fs_fstat")
+	@:overload(function(descriptor:FileDescriptor, cb:String->Stat->Void):Request {})
+	static function fstat(descriptor:FileDescriptor):Result<Stat>;
+
+	@:native("fs_lstat")
+	@:overload(function(path:String, cb:String->Stat->Void):Request {})
+	static function lstat(path:String):Result<Stat>;
+
+	@:native("fs_rename")
+	@:overload(function(path:String, newpath:String, cb:String->Bool->Void):Request {})
+	static function rename(path:String, newpath:String):Result<Bool>;
+
+	@:native("fs_fsync")
+	@:overload(function(descriptor:FileDescriptor, cb:String->Bool->Void):Request {})
+	static function fsync(descriptor:FileDescriptor):Result<Bool>;
+
+	@:native("fs_fdatasync")
+	@:overload(function(descriptor:FileDescriptor, cb:String->Bool->Void):Request {})
+	static function fdatasync(descriptor:FileDescriptor):Result<Bool>;
+
+	@:native("fs_ftruncate")
+	@:overload(function(descriptor:FileDescriptor, offset:Int, cb:String->Bool->Void):Request {})
+	static function ftruncate(descriptor:FileDescriptor, offset:Int):Result<Bool>;
+
+	@:native("fs_sendfile")
+	@:overload(function(fin:FileDescriptor, fout:FileDescriptor, cb:String->Int->Void):Request {})
+	static function sendfile(fin:FileDescriptor, fout:FileDescriptor):Result<Int>;
+
+	@:native("fs_access")
+	@:overload(function(path:String, mode:Int, cb:String->Bool->Void):Request {})
+	static function access(path:String, mode:Int):Result<Bool>;
+
+	@:native("fs_chmod")
+	@:overload(function(path:String, mode:Int, cb:String->Bool->Void):Request {})
+	static function chmod(path:String, mode:Int):Result<Bool>;
+
+	@:native("fs_fchmod")
+	@:overload(function(descriptor:FileDescriptor, mode:Int, cb:String->Bool->Void):Request {})
+	static function fchmod(descriptor:FileDescriptor, mode:Int):Result<Bool>;
+
+	@:native("fs_futime")
+	@:overload(function(descriptor:FileDescriptor, actime:Int, modtime:Int, cb:String->Bool->Void):Request {})
+	static function futime(descriptor:FileDescriptor, actime:Int, modtime:Int):Result<Bool>;
+
+	@:native("fs_utime")
+	@:overload(function(path:String, actime:Int, modtime:Int, cb:String->Bool->Void):Request {})
+	static function utime(path:String, actime:Int, modtime:Int):Result<Bool>;
+
+	@:native("fs_link")
+	@:overload(function(oldpath:String, newpath:String, cb:String->Bool->Void):Request {})
+	static function link(oldpath:String, newpath:String):Result<Bool>;
+
+	@:native("fs_symlink")
+	@:overload(function(oldpath:String, newpath:String, flags:Int, cb:String->Bool->Void):Request {})
+	static function symlink(oldpath:String, newpath:String, flags:Int):Bool;
+
+	// @:native("fs_readlink")
+	// @:overload(function(path : String, cb : String->String->Void) : Request {})
+	// static function readlink(path : String) : String;
+	@:native("fs_realpath")
+	@:overload(function(path:String, cb:String->String->Void):Request {})
+	static function realpath(path:String):String;
+
+	@:native("fs_chown")
+	@:overload(function(path:String, uid:Int, gid:Int, cb:String->Bool->Void):Request {})
+	static function chown(path:String, uid:Int, gid:Int):Bool;
+
+	@:native("fs_fchown")
+	@:overload(function(descriptor:FileDescriptor, uid:Int, gid:Int, cb:String->Bool->Void):Request {})
+	static function fchown(descriptor:FileDescriptor, uid:Int, gid:Int):Bool;
 }
 
 extern class ScanDirMarker {}
 
 @:multiReturn
 extern class ScandirNext {
-  var name : String;
-  var type : String;
+	var name:String;
+	var type:String;
 }
 
 typedef Stat = {
-  ino       : Int,
-  ctime     : TimeStamp,
-  uid       : Int,
-  dev       : Int,
-  nlink     : Int,
-  mode      : Int,
-  size      : Int,
-  birthtime : TimeStamp,
-  gid       : Int,
-  type      : String,
-  rdev      : Int,
-  gen       : Int,
-  blocks    : Int,
-  mtime     : TimeStamp,
-  atime     : TimeStamp,
-  blksize   : Int,
-  flags     : Int
+	ino:Int,
+	ctime:TimeStamp,
+	uid:Int,
+	dev:Int,
+	nlink:Int,
+	mode:Int,
+	size:Int,
+	birthtime:TimeStamp,
+	gid:Int,
+	type:String,
+	rdev:Int,
+	gen:Int,
+	blocks:Int,
+	mtime:TimeStamp,
+	atime:TimeStamp,
+	blksize:Int,
+	flags:Int
 }
 
 typedef TimeStamp = {
-  sec  : Int,
-  nsec : Int
+	sec:Int,
+	nsec:Int
 }
-
diff --git a/std/lua/lib/luv/fs/FileSystemEvent.hx b/std/lua/lib/luv/fs/FileSystemEvent.hx
index 8353f378b5c5132d347a6f4cb949735abca43866..739805533be61666eceef49839e79e2bf65e6356 100644
--- a/std/lua/lib/luv/fs/FileSystemEvent.hx
+++ b/std/lua/lib/luv/fs/FileSystemEvent.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,16 +24,16 @@ package lua.lib.luv.fs;
 
 @:luaRequire("luv")
 extern class FileSystemEvent {
-  static function new_fs_event() : FileSystemEvent;
-  @:native("new_fs_event") function new() : Void;
+	static function new_fs_event():FileSystemEvent;
+	@:native("new_fs_event") function new():Void;
 
-  function start(path : String, options : StartOptions, cb : String->Bool->Void) : Int;
-  function stop() : Int;
-  function getpath() : String;
+	function start(path:String, options:StartOptions, cb:String->Bool->Void):Int;
+	function stop():Int;
+	function getpath():String;
 }
 
 typedef StartOptions = {
-  watch_entry : Bool,
-  stat        : Bool,
-  recursive   : Bool
+	watch_entry:Bool,
+	stat:Bool,
+	recursive:Bool
 }
diff --git a/std/lua/lib/luv/fs/FileSystemPoll.hx b/std/lua/lib/luv/fs/FileSystemPoll.hx
index 300557182e0b69def1800c267053c95ee301a166..60f0cea671bed0327c5f6282717c41861ca94de9 100644
--- a/std/lua/lib/luv/fs/FileSystemPoll.hx
+++ b/std/lua/lib/luv/fs/FileSystemPoll.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,12 +21,13 @@
  */
 
 package lua.lib.luv.fs;
+
 @:luaRequire("luv")
 extern class FileSystemPoll {
-  static function new_fs_poll() : FileSystemPoll;
-  @:native("new_fs_poll") function new() : Void;
+	static function new_fs_poll():FileSystemPoll;
+	@:native("new_fs_poll") function new():Void;
 
-  function start(path : String, interval : Int, cb : String->Bool->Void) : Bool;
-  function stop() : Bool;
-  function getpath() : String;
+	function start(path:String, interval:Int, cb:String->Bool->Void):Bool;
+	function stop():Bool;
+	function getpath():String;
 }
diff --git a/std/lua/lib/luv/fs/Open.hx b/std/lua/lib/luv/fs/Open.hx
index 85de10b6ff269555788d3ba6a574a48ce2f5973e..b696ee3e9b26e1f22686c55fd7c6a016ab034b45 100644
--- a/std/lua/lib/luv/fs/Open.hx
+++ b/std/lua/lib/luv/fs/Open.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,18 +22,17 @@
 
 package lua.lib.luv.fs;
 
-@:enum
-abstract Open(String) {
-  var ReadOnly                 = "r";
-  var ReadOnlySync             = "rs";
-  var ReadWrite                = "r+";
-  var ReadWriteSync            = "rs+";
-  var ReadWriteAppend          = "a+";
-  var ReadWriteTruncate        = "w+";
-  var ReadWriteTruncateNewFile = "wx+";
-  var ReadWriteAppendNewFile   = "ax+";
-  var WriteOnly                = "w";
-  var WriteNewFile             = "wx";
-  var Append                   = "a";
-  var AppendNewFile            = "ax";
+enum abstract Open(String) {
+	var ReadOnly = "r";
+	var ReadOnlySync = "rs";
+	var ReadWrite = "r+";
+	var ReadWriteSync = "rs+";
+	var ReadWriteAppend = "a+";
+	var ReadWriteTruncate = "w+";
+	var ReadWriteTruncateNewFile = "wx+";
+	var ReadWriteAppendNewFile = "ax+";
+	var WriteOnly = "w";
+	var WriteNewFile = "wx";
+	var Append = "a";
+	var AppendNewFile = "ax";
 }
diff --git a/std/lua/lib/luv/net/Dns.hx b/std/lua/lib/luv/net/Dns.hx
index 1523f780285997f1b4651fd563bcd9921c30ddea..8a11e0d3bd579af58fa621343162dee604065300 100644
--- a/std/lua/lib/luv/net/Dns.hx
+++ b/std/lua/lib/luv/net/Dns.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,18 +24,17 @@ package lua.lib.luv.net;
 
 @:luaRequire("luv")
 extern class Dns {
+	@:overload(function(node:String, ?service:String, ?hints:AddrInfo, cb:String->Table<Int, AddrInfo>->Void):Request {})
+	public static function getaddrinfo(node:String, ?service:String, ?hints:AddrInfo):Result<Table<Int, AddrInfo>>;
 
-  @:overload(function(node : String, service : String, ?hints : AddrInfo, cb : String->Table<Int, AddrInfo>->Void) : Request {})
-  public static function getaddrinfo(node : String, service : String, ?hints : AddrInfo ) : Result<Table<Int,AddrInfo>>;
-
-  @:overload(function(ip: String, port : Int, family : String, cb : String->AddrInfo->Void) : Request {})
-  public static function getnameinfo(info:AddrInfo) : Result<String>;
+	@:overload(function(ip:String, ?port:Int, ?family:String, cb:String->AddrInfo->Void):Request {})
+	public static function getnameinfo(info:AddrInfo):Result<String>;
 }
 
 typedef AddrInfo = {
-    ?ip       : String,
-    ?addr     : String,
-    ?port     : Int,
-    ?family   : String,
-    ?socktype : String
+	?ip:String,
+	?addr:String,
+	?port:Int,
+	?family:String,
+	?socktype:String
 }
diff --git a/std/lua/lib/luv/net/Tcp.hx b/std/lua/lib/luv/net/Tcp.hx
index 3590f287123e93b9aa200712ae8f720398e83c88..daed8660bdee0c5f81223dc33426b1a8f5bf6082 100644
--- a/std/lua/lib/luv/net/Tcp.hx
+++ b/std/lua/lib/luv/net/Tcp.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,19 +20,19 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package lua.lib.luv.net; 
+package lua.lib.luv.net;
 
 @:luaRequire("luv")
 extern class Tcp extends Stream {
-  static function new_tcp() : Tcp;
-  @:native("new_tcp") function new() : Void;
-  function open(sock : Int) : Int;
-  function nodelay(enable : Bool) : Int;
-  function keepalive(enable : Bool, ?delay : Int) : Int;
-  function simultaneous_accepts(enable : Bool) : Int;
-  function bind(address : String, port : Int) : Int;
-  function getsockname() : Int;
-  function getpeername() : String;
-  function connect(host : String, port : Int, cb : String->Bool->Void) : Int;
-  function write_queue_size() : Int;
+	static function new_tcp():Tcp;
+	@:native("new_tcp") function new():Void;
+	function open(sock:Int):Int;
+	function nodelay(enable:Bool):Int;
+	function keepalive(enable:Bool, ?delay:Int):Int;
+	function simultaneous_accepts(enable:Bool):Int;
+	function bind(address:String, port:Int):Int;
+	function getsockname():Int;
+	function getpeername():String;
+	function connect(host:String, port:Int, cb:String->Bool->Void):Int;
+	function write_queue_size():Int;
 }
diff --git a/std/lua/lib/luv/net/Udp.hx b/std/lua/lib/luv/net/Udp.hx
index e0df42ea469b878b4c48c04fb4e760ad4bc2b3b0..e6030cf26e861b49a9e1b6fbbfc07d90081610c9 100644
--- a/std/lua/lib/luv/net/Udp.hx
+++ b/std/lua/lib/luv/net/Udp.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,20 +24,20 @@ package lua.lib.luv.net;
 
 @:luaRequire("luv")
 extern class Udp extends Handle {
-  static function new_udp() : Udp;
-  @:native("new_udp") function new() : Void;
+	static function new_udp():Udp;
+	@:native("new_udp") function new():Void;
 
-  function open(fd : Int) : Int;
-  function bind(host : String, port : Int) : Int;
-  function getsockname() : String;
-  function set_membership(multicast_addr : String, interface_addr : String, membership : String) : Int;
-  function set_multicast_loop(on : Bool) : Int;
-  function set_multicast_ttl(ttl : Int ) : Int;
-  function set_multicast_interface(interface_addr : String) : Int;
-  function set_broadcast(on : Bool) : Int;
-  function set_ttl(ttl : Int) : Int;
-  function send(data : String, host : String, port : Int, cb : Bool->Void) : Int;
-  function try_send(data : String, host : String, port : Int) : Int;
-  function recv_start(cb : String->Bool->Void) : Int;
-  function recv_stop() : Int;
+	function open(fd:Int):Int;
+	function bind(host:String, port:Int):Int;
+	function getsockname():String;
+	function set_membership(multicast_addr:String, interface_addr:String, membership:String):Int;
+	function set_multicast_loop(on:Bool):Int;
+	function set_multicast_ttl(ttl:Int):Int;
+	function set_multicast_interface(interface_addr:String):Int;
+	function set_broadcast(on:Bool):Int;
+	function set_ttl(ttl:Int):Int;
+	function send(data:String, host:String, port:Int, cb:Bool->Void):Int;
+	function try_send(data:String, host:String, port:Int):Int;
+	function recv_start(cb:String->Bool->Void):Int;
+	function recv_stop():Int;
 }
diff --git a/std/neko/Boot.hx b/std/neko/Boot.hx
index e51bd60cd97e9f7efb3c0763968adbe654827a58..bd1335a3cf11f4e9cd2b7d2fad24a640252bf9d3 100644
--- a/std/neko/Boot.hx
+++ b/std/neko/Boot.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,30 +19,30 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package neko;
 
 @:dox(hide)
 @:keep
 class Boot {
-
 	private static function __tmp_str() {
 		return untyped "<...>".__s;
 	}
 
-	private static function __enum_str(e : Dynamic) {
-		if( e.args == null )
+	private static function __enum_str(e:Dynamic) {
+		if (e.args == null)
 			return e.tag;
-		var s : String = e.tag + untyped "(".__s;
+		var s:String = e.tag + untyped "(".__s;
 		var i = 0;
 		var l = untyped __dollar__asize(e.args);
 		var old = e.__string;
 		e.__string = __tmp_str;
-		while( i < l ) {
-			if( i != 0 )
+		while (i < l) {
+			if (i != 0)
 				s += untyped ",".__s;
 			try {
 				s += untyped __dollar__string(e.args[i]);
-			} catch( err : Dynamic ) {
+			} catch (err:Dynamic) {
 				s += __tmp_str();
 			}
 			i += 1;
@@ -51,53 +51,56 @@ class Boot {
 		return s + untyped ")".__s;
 	}
 
-	private static function __interfLoop(cc : Dynamic,cl : Dynamic) {
-		if( cc == null )
+	private static function __interfLoop(cc:Dynamic, cl:Dynamic) {
+		if (cc == null)
 			return false;
-		if( cc == cl )
+		if (cc == cl)
 			return true;
-		var intf : Dynamic = cc.__interfaces__;
-		if( intf != null )
-			for( i in 0...intf.length ) {
+		var intf:Dynamic = cc.__interfaces__;
+		if (intf != null)
+			for (i in 0...intf.length) {
 				var i = intf[i];
-				if( i == cl || __interfLoop(i,cl) )
+				if (i == cl || __interfLoop(i, cl))
 					return true;
 			}
-		return __interfLoop(cc.__super__,cl);
+		return __interfLoop(cc.__super__, cl);
 	}
 
 	@:ifFeature("typed_catch")
-	private static function __instanceof(o,cl) {
+	private static function __instanceof(o:Dynamic, cl:Dynamic) {
 		untyped {
-			if( cl == Dynamic )
-				return true;
-			switch( __dollar__typeof(o) ) {
-			case 1: return (cl == Int || cl == Float);
-			case 2: return cl == Float || (cl == Int && __dollar__int(o) == o);
-			case 3: return cl == Bool;
-			case 5:
-				if( cl == null )
+			if (cl == Dynamic)
+				return o != null;
+			switch (__dollar__typeof(o)) {
+				case 1:
+					return (cl == Int || cl == Float);
+				case 2:
+					return cl == Float || (cl == Int && __dollar__int(o) == o);
+				case 3:
+					return cl == Bool;
+				case 5:
+					if (cl == null)
+						return false;
+					return __interfLoop(o.__class__, cl) || (o.__enum__ == cl) || (cl == Class && o.__name__ != null) || (cl == Enum && o.__ename__ != null);
+				default:
 					return false;
-				return __interfLoop(o.__class__,cl) || ( o.__enum__ == cl ) || (cl == Class && o.__name__ != null) || (cl == Enum && o.__ename__ != null );
-			default:
-				return false;
 			}
 		}
 	}
 
 	private static function __serialize(o) {
 		untyped {
-			if( o.__class__ != null ) {
+			if (o.__class__ != null) {
 				var n = o.__class__.__name__;
 				var x = __dollar__amake(n.length);
-				for( i in 0...n.length )
+				for (i in 0...n.length)
 					x[i] = n[i].__s;
 				return x;
 			}
-			if( o.__enum__ != null ) {
+			if (o.__enum__ != null) {
 				var n = o.__enum__.__ename__;
 				var x = __dollar__amake(n.length);
-				for( i in 0...n.length )
+				for (i in 0...n.length)
 					x[i] = n[i].__s;
 				return x;
 			}
@@ -105,32 +108,33 @@ class Boot {
 		}
 	}
 
-	private static function __tagserialize(o) untyped {
-		var n = o.__enum__.__ename__;
-		var x = __dollar__amake(n.length + 1);
-		for( i in 0...n.length )
-			x[i] = n[i].__s;
-		x[n.length] = o.tag;
-		return x;
-	}
+	private static function __tagserialize(o:Dynamic)
+		untyped {
+			var n = o.__enum__.__ename__;
+			var x = __dollar__amake(n.length + 1);
+			for (i in 0...n.length)
+				x[i] = n[i].__s;
+			x[n.length] = o.tag;
+			return x;
+		}
 
-	private static function __unserialize(v) {
+	private static function __unserialize(v:Dynamic) {
 		untyped {
-			if( __dollar__typeof(v) != __dollar__tarray )
+			if (__dollar__typeof(v) != __dollar__tarray)
 				throw "Invalid serialized class data";
-			for( i in 0...__dollar__asize(v) )
-				if( __dollar__typeof(v[i]) != __dollar__tstring )
+			for (i in 0...__dollar__asize(v))
+				if (__dollar__typeof(v[i]) != __dollar__tstring)
 					throw "Invalid serialized class data";
 			var cl = neko.Boot.__classes;
-			for( i in 0...__dollar__asize(v) ) {
-				cl = __dollar__objget(cl,__dollar__hash(v[i]));
-				if( cl == null )
-					throw ("Class not found " + Std.string(v));
+			for (i in 0...__dollar__asize(v)) {
+				cl = __dollar__objget(cl, __dollar__hash(v[i]));
+				if (cl == null)
+					throw("Class not found " + Std.string(v));
 			}
-			if( __dollar__typeof(cl) == __dollar__tobject ) {
-				if( cl.__name__ != null || cl.__ename__ != null )
+			if (__dollar__typeof(cl) == __dollar__tobject) {
+				if (cl.__name__ != null || cl.__ename__ != null)
 					return cl.prototype;
-				if( cl.__enum__ != null && __dollar__typeof(cl.tag) == __dollar__tstring )
+				if (cl.__enum__ != null && __dollar__typeof(cl.tag) == __dollar__tstring)
 					return cl;
 			}
 			throw "Invalid class " + Std.string(v);
@@ -143,5 +147,4 @@ class Boot {
 			__dollar__exports.__classes = neko.Boot.__classes;
 		}
 	}
-
 }
diff --git a/std/neko/Lib.hx b/std/neko/Lib.hx
index d5908c5d3c365a404d231ec8341d562a18633b10..e9f999db11462c0cdff6894fe59a529a194acfc2 100644
--- a/std/neko/Lib.hx
+++ b/std/neko/Lib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,49 +19,51 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package neko;
 
 /**
-	Platform-specific Neko Library. Provides some platform-specific functions 
-	for the Neko target, such as conversion from Haxe types to native types 
+	Platform-specific Neko Library. Provides some platform-specific functions
+	for the Neko target, such as conversion from Haxe types to native types
 	and vice-versa.
 **/
 class Lib {
-
 	/**
 		Load and return a Neko primitive from a NDLL library.
 	**/
-	public static function load( lib : String, prim : String, nargs : Int ) : Dynamic {
-		return untyped __dollar__loader.loadprim((lib+"@"+prim).__s,nargs);
+	public static function load(lib:String, prim:String, nargs:Int):Dynamic {
+		return untyped __dollar__loader.loadprim((lib + "@" + prim).__s, nargs);
 	}
 
-	public static function loadLazy(lib,prim,nargs) : Dynamic {
+	public static function loadLazy(lib, prim, nargs):Dynamic {
 		try {
-			return load(lib,prim,nargs);
-		} catch( e : Dynamic ) {
-			return untyped __dollar__varargs(function(_) { throw e; });
+			return load(lib, prim, nargs);
+		} catch (e:Dynamic) {
+			return untyped __dollar__varargs(function(_) {
+				throw e;
+			});
 		}
 	}
 
 	/**
 		Print the specified value on the default output.
 	**/
-	public static function print( v : Dynamic ) : Void {
+	public static function print(v:Dynamic):Void {
 		untyped __dollar__print(v);
 	}
 
 	/**
 		Print the specified value on the default output followed by a newline character.
 	**/
-	public static function println( v : Dynamic ) : Void {
-		untyped __dollar__print(v,"\n");
+	public static function println(v:Dynamic):Void {
+		untyped __dollar__print(v, "\n");
 	}
 
 	/**
 		Rethrow an exception. This is useful when manually filtering an exception in order
 		to keep the previous exception stack.
 	**/
-	public static function rethrow( e : Dynamic ) : Dynamic {
+	public static function rethrow(e:Dynamic):Dynamic {
 		return untyped __dollar__rethrow(e);
 	}
 
@@ -69,15 +71,15 @@ class Lib {
 		Serialize using native Neko serialization. This will return a Binary string that can be
 		stored for long term usage. The serialized data is optimized for speed and not for size.
 	**/
-	public static function serialize( v : Dynamic ) : haxe.io.Bytes {
+	public static function serialize(v:Dynamic):haxe.io.Bytes {
 		return haxe.io.Bytes.ofData(__serialize(v));
 	}
 
 	/**
 		Unserialize a string using native Neko serialization. See `serialize`.
 	**/
-	public static function unserialize( s : haxe.io.Bytes ) : Dynamic {
-		return untyped __unserialize(s.getData(),__dollar__loader);
+	public static function unserialize(s:haxe.io.Bytes):Dynamic {
+		return untyped __unserialize(s.getData(), __dollar__loader);
 	}
 
 	/**
@@ -87,102 +89,116 @@ class Lib {
 		some data into mod_neko that was serialized on a different server using a different
 		file path.
 	**/
-	public static function localUnserialize( s : haxe.io.Bytes ) : Dynamic {
-		return untyped __unserialize(s.getData(),{
-			loadmodule : function(m,l) { return __dollar__exports; },
-			loadprim : function(p,n) { return __dollar__loader.loadprim(p,n); }
+	public static function localUnserialize(s:haxe.io.Bytes):Dynamic {
+		return untyped __unserialize(s.getData(), {
+			loadmodule: function(m, l) {
+				return __dollar__exports;
+			},
+			loadprim: function(p, n) {
+				return __dollar__loader.loadprim(p, n);
+			}
 		});
 	}
 
 	/**
 		Converts a Neko value to its Haxe equivalent. Used for wrapping String and Arrays raw values into Haxe Objects.
 	**/
-	public static function nekoToHaxe( v : Dynamic ) : Dynamic untyped {
-		switch( __dollar__typeof(v) ) {
-		case 0: return v;
-		case 1: return v;
-		case 2: return v;
-		case 3: return v;
-		case 4: return new String(v);
-		case 6:
-			var a = Array.new1(v,__dollar__asize(v));
-			for( i in 0...a.length )
-				a[i] = nekoToHaxe(a[i]);
-			return a;
-		case 5:
-			var f = __dollar__objfields(v);
-			var i = 0;
-			var l = __dollar__asize(f);
-			var o = __dollar__new(v);
-			if( __dollar__objgetproto(v) != null )
-				throw "Can't convert object prototype";
-			while( i < l ) {
-				__dollar__objset(o,f[i],nekoToHaxe(__dollar__objget(v,f[i])));
-				i += 1;
+	public static function nekoToHaxe(v:Dynamic):Dynamic
+		untyped {
+			switch (__dollar__typeof(v)) {
+				case 0:
+					return v;
+				case 1:
+					return v;
+				case 2:
+					return v;
+				case 3:
+					return v;
+				case 4:
+					return new String(v);
+				case 6:
+					var a = Array.new1(v, __dollar__asize(v));
+					for (i in 0...a.length)
+						a[i] = nekoToHaxe(a[i]);
+					return a;
+				case 5:
+					var f = __dollar__objfields(v);
+					var i = 0;
+					var l = __dollar__asize(f);
+					var o = __dollar__new(v);
+					if (__dollar__objgetproto(v) != null)
+						throw "Can't convert object prototype";
+					while (i < l) {
+						__dollar__objset(o, f[i], nekoToHaxe(__dollar__objget(v, f[i])));
+						i += 1;
+					}
+					return o;
+				default:
+					throw "Can't convert " + string(v);
 			}
-			return o;
-		default:
-			throw "Can't convert "+string(v);
 		}
-	}
 
 	/**
 		Converts a Haxe value to its Neko equivalent. Used to unwrap String and Arrays Objects into raw Neko values.
 	**/
-	public static function haxeToNeko( v : Dynamic ) : Dynamic untyped {
-		switch( __dollar__typeof(v) ) {
-		case 0: return v;
-		case 1: return v;
-		case 2: return v;
-		case 3: return v;
-		case 5:
-			var cl = v.__class__;
-			if( cl == String )
-				return v.__s;
-			if( cl == Array ) {
-				var a = untyped __dollar__amake(v.length);
-				for( i in 0...v.length )
-					a[i] = haxeToNeko(v[i]);
-				return a;
+	public static function haxeToNeko(v:Dynamic):Dynamic
+		untyped {
+			switch (__dollar__typeof(v)) {
+				case 0:
+					return v;
+				case 1:
+					return v;
+				case 2:
+					return v;
+				case 3:
+					return v;
+				case 5:
+					var cl = v.__class__;
+					if (cl == String)
+						return v.__s;
+					if (cl == Array) {
+						var a = untyped __dollar__amake(v.length);
+						for (i in 0...v.length)
+							a[i] = haxeToNeko(v[i]);
+						return a;
+					}
+					if (cl != null || __dollar__objgetproto(v) != null)
+						throw "Can't convert " + string(v);
+					var f = __dollar__objfields(v);
+					var i = 0;
+					var l = __dollar__asize(f);
+					var o = __dollar__new(v);
+					while (i < l) {
+						__dollar__objset(o, f[i], haxeToNeko(__dollar__objget(v, f[i])));
+						i += 1;
+					}
+					return o;
+				default:
+					throw "Can't convert " + string(v);
 			}
-			if( cl != null || __dollar__objgetproto(v) != null )
-				throw "Can't convert "+string(v);
-			var f = __dollar__objfields(v);
-			var i = 0;
-			var l = __dollar__asize(f);
-			var o = __dollar__new(v);
-			while( i < l ) {
-				__dollar__objset(o,f[i],haxeToNeko(__dollar__objget(v,f[i])));
-				i += 1;
-			}
-			return o;
-		default:
-			throw "Can't convert "+string(v);
 		}
-	}
 
 	/**
 		Returns an object containing all compiled packages and classes.
 	**/
-	public static function getClasses() : Dynamic {
+	public static function getClasses():Dynamic {
 		return untyped neko.Boot.__classes;
 	}
 
 	/**
 		Returns a string referencing the data contains in bytes.
 	**/
-	public inline static function stringReference( b : haxe.io.Bytes ) {
-		return new String( cast b.getData() );
+	public inline static function stringReference(b:haxe.io.Bytes) {
+		return new String(cast b.getData());
 	}
 
 	/**
 		Returns bytes referencing the content of a string.
 	**/
-	public inline static function bytesReference( s : String ) : haxe.io.Bytes {
-		return untyped new haxe.io.Bytes( s.length, s.__s );
+	public inline static function bytesReference(s:String):haxe.io.Bytes {
+		return untyped new haxe.io.Bytes(s.length, s.__s);
 	}
 
-	static var __serialize = load("std","serialize",1);
-	static var __unserialize = load("std","unserialize",2);
-
+	static var __serialize = load("std", "serialize", 1);
+	static var __unserialize = load("std", "unserialize", 2);
 }
diff --git a/std/neko/NativeArray.hx b/std/neko/NativeArray.hx
index 64b24973ae6ebbb8af556757b8fab939768cf2d7..a8141572bbda5f1237c9159d1fc614542a9befed 100644
--- a/std/neko/NativeArray.hx
+++ b/std/neko/NativeArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,36 +19,35 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package neko;
 
 class NativeArray<T> implements ArrayAccess<T> {
-
-	public static inline function alloc<T>( length : Int ) : NativeArray<T> {
+	public static inline function alloc<T>(length:Int):NativeArray<T> {
 		return untyped __dollar__amake(length);
 	}
 
-	public static inline function blit<T>( dst : NativeArray<T>, dstPos : Int, src : NativeArray<T>, srcPos : Int, length : Int ) {
-		untyped __dollar__ablit(dst,dstPos,src,srcPos,length);
+	public static inline function blit<T>(dst:NativeArray<T>, dstPos:Int, src:NativeArray<T>, srcPos:Int, length:Int) {
+		untyped __dollar__ablit(dst, dstPos, src, srcPos, length);
 	}
 
-	public static inline function ofArrayCopy<T>( a : Array<T> ) : NativeArray<T> {
+	public static inline function ofArrayCopy<T>(a:Array<T>):NativeArray<T> {
 		return untyped a.__neko();
 	}
 
-	public static inline function ofArrayRef<T>( a : Array<T> ) : NativeArray<T> {
+	public static inline function ofArrayRef<T>(a:Array<T>):NativeArray<T> {
 		return untyped a.__a;
 	}
 
-	public static inline function sub<T>( a : NativeArray<T>, pos : Int, len : Int ) : NativeArray<T> {
-		return untyped __dollar__asub(a,pos,len);
+	public static inline function sub<T>(a:NativeArray<T>, pos:Int, len:Int):NativeArray<T> {
+		return untyped __dollar__asub(a, pos, len);
 	}
 
-	public static inline function toArray<T>( a : NativeArray<T> ) : Array<T> {
-		return untyped Array.new1(a,__dollar__asize(a));
+	public static inline function toArray<T>(a:NativeArray<T>):Array<T> {
+		return untyped Array.new1(a, __dollar__asize(a));
 	}
 
-	public static inline function length( a : NativeArray<Dynamic> ) : Int {
+	public static inline function length(a:NativeArray<Dynamic>):Int {
 		return untyped __dollar__asize(a);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/neko/NativeString.hx b/std/neko/NativeString.hx
index 2e30a8cd3eed6133ef42d10f26248e4d8dd5dd05..353eef9f2e00fa172b27180eb9260c38c8896e10 100644
--- a/std/neko/NativeString.hx
+++ b/std/neko/NativeString.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,24 +19,23 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package neko;
 
 class NativeString {
-
-	public static inline function ofString( s : String ) : NativeString {
+	public static inline function ofString(s:String):NativeString {
 		return untyped s.__s;
 	}
 
-	public static inline function toString( s : NativeString ) : String {
+	public static inline function toString(s:NativeString):String {
 		return new String(cast s);
 	}
 
-	public static inline function length( s : NativeString ) : Int {
+	public static inline function length(s:NativeString):Int {
 		return untyped $ssize(s);
 	}
-	
-	public static inline function alloc( size : Int ) : NativeString {
+
+	public static inline function alloc(size:Int):NativeString {
 		return untyped $smake(size);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/neko/NativeXml.hx b/std/neko/NativeXml.hx
index 97c8956b6758ad23190d5112856dbcc9d91a94f3..212a0c42c74abb39924611fc9d91f6b311d5fede 100644
--- a/std/neko/NativeXml.hx
+++ b/std/neko/NativeXml.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,49 +19,46 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package neko;
 
-@:enum abstract XmlType(String) {}
+package neko;
 
+enum abstract XmlType(String) {}
 typedef NativeXml = Xml;
 
 class Xml {
-
-	public static var Element(default,never) : XmlType;
-	public static var PCData(default,never) : XmlType;
-	public static var CData(default,never) : XmlType;
-	public static var Comment(default,never) : XmlType;
-	public static var DocType(default,never) : XmlType;
-	public static var ProcessingInstruction(default,never) : XmlType;
-	public static var Document(default,never) : XmlType;
-
-
-	public var nodeName(get,set) : String;
-	public var nodeValue(get,set) : String;
-	public var parent(get,null) : Xml;
-	public var nodeType(default,null) : XmlType;
-
-	private var _nodeName : String;
-	private var _nodeValue : String;
-	private var _attributes : Dynamic<String>;
-	private var _children : Array<Xml>;
-	private var _parent : Xml;
-
-	private function new() : Void {
-	}
-
-	private static var _parse = neko.Lib.load("std","parse_xml",2);
-
-	public static function parse( str : String ) : Xml {
+	public static var Element(default, never):XmlType;
+	public static var PCData(default, never):XmlType;
+	public static var CData(default, never):XmlType;
+	public static var Comment(default, never):XmlType;
+	public static var DocType(default, never):XmlType;
+	public static var ProcessingInstruction(default, never):XmlType;
+	public static var Document(default, never):XmlType;
+
+	public var nodeName(get, set):String;
+	public var nodeValue(get, set):String;
+	public var parent(get, null):Xml;
+	public var nodeType(default, null):XmlType;
+
+	private var _nodeName:String;
+	private var _nodeValue:String;
+	private var _attributes:Dynamic<String>;
+	private var _children:Array<Xml>;
+	private var _parent:Xml;
+
+	private function new():Void {}
+
+	private static var _parse = neko.Lib.load("std", "parse_xml", 2);
+
+	public static function parse(str:String):Xml {
 		var x = new Xml();
 		x._children = new Array();
 		var parser = {
-			cur : x,
-			add : function(x:Dynamic) {
+			cur: x,
+			add: function(x:Dynamic) {
 				untyped __this__.cur._children.push(x);
 			},
-			xml : function(name,att) {
-				var x : Dynamic = new Xml();
+			xml: function(name, att) {
+				var x:Dynamic = new Xml();
 				x._parent = untyped __this__.cur;
 				x.nodeType = Xml.Element;
 				x._nodeName = new String(name);
@@ -71,35 +68,35 @@ class Xml {
 					var f = __dollar__objfields(att);
 					var i = 0;
 					var l = __dollar__asize(f);
-					while( i < l ) {
-						__dollar__objset(att,f[i], new String(__dollar__objget(att,f[i]))) ;
+					while (i < l) {
+						__dollar__objset(att, f[i], new String(__dollar__objget(att, f[i])));
 						i++;
 					}
 					__this__.add(x);
 					__this__.cur = x;
 				}
 			},
-			cdata : function(text) {
-				var x : Dynamic = new Xml();
+			cdata: function(text) {
+				var x:Dynamic = new Xml();
 				x._parent = untyped __this__.cur;
 				x.nodeType = Xml.CData;
 				x._nodeValue = new String(text);
 				untyped __this__.add(x);
 			},
-			pcdata : function(text) {
-				var x : Dynamic = new Xml();
+			pcdata: function(text) {
+				var x:Dynamic = new Xml();
 				x._parent = untyped __this__.cur;
 				x.nodeType = Xml.PCData;
 				x._nodeValue = new String(text);
 				untyped __this__.add(x);
 			},
-			comment : function(text) {
-				var x : Dynamic = new Xml();
+			comment: function(text) {
+				var x:Dynamic = new Xml();
 				x._parent = untyped __this__.cur;
-				if( untyped __dollar__sget(text,0) == 63 ) {
+				if (untyped __dollar__sget(text, 0) == 63) {
 					x.nodeType = Xml.ProcessingInstruction;
 					text = new String(text);
-					text = text.substr(1,text.length - 2);
+					text = text.substr(1, text.length - 2);
 				} else {
 					x.nodeType = Xml.Comment;
 					text = new String(text);
@@ -107,25 +104,24 @@ class Xml {
 				x._nodeValue = text;
 				untyped __this__.add(x);
 			},
-			doctype : function(text) {
-				var x : Dynamic = new Xml();
+			doctype: function(text) {
+				var x:Dynamic = new Xml();
 				x._parent = untyped __this__.cur;
 				x.nodeType = Xml.DocType;
 				x._nodeValue = new String(text).substr(1);
-				var p : Xml = untyped __this__.cur;
+				var p:Xml = untyped __this__.cur;
 				p.addChild(x);
 			},
-			done : function() {
+			done: function() {
 				untyped __this__.cur = __this__.cur._parent;
 			}
 		};
-		untyped _parse(str.__s,parser);
+		untyped _parse(str.__s, parser);
 		x.nodeType = Xml.Document;
 		return x;
 	}
 
-
-	public static function createElement( name : String ) : Xml {
+	public static function createElement(name:String):Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Element;
 		r._nodeName = name;
@@ -134,146 +130,145 @@ class Xml {
 		return r;
 	}
 
-	public static function createPCData( data : String ) : Xml {
+	public static function createPCData(data:String):Xml {
 		var r = new Xml();
 		r.nodeType = Xml.PCData;
 		r._nodeValue = data;
 		return r;
 	}
 
-	public static function createCData( data : String ) : Xml {
+	public static function createCData(data:String):Xml {
 		var r = new Xml();
 		r.nodeType = Xml.CData;
 		r._nodeValue = data;
 		return r;
 	}
 
-	public static function createComment( data : String ) : Xml {
+	public static function createComment(data:String):Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Comment;
 		r._nodeValue = data;
 		return r;
 	}
 
-	public static function createDocType( data : String ) : Xml {
+	public static function createDocType(data:String):Xml {
 		var r = new Xml();
 		r.nodeType = Xml.DocType;
 		r._nodeValue = data;
 		return r;
 	}
 
-	public static function createProcessingInstruction( data : String ) : Xml {
+	public static function createProcessingInstruction(data:String):Xml {
 		var r = new Xml();
 		r.nodeType = Xml.ProcessingInstruction;
 		r._nodeValue = data;
 		return r;
 	}
 
-	public static function createDocument() : Xml {
+	public static function createDocument():Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Document;
 		r._children = new Array();
 		return r;
 	}
 
-	private function get_nodeName() : String {
-		if( nodeType != Xml.Element )
+	private function get_nodeName():String {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
 		return _nodeName;
 	}
 
-	private function set_nodeName( n : String ) : String {
-		if( nodeType != Xml.Element )
+	private function set_nodeName(n:String):String {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
 		return _nodeName = n;
 	}
 
-	private function get_nodeValue() : String {
-		if( nodeType == Xml.Element || nodeType == Xml.Document )
+	private function get_nodeValue():String {
+		if (nodeType == Xml.Element || nodeType == Xml.Document)
 			throw "bad nodeType";
 		return _nodeValue;
 	}
 
-	private function set_nodeValue( v : String ) : String {
-		if( nodeType == Xml.Element || nodeType == Xml.Document )
+	private function set_nodeValue(v:String):String {
+		if (nodeType == Xml.Element || nodeType == Xml.Document)
 			throw "bad nodeType";
 		return _nodeValue = v;
 	}
 
-	private function get_parent() : Xml {
+	private function get_parent():Xml {
 		return _parent;
 	}
 
-	public function get( att : String ) : String {
-		if( nodeType != Xml.Element )
+	public function get(att:String):String {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
-		return Reflect.field( _attributes, att );
+		return Reflect.field(_attributes, att);
 	}
 
-	public function set( att : String, value : String ) : Void {
-		if( nodeType != Xml.Element )
+	public function set(att:String, value:String):Void {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
-		Reflect.setField (_attributes, att, value );
+		Reflect.setField(_attributes, att, value);
 	}
 
-	public function remove( att : String ) : Void{
-		if( nodeType != Xml.Element )
+	public function remove(att:String):Void {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
-		Reflect.deleteField( _attributes, att );
+		Reflect.deleteField(_attributes, att);
 	}
 
-	public function exists( att : String ) : Bool {
-		if( nodeType != Xml.Element )
+	public function exists(att:String):Bool {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
-		return Reflect.hasField( _attributes, att );
+		return Reflect.hasField(_attributes, att);
 	}
 
-	public function attributes() : Iterator<String> {
-		if( nodeType != Xml.Element )
+	public function attributes():Iterator<String> {
+		if (nodeType != Xml.Element)
 			throw "bad nodeType";
-		return Reflect.fields( _attributes ).iterator();
+		return Reflect.fields(_attributes).iterator();
 	}
 
-	public function iterator() : Iterator<Xml> {
-		if( _children == null )
+	public function iterator():Iterator<Xml> {
+		if (_children == null)
 			throw "bad nodetype";
 		return untyped {
 			cur: 0,
 			x: this._children,
-			hasNext : function(){
+			hasNext: function() {
 				return __this__.cur < __this__.x.length;
 			},
-			next : function(){
+			next: function() {
 				return __this__.x[__this__.cur++];
 			}
 		}
 	}
 
-
-	public function elements() : Iterator<Xml> {
-		if( _children == null )
+	public function elements():Iterator<Xml> {
+		if (_children == null)
 			throw "bad nodetype";
 		return untyped {
 			cur: 0,
 			x: this._children,
-			hasNext : function() {
+			hasNext: function() {
 				var k = __this__.cur;
 				var l = __this__.x.length;
-				while( k < l ) {
-					if( __this__.x[k].nodeType == Xml.Element )
+				while (k < l) {
+					if (__this__.x[k].nodeType == Xml.Element)
 						break;
 					k += 1;
 				}
 				__this__.cur = k;
 				return k < l;
 			},
-			next : function() {
+			next: function() {
 				var k = __this__.cur;
 				var l = __this__.x.length;
-				while( k < l ) {
+				while (k < l) {
 					var n = __this__.x[k];
 					k += 1;
-					if( n.nodeType == Xml.Element ) {
+					if (n.nodeType == Xml.Element) {
 						__this__.cur = k;
 						return n;
 					}
@@ -283,31 +278,31 @@ class Xml {
 		}
 	}
 
-	public function elementsNamed( name : String ) : Iterator<Xml> {
-		if( _children == null )
+	public function elementsNamed(name:String):Iterator<Xml> {
+		if (_children == null)
 			throw "bad nodetype";
 		return untyped {
 			cur: 0,
 			x: this._children,
-			hasNext : function() {
+			hasNext: function() {
 				var k = __this__.cur;
 				var l = __this__.x.length;
-				while( k < l ) {
+				while (k < l) {
 					var n = __this__.x[k];
-					if( n.nodeType == Xml.Element && n._nodeName == name )
+					if (n.nodeType == Xml.Element && n._nodeName == name)
 						break;
 					k++;
 				}
 				__this__.cur = k;
 				return k < l;
 			},
-			next : function() {
+			next: function() {
 				var k = __this__.cur;
 				var l = __this__.x.length;
-				while( k < l ) {
+				while (k < l) {
 					var n = __this__.x[k];
 					k++;
-					if( n.nodeType == Xml.Element && n._nodeName == name ) {
+					if (n.nodeType == Xml.Element && n._nodeName == name) {
 						__this__.cur = k;
 						return n;
 					}
@@ -317,110 +312,113 @@ class Xml {
 		}
 	}
 
-	public function firstChild() : Xml {
-		if( _children == null )
+	public function firstChild():Xml {
+		if (_children == null)
 			throw "bad nodetype";
 		return _children[0];
 	}
 
-	public function firstElement() : Xml {
-		if( _children == null )
+	public function firstElement():Xml {
+		if (_children == null)
 			throw "bad nodetype";
-		for( cur in 0..._children.length ) {
+		for (cur in 0..._children.length) {
 			var n = _children[cur];
-			if( n.nodeType == Xml.Element )
+			if (n.nodeType == Xml.Element)
 				return n;
 		}
 		return null;
 	}
 
-	public function addChild( x : Xml ) : Void {
-		if( _children == null )
+	public function addChild(x:Xml):Void {
+		if (_children == null)
 			throw "bad nodetype";
-		if( x._parent != null ) x._parent._children.remove(x);
+		if (x._parent != null)
+			x._parent._children.remove(x);
 		x._parent = this;
-		_children.push( x );
+		_children.push(x);
 	}
 
-	public function removeChild( x : Xml ) : Bool {
-		if( _children == null )
+	public function removeChild(x:Xml):Bool {
+		if (_children == null)
 			throw "bad nodetype";
-		var b = _children.remove( x );
-		if( b ) x._parent = null;
+		var b = _children.remove(x);
+		if (b)
+			x._parent = null;
 		return b;
 	}
 
-	public function insertChild( x : Xml, pos : Int ) : Void {
-		if( _children == null )
+	public function insertChild(x:Xml, pos:Int):Void {
+		if (_children == null)
 			throw "bad nodetype";
-		if( x._parent != null ) x._parent._children.remove(x);
+		if (x._parent != null)
+			x._parent._children.remove(x);
 		x._parent = this;
-		_children.insert( pos, x );
+		_children.insert(pos, x);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		var s = new StringBuf();
 		toStringRec(s);
 		return s.toString();
 	}
 
-	function toStringRec(s: StringBuf) : Void {
-		switch( nodeType ) {
-		case Xml.Document:
-			for( x in _children )
-				x.toStringRec(s);
-		case Xml.Element:
-			s.addChar("<".code);
-			s.add(_nodeName);
-			for( k in Reflect.fields(_attributes) ) {
-				s.addChar(" ".code);
-				s.add(k);
-				s.addChar("=".code);
-				s.addChar("\"".code);
-				s.add(Reflect.field(_attributes,k));
-				s.addChar("\"".code);
-			}
-			if( _children.length == 0 ) {
+	function toStringRec(s:StringBuf):Void {
+		switch (nodeType) {
+			case Xml.Document:
+				for (x in _children)
+					x.toStringRec(s);
+			case Xml.Element:
+				s.addChar("<".code);
+				s.add(_nodeName);
+				for (k in Reflect.fields(_attributes)) {
+					s.addChar(" ".code);
+					s.add(k);
+					s.addChar("=".code);
+					s.addChar("\"".code);
+					s.add(Reflect.field(_attributes, k));
+					s.addChar("\"".code);
+				}
+				if (_children.length == 0) {
+					s.addChar("/".code);
+					s.addChar(">".code);
+					return;
+				}
+				s.addChar(">".code);
+				for (x in _children)
+					x.toStringRec(s);
+				s.addChar("<".code);
 				s.addChar("/".code);
+				s.add(_nodeName);
 				s.addChar(">".code);
-				return;
-			}
-			s.addChar(">".code);
-			for( x in _children )
-				x.toStringRec(s);
-			s.addChar("<".code);
-			s.addChar("/".code);
-			s.add(_nodeName);
-			s.addChar(">".code);
-		case Xml.PCData:
-			s.add(StringTools.htmlEscape(_nodeValue));
-		case Xml.CData:
-			s.add("<![CDATA[");
-			s.add(_nodeValue);
-			s.add("]]>");
-		case Xml.Comment:
-			s.add("<!--");
-			s.add(_nodeValue);
-			s.add("-->");
-		case Xml.DocType:
-			s.add("<!DOCTYPE ");
-			s.add(_nodeValue);
-			s.add(">");
-		case Xml.ProcessingInstruction:
-			s.add("<?");
-			s.add(_nodeValue);
-			s.add("?>");
+			case Xml.PCData:
+				s.add(StringTools.htmlEscape(_nodeValue));
+			case Xml.CData:
+				s.add("<![CDATA[");
+				s.add(_nodeValue);
+				s.add("]]>");
+			case Xml.Comment:
+				s.add("<!--");
+				s.add(_nodeValue);
+				s.add("-->");
+			case Xml.DocType:
+				s.add("<!DOCTYPE ");
+				s.add(_nodeValue);
+				s.add(">");
+			case Xml.ProcessingInstruction:
+				s.add("<?");
+				s.add(_nodeValue);
+				s.add("?>");
 		}
 	}
 
-	static function __init__() : Void untyped {
-		Xml.Element = "element";
-		Xml.PCData = "pcdata";
-		Xml.CData = "cdata";
-		Xml.Comment = "comment";
-		Xml.DocType = "doctype";
-		Xml.ProcessingInstruction = "processingInstruction";
-		Xml.Document = "document";
-	}
-
-}
\ No newline at end of file
+	static function __init__():Void
+		untyped {
+			Xml.Element = "element";
+			Xml.PCData = "pcdata";
+			Xml.CData = "cdata";
+			Xml.Comment = "comment";
+			Xml.DocType = "doctype";
+			Xml.ProcessingInstruction = "processingInstruction";
+			Xml.Document = "document";
+		}
+}
diff --git a/std/neko/Random.hx b/std/neko/Random.hx
index 0ae121ae122d6b3e8bacfe37cd268fa3f6dcb2d3..048cfab03d91a529d0736faaa6c1e3b15e3d99ec 100644
--- a/std/neko/Random.hx
+++ b/std/neko/Random.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,45 +19,45 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package neko;
 
 /**
 	A seeded pseudo-random generator.
-*/
+**/
 class Random {
-
-	var r : Dynamic;
+	var r:Dynamic;
 
 	/**
 		Create a new random with random seed.
-	*/
+	**/
 	public function new() {
 		r = random_new();
 	}
 
 	/**
 		Set the generator seed.
-	*/
-	public function setSeed( s : Int ) {
-		random_set_seed(r,s);
+	**/
+	public function setSeed(s:Int) {
+		random_set_seed(r, s);
 	}
 
 	/**
 		Return a random integer modulo max.
-	*/
-	public function int( max : Int ) : Int {
-		return random_int(r,max);
+	**/
+	public function int(max:Int):Int {
+		return random_int(r, max);
 	}
 
 	/**
 		Return a random float.
-	*/
-	public function float() : Float {
+	**/
+	public function float():Float {
 		return random_float(r);
 	}
 
-	static var random_new = Lib.load("std","random_new",0);
-	static var random_set_seed = Lib.load("std","random_set_seed",2);
-	static var random_int = Lib.load("std","random_int",2);
-	static var random_float = Lib.load("std","random_float",1);
+	static var random_new = Lib.load("std", "random_new", 0);
+	static var random_set_seed = Lib.load("std", "random_set_seed", 2);
+	static var random_int = Lib.load("std", "random_int", 2);
+	static var random_float = Lib.load("std", "random_float", 1);
 }
diff --git a/std/neko/Utf8.hx b/std/neko/Utf8.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7e0178f6326a8c925d63c13601a8e5d47c5945c8
--- /dev/null
+++ b/std/neko/Utf8.hx
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C)2005-2019 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 neko;
+
+@:coreApi
+class Utf8 {
+	var __b:Dynamic;
+
+	public function new(?size:Int):Void {
+		__b = utf8_buf_alloc(if (size == null) 1 else size);
+	}
+
+	public function addChar(c:Int):Void {
+		utf8_buf_add(__b, c);
+	}
+
+	public function toString():String {
+		return new String(utf8_buf_content(__b));
+	}
+
+	public static function encode(s:String):String {
+		s = untyped s.__s;
+		var sl = untyped __dollar__ssize(s);
+		var buf:Dynamic = utf8_buf_alloc(sl);
+		var i = 0;
+		while (i < sl) {
+			utf8_buf_add(buf, untyped __dollar__sget(s, i));
+			i += 1;
+		}
+		return new String(utf8_buf_content(buf));
+	}
+
+	public static function decode(s:String):String {
+		s = untyped s.__s;
+		var sl = untyped __dollar__ssize(s);
+		var ret = untyped __dollar__smake(sl);
+		var i = 0;
+		utf8_iter(s, function(c) {
+			if (c == 8364) // euro symbol
+				c = 164;
+			else if (c == 0xFEFF) // BOM
+				return;
+			else if (c > 255)
+				throw "Utf8::decode invalid character (" + c + ")";
+			untyped __dollar__sset(ret, i, c);
+			i += 1;
+		});
+		return new String(untyped __dollar__ssub(ret, 0, i));
+	}
+
+	public static function iter(s:String, chars:Int->Void):Void {
+		utf8_iter(untyped s.__s, chars);
+	}
+
+	public static function charCodeAt(s:String, index:Int):Int {
+		return utf8_get(untyped s.__s, index);
+	}
+
+	public static function validate(s:String):Bool {
+		return utf8_validate(untyped s.__s);
+	}
+
+	public static function length(s:String):Int {
+		return utf8_length(untyped s.__s);
+	}
+
+	public static function compare(a:String, b:String):Int {
+		return utf8_compare(untyped a.__s, untyped b.__s);
+	}
+
+	public static function sub(s:String, pos:Int, len:Int):String {
+		return new String(utf8_sub(untyped s.__s, pos, len));
+	}
+
+	static var utf8_buf_alloc = neko.Lib.load("std", "utf8_buf_alloc", 1);
+	static var utf8_buf_add = neko.Lib.load("std", "utf8_buf_add", 2);
+	static var utf8_buf_content = neko.Lib.load("std", "utf8_buf_content", 1);
+	static var utf8_buf_length = neko.Lib.load("std", "utf8_buf_length", 1);
+	static var utf8_iter = neko.Lib.load("std", "utf8_iter", 2);
+
+	static var utf8_get = neko.Lib.load("std", "utf8_get", 2);
+	static var utf8_validate = neko.Lib.load("std", "utf8_validate", 1);
+	static var utf8_length = neko.Lib.load("std", "utf8_length", 1);
+	static var utf8_compare = neko.Lib.load("std", "utf8_compare", 2);
+	static var utf8_sub = neko.Lib.load("std", "utf8_sub", 3);
+}
diff --git a/std/neko/Web.hx b/std/neko/Web.hx
index e9a9f4c5e6d62d7c6532d419310a4dc81b4f1255..5623895b32e3c19f50a74990d9cb7711a1a9aa4d 100644
--- a/std/neko/Web.hx
+++ b/std/neko/Web.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package neko;
 
+import haxe.ds.List;
+
 /**
 	This class is used for accessing the local Web server and the current
 	client request and information.
 **/
 class Web {
-
 	/**
 		Returns the GET and POST parameters.
 	**/
@@ -34,9 +36,9 @@ class Web {
 		var p = _get_params();
 		var h = new haxe.ds.StringMap<String>();
 		var k = "";
-		while( p != null ) {
+		while (p != null) {
 			untyped k.__s = p[0];
-			h.set(k,new String(p[1]));
+			h.set(k, new String(p[1]));
 			p = untyped p[2];
 		}
 		return h;
@@ -47,14 +49,14 @@ class Web {
 		If the URL contains the parameters `[a[]=foo;a[]=hello;a[5]=bar;a[3]=baz]` then
 		`neko.Web.getParamValues("a")` will return `["foo","hello",null,"baz",null,"bar"]`
 	**/
-	public static function getParamValues( param : String ) : Array<String> {
-		var reg = new EReg("^"+param+"(\\[|%5B)([0-9]*?)(\\]|%5D)=(.*?)$", "");
+	public static function getParamValues(param:String):Array<String> {
+		var reg = new EReg("^" + param + "(\\[|%5B)([0-9]*?)(\\]|%5D)=(.*?)$", "");
 		var res = new Array<String>();
-		var explore = function(data:String){
+		var explore = function(data:String) {
 			if (data == null || data.length == 0)
 				return;
-			for (part in data.split("&")){
-				if (reg.match(part)){
+			for (part in data.split("&")) {
+				if (reg.match(part)) {
 					var idx = reg.matched(2);
 					var val = StringTools.urlDecode(reg.matched(4));
 					if (idx == "")
@@ -95,7 +97,7 @@ class Web {
 	/**
 		Tell the client to redirect to the given url ("Location" header)
 	**/
-	public static function redirect( url : String ) {
+	public static function redirect(url:String) {
 		_cgi_redirect(untyped url.__s);
 	}
 
@@ -103,23 +105,23 @@ class Web {
 		Set an output header value. If some data have been printed, the headers have
 		already been sent so this will raise an exception.
 	**/
-	public static function setHeader( h : String, v : String ) {
-		_cgi_set_header(untyped h.__s,untyped v.__s);
+	public static function setHeader(h:String, v:String) {
+		_cgi_set_header(untyped h.__s, untyped v.__s);
 	}
 
 	/**
 		Set the HTTP return code. Same remark as setHeader.
 	**/
-	public static function setReturnCode( r : Int ) {
+	public static function setReturnCode(r:Int) {
 		_set_return_code(r);
 	}
 
 	/**
 		Retrieve a client header value sent with the request.
 	**/
-	public static function getClientHeader( k : String ) {
+	public static function getClientHeader(k:String) {
 		var v = _get_client_header(untyped k.__s);
-		if( v == null )
+		if (v == null)
 			return null;
 		return new String(v);
 	}
@@ -130,8 +132,8 @@ class Web {
 	public static function getClientHeaders() {
 		var v = _get_client_headers();
 		var a = new List();
-		while( v != null ) {
-			a.add({ header : new String(v[0]), value : new String(v[1]) });
+		while (v != null) {
+			a.add({header: new String(v[0]), value: new String(v[1])});
 			v = cast v[2];
 		}
 		return a;
@@ -142,7 +144,7 @@ class Web {
 	**/
 	public static function getParamsString() {
 		var p = _get_params_string();
-		return if( p == null ) "" else new String(p);
+		return if (p == null) "" else new String(p);
 	}
 
 	/**
@@ -155,7 +157,7 @@ class Web {
 	**/
 	public static function getPostData() {
 		var v = _get_post_data();
-		if( v == null )
+		if (v == null)
 			return null;
 		return new String(v);
 	}
@@ -164,36 +166,39 @@ class Web {
 		Returns an hashtable of all Cookies sent by the client.
 		Modifying the hashtable will not modify the cookie, use `setCookie` instead.
 	**/
-	public static function getCookies():Map<String,String> {
+	public static function getCookies():Map<String, String> {
 		var p = _get_cookies();
 		var h = new haxe.ds.StringMap<String>();
 		var k = "";
-		while( p != null ) {
+		while (p != null) {
 			untyped k.__s = p[0];
-			h.set(k,new String(p[1]));
+			h.set(k, new String(p[1]));
 			p = untyped p[2];
 		}
 		return h;
 	}
 
-
 	/**
 		Set a Cookie value in the HTTP headers. Same remark as `setHeader`.
 	**/
-	public static function setCookie( key : String, value : String, ?expire: Date, ?domain: String, ?path: String, ?secure: Bool, ?httpOnly: Bool ) {
+	public static function setCookie(key:String, value:String, ?expire:Date, ?domain:String, ?path:String, ?secure:Bool, ?httpOnly:Bool) {
 		var buf = new StringBuf();
 		buf.add(value);
-		if( expire != null ) addPair(buf, "expires=", DateTools.format(expire, "%a, %d-%b-%Y %H:%M:%S GMT"));
+		if (expire != null)
+			addPair(buf, "expires=", DateTools.format(expire, "%a, %d-%b-%Y %H:%M:%S GMT"));
 		addPair(buf, "domain=", domain);
 		addPair(buf, "path=", path);
-		if( secure ) addPair(buf, "secure", "");
-		if( httpOnly ) addPair(buf, "HttpOnly", "");
+		if (secure)
+			addPair(buf, "secure", "");
+		if (httpOnly)
+			addPair(buf, "HttpOnly", "");
 		var v = buf.toString();
 		_set_cookie(untyped key.__s, untyped v.__s);
 	}
 
-	static function addPair( buf : StringBuf, name, value ) {
-		if( value == null ) return;
+	static function addPair(buf:StringBuf, name:String, value:String) {
+		if (value == null)
+			return;
 		buf.add("; ");
 		buf.add(name);
 		buf.add(value);
@@ -202,17 +207,17 @@ class Web {
 	/**
 		Returns an object with the authorization sent by the client (Basic scheme only).
 	**/
-	public static function getAuthorization() : { user : String, pass : String } {
+	public static function getAuthorization():{user:String, pass:String} {
 		var h = getClientHeader("Authorization");
 		var reg = ~/^Basic ([^=]+)=*$/;
-		if( h != null && reg.match(h) ){
+		if (h != null && reg.match(h)) {
 			var val = reg.matched(1);
-			untyped val = new String(_base_decode(val.__s,"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".__s));
+			untyped val = new String(_base_decode(val.__s, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".__s));
 			var a = val.split(":");
-			if( a.length != 2 ){
+			if (a.length != 2) {
 				throw "Unable to decode authorization.";
 			}
-			return {user: a[0],pass: a[1]};
+			return {user: a[0], pass: a[1]};
 		}
 		return null;
 	}
@@ -228,7 +233,7 @@ class Web {
 		Set the main entry point function used to handle requests.
 		Setting it back to null will disable code caching.
 	**/
-	public static function cacheModule( f : Void -> Void ) {
+	public static function cacheModule(f:Void->Void) {
 		_set_main(f);
 	}
 
@@ -236,26 +241,26 @@ class Web {
 		Get the multipart parameters as an hashtable. The data
 		cannot exceed the maximum size specified.
 	**/
-	public static function getMultipart( maxSize : Int ) : Map<String,String> {
+	public static function getMultipart(maxSize:Int):Map<String, String> {
 		var h = new haxe.ds.StringMap();
-		var buf : haxe.io.BytesBuffer = null;
+		var buf:haxe.io.BytesBuffer = null;
 		var curname = null;
-		parseMultipart(function(p,_) {
-			if( curname != null )
-				h.set(curname,neko.Lib.stringReference(buf.getBytes()));
+		parseMultipart(function(p, _) {
+			if (curname != null)
+				h.set(curname, neko.Lib.stringReference(buf.getBytes()));
 			curname = p;
 			buf = new haxe.io.BytesBuffer();
 			maxSize -= p.length;
-			if( maxSize < 0 )
+			if (maxSize < 0)
 				throw "Maximum size reached";
-		},function(str,pos,len) {
+		}, function(str, pos, len) {
 			maxSize -= len;
-			if( maxSize < 0 )
+			if (maxSize < 0)
 				throw "Maximum size reached";
-			buf.addBytes(str,pos,len);
+			buf.addBytes(str, pos, len);
 		});
-		if( curname != null )
-			h.set(curname,neko.Lib.stringReference(buf.getBytes()));
+		if (curname != null)
+			h.set(curname, neko.Lib.stringReference(buf.getBytes()));
 		return h;
 	}
 
@@ -265,123 +270,140 @@ class Web {
 		and `onData` when some part data is read. You can this way
 		directly save the data on hard drive in the case of a file upload.
 	**/
-	public static function parseMultipart( onPart : String -> String -> Void, onData : haxe.io.Bytes -> Int -> Int -> Void ) : Void {
-		_parse_multipart(
-			function(p,f) { onPart(new String(p),if( f == null ) null else new String(f)); },
-			function(buf,pos,len) { onData(untyped new haxe.io.Bytes(__dollar__ssize(buf),buf),pos,len); }
-		);
+	public static function parseMultipart(onPart:String->String->Void, onData:haxe.io.Bytes->Int->Int->Void):Void {
+		_parse_multipart(function(p, f) {
+			onPart(new String(p), if (f == null) null else new String(f));
+		}, function(buf, pos, len) {
+			onData(untyped new haxe.io.Bytes(__dollar__ssize(buf), buf), pos, len);
+		});
 	}
 
 	/**
 		Flush the data sent to the client. By default on Apache, outgoing data is buffered so
 		this can be useful for displaying some long operation progress.
 	**/
-	public static function flush() : Void {
+	public static function flush():Void {
 		_flush();
 	}
 
 	/**
 		Get the HTTP method used by the client. This API requires Neko 1.7.1+.
 	**/
-	public static function getMethod() : String {
+	public static function getMethod():String {
 		return new String(_get_http_method());
 	}
 
 	/**
 		Write a message into the web server log file. This API requires Neko 1.7.1+.
 	**/
-	public static function logMessage( msg : String ) {
+	public static function logMessage(msg:String) {
 		_log_message(untyped msg.__s);
 	}
 
-	public static var isModNeko(default,null) : Bool;
-	public static var isTora(default,null) : Bool;
+	public static var isModNeko(default, null):Bool;
+	public static var isTora(default, null):Bool;
 
-	static var _set_main : Dynamic;
-	static var _get_host_name : Dynamic;
-	static var _get_client_ip : Dynamic;
-	static var _get_uri : Dynamic;
-	static var _cgi_redirect : Dynamic;
-	static var _cgi_set_header : Dynamic;
-	static var _set_return_code : Dynamic;
-	static var _get_client_header : Dynamic;
-	static var _get_params_string : Dynamic;
-	static var _get_post_data : Dynamic;
-	static var _get_params : Dynamic;
-	static var _get_cookies : Dynamic;
-	static var _set_cookie : Dynamic;
-	static var _get_cwd : Dynamic;
-	static var _parse_multipart : Dynamic;
-	static var _flush : Dynamic;
-	static var _get_client_headers : Dynamic;
-	static var _get_http_method : Dynamic;
-	static var _base_decode = Lib.load("std","base_decode",2);
-	static var _log_message : Dynamic;
+	static var _set_main:Dynamic;
+	static var _get_host_name:Dynamic;
+	static var _get_client_ip:Dynamic;
+	static var _get_uri:Dynamic;
+	static var _cgi_redirect:Dynamic;
+	static var _cgi_set_header:Dynamic;
+	static var _set_return_code:Dynamic;
+	static var _get_client_header:Dynamic;
+	static var _get_params_string:Dynamic;
+	static var _get_post_data:Dynamic;
+	static var _get_params:Dynamic;
+	static var _get_cookies:Dynamic;
+	static var _set_cookie:Dynamic;
+	static var _get_cwd:Dynamic;
+	static var _parse_multipart:Dynamic;
+	static var _flush:Dynamic;
+	static var _get_client_headers:Dynamic;
+	static var _get_http_method:Dynamic;
+	static var _base_decode = Lib.load("std", "base_decode", 2);
+	static var _log_message:Dynamic;
 
 	static function __init__() {
-		var get_env = Lib.load("std","get_env",1);
+		var get_env = Lib.load("std", "get_env", 1);
 		var ver = untyped get_env("MOD_NEKO".__s);
 		untyped isModNeko = (ver != null);
-		if( isModNeko ) {
-			var lib = "mod_neko"+if( ver == untyped "1".__s ) "" else ver;
-			_set_main = Lib.load(lib,"cgi_set_main",1);
-			_get_host_name = Lib.load(lib,"get_host_name",0);
-			_get_client_ip = Lib.load(lib,"get_client_ip",0);
-			_get_uri = Lib.load(lib,"get_uri",0);
-			_cgi_redirect = Lib.load(lib,"redirect",1);
-			_cgi_set_header = Lib.load(lib,"set_header",2);
-			_set_return_code = Lib.load(lib,"set_return_code",1);
-			_get_client_header = Lib.load(lib,"get_client_header",1);
-			_get_params_string = Lib.load(lib,"get_params_string",0);
-			_get_post_data = Lib.load(lib,"get_post_data",0);
-			_get_params = Lib.load(lib,"get_params",0);
-			_get_cookies = Lib.load(lib,"get_cookies",0);
-			_set_cookie = Lib.load(lib,"set_cookie",2);
-			_get_cwd = Lib.load(lib,"cgi_get_cwd",0);
-			_get_http_method = Lib.loadLazy(lib,"get_http_method",0);
-			_parse_multipart = Lib.loadLazy(lib,"parse_multipart_data",2);
-			_flush = Lib.loadLazy(lib,"cgi_flush",0);
-			_get_client_headers = Lib.loadLazy(lib,"get_client_headers",0);
-			_log_message = Lib.loadLazy(lib,"log_message",1);
-			isTora = try Lib.load(lib,"tora_infos",0) != null catch( e : Dynamic) false;
+		if (isModNeko) {
+			var lib = "mod_neko" + if (ver == untyped "1".__s) "" else ver;
+			_set_main = Lib.load(lib, "cgi_set_main", 1);
+			_get_host_name = Lib.load(lib, "get_host_name", 0);
+			_get_client_ip = Lib.load(lib, "get_client_ip", 0);
+			_get_uri = Lib.load(lib, "get_uri", 0);
+			_cgi_redirect = Lib.load(lib, "redirect", 1);
+			_cgi_set_header = Lib.load(lib, "set_header", 2);
+			_set_return_code = Lib.load(lib, "set_return_code", 1);
+			_get_client_header = Lib.load(lib, "get_client_header", 1);
+			_get_params_string = Lib.load(lib, "get_params_string", 0);
+			_get_post_data = Lib.load(lib, "get_post_data", 0);
+			_get_params = Lib.load(lib, "get_params", 0);
+			_get_cookies = Lib.load(lib, "get_cookies", 0);
+			_set_cookie = Lib.load(lib, "set_cookie", 2);
+			_get_cwd = Lib.load(lib, "cgi_get_cwd", 0);
+			_get_http_method = Lib.loadLazy(lib, "get_http_method", 0);
+			_parse_multipart = Lib.loadLazy(lib, "parse_multipart_data", 2);
+			_flush = Lib.loadLazy(lib, "cgi_flush", 0);
+			_get_client_headers = Lib.loadLazy(lib, "get_client_headers", 0);
+			_log_message = Lib.loadLazy(lib, "log_message", 1);
+			isTora = try Lib.load(lib, "tora_infos", 0) != null catch (e:Dynamic) false;
 		} else {
 			var a0 = untyped __dollar__loader.args[0];
-			if( a0 != null ) a0 = new String(a0);
-			_set_main = function(f) { };
-			_get_host_name = function() { return untyped "localhost".__s; };
-			_get_client_ip = function() { return untyped "127.0.0.1".__s; };
+			if (a0 != null)
+				a0 = new String(a0);
+			_set_main = function(f) {};
+			_get_host_name = function() {
+				return untyped "localhost".__s;
+			};
+			_get_client_ip = function() {
+				return untyped "127.0.0.1".__s;
+			};
 			_get_uri = function() {
-				return untyped (if( a0 == null ) "/" else a0).__s;
+				return untyped (if (a0 == null) "/" else a0).__s;
+			};
+			_cgi_redirect = function(v) {
+				Lib.print("Location: " + v + "\n");
+			};
+			_cgi_set_header = function(h, v) {};
+			_set_return_code = function(i) {};
+			_get_client_header = function(h) {
+				return null;
+			};
+			_get_client_headers = function() {
+				return null;
 			};
-			_cgi_redirect = function(v) { Lib.print("Location: "+v+"\n"); };
-			_cgi_set_header = function(h,v) { };
-			_set_return_code = function(i) { };
-			_get_client_header = function(h) { return null; };
-			_get_client_headers = function() { return null; };
 			_get_params_string = function() {
-				return untyped (if( a0 == null ) "" else a0).__s;
+				return untyped (if (a0 == null) "" else a0).__s;
+			};
+			_get_post_data = function() {
+				return null;
 			};
-			_get_post_data = function() { return null; };
 			_get_params = function() {
 				var l = null;
-				if( a0 == null )
+				if (a0 == null)
 					return null;
-				for( p in a0.split(";") ) {
+				for (p in a0.split(";")) {
 					var k = p.split("=");
-					if( k.length == 2 )
-						l = untyped [k[0].__s,k[1].__s,l];
+					if (k.length == 2)
+						l = untyped [k[0].__s, k[1].__s, l];
 				}
 				return l;
 			};
-			_get_cookies = function() { return null; }
-			_set_cookie = function(k,v) { };
-			_get_cwd = Lib.load("std","get_cwd",0);
+			_get_cookies = function() {
+				return null;
+			}
+			_set_cookie = function(k, v) {};
+			_get_cwd = Lib.load("std", "get_cwd", 0);
 			_get_http_method = function() return untyped "GET".__s;
-			_parse_multipart = function(a,b) { throw "Not supported"; };
-			_flush = function() { };
-			_log_message = function(s) { };
+			_parse_multipart = function(a, b) {
+				throw "Not supported";
+			};
+			_flush = function() {};
+			_log_message = function(s) {};
 			isTora = false;
 		}
 	}
-
 }
diff --git a/std/neko/_std/Array.hx b/std/neko/_std/Array.hx
index b03303f92734efdd64a304de483c26d1bfb797da..86867317d63e288e1c3148e1de1da2e62d3cc1ef 100644
--- a/std/neko/_std/Array.hx
+++ b/std/neko/_std/Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,46 +19,46 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-@:coreApi @:final class Array<T> {
+@:coreApi final class Array<T> {
+	private var __a:neko.NativeArray<T>;
 
-	private var __a : neko.NativeArray<T>;
-	public var length(default,null) : Int;
+	public var length(default, null):Int;
 
-	public function new() : Void {
+	public function new():Void {
 		this.__a = neko.NativeArray.alloc(0);
 		this.length = 0;
 	}
 
-	private static function new1<T>(a:neko.NativeArray<T>,l:Int) : Array<T> {
+	private static function new1<T>(a:neko.NativeArray<T>, l:Int):Array<T> {
 		var inst = new Array<T>();
 		inst.__a = a;
 		inst.length = l;
 		return inst;
 	}
 
-	public function concat( a : Array<T>) : Array<T> {
+	public function concat(a:Array<T>):Array<T> {
 		var a1 = this.__a;
 		var a2 = a.__a;
 		var s1 = this.length;
 		var s2 = a.length;
-		var a = neko.NativeArray.alloc(s1+s2);
-		neko.NativeArray.blit(a,0,a1,0,s1);
-		neko.NativeArray.blit(a,s1,a2,0,s2);
-		return new1(a,s1+s2);
+		var a = neko.NativeArray.alloc(s1 + s2);
+		neko.NativeArray.blit(a, 0, a1, 0, s1);
+		neko.NativeArray.blit(a, s1, a2, 0, s2);
+		return new1(a, s1 + s2);
 	}
 
-	public function copy() : Array<T> {
-		return new1(neko.NativeArray.sub(this.__a,0,this.length),this.length);
+	public function copy():Array<T> {
+		return new1(neko.NativeArray.sub(this.__a, 0, this.length), this.length);
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return untyped {
-			a : this,
-			p : 0,
-			hasNext : function() {
+			a: this,
+			p: 0,
+			hasNext: function() {
 				return __this__.p < __this__.a.length;
 			},
-			next : function() {
+			next: function() {
 				var i = __this__.a.__a[__this__.p];
 				__this__.p += 1;
 				return i;
@@ -66,46 +66,60 @@
 		};
 	}
 
-	public function insert( pos : Int, x : T ) : Void {
+	public function insert(pos:Int, x:T):Void {
 		var l = this.length;
-		if( pos < 0 ) {
+		if (pos < 0) {
 			pos = l + pos;
-			if( pos < 0 ) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
-		if( pos > l ) pos = l;
-		this.__grow(l+1);
+		if (pos > l)
+			pos = l;
+		this.__grow(l + 1);
 		var a = this.__a;
-		neko.NativeArray.blit(a,pos+1,a,pos,l-pos);
+		neko.NativeArray.blit(a, pos + 1, a, pos, l - pos);
 		a[pos] = x;
 	}
 
-	public function join( sep : String ) : String {
+	public function join(sep:String):String {
 		var s = new StringBuf();
 		var a = this.__a;
 		var max = this.length - 1;
-		for( p in 0...this.length ) {
+		for (p in 0...this.length) {
 			s.add(a[p]);
-			if( p != max )
+			if (p != max)
 				s.add(sep);
 		}
 		return s.toString();
 	}
 
-	public function toString() : String {
+	static var __hx_toString_depth = 0;
+
+	public function toString():String {
+		if (__hx_toString_depth >= 5) {
+			return "...";
+		}
 		var s = new StringBuf();
 		s.add("[");
 		var it = iterator();
-		for( i in it ) {
-			s.add(i);
-			if( it.hasNext() )
-				s.addChar(",".code);
+		__hx_toString_depth++;
+		try {
+			for (i in it) {
+				s.add(i);
+				if (it.hasNext())
+					s.addChar(",".code);
+			}
+			__hx_toString_depth--;
+		} catch (e:Dynamic) {
+			__hx_toString_depth--;
+			neko.Lib.rethrow(e);
 		}
 		s.add("]");
 		return s.toString();
 	}
 
-	public function pop() : Null<T> {
-		if( this.length == 0 )
+	public function pop():Null<T> {
+		if (this.length == 0)
 			return null;
 		this.length -= 1;
 		var x = this.__a[this.length];
@@ -113,28 +127,28 @@
 		return x;
 	}
 
-	public function push(x:T) : Int {
+	public function push(x:T):Int {
 		var l = this.length;
 		this.__grow(l + 1);
 		this.__a[l] = x;
 		return l + 1;
 	}
 
-	public function unshift(x : T) : Void {
+	public function unshift(x:T):Void {
 		var l = this.length;
 		this.__grow(l + 1);
 		var a = this.__a;
-		neko.NativeArray.blit(a,1,a,0,l);
+		neko.NativeArray.blit(a, 1, a, 0, l);
 		a[0] = x;
 	}
 
-	public function remove(x : T) : Bool {
+	public function remove(x:T):Bool {
 		var i = 0;
 		var l = this.length;
 		var a = this.__a;
-		while( i < l ) {
-			if( a[i] == x ) {
-				neko.NativeArray.blit(a,i,a,i+1,l - i - 1);
+		while (i < l) {
+			if (a[i] == x) {
+				neko.NativeArray.blit(a, i, a, i + 1, l - i - 1);
 				l -= 1;
 				this.length = l;
 				a[l] = null;
@@ -145,16 +159,16 @@
 		return false;
 	}
 
-	public function indexOf(x : T, ?fromIndex:Int) : Int {
+	public function indexOf(x:T, ?fromIndex:Int):Int {
 		var len = length;
 		var i:Int = (fromIndex != null) ? fromIndex : 0;
 		var a = __a;
 		if (i < 0) {
 			i += len;
-			if (i < 0) i = 0;
+			if (i < 0)
+				i = 0;
 		}
-		while (i < len)
-		{
+		while (i < len) {
 			if (a[i] == x)
 				return i;
 			i++;
@@ -162,7 +176,7 @@
 		return -1;
 	}
 
-	public function lastIndexOf(x : T, ?fromIndex:Int) : Int {
+	public function lastIndexOf(x:T, ?fromIndex:Int):Int {
 		var len = length;
 		var i:Int = (fromIndex != null) ? fromIndex : len - 1;
 		var a = __a;
@@ -170,8 +184,7 @@
 			i = len - 1;
 		else if (i < 0)
 			i += len;
-		while (i >= 0)
-		{
+		while (i >= 0) {
 			if (a[i] == x)
 				return i;
 			i--;
@@ -179,104 +192,110 @@
 		return -1;
 	}
 
-	public function reverse() : Void {
+	public function reverse():Void {
 		var i = 0;
 		var l = this.length;
 		var a = this.__a;
 		var half = l >> 1;
 		l -= 1;
-		while( i < half ) {
+		while (i < half) {
 			var tmp = a[i];
-			a[i] = a[l-i];
-			a[l-i] = tmp;
+			a[i] = a[l - i];
+			a[l - i] = tmp;
 			i += 1;
 		}
 	}
 
-	public function shift() : Null<T> {
+	public function shift():Null<T> {
 		var l = this.length;
-		if( l == 0 )
+		if (l == 0)
 			return null;
 		var a = this.__a;
 		var x = a[0];
 		l -= 1;
-		neko.NativeArray.blit(a,0,a,1,l);
+		neko.NativeArray.blit(a, 0, a, 1, l);
 		a[l] = null;
 		this.length = l;
 		return x;
 	}
 
-	public function slice( pos : Int, ?end : Int ) : Array<T> {
-		if( pos < 0 ){
+	public function slice(pos:Int, ?end:Int):Array<T> {
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 )
+			if (pos < 0)
 				pos = 0;
 		}
-		if( end == null )
+		if (end == null)
 			end = this.length;
-		else if( end < 0 )
+		else if (end < 0)
 			end = this.length + end;
-		if( end > this.length )
+		if (end > this.length)
 			end = this.length;
 		var len = end - pos;
-		if( len < 0 ) return new Array();
-		return new1(neko.NativeArray.sub(this.__a,pos,len),len);
+		if (len < 0)
+			return new Array();
+		return new1(neko.NativeArray.sub(this.__a, pos, len), len);
 	}
 
-	public function sort(f:T->T->Int) : Void {
+	public function sort(f:T->T->Int):Void {
 		var a = this.__a;
 		var i = 0;
 		var l = this.length;
-		while( i < l ) {
+		while (i < l) {
 			var swap = false;
 			var j = 0;
 			var max = l - i - 1;
-			while( j < max ) {
-				if( f(a[j],a[j+1]) > 0 ) {
-					var tmp = a[j+1];
-					a[j+1] = a[j];
+			while (j < max) {
+				if (f(a[j], a[j + 1]) > 0) {
+					var tmp = a[j + 1];
+					a[j + 1] = a[j];
 					a[j] = tmp;
 					swap = true;
 				}
 				j += 1;
 			}
-			if( !swap )
+			if (!swap)
 				break;
 			i += 1;
 		}
 	}
 
-	public function splice( pos : Int, len : Int ) : Array<T> {
-		if( len < 0 ) return new Array();
-		if( pos < 0 ){
+	public function splice(pos:Int, len:Int):Array<T> {
+		if (len < 0)
+			return new Array();
+		if (pos < 0) {
 			pos = this.length + pos;
-			if( pos < 0 ) pos = 0;
+			if (pos < 0)
+				pos = 0;
 		}
-		if( pos > this.length ) {
+		if (pos > this.length) {
 			pos = 0;
 			len = 0;
-		} else if( pos + len > this.length ) {
+		} else if (pos + len > this.length) {
 			len = this.length - pos;
-			if( len < 0 ) len = 0;
+			if (len < 0)
+				len = 0;
 		}
 		var a = this.__a;
-		var ret = new1(neko.NativeArray.sub(a,pos,len),len);
+		var ret = new1(neko.NativeArray.sub(a, pos, len), len);
 		var end = pos + len;
-		neko.NativeArray.blit(a,pos,a,end,this.length-end);
+		neko.NativeArray.blit(a, pos, a, end, this.length - end);
 		this.length -= len;
-		while( --len >= 0 )
+		while (--len >= 0)
 			a[this.length + len] = null;
 		return ret;
 	}
 
-	public function map<S>( f : T -> S ) : Array<S> {
-		var ret = [];
-		for (elt in this)
-			ret.push(f(elt));
+	public inline function map<S>(f:T->S):Array<S> {
+		var l = length;
+		var ret = new1(neko.NativeArray.alloc(l), l);
+		for (i in 0...l) {
+			ret[i] = f(this[i]);
+		}
 		return ret;
 	}
 
-	public function filter( f : T -> Bool ) : Array<T> {
+	public inline function filter(f:T->Bool):Array<T> {
 		var ret = [];
 		for (elt in this)
 			if (f(elt))
@@ -284,25 +303,34 @@
 		return ret;
 	}
 
+	public function resize(len:Int):Void {
+		if (length < len) {
+			__set(len - 1, null);
+		} else if (length > len) {
+			for (i in len...length) {
+				__a[i] = null;
+			}
+			this.length = len;
+		}
+	}
 
 	/* NEKO INTERNAL */
-
-	private function __get( pos : Int ) : T {
+	private function __get(pos:Int):T {
 		return this.__a[pos];
 	}
 
-	private function __set( pos : Int, v : T ) : T {
+	private function __set(pos:Int, v:T):T {
 		var a = this.__a;
-		if( this.length <= pos ) {
+		if (this.length <= pos) {
 			var l = pos + 1;
 			var dlen = l - neko.NativeArray.length(a);
-			if( dlen > 0 ) {
-				if( dlen == 1 ) {
+			if (dlen > 0) {
+				if (dlen == 1) {
 					this.__grow(l);
 					a = this.__a;
 				} else {
 					a = neko.NativeArray.alloc(l);
-					neko.NativeArray.blit(a,0,this.__a,0,this.length);
+					neko.NativeArray.blit(a, 0, this.__a, 0, this.length);
 					this.__a = a;
 				}
 			}
@@ -312,39 +340,38 @@
 		return v;
 	}
 
-	private function __grow(l:Int) : Void {
+	private function __grow(l:Int):Void {
 		var a = this.__a;
 		var sz = neko.NativeArray.length(a);
-		if( sz >= l ) {
+		if (sz >= l) {
 			this.length = l;
 			return;
 		}
 		var big = (sz * 3) >> 1;
-		if( big < l ) big = l;
+		if (big < l)
+			big = l;
 		var a2 = neko.NativeArray.alloc(big);
-		neko.NativeArray.blit(a2,0,a,0,this.length);
+		neko.NativeArray.blit(a2, 0, a, 0, this.length);
 		this.__a = a2;
 		this.length = l;
 	}
 
-	private function __neko() : neko.NativeArray<T> {
+	private function __neko():neko.NativeArray<T> {
 		var a = this.__a;
 		var sz = neko.NativeArray.length(a);
-		if( sz != this.length ) {
-			a = neko.NativeArray.sub(a,0,this.length);
+		if (sz != this.length) {
+			a = neko.NativeArray.sub(a, 0, this.length);
 			this.__a = a;
 		}
 		return a;
 	}
 
 	#if !(macro || interp)
-	static function __init__() : Void {
+	static function __init__():Void {
 		try {
-			var msort : Dynamic = neko.Lib.load("std","merge_sort",3);
-			untyped Array.prototype.sort = function(cmp) msort(__this__.__a,__this__.length,cmp);
-		} catch( e : Dynamic ) {
-		}
+			var msort:Dynamic = neko.Lib.load("std", "merge_sort", 3);
+			untyped Array.prototype.sort = function(cmp) msort(__this__.__a, __this__.length, cmp);
+		} catch (e:Dynamic) {}
 	}
 	#end
-
 }
diff --git a/std/neko/_std/Date.hx b/std/neko/_std/Date.hx
index 811e608b511a3cbedaabd8fd8df280f69164578b..a4eb0272ae44214f1671d636cf6d1a28630c5a47 100644
--- a/std/neko/_std/Date.hx
+++ b/std/neko/_std/Date.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,87 +19,123 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-import neko.Lib;
 
-@:coreApi @:final class Date {
+import neko.Lib;
 
-	private var __t : Dynamic;
+@:coreApi final class Date {
+	private var __t:Dynamic;
 
-	public function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void {
-		__t = date_set_day(0,year,month+1,day);
-		__t = date_set_hour(__t,hour,min,sec);
+	public function new(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Void {
+		__t = date_set_day(0, year, month + 1, day);
+		__t = date_set_hour(__t, hour, min, sec);
 	}
 
-	public function getTime() : Float {
+	public function getTime():Float {
 		return int32_to_float(__t) * 1000;
 	}
 
-	public function getFullYear() : Int {
+	public function getFullYear():Int {
 		return date_get_day(__t).y;
 	}
 
-	public function getMonth() : Int {
-		return date_get_day(__t).m -1;
+	public function getMonth():Int {
+		return date_get_day(__t).m - 1;
 	}
 
-	public function getDate() : Int {
+	public function getDate():Int {
 		return date_get_day(__t).d;
 	}
 
-	public function getHours() : Int {
+	public function getHours():Int {
 		return date_get_hour(__t).h;
 	}
 
-	public function getMinutes() : Int {
+	public function getMinutes():Int {
 		return date_get_hour(__t).m;
 	}
 
-	public function getSeconds() : Int {
+	public function getSeconds():Int {
 		return date_get_hour(__t).s;
 	}
 
-	public function getDay() : Int {
-		return Std.parseInt( new String(date_format(__t,untyped "%w".__s)) );
+	public function getDay():Int {
+		return Std.parseInt(new String(date_format(__t, untyped "%w".__s)));
+	}
+
+	public function getUTCFullYear():Int {
+		return date_get_utc_day(__t).y;
+	}
+
+	public function getUTCMonth():Int {
+		return date_get_utc_day(__t).m - 1;
+	}
+
+	public function getUTCDate():Int {
+		return date_get_utc_day(__t).d;
+	}
+
+	public function getUTCHours():Int {
+		return date_get_utc_hour(__t).h;
+	}
+
+	public function getUTCMinutes():Int {
+		return date_get_utc_hour(__t).m;
+	}
+
+	public function getUTCSeconds():Int {
+		return date_get_utc_hour(__t).s;
+	}
+
+	public function getUTCDay():Int {
+		return Std.parseInt(new String(date_utc_format(__t, untyped "%w".__s)));
+	}
+
+	public function getTimezoneOffset():Int {
+		return -date_get_tz(__t);
 	}
 
 	@:keep public function toString():String {
-		return new String(date_format(__t,null));
+		return new String(date_format(__t, null));
 	}
 
-	public static function now() : Date {
+	public static function now():Date {
 		return new1(date_now());
 	}
 
-	public static function fromTime( t : Float ) : Date {
+	public static function fromTime(t:Float):Date {
 		t /= 1000;
-		var i1 = untyped __dollar__int((t%65536));
-		var i2 = untyped __dollar__int(t/65536);
-		var i = int32_add(i1,int32_shl(i2,16));
+		var i1 = untyped __dollar__int((t % 65536));
+		var i2 = untyped __dollar__int(t / 65536);
+		var i = int32_add(i1, int32_shl(i2, 16));
 		return new1(i);
 	}
 
-	public static function fromString( s : String ) : Date {
+	public static function fromString(s:String):Date {
 		return new1(date_new(untyped s.__s));
 	}
 
-	private static function new1(t : Dynamic) : Date {
-		var d = new Date(2005,1,1,0,0,0);
+	private static function new1(t:Dynamic):Date {
+		var d = new Date(2005, 1, 1, 0, 0, 0);
 		d.__t = t;
 		return d;
 	}
 
-	static var date_new = Lib.load("std","date_new",1);
-	static var date_now = Lib.load("std","date_now",0);
-	static var date_format = Lib.load("std","date_format",2);
-	static var date_set_hour = Lib.load("std","date_set_hour",4);
-	static var date_set_day = Lib.load("std","date_set_day",4);
-	static var date_get_day : Dynamic -> {y:Int, m:Int, d:Int} = Lib.load("std","date_get_day",1);
-	static var date_get_hour : Dynamic -> {h:Int, m:Int, s:Int} = Lib.load("std","date_get_hour",1);
-	static var int32_to_float = Lib.load("std","int32_to_float",1);
-	static var int32_add = Lib.load("std","int32_add",2);
-	static var int32_shl = Lib.load("std","int32_shl",2);
-	@:keep static function __string() : String { return untyped "Date".__s; }
-
+	static var date_new = Lib.load("std", "date_new", 1);
+	static var date_now = Lib.load("std", "date_now", 0);
+	static var date_format = Lib.load("std", "date_format", 2);
+	static var date_utc_format = Lib.load("std", "date_utc_format", 2);
+	static var date_set_hour = Lib.load("std", "date_set_hour", 4);
+	static var date_set_day = Lib.load("std", "date_set_day", 4);
+	static var date_get_day:Dynamic->{y: Int, m: Int, d: Int} = Lib.load("std", "date_get_day", 1);
+	static var date_get_hour:Dynamic->{h: Int, m: Int, s: Int} = Lib.load("std", "date_get_hour", 1);
+	static var date_get_utc_day:Dynamic->{y: Int, m: Int, d: Int} = Lib.load("std", "date_get_utc_day", 1);
+	static var date_get_utc_hour:Dynamic->{h: Int, m: Int, s: Int} = Lib.load("std", "date_get_utc_hour", 1);
+	static var date_get_tz = Lib.load("std", "date_get_tz", 1);
+	static var int32_to_float = Lib.load("std", "int32_to_float", 1);
+	static var int32_add = Lib.load("std", "int32_add", 2);
+	static var int32_shl = Lib.load("std", "int32_shl", 2);
+
+	@:keep static function __string():String {
+		return untyped "Date".__s;
+	}
 }
-
-
diff --git a/std/neko/_std/EReg.hx b/std/neko/_std/EReg.hx
index de5fc310fff7f03ada47543d3d3440b5f1b0914f..3103802bad16f6f2aea20cb3374bd7e20051feae 100644
--- a/std/neko/_std/EReg.hx
+++ b/std/neko/_std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,160 +19,160 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-@:coreApi @:final class EReg {
+@:coreApi final class EReg {
+	var r:Dynamic;
+	var last:String;
+	var global:Bool;
 
-	var r : Dynamic;
-	var last : String;
-	var global : Bool;
-
-	public function new( r : String, opt : String ) : Void {
+	public function new(r:String, opt:String):Void {
 		var a = opt.split("g");
 		global = a.length > 1;
-		if( global )
+		if (global)
 			opt = a.join("");
 		this.r = regexp_new_options(untyped r.__s, untyped opt.__s);
 	}
 
-	public function match( s : String ) : Bool {
-		var p = regexp_match(r,untyped s.__s,0,s.length);
-		if( p )
+	public function match(s:String):Bool {
+		var p = regexp_match(r, untyped s.__s, 0, s.length);
+		if (p)
 			last = s;
 		else
 			last = null;
 		return p;
 	}
 
-	public function matched( n : Int ) : String {
-		var m = regexp_matched(r,n);
+	public function matched(n:Int):String {
+		var m = regexp_matched(r, n);
 		return (m == null) ? null : new String(m);
 	}
 
-	public function matchedLeft() : String {
-		var p = regexp_matched_pos(r,0);
-		return last.substr(0,p.pos);
+	public function matchedLeft():String {
+		var p = regexp_matched_pos(r, 0);
+		return last.substr(0, p.pos);
 	}
 
-	public function matchedRight() : String {
-		var p = regexp_matched_pos(r,0);
-		var sz = p.pos+p.len;
-		return last.substr(sz,last.length-sz);
+	public function matchedRight():String {
+		var p = regexp_matched_pos(r, 0);
+		var sz = p.pos + p.len;
+		return last.substr(sz, last.length - sz);
 	}
 
-	public function matchedPos() : { pos : Int, len : Int } {
-		return regexp_matched_pos(r,0);
+	public function matchedPos():{pos:Int, len:Int} {
+		return regexp_matched_pos(r, 0);
 	}
 
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
 		var p = regexp_match(r, untyped s.__s, pos, len < 0 ? s.length - pos : len);
-		if( p )
+		if (p)
 			last = s;
 		else
 			last = null;
 		return p;
 	}
 
-	public function split( s : String ) : Array<String> {
+	public function split(s:String):Array<String> {
 		var pos = 0;
 		var len = s.length;
 		var a = new Array();
 		var first = true;
 		do {
-			if( !regexp_match(r,untyped s.__s,pos,len) )
+			if (!regexp_match(r, untyped s.__s, pos, len))
 				break;
-			var p = regexp_matched_pos(r,0);
-			if( p.len == 0 && !first ) {
-				if( p.pos == s.length )
+			var p = regexp_matched_pos(r, 0);
+			if (p.len == 0 && !first) {
+				if (p.pos == s.length)
 					break;
 				p.pos += 1;
 			}
-			a.push(s.substr(pos,p.pos - pos));
+			a.push(s.substr(pos, p.pos - pos));
 			var tot = p.pos + p.len - pos;
 			pos += tot;
 			len -= tot;
 			first = false;
-		} while( global );
-		a.push(s.substr(pos,len));
+		} while (global);
+		a.push(s.substr(pos, len));
 		return a;
 	}
 
-	public function replace( s : String, by : String ) : String {
+	public function replace(s:String, by:String):String {
 		var b = new StringBuf();
 		var pos = 0;
 		var len = s.length;
 		var a = by.split("$");
 		var first = true;
 		do {
-			if( !regexp_match(r,untyped s.__s,pos,len) )
+			if (!regexp_match(r, untyped s.__s, pos, len))
 				break;
-			var p = regexp_matched_pos(r,0);
-			if( p.len == 0 && !first ) {
-				if( p.pos == s.length )
+			var p = regexp_matched_pos(r, 0);
+			if (p.len == 0 && !first) {
+				if (p.pos == s.length)
 					break;
 				p.pos += 1;
 			}
-			b.addSub(s,pos,p.pos-pos);
-			if( a.length > 0 )
+			b.addSub(s, pos, p.pos - pos);
+			if (a.length > 0)
 				b.add(a[0]);
 			var i = 1;
-			while( i < a.length ) {
+			while (i < a.length) {
 				var k = a[i];
 				var c = k.charCodeAt(0);
 				// 1...9
-				if( c >= 49 && c <= 57 ) {
-					var p = try regexp_matched_pos(r,Std.int(c)-48) catch( e : String ) null;
-					if( p == null ){
+				if (c >= 49 && c <= 57) {
+					var p = try regexp_matched_pos(r, Std.int(c) - 48) catch (e:String) null;
+					if (p == null) {
 						b.add("$");
 						b.add(k);
 					} else {
-						if( p.pos >= 0 ) b.addSub(s,p.pos,p.len);
-						b.addSub(k,1,k.length - 1);
+						if (p.pos >= 0)
+							b.addSub(s, p.pos, p.len);
+						b.addSub(k, 1, k.length - 1);
 					}
-				} else if( c == null ) {
+				} else if (c == null) {
 					b.add("$");
 					i++;
 					var k2 = a[i];
-					if( k2 != null && k2.length > 0 )
+					if (k2 != null && k2.length > 0)
 						b.add(k2);
 				} else
-					b.add("$"+k);
+					b.add("$" + k);
 				i++;
 			}
 			var tot = p.pos + p.len - pos;
 			pos += tot;
 			len -= tot;
 			first = false;
-		} while( global );
-		b.addSub(s,pos,len);
+		} while (global);
+		b.addSub(s, pos, len);
 		return b.toString();
 	}
 
-	//public function map( s : String, f : EReg -> String ) : String {
-		//var b = new StringBuf();
-		//var pos = 0;
-		//var len = s.length;
-		//var first = true;
-		//last = s;
-		//do {
-			//if( !regexp_match(r,untyped s.__s,pos,len) )
-				//break;
-			//var p = regexp_matched_pos(r,0);
-			//if( p.len == 0 && !first ) {
-				//if( p.pos == s.length )
-					//break;
-				//p.pos += 1;
-			//}
-			//b.addSub(s,pos,p.pos-pos);
-			//b.add(f(this));
-			//var tot = p.pos + p.len - pos;
-			//pos += tot;
-			//len -= tot;
-			//first = false;
-		//} while( global );
-		//b.addSub(s,pos,len);
-		//return b.toString();
-	//}
+	// public function map( s : String, f : EReg -> String ) : String {
+	// var b = new StringBuf();
+	// var pos = 0;
+	// var len = s.length;
+	// var first = true;
+	// last = s;
+	// do {
+	// if( !regexp_match(r,untyped s.__s,pos,len) )
+	// break;
+	// var p = regexp_matched_pos(r,0);
+	// if( p.len == 0 && !first ) {
+	// if( p.pos == s.length )
+	// break;
+	// p.pos += 1;
+	// }
+	// b.addSub(s,pos,p.pos-pos);
+	// b.add(f(this));
+	// var tot = p.pos + p.len - pos;
+	// pos += tot;
+	// len -= tot;
+	// first = false;
+	// } while( global );
+	// b.addSub(s,pos,len);
+	// return b.toString();
+	// }
 
-	public function map( s : String, f : EReg -> String ) : String {
+	public function map(s:String, f:EReg->String):String {
 		var offset = 0;
 		var buf = new StringBuf();
 		do {
@@ -182,14 +182,13 @@
 				buf.add(s.substr(offset));
 				break;
 			}
-			var p = regexp_matched_pos(r,0);
+			var p = regexp_matched_pos(r, 0);
 			buf.add(s.substr(offset, p.pos - offset));
 			buf.add(f(this));
 			if (p.len == 0) {
 				buf.add(s.substr(p.pos, 1));
 				offset = p.pos + 1;
-			}
-			else
+			} else
 				offset = p.pos + p.len;
 		} while (global);
 		if (!global && offset > 0 && offset < s.length)
@@ -197,8 +196,14 @@
 		return buf.toString();
 	}
 
-	static var regexp_new_options = neko.Lib.load("regexp","regexp_new_options",2);
-	static var regexp_match = neko.Lib.load("regexp","regexp_match",4);
-	static var regexp_matched = neko.Lib.load("regexp","regexp_matched",2);
-	static var regexp_matched_pos : Dynamic -> Int -> { pos : Int, len : Int } = neko.Lib.load("regexp","regexp_matched_pos",2);
+	public static function escape(s:String):String {
+		return escapeRegExpRe.map(s, function(r) return "\\" + r.matched(0));
+	}
+
+	static var escapeRegExpRe = ~/[\[\]{}()*+?.\\\^$|]/g;
+
+	static var regexp_new_options = neko.Lib.load("regexp", "regexp_new_options", 2);
+	static var regexp_match = neko.Lib.load("regexp", "regexp_match", 4);
+	static var regexp_matched = neko.Lib.load("regexp", "regexp_matched", 2);
+	static var regexp_matched_pos:Dynamic->Int->{pos: Int, len: Int} = neko.Lib.load("regexp", "regexp_matched_pos", 2);
 }
diff --git a/std/neko/_std/Math.hx b/std/neko/_std/Math.hx
index c6f2b7b560a25bb54ef4383ec2d77a1b11777e57..a1eaf58bc41f328136534b125e02ae1160a19239 100644
--- a/std/neko/_std/Math.hx
+++ b/std/neko/_std/Math.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,79 +19,92 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import neko.Lib;
 
 @:native("Math")
 @:keep
 private class MathImpl {
-	static var __rnd;
-	static var _rand_float = Lib.load("std","random_float",1);
-	static var _rand_int = Lib.load("std","random_int",2);
+	static var __rnd:Dynamic;
+	static var _rand_float = Lib.load("std", "random_float", 1);
+	static var _rand_int = Lib.load("std", "random_int", 2);
+
+	public static function min(a:Float, b:Float):Float {
+		return if (a < b) a else if (untyped $isnan(a)) a else b;
+	}
+
+	public static function max(a:Float, b:Float):Float {
+		return if (a < b) b else if (untyped $isnan(b)) b else a;
+	}
+
+	public static function random():Float {
+		return _rand_float(__rnd);
+	}
+
+	public static function isNaN(f:Float):Bool {
+		return untyped __dollar__isnan(f);
+	}
 
-	public static function min(a:Float,b:Float) : Float { return if( a < b ) a else if( untyped $isnan(a) ) a else b; }
-	public static function max(a:Float,b:Float) : Float { return if( a < b ) b else if( untyped $isnan(b) ) b else a; }
-	public static function random() : Float { return _rand_float(__rnd); }
-	public static function isNaN(f:Float) : Bool { return untyped __dollar__isnan(f); }
-	public static function isFinite(f:Float) : Bool { return !untyped (__dollar__isinfinite(f) || __dollar__isnan(f)); }
+	public static function isFinite(f:Float):Bool {
+		return !untyped (__dollar__isinfinite(f) || __dollar__isnan(f));
+	}
 
-	static function __init__() : Void {
-		var M : Dynamic = MathImpl;
-	 	__rnd = Lib.load("std","random_new",0)();
-	 	M.PI = Lib.load("std","math_pi",0)();
-	 	M.NaN = 0.0 / 0.0;
-	 	M.POSITIVE_INFINITY = 1.0 / 0.0;
-	 	M.NEGATIVE_INFINITY = -M.POSITIVE_INFINITY;
-		M.abs = Lib.load("std","math_abs",1);
-		M.sin = Lib.load("std","math_sin",1);
-		M.cos = Lib.load("std","math_cos",1);
-		M.atan2 = Lib.load("std","math_atan2",2);
-		M.tan = Lib.load("std","math_tan",1);
-		M.exp = Lib.load("std","math_exp",1);
-		M.log = Lib.load("std","math_log",1);
-		M.sqrt = Lib.load("std","math_sqrt",1);
-		M.round = Lib.load("std","math_round",1);
-		M.floor = Lib.load("std","math_floor",1);
-		M.ceil = Lib.load("std","math_ceil",1);
-		M.atan = Lib.load("std","math_atan",1);
-		M.asin = Lib.load("std","math_asin",1);
-		M.acos = Lib.load("std","math_acos",1);
+	static function __init__():Void {
+		var M:Dynamic = MathImpl;
+		__rnd = Lib.load("std", "random_new", 0)();
+		M.PI = Lib.load("std", "math_pi", 0)();
+		M.NaN = 0.0 / 0.0;
+		M.POSITIVE_INFINITY = 1.0 / 0.0;
+		M.NEGATIVE_INFINITY = -M.POSITIVE_INFINITY;
+		M.abs = Lib.load("std", "math_abs", 1);
+		M.sin = Lib.load("std", "math_sin", 1);
+		M.cos = Lib.load("std", "math_cos", 1);
+		M.atan2 = Lib.load("std", "math_atan2", 2);
+		M.tan = Lib.load("std", "math_tan", 1);
+		M.exp = Lib.load("std", "math_exp", 1);
+		M.log = Lib.load("std", "math_log", 1);
+		M.sqrt = Lib.load("std", "math_sqrt", 1);
+		M.round = Lib.load("std", "math_round", 1);
+		M.floor = Lib.load("std", "math_floor", 1);
+		M.ceil = Lib.load("std", "math_ceil", 1);
+		M.atan = Lib.load("std", "math_atan", 1);
+		M.asin = Lib.load("std", "math_asin", 1);
+		M.acos = Lib.load("std", "math_acos", 1);
 		M.pow = Lib.load("std", "math_pow", 2);
-		M.fceil = try Lib.load("std", "math_fceil", 1) catch( e : Dynamic ) M.ceil;
-		M.ffloor = try Lib.load("std", "math_ffloor", 1) catch( e : Dynamic ) M.floor;
-		M.fround = try Lib.load("std", "math_fround", 1) catch( e : Dynamic ) M.round;
+		M.fceil = try Lib.load("std", "math_fceil", 1) catch (e:Dynamic) M.ceil;
+		M.ffloor = try Lib.load("std", "math_ffloor", 1) catch (e:Dynamic) M.floor;
+		M.fround = try Lib.load("std", "math_fround", 1) catch (e:Dynamic) M.round;
 	}
 }
 
 @:coreApi
-@:final
-extern class Math {
-
-	public static var PI(default,null) : Float;
-	public static var NaN(default,null) : Float;
-	public static var POSITIVE_INFINITY(default,null) : Float;
-	public static var NEGATIVE_INFINITY(default,null) : Float;
+extern final class Math {
+	public static var PI(default, null):Float;
+	public static var NaN(default, null):Float;
+	public static var POSITIVE_INFINITY(default, null):Float;
+	public static var NEGATIVE_INFINITY(default, null):Float;
 
-	public static function min(a:Float,b:Float) : Float;
-	public static function max(a:Float,b:Float) : Float;
-	public static function abs( v : Float ) : Float;
-	public static function sin( v : Float ) : Float;
-	public static function cos( v : Float ) : Float;
-	public static function atan2( y : Float, x : Float ) : Float;
-	public static function tan( v : Float ) : Float;
-	public static function exp( v : Float ) : Float;
-	public static function log( v : Float ) : Float;
-	public static function sqrt( v : Float ) : Float;
-	public static function round( v : Float ) : Int;
-	public static function floor( v : Float ) : Int;
-	public static function ceil( v : Float ) : Int;
-	public static function atan( v : Float ) : Float;
-	public static function asin( v : Float ) : Float;
-	public static function acos( v : Float ) : Float;
-	public static function pow( v : Float, exp : Float ) : Float;
-	public static function fround( v : Float ) : Float;
-	public static function ffloor( v : Float ) : Float;
-	public static function fceil( v : Float ) : Float;
-	public static function random() : Float;
-	public static function isNaN(f:Float) : Bool;
-	public static function isFinite(f:Float) : Bool;
-}
\ No newline at end of file
+	public static function min(a:Float, b:Float):Float;
+	public static function max(a:Float, b:Float):Float;
+	public static function abs(v:Float):Float;
+	public static function sin(v:Float):Float;
+	public static function cos(v:Float):Float;
+	public static function atan2(y:Float, x:Float):Float;
+	public static function tan(v:Float):Float;
+	public static function exp(v:Float):Float;
+	public static function log(v:Float):Float;
+	public static function sqrt(v:Float):Float;
+	public static function round(v:Float):Int;
+	public static function floor(v:Float):Int;
+	public static function ceil(v:Float):Int;
+	public static function atan(v:Float):Float;
+	public static function asin(v:Float):Float;
+	public static function acos(v:Float):Float;
+	public static function pow(v:Float, exp:Float):Float;
+	public static function fround(v:Float):Float;
+	public static function ffloor(v:Float):Float;
+	public static function fceil(v:Float):Float;
+	public static function random():Float;
+	public static function isNaN(f:Float):Bool;
+	public static function isFinite(f:Float):Bool;
+}
diff --git a/std/neko/_std/Reflect.hx b/std/neko/_std/Reflect.hx
index 9febf2f089113b79770583c896ea9e0711957fb8..f7ffe6d59a2c74ccd1682cedf5d9d7c793578b69 100644
--- a/std/neko/_std/Reflect.hx
+++ b/std/neko/_std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,97 +20,117 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi class Reflect {
+	public static function hasField(o:Dynamic, field:String):Bool
+		untyped {
+			return $typeof(o) == $tobject && $objfield(o, $fasthash(field.__s));
+		}
 
-	public static function hasField( o : Dynamic, field : String ) : Bool untyped {
-		return $typeof(o) == $tobject && $objfield(o,$fasthash(field.__s));
-	}
-
-	public inline static function field( o : Dynamic, field : String ) : Dynamic untyped {
-		return if( $typeof(o) != $tobject ) null else $objget(o,$fasthash(field.__s));
-	}
-
-	public inline static function setField( o : Dynamic, field : String, value : Dynamic ) : Void untyped {
-		if( $typeof(o) == $tobject )
-			$objset(o,$hash(field.__s),value);
-	}
+	public inline static function field(o:Dynamic, field:String):Dynamic
+		untyped {
+			return if ($typeof(o) != $tobject) null else $objget(o, $fasthash(field.__s));
+		}
 
-	public static inline function getProperty( o : Dynamic, field : String ) : Dynamic untyped {
-		var tmp;
-		return if( $typeof(o) != $tobject ) null else if( o.__properties__ != null && (tmp=$objget(o.__properties__,$fasthash("get_".__s+field.__s))) != null ) $call($objget(o,$fasthash(tmp)),o,$array()) else $objget(o,$fasthash(field.__s));
-	}
+	public inline static function setField(o:Dynamic, field:String, value:Dynamic):Void
+		untyped {
+			if ($typeof(o) == $tobject)
+				$objset(o, $hash(field.__s), value);
+		}
 
-	public static inline function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void untyped {
-		if( $typeof(o) == $tobject ) {
+	public static inline function getProperty(o:Dynamic, field:String):Dynamic
+		untyped {
 			var tmp;
-			if( o.__properties__ != null && (tmp=$objget(o.__properties__,$fasthash("set_".__s+field.__s))) != null ) $call($objget(o,$fasthash(tmp)),o,$array(value)) else $objset(o,$hash(field.__s),value);
+			return if ($typeof(o) != $tobject) null else if (o.__properties__ != null
+				&& (tmp = $objget(o.__properties__, $fasthash("get_".__s + field.__s))) != null) $call($objget(o, $fasthash(tmp)), o, $array()) else $objget(o,
+				$fasthash(field.__s));
 		}
-	}
 
-	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
-		var a = args.__neko();
-		// pad missing args with null's
-		var n = $nargs(func);
-		if( n > $asize(a) ) {
-			var a2 = $amake(n);
-			$ablit(a2,0,a,0,$asize(a));
-			a = a2;
+	public static inline function setProperty(o:Dynamic, field:String, value:Dynamic):Void
+		untyped {
+			if ($typeof(o) == $tobject) {
+				var tmp;
+				if (o.__properties__ != null && (tmp = $objget(o.__properties__, $fasthash("set_".__s + field.__s))) != null)
+					$call($objget(o, $fasthash(tmp)), o, $array(value))
+				else
+					$objset(o, $hash(field.__s), value);
+			}
 		}
-		return $call(func,o,a);
-	}
 
-	public static function fields( o : Dynamic ) : Array<String> untyped {
-		if( $typeof(o) != $tobject )
-			return new Array<String>();
-		else {
-			var a : neko.NativeArray<Int> = $objfields(o);
-			var i = 0;
-			var hasid = false;
-			var l = $asize(a);
-			while( i < l ) {
-				var fid = a[i];
-				if( fid == -190054693 ) hasid = true; // $hash("__id__")
-				a[i] = new String($field(fid));
-				i++;
+	public static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic
+		untyped {
+			var a = args.__neko();
+			// pad missing args with null's
+			var n = $nargs(func);
+			if (n > $asize(a)) {
+				var a2 = $amake(n);
+				$ablit(a2, 0, a, 0, $asize(a));
+				a = a2;
 			}
-			var a : Array<String> = Array.new1(a, l);
-			if( hasid ) a.remove("__id__");
-			return a;
+			return $call(func, o, a);
 		}
-	}
 
-	public static function isFunction( f : Dynamic ) : Bool untyped {
-		return $typeof(f) == $tfunction;
-	}
+	public static function fields(o:Dynamic):Array<String>
+		untyped {
+			if ($typeof(o) != $tobject)
+				return new Array<String>();
+			else {
+				var a:neko.NativeArray<Int> = $objfields(o);
+				var i = 0;
+				var hasid = false;
+				var l = $asize(a);
+				while (i < l) {
+					var fid = a[i];
+					if (fid == -190054693)
+						hasid = true; // $hash("__id__")
+					a[i] = new String($field(fid));
+					i++;
+				}
+				var a:Array<String> = Array.new1(a, l);
+				if (hasid)
+					a.remove("__id__");
+				return a;
+			}
+		}
 
-	public inline static function compare<T>( a : T, b : T ) : Int {
-		return untyped $compare(a,b);
-	}
+	public static function isFunction(f:Dynamic):Bool
+		untyped {
+			return $typeof(f) == $tfunction;
+		}
 
-	public inline static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool {
-		return same_closure(f1,f2);
+	public inline static function compare<T>(a:T, b:T):Int {
+		return untyped $compare(a, b);
 	}
 
-	public static function isObject( v : Dynamic ) : Bool untyped {
-		return $typeof(v) == $tobject && v.__enum__ == null;
+	public inline static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
+		return same_closure(f1, f2);
 	}
 
-	public static function isEnumValue( v : Dynamic ) : Bool untyped {
-		return $typeof(v) == $tobject && v.__enum__ != null;
-	}
+	public static function isObject(v:Dynamic):Bool
+		untyped {
+			return $typeof(v) == $tobject && v.__enum__ == null;
+		}
 
-	public inline static function deleteField( o : Dynamic, field : String ) : Bool untyped {
-		return $objremove(o,$fasthash(field.__s));
-	}
+	public static function isEnumValue(v:Dynamic):Bool
+		untyped {
+			return $typeof(v) == $tobject && v.__enum__ != null;
+		}
 
-	public inline static function copy<T>( o : T ) : T {
+	public inline static function deleteField(o:Dynamic, field:String):Bool
+		untyped {
+			return $objremove(o, $fasthash(field.__s));
+		}
+
+	public static function copy<T>(o:Null<T>):Null<T> {
+		if (o == null)
+			return null;
 		return untyped $new(o);
 	}
 
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
-		return untyped $varargs(function(a) { return f(Array.new1(a,$asize(a))); });
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
+		return untyped $varargs(function(a) {
+			return f(Array.new1(a, $asize(a)));
+		});
 	}
 
-	static var same_closure = try neko.Lib.load("std","same_closure",2) catch( e : Dynamic ) function(f1,f2) return f1 == f2;
-
+	static var same_closure = try neko.Lib.load("std", "same_closure", 2) catch (e:Dynamic) function(f1, f2) return f1 == f2;
 }
diff --git a/std/neko/_std/Std.hx b/std/neko/_std/Std.hx
index 27b8841325602b0476354192e7f1a2304c260765..cd321ffa91184e004888a6316f4ae15e875aea97 100644
--- a/std/neko/_std/Std.hx
+++ b/std/neko/_std/Std.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,61 +20,70 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi class Std {
-
 	@:ifFeature("typed_cast")
-	public static function is( v : Dynamic, t : Dynamic ) : Bool {
-		return untyped neko.Boot.__instanceof(v,t);
+	public static function is(v:Dynamic, t:Dynamic):Bool {
+		return untyped neko.Boot.__instanceof(v, t);
 	}
 
-	public static function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
+	public static function downcast<T:{}, S:T>(value:T, c:Class<S>):S {
 		return Std.is(value, c) ? cast value : null;
 	}
 
-	public static function string( s : Dynamic ) : String {
-		return new String(untyped __dollar__string(s));
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	public static function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return inline downcast(value, c);
 	}
 
-	public static function int( x : Float ) : Int {
-		if( x < 0 ) return Math.ceil(x);
-		return Math.floor(x);
+	public static function string(s:Dynamic):String {
+		return new String(untyped __dollar__string(s));
 	}
 
-	public static function parseInt( x : String ) : Null<Int> untyped {
-		var t = __dollar__typeof(x);
-		if( t == __dollar__tint )
-			return x;
-		if( t == __dollar__tfloat )
-			return __dollar__int(x);
-		if( t != __dollar__tobject )
-			return null;
-		return __dollar__int(x.__s);
+	public static function int(x:Float):Int {
+		if (x < 0)
+			return Math.ceil(x);
+		return Math.floor(x);
 	}
 
-	public static function parseFloat( x : String ) : Float untyped {
-		if( x == null ) return Math.NaN;
-		var t = __dollar__float(x.__s);
-		if( t == null ) t = Math.NaN;
-		return t;
-	}
+	public static function parseInt(x:String):Null<Int>
+		untyped {
+			var t = __dollar__typeof(x);
+			if (t == __dollar__tint)
+				return x;
+			if (t == __dollar__tfloat)
+				return __dollar__int(x);
+			if (t != __dollar__tobject)
+				return null;
+			return __dollar__int(x.__s);
+		}
 
-	public static function random( x : Int ) : Int {
-		return untyped Math._rand_int(Math.__rnd,x);
-	}
+	public static function parseFloat(x:String):Float
+		untyped {
+			if (x == null)
+				return Math.NaN;
+			var t = __dollar__float(x.__s);
+			if (t == null)
+				t = Math.NaN;
+			return t;
+		}
 
-	static function __init__() : Void untyped {
-		Int = { __name__ : ["Int"] };
-		Float = { __name__ : ["Float"] };
-		Bool = { __ename__ : ["Bool"] };
-		Dynamic = { __name__ : ["Dynamic"] };
-		Class = { __name__ : ["Class"] };
-		Enum = {};
-		var cl = neko.Boot.__classes;
-		cl.Int = Int;
-		cl.Float = Float;
-		cl.Bool = Bool;
-		cl.Dynamic = Dynamic;
-		cl.Class = Class;
-		cl.Enum = Enum;
+	public static function random(x:Int):Int {
+		return untyped Math._rand_int(Math.__rnd, x);
 	}
 
+	static function __init__():Void
+		untyped {
+			Int = {__name__: ["Int"]};
+			Float = {__name__: ["Float"]};
+			Bool = {__ename__: ["Bool"]};
+			Dynamic = {__name__: ["Dynamic"]};
+			Class = {__name__: ["Class"]};
+			Enum = {};
+			var cl = neko.Boot.__classes;
+			cl.Int = Int;
+			cl.Float = Float;
+			cl.Bool = Bool;
+			cl.Dynamic = Dynamic;
+			cl.Class = Class;
+			cl.Enum = Enum;
+		}
 }
diff --git a/std/neko/_std/String.hx b/std/neko/_std/String.hx
index 6e849bc17d1ac4238a2936188eccf1ab6fa8edd7..19cb14c45c40c8ec250bac27e6b4270fa01e6d82 100644
--- a/std/neko/_std/String.hx
+++ b/std/neko/_std/String.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,187 +19,200 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-@:coreApi @:final class String {
+@:coreApi final class String {
+	static var __is_String = true;
+	private static var __split:Dynamic = neko.Lib.load("std", "string_split", 2);
 
-	static var __is_String;
-	private static var __split : Dynamic = neko.Lib.load("std","string_split",2);
-
-	static function __init__() : Void {
+	static function __init__():Void {
 		__is_String = true;
 	}
 
-	public var length(default,null) : Int;
+	public var length(default, null):Int;
 
-	public function new(string:String) : Void {
+	public function new(string:String):Void {
 		untyped {
-			if( __dollar__typeof(string) != __dollar__tstring )
+			if (__dollar__typeof(string) != __dollar__tstring)
 				string = __dollar__string(string);
 			this.__s = string;
 			this.length = __dollar__ssize(string);
 		}
 	}
 
-	public function charAt(index:Int) : String {
+	public function charAt(index:Int):String {
 		untyped {
 			try {
 				var s = __dollar__smake(1);
-				__dollar__sset(s,0,__dollar__sget(this.__s,index));
+				__dollar__sset(s, 0, __dollar__sget(this.__s, index));
 				return new String(s);
-			} catch( e : Dynamic ) {
+			} catch (e:Dynamic) {
 				return "";
 			}
 		}
 	}
 
-	public function charCodeAt(index : Int) : Null<Int> {
+	public function charCodeAt(index:Int):Null<Int> {
 		untyped {
-			return __dollar__sget(this.__s,index);
+			return __dollar__sget(this.__s, index);
 		}
 	}
 
-	public function indexOf( str : String, ?startIndex : Int ) : Int {
+	public function indexOf(str:String, ?startIndex:Int):Int {
 		untyped {
-			var p = try __dollar__sfind(this.__s,if( startIndex == null ) 0 else startIndex,str.__s) catch( e : Dynamic ) null;
-			if( p == null )
+			var l = __dollar__ssize(this.__s);
+			if (startIndex == null || startIndex < -l)
+				startIndex = 0;
+			if (startIndex > l)
+				return -1;
+			if (__dollar__ssize(str.__s) == 0)
+				return startIndex < 0 ? l + startIndex : startIndex;
+			var p = try __dollar__sfind(this.__s, startIndex, str.__s) catch (e:Dynamic) null;
+			if (p == null)
 				return -1;
 			return p;
 		}
 	}
 
-	public function lastIndexOf( str : String, ?startIndex : Int ) : Int {
+	public function lastIndexOf(str:String, ?startIndex:Int):Int {
 		untyped {
 			var last = -1;
-			if( startIndex == null )
-				startIndex = __dollar__ssize(this.__s);
-			while( true ) {
-				var p = try __dollar__sfind(this.__s,last+1,str.__s) catch( e : Dynamic ) null;
-				if( p == null || p > startIndex )
+			var l = __dollar__ssize(this.__s);
+			if (startIndex == null)
+				startIndex = l;
+			if (__dollar__ssize(str.__s) == 0)
+				return startIndex > l ? l : startIndex;
+			while (true) {
+				var p = try __dollar__sfind(this.__s, last + 1, str.__s) catch (e:Dynamic) null;
+				if (p == null || p > startIndex)
 					return last;
 				last = p;
 			}
 		}
 	}
 
-	public function split( delimiter : String ) : Array<String> {
+	public function split(delimiter:String):Array<String> {
 		untyped {
-			var l = __split(this.__s,delimiter.__s);
+			var l = __split(this.__s, delimiter.__s);
 			var a = new Array<String>();
-			if( l == null ) {
+			if (l == null) {
 				a.push("");
 				return a;
 			}
 			do {
 				a.push(new String(l[0]));
 				l = l[1];
-			} while( l != null );
+			} while (l != null);
 			return a;
 		}
 	}
 
-	public function substr( pos : Int, ?len : Int ) : String {
-		if( len == 0 ) return "";
+	public function substr(pos:Int, ?len:Int):String {
+		if (len == 0)
+			return "";
 		var sl = length;
 
-		if( len == null ) len = sl;
+		if (len == null)
+			len = sl;
 
-		if( pos == null ) pos = 0;
-		if( pos != 0 && len < 0 ){
+		if (pos == null)
+			pos = 0;
+		if (pos != 0 && len < 0) {
 			return "";
 		}
 
-		if( pos < 0 ){
+		if (pos < 0) {
 			pos = sl + pos;
-			if( pos < 0 ) pos = 0;
-		}else if( len < 0 ){
+			if (pos < 0)
+				pos = 0;
+		} else if (len < 0) {
 			len = sl + len - pos;
 		}
 
-		if( pos + len > sl ){
+		if (pos + len > sl) {
 			len = sl - pos;
 		}
 
-		if( pos < 0 || len <= 0 ) return "";
-		return new String(untyped __dollar__ssub(this.__s,pos,len));
+		if (pos < 0 || len <= 0)
+			return "";
+		return new String(untyped __dollar__ssub(this.__s, pos, len));
 	}
 
-	public function substring( startIndex : Int, ?endIndex : Int ) : String {
-		if ( endIndex == null) {
+	public function substring(startIndex:Int, ?endIndex:Int):String {
+		if (endIndex == null) {
 			endIndex = length;
-		} else if ( endIndex < 0 ) {
+		} else if (endIndex < 0) {
 			endIndex = 0;
-		} else if ( endIndex > length ) {
+		} else if (endIndex > length) {
 			endIndex = length;
 		}
 
-		if ( startIndex < 0 ) {
+		if (startIndex < 0) {
 			startIndex = 0;
-		} else if ( startIndex > length ) {
+		} else if (startIndex > length) {
 			startIndex = length;
 		}
 
-		if ( startIndex > endIndex ) {
+		if (startIndex > endIndex) {
 			var tmp = startIndex;
 			startIndex = endIndex;
 			endIndex = tmp;
 		}
 
-		return substr( startIndex, endIndex - startIndex );
+		return substr(startIndex, endIndex - startIndex);
 	}
 
-	public function toLowerCase() : String {
+	public function toLowerCase():String {
 		untyped {
 			var s = this.__s;
 			var l = this.length;
 			var s2 = __dollar__scopy(s);
 			var i = 0;
-			while( i < l ) {
-				var c = __dollar__sget(s,i);
-				if( c >= 65 && c <= 90 )
-					__dollar__sset(s2,i,c-65+97);
+			while (i < l) {
+				var c = __dollar__sget(s, i);
+				if (c >= 65 && c <= 90)
+					__dollar__sset(s2, i, c - 65 + 97);
 				i++;
 			}
 			return new String(s2);
 		}
 	}
 
-	public function toUpperCase() : String {
+	public function toUpperCase():String {
 		untyped {
 			var s = this.__s;
 			var l = this.length;
 			var s2 = __dollar__scopy(s);
 			var i = 0;
-			while( i < l ) {
-				var c = __dollar__sget(s,i);
-				if( c >= 97 && c <= 122 )
-					__dollar__sset(s2,i,c-97+65);
+			while (i < l) {
+				var c = __dollar__sget(s, i);
+				if (c >= 97 && c <= 122)
+					__dollar__sset(s2, i, c - 97 + 65);
 				i++;
 			}
 			return new String(s2);
 		}
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		return this;
 	}
 
 	/* NEKO INTERNALS */
-
-	private function __compare(o:String) : Int {
-		return untyped __dollar__compare(this.__s,o.__s);
+	private function __compare(o:String):Int {
+		return untyped __dollar__compare(this.__s, o.__s);
 	}
 
-	private function __add(s:Dynamic) : String {
-		return new String(untyped this.__s+__dollar__string(s));
+	private function __add(s:Dynamic):String {
+		return new String(untyped this.__s + __dollar__string(s));
 	}
 
-	private function __radd(s:Dynamic) : String {
-		return new String(untyped __dollar__string(s)+this.__s);
-	}
-
-	public static function fromCharCode( code : Int ) : String untyped {
-		var s = __dollar__smake(1);
-		__dollar__sset(s,0,code);
-		return new String(s);
+	private function __radd(s:Dynamic):String {
+		return new String(untyped __dollar__string(s) + this.__s);
 	}
 
+	public static function fromCharCode(code:Int):String
+		untyped {
+			var s = __dollar__smake(1);
+			__dollar__sset(s, 0, code);
+			return new String(s);
+		}
 }
diff --git a/std/neko/_std/StringBuf.hx b/std/neko/_std/StringBuf.hx
index 5f594f047c04c42950e99c27ebf7e816a5cc2a32..32a9e29ec5384f34bef1043ae2a9bea0cf0da040 100644
--- a/std/neko/_std/StringBuf.hx
+++ b/std/neko/_std/StringBuf.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,40 +20,39 @@
  * DEALINGS IN THE SOFTWARE.
  */
 @:coreApi class StringBuf {
+	private var b:Dynamic;
 
-	private var b : Dynamic;
+	public var length(get, never):Int;
 
-	public var length(get,never) : Int;
-
-	public function new() : Void {
+	public function new():Void {
 		b = __make();
 	}
 
-	function get_length() : Int {
-		return __get_length == null ? untyped __dollar__ssize( __to_string(b) ) : __get_length(b);
+	function get_length():Int {
+		return __get_length == null ? untyped __dollar__ssize(__to_string(b)) : __get_length(b);
 	}
 
-	public inline function add<T>( x : T ) : Void {
-		__add(b,x);
+	public inline function add<T>(x:T):Void {
+		__add(b, x);
 	}
 
-	public inline function addSub( s : String, pos : Int, ?len : Int ) : Void {
-		__add_sub(b,untyped s.__s,pos,len == null ? s.length - pos : len);
+	public inline function addSub(s:String, pos:Int, ?len:Int):Void {
+		__add_sub(b, untyped s.__s, pos, len == null ? s.length - pos : len);
 	}
 
-	public inline function addChar( c : Int ) : Void untyped {
-		__add_char(b,c);
-	}
+	public inline function addChar(c:Int):Void
+		untyped {
+			__add_char(b, c);
+		}
 
-	public inline function toString() : String {
+	public inline function toString():String {
 		return new String(__to_string(b));
 	}
 
-	static var __make : Dynamic = neko.Lib.load("std","buffer_new",0);
-	static var __add : Dynamic = neko.Lib.load("std","buffer_add",2);
-	static var __add_char : Dynamic = neko.Lib.load("std","buffer_add_char",2);
-	static var __add_sub : Dynamic = neko.Lib.load("std","buffer_add_sub",4);
-	static var __to_string : Dynamic = neko.Lib.load("std","buffer_string",1);
-	static var __get_length : Dynamic = try neko.Lib.load("std","buffer_get_length",1) catch( e : Dynamic ) null;
-
+	static var __make:Dynamic = neko.Lib.load("std", "buffer_new", 0);
+	static var __add:Dynamic = neko.Lib.load("std", "buffer_add", 2);
+	static var __add_char:Dynamic = neko.Lib.load("std", "buffer_add_char", 2);
+	static var __add_sub:Dynamic = neko.Lib.load("std", "buffer_add_sub", 4);
+	static var __to_string:Dynamic = neko.Lib.load("std", "buffer_string", 1);
+	static var __get_length:Dynamic = try neko.Lib.load("std", "buffer_get_length", 1) catch (e:Dynamic) null;
 }
diff --git a/std/neko/_std/Sys.hx b/std/neko/_std/Sys.hx
index 0fdb3e584ef674853c66ff47e6901c3b33c614c6..ed519417bc3b102419075244789b8372c2861bb4 100644
--- a/std/neko/_std/Sys.hx
+++ b/std/neko/_std/Sys.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+import haxe.SysTools;
+
 @:coreApi class Sys {
 
 	public static function print( v : Dynamic ) : Void {
@@ -99,11 +101,11 @@
 				case "Windows":
 					cmd = [
 						for (a in [StringTools.replace(cmd, "/", "\\")].concat(args))
-						StringTools.quoteWinArg(a, true)
+						SysTools.quoteWinArg(a, true)
 					].join(" ");
 					return sys_command(untyped cmd.__s);
 				case _:
-					cmd = [cmd].concat(args).map(StringTools.quoteUnixArg).join(" ");
+					cmd = [cmd].concat(args).map(SysTools.quoteUnixArg).join(" ");
 					return sys_command(untyped cmd.__s);
 			}
 		}
@@ -163,18 +165,27 @@
 	// It has to be initialized before any call to loadModule or Sys.setCwd()...
 	private static var sys_program_path = {
 		var m = neko.vm.Module.local().name;
-		try {
-			sys.FileSystem.fullPath(m);
-		} catch (e:Dynamic) {
-			// maybe the neko module name was supplied without .n extension...
-			if (!StringTools.endsWith(m, ".n")) {
-				try {
-					sys.FileSystem.fullPath(m + ".n");
-				} catch (e:Dynamic) {
+		if (m == "") { // it is likely neko embedded in an exe
+			var exe = new String(sys_exe_path());
+			try {
+				sys.FileSystem.fullPath(exe);
+			} catch (e:Dynamic) {
+				exe;
+			}
+		} else {
+			try {
+				sys.FileSystem.fullPath(m);
+			} catch (e:Dynamic) {
+				// maybe the neko module name was supplied without .n extension...
+				if (!StringTools.endsWith(m, ".n")) {
+					try {
+						sys.FileSystem.fullPath(m + ".n");
+					} catch (e:Dynamic) {
+						m;
+					}
+				} else {
 					m;
 				}
-			} else {
-				m;
 			}
 		}
 	}
diff --git a/std/neko/_std/Type.hx b/std/neko/_std/Type.hx
index 7154dc337ce08e818f461570ec2e901810a79cfd..135b331ade03d1e06c92fd732f1d79c97f3b62c6 100644
--- a/std/neko/_std/Type.hx
+++ b/std/neko/_std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/std/neko/_std/haxe/Utf8.hx b/std/neko/_std/haxe/Utf8.hx
index 0cc45b87cc1adc615fdf2a64fd4cfb92d94c7e1b..40f3c8d0fb08421953ba9b3eb0b9a18c7d168f68 100644
--- a/std/neko/_std/haxe/Utf8.hx
+++ b/std/neko/_std/haxe/Utf8.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,89 +19,89 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 @:coreApi
+@:deprecated('haxe.Utf8 is deprecated. Use UnicodeString instead.')
 class Utf8 {
+	var __b:Dynamic;
 
-	var __b : Dynamic;
-
-	public function new( ?size : Int ) : Void {
-		__b = utf8_buf_alloc(if( size == null ) 1 else size);
+	public function new(?size:Int):Void {
+		__b = utf8_buf_alloc(if (size == null) 1 else size);
 	}
 
-	public function addChar( c : Int ) : Void {
-		utf8_buf_add(__b,c);
+	public function addChar(c:Int):Void {
+		utf8_buf_add(__b, c);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		return new String(utf8_buf_content(__b));
 	}
 
-	public static function encode( s : String ) : String {
+	public static function encode(s:String):String {
 		s = untyped s.__s;
 		var sl = untyped __dollar__ssize(s);
-		var buf:Dynamic = utf8_buf_alloc( sl );
+		var buf:Dynamic = utf8_buf_alloc(sl);
 		var i = 0;
-		while( i < sl ) {
-			utf8_buf_add(buf,untyped __dollar__sget(s,i));
+		while (i < sl) {
+			utf8_buf_add(buf, untyped __dollar__sget(s, i));
 			i += 1;
 		}
-		return new String( utf8_buf_content(buf) );
+		return new String(utf8_buf_content(buf));
 	}
 
-	public static function decode( s : String ) : String {
+	public static function decode(s:String):String {
 		s = untyped s.__s;
 		var sl = untyped __dollar__ssize(s);
 		var ret = untyped __dollar__smake(sl);
 		var i = 0;
-		utf8_iter(s,function(c) {
-			if( c == 8364 ) // euro symbol
+		utf8_iter(s, function(c) {
+			if (c == 8364) // euro symbol
 				c = 164;
-			else if( c == 0xFEFF ) // BOM
+			else if (c == 0xFEFF) // BOM
 				return;
-			else if( c > 255 )
-				throw "Utf8::decode invalid character ("+c+")";
-			untyped __dollar__sset(ret,i,c);
+			else if (c > 255)
+				throw "Utf8::decode invalid character (" + c + ")";
+			untyped __dollar__sset(ret, i, c);
 			i += 1;
 		});
-		return new String( untyped __dollar__ssub(ret,0,i) );
+		return new String(untyped __dollar__ssub(ret, 0, i));
 	}
 
-	public static function iter( s : String, chars : Int -> Void ) : Void {
-		utf8_iter(untyped s.__s,chars);
+	public static function iter(s:String, chars:Int->Void):Void {
+		utf8_iter(untyped s.__s, chars);
 	}
 
-	public static function charCodeAt( s : String, index : Int ) : Int {
-		return utf8_get(untyped s.__s,index);
+	public static function charCodeAt(s:String, index:Int):Int {
+		return utf8_get(untyped s.__s, index);
 	}
 
-	public static function validate( s : String ) : Bool {
+	public static function validate(s:String):Bool {
 		return utf8_validate(untyped s.__s);
 	}
 
-	public static function length( s : String ) : Int {
+	public static function length(s:String):Int {
 		return utf8_length(untyped s.__s);
 	}
 
-	public static function compare( a : String, b : String ) : Int {
-		return utf8_compare(untyped a.__s,untyped b.__s);
+	public static function compare(a:String, b:String):Int {
+		return utf8_compare(untyped a.__s, untyped b.__s);
 	}
 
-	public static function sub( s : String, pos : Int, len : Int ) : String {
-		return new String(utf8_sub(untyped s.__s,pos,len));
+	public static function sub(s:String, pos:Int, len:Int):String {
+		return new String(utf8_sub(untyped s.__s, pos, len));
 	}
 
-	static var utf8_buf_alloc = neko.Lib.load("std","utf8_buf_alloc",1);
-	static var utf8_buf_add = neko.Lib.load("std","utf8_buf_add",2);
-	static var utf8_buf_content = neko.Lib.load("std","utf8_buf_content",1);
-	static var utf8_buf_length = neko.Lib.load("std","utf8_buf_length",1);
-	static var utf8_iter = neko.Lib.load("std","utf8_iter",2);
-
-	static var utf8_get = neko.Lib.load("std","utf8_get",2);
-	static var utf8_validate = neko.Lib.load("std","utf8_validate",1);
-	static var utf8_length = neko.Lib.load("std","utf8_length",1);
-	static var utf8_compare = neko.Lib.load("std","utf8_compare",2);
-	static var utf8_sub = neko.Lib.load("std","utf8_sub",3);
-
-}
\ No newline at end of file
+	static var utf8_buf_alloc = neko.Lib.load("std", "utf8_buf_alloc", 1);
+	static var utf8_buf_add = neko.Lib.load("std", "utf8_buf_add", 2);
+	static var utf8_buf_content = neko.Lib.load("std", "utf8_buf_content", 1);
+	static var utf8_buf_length = neko.Lib.load("std", "utf8_buf_length", 1);
+	static var utf8_iter = neko.Lib.load("std", "utf8_iter", 2);
+
+	static var utf8_get = neko.Lib.load("std", "utf8_get", 2);
+	static var utf8_validate = neko.Lib.load("std", "utf8_validate", 1);
+	static var utf8_length = neko.Lib.load("std", "utf8_length", 1);
+	static var utf8_compare = neko.Lib.load("std", "utf8_compare", 2);
+	static var utf8_sub = neko.Lib.load("std", "utf8_sub", 3);
+}
diff --git a/std/neko/_std/haxe/ds/IntMap.hx b/std/neko/_std/haxe/ds/IntMap.hx
index 39cec94137ad8c4b0043871997763a296ebf7c7e..330a02ca9fd2213a1e8d2bb77e4616496c64acaf 100644
--- a/std/neko/_std/haxe/ds/IntMap.hx
+++ b/std/neko/_std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,57 +19,75 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.ds;
 
-@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
+package haxe.ds;
 
-	private var h : Dynamic;
+@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
+	private var h:Dynamic;
 
-	public function new() : Void {
+	public function new():Void {
 		h = untyped __dollar__hnew(0);
 	}
 
-	public inline function set( key : Int, value : T ) : Void {
-		untyped __dollar__hset(h,key,value,null);
+	public inline function set(key:Int, value:T):Void {
+		untyped __dollar__hset(h, key, value, null);
 	}
 
-	public function get( key : Int ) : Null<T> {
-		return untyped __dollar__hget(h,key,null);
+	public function get(key:Int):Null<T> {
+		return untyped __dollar__hget(h, key, null);
 	}
 
-	public inline function exists( key : Int ) : Bool {
-		return untyped __dollar__hmem(h,key,null);
+	public inline function exists(key:Int):Bool {
+		return untyped __dollar__hmem(h, key, null);
 	}
 
-	public inline function remove( key : Int ) : Bool {
-		return untyped __dollar__hremove(h,key,null);
+	public inline function remove(key:Int):Bool {
+		return untyped __dollar__hremove(h, key, null);
 	}
 
-	public function keys() : Iterator<Int> {
+	public function keys():Iterator<Int> {
 		var l = new List<Int>();
-		untyped __dollar__hiter(h,function(k,_) { l.push(k); });
+		untyped __dollar__hiter(h, function(k, _) {
+			l.push(k);
+		});
 		return l.iterator();
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		var l = new List<T>();
-		untyped __dollar__hiter(h,function(_,v) { l.push(v); });
+		untyped __dollar__hiter(h, function(_, v) {
+			l.push(v);
+		});
 		return l.iterator();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():IntMap<T> {
+		var copied = new IntMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
+	public inline function clear():Void {
+		h = untyped __dollar__hnew(0);
+	}
 }
diff --git a/std/neko/_std/haxe/ds/ObjectMap.hx b/std/neko/_std/haxe/ds/ObjectMap.hx
index f30cd3e8860a76a7ebc52f87b13d72e52cf3bb9b..c4d959c9367c4704266f9856a6212c0cb4337f26 100644
--- a/std/neko/_std/haxe/ds/ObjectMap.hx
+++ b/std/neko/_std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of h software and associated documentation files (the "Software"),
@@ -19,75 +19,96 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 @:coreApi
-class ObjectMap<K:{},V> implements haxe.Constraints.IMap<K,V> {
-
+class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
 	static var count = 0;
 
-	static inline function assignId(obj: { } ):Int {
+	static inline function assignId(obj:{}):Int {
 		var newId = count++;
 		untyped obj.__id__ = newId;
 		return newId;
 	}
 
-	static inline function getId(obj: { } ):Int {
+	static inline function getId(obj:{}):Int {
 		return untyped obj.__id__;
 	}
 
-	var h : { };
-	var k : { };
+	var h:{};
+	var k:{};
 
-	public function new() : Void {
+	public function new():Void {
 		h = untyped __dollar__hnew(0);
 		k = untyped __dollar__hnew(0);
 	}
 
-	public inline function set( key : K, value : V ) : Void untyped {
-		var id = key.__id__ != null ? key.__id__ : assignId(key);
-		untyped __dollar__hset(h,id,value,null);
-		untyped __dollar__hset(k,id,key,null);
-	}
+	public inline function set(key:K, value:V):Void
+		untyped {
+			var id = key.__id__ != null ? key.__id__ : assignId(key);
+			untyped __dollar__hset(h, id, value, null);
+			untyped __dollar__hset(k, id, key, null);
+		}
 
-	public function get( key : K ) : Null<V> {
-		return untyped __dollar__hget(h,getId(key),null);
+	public function get(key:K):Null<V> {
+		return untyped __dollar__hget(h, getId(key), null);
 	}
 
-	public inline function exists( key : K ) : Bool {
-		return untyped __dollar__hmem(h,getId(key),null);
+	public inline function exists(key:K):Bool {
+		return untyped __dollar__hmem(h, getId(key), null);
 	}
 
-	public function remove( key : K ) : Bool {
+	public function remove(key:K):Bool {
 		var id = getId(key);
-		untyped __dollar__hremove(h,id,null);
-		return untyped __dollar__hremove(k,id,null);
+		untyped __dollar__hremove(h, id, null);
+		return untyped __dollar__hremove(k, id, null);
 	}
 
-	public function keys() : Iterator<K> {
+	public function keys():Iterator<K> {
 		var l = new List<K>();
-		untyped __dollar__hiter(k,function(_,v) { l.push(v); });
+		untyped __dollar__hiter(k, function(_, v) {
+			l.push(v);
+		});
 		return l.iterator();
 	}
 
-	public function iterator() : Iterator<V> {
+	public function iterator():Iterator<V> {
 		var l = new List<V>();
-		untyped __dollar__hiter(h,function(_,v) { l.push(v); });
+		untyped __dollar__hiter(h, function(_, v) {
+			l.push(v);
+		});
 		return l.iterator();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():ObjectMap<K, V> {
+		var copied = new ObjectMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(Std.string(i));
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
+
+	public inline function clear():Void {
+		h = untyped __dollar__hnew(0);
+		k = untyped __dollar__hnew(0);
+	}
 }
diff --git a/std/neko/_std/haxe/ds/StringMap.hx b/std/neko/_std/haxe/ds/StringMap.hx
index c9437d989369add9f6143f59b235c97faa404900..4582e63ed383510546ec8e93ee9a810010de59ff 100644
--- a/std/neko/_std/haxe/ds/StringMap.hx
+++ b/std/neko/_std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,57 +19,75 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.ds;
 
-@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String,T> {
+package haxe.ds;
 
-	private var h : Dynamic;
+@:coreApi class StringMap<T> implements haxe.Constraints.IMap<String, T> {
+	private var h:Dynamic;
 
-	public function new() : Void {
+	public function new():Void {
 		h = untyped __dollar__hnew(0);
 	}
 
-	public inline function set( key : String, value : T ) : Void {
-		untyped __dollar__hset(h,key.__s,value,null);
+	public inline function set(key:String, value:T):Void {
+		untyped __dollar__hset(h, key.__s, value, null);
 	}
 
-	public inline function get( key : String ) : Null<T> {
-		return untyped __dollar__hget(h,key.__s,null);
+	public inline function get(key:String):Null<T> {
+		return untyped __dollar__hget(h, key.__s, null);
 	}
 
-	public inline function exists( key : String ) : Bool {
-		return untyped __dollar__hmem(h,key.__s,null);
+	public inline function exists(key:String):Bool {
+		return untyped __dollar__hmem(h, key.__s, null);
 	}
 
-	public inline function remove( key : String ) : Bool {
-		return untyped __dollar__hremove(h,key.__s,null);
+	public inline function remove(key:String):Bool {
+		return untyped __dollar__hremove(h, key.__s, null);
 	}
 
-	public function keys() : Iterator<String> {
+	public function keys():Iterator<String> {
 		var l = new List<String>();
-		untyped __dollar__hiter(h,function(k,_) { l.push(new String(k)); });
+		untyped __dollar__hiter(h, function(k, _) {
+			l.push(new String(k));
+		});
 		return l.iterator();
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		var l = new List<T>();
-		untyped __dollar__hiter(h,function(_,v) { l.push(v); });
+		untyped __dollar__hiter(h, function(_, v) {
+			l.push(v);
+		});
 		return l.iterator();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():StringMap<T> {
+		var copied = new StringMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
 
+	public inline function clear():Void {
+		h = untyped __dollar__hnew(0);
+	}
 }
diff --git a/std/neko/_std/haxe/zip/Compress.hx b/std/neko/_std/haxe/zip/Compress.hx
index 537dbb6f3932bf8cbe9c680413c370ffb8870f79..cc300b5e34379ade5636f658363578b54df0c925 100644
--- a/std/neko/_std/haxe/zip/Compress.hx
+++ b/std/neko/_std/haxe/zip/Compress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,44 +19,43 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 @:coreApi
 class Compress {
+	var s:Dynamic;
 
-	var s : Dynamic;
-
-	public function new( level : Int ) : Void {
+	public function new(level:Int):Void {
 		s = _deflate_init(level);
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
-		return _deflate_buffer(s,src.getData(),srcPos,dst.getData(),dstPos);
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
+		return _deflate_buffer(s, src.getData(), srcPos, dst.getData(), dstPos);
 	}
 
-	public function setFlushMode( f : FlushMode ) : Void {
-		_set_flush_mode(s,untyped Std.string(f).__s);
+	public function setFlushMode(f:FlushMode):Void {
+		_set_flush_mode(s, untyped Std.string(f).__s);
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		_deflate_end(s);
 	}
 
-	public static function run( s : haxe.io.Bytes, level : Int ) : haxe.io.Bytes {
+	public static function run(s:haxe.io.Bytes, level:Int):haxe.io.Bytes {
 		var c = new Compress(level);
 		c.setFlushMode(FlushMode.FINISH);
-		var out = haxe.io.Bytes.alloc(_deflate_bound(c.s,s.length));
-		var r = c.execute(s,0,out,0);
+		var out = haxe.io.Bytes.alloc(_deflate_bound(c.s, s.length));
+		var r = c.execute(s, 0, out, 0);
 		c.close();
-		if( !r.done || r.read != s.length )
+		if (!r.done || r.read != s.length)
 			throw "Compression failed";
-		return out.sub(0,r.write);
+		return out.sub(0, r.write);
 	}
 
-	static var _deflate_init = neko.Lib.load("zlib","deflate_init",1);
-	static var _deflate_bound = neko.Lib.load("zlib","deflate_bound",2);
-	static var _deflate_buffer = neko.Lib.load("zlib","deflate_buffer",5);
-	static var _deflate_end = neko.Lib.load("zlib","deflate_end",1);
-	static var _set_flush_mode = neko.Lib.load("zlib","set_flush_mode",2);
-
+	static var _deflate_init = neko.Lib.load("zlib", "deflate_init", 1);
+	static var _deflate_bound = neko.Lib.load("zlib", "deflate_bound", 2);
+	static var _deflate_buffer = neko.Lib.load("zlib", "deflate_buffer", 5);
+	static var _deflate_end = neko.Lib.load("zlib", "deflate_end", 1);
+	static var _set_flush_mode = neko.Lib.load("zlib", "set_flush_mode", 2);
 }
diff --git a/std/neko/_std/haxe/zip/Uncompress.hx b/std/neko/_std/haxe/zip/Uncompress.hx
index 12797366c1f2e5ca56d9a7f7ca53660e27459a86..1f66f54e103ca010c71bf8b28eb47d877ef76365 100644
--- a/std/neko/_std/haxe/zip/Uncompress.hx
+++ b/std/neko/_std/haxe/zip/Uncompress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,50 +19,50 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 @:coreApi
 class Uncompress {
+	var s:Dynamic;
 
-	var s : Dynamic;
-
-	public function new( ?windowBits : Int ) : Void {
+	public function new(?windowBits:Int):Void {
 		s = _inflate_init(windowBits);
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
-		return _inflate_buffer(s,src.getData(),srcPos,dst.getData(),dstPos);
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
+		return _inflate_buffer(s, src.getData(), srcPos, dst.getData(), dstPos);
 	}
 
-	public function setFlushMode( f : FlushMode ) : Void {
-		_set_flush_mode(s,untyped Std.string(f).__s);
+	public function setFlushMode(f:FlushMode):Void {
+		_set_flush_mode(s, untyped Std.string(f).__s);
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		_inflate_end(s);
 	}
 
-	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
+	public static function run(src:haxe.io.Bytes, ?bufsize:Int):haxe.io.Bytes {
 		var u = new Uncompress(null);
-		if( bufsize == null ) bufsize = 1 << 16; // 64K
+		if (bufsize == null)
+			bufsize = 1 << 16; // 64K
 		var tmp = haxe.io.Bytes.alloc(bufsize);
 		var b = new haxe.io.BytesBuffer();
 		var pos = 0;
 		u.setFlushMode(FlushMode.SYNC);
-		while( true ) {
-			var r = u.execute(src,pos,tmp,0);
-			b.addBytes(tmp,0,r.write);
+		while (true) {
+			var r = u.execute(src, pos, tmp, 0);
+			b.addBytes(tmp, 0, r.write);
 			pos += r.read;
-			if( r.done )
+			if (r.done)
 				break;
 		}
 		u.close();
 		return b.getBytes();
 	}
 
-	static var _inflate_init = neko.Lib.load("zlib","inflate_init",1);
-	static var _inflate_buffer = neko.Lib.load("zlib","inflate_buffer",5);
-	static var _inflate_end = neko.Lib.load("zlib","inflate_end",1);
-	static var _set_flush_mode = neko.Lib.load("zlib","set_flush_mode",2);
-
+	static var _inflate_init = neko.Lib.load("zlib", "inflate_init", 1);
+	static var _inflate_buffer = neko.Lib.load("zlib", "inflate_buffer", 5);
+	static var _inflate_end = neko.Lib.load("zlib", "inflate_end", 1);
+	static var _set_flush_mode = neko.Lib.load("zlib", "set_flush_mode", 2);
 }
diff --git a/std/neko/_std/sys/FileSystem.hx b/std/neko/_std/sys/FileSystem.hx
index 4c4bd8754926393251b6e0588b1639cbc635a11f..566ca50f72acd8aef80c5ada446883477a479c1e 100644
--- a/std/neko/_std/sys/FileSystem.hx
+++ b/std/neko/_std/sys/FileSystem.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,56 +19,57 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys;
 
 private enum FileKind {
 	kdir;
 	kfile;
-	kother( k : String );
+	kother(k:String);
 }
 
 @:coreApi
 class FileSystem {
-
-	public static function exists( path : String ) : Bool {
+	public static function exists(path:String):Bool {
 		return sys_exists(untyped (makeCompatiblePath(path)).__s);
 	}
 
-	public static function rename( path : String, newPath : String ) : Void {
-		untyped sys_rename(path.__s,newPath.__s);
+	public static function rename(path:String, newPath:String):Void {
+		untyped sys_rename(path.__s, newPath.__s);
 	}
 
-	public static function stat( path : String ) : FileStat {
-		var s : FileStat = sys_stat(untyped (makeCompatiblePath(path)).__s);
+	public static function stat(path:String):FileStat {
+		var s:FileStat = sys_stat(untyped (makeCompatiblePath(path)).__s);
 		s.atime = untyped Date.new1(s.atime);
 		s.mtime = untyped Date.new1(s.mtime);
 		s.ctime = untyped Date.new1(s.ctime);
 		return s;
 	}
 
-	public static function fullPath( relPath : String ) : String {
+	public static function fullPath(relPath:String):String {
 		return new String(file_full_path(untyped relPath.__s));
 	}
 
-	public static function absolutePath ( relPath : String ) : String {
-		if (haxe.io.Path.isAbsolute(relPath)) return relPath;
+	public static function absolutePath(relPath:String):String {
+		if (haxe.io.Path.isAbsolute(relPath))
+			return relPath;
 		return haxe.io.Path.join([Sys.getCwd(), relPath]);
 	}
 
-	static function kind( path : String ) : FileKind {
+	static function kind(path:String):FileKind {
 		var k = new String(sys_file_type(untyped (makeCompatiblePath(path)).__s));
-		return switch(k) {
-		case "file": kfile;
-		case "dir": kdir;
-		default: kother(k);
+		return switch (k) {
+			case "file": kfile;
+			case "dir": kdir;
+			default: kother(k);
 		}
 	}
 
-	public static inline function isDirectory( path : String ) : Bool {
+	public static inline function isDirectory(path:String):Bool {
 		return kind(path) == kdir;
 	}
 
-	public static function createDirectory( path : String ) : Void {
+	public static function createDirectory(path:String):Void {
 		var path = haxe.io.Path.addTrailingSlash(path);
 		var _p = null;
 		var parts = [];
@@ -78,22 +79,22 @@ class FileSystem {
 		}
 		for (part in parts) {
 			if (part.charCodeAt(part.length - 1) != ":".code && !exists(part))
-				sys_create_dir( untyped part.__s, 493 );
+				sys_create_dir(untyped part.__s, 493);
 		}
 	}
 
-	public static function deleteFile( path : String ) : Void {
+	public static function deleteFile(path:String):Void {
 		file_delete(untyped path.__s);
 	}
 
-	public static function deleteDirectory( path : String ) : Void {
+	public static function deleteDirectory(path:String):Void {
 		sys_remove_dir(untyped path.__s);
 	}
 
-	public static function readDirectory( path : String ) : Array<String> {
-		var l : Array<Dynamic> = sys_read_dir(untyped path.__s);
+	public static function readDirectory(path:String):Array<String> {
+		var l:Array<Dynamic> = sys_read_dir(untyped path.__s);
 		var a = new Array();
-		while( l != null ) {
+		while (l != null) {
 			a.push(new String(l[0]));
 			l = l[1];
 		}
@@ -103,19 +104,20 @@ class FileSystem {
 	private static inline function makeCompatiblePath(path:String):String {
 		return if (path.charCodeAt(1) == ":".code && path.length <= 3) {
 			haxe.io.Path.addTrailingSlash(path);
+		} else if (path == "/") {
+			"/";
 		} else {
 			haxe.io.Path.removeTrailingSlashes(path);
 		}
 	}
 
-	private static var sys_exists = neko.Lib.load("std","sys_exists",1);
-	private static var file_delete = neko.Lib.load("std","file_delete",1);
-	private static var sys_rename = neko.Lib.load("std","sys_rename",2);
-	private static var sys_stat = neko.Lib.load("std","sys_stat",1);
-	private static var sys_file_type = neko.Lib.load("std","sys_file_type",1);
-	private static var sys_create_dir = neko.Lib.load("std","sys_create_dir",2);
-	private static var sys_remove_dir = neko.Lib.load("std","sys_remove_dir",1);
-	private static var sys_read_dir = neko.Lib.load("std","sys_read_dir",1);
-	private static var file_full_path = neko.Lib.load("std","file_full_path",1);
-
+	private static var sys_exists = neko.Lib.load("std", "sys_exists", 1);
+	private static var file_delete = neko.Lib.load("std", "file_delete", 1);
+	private static var sys_rename = neko.Lib.load("std", "sys_rename", 2);
+	private static var sys_stat = neko.Lib.load("std", "sys_stat", 1);
+	private static var sys_file_type = neko.Lib.load("std", "sys_file_type", 1);
+	private static var sys_create_dir = neko.Lib.load("std", "sys_create_dir", 2);
+	private static var sys_remove_dir = neko.Lib.load("std", "sys_remove_dir", 1);
+	private static var sys_read_dir = neko.Lib.load("std", "sys_read_dir", 1);
+	private static var file_full_path = neko.Lib.load("std", "file_full_path", 1);
 }
diff --git a/std/neko/_std/sys/db/Mysql.hx b/std/neko/_std/sys/db/Mysql.hx
index a4e523a5520dbfb70c8f37ffc79206bbbbff8a02..7856feb6ca102ea634036e4bf9a8239fa6459676 100644
--- a/std/neko/_std/sys/db/Mysql.hx
+++ b/std/neko/_std/sys/db/Mysql.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,37 +19,39 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
 private class D {
-
-	static function load(fun,args) : Dynamic {
-		return neko.Lib.load(lib,fun,args);
-	}
-
-	static var lib = try { neko.Lib.load("mysql5","connect",1); "mysql5"; } catch( e : Dynamic ) "mysql";
-	public static var connect = load("connect",1);
-	public static var select_db = load("select_db",2);
-	public static var request = load("request",2);
-	public static var close = load("close",1);
+	static function load(fun, args):Dynamic {
+		return neko.Lib.load(lib, fun, args);
+	}
+
+	static var lib = try {
+		neko.Lib.load("mysql5", "connect", 1);
+		"mysql5";
+	} catch (e:Dynamic) "mysql";
+	public static var connect = load("connect", 1);
+	public static var select_db = load("select_db", 2);
+	public static var request = load("request", 2);
+	public static var close = load("close", 1);
 	public static var escape = load("escape", 2);
 	public static var set_conv_funs = load("set_conv_funs", 4);
-	public static var result_get_length = load("result_get_length",1);
-	public static var result_get_nfields = load("result_get_nfields",1);
-	public static var result_next = load("result_next",1);
-	public static var result_get = load("result_get",2);
-	public static var result_get_int = load("result_get_int",2);
-	public static var result_get_float = load("result_get_float",2);
-	public static var result_fields_names = neko.Lib.loadLazy(lib,"result_get_fields_names",1);
-
+	public static var result_get_length = load("result_get_length", 1);
+	public static var result_get_nfields = load("result_get_nfields", 1);
+	public static var result_next = load("result_next", 1);
+	public static var result_get = load("result_get", 2);
+	public static var result_get_int = load("result_get_int", 2);
+	public static var result_get_float = load("result_get_float", 2);
+	public static var result_fields_names = neko.Lib.loadLazy(lib, "result_get_fields_names", 1);
 }
 
 private class MysqlResultSet implements sys.db.ResultSet {
+	public var length(get, null):Int;
+	public var nfields(get, null):Int;
 
-	public var length(get,null) : Int;
-	public var nfields(get,null) : Int;
-	private var __r : Dynamic;
-	private var cache : Dynamic;
+	private var __r:Dynamic;
+	private var cache:Dynamic;
 
 	public function new(r) {
 		__r = r;
@@ -64,14 +66,14 @@ private class MysqlResultSet implements sys.db.ResultSet {
 	}
 
 	public function hasNext() {
-		if( cache == null )
+		if (cache == null)
 			cache = next();
 		return (cache != null);
 	}
 
-	public function next() : Dynamic {
+	public function next():Dynamic {
 		var c = cache;
-		if( c != null ) {
+		if (c != null) {
 			cache = null;
 			return c;
 		}
@@ -79,56 +81,54 @@ private class MysqlResultSet implements sys.db.ResultSet {
 		return c;
 	}
 
-	public function results() : List<Dynamic> {
+	public function results():List<Dynamic> {
 		var l = new List();
-		while( hasNext() )
+		while (hasNext())
 			l.add(next());
 		return l;
 	}
 
-	public function getResult( n : Int ) {
-		return new String(D.result_get(__r,n));
+	public function getResult(n:Int) {
+		return new String(D.result_get(__r, n));
 	}
 
-	public function getIntResult( n : Int ) : Int {
-		return D.result_get_int(__r,n);
+	public function getIntResult(n:Int):Int {
+		return D.result_get_int(__r, n);
 	}
 
-	public function getFloatResult( n : Int ) : Float {
-		return D.result_get_float(__r,n);
+	public function getFloatResult(n:Int):Float {
+		return D.result_get_float(__r, n);
 	}
 
-	public function getFieldsNames() : Array<String> {
+	public function getFieldsNames():Array<String> {
 		var a = D.result_fields_names(__r);
 		untyped {
 			var i = 0;
 			var l = __dollar__asize(a);
-			while( i < l ) {
+			while (i < l) {
 				a[i] = new String(a[i]);
 				i += 1;
 			}
-			a = Array.new1(cast a,l);
+			a = Array.new1(cast a, l);
 		}
 		return a;
 	}
-
 }
 
 private class MysqlConnection implements sys.db.Connection {
-
-	private var __c : Dynamic;
+	private var __c:Dynamic;
 
 	public function new(c) {
 		__c = c;
 		D.set_conv_funs(c, function(s) return new String(s), function(d) return untyped Date.new1(d), function(b) return haxe.io.Bytes.ofData(b));
 	}
 
-	public function request( s : String ) : sys.db.ResultSet {
+	public function request(s:String):sys.db.ResultSet {
 		try {
 			var r = D.request(this.__c, untyped s.__s);
 			return new MysqlResultSet(r);
-		} catch( e : Dynamic ) {
-			untyped if( __dollar__typeof(e) == __dollar__tobject && __dollar__typeof(e.msg) == __dollar__tstring )
+		} catch (e:Dynamic) {
+			untyped if (__dollar__typeof(e) == __dollar__tobject && __dollar__typeof(e.msg) == __dollar__tstring)
 				e = e.msg;
 			untyped __dollar__rethrow(e);
 			return null;
@@ -139,20 +139,20 @@ private class MysqlConnection implements sys.db.Connection {
 		D.close(__c);
 	}
 
-	public function escape( s : String ) {
-		return new String(D.escape(__c,untyped s.__s));
+	public function escape(s:String) {
+		return new String(D.escape(__c, untyped s.__s));
 	}
 
-	public function quote( s : String ) {
-		return "'"+escape(s)+"'";
+	public function quote(s:String) {
+		return "'" + escape(s) + "'";
 	}
 
-	public function addValue( s : StringBuf, v : Dynamic ) {
+	public function addValue(s:StringBuf, v:Dynamic) {
 		var t = untyped __dollar__typeof(v);
-		if( untyped (t == __dollar__tint || t == __dollar__tnull) )
+		if (untyped (t == __dollar__tint || t == __dollar__tnull))
 			s.add(v);
-		else if( untyped t == __dollar__tbool )
-			s.addChar(if( v ) "1".code else "0".code);
+		else if (untyped t == __dollar__tbool)
+			s.addChar(if (v) "1".code else "0".code);
 		else {
 			s.addChar("'".code);
 			s.add(escape(Std.string(v)));
@@ -184,30 +184,30 @@ private class MysqlConnection implements sys.db.Connection {
 }
 
 @:coreApi class Mysql {
-
-	public static function connect( params : {
-		host : String,
-		?port : Int,
-		user : String,
-		pass : String,
-		?socket : String,
-		database : String
-	} ) : sys.db.Connection {
+	public static function connect(params:{
+		host:String,
+		?port:Int,
+		user:String,
+		pass:String,
+		?socket:String,
+		?database:String
+	}):sys.db.Connection {
 		var o = untyped {
-			host : params.host.__s,
-			port : if( params.port == null ) 3306 else params.port,
-			user : params.user.__s,
-			pass : params.pass.__s,
-			socket : if( params.socket == null ) null else params.socket.__s
+			host: params.host.__s,
+			port: if (params.port == null) 3306 else params.port,
+			user: params.user.__s,
+			pass: params.pass.__s,
+			socket: if (params.socket == null) null else params.socket.__s
 		};
 		var c = D.connect(o);
-		try {
-			D.select_db(c,untyped params.database.__s);
-		} catch( e : Dynamic ) {
-			D.close(c);
-			neko.Lib.rethrow(e);
+		if (params.database != null) {
+			try {
+				D.select_db(c, untyped params.database.__s);
+			} catch (e:Dynamic) {
+				D.close(c);
+				neko.Lib.rethrow(e);
+			}
 		}
 		return new MysqlConnection(c);
 	}
-
 }
diff --git a/std/neko/_std/sys/db/Sqlite.hx b/std/neko/_std/sys/db/Sqlite.hx
index 12058a01514fe3fff72b678bec8c4028d4964b06..9295336f16d9252610c6229b4633d2d0c7e41564 100644
--- a/std/neko/_std/sys/db/Sqlite.hx
+++ b/std/neko/_std/sys/db/Sqlite.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
 private class SqliteConnection implements Connection {
+	var c:Dynamic;
 
-	var c : Dynamic;
-
-	public function new( file : String ) {
+	public function new(file:String) {
 		c = _connect(untyped file.__s);
 	}
 
@@ -33,30 +33,30 @@ private class SqliteConnection implements Connection {
 		_close(c);
 	}
 
-	public function request( s : String ) : ResultSet {
+	public function request(s:String):ResultSet {
 		try {
-			return new SqliteResultSet(_request(c,untyped s.__s));
-		} catch( e : String ) {
-			throw "Error while executing "+s+" ("+e+")";
+			return new SqliteResultSet(_request(c, untyped s.__s));
+		} catch (e:String) {
+			throw "Error while executing " + s + " (" + e + ")";
 		}
 	}
 
-	public function escape( s : String ) {
+	public function escape(s:String) {
 		return s.split("'").join("''");
 	}
 
-	public function quote( s : String ) {
-		if( s.indexOf("\000") >= 0 )
-			return "x'"+new String(untyped _encode(s.__s,"0123456789ABCDEF".__s))+"'";
-		return "'"+s.split("'").join("''")+"'";
+	public function quote(s:String) {
+		if (s.indexOf("\000") >= 0)
+			return "x'" + new String(untyped _encode(s.__s, "0123456789ABCDEF".__s)) + "'";
+		return "'" + s.split("'").join("''") + "'";
 	}
 
-	public function addValue( s : StringBuf, v : Dynamic ) {
+	public function addValue(s:StringBuf, v:Dynamic) {
 		var t = untyped __dollar__typeof(v);
-		if( untyped (t == __dollar__tint || t == __dollar__tnull) )
+		if (untyped (t == __dollar__tint || t == __dollar__tnull))
 			s.add(v);
-		else if( untyped t == __dollar__tbool )
-			s.add(if( v ) 1 else 0);
+		else if (untyped t == __dollar__tbool)
+			s.add(if (v) 1 else 0);
 		else
 			s.add(quote(Std.string(v)));
 	}
@@ -83,32 +83,31 @@ private class SqliteConnection implements Connection {
 		startTransaction(); // match mysql usage
 	}
 
-	static var _encode = neko.Lib.load("std","base_encode",2);
-	static var _connect = neko.Lib.load("sqlite","connect",1);
-	static var _close = neko.Lib.load("sqlite","close",1);
-	static var _request = neko.Lib.load("sqlite","request",2);
-	static var _last_id = neko.Lib.load("sqlite","last_insert_id",1);
+	static var _encode = neko.Lib.load("std", "base_encode", 2);
+	static var _connect = neko.Lib.load("sqlite", "connect", 1);
+	static var _close = neko.Lib.load("sqlite", "close", 1);
+	static var _request = neko.Lib.load("sqlite", "request", 2);
+	static var _last_id = neko.Lib.load("sqlite", "last_insert_id", 1);
 }
 
-
 private class SqliteResultSet implements ResultSet {
+	public var length(get, null):Int;
+	public var nfields(get, null):Int;
 
-	public var length(get,null) : Int;
-	public var nfields(get,null) : Int;
-	var r : Dynamic;
-	var cache : List<Dynamic>;
+	var r:Dynamic;
+	var cache:List<Dynamic>;
 
-	public function new( r ) {
+	public function new(r) {
 		cache = new List();
 		this.r = r;
 		hasNext(); // execute the request
 	}
 
 	function get_length() {
-		if( nfields != 0 ) {
-			while( true ) {
+		if (nfields != 0) {
+			while (true) {
 				var c = doNext();
-				if( c == null )
+				if (c == null)
 					break;
 				cache.add(c);
 			}
@@ -123,77 +122,74 @@ private class SqliteResultSet implements ResultSet {
 
 	public function hasNext() {
 		var c = next();
-		if( c == null )
+		if (c == null)
 			return false;
 		cache.push(c);
 		return true;
 	}
 
-	public function next() : Dynamic {
+	public function next():Dynamic {
 		var c = cache.pop();
-		if( c != null )
+		if (c != null)
 			return c;
 		return doNext();
 	}
 
-	private function doNext() : Dynamic {
+	private function doNext():Dynamic {
 		var c = result_next(r);
-		if( c == null )
+		if (c == null)
 			return null;
 		untyped {
 			var f = __dollar__objfields(c);
 			var i = 0;
 			var l = __dollar__asize(f);
-			while( i < l ) {
-				var v = __dollar__objget(c,f[i]);
-				if( __dollar__typeof(v) == __dollar__tstring )
-					__dollar__objset(c,f[i],new String(v));
+			while (i < l) {
+				var v = __dollar__objget(c, f[i]);
+				if (__dollar__typeof(v) == __dollar__tstring)
+					__dollar__objset(c, f[i], new String(v));
 				i = i + 1;
 			}
 		}
 		return c;
 	}
 
-	public function results() : List<Dynamic> {
+	public function results():List<Dynamic> {
 		var l = new List();
-		while( true ) {
+		while (true) {
 			var c = next();
-			if( c == null )
+			if (c == null)
 				break;
 			l.add(c);
 		}
 		return l;
 	}
 
-	public function getResult( n : Int ) {
-		return new String(result_get(r,n));
+	public function getResult(n:Int) {
+		return new String(result_get(r, n));
 	}
 
-	public function getIntResult( n : Int ) : Int {
-		return result_get_int(r,n);
+	public function getIntResult(n:Int):Int {
+		return result_get_int(r, n);
 	}
 
-	public function getFloatResult( n : Int ) : Float {
-		return result_get_float(r,n);
+	public function getFloatResult(n:Int):Float {
+		return result_get_float(r, n);
 	}
 
-	public function getFieldsNames() : Array<String> {
+	public function getFieldsNames():Array<String> {
 		return null;
 	}
 
-	static var result_next = neko.Lib.load("sqlite","result_next",1);
-	static var result_get_length = neko.Lib.load("sqlite","result_get_length",1);
-	static var result_get_nfields = neko.Lib.load("sqlite","result_get_nfields",1);
-	static var result_get = neko.Lib.load("sqlite","result_get",2);
-	static var result_get_int = neko.Lib.load("sqlite","result_get_int",2);
-	static var result_get_float = neko.Lib.load("sqlite","result_get_float",2);
-
+	static var result_next = neko.Lib.load("sqlite", "result_next", 1);
+	static var result_get_length = neko.Lib.load("sqlite", "result_get_length", 1);
+	static var result_get_nfields = neko.Lib.load("sqlite", "result_get_nfields", 1);
+	static var result_get = neko.Lib.load("sqlite", "result_get", 2);
+	static var result_get_int = neko.Lib.load("sqlite", "result_get_int", 2);
+	static var result_get_float = neko.Lib.load("sqlite", "result_get_float", 2);
 }
 
 @:coreApi class Sqlite {
-
-	public static function open( file : String ) : Connection {
+	public static function open(file:String):Connection {
 		return new SqliteConnection(file);
 	}
-
 }
diff --git a/std/neko/_std/sys/io/File.hx b/std/neko/_std/sys/io/File.hx
index 7ddc2817c41919ff7b04e5d1255e778dc470b67d..7ae2cb2f65ab08f979e99c797c2d4ba30172ed46 100644
--- a/std/neko/_std/sys/io/File.hx
+++ b/std/neko/_std/sys/io/File.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,55 +19,59 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
-enum FileHandle {
-}
+enum FileHandle {}
 
 @:coreApi class File {
-
-	public static function getContent( path : String ) : String {
+	public static function getContent(path:String):String {
 		return new String(file_contents(untyped path.__s));
 	}
 
-	public static function getBytes( path : String ) : haxe.io.Bytes {
+	public static function getBytes(path:String):haxe.io.Bytes {
 		return neko.Lib.bytesReference(getContent(path));
 	}
 
-	public static function saveContent( path : String, content : String ) : Void {
+	public static function saveContent(path:String, content:String):Void {
 		var f = write(path);
 		f.writeString(content);
 		f.close();
 	}
 
-	public static function saveBytes( path : String, bytes : haxe.io.Bytes ) : Void {
+	public static function saveBytes(path:String, bytes:haxe.io.Bytes):Void {
 		var f = write(path);
 		f.write(bytes);
 		f.close();
 	}
 
-	public static function read( path : String, binary : Bool = true ) : FileInput {
-		return untyped new FileInput(file_open(path.__s,(if( binary ) "rb" else "r").__s));
+	public static function read(path:String, binary:Bool = true):FileInput {
+		return untyped new FileInput(file_open(path.__s, (if (binary) "rb" else "r").__s));
 	}
 
-	public static function write( path : String, binary : Bool = true ) : FileOutput {
-		return untyped new FileOutput(file_open(path.__s,(if( binary ) "wb" else "w").__s));
+	public static function write(path:String, binary:Bool = true):FileOutput {
+		return untyped new FileOutput(file_open(path.__s, (if (binary) "wb" else "w").__s));
 	}
 
-	public static function append( path : String, binary : Bool = true ) : FileOutput {
-		return untyped new FileOutput(file_open(path.__s,(if( binary ) "ab" else "a").__s));
+	public static function append(path:String, binary:Bool = true):FileOutput {
+		return untyped new FileOutput(file_open(path.__s, (if (binary) "ab" else "a").__s));
 	}
 
-	public static function copy( srcPath : String, dstPath : String ) : Void {
-		var s = read(srcPath,true);
-		var d = write(dstPath,true);
+	public static function update(path:String, binary:Bool = true):FileOutput {
+		if (!FileSystem.exists(path)) {
+			write(path).close();
+		}
+		return untyped new FileOutput(file_open(path.__s, (if (binary) "rb+" else "r+").__s));
+	}
+
+	public static function copy(srcPath:String, dstPath:String):Void {
+		var s = read(srcPath, true);
+		var d = write(dstPath, true);
 		d.writeInput(s);
 		s.close();
 		d.close();
 	}
 
-	private static var file_contents = neko.Lib.load("std","file_contents",1);
-	private static var file_open = neko.Lib.load("std","file_open",2);
-
-
+	private static var file_contents = neko.Lib.load("std", "file_contents", 1);
+	private static var file_open = neko.Lib.load("std", "file_open", 2);
 }
diff --git a/std/neko/_std/sys/io/FileInput.hx b/std/neko/_std/sys/io/FileInput.hx
index a4d9b5a66bd504544b233c361cb1192ae3fc3aac..5234af11c56f5e63e90712b63b9be3033a2e1888 100644
--- a/std/neko/_std/sys/io/FileInput.hx
+++ b/std/neko/_std/sys/io/FileInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,63 +19,65 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 @:coreApi class FileInput extends haxe.io.Input {
+	private var __f:File.FileHandle;
 
-	private var __f : File.FileHandle;
-
-	function new(f:File.FileHandle) : Void {
+	function new(f:File.FileHandle):Void {
 		__f = f;
 	}
 
-	public override function readByte() : Int {
+	public override function readByte():Int {
 		return try {
 			file_read_char(__f);
-		} catch( e : Dynamic ) {
-			if( untyped __dollar__typeof(e) == __dollar__tarray )
+		} catch (e:Dynamic) {
+			if (untyped __dollar__typeof(e) == __dollar__tarray)
 				throw new haxe.io.Eof();
 			else
 				throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	public override function readBytes( s : haxe.io.Bytes, p : Int, l : Int ) : Int {
+	public override function readBytes(s:haxe.io.Bytes, p:Int, l:Int):Int {
 		return try {
-			file_read(__f,s.getData(),p,l);
-		} catch( e : Dynamic ) {
-			if( untyped __dollar__typeof(e) == __dollar__tarray )
+			file_read(__f, s.getData(), p, l);
+		} catch (e:Dynamic) {
+			if (untyped __dollar__typeof(e) == __dollar__tarray)
 				throw new haxe.io.Eof();
 			else
 				throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	public override function close() : Void {
+	public override function close():Void {
 		super.close();
 		file_close(__f);
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void {
-		file_seek(__f,p,switch( pos ) { case SeekBegin: 0; case SeekCur: 1; case SeekEnd: 2; });
+	public function seek(p:Int, pos:FileSeek):Void {
+		file_seek(__f, p, switch (pos) {
+			case SeekBegin: 0;
+			case SeekCur: 1;
+			case SeekEnd: 2;
+		});
 	}
 
-	public function tell() : Int {
+	public function tell():Int {
 		return file_tell(__f);
 	}
 
-
-	public function eof() : Bool {
+	public function eof():Bool {
 		return file_eof(__f);
 	}
 
-	private static var file_eof = neko.Lib.load("std","file_eof",1);
-
-	private static var file_read = neko.Lib.load("std","file_read",4);
-	private static var file_read_char = neko.Lib.load("std","file_read_char",1);
+	private static var file_eof = neko.Lib.load("std", "file_eof", 1);
 
-	private static var file_close = neko.Lib.load("std","file_close",1);
-	private static var file_seek = neko.Lib.load("std","file_seek",3);
-	private static var file_tell = neko.Lib.load("std","file_tell",1);
+	private static var file_read = neko.Lib.load("std", "file_read", 4);
+	private static var file_read_char = neko.Lib.load("std", "file_read_char", 1);
 
+	private static var file_close = neko.Lib.load("std", "file_close", 1);
+	private static var file_seek = neko.Lib.load("std", "file_seek", 3);
+	private static var file_tell = neko.Lib.load("std", "file_tell", 1);
 }
diff --git a/std/neko/_std/sys/io/FileOutput.hx b/std/neko/_std/sys/io/FileOutput.hx
index fbf1b1300643cd64011777a643ddd3418c976629..0de130cf72cd03807417e88efc0a19f74d593028 100644
--- a/std/neko/_std/sys/io/FileOutput.hx
+++ b/std/neko/_std/sys/io/FileOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,47 +19,53 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 @:coreApi class FileOutput extends haxe.io.Output {
+	private var __f:File.FileHandle;
 
-	private var __f : File.FileHandle;
-
-	function new(f:File.FileHandle) : Void {
+	function new(f:File.FileHandle):Void {
 		__f = f;
 	}
 
-	public override function writeByte( c : Int ) : Void {
-		try file_write_char(__f,c) catch( e : Dynamic ) throw haxe.io.Error.Custom(e);
+	public override function writeByte(c:Int):Void {
+		try
+			file_write_char(__f, c)
+		catch (e:Dynamic)
+			throw haxe.io.Error.Custom(e);
 	}
 
-	public override function writeBytes( s : haxe.io.Bytes, p : Int, l : Int ) : Int {
-		return try file_write(__f,s.getData(),p,l) catch( e : Dynamic ) throw haxe.io.Error.Custom(e);
+	public override function writeBytes(s:haxe.io.Bytes, p:Int, l:Int):Int {
+		return try file_write(__f, s.getData(), p, l) catch (e:Dynamic) throw haxe.io.Error.Custom(e);
 	}
 
-	public override function flush() : Void {
+	public override function flush():Void {
 		file_flush(__f);
 	}
 
-	public override function close() : Void {
+	public override function close():Void {
 		super.close();
 		file_close(__f);
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void {
-		file_seek(__f,p,switch( pos ) { case SeekBegin: 0; case SeekCur: 1; case SeekEnd: 2; });
+	public function seek(p:Int, pos:FileSeek):Void {
+		file_seek(__f, p, switch (pos) {
+			case SeekBegin: 0;
+			case SeekCur: 1;
+			case SeekEnd: 2;
+		});
 	}
 
-	public function tell() : Int {
+	public function tell():Int {
 		return file_tell(__f);
 	}
 
-	private static var file_close = neko.Lib.load("std","file_close",1);
-	private static var file_seek = neko.Lib.load("std","file_seek",3);
-	private static var file_tell = neko.Lib.load("std","file_tell",1);
-
-	private static var file_flush = neko.Lib.load("std","file_flush",1);
-	private static var file_write = neko.Lib.load("std","file_write",4);
-	private static var file_write_char = neko.Lib.load("std","file_write_char",2);
+	private static var file_close = neko.Lib.load("std", "file_close", 1);
+	private static var file_seek = neko.Lib.load("std", "file_seek", 3);
+	private static var file_tell = neko.Lib.load("std", "file_tell", 1);
 
+	private static var file_flush = neko.Lib.load("std", "file_flush", 1);
+	private static var file_write = neko.Lib.load("std", "file_write", 4);
+	private static var file_write_char = neko.Lib.load("std", "file_write_char", 2);
 }
diff --git a/std/neko/_std/sys/io/Process.hx b/std/neko/_std/sys/io/Process.hx
index 343d11d2edb4f8d9200c02543d93553ab248991c..0c9f1cc54bf0cf63e36c52a782a1e648ba5e28b1 100644
--- a/std/neko/_std/sys/io/Process.hx
+++ b/std/neko/_std/sys/io/Process.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 private class Stdin extends haxe.io.Output {
+	var p:Dynamic;
+	var buf:haxe.io.Bytes;
 
-	var p : Dynamic;
-	var buf : haxe.io.Bytes;
-
-	public function new(p) {
+	public function new(p:Dynamic) {
 		this.p = p;
 		buf = haxe.io.Bytes.alloc(1);
 	}
@@ -37,92 +37,88 @@ private class Stdin extends haxe.io.Output {
 	}
 
 	public override function writeByte(c) {
-		buf.set(0,c);
-		writeBytes(buf,0,1);
+		buf.set(0, c);
+		writeBytes(buf, 0, 1);
 	}
 
-	public override function writeBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) : Int {
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
 		try {
-			return _stdin_write(p,buf.getData(),pos,len);
-		} catch( e : Dynamic ) {
+			return _stdin_write(p, buf.getData(), pos, len);
+		} catch (e:Dynamic) {
 			throw new haxe.io.Eof();
 		}
 	}
 
-	static var _stdin_write = neko.Lib.load("std","process_stdin_write",4);
-	static var _stdin_close = neko.Lib.load("std","process_stdin_close",1);
-
+	static var _stdin_write = neko.Lib.load("std", "process_stdin_write", 4);
+	static var _stdin_close = neko.Lib.load("std", "process_stdin_close", 1);
 }
 
 private class Stdout extends haxe.io.Input {
+	var p:Dynamic;
+	var out:Bool;
+	var buf:haxe.io.Bytes;
 
-	var p : Dynamic;
-	var out : Bool;
-	var buf : haxe.io.Bytes;
-
-	public function new(p,out) {
+	public function new(p:Dynamic, out) {
 		this.p = p;
 		this.out = out;
 		buf = haxe.io.Bytes.alloc(1);
 	}
 
 	public override function readByte() {
-		if( readBytes(buf,0,1) == 0 )
+		if (readBytes(buf, 0, 1) == 0)
 			throw haxe.io.Error.Blocked;
 		return buf.get(0);
 	}
 
-	public override function readBytes( str : haxe.io.Bytes, pos : Int, len : Int ) : Int {
+	public override function readBytes(str:haxe.io.Bytes, pos:Int, len:Int):Int {
 		try {
-			return (out?_stdout_read:_stderr_read)(p,str.getData(),pos,len);
-		} catch( e : Dynamic ) {
+			return (out ? _stdout_read : _stderr_read)(p, str.getData(), pos, len);
+		} catch (e:Dynamic) {
 			throw new haxe.io.Eof();
 		}
 	}
 
-	static var _stdout_read = neko.Lib.load("std","process_stdout_read",4);
-	static var _stderr_read = neko.Lib.load("std","process_stderr_read",4);
-
+	static var _stdout_read = neko.Lib.load("std", "process_stdout_read", 4);
+	static var _stderr_read = neko.Lib.load("std", "process_stderr_read", 4);
 }
 
 @:coreApi class Process {
+	var p:Dynamic;
 
-	var p : Dynamic;
-	public var stdout(default,null) : haxe.io.Input;
-	public var stderr(default,null) : haxe.io.Input;
-	public var stdin(default,null) : haxe.io.Output;
+	public var stdout(default, null):haxe.io.Input;
+	public var stderr(default, null):haxe.io.Input;
+	public var stdin(default, null):haxe.io.Output;
 
-	public function new( cmd : String, ?args : Array<String> ) : Void {
-		p = try 
-			_run(untyped cmd.__s, neko.Lib.haxeToNeko(args))
-		catch( e : Dynamic )
-			throw "Process creation failure : "+cmd;
+	public function new(cmd:String, ?args:Array<String>, ?detached:Bool):Void {
+		if (detached)
+			throw "Detached process is not supported on this platform";
+		p = try _run(untyped cmd.__s, neko.Lib.haxeToNeko(args)) catch (e:Dynamic) throw "Process creation failure : " + cmd;
 		stdin = new Stdin(p);
-		stdout = new Stdout(p,true);
-		stderr = new Stdout(p,false);
+		stdout = new Stdout(p, true);
+		stderr = new Stdout(p, false);
 	}
 
-	public function getPid() : Int {
+	public function getPid():Int {
 		return _pid(p);
 	}
 
-	public function exitCode( block : Bool = true ) : Null<Int> {
-		if( block == false ) throw "Non blocking exitCode() not supported on this platform";
+	public function exitCode(block:Bool = true):Null<Int> {
+		if (block == false)
+			throw "Non blocking exitCode() not supported on this platform";
 		return _exit(p);
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		_close(p);
 	}
 
-	public function kill() : Void {
+	public function kill():Void {
 		_kill(p);
 	}
 
-	static var _run = neko.Lib.load("std","process_run",2);
-	static var _exit = neko.Lib.load("std","process_exit",1);
-	static var _pid = neko.Lib.load("std","process_pid",1);
-	static var _close = neko.Lib.loadLazy("std","process_close",1);
-	static var _kill = neko.Lib.loadLazy("std","process_kill",1);
-
-}
\ No newline at end of file
+	static var _run = neko.Lib.load("std", "process_run", 2);
+	static var _exit = neko.Lib.load("std", "process_exit", 1);
+	static var _pid = neko.Lib.load("std", "process_pid", 1);
+	static var _close = neko.Lib.loadLazy("std", "process_close", 1);
+	static var _kill = neko.Lib.loadLazy("std", "process_kill", 1);
+}
diff --git a/std/neko/_std/sys/net/Host.hx b/std/neko/_std/sys/net/Host.hx
index c2ef874c38804222dba95c3d17bcaa5ca5c25c2d..4ff7a5cff249512b6129d823fc88fcf56ed06589 100644
--- a/std/neko/_std/sys/net/Host.hx
+++ b/std/neko/_std/sys/net/Host.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,40 +19,39 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
 @:coreApi
 @:keepInit
 class Host {
+	public var host(default, null):String;
 
-	public var host(default,null) : String;
-
-	public var ip(default,null) : Int;
+	public var ip(default, null):Int;
 
-	public function new( name : String ) : Void {
+	public function new(name:String):Void {
 		host = name;
 		ip = host_resolve(untyped name.__s);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		return new String(host_to_string(ip));
 	}
 
-	public function reverse() : String {
+	public function reverse():String {
 		return new String(host_reverse(ip));
 	}
 
-	public static function localhost() : String {
+	public static function localhost():String {
 		return new String(host_local());
 	}
 
-	static function __init__() : Void {
-		neko.Lib.load("std","socket_init",0)();
+	static function __init__():Void {
+		neko.Lib.load("std", "socket_init", 0)();
 	}
 
-	private static var host_resolve = neko.Lib.load("std","host_resolve",1);
-	private static var host_reverse = neko.Lib.load("std","host_reverse",1);
-	private static var host_to_string = neko.Lib.load("std","host_to_string",1);
-	private static var host_local = neko.Lib.load("std","host_local",0);
-
+	private static var host_resolve = neko.Lib.load("std", "host_resolve", 1);
+	private static var host_reverse = neko.Lib.load("std", "host_reverse", 1);
+	private static var host_to_string = neko.Lib.load("std", "host_to_string", 1);
+	private static var host_local = neko.Lib.load("std", "host_local", 0);
 }
diff --git a/std/neko/_std/sys/net/Socket.hx b/std/neko/_std/sys/net/Socket.hx
index 9a8210bc86b4d3b7a7275c24da37926d7ad943ba..4ad9756be2a59dbe28ca336c81d413b9c30a9652 100644
--- a/std/neko/_std/sys/net/Socket.hx
+++ b/std/neko/_std/sys/net/Socket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,38 +19,40 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
+
 import haxe.io.Error;
 
-private enum SocketHandle {
-}
+@:callable
+@:coreType
+abstract SocketHandle {}
 
 private class SocketOutput extends haxe.io.Output {
-
-	var __s : SocketHandle;
+	var __s:SocketHandle;
 
 	public function new(s) {
 		__s = s;
 	}
 
-	public override function writeByte( c : Int ) {
+	public override function writeByte(c:Int) {
 		try {
 			socket_send_char(__s, c);
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw Blocked;
-			else if ( e == "EOF" )
+			else if (e == "EOF")
 				throw new haxe.io.Eof();
 			else
 				throw Custom(e);
 		}
 	}
 
-	public override function writeBytes( buf : haxe.io.Bytes, pos : Int, len : Int) : Int {
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
 		return try {
 			socket_send(__s, buf.getData(), pos, len);
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw Blocked;
 			else
 				throw Custom(e);
@@ -59,81 +61,81 @@ private class SocketOutput extends haxe.io.Output {
 
 	public override function close() {
 		super.close();
-		if( __s != null ) socket_close(__s);
+		if (__s != null)
+			socket_close(__s);
 	}
 
-	private static var socket_close = neko.Lib.load("std","socket_close",1);
-	private static var socket_send_char = neko.Lib.load("std","socket_send_char",2);
-	private static var socket_send = neko.Lib.load("std","socket_send",4);
-
+	private static var socket_close = neko.Lib.load("std", "socket_close", 1);
+	private static var socket_send_char = neko.Lib.load("std", "socket_send_char", 2);
+	private static var socket_send = neko.Lib.load("std", "socket_send", 4);
 }
 
 private class SocketInput extends haxe.io.Input {
-
-	var __s : SocketHandle;
+	var __s:SocketHandle;
 
 	public function new(s) {
 		__s = s;
 	}
 
-	public override function readByte() : Int {
+	public override function readByte():Int {
 		return try {
 			socket_recv_char(__s);
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw Blocked;
-			else if( __s == null )
+			else if (__s == null)
 				throw Custom(e);
 			else
 				throw new haxe.io.Eof();
 		}
 	}
 
-	public override function readBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) : Int {
+	public override function readBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
 		var r;
 		try {
-			r = socket_recv(__s,buf.getData(),pos,len);
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			r = socket_recv(__s, buf.getData(), pos, len);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw Blocked;
 			else
 				throw Custom(e);
 		}
-		if( r == 0 )
+		if (r == 0)
 			throw new haxe.io.Eof();
 		return r;
 	}
 
 	public override function close() {
 		super.close();
-		if( __s != null ) socket_close(__s);
+		if (__s != null)
+			socket_close(__s);
 	}
 
-	private static var socket_recv = neko.Lib.load("std","socket_recv",4);
-	private static var socket_recv_char = neko.Lib.load("std","socket_recv_char",1);
-	private static var socket_close = neko.Lib.load("std","socket_close",1);
-
+	private static var socket_recv = neko.Lib.load("std", "socket_recv", 4);
+	private static var socket_recv_char = neko.Lib.load("std", "socket_recv_char", 1);
+	private static var socket_close = neko.Lib.load("std", "socket_close", 1);
 }
 
 @:coreApi
 class Socket {
+	private var __s:SocketHandle;
 
-	private var __s : SocketHandle;
-	public var input(default,null) : haxe.io.Input;
-	public var output(default,null) : haxe.io.Output;
-	public var custom : Dynamic;
+	public var input(default, null):haxe.io.Input;
+	public var output(default, null):haxe.io.Output;
+	public var custom:Dynamic;
 
-	public function new() : Void {
+	public function new():Void {
 		init();
 	}
 
-	private function init() : Void {
-		if( __s == null ) __s = socket_new(false);
+	private function init():Void {
+		if (__s == null)
+			__s = socket_new(false);
 		input = new SocketInput(__s);
 		output = new SocketOutput(__s);
 	}
 
-	public function close() : Void {
+	public function close():Void {
 		socket_close(__s);
 		untyped {
 			input.__s = null;
@@ -143,42 +145,41 @@ class Socket {
 		output.close();
 	}
 
-	public function read() : String {
+	public function read():String {
 		return new String(socket_read(__s));
 	}
 
-	public function write( content : String ) : Void {
+	public function write(content:String):Void {
 		socket_write(__s, untyped content.__s);
 	}
 
-	public function connect(host : Host, port : Int) : Void {
+	public function connect(host:Host, port:Int):Void {
 		try {
 			socket_connect(__s, host.ip, port);
-		} catch( s : String ) {
-			if( s == "std@socket_connect" )
-				throw "Failed to connect on "+host.toString()+":"+port;
-			else if ( s == "Blocking" ) {
+		} catch (s:String) {
+			if (s == "std@socket_connect")
+				throw "Failed to connect on " + host.toString() + ":" + port;
+			else if (s == "Blocking") {
 				// Do nothing, this is not a real error, it simply indicates
 				// that a non-blocking connect is in progress
-			}
-			else
+			} else
 				neko.Lib.rethrow(s);
 		}
 	}
 
-	public function listen(connections : Int) : Void {
+	public function listen(connections:Int):Void {
 		socket_listen(__s, connections);
 	}
 
-	public function shutdown( read : Bool, write : Bool ) : Void {
-		socket_shutdown(__s,read,write);
+	public function shutdown(read:Bool, write:Bool):Void {
+		socket_shutdown(__s, read, write);
 	}
 
-	public function bind(host : Host, port : Int) : Void {
+	public function bind(host:Host, port:Int):Void {
 		socket_bind(__s, host.ip, port);
 	}
 
-	public function accept() : Socket {
+	public function accept():Socket {
 		var c = socket_accept(__s);
 		var s = Type.createEmptyInstance(Socket);
 		s.__s = c;
@@ -187,67 +188,71 @@ class Socket {
 		return s;
 	}
 
-	public function peer() : { host : Host, port : Int } {
-		var a : Dynamic = socket_peer(__s);
+	public function peer():{host:Host, port:Int} {
+		var a:Dynamic = socket_peer(__s);
 		if (a == null) {
 			return null;
 		}
 		var h = new Host("127.0.0.1");
 		untyped h.ip = a[0];
-		return { host : h, port : a[1] };
+		return {host: h, port: a[1]};
 	}
 
-	public function host() : { host : Host, port : Int } {
-		var a : Dynamic = socket_host(__s);
+	public function host():{host:Host, port:Int} {
+		var a:Dynamic = socket_host(__s);
 		if (a == null) {
 			return null;
 		}
 		var h = new Host("127.0.0.1");
 		untyped h.ip = a[0];
-		return { host : h, port : a[1] };
+		return {host: h, port: a[1]};
 	}
 
-	public function setTimeout( timeout : Float ) : Void {
+	public function setTimeout(timeout:Float):Void {
 		socket_set_timeout(__s, timeout);
 	}
 
-	public function waitForRead() : Void {
-		select([this],null,null,null);
+	public function waitForRead():Void {
+		select([this], null, null, null);
 	}
 
-	public function setBlocking( b : Bool ) : Void {
-		socket_set_blocking(__s,b);
+	public function setBlocking(b:Bool):Void {
+		socket_set_blocking(__s, b);
 	}
 
-	public function setFastSend( b : Bool ) : Void {
-		socket_set_fast_send(__s,b);
+	public function setFastSend(b:Bool):Void {
+		socket_set_fast_send(__s, b);
 	}
 
-	public static function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float) : {read: Array<Socket>,write: Array<Socket>,others: Array<Socket>} {
-		var c = untyped __dollar__hnew( 1 );
-		var f = function( a : Array<Socket> ){
-			if( a == null ) return null;
+	public static function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+			?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>} {
+		var c = untyped __dollar__hnew(1);
+		var f = function(a:Array<Socket>) {
+			if (a == null)
+				return null;
 			untyped {
 				var r = __dollar__amake(a.length);
 				var i = 0;
-				while( i < a.length ){
+				while (i < a.length) {
 					r[i] = a[i].__s;
-					__dollar__hadd(c,a[i].__s,a[i]);
+					__dollar__hadd(c, a[i].__s, a[i]);
 					i += 1;
 				}
 				return r;
 			}
 		}
-		var neko_array = socket_select(f(read),f(write),f(others), timeout);
+		var neko_array = socket_select(f(read), f(write), f(others), timeout);
 
-		var g = function( a ) : Array<Socket> {
-			if( a == null ) return null;
+		var g = function(a):Array<Socket> {
+			if (a == null)
+				return null;
 
 			var r = new Array();
 			var i = 0;
-			while( i < untyped __dollar__asize(a) ){
-				var t = untyped __dollar__hget(c,a[i],null);
-				if( t == null ) throw "Socket object not found.";
+			while (i < untyped __dollar__asize(a)) {
+				var t = untyped __dollar__hget(c, a[i], null);
+				if (t == null)
+					throw "Socket object not found.";
 				r[i] = t;
 				i += 1;
 			}
@@ -261,19 +266,19 @@ class Socket {
 		};
 	}
 
-	private static var socket_new = neko.Lib.load("std","socket_new",1);
-	private static var socket_close = neko.Lib.load("std","socket_close",1);
-	private static var socket_write = neko.Lib.load("std","socket_write",2);
-	private static var socket_read = neko.Lib.load("std","socket_read",1);
-	private static var socket_connect = neko.Lib.load("std","socket_connect",3);
-	private static var socket_listen = neko.Lib.load("std","socket_listen",2);
-	private static var socket_select = neko.Lib.load("std","socket_select",4);
-	private static var socket_bind = neko.Lib.load("std","socket_bind",3);
-	private static var socket_accept = neko.Lib.load("std","socket_accept",1);
-	private static var socket_peer = neko.Lib.load("std","socket_peer",1);
-	private static var socket_host = neko.Lib.load("std","socket_host",1);
-	private static var socket_set_timeout = neko.Lib.load("std","socket_set_timeout",2);
-	private static var socket_shutdown = neko.Lib.load("std","socket_shutdown",3);
-	private static var socket_set_blocking = neko.Lib.load("std","socket_set_blocking",2);
-	private static var socket_set_fast_send = neko.Lib.loadLazy("std","socket_set_fast_send",2);
+	private static var socket_new = neko.Lib.load("std", "socket_new", 1);
+	private static var socket_close = neko.Lib.load("std", "socket_close", 1);
+	private static var socket_write = neko.Lib.load("std", "socket_write", 2);
+	private static var socket_read = neko.Lib.load("std", "socket_read", 1);
+	private static var socket_connect = neko.Lib.load("std", "socket_connect", 3);
+	private static var socket_listen = neko.Lib.load("std", "socket_listen", 2);
+	private static var socket_select = neko.Lib.load("std", "socket_select", 4);
+	private static var socket_bind = neko.Lib.load("std", "socket_bind", 3);
+	private static var socket_accept = neko.Lib.load("std", "socket_accept", 1);
+	private static var socket_peer = neko.Lib.load("std", "socket_peer", 1);
+	private static var socket_host = neko.Lib.load("std", "socket_host", 1);
+	private static var socket_set_timeout = neko.Lib.load("std", "socket_set_timeout", 2);
+	private static var socket_shutdown = neko.Lib.load("std", "socket_shutdown", 3);
+	private static var socket_set_blocking = neko.Lib.load("std", "socket_set_blocking", 2);
+	private static var socket_set_fast_send = neko.Lib.loadLazy("std", "socket_set_fast_send", 2);
 }
diff --git a/std/neko/_std/sys/net/UdpSocket.hx b/std/neko/_std/sys/net/UdpSocket.hx
index 38d73acc27130fe68e4506cf48140319c1c2a80a..5589935d13c46dd715c8ea84c88f5b2b4f1a0c6d 100644
--- a/std/neko/_std/sys/net/UdpSocket.hx
+++ b/std/neko/_std/sys/net/UdpSocket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,44 +19,49 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
+
 import haxe.io.Error;
 
 @:coreApi
 class UdpSocket extends Socket {
-
-	private override function init() : Void {
+	private override function init():Void {
 		__s = Socket.socket_new(true);
 		super.init();
 	}
 
-	public function sendTo( buf : haxe.io.Bytes, pos : Int, len : Int, addr : Address ) : Int {
+	public function sendTo(buf:haxe.io.Bytes, pos:Int, len:Int, addr:Address):Int {
 		return try {
 			socket_send_to(__s, buf.getData(), pos, len, addr);
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw Blocked;
 			else
 				throw Custom(e);
 		}
 	}
 
-	public function readFrom( buf : haxe.io.Bytes, pos : Int, len : Int, addr : Address ) : Int {
+	public function readFrom(buf:haxe.io.Bytes, pos:Int, len:Int, addr:Address):Int {
 		var r;
 		try {
-			r = socket_recv_from(__s,buf.getData(),pos,len,addr);
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			r = socket_recv_from(__s, buf.getData(), pos, len, addr);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw Blocked;
 			else
 				throw Custom(e);
 		}
-		if( r == 0 )
+		if (r == 0)
 			throw new haxe.io.Eof();
 		return r;
 	}
 
+	public function setBroadcast(b:Bool):Void {
+		socket_set_broadcast(__s, b);
+	}
+
 	static var socket_recv_from = neko.Lib.loadLazy("std", "socket_recv_from", 5);
 	static var socket_send_to = neko.Lib.loadLazy("std", "socket_send_to", 5);
-
+	static var socket_set_broadcast = neko.Lib.loadLazy("std", "socket_set_broadcast", 2);
 }
diff --git a/std/neko/_std/sys/ssl/Certificate.hx b/std/neko/_std/sys/ssl/Certificate.hx
index 57102299c9d4610ff120fd1c1815aa60208f1ce5..a7f42f81a65b27f0f51c6e28666cd065d4b74c87 100644
--- a/std/neko/_std/sys/ssl/Certificate.hx
+++ b/std/neko/_std/sys/ssl/Certificate.hx
@@ -1,59 +1,80 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
 
 @:coreApi
 class Certificate {
-	
-	var __h : Null<Certificate>;
-	var __x : Dynamic;
+	var __h:Null<Certificate>;
+	var __x:Dynamic;
 
 	@:allow(sys.ssl.Socket)
-	function new( x : Dynamic, ?h: Null<Certificate> ){
+	function new(x:Dynamic, ?h:Null<Certificate>) {
 		__x = x;
 		__h = h;
 	}
 
-	public static function loadFile( file : String ) : Certificate {
-		return new Certificate( cert_load_file( untyped file.__s ) );
+	public static function loadFile(file:String):Certificate {
+		return new Certificate(cert_load_file(untyped file.__s));
 	}
-	
-	public static function loadPath( path : String ) : Certificate {
-		return new Certificate( cert_load_path( untyped path.__s ) );
+
+	public static function loadPath(path:String):Certificate {
+		return new Certificate(cert_load_path(untyped path.__s));
 	}
 
-	public static function fromString( str : String ) : Certificate {
-		return new Certificate( cert_add_pem(null, untyped str.__s) );
+	public static function fromString(str:String):Certificate {
+		return new Certificate(cert_add_pem(null, untyped str.__s));
 	}
-	
-	public static function loadDefaults() : Certificate {
+
+	public static function loadDefaults():Certificate {
 		var x = cert_load_defaults();
-		if ( x != null )
-			return new Certificate( x );
-		
+		if (x != null)
+			return new Certificate(x);
+
 		var defPaths = null;
-		switch( Sys.systemName() ){
+		switch (Sys.systemName()) {
 			case "Linux":
 				defPaths = [
 					"/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc.
-					"/etc/pki/tls/certs/ca-bundle.crt",   // Fedora/RHEL
-					"/etc/ssl/ca-bundle.pem",             // OpenSUSE
-					"/etc/pki/tls/cacert.pem",            // OpenELEC
-					"/etc/ssl/certs",                     // SLES10/SLES11
-					"/system/etc/security/cacerts"        // Android
+					"/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL
+					"/etc/ssl/ca-bundle.pem", // OpenSUSE
+					"/etc/pki/tls/cacert.pem", // OpenELEC
+					"/etc/ssl/certs", // SLES10/SLES11
+					"/system/etc/security/cacerts" // Android
 				];
 			case "BSD":
 				defPaths = [
 					"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
-					"/etc/ssl/cert.pem",                      // OpenBSD
-					"/etc/openssl/certs/ca-certificates.crt", // NetBSD	
+					"/etc/ssl/cert.pem", // OpenBSD
+					"/etc/openssl/certs/ca-certificates.crt", // NetBSD
 				];
 			case "Android":
 				defPaths = ["/system/etc/security/cacerts"];
 			default:
 		}
-		if( defPaths != null ){
-			for( path in defPaths ){
-				if( sys.FileSystem.exists(path) ){
-					if( sys.FileSystem.isDirectory(path) )
+		if (defPaths != null) {
+			for (path in defPaths) {
+				if (sys.FileSystem.exists(path)) {
+					if (sys.FileSystem.isDirectory(path))
 						return loadPath(path);
 					else
 						return loadFile(path);
@@ -63,69 +84,67 @@ class Certificate {
 		return null;
 	}
 
-	public var commonName(get,null) : Null<String>;
-	public var altNames(get, null) : Array<String>;
-	public var notBefore(get,null) : Date;
-	public var notAfter(get,null) : Date;
+	public var commonName(get, null):Null<String>;
+	public var altNames(get, null):Array<String>;
+	public var notBefore(get, null):Date;
+	public var notAfter(get, null):Date;
 
-	function get_commonName() : Null<String> {
+	function get_commonName():Null<String> {
 		return subject("CN");
 	}
 
-	function get_altNames() : Array<String> {
-		var l : Dynamic = cert_get_altnames(__x);
+	function get_altNames():Array<String> {
+		var l:Dynamic = cert_get_altnames(__x);
 		var a = new Array<String>();
-		while( l != null ){
+		while (l != null) {
 			a.push(new String(l[0]));
 			l = l[1];
 		}
 		return a;
 	}
-	
-	public function subject( field : String ) : Null<String> {
+
+	public function subject(field:String):Null<String> {
 		var s = cert_get_subject(__x, untyped field.__s);
-		return s==null ? null : new String( cast s );
+		return s == null ? null : new String(cast s);
 	}
-	
-	public function issuer( field : String ) : Null<String> {
+
+	public function issuer(field:String):Null<String> {
 		var s = cert_get_issuer(__x, untyped field.__s);
-		return s==null ? null : new String( cast s );
+		return s == null ? null : new String(cast s);
 	}
 
-	function get_notBefore() : Date {
-		var a = cert_get_notbefore( __x );
-		return new Date( a[0], a[1] - 1, a[2], a[3], a[4], a[5] );
+	function get_notBefore():Date {
+		var a = cert_get_notbefore(__x);
+		return new Date(a[0], a[1] - 1, a[2], a[3], a[4], a[5]);
 	}
 
-	function get_notAfter() : Date {
-		var a = cert_get_notafter( __x );
-		return new Date( a[0], a[1] - 1, a[2], a[3], a[4], a[5] );
+	function get_notAfter():Date {
+		var a = cert_get_notafter(__x);
+		return new Date(a[0], a[1] - 1, a[2], a[3], a[4], a[5]);
 	}
-	
-	public function next() : Null<Certificate> {
+
+	public function next():Null<Certificate> {
 		var n = cert_get_next(__x);
-		return n == null ? null : new Certificate( n, __h==null ? this : __h );
+		return n == null ? null : new Certificate(n, __h == null ? this : __h);
 	}
 
-	public function add( pem : String ) : Void {
-		cert_add_pem(__x,untyped pem.__s);
+	public function add(pem:String):Void {
+		cert_add_pem(__x, untyped pem.__s);
 	}
 
-	public function addDER( der : haxe.io.Bytes ) : Void {
-		cert_add_der(__x,der.getData());
+	public function addDER(der:haxe.io.Bytes):Void {
+		cert_add_der(__x, der.getData());
 	}
 
-	private static var cert_load_defaults = neko.Lib.loadLazy("ssl", "cert_load_defaults",0);
-	private static var cert_load_file = neko.Lib.loadLazy("ssl", "cert_load_file",1);
-	private static var cert_load_path = neko.Lib.loadLazy("ssl","cert_load_path",1);
+	private static var cert_load_defaults = neko.Lib.loadLazy("ssl", "cert_load_defaults", 0);
+	private static var cert_load_file = neko.Lib.loadLazy("ssl", "cert_load_file", 1);
+	private static var cert_load_path = neko.Lib.loadLazy("ssl", "cert_load_path", 1);
 	private static var cert_get_subject = neko.Lib.loadLazy("ssl", "cert_get_subject", 2);
-	private static var cert_get_issuer = neko.Lib.loadLazy("ssl","cert_get_issuer",2);
-	private static var cert_get_altnames = neko.Lib.loadLazy("ssl","cert_get_altnames",1);
-	private static var cert_get_notbefore = neko.Lib.loadLazy("ssl","cert_get_notbefore",1);
-	private static var cert_get_notafter = neko.Lib.loadLazy("ssl","cert_get_notafter",1);
-	private static var cert_get_next = neko.Lib.loadLazy("ssl","cert_get_next",1);
-	private static var cert_add_pem = neko.Lib.loadLazy("ssl","cert_add_pem",2);
-	private static var cert_add_der = neko.Lib.loadLazy("ssl","cert_add_der",2);
-
-
+	private static var cert_get_issuer = neko.Lib.loadLazy("ssl", "cert_get_issuer", 2);
+	private static var cert_get_altnames = neko.Lib.loadLazy("ssl", "cert_get_altnames", 1);
+	private static var cert_get_notbefore = neko.Lib.loadLazy("ssl", "cert_get_notbefore", 1);
+	private static var cert_get_notafter = neko.Lib.loadLazy("ssl", "cert_get_notafter", 1);
+	private static var cert_get_next = neko.Lib.loadLazy("ssl", "cert_get_next", 1);
+	private static var cert_add_pem = neko.Lib.loadLazy("ssl", "cert_add_pem", 2);
+	private static var cert_add_der = neko.Lib.loadLazy("ssl", "cert_add_der", 2);
 }
diff --git a/std/neko/_std/sys/ssl/Digest.hx b/std/neko/_std/sys/ssl/Digest.hx
index 26d8979bcf13bb18ebcfae7db0d3177c6374e521..887ac89adcac51afb506e3072648329d592a0406 100644
--- a/std/neko/_std/sys/ssl/Digest.hx
+++ b/std/neko/_std/sys/ssl/Digest.hx
@@ -1,22 +1,42 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
 
 @:coreApi
 class Digest {
-	
-	public static function make( data : haxe.io.Bytes, alg : DigestAlgorithm ) : haxe.io.Bytes {
-		return haxe.io.Bytes.ofData( dgst_make( data.getData(), untyped alg.__s ) );
-	}
-	
-	public static function sign( data : haxe.io.Bytes, privKey : Key, alg : DigestAlgorithm ) : haxe.io.Bytes {
-		return haxe.io.Bytes.ofData( dgst_sign( data.getData(), @:privateAccess privKey.__k, untyped alg.__s ) );
+	public static function make(data:haxe.io.Bytes, alg:DigestAlgorithm):haxe.io.Bytes {
+		return haxe.io.Bytes.ofData(dgst_make(data.getData(), untyped alg.__s));
 	}
-	
-	public static function verify( data : haxe.io.Bytes, signature : haxe.io.Bytes, pubKey : Key, alg : DigestAlgorithm ) : Bool{
-		return dgst_verify( data.getData(), signature.getData(), @:privateAccess pubKey.__k, untyped alg.__s );
+
+	public static function sign(data:haxe.io.Bytes, privKey:Key, alg:DigestAlgorithm):haxe.io.Bytes {
+		return haxe.io.Bytes.ofData(dgst_sign(data.getData(), @:privateAccess privKey.__k, untyped alg.__s));
 	}
 
-	private static var dgst_make = neko.Lib.loadLazy("ssl","dgst_make",2);
-	private static var dgst_sign = neko.Lib.loadLazy("ssl","dgst_sign",3);
-	private static var dgst_verify = neko.Lib.loadLazy("ssl","dgst_verify",4);
+	public static function verify(data:haxe.io.Bytes, signature:haxe.io.Bytes, pubKey:Key, alg:DigestAlgorithm):Bool {
+		return dgst_verify(data.getData(), signature.getData(), @:privateAccess pubKey.__k, untyped alg.__s);
+	}
 
+	private static var dgst_make = neko.Lib.loadLazy("ssl", "dgst_make", 2);
+	private static var dgst_sign = neko.Lib.loadLazy("ssl", "dgst_sign", 3);
+	private static var dgst_verify = neko.Lib.loadLazy("ssl", "dgst_verify", 4);
 }
diff --git a/std/neko/_std/sys/ssl/Key.hx b/std/neko/_std/sys/ssl/Key.hx
index b8294cf0f4159ee0a981be02815203d054ae4eeb..dfada5bcf684db6256f7bbad22eeaabd8956d3a1 100644
--- a/std/neko/_std/sys/ssl/Key.hx
+++ b/std/neko/_std/sys/ssl/Key.hx
@@ -1,34 +1,54 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
 
 private typedef PKEY = Dynamic;
 
 @:coreApi
 class Key {
-	
-	private var __k : PKEY;
+	private var __k:PKEY;
 
-	private function new( k : PKEY ){
+	private function new(k:PKEY) {
 		__k = k;
 	}
-	
-	public static function loadFile( file : String, ?isPublic : Bool, ?pass : String ) : Key {
-		var data = sys.io.File.getBytes( file );
+
+	public static function loadFile(file:String, ?isPublic:Bool, ?pass:String):Key {
+		var data = sys.io.File.getBytes(file);
 		var str = neko.Lib.stringReference(data);
-		if( str.indexOf("-----BEGIN ") >= 0 )
-			return readPEM( str, isPublic==true, pass );
+		if (str.indexOf("-----BEGIN ") >= 0)
+			return readPEM(str, isPublic == true, pass);
 		else
-			return readDER( data, isPublic==true );
-	}
-	
-	public static function readPEM( data : String, isPublic : Bool, ?pass : String ) : Key {
-		return new Key( key_from_pem( untyped data.__s, isPublic, pass == null ? null : untyped pass.__s ) );
+			return readDER(data, isPublic == true);
 	}
 
-	public static function readDER( data : haxe.io.Bytes, isPublic : Bool ) : Key {
-		return new Key( key_from_der( data.getData(), isPublic ) );
+	public static function readPEM(data:String, isPublic:Bool, ?pass:String):Key {
+		return new Key(key_from_pem(untyped data.__s, isPublic, pass == null ? null : untyped pass.__s));
 	}
 
-	private static var key_from_pem = neko.Lib.loadLazy("ssl","key_from_pem",3);
-	private static var key_from_der = neko.Lib.loadLazy("ssl","key_from_der",2);
+	public static function readDER(data:haxe.io.Bytes, isPublic:Bool):Key {
+		return new Key(key_from_der(data.getData(), isPublic));
+	}
 
+	private static var key_from_pem = neko.Lib.loadLazy("ssl", "key_from_pem", 3);
+	private static var key_from_der = neko.Lib.loadLazy("ssl", "key_from_der", 2);
 }
diff --git a/std/neko/_std/sys/ssl/Socket.hx b/std/neko/_std/sys/ssl/Socket.hx
index 4a6ceeb72d11f3dcd313e485eb8814799295173c..17b0a571e4669142e90e59764e139769027c77e7 100644
--- a/std/neko/_std/sys/ssl/Socket.hx
+++ b/std/neko/_std/sys/ssl/Socket.hx
@@ -1,3 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
 
 private typedef SocketHandle = Dynamic;
@@ -5,81 +27,81 @@ private typedef CTX = Dynamic;
 private typedef SSL = Dynamic;
 
 private class SocketInput extends haxe.io.Input {
-	@:allow(sys.ssl.Socket) private var __s : Socket;
+	@:allow(sys.ssl.Socket) private var __s:Socket;
 
-	public function new( s : Socket ) {
+	public function new(s:Socket) {
 		this.__s = s;
 	}
 
 	public override function readByte() {
 		return try {
 			__s.handshake();
-			ssl_recv_char( @:privateAccess __s.ssl );
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			ssl_recv_char(@:privateAccess __s.ssl);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw haxe.io.Error.Blocked;
-			else if( __s == null )
+			else if (__s == null)
 				throw haxe.io.Error.Custom(e);
 			else
 				throw new haxe.io.Eof();
 		}
 	}
 
-	public override function readBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) : Int {
-		var r : Int;
-		if( __s == null )
+	public override function readBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
+		var r:Int;
+		if (__s == null)
 			throw "Invalid handle";
 		try {
 			__s.handshake();
-			r = ssl_recv(  @:privateAccess __s.ssl, buf.getData(), pos, len );
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			r = ssl_recv(@:privateAccess __s.ssl, buf.getData(), pos, len);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw haxe.io.Error.Blocked;
 			else
 				throw haxe.io.Error.Custom(e);
 		}
-		if( r == 0 )
+		if (r == 0)
 			throw new haxe.io.Eof();
 		return r;
 	}
 
 	public override function close() {
 		super.close();
-		if( __s != null ) __s.close();
+		if (__s != null)
+			__s.close();
 	}
 
-	private static var ssl_recv = neko.Lib.loadLazy( "ssl", "ssl_recv", 4 );
-	private static var ssl_recv_char = neko.Lib.loadLazy( "ssl", "ssl_recv_char", 1 );
-
+	private static var ssl_recv = neko.Lib.loadLazy("ssl", "ssl_recv", 4);
+	private static var ssl_recv_char = neko.Lib.loadLazy("ssl", "ssl_recv_char", 1);
 }
 
 private class SocketOutput extends haxe.io.Output {
-	@:allow(sys.ssl.Socket) private var __s : Socket;
+	@:allow(sys.ssl.Socket) private var __s:Socket;
 
-	public function new( s : Socket ) {
+	public function new(s:Socket) {
 		this.__s = s;
 	}
 
-	public override function writeByte( c : Int ) {
-		if( __s == null )
+	public override function writeByte(c:Int) {
+		if (__s == null)
 			throw "Invalid handle";
 		try {
 			__s.handshake();
-			ssl_send_char( @:privateAccess __s.ssl, c);
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			ssl_send_char(@:privateAccess __s.ssl, c);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw haxe.io.Error.Blocked;
 			else
 				throw haxe.io.Error.Custom(e);
 		}
 	}
 
-	public override function writeBytes( buf : haxe.io.Bytes, pos : Int, len : Int) : Int {
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
 		return try {
 			__s.handshake();
-			ssl_send( @:privateAccess __s.ssl, buf.getData(), pos, len);
-		} catch( e : Dynamic ) {
-			if( e == "Blocking" )
+			ssl_send(@:privateAccess __s.ssl, buf.getData(), pos, len);
+		} catch (e:Dynamic) {
+			if (e == "Blocking")
 				throw haxe.io.Error.Blocked;
 			else
 				throw haxe.io.Error.Custom(e);
@@ -88,139 +110,142 @@ private class SocketOutput extends haxe.io.Output {
 
 	public override function close() {
 		super.close();
-		if( __s != null ) __s.close();
+		if (__s != null)
+			__s.close();
 	}
 
-	private static var ssl_send_char = neko.Lib.loadLazy( "ssl", "ssl_send_char", 2 );
-	private static var ssl_send = neko.Lib.loadLazy( "ssl", "ssl_send", 4 );
+	private static var ssl_send_char = neko.Lib.loadLazy("ssl", "ssl_send_char", 2);
+	private static var ssl_send = neko.Lib.loadLazy("ssl", "ssl_send", 4);
 }
 
 @:coreApi
 class Socket extends sys.net.Socket {
-	
-	public static var DEFAULT_VERIFY_CERT : Null<Bool> = true;
-
-	public static var DEFAULT_CA : Null<Certificate>;
-	
-	private var ctx : CTX;
-	private var ssl : SSL;
-	
-	public var verifyCert : Null<Bool>;
-	private var caCert : Null<Certificate>;
-	private var hostname : String;
-
-	private var ownCert : Null<Certificate>;
-	private var ownKey : Null<Key>;
-	private var altSNIContexts : Null<Array<{match: String->Bool, key: Key, cert: Certificate}>>;
-	private var sniCallback : Dynamic;
-	private var handshakeDone : Bool;
-
-	private override function init() : Void {
-		__s = socket_new( false );
-		input = new SocketInput( this );
-		output = new SocketOutput( this );
-		if( DEFAULT_VERIFY_CERT && DEFAULT_CA == null ){
+	public static var DEFAULT_VERIFY_CERT:Null<Bool> = true;
+
+	public static var DEFAULT_CA:Null<Certificate>;
+
+	private var ctx:CTX;
+	private var ssl:SSL;
+
+	public var verifyCert:Null<Bool>;
+
+	private var caCert:Null<Certificate>;
+	private var hostname:String;
+
+	private var ownCert:Null<Certificate>;
+	private var ownKey:Null<Key>;
+	private var altSNIContexts:Null<Array<{match:String->Bool, key:Key, cert:Certificate}>>;
+	private var sniCallback:Dynamic;
+	private var handshakeDone:Bool;
+
+	private override function init():Void {
+		__s = socket_new(false);
+		input = new SocketInput(this);
+		output = new SocketOutput(this);
+		if (DEFAULT_VERIFY_CERT && DEFAULT_CA == null) {
 			try {
 				DEFAULT_CA = Certificate.loadDefaults();
-			}catch( e : Dynamic ){}
+			} catch (e:Dynamic) {}
 		}
 		verifyCert = DEFAULT_VERIFY_CERT;
 		caCert = DEFAULT_CA;
 	}
 
-	public override function connect(host : sys.net.Host, port : Int) : Void {
+	public override function connect(host:sys.net.Host, port:Int):Void {
 		try {
-			ctx = buildSSLContext( false );
-			ssl = ssl_new( ctx );
-			ssl_set_socket( ssl, __s );
+			ctx = buildSSLContext(false);
+			ssl = ssl_new(ctx);
+			ssl_set_socket(ssl, __s);
 			handshakeDone = false;
-			if( hostname == null )
+			if (hostname == null)
 				hostname = host.host;
-			if( hostname != null )
-				ssl_set_hostname( ssl, untyped hostname.__s );
-			socket_connect( __s, host.ip, port );
+			if (hostname != null)
+				ssl_set_hostname(ssl, untyped hostname.__s);
+			socket_connect(__s, host.ip, port);
 			handshake();
-		} catch( s : String ) {
-			if( s == "std@socket_connect" )
-				throw "Failed to connect on "+host.host+":"+port;
+		} catch (s:String) {
+			if (s == "std@socket_connect")
+				throw "Failed to connect on " + host.host + ":" + port;
 			else
 				neko.Lib.rethrow(s);
-		} catch( e : Dynamic ) {
+		} catch (e:Dynamic) {
 			neko.Lib.rethrow(e);
 		}
 	}
 
-	public function handshake() : Void {
-		if( !handshakeDone ){
+	public function handshake():Void {
+		if (!handshakeDone) {
 			try {
-				ssl_handshake( ssl );
+				ssl_handshake(ssl);
 				handshakeDone = true;
-			} catch( e : Dynamic ) {
-				if( e == "Blocking" )
+			} catch (e:Dynamic) {
+				if (e == "Blocking")
 					throw haxe.io.Error.Blocked;
 				else
-					neko.Lib.rethrow( e );
+					neko.Lib.rethrow(e);
 			}
 		}
 	}
 
-	public function setCA( cert : Certificate ) : Void {
+	public function setCA(cert:Certificate):Void {
 		caCert = cert;
 	}
 
-	public function setHostname( name : String ) : Void {
+	public function setHostname(name:String):Void {
 		hostname = name;
 	}
 
-	public function setCertificate( cert : Certificate, key : Key ) : Void {
+	public function setCertificate(cert:Certificate, key:Key):Void {
 		ownCert = cert;
 		ownKey = key;
 	}
 
-	public override function read() : String {
+	public override function read():String {
 		handshake();
-		var b = ssl_read( ssl );
-		if( b == null )
+		var b = ssl_read(ssl);
+		if (b == null)
 			return "";
 		return new String(cast b);
 	}
 
-	public override function write( content : String ) : Void {
+	public override function write(content:String):Void {
 		handshake();
-		ssl_write( ssl, untyped content.__s );
+		ssl_write(ssl, untyped content.__s);
 	}
 
-	public override function close() : Void {
-		if( ssl != null ) ssl_close( ssl );
-		if( ctx != null ) conf_close( ctx );
-		if( altSNIContexts != null )
+	public override function close():Void {
+		if (ssl != null)
+			ssl_close(ssl);
+		if (ctx != null)
+			conf_close(ctx);
+		if (altSNIContexts != null)
 			sniCallback = null;
-		socket_close( __s );
-		var input : SocketInput = cast input;
-		var output : SocketOutput = cast output;
+		socket_close(__s);
+		var input:SocketInput = cast input;
+		var output:SocketOutput = cast output;
 		@:privateAccess input.__s = output.__s = null;
 		input.close();
 		output.close();
 	}
 
-	public function addSNICertificate( cbServernameMatch : String->Bool, cert : Certificate, key : Key ) : Void {
-		if( altSNIContexts == null )
+	public function addSNICertificate(cbServernameMatch:String->Bool, cert:Certificate, key:Key):Void {
+		if (altSNIContexts == null)
 			altSNIContexts = [];
-		altSNIContexts.push( {match: cbServernameMatch, cert: cert, key: key} );
+		altSNIContexts.push({match: cbServernameMatch, cert: cert, key: key});
 	}
 
-	public override function bind( host : sys.net.Host, port : Int ) : Void {
-		ctx = buildSSLContext( true );
+	public override function bind(host:sys.net.Host, port:Int):Void {
+		ctx = buildSSLContext(true);
 
-		socket_bind( __s, host.ip, port );
+		socket_bind(__s, host.ip, port);
 	}
 
-	public override function accept() : Socket {
-		var c = socket_accept( __s );
-		var ssl = ssl_new( ctx );
-		ssl_set_socket( ssl, c );
+	public override function accept():Socket {
+		var c = socket_accept(__s);
+		var ssl = ssl_new(ctx);
+		ssl_set_socket(ssl, c);
 
-		var s = Type.createEmptyInstance( sys.ssl.Socket );
+		var s = Type.createEmptyInstance(sys.ssl.Socket);
 		s.__s = c;
 		s.ssl = ssl;
 		s.input = new SocketInput(s);
@@ -230,60 +255,62 @@ class Socket extends sys.net.Socket {
 		return s;
 	}
 
-	public function peerCertificate() : sys.ssl.Certificate {
-		var x = ssl_get_peer_certificate( ssl );
-		return x==null ? null : new sys.ssl.Certificate( x );
+	public function peerCertificate():sys.ssl.Certificate {
+		var x = ssl_get_peer_certificate(ssl);
+		return x == null ? null : new sys.ssl.Certificate(x);
 	}
 
-	private function buildSSLContext( server : Bool ) : CTX {
-		var ctx : CTX = conf_new( server );
+	private function buildSSLContext(server:Bool):CTX {
+		var ctx:CTX = conf_new(server);
 
-		if( ownCert != null && ownKey != null )
-			conf_set_cert( ctx, @:privateAccess ownCert.__x, @:privateAccess ownKey.__k );
+		if (ownCert != null && ownKey != null)
+			conf_set_cert(ctx, @:privateAccess ownCert.__x, @:privateAccess ownKey.__k);
 
-		if ( altSNIContexts != null ) {
+		if (altSNIContexts != null) {
 			sniCallback = function(servername) {
 				var servername = new String(cast servername);
-				for( c in altSNIContexts ){
-					if( c.match(servername) )
-						return @:privateAccess {key: c.key.__k, cert: c.cert.__x};
+				for (c in altSNIContexts) {
+					if (c.match(servername))
+						return @:privateAccess {
+							key:c.key.__k, cert:c.cert.__x
+						};
 				}
-				if( ownKey != null && ownCert != null )
-					return @:privateAccess { key: ownKey.__k, cert: ownCert.__x };
+				if (ownKey != null && ownCert != null)
+					return @:privateAccess {
+						key:ownKey.__k, cert:ownCert.__x
+					};
 				return null;
 			}
-			conf_set_servername_callback( ctx, sniCallback );
+			conf_set_servername_callback(ctx, sniCallback);
 		}
 
-		if ( caCert != null ) 
-			conf_set_ca( ctx, caCert == null ? null : @:privateAccess caCert.__x  );
-		conf_set_verify( ctx, verifyCert );
-		
+		if (caCert != null)
+			conf_set_ca(ctx, caCert == null ? null : @:privateAccess caCert.__x);
+		conf_set_verify(ctx, verifyCert);
+
 		return ctx;
 	}
-	
-
-	private static var ssl_new = neko.Lib.loadLazy( "ssl", "ssl_new", 1 );
-	private static var ssl_close = neko.Lib.loadLazy( "ssl", "ssl_close", 1 );
-	private static var ssl_handshake = neko.Lib.loadLazy( "ssl", "ssl_handshake", 1 );
-	private static var ssl_set_socket = neko.Lib.loadLazy( "ssl", "ssl_set_socket", 2 );
-	private static var ssl_set_hostname = neko.Lib.loadLazy( "ssl", "ssl_set_hostname", 2 );
-	private static var ssl_get_peer_certificate = neko.Lib.loadLazy( "ssl", "ssl_get_peer_certificate", 1 );
-
-	private static var ssl_read = neko.Lib.loadLazy( "ssl", "ssl_read", 1 );
-	private static var ssl_write = neko.Lib.loadLazy( "ssl", "ssl_write", 2 );
-
-	private static var conf_new = neko.Lib.loadLazy( "ssl", "conf_new", 1 );
-	private static var conf_close = neko.Lib.loadLazy( "ssl", "conf_close", 1 );
-	private static var conf_set_ca = neko.Lib.loadLazy( "ssl", "conf_set_ca", 2 );
-	private static var conf_set_verify = neko.Lib.loadLazy( "ssl", "conf_set_verify", 2 );
-	private static var conf_set_cert = neko.Lib.loadLazy( "ssl", "conf_set_cert", 3 );
-	private static var conf_set_servername_callback = neko.Lib.loadLazy( "ssl", "conf_set_servername_callback", 2 );
-
-	private static var socket_new = neko.Lib.load("std","socket_new",1);
-	private static var socket_close = neko.Lib.load("std","socket_close",1);
-	private static var socket_connect = neko.Lib.load("std","socket_connect",3);
-	private static var socket_bind = neko.Lib.load("std","socket_bind",3);
-	private static var socket_accept = neko.Lib.load("std","socket_accept",1);
 
+	private static var ssl_new = neko.Lib.loadLazy("ssl", "ssl_new", 1);
+	private static var ssl_close = neko.Lib.loadLazy("ssl", "ssl_close", 1);
+	private static var ssl_handshake = neko.Lib.loadLazy("ssl", "ssl_handshake", 1);
+	private static var ssl_set_socket = neko.Lib.loadLazy("ssl", "ssl_set_socket", 2);
+	private static var ssl_set_hostname = neko.Lib.loadLazy("ssl", "ssl_set_hostname", 2);
+	private static var ssl_get_peer_certificate = neko.Lib.loadLazy("ssl", "ssl_get_peer_certificate", 1);
+
+	private static var ssl_read = neko.Lib.loadLazy("ssl", "ssl_read", 1);
+	private static var ssl_write = neko.Lib.loadLazy("ssl", "ssl_write", 2);
+
+	private static var conf_new = neko.Lib.loadLazy("ssl", "conf_new", 1);
+	private static var conf_close = neko.Lib.loadLazy("ssl", "conf_close", 1);
+	private static var conf_set_ca = neko.Lib.loadLazy("ssl", "conf_set_ca", 2);
+	private static var conf_set_verify = neko.Lib.loadLazy("ssl", "conf_set_verify", 2);
+	private static var conf_set_cert = neko.Lib.loadLazy("ssl", "conf_set_cert", 3);
+	private static var conf_set_servername_callback = neko.Lib.loadLazy("ssl", "conf_set_servername_callback", 2);
+
+	private static var socket_new = neko.Lib.load("std", "socket_new", 1);
+	private static var socket_close = neko.Lib.load("std", "socket_close", 1);
+	private static var socket_connect = neko.Lib.load("std", "socket_connect", 3);
+	private static var socket_bind = neko.Lib.load("std", "socket_bind", 3);
+	private static var socket_accept = neko.Lib.load("std", "socket_accept", 1);
 }
diff --git a/std/neko/_std/sys/thread/Deque.hx b/std/neko/_std/sys/thread/Deque.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a710e86b18cfaa83242882be587358229fe01016
--- /dev/null
+++ b/std/neko/_std/sys/thread/Deque.hx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:coreApi
+class Deque<T> {
+	var q:Dynamic;
+
+	public function new() {
+		q = deque_create();
+	}
+
+	public function add(i:T):Void {
+		deque_add(q, i);
+	}
+
+	public function push(i:T):Void {
+		deque_push(q, i);
+	}
+
+	public function pop(block:Bool):Null<T> {
+		return deque_pop(q, block);
+	}
+
+	static var deque_create = neko.Lib.loadLazy("std", "deque_create", 0);
+	static var deque_add = neko.Lib.loadLazy("std", "deque_add", 2);
+	static var deque_push = neko.Lib.loadLazy("std", "deque_push", 2);
+	static var deque_pop = neko.Lib.loadLazy("std", "deque_pop", 2);
+}
diff --git a/std/neko/_std/sys/thread/Lock.hx b/std/neko/_std/sys/thread/Lock.hx
new file mode 100644
index 0000000000000000000000000000000000000000..816cf2a4a6414559175fc8ed9f8ba8c22eb5ed85
--- /dev/null
+++ b/std/neko/_std/sys/thread/Lock.hx
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:coreApi
+class Lock {
+	var l:Dynamic;
+
+	public function new() {
+		l = lock_create();
+	}
+
+	public function wait(?timeout:Float):Bool {
+		return lock_wait(l, timeout);
+	}
+
+	public function release():Void {
+		lock_release(l);
+	}
+
+	static var lock_create = neko.Lib.load("std", "lock_create", 0);
+	static var lock_release = neko.Lib.load("std", "lock_release", 1);
+	static var lock_wait = neko.Lib.load("std", "lock_wait", 2);
+}
diff --git a/std/neko/_std/sys/thread/Mutex.hx b/std/neko/_std/sys/thread/Mutex.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7fc35b1120cd3bbeae217a59cf8aa5678c12ac09
--- /dev/null
+++ b/std/neko/_std/sys/thread/Mutex.hx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:coreApi
+class Mutex {
+	var m:Dynamic;
+
+	public function new():Void {
+		m = mutex_create();
+	}
+
+	public function acquire():Void {
+		mutex_acquire(m);
+	}
+
+	public function tryAcquire():Bool {
+		return mutex_try(m);
+	}
+
+	public function release():Void {
+		mutex_release(m);
+	}
+
+	static var mutex_create = neko.Lib.loadLazy("std", "mutex_create", 0);
+	static var mutex_release = neko.Lib.loadLazy("std", "mutex_release", 1);
+	static var mutex_acquire = neko.Lib.loadLazy("std", "mutex_acquire", 1);
+	static var mutex_try = neko.Lib.loadLazy("std", "mutex_try", 1);
+}
diff --git a/std/neko/_std/sys/thread/Thread.hx b/std/neko/_std/sys/thread/Thread.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9b089f4a0943853b960df4f934c56ceeba5f65ce
--- /dev/null
+++ b/std/neko/_std/sys/thread/Thread.hx
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:callable
+@:coreType
+private abstract ThreadHandle {}
+
+abstract Thread(ThreadHandle) {
+	inline function new(h:ThreadHandle):Void {
+		this = h;
+	}
+
+	public inline function sendMessage(msg:Dynamic):Void {
+		thread_send(this, msg);
+	}
+
+	public static inline function current():Thread {
+		return new Thread(thread_current());
+	}
+
+	public static inline function create(callb:Void->Void):Thread {
+		return new Thread(thread_create(function(_) {
+			return callb();
+		}, null));
+	}
+
+	public static inline function readMessage(block:Bool):Dynamic {
+		return thread_read_message(block);
+	}
+
+	@:op(A == B)
+	inline function equals(other:Thread):Bool {
+		return getHandle() == other.getHandle();
+	}
+
+	private inline function getHandle():ThreadHandle {
+		return this;
+	}
+
+	/**
+			Starts an OS message loop after [osInitialize] has been done.
+			In that state, the UI handled by this thread will be updated and
+			[sync] calls can be performed. The loop returns when [exitLoop] is
+			called for this thread.
+		**
+		public static function osLoop() {
+			if( os_loop == null ) throw "Please call osInitialize() first";
+			os_loop();
+		}
+
+		/**
+			The function [f] will be called by this thread if it's in [osLoop].
+			[sync] returns immediately. See [osInitialize] remarks.
+		**
+		public function sync( f : Void -> Void ) {
+			os_sync(handle,f);
+		}
+
+		/**
+			The function [f] will be called by this thread and the calling thread
+			will wait until the result is available then return its value.
+		**
+		public function syncResult<T>( f : Void -> T ) : T {
+			if( this == current() )
+				return f();
+			var v = new neko.vm.Lock();
+			var r = null;
+			sync(function() {
+				r = f();
+				v.release();
+			});
+			v.wait();
+			return r;
+		}
+
+		/**
+			Exit from [osLoop].
+		**
+		public function exitLoop() {
+			os_loop_stop(handle);
+		}
+
+		/**
+			If you want to use the [osLoop], [sync] and [syncResult] methods, you
+			need to call [osInitialize] before creating any thread or calling [current].
+			This will load [os.ndll] library and initialize UI methods for each thread.
+		**
+		public static function osInitialize() {
+			os_loop = neko.Lib.load("os","os_loop",0);
+			os_loop_stop = neko.Lib.load("os","os_loop_stop",1);
+			os_sync = neko.Lib.load("os","os_sync",2);
+		}
+
+		static var os_loop = null;
+		static var os_loop_stop = null;
+		static var os_sync = null;
+	 */
+	static var thread_create = neko.Lib.load("std", "thread_create", 2);
+
+	static var thread_current = neko.Lib.load("std", "thread_current", 0);
+	static var thread_send = neko.Lib.load("std", "thread_send", 2);
+	static var thread_read_message = neko.Lib.load("std", "thread_read_message", 1);
+}
diff --git a/std/neko/_std/sys/thread/Tls.hx b/std/neko/_std/sys/thread/Tls.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a75d62465b5823ff56f72cb6f3038e50eb40b5e9
--- /dev/null
+++ b/std/neko/_std/sys/thread/Tls.hx
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+@:coreApi
+class Tls<T> {
+	var t:Dynamic;
+
+	public var value(get, set):T;
+
+	public function new() {
+		t = tls_create();
+	}
+
+	function get_value():T {
+		return tls_get(t);
+	}
+
+	function set_value(v:T):T {
+		tls_set(t, v);
+		return v;
+	}
+
+	static var tls_create = neko.Lib.load("std", "tls_create", 0);
+	static var tls_get = neko.Lib.load("std", "tls_get", 1);
+	static var tls_set = neko.Lib.load("std", "tls_set", 2);
+}
diff --git a/std/neko/vm/Deque.hx b/std/neko/vm/Deque.hx
index 36b48f153de0bf57a258ecf05cc0fa0c157a4d9a..d09ce91a3d1bb184f7a83e7dcbda2c2a9530f6fc 100644
--- a/std/neko/vm/Deque.hx
+++ b/std/neko/vm/Deque.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,45 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package neko.vm;
-
-/**
-	A message queue for multithread access.
-*/
-class Deque<T> {
-	var q : Dynamic;
-
-	/**
-		Create a message queue for multithread access.
-	*/
-	public function new() {
-		q = deque_create();
-	}
 
-	/**
-		Add a message at the end of the queue.
-	*/
-	public function add( i : T ) {
-		deque_add(q,i);
-	}
-
-	/**
-		Add a message at the head of the queue.
-	*/
-	public function push( i : T ) {
-		deque_push(q,i);
-	}
-
-	/**
-		Pop a message from the queue head. Either block until a message 
-		is available or return immediately with `null`.
-	*/
-	public function pop( block : Bool ) : Null<T> {
-		return deque_pop(q,block);
-	}
+package neko.vm;
 
-	static var deque_create = neko.Lib.loadLazy("std","deque_create",0);
-	static var deque_add = neko.Lib.loadLazy("std","deque_add",2);
-	static var deque_push = neko.Lib.loadLazy("std","deque_push",2);
-	static var deque_pop = neko.Lib.loadLazy("std","deque_pop",2);
-}
+@:deprecated typedef Deque<T> = sys.thread.Deque<T>;
diff --git a/std/neko/vm/Gc.hx b/std/neko/vm/Gc.hx
index 64f3282d999b16fe7162ce88a4fb11138b66260e..6eaee6d3559a674e49166f749069d77344303a8b 100644
--- a/std/neko/vm/Gc.hx
+++ b/std/neko/vm/Gc.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,27 +19,28 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package neko.vm;
 
 /**
 	Neko garbage collector utility.
-*/
+ */
 class Gc {
 	/**
 		Run the Neko garbage collector.
-	*/
-	public static function run( major : Bool ) {
+	**/
+	public static function run(major:Bool) {
 		_run(major);
 	}
 
 	/**
-		Return the size of the GC heap and the among of free space, 
+		Return the size of the GC heap and the among of free space,
 		in bytes.
-	*/
-	public static function stats() : { heap : Int, free : Int } {
+	**/
+	public static function stats():{heap:Int, free:Int} {
 		return _stats();
 	}
 
-	static var _run = neko.Lib.load("std","run_gc",1);
-	static var _stats = neko.Lib.load("std","gc_stats",0);
+	static var _run = neko.Lib.load("std", "run_gc", 1);
+	static var _stats = neko.Lib.load("std", "gc_stats", 0);
 }
diff --git a/std/neko/vm/Loader.hx b/std/neko/vm/Loader.hx
index b919c7792c8c95733e4aafa2ea8f4e2f7b40568e..0189cc52ef1871e7d4cc9bd35dc1defe346cd20f 100644
--- a/std/neko/vm/Loader.hx
+++ b/std/neko/vm/Loader.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package neko.vm;
 
 /**
 	The Neko object that implements the loader.
 **/
-enum LoaderHandle {
-}
+@:callable
+@:coreType
+abstract LoaderHandle {}
 
 /**
 	Loaders can be used to dynamically load Neko primitives stored in NDLL libraries.
@@ -43,13 +45,12 @@ enum LoaderHandle {
 	with custom secured versions. Loaders are inherited in loaded submodules.
 **/
 class Loader {
-
 	/**
 		The abstract handle.
 	**/
-	public var l : LoaderHandle;
+	public var l:LoaderHandle;
 
-	public function new( l ) {
+	public function new(l) {
 		this.l = l;
 	}
 
@@ -61,7 +62,7 @@ class Loader {
 	public function getPath() {
 		var p = untyped l.path;
 		var path = new Array<String>();
-		while( p != null ) {
+		while (p != null) {
 			path.push(new String(p[0]));
 			p = cast p[1];
 		}
@@ -71,8 +72,8 @@ class Loader {
 	/**
 		Adds a directory to the search path. See `getPath`.
 	**/
-	public function addPath( s : String ) {
-		untyped l.path = __dollar__array(s.__s,l.path);
+	public function addPath(s:String) {
+		untyped l.path = __dollar__array(s.__s, l.path);
 	}
 
 	/**
@@ -82,36 +83,36 @@ class Loader {
 		but with different names, for example with two relative paths representing
 		the same file, since the cache is done on a by-name basic.
 	**/
-	public function getCache() : Map<String,Module> {
+	public function getCache():Map<String, Module> {
 		var h = new haxe.ds.StringMap<Module>();
 		var cache = untyped l.cache;
-		for( f in Reflect.fields(cache) )
-			h.set(f,new Module(Reflect.field(cache,f)));
+		for (f in Reflect.fields(cache))
+			h.set(f, new Module(Reflect.field(cache, f)));
 		return h;
 	}
 
 	/**
 		Set a module in the loader cache.
 	**/
-	public function setCache( name : String, m : Module ) {
-		if( m == null )
-			Reflect.deleteField(untyped l.cache,name);
+	public function setCache(name:String, m:Module) {
+		if (m == null)
+			Reflect.deleteField(untyped l.cache, name);
 		else
-			Reflect.setField(untyped l.cache,name,m.m);
+			Reflect.setField(untyped l.cache, name, m.m);
 	}
 
 	/**
 		Change the cache value and returns the old value. This can be used
 		to backup the loader cache and restore it later.
 	**/
-	public function backupCache( c : Dynamic ) : Dynamic {
+	public function backupCache(c:Dynamic):Dynamic {
 		var old = untyped l.cache;
 		untyped l.cache = c;
 		return old;
 	}
 
-	function __compare( other : Loader ) {
-		return untyped __dollar__compare(this.l,other.l);
+	function __compare(other:Loader) {
+		return untyped __dollar__compare(this.l, other.l);
 	}
 
 	/**
@@ -119,8 +120,8 @@ class Loader {
 		The primitive might not be used directly in Haxe since some of the Neko values
 		needs an object wrapper in Haxe.
 	**/
-	public function loadPrimitive( prim : String, nargs : Int ) : Dynamic {
-		return untyped l.loadprim(prim.__s,nargs);
+	public function loadPrimitive(prim:String, nargs:Int):Dynamic {
+		return untyped l.loadprim(prim.__s, nargs);
 	}
 
 	/**
@@ -128,8 +129,8 @@ class Loader {
 		this Module loader, else this loader will be inherited. When loaded this
 		way, the module is directly executed.
 	**/
-	public function loadModule( modName : String, ?loader : Loader ) : Module {
-		var exp = untyped l.loadmodule(modName.__s,if( loader == null ) l else loader.l);
+	public function loadModule(modName:String, ?loader:Loader):Module {
+		var exp = untyped l.loadmodule(modName.__s, if (loader == null) l else loader.l);
 		return new Module(exp.__module);
 	}
 
@@ -145,18 +146,17 @@ class Loader {
 		Creates a loader using two methods. This loader will not have an accessible cache or path,
 		although you can implement such mechanism in the methods body.
 	**/
-	public static function make( loadPrim : String -> Int -> Dynamic, loadModule : String -> Loader -> Module ) {
+	public static function make(loadPrim:String->Int->Dynamic, loadModule:String->Loader->Module) {
 		var l = {
-			loadprim : function(prim,nargs) {
-				return loadPrim(new String(prim),nargs);
+			loadprim: function(prim, nargs) {
+				return loadPrim(new String(prim), nargs);
 			},
-			loadmodule : function(mname,loader) {
-				return loadModule(new String(mname),new Loader(loader)).exportsTable();
+			loadmodule: function(mname, loader) {
+				return loadModule(new String(mname), new Loader(loader)).exportsTable();
 			},
-			args : untyped __dollar__amake(0),
-			cache : {},
+			args: untyped __dollar__amake(0),
+			cache: {},
 		};
 		return new Loader(cast l);
 	}
-
 }
diff --git a/std/neko/vm/Lock.hx b/std/neko/vm/Lock.hx
index 012093800b729137ad9974f1a5d71073050fa3ed..0fe8eb5365a14f3a7be03165437594d3d949df36 100644
--- a/std/neko/vm/Lock.hx
+++ b/std/neko/vm/Lock.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,37 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package neko.vm;
-
-class Lock {
-	var l : Dynamic;
 
-	/**
-		Creates a lock which is initially locked.
-	*/
-	public function new() {
-		l = lock_create();
-	}
-
-	/**
-		Waits for a lock to be released and acquire it. If timeout 
-		(in seconds) is not `null` and expires then the returned 
-		value is `false`.
-	*/
-	public function wait( ?timeout : Float ) : Bool {
-		return lock_wait(l,timeout);
-	}
-	
-	/**
-		Release a lock. The thread does not need to own the lock 
-		to be able to release it. If a lock is released several 
-		times, it can be acquired as many times.
-	*/
-	public function release() {
-		lock_release(l);
-	}
+package neko.vm;
 
-	static var lock_create = neko.Lib.load("std","lock_create",0);
-	static var lock_release = neko.Lib.load("std","lock_release",1);
-	static var lock_wait = neko.Lib.load("std","lock_wait",2);
-}
+@:deprecated typedef Lock = sys.thread.Lock;
diff --git a/std/neko/vm/Module.hx b/std/neko/vm/Module.hx
index 2d4d75d383eb8de4c44a38d36646317b93bdab0c..fc2f9f42076e1b3fce420ad2ef978b47f3c936c7 100644
--- a/std/neko/vm/Module.hx
+++ b/std/neko/vm/Module.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,27 +19,29 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package neko.vm;
 
 /**
 	The abstract Neko module handle.
 **/
-enum ModuleHandle {
-}
+@:callable
+@:coreType
+abstract ModuleHandle {}
 
 /**
-	A Neko Module represent a execution unit for the Neko Virtual Machine. 
+	A Neko Module represent a execution unit for the Neko Virtual Machine.
 	Each compiled `.n` bytecode file is a module once loaded by the NekoVM.
 **/
 class Module {
-
 	/**
 		The abstract handle.
 	**/
-	public var m : ModuleHandle;
-	public var name(get,set) : String;
+	public var m:ModuleHandle;
 
-	public function new( m ) {
+	public var name(get, set):String;
+
+	public function new(m) {
 		this.m = m;
 	}
 
@@ -48,7 +50,7 @@ class Module {
 		A module can be executed several times but its globals are only initialized once
 		the first time the Module is loaded.
 	**/
-	public function execute() : Dynamic {
+	public function execute():Dynamic {
 		return _module_exec(m);
 	}
 
@@ -56,12 +58,11 @@ class Module {
 		return new String(_module_name(m));
 	}
 
-	function set_name( n : String ) {
-		_module_set_name(m,untyped n.__s);
+	function set_name(n:String) {
+		_module_set_name(m, untyped n.__s);
 		return n;
 	}
 
-
 	/**
 		Returns the Loader that this Module was loaded with.
 	**/
@@ -72,60 +73,60 @@ class Module {
 	/**
 		Returns the codeSize of the Module.
 	**/
-	public function codeSize() : Int {
+	public function codeSize():Int {
 		return _module_code_size(m);
 	}
 
 	/**
 		Returns the number of globals in this Module global table.
 	**/
-	public function globalsCount() : Int {
+	public function globalsCount():Int {
 		return _module_nglobals(m);
 	}
 
 	/**
 		Get a Module global value.
 	**/
-	public function getGlobal( n : Int ) : Dynamic {
-		return _module_global_get(m,n);
+	public function getGlobal(n:Int):Dynamic {
+		return _module_global_get(m, n);
 	}
 
 	/**
 		Set a Module global value.
 	**/
-	public function setGlobal( n : Int, v : Dynamic ) {
-		_module_global_set(m,n,v);
+	public function setGlobal(n:Int, v:Dynamic) {
+		_module_global_set(m, n, v);
 	}
 
 	public function toString() {
-		return "[Module:"+name+"]";
+		return "[Module:" + name + "]";
 	}
 
 	/**
 		Each Module has an export table which can be useful to transfert
 		values between modules.
 	**/
-	public function getExports() : Map<String,Dynamic> {
+	public function getExports():Map<String, Dynamic> {
 		var h = new haxe.ds.StringMap();
 		var exp = _module_exports(m);
-		for( f in Reflect.fields(exp) )
-			h.set(f,Reflect.field(exp,f));
+		for (f in Reflect.fields(exp))
+			h.set(f, Reflect.field(exp, f));
 		return h;
 	}
 
 	/**
 		The raw export table.
 	**/
-	public function exportsTable() : Dynamic {
+	public function exportsTable():Dynamic {
 		return _module_exports(m);
 	}
 
 	/**
 		Set a value in the Module export table.
 	**/
-	public function setExport( name : String, value : Dynamic ) {
+	public function setExport(name:String, value:Dynamic) {
 		var exp = _module_exports(m);
-		Reflect.setField(exp,name,value);
+		Reflect.setField(exp, name, value);
 	}
 
 	/**
@@ -140,10 +141,10 @@ class Module {
 		Reads a module from an Input by using the given Loader.
 		The module is initialized but has not yet been executed.
 	**/
-	public static function read( i : haxe.io.Input, l : Loader ) : Module {
-		var m = _module_read(function(buf,pos,len) {
-			return i.readBytes(untyped new haxe.io.Bytes(len,buf),pos,len);
-		},l.l);
+	public static function read(i:haxe.io.Input, l:Loader):Module {
+		var m = _module_read(function(buf, pos, len) {
+			return i.readBytes(untyped new haxe.io.Bytes(len, buf), pos, len);
+		}, l.l);
 		return new Module(m);
 	}
 
@@ -151,72 +152,71 @@ class Module {
 		Reads a module from Bytes using the given Loader.
 		The module is initialized but has not yet been executed.
 	**/
-	public static function readBytes( b : haxe.io.Bytes, loader : Loader ) : Module {
-		return new Module(_module_read_string(b.getData(),loader.l));
+	public static function readBytes(b:haxe.io.Bytes, loader:Loader):Module {
+		return new Module(_module_read_string(b.getData(), loader.l));
 	}
 
 	/**
 		Reads a module from a name and using the specified seach path and loader.
 		The module is initialized but has not yet been executed.
 	**/
-	public static function readPath( name : String, path : Array<String>, loader : Loader ) {
+	public static function readPath(name:String, path:Array<String>, loader:Loader) {
 		var p = null;
 		var i = path.length;
-		while( --i >= 0 )
-			p = untyped __dollar__array(path[i].__s,p);
-		var m = _module_read_path(p,untyped name.__s,loader.l);
+		while (--i >= 0)
+			p = untyped __dollar__array(path[i].__s, p);
+		var m = _module_read_path(p, untyped name.__s, loader.l);
 		return new Module(m);
 	}
 
 	/**
 		Extract the globals names from the given module
 	**/
-	public static function readGlobalsNames( i : haxe.io.Input ) {
-		if( i.readByte() != 0x4E || i.readByte() != 0x45 || i.readByte() != 0x4B || i.readByte() != 0x4F )
+	public static function readGlobalsNames(i:haxe.io.Input) {
+		if (i.readByte() != 0x4E || i.readByte() != 0x45 || i.readByte() != 0x4B || i.readByte() != 0x4F)
 			throw "Not a neko file";
 		function readInt() {
 			return i.readInt32();
 		}
 		var nglobals = readInt();
-		var nfields = readInt();
-		var codesize = readInt();
+		/*var nfields =*/ readInt();
+		/*var codesize =*/ readInt();
 		var a = new Array();
-		for( k in 0...nglobals ) {
-			switch(i.readByte()) {
-			case 1:
-				a.push(i.readUntil(0));
-			case 2:
-				a.push("<fun:"+(readInt()&0xFFFFFF)+">");
-			case 3:
-				a.push("STRING:"+i.readString(i.readUInt16()));
-			case 4:
-				a.push("FLOAT:"+i.readUntil(0));
-			case 5:
-				a.push("DEBUG");
-			case 6:
-				a.push("VERSION "+i.readByte());
-			default:
-				throw "assert";
+		for (k in 0...nglobals) {
+			switch (i.readByte()) {
+				case 1:
+					a.push(i.readUntil(0));
+				case 2:
+					a.push("<fun:" + (readInt() & 0xFFFFFF) + ">");
+				case 3:
+					a.push("STRING:" + i.readString(i.readUInt16()));
+				case 4:
+					a.push("FLOAT:" + i.readUntil(0));
+				case 5:
+					a.push("DEBUG");
+				case 6:
+					a.push("VERSION " + i.readByte());
+				default:
+					throw "assert";
 			}
 		}
 		return a;
 	}
 
-	function __compare( other : Module ) {
-		return untyped __dollar__compare(this.m,other.m);
+	function __compare(other:Module) {
+		return untyped __dollar__compare(this.m, other.m);
 	}
 
-	static var _module_read = neko.Lib.load("std","module_read",2);
-	static var _module_read_path = neko.Lib.load("std","module_read_path",3);
-	static var _module_exec = neko.Lib.load("std","module_exec",1);
-	static var _module_name = neko.Lib.load("std","module_name",1);
-	static var _module_exports = neko.Lib.load("std","module_exports",1);
-	static var _module_loader = neko.Lib.load("std","module_loader",1);
-	static var _module_code_size = neko.Lib.load("std","module_code_size",1);
-	static var _module_nglobals = neko.Lib.load("std","module_nglobals",1);
-	static var _module_global_get = neko.Lib.load("std","module_global_get",2);
-	static var _module_global_set = neko.Lib.load("std","module_global_set",3);
-	static var _module_read_string = neko.Lib.loadLazy("std","module_read_string",2);
-	static var _module_set_name = neko.Lib.loadLazy("std","module_set_name",2);
-
+	static var _module_read = neko.Lib.load("std", "module_read", 2);
+	static var _module_read_path = neko.Lib.load("std", "module_read_path", 3);
+	static var _module_exec = neko.Lib.load("std", "module_exec", 1);
+	static var _module_name = neko.Lib.load("std", "module_name", 1);
+	static var _module_exports = neko.Lib.load("std", "module_exports", 1);
+	static var _module_loader = neko.Lib.load("std", "module_loader", 1);
+	static var _module_code_size = neko.Lib.load("std", "module_code_size", 1);
+	static var _module_nglobals = neko.Lib.load("std", "module_nglobals", 1);
+	static var _module_global_get = neko.Lib.load("std", "module_global_get", 2);
+	static var _module_global_set = neko.Lib.load("std", "module_global_set", 3);
+	static var _module_read_string = neko.Lib.loadLazy("std", "module_read_string", 2);
+	static var _module_set_name = neko.Lib.loadLazy("std", "module_set_name", 2);
 }
diff --git a/std/neko/vm/Mutex.hx b/std/neko/vm/Mutex.hx
index 90471b3df06c1ec7826f3a8de6eb3a8788936ace..69a969b722c72e7001ad2c31424a5b4183739283 100644
--- a/std/neko/vm/Mutex.hx
+++ b/std/neko/vm/Mutex.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,51 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package neko.vm;
-
-/**
-	Creates a mutex, which can be used to acquire a temporary lock 
-	to access some ressource. The main difference with a lock is 
-	that a mutex must always be released by the owner thread.
-*/
-class Mutex {
-	var m : Dynamic;
-
-	/**
-		Creates a mutex.
-	*/
-	public function new() {
-		m = mutex_create();
-	}
 
-	/**
-		The current thread acquire the mutex or wait if not available.
-		The same thread can acquire several times the same mutex but 
-		must release it as many times it has been acquired.
-	*/
-	public function acquire() {
-		mutex_acquire(m);
-	}
-
-	/**
-		Try to acquire the mutex, returns true if acquire or false 
-		if it's already locked by another thread.
-	*/
-	public function tryAcquire() : Bool {
-		return mutex_try(m);
-	}
-
-	/**
-		Release a mutex that has been acquired by the current thread. 
-		The behavior is undefined if the current thread does not own
-		the mutex.
-	*/
-	public function release() {
-		mutex_release(m);
-	}
+package neko.vm;
 
-	static var mutex_create = neko.Lib.loadLazy("std","mutex_create",0);
-	static var mutex_release = neko.Lib.loadLazy("std","mutex_release",1);
-	static var mutex_acquire = neko.Lib.loadLazy("std","mutex_acquire",1);
-	static var mutex_try = neko.Lib.loadLazy("std","mutex_try",1);
-}
+@:deprecated typedef Mutex = sys.thread.Mutex;
diff --git a/std/neko/vm/Thread.hx b/std/neko/vm/Thread.hx
index 190f6f4826e916f77473daf81677a0855733180a..7ebdc1255ea4659512081207a1b1be10732ce52a 100644
--- a/std/neko/vm/Thread.hx
+++ b/std/neko/vm/Thread.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,116 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package neko.vm;
-
-enum ThreadHandle {
-}
-
-class Thread {
-
-	var handle : ThreadHandle;
-
-	function new(h) {
-		handle = h;
-	}
-
-	/**
-		Send a message to the thread queue. This message can be read by using `readMessage`.
-	**/
-	public function sendMessage( msg : Dynamic ) {
-		thread_send(handle,msg);
-	}
-
-
-	/**
-		Returns the current thread.
-	**/
-	public static function current() {
-		return new Thread(thread_current());
-	}
-
-	/**
-		Creates a new thread that will execute the `callb` function, then exit.
-	**/
-	public static function create( callb : Void -> Void ) {
-		return new Thread(thread_create(function(_) { return callb(); },null));
-	}
 
-	/**
-		Reads a message from the thread queue. If `block` is true, the function
-		blocks until a message is available. If `block` is false, the function
-		returns `null` if no message is available.
-	**/
-	public static function readMessage( block : Bool ) : Dynamic {
-		return thread_read_message(block);
-	}
-
-	@:keep function __compare(t) {
-		return untyped __dollar__compare(handle,t.handle);
-	}
-
-	/**
-		Starts an OS message loop after [osInitialize] has been done.
-		In that state, the UI handled by this thread will be updated and
-		[sync] calls can be performed. The loop returns when [exitLoop] is
-		called for this thread.
-	**
-	public static function osLoop() {
-		if( os_loop == null ) throw "Please call osInitialize() first";
-		os_loop();
-	}
-
-	/**
-		The function [f] will be called by this thread if it's in [osLoop].
-		[sync] returns immediately. See [osInitialize] remarks.
-	**
-	public function sync( f : Void -> Void ) {
-		os_sync(handle,f);
-	}
-
-	/**
-		The function [f] will be called by this thread and the calling thread
-		will wait until the result is available then return its value.
-	**
-	public function syncResult<T>( f : Void -> T ) : T {
-		if( this == current() )
-			return f();
-		var v = new neko.vm.Lock();
-		var r = null;
-		sync(function() {
-			r = f();
-			v.release();
-		});
-		v.wait();
-		return r;
-	}
-
-	/**
-		Exit from [osLoop].
-	**
-	public function exitLoop() {
-		os_loop_stop(handle);
-	}
-
-	/**
-		If you want to use the [osLoop], [sync] and [syncResult] methods, you
-		need to call [osInitialize] before creating any thread or calling [current].
-		This will load [os.ndll] library and initialize UI methods for each thread.
-	**
-	public static function osInitialize() {
-		os_loop = neko.Lib.load("os","os_loop",0);
-		os_loop_stop = neko.Lib.load("os","os_loop_stop",1);
-		os_sync = neko.Lib.load("os","os_sync",2);
-	}
-
-	static var os_loop = null;
-	static var os_loop_stop = null;
-	static var os_sync = null;
-	*/
-
-	static var thread_create = neko.Lib.load("std","thread_create",2);
-	static var thread_current = neko.Lib.load("std","thread_current",0);
-	static var thread_send = neko.Lib.load("std","thread_send",2);
-	static var thread_read_message = neko.Lib.load("std","thread_read_message",1);
+package neko.vm;
 
-}
+@:deprecated typedef Thread = sys.thread.Thread;
diff --git a/std/neko/vm/Tls.hx b/std/neko/vm/Tls.hx
index aa1d3052ffde549ff1a5f40e3fd5cf75bf444ef4..670121fbc337e72f025c2f4988229836b8a4e45c 100644
--- a/std/neko/vm/Tls.hx
+++ b/std/neko/vm/Tls.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,42 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package neko.vm;
-
-/**
-	Creates thread local storage.
-*/
-class Tls<T> {
-
-	var t : Dynamic;
-	public var value(get,set) : T;
 
-	/**
-		Creates thread local storage. This is placeholder that can store
-		a value that will be different depending on the local thread. 
-		Set the tls value to `null` before exiting the thread 
-		or the memory will never be collected.
-	*/
-	public function new() {
-		t = tls_create();
-	}
-
-	/**
-		Returns the value set by tls_set for the local thread.
-	*/
-	function get_value() : T {
-		return tls_get(t);
-	}
-
-	/**
-		Set the value of the TLS for the local thread.
-	*/
-	function set_value( v : T ) {
-		tls_set(t,v);
-		return v;
-	}
+package neko.vm;
 
-	static var tls_create = neko.Lib.load("std","tls_create",0);
-	static var tls_get = neko.Lib.load("std","tls_get",1);
-	static var tls_set = neko.Lib.load("std","tls_set",2);
-}
+@:deprecated typedef Tls<T> = sys.thread.Tls<T>;
diff --git a/std/neko/vm/Ui.hx b/std/neko/vm/Ui.hx
index 2061532367552886a10859c2b3ba5c1fc72d34d8..33b58bdf65c7dfa114a6a5e31d5eecb15f97b512 100644
--- a/std/neko/vm/Ui.hx
+++ b/std/neko/vm/Ui.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,50 +19,50 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package neko.vm;
 
 /**
-	Core native User Interface support. This API uses native WIN32 API 
+	Core native User Interface support. This API uses native WIN32 API
 	on Windows, Carbon API on OSX, and GTK2 on Linux.
-*/
+ */
 class Ui {
-
 	/**
-		Tells if the current thread is the main loop thread or not. 
-		The main loop thread is the one in which the first "ui" 
+		Tells if the current thread is the main loop thread or not.
+		The main loop thread is the one in which the first "ui"
 		library primitive has been loaded.
-	*/
+	**/
 	public static function isMainThread() {
 		return _is_main_thread();
 	}
 
 	/**
-		Starts the native UI event loop. This method can only be called 
+		Starts the native UI event loop. This method can only be called
 		from the main thread.
-	*/
+	**/
 	public static function loop() {
 		_loop();
 	}
 
 	/**
-		Stop the native UI event loop. This method can only be called 
+		Stop the native UI event loop. This method can only be called
 		from the main thread.
-	*/
+	**/
 	public static function stopLoop() {
 		_sync(_stop_loop);
 	}
 
 	/**
-		Queue a method call callb to be executed by the main thread while 
-		running the UI event loop. This can be used to perform UI updates 
+		Queue a method call callb to be executed by the main thread while
+		running the UI event loop. This can be used to perform UI updates
 		in the UI thread using results processed by another thread.
-	*/
-	public static function sync( f : Void -> Void ) {
+	**/
+	public static function sync(f:Void->Void) {
 		_sync(f);
 	}
 
-	public static function syncResult<T>( f : Void -> T ) : T {
-		if( isMainThread() )
+	public static function syncResult<T>(f:Void->T):T {
+		if (isMainThread())
 			return f();
 		var l = new Lock();
 		var tmp = null;
@@ -70,20 +70,19 @@ class Ui {
 		_sync(function() {
 			try {
 				tmp = f();
-			} catch( e : Dynamic ) {
-				exc = { v : e };
+			} catch (e:Dynamic) {
+				exc = {v: e};
 			}
 			l.release();
 		});
 		l.wait();
-		if( exc != null )
+		if (exc != null)
 			throw exc.v;
 		return tmp;
 	}
 
-	static var _is_main_thread = neko.Lib.load("ui","ui_is_main",0);
-	static var _loop = neko.Lib.load("ui","ui_loop",0);
-	static var _stop_loop = neko.Lib.load("ui","ui_stop_loop",0);
-	static var _sync = neko.Lib.load("ui","ui_sync",1);
-
+	static var _is_main_thread = neko.Lib.load("ui", "ui_is_main", 0);
+	static var _loop = neko.Lib.load("ui", "ui_loop", 0);
+	static var _stop_loop = neko.Lib.load("ui", "ui_stop_loop", 0);
+	static var _sync = neko.Lib.load("ui", "ui_sync", 1);
 }
diff --git a/std/neko/zip/Compress.hx b/std/neko/zip/Compress.hx
index 92dd0700131ca307db7b1f26c45ea9ac4e3d7e3a..dbf426b297e0a203fc410b966d2c60b583fc1055 100644
--- a/std/neko/zip/Compress.hx
+++ b/std/neko/zip/Compress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package neko.zip;
 
-#if (haxe_ver < 4.0)
+package neko.zip;
+
 typedef Compress = haxe.zip.Compress;
-#end
\ No newline at end of file
diff --git a/std/neko/zip/Flush.hx b/std/neko/zip/Flush.hx
index 1dac15fe7f5e06a0300fc3f86058b082e4d19f09..b7ea6ef320a6773f40d3df2732b9f0b14ef65035 100644
--- a/std/neko/zip/Flush.hx
+++ b/std/neko/zip/Flush.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package neko.zip;
 
-#if (haxe_ver < 4.0)
+package neko.zip;
+
 typedef Flush = haxe.zip.FlushMode;
-#end
\ No newline at end of file
diff --git a/std/neko/zip/Uncompress.hx b/std/neko/zip/Uncompress.hx
index 4bc86f122846a740a0a91cc8d8a5c184b0724874..67922cabd09b4f37701bc2085d175598c23a6b45 100644
--- a/std/neko/zip/Uncompress.hx
+++ b/std/neko/zip/Uncompress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package neko.zip;
 
-#if (haxe_ver < 4.0)
+package neko.zip;
+
 typedef Uncompress = haxe.zip.Uncompress;
-#end
\ No newline at end of file
diff --git a/std/php/HException.hx b/std/php/ArrayAccess.hx
similarity index 76%
rename from std/php/HException.hx
rename to std/php/ArrayAccess.hx
index 3c8303469329c569cac13a418e2c5d1e4adb2821..cce31b215a85fdf2e1a8a0f5ad3383ca64683715 100644
--- a/std/php/HException.hx
+++ b/std/php/ArrayAccess.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,17 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
-extern class HException extends Exception {
-  public var e : Dynamic;
-  public var p : haxe.PosInfos;
-  public function new(e : Dynamic, ?message : String, ?code : Int, ?p : haxe.PosInfos) : Void;
-  public function setLine(l:Int) : Void;
-  public function setFile(f:String) : Void;
-}
\ No newline at end of file
+/**
+	Native PHP interface.
+	@see http://php.net/manual/en/class.arrayaccess.php
+**/
+@:native('ArrayAccess')
+extern interface ArrayAccess<K, V> {
+	function offsetExists(offset:K):Bool;
+	function offsetGet(offset:K):V;
+	function offsetSet(offset:K, value:V):Void;
+	function offsetUnset(offset:K):Void;
+}
diff --git a/std/php/Boot.hx b/std/php/Boot.hx
index 3efbe1aba0ae8a23e0da1c6bcd45e11e13c832bc..b4d2da6376f89860d32a5599d13f7971462b3e33 100644
--- a/std/php/Boot.hx
+++ b/std/php/Boot.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,968 +19,998 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
-@:dox(hide)
-@:keep
-class Boot {
-	static var qtypes;
-	static var ttypes;
-	static var tpaths;
-	static var skip_constructor = false;
-	static function __init__() : Void {
-		var _hx_class_prefix = untyped __prefix__();
-		untyped __php__("
-function _hx_add($a, $b) {
-	if (!_hx_is_numeric($a) || !_hx_is_numeric($b)) {
-		return _hx_string_or_null($a) . _hx_string_or_null($b);
-	} else {
-		return $a + $b;
-	}
-}
+import haxe.PosInfos;
+import haxe.extern.EitherType;
 
-function _hx_anonymous($arr = array()) {
-	$o = new _hx_anonymous();
-	foreach($arr as $k => $v)
-		$o->$k = $v;
-	return $o;
-}
+using php.Global;
 
-class _hx_array implements ArrayAccess, IteratorAggregate {
-	var $a;
-	var $length;
-	function __construct($a = array()) {
-		$this->a = $a;
-		$this->length = count($a);
-	}
-
-	function concat($a) {
-		return new _hx_array(array_merge($this->a, $a->a));
+/**
+	Various Haxe->PHP compatibility utilities.
+	You should not use this class directly.
+**/
+@:keep
+@:dox(hide)
+class Boot {
+	/** List of Haxe classes registered by their PHP class names  */
+	@:protected static var aliases = new NativeAssocArray<String>();
+
+	/** Cache of HxClass instances */
+	@:protected static var classes = new NativeAssocArray<HxClass>();
+
+	/** List of getters (for Reflect) */
+	@:protected static var getters = new NativeAssocArray<NativeAssocArray<Bool>>();
+
+	/** List of setters (for Reflect) */
+	@:protected static var setters = new NativeAssocArray<NativeAssocArray<Bool>>();
+
+	/** Metadata storage */
+	@:protected static var meta = new NativeAssocArray<{}>();
+
+	/** Cache for closures created of static methods */
+	@:protected static var staticClosures = new NativeAssocArray<NativeAssocArray<HxClosure>>();
+
+	/**
+		Initialization stuff.
+		This method is called once before invoking any Haxe-generated user code.
+	**/
+	static function __init__() {
+		Global.mb_internal_encoding('UTF-8');
+		if (!Global.defined('HAXE_CUSTOM_ERROR_HANDLER') || !Const.HAXE_CUSTOM_ERROR_HANDLER) {
+			var previousLevel = Global.error_reporting(Const.E_ALL);
+			var previousHandler = Global.set_error_handler(function(errno:Int, errstr:String, errfile:String, errline:Int) {
+				if (Global.error_reporting() & errno == 0) {
+					return false;
+				}
+				/*
+				 * Division by zero should not throw
+				 * @see https://github.com/HaxeFoundation/haxe/issues/7034#issuecomment-394264544
+				 */
+				if (errno == Const.E_WARNING && errstr == 'Division by zero') {
+					return true;
+				}
+				throw new ErrorException(errstr, 0, errno, errfile, errline);
+			});
+			// Already had user-defined handler. Return it.
+			if (previousHandler != null) {
+				Global.error_reporting(previousLevel);
+				Global.set_error_handler(previousHandler);
+			}
+		}
 	}
 
-	function copy() {
-		return new _hx_array($this->a);
+	/**
+		Returns root namespace based on a value of `-D php-prefix=value` compiler flag.
+		Returns empty string if no `-D php-prefix=value` provided.
+	**/
+	public static function getPrefix():String {
+		return Syntax.code('self::PHP_PREFIX');
 	}
 
-	function &get($index) {
-		if(isset($this->a[$index])) return $this->a[$index];
-		return null;
+	/**
+		Register list of getters to be able to call getters using reflection
+	**/
+	public static function registerGetters(phpClassName:String, list:NativeAssocArray<Bool>):Void {
+		getters[phpClassName] = list;
 	}
 
-	function insert($pos, $x) {
-		array_splice($this->a, $pos, 0, array($x));
-		$this->length++;
+	/**
+		Register list of setters to be able to call getters using reflection
+	**/
+	public static function registerSetters(phpClassName:String, list:NativeAssocArray<Bool>):Void {
+		setters[phpClassName] = list;
 	}
 
-	function iterator() {
-		return new _hx_array_iterator($this->a);
-	}
+	/**
+		Check if specified property has getter
+	**/
+	public static function hasGetter(phpClassName:String, property:String):Bool {
+		ensureLoaded(phpClassName);
 
-	function getIterator() {
-		return $this->iterator();
-	}
+		var has = false;
+		var phpClassName:haxe.extern.EitherType<Bool, String> = phpClassName;
+		do {
+			has = Global.isset(getters[phpClassName][property]);
+			phpClassName = Global.get_parent_class(phpClassName);
+		} while (!has && phpClassName != false && Global.class_exists(phpClassName));
 
-	function join($sep) {
-		return implode($sep, array_map('_hx_string_rec',$this->a,array()));
+		return has;
 	}
 
-	function pop() {
-		$r = array_pop($this->a);
-		$this->length = count($this->a);
-		return $r;
-	}
+	/**
+		Check if specified property has setter
+	**/
+	public static function hasSetter(phpClassName:String, property:String):Bool {
+		ensureLoaded(phpClassName);
 
-	function push($x) {
-		$this->a[] = $x;
-		return ++$this->length;
-	}
+		var has = false;
+		var phpClassName:haxe.extern.EitherType<Bool, String> = phpClassName;
+		do {
+			has = Global.isset(setters[phpClassName][property]);
+			phpClassName = Global.get_parent_class(phpClassName);
+		} while (!has && phpClassName != false && Global.class_exists(phpClassName));
 
-	function remove($x) {
-		foreach($this->a as $i => $val)
-			if($val === $x) {
-				unset($this->a[$i]);
-				$this->a = array_values($this->a);
-				$this->length--;
-				return true;
-			}
-		return false;
+		return has;
 	}
 
-	function indexOf($x, $fromIndex) {
-		$i = ($fromIndex === null) ? 0 : $fromIndex;
-		$len = $this->length;
-		$a = $this->a;
-		if ($i < 0) {
-			$i += $len;
-			if ($i < 0) $i = 0;
-		}
-		while ($i < $len) {
-			if ($a[$i] === $x)
-				return $i;
-			$i++;
-		}
-		return -1;
-	}
-
-	function lastIndexOf($x, $fromIndex) {
-		$len = $this->length;
-		$i = ($fromIndex === null) ? $len - 1 : $fromIndex;
-		$a = $this->a;
-		if ($i >= $len)
-			$i = $len - 1;
-		else if ($i < 0)
-			$i += $len;
-		while ($i >= 0) {
-			if ($a[$i] === $x)
-				return $i;
-			$i--;
-		}
-		return -1;
-	}
-
-	function removeAt($pos) {
-		if(array_key_exists($pos, $this->a)) {
-			unset($this->a[$pos]);
-			$this->length--;
-			return true;
-		} else
-			return false;
+	/**
+		Save metadata for specified class
+	**/
+	public static function registerMeta(phpClassName:String, data:Dynamic):Void {
+		meta[phpClassName] = data;
 	}
 
-	function reverse() {
-		$this->a = array_reverse($this->a, false);
+	/**
+		Retrieve metadata for specified class
+	**/
+	public static function getMeta(phpClassName:String):Null<Dynamic> {
+		ensureLoaded(phpClassName);
+		return Global.isset(meta[phpClassName]) ? meta[phpClassName] : null;
 	}
 
-	function shift() {
-		$r = array_shift($this->a);
-		$this->length = count($this->a);
-		return $r;
+	/**
+		Associate PHP class name with Haxe class name
+	**/
+	public static function registerClass(phpClassName:String, haxeClassName:String):Void {
+		aliases[phpClassName] = haxeClassName;
 	}
 
-	function slice($pos, $end) {
-		if($end === null)
-			return new _hx_array(array_slice($this->a, $pos));
-		else
-			return new _hx_array(array_slice($this->a, $pos, $end-$pos));
+	/**
+		Returns a list of currently loaded haxe-generated classes.
+	**/
+	public static function getRegisteredClasses():Array<Class<Dynamic>> {
+		var result = [];
+		Syntax.foreach(aliases, function(phpName, haxeName) {
+			result.push(cast getClass(phpName));
+		});
+		return result;
 	}
 
-	function sort($f) {
-		usort($this->a, $f);
+	/**
+		Returns a list of phpName=>haxeName for currently loaded haxe-generated classes.
+	**/
+	public static function getRegisteredAliases():NativeAssocArray<String> {
+		return aliases;
 	}
 
-	function splice($pos, $len) {
-		if($len < 0) $len = 0;
-		$nh = new _hx_array(array_splice($this->a, $pos, $len));
-		$this->length = count($this->a);
-		return $nh;
-	}
+	/**
+		Get Class<T> instance for PHP fully qualified class name (E.g. '\some\pack\MyClass')
+		It's always the same instance for the same `phpClassName`
+	**/
+	public static function getClass(phpClassName:String):HxClass {
+		if (phpClassName.charAt(0) == '\\') {
+			phpClassName = phpClassName.substr(1);
+		}
+		if (!Global.isset(classes[phpClassName])) {
+			classes[phpClassName] = new HxClass(phpClassName);
+		}
 
-	function toString() {
-		return '['.implode(',', array_map('_hx_string_rec',$this->a,array())).']';
-	}
+		return classes[phpClassName];
+	}
+
+	/**
+		Returns Class<HxAnon>
+	**/
+	public static inline function getHxAnon():HxClass {
+		return cast HxAnon;
+	}
+
+	/**
+		Check if provided value is an anonymous object
+	**/
+	public static inline function isAnon(v:Any):Bool {
+		return Std.is(v, HxAnon);
+	}
+
+	/**
+		Returns Class<HxClass>
+	**/
+	public static inline function getHxClass():HxClass {
+		return cast HxClass;
+	}
+
+	/**
+		Returns either Haxe class name for specified `phpClassName` or (if no such Haxe class registered) `phpClassName`.
+	**/
+	public static function getClassName(phpClassName:String):String {
+		var hxClass = getClass(phpClassName);
+		var name = getHaxeName(hxClass);
+		return (name == null ? hxClass.phpClassName : name);
+	}
+
+	/**
+		Returns original Haxe fully qualified class name for this type (if exists)
+	**/
+	public static function getHaxeName(hxClass:HxClass):Null<String> {
+		switch (hxClass.phpClassName) {
+			case 'Int':
+				return 'Int';
+			case 'String':
+				return 'String';
+			case 'Bool':
+				return 'Bool';
+			case 'Float':
+				return 'Float';
+			case 'Class':
+				return 'Class';
+			case 'Enum':
+				return 'Enum';
+			case 'Dynamic':
+				return 'Dynamic';
+			case _:
+		}
 
-	function __toString() {
-		return $this->toString();
-	}
+		inline function exists()
+			return Global.isset(aliases[hxClass.phpClassName]);
 
-	function unshift($x) {
-		array_unshift($this->a, $x);
-		$this->length++;
-	}
+		if (exists()) {
+			return aliases[hxClass.phpClassName];
+		} else if (Global.class_exists(hxClass.phpClassName) && exists()) {
+			return aliases[hxClass.phpClassName];
+		} else if (Global.interface_exists(hxClass.phpClassName) && exists()) {
+			return aliases[hxClass.phpClassName];
+		}
 
-	function map($f) {
-		return new _hx_array(array_map($f, $this->a));
+		return null;
 	}
 
-	function filter($f) {
-		return new _hx_array(array_values(array_filter($this->a,$f)));
-	}
+	/**
+		Find corresponding PHP class name.
+		Returns `null` if specified class does not exist.
+	**/
+	public static function getPhpName(haxeName:String):Null<String> {
+		var prefix = getPrefix();
+		var phpParts = (Global.strlen(prefix) == 0 ? [] : [prefix]);
 
-	// ArrayAccess methods:
-	function offsetExists($offset) {
-		return isset($this->a[$offset]);
-	}
+		var haxeParts = haxeName.split('.');
+		for (part in haxeParts) {
+			if (isPhpKeyword(part)) {
+				part += '_hx';
+			}
+			phpParts.push(part);
+		}
 
-	function offsetGet($offset) {
-		if(isset($this->a[$offset])) return $this->a[$offset];
-		return null;
+		return phpParts.join('\\');
 	}
 
-	function offsetSet($offset, $value) {
-		if($this->length <= $offset) {
-			$this->a = array_merge($this->a, array_fill(0, $offset+1-$this->length, null));
-			$this->length = $offset+1;
-		}
-		return $this->a[$offset] = $value;
+	/**
+		Check if the value of `str` is a reserved keyword in PHP
+		@see https://www.php.net/manual/en/reserved.keywords.php
+	**/
+	@:pure(false)
+	static public function isPhpKeyword(str:String):Bool {
+		//The body of this method is generated by the compiler
+		return false;
 	}
 
-	function offsetUnset($offset) {
-		return $this->removeAt($offset);
+	/**
+		Unsafe cast to HxClosure
+	**/
+	public static inline function castClosure(value:Dynamic):HxClosure {
+		return value;
 	}
-}
 
-class _hx_array_iterator implements Iterator {
-	private $a;
-	private $i;
-	public function __construct($a) {
-		$this->a = $a;
-		$this->i = 0;
+	/**
+		Unsafe cast to HxClass
+	**/
+	public static inline function castClass(cls:Class<Dynamic>):HxClass {
+		return cast cls;
 	}
 
-	public function next() {
-		if(!$this->hasNext()) return null;
-		return $this->a[$this->i++];
+	/**
+		Returns `Class<T>` for `HxClosure`
+	**/
+	public static inline function closureHxClass():HxClass {
+		return cast HxClosure;
 	}
 
-	public function hasNext() {
-		return $this->i < count($this->a);
+	/**
+		Implementation for `cast(value, Class<Dynamic>)`
+		@throws HxException if `value` cannot be casted to this type
+	**/
+	public static function typedCast(hxClass:HxClass, value:Dynamic):Dynamic {
+		if (value == null)
+			return null;
+		switch (hxClass.phpClassName) {
+			case 'Int':
+				if (Boot.isNumber(value)) {
+					return Global.intval(value);
+				}
+			case 'Float':
+				if (Boot.isNumber(value)) {
+					return value.floatval();
+				}
+			case 'Bool':
+				if (value.is_bool()) {
+					return value;
+				}
+			case 'String':
+				if (value.is_string()) {
+					return value;
+				}
+			case 'php\\NativeArray':
+				if (value.is_array()) {
+					return value;
+				}
+			case _:
+				if (value.is_object() && Std.is(value, cast hxClass)) {
+					return value;
+				}
+		}
+		throw 'Cannot cast ' + Std.string(value) + ' to ' + getClassName(hxClass.phpClassName);
 	}
 
-	public function current() {
-		if (!$this->hasNext()) return false;
-		return $this->a[$this->i];
+	/**
+		Returns string representation of `value`
+	**/
+	public static function stringify(value:Dynamic, maxRecursion:Int = 10):String {
+		if (maxRecursion <= 0) {
+			return '<...>';
+		}
+		if (value == null) {
+			return 'null';
+		}
+		if (value.is_string()) {
+			return value;
+		}
+		if (value.is_int() || value.is_float()) {
+			return Syntax.string(value);
+		}
+		if (value.is_bool()) {
+			return value ? 'true' : 'false';
+		}
+		if (value.is_array()) {
+			var strings = Syntax.arrayDecl();
+			Syntax.foreach(value, function(key:Dynamic, item:Dynamic) {
+				strings.push(Syntax.string(key) + ' => ' + stringify(item, maxRecursion - 1));
+			});
+			return '[' + Global.implode(', ', strings) + ']';
+		}
+		if (value.is_object()) {
+			if (Std.is(value, Array)) {
+				return inline stringifyNativeIndexedArray(value.arr, maxRecursion - 1);
+			}
+			if (Std.is(value, HxEnum)) {
+				var e:HxEnum = value;
+				var result = e.tag;
+				if (Global.count(e.params) > 0) {
+					var strings = Global.array_map(function(item) return Boot.stringify(item, maxRecursion - 1), e.params);
+					result += '(' + Global.implode(',', strings) + ')';
+				}
+				return result;
+			}
+			if (value.method_exists('toString')) {
+				return value.toString();
+			}
+			if (value.method_exists('__toString')) {
+				return value.__toString();
+			}
+			if (Std.is(value, StdClass)) {
+				if (Global.isset(Syntax.field(value, 'toString')) && value.toString.is_callable()) {
+					return value.toString();
+				}
+				var result = new NativeIndexedArray<String>();
+				var data = Global.get_object_vars(value);
+				for (key in data.array_keys()) {
+					result.array_push('$key : ' + stringify(data[key], maxRecursion - 1));
+				}
+				return '{ ' + Global.implode(', ', result) + ' }';
+			}
+			if (isFunction(value)) {
+				return '<function>';
+			}
+			if (Std.is(value, HxClass)) {
+				return '[class ' + getClassName((value : HxClass).phpClassName) + ']';
+			} else {
+				return '[object ' + getClassName(Global.get_class(value)) + ']';
+			}
+		}
+		throw "Unable to stringify value";
 	}
 
-	public function key() {
-		return $this->i;
+	static public function stringifyNativeIndexedArray<T>(arr:NativeIndexedArray<T>, maxRecursion:Int = 10):String {
+		var strings = Syntax.arrayDecl();
+		Syntax.foreach(arr, function(index:Int, value:T) {
+			strings[index] = Boot.stringify(value, maxRecursion - 1);
+		});
+		return '[' + Global.implode(',', strings) + ']';
 	}
 
-	public function valid() {
-		return $this->current() !== false;
+	static public inline function isNumber(value:Dynamic) {
+		return value.is_int() || value.is_float();
 	}
 
-	public function rewind() {
-		$this->i = 0;
-	}
-	public function size() {
-		return count($this->a);
+	/**
+		Check if specified values are equal
+	**/
+	public static function equal(left:Dynamic, right:Dynamic):Bool {
+		if (isNumber(left) && isNumber(right)) {
+			return Syntax.equal(left, right);
+		}
+		if (Std.is(left, HxClosure) && Std.is(right, HxClosure)) {
+			return (left : HxClosure).equals(right);
+		}
+		return Syntax.strictEqual(left, right);
 	}
-}
-
-function _hx_array_get($a, $pos) { return $a[$pos]; }
-
-function _hx_array_increment($a, $pos) { return $a[$pos] += 1; }
-function _hx_array_decrement($a, $pos) { return $a[$pos] -= 1; }
 
-function _hx_array_assign($a, $i, $v) { return $a[$i] = $v; }
-
-class _hx_break_exception extends Exception {}
-
-function _hx_cast($v, $type) {
-	if(_hx_instanceof($v, $type)) {
-		return $v;
-	} else {
-		throw new HException('Class cast error');
+	/**
+		Concat `left` and `right` if both are strings or string and null.
+		Otherwise return sum of `left` and `right`.
+	**/
+	public static function addOrConcat(left:Dynamic, right:Dynamic):Dynamic {
+		if (left.is_string() || right.is_string()) {
+			return (left : String) + (right : String);
+		}
+		return Syntax.add(left, right);
 	}
-}
-
-function _hx_char_at($o, $i) {
-	if ($i < 0)
-		return '';
-	$c = substr($o, $i, 1);
-	return FALSE === $c ? '' : $c;
-}
-
-function _hx_char_code_at($s, $pos) {
-	if($pos < 0 || $pos >= strlen($s)) return null;
-	return ord($s{$pos});
-}
-
-function _hx_deref($o) { return $o; }
 
-function _hx_equal($x, $y) {
-	if(is_null($x)) {
-		return is_null($y);
-	} else {
-		if(is_null($y)) {
+	/**
+		`Std.is()` implementation
+	**/
+	public static function is(value:Dynamic, type:HxClass):Bool {
+		if (type == null)
 			return false;
-		} else {
-			if((is_float($x) || is_int($x)) && (is_float($y) || is_int($y))) {
-				return $x == $y;
-			} else {
-				return $x === $y;
-			}
+
+		var phpType = type.phpClassName;
+		#if php_prefix
+		var prefix = getPrefix();
+		if (Global.substr(phpType, 0, Global.strlen(prefix) + 1) == '$prefix\\') {
+			phpType = Global.substr(phpType, Global.strlen(prefix) + 1);
 		}
+		#end
+
+		switch (phpType) {
+			case 'Dynamic':
+				return value != null;
+			case 'Int':
+				return (value.is_int() || (value.is_float() && Syntax.equal(Syntax.int(value), value) && !Global.is_nan(value)))
+					&& Global.abs(value) <= 2147483648;
+			case 'Float':
+				return value.is_float() || value.is_int();
+			case 'Bool':
+				return value.is_bool();
+			case 'String':
+				return value.is_string();
+			case 'php\\NativeArray', 'php\\_NativeArray\\NativeArray_Impl_':
+				return value.is_array();
+			case 'Enum' | 'Class':
+				if (Std.is(value, HxClass)) {
+					var valuePhpClass = (cast value : HxClass).phpClassName;
+					var enumPhpClass = (cast HxEnum : HxClass).phpClassName;
+					var isEnumType = Global.is_subclass_of(valuePhpClass, enumPhpClass);
+					return (phpType == 'Enum' ? isEnumType : !isEnumType);
+				}
+			case _:
+				if (value.is_object()) {
+					var type:Class<Dynamic> = cast type;
+					return Syntax.instanceof(value, type);
+				}
+		}
+		return false;
 	}
-}
 
-function _hx_mod($x, $y) {
-	if (is_int($x) && is_int($y)) {
-		if ($y == 0) return 0;
-		return $x % $y;
+	/**
+		Check if `value` is a `Class<T>`
+	**/
+	public static inline function isClass(value:Dynamic):Bool {
+		return Std.is(value, HxClass);
 	}
-	if (!is_nan($x) && !is_nan($y) && !is_finite($y) && is_finite($x)) {
-		return $x;
-	}
-	return fmod($x, $y);
-}
 
-function _hx_error_handler($errno, $errmsg, $filename, $linenum, $vars) {
-	if (!(error_reporting() & $errno)) {
-		return false;
+	/**
+		Check if `value` is an enum constructor instance
+	**/
+	public static inline function isEnumValue(value:Dynamic):Bool {
+		return Std.is(value, HxEnum);
 	}
-	$msg = $errmsg . ' (errno: ' . $errno . ')';
-	$e = new HException($msg, '', $errno, _hx_anonymous(array('fileName' => 'Boot.hx', 'lineNumber' => __LINE__, 'className' => 'php.Boot', 'methodName' => '_hx_error_handler')));
-	$e->setFile($filename);
-	$e->setLine($linenum);
-	throw $e;
-	return null;
-}
-
-function _hx_exception_handler($e) {
-	if(0 == strncasecmp(PHP_SAPI, 'cli', 3)) {
-		$msg   = $e-> getMessage();
-		$nl    = \"\\n\";
-		$pre   = '';
-		$post  = '';
-	} else {
-		$msg   = '<b>' . $e-> getMessage() . '</b>';
-		$nl    = \"<br />\";
-		$pre   = '<pre>';
-		$post  = '</pre>';
-	}
-	if(isset($GLOBALS['%s'])) {
-		$stack = '';
-		$i = $GLOBALS['%s']->length;
-		while(--$i >= 0)
-			$stack .= 'Called from '.$GLOBALS['%s'][$i].$nl;
-		echo $pre.'uncaught exception: '.$msg.$nl.$nl.$stack.$post;
-	} else
-		echo $pre.'uncaught exception: '.$msg.$nl.$nl.'in file: '.$e->getFile().' line '.$e->getLine().$nl.$e->getTraceAsString().$post;
-	exit(1);
-}
 
-function _hx_explode($delimiter, $s) {
-	if($delimiter == '')
-		return new _hx_array(str_split($s, 1));
-	return new _hx_array(explode($delimiter, $s));
-}
+	/**
+		Check if `value` is a function
+	**/
+	public static inline function isFunction(value:Dynamic):Bool {
+		return Std.is(value, Closure) || Std.is(value, HxClosure);
+	}
 
-function _hx_explode2($s, $delimiter) {
-	if($delimiter == '')
-		return new _hx_array(str_split($s, 1));
-	return new _hx_array(explode($delimiter, $s));
-}
+	/**
+		Check if `value` is an instance of `HxClosure`
+	**/
+	public static inline function isHxClosure(value:Dynamic):Bool {
+		return Std.is(value, HxClosure);
+	}
 
-function _hx_field($o, $field) {
-	if(_hx_has_field($o, $field)) {
-		if($o instanceof _hx_type) {
-			if(is_callable($c = array($o->__tname__, $field)) && !property_exists($o->__tname__, $field)) {
-				return $c;
-			} else {
-				$name = $o->__tname__;
-				return eval('return '.$name.'::$'.$field.';');
-			}
+	/**
+		Performs `left >>> right` operation
+	**/
+	public static function shiftRightUnsigned(left:Int, right:Int):Int {
+		if (right == 0) {
+			return left;
+		} else if (left >= 0) {
+			return (left >> right) & ~((1 << (8 * Const.PHP_INT_SIZE - 1)) >> (right - 1));
 		} else {
-			if(is_string($o)) {
-				if($field == 'length') {
-					return strlen($o);
-				} else {
-					switch($field) {
-						case 'charAt'     : return array(new _hx_lambda(array(&$o), '_hx_char_at'), 'execute');
-						case 'charCodeAt' : return array(new _hx_lambda(array(&$o), '_hx_char_code_at'), 'execute');
-						case 'indexOf'    : return array(new _hx_lambda(array(&$o), '_hx_index_of'), 'execute');
-						case 'lastIndexOf': return array(new _hx_lambda(array(&$o), '_hx_last_index_of'), 'execute');
-						case 'split'      : return array(new _hx_lambda(array(&$o), '_hx_explode2'), 'execute');
-						case 'substr'     : return array(new _hx_lambda(array(&$o), '_hx_substr'), 'execute');
-						case 'toUpperCase': return array(new _hx_lambda(array(&$o), 'strtoupper'), 'execute');
-						case 'toLowerCase': return array(new _hx_lambda(array(&$o), 'strtolower'), 'execute');
-						case 'toString'   : return array(new _hx_lambda(array(&$o), '_hx_deref'), 'execute');
-					}
-					return null;
-				}
-			} else {
-				if(property_exists($o, $field)) {
-					if(is_array($o->$field) && is_callable($o->$field)) {
-						return $o->$field;
-					} else {
-						if(is_string($o->$field) && _hx_is_lambda($o->$field)) {
-							return array($o, $field);
-						} else {
-							return $o->$field;
-						}
-					}
-				} else if(isset($o->__dynamics) && isset($o->__dynamics[$field])) {
-					return $o->__dynamics[$field];
-				} else {
-					return array($o, $field);
-				}
-			}
+			return (left >> right) & (0x7fffffff >> (right - 1));
 		}
-	} else {
-		return null;
 	}
-}
-
-function _hx_get_object_vars($o) {
-	$a = array_keys(get_object_vars($o));
-	if(isset($o->__dynamics))
-		$a = array_merge($a, array_keys($o->__dynamics));
-	$arr = array();
-	foreach($a as $val)
-		$arr[] = '' . $val;
-	return $arr;
-}
-
-function _hx_has_field($o, $field) {
-	return
-		(is_object($o) && (method_exists($o, $field) || isset($o->$field) || property_exists($o, $field) || isset($o->__dynamics[$field])))
-		||
-		(is_string($o) && (in_array($field, array('toUpperCase', 'toLowerCase', 'charAt', 'charCodeAt', 'indexOf', 'lastIndexOf', 'split', 'substr', 'toString', 'length'))))
-	;
-}
-
-function _hx_index_of($s, $value, $startIndex = null) {
-	$x = strpos($s, $value, $startIndex);
-	if($x === false)
-		return -1;
-	else
-		return $x;
-}
 
-function _hx_instanceof($v, $t) {
-	if($t === null) {
-		return false;
-	}
-	switch($t->__tname__) {
-		case 'Array'  : return is_array($v);
-		case 'String' : return is_string($v) && !_hx_is_lambda($v);
-		case 'Bool'   : return is_bool($v);
-		case 'Int'    : return (is_int($v) || (is_float($v) && intval($v) == $v && !is_nan($v))) && abs($v) <= 0x80000000;
-		case 'Float'  : return is_float($v) || is_int($v);
-		case 'Dynamic': return true;
-		case 'Class'  : return ($v instanceof _hx_class || $v instanceof _hx_interface) && $v->__tname__ != 'Enum';
-		case 'Enum'   : return $v instanceof _hx_enum;
-		case 'php.NativeArray': return is_array($v);
-		default       : return is_a($v, $t->__tname__);
+	/**
+		Helper method to avoid "Cannot use temporary expression in write context" error for expressions like this:
+		```haxe
+		(new MyClass()).fieldName = 'value';
+		```
+	**/
+	static public function deref(value:Dynamic):Dynamic {
+		return value;
 	}
-}
-
-function _hx_is_lambda($s) {
-	return (is_string($s) && substr($s, 0, 8) == chr(0).'lambda_') || (is_array($s) && count($s) > 0 && (is_a($s[0], '_hx_lambda') || is_a($s[0], '_hx_lambda2')));
-}
-
-function _hx_is_numeric($v)
-{
-	return is_numeric($v) && !is_string($v);
-}
 
-function _hx_last_index_of($s, $value, $startIndex = null) {
-	$x = strrpos($s, $value, $startIndex === null ? 0 : $startIndex-strlen($s));
-	if($x === false)
-		return -1;
-	else
-		return $x;
-}
-
-function _hx_len($o) {
-	return is_string($o) ? strlen($o) : $o->length;
-}
-
-class _hx_list_iterator implements Iterator {
-	private $h;
-	private $list;
-	private $counter;
-	public function __construct($list) {
-		$this->list = $list;
-		$this->rewind();
+	/**
+		Create Haxe-compatible anonymous structure of `data` associative array
+	**/
+	static public inline function createAnon(data:NativeArray):Dynamic {
+		return new HxAnon(data);
 	}
 
-	public function next() {
-		if($this->h == null) return null;
-		$this->counter++;
-		$x = $this->h[0];
-		$this->h = $this->h[1];
-		return $x;
+	/**
+		Make sure specified class is loaded
+	**/
+	static public inline function ensureLoaded(phpClassName:String):Bool {
+		return Global.class_exists(phpClassName) || Global.interface_exists(phpClassName);
 	}
 
-	public function hasNext() {
-		return $this->h != null;
+	/**
+		Get `field` of a dynamic `value` in a safe manner (avoid exceptions on trying to get a method)
+	**/
+	static public function dynamicField(value:Dynamic, field:String):Dynamic {
+		if (Global.method_exists(value, field)) {
+			return closure(value, field);
+		}
+		if (Global.is_string(value)) {
+			value = @:privateAccess new HxDynamicStr(value);
+		}
+		return Syntax.field(value, field);
 	}
 
-	public function current() {
-		if (!$this->hasNext()) return null;
-		return $this->h[0];
+	public static function dynamicString(str:String):HxDynamicStr {
+		return @:privateAccess new HxDynamicStr(str);
 	}
 
-	public function key() {
-		return $this->counter;
+	/**
+		Creates Haxe-compatible closure of an instance method.
+		@param obj - any object
+	**/
+	public static function getInstanceClosure(obj:{?__hx_closureCache:NativeAssocArray<HxClosure>}, methodName:String) {
+		var result = Syntax.coalesce(obj.__hx_closureCache[methodName], null);
+		if (result != null) {
+			return result;
+		}
+		result = new HxClosure(obj, methodName);
+		if (!Global.property_exists(obj, '__hx_closureCache')) {
+			obj.__hx_closureCache = new NativeAssocArray();
+		}
+		obj.__hx_closureCache[methodName] = result;
+		return result;
 	}
 
-	public function valid() {
-		return $this->current() !== null;
+	/**
+		Creates Haxe-compatible closure of a static method.
+	**/
+	public static function getStaticClosure(phpClassName:String, methodName:String) {
+		var result = Syntax.coalesce(staticClosures[phpClassName][methodName], null);
+		if (result != null) {
+			return result;
+		}
+		result = new HxClosure(phpClassName, methodName);
+		if (!Global.array_key_exists(phpClassName, staticClosures)) {
+			staticClosures[phpClassName] = new NativeAssocArray();
+		}
+		staticClosures[phpClassName][methodName] = result;
+		return result;
+	}
+
+	/**
+		Creates Haxe-compatible closure.
+		@param type `this` for instance methods; full php class name for static methods
+		@param func Method name
+	**/
+	public static inline function closure(target:Dynamic, func:String):HxClosure {
+		return target.is_string() ? getStaticClosure(target, func) : getInstanceClosure(target, func);
+	}
+
+	/**
+		Get UTF-8 code of the first character in `s` without any checks
+	**/
+	static public inline function unsafeOrd(s:NativeString):Int {
+		var code = Global.ord(s[0]);
+		if (code < 0xC0) {
+			return code;
+		} else if (code < 0xE0) {
+			return ((code - 0xC0) << 6) + Global.ord(s[1]) - 0x80;
+		} else if (code < 0xF0) {
+			return ((code - 0xE0) << 12) + ((Global.ord(s[1]) - 0x80) << 6) + Global.ord(s[2]) - 0x80;
+		} else {
+			return ((code - 0xF0) << 18) + ((Global.ord(s[1]) - 0x80) << 12) + ((Global.ord(s[2]) - 0x80) << 6) + Global.ord(s[3]) - 0x80;
+		}
 	}
+}
 
-	public function rewind() {
-		$this->counter = -1;
-		$this->h = $this->list->h;
+/**
+	Class<T> implementation for Haxe->PHP internals.
+**/
+@:keep
+@:dox(hide)
+private class HxClass {
+	public var phpClassName(default, null):String;
+
+	public function new(phpClassName:String):Void {
+		this.phpClassName = phpClassName;
+	}
+
+	/**
+		Magic method to call static methods of this class, when `HxClass` instance is in a `Dynamic` variable.
+	**/
+	@:phpMagic
+	function __call(method:String, args:NativeArray):Dynamic {
+		var callback = (phpClassName == 'String' ? Syntax.nativeClassName(HxString) : phpClassName) + '::' + method;
+		return Global.call_user_func_array(callback, args);
+	}
+
+	/**
+		Magic method to get static vars of this class, when `HxClass` instance is in a `Dynamic` variable.
+	**/
+	@:phpMagic
+	function __get(property:String):Dynamic {
+		if (Global.defined('$phpClassName::$property')) {
+			return Global.constant('$phpClassName::$property');
+		} else if (Boot.hasGetter(phpClassName, property)) {
+			return Syntax.staticCall(phpClassName, 'get_$property');
+		} else if (phpClassName.method_exists(property)) {
+			return new HxClosure(phpClassName, property);
+		} else {
+			return Syntax.getStaticField(phpClassName, property);
+		}
 	}
 
-	public function size() {
-		return $this->list->length;
+	/**
+		Magic method to set static vars of this class, when `HxClass` instance is in a `Dynamic` variable.
+	**/
+	@:phpMagic
+	function __set(property:String, value:Dynamic):Void {
+		if (Boot.hasSetter(phpClassName, property)) {
+			Syntax.staticCall(phpClassName, 'set_$property', value);
+		} else {
+			Syntax.setStaticField(phpClassName, property, value);
+		}
 	}
 }
 
-function _hx_null() { return null; }
-
-class _hx_nullob {
-	function _throw()       { throw new HException('Null object'); }
-	function __call($f, $a) { $this->_throw(); }
-	function __get($f)      { $this->_throw(); }
-	function __set($f, $v)  { $this->_throw(); }
-	function __isset($f)    { $this->_throw(); }
-	function __unset($f)    { $this->_throw(); }
-	function __toString()   { return 'null'; }
-	static $inst;
-}
-
-_hx_nullob::$inst = new _hx_nullob();
-
-function _hx_nullob() { return _hx_nullob::$inst; }
+/**
+	Base class for enum types
+**/
+@:keep
+@:dox(hide)
+@:allow(php.Boot.stringify)
+private class HxEnum {
+	final tag:String;
+	final index:Int;
+	final params:NativeArray;
 
-function _hx_qtype($n) {
-	if(!isset(php_Boot::$qtypes[$n])) {
-		php_Boot::$qtypes[$n] = new _hx_type($n, null);
+	public function new(tag:String, index:Int, arguments:NativeArray = null):Void {
+		this.tag = tag;
+		this.index = index;
+		params = (arguments == null ? new NativeArray() : arguments);
 	}
 
-	return php_Boot::$qtypes[$n];
-}
+	/**
+		Get string representation of this `Class`
+	**/
+	public function toString():String {
+		return __toString();
+	}
 
-function _hx_register_type($t) {
-	php_Boot::$qtypes[$t->__qname__] = $t;
-	php_Boot::$ttypes[$t->__tname__] = $t;
-	if($t->__path__ !== null)
-		php_Boot::$tpaths[$t->__tname__] = $t->__path__;
+	/**
+		PHP magic method to get string representation of this `Class`
+	**/
+	@:phpMagic
+	public function __toString():String {
+		return Boot.stringify(this);
+	}
 }
 
-function _hx_set_method($o, $field, $func) {
-	$value[0]->scope = $o;
-	$o->$field = $func;
-}
+/**
+	`String` implementation
+**/
+@:keep
+@:dox(hide)
+private class HxString {
+	public static function toUpperCase(str:String):String {
+		return Global.mb_strtoupper(str);
+	}
 
-function _hx_shift_right($v, $n) {
-	return ($n == 0) ? $v : ($v >= 0) ? ($v >> $n) : ($v >> $n) & (0x7fffffff >> ($n-1));
-}
+	public static function toLowerCase(str:String):String {
+		return Global.mb_strtolower(str);
+	}
 
-function _hx_string_call($s, $method, $params) {
-	if(!is_string($s)) return call_user_func_array(array($s, $method), $params);
-	switch($method) {
-		case 'toUpperCase': return strtoupper($s);
-		case 'toLowerCase': return strtolower($s);
-		case 'charAt'     : return substr($s, $params[0], 1);
-		case 'charCodeAt' : return _hx_char_code_at($s, $params[0]);
-		case 'indexOf'    : return _hx_index_of($s, $params[0], (count($params) > 1 ? $params[1] : null));
-		case 'lastIndexOf': return _hx_last_index_of($s, $params[0], (count($params) > 1 ? $params[1] : null));
-		case 'split'      : return _hx_explode($params[0], $s);
-		case 'substr'     : return _hx_substr($s, $params[0], (count($params) > 1 ? $params[1] : null));
-		case 'toString'   : return $s;
-		default           : throw new HException('Invalid Operation: ' . $method);
+	public static function charAt(str:String, index:Int):String {
+		return index < 0 ? '' : Global.mb_substr(str, index, 1);
 	}
-}
 
-function _hx_string_or_null($s) {
-	return $s === null ? 'null' : $s;
-}
+	public static function charCodeAt(str:String, index:Int):Null<Int> {
+		if (index < 0 || str == '') {
+			return null;
+		}
+		if (index == 0) {
+			return Boot.unsafeOrd(str);
+		}
+		var char = Global.mb_substr(str, index, 1);
+		return char == '' ? null : Boot.unsafeOrd(char);
+	}
 
-function _hx_string_rec($o, $s) {
-	if($o === null)                return 'null';
-	if(strlen($s) >= 5)            return '<...>';
-	if(is_int($o) || is_float($o)) return '' . $o;
-	if(is_bool($o))                return $o ? 'true' : 'false';
-	if(is_object($o)) {
-		$c = get_class($o);
-		if($o instanceof Enum) {
-			$b = $o->tag;
-			if(!empty($o->params)) {
-				$s .= \"\t\";
-				$b .= '(';
-				foreach($o->params as $i => $val) {
-					if($i > 0)
-						$b .= ',' . _hx_string_rec($val, $s);
-					else
-						$b .= _hx_string_rec($val, $s);
-				}
-				$b .= ')';
-			}
-			return $b;
+	public static function indexOf(str:String, search:String, startIndex:Int = null):Int {
+		if (startIndex == null) {
+			startIndex = 0;
 		} else {
-			if ($o instanceof _hx_anonymous) {
-				if ($o->toString && is_callable($o->toString)) {
-					return call_user_func($o->toString);
-				}
-				$rfl = new ReflectionObject($o);
-				$b2 = \"{\n\";
-				$s .= \"\t\";
-				$properties = $rfl->getProperties();
-
-				foreach($properties as $i => $prop) {
-					$f = $prop->getName();
-					if($i > 0)
-						$b2 .= \", \n\";
-					$b2 .= $s . $f . ' : ' . _hx_string_rec($o->$f, $s);
-				}
-				$s = substr($s, 1);
-				$b2 .= \"\n\" . $s . '}';
-				return $b2;
-			} else {
-				if($o instanceof _hx_type)
-					return $o->__qname__;
-				else {
-					if(is_callable(array($o, 'toString')))
-						return $o->toString();
-					else {
-						if(is_callable(array($o, '__toString')))
-							return $o->__toString();
-						else
-							return '[' . _hx_ttype($c) . ']';
-					}
+			var length = str.length;
+			if (startIndex < 0) {
+				startIndex += length;
+				if (startIndex < 0) {
+					startIndex = 0;
 				}
 			}
+			if (startIndex >= length && search != '') {
+				return -1;
+			}
+		}
+		var index:EitherType<Int, Bool> = if (search == '') {
+			var length = str.length;
+			startIndex > length ? length : startIndex;
+		} else {
+			Global.mb_strpos(str, search, startIndex);
 		}
+		return (index == false ? -1 : index);
 	}
-	if(is_string($o)) {
-		if(_hx_is_lambda($o)) return '<function>';
-//		if(strlen($s) > 0)    return '\"' . str_replace('\"', '\\\"', $o) . '\"';
-		else                  return $o;
-	}
-	if(is_array($o)) {
-		if(is_callable($o)) return '<function>';
-		$str = '[';
-		$s .= \"\t\";
-		$first = true;
-		$assoc = true;
-		foreach($o as $k => $v)
-		{
-			if ($first && $k === 0)
-				$assoc = false;
-			$str .= ($first ? '' : ',') . ($assoc
-				? _hx_string_rec($k, $s) . '=>' . _hx_string_rec($o[$k], $s)
-				: _hx_string_rec($o[$k], $s)
-			);
-			$first = false;
-		}
-		$str .= ']';
-		return $str;
-	}
-	return '';
-}
 
-function _hx_substr($s, $pos, $len) {
-	if($pos !== null && $pos !== 0 && $len !== null && $len < 0) return '';
-	if($len === null) $len = strlen($s);
-	if($pos < 0) {
-		$pos = strlen($s) + $pos;
-		if($pos < 0) $pos = 0;
-	} else if($len < 0 )
-		$len = strlen($s) + $len - $pos;
-	$s = substr($s, $pos, $len);
-	if($s === false)
-		return '';
-	else
-		return $s;
-}
-
-function _hx_substring($s, $startIndex, $endIndex) {
-	$len = strlen($s);
-	if ($endIndex === null)
-		$endIndex = $len;
-	else if ($endIndex < 0)
-		$endIndex = 0;
-	else if ($endIndex > $len)
-		$endIndex  = $len;
-
-	if ($startIndex < 0)
-		$startIndex = 0;
-	else if ($startIndex > $len)
-		$startIndex = $len;
-
-	if ($startIndex > $endIndex) {
-		$tmp = $startIndex;
-		$startIndex = $endIndex;
-		$endIndex = $tmp;
-	}
-	return _hx_substr($s, $startIndex, $endIndex - $startIndex);
-}
-
-function _hx_trace($v, $i) {
-	$msg = $i !== null ? $i->fileName.':'.$i->lineNumber.': ' : '';
-	echo $msg._hx_string_rec($v, '').\"\n\";
-}
-
-function _hx_ttype($n) {
-	return isset(php_Boot::$ttypes[$n]) ? php_Boot::$ttypes[$n] : null;
-}
-
-function _hx_make_var_args() {
-	$args = func_get_args();
-	$f = array_shift($args);
-	return call_user_func($f, new _hx_array($args));
-}
-
-class _hx_anonymous extends stdClass {
-	public function __call($m, $a) {
-		return call_user_func_array($this->$m, $a);
+	public static function lastIndexOf(str:String, search:String, startIndex:Int = null):Int {
+		var start = startIndex;
+		if (start == null) {
+			start = 0;
+		} else {
+			var length = str.length;
+			if (start >= 0) {
+				start = start - length;
+				if (start > 0) {
+					start = 0;
+				}
+			} else if (start < -length) {
+				start = -length;
+			}
+		}
+		var index:EitherType<Int, Bool> = if (search == '') {
+			var length = str.length;
+			startIndex == null || startIndex > length ? length : startIndex;
+		} else {
+			Global.mb_strrpos(str, search, start);
+		}
+		if (index == false) {
+			return -1;
+		} else {
+			return index;
+		}
 	}
 
-	public function __set($n, $v) {
-		$this->$n = $v;
+	public static function split(str:String, delimiter:String):Array<String> {
+		var arr:NativeArray = if (delimiter == '') {
+			Global.preg_split('//u', str, -1, Const.PREG_SPLIT_NO_EMPTY);
+		} else {
+			delimiter = Global.preg_quote(delimiter, '/');
+			Global.preg_split('/$delimiter/', str);
+		}
+		return @:privateAccess Array.wrap(arr);
 	}
 
-	public function &__get($n) {
-		if(isset($this->$n))
-			return $this->$n;
-		$null = null;
-		return $null;
+	public static function substr(str:String, pos:Int, ?len:Int):String {
+		return Global.mb_substr(str, pos, len);
 	}
 
-	public function __isset($n) {
-		return isset($this->$n);
+	public static function substring(str:String, startIndex:Int, ?endIndex:Int):String {
+		if (endIndex == null) {
+			if (startIndex < 0) {
+				startIndex = 0;
+			}
+			return Global.mb_substr(str, startIndex);
+		}
+		if (endIndex < 0) {
+			endIndex = 0;
+		}
+		if (startIndex < 0) {
+			startIndex = 0;
+		}
+		if (startIndex > endIndex) {
+			var tmp = endIndex;
+			endIndex = startIndex;
+			startIndex = tmp;
+		}
+		return Global.mb_substr(str, startIndex, endIndex - startIndex);
 	}
 
-	public function __unset($n) {
-		unset($this->$n);
+	public static function toString(str:String):String {
+		return str;
 	}
 
-	public function __toString() {
-		$rfl = new ReflectionObject($this);
-		$b = '{ ';
-		$properties = $rfl->getProperties();
-		$first = true;
-		while(list(, $prop) = each($properties)) {
-			if($first)
-				$first = false;
-			else
-				$b .= ', ';
-			$f = $prop->getName();
-			$b .= $f . ' => ' . $this->$f;
-		}
-		$b .= ' }';
-		return $b;
+	public static function fromCharCode(code:Int):String {
+		return Global.mb_chr(code);
 	}
 }
 
-class _hx_type {
-	public $__tname__;
-	public $__qname__;
-	public $__path__;
-	public function __construct($cn, $qn, $path = null) {
-		$this->__tname__ = $cn;
-		$this->__qname__ = $qn;
-		$this->__path__ = $path;
-		if(property_exists($cn, '__meta__'))
-			$this->__meta__ =  eval($cn.'::$__meta__');
-	}
-
-	public function __ensureMeta__() {
-		if(property_exists($this->__tname__, '__meta__') && !$this->__meta__) {
-			$this->__meta__ =  eval($this->__tname__.'::$__meta__');
+/**
+	For Dynamic access which looks like String.
+	Instances of this class should not be saved anywhere.
+	Instead it should be used to immediately invoke a String field right after instance creation one time only.
+**/
+@:dox(hide)
+@:keep
+private class HxDynamicStr extends HxClosure {
+	static var hxString:String = (cast HxString : HxClass).phpClassName;
+
+	/**
+		Returns HxDynamicStr instance if `value` is a string.
+		Otherwise returns `value` as-is.
+	**/
+	static function wrap(value:Dynamic):Dynamic {
+		if (value.is_string()) {
+			return new HxDynamicStr(value);
+		} else {
+			return value;
 		}
 	}
 
-	public function toString()   { return $this->__toString(); }
+	static inline function invoke(str:String, method:String, args:NativeArray):Dynamic {
+		Global.array_unshift(args, str);
+		return Global.call_user_func_array(hxString + '::' + method, args);
+	}
 
-	public function __toString() {
-		return $this->__qname__;
+	function new(str:String) {
+		super(str, null);
 	}
 
-	private $rfl = false;
-	public function __rfl__() {
-		if($this->rfl !== false) return $this->rfl;
-		if(class_exists($this->__tname__) || interface_exists($this->__tname__))
-			$this->rfl = new ReflectionClass($this->__tname__);
-		else
-			$this->rfl = null;
-		return $this->rfl;
+	@:phpMagic
+	function __get(field:String):Dynamic {
+		switch (field) {
+			case 'length':
+				return (target : String).length;
+			case _:
+				func = field;
+				return this;
+		}
 	}
 
-	public function __call($n, $a) {
-		return call_user_func_array(array($this->__tname__, $n), $a);
+	@:phpMagic
+	function __call(method:String, args:NativeArray):Dynamic {
+		return invoke(target, method, args);
 	}
 
-	public function __get($n) {
-		if(($r = $this->__rfl__())==null) return null;
-		if($r->hasProperty($n)) {
-			try {
-				return $r->getStaticPropertyValue($n);
-			} catch(Exception $e) {
-				return null;
-			}
-		} else if($r->hasMethod($n))
-			return array($r->name, $n);
-		else
-			return null;
+	/**
+		@see http://php.net/manual/en/language.oop5.magic.php#object.invoke
+	**/
+	@:phpMagic
+	override public function __invoke() {
+		return invoke(target, func, Global.func_get_args());
 	}
 
-	public function __set($n, $v) {
-		if(($r = $this->__rfl__())==null) return null;
-		return $r->setStaticPropertyValue($n, $v);
+	/**
+		Generates callable value for PHP
+	**/
+	override public function getCallback(eThis:Dynamic = null):NativeIndexedArray<Dynamic> {
+		if (eThis == null) {
+			return Syntax.arrayDecl((this : Dynamic), func);
+		}
+		return Syntax.arrayDecl((new HxDynamicStr(eThis) : Dynamic), func);
 	}
 
-	public function __isset($n) {
-		if(($r = $this->__rfl__())==null) return null;
-		return array_key_exists($n, $r->getStaticProperties()) || $r->hasMethod($n);
+	/**
+		Invoke this closure with `newThis` instead of `this`
+	**/
+	override public function callWith(newThis:Dynamic, args:NativeArray):Dynamic {
+		if (newThis == null) {
+			newThis = target;
+		}
+		return invoke(newThis, func, args);
 	}
 }
 
-class _hx_class extends _hx_type {}
-
-class _hx_enum extends _hx_type {}
-
-class _hx_interface extends _hx_type {}
-
-class HException extends Exception {
-	public function __construct($e, $message = null, $code = null, $p = null) {
-		$message = _hx_string_rec($e, '') . $message;
-		parent::__construct($message,$code);
-		$this->e = $e;
-		$this->p = $p;
+/**
+	Anonymous objects implementation
+**/
+@:keep
+@:dox(hide)
+private class HxAnon extends StdClass {
+	public function new(fields:NativeArray = null) {
+		super();
+		if (fields != null) {
+			Syntax.foreach(fields, function(name, value) Syntax.setField(this, name, value));
+		}
 	}
-	public $e;
-	public $p;
-	public function setLine($l) {
-		$this->line = $l;
+
+	@:phpMagic
+	function __get(name:String) {
+		return null;
 	}
-	public function setFile($f) {
-		$this->file = $f;
+
+	@:phpMagic
+	function __call(name:String, args:NativeArray):Dynamic {
+		return Syntax.code("($this->{0})(...{1})", name, args);
 	}
 }
 
-class _hx_lambda {
-	public function __construct($locals, $func) {
-		$this->locals = $locals;
-		$this->func = $func;
+/**
+	Closures implementation
+**/
+@:keep
+@:dox(hide)
+private class HxClosure {
+	/** `this` for instance methods; php class name for static methods */
+	var target:Dynamic;
+
+	/** Method name for methods */
+	var func:String;
+
+	/** A callable value, which can be invoked by PHP */
+	var callable:Any;
+
+	public function new(target:Dynamic, func:String):Void {
+		this.target = target;
+		this.func = func;
+		// Force runtime error if trying to create a closure of an instance which happen to be `null`
+		if (target.is_null()) {
+			throw "Unable to create closure on `null`";
+		}
+		callable = Std.is(target, HxAnon) ? Syntax.field(target, func) : Syntax.arrayDecl(target, func);
 	}
-	public $locals;
-	public $func;
 
-	public function execute() {
-		// if use $this->locals directly in array_merge it works only if I make the assignement loop,
-		// so I've decided to reference $arr
-		$arr = array();
-		foreach($this->locals as $i => $val)
-			$arr[] = & $this->locals[$i];
-		$args = func_get_args();
-		return call_user_func_array($this->func, array_merge($arr, $args));
+	/**
+		@see http://php.net/manual/en/language.oop5.magic.php#object.invoke
+	**/
+	@:phpMagic
+	public function __invoke() {
+		return Global.call_user_func_array(callable, Global.func_get_args());
 	}
-}
 
-class Enum {
-	public function __construct($tag, $index, $params = null) { $this->tag = $tag; $this->index = $index; $this->params = $params; }
-	public $tag;
-	public $index;
-	public $params;
-
-	public function __toString() {
-		return $this->tag;
+	/**
+		Generates callable value for PHP
+	**/
+	public function getCallback(eThis:Dynamic = null):NativeIndexedArray<Dynamic> {
+		if (eThis == null) {
+			eThis = target;
+		}
+		if (Std.is(eThis, HxAnon)) {
+			return Syntax.field(eThis, func);
+		}
+		return Syntax.arrayDecl(eThis, func);
 	}
-}
 
-error_reporting(E_ALL & ~E_STRICT);
-set_error_handler('_hx_error_handler', E_ALL & ~E_STRICT);
-set_exception_handler('_hx_exception_handler');
-
-php_Boot::$qtypes = array();
-php_Boot::$ttypes = array();
-php_Boot::$tpaths = array();
-
-_hx_register_type(new _hx_class('String',  'String'));
-_hx_register_type(new _hx_class('_hx_array', 'Array'));
-_hx_register_type(new _hx_class('Int',     'Int'));
-_hx_register_type(new _hx_class('Float',   'Float'));
-_hx_register_type(new _hx_class('Class',   'Class'));
-_hx_register_type(new _hx_class('Enum',    'Enum'));
-_hx_register_type(new _hx_class('Dynamic', 'Dynamic'));
-_hx_register_type(new _hx_enum('Bool',     'Bool'));
-_hx_register_type(new _hx_enum('Void',     'Void'));
-
-
-$_hx_libdir = dirname(__FILE__) . '/..';
-$_hx_autload_cache_file = $_hx_libdir . '/../cache/haxe_autoload.php';
-if(!file_exists($_hx_autload_cache_file)) {
-	function _hx_build_paths($d, &$_hx_types_array, $pack, $prefix) {
-		$h = opendir($d);
-		while(false !== ($f = readdir($h))) {
-			$p = $d.'/'.$f;
-			if($f == '.' || $f == '..')
-				continue;
-				if (is_file($p) && substr($f, -4) == '.php') {
-				$bn = basename($f, '.php');
-				if ($prefix)
-				{
-					if ($prefix != substr($bn, 0, $lenprefix = strlen($prefix)))
-						continue;
-					$bn = substr($bn, $lenprefix);
-				}
-				if(substr($bn, -6) == '.class') {
-					$bn = substr($bn, 0, -6);
-					$t = 0;
-				} else if(substr($bn, -5) == '.enum') {
-					$bn = substr($bn, 0, -5);
-					$t = 1;
-				} else if(substr($bn, -10) == '.interface') {
-					$bn = substr($bn, 0, -10);
-					$t = 2;
-				} else if(substr($bn, -7) == '.extern') {
-					$bn = substr($bn, 0, -7);
-					$t = 3;
-				} else
-					continue;
-				$qname = ($bn == 'HList' && empty($pack)) ? 'List' : join(array_merge($pack, array($bn)), '.');
-				$_hx_types_array[] = array(
-					'path' => $p,
-					'name' => $prefix . $bn,
-					'type' => $t,
-					'qname' => $qname,
-					'phpname' => join(array_merge($pack, array($prefix . $bn)), '_')
-				);
-			} else if(is_dir($p))
-				_hx_build_paths($p, $_hx_types_array, array_merge($pack, array($f)), $prefix);
-		}
-		closedir($h);
-	}
-
-	$_hx_cache_content = '<?php\n\n';
-	$_hx_types_array = array();
-
-	_hx_build_paths($_hx_libdir, $_hx_types_array, array(), $_hx_class_prefix);
-
-	foreach($_hx_types_array as $val) {
-		$_hx_cache_content .= '_hx_register_type(new ';
-		$t = null;
-		if($val['type'] == 0) {
-			$t = new _hx_class($val['phpname'], $val['qname'], $val['path']);
-			$_hx_cache_content .= '_hx_class';
-		} else if($val['type'] == 1) {
-			$t = new _hx_enum($val['phpname'], $val['qname'], $val['path']);
-			$_hx_cache_content .= '_hx_enum';
-		} else if($val['type'] == 2) {
-			$t = new _hx_interface($val['phpname'], $val['qname'], $val['path']);
-			$_hx_cache_content .= '_hx_interface';
-		} else if($val['type'] == 3) {
-			$t = new _hx_class($val['name'], $val['qname'], $val['path']);
-			$_hx_cache_content .= '_hx_class';
-		}
-		_hx_register_type($t);
-		$_hx_cache_content .= '(\\''.($val['type'] == 3 ? $val['name'] : $val['phpname']).'\\', \\''.$val['qname'].'\\', \\''.$val['path'].'\\'));\n';
-	}
-	try {
-		file_put_contents($_hx_autload_cache_file, $_hx_cache_content);
-	} catch(Exception $e) {}
-	unset($_hx_types_array);
-	unset($_hx_cache_content);
-} else {
-	require($_hx_autload_cache_file);
-}
+	/**
+		Check if this is the same closure
+	**/
+	public function equals(closure:HxClosure):Bool {
+		return (target == closure.target && func == closure.func);
+	}
 
-function _hx_autoload($name) {
-	if(!isset(php_Boot::$tpaths[$name])) return false;
-	require_once(php_Boot::$tpaths[$name]);
-	return true;
+	/**
+		Invoke this closure with `newThis` instead of `this`
+	**/
+	public function callWith(newThis:Dynamic, args:NativeArray):Dynamic {
+		return Global.call_user_func_array(getCallback(newThis), args);
+	}
 }
 
-if(!ini_get('date.timezone'))
-	date_default_timezone_set('UTC');
+/**
+	Special exception which is used to wrap non-throwable values
+**/
+@:keep
+@:dox(hide)
+private class HxException extends Exception {
+	var e:Dynamic;
 
-spl_autoload_register('_hx_autoload')");
+	public function new(e:Dynamic):Void {
+		this.e = e;
+		super(Boot.stringify(e));
 	}
 }
diff --git a/std/php/BytesData.hx b/std/php/BytesData.hx
deleted file mode 100644
index 1553f309ef3d1ab994bfc461e3f670f7ba61e5d5..0000000000000000000000000000000000000000
--- a/std/php/BytesData.hx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C)2005-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 php;
-
-
-
-private class Wrapper {
-	public var s : NativeString;
-	public inline function new (s:NativeString) {
-		this.s = s;
-	}
-}
-
-abstract BytesData(Wrapper) {
-
-	inline function new (x:Wrapper) this = x;
-
-	inline function str ():php.NativeString return this.s;
-
-	inline function setNativeString (val:NativeString):Void {
-		this.s = val;
-	}
-
-	inline function get_length ():Int {
-		return untyped __call__("strlen", str());
-	}
-
-	static inline function wrap (s:NativeString):Wrapper {
-		return new Wrapper(s);
-	}
-
-	static inline function ofNativeString (s:NativeString) {
-		return new BytesData( wrap(s));
-	}
-
-	public inline function set (index:Int, val:Int):Void {
-		untyped __php__("{0}->s[{1}] = chr({2})", this, index, val);
-	}
-
-	public var length(get, never):Int;
-
-	public inline function compare (other:BytesData):Int {
-		return untyped __php__("{0} < {1} ? -1 : ({0} == {1} ? 0 : 1)", str(), other.str());
-	}
-
-	public inline function get (pos:Int):Int {
-		return untyped __call__("ord", str()[pos]);
-	}
-
-	public inline function copy ():BytesData {
-		return ofNativeString(str());
-	}
-
-	public inline function getString (pos:Int, len:Int):String {
-		return untyped __call__("substr", str(), pos, len);
-	}
-
-	public inline function sub (pos:Int, len:Int):BytesData {
-		return ofString(untyped __call__("substr", str(), pos, len));
-	}
-
-	public inline function blit (pos : Int, src : BytesData, srcpos : Int, len : Int):Void {
-		setNativeString(untyped __php__("substr({0}, 0, {2}) . substr({1}, {3}, {4}) . substr({0}, {2}+{4})", str(), src.str(), pos, srcpos, len));
-	}
-
-	public inline function toString():String return cast str();
-
-	public static inline function ofString (s:String) {
-		return ofNativeString(cast s);
-	}
-
-	public static inline function alloc (length:Int) {
-		return ofNativeString(untyped __call__("str_repeat", __call__("chr", 0), length));
-	}
-}
\ No newline at end of file
diff --git a/std/php/Closure.hx b/std/php/Closure.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4d9d5591a233914e3bdc423de110c59c9242f35d
--- /dev/null
+++ b/std/php/Closure.hx
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+import haxe.extern.Rest;
+
+/**
+	@see http://php.net/manual/en/class.closure.php
+**/
+@:native('Closure')
+extern class Closure {
+	public function bindTo(newthis:{}, newscope:Dynamic = "static"):Closure;
+	public function call(newthis:{}, args:Rest<Dynamic>):Dynamic;
+}
diff --git a/std/php/Const.hx b/std/php/Const.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7a70b2009a8a59125ce548b4ef6af4d6b12532b7
--- /dev/null
+++ b/std/php/Const.hx
@@ -0,0 +1,427 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+/**
+	This class contains externs for native PHP constants defined in global namespace.
+	For native PHP functions in global namespace see `php.Global`.
+**/
+@:phpGlobal
+extern class Const {
+	/**
+		If this constant is defined and equals `true` then Haxe will not set error handler automatically.
+	**/
+	static final HAXE_CUSTOM_ERROR_HANDLER:Bool;
+
+	/**
+		@see http://php.net/manual/en/reserved.constants.php
+	**/
+	static final PHP_VERSION_ID:Int;
+
+	static final PHP_OS:String;
+	static final PHP_SAPI:String;
+	static final PHP_BINARY:String;
+	static final PHP_EOL:String;
+	static final PHP_INT_MAX:Int;
+	static final PHP_INT_MIN:Int;
+	static final PHP_INT_SIZE:Int;
+
+	/**
+		@see http://php.net/manual/en/language.constants.predefined.php
+	**/
+	static final __LINE__:Int;
+
+	static final __FILE__:String;
+	static final __DIR__:String;
+	static final __FUNCTION__:String;
+	static final __CLASS__:String;
+	static final __TRAIT__:String;
+	static final __METHOD__:String;
+	static final __NAMESPACE__:String;
+
+	/**
+		@see https://php.net/manual/en/dir.constants.php
+	**/
+	static final DIRECTORY_SEPARATOR:String;
+
+	static final PATH_SEPARATOR:String;
+	static final SCANDIR_SORT_ASCENDING:Int;
+	static final SCANDIR_SORT_DESCENDING:Int;
+	static final SCANDIR_SORT_NONE:Int;
+
+	/**
+		@see http://php.net/manual/en/errorfunc.constants.php
+	**/
+	static final E_ERROR:Int;
+
+	static final E_WARNING:Int;
+	static final E_PARSE:Int;
+	static final E_NOTICE:Int;
+	static final E_CORE_ERROR:Int;
+	static final E_CORE_WARNING:Int;
+	static final E_COMPILE_ERROR:Int;
+	static final E_COMPILE_WARNING:Int;
+	static final E_USER_ERROR:Int;
+	static final E_USER_WARNING:Int;
+	static final E_USER_NOTICE:Int;
+	static final E_STRICT:Int;
+	static final E_RECOVERABLE_ERROR:Int;
+	static final E_DEPRECATED:Int;
+	static final E_USER_DEPRECATED:Int;
+	static final E_ALL:Int;
+
+	/**
+		@see http://php.net/manual/en/function.count.php
+	**/
+	static final COUNT_NORMAL:Int;
+
+	static final COUNT_RECURSIVE:Int;
+
+	/**
+		@see http://php.net/manual/en/function.array-filter.php
+	**/
+	static final ARRAY_FILTER_USE_KEY:Int;
+
+	static final ARRAY_FILTER_USE_BOTH:Int;
+
+	/**
+		@see http://php.net/manual/en/function.debug-backtrace.php
+	**/
+	static final DEBUG_BACKTRACE_PROVIDE_OBJECT:Int;
+
+	static final DEBUG_BACKTRACE_IGNORE_ARGS:Int;
+
+	/**
+		@see http://php.net/manual/en/math.constants.php
+	**/
+	static final M_PI:Float;
+
+	static final M_E:Float;
+	static final M_LOG2E:Float;
+	static final M_LOG10E:Float;
+	static final M_LN2:Float;
+	static final M_LN10:Float;
+	static final M_PI_2:Float;
+	static final M_PI_4:Float;
+	static final M_1_PI:Float;
+	static final M_2_PI:Float;
+	static final M_SQRTPI:Float;
+	static final M_2_SQRTPI:Float;
+	static final M_SQRT2:Float;
+	static final M_SQRT3:Float;
+	static final M_SQRT1_2:Float;
+	static final M_LNPI:Float;
+	static final M_EULER:Float;
+	static final PHP_ROUND_HALF_UP:Int;
+	static final PHP_ROUND_HALF_DOWN:Int;
+	static final PHP_ROUND_HALF_EVEN:Int;
+	static final PHP_ROUND_HALF_ODD:Int;
+	static final NAN:Float;
+	static final INF:Float;
+
+	/**
+		@see http://php.net/manual/en/function.setlocale.php
+	**/
+	static final LC_ALL:Int;
+
+	static final LC_COLLATE:Int;
+	static final LC_CTYPE:Int;
+	static final LC_MONETARY:Int;
+	static final LC_NUMERIC:Int;
+	static final LC_TIME:Int;
+	static final LC_MESSAGES:Int;
+
+	/**
+		@see http://php.net/manual/en/features.commandline.io-streams.php
+	**/
+	static final STDIN:Resource;
+
+	static final STDOUT:Resource;
+	static final STDERR:Resource;
+
+	/**
+		@see http://php.net/manual/en/function.preg-match-all.php
+	**/
+	static final PREG_PATTERN_ORDER:Int;
+
+	static final PREG_SET_ORDER:Int;
+	static final PREG_OFFSET_CAPTURE:Int;
+
+	/**
+		@see http://php.net/manual/en/function.preg-split.php
+	**/
+	static final PREG_SPLIT_NO_EMPTY:Int;
+
+	static final PREG_SPLIT_DELIM_CAPTURE:Int;
+	static final PREG_SPLIT_OFFSET_CAPTURE:Int;
+
+	/**
+		@see http://php.net/manual/en/function.preg-last-error.php
+	**/
+	static final PREG_NO_ERROR:Int;
+
+	static final PREG_INTERNAL_ERROR:Int;
+	static final PREG_BACKTRACK_LIMIT_ERROR:Int;
+	static final PREG_RECURSION_LIMIT_ERROR:Int;
+	static final PREG_BAD_UTF8_ERROR:Int;
+	static final PREG_BAD_UTF8_OFFSET_ERROR:Int;
+	static final PREG_JIT_STACKLIMIT_ERROR:Int;
+
+	/**
+		@see http://php.net/manual/en/function.htmlspecialchars.php
+	**/
+	static final ENT_COMPAT:Int;
+
+	static final ENT_QUOTES:Int;
+	static final ENT_NOQUOTES:Int;
+	static final ENT_IGNORE:Int;
+	static final ENT_SUBSTITUTE:Int;
+	static final ENT_DISALLOWED:Int;
+	static final ENT_HTML401:Int;
+	static final ENT_XML1:Int;
+	static final ENT_XHTML:Int;
+	static final ENT_HTML5:Int;
+
+	/**
+		@see http://php.net/manual/en/function.str-pad.php
+	**/
+	static final STR_PAD_RIGHT:Int;
+
+	static final STR_PAD_LEFT:Int;
+	static final STR_PAD_BOTH:Int;
+
+	/**
+		@see http://php.net/manual/en/function.feof.php
+	**/
+	static final SEEK_SET:Int;
+
+	static final SEEK_CUR:Int;
+	static final SEEK_END:Int;
+
+	/**
+		@see http://php.net/manual/en/function.stream-socket-server.php
+	**/
+	static final STREAM_SERVER_BIND:Int;
+
+	static final STREAM_SERVER_LISTEN:Int;
+
+	/**
+		@see http://php.net/manual/en/function.stream-socket-client.php
+	**/
+	static final STREAM_CLIENT_CONNECT:Int;
+
+	static final STREAM_CLIENT_ASYNC_CONNECT:Int;
+	static final STREAM_CLIENT_PERSISTENT:Int;
+
+	/**
+		@see http://php.net/manual/en/sockets.constants.php
+	**/
+	static final SOCK_STREAM:Int;
+
+	static final SOCK_DGRAM:Int;
+	static final SOCK_SEQPACKET:Int;
+	static final SOCK_RAW:Int;
+	static final SOCK_RDM:Int;
+	static final AF_INET:Int;
+	static final AF_INET6:Int;
+	static final AF_UNIX:Int;
+	static final SOL_TCP:Int;
+	static final SOL_SOCKET:Int;
+	static final SO_RCVTIMEO:Int;
+	static final SO_SNDTIMEO:Int;
+	static final TCP_NODELAY:Int;
+	static final PHP_BINARY_READ:Int;
+
+	/**
+		@see http://php.net/manual/en/json.constants.php
+	**/
+	static final JSON_ERROR_NONE:Int;
+
+	static final JSON_ERROR_DEPTH:Int;
+	static final JSON_ERROR_STATE_MISMATCH:Int;
+	static final JSON_ERROR_CTRL_CHAR:Int;
+	static final JSON_ERROR_SYNTAX:Int;
+	static final JSON_ERROR_UTF8:Int;
+	static final JSON_ERROR_RECURSION:Int;
+	static final JSON_ERROR_INF_OR_NAN:Int;
+	static final JSON_ERROR_UNSUPPORTED_TYPE:Int;
+	static final JSON_HEX_TAG:Int;
+	static final JSON_HEX_AMP:Int;
+	static final JSON_HEX_APOS:Int;
+	static final JSON_HEX_QUOT:Int;
+	static final JSON_FORCE_OBJECT:Int;
+	static final JSON_NUMERIC_CHECK:Int;
+	static final JSON_BIGINT_AS_STRING:Int;
+	static final JSON_PRETTY_PRINT:Int;
+	static final JSON_UNESCAPED_SLASHES:Int;
+	static final JSON_UNESCAPED_UNICODE:Int;
+	static final JSON_PARTIAL_OUTPUT_ON_ERROR:Int;
+	static final JSON_PRESERVE_ZERO_FRACTION:Int;
+
+	/**
+		@see http://php.net/manual/en/mysqli.constants.php
+	**/
+	static final MYSQLI_READ_DEFAULT_GROUP:Int;
+
+	static final MYSQLI_READ_DEFAULT_FILE:Int;
+	static final MYSQLI_OPT_CONNECT_TIMEOUT:Int;
+	static final MYSQLI_OPT_LOCAL_INFILE:Int;
+	static final MYSQLI_INIT_COMMAND:Int;
+	static final MYSQLI_CLIENT_SSL:Int;
+	static final MYSQLI_CLIENT_COMPRESS:Int;
+	static final MYSQLI_CLIENT_INTERACTIVE:Int;
+	static final MYSQLI_CLIENT_IGNORE_SPACE:Int;
+	static final MYSQLI_CLIENT_NO_SCHEMA:Int;
+	static final MYSQLI_CLIENT_MULTI_QUERIES:Int;
+	static final MYSQLI_STORE_RESULT:Int;
+	static final MYSQLI_USE_RESULT:Int;
+	static final MYSQLI_ASSOC:Int;
+	static final MYSQLI_NUM:Int;
+	static final MYSQLI_BOTH:Int;
+	static final MYSQLI_NOT_NULL_FLAG:Int;
+	static final MYSQLI_PRI_KEY_FLAG:Int;
+	static final MYSQLI_UNIQUE_KEY_FLAG:Int;
+	static final MYSQLI_MULTIPLE_KEY_FLAG:Int;
+	static final MYSQLI_BLOB_FLAG:Int;
+	static final MYSQLI_UNSIGNED_FLAG:Int;
+	static final MYSQLI_ZEROFILL_FLAG:Int;
+	static final MYSQLI_AUTO_INCREMENT_FLAG:Int;
+	static final MYSQLI_TIMESTAMP_FLAG:Int;
+	static final MYSQLI_SET_FLAG:Int;
+	static final MYSQLI_NUM_FLAG:Int;
+	static final MYSQLI_PART_KEY_FLAG:Int;
+	static final MYSQLI_GROUP_FLAG:Int;
+	static final MYSQLI_TYPE_DECIMAL:Int;
+	static final MYSQLI_TYPE_NEWDECIMAL:Int;
+	static final MYSQLI_TYPE_BIT:Int;
+	static final MYSQLI_TYPE_TINY:Int;
+	static final MYSQLI_TYPE_SHORT:Int;
+	static final MYSQLI_TYPE_LONG:Int;
+	static final MYSQLI_TYPE_FLOAT:Int;
+	static final MYSQLI_TYPE_DOUBLE:Int;
+	static final MYSQLI_TYPE_NULL:Int;
+	static final MYSQLI_TYPE_TIMESTAMP:Int;
+	static final MYSQLI_TYPE_LONGLONG:Int;
+	static final MYSQLI_TYPE_INT24:Int;
+	static final MYSQLI_TYPE_DATE:Int;
+	static final MYSQLI_TYPE_TIME:Int;
+	static final MYSQLI_TYPE_DATETIME:Int;
+	static final MYSQLI_TYPE_YEAR:Int;
+	static final MYSQLI_TYPE_NEWDATE:Int;
+	static final MYSQLI_TYPE_INTERVAL:Int;
+	static final MYSQLI_TYPE_ENUM:Int;
+	static final MYSQLI_TYPE_SET:Int;
+	static final MYSQLI_TYPE_TINY_BLOB:Int;
+	static final MYSQLI_TYPE_MEDIUM_BLOB:Int;
+	static final MYSQLI_TYPE_LONG_BLOB:Int;
+	static final MYSQLI_TYPE_BLOB:Int;
+	static final MYSQLI_TYPE_VAR_STRING:Int;
+	static final MYSQLI_TYPE_STRING:Int;
+	static final MYSQLI_TYPE_CHAR:Int;
+	static final MYSQLI_TYPE_GEOMETRY:Int;
+	static final MYSQLI_NEED_DATA:Int;
+	static final MYSQLI_NO_DATA:Int;
+	static final MYSQLI_DATA_TRUNCATED:Int;
+	static final MYSQLI_ENUM_FLAG:Int;
+	static final MYSQLI_BINARY_FLAG:Int;
+	static final MYSQLI_CURSOR_TYPE_FOR_UPDATE:Int;
+	static final MYSQLI_CURSOR_TYPE_NO_CURSOR:Int;
+	static final MYSQLI_CURSOR_TYPE_READ_ONLY:Int;
+	static final MYSQLI_CURSOR_TYPE_SCROLLABLE:Int;
+	static final MYSQLI_STMT_ATTR_CURSOR_TYPE:Int;
+	static final MYSQLI_STMT_ATTR_PREFETCH_ROWS:Int;
+	static final MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH:Int;
+	static final MYSQLI_SET_CHARSET_NAME:Int;
+	static final MYSQLI_REPORT_INDEX:Int;
+	static final MYSQLI_REPORT_ERROR:Int;
+	static final MYSQLI_REPORT_STRICT:Int;
+	static final MYSQLI_REPORT_ALL:Int;
+	static final MYSQLI_REPORT_OFF:Int;
+	static final MYSQLI_DEBUG_TRACE_ENABLED:Int;
+	static final MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED:Int;
+	static final MYSQLI_SERVER_QUERY_NO_INDEX_USED:Int;
+	static final MYSQLI_REFRESH_GRANT:Int;
+	static final MYSQLI_REFRESH_LOG:Int;
+	static final MYSQLI_REFRESH_TABLES:Int;
+	static final MYSQLI_REFRESH_HOSTS:Int;
+	static final MYSQLI_REFRESH_STATUS:Int;
+	static final MYSQLI_REFRESH_THREADS:Int;
+	static final MYSQLI_REFRESH_SLAVE:Int;
+	static final MYSQLI_REFRESH_MASTER:Int;
+	static final MYSQLI_TRANS_COR_AND_CHAIN:Int;
+	static final MYSQLI_TRANS_COR_AND_NO_CHAIN:Int;
+	static final MYSQLI_TRANS_COR_RELEASE:Int;
+	static final MYSQLI_TRANS_COR_NO_RELEASE:Int;
+	static final MYSQLI_TRANS_START_READ_ONLY:Int;
+	static final MYSQLI_TRANS_START_READ_WRITE:Int;
+	static final MYSQLI_TRANS_START_CONSISTENT_SNAPSHOT:Int;
+
+	/**
+		@see http://php.net/manual/en/sqlite3.constants.php
+	**/
+	static final SQLITE3_ASSOC:Int;
+
+	static final SQLITE3_NUM:Int;
+	static final SQLITE3_BOTH:Int;
+	static final SQLITE3_INTEGER:Int;
+	static final SQLITE3_FLOAT:Int;
+	static final SQLITE3_TEXT:Int;
+	static final SQLITE3_BLOB:Int;
+	static final SQLITE3_NULL:Int;
+	static final SQLITE3_OPEN_READONLY:Int;
+	static final SQLITE3_OPEN_READWRITE:Int;
+	static final SQLITE3_OPEN_CREATE:Int;
+
+	/**
+		@see http://php.net/manual/en/function.glob.php
+	**/
+	static final GLOB_MARK:Int;
+
+	static final GLOB_NOSORT:Int;
+	static final GLOB_NOCHECK:Int;
+	static final GLOB_NOESCAPE:Int;
+	static final GLOB_BRACE:Int;
+	static final GLOB_ONLYDIR:Int;
+	static final GLOB_ERR:Int;
+
+	/**
+		@see http://php.net/manual/en/zlib.constants.php
+	**/
+	static final FORCE_GZIP:Int;
+
+	static final FORCE_DEFLATE:Int;
+	static final ZLIB_ENCODING_RAW:Int;
+	static final ZLIB_ENCODING_DEFLATE:Int;
+	static final ZLIB_ENCODING_GZIP:Int;
+	static final ZLIB_FILTERED:Int;
+	static final ZLIB_HUFFMAN_ONLY:Int;
+	static final ZLIB_FIXED:Int;
+	static final ZLIB_RLE:Int;
+	static final ZLIB_DEFAULT_STRATEGY:Int;
+	static final ZLIB_BLOCK:Int;
+	static final ZLIB_NO_FLUSH:Int;
+	static final ZLIB_PARTIAL_FLUSH:Int;
+	static final ZLIB_SYNC_FLUSH:Int;
+	static final ZLIB_FULL_FLUSH:Int;
+	static final ZLIB_FINISH:Int;
+}
diff --git a/std/php7/Error.hx b/std/php/Error.hx
similarity index 59%
rename from std/php7/Error.hx
rename to std/php/Error.hx
index 8044f90a1a897ee3c68c2e229c7caee49e239383..d3230a85f8520c2276cc2959c75690c9087051ff 100644
--- a/std/php7/Error.hx
+++ b/std/php/Error.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,24 +19,24 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
 @:native('Error')
 extern class Error implements Throwable {
-	function new(?message : String, ?code : Int, ?previous:Throwable) : Void;
+	function new(?message:String, ?code:Int, ?previous:Throwable):Void;
 
-	private var message : String;
-	private var code : Int;
-	private var file : String;
-	private var line : Int;
+	private var message:String;
+	private var code:Int;
+	private var file:String;
+	private var line:Int;
 
-	@:final
-	function getPrevious() : Throwable;   // Returns previous Throwable
-	function getMessage() : String;       // message of the exception
-	function getCode() : Int;             // code of the exception
-	function getFile() : String;          // source filename
-	function getLine() : Int;             // source line
-	function getTrace() : NativeIndexedArray<NativeAssocArray<Dynamic>>;  // an array of the backtrace
-	function getTraceAsString() : String; // formated string of trace
-	@:phpMagic function __toString() : String;       // formated string for display
-}
\ No newline at end of file
+	final function getPrevious():Throwable; // Returns previous Throwable
+	function getMessage():String; // message of the exception
+	function getCode():Int; // code of the exception
+	function getFile():String; // source filename
+	function getLine():Int; // source line
+	function getTrace():NativeIndexedArray<NativeAssocArray<Dynamic>>; // an array of the backtrace
+	function getTraceAsString():String; // formatted string of trace
+	@:phpMagic function __toString():String; // formatted string for display
+}
diff --git a/std/php7/ErrorException.hx b/std/php/ErrorException.hx
similarity index 59%
rename from std/php7/ErrorException.hx
rename to std/php/ErrorException.hx
index 15d087c500b6e41c76211dd64a52044715e4c52b..fb4fa79850746c112408a492912129c76ef3e10f 100644
--- a/std/php7/ErrorException.hx
+++ b/std/php/ErrorException.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
 /**
@@ -26,15 +27,15 @@ package php;
 **/
 @:native('ErrorException')
 extern class ErrorException implements Throwable {
-	function new (?message:String, ?code:Int, ?severety:Int, ?filename:String, ?lineno:Int, ?previous:Throwable) : Void;
+	function new(?message:String, ?code:Int, ?severety:Int, ?filename:String, ?lineno:Int, ?previous:Throwable):Void;
 
-	@:final function getSeverity() : Int;
-	@:final function getPrevious() : Throwable;   // Returns previous Throwable
-    @:final function getMessage() : String;       // message of the exception
-    @:final function getCode() : Int;             // code of the exception
-    @:final function getFile() : String;          // source filename
-    @:final function getLine() : Int;             // source line
-    @:final function getTrace() : NativeIndexedArray<NativeAssocArray<Dynamic>>;  // an array of the backtrace
-    @:final function getTraceAsString() : String; // formated string of trace
-	@:phpMagic function __toString() : String;       // formated string for display
-}
\ No newline at end of file
+	final function getSeverity():Int;
+	final function getPrevious():Throwable; // Returns previous Throwable
+	final function getMessage():String; // message of the exception
+	final function getCode():Int; // code of the exception
+	final function getFile():String; // source filename
+	final function getLine():Int; // source line
+	final function getTrace():NativeIndexedArray<NativeAssocArray<Dynamic>>; // an array of the backtrace
+	final function getTraceAsString():String; // formatted string of trace
+	@:phpMagic function __toString():String; // formatted string for display
+}
diff --git a/std/php/Exception.hx b/std/php/Exception.hx
index 03b7536b5d24d6981906ea9867679986fbf36c2c..333ed6817afd9435a7eeb41f48e31a0f78f748b4 100644
--- a/std/php/Exception.hx
+++ b/std/php/Exception.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,22 +19,24 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package php;
 
-extern class Exception {
-  public function new(?message : String, ?code : Int) : Void;
+package php;
 
-  private var message : String;
-  private var code : Int;
-  private var file : String;
-  private var line : Int;
+@:native('Exception')
+extern class Exception implements Throwable {
+	public function new(?message:String, ?code:Int, ?previous:Throwable):Void;
 
-  public function getMessage() : String;       // message of the exception
-  public function getCode() : Int;             // code of the exception
-  public function getFile() : String;          // source filename
-  public function getLine() : Int;             // source line
-  public function getTrace() : Array<String>;  // an array of the backtrace()
-  public function getTraceAsString() : String; // formated string of trace
+	private var message:String;
+	private var code:Int;
+	private var file:String;
+	private var line:Int;
 
-  public function __toString() : String;       // formated string for display
-}
\ No newline at end of file
+	final function getPrevious():Throwable; // Returns previous Throwable
+	function getMessage():String; // message of the exception
+	function getCode():Int; // code of the exception
+	function getFile():String; // source filename
+	function getLine():Int; // source line
+	function getTrace():NativeIndexedArray<NativeAssocArray<Dynamic>>; // an array of the backtrace
+	function getTraceAsString():String; // formatted string of trace
+	@:phpMagic function __toString():String; // formatted string for display
+}
diff --git a/std/php/Generator.hx b/std/php/Generator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..471ab39d925ad4529a8dd8af3ad04d897b24e8a3
--- /dev/null
+++ b/std/php/Generator.hx
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+/**
+	@see http://php.net/manual/en/class.generator.php
+
+	Generator is not a Haxe Iterable. It can be iterated one time only.
+	Unfortunately Haxe does not know that in PHP generators may have no `return` expression or `return value` with any type of `value`.
+	Use `return null` or untyped cast to workaround this issue:
+	```haxe
+	function generatorWithoutReturn():Generator {
+		php.Syntax.yield(1);
+		return null;
+	}
+
+	function generatorWithReturn():Generator {
+		php.Syntax.yield(1);
+		return cast "hello";
+	}
+
+	var g = generatorWithReturn();
+	for(i in g) {
+		trace(i);
+	}
+	trace(g.getReturn()); // "hello"
+	```
+**/
+@:native('Generator')
+extern class Generator {
+	function current():Dynamic;
+	function getReturn():Dynamic;
+	function key():Dynamic;
+	function next():Void;
+	function rewind():Void;
+	function send(value:Dynamic):Dynamic;
+	@:native('throw')
+	function throwError(exception:Throwable):Dynamic;
+	function valid():Bool;
+
+	inline function iterator():GeneratorIterator {
+		return new GeneratorIterator(this);
+	}
+}
+
+private class GeneratorIterator {
+	var generator:Generator;
+
+	/**
+		This field is required to maintain execution order of .next()/.valid()/.current() methods.
+		@see http://php.net/manual/en/class.iterator.php
+	**/
+	var first:Bool = true;
+
+	public inline function new(generator:Generator) {
+		this.generator = generator;
+	}
+
+	public inline function hasNext():Bool {
+		if (first) {
+			first = false;
+		} else {
+			generator.next();
+		}
+		return generator.valid();
+	}
+
+	public inline function next():Dynamic {
+		return generator.current();
+	}
+}
diff --git a/std/php/Global.hx b/std/php/Global.hx
new file mode 100644
index 0000000000000000000000000000000000000000..82957c2ca02e13db9762988c991002fcd3d69d13
--- /dev/null
+++ b/std/php/Global.hx
@@ -0,0 +1,1455 @@
+package php;
+
+import haxe.extern.*;
+import haxe.Constraints;
+
+/**
+	This class contains externs for native PHP functions defined in global namespace.
+	For native PHP constants in global namespace see `php.Const`.
+**/
+@:phpGlobal
+extern class Global {
+	/**
+		@see http://php.net/manual/en/function.exit.php
+	**/
+	static function exit(status:EitherType<String, Int>):Void;
+
+	/**
+		@see http://php.net/manual/en/function.exit.php
+	**/
+	static function die(status:EitherType<String, Int>):Void;
+
+	/**
+		@see http://php.net/manual/en/function.error-reporting.php
+	**/
+	static function error_reporting(?level:Int):Int;
+
+	/**
+		@see http://php.net/manual/en/function.set-error-handler.php
+	**/
+	@:overload(function(error_handler:Int->String->Bool, ?error_types:Int):Dynamic {})
+	@:overload(function(error_handler:Int->String->String->Bool, ?error_types:Int):Dynamic {})
+	@:overload(function(error_handler:Int->String->String->Int->Bool, ?error_types:Int):Dynamic {})
+	static function set_error_handler(?error_handler:Int->String->String->Int->Array<Dynamic>->Bool, ?error_types:Int):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.restore-error-handler.php
+	**/
+	static function restore_error_handler():Bool;
+
+	/**
+		@see http://php.net/manual/en/function.set-exception-handler.php
+	**/
+	static function set_exception_handler(exception_handler:Throwable->Void):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.restore-exception-handler.php
+	**/
+	static function restore_exception_handler():Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-int.php
+	**/
+	static function is_int(value:Dynamic):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-float.php
+	**/
+	static function is_float(value:Dynamic):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-string.php
+	**/
+	static function is_string(value:Dynamic):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-numeric.php
+	**/
+	static function is_numeric(value:Dynamic):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-bool.php
+	**/
+	static function is_bool(value:Dynamic):Bool;
+
+	/**
+		Checks if `values` is `php.NativeArray`
+		@see http://php.net/manual/en/function.is-array.php
+	**/
+	static function is_array(value:Dynamic):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-object.php
+	**/
+	static function is_object(value:Dynamic):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-null.php
+	**/
+	static function is_null(value:Dynamic):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-subclass-of.php
+	**/
+	static function is_subclass_of(value:Dynamic, className:String, allow_string:Bool = true):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.class-exists.php
+	**/
+	static function class_exists(class_name:String, autoload:Bool = true):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.interface-exists.php
+	**/
+	static function interface_exists(interface_name:String, autoload:Bool = true):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.intval.php
+	**/
+	static function intval(value:Dynamic, base:Int = 10):Int;
+
+	/**
+		@see http://php.net/manual/en/function.floatval.php
+	**/
+	static function floatval(value:Dynamic):Float;
+
+	/**
+		@see http://php.net/manual/en/function.boolval.php
+	**/
+	static function boolval(value:Dynamic):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.strval.php
+	**/
+	static function strval(value:Dynamic):String;
+
+	/**
+		@see http://php.net/manual/en/function.phpversion.php
+	**/
+	static function phpversion(?extension:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.class-alias.php
+	**/
+	static function class_alias(original:String, alias:String, autoload:Bool = true):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.count.php
+	**/
+	static function count(array:Dynamic, ?mode:Int):Int;
+
+	/**
+		@see http://php.net/manual/en/function.array-filter.php
+	**/
+	@:overload(function(array:NativeArray, callback:Dynamic->Bool, ?flag:Int):NativeArray {})
+	static function array_filter(array:NativeArray, ?callback:Dynamic->?Dynamic->Bool, flag:Int = 0):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.implode.php
+	**/
+	@:overload(function(pieces:NativeArray):String {})
+	static function implode(glue:String, pieces:NativeArray):String;
+
+	/**
+		@see http://php.net/manual/en/function.array-map.php
+	**/
+	static function array_map(callback:EitherType<Dynamic->Dynamic, String>, array:Rest<NativeArray>):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.array-merge.php
+	**/
+	static function array_merge(array:Rest<NativeArray>):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.array-diff.php
+	**/
+	static function array_diff(array:Rest<NativeArray>):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.array-pop.php
+	**/
+	static function array_pop(array:NativeArray):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.array-push.php
+	**/
+	static function array_push(array:Ref<NativeArray>, value:Rest<Dynamic>):Int;
+
+	/**
+		@see http://php.net/manual/en/function.array-reverse.php
+	**/
+	static function array_reverse(array:NativeArray, preserve_keys:Bool = false):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.array-search.php
+	**/
+	static function array_search(needle:Dynamic, haystack:NativeArray, strict:Bool = false):EitherType<Bool, EitherType<String, Int>>;
+
+	/**
+		@see http://php.net/manual/en/function.array-shift.php
+	**/
+	static function array_shift(array:Ref<NativeArray>):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.array-slice.php
+	**/
+	static function array_slice(array:NativeArray, offset:Int, length:Int = null, preserve_keys:Bool = false):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.array-splice.php
+	**/
+	static function array_splice(array:Ref<NativeArray>, offset:Int, lenght:Int = 0, ?replacement:Dynamic):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.array-unshift.php
+	**/
+	static function array_unshift(arr:Ref<NativeArray>, value:Rest<Dynamic>):Int;
+
+	/**
+		@see http://php.net/manual/en/function.array-values.php
+	**/
+	static function array_values(arr:NativeArray):NativeIndexedArray<Dynamic>;
+
+	/**
+		@see http://php.net/manual/en/function.array-keys.php
+	**/
+	static function array_keys(arr:NativeArray):NativeIndexedArray<EitherType<String, Int>>;
+
+	/**
+		@see http://php.net/manual/en/function.array-key-exists.php
+	**/
+	static function array_key_exists(key:EitherType<String, Int>, arr:NativeArray):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.array-fill.php
+	**/
+	static function array_fill(start_index:Int, num:Int, value:Dynamic):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.array-pad.php
+	**/
+	static function array_pad(array:NativeArray, size:Int, value:Dynamic):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.in-array.php
+	**/
+	static function in_array(needle:Dynamic, haystack:NativeArray, strict:Bool = false):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.usort.php
+	**/
+	static function usort(array:Ref<NativeArray>, value_compare_func:Dynamic->Dynamic->Int):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.reset.php
+	**/
+	static function reset(array:Ref<NativeArray>):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.current.php
+	**/
+	static function current(array:Ref<NativeArray>):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.next.php
+	**/
+	static function next(array:Ref<NativeArray>):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.prev.php
+	**/
+	static function prev(array:Ref<NativeArray>):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.end.php
+	**/
+	static function end(array:Ref<NativeArray>):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.key.php
+	**/
+	static function key(array:NativeArray):EitherType<String, Int>;
+
+	/**
+		@see http://php.net/manual/en/function.each.php
+	**/
+	static function each(array:Ref<NativeArray>):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.defined.php
+	**/
+	static function defined(name:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.constant.php
+	**/
+	static function constant(name:String):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.define.php
+	**/
+	static function define(name:String, value:Dynamic, case_insensitive:Bool = false):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.echo.php
+	**/
+	static function echo(args:Rest<String>):Void;
+
+	/**
+		@see http://php.net/manual/en/function.sprintf.php
+	**/
+	static function sprintf(format:String, args:Rest<Dynamic>):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.method-exists.php
+	**/
+	static function method_exists(object:Dynamic, method_name:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.property-exists.php
+	**/
+	static function property_exists(object:Dynamic, property_name:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-callable.php
+	**/
+	static function is_callable(value:Dynamic, syntax_only:Bool = false, ?callable_name:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.isset.php
+	**/
+	static function isset(value:Dynamic, args:Rest<Dynamic>):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.unset.php
+	**/
+	static function unset(value:Dynamic, values:Rest<Dynamic>):Void;
+
+	/**
+		@see http://php.net/manual/en/function.get-object-vars.php
+	**/
+	static function get_object_vars(object:{}):NativeAssocArray<Dynamic>;
+
+	/**
+		@see http://php.net/manual/en/function.get-class.php
+	**/
+	static function get_class(object:{} = null):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.get-parent-class.php
+	**/
+	static function get_parent_class(?object:Dynamic):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.var-dump.php
+	**/
+	static function var_dump(args:Rest<Dynamic>):Void;
+
+	/**
+		@see http://php.net/manual/en/function.ord.php
+	**/
+	static function ord(string:String):Int;
+
+	/**
+		@see http://php.net/manual/en/function.chr.php
+	**/
+	static function chr(code:Int):String;
+
+	/**
+		@see http://php.net/manual/en/function.strpos.php
+	**/
+	static function strpos(haystack:String, needle:String, offset:Int = 0):EitherType<Bool, Int>;
+
+	/**
+		@see http://php.net/manual/en/function.strrpos.php
+	**/
+	static function strrpos(haystack:String, needle:String, offset:Int = 0):EitherType<Bool, Int>;
+
+	/**
+		@see http://php.net/manual/en/function.str-split.php
+	**/
+	static function str_split(string:String, split_length:Int = 1):EitherType<Bool, NativeIndexedArray<String>>;
+
+	/**
+		@see http://php.net/manual/en/function.strlen.php
+	**/
+	static function strlen(string:String):Int;
+
+	/**
+		@see http://php.net/manual/en/function.strcmp.php
+	**/
+	static function strcmp(str1:String, str2:String):Int;
+
+	/**
+		@see http://php.net/manual/en/function.str-repeat.php
+	**/
+	static function str_repeat(input:String, multiplier:Int):String;
+
+	/**
+		@see http://php.net/manual/en/function.str-replace.php
+	**/
+	static function str_replace(search:EitherType<String, NativeArray>, replace:EitherType<String, NativeArray>, subject:EitherType<String, NativeArray>,
+		?count:Int):EitherType<String, NativeArray>;
+
+	/**
+		@see http://php.net/manual/en/function.explode.php
+	**/
+	static function explode(delimiter:String, string:String, ?limit:Int):EitherType<Bool, NativeIndexedArray<String>>;
+
+	/**
+		@see http://php.net/manual/en/function.substr.php
+	**/
+	static function substr(string:String, start:Int, ?length:Int):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.substr-count.php
+	**/
+	static function substr_count(haystack:String, needle:String, ?offset:Int, ?length:Int):Int;
+
+	/**
+		@see http://php.net/manual/en/function.substr_replace.php
+	**/
+	static function substr_replace(string:EitherType<String, NativeArray>, replacement:EitherType<String, NativeArray>, start:EitherType<Int, NativeArray>,
+		?length:EitherType<Int, NativeArray>):EitherType<String, NativeArray>;
+
+	/**
+		@see http://php.net/manual/en/function.strtoupper.php
+	**/
+	static function strtoupper(string:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.strtolower.php
+	**/
+	static function strtolower(string:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.debug-backtrace.php
+	**/
+	static function debug_backtrace(?options:Int, ?limit:Int):NativeIndexedArray<NativeAssocArray<Dynamic>>;
+
+	/**
+		@see http://php.net/manual/en/function.call-user-func.php
+	**/
+	static function call_user_func(callback:Dynamic, arguments:Rest<Dynamic>):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.call-user-func-array.php
+	**/
+	static function call_user_func_array(callback:Dynamic, arguments:NativeArray):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.func-get-args.php
+	**/
+	static function func_get_args():NativeIndexedArray<Dynamic>;
+
+	/**
+		@see http://php.net/manual/en/function.abs.php
+	**/
+	static function abs<T:Float>(number:T):T;
+
+	/**
+		@see http://php.net/manual/en/function.min.php
+	**/
+	static function min(values:Rest<Dynamic>):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.max.php
+	**/
+	static function max(values:Rest<Dynamic>):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.sin.php
+	**/
+	static function sin(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.cos.php
+	**/
+	static function cos(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.atan2.php
+	**/
+	static function atan2(y:Float, x:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.tan.php
+	**/
+	static function tan(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.exp.php
+	**/
+	static function exp(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.log.php
+	**/
+	static function log(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.sqrt.php
+	**/
+	static function sqrt(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.floor.php
+	**/
+	static function floor(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.ceil.php
+	**/
+	static function ceil(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.round.php
+	**/
+	static function round(val:Float, precision:Int = 0, ?mode:Int):Float;
+
+	/**
+		@see http://php.net/manual/en/function.atan.php
+	**/
+	static function atan(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.asin.php
+	**/
+	static function asin(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.acos.php
+	**/
+	static function acos(arg:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.pow.php
+	**/
+	static function pow(base:Float, exp:Float):Float;
+
+	/**
+		@see http://php.net/manual/en/function.mt-rand.php
+	**/
+	@:overload(function():Int {})
+	static function mt_rand(base:Int, exp:Int):Int;
+
+	/**
+		@see http://php.net/manual/en/function.mt-getrandmax.php
+	**/
+	static function mt_getrandmax():Int;
+
+	/**
+		@see http://php.net/manual/en/function.is-nan.php
+	**/
+	static function is_nan(arg:Float):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-finite.php
+	**/
+	static function is_finite(arg:Float):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.trim.php
+	**/
+	static function trim(str:String, ?character_mask:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.rtrim.php
+	**/
+	static function rtrim(str:String, ?character_mask:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.ltrim.php
+	**/
+	static function ltrim(str:String, ?character_mask:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.getenv.php
+	**/
+	static function getenv(varname:String):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.putenv.php
+	**/
+	static function putenv(setting:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.sleep.php
+	**/
+	static function sleep(seconds:Int):EitherType<Bool, Int>;
+
+	/**
+		@see http://php.net/manual/en/function.usleep.php
+	**/
+	static function usleep(micro_seconds:Int):Void;
+
+	/**
+		@see http://php.net/manual/en/function.setlocale.php
+	**/
+	@:overload(function(category:Int, locale:NativeIndexedArray<String>):EitherType<Bool, String> {})
+	static function setlocale(category:Int, locale:Rest<String>):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.getcwd.php
+	**/
+	static function getcwd():EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.chdir.php
+	**/
+	static function chdir(directory:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.php-uname.php
+	**/
+	static function php_uname(mode:String = 'a'):String;
+
+	/**
+		@see http://php.net/manual/en/function.system.php
+	**/
+	static function system(command:String, ?return_var:Ref<Int>):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.microtime.php
+	**/
+	static function microtime(get_as_float:Bool = false):EitherType<Float, String>;
+
+	/**
+		@see http://php.net/manual/en/function.fopen.php
+	**/
+	static function fopen(filename:String, mode:String, use_include_path:Bool = false, ?context:Resource):EitherType<Bool, Resource>;
+
+	/**
+		@see http://php.net/manual/en/function.fclose.php
+	**/
+	static function fclose(handle:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.feof.php
+	**/
+	static function feof(handle:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.fseek.php
+	**/
+	static function fseek(handle:Resource, offset:Int, ?whence:Int):EitherType<Int, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.ftell.php
+	**/
+	static function ftell(handle:Resource):EitherType<Int, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.rewind.php
+	**/
+	static function rewind(handle:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.fgetc.php
+	**/
+	static function fgetc(handle:Resource):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.fgets.php
+	**/
+	static function fgets(handle:Resource):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.fflush.php
+	**/
+	static function fflush(handle:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.fwrite.php
+	**/
+	static function fwrite(handle:Resource, string:String, ?length:Int):EitherType<Int, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.fread.php
+	**/
+	static function fread(handle:Resource, length:Int):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.file-exists.php
+	**/
+	static function file_exists(filename:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.file-get-contents.php
+	**/
+	static function file_get_contents(filename:String, use_include_path:Bool = false, ?context:Resource, offset:Int = 0, ?maxlen:Int):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.file-put-contents.php
+	**/
+	static function file_put_contents(filename:String, data:Dynamic, flags:Int = 0, ?context:Resource):EitherType<Int, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.clearstatcache.php
+	**/
+	static function clearstatcache(clear_realpath_cache:Bool = false, ?filename:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.fstat.php
+	**/
+	static function fstat(handle:Resource):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.stat.php
+	**/
+	static function stat(filename:String):EitherType<NativeArray, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.realpath.php
+	**/
+	static function realpath(path:String):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.filetype.php
+	**/
+	static function filetype(filename:String):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.mkdir.php
+	**/
+	static function mkdir(pathname:String, mode:Int = 511, recursive:Bool = false, ?context:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.unlink.php
+	**/
+	static function unlink(filename:String, ?context:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.rmdir.php
+	**/
+	static function rmdir(dirname:String, ?context:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.dirname.php
+	**/
+	static function dirname(path:String, levels:Int = 1):String;
+
+	/**
+		@see http://php.net/manual/en/function.glob.php
+	**/
+	static function glob(pattern:String, flags:Int = 0):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.opendir.php
+	**/
+	static function opendir(path:String, ?context:Resource):EitherType<Resource, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.closedir.php
+	**/
+	static function closedir(dir_handle:Resource):Void;
+
+	/**
+		@see http://php.net/manual/en/function.readdir.php
+	**/
+	static function readdir(?dir_handle:Resource):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.rewinddir.php
+	**/
+	static function rewinddir(?dir_handle:Resource):Void;
+
+	/**
+		@see http://php.net/manual/en/function.is-dir.php
+	**/
+	static function is_dir(filename:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.rename.php
+	**/
+	static function rename(oldname:String, newname:String, ?context:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.copy.php
+	**/
+	static function copy(source:String, dest:String, ?context:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.preg-match.php
+	**/
+	static function preg_match(pattern:String, subject:String, ?matches:NativeArray, ?flags:Int, ?offset:Int):EitherType<Bool, Int>;
+
+	/**
+		@see http://php.net/manual/en/function.preg-match-all.php
+	**/
+	static function preg_match_all(pattern:String, subject:String, ?matches:NativeArray, ?flags:Int, ?offset:Int):EitherType<Bool, Int>;
+
+	/**
+		@see http://php.net/manual/en/function.preg-quote.php
+	**/
+	static function preg_quote(str:String, ?delimiter:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.preg-split.php
+	**/
+	static function preg_split(pattern:String, subject:String, limit:Int = -1, flags:Int = 0):EitherType<Bool, NativeArray>;
+
+	/**
+		@see http://php.net/manual/en/function.preg-replace.php
+	**/
+	static function preg_replace(pattern:EitherType<String, NativeArray>, replacement:EitherType<String, NativeArray>,
+		subject:EitherType<String, NativeArray>, limit:Int = -1, ?count:Int):EitherType<String, NativeArray>;
+
+	/**
+		@see http://php.net/manual/en/function.preg-last-error.php
+	**/
+	static function preg_last_error():Int;
+
+	/**
+		@see http://php.net/manual/en/function.md5.php
+	**/
+	static function md5(str:String, raw_output:Bool = false):String;
+
+	/**
+		@see http://php.net/manual/en/function.sha1.php
+	**/
+	static function sha1(str:String, raw_output:Bool = false):String;
+
+	/**
+		@see http://php.net/manual/en/function.hash.php
+	**/
+	static function hash(algo:String, str:String, raw_output:Bool = false):String;
+
+	/**
+		@see http://php.net/manual/en/function.pack.php
+	**/
+	static function pack(format:String, args:Rest<Dynamic>):String;
+
+	/**
+		@see http://php.net/manual/en/function.unpack.php
+	**/
+	static function unpack(format:String, data:String):NativeArray;
+
+	/**
+		@see http://php.net/manual/en/function.chunk-split.php
+	**/
+	static function chunk_split(body:String, chunklen:Int = 76, end:String = "\r\n"):String;
+
+	/**
+		@see http://php.net/manual/en/function.urlencode.php
+	**/
+	static function urlencode(str:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.urldecode.php
+	**/
+	static function urldecode(str:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.rawurlencode.php
+	**/
+	static function rawurlencode(str:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.rawurldecode.php
+	**/
+	static function rawurldecode(str:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.header.php
+	**/
+	static function header(string:String, replace:Bool = true, ?http_response_code:Int):Void;
+
+	/**
+		@see http://php.net/manual/en/function.setcookie.php
+	**/
+	static function setcookie(name:String, value:String = "", expire:Int = 0, path:String = "", domain:String = "", secure:Bool = false,
+		httponly:Bool = false):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.htmlspecialchars.php
+	**/
+	static function htmlspecialchars(string:String, ?flags:Int, ?encoding:String, double_encode:Bool = true):String;
+
+	/**
+		@see http://php.net/manual/en/function.htmlspecialchars_decode.php
+	**/
+	static function htmlspecialchars_decode(string:String, ?flags:Int):String;
+
+	/**
+		@see http://php.net/manual/en/function.str-pad.php
+	**/
+	static function str_pad(input:String, pad_length:Int, pad_String:String = ' ', ?pad_type:Int):String;
+
+	/**
+		@see http://php.net/manual/en/function.dechex.php
+	**/
+	static function dechex(number:Int):String;
+
+	/**
+		@see http://php.net/manual/en/function.hexdec.php
+	**/
+	static function hexdec(hex_string:String):Int;
+
+	/**
+		@see http://php.net/manual/en/function.decbin.php
+	**/
+	static function decbin(number:Int):String;
+
+	/**
+		@see http://php.net/manual/en/function.bindec.php
+	**/
+	static function bindec(binary_string:String):Float;
+
+	/**
+		@see http://php.net/manual/en/function.bin2hex.php
+	**/
+	static function bin2hex(str:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.hex2bin.php
+	**/
+	static function hex2bin(str:String):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.serialize.php
+	**/
+	static function serialize(value:Dynamic):String;
+
+	/**
+		@see http://php.net/manual/en/function.unserialize.php
+	**/
+	static function unserialize(str:String, ?options:NativeArray):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.extension-loaded.php
+	**/
+	static function extension_loaded(name:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.strncasecmp.php
+	**/
+	static function strncasecmp(str1:String, str2:String, len:Int):Int;
+
+	/**
+		@see http://php.net/manual/en/function.strcasecmp.php
+	**/
+	static function strcasecmp(str1:String, str2:String):Int;
+
+	/**
+		@see http://php.net/manual/en/function.fpassthru.php
+	**/
+	static function fpassthru(handle:Resource):Int;
+
+	/**
+		@see http://php.net/manual/en/function.json-encode.php
+	**/
+	static function json_encode(value:Dynamic, options:Int = 0, depth:Int = 512):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.json-decode.php
+	**/
+	static function json_decode(json:String, assoc:Bool = false, depth:Int = 512, options:Int = 512):Dynamic;
+
+	/**
+		@see http://php.net/manual/en/function.json-last-error.php
+	**/
+	static function json_last_error():Int;
+
+	/**
+		@see http://php.net/manual/en/function.json-last-error-msg.php
+	**/
+	static function json_last_error_msg():EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.spl-object-hash.php
+	**/
+	static function spl_object_hash(obj:{}):String;
+
+	/**
+		@see http://php.net/manual/en/function.spl-autoload-call.php
+	**/
+	static function spl_autoload_call(class_name:String):Void;
+
+	/**
+		@see http://php.net/manual/en/function.spl-autoload-extensions.php
+	**/
+	static function spl_autoload_extensions(?file_extensions:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.spl-autoload-functions.php
+	**/
+	static function spl_autoload_functions():EitherType<NativeIndexedArray<Function>, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.spl-autoload-register.php
+	**/
+	static function spl_autoload_register(?autoload_function:(className:String) -> Void, throw_exception:Bool = true, prepend:Bool = false):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.spl-autoload-unregister.php
+	**/
+	static function spl_autoload_unregister(autoload_function:(className:String) -> Void):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.spl-autoload.php
+	**/
+	static function spl_autoload(class_name:String, ?file_extensions:String):Void;
+
+	/**
+		@see http://php.net/manual/en/function.utf8-encode.php
+	**/
+	static function utf8_encode(data:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.utf8-decode.php
+	**/
+	static function utf8_decode(data:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.mb-internal-encoding.php
+	**/
+	static function mb_internal_encoding(?encoding:String):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.mb-convert-encoding.php
+	**/
+	static function mb_convert_encoding(str:String, to_encoding:String, ?from_encoding:Dynamic):String;
+
+	/**
+		@see http://php.net/manual/en/function.mb-check-encoding.php
+	**/
+	static function mb_check_encoding(str:String = null, ?encoding:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.mb-split.php
+	**/
+	static function mb_split(pattern:String, str:String, ?limit:Int):NativeIndexedArray<String>;
+
+	/**
+		@see http://php.net/manual/en/function.mb-strlen.php
+	**/
+	static function mb_strlen(str:String, ?encoding:String):EitherType<Int, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.mb-substr.php
+	**/
+	static function mb_substr(str:String, start:Int, length:Int = null, ?encoding:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.mb-chr.php
+		(Polyfilled for php 7.0)
+	**/
+	static function mb_chr(cp:Int, ?encoding:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.mb-ord.php
+		(Polyfilled for php 7.0)
+	**/
+	static function mb_ord(str:String, ?encoding:String):Int;
+
+	/**
+		@see http://php.net/manual/en/function.mb-regex-encoding.php
+	**/
+	static function mb_regex_encoding(?encoding:String):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.mb-strtoupper.php
+	**/
+	static function mb_strtoupper(str:String, ?encoding:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.mb-strpos.php
+	**/
+	static function mb_strpos(haystack:String, needle:String, ?offset:Int, ?encoding:String):EitherType<Int, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.mb-strrpos.php
+	**/
+	static function mb_strrpos(haystack:String, needle:String, ?offset:Int, ?encoding:String):EitherType<Int, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.mb-strtolower.php
+	**/
+	static function mb_strtolower(str:String, ?encoding:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.proc-open.php
+	**/
+	static function proc_open(cmd:String, descriptorspec:NativeArray, pipes:NativeIndexedArray<Resource>, ?cwd:String, ?env:NativeArray,
+		?other_options:NativeArray):EitherType<Resource, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.proc-get-status.php
+	**/
+	static function proc_get_status(process:Resource):EitherType<Bool, NativeAssocArray<Scalar>>;
+
+	/**
+		@see http://php.net/manual/en/function.proc-close.php
+	**/
+	static function proc_close(process:Resource):Int;
+
+	/**
+		@see http://php.net/manual/en/function.proc-terminate.php
+	**/
+	static function proc_terminate(process:Resource, signal:Int = 15):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.stream-select.php
+	**/
+	static function stream_select(read:NativeArray, write:NativeArray, except:NativeArray, tv_sec:Int, tv_usec:Int = 0):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.stream-get-contents.php
+	**/
+	static function stream_get_contents(handle:Resource, maxlength:Int = -1, offset:Int = -1):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.stream-socket-shutdown.php
+	**/
+	static function stream_socket_shutdown(stream:Resource, how:Int):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.stream-set-timeout.php
+	**/
+	static function stream_set_timeout(stream:Resource, seconds:Int, microseconds:Int = 0):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.stream-set-blocking.php
+	**/
+	static function stream_set_blocking(stream:Resource, mode:Bool):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.stream-socket-accept.php
+	**/
+	static function stream_socket_accept(server_socket:Resource, ?timeout:Float, ?peername:Ref<String>):EitherType<Resource, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.stream-socket-client.php
+	**/
+	static function stream_socket_client(remote_socket:String, ?errno:Ref<Int>, ?errstr:Ref<String>, ?timeout:Float, ?flags:Int,
+		?context:Resource):EitherType<Resource, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.stream-socket-server.php
+	**/
+	static function stream_socket_server(local_socket:String, ?errno:Ref<Int>, ?errstr:Ref<String>, ?flags:Int, ?context:Resource):EitherType<Resource, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.stream-socket-get-name.php
+	**/
+	static function stream_socket_get_name(stream:Resource, want_peer:Bool):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.socket-create.php
+	**/
+	static function socket_create(domain:Int, type:Int, protocol:Int):Resource;
+
+	/**
+		@see http://php.net/manual/en/function.socket-connect.php
+	**/
+	static function socket_connect(stream:Resource, host:String, port:Int):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.socket-listen.php
+	**/
+	static function socket_listen(stream:Resource, connections:Int):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.socket-shutdown.php
+	**/
+	static function socket_shutdown(stream:Resource, rw:Int):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.socket-bind.php
+	**/
+	static function socket_bind(stream:Resource, host:String, port:Int):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.socket-accept.php
+	**/
+	static function socket_accept(stream:Resource):EitherType<Resource, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.socket-getpeername.php
+	**/
+	static function socket_getpeername(stream:Resource, host:Ref<String>, port:Ref<Int>):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.socket-getsockname.php
+	**/
+	static function socket_getsockname(stream:Resource, host:Ref<String>, port:Ref<Int>):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.socket-set-block.php
+	**/
+	static function socket_set_block(stream:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.socket-set-nonblock.php
+	**/
+	static function socket_set_nonblock(stream:Resource):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.socket-set-option.php
+	**/
+	static function socket_set_option(stream:Resource, level:Int, option:Int, val:Any):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.socket-select.php
+	**/
+	static function socket_select(read:NativeIndexedArray<Resource>, write:NativeIndexedArray<Resource>, other:NativeIndexedArray<Resource>, tv_sec:Int = 0,
+		tv_usec:Int = 0):EitherType<Bool, Int>;
+
+	/**
+		@see http://php.net/manual/en/function.socket-read.php
+	**/
+	static function socket_read(resource:Resource, length:Int, ?type:Int):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.socket-write.php
+	**/
+	static function socket_write(resource:Resource, buffer:String, len:Int = 0):EitherType<Bool, Int>;
+
+	/**
+		@see http://php.net/manual/en/function.socket-import-stream.php
+	**/
+	static function socket_import_stream(resource:Resource):EitherType<Bool, Resource>;
+
+	/**
+		@see http://php.net/manual/en/function.socket-export-stream.php
+	**/
+	static function socket_export_stream(resource:Resource):EitherType<Bool, Resource>;
+
+	/**
+		@see http://php.net/manual/en/function.socket-close.php
+	**/
+	static function socket_close(resource:Resource):Void;
+
+	/**
+		@see http://php.net/manual/en/function.ini-get.php
+	**/
+	static function ini_get(var_name:String):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.ini-set.php
+	**/
+	static function ini_set(var_name:String, newvalue:String):EitherType<Bool, String>;
+
+	/**
+		@see http://php.net/manual/en/function.sqlite-error-string.php
+	**/
+	static function sqlite_error_string(error_code:Int):String;
+
+	/**
+		@see http://php.net/manual/en/function.sqlite-escape-string.php
+	**/
+	static function sqlite_escape_string(item:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.set-time-limit.php
+	**/
+	static function set_time_limit(seconds:Int):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.function-exists.php
+	**/
+	static function function_exists(function_name:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.getallheaders.php
+	**/
+	static function getallheaders():NativeAssocArray<Dynamic>;
+
+	/**
+		@see http://php.net/manual/en/function.ucwords.php
+	**/
+	static function ucwords(str:String, ?delimiters:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.base64-encode.php
+	**/
+	static function base64_encode(data:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.base64-decode.php
+	**/
+	static function base64_decode(data:String, strict:Bool = false):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.gethostbyname.php
+	**/
+	static function gethostbyname(hostname:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.gethostbyaddr.php
+	**/
+	static function gethostbyaddr(ip_address:String):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.getprotobyname.php
+	**/
+	static function getprotobyname(name:String):EitherType<Int, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.mktime.php
+	**/
+	static function mktime(?hour:Int, ?minute:Int, ?second:Int, ?month:Int, ?day:Int, ?year:Int, ?is_dst:Int):EitherType<Int, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.gmmktime.php
+	**/
+	static function gmmktime(?hour:Int, ?minute:Int, ?second:Int, ?month:Int, ?day:Int, ?year:Int, ?is_dst:Int):Int;
+
+	/**
+		@see http://php.net/manual/en/function.date.php
+	**/
+	static function date(format:String, ?timestamp:Int):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.gmdate.php
+	**/
+	static function gmdate(format:String, ?timestamp:Int):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.time.php
+	**/
+	static function time():Int;
+
+	/**
+		@see http://php.net/manual/en/function.strftime.php
+	**/
+	static function strftime(format:String, ?timestamp:Int):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.strtotime.php
+	**/
+	static function strtotime(time:String, ?now:Int):EitherType<Int, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.flush.php
+	**/
+	static function flush():Void;
+
+	/**
+		@see http://php.net/manual/en/function.session-cache-limiter.php
+	**/
+	static function session_cache_limiter(?cache_limiter:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.session-cache-expire.php
+	**/
+	static function session_cache_expire(?new_cache_expire:Int):Int;
+
+	/**
+		@see http://php.net/manual/en/function.session-name.php
+	**/
+	static function session_name(?name:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.session-start.php
+	**/
+	static function session_start(?options:NativeArray):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.session-unset.php
+	**/
+	static function session_unset():Void;
+
+	/**
+		@see http://php.net/manual/en/function.session-write-close.php
+	**/
+	static function session_write_close():Void;
+
+	/**
+		@see http://php.net/manual/en/function.session-id.php
+	**/
+	static function session_id(?id:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.session-save-path.php
+	**/
+	static function session_save_path(?path:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.session-module-name.php
+	**/
+	static function session_module_name(?module:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.session-regenerate-id.php
+	**/
+	static function session_regenerate_id(delete_old_session:Bool = false):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.session-set-cookie-params.php
+	**/
+	static function session_set_cookie_params(lifetime:Int, ?path:String, ?domain:String, secure:Bool = false, httponly:Bool = false):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.session-get-cookie-params.php
+	**/
+	static function session_get_cookie_params():NativeAssocArray<Dynamic>;
+
+	/**
+		@see http://php.net/manual/en/function.session-set-save-handler.php
+	**/
+	@:overload(function(sessionhandler:SessionHandlerInterface, register_shutdown:Bool = true):Bool {})
+	static function session_set_save_handler(open:String->String->Bool, close:Void->Bool, read:String->String, write:String->String->Bool,
+		destroy:String->Bool, gc:Int->Bool, ?create_sid:Void->String, ?validate_sid:Function, ?update_timestamp:Function):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.mail.php
+	**/
+	static function mail(to:String, subject:String, message:String, ?additional_headers:String, ?additional_parameters:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.require.php
+	**/
+	static function require(include_path:String):Void;
+
+	/**
+		@see http://php.net/manual/en/function.require-once.php
+	**/
+	static function require_once(include_path:String):Void;
+
+	/**
+		@see http://php.net/manual/en/function.include.php
+	**/
+	static function include(include_path:String):Void;
+
+	/**
+		@see http://php.net/manual/en/function.include-once.php
+	**/
+	static function include_once(include_path:String):Void;
+
+	/**
+		@see http://php.net/manual/en/function.set-include-path.php
+	**/
+	static function set_include_path(new_include_path:String):String;
+
+	/**
+		@see http://php.net/manual/en/function.get-include-path.php
+	**/
+	static function get_include_path():String;
+
+	/**
+		@see http://php.net/manual/en/function.gzcompress.php
+	**/
+	static function gzcompress(data:String, ?level:Int, ?encoding:Int):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.gzuncompress.php
+	**/
+	static function gzuncompress(data:String, ?length:Int):EitherType<String, Bool>;
+
+	/**
+		@see http://php.net/manual/en/function.move-uploaded-file.php
+	**/
+	static function move_uploaded_file(filename:String, destination:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.is-uploaded-file.php
+	**/
+	static function is_uploaded_file(filename:String):Bool;
+
+	/**
+		@see http://php.net/manual/en/function.gc-collect-cycles.php
+	**/
+	static function gc_collect_cycles():Int;
+}
diff --git a/std/php/IteratorAggregate.hx b/std/php/IteratorAggregate.hx
index 8605d41a9c498386cfac1fc193810d47ff057d4c..4742b36254c9c7e769f200eea899ddef4494e071 100644
--- a/std/php/IteratorAggregate.hx
+++ b/std/php/IteratorAggregate.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
+@:native('IteratorAggregate')
 extern interface IteratorAggregate<T> {
 	/**
 		This method is not public to not induce Haxe users to use it ;)
 		Use iterator() instead.
 		The return type would be Aggregator that is unusable in Haxe
 	**/
-	private function getIterator() : Iterator<T>; //
-}
\ No newline at end of file
+	private function getIterator():Iterator<T>; //
+
+}
diff --git a/std/php/Lib.hx b/std/php/Lib.hx
index 91b1c2e1a103c7b198407d311d25f8cdc743f282..a235388a32da37b8d372f93f737b1d3cf34e1854 100644
--- a/std/php/Lib.hx
+++ b/std/php/Lib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,181 +19,171 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
+import haxe.ds.StringMap;
+import php.*;
+import php.reflection.ReflectionClass;
+
 /**
-	Platform-specific PHP Library. Provides some platform-specific functions 
-	for the PHP target, such as conversion from Haxe types to native types 
+	Platform-specific PHP Library. Provides some platform-specific functions
+	for the PHP target, such as conversion from Haxe types to native types
 	and vice-versa.
 **/
 class Lib {
 	/**
 		Print the specified value on the default output.
 	**/
-	public static function print( v : Dynamic ) : Void {
-		untyped __call__("echo", Std.string(v));
+	public static inline function print(v:Dynamic):Void {
+		Global.echo(Std.string(v));
 	}
 
 	/**
-		Print the specified value on the default output followed by 
+		Print the specified value on the default output followed by
 		a newline character.
 	**/
-	public static function println( v : Dynamic ) : Void {
+	public static function println(v:Dynamic):Void {
 		print(v);
 		print("\n");
 	}
 
 	/**
-		Displays structured information about one or more expressions 
-		that includes its type and value. Arrays and objects are 
+		Displays structured information about one or more expressions
+		that includes its type and value. Arrays and objects are
 		explored recursively with values indented to show structure.
-	*/
-	public static function dump(v : Dynamic) : Void {
-		untyped __call__("var_dump", v);
+	**/
+	public static inline function dump(v:Dynamic):Void {
+		Global.var_dump(v);
 	}
 
 	/**
-		Serialize using native PHP serialization. This will return a binary 
+		Serialize using native PHP serialization. This will return a binary
 		`String` that can be stored for long term usage.
 	**/
-	public static function serialize( v : Dynamic ) : String {
-		return untyped __call__("serialize", v);
+	public static inline function serialize(v:Dynamic):String {
+		return Global.serialize(v);
 	}
 
 	/**
 		Unserialize a `String` using native PHP serialization. See `php.Lib.serialize()`.
 	**/
-	public static function unserialize( s : String ) : Dynamic {
-		return untyped __call__("unserialize", s);
+	public static inline function unserialize(s:String):Dynamic {
+		return Global.unserialize(s);
 	}
 
 	/**
 		Find out whether an extension is loaded.
-	*/
-	public static function extensionLoaded(name : String) {
-		return untyped __call__("extension_loaded", name);
+	**/
+	public static inline function extensionLoaded(name:String) {
+		return Global.extension_loaded(name);
 	}
 
-	public static function isCli() : Bool {
-		return untyped __php__("(0 == strncasecmp(PHP_SAPI, 'cli', 3))");
+	public static inline function isCli():Bool {
+		return 0 == Global.strncasecmp(Const.PHP_SAPI, 'cli', 3);
 	}
 
 	/**
 		Output file content from the given file name.
-	*/
-	public static function printFile(file : String) {
-		return untyped __call__("fpassthru", __call__("fopen", file,  "r"));
+	**/
+	public static inline function printFile(file:String) {
+		return Global.fpassthru(Global.fopen(file, "r"));
 	}
 
-	public static function toPhpArray(a : Array<Dynamic>) : NativeArray {
-		return untyped __field__(a, 'a');
+	public static inline function toPhpArray(a:Array<Dynamic>):NativeArray {
+		return @:privateAccess a.arr;
 	}
 
-	public static inline function toHaxeArray(a : NativeArray) : Array<Dynamic> {
-		return untyped __call__("new _hx_array", a);
+	public static inline function toHaxeArray(a:NativeArray):Array<Dynamic> {
+		return @:privateAccess Array.wrap(a);
 	}
 
-	public static function hashOfAssociativeArray<T>(arr : NativeArray) : Map<String,T> {
-		var h = new haxe.ds.StringMap<T>();
-		untyped h.h = arr;
-		return h;
+	public static function hashOfAssociativeArray<T>(arr:NativeAssocArray<T>):Map<String, T> {
+		var result = new StringMap();
+		@:privateAccess result.data = arr;
+		return result;
 	}
 
-	public static function associativeArrayOfHash(hash : haxe.ds.StringMap<Dynamic>) : NativeArray {
-		return untyped hash.h;
+	public static inline function associativeArrayOfHash(hash:haxe.ds.StringMap<Dynamic>):NativeArray {
+		return @:privateAccess hash.data;
 	}
 
-	public static function objectOfAssociativeArray(arr : NativeArray) : Dynamic {
-		untyped __php__("foreach($arr as $key => $value){
-			if(is_array($value)) $arr[$key] = php_Lib::objectOfAssociativeArray($value);
-		}");
-		return untyped __call__("_hx_anonymous", arr);
+	public static function objectOfAssociativeArray(arr:NativeArray):Dynamic {
+		Syntax.foreach(arr, function(key:Scalar, value:Dynamic) {
+			if (Global.is_array(value)) {
+				arr[key] = objectOfAssociativeArray(value);
+			}
+		});
+		return Boot.createAnon(arr);
 	}
 
-	public static function associativeArrayOfObject(ob : Dynamic) : NativeArray {
-		return untyped __php__("(array) $ob");
+	public static inline function associativeArrayOfObject(ob:Dynamic):NativeArray {
+		return Syntax.array(ob);
 	}
 
 	/**
-	 * See the documentation for the equivalent PHP function for details on usage:
-	 * <http://php.net/manual/en/function.mail.php>
-	 * @param	to
-	 * @param	subject
-	 * @param	message
-	 * @param	?additionalHeaders
-	 * @param	?additionalParameters
-	 */
-	public static function mail(to : String, subject : String, message : String, ?additionalHeaders : String, ?additionalParameters : String) : Bool
-	{
-		if(null != additionalParameters)
-			return untyped __call__("mail", to, subject, message, additionalHeaders, additionalParameters);
-		else if(null != additionalHeaders)
-			return untyped __call__("mail", to, subject, message, additionalHeaders);
-		else
-			return untyped __call__("mail", to, subject, message);
+		See the documentation for the equivalent PHP function for details on usage:
+		<http://php.net/manual/en/function.mail.php>
+	**/
+	public static inline function mail(to:String, subject:String, message:String, ?additionalHeaders:String, ?additionalParameters:String):Bool {
+		return Global.mail(to, subject, message, additionalHeaders, additionalParameters);
 	}
 
 	/**
-		For neko compatibility only.
+		Rethrows an exception.
+		If `e` is not a value caught in `try...catch` or if called outside of `catch` block, then `e` is thrown as
+		a new exception.
 	**/
-	public static function rethrow( e : Dynamic ) {
-		if(Std.is(e, Exception)) {
-			var __rtex__ = e;
-			untyped __php__("throw $__rtex__");
+	extern public static inline function rethrow(e:Dynamic) {
+		if (Syntax.code("isset($__hx__caught_e, $__hx__real_e)") && e == Syntax.code("$__hx__real_e")) {
+			Syntax.code("throw $__hx__caught_e");
 		}
-		else throw e;
+		throw e;
 	}
 
-	static function appendType(o : Dynamic, path : Array<String>, t : Dynamic) {
-		var name = path.shift();
-		if(path.length == 0)
-			untyped __php__("$o->$name = $t");
-		else {
-			var so = untyped __call__("isset", __php__("$o->$name")) ? __php__("$o->$name") : {};
-			appendType(so, path, t);
-			untyped __php__("$o->$name = $so");
+	/**
+		Tries to load all compiled php files and returns list of types.
+	**/
+	public static function getClasses():Dynamic {
+		if (!loaded) {
+			loaded = true;
+			var reflection = new ReflectionClass(Boot.getPhpName('php.Boot'));
+			loadLib(Global.dirname(reflection.getFileName(), 2));
 		}
-	}
 
-	public static function getClasses() {
-		var path : String = null;
-		var o = {};
-		untyped __call__('reset', php.Boot.qtypes);
-		while((path = untyped __call__('key', php.Boot.qtypes)) != null) {
-			appendType(o, path.split('.'), untyped php.Boot.qtypes[path]);
-			untyped __call__('next',php.Boot.qtypes);
-		}
-		return o;
+		var result:Dynamic = {};
+		Syntax.foreach(Boot.getRegisteredAliases(), function(phpName:String, haxeName:String) {
+			var parts = haxeName.split('.');
+			var obj = result;
+			while (parts.length > 1) {
+				var pack = parts.shift();
+				if (Syntax.field(obj, pack) == null) {
+					Syntax.setField(obj, pack, {});
+				}
+				obj = Syntax.field(obj, pack);
+			}
+			Syntax.setField(obj, parts[0], Boot.getClass(phpName));
+		});
+
+		return result;
 	}
 
+	static var loaded:Bool = false;
+
 	/**
-	*  Loads types defined in the specified directory.
- 	*/
- 	public static function loadLib(pathToLib : String) : Void
- 	{
-		var prefix = untyped __prefix__();
-		untyped __php__("$_hx_types_array = array();
- 		$_hx_cache_content = '';
- 		//Calling this function will put all types present in the specified types in the $_hx_types_array
- 		_hx_build_paths($pathToLib, $_hx_types_array, array(), $prefix);
-
- 		foreach($_hx_types_array as $val) {
- 			//For every type that has been found, create its description
- 			$t = null;
- 			if($val['type'] == 0) {
- 				$t = new _hx_class($val['phpname'], $val['qname'], $val['path']);
- 			} else if($val['type'] == 1) {
- 				$t = new _hx_enum($val['phpname'], $val['qname'], $val['path']);
- 			} else if($val['type'] == 2) {
- 				$t = new _hx_interface($val['phpname'], $val['qname'], $val['path']);
- 			} else if($val['type'] == 3) {
- 				$t = new _hx_class($val['name'], $val['qname'], $val['path']);
- 			}
- 			//Register the type
- 			if(!array_key_exists($t->__qname__, php_Boot::$qtypes)) {
- 				_hx_register_type($t);
- 			}
- 		}
- ");
- 	}
+		Loads types defined in the specified directory.
+	**/
+	public static function loadLib(pathToLib:String):Void {
+		var absolutePath = Global.realpath(pathToLib);
+		if (absolutePath == false)
+			throw 'Failed to read path: $pathToLib';
+		Syntax.foreach(Global.glob('$absolutePath/*.php'), function(_, fileName) {
+			if (!Global.is_dir(fileName)) {
+				Global.require_once(fileName);
+			}
+		});
+		Syntax.foreach(Global.glob('$absolutePath/*', Const.GLOB_ONLYDIR), function(_, dirName) {
+			loadLib(dirName);
+		});
+	}
 }
diff --git a/std/php/NativeArray.hx b/std/php/NativeArray.hx
index 0028ad2a317ee6d630eb5af7357f5e898e3275a4..ee005424dc74e8276d246b1e6f4c1c040f8f0a01 100644
--- a/std/php/NativeArray.hx
+++ b/std/php/NativeArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,60 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
-extern class NativeArray implements ArrayAccess<Dynamic> {
+import haxe.extern.EitherType;
+
+using php.Global;
+
+/**
+	Native PHP array.
+**/
+@:coreType @:runtimeValue @:semantics(value) abstract NativeArray {
+	public inline function new()
+		this = Syntax.arrayDecl();
+
+	@:arrayAccess function getByInt(key:Int):Dynamic;
+
+	@:arrayAccess function setByInt(key:Int, val:Dynamic):Dynamic;
+
+	@:arrayAccess function getByFloat(key:Float):Dynamic;
+
+	@:arrayAccess function setByFloat(key:Float, val:Dynamic):Dynamic;
+
+	@:arrayAccess function getByString(key:String):Dynamic;
+
+	@:arrayAccess function setByString(key:String, val:Dynamic):Dynamic;
+
+	@:arrayAccess function getByBool(key:Bool):Dynamic;
+
+	@:arrayAccess function setByBool(key:Bool, val:Dynamic):Dynamic;
+
+	public inline function iterator()
+		return Global.array_values(this).iterator();
+
+	public inline function keyValueIterator():NativeArrayKeyValueIterator
+		return new NativeArrayKeyValueIterator(this);
+}
+
+private class NativeArrayKeyValueIterator {
+	var length:Int;
+	var current:Int = 0;
+	var keys:NativeIndexedArray<EitherType<String, Int>>;
+	var values:NativeIndexedArray<Dynamic>;
+
+	public inline function new(data:NativeArray) {
+		length = Global.count(data);
+		this.keys = Global.array_keys(data);
+		this.values = Global.array_values(data);
+	}
+
+	public inline function hasNext():Bool {
+		return current < length;
+	}
 
-}
\ No newline at end of file
+	public inline function next():{key:EitherType<String, Int>, value:Dynamic} {
+		return {key: keys[current], value: values[current++]};
+	}
+}
diff --git a/std/php7/NativeArray.hx b/std/php/NativeAssocArray.hx
similarity index 52%
rename from std/php7/NativeArray.hx
rename to std/php/NativeAssocArray.hx
index 41590b1f518cf486ecea86e7c26eaa13c10aca02..0ea590c34a49a096a1b12981c5d13b24b3368026 100644
--- a/std/php7/NativeArray.hx
+++ b/std/php/NativeAssocArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,49 +19,47 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package php;
 
-using php.Global;
+package php;
 
-/**
-	Native PHP array.
-**/
-@:coreType @:runtimeValue abstract NativeArray {
+@:forward
+@:semantics(value)
+abstract NativeAssocArray<T>(NativeArray) from NativeArray to NativeArray {
 	public inline function new()
 		this = Syntax.arrayDecl();
 
-	@:arrayAccess function getByInt(key:Int):Dynamic;
-	@:arrayAccess function setByInt(key:Int, val:Dynamic):Dynamic;
-	@:arrayAccess function getByFloat(key:Float):Dynamic;
-	@:arrayAccess function setByFloat(key:Float, val:Dynamic):Dynamic;
-	@:arrayAccess function getByString(key:String):Dynamic;
-	@:arrayAccess function setByString(key:String, val:Dynamic):Dynamic;
-	@:arrayAccess function getByBool(key:Bool):Dynamic;
-	@:arrayAccess function setByBool(key:Bool, val:Dynamic):Dynamic;
+	@:arrayAccess
+	inline function get(key:String):T
+		return this[key];
+
+	@:arrayAccess
+	inline function set(key:String, val:T):T
+		return this[key] = val;
 
 	public inline function iterator()
-		return new NativeArrayIterator(this);
+		return (cast Global.array_values(this) : NativeIndexedArray<T>).iterator();
+
+	public inline function keyValueIterator():NativeAssocArrayKeyValueIterator<T>
+		return new NativeAssocArrayKeyValueIterator(this);
 }
 
-/**
-	Allows iterating over native PHP array with Haxe for-loop
-**/
-private class NativeArrayIterator {
-	var arr:NativeArray;
-	var hasMore:Bool;
+private class NativeAssocArrayKeyValueIterator<T> {
+	var length:Int;
+	var current:Int = 0;
+	var keys:NativeIndexedArray<String>;
+	var values:NativeIndexedArray<T>;
 
-	public inline function new( a:NativeArray ) {
-		arr = a;
-		hasMore = (arr.reset() != false);
+	public inline function new(data:NativeIndexedArray<T>) {
+		length = Global.count(data);
+		this.keys = Global.array_keys(data);
+		this.values = cast Global.array_values(data);
 	}
 
-	public inline function hasNext() : Bool {
-		return hasMore;
+	public inline function hasNext():Bool {
+		return current < length;
 	}
 
-	public inline function next() : Dynamic {
-		var result = arr.current();
-		hasMore = (arr.next() != false);
-		return result;
+	public inline function next():{key:String, value:T} {
+		return {key: keys[current], value: values[current++]};
 	}
 }
diff --git a/std/php/NativeIndexedArray.hx b/std/php/NativeIndexedArray.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1fbc8f3f816cc384f7b95b686550d696da742f54
--- /dev/null
+++ b/std/php/NativeIndexedArray.hx
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+@:forward
+@:semantics(value)
+abstract NativeIndexedArray<T>(NativeArray) from NativeArray to NativeArray {
+	public inline function new()
+		this = Syntax.arrayDecl();
+
+	@:arrayAccess
+	inline function get(idx:Int):T
+		return this[idx];
+
+	@:arrayAccess
+	inline function set(idx:Int, val:T):T
+		return this[idx] = val;
+
+	public inline function push(val:T)
+		Syntax.code('{0}[] = {1}', this, val);
+
+	public inline function iterator():NativeIndexedArrayIterator<T>
+		return new NativeIndexedArrayIterator(this);
+
+	public inline function keyValueIterator():NativeIndexedArrayKeyValueIterator<T>
+		return new NativeIndexedArrayKeyValueIterator(this);
+
+	@:to
+	inline function toHaxeArray():Array<T>
+		return @:privateAccess Array.wrap(this);
+
+	@:from
+	static inline function fromHaxeArray<T>(a:Array<T>):NativeIndexedArray<T>
+		return @:privateAccess a.arr;
+
+	public inline function toString():String {
+		return Boot.stringifyNativeIndexedArray(this);
+	}
+}
+
+private class NativeIndexedArrayIterator<T> {
+	var length:Int;
+	var current:Int = 0;
+	var data:NativeIndexedArray<T>;
+
+	public inline function new(data:NativeIndexedArray<T>) {
+		length = Global.count(data);
+		this.data = data;
+	}
+
+	public inline function hasNext():Bool {
+		return current < length;
+	}
+
+	public inline function next():T {
+		return data[current++];
+	}
+}
+
+private class NativeIndexedArrayKeyValueIterator<T> {
+	var length:Int;
+	var current:Int = 0;
+	var data:NativeIndexedArray<T>;
+
+	public inline function new(data:NativeIndexedArray<T>) {
+		length = Global.count(data);
+		this.data = data;
+	}
+
+	public inline function hasNext():Bool {
+		return current < length;
+	}
+
+	public inline function next():{key:Int, value:T} {
+		return {key: current, value: data[current++]};
+	}
+}
diff --git a/std/php/NativeString.hx b/std/php/NativeString.hx
index 487cac2b3d1bd53fded5528aab4f3d6d5df21f37..fe28598160f55e070086794173a0236cc0bc4a72 100644
--- a/std/php/NativeString.hx
+++ b/std/php/NativeString.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,56 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
-extern class NativeString implements ArrayAccess<String> {
+/**
+	Native PHP string.
+**/
+@:coreType @:runtimeValue abstract NativeString from String to String {
+	@:arrayAccess function get(key:Int):String;
+
+	@:arrayAccess function set(key:Int, val:String):String;
+
+	public inline function iterator() {
+		return new NativeStringIterator(this);
+	}
+
+	public inline function keyValueIterator() {
+		return new NativeStringKeyValueIterator(this);
+	}
+}
+
+class NativeStringIterator {
+	var s:NativeString;
+	var i:Int = 0;
+
+	public inline function new(s:NativeString) {
+		this.s = s;
+	}
+
+	public inline function hasNext():Bool {
+		return i < Global.strlen(s);
+	}
+
+	public inline function next():String {
+		return s[i++];
+	}
+}
+
+class NativeStringKeyValueIterator {
+	var s:NativeString;
+	var i:Int = 0;
+
+	public inline function new(s:NativeString) {
+		this.s = s;
+	}
+
+	public inline function hasNext():Bool {
+		return i < Global.strlen(s);
+	}
 
-}
\ No newline at end of file
+	public inline function next():{key:Int, value:String} {
+		return {key: i, value: s[i++]};
+	}
+}
diff --git a/std/php7/NativeStructArray.hx b/std/php/NativeStructArray.hx
similarity index 89%
rename from std/php7/NativeStructArray.hx
rename to std/php/NativeStructArray.hx
index 8ebbfb337b5d79e8ebac576a4d89f1ca2e3aab16..beb87475e8be2ff773fdf9dd4bb7d14551c545dc 100644
--- a/std/php7/NativeStructArray.hx
+++ b/std/php/NativeStructArray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
 /**
@@ -37,4 +38,12 @@ abstract NativeStructArray<T:{}>(NativeArray) to NativeArray {
 	inline function __toObject():T {
 		return Boot.createAnon(this);
 	}
+
+	@:arrayAccess
+	inline function get<V>(key:String):V
+		return this[key];
+
+	@:arrayAccess
+	inline function set<V>(key:String, val:V):V
+		return this[key] = val;
 }
diff --git a/std/php/NativeXml.hx b/std/php/NativeXml.hx
deleted file mode 100644
index 6f440a73769dcc4cc99f547b49be2b7f4a93ce78..0000000000000000000000000000000000000000
--- a/std/php/NativeXml.hx
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright (C)2005-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 php;
-
-import php.Lib;
-
-enum XmlType {
-}
-
-typedef NativeXml = Xml;
-
-class Xml {
-
-	public static var Element(default,null) : XmlType;
-	public static var PCData(default,null) : XmlType;
-	public static var CData(default,null) : XmlType;
-	public static var Comment(default,null) : XmlType;
-	public static var DocType(default,null) : XmlType;
-	public static var ProcessingInstruction(default,null) : XmlType;
-	public static var Document(default,null) : XmlType;
-
-	public var nodeType(default,null) : XmlType;
-	public var nodeName(get,set) : String;
-	public var nodeValue(get,set) : String;
-	public var parent(get,null) : Xml;
-
-	var _nodeName : String;
-	var _nodeValue : String;
-	var _attributes : haxe.ds.StringMap<String>;
-	var _children : Array<Xml>;
-	var _parent : Xml;
-	var _fromCustomParser:Bool;
-
-	private static var build : Xml;
-	private static function __start_element_handler(parser : Dynamic, name : String, attribs : ArrayAccess<String>) : Void {
-		var node = createElement(name);
-		untyped __php__("foreach($attribs as $k => $v) $node->set($k, $v)");
-		build.addChild(node);
-		build = node;
-	}
-
-	private static function __end_element_handler(parser : Dynamic, name : String) : Void {
-		build = build.parent;
-	}
-
-	private static function __decodeattr(value : String) : String
-	{
-		return untyped __call__("str_replace", "'", '&apos;', __call__("htmlspecialchars", value, __php__('ENT_COMPAT'), 'UTF-8'));
-	}
-
-	private static function __decodeent(value : String) : String
-	{
-		return untyped __call__("str_replace", "'", '&apos;', __call__("htmlentities", value, __php__('ENT_COMPAT'), 'UTF-8'));
-	}
-
-	private static function __character_data_handler(parser : Dynamic, data : String) : Void {
-		var d = __decodeent(data);
-		if ((untyped __call__("strlen", data) == 1 && d != data) || d == data) {
-			var last = build._children[build._children.length - 1];
-			if (null != last && last.nodeType == Xml.PCData)
-			{
-				last.nodeValue += d;
-			} else
-				build.addChild(createPCData(d));
-		} else {
-			build.addChild(createCData(data));
-		}
-	}
-
-	private static function __default_handler(parser : Dynamic, data : String) : Void {
-		//On some PHP setups (seems to happen when libexpat is used) we may get called for such "entities" although character_data will correctly be called afterward.
-		if(data == "<![CDATA[")
-			return;
-		if(data == "]]>")
-			return;
-		if ("<!--" == data.substr(0, 4))
-			build.addChild(createComment(data.substr(4, data.length-7)));
-		else
-			build.addChild(createPCData(data));
-	}
-
-	static var reHeader = ~/\s*(?:<\?(.+?)\?>)?(?:<!DOCTYPE ([^>]+)>)?/mi;
-
-	public static function parse( str : String ) : Xml {
-		build = createDocument();
-		var xml_parser = untyped __call__("xml_parser_create");
-		untyped __call__("xml_set_element_handler", xml_parser, __start_element_handler, __end_element_handler);
-		untyped __call__("xml_set_character_data_handler", xml_parser, __character_data_handler);
-		untyped __call__("xml_set_default_handler", xml_parser, __default_handler);
-		untyped __call__("xml_parser_set_option", xml_parser, __php__("XML_OPTION_CASE_FOLDING"), 0);
-		untyped __call__("xml_parser_set_option", xml_parser, __php__("XML_OPTION_SKIP_WHITE"), 0);
-
-		reHeader.match(str);
-
-		str = "<doc>"+reHeader.matchedRight()+"</doc>";
-
-		if(1 != untyped __call__("xml_parse", xml_parser, str, true)) {
-			throw "Xml parse error ("+untyped __call__("xml_error_string", __call__("xml_get_error_code", xml_parser)) + ") line #" + __call__("xml_get_current_line_number", xml_parser);
-		}
-
-		untyped __call__("xml_parser_free", xml_parser);
-
-		build = build._children[0];
-		build._parent = null;
-		build._nodeName = null;
-		build.nodeType = Document;
-
-		var doctype = reHeader.matched(2);
-		if (null != doctype)
-			build.insertChild(createDocType(doctype), 0);
-
-		var ProcessingInstruction = reHeader.matched(1);
-		if (null != ProcessingInstruction)
-			build.insertChild(createProcessingInstruction(ProcessingInstruction), 0);
-
-		return build;
-	}
-
-	private function new(fromCustomParser:Bool = false) : Void {
-		_fromCustomParser = fromCustomParser;
-	}
-
-	@:allow(haxe.xml.Parser)
-	static function createPCDataFromCustomParser( data : String ) : Xml {
-		var r = new Xml(true);
-		r.nodeType = Xml.PCData;
-		r.set_nodeValue( data );
-		return r;
-	}
-
-	public static function createElement( name : String ) : Xml {
-		var r = new Xml();
-		r.nodeType = Xml.Element;
-		r._children = new Array();
-		r._attributes = new haxe.ds.StringMap();
-		r.set_nodeName( name );
-		return r;
-	}
-
-	public static function createPCData( data : String ) : Xml {
-		var r = new Xml();
-		r.nodeType = Xml.PCData;
-		r.set_nodeValue( data );
-		return r;
-	}
-
-	public static function createCData( data : String ) : Xml {
-		var r = new Xml();
-		r.nodeType = Xml.CData;
-		r.set_nodeValue( data );
-		return r;
-	}
-
-	public static function createComment( data : String ) : Xml {
-		var r = new Xml();
-		r.nodeType = Xml.Comment;
-		r.set_nodeValue( data );
-		return r;
-	}
-
-	public static function createDocType( data : String ) : Xml {
-		var r = new Xml();
-		r.nodeType = Xml.DocType;
-		r.set_nodeValue( data );
-		return r;
-	}
-
-	public static function createProcessingInstruction( data : String ) : Xml {
-		var r = new Xml();
-		r.nodeType = Xml.ProcessingInstruction;
-		r.set_nodeValue( data );
-		return r;
-	}
-
-	public static function createDocument() : Xml {
-		var r = new Xml();
-		r.nodeType = Xml.Document;
-		r._children = new Array();
-		return r;
-	}
-
-	private function get_nodeName() : String {
-		if( nodeType != Xml.Element )
-			throw "bad nodeType";
-		return _nodeName;
-	}
-
-	private function set_nodeName( n : String ) : String {
-		if( nodeType != Xml.Element )
-			throw "bad nodeType";
-		return _nodeName = n;
-	}
-
-	private function get_nodeValue() : String {
-		if( nodeType == Xml.Element || nodeType == Xml.Document )
-			throw "bad nodeType";
-		return _nodeValue;
-	}
-
-	private function set_nodeValue( v : String ) : String {
-		if( nodeType == Xml.Element || nodeType == Xml.Document )
-			throw "bad nodeType";
-		return _nodeValue = v;
-	}
-
-	private inline function get_parent() : Xml {
-		return _parent;
-	}
-
-	public function get( att : String ) : String {
-		if( nodeType != Xml.Element )
-			throw "bad nodeType";
-		return _attributes.get( att );
-	}
-
-	// TODO: check correct transform function
-	@:ifFeature("Xml.parse")
-	public function set( att : String, value : String ) : Void {
-		if( nodeType != Xml.Element )
-			throw "bad nodeType";
-		_attributes.set( att, __decodeattr(value) );
-	}
-
-	public function remove( att : String ) : Void{
-		if( nodeType != Xml.Element )
-			throw "bad nodeType";
-		_attributes.remove( att );
-	}
-
-	public function exists( att : String ) : Bool {
-		if( nodeType != Xml.Element )
-			throw "bad nodeType";
-		return _attributes.exists( att );
-	}
-
-	public function attributes() : Iterator<String> {
-		if( nodeType != Xml.Element )
-			throw "bad nodeType";
-		return _attributes.keys();
-	}
-
-	public function iterator() : Iterator<Xml> {
-		if( _children == null ) throw "bad nodetype";
-		return _children.iterator();
-	}
-
-	public function elements() : Iterator<Xml> {
-		if( _children == null ) throw "bad nodetype";
-		return Lambda.filter(_children, function(child) return child.nodeType == Xml.Element).iterator();
-	}
-
-	public function elementsNamed( name : String ) : Iterator<Xml> {
-		if( _children == null ) throw "bad nodetype";
-		return Lambda.filter(_children, function(child) return child.nodeType == Xml.Element && child.nodeName == name).iterator();
-	}
-
-	public function firstChild() : Xml {
-		if( _children == null ) throw "bad nodetype";
-		if( _children.length == 0 ) return null;
-		return _children[0];
-	}
-
-	public function firstElement() : Xml {
-		if( _children == null ) throw "bad nodetype";
-		for (child in _children)
-			if (child.nodeType == Xml.Element)
-				return child;
-		return null;
-	}
-
-	public function addChild( x : Xml ) : Void {
-		if( _children == null ) throw "bad nodetype";
-		if( x._parent != null ) x._parent._children.remove(x);
-		x._parent = this;
-		_children.push( x );
-	}
-
-	public function removeChild( x : Xml ) : Bool {
-		if( _children == null ) throw "bad nodetype";
-		var b = _children.remove( x );
-		if( b )
-			x._parent = null;
-		return b;
-	}
-
-	public function insertChild( x : Xml, pos : Int ) : Void {
-		if( _children == null ) throw "bad nodetype";
-		if( x._parent != null ) x._parent._children.remove(x);
-		x._parent = this;
-		_children.insert( pos, x );
-	}
-
-	public function toString() : String {
-		if( nodeType == Xml.PCData )
-			return _fromCustomParser ? StringTools.htmlEscape(_nodeValue) : _nodeValue;
-
-		var s = "";
-
-		if( nodeType == Xml.Element ) {
-			s += "<";
-			s += _nodeName;
-			for( k in _attributes.keys() ){
-				s += " ";
-				s += k;
-				s += "=\""; // \"
-				s += _attributes.get(k);
-				s += "\""; // \"
-			}
-			if( _children.length == 0 ) {
-				s += "/>";
-				return s;
-			}
-			s += ">";
-		} else if( nodeType == Xml.CData )
-			return "<![CDATA["+_nodeValue+"]]>";
-		else if( nodeType == Xml.Comment )
-			return "<!--"+_nodeValue+"-->";
-		else if( nodeType == Xml.DocType )
-			return "<!DOCTYPE "+_nodeValue+">";
-		else if ( nodeType == Xml.ProcessingInstruction )
-			return "<?"+_nodeValue+"?>";
-
-
-		for( x in iterator() )
-			s += x.toString();
-
-		if( nodeType == Xml.Element ) {
-			s += "</";
-			s += _nodeName;
-			s += ">";
-		}
-		return s;
-	}
-
-	static function __init__() : Void untyped {
-		Xml.Element = "element";
-		Xml.PCData = "pcdata";
-		Xml.CData = "cdata";
-		Xml.Comment = "comment";
-		Xml.DocType = "doctype";
-		Xml.ProcessingInstruction = "processingInstruction";
-		Xml.Document = "document";
-	}
-
-}
diff --git a/std/php/Ref.hx b/std/php/Ref.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a42f418541ddadd6313f227cbacd058803d39a66
--- /dev/null
+++ b/std/php/Ref.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+/**
+	Special type which allows passing function arguments by reference.
+	This type should be used for externs only.
+**/
+@:semantics(reference)
+typedef Ref<T> = T;
diff --git a/std/php/Resource.hx b/std/php/Resource.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4bc3edba0e8c0436652cbfcc9487d578471443ad
--- /dev/null
+++ b/std/php/Resource.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+/**
+	PHP native `resource` type
+	@see http://php.net/manual/en/language.types.resource.php
+**/
+abstract Resource(Dynamic) {}
diff --git a/std/php/RuntimeException.hx b/std/php/RuntimeException.hx
new file mode 100644
index 0000000000000000000000000000000000000000..171c203326849bfd8a1aecf3e35e24ce3466daf1
--- /dev/null
+++ b/std/php/RuntimeException.hx
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+@:native('RuntimeException')
+extern class RuntimeException extends Exception {}
diff --git a/std/php7/NativeString.hx b/std/php/Scalar.hx
similarity index 82%
rename from std/php7/NativeString.hx
rename to std/php/Scalar.hx
index 644d85abdfece825e6fb50d379cfa639488915fd..f8fc4fd88da6d32f9b1c895e9e12095add504322 100644
--- a/std/php7/NativeString.hx
+++ b/std/php/Scalar.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
+import haxe.extern.EitherType;
+
 /**
-	Native PHP string.
+	`Scalar` is a type that is compatible with any scalar value (int, float, bool, string)
 **/
-@:coreType @:runtimeValue abstract NativeString from String to String {
-
-	@:arrayAccess function get(key:Int):String;
-	@:arrayAccess function set(key:Int, val:String):String;
-}
\ No newline at end of file
+typedef Scalar = EitherType<Int, EitherType<String, EitherType<Float, Bool>>>;
diff --git a/std/php/Session.hx b/std/php/Session.hx
index 6d017dc63297a98076fb8497c39e64fb8a5f6f7a..0dc3633f9399190455694a72131ec7dd5da80e8d 100644
--- a/std/php/Session.hx
+++ b/std/php/Session.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,20 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
+import php.Boot;
+import php.Global.*;
+import php.SuperGlobal.*;
+
 /**
-	Session consists of a way to preserve certain data across 
+	Session consists of a way to preserve certain data across
 	subsequent accesses.
-*/
+ */
 class Session {
 	public static function getCacheLimiter() {
-		switch(untyped __call__("session_cache_limiter")) {
+		switch (session_cache_limiter()) {
 			case "public":
 				return Public;
 			case "private":
@@ -40,123 +45,138 @@ class Session {
 		return null;
 	}
 
-	public static function setCacheLimiter(l : CacheLimiter) {
-		if(started) throw "You can't set the cache limiter while the session is already in use";
-		switch(l) {
+	public static function setCacheLimiter(l:CacheLimiter) {
+		if (started)
+			throw "You can't set the cache limiter while the session is already in use";
+		switch (l) {
 			case Public:
-				untyped __call__("session_cache_limiter", "public");
+				session_cache_limiter("public");
 			case Private:
-				untyped __call__("session_cache_limiter", "private");
+				session_cache_limiter("private");
 			case NoCache:
-				untyped __call__("session_cache_limiter", "nocache");
+				session_cache_limiter("nocache");
 			case PrivateNoExpire:
-				untyped __call__("session_cache_limiter", "private_no_expire");
+				session_cache_limiter("private_no_expire");
 		}
 	}
 
-	public static function getCacheExpire() : Int {
-		return untyped __call__("session_cache_expire");
+	public static function getCacheExpire():Int {
+		return session_cache_expire();
 	}
 
-	public static function setCacheExpire(minutes : Int) {
-		if(started) throw "You can't set the cache expire time while the session is already in use";
-		untyped __call__("session_cache_expire", minutes);
+	public static function setCacheExpire(minutes:Int) {
+		if (started)
+			throw "You can't set the cache expire time while the session is already in use";
+		session_cache_expire(minutes);
 	}
 
-	public static function setName(name : String) {
-		if(started) throw "You can't set the name while the session is already in use";
-		untyped __call__("session_name", name);
+	public static function setName(name:String) {
+		if (started)
+			throw "You can't set the name while the session is already in use";
+		session_name(name);
 	}
 
-	public static function getName() : String {
-		return untyped __call__("session_name");
+	public static function getName():String {
+		return session_name();
 	}
 
-	public static function getId() : String {
-		return untyped __call__("session_id");
+	public static function getId():String {
+		return session_id();
 	}
 
-	public static function setId(id : String) {
-		if(started) throw "You can't set the session id while the session is already in use";
-		untyped __call__("session_id", id);
+	public static function setId(id:String) {
+		if (started)
+			throw "You can't set the session id while the session is already in use";
+		session_id(id);
 	}
 
-	public static function getSavePath() : String {
-		return untyped __call__("session_save_path");
+	public static function getSavePath():String {
+		return session_save_path();
 	}
 
-	public static function setSavePath(path : String) {
-		if(started) throw "You can't set the save path while the session is already in use";
-		untyped __call__("session_save_path", path);
+	public static function setSavePath(path:String) {
+		if (started)
+			throw "You can't set the save path while the session is already in use";
+		session_save_path(path);
 	}
 
-	public static function getModule() : String {
-		return untyped __call__("session_module_name");
+	public static function getModule():String {
+		return session_module_name();
 	}
 
-	public static function setModule(module : String) {
-		if(started) throw "You can't set the module while the session is already in use";
-		untyped __call__("session_module_name", module);
+	public static function setModule(module:String) {
+		if (started)
+			throw "You can't set the module while the session is already in use";
+		session_module_name(module);
 	}
 
-	public static function regenerateId(?deleteold : Bool) : Bool {
-		return untyped __call__("session_regenerate_id", deleteold);
+	public static function regenerateId(?deleteold:Bool):Bool {
+		return session_regenerate_id(deleteold);
 	}
 
-	public static function get(name : String) : Dynamic {
+	public static function get(name:String):Dynamic {
 		start();
-		if(!untyped __call__('isset', __var__("_SESSION", name))) return null;
-		return untyped __var__("_SESSION", name);
+		if (!isset(_SESSION[name]))
+			return null;
+		return _SESSION[name];
 	}
 
-	public static function set(name : String, value : Dynamic) {
+	public static function set(name:String, value:Dynamic) {
 		start();
-		return untyped __set__("_SESSION", name, value);
+		return _SESSION[name] = value;
 	}
 
-	public static function setCookieParams(?lifetime : Int, ?path : String, ?domain : String, ?secure : Bool, ?httponly : Bool) {
-		if(started) throw "You can't set the cookie params while the session is already in use";
-		untyped __call__("session_set_cookie_params", lifetime, path, domain, secure, httponly);
+	public static function setCookieParams(?lifetime:Int, ?path:String, ?domain:String, ?secure:Bool, ?httponly:Bool) {
+		if (started)
+			throw "You can't set the cookie params while the session is already in use";
+		session_set_cookie_params(lifetime, path, domain, secure, httponly);
 	}
 
-	public static function getCookieParams() : { lifetime : Int, path : String, domain : String, secure : Bool, httponly : Bool} {
-		return untyped __call__("_hx_anonymous", untyped __call__("session_get_cookie_params"));
+	public static function getCookieParams():{
+		lifetime:Int,
+		path:String,
+		domain:String,
+		secure:Bool,
+		httponly:Bool
+	} {
+		return Boot.createAnon(session_get_cookie_params());
 	}
 
 	// TODO: completely untested
-	public static function setSaveHandler(open : String -> String -> Bool, close : Void -> Bool, read : String -> String, write : String -> String -> Bool, destroy, gc) : Bool {
-		return untyped __call__("session_set_save_handler", open, close, read, write, destroy, gc);
+	public static function setSaveHandler(open:String->String->Bool, close:Void->Bool, read:String->String, write:String->String->Bool, destroy, gc):Bool {
+		return session_set_save_handler(open, close, read, write, destroy, gc);
 	}
 
-	public static function exists(name : String) {
+	public static function exists(name:String) {
 		start();
-		return untyped __call__("array_key_exists", name, __var__("_SESSION"));
+		return array_key_exists(name, _SESSION);
 	}
 
-	public static function remove(name : String) {
+	public static function remove(name:String) {
 		start();
-		untyped __call__("unset", __var__("_SESSION", name));
+		unset(_SESSION[name]);
 	}
 
-	public static var started(default, null) : Bool;
+	public static var started(default, null):Bool;
+
 	public static function start() {
-		if(started) return;
+		if (started)
+			return;
 		started = true;
-		untyped __call__("session_start");
+		session_start();
 	}
 
 	public static function clear() {
-		untyped __call__("session_unset");
+		session_unset();
 	}
 
 	public static function close() {
-		untyped __call__("session_write_close");
+		session_write_close();
 		started = false; // TODO: not sure this useful; test if a closed session can be re-opened (I doubt)
 	}
 
-	static function __init__()
-	{
-		started = untyped __call__("isset", __var__("_SESSION"));
+	static function __init__() {
+		started = isset(_SESSION);
 	}
 }
 
diff --git a/std/php7/IteratorAggregate.hx b/std/php/SessionHandlerInterface.hx
similarity index 70%
rename from std/php7/IteratorAggregate.hx
rename to std/php/SessionHandlerInterface.hx
index fd7852c7fa75cd58ee4a514ddd85f76cf27c341d..c9d35cdd40d398d87b075c16bdbd20e366aa2a3d 100644
--- a/std/php7/IteratorAggregate.hx
+++ b/std/php/SessionHandlerInterface.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
-@:native('IteratorAggregate')
-extern interface IteratorAggregate<T> {
-	/**
-		This method is not public to not induce Haxe users to use it ;)
-		Use iterator() instead.
-		The return type would be Aggregator that is unusable in Haxe
-	**/
-	private function getIterator() : Iterator<T>; //
-}
\ No newline at end of file
+/**
+	@see http://php.net/manual/en/class.sessionhandlerinterface.php
+**/
+@:native('SessionHandlerInterface')
+extern interface SessionHandlerInterface {
+	function close():Bool;
+	function destroy(session_id:String):Bool;
+	function gc(maxlifetime:Int):Bool;
+	function open(save_path:String, session_name:String):Bool;
+	function read(session_id:String):String;
+	function write(session_id:String, session_data:String):Bool;
+}
diff --git a/std/php/StdClass.hx b/std/php/StdClass.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9522ad26ec7c0fbbb628b0ff372075f3b1a0d9f6
--- /dev/null
+++ b/std/php/StdClass.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+@:native('StdClass')
+@:phpNoConstructor
+extern class StdClass implements Dynamic {
+	function new():Void;
+}
diff --git a/std/php/SuperGlobal.hx b/std/php/SuperGlobal.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c21ab0d70b0c534cb756692cc5a97c442841c3fc
--- /dev/null
+++ b/std/php/SuperGlobal.hx
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+class SuperGlobal {
+	/**
+		@see http://php.net/manual/en/reserved.variables.globals.php
+	**/
+	public static var GLOBALS(get, never):NativeAssocArray<Dynamic>;
+
+	static inline function get_GLOBALS()
+		return Syntax.code("$GLOBALS");
+
+	/**
+		@see http://php.net/manual/en/reserved.variables.server.php
+	**/
+	public static var _SERVER(get, never):NativeAssocArray<Dynamic>;
+
+	static inline function get__SERVER()
+		return Syntax.code("$_SERVER");
+
+	/**
+		@see http://php.net/manual/en/reserved.variables.get.php
+	**/
+	public static var _GET(get, never):NativeAssocArray<Dynamic>;
+
+	static inline function get__GET()
+		return Syntax.code("$_GET");
+
+	/**
+		@see http://php.net/manual/en/reserved.variables.post.php
+	**/
+	public static var _POST(get, never):NativeAssocArray<Dynamic>;
+
+	static inline function get__POST()
+		return Syntax.code("$_POST");
+
+	/**
+		@see http://php.net/manual/en/reserved.variables.files.php
+	**/
+	public static var _FILES(get, never):NativeAssocArray<Dynamic>;
+
+	static inline function get__FILES()
+		return Syntax.code("$_FILES");
+
+	/**
+		@see http://php.net/manual/en/reserved.variables.cookie.php
+	**/
+	public static var _COOKIE(get, never):NativeAssocArray<Dynamic>;
+
+	static inline function get__COOKIE()
+		return Syntax.code("$_COOKIE");
+
+	/**
+		@see http://php.net/manual/en/reserved.variables.session.php
+	**/
+	public static var _SESSION(get, never):NativeAssocArray<Dynamic>;
+
+	static inline function get__SESSION()
+		return Syntax.code("$_SESSION");
+
+	/**
+		@see http://php.net/manual/en/reserved.variables.request.php
+	**/
+	public static var _REQUEST(get, never):NativeAssocArray<Dynamic>;
+
+	static inline function get__REQUEST()
+		return Syntax.code("$_REQUEST");
+
+	/**
+		@see http://php.net/manual/en/reserved.variables.env.php
+	**/
+	public static var _ENV(get, never):NativeAssocArray<Dynamic>;
+
+	static inline function get__ENV()
+		return Syntax.code("$_ENV");
+}
diff --git a/std/php/Syntax.hx b/std/php/Syntax.hx
new file mode 100644
index 0000000000000000000000000000000000000000..33446791a63548fb94f1a89fed67ef5d1fec11c0
--- /dev/null
+++ b/std/php/Syntax.hx
@@ -0,0 +1,345 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+import haxe.extern.Rest;
+import haxe.extern.AsVar;
+import haxe.extern.EitherType;
+
+/**
+	Special extern class to support PHP language specifics.
+	Don't use these functions unless you are really sure what you are doing.
+**/
+@:noClosure
+extern class Syntax {
+	/**
+		Embeds plain php code.
+		`php` should be a string literal with php code.
+		It can contain placeholders like `{0}`, `{1}` which will be replaced with corresponding arguments from `args`.
+		E.g.:
+		```haxe
+		Syntax.code("var_dump({0}, {1})", a, b);
+		```
+		will generate
+		```haxe
+		var_dump($a, $b);
+		```
+	**/
+	static function code(code:String, args:Rest<Dynamic>):Dynamic;
+
+	/**
+		The same as `code()`, but adds dereferencing
+		when required to workaround "cannot use temporary expression in write context" php error.
+	**/
+	static function codeDeref(code:String, args:Rest<Dynamic>):Dynamic;
+
+	/**
+		Generates `$left <=> $right`
+	**/
+	static inline function spaceship(left:Dynamic, right:Dynamic):Int {
+		return code('({0} <=> {1})', left, right);
+	}
+
+	/**
+		Generates `$left ?? $right`
+	**/
+	static function coalesce<T>(left:T, right:T):T;
+
+	/**
+		Generates `$left . $right`
+	**/
+	static inline function concat(left:String, right:String):String {
+		return code('({0} . {1})', left, right);
+	}
+
+	/**
+		Generates `$left == $right`
+	**/
+	static inline function equal(left:Dynamic, right:Dynamic):Bool {
+		return code('({0} == {1})', left, right);
+	}
+
+	/**
+		Generates `$left === $right`
+	**/
+	static inline function strictEqual(left:Dynamic, right:Dynamic):Bool {
+		return code('({0} === {1})', left, right);
+	}
+
+	/**
+		Generates `$left != $right`
+	**/
+	static inline function notEqual(left:Dynamic, right:Dynamic):Bool {
+		return code('({0} != {1})', left, right);
+	}
+
+	/**
+		Generates `$left !== $right`
+	**/
+	static inline function strictNotEqual(left:Dynamic, right:Dynamic):Bool {
+		return code('({0} !== {1})', left, right);
+	}
+
+	/**
+		Generates `$left + $right` for numbers.
+	**/
+	static inline function add<T:Float>(left:T, right:T):T {
+		return code('({0} + {1})', left, right);
+	}
+
+	/**
+		Generates `$left + $right` for php arrays.
+	**/
+	static inline function union(left:NativeArray, right:NativeArray):NativeArray {
+		return codeDeref('({0} + {1})', left, right);
+	}
+
+	/**
+		Generates `$left ** $right`
+	**/
+	static inline function exp<T:Float>(left:T, right:T):T {
+		return code('({0} ** {1})', left, right);
+	}
+
+	/**
+		Generates `$left % $right`
+	**/
+	static inline function mod(left:Float, right:Float):Int {
+		return code('({0} % {1})', left, right);
+	}
+
+	/**
+		Generates `$left ?: $right`
+	**/
+	static inline function shortTernary<T>(left:T, right:T):T {
+		return codeDeref('({0} ?: {1})', left, right);
+	}
+
+	/**
+		Generates `$left xor $right`
+	**/
+	static inline function xor(left:Bool, right:Bool):Bool {
+		return code('({0} xor {1})', left, right);
+	}
+
+	/**
+		Generates `(int)$value`
+	**/
+	static inline function int(value:Dynamic):Int {
+		return code('(int)({0})', value);
+	}
+
+	/**
+		Generates `(float)$value`
+	**/
+	static inline function float(value:Dynamic):Float {
+		return code('(float)({0})', value);
+	}
+
+	/**
+		Generates `(string)$value`
+	**/
+	static inline function string(value:Dynamic):String {
+		return code('(string)({0})', value);
+	}
+
+	/**
+		Generates `(bool)$value`
+	**/
+	static inline function bool(value:Dynamic):Bool {
+		return code('(bool)({0})', value);
+	}
+
+	/**
+		Generates `(object)$value`
+	**/
+	static inline function object(value:Dynamic):StdClass {
+		return codeDeref('((object)({0}))', value);
+	}
+
+	/**
+		Generates `(array)$value`
+	**/
+	static inline function array(value:Dynamic):NativeArray {
+		return codeDeref('((array)({0}))', value);
+	}
+
+	/**
+		Generates `$value instanceof $phpClassName`.
+		Haxe generates `Std.is(value, Type)` calls as `$value instanceof Type` automatically where possible.
+		So you may need this only if you have a `Class` stored in a variable.
+	**/
+	@:overload(function(value:AsVar<Dynamic>, phpClassName:AsVar<String>):Bool {})
+	static function instanceof<V, C>(value:AsVar<V>, type:AsVar<Class<C>>):Bool;
+
+	/**
+		Generates PHP class name for a provided Haxe class.
+		```haxe
+		trace(Syntax.nativeClassName(php.Web)); // outputs: php\Web
+		```
+	**/
+	static function nativeClassName<T>(cls:EitherType<Class<T>, Enum<T>>):String;
+
+	/**
+		```haxe
+		Syntax.foreach(collection, function(key, value) trace(key, value));
+		```
+		generates:
+		```haxe
+		foreach($collection as $key => $value) {
+			trace($key, $value);
+		}
+		```
+	**/
+	static inline function foreach<TCollection, TKey, TValue>(collection:TCollection, body:TKey->TValue->Void):Void {
+		while (Syntax.foreachCondition) {
+			Syntax.foreachCollection(collection);
+			var key:TKey = Syntax.foreachKey();
+			var value:TValue = Syntax.foreachValue();
+			Syntax.keepVar(key, value, key, value);
+			body(key, value);
+		}
+	}
+
+	static private var foreachCondition:Bool;
+	static private function foreachCollection<T>(collection:T):Void;
+	static private function foreachKey<T>():T;
+	static private function foreachValue<T>():T;
+
+	/**
+		Generates `new $className($arg1, ...$argN)`
+	**/
+	@:overload(function(className:AsVar<String>, args:Rest<Dynamic>):Dynamic {})
+	static function construct<T>(cls:AsVar<Class<T>>, args:Rest<Dynamic>):T;
+
+	/**
+		Generates instance field access for reading on `object`
+	**/
+	static function field<T>(object:AsVar<T>, fieldName:String):Dynamic;
+
+	/**
+		Generates instance field access for reading on `object`
+	**/
+	@:deprecated("php.Syntax.getFiled() is deprecated. Use php.Syntax.field() instead.")
+	static function getField<T>(object:AsVar<T>, fieldName:String):Dynamic;
+
+	/**
+		Generates instance field access for writing on `object`
+	**/
+	static function setField<T>(object:AsVar<T>, fieldName:String, value:Dynamic):Void;
+
+	/**
+		Generates static field access for reading on `className`
+	**/
+	static function getStaticField(className:AsVar<EitherType<Class<Dynamic>, String>>, fieldName:String):Dynamic;
+
+	/**
+		Generates static field access for writing on `object`
+	**/
+	static function setStaticField(object:AsVar<EitherType<Class<Dynamic>, String>>, fieldName:String, value:Dynamic):Void;
+
+	/**
+		Generates a call to instance method: `$object->{$methodName}(<args>)`
+	**/
+	static function call<T>(object:AsVar<T>, methodName:String, args:Rest<Dynamic>):Dynamic;
+
+	/**
+		Generates a call to static method: `$className::{$methodName}(<args>)`
+	**/
+	static function staticCall(className:AsVar<EitherType<Class<Dynamic>, String>>, methodName:String, args:Rest<Dynamic>):Dynamic;
+
+	/**
+		```haxe
+		Syntax.arrayDecl(arg1, arg2, arg3);
+		```
+		Generates native array declaration:
+		```haxe
+		[$arg1, $arg2, $arg3]
+		```
+	**/
+	static function arrayDecl<T>(args:Rest<T>):NativeIndexedArray<T>;
+
+	/**
+		```haxe
+		Syntax.assocDecl({field1:'first', field2:2}});
+		```
+		Generates native associative array declaration:
+		```haxe
+		["field1" => "first", "field2" => 2];
+		```
+		This method is not recursive.
+		Accepts object declarations only.
+		That means you can't pass an object stored in a variable to this method like `Syntax.assocDecl(someVar)`.
+		Use `php.Lib.associativeArrayOfObject(someVar)` instead.
+	**/
+	static function assocDecl<T:{}>(?arg:T):NativeAssocArray<Dynamic>;
+
+	/**
+		Don't let compiler to optimize away local var passed to this method.
+	**/
+	static function keepVar(localVar:Rest<Dynamic>):Void;
+
+	/**
+		Adds `...` operator before `args`
+	**/
+	static inline function splat(args:EitherType<NativeArray, Traversable>):Rest<Dynamic> {
+		return code('...{0}', args);
+	}
+
+	/**
+		Add errors suppression operator `@` before `expression`
+	**/
+	static function suppress<T>(expression:T):T;
+
+	/**
+		Generates `clone $value`.
+		@see http://php.net/manual/en/language.oop5.cloning.php
+	**/
+	static inline function clone<T>(value:T):T {
+		return Syntax.code('(clone {0})', value);
+	}
+
+	/**
+		Generates `yield $value`.
+		@see http://php.net/manual/en/language.generators.syntax.php
+	**/
+	static inline function yield(value:Dynamic):Dynamic {
+		return Syntax.code('yield {0}', value);
+	}
+
+	/**
+		Generates `yield $key => $value`.
+		@see http://php.net/manual/en/language.generators.syntax.php
+	**/
+	static inline function yieldPair(key:Dynamic, value:Dynamic):Dynamic {
+		return Syntax.code('yield {0} => {1}', key, value);
+	}
+
+	/**
+		Generates `yield for $value`.
+		@see http://php.net/manual/en/language.generators.syntax.php
+	**/
+	static inline function yieldFrom(value:Dynamic):Dynamic {
+		return Syntax.code('yield from {0}', value);
+	}
+}
diff --git a/std/php7/NativeIndexedArray.hx b/std/php/Throwable.hx
similarity index 62%
rename from std/php7/NativeIndexedArray.hx
rename to std/php/Throwable.hx
index 6319ffec8e0858789ac6cee92bbe9b47e12d5109..31027655d624c76e8688499ac58094c214f73be1 100644
--- a/std/php7/NativeIndexedArray.hx
+++ b/std/php/Throwable.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,26 +19,20 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package php;
-
-@:forward
-abstract NativeIndexedArray<T>(NativeArray) from NativeArray to NativeArray {
-	public inline function new()
-		this = Syntax.arrayDecl();
-
-	@:arrayAccess
-	inline function get(idx:Int):T
-		return this[idx];
 
-	@:arrayAccess
-	inline function set(idx:Int, val:T):T
-		return this[idx] = val;
-
-	@:to
-	inline function toHaxeArray():Array<T>
-		return @:privateAccess Array.wrap(this);
+package php;
 
-	@:from
-	static inline function fromHaxeArray<T>(a:Array<T>):NativeIndexedArray<T>
-		return @:privateAccess a.arr;
-}
\ No newline at end of file
+/**
+	@see http://php.net/manual/en/class.throwable.php
+**/
+@:native('Throwable')
+extern interface Throwable {
+	function getPrevious():Throwable; // Returns previous Throwable
+	function getMessage():String; // message of the exception
+	function getCode():Int; // code of the exception
+	function getFile():String; // source filename
+	function getLine():Int; // source line
+	function getTrace():NativeIndexedArray<NativeAssocArray<Dynamic>>; // an array of the backtrace
+	function getTraceAsString():String; // formatted string of trace
+	@:phpMagic function __toString():String; // formatted string for display
+}
diff --git a/std/php/Traversable.hx b/std/php/Traversable.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d17d9e9fc987b2eec58a26866acec5889d804b5c
--- /dev/null
+++ b/std/php/Traversable.hx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C)2005-2019 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 php;
+
+/**
+	@see http://php.net/manual/en/class.traversable.php
+**/
+@:native('Traversable')
+extern interface Traversable {}
diff --git a/std/php/Web.hx b/std/php/Web.hx
index 11c1b169d67baabcf5b51c06f4c6531e8aa1473d..b4cf758ed7c3169b15dc63f98371136235f9bcee 100644
--- a/std/php/Web.hx
+++ b/std/php/Web.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,39 +19,37 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package php;
 
 import haxe.io.Bytes;
+import haxe.ds.Map;
+import php.Syntax.*;
+import php.Global.*;
+import php.SuperGlobal.*;
 
 /**
 	This class is used for accessing the local Web server and the current
 	client request and information.
 **/
 class Web {
-
 	/**
 		Returns the GET and POST parameters.
 	**/
-	public static function getParams() : Map<String,String> {
+	public static function getParams():Map<String, String> {
 		#if force_std_separator
-		var a : NativeArray = untyped __php__("$_POST");
-		if(untyped __call__("get_magic_quotes_gpc"))
-			untyped __php__("reset($a); while(list($k, $v) = each($a)) $a[$k] = stripslashes((string)$v)");
-		var h = Lib.hashOfAssociativeArray(a);
+		var h = Lib.hashOfAssociativeArray(_POST);
 		var params = getParamsString();
-		if( params == "" )
+		if (params == "")
 			return h;
-		for( p in ~/[;&]/g.split(params) ) {
+		for (p in ~/[;&]/g.split(params)) {
 			var a = p.split("=");
 			var n = a.shift();
-			h.set(StringTools.urlDecode(n),StringTools.urlDecode(a.join("=")));
+			h.set(StringTools.urlDecode(n), StringTools.urlDecode(a.join("=")));
 		}
 		return h;
 		#else
-		var a : NativeArray = untyped __php__("array_merge($_GET, $_POST)");
-		if(untyped __call__("get_magic_quotes_gpc"))
-			untyped __php__("reset($a); while(list($k, $v) = each($a)) $a[$k] = stripslashes((string)$v)");
-		return Lib.hashOfAssociativeArray(a);
+		return Lib.hashOfAssociativeArray(array_merge(_GET, _POST));
 		#end
 	}
 
@@ -60,14 +58,14 @@ class Web {
 		If you have in your URL the parameters `a[]=foo;a[]=hello;a[5]=bar;a[3]=baz` then
 		`php.Web.getParamValues("a")` will return `["foo","hello",null,"baz",null,"bar"]`.
 	**/
-	public static function getParamValues( param : String ) : Array<String> {
-		var reg = new EReg("^"+param+"(\\[|%5B)([0-9]*?)(\\]|%5D)=(.*?)$", "");
+	public static function getParamValues(param:String):Array<String> {
+		var reg = new EReg("^" + param + "(\\[|%5B)([0-9]*?)(\\]|%5D)=(.*?)$", "");
 		var res = new Array<String>();
-		var explore = function(data:String){
-			if (data == null || data.length == 0)
+		var explore = function(data:String) {
+			if (data == null || Global.strlen(data) == 0)
 				return;
-			for (part in data.split("&")){
-				if (reg.match(part)){
+			for (part in data.split("&")) {
+				if (reg.match(part)) {
 					var idx = reg.matched(2);
 					var val = StringTools.urlDecode(reg.matched(4));
 					if (idx == "")
@@ -80,16 +78,15 @@ class Web {
 		explore(StringTools.replace(getParamsString(), ";", "&"));
 		explore(getPostData());
 
-        if (res.length == 0) {
-            var post:haxe.ds.StringMap<Dynamic> = Lib.hashOfAssociativeArray(untyped __php__("$_POST"));
-            var data = post.get(param);
-            var k = 0, v = "";
-            if (untyped __call__("is_array", data)) {
-                untyped __php__(" reset($data); while(list($k, $v) = each($data)) { ");
-                res[k] = v;
-                untyped __php__(" } ");
-            }
-        }
+		if (res.length == 0) {
+			var post:haxe.ds.StringMap<Dynamic> = Lib.hashOfAssociativeArray(_POST);
+			var data = post.get(param);
+			if (is_array(data)) {
+				foreach(data, function(key:Int, value:String) {
+					res[key] = value;
+				});
+			}
+		}
 
 		if (res.length == 0)
 			return null;
@@ -99,140 +96,212 @@ class Web {
 	/**
 		Returns the local server host name.
 	**/
-	public static inline function getHostName() : String {
-		return untyped __php__("$_SERVER['SERVER_NAME']");
+	public static inline function getHostName():String {
+		return _SERVER['SERVER_NAME'];
 	}
 
 	/**
 		Surprisingly returns the client IP address.
 	**/
-	public static inline function getClientIP() : String {
-		return untyped __php__("$_SERVER['REMOTE_ADDR']");
+	public static inline function getClientIP():String {
+		return _SERVER['REMOTE_ADDR'];
 	}
 
 	/**
 		Returns the original request URL (before any server internal redirections).
 	**/
-	public static function getURI() : String {
-		var s : String = untyped __php__("$_SERVER['REQUEST_URI']");
+	public static function getURI():String {
+		var s:String = _SERVER['REQUEST_URI'];
 		return s.split("?")[0];
 	}
 
 	/**
 		Tell the client to redirect to the given url ("Location" header).
 	**/
-	public static function redirect( url : String ) {
-		untyped __call__('header', "Location: " + url);
+	public static function redirect(url:String) {
+		header("Location: " + url);
 	}
 
 	/**
 		Set an output header value. If some data have been printed, the headers have
 		already been sent so this will raise an exception.
 	**/
-	public static inline function setHeader( h : String, v : String ) {
-		untyped __call__('header', h+": "+v);
+	public static inline function setHeader(h:String, v:String) {
+		header('$h: $v');
 	}
 
 	/**
 		Set the HTTP return code. Same remark as `php.Web.setHeader()`.
 		See status code explanation here: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
 	**/
-	public static function setReturnCode( r : Int ) {
-		var code : String;
-		switch(r) {
-			case 100: code = "100 Continue";
-			case 101: code = "101 Switching Protocols";
-			case 200: code = "200 OK";
-			case 201: code = "201 Created";
-			case 202: code = "202 Accepted";
-			case 203: code = "203 Non-Authoritative Information";
-			case 204: code = "204 No Content";
-			case 205: code = "205 Reset Content";
-			case 206: code = "206 Partial Content";
-			case 300: code = "300 Multiple Choices";
-			case 301: code = "301 Moved Permanently";
-			case 302: code = "302 Found";
-			case 303: code = "303 See Other";
-			case 304: code = "304 Not Modified";
-			case 305: code = "305 Use Proxy";
-			case 307: code = "307 Temporary Redirect";
-			case 400: code = "400 Bad Request";
-			case 401: code = "401 Unauthorized";
-			case 402: code = "402 Payment Required";
-			case 403: code = "403 Forbidden";
-			case 404: code = "404 Not Found";
-			case 405: code = "405 Method Not Allowed";
-			case 406: code = "406 Not Acceptable";
-			case 407: code = "407 Proxy Authentication Required";
-			case 408: code = "408 Request Timeout";
-			case 409: code = "409 Conflict";
-			case 410: code = "410 Gone";
-			case 411: code = "411 Length Required";
-			case 412: code = "412 Precondition Failed";
-			case 413: code = "413 Request Entity Too Large";
-			case 414: code = "414 Request-URI Too Long";
-			case 415: code = "415 Unsupported Media Type";
-			case 416: code = "416 Requested Range Not Satisfiable";
-			case 417: code = "417 Expectation Failed";
-			case 500: code = "500 Internal Server Error";
-			case 501: code = "501 Not Implemented";
-			case 502: code = "502 Bad Gateway";
-			case 503: code = "503 Service Unavailable";
-			case 504: code = "504 Gateway Timeout";
-			case 505: code = "505 HTTP Version Not Supported";
-			default: code = Std.string(r);
+	public static function setReturnCode(r:Int) {
+		var code:String;
+		switch (r) {
+			case 100:
+				code = "100 Continue";
+			case 101:
+				code = "101 Switching Protocols";
+			case 200:
+				code = "200 OK";
+			case 201:
+				code = "201 Created";
+			case 202:
+				code = "202 Accepted";
+			case 203:
+				code = "203 Non-Authoritative Information";
+			case 204:
+				code = "204 No Content";
+			case 205:
+				code = "205 Reset Content";
+			case 206:
+				code = "206 Partial Content";
+			case 300:
+				code = "300 Multiple Choices";
+			case 301:
+				code = "301 Moved Permanently";
+			case 302:
+				code = "302 Found";
+			case 303:
+				code = "303 See Other";
+			case 304:
+				code = "304 Not Modified";
+			case 305:
+				code = "305 Use Proxy";
+			case 307:
+				code = "307 Temporary Redirect";
+			case 400:
+				code = "400 Bad Request";
+			case 401:
+				code = "401 Unauthorized";
+			case 402:
+				code = "402 Payment Required";
+			case 403:
+				code = "403 Forbidden";
+			case 404:
+				code = "404 Not Found";
+			case 405:
+				code = "405 Method Not Allowed";
+			case 406:
+				code = "406 Not Acceptable";
+			case 407:
+				code = "407 Proxy Authentication Required";
+			case 408:
+				code = "408 Request Timeout";
+			case 409:
+				code = "409 Conflict";
+			case 410:
+				code = "410 Gone";
+			case 411:
+				code = "411 Length Required";
+			case 412:
+				code = "412 Precondition Failed";
+			case 413:
+				code = "413 Request Entity Too Large";
+			case 414:
+				code = "414 Request-URI Too Long";
+			case 415:
+				code = "415 Unsupported Media Type";
+			case 416:
+				code = "416 Requested Range Not Satisfiable";
+			case 417:
+				code = "417 Expectation Failed";
+			case 500:
+				code = "500 Internal Server Error";
+			case 501:
+				code = "501 Not Implemented";
+			case 502:
+				code = "502 Bad Gateway";
+			case 503:
+				code = "503 Service Unavailable";
+			case 504:
+				code = "504 Gateway Timeout";
+			case 505:
+				code = "505 HTTP Version Not Supported";
+			default:
+				code = Std.string(r);
 		}
-		untyped __call__('header', "HTTP/1.1 " + code, true, r);
+		header("HTTP/1.1 " + code, true, r);
 	}
 
 	/**
 		Retrieve a client header value sent with the request.
 	**/
-	public static function getClientHeader( k : String ) : String {
-		var k = StringTools.replace(k.toUpperCase(),"-","_");
-		for(i in getClientHeaders()) {
-			if(i.header == k)
-				return i.value;
-		}
-		return null;
+	public static function getClientHeader(k:String):String {
+		return loadClientHeaders().get(str_replace('-', '_', strtoupper(k)));
 	}
 
+	private static var _clientHeaders:Map<String, String>;
 
-	private static var _client_headers : List<{header : String, value : String}>;
 	/**
-		Retrieve all the client headers.
+		Based on https://github.com/ralouphie/getallheaders
 	**/
-	public static function getClientHeaders() {
-		if(_client_headers == null) {
-			_client_headers = new List();
-			var h = Lib.hashOfAssociativeArray(untyped __php__("$_SERVER"));
-			for(k in h.keys()) {
-				if(k.substr(0,5) == "HTTP_") {
-					_client_headers.add({ header : k.substr(5), value : h.get(k)});
-				// this is also a valid prefix (issue #1883)
-				} else if(k.substr(0,8) == "CONTENT_") {
-					_client_headers.add({ header : k, value : h.get(k)});
+	static function loadClientHeaders():Map<String, String> {
+		if (_clientHeaders != null)
+			return _clientHeaders;
+
+		_clientHeaders = new Map();
+
+		if (function_exists('getallheaders')) {
+			foreach(getallheaders(), function(key:String, value:Dynamic) {
+				_clientHeaders.set(str_replace('-', '_', strtoupper(key)), Std.string(value));
+			});
+			return _clientHeaders;
+		}
+
+		var copyServer = Syntax.assocDecl({
+			CONTENT_TYPE: 'Content-Type',
+			CONTENT_LENGTH: 'Content-Length',
+			CONTENT_MD5: 'Content-Md5'
+		});
+		foreach(_SERVER, function(key:String, value:Dynamic) {
+			if ((substr(key, 0, 5) : String) == 'HTTP_') {
+				key = substr(key, 5);
+				if (!isset(copyServer[key]) || !isset(_SERVER[key])) {
+					_clientHeaders[key] = Std.string(value);
 				}
+			} else if (isset(copyServer[key])) {
+				_clientHeaders[key] = Std.string(value);
 			}
-			// and these(issue #5270)
-			if(untyped __php__("isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])")) {
-				_client_headers.add({header: 'AUTHORIZATION', value: untyped __php__("(string)$_SERVER['REDIRECT_HTTP_AUTHORIZATION']")});
-			} else if(untyped __php__("isset($_SERVER['PHP_AUTH_USER'])")) {
-				var basic_pass = untyped __php__("isset($_SERVER['PHP_AUTH_PW']) ? (string)$_SERVER['PHP_AUTH_PW'] : ''");
-				_client_headers.add({header: 'AUTHORIZATION', value: 'Basic ' + untyped __php__("base64_encode($_SERVER['PHP_AUTH_USER'] + ':' + $basic_pass)")});
-			} else if(untyped __php__("isset($_SERVER['PHP_AUTH_DIGEST'])")) {
-				_client_headers.add({header: 'AUTHORIZATION', value: untyped __php__("(string)$_SERVER['PHP_AUTH_DIGEST']")});
+		});
+		if (!_clientHeaders.exists('AUTHORIZATION')) {
+			if (isset(_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
+				_clientHeaders['AUTHORIZATION'] = Std.string(_SERVER['REDIRECT_HTTP_AUTHORIZATION']);
+			} else if (isset(_SERVER['PHP_AUTH_USER'])) {
+				var basic_pass = isset(_SERVER['PHP_AUTH_PW']) ? Std.string(_SERVER['PHP_AUTH_PW']) : '';
+				_clientHeaders['AUTHORIZATION'] = 'Basic ' + base64_encode(_SERVER['PHP_AUTH_USER'] + ':' + basic_pass);
+			} else if (isset(_SERVER['PHP_AUTH_DIGEST'])) {
+				_clientHeaders['AUTHORIZATION'] = Std.string(_SERVER['PHP_AUTH_DIGEST']);
 			}
 		}
-		return _client_headers;
+
+		return _clientHeaders;
+	}
+
+	/**
+		Retrieve all the client headers.
+	**/
+	public static function getClientHeaders():List<{value:String, header:String}> {
+		var headers = loadClientHeaders();
+		var result = new List();
+		for (key in headers.keys()) {
+			result.push({value: headers.get(key), header: key});
+		}
+		return result;
+	}
+
+	/**
+		Retrieve all the client headers as `haxe.ds.Map`.
+	**/
+	public static function getClientHeadersMap():Map<String, String> {
+		return loadClientHeaders().copy();
 	}
 
 	/**
 		Returns all the GET parameters `String`
 	**/
-	public static function getParamsString() : String {
-		if(untyped __call__("isset", __var__("_SERVER", "QUERY_STRING")))
-			return untyped __var__("_SERVER", "QUERY_STRING");
+	public static function getParamsString():String {
+		if (isset(_SERVER['QUERY_STRING']))
+			return _SERVER['QUERY_STRING'];
 		else
 			return "";
 	}
@@ -245,17 +314,17 @@ class Web {
 		case, you will have to use `php.Web.getMultipart()` or
 		`php.Web.parseMultipart()` methods.
 	**/
-	public static function getPostData() : Null<String> {
-		var h = untyped __call__("fopen", "php://input", "r");
+	public static function getPostData():Null<String> {
+		var h = fopen("php://input", "r");
 		var bsize = 8192;
 		var max = 32;
-		var data : String = null;
+		var data:String = null;
 		var counter = 0;
-		while (!untyped __call__("feof", h) && counter < max) {
-			data = untyped __php__('{0} . fread({1}, {2})', data, h, bsize);
+		while (!feof(h) && counter < max) {
+			data = Syntax.concat(data, fread(h, bsize));
 			counter++;
 		}
-		untyped __call__("fclose", h);
+		fclose(h);
 		return data;
 	}
 
@@ -264,140 +333,149 @@ class Web {
 		Modifying the hashtable will not modify the cookie, use `php.Web.setCookie()`
 		instead.
 	**/
-	public static function getCookies():Map<String,String> {
-		return Lib.hashOfAssociativeArray(untyped __php__("$_COOKIE"));
+	public static function getCookies():Map<String, String> {
+		return Lib.hashOfAssociativeArray(_COOKIE);
 	}
 
-
 	/**
 		Set a Cookie value in the HTTP headers. Same remark as `php.Web.setHeader()`.
 	**/
-	public static function setCookie( key : String, value : String, ?expire: Date, ?domain: String, ?path: String, ?secure: Bool, ?httpOnly: Bool ) {
-		var t = expire == null ? 0 : Std.int(expire.getTime()/1000.0);
-		if(path == null) path = '/';
-		if(domain == null) domain = '';
-		if(secure == null) secure = false;
-		if(httpOnly == null) httpOnly = false;
-		untyped __call__("setcookie", key, value, t, path, domain, secure, httpOnly);
+	public static function setCookie(key:String, value:String, ?expire:Date, ?domain:String, ?path:String, ?secure:Bool, ?httpOnly:Bool) {
+		var t = expire == null ? 0 : Std.int(expire.getTime() / 1000.0);
+		if (path == null)
+			path = '/';
+		if (domain == null)
+			domain = '';
+		if (secure == null)
+			secure = false;
+		if (httpOnly == null)
+			httpOnly = false;
+		setcookie(key, value, t, path, domain, secure, httpOnly);
 	}
 
 	/**
 		Returns an object with the authorization sent by the client (Basic scheme only).
 	**/
-	public static function getAuthorization() : { user : String, pass : String } {
-		if(!untyped __php__("isset($_SERVER['PHP_AUTH_USER'])"))
+	public static function getAuthorization():{user:String, pass:String} {
+		if (!isset(_SERVER['PHP_AUTH_USER']))
 			return null;
-		return untyped {user: __php__("$_SERVER['PHP_AUTH_USER']"), pass: __php__("$_SERVER['PHP_AUTH_PW']")};
+		return {user: _SERVER['PHP_AUTH_USER'], pass: _SERVER['PHP_AUTH_PW']};
 	}
 
 	/**
 		Get the current script directory in the local filesystem.
 	**/
-	public static inline function getCwd() : String {
-		return untyped __php__("dirname($_SERVER[\"SCRIPT_FILENAME\"])") + "/";
+	public static inline function getCwd():String {
+		return dirname(_SERVER['SCRIPT_FILENAME']) + "/";
 	}
 
 	/**
 		Get the multipart parameters as an hashtable. The data
 		cannot exceed the maximum size specified.
 	**/
-	public static function getMultipart( maxSize : Int ) : Map<String,String> {
+	public static function getMultipart(maxSize:Int):Map<String, String> {
 		var h = new haxe.ds.StringMap();
-		var buf : StringBuf = null;
+		var buf:StringBuf = null;
 		var curname = null;
-		parseMultipart(function(p,_) {
-			if( curname != null )
-				h.set(curname,buf.toString());
+		parseMultipart(function(p, _) {
+			if (curname != null)
+				h.set(curname, buf.toString());
 			curname = p;
 			buf = new StringBuf();
-			maxSize -= p.length;
-			if( maxSize < 0 )
+			maxSize -= Global.strlen(p);
+			if (maxSize < 0)
 				throw "Maximum size reached";
-		}, function(str,pos,len) {
+		}, function(str, pos, len) {
 			maxSize -= len;
-			if( maxSize < 0 )
+			if (maxSize < 0)
 				throw "Maximum size reached";
-			buf.addSub(str.toString(),pos,len);
+			buf.addSub(str.toString(), pos, len);
 		});
-		if( curname != null )
-			h.set(curname,buf.toString());
+		if (curname != null)
+			h.set(curname, buf.toString());
 		return h;
 	}
 
 	/**
 		Parse the multipart data. Call `onPart` when a new part is found
 		with the part name and the filename if present
-		and `onData` when some part data is read. You can this way
+		and `onData` when some part data is readed. You can this way
 		directly save the data on hard drive in the case of a file upload.
 	**/
-	public static function parseMultipart( onPart : String -> String -> Void, onData : Bytes -> Int -> Int -> Void ) : Void {
-		var a : NativeArray = untyped __var__("_POST");
-		if(untyped __call__("get_magic_quotes_gpc"))
-			untyped __php__("reset($a); while(list($k, $v) = each($a)) $a[$k] = stripslashes((string)$v)");
-		var post = Lib.hashOfAssociativeArray(a);
-
-		for (key in post.keys())
-		{
+	public static function parseMultipart(onPart:String->String->Void, onData:Bytes->Int->Int->Void):Void {
+		Syntax.foreach(_POST, function(key:String, value:Dynamic) {
 			onPart(key, "");
-			var v = post.get(key);
-			onData(Bytes.ofString(v), 0, untyped __call__("strlen", v));
-		}
+			onData(Bytes.ofString(value), 0, strlen(value));
+		});
 
-		if(!untyped __call__("isset", __php__("$_FILES"))) return;
-		var parts : Array<String> = untyped __call__("new _hx_array",__call__("array_keys", __php__("$_FILES")));
-		for(part in parts) {
-			var info : Dynamic = untyped __php__("$_FILES[$part]");
-			var tmp : String = untyped info['tmp_name'];
-			var file : String = untyped info['name'];
-			var err : Int = untyped info['error'];
-
-			if(err > 0) {
-				switch(err) {
-					case 1: throw "The uploaded file exceeds the max size of " + untyped __call__('ini_get', 'upload_max_filesize');
-					case 2: throw "The uploaded file exceeds the max file size directive specified in the HTML form (max is" + untyped __call__('ini_get', 'post_max_size') + ")";
-					case 3: throw "The uploaded file was only partially uploaded";
-					case 4: continue; // No file was uploaded
-					case 6: throw "Missing a temporary folder";
-					case 7: throw "Failed to write file to disk";
-					case 8: throw "File upload stopped by extension";
+		if (!isset(_FILES))
+			return;
+		Syntax.foreach(_FILES, function(part:String, data:NativeAssocArray<Dynamic>) {
+			function handleFile(tmp:String, file:String, err:Int) {
+				var fileUploaded = true;
+				if (err > 0) {
+					switch (err) {
+						case 1:
+							throw "The uploaded file exceeds the max size of " + ini_get('upload_max_filesize');
+						case 2:
+							throw "The uploaded file exceeds the max file size directive specified in the HTML form (max is" + ini_get('post_max_size') + ")";
+						case 3:
+							throw "The uploaded file was only partially uploaded";
+						case 4:
+							fileUploaded = false; // No file was uploaded
+						case 6:
+							throw "Missing a temporary folder";
+						case 7:
+							throw "Failed to write file to disk";
+						case 8:
+							throw "File upload stopped by extension";
+					}
 				}
-			}
-			onPart(part, file);
-			if ("" != file)
-			{
-				var h = untyped __call__("fopen", tmp, "r");
-				var bsize = 8192;
-				while (!untyped __call__("feof", h)) {
-					var buf : String = untyped __call__("fread", h, bsize);
-					var size : Int = untyped __call__("strlen", buf);
-					onData(Bytes.ofString(buf), 0, size);
+				if (fileUploaded) {
+					onPart(part, file);
+					if ("" != file) {
+						var h = fopen(tmp, "r");
+						var bsize = 8192;
+						while (!feof(h)) {
+							var buf:String = fread(h, bsize);
+							var size:Int = strlen(buf);
+							onData(Bytes.ofString(buf), 0, size);
+						}
+						fclose(h);
+					}
 				}
-				untyped __call__("fclose", h);
 			}
-		}
+			if (is_array(data['name'])) {
+				for (index in array_keys(data['name'])) {
+					handleFile(data['tmp_name'][index], data['name'][index], data['error'][index]);
+				};
+			} else {
+				handleFile(data['tmp_name'], data['name'], data['error']);
+			}
+		});
 	}
 
 	/**
 		Flush the data sent to the client. By default on Apache, outgoing data is buffered so
 		this can be useful for displaying some long operation progress.
 	**/
-	public static inline function flush() : Void {
-		untyped __call__("flush");
+	public static inline function flush():Void {
+		Global.flush();
 	}
 
 	/**
 		Get the HTTP method used by the client.
 	**/
-	public static function getMethod() : String {
-		if(untyped __php__("isset($_SERVER['REQUEST_METHOD'])"))
-			return untyped __php__("$_SERVER['REQUEST_METHOD']");
+	public static function getMethod():String {
+		if (isset(_SERVER['REQUEST_METHOD']))
+			return _SERVER['REQUEST_METHOD'];
 		else
 			return null;
 	}
 
-	public static var isModNeko(default,null) : Bool;
+	public static var isModNeko(default, null):Bool;
 
 	static function __init__() {
-		isModNeko = !php.Lib.isCli();
+		isModNeko = !Lib.isCli();
 	}
 }
diff --git a/std/php/_polyfills.php b/std/php/_polyfills.php
new file mode 100644
index 0000000000000000000000000000000000000000..c3638b510bbd9996cbafa882241dac988a8c27c3
--- /dev/null
+++ b/std/php/_polyfills.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Polyfills for some functions, which are required by Haxe-generated code, but not available in PHP 7.0.
+ * No Haxe-generated code is available at this point.
+ * No code should be executed from this file.
+ * Symbols declarations are the only code allowed here.
+ */
+namespace { //Namespace declaration is required because this file is included under non-root namespace.
+
+	/**
+	 * @see http://php.net/manual/en/function.mb-chr.php
+	 */
+	if(!function_exists('mb_chr')) {
+		function mb_chr($code, $encoding = null) {
+			if($encoding && $encoding !== 'UTF-8') {
+				throw new Exception("$encoding is not supported in mb_chr() polyfill.");
+			}
+			if (0x80 > $code %= 0x200000) {
+				$s = chr($code);
+			} elseif (0x800 > $code) {
+				$s = chr(0xC0 | $code >> 6) . chr(0x80 | $code & 0x3F);
+			} elseif (0x10000 > $code) {
+				$s = chr(0xE0 | $code >> 12) . chr(0x80 | $code >> 6 & 0x3F) . chr(0x80 | $code & 0x3F);
+			} else {
+				$s = chr(0xF0 | $code >> 18) . chr(0x80 | $code >> 12 & 0x3F) . chr(0x80 | $code >> 6 & 0x3F) . chr(0x80 | $code & 0x3F);
+			}
+			return $s;
+		}
+	}
+
+	/**
+	 * @see http://php.net/manual/en/function.mb-ord.php
+	 */
+	if(!function_exists('mb_ord')) {
+		function mb_ord($s, $encoding = null) {
+			if($encoding && $encoding !== 'UTF-8') {
+				throw new Exception("$encoding is not supported in mb_ord() polyfill.");
+			}
+			$code = ($s = unpack('C*', substr($s, 0, 4))) ? $s[1] : 0;
+			if (0xF0 <= $code) {
+				return (($code - 0xF0) << 18) + (($s[2] - 0x80) << 12) + (($s[3] - 0x80) << 6) + $s[4] - 0x80;
+			}
+			if (0xE0 <= $code) {
+				return (($code - 0xE0) << 12) + (($s[2] - 0x80) << 6) + $s[3] - 0x80;
+			}
+			if (0xC0 <= $code) {
+				return (($code - 0xC0) << 6) + $s[2] - 0x80;
+			}
+			return $code;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/std/php7/_std/Array.hx b/std/php/_std/Array.hx
similarity index 66%
rename from std/php7/_std/Array.hx
rename to std/php/_std/Array.hx
index 88d447123f5b8728d9e5883637ca803b3df6bb7e..8954941220a4090100d5661066ceae71b6b8137b 100644
--- a/std/php7/_std/Array.hx
+++ b/std/php/_std/Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import php.*;
 
 using php.Global;
 
 @:coreApi
-@:final
-class Array<T> implements ArrayAccess<Int,T> {
+final class Array<T> implements ArrayAccess<Int, T> {
 	public var length(default, null):Int;
+
 	var arr:NativeIndexedArray<T>;
 
 	public function new() {
@@ -38,16 +39,22 @@ class Array<T> implements ArrayAccess<Int,T> {
 		return wrap(Global.array_merge(arr, a.arr));
 	}
 
-	public function copy():Array<T> {
-		return wrap(arr);
+	public inline function copy():Array<T> {
+		return Syntax.clone(this);
 	}
 
-	public function filter(f:T->Bool):Array<T> {
-		return wrap(Global.array_values(Global.array_filter(arr, f)));
+	public inline function filter(f:T->Bool):Array<T> {
+		var result = Syntax.arrayDecl();
+		for(item in arr) {
+			if (f(item)) {
+				result.push(item);
+			}
+		}
+		return wrap(result);
 	}
 
 	public function indexOf(x:T, ?fromIndex:Int):Int {
-		if (fromIndex == null) {
+		if (fromIndex == null && !Boot.isHxClosure(x) && !Boot.isNumber(x)) {
 			var index = Global.array_search(x, arr, true);
 			if (index == false) {
 				return -1;
@@ -55,8 +62,14 @@ class Array<T> implements ArrayAccess<Int,T> {
 				return index;
 			}
 		}
-		if (fromIndex < 0) fromIndex += length;
-		if (fromIndex < 0) fromIndex = 0;
+		if (fromIndex == null) {
+			fromIndex = 0;
+		} else {
+			if (fromIndex < 0)
+				fromIndex += length;
+			if (fromIndex < 0)
+				fromIndex = 0;
+		}
 		while (fromIndex < length) {
 			if (arr[fromIndex] == x)
 				return fromIndex;
@@ -70,18 +83,20 @@ class Array<T> implements ArrayAccess<Int,T> {
 		Global.array_splice(arr, pos, 0, Syntax.arrayDecl(x));
 	}
 
-	@:keep
-	public function iterator() : Iterator<T> {
+	@:ifFeature("dynamic_read.iterator", "anon_optional_read.iterator", "anon_read.iterator")
+	public inline function iterator():Iterator<T> {
 		return new ArrayIterator(this);
 	}
 
 	public function join(sep:String):String {
-		return Global.implode(sep, Global.array_map('strval', arr));
+		return Global.implode(sep, Global.array_map(Syntax.nativeClassName(Boot) + '::stringify', arr));
 	}
 
 	public function lastIndexOf(x:T, ?fromIndex:Int):Int {
-		if (fromIndex == null || fromIndex >= length) fromIndex = length - 1;
-		if (fromIndex < 0) fromIndex += length;
+		if (fromIndex == null || fromIndex >= length)
+			fromIndex = length - 1;
+		if (fromIndex < 0)
+			fromIndex += length;
 		while (fromIndex >= 0) {
 			if (arr[fromIndex] == x)
 				return fromIndex;
@@ -92,14 +107,15 @@ class Array<T> implements ArrayAccess<Int,T> {
 
 	public inline function map<S>(f:T->S):Array<S> {
 		var result = Syntax.arrayDecl();
-		for(i in 0...length) {
-			result[i] = f(arr[i]);
+		for(item in arr) {
+			result.push(f(item));
 		}
 		return wrap(result);
 	}
 
 	public inline function pop():Null<T> {
-		if (length > 0) length--;
+		if (length > 0)
+			length--;
 		return Global.array_pop(arr);
 	}
 
@@ -109,14 +125,16 @@ class Array<T> implements ArrayAccess<Int,T> {
 	}
 
 	public function remove(x:T):Bool {
-		for (i in 0...length) {
-			if (arr[i] == x) {
-				Global.array_splice(arr, i, 1);
+		var result = false;
+		Syntax.foreach(arr, function(index:Int, value:T) {
+			if (value == x) {
+				Global.array_splice(arr, index, 1);
 				length--;
-				return true;
+				result = true;
+				Syntax.code('break');
 			}
-		}
-		return false;
+		});
+		return result;
 	}
 
 	public inline function reverse():Void {
@@ -124,17 +142,21 @@ class Array<T> implements ArrayAccess<Int,T> {
 	}
 
 	public inline function shift():Null<T> {
-		if (length > 0) length--;
+		if (length > 0)
+			length--;
 		return Global.array_shift(arr);
 	}
 
 	public function slice(pos:Int, ?end:Int):Array<T> {
-		if (pos < 0) pos += length;
-		if (pos < 0) pos = 0;
+		if (pos < 0)
+			pos += length;
+		if (pos < 0)
+			pos = 0;
 		if (end == null) {
 			return wrap(Global.array_slice(arr, pos));
 		} else {
-			if (end < 0) end += length;
+			if (end < 0)
+				end += length;
 			if (end <= pos) {
 				return [];
 			} else {
@@ -148,7 +170,8 @@ class Array<T> implements ArrayAccess<Int,T> {
 	}
 
 	public function splice(pos:Int, len:Int):Array<T> {
-		if (len < 0) return [];
+		if (len < 0)
+			return [];
 		var result = wrap(Global.array_splice(arr, pos, len));
 		length -= result.length;
 		return result;
@@ -159,39 +182,47 @@ class Array<T> implements ArrayAccess<Int,T> {
 	}
 
 	public function toString():String {
-		var strings = Syntax.arrayDecl();
-		Syntax.foreach(arr, function(index:Int, value:T) {
-			strings[index] = Boot.stringify(value);
-		});
-		return '[' + Global.implode(',', strings) + ']';
+		return inline Boot.stringifyNativeIndexedArray(arr);
+	}
+
+	public function resize(len:Int):Void {
+		if (length < len) {
+			arr = Global.array_pad(arr, len, null);
+		} else if (length > len) {
+			Global.array_splice(arr, len, length - len);
+		}
+		length = len;
 	}
 
 	@:noCompletion
-	function offsetExists( offset:Int ) : Bool {
+	function offsetExists(offset:Int):Bool {
 		return offset < length;
 	}
 
 	@:noCompletion
-	function offsetGet( offset:Int ) : Ref<T> {
+	function offsetGet(offset:Int):Ref<T> {
 		try {
 			return arr[offset];
-		} catch(e:Dynamic) {
+		} catch (e:Dynamic) {
 			return null;
 		}
 	}
 
 	@:noCompletion
-	function offsetSet( offset:Int, value:T ) : Void {
+	function offsetSet(offset:Int, value:T):Void {
 		if (length <= offset) {
-			arr = Global.array_merge(arr, Global.array_fill(0, offset + 1 - length, null));
+			for(i in length...offset + 1) {
+				arr[i] = null;
+			}
 			length = offset + 1;
 		}
 		arr[offset] = value;
+		Syntax.code("return {0}", value);
 	}
 
 	@:noCompletion
-	function offsetUnset( offset:Int ) : Void {
-		if (offset >= 0 && offset < length ) {
+	function offsetUnset(offset:Int):Void {
+		if (offset >= 0 && offset < length) {
 			Global.array_splice(arr, offset, 1);
 			--length;
 		}
@@ -225,21 +256,20 @@ private class ArrayIterator<T> {
 	@:keep
 	@:phpMagic
 	function __get(method:String) {
-		return switch(method) {
+		return switch (method) {
 			case 'hasNext', 'next': Boot.closure(this, method);
 			case _: null;
 		}
 	}
 }
 
-
 /**
 	This one is required for `Array`
 **/
 @:native('ArrayAccess')
-private extern interface ArrayAccess<K,V> {
-	private function offsetExists( offset:K ) : Bool;
-	private function offsetGet( offset:K ) : V;
-	private function offsetSet( offset:K, value:V ) : Void;
-	private function offsetUnset( offset:K ) : Void;
-}
\ No newline at end of file
+private extern interface ArrayAccess<K, V> {
+	private function offsetExists(offset:K):Bool;
+	private function offsetGet(offset:K):V;
+	private function offsetSet(offset:K, value:V):Void;
+	private function offsetUnset(offset:K):Void;
+}
diff --git a/std/php/_std/Date.hx b/std/php/_std/Date.hx
index 8e515b980071c5ff78b0825ebbd8710e45c8d612..6c554a74f3ec8e4f5497c3dc641f4ef5cc6bc7d8 100644
--- a/std/php/_std/Date.hx
+++ b/std/php/_std/Date.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,74 +19,122 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-@:coreApi @:final class Date
-{
-	private var __t : Float;
 
-	public function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void {
-		__t = untyped __call__("mktime", hour, min, sec, month+1, day, year);
+import php.Global.*;
+import php.Syntax.*;
+
+@:coreApi final class Date {
+	private var __t:Float;
+
+	public function new(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Void {
+		__t = mktime(hour, min, sec, month + 1, day, year);
 	}
 
-	public function getTime() : Float {
-		return __t * 1000;
+	public function getTime():Float {
+		return __t * 1000.0;
 	}
 
-	private function getPhpTime() : Float {
+	private function getPhpTime():Float {
 		return __t;
 	}
 
-	public function getFullYear() : Int {
-		return untyped __call__("intval", __call__("date", "Y", this.__t));
+	public function getFullYear():Int {
+		return int(date("Y", int(__t)));
 	}
 
-	public function getMonth() : Int {
-		var m : Int = untyped __call__("intval", __call__("date", "n", this.__t));
+	public function getMonth():Int {
+		var m:Int = int(date("n", int(__t)));
 		return -1 + m;
 	}
 
-	public function getDate() : Int {
-		return untyped __call__("intval", __call__("date", "j", this.__t));
+	public function getDate():Int {
+		return int(date("j", int(__t)));
+	}
+
+	public function getHours():Int {
+		return int(date("G", int(__t)));
+	}
+
+	public function getMinutes():Int {
+		return int(date("i", int(__t)));
 	}
 
-	public function getHours() : Int {
-		return untyped __call__("intval", __call__("date", "G", this.__t));
+	public function getSeconds():Int {
+		return int(date("s", int(__t)));
 	}
 
-	public function getMinutes() : Int {
-		return untyped __call__("intval", __call__("date", "i", this.__t));
+	public function getDay():Int {
+		return int(date("w", int(__t)));
+	}
+
+	public function getUTCFullYear():Int {
+		return int(gmdate("Y", int(__t)));
+	}
+
+	public function getUTCMonth():Int {
+		var m:Int = int(gmdate("n", int(__t)));
+		return -1 + m;
 	}
 
-	public function getSeconds() : Int {
-		return untyped __call__("intval", __call__("date", "s", this.__t));
+	public function getUTCDate():Int {
+		return int(gmdate("j", int(__t)));
 	}
 
-	public function getDay() : Int {
-		return untyped __call__("intval", __call__("date", "w", this.__t));
+	public function getUTCHours():Int {
+		return int(gmdate("G", int(__t)));
+	}
+
+	public function getUTCMinutes():Int {
+		return int(gmdate("i", int(__t)));
+	}
+
+	public function getUTCSeconds():Int {
+		return int(gmdate("s", int(__t)));
+	}
+
+	public function getUTCDay():Int {
+		return int(gmdate("w", int(__t)));
+	}
+
+	public function getTimezoneOffset():Int {
+		return -Std.int(int(date("Z", int(__t))) / 60);
 	}
 
 	public function toString():String {
-		return untyped __call__("date", "Y-m-d H:i:s", this.__t);
+		return date("Y-m-d H:i:s", int(__t));
 	}
 
-	public static function now() : Date {
-		return fromPhpTime(untyped __call__("round", __call__("microtime", true), 3));
+	public static function now():Date {
+		return fromPhpTime(round(microtime(true), 3));
 	}
 
-	static function fromPhpTime( t : Float ) : Date {
-		var d = new Date(2000,1,1,0,0,0);
+	static function fromPhpTime(t:Float):Date {
+		var d = new Date(2000, 1, 1, 0, 0, 0);
 		d.__t = t;
 		return d;
 	}
 
-	public static function fromTime( t : Float ) : Date {
-		var d = new Date(2000,1,1,0,0,0);
+	public static function fromTime(t:Float):Date {
+		var d = new Date(2000, 1, 1, 0, 0, 0);
 		d.__t = t / 1000;
 		return d;
 	}
 
-	public static function fromString( s : String ) : Date {
-		return fromPhpTime(untyped __call__("strtotime", s));
+	public static function fromString(s:String):Date {
+		switch (s.length) {
+			case 8: // hh:mm:ss
+				var k = s.split(":");
+				return Date.fromTime(Std.parseInt(k[0]) * 3600000. + Std.parseInt(k[1]) * 60000. + Std.parseInt(k[2]) * 1000.);
+			case 10: // YYYY-MM-DD
+				var k = s.split("-");
+				return new Date(Std.parseInt(k[0]), Std.parseInt(k[1]) - 1, Std.parseInt(k[2]), 0, 0, 0);
+			case 19: // YYYY-MM-DD hh:mm:ss
+				var k = s.split(" ");
+				var y = k[0].split("-");
+				var t = k[1].split(":");
+				return new Date(Std.parseInt(y[0]), Std.parseInt(y[1]) - 1, Std.parseInt(y[2]), Std.parseInt(t[0]), Std.parseInt(t[1]), Std.parseInt(t[2]));
+			default:
+				throw "Invalid date format : " + s;
+		}
 	}
 }
-
-
diff --git a/std/php/_std/EReg.hx b/std/php/_std/EReg.hx
index fe754ca58dad3b9a30f1c6f21ba7f17df7cc07e9..eeca98dc779e32a0dc0346e4ff15da91a796edec 100644
--- a/std/php/_std/EReg.hx
+++ b/std/php/_std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,103 +19,161 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-@:coreApi @:final class EReg {
 
-	var r : Dynamic;
-	var last : String;
-	var global : Bool;
-	var pattern : String;
-	var options : String;
-	var re : String;
-	var matches : ArrayAccess<Dynamic>;
+import haxe.extern.EitherType;
+import php.*;
 
-	public function new( r : String, opt : String ) : Void {
+@:coreApi final class EReg {
+	var r:Dynamic;
+	var last:String;
+	var global:Bool;
+	var pattern:String;
+	var options:String;
+	var re:String;
+	var reUnicode(get, never):String;
+	var matches:NativeIndexedArray<NativeIndexedArray<EitherType<Int, String>>>;
+
+	public function new(r:String, opt:String):Void {
 		this.pattern = r;
-		var a = opt.split("g");
-		global = a.length > 1;
-		if( global )
-			opt = a.join("");
-		this.options = opt;
-		this.re = untyped __php__("'\"' . str_replace('\"','\\\\\"',$r) . '\"' . $opt");
+		options = Global.str_replace('g', '', opt);
+		global = options != opt;
+		options = Global.str_replace('u', '', options);
+		this.re = '"' + Global.str_replace('"', '\\"', r) + '"' + options;
 	}
 
-	public function match( s : String ) : Bool {
-		var p : Int = untyped __call__("preg_match", re, s, matches, __php__("PREG_OFFSET_CAPTURE"));
+	public function match(s:String):Bool {
+		return matchFromByte(s, 0);
+	}
 
-		if(p > 0)
+	inline function matchFromByte(s:String, bytesOffset:Int):Bool {
+		var p = Global.preg_match(reUnicode, s, matches, Const.PREG_OFFSET_CAPTURE, bytesOffset);
+		if (p == false) {
+			handlePregError();
+			p = Global.preg_match(re, s, matches, Const.PREG_OFFSET_CAPTURE);
+		}
+		if ((p : Int) > 0) {
 			last = s;
-		else
+		} else {
 			last = null;
-		return p > 0;
+		}
+		return (p : Int) > 0;
+	}
+
+	function handlePregError():Void {
+		var e = Global.preg_last_error();
+		if (e == Const.PREG_INTERNAL_ERROR) {
+			throw 'EReg: internal PCRE error';
+		} else if (e == Const.PREG_BACKTRACK_LIMIT_ERROR) {
+			throw 'EReg: backtrack limit';
+		} else if (e == Const.PREG_RECURSION_LIMIT_ERROR) {
+			throw 'EReg: recursion limit';
+		} else if (e == Const.PREG_JIT_STACKLIMIT_ERROR) {
+			throw 'failed due to limited JIT stack space';
+		}
+		// else if(e == Const.PREG_BAD_UTF8_ERROR) {
+		// 	throw 'EReg: malformed UTF8';
+		// } else if(e == Const.PREG_BAD_UTF8_OFFSET_ERROR) {
+		// 	throw 'EReg: the offset didn\'t correspond to the begin of a valid UTF-8 code point';
+		// }
 	}
 
-	public function matched( n : Int ) : String {
-		if (matches == null ||  n < 0 ) throw "EReg::matched";
-		// we can't differenciate between optional groups at the end of a match
+	public function matched(n:Int):String {
+		if (matches == null || n < 0)
+			throw "EReg::matched";
+		// we can't differentiate between optional groups at the end of a match
 		// that have not been matched and invalid groups
-		if( n >= untyped __call__("count", matches)) return null;
-		if(untyped __php__("$this->matches[$n][1] < 0")) return null;
-		return untyped __php__("$this->matches[$n][0]");
+		if (n >= Global.count(matches))
+			return null;
+		if ((matches[n][1] : Int) < 0)
+			return null;
+		return matches[n][0];
 	}
 
-	public function matchedLeft() : String {
-		if( untyped __call__("count", matches) == 0 ) throw "No string matched";
-		return last.substr(0, untyped __php__("$this->matches[0][1]"));
+	public function matchedLeft():String {
+		if (Global.count(matches) == 0)
+			throw "No string matched";
+		return Global.substr(last, 0, matches[0][1]);
 	}
 
-	public function matchedRight() : String {
-		if( untyped __call__("count", matches) == 0 ) throw "No string matched";
-		var x : Int = untyped __php__("$this->matches[0][1]") + __call__("strlen",__php__("$this->matches[0][0]"));
-		return last.substr(x);
+	public function matchedRight():String {
+		if (Global.count(matches) == 0)
+			throw "No string matched";
+		var x:Int = (matches[0][1] : Int) + Global.strlen(matches[0][0]);
+		return Global.substr(last, x);
 	}
 
-	public function matchedPos() : { pos : Int, len : Int } {
-		return untyped { pos : __php__("$this->matches[0][1]"), len : __call__("strlen",__php__("$this->matches[0][0]")) };
+	public function matchedPos():{pos:Int, len:Int} {
+		return {
+			pos: Global.mb_strlen(Global.substr(last, 0, matches[0][1])),
+			len: Global.mb_strlen(matches[0][0])
+		};
 	}
 
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
-		var p : Int = untyped __call__("preg_match", re, len < 0 ? s : s.substr(0,pos + len), matches, __php__("PREG_OFFSET_CAPTURE"), pos);
-		if(p > 0) {
-			last = s;
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
+		var subject = len < 0 ? s : s.substr(0, pos + len);
+		var p = Global.preg_match(reUnicode, subject, matches, Const.PREG_OFFSET_CAPTURE, pos);
+		if (p == false) {
+			handlePregError();
+			p = Global.preg_match(re, subject, matches, Const.PREG_OFFSET_CAPTURE, pos);
 		}
-		else
+		if ((p : Int) > 0) {
+			last = s;
+		} else {
 			last = null;
-		return p > 0;
+		}
+		return (p : Int) > 0;
 	}
 
-	public function split( s : String ) : Array<String> {
-		return untyped __php__("new _hx_array(preg_split($this->re, $s, $this->{\"global\"} ? -1 : 2))");
+	public function split(s:String):Array<String> {
+		var parts:NativeArray = Global.preg_split(reUnicode, s, (global ? -1 : 2));
+		if (parts == null) {
+			handlePregError();
+			parts = Global.preg_split(re, s, (global ? -1 : 2));
+		}
+		return @:privateAccess Array.wrap(parts);
 	}
 
-	public function replace( s : String, by : String ) : String {
-		by = untyped __call__("str_replace", "\\$", "\\\\$", by);
-		by = untyped __call__("str_replace", "$$", "\\$", by);
-		untyped __php__("if(!preg_match('/\\\\([^?].*?\\\\)/', $this->re)) $by = preg_replace('/\\$(\\d+)/', '\\\\\\$\\1', $by)");
-		return untyped __call__("preg_replace", re, by, s, global ? -1 : 1);
+	public function replace(s:String, by:String):String {
+		by = Global.str_replace("\\$", "\\\\$", by);
+		by = Global.str_replace("$$", "\\$", by);
+		if (!Global.preg_match('/\\\\([^?].*?\\\\)/', re)) {
+			by = Global.preg_replace('/\\$(\\d+)/', '\\$\\1', by);
+		}
+		var result = Global.preg_replace(reUnicode, by, s, global ? -1 : 1);
+		if (result == null) {
+			handlePregError();
+			result = Global.preg_replace(re, by, s, global ? -1 : 1);
+		}
+		return result;
 	}
 
-	public function map( s : String, f : EReg -> String ) : String {
-		var offset = 0;
-		var buf = new StringBuf();
+	public function map(s:String, f:EReg->String):String {
+		if(!matchFromByte(s, 0)) {
+			return s;
+		}
+		var result = '';
+		var bytesOffset = 0;
+		var bytesTotal = Global.strlen(s);
 		do {
-			if (offset >= s.length)
-				break;
-			else if (!matchSub(s, offset)) {
-				buf.add(s.substr(offset));
-				break;
-			}
-			var p = matchedPos();
-			buf.add(s.substr(offset, p.pos - offset));
-			buf.add(f(this));
-			if (p.len == 0) {
-				buf.add(s.substr(p.pos, 1));
-				offset = p.pos + 1;
+			result += Global.substr(s, bytesOffset, matches[0][1] - bytesOffset);
+			result += f(this);
+			bytesOffset = matches[0][1];
+			if(matches[0][0] == '') {
+				result += Global.mb_substr(Global.substr(s, bytesOffset), 0, 1);
+				bytesOffset++;
+			} else {
+				bytesOffset += Global.strlen(matches[0][0]);
 			}
-			else
-				offset = p.pos + p.len;
-		} while (global);
-		if (!global && offset > 0 && offset < s.length)
-			buf.add(s.substr(offset));
-		return buf.toString();
+		} while(global && bytesOffset < bytesTotal && matchFromByte(s, bytesOffset));
+		result += Global.substr(s, bytesOffset);
+		return result;
+	}
+
+	public static inline function escape(s:String):String {
+		return Global.preg_quote(s);
+	}
+
+	inline function get_reUnicode():String {
+		return Syntax.concat(re, 'u');
 	}
 }
diff --git a/std/php/_std/List.hx b/std/php/_std/List.hx
deleted file mode 100644
index a23b50321111b6c1ea9659de866e091f4f2dcad7..0000000000000000000000000000000000000000
--- a/std/php/_std/List.hx
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-@:coreApi class List<T> implements php.IteratorAggregate<T> {
-
-	@:ifFeature("List.iterator") private var h : ArrayAccess<Dynamic>;
-	@:ifFeature("List.iterator") private var q : ArrayAccess<Dynamic>;
-
-	public var length(default,null) : Int;
-
-	public function new() : Void {
-		length = 0;
-	}
-
-	public function add( item : T ) : Void {
-		var x = untyped __call__('array', item, null);
-		if( h == null )
-			untyped __php__("$this->h =& $x");
-		else
-			untyped __php__("$this->q[1] =& $x");
-		untyped __php__("$this->q =& $x");
-		length++;
-	}
-
-	public function push( item : T ) : Void {
-		var x = untyped __call__('array', item, __php__("&$this->h"));
-		untyped __php__("$this->h =& $x");
-		if( q == null )
-			untyped __php__("$this->q =& $x");
-		length++;
-	}
-
-	public function first() : Null<T> {
-		return if( h == null ) null else h[0];
-	}
-
-	public function last() : Null<T> {
-		return if( q == null ) null else q[0];
-	}
-
-	public function pop() : Null<T> {
-		if( h == null )
-			return null;
-		var x = h[0];
-		untyped __php__("$this->h =& $this->h[1]");
-		if( h == null )
-			q = null;
-		length--;
-		return x;
-	}
-
-	public function isEmpty() : Bool {
-		return (h == null);
-	}
-
-	public function clear() : Void {
-		h = null;
-		q = null;
-		length = 0;
-	}
-
-	public function remove( v : T ) : Bool {
-		var prev = null;
-		var l = untyped __php__("& $this->h");
-		while( l != null ) {
-			if(untyped __php__("$l[0] === $v")) {
-				if( prev == null )
-					untyped __php__("$this->h =& $l[1]");
-				else
-					untyped __php__("$prev[1] =& $l[1]");
-				if(untyped __physeq__(q, l))
-					untyped __php__("$this->q =& $prev");
-				length--;
-				return true;
-			}
-			untyped __php__("$prev =& $l");
-			untyped __php__("$l =& $l[1]");
-		}
-		return false;
-	}
-
-	public function iterator() : ListIterator<T> {
-		return untyped __call__("new _hx_list_iterator", this);
-	}
-
-	public function toString() : String {
-		var s = "";
-		var first = true;
-		var l = h;
-		while( l != null ) {
-			if( first )
-				first = false;
-			else
-				s += ", ";
-			s += Std.string(l[0]);
-			l = l[1];
-		}
-		return "{" + s + "}";
-	}
-
-	public function join(sep : String) : String {
-		var s = "";
-		var first = true;
-		var l = h;
-		while( l != null ) {
-			if( first )
-				first = false;
-			else
-				s += sep;
-			s += l[0];
-			l = l[1];
-		}
-		return s;
-	}
-
-	public function filter( f : T -> Bool ) : List<T> {
-		var l2 = new List();
-		var l = h;
-		while( l != null ) {
-			var v = l[0];
-			l = l[1];
-			if( f(v) )
-				l2.add(v);
-		}
-		return l2;
-	}
-
-	public function map<X>(f : T -> X) : List<X> {
-		var b = new List();
-		var l = h;
-		while( l != null ) {
-			var v = l[0];
-			l = l[1];
-			b.add(f(v));
-		}
-		return b;
-	}
-
-	function getIterator() : Iterator<T> {
-		return iterator();
-	}
-}
-
-@:coreType private extern class ListIterator<T> {
-	function hasNext():Bool;
-	function next():T;
-}
diff --git a/std/php/_std/Math.hx b/std/php/_std/Math.hx
index 344a868551df7018086b1a80612d08a75811b6f8..dd0f02aa9fa07ba204f2e01f659a957edf777f25 100644
--- a/std/php/_std/Math.hx
+++ b/std/php/_std/Math.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,54 +19,83 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-@:coreApi class Math
-{
-	public static var PI(default,null) : Float;
-	public static var NaN(default,null) : Float;
-	public static var POSITIVE_INFINITY(default,null) : Float;
-	public static var NEGATIVE_INFINITY(default,null) : Float;
-
-	public static function abs(v : Float) : Float      { return untyped __call__("abs", v); }
-	public static function min(a : Float,b : Float) : Float    { return untyped !isNaN(a) ? __call__("min", a, b) : NaN; }
-	public static function max(a : Float,b : Float) : Float    { return untyped !isNaN(b) ? __call__("max", a, b) : NaN; }
-	public static function sin(v : Float) : Float      { return untyped __call__("sin", v); }
-	public static function cos(v : Float) : Float      { return untyped __call__("cos", v); }
-	public static function atan2(y : Float,x : Float) : Float  { return untyped __call__("atan2", y, x); }
-	public static function tan(v : Float) : Float      { return untyped __call__("tan", v); }
-	public static function exp(v : Float) : Float      {
-		if(isNaN(v))
-			return NaN;
-		if(untyped __call__("is_finite", v))
-			return untyped __call__("exp", v);
-		else if(v == POSITIVE_INFINITY)
-			return POSITIVE_INFINITY;
-		else
-			return 0.0;
-	}
-	public static function log(v : Float) : Float      { return untyped __call__("log", v); }
-	public static function sqrt(v : Float) : Float     { return untyped __call__("sqrt", v); }
-	public static function round(v : Float) : Int      { return untyped __call__("(int) floor", v + 0.5); }
-	public static function floor(v : Float) : Int      { return untyped __call__("(int) floor", v); }
-	public static function ceil(v : Float) : Int       { return untyped __call__("(int) ceil", v); }
-	public static function atan(v : Float) : Float     { return untyped __call__("atan", v); }
-	public static function asin(v : Float) : Float     { return untyped __call__("asin", v); }
-	public static function acos(v : Float) : Float     { return untyped __call__("acos", v); }
-	public static function pow(v : Float,exp : Float) : Float    { return untyped __call__("pow", v, exp); }
-	public static function random() : Float    { return untyped __call__("mt_rand") / __call__("mt_getrandmax"); }
-	public static function isNaN(f : Float) : Bool     { return untyped __call__("is_nan", f); }
-	public static function isFinite(f : Float) : Bool  { return untyped __call__("is_finite", f); }
-
-	public static function fround(v : Float) : Float      { return untyped __call__("floor", v + 0.5); }
-	public static function ffloor(v : Float) : Float      { return untyped __call__("floor", v); }
-	public static function fceil(v : Float) : Float       { return untyped __call__("ceil", v); }
-
-	static function __init__() : Void {
-	 	PI = untyped __php__("M_PI");
-	 	NaN = untyped __php__("acos(1.01)");
-	 	NEGATIVE_INFINITY = untyped __php__("log(0)");
-	 	POSITIVE_INFINITY = -NEGATIVE_INFINITY;
-	}
 
-}
+import php.Global;
+import php.Const;
+import php.Syntax;
+
+@:coreApi class Math {
+	public static var PI(default, null):Float = Const.M_PI;
+	public static var NaN(default, null):Float = Const.NAN;
+	public static var POSITIVE_INFINITY(default, null):Float = Const.INF;
+	public static var NEGATIVE_INFINITY(default, null):Float = -Const.INF;
+
+	public static inline function abs(v:Float):Float
+		return Global.abs(v);
+
+	public static inline function min(a:Float, b:Float):Float
+		return isNaN(a) || isNaN(b) ? NaN : Global.min(a, b);
+
+	public static inline function max(a:Float, b:Float):Float
+		return isNaN(a) || isNaN(b) ? NaN : Global.max(a, b);
+
+	public static inline function sin(v:Float):Float
+		return Global.sin(v);
+
+	public static inline function cos(v:Float):Float
+		return Global.cos(v);
+
+	public static inline function atan2(y:Float, x:Float):Float
+		return Global.atan2(y, x);
+
+	public static inline function tan(v:Float):Float
+		return Global.tan(v);
+
+	public static inline function exp(v:Float):Float
+		return Global.exp(v);
+
+	public static inline function log(v:Float):Float
+		return Global.log(v);
+
+	public static inline function sqrt(v:Float):Float
+		return Global.sqrt(v);
 
+	public static inline function round(v:Float):Int
+		return Syntax.int(Global.floor(v + 0.5));
 
+	public static inline function floor(v:Float):Int
+		return Syntax.int(Global.floor(v));
+
+	public static inline function ceil(v:Float):Int
+		return Syntax.int(Global.ceil(v));
+
+	public static inline function atan(v:Float):Float
+		return Global.atan(v);
+
+	public static inline function asin(v:Float):Float
+		return Global.asin(v);
+
+	public static inline function acos(v:Float):Float
+		return Global.acos(v);
+
+	public static inline function pow(v:Float, exp:Float):Float
+		return Syntax.exp(v, exp);
+
+	public static inline function random():Float
+		return Global.mt_rand() / Global.mt_getrandmax();
+
+	public static inline function isNaN(f:Float):Bool
+		return Global.is_nan(f);
+
+	public static inline function isFinite(f:Float):Bool
+		return Global.is_finite(f);
+
+	public static inline function fround(v:Float):Float
+		return Global.floor(v + 0.5);
+
+	public static inline function ffloor(v:Float):Float
+		return Global.floor(v);
+
+	public static inline function fceil(v:Float):Float
+		return Global.ceil(v);
+}
diff --git a/std/php/_std/Reflect.hx b/std/php/_std/Reflect.hx
index 8572bd7866f804c1c9bba1edb1fcbb9893769062..8e439b468d9cdd4738e8d3bb453bfb20d3e151e2 100644
--- a/std/php/_std/Reflect.hx
+++ b/std/php/_std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,101 +19,162 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
+import php.Boot;
+import php.Syntax;
+import php.Closure;
+import php.Const;
+import php.NativeAssocArray;
+import haxe.Constraints;
+
+using php.Global;
+
 @:coreApi class Reflect {
+	public static function hasField(o:Dynamic, field:String):Bool {
+		if (!o.is_object())
+			return false;
+		if (o.property_exists(field))
+			return true;
+
+		if (Boot.isClass(o)) {
+			var phpClassName = Boot.castClass(o).phpClassName;
+			return Global.property_exists(phpClassName, field)
+				|| Global.method_exists(phpClassName, field)
+				|| Global.defined('$phpClassName::$field');
+		}
 
-	public inline static function hasField( o : Dynamic, field : String ) : Bool {
-		return untyped __call__("_hx_has_field", o, field);
+		return false;
 	}
 
-	public static function field( o : Dynamic, field : String ) : Dynamic {
-		return untyped __call__("_hx_field", o, field);
+	public static function field(o:Dynamic, field:String):Dynamic {
+		if (o.is_string()) {
+			return Syntax.field(Boot.dynamicString(o), field);
+		}
+		if (!o.is_object())
+			return null;
+
+		if (field == '' && Const.PHP_VERSION_ID < 70100) {
+			return Syntax.coalesce(Syntax.array(o)[field], null);
+		}
+
+		if (o.property_exists(field)) {
+			return Syntax.field(o, field);
+		}
+		if (o.method_exists(field)) {
+			return Boot.getInstanceClosure(o, field);
+		}
+
+		if (Boot.isClass(o)) {
+			var phpClassName = Boot.castClass(o).phpClassName;
+			if (Global.defined('$phpClassName::$field')) {
+				return Global.constant('$phpClassName::$field');
+			}
+			if (Global.property_exists(phpClassName, field)) {
+				return Syntax.field(o, field);
+			}
+			if (Global.method_exists(phpClassName, field)) {
+				return Boot.getStaticClosure(phpClassName, field);
+			}
+		}
+
+		return null;
 	}
 
-	public inline static function setField( o : Dynamic, field : String, value : Dynamic ) : Void {
-		untyped __setfield__(o, field, value);
+	public static function setField(o:Dynamic, field:String, value:Dynamic):Void {
+		Syntax.setField(o, field, value);
 	}
 
-	public static function getProperty( o : Dynamic, field : String ) : Dynamic {
-		if (null == o) return null;
-		var cls : String = Std.is(o, Class) ? untyped __php__("$o->__tname__") : untyped __call__("get_class", o);
-		var cls_vars : php.NativeArray = untyped __call__("get_class_vars", cls);
-		if (untyped __php__("isset($cls_vars['__properties__']) && isset($cls_vars['__properties__']['get_'.$field]) && ($field = $cls_vars['__properties__']['get_'.$field])"))
-			return untyped __php__("$o->$field()");
-		else
-			return untyped __call__("_hx_field", o, field);
+	public static function getProperty(o:Dynamic, field:String):Dynamic {
+		if (o.is_object()) {
+			if (Boot.isClass(o)) {
+				var phpClassName = Boot.castClass(o).phpClassName;
+				if (Boot.hasGetter(phpClassName, field)) {
+					return Syntax.staticCall(phpClassName, 'get_$field');
+				}
+			} else if (Boot.hasGetter(Global.get_class(o), field)) {
+				return Syntax.call(o, 'get_$field');
+			}
+		}
+
+		return Reflect.field(o, field);
 	}
 
-	public static function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void {
-		if (null == o) return null;
-		var cls : String = Std.is(o, Class) ? untyped __php__("$o->__tname__") : untyped __call__("get_class", o);
-		var cls_vars : php.NativeArray = untyped __call__("get_class_vars", cls);
-		if (untyped __php__("isset($cls_vars['__properties__']) && isset($cls_vars['__properties__']['set_'.$field]) && ($field = $cls_vars['__properties__']['set_'.$field])"))
-			untyped __php__("$o->$field($value)");
-		else
-			untyped __setfield__(o, field, value);
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void {
+		if (o.is_object()) {
+			if (Boot.hasSetter(Global.get_class(o), field)) {
+				Syntax.call(o, 'set_$field', value);
+			} else {
+				Syntax.setField(o, field, value);
+			}
+		}
 	}
 
-	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
-		return __call__("call_user_func_array", __call__("is_callable", func) ? func : __call__("array", o, func), (null == args ? __call__("array") : __field__(args, "a")));
+	public static function callMethod(o:Dynamic, func:Function, args:Array<Dynamic>):Dynamic {
+		return Global.call_user_func_array(func, @:privateAccess args.arr);
 	}
 
-	public static function fields( o : Dynamic ) : Array<String> {
-		if( o == null ) return new Array();
-		return untyped __php__("$o instanceof _hx_array")
-				? __php__("new _hx_array(array('concat','copy','insert','iterator','length','join','pop','push','remove','reverse','shift','slice','sort','splice','toString','unshift'))")
-				: (__call__('is_string', o)
-					? __php__("new _hx_array(array('charAt','charCodeAt','indexOf','lastIndexOf','length','split','substr','toLowerCase','toString','toUpperCase'))")
-					: __php__("new _hx_array(_hx_get_object_vars($o))"));
+	public static function fields(o:Dynamic):Array<String> {
+		if (Global.is_object(o)) {
+			return @:privateAccess Array.wrap(Global.get_object_vars(o).array_keys());
+		}
+		return [];
 	}
 
-	public static function isFunction( f : Dynamic ) : Bool {
-		return untyped __php__("(is_array($f) && is_callable($f)) || _hx_is_lambda($f)") || (__php__("is_array($f)") && hasField(__php__("$f[0]"), __php__("$f[1]")) && __php__("$f[1]") != "length");
+	public static inline function isFunction(f:Dynamic):Bool {
+		return Boot.isFunction(f);
 	}
 
-	public static function compare<T>( a : T, b : T ) : Int {
-		return ( a == b ) ? 0 : untyped __php__("is_string($a)") ? untyped __php__("strcmp($a, $b)") : (((cast a) > (cast b)) ? 1 : -1);
+	public static function compare<T>(a:T, b:T):Int {
+		if (a == b)
+			return 0;
+		if (Global.is_string(a)) {
+			return Global.strcmp(cast a, cast b);
+		} else {
+			return ((cast a) > (cast b) ? 1 : -1);
+		}
 	}
 
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool {
-		if(untyped __call__("is_array", f1) && untyped __call__("is_array", f1))
-			return untyped __php__("$f1[0] === $f2[0] && $f1[1] == $f2[1]");
-		if(untyped __call__("is_string", f1) && untyped __call__("is_string", f2))
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
+		if (Boot.isHxClosure(f1) && Boot.isHxClosure(f2)) {
+			return f1.equals(f2);
+		} else {
 			return f1 == f2;
-		return false;
+		}
 	}
 
-	public static function isObject( v : Dynamic ) : Bool {
-		if( v == null )
+	public static function isObject(v:Dynamic):Bool {
+		if (Boot.isEnumValue(v)) {
 			return false;
-		if(untyped __call__("is_object", v))
-			return untyped __php__("$v instanceof _hx_anonymous") || Type.getClass(v) != null
-			  || untyped __php__("$v instanceof _hx_class")
-			  || untyped __php__("$v instanceof _hx_enum");
-		return untyped __php__("is_string($v) && !_hx_is_lambda($v)");
+		} else {
+			return v.is_object() || v.is_string();
+		}
 	}
 
-	public static function isEnumValue( v : Dynamic ) : Bool {
-		return untyped __php__("$v instanceof Enum");
+	public static inline function isEnumValue(v:Dynamic):Bool {
+		return Boot.isEnumValue(v);
 	}
 
-	public static function deleteField( o : Dynamic, field : String ) : Bool {
-		if(!hasField(o,field)) return false;
-		untyped __php__("if(isset($o->__dynamics[$field])) unset($o->__dynamics[$field]); else if($o instanceof _hx_anonymous) unset($o->$field); else $o->$field = null");
-		return true;
+	public static function deleteField(o:Dynamic, field:String):Bool {
+		if (hasField(o, field)) {
+			Global.unset(Syntax.field(o, field));
+			return true;
+		} else {
+			return false;
+		}
 	}
 
-	public static function copy<T>( o : T ) : T {
-		if (untyped __call__("is_string", o)) return o;
-		var o2 : Dynamic = {};
-		for( f in Reflect.fields(o) )
-			Reflect.setField(o2,f,Reflect.field(o,f));
-		return o2;
+	public static function copy<T>(o:Null<T>):Null<T> {
+		if (Boot.isAnon(o)) {
+			return Syntax.clone(o);
+		} else {
+			return null;
+		}
 	}
 
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
-		return untyped __php__("array(new _hx_lambda(array(&$f), '_hx_make_var_args'), 'execute')");
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
+		return function() {
+			return Global.call_user_func(f, @:privateAccess Array.wrap(Global.func_get_args()));
+		}
 	}
-
-
 }
diff --git a/std/php/_std/Std.hx b/std/php/_std/Std.hx
index 6b4724f48866adda6d62e5aff51a0401c7589c33..f1736c1cb9427d9600bf18108cf62f0100911f27 100644
--- a/std/php/_std/Std.hx
+++ b/std/php/_std/Std.hx
@@ -1,5 +1,6 @@
+import php.Boot;
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,47 +20,57 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+import php.Global;
+import php.Const;
+import php.Syntax;
+
 @:coreApi class Std {
+	public static inline function is(v:Dynamic, t:Dynamic):Bool {
+		return Boot.is(v, t);
+	}
 
-	public static function is( v : Dynamic, t : Dynamic ) : Bool {
-		return untyped __call__("_hx_instanceof", v,t);
+	public static inline function downcast<T:{}, S:T>(value:T, c:Class<S>):S {
+		return Boot.is(value, cast c) ? cast value : null;
 	}
 
-	public static function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
-		return Std.is(value, c) ? cast value : null;
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	public static inline function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return Boot.is(value, cast c) ? cast value : null;
 	}
 
-	public static function string( s : Dynamic ) : String {
-		return untyped __call__("_hx_string_rec", s, '');
+	public static function string(s:Dynamic):String {
+		return Boot.stringify(s);
 	}
 
-	public static function int( x : Float ) : Int {
-		var i : Int = untyped __call__("fmod", x, 0x80000000) & 0xffffffff;
-		if (untyped i & 0x80000000)
-        	i = -((~i & 0xffffffff) + 1);
-        return i;
+	public static inline function int(x:Float):Int {
+		return Syntax.int(x);
 	}
 
-	public static function parseInt( x : String ) : Null<Int> {
-		x = untyped __call__("ltrim", x);
-		var firstCharIndex = (x.charAt(0) == '-' ? 1 : 0);
-		var firstCharCode = x.charCodeAt(firstCharIndex);
-		if (!isDigitCode(firstCharCode)) {
-			return null;
-		}
-		var secondChar = x.charAt(firstCharIndex + 1);
-		if (secondChar == 'x' || secondChar == 'X') {
-			return untyped __call__("intval", x, 0);
+	public static function parseInt(x:String):Null<Int> {
+		if (Global.is_numeric(x)) {
+			return Global.intval(x, 10);
 		} else {
-			return untyped __call__("intval", x, 10);
+			x = Global.ltrim(x);
+			var firstCharIndex = (x.charAt(0) == '-' ? 1 : 0);
+			var firstCharCode = x.charCodeAt(firstCharIndex);
+			if (!isDigitCode(firstCharCode)) {
+				return null;
+			}
+			var secondChar = x.charAt(firstCharIndex + 1);
+			if (secondChar == 'x' || secondChar == 'X') {
+				return Global.intval(x, 0);
+			} else {
+				return Global.intval(x, 10);
+			}
 		}
 	}
 
-	public static function parseFloat( x : String ) : Float {
-		var result = untyped __call__("floatval", x);
-		if (untyped __php__("$result != 0")) return result;
+	public static function parseFloat(x:String):Float {
+		var result = Global.floatval(x);
+		if (result != 0)
+			return result;
 
-		x = untyped __call__("ltrim", x);
+		x = Global.ltrim(x);
 		var firstCharIndex = (x.charAt(0) == '-' ? 1 : 0);
 		var charCode = x.charCodeAt(firstCharIndex);
 
@@ -70,15 +81,15 @@
 		if (isDigitCode(charCode)) {
 			return 0.0;
 		} else {
-			return Math.NaN;
+			return Const.NAN;
 		}
 	}
 
-	public static function random( x : Int ) : Int {
-		return untyped x <= 0 ? 0 : __call__("mt_rand", 0, x-1);
+	public static inline function random(x:Int):Int {
+		return x <= 1 ? 0 : Global.mt_rand(0, x - 1);
 	}
 
-	static inline function isDigitCode( charCode:Null<Int> ) : Bool {
+	static inline function isDigitCode(charCode:Null<Int>):Bool {
 		return charCode != null && charCode >= '0'.code && charCode <= '9'.code;
 	}
 }
diff --git a/std/php/_std/String.hx b/std/php/_std/String.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0db9085e9ed1be4553cae872dd8ab42d51c75151
--- /dev/null
+++ b/std/php/_std/String.hx
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C)2005-2019 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.
+ */
+
+import php.*;
+
+@:coreApi extern class String {
+	var length(default, null):Int;
+
+	@:pure function new(string:String):Void;
+
+	@:pure @:runtime inline function toUpperCase():String {
+		return Global.mb_strtoupper(this);
+	}
+
+	@:pure @:runtime inline function toLowerCase():String {
+		return Global.mb_strtolower(this);
+	}
+
+	@:pure @:runtime inline function charAt(index:Int):String {
+		return index < 0 ? '' : Global.mb_substr(this, index, 1);
+	}
+
+	@:pure function charCodeAt(index:Int):Null<Int>;
+
+	@:pure function indexOf(str:String, ?startIndex:Int):Int;
+
+	@:pure function lastIndexOf(str:String, ?startIndex:Int):Int;
+
+	@:pure function split(delimiter:String):Array<String>;
+
+	@:pure @:runtime inline function substr(pos:Int, ?len:Int):String {
+		return Global.mb_substr(this, pos, len);
+	}
+
+	@:pure function substring(startIndex:Int, ?endIndex:Int):String;
+
+	@:pure @:runtime inline function toString():String {
+		return this;
+	}
+
+	@:pure @:runtime static inline function fromCharCode(code:Int):String {
+		return Global.mb_chr(code);
+	}
+}
diff --git a/std/php/_std/StringBuf.hx b/std/php/_std/StringBuf.hx
index 339caf59fc6131267c7a53f003917f2d4ec17714..120141117158e0f15dcb6526e04c781a16b55ce6 100644
--- a/std/php/_std/StringBuf.hx
+++ b/std/php/_std/StringBuf.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,33 +19,44 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
+import php.Global;
+import php.Syntax;
+
 @:coreApi class StringBuf {
-	private var b : String;
+	private var b:String;
 
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
-	public function new() : Void {
+	public function new():Void {
 		b = "";
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return b.length;
 	}
 
-	public function add<T>( x : T ) : Void {
-		untyped if( __call__('is_null',x) ) x = cast 'null' else if( __call__('is_bool',x) ) x = cast (x?'true':'false');
-		b += x;
+	public function add<T>(x:T):Void {
+		if (x == null) {
+			b = Syntax.concat(b, 'null');
+		} else if (Global.is_bool(x)) {
+			b = Syntax.concat(b, ((x : Dynamic) ? 'true' : 'false'));
+		} else if (Global.is_string(x)) {
+			b = Syntax.concat(b, cast x);
+		} else {
+			b += x;
+		}
 	}
 
-	public inline function addSub( s : String, pos : Int, ?len : Int ) : Void {
-		b += s.substr(pos,len);
+	public inline function addSub(s:String, pos:Int, ?len:Int):Void {
+		b += s.substr(pos, len);
 	}
 
-	public inline function addChar( c : Int ) : Void {
+	public inline function addChar(c:Int):Void {
 		b += String.fromCharCode(c);
 	}
 
-	public inline function toString() : String {
+	public inline function toString():String {
 		return b;
 	}
 }
diff --git a/std/php/_std/StringTools.hx b/std/php/_std/StringTools.hx
index d27cb65e2b55706202c0f645f510dd56596e7d7b..ef2a62410141882c8faf222d9bca93dee2e4c51d 100644
--- a/std/php/_std/StringTools.hx
+++ b/std/php/_std/StringTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,180 +19,136 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
+import php.*;
+import haxe.iterators.StringIterator;
+import haxe.iterators.StringKeyValueIterator;
+
 @:coreApi class StringTools {
+	public inline static function urlEncode(s:String):String {
+		return Global.rawurlencode(s);
+	}
 
-	public inline static function urlEncode( s : String ) : String untyped {
-		return __call__("rawurlencode", s);
+	public inline static function urlDecode(s:String):String {
+		return Global.urldecode(s);
 	}
 
-	public inline static function urlDecode( s : String ) : String untyped {
-		return __call__("urldecode", s);
+	public inline static function htmlEscape(s:String, ?quotes:Bool):String {
+		return Global.htmlspecialchars(s, (quotes ? Const.ENT_QUOTES | Const.ENT_HTML401 : Const.ENT_NOQUOTES));
 	}
 
-	public static function htmlEscape( s : String, ?quotes : Bool ) : String {
-		s = s.split("&").join("&amp;").split("<").join("&lt;").split(">").join("&gt;");
-		return quotes ? s.split('"').join("&quot;").split("'").join("&#039;") : s;
+	public inline static function htmlUnescape(s:String):String {
+		return Global.htmlspecialchars_decode(s, Const.ENT_QUOTES);
 	}
 
-	public inline static function htmlUnescape( s : String ) : String {
-		return untyped __call__("htmlspecialchars_decode", s ,__php__("ENT_QUOTES"));
+	public inline static function contains(s:String, value:String):Bool {
+		return s.indexOf(value) != -1;
 	}
 
-	public static function startsWith( s : String, start : String ) : Bool {
-		return( s.length >= start.length && s.substr(0,start.length) == start );
+	public static function startsWith(s:String, start:String):Bool {
+		return start == '' || Global.substr(s, 0, Global.strlen(start)) == start;
 	}
 
-	public static function endsWith( s : String, end : String ) : Bool {
-		var elen = end.length;
-		var slen = s.length;
-		return( slen >= elen && s.substr(slen-elen,elen) == end );
+	public static function endsWith(s:String, end:String):Bool {
+		return end == '' || Global.substr(s, -Global.strlen(end)) == end;
 	}
 
-	public static function isSpace( s : String, pos : Int ) : Bool {
-		var c = s.charCodeAt( pos );
+	public static function isSpace(s:String, pos:Int):Bool {
+		var c = s.charCodeAt(pos);
 		return (c >= 9 && c <= 13) || c == 32;
 	}
 
-	public inline static function ltrim( s : String ) : String {
-		return untyped __call__("ltrim", s);
+	public inline static function ltrim(s:String):String {
+		return Global.ltrim(s);
 	}
 
-	public inline static function rtrim( s : String ) : String {
-		return untyped __call__("rtrim", s);
+	public inline static function rtrim(s:String):String {
+		return Global.rtrim(s);
 	}
 
-	public inline static function trim( s : String ) : String {
-		return untyped __call__("trim", s);
+	public inline static function trim(s:String):String {
+		return Global.trim(s);
 	}
 
-	public inline static function rpad( s : String, c : String, l : Int ) : String {
-		return c.length == 0 || s.length >= l ? s : untyped __call__("str_pad", s, Math.ceil((l-s.length) / c.length) * c.length + s.length , c, __php__("STR_PAD_RIGHT"));
+	public static function rpad(s:String, c:String, l:Int):String {
+		var cLength = c.length;
+		var sLength = s.length;
+		if (cLength == 0 || sLength >= l)
+			return s;
+		var padLength = l - sLength;
+		var padCount = Syntax.int(padLength / cLength);
+		if (padCount > 0) {
+			var result = Global.str_pad(s, Global.strlen(s) + padCount * Global.strlen(c), c, Const.STR_PAD_RIGHT);
+			return (padCount * cLength >= padLength) ? result : Syntax.concat(result, c);
+		} else {
+			return Syntax.concat(s, c);
+		}
 	}
 
-	public inline static function lpad( s : String, c : String, l : Int ) : String {
-		return c.length == 0 || s.length >= l ? s : untyped __call__("str_pad", s, Math.ceil((l-s.length) / c.length) * c.length + s.length , c, __php__("STR_PAD_LEFT"));
+	public static function lpad(s:String, c:String, l:Int):String {
+		var cLength = c.length;
+		var sLength = s.length;
+		if (cLength == 0 || sLength >= l)
+			return s;
+		var padLength = l - sLength;
+		var padCount = Syntax.int(padLength / cLength);
+		if (padCount > 0) {
+			var result = Global.str_pad(s, Global.strlen(s) + padCount * Global.strlen(c), c, Const.STR_PAD_LEFT);
+			return (padCount * cLength >= padLength) ? result : Syntax.concat(c, result);
+		} else {
+			return Syntax.concat(c, s);
+		}
 	}
 
-	public inline static function replace( s : String, sub : String, by : String ) : String {
-		return untyped sub=="" ? __call__("implode", __call__("str_split ", s) , by) : __call__("str_replace", sub, by, s);
+	public static function replace(s:String, sub:String, by:String):String {
+		if (sub == '') {
+			return Global.implode(by, Global.preg_split('//u', s, -1, Const.PREG_SPLIT_NO_EMPTY));
+		}
+		return Global.str_replace(sub, by, s);
 	}
 
-	public static function hex( n : Int, ?digits : Int ) : String {
-		var s : String = untyped __call__("dechex", n),
-			len = 8;
-		if (s.length > (null == digits ? len : (len = digits > len ? digits : len)))
+	public static function hex(n:Int, ?digits:Int):String {
+		var s = Global.dechex(n);
+		var len = 8;
+		if (Global.strlen(s) > (null == digits ? len : (len = digits > len ? digits : len)))
 			s = s.substr(-len);
-		else if ( digits != null )
+		else if (digits != null)
 			s = lpad(s, '0', digits);
 		return s.toUpperCase();
 	}
 
-	public static inline function fastCodeAt( s : String, index : Int ) : Int {
-		return untyped s.cca(index);
+	public static function fastCodeAt(s:String, index:Int):Int {
+		var char:NativeString = (index == 0 ? s : Global.mb_substr(s, index, 1));
+		if (char == '')
+			return 0;
+		return Boot.unsafeOrd(char);
 	}
 
-	public static inline function isEof( c : Int ) : Bool {
-		return untyped __physeq__(c, 0);
+	public static inline function iterator(s:String):StringIterator {
+		return new StringIterator(s);
 	}
 
-	/**
-		Returns a String that can be used as a single command line argument
-		on Unix.
-		The input will be quoted, or escaped if necessary.
-	*/
-	public static function quoteUnixArg(argument:String):String {
-		// Based on cpython's shlex.quote().
-		// https://hg.python.org/cpython/file/a3f076d4f54f/Lib/shlex.py#l278
-
-		if (argument == "")
-			return "''";
-
-		if (!~/[^a-zA-Z0-9_@%+=:,.\/-]/.match(argument))
-			return argument;
-
-		// use single quotes, and put single quotes into double quotes
-		// the string $'b is then quoted as '$'"'"'b'
-		return "'" + replace(argument, "'", "'\"'\"'") + "'";
-	}
-
-	/**
-		Character codes of the characters that will be escaped by `quoteWinArg(_, true)`.
-	*/
-	public static var winMetaCharacters = [";".code, ",".code, " ".code, "(".code, ")".code, "%".code, "!".code, "^".code, "\"".code, "<".code, ">".code, "&".code, "|".code, "\n".code, "\r".code];
-
-	/**
-		Returns a String that can be used as a single command line argument
-		on Windows.
-		The input will be quoted, or escaped if necessary, such that the output
-		will be parsed as a single argument using the rule specified in
-		http://msdn.microsoft.com/en-us/library/ms880421
-
-		Examples:
-		```
-		quoteWinArg("abc") == "abc";
-		quoteWinArg("ab c") == '"ab c"';
-		```
-	*/
-	public static function quoteWinArg(argument:String, escapeMetaCharacters:Bool):String {
-		// If there is no space, tab, back-slash, or double-quotes, and it is not an empty string.
-		if (!~/^[^ \t\\"]+$/.match(argument)) {
-
-			// Based on cpython's subprocess.list2cmdline().
-			// https://hg.python.org/cpython/file/50741316dd3a/Lib/subprocess.py#l620
-
-			var result = new StringBuf();
-			var needquote = argument.indexOf(" ") != -1 || argument.indexOf("\t") != -1 || argument == "";
-
-			if (needquote)
-				result.add('"');
-
-			var bs_buf = new StringBuf();
-			for (i in 0...argument.length) {
-				switch (argument.charCodeAt(i)) {
-					case "\\".code:
-						// Don't know if we need to double yet.
-						bs_buf.add("\\");
-					case '"'.code:
-						// Double backslashes.
-						var bs = bs_buf.toString();
-						result.add(bs);
-						result.add(bs);
-						bs_buf = new StringBuf();
-						result.add('\\"');
-					case c:
-						// Normal char
-						if (bs_buf.length > 0) {
-							result.add(bs_buf.toString());
-							bs_buf = new StringBuf();
-						}
-						result.addChar(c);
-				}
-			}
-
-			// Add remaining backslashes, if any.
-			result.add(bs_buf.toString());
-
-			if (needquote) {
-				result.add(bs_buf.toString());
-				result.add('"');
-			}
-
-			argument = result.toString();
-		}
+	public static inline function keyValueIterator(s:String):StringKeyValueIterator {
+		return new StringKeyValueIterator(s);
+	}
 
-		if (escapeMetaCharacters) {
-			var result = new StringBuf();
-			for (i in 0...argument.length) {
-				var c = argument.charCodeAt(i);
-				if (winMetaCharacters.indexOf(c) >= 0) {
-					result.addChar("^".code);
-				}
-				result.addChar(c);
-			}
-			return result.toString();
-		} else {
-			return argument;
-		}
+	@:noUsing public static inline function isEof(c:Int):Bool {
+		return c == 0;
+	}
+
+	@:noCompletion
+	@:deprecated('StringTools.quoteUnixArg() is deprecated. Use haxe.SysTools.quoteUnixArg() instead.')
+	public static function quoteUnixArg(argument:String):String {
+		return inline haxe.SysTools.quoteUnixArg(argument);
 	}
 
+	@:noCompletion
+	@:deprecated('StringTools.winMetaCharacters is deprecated. Use haxe.SysTools.winMetaCharacters instead.')
+	public static var winMetaCharacters:Array<Int> = cast haxe.SysTools.winMetaCharacters;
+
+	@:noCompletion
+	@:deprecated('StringTools.quoteWinArg() is deprecated. Use haxe.SysTools.quoteWinArg() instead.')
+	public static function quoteWinArg(argument:String, escapeMetaCharacters:Bool):String {
+		return inline haxe.SysTools.quoteWinArg(argument, escapeMetaCharacters);
+	}
 }
diff --git a/std/php/_std/Sys.hx b/std/php/_std/Sys.hx
index 8fc1bb15427d988d46bcf2ff188a802b42d1a662..5de11a48b0c517a5cab42a63152327fe82345afe 100644
--- a/std/php/_std/Sys.hx
+++ b/std/php/_std/Sys.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,120 +19,139 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
+import php.*;
+import sys.io.FileOutput;
+import sys.io.FileInput;
+import haxe.SysTools;
+
 @:coreApi class Sys {
+	/** Environment variables set by `Sys.putEnv()` */
+	static var customEnvVars = new NativeAssocArray<String>();
 
-	public static function print( v : Dynamic ) : Void {
-		untyped __call__("echo", Std.string(v));
+	public static inline function print(v:Dynamic):Void {
+		Global.echo(Std.string(v));
 	}
 
-	public static function println( v : Dynamic ) : Void {
-		print(v);
-		print("\n");
+	public static inline function println(v:Dynamic):Void {
+		Global.echo(Std.string(v) + Const.PHP_EOL);
 	}
 
-	public static function args() : Array<String> {
-		return untyped __call__('array_key_exists', 'argv', __var__('_SERVER')) ? __call__('new _hx_array', __call__('array_slice', __var__('_SERVER', 'argv'), 1)) : [];
+	public static function args():Array<String> {
+		if (Global.array_key_exists('argv', SuperGlobal._SERVER)) {
+			return @:privateAccess Array.wrap(Global.array_slice(SuperGlobal._SERVER['argv'], 1));
+		} else {
+			return [];
+		}
 	}
 
-	public static function getEnv( s : String ) : String {
-		var ret:Dynamic = untyped __call__("getenv", s);
-		return ret == false ? null : ret;
+	public static function getEnv(s:String):String {
+		var value = Global.getenv(s);
+		return value == false ? null : value;
 	}
 
-	public static function putEnv( s : String, v : String ) : Void {
-		return untyped __call__("putenv", s + "=" + v);
+	public static function putEnv(s:String, v:String):Void {
+		customEnvVars[s] = '$v'; // in case of `null` it should become `"null"`
+		Global.putenv('$s=$v');
 	}
 
-	public static function sleep( seconds : Float ) : Void {
-		return untyped __call__("usleep", seconds*1000000);
+	public static inline function sleep(seconds:Float):Void {
+		return Global.usleep(Std.int(seconds * 1000000));
 	}
 
-	public static function setTimeLocale( loc : String ) : Bool {
-		return untyped __call__("setlocale", __php__("LC_TIME"), loc) != false;
+	public static inline function setTimeLocale(loc:String):Bool {
+		return Global.setlocale(Const.LC_TIME, loc) != false;
 	}
 
-	public static function getCwd() : String {
-		var cwd : String = untyped __call__("getcwd");
-		var l = cwd.substr(-1);
-		return cwd + (l == '/' || l == '\\' ? '' : '/');
+	public static function getCwd():String {
+		var cwd = Global.getcwd();
+		if (cwd == false)
+			return null;
+		var l = (cwd : String).substr(-1);
+		return (cwd : String) + (l == '/' || l == '\\' ? '' : '/');
 	}
 
-	public static function setCwd( s : String ) : Void {
-		untyped __call__("chdir", s);
+	public static inline function setCwd(s:String):Void {
+		Global.chdir(s);
 	}
 
-	public static function systemName() : String {
-		var s : String = untyped __call__("php_uname", "s");
-		var p : Int;
-		if((p = s.indexOf(" ")) >= 0)
-			return s.substr(0, p);
-		else
-			return s;
+	public static function systemName():String {
+		var s = Global.php_uname('s');
+		var p = s.indexOf(" ");
+		return (p >= 0 ? s.substr(0, p) : s);
 	}
 
-	public static function command( cmd : String, ?args : Array<String> ) : Int {
+	public static function command(cmd:String, ?args:Array<String>):Int {
 		if (args != null) {
 			switch (systemName()) {
 				case "Windows":
 					cmd = [
 						for (a in [StringTools.replace(cmd, "/", "\\")].concat(args))
-						StringTools.quoteWinArg(a, true)
+							SysTools.quoteWinArg(a, true)
 					].join(" ");
 				case _:
-					cmd = [cmd].concat(args).map(StringTools.quoteUnixArg).join(" ");
+					cmd = [cmd].concat(args).map(SysTools.quoteUnixArg).join(" ");
 			}
 		}
-		var result = 0;
-		untyped __call__("system", cmd, result);
+		var result = Boot.deref(0);
+		Global.system(cmd, result);
 		return result;
 	}
 
-	public static function exit( code : Int ) : Void {
-		untyped __call__("exit", code);
+	public static inline function exit(code:Int):Void {
+		Global.exit(code);
 	}
 
-	public static function time() : Float {
-		return untyped __call__("microtime", true);
+	public static inline function time():Float {
+		return Global.microtime(true);
 	}
 
-	public static function cpuTime() : Float {
-		return untyped __call__("microtime", true) - __php__("$_SERVER['REQUEST_TIME']");
+	public static function cpuTime():Float {
+		return time() - SuperGlobal._SERVER['REQUEST_TIME'];
 	}
 
-	@:deprecated("Use programPath instead") public static function executablePath() : String {
-		return untyped __php__("$_SERVER['SCRIPT_FILENAME']");
+	@:deprecated("Use programPath instead") public static inline function executablePath():String {
+		return SuperGlobal._SERVER['SCRIPT_FILENAME'];
 	}
 
 	// It has to be initialized before any call to Sys.setCwd()...
-	static var _programPath = sys.FileSystem.fullPath(untyped __php__("$_SERVER['SCRIPT_FILENAME']"));
-	public static function programPath() : String {
+	static var _programPath = sys.FileSystem.fullPath(SuperGlobal._SERVER['SCRIPT_FILENAME']);
+
+	public static function programPath():String {
 		return _programPath;
 	}
 
-	public static function environment() : Map<String,String> {
-		return php.Lib.hashOfAssociativeArray(untyped __php__("$_SERVER"));
+	public static function environment():Map<String, String> {
+		var env = SuperGlobal._SERVER;
+		Syntax.foreach(customEnvVars, function(name:String, value:String) {
+			env[name] = value;
+		});
+		return php.Lib.hashOfAssociativeArray(env);
 	}
 
-	public static function stdin() : haxe.io.Input {
-		var p = untyped __php__("defined('STDIN') ? STDIN : fopen('php://stdin', 'r')");
-		return untyped new sys.io.FileInput(p);
+	public static function stdin():haxe.io.Input {
+		var p = Global.defined('STDIN') ? Const.STDIN : Global.fopen('php://stdin', 'r');
+		return @:privateAccess new FileInput(p);
 	}
 
-	public static function stdout() : haxe.io.Output {
-		var p = untyped __php__("defined('STDOUT') ? STDOUT : fopen('php://stdout', 'w')");
-		return untyped new sys.io.FileOutput(p);
+	public static function stdout():haxe.io.Output {
+		var p = Global.defined('STDOUT') ? Const.STDOUT : Global.fopen('php://stdout', 'w');
+		return @:privateAccess new FileOutput(p);
 	}
 
-	public static function stderr() : haxe.io.Output {
-		var p = untyped __php__("defined('STDERR') ? STDERR : fopen('php://stderr', 'w')");
-		return untyped new sys.io.FileOutput(p);
+	public static function stderr():haxe.io.Output {
+		var p = Global.defined('STDERR') ? Const.STDERR : Global.fopen('php://stderr', 'w');
+		return @:privateAccess new FileOutput(p);
 	}
 
-	public static function getChar( echo : Bool ) : Int {
-		var v : Int = untyped __call__("fgetc", __php__("STDIN"));
-		if(echo)
-			untyped __call__('echo', v);
-		return v;
+	public static function getChar(echo:Bool):Int {
+		var c = Global.fgetc(Const.STDIN);
+		if (c == false) {
+			return 0;
+		} else {
+			if (echo)
+				Global.echo(c);
+			return Global.ord(c);
+		}
 	}
-
 }
diff --git a/std/php/_std/Type.hx b/std/php/_std/Type.hx
index a516c903fa2d31a7621190d06777f4ecdc3f8274..e1781aa2fc5ea2ed43f1ae79372b633256ff4440 100644
--- a/std/php/_std/Type.hx
+++ b/std/php/_std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,6 +20,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+import php.*;
+import php.reflection.*;
+import haxe.extern.EitherType;
+
+using php.Global;
+
 enum ValueType {
 	TNull;
 	TInt;
@@ -27,241 +33,337 @@ enum ValueType {
 	TBool;
 	TObject;
 	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
 	TUnknown;
 }
 
 @:coreApi class Type {
-
-	public static function getClass<T>( o : T ) : Class<T> untyped {
-		if(o == null) return null;
-		untyped if(__call__("is_array",  o)) {
-			if(__call__("count", o) == 2 && __call__("is_callable", o)) return null;
-			return __call__("_hx_ttype", 'Array');
-		}
-		if(untyped __call__("is_string", o)) {
-			if(__call__("_hx_is_lambda", untyped o)) return null;
-			return __call__("_hx_ttype", 'String');
-		}
-		if(!untyped __call__("is_object", o)) {
+	public static function getClass<T>(o:T):Class<T> {
+		if (Global.is_object(o) && !Boot.isClass(o) && !Boot.isEnumValue(o)) {
+			var cls = Boot.getClass(Global.get_class(cast o));
+			return (cls == Boot.getHxAnon() ? null : cast cls);
+		} else if (Global.is_string(o)) {
+			return cast String;
+		} else {
 			return null;
 		}
-		var c = __call__("get_class", o);
-		if(c == false || c == '_hx_anonymous' || __call__("is_subclass_of", c, "enum"))
-			return null;
-		else
-			return __call__("_hx_ttype", c);
 	}
 
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic> untyped {
-		if(!__php__("$o instanceof Enum"))
+	public static function getEnum(o:EnumValue):Enum<Dynamic> {
+		if (o == null)
 			return null;
-		else
-			return __php__("_hx_ttype(get_class($o))");
+		return cast Boot.getClass(Global.get_class(cast o));
 	}
 
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic> {
-		var s = untyped __call__("get_parent_class", c.__tname__);
-		if(s == false)
+	public static function getSuperClass(c:Class<Dynamic>):Class<Dynamic> {
+		if (c == null)
+			return null;
+		var parentClass = Global.get_parent_class((cast c).phpClassName);
+		if (!parentClass)
 			return null;
-		else
-			return untyped __call__("_hx_ttype", s);
+		return cast Boot.getClass(parentClass);
 	}
 
-	public static function getClassName( c : Class<Dynamic> ) : String {
-		if( c == null )
+	public static function getClassName(c:Class<Dynamic>):String {
+		if (c == null)
 			return null;
-		return untyped c.__qname__;
+		return Boot.getHaxeName(cast c);
 	}
 
-	public static function getEnumName( e : Enum<Dynamic> ) : String {
-		return untyped e.__qname__;
+	public static function getEnumName(e:Enum<Dynamic>):String {
+		return getClassName(cast e);
 	}
 
-	public static function resolveClass( name : String ) : Class<Dynamic> untyped {
-		var c = untyped __call__("_hx_qtype", name);
-		if(__php__("$c instanceof _hx_class || $c instanceof _hx_interface"))
-			return c;
-		else
+	public static function resolveClass(name:String):Class<Dynamic> {
+		if (name == null)
+			return null;
+		switch (name) {
+			case 'Dynamic':
+				return cast Dynamic;
+			case 'Int':
+				return cast Int;
+			case 'Float':
+				return cast Float;
+			case 'Bool':
+				return cast Bool;
+			case 'String':
+				return String;
+			case 'Class':
+				return cast Class;
+			case 'Enum':
+				return cast Enum;
+		}
+
+		var phpClass = Boot.getPhpName(name);
+		if (!Global.class_exists(phpClass) && !Global.interface_exists(phpClass))
 			return null;
+
+		var hxClass = Boot.getClass(phpClass);
+
+		return cast hxClass;
 	}
 
-	public static function resolveEnum( name : String ) : Enum<Dynamic> {
-		var e = untyped __call__("_hx_qtype", name);
-		if(untyped __php__("$e instanceof _hx_enum"))
-			return e;
-		else
+	public static function resolveEnum(name:String):Enum<Dynamic> {
+		if (name == null)
 			return null;
+		if (name == 'Bool')
+			return cast Bool;
+
+		var phpClass = Boot.getPhpName(name);
+		if (!Global.class_exists(phpClass))
+			return null;
+
+		var hxClass = Boot.getClass(phpClass);
+
+		return cast hxClass;
 	}
 
-	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T untyped {
-		if(cl.__qname__ == 'Array') return [];
-		if(cl.__qname__ == 'String') return args[0];
-		var c = cl.__rfl__();
-		if(c == null) return null;
-		return __php__("$inst = $c->getConstructor() ? $c->newInstanceArgs($args->a) : $c->newInstanceArgs()");
+	public static function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T {
+		if (String == cast cl)
+			return args[0];
+
+		var nativeArgs:NativeArray = @:privateAccess args.arr;
+		return Syntax.construct(Syntax.nativeClassName(cl), Syntax.splat(nativeArgs));
 	}
 
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T untyped {
-		if(cl.__qname__ == 'Array') return [];
-		if(cl.__qname__ == 'String') return '';
-		try {
-			__php__("php_Boot::$skip_constructor = true");
-			var rfl = cl.__rfl__();
-			if(rfl == null) return null;
-			var m = __php__("$rfl->getConstructor()");
-			var nargs : Int = m.getNumberOfRequiredParameters();
-			var i;
-			if(nargs > 0) {
-				var args = __call__("array_fill", 0, m.getNumberOfRequiredParameters(), null);
-				i = __php__("$rfl->newInstanceArgs($args)");
-			} else {
-				i = __php__("$rfl->newInstanceArgs(array())");
-			}
-			__php__("php_Boot::$skip_constructor = false");
-			return i;
-		} catch( e : Dynamic ) {
-			__php__("php_Boot::$skip_constructor = false");
-			throw "Unable to instantiate " + Std.string(cl);
-		}
-		return null;
+	public static function createEmptyInstance<T>(cl:Class<T>):T {
+		if (String == cast cl)
+			return cast '';
+		if (Array == cast cl)
+			return cast [];
+
+		var reflection = new ReflectionClass(Syntax.nativeClassName(cl));
+		return reflection.newInstanceWithoutConstructor();
 	}
 
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		var f:Dynamic = Reflect.field(e,constr);
-		if( f == null ) throw "No such constructor "+constr;
-		if( Reflect.isFunction(f) ) {
-			if( params == null ) throw "Constructor "+constr+" need parameters";
-			return Reflect.callMethod(e,f,params);
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T {
+		if (e == null || constr == null)
+			return null;
+
+		var phpName = Syntax.nativeClassName(e);
+
+		if (!Global.in_array(constr, Syntax.staticCall(phpName, "__hx__list"))) {
+			throw 'No such constructor $constr';
+		}
+
+		var paramsCounts:NativeAssocArray<Int> = Syntax.staticCall(phpName, "__hx__paramsCount");
+		if ((params == null && paramsCounts[constr] != 0) || (params != null && params.length != paramsCounts[constr])) {
+			throw 'Provided parameters count does not match expected parameters count';
+		}
+
+		if (params == null) {
+			return Syntax.staticCall(phpName, constr);
+		} else {
+			var nativeArgs:NativeArray = @:privateAccess params.arr;
+			return Syntax.staticCall(phpName, constr, Syntax.splat(nativeArgs));
 		}
-		if( params != null && params.length != 0 )
-			throw "Constructor "+constr+" does not need parameters";
-		return f;
 	}
 
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
-		var c = Type.getEnumConstructs(e)[index];
-		if( c == null ) throw index+" is not a valid enum constructor index";
-		return createEnum(e,c,params);
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T {
+		if (e == null || index == null)
+			return null;
+
+		var phpName = Syntax.nativeClassName(e);
+
+		var constructors:NativeIndexedArray<String> = Syntax.staticCall(phpName, "__hx__list");
+		if (index < 0 || index >= Global.count(constructors)) {
+			throw '$index is not a valid enum constructor index';
+		}
+
+		var constr = constructors[index];
+		var paramsCounts:NativeAssocArray<Int> = Syntax.staticCall(phpName, "__hx__paramsCount");
+		if ((params == null && paramsCounts[constr] != 0) || (params != null && params.length != paramsCounts[constr])) {
+			throw 'Provided parameters count does not match expected parameters count';
+		}
+
+		if (params == null) {
+			return Syntax.staticCall(phpName, constr);
+		} else {
+			var nativeArgs:NativeArray = @:privateAccess params.arr;
+			return Syntax.staticCall(phpName, constr, Syntax.splat(nativeArgs));
+		}
 	}
 
-	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String> {
-		if(untyped c.__qname__ == 'String') return ['substr', 'charAt', 'charCodeAt', 'indexOf', 'lastIndexOf', 'split', 'toLowerCase', 'toUpperCase', 'toString', 'length'];
-		if(untyped c.__qname__ == 'Array') return  ['push', 'concat', 'join', 'pop', 'reverse', 'shift', 'slice', 'sort', 'splice', 'toString', 'copy', 'unshift', 'insert', 'remove', 'iterator', 'length'];
-		untyped __php__("
-		$rfl = $c->__rfl__();
-		if($rfl === null) return new _hx_array(array());
-		$r = array();
-		$internals = array('__construct', '__call', '__get', '__set', '__isset', '__unset', '__toString');
-		$ms = $rfl->getMethods();
-		while(list(, $m) = each($ms)) {
-			$n = $m->getName();
-			if(!$m->isStatic() && !in_array($n, $internals)) $r[] = $n;
+	public static function getInstanceFields(c:Class<Dynamic>):Array<String> {
+		if (c == null)
+			return null;
+		if (c == String) {
+			return [
+				'substr', 'charAt', 'charCodeAt', 'indexOf', 'lastIndexOf', 'split', 'toLowerCase', 'toUpperCase', 'toString', 'length'
+			];
+		}
+
+		var reflection = new ReflectionClass(Syntax.nativeClassName(c));
+
+		var methods = new NativeArray();
+		for (method in reflection.getMethods()) {
+			if (!method.isStatic()) {
+				var name = method.getName();
+				if (!isServiceFieldName(name)) {
+					methods.array_push(name);
+				}
+			}
+		}
+
+		var properties = new NativeArray();
+		for (property in reflection.getProperties()) {
+			if (!property.isStatic()) {
+				var name = property.getName();
+				if (!isServiceFieldName(name)) {
+					properties.array_push(name);
+				}
+			}
 		}
-		$ps = $rfl->getProperties();
-		while(list(, $p) = each($ps))
-			if(!$p->isStatic() && ($name = $p->getName()) !== '__dynamics') $r[] = $name;
-		");
-		return untyped __php__("new _hx_array(array_values(array_unique($r)))");
+		properties = Global.array_diff(properties, methods);
+
+		var fields = Global.array_merge(properties, methods);
+
+		return @:privateAccess Array.wrap(fields);
 	}
 
-	public static function getClassFields( c : Class<Dynamic> ) : Array<String> {
-		if(untyped c.__qname__ == 'String') return ['fromCharCode'];
-		if(untyped c.__qname__ == 'Array')  return [];
-		untyped __php__("
-		$rfl = $c->__rfl__();
-		if($rfl === null) return new _hx_array(array());
-		$ms = $rfl->getMethods(ReflectionMethod::IS_STATIC);
-		$r = array();
-		while(list(, $m) = each($ms)) {
-			$cls = $m->getDeclaringClass();
-			if($cls->getName() == $c->__tname__) $r[] = $m->getName();
+	public static function getClassFields(c:Class<Dynamic>):Array<String> {
+		if (c == null)
+			return null;
+		if (c == String)
+			return ['fromCharCode'];
+
+		var phpName = Syntax.nativeClassName(c);
+
+		var reflection = new ReflectionClass(phpName);
+
+		var methods = new NativeArray();
+		for (m in reflection.getMethods(ReflectionMethod.IS_STATIC)) {
+			var name = m.getName();
+			if (!isServiceFieldName(name) && phpName == m.getDeclaringClass().getName()) {
+				methods.array_push(name);
+			}
 		}
-		$ps = $rfl->getProperties(ReflectionMethod::IS_STATIC);
-		while(list(, $p) = each($ps)) {
-			$cls = $p->getDeclaringClass();
-			if($cls->getName() == $c->__tname__ && ($name = $p->getName()) !== '__properties__') $r[] = $name;
+
+		var properties = new NativeArray();
+		for (p in reflection.getProperties(ReflectionProperty.IS_STATIC)) {
+			var name = p.getName();
+			if (!isServiceFieldName(name) && phpName == p.getDeclaringClass().getName()) {
+				properties.array_push(name);
+			}
 		}
-		");
-		return untyped __php__("new _hx_array(array_values(array_unique($r)))");
+		properties = Global.array_diff(properties, methods);
+		var fields = Global.array_merge(properties, methods);
+
+		return @:privateAccess Array.wrap(fields);
 	}
 
-	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> untyped {
-		if (__php__("$e->__tname__ == 'Bool'")) return ['true', 'false'];
-		if (__php__("$e->__tname__ == 'Void'")) return [];
-		return __call__("new _hx_array", e.__constructors);
+	public static function getEnumConstructs(e:Enum<Dynamic>):Array<String> {
+		if (e == null)
+			return null;
+		return @:privateAccess Array.wrap(untyped e.__hx__list());
 	}
 
-	public static function typeof( v : Dynamic ) : ValueType untyped {
-		if(v == null) return TNull;
-		if(__call__("is_array", v)) {
-			if(__call__("is_callable", v)) return TFunction;
-			return TClass(Array);
-		}
-		if(__call__("is_string", v)) {
-			if(__call__("_hx_is_lambda", v)) return TFunction;
-			return TClass(String);
+	public static function typeof(v:Dynamic):ValueType {
+		if (v == null)
+			return TNull;
+
+		if (v.is_object()) {
+			if (Reflect.isFunction(v))
+				return TFunction;
+			if (Std.is(v, StdClass))
+				return TObject;
+			if (Boot.isClass(v))
+				return TObject;
+
+			var hxClass = Boot.getClass(Global.get_class(v));
+			if (Boot.isEnumValue(v))
+				return TEnum(cast hxClass);
+			return TClass(cast hxClass);
 		}
-		if(__call__("is_bool", v)) return TBool;
-		if(__call__("is_int", v)) return TInt;
-		if(__call__("is_float", v)) return TFloat;
-		if(__php__("$v instanceof _hx_anonymous"))  return TObject;
-		if(__php__("$v instanceof _hx_enum"))  return TObject;
-		if(__php__("$v instanceof _hx_class"))  return TObject;
 
-		var c = __php__("_hx_ttype(get_class($v))");
+		if (v.is_bool())
+			return TBool;
+		if (v.is_int())
+			return TInt;
+		if (v.is_float())
+			return TFloat;
+		if (v.is_string())
+			return TClass(String);
 
-		if(__php__("$c instanceof _hx_enum"))  return TEnum(cast c);
-		if(__php__("$c instanceof _hx_class")) return TClass(cast c);
 		return TUnknown;
 	}
 
-	public static function enumEq<T>( a : T, b : T ) : Bool untyped {
-		if( a == b )
+	public static function enumEq<T:EnumValue>(a:T, b:T):Bool {
+		if (a == b)
 			return true;
+		if (a == null || b == null)
+			return false;
+
 		try {
-			if( a.index != b.index )
+			if (Global.get_class(cast a) != Global.get_class(cast b))
+				return false;
+			if (enumIndex(a) != enumIndex(b))
 				return false;
-			for( i in 0...__call__("count", a.params))
-				if(getEnum(untyped __php__("$a->params[$i]")) != null) {
-					if(!untyped enumEq(__php__("$a->params[$i]"),__php__("$b->params[$i]")))
+
+			var aParams:NativeIndexedArray<Dynamic> = untyped a.params;
+			var bParams:NativeIndexedArray<Dynamic> = untyped b.params;
+			for (i in 0...Global.count(aParams)) {
+				// enums
+				if (Boot.isEnumValue(aParams[i])) {
+					if (!enumEq(aParams[i], bParams[i])) {
 						return false;
-				} else {
-					if(!untyped __call__("_hx_equal", __php__("$a->params[$i]"),__php__("$b->params[$i]")))
+					}
+					continue;
+				}
+				// functions
+				if (Reflect.isFunction(aParams[i])) {
+					if (!Reflect.compareMethods(aParams[i], bParams[i])) {
 						return false;
+					}
+					continue;
+				}
+				// everything else
+				if (aParams[i] != bParams[i]) {
+					return false;
 				}
-		} catch( e : Dynamic ) {
+			}
+
+			return true;
+		} catch (e:Dynamic) {
 			return false;
 		}
-		return true;
 	}
 
-	public static function enumConstructor( e : EnumValue ) : String {
+	public static function enumConstructor(e:EnumValue):String {
 		return untyped e.tag;
 	}
 
-	public static function enumParameters( e : EnumValue ) : Array<Dynamic> untyped {
-		if(e.params == null)
-			return [];
-		else
-			return __php__("new _hx_array($e->params)");
+	public inline static function enumParameters(e:EnumValue):Array<Dynamic> {
+		return @:privateAccess Array.wrap(untyped e.params);
 	}
 
-	public inline static function enumIndex( e : EnumValue ) : Int {
+	public inline static function enumIndex(e:EnumValue):Int {
 		return untyped e.index;
 	}
 
-	public static function allEnums<T>( e : Enum<T> ) : Array<T> {
-		var all = [];
-		for( c in getEnumConstructs(e) ) {
-			var v = Reflect.field(e,c);
-			if( !Reflect.isFunction(v) )
-				all.push(v);
+	public static function allEnums<T>(e:Enum<T>):Array<T> {
+		if (e == null)
+			return null;
+
+		var phpName = Syntax.nativeClassName(e);
+
+		var result = [];
+
+		for (name in getEnumConstructs(e)) {
+			var reflection = new ReflectionMethod(phpName, name);
+			if (reflection.getNumberOfParameters() == 0) {
+				result.push(reflection.invoke(null));
+			}
 		}
-		return all;
-	}
 
+		return result;
+	}
 
+	/**
+		check if specified `name` is a special field name generated by compiler.
+	**/
+	static inline function isServiceFieldName(name:String):Bool {
+		return (name == '__construct' || name.indexOf('__hx_') == 0);
+	}
 }
-
diff --git a/std/php7/_std/haxe/CallStack.hx b/std/php/_std/haxe/CallStack.hx
similarity index 50%
rename from std/php7/_std/haxe/CallStack.hx
rename to std/php/_std/haxe/CallStack.hx
index 2504732dc5a6c4adf8e13dc2d79abd93fe1f1a34..7c47fe9b5f3ca51f629ee2b3000c41788baaa162 100644
--- a/std/php7/_std/haxe/CallStack.hx
+++ b/std/php/_std/haxe/CallStack.hx
@@ -1,18 +1,37 @@
+/*
+ * Copyright (C)2005-2019 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 haxe;
 
 import php.*;
 
 private typedef NativeTrace = NativeIndexedArray<NativeAssocArray<Dynamic>>;
 
-/**
-	Elements return by `CallStack` methods.
-**/
 enum StackItem {
 	CFunction;
-	Module( m : String );
-	FilePos( s : Null<StackItem>, file : String, line : Int );
-	Method( classname : String, method : String );
-	LocalFunction( ?v : Int );
+	Module(m:String);
+	FilePos(s:Null<StackItem>, file:String, line:Int, ?column:Null<Int>);
+	Method(classname:Null<String>, method:String);
+	LocalFunction(?v:Int);
 }
 
 class CallStack {
@@ -20,58 +39,48 @@ class CallStack {
 		If defined this function will be used to transform call stack entries.
 		@param String - generated php file name.
 		@param Int - Line number in generated file.
-	*/
-	static public var mapPosition : String->Int->Null<{?source:String, ?originalLine:Int}>;
+	**/
+	static public var mapPosition:String->Int->Null<{?source:String, ?originalLine:Int}>;
 
 	@:ifFeature("haxe.CallStack.exceptionStack")
-	static var lastExceptionTrace : NativeTrace;
+	static var lastExceptionTrace:NativeTrace;
 
-	/**
-		Return the call stack elements, or an empty array if not available.
-	**/
-	public static function callStack() : Array<StackItem> {
+	public static function callStack():Array<StackItem> {
 		return makeStack(Global.debug_backtrace(Const.DEBUG_BACKTRACE_IGNORE_ARGS));
 	}
 
-	/**
-		Return the exception stack : this is the stack elements between
-		the place the last exception was thrown and the place it was
-		caught, or an empty array if not available.
-	**/
-	public static function exceptionStack() : Array<StackItem> {
+	public static function exceptionStack():Array<StackItem> {
 		return makeStack(lastExceptionTrace == null ? new NativeIndexedArray() : lastExceptionTrace);
 	}
 
-	/**
-		Returns a representation of the stack as a printable string.
-	**/
-	public static function toString( stack : Array<StackItem> ) {
+	public static function toString(stack:Array<StackItem>) {
 		var b = new StringBuf();
-		for( s in stack ) {
+		for (s in stack) {
 			b.add("\nCalled from ");
-			itemToString(b,s);
+			itemToString(b, s);
 		}
 		return b.toString();
 	}
 
-	static function itemToString( b:StringBuf, s ) {
-		switch( s ) {
+	static function itemToString(b:StringBuf, s) {
+		switch (s) {
 			case CFunction:
 				b.add("a C function");
 			case Module(m):
 				b.add("module ");
 				b.add(m);
-			case FilePos(s,file,line):
-				if( s != null ) {
-					itemToString(b,s);
+			case FilePos(s, file, line, _):
+				if (s != null) {
+					itemToString(b, s);
 					b.add(" (");
 				}
 				b.add(file);
 				b.add(" line ");
 				b.add(line);
-				if( s != null ) b.add(")");
-			case Method(cname,meth):
-				b.add(cname);
+				if (s != null)
+					b.add(")");
+			case Method(cname, meth):
+				b.add(cname == null ? "<unknown>" : cname);
 				b.add(".");
 				b.add(meth);
 			case LocalFunction(n):
@@ -80,17 +89,17 @@ class CallStack {
 	}
 
 	@:ifFeature("haxe.CallStack.exceptionStack")
-	static function saveExceptionTrace( e:Throwable ) : Void {
+	static function saveExceptionTrace(e:Throwable):Void {
 		lastExceptionTrace = e.getTrace();
 
-		//Reduce exception stack to the place where exception was caught
+		// Reduce exception stack to the place where exception was caught
 		var currentTrace = Global.debug_backtrace(Const.DEBUG_BACKTRACE_IGNORE_ARGS);
 		var count = Global.count(currentTrace);
 
 		for (i in -(count - 1)...1) {
 			var exceptionEntry:NativeAssocArray<Dynamic> = Global.end(lastExceptionTrace);
 
-			if(!Global.isset(exceptionEntry['file']) || !Global.isset(currentTrace[-i]['file'])) {
+			if (!Global.isset(exceptionEntry['file']) || !Global.isset(currentTrace[-i]['file'])) {
 				Global.array_pop(lastExceptionTrace);
 			} else if (currentTrace[-i]['file'] == exceptionEntry['file'] && currentTrace[-i]['line'] == exceptionEntry['line']) {
 				Global.array_pop(lastExceptionTrace);
@@ -99,7 +108,7 @@ class CallStack {
 			}
 		}
 
-		//Remove arguments from trace to avoid blocking some objects from GC
+		// Remove arguments from trace to avoid blocking some objects from GC
 		var count = Global.count(lastExceptionTrace);
 		for (i in 0...count) {
 			lastExceptionTrace[i]['args'] = new NativeArray();
@@ -114,7 +123,7 @@ class CallStack {
 		Global.array_unshift(lastExceptionTrace, thrownAt);
 	}
 
-	static function makeStack (native:NativeTrace) : Array<StackItem> {
+	static function makeStack(native:NativeTrace):Array<StackItem> {
 		var result = [];
 		var count = Global.count(native);
 
@@ -125,12 +134,14 @@ class CallStack {
 			if (i + 1 < count) {
 				var next = native[i + 1];
 
-				if(!Global.isset(next['function'])) next['function'] = '';
-				if(!Global.isset(next['class'])) next['class'] = '';
+				if (!Global.isset(next['function']))
+					next['function'] = '';
+				if (!Global.isset(next['class']))
+					next['class'] = '';
 
-				if ((next['function']:String).indexOf('{closure}') >= 0) {
+				if ((next['function'] : String).indexOf('{closure}') >= 0) {
 					item = LocalFunction();
-				} else if ((next['class']:String).length > 0 && (next['function']:String).length > 0) {
+				} else if (Global.strlen(next['class']) > 0 && Global.strlen(next['function']) > 0) {
 					var cls = Boot.getClassName(next['class']);
 					item = Method(cls, next['function']);
 				}
@@ -151,5 +162,4 @@ class CallStack {
 
 		return result;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/php/_std/haxe/Json.hx b/std/php/_std/haxe/Json.hx
index a4a0c9e3ba4cf0d1e2d20ce8fc982c31eb19c080..7a30854222e9fc8161f54b038c918b27997ec7e3 100644
--- a/std/php/_std/haxe/Json.hx
+++ b/std/php/_std/haxe/Json.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,84 +19,96 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
+import php.*;
+import haxe.format.JsonPrinter;
+
 @:coreApi
 class Json {
-
-	public static inline function parse( text : String ) : Dynamic {
-		#if !haxeJSON
-		return phpJsonDecode(text);
-		#else
+	public static inline function parse(text:String):Dynamic {
+		#if haxeJSON
 		return haxe.format.JsonParser.parse(text);
+		#else
+		return phpJsonDecode(text);
 		#end
 	}
 
-	public static inline function stringify( value : Dynamic, ?replacer:Dynamic -> Dynamic -> Dynamic, ?space:String ) : String {
-		#if !haxeJSON
-		return phpJsonEncode(value, replacer, space);
+	public static inline function stringify(value:Dynamic, ?replacer:(key:Dynamic, value:Dynamic) -> Dynamic, ?space:String):String {
+		#if haxeJSON
+		return JsonPrinter.print(value, replacer, space);
 		#else
-		return haxe.format.JsonPrinter.print(value, replacer, space);
+		return phpJsonEncode(value, replacer, space);
 		#end
 	}
 
 	static function phpJsonDecode(json:String):Dynamic {
-		var val = untyped __call__("json_decode", json);
-		if (val == null && untyped __php__("json_last_error() != JSON_ERROR_NONE")) {
-			throw untyped __call__("json_last_error_msg");
+		var value = Global.json_decode(json);
+		if (value == null && Global.json_last_error() != Const.JSON_ERROR_NONE) {
+			throw Global.json_last_error_msg();
 		}
-		return convertAfterDecode(val);
+		return convertAfterDecode(value);
 	}
 
-	static function convertAfterDecode(val:Dynamic):Dynamic {
-		var arr:php.NativeArray;
-		if (untyped __call__("is_object", val)) {
-			arr = phpMapArray(php.Lib.associativeArrayOfObject(val), convertAfterDecode);
-			return untyped __call__("_hx_anonymous", arr);
+	static function convertAfterDecode(value:Dynamic):Dynamic {
+		if (Global.is_object(value)) {
+			var result = new NativeAssocArray();
+			var data = Syntax.array(value);
+			Syntax.foreach(data, function(fieldName:String, fieldValue:Dynamic) {
+				result[fieldName] = convertAfterDecode(fieldValue);
+			});
+
+			return Boot.createAnon(result);
 		}
-		else if (untyped __call__("is_array", val)) {
-			arr = phpMapArray(val, convertAfterDecode);
-			return php.Lib.toHaxeArray(arr);
+
+		if (Global.is_array(value)) {
+			var result = new NativeIndexedArray();
+			Syntax.foreach(value, function(index:Int, item:Dynamic) {
+				result[index] = convertAfterDecode(item);
+			});
+
+			return @:privateAccess Array.wrap(result);
 		}
-		else
-			return val;
-	}
 
-	static function phpJsonEncode(val:Dynamic, ?replacer:Dynamic -> Dynamic -> Dynamic, ?space:String):String {
-		if(null != replacer || null != space)
-			return haxe.format.JsonPrinter.print(val, replacer, space);
-		var json = untyped __call__("json_encode", convertBeforeEncode(val));
-		if (untyped __physeq__(json, false))
-			return throw "invalid json";
-		else
-			return json;
+		return value;
 	}
 
-	static function convertBeforeEncode(val:Dynamic):Dynamic {
-		var arr:php.NativeArray;
-		if (untyped __call__("is_object", val)) {
-			switch (untyped __call__("get_class", val)) {
-				case "_hx_anonymous", "stdClass" :
-					arr = php.Lib.associativeArrayOfObject(val);
-					if(untyped __php__('!{0}', arr)) return {};
-				case "_hx_array" : arr = php.Lib.toPhpArray(val);
-				case "Date" : return Std.string(val); //.split(" ").join("T"); //better with "T"?
-				case "HList" : arr = php.Lib.toPhpArray(Lambda.array(val)); //convert List to array?
-				case "_hx_enum" : return Type.enumIndex(val);
-				case "StringMap", "IntMap" : arr = php.Lib.associativeArrayOfHash(val);
-				default : arr = php.Lib.associativeArrayOfObject(val);
-			}
+	static function phpJsonEncode(value:Dynamic, ?replacer:(key:Dynamic, value:Dynamic) -> Dynamic, ?space:String):String {
+		if (null != replacer || null != space) {
+			return JsonPrinter.print(value, replacer, space);
 		}
-		else if (untyped __call__("is_array", val)) arr = val;
-		else {
-			if (untyped __call__("is_float",val) && !__call__("is_finite",val)) val = null;
-			return val;
+
+		var json = Global.json_encode(convertBeforeEncode(value));
+		if (Global.json_last_error() != Const.JSON_ERROR_NONE) {
+			return throw Global.json_last_error_msg();
 		}
-		return phpMapArray(arr, convertBeforeEncode);
+		return json;
 	}
 
-	inline static function phpMapArray(arr:php.NativeArray, func:Dynamic->Dynamic):php.NativeArray {
-		return untyped __call__("array_map", func, arr);
-	}
+	static function convertBeforeEncode(value:Dynamic):Dynamic {
+		if (Std.is(value, Array)) {
+			var result = new NativeIndexedArray();
+			Syntax.foreach(value.arr, function(index:Int, item:Dynamic) {
+				result[index] = convertBeforeEncode(item);
+			});
+
+			return result;
+		}
+
+		if (Global.is_object(value)) {
+			var result = {};
+			Syntax.foreach(value, function(fieldName:String, fieldValue:Dynamic) {
+				Syntax.setField(result, fieldName, convertBeforeEncode(fieldValue));
+			});
 
-}
\ No newline at end of file
+			return result;
+		}
+
+		if (Global.is_float(value) && !Global.is_finite(value)) {
+			return null;
+		}
+
+		return value;
+	}
+}
diff --git a/std/php/_std/haxe/Resource.hx b/std/php/_std/haxe/Resource.hx
index afd5d38bd5b1f667c8f6e1146a13bebc6005ac96..c3664da452ff80ff91dc4fee2396204b5591a4eb 100644
--- a/std/php/_std/haxe/Resource.hx
+++ b/std/php/_std/haxe/Resource.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,36 +19,46 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
+import php.*;
 import haxe.io.Bytes;
 import haxe.crypto.Base64;
 
 @:coreApi
 class Resource {
-
-	static function cleanName(name : String) : String {
+	static function cleanName(name:String):String {
 		return ~/[\\\/:?"*<>|]/.replace(name, '_');
 	}
 
-	static function getDir() : String {
-		return untyped __call__('dirname', __php__('__FILE__'))+"/../../res";
+	static function getDir():String {
+		var pathToRoot = '/../..';
+		#if php_prefix
+		pathToRoot += '/..';
+		for (i in 0...Global.substr_count(Boot.getPrefix(), '\\')) {
+			pathToRoot += '/..';
+		}
+		#end
+		return Global.dirname(Const.__FILE__) + pathToRoot + "/res";
 	}
 
 	@:access(haxe.io.Path.escape)
-	static function getPath(name : String) : String {
-		return getDir()+'/'+haxe.io.Path.escape(name);
+	static function getPath(name:String):String {
+		return getDir() + '/' + haxe.io.Path.escape(name);
 	}
 
 	@:access(haxe.io.Path.unescape)
-	public static function listNames() : Array<String> {
+	public static function listNames():Array<String> {
 		var a = sys.FileSystem.readDirectory(getDir());
-		if(a[0] == '.') a.shift();
-		if(a[0] == '..') a.shift();
+		if (a[0] == '.')
+			a.shift();
+		if (a[0] == '..')
+			a.shift();
 		return a.map(function(s) return haxe.io.Path.unescape(s));
 	}
 
-	public static function getString( name : String ) : String {
+	public static function getString(name:String):String {
 		var path = getPath(name);
 		return if (!sys.FileSystem.exists(path))
 			null;
@@ -56,12 +66,11 @@ class Resource {
 			sys.io.File.getContent(path);
 	}
 
-	public static function getBytes( name : String ) : haxe.io.Bytes {
+	public static function getBytes(name:String):haxe.io.Bytes {
 		var path = getPath(name);
 		return if (!sys.FileSystem.exists(path))
 			null;
 		else
 			sys.io.File.getBytes(path);
 	}
-
 }
diff --git a/std/php/_std/haxe/Utf8.hx b/std/php/_std/haxe/Utf8.hx
index 24881b7a8e8e7eb3a1f6c7edf50e8d65021c38ae..f832e4d2038aa90bc0f05b5f42234f3ca2112699 100644
--- a/std/php/_std/haxe/Utf8.hx
+++ b/std/php/_std/haxe/Utf8.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,67 +19,71 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
+import php.Global;
+
 @:coreApi
+@:deprecated('haxe.Utf8 is deprecated. Use UnicodeString instead.')
 class Utf8 {
+	var __b:String;
 
-	var __b : String;
-
-	public function new( ?size : Int ) : Void {
+	public function new(?size:Int):Void {
 		__b = '';
 	}
 
-	public function addChar( c : Int ) : Void {
+	public function addChar(c:Int):Void {
 		__b += uchr(c);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		return __b;
 	}
 
-	public static function encode( s : String ) : String {
-		return untyped __call__("utf8_encode", s);
+	public static function encode(s:String):String {
+		return Global.utf8_encode(s);
 	}
 
-	public static function decode( s : String ) : String {
-		return untyped __call__("utf8_decode", s);
+	public static function decode(s:String):String {
+		return Global.utf8_decode(s);
 	}
 
-	public static function iter(s : String, chars : Int -> Void ) : Void {
+	public static function iter(s:String, chars:Int->Void):Void {
 		var len = length(s);
-		for(i in 0...len)
+		for (i in 0...len) {
 			chars(charCodeAt(s, i));
+		}
 	}
 
-	public static function charCodeAt( s : String, index : Int ) : Int {
+	public static function charCodeAt(s:String, index:Int):Int {
 		return uord(sub(s, index, 1));
 	}
 
-	static function uchr(i : Int) : String {
-		return untyped __php__("mb_convert_encoding(pack('N',$i), 'UTF-8', 'UCS-4BE')");
+	static function uchr(i:Int):String {
+		return Global.mb_convert_encoding(Global.pack('N', i), 'UTF-8', 'UCS-4BE');
 	}
 
-	static function uord(s : String) : Int untyped {
-		var c : Array<Int> = untyped __php__("unpack('N', mb_convert_encoding($s, 'UCS-4BE', 'UTF-8'))");
+	static function uord(s:String):Int {
+		var c = Global.unpack('N', Global.mb_convert_encoding(s, 'UCS-4BE', 'UTF-8'));
 		return c[1];
 	}
 
-	public static function validate( s : String ) : Bool {
-		return untyped __call__("mb_check_encoding", s, enc);
+	public static function validate(s:String):Bool {
+		return Global.mb_check_encoding(s, enc);
 	}
 
-	public static function length( s : String ) : Int {
-		return untyped __call__("mb_strlen", s, enc);
+	public static function length(s:String):Int {
+		return Global.mb_strlen(s, enc);
 	}
 
-	public static function compare( a : String, b : String ) : Int {
-		return untyped __call__("strcmp", a, b);
+	public static function compare(a:String, b:String):Int {
+		return Global.strcmp(a, b);
 	}
 
-	public static function sub( s : String, pos : Int, len : Int ) : String {
-		return untyped __call__("mb_substr", s, pos, len, enc);
+	public static function sub(s:String, pos:Int, len:Int):String {
+		return Global.mb_substr(s, pos, len, enc);
 	}
 
 	private static inline var enc = "UTF-8";
-}
\ No newline at end of file
+}
diff --git a/std/php/_std/haxe/crypto/Base64.hx b/std/php/_std/haxe/crypto/Base64.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dbc42f2733163f92334f6204ca23e0f844098b42
--- /dev/null
+++ b/std/php/_std/haxe/crypto/Base64.hx
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.crypto;
+
+import php.Global.*;
+import php.Syntax;
+import php.NativeArray;
+import haxe.io.Bytes;
+
+class Base64 {
+	public static var CHARS(default, null) = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	public static var BYTES(default, null) = haxe.io.Bytes.ofString(CHARS);
+
+	public static var URL_CHARS(default, null) = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+	public static var URL_BYTES(default, null) = haxe.io.Bytes.ofString(URL_CHARS);
+
+	static final NORMAL_62_63:NativeArray = Syntax.arrayDecl('+', '/');
+	static final URL_62_63:NativeArray = Syntax.arrayDecl('-', '_');
+
+	public static inline function encode(bytes:Bytes, complement = true):String {
+		var result = base64_encode(bytes.toString());
+		return (complement ? result : rtrim(result, "="));
+	}
+
+	public static inline function decode(str:String, complement = true):Bytes {
+		if (!complement) {
+			switch (strlen(str) % 3) {
+				case 1:
+					str += "==";
+				case 2:
+					str += "=";
+				default:
+			}
+		}
+		return Bytes.ofString(base64_decode(str, true));
+	}
+
+	public static inline function urlEncode(bytes:Bytes, complement = true):String {
+		var result = str_replace(NORMAL_62_63, URL_62_63, base64_encode(bytes.toString()));
+		return (complement ? result : rtrim(result, "="));
+	}
+
+	public static inline function urlDecode(str:String, complement = true):Bytes {
+		if (!complement) {
+			switch (strlen(str) % 3) {
+				case 1:
+					str += "==";
+				case 2:
+					str += "=";
+				default:
+			}
+		}
+		return Bytes.ofString(base64_decode(str_replace(URL_62_63, NORMAL_62_63, str), true));
+	}
+}
diff --git a/std/php7/_std/haxe/crypto/Md5.hx b/std/php/_std/haxe/crypto/Md5.hx
similarity index 81%
rename from std/php7/_std/haxe/crypto/Md5.hx
rename to std/php/_std/haxe/crypto/Md5.hx
index 7741261bf17f21a8067172aaf70b22f1dd491589..709d06e7093c092ccab1913989fdf829cfb52aec 100644
--- a/std/php7/_std/haxe/crypto/Md5.hx
+++ b/std/php/_std/haxe/crypto/Md5.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 import php.Global;
 import haxe.io.Bytes;
 
-/**
-	Creates a MD5 of a String.
-**/
 class Md5 {
-
-	public static inline function encode( s : String ) : String {
+	public static inline function encode(s:String):String {
 		return Global.md5(s);
 	}
 
-	public static inline function make( b : haxe.io.Bytes ) : haxe.io.Bytes {
-        return Bytes.ofData(Global.md5(b.getData(), true));
+	public static inline function make(b:haxe.io.Bytes):haxe.io.Bytes {
+		return Bytes.ofData(Global.md5(b.getData(), true));
 	}
 }
diff --git a/std/php7/_std/haxe/crypto/Sha1.hx b/std/php/_std/haxe/crypto/Sha1.hx
similarity index 85%
rename from std/php7/_std/haxe/crypto/Sha1.hx
rename to std/php/_std/haxe/crypto/Sha1.hx
index 829820f60f5aa42bd4c9cce25707548d7c78a2c3..388989bbb008789d3ad62cf0989d8188e9db415b 100644
--- a/std/php7/_std/haxe/crypto/Sha1.hx
+++ b/std/php/_std/haxe/crypto/Sha1.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 import php.Global;
 import haxe.io.Bytes;
 
-/**
-	Creates a Sha1 of a String.
-*/
 class Sha1 {
-
-	public static inline function encode( s:String ) : String {
+	public static inline function encode(s:String):String {
 		return Global.sha1(s);
 	}
 
-	public static inline function make( b : haxe.io.Bytes ) : haxe.io.Bytes {
+	public static inline function make(b:haxe.io.Bytes):haxe.io.Bytes {
 		return Bytes.ofData(Global.sha1(b.getData(), true));
 	}
 }
diff --git a/std/php7/_std/haxe/crypto/Sha224.hx b/std/php/_std/haxe/crypto/Sha224.hx
similarity index 85%
rename from std/php7/_std/haxe/crypto/Sha224.hx
rename to std/php/_std/haxe/crypto/Sha224.hx
index 0ca5cb37ad7854961311cd3ed2bb1a946827b9a6..67b3a02ceedb3e630288b178b0da40da9787e221 100644
--- a/std/php7/_std/haxe/crypto/Sha224.hx
+++ b/std/php/_std/haxe/crypto/Sha224.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 import php.Global;
 import haxe.io.Bytes;
 
-/**
-	Creates a Sha224 of a String.
-*/
 class Sha224 {
-
-	public static inline function encode( s:String ) : String {
+	public static inline function encode(s:String):String {
 		return Global.hash('sha224', s);
 	}
 
-	public static function make( b : haxe.io.Bytes ) : haxe.io.Bytes {
+	public static function make(b:haxe.io.Bytes):haxe.io.Bytes {
 		return Bytes.ofData(Global.hash('sha224', b.getData(), true));
 	}
 }
diff --git a/std/php7/_std/haxe/crypto/Sha256.hx b/std/php/_std/haxe/crypto/Sha256.hx
similarity index 85%
rename from std/php7/_std/haxe/crypto/Sha256.hx
rename to std/php/_std/haxe/crypto/Sha256.hx
index ec2ab0bd09f886ac93c4ae37afd467b7eb286103..087dce1183668b0bcd9d91d9ed7df265156cba1a 100644
--- a/std/php7/_std/haxe/crypto/Sha256.hx
+++ b/std/php/_std/haxe/crypto/Sha256.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.crypto;
 
 import php.Global;
 import haxe.io.Bytes;
 
-/**
-	Creates a Sha256 of a String.
-*/
 class Sha256 {
-
-	public static inline function encode( s:String ) : String {
+	public static inline function encode(s:String):String {
 		return Global.hash('sha256', s);
 	}
 
-	public static function make( b : haxe.io.Bytes ) : haxe.io.Bytes {
+	public static function make(b:haxe.io.Bytes):haxe.io.Bytes {
 		return Bytes.ofData(Global.hash('sha256', b.getData(), true));
 	}
 }
diff --git a/std/php/_std/haxe/ds/IntMap.hx b/std/php/_std/haxe/ds/IntMap.hx
index 79643b5cc2406490ecd8694338f1db5e17c650c1..cd150ff8df4a57dfbe759da8ef32d71bee8fd5aa 100644
--- a/std/php/_std/haxe/ds/IntMap.hx
+++ b/std/php/_std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,66 +19,70 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
-@:coreApi class IntMap<T> implements php.IteratorAggregate<T> implements haxe.Constraints.IMap<Int,T> {
-	@:analyzer(no_simplification)
-	private var h : ArrayAccess<Int>;
+import php.Syntax;
+import php.Global;
+import php.NativeArray;
+import php.NativeIndexedArray;
+
+@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
+	var data:NativeIndexedArray<T>;
 
-	public function new() : Void {
-		h = untyped __call__('array');
+	public function new():Void {
+		data = new NativeIndexedArray();
 	}
 
-	public function set( key : Int, value : T ) : Void {
-		untyped h[key] = value;
+	public inline function set(key:Int, value:T):Void {
+		data[key] = value;
 	}
 
-	public function get( key : Int ) : Null<T> {
-		if (untyped __call__("array_key_exists", key, h))
-			return untyped h[key];
-		else
-			return null;
+	public inline function get(key:Int):Null<T> {
+		return Syntax.coalesce(data[key], null);
 	}
 
-	public function exists( key : Int ) : Bool {
-		return untyped __call__("array_key_exists", key, h);
+	public inline function exists(key:Int):Bool {
+		return Global.array_key_exists(key, data);
 	}
 
-	public function remove( key : Int ) : Bool {
-		if (untyped __call__("array_key_exists", key, h)) {
-			untyped __call__("unset", h[key]);
+	public function remove(key:Int):Bool {
+		if (Global.array_key_exists(key, data)) {
+			Global.unset(data[key]);
 			return true;
-		} else
-			return false;
+		}
+
+		return false;
 	}
 
-	public function keys() : Iterator<Int> {
-		return untyped __call__("new _hx_array_iterator", __call__("array_keys", h));
+	public inline function keys():Iterator<Int> {
+		return Global.array_keys(data).iterator();
 	}
 
-	public function iterator() : Iterator<T> {
-		return untyped __call__("new _hx_array_iterator", __call__("array_values", h));
+	@:ifFeature("dynamic_read.iterator", "anon_optional_read.iterator", "anon_read.iterator")
+	public inline function iterator():Iterator<T> {
+		return Global.array_values(data).iterator();
 	}
 
-	public function toString() : String {
-		var s = "{";
-		var it = keys();
-		for( i in it ) {
-			s += i;
-			s += " => ";
-			s += Std.string(get(i));
-			if( it.hasNext() )
-				s += ", ";
-		}
-		return s + "}";
+	@:ifFeature("dynamic_read.keyValueIterator", "anon_optional_read.keyValueIterator", "anon_read.keyValueIterator")
+	public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public inline function copy():IntMap<T> {
+		return Syntax.clone(this);
+	}
+
+	public function toString():String {
+		var parts = new NativeArray();
+		Syntax.foreach(data, function(key:Int, value:T) {
+			Global.array_push(parts, '$key => ' + Std.string(value));
+		});
+
+		return '{' + Global.implode(', ', parts) + '}';
 	}
 
-	/**
-		Implement IteratorAggregate for native php iteration
-	**/
-	#if php
-	function getIterator() : Iterator<T> {
-		return iterator();
+	public inline function clear():Void {
+		data = new NativeIndexedArray();
 	}
-	#end
 }
diff --git a/std/php/_std/haxe/ds/ObjectMap.hx b/std/php/_std/haxe/ds/ObjectMap.hx
index 0bf79c883143e3f3103edf89acbfd6ced2bfa7e6..bf56073a061965c15000bd37c0cc6f46485ba534 100644
--- a/std/php/_std/haxe/ds/ObjectMap.hx
+++ b/std/php/_std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,68 +22,76 @@
 
 package haxe.ds;
 
-@:coreApi
-class ObjectMap <K:{ }, V> implements haxe.Constraints.IMap<K,V> {
-	static function getId(key: { } ):String {
-		return untyped __php__("spl_object_hash($key)");
-	}
+import php.*;
 
-	@:analyzer(no_simplification)
-	var h : ArrayAccess<V>;
-	@:analyzer(no_simplification)
-	var hk : ArrayAccess<K>;
+@:coreApi
+class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
+	var _keys:NativeAssocArray<K>;
+	var _values:NativeAssocArray<V>;
 
 	public function new():Void {
-		h = untyped __call__('array');
-		hk = untyped __call__('array');
+		_keys = new NativeAssocArray();
+		_values = new NativeAssocArray();
 	}
 
-	public function set(key:K, value:V):Void untyped {
-		var id = getId(key);
-		untyped h[id] = value;
-		untyped hk[id] = key;
+	public function set(key:K, value:V):Void {
+		var id = Global.spl_object_hash(key);
+		_keys[id] = key;
+		_values[id] = value;
 	}
 
 	public function get(key:K):Null<V> {
-		var id = getId(key);
-		if (untyped __call__("array_key_exists", id, h))
-			return untyped h[id];
-		else
-			return null;
+		var id = Global.spl_object_hash(key);
+		return Global.isset(_values[id]) ? _values[id] : null;
 	}
 
 	public function exists(key:K):Bool {
-		return untyped __call__("array_key_exists", getId(key), h);
+		return Global.array_key_exists(Global.spl_object_hash(key), _values);
 	}
 
-	public function remove( key : K ) : Bool {
-		var id = getId(key);
-		if (untyped __call__("array_key_exists", id, h)) {
-			untyped __call__("unset", h[id]);
-			untyped __call__("unset", hk[id]);
+	public function remove(key:K):Bool {
+		var id = Global.spl_object_hash(key);
+		if (Global.array_key_exists(id, _values)) {
+			Global.unset(_keys[id], _values[id]);
 			return true;
-		} else
+		} else {
 			return false;
+		}
+	}
+
+	public inline function keys():Iterator<K> {
+		return _keys.iterator();
+	}
+
+	@:ifFeature("dynamic_read.iterator", "anon_optional_read.iterator", "anon_read.iterator")
+	public inline function iterator():Iterator<V> {
+		return _values.iterator();
 	}
 
-	public inline function keys() : Iterator<K> {
-		return untyped __call__("new _hx_array_iterator", __call__("array_values", hk));
+	@:ifFeature("dynamic_read.keyValueIterator", "anon_optional_read.keyValueIterator", "anon_read.keyValueIterator")
+	public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
 	}
 
-	public inline function iterator() : Iterator<V> {
-		return untyped __call__("new _hx_array_iterator", __call__("array_values", h));
+	public inline function copy():ObjectMap<K, V> {
+		return Syntax.clone(this);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		var s = "{";
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s += Std.string(i);
 			s += " => ";
 			s += Std.string(get(i));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s += ", ";
 		}
 		return s + "}";
 	}
-}
\ No newline at end of file
+
+	public inline function clear():Void {
+		_keys = new NativeAssocArray();
+		_values = new NativeAssocArray();
+	}
+}
diff --git a/std/php/_std/haxe/ds/StringMap.hx b/std/php/_std/haxe/ds/StringMap.hx
index 3f27ba090b432c26e96557653d01e731b079dc88..3d32344521e57d291d02df8e9a4e60feb5de109a 100644
--- a/std/php/_std/haxe/ds/StringMap.hx
+++ b/std/php/_std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,66 +19,71 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
-@:coreApi class StringMap<T> implements php.IteratorAggregate<T> implements haxe.Constraints.IMap<String,T> {
-	@:analyzer(no_simplification)
-	private var h : ArrayAccess<T>;
+import php.Syntax;
+import php.Global;
+import php.NativeArray;
+import php.NativeAssocArray;
+import haxe.Constraints;
+
+@:coreApi class StringMap<T> implements IMap<String, T> {
+	private var data:NativeAssocArray<T>;
 
-	public function new() : Void {
-		h = untyped __call__('array');
+	public inline function new():Void {
+		data = new NativeAssocArray();
 	}
 
-	public function set( key : String, value : T ) : Void {
-		untyped h[key] = value;
+	public inline function set(key:String, value:T):Void {
+		data[key] = value;
 	}
 
-	public function get( key : String ) : Null<T> {
-		if (untyped __call__("array_key_exists", key, h))
-			return untyped h[key];
-		else
-			return null;
+	public inline function get(key:String):Null<T> {
+		return Syntax.coalesce(data[key], null);
 	}
 
-	public function exists( key : String ) : Bool {
-		return untyped __call__("array_key_exists", key, h);
+	public inline function exists(key:String):Bool {
+		return Global.array_key_exists(key, data);
 	}
 
-	public function remove( key : String ) : Bool {
-		if (untyped __call__("array_key_exists", key, h)) {
-			untyped __call__("unset", h[key]);
+	public function remove(key:String):Bool {
+		if (Global.array_key_exists(key, data)) {
+			Global.unset(data[key]);
 			return true;
-		} else
+		} else {
 			return false;
+		}
 	}
 
-	public function keys() : Iterator<String> {
-		return untyped __call__("new _hx_array_iterator", __call__("array_map", "strval", __call__("array_keys", h)));
+	public inline function keys():Iterator<String> {
+		return Global.array_map('strval', Global.array_keys(data)).iterator();
 	}
 
-	public function iterator() : Iterator<T> {
-		return untyped __call__("new _hx_array_iterator", __call__("array_values", h));
+	@:ifFeature("dynamic_read.iterator", "anon_optional_read.iterator", "anon_read.iterator")
+	public inline function iterator():Iterator<T> {
+		return data.iterator();
 	}
 
-	public function toString() : String {
-		var s = "{";
-		var it = keys();
-		for( i in it ) {
-			s += i;
-			s += " => ";
-			s += Std.string(get(i));
-			if( it.hasNext() )
-				s += ", ";
-		}
-		return s + "}";
+	@:ifFeature("dynamic_read.keyValueIterator", "anon_optional_read.keyValueIterator", "anon_read.keyValueIterator")
+	public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public inline function copy():StringMap<T> {
+		return Syntax.clone(this);
+	}
+
+	public function toString():String {
+		var parts = new NativeArray();
+		Syntax.foreach(data, function(key:String, value:T) {
+			Global.array_push(parts, '$key => ' + Std.string(value));
+		});
+
+		return '{' + Global.implode(', ', parts) + '}';
 	}
 
-	/**
-		Implement IteratorAggregate for native php iteration
-	**/
-	#if php
-	function getIterator() : Iterator<T> {
-		return iterator();
+	public inline function clear():Void {
+		data = new NativeAssocArray();
 	}
-	#end
 }
diff --git a/std/php/_std/haxe/ds/Vector.hx b/std/php/_std/haxe/ds/Vector.hx
new file mode 100644
index 0000000000000000000000000000000000000000..26126d27e3aeaacbb52a2d0dedbf384fd9734809
--- /dev/null
+++ b/std/php/_std/haxe/ds/Vector.hx
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.ds;
+
+import php.*;
+
+private class PhpVectorData<T> {
+	public var length:Int;
+	public var data:NativeIndexedArray<T>;
+
+	public inline function new(length:Int) {
+		this.length = length;
+		data = new NativeIndexedArray();
+	}
+}
+
+private typedef VectorData<T> = PhpVectorData<T>;
+
+abstract Vector<T>(VectorData<T>) {
+	public var length(get, never):Int;
+
+	public inline function new(length:Int) {
+		this = new VectorData(length);
+	}
+
+	@:op([]) public inline function get(index:Int):T {
+		return Syntax.coalesce(this.data[index], null);
+	}
+
+	@:op([]) public inline function set(index:Int, val:T):T {
+		return this.data[index] = val;
+	}
+
+	inline function get_length():Int {
+		return this.length;
+	}
+
+	public static function blit<T>(src:Vector<T>, srcPos:Int, dest:Vector<T>, destPos:Int, len:Int):Void {
+		if (src == dest) {
+			if (srcPos < destPos) {
+				var i = srcPos + len;
+				var j = destPos + len;
+				for (k in 0...len) {
+					i--;
+					j--;
+					src[j] = src[i];
+				}
+			} else if (srcPos > destPos) {
+				var i = srcPos;
+				var j = destPos;
+				for (k in 0...len) {
+					src[j] = src[i];
+					i++;
+					j++;
+				}
+			}
+		} else {
+			for (i in 0...len) {
+				dest[destPos + i] = src[srcPos + i];
+			}
+		}
+	}
+
+	public function toArray():Array<T> {
+		var result = [];
+		@:privateAccess result.length = length;
+		for (i in 0...length) {
+			@:privateAccess result.arr.push(get(i));
+		}
+		return result;
+	}
+
+	public inline function toData():VectorData<T> {
+		return this;
+	}
+
+	static public inline function fromData<T>(data:VectorData<T>):Vector<T> {
+		return cast data;
+	}
+
+	static public inline function fromArrayCopy<T>(array:Array<T>):Vector<T> {
+		var vectorData = new VectorData(array.length);
+		vectorData.data = @:privateAccess array.arr;
+		return cast vectorData;
+	}
+
+	public inline function copy<T>():Vector<T> {
+		return cast Syntax.clone(this);
+	}
+
+	public function join<T>(sep:String):String {
+		if (this.length == 0) {
+			return '';
+		}
+		var result = Std.string(get(0));
+		for (i in 1...this.length) {
+			result = Syntax.concat(result, Syntax.concat(sep, Std.string(get(i))));
+		}
+		return result;
+	}
+
+	public inline function map<S>(f:T->S):Vector<S> {
+		var result = new Vector(this.length);
+		Syntax.foreach(this.data, function(key:Int, value:T) {
+			result[key] = f(value);
+		});
+		return result;
+	}
+
+	public inline function sort<T>(f:T->T->Int):Void {
+		Global.usort(this.data, f);
+	}
+}
diff --git a/std/php/_std/haxe/format/JsonParser.hx b/std/php/_std/haxe/format/JsonParser.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c0afbb9251cc0f4d7fc5f375e631279add326178
--- /dev/null
+++ b/std/php/_std/haxe/format/JsonParser.hx
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.format;
+
+import php.Syntax;
+import php.Global;
+import php.NativeString;
+
+using haxe.format.JsonParser;
+
+class JsonParser {
+	static public inline function parse(str:String):Dynamic {
+		return new JsonParser(str).doParse();
+	}
+
+	var str:NativeString;
+	var pos:Int;
+
+	function new(str:String) {
+		this.str = str;
+		this.pos = 0;
+	}
+
+	function doParse():Dynamic {
+		var result = parseRec();
+		var c;
+		while (!StringTools.isEof(c = nextChar())) {
+			switch (c) {
+				case ' '.code, '\r'.code, '\n'.code, '\t'.code:
+				// allow trailing whitespace
+				default:
+					invalidChar();
+			}
+		}
+		return result;
+	}
+
+	function parseRec():Dynamic {
+		while (true) {
+			var c = nextChar();
+			switch (c) {
+				case ' '.code, '\r'.code, '\n'.code, '\t'.code:
+				// loop
+				case '{'.code:
+					var obj = {}, field = null, comma:Null<Bool> = null;
+					while (true) {
+						var c = nextChar();
+						switch (c) {
+							case ' '.code, '\r'.code, '\n'.code, '\t'.code:
+							// loop
+							case '}'.code:
+								if (field != null || comma == false)
+									invalidChar();
+								return obj;
+							case ':'.code:
+								if (field == null)
+									invalidChar();
+								Reflect.setField(obj, field, parseRec());
+								field = null;
+								comma = true;
+							case ','.code:
+								if (comma) comma = false else invalidChar();
+							case '"'.code:
+								if (field != null || comma) invalidChar();
+								field = parseString();
+							default:
+								invalidChar();
+						}
+					}
+				case '['.code:
+					var arr = [], comma:Null<Bool> = null;
+					while (true) {
+						var c = nextChar();
+						switch (c) {
+							case ' '.code, '\r'.code, '\n'.code, '\t'.code:
+							// loop
+							case ']'.code:
+								if (comma == false) invalidChar();
+								return arr;
+							case ','.code:
+								if (comma) comma = false else invalidChar();
+							default:
+								if (comma) invalidChar();
+								pos--;
+								arr.push(parseRec());
+								comma = true;
+						}
+					}
+				case 't'.code:
+					var save = pos;
+					if (nextChar() != 'r'.code || nextChar() != 'u'.code || nextChar() != 'e'.code) {
+						pos = save;
+						invalidChar();
+					}
+					return true;
+				case 'f'.code:
+					var save = pos;
+					if (nextChar() != 'a'.code || nextChar() != 'l'.code || nextChar() != 's'.code || nextChar() != 'e'.code) {
+						pos = save;
+						invalidChar();
+					}
+					return false;
+				case 'n'.code:
+					var save = pos;
+					if (nextChar() != 'u'.code || nextChar() != 'l'.code || nextChar() != 'l'.code) {
+						pos = save;
+						invalidChar();
+					}
+					return null;
+				case '"'.code:
+					return parseString();
+				case '0'.code, '1'.code, '2'.code, '3'.code, '4'.code, '5'.code, '6'.code, '7'.code, '8'.code, '9'.code, '-'.code:
+					return parseNumber(c);
+				default:
+					invalidChar();
+			}
+		}
+	}
+
+	function parseString() {
+		var start = pos;
+		var buf:NativeString = null;
+		while (true) {
+			var c = nextChar();
+			if (c == '"'.code)
+				break;
+			if (c == '\\'.code) {
+				if (buf == null) {
+					buf = '';
+				}
+				buf = buf.addSub(str, start, pos - start - 1);
+				c = nextChar();
+				switch (c) {
+					case "r".code:
+						buf = Syntax.concat(buf, "\r");
+					case "n".code:
+						buf = Syntax.concat(buf, "\n");
+					case "t".code:
+						buf = Syntax.concat(buf, "\t");
+					case "b".code:
+						buf = Syntax.concat(buf, Global.chr(8));
+					case "f".code:
+						buf = Syntax.concat(buf, Global.chr(12));
+					case "/".code, '\\'.code, '"'.code:
+						buf = Syntax.concat(buf, Global.mb_chr(c));
+					case 'u'.code:
+						var uc = Std.parseInt("0x" + str.substr(pos, 4));
+						pos += 4;
+						buf = Syntax.concat(buf, Global.mb_chr(uc));
+					default:
+						throw "Invalid escape sequence \\" + String.fromCharCode(c) + " at position " + (pos - 1);
+				}
+				start = pos;
+			}
+			// ensure utf8 chars are not cut
+			else if (c >= 0x80) {
+				pos++;
+				if (c >= 0xFC)
+					pos += 4;
+				else if (c >= 0xF8)
+					pos += 3;
+				else if (c >= 0xF0)
+					pos += 2;
+				else if (c >= 0xE0)
+					pos++;
+			} else if (StringTools.isEof(c))
+				throw "Unclosed string";
+		}
+		if (buf == null) {
+			return str.substr(start, pos - start - 1);
+		} else {
+			return buf.addSub(str, start, pos - start - 1);
+		}
+	}
+
+	inline function parseNumber(c:Int):Dynamic {
+		var start = pos - 1;
+		var minus = c == '-'.code, digit = !minus, zero = c == '0'.code;
+		var point = false, e = false, pm = false, end = false;
+		while (true) {
+			c = nextChar();
+			switch (c) {
+				case '0'.code:
+					if (zero && !point)
+						invalidNumber(start);
+					if (minus) {
+						minus = false;
+						zero = true;
+					}
+					digit = true;
+				case '1'.code, '2'.code, '3'.code, '4'.code, '5'.code, '6'.code, '7'.code, '8'.code, '9'.code:
+					if (zero && !point)
+						invalidNumber(start);
+					if (minus)
+						minus = false;
+					digit = true;
+					zero = false;
+				case '.'.code:
+					if (minus || point || e)
+						invalidNumber(start);
+					digit = false;
+					point = true;
+				case 'e'.code, 'E'.code:
+					if (minus || zero || e)
+						invalidNumber(start);
+					digit = false;
+					e = true;
+				case '+'.code, '-'.code:
+					if (!e || pm)
+						invalidNumber(start);
+					digit = false;
+					pm = true;
+				default:
+					if (!digit)
+						invalidNumber(start);
+					pos--;
+					end = true;
+			}
+			if (end)
+				break;
+		}
+
+		var f = Std.parseFloat(str.substr(start, pos - start));
+		var i = Std.int(f);
+		return if (i == f) i else f;
+	}
+
+	inline function nextChar() {
+		return fastCodeAt(str, pos++);
+	}
+
+	function invalidChar() {
+		pos--; // rewind
+		throw "Invalid char " + fastCodeAt(str, pos) + " at position " + pos;
+	}
+
+	function invalidNumber(start:Int) {
+		throw "Invalid number at position " + start + ": " + str.substr(start, pos - start);
+	}
+
+	// TODO: rewrite the parser using a buffer instead of a string as the data source
+	static inline function fastCodeAt(s:NativeString, pos:Int):Int {
+		return pos >= Global.strlen(s) ? 0 : Global.ord(s[pos]);
+	}
+
+	static inline function substr(s:NativeString, pos:Int, ?length:Int):NativeString {
+		return Global.substr(s, pos, length);
+	}
+
+	static inline function addSub(buf:NativeString, s:NativeString, pos:Int, length:Int):NativeString {
+		return Syntax.concat(buf, Global.substr(s, pos, length));
+	}
+}
diff --git a/std/php/_std/haxe/io/Bytes.hx b/std/php/_std/haxe/io/Bytes.hx
new file mode 100644
index 0000000000000000000000000000000000000000..64e0beff93ae3e57ef724e57e5e052bbf4d5aa96
--- /dev/null
+++ b/std/php/_std/haxe/io/Bytes.hx
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.io;
+
+import php.Global;
+
+class Bytes {
+	public var length(default, null):Int;
+
+	var b:BytesData;
+
+	function new(length:Int, b:BytesData):Void {
+		this.length = length;
+		this.b = b;
+	}
+
+	public inline function get(pos:Int):Int {
+		return b.get(pos);
+	}
+
+	public inline function set(pos:Int, v:Int):Void {
+		b.set(pos, v);
+	}
+
+	public inline function blit(pos:Int, src:Bytes, srcpos:Int, len:Int):Void {
+		if (pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length) {
+			throw Error.OutsideBounds;
+		} else {
+			b.blit(pos, src.b, srcpos, len);
+		}
+	}
+
+	public function fill(pos:Int, len:Int, value:Int):Void {
+		for (i in pos...pos + len)
+			b.set(i, value);
+	}
+
+	public inline function sub(pos:Int, len:Int):Bytes {
+		if (pos < 0 || len < 0 || pos + len > length) {
+			throw Error.OutsideBounds;
+		} else {
+			return new Bytes(len, b.sub(pos, len));
+		}
+	}
+
+	public inline function compare(other:Bytes):Int {
+		return b.compare(other.b);
+	}
+
+	public function getDouble(pos:Int):Float {
+		return FPHelper.i64ToDouble(getInt32(pos), getInt32(pos + 4));
+	}
+
+	public function getFloat(pos:Int):Float {
+		var b = new haxe.io.BytesInput(this, pos, 4);
+		return b.readFloat();
+	}
+
+	public function setDouble(pos:Int, v:Float):Void {
+		var i = FPHelper.doubleToI64(v);
+		setInt32(pos, i.low);
+		setInt32(pos + 4, i.high);
+	}
+
+	public function setFloat(pos:Int, v:Float):Void {
+		setInt32(pos, FPHelper.floatToI32(v));
+	}
+
+	public inline function getUInt16(pos:Int):Int {
+		return get(pos) | (get(pos + 1) << 8);
+	}
+
+	public inline function setUInt16(pos:Int, v:Int):Void {
+		set(pos, v);
+		set(pos + 1, v >> 8);
+	}
+
+	public inline function getInt32(pos:Int):Int {
+		var v = get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos + 3) << 24);
+		return if (v & 0x80000000 != 0) v | 0x80000000 else v;
+	}
+
+	public inline function getInt64(pos:Int):haxe.Int64 {
+		return haxe.Int64.make(getInt32(pos + 4), getInt32(pos));
+	}
+
+	public inline function setInt32(pos:Int, v:Int):Void {
+		set(pos, v);
+		set(pos + 1, v >> 8);
+		set(pos + 2, v >> 16);
+		set(pos + 3, v >>> 24);
+	}
+
+	public inline function setInt64(pos:Int, v:haxe.Int64):Void {
+		setInt32(pos, v.low);
+		setInt32(pos + 4, v.high);
+	}
+
+	public inline function getString(pos:Int, len:Int, ?encoding:Encoding):String {
+		if (pos < 0 || len < 0 || pos + len > length) {
+			throw Error.OutsideBounds;
+		} else {
+			// no need to handle encoding, because PHP strings are binary safe.
+			return b.getString(pos, len);
+		}
+	}
+
+	@:deprecated("readString is deprecated, use getString instead")
+	@:noCompletion
+	public inline function readString(pos:Int, len:Int):String {
+		return getString(pos, len);
+	}
+
+	public function toString():String {
+		return b;
+	}
+
+	public inline function toHex():String {
+		return php.Global.bin2hex(b.toString());
+	}
+
+	public inline function getData():BytesData {
+		return b;
+	}
+
+	public static function alloc(length:Int):Bytes {
+		return new Bytes(length, BytesData.alloc(length));
+	}
+
+	public static inline function ofString(s:String, ?encoding:Encoding):Bytes {
+		return new Bytes(php.Global.strlen(s), s);
+	}
+
+	public static inline function ofData(b:BytesData):Bytes {
+		return new Bytes(b.length, b);
+	}
+
+	public static function ofHex(s:String):Bytes {
+		var len = Global.strlen(s);
+		if ((len & 1) != 0)
+			throw "Not a hex string (odd number of digits)";
+		var b:String = php.Global.hex2bin(s);
+		return new Bytes(Global.strlen(b), b);
+	}
+
+	public inline static function fastGet(b:BytesData, pos:Int):Int {
+		return b.get(pos);
+	}
+}
diff --git a/std/php7/_std/haxe/io/BytesBuffer.hx b/std/php/_std/haxe/io/BytesBuffer.hx
similarity index 55%
rename from std/php7/_std/haxe/io/BytesBuffer.hx
rename to std/php/_std/haxe/io/BytesBuffer.hx
index b5871cb7df0240d918908467e720a8cb17f76c05..708d1124fd77733eaa4f1c91fe69695bff6dbef9 100644
--- a/std/php7/_std/haxe/io/BytesBuffer.hx
+++ b/std/php/_std/haxe/io/BytesBuffer.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,71 +19,67 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 import php.*;
 
 class BytesBuffer {
-	var b : String;
+	var b:NativeString;
 
-	/** The length of the buffer in bytes. **/
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
 	public function new() {
 		b = "";
 	}
 
-	public inline function addByte( byte : Int ) {
-		Syntax.binop(b, '.=', Global.chr(byte));
+	public inline function addByte(byte:Int) {
+		b = Syntax.concat(b, Global.chr(byte));
 	}
 
-	public inline function add( src : Bytes ) {
-		Syntax.binop(b, '.=', src.getData().toNativeString());
+	public inline function add(src:Bytes) {
+		b = Syntax.concat(b, src.getData().toNativeString());
 	}
 
-	public inline function addString( v : String ) {
-		Syntax.binop(b, '.=', v);
+	public inline function addString(v:String, ?encoding:Encoding) {
+		b = Syntax.concat(b, v);
 	}
 
-	public function addInt32( v : Int ) {
-		addByte(v&0xFF);
-		addByte((v>>8)&0xFF);
-		addByte((v>>16)&0xFF);
-		addByte(v>>>24);
+	public function addInt32(v:Int) {
+		addByte(v & 0xFF);
+		addByte((v >> 8) & 0xFF);
+		addByte((v >> 16) & 0xFF);
+		addByte(v >>> 24);
 	}
 
-	public function addInt64( v : haxe.Int64 ) {
+	public function addInt64(v:haxe.Int64) {
 		addInt32(v.low);
 		addInt32(v.high);
 	}
 
-	public inline function addFloat( v : Float ) {
+	public inline function addFloat(v:Float) {
 		addInt32(FPHelper.floatToI32(v));
 	}
 
-	public inline function addDouble( v : Float ) {
+	public inline function addDouble(v:Float) {
 		addInt64(FPHelper.doubleToI64(v));
 	}
 
-	public inline function addBytes( src : Bytes, pos : Int, len : Int ) {
-		if( pos < 0 || len < 0 || pos + len > src.length ) {
+	public inline function addBytes(src:Bytes, pos:Int, len:Int) {
+		if (pos < 0 || len < 0 || pos + len > src.length) {
 			throw Error.OutsideBounds;
 		} else {
-			Syntax.binop(b, '.=', src.getData().sub(pos, len).toString());
+			b = Syntax.concat(b, src.getData().sub(pos, len).toString());
 		}
 	}
 
-	/**
-		Returns either a copy or a reference of the current bytes.
-		Once called, the buffer can no longer be used.
-	**/
-	public function getBytes() : Bytes untyped {
-		var bytes = new Bytes(b.length, b);
+	public function getBytes():Bytes {
+		var bytes = @:privateAccess new Bytes(length, b);
 		b = null;
 		return bytes;
 	}
 
-	inline function get_length() : Int {
-		return b.length;
+	inline function get_length():Int {
+		return Global.strlen(b);
 	}
 }
diff --git a/std/php7/_std/haxe/io/BytesData.hx b/std/php/_std/haxe/io/BytesData.hx
similarity index 56%
rename from std/php7/_std/haxe/io/BytesData.hx
rename to std/php/_std/haxe/io/BytesData.hx
index 391071cd1a1e1f323227016b2c44d3cbcac3623d..193cb8f93e45922a16ba381151df419ba73628ef 100644
--- a/std/php7/_std/haxe/io/BytesData.hx
+++ b/std/php/_std/haxe/io/BytesData.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,70 +19,76 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 import php.*;
 
+using php.Syntax;
+
+typedef BytesData = BytesDataAbstract;
+
 private class Container {
 	public var s:NativeString;
-	public inline function new(s:NativeString) this.s = s;
-}
 
-abstract BytesData(Container) from Container to Container {
+	public inline function new(s:NativeString)
+		this.s = s;
+}
 
-	public var length (get,never):Int;
+private abstract BytesDataAbstract(Container) from Container to Container {
+	public var length(get, never):Int;
 
-	public static inline function alloc (length:Int):BytesData {
+	public static inline function alloc(length:Int):BytesDataAbstract {
 		return Global.str_repeat(Global.chr(0), length);
 	}
 
 	@:arrayAccess
-	public inline function get (pos:Int):Int {
+	public inline function get(pos:Int):Int {
 		return Global.ord(this.s[pos]);
 	}
 
 	@:arrayAccess
-	public inline function set (index:Int, val:Int):Void {
+	public inline function set(index:Int, val:Int):Void {
 		this.s = Global.substr_replace(this.s, Global.chr(val), index, 1);
 	}
 
-	public inline function compare (other:BytesData):Int {
-		return Syntax.binop(this.s, '<=>', (other:Container).s);
+	public inline function compare(other:BytesDataAbstract):Int {
+		return Syntax.spaceship(this.s, (other : Container).s);
 	}
 
-	public inline function getString (pos:Int, len:Int):String {
+	public inline function getString(pos:Int, len:Int):String {
 		return Global.substr(this.s, pos, len);
 	}
 
-	public inline function sub (pos:Int, len:Int):BytesData {
-		return (Global.substr(this.s, pos, len):String);
+	public inline function sub(pos:Int, len:Int):BytesDataAbstract {
+		return (Global.substr(this.s, pos, len) : String);
 	}
 
-	public inline function blit (pos : Int, src : BytesData, srcpos : Int, len : Int):Void {
-		this.s = Syntax.binop(Syntax.binop(Global.substr(this.s, 0, pos), '.', Global.substr(src, srcpos, len)), '.', Global.substr(this.s, pos + len));
+	public inline function blit(pos:Int, src:BytesDataAbstract, srcpos:Int, len:Int):Void {
+		this.s = Global.substr(this.s, 0, pos).concat(Global.substr(src, srcpos, len)).concat(Global.substr(this.s, pos + len));
 	}
 
-	inline function get_length ():Int {
+	inline function get_length():Int {
 		return Global.strlen(this.s);
 	}
 
 	@:from
-	static inline function fromNativeString (s:NativeString):BytesData {
+	static inline function fromNativeString(s:NativeString):BytesDataAbstract {
 		return new Container(s);
 	}
 
 	@:to
-	public inline function toNativeString ():NativeString {
+	public inline function toNativeString():NativeString {
 		return this.s;
 	}
 
 	@:from
-	static inline function fromString (s:String):BytesData {
+	static inline function fromString(s:String):BytesDataAbstract {
 		return new Container(s);
 	}
 
 	@:to
-	public inline function toString ():String {
+	public inline function toString():String {
 		return this.s;
 	}
-}
\ No newline at end of file
+}
diff --git a/std/php7/_std/haxe/io/BytesInput.hx b/std/php/_std/haxe/io/BytesInput.hx
similarity index 61%
rename from std/php7/_std/haxe/io/BytesInput.hx
rename to std/php/_std/haxe/io/BytesInput.hx
index 19487ecf65e20901f8ee9bf354eec319d2d12856..316e28ee374de12d1e9e115408fe1538a1950a49 100644
--- a/std/php7/_std/haxe/io/BytesInput.hx
+++ b/std/php/_std/haxe/io/BytesInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,24 +19,26 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 class BytesInput extends Input {
-	var b : BytesData;
-	var pos : Int;
-	var len : Int;
-	var totlen : Int;
+	var b:BytesData;
+	var pos:Int;
+	var len:Int;
+	var totlen:Int;
 
-	/** The current position in the stream in bytes. */
-	public var position(get,set) : Int;
+	public var position(get, set):Int;
 
-	/** The length of the stream in bytes. */
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
-	public function new( b : Bytes, ?pos : Int, ?len : Int ) {
-		if( pos == null ) pos = 0;
-		if( len == null ) len = b.length - pos;
-		if( pos < 0 || len < 0 || pos + len > b.length ) throw Error.OutsideBounds;
+	public function new(b:Bytes, ?pos:Int, ?len:Int) {
+		if (pos == null)
+			pos = 0;
+		if (len == null)
+			len = b.length - pos;
+		if (pos < 0 || len < 0 || pos + len > b.length)
+			throw Error.OutsideBounds;
 
 		this.b = b.getData();
 		this.pos = pos;
@@ -44,33 +46,36 @@ class BytesInput extends Input {
 		this.totlen = len;
 	}
 
-	inline function get_position() : Int {
+	inline function get_position():Int {
 		return pos;
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return totlen;
 	}
 
-	function set_position( p : Int ) : Int {
-		if( p < 0 ) p = 0;
-		else if( p > length ) p = length;
+	function set_position(p:Int):Int {
+		if (p < 0)
+			p = 0;
+		else if (p > length)
+			p = length;
 		len = totlen - p;
 		return pos = p;
 	}
 
-	public override function readByte() : Int {
-		if( len == 0 ) throw new Eof();
+	public override function readByte():Int {
+		if (len == 0)
+			throw new Eof();
 		--len;
 		return b[pos++];
 	}
 
-	public override function readBytes( buf : Bytes, pos, len ) : Int {
-		if( pos < 0 || len < 0 || pos + len > buf.length )
+	public override function readBytes(buf:Bytes, pos, len):Int {
+		if (pos < 0 || len < 0 || pos + len > buf.length)
 			throw Error.OutsideBounds;
-		if( this.len == 0 && len > 0 )
+		if (this.len == 0 && len > 0)
 			throw new Eof();
-		if( this.len < len )
+		if (this.len < len)
 			len = this.len;
 		buf.getData().blit(pos, b, this.pos, len);
 		this.pos += len;
diff --git a/std/php7/_std/haxe/io/BytesOutput.hx b/std/php/_std/haxe/io/BytesOutput.hx
similarity index 74%
rename from std/php7/_std/haxe/io/BytesOutput.hx
rename to std/php/_std/haxe/io/BytesOutput.hx
index 21c880661da19b1fdf6786e46f000909025d97fe..c4bb2556c94387570f893fec202dea0e517c1767 100644
--- a/std/php7/_std/haxe/io/BytesOutput.hx
+++ b/std/php/_std/haxe/io/BytesOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 class BytesOutput extends Output {
+	var b:BytesBuffer;
 
-	var b : BytesBuffer;
-
-	/** The length of the stream in bytes. **/
-	public var length(get,never) : Int;
+	public var length(get, never):Int;
 
 	public function new() {
 		b = new BytesBuffer();
@@ -36,22 +35,16 @@ class BytesOutput extends Output {
 		b.addByte(c);
 	}
 
-	override function writeBytes( buf : Bytes, pos, len ) : Int {
-		b.addBytes(buf,pos,len);
+	override function writeBytes(buf:Bytes, pos, len):Int {
+		b.addBytes(buf, pos, len);
 		return len;
 	}
 
-	/**
-		Returns the `Bytes` of this output.
-
-		This function should not be called more than once on a given
-		`BytesOutput` instance.
-	**/
-	public function getBytes() : Bytes {
+	public function getBytes():Bytes {
 		return b.getBytes();
 	}
 
-	inline function get_length() : Int {
+	inline function get_length():Int {
 		return b.length;
 	}
 }
diff --git a/std/php7/_std/haxe/io/FPHelper.hx b/std/php/_std/haxe/io/FPHelper.hx
similarity index 66%
rename from std/php7/_std/haxe/io/FPHelper.hx
rename to std/php/_std/haxe/io/FPHelper.hx
index 41f2f20f61abb3db5ed6e3b5dd86ddabf746799b..b7fe91a0928782b1bc643a9164e1c1a61e397786 100644
--- a/std/php7/_std/haxe/io/FPHelper.hx
+++ b/std/php/_std/haxe/io/FPHelper.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,37 +19,28 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.io;
 
 import php.*;
 
-/**
-	Helper that converts between floating point and binary representation.
-	Always works in low-endian encoding.
-**/
 class FPHelper {
-
-	static var isLittleEndian : Bool = Global.unpack('S','\x01\x00')[1] == 1;
+	static var isLittleEndian:Bool = Global.unpack('S', '\x01\x00')[1] == 1;
 	static var i64tmp = Int64.ofInt(0);
 
-	public static inline function i32ToFloat( i : Int ) : Float {
+	public static inline function i32ToFloat(i:Int):Float {
 		return Global.unpack('f', Global.pack('l', i))[1];
 	}
 
-	public static inline function floatToI32( f : Float ) : Int {
+	public static inline function floatToI32(f:Float):Int {
 		return Global.unpack('l', Global.pack('f', f))[1];
 	}
 
-	public static inline function i64ToDouble( low : Int, high : Int ) : Float {
+	public static inline function i64ToDouble(low:Int, high:Int):Float {
 		return Global.unpack('d', Global.pack('ii', isLittleEndian ? low : high, isLittleEndian ? high : low))[1];
 	}
 
-	/**
-		Returns an Int64 representing the bytes representation of the double precision IEEE float value.
-		WARNING : for performance reason, the same Int64 value might be reused every time. Copy its low/high values before calling again.
-		We still ensure that this is safe to use in a multithread environment
-	**/
-	public static function doubleToI64( v : Float ) : Int64 {
+	public static function doubleToI64(v:Float):Int64 {
 		var a = Global.unpack(isLittleEndian ? 'V2' : 'N2', Global.pack('d', v));
 		var i64 = i64tmp;
 		@:privateAccess i64.set_low(a[isLittleEndian ? 1 : 2]);
@@ -57,5 +48,4 @@ class FPHelper {
 
 		return i64;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/js/html/compat/ArrayBuffer.hx b/std/php/_std/haxe/iterators/StringIteratorUnicode.hx
similarity index 52%
rename from std/js/html/compat/ArrayBuffer.hx
rename to std/php/_std/haxe/iterators/StringIteratorUnicode.hx
index 1a152faff3a08646ea46f42a9d8e19021e883c51..0a80b7005940b6e897e338c46857b4302c7d84ca 100644
--- a/std/js/html/compat/ArrayBuffer.hx
+++ b/std/php/_std/haxe/iterators/StringIteratorUnicode.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,43 +19,48 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package js.html.compat;
 
-#if !nodejs
-@:ifFeature("js.html.ArrayBuffer.*")
-class ArrayBuffer {
+package haxe.iterators;
 
-	public var byteLength : Int;
-	var a : Array<Int>;
+import php.Global.*;
+import php.NativeString;
 
-	public function new( ?a : Dynamic ) {
-		if( Std.is(a,Array) ) {
-			this.a = a;
-			byteLength = a.length;
-		} else {
-			var len : Int = a;
-			this.a = [];
-			for( i in 0...len )
-				this.a[i] = 0;
-			byteLength = len;
-		}
+class StringIteratorUnicode {
+	var byteOffset:Int = 0;
+	var totalBytes:Int;
+	var s:NativeString;
+
+	public inline function new(s:String) {
+		this.s = s;
+		totalBytes = strlen(s);
 	}
 
-	public function slice(begin,?end) {
-		return new ArrayBuffer(a.slice(begin,end));
+	public inline function hasNext() {
+		return byteOffset < totalBytes;
 	}
 
-	static function sliceImpl(begin,?end) {
-		var u = new js.html.Uint8Array(js.Lib.nativeThis, begin, end == null ? null : end - begin);
-		var result = new js.html.ArrayBuffer(u.byteLength);
-		var resultArray = new js.html.Uint8Array(result);
-		resultArray.set(u);
-		return result;
+	public inline function next() {
+		var code = ord(s[byteOffset]);
+		if (code < 0xC0) {
+			byteOffset++;
+		} else if (code < 0xE0) {
+			code = ((code - 0xC0) << 6) + ord(s[byteOffset + 1]) - 0x80;
+			byteOffset += 2;
+		} else if (code < 0xF0) {
+			code = ((code - 0xE0) << 12) + ((ord(s[byteOffset + 1]) - 0x80) << 6) + ord(s[byteOffset + 2]) - 0x80;
+			byteOffset += 3;
+		} else {
+			code = ((code - 0xF0) << 18)
+				+ ((ord(s[byteOffset + 1]) - 0x80) << 12)
+				+ ((ord(s[byteOffset + 2]) - 0x80) << 6)
+				+ ord(s[byteOffset + 3])
+				- 0x80;
+			byteOffset += 4;
+		}
+		return code;
 	}
 
-	static function __init__() untyped {
-		var ArrayBuffer = js.Lib.global.ArrayBuffer || js.html.compat.ArrayBuffer;
-		if( ArrayBuffer.prototype.slice == null ) ArrayBuffer.prototype.slice = sliceImpl; // IE10
+	static public inline function unicodeIterator(s:String) {
+		return new StringIteratorUnicode(s);
 	}
 }
-#end
\ No newline at end of file
diff --git a/std/php/_std/haxe/iterators/StringKeyValueIteratorUnicode.hx b/std/php/_std/haxe/iterators/StringKeyValueIteratorUnicode.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5d6b51ddf43a4c9e363b2c59b221ff903f6a4618
--- /dev/null
+++ b/std/php/_std/haxe/iterators/StringKeyValueIteratorUnicode.hx
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.iterators;
+
+import php.Global.*;
+import php.NativeString;
+
+class StringKeyValueIteratorUnicode {
+	var charOffset:Int = 0;
+	var byteOffset:Int = 0;
+	var totalBytes:Int;
+	var s:NativeString;
+
+	public inline function new(s:String) {
+		this.s = s;
+		totalBytes = strlen(s);
+	}
+
+	public inline function hasNext() {
+		return byteOffset < totalBytes;
+	}
+
+	public inline function next() {
+		var code = ord(s[byteOffset]);
+		if (code < 0xC0) {
+			byteOffset++;
+		} else if (code < 0xE0) {
+			code = ((code - 0xC0) << 6) + ord(s[byteOffset + 1]) - 0x80;
+			byteOffset += 2;
+		} else if (code < 0xF0) {
+			code = ((code - 0xE0) << 12) + ((ord(s[byteOffset + 1]) - 0x80) << 6) + ord(s[byteOffset + 2]) - 0x80;
+			byteOffset += 3;
+		} else {
+			code = ((code - 0xF0) << 18)
+				+ ((ord(s[byteOffset + 1]) - 0x80) << 12)
+				+ ((ord(s[byteOffset + 2]) - 0x80) << 6)
+				+ ord(s[byteOffset + 3])
+				- 0x80;
+			byteOffset += 4;
+		}
+		return {key: charOffset++, value: code};
+	}
+
+	static public inline function unicodeKeyValueIterator(s:String) {
+		return new StringKeyValueIteratorUnicode(s);
+	}
+}
diff --git a/std/php/_std/haxe/xml/Parser.hx b/std/php/_std/haxe/xml/Parser.hx
new file mode 100644
index 0000000000000000000000000000000000000000..216a96ec81ff8d19f63229b8c80075c2348d5d70
--- /dev/null
+++ b/std/php/_std/haxe/xml/Parser.hx
@@ -0,0 +1,401 @@
+/*
+ * Copyright (C)2005-2019 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 haxe.xml;
+
+import php.Global;
+import php.Syntax;
+import php.NativeString;
+
+using haxe.xml.Parser;
+
+private enum abstract S(Int) {
+	var IGNORE_SPACES;
+	var BEGIN;
+	var BEGIN_NODE;
+	var TAG_NAME;
+	var BODY;
+	var ATTRIB_NAME;
+	var EQUALS;
+	var ATTVAL_BEGIN;
+	var ATTRIB_VAL;
+	var CHILDS;
+	var CLOSE;
+	var WAIT_END;
+	var WAIT_END_RET;
+	var PCDATA;
+	var HEADER;
+	var COMMENT;
+	var DOCTYPE;
+	var CDATA;
+	var ESCAPE;
+}
+
+class XmlParserException {
+	public var message:String;
+
+	public var lineNumber:Int;
+
+	public var positionAtLine:Int;
+
+	public var position:Int;
+
+	public var xml:String;
+
+	public function new(message:String, xml:String, position:Int) {
+		this.xml = xml;
+		this.message = message;
+		this.position = position;
+		lineNumber = 1;
+		positionAtLine = 0;
+
+		for (i in 0...position) {
+			var c = (xml : NativeString).fastCodeAt(i);
+			if (c == '\n'.code) {
+				lineNumber++;
+				positionAtLine = 0;
+			} else {
+				if (c != '\r'.code)
+					positionAtLine++;
+			}
+		}
+	}
+
+	public function toString():String {
+		return Type.getClassName(Type.getClass(this)) + ": " + message + " at line " + lineNumber + " char " + positionAtLine;
+	}
+}
+
+class Parser {
+	static var escapes = {
+		var h = new haxe.ds.StringMap();
+		h.set("lt", "<");
+		h.set("gt", ">");
+		h.set("amp", "&");
+		h.set("quot", '"');
+		h.set("apos", "'");
+		h;
+	}
+
+	static public function parse(str:String, strict = false) {
+		var doc = Xml.createDocument();
+		doParse(str, strict, 0, doc);
+		return doc;
+	}
+
+	static function doParse(str:NativeString, strict:Bool, p:Int = 0, ?parent:Xml):Int {
+		var xml:Xml = null;
+		var state = S.BEGIN;
+		var next = S.BEGIN;
+		var aname = null;
+		var start = 0;
+		var nsubs = 0;
+		var nbrackets = 0;
+		var c = str.fastCodeAt(p);
+		var buf:NativeString = '';
+		// need extra state because next is in use
+		var escapeNext = S.BEGIN;
+		var attrValQuote = -1;
+		inline function addChild(xml:Xml) {
+			parent.addChild(xml);
+			nsubs++;
+		}
+		while (!StringTools.isEof(c)) {
+			switch (state) {
+				case S.IGNORE_SPACES:
+					switch (c) {
+						case '\n'.code, '\r'.code, '\t'.code, ' '.code:
+						default:
+							state = next;
+							continue;
+					}
+				case S.BEGIN:
+					switch (c) {
+						case '<'.code:
+							state = S.IGNORE_SPACES;
+							next = S.BEGIN_NODE;
+						default:
+							start = p;
+							state = S.PCDATA;
+							continue;
+					}
+				case S.PCDATA:
+					if (c == '<'.code) {
+						buf = buf.addSub(str, start, p - start);
+						var child = Xml.createPCData(buf);
+						buf = '';
+						addChild(child);
+						state = S.IGNORE_SPACES;
+						next = S.BEGIN_NODE;
+					} else if (c == '&'.code) {
+						buf = buf.addSub(str, start, p - start);
+						state = S.ESCAPE;
+						escapeNext = S.PCDATA;
+						start = p + 1;
+					}
+				case S.CDATA:
+					if (c == ']'.code && str.fastCodeAt(p + 1) == ']'.code && str.fastCodeAt(p + 2) == '>'.code) {
+						var child = Xml.createCData(str.substr(start, p - start));
+						addChild(child);
+						p += 2;
+						state = S.BEGIN;
+					}
+				case S.BEGIN_NODE:
+					switch (c) {
+						case '!'.code:
+							if (str.fastCodeAt(p + 1) == '['.code) {
+								p += 2;
+								if (Global.strtoupper(str.substr(p, 6)) != "CDATA[")
+									throw new XmlParserException("Expected <![CDATA[", str, p);
+								p += 5;
+								state = S.CDATA;
+								start = p + 1;
+							} else if (str.fastCodeAt(p + 1) == 'D'.code || str.fastCodeAt(p + 1) == 'd'.code) {
+								if (Global.strtoupper(str.substr(p + 2, 6)) != "OCTYPE")
+									throw new XmlParserException("Expected <!DOCTYPE", str, p);
+								p += 8;
+								state = S.DOCTYPE;
+								start = p + 1;
+							} else if (str.fastCodeAt(p + 1) != '-'.code || str.fastCodeAt(p + 2) != '-'.code)
+								throw new XmlParserException("Expected <!--", str, p);
+							else {
+								p += 2;
+								state = S.COMMENT;
+								start = p + 1;
+							}
+						case '?'.code:
+							state = S.HEADER;
+							start = p;
+						case '/'.code:
+							if (parent == null)
+								throw new XmlParserException("Expected node name", str, p);
+							start = p + 1;
+							state = S.IGNORE_SPACES;
+							next = S.CLOSE;
+						default:
+							state = S.TAG_NAME;
+							start = p;
+							continue;
+					}
+				case S.TAG_NAME:
+					if (!isValidChar(c)) {
+						if (p == start)
+							throw new XmlParserException("Expected node name", str, p);
+						xml = Xml.createElement(str.substr(start, p - start));
+						addChild(xml);
+						state = S.IGNORE_SPACES;
+						next = S.BODY;
+						continue;
+					}
+				case S.BODY:
+					switch (c) {
+						case '/'.code:
+							state = S.WAIT_END;
+						case '>'.code:
+							state = S.CHILDS;
+						default:
+							state = S.ATTRIB_NAME;
+							start = p;
+							continue;
+					}
+				case S.ATTRIB_NAME:
+					if (!isValidChar(c)) {
+						var tmp;
+						if (start == p)
+							throw new XmlParserException("Expected attribute name", str, p);
+						tmp = str.substr(start, p - start);
+						aname = tmp;
+						if (xml.exists(aname))
+							throw new XmlParserException("Duplicate attribute [" + aname + "]", str, p);
+						state = S.IGNORE_SPACES;
+						next = S.EQUALS;
+						continue;
+					}
+				case S.EQUALS:
+					switch (c) {
+						case '='.code:
+							state = S.IGNORE_SPACES;
+							next = S.ATTVAL_BEGIN;
+						default:
+							throw new XmlParserException("Expected =", str, p);
+					}
+				case S.ATTVAL_BEGIN:
+					switch (c) {
+						case '"'.code | '\''.code:
+							buf = '';
+							state = S.ATTRIB_VAL;
+							start = p + 1;
+							attrValQuote = c;
+						default:
+							throw new XmlParserException("Expected \"", str, p);
+					}
+				case S.ATTRIB_VAL:
+					switch (c) {
+						case '&'.code:
+							buf = buf.addSub(str, start, p - start);
+							state = S.ESCAPE;
+							escapeNext = S.ATTRIB_VAL;
+							start = p + 1;
+						case '>'.code | '<'.code if (strict):
+							// HTML allows these in attributes values
+							throw new XmlParserException("Invalid unescaped " + String.fromCharCode(c) + " in attribute value", str, p);
+						case _ if (c == attrValQuote):
+							buf = buf.addSub(str, start, p - start);
+							var val = buf;
+							buf = '';
+							xml.set(aname, val);
+							state = S.IGNORE_SPACES;
+							next = S.BODY;
+					}
+				case S.CHILDS:
+					p = doParse(str, strict, p, xml);
+					start = p;
+					state = S.BEGIN;
+				case S.WAIT_END:
+					switch (c) {
+						case '>'.code:
+							state = S.BEGIN;
+						default:
+							throw new XmlParserException("Expected >", str, p);
+					}
+				case S.WAIT_END_RET:
+					switch (c) {
+						case '>'.code:
+							if (nsubs == 0)
+								parent.addChild(Xml.createPCData(""));
+							return p;
+						default:
+							throw new XmlParserException("Expected >", str, p);
+					}
+				case S.CLOSE:
+					if (!isValidChar(c)) {
+						if (start == p)
+							throw new XmlParserException("Expected node name", str, p);
+
+						var v = str.substr(start, p - start);
+						if (parent == null || parent.nodeType != Element) {
+							throw new XmlParserException('Unexpected </$v>, tag is not open', str, p);
+						}
+						if (v != parent.nodeName)
+							throw new XmlParserException("Expected </" + parent.nodeName + ">", str, p);
+
+						state = S.IGNORE_SPACES;
+						next = S.WAIT_END_RET;
+						continue;
+					}
+				case S.COMMENT:
+					if (c == '-'.code && str.fastCodeAt(p + 1) == '-'.code && str.fastCodeAt(p + 2) == '>'.code) {
+						addChild(Xml.createComment(str.substr(start, p - start)));
+						p += 2;
+						state = S.BEGIN;
+					}
+				case S.DOCTYPE:
+					if (c == '['.code)
+						nbrackets++;
+					else if (c == ']'.code)
+						nbrackets--;
+					else if (c == '>'.code && nbrackets == 0) {
+						addChild(Xml.createDocType(str.substr(start, p - start)));
+						state = S.BEGIN;
+					}
+				case S.HEADER:
+					if (c == '?'.code && str.fastCodeAt(p + 1) == '>'.code) {
+						p++;
+						var str = str.substr(start + 1, p - start - 2);
+						addChild(Xml.createProcessingInstruction(str));
+						state = S.BEGIN;
+					}
+				case S.ESCAPE:
+					if (c == ';'.code) {
+						var s = str.substr(start, p - start);
+						if (s.fastCodeAt(0) == '#'.code) {
+							var c = s.fastCodeAt(1) == 'x'.code ? Std.parseInt("0" + s.substr(1,
+								Global.strlen(s) - 1)) : Std.parseInt(s.substr(1, Global.strlen(s) - 1));
+							buf = Syntax.concat(buf, Global.mb_chr(c));
+						} else if (!escapes.exists(s)) {
+							if (strict)
+								throw new XmlParserException("Undefined entity: " + s, str, p);
+							buf = Syntax.concat(buf, '&$s;');
+						} else {
+							buf = Syntax.concat(buf, escapes.get(s));
+						}
+						start = p + 1;
+						state = escapeNext;
+					} else if (!isValidChar(c) && c != "#".code) {
+						if (strict)
+							throw new XmlParserException("Invalid character in entity: " + String.fromCharCode(c), str, p);
+						buf = Syntax.concat(buf, "&");
+						buf = buf.addSub(str, start, p - start);
+						p--;
+						start = p + 1;
+						state = escapeNext;
+					}
+			}
+			c = str.fastCodeAt(++p);
+		}
+
+		if (state == S.BEGIN) {
+			start = p;
+			state = S.PCDATA;
+		}
+
+		if (state == S.PCDATA) {
+			if (parent.nodeType == Element) {
+				throw new XmlParserException("Unclosed node <" + parent.nodeName + ">", str, p);
+			}
+			if (p != start || nsubs == 0) {
+				buf = buf.addSub(str, start, p - start);
+				addChild(Xml.createPCData(buf));
+			}
+			return p;
+		}
+
+		if (!strict && state == S.ESCAPE && escapeNext == S.PCDATA) {
+			buf = Syntax.concat(buf, "&");
+			buf = buf.addSub(str, start, p - start);
+			addChild(Xml.createPCData(buf));
+			return p;
+		}
+
+		throw new XmlParserException("Unexpected end", str, p);
+	}
+
+	static inline function isValidChar(c) {
+		return (c >= 'a'.code && c <= 'z'.code) || (c >= 'A'.code && c <= 'Z'.code) || (c >= '0'.code && c <= '9'.code) || c == ':'.code || c == '.'.code
+			|| c == '_'.code || c == '-'.code;
+	}
+
+	// TODO: rewrite the parser using a buffer instead of a string as the data source
+
+	@:allow(haxe.xml.XmlParserException)
+	static inline function fastCodeAt(s:NativeString, pos:Int):Int {
+		return pos >= Global.strlen(s) ? 0 : Global.ord(s[pos]);
+	}
+
+	static inline function substr(s:NativeString, pos:Int, ?length:Int):NativeString {
+		return Global.substr(s, pos, length);
+	}
+
+	static inline function addSub(buf:NativeString, s:NativeString, pos:Int, length:Int):NativeString {
+		return Syntax.concat(buf, Global.substr(s, pos, length));
+	}
+}
diff --git a/std/php/_std/haxe/zip/Compress.hx b/std/php/_std/haxe/zip/Compress.hx
index d1cf82368e560b785d3345a4a78df1691ee24f14..175b352563a37925068c164871a5f0fa5122ffe0 100644
--- a/std/php/_std/haxe/zip/Compress.hx
+++ b/std/php/_std/haxe/zip/Compress.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,21 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 @:coreApi
 class Compress {
+	private var level:Int;
 
-	private var level : Int;
-
-	public function new( level : Int ) : Void {
+	public function new(level:Int):Void {
 		this.level = level;
 	}
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
-		var input = src.sub( srcPos , src.length - srcPos );
-		var data = run( input , level );
-		dst.blit( dstPos , data , 0 , data.length );
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
+		var input = src.sub(srcPos, src.length - srcPos);
+		var data = run(input, level);
+		dst.blit(dstPos, data, 0, data.length);
 
 		return {
 			done: true,
@@ -42,14 +42,12 @@ class Compress {
 		};
 	}
 
-	public function setFlushMode( f : FlushMode ) : Void {
-	}
+	public function setFlushMode(f:FlushMode):Void {}
 
-	public function close() : Void {
-	}
+	public function close():Void {}
 
-	public static function run( s : haxe.io.Bytes, level : Int ) : haxe.io.Bytes {
-		var c = untyped __call__("gzcompress", s.toString(), level);
+	public static function run(s:haxe.io.Bytes, level:Int):haxe.io.Bytes {
+		var c = php.Global.gzcompress(s.toString(), level);
 		return haxe.io.Bytes.ofString(c);
 	}
 }
diff --git a/std/php/_std/haxe/zip/Uncompress.hx b/std/php/_std/haxe/zip/Uncompress.hx
index 1a16bcb2cce906f03999da92775fd780c25b57cc..10a85ffdbabf44ef71aaad1c1dbf3ec96dde0895 100644
--- a/std/php/_std/haxe/zip/Uncompress.hx
+++ b/std/php/_std/haxe/zip/Uncompress.hx
@@ -19,27 +19,30 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.zip;
 
 class Uncompress {
+	public function new(?windowBits:Int) {}
 
-	public function new( ?windowBits : Int ) {
-		throw "Not implemented for this platform";
-	}
+	public function execute(src:haxe.io.Bytes, srcPos:Int, dst:haxe.io.Bytes, dstPos:Int):{done:Bool, read:Int, write:Int} {
+		var input = src.sub(srcPos, src.length - srcPos);
+		var data = run(input);
+		dst.blit(dstPos, data, 0, data.length);
 
-	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
-		return null;
+		return {
+			done: true,
+			read: input.length,
+			write: data.length
+		};
 	}
 
-	public function setFlushMode( f : FlushMode ) {
-	}
+	public function setFlushMode(f:FlushMode) {}
 
-	public function close() {
-	}
+	public function close() {}
 
-	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
-		var c = untyped __call__("gzuncompress", src.toString());
+	public static function run(src:haxe.io.Bytes, ?bufsize:Int):haxe.io.Bytes {
+		var c = php.Global.gzuncompress(src.toString());
 		return haxe.io.Bytes.ofString(c);
 	}
-
 }
diff --git a/std/php/_std/sys/FileSystem.hx b/std/php/_std/sys/FileSystem.hx
index 3ff223ff8f0ecdeb84cf931f1e0e385b56af7414..a6b5b1cf7038497b8a194ab047428738a7f787ae 100644
--- a/std/php/_std/sys/FileSystem.hx
+++ b/std/php/_std/sys/FileSystem.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,95 +19,106 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys;
 
+import php.*;
+import haxe.io.Path;
+
 private enum FileKind {
 	kdir;
 	kfile;
-	kother( k : String );
+	kother(k:String);
 }
 
 @:coreApi
 class FileSystem {
-
-	public static inline function exists( path : String ) : Bool {
-		return untyped __call__("file_exists", path);
+	public static inline function exists(path:String):Bool {
+		Global.clearstatcache(true, path);
+		return Global.file_exists(path);
 	}
 
-	public static inline function rename( path : String, newPath : String ) : Void {
-		untyped __call__("rename", path, newPath);
+	public static inline function rename(path:String, newPath:String):Void {
+		Global.rename(path, newPath);
 	}
 
-	public static function stat( path : String ) : FileStat {
-		untyped __php__("$fstat = stat($path);");
-		return untyped {
-			gid   : __php__("$fstat['gid']"),
-			uid   : __php__("$fstat['uid']"),
-			atime : Date.fromTime(__php__("$fstat['atime']")*1000),
-			mtime : Date.fromTime(__php__("$fstat['mtime']")*1000),
-			ctime : Date.fromTime(__php__("$fstat['ctime']")*1000),
-			dev   : __php__("$fstat['dev']"),
-			ino   : __php__("$fstat['ino']"),
-			nlink : __php__("$fstat['nlink']"),
-			rdev  : __php__("$fstat['rdev']"),
-			size  : __php__("$fstat['size']"),
-			mode  : __php__("$fstat['mode']")
+	public static function stat(path:String):FileStat {
+		Global.clearstatcache(true, path);
+		var info = Global.stat(path);
+		if (info == false)
+			throw 'Unable to stat $path';
+		var info:NativeArray = info;
+
+		return {
+			gid: info['gid'],
+			uid: info['uid'],
+			atime: Date.fromTime(info['atime'] * 1000),
+			mtime: Date.fromTime(info['mtime'] * 1000),
+			ctime: Date.fromTime(info['ctime'] * 1000),
+			dev: info['dev'],
+			ino: info['ino'],
+			nlink: info['nlink'],
+			rdev: info['rdev'],
+			size: info['size'],
+			mode: info['mode']
 		};
 	}
 
-	public static inline function fullPath( relPath : String ) : String {
-		var p = untyped __call__("realpath", relPath);
-		if (untyped __physeq__(p, false))
-			return null;
-		else
-			return p;
+	public static inline function fullPath(relPath:String):String {
+		return Syntax.shortTernary(Global.realpath(relPath), null);
 	}
 
-	public static function absolutePath ( relPath : String ) : String {
-		if (haxe.io.Path.isAbsolute(relPath)) return relPath;
-		return haxe.io.Path.join([Sys.getCwd(), relPath]);
+	public static function absolutePath(relPath:String):String {
+		if (Path.isAbsolute(relPath))
+			return relPath;
+		return Path.join([Sys.getCwd(), relPath]);
 	}
 
-	static function kind( path : String ) : FileKind {
-		var k = untyped __call__("filetype", path);
-		switch(k) {
-			case "file": return kfile;
-			case "dir": return kdir;
-			default: return kother(k);
+	static function kind(path:String):FileKind {
+		Global.clearstatcache(true, path);
+		var kind = Global.filetype(path);
+		if (kind == false)
+			throw 'Failed to check file type $path';
+
+		switch (kind) {
+			case "file":
+				return kfile;
+			case "dir":
+				return kdir;
+			default:
+				return kother(kind);
 		}
 	}
 
-	public static inline function isDirectory( path : String ) : Bool {
-		return untyped __call__("is_dir", path);
+	public static function isDirectory(path:String):Bool {
+		Global.clearstatcache(true, path);
+		return Global.is_dir(path);
 	}
 
-	public static inline function createDirectory( path : String ) : Void {
-		var path = haxe.io.Path.addTrailingSlash(path);
-		var _p = null;
-		var parts = [];
-		while (path != (_p = haxe.io.Path.directory(path))) {
-			parts.unshift(path);
-			path = _p;
-		}
-		for (part in parts) {
-			if (part.charCodeAt(part.length - 1) != ":".code && !exists(part))
-				untyped __call__("@mkdir", part, 493); // php default is 0777, neko is 0755
-		}
+	public static function createDirectory(path:String):Void {
+		Global.clearstatcache(true, path);
+		if (!Global.is_dir(path))
+			Global.mkdir(path, 493, true);
 	}
 
-	public static inline function deleteFile( path : String ) : Void {
-		untyped __call__("unlink", path);
+	public static inline function deleteFile(path:String):Void {
+		Global.unlink(path);
 	}
 
-	public static inline function deleteDirectory( path : String ) : Void {
-		untyped __call__("rmdir", path);
+	public static inline function deleteDirectory(path:String):Void {
+		Global.rmdir(path);
 	}
 
-	public static function readDirectory( path : String ) : Array<String> {
-		var l = untyped __call__("array");
-		untyped __php__("$dh = opendir($path);
-        while (($file = readdir($dh)) !== false) if(\".\" != $file && \"..\" != $file) $l[] = $file;
-        closedir($dh);");
-		return untyped __call__("new _hx_array", l);
+	public static function readDirectory(path:String):Array<String> {
+		var list = [];
+		var dir = Global.opendir(path);
+		var file;
+		while ((file = Global.readdir(dir)) != false) {
+			if (file != '.' && file != '..') {
+				list.push(file);
+			}
+		}
+		Global.closedir(dir);
+		return list;
 	}
 }
diff --git a/std/php/_std/sys/db/Mysql.hx b/std/php/_std/sys/db/Mysql.hx
index cc6074117f1f73bc3f3e5e26c473aba967b69c48..7321b5880497cbea354ede6648e405c86141437c 100644
--- a/std/php/_std/sys/db/Mysql.hx
+++ b/std/php/_std/sys/db/Mysql.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,30 +19,250 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
-import sys.db.Connection;
+import php.*;
+import sys.db.*;
+import php.db.*;
+import php.db.Mysqli_result;
 
 @:coreApi class Mysql {
+	public static function connect(params:{
+		host:String,
+		?port:Int,
+		user:String,
+		pass:String,
+		?socket:String,
+		?database:String
+	}):Connection {
+		return new MysqlConnection(params);
+	}
+}
+
+private class MysqlConnection implements Connection {
+	var db:Mysqli;
+
+	public function new(params:{
+		host:String,
+		?port:Int,
+		user:String,
+		pass:String,
+		?socket:String,
+		?database:String
+	}):Void {
+		if (params.port == null)
+			params.port = Std.parseInt(Global.ini_get('mysqli.default_port'));
+		if (params.socket == null)
+			params.socket = Global.ini_get('mysqli.default_socket');
+		if (params.database == null)
+			params.database = "";
 
-	public static function connect( params : {
-		host : String,
-		?port : Int,
-		user : String,
-		pass : String,
-		?socket : String,
-		database : String
-	} ) : sys.db.Connection {
-		var dsn="mysql:";
-		if (params.socket !=null)
-			dsn+="unix_socket="+params.socket+";";
-		else{
-			dsn+="host="+params.host+";";
-			if (params.port!=null)
-				dsn+='port='+params.port+";";
+		db = new Mysqli(params.host, params.user, params.pass, params.database, params.port, params.socket);
+	}
+
+	public function request(s:String):ResultSet {
+		var result = db.query(s);
+		if (result == false)
+			throw 'Failed to perform db query: ' + db.error;
+		if (result == true) {
+			return new WriteMysqlResultSet(db.affected_rows);
 		}
-		dsn+="dbname="+params.database;
-		return php.db.PDO.open(dsn,params.user,params.pass);
+
+		return new MysqlResultSet(result);
+	}
+
+	public function close():Void {
+		db.close();
+	}
+
+	public function escape(s:String):String {
+		return db.escape_string(s);
+	}
+
+	public function quote(s:String):String {
+		if (s.indexOf("\000") >= 0)
+			return "x'" + Global.bin2hex(s) + "'";
+		return "'" + db.escape_string(s) + "'";
+	}
+
+	public function addValue(s:StringBuf, v:Dynamic):Void {
+		if (Global.is_int(v) || Global.is_null(v)) {
+			s.add(v);
+		} else if (Global.is_bool(v)) {
+			s.add(v ? 1 : 0);
+		} else {
+			s.add(quote(Std.string(v)));
+		}
+	}
+
+	public function lastInsertId():Int {
+		return db.insert_id;
 	}
 
+	public function dbName():String {
+		return 'MySQL';
+	}
+
+	public function startTransaction():Void {
+		var success = db.begin_transaction();
+		if (!success)
+			throw 'Failed to start transaction: ' + db.error;
+	}
+
+	public function commit():Void {
+		var success = db.commit();
+		if (!success)
+			throw 'Failed to commit transaction: ' + db.error;
+	}
+
+	public function rollback():Void {
+		var success = db.rollback();
+		if (!success)
+			throw 'Failed to rollback transaction: ' + db.error;
+	}
+}
+
+private class MysqlResultSet implements ResultSet {
+	static var hxAnonClassName = Boot.getHxAnon().phpClassName;
+
+	public var length(get, null):Int;
+	public var nfields(get, null):Int;
+
+	var result:Mysqli_result;
+	var fetchedRow:NativeAssocArray<Scalar>;
+	var fieldsInfo:NativeAssocArray<MysqliFieldInfo>;
+
+	public function new(result:Mysqli_result) {
+		this.result = result;
+	}
+
+	public function hasNext():Bool {
+		if (fetchedRow == null)
+			fetchNext();
+		return fetchedRow != null;
+	}
+
+	public function next():Dynamic {
+		if (fetchedRow == null)
+			fetchNext();
+		return withdrawFetched();
+	}
+
+	public function results():List<Dynamic> {
+		var list = new List();
+
+		result.data_seek(0);
+		var row = result.fetch_object(hxAnonClassName);
+		while (row != null) {
+			row = correctObjectTypes(row);
+			list.add(row);
+			row = result.fetch_object(hxAnonClassName);
+		}
+
+		return list;
+	}
+
+	public function getResult(n:Int):String {
+		if (fetchedRow == null)
+			fetchNext();
+		return Global.array_values(fetchedRow)[n];
+	}
+
+	public function getIntResult(n:Int):Int {
+		return Syntax.int(getResult(n));
+	}
+
+	public function getFloatResult(n:Int):Float {
+		return Syntax.float(getResult(n));
+	}
+
+	public function getFieldsNames():Null<Array<String>> {
+		var fields = result.fetch_fields();
+		return [for (field in fields) field.name];
+	}
+
+	function fetchNext() {
+		var row = result.fetch_assoc();
+		if (row != null)
+			fetchedRow = correctArrayTypes(row);
+	}
+
+	function withdrawFetched():Dynamic {
+		if (fetchedRow == null)
+			return null;
+		var row = fetchedRow;
+		fetchedRow = null;
+		return Boot.createAnon(row);
+	}
+
+	function correctArrayTypes(row:NativeAssocArray<String>):NativeAssocArray<Scalar> {
+		var fieldsInfo = getFieldsInfo();
+		Syntax.foreach(row, function(field:String, value:String) {
+			row[field] = correctType(value, fieldsInfo[field].type);
+		});
+		return cast row;
+	}
+
+	function correctObjectTypes(row:{}):{} {
+		var fieldsInfo = getFieldsInfo();
+		Syntax.foreach(row, function(field:String, value:String) {
+			value = correctType(value, fieldsInfo[field].type);
+			Syntax.setField(row, field, value);
+		});
+		return row;
+	}
+
+	inline function getFieldsInfo():NativeAssocArray<MysqliFieldInfo> {
+		if (fieldsInfo == null) {
+			fieldsInfo = cast Syntax.arrayDecl();
+			Syntax.foreach(result.fetch_fields(), function(_, info) {
+				fieldsInfo[info.name] = info;
+			});
+		}
+		return fieldsInfo;
+	}
+
+	function correctType(value:String, type:Int):Scalar {
+		if (value == null)
+			return null;
+		if (type == Const.MYSQLI_TYPE_BIT || type == Const.MYSQLI_TYPE_TINY || type == Const.MYSQLI_TYPE_SHORT || type == Const.MYSQLI_TYPE_LONG
+			|| type == Const.MYSQLI_TYPE_INT24 || type == Const.MYSQLI_TYPE_CHAR) {
+			return Syntax.int(value);
+		}
+		if (type == Const.MYSQLI_TYPE_DECIMAL
+			|| type == Const.MYSQLI_TYPE_NEWDECIMAL
+			|| type == Const.MYSQLI_TYPE_FLOAT
+			|| type == Const.MYSQLI_TYPE_DOUBLE) {
+			return Syntax.float(value);
+		}
+		return value;
+	}
+
+	function get_length()
+		return result.num_rows;
+
+	function get_nfields()
+		return result.field_count;
+}
+
+private class WriteMysqlResultSet extends MysqlResultSet {
+	var affectedRows:Int = 0;
+
+	public function new(affectedRows:Int) {
+		super(null);
+		this.affectedRows = affectedRows;
+	}
+
+	override public function hasNext():Bool {
+		return false;
+	}
+
+	override function fetchNext() {}
+
+	override function get_length()
+		return affectedRows;
+
+	override function get_nfields()
+		return 0;
 }
diff --git a/std/php/_std/sys/db/Sqlite.hx b/std/php/_std/sys/db/Sqlite.hx
index a136696f2735f60ba4fab661e2fc0c9097e71bf9..c60c2afb134be8e0148e14c41980b0b60347a217 100644
--- a/std/php/_std/sys/db/Sqlite.hx
+++ b/std/php/_std/sys/db/Sqlite.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,187 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
+import php.*;
+import php.db.*;
+import sys.db.*;
+
 @:coreApi class Sqlite {
+	public static function open(file:String):Connection {
+		return new SQLiteConnection(file);
+	}
+}
+
+private class SQLiteConnection implements Connection {
+	var db:SQLite3;
+
+	public function new(file:String) {
+		db = new SQLite3(file);
+		db.enableExceptions(true);
+	}
+
+	public function request(s:String):ResultSet {
+		var result = db.query(s);
+		return new SQLiteResultSet(result);
+	}
+
+	public function close():Void {
+		db.close();
+	}
+
+	public function escape(s:String):String {
+		return SQLite3.escapeString(s);
+	}
+
+	public function quote(s:String):String {
+		if (s.indexOf("\000") >= 0)
+			return "x'" + Global.bin2hex(s) + "'";
+		return "'" + SQLite3.escapeString(s) + "'";
+	}
+
+	public function addValue(s:StringBuf, v:Dynamic):Void {
+		if (Global.is_int(v) || Global.is_null(v)) {
+			s.add(v);
+		} else if (Global.is_bool(v)) {
+			s.add(v ? 1 : 0);
+		} else {
+			s.add(quote(Std.string(v)));
+		}
+	}
+
+	public function lastInsertId():Int {
+		return Syntax.int(db.lastInsertRowID());
+	}
+
+	public function dbName():String {
+		return 'SQLite';
+	}
+
+	public function startTransaction():Void {
+		db.query('BEGIN TRANSACTION');
+	}
+
+	public function commit():Void {
+		db.query('COMMIT');
+	}
+
+	public function rollback():Void {
+		db.query('ROLLBACK');
+	}
+}
+
+private class SQLiteResultSet implements ResultSet {
+	public var length(get, null):Int;
+	public var nfields(get, null):Int;
 
-	public static function open( file : String ) : Connection {
-		return php.db.PDO.open("sqlite:"+file);
+	var _length:Int = 0;
+	var _nfields:Int = 0;
+
+	var loaded:Bool = false;
+	var currentIndex:Int = 0;
+	var rows:NativeIndexedArray<NativeAssocArray<Scalar>>;
+	var result:SQLite3Result;
+	var fetchedRow:NativeArray;
+	var fieldsInfo:NativeAssocArray<Int>;
+
+	public function new(result:SQLite3Result) {
+		this.result = result;
+	}
+
+	public function hasNext():Bool {
+		if (!loaded)
+			load();
+		return currentIndex < _length;
+	}
+
+	public function next():Dynamic {
+		if (!loaded)
+			load();
+		var next:Dynamic = rows[currentIndex++];
+		return Boot.createAnon(correctArrayTypes(next));
+	}
+
+	public function results():List<Dynamic> {
+		if (!loaded)
+			load();
+		var list = new List();
+		Syntax.foreach(rows, function(_, row) list.add(Boot.createAnon(correctArrayTypes(row))));
+		return list;
+	}
+
+	public function getResult(n:Int):String {
+		if (!loaded)
+			load();
+		if (!hasNext())
+			return null;
+		return Global.array_values(rows[currentIndex])[n];
+	}
+
+	public function getIntResult(n:Int):Int {
+		return Syntax.int(getResult(n));
+	}
+
+	public function getFloatResult(n:Int):Float {
+		return Syntax.float(getResult(n));
 	}
 
-}
\ No newline at end of file
+	public function getFieldsNames():Null<Array<String>> {
+		var fieldsInfo = getFieldsInfo();
+		return Global.array_keys(fieldsInfo);
+	}
+
+	function correctArrayTypes(row:NativeAssocArray<String>):NativeAssocArray<Scalar> {
+		var fieldsInfo = getFieldsInfo();
+		Syntax.foreach(row, function(field:String, value:String) {
+			row[field] = correctType(value, fieldsInfo[field]);
+		});
+		return cast row;
+	}
+
+	inline function getFieldsInfo():NativeAssocArray<Int> {
+		if (fieldsInfo == null) {
+			fieldsInfo = cast Syntax.arrayDecl();
+			for (i in 0...nfields) {
+				fieldsInfo[result.columnName(i)] = result.columnType(i);
+			}
+		}
+		return fieldsInfo;
+	}
+
+	function load() {
+		loaded = true;
+		_nfields = result.numColumns();
+		getFieldsInfo();
+		fetchAll();
+	}
+
+	function correctType(value:String, type:Int):Scalar {
+		if (value == null)
+			return null;
+		if (type == Const.SQLITE3_INTEGER)
+			return Syntax.int(value);
+		if (type == Const.SQLITE3_FLOAT)
+			return Syntax.float(value);
+		return value;
+	}
+
+	function fetchAll() {
+		rows = Syntax.arrayDecl();
+		var index = 0;
+		var row = result.fetchArray(Const.SQLITE3_ASSOC);
+		while (row != false) {
+			rows[index] = correctArrayTypes(row);
+			row = result.fetchArray(Const.SQLITE3_ASSOC);
+			index++;
+		}
+		_length = index;
+	}
+
+	function get_length()
+		return _length;
+
+	function get_nfields()
+		return _nfields;
+}
diff --git a/std/php/_std/sys/io/File.hx b/std/php/_std/sys/io/File.hx
index 0021be1dfa3ecd226cce28b130ff3eafe047ec7d..b1a7794ebc9eabd56224a63ad42ffd1cd42aa508 100644
--- a/std/php/_std/sys/io/File.hx
+++ b/std/php/_std/sys/io/File.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,45 +19,51 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
-enum FileHandle {
-}
+import php.Global.*;
+import php.Global;
 
 @:coreApi class File {
-
-	public static function getContent( path : String ) : String {
-		return untyped __call__("file_get_contents", path);
+	public static function getContent(path:String):String {
+		return file_get_contents(path);
 	}
 
-	public static function getBytes( path : String ) : haxe.io.Bytes {
-		return haxe.io.Bytes.ofString(getContent(path));
+	public static function getBytes(path:String):haxe.io.Bytes {
+		return haxe.io.Bytes.ofString(file_get_contents(path));
 	}
 
-	public static function saveContent( path : String, content : String) : Void {
-		untyped __call__("file_put_contents", path, content);
+	public static function saveContent(path:String, content:String):Void {
+		file_put_contents(path, content);
 	}
 
-	public static function saveBytes( path : String, bytes : haxe.io.Bytes ) : Void {
+	public static function saveBytes(path:String, bytes:haxe.io.Bytes):Void {
 		var f = write(path);
 		f.write(bytes);
 		f.close();
 	}
 
-	public static function read( path : String, binary : Bool = true ) : FileInput {
-		return untyped new FileInput(__call__('fopen', path, binary ? "rb" : "r"));
+	public static function read(path:String, binary:Bool = true):FileInput {
+		return @:privateAccess new FileInput(fopen(path, binary ? "rb" : "r"));
 	}
 
-	public static function write( path : String, binary : Bool = true ) : FileOutput {
-		return untyped new FileOutput(untyped __call__('fopen', path, binary ? "wb" : "w"));
+	public static function write(path:String, binary:Bool = true):FileOutput {
+		return untyped new FileOutput(fopen(path, binary ? "wb" : "w"));
 	}
 
-	public static function append( path : String, binary : Bool = true ) : FileOutput {
-		return untyped new FileOutput(untyped __call__('fopen', path, binary ? "ab" : "a"));
+	public static function append(path:String, binary:Bool = true):FileOutput {
+		return untyped new FileOutput(fopen(path, binary ? "ab" : "a"));
 	}
 
-	public static function copy( srcPath : String, dstPath : String ) : Void {
-		untyped __call__("copy", srcPath, dstPath);
+	public static function update(path:String, binary:Bool = true):FileOutput {
+		if (!FileSystem.exists(path)) {
+			write(path).close();
+		}
+		return untyped new FileOutput(fopen(path, binary ? "rb+" : "r+"));
 	}
 
+	public static function copy(srcPath:String, dstPath:String):Void {
+		Global.copy(srcPath, dstPath);
+	}
 }
diff --git a/std/php/_std/sys/io/FileInput.hx b/std/php/_std/sys/io/FileInput.hx
index 1085f301fcd68f532bd9528e4399548c998ba0eb..068956a61d551f7c355c34420bd444f0323d826c 100644
--- a/std/php/_std/sys/io/FileInput.hx
+++ b/std/php/_std/sys/io/FileInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,64 +19,82 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
+
 import haxe.io.Eof;
+import haxe.io.Error;
+import haxe.io.Bytes;
+import php.*;
+import php.Global.*;
+import php.Const.*;
 
 @:coreApi
 class FileInput extends haxe.io.Input {
+	private var __f:Resource;
 
-	private var __f : File.FileHandle;
-
-	function new(f:File.FileHandle) : Void {
+	function new(f:Resource):Void {
 		__f = f;
 	}
 
-	public override function readByte() : Int {
-		var r = untyped __call__('fread', __f, 1);
-		if(untyped __call__('feof', __f)) return throw new haxe.io.Eof();
-		if(untyped __physeq__(r, false)) return throw haxe.io.Error.Custom('An error occurred');
-		return untyped __call__('ord', r);
+	public override function readByte():Int {
+		var r = fread(__f, 1);
+		if (feof(__f))
+			throw new Eof();
+		if (r == false)
+			throw Custom('An error occurred');
+		return ord(r);
 	}
 
-	public override function readBytes( s : haxe.io.Bytes, p : Int, l : Int ) : Int {
-		if(untyped __call__('feof', __f)) return throw new haxe.io.Eof();
-		var r : String = untyped __call__('fread', __f, l);
-		if(untyped __physeq__(r, false)) return throw haxe.io.Error.Custom('An error occurred');
-		var b = haxe.io.Bytes.ofString(r);
-		s.blit(p, b, 0, r.length);
-		return r.length;
+	public override function readBytes(s:Bytes, p:Int, l:Int):Int {
+		if (feof(__f))
+			throw new Eof();
+		var r = fread(__f, l);
+		if (r == false)
+			throw Custom('An error occurred');
+		if (strlen(r) == 0)
+			throw new Eof();
+		var b = Bytes.ofString(r);
+		s.blit(p, b, 0, strlen(r));
+		return strlen(r);
 	}
 
-	public override function close() : Void {
+	public override function close():Void {
 		super.close();
-		if(__f != null)	untyped __call__('fclose', __f);
+		if (__f != null)
+			fclose(__f);
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void {
+	public function seek(p:Int, pos:FileSeek):Void {
 		var w;
-		switch( pos ) {
-			case SeekBegin: w = untyped __php__('SEEK_SET');
-			case SeekCur  : w = untyped __php__('SEEK_CUR');
-			case SeekEnd  : w = untyped __php__('SEEK_END');
+		switch (pos) {
+			case SeekBegin:
+				w = SEEK_SET;
+			case SeekCur:
+				w = SEEK_CUR;
+			case SeekEnd:
+				w = SEEK_END;
 		}
-		var r = untyped __call__('fseek', __f, p, w);
-		if(untyped __physeq__(r, false)) throw haxe.io.Error.Custom('An error occurred');
+		var r = fseek(__f, p, w);
+		if (r == false)
+			throw Custom('An error occurred');
 	}
 
-	public function tell() : Int {
-		var r = untyped __call__('ftell', __f);
-		if(untyped __physeq__(r, false)) return throw haxe.io.Error.Custom('An error occurred');
+	public function tell():Int {
+		var r = ftell(__f);
+		if (r == false)
+			throw Custom('An error occurred');
 		return cast r;
 	}
 
-	public function eof() : Bool {
-		return untyped __call__('feof', __f);
+	public function eof():Bool {
+		return feof(__f);
 	}
 
-	override function readLine() : String {
-		var r : String = untyped __call__('fgets', __f);
-		if (untyped __physeq__(false, r))
+	override function readLine():String {
+		var r = fgets(__f);
+		if (false == r)
 			throw new Eof();
-		return untyped __call__("rtrim", r, "\r\n");
+		return rtrim(r, "\r\n");
 	}
 }
diff --git a/std/php/_std/sys/io/FileOutput.hx b/std/php/_std/sys/io/FileOutput.hx
index f30e16eb1d44d735efffa2504a9575bed9919ca9..b87157a84196ad7e4f26e4b0b621df83cba0b72b 100644
--- a/std/php/_std/sys/io/FileOutput.hx
+++ b/std/php/_std/sys/io/FileOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,54 +19,68 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
+import php.*;
+import php.Global.*;
+import php.Const.*;
+
 @:coreApi
 class FileOutput extends haxe.io.Output {
-	private var __f : File.FileHandle;
+	private var __f:Resource;
 
-	function new(f:File.FileHandle) : Void {
+	function new(f:Resource):Void {
 		__f = f;
 	}
 
-	public override function writeByte( c : Int ) : Void {
-		var r = untyped __call__('fwrite', __f, __call__('chr', c));
-		if(untyped __physeq__(r, false)) throw haxe.io.Error.Custom('An error occurred');
+	public override function writeByte(c:Int):Void {
+		var r = fwrite(__f, chr(c));
+		if (r == false)
+			throw haxe.io.Error.Custom('An error occurred');
 	}
 
-	public override function writeBytes( b : haxe.io.Bytes, p : Int, l : Int ) : Int {
+	public override function writeBytes(b:haxe.io.Bytes, p:Int, l:Int):Int {
 		var s = b.getString(p, l);
-		if(untyped __call__('feof', __f)) return throw new haxe.io.Eof();
-		var r = untyped __call__('fwrite', __f, s, l);
-		if(untyped __physeq__(r, false)) return throw haxe.io.Error.Custom('An error occurred');
+		if (feof(__f))
+			throw new haxe.io.Eof();
+		var r = fwrite(__f, s, l);
+		if (r == false)
+			throw haxe.io.Error.Custom('An error occurred');
 		return r;
 	}
 
-	public override function flush() : Void {
-		var r = untyped __call__('fflush', __f);
-		if(untyped __physeq__(r, false)) throw haxe.io.Error.Custom('An error occurred');
+	public override function flush():Void {
+		var r = fflush(__f);
+		if (r == false)
+			throw haxe.io.Error.Custom('An error occurred');
 	}
 
-	public override function close() : Void {
+	public override function close():Void {
 		super.close();
-		if(__f != null)	untyped __call__('fclose', __f);
+		if (__f != null)
+			fclose(__f);
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void {
+	public function seek(p:Int, pos:FileSeek):Void {
 		var w;
-		switch( pos ) {
-			case SeekBegin: w = untyped __php__('SEEK_SET');
-			case SeekCur  : w = untyped __php__('SEEK_CUR');
-			case SeekEnd  : w = untyped __php__('SEEK_END');
+		switch (pos) {
+			case SeekBegin:
+				w = SEEK_SET;
+			case SeekCur:
+				w = SEEK_CUR;
+			case SeekEnd:
+				w = SEEK_END;
 		}
-		var r = untyped __call__('fseek', __f, p, w);
-		if(untyped __physeq__(r, false)) throw haxe.io.Error.Custom('An error occurred');
+		var r = fseek(__f, p, w);
+		if (r == false)
+			throw haxe.io.Error.Custom('An error occurred');
 	}
 
-	public function tell() : Int {
-		var r = untyped __call__('ftell', __f);
-		if(untyped __physeq__(r, false)) return throw haxe.io.Error.Custom('An error occurred');
-		return cast r;
+	public function tell():Int {
+		var r = ftell(__f);
+		if (r == false)
+			throw haxe.io.Error.Custom('An error occurred');
+		return r;
 	}
-
 }
diff --git a/std/php/_std/sys/io/Process.hx b/std/php/_std/sys/io/Process.hx
index 543303fd95357906bf033a5165d6947043929351..85c4bca34c70c02bfceaede8a9a43ddce52b1eea 100644
--- a/std/php/_std/sys/io/Process.hx
+++ b/std/php/_std/sys/io/Process.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,138 +19,180 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
-import php.NativeArray;
 
-private class Stdin extends haxe.io.Output {
-	var p : Dynamic;
-	var buf : haxe.io.Bytes;
+import php.*;
+import haxe.io.*;
+import haxe.SysTools;
+
+using StringTools;
+using php.Global;
+
+@:forward(iterator)
+private abstract ProcessPipes(NativeIndexedArray<Resource>) from NativeIndexedArray<Resource> to NativeIndexedArray<Resource> {
+	public var stdin(get, never):Resource;
+	public var stdout(get, never):Resource;
+	public var stderr(get, never):Resource;
+
+	inline function get_stdin()
+		return this[0];
+
+	inline function get_stdout()
+		return this[1];
+
+	inline function get_stderr()
+		return this[2];
+}
+
+private class ReadablePipe extends Input {
+	var pipe:Resource;
+	var tmpBytes:Bytes;
 
-	public function new(p:Dynamic) {
-		this.p = p;
-		buf = haxe.io.Bytes.alloc(1);
+	public function new(pipe:Resource) {
+		this.pipe = pipe;
+		tmpBytes = Bytes.alloc(1);
 	}
 
-	public override function close() {
-		super.close();
-		untyped __call__('fclose', p);
+	override public function close():Void {
+		pipe.fclose();
 	}
 
-	public override function writeByte(c) {
-		buf.set(0,c);
-		writeBytes(buf,0,1);
+	override public function readByte():Int {
+		if (readBytes(tmpBytes, 0, 1) == 0)
+			throw Error.Blocked;
+		return tmpBytes.get(0);
 	}
 
-	public override function writeBytes( b : haxe.io.Bytes, pos : Int, l : Int ) : Int {
-		var s = b.getString(pos, l);
-		if(untyped __call__('feof', p)) return throw new haxe.io.Eof();
-		var r = untyped __call__('fwrite', p, s, l);
-		if(untyped __physeq__(r, false)) return throw haxe.io.Error.Custom('An error occurred');
-		return r;
+	override public function readBytes(s:Bytes, pos:Int, len:Int):Int {
+		if (pipe.feof())
+			throw new Eof();
+
+		var result = pipe.fread(len);
+		if (result == "")
+			throw new Eof();
+		if (result == false)
+			return throw Error.Custom('Failed to read process output');
+		var result:String = result;
+
+		var bytes = Bytes.ofString(result);
+		s.blit(pos, bytes, 0, result.strlen());
+		return result.strlen();
 	}
 }
 
-private class Stdout extends haxe.io.Input {
-	var p : Dynamic;
-	var buf : haxe.io.Bytes;
+private class WritablePipe extends Output {
+	var pipe:Resource;
+	var tmpBytes:Bytes;
+
+	public function new(pipe:Resource) {
+		this.pipe = pipe;
+		tmpBytes = Bytes.alloc(1);
+	}
 
-	public function new(p:Dynamic) {
-		this.p = p;
-		buf = haxe.io.Bytes.alloc(1);
+	override public function close():Void {
+		pipe.fclose();
 	}
 
-	public override function readByte() {
-		if( readBytes(buf,0,1) == 0 )
-			throw haxe.io.Error.Blocked;
-		return buf.get(0);
+	override public function writeByte(c:Int):Void {
+		tmpBytes.set(0, c);
+		writeBytes(tmpBytes, 0, 1);
 	}
 
-	public override function readBytes( str : haxe.io.Bytes, pos : Int, l : Int ) : Int {
-		if(untyped __call__('feof', p)) return throw new haxe.io.Eof();
-		var r : String = untyped __call__('fread', p, l);
-		if(untyped __physeq__(r, "")) return throw new haxe.io.Eof();
-		if(untyped __physeq__(r, false)) return throw haxe.io.Error.Custom('An error occurred');
-		var b = haxe.io.Bytes.ofString(r);
-		str.blit(pos, b, 0, r.length);
-		return r.length;
+	override public function writeBytes(b:Bytes, pos:Int, l:Int):Int {
+		var s = b.getString(pos, l);
+		if (pipe.feof())
+			throw new Eof();
+
+		var result = Global.fwrite(pipe, s, l);
+		if (result == false)
+			throw Error.Custom('Failed to write to process input');
+		return result;
 	}
 }
 
-@:coreApi
 class Process {
-	var p : Dynamic;
-	var st : NativeArray;
-	var cl : Int;
-	public var stdout(default,null) : haxe.io.Input;
-	public var stderr(default,null) : haxe.io.Input;
-	public var stdin(default,null) : haxe.io.Output;
-
-	public function new( cmd : String, ?args : Array<String> ) : Void {
-		var pipes = untyped __call__("array");
-		var descriptorspec = untyped __php__("array(
-			array('pipe', 'r'),
-			array('pipe', 'w'),
-			array('pipe', 'w')
-		)");
-		if (args != null) {
-			switch (Sys.systemName()) {
-				case "Windows":
-					cmd = [
-						for (a in [StringTools.replace(cmd, "/", "\\")].concat(args))
-						StringTools.quoteWinArg(a, true)
-					].join(" ");
-				case _:
-					cmd = [cmd].concat(args).map(StringTools.quoteUnixArg).join(" ");
-			}
-		}
-		p = untyped __call__('proc_open', cmd, descriptorspec, pipes);
-		if(untyped __physeq__(p, false)) throw "Process creation failure : "+cmd;
-		stdin  = new Stdin( pipes[0]);
-		stdout = new Stdout(pipes[1]);
-		stderr = new Stdout(pipes[2]);
+	public var stdout(default, null):Input;
+
+	public var stderr(default, null):Input;
+
+	public var stdin(default, null):Output;
+
+	var process:Resource;
+	var pipes:ProcessPipes;
+	var pid:Int = -1;
+	var running:Bool = true;
+	var _exitCode:Int = -1;
+
+	public function new(cmd:String, ?args:Array<String>, ?detached:Bool):Void {
+		if (detached)
+			throw "Detached process is not supported on this platform";
+		var descriptors = Syntax.arrayDecl(Syntax.arrayDecl('pipe', 'r'), Syntax.arrayDecl('pipe', 'w'), Syntax.arrayDecl('pipe', 'w'));
+		var result = buildCmd(cmd, args).proc_open(descriptors, pipes);
+		if (result == false)
+			throw Error.Custom('Failed to start process: $cmd');
+		process = result;
+
+		updateStatus();
+
+		stdin = new WritablePipe(pipes.stdin);
+		stdout = new ReadablePipe(pipes.stdout);
+		stderr = new ReadablePipe(pipes.stderr);
 	}
 
-	public function close() : Void {
-		if(null == st)
-			st = untyped __call__('proc_get_status', p);
-		replaceStream(stderr);
-		replaceStream(stdout);
-		if(null == cl)
-			cl = untyped __call__('proc_close', p);
+	public function getPid():Int {
+		return pid;
 	}
 
-	public function getPid() : Int {
-		var r = untyped __call__('proc_get_status', p);
-		return r[untyped 'pid'];
+	public function exitCode(block:Bool = true):Null<Int> {
+		if (!block) {
+			updateStatus();
+			return (running ? null : _exitCode);
+		}
+		while (running) {
+			var arr = Syntax.arrayDecl(process);
+			Syntax.suppress(Global.stream_select(arr, arr, arr, null));
+			updateStatus();
+		}
+		return _exitCode;
 	}
 
-	public function kill() : Void {
-		untyped __call__('proc_terminate',p);
+	public function close():Void {
+		if (!running)
+			return;
+
+		for (pipe in pipes)
+			Global.fclose(pipe);
+		process.proc_close();
 	}
 
-	function replaceStream(input : haxe.io.Input) : Void {
-		var fp = untyped __call__("fopen", "php://memory", "r+");
-		while(true) {
-			var s = untyped __call__("fread", untyped input.p, 8192);
-			if(untyped __physeq__(s, false) || s == null || s == '') break;
-			untyped __call__("fwrite", fp, s);
-		}
-		untyped __call__("rewind", fp);
-		untyped input.p = fp;
+	public function kill():Void {
+		process.proc_terminate();
 	}
 
-	public function exitCode( block : Bool = true ) : Null<Int> {
-		if (null == cl)
-		{
-			st = untyped __call__('proc_get_status', p);
-			while(st[untyped 'running']) {
-				if( block == false ) return null;
-				Sys.sleep(0.01);
-				st = untyped __call__('proc_get_status', p);
-			}
-			close();
+	function buildCmd(cmd:String, ?args:Array<String>):String {
+		if (args == null)
+			return cmd;
+
+		return switch (Sys.systemName()) {
+			case "Windows":
+				[cmd.replace("/", "\\")].concat(args).map(SysTools.quoteWinArg.bind(_, true)).join(" ");
+			case _:
+				[cmd].concat(args).map(SysTools.quoteUnixArg).join(" ");
 		}
-		return (cast st[untyped 'exitcode']) < 0 ? cl : cast st[untyped 'exitcode'];
+	}
 
+	function updateStatus():Void {
+		if (!running)
+			return;
+
+		var status = process.proc_get_status();
+		if (status == false)
+			throw Error.Custom('Failed to obtain process status');
+		var status:NativeAssocArray<Scalar> = status;
+
+		pid = status['pid'];
+		running = status['running'];
+		_exitCode = status['exitcode'];
 	}
-}
\ No newline at end of file
+}
diff --git a/std/php/_std/sys/net/Host.hx b/std/php/_std/sys/net/Host.hx
index b9a0c89fbdd6fc9a31a7207ed06f73c7e078b3a4..9d6997b60ec519f8a15b3b89f6a2cea4fceb60b5 100644
--- a/std/php/_std/sys/net/Host.hx
+++ b/std/php/_std/sys/net/Host.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,40 +19,44 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
+import php.Global.*;
+import php.SuperGlobal.*;
+
 @:coreApi
 class Host {
+	public var host(default, null):String;
 
-	public var host(default,null) : String;
+	private var _ip:String;
 
-	private var _ip : String;
-	public var ip(default,null) : Int;
+	public var ip(default, null):Int;
 
-	public function new( name : String ) : Void {
+	public function new(name:String):Void {
 		host = name;
-		if(~/^(\d{1,3}\.){3}\d{1,3}$/.match(name)) {
-		  _ip = name;
+		if (~/^(\d{1,3}\.){3}\d{1,3}$/.match(name)) {
+			_ip = name;
 		} else {
-			_ip = untyped __call__('gethostbyname', name);
-			if(_ip == name) {
+			_ip = gethostbyname(name);
+			if (_ip == name) {
 				ip = 0;
 				return;
 			}
 		}
 		var p = _ip.split('.');
-		ip = untyped __call__('intval', __call__('sprintf', '%02X%02X%02X%02X', p[3], p[2], p[1], p[0]), 16);
+		ip = intval(sprintf('%02X%02X%02X%02X', p[3], p[2], p[1], p[0]), 16);
 	}
 
-	public function toString() : String {
+	public function toString():String {
 		return _ip;
 	}
 
-	public function reverse() : String {
-		return untyped __call__('gethostbyaddr', _ip);
+	public function reverse():String {
+		return gethostbyaddr(_ip);
 	}
 
-	public static function localhost() : String {
-		return untyped __var__('_SERVER', 'HTTP_HOST');
+	public static function localhost():String {
+		return php.Syntax.coalesce(_SERVER['HTTP_HOST'], "localhost");
 	}
 }
diff --git a/std/php/_std/sys/net/Socket.hx b/std/php/_std/sys/net/Socket.hx
index 7f7ca12dedabc86b82a2340b02b90444407356ab..83cf4834feb26199a2a23563a2a5c3b2ab7c38f8 100644
--- a/std/php/_std/sys/net/Socket.hx
+++ b/std/php/_std/sys/net/Socket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,154 +19,171 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
-import sys.io.File;
+import php.*;
+import php.Global.*;
+import php.Const.*;
+import sys.io.FileInput;
+import sys.io.FileOutput;
 
 @:coreApi
 class Socket {
+	private var __s:Resource;
+	private var stream:Resource;
+
+	public var input(default, null):haxe.io.Input;
+	public var output(default, null):haxe.io.Output;
+	public var custom:Dynamic;
 
-	private var __s : FileHandle;
-	private var protocol : String;
-	public var input(default,null) : haxe.io.Input;
-	public var output(default,null) : haxe.io.Output;
-	public var custom : Dynamic;
+	var protocol:String;
 
-	public function new() : Void {
-		input = untyped new sys.io.FileInput(null);
-		output = untyped new sys.io.FileOutput(null);
+	public function new():Void {
+		input = @:privateAccess new sys.io.FileInput(null);
+		output = @:privateAccess new sys.io.FileOutput(null);
+		initSocket();
 		protocol = "tcp";
 	}
 
-	private function assignHandler() : Void {
-		untyped input.__f = __s;
-		untyped output.__f = __s;
+	private function initSocket():Void {
+		__s = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 	}
 
-	public function close() : Void {
-		untyped __call__('fclose', __s);
-		untyped {
-			input.__f = null;
-			output.__f = null;
-		}
+	private function assignHandler():Void {
+		stream = socket_export_stream(__s);
+		@:privateAccess (cast input : FileInput).__f = stream;
+		@:privateAccess (cast output : FileOutput).__f = stream;
+	}
+
+	public function close():Void {
+		socket_close(__s);
+		@:privateAccess (cast input : FileInput).__f = null;
+		@:privateAccess (cast output : FileOutput).__f = null;
 		input.close();
 		output.close();
 	}
 
-	public function read() : String {
+	public function read():String {
 		var b = '';
-		untyped __php__("while (!feof($this->__s)) $b .= fgets($this->__s)");
+		while (!feof(stream))
+			b += fgets(stream);
 		return b;
 	}
 
-	public function write( content : String ) : Void {
-		return untyped __call__('fwrite', __s, content);
+	public function write(content:String):Void {
+		fwrite(stream, content);
 	}
 
-	public function connect(host : Host, port : Int) : Void {
-		var errs = null;
-		var errn = null;
-		var r = untyped __call__('stream_socket_client', protocol + '://' +host.host + ':' + port, errn, errs);
-		Socket.checkError(r, errn, errs);
-		__s = cast r;
+	public function connect(host:Host, port:Int):Void {
+		var r = socket_connect(__s, host.host, port);
+		checkError(r, 0, 'Unable to connect');
 		assignHandler();
 	}
 
-	public function listen(connections : Int) : Void {
-		throw "Not implemented";
-/* TODO: ??????
-		var r = untyped __call__('socket_listen', __s, connections);
-		checkError(r);
-*/
+	public function listen(connections:Int):Void {
+		var r = socket_listen(__s, connections);
+		checkError(r, 0, 'Unable to listen on socket');
+		assignHandler();
 	}
 
-	public function shutdown( read : Bool, write : Bool ) : Void {
-		var r;
-		if(untyped __call__("function_exists", "stream_socket_shutdown")) {
-			var rw = read && write ? 2 : (write ? 1 : (read ? 0 : 2));
-			r = untyped __call__('stream_socket_shutdown', __s, rw);
-		} else {
-			r = untyped __call__('fclose', __s);
-		}
-		checkError(r, 0, 'Unable to Shutdown');
+	public function shutdown(read:Bool, write:Bool):Void {
+		var rw = read && write ? 2 : (write ? 1 : (read ? 0 : 2));
+		var r = socket_shutdown(__s, rw);
+		checkError(r, 0, 'Unable to shutdown');
 	}
 
-	public function bind(host : Host, port : Int) : Void {
-		var errs = null;
-		var errn = null;
-		var r = untyped __call__('stream_socket_server', protocol + '://' + host.host + ':' + port, errn, errs, (protocol=="udp") ? __php__('STREAM_SERVER_BIND') : __php__('STREAM_SERVER_BIND | STREAM_SERVER_LISTEN'));
-		Socket.checkError(r, errn, errs);
-		__s = cast r;
-		assignHandler();
+	public function bind(host:Host, port:Int):Void {
+		var r = socket_bind(__s, host.host, port);
+		checkError(r, 0, "Unable to bind socket");
 	}
 
-	public function accept() : Socket {
-		var r = untyped __call__('stream_socket_accept', __s);
+	public function accept():Socket {
+		var r = socket_accept(__s);
 		checkError(r, 0, 'Unable to accept connections on socket');
 		var s = new Socket();
-		s.__s = cast r;
+		// FIXME: wasted resource here
+		s.__s = r;
 		s.assignHandler();
 		return s;
 	}
 
-	private function hpOfString(s : String) : { host : Host, port : Int } {
-		var parts = s.split(':');
-		if(parts.length == 2) {
-			return { host : new Host(parts[0]), port : Std.parseInt(parts[1]) };
-		} else {
-			return { host : new Host(parts[1].substr(2)), port : Std.parseInt(parts[2]) };
-		}
-	}
-
-	public function peer() : { host : Host, port : Int } {
-		var r : String = untyped __call__('stream_socket_get_name', __s, true);
-		checkError(cast r, 0, 'Unable to retrieve the peer name');
-		return hpOfString(r);
+	public function peer():{host:Host, port:Int} {
+		var host:String = "", port:Int = 0;
+		var r = socket_getpeername(__s, host, port);
+		checkError(r, 0, 'Unable to retrieve the peer name');
+		return {host: new Host(host), port: port};
 	}
 
-	public function host() : { host : Host, port : Int } {
-		var r : String = untyped __call__('stream_socket_get_name', __s, false);
-		checkError(cast r, 0, 'Unable to retrieve the host name');
-		return hpOfString(r);
+	public function host():{host:Host, port:Int} {
+		var host:String = "", port:Int = 0;
+		var r = socket_getsockname(__s, host, port);
+		checkError(r, 0, 'Unable to retrieve the host name');
+		return {host: new Host(host), port: port};
 	}
 
-	public function setTimeout( timeout : Float ) : Void {
+	public function setTimeout(timeout:Float):Void {
 		var s = Std.int(timeout);
-		var ms = Std.int((timeout-s)*1000000);
-		var r = untyped __call__('stream_set_timeout', __s, s, ms);
-		checkError(r, 0, 'Unable to set timeout');
+		var ms = Std.int((timeout - s) * 1000000);
+		var timeOut:NativeStructArray<{sec:Int, usec:Int}> = {sec: s, usec: ms};
+		var r = socket_set_option(__s, SOL_SOCKET, SO_RCVTIMEO, timeOut);
+		checkError(r, 0, 'Unable to set receive timeout');
+		r = socket_set_option(__s, SOL_SOCKET, SO_SNDTIMEO, timeOut);
+		checkError(r, 0, 'Unable to set send timeout');
 	}
 
-	public function setBlocking( b : Bool ) : Void {
-		var r = untyped __call__('stream_set_blocking', __s, b);
-		checkError(r, 0, 'Unable to block');
+	public function setBlocking(b:Bool):Void {
+		var r = b ? socket_set_block(__s) : socket_set_nonblock(__s);
+		checkError(r, 0, 'Unable to set blocking');
 	}
 
-	public function setFastSend( b : Bool ) : Void {
-		throw "Not implemented";
+	public function setFastSend(b:Bool):Void {
+		var r = socket_set_option(__s, SOL_TCP, TCP_NODELAY, true);
+		checkError(r, 0, "Unable to set TCP_NODELAY on socket");
 	}
 
-	public function waitForRead() : Void {
-		select([this],null,null);
+	public function waitForRead():Void {
+		select([this], null, null);
 	}
 
-	private static function checkError(r : Bool, code : Int, msg : String) : Void {
-		if(!untyped __physeq__(r, false)) return;
-		throw haxe.io.Error.Custom('Error ['+code+']: ' +msg);
+	private static function checkError(r:Bool, code:Int, msg:String):Void {
+		if (r != false)
+			return;
+		throw haxe.io.Error.Custom('Error [$code]: $msg');
 	}
 
-	private static function getType(isUdp : Bool) : Int {
-		return isUdp ? untyped __php__('SOCK_DGRAM') : untyped __php__('SOCK_STREAM');
-	}
-
-	private static function getProtocol(protocol : String) : Int {
-		return untyped __call__('getprotobyname', protocol);
- 	}
+	public static function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+			?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>} {
+		var map:Map<Int, Socket> = new Map();
+		inline function addSockets(sockets:Array<Socket>) {
+			if (sockets != null)
+				for (s in sockets)
+					map[Syntax.int(s.__s)] = s;
+		}
+		inline function getRaw(sockets:Array<Socket>):Array<Resource> {
+			return sockets == null ? [] : [for (s in sockets) s.__s];
+		}
+		inline function getOriginal(result:Array<Resource>) {
+			return [for (r in result) map[Syntax.int(r)]];
+		}
 
-	public static function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float) : { read: Array<Socket>,write: Array<Socket>,others: Array<Socket> }
-	{
-		throw "Not implemented";
-		return null;
+		addSockets(read);
+		addSockets(write);
+		addSockets(others);
+
+		// unwrap Sockets into Resources
+		var rawRead:NativeIndexedArray<Resource> = getRaw(read),
+			rawWrite:NativeIndexedArray<Resource> = getRaw(write),
+			rawOthers:NativeIndexedArray<Resource> = getRaw(others);
+		var sec = timeout == null ? null : Std.int(timeout);
+		var usec = timeout == null ? 0 : Std.int((timeout % 1) * 1000000);
+		var result = socket_select(rawRead, rawWrite, rawOthers, sec, usec);
+		checkError(result, 0, "Error during select call");
+		// convert raw resources back to Socket objects
+		return {
+			read: getOriginal(rawRead),
+			write: getOriginal(rawWrite),
+			others: getOriginal(rawOthers),
+		}
 	}
-
 }
diff --git a/std/php/db/Mysqli.hx b/std/php/db/Mysqli.hx
new file mode 100644
index 0000000000000000000000000000000000000000..85bcb8f9c5889e9ea568e2d002ce5fe51c4d9c48
--- /dev/null
+++ b/std/php/db/Mysqli.hx
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C)2005-2019 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 php.db;
+
+import haxe.extern.*;
+import php.*;
+import haxe.Constraints.Function;
+
+/**
+	@see http://php.net/manual/en/class.mysqli.php
+**/
+@:native('Mysqli')
+extern class Mysqli {
+	var affected_rows(default, null):Int;
+	var client_info(default, null):String;
+	var client_version(default, null):Int;
+	var connect_errno(default, null):Int;
+	var connect_error(default, null):String;
+	var errno(default, null):Int;
+	var error_list(default, null):NativeAssocArray<Scalar>;
+	var error(default, null):String;
+	var field_count(default, null):Int;
+	var host_info(default, null):String;
+	var protocol_version(default, null):String;
+	var server_info(default, null):String;
+	var server_version(default, null):Int;
+	var info(default, null):String;
+	var insert_id(default, null):EitherType<Int, String>;
+	var sqlstate(default, null):String;
+	var thread_id(default, null):Int;
+	var warning_count(default, null):Int;
+
+	static function poll(read:Ref<NativeArray>, error:Ref<NativeArray>, reject:Ref<NativeArray>, sec:Int, ?usec:Int):Int;
+
+	function new(?host:String, ?username:String, ?passwd:String, dbname:String = "", ?port:Int, ?socket:String):Void;
+	function autocommit(mode:Bool):Bool;
+	function begin_transaction(?flags:Int, ?name:String):Bool;
+	function change_user(user:String, password:String, database:String):Bool;
+	function character_set_name():String;
+	function close():Bool;
+	function commit(?flags:Int, ?name:String):Bool;
+	function debug(message:String):Bool;
+	function dump_debug_info():Bool;
+	function get_charset():{
+		charset:String,
+		collation:String,
+		dir:String,
+		min_length:Int,
+		number:Int,
+		state:Int
+	};
+	function get_client_info():String;
+	function get_connection_stats():Bool;
+	function get_warnings():Mysqli_warning;
+	function init():Mysqli;
+	function kill(processid:Int):Bool;
+	function more_results():Bool;
+	function multi_query(query:String):Bool;
+	function next_result():Bool;
+	function options(option:Int, value:Scalar):Bool;
+	function ping():Bool;
+	function prepare(query:String):Mysqli_stmt;
+	function query(query:String, ?resultmode:Int):EitherType<Bool, Mysqli_result>;
+	function real_connect(?host:String, ?username:String, ?passwd:String, ?dbname:String, ?port:Int, ?socket:String, ?flags:Int):Bool;
+	function escape_string(escapestr:String):String;
+	function real_query(query:String):Bool;
+	function reap_async_query():Mysqli_result;
+	function refresh(options:Int):Bool;
+	function rollback(?flags:Int, ?name:String):Bool;
+	function rpl_query_type(query:String):Int;
+	function select_db(dbname:String):Bool;
+	function send_query(query:String):Bool;
+	function set_charset(charset:String):Bool;
+	function set_local_infile_handler(read_func:Function):Bool;
+	function ssl_set(key:String, cert:String, ca:String, capath:String, cipher:String):Bool;
+	function stat():String;
+	function stmt_init():Mysqli_stmt;
+	function store_result(?option:Int):Mysqli_result;
+	function use_result():Mysqli_result;
+}
diff --git a/std/php7/NativeAssocArray.hx b/std/php/db/Mysqli_driver.hx
similarity index 68%
rename from std/php7/NativeAssocArray.hx
rename to std/php/db/Mysqli_driver.hx
index 7bec6831d8d8f817048a79a0fb65f17775d2b8ca..8293f41a4f3b70157172193c20ccce20b17d7e32 100644
--- a/std/php7/NativeAssocArray.hx
+++ b/std/php/db/Mysqli_driver.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,22 +19,20 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package php;
 
-@:forward
-abstract NativeAssocArray<T>(NativeArray) from NativeArray to NativeArray {
-	public inline function new()
-		this = Syntax.arrayDecl();
+package php.db;
 
-	@:arrayAccess
-	inline function get(key:String):T
-		return this[key];
+import php.NativeArray;
 
-	@:arrayAccess
-	inline function set(key:String, val:T):T
-		return this[key] = val;
+@:native('Mysqli_driver')
+extern class Mysqli_driver {
+	var client_info(default, null):String;
+	var client_version(default, null):String;
+	var driver_version(default, null):String;
+	var embedded(default, null):String;
+	var reconnect(default, null):Bool;
+	var report_mode(default, null):Int;
 
-    //TODO
-    // @:to function toMap():Map<String,T>
-    // @:from static function fromMap<T>(map:Map<String,T>):NativeAssocArray<T>
+	function embedded_server_end():Void;
+	function embedded_server_start(start:Bool, arguments:NativeArray, groups:NativeArray):Bool;
 }
diff --git a/std/php/db/Mysqli_result.hx b/std/php/db/Mysqli_result.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f56e5952758c56c336683490bc024d9508a25fa2
--- /dev/null
+++ b/std/php/db/Mysqli_result.hx
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C)2005-2019 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 php.db;
+
+import php.*;
+import haxe.extern.*;
+
+/**
+	@see http://php.net/manual/en/class.mysqli-result.php
+**/
+@:native('Myslqi_result')
+extern class Mysqli_result implements Traversable {
+	var current_field(default, null):Int;
+	var field_count(default, null):Int;
+	var lengths(default, null):EitherType<Bool, NativeIndexedArray<Int>>;
+	var num_rows(default, null):Int;
+
+	function data_seek(offset:Int):Bool;
+	function fetch_all(?resulttype:Int):NativeArray;
+	function fetch_array(?resulttype:Int):NativeArray;
+	function fetch_assoc():NativeAssocArray<String>;
+	function fetch_field_direct(fieldnr:Int):MysqliFieldInfo;
+	function fetch_field():MysqliFieldInfo;
+	function fetch_fields():NativeIndexedArray<MysqliFieldInfo>;
+	function fetch_object(?class_name:String = "stdClass", ?params:NativeArray):{};
+	function fetch_row():NativeIndexedArray<String>;
+	function field_seek(fieldnr:Int):Bool;
+	function free():Void;
+}
+
+typedef MysqliFieldInfo = {
+	name:String,
+	orgname:String,
+	table:String,
+	orgtable:String,
+	max_length:Int,
+	length:Int,
+	charsetnr:Int,
+	flags:Int,
+	type:Int,
+	decimals:Int
+}
diff --git a/std/php/db/Mysqli_stmt.hx b/std/php/db/Mysqli_stmt.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5942aad372b47f4d68db59aa71c55c73ce3d6f72
--- /dev/null
+++ b/std/php/db/Mysqli_stmt.hx
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C)2005-2019 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 php.db;
+
+import haxe.extern.*;
+import php.*;
+
+@:native('Mysqli_stmt')
+extern class Mysqli_stmt {
+	var affected_rows(default, null):Int;
+	var errno(default, null):Int;
+	var error_list(default, null):NativeArray;
+	var error(default, null):String;
+	var field_count(default, null):Int;
+	var insert_id(default, null):Int;
+	var num_rows(default, null):Int;
+	var param_count(default, null):Int;
+	var sqlstate(default, null):String;
+
+	function new(link:Mysqli, ?query:String):Void;
+	function attr_get(attr:Int):Int;
+	function attr_set(attr:Int, mode:Int):Bool;
+	function bind_param(types:String, var1:Ref<Dynamic>, args:Rest<Ref<Dynamic>>):Bool;
+	function bind_result(var1:Ref<Dynamic>, args:Rest<Ref<Dynamic>>):Bool;
+	function close():Bool;
+	function data_seek(offset:Int):Void;
+	function execute():Bool;
+	function fetch():Bool;
+	function free_result():Void;
+	function get_result():Mysqli_result;
+	function get_warnings(stmt:Mysqli_stmt):{};
+	function prepare(query:String):Bool;
+	function reset():Bool;
+	function result_metadata():Mysqli_result;
+	function send_long_data(param_nr:Int, data:String):Bool;
+	function store_result():Bool;
+}
diff --git a/std/php/db/Mysqli_warning.hx b/std/php/db/Mysqli_warning.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1f373d50b67b8205181c78b7d31402eac22345a8
--- /dev/null
+++ b/std/php/db/Mysqli_warning.hx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C)2005-2019 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 php.db;
+
+@:native('Mysqli_warning')
+extern class Mysqli_warning {
+	var message(default, null):String;
+	var sqlstate(default, null):Dynamic;
+	var errno(default, null):Int;
+
+	function next():Void;
+}
diff --git a/std/php/db/PDO.hx b/std/php/db/PDO.hx
index ec4c2fb6a135e6f7bae6d04ec5cf3ba43233b664..89a94847c894da5ff2b09e1b899a5d1129403d97 100644
--- a/std/php/db/PDO.hx
+++ b/std/php/db/PDO.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,398 +19,90 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package php.db;
-
-import php.NativeArray;
-
-import sys.db.Connection;
-import sys.db.ResultSet;
-
-import php.Lib;
-
-/**
- * PDO::FETCH_COLUMN = 7
- * PDO::FETCH_CLASS = 8
- * PDO::FETCH_INTO = 9
- * PDO::PARAM_STR = 2
- * PDO::FETCH_BOTH = 4
- * PDO::FETCH_ORI_NEXT = 0
- */
-class PDO
-{
-	public static function open(dsn : String, ?user : String, ?password : String, ?options : Dynamic) : Connection {
-		return new PDOConnection(dsn, user, password, options);
-	}
-}
-
-extern class PDOClass
-{
-//	public function new(dns : String, ?username : String, ?password : String, ?driver_options : NativeArray) : Void;
-	public function beginTransaction() : Bool;
-	public function commit() : Bool;
-	public function errorCode() : Dynamic;
-	public function errorInfo() : NativeArray;
-	public function exec(statement : String) : Int;
-	public function getAttribute(attribute : Int) : Dynamic;
-	public function getAvailableDrivers() : NativeArray;
-	public function lastInsertId(?name : String) : String;
-	public function prepare(statement : String, driver_options : NativeArray) : PDOStatement;
-	public function query(statement : String, mode : Int) : PDOStatement;
-	public function quote(String : String, ?parameter_type : Int = 2) : String;
-	public function rollBack() : Bool;
-	public function setAttribute(attribute : Int, value : Dynamic) : Bool;
-}
-
-extern class PDOStatement
-{
-	public function bindColumn(column : Dynamic, param : Dynamic, ?type : Int, ?maxlen : Int, ?driverdata : Dynamic) : Bool;
-	public function bindParam(parameter : Dynamic, variable : Dynamic, ?data_type : Int, ?length : Int, ?driver_options : Dynamic) : Bool;
-	public function bindValue(parameter : Dynamic, value : Dynamic, ?data_type : Int) : Bool;
-	public function closeCursor() : Bool;
-	public function columnCount() : Int;
-	public function debugDumpParams() : Bool;
-	public function errorCode() : String;
-	public function errorInfo() : NativeArray;
-	public function execute(input_parameters : NativeArray) : Bool;
-	public function fetch(?fetch_style : Int = 4, ?cursor_orientation : Int = 0, ?cursor_offset : Int = 0) : Dynamic;
-	public function fetchAll(?fetch_style : Int) : NativeArray;
-	public function fetchColumn(?column_number : Int = 0) : String;
-	public function fetchObject(?class_name : String, ?ctor_args : NativeArray) : Dynamic;
-	public function getAttribute(attribute : Int) : Dynamic;
-	public function getColumnMeta(column : Int) : NativeArray;
-	public function nextRowset() : Bool;
-	public function rowCount() : Int;
-	public function setAttribute(attribute : Int, value : Dynamic) : Bool;
-	public function setFetchMode(mode : Int, ?fetch : Dynamic, ?ctorargs : NativeArray) : Bool;
-}
-
-private class PDOConnection implements Connection {
-
-	var pdo : PDOClass;
-	var dbname : String;
-
-	public function new(dsn : String, ?user : String, ?password : String, ?options : Dynamic) {
-		if(null == options)
-			pdo = untyped __call__("new PDO", dsn, user, password);
-		else
-		{
-			var arr : NativeArray = untyped __call__("array");
-			for (key in Reflect.fields(options))
-				arr[untyped key] = Reflect.field(options, key);
-			pdo = untyped __call__("new PDO", dsn, user, password, arr);
-		}
-		dbname = dsn.split(':').shift();
-		switch(dbname.toLowerCase())
-		{
-			case "sqlite":
-				dbname = "SQLite";
-			case "mysql":
-				dbname = "MySQL";
-		}
-	}
-
-	public function close() {
-		pdo = null;
-		untyped __call__("unset", pdo);
-	}
-
-	public function request( s : String ) : ResultSet {
-		var result = pdo.query(s, untyped __php__("PDO::PARAM_STR"));
-		if(untyped __physeq__(result, false))
-		{
-			var info = Lib.toHaxeArray(pdo.errorInfo());
-			throw "Error while executing " + s + " (" + info[2] + ")";
-		}
-		var db = dbname.toLowerCase();
-		switch(db)
-		{
-			case "sqlite":
-				return new AllResultSet(result, new DBNativeStrategy(db));
-			default: // mysql
-				return new PDOResultSet(result, new PHPNativeStrategy());
-		}
-	}
-
-	public function escape( s : String ) {
-		var output = pdo.quote(s);
-		return output.length > 2 ? output.substr(1, output.length-2) : output;
-	}
-
-	public function quote( s : String ) {
-		if( s.indexOf("\000") >= 0 )
-			return "x'"+untyped __call__('bin2hex', s)+"'";
-		return pdo.quote(s);
-	}
-
-	public function addValue( s : StringBuf, v : Dynamic ) {
-		if( untyped __call__("is_int", v) || __call__("is_null", v))
-			s.add(v);
-		else if( untyped __call__("is_bool", v) )
-			s.add(if( v ) 1 else 0);
-		else
-			s.add(quote(Std.string(v)));
-	}
-
-	public function lastInsertId() {
-		return cast(Std.parseInt(pdo.lastInsertId()), Int);
-	}
-
-	public function dbName() {
-		return dbname;
-	}
-
-	public function startTransaction() {
-		pdo.beginTransaction();
-	}
-
-	public function commit() {
-		pdo.commit();
-	}
-
-	public function rollback() {
-		pdo.rollBack();
-	}
-}
-
-private class TypeStrategy {
-	public function new() {
-	}
-	public function map(data : NativeArray) : Dynamic
-	{
-		return throw "must override";
-	}
-
-	public static function convert(v : String, type : String) : Dynamic {
-		if (v == null) return v;
-		switch(type) {
-			case "bool":
-				return untyped __call__("(bool)", v);
-			case "int":
-				return untyped __call__("intval", v);
-			case "float":
-				return untyped __call__("floatval", v);
-			case "date":
-				return Date.fromString(v);
-			case "blob":
-				return haxe.io.Bytes.ofString(v);
-			default:
-				return v;
-		}
-	}
-}
-
-private class PHPNativeStrategy extends TypeStrategy {
-	static inline var KEY = "native_type";
-	override function map(data : NativeArray) : Dynamic {
-		if (!untyped __call__("isset", data[KEY])) {
-			if (untyped __call__("isset", data["precision"])) {
-//				if (untyped __call__("isset", data["len"]) && data["len"] == 1)
-//					return "bool"
-//				else
-					return "int";
-			} else
-				return "string";
-		}
-		var pdo_type_str:Int = untyped __php__("PDO::PARAM_STR");
-		var pdo_type : Int = untyped data["pdo_type"];
-
-		var type : String = untyped data[KEY];
-		type = type.toLowerCase();
-		switch(type)
-		{
-			case "float", "decimal", "double", "newdecimal":
-				return "float";
-			case "date", "datetime", "timestamp":
-				return "date";
-			case "bool", "tinyint(1)":
-				return "bool";
-			case "int", "int24", "int32", "long", "longlong", "short", "tiny":
-				return "int";
-			case "blob" if (pdo_type == pdo_type_str):
-			 	return "string";
-			case "blob":
-				return "blob";
-			default:
-				return "string";
-		}
-	}
-}
 
-private class DBNativeStrategy extends PHPNativeStrategy {
-	static inline var SUFFIX = ":decl_type";
-	var dbname : String;
-	var key : String;
-	public function new(dbname : String)
-	{
-		super();
-		this.dbname = dbname.toLowerCase();
-		this.key = dbname + SUFFIX;
-	}
-
-	override function map(data : NativeArray) : Dynamic {
-		if (!untyped __call__("isset", data[key]))
-			return super.map(data);
-		var type : String = untyped data[key];
-		type = type.toLowerCase();
-		switch(type)
-		{
-			case "real":
-				return "float";
-			case "integer":
-				return "int";
-			default:
-				return "string";
-		}
-	}
-}
-
-private class BaseResultSet implements ResultSet {
-	var pdo : PDOStatement;
-	var typeStrategy : TypeStrategy;
-	var _fields : Int;
-	var _columnNames : Array<String>;
-	var _columnTypes : Array<String>;
-
-	public var length(get, null) : Int;
-	public var nfields(get, null) : Int;
-
-	public function new(pdo : PDOStatement, typeStrategy : TypeStrategy)
-	{
-		this.pdo = pdo;
-		this.typeStrategy = typeStrategy;
-		this._fields = pdo.columnCount();
-		this._columnNames = [];
-		this._columnTypes = [];
-		feedColumns();
-	}
-
-	private function feedColumns() {
-		for (i in 0..._fields) {
-			var data = pdo.getColumnMeta(i);
-			_columnNames.push(data[untyped 'name']);
-			_columnTypes.push(typeStrategy.map(data));
-		}
-	}
-
-	public function getFloatResult(index : Int) : Float {
-		return untyped __call__("floatval", getResult(index));
-	}
-
-	public function getIntResult(index : Int) : Int {
-		return untyped __call__("intval", getResult(index));
-	}
-
-	public function getResult(index : Int) : String {
-		return throw "must override";
-	}
-
-	public function hasNext() : Bool {
-		return throw "must override";
-	}
-
-	function get_length() : Int {
-		return throw "must override";
-	}
-
-	function nextRow() : NativeArray {
-		return throw "must override";
-	}
-
-	public function next() : Dynamic {
-		var row = nextRow();
-		var o : Dynamic = { };
-		for (i in 0..._fields)
-			Reflect.setField(o, _columnNames[i], TypeStrategy.convert(row[i], _columnTypes[i]));
-		return o;
-	}
-
-	function get_nfields() : Int {
-		return _fields;
-	}
-
-	public function results() : List<Dynamic>
-	{
-		var list = new List();
-		while (hasNext())
-			list.add(next());
-		return list;
-	}
-
-	public function getFieldsNames() : Array<String> {
-		return throw "Not implemented";
-	}
-}
-
-private class AllResultSet extends BaseResultSet {
-	var all : NativeArray;
-	var pos : Int;
-	var _length : Int;
-
-	public function new(pdo : PDOStatement, typeStrategy : TypeStrategy)
-	{
-		super(pdo, typeStrategy);
-		this.all = pdo.fetchAll(untyped __php__("PDO::FETCH_NUM"));
-		this.pos = 0;
-		this._length = untyped __call__("count", all);
-	}
-
-	override function getResult(index : Int) : String {
-		untyped if(__call__("isset", all[0]) && __call__("isset", all[0][index]))
-			return all[0][index];
-		else
-			return null;
-	}
-
-	override function hasNext() : Bool {
-		return pos < _length;
-	}
-
-	override function get_length() : Int {
-		return _length;
-	}
-
-	override function nextRow() : NativeArray {
-		return all[pos++];
-	}
-}
-
-private class PDOResultSet extends BaseResultSet {
-	private var cache : NativeArray;
-	public function new(pdo : PDOStatement, typeStrategy : TypeStrategy)
-	{
-		super(pdo, typeStrategy);
-	}
-
-	override function getResult(index : Int) : String {
-		if (!hasNext())
-			return null;
-		return cache[index];
-	}
-
-	override function hasNext() {
-		if(untyped __physeq__(null, cache))
-			cacheRow();
-		return (untyped cache);
-	}
-
-	override function get_length() {
-		if (untyped __physeq__(pdo, false))
-			return 0;
-		return pdo.rowCount();
-	}
-
-	private function cacheRow() {
-		cache = untyped pdo.fetch(__php__("PDO::FETCH_NUM"), __php__("PDO::FETCH_ORI_NEXT"));
-	}
+package php.db;
 
-	override function nextRow()
-	{
-		if (!hasNext())
-			return null;
-		else {
-			var v = cache;
-			cache = null;
-			return v;
-		}
-	}
+import php.*;
+
+@:native('PDO')
+extern class PDO {
+	@:phpClassConst static var PARAM_BOOL:Int;
+	@:phpClassConst static var PARAM_NULL:Int;
+	@:phpClassConst static var PARAM_INT:Int;
+	@:phpClassConst static var PARAM_STR:Int;
+	@:phpClassConst static var PARAM_LOB:Int;
+	@:phpClassConst static var PARAM_STMT:Int;
+	@:phpClassConst static var PARAM_INPUT_OUTPUT:Int;
+	@:phpClassConst static var FETCH_LAZY:Int;
+	@:phpClassConst static var FETCH_ASSOC:Int;
+	@:phpClassConst static var FETCH_NAMED:Int;
+	@:phpClassConst static var FETCH_NUM:Int;
+	@:phpClassConst static var FETCH_BOTH:Int;
+	@:phpClassConst static var FETCH_OBJ:Int;
+	@:phpClassConst static var FETCH_BOUND:Int;
+	@:phpClassConst static var FETCH_COLUMN:Int;
+	@:phpClassConst static var FETCH_CLASS:Int;
+	@:phpClassConst static var FETCH_INTO:Int;
+	@:phpClassConst static var FETCH_FUNC:Int;
+	@:phpClassConst static var FETCH_GROUP:Int;
+	@:phpClassConst static var FETCH_UNIQUE:Int;
+	@:phpClassConst static var FETCH_KEY_PAIR:Int;
+	@:phpClassConst static var FETCH_CLASSTYPE:Int;
+	@:phpClassConst static var FETCH_SERIALIZE:Int;
+	@:phpClassConst static var FETCH_PROPS_LATE:Int;
+	@:phpClassConst static var ATTR_AUTOCOMMIT:Int;
+	@:phpClassConst static var ATTR_PREFETCH:Int;
+	@:phpClassConst static var ATTR_TIMEOUT:Int;
+	@:phpClassConst static var ATTR_ERRMODE:Int;
+	@:phpClassConst static var ATTR_SERVER_VERSION:Int;
+	@:phpClassConst static var ATTR_CLIENT_VERSION:Int;
+	@:phpClassConst static var ATTR_SERVER_INFO:Int;
+	@:phpClassConst static var ATTR_CONNECTION_STATUS:Int;
+	@:phpClassConst static var ATTR_CASE:Int;
+	@:phpClassConst static var ATTR_CURSOR_NAME:Int;
+	@:phpClassConst static var ATTR_CURSOR:Int;
+	@:phpClassConst static var ATTR_DRIVER_NAME:String;
+	@:phpClassConst static var ATTR_ORACLE_NULLS:Int;
+	@:phpClassConst static var ATTR_PERSISTENT:Int;
+	@:phpClassConst static var ATTR_STATEMENT_CLASS:Int;
+	@:phpClassConst static var ATTR_FETCH_TABLE_NAMES:Int;
+	@:phpClassConst static var ATTR_STRINGIFY_FETCHES:Int;
+	@:phpClassConst static var ATTR_EMULATE_PREPARES:Int;
+	@:phpClassConst static var ERRMODE_SILENT:Int;
+	@:phpClassConst static var ERRMODE_WARNING:Int;
+	@:phpClassConst static var ERRMODE_EXCEPTION:Int;
+	@:phpClassConst static var CASE_NATURAL:Int;
+	@:phpClassConst static var CASE_LOWER:Int;
+	@:phpClassConst static var CASE_UPPER:Int;
+	@:phpClassConst static var NULL_NATURAL:Int;
+	@:phpClassConst static var FETCH_ORI_PRIOR:Int;
+	@:phpClassConst static var FETCH_ORI_FIRST:Int;
+	@:phpClassConst static var FETCH_ORI_LAST:Int;
+	@:phpClassConst static var FETCH_ORI_ABS:Int;
+	@:phpClassConst static var FETCH_ORI_REL:Int;
+	@:phpClassConst static var CURSOR_FWDONLY:Int;
+	@:phpClassConst static var CURSOR_SCROLL:Int;
+	@:phpClassConst static var ERR_NONE:String;
+	@:phpClassConst static var PARAM_EVT_ALLOC:Int;
+	@:phpClassConst static var PARAM_EVT_FREE:Int;
+	@:phpClassConst static var PARAM_EVT_EXEC_PRE:Int;
+	@:phpClassConst static var PARAM_EVT_EXEC_POST:Int;
+	@:phpClassConst static var PARAM_EVT_FETCH_PRE:Int;
+	@:phpClassConst static var PARAM_EVT_FETCH_POST:Int;
+	@:phpClassConst static var PARAM_EVT_NORMALIZE:Int;
+
+	function new(dns:String, ?username:String, ?password:String, ?options:NativeArray):Void;
+	function beginTransaction():Bool;
+	function commit():Bool;
+	function errorCode():Dynamic;
+	function errorInfo():NativeArray;
+	function exec(statement:String):Int;
+	function getAttribute(attribute:Int):Dynamic;
+	function getAvailableDrivers():NativeArray;
+	function lastInsertId(?name:String):String;
+	function prepare(statement:String, ?driver_options:NativeArray):PDOStatement;
+	function query(statement:String, ?mode:Int):PDOStatement;
+	function quote(String:String, ?parameter_type:Int = 2):String;
+	function rollBack():Bool;
+	function setAttribute(attribute:Int, value:Dynamic):Bool;
 }
diff --git a/std/php/db/PDOException.hx b/std/php/db/PDOException.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a3a72cb3d8b5641abede7b639876558bf6954925
--- /dev/null
+++ b/std/php/db/PDOException.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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 php.db;
+
+import php.RuntimeException;
+
+@:native('PDOException')
+extern class PDOException extends RuntimeException {
+	var errorInfo:NativeArray;
+}
diff --git a/std/php/db/PDOStatement.hx b/std/php/db/PDOStatement.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b720387dab1a15c637c90741aaaa8fb3e321958a
--- /dev/null
+++ b/std/php/db/PDOStatement.hx
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C)2005-2019 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 php.db;
+
+import php.*;
+
+@:native('PDOStatement')
+extern class PDOStatement {
+	function bindColumn(column:Dynamic, param:Dynamic, ?type:Int, ?maxlen:Int, ?driverdata:Dynamic):Bool;
+	function bindParam(parameter:Dynamic, variable:Dynamic, ?data_type:Int, ?length:Int, ?driver_options:Dynamic):Bool;
+	function bindValue(parameter:Dynamic, value:Dynamic, ?data_type:Int):Bool;
+	function closeCursor():Bool;
+	function columnCount():Int;
+	function debugDumpParams():Bool;
+	function errorCode():String;
+	function errorInfo():NativeArray;
+	function execute(?input_parameters:NativeArray):Bool;
+	function fetch(?fetch_style:Int = 4, ?cursor_orientation:Int = 0, ?cursor_offset:Int = 0):Dynamic;
+	function fetchAll(?fetch_style:Int, ?fetch_argument:Dynamic, ?ctor_args:NativeArray):NativeArray;
+	function fetchColumn(?column_number:Int = 0):String;
+	function fetchObject(?class_name:String, ?ctor_args:NativeArray):Dynamic;
+	function getAttribute(attribute:Int):Dynamic;
+	function getColumnMeta(column:Int):NativeArray;
+	function nextRowset():Bool;
+	function rowCount():Int;
+	function setAttribute(attribute:Int, value:Dynamic):Bool;
+	function setFetchMode(mode:Int, ?fetch:Dynamic, ?ctorargs:NativeArray):Bool;
+}
diff --git a/std/php/db/SQLite3.hx b/std/php/db/SQLite3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c775b053503e8cee0880325e548db78fdf03b566
--- /dev/null
+++ b/std/php/db/SQLite3.hx
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C)2005-2019 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 php.db;
+
+import haxe.Constraints;
+import php.*;
+import haxe.extern.EitherType;
+
+@:native('SQLite3')
+extern class SQLite3 {
+	static function version():NativeArray;
+	static function escapeString(value:String):String;
+	function busyTimeout(msecs:Int):Bool;
+	function changes():Int;
+	function close():Bool;
+	function new(filename:String, ?flags:Int, encryption_key:String = null):Void;
+	function createAggregate(name:String, step_callback:Function, final_callback:Function, argument_count:Int = -1):Bool;
+	function createCollation(name:String, callback:Function):Bool;
+	function createFunction(name:String, callback:Function, argument_count:Int = -1):Bool;
+	function enableExceptions(enableExceptions:Bool = false):Bool;
+	function exec(query:String):Bool;
+	function lastErrorCode():Int;
+	function lastErrorMsg():String;
+	function lastInsertRowID():Int;
+	function loadExtension(shared_library:String):Bool;
+	function open(filename:String, ?flags:Int, encryption_key:String = null):Void;
+	function prepare(query:String):SQLite3Stmt;
+	function query(query:String):EitherType<Bool, SQLite3Result>;
+	function querySingle(query:String, entire_row:Bool = false):Dynamic;
+}
diff --git a/std/php/db/SQLite3Result.hx b/std/php/db/SQLite3Result.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ea65802a6a884b914f6890a86908e2fa8399e689
--- /dev/null
+++ b/std/php/db/SQLite3Result.hx
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C)2005-2019 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 php.db;
+
+import php.*;
+import haxe.extern.EitherType;
+
+@:native('SQLite3Result')
+extern class SQLite3Result {
+	function columnName(column_number:Int):String;
+	function columnType(column_number:Int):Int;
+	function fetchArray(?mode:Int):EitherType<Bool, NativeAssocArray<String>>;
+	function finalize():Bool;
+	function numColumns():Int;
+	function reset():Bool;
+}
diff --git a/std/php/db/SQLite3Stmt.hx b/std/php/db/SQLite3Stmt.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f3d13a98aac214e3b994c38fe6d45a88370b629a
--- /dev/null
+++ b/std/php/db/SQLite3Stmt.hx
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C)2005-2019 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 php.db;
+
+import php.*;
+import haxe.extern.EitherType;
+
+@:native('SQLite3Stmt')
+extern class SQLite3Stmt {
+	function bindParam(sql_param:EitherType<String, Int>, param:Ref<Dynamic>, ?type:Int):Bool;
+	function bindValue(sql_param:EitherType<String, Int>, value:Dynamic, ?type:Int):Bool;
+	function clear():Bool;
+	function close():Bool;
+	function execute():SQLite3Result;
+	function paramCount():Int;
+	function readOnly():Bool;
+	function reset():Bool;
+}
diff --git a/std/php7/_std/sys/net/Socket.hx b/std/php/net/Socket.hx
similarity index 51%
rename from std/php7/_std/sys/net/Socket.hx
rename to std/php/net/Socket.hx
index 293d6871e8830bb2a79571f95f41648213dda7ff..8fadbf729f84cd390d516f8784de79f99718404c 100644
--- a/std/php7/_std/sys/net/Socket.hx
+++ b/std/php/net/Socket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,90 +19,92 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package sys.net;
+
+package php.net;
 
 import php.*;
 import php.Global.*;
 import php.Const.*;
 import sys.io.FileInput;
 import sys.io.FileOutput;
+import sys.net.Host;
 
-@:coreApi
-class Socket {
-
-	private var __s : Resource;
-	private var protocol : String;
-	public var input(default,null) : haxe.io.Input;
-	public var output(default,null) : haxe.io.Output;
-	public var custom : Dynamic;
+class Socket extends sys.net.Socket {
+	var connected = false;
+	var timeout:Null<Float> = null;
 
-	public function new() : Void {
-		input = @:privateAccess new sys.io.FileInput(null);
-		output = @:privateAccess new sys.io.FileOutput(null);
+	public function new():Void {
+		super();
 		protocol = "tcp";
 	}
 
-	private function assignHandler() : Void {
-		@:privateAccess (cast input:FileInput).__f = __s;
-		@:privateAccess (cast output:FileOutput).__f = __s;
+	override function initSocket():Void {
+		// do not init socket with `socket_*` functions, because we will use streams instead.
+	}
+
+	override function assignHandler():Void {
+		@:privateAccess (cast input : FileInput).__f = __s;
+		@:privateAccess (cast output : FileOutput).__f = __s;
+		connected = true;
+		if (timeout != null) {
+			setTimeout(timeout);
+		}
 	}
 
-	public function close() : Void {
+	override public function close():Void {
+		connected = false;
 		fclose(__s);
-		@:privateAccess (cast input:FileInput).__f = null;
-		@:privateAccess (cast output:FileOutput).__f = null;
+		@:privateAccess (cast input : FileInput).__f = null;
+		@:privateAccess (cast output : FileOutput).__f = null;
 		input.close();
 		output.close();
 	}
 
-	public function read() : String {
+	override public function read():String {
 		var b = '';
-		while(!feof(__s)) Syntax.binop(b, '.=', fgets(__s));
+		while (!feof(__s))
+			b += fgets(__s);
 		return b;
 	}
 
-	public function write( content : String ) : Void {
+	override public function write(content:String):Void {
 		fwrite(__s, content);
 	}
 
-	public function connect(host : Host, port : Int) : Void {
+	override public function connect(host:Host, port:Int):Void {
 		var errs = null;
 		var errn = null;
 		var r = stream_socket_client(protocol + '://' + host.host + ':' + port, errn, errs);
-		Socket.checkError(r, errn, errs);
+		checkError(r, errn, errs);
 		__s = r;
 		assignHandler();
 	}
 
-	public function listen(connections : Int) : Void {
+	override public function listen(connections:Int):Void {
 		throw "Not implemented";
-/* TODO: ??????
-		var r = socket_listen(__s, connections);
-		checkError(r);
-*/
+		/* TODO: ??????
+			var r = socket_listen(__s, connections);
+			checkError(r);
+		 */
 	}
 
-	public function shutdown( read : Bool, write : Bool ) : Void {
+	override public function shutdown(read:Bool, write:Bool):Void {
 		var rw = read && write ? 2 : (write ? 1 : (read ? 0 : 2));
 		var r = stream_socket_shutdown(__s, rw);
 		checkError(r, 0, 'Unable to Shutdown');
 	}
 
-	public function bind(host : Host, port : Int) : Void {
+	override public function bind(host:Host, port:Int):Void {
 		var errs = Boot.deref(null);
 		var errn = Boot.deref(null);
-		var r = stream_socket_server(
-			protocol + '://' + host.host + ':' + port,
-			errn,
-			errs,
-			(protocol == "udp" ? STREAM_SERVER_BIND : STREAM_SERVER_BIND | STREAM_SERVER_LISTEN)
-		);
+		var r = stream_socket_server(protocol + '://' + host.host + ':' + port, errn, errs,
+			(protocol == "udp" ? STREAM_SERVER_BIND : STREAM_SERVER_BIND | STREAM_SERVER_LISTEN));
 		Socket.checkError(r, errn, errs);
 		__s = cast r;
 		assignHandler();
 	}
 
-	public function accept() : Socket {
+	override public function accept():Socket {
 		var r = stream_socket_accept(__s);
 		checkError(r, 0, 'Unable to accept connections on socket');
 		var s = new Socket();
@@ -111,64 +113,53 @@ class Socket {
 		return s;
 	}
 
-	private function hpOfString(s : String) : { host : Host, port : Int } {
+	private function hpOfString(s:String):{host:Host, port:Int} {
 		var parts = s.split(':');
-		if(parts.length == 2) {
-			return { host : new Host(parts[0]), port : Std.parseInt(parts[1]) };
+		if (parts.length == 2) {
+			return {host: new Host(parts[0]), port: Std.parseInt(parts[1])};
 		} else {
-			return { host : new Host(parts[1].substr(2)), port : Std.parseInt(parts[2]) };
+			return {host: new Host(parts[1].substr(2)), port: Std.parseInt(parts[2])};
 		}
 	}
 
-	public function peer() : { host : Host, port : Int } {
+	override public function peer():{host:Host, port:Int} {
 		var r = stream_socket_get_name(__s, true);
 		checkError(r, 0, 'Unable to retrieve the peer name');
 		return hpOfString(r);
 	}
 
-	public function host() : { host : Host, port : Int } {
+	override public function host():{host:Host, port:Int} {
 		var r = stream_socket_get_name(__s, false);
 		checkError(r, 0, 'Unable to retrieve the host name');
 		return hpOfString(r);
 	}
 
-	public function setTimeout( timeout : Float ) : Void {
+	override public function setTimeout(timeout:Float):Void {
+		if (!connected) {
+			this.timeout = timeout;
+			return;
+		}
 		var s = Std.int(timeout);
 		var ms = Std.int((timeout - s) * 1000000);
 		var r = stream_set_timeout(__s, s, ms);
 		checkError(r, 0, 'Unable to set timeout');
 	}
 
-	public function setBlocking( b : Bool ) : Void {
-		var r = stream_set_blocking(__s, b);
-		checkError(r, 0, 'Unable to block');
-	}
-
-	public function setFastSend( b : Bool ) : Void {
-		throw "Not implemented";
-	}
-
-	public function waitForRead() : Void {
-		select([this], null, null);
-	}
-
-	private static function checkError(r : Bool, code : Int, msg : String) : Void {
-		if(r != false) return;
-		throw haxe.io.Error.Custom('Error [$code]: $msg');
-	}
-
-	private static function getType(isUdp : Bool) : Int {
+	private static function getType(isUdp:Bool):Int {
 		return isUdp ? SOCK_DGRAM : SOCK_STREAM;
 	}
 
-	private static function getProtocol(protocol : String) : Int {
+	private static function getProtocol(protocol:String):Int {
 		return getprotobyname(protocol);
- 	}
+	}
 
-	public static function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float) : { read: Array<Socket>,write: Array<Socket>,others: Array<Socket> }
-	{
+	public static function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+			?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>} {
 		throw "Not implemented";
 		return null;
 	}
 
+	private static inline function checkError(r:Bool, code:Int, msg:String):Void {
+		return sys.net.Socket.checkError(r, code, msg);
+	}
 }
diff --git a/std/php/net/SslSocket.hx b/std/php/net/SslSocket.hx
index c3f6a47a826e36f40a5627c35ab23c725f67443c..680c2228f55b20982134e985f79550727b450f6e 100644
--- a/std/php/net/SslSocket.hx
+++ b/std/php/net/SslSocket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package php.net;
 
-class SslSocket extends sys.net.Socket {
+package php.net;
 
-	public function new() : Void {
+class SslSocket extends php.net.Socket {
+	public function new():Void {
 		super();
 		protocol = "ssl";
 	}
-
 }
diff --git a/std/php/reflection/ReflectionClass.hx b/std/php/reflection/ReflectionClass.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7639f2e77fa028f893ccc9fe975800cab6f07ed6
--- /dev/null
+++ b/std/php/reflection/ReflectionClass.hx
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C)2005-2019 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 php.reflection;
+
+import haxe.extern.Rest;
+
+@:native('ReflectionClass')
+extern class ReflectionClass implements Reflector {
+	@:phpClassConst static var IS_IMPLICIT_ABSTRACT:Int;
+	@:phpClassConst static var IS_EXPLICIT_ABSTRACT:Int;
+	@:phpClassConst static var IS_FINAL:Int;
+
+	static function export(argument:Dynamic, returnValue:Bool = false):String;
+
+	var name:String;
+
+	function new(argument:Dynamic):Void;
+	function getConstant(name:String):Dynamic;
+	function getConstants():NativeAssocArray<Dynamic>;
+	function getConstructor():ReflectionMethod;
+	function getDefaultProperties():NativeAssocArray<Dynamic>;
+	function getDocComment():String;
+	function getEndLine():Int;
+	// function getExtension() : ReflectionExtension;
+	function getExtensionName():String;
+	function getFileName():String;
+	function getInterfaceNames():NativeIndexedArray<String>;
+	function getInterfaces():NativeIndexedArray<ReflectionClass>;
+	function getMethod(name:String):ReflectionMethod;
+	function getMethods(?filter:Int):NativeIndexedArray<ReflectionMethod>;
+	function getModifiers():Int;
+	function getName():String;
+	function getNamespaceName():String;
+	function getParentClass():Null<ReflectionClass>;
+	function getProperties(?filter:Int):NativeIndexedArray<ReflectionProperty>;
+	function getProperty(name:String):ReflectionProperty;
+	function getShortName():String;
+	function getStartLine():Int;
+	function getStaticProperties():NativeAssocArray<Dynamic>;
+	function getStaticPropertyValue(name:String, ?def_value:Ref<Dynamic>):Dynamic;
+	function getTraitAliases():NativeAssocArray<String>;
+	function getTraitNames():NativeIndexedArray<String>;
+	function getTraits():NativeIndexedArray<ReflectionClass>;
+	function hasConstant(name:String):Bool;
+	function hasMethod(name:String):Bool;
+	function hasProperty(name:String):Bool;
+	function implementsInterface(interfaceName:String):Bool;
+	function inNamespace():Bool;
+	function isAbstract():Bool;
+	function isAnonymous():Bool;
+	function isCloneable():Bool;
+	function isFinal():Bool;
+	function isInstance(object:{}):Bool;
+	function isInstantiable():Bool;
+	function isInterface():Bool;
+	function isInternal():Bool;
+	function isIterateable():Bool;
+	function isSubclassOf(className:String):Bool;
+	function isTrait():Bool;
+	function isUserDefined():Bool;
+	function newInstance(args:Rest<Dynamic>):Dynamic;
+	function newInstanceArgs(?args:NativeIndexedArray<Dynamic>):Dynamic;
+	function newInstanceWithoutConstructor():Dynamic;
+	function setStaticPropertyValue(name:String, value:String):Void;
+	@:phpMagic function __toString():String;
+}
diff --git a/std/php/reflection/ReflectionFunctionAbstract.hx b/std/php/reflection/ReflectionFunctionAbstract.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f39a729dcb17547a243bbc1c881005849e9c05e2
--- /dev/null
+++ b/std/php/reflection/ReflectionFunctionAbstract.hx
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C)2005-2019 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 php.reflection;
+
+@:native('ReflectionFunctionAbstract')
+extern class ReflectionFunctionAbstract implements Reflector {
+	var name:String;
+
+	function getClosureScopeClass():ReflectionClass;
+	function getClosureThis():Dynamic;
+	function getDocComment():String;
+	function getEndLine():Int;
+	// function getExtension() : ReflectionExtension;
+	function getExtensionName():String;
+	function getFileName():String;
+	function getName():String;
+	function getNamespaceName():String;
+	function getNumberOfParameters():Int;
+	function getNumberOfRequiredParameters():Int;
+	// function getParameters() : NativeIndexedArray<ReflectionParameter>;
+	// function getReturnType() : ReflectionType;
+	function getShortName():String;
+	function getStartLine():Int;
+	function getStaticVariables():NativeAssocArray<Dynamic>;
+	function hasReturnType():Bool;
+	function inNamespace():Bool;
+	function isClosure():Bool;
+	function isDeprecated():Bool;
+	function isGenerator():Bool;
+	function isInternal():Bool;
+	function isUserDefined():Bool;
+	function isVariadic():Bool;
+	function returnsReference():Bool;
+	@:phpMagic function __toString():String;
+}
diff --git a/std/php/reflection/ReflectionMethod.hx b/std/php/reflection/ReflectionMethod.hx
new file mode 100644
index 0000000000000000000000000000000000000000..187faf3239d82d3287f2d6988b71e0143569be61
--- /dev/null
+++ b/std/php/reflection/ReflectionMethod.hx
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C)2005-2019 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 php.reflection;
+
+import haxe.Constraints;
+import haxe.extern.Rest;
+
+@:native('ReflectionMethod')
+extern class ReflectionMethod extends ReflectionFunctionAbstract {
+	@:phpClassConst static var IS_STATIC:Int;
+	@:phpClassConst static var IS_PUBLIC:Int;
+	@:phpClassConst static var IS_PROTECTED:Int;
+	@:phpClassConst static var IS_PRIVATE:Int;
+	@:phpClassConst static var IS_ABSTRACT:Int;
+	@:phpClassConst static var IS_FINAL:Int;
+
+	// public var class : String;
+	public static function export(className:String, name:String, ?returnValue:Bool):String;
+
+	public function new(cls:Dynamic, name:String):Void;
+	public function getClosure(object:{}):Function;
+	public function getDeclaringClass():ReflectionClass;
+	public function getModifiers():Int;
+	public function getPrototype():ReflectionMethod;
+	public function invoke(object:{}, args:Rest<Dynamic>):Dynamic;
+	public function invokeArgs(object:{}, args:NativeIndexedArray<Dynamic>):Dynamic;
+	public function isAbstract():Bool;
+	public function isConstructor():Bool;
+	public function isDestructor():Bool;
+	public function isFinal():Bool;
+	public function isPrivate():Bool;
+	public function isProtected():Bool;
+	public function isPublic():Bool;
+	public function isStatic():Bool;
+	public function setAccessible(accessible:Bool):Void;
+}
diff --git a/std/php/reflection/ReflectionProperty.hx b/std/php/reflection/ReflectionProperty.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fc01bf788e44abbe71d7863a382d8b0b8a681592
--- /dev/null
+++ b/std/php/reflection/ReflectionProperty.hx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)2005-2019 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 php.reflection;
+
+@:native('ReflectionProperty')
+extern class ReflectionProperty implements Reflector {
+	@:phpClassConst static var IS_STATIC:Int;
+	@:phpClassConst static var IS_:Int;
+	@:phpClassConst static var IS_PROTECTED:Int;
+	@:phpClassConst static var IS_PRIVATE:Int;
+
+	var name:String;
+
+	static function export(className:Dynamic, name:String, ?returnValue:Bool):String;
+
+	function new(cls:Dynamic, name:String):Void;
+	function getDeclaringClass():ReflectionClass;
+	function getDocComment():String;
+	function getModifiers():Int;
+	function getName():String;
+	function getValue(?object:{}):Dynamic;
+	function isPrivate():Bool;
+	function isProtected():Bool;
+	function isPublic():Bool;
+	function isStatic():Bool;
+	function setAccessible(accessible:Bool):Void;
+	function setValue(object:{}, value:Dynamic):Void;
+	@:phpMagic function __toString():String;
+}
diff --git a/std/php/reflection/Reflector.hx b/std/php/reflection/Reflector.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4b25332fb26e3081ba466626794de0277413bb21
--- /dev/null
+++ b/std/php/reflection/Reflector.hx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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 php.reflection;
+
+@:native('Reflector')
+extern interface Reflector {
+	public function __toString():String;
+}
diff --git a/std/php7/ArrayAccess.hx b/std/php7/ArrayAccess.hx
deleted file mode 100644
index a69539d8136cb2fb1c6942f13cb9456da626c9e8..0000000000000000000000000000000000000000
--- a/std/php7/ArrayAccess.hx
+++ /dev/null
@@ -1,13 +0,0 @@
-package php;
-
-/**
-	Native PHP interface.
-	@see http://php.net/manual/en/class.arrayaccess.php
-**/
-@:native('ArrayAccess')
-extern interface ArrayAccess<K,V> {
-	function offsetExists( offset:K ) : Bool;
-	function offsetGet( offset:K ) : V;
-	function offsetSet( offset:K, value:V ) : Void;
-	function offsetUnset( offset:K ) : Void;
-}
\ No newline at end of file
diff --git a/std/php7/Boot.hx b/std/php7/Boot.hx
deleted file mode 100644
index 9afa66dd2ea389fb41599e1666c459b59986387e..0000000000000000000000000000000000000000
--- a/std/php7/Boot.hx
+++ /dev/null
@@ -1,890 +0,0 @@
-/*
- * Copyright (C)2005-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 php;
-
-import haxe.PosInfos;
-
-using php.Global;
-
-/**
-	Various Haxe->PHP compatibility utilities.
-	You should not use this class directly.
-**/
-@:keep
-@:dox(hide)
-class Boot {
-	/** List of Haxe classes registered by their PHP class names  */
-	@:protected static var aliases = new NativeAssocArray<String>();
-	/** Cache of HxClass instances */
-	@:protected static var classes = new NativeAssocArray<HxClass>();
-	/** List of getters (for Reflect) */
-	@:protected static var getters = new NativeAssocArray<NativeAssocArray<Bool>>();
-	/** List of setters (for Reflect) */
-	@:protected static var setters = new NativeAssocArray<NativeAssocArray<Bool>>();
-	/** Metadata storage */
-	@:protected static var meta = new NativeAssocArray<{}>();
-
-	/**
-		Initialization stuff.
-		This method is called once before invoking any Haxe-generated user code.
-	**/
-	static function __init__() {
-		if (!Global.defined('HAXE_CUSTOM_ERROR_HANDLER') || !Const.HAXE_CUSTOM_ERROR_HANDLER) {
-			var previousLevel = Global.error_reporting(Const.E_ALL);
-			var previousHandler = Global.set_error_handler(
-				function (errno:Int, errstr:String, errfile:String, errline:Int) {
-					if (Global.error_reporting() & errno == 0) {
-						return false;
-					}
-					throw new ErrorException(errstr, 0, errno, errfile, errline);
-				}
-			);
-			//Already had user-defined handler. Return it.
-			if (previousHandler != null) {
-				Global.error_reporting(previousLevel);
-				Global.set_error_handler(previousHandler);
-			}
-		}
-	}
-
-	/**
-		Returns root namespace based on a value of `--php-prefix` compiler flag.
-		Returns empty string if no `--php-prefix` provided.
-	**/
-	public static inline function getPrefix() : String {
-		return untyped __php__('self::PHP_PREFIX');
-	}
-
-	/**
-		Register list of getters to be able to call getters using reflection
-	**/
-	public static function registerGetters( phpClassName:String, list:NativeAssocArray<Bool> ) : Void {
-		getters[phpClassName] = list;
-	}
-
-	/**
-		Register list of setters to be able to call getters using reflection
-	**/
-	public static function registerSetters( phpClassName:String, list:NativeAssocArray<Bool> ) : Void {
-		setters[phpClassName] = list;
-	}
-
-	/**
-		Check if specified property has getter
-	**/
-	public static function hasGetter( phpClassName:String, property:String ) : Bool {
-		ensureLoaded(phpClassName);
-
-		var has = false;
-		var phpClassName:haxe.extern.EitherType<Bool,String> = phpClassName;
-		do {
-			has = Global.isset(getters[phpClassName][property]);
-			phpClassName = Global.get_parent_class(phpClassName);
-		} while (!has && phpClassName != false && Global.class_exists(phpClassName));
-
-		return has;
-	}
-
-	/**
-		Check if specified property has setter
-	**/
-	public static function hasSetter( phpClassName:String, property:String ) : Bool {
-		ensureLoaded(phpClassName);
-
-		var has = false;
-		var phpClassName:haxe.extern.EitherType<Bool,String> = phpClassName;
-		do {
-			has = Global.isset(setters[phpClassName][property]);
-			phpClassName = Global.get_parent_class(phpClassName);
-		} while (!has && phpClassName != false && Global.class_exists(phpClassName));
-
-		return has;
-	}
-
-	/**
-		Save metadata for specified class
-	**/
-	public static function registerMeta( phpClassName:String, data:Dynamic ) : Void {
-		meta[phpClassName] = data;
-	}
-
-	/**
-		Retrieve metadata for specified class
-	**/
-	public static function getMeta( phpClassName:String ) : Null<Dynamic> {
-		ensureLoaded(phpClassName);
-		return Global.isset(meta[phpClassName]) ? meta[phpClassName] : null;
-	}
-
-	/**
-		Associate PHP class name with Haxe class name
-	**/
-	public static function registerClass( phpClassName:String, haxeClassName:String ) : Void {
-		aliases[phpClassName] = haxeClassName;
-	}
-
-	/**
-		Returns a list of currently loaded haxe-generated classes.
-	**/
-	public static function getRegisteredClasses():Array<Class<Dynamic>> {
-		var result = [];
-		Syntax.foreach(aliases, function(phpName, haxeName) {
-			result.push(cast getClass(phpName));
-		});
-		return result;
-	}
-
-	/**
-		Returns a list of phpName=>haxeName for currently loaded haxe-generated classes.
-	**/
-	public static function getRegisteredAliases():NativeAssocArray<String> {
-		return aliases;
-	}
-
-	/**
-		Get Class<T> instance for PHP fully qualified class name (E.g. '\some\pack\MyClass')
-		It's always the same instance for the same `phpClassName`
-	**/
-	public static function getClass( phpClassName:String ) : HxClass {
-		if (phpClassName.charAt(0) == '\\') {
-			phpClassName = phpClassName.substr(1);
-		}
-		if (!Global.isset(classes[phpClassName])) {
-			classes[phpClassName] = new HxClass(phpClassName);
-		}
-
-		return classes[phpClassName];
-	}
-
-	/**
-		Returns Class<HxAnon>
-	**/
-	public static inline function getHxAnon() : HxClass {
-		return cast HxAnon;
-	}
-
-	/**
-		Returns Class<HxClass>
-	**/
-	public static inline function getHxClass() : HxClass {
-		return cast HxClass;
-	}
-
-	/**
-		Returns either Haxe class name for specified `phpClassName` or (if no such Haxe class registered) `phpClassName`.
-	**/
-	public static function getClassName( phpClassName:String ) : String {
-		var hxClass = getClass(phpClassName);
-		var name = getHaxeName(hxClass);
-		return (name == null ? hxClass.phpClassName : name);
-	}
-
-	/**
-		Returns original Haxe fully qualified class name for this type (if exists)
-	**/
-	public static function getHaxeName( hxClass:HxClass) : Null<String> {
-		switch (hxClass.phpClassName) {
-			case 'Int': return 'Int';
-			case 'String': return 'String';
-			case 'Bool': return 'Bool';
-			case 'Float': return 'Float';
-			case 'Class': return 'Class';
-			case 'Enum': return 'Enum';
-			case 'Dynamic': return 'Dynamic';
-			case _:
-		}
-
-		inline function exists() return Global.isset(aliases[hxClass.phpClassName]);
-
-		if (exists()) {
-			return aliases[hxClass.phpClassName];
-		} else if (Global.class_exists(hxClass.phpClassName) && exists()) {
-			return aliases[hxClass.phpClassName];
-		} else if (Global.interface_exists(hxClass.phpClassName) && exists()) {
-			return aliases[hxClass.phpClassName];
-		}
-
-		return null;
-	}
-
-	/**
-		Find corresponding PHP class name.
-		Returns `null` if specified class does not exist.
-	**/
-	public static function getPhpName( haxeName:String ) : Null<String> {
-		var prefix = getPrefix();
-		var phpParts = (prefix.length == 0 ? [] : [prefix]);
-
-		var haxeParts = haxeName.split('.');
-		for (part in haxeParts) {
-			switch (part.toLowerCase()) {
-				case "__halt_compiler" | "abstract" | "and" | "array" | "as" | "break" | "callable" | "case" | "catch" | "class"
-					| "clone" | "const" | "continue" | "declare" | "default" | "die" | "do" | "echo" | "else" | "elseif" | "empty"
-					| "enddeclare" | "endfor" | "endforeach" | "endif" | "endswitch" | "endwhile" | "eval" | "exit" | "extends"
-					| "final" | "finally" | "for" | "foreach" | "function" | "global" | "goto" | "if" | "implements" | "include"
-					| "include_once" | "instanceof" | "insteadof" | "interface" | "isset" | "list" | "namespace" | "new" | "or"
-					| "print" | "private" | "protected" | "public" | "require" | "require_once" | "return" | "static" | "switch"
-					| "throw" | "trait" | "try" | "unset" | "use" | "var" | "while" | "xor" | "yield" | "__class__" | "__dir__"
-					| "__file__" | "__function__" | "__line__" | "__method__" | "__trait__" | "__namespace__" | "int" | "float"
-					| "bool" | "string" | "true" | "false" | "null" | "parent" | "void" | "iterable" | "object":
-						part += '_hx';
-				case _:
-			}
-			phpParts.push(part);
-		}
-
-		return phpParts.join('\\');
-	}
-
-	/**
-		Creates Haxe-compatible closure.
-		@param type `this` for instance methods; full php class name for static methods
-		@param func Method name
-	**/
-	public static inline function closure( target:Dynamic, func:Dynamic ) : HxClosure {
-		return new HxClosure(target, func);
-	}
-
-	/**
-		Unsafe cast to HxClosure
-	**/
-	public static inline function castClosure(value:Dynamic) : HxClosure {
-		return value;
-	}
-
-	/**
-		Unsafe cast to HxClass
-	**/
-	public static inline function castClass(cls:Class<Dynamic>) : HxClass {
-		return cast cls;
-	}
-
-	/**
-		Returns `Class<T>` for `HxClosure`
-	**/
-	public static inline function closureHxClass() : HxClass {
-		return cast HxClosure;
-	}
-
-	/**
-		Implementation for `cast(value, Class<Dynamic>)`
-		@throws HxException if `value` cannot be casted to this type
-	**/
-	public static function typedCast( hxClass:HxClass, value:Dynamic ) : Dynamic {
-		switch (hxClass.phpClassName) {
-			case 'Int':
-				if (Boot.isNumber(value)) {
-					return Global.intval(value);
-				}
-			case 'Float':
-				if (Boot.isNumber(value)) {
-					return value.floatval();
-				}
-			case 'Bool':
-				if (value.is_bool()) {
-					return value;
-				}
-			case 'String':
-				if (value.is_string()) {
-					return value;
-				}
-			case 'php\\NativeArray':
-				if (value.is_array()) {
-					return value;
-				}
-			case _:
-				if (value.is_object() && Std.is(value, cast hxClass)) {
-					return value;
-				}
-		}
-		throw 'Cannot cast ' + Std.string(value) + ' to ' + getClassName(hxClass.phpClassName);
-	}
-
-	/**
-		`trace()` implementation
-	**/
-	public static function trace( value:Dynamic, infos:PosInfos ) : Void {
-		if (infos != null) {
-			Global.echo('${infos.fileName}:${infos.lineNumber}: ');
-		}
-		Global.echo(stringify(value));
-		if (infos.customParams != null) {
-			for (value in infos.customParams) {
-				Global.echo(',' + stringify(value));
-			}
-		}
-		Global.echo('\n');
-	}
-
-	/**
-		Returns string representation of `value`
-	**/
-	public static function stringify( value : Dynamic ) : String {
-		if (value == null) {
-			return 'null';
-		}
-		if (value.is_string()) {
-			return value;
-		}
-		if (value.is_int() || value.is_float()) {
-			return Syntax.string(value);
-		}
-		if (value.is_bool()) {
-			return value ? 'true' : 'false';
-		}
-		if (value.is_array()) {
-			var strings = Syntax.arrayDecl();
-			Syntax.foreach(value, function(key:Dynamic, item:Dynamic) {
-				Global.array_push(strings, (key:String) + ' => ' + stringify(item));
-			});
-			return '[' + Global.implode(', ', strings) + ']';
-		}
-		if (value.is_object()) {
-			if (value.method_exists('toString')) {
-				return value.toString();
-			}
-			if (value.method_exists('__toString')) {
-				return value.__toString();
-			}
-			if (Std.is(value, StdClass)) {
-				if (Global.isset(Syntax.getField(value, 'toString')) && value.toString.is_callable()) {
-					return value.toString();
-				}
-				var result = new NativeIndexedArray<String>();
-				var data = Global.get_object_vars(value);
-				for (key in data.array_keys()) {
-					result.array_push('$key : ' + stringify(data[key]));
-				}
-				return '{ ' + Global.implode(', ', result) + ' }';
-			}
-			if (isFunction(value)) {
-				return '<function>';
-			}
-			if (Std.is(value, HxClass)) {
-				return '[class ' + getClassName((value:HxClass).phpClassName) + ']';
-			} else {
-				return '[object ' + getClassName(Global.get_class(value)) + ']';
-			}
-		}
-		throw "Unable to stringify value";
-	}
-
-	static public inline function isNumber( value:Dynamic ) {
-		return value.is_int() || value.is_float();
-	}
-
-	/**
-		Check if specified values are equal
-	**/
-	public static function equal( left:Dynamic, right:Dynamic ) : Bool {
-		if (isNumber(left) && isNumber(right)) {
-			return Syntax.binop(left, '==', right);
-		}
-		return Syntax.binop(left, '===', right);
-	}
-
-	/**
-		Concat `left` and `right` if both are strings or string and null.
-		Otherwise return sum of `left` and `right`.
-	**/
-	public static function addOrConcat( left:Dynamic, right:Dynamic ) : Dynamic {
-		if (left.is_string() || right.is_string()) {
-			return (left:String) + (right:String);
-		}
-		return Syntax.binop(left, '+', right);
-	}
-
-	/**
-		`Std.is()` implementation
-	**/
-	public static function is( value:Dynamic, type:HxClass ) : Bool {
-		if (type == null) return false;
-
-		var phpType = type.phpClassName;
-		switch (phpType) {
-			case 'Dynamic':
-				return true;
-			case 'Int':
-				return (
-						value.is_int()
-						|| (
-							value.is_float()
-							&& Syntax.binop(Syntax.int(value), '==', value)
-							&& !Global.is_nan(value)
-						)
-					)
-					&& Global.abs(value) <= 2147483648;
-			case 'Float':
-				return value.is_float() || value.is_int();
-			case 'Bool':
-				return value.is_bool();
-			case 'String':
-				return value.is_string();
-			case 'php\\NativeArray', 'php\\_NativeArray\\NativeArray_Impl_':
-				return value.is_array();
-			case 'Enum', 'Class':
-				if (Std.is(value, HxClass)) {
-					var valuePhpClass = (cast value:HxClass).phpClassName;
-					var enumPhpClass = (cast HxEnum:HxClass).phpClassName;
-					var isEnumType = Global.is_subclass_of(valuePhpClass, enumPhpClass);
-					return (phpType == 'Enum' ? isEnumType : !isEnumType);
-				}
-			case _:
-				if (value.is_object()) {
-					var type:Class<Dynamic> = cast type;
-					return Syntax.instanceof(value, type);
-				}
-		}
-		return false;
-	}
-
-	/**
-		Check if `value` is a `Class<T>`
-	**/
-	public static inline function isClass(value:Dynamic) : Bool {
-		return Std.is(value, HxClass);
-	}
-
-	/**
-		Check if `value` is an enum constructor instance
-	**/
-	public static inline function isEnumValue(value:Dynamic) : Bool {
-		return Std.is(value, HxEnum);
-	}
-
-	/**
-		Check if `value` is a function
-	**/
-	public static inline function isFunction(value:Dynamic) : Bool {
-		return Std.is(value, Closure) || Std.is(value, HxClosure);
-	}
-
-	/**
-		Check if `value` is an instance of `HxClosure`
-	**/
-	public static inline function isHxClosure(value:Dynamic) : Bool {
-		return Std.is(value, HxClosure);
-	}
-
-	/**
-		Performs `left >>> right` operation
-	**/
-	public static function shiftRightUnsigned( left:Int, right:Int ) : Int {
-		if (right == 0) {
-			return left;
-		} else if (left >= 0) {
-			return (left >> right);
-		} else {
-			return (left >> right) & (0x7fffffff >> (right - 1));
-		}
-	}
-
-	/**
-		Helper method to avoid "Cannot use temporary expression in write context" error for expressions like this:
-		```
-		(new MyClass()).fieldName = 'value';
-		```
-	**/
-	static public function deref( value:Dynamic ) : Dynamic {
-		return value;
-	}
-
-	/**
-		Create Haxe-compatible anonymous structure of `data` associative array
-	**/
-	static public inline function createAnon( data:NativeArray ) : Dynamic {
-		return new HxAnon(data);
-	}
-
-	/**
-		Make sure specified class is loaded
-	**/
-	static public inline function ensureLoaded(phpClassName:String ) : Bool {
-		return Global.class_exists(phpClassName) || Global.interface_exists(phpClassName);
-	}
-
-	/**
-		Get `field` of a dynamic `value` in a safe manner (avoid exceptions on trying to get a method)
-	**/
-	static public function dynamicField( value:Dynamic, field:String ) : Dynamic {
-		if(Global.method_exists(value, field)) {
-			return closure(value, field);
-		}
-		if(Global.is_string(value)) {
-			value = @:privateAccess new HxDynamicStr(value);
-		}
-		return Syntax.getField(value, field);
-	}
-}
-
-
-/**
-	Class<T> implementation for Haxe->PHP internals.
-**/
-@:keep
-@:dox(hide)
-private class HxClass {
-
-	public var phpClassName (default,null) : String;
-
-	public function new( phpClassName:String ) : Void {
-		this.phpClassName = phpClassName;
-	}
-
-	/**
-		Magic method to call static methods of this class, when `HxClass` instance is in a `Dynamic` variable.
-	**/
-	@:phpMagic
-	function __call( method:String, args:NativeArray ) : Dynamic {
-		var callback = (phpClassName == 'String' ? (cast HxString:HxClass).phpClassName : phpClassName) + '::' + method;
-		return Global.call_user_func_array(callback, args);
-	}
-
-	/**
-		Magic method to get static vars of this class, when `HxClass` instance is in a `Dynamic` variable.
-	**/
-	@:phpMagic
-	function __get( property:String ) : Dynamic {
-		if (Global.defined('$phpClassName::$property')) {
-			return Global.constant('$phpClassName::$property');
-		} else if (Boot.hasGetter(phpClassName, property)) {
-			return Syntax.staticCall(phpClassName, 'get_$property');
-		} else {
-			return Syntax.getStaticField(phpClassName, property);
-		}
-	}
-
-	/**
-		Magic method to set static vars of this class, when `HxClass` instance is in a `Dynamic` variable.
-	**/
-	@:phpMagic
-	function __set( property:String, value:Dynamic ) : Void {
-		if (Boot.hasSetter(phpClassName, property)) {
-			Syntax.staticCall(phpClassName, 'set_$property', value);
-		} else {
-			Syntax.setStaticField(phpClassName, property, value);
-		}
-	}
-}
-
-
-/**
-	Base class for enum types
-**/
-@:keep
-@:dox(hide)
-private class HxEnum {
-	static var singletons = new Map<String,HxEnum>();
-
-	var tag : String;
-	var index : Int;
-	var params : NativeArray;
-
-	/**
-		Returns instances of constructors without arguments
-	**/
-	public static function singleton( enumClass:String, tag:String, index:Int ) : HxEnum {
-		var key = '$enumClass::$tag';
-
-		var instance = singletons.get(key);
-		if (instance == null) {
-			instance = Syntax.construct(enumClass, tag, index);
-			singletons.set(key, instance);
-		}
-
-		return instance;
-	}
-
-	public function new( tag:String, index:Int, arguments:NativeArray = null ) : Void {
-		this.tag = tag;
-		this.index = index;
-		params = (arguments == null ? new NativeArray() : arguments);
-	}
-
-	/**
-		Get string representation of this `Class`
-	**/
-	public function toString() : String {
-		return __toString();
-	}
-
-	/**
-		PHP magic method to get string representation of this `Class`
-	**/
-	@:phpMagic
-	public function __toString() : String {
-		var result = tag;
-		if (Global.count(params) > 0) {
-			var strings = Global.array_map(function (item) return Boot.stringify(item), params);
-			result += '(' + Global.implode(',', strings) + ')';
-		}
-		return result;
-	}
-}
-
-
-/**
-	`String` implementation
-**/
-@:keep
-@:dox(hide)
-private class HxString {
-
-	public static function toUpperCase( str:String ) : String {
-		return Global.strtoupper(str);
-	}
-
-	public static function toLowerCase( str:String ) : String {
-		return Global.strtolower(str);
-	}
-
-	public static function charAt( str:String, index:Int) : String {
-		if (index < 0 || index >= str.length) {
-			return '';
-		} else {
-			return (str:NativeString)[index];
-		}
-	}
-
-	public static function charCodeAt( str:String, index:Int) : Null<Int> {
-		if (index < 0 || index >= str.length) {
-			return null;
-		} else {
-			return Global.ord((str:NativeString)[index]);
-		}
-	}
-
-	public static function indexOf( str:String, search:String, startIndex:Int = null ) : Int {
-		if (startIndex == null) {
-			startIndex = 0;
-		} else if (startIndex < 0) {
-			startIndex += str.length;
-		}
-		var index = Global.strpos(str, search, startIndex);
-		return (index == false ? -1 : index);
-	}
-
-	public static function lastIndexOf( str:String, search:String, startIndex:Int = null ) : Int {
-		var index = Global.strrpos(str, search, (startIndex == null ? 0 : startIndex - str.length));
-		if (index == false) {
-			return -1;
-		} else {
-			return index;
-		}
-	}
-
-	public static function split( str:String, delimiter:String ) : Array<String> {
-		if (delimiter == '') {
-			return @:privateAccess Array.wrap(Global.str_split(str));
-		} else {
-			return @:privateAccess Array.wrap(Global.explode(delimiter, str));
-		}
-	}
-
-	public static function substr( str:String, pos:Int, ?len:Int ) : String {
-		if (pos < -str.length) {
-			pos = 0;
-		} else if (pos >= str.length) {
-			return '';
-		}
-		if (len == null) {
-			return Global.substr(str, pos);
-		} else {
-			var result = Global.substr(str, pos, len);
-			return (result == false ? '' : result);
-		}
-	}
-
-	public static function substring( str:String, startIndex:Int, ?endIndex:Int ) : String {
-		if (endIndex == null) {
-			endIndex = str.length;
-		} else if (endIndex < 0) {
-			endIndex = 0;
-		}
-		if (startIndex < 0) startIndex = 0;
-		if (startIndex > endIndex) {
-			var tmp = endIndex;
-			endIndex = startIndex;
-			startIndex = tmp;
-		}
-		var result = Global.substr(str, startIndex, endIndex - startIndex);
-		return (result == false ? '' : result);
-	}
-
-	public static function toString( str:String ) : String {
-		return str;
-	}
-
-	public static function fromCharCode( code:Int ) : String {
-		return Global.chr(code);
-	}
-}
-
-/**
-	For Dynamic access which looks like String
-**/
-@:dox(hide)
-@:keep
-private class HxDynamicStr {
-	static var hxString : String = (cast HxString:HxClass).phpClassName;
-	var str : String;
-
-	/**
-		Returns HxDynamicStr instance if `value` is a string.
-		Otherwise returns `value` as-is.
-	**/
-	static function wrap( value:Dynamic ) : Dynamic {
-		if (value.is_string()) {
-			return new HxDynamicStr(value);
-		} else {
-			return value;
-		}
-	}
-
-	function new( str:String ) {
-		this.str = str;
-	}
-
-	@:phpMagic
-	function __get( field:String ) : Dynamic {
-		switch (field) {
-			case 'length':      return str.length;
-			case 'toUpperCase': return HxString.toUpperCase.bind(str);
-			case 'toLowerCase': return HxString.toLowerCase.bind(str);
-			case 'charAt':      return HxString.charAt.bind(str);
-			case 'indexOf':     return HxString.indexOf.bind(str);
-			case 'lastIndexOf': return HxString.lastIndexOf.bind(str);
-			case 'split':       return HxString.split.bind(str);
-			case 'toString':    return HxString.toString.bind(str);
-			case 'substring':   return HxString.substring.bind(str);
-			case 'substr':      return HxString.substr.bind(str);
-			case 'charCodeAt':  return HxString.charCodeAt.bind(str);
-		}
-		/** Force invalid field access error */
-		return Syntax.getField(str, field);
-	}
-
-	@:phpMagic
-	function __call( method:String, args:NativeArray ) : Dynamic {
-		Global.array_unshift(args, str);
-		return Global.call_user_func_array(hxString + '::' + method, args);
-	}
-}
-
-
-/**
-	Anonymous objects implementation
-**/
-@:keep
-@:dox(hide)
-private class HxAnon extends StdClass {
-
-	public function new( fields:NativeArray = null ) {
-		super();
-		if (fields != null) {
-			Syntax.foreach(fields, function(name, value) Syntax.setField(this, name, value));
-		}
-	}
-
-	@:phpMagic
-	function __get( name:String ) {
-		return null;
-	}
-
-	@:phpMagic
-	function __call( name:String, args:NativeArray ) : Dynamic {
-		var method = Syntax.getField(this, name);
-		Syntax.keepVar(method);
-		return method(Syntax.splat(args));
-	}
-}
-
-/**
-	Closures implementation
-**/
-@:keep
-@:dox(hide)
-private class HxClosure {
-	/** `this` for instance methods; php class name for static methods */
-	var target : Dynamic;
-	/** Method name for methods */
-	var func : String;
-
-	public function new( target:Dynamic, func:String ) : Void {
-		this.target = target;
-		this.func = func;
-		//Force runtime error if trying to create a closure of an instance which happen to be `null`
-		if (target.is_null()) {
-			throw "Unable to create closure on `null`";
-		}
-	}
-
-	/**
-		@see http://php.net/manual/en/language.oop5.magic.php#object.invoke
-	**/
-	@:phpMagic
-	public function __invoke() {
-		return Global.call_user_func_array(getCallback(), Global.func_get_args());
-	}
-
-	/**
-		Generates callable value for PHP
-	**/
-	public function getCallback(eThis:Dynamic = null) : NativeIndexedArray<Dynamic> {
-		if (eThis == null) {
-			eThis = target;
-		}
-		if (Std.is(eThis, StdClass)) {
-			if (Std.is(eThis, HxAnon)) {
-				return Syntax.getField(eThis, func);
-			}
-		}
-		return Syntax.arrayDecl(eThis, func);
-	}
-
-	/**
-		Check if this is the same closure
-	**/
-	public function equals( closure:HxClosure ) : Bool {
-		return (target == closure.target && func == closure.func);
-	}
-
-	/**
-		Invoke this closure with `newThis` instead of `this`
-	**/
-	public function callWith( newThis:Dynamic, args:NativeArray ) : Dynamic {
-		return Global.call_user_func_array(getCallback(newThis), args);
-	}
-}
-
-/**
-	Special exception which is used to wrap non-throwable values
-**/
-@:keep
-@:dox(hide)
-private class HxException extends Exception {
-  var e : Dynamic;
-  public function new( e:Dynamic ) : Void {
-	  this.e = e;
-	  super(Boot.stringify(e));
-  }
-}
\ No newline at end of file
diff --git a/std/php7/Closure.hx b/std/php7/Closure.hx
deleted file mode 100644
index 4ac23389d0c4e149449b4699a166b67e0b3ff78c..0000000000000000000000000000000000000000
--- a/std/php7/Closure.hx
+++ /dev/null
@@ -1,12 +0,0 @@
-package php;
-
-import haxe.extern.Rest;
-
-/**
-    @see http://php.net/manual/en/class.closure.php
-**/
-@:native('Closure')
-extern class Closure {
-    public function bindTo( newthis:{}, newscope:Dynamic = "static" ) : Closure;
-    public function call ( newthis:{}, args:Rest<Dynamic> ) : Dynamic;
-}
\ No newline at end of file
diff --git a/std/php7/Const.hx b/std/php7/Const.hx
deleted file mode 100644
index 39c3fb769f69cbdc9de86b44be7b23735e3e83ff..0000000000000000000000000000000000000000
--- a/std/php7/Const.hx
+++ /dev/null
@@ -1,312 +0,0 @@
-package php;
-
-/**
-	This class contains externs for native PHP constants defined in global namespace.
-	For native PHP functions in global namespace see `php.Global`.
-**/
-@:phpGlobal
-extern class Const {
-	/**
-		If this constant is defined and equals `true` then Haxe will not set error handler automatically.
-	**/
-	static var HAXE_CUSTOM_ERROR_HANDLER : Bool;
-	/**
-		@see http://php.net/manual/en/reserved.constants.php
-	**/
-	static var PHP_OS : String;
-	static var PHP_SAPI : String;
-	static var PHP_EOL : String;
-	static var PHP_INT_MAX : Int;
-	static var PHP_INT_MIN : Int;
-	static var PHP_INT_SIZE : Int;
-	/**
-		@see http://php.net/manual/en/language.constants.predefined.php
-	**/
-	static var __LINE__ : Int;
-	static var __FILE__ : String;
-	static var __DIR__ : String;
-	static var __FUNCTION__ : String;
-	static var __CLASS__ : String;
-	static var __TRAIT__ : String;
-	static var __METHOD__ : String;
-	static var __NAMESPACE__ : String;
-	/**
-		@see http://php.net/manual/en/errorfunc.constants.php
-	**/
-	static var E_ERROR : Int;
-	static var E_WARNING : Int;
-	static var E_PARSE : Int;
-	static var E_NOTICE : Int;
-	static var E_CORE_ERROR : Int;
-	static var E_CORE_WARNING : Int;
-	static var E_COMPILE_ERROR : Int;
-	static var E_COMPILE_WARNING : Int;
-	static var E_USER_ERROR : Int;
-	static var E_USER_WARNING : Int;
-	static var E_USER_NOTICE : Int;
-	static var E_STRICT : Int;
-	static var E_RECOVERABLE_ERROR : Int;
-	static var E_DEPRECATED : Int;
-	static var E_USER_DEPRECATED : Int;
-	static var E_ALL : Int;
-	/**
-		@see http://php.net/manual/en/function.count.php
-	**/
-	static var COUNT_NORMAL : Int;
-	static var COUNT_RECURSIVE : Int;
-	/**
-		@see http://php.net/manual/en/function.array-filter.php
-	**/
-	static var ARRAY_FILTER_USE_KEY : Int;
-	static var ARRAY_FILTER_USE_BOTH : Int;
-	/**
-		@see http://php.net/manual/en/function.debug-backtrace.php
-	**/
-	static var DEBUG_BACKTRACE_PROVIDE_OBJECT : Int;
-	static var DEBUG_BACKTRACE_IGNORE_ARGS : Int;
-	/**
-		@see http://php.net/manual/en/math.constants.php
-	**/
-	static var M_PI : Float;
-	static var M_E : Float;
-	static var M_LOG2E : Float;
-	static var M_LOG10E : Float;
-	static var M_LN2 : Float;
-	static var M_LN10 : Float;
-	static var M_PI_2 : Float;
-	static var M_PI_4 : Float;
-	static var M_1_PI : Float;
-	static var M_2_PI : Float;
-	static var M_SQRTPI : Float;
-	static var M_2_SQRTPI : Float;
-	static var M_SQRT2 : Float;
-	static var M_SQRT3 : Float;
-	static var M_SQRT1_2 : Float;
-	static var M_LNPI : Float;
-	static var M_EULER : Float;
-	static var PHP_ROUND_HALF_UP : Int;
-	static var PHP_ROUND_HALF_DOWN : Int;
-	static var PHP_ROUND_HALF_EVEN : Int;
-	static var PHP_ROUND_HALF_ODD : Int;
-	static var NAN : Float;
-	static var INF : Float;
-	/**
-		@see http://php.net/manual/en/function.setlocale.php
-	**/
-	static var LC_ALL : Int;
-	static var LC_COLLATE : Int;
-	static var LC_CTYPE : Int;
-	static var LC_MONETARY : Int;
-	static var LC_NUMERIC : Int;
-	static var LC_TIME : Int;
-	static var LC_MESSAGES : Int;
-	/**
-		@see http://php.net/manual/en/features.commandline.io-streams.php
-	**/
-	static var STDIN : Resource;
-	static var STDOUT : Resource;
-	static var STDERR : Resource;
-	/**
-		@see http://php.net/manual/en/function.preg-match-all.php
-	**/
-	static var PREG_PATTERN_ORDER : Int;
-	static var PREG_SET_ORDER : Int;
-	static var PREG_OFFSET_CAPTURE : Int;
-	/**
-		@see http://php.net/manual/en/function.preg-split.php
-	**/
-	static var PREG_SPLIT_NO_EMPTY : Int;
-	static var PREG_SPLIT_DELIM_CAPTURE : Int;
-	static var PREG_SPLIT_OFFSET_CAPTURE : Int;
-	/**
-		@see http://php.net/manual/en/function.htmlspecialchars.php
-	**/
-	static var ENT_COMPAT : Int;
-	static var ENT_QUOTES : Int;
-	static var ENT_NOQUOTES : Int;
-	static var ENT_IGNORE : Int;
-	static var ENT_SUBSTITUTE : Int;
-	static var ENT_DISALLOWED : Int;
-	static var ENT_HTML401 : Int;
-	static var ENT_XML1 : Int;
-	static var ENT_XHTML : Int;
-	static var ENT_HTML5 : Int;
-	/**
-		@see http://php.net/manual/en/function.str-pad.php
-	**/
-	static var STR_PAD_RIGHT : Int;
-	static var STR_PAD_LEFT : Int;
-	static var STR_PAD_BOTH : Int;
-	/**
-		@see http://php.net/manual/en/function.feof.php
-	**/
-	static var SEEK_SET : Int;
-	static var SEEK_CUR : Int;
-	static var SEEK_END : Int;
-	/**
-		@see http://php.net/manual/en/function.stream-socket-server.php
-	**/
-	static var STREAM_SERVER_BIND : Int;
-	static var STREAM_SERVER_LISTEN : Int;
-	/**
-		@see http://php.net/manual/en/function.stream-socket-client.php
-	**/
-	static var STREAM_CLIENT_CONNECT : Int;
-	static var STREAM_CLIENT_ASYNC_CONNECT : Int;
-	static var STREAM_CLIENT_PERSISTENT : Int;
-	/**
-		@see http://php.net/manual/en/function.socket-create.php
-	**/
-	static var SOCK_STREAM : Int;
-	static var SOCK_DGRAM : Int;
-	static var SOCK_SEQPACKET : Int;
-	static var SOCK_RAW : Int;
-	static var SOCK_RDM : Int;
-	static var AF_INET : Int;
-	static var AF_INET6 : Int;
-	static var AF_UNIX : Int;
-	/**
-		@see http://php.net/manual/en/json.constants.php
-	**/
-	static var JSON_ERROR_NONE : Int;
-	static var JSON_ERROR_DEPTH : Int;
-	static var JSON_ERROR_STATE_MISMATCH : Int;
-	static var JSON_ERROR_CTRL_CHAR : Int;
-	static var JSON_ERROR_SYNTAX : Int;
-	static var JSON_ERROR_UTF8 : Int;
-	static var JSON_ERROR_RECURSION : Int;
-	static var JSON_ERROR_INF_OR_NAN : Int;
-	static var JSON_ERROR_UNSUPPORTED_TYPE : Int;
-	static var JSON_HEX_TAG : Int;
-	static var JSON_HEX_AMP : Int;
-	static var JSON_HEX_APOS : Int;
-	static var JSON_HEX_QUOT : Int;
-	static var JSON_FORCE_OBJECT : Int;
-	static var JSON_NUMERIC_CHECK : Int;
-	static var JSON_BIGINT_AS_STRING : Int;
-	static var JSON_PRETTY_PRINT : Int;
-	static var JSON_UNESCAPED_SLASHES : Int;
-	static var JSON_UNESCAPED_UNICODE : Int;
-	static var JSON_PARTIAL_OUTPUT_ON_ERROR : Int;
-	static var JSON_PRESERVE_ZERO_FRACTION : Int;
-	/**
-		@see http://php.net/manual/en/mysqli.constants.php
-	**/
-	static var MYSQLI_READ_DEFAULT_GROUP : Int;
-	static var MYSQLI_READ_DEFAULT_FILE : Int;
-	static var MYSQLI_OPT_CONNECT_TIMEOUT : Int;
-	static var MYSQLI_OPT_LOCAL_INFILE : Int;
-	static var MYSQLI_INIT_COMMAND : Int;
-	static var MYSQLI_CLIENT_SSL : Int;
-	static var MYSQLI_CLIENT_COMPRESS : Int;
-	static var MYSQLI_CLIENT_INTERACTIVE : Int;
-	static var MYSQLI_CLIENT_IGNORE_SPACE : Int;
-	static var MYSQLI_CLIENT_NO_SCHEMA : Int;
-	static var MYSQLI_CLIENT_MULTI_QUERIES : Int;
-	static var MYSQLI_STORE_RESULT : Int;
-	static var MYSQLI_USE_RESULT : Int;
-	static var MYSQLI_ASSOC : Int;
-	static var MYSQLI_NUM : Int;
-	static var MYSQLI_BOTH : Int;
-	static var MYSQLI_NOT_NULL_FLAG : Int;
-	static var MYSQLI_PRI_KEY_FLAG : Int;
-	static var MYSQLI_UNIQUE_KEY_FLAG : Int;
-	static var MYSQLI_MULTIPLE_KEY_FLAG : Int;
-	static var MYSQLI_BLOB_FLAG : Int;
-	static var MYSQLI_UNSIGNED_FLAG : Int;
-	static var MYSQLI_ZEROFILL_FLAG : Int;
-	static var MYSQLI_AUTO_INCREMENT_FLAG : Int;
-	static var MYSQLI_TIMESTAMP_FLAG : Int;
-	static var MYSQLI_SET_FLAG : Int;
-	static var MYSQLI_NUM_FLAG : Int;
-	static var MYSQLI_PART_KEY_FLAG : Int;
-	static var MYSQLI_GROUP_FLAG : Int;
-	static var MYSQLI_TYPE_DECIMAL : Int;
-	static var MYSQLI_TYPE_NEWDECIMAL : Int;
-	static var MYSQLI_TYPE_BIT : Int;
-	static var MYSQLI_TYPE_TINY : Int;
-	static var MYSQLI_TYPE_SHORT : Int;
-	static var MYSQLI_TYPE_LONG : Int;
-	static var MYSQLI_TYPE_FLOAT : Int;
-	static var MYSQLI_TYPE_DOUBLE : Int;
-	static var MYSQLI_TYPE_NULL : Int;
-	static var MYSQLI_TYPE_TIMESTAMP : Int;
-	static var MYSQLI_TYPE_LONGLONG : Int;
-	static var MYSQLI_TYPE_INT24 : Int;
-	static var MYSQLI_TYPE_DATE : Int;
-	static var MYSQLI_TYPE_TIME : Int;
-	static var MYSQLI_TYPE_DATETIME : Int;
-	static var MYSQLI_TYPE_YEAR : Int;
-	static var MYSQLI_TYPE_NEWDATE : Int;
-	static var MYSQLI_TYPE_INTERVAL : Int;
-	static var MYSQLI_TYPE_ENUM : Int;
-	static var MYSQLI_TYPE_SET : Int;
-	static var MYSQLI_TYPE_TINY_BLOB : Int;
-	static var MYSQLI_TYPE_MEDIUM_BLOB : Int;
-	static var MYSQLI_TYPE_LONG_BLOB : Int;
-	static var MYSQLI_TYPE_BLOB : Int;
-	static var MYSQLI_TYPE_VAR_STRING : Int;
-	static var MYSQLI_TYPE_STRING : Int;
-	static var MYSQLI_TYPE_CHAR : Int;
-	static var MYSQLI_TYPE_GEOMETRY : Int;
-	static var MYSQLI_NEED_DATA : Int;
-	static var MYSQLI_NO_DATA : Int;
-	static var MYSQLI_DATA_TRUNCATED : Int;
-	static var MYSQLI_ENUM_FLAG : Int;
-	static var MYSQLI_BINARY_FLAG : Int;
-	static var MYSQLI_CURSOR_TYPE_FOR_UPDATE : Int;
-	static var MYSQLI_CURSOR_TYPE_NO_CURSOR : Int;
-	static var MYSQLI_CURSOR_TYPE_READ_ONLY : Int;
-	static var MYSQLI_CURSOR_TYPE_SCROLLABLE : Int;
-	static var MYSQLI_STMT_ATTR_CURSOR_TYPE : Int;
-	static var MYSQLI_STMT_ATTR_PREFETCH_ROWS : Int;
-	static var MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH : Int;
-	static var MYSQLI_SET_CHARSET_NAME : Int;
-	static var MYSQLI_REPORT_INDEX : Int;
-	static var MYSQLI_REPORT_ERROR : Int;
-	static var MYSQLI_REPORT_STRICT : Int;
-	static var MYSQLI_REPORT_ALL : Int;
-	static var MYSQLI_REPORT_OFF : Int;
-	static var MYSQLI_DEBUG_TRACE_ENABLED : Int;
-	static var MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED : Int;
-	static var MYSQLI_SERVER_QUERY_NO_INDEX_USED : Int;
-	static var MYSQLI_REFRESH_GRANT : Int;
-	static var MYSQLI_REFRESH_LOG : Int;
-	static var MYSQLI_REFRESH_TABLES : Int;
-	static var MYSQLI_REFRESH_HOSTS : Int;
-	static var MYSQLI_REFRESH_STATUS : Int;
-	static var MYSQLI_REFRESH_THREADS : Int;
-	static var MYSQLI_REFRESH_SLAVE : Int;
-	static var MYSQLI_REFRESH_MASTER : Int;
-	static var MYSQLI_TRANS_COR_AND_CHAIN : Int;
-	static var MYSQLI_TRANS_COR_AND_NO_CHAIN : Int;
-	static var MYSQLI_TRANS_COR_RELEASE : Int;
-	static var MYSQLI_TRANS_COR_NO_RELEASE : Int;
-	static var MYSQLI_TRANS_START_READ_ONLY : Int;
-	static var MYSQLI_TRANS_START_READ_WRITE : Int;
-	static var MYSQLI_TRANS_START_CONSISTENT_SNAPSHOT : Int;
-	/**
-		@see http://php.net/manual/en/sqlite3.constants.php
-	**/
-	static var SQLITE3_ASSOC : Int;
-	static var SQLITE3_NUM : Int;
-	static var SQLITE3_BOTH : Int;
-	static var SQLITE3_INTEGER : Int;
-	static var SQLITE3_FLOAT : Int;
-	static var SQLITE3_TEXT : Int;
-	static var SQLITE3_BLOB : Int;
-	static var SQLITE3_NULL : Int;
-	static var SQLITE3_OPEN_READONLY : Int;
-	static var SQLITE3_OPEN_READWRITE : Int;
-	static var SQLITE3_OPEN_CREATE : Int;
-	/**
-		@see http://php.net/manual/en/function.glob.php
-	**/
-	static var GLOB_MARK : Int;
-	static var GLOB_NOSORT : Int;
-	static var GLOB_NOCHECK : Int;
-	static var GLOB_NOESCAPE : Int;
-	static var GLOB_BRACE : Int;
-	static var GLOB_ONLYDIR : Int;
-	static var GLOB_ERR : Int;
-}
\ No newline at end of file
diff --git a/std/php7/Exception.hx b/std/php7/Exception.hx
deleted file mode 100644
index e8818bb9c648dfd9bb230eb84d32c993aa46bf7a..0000000000000000000000000000000000000000
--- a/std/php7/Exception.hx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C)2005-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 php;
-
-@:native('Exception')
-extern class Exception implements Throwable {
-	public function new(?message : String, ?code : Int, ?previous:Throwable) : Void;
-
-	private var message : String;
-	private var code : Int;
-	private var file : String;
-	private var line : Int;
-
-	@:final
-	function getPrevious() : Throwable;   // Returns previous Throwable
-    function getMessage() : String;       // message of the exception
-    function getCode() : Int;             // code of the exception
-    function getFile() : String;          // source filename
-    function getLine() : Int;             // source line
-    function getTrace() : NativeIndexedArray<NativeAssocArray<Dynamic>>;  // an array of the backtrace
-    function getTraceAsString() : String; // formated string of trace
-	@:phpMagic function __toString() : String;       // formated string for display
-}
\ No newline at end of file
diff --git a/std/php7/Global.hx b/std/php7/Global.hx
deleted file mode 100644
index fa954095cde9a4d0518cba1866fec881b5c27b7f..0000000000000000000000000000000000000000
--- a/std/php7/Global.hx
+++ /dev/null
@@ -1,1200 +0,0 @@
-package php;
-
-import haxe.extern.*;
-import haxe.Constraints;
-
-/**
-	This class contains externs for native PHP functions defined in global namespace.
-	For native PHP constants in global namespace see `php.Const`.
-**/
-@:phpGlobal
-extern class Global {
-	/**
-		@see http://php.net/manual/en/function.exit.php
-	**/
-	static function exit( status:EitherType<String,Int> ) : Void ;
-
-	/**
-		@see http://php.net/manual/en/function.exit.php
-	**/
-	static function die( status:EitherType<String,Int> ) : Void ;
-
-	/**
-		@see http://php.net/manual/en/function.error-reporting.php
-	**/
-	static function error_reporting( ?level:Int ) : Int ;
-
-	/**
-		@see http://php.net/manual/en/function.set-error-handler.php
-	**/
-	@:overload(function( error_handler:Int->String->Bool, ?error_types:Int ) : Dynamic {})
-	@:overload(function( error_handler:Int->String->String->Bool, ?error_types:Int ) : Dynamic {})
-	@:overload(function( error_handler:Int->String->String->Int->Bool, ?error_types:Int ) : Dynamic {})
-	static function set_error_handler( ?error_handler:Int->String->String->Int->Array<Dynamic>->Bool, ?error_types:Int ) : Dynamic ;
-
-	/**
-		@see http://php.net/manual/en/function.restore-error-handler.php
-	**/
-	static function restore_error_handler() : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.set-exception-handler.php
-	**/
-	static function set_exception_handler( exception_handler:Throwable->Void ) : Dynamic ;
-
-	/**
-		@see http://php.net/manual/en/function.restore-exception-handler.php
-	**/
-	static function restore_exception_handler() : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.is-int.php
-	**/
-	static function is_int( value:Dynamic ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.is-float.php
-	**/
-	static function is_float( value:Dynamic ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.is-string.php
-	**/
-	static function is_string( value:Dynamic ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.is-numeric.php
-	**/
-	static function is_numeric( value:Dynamic ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.is-bool.php
-	**/
-	static function is_bool( value:Dynamic ) : Bool ;
-
-	/**
-		Checks if `values` is `php.NativeArray`
-		@see http://php.net/manual/en/function.is-array.php
-	**/
-	static function is_array( value:Dynamic ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.is-object.php
-	**/
-	static function is_object( value:Dynamic ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.is-null.php
-	**/
-	static function is_null( value:Dynamic ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.is-subclass-of.php
-	**/
-	static function is_subclass_of( value:Dynamic, className:String, allow_string:Bool = true ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.class-exists.php
-	**/
-	static function class_exists( class_name:String, autoload:Bool = true ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.interface-exists.php
-	**/
-	static function interface_exists( interface_name:String, autoload:Bool = true ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.intval.php
-	**/
-	static function intval( value:Dynamic, base:Int = 10 ) : Int ;
-
-	/**
-		@see http://php.net/manual/en/function.floatval.php
-	**/
-	static function floatval( value:Dynamic ) : Float ;
-
-	/**
-		@see http://php.net/manual/en/function.boolval.php
-	**/
-	static function boolval( value:Dynamic ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.strval.php
-	**/
-	static function strval( value:Dynamic ) : String ;
-
-	/**
-		@see http://php.net/manual/en/function.phpversion.php
-	**/
-	static function phpversion( ?extension:String ) : String ;
-
-	/**
-		@see http://php.net/manual/en/function.class-alias.php
-	**/
-	static function class_alias( original:String, alias:String, autoload:Bool = true ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.count.php
-	**/
-	static function count( array:Dynamic, ?mode:Int ) : Int ;
-
-	/**
-		@see http://php.net/manual/en/function.array-filter.php
-	**/
-	@:overload(function(array:NativeArray,callback:Dynamic->Bool,?flag:Int):NativeArray {})
-	static function array_filter( array:NativeArray, ?callback:Dynamic->?Dynamic->Bool, flag:Int = 0 ) : NativeArray ;
-
-	/**
-		@see http://php.net/manual/en/function.implode.php
-	**/
-	@:overload(function(pieces:NativeArray):String {})
-	static function implode( glue:String, pieces:NativeArray ) : String ;
-
-	/**
-		@see http://php.net/manual/en/function.array-map.php
-	**/
-	static function array_map( callback:EitherType<Dynamic->Dynamic, String>, array:Rest<NativeArray> ) : NativeArray ;
-
-	/**
-		@see http://php.net/manual/en/function.array-merge.php
-	**/
-	static function array_merge( array:Rest<NativeArray> ) : NativeArray ;
-
-	/**
-		@see http://php.net/manual/en/function.array-diff.php
-	**/
-	static function array_diff( array:Rest<NativeArray> ) : NativeArray ;
-
-	/**
-		@see http://php.net/manual/en/function.array-pop.php
-	**/
-	static function array_pop( array:NativeArray ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.array-push.php
-	**/
-	static function array_push( array:Ref<NativeArray>, value:Rest<Dynamic> ) : Int ;
-
-	/**
-		@see http://php.net/manual/en/function.array-reverse.php
-	**/
-	static function array_reverse( array:NativeArray, preserve_keys:Bool = false ) : NativeArray ;
-
-	/**
-		@see http://php.net/manual/en/function.array-search.php
-	**/
-	static function array_search( needle:Dynamic, haystack:NativeArray, strict:Bool = false) : EitherType<Bool,EitherType<String,Int>> ;
-
-	/**
-		@see http://php.net/manual/en/function.array-shift.php
-	**/
-	static function array_shift( array:Ref<NativeArray> ) : Dynamic ;
-
-	/**
-		@see http://php.net/manual/en/function.array-slice.php
-	**/
-	static function array_slice( array:NativeArray, offset:Int, length:Int = null, preserve_keys:Bool = false ) : NativeArray ;
-
-	/**
-		@see http://php.net/manual/en/function.array-splice.php
-	**/
-	static function array_splice( array:Ref<NativeArray>, offset:Int, lenght:Int = 0, ?replacement:Dynamic ) : NativeArray ;
-
-	/**
-		@see http://php.net/manual/en/function.array-unshift.php
-	**/
-	static function array_unshift( arr:Ref<NativeArray>, value:Rest<Dynamic> ) : Int ;
-
-	/**
-		@see http://php.net/manual/en/function.array-values.php
-	**/
-	static function array_values( arr:NativeArray ) : NativeIndexedArray<Dynamic> ;
-
-	/**
-		@see http://php.net/manual/en/function.array-keys.php
-	**/
-	static function array_keys( arr:NativeArray ) : NativeIndexedArray<EitherType<String,Int>> ;
-
-	/**
-		@see http://php.net/manual/en/function.array-key-exists.php
-	**/
-	static function array_key_exists( key:EitherType<String,Int>, arr:NativeArray ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.array-fill.php
-	**/
-	static function array_fill( start_index:Int, num:Int, value:Dynamic ) : NativeArray ;
-
-	/**
-		@see http://php.net/manual/en/function.in-array.php
-	**/
-	static function in_array( needle:Dynamic, haystack:NativeArray, strict:Bool = false ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.usort.php
-	**/
-	static function usort( array:Ref<NativeArray>, value_compare_func:Dynamic->Dynamic->Int ) : Bool ;
-
-	/**
-		@see http://php.net/manual/en/function.reset.php
-	**/
-	static function reset( array:Ref<NativeArray> ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.current.php
-	**/
-	static function current( array:Ref<NativeArray> ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.next.php
-	**/
-	static function next( array:Ref<NativeArray> ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.prev.php
-	**/
-	static function prev( array:Ref<NativeArray> ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.end.php
-	**/
-	static function end( array:Ref<NativeArray> ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.key.php
-	**/
-	static function key( array:NativeArray ) : EitherType<String,Int>;
-
-	/**
-		@see http://php.net/manual/en/function.each.php
-	**/
-	static function each( array:Ref<NativeArray> ) : NativeArray;
-
-	/**
-		@see http://php.net/manual/en/function.defined.php
-	**/
-	static function defined( name:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.constant.php
-	*/
-	static function constant( name:String ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.define.php
-	**/
-	static function define( name:String, value:Dynamic, case_insensitive:Bool = false ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.echo.php
-	**/
-	static function echo( args:Rest<String> ) : Void;
-
-	/**
-		@see http://php.net/manual/en/function.sprintf.php
-	**/
-	static function sprintf( format:String, args:Rest<Dynamic> ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.method-exists.php
-	**/
-	static function method_exists( object:Dynamic, method_name:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.property-exists.php
-	**/
-	static function property_exists( object:Dynamic, property_name:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.is-callable.php
-	**/
-	static function is_callable( value:Dynamic,  syntax_only:Bool = false, ?callable_name:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.isset.php
-	**/
-	static function isset( value:Dynamic, args:Rest<Dynamic> ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.unset.php
-	**/
-	static function unset( value:Dynamic, values:Rest<Dynamic> ) : Void;
-
-	/**
-		@see http://php.net/manual/en/function.get-object-vars.php
-	**/
-	static function get_object_vars( object:{} ) : NativeAssocArray<Dynamic>;
-
-	/**
-		@see http://php.net/manual/en/function.get-class.php
-	**/
-	static function get_class( object:{} = null ) : EitherType<Bool,String>;
-
-	/**
-		@see http://php.net/manual/en/function.get-parent-class.php
-	**/
-	static function get_parent_class( ?object:Dynamic ) : EitherType<Bool,String>;
-
-	/**
-		@see http://php.net/manual/en/function.var-dump.php
-	**/
-	static function var_dump( args:Rest<Dynamic> ) : Void;
-
-	/**
-		@see http://php.net/manual/en/function.ord.php
-	**/
-	static function ord( string:String ) : Int;
-
-	/**
-		@see http://php.net/manual/en/function.chr.php
-	**/
-	static function chr( code:Int ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.strpos.php
-	**/
-	static function strpos( haystack:String, needle:String, offset:Int = 0 ) : EitherType<Bool, Int>;
-
-	/**
-		@see http://php.net/manual/en/function.strrpos.php
-	**/
-	static function strrpos( haystack:String, needle:String, offset:Int = 0 ) : EitherType<Bool, Int>;
-
-	/**
-		@see http://php.net/manual/en/function.str-split.php
-	**/
-	static function str_split( string:String, split_length:Int = 1 ) : EitherType<Bool,NativeIndexedArray<String>>;
-
-	/**
-		@see http://php.net/manual/en/function.strlen.php
-	**/
-	static function strlen( string:String ) : Int;
-
-	/**
-		@see http://php.net/manual/en/function.strcmp.php
-	**/
-	static function strcmp( str1:String, str2:String ) : Int;
-
-	/**
-		@see http://php.net/manual/en/function.str-repeat.php
-	**/
-	static function str_repeat( input:String, multiplier:Int ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.str-replace.php
-	**/
-	static function str_replace( search:EitherType<String,NativeArray>, replace:EitherType<String,NativeArray>, subject:EitherType<String,NativeArray>, ?count:Int ) : EitherType<String,NativeArray>;
-
-	/**
-		@see http://php.net/manual/en/function.explode.php
-	**/
-	static function explode( delimiter:String, string:String, ?limit:Int ) : EitherType<Bool,NativeIndexedArray<String>>;
-
-	/**
-		@see http://php.net/manual/en/function.substr.php
-	**/
-	static function substr( string:String, start:Int, ?length:Int ) : EitherType<Bool,String>;
-
-	/**
-		@see http://php.net/manual/en/function.substr_replace.php
-	**/
-	static function substr_replace( string:EitherType<String,NativeArray>, replacement:EitherType<String,NativeArray>, start:EitherType<Int,NativeArray>, ?length:EitherType<Int,NativeArray> ) : EitherType<String,NativeArray>;
-
-	/**
-		@see http://php.net/manual/en/function.strtoupper.php
-	**/
-	static function strtoupper( string:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.strtolower.php
-	**/
-	static function strtolower( string:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.debug-backtrace.php
-	**/
-	static function debug_backtrace( ?options:Int, ?limit:Int ) : NativeIndexedArray<NativeAssocArray<Dynamic>>;
-
-	/**
-		@see http://php.net/manual/en/function.call-user-func.php
-	**/
-	static function call_user_func( callback:Dynamic, arguments:Rest<Dynamic> ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.call-user-func-array.php
-	**/
-	static function call_user_func_array( callback:Dynamic, arguments:NativeArray ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.func-get-args.php
-	**/
-	static function func_get_args() : NativeIndexedArray<Dynamic>;
-
-	/**
-		@see http://php.net/manual/en/function.abs.php
-	**/
-	static function abs<T:Float>( number:T ) : T;
-
-	/**
-		@see http://php.net/manual/en/function.min.php
-	**/
-	static function min( values:Rest<Dynamic> ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.max.php
-	**/
-	static function max( values:Rest<Dynamic> ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.sin.php
-	**/
-	static function sin( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.cos.php
-	**/
-	static function cos( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.atan2.php
-	**/
-	static function atan2( y:Float, x:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.tan.php
-	**/
-	static function tan( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.exp.php
-	**/
-	static function exp( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.log.php
-	**/
-	static function log( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.sqrt.php
-	**/
-	static function sqrt( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.floor.php
-	**/
-	static function floor( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.ceil.php
-	**/
-	static function ceil( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.round.php
-	**/
-	static function round( val:Float, precision:Int = 0, ?mode:Int ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.atan.php
-	**/
-	static function atan( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.asin.php
-	**/
-	static function asin( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.acos.php
-	**/
-	static function acos( arg:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.pow.php
-	**/
-	static function pow( base:Float, exp:Float ) : Float;
-
-	/**
-		@see http://php.net/manual/en/function.mt-rand.php
-	**/
-	@:overload(function() : Int {})
-	static function mt_rand( base:Int, exp:Int ) : Int;
-
-	/**
-		@see http://php.net/manual/en/function.mt-getrandmax.php
-	**/
-	static function mt_getrandmax() : Int;
-
-	/**
-		@see http://php.net/manual/en/function.is-nan.php
-	**/
-	static function is_nan( arg:Float ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.is-finite.php
-	**/
-	static function is_finite( arg:Float ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.trim.php
-	**/
-	static function trim( str:String, ?character_mask:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.rtrim.php
-	**/
-	static function rtrim( str:String, ?character_mask:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.ltrim.php
-	**/
-	static function ltrim( str:String, ?character_mask:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.getenv.php
-	**/
-	static function getenv( varname:String ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.putenv.php
-	**/
-	static function putenv( setting:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.sleep.php
-	**/
-	static function sleep( seconds:Int ) : EitherType<Bool,Int>;
-
-	/**
-		@see http://php.net/manual/en/function.usleep.php
-	**/
-	static function usleep( micro_seconds:Int ) : Void;
-
-	/**
-		@see http://php.net/manual/en/function.setlocale.php
-	**/
-	@:overload(function( category:Int, locale:NativeIndexedArray<String> ) : EitherType<Bool,String> {})
-	static function setlocale( category:Int, locale:Rest<String> ) : EitherType<Bool,String>;
-
-	/**
-		@see http://php.net/manual/en/function.getcwd.php
-	**/
-	static function getcwd() : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.chdir.php
-	**/
-	static function chdir( directory:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.php-uname.php
-	**/
-	static function php_uname( mode:String = 'a' ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.system.php
-	**/
-	static function system( command:String, ?return_var:Ref<Int> ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.microtime.php
-	**/
-	static function microtime( get_as_float:Bool = false ) : EitherType<Float,String>;
-
-	/**
-		@see http://php.net/manual/en/function.fopen.php
-	**/
-	static function fopen( filename:String, mode:String, use_include_path:Bool = false, ?context:Resource ) : EitherType<Bool,Resource>;
-
-	/**
-		@see http://php.net/manual/en/function.fclose.php
-	**/
-	static function fclose( handle:Resource ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.feof.php
-	**/
-	static function feof( handle:Resource ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.fseek.php
-	**/
-	static function fseek( handle:Resource, offset:Int, ?whence:Int ) : EitherType<Int,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.ftell.php
-	**/
-	static function ftell( handle:Resource ) : EitherType<Int,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.rewind.php
-	**/
-	static function rewind( handle:Resource ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.fgetc.php
-	**/
-	static function fgetc( handle:Resource ) : EitherType<Bool,String>;
-
-	/**
-		@see http://php.net/manual/en/function.fgets.php
-	**/
-	static function fgets( handle:Resource ) : EitherType<Bool,String>;
-
-	/**
-		@see http://php.net/manual/en/function.fflush.php
-	**/
-	static function fflush( handle:Resource ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.fwrite.php
-	**/
-	static function fwrite( handle:Resource, string:String, ?length:Int ) : EitherType<Int,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.fread.php
-	**/
-	static function fread( handle:Resource, length:Int ) : EitherType<Bool,String>;
-
-	/**
-		@see http://php.net/manual/en/function.file-exists.php
-	**/
-	static function file_exists( filename:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.file-get-contents.php
-	**/
-	static function file_get_contents( filename:String, use_include_path:Bool = false, ?context:Resource, offset:Int = 0, ?maxlen:Int ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.file-put-contents.php
-	**/
-	static function file_put_contents( filename:String, data:Dynamic, flags:Int = 0, ?context:Resource ) : EitherType<Int,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.clearstatcache.php
-	**/
-	static function clearstatcache( clear_realpath_cache:Bool = false, ?filename:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.fstat.php
-	**/
-	static function fstat( handle:Resource ) : NativeArray;
-
-	/**
-		@see http://php.net/manual/en/function.stat.php
-	**/
-	static function stat( filename:String ) : EitherType<NativeArray,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.realpath.php
-	**/
-	static function realpath( path:String ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.filetype.php
-	**/
-	static function filetype( filename:String ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.mkdir.php
-	**/
-	static function mkdir( pathname:String, mode:Int = 511, recursive:Bool = false, ?context:Resource ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.unlink.php
-	**/
-	static function unlink( filename:String, ?context:Resource ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.rmdir.php
-	**/
-	static function rmdir( dirname:String, ?context:Resource ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.dirname.php
-	**/
-	static function dirname( path:String, levels:Int = 1 ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.glob.php
-	**/
-	static function glob( pattern:String, flags:Int = 0 ) : NativeArray;
-
-	/**
-		@see http://php.net/manual/en/function.opendir.php
-	**/
-	static function opendir( path:String, ?context:Resource ) : EitherType<Resource,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.closedir.php
-	**/
-	static function closedir( dir_handle:Resource ) : Void;
-
-	/**
-		@see http://php.net/manual/en/function.readdir.php
-	**/
-	static function readdir( ?dir_handle:Resource ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.rewinddir.php
-	**/
-	static function rewinddir( ?dir_handle:Resource ) : Void;
-
-	/**
-		@see http://php.net/manual/en/function.is-dir.php
-	**/
-	static function is_dir( filename:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.rename.php
-	**/
-	static function rename( oldname:String, newname:String, ?context:Resource ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.copy.php
-	**/
-	static function copy( source:String, dest:String, ?context:Resource ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.preg-match.php
-	**/
-	static function preg_match( pattern:String, subject:String, ?matches:NativeArray, ?flags:Int, ?offset:Int ) : EitherType<Bool,Int> ;
-
-	/**
-		@see http://php.net/manual/en/function.preg-match-all.php
-	**/
-	static function preg_match_all( pattern:String, subject:String, ?matches:NativeArray, ?flags:Int, ?offset:Int ) : EitherType<Bool,Int> ;
-
-	/**
-		@see http://php.net/manual/en/function.preg-quote.php
-	**/
-	static function preg_quote( str:String, ?delimiter:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.preg-split.php
-	**/
-	static function preg_split( pattern:String, subject:String, limit:Int = -1, flags:Int = 0 ) : EitherType<Bool,NativeArray> ;
-
-	/**
-		@see http://php.net/manual/en/function.preg-replace.php
-	**/
-	static function preg_replace( pattern:EitherType<String,NativeArray>, replacement:EitherType<String,NativeArray>, subject:EitherType<String,NativeArray>, limit:Int = -1, ?count:Int ) : EitherType<String,NativeArray> ;
-
-	/**
-		@see http://php.net/manual/en/function.md5.php
-	**/
-	static function md5( str:String, raw_output:Bool = false ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.sha1.php
-	**/
-	static function sha1( str:String, raw_output:Bool = false ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.hash.php
-	**/
-	static function hash( algo:String, str:String, raw_output:Bool = false ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.pack.php
-	**/
-	static function pack( format:String, args:Rest<Dynamic> ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.unpack.php
-	**/
-	static function unpack( format:String, data:String ) : NativeArray;
-
-	/**
-		@see http://php.net/manual/en/function.chunk-split.php
-	**/
-	static function chunk_split( body:String, chunklen:Int = 76, end:String = "\r\n" ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.urlencode.php
-	**/
-	static function urlencode( str:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.urldecode.php
-	**/
-	static function urldecode( str:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.rawurlencode.php
-	**/
-	static function rawurlencode( str:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.rawurldecode.php
-	**/
-	static function rawurldecode( str:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.header.php
-	**/
-	static function header( string:String, replace:Bool = true, ?http_response_code:Int ) : Void;
-
-	/**
-		@see http://php.net/manual/en/function.setcookie.php
-	**/
-	static function setcookie( name:String, value:String = "", expire:Int = 0, path:String = "", domain:String = "", secure:Bool = false, httponly:Bool = false ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.htmlspecialchars.php
-	**/
-	static function htmlspecialchars( string:String, ?flags:Int, ?encoding:String, double_encode:Bool = true ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.htmlspecialchars_decode.php
-	**/
-	static function htmlspecialchars_decode( string:String, ?flags:Int ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.str-pad.php
-	**/
-	static function str_pad( input:String, pad_length:Int, pad_String:String = ' ', ?pad_type:Int ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.dechex.php
-	**/
-	static function dechex( number:Int ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.hexdec.php
-	**/
-	static function hexdec( hex_string:String ) : Int;
-
-	/**
-		@see http://php.net/manual/en/function.bin2hex.php
-	**/
-	static function bin2hex( str:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.hex2bin.php
-	**/
-	static function hex2bin( str:String ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.serialize.php
-	**/
-	static function serialize( value:Dynamic ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.unserialize.php
-	**/
-	static function unserialize( str:String, ?options:NativeArray ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.extension-loaded.php
-	**/
-	static function extension_loaded( name:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.strncasecmp.php
-	**/
-	static function strncasecmp( str1:String, str2:String, len:Int ) : Int;
-
-	/**
-		@see http://php.net/manual/en/function.strcasecmp.php
-	**/
-	static function strcasecmp( str1:String, str2:String ) : Int;
-
-	/**
-		@see http://php.net/manual/en/function.fpassthru.php
-	**/
-	static function fpassthru( handle:Resource ) : Int;
-
-	/**
-		@see http://php.net/manual/en/function.json-encode.php
-	**/
-	static function json_encode( value:Dynamic, options:Int = 0, depth:Int = 512 ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.json-decode.php
-	**/
-	static function json_decode( json:String, assoc:Bool = false, depth:Int = 512, options:Int = 512 ) : Dynamic;
-
-	/**
-		@see http://php.net/manual/en/function.json-last-error.php
-	**/
-	static function json_last_error() : Int;
-
-	/**
-		@see http://php.net/manual/en/function.json-last-error-msg.php
-	**/
-	static function json_last_error_msg() : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.spl-object-hash.php
-	**/
-	static function spl_object_hash( obj:{} ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.utf8-encode.php
-	**/
-	static function utf8_encode( data:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.utf8-decode.php
-	**/
-	static function utf8_decode( data:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.mb-convert-encoding.php
-	**/
-	static function mb_convert_encoding( str:String, to_encoding:String, ?from_encoding:Dynamic ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.mb-check-encoding.php
-	**/
-	static function mb_check_encoding( str:String = null, ?encoding:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.mb-strlen.php
-	**/
-	static function mb_strlen( str:String, ?encoding:String ) : EitherType<Int,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.mb-substr.php
-	**/
-	static function mb_substr( str:String, start:Int, length:Int = null, ?encoding:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.proc-open.php
-	**/
-	static function proc_open( cmd:String, descriptorspec:NativeArray, pipes:NativeIndexedArray<Resource>, ?cwd:String, ?env:NativeArray, ?other_options:NativeArray ) : EitherType<Resource,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.proc-get-status.php
-	**/
-	static function proc_get_status( process:Resource ) : EitherType<Bool,NativeAssocArray<Scalar>>;
-
-	/**
-		@see http://php.net/manual/en/function.proc-close.php
-	**/
-	static function proc_close( process:Resource ) : Int;
-
-	/**
-		@see http://php.net/manual/en/function.proc-terminate.php
-	**/
-	static function proc_terminate( process:Resource, signal:Int = 15 ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.stream-select.php
-	**/
-	static function stream_select( read:NativeArray, write:NativeArray, except:NativeArray, tv_sec:Int, tv_usec:Int = 0 ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.stream-socket-shutdown.php
-	**/
-	static function stream_socket_shutdown( stream:Resource, how:Int ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.stream-set-timeout.php
-	**/
-	static function stream_set_timeout( stream:Resource, seconds:Int, microseconds:Int = 0 ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.stream-set-blocking.php
-	**/
-	static function stream_set_blocking( stream:Resource, mode:Bool ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.stream-socket-accept.php
-	**/
-	static function stream_socket_accept( server_socket:Resource, ?timeout:Float, ?peername:Ref<String> ) : EitherType<Resource,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.stream-socket-client.php
-	**/
-	static function stream_socket_client( remote_socket:String, ?errno:Ref<Int>, ?errstr:Ref<String>, ?timeout:Float, ?flags:Int, ?context:Resource ) : EitherType<Resource,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.stream-socket-server.php
-	**/
-	static function stream_socket_server( local_socket:String, ?errno:Ref<Int>, ?errstr:Ref<String>, ?flags:Int, ?context:Resource ) : EitherType<Resource,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.stream-socket-get-name.php
-	**/
-	static function stream_socket_get_name( stream:Resource, want_peer:Bool ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.ini-get.php
-	**/
-	static function ini_get( var_name:String ) : EitherType<Bool,String>;
-
-	/**
-		@see http://php.net/manual/en/function.ini-set.php
-	**/
-	static function ini_set( var_name:String, newvalue:String ) : EitherType<Bool,String>;
-
-	/**
-		@see http://php.net/manual/en/function.sqlite-error-string.php
-	**/
-	static function sqlite_error_string( error_code:Int ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.sqlite-escape-string.php
-	**/
-	static function sqlite_escape_string( item:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.set-time-limit.php
-	**/
-	static function set_time_limit( seconds:Int ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.function-exists.php
-	**/
-	static function function_exists( function_name:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.getallheaders.php
-	**/
-	static function getallheaders() : NativeAssocArray<Dynamic>;
-
-	/**
-		@see http://php.net/manual/en/function.ucwords.php
-	**/
-	static function ucwords( str:String, ?delimiters:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.base64-encode.php
-	**/
-	static function base64_encode( data:String ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.base64-decode.php
-	**/
-	static function base64_decode( data:String, strict:Bool = false ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.gethostbyname.php
-	**/
-	static function gethostbyname( hostname:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.gethostbyaddr.php
-	**/
-	static function gethostbyaddr( ip_address:String ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.getprotobyname.php
-	**/
-	static function getprotobyname( name:String ) : EitherType<Int,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.mktime.php
-	**/
-	static function mktime( ?hour:Int, ?minute:Int, ?second:Int, ?month:Int, ?day:Int, ?year:Int, ?is_dst:Int ) : EitherType<Int,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.date.php
-	**/
-	static function date( format:String, ?timestamp:Int ) : EitherType<String,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.strtotime.php
-	**/
-	static function strtotime( time:String, ?now:Int ) : EitherType<Int,Bool>;
-
-	/**
-		@see http://php.net/manual/en/function.flush.php
-	**/
-	static function flush() : Void;
-
-	/**
-		@see http://php.net/manual/en/function.session-cache-limiter.php
-	**/
-	static function session_cache_limiter( ?cache_limiter:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.session-cache-expire.php
-	**/
-	static function session_cache_expire( ?new_cache_expire:Int ) : Int;
-
-	/**
-		@see http://php.net/manual/en/function.session-name.php
-	**/
-	static function session_name( ?name:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.session-start.php
-	**/
-	static function session_start( ?options:NativeArray ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.session-unset.php
-	**/
-	static function session_unset() : Void;
-
-	/**
-		@see http://php.net/manual/en/function.session-write-close.php
-	**/
-	static function session_write_close() : Void;
-
-	/**
-		@see http://php.net/manual/en/function.session-id.php
-	**/
-	static function session_id( ?id:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.session-save-path.php
-	**/
-	static function session_save_path( ?path:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.session-module-name.php
-	**/
-	static function session_module_name( ?module:String ) : String;
-
-	/**
-		@see http://php.net/manual/en/function.session-regenerate-id.php
-	**/
-	static function session_regenerate_id( delete_old_session:Bool = false ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.session-set-cookie-params.php
-	**/
-	static function session_set_cookie_params( lifetime:Int, ?path:String, ?domain:String, secure:Bool = false, httponly:Bool = false ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.session-get-cookie-params.php
-	**/
-	static function session_get_cookie_params() : NativeAssocArray<Dynamic>;
-
-	/**
-		@see http://php.net/manual/en/function.session-set-save-handler.php
-	**/
-	@:overload(function( sessionhandler:SessionHandlerInterface, register_shutdown:Bool = true ) : Bool {})
-	static function session_set_save_handler( open:String->String->Bool, close:Void->Bool, read:String->String, write:String->String->Bool, destroy:String->Bool, gc:Int->Bool, ?create_sid:Void->String, ?validate_sid:Function, ?update_timestamp:Function ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.mail.php
-	**/
-	static function mail( to:String, subject:String, message:String, ?additional_headers:String, ?additional_parameters:String ) : Bool;
-
-	/**
-		@see http://php.net/manual/en/function.require.php
-	**/
-	static function require( include_path:String ) : Void;
-
-	/**
-		@see http://php.net/manual/en/function.require-once.php
-	**/
-	static function require_once( include_path:String ) : Void;
-
-	/**
-		@see http://php.net/manual/en/function.include.php
-	**/
-	static function include( include_path:String ) : Void;
-
-	/**
-		@see http://php.net/manual/en/function.include-once.php
-	**/
-	static function include_once( include_path:String ) : Void;
-}
\ No newline at end of file
diff --git a/std/php7/Lib.hx b/std/php7/Lib.hx
deleted file mode 100644
index 26107ef14b666a20614117595e6388cee4a7bb3f..0000000000000000000000000000000000000000
--- a/std/php7/Lib.hx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C)2005-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 php;
-
-import haxe.ds.StringMap;
-import php.*;
-import php.reflection.ReflectionClass;
-
-/**
-	Platform-specific PHP Library. Provides some platform-specific functions
-	for the PHP target, such as conversion from Haxe types to native types
-	and vice-versa.
-**/
-class Lib {
-	/**
-		Print the specified value on the default output.
-	**/
-	public static inline function print( v : Dynamic ) : Void {
-		Global.echo(Std.string(v));
-	}
-
-	/**
-		Print the specified value on the default output followed by
-		a newline character.
-	**/
-	public static function println( v : Dynamic ) : Void {
-		print(v);
-		print("\n");
-	}
-
-	/**
-		Displays structured information about one or more expressions
-		that includes its type and value. Arrays and objects are
-		explored recursively with values indented to show structure.
-	*/
-	public static inline function dump(v : Dynamic) : Void {
-		Global.var_dump(v);
-	}
-
-	/**
-		Serialize using native PHP serialization. This will return a binary
-		`String` that can be stored for long term usage.
-	**/
-	public static inline function serialize( v : Dynamic ) : String {
-		return Global.serialize(v);
-	}
-
-	/**
-		Unserialize a `String` using native PHP serialization. See `php.Lib.serialize()`.
-	**/
-	public static inline function unserialize( s : String ) : Dynamic {
-		return Global.unserialize(s);
-	}
-
-	/**
-		Find out whether an extension is loaded.
-	*/
-	public static inline function extensionLoaded(name : String) {
-		return Global.extension_loaded(name);
-	}
-
-	public static inline function isCli() : Bool {
-		return 0 == Global.strncasecmp(Const.PHP_SAPI, 'cli', 3);
-	}
-
-	/**
-		Output file content from the given file name.
-	*/
-	public static inline function printFile(file : String) {
-		return Global.fpassthru(Global.fopen(file,  "r"));
-	}
-
-	public static inline function toPhpArray(a : Array<Dynamic>) : NativeArray {
-		return @:privateAccess a.arr;
-	}
-
-	public static inline function toHaxeArray(a : NativeArray) : Array<Dynamic> {
-		return @:privateAccess Array.wrap(a);
-	}
-
-	public static function hashOfAssociativeArray<T>(arr : NativeAssocArray<T>) : Map<String,T> {
-		var result = new StringMap();
-		@:privateAccess result.data = arr;
-		return result;
-	}
-
-	public static inline function associativeArrayOfHash(hash : haxe.ds.StringMap<Dynamic>) : NativeArray {
-		return @:privateAccess hash.data;
-	}
-
-	public static inline function objectOfAssociativeArray(arr : NativeArray) : Dynamic {
-		Syntax.foreach(arr, function(key:Scalar, value:Dynamic) {
-			if(Global.is_array(value)) {
-				arr[key] = objectOfAssociativeArray(value);
-			}
-		});
-		return Boot.createAnon(arr);
-	}
-
-	public static inline function associativeArrayOfObject(ob : Dynamic) : NativeArray {
-		return Syntax.array(ob);
-	}
-
-	/**
-	 * See the documentation for the equivalent PHP function for details on usage:
-	 * <http://php.net/manual/en/function.mail.php>
-	 * @param	to
-	 * @param	subject
-	 * @param	message
-	 * @param	?additionalHeaders
-	 * @param	?additionalParameters
-	 */
-	public static inline function mail(to : String, subject : String, message : String, ?additionalHeaders : String, ?additionalParameters : String) : Bool {
-		return Global.mail(to, subject, message, additionalHeaders, additionalParameters);
-	}
-
-	/**
-		For neko compatibility only.
-	**/
-	public static inline function rethrow( e : Dynamic ) {
-		throw e;
-	}
-
-	/**
-		Tries to load all compiled php files and returns list of tpes.
-	**/
-	public static function getClasses():Dynamic {
-		if(!loaded) {
-			loaded = true;
-			var reflection = new ReflectionClass(Boot.getPhpName('php.Boot'));
-			loadLib(Global.dirname(reflection.getFileName(), 2));
-		}
-
-		var result:Dynamic = {};
-		Syntax.foreach(Boot.getRegisteredAliases(), function(phpName:String, haxeName:String) {
-			var parts = haxeName.split('.');
-			var obj = result;
-			while(parts.length > 1) {
-				var pack = parts.shift();
-				if(Syntax.getField(obj, pack) == null) {
-					Syntax.setField(obj, pack, {});
-				}
-				obj = Syntax.getField(obj, pack);
-			}
-			Syntax.setField(obj, parts[0], Boot.getClass(phpName));
-		});
-
-		return result;
-	}
-	static var loaded:Bool = false;
-
-	/**
-		Loads types defined in the specified directory.
-	**/
-	public static function loadLib(pathToLib : String) : Void {
-		var absolutePath = Global.realpath(pathToLib);
-		if(absolutePath == false) throw 'Failed to read path: $pathToLib';
-		Syntax.foreach(Global.glob('$absolutePath/*.php'), function(_, fileName) {
-			if(!Global.is_dir(fileName)) {
-				Global.require_once(fileName);
-			}
-		});
-		Syntax.foreach(Global.glob('$absolutePath/*', Const.GLOB_ONLYDIR), function(_, dirName) {
-			loadLib(dirName);
-		});
-	}
-}
diff --git a/std/php7/Ref.hx b/std/php7/Ref.hx
deleted file mode 100644
index 55d1ecb6c285935a6870b1287395015ff91e3557..0000000000000000000000000000000000000000
--- a/std/php7/Ref.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package php;
-
-/**
-	Special type which allows passing function arguments by reference.
-	This type should be used for externs only.
-**/
-typedef Ref<T> = T;
\ No newline at end of file
diff --git a/std/php7/Resource.hx b/std/php7/Resource.hx
deleted file mode 100644
index 00149f761c307b1eba17327980263787de3fbc95..0000000000000000000000000000000000000000
--- a/std/php7/Resource.hx
+++ /dev/null
@@ -1,5 +0,0 @@
-package php;
-
-abstract Resource(Dynamic) {
-
-}
diff --git a/std/php7/RuntimeException.hx b/std/php7/RuntimeException.hx
deleted file mode 100644
index 258f4c02b50f88fb64dce3e332ef823b024f7783..0000000000000000000000000000000000000000
--- a/std/php7/RuntimeException.hx
+++ /dev/null
@@ -1,4 +0,0 @@
-package php;
-
-@:native('RuntimeException')
-extern class RuntimeException extends Exception {}
\ No newline at end of file
diff --git a/std/php7/Scalar.hx b/std/php7/Scalar.hx
deleted file mode 100644
index b201aa0f371ba73cf913bb3d0e784d2a2406d0e8..0000000000000000000000000000000000000000
--- a/std/php7/Scalar.hx
+++ /dev/null
@@ -1,9 +0,0 @@
-package php;
-
-import haxe.extern.EitherType;
-
-
-/**
-    `Scalar` is a type that is compatible with any scalar value (int, float, bool, string)
-**/
-typedef Scalar = EitherType<Int, EitherType<String, EitherType<Float, Bool>>>;
\ No newline at end of file
diff --git a/std/php7/Session.hx b/std/php7/Session.hx
deleted file mode 100644
index 78e2c4b5a9c7e74328d8f70cb66fcfa9871caea0..0000000000000000000000000000000000000000
--- a/std/php7/Session.hx
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C)2005-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 php;
-
-import php.Boot;
-import php.Global.*;
-import php.SuperGlobal.*;
-
-/**
-	Session consists of a way to preserve certain data across
-	subsequent accesses.
-*/
-class Session {
-	public static function getCacheLimiter() {
-		switch(session_cache_limiter()) {
-			case "public":
-				return Public;
-			case "private":
-				return Private;
-			case "nocache":
-				return NoCache;
-			case "private_no_expire":
-				return PrivateNoExpire;
-		}
-		return null;
-	}
-
-	public static function setCacheLimiter(l : CacheLimiter) {
-		if(started) throw "You can't set the cache limiter while the session is already in use";
-		switch(l) {
-			case Public:
-				session_cache_limiter("public");
-			case Private:
-				session_cache_limiter("private");
-			case NoCache:
-				session_cache_limiter("nocache");
-			case PrivateNoExpire:
-				session_cache_limiter("private_no_expire");
-		}
-	}
-
-	public static function getCacheExpire() : Int {
-		return session_cache_expire();
-	}
-
-	public static function setCacheExpire(minutes : Int) {
-		if(started) throw "You can't set the cache expire time while the session is already in use";
-		session_cache_expire(minutes);
-	}
-
-	public static function setName(name : String) {
-		if(started) throw "You can't set the name while the session is already in use";
-		session_name(name);
-	}
-
-	public static function getName() : String {
-		return session_name();
-	}
-
-	public static function getId() : String {
-		return session_id();
-	}
-
-	public static function setId(id : String) {
-		if(started) throw "You can't set the session id while the session is already in use";
-		session_id(id);
-	}
-
-	public static function getSavePath() : String {
-		return session_save_path();
-	}
-
-	public static function setSavePath(path : String) {
-		if(started) throw "You can't set the save path while the session is already in use";
-		session_save_path(path);
-	}
-
-	public static function getModule() : String {
-		return session_module_name();
-	}
-
-	public static function setModule(module : String) {
-		if(started) throw "You can't set the module while the session is already in use";
-		session_module_name(module);
-	}
-
-	public static function regenerateId(?deleteold : Bool) : Bool {
-		return session_regenerate_id(deleteold);
-	}
-
-	public static function get(name : String) : Dynamic {
-		start();
-		if(!isset(_SESSION[name])) return null;
-		return _SESSION[name];
-	}
-
-	public static function set(name : String, value : Dynamic) {
-		start();
-		return _SESSION[name] = value;
-	}
-
-	public static function setCookieParams(?lifetime : Int, ?path : String, ?domain : String, ?secure : Bool, ?httponly : Bool) {
-		if(started) throw "You can't set the cookie params while the session is already in use";
-		session_set_cookie_params(lifetime, path, domain, secure, httponly);
-	}
-
-	public static function getCookieParams() : { lifetime : Int, path : String, domain : String, secure : Bool, httponly : Bool} {
-		return Boot.createAnon(session_get_cookie_params());
-	}
-
-	// TODO: completely untested
-	public static function setSaveHandler(open : String -> String -> Bool, close : Void -> Bool, read : String -> String, write : String -> String -> Bool, destroy, gc) : Bool {
-		return session_set_save_handler(open, close, read, write, destroy, gc);
-	}
-
-	public static function exists(name : String) {
-		start();
-		return array_key_exists(name, _SESSION);
-	}
-
-	public static function remove(name : String) {
-		start();
-		unset(_SESSION[name]);
-	}
-
-	public static var started(default, null) : Bool;
-	public static function start() {
-		if(started) return;
-		started = true;
-		session_start();
-	}
-
-	public static function clear() {
-		session_unset();
-	}
-
-	public static function close() {
-		session_write_close();
-		started = false; // TODO: not sure this useful; test if a closed session can be re-opened (I doubt)
-	}
-
-	static function __init__() {
-		started = isset(_SESSION);
-	}
-}
-
-enum CacheLimiter {
-	Public;
-	Private;
-	NoCache;
-	PrivateNoExpire;
-}
diff --git a/std/php7/SessionHandlerInterface.hx b/std/php7/SessionHandlerInterface.hx
deleted file mode 100644
index 51def6cc1fd000ed84ad844eae28c1cf6bcf1a74..0000000000000000000000000000000000000000
--- a/std/php7/SessionHandlerInterface.hx
+++ /dev/null
@@ -1,14 +0,0 @@
-package php;
-
-/**
-	@see http://php.net/manual/en/class.sessionhandlerinterface.php
-**/
-@:native('SessionHandlerInterface')
-extern interface SessionHandlerInterface {
-	function close() : Bool;
-	function destroy( session_id:String ) : Bool;
-	function gc( maxlifetime:Int ) : Bool;
-	function open( save_path:String, session_name:String ) : Bool;
-	function read( session_id:String ) : String;
-	function write( session_id:String, session_data:String ) : Bool;
-}
\ No newline at end of file
diff --git a/std/php7/StdClass.hx b/std/php7/StdClass.hx
deleted file mode 100644
index 64179a75ff2af137448fe878d3686925f0b8fcd3..0000000000000000000000000000000000000000
--- a/std/php7/StdClass.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package php;
-
-@:native('StdClass')
-@:phpNoConstructor
-extern class StdClass implements Dynamic {
-	function new() : Void;
-}
\ No newline at end of file
diff --git a/std/php7/SuperGlobal.hx b/std/php7/SuperGlobal.hx
deleted file mode 100644
index 885bb93efc6af962c5ac720b67786d3b1589f44f..0000000000000000000000000000000000000000
--- a/std/php7/SuperGlobal.hx
+++ /dev/null
@@ -1,60 +0,0 @@
-package php;
-
-
-
-class SuperGlobal {
-    /**
-        @see http://php.net/manual/en/reserved.variables.globals.php
-    **/
-    public static var GLOBALS (get,never):NativeAssocArray<Dynamic>;
-    static inline function get_GLOBALS() return untyped __php__("$GLOBALS");
-
-    /**
-        @see http://php.net/manual/en/reserved.variables.server.php
-    **/
-    public static var _SERVER (get,never):NativeAssocArray<Dynamic>;
-    static inline function get__SERVER() return untyped __php__("$_SERVER");
-
-    /**
-        @see http://php.net/manual/en/reserved.variables.get.php
-    **/
-    public static var _GET (get,never):NativeAssocArray<Dynamic>;
-    static inline function get__GET() return untyped __php__("$_GET");
-
-    /**
-        @see http://php.net/manual/en/reserved.variables.post.php
-    **/
-    public static var _POST (get,never):NativeAssocArray<Dynamic>;
-    static inline function get__POST() return untyped __php__("$_POST");
-
-    /**
-        @see http://php.net/manual/en/reserved.variables.files.php
-    **/
-    public static var _FILES (get,never):NativeAssocArray<Dynamic>;
-    static inline function get__FILES() return untyped __php__("$_FILES");
-
-    /**
-        @see http://php.net/manual/en/reserved.variables.cookie.php
-    **/
-    public static var _COOKIE (get,never):NativeAssocArray<Dynamic>;
-    static inline function get__COOKIE() return untyped __php__("$_COOKIE");
-
-    /**
-        @see http://php.net/manual/en/reserved.variables.session.php
-    **/
-    public static var _SESSION (get,never):NativeAssocArray<Dynamic>;
-    static inline function get__SESSION() return untyped __php__("$_SESSION");
-
-    /**
-        @see http://php.net/manual/en/reserved.variables.request.php
-    **/
-    public static var _REQUEST (get,never):NativeAssocArray<Dynamic>;
-    static inline function get__REQUEST() return untyped __php__("$_REQUEST");
-
-    /**
-        @see http://php.net/manual/en/reserved.variables.env.php
-    **/
-    public static var _ENV (get,never):NativeAssocArray<Dynamic>;
-    static inline function get__ENV() return untyped __php__("$_ENV");
-
-}
\ No newline at end of file
diff --git a/std/php7/Syntax.hx b/std/php7/Syntax.hx
deleted file mode 100644
index ac41e85ff33820c659195c5e0aa16ad074fe8e9d..0000000000000000000000000000000000000000
--- a/std/php7/Syntax.hx
+++ /dev/null
@@ -1,127 +0,0 @@
-package php;
-
-import haxe.extern.Rest;
-import haxe.extern.AsVar;
-import haxe.extern.EitherType;
-
-/**
-    Special extern class to support PHP language specifics.
-    Don't use these functions unless you are really sure what you are doing.
-**/
-extern class Syntax {
-    /**
-        This method allows to force specified binary operation for `left` and `right` values.
-        `operator` must be a constant string like "+" or "==".
-    **/
-    static function binop( left:Dynamic, operator:String, right:Dynamic ) : Dynamic;
-
-    /**
-        Generates `(int)$value`
-    **/
-    static function int( value:Dynamic ) : Int;
-
-    /**
-        Generates `(float)$value`
-    **/
-    static function float( value:Dynamic ) : Float;
-
-    /**
-        Generates `(string)$value`
-    **/
-    static function string( value:Dynamic ) : String;
-
-    /**
-        Generates `(bool)$value`
-    **/
-    static function bool( value:Dynamic ) : Bool;
-
-    /**
-        Generates `(object)$value`
-    **/
-    static function object( value:Dynamic ) : Dynamic;
-
-    /**
-        Generates `(array)$value`
-    **/
-    static function array( value:Dynamic ) : NativeArray;
-
-    /**
-        Ggenerates `$value instanceof $phpClassName`.
-        Haxe generates `Std.is(value, Type)` calls to `$value instanceof Type` automatically where possible.
-        `type` only accepts direct class names. That means `Type.resolveClass('MyClass')` is not allowed, but `MyClass` is.
-    **/
-    static function instanceof<V,C>( value:AsVar<V>,  type:AsVar<Class<C>> ) : Bool;
-
-    /**
-        ```
-        PHP.foreach(collection, function(key, value) trace(key, value));
-        ```
-        generates:
-        ```
-        foreach($collection as $key => $value) {
-            trace($key, $value);
-        }
-        ```
-    **/
-    static function foreach<TCollection,TKey,TValue>( collection:TCollection, body:TKey->TValue->Void ) : Void;
-
-    /**
-        Generates `new $className($arg1, ...$argN)`
-    **/
-    static function construct( className:AsVar<String>, args:Rest<Dynamic>) : Dynamic;
-
-    /**
-        Generates instance field access for reading on `object`
-    **/
-    static function getField<T>( object:AsVar<T>, fieldName:AsVar<String> ) : Dynamic;
-
-    /**
-        Generates instance field access for writing on `object`
-    **/
-    static function setField<T>( object:AsVar<T>, fieldName:AsVar<String>, value:Dynamic ) : Void;
-
-    /**
-        Generates static field access for reading on `className`
-    **/
-    static function getStaticField( className:AsVar<EitherType<Class<Dynamic>,String>>, fieldName:AsVar<String> ) : Dynamic;
-
-    /**
-        Generates static field access for writing on `object`
-    **/
-    static function setStaticField( object:AsVar<EitherType<Class<Dynamic>,String>>, fieldName:AsVar<String>, value:Dynamic ) : Void;
-
-    /**
-        Generates a call to instance method: `$object->{$methodName}(<args>)`
-    **/
-    static function call<T>( object:AsVar<T>, methodName:AsVar<String>, args:Rest<Dynamic> ) : Dynamic;
-    /**
-        Generates a call to static method: `$className::{$methodName}(<args>)`
-    **/
-    static function staticCall( className:AsVar<EitherType<Class<Dynamic>,String>>, methodName:AsVar<String>, args:Rest<Dynamic> ) : Dynamic;
-
-    /**
-        ```
-        PHP.arrayDecl(arg1, arg2, arg3);
-        ```
-        Generates native array declaration:
-        ```
-        [$arg1, $arg2, $arg3]
-        ```
-    **/
-    static function arrayDecl<T>( args:Rest<T> ) : NativeIndexedArray<T>;
-
-    /**
-        Don't let compiler to optimize away local var passed to this method.
-    **/
-    static function keepVar( localVar:Dynamic ) : Void;
-
-    /**
-        Adds `...` operator before `args`
-    **/
-    static function splat( args:EitherType<NativeArray, Traversable> ) : Rest<Dynamic>;
-
-    /**
-        Add errors suppression operator `@` before `expression`
-    **/
-    static function suppress<T>( expression:T ) : T;
-}
\ No newline at end of file
diff --git a/std/php7/Throwable.hx b/std/php7/Throwable.hx
deleted file mode 100644
index 80cc5ee7fa4d90364a5ff48ceb2839572329c35b..0000000000000000000000000000000000000000
--- a/std/php7/Throwable.hx
+++ /dev/null
@@ -1,16 +0,0 @@
-package php;
-
-/**
-    @see http://php.net/manual/en/class.throwable.php
-**/
-@:native('Throwable')
-extern interface Throwable {
-    function getPrevious() : Throwable;   // Returns previous Throwable
-    function getMessage() : String;       // message of the exception
-    function getCode() : Int;             // code of the exception
-    function getFile() : String;          // source filename
-    function getLine() : Int;             // source line
-    function getTrace() : NativeIndexedArray<NativeAssocArray<Dynamic>>;  // an array of the backtrace
-    function getTraceAsString() : String; // formated string of trace
-	@:phpMagic function __toString() : String;       // formated string for display
-}
\ No newline at end of file
diff --git a/std/php7/Traversable.hx b/std/php7/Traversable.hx
deleted file mode 100644
index ee15e051d159e2bc7296199f87926b2325e6b785..0000000000000000000000000000000000000000
--- a/std/php7/Traversable.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package php;
-
-/**
-    @see http://php.net/manual/en/class.traversable.php
-**/
-@:native('Traversable')
-extern interface Traversable {}
\ No newline at end of file
diff --git a/std/php7/Web.hx b/std/php7/Web.hx
deleted file mode 100644
index 4c8905c55be5c5e1b3a3145c29419e47b087f755..0000000000000000000000000000000000000000
--- a/std/php7/Web.hx
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * Copyright (C)2005-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 php;
-
-import haxe.io.Bytes;
-import php.Syntax.*;
-import php.Global.*;
-import php.SuperGlobal.*;
-
-/**
-	This class is used for accessing the local Web server and the current
-	client request and information.
-**/
-class Web {
-
-	/**
-		Returns the GET and POST parameters.
-	**/
-	public static function getParams() : Map<String,String> {
-		#if force_std_separator
-		var h = Lib.hashOfAssociativeArray(_POST);
-		var params = getParamsString();
-		if( params == "" )
-			return h;
-		for( p in ~/[;&]/g.split(params) ) {
-			var a = p.split("=");
-			var n = a.shift();
-			h.set(StringTools.urlDecode(n),StringTools.urlDecode(a.join("=")));
-		}
-		return h;
-		#else
-		return Lib.hashOfAssociativeArray(array_merge(_GET, _POST));
-		#end
-	}
-
-	/**
-		Returns an Array of Strings built using GET / POST values.
-		If you have in your URL the parameters `a[]=foo;a[]=hello;a[5]=bar;a[3]=baz` then
-		`php.Web.getParamValues("a")` will return `["foo","hello",null,"baz",null,"bar"]`.
-	**/
-	public static function getParamValues( param : String ) : Array<String> {
-		var reg = new EReg("^"+param+"(\\[|%5B)([0-9]*?)(\\]|%5D)=(.*?)$", "");
-		var res = new Array<String>();
-		var explore = function(data:String){
-			if (data == null || data.length == 0)
-				return;
-			for (part in data.split("&")){
-				if (reg.match(part)){
-					var idx = reg.matched(2);
-					var val = StringTools.urlDecode(reg.matched(4));
-					if (idx == "")
-						res.push(val);
-					else
-						res[Std.parseInt(idx)] = val;
-				}
-			}
-		}
-		explore(StringTools.replace(getParamsString(), ";", "&"));
-		explore(getPostData());
-
-		if (res.length == 0) {
-			var post:haxe.ds.StringMap<Dynamic> = Lib.hashOfAssociativeArray(_POST);
-			var data = post.get(param);
-			if (is_array(data)) {
-				foreach(data, function(key:Int, value:String) {
-					res[key] = value;
-				});
-			}
-		}
-
-		if (res.length == 0)
-			return null;
-		return res;
-	}
-
-	/**
-		Returns the local server host name.
-	**/
-	public static inline function getHostName() : String {
-		return _SERVER['SERVER_NAME'];
-	}
-
-	/**
-		Surprisingly returns the client IP address.
-	**/
-	public static inline function getClientIP() : String {
-		return _SERVER['REMOTE_ADDR'];
-	}
-
-	/**
-		Returns the original request URL (before any server internal redirections).
-	**/
-	public static function getURI() : String {
-		var s : String = _SERVER['REQUEST_URI'];
-		return s.split("?")[0];
-	}
-
-	/**
-		Tell the client to redirect to the given url ("Location" header).
-	**/
-	public static function redirect( url : String ) {
-		header("Location: " + url);
-	}
-
-	/**
-		Set an output header value. If some data have been printed, the headers have
-		already been sent so this will raise an exception.
-	**/
-	public static inline function setHeader( h : String, v : String ) {
-		header('$h: $v');
-	}
-
-	/**
-		Set the HTTP return code. Same remark as `php.Web.setHeader()`.
-		See status code explanation here: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-	**/
-	public static function setReturnCode( r : Int ) {
-		var code : String;
-		switch(r) {
-			case 100: code = "100 Continue";
-			case 101: code = "101 Switching Protocols";
-			case 200: code = "200 OK";
-			case 201: code = "201 Created";
-			case 202: code = "202 Accepted";
-			case 203: code = "203 Non-Authoritative Information";
-			case 204: code = "204 No Content";
-			case 205: code = "205 Reset Content";
-			case 206: code = "206 Partial Content";
-			case 300: code = "300 Multiple Choices";
-			case 301: code = "301 Moved Permanently";
-			case 302: code = "302 Found";
-			case 303: code = "303 See Other";
-			case 304: code = "304 Not Modified";
-			case 305: code = "305 Use Proxy";
-			case 307: code = "307 Temporary Redirect";
-			case 400: code = "400 Bad Request";
-			case 401: code = "401 Unauthorized";
-			case 402: code = "402 Payment Required";
-			case 403: code = "403 Forbidden";
-			case 404: code = "404 Not Found";
-			case 405: code = "405 Method Not Allowed";
-			case 406: code = "406 Not Acceptable";
-			case 407: code = "407 Proxy Authentication Required";
-			case 408: code = "408 Request Timeout";
-			case 409: code = "409 Conflict";
-			case 410: code = "410 Gone";
-			case 411: code = "411 Length Required";
-			case 412: code = "412 Precondition Failed";
-			case 413: code = "413 Request Entity Too Large";
-			case 414: code = "414 Request-URI Too Long";
-			case 415: code = "415 Unsupported Media Type";
-			case 416: code = "416 Requested Range Not Satisfiable";
-			case 417: code = "417 Expectation Failed";
-			case 500: code = "500 Internal Server Error";
-			case 501: code = "501 Not Implemented";
-			case 502: code = "502 Bad Gateway";
-			case 503: code = "503 Service Unavailable";
-			case 504: code = "504 Gateway Timeout";
-			case 505: code = "505 HTTP Version Not Supported";
-			default: code = Std.string(r);
-		}
-		header("HTTP/1.1 " + code, true, r);
-	}
-
-	/**
-		Retrieve a client header value sent with the request.
-	**/
-	public static function getClientHeader( k : String ) : String {
-		return loadClientHeaders().get(k);
-	}
-
-
-	private static var _clientHeaders : Map<String,String>;
-	/**
-		Based on https://github.com/ralouphie/getallheaders
-	**/
-	static function loadClientHeaders():Map<String,String> {
-		if(_clientHeaders != null) return _clientHeaders;
-
-		_clientHeaders = new Map();
-
-		if(function_exists('getallheaders')) {
-			foreach(getallheaders(), function(key:String, value:Dynamic) {
-				_clientHeaders.set(key, Std.string(value));
-			});
-			return _clientHeaders;
-		}
-
-		var copyServer = [
-			'CONTENT_TYPE'   => 'Content-Type',
-			'CONTENT_LENGTH' => 'Content-Length',
-			'CONTENT_MD5'    => 'Content-Md5'
-		];
-		foreach(_SERVER, function(key:String, value:Dynamic) {
-			if((substr(key, 0, 5):String) == 'HTTP_') {
-				key = substr(key, 5);
-				if(!copyServer.exists(key) || !isset(_SERVER[key])) {
-					key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', key))));
-					_clientHeaders[key] = Std.string(value);
-				}
-			} else if(copyServer[key] != null) {
-				_clientHeaders[copyServer[key]] = Std.string(value);
-			}
-		});
-		if(!_clientHeaders.exists('Authorization')) {
-			if(isset(_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
-				_clientHeaders['Authorization'] = Std.string(_SERVER['REDIRECT_HTTP_AUTHORIZATION']);
-			} else if(isset(_SERVER['PHP_AUTH_USER'])) {
-				var basic_pass = isset(_SERVER['PHP_AUTH_PW']) ? Std.string(_SERVER['PHP_AUTH_PW']) : '';
-				_clientHeaders['Authorization'] = 'Basic ' + base64_encode(_SERVER['PHP_AUTH_USER'] + ':' + basic_pass);
-			} else if(isset(_SERVER['PHP_AUTH_DIGEST'])) {
-				_clientHeaders['Authorization'] = Std.string(_SERVER['PHP_AUTH_DIGEST']);
-			}
-		}
-
-		return _clientHeaders;
-	}
-
-	/**
-		Retrieve all the client headers.
-	**/
-	public static function getClientHeaders():List<{value:String, header:String}> {
-		var headers = loadClientHeaders();
-		var result = new List();
-		for(key in headers.keys()) {
-			result.push({value:headers.get(key), header:key});
-		}
-		return result;
-	}
-
-	/**
-		Returns all the GET parameters `String`
-	**/
-	public static function getParamsString() : String {
-		if(isset(_SERVER['QUERY_STRING']))
-			return _SERVER['QUERY_STRING'];
-		else
-			return "";
-	}
-
-	/**
-		Returns all the POST data. POST Data is always parsed as
-		being application/x-www-form-urlencoded and is stored into
-		the getParams hashtable. POST Data is maximimized to 256K
-		unless the content type is multipart/form-data. In that
-		case, you will have to use `php.Web.getMultipart()` or
-		`php.Web.parseMultipart()` methods.
-	**/
-	public static function getPostData() : Null<String> {
-		var h = fopen("php://input", "r");
-		var bsize = 8192;
-		var max = 32;
-		var data : String = null;
-		var counter = 0;
-		while (!feof(h) && counter < max) {
-			data = Syntax.binop(data, ' . ', fread(h, bsize));
-			counter++;
-		}
-		fclose(h);
-		return data;
-	}
-
-	/**
-		Returns an hashtable of all Cookies sent by the client.
-		Modifying the hashtable will not modify the cookie, use `php.Web.setCookie()`
-		instead.
-	**/
-	public static function getCookies():Map<String,String> {
-		return Lib.hashOfAssociativeArray(_COOKIE);
-	}
-
-
-	/**
-		Set a Cookie value in the HTTP headers. Same remark as `php.Web.setHeader()`.
-	**/
-	public static function setCookie( key : String, value : String, ?expire: Date, ?domain: String, ?path: String, ?secure: Bool, ?httpOnly: Bool ) {
-		var t = expire == null ? 0 : Std.int(expire.getTime()/1000.0);
-		if(path == null) path = '/';
-		if(domain == null) domain = '';
-		if(secure == null) secure = false;
-		if(httpOnly == null) httpOnly = false;
-		setcookie(key, value, t, path, domain, secure, httpOnly);
-	}
-
-	/**
-		Returns an object with the authorization sent by the client (Basic scheme only).
-	**/
-	public static function getAuthorization() : { user : String, pass : String } {
-		if(!isset(_SERVER['PHP_AUTH_USER']))
-			return null;
-		return {user: _SERVER['PHP_AUTH_USER'], pass: _SERVER['PHP_AUTH_PW']};
-	}
-
-	/**
-		Get the current script directory in the local filesystem.
-	**/
-	public static inline function getCwd() : String {
-		return dirname(_SERVER['SCRIPT_FILENAME']) + "/";
-	}
-
-	/**
-		Get the multipart parameters as an hashtable. The data
-		cannot exceed the maximum size specified.
-	**/
-	public static function getMultipart( maxSize : Int ) : Map<String,String> {
-		var h = new haxe.ds.StringMap();
-		var buf : StringBuf = null;
-		var curname = null;
-		parseMultipart(function(p,_) {
-			if( curname != null )
-				h.set(curname,buf.toString());
-			curname = p;
-			buf = new StringBuf();
-			maxSize -= p.length;
-			if( maxSize < 0 )
-				throw "Maximum size reached";
-		}, function(str,pos,len) {
-			maxSize -= len;
-			if( maxSize < 0 )
-				throw "Maximum size reached";
-			buf.addSub(str.toString(),pos,len);
-		});
-		if( curname != null )
-			h.set(curname,buf.toString());
-		return h;
-	}
-
-	/**
-		Parse the multipart data. Call `onPart` when a new part is found
-		with the part name and the filename if present
-		and `onData` when some part data is readed. You can this way
-		directly save the data on hard drive in the case of a file upload.
-	**/
-	public static function parseMultipart( onPart : String -> String -> Void, onData : Bytes -> Int -> Int -> Void ) : Void {
-		var post = Lib.hashOfAssociativeArray(_POST);
-
-		for (key in post.keys())
-		{
-			onPart(key, "");
-			var v = post.get(key);
-			onData(Bytes.ofString(v), 0, strlen(v));
-		}
-
-		if(!isset(_FILES)) return;
-		var parts : Array<String> = @:privateAccess Array.wrap(array_keys(_FILES));
-		for(part in parts) {
-			var info : NativeAssocArray<Dynamic> = _FILES[part];
-			var tmp : String = info['tmp_name'];
-			var file : String = info['name'];
-			var err : Int = info['error'];
-
-			if(err > 0) {
-				switch(err) {
-					case 1: throw "The uploaded file exceeds the max size of " + ini_get('upload_max_filesize');
-					case 2: throw "The uploaded file exceeds the max file size directive specified in the HTML form (max is" + ini_get('post_max_size') + ")";
-					case 3: throw "The uploaded file was only partially uploaded";
-					case 4: continue; // No file was uploaded
-					case 6: throw "Missing a temporary folder";
-					case 7: throw "Failed to write file to disk";
-					case 8: throw "File upload stopped by extension";
-				}
-			}
-			onPart(part, file);
-			if ("" != file)
-			{
-				var h = fopen(tmp, "r");
-				var bsize = 8192;
-				while (!feof(h)) {
-					var buf : String = fread(h, bsize);
-					var size : Int = strlen(buf);
-					onData(Bytes.ofString(buf), 0, size);
-				}
-				fclose(h);
-			}
-		}
-	}
-
-	/**
-		Flush the data sent to the client. By default on Apache, outgoing data is buffered so
-		this can be useful for displaying some long operation progress.
-	**/
-	public static inline function flush() : Void {
-		flush();
-	}
-
-	/**
-		Get the HTTP method used by the client.
-	**/
-	public static function getMethod() : String {
-		if(isset(_SERVER['REQUEST_METHOD']))
-			return _SERVER['REQUEST_METHOD'];
-		else
-			return null;
-	}
-
-	public static var isModNeko(default,null) : Bool;
-
-	static function __init__() {
-		isModNeko = !Lib.isCli();
-	}
-}
diff --git a/std/php7/_std/Date.hx b/std/php7/_std/Date.hx
deleted file mode 100644
index 19e92db11de2cbac61cb701821e2ab1fdace2864..0000000000000000000000000000000000000000
--- a/std/php7/_std/Date.hx
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-import php.Global.*;
-import php.Syntax.*;
-
-@:coreApi @:final class Date
-{
-	private var __t : Float;
-
-	public function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void {
-		__t = mktime(hour, min, sec, month + 1, day, year);
-	}
-
-	public function getTime() : Float {
-		return __t * 1000.0;
-	}
-
-	private function getPhpTime() : Float {
-		return __t;
-	}
-
-	public function getFullYear() : Int {
-		return int(date("Y", int(__t)));
-	}
-
-	public function getMonth() : Int {
-		var m : Int = int(date("n", int(__t)));
-		return -1 + m;
-	}
-
-	public function getDate() : Int {
-		return int(date("j", int(__t)));
-	}
-
-	public function getHours() : Int {
-		return int(date("G", int(__t)));
-	}
-
-	public function getMinutes() : Int {
-		return int(date("i", int(__t)));
-	}
-
-	public function getSeconds() : Int {
-		return int(date("s", int(__t)));
-	}
-
-	public function getDay() : Int {
-		return int(date("w", int(__t)));
-	}
-
-	public function toString():String {
-		return date("Y-m-d H:i:s", int(__t));
-	}
-
-	public static function now() : Date {
-		return fromPhpTime(round(microtime(true), 3));
-	}
-
-	static function fromPhpTime( t : Float ) : Date {
-		var d = new Date(2000, 1, 1, 0, 0, 0);
-		d.__t = t;
-		return d;
-	}
-
-	public static function fromTime( t : Float ) : Date {
-		var d = new Date(2000, 1, 1, 0, 0, 0);
-		d.__t = t / 1000;
-		return d;
-	}
-
-	public static function fromString( s : String ) : Date {
-		return fromPhpTime(strtotime(s));
-	}
-}
-
-
diff --git a/std/php7/_std/EReg.hx b/std/php7/_std/EReg.hx
deleted file mode 100644
index 4f91a9095051fed72fa52570a41d8f9a7edf5418..0000000000000000000000000000000000000000
--- a/std/php7/_std/EReg.hx
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-import haxe.extern.EitherType;
-import php.*;
-
-@:coreApi @:final class EReg {
-
-	var r : Dynamic;
-	var last : String;
-	var global : Bool;
-	var pattern : String;
-	var options : String;
-	var re : String;
-	var matches : NativeIndexedArray<NativeIndexedArray<EitherType<Int,String>>>;
-
-	public function new( r : String, opt : String ) : Void {
-		this.pattern = r;
-		var a = opt.split("g");
-		global = a.length > 1;
-		if (global) {
-			opt = a.join("");
-		}
-		this.options = opt;
-		this.re = '"' + Global.str_replace('"', '\\"', r) + '"' + opt;
-	}
-
-	public function match( s : String ) : Bool {
-		var p : Int = Global.preg_match(re, s, matches, Const.PREG_OFFSET_CAPTURE);
-
-		if (p > 0) {
-			last = s;
-		} else {
-			last = null;
-		}
-		return p > 0;
-	}
-
-	public function matched( n : Int ) : String {
-		if (matches == null ||  n < 0) throw "EReg::matched";
-		// we can't differenciate between optional groups at the end of a match
-		// that have not been matched and invalid groups
-		if (n >= Global.count(matches)) return null;
-		if ((matches[n][1]:Int) < 0) return null;
-		return matches[n][0];
-	}
-
-	public function matchedLeft() : String {
-		if (Global.count(matches) == 0) throw "No string matched";
-		return last.substr(0, matches[0][1]);
-	}
-
-	public function matchedRight() : String {
-		if (Global.count(matches) == 0) throw "No string matched";
-		var x : Int = (matches[0][1]:Int) + Global.strlen(matches[0][0]);
-		return last.substr(x);
-	}
-
-	public function matchedPos() : { pos : Int, len : Int } {
-		return {
-			pos : matches[0][1],
-			len : Global.strlen(matches[0][0])
-		};
-	}
-
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
-		var subject = len < 0 ? s : s.substr(0,pos + len);
-		var p : Int = Global.preg_match(re, subject, matches, Const.PREG_OFFSET_CAPTURE, pos);
-		if(p > 0) {
-			last = s;
-		}
-		else {
-			last = null;
-		}
-		return p > 0;
-	}
-
-	public function split( s : String ) : Array<String> {
-		var parts:NativeArray = Global.preg_split(re, s, (global ? -1 : 2));
-		return @:privateAccess Array.wrap(parts);
-	}
-
-	public function replace( s : String, by : String ) : String {
-		by = Global.str_replace("\\$", "\\\\$", by);
-		by = Global.str_replace("$$", "\\$", by);
-		if (!Global.preg_match('/\\\\([^?].*?\\\\)/', re)) {
-			by = Global.preg_replace('/\\$(\\d+)/', '\\$\\1', by);
-		}
-		return Global.preg_replace(re, by, s, global ? -1 : 1);
-	}
-
-	public function map( s : String, f : EReg -> String ) : String {
-		var offset = 0;
-		var buf = new StringBuf();
-		do {
-			if (offset >= s.length) {
-				break;
-			} else if (!matchSub(s, offset)) {
-				buf.add(s.substr(offset));
-				break;
-			}
-			var p = matchedPos();
-			buf.add(s.substr(offset, p.pos - offset));
-			buf.add(f(this));
-			if (p.len == 0) {
-				buf.add(s.substr(p.pos, 1));
-				offset = p.pos + 1;
-			}
-			else {
-				offset = p.pos + p.len;
-			}
-		} while (global);
-		if (!global && offset > 0 && offset < s.length) {
-			buf.add(s.substr(offset));
-		}
-		return buf.toString();
-	}
-}
diff --git a/std/php7/_std/Math.hx b/std/php7/_std/Math.hx
deleted file mode 100644
index 5694905031dba8e82e3b1ebe25246458f13a8c39..0000000000000000000000000000000000000000
--- a/std/php7/_std/Math.hx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-import php.Global;
-import php.Const;
-import php.Syntax.*;
-
-@:coreApi class Math {
-	public static var PI(default,null) : Float = Const.M_PI;
-	public static var NaN(default,null) : Float = Const.NAN;
-	public static var POSITIVE_INFINITY(default,null) : Float = Const.INF;
-	public static var NEGATIVE_INFINITY(default,null) : Float = -Const.INF;
-
-	public static inline function abs( v:Float ) : Float return Global.abs(v);
-	public static inline function min( a:Float, b:Float ) : Float return isNaN(a) || isNaN(b) ? NaN : Global.min(a, b);
-	public static inline function max( a:Float, b:Float ) : Float return isNaN(a) || isNaN(b) ? NaN : Global.max(a, b);
-	public static inline function sin( v:Float ) : Float return Global.sin(v);
-	public static inline function cos( v:Float ) : Float return Global.cos(v);
-	public static inline function atan2( y:Float, x:Float ) : Float return Global.atan2(y, x);
-	public static inline function tan( v:Float ) : Float return Global.tan(v);
-	public static inline function exp( v:Float ) : Float return Global.exp(v);
-	public static inline function log( v:Float ) : Float return Global.log(v);
-	public static inline function sqrt( v:Float ) : Float return Global.sqrt(v);
-	public static inline function round( v:Float ) : Int return int(Global.floor(v + 0.5));
-	public static inline function floor( v:Float ) : Int return int(Global.floor(v));
-	public static inline function ceil( v:Float ) : Int return int(Global.ceil(v));
-	public static inline function atan( v:Float ) : Float return Global.atan(v);
-	public static inline function asin( v:Float ) : Float return Global.asin(v);
-	public static inline function acos( v:Float ) : Float return Global.acos(v);
-	public static inline function pow( v:Float, exp:Float ) : Float return Global.pow(v, exp);
-	public static inline function random() : Float return Global.mt_rand() / Global.mt_getrandmax();
-	public static inline function isNaN( f:Float ) : Bool return Global.is_nan(f);
-	public static inline function isFinite( f:Float ) : Bool return Global.is_finite(f);
-
-	public static inline function fround( v:Float ) : Float return Global.floor(v + 0.5);
-	public static inline function ffloor( v:Float ) : Float return Global.floor(v);
-	public static inline function fceil( v:Float ) : Float return Global.ceil(v);
-}
-
-
diff --git a/std/php7/_std/Reflect.hx b/std/php7/_std/Reflect.hx
deleted file mode 100644
index 7a1bfbdbb2b3e0455d228c703adb0825fb7f99f0..0000000000000000000000000000000000000000
--- a/std/php7/_std/Reflect.hx
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-import php.Boot;
-import php.Syntax;
-import php.Closure;
-import haxe.Constraints;
-
-using php.Global;
-
-@:coreApi class Reflect {
-
-	public static function hasField( o : Dynamic, field : String ) : Bool {
-		if (!o.is_object()) return false;
-		if (o.property_exists(field)) return true;
-
-		if (Boot.isClass(o)) {
-			var phpClassName = Boot.castClass(o).phpClassName;
-			return Global.property_exists(phpClassName, field) || Global.method_exists(phpClassName, field) || Global.defined('$phpClassName::$field');
-		}
-
-		return false;
-	}
-
-	public static function field( o : Dynamic, field : String ) : Dynamic {
-		if (!o.is_object()) return null;
-
-		if (o.property_exists(field)) {
-			return Syntax.getField(o, field);
-		}
-		if (o.method_exists(field)) {
-			return Boot.closure(o, field);
-		}
-
-		if (Boot.isClass(o)) {
-			var phpClassName = Boot.castClass(o).phpClassName;
-			if (Global.defined('$phpClassName::$field')) {
-				return Global.constant('$phpClassName::$field');
-			}
-			if (Global.property_exists(phpClassName, field)) {
-				return Syntax.getField(o, field);
-			}
-			if (Global.method_exists(phpClassName, field)) {
-				return Boot.closure(phpClassName, field);
-			}
-		}
-
-		return null;
-	}
-
-	public static function setField( o : Dynamic, field : String, value : Dynamic ) : Void {
-		Syntax.setField(o, field, value);
-	}
-
-	public static function getProperty( o : Dynamic, field : String ) : Dynamic {
-		if (o.is_object()) {
-			if (Boot.isClass(o)) {
-				var phpClassName = Boot.castClass(o).phpClassName;
-				if (Boot.hasGetter(phpClassName, field)) {
-					return Syntax.staticCall(phpClassName, 'get_$field');
-				}
-			} else if (Boot.hasGetter(Global.get_class(o), field)) {
-				return Syntax.call(o, 'get_$field');
-			}
-		}
-
-		return Reflect.field(o, field);
-	}
-
-	public static function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void {
-		if (o.is_object()) {
-			if (Boot.hasSetter(Global.get_class(o), field)) {
-				Syntax.call(o, 'set_$field', value);
-			} else {
-				Syntax.setField(o, field, value);
-			}
-		}
-	}
-
-	public static function callMethod( o : Dynamic, func : Function, args : Array<Dynamic> ) : Dynamic {
-		if (Std.is(func, Closure)) {
-			if (o != null) {
-				func = cast cast(func, Closure).bindTo(o);
-			}
-			return Global.call_user_func_array(func, @:privateAccess args.arr);
-		} else {
-			return Boot.castClosure(func).callWith(o, @:privateAccess args.arr);
-		}
-	}
-
-	public static function fields( o : Dynamic ) : Array<String> {
-		if (Global.is_object(o)) {
-			return @:privateAccess Array.wrap(Global.get_object_vars(o).array_keys());
-		}
-		return [];
-	}
-
-	public static inline function isFunction( f : Dynamic ) : Bool {
-		return Boot.isFunction(f);
-	}
-
-	public static function compare<T>( a : T, b : T ) : Int {
-		if (a == b) return 0;
-		if (Global.is_string(a)){
-			return Global.strcmp(cast a, cast b);
-		} else {
-			return ((cast a) > (cast b) ? 1 : -1);
-		}
-	}
-
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool {
-		if (Boot.isHxClosure(f1) && Boot.isHxClosure(f2)) {
-			return f1.equals(f2);
-		} else {
-			return f1 == f2;
-		}
-	}
-
-	public static function isObject( v : Dynamic ) : Bool {
-		if (Boot.isEnumValue(v)) {
-			return false;
-		} else {
-			return v.is_object() || v.is_string();
-		}
-	}
-
-	public static inline function isEnumValue( v : Dynamic ) : Bool {
-		return Boot.isEnumValue(v);
-	}
-
-	public static function deleteField( o : Dynamic, field : String ) : Bool {
-		if (hasField(o, field)) {
-			Global.unset(Syntax.getField(o, field));
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public static function copy<T>( o : T ) : T {
-		if (Global.is_object(o)) {
-			var fields = Global.get_object_vars(cast o);
-			var hxAnon = Boot.getHxAnon().phpClassName;
-			return Syntax.construct(hxAnon, fields);
-		} else {
-			return null;
-		}
-	}
-
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
-		return function () {
-			return Global.call_user_func(f, @:privateAccess Array.wrap(Global.func_get_args()));
-		}
-	}
-
-
-}
diff --git a/std/php7/_std/Std.hx b/std/php7/_std/Std.hx
deleted file mode 100644
index 8ffd1367dad5e5821378408f0586369cb81c6b61..0000000000000000000000000000000000000000
--- a/std/php7/_std/Std.hx
+++ /dev/null
@@ -1,94 +0,0 @@
-import php.Boot;
-
-/*
- * Copyright (C)2005-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.
- */
-
-import php.Global;
-import php.Const;
-import php.Syntax;
-
-@:keep
-@:coreApi class Std {
-
-	public static inline function is( v : Dynamic, t : Dynamic ) : Bool {
-		return Boot.is(v, t);
-	}
-
-	public static inline function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
-		return Boot.is(value, cast c) ? cast value : null;
-	}
-
-	public static function string( s : Dynamic ) : String {
-		return Boot.stringify(s);
-	}
-
-	public static inline function int( x : Float ) : Int {
-		return Syntax.int(x);
-	}
-
-	public static function parseInt( x : String ) : Null<Int> {
-		if (Global.is_numeric(x)) {
-			return Global.intval(x, 10);
-		} else {
-			x = Global.ltrim(x);
-			var firstCharIndex = (x.charAt(0) == '-' ? 1 : 0);
-			var firstCharCode = x.charCodeAt(firstCharIndex);
-			if (!isDigitCode(firstCharCode)) {
-				return null;
-			}
-			var secondChar = x.charAt(firstCharIndex + 1);
-			if (secondChar == 'x' || secondChar == 'X') {
-				return Global.intval(x, 0);
-			} else {
-				return Global.intval(x, 10);
-			}
-		}
-	}
-
-	public static function parseFloat( x : String ) : Float {
-		var result = Global.floatval(x);
-		if (result != 0) return result;
-
-		x = Global.ltrim(x);
-		var firstCharIndex = (x.charAt(0) == '-' ? 1 : 0);
-		var charCode = x.charCodeAt(firstCharIndex);
-
-		if (charCode == '.'.code) {
-			charCode = x.charCodeAt(firstCharIndex + 1);
-		}
-
-		if (isDigitCode(charCode)) {
-			return 0.0;
-		} else {
-			return Const.NAN;
-		}
-	}
-
-	public static inline function random( x : Int ) : Int {
-		return x <= 1 ? 0 : Global.mt_rand(0, x - 1);
-	}
-
-	static inline function isDigitCode( charCode:Null<Int> ) : Bool {
-		return charCode != null && charCode >= '0'.code && charCode <= '9'.code;
-	}
-
-}
diff --git a/std/php7/_std/StringTools.hx b/std/php7/_std/StringTools.hx
deleted file mode 100644
index 410b5ec92349210d917aec5b60b402a2b9748b16..0000000000000000000000000000000000000000
--- a/std/php7/_std/StringTools.hx
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-import php.*;
-
-@:coreApi class StringTools {
-
-	public inline static function urlEncode( s : String ) : String {
-		return Global.rawurlencode(s);
-	}
-
-	public inline static function urlDecode( s : String ) : String {
-		return Global.urldecode(s);
-	}
-
-	public inline static function htmlEscape( s : String, ?quotes : Bool ) : String {
-		return Global.htmlspecialchars(s, (quotes ? Const.ENT_QUOTES | Const.ENT_HTML401 : Const.ENT_NOQUOTES));
-	}
-
-	public inline static function htmlUnescape( s : String ) : String {
-		return Global.htmlspecialchars_decode(s, Const.ENT_QUOTES);
-	}
-
-	public static function startsWith( s : String, start : String ) : Bool {
-		return start == '' || Global.strpos(s, start) == 0;
-	}
-
-	public static function endsWith( s : String, end : String ) : Bool {
-		return end == '' || Global.substr(s, -end.length) == end;
-	}
-
-	public static function isSpace( s : String, pos : Int ) : Bool {
-		var c = s.charCodeAt( pos );
-		return (c >= 9 && c <= 13) || c == 32;
-	}
-
-	public inline static function ltrim( s : String ) : String {
-		return Global.ltrim(s);
-	}
-
-	public inline static function rtrim( s : String ) : String {
-		return Global.rtrim(s);
-	}
-
-	public inline static function trim( s : String ) : String {
-		return Global.trim(s);
-	}
-
-	public static function rpad( s : String, c : String, l : Int ) : String {
-		if (c.length == 0 || s.length >= l) return s;
-		var padLength = Math.ceil((l - s.length) / c.length) * c.length + s.length;
-		return Global.str_pad(s, padLength, c, Const.STR_PAD_RIGHT);
-	}
-
-	public static function lpad( s : String, c : String, l : Int ) : String {
-		if (c.length == 0 || s.length >= l) return s;
-		var padLength = Math.ceil((l - s.length) / c.length) * c.length + s.length;
-		return Global.str_pad(s, padLength, c, Const.STR_PAD_LEFT);
-	}
-
-	public static function replace( s : String, sub : String, by : String ) : String {
-		if (sub == '') {
-			return Global.implode(by, Global.str_split(s));
-		}
-		return Global.str_replace(sub, by, s);
-	}
-
-	public static function hex( n : Int, ?digits : Int ) : String {
-		var s = Global.dechex(n);
-		var len = 8;
-		if (s.length > (null == digits ? len : (len = digits > len ? digits : len)))
-			s = s.substr(-len);
-		else if ( digits != null )
-			s = lpad(s, '0', digits);
-		return s.toUpperCase();
-	}
-
-	public static inline function fastCodeAt( s : String, index : Int ) : Int {
-		return (s.length == index ? 0 : Global.ord((s:NativeString)[index]));
-	}
-
-	public static inline function isEof( c : Int ) : Bool {
-		return c == 0;
-	}
-
-	/**
-		Returns a String that can be used as a single command line argument
-		on Unix.
-		The input will be quoted, or escaped if necessary.
-	*/
-	public static function quoteUnixArg(argument:String):String {
-		// Based on cpython's shlex.quote().
-		// https://hg.python.org/cpython/file/a3f076d4f54f/Lib/shlex.py#l278
-
-		if (argument == "")
-			return "''";
-
-		if (!~/[^a-zA-Z0-9_@%+=:,.\/-]/.match(argument))
-			return argument;
-
-		// use single quotes, and put single quotes into double quotes
-		// the string $'b is then quoted as '$'"'"'b'
-		return "'" + replace(argument, "'", "'\"'\"'") + "'";
-	}
-
-	/**
-		Character codes of the characters that will be escaped by `quoteWinArg(_, true)`.
-	*/
-	public static var winMetaCharacters = [";".code, ",".code, " ".code, "(".code, ")".code, "%".code, "!".code, "^".code, "\"".code, "<".code, ">".code, "&".code, "|".code, "\n".code, "\r".code];
-
-	/**
-		Returns a String that can be used as a single command line argument
-		on Windows.
-		The input will be quoted, or escaped if necessary, such that the output
-		will be parsed as a single argument using the rule specified in
-		http://msdn.microsoft.com/en-us/library/ms880421
-
-		Examples:
-		```
-		quoteWinArg("abc") == "abc";
-		quoteWinArg("ab c") == '"ab c"';
-		```
-	*/
-	public static function quoteWinArg(argument:String, escapeMetaCharacters:Bool):String {
-		// If there is no space, tab, back-slash, or double-quotes, and it is not an empty string.
-		if (!~/^[^ \t\\"]+$/.match(argument)) {
-
-			// Based on cpython's subprocess.list2cmdline().
-			// https://hg.python.org/cpython/file/50741316dd3a/Lib/subprocess.py#l620
-
-			var result = new StringBuf();
-			var needquote = argument.indexOf(" ") != -1 || argument.indexOf("\t") != -1 || argument == "";
-
-			if (needquote)
-				result.add('"');
-
-			var bs_buf = new StringBuf();
-			for (i in 0...argument.length) {
-				switch (argument.charCodeAt(i)) {
-					case "\\".code:
-						// Don't know if we need to double yet.
-						bs_buf.add("\\");
-					case '"'.code:
-						// Double backslashes.
-						var bs = bs_buf.toString();
-						result.add(bs);
-						result.add(bs);
-						bs_buf = new StringBuf();
-						result.add('\\"');
-					case c:
-						// Normal char
-						if (bs_buf.length > 0) {
-							result.add(bs_buf.toString());
-							bs_buf = new StringBuf();
-						}
-						result.addChar(c);
-				}
-			}
-
-			// Add remaining backslashes, if any.
-			result.add(bs_buf.toString());
-
-			if (needquote) {
-				result.add(bs_buf.toString());
-				result.add('"');
-			}
-
-			argument = result.toString();
-		}
-
-		if (escapeMetaCharacters) {
-			var result = new StringBuf();
-			for (i in 0...argument.length) {
-				var c = argument.charCodeAt(i);
-				if (winMetaCharacters.indexOf(c) >= 0) {
-					result.addChar("^".code);
-				}
-				result.addChar(c);
-			}
-			return result.toString();
-		} else {
-			return argument;
-		}
-	}
-
-}
diff --git a/std/php7/_std/Sys.hx b/std/php7/_std/Sys.hx
deleted file mode 100644
index 03fb1b07103b07665b610eacb9aa41201815f528..0000000000000000000000000000000000000000
--- a/std/php7/_std/Sys.hx
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-import php.*;
-import sys.io.FileOutput;
-import sys.io.FileInput;
-
-@:coreApi class Sys {
-
-	public static inline function print( v : Dynamic ) : Void {
-		Global.echo(Std.string(v));
-	}
-
-	public static function println( v : Dynamic ) : Void {
-		print(v);
-		print("\n");
-	}
-
-	public static function args() : Array<String> {
-		if (Global.array_key_exists('argv', SuperGlobal._SERVER)) {
-			return @:privateAccess Array.wrap(Global.array_slice(SuperGlobal._SERVER['argv'], 1));
-		} else {
-			return [];
-		}
-	}
-
-	public static function getEnv( s : String ) : String {
-		var value = Global.getenv(s);
-		return value == false ? null : value;
-	}
-
-	public static inline function putEnv( s : String, v : String ) : Void {
-		Global.putenv('$s=$v');
-	}
-
-	public static inline function sleep( seconds : Float ) : Void {
-		return Global.usleep(Std.int(seconds * 1000000));
-	}
-
-	public static inline function setTimeLocale( loc : String ) : Bool {
-		return Global.setlocale(Const.LC_TIME, loc) != false;
-	}
-
-	public static function getCwd() : String {
-		var cwd = Global.getcwd();
-		if (cwd == false) return null;
-		var l = (cwd:String).substr(-1);
-		return (cwd:String) + (l == '/' || l == '\\' ? '' : '/');
-	}
-
-	public static inline function setCwd( s : String ) : Void {
-		Global.chdir(s);
-	}
-
-	public static function systemName() : String {
-		var s = Global.php_uname('s');
-		var p = s.indexOf(" ");
-		return (p >= 0 ? s.substr(0, p) : s);
-	}
-
-	public static function command( cmd : String, ?args : Array<String> ) : Int {
-		if (args != null) {
-			switch (systemName()) {
-				case "Windows":
-					cmd = [
-						for (a in [StringTools.replace(cmd, "/", "\\")].concat(args))
-						StringTools.quoteWinArg(a, true)
-					].join(" ");
-				case _:
-					cmd = [cmd].concat(args).map(StringTools.quoteUnixArg).join(" ");
-			}
-		}
-		var result = Boot.deref(0);
-		Global.system(cmd, result);
-		return result;
-	}
-
-	public static inline function exit( code : Int ) : Void {
-		Global.exit(code);
-	}
-
-	public static inline function time() : Float {
-		return Global.microtime(true);
-	}
-
-	public static function cpuTime() : Float {
-		return time() - SuperGlobal._SERVER['REQUEST_TIME'];
-	}
-
-	@:deprecated("Use programPath instead") public static inline function executablePath() : String {
-		return SuperGlobal._SERVER['SCRIPT_FILENAME'];
-	}
-
-	// It has to be initialized before any call to Sys.setCwd()...
-	static var _programPath = sys.FileSystem.fullPath(SuperGlobal._SERVER['SCRIPT_FILENAME']);
-	public static function programPath() : String {
-		return _programPath;
-	}
-
-	public static function environment() : Map<String,String> {
-		return php.Lib.hashOfAssociativeArray(SuperGlobal._SERVER);
-	}
-
-	public static function stdin() : haxe.io.Input {
-		var p = Global.defined('STDIN') ? Const.STDIN : Global.fopen('php://stdin', 'r');
-		return @:privateAccess new FileInput(p);
-	}
-
-	public static function stdout() : haxe.io.Output {
-		var p = Global.defined('STDOUT') ? Const.STDOUT : Global.fopen('php://stdout', 'w');
-		return @:privateAccess new FileOutput(p);
-	}
-
-	public static function stderr() : haxe.io.Output {
-		var p = Global.defined('STDERR') ? Const.STDERR : Global.fopen('php://stderr', 'w');
-		return @:privateAccess new FileOutput(p);
-	}
-
-	public static function getChar( echo : Bool ) : Int {
-		var c = Global.fgetc(Const.STDIN);
-		if (c == false) {
-			return 0;
-		} else {
-			if(echo) Global.echo(c);
-			return Global.ord(c);
-		}
-	}
-
-}
diff --git a/std/php7/_std/Type.hx b/std/php7/_std/Type.hx
deleted file mode 100644
index a75c0974d6883894c3003da88929f5133059a1ab..0000000000000000000000000000000000000000
--- a/std/php7/_std/Type.hx
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright (C)2005-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.
- */
-
-import php.*;
-import php.reflection.*;
-import haxe.extern.EitherType;
-
-using php.Global;
-
-enum ValueType {
-	TNull;
-	TInt;
-	TFloat;
-	TBool;
-	TObject;
-	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
-	TUnknown;
-}
-
-@:coreApi class Type {
-
-	public static function getClass<T>( o : T ) : Class<T> {
-		if(Global.is_object(o) && !Boot.isClass(o) && !Boot.isEnumValue(o)) {
-			var cls = Boot.getClass(Global.get_class(cast o));
-			return (cls == Boot.getHxAnon() ? null : cast cls);
-		} else if(Global.is_string(o)) {
-			return cast String;
-		} else {
-			return null;
-		}
-	}
-
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic> {
-		if(o == null) return null;
-		return cast Boot.getClass(Global.get_class(cast o));
-	}
-
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic> {
-		if(c == null) return null;
-		var parentClass = Global.get_parent_class((cast c).phpClassName);
-		if(!parentClass) return null;
-		return cast Boot.getClass(parentClass);
-	}
-
-	public static function getClassName( c : Class<Dynamic> ) : String {
-		if(c == null) return null;
-		return Boot.getHaxeName(cast c);
-	}
-
-	public static function getEnumName( e : Enum<Dynamic> ) : String {
-		return getClassName(cast e);
-	}
-
-	public static function resolveClass( name : String ) : Class<Dynamic> {
-		if (name == null) return null;
-		switch(name) {
-			case 'Dynamic': return cast Dynamic;
-			case 'Int': return cast Int;
-			case 'Float': return cast Float;
-			case 'Bool':  return cast Bool;
-			case 'String': return String;
-			case 'Class': return cast Class;
-			case 'Enum': return cast Enum;
-		}
-
-		var phpClass = Boot.getPhpName(name);
-		if (!Global.class_exists(phpClass) && !Global.interface_exists(phpClass)) return null;
-
-		var hxClass = Boot.getClass(phpClass);
-
-		return cast hxClass;
-	}
-
-	public static function resolveEnum( name : String ) : Enum<Dynamic> {
-		if (name == null) return null;
-		if (name == 'Bool') return cast Bool;
-
-		var phpClass = Boot.getPhpName(name);
-		if (!Global.class_exists(phpClass)) return null;
-
-		var hxClass = Boot.getClass(phpClass);
-
-		return cast hxClass;
-	}
-
-	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T {
-		if (String == cast cl) return args[0];
-
-		var phpName = getPhpName(cl);
-		if (phpName == null) return null;
-		var nativeArgs:NativeArray = @:privateAccess args.arr;
-		return Syntax.construct(phpName, Syntax.splat(nativeArgs));
-	}
-
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T {
-		if (String == cast cl) return cast '';
-		if (Array == cast cl) return cast [];
-
-		var phpName = getPhpName(cl);
-		if (phpName == null) return null;
-
-		var reflection = new ReflectionClass(phpName);
-		return reflection.newInstanceWithoutConstructor();
-	}
-
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		if (e == null || constr == null) return null;
-
-		var phpName = getPhpName(e);
-		if (phpName == null) return null;
-
-		if (!Global.in_array(constr, Syntax.staticCall(phpName, "__hx__list"))) {
-			throw 'No such constructor $constr';
-		}
-
-		var paramsCounts:NativeAssocArray<Int> = Syntax.staticCall(phpName, "__hx__paramsCount");
-		if ((params == null && paramsCounts[constr] != 0) || (params != null && params.length != paramsCounts[constr])) {
-			throw 'Provided parameters count does not match expected parameters count';
-		}
-
-		if (params == null) {
-			return Syntax.staticCall(phpName, constr);
-		} else {
-			var nativeArgs:NativeArray = @:privateAccess params.arr;
-			return Syntax.staticCall(phpName, constr, Syntax.splat(nativeArgs));
-		}
-	}
-
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
-		if (e == null || index == null) return null;
-
-		var phpName = getPhpName(e);
-		if (phpName == null) return null;
-
-		var constructors:NativeIndexedArray<String> = Syntax.staticCall(phpName, "__hx__list");
-		if (index < 0 || index >= Global.count(constructors)) {
-			throw '$index is not a valid enum constructor index';
-		}
-
-		var constr = constructors[index];
-		var paramsCounts:NativeAssocArray<Int> = Syntax.staticCall(phpName, "__hx__paramsCount");
-		if ((params == null && paramsCounts[constr] != 0) || (params != null && params.length != paramsCounts[constr])) {
-			throw 'Provided parameters count does not match expected parameters count';
-		}
-
-		if (params == null) {
-			return Syntax.staticCall(phpName, constr);
-		} else {
-			var nativeArgs:NativeArray = @:privateAccess params.arr;
-			return Syntax.staticCall(phpName, constr, Syntax.splat(nativeArgs));
-		}
-	}
-
-	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String> {
-		if (c == null) return null;
-		if (c == String) {
-			return [
-				'substr', 'charAt', 'charCodeAt', 'indexOf',
-				'lastIndexOf', 'split', 'toLowerCase',
-				'toUpperCase', 'toString', 'length'
-			];
-		}
-
-		var phpName = getPhpName(c);
-		if (phpName == null) return null;
-
-		var reflection = new ReflectionClass(phpName);
-
-		var methods = new NativeArray();
-		for (m in reflection.getMethods()) {
-			var method:ReflectionMethod = m;
-			if (!method.isStatic()) {
-				var name = method.getName();
-				if (!isServiceFieldName(name)) {
-					methods.array_push(name);
-				}
-			}
-		}
-
-		var properties = new NativeArray();
-		for (p in reflection.getProperties()) {
-			var property:ReflectionProperty = p;
-			if (!property.isStatic()) {
-				var name = property.getName();
-				if (!isServiceFieldName(name)) {
-					properties.array_push(name);
-				}
-			}
-		}
-		properties = Global.array_diff(properties, methods);
-
-		var fields = Global.array_merge(properties, methods);
-
-		return @:privateAccess Array.wrap(fields);
-	}
-
-	public static function getClassFields( c : Class<Dynamic> ) : Array<String> {
-		if (c == null) return null;
-		if (c == String) return ['fromCharCode'];
-
-		var phpName = getPhpName(c);
-		if (phpName == null) return null;
-
-		var reflection = new ReflectionClass(phpName);
-
-		var methods = new NativeArray();
-		for (m in reflection.getMethods(ReflectionMethod.IS_STATIC)) {
-			//TODO: report an issue on invalid type inference for iteration over `NativeIndexedArray`
-			var m:ReflectionMethod = m;
-			var name = m.getName();
-			if (!isServiceFieldName(name) && phpName == m.getDeclaringClass().getName()) {
-				methods.array_push(name);
-			}
-		}
-
-		var properties = new NativeArray();
-		for (p in reflection.getProperties(ReflectionProperty.IS_STATIC)) {
-			var p:ReflectionMethod = p;
-			var name = p.getName();
-			if (!isServiceFieldName(name) && phpName == p.getDeclaringClass().getName()) {
-				properties.array_push(name);
-			}
-		}
-		properties = Global.array_diff(properties, methods);
-		var fields = Global.array_merge(properties, methods);
-
-		return @:privateAccess Array.wrap(fields);
-	}
-
-	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> {
-		if (e == null) return null;
-		return @:privateAccess Array.wrap(untyped e.__hx__list());
-	}
-
-	public static function typeof( v : Dynamic ) : ValueType {
-		if (v == null) return TNull;
-
-		if (v.is_object()) {
-			if (Reflect.isFunction(v)) return TFunction;
-			if (Std.is(v, StdClass)) return TObject;
-			if (Boot.isClass(v)) return TObject;
-
-			var hxClass = Boot.getClass(Global.get_class(v));
-			if (Boot.isEnumValue(v)) return TEnum(cast hxClass);
-			return TClass(cast hxClass);
-		}
-
-		if (v.is_bool()) return TBool;
-		if (v.is_int()) return TInt;
-		if (v.is_float()) return TFloat;
-		if (v.is_string()) return TClass(String);
-
-		return TUnknown;
-	}
-
-	public static function enumEq<T:EnumValue>( a : T, b : T ) : Bool {
-		if (a == b) return true;
-		if (a == null || b == null) return false;
-
-		try {
-			if (Global.get_class(cast a) != Global.get_class(cast b)) return false;
-			if (enumIndex(a) != enumIndex(b)) return false;
-
-			var aParams:NativeIndexedArray<Dynamic> = untyped a.params;
-			var bParams:NativeIndexedArray<Dynamic> = untyped b.params;
-			for (i in 0...Global.count(aParams)) {
-				//enums
-				if (Boot.isEnumValue(aParams[i])) {
-					if (!enumEq(aParams[i], bParams[i])) {
-						return false;
-					}
-					continue;
-				}
-				//functions
-				if (Reflect.isFunction(aParams[i])) {
-					if (!Reflect.compareMethods(aParams[i], bParams[i])) {
-						return false;
-					}
-					continue;
-				}
-				//everything else
-				if (aParams[i] != bParams[i]) {
-					return false;
-				}
-			}
-
-			return true;
-		} catch (e:Dynamic) {
-			return false;
-		}
-	}
-
-	public static function enumConstructor( e : EnumValue ) : String {
-		return untyped e.tag;
-	}
-
-	public inline static function enumParameters( e : EnumValue ) : Array<Dynamic> {
-		return @:privateAccess Array.wrap(untyped e.params);
-	}
-
-	public inline static function enumIndex( e : EnumValue ) : Int {
-		return untyped e.index;
-	}
-
-	public static function allEnums<T>( e : Enum<T> ) : Array<T> {
-		if (e == null) return null;
-
-		var phpName = getPhpName(e);
-		if (phpName == null) return null;
-
-		var result = [];
-
-		for (name in getEnumConstructs(e)) {
-			var reflection = new ReflectionMethod(phpName, name);
-			if (reflection.getNumberOfParameters() == 0) {
-				result.push(reflection.invoke(null));
-			}
-		}
-
-		return result;
-	}
-
-	/**
-		Get corresponding PHP name for specified `type`.
-		Returns `null` if `type` does not exist.
-	**/
-	static function getPhpName( type:EitherType<Class<Dynamic>,Enum<Dynamic>> ) : Null<String> {
-		var haxeName = Boot.getHaxeName(cast type);
-
-		return (haxeName == null ? null : Boot.getPhpName(haxeName));
-	}
-
-	/**
-		check if specified `name` is a special field name generated by compiler.
-	 **/
-	static inline function isServiceFieldName(name:String) : Bool {
-		return (name == '__construct' || name.indexOf('__hx__') == 0);
-	}
-}
-
diff --git a/std/php7/_std/haxe/Json.hx b/std/php7/_std/haxe/Json.hx
deleted file mode 100644
index 0ba16010d4f73636d2d272fe628cceac2651f455..0000000000000000000000000000000000000000
--- a/std/php7/_std/haxe/Json.hx
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C)2005-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 haxe;
-
-import php.*;
-import haxe.format.JsonPrinter;
-
-@:coreApi
-class Json {
-
-	public static inline function parse( text : String ) : Dynamic {
-		#if haxeJSON
-			return haxe.format.JsonParser.parse(text);
-		#else
-			return phpJsonDecode(text);
-		#end
-	}
-
-	public static inline function stringify( value : Dynamic, ?replacer:Dynamic -> Dynamic -> Dynamic, ?space:String ) : String {
-		#if haxeJSON
-			return JsonPrinter.print(value, replacer, space);
-		#else
-			return phpJsonEncode(value, replacer, space);
-		#end
-	}
-
-	static function phpJsonDecode(json:String):Dynamic {
-		var value = Global.json_decode(json);
-		if (value == null && Global.json_last_error() != Const.JSON_ERROR_NONE) {
-			throw Global.json_last_error_msg();
-		}
-		return convertAfterDecode(value);
-	}
-
-	static function convertAfterDecode(value:Dynamic):Dynamic {
-		if (Global.is_object(value)) {
-			var result = new NativeAssocArray();
-			var data = Syntax.array(value);
-			Syntax.foreach(data, function(fieldName:String, fieldValue:Dynamic) {
-				result[fieldName] = convertAfterDecode(fieldValue);
-			});
-
-			return Boot.createAnon(result);
-		}
-
-		if (Global.is_array(value)) {
-			var result = new NativeIndexedArray();
-			Syntax.foreach(value, function(index:Int, item:Dynamic) {
-				result[index] = convertAfterDecode(item);
-			});
-
-			return @:privateAccess Array.wrap(result);
-		}
-
-		return value;
-	}
-
-	static function phpJsonEncode(value:Dynamic, ?replacer:Dynamic -> Dynamic -> Dynamic, ?space:String):String {
-		if(null != replacer || null != space) {
-			return JsonPrinter.print(value, replacer, space);
-		}
-
-		var json = Global.json_encode(convertBeforeEncode(value));
-		if (Global.json_last_error() != Const.JSON_ERROR_NONE) {
-			return throw Global.json_last_error_msg();
-		}
-		return json;
-	}
-
-	static function convertBeforeEncode(value:Dynamic):Dynamic {
-		if (Std.is(value, Array)) {
-			var result = new NativeIndexedArray();
-			Syntax.foreach(value.arr, function(index:Int, item:Dynamic) {
-				result[index] = convertBeforeEncode(item);
-			});
-
-			return result;
-		}
-
-		if (Global.is_object(value)) {
-			var result = {};
-			Syntax.foreach(value, function(fieldName:String, fieldValue:Dynamic) {
-				Syntax.setField(result, fieldName, convertBeforeEncode(fieldValue));
-			});
-
-			return result;
-		}
-
-		if (Global.is_float(value) && !Global.is_finite(value)) {
-			return null;
-		}
-
-		return value;
-	}
-}
\ No newline at end of file
diff --git a/std/php7/_std/haxe/Resource.hx b/std/php7/_std/haxe/Resource.hx
deleted file mode 100644
index e31c78d3a539bbce4be82a67bfac72dfac57ab6d..0000000000000000000000000000000000000000
--- a/std/php7/_std/haxe/Resource.hx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C)2005-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 haxe;
-
-import php.*;
-import haxe.io.Bytes;
-import haxe.crypto.Base64;
-
-@:coreApi
-class Resource {
-
-	static function cleanName(name : String) : String {
-		return ~/[\\\/:?"*<>|]/.replace(name, '_');
-	}
-
-	static function getDir() : String {
-		return Global.dirname(Const.__FILE__) + "/../../res";
-	}
-
-	@:access(haxe.io.Path.escape)
-	static function getPath(name : String) : String {
-		return getDir()+'/'+haxe.io.Path.escape(name);
-	}
-
-	@:access(haxe.io.Path.unescape)
-	public static function listNames() : Array<String> {
-		var a = sys.FileSystem.readDirectory(getDir());
-		if(a[0] == '.') a.shift();
-		if(a[0] == '..') a.shift();
-		return a.map(function(s) return haxe.io.Path.unescape(s));
-	}
-
-	public static function getString( name : String ) : String {
-		var path = getPath(name);
-		return if (!sys.FileSystem.exists(path))
-			null;
-		else
-			sys.io.File.getContent(path);
-	}
-
-	public static function getBytes( name : String ) : haxe.io.Bytes {
-		var path = getPath(name);
-		return if (!sys.FileSystem.exists(path))
-			null;
-		else
-			sys.io.File.getBytes(path);
-	}
-
-}
diff --git a/std/php7/_std/haxe/Utf8.hx b/std/php7/_std/haxe/Utf8.hx
deleted file mode 100644
index 2f8b61b10900ee1fc17ccfacf22ba7a96e27b436..0000000000000000000000000000000000000000
--- a/std/php7/_std/haxe/Utf8.hx
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C)2005-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 haxe;
-
-import php.Global;
-
-@:coreApi
-class Utf8 {
-
-	var __b : String;
-
-	public function new( ?size : Int ) : Void {
-		__b = '';
-	}
-
-	public function addChar( c : Int ) : Void {
-		__b += uchr(c);
-	}
-
-	public function toString() : String {
-		return __b;
-	}
-
-	public static function encode( s : String ) : String {
-		return Global.utf8_encode(s);
-	}
-
-	public static function decode( s : String ) : String {
-		return Global.utf8_decode(s);
-	}
-
-	public static function iter(s : String, chars : Int -> Void ) : Void {
-		var len = length(s);
-		for(i in 0...len) {
-			chars(charCodeAt(s, i));
-		}
-	}
-
-	public static function charCodeAt( s : String, index : Int ) : Int {
-		return uord(sub(s, index, 1));
-	}
-
-	static function uchr(i : Int) : String {
-		return Global.mb_convert_encoding(Global.pack('N', i), 'UTF-8', 'UCS-4BE');
-	}
-
-	static function uord(s : String) : Int {
-		var c = Global.unpack('N', Global.mb_convert_encoding(s, 'UCS-4BE', 'UTF-8'));
-		return c[1];
-	}
-
-	public static function validate( s : String ) : Bool {
-		return Global.mb_check_encoding(s, enc);
-	}
-
-	public static function length( s : String ) : Int {
-		return Global.mb_strlen(s, enc);
-	}
-
-	public static function compare( a : String, b : String ) : Int {
-		return Global.strcmp(a, b);
-	}
-
-	public static function sub( s : String, pos : Int, len : Int ) : String {
-		return Global.mb_substr(s, pos, len, enc);
-	}
-
-	private static inline var enc = "UTF-8";
-}
\ No newline at end of file
diff --git a/std/php7/_std/haxe/ds/IntMap.hx b/std/php7/_std/haxe/ds/IntMap.hx
deleted file mode 100644
index a19df22ac6bf1d148940e215d14ede6ec180aeb7..0000000000000000000000000000000000000000
--- a/std/php7/_std/haxe/ds/IntMap.hx
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C)2005-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 haxe.ds;
-
-import php.Syntax;
-import php.Global;
-import php.NativeArray;
-import php.NativeIndexedArray;
-
-@:coreApi class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
-
-	var data:NativeIndexedArray<T>;
-
-	/**
-		Creates a new IntMap.
-	**/
-	public function new() : Void {
-		data = new NativeIndexedArray();
-	}
-
-	/**
-		See `Map.set`
-	**/
-	public inline function set( key : Int, value : T ) : Void {
-		data[key] = value;
-	}
-
-	/**
-		See `Map.get`
-	**/
-	public inline function get( key : Int ) : Null<T> {
-		return Syntax.binop(data[key], '??', null);
-	}
-
-	/**
-		See `Map.exists`
-	**/
-	public inline function exists( key : Int ) : Bool {
-		return Global.array_key_exists(key, data);
-	}
-
-	/**
-		See `Map.remove`
-	**/
-	public function remove( key : Int ) : Bool {
-		if (Global.array_key_exists(key, data)) {
-			Global.unset(data[key]);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-		See `Map.keys`
-	**/
-	public inline function keys() : Iterator<Int> {
-		return Global.array_keys(data).iterator();
-	}
-
-	/**
-		See `Map.iterator`
-	**/
-	public inline function iterator() : Iterator<T> {
-		return Global.array_values(data).iterator();
-	}
-
-	/**
-		See `Map.toString`
-	**/
-	public function toString() : String {
-		var parts = new NativeArray();
-		Syntax.foreach(data, function(key:Int, value:T) {
-			Global.array_push(parts, '$key => ' + Std.string(value));
-		});
-
-		return '{' + Global.implode(', ', parts) + '}';
-	}
-}
diff --git a/std/php7/_std/haxe/ds/ObjectMap.hx b/std/php7/_std/haxe/ds/ObjectMap.hx
deleted file mode 100644
index f42a6d97cc4dcc2a3cc62b0c42556814f9250838..0000000000000000000000000000000000000000
--- a/std/php7/_std/haxe/ds/ObjectMap.hx
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C)2005-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 haxe.ds;
-
-import php.*;
-
-@:coreApi
-class ObjectMap <K:{ }, V> implements haxe.Constraints.IMap<K,V> {
-	var _keys:NativeAssocArray<K>;
-	var _values:NativeAssocArray<V>;
-
-	public function new():Void {
-		_keys = new NativeAssocArray();
-		_values = new NativeAssocArray();
-	}
-
-	public function set(key:K, value:V):Void {
-		var id = Global.spl_object_hash(key);
-		_keys[id] = key;
-		_values[id] = value;
-	}
-
-	public function get(key:K):Null<V> {
-		var id = Global.spl_object_hash(key);
-		return Global.isset(_values[id]) ? _values[id] : null;
-	}
-
-	public function exists(key:K):Bool {
-		return Global.array_key_exists(Global.spl_object_hash(key), _values);
-	}
-
-	public function remove( key : K ) : Bool {
-		var id = Global.spl_object_hash(key);
-		if (Global.array_key_exists(id, _values)) {
-			Global.unset(_keys[id], _values[id]);
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public inline function keys() : Iterator<K> {
-		return _keys.iterator();
-	}
-
-	public inline function iterator() : Iterator<V> {
-		return _values.iterator();
-	}
-
-	public function toString() : String {
-		var s = "{";
-		var it = keys();
-		for( i in it ) {
-			s += Std.string(i);
-			s += " => ";
-			s += Std.string(get(i));
-			if( it.hasNext() )
-				s += ", ";
-		}
-		return s + "}";
-	}
-}
\ No newline at end of file
diff --git a/std/php7/_std/haxe/ds/StringMap.hx b/std/php7/_std/haxe/ds/StringMap.hx
deleted file mode 100644
index 68718ecd7b3602f4120dddb10d58237dbed44051..0000000000000000000000000000000000000000
--- a/std/php7/_std/haxe/ds/StringMap.hx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C)2005-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 haxe.ds;
-
-import php.Syntax;
-import php.Global;
-import php.NativeArray;
-import php.NativeAssocArray;
-import haxe.Constraints;
-
-@:coreApi class StringMap<T> implements IMap<String,T> {
-	private var data : NativeAssocArray<T>;
-
-	public inline function new() : Void {
-		data = new NativeAssocArray();
-	}
-
-	public inline function set( key : String, value : T ) : Void {
-		data[key] = value;
-	}
-
-	public inline function get( key : String ) : Null<T> {
-		return Syntax.binop(data[key], '??', null);
-	}
-
-	public inline function exists( key : String ) : Bool {
-		return Global.array_key_exists(key, data);
-	}
-
-	public function remove( key : String ) : Bool {
-		if (Global.array_key_exists(key, data)) {
-			Global.unset(data[key]);
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public inline function keys() : Iterator<String> {
-		return Global.array_map('strval', Global.array_keys(data)).iterator();
-	}
-
-	public inline function iterator() : Iterator<T> {
-		return data.iterator();
-	}
-
-	public function toString() : String {
-		var parts = new NativeArray();
-		Syntax.foreach(data, function(key:String, value:T) {
-			Global.array_push(parts, '$key => ' + Std.string(value));
-		});
-
-		return '{' + Global.implode(', ', parts) + '}';
-	}
-}
diff --git a/std/php7/_std/haxe/io/Bytes.hx b/std/php7/_std/haxe/io/Bytes.hx
deleted file mode 100644
index 3733785f42e41e5b40f709fad148a5b198ba4b73..0000000000000000000000000000000000000000
--- a/std/php7/_std/haxe/io/Bytes.hx
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (C)2005-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 haxe.io;
-
-class Bytes {
-
-	public var length(default,null) : Int;
-
-	var b:BytesData;
-
-	function new(length:Int, b:BytesData) : Void {
-		this.length = length;
-		this.b = b;
-	}
-
-	public inline function get( pos : Int ) : Int {
-		return b.get(pos);
-	}
-
-	public inline function set( pos : Int, v : Int ) : Void {
-		b.set(pos, v);
-	}
-
-	public inline function blit( pos : Int, src : Bytes, srcpos : Int, len : Int ) : Void {
-		if( pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length ) {
-			throw Error.OutsideBounds;
-		} else {
-			b.blit(pos, src.b, srcpos, len);
-		}
-	}
-
-	public function fill( pos : Int, len : Int, value : Int ) : Void {
-		for(i in pos...pos+len) b.set(i, value);
-	}
-
-	public inline function sub( pos : Int, len : Int ) : Bytes {
-		if( pos < 0 || len < 0 || pos + len > length ) {
-			throw Error.OutsideBounds;
-		} else {
-			return new Bytes(len, b.sub(pos, len));
-		}
-	}
-
-	public inline function compare( other : Bytes ) : Int {
-		return b.compare(other.b);
-	}
-
-	/**
-		Returns the IEEE double precision value at given position (in low endian encoding).
-		Result is unspecified if reading outside of the bounds
-	**/
-	public function getDouble( pos : Int ) : Float {
-		return FPHelper.i64ToDouble(getInt32(pos),getInt32(pos+4));
-	}
-
-	/**
-		Returns the IEEE single precision value at given position (in low endian encoding).
-		Result is unspecified if reading outside of the bounds
-	**/
-	public function getFloat( pos : Int ) : Float {
-		var b = new haxe.io.BytesInput(this,pos,4);
-		return b.readFloat();
-	}
-
-	/**
-		Store the IEEE double precision value at given position in low endian encoding.
-		Result is unspecified if writing outside of the bounds.
-	**/
-	public function setDouble( pos : Int, v : Float ) : Void {
-		var i = FPHelper.doubleToI64(v);
-		setInt32(pos, i.low);
-		setInt32(pos + 4, i.high);
-	}
-
-	/**
-		Store the IEEE single precision value at given position in low endian encoding.
-		Result is unspecified if writing outside of the bounds.
-	**/
-	public function setFloat( pos : Int, v : Float ) : Void {
-		setInt32(pos, FPHelper.floatToI32(v));
-	}
-
-	/**
-		Returns the 16 bit unsigned integer at given position (in low endian encoding).
-	**/
-	public inline function getUInt16( pos : Int ) : Int {
-		return get(pos) | (get(pos + 1) << 8);
-	}
-
-	/**
-		Store the 16 bit unsigned integer at given position (in low endian encoding).
-	**/
-	public inline function setUInt16( pos : Int, v : Int ) : Void {
-		set(pos, v);
-		set(pos + 1, v >> 8);
-	}
-
-	/**
-		Returns the 32 bit integer at given position (in low endian encoding).
-	**/
-	public inline function getInt32( pos : Int ) : Int {
-		var v = get(pos) | (get(pos + 1) << 8) | (get(pos + 2) << 16) | (get(pos+3) << 24);
-		return if( v & 0x80000000 != 0 ) v | 0x80000000 else v;
-	}
-
-	/**
-		Returns the 64 bit integer at given position (in low endian encoding).
-	**/
-	public inline function getInt64( pos : Int ) : haxe.Int64 {
-		return haxe.Int64.make(getInt32(pos+4), getInt32(pos));
-	}
-
-	/**
-		Store the 32 bit integer at given position (in low endian encoding).
-	**/
-	public inline function setInt32( pos : Int, v : Int ) : Void {
-		set(pos, v);
-		set(pos + 1, v >> 8);
-		set(pos + 2, v >> 16);
-		set(pos + 3, v >>> 24);
-	}
-
-	/**
-		Store the 64 bit integer at given position (in low endian encoding).
-	**/
-	public inline function setInt64( pos : Int, v : haxe.Int64 ) : Void {
-		setInt32(pos, v.low);
-		setInt32(pos + 4, v.high);
-	}
-
-	public inline function getString( pos : Int, len : Int ) : String {
-		if( pos < 0 || len < 0 || pos + len > length ) {
-			throw Error.OutsideBounds;
-		} else {
-			return b.getString(pos, len);
-		}
-	}
-
-	@:deprecated("readString is deprecated, use getString instead")
-	@:noCompletion
-	public inline function readString(pos:Int, len:Int):String {
-		return getString(pos, len);
-	}
-
-	public function toString() : String {
-		return b;
-	}
-
-	public function toHex() : String {
-		var s = new StringBuf();
-		var chars = [];
-		var str = "0123456789abcdef";
-		for( i in 0...str.length )
-			chars.push(str.charCodeAt(i));
-		for( i in 0...length ) {
-			var c = get(i);
-			s.addChar(chars[c >> 4]);
-			s.addChar(chars[c & 15]);
-		}
-		return s.toString();
-	}
-
-	public inline function getData() : BytesData {
-		return b;
-	}
-
-	public static function alloc( length : Int ) : Bytes {
-		return new Bytes(length, BytesData.alloc(length));
-	}
-
-	public static inline function ofString( s : String ) : Bytes {
-		return new Bytes(s.length, s);
-	}
-
-	public static inline function ofData( b : BytesData ) : Bytes {
-		return new Bytes(b.length, b);
-	}
-
-	/**
-		Read the most efficiently possible the n-th byte of the data.
-		Behavior when reading outside of the available data is unspecified.
-	**/
-	public inline static function fastGet( b : BytesData, pos : Int ) : Int {
-		return b.get(pos);
-	}
-
-}
diff --git a/std/php7/_std/sys/FileSystem.hx b/std/php7/_std/sys/FileSystem.hx
deleted file mode 100644
index e5cbb8d7636d6b1d36bf035518fe46ea3b94e0c1..0000000000000000000000000000000000000000
--- a/std/php7/_std/sys/FileSystem.hx
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C)2005-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 sys;
-
-import php.*;
-import haxe.io.Path;
-
-private enum FileKind {
-	kdir;
-	kfile;
-	kother( k : String );
-}
-
-@:coreApi
-class FileSystem {
-
-	public static inline function exists( path : String ) : Bool {
-		return Global.file_exists(path);
-	}
-
-	public static inline function rename( path : String, newPath : String ) : Void {
-		Global.rename(path, newPath);
-	}
-
-	public static function stat( path : String ) : FileStat {
-		var info = Global.stat(path);
-		if (info == false) throw 'Unable to stat $path';
-		var info:NativeArray = info;
-
-		return {
-			gid   : info['gid'],
-			uid   : info['uid'],
-			atime : Date.fromTime(info['atime'] * 1000),
-			mtime : Date.fromTime(info['mtime'] * 1000),
-			ctime : Date.fromTime(info['ctime'] * 1000),
-			dev   : info['dev'],
-			ino   : info['ino'],
-			nlink : info['nlink'],
-			rdev  : info['rdev'],
-			size  : info['size'],
-			mode  : info['mode']
-		};
-	}
-
-	public static inline function fullPath( relPath : String ) : String {
-		return (Syntax.binop(Global.realpath(relPath), "?:", null));
-	}
-
-	public static function absolutePath ( relPath : String ) : String {
-		if (Path.isAbsolute(relPath)) return relPath;
-		return Path.join([Sys.getCwd(), relPath]);
-	}
-
-	static function kind( path : String ) : FileKind {
-		var kind = Global.filetype(path);
-		if (kind == false) throw 'Failed to check file type $path';
-
-		switch(kind) {
-			case "file": return kfile;
-			case "dir": return kdir;
-			default: return kother(kind);
-		}
-	}
-
-	public static inline function isDirectory( path : String ) : Bool {
-		return Global.is_dir(path);
-	}
-
-	public static inline function createDirectory( path : String ) : Void {
-		Global.mkdir(path, 493, true);
-	}
-
-	public static inline function deleteFile( path : String ) : Void {
-		Global.unlink(path);
-	}
-
-	public static inline function deleteDirectory( path : String ) : Void {
-		Global.rmdir(path);
-	}
-
-	public static function readDirectory( path : String ) : Array<String> {
-		var list = [];
-		var dir = Global.opendir(path);
-		var file;
-		while ((file = Global.readdir(dir)) != false) {
-			if (file != '.' && file != '..') {
-				list.push(file);
-			}
-		}
-		Global.closedir(dir);
-        return list;
-	}
-}
diff --git a/std/php7/_std/sys/db/Mysql.hx b/std/php7/_std/sys/db/Mysql.hx
deleted file mode 100644
index 97384cfc2f3df639aee5f5b88846cd3dd07a94ca..0000000000000000000000000000000000000000
--- a/std/php7/_std/sys/db/Mysql.hx
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.db;
-
-import php.*;
-import sys.db.*;
-import php.db.*;
-import php.db.Mysqli_result;
-
-@:coreApi class Mysql {
-	public static function connect(
-		params : {
-			host : String,
-			?port : Int,
-			user : String,
-			pass : String,
-			?socket : String,
-			database : String
-		}
-	) : Connection {
-		return new MysqlConnection(params);
-	}
-}
-
-private class MysqlConnection implements Connection {
-	var db : Mysqli;
-
-	public function new(
-		params : {
-			host : String,
-			?port : Int,
-			user : String,
-			pass : String,
-			?socket : String,
-			database : String
-		}
-	) : Void {
-		if (params.port == null) params.port = Std.parseInt(Global.ini_get('mysqli.default_port'));
-		if (params.socket == null) params.socket = Global.ini_get('mysqli.default_socket');
-
-		db = new Mysqli(params.host, params.user, params.pass, params.database, params.port, params.socket);
-	}
-
-	public function request( s : String ) : ResultSet {
-		var result = db.query(s);
-		if (result == false) throw 'Failed to perform db query';
-		if (result == true) return null;
-
-		return new MysqlResultSet(result);
-	}
-
-	public function close() : Void {
-		db.close();
-	}
-
-	public function escape( s : String ) : String {
-		return db.escape_string(s);
-	}
-
-	public function quote( s : String ) : String {
-		if (s.indexOf("\000") >= 0) return "x'" + Global.bin2hex(s) + "'";
-		return "'" + db.escape_string(s) + "'";
-	}
-
-	public function addValue( s : StringBuf, v : Dynamic ) : Void {
-		if (Global.is_int(v)
-		|| Global.is_null(v)) {
-			s.add(v);
-		} else if (Global.is_bool(v)) {
-			s.add(v ? 1 : 0);
-		} else {
-			s.add(quote(Std.string(v)));
-		}
-	}
-
-	public function lastInsertId() : Int {
-		return db.insert_id;
-	}
-
-	public function dbName() : String {
-		return 'MySQL';
-	}
-
-	public function startTransaction() : Void {
-		var success = db.begin_transaction();
-		if (!success) throw 'Failed to start transaction';
-	}
-
-	public function commit() : Void {
-		var success = db.commit();
-		if (!success) throw 'Failed to commit transaction';
-	}
-
-	public function rollback() : Void {
-		var success = db.rollback();
-		if (!success) throw 'Failed to rollback transaction';
-	}
-
-}
-
-private class MysqlResultSet implements ResultSet {
-	static var hxAnonClassName = Boot.getHxAnon().phpClassName;
-
-	public var length(get,null) : Int;
-	public var nfields(get,null) : Int;
-
-	var result:Mysqli_result;
-	var fetchedRow:NativeAssocArray<Scalar>;
-	var fieldsInfo:NativeAssocArray<MysqliFieldInfo>;
-
-	public function new( result:Mysqli_result ) {
-		this.result = result;
-	}
-
-	public function hasNext() : Bool {
-		if (fetchedRow == null) fetchNext();
-		return fetchedRow != null;
-	}
-
-	public function next() : Dynamic {
-		if (fetchedRow == null) fetchNext();
-		return withdrawFetched();
-	}
-
-	public function results() : List<Dynamic> {
-		var list = new List();
-
-		result.data_seek(0);
-		var row = result.fetch_object(hxAnonClassName);
-		while (row != null) {
-			row = correctObjectTypes(row);
-			list.add(row);
-			row = result.fetch_object(hxAnonClassName);
-		}
-
-		return list;
-	}
-
-	public function getResult( n : Int ) : String {
-		if (fetchedRow == null) fetchNext();
-		return Global.array_values(fetchedRow)[n];
-	}
-
-	public function getIntResult( n : Int ) : Int {
-		return Syntax.int(getResult(n));
-	}
-
-	public function getFloatResult( n : Int ) : Float {
-		return Syntax.float(getResult(n));
-	}
-
-	public function getFieldsNames() : Null<Array<String>> {
-		var fields = result.fetch_fields();
-		return [for (field in fields) field.name];
-	}
-
-	function fetchNext() {
-		var row = result.fetch_assoc();
-		if (row != null) fetchedRow = correctArrayTypes(row);
-	}
-
-	function withdrawFetched() : Dynamic {
-		if (fetchedRow == null) return null;
-		var row = fetchedRow;
-		fetchedRow = null;
-		return Boot.createAnon(row);
-	}
-
-	function correctArrayTypes(row:NativeAssocArray<String>):NativeAssocArray<Scalar> {
-		var fieldsInfo = getFieldsInfo();
-		Syntax.foreach(row, function(field:String, value:String) {
-			row[field] = correctType(value, fieldsInfo[field].type);
-		});
-		return cast row;
-	}
-
-	function correctObjectTypes(row:{}):{} {
-		var fieldsInfo = getFieldsInfo();
-		Syntax.foreach(row, function(field:String, value:String) {
-			value = correctType(value, fieldsInfo[field].type);
-			Syntax.setField(row, field, value);
-		});
-		return row;
-	}
-
-	inline function getFieldsInfo():NativeAssocArray<MysqliFieldInfo> {
-		if (fieldsInfo == null) {
-			fieldsInfo = cast Syntax.arrayDecl();
-			Syntax.foreach(result.fetch_fields(), function(_, info) {
-				fieldsInfo[info.name] = info;
-			});
-		}
-		return fieldsInfo;
-	}
-
-	function correctType(value:String, type:Int):Scalar {
-		if (value == null) return null;
-		if (
-			type == Const.MYSQLI_TYPE_BIT
-			|| type == Const.MYSQLI_TYPE_TINY
-			|| type == Const.MYSQLI_TYPE_SHORT
-			|| type == Const.MYSQLI_TYPE_LONG
-			|| type == Const.MYSQLI_TYPE_INT24
-			|| type == Const.MYSQLI_TYPE_CHAR
-		) {
-			return Syntax.int(value);
-		}
-		if (
-			type == Const.MYSQLI_TYPE_DECIMAL
-			|| type == Const.MYSQLI_TYPE_NEWDECIMAL
-			|| type == Const.MYSQLI_TYPE_FLOAT
-			|| type == Const.MYSQLI_TYPE_DOUBLE
-		) {
-			return Syntax.float(value);
-		}
-		return value;
-	}
-
-	function get_length() return result.num_rows;
-	function get_nfields() return result.field_count;
-}
diff --git a/std/php7/_std/sys/db/Sqlite.hx b/std/php7/_std/sys/db/Sqlite.hx
deleted file mode 100644
index 3bd93679f8bc900e4c8d2747ea5448ddf87253cb..0000000000000000000000000000000000000000
--- a/std/php7/_std/sys/db/Sqlite.hx
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.db;
-
-import php.*;
-import php.db.*;
-import sys.db.*;
-
-@:coreApi class Sqlite {
-	public static function open( file:String ) : Connection {
-		return new SQLiteConnection(file);
-	}
-}
-
-private class SQLiteConnection implements Connection {
-	var db:SQLite3;
-
-	public function new( file:String ) {
-		db = new SQLite3(file);
-		db.enableExceptions(true);
-	}
-
-	public function request( s : String ) : ResultSet {
-		var result = db.query(s);
-		return new SQLiteResultSet(result);
-	}
-
-	public function close() : Void {
-		db.close();
-	}
-
-	public function escape( s : String ) : String {
-		return SQLite3.escapeString(s);
-	}
-
-	public function quote( s : String ) : String {
-		if (s.indexOf("\000") >= 0) return "x'" + Global.bin2hex(s) + "'";
-		return "'" + SQLite3.escapeString(s) + "'";
-	}
-
-	public function addValue( s : StringBuf, v : Dynamic ) : Void {
-		if (Global.is_int(v) || Global.is_null(v)) {
-			s.add(v);
-		} else if (Global.is_bool(v)) {
-			s.add(v ? 1 : 0);
-		} else {
-			s.add(quote(Std.string(v)));
-		}
-	}
-
-	public function lastInsertId() : Int {
-		return Syntax.int(db.lastInsertRowID());
-	}
-
-	public function dbName() : String {
-		return 'SQLite';
-	}
-
-	public function startTransaction() : Void {
-		db.query('BEGIN TRANSACTION');
-	}
-
-	public function commit() : Void {
-		db.query('COMMIT');
-	}
-
-	public function rollback() : Void {
-		db.query('ROLLBACK');
-	}
-}
-
-private class SQLiteResultSet implements ResultSet {
-	public var length(get,null) : Int;
-	public var nfields(get,null) : Int;
-
-	var _length : Int = 0;
-	var _nfields : Int = 0;
-
-	var loaded:Bool = false;
-	var currentIndex:Int = 0;
-	var rows:NativeIndexedArray<NativeAssocArray<Scalar>>;
-	var result:SQLite3Result;
-	var fetchedRow:NativeArray;
-	var fieldsInfo:NativeAssocArray<Int>;
-
-	public function new( result:SQLite3Result ) {
-		this.result = result;
-	}
-
-	public function hasNext() : Bool {
-		if (!loaded) load();
-		return currentIndex < _length;
-	}
-
-	public function next() : Dynamic {
-		if (!loaded) load();
-		var next:Dynamic = rows[currentIndex++];
-		return Boot.createAnon(correctArrayTypes(next));
-	}
-
-	public function results() : List<Dynamic> {
-		if (!loaded) load();
-		var list = new List();
-		Syntax.foreach(rows, function(_, row) list.add(Boot.createAnon(correctArrayTypes(row))));
-		return list;
-	}
-
-	public function getResult( n : Int ) : String {
-		if (!loaded) load();
-		if (!hasNext()) return null;
-		return Global.array_values(rows[currentIndex])[n];
-	}
-
-	public function getIntResult( n : Int ) : Int {
-		return Syntax.int(getResult(n));
-	}
-
-	public function getFloatResult( n : Int ) : Float {
-		return Syntax.float(getResult(n));
-	}
-
-	public function getFieldsNames() : Null<Array<String>> {
-		var fieldsInfo = getFieldsInfo();
-		return Global.array_keys(fieldsInfo);
-	}
-
-	function correctArrayTypes(row:NativeAssocArray<String>):NativeAssocArray<Scalar> {
-		var fieldsInfo = getFieldsInfo();
-		Syntax.foreach(row, function(field:String, value:String) {
-			row[field] = correctType(value, fieldsInfo[field]);
-		});
-		return cast row;
-	}
-
-	inline function getFieldsInfo():NativeAssocArray<Int> {
-		if (fieldsInfo == null) {
-			fieldsInfo = cast Syntax.arrayDecl();
-			for(i in 0...nfields) {
-				fieldsInfo[result.columnName(i)] = result.columnType(i);
-			}
-		}
-		return fieldsInfo;
-	}
-
-	function load() {
-		loaded = true;
-		_nfields = result.numColumns();
-		getFieldsInfo();
-		fetchAll();
-	}
-
-	function correctType(value:String, type:Int):Scalar {
-		if (value == null) return null;
-		if (type == Const.SQLITE3_INTEGER) return Syntax.int(value);
-		if (type == Const.SQLITE3_FLOAT) return Syntax.float(value);
-		return value;
-	}
-
-	function fetchAll() {
-		rows = Syntax.arrayDecl();
-		var index = 0;
-		var row = result.fetchArray(Const.SQLITE3_ASSOC);
-		while(row != false) {
-			rows[index] = correctArrayTypes(row);
-			row = result.fetchArray(Const.SQLITE3_ASSOC);
-			index++;
-		}
-		_length = index;
-	}
-
-	function get_length() return _length;
-	function get_nfields() return _nfields;
-}
\ No newline at end of file
diff --git a/std/php7/_std/sys/io/File.hx b/std/php7/_std/sys/io/File.hx
deleted file mode 100644
index e05dc09668f0772dd0bea8d99ea0a531558b7e33..0000000000000000000000000000000000000000
--- a/std/php7/_std/sys/io/File.hx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.io;
-
-import php.Global.*;
-import php.Global;
-
-@:coreApi class File {
-
-	public static function getContent( path : String ) : String {
-		return file_get_contents(path);
-	}
-
-	public static function getBytes( path : String ) : haxe.io.Bytes {
-		return haxe.io.Bytes.ofString(file_get_contents(path));
-	}
-
-	public static function saveContent( path : String, content : String) : Void {
-		file_put_contents(path, content);
-	}
-
-	public static function saveBytes( path : String, bytes : haxe.io.Bytes ) : Void {
-		var f = write(path);
-		f.write(bytes);
-		f.close();
-	}
-
-	public static function read( path : String, binary : Bool = true ) : FileInput {
-		return @:privateAccess new FileInput(fopen(path, binary ? "rb" : "r"));
-	}
-
-	public static function write( path : String, binary : Bool = true ) : FileOutput {
-		return untyped new FileOutput(fopen(path, binary ? "wb" : "w"));
-	}
-
-	public static function append( path : String, binary : Bool = true ) : FileOutput {
-		return untyped new FileOutput(fopen(path, binary ? "ab" : "a"));
-	}
-
-	public static function copy( srcPath : String, dstPath : String ) : Void {
-		Global.copy(srcPath, dstPath);
-	}
-
-}
diff --git a/std/php7/_std/sys/io/FileInput.hx b/std/php7/_std/sys/io/FileInput.hx
deleted file mode 100644
index 6ddb4d073a39e75e7011355072329a4c0736052d..0000000000000000000000000000000000000000
--- a/std/php7/_std/sys/io/FileInput.hx
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.io;
-
-import haxe.io.Eof;
-import haxe.io.Error;
-import haxe.io.Bytes;
-import php.*;
-import php.Global.*;
-import php.Const.*;
-
-@:coreApi
-class FileInput extends haxe.io.Input {
-
-	private var __f : Resource;
-
-	function new(f:Resource) : Void {
-		__f = f;
-	}
-
-	public override function readByte() : Int {
-		var r = fread(__f, 1);
-		if(feof(__f)) throw new Eof();
-		if(r == false) throw Custom('An error occurred');
-		return ord(r);
-	}
-
-	public override function readBytes( s : Bytes, p : Int, l : Int ) : Int {
-		if(feof(__f)) throw new Eof();
-		var r = fread(__f, l);
-		if(r == false) throw Custom('An error occurred');
-		var b = Bytes.ofString(r);
-		s.blit(p, b, 0, (r:String).length);
-		return (r:String).length;
-	}
-
-	public override function close() : Void {
-		super.close();
-		if(__f != null)	fclose(__f);
-	}
-
-	public function seek( p : Int, pos : FileSeek ) : Void {
-		var w;
-		switch( pos ) {
-			case SeekBegin: w = SEEK_SET;
-			case SeekCur  : w = SEEK_CUR;
-			case SeekEnd  : w = SEEK_END;
-		}
-		var r = fseek(__f, p, w);
-		if(r == false) throw Custom('An error occurred');
-	}
-
-	public function tell() : Int {
-		var r = ftell(__f);
-		if(r == false) throw Custom('An error occurred');
-		return cast r;
-	}
-
-	public function eof() : Bool {
-		return feof(__f);
-	}
-
-	override function readLine() : String {
-		var r = fgets(__f);
-		if (false == r) throw new Eof();
-		return rtrim(r, "\r\n");
-	}
-}
diff --git a/std/php7/_std/sys/io/FileOutput.hx b/std/php7/_std/sys/io/FileOutput.hx
deleted file mode 100644
index f3e5ef09e84e4d6ba00d32bd3d1ee31e21761f19..0000000000000000000000000000000000000000
--- a/std/php7/_std/sys/io/FileOutput.hx
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.io;
-
-import php.*;
-import php.Global.*;
-import php.Const.*;
-
-@:coreApi
-class FileOutput extends haxe.io.Output {
-	private var __f : Resource;
-
-	function new(f:Resource) : Void {
-		__f = f;
-	}
-
-	public override function writeByte( c : Int ) : Void {
-		var r = fwrite(__f, chr(c));
-		if(r == false) throw haxe.io.Error.Custom('An error occurred');
-	}
-
-	public override function writeBytes( b : haxe.io.Bytes, p : Int, l : Int ) : Int {
-		var s = b.getString(p, l);
-		if(feof(__f)) throw new haxe.io.Eof();
-		var r = fwrite(__f, s, l);
-		if(r == false) throw haxe.io.Error.Custom('An error occurred');
-		return r;
-	}
-
-	public override function flush() : Void {
-		var r = fflush(__f);
-		if(r == false) throw haxe.io.Error.Custom('An error occurred');
-	}
-
-	public override function close() : Void {
-		super.close();
-		if(__f != null)	fclose(__f);
-	}
-
-	public function seek( p : Int, pos : FileSeek ) : Void {
-		var w;
-		switch( pos ) {
-			case SeekBegin: w = SEEK_SET;
-			case SeekCur  : w = SEEK_CUR;
-			case SeekEnd  : w = SEEK_END;
-		}
-		var r = fseek(__f, p, w);
-		if(r == false) throw haxe.io.Error.Custom('An error occurred');
-	}
-
-	public function tell() : Int {
-		var r = ftell(__f);
-		if(r == false) throw haxe.io.Error.Custom('An error occurred');
-		return r;
-	}
-
-}
diff --git a/std/php7/_std/sys/io/Process.hx b/std/php7/_std/sys/io/Process.hx
deleted file mode 100644
index 8550c3cbc36fc22b31f545ea8774aedda45a8dd6..0000000000000000000000000000000000000000
--- a/std/php7/_std/sys/io/Process.hx
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.io;
-
-import php.*;
-import haxe.io.*;
-
-using StringTools;
-using php.Global;
-
-@:forward(iterator)
-private abstract ProcessPipes(NativeIndexedArray<Resource>) from NativeIndexedArray<Resource> to NativeIndexedArray<Resource> {
-	public var stdin (get,never) : Resource;
-	public var stdout (get,never) : Resource;
-	public var stderr (get,never) : Resource;
-
-	inline function get_stdin() return this[0];
-	inline function get_stdout() return this[1];
-	inline function get_stderr() return this[2];
-}
-
-private class ReadablePipe extends Input {
-	var pipe : Resource;
-	var tmpBytes : Bytes;
-
-	public function new(pipe:Resource) {
-		this.pipe = pipe;
-		tmpBytes = Bytes.alloc(1);
-	}
-
-	override public function close() : Void {
-		pipe.fclose();
-	}
-
-	override public function readByte() : Int {
-		if (readBytes(tmpBytes, 0, 1) == 0) throw Error.Blocked;
-		return tmpBytes.get(0);
-	}
-
-	override public function readBytes( s:Bytes, pos:Int, len:Int ) : Int {
-		if(pipe.feof()) throw new Eof();
-
-		var result = pipe.fread(len);
-		if(result == "") throw new Eof();
-		if(result == false) return throw Error.Custom('Failed to read process output');
-		var result:String = result;
-
-		var bytes = Bytes.ofString(result);
-		s.blit(pos, bytes, 0, result.length);
-		return result.length;
-	}
-}
-
-private class WritablePipe extends Output {
-	var pipe : Resource;
-	var tmpBytes : Bytes;
-
-	public function new(pipe:Resource) {
-		this.pipe = pipe;
-		tmpBytes = Bytes.alloc(1);
-	}
-
-	override public function close() : Void {
-		pipe.fclose();
-	}
-
-	override public function writeByte(c:Int) : Void {
-		tmpBytes.set(0, c);
-		writeBytes(tmpBytes, 0, 1);
-	}
-
-	override public function writeBytes( b : Bytes, pos : Int, l : Int ) : Int {
-		var s = b.getString(pos, l);
-		if(pipe.feof()) throw new Eof();
-
-		var result = Global.fwrite(pipe, s, l);
-		if(result == false) throw Error.Custom('Failed to write to process input');
-		return result;
-	}
-}
-
-class Process {
-	/**
-		Standard output. The output stream where a process writes its output data.
-	**/
-	public var stdout(default, null) : Input;
-
-	/**
-		Standard error. The output stream to output error messages or diagnostics.
-	**/
-	public var stderr(default, null) : Input;
-
-	/**
-		Standard input. The stream data going into a process.
-	**/
-	public var stdin(default, null) : Output;
-
-	var process : Resource;
-	var pipes : ProcessPipes;
-	var pid : Int = -1;
-	var running : Bool = true;
-	var _exitCode : Int = -1;
-
-	/**
-		Construct a `Process` object, which run the given command immediately.
-
-		Command arguments can be passed in two ways: 1. using `args`, 2. appending to `cmd` and leaving `args` as `null`.
-
-		 1. When using `args` to pass command arguments, each argument will be automatically quoted, and shell meta-characters will be escaped if needed.
-		`cmd` should be an executable name that can be located in the `PATH` environment variable, or a path to an executable.
-
-		 2. When `args` is not given or is `null`, command arguments can be appended to `cmd`. No automatic quoting/escaping will be performed. `cmd` should be formatted exactly as it would be when typed at the command line.
-		It can run executables, as well as shell commands that are not executables (e.g. on Windows: `dir`, `cd`, `echo` etc).
-
-		`close()` should be called when the `Process` is no longer used.
-	*/
-	public function new( cmd : String, ?args : Array<String> ) : Void {
-		var descriptors = Syntax.arrayDecl(
-			Syntax.arrayDecl('pipe', 'r'),
-			Syntax.arrayDecl('pipe', 'w'),
-			Syntax.arrayDecl('pipe', 'w')
-		);
-		var result = buildCmd(cmd, args).proc_open(descriptors, pipes);
-		if (result == false) throw Error.Custom('Failed to start process: $cmd');
-		process = result;
-
-		updateStatus();
-
-		stdin = new WritablePipe(pipes.stdin);
-		stdout = new ReadablePipe(pipes.stdout);
-		stderr = new ReadablePipe(pipes.stderr);
-	}
-
-	/**
-		Return the process ID.
-	*/
-	public function getPid() : Int {
-		return pid;
-	}
-
-	public function exitCode( block : Bool = true ) : Null<Int> {
-		if(!block) {
-			updateStatus();
-			return (running ? null : _exitCode);
-		}
-		while (running) {
-			var arr = Syntax.arrayDecl(process);
-			Syntax.suppress(Global.stream_select(arr, arr, arr, null));
-			updateStatus();
-		}
-		return _exitCode;
-	}
-
-	/**
-		Close the process handle and release the associated resources.
-		All `Process` fields should not be used after `close()` is called.
-	*/
-	public function close() : Void {
-		if (!running) return;
-
-		for (pipe in pipes) Global.fclose(pipe);
-		process.proc_close();
-	}
-
-	/**
-		Kill the process.
-	*/
-	public function kill() : Void {
-		process.proc_terminate();
-	}
-
-	function buildCmd( cmd:String, ?args:Array<String> ) : String {
-		if (args == null) return cmd;
-
-		return switch (Sys.systemName()) {
-			case "Windows":
-				[cmd.replace("/", "\\")].concat(args).map(StringTools.quoteWinArg.bind(_, true)).join(" ");
-			case _:
-				[cmd].concat(args).map(StringTools.quoteUnixArg).join(" ");
-		}
-	}
-
-	function updateStatus() : Void {
-		if (!running) return;
-
-		var status = process.proc_get_status();
-		if (status == false) throw Error.Custom('Failed to obtain process status');
-		var status:NativeAssocArray<Scalar> = status;
-
-		pid = status['pid'];
-		running = status['running'];
-		_exitCode = status['exitcode'];
-	}
-}
\ No newline at end of file
diff --git a/std/php7/db/Mysqli.hx b/std/php7/db/Mysqli.hx
deleted file mode 100644
index 3bf619f30bfb396ae91a911a502639c680f4312d..0000000000000000000000000000000000000000
--- a/std/php7/db/Mysqli.hx
+++ /dev/null
@@ -1,71 +0,0 @@
-package php.db;
-
-import haxe.extern.*;
-import php.*;
-import haxe.Constraints.Function;
-
-/**
-    @see http://php.net/manual/en/class.mysqli.php
-**/
-@:native('Mysqli')
-extern class Mysqli {
-    var affected_rows (default,null) : Int;
-    var client_info (default,null) : String;
-    var client_version (default,null) : Int;
-    var connect_errno (default,null) : Int;
-    var connect_error (default,null) : String;
-    var errno (default,null) : Int;
-    var error_list (default,null) : NativeAssocArray<Scalar>;
-    var error (default,null) : String;
-    var field_count (default,null) : Int;
-    var host_info (default,null) : String;
-    var protocol_version (default,null) : String;
-    var server_info (default,null) : String;
-    var server_version (default,null) : Int;
-    var info (default,null) : String;
-    var insert_id (default,null) : EitherType<Int,String>;
-    var sqlstate (default,null) : String;
-    var thread_id (default,null) : Int;
-    var warning_count (default,null) : Int;
-
-    static function poll( read:Ref<NativeArray> , error:Ref<NativeArray> , reject:Ref<NativeArray> , sec:Int, ?usec:Int ) : Int;
-
-    function new( ?host:String, ?username:String, ?passwd:String, dbname:String = "", ?port:Int, ?socket:String ) : Void;
-    function autocommit( mode:Bool ) : Bool;
-    function begin_transaction( ?flags:Int, ?name:String ) : Bool;
-    function change_user( user:String, password:String, database:String ) : Bool;
-    function character_set_name() : String;
-    function close() : Bool;
-    function commit( ?flags:Int, ?name:String ) : Bool;
-    function debug( message:String ) : Bool;
-    function dump_debug_info() : Bool;
-    function get_charset() : {charset:String, collation:String, dir:String, min_length:Int, number:Int, state:Int};
-    function get_client_info() : String;
-    function get_connection_stats() : Bool;
-    function get_warnings() : Mysqli_warning;
-    function init() : Mysqli;
-    function kill( processid:Int ) : Bool;
-    function more_results() : Bool;
-    function multi_query( query:String ) : Bool;
-    function next_result() : Bool;
-    function options( option:Int , value:Scalar ) : Bool;
-    function ping() : Bool;
-    function prepare( query:String ) : Mysqli_stmt;
-    function query( query:String, ?resultmode:Int ) : EitherType<Bool,Mysqli_result>;
-    function real_connect( ?host:String, ?username:String, ?passwd:String, ?dbname:String, ?port:Int, ?socket:String, ?flags:Int ) : Bool;
-    function escape_string( escapestr:String ) : String;
-    function real_query( query:String ) : Bool;
-    function reap_async_query() : Mysqli_result;
-    function refresh( options:Int ) : Bool;
-    function rollback( ?flags:Int, ?name:String ) : Bool;
-    function rpl_query_type( query:String ) : Int;
-    function select_db( dbname:String ) : Bool;
-    function send_query( query:String ) : Bool;
-    function set_charset( charset:String ) : Bool;
-    function set_local_infile_handler( read_func:Function ) : Bool;
-    function ssl_set( key:String, cert:String, ca:String, capath:String, cipher:String) : Bool;
-    function stat() : String;
-    function stmt_init() : Mysqli_stmt;
-    function store_result( ?option:Int ) : Mysqli_result;
-    function use_result() : Mysqli_result;
-}
\ No newline at end of file
diff --git a/std/php7/db/Mysqli_driver.hx b/std/php7/db/Mysqli_driver.hx
deleted file mode 100644
index b211f197bcad20aeed3c0e6c58a2459120c099d7..0000000000000000000000000000000000000000
--- a/std/php7/db/Mysqli_driver.hx
+++ /dev/null
@@ -1,16 +0,0 @@
-package php.db;
-
-import php.NativeArray;
-
-@:native('Mysqli_driver')
-extern class Mysqli_driver {
-    var client_info (default,null) : String ;
-    var client_version (default,null) : String ;
-    var driver_version (default,null) : String ;
-    var embedded (default,null) : String ;
-    var reconnect (default,null) : Bool ;
-    var report_mode (default,null) : Int ;
-
-    function embedded_server_end() : Void;
-    function embedded_server_start( start:Bool, arguments:NativeArray, groups:NativeArray ) : Bool;
-}
\ No newline at end of file
diff --git a/std/php7/db/Mysqli_result.hx b/std/php7/db/Mysqli_result.hx
deleted file mode 100644
index 7c9624b55b31d4795993e1db71bc1a68840f54c0..0000000000000000000000000000000000000000
--- a/std/php7/db/Mysqli_result.hx
+++ /dev/null
@@ -1,40 +0,0 @@
-package php.db;
-
-import php.*;
-import haxe.extern.*;
-
-/**
-    @see http://php.net/manual/en/class.mysqli-result.php
-**/
-@:native('Myslqi_result')
-extern class Mysqli_result implements Traversable {
-    var current_field  (default,null) : Int;
-    var field_count (default,null) : Int;
-    var lengths (default,null) : EitherType<Bool, NativeIndexedArray<Int>>;
-    var num_rows (default,null) : Int;
-
-    function data_seek( offset:Int ) : Bool;
-    function fetch_all( ?resulttype:Int ) : NativeArray;
-    function fetch_array( ?resulttype:Int ) : NativeArray;
-    function fetch_assoc() : NativeAssocArray<String>;
-    function fetch_field_direct( fieldnr:Int ) : MysqliFieldInfo;
-    function fetch_field() : MysqliFieldInfo;
-    function fetch_fields() : NativeIndexedArray<MysqliFieldInfo>;
-    function fetch_object( ?class_name:String = "stdClass", ?params:NativeArray ) : {};
-    function fetch_row() : NativeIndexedArray<String>;
-    function field_seek( fieldnr:Int ) : Bool;
-    function free() : Void;
-}
-
-typedef MysqliFieldInfo = {
-    name : String,
-    orgname : String,
-    table : String,
-    orgtable : String,
-    max_length : Int,
-    length : Int,
-    charsetnr : Int,
-    flags : Int,
-    type : Int,
-    decimals : Int
-}
\ No newline at end of file
diff --git a/std/php7/db/Mysqli_stmt.hx b/std/php7/db/Mysqli_stmt.hx
deleted file mode 100644
index 5206b1c3a2da8f484a5446a875f2f8166f2d35f4..0000000000000000000000000000000000000000
--- a/std/php7/db/Mysqli_stmt.hx
+++ /dev/null
@@ -1,35 +0,0 @@
-package php.db;
-
-import haxe.extern.*;
-import php.*;
-
-@:native('Mysqli_stmt')
-extern class Mysqli_stmt {
-    var affected_rows (default,null) : Int;
-    var errno (default,null) : Int;
-    var error_list (default,null) : NativeArray;
-    var error (default,null) : String;
-    var field_count (default,null) : Int;
-    var insert_id (default,null) : Int;
-    var num_rows (default,null) : Int;
-    var param_count (default,null) : Int;
-    var sqlstate (default,null) : String;
-
-    function new( link:Mysqli, ?query:String ) : Void;
-    function attr_get( attr:Int ) : Int;
-    function attr_set( attr:Int , mode:Int ) : Bool;
-    function bind_param( types:String , var1:Ref<Dynamic>, args:Rest<Ref<Dynamic>> ) : Bool;
-    function bind_result( var1:Ref<Dynamic>, args:Rest<Ref<Dynamic>> ) : Bool;
-    function close() : Bool;
-    function data_seek( offset:Int ) : Void;
-    function execute() : Bool;
-    function fetch() : Bool;
-    function free_result() : Void;
-    function get_result() : Mysqli_result;
-    function get_warnings( stmt:Mysqli_stmt ) : {};
-    function prepare( query:String ) : Bool;
-    function reset() : Bool;
-    function result_metadata() : Mysqli_result;
-    function send_long_data( param_nr:Int , data:String ) : Bool;
-    function store_result() : Bool;
-}
\ No newline at end of file
diff --git a/std/php7/db/Mysqli_warning.hx b/std/php7/db/Mysqli_warning.hx
deleted file mode 100644
index d5b531572b3550b271cbf6e416d9e1c74ae3c656..0000000000000000000000000000000000000000
--- a/std/php7/db/Mysqli_warning.hx
+++ /dev/null
@@ -1,10 +0,0 @@
-package php.db;
-
-@:native('Mysqli_warning')
-extern class Mysqli_warning {
-    var message (default,null): String;
-    var sqlstate (default,null): Dynamic;
-    var errno (default,null): Int;
-
-    function next() : Void;
-}
\ No newline at end of file
diff --git a/std/php7/db/PDO.hx b/std/php7/db/PDO.hx
deleted file mode 100644
index ae9f709dbfd29ba4ffd28688154f331823267240..0000000000000000000000000000000000000000
--- a/std/php7/db/PDO.hx
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C)2005-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 php.db;
-
-import php.*;
-
-@:native('PDO')
-extern class PDO {
-	@:phpClassConst static var PARAM_BOOL : Int;
-	@:phpClassConst static var PARAM_NULL : Int;
-	@:phpClassConst static var PARAM_INT : Int;
-	@:phpClassConst static var PARAM_STR : Int;
-	@:phpClassConst static var PARAM_LOB : Int;
-	@:phpClassConst static var PARAM_STMT : Int;
-	@:phpClassConst static var PARAM_INPUT_OUTPUT : Int;
-	@:phpClassConst static var FETCH_LAZY : Int;
-	@:phpClassConst static var FETCH_ASSOC : Int;
-	@:phpClassConst static var FETCH_NAMED : Int;
-	@:phpClassConst static var FETCH_NUM : Int;
-	@:phpClassConst static var FETCH_BOTH : Int;
-	@:phpClassConst static var FETCH_OBJ : Int;
-	@:phpClassConst static var FETCH_BOUND : Int;
-	@:phpClassConst static var FETCH_COLUMN : Int;
-	@:phpClassConst static var FETCH_CLASS : Int;
-	@:phpClassConst static var FETCH_INTO : Int;
-	@:phpClassConst static var FETCH_FUNC : Int;
-	@:phpClassConst static var FETCH_GROUP : Int;
-	@:phpClassConst static var FETCH_UNIQUE : Int;
-	@:phpClassConst static var FETCH_KEY_PAIR : Int;
-	@:phpClassConst static var FETCH_CLASSTYPE : Int;
-	@:phpClassConst static var FETCH_SERIALIZE : Int;
-	@:phpClassConst static var FETCH_PROPS_LATE : Int;
-	@:phpClassConst static var ATTR_AUTOCOMMIT : Int;
-	@:phpClassConst static var ATTR_PREFETCH : Int;
-	@:phpClassConst static var ATTR_TIMEOUT : Int;
-	@:phpClassConst static var ATTR_ERRMODE : Int;
-	@:phpClassConst static var ATTR_SERVER_VERSION : Int;
-	@:phpClassConst static var ATTR_CLIENT_VERSION : Int;
-	@:phpClassConst static var ATTR_SERVER_INFO : Int;
-	@:phpClassConst static var ATTR_CONNECTION_STATUS : Int;
-	@:phpClassConst static var ATTR_CASE : Int;
-	@:phpClassConst static var ATTR_CURSOR_NAME : Int;
-	@:phpClassConst static var ATTR_CURSOR : Int;
-	@:phpClassConst static var ATTR_DRIVER_NAME : String;
-	@:phpClassConst static var ATTR_ORACLE_NULLS : Int;
-	@:phpClassConst static var ATTR_PERSISTENT : Int;
-	@:phpClassConst static var ATTR_STATEMENT_CLASS : Int;
-	@:phpClassConst static var ATTR_FETCH_TABLE_NAMES : Int;
-	@:phpClassConst static var ATTR_STRINGIFY_FETCHES : Int;
-	@:phpClassConst static var ATTR_EMULATE_PREPARES : Int;
-	@:phpClassConst static var ERRMODE_SILENT : Int;
-	@:phpClassConst static var ERRMODE_WARNING : Int;
-	@:phpClassConst static var ERRMODE_EXCEPTION : Int;
-	@:phpClassConst static var CASE_NATURAL : Int;
-	@:phpClassConst static var CASE_LOWER : Int;
-	@:phpClassConst static var CASE_UPPER : Int;
-	@:phpClassConst static var NULL_NATURAL : Int;
-	@:phpClassConst static var FETCH_ORI_PRIOR : Int;
-	@:phpClassConst static var FETCH_ORI_FIRST : Int;
-	@:phpClassConst static var FETCH_ORI_LAST : Int;
-	@:phpClassConst static var FETCH_ORI_ABS : Int;
-	@:phpClassConst static var FETCH_ORI_REL : Int;
-	@:phpClassConst static var CURSOR_FWDONLY : Int;
-	@:phpClassConst static var CURSOR_SCROLL : Int;
-	@:phpClassConst static var ERR_NONE : String;
-	@:phpClassConst static var PARAM_EVT_ALLOC : Int;
-	@:phpClassConst static var PARAM_EVT_FREE : Int;
-	@:phpClassConst static var PARAM_EVT_EXEC_PRE : Int;
-	@:phpClassConst static var PARAM_EVT_EXEC_POST : Int;
-	@:phpClassConst static var PARAM_EVT_FETCH_PRE : Int;
-	@:phpClassConst static var PARAM_EVT_FETCH_POST : Int;
-	@:phpClassConst static var PARAM_EVT_NORMALIZE : Int;
-
-	function new( dns : String, ?username : String, ?password : String, ?options : NativeArray) : Void;
-	function beginTransaction() : Bool;
-	function commit() : Bool;
-	function errorCode() : Dynamic;
-	function errorInfo() : NativeArray;
-	function exec(statement : String) : Int;
-	function getAttribute(attribute : Int) : Dynamic;
-	function getAvailableDrivers() : NativeArray;
-	function lastInsertId(?name : String) : String;
-	function prepare(statement : String, driver_options : NativeArray) : PDOStatement;
-	function query(statement : String, ?mode : Int) : PDOStatement;
-	function quote(String : String, ?parameter_type : Int = 2) : String;
-	function rollBack() : Bool;
-	function setAttribute(attribute : Int, value : Dynamic) : Bool;
-}
\ No newline at end of file
diff --git a/std/php7/db/PDOException.hx b/std/php7/db/PDOException.hx
deleted file mode 100644
index 73f034adb55fe0a9763500edfcae484df548fb15..0000000000000000000000000000000000000000
--- a/std/php7/db/PDOException.hx
+++ /dev/null
@@ -1,8 +0,0 @@
-package php.db;
-
-import php.RuntimeException;
-
-@:native('PDOException')
-extern class PDOException extends RuntimeException {
-    var errorInfo : NativeArray;
-}
\ No newline at end of file
diff --git a/std/php7/db/PDOStatement.hx b/std/php7/db/PDOStatement.hx
deleted file mode 100644
index 7d5f247577947cbefcbd9415c2f36634997f5a4b..0000000000000000000000000000000000000000
--- a/std/php7/db/PDOStatement.hx
+++ /dev/null
@@ -1,26 +0,0 @@
-package php.db;
-
-import php.*;
-
-@:native('PDOStatement')
-extern class PDOStatement {
-	function bindColumn(column : Dynamic, param : Dynamic, ?type : Int, ?maxlen : Int, ?driverdata : Dynamic) : Bool;
-	function bindParam(parameter : Dynamic, variable : Dynamic, ?data_type : Int, ?length : Int, ?driver_options : Dynamic) : Bool;
-	function bindValue(parameter : Dynamic, value : Dynamic, ?data_type : Int) : Bool;
-	function closeCursor() : Bool;
-	function columnCount() : Int;
-	function debugDumpParams() : Bool;
-	function errorCode() : String;
-	function errorInfo() : NativeArray;
-	function execute(input_parameters : NativeArray) : Bool;
-	function fetch(?fetch_style : Int = 4, ?cursor_orientation : Int = 0, ?cursor_offset : Int = 0) : Dynamic;
-	function fetchAll(?fetch_style : Int, ?fetch_argument:Dynamic, ?ctor_args:NativeArray) : NativeArray;
-	function fetchColumn(?column_number : Int = 0) : String;
-	function fetchObject(?class_name : String, ?ctor_args : NativeArray) : Dynamic;
-	function getAttribute(attribute : Int) : Dynamic;
-	function getColumnMeta(column : Int) : NativeArray;
-	function nextRowset() : Bool;
-	function rowCount() : Int;
-	function setAttribute(attribute : Int, value : Dynamic) : Bool;
-	function setFetchMode(mode : Int, ?fetch : Dynamic, ?ctorargs : NativeArray) : Bool;
-}
\ No newline at end of file
diff --git a/std/php7/db/SQLite3.hx b/std/php7/db/SQLite3.hx
deleted file mode 100644
index a91f2b9f31f7af99e0c261730fe9c7dd1f39a98e..0000000000000000000000000000000000000000
--- a/std/php7/db/SQLite3.hx
+++ /dev/null
@@ -1,28 +0,0 @@
-package php.db;
-
-import haxe.Constraints;
-import php.*;
-import haxe.extern.EitherType;
-
-@:native('SQLite3')
-extern class SQLite3 {
-	static function version() : NativeArray;
-	static function escapeString(value:String) : String;
-	function busyTimeout(msecs:Int) : Bool;
-	function changes() : Int;
-	function close() : Bool;
-	function new(filename:String, ?flags:Int, encryption_key:String = null) : Void;
-	function createAggregate(name:String, step_callback:Function, final_callback:Function, argument_count:Int = -1) : Bool;
-	function createCollation(name:String, callback:Function) : Bool;
-	function createFunction(name:String, callback:Function, argument_count:Int = -1) : Bool;
-	function enableExceptions( enableExceptions:Bool = false) : Bool;
-	function exec(query:String) : Bool;
-	function lastErrorCode() : Int;
-	function lastErrorMsg() : String;
-	function lastInsertRowID() : Int;
-	function loadExtension(shared_library:String) : Bool;
-	function open(filename:String, ?flags:Int, encryption_key:String = null) : Void;
-	function prepare(query:String) : SQLite3Stmt;
-	function query(query:String) : EitherType<Bool,SQLite3Result>;
-	function querySingle(query:String, entire_row:Bool = false) : Dynamic;
-}
\ No newline at end of file
diff --git a/std/php7/db/SQLite3Result.hx b/std/php7/db/SQLite3Result.hx
deleted file mode 100644
index 3760d1d3c2f011f2f15dbf9c0424a95fd840d68e..0000000000000000000000000000000000000000
--- a/std/php7/db/SQLite3Result.hx
+++ /dev/null
@@ -1,14 +0,0 @@
-package php.db;
-
-import php.*;
-import haxe.extern.EitherType;
-
-@:native('SQLite3Result')
-extern class SQLite3Result {
-	function columnName(column_number:Int) : String;
-	function columnType(column_number:Int) : Int;
-	function fetchArray(?mode:Int) : EitherType<Bool,NativeAssocArray<String>>;
-	function finalize() : Bool;
-	function numColumns() : Int;
-	function reset() : Bool;
-}
\ No newline at end of file
diff --git a/std/php7/db/SQLite3Stmt.hx b/std/php7/db/SQLite3Stmt.hx
deleted file mode 100644
index 471527a5ce5f7cff7be2c4b35030b5feb4ca9016..0000000000000000000000000000000000000000
--- a/std/php7/db/SQLite3Stmt.hx
+++ /dev/null
@@ -1,16 +0,0 @@
-package php.db;
-
-import php.*;
-import haxe.extern.EitherType;
-
-@:native('SQLite3Stmt')
-extern class SQLite3Stmt {
-	function bindParam(sql_param:EitherType<String,Int>, param:Ref<Dynamic>, ?type:Int) : Bool;
-	function bindValue(sql_param:EitherType<String,Int>, value:Dynamic, ?type:Int) : Bool;
-	function clear() : Bool;
-	function close() : Bool;
-	function execute() : SQLite3Result;
-	function paramCount() : Int;
-	function readOnly() : Bool;
-	function reset() : Bool;
-}
\ No newline at end of file
diff --git a/std/php7/reflection/ReflectionClass.hx b/std/php7/reflection/ReflectionClass.hx
deleted file mode 100644
index ea522e5f92e13a481ec4edb3722b849c2c6e23de..0000000000000000000000000000000000000000
--- a/std/php7/reflection/ReflectionClass.hx
+++ /dev/null
@@ -1,64 +0,0 @@
-package php.reflection;
-
-import haxe.extern.Rest;
-
-@:native('ReflectionClass')
-extern class ReflectionClass implements Reflector {
-    @:phpClassConst static var IS_IMPLICIT_ABSTRACT : Int;
-    @:phpClassConst static var IS_EXPLICIT_ABSTRACT : Int;
-    @:phpClassConst static var IS_FINAL : Int;
-
-    static function export( argument:Dynamic, returnValue:Bool = false ) : String;
-
-    var name : String;
-
-    function new( argument:Dynamic ) : Void;
-    function getConstant( name:String ) : Dynamic;
-    function getConstants() : NativeAssocArray<Dynamic>;
-    function getConstructor() : ReflectionMethod;
-    function getDefaultProperties() : NativeAssocArray<Dynamic>;
-    function getDocComment() : String;
-    function getEndLine() : Int;
-    // function getExtension() : ReflectionExtension;
-    function getExtensionName() : String;
-    function getFileName() : String;
-    function getInterfaceNames() : NativeIndexedArray<String>;
-    function getInterfaces() : NativeIndexedArray<ReflectionClass>;
-    function getMethod( name:String ) : ReflectionMethod;
-    function getMethods( ?filter:Int ) : NativeIndexedArray<ReflectionMethod>;
-    function getModifiers() : Int;
-    function getName() : String;
-    function getNamespaceName() : String;
-    function getParentClass() : Null<ReflectionClass>;
-    function getProperties( ?filter:Int ) : NativeIndexedArray<ReflectionProperty>;
-    function getProperty( name:String ) : ReflectionProperty;
-    function getShortName() : String;
-    function getStartLine() : Int;
-    function getStaticProperties() : NativeAssocArray<Dynamic>;
-    function getStaticPropertyValue( name:String, ?def_value:Ref<Dynamic> ) : Dynamic;
-    function getTraitAliases() : NativeAssocArray<String>;
-    function getTraitNames() : NativeIndexedArray<String>;
-    function getTraits() : NativeIndexedArray<ReflectionClass>;
-    function hasConstant( name:String ) : Bool;
-    function hasMethod( name:String ) : Bool;
-    function hasProperty( name:String ) : Bool;
-    function implementsInterface( interfaceName:String ) : Bool;
-    function inNamespace() : Bool;
-    function isAbstract() : Bool;
-    function isAnonymous() : Bool;
-    function isCloneable() : Bool;
-    function isFinal() : Bool;
-    function isInstance( object:{} ) : Bool;
-    function isInstantiable() : Bool;
-    function isInterface() : Bool;
-    function isInternal() : Bool;
-    function isIterateable() : Bool;
-    function isSubclassOf( className:String ) : Bool;
-    function isTrait() : Bool;
-    function isUserDefined() : Bool;
-    function newInstance( args:Rest<Dynamic> ) : Dynamic;
-    function newInstanceArgs( ?args:NativeIndexedArray<Dynamic> ) : Dynamic;
-    function newInstanceWithoutConstructor() : Dynamic;
-    function setStaticPropertyValue( name:String , value:String ) : Void;
-    @:phpMagic function __toString() : String;
-}
\ No newline at end of file
diff --git a/std/php7/reflection/ReflectionFunctionAbstract.hx b/std/php7/reflection/ReflectionFunctionAbstract.hx
deleted file mode 100644
index 1a1912d28f5914f864c8192df24bbd61fb901c48..0000000000000000000000000000000000000000
--- a/std/php7/reflection/ReflectionFunctionAbstract.hx
+++ /dev/null
@@ -1,35 +0,0 @@
-package php.reflection;
-
-
-@:native('ReflectionFunctionAbstract')
-extern class ReflectionFunctionAbstract implements Reflector {
-
-    var name : String;
-
-    function getClosureScopeClass() : ReflectionClass;
-    function getClosureThis() : Dynamic;
-    function getDocComment() : String;
-    function getEndLine() : Int;
-    // function getExtension() : ReflectionExtension;
-    function getExtensionName() : String;
-    function getFileName() : String;
-    function getName() : String;
-    function getNamespaceName() : String;
-    function getNumberOfParameters() : Int;
-    function getNumberOfRequiredParameters() : Int;
-    // function getParameters() : NativeIndexedArray<ReflectionParameter>;
-    // function getReturnType() : ReflectionType;
-    function getShortName() : String;
-    function getStartLine() : Int;
-    function getStaticVariables() : NativeAssocArray<Dynamic>;
-    function hasReturnType() : Bool;
-    function inNamespace() : Bool;
-    function isClosure() : Bool;
-    function isDeprecated() : Bool;
-    function isGenerator() : Bool;
-    function isInternal() : Bool;
-    function isUserDefined() : Bool;
-    function isVariadic() : Bool;
-    function returnsReference() : Bool;
-    @:phpMagic function __toString() : String;
-}
\ No newline at end of file
diff --git a/std/php7/reflection/ReflectionMethod.hx b/std/php7/reflection/ReflectionMethod.hx
deleted file mode 100644
index 76f2f3f4886e3677eed64cd3a0a7c1958872accc..0000000000000000000000000000000000000000
--- a/std/php7/reflection/ReflectionMethod.hx
+++ /dev/null
@@ -1,35 +0,0 @@
-package php.reflection;
-
-import haxe.Constraints;
-import haxe.extern.Rest;
-
-@:native('ReflectionMethod')
-extern class ReflectionMethod extends ReflectionFunctionAbstract {
-    @:phpClassConst static var IS_STATIC : Int;
-    @:phpClassConst static var IS_PUBLIC : Int;
-    @:phpClassConst static var IS_PROTECTED : Int;
-    @:phpClassConst static var IS_PRIVATE : Int;
-    @:phpClassConst static var IS_ABSTRACT : Int;
-    @:phpClassConst static var IS_FINAL : Int;
-
-    // public var class : String;
-
-    public static function export( className:String, name:String, ?returnValue:Bool) : String;
-
-    public function new( cls:Dynamic, name:String ) : Void;
-    public function getClosure( object:{} ) : Function;
-    public function getDeclaringClass() : ReflectionClass;
-    public function getModifiers() : Int;
-    public function getPrototype() : ReflectionMethod;
-    public function invoke( object:{}, args:Rest<Dynamic> ) : Dynamic;
-    public function invokeArgs( object:{}, args:NativeIndexedArray<Dynamic> ) : Dynamic;
-    public function isAbstract() : Bool;
-    public function isConstructor() : Bool;
-    public function isDestructor() : Bool;
-    public function isFinal() : Bool;
-    public function isPrivate() : Bool;
-    public function isProtected() : Bool;
-    public function isPublic() : Bool;
-    public function isStatic() : Bool;
-    public function setAccessible( accessible:Bool ) : Void;
-}
\ No newline at end of file
diff --git a/std/php7/reflection/ReflectionProperty.hx b/std/php7/reflection/ReflectionProperty.hx
deleted file mode 100644
index 99b95c0994218d03067b777ad09c1e4832bca1e5..0000000000000000000000000000000000000000
--- a/std/php7/reflection/ReflectionProperty.hx
+++ /dev/null
@@ -1,28 +0,0 @@
-package php.reflection;
-
-
-@:native('ReflectionProperty')
-extern class ReflectionProperty implements Reflector {
-    @:phpClassConst static var IS_STATIC : Int;
-    @:phpClassConst static var IS_: Int;
-    @:phpClassConst static var IS_PROTECTED : Int;
-    @:phpClassConst static var IS_PRIVATE : Int;
-
-    var name : String;
-
-    static function export( className:Dynamic, name:String, ?returnValue:Bool ) : String;
-
-    function new ( cls:Dynamic, name:String ) : Void;
-    function getDeclaringClass() : ReflectionClass;
-    function getDocComment() : String;
-    function getModifiers() : Int;
-    function getName() : String;
-    function getValue( ?object:{} ) : Dynamic;
-    function isPrivate() : Bool;
-    function isProtected() : Bool;
-    function isPublic() : Bool;
-    function isStatic() : Bool;
-    function setAccessible ( accessible:Bool ) : Void;
-    function setValue( object:{}, value:Dynamic ) : Void;
-    @:phpMagic function __toString() : String;
-}
\ No newline at end of file
diff --git a/std/php7/reflection/Reflector.hx b/std/php7/reflection/Reflector.hx
deleted file mode 100644
index e8a1abaca541ca027baa58251d5096d88e091d34..0000000000000000000000000000000000000000
--- a/std/php7/reflection/Reflector.hx
+++ /dev/null
@@ -1,6 +0,0 @@
-package php.reflection;
-
-@:native('Reflector')
-extern interface Reflector {
-    public function __toString() : String;
-}
\ No newline at end of file
diff --git a/std/python/Boot.hx b/std/python/Boot.hx
index a9e4401fd4720f9956ed7368da84b4de8a0fc25a..88d6f00bd3e4a1e2517c97bb26ed0c174a15783d 100644
--- a/std/python/Boot.hx
+++ b/std/python/Boot.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
+import python.internal.MethodClosure;
 import python.internal.ArrayImpl;
 import python.internal.Internal;
 import python.internal.StringImpl;
@@ -30,29 +32,21 @@ import python.internal.HxException;
 import python.internal.AnonObject;
 import python.internal.UBuiltins;
 import python.lib.Inspect;
-
 import python.Syntax;
 
 @:dox(hide)
 class Boot {
-
-	static var keywords:Set<String> = new Set(
-	[
-		"and",      "del",      "from",     "not",      "with",
-		"as",       "elif",     "global",   "or",       "yield",
-		"assert",   "else",     "if",       "pass",     "None",
-		"break",    "except",   "import",   "raise",    "True",
-		"class",    "exec",     "in",       "return",   "False",
-		"continue", "finally",  "is",       "try",
-		"def",      "for",      "lambda",   "while",
+	static var keywords:Set<String> = new Set([
+		"and", "del", "from", "not", "with", "as", "elif", "global", "or", "yield", "assert", "else", "if", "pass", "None", "break", "except", "import",
+		"raise", "True", "class", "exec", "in", "return", "False", "continue", "finally", "is", "try", "def", "for", "lambda", "while",
 	]);
 
-	inline static function arrayJoin <T>(x:Array<T>, sep:String):String {
-		return Syntax.field(sep, "join")(Syntax.pythonCode("[{0}(x1,'') for x1 in {1}]", python.Boot.toString1, x));
+	inline static function arrayJoin<T>(x:Array<T>, sep:String):String {
+		return Syntax.field(sep, "join")(Syntax.code("[{0}(x1,'') for x1 in {1}]", python.Boot.toString1, x));
 	}
 
-	inline static function safeJoin (x:Array<String>, sep:String):String {
-		return Syntax.field(sep, "join")(Syntax.pythonCode("[x1 for x1 in {0}]", x));
+	inline static function safeJoin(x:Array<String>, sep:String):String {
+		return Syntax.field(sep, "join")(Syntax.code("[x1 for x1 in {0}]", x));
 	}
 
 	inline static function isPyBool(o:Dynamic):Bool {
@@ -60,14 +54,15 @@ class Boot {
 	}
 
 	inline static function isPyInt(o:Dynamic):Bool {
-		return UBuiltins.isinstance(o, UBuiltins.int);
+		// for historic reasons bool extends int
+		return UBuiltins.isinstance(o, UBuiltins.int) && !isPyBool(o);
 	}
 
 	inline static function isPyFloat(o:Dynamic):Bool {
 		return UBuiltins.isinstance(o, UBuiltins.float);
 	}
 
-	static inline function isClass(o:Dynamic) : Bool {
+	static inline function isClass(o:Dynamic):Bool {
 		return o != null && (o == String || Inspect.isclass(o));
 	}
 
@@ -75,31 +70,37 @@ class Boot {
 		return UBuiltins.isinstance(o, AnonObject);
 	}
 
-	@:ifFeature("add_dynamic") private static function _add_dynamic(a:Dynamic,b:Dynamic):Dynamic {
+	@:ifFeature("add_dynamic") private static function _add_dynamic(a:Dynamic, b:Dynamic):Dynamic {
 		if (UBuiltins.isinstance(a, String) && UBuiltins.isinstance(b, String)) {
 			return Syntax.binop(a, "+", b);
 		}
 		if (UBuiltins.isinstance(a, String) || UBuiltins.isinstance(b, String)) {
-			return Syntax.binop(toString1(a,""), "+", toString1(b,""));
+			return Syntax.binop(toString1(a, ""), "+", toString1(b, ""));
 		}
 		return Syntax.binop(a, "+", b);
 	}
 
-	static inline function toString (o:Dynamic) {
+	static inline function toString(o:Dynamic) {
 		return toString1(o, "");
 	}
 
-	private static function toString1(o:Dynamic,s:String):String {
+	private static function toString1(o:Dynamic, s:String):String {
+		if (o == null)
+			return "null";
 
-		if( o == null ) return "null";
+		if (isString(o))
+			return o;
 
-		if (isString(o)) return o;
-
-		if (s == null) s = "";
-		if( s.length >= 5 ) return "<...>"; // too much deep recursion
+		if (s == null)
+			s = "";
+		if (s.length >= 5)
+			return "<...>"; // too much deep recursion
 
 		if (isPyBool(o)) {
-			if ((o:Bool)) return "true" else return "false";
+			if ((o : Bool))
+				return "true"
+			else
+				return "false";
 		}
 		if (isPyInt(o)) {
 			return UBuiltins.str(o);
@@ -107,7 +108,7 @@ class Boot {
 		// 1.0 should be printed as 1
 		if (isPyFloat(o)) {
 			try {
-				if ( (o:Float) == UBuiltins.int(o)) {
+				if ((o : Float) == UBuiltins.int(o)) {
 					return UBuiltins.str(Math.round(o));
 				} else {
 					return UBuiltins.str(o);
@@ -117,20 +118,19 @@ class Boot {
 			}
 		}
 
-		if (isArray(o))
-		{
+		if (isArray(o)) {
 			var o1:Array<Dynamic> = o;
 
 			var l = o1.length;
 
 			var st = "[";
 			s += "\t";
-			for( i in 0...l ) {
+			for (i in 0...l) {
 				var prefix = "";
 				if (i > 0) {
 					prefix = ",";
 				}
-				st += prefix + toString1(o1[i],s);
+				st += prefix + toString1(o1[i], s);
 			}
 			st += "]";
 			return st;
@@ -139,40 +139,27 @@ class Boot {
 		try {
 			if (UBuiltins.hasattr(o, "toString"))
 				return Syntax.callField(o, "toString");
-		} catch (e:Dynamic) {
-		}
-
-		if (Inspect.isfunction(o) || Inspect.ismethod(o)) return "<function>";
+		} catch (e:Dynamic) {}
 
-		if (UBuiltins.hasattr(o, "__class__"))
-		{
-
-			if (isAnonObject(o))
-			{
+		if (UBuiltins.hasattr(o, "__class__")) {
+			if (isAnonObject(o)) {
 				var toStr = null;
-				try
-				{
+				try {
 					var fields = fields(o);
-					var fieldsStr = [for (f in fields) '$f : ${toString1(simpleField(o,f), s+"\t")}'];
+					var fieldsStr = [for (f in fields) '$f : ${toString1(simpleField(o, f), s + "\t")}'];
 					toStr = "{ " + safeJoin(fieldsStr, ", ") + " }";
-				}
-				catch (e:Dynamic) {
+				} catch (e:Dynamic) {
 					return "{ ... }";
 				}
 
-				if (toStr == null)
-				{
+				if (toStr == null) {
 					return "{ ... }";
-				}
-				else
-				{
+				} else {
 					return toStr;
 				}
-
 			}
 			if (UBuiltins.isinstance(o, Enum)) {
-
-				var o:EnumImpl = (o:EnumImpl);
+				var o:EnumImpl = (o : EnumImpl);
 
 				var l = UBuiltins.len(o.params);
 				var hasParams = l > 0;
@@ -183,7 +170,7 @@ class Boot {
 						if (i > 0) {
 							prefix = ",";
 						}
-						paramsStr += prefix + toString1(o.params[i],s);
+						paramsStr += prefix + toString1(o.params[i], s);
 					}
 					return o.tag + "(" + paramsStr + ")";
 				} else {
@@ -194,23 +181,23 @@ class Boot {
 			if (Internal.hasClassName(o)) {
 				if (Syntax.field(Syntax.field(o, "__class__"), "__name__") != "type") {
 					var fields = getInstanceFields(o);
-					var fieldsStr = [for (f in fields) '$f : ${toString1(simpleField(o,f), s+"\t")}'];
+					var fieldsStr = [for (f in fields) '$f : ${toString1(simpleField(o, f), s + "\t")}'];
 
-					var toStr = (Internal.fieldClassName(o):String) + "( " + safeJoin(fieldsStr, ", ") + " )";
+					var toStr = (Internal.fieldClassName(o) : String) + "( " + safeJoin(fieldsStr, ", ") + " )";
 					return toStr;
 				} else {
 					var fields = getClassFields(o);
-					var fieldsStr = [for (f in fields) '$f : ${toString1(simpleField(o,f), s+"\t")}'];
-					var toStr = "#" + (Internal.fieldClassName(o):String) + "( " + safeJoin(fieldsStr, ", ") + " )";
+					var fieldsStr = [for (f in fields) '$f : ${toString1(simpleField(o, f), s + "\t")}'];
+					var toStr = "#" + (Internal.fieldClassName(o) : String) + "( " + safeJoin(fieldsStr, ", ") + " )";
 					return toStr;
 				}
 			}
 
-			if (isMetaType(o,String)) {
+			if (isMetaType(o, String)) {
 				return "#String";
 			}
 
-			if (isMetaType(o,Array)) {
+			if (isMetaType(o, Array)) {
 				return "#Array";
 			}
 
@@ -241,94 +228,150 @@ class Boot {
 	}
 
 	@:analyzer(no_local_dce)
-	static function fields (o:Dynamic) {
+	static function fields(o:Dynamic) {
 		var a = [];
 		if (o != null) {
 			if (Internal.hasFields(o)) {
-				var fields:Array<String> = Internal.fieldFields(o);
-				return fields.copy();
+				var fields = Internal.fieldFields(o);
+				if (fields != null) {
+					return (fields : Array<String>).copy();
+				}
 			}
 			if (isAnonObject(o)) {
-
 				var d = Syntax.field(o, "__dict__");
 				var keys = Syntax.callField(d, "keys");
 				var handler = unhandleKeywords;
 
-				Syntax.pythonCode("for k in keys:");
-				Syntax.pythonCode("    a.append(handler(k))");
-			}
-			else if (UBuiltins.hasattr(o, "__dict__")) {
+				Syntax.code("for k in keys:");
+				Syntax.code("    if (k != '_hx_disable_getattr'):");
+				Syntax.code("        a.append(handler(k))");
+			} else if (UBuiltins.hasattr(o, "__dict__")) {
 				var a = [];
 				var d = Syntax.field(o, "__dict__");
-				var keys1  = Syntax.callField(d, "keys");
-				Syntax.pythonCode("for k in keys1:");
-				Syntax.pythonCode("    a.append(k)");
-
+				var keys1 = Syntax.callField(d, "keys");
+				Syntax.code("for k in keys1:");
+				Syntax.code("    a.append(k)");
 			}
 		}
 		return a;
 	}
 
-	static inline function isString (o:Dynamic):Bool {
+	static inline function isString(o:Dynamic):Bool {
 		return UBuiltins.isinstance(o, UBuiltins.str);
 	}
 
-	static inline function isArray (o:Dynamic):Bool {
+	static inline function isArray(o:Dynamic):Bool {
 		return UBuiltins.isinstance(o, UBuiltins.list);
 	}
 
-	static function simpleField( o : Dynamic, field : String ) : Dynamic {
-		if (field == null) return null;
+	static function simpleField(o:Dynamic, field:String):Dynamic {
+		if (field == null)
+			return null;
 
 		var field = handleKeywords(field);
 		return if (UBuiltins.hasattr(o, field)) UBuiltins.getattr(o, field) else null;
 	}
 
-	static function field( o : Dynamic, field : String ) : Dynamic {
-		if (field == null) return null;
-
-		switch (field) {
-			case "length" if (isString(o)): return StringImpl.get_length(o);
-			case "toLowerCase" if (isString(o)): return StringImpl.toLowerCase.bind(o);
-			case "toUpperCase" if (isString(o)): return StringImpl.toUpperCase.bind(o);
-			case "charAt" if (isString(o)): return StringImpl.charAt.bind(o);
-			case "charCodeAt" if (isString(o)): return StringImpl.charCodeAt.bind(o);
-			case "indexOf" if (isString(o)): return StringImpl.indexOf.bind(o);
-			case "lastIndexOf" if (isString(o)): return StringImpl.lastIndexOf.bind(o);
-			case "split" if (isString(o)): return StringImpl.split.bind(o);
-			case "substr" if (isString(o)): return StringImpl.substr.bind(o);
-			case "substring" if (isString(o)): return StringImpl.substring.bind(o);
-			case "toString" if (isString(o)): return StringImpl.toString.bind(o);
-			case "length" if (isArray(o)): return ArrayImpl.get_length(o);
-			case "map" if (isArray(o)): return ArrayImpl.map.bind(o);
-			case "filter" if (isArray(o)): return ArrayImpl.filter.bind(o);
-			case "concat" if (isArray(o)): return ArrayImpl.concat.bind(o);
-			case "copy" if (isArray(o)): return function () return ArrayImpl.copy(o);
-			case "iterator" if (isArray(o)): return ArrayImpl.iterator.bind(o);
-			case "insert" if (isArray(o)): return ArrayImpl.insert.bind(o);
-			case "join" if (isArray(o)): return function (sep) return ArrayImpl.join(o, sep);
-			case "toString" if (isArray(o)): return ArrayImpl.toString.bind(o);
-			case "pop" if (isArray(o)): return ArrayImpl.pop.bind(o);
-			case "push" if (isArray(o)): return ArrayImpl.push.bind(o);
-			case "unshift" if (isArray(o)): return ArrayImpl.unshift.bind(o);
-			case "indexOf" if (isArray(o)): return ArrayImpl.indexOf.bind(o);
-			case "lastIndexOf" if (isArray(o)): return ArrayImpl.lastIndexOf.bind(o);
-			case "remove" if (isArray(o)): return ArrayImpl.remove.bind(o);
-			case "reverse" if (isArray(o)): return ArrayImpl.reverse.bind(o);
-			case "shift" if (isArray(o)): return ArrayImpl.shift.bind(o);
-			case "slice" if (isArray(o)): return ArrayImpl.slice.bind(o);
-			case "sort" if (isArray(o)): return ArrayImpl.sort.bind(o);
-			case "splice" if (isArray(o)): return ArrayImpl.splice.bind(o);
+	@:ifFeature("closure_Array", "closure_String")
+	static inline function createClosure(obj:Dynamic, func:Dynamic):Dynamic {
+		return new MethodClosure(obj, func);
+	}
+
+	static function hasField(o:Dynamic, field:String):Bool {
+		if (isAnonObject(o)) {
+			return Syntax.code('{0}._hx_hasattr({1})', o, field);
 		}
+		return UBuiltins.hasattr(o, handleKeywords(field));
+	}
 
+	static function field(o:Dynamic, field:String):Dynamic {
+		if (field == null)
+			return null;
 
-		var field = handleKeywords(field);
-		return if (UBuiltins.hasattr(o, field)) UBuiltins.getattr(o, field) else null;
-	}
+		inline function def() {
+			var field = handleKeywords(field);
+			return if (UBuiltins.hasattr(o, field)) UBuiltins.getattr(o, field) else null;
+		}
 
+		return if (isString(o)) {
+			switch (field) {
+				case "length":
+					StringImpl.get_length(o);
+				case "toLowerCase":
+					createClosure(o, StringImpl.toLowerCase);
+				case "toUpperCase":
+					createClosure(o, StringImpl.toUpperCase);
+				case "charAt":
+					createClosure(o, StringImpl.charAt);
+				case "charCodeAt":
+					createClosure(o, StringImpl.charCodeAt);
+				case "indexOf":
+					createClosure(o, StringImpl.indexOf);
+				case "lastIndexOf":
+					createClosure(o, StringImpl.lastIndexOf);
+				case "split":
+					createClosure(o, StringImpl.split);
+				case "substr":
+					createClosure(o, StringImpl.substr);
+				case "substring":
+					createClosure(o, StringImpl.substring);
+				case "toString":
+					createClosure(o, StringImpl.toString);
+				default:
+					def();
+			}
+		} else if (isArray(o)) {
+			switch (field) {
+				case "length":
+					ArrayImpl.get_length(o);
+				case "map":
+					createClosure(o, ArrayImpl.map);
+				case "filter":
+					createClosure(o, ArrayImpl.filter);
+				case "concat":
+					createClosure(o, ArrayImpl.concat);
+				case "copy":
+					createClosure(o, ArrayImpl.copy);
+				case "iterator":
+					createClosure(o, ArrayImpl.iterator);
+				case "insert":
+					createClosure(o, ArrayImpl.insert);
+				case "join":
+					createClosure(o, ArrayImpl.join);
+				case "toString":
+					createClosure(o, ArrayImpl.toString);
+				case "pop":
+					createClosure(o, ArrayImpl.pop);
+				case "push":
+					createClosure(o, ArrayImpl.push);
+				case "unshift":
+					createClosure(o, ArrayImpl.unshift);
+				case "indexOf":
+					createClosure(o, ArrayImpl.indexOf);
+				case "lastIndexOf":
+					createClosure(o, ArrayImpl.lastIndexOf);
+				case "remove":
+					createClosure(o, ArrayImpl.remove);
+				case "reverse":
+					createClosure(o, ArrayImpl.reverse);
+				case "shift":
+					createClosure(o, ArrayImpl.shift);
+				case "slice":
+					createClosure(o, ArrayImpl.slice);
+				case "sort":
+					createClosure(o, ArrayImpl.sort);
+				case "splice":
+					createClosure(o, ArrayImpl.splice);
+				default:
+					def();
+			}
+		} else {
+			def();
+		}
+	}
 
-	static function getInstanceFields( c : Class<Dynamic> ) : Array<String> {
-		var f = if (Internal.hasFields(c)) Internal.fieldFields(c) else [];
+	static function getInstanceFields(c:Class<Dynamic>):Array<String> {
+		var f = if (Internal.hasFields(c)) (Internal.fieldFields(c) : Array<String>).copy() else [];
 		if (Internal.hasMethods(c))
 			f = f.concat(Internal.fieldMethods(c));
 
@@ -337,11 +380,8 @@ class Boot {
 		if (sc == null) {
 			return f;
 		} else {
-
 			var scArr = getInstanceFields(sc);
 			var scMap = new Set(scArr);
-			//var scMap = [for (f in scArr) f => f];
-			var res = [];
 			for (f1 in f) {
 				if (!scMap.has(f1)) {
 					scArr.push(f1);
@@ -352,8 +392,8 @@ class Boot {
 		}
 	}
 
-	static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic> {
-		if( c == null )
+	static function getSuperClass(c:Class<Dynamic>):Class<Dynamic> {
+		if (c == null)
 			return null;
 
 		try {
@@ -361,14 +401,11 @@ class Boot {
 				return Internal.fieldSuper(c);
 			}
 			return null;
-		} catch (e:Dynamic) {
-
-		}
+		} catch (e:Dynamic) {}
 		return null;
-
 	}
 
-	static function getClassFields( c : Class<Dynamic> ) : Array<String> {
+	static function getClassFields(c:Class<Dynamic>):Array<String> {
 		if (Internal.hasStatics(c)) {
 			var x:Array<String> = Internal.fieldStatics(c);
 			return x.copy();
@@ -377,29 +414,61 @@ class Boot {
 		}
 	}
 
-
-
-	static inline function unsafeFastCodeAt (s, index) {
+	static inline function unsafeFastCodeAt(s:String, index:Int) {
 		return UBuiltins.ord(python.Syntax.arrayAccess(s, index));
 	}
 
 	static inline function handleKeywords(name:String):String {
 		return if (keywords.has(name)) {
 			Internal.getPrefixed(name);
-		} else if (name.length > 2 && unsafeFastCodeAt(name,0) == "_".code && unsafeFastCodeAt(name,1) == "_".code && unsafeFastCodeAt(name, name.length-1) != "_".code) {
+		} else if (name.length > 2
+			&& unsafeFastCodeAt(name, 0) == "_".code
+			&& unsafeFastCodeAt(name, 1) == "_".code
+			&& unsafeFastCodeAt(name, name.length - 1) != "_".code) {
 			Internal.getPrefixed(name);
-		}
-		else name;
+		} else
+			name;
 	}
 
 	static var prefixLength = Internal.prefix().length;
 
 	static function unhandleKeywords(name:String):String {
-		if (name.substr(0,prefixLength) == Internal.prefix()) {
+		if (name.substr(0, prefixLength) == Internal.prefix()) {
 			var real = name.substr(prefixLength);
-			if (keywords.has(real)) return real;
+			if (keywords.has(real))
+				return real;
 		}
 		return name;
 	}
 
-}
\ No newline at end of file
+	static inline function implementsInterface(value:Dynamic, cls:Class<Dynamic>):Bool {
+		function loop(intf) {
+			var f:Array<Dynamic> = if (Internal.hasInterfaces(intf)) Internal.fieldInterfaces(intf) else [];
+			if (f != null) {
+				for (i in f) {
+					if (i == cls) {
+						return true;
+					} else {
+						var l = loop(i);
+						if (l) {
+							return true;
+						}
+					}
+				}
+				return false;
+			} else {
+				return false;
+			}
+		}
+		var currentClass = Syntax.field(value, "__class__");
+		var result = false;
+		while (currentClass != null) {
+			if (loop(currentClass)) {
+				result = true;
+				break;
+			}
+			currentClass = getSuperClass(currentClass);
+		}
+		return result;
+	}
+}
diff --git a/std/python/Bytearray.hx b/std/python/Bytearray.hx
index b5fbab3a1b35fc5e35da2be46d0ee99faedcdd19..4094e6065126c95fada79e5ec739b2b7a9f1471a 100644
--- a/std/python/Bytearray.hx
+++ b/std/python/Bytearray.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,33 +19,37 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.Syntax;
 
 @:native("bytearray")
 extern class Bytearray implements ArrayAccess<Int> {
+	public var length(get, never):Int;
 
-	public var length(get,never):Int;
-
-	@:overload(function (it:Array<Int>):Void {})
-	@:overload(function (it:NativeIterable<Int>):Void {})
-	@:overload(function (size:Int):Void {})
-	public function new (source:String,encoding:String,?errors:Dynamic):Void;
+	@:overload(function():Void {})
+	@:overload(function(it:Array<Int>):Void {})
+	@:overload(function(it:NativeIterable<Int>):Void {})
+	@:overload(function(size:Int):Void {})
+	public function new(source:String, encoding:String, ?errors:Dynamic):Void;
 
-	inline function get_length ():Int {
+	private inline function get_length():Int {
 		return python.internal.UBuiltins.len(this);
 	}
 
+	function append(x:Int):Void;
+	function extend(t:Bytearray):Void;
+
 	public inline function get(i:Int):Int {
 		return Syntax.arrayAccess(this, i);
 	}
 
-	public inline function set(i:Int,v:Int):Void {
-        this.__setitem__(i,v);
-    }
+	public inline function set(i:Int, v:Int):Void {
+		this.__setitem__(i, v);
+	}
 
-    public function __setitem__(i:Int,v:Int):Void;
+	public function __setitem__(i:Int, v:Int):Void;
 
-	public function decode(encoding:String="utf-8", errors:String="strict"):String;
+	public function decode(encoding:String = "utf-8", errors:String = "strict"):String;
 }
diff --git a/std/python/Bytes.hx b/std/python/Bytes.hx
index 8c4b1966d85a7be1d2c22d08057d2d0738986934..f9e67108c91070f6771a6124fee73730d0958a16 100644
--- a/std/python/Bytes.hx
+++ b/std/python/Bytes.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.Bytearray;
 
 @:native("bytes")
 extern class Bytes extends Bytearray {
-
-	//public function decode(encoding:String="utf-8", errors:String="strict"):String;
-
-}
\ No newline at end of file
+	// public function decode(encoding:String="utf-8", errors:String="strict"):String;
+}
diff --git a/std/python/Dict.hx b/std/python/Dict.hx
index c5b2feb6f9cdba40c0b997e8717534ce6b3b8fe6..91cf6450df5aaa2bf38550a5c5433fba97fb0868 100644
--- a/std/python/Dict.hx
+++ b/std/python/Dict.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.internal.UBuiltins;
@@ -27,10 +28,10 @@ import python.NativeIterator;
 import python.Syntax;
 
 @:native("dict")
-extern class Dict<K,V> {
-	function new ():Void;
+extern class Dict<K, V> {
+	function new():Void;
 
-	var length(get,never):Int;
+	var length(get, never):Int;
 	private inline function get_length():Int {
 		return UBuiltins.len(this);
 	}
@@ -54,13 +55,13 @@ extern class Dict<K,V> {
 	}
 
 	function clear():Void;
-	function copy():Dict<K,V>;
-	function items():DictView<Tuple2<K,V>>;
+	function copy():Dict<K, V>;
+	function items():DictView<Tuple2<K, V>>;
 	function keys():DictView<K>;
 	function pop(key:K, ?def:V):V;
-	function popitem():Tuple2<K,V>;
+	function popitem():Tuple2<K, V>;
 	function setdefault(key:K, ?def:V):V;
-	function update(d:Dict<K,V>):Void;
+	function update(d:Dict<K, V>):Void;
 	function values():DictView<V>;
 
 	inline function iter():NativeIterator<K> {
@@ -75,7 +76,7 @@ extern class Dict<K,V> {
 }
 
 extern class DictView<T> {
-	var length(get,never):Int;
+	var length(get, never):Int;
 	private inline function get_length():Int {
 		return UBuiltins.len(this);
 	}
diff --git a/std/python/Exceptions.hx b/std/python/Exceptions.hx
index d5253b5abe36beb868f979459b64511d4771af10..ea7ab8a394dfdaf48413e8db4c91c60c33c555f3 100644
--- a/std/python/Exceptions.hx
+++ b/std/python/Exceptions.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,358 +19,189 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import haxe.extern.Rest;
 
 @:native("BaseException")
-extern class BaseException
-{
+extern class BaseException {
 	function new(args:Rest<Dynamic>):Void;
 }
 
-
-
 @:native("BufferError")
-extern class BufferError extends BaseException
-{
-
-}
+extern class BufferError extends BaseException {}
 
 @:native("GeneratorExit")
-extern class GeneratorExit extends BaseException
-{
-
-}
+extern class GeneratorExit extends BaseException {}
 
 @:native("KeyboardInterrupt")
-extern class KeyboardInterrupt extends BaseException
-{
-
-}
+extern class KeyboardInterrupt extends BaseException {}
 
 @:native("Exception")
-extern class Exception extends BaseException
-{
-
-}
+extern class Exception extends BaseException {}
 
 @:native("SyntaxError")
-extern class SyntaxError extends Exception
-{
-
-}
+extern class SyntaxError extends Exception {}
 
 @:native("StopIteration")
-extern class StopIteration extends Exception
-{
-
-}
+extern class StopIteration extends Exception {}
 
 @:native("RuntimeError")
-extern class RuntimeError extends Exception
-{
-
-}
+extern class RuntimeError extends Exception {}
 
 @:native("NotImplementedError")
-extern class NotImplementedError extends RuntimeError
-{
-
-}
+extern class NotImplementedError extends RuntimeError {}
 
 @:native("IndentationError")
-extern class IndentationError extends SyntaxError
-{
-
-}
+extern class IndentationError extends SyntaxError {}
 
 @:native("EnvironmentError")
-extern class EnvironmentError extends Exception
-{
-
-}
+extern class EnvironmentError extends Exception {}
 
 @:native("OSError")
-extern class OSError extends EnvironmentError
-{
-
-}
+extern class OSError extends EnvironmentError {}
 
 @:native("BlockingIOError")
-extern class BlockingIOError extends OSError
-{
-
-}
+extern class BlockingIOError extends OSError {}
 
 @:native("ChildProcessError")
-extern class ChildProcessError extends OSError
-{
-
-}
+extern class ChildProcessError extends OSError {}
 
 @:native("ConnectionError")
-extern class ConnectionError extends OSError
-{
-
-}
+extern class ConnectionError extends OSError {}
 
 @:native("BrokenPipeError")
-extern class BrokenPipeError extends ConnectionError
-{
-
-}
+extern class BrokenPipeError extends ConnectionError {}
 
 @:native("ConnectionAbortedError")
-extern class ConnectionAbortedError extends ConnectionError
-{
+extern class ConnectionAbortedError extends ConnectionError {}
 
-}
 @:native("ConnectionRefusedError")
-extern class ConnectionRefusedError extends ConnectionError
-{
+extern class ConnectionRefusedError extends ConnectionError {}
 
-}
 @:native("ConnectionResetError")
-extern class ConnectionResetError extends ConnectionError
-{
-
-}
+extern class ConnectionResetError extends ConnectionError {}
 
 @:native("FileExistsError")
-extern class FileExistsError extends OSError
-{
+extern class FileExistsError extends OSError {}
 
-}
 @:native("FileNotFoundError")
-extern class FileNotFoundError extends OSError
-{
+extern class FileNotFoundError extends OSError {}
 
-}
 @:native("InterruptedError")
-extern class InterruptedError extends OSError
-{
+extern class InterruptedError extends OSError {}
 
-}
 @:native("IsADirectoryError")
-extern class IsADirectoryError extends OSError
-{
+extern class IsADirectoryError extends OSError {}
 
-}
 @:native("NotADirectoryError")
-extern class NotADirectoryError extends OSError
-{
+extern class NotADirectoryError extends OSError {}
 
-}
 @:native("PermissionError")
-extern class PermissionError extends OSError
-{
+extern class PermissionError extends OSError {}
 
-}
 @:native("ProcessLookupError")
-extern class ProcessLookupError extends OSError
-{
+extern class ProcessLookupError extends OSError {}
 
-}
 @:native("TimeoutError")
-extern class TimeoutError extends OSError
-{
-
-}
-
+extern class TimeoutError extends OSError {}
 
 @:native("NameError")
-extern class NameError extends Exception
-{
-
-}
+extern class NameError extends Exception {}
 
 @:native("UnboundLocalError")
-extern class UnboundLocalError extends NameError
-{
-
-}
+extern class UnboundLocalError extends NameError {}
 
 @:native("MemoryError")
-extern class MemoryError extends Exception
-{
-
-}
+extern class MemoryError extends Exception {}
 
 @:native("AssertionError")
-extern class AssertionError extends Exception
-{
-
-}
+extern class AssertionError extends Exception {}
 
 @:native("AttributeError")
-extern class AttributeError extends Exception
-{
-
-}
+extern class AttributeError extends Exception {}
 
 @:native("EOFError")
-extern class EOFError extends Exception
-{
-
-}
+extern class EOFError extends Exception {}
 
 @:native("ArithmeticError")
-extern class ArithmeticError extends Exception
-{
-
-}
-
-
+extern class ArithmeticError extends Exception {}
 
 @:native("FloatingPointError")
-extern class FloatingPointError extends ArithmeticError
-{
-
-}
+extern class FloatingPointError extends ArithmeticError {}
 
 @:native("OverflowError")
-extern class OverflowError extends ArithmeticError
-{
-
-}
-
+extern class OverflowError extends ArithmeticError {}
 
 @:native("ZeroDivisionError")
-extern class ZeroDivisionError extends ArithmeticError
-{
-
-}
-
-
+extern class ZeroDivisionError extends ArithmeticError {}
 
 @:native("ImportError")
-extern class ImportError extends Exception
-{
-
-}
+extern class ImportError extends Exception {}
 
 @:native("LookupError")
-extern class LookupError extends Exception
-{
-
-}
+extern class LookupError extends Exception {}
 
 @:native("IndexError")
-extern class IndexError extends LookupError
-{
-
-}
+extern class IndexError extends LookupError {}
 
 @:native("KeyError")
-extern class KeyError extends LookupError
-{
-
-}
+extern class KeyError extends LookupError {}
 
 @:native("IOError")
-extern class IOError extends EnvironmentError
-{
-
-}
+extern class IOError extends EnvironmentError {}
 
 @:native("VMSError")
-extern class VMSError extends OSError
-{
-
-}
+extern class VMSError extends OSError {}
 
 @:native("WindowsError")
-extern class WindowsError extends OSError
-{
-
-}
-
-
-
-
-
+extern class WindowsError extends OSError {}
 
 @:native("ValueError")
-extern class ValueError extends Exception
-{
-
-}
+extern class ValueError extends Exception {}
 
 @:native("UnicodeError")
-extern class UnicodeError extends ValueError
-{
+extern class UnicodeError extends ValueError {}
 
-}
 @:native("UnicodeDecodeError")
-extern class UnicodeDecodeError extends UnicodeError
-{
+extern class UnicodeDecodeError extends UnicodeError {}
 
-}
 @:native("UnicodeEncodeError")
-extern class UnicodeEncodeError extends UnicodeError
-{
+extern class UnicodeEncodeError extends UnicodeError {}
 
-}
 @:native("UnicodeTranslateError")
-extern class UnicodeTranslateError extends UnicodeError
-{
-
-}
+extern class UnicodeTranslateError extends UnicodeError {}
 
 @:native("Warning")
-extern class Warning extends Exception
-{
-
-}
+extern class Warning extends Exception {}
 
 @:native("DeprecationWarning")
-extern class DeprecationWarning extends Warning
-{
+extern class DeprecationWarning extends Warning {}
 
-}
 @:native("PendingDeprecationWarning")
-extern class PendingDeprecationWarning extends Warning
-{
+extern class PendingDeprecationWarning extends Warning {}
 
-}
 @:native("RuntimeWarning")
-extern class RuntimeWarning extends Warning
-{
+extern class RuntimeWarning extends Warning {}
 
-}
 @:native("SyntaxWarning")
-extern class SyntaxWarning extends Warning
-{
+extern class SyntaxWarning extends Warning {}
 
-}
 @:native("UserWarning")
-extern class UserWarning extends Warning
-{
+extern class UserWarning extends Warning {}
 
-}
 @:native("FutureWarning")
-extern class FutureWarning extends Warning
-{
+extern class FutureWarning extends Warning {}
 
-}
 @:native("ImportWarning")
-extern class ImportWarning extends Warning
-{
+extern class ImportWarning extends Warning {}
 
-}
 @:native("UnicodeWarning")
-extern class UnicodeWarning extends Warning
-{
+extern class UnicodeWarning extends Warning {}
 
-}
 @:native("BytesWarning")
-extern class BytesWarning extends Warning
-{
+extern class BytesWarning extends Warning {}
 
-}
 @:native("ResourceWarning")
-extern class ResourceWarning extends Warning
-{
-
-}
+extern class ResourceWarning extends Warning {}
diff --git a/std/python/HaxeIterable.hx b/std/python/HaxeIterable.hx
index 2e8b962a8c6b59443978e5d2e0ba1233ab091046..b51dfa142c7bc552411b9a52b0b6e479e52ca0cd 100644
--- a/std/python/HaxeIterable.hx
+++ b/std/python/HaxeIterable.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,19 +19,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.NativeIterable.NativeIterableRaw;
 
 class HaxeIterable<T> {
-
-	var x : NativeIterableRaw<T>;
+	var x:NativeIterableRaw<T>;
 
 	public inline function new(x:NativeIterableRaw<T>) {
 		this.x = x;
 	}
 
 	public inline function iterator():HaxeIterator<T> {
-        return new HaxeIterator(x.__iter__());
-    }
+		return new HaxeIterator(x.__iter__());
+	}
 }
diff --git a/std/python/HaxeIterator.hx b/std/python/HaxeIterator.hx
index a6a75784e988a063f78fc8994fd26fb059cce0d3..4cdb217131986ca0f3c0f6477cb1253d2b727e85 100644
--- a/std/python/HaxeIterator.hx
+++ b/std/python/HaxeIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.Exceptions.StopIteration;
@@ -35,12 +36,13 @@ class HaxeIterator<T> {
 	}
 
 	public inline function next():T {
-		if (!checked) hasNext();
+		if (!checked)
+			hasNext();
 		checked = false;
 		return x;
 	}
 
-	public function hasNext ():Bool {
+	public function hasNext():Bool {
 		if (!checked) {
 			try {
 				x = it.__next__();
diff --git a/std/python/KwArgs.hx b/std/python/KwArgs.hx
index c266306cf0dd5603ce603947b91df299b0b64240..892e8132faf36a9c13f6095fda40428f441248e1 100644
--- a/std/python/KwArgs.hx
+++ b/std/python/KwArgs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.Dict;
@@ -34,22 +35,23 @@ import python.Dict;
 	f({a: 10});
 	```
 **/
-abstract KwArgs<T:{}>(Dict<String,Dynamic>) {
-	inline function new (d:Dict<String,Dynamic>) {
+abstract KwArgs<T:{}>(Dict<String, Dynamic>) {
+	inline function new(d:Dict<String, Dynamic>) {
 		this = d;
 	}
 
-	@:to public inline function toDict():Dict<String,Dynamic> {
+	@:to public inline function toDict():Dict<String, Dynamic> {
 		// pass null, it's just to have the type information available in genpy
 		return toDictHelper(null);
 	}
+
 	// this is a helper method (hack) which is matched in genpy to extract the type information for reverse mapping
 	// of keyword fields.
-	function toDictHelper(x:T):Dict<String,Dynamic> {
+	function toDictHelper(x:T):Dict<String, Dynamic> {
 		return this;
 	}
 
-	@:from static inline function fromDict(d:Dict<String,Dynamic>):KwArgs<Dynamic> {
+	@:from static inline function fromDict(d:Dict<String, Dynamic>):KwArgs<Dynamic> {
 		return new KwArgs(d);
 	}
 
diff --git a/std/python/Lib.hx b/std/python/Lib.hx
index 0d566023cd30c823dd8cefdf7342f3bee22f0743..6ddcc3f6db275e00d3134ee43fa4c294a02ac0ab 100644
--- a/std/python/Lib.hx
+++ b/std/python/Lib.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.internal.AnonObject;
@@ -28,90 +29,90 @@ import python.NativeStringTools;
 typedef PySys = python.lib.Sys;
 
 /**
-	Platform-specific Python Library. Provides some platform-specific functions 
-	for the Python target, such as conversion from Haxe types to native types 
+	Platform-specific Python Library. Provides some platform-specific functions
+	for the Python target, such as conversion from Haxe types to native types
 	and vice-versa.
 **/
 class Lib {
+	static var lineEnd:String = Sys.systemName() == "Windows" ? "\r\n" : "\n";
+	static public var __name__(get, never):String;
+
+	static inline function get___name__():String
+		return python.Syntax.code('__name__');
+
 	/**
 		Print the specified value on the default output.
 	**/
-	public static function print(v:Dynamic):Void {
-		var str = Std.string(v);
+	public static inline function print(v:Dynamic):Void {
+		printString(Std.string(v));
+	}
 
-		PySys.stdout.buffer.write( NativeStringTools.encode(str, "utf-8"));
+	private static function printString(str:String):Void {
+		PySys.stdout.buffer.write(NativeStringTools.encode(str, "utf-8"));
 		PySys.stdout.flush();
 	}
 
 	/**
 		Print the specified value on the default output followed by a newline character.
 	**/
-	public static function println(v:Dynamic):Void {
+	public static inline function println(v:Dynamic):Void {
 		var str = Std.string(v);
-
-		PySys.stdout.buffer.write( NativeStringTools.encode('$str\n', "utf-8"));
-		PySys.stdout.flush();
+		printString('$str$lineEnd');
 	}
 
 	/**
-	 	Returns an anonymous Object which holds the same data as the Dictionary `v`.
+		Returns an anonymous Object which holds the same data as the Dictionary `v`.
 	**/
-	public static function dictToAnon (v:Dict<String, Dynamic>):Dynamic {
+	public static function dictToAnon(v:Dict<String, Dynamic>):Dynamic {
 		return new AnonObject(v.copy());
 	}
 
-
 	/**
-	 	Returns a flat copy of the underlying Dictionary of `o`.
+		Returns a flat copy of the underlying Dictionary of `o`.
 	**/
 	@:access(python.Boot.isAnonObject)
-	public static function anonToDict (o:{}):Dict<String, Dynamic> {
-		return if (Boot.isAnonObject(o))
-		{
-			(Syntax.field(o, "__dict__"):Dict<String,Dynamic>).copy();
-		}
-		else null;
-
+	public static function anonToDict(o:{}):Dict<String, Dynamic> {
+		return if (Boot.isAnonObject(o)) {
+			(Syntax.field(o, "__dict__") : Dict<String, Dynamic>).copy();
+		} else null;
 	}
 
 	/**
-	 	Returns the underlying Dictionary of the anonymous object `o`.
-	 	Modifications to this dictionary are reflected in the anonymous Object too.
+		Returns the underlying Dictionary of the anonymous object `o`.
+		Modifications to this dictionary are reflected in the anonymous Object too.
 	**/
 	@:access(python.Boot.isAnonObject)
-	public static function anonAsDict (o:{}):Dict<String, Dynamic> {
-		return if (Boot.isAnonObject(o))
-		{
-			(Syntax.field(o, "__dict__"):Dict<String,Dynamic>);
-		}
-		else null;
+	public static function anonAsDict(o:{}):Dict<String, Dynamic> {
+		return if (Boot.isAnonObject(o)) {
+			(Syntax.field(o, "__dict__") : Dict<String, Dynamic>);
+		} else null;
 	}
 
 	/**
-	 	Returns the Dictionary `d` as an anonymous Object.
-	 	Modifications to the object are reflected in the Dictionary too.
+		Returns the Dictionary `d` as an anonymous Object.
+		Modifications to the object are reflected in the Dictionary too.
 	**/
-	public static function dictAsAnon (d:Dict<String, Dynamic>):Dynamic {
+	public static inline function dictAsAnon(d:Dict<String, Dynamic>):Dynamic {
 		return new AnonObject(d);
 	}
 
 	/**
 		Return Python native iterable from Haxe iterable.
 	**/
-	public static function toPythonIterable <T>(it:Iterable<T>):python.NativeIterable<T> {
+	public static function toPythonIterable<T>(it:Iterable<T>):python.NativeIterable<T> {
 		return {
-			__iter__ : function () {
+			__iter__: function() {
 				var it1 = it.iterator();
 				var self:NativeIterator<T> = null;
 				self = new NativeIterator({
-					__next__ : function ():T {
-					if (it1.hasNext()) {
-						return it1.next();
-					} else {
-						throw new python.Exceptions.StopIteration();
-					}
-				},
-				__iter__ : function () return self
+					__next__: function():T {
+						if (it1.hasNext()) {
+							return it1.next();
+						} else {
+							throw new python.Exceptions.StopIteration();
+						}
+					},
+					__iter__: function() return self
 				});
 				return self;
 			}
@@ -121,14 +122,14 @@ class Lib {
 	/**
 		Return Haxe iterable from Python native iterable.
 	**/
-	public static inline function toHaxeIterable <T>(it:NativeIterable<T>):HaxeIterable<T> {
+	public static inline function toHaxeIterable<T>(it:NativeIterable<T>):HaxeIterable<T> {
 		return new HaxeIterable(it);
 	}
 
 	/**
 		Return Haxe iterator instance from Python native iterable.
 	**/
-	public static inline function toHaxeIterator <T>(it:NativeIterator<T>):HaxeIterator<T> {
+	public static inline function toHaxeIterator<T>(it:NativeIterator<T>):HaxeIterator<T> {
 		return new HaxeIterator(it);
 	}
 }
diff --git a/std/python/NativeArrayTools.hx b/std/python/NativeArrayTools.hx
index 5e13b07c430a4c90f05d6a5d1a4395838e2e2195..76080565d5c37d862047182e883fc5519493f54b 100644
--- a/std/python/NativeArrayTools.hx
+++ b/std/python/NativeArrayTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,20 +19,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 class NativeArrayTools {
-
-	public static inline function extend <T>(a:Array<T>, x:Array<T>):Void {
+	public static inline function extend<T>(a:Array<T>, x:Array<T>):Void {
 		python.Syntax.field(a, "extend")(x);
 	}
 
-	public static inline function append <T>(a:Array<T>, x:T):Void {
+	public static inline function append<T>(a:Array<T>, x:T):Void {
 		python.Syntax.field(a, "append")(x);
 	}
 
-	public static inline function contains <T>(a:Array<T>, x:T):Bool {
-		return python.Syntax.isIn(x,a);
+	public static inline function contains<T>(a:Array<T>, x:T):Bool {
+		return python.Syntax.isIn(x, a);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/python/NativeIterable.hx b/std/python/NativeIterable.hx
index 425916b48d44b30553e983cfc88beaee75b39aad..fe8b94fcd4d77c5704fb3daae8ff6c3a288aa9fa 100644
--- a/std/python/NativeIterable.hx
+++ b/std/python/NativeIterable.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,30 +19,32 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.HaxeIterable;
 import python.NativeIterator;
 
 /**
-    This type represents native Python iterables (objects that implement `__iter__()` method).
-    It supports Haxe iteration and conversion to `Iterable` by creating wrapper objects.
+	This type represents native Python iterables (objects that implement `__iter__()` method).
+	It supports Haxe iteration and conversion to `Iterable` by creating wrapper objects.
 **/
 abstract NativeIterable<T>(NativeIterableRaw<T>) to NativeIterableRaw<T> from NativeIterableRaw<T> {
+	/**
+		Return Haxe `Iterable` object wrapping `this` native iterable.
+	**/
+	@:to public inline function toHaxeIterable():HaxeIterable<T>
+		return new HaxeIterable(this);
 
-    /**
-        Return Haxe `Iterable` object wrapping `this` native iterable.
-    **/
-	@:to public inline function toHaxeIterable():HaxeIterable<T> return new HaxeIterable(this);
-
-    /**
-        Return Haxe `Iterator` object by wrapping `this.__iter__()` native iterator.
-    **/
-	public inline function iterator():HaxeIterator<T> return new HaxeIterator(this.__iter__());
+	/**
+		Return Haxe `Iterator` object by wrapping `this.__iter__()` native iterator.
+	**/
+	public inline function iterator():HaxeIterator<T>
+		return new HaxeIterator(this.__iter__());
 }
 
 /**
-    Native Python iterable protocol.
+	Native Python iterable protocol.
 **/
 typedef NativeIterableRaw<T> = {
 	private function __iter__():NativeIterator<T>;
diff --git a/std/python/NativeIterator.hx b/std/python/NativeIterator.hx
index a65108968c3e0dd1984b09eb14a39257274aa12f..76cccfb91062b28bcf0c5c46a8cfb66c5f98f03c 100644
--- a/std/python/NativeIterator.hx
+++ b/std/python/NativeIterator.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,27 +19,29 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.NativeIterable.NativeIterableRaw;
 
 /**
-    This type represents native Python iterators.
-    It supports automatic conversion to Haxe `Iterator` by creating wrapper object.
+	This type represents native Python iterators.
+	It supports automatic conversion to Haxe `Iterator` by creating wrapper object.
 **/
 abstract NativeIterator<T>(NativeIteratorRaw<T>) to NativeIteratorRaw<T> to NativeIterable<T> {
-	public inline function new(p:NativeIteratorRaw<T>) this = p;
+	public inline function new(p:NativeIteratorRaw<T>)
+		this = p;
 
-    /**
-        Return Haxe `Iterator` object by wrapping `this` native iterator.
-    **/
-	@:to public inline function toHaxeIterator():HaxeIterator<T> return new HaxeIterator(this);
+	/**
+		Return Haxe `Iterator` object by wrapping `this` native iterator.
+	**/
+	@:to public inline function toHaxeIterator():HaxeIterator<T>
+		return new HaxeIterator(this);
 }
 
 /**
-    Native Python iterator protocol.
+	Native Python iterator protocol.
 **/
-typedef NativeIteratorRaw<T> = {
-	>NativeIterableRaw<T>,
+typedef NativeIteratorRaw<T> = NativeIterableRaw<T> & {
 	function __next__():T;
 }
diff --git a/std/python/NativeStringTools.hx b/std/python/NativeStringTools.hx
index 81c6ce20477117bc234e143c85ee0f6e12803135..0842bbf4d195d2a75bd2bcc7c30bec2d988aaad5 100644
--- a/std/python/NativeStringTools.hx
+++ b/std/python/NativeStringTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,34 +19,38 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.Bytes;
 import python.Tuple;
 
 class NativeStringTools {
-
-	public static function format (s:String, args:Array<Dynamic>):String
-	{
+	public static function format(s:String, args:Array<Dynamic>):String {
 		return python.Syntax.field(s, "format")(python.Syntax.varArgs(args));
 	}
 
-	public static inline function encode(s:String, encoding:String="utf-8", errors:String="strict"):Bytes {
-		return (python.Syntax.callField(s, "encode", encoding, errors):Bytes);
+	public static inline function encode(s:String, encoding:String = "utf-8", errors:String = "strict"):Bytes {
+		return (python.Syntax.callField(s, "encode", encoding, errors) : Bytes);
 	}
 
 	public static inline function contains(s:String, e:String):Bool {
-		return python.Syntax.isIn(e,s);
+		return python.Syntax.isIn(e, s);
 	}
 
-	public static inline function strip(s:String, ?chars:String):String
-	{
+	public static inline function strip(s:String, ?chars:String):String {
 		return python.Syntax.field(s, "strip")(chars);
 	}
 
-	public static inline function rpartition (s:String, sep:String):Tuple3<String, String, String>
-	{
+	public static inline function rpartition(s:String, sep:String):Tuple3<String, String, String> {
 		return python.Syntax.field(s, "rpartition")(sep);
 	}
 
-}
\ No newline at end of file
+	public static inline function startswith(s:String, prefix:String):Bool {
+		return python.Syntax.field(s, "startswith")(prefix);
+	}
+
+	public static inline function endswith(s:String, suffix:String):Bool {
+		return python.Syntax.field(s, "endswith")(suffix);
+	}
+}
diff --git a/std/python/Set.hx b/std/python/Set.hx
index 3c481cdbabea70524144745d378964a9dfbfd39e..fc5ba525d2fda0c0794875213a039128d21d72e9 100644
--- a/std/python/Set.hx
+++ b/std/python/Set.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import haxe.extern.Rest;
@@ -32,7 +33,7 @@ extern class Set<T> {
 	@:overload(function(?array:Array<T>):Void {})
 	function new(?iterable:NativeIterable<T>):Void;
 
-	var length(get,never):Int;
+	var length(get, never):Int;
 	private inline function get_length():Int {
 		return UBuiltins.len(this);
 	}
diff --git a/std/python/Syntax.hx b/std/python/Syntax.hx
index a0de2d62291cbe4927992be1b7e73b9b4bd37312..eb785e6e440ac7c35f3ab13204ff02c602788f9d 100644
--- a/std/python/Syntax.hx
+++ b/std/python/Syntax.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 #if macro
@@ -26,53 +27,66 @@ import haxe.macro.Expr;
 import haxe.macro.Context;
 import haxe.macro.ExprTools;
 #end
+import haxe.extern.Rest;
 
 @:noPackageRestrict
+@:noClosure
 extern class Syntax {
-
 	#if macro
 	static var self = macro python.Syntax;
 	#end
 
-	@:noUsing macro public static function importModule (module:String):haxe.macro.Expr {
-		return macro ($self.pythonCode($v{"import " + module}):Void);
+	@:noUsing macro public static function importModule(module:String):haxe.macro.Expr {
+		return macro($self.code($v{"import " + module}) : Void);
 	}
 
-	@:noUsing macro public static function importAs (module:String, className : String):haxe.macro.Expr {
+	@:noUsing macro public static function importAs(module:String, className:String):haxe.macro.Expr {
 		var n = className.split(".").join("_");
 		var e = "import " + module + " as " + n;
 
-		return macro ($self.pythonCode($v{e}):Void);
+		return macro($self.code($v{e}) : Void);
 	}
 
+	#if !macro
+	@:overload(function(className:String, args:Rest<Dynamic>):Dynamic {})
+	static function construct<T>(cls:Class<T>, args:Rest<Dynamic>):T;
+	#end
+
 	@:noUsing
-	macro public static function newInstance (c:Expr, params:Array<Expr>):haxe.macro.Expr {
+	@:deprecated("python.Syntax.newInstance() is deprecated. Use python.Syntax.construct() instead.")
+	macro public static function newInstance(c:Expr, params:Array<Expr>):haxe.macro.Expr {
 		return macro $self._newInstance($c, $a{params});
 	}
 
-	static function _newInstance(c:Dynamic, args:Array<Dynamic>):Dynamic { return null; }
+	extern static function _newInstance(c:Dynamic, args:Array<Dynamic>):Dynamic;
 
 	@:noUsing
-	public static function isIn(a:Dynamic, b:Dynamic):Bool { return false; }
+	extern public static function isIn(a:Dynamic, b:Dynamic):Bool;
 
 	@:noUsing
-	public static function delete(a:Dynamic):Void { }
+	extern public static function delete(a:Dynamic):Void;
 
 	@:noUsing
-	public static function binop(a:Dynamic, op:String, b:Dynamic):Dynamic { return null; }
+	extern public static function binop(a:Dynamic, op:String, b:Dynamic):Dynamic;
 
 	@:noUsing
-	public static function assign(a:Dynamic, b:Dynamic):Void { }
+	extern public static function assign(a:Dynamic, b:Dynamic):Void;
+
+	#if !macro
+	public static function code(code:String, args:Rest<Dynamic>):Dynamic;
+	#end
 
 	@:noUsing
+	@:deprecated("python.Syntax.pythonCode() is deprecated. Use python.Syntax.code() instead.")
 	macro public static function pythonCode(b:ExprOf<String>, rest:Array<Expr>):Expr {
-		if (rest == null) rest = [];
+		if (rest == null)
+			rest = [];
 		return macro @:pos(Context.currentPos()) untyped $self._pythonCode($b, $a{rest});
 	};
 
 	#if !macro
 	@:noUsing
-	public static function _pythonCode<T>(b:String, args:Array<Dynamic>):T { return null; };
+	public static function _pythonCode<T>(b:String, args:Array<Dynamic>):T;
 	#end
 	@:noUsing
 	macro public static function arrayAccess(x:Expr, rest:Array<Expr>):ExprOf<Dynamic> {
@@ -84,28 +98,26 @@ extern class Syntax {
 		return macro $self._arrayAccess($x, $a{rest}, true);
 	}
 
-	static function _arrayAccess(a:Dynamic, args:Array<Dynamic>, ?trailingColon:Bool = false):Dynamic { return null; }
+	extern static function _arrayAccess(a:Dynamic, args:Array<Dynamic>, ?trailingColon:Bool = false):Dynamic;
 
 	@:noUsing
-	public static function arraySet(a:Dynamic, i:Dynamic, v:Dynamic):Dynamic { return null; }
-
-
-	static function _foreach(id:Dynamic, it:Dynamic, block:Dynamic):Dynamic { return null; }
+	extern public static function arraySet(a:Dynamic, i:Dynamic, v:Dynamic):Dynamic;
 
+	extern static function _foreach(id:Dynamic, it:Dynamic, block:Dynamic):Dynamic;
 
 	@:noUsing
 	macro public static function foreach<T>(v:Expr, it:Expr, b:Expr):haxe.macro.Expr {
 		var id = switch (v.expr) {
 			case EConst(CIdent(x)): x;
-			case _ : Context.error("unexpected " + ExprTools.toString(v) + ": const ident expected", v.pos);
+			case _: Context.error("unexpected " + ExprTools.toString(v) + ": const ident expected", v.pos);
 		}
 
 		var iter = try {
-			var it = macro ($it.__iter__() : python.NativeIterator.NativeIteratorRaw<T>);
+			var it = macro($it.__iter__() : python.NativeIterator.NativeIteratorRaw<T>);
 			Context.typeof(it);
 			it;
 		} catch (e:Dynamic) {
-			macro ($it : python.NativeIterable.NativeIterableRaw<T>);
+			macro($it : python.NativeIterable.NativeIterableRaw<T>);
 		}
 
 		return macro {
@@ -114,13 +126,12 @@ extern class Syntax {
 		}
 	}
 
-	@:noUsing macro public static function importFromAs (from:String, module:String, className : String):haxe.macro.Expr {
-
+	@:noUsing macro public static function importFromAs(from:String, module:String, className:String):haxe.macro.Expr {
 		var n = className.split(".").join("_");
 
 		var e = "from " + from + " import " + module + " as " + n;
 
-		return macro ($self.pythonCode($v{e}):Void);
+		return macro($self.code($v{e}) : Void);
 	}
 
 	@:noUsing
@@ -128,10 +139,10 @@ extern class Syntax {
 		return macro @:pos(o.pos) $self.call($self.field($o, $field), $a{params});
 	}
 
-	static function call(e:Dynamic, args:Array<Dynamic>):Dynamic { return null; }
+	extern static function call(e:Dynamic, args:Array<Dynamic>):Dynamic;
 
 	@:noUsing
-	public static function field (o:Dynamic, field:String):Dynamic { return null; }
+	extern public static function field(o:Dynamic, field:String):Dynamic;
 
 	@:noUsing
 	macro public static function tuple(args:Array<Expr>):Dynamic {
@@ -139,16 +150,16 @@ extern class Syntax {
 		return macro $self._tuple($args);
 	}
 
-	static function _tuple(args:Array<Dynamic>):Dynamic { return null; }
+	extern static function _tuple(args:Array<Dynamic>):Dynamic;
 
 	@:noUsing
-	public static function varArgs(args:Array<Dynamic>):Dynamic { return null; }
+	extern public static function varArgs(args:Array<Dynamic>):Dynamic;
 
-	macro public static function callNamedUntyped (e:Expr, args:Expr):Expr {
+	macro public static function callNamedUntyped(e:Expr, args:Expr):Expr {
 		return macro @:pos(e.pos) $self._callNamedUntyped($e, $args);
 	}
 
-	static function _callNamedUntyped(e:Dynamic, args:Dynamic):Dynamic { return null; }
+	extern static function _callNamedUntyped(e:Dynamic, args:Dynamic):Dynamic;
 
-	public static function opPow(a:Int, b:Int):Int { return 0; }
-}
\ No newline at end of file
+	extern public static function opPow(a:Int, b:Int):Int;
+}
diff --git a/std/python/Tuple.hx b/std/python/Tuple.hx
index cf2e64e2effe07412d6f966fc115c7fc4e54fe40..276997746a0689e29481e2fc3ad88ede67068e66 100644
--- a/std/python/Tuple.hx
+++ b/std/python/Tuple.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.internal.UBuiltins;
@@ -29,7 +30,7 @@ extern class Tuple<X> implements ArrayAccess<X> {
 	@:overload(function():Void {})
 	function new(a:Array<X>):Void;
 
-	var length(get,never):Int;
+	var length(get, never):Int;
 
 	inline function get_length():Int {
 		return UBuiltins.len(this);
@@ -42,55 +43,75 @@ extern class Tuple<X> implements ArrayAccess<X> {
 
 @:native("tuple")
 extern class Tuple1<A> extends Tuple<Dynamic> {
-	static inline function make<A>(a:A):Tuple1<A> return Syntax.tuple(a);
+	static inline function make<A>(a:A):Tuple1<A>
+		return Syntax.tuple(a);
 	var _1(get, null):A;
-	inline function get__1():A return this[0];
+	inline function get__1():A
+		return this[0];
 }
 
 @:native("tuple")
-extern class Tuple2<A,B> extends Tuple<Dynamic> {
-	static inline function make <A,B>(a:A, b:B):Tuple2<A,B> return Syntax.tuple(a,b);
+extern class Tuple2<A, B> extends Tuple<Dynamic> {
+	static inline function make<A, B>(a:A, b:B):Tuple2<A, B>
+		return Syntax.tuple(a, b);
 	var _1(get, null):A;
-	inline function get__1():A return this[0];
+	inline function get__1():A
+		return this[0];
 	var _2(get, null):B;
-	inline function get__2():B return this[1];
+	inline function get__2():B
+		return this[1];
 }
 
 @:native("tuple")
-extern class Tuple3<A,B,C> extends Tuple<Dynamic> {
-	static inline function make <A,B,C>(a:A, b:B,c:C):Tuple3<A,B,C> return Syntax.tuple(a,b,c);
+extern class Tuple3<A, B, C> extends Tuple<Dynamic> {
+	static inline function make<A, B, C>(a:A, b:B, c:C):Tuple3<A, B, C>
+		return Syntax.tuple(a, b, c);
 	var _1(get, null):A;
-	inline function get__1():A return this[0];
+	inline function get__1():A
+		return this[0];
 	var _2(get, null):B;
-	inline function get__2():B return this[1];
+	inline function get__2():B
+		return this[1];
 	var _3(get, null):C;
-	inline function get__3():C return this[2];
+	inline function get__3():C
+		return this[2];
 }
 
 @:native("tuple")
-extern class Tuple4<A,B,C,D> extends Tuple<Dynamic> {
-	static inline function make <A,B,C,D>(a:A, b:B,c:C,d:D):Tuple4<A,B,C,D> return Syntax.tuple(a,b,c,d);
+extern class Tuple4<A, B, C, D> extends Tuple<Dynamic> {
+	static inline function make<A, B, C, D>(a:A, b:B, c:C, d:D):Tuple4<A, B, C, D>
+		return Syntax.tuple(a, b, c, d);
 	var _1(get, null):A;
-	inline function get__1():A return this[0];
+	inline function get__1():A
+		return this[0];
 	var _2(get, null):B;
-	inline function get__2():B return this[1];
+	inline function get__2():B
+		return this[1];
 	var _3(get, null):C;
-	inline function get__3():C return this[2];
+	inline function get__3():C
+		return this[2];
 	var _4(get, null):D;
-	inline function get__4():D return this[3];
+	inline function get__4():D
+		return this[3];
 }
 
 @:native("tuple")
-extern class Tuple5<A,B,C,D,E> extends Tuple<Dynamic> {
-	static inline function make <A,B,C,D,E>(a:A, b:B,c:C,d:D,e:E):Tuple5<A,B,C,D,E> return Syntax.tuple(a,b,c,d,e);
+extern class Tuple5<A, B, C, D, E> extends Tuple<Dynamic> {
+	static inline function make<A, B, C, D, E>(a:A, b:B, c:C, d:D, e:E):Tuple5<A, B, C, D, E>
+		return Syntax.tuple(a, b, c, d, e);
 	var _1(get, null):A;
-	inline function get__1():A return this[0];
+	inline function get__1():A
+		return this[0];
 	var _2(get, null):B;
-	inline function get__2():B return this[1];
+	inline function get__2():B
+		return this[1];
 	var _3(get, null):C;
-	inline function get__3():C return this[2];
+	inline function get__3():C
+		return this[2];
 	var _4(get, null):D;
-	inline function get__4():D return this[3];
+	inline function get__4():D
+		return this[3];
 	var _5(get, null):E;
-	inline function get__5():E return this[4];
+	inline function get__5():E
+		return this[4];
 }
diff --git a/std/python/VarArgs.hx b/std/python/VarArgs.hx
index 07f4c4ad433781eb574817b632027531f880327a..38080381342b6c6bf94e7d4bbfa95a9a6c8c17ee 100644
--- a/std/python/VarArgs.hx
+++ b/std/python/VarArgs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python;
 
 import python.internal.UBuiltins.list;
diff --git a/std/python/_std/Array.hx b/std/python/_std/Array.hx
index 7e21ea93c1e05b2bb606914bf5e5cc9b066ec09e..42f81e0c9314a39026cce241152c7587bfcfe93d 100644
--- a/std/python/_std/Array.hx
+++ b/std/python/_std/Array.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 #if !macro
 import python.internal.ArrayImpl;
 import python.NativeIterator;
@@ -27,110 +28,105 @@ import python.NativeIterator;
 @:native("list")
 @:coreApi
 extern class Array<T> implements ArrayAccess<T> {
+	public var length(default, null):Int;
 
-	public var length(default,null) : Int;
-
-
-	public function new() : Void;
-
-	public inline function concat( a : Array<T>) : Array<T> {
+	public function new():Void;
 
+	public inline function concat(a:Array<T>):Array<T> {
 		return ArrayImpl.concat(this, a);
 	}
 
-	public inline function copy() : Array<T> {
+	public inline function copy():Array<T> {
 		return ArrayImpl.copy(this);
 	}
 
-	@:runtime public inline function iterator() : Iterator<T> {
+	@:runtime public inline function iterator():Iterator<T> {
 		return ArrayImpl.iterator(this);
 	}
 
-	public inline function insert( pos : Int, x : T ) : Void {
+	public inline function insert(pos:Int, x:T):Void {
 		ArrayImpl.insert(this, pos, x);
 	}
 
-
-	@:runtime public inline function join( sep : String ) : String {
+	@:runtime public inline function join(sep:String):String {
 		return ArrayImpl.join(this, sep);
 	}
 
-	public inline function toString() : String {
+	public inline function toString():String {
 		return ArrayImpl.toString(this);
 	}
 
-	@:runtime public inline function pop() : Null<T> {
+	@:runtime public inline function pop():Null<T> {
 		return ArrayImpl.pop(this);
 	}
 
-	@:runtime public inline function push(x:T) : Int {
-		return ArrayImpl.push(this,x);
+	@:runtime public inline function push(x:T):Int {
+		return ArrayImpl.push(this, x);
 	}
 
-	public inline function unshift(x : T) : Void {
-		ArrayImpl.unshift(this,x);
+	public inline function unshift(x:T):Void {
+		ArrayImpl.unshift(this, x);
 	}
 
-	public inline function indexOf(x : T, ?fromIndex:Int) : Int {
-		return ArrayImpl.indexOf(this,x, fromIndex);
+	public inline function indexOf(x:T, ?fromIndex:Int):Int {
+		return ArrayImpl.indexOf(this, x, fromIndex);
 	}
 
-	public inline function lastIndexOf(x : T, ?fromIndex:Int) : Int {
-		return ArrayImpl.lastIndexOf(this,x, fromIndex);
+	public inline function lastIndexOf(x:T, ?fromIndex:Int):Int {
+		return ArrayImpl.lastIndexOf(this, x, fromIndex);
 	}
 
-	public inline function remove(x : T) : Bool {
-		return ArrayImpl.remove(this,x);
-
+	public inline function remove(x:T):Bool {
+		return ArrayImpl.remove(this, x);
 	}
 
-	public inline function reverse() : Void {
+	public inline function reverse():Void {
 		ArrayImpl.reverse(this);
 	}
 
-	@:runtime public inline function shift() : Null<T> {
+	@:runtime public inline function shift():Null<T> {
 		return ArrayImpl.shift(this);
 	}
 
-	public inline function slice( pos : Int, ?end : Int ) : Array<T> {
+	public inline function slice(pos:Int, ?end:Int):Array<T> {
 		return ArrayImpl.slice(this, pos, end);
 	}
 
-	public inline function sort(f:T->T->Int) : Void {
+	public inline function sort(f:T->T->Int):Void {
 		ArrayImpl.sort(this, f);
 	}
 
-	public inline function splice( pos : Int, len : Int ) : Array<T> {
+	public inline function splice(pos:Int, len:Int):Array<T> {
 		return ArrayImpl.splice(this, pos, len);
 	}
 
-	@:runtime public inline function map<S>( f : T -> S ) : Array<S> {
+	@:runtime public inline function map<S>(f:T->S):Array<S> {
 		return ArrayImpl.map(this, f);
 	}
 
-	@:runtime public inline function filter( f : T -> Bool ) : Array<T> {
-		return ArrayImpl.filter(this,f);
+	@:runtime public inline function filter(f:T->Bool):Array<T> {
+		return ArrayImpl.filter(this, f);
+	}
+
+	public inline function resize(len:Int):Void {
+		ArrayImpl.resize(this, len);
 	}
 
-	@:keep private inline function _get(idx:Int):T
-	{
+	@:keep private inline function _get(idx:Int):T {
 		return ArrayImpl._get(this, idx);
 	}
 
-	@:keep private inline function _set(idx:Int, val:T):T
-	{
-		return ArrayImpl._set(this, idx,val);
+	@:keep private inline function _set(idx:Int, val:T):T {
+		return ArrayImpl._set(this, idx, val);
 	}
 
-	@:keep private inline function unsafeGet(idx:Int):T
-	{
+	@:keep private inline function unsafeGet(idx:Int):T {
 		return ArrayImpl.unsafeGet(this, idx);
 	}
 
-	@:keep private inline function unsafeSet(idx:Int, val:T):T
-	{
-		return ArrayImpl.unsafeSet(this, idx,val);
+	@:keep private inline function unsafeSet(idx:Int, val:T):T {
+		return ArrayImpl.unsafeSet(this, idx, val);
 	}
 
-	@:noCompletion private function __iter__ ():NativeIterator<T>;
-}
\ No newline at end of file
+	@:noCompletion private function __iter__():NativeIterator<T>;
+}
diff --git a/std/python/_std/Date.hx b/std/python/_std/Date.hx
index 4dd8b98d387ed5f8533d0730a23855d41a5aca4a..3899bcaa529824667ab2dafd5611ff6986f51cff 100644
--- a/std/python/_std/Date.hx
+++ b/std/python/_std/Date.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,124 +19,137 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import python.lib.datetime.Datetime;
 import python.lib.datetime.Timedelta;
+import python.lib.datetime.Timezone;
 import python.Syntax;
 
-@:coreApi class Date
-{
-	static var EPOCH_UTC = Datetime.fromtimestamp(0, python.lib.datetime.Timezone.utc);
-
+@:coreApi class Date {
 	private var date:Datetime;
-
-	public function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void
-	{
-		if (year < Datetime.min.year) year = Datetime.min.year;
-		if (day == 0) day = 1;
-		date = new Datetime(year, month+1, day, hour, min, sec, 0);
+	private var dateUTC:Datetime;
+
+	public function new(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Void {
+		if (year < Datetime.min.year)
+			year = Datetime.min.year;
+		if (day == 0)
+			day = 1;
+		date = makeLocal(new Datetime(year, month + 1, day, hour, min, sec, 0));
+		dateUTC = date.astimezone(Timezone.utc);
 	}
 
-	public inline function getTime() : Float
-	{
-		return python.lib.Time.mktime(date.timetuple()) * 1000;
+	public inline function getTime():Float {
+		return date.timestamp() * 1000;
 	}
 
-	public inline function getHours() : Int
-	{
+	public inline function getHours():Int {
 		return date.hour;
 	}
 
-	public inline function getMinutes() : Int
-	{
+	public inline function getMinutes():Int {
 		return date.minute;
 	}
 
-	public inline function getSeconds() : Int
-	{
+	public inline function getSeconds():Int {
 		return date.second;
 	}
 
-	public inline function getFullYear() : Int
-	{
+	public inline function getFullYear():Int {
 		return date.year;
 	}
 
-	public inline function getMonth() : Int
-	{
-		return date.month-1;
+	public inline function getMonth():Int {
+		return date.month - 1;
 	}
 
-	public inline function getDate() : Int
-	{
+	public inline function getDate():Int {
 		return date.day;
 	}
 
-	public inline function getDay() : Int
-	{
-		return date.isoweekday();
+	public inline function getDay():Int {
+		return date.isoweekday() % 7;
 	}
 
-	public function toString():String
-	{
-		inline function st (x) return Std.string(x);
+	public inline function getUTCHours():Int {
+		return dateUTC.hour;
+	}
 
-		var m = getMonth()+1;
-		var d = getDate();
-		var h = getHours();
-		var mi = getMinutes();
-		var s = getSeconds();
-		return st(getFullYear())
-			+"-"+(if( m < 10 ) "0"+st(m) else ""+st(m))
-			+"-"+(if( d < 10 ) "0"+st(d) else ""+st(d))
-			+" "+(if( h < 10 ) "0"+st(h) else ""+st(h))
-			+":"+(if( mi < 10 ) "0"+st(mi) else ""+st(mi))
-			+":"+(if( s < 10 ) "0"+st(s) else ""+st(s));
+	public inline function getUTCMinutes():Int {
+		return dateUTC.minute;
 	}
 
-	static public function now() : Date
-	{
-		var d = new Date(1970, 0, 1, 0, 0, 0);
-		d.date = Datetime.now();
-		return d;
+	public inline function getUTCSeconds():Int {
+		return dateUTC.second;
 	}
 
-	static public function fromTime( t : Float ) : Date
-	{
-		var d = new Date(1970, 0, 1, 0, 0, 0);
-		d.date = Datetime.fromtimestamp(t / 1000.0);
-		return d;
+	public inline function getUTCFullYear():Int {
+		return dateUTC.year;
 	}
 
+	public inline function getUTCMonth():Int {
+		return dateUTC.month - 1;
+	}
+
+	public inline function getUTCDate():Int {
+		return dateUTC.day;
+	}
+
+	public inline function getUTCDay():Int {
+		return dateUTC.isoweekday() % 7;
+	}
 
-	static function UTC( year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Float
-	{
-		var dt = new Datetime(year, month+1, day, hour, min, sec, 0, python.lib.datetime.Timezone.utc);
-		return datetimeTimestamp(dt, EPOCH_UTC);
+	public function getTimezoneOffset():Int {
+		return -Std.int(Syntax.binop(date.utcoffset(), "/", new Timedelta(0, 60)));
 	}
 
+	public function toString():String {
+		return date.strftime("%Y-%m-%d %H:%M:%S");
+	}
+
+	static public function now():Date {
+		var d = new Date(2000, 0, 1, 0, 0, 0);
+		d.date = makeLocal(Datetime.now());
+		d.dateUTC = d.date.astimezone(Timezone.utc);
+		return d;
+	}
+
+	static public function fromTime(t:Float):Date {
+		var d = new Date(2000, 0, 1, 0, 0, 0);
+		d.date = makeLocal(Datetime.fromtimestamp(t / 1000.0));
+		d.dateUTC = d.date.astimezone(Timezone.utc);
+		return d;
+	}
+
+	static function makeLocal(date:Datetime):Datetime {
+		try {
+			return date.astimezone();
+		} catch (e:Dynamic) {
+			// No way in vanilla Python <=3.5 to get the local timezone
+			// Additionally dates close to the epoch <86400 will throw on astimezone
+			var tzinfo = Datetime.now(Timezone.utc).astimezone().tzinfo;
+			return date.replace({tzinfo: tzinfo});
+		}
+	}
 
-	static function datetimeTimestamp(dt:Datetime, epoch:Datetime):Float {
-		return (Syntax.binop(dt, "-", epoch) : Timedelta).total_seconds() * 1000;
+	static function UTC(year:Int, month:Int, day:Int, hour:Int, min:Int, sec:Int):Float {
+		return new Datetime(year, month + 1, day, hour, min, sec, 0, python.lib.datetime.Timezone.utc).timestamp() * 1000;
 	}
 
-	static public function fromString( s : String ) : Date
-	{
-		switch( s.length )
-		{
+	static public function fromString(s:String):Date {
+		switch (s.length) {
 			case 8: // hh:mm:ss
 				var k = s.split(":");
-				var d : Date = new Date(0, 0, 0, Std.parseInt(k[0]), Std.parseInt(k[1]), Std.parseInt(k[2]));
-				return d;
+				return Date.fromTime(Std.parseInt(k[0]) * 3600000. + Std.parseInt(k[1]) * 60000. + Std.parseInt(k[2]) * 1000.);
 			case 10: // YYYY-MM-DD
 				var k = s.split("-");
-				return new Date(Std.parseInt(k[0]),Std.parseInt(k[1]) - 1,Std.parseInt(k[2]),0,0,0);
+				return new Date(Std.parseInt(k[0]), Std.parseInt(k[1]) - 1, Std.parseInt(k[2]), 0, 0, 0);
 			case 19: // YYYY-MM-DD hh:mm:ss
 				var k = s.split(" ");
 				var y = k[0].split("-");
 				var t = k[1].split(":");
-				return new Date(Std.parseInt(y[0]),Std.parseInt(y[1]) - 1,Std.parseInt(y[2]),Std.parseInt(t[0]),Std.parseInt(t[1]),Std.parseInt(t[2]));
+				return new Date(Std.parseInt(y[0]), Std.parseInt(y[1]) - 1, Std.parseInt(y[2]), Std.parseInt(t[0]), Std.parseInt(t[1]), Std.parseInt(t[2]));
 			default:
 				throw "Invalid date format : " + s;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/_std/EReg.hx b/std/python/_std/EReg.hx
index f0b3dcf025006256b3728d6ec47224730d6a2b44..845f7a0c5d57166586aee4c462a25845b6bbb9fd 100644
--- a/std/python/_std/EReg.hx
+++ b/std/python/_std/EReg.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import python.internal.UBuiltins;
 import python.lib.Re;
 import python.lib.Re.MatchObject;
@@ -30,60 +31,63 @@ class EReg {
 	var matchObj:MatchObject;
 	var global:Bool;
 
-	public function new( r : String, opt : String ) {
+	public function new(r:String, opt:String) {
 		global = false;
 		var options = 0;
 		for (i in 0...opt.length) {
 			var c = StringTools.fastCodeAt(opt, i);
-			if (c == "m".code) options |= Re.M;
-			if (c == "i".code) options |= Re.I;
-			if (c == "s".code) options |= Re.S;
-			if (c == "u".code) options |= Re.U;
-			if (c == "g".code) global = true;
+			if (c == "m".code)
+				options |= Re.M;
+			if (c == "i".code)
+				options |= Re.I;
+			if (c == "s".code)
+				options |= Re.S;
+			if (c == "u".code)
+				options |= Re.U;
+			if (c == "g".code)
+				global = true;
 		}
 		pattern = Re.compile(r, options);
 	}
 
-	public inline function match( s : String ) : Bool {
+	public inline function match(s:String):Bool {
 		matchObj = Re.search(pattern, s);
 		return matchObj != null;
 	}
 
-	public inline function matched( n : Int ) : String {
+	public inline function matched(n:Int):String {
 		return matchObj.group(n);
 	}
 
-	public inline function matchedLeft() : String {
+	public inline function matchedLeft():String {
 		return matchObj.string.substr(0, matchObj.start());
 	}
 
-	public inline function matchedRight() : String {
+	public inline function matchedRight():String {
 		return matchObj.string.substr(matchObj.end());
 	}
 
-	public inline function matchedPos() : { pos : Int, len : Int } {
-		return { pos : matchObj.start(), len : matchObj.end() - matchObj.start() };
+	public inline function matchedPos():{pos:Int, len:Int} {
+		return {pos: matchObj.start(), len: matchObj.end() - matchObj.start()};
 	}
 
-	public function matchSub( s : String, pos : Int, len : Int = -1):Bool {
+	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
 		if (len != -1) {
-			matchObj = pattern.search(s, pos, pos+len);
+			matchObj = pattern.search(s, pos, pos + len);
 		} else {
 			matchObj = pattern.search(s, pos);
 		}
 
 		return this.matchObj != null;
-
 	}
 
-	public function split( s : String ) : Array<String> {
+	public function split(s:String):Array<String> {
 		return if (global) {
 			var ret = [];
 			var lastEnd = 0;
 
 			for (x in Re.finditer(pattern, s)) {
-
-				ret.push(s.substring(lastEnd, x.start() ));
+				ret.push(s.substring(lastEnd, x.start()));
 				lastEnd = x.end();
 			}
 			ret.push(s.substr(lastEnd));
@@ -93,62 +97,53 @@ class EReg {
 			if (matchObj == null) {
 				[s];
 			} else {
-				[ s.substring(0, matchObj.start()), s.substr(matchObj.end()) ];
+				[s.substring(0, matchObj.start()), s.substr(matchObj.end())];
 			}
-
 		}
 	}
 
-	public function replace( s : String, by : String ) : String
-	{
+	public function replace(s:String, by:String):String {
 		var by = by.split("$$").join("_hx_#repl#__");
-		function replace (x:MatchObject) {
+		function replace(x:MatchObject) {
 			var res = by;
 			var g = x.groups();
 			for (i in 0...g.length) {
 				var gs = g[i];
 				if (gs == null)
 					continue;
-				res = res.split("$"+UBuiltins.str(i+1)).join(gs);
+				res = res.split("$" + UBuiltins.str(i + 1)).join(gs);
 			}
 			res = res.split("_hx_#repl#__").join("$");
 			return res;
 		}
-		return Re.sub(pattern, replace, s, global ? 0 : 1 );
+		return Re.sub(pattern, replace, s, global ? 0 : 1);
 	}
 
-	public function map( s : String, f : EReg -> String ) : String {
-
+	public function map(s:String, f:EReg->String):String {
 		var buf = new StringBuf();
 		var pos = 0;
 		var right = s;
 
 		var cur = this;
-		while( pos < s.length ) {
-
+		while (pos < s.length) {
 			if (matchObj == null) {
 				matchObj = Re.search(pattern, s);
 			} else {
 				matchObj = matchObj.re.search(s, pos);
 			}
 
-			if( matchObj == null )
+			if (matchObj == null)
 				break;
 
-
-
 			var pos1 = matchObj.end();
 
 			var curPos = cur.matchedPos();
 
-
 			buf.add(cur.matchedLeft().substr(pos));
 			buf.add(f(cur));
 
 			right = cur.matchedRight();
 
-
-
 			if (!global) {
 				buf.add(right);
 				return buf.toString();
@@ -157,15 +152,16 @@ class EReg {
 			if (curPos.len == 0) {
 				buf.add(s.charAt(pos1));
 				right = right.substr(1);
-				pos = pos1+1;
+				pos = pos1 + 1;
 			} else {
 				pos = pos1;
 			}
-
-
 		}
 		buf.add(right);
 		return buf.toString();
+	}
 
+	public static inline function escape(s:String):String {
+		return Re.escape(s);
 	}
 }
diff --git a/std/python/_std/Math.hx b/std/python/_std/Math.hx
index 8e92223df0763a95f74ff8abcaf655e48a5ad27f..89d605418da884abd00fae55683d036a6fad6c2a 100644
--- a/std/python/_std/Math.hx
+++ b/std/python/_std/Math.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,32 +19,30 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import python.internal.UBuiltins;
 
 @:pythonImport("math")
 @:coreApi
-extern class Math
-{
-	static var PI(default,null) : Float;
+extern class Math {
+	static var PI(default, null):Float;
 
-	static var NEGATIVE_INFINITY(default, null) : Float;
+	static var NEGATIVE_INFINITY(default, null):Float;
 
-	static var POSITIVE_INFINITY(default,null) : Float;
+	static var POSITIVE_INFINITY(default, null):Float;
 
-	static var NaN(default, null) : Float;
+	static var NaN(default, null):Float;
 
-	public static inline function abs(v:Float):Float
-	{
-		return (Math:Dynamic).fabs(v);
+	public static inline function abs(v:Float):Float {
+		return (Math : Dynamic).fabs(v);
 	}
 
 	public static inline function min(a:Float, b:Float):Float {
-		return if (isNaN(a)) a else if (isNaN(b)) b else UBuiltins.min(a,b);
+		return if (isNaN(a)) a else if (isNaN(b)) b else UBuiltins.min(a, b);
 	}
 
-	public static inline function max(a:Float, b:Float):Float
-	{
-		return if (isNaN(a)) a else if (isNaN(b)) b else UBuiltins.max(a,b);
+	public static inline function max(a:Float, b:Float):Float {
+		return if (isNaN(a)) a else if (isNaN(b)) b else UBuiltins.max(a, b);
 	}
 
 	public static inline function sin(v:Float):Float {
@@ -55,30 +53,19 @@ extern class Math
 		return if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) NaN else python.lib.Math.cos(v);
 	}
 
-	static function tan(v:Float):Float {
-		return if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) NaN else python.lib.Math.tan(v);
-	}
-	static function asin(v:Float):Float {
-		return if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) NaN else python.lib.Math.asin(v);
-	}
-	static function acos(v:Float):Float {
-		return if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) NaN else python.lib.Math.acos(v);
-	}
-	static function atan(v:Float):Float {
-		return if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) NaN else python.lib.Math.atan(v);
-	}
-	static function atan2(y:Float, x:Float):Float {
-		return if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) NaN else python.lib.Math.atan2(v);
-	}
+	static function tan(v:Float):Float;
+	static function asin(v:Float):Float;
+	static function acos(v:Float):Float;
+	static function atan(v:Float):Float;
+	static function atan2(y:Float, x:Float):Float;
 
-	public static inline function exp(v:Float):Float
-	{
+	public static inline function exp(v:Float):Float {
 		if (v == NEGATIVE_INFINITY) {
 			return 0.0;
 		} else if (v == POSITIVE_INFINITY) {
 			return POSITIVE_INFINITY;
 		} else {
-			return (Math:Dynamic).exp(v);
+			return (Math : Dynamic).exp(v);
 		}
 	}
 
@@ -88,8 +75,7 @@ extern class Math
 
 	static function pow(v:Float, exp:Float):Float;
 
-	public static inline function sqrt(v:Float):Float
-	{
+	public static inline function sqrt(v:Float):Float {
 		return if (v < 0) NaN else python.lib.Math.sqrt(v);
 	}
 
@@ -101,33 +87,38 @@ extern class Math
 
 	static function ceil(v:Float):Int;
 
-	inline static function random() : Float {
+	inline static function random():Float {
 		return python.lib.Random.random();
 	}
 
-	static inline function ffloor( v : Float ) : Float {
-		if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) return v;
-		if (isNaN(v)) return NaN;
+	static inline function ffloor(v:Float):Float {
+		if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY)
+			return v;
+		if (isNaN(v))
+			return NaN;
 		return floor(v);
 	}
 
-	static inline function fceil( v : Float ) : Float
-	{
-		if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) return v;
-		if (isNaN(v)) return NaN;
+	static inline function fceil(v:Float):Float {
+		if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY)
+			return v;
+		if (isNaN(v))
+			return NaN;
 		return ceil(v);
 	}
 
-	static inline function fround( v : Float ) : Float {
-		if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) return v;
-		if (isNaN(v)) return NaN;
+	static inline function fround(v:Float):Float {
+		if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY)
+			return v;
+		if (isNaN(v))
+			return NaN;
 		return round(v);
 	}
 
-	static inline function isFinite( f : Float ) : Bool return f != POSITIVE_INFINITY && f != NEGATIVE_INFINITY && !isNaN(f);
-
-	static inline function isNaN( f : Float ) : Bool {
+	static inline function isFinite(f:Float):Bool
+		return f != POSITIVE_INFINITY && f != NEGATIVE_INFINITY && !isNaN(f);
 
+	static inline function isNaN(f:Float):Bool {
 		return python.lib.Math.isnan(f);
 	}
 
@@ -137,5 +128,4 @@ extern class Math
 		NaN = UBuiltins.float("nan");
 		PI = python.lib.Math.pi;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/python/_std/Reflect.hx b/std/python/_std/Reflect.hx
index d6493ab586877ab1d4f29eefa975469a363f0a5b..1ecfd39b586c4cc32deff7ae3b1292a4d1772a23 100644
--- a/std/python/_std/Reflect.hx
+++ b/std/python/_std/Reflect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,37 +24,37 @@ import python.internal.AnonObject;
 import python.internal.StringImpl;
 import python.internal.ArrayImpl;
 import python.internal.UBuiltins;
-
+import python.internal.MethodClosure;
 import python.lib.Inspect;
 import python.Syntax;
 import python.VarArgs;
+import python.Boot;
 import python.Boot.handleKeywords;
 
 @:access(python.Boot)
 @:coreApi
 class Reflect {
-
-	public static inline function hasField( o : Dynamic, field : String ) : Bool {
-		return UBuiltins.hasattr(o, handleKeywords(field));
+	public static inline function hasField(o:Dynamic, field:String):Bool {
+		return Boot.hasField(o, field);
 	}
 
-
 	@:ifFeature("dynamic_read", "anon_optional_read")
-	public static function field( o : Dynamic, field : String ) : Dynamic {
-		return python.Boot.field(o, field);
+	public static function field(o:Dynamic, field:String):Dynamic {
+		return Boot.field(o, field);
 	}
 
 	@:ifFeature("dynamic_write", "anon_optional_write")
-	public static inline function setField( o : Dynamic, field : String, value : Dynamic ) : Void {
+	public static inline function setField(o:Dynamic, field:String, value:Dynamic):Void {
 		UBuiltins.setattr(o, handleKeywords(field), value);
 	}
 
-	public static function getProperty( o : Dynamic, field : String ) : Dynamic
-	{
+	public static function getProperty(o:Dynamic, field:String):Dynamic {
 		if (o == null)
 			return null;
 
 		field = handleKeywords(field);
+		if (Boot.isAnonObject(o))
+			return Reflect.field(o, field);
 		var tmp = Reflect.field(o, "get_" + field);
 		if (tmp != null && UBuiltins.callable(tmp))
 			return tmp();
@@ -62,74 +62,83 @@ class Reflect {
 			return Reflect.field(o, field);
 	}
 
-	public static function setProperty( o : Dynamic, field : String, value : Dynamic ) : Void {
-
+	public static function setProperty(o:Dynamic, field:String, value:Dynamic):Void {
 		var field = handleKeywords(field);
-		if (UBuiltins.hasattr(o, "set_" + field))
+		if (Boot.isAnonObject(o))
+			UBuiltins.setattr(o, field, value);
+		else if (UBuiltins.hasattr(o, "set_" + field))
 			UBuiltins.getattr(o, "set_" + field)(value);
 		else
 			UBuiltins.setattr(o, field, value);
 	}
 
-	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic
-	{
+	public static function callMethod(o:Dynamic, func:haxe.Constraints.Function, args:Array<Dynamic>):Dynamic {
 		return if (UBuiltins.callable(func)) func(python.Syntax.varArgs(args)) else null;
 	}
 
-	public static inline function fields( o : Dynamic ) : Array<String>
-	{
+	public static inline function fields(o:Dynamic):Array<String> {
 		return python.Boot.fields(o);
 	}
 
-	public static function isFunction( f : Dynamic ) : Bool
-	{
-		return Inspect.isfunction(f) || Inspect.ismethod(f) || UBuiltins.hasattr(f, "func_code");
+	public static function isFunction(f:Dynamic):Bool {
+		return Inspect.isfunction(f) || Inspect.ismethod(f) || Boot.hasField(f, "func_code");
 	}
 
-	public static function compare<T>( a : T, b : T ) : Int {
-		if (a == null && b == null) return 0;
-		return
-			if (a == null) 1 else if (b == null) -1
-			else ( a == b ) ? 0 : (((cast a) > (cast b)) ? 1 : -1);
+	public static function compare<T>(a:T, b:T):Int {
+		if (a == null && b == null)
+			return 0;
+		return if (a == null) 1 else if (b == null) -1 else (a == b) ? 0 : (((cast a) > (cast b)) ? 1 : -1);
 	}
 
-	public static function compareMethods( f1 : Dynamic, f2 : Dynamic ) : Bool {
-		if( f1 == f2 )
+	static inline function isClosure(v:Dynamic):Bool {
+		return UBuiltins.isinstance(v, MethodClosure);
+	}
+
+	public static function compareMethods(f1:Dynamic, f2:Dynamic):Bool {
+		if (f1 == f2)
 			return true;
-		if( !isFunction(f1) || !isFunction(f2) )
+		if (isClosure(f1) && isClosure(f2)) {
+			var m1 = (f1 : MethodClosure);
+			var m2 = (f2 : MethodClosure);
+			return m1.obj == m2.obj && m1.func == m2.func;
+		}
+		if (!isFunction(f1) || !isFunction(f2))
 			return false;
 
 		return false;
 	}
 
-	public static function isObject( v : Dynamic ) : Bool {
+	public static function isObject(v:Dynamic):Bool {
 		return switch (Type.typeof(v)) {
 			case TObject, TClass(_): true;
-			case _ : false;
+			case _: false;
 		}
 	}
 
-	public static function isEnumValue( v : Dynamic ) : Bool {
+	public static function isEnumValue(v:Dynamic):Bool {
 		return v != Enum && UBuiltins.isinstance(v, cast Enum);
 	}
 
-	public static function deleteField( o : Dynamic, field : String ) : Bool {
+	public static function deleteField(o:Dynamic, field:String):Bool {
 		field = handleKeywords(field);
-		if( !hasField(o,field) ) return false;
+		if (!hasField(o, field))
+			return false;
 		Syntax.callField(o, "__delattr__", field);
 		return true;
 	}
 
-	public static function copy<T>( o : T ) : T {
-		var o2 : Dynamic = {};
-		for ( f in Reflect.fields(o) )
-			Reflect.setField(o2, f, Reflect.field(o,f));
+	public static function copy<T>(o:Null<T>):Null<T> {
+		if (o == null)
+			return null;
+		var o2:Dynamic = {};
+		for (f in Reflect.fields(o))
+			Reflect.setField(o2, f, Reflect.field(o, f));
 		return o2;
 	}
 
-	@:overload(function( f : Array<Dynamic> -> Void ) : Dynamic {})
-	public static function makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
-		return function (v:VarArgs<Dynamic>) {
+	@:overload(function(f:Array<Dynamic>->Void):Dynamic {})
+	public static function makeVarArgs(f:Array<Dynamic>->Dynamic):Dynamic {
+		return function(v:VarArgs<Dynamic>) {
 			return f(v);
 		}
 	}
diff --git a/std/python/_std/Std.hx b/std/python/_std/Std.hx
index a1bac1a25b8f554464fd8867bb514c87bffc3df3..ab91d3cd56cb762f8c716ebe5d82dac2be5b4a8e 100644
--- a/std/python/_std/Std.hx
+++ b/std/python/_std/Std.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,112 +30,93 @@ import python.Syntax;
 
 @:keepInit
 @:coreApi class Std {
-
-	public static inline function instance<T:{}, S:T>( value : T, c : Class<S> ) : S {
+	@:access(python.Boot)
+	public static function downcast<T:{}, S:T>(value:T, c:Class<S>):S {
 		try {
-			return UBuiltins.isinstance(value,c) ? cast value : null;
+			return UBuiltins.isinstance(value, c) || (Inspect.isInterface(c) && Boot.implementsInterface(value, c)) ? cast value : null;
 		} catch (e:Dynamic) {
 			return null;
 		}
 	}
 
+	@:deprecated('Std.instance() is deprecated. Use Std.downcast() instead.')
+	public static inline function instance<T:{}, S:T>(value:T, c:Class<S>):S {
+		return downcast(value, c);
+	}
+
 	@:access(python.Boot)
 	static inline function isMetaType(v:Dynamic, t:Dynamic):Bool {
-		return Boot.isMetaType(v,t);
+		return Boot.isMetaType(v, t);
 	}
 
 	@:access(python.Boot)
 	@:ifFeature("typed_cast")
-	public static function is( v : Dynamic, t : Dynamic ) : Bool {
-
+	public static function is(v:Dynamic, t:Dynamic):Bool {
 		if (v == null && t == null) {
 			return false;
 		}
 		if (t == null) {
-
 			return false;
 		}
-		if (isMetaType(t,Dynamic)) {
-			return true;
+		if (isMetaType(t, Dynamic)) {
+			return v != null;
 		}
 		var isBool = UBuiltins.isinstance(v, UBuiltins.bool);
 
 		if (isMetaType(t, Bool) && isBool) {
 			return true;
 		}
-		if (!isBool && !isMetaType(t, Bool) && isMetaType(t,Int) && UBuiltins.isinstance(v, UBuiltins.int )) {
+		if (!isBool && !isMetaType(t, Bool) && isMetaType(t, Int) && UBuiltins.isinstance(v, UBuiltins.int)) {
 			return true;
 		}
 		var vIsFloat = UBuiltins.isinstance(v, UBuiltins.float);
 
-		if (!isBool && vIsFloat && isMetaType(t,Int) && Math.isFinite(v) && v == Std.int(v) && v <= 2147483647 && v >= -2147483648) {
+		if (!isBool && vIsFloat && isMetaType(t, Int) && Math.isFinite(v) && v == Std.int(v) && v <= 2147483647 && v >= -2147483648) {
 			return true;
 		}
 
-
-		if (!isBool &&  isMetaType(t,Float) && ( UBuiltins.isinstance(v, python.Syntax.tuple(UBuiltins.float, UBuiltins.int)))) {
+		if (!isBool && isMetaType(t, Float) && (UBuiltins.isinstance(v, python.Syntax.tuple(UBuiltins.float, UBuiltins.int)))) {
 			return true;
 		}
 
-		if ( isMetaType(t, UBuiltins.str)) {
+		if (isMetaType(t, UBuiltins.str)) {
 			return UBuiltins.isinstance(v, String);
 		}
-		var isEnumType = isMetaType(t,Enum);
-		if (isEnumType && Inspect.isclass(v) && Internal.hasConstructs(v)) return true;
+		var isEnumType = isMetaType(t, Enum);
+		if (isEnumType && Inspect.isclass(v) && Internal.hasConstructs(v))
+			return true;
 
-		if (isEnumType) return false;
+		if (isEnumType)
+			return false;
 
-		var isClassType = isMetaType(t,Class);
-		if (isClassType && !UBuiltins.isinstance(v, Enum) && Inspect.isclass(v) && Internal.hasClassName(v) && !Internal.hasConstructs(v)) return true;
+		var isClassType = isMetaType(t, Class);
+		if (isClassType
+			&& !UBuiltins.isinstance(v, Enum)
+			&& Inspect.isclass(v)
+			&& Internal.hasClassName(v)
+			&& !Internal.hasConstructs(v))
+			return true;
 
-		if (isClassType) return false;
+		if (isClassType)
+			return false;
 
 		if (try UBuiltins.isinstance(v, t) catch (e:Dynamic) false) {
 			return true;
 		}
 
 		if (Inspect.isclass(t)) {
-
-			function loop (intf)
-			{
-				var f:Array<Dynamic> = if (Internal.hasInterfaces(intf)) Internal.fieldInterfaces(intf) else [];
-				if (f != null) {
-					for (i in f) {
-						if ( i == t) {
-							return true;
-						} else {
-							var l = loop(i);
-							if (l) {
-								return true;
-							}
-						}
-					}
-					return false;
-				} else {
-					return false;
-				}
-			}
-			var currentClass = Syntax.field(v, "__class__");
-			while(currentClass != null) {
-				if (loop(currentClass)) {
-					return true;
-				}
-				currentClass = python.Boot.getSuperClass(currentClass);
-			}
-			return false;
+			return Boot.implementsInterface(v, t);
 		} else {
 			return false;
 		}
 	}
 
 	@:access(python.Boot)
-	public static function string( s : Dynamic ) : String
-	{
+	public static function string(s:Dynamic):String {
 		return python.Boot.toString(s);
 	}
 
-	public static inline function int( x : Float ) : Int
-	{
+	public static inline function int(x:Float):Int {
 		try {
 			return UBuiltins.int(x);
 		} catch (e:Dynamic) {
@@ -143,20 +124,20 @@ import python.Syntax;
 		}
 	}
 
-	public static function parseInt( x : String ) : Null<Int> {
-		if (x == null) return null;
+	public static function parseInt(x:String):Null<Int> {
+		if (x == null)
+			return null;
 		try {
 			return UBuiltins.int(x);
 		} catch (e:Dynamic) {
 			try {
-				var prefix = x.substr(0,2).toLowerCase();
+				var prefix = x.substr(0, 2).toLowerCase();
 
 				if (prefix == "0x") {
-					return UBuiltins.int(x,16);
+					return UBuiltins.int(x, 16);
 				}
 				throw "fail";
 			} catch (e:Dynamic) {
-
 				var r = int(parseFloat(x));
 
 				if (r == null) {
@@ -172,35 +153,24 @@ import python.Syntax;
 		}
 	}
 
-	static function shortenPossibleNumber (x:String):String
-	{
+	static function shortenPossibleNumber(x:String):String {
 		var r = "";
 		for (i in 0...x.length) {
 			var c = x.charAt(i);
 			switch (c.charCodeAt(0)) {
-				case "0".code
-				| "1".code
-				| "2".code
-				| "3".code
-				| "4".code
-				| "5".code
-				| "6".code
-				| "7".code
-				| "8".code
-				| "9".code
-				| ".".code : r += c;
-				case _ : break;
+				case "0".code | "1".code | "2".code | "3".code | "4".code | "5".code | "6".code | "7".code | "8".code | "9".code | ".".code:
+					r += c;
+				case _:
+					break;
 			}
 		}
 		return r;
 	}
 
-	public static function parseFloat( x : String ) : Float
-	{
+	public static function parseFloat(x:String):Float {
 		try {
 			return UBuiltins.float(x);
 		} catch (e:Dynamic) {
-
 			if (x != null) {
 				var r1 = shortenPossibleNumber(x);
 				if (r1 != x) {
@@ -211,11 +181,7 @@ import python.Syntax;
 		}
 	}
 
-	public static inline function random( x : Int ) : Int {
-		if (x <= 0) {
-			return 0;
-		} else {
-			return int(Math.random()*x);
-		}
+	public static inline function random(x:Int):Int {
+		return if (x <= 0) 0 else python.internal.UBuiltins.int(Math.random() * x);
 	}
 }
diff --git a/std/python/_std/String.hx b/std/python/_std/String.hx
index f8f73746eca93e66f956f141468451181a0e5659..4c3d32374bd760bc9cef94bad0b215916f1750e8 100644
--- a/std/python/_std/String.hx
+++ b/std/python/_std/String.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,58 +19,58 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 #if !macro
 import python.internal.StringImpl;
 #end
+
 @:coreApi
 @:native("str")
 extern class String {
-	var length(default,null) : Int;
-	
-	function new(string:String) : Void;
-	
-	@:runtime public inline function toUpperCase() : String {
+	var length(default, null):Int;
+
+	function new(string:String):Void;
+
+	@:runtime public inline function toUpperCase():String {
 		return StringImpl.toUpperCase(this);
 	}
 
-	@:runtime public inline function toLowerCase() : String {
+	@:runtime public inline function toLowerCase():String {
 		return StringImpl.toLowerCase(this);
 	}
 
-	inline public function charAt(index : Int) : String
-	{
+	inline public function charAt(index:Int):String {
 		return StringImpl.charAt(this, index);
 	}
 
-	inline public function charCodeAt( index : Int) : Null<Int>
-	{
+	inline public function charCodeAt(index:Int):Null<Int> {
 		return StringImpl.charCodeAt(this, index);
 	}
 
-	inline function indexOf( str : String, ?startIndex : Int ) : Int {
+	inline function indexOf(str:String, ?startIndex:Int):Int {
 		return StringImpl.indexOf(this, str, startIndex);
 	}
 
-	inline function lastIndexOf( str : String, ?startIndex : Int ) : Int {
+	inline function lastIndexOf(str:String, ?startIndex:Int):Int {
 		return StringImpl.lastIndexOf(this, str, startIndex);
 	}
 
-	inline function split( delimiter : String ) : Array<String> {
+	@:runtime inline function split(delimiter:String):Array<String> {
 		return StringImpl.split(this, delimiter);
 	}
 
-	inline public function substr( pos : Int, ?len : Int ) : String
-	{
+	inline public function substr(pos:Int, ?len:Int):String {
 		return StringImpl.substr(this, pos, len);
 	}
 
-	inline function substring( startIndex : Int, ?endIndex : Int ) : String {
+	inline function substring(startIndex:Int, ?endIndex:Int):String {
 		return StringImpl.substring(this, startIndex, endIndex);
 	}
 
-	inline function toString() : String return StringImpl.toString(this);
+	inline function toString():String
+		return StringImpl.toString(this);
 
-	public static inline function fromCharCode( code : Int ) : String {
+	public static inline function fromCharCode(code:Int):String {
 		return StringImpl.fromCharCode(code);
 	}
 }
diff --git a/std/python/_std/StringBuf.hx b/std/python/_std/StringBuf.hx
index c5efe8ab103d28ff4293e60880d3fda96bf0058f..e225d2a8a74bbafff046771dfcef269aef4692ac 100644
--- a/std/python/_std/StringBuf.hx
+++ b/std/python/_std/StringBuf.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,7 @@ import python.lib.io.StringIO;
 
 @:coreApi
 class StringBuf {
-
-	private var b : StringIO;
+	private var b:StringIO;
 
 	public inline function new():Void {
 		this.b = new StringIO();
@@ -34,7 +33,7 @@ class StringBuf {
 
 	public var length(get, never):Int;
 
-	function get_length ():Int {
+	function get_length():Int {
 		var pos = b.tell();
 		b.seek(0, SeekEnd);
 		var len = b.tell();
@@ -42,7 +41,7 @@ class StringBuf {
 		return len;
 	}
 
-	public inline function add<T>( x : T ) : Void {
+	public inline function add<T>(x:T):Void {
 		add1(Std.string(x));
 	}
 
@@ -50,15 +49,15 @@ class StringBuf {
 		b.write(s);
 	}
 
-	public inline function addChar( c : Int ) : Void {
+	public inline function addChar(c:Int):Void {
 		add1(String.fromCharCode(c));
 	}
 
-	public inline function addSub( s : String, pos : Int, ?len : Int) : Void {
+	public inline function addSub(s:String, pos:Int, ?len:Int):Void {
 		add1((len == null ? s.substr(pos) : s.substr(pos, len)));
 	}
 
-	public inline function toString() : String {
+	public inline function toString():String {
 		return b.getvalue();
 	}
 }
diff --git a/std/python/_std/Sys.hx b/std/python/_std/Sys.hx
index fecb5af10ac8748080117fee0fbdd1944d149afb..f201761f515456670ab949ab678057ff786939ef 100644
--- a/std/python/_std/Sys.hx
+++ b/std/python/_std/Sys.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 import python.lib.Time;
 import python.lib.Os;
 import sys.io.FileInput;
@@ -26,12 +27,9 @@ import sys.io.FileOutput;
 
 @:coreApi
 class Sys {
-
 	static var environ:haxe.ds.StringMap<String> = {
 		environ = new haxe.ds.StringMap();
-
 		var env = Os.environ;
-
 		for (key in env.keys()) {
 			environ.set(key, env.get(key, null));
 		}
@@ -46,83 +44,82 @@ class Sys {
 		python.lib.Sys.exit(code);
 	}
 
-	public static function print(v:Dynamic):Void {
+	public static inline function print(v:Dynamic):Void {
 		python.Lib.print(v);
 	}
 
-	public static function println(v:Dynamic):Void {
+	public static inline function println(v:Dynamic):Void {
 		python.Lib.println(v);
 	}
 
-	public static function args() : Array<String> {
+	public static function args():Array<String> {
 		var argv = python.lib.Sys.argv;
 		return argv.slice(1);
 	}
 
-	public static function getEnv( s : String ) : String {
+	public static function getEnv(s:String):String {
 		return environ.get(s);
 	}
 
-	public static function putEnv( s : String, v : String ) : Void {
+	public static function putEnv(s:String, v:String):Void {
 		python.lib.Os.putenv(s, v);
 		environ.set(s, v);
 	}
 
-	public static function environment() : Map<String,String> {
+	public static function environment():Map<String, String> {
 		return environ;
 	}
 
-	public static function sleep( seconds : Float ) : Void {
+	public static function sleep(seconds:Float):Void {
 		python.lib.Time.sleep(seconds);
 	}
 
-	public static function setTimeLocale( loc : String ) : Bool {
+	public static function setTimeLocale(loc:String):Bool {
 		return false;
 	}
 
-	public static function getCwd() : String {
+	public static function getCwd():String {
 		return python.lib.Os.getcwd();
 	}
 
-	public static function setCwd( s : String ) : Void {
+	public static function setCwd(s:String):Void {
 		python.lib.Os.chdir(s);
 	}
 
-	public static function systemName() : String {
+	public static function systemName():String {
 		return switch (python.lib.Sys.platform) {
-			case x if (StringTools.startsWith(x, "linux")):
+			case var x if (StringTools.startsWith(x, "linux")):
 				"Linux";
 			case "darwin": "Mac";
-			case "win32" | "cygwin" : "Windows";
-			case _ :
+			case "win32" | "cygwin": "Windows";
+			case _:
 				throw "not supported platform";
 		}
 	}
 
-	public static function command( cmd : String, ?args : Array<String> ) : Int {
-		return
-			if (args == null)
-				python.lib.Subprocess.call(cmd, { shell: true });
-			else
-				python.lib.Subprocess.call([cmd].concat(args));
+	public static function command(cmd:String, ?args:Array<String>):Int {
+		return if (args == null)
+			python.lib.Subprocess.call(cmd, {shell: true});
+		else
+			python.lib.Subprocess.call([cmd].concat(args));
 	}
 
-	public static inline function cpuTime() : Float {
+	public static inline function cpuTime():Float {
 		return python.lib.Timeit.default_timer();
 	}
 
-	@:deprecated("Use programPath instead") public static function executablePath() : String {
+	@:deprecated("Use programPath instead") public static function executablePath():String {
 		return python.lib.Sys.argv[0];
 	}
 
 	// It has to be initialized before any call to Sys.setCwd()...
 	static var _programPath = sys.FileSystem.fullPath(python.lib.Inspect.getsourcefile(Sys));
-	public static function programPath() : String {
+
+	public static function programPath():String {
 		return _programPath;
 	}
 
-	public static function getChar( echo : Bool ) : Int {
-
+	public static function getChar(echo:Bool):Int {
 		var ch = switch (systemName()) {
 			case "Linux" | "Mac":
 				var fd = python.lib.Sys.stdin.fileno();
@@ -141,8 +138,9 @@ class Sys {
 				}
 
 			case "Windows":
-				python.lib.Msvcrt.getch().decode("utf-8").charCodeAt(0);
-			case x :
+				// python.lib.Msvcrt.getch().decode("utf-8").charCodeAt(0);
+				python.lib.Msvcrt.getwch().charCodeAt(0);
+			case var x:
 				throw "platform " + x + " not supported";
 		}
 		if (echo) {
@@ -151,17 +149,15 @@ class Sys {
 		return ch;
 	}
 
-	public static function stdin() : haxe.io.Input {
+	public static function stdin():haxe.io.Input {
 		return python.io.IoTools.createFileInputFromText(python.lib.Sys.stdin);
 	}
 
-	public static function stdout() : haxe.io.Output {
+	public static function stdout():haxe.io.Output {
 		return python.io.IoTools.createFileOutputFromText(python.lib.Sys.stdout);
 	}
 
-	public static function stderr() : haxe.io.Output {
+	public static function stderr():haxe.io.Output {
 		return python.io.IoTools.createFileOutputFromText(python.lib.Sys.stderr);
 	}
-
-
-}
\ No newline at end of file
+}
diff --git a/std/python/_std/Type.hx b/std/python/_std/Type.hx
index 62151c4c3bfa2c0fa77347a61e6dee0490b29756..b422c017e754bfd891c5624eee7aab0918f4cc04 100644
--- a/std/python/_std/Type.hx
+++ b/std/python/_std/Type.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,22 +33,22 @@ enum ValueType {
 	TBool;
 	TObject;
 	TFunction;
-	TClass( c : Class<Dynamic> );
-	TEnum( e : Enum<Dynamic> );
+	TClass(c:Class<Dynamic>);
+	TEnum(e:Enum<Dynamic>);
 	TUnknown;
 }
 
 @:access(python.Boot)
 @:coreApi class Type {
-
-	public static function getClass<T>( o : T ) : Class<T> {
-
-		if( o == null )
+	public static function getClass<T>(o:T):Class<T> {
+		if (o == null)
 			return null;
 
-		if (python.Boot.isClass(o)) return null;
+		if (python.Boot.isClass(o))
+			return null;
 
-		if (python.Boot.isAnonObject(o)) return null;
+		if (python.Boot.isAnonObject(o))
+			return null;
 
 		if (Internal.hasClass(o)) {
 			return Internal.fieldClass(o);
@@ -60,25 +60,27 @@ enum ValueType {
 		}
 	}
 
-	public static function getEnum( o : EnumValue ) : Enum<Dynamic> {
-		if( o == null )
+	public static function getEnum(o:EnumValue):Enum<Dynamic> {
+		if (o == null)
 			return null;
 		return Syntax.field(o, "__class__");
 	}
 
-	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic> {
+	public static function getSuperClass(c:Class<Dynamic>):Class<Dynamic> {
 		return python.Boot.getSuperClass(c);
-
 	}
 
-	public static function getClassName( c : Class<Dynamic> ) : String {
+	public static function getClassName(c:Class<Dynamic>):String {
 		if (Internal.hasClassName(c)) {
 			return Internal.fieldClassName(c);
 		} else {
 			// it's not a Haxe class
-			if (c == Array) return "Array";
-			if (c == Math) return "Math";
-			if (c == String) return "String";
+			if (c == Array)
+				return "Array";
+			if (c == Math)
+				return "Math";
+			if (c == String)
+				return "String";
 
 			try {
 				return Syntax.field(c, "__name__");
@@ -88,39 +90,40 @@ enum ValueType {
 		}
 	}
 
-	public static function getEnumName( e : Enum<Dynamic> ) : String {
+	public static function getEnumName(e:Enum<Dynamic>):String {
 		return Internal.fieldClassName(e);
 	}
 
-	public static function resolveClass( name : String ) : Class<Dynamic>
-	{
-		if (name == "Array") return Array;
-		if (name == "Math") return Math;
-		if (name == "String") return String;
+	public static function resolveClass(name:String):Class<Dynamic> {
+		if (name == "Array")
+			return Array;
+		if (name == "Math")
+			return Math;
+		if (name == "String")
+			return String;
 
-		var cl : Class<Dynamic> = Internal.classRegistry().get(name, null);
+		var cl:Class<Dynamic> = Internal.classRegistry().get(name, null);
 		// ensure that this is a class
-		if( cl == null || !python.Boot.isClass(cl) )
+		if (cl == null || !python.Boot.isClass(cl))
 			return null;
 		return cl;
 	}
 
-	public static function resolveEnum( name : String ) : Enum<Dynamic> {
-		if (name == "Bool") return cast Bool;
+	public static function resolveEnum(name:String):Enum<Dynamic> {
+		if (name == "Bool")
+			return cast Bool;
 		var o = resolveClass(name);
 		return if (Internal.hasConstructs(o)) cast o else null;
 	}
 
-	public static inline function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T
-	{
-		return Syntax.newInstance(cl, Syntax.varArgs(args));
+	public static inline function createInstance<T>(cl:Class<T>, args:Array<Dynamic>):T {
+		return Syntax.construct(cl, Syntax.varArgs(args));
 	}
 
-	public static function createEmptyInstance<T>( cl : Class<T> ) : T
-	{
+	public static function createEmptyInstance<T>(cl:Class<T>):T {
 		var i = Syntax.callField(cl, "__new__", cl);
 
-		function callInit (cl) {
+		function callInit(cl) {
 			var sc = getSuperClass(cl);
 			if (sc != null) {
 				callInit(sc);
@@ -134,36 +137,37 @@ enum ValueType {
 		return i;
 	}
 
-	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T
-	{
-		var f:Dynamic = Reflect.field(e,constr);
-		if( f == null ) throw "No such constructor "+constr;
-		if( Reflect.isFunction(f) ) {
-			if( params == null ) throw "Constructor "+constr+" need parameters";
+	public static function createEnum<T>(e:Enum<T>, constr:String, ?params:Array<Dynamic>):T {
+		var f:Dynamic = Reflect.field(e, constr);
+		if (f == null)
+			throw "No such constructor " + constr;
+		if (Reflect.isFunction(f)) {
+			if (params == null)
+				throw "Constructor " + constr + " need parameters";
 
-			return Reflect.callMethod(e,f,params);
+			return Reflect.callMethod(e, f, params);
 		}
-		if( params != null && params.length != 0 )
-			throw "Constructor "+constr+" does not need parameters";
+		if (params != null && params.length != 0)
+			throw "Constructor " + constr + " does not need parameters";
 		return f;
 	}
 
-	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
-
-		var c : String = Internal.fieldConstructs(e)[index];
-		if( c == null ) throw index+" is not a valid enum constructor index";
-		return createEnum(e,c,params);
+	public static function createEnumIndex<T>(e:Enum<T>, index:Int, ?params:Array<Dynamic>):T {
+		var c:String = Internal.fieldConstructs(e)[index];
+		if (c == null)
+			throw index + " is not a valid enum constructor index";
+		return createEnum(e, c, params);
 	}
 
-	public static inline function getInstanceFields( c : Class<Dynamic> ) : Array<String> {
+	public static inline function getInstanceFields(c:Class<Dynamic>):Array<String> {
 		return python.Boot.getInstanceFields(c);
 	}
 
-	public static inline function getClassFields( c : Class<Dynamic> ) : Array<String> {
+	public static inline function getClassFields(c:Class<Dynamic>):Array<String> {
 		return python.Boot.getClassFields(c);
 	}
 
-	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> {
+	public static function getEnumConstructs(e:Enum<Dynamic>):Array<String> {
 		if (UBuiltins.hasattr(e, Internal.constructsVal())) {
 			var x:Array<String> = Internal.fieldConstructs(e);
 			return x.copy();
@@ -172,12 +176,10 @@ enum ValueType {
 		}
 	}
 
-
-
-	public static function typeof( v : Dynamic ) : ValueType {
+	public static function typeof(v:Dynamic):ValueType {
 		if (v == null) {
 			return TNull;
-		} else if (UBuiltins.isinstance(v, UBuiltins.bool )) {
+		} else if (UBuiltins.isinstance(v, UBuiltins.bool)) {
 			return TBool;
 		} else if (UBuiltins.isinstance(v, UBuiltins.int)) {
 			return TInt;
@@ -189,11 +191,9 @@ enum ValueType {
 			return TClass(Array);
 		} else if (UBuiltins.isinstance(v, AnonObject) || python.lib.Inspect.isclass(v)) {
 			return TObject;
-		}
-		else if (UBuiltins.isinstance(v, Enum)) {
+		} else if (UBuiltins.isinstance(v, Enum)) {
 			return TEnum(Syntax.field(v, "__class__"));
-		}
-		else if (UBuiltins.isinstance(v, UBuiltins.type) || Internal.hasClass(v)) {
+		} else if (UBuiltins.isinstance(v, UBuiltins.type) || Internal.hasClass(v)) {
 			return TClass(Syntax.field(v, "__class__"));
 		} else if (UBuiltins.callable(v)) {
 			return TFunction;
@@ -202,57 +202,56 @@ enum ValueType {
 		}
 	}
 
-	static inline function asEnumImpl (x:Dynamic):EnumImpl {
-		return (cast x:EnumImpl);
+	static inline function asEnumImpl(x:Dynamic):EnumImpl {
+		return (cast x : EnumImpl);
 	}
 
-	public static function enumEq<T>( a : T, b : T ) : Bool {
-		if( a == b )
+	public static function enumEq<T>(a:T, b:T):Bool {
+		if (a == b)
 			return true;
 		try {
-			if (b == null && a != b) return false;
-			if( asEnumImpl(a).tag != asEnumImpl(b).tag )
+			if (b == null && a != b)
+				return false;
+			if (asEnumImpl(a).tag != asEnumImpl(b).tag)
 				return false;
 			var p1 = asEnumImpl(a).params;
 			var p2 = asEnumImpl(b).params;
-			if (p1.length != p2.length) return false;
+			if (p1.length != p2.length)
+				return false;
 
-			for( i in 0...p1.length )
-				if( !enumEq(p1[i],p2[i]) )
+			for (i in 0...p1.length)
+				if (!enumEq(p1[i], p2[i]))
 					return false;
 
-			if( Internal.fieldClass(a) != Internal.fieldClass(b))
+			if (Internal.fieldClass(a) != Internal.fieldClass(b))
 				return false;
-		} catch( e : Dynamic ) {
+		} catch (e:Dynamic) {
 			return false;
 		}
 		return true;
 	}
 
-	public static inline function enumConstructor( e : EnumValue ) : String {
+	public static inline function enumConstructor(e:EnumValue):String {
 		return asEnumImpl(e).tag;
 	}
 
-	public static inline function enumParameters( e : EnumValue ) : Array<Dynamic> {
-		return asEnumImpl(e).params;
+	public static inline function enumParameters(e:EnumValue):Array<Dynamic> {
+		return asEnumImpl(e).params.toArray();
 	}
 
-	public static inline function enumIndex( e : EnumValue ) : Int {
+	public static inline function enumIndex(e:EnumValue):Int {
 		return asEnumImpl(e).index;
 	}
 
-	public static function allEnums<T>( e : Enum<T> ) : Array<T>
-	{
-			var ctors = getEnumConstructs(e);
-			var ret = [];
-			for (ctor in ctors)
-			{
-					var v = Reflect.field(e, ctor);
-					if (Std.is(v, e))
-							ret.push(v);
-			}
+	public static function allEnums<T>(e:Enum<T>):Array<T> {
+		var ctors = getEnumConstructs(e);
+		var ret = [];
+		for (ctor in ctors) {
+			var v = Reflect.field(e, ctor);
+			if (Std.is(v, e))
+				ret.push(v);
+		}
 
-			return ret;
+		return ret;
 	}
-
 }
diff --git a/std/python/_std/haxe/Json.hx b/std/python/_std/haxe/Json.hx
index 440b1293db5de04b6e4c85b519de5d988b3ec04f..ad6ace1f0daff00a55a07b71418167f872bdd3f6 100644
--- a/std/python/_std/haxe/Json.hx
+++ b/std/python/_std/haxe/Json.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,17 +19,17 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 import python.Syntax;
 
 class Json {
-
-	public static inline function parse( text : String ) : Dynamic {
-		return python.lib.Json.loads(text, { object_hook : python.Lib.dictToAnon });
+	public static inline function parse(text:String):Dynamic {
+		return python.lib.Json.loads(text, {object_hook: python.Lib.dictToAnon});
 	}
 
-	public static inline function stringify( value : Dynamic, ?replacer:Dynamic -> Dynamic -> Dynamic, ?space : String ) : String {
+	public static inline function stringify(value:Dynamic, ?replacer:(key:Dynamic, value:Dynamic) -> Dynamic, ?space:String):String {
 		return haxe.format.JsonPrinter.print(value, replacer, space);
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/_std/haxe/Resource.hx b/std/python/_std/haxe/Resource.hx
index 5b27886e8adc33062ebb57add562d3422834bf9e..b81294773142e70e4b6616cefafa07cf3d8aa5bb 100644
--- a/std/python/_std/haxe/Resource.hx
+++ b/std/python/_std/haxe/Resource.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,32 +19,33 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe;
 
 import haxe.io.Bytes;
 import haxe.io.BytesData;
 
 @:coreApi class Resource {
+	static var content:python.Dict<String, BytesData>;
 
-	static var content:python.Dict<String,BytesData>;
-
-	static function getContent():python.Dict<String,BytesData> {
-		if (content == null) content = untyped _hx_resources__();
+	static function getContent():python.Dict<String, BytesData> {
+		if (content == null)
+			content = untyped _hx_resources__();
 		return content;
 	}
 
-	public static inline function listNames() : Array<String> {
+	public static inline function listNames():Array<String> {
 		return python.internal.UBuiltins.list(getContent().keys());
 	}
 
-	public static function getString( name : String ) : String {
+	public static function getString(name:String):String {
 		var bytes = getBytes(name);
 		if (bytes != null)
 			return bytes.toString();
 		return null;
 	}
 
-	public static function getBytes( name : String ) : haxe.io.Bytes {
+	public static function getBytes(name:String):haxe.io.Bytes {
 		var data = getContent().get(name, null);
 		if (data == null)
 			return null;
diff --git a/std/python/_std/haxe/ds/IntMap.hx b/std/python/_std/haxe/ds/IntMap.hx
index 89a245a52eb46a1e44b5e5c061d8f623d720aa5e..c63eb6d442e9e06fb74a5d8d3fff209b6e7a4efd 100644
--- a/std/python/_std/haxe/ds/IntMap.hx
+++ b/std/python/_std/haxe/ds/IntMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,57 +19,73 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 import python.Dict;
 import python.Syntax;
 
 class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
-	private var h : Dict<Int, T>;
+	private var h:Dict<Int, T>;
 
-	public function new() : Void {
+	public function new():Void {
 		h = new Dict();
 	}
 
-	public function set( key : Int, value : T ) : Void {
+	public function set(key:Int, value:T):Void {
 		h.set(key, value);
 	}
 
-	public inline function get( key : Int ) : Null<T> {
+	public inline function get(key:Int):Null<T> {
 		return h.get(key, null);
 	}
 
-	public inline function exists( key : Int ) : Bool {
+	public inline function exists(key:Int):Bool {
 		return h.hasKey(key);
 	}
 
-	public function remove( key : Int ) : Bool
-	{
-		if(!h.hasKey(key)) return false;
+	public function remove(key:Int):Bool {
+		if (!h.hasKey(key))
+			return false;
 		Syntax.delete(Syntax.arrayAccess(h, key));
 		return true;
 	}
 
-	public function keys() : Iterator<Int> {
+	public function keys():Iterator<Int> {
 		return h.keys().iter();
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return h.values().iter();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():IntMap<T> {
+		var copied = new IntMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
-}
\ No newline at end of file
+
+	public inline function clear():Void {
+		h.clear();
+	}
+}
diff --git a/std/python/_std/haxe/ds/ObjectMap.hx b/std/python/_std/haxe/ds/ObjectMap.hx
index b665508c6603d6cb42725b6136a9e70eaa7b852a..5dd5aa3fe4b452afd8c7982d9fa7dbf02197913f 100644
--- a/std/python/_std/haxe/ds/ObjectMap.hx
+++ b/std/python/_std/haxe/ds/ObjectMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,16 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package haxe.ds;
 
 import python.Dict;
 
-class ObjectMap<K:{},V> implements haxe.Constraints.IMap<K, V> {
-
-	var h : Dict<K,V>;
-
+class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
+	var h:Dict<K, V>;
 
-	public function new() : Void {
+	public function new():Void {
 		h = new Dict();
 	}
 
@@ -44,33 +43,48 @@ class ObjectMap<K:{},V> implements haxe.Constraints.IMap<K, V> {
 		return h.hasKey(key);
 	}
 
-	public function remove( key : K ) : Bool
-	{
+	public function remove(key:K):Bool {
 		var r = h.hasKey(key);
-		if (r) h.remove(key);
+		if (r)
+			h.remove(key);
 		return r;
 	}
 
-	public function keys() : Iterator<K> {
+	public function keys():Iterator<K> {
 		return h.keys().iter();
 	}
 
-	public function iterator() : Iterator<V> {
+	public function iterator():Iterator<V> {
 		return h.values().iter();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<K, V> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public function copy():ObjectMap<K, V> {
+		var copied = new ObjectMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(Std.string(i));
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
+
+	public inline function clear():Void {
+		h.clear();
+	}
 }
diff --git a/std/python/_std/haxe/ds/StringMap.hx b/std/python/_std/haxe/ds/StringMap.hx
index 51cc300a6c12db0c240d9b922605ca01c1f8a73f..110e07c4818adac87736d895fa5e8f4a7a3bac63 100644
--- a/std/python/_std/haxe/ds/StringMap.hx
+++ b/std/python/_std/haxe/ds/StringMap.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,59 +19,74 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package haxe.ds;
 
+package haxe.ds;
 
 import python.Syntax;
 import python.Dict;
 
 class StringMap<T> implements haxe.Constraints.IMap<String, T> {
-	private var h : Dict<String,T>;
+	private var h:Dict<String, T>;
 
-	public function new() : Void {
+	public function new():Void {
 		h = new Dict();
 	}
 
-	public inline function set( key : String, value : T ) : Void {
+	public inline function set(key:String, value:T):Void {
 		h.set(key, value);
 	}
 
-	public inline function get( key : String ) : Null<T> {
+	public inline function get(key:String):Null<T> {
 		return h.get(key, null);
 	}
 
-	public inline function exists( key : String ) : Bool {
+	public inline function exists(key:String):Bool {
 		return h.hasKey(key);
 	}
 
-	public function remove( key : String ) : Bool {
+	public function remove(key:String):Bool {
 		var has = h.hasKey(key);
-		if (has) h.remove(key);
+		if (has)
+			h.remove(key);
 		return has;
 	}
 
-	public function keys() : Iterator<String> {
+	public function keys():Iterator<String> {
 		return h.keys().iter();
 	}
 
-	public function iterator() : Iterator<T> {
+	public function iterator():Iterator<T> {
 		return h.values().iter();
 	}
 
-	public function toString() : String {
+	@:runtime public inline function keyValueIterator():KeyValueIterator<String, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
 
+	public function copy():StringMap<T> {
+		var copied = new StringMap();
+		for (key in keys())
+			copied.set(key, get(key));
+		return copied;
+	}
+
+	public function toString():String {
 		var s = new StringBuf();
 
 		s.add("{");
 		var it = keys();
-		for( i in it ) {
+		for (i in it) {
 			s.add(i);
 			s.add(" => ");
 			s.add(Std.string(get(i)));
-			if( it.hasNext() )
+			if (it.hasNext())
 				s.add(", ");
 		}
 		s.add("}");
 		return s.toString();
 	}
-}
\ No newline at end of file
+
+	public inline function clear():Void {
+		h.clear();
+	}
+}
diff --git a/std/python/_std/sys/FileSystem.hx b/std/python/_std/sys/FileSystem.hx
index 397e953b9f9cf444a65805a306c2de5823ba2fc6..8c7d5487ce5e0db729b7752b94eab1e57807922d 100644
--- a/std/python/_std/sys/FileSystem.hx
+++ b/std/python/_std/sys/FileSystem.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys;
 
 import python.lib.Os;
@@ -26,60 +27,58 @@ import python.lib.os.Path;
 
 @:coreApi
 class FileSystem {
-
-	public static function exists( path : String ) : Bool {
+	public static function exists(path:String):Bool {
 		return Path.exists(path);
 	}
 
-	public static function stat( path : String ) : sys.FileStat {
+	public static function stat(path:String):sys.FileStat {
 		var s = Os.stat(path);
 		return {
-			gid : s.st_gid,
-			uid : s.st_uid,
-			atime : Date.fromTime(s.st_atime),
-			mtime : Date.fromTime(s.st_mtime),
-			ctime : Date.fromTime(s.st_ctime),
-			size : s.st_size,
-			dev : s.st_dev,
-			ino : s.st_ino,
-			nlink : s.st_nlink,
-			rdev : python.internal.UBuiltins.getattr(s, "st_rdev", 0), // st_rdev is not available on Windows
-			mode : s.st_mode
+			gid: s.st_gid,
+			uid: s.st_uid,
+			atime: Date.fromTime(1000 * s.st_atime),
+			mtime: Date.fromTime(1000 * s.st_mtime),
+			ctime: Date.fromTime(1000 * s.st_ctime),
+			size: s.st_size,
+			dev: s.st_dev,
+			ino: s.st_ino,
+			nlink: s.st_nlink,
+			rdev: python.internal.UBuiltins.getattr(s, "st_rdev", 0), // st_rdev is not available on Windows
+			mode: s.st_mode
 		}
 	}
 
-	public static function rename( path : String, newPath : String ) : Void {
+	public static function rename(path:String, newPath:String):Void {
 		Os.rename(path, newPath);
 	}
 
-	public static function fullPath( relPath : String ) : String {
+	public static function fullPath(relPath:String):String {
 		return Path.realpath(relPath);
 	}
 
-	public static function absolutePath ( relPath : String ) : String {
-		if (haxe.io.Path.isAbsolute(relPath)) return relPath;
+	public static function absolutePath(relPath:String):String {
+		if (haxe.io.Path.isAbsolute(relPath))
+			return relPath;
 		return haxe.io.Path.join([Sys.getCwd(), relPath]);
 	}
 
-	public static function isDirectory( path : String ) : Bool
-	{
+	public static function isDirectory(path:String):Bool {
 		return Path.isdir(path);
 	}
 
-	public static function createDirectory( path : String ) : Void {
+	public static function createDirectory(path:String):Void {
 		Os.makedirs(path, 511, true);
 	}
 
-	public static function deleteFile( path : String ) : Void {
+	public static function deleteFile(path:String):Void {
 		Os.remove(path);
 	}
 
-	public static function deleteDirectory( path : String ) : Void {
+	public static function deleteDirectory(path:String):Void {
 		Os.rmdir(path);
 	}
 
-	public static function readDirectory( path : String ) : Array<String> {
+	public static function readDirectory(path:String):Array<String> {
 		return Os.listdir(path);
 	}
-
 }
diff --git a/std/python/_std/sys/io/File.hx b/std/python/_std/sys/io/File.hx
index 897d70da81dbe81598976ce8ec735a7b53e714d7..d868ae5cd75fda646173b66e26863f2c3100ddf9 100644
--- a/std/python/_std/sys/io/File.hx
+++ b/std/python/_std/sys/io/File.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 import python.io.IoTools;
@@ -26,22 +27,20 @@ import sys.io.FileInput;
 
 @:coreApi
 class File {
-
-	public static function getContent( path : String ) : String
-	{
+	public static function getContent(path:String):String {
 		var f:python.lib.io.TextIOBase = cast python.lib.Builtins.open(path, "r", -1, "utf-8", null, "");
 		var content = f.read(-1);
 		f.close();
 		return content;
 	}
 
-	public static function saveContent( path : String, content : String ) : Void {
+	public static function saveContent(path:String, content:String):Void {
 		var f:python.lib.io.TextIOBase = cast python.lib.Builtins.open(path, "w", -1, "utf-8", null, "");
 		f.write(content);
 		f.close();
 	}
 
-	public static function getBytes( path : String ) : haxe.io.Bytes {
+	public static function getBytes(path:String):haxe.io.Bytes {
 		var f:python.lib.io.RawIOBase = cast python.lib.Builtins.open(path, "rb", -1);
 		var size = f.read(-1);
 		var b = haxe.io.Bytes.ofData(size);
@@ -49,13 +48,13 @@ class File {
 		return b;
 	}
 
-	public static function saveBytes( path : String, bytes : haxe.io.Bytes ) : Void {
+	public static function saveBytes(path:String, bytes:haxe.io.Bytes):Void {
 		var f:python.lib.io.RawIOBase = cast python.lib.Builtins.open(path, "wb", -1);
 		f.write(bytes.getData());
 		f.close();
 	}
 
-	public static function read( path : String, binary : Bool = true ) : FileInput {
+	public static function read(path:String, binary:Bool = true):FileInput {
 		var mode = if (binary) "rb" else "r";
 
 		var f = python.lib.Builtins.open(path, mode, -1, null, null, binary ? null : "");
@@ -63,22 +62,31 @@ class File {
 		return if (binary) IoTools.createFileInputFromBytes(cast f) else IoTools.createFileInputFromText(cast f);
 	}
 
-	public static function write( path : String, binary : Bool = true ) : FileOutput {
+	public static function write(path:String, binary:Bool = true):FileOutput {
 		var mode = if (binary) "wb" else "w";
 		var f = python.lib.Builtins.open(path, mode, -1, null, null, binary ? null : "");
 
 		return if (binary) IoTools.createFileOutputFromBytes(cast f) else IoTools.createFileOutputFromText(cast f);
 	}
 
-	public static function append( path : String, binary : Bool = true ) : FileOutput {
+	public static function append(path:String, binary:Bool = true):FileOutput {
 		var mode = if (binary) "ab" else "a";
 		var f = python.lib.Builtins.open(path, mode, -1, null, null, binary ? null : "");
 
 		return if (binary) IoTools.createFileOutputFromBytes(cast f) else IoTools.createFileOutputFromText(cast f);
 	}
 
-	public static function copy( srcPath : String, dstPath : String ) : Void
-	{
+	public static function update(path:String, binary:Bool = true):FileOutput {
+		if (!FileSystem.exists(path)) {
+			write(path).close();
+		}
+		var mode = if (binary) "rb+" else "r+";
+		var f = python.lib.Builtins.open(path, mode, -1, null, null, binary ? null : "");
+
+		return if (binary) IoTools.createFileOutputFromBytes(cast f) else IoTools.createFileOutputFromText(cast f);
+	}
+
+	public static function copy(srcPath:String, dstPath:String):Void {
 		return python.lib.Shutil.copy(srcPath, dstPath);
 	}
 }
diff --git a/std/python/_std/sys/io/FileInput.hx b/std/python/_std/sys/io/FileInput.hx
index 9d06c3e7d424ea63128d20dd0014860760b344a7..e3afd9f78963a79011be887a301bd0924d89672b 100644
--- a/std/python/_std/sys/io/FileInput.hx
+++ b/std/python/_std/sys/io/FileInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,21 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 import haxe.io.Bytes;
+import haxe.io.Encoding;
 import haxe.io.Input;
 import python.io.IFileInput;
 
-
-
-class FileInput extends Input
-{
+class FileInput extends Input {
 	var impl:IFileInput;
 
-
-
-	public function new (impl:IFileInput) {
+	public function new(impl:IFileInput) {
 		this.impl = impl;
 	}
 
@@ -41,21 +38,23 @@ class FileInput extends Input
 		return impl.bigEndian = b;
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void {
+	public function seek(p:Int, pos:FileSeek):Void {
 		return impl.seek(p, pos);
 	}
-	public function tell() : Int {
+
+	public function tell():Int {
 		return impl.tell();
 	}
-	public function eof() : Bool {
+
+	public function eof():Bool {
 		return impl.eof();
 	}
 
-	override public function readByte() : Int {
+	override public function readByte():Int {
 		return impl.readByte();
 	}
 
-	override public function readBytes( s : Bytes, pos : Int, len : Int ) : Int {
+	override public function readBytes(s:Bytes, pos:Int, len:Int):Int {
 		return impl.readBytes(s, pos, len);
 	}
 
@@ -63,31 +62,31 @@ class FileInput extends Input
 		impl.close();
 	}
 
-	override public function readAll( ?bufsize : Int ) : Bytes {
+	override public function readAll(?bufsize:Int):Bytes {
 		return impl.readAll(bufsize);
 	}
 
-	override public function readFullBytes( s : Bytes, pos : Int, len : Int ):Void {
+	override public function readFullBytes(s:Bytes, pos:Int, len:Int):Void {
 		impl.readFullBytes(s, pos, len);
 	}
 
-	override public function read( nbytes : Int ) : Bytes {
+	override public function read(nbytes:Int):Bytes {
 		return impl.read(nbytes);
 	}
 
-	override public function readUntil( end : Int ) : String {
+	override public function readUntil(end:Int):String {
 		return impl.readUntil(end);
 	}
 
-	override public function readLine() : String {
+	override public function readLine():String {
 		return impl.readLine();
 	}
 
-	override public function readFloat() : Float {
+	override public function readFloat():Float {
 		return impl.readFloat();
 	}
 
-	override public function readDouble() : Float {
+	override public function readDouble():Float {
 		return impl.readDouble();
 	}
 
@@ -115,11 +114,7 @@ class FileInput extends Input
 		return impl.readInt32();
 	}
 
-	override public function readString( len : Int ) : String {
+	override public function readString(len:Int, ?encoding:Encoding):String {
 		return impl.readString(len);
 	}
-
-
-
-
-}
\ No newline at end of file
+}
diff --git a/std/python/_std/sys/io/FileOutput.hx b/std/python/_std/sys/io/FileOutput.hx
index 12de1ee616b13d7a9b4150815795ef9b9a61a247..e94343212bc8f0bc67b6953cbd9d3e0ecebad273 100644
--- a/std/python/_std/sys/io/FileOutput.hx
+++ b/std/python/_std/sys/io/FileOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,26 +19,27 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 import haxe.io.Bytes;
+import haxe.io.Encoding;
 import haxe.io.Input;
 import haxe.io.Output;
 import python.io.IFileOutput;
 
 class FileOutput extends Output {
-
 	var impl:IFileOutput;
 
-	public function new (impl:IFileOutput) {
+	public function new(impl:IFileOutput) {
 		this.impl = impl;
 	}
 
-	public function seek( p : Int, pos : FileSeek ) : Void {
+	public function seek(p:Int, pos:FileSeek):Void {
 		return impl.seek(p, pos);
 	}
 
-	public function tell() : Int {
+	public function tell():Int {
 		return impl.tell();
 	}
 
@@ -46,12 +47,12 @@ class FileOutput extends Output {
 		return impl.bigEndian = b;
 	}
 
-	override public function writeByte( c : Int ) : Void {
+	override public function writeByte(c:Int):Void {
 		impl.writeByte(c);
 	}
 
-	override public function writeBytes( s : Bytes, pos : Int, len : Int ):Int {
-		return impl.writeBytes(s,pos,len);
+	override public function writeBytes(s:Bytes, pos:Int, len:Int):Int {
+		return impl.writeBytes(s, pos, len);
 	}
 
 	override public function flush():Void {
@@ -62,55 +63,55 @@ class FileOutput extends Output {
 		impl.close();
 	}
 
-	override public function write( s : Bytes ) : Void {
+	override public function write(s:Bytes):Void {
 		impl.write(s);
 	}
 
-	override public function writeFullBytes( s : Bytes, pos : Int, len : Int ):Void {
-		impl.writeFullBytes(s,pos,len);
+	override public function writeFullBytes(s:Bytes, pos:Int, len:Int):Void {
+		impl.writeFullBytes(s, pos, len);
 	}
 
-	override public function writeFloat( x : Float ):Void {
+	override public function writeFloat(x:Float):Void {
 		impl.writeFloat(x);
 	}
 
-	override public function writeDouble( x : Float ):Void {
+	override public function writeDouble(x:Float):Void {
 		impl.writeDouble(x);
 	}
 
-	override public function writeInt8( x : Int ):Void {
+	override public function writeInt8(x:Int):Void {
 		impl.writeInt8(x);
 	}
 
-	override public function writeInt16( x : Int ):Void {
+	override public function writeInt16(x:Int):Void {
 		impl.writeInt16(x);
 	}
 
-	override public function writeUInt16( x : Int ):Void {
+	override public function writeUInt16(x:Int):Void {
 		impl.writeUInt16(x);
 	}
 
-	override public function writeInt24( x : Int ):Void {
+	override public function writeInt24(x:Int):Void {
 		impl.writeInt24(x);
 	}
 
-	override public function writeUInt24( x : Int ):Void {
+	override public function writeUInt24(x:Int):Void {
 		impl.writeUInt24(x);
 	}
 
-	override public function writeInt32( x : Int ):Void {
+	override public function writeInt32(x:Int):Void {
 		impl.writeInt32(x);
 	}
 
-	override public function prepare( nbytes : Int ):Void {
+	override public function prepare(nbytes:Int):Void {
 		impl.prepare(nbytes);
 	}
 
-	override public function writeInput( i : Input, ?bufsize : Int ):Void {
-		impl.writeInput(i,bufsize);
+	override public function writeInput(i:Input, ?bufsize:Int):Void {
+		impl.writeInput(i, bufsize);
 	}
 
-	override public function writeString( s : String ):Void {
+	override public function writeString(s:String, ?encoding:Encoding):Void {
 		impl.writeString(s);
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/_std/sys/io/Process.hx b/std/python/_std/sys/io/Process.hx
index 847fff0a8990ad45b445e26f914240c4d4ab71de..9bfa102e549602c3c444e453b1cb4bbb1e071957 100644
--- a/std/python/_std/sys/io/Process.hx
+++ b/std/python/_std/sys/io/Process.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 import python.io.IoTools;
@@ -29,45 +30,53 @@ import python.lib.Subprocess;
 import python.lib.subprocess.Popen;
 
 class Process {
-
-	public var stdout(default,null) : haxe.io.Input;
-	public var stderr(default,null) : haxe.io.Input;
-	public var stdin(default,null) : haxe.io.Output;
+	public var stdout(default, null):haxe.io.Input;
+	public var stderr(default, null):haxe.io.Input;
+	public var stdin(default, null):haxe.io.Output;
 
 	var p:Popen;
 
-	public function new( cmd : String, ?args : Array<String> ) : Void {
-		p = Popen.create(args == null ? cmd : [cmd].concat(args), { shell : args == null, stdin : Subprocess.PIPE, stdout: Subprocess.PIPE, stderr : Subprocess.PIPE });
+	public function new(cmd:String, ?args:Array<String>, ?detached:Bool):Void {
+		if (detached)
+			throw "Detached process is not supported on this platform";
+		p = Popen.create(args == null ? cmd : [cmd].concat(args), {
+			shell: args == null,
+			stdin: Subprocess.PIPE,
+			stdout: Subprocess.PIPE,
+			stderr: Subprocess.PIPE
+		});
 		this.stdout = IoTools.createFileInputFromText(new TextIOWrapper(new BufferedReader(p.stdout)));
 		this.stderr = IoTools.createFileInputFromText(new TextIOWrapper(new BufferedReader(p.stderr)));
-		this.stdin =  IoTools.createFileOutputFromText(new TextIOWrapper(new BufferedWriter(p.stdin)));
+		this.stdin = IoTools.createFileOutputFromText(new TextIOWrapper(new BufferedWriter(p.stdin)));
 	}
 
-	public function getPid() : Int {
+	public function getPid():Int {
 		return p.pid;
 	}
-	public function exitCode( block : Bool = true ) : Null<Int> {
-		if( block == false )
+
+	public function exitCode(block:Bool = true):Null<Int> {
+		if (block == false)
 			return p.poll();
 		return p.wait();
 	}
-	public function close() : Void {
+
+	public function close():Void {
 		var ver = python.lib.Sys.version_info;
 		if (ver[0] > 3 || (ver[0] == 3 && ver[1] >= 3)) // >= 3.3
 			try {
 				p.terminate();
 			} catch (e:python.Exceptions.ProcessLookupError) {
-				// it has already terminated 
+				// it has already terminated
 			}
 		else
 			try {
 				p.terminate();
 			} catch (e:python.Exceptions.OSError) {
-				// it has already terminated 
+				// it has already terminated
 			}
 	}
-	public function kill() : Void {
+
+	public function kill():Void {
 		p.kill();
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/python/_std/sys/net/Host.hx b/std/python/_std/sys/net/Host.hx
index 235b523a558250305a7109849ab48ac164877d4d..d8ef9eb26a22206b39936ab36faef2fa4601518a 100644
--- a/std/python/_std/sys/net/Host.hx
+++ b/std/python/_std/sys/net/Host.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,28 +19,29 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
 class Host {
-	public var host(default,null) : String;
-	public var ip(default,null) : Int;
+	public var host(default, null):String;
+	public var ip(default, null):Int;
 
 	var name:String;
-	
-	public function new( name : String ) : Void {
+
+	public function new(name:String):Void {
 		host = name;
 		this.name = name;
-    	}
+	}
 
-	public function toString() : String {
+	public function toString():String {
 		return name;
 	}
-    
-	public function reverse() : String {
-        	return "";
-    	}
-    
-	public static function localhost() : String {
-        	return "";
-    	}
+
+	public function reverse():String {
+		return "";
+	}
+
+	public static function localhost():String {
+		return "";
+	}
 }
diff --git a/std/python/_std/sys/net/Socket.hx b/std/python/_std/sys/net/Socket.hx
index d182fbb4293b3aa2be0676e153d1906706c32580..a4f507ab3cf869d266f739c4425029ce7cb62860 100644
--- a/std/python/_std/sys/net/Socket.hx
+++ b/std/python/_std/sys/net/Socket.hx
@@ -1,24 +1,25 @@
 /*
-* Copyright (C)2005-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.
-*/
+ * Copyright (C)2005-2019 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 sys.net;
 
 import haxe.io.Error;
@@ -26,241 +27,175 @@ import haxe.io.Bytes;
 import haxe.io.BytesData;
 import python.Exceptions;
 import python.Tuple;
-import python.lib.net.Socket in PSocket;
-import python.lib.net.Socket.SocketModule in PSocketModule;
-import python.lib.net.Address in PAddress;
+import python.lib.socket.Socket in PSocket;
+import python.lib.Socket in PSocketModule;
+import python.lib.socket.Address in PAddress;
 import python.lib.Select;
 
 private class SocketInput extends haxe.io.Input {
-
-    var __s : PSocket;
-
-    public function new(s) {
-        __s = s;
-    }
-
-    public override function readByte() : Int {
-        var r:BytesData;
-        try {
-            r = __s.recv(1,0);
-        } catch( e : BlockingIOError ) {
-                throw Blocked;
-        }
-        if( r.length == 0 )
-            throw new haxe.io.Eof();
-        return python.Syntax.pythonCode("r[0]");
-    }
-
-    public override function readBytes( buf : haxe.io.Bytes, pos : Int, len : Int ) : Int {
-        var r;
-        var data = buf.getData();
-        try {
-            r = __s.recv(len,0);
-            for (i in pos...(pos+r.length)){
-                data.set(i,r[i-pos]);
-            }
-        } catch( e : BlockingIOError ) {
-                throw Blocked;
-        }
-        if( r.length == 0 )
-            throw new haxe.io.Eof();
-        return r.length;
-    }
-
-    public override function close() {
-        super.close();
-        if( __s != null ) __s.close();
-    }
-
+	var __s:PSocket;
+
+	public function new(s) {
+		__s = s;
+	}
+
+	public override function readByte():Int {
+		var r:BytesData;
+		try {
+			r = __s.recv(1, 0);
+		} catch (e:BlockingIOError) {
+			throw Blocked;
+		}
+		if (r.length == 0)
+			throw new haxe.io.Eof();
+		return python.Syntax.code("r[0]");
+	}
+
+	public override function readBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
+		var r;
+		var data = buf.getData();
+		try {
+			r = __s.recv(len, 0);
+			for (i in pos...(pos + r.length)) {
+				data.set(i, r[i - pos]);
+			}
+		} catch (e:BlockingIOError) {
+			throw Blocked;
+		}
+		if (r.length == 0)
+			throw new haxe.io.Eof();
+		return r.length;
+	}
+
+	public override function close() {
+		super.close();
+		if (__s != null)
+			__s.close();
+	}
 }
 
 private class SocketOutput extends haxe.io.Output {
-
-    var __s : PSocket;
-
-    public function new(s) {
-        __s = s;
-    }
-
-    public override function writeByte( c : Int ) {
-        try {
-            __s.send(python.Syntax.pythonCode('bytes([c])'),0);
-        } catch( e : BlockingIOError ) {
-                throw Blocked;
-        }
-    }
-
-    public override function writeBytes( buf : haxe.io.Bytes, pos : Int, len : Int) : Int {
-        try {
-            var data    = buf.getData();
-            var payload = python.Syntax.pythonCode("data[{0}:{0}+{1}]", pos, len);
-            var r = __s.send(payload,0);
-            return r;
-        } catch( e : BlockingIOError ) {
-            throw Blocked;
-        }
-    }
-
-    public override function close() {
-        super.close();
-        if( __s != null ) __s.close();
-    }
+	var __s:PSocket;
+
+	public function new(s) {
+		__s = s;
+	}
+
+	public override function writeByte(c:Int) {
+		try {
+			__s.send(python.Syntax.code('bytes([c])'), 0);
+		} catch (e:BlockingIOError) {
+			throw Blocked;
+		}
+	}
+
+	public override function writeBytes(buf:haxe.io.Bytes, pos:Int, len:Int):Int {
+		try {
+			var data = buf.getData();
+			var payload = python.Syntax.code("{0}[{1}:{1}+{2}]", data, pos, len);
+			var r = __s.send(payload, 0);
+			return r;
+		} catch (e:BlockingIOError) {
+			throw Blocked;
+		}
+	}
+
+	public override function close() {
+		super.close();
+		if (__s != null)
+			__s.close();
+	}
 }
 
-/**
-    A TCP socket class : allow you to both connect to a given server and exchange messages or start your own server and wait for connections.
-**/
 @:coreApi class Socket {
-
-
-    var __s:PSocket;
-    /**
-        The stream on which you can read available data. By default the stream is blocking until the requested data is available,
-        use `setBlocking(false)` or `setTimeout` to prevent infinite waiting.
-    **/
-    public var input(default,null) : haxe.io.Input;
-
-    /**
-        The stream on which you can send data. Please note that in case the output buffer you will block while writing the data, use [setBlocking(false)] or [setTimeout] to prevent that.
-    **/
-    public var output(default,null) : haxe.io.Output;
-
-    /**
-        A custom value that can be associated with the socket. Can be used to retrieve your custom infos after a `select`.
-    ***/
-    public var custom : Dynamic;
-
-    /**
-        Creates a new unconnected socket.
-    **/
-    public function new() : Void {
-    }
-
-    function __init() : Void  {
-        __s = new PSocket();
-        input = new SocketInput(__s);
-        output = new SocketOutput(__s);
-    }
-
-    /**
-        Closes the socket : make sure to properly close all your sockets or you will crash when you run out of file descriptors.
-    **/
-    public function close() : Void {
-        __s.close();
-    }
-
-    /**
-        Read the whole data available on the socket.
-    **/
-    public function read() : String {
-        return input.readAll().toString();
-    }
-
-    /**
-        Write the whole data to the socket output.
-    **/
-    public function write( content : String ) : Void {
-        output.writeString(content);
-    }
-
-    /**
-        Connect to the given server host/port. Throw an exception in case we couldn't successfully connect.
-    **/
-    public function connect( host : Host, port : Int ) : Void {
-        __init();
-        var host_str = host.toString();
-        __s.connect(python.Syntax.pythonCode("(host_str,port)"));
-    }
-
-    /**
-        Allow the socket to listen for incoming questions. The parameter tells how many pending connections we can have until they get refused. Use `accept()` to accept incoming connections.
-    **/
-    public function listen( connections : Int ) : Void {
-        __s.listen(connections);
-    }
-
-    /**
-        Shutdown the socket, either for reading or writing.
-    **/
-    public function shutdown( read : Bool, write : Bool ) : Void
-        __s.shutdown( (read && write) ? PSocketModule.SHUT_RDWR : read ?  PSocketModule.SHUT_RD : PSocketModule.SHUT_WR  );
-
-    /**
-        Bind the socket to the given host/port so it can afterwards listen for connections there.
-    **/
-    public function bind( host : Host, port : Int ) : Void {
-        __init();
-        var host_str = host.toString();
-        __s.bind(python.Syntax.pythonCode("(host_str,port)"));
-    }
-
-    /**
-        Accept a new connected client. This will return a connected socket on which you can read/write some data.
-    **/
-    public function accept() : Socket {
-        var tp2:Tuple2<PSocket,PAddress> = __s.accept();
-        var s = new Socket();
-        s.__s = tp2._1;
-        s.input = new SocketInput(s.__s);
-        s.output = new SocketOutput(s.__s);
-        return s;
-    }
-
-    /**
-        Return the information about the other side of a connected socket.
-    **/
-    public function peer() : { host : Host, port : Int } {
-        var pn = __s.getpeername();
-        return { host:new Host( pn._1 ), port:pn._2}
-    }
-
-    /**
-        Return the information about our side of a connected socket.
-    **/
-    public function host() : { host : Host, port : Int } {
-        var pn = __s.getsockname();
-        return { host:new Host( pn._1 ), port:pn._2};
-    }
-
-    /**
-        Gives a timeout after which blocking socket operations (such as reading and writing) will abort and throw an exception.
-    **/
-    public function setTimeout( timeout : Float ) : Void {
-        __s.settimeout(timeout);
-    }
-
-    /**
-        Block until some data is available for read on the socket.
-    **/
-    public function waitForRead() : Void {
-
-    }
-
-    /**
-        Change the blocking mode of the socket. A blocking socket is the default behavior. A non-blocking socket will abort blocking operations immediately by throwing a haxe.io.Error.Blocking value.
-    **/
-    public function setBlocking( b : Bool ) : Void {
-        __s.setblocking(b);
-    }
-
-    /**
-        Allows the socket to immediately send the data when written to its output : this will cause less ping but might increase the number of packets / data size, especially when doing a lot of small writes.
-    **/
-    public function setFastSend( b : Bool ) : Void {}
-
-    @:keep function fileno():Int return __s.fileno();
-
-    /**
-        Wait until one of the sockets groups is ready for the given operation :
-        - `read` contains sockets on which we want to wait for available data to be read,
-        - `write` contains sockets on which we want to wait until we are allowed to write some data to their output buffers,
-        - `others` contains sockets on which we want to wait for exceptional conditions.
-        - `select` will block until one of the condition is met, in which case it will return the sockets for which the condition was true.
-        In case a `timeout` (in seconds) is specified, select might wait at worse until the timeout expires.
-    **/
-    public static function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float) : { read: Array<Socket>,write: Array<Socket>,others: Array<Socket> } {
-        var t3 = Select.select(read,write,others,timeout);
-        return {read:t3._1,write:t3._2,others:t3._3};
-    }
-
+	var __s:PSocket;
+
+	public var input(default, null):haxe.io.Input;
+
+	public var output(default, null):haxe.io.Output;
+
+	public var custom:Dynamic;
+
+	public function new():Void {
+		__initSocket();
+		input = new SocketInput(__s);
+		output = new SocketOutput(__s);
+	}
+
+	function __initSocket():Void {
+		__s = new PSocket();
+	}
+
+	public function close():Void {
+		__s.close();
+	}
+
+	public function read():String {
+		return input.readAll().toString();
+	}
+
+	public function write(content:String):Void {
+		output.writeString(content);
+	}
+
+	public function connect(host:Host, port:Int):Void {
+		var host_str = host.toString();
+		__s.connect(Tuple2.make(host_str, port));
+	}
+
+	public function listen(connections:Int):Void {
+		__s.listen(connections);
+	}
+
+	public function shutdown(read:Bool, write:Bool):Void
+		__s.shutdown((read && write) ? PSocketModule.SHUT_RDWR : read ? PSocketModule.SHUT_RD : PSocketModule.SHUT_WR);
+
+	public function bind(host:Host, port:Int):Void {
+		var host_str = host.toString();
+		__s.bind(Tuple2.make(host_str, port));
+	}
+
+	public function accept():Socket {
+		var tp2:Tuple2<PSocket, PAddress> = __s.accept();
+		var s = new Socket();
+		s.__s = tp2._1;
+		s.input = new SocketInput(s.__s);
+		s.output = new SocketOutput(s.__s);
+		return s;
+	}
+
+	public function peer():{host:Host, port:Int} {
+		var pn = __s.getpeername();
+		return {host: new Host(pn._1), port: pn._2}
+	}
+
+	public function host():{host:Host, port:Int} {
+		var pn = __s.getsockname();
+		return {host: new Host(pn._1), port: pn._2};
+	}
+
+	public function setTimeout(timeout:Float):Void {
+		__s.settimeout(timeout);
+	}
+
+	public function waitForRead():Void {
+		Select.select([this], [], []);
+	}
+
+	public function setBlocking(b:Bool):Void {
+		__s.setblocking(b);
+	}
+
+	public function setFastSend(b:Bool):Void {
+		__s.setsockopt(PSocketModule.SOL_TCP, PSocketModule.TCP_NODELAY, b);
+	}
+
+	@:keep function fileno():Int
+		return __s.fileno();
+
+	public static function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+			?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>} {
+		var t3 = Select.select(read, write, others, timeout);
+		return {read: t3._1, write: t3._2, others: t3._3};
+	}
 }
diff --git a/std/python/internal/AnonObject.hx b/std/python/internal/AnonObject.hx
index 3b126cc776a2b4b393aa066a935f43d721d06984..1ebaf7bf5cb4ba15110deb9c414bc1d9a9d9f828 100644
--- a/std/python/internal/AnonObject.hx
+++ b/std/python/internal/AnonObject.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.internal;
 
 @:native("_hx_AnonObject")
diff --git a/std/python/internal/ArrayImpl.hx b/std/python/internal/ArrayImpl.hx
index e7a1093334633edf5d3da1f0fa5f4a9ccd82fac9..3b6258289f1417cb4da37dbf1b18d76fb98ce333 100644
--- a/std/python/internal/ArrayImpl.hx
+++ b/std/python/internal/ArrayImpl.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,82 +26,80 @@ import python.lib.Functools;
 
 @:allow(Array)
 class ArrayImpl {
-
 	@:ifFeature("dynamic_read.length", "anon_optional_read.length", "python.internal.ArrayImpl.length")
-	public static inline function get_length <T>(x:Array<T>):Int return UBuiltins.len(x);
+	public static inline function get_length<T>(x:Array<T>):Int
+		return UBuiltins.len(x);
 
 	@:ifFeature("dynamic_read.concat", "anon_optional_read.concat", "python.internal.ArrayImpl.concat")
-	public static inline function concat<T>(a1:Array<T>, a2 : Array<T>) : Array<T> {
+	public static inline function concat<T>(a1:Array<T>, a2:Array<T>):Array<T> {
 		return Syntax.binop(a1, "+", a2);
 	}
 
 	@:ifFeature("dynamic_read.copy", "anon_optional_read.copy", "python.internal.ArrayImpl.copy")
-	public static inline function copy<T>(x:Array<T>) : Array<T> {
+	public static inline function copy<T>(x:Array<T>):Array<T> {
 		return UBuiltins.list(x);
 	}
 
 	@:ifFeature("dynamic_read.iterator", "anon_optional_read.iterator", "python.internal.ArrayImpl.iterator")
-	public static inline function iterator<T>(x:Array<T>) : Iterator<T> {
+	public static inline function iterator<T>(x:Array<T>):Iterator<T> {
 		return new HaxeIterator(Syntax.callField(x, "__iter__"));
 	}
 
 	@:ifFeature("dynamic_read.indexOf", "anon_optional_read.indexOf", "python.internal.ArrayImpl.indexOf")
-	public static function indexOf<T>(a:Array<T>, x : T, ?fromIndex:Int) : Int {
+	public static function indexOf<T>(a:Array<T>, x:T, ?fromIndex:Int):Int {
 		var len = a.length;
-		var l =
-			if (fromIndex == null) 0
-			else if (fromIndex < 0) len + fromIndex
-			else fromIndex;
-		if (l < 0) l = 0;
+		var l = if (fromIndex == null) 0 else if (fromIndex < 0) len + fromIndex else fromIndex;
+		if (l < 0)
+			l = 0;
 		for (i in l...len) {
-			if (unsafeGet(a,i) == x) return i;
+			if (unsafeGet(a, i) == x)
+				return i;
 		}
 		return -1;
 	}
 
 	@:ifFeature("dynamic_read.lastIndexOf", "anon_optional_read.lastIndexOf", "python.internal.ArrayImpl.lastIndexOf")
-	public static function lastIndexOf<T>(a:Array<T>, x : T, ?fromIndex:Int) : Int {
+	public static function lastIndexOf<T>(a:Array<T>, x:T, ?fromIndex:Int):Int {
 		var len = a.length;
-		var l =
-			if (fromIndex == null) len
-			else if (fromIndex < 0) len + fromIndex + 1
-			else fromIndex+1;
-		if (l > len) l = len;
+		var l = if (fromIndex == null) len else if (fromIndex < 0) len + fromIndex + 1 else fromIndex + 1;
+		if (l > len)
+			l = len;
 		while (--l > -1) {
-			if (unsafeGet(a,l) == x) return l;
+			if (unsafeGet(a, l) == x)
+				return l;
 		}
 		return -1;
 	}
 
 	@:access(python.Boot)
 	@:ifFeature("dynamic_read.join", "anon_optional_read.join", "python.internal.ArrayImpl.join")
-	public static inline function join<T>(x:Array<T>, sep : String ) : String {
+	public static inline function join<T>(x:Array<T>, sep:String):String {
 		return Boot.arrayJoin(x, sep);
 	}
 
 	@:ifFeature("dynamic_read.toString", "anon_optional_read.toString", "python.internal.ArrayImpl.toString")
-	public static inline function toString<T>(x:Array<T>) : String {
+	public static inline function toString<T>(x:Array<T>):String {
 		return "[" + join(x, ",") + "]";
 	}
 
 	@:ifFeature("dynamic_read.pop", "anon_optional_read.pop", "python.internal.ArrayImpl.pop")
-	public static inline function pop<T>(x:Array<T>) : Null<T> {
+	public static inline function pop<T>(x:Array<T>):Null<T> {
 		return if (x.length == 0) null else Syntax.callField(x, "pop");
 	}
 
 	@:ifFeature("dynamic_read.push", "anon_optional_read.push", "python.internal.ArrayImpl.push")
-	public static inline function push<T>(x:Array<T>, e:T) : Int {
+	public static inline function push<T>(x:Array<T>, e:T):Int {
 		Syntax.callField(x, "append", e);
 		return x.length;
 	}
 
 	@:ifFeature("dynamic_read.unshift", "anon_optional_read.unshift", "python.internal.ArrayImpl.unshift")
-	public static inline function unshift<T>(x:Array<T>,e : T) : Void {
-		x.insert(0,e);
+	public static inline function unshift<T>(x:Array<T>, e:T):Void {
+		x.insert(0, e);
 	}
 
 	@:ifFeature("dynamic_read.remove", "anon_optional_read.remove", "python.internal.ArrayImpl.remove")
-	public static function remove<T>(x:Array<T>,e : T) : Bool {
+	public static function remove<T>(x:Array<T>, e:T):Bool {
 		try {
 			Syntax.callField(x, "remove", e);
 			return true;
@@ -111,45 +109,50 @@ class ArrayImpl {
 	}
 
 	@:ifFeature("dynamic_read.shift", "anon_optional_read.shift", "python.internal.ArrayImpl.shift")
-	public static inline function shift<T>(x:Array<T>) : Null<T> {
-		if (x.length == 0) return null;
+	public static inline function shift<T>(x:Array<T>):Null<T> {
+		if (x.length == 0)
+			return null;
 		return Syntax.callField(x, "pop", 0);
 	}
 
 	@:ifFeature("dynamic_read.slice", "anon_optional_read.slice", "python.internal.ArrayImpl.slice")
-	public static inline function slice<T>(x:Array<T>, pos : Int, ?end : Int ) : Array<T> {
+	public static inline function slice<T>(x:Array<T>, pos:Int, ?end:Int):Array<T> {
 		return Syntax.arrayAccess(x, pos, end);
 	}
+
 	@:ifFeature("dynamic_read.sort", "anon_optional_read.sort", "python.internal.ArrayImpl.sort")
-	public static inline function sort<T>(x:Array<T>, f:T->T->Int) : Void {
-		Syntax.callNamedUntyped(Syntax.field(x, "sort"), { key : Functools.cmp_to_key(f) });
+	public static inline function sort<T>(x:Array<T>, f:T->T->Int):Void {
+		Syntax.callNamedUntyped(Syntax.field(x, "sort"), {key: Functools.cmp_to_key(f)});
 	}
 
 	@:ifFeature("dynamic_read.splice", "anon_optional_read.splice", "python.internal.ArrayImpl.splice")
-	public static inline function splice<T>(x:Array<T>, pos : Int, len : Int ) : Array<T> {
-		if (pos < 0) pos = x.length+pos;
-		if (pos < 0) pos = 0;
-		var res = Syntax.arrayAccess(x, pos, pos+len);
-		Syntax.delete((Syntax.arrayAccess(x, pos, pos+len)));
+	public static inline function splice<T>(x:Array<T>, pos:Int, len:Int):Array<T> {
+		if (pos < 0)
+			pos = x.length + pos;
+		if (pos < 0)
+			pos = 0;
+		var res = Syntax.arrayAccess(x, pos, pos + len);
+		Syntax.delete((Syntax.arrayAccess(x, pos, pos + len)));
 		return res;
 	}
 
 	@:ifFeature("dynamic_read.map", "anon_optional_read.map", "python.internal.ArrayImpl.map")
-	public static inline function map<S,T>(x:Array<T>, f : T -> S) : Array<S> {
+	public static inline function map<S, T>(x:Array<T>, f:T->S):Array<S> {
 		return UBuiltins.list(UBuiltins.map(f, cast x));
 	}
 
 	@:ifFeature("dynamic_read.filter", "anon_optional_read.filter", "python.internal.ArrayImpl.filter")
-	public static inline function filter<T>(x:Array<T>, f : T -> Bool) : Array<T> {
+	public static inline function filter<T>(x:Array<T>, f:T->Bool):Array<T> {
 		return UBuiltins.list(UBuiltins.filter(f, cast x));
 	}
 
 	@:ifFeature("dynamic_read.insert", "anon_optional_read.insert", "python.internal.ArrayImpl.insert")
-	public static inline function insert<T>(a:Array<T>, pos : Int, x : T ) : Void {
+	public static inline function insert<T>(a:Array<T>, pos:Int, x:T):Void {
 		Syntax.callField(a, "insert", pos, x);
 	}
+
 	@:ifFeature("dynamic_read.reverse", "anon_optional_read.reverse", "python.internal.ArrayImpl.reverse")
-	public static inline function reverse<T>(a:Array<T>) : Void {
+	public static inline function reverse<T>(a:Array<T>):Void {
 		Syntax.callField(a, "reverse");
 	}
 
@@ -163,7 +166,7 @@ class ArrayImpl {
 		var l = x.length;
 		while (l < idx) {
 			x.push(null);
-			l+=1;
+			l += 1;
 		}
 		if (l == idx) {
 			x.push(v);
@@ -173,12 +176,21 @@ class ArrayImpl {
 		return v;
 	}
 
-	public static inline function unsafeGet<T>(x:Array<T>,idx:Int):T {
+	public static inline function unsafeGet<T>(x:Array<T>, idx:Int):T {
 		return Syntax.arrayAccess(x, idx);
 	}
 
-	public static inline function unsafeSet<T>(x:Array<T>,idx:Int, val:T):T {
+	public static inline function unsafeSet<T>(x:Array<T>, idx:Int, val:T):T {
 		Syntax.assign(Syntax.arrayAccess(x, idx), val);
 		return val;
 	}
-}
\ No newline at end of file
+
+	public static inline function resize<T>(x:Array<T>, len:Int):Void {
+		var l = x.length;
+		if (l < len) {
+			_set(x, len - 1, null);
+		} else if (l > len) {
+			splice(x, len, l - len);
+		}
+	}
+}
diff --git a/std/python/internal/EnumImpl.hx b/std/python/internal/EnumImpl.hx
index 50fef952b5b5faf3b5aa839a3fad4ec71f03967b..41d1be97f5351c6b941754aed55af0aa15400512 100644
--- a/std/python/internal/EnumImpl.hx
+++ b/std/python/internal/EnumImpl.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.internal;
 
 @:ifFeature("has_enum", "Enum.*")
@@ -31,7 +32,7 @@ class EnumImpl {
 	public var index:Int;
 
 	@:ifFeature("has_enum", "Enum.*")
-	public var params:Array<Dynamic>;
+	public var params:Tuple<Dynamic>;
 
 	@:ifFeature("has_enum", "Enum.*")
 	public function new(tag, index, params) {
@@ -45,7 +46,7 @@ class EnumImpl {
 		return if (params == null) {
 			tag;
 		} else {
-			tag + "(" + params.join(",") + ")";
+			python.Syntax.code("{0} + '(' + (', '.join(str(v) for v in {1})) + ')'", tag, params);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/internal/HxException.hx b/std/python/internal/HxException.hx
index 0930afbb7c6d34015eeaa975bb74f689f46cea34..dddde87ab00cdd1271ef713750b0e989b1e65456 100644
--- a/std/python/internal/HxException.hx
+++ b/std/python/internal/HxException.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.internal;
 
 @:ifFeature("has_throw")
@@ -26,8 +27,9 @@ package python.internal;
 class HxException extends python.Exceptions.Exception {
 	@:ifFeature("has_throw")
 	public var val:Dynamic;
+
 	@:ifFeature("has_throw")
-	public function new(val) {
+	public function new(val:Dynamic) {
 		var message = UBuiltins.str(val);
 		super(message);
 		this.val = val;
diff --git a/std/python/internal/HxOverrides.hx b/std/python/internal/HxOverrides.hx
index e94118dce287d4f2501c2fd08f9b931d5b3cf223..e885e194d580e69c7734230505bfa21b6615a5de 100644
--- a/std/python/internal/HxOverrides.hx
+++ b/std/python/internal/HxOverrides.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,44 +19,44 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.internal;
 
 import python.Syntax;
-
-import python.Syntax.pythonCode in py;
+import python.Syntax.code in py;
 
 @:noDoc
 @:native("HxOverrides")
 @:access(python.internal.ArrayImpl)
 @:access(python.Boot)
 class HxOverrides {
-
 	// this two cases iterator and shift are like all methods in String and Array and are already handled in Reflect
 	// we need to modify the transformer to call Reflect directly
-
 	@:ifFeature("dynamic_read.iterator", "anon_optional_read.iterator", "anon_read.iterator")
 	static public function iterator(x) {
 		if (Boot.isArray(x)) {
-			return (x:Array<Dynamic>).iterator();
+			return (x : Array<Dynamic>).iterator();
 		}
 		return Syntax.callField(x, "iterator");
 	}
+
 	@:ifFeature("dynamic_binop_==", "dynamic_binop_!=")
-	static function eq( a:Dynamic, b:Dynamic ) : Bool {
+	static function eq(a:Dynamic, b:Dynamic):Bool {
 		if (Boot.isArray(a) || Boot.isArray(b)) {
-			return Syntax.pythonCode('a is b');
+			return Syntax.code('a is b');
 		}
 		return Syntax.binop(a, "==", b);
 	}
+
 	@:ifFeature("unsafe_string_concat")
-	static function stringOrNull (s:String):String {
+	static function stringOrNull(s:String):String {
 		return if (s == null) "null" else s;
 	}
 
 	@:ifFeature("dynamic_read.shift", "anon_optional_read.shift", "anon_read.shift")
 	static public function shift(x) {
 		if (Boot.isArray(x)) {
-			return (x:Array<Dynamic>).shift();
+			return (x : Array<Dynamic>).shift();
 		}
 		return Syntax.callField(x, "shift");
 	}
@@ -64,15 +64,15 @@ class HxOverrides {
 	@:ifFeature("dynamic_read.pop", "anon_optional_read.pop", "anon_read.pop")
 	static public function pop(x) {
 		if (Boot.isArray(x)) {
-			return (x:Array<Dynamic>).pop();
+			return (x : Array<Dynamic>).pop();
 		}
 		return Syntax.callField(x, "pop");
 	}
 
 	@:ifFeature("dynamic_read.push", "anon_optional_read.push", "anon_read.push")
-	static public function push(x, e) {
+	static public function push(x:Dynamic, e:Dynamic) {
 		if (Boot.isArray(x)) {
-			return (x:Array<Dynamic>).push(e);
+			return (x : Array<Dynamic>).push(e);
 		}
 		return Syntax.callField(x, "push", e);
 	}
@@ -80,7 +80,7 @@ class HxOverrides {
 	@:ifFeature("dynamic_read.join", "anon_optional_read.join", "anon_read.join")
 	static public function join(x, sep) {
 		if (Boot.isArray(x)) {
-			return (x:Array<Dynamic>).join(sep);
+			return (x : Array<Dynamic>).join(sep);
 		}
 		return Syntax.callField(x, "join", sep);
 	}
@@ -88,15 +88,15 @@ class HxOverrides {
 	@:ifFeature("dynamic_read.filter", "anon_optional_read.filter", "anon_read.filter")
 	static public function filter(x, f) {
 		if (Boot.isArray(x)) {
-			return (x:Array<Dynamic>).filter(f);
+			return (x : Array<Dynamic>).filter(f);
 		}
 		return Syntax.callField(x, "filter", f);
 	}
 
 	@:ifFeature("dynamic_read.map", "anon_optional_read.map", "anon_read.map")
-	static public function map(x, f) {
+	static public function map(x:Dynamic, f:Dynamic) {
 		if (Boot.isArray(x)) {
-			return (x:Array<Dynamic>).map(f);
+			return (x : Array<Dynamic>).map(f);
 		}
 		return Syntax.callField(x, "map", f);
 	}
@@ -104,7 +104,7 @@ class HxOverrides {
 	@:ifFeature("dynamic_read.toUpperCase", "anon_optional_read.toUpperCase", "anon_read.toUpperCase")
 	static public function toUpperCase(x) {
 		if (Boot.isString(x)) {
-			return (x:String).toUpperCase();
+			return (x : String).toUpperCase();
 		}
 		return Syntax.callField(x, "toUpperCase");
 	}
@@ -112,23 +112,64 @@ class HxOverrides {
 	@:ifFeature("dynamic_read.toLowerCase", "anon_optional_read.toLowerCase", "anon_read.toLowerCase")
 	static public function toLowerCase(x) {
 		if (Boot.isString(x)) {
-			return (x:String).toLowerCase();
+			return (x : String).toLowerCase();
 		}
 		return Syntax.callField(x, "toLowerCase");
 	}
 
+	@:ifFeature("dynamic_read.split", "anon_optional_read.split", "anon_read.split")
+	static public function split(x:Dynamic, delimiter:String) {
+		if (Boot.isString(x)) {
+			return (x : String).split(delimiter);
+		}
+		return Syntax.callField(x, "split", delimiter);
+	}
+
+	@:ifFeature("dynamic_read.length", "anon_optional_read.length", "anon_read.length")
+	static public function length(x:Dynamic) {
+		if (Boot.isString(x)) {
+			return (x : String).length;
+		} else if (Boot.isArray(x)) {
+			return (x : Array<Dynamic>).length;
+		}
+		return Syntax.field(x, "length");
+	}
+
 	@:ifFeature("binop_>>>")
 	static public function rshift(val:Int, n:Int) {
-		return Syntax.binop(Syntax.binop(val, "%", Syntax.pythonCode("0x100000000")), ">>", n);
+		return Syntax.binop(Syntax.binop(val, "%", Syntax.code("0x100000000")), ">>", n);
 	}
 
 	@:ifFeature("binop_%")
 	static public function modf(a:Float, b:Float) {
-		return Syntax.pythonCode("float('nan') if (b == 0.0) else a % b if a >= 0 else -(-a % b)");
+		if(b == 0.0) {
+			return Syntax.code("float('nan')");
+		} else if(a < 0) {
+			if(b < 0) {
+				return Syntax.code("-(-{0} % (-{1}))", a, b);
+			} else {
+				return Syntax.code("-(-{0} % {1})", a, b);
+			}
+		} else if(b < 0) {
+			return Syntax.code("{0} % (-{1})", a, b);
+		} else {
+			return Syntax.code("{0} % {1}", a, b);
+		}
 	}
+
 	@:ifFeature("binop_%")
 	static public function mod(a:Int, b:Int) {
-		return Syntax.pythonCode("a % b if a >= 0 else -(-a % b)");
+		if(a < 0) {
+			if(b < 0) {
+				return Syntax.code("-(-{0} % (-{1}))", a, b);
+			} else {
+				return Syntax.code("-(-{0} % {1})", a, b);
+			}
+		} else if(b < 0) {
+			return Syntax.code("{0} % (-{1})", a, b);
+		} else {
+			return Syntax.code("{0} % {1}", a, b);
+		}
 	}
 
 	@:ifFeature("dynamic_array_read")
@@ -151,12 +192,11 @@ class HxOverrides {
 	}
 
 	@:ifFeature("python._KwArgs.KwArgs_Impl_.fromT")
-	static public function mapKwArgs(a:{}, v:Dict<String,String>)
-	{
+	static public function mapKwArgs(a:{}, v:Dict<String, String>) {
 		var a = python.Lib.dictAsAnon(python.Lib.anonToDict(a));
 		for (k in v.keys()) {
 			var val = v.get(k);
-			if (UBuiltins.hasattr(a, k)) {
+			if (Syntax.code('{0}._hx_hasattr({1})', a, k)) {
 				var x = UBuiltins.getattr(a, k);
 				UBuiltins.setattr(a, val, x);
 				UBuiltins.delattr(a, k);
@@ -166,11 +206,9 @@ class HxOverrides {
 	}
 
 	@:ifFeature("python._KwArgs.KwArgs_Impl_.toDictHelper")
-	static public function reverseMapKwArgs(a:Dict<String,Dynamic>, v:Dict<String,String>)
-	{
+	static public function reverseMapKwArgs(a:Dict<String, Dynamic>, v:Dict<String, String>) {
 		var a = a.copy();
 		for (k in v.keys()) {
-
 			var val = v.get(k);
 			if (a.hasKey(val)) {
 				var x = a.get(val, null);
@@ -180,5 +218,4 @@ class HxOverrides {
 		}
 		return a;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/python/internal/Internal.hx b/std/python/internal/Internal.hx
index d62ac471e5b0d544cf265d9b92fb95349079dc47..78d95325dbd6bb95164e288ef0ad5d23618c0b10 100644
--- a/std/python/internal/Internal.hx
+++ b/std/python/internal/Internal.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.internal;
+
 #if macro
 import haxe.macro.Context;
 import haxe.macro.Expr;
@@ -27,12 +29,9 @@ import haxe.macro.Expr;
 
 @:noPackageRestrict
 class Internal {
-
 	#if macro
-
 	static var _prefix = "_hx_";
 
-
 	static var _className = _prefix + "class_name";
 	static var _class = _prefix + "class";
 	static var _fields = _prefix + "fields";
@@ -47,15 +46,13 @@ class Internal {
 
 	static var _dict = "__dict__";
 
-	static function _getPrefixed (x:Expr):Expr {
+	static function _getPrefixed(x:Expr):Expr {
 		return switch (x.expr) {
 			case EConst(CString(x)): macro @:pos(Context.currentPos()) $v{_prefix + x};
-			case _ : macro @:pos(Context.currentPos()) (python.Syntax.binop($v{_prefix},"+",$x):String);
+			case _: macro @:pos(Context.currentPos()) (python.Syntax.binop($v{_prefix}, "+", $x) : String);
 		}
 	}
 
-
-
 	static function withPos(x:String):Expr {
 		return macro @:pos(Context.currentPos()) $v{x};
 	}
@@ -64,93 +61,90 @@ class Internal {
 		return macro @:pos(Context.currentPos()) (untyped __define_feature__($v{"python." + x}, python.Syntax.field($o, $v{x})));
 	}
 
-	static function has (o:Expr, field:String):Expr {
-		return macro (untyped __define_feature__($v{"python." + field}, python.internal.UBuiltins.hasattr($o, $v{field})) : Bool);
+	static function has(o:Expr, field:String):Expr {
+		return macro(untyped __define_feature__($v{"python." + field}, python.internal.UBuiltins.hasattr($o, $v{field})) : Bool);
 	}
-
 	#end
 
-	macro public static function getPrefixed (x:ExprOf<String>):Expr {
+	macro public static function getPrefixed(x:ExprOf<String>):Expr {
 		return switch (x.expr) {
 			case EConst(CString(x)): macro @:pos(Context.currentPos()) $v{_prefix + x};
-			case _ : macro @:pos(Context.currentPos()) (python.Syntax.binop($v{_prefix},"+",$x):String);
+			case _: macro @:pos(Context.currentPos()) (python.Syntax.binop($v{_prefix}, "+", $x) : String);
 		}
 	}
 
-	macro public static function classRegistry ():Expr {
-		return macro (untyped __define_feature__($v{"python." + _classes}, python.Syntax.pythonCode($v{_classes})) : python.Dict<String, Class<Dynamic>>);
+	macro public static function classRegistry():Expr {
+		return macro(untyped __define_feature__($v{"python." + _classes}, python.Syntax.code($v{_classes})) : python.Dict<String, Class<Dynamic>>);
 	}
 
-	macro public static function callFieldPrefixed (o:Expr, x:String, params:Array<Expr>):Expr {
-		var args = [o,macro @:pos(Context.currentPos()) $v{_prefix + x}].concat(params);
+	macro public static function callFieldPrefixed(o:Expr, x:String, params:Array<Expr>):Expr {
+		var args = [o, macro @:pos(Context.currentPos()) $v{_prefix + x}].concat(params);
 		return macro @:pos(Context.currentPos()) python.Syntax.callField($a{args});
 	}
 
-	macro public static function fieldPrefixed (o:Expr, x:String):Expr {
-		var args = [o,macro @:pos(Context.currentPos()) $v{_prefix + x}];
+	macro public static function fieldPrefixed(o:Expr, x:String):Expr {
+		var args = [o, macro @:pos(Context.currentPos()) $v{_prefix + x}];
 		return macro @:pos(Context.currentPos()) python.Syntax.field($a{args});
 	}
 
-	macro public static function hasAttrPrefixed (o:Expr, x:String):Expr {
-		var args = [o,macro @:pos(Context.currentPos()) $v{_prefix + x}];
+	macro public static function hasAttrPrefixed(o:Expr, x:String):Expr {
+		var args = [o, macro @:pos(Context.currentPos()) $v{_prefix + x}];
 		return macro @:pos(Context.currentPos()) python.Syntax.field($a{args});
 	}
 
-
-
-	macro public static function importAsPrefixed (o:String, x:String) {
+	macro public static function importAsPrefixed(o:String, x:String) {
 		return macro @:pos(Context.currentPos()) python.Syntax.importAs($v{o}, $v{_prefix + x});
 	}
 
-	macro public static function prefix ():Expr {
+	macro public static function prefix():Expr {
 		return macro @:pos(Context.currentPos()) $v{_prefix};
 	}
 
-	macro public static function pythonCodePrefixed (x:String):Expr {
-		return macro python.Syntax.pythonCode($v{_prefix + x});
+	macro public static function pythonCodePrefixed(x:String):Expr {
+		return macro python.Syntax.code($v{_prefix + x});
 	}
 
-	macro public static function hasClassName (o:Expr):Expr {
+	macro public static function hasClassName(o:Expr):Expr {
 		return has(o, _className);
 	}
 
-	macro public static function hasInterfaces (o:Expr):Expr {
+	macro public static function hasInterfaces(o:Expr):Expr {
 		return has(o, _interfaces);
 	}
 
-	macro public static function hasClass (o:Expr):Expr {
+	macro public static function hasClass(o:Expr):Expr {
 		return has(o, _class);
 	}
 
-	macro public static function hasConstructs (o:Expr):Expr {
+	macro public static function hasConstructs(o:Expr):Expr {
 		return has(o, _constructs);
 	}
 
-	macro public static function hasEmptyInit (o:Expr):Expr {
+	macro public static function hasEmptyInit(o:Expr):Expr {
 		return has(o, _emptyInit);
 	}
 
-	macro public static function hasMethods (o:Expr):Expr {
+	macro public static function hasMethods(o:Expr):Expr {
 		return has(o, _methods);
 	}
 
-	macro public static function hasFields (o:Expr):Expr {
+	macro public static function hasFields(o:Expr):Expr {
 		return has(o, _fields);
 	}
 
-	macro public static function hasSuper (o:Expr):Expr {
+	macro public static function hasSuper(o:Expr):Expr {
 		return has(o, _super);
 	}
 
-	macro public static function hasStatics (o:Expr):Expr {
+	macro public static function hasStatics(o:Expr):Expr {
 		return has(o, _statics);
 	}
 
-	macro public static function classNameVal ():Expr {
+	macro public static function classNameVal():Expr {
 		return withPos(_className);
 	}
 
-	macro public static function methodsVal ():Expr {
+	macro public static function methodsVal():Expr {
 		return withPos(_methods);
 	}
 
@@ -182,47 +176,47 @@ class Internal {
 		return withPos(_emptyInit);
 	}
 
-	macro public static function fieldClassName (o:Expr):Expr {
+	macro public static function fieldClassName(o:Expr):Expr {
 		return fieldWithPos(o, _className);
 	}
 
-	macro public static function fieldInterfaces (o:Expr):Expr {
+	macro public static function fieldInterfaces(o:Expr):Expr {
 		return fieldWithPos(o, _interfaces);
 	}
 
-	macro public static function fieldClass (o:Expr):Expr {
+	macro public static function fieldClass(o:Expr):Expr {
 		return fieldWithPos(o, _class);
 	}
 
-	macro public static function fieldSuper (o:Expr):Expr {
+	macro public static function fieldSuper(o:Expr):Expr {
 		return fieldWithPos(o, _super);
 	}
 
-	macro public static function fieldStatics (o:Expr):Expr {
+	macro public static function fieldStatics(o:Expr):Expr {
 		return fieldWithPos(o, _statics);
 	}
 
-	macro public static function fieldMethods (o:Expr):Expr {
+	macro public static function fieldMethods(o:Expr):Expr {
 		return fieldWithPos(o, _methods);
 	}
 
-	macro public static function fieldFields (o:Expr):Expr {
+	macro public static function fieldFields(o:Expr):Expr {
 		return fieldWithPos(o, _fields);
 	}
 
-	macro public static function fieldConstructs (o:Expr):Expr {
+	macro public static function fieldConstructs(o:Expr):Expr {
 		return fieldWithPos(o, _constructs);
 	}
 
-	macro public static function fieldDict (o:Expr):Expr {
+	macro public static function fieldDict(o:Expr):Expr {
 		return macro @:pos(Context.currentPos()) python.Syntax.field($o, $v{_dict});
 	}
 
-	macro public static function fieldEmptyInit (o:Expr):Expr {
+	macro public static function fieldEmptyInit(o:Expr):Expr {
 		return fieldWithPos(o, _emptyInit);
 	}
 
-	macro public static function callEmptyInit (o:Expr, instance:Expr):Expr {
+	macro public static function callEmptyInit(o:Expr, instance:Expr):Expr {
 		return macro @:pos(Context.currentPos()) python.Syntax.callField($o, $v{_emptyInit}, $instance);
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/internal/MethodClosure.hx b/std/python/internal/MethodClosure.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7d5f9bf7d7f3513e8071495524ddcab2496629ff
--- /dev/null
+++ b/std/python/internal/MethodClosure.hx
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C)2005-2019 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 python.internal;
+
+class MethodClosure {
+	@:allow(Reflect) var obj:Dynamic;
+	@:allow(Reflect) var func:haxe.Constraints.Function;
+
+	public function new(obj:Dynamic, func:haxe.Constraints.Function) {
+		this.obj = obj;
+		this.func = func;
+	}
+
+	@:keep public function __call__(args:VarArgs<Dynamic>) {
+		return this.func(this.obj, args);
+	}
+}
diff --git a/std/python/internal/StringImpl.hx b/std/python/internal/StringImpl.hx
index 1d0bcd33f8abffbd448cdea9c63d0d9140ab4e79..de1b316c827360892b70d2e6df7a28d2db8e5df2 100644
--- a/std/python/internal/StringImpl.hx
+++ b/std/python/internal/StringImpl.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,28 +19,26 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.internal;
 
 import python.internal.Internal;
 
 @:native("HxString")
 class StringImpl {
-
 	@:ifFeature("dynamic_read.split", "anon_optional_read.split", "python.internal.StringImpl.split")
-	public static inline function split (s:String, d:String) {
+	public static inline function split(s:String, d:String) {
 		return if (d == "") UBuiltins.list(s) else Syntax.callField(s, "split", d);
 	}
 
 	@:ifFeature("dynamic_read.charCodeAt", "anon_optional_read.charCodeAt", "python.internal.StringImpl.charCodeAt")
 	public static function charCodeAt(s:String, index:Int) {
-		return
-			if (s == null || s.length == 0 || index < 0 || index >= s.length) null
-			else UBuiltins.ord(Syntax.arrayAccess(s, index));
+		return if (s == null || s.length == 0 || index < 0 || index >= s.length) null else UBuiltins.ord(Syntax.arrayAccess(s, index));
 	}
 
 	@:ifFeature("dynamic_read.charAt", "anon_optional_read.charAt", "python.internal.StringImpl.charAt")
 	public static inline function charAt(s:String, index:Int) {
-		return if (index < 0 || index >= s.length) "" else Syntax.arrayAccess(s,index);
+		return if (index < 0 || index >= s.length) "" else Syntax.arrayAccess(s, index);
 	}
 
 	@:ifFeature("dynamic_read.lastIndexOf", "anon_optional_read.lastIndexOf", "python.internal.StringImpl.lastIndexOf")
@@ -48,10 +46,9 @@ class StringImpl {
 		if (startIndex == null) {
 			return Syntax.callField(s, "rfind", str, 0, s.length);
 		} else {
-
-			var i = Syntax.callField(s, "rfind", str, 0, startIndex+1);
+			var i = Syntax.callField(s, "rfind", str, 0, startIndex + 1);
 			var startLeft = i == -1 ? UBuiltins.max(0, startIndex + 1 - str.length) : i + 1;
-			var check = Syntax.callField(s,"find", str, startLeft, s.length);
+			var check = Syntax.callField(s, "find", str, startLeft, s.length);
 			if (check > i && check <= startIndex) {
 				return check;
 			} else {
@@ -61,61 +58,72 @@ class StringImpl {
 	}
 
 	@:ifFeature("dynamic_read.toUpperCase", "anon_optional_read.toUpperCase", "python.internal.StringImpl.toUpperCase")
-	public static inline function toUpperCase (s:String) {
-		
+	public static inline function toUpperCase(s:String) {
 		return Syntax.callField(s, "upper");
 	}
+
 	@:ifFeature("dynamic_read.toLowerCase", "anon_optional_read.toLowerCase", "python.internal.StringImpl.toLowerCase")
-	public static inline function toLowerCase (s:String) {
+	public static inline function toLowerCase(s:String) {
 		return Syntax.callField(s, "lower");
 	}
+
 	@:ifFeature("dynamic_read.indexOf", "anon_optional_read.indexOf", "python.internal.StringImpl.indexOf")
-	public static inline function indexOf (s:String, str:String, ?startIndex:Int) {
+	public static inline function indexOf(s:String, str:String, ?startIndex:Int) {
 		if (startIndex == null)
 			return Syntax.callField(s, "find", str);
 		else
 			return Syntax.callField(s, "find", str, startIndex);
 	}
+
 	@:ifFeature("dynamic_read.toString", "anon_optional_read.toString", "python.internal.StringImpl.toString")
-	public static inline function toString (s:String) {
+	public static inline function toString(s:String) {
 		return s;
 	}
+
 	@:ifFeature("dynamic_read.length", "anon_optional_read.length", "python.internal.StringImpl.length")
-	public static inline function get_length (s:String) {
+	public static inline function get_length(s:String) {
 		return UBuiltins.len(s);
 	}
+
 	@:ifFeature("dynamic_read.fromCharCode", "anon_optional_read.fromCharCode", "python.internal.StringImpl.fromCharCode")
-	public static inline function fromCharCode( code : Int ) : String {
+	public static inline function fromCharCode(code:Int):String {
 		#if doc_gen
 		return "";
 		#else
 		return Syntax.callField('', "join", UBuiltins.map(UBuiltins.chr, cast [code])); // TODO: check cast
 		#end
 	}
+
 	@:ifFeature("dynamic_read.substring", "anon_optional_read.substring", "python.internal.StringImpl.substring")
-	public static function substring( s:String, startIndex : Int, ?endIndex : Int ) : String {
-		if (startIndex < 0) startIndex = 0;
+	public static function substring(s:String, startIndex:Int, ?endIndex:Int):String {
+		if (startIndex < 0)
+			startIndex = 0;
 		if (endIndex == null) {
 			return Syntax.arrayAccessWithTrailingColon(s, startIndex);
 		} else {
-			if (endIndex < 0) endIndex = 0;
+			if (endIndex < 0)
+				endIndex = 0;
 			if (endIndex < startIndex) {
-
 				return Syntax.arrayAccess(s, endIndex, startIndex);
 			} else {
-
 				return Syntax.arrayAccess(s, startIndex, endIndex);
 			}
 		}
 	}
+
 	@:ifFeature("dynamic_read.substr", "anon_optional_read.substr", "python.internal.StringImpl.substr")
-	public static function substr( s:String, startIndex : Int, ?len : Int ) : String {
+	public static function substr(s:String, startIndex:Int, ?len:Int):String {
 		if (len == null) {
 			return Syntax.arrayAccessWithTrailingColon(s, startIndex);
 		} else {
-			if (len == 0) return "";
-			return Syntax.arrayAccess(s, startIndex, startIndex+len);
+			if (len == 0)
+				return "";
+			if (startIndex < 0) {
+				startIndex = s.length + startIndex;
+				if (startIndex < 0)
+					startIndex = 0;
+			}
+			return Syntax.arrayAccess(s, startIndex, startIndex + len);
 		}
-
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/internal/UBuiltins.hx b/std/python/internal/UBuiltins.hx
index ae0cf508eb02003da8a2c118090ab624703a0bfb..ada29a87e100926c874afadfed96f980e08844de 100644
--- a/std/python/internal/UBuiltins.hx
+++ b/std/python/internal/UBuiltins.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,31 +19,33 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.internal;
 
 /**
-    This class provides unqualified access to python builtins that are safe to use in haxe/python code.
-    Fields listed here must be synchronized with genpy's KeywordHandler.kwds2 list to be properly escaped.
+	This class provides unqualified access to python builtins that are safe to use in haxe/python code.
+	Fields listed here must be synchronized with genpy's KeywordHandler.kwds2 list to be properly escaped.
 **/
 extern class UBuiltins {
-    static function len(x:Dynamic):Int;
-    static function isinstance(o:Dynamic, c:Dynamic):Bool;
-    static function str(o:Dynamic):String;
-    static function bool(o:Dynamic):Bool;
-    static function float(o:Dynamic):Float;
-    static function int(o:Dynamic, ?base:Int):Int;
-    static function list<T>(o:Dynamic):Array<T>;
-    static function min<T>(a:T, b:T):T;
-    static function max<T>(a:T, b:T):T;
-    static function hasattr(o:Dynamic, a:String):Bool;
-    static function getattr(o:Dynamic, a:String, ?def:Dynamic):Dynamic;
-    static function setattr(o:Dynamic, a:String, v:Dynamic):Void;
-    static function delattr(o:Dynamic, attr:String):Void;
-    static function callable(x:Dynamic):Bool;
-    static function type(o:Dynamic):Dynamic;
-    static function ord(s:String):Int;
-    static function chr(c:Int):String;
-    static function map<T,S>(f:T->S, a:Array<T>):Array<S>;
-    static function filter<T>(f:T->Bool, a:Array<T>):Array<T>;
-    static function iter<T>(o:python.NativeIterable<T>):python.NativeIterator<T>;
+	static function id(x:Dynamic):String;
+	static function len(x:Dynamic):Int;
+	static function isinstance(o:Dynamic, c:Dynamic):Bool;
+	static function str(o:Dynamic):String;
+	static function bool(o:Dynamic):Bool;
+	static function float(o:Dynamic):Float;
+	static function int(o:Dynamic, ?base:Int):Int;
+	static function list<T>(o:Dynamic):Array<T>;
+	static function min<T>(a:T, b:T):T;
+	static function max<T>(a:T, b:T):T;
+	static function hasattr(o:Dynamic, a:String):Bool;
+	static function getattr(o:Dynamic, a:String, ?def:Dynamic):Dynamic;
+	static function setattr(o:Dynamic, a:String, v:Dynamic):Void;
+	static function delattr(o:Dynamic, attr:String):Void;
+	static function callable(x:Dynamic):Bool;
+	static function type(o:Dynamic):Dynamic;
+	static function ord(s:String):Int;
+	static function chr(c:Int):String;
+	static function map<T, S>(f:T->S, a:Array<T>):Array<S>;
+	static function filter<T>(f:T->Bool, a:Array<T>):Array<T>;
+	static function iter<T>(o:python.NativeIterable<T>):python.NativeIterator<T>;
 }
diff --git a/std/python/io/FileBytesInput.hx b/std/python/io/FileBytesInput.hx
index 72da0c782d58df15d511fad828afb2979ef5aafd..dbe334aa6fab07142d8baeebc46035643cda05a9 100644
--- a/std/python/io/FileBytesInput.hx
+++ b/std/python/io/FileBytesInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import python.io.NativeBytesInput;
@@ -28,7 +29,7 @@ import python.lib.io.IOBase.SeekSet;
 import python.lib.io.TextIOBase;
 
 class FileBytesInput extends NativeBytesInput implements IFileInput {
-	public function new (stream:RawIOBase) {
+	public function new(stream:RawIOBase) {
 		super(stream);
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/io/FileBytesOutput.hx b/std/python/io/FileBytesOutput.hx
index 12baf1d02748506f73f4222884f994aafda0b2ac..0ad796e585176b4f36e4f834e74c491b5071d538 100644
--- a/std/python/io/FileBytesOutput.hx
+++ b/std/python/io/FileBytesOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import python.io.IFileOutput;
@@ -26,7 +27,7 @@ import python.io.NativeBytesOutput;
 import python.lib.io.RawIOBase;
 
 class FileBytesOutput extends NativeBytesOutput implements IFileOutput {
-	public function new (stream:RawIOBase) {
+	public function new(stream:RawIOBase) {
 		super(stream);
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/io/FileTextInput.hx b/std/python/io/FileTextInput.hx
index b5c6cae1082a3341fc6e3d0cb848bf362f9a2e7a..ebc4599e410c82163bedce3c2db44dfb84ac3549 100644
--- a/std/python/io/FileTextInput.hx
+++ b/std/python/io/FileTextInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import python.io.NativeBytesInput;
@@ -28,7 +29,7 @@ import python.lib.io.IOBase.SeekSet;
 import python.lib.io.TextIOBase;
 
 class FileTextInput extends NativeTextInput implements IFileInput {
-	public function new (stream:TextIOBase) {
+	public function new(stream:TextIOBase) {
 		super(stream);
 	}
 }
diff --git a/std/python/io/FileTextOutput.hx b/std/python/io/FileTextOutput.hx
index 760fc8aa4f2c14593d57efd20bfa1559aebddf4e..4a44148c763b556497bfbb43d055a3320ea1e711 100644
--- a/std/python/io/FileTextOutput.hx
+++ b/std/python/io/FileTextOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import python.io.IFileOutput;
@@ -26,7 +27,7 @@ import python.io.NativeBytesOutput;
 import python.lib.io.TextIOBase;
 
 class FileTextOutput extends NativeTextOutput implements IFileOutput {
-	public function new (stream:TextIOBase) {
+	public function new(stream:TextIOBase) {
 		super(stream);
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/io/IFileInput.hx b/std/python/io/IFileInput.hx
index 803a92afdbcc6d31fd412878e4c000654f00fd3c..d07f7682a998da8d894d8a544f285a5edbab09b2 100644
--- a/std/python/io/IFileInput.hx
+++ b/std/python/io/IFileInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,16 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import python.io.IInput;
 import sys.io.FileSeek;
 
-
-
 interface IFileInput extends IInput {
-	public function seek( p : Int, pos : FileSeek ) : Void;
+	public function seek(p:Int, pos:FileSeek):Void;
 
-	public function tell() : Int;
-	public function eof() : Bool;
-}
\ No newline at end of file
+	public function tell():Int;
+	public function eof():Bool;
+}
diff --git a/std/python/io/IFileOutput.hx b/std/python/io/IFileOutput.hx
index 5d8ec8f9a161f9743cfdd132c47718dbd8f14fae..8964aeaca63582b8c2402e086efa3412e150458e 100644
--- a/std/python/io/IFileOutput.hx
+++ b/std/python/io/IFileOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import python.io.IOutput;
 import sys.io.FileSeek;
 
 interface IFileOutput extends IOutput {
-
-	public function seek( p : Int, pos : FileSeek ) : Void;
-	public function tell() : Int;
-
-}
\ No newline at end of file
+	public function seek(p:Int, pos:FileSeek):Void;
+	public function tell():Int;
+}
diff --git a/std/python/io/IInput.hx b/std/python/io/IInput.hx
index ca67167fec8dec41b7a6e47bd403086e5104a7cd..cf77a59016c76d87a182f781986bb2993e4f7b40 100644
--- a/std/python/io/IInput.hx
+++ b/std/python/io/IInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,33 +19,34 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import haxe.io.Bytes;
+import haxe.io.Encoding;
 
-interface IInput
-{
-	public var bigEndian(default,set) : Bool;
+interface IInput {
+	public var bigEndian(default, set):Bool;
 
-	public function readByte() : Int;
+	public function readByte():Int;
 
-	public function readBytes( s : Bytes, pos : Int, len : Int ) : Int;
+	public function readBytes(s:Bytes, pos:Int, len:Int):Int;
 
 	public function close():Void;
 
-	public function readAll( ?bufsize : Int ) : Bytes;
+	public function readAll(?bufsize:Int):Bytes;
 
-	public function readFullBytes( s : Bytes, pos : Int, len : Int ):Void;
+	public function readFullBytes(s:Bytes, pos:Int, len:Int):Void;
 
-	public function read( nbytes : Int ) : Bytes;
+	public function read(nbytes:Int):Bytes;
 
-	public function readUntil( end : Int ) : String;
+	public function readUntil(end:Int):String;
 
-	public function readLine() : String;
+	public function readLine():String;
 
-	public function readFloat() : Float;
+	public function readFloat():Float;
 
-	public function readDouble() : Float;
+	public function readDouble():Float;
 
 	public function readInt8():Int;
 
@@ -59,5 +60,5 @@ interface IInput
 
 	public function readInt32():Int;
 
-	public function readString( len : Int ) : String;
-}
\ No newline at end of file
+	public function readString(len:Int, ?encoding:Encoding):String;
+}
diff --git a/std/python/io/IOutput.hx b/std/python/io/IOutput.hx
index 7408a223578c084e565b84950a5527f5edf9099a..9cf6341959568f6ec2e24c6126170b8100d31b9d 100644
--- a/std/python/io/IOutput.hx
+++ b/std/python/io/IOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,46 +19,47 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import haxe.io.Bytes;
+import haxe.io.Encoding;
 import haxe.io.Input;
 
 interface IOutput {
+	public var bigEndian(default, set):Bool;
 
-	public var bigEndian(default, set) : Bool;
-
-	public function writeByte( c : Int ) : Void;
+	public function writeByte(c:Int):Void;
 
-	public function writeBytes( s : Bytes, pos : Int, len : Int ):Int;
+	public function writeBytes(s:Bytes, pos:Int, len:Int):Int;
 
 	public function flush():Void;
 
 	public function close():Void;
 
-	public function write( s : Bytes ) : Void;
+	public function write(s:Bytes):Void;
 
-	public function writeFullBytes( s : Bytes, pos : Int, len : Int ):Void;
+	public function writeFullBytes(s:Bytes, pos:Int, len:Int):Void;
 
-	public function writeFloat( x : Float ):Void;
+	public function writeFloat(x:Float):Void;
 
-	public function writeDouble( x : Float ):Void;
+	public function writeDouble(x:Float):Void;
 
-	public function writeInt8( x : Int ):Void;
+	public function writeInt8(x:Int):Void;
 
-	public function writeInt16( x : Int ):Void;
+	public function writeInt16(x:Int):Void;
 
-	public function writeUInt16( x : Int ):Void;
+	public function writeUInt16(x:Int):Void;
 
-	public function writeInt24( x : Int ):Void;
+	public function writeInt24(x:Int):Void;
 
-	public function writeUInt24( x : Int ):Void;
+	public function writeUInt24(x:Int):Void;
 
-	public function writeInt32( x : Int ):Void;
+	public function writeInt32(x:Int):Void;
 
-	public function prepare( nbytes : Int ):Void;
+	public function prepare(nbytes:Int):Void;
 
-	public function writeInput( i : Input, ?bufsize : Int ):Void;
+	public function writeInput(i:Input, ?bufsize:Int):Void;
 
-	public function writeString( s : String ):Void;
-}
\ No newline at end of file
+	public function writeString(s:String, ?encoding:Encoding):Void;
+}
diff --git a/std/python/io/IoTools.hx b/std/python/io/IoTools.hx
index fcd6a9593dc15900335275cdf8ba65bcc5a3ac43..a082349c653d0a2b2a3e7b2c1513347d13ff93c2 100644
--- a/std/python/io/IoTools.hx
+++ b/std/python/io/IoTools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import python.io.FileBytesInput;
@@ -29,54 +30,47 @@ import python.lib.io.RawIOBase;
 import python.lib.io.TextIOBase;
 import sys.io.FileInput;
 import sys.io.FileOutput;
-
 import python.lib.io.IOBase.SeekSet;
 
-
 class IoTools {
-
-	public static function createFileInputFromText (t:TextIOBase) {
+	public static function createFileInputFromText(t:TextIOBase) {
 		return new FileInput(new FileTextInput(t));
 	}
 
-	public static function createFileInputFromBytes (t:RawIOBase) {
+	public static function createFileInputFromBytes(t:RawIOBase) {
 		return new FileInput(new FileBytesInput(t));
 	}
 
-	public static function createFileOutputFromText (t:TextIOBase) {
+	public static function createFileOutputFromText(t:TextIOBase) {
 		return new FileOutput(new FileTextOutput(t));
 	}
 
-	public static function createFileOutputFromBytes (t:RawIOBase) {
+	public static function createFileOutputFromBytes(t:RawIOBase) {
 		return new FileOutput(new FileBytesOutput(t));
 	}
 
-	public static function seekInTextMode (stream:TextIOBase, tell:Void->Int , p : Int, pos : sys.io.FileSeek)
-	{
- 		var pos = switch (pos) {
- 			case SeekBegin:
- 				SeekSet;
- 			case SeekCur:
- 				p = tell() + p;
- 				SeekSet;
- 			case SeekEnd :
- 				stream.seek(0, SeekEnd);
- 				p = tell() + p;
- 				SeekSet;
- 		}
+	public static function seekInTextMode(stream:TextIOBase, tell:Void->Int, p:Int, pos:sys.io.FileSeek) {
+		var pos = switch (pos) {
+			case SeekBegin:
+				SeekSet;
+			case SeekCur:
+				p = tell() + p;
+				SeekSet;
+			case SeekEnd:
+				stream.seek(0, SeekEnd);
+				p = tell() + p;
+				SeekSet;
+		}
 
- 		stream.seek(p, pos);
+		stream.seek(p, pos);
 	}
 
-	public static function seekInBinaryMode (stream:RawIOBase, p : Int, pos : sys.io.FileSeek)
-	{
- 		var pos = switch(pos)
-		{
+	public static function seekInBinaryMode(stream:RawIOBase, p:Int, pos:sys.io.FileSeek) {
+		var pos = switch (pos) {
 			case SeekBegin: SeekSet;
 			case SeekCur: SeekCur;
 			case SeekEnd: SeekEnd;
 		};
 		stream.seek(p, pos);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/python/io/NativeBytesInput.hx b/std/python/io/NativeBytesInput.hx
index 4e0670ff1621cd589ad5e6c8e86280cd2208e0e1..410b7b2277b43f0be5290dd6ddc930a693196aff 100644
--- a/std/python/io/NativeBytesInput.hx
+++ b/std/python/io/NativeBytesInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,45 +19,37 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import haxe.io.Eof;
 import haxe.io.Input;
-
 import python.io.IInput;
 import python.io.IoTools;
 import python.Bytearray;
 import python.lib.io.RawIOBase;
 import python.lib.io.IOBase.SeekSet;
 
-
 class NativeBytesInput extends NativeInput<RawIOBase> implements IInput {
-
-
-	public function new (stream:RawIOBase) {
+	public function new(stream:RawIOBase) {
 		super(stream);
-
 	}
 
-	override public function readByte():Int
-	{
-
+	override public function readByte():Int {
 		var ret = stream.read(1);
 
-		if (ret.length == 0) throwEof();
+		if (ret.length == 0)
+			throwEof();
 
 		return ret.get(0);
 	}
 
-	override public function seek( p : Int, pos : sys.io.FileSeek ) : Void
-	{
+	override public function seek(p:Int, pos:sys.io.FileSeek):Void {
 		wasEof = false;
 		return IoTools.seekInBinaryMode(stream, p, pos);
 	}
 
-	override function readinto (b:Bytearray):Int {
+	override function readinto(b:Bytearray):Int {
 		return stream.readinto(b);
 	}
-
-
-}
\ No newline at end of file
+}
diff --git a/std/python/io/NativeBytesOutput.hx b/std/python/io/NativeBytesOutput.hx
index eed68d24bc86ef73686ef52c618bcce53dc2b2c2..a3df6c59444e571417689c002f49c3cfd14da6a9 100644
--- a/std/python/io/NativeBytesOutput.hx
+++ b/std/python/io/NativeBytesOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,32 +19,32 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import haxe.io.Output;
-
 import python.Bytearray;
 import python.lib.io.IOBase;
 import python.lib.io.RawIOBase;
 
-class NativeBytesOutput extends NativeOutput<RawIOBase>{
-
-	public function new (stream:RawIOBase) {
+class NativeBytesOutput extends NativeOutput<RawIOBase> {
+	public function new(stream:RawIOBase) {
 		super(stream);
 	}
 
-	public function seek( p : Int, pos : sys.io.FileSeek ) : Void
-	{
+	public function seek(p:Int, pos:sys.io.FileSeek):Void {
 		return IoTools.seekInBinaryMode(stream, p, pos);
 	}
 
-	override public function prepare(nbytes:Int):Void
-	{
+	override public function prepare(nbytes:Int):Void {
 		stream.truncate(nbytes);
 	}
 
-	override public function writeByte(c:Int):Void
-	{
+	override public function writeByte(c:Int):Void {
 		stream.write(new Bytearray([c]));
 	}
-}
\ No newline at end of file
+
+	override function writeBytes(s:haxe.io.Bytes, pos:Int, len:Int):Int {
+		return stream.write(python.Syntax.code("{0}[{1}:{2}]", s.getData(), pos, pos + len));
+	}
+}
diff --git a/std/python/io/NativeInput.hx b/std/python/io/NativeInput.hx
index 85242fddeb68dab0c9bc73da8e83dfbfc3bbe5ff..4bce039aeeb607f5a4f18775ad66c758e9e5dd43 100644
--- a/std/python/io/NativeInput.hx
+++ b/std/python/io/NativeInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import haxe.io.Eof;
@@ -28,27 +29,27 @@ import python.lib.io.IOBase;
 import python.lib.io.RawIOBase;
 
 class NativeInput<T:IOBase> extends Input {
-
 	var stream:T;
 	var wasEof:Bool;
 
-	function new (s:T) {
+	function new(s:T) {
 		this.stream = s;
 		this.bigEndian = false;
 		wasEof = false;
-		if (!stream.readable()) throw "Write-only stream";
+		if (!stream.readable())
+			throw "Write-only stream";
 	}
 
-	public var canSeek(get,never):Bool;
-	inline function get_canSeek():Bool return stream.seekable();
+	public var canSeek(get, never):Bool;
+
+	inline function get_canSeek():Bool
+		return stream.seekable();
 
-	override public function close():Void
-	{
+	override public function close():Void {
 		stream.close();
 	}
 
-	public function tell() : Int
-	{
+	public function tell():Int {
 		return stream.tell();
 	}
 
@@ -61,16 +62,16 @@ class NativeInput<T:IOBase> extends Input {
 		return wasEof;
 	}
 
-	function readinto (b:Bytearray):Int {
-		throw "abstract method, should be overriden";
+	function readinto(b:Bytearray):Int {
+		throw "abstract method, should be overridden";
 	}
 
-	function seek (p:Int, mode:sys.io.FileSeek) {
-		throw "abstract method, should be overriden";
+	function seek(p:Int, mode:sys.io.FileSeek) {
+		throw "abstract method, should be overridden";
 	}
 
 	override public function readBytes(s:haxe.io.Bytes, pos:Int, len:Int):Int {
-		if( pos < 0 || len < 0 || pos + len > s.length )
+		if (pos < 0 || len < 0 || pos + len > s.length)
 			throw haxe.io.Error.OutsideBounds;
 
 		var ba = new Bytearray(len);
@@ -80,4 +81,4 @@ class NativeInput<T:IOBase> extends Input {
 		s.blit(pos, haxe.io.Bytes.ofData(ba), 0, len);
 		return ret;
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/io/NativeOutput.hx b/std/python/io/NativeOutput.hx
index ee933a3387f3cb0795d25674c15939e2d96bb360..d628a28d577cb7dfb73bcad0e375deaa16559601 100644
--- a/std/python/io/NativeOutput.hx
+++ b/std/python/io/NativeOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,44 +19,41 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import haxe.io.Output;
-
 import python.lib.io.IOBase;
 import python.lib.io.RawIOBase;
 
 class NativeOutput<T:IOBase> extends Output {
-
 	var stream:T;
 
-	public var canSeek(get,never):Bool;
-	inline function get_canSeek():Bool return stream.seekable();
+	public var canSeek(get, never):Bool;
 
-	public function new (stream:T) {
+	inline function get_canSeek():Bool
+		return stream.seekable();
+
+	public function new(stream:T) {
 		this.bigEndian = false;
 		this.stream = stream;
-		if (!stream.writable()) throw "Read only stream";
+		if (!stream.writable())
+			throw "Read only stream";
 	}
 
-	override public function close():Void
-	{
+	override public function close():Void {
 		stream.close();
 	}
 
-	override public function prepare(nbytes:Int):Void
-	{
+	override public function prepare(nbytes:Int):Void {
 		stream.truncate(nbytes);
 	}
 
-	override public function flush():Void
-	{
+	override public function flush():Void {
 		stream.flush();
 	}
 
-
-	public function tell() : Int
-	{
+	public function tell():Int {
 		return stream.tell();
 	}
-}
\ No newline at end of file
+}
diff --git a/std/python/io/NativeTextInput.hx b/std/python/io/NativeTextInput.hx
index e7c2351fa672587abc5d5119d7e1f42d56d6d2c1..624fa0adbe7d803f9eb95d77019f6f50cb18506f 100644
--- a/std/python/io/NativeTextInput.hx
+++ b/std/python/io/NativeTextInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import haxe.io.Eof;
 import haxe.io.Input;
-
 import python.io.IInput;
 import python.io.IoTools;
 import python.io.NativeInput;
@@ -32,30 +32,26 @@ import python.lib.io.RawIOBase;
 import python.lib.io.IOBase.SeekSet;
 import python.lib.io.TextIOBase;
 
-
 class NativeTextInput extends NativeInput<TextIOBase> implements IInput {
-
-	public function new (stream:TextIOBase) {
+	public function new(stream:TextIOBase) {
 		super(stream);
 	}
 
-	override public function readByte():Int
-	{
-		var ret = stream.read(1);
+	override public function readByte():Int {
+		var ret = stream.buffer.read(1);
 
-		if (ret.length == 0) throwEof();
+		if (ret.length == 0)
+			throwEof();
 
-		return ret.charCodeAt(0);
+		return ret[0];
 	}
 
-	override public function seek( p : Int, pos : sys.io.FileSeek ) : Void
-	{
+	override public function seek(p:Int, pos:sys.io.FileSeek):Void {
 		wasEof = false;
 		IoTools.seekInTextMode(stream, tell, p, pos);
 	}
 
-	override function readinto (b:Bytearray):Int {
+	override function readinto(b:Bytearray):Int {
 		return stream.buffer.readinto(b);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/python/io/NativeTextOutput.hx b/std/python/io/NativeTextOutput.hx
index ff0403f4cf8bb6254c1c1b4c8840c2ad1f253b2d..3fc14ec88aed0e0c52b4cafb86008aeec0ec4d8e 100644
--- a/std/python/io/NativeTextOutput.hx
+++ b/std/python/io/NativeTextOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,30 +19,31 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.io;
 
 import haxe.io.Output;
-
 import python.io.IoTools;
 import python.lib.io.IOBase;
 import python.lib.io.RawIOBase;
 import python.lib.io.TextIOBase;
 
 class NativeTextOutput extends NativeOutput<TextIOBase> {
-
-	public function new (stream:TextIOBase) {
+	public function new(stream:TextIOBase) {
 		super(stream);
-		if (!stream.writable()) throw "Read only stream";
+		if (!stream.writable())
+			throw "Read only stream";
 	}
 
-	public function seek( p : Int, pos : sys.io.FileSeek ) : Void
-	{
+	public function seek(p:Int, pos:sys.io.FileSeek):Void {
 		IoTools.seekInTextMode(stream, tell, p, pos);
 	}
 
-	override public function writeByte(c:Int):Void
-	{
-		stream.write(String.fromCharCode(c));
+	override public function writeBytes(s:haxe.io.Bytes, pos:Int, len:Int):Int {
+		return stream.buffer.write(python.Syntax.arrayAccess(@:privateAccess s.b, pos, pos + len));
 	}
 
-}
\ No newline at end of file
+	override public function writeByte(c:Int):Void {
+		stream.write(String.fromCharCode(c));
+	}
+}
diff --git a/std/python/lib/Builtins.hx b/std/python/lib/Builtins.hx
index aa5fa7771fb3a44f30d0d13f9d28373ab753e90b..75d0001f6b1adf74582a2c407e16e77a138ed403 100644
--- a/std/python/lib/Builtins.hx
+++ b/std/python/lib/Builtins.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,10 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import haxe.extern.Rest;
-
 import python.lib.io.FileIO;
 import python.Dict;
 import python.lib.io.IOBase;
@@ -31,10 +31,7 @@ import python.NativeIterator;
 
 @:pythonImport("builtins")
 extern class Builtins {
-
-
-
-	@:overload(function (f:Int):Int {})
+	@:overload(function(f:Int):Int {})
 	public static function abs(x:Float):Float;
 	public static function all(i:Iterable<Bool>):Bool;
 	public static function any(i:Iterable<Bool>):Bool;
@@ -44,127 +41,116 @@ extern class Builtins {
 	public static function issubclass(x:Class<Dynamic>, from:Class<Dynamic>):Bool;
 	public static function callable(x:Dynamic):Bool;
 
-
-
-
 	@:overload(function(obj:Dynamic, f:Tuple<Dynamic>):Bool {})
 	public static function isinstance(obj:Dynamic, cl:Dynamic):Bool;
 
 	public static function hasattr(obj:Dynamic, attr:String):Bool;
 	public static function getattr(obj:Dynamic, attr:String):Dynamic;
 
-	@:overload(function (f:Set<Dynamic>):Int {})
-	@:overload(function (f:StringBuf):Int {})
-	@:overload(function (f:Array<Dynamic>):Int {})
-	@:overload(function (f:Dict<Dynamic, Dynamic>):Int {})
-	@:overload(function (f:Bytes):Int {})
-	@:overload(function (f:DictView<Dynamic>):Int {})
-	@:overload(function (f:Bytearray):Int {})
-	@:overload(function (f:Tuple<Dynamic>):Int {})
+	@:overload(function(f:Set<Dynamic>):Int {})
+	@:overload(function(f:StringBuf):Int {})
+	@:overload(function(f:Array<Dynamic>):Int {})
+	@:overload(function(f:Dict<Dynamic, Dynamic>):Int {})
+	@:overload(function(f:Bytes):Int {})
+	@:overload(function(f:DictView<Dynamic>):Int {})
+	@:overload(function(f:Bytearray):Int {})
+	@:overload(function(f:Tuple<Dynamic>):Int {})
 	public static function len(x:String):Int;
 
-	public static function open(file:String, mode:String, ?buffering:Int = -1, ?encoding:String = null, ?errors : String, ?newline:String, ?closefd:Bool, ?opener:String->Int->FileDescriptor):IOBase;
-
-	//public static function divmod():Void;
-	//public static function input():Void;
+	public static function open(file:String, mode:String, ?buffering:Int = -1, ?encoding:String = null, ?errors:String, ?newline:String, ?closefd:Bool,
+		?opener:String->Int->FileDescriptor):IOBase;
 
-	//public static function staticmethod():Void;
-	//public static function enumerate():Void;
-	@:overload(function (x:Dynamic, base:Int):Int {})
+	// public static function divmod():Void;
+	// public static function input():Void;
+	// public static function staticmethod():Void;
+	// public static function enumerate():Void;
+	@:overload(function(x:Dynamic, base:Int):Int {})
 	public static function int(x:Dynamic):Int;
 	public static function ord(s:String):Int;
 	public static function str(o:Dynamic):String;
-	//public static function eval():Void;
-
-	//public static function pow():Void;
-	//public static function sum():Void;
-	//public static function basestring():Void;
-	//public static function execfile():Void;
 
+	// public static function eval():Void;
+	// public static function pow():Void;
+	// public static function sum():Void;
+	// public static function basestring():Void;
+	// public static function execfile():Void;
 	public static function print(o:Dynamic):Void;
 
-	//public static function super():Void;
-	//public static function bin():Void;
-	//public static function file():Void;
+	// public static function super():Void;
+	// public static function bin():Void;
+	// public static function file():Void;
 	public static function iter<X>(d:DictView<X>):NativeIterator<X>;
-	//public static function property():Void;
-
 
+	// public static function property():Void;
 	/*
-	@:overload(function <X>():Tuple<X> {})
-	public static function tuple<X>(a:Array<X>):Tuple<X>;
-	*/
-
-
-
-	//public static function range():Void;
-
+		@:overload(function <X>():Tuple<X> {})
+		public static function tuple<X>(a:Array<X>):Tuple<X>;
+	 */
+	// public static function range():Void;
 	public static function type():Void;
 	/*
-	@:overload(function (it:Array<Int>):python.Bytearray {})
-	@:overload(function (it:NativeIterable<Int>):python.Bytearray {})
-	@:overload(function (size:Int):python.Bytearray {})
-	public static function bytearray(source:String,encoding:String,?errors:Dynamic):python.Bytearray;
-	*/
+		@:overload(function (it:Array<Int>):python.Bytearray {})
+		@:overload(function (it:NativeIterable<Int>):python.Bytearray {})
+		@:overload(function (size:Int):python.Bytearray {})
+		public static function bytearray(source:String,encoding:String,?errors:Dynamic):python.Bytearray;
+	 */
 	public static function float(x:Dynamic):Float;
 
-	@:overload(function <T>(f:Array<T>):Array<T> {})
-	@:overload(function <T>(f:Tuple<T>):Array<T> {})
-	@:overload(function <T>(f:Dict.DictView<T>):Array<T> {})
-	@:overload(function (f:String):Array<String> {})
+	@:overload(function<T>(f:Array<T>):Array<T> {})
+	@:overload(function<T>(f:Tuple<T>):Array<T> {})
+	@:overload(function<T>(f:Dict.DictView<T>):Array<T> {})
+	@:overload(function(f:String):Array<String> {})
 	public static function list<T>(i:NativeIterable<T>):Array<T>;
 
-	@:overload(function <A>(f:A->Bool, i:NativeIterable<A>):NativeIterator<A> {})
+	@:overload(function<A>(f:A->Bool, i:NativeIterable<A>):NativeIterator<A> {})
 	public static function filter<A>(f:A->Bool, i:Array<A>):NativeIterator<A>;
-	//public static function raw_input():Void;
-	//public static function unichr():Void;
 
-	//public static function format():Void;
-	//public static function locals():Void;
-	//public static function reduce():Void;
-	//public static function unicode():Void;
+	// public static function raw_input():Void;
+	// public static function unichr():Void;
+	// public static function format():Void;
+	// public static function locals():Void;
+	// public static function reduce():Void;
+	// public static function unicode():Void;
 	public static function chr(c:Int):String;
-	//public static function frozenset():Void;
-	//public static function long():Void;
-	//public static function reload():Void;
-	//public static function vars():Void;
-	//public static function classmethod():Void;
-
-	public static function map<A,B>(fn:A->B, it:NativeIterable<A>):NativeIterator<B>;
-	//public static function repr():Void;
-	//public static function xrange():Void;
-	//public static function cmp():Void;
-	//public static function globals():Void;
-	@:overload(function (a1:Float, a2:Float, rest:Rest<Float>):Float {})
+
+	// public static function frozenset():Void;
+	// public static function long():Void;
+	// public static function reload():Void;
+	// public static function vars():Void;
+	// public static function classmethod():Void;
+	public static function map<A, B>(fn:A->B, it:NativeIterable<A>):NativeIterator<B>;
+	public static function repr(o:Dynamic):String;
+	// public static function xrange():Void;
+	// public static function cmp():Void;
+	// public static function globals():Void;
+	@:overload(function(a1:Float, a2:Float, rest:Rest<Float>):Float {})
 	public static function max(a1:Int, a2:Int, rest:Rest<Int>):Int;
-	//public static function reversed():Void;
-	//public static function zip():Void;
-	//public static function compile():Void;
 
-	//public static function memoryview():Void;
+	// public static function reversed():Void;
+	// public static function zip():Void;
+	// public static function compile():Void;
+	// public static function memoryview():Void;
 	public static function round(f:Float):Int;
-	//public static function __import__():Void;
-	//public static function complex():Void;
-	//public static function hash():Void;
-	@:overload(function (a1:Float, a2:Float, rest:Rest<Float>):Float {})
+	// public static function __import__():Void;
+	// public static function complex():Void;
+	// public static function hash():Void;
+	@:overload(function(a1:Float, a2:Float, rest:Rest<Float>):Float {})
 	public static function min(a1:Int, a2:Int, rest:Rest<Int>):Int;
-	//public static function set():Void;
-	//public static function apply():Void;
+	// public static function set():Void;
+	// public static function apply():Void;
 	public static function delattr(o:Dynamic, attr:String):Void;
-	//public static function help():Void;
-	//public static function next():Void;
+	// public static function help():Void;
+	// public static function next():Void;
 	public static function setattr(o:Dynamic, attr:String, val:Dynamic):Void;
-	//public static function buffer():Void;
-	//public static function dict():Void;
-	//public static function hex():Void;
-	//public static function object():Void;
-	//public static function slice():Void;
-	//public static function coerce():Void;
-	//public static function dir():Void;
+	// public static function buffer():Void;
+	// public static function dict():Void;
+	// public static function hex():Void;
+	// public static function object():Void;
+	// public static function slice():Void;
+	// public static function coerce():Void;
+	// public static function dir():Void;
 	public static function id(x:{}):Int;
-	//public static function oct():Void;
-	//public static function sorted():Void;
-	//public static function intern():Void;
-
-
-}
\ No newline at end of file
+	// public static function oct():Void;
+	// public static function sorted():Void;
+	// public static function intern():Void;
+}
diff --git a/std/python/lib/Codecs.hx b/std/python/lib/Codecs.hx
index d1c4f9fac6056e4076d08f96492b23a7f8b7e43f..ca731196c3f71a6f69aaa5f48a8bb5752abf6a28 100644
--- a/std/python/lib/Codecs.hx
+++ b/std/python/lib/Codecs.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.Bytes;
@@ -29,4 +30,4 @@ extern class Codecs {
 	static function open(filename:String, mode:String, ?encoding:String, ?errors:String, ?buffering:Bool):StreamReaderWriter;
 	static function encode(obj:String, ?encoding:String = "utf-8", errors:String = "strict"):Bytes;
 	static function decode(obj:Bytes, ?encoding:String = "utf-8", errors:String = "strict"):String;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/FileDescriptor.hx b/std/python/lib/FileDescriptor.hx
index 9adb407348932bc29da578afbdce37814e432e73..c6bc906136bb16596d77c2ad37c0447d5895d8f3 100644
--- a/std/python/lib/FileDescriptor.hx
+++ b/std/python/lib/FileDescriptor.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package python.lib;
 
-extern class FileDescriptor {
+package python.lib;
 
-}
\ No newline at end of file
+extern class FileDescriptor {}
diff --git a/std/python/lib/FileObject.hx b/std/python/lib/FileObject.hx
index 70ff1a69a8eb225f78ea3a9c4384c4e760b88c12..d3e3c94d9e0fb7e32b025a00d6ab3fd0d5daf5da 100644
--- a/std/python/lib/FileObject.hx
+++ b/std/python/lib/FileObject.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.lib.io.IOBase;
 
-typedef FileObject = IOBase;
\ No newline at end of file
+typedef FileObject = IOBase;
diff --git a/std/python/lib/Functools.hx b/std/python/lib/Functools.hx
index 67c1612fb7b030013a5d55747d270b9fd35da338..81f96ff9b32cb9bf613e048a17cb93eefd239f0f 100644
--- a/std/python/lib/Functools.hx
+++ b/std/python/lib/Functools.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package python.lib;
 
+package python.lib;
 
 @:pythonImport("functools")
 extern class Functools {
-
 	public static function cmp_to_key<A>(f:A->A->Int):Dynamic;
-
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/Glob.hx b/std/python/lib/Glob.hx
index 06050bcc4452beb845ec61b96c678e903c88f889..1d01c7e295cc1e7115fbc26f704b42103c490a69 100644
--- a/std/python/lib/Glob.hx
+++ b/std/python/lib/Glob.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package python.lib;
 
+package python.lib;
 
 import python.NativeIterator;
 
 @:pythonImport("glob")
 extern class Glob {
-
-	public static function glob (pathname:String):Array<String>;
-	public static function iglob (pathname:String):NativeIterator<String>;
-
-}
\ No newline at end of file
+	public static function glob(pathname:String):Array<String>;
+	public static function iglob(pathname:String):NativeIterator<String>;
+}
diff --git a/std/python/lib/Hashlib.hx b/std/python/lib/Hashlib.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e26aeab4a66010e492a2c79b0ca77fd8260cae52
--- /dev/null
+++ b/std/python/lib/Hashlib.hx
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C)2005-2019 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 python.lib;
+
+import python.Bytes;
+import python.Set;
+
+@:pythonImport("hashlib")
+extern class Hashlib {
+	/**
+		A set containing the names of the hash algorithms guaranteed to be supported by this module on all platforms.
+		Note that ‘md5’ is in this list despite some upstream vendors offering an odd “FIPS compliant” Python build that excludes it.
+	**/
+	static var algorithms_guaranteed(default, null):Set<String>;
+
+	/**
+		A set containing the names of the hash algorithms that are available in the running Python interpreter.
+		These names will be recognized when passed to new(). algorithms_guaranteed will always be a subset.
+		The same algorithm may appear multiple times in this set under different names (thanks to OpenSSL).
+	**/
+	static var algorithms_available(default, null):Set<String>;
+
+	/**
+		A generic constructor that takes the string name of the desired algorithm as its first parameter.
+		It also exists to allow access to the above listed hashes as well as any other algorithms that your OpenSSL library may offer.
+		The named constructors are much faster than new() and should be preferred.
+	**/
+	@:native("new")
+	static function new_(name:String, ?data:Bytes):HashlibHash;
+
+	static function sha1():HashlibHash;
+	static function sha224():HashlibHash;
+	static function sha256():HashlibHash;
+	static function sha384():HashlibHash;
+	static function sha512():HashlibHash;
+	static function blake2b():HashlibHash;
+	static function blake2s():HashlibHash;
+	static function md5():HashlibHash;
+	static function sha3_224():HashlibHash;
+	static function sha3_256():HashlibHash;
+	static function sha3_384():HashlibHash;
+	static function sha3_512():HashlibHash;
+	static function shake_128():HashlibHash;
+	static function shake_256():HashlibHash;
+}
+
+extern class HashlibHash {
+	/**
+		The size of the resulting hash in bytes.
+	**/
+	var digest_size(default, null):Int;
+
+	/**
+		The internal block size of the hash algorithm in bytes.
+	**/
+	var block_size(default, null):Int;
+
+	/**
+		The canonical name of this hash, always lowercase and always suitable as a parameter to new() to create another hash of this type.
+	**/
+	var name:String;
+
+	/**
+		Update the hash object with the object arg, which must be interpretable as a buffer of bytes.
+		Repeated calls are equivalent to a single call with the concatenation of all the arguments: m.update(a); m.update(b) is equivalent to m.update(a+b).
+	**/
+	function update(a:Bytes):Void;
+
+	/**
+		Return the digest of the data passed to the update() method so far.
+		This is a bytes object of size digest_size which may contain bytes in the whole range from 0 to 255.
+	**/
+	function digest():Bytes;
+
+	/**
+		Like digest() except the digest is returned as a string object of double length, containing only hexadecimal digits.
+		This may be used to exchange the value safely in email or other non-binary environments.
+	**/
+	function hexdigest():String;
+
+	/**
+		Return a copy (“clone”) of the hash object.
+		This can be used to efficiently compute the digests of data sharing a common initial substring.
+	**/
+	function copy():HashlibHash;
+}
diff --git a/std/python/lib/Inspect.hx b/std/python/lib/Inspect.hx
index 51ab05fd80eff78a4cfb1239b915f46f249384f9..b0a25afe70a4654e05ab0f58ea7b424d3b16606d 100644
--- a/std/python/lib/Inspect.hx
+++ b/std/python/lib/Inspect.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,20 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.Tuple.Tuple2;
 
 @:pythonImport("inspect")
 extern class Inspect {
-	static function getmembers(object:Dynamic, ?predicate:Dynamic->Bool):Array<Tuple2<String,Dynamic>>;
+	static function getmembers(object:Dynamic, ?predicate:Dynamic->Bool):Array<Tuple2<String, Dynamic>>;
 	static function ismethod(object:Dynamic):Bool;
 	static function isclass(object:Dynamic):Bool;
 	static function isfunction(object:Dynamic):Bool;
 	static function getsourcefile(object:Dynamic):String;
+
+	static public inline function isInterface(cls:Class<Dynamic>):Bool {
+		return untyped __define_feature__("python._hx_is_interface", c._hx_is_interface);
+	}
 }
diff --git a/std/python/lib/Io.hx b/std/python/lib/Io.hx
index 1925010dd34c69e87195119e598e077fdbb949b8..6fbee2c2c1b83c41ade3baafd0d3ed4b39df53c9 100644
--- a/std/python/lib/Io.hx
+++ b/std/python/lib/Io.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.lib.io.IOBase;
 
 @:pythonImport("io")
 extern class Io {
-
 	public static var DEFAULT_BUFFER_SIZE:Int;
 
-	public static function open(file:String, mode:String, ?buffering:Int = -1, ?encoding:String = null, ?errors : String, ?newline:String, ?closefd:Bool, ?opener:String->Int->FileDescriptor):IOBase;
-}
\ No newline at end of file
+	public static function open(file:String, mode:String, ?buffering:Int = -1, ?encoding:String = null, ?errors:String, ?newline:String, ?closefd:Bool,
+		?opener:String->Int->FileDescriptor):IOBase;
+}
diff --git a/std/python/lib/Json.hx b/std/python/lib/Json.hx
index ab83f1f0fa64d2cccda76bd2050c7ad4c28b808e..834afa1a8bfdb670b47bb54c0901eb42539b2dc6 100644
--- a/std/python/lib/Json.hx
+++ b/std/python/lib/Json.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.KwArgs;
@@ -27,28 +28,25 @@ import python.lib.json.JSONEncoder;
 import python.Tuple.Tuple2;
 
 typedef JsonDumpsOptions = {
-	@:optional var skipkeys : Bool;
-	@:optional var ensure_ascii : Bool;
-	@:optional var check_circular : Bool;
-	@:optional var allow_nan : Bool;
-	@:optional var cls : Dynamic;
-	@:optional var indent : String;
-	@:optional var separators:Tuple2<String,String>;
-	@:optional @:native("default") var def:Dynamic->String;
-	@:optional var sort_keys:Bool;
-
+	var ?skipkeys:Bool;
+	var ?ensure_ascii:Bool;
+	var ?check_circular:Bool;
+	var ?allow_nan:Bool;
+	var ?cls:Dynamic;
+	var ?indent:String;
+	var ?separators:Tuple2<String, String>;
+	@:native("default") var ?def:Dynamic->String;
+	var ?sort_keys:Bool;
 }
 
 typedef JsonLoadsOptions = {
-	@:optional var encoding:String;
-	@:optional var cls : Dynamic;
-	@:optional var object_hook:Dict<String, Dynamic>->Dynamic;
+	var ?encoding:String;
+	var ?cls:Dynamic;
+	var ?object_hook:Dict<String, Dynamic>->Dynamic;
 }
 
 @:pythonImport("json")
 extern class Json {
-
-	public static function loads ( s:String, ?options:KwArgs<JsonLoadsOptions>):Dict<String, Dynamic>;
-	public static function dumps (x:Dynamic, ?options:KwArgs<JsonDumpsOptions>):String;
-
-}
\ No newline at end of file
+	public static function loads(s:String, ?options:KwArgs<JsonLoadsOptions>):Dict<String, Dynamic>;
+	public static function dumps(x:Dynamic, ?options:KwArgs<JsonDumpsOptions>):String;
+}
diff --git a/std/python/lib/Math.hx b/std/python/lib/Math.hx
index c59e1844de7bc2965ca264c349cc83aa97697d90..9d1c0cd5563826f7a247d4a670f5f88bf1ecc715 100644
--- a/std/python/lib/Math.hx
+++ b/std/python/lib/Math.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 @:pythonImport("math")
 extern class Math {
-
-	public static function isnan (f:Float):Bool;
+	public static function isnan(f:Float):Bool;
 
 	public static var pi:Float;
 
@@ -37,5 +37,4 @@ extern class Math {
 	static function acos(v:Float):Float;
 	static function atan(v:Float):Float;
 	static function atan2(y:Float, x:Float):Float;
-
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/Msvcrt.hx b/std/python/lib/Msvcrt.hx
index 7a569b0b22184b82c006278dfd531cd488b21cf6..aec2bad8487d6a1ab52ab1608621185a15457085 100644
--- a/std/python/lib/Msvcrt.hx
+++ b/std/python/lib/Msvcrt.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
-@:pythonImport("msvcrt", ignoreError=true)
+@:pythonImport("msvcrt", ignoreError = true)
 extern class Msvcrt {
-
-	public static function getch ():python.Bytes;
-
-}
\ No newline at end of file
+	public static function getch():python.Bytes;
+	public static function getwch():String;
+}
diff --git a/std/python/lib/Os.hx b/std/python/lib/Os.hx
index 70751633e47dd5cc47ba54d919286435e09bea6c..c3b64b8a40b67d340b124f624b11802b4bd1300d 100644
--- a/std/python/lib/Os.hx
+++ b/std/python/lib/Os.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package python.lib;
 
+package python.lib;
 
 import python.Exceptions.OSError;
 import python.Tuple;
@@ -53,41 +53,40 @@ extern class Stat {
 
 @:pythonImport("os")
 extern class Os {
+	public static var environ:Dict<String, String>;
 
-	public static var environ : Dict<String, String>;
-
-	public static function putenv (name:String, value:String):Void;
+	public static function putenv(name:String, value:String):Void;
 
-	public static function chdir (path:String):Void;
+	public static function chdir(path:String):Void;
 
-	public static function unlink (path:String):Void;
-	public static function remove (path:String):Void;
+	public static function unlink(path:String):Void;
+	public static function remove(path:String):Void;
 
 	public static function getcwd():String;
 
 	public static function getcwdb():Bytes;
 
-	public static function removedirs (path:String):Void;
+	public static function removedirs(path:String):Void;
 
-	public static function rename (src:String, dest:String):Void;
+	public static function rename(src:String, dest:String):Void;
 
-	public static function renames (oldName:String, newName:String):Void;
+	public static function renames(oldName:String, newName:String):Void;
 
-	public static function rmdir (path:String):Void;
+	public static function rmdir(path:String):Void;
 
+	public static function stat(path:String):Stat;
 
-	public static function stat (path:String):Stat;
+	public static function fchdir(fd:FileDescriptor):Void;
 
-	public static function fchdir (fd:FileDescriptor):Void;
+	public static function listdir(path:String = "."):Array<String>;
 
-	public static function listdir (path:String = "."):Array<String>;
+	public static function walk(top:String, topdown:Bool = true, onerror:OSError->Void = null,
+		followlinks:Bool = false):Tuple3<String, Array<String>, Array<String>>;
 
-	public static function walk (top:String, topdown:Bool = true, onerror:OSError->Void = null, followlinks:Bool = false):Tuple3<String, Array<String>, Array<String>>;
-
-	public static var sep(default, null) : String;
+	public static var sep(default, null):String;
 	public static var pathsep(default, null):String;
 
-	public static function makedirs (path:String, mode : Int = 511 /* Oktal 777 */, exist_ok:Bool = false):Void;
+	public static function makedirs(path:String, mode:Int = 511 /* Oktal 777 */, exist_ok:Bool = false):Void;
 
-	public static function mkdir (path:String, mode : Int = 511 /* Oktal 777 */):Void;
-}
\ No newline at end of file
+	public static function mkdir(path:String, mode:Int = 511 /* Oktal 777 */):Void;
+}
diff --git a/std/python/lib/Pprint.hx b/std/python/lib/Pprint.hx
index 7d1c5865d076e48478933f415c6416cba1c765c2..6b1125acc58ba86c0fa377b59b83a0637b78986d 100644
--- a/std/python/lib/Pprint.hx
+++ b/std/python/lib/Pprint.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 @:pythonImport("pprint")
 extern class Pprint {
+	public static function pprint(x:Dynamic):Void;
 
-
-	public static function pprint (x:Dynamic):Void;
-
-	public static function pformat(object:Dynamic, indent:Int=1, width:Int=80, depth:Int=null):String;
-
-}
\ No newline at end of file
+	public static function pformat(object:Dynamic, indent:Int = 1, width:Int = 80, depth:Int = null):String;
+}
diff --git a/std/python/lib/Random.hx b/std/python/lib/Random.hx
index fd6846e293ef3dee57af973721391d5cea29de09..d62160735042a7a3d1ddf6aa507fa93d0314f838 100644
--- a/std/python/lib/Random.hx
+++ b/std/python/lib/Random.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,135 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package python.lib;
 
+package python.lib;
 
 @:pythonImport("random")
 extern class Random {
+	/**
+		Initialize the random number generator.
+
+		If `a` is omitted or `null`, the current system time is used.
+		If randomness sources are provided by the operating system,
+		they are used instead of the system time (see the os.urandom()
+		function for details on availability).
+
+		If `a` is an int, it is used directly.
+
+		With `version` 2 (the default), a str, bytes, or bytearray object
+		gets converted to an int and all of its bits are used.
+		With version 1, the hash() of a is used instead.
+	**/
+	static function seed(?a:Int, ?version:Int):Float;
+
+	/**
+		Return an object capturing the current internal state of the generator.
+		This object can be passed to setstate() to restore the state.
+	**/
+	static function getstate():RandomState;
+
+	/**
+		`state` should have been obtained from a previous call to `getstate`(),
+		and `setstate`() restores the internal state of the generator to what
+		it was at the time `getstate`() was called.
+	**/
+	static function setstate(state:RandomState):Void;
+
+	/**
+		Returns a Python integer with `k` random bits.
+		This method is supplied with the `MersenneTwister` generator and
+		some other generators may also provide it as an optional part of the API.
+		When available, `getrandbits`() enables `randrange`() to handle arbitrarily large ranges.
+	**/
+	static function getrandbits(k:Int):Int;
+
+	/**
+		Return a randomly selected element from `range(start, stop, step)`.
+		This is equivalent to `choice(range(start, stop, step))`,
+		but doesn’t actually build a range object.
+	**/
+	@:overload(function(stop:Int):Int {})
+	static function randrange(start:Int, stop:Int, ?step:Int):Int;
+
+	/**
+		Return a random integer N such that `a <= N <= b`. Alias for `randrange(a, b+1)`.
+	**/
+	static function randint(a:Int, b:Int):Int;
+
+	/**
+		Return the next random floating point number in the range [0.0, 1.0).
+	**/
+	static function random():Float;
+
+	/**
+		Return a random floating point number N such that
+		`a <= N <= b` for `a <= b` and `b <= N <= a` for `b < a`.
+	**/
+	static function uniform(a:Float, b:Float):Float;
+
+	/**
+		Return a random floating point number N such that
+		`low <= N <= high` and with the specified `mode` between those bounds.
+		The `low` and `high` bounds default to zero and one.
+		The `mode` argument defaults to the midpoint between the bounds,
+		giving a symmetric distribution.
+	**/
+	static function triangular(?low:Float, ?high:Float, ?mode:Float):Float;
+
+	/**
+		Beta distribution. Conditions on the parameters are `alpha > 0` and `beta > 0`.
+		Returned values range between 0 and 1.
+	**/
+	static function betavariate(alpha:Float, beta:Float):Float;
+
+	/**
+		Exponential distribution. `lambd` is 1.0 divided by the desired mean.
+		It should be nonzero. Returned values range from 0 to positive infinity if `lambd` is positive,
+		and from negative infinity to 0 if `lambd` is negative.
+	**/
+	static function expovariate(lambd:Float):Float;
+
+	/**
+		Gamma distribution. (Not the gamma function!)
+		Conditions on the parameters are `alpha > 0` and `beta > 0`.
+	**/
+	static function gammavariate(alpha:Float, beta:Float):Float;
+
+	/**
+		Gaussian distribution. `mu` is the mean, and `sigma` is the standard deviation.
+		This is slightly faster than the `normalvariate` function defined below.
+	**/
+	static function gauss(mu:Float, sigma:Float):Float;
+
+	/**
+		Log normal distribution. If you take the natural logarithm of this distribution,
+		you’ll get a normal distribution with mean `mu` and standard deviation `sigma`.
+		`mu` can have any value, and `sigma` must be greater than zero.
+	**/
+	static function lognormvariate(mu:Float, sigma:Float):Float;
+
+	/**
+		Normal distribution. `mu` is the mean, and `sigma` is the standard deviation.
+	**/
+	static function normalvariate(mu:Float, sigma:Float):Float;
+
+	/**
+		`mu` is the mean angle, expressed in radians between 0 and 2*pi,
+		and `kappa` is the concentration parameter, which must be greater than or equal to zero.
+		If `kappa` is equal to zero, this distribution reduces to a uniform random angle
+		over the range 0 to 2*pi.
+	**/
+	static function vonmisesvariate(mu:Float, kappa:Float):Float;
+
+	/**
+		Pareto distribution. alpha is the `shape` parameter.
+	**/
+	static function paretovariate(alpha:Float):Float;
 
-	public static function random ():Float;
+	/**
+		Weibull distribution. `alpha` is the scale parameter and `beta` is the shape parameter.
+	**/
+	static function weibullvariate(alpha:Float, beta:Float):Float;
+}
 
-}
\ No newline at end of file
+abstract RandomState({}) {}
diff --git a/std/python/lib/Re.hx b/std/python/lib/Re.hx
index f83ca6d29325b5101f4f5c7b2ebc3a16f85039ec..46e6adbb1393d7cfbc6743dad771312ade5a1bc9 100644
--- a/std/python/lib/Re.hx
+++ b/std/python/lib/Re.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,28 +19,23 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.Tuple;
 
+private abstract Choice<A, B>(Dynamic) {
+	@:from public static inline function fromA<A, B>(x:A):Choice<A, B>
+		return cast x;
 
-private abstract Choice <A,B>(Dynamic) {
-	@:from public static inline function fromA <A,B>(x:A):Choice<A,B> return cast x;
-	@:from public static inline function fromB <A,B>(x:B):Choice<A,B> return cast x;
+	@:from public static inline function fromB<A, B>(x:B):Choice<A, B>
+		return cast x;
 }
 
-typedef TODO = Dynamic;
-
 typedef Pattern = Choice<String, Regex>;
-
 typedef Repl = Choice<String, MatchObject->String>;
 
-
-
-
-extern class MatchObject
-{
-
+extern class MatchObject {
 	public var pos(default, null):Int;
 	public var endpos(default, null):Int;
 	public var lastindex(default, null):Int;
@@ -50,20 +45,19 @@ extern class MatchObject
 
 	public function expand(template:String):String;
 
-	@:overload(function (x:String):String {})
+	@:overload(function(x:String):String {})
 	public function group(?i:Int = 0):String;
 
 	public function groups(defaultVal:String = null):Tuple<String>;
 	public function groupdict(defaultVal:Dict<String, String> = null):Dict<String, String>;
 
-	@:overload(function (x:String):Int {})
-	public function start (?i:Int = 0):Int;
-
-	@:overload(function (x:String):Int {})
-	public function end (?i:Int = 0):Int;
+	@:overload(function(x:String):Int {})
+	public function start(?i:Int = 0):Int;
 
-	public function span (?i:Int):Tuple2<Int, Int>;
+	@:overload(function(x:String):Int {})
+	public function end(?i:Int = 0):Int;
 
+	public function span(?i:Int):Tuple2<Int, Int>;
 
 	public inline function groupById(s:String):String {
 		return group(s);
@@ -76,12 +70,10 @@ extern class MatchObject
 	public inline function endById(s:String):Int {
 		return end(s);
 	}
-
 }
 
 private class RegexHelper {
-	public static function findallDynamic(r:Regex, string:String, ?pos:Int, ?endpos:Int):Array<Dynamic>
-	{
+	public static function findallDynamic(r:Regex, string:String, ?pos:Int, ?endpos:Int):Array<Dynamic> {
 		if (endpos == null) {
 			if (pos == null) {
 				return python.Syntax.field(r, "findall")(string);
@@ -91,42 +83,35 @@ private class RegexHelper {
 		} else {
 			return python.Syntax.field(r, "findall")(string, pos, endpos);
 		}
-
 	}
 }
 
-extern class Regex
-{
+extern class Regex {
 	public function search(string:String, pos:Int = 0, ?endpos:Int):Null<MatchObject>;
 	public function match(string:String, pos:Int = 0, ?endpos:Int):Null<MatchObject>;
 
-	public function split(string:String, maxsplit:Int=0):Array<String>;
+	public function split(string:String, maxsplit:Int = 0):Array<String>;
 
-	public inline function findallString(string:String, ?pos:Int, ?endpos:Int):Array<String>
-	{
+	public inline function findallString(string:String, ?pos:Int, ?endpos:Int):Array<String> {
 		return cast this.findallDynamic(string, pos, endpos);
 	}
 
-
-	public inline function findallDynamic(string:String, ?pos:Int, ?endpos:Int):Array<Dynamic>
-	{
+	public inline function findallDynamic(string:String, ?pos:Int, ?endpos:Int):Array<Dynamic> {
 		return RegexHelper.findallDynamic(this, string, pos, endpos);
 	}
 
 	public inline function findallTuple(string:String, ?pos:Int, ?endpos:Int):Array<Tuple<String>> {
-
 		return cast this.findallDynamic(string, pos, endpos);
 	}
 
-	public inline function findallArray(string:String, ?pos:Int, ?endpos:Int):Array<Array<String>>
-	{
-		return findallTuple(string, pos, endpos).map(function (t) return t.toArray());
+	public inline function findallArray(string:String, ?pos:Int, ?endpos:Int):Array<Array<String>> {
+		return findallTuple(string, pos, endpos).map(function(t) return t.toArray());
 	}
 
 	public function finditer(string:String, ?pos:Int, ?endpos:Int):NativeIterator<MatchObject>;
 
-	public function sub(repl:Repl, string:String, count:Int=0):String;
-	public function subn(repl:Repl, string:String, count:Int=0):String;
+	public function sub(repl:Repl, string:String, count:Int = 0):String;
+	public function subn(repl:Repl, string:String, count:Int = 0):String;
 
 	public var flags(default, null):Int;
 	public var groups(default, null):Int;
@@ -134,11 +119,8 @@ extern class Regex
 	public var pattern(default, null):String;
 }
 
-
 @:pythonImport("re")
-extern class Re
-{
-
+extern class Re {
 	public static var A:Int;
 	public static var ASCII:Int;
 	public static var DEBUG:Int;
@@ -160,46 +142,38 @@ extern class Re
 	public static var U:Int;
 	public static var UNICODE:Int;
 
+	public static function compile(pattern:String, ?flags:Int = 0):Regex;
 
+	public static function match(pattern:Pattern, string:String, flags:Int = 0):Null<MatchObject>;
 
-	public static function compile (pattern:String, ?flags:Int = 0):Regex;
-
-	public static function match (pattern:Pattern, string:String, flags:Int = 0):Null<MatchObject>;
+	public static function search(pattern:Pattern, string:String, flags:Int = 0):Null<MatchObject>;
 
-	public static function search (pattern:Pattern, string:String, flags:Int = 0):Null<MatchObject>;
+	public static function split(pattern:Pattern, string:String, maxsplit:Int = 0, flags:Int = 0):Array<String>;
 
-	public static function split(pattern:Pattern, string:String, maxsplit:Int=0, flags:Int=0):Array<String>;
-
-	public static inline function findallDynamic(pattern:Pattern, string:String, flags:Int=0):Array<Dynamic>
-	{
+	public static inline function findallDynamic(pattern:Pattern, string:String, flags:Int = 0):Array<Dynamic> {
 		return python.Syntax.field(pattern, "findall")(string, flags);
 	}
 
-
-	public static inline function findallString(pattern:Pattern, string:String,	flags:Int=0):Array<String>
-	{
+	public static inline function findallString(pattern:Pattern, string:String, flags:Int = 0):Array<String> {
 		return python.Syntax.field(pattern, "findall")(string, flags);
 	}
 
-	public static inline function findallTuple(pattern:Pattern, string:String, flags:Int=0):Array<Tuple<String>>
-	{
+	public static inline function findallTuple(pattern:Pattern, string:String, flags:Int = 0):Array<Tuple<String>> {
 		return python.Syntax.field(pattern, "findall")(string, flags);
 	}
 
-	public static inline function findallArray(pattern:Pattern, string:String, flags:Int=0):Array<Array<String>>
-	{
-		return findallTuple(pattern, string,flags).map(function (t) return t.toArray());
+	public static inline function findallArray(pattern:Pattern, string:String, flags:Int = 0):Array<Array<String>> {
+		return findallTuple(pattern, string, flags).map(function(t) return t.toArray());
 	}
 
-	public static function finditer(pattern:Pattern, string:String,   flags:Int=0):NativeIterator<MatchObject>;
+	public static function finditer(pattern:Pattern, string:String, flags:Int = 0):NativeIterator<MatchObject>;
 
+	@:overload(function(pattern:Pattern, repl:String, string:String, ?count:Int = 0, ?flags:Int = 0):String {})
+	public static function sub(pattern:Pattern, repl:MatchObject->String, string:String, ?count:Int = 0, ?flags:Int = 0):String;
 
-	@:overload(function (pattern:Pattern, repl:String, string:String,  ?count:Int=0, ?flags:Int=0):String {})
-	public static function sub(pattern:Pattern, repl:MatchObject->String, string:String,  ?count:Int=0, ?flags:Int=0):String;
+	public static function subn(pattern:Pattern, repl:Repl, string:String, count:Int = 0, flags:Int = 0):String;
 
-	public static function subn(pattern:Pattern, repl:Repl, string:String, count:Int=0, flags:Int=0):String;
-
-	public static function escape(string:String):TODO;
+	public static function escape(string:String):String;
 
 	public static function purge():Void;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/Select.hx b/std/python/lib/Select.hx
index e51a1cbc1167b22e45ecc1af8c9e604131d63806..acae61c5538fe49182487555ac3db57a9f32dd7e 100644
--- a/std/python/lib/Select.hx
+++ b/std/python/lib/Select.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import haxe.io.BytesData;
 import python.Tuple;
 
-private typedef Selectable = haxe.extern.EitherType<Int,{function fileno():Int;}>
+private typedef Selectable = haxe.extern.EitherType<Int, {function fileno():Int;}>;
 
 @:pythonImport("select")
 extern class Select {
-    static function select<T>(rlist:Array<T>, wlist:Array<T>, xlist:Array<T>, ?timeout:Float):Tuple3<Array<T>,Array<T>,Array<T>>;
+	static function select<T>(rlist:Array<T>, wlist:Array<T>, xlist:Array<T>, ?timeout:Float):Tuple3<Array<T>, Array<T>, Array<T>>;
 }
diff --git a/std/python/lib/Shutil.hx b/std/python/lib/Shutil.hx
index 183a88daefe59ee3dbe1d54f8e12ec3473098715..f2cf04938867e676c274ef67f1dc084082fc55c8 100644
--- a/std/python/lib/Shutil.hx
+++ b/std/python/lib/Shutil.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,16 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package python.lib;
 
+package python.lib;
 
 @:pythonImport("shutil")
 extern class Shutil {
+	public static function rmtree(path:String, ?ignore_errors:Bool = false, ?onerror:python.Exceptions.BaseException->Void):Void;
 
-	public static function rmtree(path:String, ?ignore_errors:Bool=false, ?onerror:python.Exceptions.BaseException->Void):Void;
-
-	public static function copyfile (src:String, dst:String):Void;
+	public static function copyfile(src:String, dst:String):Void;
 
-	public static function copy (src:String, dst:String):Void;
-	public static function copy2 (src:String, dst:String):Void;
-}
\ No newline at end of file
+	public static function copy(src:String, dst:String):Void;
+	public static function copy2(src:String, dst:String):Void;
+}
diff --git a/std/python/lib/Socket.hx b/std/python/lib/Socket.hx
new file mode 100644
index 0000000000000000000000000000000000000000..62906e7728e3dc00f47b3af9cceea5285e9c3eb1
--- /dev/null
+++ b/std/python/lib/Socket.hx
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C)2005-2019 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 python.lib;
+
+@:pythonImport("socket")
+extern class Socket {
+	static var AF_APPLETALK:Int;
+	static var AF_ASH:Int;
+	static var AF_ATMPVC:Int;
+	static var AF_ATMSVC:Int;
+	static var AF_AX25:Int;
+	static var AF_BLUETOOTH:Int;
+	static var AF_BRIDGE:Int;
+	static var AF_CAN:Int;
+	static var AF_ECONET:Int;
+	static var AF_INET:Int;
+	static var AF_INET6:Int;
+	static var AF_IPX:Int;
+	static var AF_IRDA:Int;
+	static var AF_KEY:Int;
+	static var AF_LLC:Int;
+	static var AF_NETBEUI:Int;
+	static var AF_NETLINK:Int;
+	static var AF_NETROM:Int;
+	static var AF_PACKET:Int;
+	static var AF_PPPOX:Int;
+	static var AF_RDS:Int;
+	static var AF_ROSE:Int;
+	static var AF_ROUTE:Int;
+	static var AF_SECURITY:Int;
+	static var AF_SNA:Int;
+	static var AF_TIPC:Int;
+	static var AF_UNIX:Int;
+	static var AF_UNSPEC:Int;
+	static var AF_WANPIPE:Int;
+	static var AF_X25:Int;
+	static var AI_ADDRCONFIG:Int;
+	static var AI_ALL:Int;
+	static var AI_CANONNAME:Int;
+	static var AI_NUMERICHOST:Int;
+	static var AI_NUMERICSERV:Int;
+	static var AI_PASSIVE:Int;
+	static var AI_V4MAPPED:Int;
+	static var BDADDR_ANY:Int;
+	static var BDADDR_LOCAL:Int;
+	static var BTPROTO_HCI:Int;
+	static var BTPROTO_L2CAP:Int;
+	static var BTPROTO_RFCOMM:Int;
+	static var BTPROTO_SCO:Int;
+	static var CAN_EFF_FLAG:Int;
+	static var CAN_EFF_MASK:Int;
+	static var CAN_ERR_FLAG:Int;
+	static var CAN_ERR_MASK:Int;
+	static var CAN_RAW:Int;
+	static var CAN_RAW_ERR_FILTER:Int;
+	static var CAN_RAW_FILTER:Int;
+	static var CAN_RAW_LOOPBACK:Int;
+	static var CAN_RAW_RECV_OWN_MSGS:Int;
+	static var CAN_RTR_FLAG:Int;
+	static var CAN_SFF_MASK:Int;
+	static var CAPI:Int;
+	static var CMSG_LEN:Int;
+	static var CMSG_SPACE:Int;
+	static var EAGAIN:Int;
+	static var EAI_ADDRFAMILY:Int;
+	static var EAI_AGAIN:Int;
+	static var EAI_BADFLAGS:Int;
+	static var EAI_FAIL:Int;
+	static var EAI_FAMILY:Int;
+	static var EAI_MEMORY:Int;
+	static var EAI_NODATA:Int;
+	static var EAI_NONAME:Int;
+	static var EAI_OVERFLOW:Int;
+	static var EAI_SERVICE:Int;
+	static var EAI_SOCKTYPE:Int;
+	static var EAI_SYSTEM:Int;
+	static var EBADF:Int;
+	static var EWOULDBLOCK:Int;
+	static var HCI_DATA_DIR:Int;
+	static var HCI_FILTER:Int;
+	static var HCI_TIME_STAMP:Int;
+	static var INADDR_ALLHOSTS_GROUP:Int;
+	static var INADDR_ANY:Int;
+	static var INADDR_BROADCAST:Int;
+	static var INADDR_LOOPBACK:Int;
+	static var INADDR_MAX_LOCAL_GROUP:Int;
+	static var INADDR_NONE:Int;
+	static var INADDR_UNSPEC_GROUP:Int;
+	static var IPPORT_RESERVED:Int;
+	static var IPPORT_USERRESERVED:Int;
+	static var IPPROTO_AH:Int;
+	static var IPPROTO_DSTOPTS:Int;
+	static var IPPROTO_EGP:Int;
+	static var IPPROTO_ESP:Int;
+	static var IPPROTO_FRAGMENT:Int;
+	static var IPPROTO_GRE:Int;
+	static var IPPROTO_HOPOPTS:Int;
+	static var IPPROTO_ICMP:Int;
+	static var IPPROTO_ICMPV6:Int;
+	static var IPPROTO_IDP:Int;
+	static var IPPROTO_IGMP:Int;
+	static var IPPROTO_IP:Int;
+	static var IPPROTO_IPIP:Int;
+	static var IPPROTO_IPV6:Int;
+	static var IPPROTO_NONE:Int;
+	static var IPPROTO_PIM:Int;
+	static var IPPROTO_PUP:Int;
+	static var IPPROTO_RAW:Int;
+	static var IPPROTO_ROUTING:Int;
+	static var IPPROTO_RSVP:Int;
+	static var IPPROTO_SCTP:Int;
+	static var IPPROTO_TCP:Int;
+	static var IPPROTO_TP:Int;
+	static var IPPROTO_UDP:Int;
+	static var IPV6_CHECKSUM:Int;
+	static var IPV6_DSTOPTS:Int;
+	static var IPV6_HOPLIMIT:Int;
+	static var IPV6_HOPOPTS:Int;
+	static var IPV6_JOIN_GROUP:Int;
+	static var IPV6_LEAVE_GROUP:Int;
+	static var IPV6_MULTICAST_HOPS:Int;
+	static var IPV6_MULTICAST_IF:Int;
+	static var IPV6_MULTICAST_LOOP:Int;
+	static var IPV6_NEXTHOP:Int;
+	static var IPV6_PKTINFO:Int;
+	static var IPV6_RECVDSTOPTS:Int;
+	static var IPV6_RECVHOPLIMIT:Int;
+	static var IPV6_RECVHOPOPTS:Int;
+	static var IPV6_RECVPKTINFO:Int;
+	static var IPV6_RECVRTHDR:Int;
+	static var IPV6_RECVTCLASS:Int;
+	static var IPV6_RTHDR:Int;
+	static var IPV6_RTHDRDSTOPTS:Int;
+	static var IPV6_RTHDR_TYPE_0:Int;
+	static var IPV6_TCLASS:Int;
+	static var IPV6_UNICAST_HOPS:Int;
+	static var IPV6_V6ONLY:Int;
+	static var IP_ADD_MEMBERSHIP:Int;
+	static var IP_DEFAULT_MULTICAST_LOOP:Int;
+	static var IP_DEFAULT_MULTICAST_TTL:Int;
+	static var IP_DROP_MEMBERSHIP:Int;
+	static var IP_HDRINCL:Int;
+	static var IP_MAX_MEMBERSHIPS:Int;
+	static var IP_MULTICAST_IF:Int;
+	static var IP_MULTICAST_LOOP:Int;
+	static var IP_MULTICAST_TTL:Int;
+	static var IP_OPTIONS:Int;
+	static var IP_RECVOPTS:Int;
+	static var IP_RECVRETOPTS:Int;
+	static var IP_RETOPTS:Int;
+	static var IP_TOS:Int;
+	static var IP_TRANSPARENT:Int;
+	static var IP_TTL:Int;
+	static var MSG_CMSG_CLOEXEC:Int;
+	static var MSG_CONFIRM:Int;
+	static var MSG_CTRUNC:Int;
+	static var MSG_DONTROUTE:Int;
+	static var MSG_DONTWAIT:Int;
+	static var MSG_EOR:Int;
+	static var MSG_ERRQUEUE:Int;
+	static var MSG_MORE:Int;
+	static var MSG_NOSIGNAL:Int;
+	static var MSG_OOB:Int;
+	static var MSG_PEEK:Int;
+	static var MSG_TRUNC:Int;
+	static var MSG_WAITALL:Int;
+	static var NETLINK_DNRTMSG:Int;
+	static var NETLINK_FIREWALL:Int;
+	static var NETLINK_IP6_FW:Int;
+	static var NETLINK_NFLOG:Int;
+	static var NETLINK_ROUTE:Int;
+	static var NETLINK_USERSOCK:Int;
+	static var NETLINK_XFRM:Int;
+	static var NI_DGRAM:Int;
+	static var NI_MAXHOST:Int;
+	static var NI_MAXSERV:Int;
+	static var NI_NAMEREQD:Int;
+	static var NI_NOFQDN:Int;
+	static var NI_NUMERICHOST:Int;
+	static var NI_NUMERICSERV:Int;
+	static var PACKET_BROADCAST:Int;
+	static var PACKET_FASTROUTE:Int;
+	static var PACKET_HOST:Int;
+	static var PACKET_LOOPBACK:Int;
+	static var PACKET_MULTICAST:Int;
+	static var PACKET_OTHERHOST:Int;
+	static var PACKET_OUTGOING:Int;
+	static var PF_CAN:Int;
+	static var PF_PACKET:Int;
+	static var PF_RDS:Int;
+	static var SCM_CREDENTIALS:Int;
+	static var SCM_RIGHTS:Int;
+	static var SHUT_RD:Int;
+	static var SHUT_RDWR:Int;
+	static var SHUT_WR:Int;
+	static var SOCK_CLOEXEC:Int;
+	static var SOCK_DGRAM:Int;
+	static var SOCK_NONBLOCK:Int;
+	static var SOCK_RAW:Int;
+	static var SOCK_RDM:Int;
+	static var SOCK_SEQPACKET:Int;
+	static var SOCK_STREAM:Int;
+	static var SOL_CAN_BASE:Int;
+	static var SOL_CAN_RAW:Int;
+	static var SOL_HCI:Int;
+	static var SOL_IP:Int;
+	static var SOL_SOCKET:Int;
+	static var SOL_TCP:Int;
+	static var SOL_TIPC:Int;
+	static var SOL_UDP:Int;
+	static var SOMAXCONN:Int;
+	static var SO_ACCEPTCONN:Int;
+	static var SO_BINDTODEVICE:Int;
+	static var SO_BROADCAST:Int;
+	static var SO_DEBUG:Int;
+	static var SO_DONTROUTE:Int;
+	static var SO_ERROR:Int;
+	static var SO_KEEPALIVE:Int;
+	static var SO_LINGER:Int;
+	static var SO_OOBINLINE:Int;
+	static var SO_PASSCRED:Int;
+	static var SO_PEERCRED:Int;
+	static var SO_RCVBUF:Int;
+	static var SO_RCVLOWAT:Int;
+	static var SO_RCVTIMEO:Int;
+	static var SO_REUSEADDR:Int;
+	static var SO_REUSEPORT:Int;
+	static var SO_SNDBUF:Int;
+	static var SO_SNDLOWAT:Int;
+	static var SO_SNDTIMEO:Int;
+	static var SO_TYPE:Int;
+	static var TCP_CORK:Int;
+	static var TCP_DEFER_ACCEPT:Int;
+	static var TCP_INFO:Int;
+	static var TCP_KEEPCNT:Int;
+	static var TCP_KEEPIDLE:Int;
+	static var TCP_KEEPINTVL:Int;
+	static var TCP_LINGER2:Int;
+	static var TCP_MAXSEG:Int;
+	static var TCP_NODELAY:Int;
+	static var TCP_QUICKACK:Int;
+	static var TCP_SYNCNT:Int;
+	static var TCP_WINDOW_CLAMP:Int;
+	static var TIPC_ADDR_ID:Int;
+	static var TIPC_ADDR_NAME:Int;
+	static var TIPC_ADDR_NAMESEQ:Int;
+	static var TIPC_CFG_SRV:Int;
+	static var TIPC_CLUSTER_SCOPE:Int;
+	static var TIPC_CONN_TIMEOUT:Int;
+	static var TIPC_CRITICAL_IMPORTANCE:Int;
+	static var TIPC_DEST_DROPPABLE:Int;
+	static var TIPC_HIGH_IMPORTANCE:Int;
+	static var TIPC_IMPORTANCE:Int;
+	static var TIPC_LOW_IMPORTANCE:Int;
+	static var TIPC_MEDIUM_IMPORTANCE:Int;
+	static var TIPC_NODE_SCOPE:Int;
+	static var TIPC_PUBLISHED:Int;
+	static var TIPC_SRC_DROPPABLE:Int;
+	static var TIPC_SUBSCR_TIMEOUT:Int;
+	static var TIPC_SUB_CANCEL:Int;
+	static var TIPC_SUB_PORTS:Int;
+	static var TIPC_SUB_SERVICE:Int;
+	static var TIPC_TOP_SRV:Int;
+	static var TIPC_WAIT_FOREVER:Int;
+	static var TIPC_WITHDRAWN:Int;
+	static var TIPC_ZONE_SCOPE:Int;
+	static var _GLOBAL_DEFAULT_TIMEOUT:Int;
+}
diff --git a/std/python/lib/Ssl.hx b/std/python/lib/Ssl.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7ac48e73760137e38b938c27e5d36d902f82c4c6
--- /dev/null
+++ b/std/python/lib/Ssl.hx
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C)2005-2019 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 python.lib;
+
+import python.lib.ssl.SSLContext;
+
+@:pythonImport("ssl")
+extern class Ssl {
+	@:require(python_version >= 3.4)
+	public static function create_default_context(purpose:String):SSLContext;
+
+	/**
+		Prevents a TLSv1 connection. This option is only applicable in conjunction
+		with PROTOCOL_TLS. It prevents the peers from choosing TLSv1 as the
+		protocol version.
+	**/
+	public static var OP_NO_TLSv1:Int;
+
+	/**
+		Prevents a TLSv1.1 connection. This option is only applicable in conjunction
+		with PROTOCOL_TLS. It prevents the peers from choosing TLSv1.1 as the
+		protocol version. Available only with openssl version 1.0.1+.
+
+		since python 3.4
+	**/
+	@:require(python_version >= 3.4)
+	public static var OP_NO_TLSv1_1:Int;
+
+	public static var OP_NO_SSLv3:Int;
+	public static var OP_NO_SSLv2:Int;
+
+	public static var OP_NO_COMPRESSION:Int;
+
+	#if (python_version >= 3.6)
+	@:deprecated("deprecated, use PROTOCOL_TLS instead")
+	#end
+	public static var PROTOCOL_SSLv23:String;
+
+	@:require(python_version >= 3.6)
+	public static var PROTOCOL_TLS:String;
+
+	public static var CERT_REQUIRED:Int;
+}
diff --git a/std/python/lib/Subprocess.hx b/std/python/lib/Subprocess.hx
index b51598fb06d17625be1f80f835b35bbccfe07f39..4008e3ad63fc5237ddeaa7c5311d978b29286f1e 100644
--- a/std/python/lib/Subprocess.hx
+++ b/std/python/lib/Subprocess.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,20 +19,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import haxe.extern.EitherType;
 
 extern class StartupInfo {
-	public var dwFlags : Int;
+	public var dwFlags:Int;
 
 	public var wShowWindow:Int;
-
 }
 
 @:pythonImport("subprocess")
 extern class Subprocess {
-
 	public static function STARTUPINFO():StartupInfo;
 
 	public static var STD_INPUT_HANDLE:Int;
@@ -49,6 +48,5 @@ extern class Subprocess {
 
 	public static var STDOUT:Int;
 
-	public static function call(args:EitherType<String,Array<String>>, ?kwArgs:python.KwArgs<Dynamic>):Int;
-
-}
\ No newline at end of file
+	public static function call(args:EitherType<String, Array<String>>, ?kwArgs:python.KwArgs<Dynamic>):Int;
+}
diff --git a/std/python/lib/Sys.hx b/std/python/lib/Sys.hx
index 0b69f2fe1abcef249fd2067faeae15d62f6df80a..15f7cb3a0cfa55a48993a76bf47937294a6fd015 100644
--- a/std/python/lib/Sys.hx
+++ b/std/python/lib/Sys.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.Exceptions.BaseException;
@@ -27,18 +28,16 @@ import python.lib.io.RawIOBase;
 import python.lib.io.TextIOBase;
 import python.Tuple;
 
-
 extern class TB {}
 extern class Frame {}
 
 @:pythonImport("sys")
 extern class Sys {
-
 	public static var argv(default, never):Array<String>;
 
 	public static var executable(default, never):String;
 
-	public static function exit (x:Int):Void;
+	public static function exit(x:Int):Void;
 
 	public static function getfilesystemencoding():String;
 
@@ -49,11 +48,11 @@ extern class Sys {
 	public static var stdin(default, never):TextIOBase;
 	public static var stderr(default, never):TextIOBase;
 
-	public static function getsizeof (t:Dynamic):Int;
+	public static function getsizeof(t:Dynamic):Int;
 
 	public static var maxsize:Int;
 
 	public static function exc_info<T:BaseException>():Tuple3<Class<T>, T, TB>;
 
-	public static var version_info:Tuple5<Int,Int,Int,String,Int>;
+	public static var version_info:Tuple5<Int, Int, Int, String, Int>;
 }
diff --git a/std/python/lib/Tempfile.hx b/std/python/lib/Tempfile.hx
index bf519dfc64b7513d021dbcac3b414f9be87cb392..013bdd586c766bea5033310034735fb5e32c7237 100644
--- a/std/python/lib/Tempfile.hx
+++ b/std/python/lib/Tempfile.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 @:pythonImport("tempfile")
 extern class Tempfile {
-
 	public static function gettempdir():String;
-
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/Termios.hx b/std/python/lib/Termios.hx
index 41fa6c18a87cc32ce7aae163bb83d6b1eaf02a30..5d6c191877134492ada6f8de3c25b09420a7dd51 100644
--- a/std/python/lib/Termios.hx
+++ b/std/python/lib/Termios.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,18 +19,17 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 abstract TermiosSettings(Dynamic) {}
 
-@:pythonImport("termios", ignoreError=true)
+@:pythonImport("termios", ignoreError = true)
 extern class Termios {
+	public static var TCSADRAIN:Int;
+	public static var ECHO:Int;
 
-	public static var TCSADRAIN : Int;
-	public static var ECHO : Int;
-
-	public static function tcgetattr (fileNo:Int):TermiosSettings;
-
-	public static function tcsetattr (fileNo:Int, when:Int, settings:TermiosSettings):Void;
+	public static function tcgetattr(fileNo:Int):TermiosSettings;
 
-}
\ No newline at end of file
+	public static function tcsetattr(fileNo:Int, when:Int, settings:TermiosSettings):Void;
+}
diff --git a/std/python/lib/ThreadLowLevel.hx b/std/python/lib/ThreadLowLevel.hx
index 57c904ee4181dd3e2cc81d85015775e8e2165ab2..8adcd9cbe3ced66d8e6bab73088107185c9f1a47 100644
--- a/std/python/lib/ThreadLowLevel.hx
+++ b/std/python/lib/ThreadLowLevel.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.Tuple;
 
-private typedef TODO = Dynamic;
-
 @:pythonImport("_thread")
 extern class ThreadLowLevel {
-
-	public static function start_new_thread(f:Void->Void, args:Tuple<Dynamic>):TODO;
-
-}
\ No newline at end of file
+	public static function start_new_thread(f:Void->Void, args:Tuple<Dynamic>):Dynamic;
+}
diff --git a/std/python/lib/Threading.hx b/std/python/lib/Threading.hx
index cb7355ceb77f9037fccf18f34371d32e9d4dcda6..ebfec85edf9b8e4230b6a92492e6b887dc730252 100644
--- a/std/python/lib/Threading.hx
+++ b/std/python/lib/Threading.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.lib.threading.Thread;
 
 @:pythonImport("threading")
 extern class Threading {
-
 	public static function active_count():Int;
 	public static function current_thread():Thread;
 	public static function get_ident():Int;
@@ -36,5 +36,4 @@ extern class Threading {
 	public static function stack_size(?size:Int):Int;
 	public static function local():Dynamic;
 	public static var TIMEOUT_MAX:Float;
-	
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/Time.hx b/std/python/lib/Time.hx
index 3a0368061c1ed0d8c5b5ec49815f14d0a4899a95..52ed3392d6baa89f82ddaeb8678f901931619394 100644
--- a/std/python/lib/Time.hx
+++ b/std/python/lib/Time.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.lib.time.StructTime;
 
 @:pythonImport("time")
 extern class Time {
-
-	public static function time ():Float;
-	public static function clock ():Float;
-	public static function sleep (t:Float):Void;
+	public static function time():Float;
+	public static function clock():Float;
+	public static function sleep(t:Float):Void;
 	public static function mktime(s:StructTime):Float;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/Timeit.hx b/std/python/lib/Timeit.hx
index e7c1beaca60e702d40b777dc56d76de3564054f5..54264c44cd8197213c72ceda3c584d0584692aeb 100644
--- a/std/python/lib/Timeit.hx
+++ b/std/python/lib/Timeit.hx
@@ -1,5 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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 python.lib;
+
 @:pythonImport("timeit")
 extern class Timeit {
 	public static function default_timer():Float;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/Traceback.hx b/std/python/lib/Traceback.hx
index b6eef62537c1a6dbbd5582e454599d7083368eb4..8bc3cd172f15073ee722e33637e03bf43df5020c 100644
--- a/std/python/lib/Traceback.hx
+++ b/std/python/lib/Traceback.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
 import python.lib.Sys;
@@ -27,10 +28,8 @@ import python.Tuple;
 
 @:pythonImport("traceback")
 extern class Traceback {
-
 	public static function extract_stack(?f:Frame, ?limit:Int):Array<StackItem>;
 	public static function extract_tb(tb:Sys.TB, ?limit:Int):Array<StackItem>;
-
 }
 
 private typedef StackItem = Tuple4<String, Int, String, String>;
diff --git a/std/python/lib/Tty.hx b/std/python/lib/Tty.hx
index 2bff3dab23721f932ab949f054da00cb5b9a0476..22c4498c56f5f13d75a97fa5d3f4c01f17e5d8c6 100644
--- a/std/python/lib/Tty.hx
+++ b/std/python/lib/Tty.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,9 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib;
 
-@:pythonImport("tty", ignoreError=true)
+@:pythonImport("tty", ignoreError = true)
 extern class Tty {
-	public static function setraw (fileNo:Int):Void;
-}
\ No newline at end of file
+	public static function setraw(fileNo:Int):Void;
+}
diff --git a/std/python/lib/codecs/Codec.hx b/std/python/lib/codecs/Codec.hx
index 666627ef8ab3592032dac7be5838d905fea58cdd..e5d3c5ec4263967f54677b036598be430f1386e7 100644
--- a/std/python/lib/codecs/Codec.hx
+++ b/std/python/lib/codecs/Codec.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.codecs;
 
 import python.Bytes;
diff --git a/std/python/lib/codecs/StreamReader.hx b/std/python/lib/codecs/StreamReader.hx
index 6d24a783593d9a27a6a45a2e85f6a597d84a6ff3..6bae8c805f7968b0f785ff12c068328de4e089ff 100644
--- a/std/python/lib/codecs/StreamReader.hx
+++ b/std/python/lib/codecs/StreamReader.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.codecs;
 
 import python.lib.codecs.Codec;
@@ -36,4 +37,4 @@ extern class StreamReader extends Codec implements IStreamReader {
 	public function readline(?size:Int, ?keepsend:Bool = false):String;
 	public function readlines(?sizehint:Int, ?keepsend:Bool = false):Array<String>;
 	public function reset():Void;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/codecs/StreamReaderWriter.hx b/std/python/lib/codecs/StreamReaderWriter.hx
index 31f67387ccaf5890a9e69d16c1b1549bd80cebfa..d8ef573a06f03506084ee3518fda91abf7d5fb07 100644
--- a/std/python/lib/codecs/StreamReaderWriter.hx
+++ b/std/python/lib/codecs/StreamReaderWriter.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.codecs;
 
 import python.lib.codecs.Codec;
@@ -29,7 +30,6 @@ import python.lib.codecs.StreamWriter;
 extern class StreamReaderWriter extends StreamReader implements IStreamWriter {
 	public function write(object:Dynamic):Void;
 	public function writelines(list:Array<String>):Void;
-
 }
 
-@:remove extern interface IStreamReaderWriter extends IStreamReader extends IStreamWriter {}
\ No newline at end of file
+@:remove extern interface IStreamReaderWriter extends IStreamReader extends IStreamWriter {}
diff --git a/std/python/lib/codecs/StreamWriter.hx b/std/python/lib/codecs/StreamWriter.hx
index 0f27eb8805c647c648686b02beba5fd365d12272..356e429f2ae3a6fee710a5223a4a2dfc5dc8dc95 100644
--- a/std/python/lib/codecs/StreamWriter.hx
+++ b/std/python/lib/codecs/StreamWriter.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.codecs;
 
 import python.lib.codecs.Codec;
@@ -30,9 +31,8 @@ extern class StreamWriter extends Codec implements ICodec {
 	public function reset():Void;
 }
 
-
 @:remove extern interface IStreamWriter extends ICodec {
 	public function write(object:Dynamic):Void;
 	public function writelines(list:Array<String>):Void;
 	public function reset():Void;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/datetime/Datetime.hx b/std/python/lib/datetime/Datetime.hx
index 2ca67317e9b39b97aabc723a9c62bba7b0f9b119..53ca5d1b242f050ce11ff76aea9dd42db77b0b54 100644
--- a/std/python/lib/datetime/Datetime.hx
+++ b/std/python/lib/datetime/Datetime.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,45 +19,54 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.datetime;
 
 import python.lib.time.StructTime;
 
 @:pythonImport("datetime", "datetime")
 extern class Datetime {
+	public function new(year:Int, month:Int, day:Int, hour:Int = 0, minute:Int = 0, second:Int = 0, microsecond:Int = 0, tzinfo:Tzinfo = null);
 
-	public function new (year:Int, month:Int, day:Int, hour:Int=0, minute:Int=0, second:Int=0, microsecond:Int=0, tzinfo:Tzinfo=null);
-
-	public static var min : Datetime;
-	public static var max : Datetime;
-	public static var resolution : Timedelta;
-
-	public var year : Int;
-	public var month : Int;
-	public var day : Int;
-	public var hour : Int;
-	public var minute : Int;
-	public var second : Int;
-	public var microsecond : Int;
-	public var tzinfo : Tzinfo;
-
+	public static var min:Datetime;
+	public static var max:Datetime;
+	public static var resolution:Timedelta;
 
+	public var year:Int;
+	public var month:Int;
+	public var day:Int;
+	public var hour:Int;
+	public var minute:Int;
+	public var second:Int;
+	public var microsecond:Int;
+	public var tzinfo:Tzinfo;
 
-	public static function today ():Datetime;
-	public static function now (?tzinfo:Tzinfo):Datetime;
-	public static function utcnow ():Datetime;
-	public static function fromtimestamp (timestamp:Float, tzInfo:Tzinfo=null):Datetime;
-	public static function utcfromtimestamp (timestamp:Int):Datetime;
-	public static function fromordinal (ordinal:Int):Datetime;
+	public static function today():Datetime;
+	public static function now(?tzinfo:Tzinfo):Datetime;
+	public static function utcnow():Datetime;
+	public static function fromtimestamp(timestamp:Float, tzInfo:Tzinfo = null):Datetime;
+	public static function utcfromtimestamp(timestamp:Int):Datetime;
+	public static function fromordinal(ordinal:Int):Datetime;
 
 	public function timetuple():StructTime;
-	public function strftime (format:String):String;
-	public function replace (?year:Int = 1970, ?month:Int = 1, ?day:Int = 1, ?hour:Int = 0, ?minute:Int = 0, ?second:Int, ?microsecond:Int, ?tzinfo:Tzinfo):Datetime;
+	public function strftime(format:String):String;
+	public function replace(kwargs:python.KwArgs<{
+		?year:Int,
+		?month:Int,
+		?day:Int,
+		?hour:Int,
+		?minute:Int,
+		?second:Int,
+		?microsecond:Int,
+		?tzinfo:Tzinfo
+	}>):Datetime;
 	/* 0-6 */
 	public function weekday():Int;
 	/* 1-7 */
 	public function isoweekday():Int;
+	public function utcoffset():Int;
 
 	// python 3.3
-	public function timestamp ():Float;
-}
\ No newline at end of file
+	public function timestamp():Float;
+	public function astimezone(?tz:Tzinfo):Datetime;
+}
diff --git a/std/python/lib/datetime/Timedelta.hx b/std/python/lib/datetime/Timedelta.hx
index eadc037623007dcd6d4daa33b5e11bab33944546..810a58ea1717e593934b023475802043b3680150 100644
--- a/std/python/lib/datetime/Timedelta.hx
+++ b/std/python/lib/datetime/Timedelta.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,18 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.datetime;
 
 @:pythonImport("datetime", "timedelta")
 extern class Timedelta {
+	static var min:Timedelta;
+	static var max:Timedelta;
+	static var resolution:Timedelta;
 
-	static var min : Timedelta;
-	static var max : Timedelta;
-	static var resolution : Timedelta;
-
-	var days : Int;
-	var seconds : Int;
-	var microseconds : Int;
+	var days:Int;
+	var seconds:Int;
+	var microseconds:Int;
 
 	function new(days:Int = 0, seconds:Int = 0, microseconds:Int = 0, milliseconds:Int = 0, minutes:Int = 0, hours:Int = 0, weeks:Int = 0):Void;
 	function total_seconds():Float;
diff --git a/std/python/lib/datetime/Timezone.hx b/std/python/lib/datetime/Timezone.hx
index c3b29945216c15320411ddad66d84db2288d5438..7de1e95bc6a6eb1bcc33a52add881941bb9d9642 100644
--- a/std/python/lib/datetime/Timezone.hx
+++ b/std/python/lib/datetime/Timezone.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,10 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.datetime;
 
 @:pythonImport("datetime", "timezone")
 extern class Timezone extends Tzinfo {
-
 	public static var utc(default, never):Tzinfo;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/datetime/Tzinfo.hx b/std/python/lib/datetime/Tzinfo.hx
index becbc965f1f35df0b244c8b9b90e3edd930e3907..431b7cc7f389b3f1133b9c165af5189d85d349e0 100644
--- a/std/python/lib/datetime/Tzinfo.hx
+++ b/std/python/lib/datetime/Tzinfo.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.datetime;
 
 @:pythonImport("datetime", "tzinfo")
-extern class Tzinfo {
-}
+extern class Tzinfo {}
diff --git a/std/python/lib/io/BlockingIOError.hx b/std/python/lib/io/BlockingIOError.hx
index 5cc7f6f340b051b671269cc9d9dbd0d6d7193306..2fac4ca0ad8addedfb69cb4136fe4c510c36005d 100644
--- a/std/python/lib/io/BlockingIOError.hx
+++ b/std/python/lib/io/BlockingIOError.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import python.Exceptions.IOError;
 
 @:pythonImport("io", "BlockingIOError")
 class BlockingIOError extends IOError {
-
 	var characters_written:Int;
-
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/io/BufferedIOBase.hx b/std/python/lib/io/BufferedIOBase.hx
index 4579b175ac64cd6463f004a4112a507d0f95fa22..e568ab107cd4431598e462d9140c7435d3814f79 100644
--- a/std/python/lib/io/BufferedIOBase.hx
+++ b/std/python/lib/io/BufferedIOBase.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,33 +19,31 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import python.lib.io.IOBase;
-
 import python.lib.io.RawIOBase;
 import python.Bytearray;
 
 @:pythonImport("io", "BufferedIOBase")
 extern class BufferedIOBase extends IOBase implements IBufferedIOBase {
-
 	/* not always available */
 	public var raw:RawIOBase;
 
-	public function write (b:Bytearray):Int;
-	public function readinto (b:Bytearray):Int;
-	public function detach ():RawIOBase;
+	public function write(b:Bytearray):Int;
+	public function readinto(b:Bytearray):Int;
+	public function detach():RawIOBase;
 	public function read(n:Int = -1):Null<Bytes>;
 	public function read1(n:Int = -1):Null<Bytes>;
 }
 
-
 @:remove extern interface IBufferedIOBase extends IIOBase {
 	public var raw:RawIOBase;
 
-	public function write (b:Bytearray):Int;
-	public function readinto (b:Bytearray):Int;
-	public function detach ():RawIOBase;
+	public function write(b:Bytearray):Int;
+	public function readinto(b:Bytearray):Int;
+	public function detach():RawIOBase;
 	public function read(n:Int = -1):Null<Bytes>;
 	public function read1(n:Int = -1):Null<Bytes>;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/io/BufferedRWPair.hx b/std/python/lib/io/BufferedRWPair.hx
index 8ad224ad9078a9891e54c143b92e899939d219bb..780edbf2e8089959bd93166cf14939bdf31a801d 100644
--- a/std/python/lib/io/BufferedRWPair.hx
+++ b/std/python/lib/io/BufferedRWPair.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 @:pythonImport("io", "BufferedRWPair")
-extern class BufferedRWPair extends BufferedIOBase {
-
-
-
-}
\ No newline at end of file
+extern class BufferedRWPair extends BufferedIOBase {}
diff --git a/std/python/lib/io/BufferedRandom.hx b/std/python/lib/io/BufferedRandom.hx
index c9c771a1d3e2137814d610d3f4b14a98d8f57e9c..276b3e3501b257f7f8a73aadc450f41db9462c1c 100644
--- a/std/python/lib/io/BufferedRandom.hx
+++ b/std/python/lib/io/BufferedRandom.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import python.lib.io.BufferedReader;
 import python.lib.io.BufferedWriter;
 
 @:pythonImport("io", "BufferedRandom")
-extern class BufferedRandom extends BufferedReader implements IBufferedWriter {
-
-
-
-}
\ No newline at end of file
+extern class BufferedRandom extends BufferedReader implements IBufferedWriter {}
diff --git a/std/python/lib/io/BufferedReader.hx b/std/python/lib/io/BufferedReader.hx
index 46840aa0f0b595f31f51f24d1a8a5141678143bb..3fe7dfb1daad80710ceb12000a007c288f109ac5 100644
--- a/std/python/lib/io/BufferedReader.hx
+++ b/std/python/lib/io/BufferedReader.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import python.Bytes;
@@ -26,15 +27,11 @@ import python.lib.io.BufferedIOBase;
 
 @:pythonImport("io", "BufferedReader")
 extern class BufferedReader extends BufferedIOBase implements IBufferedReader {
-
-	public function new (raw:RawIOBase):Void;
+	public function new(raw:RawIOBase):Void;
 
 	public function peek(?n:Int):Null<Bytes>;
-
-
 }
 
 @:remove extern interface IBufferedReader extends IBufferedIOBase {
 	public function peek(?n:Int):Null<Bytes>;
-
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/io/BufferedWriter.hx b/std/python/lib/io/BufferedWriter.hx
index 342b6db99621237fd4466bbdc7e4238ee7bf356e..0bb4893495620c677bd4a017e2f2162d40df4f4c 100644
--- a/std/python/lib/io/BufferedWriter.hx
+++ b/std/python/lib/io/BufferedWriter.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import python.Bytearray;
@@ -26,10 +27,9 @@ import python.lib.io.BufferedIOBase;
 
 @:pythonImport("io", "BufferedWriter")
 extern class BufferedWriter extends BufferedIOBase implements IBufferedWriter {
-	public function new (raw:RawIOBase):Void;
+	public function new(raw:RawIOBase):Void;
 }
 
-
 @:remove extern interface IBufferedWriter extends IBufferedIOBase {
 	public function flush():Void;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/io/BytesIO.hx b/std/python/lib/io/BytesIO.hx
index 294f8fe24f206402bfa6237003983d840f1f4ee2..810492f3dd23ef0c17b0c0132d8d87d64dd78981 100644
--- a/std/python/lib/io/BytesIO.hx
+++ b/std/python/lib/io/BytesIO.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 @:pythonImport("io", "BytesIO")
 extern class BytesIO extends python.lib.io.BufferedIOBase {
-
-	public function new (base:python.lib.io.IOBase);
-
-}
\ No newline at end of file
+	public function new(base:python.lib.io.IOBase);
+}
diff --git a/std/python/lib/io/FileIO.hx b/std/python/lib/io/FileIO.hx
index 7a44ecbe98101bb987da54b64c1c7eb3b6d63b81..a57141921c7d2ad7bd2e3af1cc2fc306d7eb0cc5 100644
--- a/std/python/lib/io/FileIO.hx
+++ b/std/python/lib/io/FileIO.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,22 +19,20 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import python.lib.io.RawIOBase;
 
 @:pythonImport("io", "FileIO")
 extern class FileIO extends RawIOBase {
-
 	/**
 		The mode as given in the constructor.
 	**/
 	public var mode:String;
+
 	/**
 		The file name. This is the file descriptor of the file when no name is given in the constructor.
 	**/
 	public var name:String;
-
-
-
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/io/IOBase.hx b/std/python/lib/io/IOBase.hx
index 44b39111c07749ff150806a9636184c8c69b8825..5c0d54fcd57e12e092085ffe5101c8d9a8611baf 100644
--- a/std/python/lib/io/IOBase.hx
+++ b/std/python/lib/io/IOBase.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,28 +19,29 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
-@:enum abstract SeekSet(Int) {
+enum abstract SeekSet(Int) {
 	var SeekSet = 0;
 	var SeekCur = 1;
 	var SeekEnd = 2;
 }
+
 @:pythonImport("io", "IOBase")
 extern class IOBase implements IIOBase {
-
 	public function close():Void;
 	public function flush():Void;
 	public function readline(limit:Int = -1):String;
 	public function readable():Bool;
 	public var closed(default, null):Bool;
-	public function readlines(hint:Int=-1):Array<String>;
+	public function readlines(hint:Int = -1):Array<String>;
 	public function tell():Int;
 	public function writable():Bool;
 	public function seekable():Bool;
 	public function fileno():Int;
 	public function seek(offset:Int, whence:SeekSet):Int;
-	public function truncate (size:Int):Int;
+	public function truncate(size:Int):Int;
 }
 
 @:remove extern interface IIOBase {
@@ -49,11 +50,11 @@ extern class IOBase implements IIOBase {
 	public function readline(limit:Int = -1):String;
 	public function readable():Bool;
 	public var closed(default, null):Bool;
-	public function readlines(hint:Int=-1):Array<String>;
+	public function readlines(hint:Int = -1):Array<String>;
 	public function tell():Int;
 	public function writable():Bool;
 	public function seekable():Bool;
 	public function fileno():Int;
 	public function seek(offset:Int, whence:SeekSet):Int;
-	public function truncate (size:Int):Int;
-}
\ No newline at end of file
+	public function truncate(size:Int):Int;
+}
diff --git a/std/python/lib/io/RawIOBase.hx b/std/python/lib/io/RawIOBase.hx
index d621fa7f124ce22c159ada47bbcf55a631d2de5c..ac38448bf5e33aef249b4afaa9e4005f615ddc2c 100644
--- a/std/python/lib/io/RawIOBase.hx
+++ b/std/python/lib/io/RawIOBase.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import python.lib.io.FileIO;
@@ -26,17 +27,15 @@ import python.lib.io.IOBase;
 
 @:pythonImport("io", "RawIOBase")
 extern class RawIOBase extends IOBase implements IRawIOBase {
-
 	public function readall():Bytes;
-	public function read(n:Int=-1):Null<Bytes>;
+	public function read(n:Int = -1):Null<Bytes>;
 	public function write(b:Bytearray):Null<Int>;
 	public function readinto(b:Bytearray):Null<Int>;
 }
 
 @:remove extern interface IRawIOBase extends IIOBase {
-
 	public function readall():Bytes;
-	public function read(n:Int=-1):Null<Bytes>;
+	public function read(n:Int = -1):Null<Bytes>;
 	public function write(b:Bytearray):Null<Int>;
 	public function readinto(b:Bytearray):Null<Int>;
 }
diff --git a/std/python/lib/io/StringIO.hx b/std/python/lib/io/StringIO.hx
index ee30f05171eeeb963aff420a8dbe92316b7b2e97..1016ad3f375ac100d9287cb1dcd05b26cb77779f 100644
--- a/std/python/lib/io/StringIO.hx
+++ b/std/python/lib/io/StringIO.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import python.lib.io.TextIOBase;
 import python.Syntax;
 
 @:pythonImport("io", "StringIO")
-extern class StringIO extends TextIOBase
-{
-	public function new (?s:String):Void;
+extern class StringIO extends TextIOBase {
+	public function new(?s:String):Void;
 	public function getvalue():String;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/io/TextIOBase.hx b/std/python/lib/io/TextIOBase.hx
index 802dff3d82e68015200502c870ac6a80f3a96557..364742916478bdd83a45b95eb899277a0920fcf6 100644
--- a/std/python/lib/io/TextIOBase.hx
+++ b/std/python/lib/io/TextIOBase.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import haxe.extern.EitherType;
@@ -27,36 +28,29 @@ import python.lib.io.IOBase;
 
 @:pythonImport("io", "TextIOBase")
 extern class TextIOBase extends IOBase implements ITextIOBase {
-
 	public var encoding:String;
 	public var error:String;
 	public var newlines:Null<EitherType<String, Tuple<String>>>;
 
-	public function detach ():BufferedIOBase;
+	public function detach():BufferedIOBase;
 
-	public function write (s:String):Int;
+	public function write(s:String):Int;
 
-	public function read (n:Int):String;
+	public function read(n:Int):String;
 
 	public var buffer:BufferedIOBase;
-
 }
 
 @:remove extern interface ITextIOBase extends IIOBase {
-
 	public var encoding:String;
 	public var error:String;
 	public var newlines:Null<EitherType<String, Tuple<String>>>;
 
 	public var buffer:BufferedIOBase;
 
-	public function detach ():BufferedIOBase;
-
-	public function write (s:String):Int;
-
-	public function read (n:Int):String;
-
-
+	public function detach():BufferedIOBase;
 
+	public function write(s:String):Int;
 
+	public function read(n:Int):String;
 }
diff --git a/std/python/lib/io/TextIOWrapper.hx b/std/python/lib/io/TextIOWrapper.hx
index 8fe1fb03f1ce29d22acd48b19e29093349580742..45363d5920eb9e257bbca2ef738ac31a557ee047 100644
--- a/std/python/lib/io/TextIOWrapper.hx
+++ b/std/python/lib/io/TextIOWrapper.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import python.lib.io.BufferedIOBase;
@@ -27,17 +28,16 @@ import python.Syntax;
 import python.KwArgs;
 
 typedef TextIOWrapperOptions = {
-	?encoding : String,
-	?errors : String,
-	?newline : String,
-	?line_buffering : Bool,
-	?write_through : Bool
+	?encoding:String,
+	?errors:String,
+	?newline:String,
+	?line_buffering:Bool,
+	?write_through:Bool
 };
 
 @:pythonImport("io", "TextIOWrapper")
-extern class TextIOWrapper extends TextIOBase
-{
-	public function new (buffer:BufferedIOBase, ?options:KwArgs<TextIOWrapperOptions>):Void;
+extern class TextIOWrapper extends TextIOBase {
+	public function new(buffer:BufferedIOBase, ?options:KwArgs<TextIOWrapperOptions>):Void;
 
-	public var line_buffering : Bool;
-}
\ No newline at end of file
+	public var line_buffering:Bool;
+}
diff --git a/std/python/lib/io/UnsupportedOperation.hx b/std/python/lib/io/UnsupportedOperation.hx
index ef433aae3b1aecdf4f73e0a8f21583889ae4a09b..32c8bf41141bc635f65db1875c8933626530f8a0 100644
--- a/std/python/lib/io/UnsupportedOperation.hx
+++ b/std/python/lib/io/UnsupportedOperation.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.io;
 
 import python.Exceptions.IOError;
 
 @:pythonImport("io", "UnsupportedOperation")
-class UnsupportedOperation extends IOError {
-
-
-
-}
\ No newline at end of file
+class UnsupportedOperation extends IOError {}
diff --git a/std/python/lib/json/JSONDecoder.hx b/std/python/lib/json/JSONDecoder.hx
index 42bf44fd170611bf6104be8f8441d2430b74532a..45f01df60455464d2a91a6179b2f9a3850950231 100644
--- a/std/python/lib/json/JSONDecoder.hx
+++ b/std/python/lib/json/JSONDecoder.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,23 +19,24 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.json;
 
 import python.Tuple;
 
 typedef JSONDecoderOptions = {
-	@:optional var object_hook : Dict<String, Dynamic>->Dynamic;
-	@:optional var parse_float : String->Float;
-	@:optional var parse_int : String->Int;
-	@:optional var parse_constant : String->Dynamic;
-	@:optional var strict:Bool;
-	@:optional var object_pairs_hook : Array<Tuple2<String,String>>->Dict<String,Dynamic>;
+	var ?object_hook:Dict<String, Dynamic>->Dynamic;
+	var ?parse_float:String->Float;
+	var ?parse_int:String->Int;
+	var ?parse_constant:String->Dynamic;
+	var ?strict:Bool;
+	var ?object_pairs_hook:Array<Tuple2<String, String>>->Dict<String, Dynamic>;
 }
 
 @:pythonImport("json", "JSONDecoder")
 extern class JSONDecoder {
-	public function new (?options:KwArgs<JSONDecoderOptions>):Void;
+	public function new(?options:KwArgs<JSONDecoderOptions>):Void;
 
-	public function decode (o:String):Dynamic;
-	public function raw_decode (o:String):Tuple2<Dynamic, Int>;
+	public function decode(o:String):Dynamic;
+	public function raw_decode(o:String):Tuple2<Dynamic, Int>;
 }
diff --git a/std/python/lib/json/JSONEncoder.hx b/std/python/lib/json/JSONEncoder.hx
index 5526ad052ea14ccfbd4c99f08e506c729592edb3..06b29d22bcf13ed2d97e46ebe5c725d3fab23914 100644
--- a/std/python/lib/json/JSONEncoder.hx
+++ b/std/python/lib/json/JSONEncoder.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,25 +19,27 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.json;
 
 import python.Tuple;
 
 typedef JSONEncoderOptions = {
-	@:optional var skipkeys : Bool;
-	@:optional var ensure_ascii : Bool;
-	@:optional var check_circular : Bool;
-	@:optional var allow_nan : Bool;
-	@:optional var sort_keys:Bool;
-	@:optional var indent : String;
-	@:optional var separators:Tuple2<String,String>;
-	@:optional @:native("default") var def:Dynamic->String;
+	var ?skipkeys:Bool;
+	var ?ensure_ascii:Bool;
+	var ?check_circular:Bool;
+	var ?allow_nan:Bool;
+	var ?sort_keys:Bool;
+	var ?indent:String;
+	var ?separators:Tuple2<String, String>;
+	@:native("default") var ?def:Dynamic->String;
 }
+
 @:pythonImport("json", "JSONEncoder")
 extern class JSONEncoder {
-	public function new (?options:KwArgs<JSONEncoderOptions>):Void;
+	public function new(?options:KwArgs<JSONEncoderOptions>):Void;
 
-	@:native("default") public function def (o:Dynamic):Dynamic;
+	@:native("default") public function def(o:Dynamic):Dynamic;
 
-	public function encode (o:Dynamic):String;
+	public function encode(o:Dynamic):String;
 }
diff --git a/std/python/lib/net/Address.hx b/std/python/lib/net/Address.hx
index 56c139b26e00c7798e51f89963fa84bd42a73fc5..09980e39d4226536ff946a1a41a5042a9956c73a 100644
--- a/std/python/lib/net/Address.hx
+++ b/std/python/lib/net/Address.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.net;
 
-typedef Address = python.Tuple.Tuple2<String,Int>;
\ No newline at end of file
+@:deprecated("Use python.lib.socket.Adress instead")
+typedef Address = python.lib.socket.Address;
diff --git a/std/python/lib/net/Socket.hx b/std/python/lib/net/Socket.hx
index 3a6f13c2b4536e956a5f0aad1dc86773646960ee..409c9f86e44904ccff9ed97a6f1ee73313827e58 100644
--- a/std/python/lib/net/Socket.hx
+++ b/std/python/lib/net/Socket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,363 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package python.lib.net;
 
-import haxe.io.BytesData;
-import python.Tuple;
+package python.lib.net;
 
 /**
-    A TCP socket class : allow you to both connect to a given server and exchange messages or start your own server and wait for connections.
+	A TCP socket class : allow you to both connect to a given server and exchange messages or start your own server and wait for connections.
 **/
+@:deprecated("Use python.lib.socket.Socket instead")
+typedef Socket = python.lib.socket.Socket;
 
-@:pythonImport("socket", "socket")
-extern class Socket {
-    function send(d:BytesData,flags:Int):Int;
-    function recv(n:Int,flags:Int):BytesData;
-
-    /**
-        Creates a new unconnected socket.
-    **/
-    function new() : Void;
-
-    /**
-        Closes the socket : make sure to properly close all your sockets or you will crash when you run out of file descriptors.
-    **/
-    function close() : Void;
-
-    /**
-        Connect to the given server host/port. Throw an exception in case we couldn't successfully connect.
-    **/
-    function connect( addr : python.lib.net.Address ) : Void;
-
-    //function create_connection() :
-
-    /**
-        Allow the socket to listen for incoming questions. The parameter tells how many pending connections we can have until they get refused. Use `accept()` to accept incoming connections.
-    **/
-    function listen( connections : Int ) : Void;
-
-    /**
-        Shutdown the socket, either for reading or writing.
-    **/
-    function shutdown( how :Int ) : Void;
-
-    /**
-        Bind the socket to the given host/port so it can afterwards listen for connections there.
-    **/
-    function bind( address : python.lib.net.Address ) : Void;
-
-    /**
-        Accept a new connected client. This will return a connected socket on which you can read/write some data.
-    **/
-    function accept() : Tuple2<Socket,Address>;
-
-    /**
-        Return the information about the other side of a connected socket.
-    **/
-    function getpeername() : python.lib.net.Address;
-
-    /**
-        Return the information about our side of a connected socket.
-    **/
-    function getsockname() : python.lib.net.Address;
-
-    /**
-        Gives a timeout after which blocking socket operations (such as reading and writing) will abort and throw an exception.
-    **/
-    function settimeout( timeout : Float ) : Void;
-
-    /**
-        Block until some data is available for read on the socket.
-    **/
-    function waitForRead() : Void;
-
-    /**
-        Change the blocking mode of the socket. A blocking socket is the default behavior. A non-blocking socket will abort blocking operations immediately by throwing a haxe.io.Error.Blocking value.
-    **/
-    function setblocking( b : Bool ) : Void;
-
-    /**
-
-    **/
-    function setsockopt( family:Int, option:Int, value : Bool ) : Void;
-
-
-    function fileno():Int;
-
-    /**
-        Wait until one of the sockets groups is ready for the given operation :
-        - `read` contains sockets on which we want to wait for available data to be read,
-        - `write` contains sockets on which we want to wait until we are allowed to write some data to their output buffers,
-        - `others` contains sockets on which we want to wait for exceptional conditions.
-        - `select` will block until one of the condition is met, in which case it will return the sockets for which the condition was true.
-        In case a `timeout` (in seconds) is specified, select might wait at worse until the timeout expires.
-    **/
-    //static function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float) : { read: Array<Socket>,write: Array<Socket>,others: Array<Socket> };
-
-}
-
-@:pythonImport("socket")
-extern class SocketModule {
-    static var AF_APPLETALK:Int;
-    static var AF_ASH:Int;
-    static var AF_ATMPVC:Int;
-    static var AF_ATMSVC:Int;
-    static var AF_AX25:Int;
-    static var AF_BLUETOOTH:Int;
-    static var AF_BRIDGE:Int;
-    static var AF_CAN:Int;
-    static var AF_ECONET:Int;
-    static var AF_INET:Int;
-    static var AF_INET6:Int;
-    static var AF_IPX:Int;
-    static var AF_IRDA:Int;
-    static var AF_KEY:Int;
-    static var AF_LLC:Int;
-    static var AF_NETBEUI:Int;
-    static var AF_NETLINK:Int;
-    static var AF_NETROM:Int;
-    static var AF_PACKET:Int;
-    static var AF_PPPOX:Int;
-    static var AF_RDS:Int;
-    static var AF_ROSE:Int;
-    static var AF_ROUTE:Int;
-    static var AF_SECURITY:Int;
-    static var AF_SNA:Int;
-    static var AF_TIPC:Int;
-    static var AF_UNIX:Int;
-    static var AF_UNSPEC:Int;
-    static var AF_WANPIPE:Int;
-    static var AF_X25:Int;
-    static var AI_ADDRCONFIG:Int;
-    static var AI_ALL:Int;
-    static var AI_CANONNAME:Int;
-    static var AI_NUMERICHOST:Int;
-    static var AI_NUMERICSERV:Int;
-    static var AI_PASSIVE:Int;
-    static var AI_V4MAPPED:Int;
-    static var BDADDR_ANY:Int;
-    static var BDADDR_LOCAL:Int;
-    static var BTPROTO_HCI:Int;
-    static var BTPROTO_L2CAP:Int;
-    static var BTPROTO_RFCOMM:Int;
-    static var BTPROTO_SCO:Int;
-    static var CAN_EFF_FLAG:Int;
-    static var CAN_EFF_MASK:Int;
-    static var CAN_ERR_FLAG:Int;
-    static var CAN_ERR_MASK:Int;
-    static var CAN_RAW:Int;
-    static var CAN_RAW_ERR_FILTER:Int;
-    static var CAN_RAW_FILTER:Int;
-    static var CAN_RAW_LOOPBACK:Int;
-    static var CAN_RAW_RECV_OWN_MSGS:Int;
-    static var CAN_RTR_FLAG:Int;
-    static var CAN_SFF_MASK:Int;
-    static var CAPI:Int;
-    static var CMSG_LEN:Int;
-    static var CMSG_SPACE:Int;
-    static var EAGAIN:Int;
-    static var EAI_ADDRFAMILY:Int;
-    static var EAI_AGAIN:Int;
-    static var EAI_BADFLAGS:Int;
-    static var EAI_FAIL:Int;
-    static var EAI_FAMILY:Int;
-    static var EAI_MEMORY:Int;
-    static var EAI_NODATA:Int;
-    static var EAI_NONAME:Int;
-    static var EAI_OVERFLOW:Int;
-    static var EAI_SERVICE:Int;
-    static var EAI_SOCKTYPE:Int;
-    static var EAI_SYSTEM:Int;
-    static var EBADF:Int;
-    static var EWOULDBLOCK:Int;
-    static var HCI_DATA_DIR:Int;
-    static var HCI_FILTER:Int;
-    static var HCI_TIME_STAMP:Int;
-    static var INADDR_ALLHOSTS_GROUP:Int;
-    static var INADDR_ANY:Int;
-    static var INADDR_BROADCAST:Int;
-    static var INADDR_LOOPBACK:Int;
-    static var INADDR_MAX_LOCAL_GROUP:Int;
-    static var INADDR_NONE:Int;
-    static var INADDR_UNSPEC_GROUP:Int;
-    static var IPPORT_RESERVED:Int;
-    static var IPPORT_USERRESERVED:Int;
-    static var IPPROTO_AH:Int;
-    static var IPPROTO_DSTOPTS:Int;
-    static var IPPROTO_EGP:Int;
-    static var IPPROTO_ESP:Int;
-    static var IPPROTO_FRAGMENT:Int;
-    static var IPPROTO_GRE:Int;
-    static var IPPROTO_HOPOPTS:Int;
-    static var IPPROTO_ICMP:Int;
-    static var IPPROTO_ICMPV6:Int;
-    static var IPPROTO_IDP:Int;
-    static var IPPROTO_IGMP:Int;
-    static var IPPROTO_IP:Int;
-    static var IPPROTO_IPIP:Int;
-    static var IPPROTO_IPV6:Int;
-    static var IPPROTO_NONE:Int;
-    static var IPPROTO_PIM:Int;
-    static var IPPROTO_PUP:Int;
-    static var IPPROTO_RAW:Int;
-    static var IPPROTO_ROUTING:Int;
-    static var IPPROTO_RSVP:Int;
-    static var IPPROTO_SCTP:Int;
-    static var IPPROTO_TCP:Int;
-    static var IPPROTO_TP:Int;
-    static var IPPROTO_UDP:Int;
-    static var IPV6_CHECKSUM:Int;
-    static var IPV6_DSTOPTS:Int;
-    static var IPV6_HOPLIMIT:Int;
-    static var IPV6_HOPOPTS:Int;
-    static var IPV6_JOIN_GROUP:Int;
-    static var IPV6_LEAVE_GROUP:Int;
-    static var IPV6_MULTICAST_HOPS:Int;
-    static var IPV6_MULTICAST_IF:Int;
-    static var IPV6_MULTICAST_LOOP:Int;
-    static var IPV6_NEXTHOP:Int;
-    static var IPV6_PKTINFO:Int;
-    static var IPV6_RECVDSTOPTS:Int;
-    static var IPV6_RECVHOPLIMIT:Int;
-    static var IPV6_RECVHOPOPTS:Int;
-    static var IPV6_RECVPKTINFO:Int;
-    static var IPV6_RECVRTHDR:Int;
-    static var IPV6_RECVTCLASS:Int;
-    static var IPV6_RTHDR:Int;
-    static var IPV6_RTHDRDSTOPTS:Int;
-    static var IPV6_RTHDR_TYPE_0:Int;
-    static var IPV6_TCLASS:Int;
-    static var IPV6_UNICAST_HOPS:Int;
-    static var IPV6_V6ONLY:Int;
-    static var IP_ADD_MEMBERSHIP:Int;
-    static var IP_DEFAULT_MULTICAST_LOOP:Int;
-    static var IP_DEFAULT_MULTICAST_TTL:Int;
-    static var IP_DROP_MEMBERSHIP:Int;
-    static var IP_HDRINCL:Int;
-    static var IP_MAX_MEMBERSHIPS:Int;
-    static var IP_MULTICAST_IF:Int;
-    static var IP_MULTICAST_LOOP:Int;
-    static var IP_MULTICAST_TTL:Int;
-    static var IP_OPTIONS:Int;
-    static var IP_RECVOPTS:Int;
-    static var IP_RECVRETOPTS:Int;
-    static var IP_RETOPTS:Int;
-    static var IP_TOS:Int;
-    static var IP_TRANSPARENT:Int;
-    static var IP_TTL:Int;
-    static var MSG_CMSG_CLOEXEC:Int;
-    static var MSG_CONFIRM:Int;
-    static var MSG_CTRUNC:Int;
-    static var MSG_DONTROUTE:Int;
-    static var MSG_DONTWAIT:Int;
-    static var MSG_EOR:Int;
-    static var MSG_ERRQUEUE:Int;
-    static var MSG_MORE:Int;
-    static var MSG_NOSIGNAL:Int;
-    static var MSG_OOB:Int;
-    static var MSG_PEEK:Int;
-    static var MSG_TRUNC:Int;
-    static var MSG_WAITALL:Int;
-    static var NETLINK_DNRTMSG:Int;
-    static var NETLINK_FIREWALL:Int;
-    static var NETLINK_IP6_FW:Int;
-    static var NETLINK_NFLOG:Int;
-    static var NETLINK_ROUTE:Int;
-    static var NETLINK_USERSOCK:Int;
-    static var NETLINK_XFRM:Int;
-    static var NI_DGRAM:Int;
-    static var NI_MAXHOST:Int;
-    static var NI_MAXSERV:Int;
-    static var NI_NAMEREQD:Int;
-    static var NI_NOFQDN:Int;
-    static var NI_NUMERICHOST:Int;
-    static var NI_NUMERICSERV:Int;
-    static var PACKET_BROADCAST:Int;
-    static var PACKET_FASTROUTE:Int;
-    static var PACKET_HOST:Int;
-    static var PACKET_LOOPBACK:Int;
-    static var PACKET_MULTICAST:Int;
-    static var PACKET_OTHERHOST:Int;
-    static var PACKET_OUTGOING:Int;
-    static var PF_CAN:Int;
-    static var PF_PACKET:Int;
-    static var PF_RDS:Int;
-    static var SCM_CREDENTIALS:Int;
-    static var SCM_RIGHTS:Int;
-    static var SHUT_RD:Int;
-    static var SHUT_RDWR:Int;
-    static var SHUT_WR:Int;
-    static var SOCK_CLOEXEC:Int;
-    static var SOCK_DGRAM:Int;
-    static var SOCK_NONBLOCK:Int;
-    static var SOCK_RAW:Int;
-    static var SOCK_RDM:Int;
-    static var SOCK_SEQPACKET:Int;
-    static var SOCK_STREAM:Int;
-    static var SOL_CAN_BASE:Int;
-    static var SOL_CAN_RAW:Int;
-    static var SOL_HCI:Int;
-    static var SOL_IP:Int;
-    static var SOL_SOCKET:Int;
-    static var SOL_TCP:Int;
-    static var SOL_TIPC:Int;
-    static var SOL_UDP:Int;
-    static var SOMAXCONN:Int;
-    static var SO_ACCEPTCONN:Int;
-    static var SO_BINDTODEVICE:Int;
-    static var SO_BROADCAST:Int;
-    static var SO_DEBUG:Int;
-    static var SO_DONTROUTE:Int;
-    static var SO_ERROR:Int;
-    static var SO_KEEPALIVE:Int;
-    static var SO_LINGER:Int;
-    static var SO_OOBINLINE:Int;
-    static var SO_PASSCRED:Int;
-    static var SO_PEERCRED:Int;
-    static var SO_RCVBUF:Int;
-    static var SO_RCVLOWAT:Int;
-    static var SO_RCVTIMEO:Int;
-    static var SO_REUSEADDR:Int;
-    static var SO_REUSEPORT:Int;
-    static var SO_SNDBUF:Int;
-    static var SO_SNDLOWAT:Int;
-    static var SO_SNDTIMEO:Int;
-    static var SO_TYPE:Int;
-    static var TCP_CORK:Int;
-    static var TCP_DEFER_ACCEPT:Int;
-    static var TCP_INFO:Int;
-    static var TCP_KEEPCNT:Int;
-    static var TCP_KEEPIDLE:Int;
-    static var TCP_KEEPINTVL:Int;
-    static var TCP_LINGER2:Int;
-    static var TCP_MAXSEG:Int;
-    static var TCP_NODELAY:Int;
-    static var TCP_QUICKACK:Int;
-    static var TCP_SYNCNT:Int;
-    static var TCP_WINDOW_CLAMP:Int;
-    static var TIPC_ADDR_ID:Int;
-    static var TIPC_ADDR_NAME:Int;
-    static var TIPC_ADDR_NAMESEQ:Int;
-    static var TIPC_CFG_SRV:Int;
-    static var TIPC_CLUSTER_SCOPE:Int;
-    static var TIPC_CONN_TIMEOUT:Int;
-    static var TIPC_CRITICAL_IMPORTANCE:Int;
-    static var TIPC_DEST_DROPPABLE:Int;
-    static var TIPC_HIGH_IMPORTANCE:Int;
-    static var TIPC_IMPORTANCE:Int;
-    static var TIPC_LOW_IMPORTANCE:Int;
-    static var TIPC_MEDIUM_IMPORTANCE:Int;
-    static var TIPC_NODE_SCOPE:Int;
-    static var TIPC_PUBLISHED:Int;
-    static var TIPC_SRC_DROPPABLE:Int;
-    static var TIPC_SUBSCR_TIMEOUT:Int;
-    static var TIPC_SUB_CANCEL:Int;
-    static var TIPC_SUB_PORTS:Int;
-    static var TIPC_SUB_SERVICE:Int;
-    static var TIPC_TOP_SRV:Int;
-    static var TIPC_WAIT_FOREVER:Int;
-    static var TIPC_WITHDRAWN:Int;
-    static var TIPC_ZONE_SCOPE:Int;
-    static var _GLOBAL_DEFAULT_TIMEOUT:Int;
-}
+@:deprecated("Use python.lib.Socket instead")
+typedef SocketModule = python.lib.Socket;
diff --git a/std/python/lib/os/Path.hx b/std/python/lib/os/Path.hx
index fedce00d0c87a2a718e9f0a0f53c0e9c31a23615..e4967ddfa9a7567a6ef9fb94e8a7b7e7a98dc61f 100644
--- a/std/python/lib/os/Path.hx
+++ b/std/python/lib/os/Path.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.os;
 
 import haxe.extern.Rest;
@@ -26,60 +27,56 @@ import python.Tuple;
 
 @:pythonImport("os", "path")
 extern class Path {
+	public static var sep:String;
+	public static function exists(path:String):Bool;
 
-	public static var sep : String;
-	public static function exists (path:String):Bool;
-
-	public static function abspath (path:String):String;
-
-	public static function basename (path:String):String;
-
-	public static function commonprefix (paths:Array<String>):String;
-
-	public static function lexists (path:String):Bool;
+	public static function abspath(path:String):String;
 
-	public static function expanduser (path:String):String;
+	public static function basename(path:String):String;
 
-	public static function expandvars (path:String):String;
+	public static function commonprefix(paths:Array<String>):String;
 
-	public static function getmtime (path:String):Float;
+	public static function lexists(path:String):Bool;
 
-	public static function getatime (path:String):Float;
+	public static function expanduser(path:String):String;
 
-	public static function getctime (path:String):Float;
+	public static function expandvars(path:String):String;
 
-	public static function getsize (path:String):Int;
+	public static function getmtime(path:String):Float;
 
-	public static function isabs (path:String):Bool;
+	public static function getatime(path:String):Float;
 
-	public static function isfile (path:String):Bool;
+	public static function getctime(path:String):Float;
 
-	public static function isdir (path:String):Bool;
+	public static function getsize(path:String):Int;
 
-	public static function dirname (path:String):String;
+	public static function isabs(path:String):Bool;
 
+	public static function isfile(path:String):Bool;
 
+	public static function isdir(path:String):Bool;
 
-	public static function islink (path:String):Bool;
+	public static function dirname(path:String):String;
 
-	public static function ismount (path:String):Bool;
+	public static function islink(path:String):Bool;
 
-	public static function join (path:String, paths:Rest<String>):String;
+	public static function ismount(path:String):Bool;
 
-	public static function normpath (path:String):String;
+	public static function join(path:String, paths:Rest<String>):String;
 
-	public static function realpath (path:String):String;
+	public static function normpath(path:String):String;
 
-	public static function relpath (path:String):String;
+	public static function realpath(path:String):String;
 
-	public static function samefile (path1:String, path2:String):String;
+	public static function relpath(path:String):String;
 
-	public static function split (path:String):Tuple2<String, String>;
+	public static function samefile(path1:String, path2:String):String;
 
-	public static function splitdrive (path:String):Tuple2<String, String>;
+	public static function split(path:String):Tuple2<String, String>;
 
-	public static function splitext (path:String):Tuple2<String, String>;
+	public static function splitdrive(path:String):Tuple2<String, String>;
 
-	public static function supports_unicode_filenames ():Bool;
+	public static function splitext(path:String):Tuple2<String, String>;
 
-}
\ No newline at end of file
+	public static function supports_unicode_filenames():Bool;
+}
diff --git a/std/python/lib/socket/Address.hx b/std/python/lib/socket/Address.hx
new file mode 100644
index 0000000000000000000000000000000000000000..deda91f6016ffc163a7e66d553e60d847a8f1f00
--- /dev/null
+++ b/std/python/lib/socket/Address.hx
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C)2005-2019 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 python.lib.socket;
+
+typedef Address = python.Tuple.Tuple2<String, Int>;
diff --git a/std/python/lib/socket/Socket.hx b/std/python/lib/socket/Socket.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2a5087a848ed0c6d3e16ae7c9330bd9ce408424c
--- /dev/null
+++ b/std/python/lib/socket/Socket.hx
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C)2005-2019 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 python.lib.socket;
+
+import haxe.io.BytesData;
+import python.Tuple;
+
+/**
+	A TCP socket class : allow you to both connect to a given server and exchange messages or start your own server and wait for connections.
+**/
+@:pythonImport("socket", "socket")
+extern class Socket {
+	function send(d:BytesData, flags:Int):Int;
+	function recv(n:Int, flags:Int):BytesData;
+
+	/**
+		Creates a new unconnected socket.
+	**/
+	function new():Void;
+
+	/**
+		Closes the socket : make sure to properly close all your sockets or you will crash when you run out of file descriptors.
+	**/
+	function close():Void;
+
+	/**
+		Connect to the given server host/port. Throw an exception in case we couldn't successfully connect.
+	**/
+	function connect(addr:python.lib.socket.Address):Void;
+
+	// function create_connection() :
+
+	/**
+		Allow the socket to listen for incoming questions. The parameter tells how many pending connections we can have until they get refused. Use `accept()` to accept incoming connections.
+	**/
+	function listen(connections:Int):Void;
+
+	/**
+		Shutdown the socket, either for reading or writing.
+	**/
+	function shutdown(how:Int):Void;
+
+	/**
+		Bind the socket to the given host/port so it can afterwards listen for connections there.
+	**/
+	function bind(address:python.lib.socket.Address):Void;
+
+	/**
+		Accept a new connected client. This will return a connected socket on which you can read/write some data.
+	**/
+	function accept():Tuple2<Socket, Address>;
+
+	/**
+		Return the information about the other side of a connected socket.
+	**/
+	function getpeername():python.lib.socket.Address;
+
+	/**
+		Return the information about our side of a connected socket.
+	**/
+	function getsockname():python.lib.socket.Address;
+
+	/**
+		Gives a timeout after which blocking socket operations (such as reading and writing) will abort and throw an exception.
+	**/
+	function settimeout(timeout:Float):Void;
+
+	/**
+		Block until some data is available for read on the socket.
+	**/
+	function waitForRead():Void;
+
+	/**
+		Change the blocking mode of the socket. A blocking socket is the default behavior. A non-blocking socket will abort blocking operations immediately by throwing a haxe.io.Error.Blocked value.
+	**/
+	function setblocking(b:Bool):Void;
+
+	/**
+
+	**/
+	function setsockopt(family:Int, option:Int, value:Bool):Void;
+
+	function fileno():Int;
+	/**
+		Wait until one of the sockets groups is ready for the given operation :
+		- `read` contains sockets on which we want to wait for available data to be read,
+		- `write` contains sockets on which we want to wait until we are allowed to write some data to their output buffers,
+		- `others` contains sockets on which we want to wait for exceptional conditions.
+		- `select` will block until one of the condition is met, in which case it will return the sockets for which the condition was true.
+		In case a `timeout` (in seconds) is specified, select might wait at worse until the timeout expires.
+	**/
+	// static function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float) : { read: Array<Socket>,write: Array<Socket>,others: Array<Socket> };
+}
diff --git a/std/python/lib/ssl/Purpose.hx b/std/python/lib/ssl/Purpose.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1e875dc03aab9841cddb2d2b99588733b4c69f06
--- /dev/null
+++ b/std/python/lib/ssl/Purpose.hx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2019 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 python.lib.ssl;
+
+@:require(python_version >= 3.4)
+@:pythonImport("ssl", "Purpose")
+extern class Purpose {
+	public static var SERVER_AUTH:String;
+	public static var CLIENT_AUTH:String;
+}
diff --git a/std/python/lib/ssl/SSLContext.hx b/std/python/lib/ssl/SSLContext.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6879e449d433d25d3cecd9d33bc9b86cab5cb8bb
--- /dev/null
+++ b/std/python/lib/ssl/SSLContext.hx
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C)2005-2019 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 python.lib.ssl;
+
+import python.lib.ssl.SSLSocket;
+
+@:pythonImport("ssl", "SSLContext")
+extern class SSLContext {
+	public function new(protocol:String):Void;
+	#if (python_version >= 3.6)
+	public function wrap_socket(s:python.lib.socket.Socket, server_side:Bool = false, do_handshake_on_connect:Bool = true, suppress_ragged_eofs:Bool = true,
+		server_hostname:String = null, session:SSLSession = null):python.lib.ssl.SSLSocket;
+	#else
+	public function wrap_socket(s:python.lib.socket.Socket, server_side:Bool = false, do_handshake_on_connect:Bool = true, suppress_ragged_eofs:Bool = true,
+		server_hostname:String = null):python.lib.ssl.SSLSocket;
+	#end
+	public var options:Int;
+
+	@:require(python_version >= 3.4)
+	public var check_hostname:Bool;
+
+	public var verify_mode:Int;
+	public function load_verify_locations(cafile:String = null, capath:String = null, cadata:String = null):Void;
+	public function set_default_verify_paths():Void;
+
+	@:require(python_version >= 3.4)
+	public function load_default_certs():Void;
+	// public function load_cert_chain(certfile:String, keyfile:String = null, password:String = null):Void;
+	// public function set_servername_callback(callback:SSLSocket -> String -> SSLContext -> Void ):Void;
+}
diff --git a/std/python/lib/ssl/SSLSession.hx b/std/python/lib/ssl/SSLSession.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9e93cc3df43dc5ccf87f8be8f3f86a5d2532adf0
--- /dev/null
+++ b/std/python/lib/ssl/SSLSession.hx
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C)2005-2019 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 python.lib.ssl;
+
+@:require(python_version >= 3.6)
+@:pythonImport("ssl", "SSLSession")
+extern class SSLSession {}
diff --git a/std/python/lib/ssl/SSLSocket.hx b/std/python/lib/ssl/SSLSocket.hx
new file mode 100644
index 0000000000000000000000000000000000000000..289b05b1f98d6b029fad015ce437a06a8e0a0832
--- /dev/null
+++ b/std/python/lib/ssl/SSLSocket.hx
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C)2005-2019 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 python.lib.ssl;
+
+@:pythonImport("ssl", "SSLSocket")
+extern class SSLSocket extends python.lib.socket.Socket {}
diff --git a/std/python/lib/subprocess/Popen.hx b/std/python/lib/subprocess/Popen.hx
index 89cdf6d96d75d878b94240c1adc2195ce80e74c2..dbb3083eb64f50d8cbf20383aae4f266ce8f749d 100644
--- a/std/python/lib/subprocess/Popen.hx
+++ b/std/python/lib/subprocess/Popen.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.subprocess;
 
 import python.lib.io.BufferedReader;
@@ -30,26 +31,24 @@ import python.Dict;
 import haxe.extern.EitherType;
 
 typedef PopenOptions = {
-	?bufsize : Int,
-	?executable  : String,
-	?stdin  : Dynamic,
-	?stdout  : Dynamic,
-	?stderr : Dynamic,
-	?preexec_fn : Void->Void,
-	?close_fds : Bool,
-	?shell : Bool,
-	?cwd : String,
-	?env : Dict<String, String>,
-	?universal_newlines : Bool,
-	?startupinfo : StartupInfo,
-	?creationflags : Int,
+	?bufsize:Int,
+	?executable:String,
+	?stdin:Dynamic,
+	?stdout:Dynamic,
+	?stderr:Dynamic,
+	?preexec_fn:Void->Void,
+	?close_fds:Bool,
+	?shell:Bool,
+	?cwd:String,
+	?env:Dict<String, String>,
+	?universal_newlines:Bool,
+	?startupinfo:StartupInfo,
+	?creationflags:Int,
 }
 
 @:pythonImport("subprocess", "Popen")
 extern class Popen {
-
-	public static inline function create (args:EitherType<String, Array<String>>, o:PopenOptions):Popen {
-
+	public static inline function create(args:EitherType<String, Array<String>>, o:PopenOptions):Popen {
 		o.bufsize = if (Reflect.hasField(o, "bufsize")) o.bufsize else 0;
 		o.executable = if (Reflect.hasField(o, "executable")) o.executable else null;
 		o.stdin = if (Reflect.hasField(o, "stdin")) o.stdin else null;
@@ -66,34 +65,28 @@ extern class Popen {
 		o.creationflags = if (Reflect.hasField(o, "creationflags")) o.creationflags else 0;
 
 		if (std.Sys.systemName() == "Windows") {
-			return new Popen(args, o.bufsize, o.executable, o.stdin, o.stdout, o.stderr, o.preexec_fn,
-			o.close_fds, o.shell, o.cwd, o.env, o.universal_newlines, o.startupinfo, o.creationflags);
+			return new Popen(args, o.bufsize, o.executable, o.stdin, o.stdout, o.stderr, o.preexec_fn, o.close_fds, o.shell, o.cwd, o.env,
+				o.universal_newlines, o.startupinfo, o.creationflags);
 		} else {
-			return new Popen(args, o.bufsize, o.executable, o.stdin, o.stdout, o.stderr, o.preexec_fn,
-			o.close_fds, o.shell, o.cwd, o.env, o.universal_newlines, o.startupinfo);
+			return new Popen(args, o.bufsize, o.executable, o.stdin, o.stdout, o.stderr, o.preexec_fn, o.close_fds, o.shell, o.cwd, o.env,
+				o.universal_newlines, o.startupinfo);
 		}
-
 	}
 
-	public function new (args:Array<String>, bufsize:Int=0, executable:String = null,
-			stdin:Int = null, stdout:Int = null, stderr:Int=null, preexec_fn:Void->Void=null,
-			close_fds:Bool=false, shell:Bool=false, cwd:String=null, env:Dict<String,String>=null,
-			universal_newlines:Bool=false, startupinfo:StartupInfo=null, creationflags:Int=0):Void;
-
+	public function new(args:Array<String>, bufsize:Int = 0, executable:String = null, stdin:Int = null, stdout:Int = null, stderr:Int = null,
+		preexec_fn:Void->Void = null, close_fds:Bool = false, shell:Bool = false, cwd:String = null, env:Dict<String, String> = null,
+		universal_newlines:Bool = false, startupinfo:StartupInfo = null, creationflags:Int = 0):Void;
 
+	public function kill():Void;
+	public function wait(?timeout:Null<Int>):Null<Int>;
+	public function poll():Null<Int>;
+	public function terminate():Void;
 
-
-	public function kill ():Void;
-	public function wait (?timeout:Null<Int>):Null<Int>;
-	public function poll ():Null<Int>;
-	public function terminate ():Void;
-
-	public var stdout : FileIO;
-	public var stderr : FileIO;
-	public var stdin : FileIO;
-	public var returncode : Int;
+	public var stdout:FileIO;
+	public var stderr:FileIO;
+	public var stdin:FileIO;
+	public var returncode:Int;
 	public var pid:Int;
 
-	public function communicate (input:Bytes = null, timeout:Null<Int> = null):Tuple2<Bytes, Bytes>;
-
-}
\ No newline at end of file
+	public function communicate(input:Bytes = null, timeout:Null<Int> = null):Tuple2<Bytes, Bytes>;
+}
diff --git a/std/python/lib/threading/Lock.hx b/std/python/lib/threading/Lock.hx
index b254807143481fb38cf6e7c6c9bc0157866ffe6b..566a01c6071a62179db4b3973186ff3fc76ee8b3 100644
--- a/std/python/lib/threading/Lock.hx
+++ b/std/python/lib/threading/Lock.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.threading;
 
 @:pythonImport("threading", "Lock")
 extern class Lock {
-  public function new():Void;
-  public function acquire(?blocking:Bool, ?timeout:Float):Bool;
-  public function release():Void;
-}
\ No newline at end of file
+	public function new():Void;
+	public function acquire(?blocking:Bool, ?timeout:Float):Bool;
+	public function release():Void;
+}
diff --git a/std/python/lib/threading/RLock.hx b/std/python/lib/threading/RLock.hx
index e76025b9c602fb65e4f27f3076da2b1e83dd0b87..6b425df9724b63ae0386cfa5bf9ea53bbfcd64c5 100644
--- a/std/python/lib/threading/RLock.hx
+++ b/std/python/lib/threading/RLock.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,11 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.threading;
 
 @:pythonImport("threading", "RLock")
 extern class RLock {
-  public function new():Void;
-  public function acquire(?blocking:Bool, ?timeout:Float):Bool;
-  public function release():Void;
-}
\ No newline at end of file
+	public function new():Void;
+	public function acquire(?blocking:Bool, ?timeout:Float):Bool;
+	public function release():Void;
+}
diff --git a/std/python/lib/threading/Thread.hx b/std/python/lib/threading/Thread.hx
index 3850193128315f7a48d52b638d15d27ca07a9a88..a3faf9f11ade4d08f7e14cc6722ea801bf4b16a7 100644
--- a/std/python/lib/threading/Thread.hx
+++ b/std/python/lib/threading/Thread.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,25 +19,26 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.threading;
 
 typedef ThreadOptions = {
-	@:optional var group : Dynamic;
-	@:optional var target : Dynamic;
-	@:optional var name : String;
-	@:optional var args : Tuple<Dynamic>;
-	@:optional var kwargs : Dict<String,Dynamic>;
-	@:optional var daemon : Dynamic;
+	var ?group:Dynamic;
+	var ?target:Dynamic;
+	var ?name:String;
+	var ?args:Tuple<Dynamic>;
+	var ?kwargs:Dict<String, Dynamic>;
+	var ?daemon:Dynamic;
 }
 
 @:pythonImport("threading", "Thread")
 extern class Thread {
-  public var name:String;
-  public var ident:Int;
-  public var daemon:Bool;
-  public function new (?options:KwArgs<ThreadOptions>):Void;
-  public function start():Void;
-  public function run():Void;
-  public function join(?timeout:Float):Void;
-  public function is_alive():Bool;
-}
\ No newline at end of file
+	public var name:String;
+	public var ident:Int;
+	public var daemon:Bool;
+	public function new(?options:KwArgs<ThreadOptions>):Void;
+	public function start():Void;
+	public function run():Void;
+	public function join(?timeout:Float):Void;
+	public function is_alive():Bool;
+}
diff --git a/std/python/lib/time/StructTime.hx b/std/python/lib/time/StructTime.hx
index 7eb3ddca9ea0ed9d1a8b43d5c580c4d2ef74b1bd..36d25d7878b46f598ea6ca674dcae6bf68cbbe15 100644
--- a/std/python/lib/time/StructTime.hx
+++ b/std/python/lib/time/StructTime.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,12 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
- package python.lib.time;
 
-@:pythonImport("time", "struct_time")
-extern class StructTime implements ArrayAccess<Int> {
-	
-
-	
+package python.lib.time;
 
-}
\ No newline at end of file
+@:pythonImport("time", "struct_time")
+extern class StructTime implements ArrayAccess<Int> {}
diff --git a/std/python/lib/urllib/Parse.hx b/std/python/lib/urllib/Parse.hx
index f0bb5e2a9cdb51bcbeb0a2dd1bfc31b3b3fe9fb7..a1e5db4f3a44edf87dd7ce9843a6d8b0885429d8 100644
--- a/std/python/lib/urllib/Parse.hx
+++ b/std/python/lib/urllib/Parse.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,10 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.urllib;
 
 @:pythonImport("urllib.parse")
 extern class Parse {
 	static function quote(s:String, ?safe:String):String;
 	static function unquote(s:String):String;
-}
\ No newline at end of file
+}
diff --git a/std/python/lib/xml/etree/ElementTree.hx b/std/python/lib/xml/etree/ElementTree.hx
index 9f94198894668f4287897a5ffeb941db16dba86e..9e258cdefd68fa39b1b10a4dd661cef3b401a364 100644
--- a/std/python/lib/xml/etree/ElementTree.hx
+++ b/std/python/lib/xml/etree/ElementTree.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,49 +19,43 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package python.lib.xml.etree;
 
 import python.Tuple.Tuple2;
-
 import python.NativeIterable;
 import python.NativeIterator;
 import python.Dict;
 
-extern class XMLParser {
-
-}
+extern class XMLParser {}
 
 @:pythonImport("xml.etree.ElementTree", "Element")
 extern class Element {
-	public function getroot ():ElementTree;
+	public function getroot():ElementTree;
 	public var tag:String;
-	public var attrib : Dict<String, String>;
+	public var attrib:Dict<String, String>;
 	public var text:Null<String>;
 
+	public function get<T>(key:String, def:T = null):T;
+	public function set(key:String, val:String):Void;
 
-	public function get <T>(key:String, def:T = null):T;
-	public function set (key:String, val:String):Void;
+	public function copy():Element;
 
-	public function copy ():Element;
+	public function keys():Array<String>;
+	public function items():Array<Tuple2<String, String>>;
 
-	public function keys ():Array<String>;
-	public function items ():Array<Tuple2<String, String>>;
-
-	public function iter (tag:String):NativeIterable<Element>;
-	public function iterfind (tag:String, namespaces:Dict<String,String> = null):NativeIterator<Element>;
-	public function find (match:String, namespaces:Dict<String,String> = null):Null<Element>;
-	public function findall (match:String, namespaces:Dict<String,String> = null):Array<Element>;
+	public function iter(tag:String):NativeIterable<Element>;
+	public function iterfind(tag:String, namespaces:Dict<String, String> = null):NativeIterator<Element>;
+	public function find(match:String, namespaces:Dict<String, String> = null):Null<Element>;
+	public function findall(match:String, namespaces:Dict<String, String> = null):Array<Element>;
 }
 
 @:pythonImport("xml.etree.ElementTree")
 extern class ElementTree {
-
-
-
 	public static function XML(text:String, ?parser:XMLParser):Element;
 	public static function parse(xml:String):ElementTree;
 
-	public function iter (tag:String):NativeIterable<Element>;
-	public function find (match:String, namespaces:Dict<String,String> = null):Null<Element>;
-	public function getroot ():Element;
+	public function iter(tag:String):NativeIterable<Element>;
+	public function find(match:String, namespaces:Dict<String, String> = null):Null<Element>;
+	public function getroot():Element;
 }
diff --git a/std/python/net/SslSocket.hx b/std/python/net/SslSocket.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2ff8ed55659670322f8b93b04f99c6fadd6e8b76
--- /dev/null
+++ b/std/python/net/SslSocket.hx
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C)2005-2019 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 python.net;
+
+import python.lib.Ssl;
+import python.lib.ssl.Purpose;
+import python.lib.socket.Socket as PSocket;
+import sys.net.Host;
+
+class SslSocket extends sys.net.Socket {
+	var hostName:String;
+
+	override function __initSocket():Void {
+		#if (python_version >= 3.4)
+		var context = Ssl.create_default_context(Purpose.SERVER_AUTH);
+		#else
+		// hopefully these options are good enough
+		var context = new python.lib.ssl.SSLContext(Ssl.PROTOCOL_SSLv23);
+		context.verify_mode = Ssl.CERT_REQUIRED;
+		context.set_default_verify_paths();
+		context.options |= Ssl.OP_NO_SSLv2;
+		context.options |= Ssl.OP_NO_SSLv3;
+		context.options |= Ssl.OP_NO_COMPRESSION;
+		#end
+		context.options |= Ssl.OP_NO_TLSv1 #if (python_version >= 3.4) | Ssl.OP_NO_TLSv1_1 #end; // python 3.4 | Ssl.OP_NO_TLSv1_1;
+		__s = new PSocket();
+		__s = context.wrap_socket(__s, false, true, true, this.hostName);
+	}
+
+	public override function connect(host:Host, port:Int):Void {
+		this.hostName = host.host;
+		super.connect(host, port);
+	}
+
+	public override function bind(host:Host, port:Int):Void {
+		throw "not implemented";
+	}
+}
diff --git a/std/sys/FileStat.hx b/std/sys/FileStat.hx
index 2acff82596c935d304b4f6a7d32e574be933b710..7794282c4a119b074007050d2c550af8d1a6e1e4 100644
--- a/std/sys/FileStat.hx
+++ b/std/sys/FileStat.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,65 +19,65 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys;
 
 /**
 	File information, as given by `sys.FileSystem.stat`.
 **/
 typedef FileStat = {
-
 	/**
-		The user group id for the file's owner.
+		The user group id for the file owner.
 	**/
-	var gid : Int;
+	var gid:Int;
 
 	/** 
-		The user id for the file's owner.
+		The user id for the file owner.
 	**/
-	var uid : Int;
+	var uid:Int;
 
 	/** 
 		The last access time for the file (when enabled by the file system).
 	**/
-	var atime : Date;
+	var atime:Date;
 
 	/** 
 		The last modification time for the file.
 	**/
-	var mtime : Date;
+	var mtime:Date;
 
 	/**
 		The creation time for the file (not all file systems support this).
 	**/
-	var ctime : Date;
+	var ctime:Date;
 
 	/** 
-		The size of the file, in bytes. 
+		The size of the file, in bytes.
 	**/
-	var size : Int;
+	var size:Int;
 
 	/** 
 		The device on which stat resides.
 	**/
-	var dev : Int;
+	var dev:Int;
 
 	/** 
 		The inode number for stat.
 	**/
-	var ino : Int;
+	var ino:Int;
 
 	/** 
 		The number of hard links to stat.
 	**/
-	var nlink : Int;
+	var nlink:Int;
 
 	/** 
 		The device type on which stat resides (special files only).
 	**/
-	var rdev : Int;
+	var rdev:Int;
 
 	/** 
 		The permission bits of stat. The meaning of the bits is platform dependent.
 	**/
-	var mode : Int;
+	var mode:Int;
 }
diff --git a/std/sys/FileSystem.hx b/std/sys/FileSystem.hx
index d95e23b76aab0ea2a951ba15049fe477d7027119..028a472816bb65d388dd02bab47bf26b5b19b367 100644
--- a/std/sys/FileSystem.hx
+++ b/std/sys/FileSystem.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,68 +19,58 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys;
 
 /**
-	This class allows you to get information about the files and directories.
+	This class provides information about files and directories.
+
+	If `null` is passed as a file path to any function in this class, the
+	result is unspecified, and may differ from target to target.
 
 	See `sys.io.File` for the complementary file API.
 **/
 extern class FileSystem {
-
 	/**
-		Tells if the file or directory specified by `path` exists.
-
-		If `path` is null, the result is unspecified.
+		Returns `true` if the file or directory specified by `path` exists.
 	**/
-	static function exists( path : String ) : Bool;
+	static function exists(path:String):Bool;
 
 	/**
 		Renames/moves the file or directory specified by `path` to `newPath`.
 
 		If `path` is not a valid file system entry, or if it is not accessible,
 		or if `newPath` is not accessible, an exception is thrown.
-
-		If `path` or `newPath` are null, the result is unspecified.
 	**/
-	static function rename( path : String, newPath : String ) : Void;
+	static function rename(path:String, newPath:String):Void;
 
 	/**
-		Returns `FileStat` information on the file or directory specified by
+		Returns `FileStat` information for the file or directory specified by
 		`path`.
-
-		If `path` is null, the result is unspecified.
 	**/
-	static function stat( path : String ) : FileStat;
+	static function stat(path:String):FileStat;
 
 	/**
 		Returns the full path of the file or directory specified by `relPath`,
 		which is relative to the current working directory. Symlinks will be
 		followed and the path will be normalized.
-
-		If `relPath` is null, the result is unspecified.
 	**/
-	static function fullPath( relPath : String ) : String;
+	static function fullPath(relPath:String):String;
 
 	/**
 		Returns the full path of the file or directory specified by `relPath`,
 		which is relative to the current working directory. The path doesn't
 		have to exist.
-
-		If `relPath` is null, the result is unspecified.
 	**/
-	//@:require(haxe_ver >= 3.2)
-	static function absolutePath( relPath : String ) : String;
+	static function absolutePath(relPath:String):String;
 
 	/**
-		Tells if the file or directory specified by `path` is a directory.
+		Returns `true` if the file or directory specified by `path` is a directory.
 
 		If `path` is not a valid file system entry or if its destination is not
 		accessible, an exception is thrown.
-
-		If `path` is null, the result is unspecified.
 	**/
-	static function isDirectory( path : String ) : Bool;
+	static function isDirectory(path:String):Bool;
 
 	/**
 		Creates a directory specified by `path`.
@@ -88,39 +78,31 @@ extern class FileSystem {
 		This method is recursive: The parent directories don't have to exist.
 
 		If the directory cannot be created, an exception is thrown.
-
-		If `path` is null, the result is unspecified.
 	**/
-	static function createDirectory( path : String ) : Void;
+	static function createDirectory(path:String):Void;
 
 	/**
 		Deletes the file specified by `path`.
 
 		If `path` does not denote a valid file, or if that file cannot be
 		deleted, an exception is thrown.
-
-		If `path` is null, the result is unspecified.
 	**/
-	static function deleteFile( path : String ) : Void;
+	static function deleteFile(path:String):Void;
 
 	/**
-		Deletes the directory specified by `path`.
+		Deletes the directory specified by `path`. Only empty directories can
+		be deleted.
 
 		If `path` does not denote a valid directory, or if that directory cannot
 		be deleted, an exception is thrown.
-
-		If `path` is null, the result is unspecified.
 	**/
-	static function deleteDirectory( path : String ) : Void;
+	static function deleteDirectory(path:String):Void;
 
 	/**
 		Returns the names of all files and directories in the directory specified
-		by `path`.
+		by `path`. `"."` and `".."` are not included in the output.
 
 		If `path` does not denote a valid directory, an exception is thrown.
-
-		If `path` is null, the result is unspecified.
 	**/
-	static function readDirectory( path : String ) : Array<String>;
-
+	static function readDirectory(path:String):Array<String>;
 }
diff --git a/std/sys/Http.hx b/std/sys/Http.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8e6ac9f27b83a1628f00520ee929f564d421b4da
--- /dev/null
+++ b/std/sys/Http.hx
@@ -0,0 +1,498 @@
+/*
+ * Copyright (C)2005-2019 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 sys;
+
+import haxe.io.BytesOutput;
+import haxe.io.Bytes;
+import haxe.io.Input;
+import sys.net.Host;
+import sys.net.Socket;
+
+class Http extends haxe.http.HttpBase {
+	public var noShutdown:Bool;
+	public var cnxTimeout:Float;
+	public var responseHeaders:Map<String, String>;
+
+	var chunk_size:Null<Int>;
+	var chunk_buf:haxe.io.Bytes;
+	var file:{
+		param:String,
+		filename:String,
+		io:haxe.io.Input,
+		size:Int,
+		mimeType:String
+	};
+
+	public static var PROXY:{host:String, port:Int, auth:{user:String, pass:String}} = null;
+
+	public function new(url:String) {
+		cnxTimeout = 10;
+		#if php
+		noShutdown = !php.Global.function_exists('stream_socket_shutdown');
+		#end
+		super(url);
+	}
+
+	public override function request(?post:Bool) {
+		var output = new haxe.io.BytesOutput();
+		var old = onError;
+		var err = false;
+		onError = function(e) {
+			responseBytes = output.getBytes();
+			err = true;
+			// Resetting back onError before calling it allows for a second "retry" request to be sent without onError being wrapped twice
+			onError = old;
+			onError(e);
+		}
+		post = post || postBytes != null || postData != null;
+		customRequest(post, output);
+		if (!err) {
+			success(output.getBytes());
+		}
+	}
+
+	@:noCompletion
+	@:deprecated("Use fileTransfer instead")
+	inline public function fileTransfert(argname:String, filename:String, file:haxe.io.Input, size:Int, mimeType = "application/octet-stream") {
+		fileTransfer(argname, filename, file, size, mimeType);
+	}
+
+	public function fileTransfer(argname:String, filename:String, file:haxe.io.Input, size:Int, mimeType = "application/octet-stream") {
+		this.file = {
+			param: argname,
+			filename: filename,
+			io: file,
+			size: size,
+			mimeType: mimeType
+		};
+	}
+
+	public function customRequest(post:Bool, api:haxe.io.Output, ?sock:sys.net.Socket, ?method:String) {
+		this.responseAsString = null;
+		this.responseBytes = null;
+		var url_regexp = ~/^(https?:\/\/)?([a-zA-Z\.0-9_-]+)(:[0-9]+)?(.*)$/;
+		if (!url_regexp.match(url)) {
+			onError("Invalid URL");
+			return;
+		}
+		var secure = (url_regexp.matched(1) == "https://");
+		if (sock == null) {
+			if (secure) {
+				#if php
+				sock = new php.net.SslSocket();
+				#elseif java
+				sock = new java.net.SslSocket();
+				#elseif python
+				sock = new python.net.SslSocket();
+				#elseif (!no_ssl && (hxssl || hl || cpp || (neko && !(macro || interp))))
+				sock = new sys.ssl.Socket();
+				#else
+				throw "Https is only supported with -lib hxssl";
+				#end
+			} else {
+				sock = new Socket();
+			}
+			sock.setTimeout(cnxTimeout);
+		}
+		var host = url_regexp.matched(2);
+		var portString = url_regexp.matched(3);
+		var request = url_regexp.matched(4);
+		// ensure path begins with a forward slash
+		// this is required by original URL specifications and many servers have issues if it's not supplied
+		// see https://stackoverflow.com/questions/1617058/ok-to-skip-slash-before-query-string
+		if (request.charAt(0) != "/") {
+			request = "/" + request;
+		}
+		var port = if (portString == null || portString == "") secure ? 443 : 80 else Std.parseInt(portString.substr(1, portString.length - 1));
+
+		var multipart = (file != null);
+		var boundary = null;
+		var uri = null;
+		if (multipart) {
+			post = true;
+			boundary = Std.string(Std.random(1000))
+				+ Std.string(Std.random(1000))
+				+ Std.string(Std.random(1000))
+				+ Std.string(Std.random(1000));
+			while (boundary.length < 38)
+				boundary = "-" + boundary;
+			var b = new StringBuf();
+			for (p in params) {
+				b.add("--");
+				b.add(boundary);
+				b.add("\r\n");
+				b.add('Content-Disposition: form-data; name="');
+				b.add(p.name);
+				b.add('"');
+				b.add("\r\n");
+				b.add("\r\n");
+				b.add(p.value);
+				b.add("\r\n");
+			}
+			b.add("--");
+			b.add(boundary);
+			b.add("\r\n");
+			b.add('Content-Disposition: form-data; name="');
+			b.add(file.param);
+			b.add('"; filename="');
+			b.add(file.filename);
+			b.add('"');
+			b.add("\r\n");
+			b.add("Content-Type: " + file.mimeType + "\r\n" + "\r\n");
+			uri = b.toString();
+		} else {
+			for (p in params) {
+				if (uri == null)
+					uri = "";
+				else
+					uri += "&";
+				uri += StringTools.urlEncode(p.name) + "=" + StringTools.urlEncode('${p.value}');
+			}
+		}
+
+		var b = new BytesOutput();
+		if (method != null) {
+			b.writeString(method);
+			b.writeString(" ");
+		} else if (post)
+			b.writeString("POST ");
+		else
+			b.writeString("GET ");
+
+		if (Http.PROXY != null) {
+			b.writeString("http://");
+			b.writeString(host);
+			if (port != 80) {
+				b.writeString(":");
+				b.writeString('$port');
+			}
+		}
+		b.writeString(request);
+
+		if (!post && uri != null) {
+			if (request.indexOf("?", 0) >= 0)
+				b.writeString("&");
+			else
+				b.writeString("?");
+			b.writeString(uri);
+		}
+		b.writeString(" HTTP/1.1\r\nHost: " + host + "\r\n");
+		if (postData != null) {
+			postBytes = Bytes.ofString(postData);
+			postData = null;
+		}
+		if (postBytes != null)
+			b.writeString("Content-Length: " + postBytes.length + "\r\n");
+		else if (post && uri != null) {
+			if (multipart || !Lambda.exists(headers, function(h) return h.name == "Content-Type")) {
+				b.writeString("Content-Type: ");
+				if (multipart) {
+					b.writeString("multipart/form-data");
+					b.writeString("; boundary=");
+					b.writeString(boundary);
+				} else
+					b.writeString("application/x-www-form-urlencoded");
+				b.writeString("\r\n");
+			}
+			if (multipart)
+				b.writeString("Content-Length: " + (uri.length + file.size + boundary.length + 6) + "\r\n");
+			else
+				b.writeString("Content-Length: " + uri.length + "\r\n");
+		}
+		b.writeString("Connection: close\r\n");
+		for (h in headers) {
+			b.writeString(h.name);
+			b.writeString(": ");
+			b.writeString(h.value);
+			b.writeString("\r\n");
+		}
+		b.writeString("\r\n");
+		if (postBytes != null)
+			b.writeFullBytes(postBytes, 0, postBytes.length);
+		else if (post && uri != null)
+			b.writeString(uri);
+		try {
+			if (Http.PROXY != null)
+				sock.connect(new Host(Http.PROXY.host), Http.PROXY.port);
+			else
+				sock.connect(new Host(host), port);
+			if (multipart)
+				writeBody(b,file.io,file.size,boundary,sock)
+			else
+				writeBody(b,null,0,null,sock);
+			readHttpResponse(api, sock);
+			sock.close();
+		} catch (e:Dynamic) {
+			try
+				sock.close()
+			catch (e:Dynamic) {};
+			onError(Std.string(e));
+		}
+	}
+
+	function writeBody(body:Null<BytesOutput>, fileInput:Null<Input>, fileSize:Int, boundary:Null<String>, sock:Socket) {
+		if (body != null) {
+			var bytes = body.getBytes();
+			sock.output.writeFullBytes(bytes, 0, bytes.length);
+		}
+		if (boundary != null) {
+			var bufsize = 4096;
+			var buf = haxe.io.Bytes.alloc(bufsize);
+			while (fileSize > 0) {
+				var size = if (fileSize > bufsize) bufsize else fileSize;
+				var len = 0;
+				try {
+					len = fileInput.readBytes(buf, 0, size);
+				} catch (e:haxe.io.Eof)
+					break;
+				sock.output.writeFullBytes(buf, 0, len);
+				fileSize -= len;
+			}
+			sock.output.writeString("\r\n");
+			sock.output.writeString("--");
+			sock.output.writeString(boundary);
+			sock.output.writeString("--");
+		}
+	}
+
+	function readHttpResponse(api:haxe.io.Output, sock:sys.net.Socket) {
+		// READ the HTTP header (until \r\n\r\n)
+		var b = new haxe.io.BytesBuffer();
+		var k = 4;
+		var s = haxe.io.Bytes.alloc(4);
+		sock.setTimeout(cnxTimeout);
+		while (true) {
+			var p = sock.input.readBytes(s, 0, k);
+			while (p != k)
+				p += sock.input.readBytes(s, p, k - p);
+			b.addBytes(s, 0, k);
+			switch (k) {
+				case 1:
+					var c = s.get(0);
+					if (c == 10)
+						break;
+					if (c == 13)
+						k = 3;
+					else
+						k = 4;
+				case 2:
+					var c = s.get(1);
+					if (c == 10) {
+						if (s.get(0) == 13)
+							break;
+						k = 4;
+					} else if (c == 13)
+						k = 3;
+					else
+						k = 4;
+				case 3:
+					var c = s.get(2);
+					if (c == 10) {
+						if (s.get(1) != 13)
+							k = 4;
+						else if (s.get(0) != 10)
+							k = 2;
+						else
+							break;
+					} else if (c == 13) {
+						if (s.get(1) != 10 || s.get(0) != 13)
+							k = 1;
+						else
+							k = 3;
+					} else
+						k = 4;
+				case 4:
+					var c = s.get(3);
+					if (c == 10) {
+						if (s.get(2) != 13)
+							continue;
+						else if (s.get(1) != 10 || s.get(0) != 13)
+							k = 2;
+						else
+							break;
+					} else if (c == 13) {
+						if (s.get(2) != 10 || s.get(1) != 13)
+							k = 3;
+						else
+							k = 1;
+					}
+			}
+		}
+		#if neko
+		var headers = neko.Lib.stringReference(b.getBytes()).split("\r\n");
+		#else
+		var headers = b.getBytes().toString().split("\r\n");
+		#end
+		var response = headers.shift();
+		var rp = response.split(" ");
+		var status = Std.parseInt(rp[1]);
+		if (status == 0 || status == null)
+			throw "Response status error";
+
+		// remove the two lasts \r\n\r\n
+		headers.pop();
+		headers.pop();
+		responseHeaders = new haxe.ds.StringMap();
+		var size = null;
+		var chunked = false;
+		for (hline in headers) {
+			var a = hline.split(": ");
+			var hname = a.shift();
+			var hval = if (a.length == 1) a[0] else a.join(": ");
+			hval = StringTools.ltrim(StringTools.rtrim(hval));
+			responseHeaders.set(hname, hval);
+			switch (hname.toLowerCase()) {
+				case "content-length":
+					size = Std.parseInt(hval);
+				case "transfer-encoding":
+					chunked = (hval.toLowerCase() == "chunked");
+			}
+		}
+
+		onStatus(status);
+
+		var chunk_re = ~/^([0-9A-Fa-f]+)[ ]*\r\n/m;
+		chunk_size = null;
+		chunk_buf = null;
+
+		var bufsize = 1024;
+		var buf = haxe.io.Bytes.alloc(bufsize);
+		if (chunked) {
+			try {
+				while (true) {
+					var len = sock.input.readBytes(buf, 0, bufsize);
+					if (!readChunk(chunk_re, api, buf, len))
+						break;
+				}
+			} catch (e:haxe.io.Eof) {
+				throw "Transfer aborted";
+			}
+		} else if (size == null) {
+			if (!noShutdown)
+				sock.shutdown(false, true);
+			try {
+				while (true) {
+					var len = sock.input.readBytes(buf, 0, bufsize);
+					if (len == 0)
+						break;
+					api.writeBytes(buf, 0, len);
+				}
+			} catch (e:haxe.io.Eof) {}
+		} else {
+			api.prepare(size);
+			try {
+				while (size > 0) {
+					var len = sock.input.readBytes(buf, 0, if (size > bufsize) bufsize else size);
+					api.writeBytes(buf, 0, len);
+					size -= len;
+				}
+			} catch (e:haxe.io.Eof) {
+				throw "Transfer aborted";
+			}
+		}
+		if (chunked && (chunk_size != null || chunk_buf != null))
+			throw "Invalid chunk";
+		if (status < 200 || status >= 400)
+			throw "Http Error #" + status;
+		api.close();
+	}
+
+	function readChunk(chunk_re:EReg, api:haxe.io.Output, buf:haxe.io.Bytes, len) {
+		if (chunk_size == null) {
+			if (chunk_buf != null) {
+				var b = new haxe.io.BytesBuffer();
+				b.add(chunk_buf);
+				b.addBytes(buf, 0, len);
+				buf = b.getBytes();
+				len += chunk_buf.length;
+				chunk_buf = null;
+			}
+			#if neko
+			if (chunk_re.match(neko.Lib.stringReference(buf))) {
+			#else
+			if (chunk_re.match(buf.toString())) {
+			#end
+				var p = chunk_re.matchedPos();
+				if (p.len <= len) {
+					var cstr = chunk_re.matched(1);
+					chunk_size = Std.parseInt("0x" + cstr);
+					if (chunk_size == 0) {
+						chunk_size = null;
+						chunk_buf = null;
+						return false;
+					}
+					len -= p.len;
+					return readChunk(chunk_re, api, buf.sub(p.len, len), len);
+				}
+			}
+			// prevent buffer accumulation
+			if (len > 10) {
+				onError("Invalid chunk");
+				return false;
+			}
+			chunk_buf = buf.sub(0, len);
+			return true;
+		}
+
+		if (chunk_size > len) {
+			chunk_size -= len;
+			api.writeBytes(buf, 0, len);
+			return true;
+		}
+		var end = chunk_size + 2;
+		if (len >= end) {
+			if (chunk_size > 0)
+				api.writeBytes(buf, 0, chunk_size);
+			len -= end;
+			chunk_size = null;
+			if (len == 0)
+				return true;
+			return readChunk(chunk_re, api, buf.sub(end, len), len);
+		}
+		if (chunk_size > 0)
+			api.writeBytes(buf, 0, chunk_size);
+		chunk_size -= len;
+		return true;
+	}
+
+	/**
+		Makes a synchronous request to `url`.
+
+		This creates a new Http instance and makes a GET request by calling its
+		`request(false)` method.
+
+		If `url` is null, the result is unspecified.
+	**/
+	public static function requestUrl(url:String):String {
+		var h = new Http(url);
+		var r = null;
+		h.onData = function(d) {
+			r = d;
+		}
+		h.onError = function(e) {
+			throw e;
+		}
+		h.request(false);
+		return r;
+	}
+}
diff --git a/std/sys/db/Connection.hx b/std/sys/db/Connection.hx
index b9063579e7bf615674cf05fda25cae69c3f31d63..d7331f5d5a42b53c6aba3c06709b0aa81d985105 100644
--- a/std/sys/db/Connection.hx
+++ b/std/sys/db/Connection.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,19 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
 interface Connection {
-
-	function request( s : String ) : ResultSet;
-	function close() : Void;
-	function escape( s : String ) : String;
-	function quote( s : String ) : String;
-	function addValue( s : StringBuf, v : Dynamic ) : Void;
-	function lastInsertId() : Int;
-	function dbName() : String;
-	function startTransaction() : Void;
-	function commit() : Void;
-	function rollback() : Void;
-
+	function request(s:String):ResultSet;
+	function close():Void;
+	function escape(s:String):String;
+	function quote(s:String):String;
+	function addValue(s:StringBuf, v:Dynamic):Void;
+	function lastInsertId():Int;
+	function dbName():String;
+	function startTransaction():Void;
+	function commit():Void;
+	function rollback():Void;
 }
diff --git a/std/sys/db/Manager.hx b/std/sys/db/Manager.hx
deleted file mode 100644
index 526e160f429deab9d75e6c264030019d1a81a930..0000000000000000000000000000000000000000
--- a/std/sys/db/Manager.hx
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.db;
-import Reflect;
-import sys.db.Connection;
-import sys.db.RecordInfos;
-
-/**
-	Record Manager : the persistent object database manager. See the tutorial on
-	Haxe website to learn how to use Record.
-**/
-#if !macro @:build(sys.db.RecordMacros.addRtti()) #end
-@:deprecated("This class will be removed soon, please install the record-macros library")
-class Manager<T : Object> {
-
-	/* ----------------------------- STATICS ------------------------------ */
-	public static var cnx(default, set) : Connection;
-	public static var lockMode : String;
-
-	private static inline var cache_field = "__cache__";
-
-	private static var object_cache : haxe.ds.StringMap<Object> = new haxe.ds.StringMap();
-	private static var init_list : List<Manager<Dynamic>> = new List();
-
-	private static var KEYWORDS = {
-		var h = new haxe.ds.StringMap();
-		for( k in "ADD|ALL|ALTER|ANALYZE|AND|AS|ASC|ASENSITIVE|BEFORE|BETWEEN|BIGINT|BINARY|BLOB|BOTH|BY|CALL|CASCADE|CASE|CHANGE|CHAR|CHARACTER|CHECK|COLLATE|COLUMN|CONDITION|CONSTRAINT|CONTINUE|CONVERT|CREATE|CROSS|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURSOR|DATABASE|DATABASES|DAY_HOUR|DAY_MICROSECOND|DAY_MINUTE|DAY_SECOND|DEC|DECIMAL|DECLARE|DEFAULT|DELAYED|DELETE|DESC|DESCRIBE|DETERMINISTIC|DISTINCT|DISTINCTROW|DIV|DOUBLE|DROP|DUAL|EACH|ELSE|ELSEIF|ENCLOSED|ESCAPED|EXISTS|EXIT|EXPLAIN|FALSE|FETCH|FLOAT|FLOAT4|FLOAT8|FOR|FORCE|FOREIGN|FROM|FULLTEXT|GRANT|GROUP|HAVING|HIGH_PRIORITY|HOUR_MICROSECOND|HOUR_MINUTE|HOUR_SECOND|IF|IGNORE|IN|INDEX|INFILE|INNER|INOUT|INSENSITIVE|INSERT|INT|INT1|INT2|INT3|INT4|INT8|INTEGER|INTERVAL|INTO|IS|ITERATE|JOIN|KEY|KEYS|KILL|LEADING|LEAVE|LEFT|LIKE|LIMIT|LINES|LOAD|LOCALTIME|LOCALTIMESTAMP|LOCK|LONG|LONGBLOB|LONGTEXT|LOOP|LOW_PRIORITY|MATCH|MEDIUMBLOB|MEDIUMINT|MEDIUMTEXT|MIDDLEINT|MINUTE_MICROSECOND|MINUTE_SECOND|MOD|MODIFIES|NATURAL|NOT|NO_WRITE_TO_BINLOG|NULL|NUMERIC|ON|OPTIMIZE|OPTION|OPTIONALLY|OR|ORDER|OUT|OUTER|OUTFILE|PRECISION|PRIMARY|PROCEDURE|PURGE|READ|READS|REAL|REFERENCES|REGEXP|RELEASE|RENAME|REPEAT|REPLACE|REQUIRE|RESTRICT|RETURN|REVOKE|RIGHT|RLIKE|SCHEMA|SCHEMAS|SECOND_MICROSECOND|SELECT|SENSITIVE|SEPARATOR|SET|SHOW|SMALLINT|SONAME|SPATIAL|SPECIFIC|SQL|SQLEXCEPTION|SQLSTATE|SQLWARNING|SQL_BIG_RESULT|SQL_CALC_FOUND_ROWS|SQL_SMALL_RESULT|SSL|STARTING|STRAIGHT_JOIN|TABLE|TERMINATED|THEN|TINYBLOB|TINYINT|TINYTEXT|TO|TRAILING|TRIGGER|TRUE|UNDO|UNION|UNIQUE|UNLOCK|UNSIGNED|UPDATE|USAGE|USE|USING|UTC_DATE|UTC_TIME|UTC_TIMESTAMP|VALUES|VARBINARY|VARCHAR|VARCHARACTER|VARYING|WHEN|WHERE|WHILE|WITH|WRITE|XOR|YEAR_MONTH|ZEROFILL|ASENSITIVE|CALL|CONDITION|CONNECTION|CONTINUE|CURSOR|DECLARE|DETERMINISTIC|EACH|ELSEIF|EXIT|FETCH|GOTO|INOUT|INSENSITIVE|ITERATE|LABEL|LEAVE|LOOP|MODIFIES|OUT|READS|RELEASE|REPEAT|RETURN|SCHEMA|SCHEMAS|SENSITIVE|SPECIFIC|SQL|SQLEXCEPTION|SQLSTATE|SQLWARNING|TRIGGER|UNDO|UPGRADE|WHILE".split("|") )
-			h.set(k.toLowerCase(),true);
-		h;
-	}
-
-	private static function set_cnx( c : Connection ) {
-		cnx = c;
-		lockMode = (c != null && c.dbName() == "MySQL") ? " FOR UPDATE" : "";
-		return c;
-	}
-
-	/* ---------------------------- BASIC API ----------------------------- */
-
-	var table_infos : RecordInfos;
-	var table_name : String;
-	var table_keys : Array<String>;
-	var class_proto : { prototype : Dynamic };
-
-	public function new( classval : Class<T> ) {
-		var m : Array<Dynamic> = haxe.rtti.Meta.getType(classval).rtti;
-		if( m == null ) throw "Missing @rtti for class " + Type.getClassName(classval);
-		table_infos = haxe.Unserializer.run(m[0]);
-		table_name = quoteField(table_infos.name);
-		table_keys = table_infos.key;
-		// set the manager and ready for further init
-		class_proto = cast classval;
-		#if neko
-		class_proto.prototype._manager = this;
-		init_list.add(this);
-		#end
-	}
-
-	public function all( ?lock: Bool ) : List<T> {
-		return unsafeObjects("SELECT * FROM " + table_name,lock);
-	}
-
-	public macro function get(ethis,id,?lock:haxe.macro.Expr.ExprOf<Bool>) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprOf<T> #end {
-		return RecordMacros.macroGet(ethis,id,lock);
-	}
-
-	public macro function select(ethis, cond, ?options, ?lock:haxe.macro.Expr.ExprOf<Bool>) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprOf<T> #end {
-		return RecordMacros.macroSearch(ethis, cond, options, lock, true);
-	}
-
-	public macro function search(ethis, cond, ?options, ?lock:haxe.macro.Expr.ExprOf<Bool>) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprOf<List<T>> #end {
-		return RecordMacros.macroSearch(ethis, cond, options, lock);
-	}
-
-	public macro function count(ethis, cond) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprOf<Int> #end {
-		return RecordMacros.macroCount(ethis, cond);
-	}
-
-	public macro function delete(ethis, cond, ?options) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprOf<Void> #end {
-		return RecordMacros.macroDelete(ethis, cond, options);
-	}
-
-	public function dynamicSearch( x : {}, ?lock : Bool ) : List<T> {
-		var s = new StringBuf();
-		s.add("SELECT * FROM ");
-		s.add(table_name);
-		s.add(" WHERE ");
-		addCondition(s,x);
-		return unsafeObjects(s.toString(),lock);
-	}
-
-	function quote( s : String ) : String {
-		return getCnx().quote( s );
-	}
-
-	/* -------------------------- RECORDOBJECT API -------------------------- */
-
-	function doUpdateCache( x : T, name : String, v : Dynamic ) {
-		var cache : { v : Dynamic } = Reflect.field(x, "cache_" + name);
-		// if the cache has not been fetched (for instance if the field was set by reflection)
-		// then we directly use the new value
-		if( cache == null )
-			return v;
-		var v = doSerialize(name, cache.v);
-		// don't set it since the value might change again later
-		// Reflect.setField(x, name, v);
-		return v;
-	}
-
-	static function getFieldName(field:RecordField):String
-	{
-		return switch (field.t) {
-			case DData | DEnum(_):
-				"data_" + field.name;
-			case _:
-				field.name;
-		}
-	}
-
-	function doInsert( x : T ) {
-		unmake(x);
-		var s = new StringBuf();
-		var fields = new List();
-		var values = new List();
-		var cache = Reflect.field(x,cache_field);
-		if (cache == null)
-		{
-			Reflect.setField(x,cache_field,cache = {});
-		}
-
-		for( f in table_infos.fields ) {
-			var name = f.name,
-			    fieldName = getFieldName(f);
-			var v:Dynamic = Reflect.field(x,fieldName);
-			if( v != null ) {
-				fields.add(quoteField(name));
-				switch( f.t ) {
-				case DData: v = doUpdateCache(x, name, v);
-				default:
-				}
-				values.add(v);
-			} else if( !f.isNull ) {
-				// if the field is not defined, give it a default value on insert
-				switch( f.t ) {
-				case DUInt, DTinyInt, DInt, DSingle, DFloat, DFlags(_), DBigInt, DTinyUInt, DSmallInt, DSmallUInt, DMediumInt, DMediumUInt, DEnum(_):
-					Reflect.setField(x, fieldName, 0);
-				case DBool:
-					Reflect.setField(x, fieldName, false);
-				case DTinyText, DText, DString(_), DSmallText, DSerialized:
-					Reflect.setField(x, fieldName, "");
-				case DSmallBinary, DNekoSerialized, DLongBinary, DBytes(_), DBinary:
-					Reflect.setField(x, fieldName, haxe.io.Bytes.alloc(0));
-				case DDate, DDateTime, DTimeStamp:
-					// default date might depend on database
-				case DId, DUId, DBigId, DNull, DInterval, DEncoded, DData:
-					// no default value for these
-				}
-			}
-
-			Reflect.setField(cache, name, v);
-		}
-		s.add("INSERT INTO ");
-		s.add(table_name);
-		if (fields.length > 0 || cnx.dbName() != "SQLite")
-		{
-			s.add(" (");
-			s.add(fields.join(","));
-			s.add(") VALUES (");
-			var first = true;
-			for( v in values ) {
-				if( first )
-					first = false;
-				else
-					s.add(", ");
-				getCnx().addValue(s,v);
-			}
-			s.add(")");
-		} else {
-			s.add(" DEFAULT VALUES");
-		}
-		unsafeExecute(s.toString());
-		untyped x._lock = true;
-		// table with one key not defined : suppose autoincrement
-		if( table_keys.length == 1 && Reflect.field(x,table_keys[0]) == null )
-			Reflect.setField(x,table_keys[0],getCnx().lastInsertId());
-		addToCache(x);
-	}
-
-	inline function isBinary( t : RecordInfos.RecordType ) {
-		return switch( t ) {
-			case DSmallBinary, DNekoSerialized, DLongBinary, DBytes(_), DBinary: true;
-			//case DData: true // -- disabled for implementation purposes
-			default: false;
-		};
-	}
-
-	inline function hasBinaryChanged( a : haxe.io.Bytes, b : haxe.io.Bytes ) {
-		return a != b && (a == null || b == null || a.compare(b) != 0);
-	}
-
-	function doUpdate( x : T ) {
-		if( untyped !x._lock )
-			throw "Cannot update a not locked object";
-		var upd = getUpdateStatement(x);
-		if (upd == null) return;
-		unsafeExecute(upd);
-	}
-
-	function getUpdateStatement( x : T ):Null<String>
-	{
-		unmake(x);
-		var s = new StringBuf();
-		s.add("UPDATE ");
-		s.add(table_name);
-		s.add(" SET ");
-		var cache = Reflect.field(x,cache_field);
-		var mod = false;
-		for( f in table_infos.fields ) {
-			if (table_keys.indexOf(f.name) >= 0)
-				continue;
-			var name = f.name,
-			    fieldName = getFieldName(f);
-			var v : Dynamic = Reflect.field(x,fieldName);
-			var vc : Dynamic = Reflect.field(cache,name);
-			if( cache == null || v != vc ) {
-				switch( f.t ) {
-				case DSmallBinary, DNekoSerialized, DLongBinary, DBytes(_), DBinary:
-					if ( !hasBinaryChanged(v,vc) )
-						continue;
-				case DData:
-					v = doUpdateCache(x, name, v);
-					if( !hasBinaryChanged(v,vc) )
-						continue;
-				default:
-				}
-				if( mod )
-					s.add(", ");
-				else
-					mod = true;
-				s.add(quoteField(name));
-				s.add(" = ");
-				getCnx().addValue(s,v);
-				if ( cache != null )
-					Reflect.setField(cache,name,v);
-			}
-		}
-		if( !mod )
-			return null;
-		s.add(" WHERE ");
-		addKeys(s,x);
-		return s.toString();
-	}
-
-	function doDelete( x : T ) {
-		var s = new StringBuf();
-		s.add("DELETE FROM ");
-		s.add(table_name);
-		s.add(" WHERE ");
-		addKeys(s,x);
-		unsafeExecute(s.toString());
-		removeFromCache(x);
-	}
-
-	function doLock( i : T ) {
-		if( untyped i._lock )
-			return;
-		var s = new StringBuf();
-		s.add("SELECT * FROM ");
-		s.add(table_name);
-		s.add(" WHERE ");
-		addKeys(s, i);
-		// will force sync
-		if( unsafeObject(s.toString(),true) != i )
-			throw "Could not lock object (was deleted ?); try restarting transaction";
-	}
-
-	function objectToString( it : T ) : String {
-		var s = new StringBuf();
-		s.add(table_name);
-		if( table_keys.length == 1 ) {
-			s.add("#");
-			s.add(Reflect.field(it,table_keys[0]));
-		} else {
-			s.add("(");
-			var first = true;
-			for( f in table_keys ) {
-				if( first )
-					first = false;
-				else
-					s.add(",");
-				s.add(quoteField(f));
-				s.add(":");
-				s.add(Reflect.field(it,f));
-			}
-			s.add(")");
-		}
-		return s.toString();
-	}
-
-	function doSerialize( field : String, v : Dynamic ) : haxe.io.Bytes {
-		var s = new haxe.Serializer();
-		s.useEnumIndex = true;
-		s.serialize(v);
-		var str = s.toString();
-		#if neko
-		return neko.Lib.bytesReference(str);
-		#else
-		return haxe.io.Bytes.ofString(str);
-		#end
-	}
-
-	function doUnserialize( field : String, b : haxe.io.Bytes ) : Dynamic {
-		if( b == null )
-			return null;
-		var str;
-		#if neko
-		str = neko.Lib.stringReference(b);
-		#else
-		str = b.toString();
-		#end
-		if( str == "" )
-			return null;
-		return haxe.Unserializer.run(str);
-	}
-
-	/* ---------------------------- INTERNAL API -------------------------- */
-
-	function normalizeCache(x:CacheType<T>)
-	{
-		for (f in Reflect.fields(x) )
-		{
-			var val:Dynamic = Reflect.field(x,f), info = table_infos.hfields.get(f);
-			if (info != null)
-			{
-				if (val != null) switch (info.t) {
-					case DDate, DDateTime if (!Std.is(val,Date)):
-						if (Std.is(val,Float))
-						{
-							val = Date.fromTime(val);
-						} else {
-							var v = val + "";
-							var index = v.indexOf('.');
-							if (index >= 0)
-								v = v.substr(0,index);
-							val = Date.fromString(v);
-						}
-					case DSmallBinary, DLongBinary, DBinary, DBytes(_), DData if (Std.is(val, String)):
-						val = haxe.io.Bytes.ofString(val);
-					case DString(_) | DTinyText | DSmallText | DText if(!Std.is(val,String)):
-						val = val + "";
-#if (cs && erase_generics)
-					// on C#, SQLite Ints are returned as Int64
-					case DInt if (!Std.is(val,Int)):
-						val = cast(val,Int);
-#end
-					case DBool if (!Std.is(val,Bool)):
-						if (Std.is(val,Int))
-							val = val != 0;
-						else if (Std.is(val, String)) switch (val.toLowerCase()) {
-							case "1", "true": val = true;
-							case "0", "false": val = false;
-						}
-					case DFloat if (Std.is(val,String)):
-						val = Std.parseFloat(val);
-					case _:
-				}
-				Reflect.setField(x, f, val);
-			}
-		}
-	}
-
-	function cacheObject( x : T, lock : Bool ) {
-		#if neko
-		var o = untyped __dollar__new(x);
-		untyped __dollar__objsetproto(o, class_proto.prototype);
-		#else
-		var o : T = Type.createEmptyInstance(cast class_proto);
-		untyped o._manager = this;
-		#end
-		normalizeCache(x);
-		for (f in Reflect.fields(x) )
-		{
-			var val:Dynamic = Reflect.field(x,f), info = table_infos.hfields.get(f);
-			if (info != null)
-			{
-				var fieldName = getFieldName(info);
-				Reflect.setField(o, fieldName, val);
-			}
-		}
-		Reflect.setField(o,cache_field,x);
-		addToCache(o);
-		untyped o._lock = lock;
-		return o;
-	}
-
-	function make( x : T ) {
-	}
-
-	function unmake( x : T ) {
-	}
-
-	function quoteField(f : String) {
-		return KEYWORDS.exists(f.toLowerCase()) ? "`"+f+"`" : f;
-	}
-
-	function addKeys( s : StringBuf, x : {} ) {
-		var first = true;
-		for( k in table_keys ) {
-			if( first )
-				first = false;
-			else
-				s.add(" AND ");
-			s.add(quoteField(k));
-			s.add(" = ");
-			var f = Reflect.field(x,k);
-			if( f == null )
-				throw ("Missing key "+k);
-			getCnx().addValue(s,f);
-		}
-	}
-
-	function unsafeExecute( sql : String ) {
-		return getCnx().request(sql);
-	}
-
-	public function unsafeObject( sql : String, lock : Bool ) : T {
-		if( lock != false ) {
-			lock = true;
-			sql += getLockMode();
-		}
-		var r = unsafeExecute(sql);
-		var r = r.hasNext() ? r.next() : null;
-		if( r == null )
-			return null;
-		normalizeCache(r);
-		var c = getFromCache(r,lock);
-		if( c != null )
-			return c;
-		r = cacheObject(r,lock);
-		make(r);
-		return r;
-	}
-
-	public function unsafeObjects( sql : String, lock : Bool ) : List<T> {
-		if( lock != false ) {
-			lock = true;
-			sql += getLockMode();
-		}
-		var l = unsafeExecute(sql).results();
-		var l2 = new List<T>();
-		for( x in l ) {
-			normalizeCache(x);
-			var c = getFromCache(x,lock);
-			if( c != null )
-				l2.add(c);
-			else {
-				x = cacheObject(x,lock);
-				make(x);
-				l2.add(x);
-			}
-		}
-		return l2;
-	}
-
-	public function unsafeCount( sql : String ) {
-		return unsafeExecute(sql).getIntResult(0);
-	}
-
-	public function unsafeDelete( sql : String ) {
-		unsafeExecute(sql);
-	}
-
-	public function unsafeGet( id : Dynamic, ?lock : Bool ) : T {
-		if( lock == null ) lock = true;
-		if( table_keys.length != 1 )
-			throw "Invalid number of keys";
-		if( id == null )
-			return null;
-		var x : Dynamic = getFromCacheKey(Std.string(id) + table_name);
-		if( x != null && (!lock || x._lock) )
-			return x;
-		var s = new StringBuf();
-		s.add("SELECT * FROM ");
-		s.add(table_name);
-		s.add(" WHERE ");
-		s.add(quoteField(table_keys[0]));
-		s.add(" = ");
-		getCnx().addValue(s,id);
-		return unsafeObject(s.toString(), lock);
-	}
-
-	public function unsafeGetWithKeys( keys : { }, ?lock : Bool ) : T {
-		if( lock == null ) lock = true;
-		var x : Dynamic = getFromCacheKey(makeCacheKey(cast keys));
-		if( x != null && (!lock || x._lock) )
-			return x;
-		var s = new StringBuf();
-		s.add("SELECT * FROM ");
-		s.add(table_name);
-		s.add(" WHERE ");
-		addKeys(s,keys);
-		return unsafeObject(s.toString(),lock);
-	}
-
-	public function unsafeGetId( o : T ) : Dynamic {
-		return o == null ? null : Reflect.field(o, table_keys[0]);
-	}
-
-	public static function nullCompare( a : String, b : String, eq : Bool ) {
-		if (a == null || a == 'NULL') {
-			return eq ? '$b IS NULL' : '$b IS NOT NULL';
-		} else if (b == null || b == 'NULL') {
-			return eq ? '$a IS NULL' : '$a IS NOT NULL';
-		}
-		// we can't use a null-safe operator here
-		if( cnx.dbName() != "MySQL" )
-			return a + (eq ? " = " : " != ") + b;
-		var sql = a+" <=> "+b;
-		if( !eq ) sql = "NOT("+sql+")";
-		return sql;
-	}
-
-	function addCondition(s : StringBuf,x) {
-		var first = true;
-		if( x != null )
-			for( f in Reflect.fields(x) ) {
-				if( first )
-					first = false;
-				else
-					s.add(" AND ");
-				s.add(quoteField(f));
-				var d = Reflect.field(x,f);
-				if( d == null )
-					s.add(" IS NULL");
-				else {
-					s.add(" = ");
-					getCnx().addValue(s,d);
-				}
-			}
-		if( first )
-			s.add("TRUE");
-	}
-
-	/* --------------------------- MISC API  ------------------------------ */
-
-	public function dbClass() : Class<Dynamic> {
-		return cast class_proto;
-	}
-
-	public function dbInfos() {
-		return table_infos;
-	}
-
-	function getCnx() {
-		return cnx;
-	}
-
-	function getLockMode() {
-		return lockMode;
-	}
-
-	/**
-		Remove the cached value for the given Object field : this will ensure
-		that the value is updated when calling .update(). This is necessary if
-		you are modifying binary data in-place since the cache will be modified
-		as well.
-	**/
-	public function forceUpdate( o : T, field : String ) {
-		// set a reference that will ensure != and .compare() != 0
-		Reflect.setField(Reflect.field(o,cache_field),field,null);
-	}
-
-	/* --------------------------- INIT / CLEANUP ------------------------- */
-
-	public static function initialize() {
-		var l = init_list;
-		init_list = new List();
-		for( m in l )
-			for( r in m.table_infos.relations )
-				m.initRelation(r);
-	}
-
-	public static function cleanup() {
-		object_cache = new haxe.ds.StringMap();
-	}
-
-	function initRelation( r : RecordInfos.RecordRelation ) {
-		// setup getter/setter
-		var spod : Dynamic = Type.resolveClass(r.type);
-		if( spod == null ) throw "Missing spod type " + r.type;
-		var manager : Manager<Dynamic> = spod.manager;
-		var hprop = "__"+r.prop;
-		var hkey = r.key;
-		var lock = r.lock;
-		if( manager == null || manager.table_keys == null ) throw ("Invalid manager for relation "+table_name+":"+r.prop);
-		if( manager.table_keys.length != 1 ) throw ("Relation " + r.prop + "(" + r.key + ") on a multiple key table");
-#if neko
-		Reflect.setField(class_proto.prototype,"get_"+r.prop,function() {
-			var othis = untyped __this__;
-			var f = Reflect.field(othis,hprop);
-			if( f != null )
-				return f;
-			var id = Reflect.field(othis, hkey);
-			if( id == null )
-				return null;
-			f = manager.unsafeGet(id,lock);
-			// it's highly possible that in that case the object has been inserted
-			// after we started our transaction : in that case, let's lock it, since
-			// it's still better than returning 'null' while it exists
-			if( f == null && id != null && !lock )
-				f = manager.unsafeGet(id,true);
-			Reflect.setField(othis,hprop,f);
-			return f;
-		});
-		Reflect.setField(class_proto.prototype,"set_"+r.prop,function(f) {
-			var othis = untyped __this__;
-			Reflect.setField(othis,hprop,f);
-			Reflect.setField(othis,hkey,Reflect.field(f,manager.table_keys[0]));
-			return f;
-		});
-#end
-	}
-
-	#if !neko
-
-	function __get( x : Dynamic, prop : String, key : String, lock ) {
-		var v = Reflect.field(x,prop);
-		if( v != null )
-			return v;
-		var y = unsafeGet(Reflect.field(x, key), lock);
-		Reflect.setField(x,prop,v);
-		return y;
-	}
-
-	function __set( x : Dynamic, prop : String, key : String, v : T ) {
-		Reflect.setField(x,prop,v);
-		if( v == null )
-			Reflect.setField(x,key,null);
-		else
-			Reflect.setField(x,key,Reflect.field(v,table_keys[0]));
-		return v;
-	}
-
-	#end
-
-	/* ---------------------------- OBJECT CACHE -------------------------- */
-
-	function makeCacheKey( x : T ) : String {
-		if( table_keys.length == 1 ) {
-			var k = Reflect.field(x,table_keys[0]);
-			if( k == null )
-				throw("Missing key "+table_keys[0]);
-			return Std.string(k)+table_name;
-		}
-		var s = new StringBuf();
-		for( k in table_keys ) {
-			var v = Reflect.field(x,k);
-			if( k == null )
-				throw("Missing key "+k);
-			s.add(v);
-			s.add("#");
-		}
-		s.add(table_name);
-		return s.toString();
-	}
-
-	function addToCache( x : CacheType<T> ) {
-		object_cache.set(makeCacheKey(x),x);
-	}
-
-	function removeFromCache( x : CacheType<T> ) {
-		object_cache.remove(makeCacheKey(x));
-	}
-
-	function getFromCacheKey( key : String ) : T {
-		return cast object_cache.get(key);
-	}
-
-	function getFromCache( x : CacheType<T>, lock : Bool ) : T {
-		var c : Dynamic = object_cache.get(makeCacheKey(x));
-		if( c != null && lock && !c._lock ) {
-			// synchronize the fields since our result is up-to-date !
-			for( f in Reflect.fields(c) )
-				Reflect.deleteField(c,f);
-			for (f in table_infos.fields)
-			{
-				var name = f.name,
-				    fieldName = getFieldName(f);
-				Reflect.setField(c,fieldName,Reflect.field(x,name));
-			}
-			// mark as locked
-			c._lock = true;
-			// restore our manager
-			#if !neko
-			untyped c._manager = this;
-			#end
-			// use the new object as our cache of fields
-			Reflect.setField(c,cache_field,x);
-			// remake object
-			make(c);
-		}
-		return c;
-	}
-
-	/* ---------------------------- QUOTES -------------------------- */
-
-	public static function quoteAny( v : Dynamic ) {
-		if (v == null) {
-			return 'NULL';
-		}
-
-		var s = new StringBuf();
-		cnx.addValue(s, v);
-		return s.toString();
-	}
-
-	public static function quoteList( v : String, it : Iterable<Dynamic> ) {
-		var b = new StringBuf();
-		var first = true;
-		if( it != null )
-			for( v in it ) {
-				if( first ) first = false else b.addChar(','.code);
-				cnx.addValue(b, v);
-			}
-		if( first )
-			return "FALSE";
-		return v + " IN (" + b.toString() + ")";
-	}
-
-	// We need Bytes.toString to not be DCE'd. See #1937
-	@:keep static function __depends() { return haxe.io.Bytes.alloc(0).toString(); }
-}
-
-private typedef CacheType<T> = Dynamic;
diff --git a/std/sys/db/Mysql.hx b/std/sys/db/Mysql.hx
index 809b7337805ac3146ab9a4ba30d22f8b7fc1b5f7..760f293efb6a4643bb48e4a3ad437839b0001e60 100644
--- a/std/sys/db/Mysql.hx
+++ b/std/sys/db/Mysql.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,20 +19,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
 class Mysql {
-
-	public static function connect( params : {
-		host : String,
-		?port : Int,
-		user : String,
-		pass : String,
-		?socket : String,
-		database : String
-	} ) : sys.db.Connection {
+	public static function connect(params:{
+		host:String,
+		?port:Int,
+		user:String,
+		pass:String,
+		?socket:String,
+		?database:String
+	}):sys.db.Connection {
 		throw "Not implemented for this platform";
 		return null;
 	}
-
 }
diff --git a/std/sys/db/Object.hx b/std/sys/db/Object.hx
deleted file mode 100644
index 8b535592ed2805808bf532bb5069a8a91bb16dd0..0000000000000000000000000000000000000000
--- a/std/sys/db/Object.hx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.db;
-
-/**
-	Record Object : the persistent object base type. See the tutorial on Haxe
-	website to learn how to use Record.
-**/
-@:keepSub
-@:autoBuild(sys.db.RecordMacros.macroBuild()) @:skipFields
-@:deprecated("This class will be removed soon, please install the record-macros library")
-class Object {
-
-	var _lock(default,never) : Bool;
-	var _manager(default,never) : sys.db.Manager<Dynamic>;
-#if !neko
-	@:keep var __cache__:Dynamic;
-#end
-
-	public function new() {
-		#if !neko
-		if( _manager == null ) untyped _manager = __getManager();
-		#end
-	}
-
-#if !neko
-	private function __getManager():sys.db.Manager<Dynamic>
-	{
-		var cls:Dynamic = Type.getClass(this);
-		return cls.manager;
-	}
-#end
-
-	public function insert() {
-		untyped _manager.doInsert(this);
-	}
-
-	public function update() {
-		untyped _manager.doUpdate(this);
-	}
-
-	public function lock() {
-		untyped _manager.doLock(this);
-	}
-
-	public function delete() {
-		untyped _manager.doDelete(this);
-	}
-
-	public function isLocked() {
-		return _lock;
-	}
-
-	public function toString() : String {
-		return untyped _manager.objectToString(this);
-	}
-
-}
diff --git a/std/sys/db/RecordInfos.hx b/std/sys/db/RecordInfos.hx
deleted file mode 100644
index bdfc09d82dd82ef5b9e64fdaa89dfb4803415733..0000000000000000000000000000000000000000
--- a/std/sys/db/RecordInfos.hx
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.db;
-
-@:deprecated("This class will be removed soon, please install the record-macros library")
-enum RecordType {
-	DId;
-	DInt;
-	DUId;
-	DUInt;
-	DBigId;
-	DBigInt;
-	DSingle;
-	DFloat;
-	DBool;
-	DString( n : Int );
-	DDate;
-	DDateTime;
-	DTimeStamp;
-	DTinyText;
-	DSmallText;
-	DText;
-	DSmallBinary;
-	DLongBinary;
-	DBinary;
-	DBytes( n : Int );
-	DEncoded;
-	DSerialized;
-	DNekoSerialized;
-	DFlags( flags : Array<String>, autoSize : Bool );
-	DTinyInt;
-	DTinyUInt;
-	DSmallInt;
-	DSmallUInt;
-	DMediumInt;
-	DMediumUInt;
-	DData;
-	DEnum( name : String );
-	// specific for intermediate calculus
-	DInterval;
-	DNull;
-}
-
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef RecordField = {
-	var name : String;
-	var t : RecordType;
-	var isNull : Bool;
-}
-
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef RecordRelation = {
-	var prop : String;
-	var key : String;
-	var type : String;
-	var module : String;
-	var cascade : Bool;
-	var lock : Bool;
-	var isNull : Bool;
-}
-
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef RecordInfos = {
-	var name : String;
-	var key : Array<String>;
-	var fields : Array<RecordField>;
-	var hfields : Map<String,RecordField>;
-	var relations : Array<RecordRelation>;
-	var indexes : Array<{ keys : Array<String>, unique : Bool }>;
-}
diff --git a/std/sys/db/RecordMacros.hx b/std/sys/db/RecordMacros.hx
deleted file mode 100644
index 9dda10aa1beb3140bc25aa8616a0556122163257..0000000000000000000000000000000000000000
--- a/std/sys/db/RecordMacros.hx
+++ /dev/null
@@ -1,1428 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.db;
-import sys.db.RecordInfos;
-import haxe.macro.Expr;
-import haxe.macro.Type.VarAccess;
-#if macro
-import haxe.macro.Context;
-using haxe.macro.TypeTools;
-#end
-using Lambda;
-
-private typedef SqlFunction = {
-	var name : String;
-	var params : Array<RecordType>;
-	var ret : RecordType;
-	var sql : String;
-}
-
-@:deprecated("This class will be removed soon, please install the record-macros library")
-class RecordMacros {
-
-	static var GLOBAL = null;
-	static var simpleString = ~/^[A-Za-z0-9 ]*$/;
-
-	var isNull : Bool;
-	var manager : Expr;
-	var inf : RecordInfos;
-	var g : {
-		var cache : haxe.ds.StringMap<RecordInfos>;
-		var types : haxe.ds.StringMap<RecordType>;
-		var functions : haxe.ds.StringMap<SqlFunction>;
-	};
-
-	function new(c) {
-		if( GLOBAL != null )
-			g = GLOBAL;
-		else {
-			g = initGlobals();
-			GLOBAL = g;
-		}
-		inf = getRecordInfos(c);
-	}
-
-	function initGlobals()
-	{
-		var cache = new haxe.ds.StringMap();
-		var types = new haxe.ds.StringMap();
-		for( c in Type.getEnumConstructs(RecordType) ) {
-			var e : Dynamic = Reflect.field(RecordType, c);
-			if( Std.is(e, RecordType) )
-				types.set("S"+c.substr(1), e);
-		}
-		types.remove("SNull");
-		var functions = new haxe.ds.StringMap();
-		for( f in [
-			{ name : "now", params : [], ret : DDateTime, sql : "NOW($)" },
-			{ name : "curDate", params : [], ret : DDate, sql : "CURDATE($)" },
-			{ name : "seconds", params : [DFloat], ret : DInterval, sql : "INTERVAL $ SECOND" },
-			{ name : "minutes", params : [DFloat], ret : DInterval, sql : "INTERVAL $ MINUTE" },
-			{ name : "hours", params : [DFloat], ret : DInterval, sql : "INTERVAL $ HOUR" },
-			{ name : "days", params : [DFloat], ret : DInterval, sql : "INTERVAL $ DAY" },
-			{ name : "months", params : [DFloat], ret : DInterval, sql : "INTERVAL $ MONTH" },
-			{ name : "years", params : [DFloat], ret : DInterval, sql : "INTERVAL $ YEAR" },
-			{ name : "date", params : [DDateTime], ret : DDate, sql : "DATE($)" },
-		])
-			functions.set(f.name, f);
-		return { cache : cache, types : types, functions : functions };
-	}
-
-	public dynamic function error( msg : String, pos : Position ) : Dynamic {
-		#if macro
-		Context.error(msg, pos);
-		#else
-		throw msg;
-		#end
-		return null;
-	}
-
-	public dynamic function typeof( e : Expr ) : haxe.macro.Type {
-		#if macro
-		return Context.typeof(e);
-		#else
-		throw "not implemented";
-		return null;
-		#end
-	}
-
-	public dynamic function follow( t : haxe.macro.Type, ?once ) : haxe.macro.Type {
-		#if macro
-		return Context.follow(t,once);
-		#else
-		throw "not implemented";
-		return null;
-		#end
-	}
-
-	public dynamic function getManager( t : haxe.macro.Type, p : Position ) : RecordMacros {
-		#if macro
-		return getManagerInfos(t, p);
-		#else
-		throw "not implemented";
-		return null;
-		#end
-	}
-
-	public dynamic function resolveType( name : String, ?module : String ) : haxe.macro.Type {
-		#if macro
-		if (module != null)
-		{
-			var m = Context.getModule(module);
-			for (t in m)
-			{
-				if (t.toString() == name)
-					return t;
-			}
-		}
-
-		return Context.getType(name);
-		#else
-		throw "not implemented";
-		return null;
-		#end
-	}
-
-	function makeInt( t : haxe.macro.Type ) {
-		switch( t ) {
-		case TInst(c, _):
-			var name = c.toString();
-			if( name.charAt(0) == "I" )
-				return Std.parseInt(name.substr(1));
-		default:
-		}
-		throw "Unsupported " + Std.string(t);
-	}
-
-	function makeRecord( t : haxe.macro.Type ) {
-		switch( t ) {
-		case TInst(c, _):
-			var name = c.toString();
-			var cl = c.get();
-			var csup = cl.superClass;
-			while( csup != null ) {
-				if( csup.t.toString() == "sys.db.Object" )
-					return c;
-				csup = csup.t.get().superClass;
-			}
-		case TType(t, p):
-			var name = t.toString();
-			if( p.length == 1 && (name == "Null" || name == "sys.db.SNull") ) {
-				isNull = true;
-				return makeRecord(p[0]);
-			}
-		default:
-		}
-		return null;
-	}
-
-	function getFlags( t : haxe.macro.Type ) {
-		switch( t ) {
-		case TEnum(e,_):
-			var cl = e.get().names;
-			if( cl.length > 1 ) {
-				var prefix = cl[0];
-				for( c in cl )
-					while( prefix.length > 0 && c.substr(0, prefix.length) != prefix )
-						prefix = prefix.substr(0, -1);
-				for( i in 0...cl.length )
-					cl[i] = cl[i].substr(prefix.length);
-			}
-			if( cl.length > 31 ) throw "Too many flags";
-			return cl;
-		default:
-			throw "Flags parameter should be an enum";
-		}
-	}
-
-	function makeType( t : haxe.macro.Type ) {
-		switch( t ) {
-		case TInst(c, _):
-			var name = c.toString();
-			return switch( name ) {
-			case "Int": DInt;
-			case "Float": DFloat;
-			case "String": DText;
-			case "Date": DDateTime;
-			case "haxe.io.Bytes": DBinary;
-			default: throw "Unsupported Record Type " + name;
-			}
-		case TAbstract(a, p):
-			var name = a.toString();
-			return switch( name ) {
-			case "Int": DInt;
-			case "Float": DFloat;
-			case "Bool": DBool;
-			case _ if (!a.get().meta.has(':coreType')):
-				var a = a.get();
-#if macro
-				makeType(a.type.applyTypeParameters(a.params, p));
-#else
-				makeType(a.type);
-#end
-			default: throw "Unsupported Record Type " + name;
-			}
-		case TEnum(e, _):
-			var name = e.toString();
-			return switch( name ) {
-			case "Bool": DBool;
-			default:
-				throw "Unsupported Record Type " + name + " (enums must be wrapped with SData or SEnum)";
-			}
-		case TType(td, p):
-			var name = td.toString();
-			if( StringTools.startsWith(name, "sys.db.") )
-				name = name.substr(7);
-			var k = g.types.get(name);
-			if( k != null ) return k;
-			if( p.length == 1 )
-				switch( name ) {
-				case "SString": return DString(makeInt(p[0]));
-				case "SBytes": return DBytes(makeInt(p[0]));
-				case "SNull", "Null": isNull = true; return makeType(p[0]);
-				case "SFlags": return DFlags(getFlags(p[0]),false);
-				case "SSmallFlags": return DFlags(getFlags(p[0]),true);
-				case "SData": return DData;
-				case "SEnum":
-					switch( p[0] ) {
-					case TEnum(en, _):
-						var e = en.get();
-						var count = 0, hasParam = false;
-						for( c in e.constructs ) {
-							count++;
-							switch( c.type ) {
-							case TFun(_):
-								hasParam = true;
-							default:
-							}
-						}
-						if( hasParam )
-							throw "You can't use SEnum if the enum have parameters, try SData instead";
-						if( count >= 256 )
-							throw "Too many enum constructors";
-						return DEnum(en.toString());
-					default:
-						// should cause another error
-					}
-				default:
-				}
-			return makeType(follow(t, true));
-		default:
-		}
-		throw "Unsupported Record Type " + Std.string(t);
-	}
-
-	function makeIdent( e : Expr ) {
-		return switch( e.expr ) {
-		case EConst(c):
-			switch( c ) {
-			case CIdent(s): s;
-			default: error("Identifier expected", e.pos);
-			}
-		default: error("Identifier expected", e.pos);
-		}
-	}
-
-	function getRecordInfos( c : haxe.macro.Type.Ref<haxe.macro.Type.ClassType> ) : RecordInfos {
-		var cname = c.toString();
-		var i = g.cache.get(cname);
-		if( i != null ) return i;
-		i = {
-			key : null,
-			name : cname.split(".").pop(), // remove package name
-			fields : [],
-			hfields : new haxe.ds.StringMap(),
-			relations : [],
-			indexes : [],
-		};
-		g.cache.set(cname, i);
-		var c = c.get();
-		var fieldsPos = new haxe.ds.StringMap();
-		var fields = c.fields.get();
-		var csup = c.superClass;
-		while( csup != null ) {
-			var c = csup.t.get();
-			if( !c.meta.has(":skipFields") )
-				fields = c.fields.get().concat(fields);
-			csup = c.superClass;
-		}
-		for( f in fields ) {
-			fieldsPos.set(f.name, f.pos);
-			switch( f.kind ) {
-			case FMethod(_):
-				// skip methods
-				continue;
-			case FVar(g, s):
-				// skip not-db fields
-				if( f.meta.has(":skip") )
-					continue;
-				// handle relations
-				if( f.meta.has(":relation") ) {
-					if( !Type.enumEq(g,AccCall) || !Type.enumEq(s,AccCall) )
-						error("Relation should be (dynamic,dynamic)", f.pos);
-					for( m in f.meta.get() ) {
-						if( m.name != ":relation" ) continue;
-						if( m.params.length == 0 ) error("Missing relation key", m.pos);
-						var params = [];
-						for( p in m.params )
-							params.push({ i : makeIdent(p), p : p.pos });
-						isNull = false;
-						var t = makeRecord(f.type);
-						if( t == null ) error("Relation type should be a sys.db.Object", f.pos);
-						var mod = t.get().module;
-						var r = {
-							prop : f.name,
-							key : params.shift().i,
-							type : t.toString(),
-							module : mod,
-							cascade : false,
-							lock : false,
-							isNull : isNull,
-						};
-						// setup flags
-						for( p in params )
-							switch( p.i ) {
-							case "lock": r.lock = true;
-							case "cascade": r.cascade = true;
-							default: error("Unknown relation flag", p.p);
-							}
-						i.relations.push(r);
-					}
-					continue;
-				}
-				switch( g ) {
-				case AccCall:
-					if( !f.meta.has(":data") )
-						error("Relation should be defined with @:relation(key)", f.pos);
-				default:
-				}
-			}
-			isNull = false;
-			var fi = {
-				name : f.name,
-				t : try makeType(f.type) catch( e : String ) error(e,f.pos),
-				isNull : isNull,
-			};
-			var isId = switch( fi.t ) {
-			case DId, DUId, DBigId: true;
-			default: i.key == null && fi.name == "id";
-			}
-			if( isId ) {
-				switch(fi.t)
-				{
-					case DInt:
-						fi.t = DId;
-					case DUInt:
-						fi.t = DUId;
-					case DBigInt:
-						fi.t = DBigId;
-					case _:
-				}
-				if( i.key == null ) i.key = [fi.name] else error("Multiple table id declaration", f.pos);
-			}
-			i.fields.push(fi);
-			i.hfields.set(fi.name, fi);
-		}
-		// create fields for undeclared relations keys :
-		for( r in i.relations ) {
-			var field = fields.find(function(f) return f.name == r.prop);
-			var f = i.hfields.get(r.key);
-			var relatedInf = getRecordInfos(makeRecord(resolveType(r.type, r.module)));
-			if (relatedInf.key.length > 1)
-				error('The relation ${r.prop} is invalid: Type ${r.type} has multiple keys, which is not supported',field.pos);
-			var relatedKey = relatedInf.key[0];
-			var relatedKeyType = switch(relatedInf.hfields.get(relatedKey).t)
-				{
-					case DId: DInt;
-					case DUId: DUInt;
-					case DBigId: DBigInt;
-					case t = DString(_): t;
-					case t: error('Unexpected id type $t for the relation. Use either SId, SInt, SUId, SUInt, SBigID, SBigInt or SString', field.pos);
-				}
-
-			if( f == null ) {
-				f = {
-					name : r.key,
-					t : relatedKeyType,
-					isNull : r.isNull,
-				};
-				i.fields.push(f);
-				i.hfields.set(f.name, f);
-			} else {
-				var pos = fieldsPos.get(f.name);
-				if( f.t != relatedKeyType) error("Relation source and field should have same type", pos);
-				if( f.isNull != r.isNull ) error("Relation and field should have same nullability", pos);
-			}
-		}
-		// process class metadata
-		for( m in c.meta.get() )
-			switch( m.name ) {
-			case ":id":
-				i.key = [];
-				for( p in m.params ) {
-					var id = makeIdent(p);
-					if( !i.hfields.exists(id) )
-						error("This field does not exists", p.pos);
-					i.key.push(id);
-				}
-				if( i.key.length == 0 ) error("Invalid :id", m.pos);
-				if (i.key.length == 1 )
-				{
-					var field = i.hfields.get(i.key[0]);
-					switch(field.t)
-					{
-						case DInt:
-							field.t = DId;
-						case DUInt:
-							field.t = DUId;
-						case DBigInt:
-							field.t = DBigId;
-						case _:
-					}
-				}
-			case ":index":
-				var idx = [];
-				for( p in m.params ) idx.push(makeIdent(p));
-				var unique = idx[idx.length - 1] == "unique";
-				if( unique ) idx.pop();
-				if( idx.length == 0 ) error("Invalid :index", m.pos);
-				for( k in 0...idx.length )
-					if( !i.hfields.exists(idx[k]) )
-						error("This field does not exists", m.params[k].pos);
-				i.indexes.push( { keys : idx, unique : unique } );
-			case ":table":
-				if( m.params.length != 1 ) error("Invalid :table", m.pos);
-				i.name = switch( m.params[0].expr ) {
-				case EConst(c): switch( c ) { case CString(s): s; default: null; }
-				default: null;
-				};
-				if( i.name == null ) error("Invalid :table value", m.params[0].pos);
-			default:
-			}
-		// check primary key defined
-		if( i.key == null )
-			error("Table is missing unique id, use either SId, SUId, SBigID or @:id", c.pos);
-		return i;
-	}
-
-	function quoteField( f : String ) {
-		var m : { private var KEYWORDS : haxe.ds.StringMap<Bool>; } = Manager;
-		return m.KEYWORDS.exists(f.toLowerCase()) ? "`"+f+"`" : f;
-	}
-
-	function initManager( pos : Position ) {
-		manager = { expr : EField({ expr : EField({ expr : EConst(CIdent("sys")), pos : pos },"db"), pos : pos }, "Manager"), pos : pos };
-	}
-
-	inline function makeString( s : String, pos ) {
-		return { expr : EConst(CString(s)), pos : pos };
-	}
-
-	inline function makeOp( op : String, e1, e2, pos ) {
-		return sqlAdd(sqlAddString(e1,op),e2,pos);
-	}
-
-	inline function sqlAdd( e1 : Expr, e2 : Expr, pos : Position ) {
-		return { expr : EBinop(OpAdd, e1, e2), pos : pos };
-	}
-
-	inline function sqlAddString( sql : Expr, s : String ) {
-		return { expr : EBinop(OpAdd, sql, makeString(s,sql.pos)), pos : sql.pos };
-	}
-
-	function sqlQuoteValue( v : Expr, t : RecordType, isNull : Bool ) {
-		switch( v.expr ) {
-		case EConst(c):
-			switch( c ) {
-			case CInt(_), CFloat(_): return v;
-			case CString(s):
-				if( simpleString.match(s) ) return { expr : EConst(CString("'"+s+"'")), pos : v.pos };
-			case CIdent(n):
-				switch( n ) {
-				case "null": return { expr : EConst(CString("NULL")), pos : v.pos };
-				case "true": return { expr : EConst(CString("TRUE")), pos : v.pos };
-				case "false": return { expr : EConst(CString("FALSE")), pos : v.pos };
-				}
-			default:
-			}
-		default:
-		}
-		return { expr : ECall( { expr : EField(manager, "quoteAny"), pos : v.pos }, [ensureType(v,t,isNull)]), pos : v.pos }
-	}
-
-	inline function sqlAddValue( sql : Expr, v : Expr, t : RecordType, isNull : Bool ) {
-		return { expr : EBinop(OpAdd, sql, sqlQuoteValue(v,t, isNull)), pos : sql.pos };
-	}
-
-	function unifyClass( t : RecordType ) {
-		return switch( t ) {
-		case DId, DInt, DUId, DUInt, DEncoded, DFlags(_), DTinyInt, DTinyUInt, DSmallInt, DSmallUInt, DMediumInt, DMediumUInt: 0;
-		case DBigId, DBigInt, DSingle, DFloat: 1;
-		case DBool: 2;
-		case DString(_), DTinyText, DSmallText, DText, DSerialized: 3;
-		case DDate, DDateTime, DTimeStamp: 4;
-		case DSmallBinary, DLongBinary, DBinary, DBytes(_), DNekoSerialized, DData: 5;
-		case DInterval: 6;
-		case DNull: 7;
-		case DEnum(_): -1;
-		};
-	}
-
-	function tryUnify( t, rt ) {
-		if( t == rt ) return true;
-		var c = unifyClass(t);
-		if( c < 0 ) return Type.enumEq(t, rt);
-		var rc = unifyClass(rt);
-		return c == rc || (c == 0 && rc == 1); // allow Int-to-Float expansion
-	}
-
-	function typeStr( t : RecordType ) {
-		return Std.string(t).substr(1);
-	}
-
-	function canStringify( t : RecordType ) {
-		return switch( unifyClass(t) ) {
-		case 0, 1, 2, 3, 4, 5, 7: true;
-		default: false;
-		};
-	}
-
-	function convertType( t : RecordType ) {
-		var pack = [];
-		return TPath( {
-			name : switch( unifyClass(t) ) {
-			case 0: "Int";
-			case 1: "Float";
-			case 2: "Bool";
-			case 3: "String";
-			case 4: "Date";
-			case 5: pack = ["haxe", "io"];  "Bytes";
-			default: throw "assert";
-			},
-			pack : pack,
-			params : [],
-			sub : null,
-		});
-	}
-
-	function unify( t : RecordType, rt : RecordType, pos : Position ) {
-		if( !tryUnify(t, rt) )
-			error(typeStr(t) + " should be " + typeStr(rt), pos);
-	}
-
-	function buildCmp( op, e1, e2, pos ) {
-		var r1 = buildCond(e1);
-		var r2 = buildCond(e2);
-		unify(r2.t, r1.t, e2.pos);
-		if( !tryUnify(r1.t, DFloat) && !tryUnify(r1.t, DDate) && !tryUnify(r1.t, DText) )
-			unify(r1.t, DFloat, e1.pos);
-		return { sql : makeOp(op, r1.sql, r2.sql, pos), t : DBool, n : r1.n || r2.n };
-	}
-
-	function buildNum( op, e1, e2, pos ) {
-		var r1 = buildCond(e1);
-		var r2 = buildCond(e2);
-		var c1 = unifyClass(r1.t);
-		var c2 = unifyClass(r2.t);
-		if( c1 > 1 ) {
-			if( op == "-" && tryUnify(r1.t, DDateTime) && tryUnify(r2.t,DInterval) )
-				return { sql : makeOp(op, r1.sql, r2.sql, pos), t : DDateTime, n : r1.n };
-			unify(r1.t, DInt, e1.pos);
-		}
-		if( c2 > 1 ) unify(r2.t, DInt, e2.pos);
-		return { sql : makeOp(op, r1.sql, r2.sql, pos), t : (c1 + c2) == 0 ? DInt : DFloat, n : r1.n || r2.n };
-	}
-
-	function buildInt( op, e1, e2, pos ) {
-		var r1 = buildCond(e1);
-		var r2 = buildCond(e2);
-		unify(r1.t, DInt, e1.pos);
-		unify(r2.t, DInt, e2.pos);
-		return { sql : makeOp(op, r1.sql, r2.sql, pos), t : DInt, n : r1.n || r2.n };
-	}
-
-	function buildEq( eq, e1 : Expr, e2, pos ) {
-		var r1 = null;
-		switch( e1.expr ) {
-		case EConst(c):
-			switch( c ) {
-			case CIdent(i):
-				if( i.charCodeAt(0) == "$".code ) {
-					var tmp = { field : i.substr(1), expr : e2 };
-					var f = getField(tmp);
-					r1 = { sql : makeString(quoteField(tmp.field), e1.pos), t : f.t, n : f.isNull };
-					e2 = tmp.expr;
-					switch( f.t ) {
-					case DEnum(e):
-						var ok = false;
-						switch( e2.expr ) {
-						case EConst(c):
-							switch( c ) {
-							case CIdent(n):
-								if( n.charCodeAt(0) == '$'.code )
-									ok = true;
-								else switch( resolveType(e) ) {
-								case TEnum(e, _):
-									var c = e.get().constructs.get(n);
-									if( c == null ) {
-										if( n == "null" )
-											return { sql : sqlAddString(r1.sql, eq ? " IS NULL" : " IS NOT NULL"), t : DBool, n : false };
-									} else {
-										return { sql : makeOp(eq?" = ":" != ", r1.sql, { expr : EConst(CInt(Std.string(c.index))), pos : e2.pos }, pos), t : DBool, n : r1.n };
-									}
-								default:
-								}
-							default:
-							}
-						default:
-						}
-						if( !ok )
-						{
-							var epath = e.split('.');
-							var ename = epath.pop();
-							var etype = TPath({ name:ename, pack:epath });
-							if (r1.n) {
-								return { sql: macro $manager.nullCompare(${r1.sql}, { var tmp = @:pos(e2.pos) (${e2} : $etype); tmp == null ? null : (std.Type.enumIndex(tmp) + ''); }, ${eq ? macro true : macro false}), t : DBool, n: true };
-							} else {
-								var expr = macro { @:pos(e2.pos) var tmp : $etype = $e2; (tmp == null ? null : (std.Type.enumIndex(tmp) + '')); };
-								return { sql: makeOp(eq?" = ":" != ", r1.sql, expr, pos), t : DBool, n : r1.n };
-							}
-						}
-					default:
-					}
-				}
-			default:
-			}
-		default:
-		}
-		if( r1 == null )
-			r1 = buildCond(e1);
-		var r2 = buildCond(e2);
-		if( r2.t == DNull ) {
-			if( !r1.n )
-				error("Expression can't be null", e1.pos);
-			return { sql : sqlAddString(r1.sql, eq ? " IS NULL" : " IS NOT NULL"), t : DBool, n : false };
-		} else {
-			unify(r2.t, r1.t, e2.pos);
-			unify(r1.t, r2.t, e1.pos);
-		}
-		var sql;
-		// use some different operators if there is a possibility for comparing two NULLs
-		if( r1.n || r2.n )
-			sql = { expr : ECall({ expr : EField(manager,"nullCompare"), pos : pos },[r1.sql,r2.sql,{ expr : EConst(CIdent(eq?"true":"false")), pos : pos }]), pos : pos };
-		else
-			sql = makeOp(eq?" = ":" != ", r1.sql, r2.sql, pos);
-		return { sql : sql, t : DBool, n : r1.n || r2.n };
-	}
-
-	function buildDefault( cond : Expr ) {
-		var t = typeof(cond);
-		isNull = false;
-		var d = try makeType(t) catch( e : String ) try makeType(follow(t)) catch( e : String ) error("Unsupported type " + Std.string(t), cond.pos);
-		return { sql : sqlQuoteValue(cond, d, isNull), t : d, n : isNull };
-	}
-
-	function getField( f : { field : String, expr : Expr } ) {
-		var fi = inf.hfields.get(f.field);
-		if( fi == null ) {
-			for( r in inf.relations )
-				if( r.prop == f.field ) {
-					var path = r.type.split(".");
-					var p = f.expr.pos;
-					path.push("manager");
-					var first = path.shift();
-					var mpath = { expr : EConst(CIdent(first)), pos : p };
-					for ( e in path )
-						mpath = { expr : EField(mpath, e), pos : p };
-					var m = getManager(typeof(mpath),p);
-					var getid = { expr : ECall( { expr : EField(mpath, "unsafeGetId"), pos : p }, [f.expr]), pos : p };
-					f.field = r.key;
-					f.expr = ensureType(getid, m.inf.hfields.get(m.inf.key[0]).t, r.isNull);
-					return inf.hfields.get(r.key);
-				}
-			error("No database field '" + f.field+"'", f.expr.pos);
-		}
-		return fi;
-	}
-
-	function buildCond( cond : Expr ) {
-		var sql = null;
-		var p = cond.pos;
-		switch( cond.expr ) {
-		case EObjectDecl(fl):
-			var first = true;
-			var sql = makeString("(", p);
-			var fields = new haxe.ds.StringMap();
-			for( f in fl ) {
-				var fi = getField(f);
-				if( first )
-					first = false;
-				else
-					sql = sqlAddString(sql, " AND ");
-				sql = sqlAddString(sql, quoteField(fi.name) + (fi.isNull ? " <=> " : " = "));
-				sql = sqlAddValue(sql, f.expr, fi.t, fi.isNull);
-				if( fields.exists(fi.name) )
-					error("Duplicate field " + fi.name, p);
-				else
-					fields.set(fi.name, true);
-			}
-			if( first ) sqlAddString(sql, "TRUE");
-			sql = sqlAddString(sql, ")");
-			return { sql : sql, t : DBool, n : false };
-		case EParenthesis(e):
-			var r = buildCond(e);
-			r.sql = sqlAdd(makeString("(", p), r.sql, p);
-			r.sql = sqlAddString(r.sql, ")");
-			return r;
-		case EBinop(op, e1, e2):
-			switch( op ) {
-			case OpAdd:
-				var r1 = buildCond(e1);
-				var r2 = buildCond(e2);
-				var rt = if( tryUnify(r1.t, DFloat) && tryUnify(r2.t, DFloat) )
-					tryUnify(r1.t, DInt) ? tryUnify(r2.t, DInt) ? DInt : DFloat : DFloat;
-				else if( (tryUnify(r1.t, DText) && canStringify(r2.t)) || (tryUnify(r2.t, DText) && canStringify(r1.t)) )
-					return { sql : sqlAddString(sqlAdd(sqlAddString(sqlAdd(makeString("CONCAT(",p),r1.sql,p),","),r2.sql,p),")"), t : DText, n : r1.n || r2.n }
-				else
-					error("Can't add " + typeStr(r1.t) + " and " + typeStr(r2.t), p);
-				return { sql : makeOp("+", r1.sql, r2.sql, p), t : rt, n : r1.n || r2.n };
-			case OpBoolAnd, OpBoolOr:
-				var r1 = buildCond(e1);
-				var r2 = buildCond(e2);
-				unify(r1.t, DBool, e1.pos);
-				unify(r2.t, DBool, e2.pos);
-				return { sql : makeOp(op == OpBoolAnd ? " AND " : " OR ", r1.sql, r2.sql, p), t : DBool, n : false };
-			case OpGte:
-				return buildCmp(">=", e1, e2, p);
-			case OpLte:
-				return buildCmp("<=", e1, e2, p);
-			case OpGt:
-				return buildCmp(">", e1, e2, p);
-			case OpLt:
-				return buildCmp("<", e1, e2, p);
-			case OpSub:
-				return buildNum("-", e1, e2, p);
-			case OpDiv:
-				var r = buildNum("/", e1, e2, p);
-				r.t = DFloat;
-				return r;
-			case OpMult:
-				return buildNum("*", e1, e2, p);
-			case OpEq, OpNotEq:
-				return buildEq(op == OpEq, e1, e2, p);
-			case OpXor:
-				return buildInt("^", e1, e2, p);
-			case OpOr:
-				return buildInt("|", e1, e2, p);
-			case OpAnd:
-				return buildInt("&", e1, e2, p);
-			case OpShr:
-				return buildInt(">>", e1, e2, p);
-			case OpShl:
-				return buildInt("<<", e1, e2, p);
-			case OpMod:
-				return buildNum("%", e1, e2, p);
-			case OpUShr, OpInterval, OpAssignOp(_), OpAssign, OpArrow:
-				error("Unsupported operation", p);
-			}
-		case EUnop(op, _, e):
-			var r = buildCond(e);
-			switch( op ) {
-			case OpNot:
-				var sql = makeString("!", p);
-				unify(r.t, DBool, e.pos);
-				switch( r.sql.expr ) {
-				case EConst(_):
-				default:
-					r.sql = sqlAddString(r.sql, ")");
-					sql = sqlAddString(sql, "(");
-				}
-				return { sql : sqlAdd(sql, r.sql, p), t : DBool, n : r.n };
-			case OpNegBits:
-				var sql = makeString("~", p);
-				unify(r.t, DInt, e.pos);
-				return { sql : sqlAdd(sql, r.sql, p), t : DInt, n : r.n };
-			case OpNeg:
-				var sql = makeString("-", p);
-				unify(r.t, DFloat, e.pos);
-				return { sql : sqlAdd(sql, r.sql, p), t : r.t, n : r.n };
-			case OpIncrement, OpDecrement:
-				error("Unsupported operation", p);
-			}
-		case EConst(c):
-			switch( c ) {
-			case CInt(s): return { sql : makeString(s, p), t : DInt, n : false };
-			case CFloat(s): return { sql : makeString(s, p), t : DFloat, n : false };
-			case CString(s): return { sql : sqlQuoteValue(cond, DText, false), t : DString(s.length), n : false };
-			case CRegexp(_): error("Unsupported", p);
-			case CIdent(n):
-				if( n.charCodeAt(0) == "$".code ) {
-					n = n.substr(1);
-					var f = inf.hfields.get(n);
-					if( f == null ) error("Unknown database field '" + n + "'", p);
-					return { sql : makeString(quoteField(f.name), p), t : f.t, n : f.isNull };
-				}
-				switch( n ) {
-				case "null":
-					return { sql : makeString("NULL", p), t : DNull, n : true };
-				case "true":
-					return { sql : makeString("TRUE", p), t : DBool, n : false };
-				case "false":
-					return { sql : makeString("FALSE", p), t : DBool, n : false };
-				}
-				return buildDefault(cond);
-			}
-		case ECall(c, pl):
-			switch( c.expr ) {
-			case EConst(co):
-				switch(co) {
-				case CIdent(t):
-					if( t.charCodeAt(0) == '$'.code ) {
-						var f = g.functions.get(t.substr(1));
-						if( f == null ) error("Unknown method " + t, c.pos);
-						if( f.params.length != pl.length ) error("Function " + f.name + " requires " + f.params.length + " parameters", p);
-						var parts = f.sql.split("$");
-						var sql = makeString(parts[0], p);
-						var first = true;
-						var isNull = false;
-						for( i in 0...f.params.length ) {
-							var r = buildCond(pl[i]);
-							if( r.n ) isNull = true;
-							unify(r.t, f.params[i], pl[i].pos);
-							if( first )
-								first = false;
-							else
-								sql = sqlAddString(sql, ",");
-							sql = sqlAdd(sql, r.sql, p);
-						}
-						sql = sqlAddString(sql, parts[1]);
-						// assume that for all SQL functions, a NULL parameter will make a NULL result
-						return { sql : sql, t : f.ret, n : isNull };
-					}
-				default:
-				}
-			case EField(e, f):
-				switch( f ) {
-				case "like":
-					if( pl.length == 1 ) {
-						var r = buildCond(e);
-						var v = buildCond(pl[0]);
-						if( !tryUnify(r.t, DText) ) {
-							if( tryUnify(r.t, DBinary) )
-								unify(v.t, DBinary, pl[0].pos);
-							else
-								unify(r.t, DText, e.pos);
-						} else
-							unify(v.t, DText, pl[0].pos);
-						return { sql : makeOp(" LIKE ", r.sql, v.sql, p), t : DBool, n : r.n || v.n };
-					}
-				case "has":
-					if( pl.length == 1 ) {
-						var r = buildCond(e);
-						switch( r.t ) {
-						case DFlags(vals,_):
-							var id = makeIdent(pl[0]);
-							var idx = Lambda.indexOf(vals,id);
-							if( idx < 0 ) error("Flag should be "+vals.join(","), pl[0].pos);
-							return { sql : sqlAddString(r.sql, " & " + (1 << idx) + " != 0"), t : DBool, n : r.n };
-						default:
-						}
-					}
-				}
-			default:
-			}
-			return buildDefault(cond);
-		case EField(_, _), EDisplay(_):
-			return buildDefault(cond);
-		case EIf(e, e1, e2), ETernary(e, e1, e2):
-			if( e2 == null ) error("If must have an else statement", p);
-			var r1 = buildCond(e1);
-			var r2 = buildCond(e2);
-			unify(r2.t, r1.t, e2.pos);
-			unify(r1.t, r2.t, e1.pos);
-			return { sql : { expr : EIf(e, r1.sql, r2.sql), pos : p }, t : r1.t, n : r1.n || r2.n };
-		case EIn(e, v):
-			var e = buildCond(e);
-			var t = TPath({
-				pack : [],
-				name : "Iterable",
-				params : [TPType(convertType(e.t))],
-				sub : null,
-			});
-			return { sql : { expr : ECall( { expr : EField(manager, "quoteList"), pos : p }, [e.sql, { expr : ECheckType(v,t), pos : p } ]), pos : p }, t : DBool, n : e.n };
-		default:
-			return buildDefault(cond);
-		}
-		error("Unsupported expression", p);
-		return null;
-	}
-
-	function ensureType( e : Expr, rt : RecordType, isNull : Bool ) {
-		var t = convertType(rt);
-		if (isNull) {
-			t = macro : Null<$t>;
-		}
-		return { expr : ECheckType(e, t), pos : e.pos };
-	}
-
-	function checkKeys( econd : Expr ) {
-		var p = econd.pos;
-		switch( econd.expr ) {
-		case EObjectDecl(fl):
-			var key = inf.key.copy();
-			for( f in fl ) {
-				var fi = getField(f);
-				if( !key.remove(fi.name) ) {
-					if( Lambda.has(inf.key, fi.name) )
-						error("Duplicate field " + fi.name, p);
-					else
-						error("Field " + f.field + " is not part of table key (" + inf.key.join(",") + ")", p);
-				}
-				f.expr = ensureType(f.expr, fi.t, fi.isNull);
-			}
-			return econd;
-		default:
-			if( inf.key.length > 1 )
-				error("You can't use a single value on a table with multiple keys (" + inf.key.join(",") + ")", p);
-			var fi = inf.hfields.get(inf.key[0]);
-			return ensureType(econd, fi.t, fi.isNull);
-		}
-	}
-
-	function orderField(e) {
-		switch( e.expr ) {
-		case EConst(c):
-			switch( c ) {
-			case CIdent(t):
-				if( !inf.hfields.exists(t) )
-					error("Unknown database field", e.pos);
-				return quoteField(t);
-			default:
-			}
-		case EUnop(op, _, e):
-			if( op == OpNeg )
-				return orderField(e) + " DESC";
-		default:
-		}
-		error("Invalid order field", e.pos);
-		return null;
-	}
-
-	function concatStrings( e : Expr ) {
-		var inf = { e : null, str : null };
-		browseStrings(inf, e);
-		if( inf.str != null ) {
-			var es = { expr : EConst(CString(inf.str)), pos : e.pos };
-			if( inf.e == null )
-				inf.e = es;
-			else
-				inf.e = { expr : EBinop(OpAdd, inf.e, es), pos : e.pos };
-		}
-		return inf.e;
-	}
-
-	function browseStrings( inf : { e : Expr, str : String }, e : Expr ) {
-		switch( e.expr ) {
-		case EConst(c):
-			switch( c ) {
-			case CString(s):
-				if( inf.str == null )
-					inf.str = s;
-				else
-					inf.str += s;
-				return;
-			case CInt(s), CFloat(s):
-				if( inf.str != null ) {
-					inf.str += s;
-					return;
-				}
-			default:
-			}
-		case EBinop(op, e1, e2):
-			if( op == OpAdd ) {
-				browseStrings(inf,e1);
-				browseStrings(inf,e2);
-				return;
-			}
-		case EIf(cond, e1, e2):
-			e = { expr : EIf(cond, concatStrings(e1), concatStrings(e2)), pos : e.pos };
-		default:
-		}
-		if( inf.str != null ) {
-			e = { expr : EBinop(OpAdd, { expr : EConst(CString(inf.str)), pos : e.pos }, e), pos : e.pos };
-			inf.str = null;
-		}
-		if( inf.e == null )
-			inf.e = e;
-		else
-			inf.e = { expr : EBinop(OpAdd, inf.e, e), pos : e.pos };
-	}
-
-	function buildOptions( eopt : Expr ) {
-		var p = eopt.pos;
-		var opts = new haxe.ds.StringMap();
-		var opt = { limit : null, orderBy : null, forceIndex : null };
-		switch( eopt.expr ) {
-		case EObjectDecl(fields):
-			var limit = null;
-			for( o in fields ) {
-				if( opts.exists(o.field) ) error("Duplicate option " + o.field, p);
-				opts.set(o.field, true);
-				switch( o.field ) {
-				case "orderBy":
-					var fields = switch( o.expr.expr ) {
-					case EArrayDecl(vl): Lambda.array(Lambda.map(vl, orderField));
-					case ECall(v, pl):
-						if( pl.length != 0 || !Type.enumEq(v.expr, EConst(CIdent("rand"))) )
-							[orderField(o.expr)]
-						else
-							["RAND()"];
-					default: [orderField(o.expr)];
-					};
-					opt.orderBy = fields.join(",");
-				case "limit":
-					var limits = switch( o.expr.expr ) {
-					case EArrayDecl(vl): Lambda.array(Lambda.map(vl, buildDefault));
-					default: [buildDefault(o.expr)];
-					}
-					if( limits.length == 0 || limits.length > 2 ) error("Invalid limits", o.expr.pos);
-					var l0 = limits[0], l1 = limits[1];
-					unify(l0.t, DInt, l0.sql.pos);
-					if( l1 != null )
-						unify(l1.t, DInt, l1.sql.pos);
-					opt.limit = { pos : l0.sql, len : l1 == null ? null : l1.sql };
-				case "forceIndex":
-					var fields = switch( o.expr.expr ) {
-					case EArrayDecl(vl): Lambda.array(Lambda.map(vl, makeIdent));
-					default: [makeIdent(o.expr)];
-					}
-					for( f in fields )
-						if( !inf.hfields.exists(f) )
-							error("Unknown field " + f, o.expr.pos);
-					var idx = fields.join(",");
-					if( !Lambda.exists(inf.indexes, function(i) return i.keys.join(",") == idx) && !Lambda.exists(inf.relations,function(r) return r.key == idx) )
-						error("These fields are not indexed", o.expr.pos);
-					opt.forceIndex = idx;
-				default:
-					error("Unknown option '" + o.field + "'", p);
-				}
-			}
-		default:
-			error("Options should be { orderBy : field, limit : [a,b] }", p);
-		}
-		return opt;
-	}
-
-	public static function getInfos( t : haxe.macro.Type ) {
-		var c = switch( t ) {
-		case TInst(c, _): if( c.toString() == "sys.db.Object" ) return null; c;
-		default: return null;
-		};
-		return new RecordMacros(c);
-	}
-
-
-	#if macro
-	static var RTTI = false;
-	static var FIRST_COMPILATION = true;
-
-	public static function addRtti() : Array<Field> {
-		if( RTTI ) return null;
-		RTTI = true;
-		if( FIRST_COMPILATION ) {
-			FIRST_COMPILATION = false;
-			Context.onMacroContextReused(function() {
-				RTTI = false;
-				GLOBAL = null;
-				return true;
-			});
-		}
-		Context.getType("sys.db.RecordInfos");
-		Context.onGenerate(function(types) {
-			for( t in types )
-				switch( t ) {
-				case TInst(c, _):
-					var c = c.get();
-					var cur = c.superClass;
-					while( cur != null ) {
-						if( cur.t.toString() == "sys.db.Object" )
-							break;
-						cur = cur.t.get().superClass;
-					}
-					if( cur == null || c.meta.has(":skip") || c.meta.has("rtti") )
-						continue;
-					var inst = getInfos(t);
-					var s = new haxe.Serializer();
-					s.useEnumIndex = true;
-					s.useCache = true;
-					s.serialize(inst.inf);
-					c.meta.add("rtti", [ { expr : EConst(CString(s.toString())), pos : c.pos } ], c.pos);
-				default:
-				}
-		});
-		Context.registerModuleReuseCall("sys.db.Manager", "sys.db.RecordMacros.addRtti()");
-		return null;
-	}
-
-	static function getManagerInfos( t : haxe.macro.Type, pos ) {
-		var param = null;
-		switch( t ) {
-		case TInst(c, p):
-			while( true ) {
-				if( c.toString() == "sys.db.Manager" ) {
-					param = p[0];
-					break;
-				}
-				var csup = c.get().superClass;
-				if( csup == null ) break;
-				c = csup.t;
-				p = csup.params;
-			}
-		case TType(t, p):
-			if( p.length == 1 && t.toString() == "sys.db.Manager" )
-				param = p[0];
-		default:
-		}
-		var inst = if( param == null ) null else getInfos(param);
-		if( inst == null )
-			Context.error("This method must be called from a specific Manager", Context.currentPos());
-		inst.initManager(pos);
-		return inst;
-	}
-
-	static function buildSQL( em : Expr, econd : Expr, prefix : String, ?eopt : Expr ) {
-		var pos = Context.currentPos();
-		var inst = getManagerInfos(Context.typeof(em),pos);
-		var sql = { expr : EConst(CString(prefix + " " + inst.quoteField(inst.inf.name))), pos : econd.pos };
-		var r = inst.buildCond(econd);
-		if( r.t != DBool ) Context.error("Expression should be a condition", econd.pos);
-		if( eopt != null && !Type.enumEq(eopt.expr, EConst(CIdent("null"))) ) {
-			var opt = inst.buildOptions(eopt);
-			if( opt.orderBy != null )
-				r.sql = inst.sqlAddString(r.sql, " ORDER BY " + opt.orderBy);
-			if( opt.limit != null ) {
-				r.sql = inst.sqlAddString(r.sql, " LIMIT ");
-				r.sql = inst.sqlAdd(r.sql, opt.limit.pos, pos);
-				if( opt.limit.len != null ) {
-					r.sql = inst.sqlAddString(r.sql, ",");
-					r.sql = inst.sqlAdd(r.sql, opt.limit.len, pos);
-				}
-			}
-			if( opt.forceIndex != null )
-				sql = inst.sqlAddString(sql, " FORCE INDEX (" + inst.inf.name+"_"+opt.forceIndex+")");
-		}
-		sql = inst.sqlAddString(sql, " WHERE ");
-		var sql = inst.sqlAdd(sql, r.sql, sql.pos);
-		#if !display
-		sql = inst.concatStrings(sql);
-		#end
-		return sql;
-	}
-
-	public static function macroGet( em : Expr, econd : Expr, elock : Expr ) {
-		var pos = Context.currentPos();
-		var inst = getManagerInfos(Context.typeof(em),pos);
-		econd = inst.checkKeys(econd);
-		elock = defaultTrue(elock);
-		switch( econd.expr ) {
-		case EObjectDecl(_):
-			return { expr : ECall({ expr : EField(em,"unsafeGetWithKeys"), pos : pos },[econd,elock]), pos : pos };
-		default:
-			return { expr : ECall({ expr : EField(em,"unsafeGet"), pos : pos },[econd,elock]), pos : pos };
-		}
-	}
-
-	static function defaultTrue( e : Expr ) {
-		return switch( e.expr ) {
-		case EConst(CIdent("null")): { expr : EConst(CIdent("true")), pos : e.pos };
-		default: e;
-		}
-	}
-
-	public static function macroSearch( em : Expr, econd : Expr, eopt : Expr, elock : Expr, ?single ) {
-		// allow both search(e,opts) and search(e,lock)
-		if( eopt != null && (elock == null || Type.enumEq(elock.expr, EConst(CIdent("null")))) ) {
-			switch( eopt.expr ) {
-			case EObjectDecl(_):
-			default:
-				var tmp = eopt;
-				eopt = elock;
-				elock = tmp;
-			}
-		}
-		var sql = buildSQL(em, econd, "SELECT * FROM", eopt);
-		var pos = Context.currentPos();
-		var e = { expr : ECall( { expr : EField(em, "unsafeObjects"), pos : pos }, [sql,defaultTrue(elock)]), pos : pos };
-		if( single )
-			e = { expr : ECall( { expr : EField(e, "first"), pos : pos }, []), pos : pos };
-		return e;
-	}
-
-	public static function macroCount( em : Expr, econd : Expr ) {
-		var sql = buildSQL(em, econd, "SELECT COUNT(*) FROM");
-		var pos = Context.currentPos();
-		return { expr : ECall({ expr : EField(em,"unsafeCount"), pos : pos },[sql]), pos : pos };
-	}
-
-	public static function macroDelete( em : Expr, econd : Expr, eopt : Expr ) {
-		var sql = buildSQL(em, econd, "DELETE FROM", eopt);
-		var pos = Context.currentPos();
-		return { expr : ECall({ expr : EField(em,"unsafeDelete"), pos : pos },[sql]), pos : pos };
-	}
-
-	static var isNeko = Context.defined("neko");
-
-	static function buildField( f : Field, fields : Array<Field>, ft : ComplexType, rt : ComplexType, isNull=false ) {
-		var p = switch( ft ) {
-		case TPath(p): p;
-		default: return;
-		}
-		if( p.params.length != 1 )
-			return;
-		var t = switch( p.params[0] ) {
-		case TPExpr(_): return;
-		case TPType(t): t;
-		};
-		var pos = f.pos;
-		switch( p.name ) {
-		case "SData":
-			f.kind = FProp("dynamic", "dynamic", rt, null);
-			f.meta.push( { name : ":data", params : [], pos : f.pos } );
-			f.meta.push( { name : ":isVar", params : [], pos : f.pos } );
-			var meta = [ { name : ":hide", params : [], pos : pos } ];
-			var cache = "cache_" + f.name,
-			    dataName = "data_" + f.name;
-			var ecache = { expr : EConst(CIdent(cache)), pos : pos };
-			var efield = { expr : EConst(CIdent(dataName)), pos : pos };
-			var fname = { expr : EConst(CString(dataName)), pos : pos };
-			var get = {
-				args : [],
-				params : [],
-				ret : t,
-				// we set efield to an empty object to make sure it will be != from previous value when insert/update is triggered
-				expr : macro { if( $ecache == null ) { $ecache = { v : untyped manager.doUnserialize($fname, cast $efield) }; Reflect.setField(this, $fname, { } ); }; return $ecache.v; },
-			};
-			var set = {
-				args : [{ name : "_v", opt : false, type : t, value : null }],
-				params : [],
-				ret : t,
-				expr : macro { if( $ecache == null ) { $ecache = { v : _v }; $efield = cast {}; } else $ecache.v = _v; return _v; },
-			};
-			fields.push( { name : cache, pos : pos, meta : [meta[0], { name:":skip", params:[], pos:pos } ], access : [APrivate], doc : null, kind : FVar(macro : { v : $t }, null) } );
-			fields.push( { name : dataName, pos : pos, meta : [meta[0], { name:":skip", params:[], pos:pos } ], access : [APrivate], doc : null, kind : FVar(macro : Dynamic, null) } );
-			fields.push( { name : "get_" + f.name, pos : pos, meta : meta, access : [APrivate], doc : null, kind : FFun(get) } );
-			fields.push( { name : "set_" + f.name, pos : pos, meta : meta, access : [APrivate], doc : null, kind : FFun(set) } );
-		case "SEnum":
-			f.kind = FProp("dynamic", "dynamic", rt, null);
-			f.meta.push( { name : ":data", params : [], pos : f.pos } );
-			var meta = [ { name : ":hide", params : [], pos : pos } ];
-			var dataName = "data_" + f.name;
-			var efield = { expr : EConst(CIdent(dataName)), pos : pos };
-			var eval = switch( t ) {
-			case TPath(p):
-				var pack = p.pack.copy();
-				pack.push(p.name);
-				if( p.sub != null ) pack.push(p.sub);
-				Context.parse(pack.join("."), f.pos);
-			default:
-				Context.error("Enum parameter expected", f.pos);
-			}
-			var get = {
-				args : [],
-				params : [],
-				ret : t,
-				expr : macro return $efield == null ? null : Type.createEnumIndex($eval,cast $efield),
-			};
-			var set = {
-				args : [{ name : "_v", opt : false, type : t, value : null }],
-				params : [],
-				ret : t,
-				expr : (Context.defined('cs') && !isNull) ?
-					macro { $efield = cast Type.enumIndex(_v); return _v; } :
-					macro { $efield = _v == null ? null : cast Type.enumIndex(_v); return _v; },
-			};
-			fields.push( { name : "get_" + f.name, pos : pos, meta : meta, access : [APrivate], doc : null, kind : FFun(get) } );
-			fields.push( { name : "set_" + f.name, pos : pos, meta : meta, access : [APrivate], doc : null, kind : FFun(set) } );
-			fields.push( { name : dataName, pos : pos, meta : [meta[0], { name:":skip", params:[], pos:pos } ], access : [APrivate], doc : null, kind : FVar(macro : Null<Int>, null) } );
-		case "SNull", "Null":
-			buildField(f, fields, t, rt,true);
-		}
-	}
-
-	public static function macroBuild() {
-		var fields = Context.getBuildFields();
-		var hasManager = false;
-		for( f in fields ) {
-			var skip = false;
-			if( f.name == "manager") hasManager = true;
-			for( m in f.meta )
-				switch( m.name ) {
-				case ":skip":
-					skip = true;
-				case ":relation":
-					switch( f.kind ) {
-						case FVar(t, _):
-							f.kind = FProp("dynamic", "dynamic", t);
-							if( isNeko )
-								continue;
-							// create compile-time getter/setter for other platforms
-							var relKey = null;
-							var relParams = [];
-							var lock = false;
-							for( p in m.params )
-								switch( p.expr ) {
-								case EConst(c):
-									switch( c ) {
-									case CIdent(i):
-										relParams.push(i);
-									default:
-									}
-								default:
-								}
-							relKey = relParams.shift();
-							for( p in relParams )
-								if( p == "lock" )
-									lock = true;
-							// we will get an error later
-							if( relKey == null )
-								continue;
-							// generate get/set methods stubs
-							var pos = f.pos;
-							var ttype = t, tname;
-							while( true )
-								switch(ttype) {
-								case TPath(t):
-									if( t.params.length == 1 && (t.name == "Null" || t.name == "SNull") ) {
-										ttype = switch( t.params[0] ) {
-										case TPType(t): t;
-										default: throw "assert";
-										};
-										continue;
-									}
-									var p = t.pack.copy();
-									p.push(t.name);
-									if( t.sub != null ) p.push(t.sub);
-									tname = p.join(".");
-									break;
-								default:
-									Context.error("Relation type should be a type path", f.pos);
-								}
-							function e(expr) return { expr : expr, pos : pos };
-							var get = {
-								args : [],
-								params : [],
-								ret : t,
-								expr : Context.parse("return untyped "+tname+".manager.__get(this,'"+f.name+"','"+relKey+"',"+lock+")",pos),
-							};
-							var set = {
-								args : [{ name : "_v", opt : false, type : t, value : null }],
-								params : [],
-								ret : t,
-								expr : Context.parse("return untyped "+tname+".manager.__set(this,'"+f.name+"','"+relKey+"',_v)",pos),
-							};
-							var meta = [{ name : ":hide", params : [], pos : pos }];
-							f.meta.push({ name: ":isVar", params : [], pos : pos });
-							fields.push({ name : "get_"+f.name, pos : pos, meta : meta, access : [APrivate], doc : null, kind : FFun(get) });
-							fields.push({ name : "set_"+f.name, pos : pos, meta : meta, access : [APrivate], doc : null, kind : FFun(set) });
-							fields.push({ name : relKey, pos : pos, meta : [{ name : ":skip", params : [], pos : pos }], access : [APrivate], doc : null, kind : FVar(macro : Dynamic) });
-					default:
-						Context.error("Invalid relation field type", f.pos);
-					}
-					break;
-				default:
-				}
-			if( skip )
-				continue;
-			switch( f.kind ) {
-			case FVar(t, _) | FProp('default',_,t,_):
-				if( t != null )
-					buildField(f,fields,t,t);
-			default:
-			}
-		}
-		if( !hasManager ) {
-			var inst = Context.getLocalClass().get();
-			if( inst.meta.has(":skip") )
-				return fields;
-			if (!Context.defined('neko'))
-			{
-				var iname = { expr:EConst(CIdent(inst.name)), pos: inst.pos };
-				var getM = {
-					args : [],
-					params : [],
-					ret : macro : sys.db.Manager<Dynamic>,
-					expr : macro return $iname.manager
-				};
-				fields.push({ name: "__getManager", meta : [], access : [APrivate,AOverride], doc : null, kind : FFun(getM), pos : inst.pos });
-			}
-			var p = inst.pos;
-			var tinst = TPath( { pack : inst.pack, name : inst.name, sub : null, params : [] } );
-			var path = inst.pack.copy().concat([inst.name]).join(".");
-			var enew = { expr : ENew( { pack : ["sys", "db"], name : "Manager", sub : null, params : [TPType(tinst)] }, [Context.parse(path, p)]), pos : p }
-			fields.push({ name : "manager", meta : [], kind : FVar(null,enew), doc : null, access : [AStatic,APublic], pos : p });
-		}
-		return fields;
-	}
-
-	#end
-
-}
diff --git a/std/sys/db/ResultSet.hx b/std/sys/db/ResultSet.hx
index b310911c63448404d81e720c902b9f08564b61b9..49f689994e810ee0f074a02222266bf0e80a7b85 100644
--- a/std/sys/db/ResultSet.hx
+++ b/std/sys/db/ResultSet.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,20 +19,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
 interface ResultSet {
+	var length(get, null):Int;
+	var nfields(get, null):Int;
 
-	var length(get,null) : Int;
-	var nfields(get,null) : Int;
-
-
-	function hasNext() : Bool;
-	function next() : Dynamic;
-	function results() : List<Dynamic>;
-	function getResult( n : Int ) : String;
-	function getIntResult( n : Int ) : Int;
-	function getFloatResult( n : Int ) : Float;
-	function getFieldsNames() : Null<Array<String>>;
-
+	function hasNext():Bool;
+	function next():Dynamic;
+	function results():List<Dynamic>;
+	function getResult(n:Int):String;
+	function getIntResult(n:Int):Int;
+	function getFloatResult(n:Int):Float;
+	function getFieldsNames():Null<Array<String>>;
 }
diff --git a/std/sys/db/Sqlite.hx b/std/sys/db/Sqlite.hx
index 225ff9db77d89df95fa00056f447ce647ed635af..6d0e4c77db7c55399d0ad64b84a372dd2b66344b 100644
--- a/std/sys/db/Sqlite.hx
+++ b/std/sys/db/Sqlite.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,13 +19,23 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.db;
 
 class Sqlite {
+	/**
+		Opens a new SQLite connection on the specified path.
+
+		(cs) You will need a SQLite ADO.NET Provider
+		(see http://www.mono-project.com/docs/database-access/providers/sqlite/).
+		Also note that this will try to open an assembly named `Mono.Data.Sqlite`
+		if it wasn't loaded yet.
 
-	public static function open( file : String ) : Connection {
+		(java) You will need a SQLite JDBC driver (e.g. 
+		https://bitbucket.org/xerial/sqlite-jdbc).
+	**/
+	public static function open(file:String):Connection {
 		throw "Not implemented for this platform";
 		return null;
 	}
-
 }
diff --git a/std/sys/db/TableCreate.hx b/std/sys/db/TableCreate.hx
deleted file mode 100644
index 8a78cc1797a97fbdd44aff8c24a4003fc5b5f80c..0000000000000000000000000000000000000000
--- a/std/sys/db/TableCreate.hx
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.db;
-import sys.db.RecordInfos;
-
-@:deprecated("This class will be removed soon, please install the record-macros library")
-class TableCreate {
-
-	static function autoInc( dbName ) {
-		// on SQLite, autoincrement is necessary to be primary key as well
-		return dbName == "SQLite" ? "PRIMARY KEY AUTOINCREMENT" : "AUTO_INCREMENT";
-	}
-
-	public static function getTypeSQL( t : RecordType, dbName : String ) {
-		return switch( t ) {
-		case DId: "INTEGER "+autoInc(dbName);
-		case DUId: "INTEGER UNSIGNED "+autoInc(dbName);
-		case DInt, DEncoded: "INTEGER";
-		case DUInt: "INTEGER UNSIGNED";
-		case DTinyInt: "TINYINT";
-		case DTinyUInt, DEnum(_): "TINYINT UNSIGNED";
-		case DSmallInt: "SMALLINT";
-		case DSmallUInt: "SMALLINT UNSIGNED";
-		case DMediumInt: "MEDIUMINT";
-		case DMediumUInt: "MEDIUMINT UNSIGNED";
-		case DSingle: "FLOAT";
-		case DFloat: "DOUBLE";
-		case DBool: "TINYINT(1)";
-		case DString(n): "VARCHAR("+n+")";
-		case DDate: "DATE";
-		case DDateTime: "DATETIME";
-		case DTimeStamp: "TIMESTAMP DEFAULT 0";
-		case DTinyText: "TINYTEXT";
-		case DSmallText: "TEXT";
-		case DText, DSerialized: "MEDIUMTEXT";
-		case DSmallBinary: "BLOB";
-		case DBinary, DNekoSerialized, DData: "MEDIUMBLOB";
-		case DLongBinary: "LONGBLOB";
-		case DBigInt: "BIGINT";
-		case DBigId: "BIGINT "+autoInc(dbName);
-		case DBytes(n): "BINARY(" + n + ")";
-		case DFlags(fl, auto): getTypeSQL(auto ? (fl.length <= 8 ? DTinyUInt : (fl.length <= 16 ? DSmallUInt : (fl.length <= 24 ? DMediumUInt : DInt))) : DInt, dbName);
-		case DNull, DInterval: throw "assert";
-		};
-	}
-
-	public static function create( manager : sys.db.Manager<Dynamic>, ?engine ) {
-		function quote(v:String):String {
-			return untyped manager.quoteField(v);
-		}
-		var cnx : Connection = untyped manager.getCnx();
-		if( cnx == null )
-			throw "SQL Connection not initialized on Manager";
-		var dbName = cnx.dbName();
-		var infos = manager.dbInfos();
-		var sql = "CREATE TABLE " + quote(infos.name) + " (";
-		var decls = [];
-		var hasID = false;
-		for( f in infos.fields ) {
-			switch( f.t ) {
-			case DId:
-				hasID = true;
-			case DUId, DBigId:
-				hasID = true;
-				if( dbName == "SQLite" )
-					throw "S" + Std.string(f.t).substr(1)+" is not supported by " + dbName + " : use SId instead";
-			default:
-			}
-			decls.push(quote(f.name)+" "+getTypeSQL(f.t,dbName)+(f.isNull ? "" : " NOT NULL"));
-		}
-		if( dbName != "SQLite" || !hasID )
-			decls.push("PRIMARY KEY ("+Lambda.map(infos.key,quote).join(",")+")");
-		sql += decls.join(",");
-		sql += ")";
-		if( engine != null )
-			sql += "ENGINE="+engine;
-		cnx.request(sql);
-	}
-
-	public static function exists( manager : sys.db.Manager<Dynamic> ) : Bool {
-		var cnx : Connection = untyped manager.getCnx();
-		if( cnx == null )
-			throw "SQL Connection not initialized on Manager";
-		try {
-			cnx.request("SELECT * FROM `"+manager.dbInfos().name+"` LIMIT 1");
-			return true;
-		} catch( e : Dynamic ) {
-			return false;
-		}
-	}
-}
diff --git a/std/sys/db/Transaction.hx b/std/sys/db/Transaction.hx
deleted file mode 100644
index 44a3461c8179b6fc1be1820df3fbfb893efd4975..0000000000000000000000000000000000000000
--- a/std/sys/db/Transaction.hx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.db;
-
-class Transaction {
-
-	public static function isDeadlock(e : Dynamic) {
-		return Std.is(e,String) && ~/try restarting transaction/.match(e);
-	}
-
-	private static function runMainLoop(mainFun,logError,count) {
-		try {
-			mainFun();
-		} catch( e : Dynamic ) {
-			if( count > 0 && isDeadlock(e) ) {
-				Manager.cleanup();
-				Manager.cnx.rollback(); // should be already done, but in case...
-				Manager.cnx.startTransaction();
-				runMainLoop(mainFun,logError,count-1);
-				return;
-			}
-			if( logError == null ) {
-				Manager.cnx.rollback();
-				#if neko
-				neko.Lib.rethrow(e);
-				#else
-				throw e;
-				#end
-			}
-			logError(e); // should ROLLBACK if needed
-		}
-	}
-
-	public static function main( cnx, mainFun : Void -> Void, ?logError : Dynamic -> Void ) {
-		Manager.initialize();
-		Manager.cnx = cnx;
-		Manager.cnx.startTransaction();
-		runMainLoop(mainFun,logError,3);
-		try {
-			Manager.cnx.commit();
-		} catch( e : String ) {
-			// sqlite can have errors on commit
-			if( ~/Database is busy/.match(e) )
-				logError(e);
-		}
-		Manager.cnx.close();
-		Manager.cnx = null;
-		Manager.cleanup();
-	}
-
-}
diff --git a/std/sys/db/Types.hx b/std/sys/db/Types.hx
deleted file mode 100644
index 359ede6102f6c599ff9e66ea8f3f298363ec3876..0000000000000000000000000000000000000000
--- a/std/sys/db/Types.hx
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C)2005-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 sys.db;
-
-// basic types
-
-/** int with auto increment **/
-@:noPackageRestrict
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SId = Null<Int>
-
-/** int unsigned with auto increment **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SUId = Null<Int>
-
-/** big int with auto increment **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SBigId = Null<Float>
-
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SInt = Null<Int>
-
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SUInt = Null<Int>
-
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SBigInt = Null<Float>
-
-/** single precision float **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SSingle = Null<Float>
-
-/** double precision float **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SFloat = Null<Float>
-
-/** use `tinyint(1)` to distinguish with int **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SBool = Null<Bool>
-
-/** same as `varchar(n)` **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SString<Const> = String
-
-/** date only, use `SDateTime` for date+time **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SDate = Date
-
-/** mysql DateTime **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SDateTime = Date
-
-/** mysql Timestamp **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef STimeStamp = Date
-
-/** TinyText (up to 255 bytes) **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef STinyText = String
-
-/** Text (up to 64KB) **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SSmallText = String
-
-/** MediumText (up to 24MB) **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SText = String
-
-/** Blob type (up to 64KB) **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SSmallBinary = haxe.io.Bytes
-
-/** LongBlob type (up to 4GB) **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SLongBinary = haxe.io.Bytes
-
-/** MediumBlob type (up to 24MB) **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SBinary = haxe.io.Bytes
-
-/** same as binary(n) **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SBytes<Const> = haxe.io.Bytes
-
-/** one byte signed `-128...127` **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef STinyInt = Null<Int>
-
-/** two bytes signed `-32768...32767` **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SSmallInt = Null<Int>
-
-/** three bytes signed `-8388608...8388607` **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SMediumInt = Null<Int>
-
-/** one byte `0...255` **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef STinyUInt = Null<Int>
-
-/** two bytes `0...65535` **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SSmallUInt = Null<Int>
-
-/** three bytes `0...16777215` **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SMediumUInt = Null<Int>
-
-// extra
-
-/** specify that this field is nullable **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SNull<T> = Null<T>
-
-/** specify that the integer use custom encoding **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SEncoded = Null<Int>
-
-/** Haxe Serialized string **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SSerialized = String
-
-/** native neko serialized bytes **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SNekoSerialized = haxe.io.Bytes
-
-/** a set of bitflags of different enum values **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SFlags<T:EnumValue> = Null<haxe.EnumFlags<T>>
-
-/** same as `SFlags` but will adapt the storage size to the number of flags **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SSmallFlags<T:EnumValue> = SFlags<T>;
-
-/** allow to store any value in serialized form **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SData<T> = Null<T>
-
-/** allow to store an enum value that does not have parameters as a simple int **/
-@:deprecated("This class will be removed soon, please install the record-macros library")
-typedef SEnum<E:EnumValue> = Null<E>
-
diff --git a/std/sys/io/File.hx b/std/sys/io/File.hx
index 419c3a12b5d958a36a48468b666e58192e4449bd..da5e6c8e3a9b995daff878dfe851b93a07bf04fd 100644
--- a/std/sys/io/File.hx
+++ b/std/sys/io/File.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 /**
-	API for reading and writing to files.
+	API for reading and writing files.
 
 	See `sys.FileSystem` for the complementary file system API.
 **/
 extern class File {
-
 	/**
 		Retrieves the content of the file specified by `path` as a String.
 
@@ -37,7 +37,7 @@ extern class File {
 
 		If `path` is null, the result is unspecified.
 	**/
-	static function getContent( path : String ) : String;
+	static function getContent(path:String):String;
 
 	/**
 		Stores `content` in the file specified by `path`.
@@ -46,7 +46,7 @@ extern class File {
 
 		If `path` or `content` are null, the result is unspecified.
 	**/
-	static function saveContent( path : String, content : String ) : Void;
+	static function saveContent(path:String, content:String):Void;
 
 	/**
 		Retrieves the binary content of the file specified by `path`.
@@ -57,7 +57,7 @@ extern class File {
 
 		If `path` is null, the result is unspecified.
 	**/
-	static function getBytes( path : String ) : haxe.io.Bytes;
+	static function getBytes(path:String):haxe.io.Bytes;
 
 	/**
 		Stores `bytes` in the file specified by `path` in binary mode.
@@ -66,7 +66,7 @@ extern class File {
 
 		If `path` or `bytes` are null, the result is unspecified.
 	**/
-	static function saveBytes( path : String, bytes : haxe.io.Bytes ) : Void;
+	static function saveBytes(path:String, bytes:haxe.io.Bytes):Void;
 
 	/**
 		Returns an `FileInput` handle to the file specified by `path`.
@@ -83,7 +83,7 @@ extern class File {
 
 		If `path` is null, the result is unspecified.
 	**/
-	static function read( path : String, binary : Bool = true ) : FileInput;
+	static function read(path:String, binary:Bool = true):FileInput;
 
 	/**
 		Returns an `FileOutput` handle to the file specified by `path`.
@@ -101,14 +101,21 @@ extern class File {
 
 		If `path` is null, the result is unspecified.
 	**/
-	static function write( path : String, binary : Bool = true ) : FileOutput;
+	static function write(path:String, binary:Bool = true):FileOutput;
 
 	/**
 		Similar to `sys.io.File.write`, but appends to the file if it exists
 		instead of overwriting its contents.
 	**/
-	static function append( path : String, binary : Bool = true ) : FileOutput;
+	static function append(path:String, binary:Bool = true):FileOutput;
 
+	/**
+		Similar to `sys.io.File.append`. While `append` can only seek or write
+		starting from the end of the file's previous contents, `update` can
+		seek to any position, so the file's previous contents can be
+		selectively overwritten.
+	**/
+	static function update(path:String, binary:Bool = true):FileOutput;
 
 	/**
 		Copies the contents of the file specified by `srcPath` to the file
@@ -121,5 +128,5 @@ extern class File {
 
 		If `srcPath` or `dstPath` are null, the result is unspecified.
 	**/
-	static function copy( srcPath : String, dstPath : String ) : Void;
+	static function copy(srcPath:String, dstPath:String):Void;
 }
diff --git a/std/sys/io/FileInput.hx b/std/sys/io/FileInput.hx
index af2aa57cbafa85569159143b2e3e092670c65660..8e81fd805d089633bc445ed9b86184443e14b664 100644
--- a/std/sys/io/FileInput.hx
+++ b/std/sys/io/FileInput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 /**
 	Use `sys.io.File.read` to create a `FileInput`.
 **/
 extern class FileInput extends haxe.io.Input {
-
-	function seek( p : Int, pos : FileSeek ) : Void;
-	function tell() : Int;
-	function eof() : Bool;
-
+	function seek(p:Int, pos:FileSeek):Void;
+	function tell():Int;
+	function eof():Bool;
 }
diff --git a/std/sys/io/FileOutput.hx b/std/sys/io/FileOutput.hx
index 554c7d5f628f96b5117d8213c94cf7266f290054..f334c386ac9ca1d13a7718861b5f3fdbfdf09a2f 100644
--- a/std/sys/io/FileOutput.hx
+++ b/std/sys/io/FileOutput.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 /**
 	Use `sys.io.File.write` to create a `FileOutput`.
 **/
 extern class FileOutput extends haxe.io.Output {
-
-	public function seek( p : Int, pos : FileSeek ) : Void;
-	public function tell() : Int;
-
+	public function seek(p:Int, pos:FileSeek):Void;
+	public function tell():Int;
 }
diff --git a/std/sys/io/FileSeek.hx b/std/sys/io/FileSeek.hx
index b99de9b656b00d33f627ea99df51774017f47af7..21d3699ab581e2e7c81e6668cfa63cb0697fcdb1 100644
--- a/std/sys/io/FileSeek.hx
+++ b/std/sys/io/FileSeek.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 enum FileSeek {
diff --git a/std/sys/io/Process.hx b/std/sys/io/Process.hx
index 792eebffa566e038ed3bb7b12d9e46251194d36c..c6c209eff91f83307f3936ce41272c5278149b10 100644
--- a/std/sys/io/Process.hx
+++ b/std/sys/io/Process.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,23 +19,24 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.io;
 
 extern class Process {
 	/**
 		Standard output. The output stream where a process writes its output data.
 	**/
-	var stdout(default, null) : haxe.io.Input;
+	var stdout(default, null):haxe.io.Input;
 
 	/**
 		Standard error. The output stream to output error messages or diagnostics.
 	**/
-	var stderr(default, null) : haxe.io.Input;
+	var stderr(default, null):haxe.io.Input;
 
 	/**
 		Standard input. The stream data going into a process.
 	**/
-	var stdin(default, null) : haxe.io.Output;
+	var stdin(default, null):haxe.io.Output;
 
 	/**
 		Construct a `Process` object, which run the given command immediately.
@@ -48,32 +49,33 @@ extern class Process {
 		 2. When `args` is not given or is `null`, command arguments can be appended to `cmd`. No automatic quoting/escaping will be performed. `cmd` should be formatted exactly as it would be when typed at the command line.
 		It can run executables, as well as shell commands that are not executables (e.g. on Windows: `dir`, `cd`, `echo` etc).
 
+		`detached` allows the created process to be standalone. You cannot communicate with it but you can look at its exit code. Not supported on php.
+
 		`close()` should be called when the `Process` is no longer used.
-	*/
-	function new( cmd : String, ?args : Array<String> ) : Void;
+	**/
+	function new(cmd:String, ?args:Array<String>, ?detached:Bool):Void;
 
 	/**
 		Return the process ID.
-	*/
-	function getPid() : Int;
+	**/
+	function getPid():Int;
 
 	/**
 		Query the exit code of the process.
 		If `block` is true or not specified, it will block until the process terminates.
 		If `block` is false, it will return either the process exit code if it's already terminated or null if it's still running.
 		If the process has already exited, return the exit code immediately.
-	*/
-	function exitCode( block : Bool = true ) : Null<Int>;
+	**/
+	function exitCode(block:Bool = true):Null<Int>;
 
 	/**
 		Close the process handle and release the associated resources.
 		All `Process` fields should not be used after `close()` is called.
-	*/
-	function close() : Void;
+	**/
+	function close():Void;
 
 	/**
 		Kill the process.
-	*/
-	function kill() : Void;
-
-}
\ No newline at end of file
+	**/
+	function kill():Void;
+}
diff --git a/std/sys/net/Address.hx b/std/sys/net/Address.hx
index de70125b3f30b22f002c26aef6aa8961715d6c63..5ecc0f6fca6ce4ca6fd153bb78b3b2675164b9bf 100644
--- a/std/sys/net/Address.hx
+++ b/std/sys/net/Address.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,15 +19,17 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
 /**
-	An address is used to represent a port on a given host ip. 
+	An address is used to represent a port on a given host ip.
 	It is used by `sys.net.UdpSocket`.
 **/
 class Address {
-	public var host : Int;
-	public var port : Int;
+	public var host:Int;
+	public var port:Int;
+
 	public function new() {
 		host = 0;
 		port = 0;
@@ -39,11 +41,13 @@ class Address {
 		return h;
 	}
 
-	public function compare( a : Address ) {
+	public function compare(a:Address) {
 		var dh = a.host - host;
-		if( dh != 0 ) return dh;
+		if (dh != 0)
+			return dh;
 		var dp = a.port - port;
-		if( dp != 0 ) return dp;
+		if (dp != 0)
+			return dp;
 		return 0;
 	}
 
@@ -53,5 +57,4 @@ class Address {
 		c.port = port;
 		return c;
 	}
-
-}
\ No newline at end of file
+}
diff --git a/std/sys/net/Host.hx b/std/sys/net/Host.hx
index 93dccc4f5c1259e9276e059ebff2b59476a816fa..9cd54fda795ec400260d044656443e618618f541 100644
--- a/std/sys/net/Host.hx
+++ b/std/sys/net/Host.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,42 +19,41 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
 /**
 	A given IP host name.
 **/
 extern class Host {
-
 	/**
 		The provided host string.
 	**/
-	var host(default,null) : String;
+	var host(default, null):String;
 
 	/**
 		The actual IP corresponding to the host.
 	**/
-	var ip(default,null) : Int;
+	var ip(default, null):Int;
 
 	/**
 		Creates a new Host : the name can be an IP in the form "127.0.0.1" or an host name such as "google.com", in which case
 		the corresponding IP address is resolved using DNS. An exception occur if the host name could not be found.
 	**/
-	function new( name : String ) : Void;
+	function new(name:String):Void;
 
 	/**
 		Returns the IP representation of the host
 	**/
-	function toString() : String;
+	function toString():String;
 
 	/**
 		Perform a reverse-DNS query to resolve a host name from an IP.
 	**/
-	function reverse() : String;
+	function reverse():String;
 
 	/**
 		Returns the local computer host name
 	**/
-	static function localhost() : String;
-
+	static function localhost():String;
 }
diff --git a/std/sys/net/Socket.hx b/std/sys/net/Socket.hx
index 3a12abd024babe188d754e53375476a4d69520d2..8a766b66a88762ed85172b049392fcc9edb62f68 100644
--- a/std/sys/net/Socket.hx
+++ b/std/sys/net/Socket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,112 +19,121 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
 /**
 	A TCP socket class : allow you to both connect to a given server and exchange messages or start your own server and wait for connections.
 **/
 extern class Socket {
-
 	/**
 		The stream on which you can read available data. By default the stream is blocking until the requested data is available,
 		use `setBlocking(false)` or `setTimeout` to prevent infinite waiting.
 	**/
-	var input(default,null) : haxe.io.Input;
+	var input(default, null):haxe.io.Input;
 
 	/**
 		The stream on which you can send data. Please note that in case the output buffer you will block while writing the data, use `setBlocking(false)` or `setTimeout` to prevent that.
 	**/
-	var output(default,null) : haxe.io.Output;
+	var output(default, null):haxe.io.Output;
 
 	/**
 		A custom value that can be associated with the socket. Can be used to retrieve your custom infos after a `select`.
 	***/
-	var custom : Dynamic;
+	var custom:Dynamic;
 
 	/**
 		Creates a new unconnected socket.
 	**/
-	function new() : Void;
+	function new():Void;
 
 	/**
 		Closes the socket : make sure to properly close all your sockets or you will crash when you run out of file descriptors.
 	**/
-	function close() : Void;
+	function close():Void;
 
 	/**
 		Read the whole data available on the socket.
+
+		*Note*: this is **not** meant to be used together with `setBlocking(false)`,
+		as it will always throw `haxe.io.Error.Blocked`. `input` methods should be used directly instead.
 	**/
-	function read() : String;
+	function read():String;
 
 	/**
 		Write the whole data to the socket output.
+
+		*Note*: this is **not** meant to be used together with `setBlocking(false)`, as
+		`haxe.io.Error.Blocked` may be thrown mid-write with no indication of how many bytes have been written.
+		`output.writeBytes()` should be used instead as it returns this information.
 	**/
-	function write( content : String ) : Void;
+	function write(content:String):Void;
 
 	/**
 		Connect to the given server host/port. Throw an exception in case we couldn't successfully connect.
 	**/
-	function connect( host : Host, port : Int ) : Void;
+	function connect(host:Host, port:Int):Void;
 
 	/**
 		Allow the socket to listen for incoming questions. The parameter tells how many pending connections we can have until they get refused. Use `accept()` to accept incoming connections.
 	**/
-	function listen( connections : Int ) : Void;
+	function listen(connections:Int):Void;
 
 	/**
 		Shutdown the socket, either for reading or writing.
 	**/
-	function shutdown( read : Bool, write : Bool ) : Void;
+	function shutdown(read:Bool, write:Bool):Void;
 
 	/**
 		Bind the socket to the given host/port so it can afterwards listen for connections there.
 	**/
-	function bind( host : Host, port : Int ) : Void;
+	function bind(host:Host, port:Int):Void;
 
 	/**
 		Accept a new connected client. This will return a connected socket on which you can read/write some data.
 	**/
-	function accept() : Socket;
+	function accept():Socket;
 
 	/**
 		Return the information about the other side of a connected socket.
 	**/
-	function peer() : { host : Host, port : Int };
+	function peer():{host:Host, port:Int};
 
 	/**
 		Return the information about our side of a connected socket.
 	**/
-	function host() : { host : Host, port : Int };
+	function host():{host:Host, port:Int};
 
 	/**
-		Gives a timeout after which blocking socket operations (such as reading and writing) will abort and throw an exception.
+		Gives a timeout (in seconds) after which blocking socket operations (such as reading and writing) will abort and throw an exception.
 	**/
-	function setTimeout( timeout : Float ) : Void;
+	function setTimeout(timeout:Float):Void;
 
 	/**
 		Block until some data is available for read on the socket.
 	**/
-	function waitForRead() : Void;
+	function waitForRead():Void;
 
 	/**
-		Change the blocking mode of the socket. A blocking socket is the default behavior. A non-blocking socket will abort blocking operations immediately by throwing a haxe.io.Error.Blocking value.
+		Change the blocking mode of the socket. A blocking socket is the default behavior. A non-blocking socket will abort blocking operations immediately by throwing a haxe.io.Error.Blocked value.
 	**/
-	function setBlocking( b : Bool ) : Void;
+	function setBlocking(b:Bool):Void;
 
 	/**
 		Allows the socket to immediately send the data when written to its output : this will cause less ping but might increase the number of packets / data size, especially when doing a lot of small writes.
 	**/
-	function setFastSend( b : Bool ) : Void;
+	function setFastSend(b:Bool):Void;
 
 	/**
-		Wait until one of the sockets groups is ready for the given operation :
-		 - `read`contains sockets on which we want to wait for available data to be read,
+		Wait until one of the sockets group is ready for the given operation:
+
+		 - `read` contains sockets on which we want to wait for available data to be read,
 		 - `write` contains sockets on which we want to wait until we are allowed to write some data to their output buffers,
 		 - `others` contains sockets on which we want to wait for exceptional conditions.
 		 - `select` will block until one of the condition is met, in which case it will return the sockets for which the condition was true.
-		In case a `timeout` (in seconds) is specified, select might wait at worse until the timeout expires.
-	**/
-	static function select(read : Array<Socket>, write : Array<Socket>, others : Array<Socket>, ?timeout : Float) : { read: Array<Socket>,write: Array<Socket>,others: Array<Socket> };
 
+		In case a `timeout` (in seconds) is specified, select might wait at worst until the timeout expires.
+	**/
+	static function select(read:Array<Socket>, write:Array<Socket>, others:Array<Socket>,
+		?timeout:Float):{read:Array<Socket>, write:Array<Socket>, others:Array<Socket>};
 }
diff --git a/std/sys/net/UdpSocket.hx b/std/sys/net/UdpSocket.hx
index b61e9283e727e3b76d591b410a01fa2602b7a943..6edbd386736342a331c308781d9f517272c5c884 100644
--- a/std/sys/net/UdpSocket.hx
+++ b/std/sys/net/UdpSocket.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2019 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,30 +19,36 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.net;
 
 /**
 	A UDP socket class
 **/
 class UdpSocket extends Socket {
-
 	public function new() {
 		throw "Not available on this platform";
 		super();
 	}
 
+	/**
+		Allows the socket to send to broadcast addresses.
+	**/
+	public function setBroadcast(b:Bool):Void {
+		throw "Not available on this platform";
+	}
+
 	/**
 		Sends data to the specified target host/port address.
 	**/
-	public function sendTo( buf : haxe.io.Bytes, pos : Int, len : Int, addr : Address ) : Int {
+	public function sendTo(buf:haxe.io.Bytes, pos:Int, len:Int, addr:Address):Int {
 		return 0;
 	}
 
 	/**
 		Reads data from any incoming address and store the receiver address into the address parameter.
 	**/
-	public function readFrom( buf : haxe.io.Bytes, pos : Int, len : Int, addr : Address ) : Int {
+	public function readFrom(buf:haxe.io.Bytes, pos:Int, len:Int, addr:Address):Int {
 		return 0;
 	}
-
 }
diff --git a/std/sys/ssl/Certificate.hx b/std/sys/ssl/Certificate.hx
index 2221146808f85d65e0c0eeaadfe2a0603b75445d..16b705b48039dc0587a622e422c9d405cee11fe4 100644
--- a/std/sys/ssl/Certificate.hx
+++ b/std/sys/ssl/Certificate.hx
@@ -1,39 +1,59 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
 
 extern class Certificate {
-	
-	public static function loadFile( file : String ) : Certificate;
-	
-	public static function loadPath( path : String ) : Certificate;
+	public static function loadFile(file:String):Certificate;
+
+	public static function loadPath(path:String):Certificate;
+
+	public static function fromString(str:String):Certificate;
+
+	public static function loadDefaults():Certificate;
+
+	public var commonName(get, null):Null<String>;
+
+	public var altNames(get, null):Array<String>;
+
+	public var notBefore(get, null):Date;
 
-	public static function fromString( str : String ) : Certificate;
-	
-	public static function loadDefaults() : Certificate;
+	public var notAfter(get, null):Date;
 
-	public var commonName(get,null) : Null<String>;
+	public function subject(field:String):Null<String>;
 
-	public var altNames(get,null) : Array<String>;
-	
-	public var notBefore(get,null) : Date;
-	
-	public var notAfter(get,null) : Date;
-	
-	public function subject( field : String ) : Null<String>;
-	
-	public function issuer( field : String ) : Null<String>;
-	
-	public function next() : Null<Certificate>;
+	public function issuer(field:String):Null<String>;
 
-	public function add( pem : String ) : Void;
+	public function next():Null<Certificate>;
 
-	public function addDER( der : haxe.io.Bytes ) : Void;
+	public function add(pem:String):Void;
 
-	private function get_commonName() : Null<String>;
+	public function addDER(der:haxe.io.Bytes):Void;
 
-	private function get_altNames() : Array<String>;
+	private function get_commonName():Null<String>;
 
-	private function get_notBefore() : Date;
+	private function get_altNames():Array<String>;
 
-	private function get_notAfter() : Date;
+	private function get_notBefore():Date;
 
+	private function get_notAfter():Date;
 }
diff --git a/std/sys/ssl/Digest.hx b/std/sys/ssl/Digest.hx
index 3499a2b170065967efa85ee4f86c9b622b251841..b5ae65815a539b7b13d26153596a7c713a221cf5 100644
--- a/std/sys/ssl/Digest.hx
+++ b/std/sys/ssl/Digest.hx
@@ -1,11 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
 
 extern class Digest {
-	
-	static function make( data : haxe.io.Bytes, alg : DigestAlgorithm ) : haxe.io.Bytes;
-	
-	static function sign( data : haxe.io.Bytes, privKey : Key, alg : DigestAlgorithm ) : haxe.io.Bytes;
-	
-	static function verify( data : haxe.io.Bytes, signature : haxe.io.Bytes, pubKey : Key, alg : DigestAlgorithm ) : Bool;
+	static function make(data:haxe.io.Bytes, alg:DigestAlgorithm):haxe.io.Bytes;
+
+	static function sign(data:haxe.io.Bytes, privKey:Key, alg:DigestAlgorithm):haxe.io.Bytes;
 
+	static function verify(data:haxe.io.Bytes, signature:haxe.io.Bytes, pubKey:Key, alg:DigestAlgorithm):Bool;
 }
diff --git a/std/sys/ssl/DigestAlgorithm.hx b/std/sys/ssl/DigestAlgorithm.hx
index aed3b0494cf5d4a6ad9a09911d83a88ef51c81b0..d7e714656cb534e4d47cce0748fa9d03802ce2d4 100644
--- a/std/sys/ssl/DigestAlgorithm.hx
+++ b/std/sys/ssl/DigestAlgorithm.hx
@@ -1,7 +1,28 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
 
-@:enum
-abstract DigestAlgorithm(String) to String {
+enum abstract DigestAlgorithm(String) to String {
 	var MD5 = "MD5";
 	var SHA1 = "SHA1";
 	var SHA224 = "SHA224";
diff --git a/std/sys/ssl/Key.hx b/std/sys/ssl/Key.hx
index 1bc013fbcc140b7fe9585c42ec3d74e98fcddd1b..59368cf83cedf0194928650bd49c9d0338ee9fb5 100644
--- a/std/sys/ssl/Key.hx
+++ b/std/sys/ssl/Key.hx
@@ -1,11 +1,31 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
 
 extern class Key {
-	
-	static function loadFile( file : String, ?isPublic : Bool, ?pass : String ) : Key;
-	
-	static function readPEM( data : String, isPublic : Bool, ?pass : String ) : Key;
+	static function loadFile(file:String, ?isPublic:Bool, ?pass:String):Key;
 
-	static function readDER( data : haxe.io.Bytes, isPublic : Bool ) : Key;
+	static function readPEM(data:String, isPublic:Bool, ?pass:String):Key;
 
+	static function readDER(data:haxe.io.Bytes, isPublic:Bool):Key;
 }
diff --git a/std/sys/ssl/Socket.hx b/std/sys/ssl/Socket.hx
index d5c8da1fbac331324c54db788bd04d42d459b6dd..c540ac9be4de42df71a10b1c6eb9cfabee098950 100644
--- a/std/sys/ssl/Socket.hx
+++ b/std/sys/ssl/Socket.hx
@@ -1,50 +1,70 @@
+/*
+ * Copyright (C)2005-2019 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 sys.ssl;
 
 /**
 	A TLS socket class : allow you to both connect to a given server and exchange messages or start your own server and wait for connections.
 **/
 extern class Socket extends sys.net.Socket {
+	static var DEFAULT_VERIFY_CERT:Null<Bool>;
 
-	static var DEFAULT_VERIFY_CERT : Null<Bool>;
-
-	static var DEFAULT_CA : Null<sys.ssl.Certificate>;
+	static var DEFAULT_CA:Null<sys.ssl.Certificate>;
 
 	/**
 		Define if peer certificate is verified during SSL handshake.
 	**/
-	var verifyCert : Null<Bool>;
+	var verifyCert:Null<Bool>;
 
-	function new() : Void;
+	function new():Void;
 
 	/**
 		Perform the SSL handshake.
 	**/
-	function handshake() : Void;
-	
+	function handshake():Void;
+
 	/**
 		Configure the certificate chain for peer certificate verification.
-	**/	
-	function setCA( cert : sys.ssl.Certificate ) : Void;
+	**/
+	function setCA(cert:sys.ssl.Certificate):Void;
 
 	/**
 		Configure the hostname for Server Name Indication TLS extension.
 	**/
-	function setHostname( name : String ) : Void;
+	function setHostname(name:String):Void;
 
 	/**
 		Configure own certificate and private key.
 	**/
-	function setCertificate( cert : Certificate, key : Key ) : Void;
+	function setCertificate(cert:Certificate, key:Key):Void;
 
 	/**
 		Configure additionals certificates and private keys for Server Name Indication extension.
 		The callback may be called during handshake to determine the certificate to use.
 	**/
-	function addSNICertificate( cbServernameMatch : String->Bool, cert : Certificate, key : Key ) : Void;
-	
+	function addSNICertificate(cbServernameMatch:String->Bool, cert:Certificate, key:Key):Void;
+
 	/**
 		Return the certificate received from the other side of a connection.
 	**/
-	function peerCertificate() : sys.ssl.Certificate;
-
+	function peerCertificate():sys.ssl.Certificate;
 }
diff --git a/std/sys/thread/Deque.hx b/std/sys/thread/Deque.hx
new file mode 100644
index 0000000000000000000000000000000000000000..779e8f43f8f549fb0101884e932ae7ec262ce29e
--- /dev/null
+++ b/std/sys/thread/Deque.hx
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+#if (!target.threaded)
+#error "This class is not available on this target"
+#end
+
+/**
+	A Deque is a double-ended queue with a `pop` method that can block until
+	an element is available. It is commonly used to synchronize threads.
+ */
+@:coreApi extern class Deque<T> {
+	/**
+		Create a new Deque instance which is initially empty.
+	**/
+	public function new():Void;
+
+	/**
+		Adds an element at the end of `this` Deque.
+	**/
+	public function add(i:T):Void;
+
+	/**
+		Adds an element at the front of `this` Deque.
+	**/
+	public function push(i:T):Void;
+
+	/**
+		Tries to retrieve an element from the front of `this` Deque.
+
+		If an element is available, it is removed from the queue and returned.
+
+		If no element is available and `block` is `false`, `null` is returned.
+
+		Otherwise, execution blocks until an element is available and returns it.
+	**/
+	public function pop(block:Bool):Null<T>;
+}
diff --git a/std/sys/thread/Lock.hx b/std/sys/thread/Lock.hx
new file mode 100644
index 0000000000000000000000000000000000000000..70bea3fd70cfbd0c7d45c67fac13efd503655b04
--- /dev/null
+++ b/std/sys/thread/Lock.hx
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+#if (!target.threaded)
+#error "This class is not available on this target"
+#end
+
+/**
+	A Lock allows blocking execution until it has been unlocked. It keeps track
+	of how often `release` has been called, and blocks exactly as many `wait`
+	calls.
+
+	The order of the `release` and `wait` calls is irrelevant. That is, a Lock
+	can be released before anyone waits for it. In that case, the `wait` call
+	will execute immediately.
+
+	Usage example:
+
+	```
+		var lock = new Lock();
+		var elements = [1, 2, 3];
+		for (element in elements) {
+			// Create one thread per element
+			new Thread(function() {
+				trace(element);
+				Sys.sleep(1);
+				// Release once per thread = 3 times
+				lock.release();
+			});
+		}
+		for (_ in elements) {
+			// Wait 3 times
+			lock.wait();
+		}
+		trace("All threads finished");
+	```
+**/
+extern class Lock {
+	/**
+		Creates a new Lock which is initially locked.
+	**/
+	public function new():Void;
+
+	/**
+		Waits for the lock to be released, or `timeout` (in seconds)
+		to expire. Returns `true` if the lock is released and `false`
+		if a time-out occurs.
+	**/
+	public function wait(?timeout:Float):Bool;
+
+	/**
+		Releases the lock once.
+
+		The thread does not need to own the lock in order to release
+		it. Each call to `release` allows exactly one call to `wait`
+		to execute.
+	**/
+	public function release():Void;
+}
diff --git a/std/sys/thread/Mutex.hx b/std/sys/thread/Mutex.hx
new file mode 100644
index 0000000000000000000000000000000000000000..19f1823bf93e719a041417a863f742408950e6e1
--- /dev/null
+++ b/std/sys/thread/Mutex.hx
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+#if (!target.threaded)
+#error "This class is not available on this target"
+#end
+
+/**
+	Creates a mutex, which can be used to acquire a temporary lock
+	to access some ressource. The main difference with a lock is
+	that a mutex must always be released by the owner thread.
+ */
+extern class Mutex {
+	/**
+		Creates a mutex.
+	**/
+	public function new():Void;
+
+	/**
+		The current thread acquire the mutex or wait if not available.
+		The same thread can acquire several times the same mutex but
+		must release it as many times it has been acquired.
+	**/
+	public function acquire():Void;
+
+	/**
+		Try to acquire the mutex, returns true if acquire or false
+		if it's already locked by another thread.
+	**/
+	public function tryAcquire():Bool;
+
+	/**
+		Release a mutex that has been acquired by the current thread.
+		The behavior is undefined if the current thread does not own
+		the mutex.
+	**/
+	public function release():Void;
+}
diff --git a/std/sys/thread/Thread.hx b/std/sys/thread/Thread.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d11b7bc6fa9d58638d0e4a62d113d0edb6310153
--- /dev/null
+++ b/std/sys/thread/Thread.hx
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+#if (!target.threaded)
+#error "This class is not available on this target"
+#end
+extern abstract Thread({}) {
+	/**
+		Send a message to the thread queue. This message can be read by using `readMessage`.
+	**/
+	public function sendMessage(msg:Dynamic):Void;
+
+	/**
+		Returns the current thread.
+	**/
+	public static function current():Thread;
+
+	/**
+		Creates a new thread that will execute the `f` function, then exit.
+	**/
+	public static function create(callb:Void->Void):Thread;
+
+	/**
+		Reads a message from the thread queue. If `block` is true, the function
+		blocks until a message is available. If `block` is false, the function
+		returns `null` if no message is available.
+	**/
+	public static function readMessage(block:Bool):Dynamic;
+}
diff --git a/std/sys/thread/Tls.hx b/std/sys/thread/Tls.hx
new file mode 100644
index 0000000000000000000000000000000000000000..129aa5c9c1480ea4d598471edeee016a3c410e76
--- /dev/null
+++ b/std/sys/thread/Tls.hx
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C)2005-2019 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 sys.thread;
+
+#if (!target.threaded)
+#error "This class is not available on this target"
+#end
+
+/**
+	Creates thread local storage.
+
+	(hl) Warning: At the moment `Tls` does not protect the value from being
+	garbage collected. Keep the value reachable to avoid crashes.
+**/
+extern class Tls<T> {
+	public var value(get, set):T;
+
+	/**
+		Creates thread local storage. This is placeholder that can store
+		a value that will be different depending on the local thread.
+		Set the tls value to `null` before exiting the thread
+		or the memory will never be collected.
+	**/
+	public function new():Void;
+}
diff --git a/tests/Brewfile b/tests/Brewfile
index 00f877fc260d03f66e6fb91e78d32dd6741ee3a7..c30420cc0b7f89bc6094da26927d19e8408077fc 100644
--- a/tests/Brewfile
+++ b/tests/Brewfile
@@ -1,5 +1,9 @@
 brew "ocaml"
-brew "camlp4"
+brew "camlp5"
+brew "opam"
+brew "ninja"
 brew "zlib"
 brew "pcre"
 brew "awscli"
+brew "cmake"
+brew "pkg-config"
diff --git a/tests/RunCi.hx b/tests/RunCi.hx
index e88c544e07396ae97603ff87274aa974357692e6..5da13ce7f390b040fc1c86b5266803535bcc1c07 100644
--- a/tests/RunCi.hx
+++ b/tests/RunCi.hx
@@ -1,45 +1,10 @@
-using StringTools;
-
-import yaml.*;
-
-import sys.*;
-import sys.io.*;
-import haxe.*;
-import haxe.io.*;
-
-private typedef TravisConfig = {
-	before_install: Array<String>,
-	script: Array<String>
-}
-
-/**
-	List of "TEST" defined in the "matrix" section of ".travis.yml".
-*/
-@:enum abstract TEST(String) from String {
-	var Macro = "macro";
-	var Neko = "neko";
-	var Js = "js";
-	var Lua = "lua";
-	var Php = "php";
-	var Php7 = "php7";
-	var Cpp = "cpp";
-	var Flash9 = "flash9";
-	var As3 = "as3";
-	var Java = "java";
-	var Cs = "cs";
-	var Python = "python";
-	var Hl = "hl";
-	var ThirdParty = "third-party";
-}
+import runci.TestTarget;
+import runci.System;
+import runci.System.*;
+import runci.Config.*;
+import runci.Deployment.*;
 
-enum Ci {
-	TravisCI;
-	AppVeyor;
-}
-
-enum Failure {
-	Fail;
-}
+using StringTools;
 
 /**
 	Will be run by CI services, currently TravisCI and AppVeyor.
@@ -53,850 +18,24 @@ enum Failure {
 	Build result: https://ci.appveyor.com/project/HaxeFoundation/haxe
 */
 class RunCi {
-	static function successMsg(msg:String):Void {
-		Sys.println('\x1b[32m' + msg + '\x1b[0m');
-	}
-	static function failMsg(msg:String):Void {
-		Sys.println('\x1b[31m' + msg + '\x1b[0m');
-	}
-	static function infoMsg(msg:String):Void {
-		Sys.println('\x1b[36m' + msg + '\x1b[0m');
-	}
-
-	static function fail():Void {
-		success = false;
-		throw Fail;
-	}
-
-	static var S3_HXBUILDS_ADDR(default, null) = 's3://hxbuilds/builds/haxe';
-
-	/**
-		Run a command using `Sys.command()`.
-		If the command exits with non-zero code, exit the whole script with the same code.
-
-		If `useRetry` is `true`, the command will be re-run if it exits with non-zero code (3 trials).
-		It is useful for running network-dependent commands.
-	*/
-	static function runCommand(cmd:String, ?args:Array<String>, useRetry:Bool = false, allowFailure:Bool = false):Void {
-		var trials = useRetry ? 3 : 1;
-		var exitCode:Int = 1;
-		var cmdStr = cmd + (args == null ? '' : ' $args');
-
-		while (trials-->0) {
-			Sys.println('Command: $cmdStr');
-
-			var t = Timer.stamp();
-			exitCode = Sys.command(cmd, args);
-			var dt = Math.round(Timer.stamp() - t);
-
-			if (exitCode == 0)
-				successMsg('Command exited with $exitCode in ${dt}s: $cmdStr');
-			else
-				failMsg('Command exited with $exitCode in ${dt}s: $cmdStr');
-
-			if (exitCode == 0) {
-				return;
-			} else if (trials > 0) {
-				Sys.println('Command will be re-run...');
-			}
-		}
-
-		if (!allowFailure)
-			fail();
-	}
-
-	static function isAptPackageInstalled(aptPackage:String):Bool {
-		return commandSucceed("dpkg-query", ["-W", "-f='${Status}'", aptPackage]);
-	}
-
-	static function requireAptPackages(packages:Array<String>):Void {
-		var notYetInstalled = [for (p in packages) if (!isAptPackageInstalled(p)) p];
-		if (notYetInstalled.length > 0)
-			runCommand("sudo", ["apt-get", "install", "-y"].concat(notYetInstalled), true);
-	}
-
-	static function haxelibInstallGit(account:String, repository:String, ?branch:String, ?srcPath:String, useRetry:Bool = false, ?altName:String):Void {
-		var name:String = (altName == null) ? repository : altName;
-		try {
-			getHaxelibPath(name);
-			infoMsg('$name has already been installed.');
-		} catch (e:Dynamic) {
-			var args:Array<String> = ["git", name, 'https://github.com/$account/$repository'];
-			if (branch != null) {
-				args.push(branch);
-			}
-			if (srcPath != null) {
-				args.push(srcPath);
-			}
-
-			runCommand("haxelib", args, useRetry);
-		}
-	}
-
-	static function haxelibInstall(library:String):Void {
-		try {
-			getHaxelibPath(library);
-			infoMsg('$library has already been installed.');
-		} catch (e:Dynamic) {
-			runCommand("haxelib", ["install", library]);
-		}
-	}
-
-	static function haxelibRun(args:Array<String>, useRetry:Bool = false):Void {
-		runCommand("haxelib", ["run"].concat(args), useRetry);
-	}
-
-	static function getHaxelibPath(libName:String) {
-		var proc = new Process("haxelib", ["path", libName]);
-		var result;
-		var code = proc.exitCode();
-		do {
-			result = proc.stdout.readLine();
-			if (!result.startsWith("-L")) {
-				break;
-			}
-		} while(true);
-		proc.close();
-		if (code != 0) {
-			throw 'Failed to get haxelib path ($result)';
-		}
-		return result;
-	}
-
-	static function changeDirectory(path:String) {
-		Sys.println('Changing directory to $path');
-		Sys.setCwd(path);
-	}
-
-	static function setupFlashPlayerDebugger():Void {
-		var mmcfgPath = switch (systemName) {
-			case "Linux":
-				Sys.getEnv("HOME") + "/mm.cfg";
-			case "Mac":
-				"/Library/Application Support/Macromedia/mm.cfg";
-			case _:
-				throw "unsupported system";
-		}
-
-		switch (systemName) {
-			case "Linux":
-				requireAptPackages([
-					"libcurl3:i386", "libglib2.0-0:i386", "libx11-6:i386", "libxext6:i386",
-					"libxt6:i386", "libxcursor1:i386", "libnss3:i386", "libgtk2.0-0:i386"
-				]);
-				runCommand("wget", ["-nv", "http://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux_debug.x86_64.tar.gz"], true);
-				runCommand("tar", ["-xf", "flash_player_sa_linux_debug.x86_64.tar.gz", "-C", Sys.getEnv("HOME")]);
-				File.saveContent(mmcfgPath, "ErrorReportingEnable=1\nTraceOutputFileEnable=1");
-				runCommand(Sys.getEnv("HOME") + "/flashplayerdebugger", ["-v"]);
-			case "Mac":
-				runCommand("brew", ["tap", "caskroom/versions"]);
-				runCommand("brew", ["cask", "install", "flash-player-debugger"]);
-				var dir = Path.directory(mmcfgPath);
-				runCommand("sudo", ["mkdir", "-p", dir]);
-				runCommand("sudo", ["chmod", "a+w", dir]);
-				File.saveContent(mmcfgPath, "ErrorReportingEnable=1\nTraceOutputFileEnable=1");
-		}
-	}
-
-	/**
-		Run a Flash swf file.
-		Return whether the test is successful or not.
-		It detemines the test result by reading the flashlog.txt, looking for "SUCCESS: true".
-	*/
-	static function runFlash(swf:String):Bool {
-		swf = FileSystem.fullPath(swf);
-		Sys.println('going to run $swf');
-		switch (systemName) {
-			case "Linux":
-				new Process(Sys.getEnv("HOME") + "/flashplayerdebugger", [swf]);
-			case "Mac":
-				Sys.command("open", ["-a", "/Applications/Flash Player Debugger.app", swf]);
-		}
-
-		//wait a little until flashlog.txt is created
-		var flashlogPath = switch (systemName) {
-			case "Linux":
-				Sys.getEnv("HOME") + "/.macromedia/Flash_Player/Logs/flashlog.txt";
-			case "Mac":
-				Sys.getEnv("HOME") + "/Library/Preferences/Macromedia/Flash Player/Logs/flashlog.txt";
-			case _:
-				throw "unsupported system";
-		}
-
-		for (t in 0...5) {
-			runCommand("sleep", ["2"]);
-			if (FileSystem.exists(flashlogPath))
-				break;
-		}
-		if (!FileSystem.exists(flashlogPath)) {
-			failMsg('$flashlogPath not found.');
-			return false;
-		}
-
-		//read flashlog.txt continously
-		var traceProcess = new Process("tail", ["-f", flashlogPath]);
-		var line = "";
-		while (true) {
-			try {
-				line = traceProcess.stdout.readLine();
-				Sys.println(line);
-				if (line.indexOf("SUCCESS: ") >= 0) {
-					return line.indexOf("SUCCESS: true") >= 0;
-				}
-			} catch (e:haxe.io.Eof) {
-				break;
-			}
-		}
-		return false;
-	}
-
-	static function runCs(exe:String, ?args:Array<String>):Void {
-		if (args == null) args = [];
-		exe = FileSystem.fullPath(exe);
-		switch (systemName) {
-			case "Linux", "Mac":
-				runCommand("mono", [exe].concat(args));
-			case "Windows":
-				runCommand(exe, args);
-				switch (ci) {
-					case AppVeyor:
-						// https://github.com/HaxeFoundation/haxe/issues/4873
-						// runCommand("mono", [exe].concat(args));
-					case _:
-						//pass
-				}
-		}
-	}
-
-	static function runCpp(bin:String, ?args:Array<String>):Void {
-		if (args == null) args = [];
-		bin = FileSystem.fullPath(bin);
-		runCommand(bin, args);
-	}
-
-	static function parseCommand(cmd:String) {
-		var args = [];
-		var offset = 0;
-		var cur = new StringBuf();
-		var inString = false;
-
-		while(true) {
-			switch(cmd.fastCodeAt(offset++)) {
-				case '"'.code:
-					inString = !inString;
-				case ' '.code if (!inString):
-					if (cur.length > 0) {
-						args.push(cur.toString());
-						cur = new StringBuf();
-					}
-				case '\\'.code:
-					cur.addChar(cmd.fastCodeAt(offset++));
-				case "$".code:
-					switch (cmd.fastCodeAt(offset)) {
-						case '('.code:
-							++offset;
-							var env = new StringBuf();
-							while(true) {
-								switch(cmd.fastCodeAt(offset++)) {
-									case ')'.code:
-										break;
-									case c:
-										env.addChar(c);
-								}
-							}
-							cur.add(Sys.getEnv(env.toString()));
-						case _:
-							cur.addChar("$".code);
-					}
-				case c:
-					cur.addChar(c);
-			}
-			if (offset == cmd.length) {
-				break;
-			}
-		}
-		if (cur.length > 0) {
-			args.push(cur.toString());
-		}
-		return args;
-	}
-
-	//static function parseTravisFile(path:String, ignoreBeforeInstall = false) {
-		//var yaml:TravisConfig = yaml.Yaml.read(path, Parser.options().useObjects());
-		//if (!ignoreBeforeInstall) {
-			//for (code in yaml.before_install) {
-				//var args = parseCommand(code);
-				//var cmd = args.shift();
-				//runCommand(cmd, args);
-			//}
-		//}
-		//for (code in yaml.script) {
-			//var args = parseCommand(code);
-			//var cmd = args.shift();
-			//runCommand(cmd, args);
-		//}
-	//}
-
-	static function commandSucceed(cmd:String, args:Array<String>):Bool {
-		return try {
-			var p = new Process(cmd, args);
-			var succeed = p.exitCode() == 0;
-			p.close();
-			succeed;
-		} catch(e:Dynamic) false;
-	}
-
-	static function commandResult(cmd:String, args:Array<String>):{
-		stdout:String,
-		stderr:String,
-		exitCode:Int
-	} {
-		var p = new Process(cmd, args);
-		var out = {
-			stdout: p.stdout.readAll().toString(),
-			stderr: p.stderr.readAll().toString(),
-			exitCode: p.exitCode()
-		}
-		p.close();
-		return out;
-	}
-
-	static function addToPATH(path:String):Void {
-		switch (systemName) {
-			case "Windows":
-				Sys.putEnv("PATH", Sys.getEnv("PATH") + ";" + path);
-			case "Mac", "Linux":
-				Sys.putEnv("PATH", Sys.getEnv("PATH") + ":" + path);
-		}
-	}
-
-	static function getPhpDependencies() {
-		switch (systemName) {
-			case "Linux":
-				var phpCmd = commandResult("php", ["-v"]);
-				var phpVerReg = ~/PHP ([0-9]+\.[0-9]+)/i;
-				var phpVer = if (phpVerReg.match(phpCmd.stdout))
-					Std.parseFloat(phpVerReg.matched(1));
-				else
-					null;
-				if (phpCmd.exitCode == 0 && phpVer != null && phpVer >= 5.5) {
-					infoMsg('php has already been installed.');
-				} else {
-					requireAptPackages(["php5-cli", "php5-mysql", "php5-sqlite"]);
-				}
-			case "Mac":
-				//pass
-			case "Windows":
-				if (commandSucceed("php", ["-v"])) {
-					infoMsg('php has already been installed.');
-				} else {
-					runCommand("cinst", ["php", "-version", "5.6.3", "-y"], true);
-					addToPATH("C:\\tools\\php");
-				}
-		}
-		runCommand("php", ["-v"]);
-	}
-
-	static var gotCppDependencies = false;
-	static function getCppDependencies() {
-		if (gotCppDependencies) return;
-
-		//hxcpp dependencies
-		switch (systemName) {
-			case "Linux":
-				requireAptPackages(["gcc-multilib", "g++-multilib"]);
-			case "Mac":
-				//pass
-		}
-
-
-		//install and build hxcpp
-		try {
-			getHaxelibPath("hxcpp");
-			infoMsg('hxcpp has already been installed.');
-		} catch(e:Dynamic) {
-			haxelibInstallGit("HaxeFoundation", "hxcpp", true);
-			var oldDir = Sys.getCwd();
-			changeDirectory(getHaxelibPath("hxcpp") + "tools/hxcpp/");
-			runCommand("haxe", ["compile.hxml"]);
-			changeDirectory(oldDir);
-		}
-
-		gotCppDependencies = true;
-	}
-
-	static var gotSpodDependencies = false;
-  static function getSpodDependencies() {
-		if (gotSpodDependencies ) return;
-
-		//install and build hxcpp
-		try {
-			getHaxelibPath("record-macros");
-			infoMsg('record-macros has already been installed.');
-		} catch(e:Dynamic) {
-			haxelibInstallGit("HaxeFoundation", "record-macros", true);
-		}
-
-		gotSpodDependencies = true;
-  }
-
-	static function getJavaDependencies() {
-		haxelibInstallGit("HaxeFoundation", "hxjava", true);
-
-		runCommand("javac", ["-version"]);
-	}
-
-	static function getJSDependencies() {
-		switch (systemName) {
-			case "Linux":
-				if (commandSucceed("node", ["-v"])) {
-					infoMsg('node has already been installed.');
-				} else {
-					requireAptPackages(["nodejs"]);
-				}
-			case "Mac":
-				//pass
-		}
-
-		runCommand("node", ["-v"]);
-	}
-
-	static function getLuaDependencies(){
-		switch (systemName){
-			case "Linux":
-				requireAptPackages(["libpcre3-dev"]);
-				runCommand("pip", ["install", "--user", "hererocks"]);
-			case "Mac": {
-				if (commandSucceed("python3", ["-V"]))
-					infoMsg('python3 has already been installed.');
-				else
-					runCommand("brew", ["install", "python3"], true);
-
-			  runCommand("brew", ["install", "pcre"], false, true);
-				runCommand("pip3", ["install", "hererocks"]);
-			}
-		}
-	}
-
-	static function installLuaVersionDependencies(lv:String){
-	  if (lv == "-l5.1"){
-			if (!commandSucceed("luarocks", ["show", "luabit"])) {
-	    runCommand("luarocks", ["install", "luabitop", "1.0.2-3", "--server=https://luarocks.org/dev"]);
-	  }
-		}
-		if (!commandSucceed("luarocks", ["show", "lrexlib-pcre"])) {
-	  runCommand("luarocks", ["install", "lrexlib-pcre", "2.8.0-1", "--server=https://luarocks.org/dev"]);
-		}
-		if (!commandSucceed("luarocks", ["show", "luv"])) {
-	  runCommand("luarocks", ["install", "luv", "1.9.1-0", "--server=https://luarocks.org/dev"]);
-		}
-		if (!commandSucceed("luarocks", ["show", "luasocket"])) {
-	  runCommand("luarocks", ["install", "luasocket", "3.0rc1-2", "--server=https://luarocks.org/dev"]);
-		}
-		if (!commandSucceed("luarocks", ["show", "environ"])) {
-	  runCommand("luarocks", ["install", "environ", "0.1.0-1", "--server=https://luarocks.org/dev"]);
-	}
-	}
-
-	static function getCsDependencies() {
-		switch (systemName) {
-			case "Linux":
-				if (commandSucceed("mono", ["--version"]))
-					infoMsg('mono has already been installed.');
-				else
-					requireAptPackages(["mono-devel", "mono-mcs"]);
-				runCommand("mono", ["--version"]);
-			case "Mac":
-				if (commandSucceed("mono", ["--version"]))
-					infoMsg('mono has already been installed.');
-				else
-					runCommand("brew", ["install", "mono"], true);
-				runCommand("mono", ["--version"]);
-			case "Windows":
-				switch (ci) {
-					case AppVeyor:
-						addToPATH("C:\\Program Files (x86)\\Mono\\bin");
-						runCommand("mono", ["--version"]);
-					case _:
-						//pass
-				}
-		}
-
-		haxelibInstallGit("HaxeFoundation", "hxcs", true);
-	}
-
-	static var gotOpenFLDependencies = false;
-	static function getOpenFLDependencies() {
-		if (gotOpenFLDependencies) return;
-
-		getCppDependencies();
-
-		haxelibInstallGit("HaxeFoundation", "format");
-		haxelibInstallGit("haxenme", "nme");
-		haxelibInstallGit("haxenme", "nme-dev");
-		haxelibInstallGit("openfl", "svg");
-		haxelibInstallGit("openfl", "lime");
-		haxelibInstallGit("openfl", "lime-tools");
-		haxelibInstallGit("openfl", "openfl-native");
-		haxelibInstallGit("openfl", "openfl-html5");
-		haxelibInstallGit("openfl", "openfl");
-
-		switch (systemName) {
-			case "Linux":
-				haxelibRun(["openfl", "rebuild", "linux"]);
-			case "Mac":
-				haxelibRun(["openfl", "rebuild", "mac"]);
-		}
-		haxelibRun(["openfl", "rebuild", "tools"]);
-
-		gotOpenFLDependencies = true;
-	}
-
-	/**
-		Install python and return the names of the installed pythons.
-	*/
-	static function getPythonDependencies():Array<String> {
-		switch (systemName) {
-			case "Linux":
-				if (commandSucceed("python3", ["-V"]))
-					infoMsg('python3 has already been installed.');
-				else
-					requireAptPackages(["python3"]);
-				runCommand("python3", ["-V"]);
-
-				var pypy = "pypy3";
-				if (commandSucceed(pypy, ["-V"])) {
-					infoMsg('pypy3 has already been installed.');
-				} else {
-					var pypyVersion = "pypy3-2.4.0-linux64";
-					runCommand("wget", ['https://bitbucket.org/pypy/pypy/downloads/${pypyVersion}.tar.bz2'], true);
-					runCommand("tar", ["-xf", '${pypyVersion}.tar.bz2']);
-					pypy = FileSystem.fullPath('${pypyVersion}/bin/pypy3');
-				}
-				runCommand(pypy, ["-V"]);
-
-				return ["python3", pypy];
-			case "Mac":
-				if (commandSucceed("python3", ["-V"]))
-					infoMsg('python3 has already been installed.');
-				else
-					runCommand("brew", ["install", "python3"], true);
-				runCommand("python3", ["-V"]);
-
-				if (commandSucceed("pypy3", ["-V"]))
-					infoMsg('pypy3 has already been installed.');
-				else
-					runCommand("brew", ["install", "pypy3"], true);
-				runCommand("pypy3", ["-V"]);
-
-				return ["python3", "pypy3"];
-			case "Windows":
-				if (commandSucceed("python3", ["-V"]))
-					infoMsg('python3 has already been installed.');
-				else
-					throw "please install python 3.x and make it available as python3 in PATH";
-				runCommand("python3", ["-V"]);
-				return ["python3"];
-		}
-
-		return [];
-	}
-
-	static var ci(default, never):Null<Ci> =
-		if (Sys.getEnv("TRAVIS") == "true")
-			TravisCI;
-		else if (Sys.getEnv("APPVEYOR") == "True")
-			AppVeyor;
-		else
-			null;
-	static var systemName(default, never) = Sys.systemName();
-	static var cwd(default, never) = Sys.getCwd();
-	static var repoDir(default, never) = FileSystem.fullPath("..") + "/";
-	static var unitDir(default, never) = cwd + "unit/";
-	static var sysDir(default, never) = cwd + "sys/";
-	static var optDir(default, never) = cwd + "optimization/";
-	static var miscDir(default, never) = cwd + "misc/";
-	static var displayDir(default, never) = cwd + "display/";
-	static var gitInfo(get, null):{repo:String, branch:String, commit:String, timestamp:Float, date:String};
-	static var success(default, null) = true;
-	static function get_gitInfo() return if (gitInfo != null) gitInfo else gitInfo = {
-		repo: switch (ci) {
-			case TravisCI:
-				Sys.getEnv("TRAVIS_REPO_SLUG");
-			case AppVeyor:
-				Sys.getEnv("APPVEYOR_PROJECT_SLUG");
-			case _:
-				commandResult("git", ["config", "--get", "remote.origin.url"]).stdout.trim();
-		},
-		branch: switch (ci) {
-			case TravisCI:
-				Sys.getEnv("TRAVIS_BRANCH");
-			case AppVeyor:
-				Sys.getEnv("APPVEYOR_REPO_BRANCH");
-			case _:
-				commandResult("git", ["rev-parse", "--abbrev-ref", "HEAD"]).stdout.trim();
-		},
-		commit: commandResult("git", ["rev-parse", "HEAD"]).stdout.trim(),
-		timestamp: Std.parseFloat(commandResult("git", ["show", "-s", "--format=%ct", "HEAD"]).stdout),
-		date: {
-			var gitTime = commandResult("git", ["show", "-s", "--format=%ct", "HEAD"]).stdout;
-			var tzd = {
-				var z = Date.fromTime(0);
-				z.getHours() * 60 * 60 * 1000 + z.getMinutes() * 60 * 1000;
-			}
-			// make time in the UTC time zone
-			var time = Date.fromTime(Std.parseFloat(gitTime) * 1000 - tzd);
-			DateTools.format(time, "%Y-%m-%dT%H:%M:%SZ");
-		}
-	}
-	static var haxeVer(default, never) = {
-		var haxe_ver = haxe.macro.Compiler.getDefine("haxe_ver");
-		switch (haxe_ver.split(".")) {
-			case [major]:
-				major;
-			case [major, minor] if (minor.length == 1):
-				'${major}.${minor}';
-			case [major, minor] if (minor.length > 1):
-				var minor = minor.charAt(0);
-				var patch = Std.parseInt(minor.substr(1));
-				'${major}.${minor}.${patch}';
-			case _:
-				throw haxe_ver;
-		}
-	}
-	static var haxeVerFull(default, never) = {
-		var ver = haxeVer.split(".");
-		while (ver.length < 3) {
-			ver.push("0");
-		}
-		ver.join(".");
-	}
-
-	static function isDeployNightlies () {
-		return Sys.getEnv("DEPLOY_NIGHTLIES") != null;
-	}
-
-	static function deploy():Void {
-		if (isDeployNightlies()) {
-			changeDirectory(repoDir);
-			deployNightlies();
-		}
-
-		if (isDeployApiDocsRequired()) {
-			changeDirectory(repoDir);
-			runCommand("make", ["xmldoc"]);
-			deployApiDoc();
-		}
-	}
-
-	static function deployBintray():Void {
-		if (
-			Sys.getEnv("BINTRAY") != null &&
-			Sys.getEnv("BINTRAY_USERNAME") != null &&
-			Sys.getEnv("BINTRAY_API_KEY") != null
-		) {
-			// generate bintray config
-			var tpl = new Template(File.getContent("extra/bintray.tpl.json"));
-			var compatDate = ~/[^0-9]/g.replace(gitInfo.date, "");
-			var json = tpl.execute({
-				packageSubject: {
-					var sub = Sys.getEnv("BINTRAY_SUBJECT");
-					sub != null ? sub : Sys.getEnv("BINTRAY_USERNAME");
-				},
-				os: systemName.toLowerCase(),
-				versionName: '${haxeVer}+${compatDate}.${gitInfo.commit.substr(0,7)}',
-				versionDesc: "Automated CI build.",
-				gitRepo: gitInfo.repo,
-				gitBranch: gitInfo.branch,
-				gitCommit: gitInfo.commit,
-				gitDate: gitInfo.date,
-			});
-			var path = "extra/bintray.json";
-			File.saveContent("extra/bintray.json", json);
-			infoMsg("saved " + FileSystem.absolutePath(path) + " with content:");
-			Sys.println(json);
-		}
-	}
-
-	static function isDeployApiDocsRequired () {
-		return
-			Sys.getEnv("DEPLOY_API_DOCS") != null && 
-			switch(Sys.getEnv("TRAVIS_TAG")) {
-				case null, _.trim() => "":
-					false;
-				case tag:
-					trace('tag $tag is deployable');
-					true;
-			}
-	}
-
-	/**
-		Deploy doc to api.haxe.org.
-	*/
-	static function deployApiDoc():Void {
-		changeDirectory(repoDir);
-		File.saveContent("extra/doc/info.json", Json.stringify({
-			"commit": gitInfo.commit,
-			"branch": gitInfo.branch,
-		}));
-		switch (Sys.getEnv("GHP_REMOTE")) { // should be in the form of https://token@github.com/account/repo.git
-			case null:
-				infoMsg('Missing GHP_REMOTE, skip api doc deploy.');
-			case remoteRepo:
-				var localRepo = "extra/api.haxe.org";
-				runCommand("git", ["clone", remoteRepo, localRepo]);
-				runCommand("haxe", ["--cwd", localRepo, "--run", "ImportXml", FileSystem.absolutePath("extra/doc")]);
-		}
-	}
-
-	/**
-		Deploy source package to hxbuilds s3
-	*/
-	static function deployNightlies():Void {
-		var gitTime = commandResult("git", ["show", "-s", "--format=%ct", "HEAD"]).stdout;
-		var tzd = {
-			var z = Date.fromTime(0);
-			z.getHours() * 60 * 60 * 1000 + z.getMinutes() * 60 * 1000;
-		};
-		var time = Date.fromTime(Std.parseFloat(gitTime) * 1000 - tzd);
-		if (
-			(gitInfo.branch == "development" ||
-			gitInfo.branch == "master" ||
-			~/^[0-9]\.[0-9]_bugfix$/.match(gitInfo.branch) ||
-			gitInfo.branch == "nightly-travis") &&
-			Sys.getEnv("HXBUILDS_AWS_ACCESS_KEY_ID") != null &&
-			Sys.getEnv("HXBUILDS_AWS_SECRET_ACCESS_KEY") != null &&
-			Sys.getEnv("TRAVIS_PULL_REQUEST") != "true"
-		) {
-			switch (ci) {
-				case null:
-					trace('Not deploying nightlies (not in CI)');
-				case TravisCI:
-					if (systemName == 'Linux') {
-						// source
-						for (file in sys.FileSystem.readDirectory('out')) {
-							if (file.startsWith('haxe') && file.endsWith('_src.tar.gz')) {
-								submitToS3("source", 'out/$file');
-								break;
-							}
-						}
-					}
-					for (file in sys.FileSystem.readDirectory('out')) {
-						if (file.startsWith('haxe')) {
-							if (file.endsWith('_bin.tar.gz')) {
-								var name = systemName == "Linux" ? 'linux64' : 'mac';
-								submitToS3(name, 'out/$file');
-							} else if (file.endsWith('_installer.tar.gz')) {
-								submitToS3('mac-installer', 'out/$file');
-							}
-						}
-					}
-				case AppVeyor:
-					var kind = switch (Sys.getEnv("ARCH")) {
-						case null:
-							throw "ARCH is not set";
-						case "32":
-							"windows";
-						case "64":
-							"windows64";
-						case _:
-							throw "unknown ARCH";
-					}
-					for (file in sys.FileSystem.readDirectory('out')) {
-						if (file.startsWith('haxe')) {
-							if (file.endsWith('_bin.zip')) {
-								submitToS3(kind, 'out/$file');
-							} else if (file.endsWith('_installer.zip')) {
-								submitToS3('${kind}-installer', 'out/$file');
-							}
-						}
-					}
-			}
-		} else {
-			trace('Not deploying nightlies');
-		}
-	}
-
-	static function fileExtension(file:String) {
-		file = haxe.io.Path.withoutDirectory(file);
-		var idx = file.indexOf('.');
-		if (idx < 0) {
-			return '';
-		} else {
-			return file.substr(idx);
-		}
-	}
-
-	static function submitToS3(kind:String, sourceFile:String) {
-		var date = DateTools.format(Date.now(), '%Y-%m-%d');
-		var ext = fileExtension(sourceFile);
-		var fileName = 'haxe_${date}_${gitInfo.branch}_${gitInfo.commit.substr(0,7)}${ext}';
-
-		var changeLatest = gitInfo.branch == "development";
-		Sys.putEnv('AWS_ACCESS_KEY_ID', Sys.getEnv('HXBUILDS_AWS_ACCESS_KEY_ID'));
-		Sys.putEnv('AWS_SECRET_ACCESS_KEY', Sys.getEnv('HXBUILDS_AWS_SECRET_ACCESS_KEY'));
-		runCommand('aws s3 cp --region us-east-1 "$sourceFile" "$S3_HXBUILDS_ADDR/$kind/$fileName"');
-		if (changeLatest) {
-			runCommand('aws s3 cp --region us-east-1 "$sourceFile" "$S3_HXBUILDS_ADDR/$kind/haxe_latest$ext"');
-		}
-		Indexer.index('$S3_HXBUILDS_ADDR/$kind/');
-		runCommand('aws s3 cp --region us-east-1 index.html "$S3_HXBUILDS_ADDR/$kind/index.html"');
-	}
-
-	/**
-		Deploy source package to ppa:haxe/snapshots.
-	*/
-	static function deployPPA():Void {
-		if (
-			gitInfo.branch == "development" &&
-			Sys.getEnv("DEPLOY") != null &&
-			Sys.getEnv("haxeci_decrypt") != null
-		) {
-			// setup deb info
-			runCommand("git config --global user.name \"${DEBFULLNAME}\"");
-			runCommand("git config --global user.email \"${DEBEMAIL}\"");
-			// setup haxeci_ssh
-			runCommand("openssl aes-256-cbc -k \"$haxeci_decrypt\" -in extra/haxeci_ssh.enc -out extra/haxeci_ssh -d");
-			runCommand("chmod 600 extra/haxeci_ssh");
-			runCommand("ssh-add extra/haxeci_ssh");
-			// setup haxeci_sec.gpg
-			runCommand("openssl aes-256-cbc -k \"$haxeci_decrypt\" -in extra/haxeci_sec.gpg.enc -out extra/haxeci_sec.gpg -d");
-			runCommand("gpg --allow-secret-key-import --import extra/haxeci_sec.gpg");
-			runCommand("sudo apt-get install devscripts git-buildpackage ubuntu-dev-tools dh-make -y");
-			var compatDate = ~/[^0-9]/g.replace(gitInfo.date, "");
-			var SNAPSHOT_VERSION = '${haxeVerFull}+1SNAPSHOT${compatDate}+${gitInfo.commit.substr(0,7)}';
-			runCommand('cp out/haxe*_src.tar.gz "../haxe_${SNAPSHOT_VERSION}.orig.tar.gz"');
-			changeDirectory("..");
-			runCommand("git clone https://github.com/HaxeFoundation/haxe-debian.git");
-			changeDirectory("haxe-debian");
-			runCommand("git checkout upstream");
-			runCommand("git checkout next");
-			runCommand('gbp import-orig "../haxe_${SNAPSHOT_VERSION}.orig.tar.gz" -u "${SNAPSHOT_VERSION}" --debian-branch=next');
-			runCommand('dch -v "1:${SNAPSHOT_VERSION}-1" --urgency low "snapshot build"');
-			runCommand("debuild -S -sa");
-			runCommand("backportpackage -d yakkety --upload ${PPA} --yes ../haxe_*.dsc");
-			runCommand("backportpackage -d xenial  --upload ${PPA} --yes ../haxe_*.dsc");
-			runCommand("backportpackage -d wily    --upload ${PPA} --yes ../haxe_*.dsc");
-			runCommand("backportpackage -d vivid   --upload ${PPA} --yes ../haxe_*.dsc");
-			runCommand("backportpackage -d trusty  --upload ${PPA} --yes ../haxe_*.dsc");
-			runCommand("git checkout debian/changelog");
-			runCommand("git merge -X ours --no-edit origin/next-precise");
-			runCommand('dch -v "1:${SNAPSHOT_VERSION}-1" --urgency low "snapshot build"');
-			runCommand("debuild -S -sa");
-			runCommand("backportpackage -d precise --upload ${PPA} --yes ../haxe_*.dsc");
-		}
-	}
-
 	static function main():Void {
 		Sys.putEnv("OCAMLRUNPARAM", "b");
 
-		var tests:Array<TEST> = switch (Sys.getEnv("TEST")) {
+		var args = Sys.args();
+		var tests:Array<TestTarget> = switch (args.length==1 ? args[0] : Sys.getEnv("TEST")) {
 			case null:
 				[Macro];
 			case env:
 				[for (v in env.split(",")) v.trim().toLowerCase()];
 		}
-		Sys.println('Going to test: $tests');
+
+		infoMsg('Going to test: $tests');
+
+		if (isCi()) {
+			changeDirectory('echoServer');
+			runCommand('haxe', ['build.hxml']);
+			changeDirectory(cwd);
+		}
 
 		for (test in tests) {
 			switch (ci) {
@@ -906,307 +45,63 @@ class RunCi {
 					//pass
 			}
 
+			switch (systemName) {
+				case "Windows":
+					// change codepage to UTF-8
+					runCommand("chcp", ["65001"]);
+				case _:
+					//pass
+			}
+
+			//run neko-based http echo server
+			var echoServer = new sys.io.Process('nekotools', ['server', '-d', 'echoServer/www/', '-p', '20200']);
+
 			infoMsg('test $test');
 			var success = true;
 			try {
 				changeDirectory(unitDir);
-
+				haxelibInstallGit("haxe-utest", "utest", "master");
 
 				var args = switch (ci) {
+					case null:
+						[];
 					case TravisCI:
 						["-D","travis"];
 					case AppVeyor:
 						["-D","appveyor"];
-					case _:
-						[];
+					case AzurePipelines:
+						["-D","azure"];
 				}
+				args = args.concat(["-D", systemName]);
 				switch (test) {
 					case Macro:
-						runCommand("haxe", ["compile-macro.hxml"].concat(args));
-
-						changeDirectory(displayDir);
-						runCommand("haxe", ["build.hxml"]);
-
-						changeDirectory(miscDir);
-						getCsDependencies();
-						getPythonDependencies();
-						runCommand("haxe", ["compile.hxml"]);
-
-						changeDirectory(sysDir);
-						runCommand("haxe", ["compile-macro.hxml"]);
-						runCommand("haxe", ["compile-each.hxml", "--run", "Main"]);
+						runci.targets.Macro.run(args);
 					case Neko:
-						getSpodDependencies();
-						runCommand("haxe", ["compile-neko.hxml", "-D", "dump", "-D", "dump_ignore_var_ids"].concat(args));
-						runCommand("neko", ["bin/unit.n"]);
-
-						changeDirectory(sysDir);
-						runCommand("haxe", ["compile-neko.hxml"]);
-						runCommand("neko", ["bin/neko/sys.n"]);
-					case Php7:
-							getSpodDependencies();
-							runCommand("haxe", ["compile-php7.hxml"].concat(args));
-							runCommand("php", ["bin/php7/index.php"]);
-
-							changeDirectory(sysDir);
-							runCommand("haxe", ["compile-php7.hxml"]);
-							runCommand("php", ["bin/php7/Main/index.php"]);
+						runci.targets.Neko.run(args);
 					case Php:
-							getSpodDependencies();
-							getPhpDependencies();
-							runCommand("haxe", ["compile-php.hxml"].concat(args));
-							runCommand("php", ["bin/php/index.php"]);
-
-							changeDirectory(sysDir);
-							runCommand("haxe", ["compile-php.hxml"]);
-							runCommand("php", ["bin/php/Main/index.php"]);
+						runci.targets.Php.run(args);
 					case Python:
-						var pys = getPythonDependencies();
-
-						runCommand("haxe", ["compile-python.hxml"].concat(args));
-						for (py in pys) {
-							runCommand(py, ["bin/unit.py"]);
-						}
-
-						changeDirectory(sysDir);
-						runCommand("haxe", ["compile-python.hxml"]);
-						for (py in pys) {
-							runCommand(py, ["bin/python/sys.py"]);
-						}
-
-						changeDirectory(miscDir + "pythonImport");
-						runCommand("haxe", ["compile.hxml"]);
-						for (py in pys) {
-							runCommand(py, ["test.py"]);
-						}
+						runci.targets.Python.run(args);
 					case Lua:
-						getLuaDependencies();
-						var envpath = Sys.getEnv("HOME") + '/lua_env';
-						addToPATH(envpath + '/bin');
-						for (lv in ["-l5.1", "-l5.2", "-l5.3", "-j2.0", "-j2.1" ]){
-						  if (systemName == "Mac" && lv.startsWith("-j")) continue;
-						  Sys.println('--------------------');
-						  Sys.println('Lua Version: $lv');
-						  runCommand("hererocks", [envpath, lv, "-rlatest", "-i"]);
-						  trace('path: ' + Sys.getEnv("PATH"));
-						  runCommand("lua",["-v"]);
-						  runCommand("luarocks",[]);
-						  installLuaVersionDependencies(lv);
-
-						  changeDirectory(unitDir);
-						  runCommand("haxe", ["compile-lua.hxml"].concat(args));
-						  runCommand("lua", ["bin/unit.lua"]);
-
-						  changeDirectory(sysDir);
-						  runCommand("haxe", ["compile-lua.hxml"].concat(args));
-						  runCommand("lua", ["bin/lua/sys.lua"]);
-						}
+						runci.targets.Lua.run(args);
 					case Cpp:
-						getCppDependencies();
-						getSpodDependencies();
-						runCommand("haxe", ["compile-cpp.hxml", "-D", "HXCPP_M32"].concat(args));
-						runCpp("bin/cpp/TestMain-debug", []);
-
-						switch (ci) {
-							case AppVeyor:
-								//save time...
-							case _:
-								runCommand("rm", ["-rf", "cpp"]);
-								runCommand("haxe", ["compile-cpp.hxml", "-D", "HXCPP_M64"].concat(args));
-								runCpp("bin/cpp/TestMain-debug", []);
-
-								// https://github.com/HaxeFoundation/hxcpp/issues/646
-								// runCommand("haxe", ["compile-cppia-host.hxml"]);
-								// runCommand("haxe", ["compile-cppia.hxml"]);
-								// runCpp("bin/cppia/Host-debug", ["bin/unit.cppia"]);
-						}
-
-						changeDirectory(sysDir);
-						runCommand("haxe", ["compile-cpp.hxml"]);
-						runCpp("bin/cpp/Main-debug", []);
-
-						// if (Sys.systemName() == "Mac")
-						// {
-						// 	changeDirectory(miscDir + "cppObjc");
-						// 	runCommand("haxe", ["build.hxml"]);
-						// 	runCpp("bin/TestObjc-debug");
-						// }
+						runci.targets.Cpp.run(args, true, true);
+					case Cppia:
+						runci.targets.Cpp.run(args, false, true);
 					case Js:
-						getJSDependencies();
-
-						var jsOutputs = [
-							for (es3 in       [[], ["-D", "js-es=3"]])
-							for (unflatten in [[], ["-D", "js-unflatten"]])
-							for (classic in   [[], ["-D", "js-classic"]])
-							{
-								var extras = args.concat(es3).concat(unflatten).concat(classic);
-
-								runCommand("haxe", ["compile-js.hxml"].concat(extras));
-
-								var output = if (extras.length > 0) {
-									"bin/js/" + extras.join("") + "/unit.js";
-								} else {
-									"bin/js/default/unit.js";
-								}
-								var outputDir = Path.directory(output);
-								if (!FileSystem.exists(outputDir)) {
-									FileSystem.createDirectory(outputDir);
-								}
-								FileSystem.rename("bin/unit.js", output);
-								FileSystem.rename("bin/unit.js.map", output + ".map");
-								runCommand("node", ["-e", "require('./" + output + "').unit.TestMain.nodejsMain();"]);
-								output;
-							}
-						];
-
-						var env = Sys.environment();
-						if (
-							env.exists("SAUCE") &&
-							env.exists("SAUCE_USERNAME") &&
-							env.exists("SAUCE_ACCESS_KEY")
-						) {
-							// sauce-connect should have been started
-
-							// var scVersion = "sc-4.3-linux";
-							// runCommand("wget", ['https://saucelabs.com/downloads/${scVersion}.tar.gz'], true);
-							// runCommand("tar", ["-xf", '${scVersion}.tar.gz']);
-
-							// //start sauce-connect
-							// var scReadyFile = "sauce-connect-ready-" + Std.random(100);
-							// var sc = new Process('${scVersion}/bin/sc', [
-							// 	"-i", Sys.getEnv("TRAVIS_JOB_NUMBER"),
-							// 	"-f", scReadyFile
-							// ]);
-							// while(!FileSystem.exists(scReadyFile)) {
-							// 	Sys.sleep(0.5);
-							// }
-
-							runCommand("npm", ["install", "wd", "q"], true);
-							haxelibInstall("hxnodejs");
-							runCommand("haxe", ["compile-saucelabs-runner.hxml"]);
-							var server = new Process("nekotools", ["server"]);
-							runCommand("node", ["bin/RunSauceLabs.js"].concat([for (js in jsOutputs) "unit-js.html?js=" + js.urlEncode()]));
-
-							server.close();
-							// sc.close();
-						}
-
-						infoMsg("Test optimization:");
-						changeDirectory(optDir);
-						runCommand("haxe", ["run.hxml"]);
+						runci.targets.Js.run(args);
 					case Java:
-						getSpodDependencies();
-						getJavaDependencies();
-						runCommand("haxe", ["compile-java.hxml"].concat(args));
-						runCommand("java", ["-jar", "bin/java/TestMain-Debug.jar"]);
-
-						runCommand("haxe", ["compile-java.hxml","-dce","no"].concat(args));
-						runCommand("java", ["-jar", "bin/java/TestMain-Debug.jar"]);
-
-						changeDirectory(sysDir);
-						runCommand("haxe", ["compile-java.hxml"]);
-						runCommand("java", ["-jar", "bin/java/Main-Debug.jar"]);
-
-						infoMsg("Testing java-lib extras");
-						changeDirectory('$unitDir/bin');
-						runCommand("git", ["clone", "https://github.com/waneck/java-lib-tests.git", "--depth", "1"], true);
-						for (dir in FileSystem.readDirectory('java-lib-tests'))
-						{
-							var path = 'java-lib-tests/$dir';
-							if (FileSystem.isDirectory(path)) for (file in FileSystem.readDirectory(path))
-							{
-								if (file.endsWith('.hxml'))
-								{
-									runCommand("haxe", ["--cwd",'java-lib-tests/$dir',file]);
-								}
-							}
-						}
-
+						runci.targets.Java.run(args);
+					case Jvm:
+						runci.targets.Jvm.run(args);
 					case Cs:
-						getSpodDependencies();
-						getCsDependencies();
-
-						var compl = switch [ci, systemName] {
-							case [TravisCI, "Linux"]:
-								"-travis";
-							case _:
-								"";
-						};
-
-						for (fastcast in      [[], ["-D", "fast_cast"]])
-						for (noroot in        [[], ["-D", "no_root"]])
-						for (erasegenerics in [[], ["-D", "erase_generics"]])
-						{
-							var extras = fastcast.concat(erasegenerics).concat(noroot);
-							runCommand("haxe", ['compile-cs$compl.hxml'].concat(extras));
-							runCs("bin/cs/bin/TestMain-Debug.exe");
-
-							runCommand("haxe", ['compile-cs-unsafe$compl.hxml'].concat(extras));
-							runCs("bin/cs_unsafe/bin/TestMain-Debug.exe");
-						}
-
-						runCommand("haxe", ['compile-cs$compl.hxml','-dce','no']);
-						runCs("bin/cs/bin/TestMain-Debug.exe");
-
-						changeDirectory(sysDir);
-						runCommand("haxe", ["compile-cs.hxml",'-D','fast_cast']);
-						runCs("bin/cs/bin/Main-Debug.exe", []);
-
-						changeDirectory(miscDir + "csTwoLibs");
-						for (i in 1...5)
-						{
-							runCommand("haxe", ['compile-$i.hxml','-D','fast_cast']);
-							runCs("bin/main/bin/Main.exe");
-						}
-
+						runci.targets.Cs.run(args);
 					case Flash9:
-						setupFlashPlayerDebugger();
-						runCommand("haxe", ["compile-flash9.hxml", "-D", "fdb", "-D", "dump", "-D", "dump_ignore_var_ids"].concat(args));
-						var success = runFlash("bin/unit9.swf");
-						if (!success)
-							fail();
+						runci.targets.Flash.run(args);
 					case As3:
-						setupFlashPlayerDebugger();
-
-						//setup flex sdk
-						if (commandSucceed("mxmlc", ["--version"])) {
-							infoMsg('mxmlc has already been installed.');
-						} else {
-							var apacheMirror = Json.parse(Http.requestUrl("http://www.apache.org/dyn/closer.lua?as_json=1")).preferred;
-							var flexVersion = "4.16.0";
-							runCommand("wget", ['${apacheMirror}/flex/${flexVersion}/binaries/apache-flex-sdk-${flexVersion}-bin.tar.gz'], true);
-							runCommand("tar", ["-xf", 'apache-flex-sdk-${flexVersion}-bin.tar.gz', "-C", Sys.getEnv("HOME")]);
-							var flexsdkPath = Sys.getEnv("HOME") + '/apache-flex-sdk-${flexVersion}-bin';
-							addToPATH(flexsdkPath + "/bin");
-							var playerglobalswcFolder = flexsdkPath + "/player";
-							FileSystem.createDirectory(playerglobalswcFolder + "/11.1");
-							runCommand("wget", ["-nv", "http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc", "-O", playerglobalswcFolder + "/11.1/playerglobal.swc"], true);
-							File.saveContent(flexsdkPath + "/env.properties", 'env.PLAYERGLOBAL_HOME=$playerglobalswcFolder');
-							runCommand("mxmlc", ["--version"]);
-						}
-
-						runCommand("haxe", ["compile-as3.hxml", "-D", "fdb"].concat(args));
-						var success = runFlash("bin/unit9_as3.swf");
-						if (!success)
-							fail();
+						runci.targets.As3.run(args);
 					case Hl:
-						runCommand("haxe", ["compile-hl.hxml"]);
-					case ThirdParty:
-						getPhpDependencies();
-						getJavaDependencies();
-						getJSDependencies();
-						getCsDependencies();
-						getPythonDependencies();
-						getCppDependencies();
-						//getOpenFLDependencies();
-
-						//testPolygonalDs();
-						// if (systemName == "Linux") testFlambe(); //#3439
-						testHxTemplo();
-						testMUnit();
-						testHaxeQuake();
-						//testOpenflSamples();
-						//testFlixelDemos();
+						runci.targets.Hl.run(args);
 					case t:
 						throw "unknown target: " + t;
 				}
@@ -1226,6 +121,9 @@ class RunCi {
 			} else {
 				failMsg('test ${test} failed');
 			}
+
+			echoServer.kill();
+			echoServer.close();
 		}
 
 		if (success) {
@@ -1234,116 +132,4 @@ class RunCi {
 			Sys.exit(1);
 		}
 	}
-
-	static function testHxTemplo() {
-		infoMsg("Test hx-templo:");
-
-		changeDirectory(unitDir);
-
-		haxelibInstallGit("Simn", "hxparse", "master", "src");
-		haxelibInstallGit("Simn", "hxtemplo");
-
-		var buildArgs = [
-			"-cp", "src",
-			"-cp", "test",
-			"-main", "Test",
-			"-lib", "hxparse",
-			"-dce", "full"
-		];
-
-		changeDirectory(getHaxelibPath("hxtemplo") + "..");
-		runCommand("haxe", ["build.hxml"]);
-	}
-
-	static function testPolygonalDs() {
-		infoMsg("Test polygonal-ds:");
-
-		changeDirectory(unitDir);
-		haxelibInstallGit("Simn", "ds", "python-support", null, false, "polygonal-ds");
-		haxelibInstallGit("polygonal", "core", "master", "src", false, "polygonal-core");
-		haxelibInstallGit("polygonal", "printf", "master", "src", false, "polygonal-printf");
-		changeDirectory(getHaxelibPath("polygonal-ds"));
-		runCommand("haxe", ["build.hxml"]);
-		runCommand("python3", ["unit.py"]);
-		runCommand("node", ["unit.js"]);
-	}
-
-	static function testMUnit() {
-		infoMsg("Test MUnit:");
-
-		changeDirectory(unitDir);
-
-		haxelibInstallGit("massiveinteractive", "mconsole", "master", "src");
-		haxelibInstallGit("massiveinteractive", "MassiveCover", "master", "src", false, "mcover");
-		haxelibInstallGit("massiveinteractive", "MassiveLib", "master", "src", false, "mlib");
-		haxelibInstallGit("massiveinteractive", "MassiveUnit", "2.1.2", "src", false, "munit");
-		changeDirectory(Path.join([getHaxelibPath("munit"), "..", "tool"]));
-		runCommand("haxe", ["build.hxml"]);
-		haxelibRun(["munit", "test", "-result-exit-code", "-neko"], true);
-		changeDirectory("../");
-		haxelibRun(["munit", "test", "-result-exit-code", "-neko"], true);
-	}
-
-	static function testHaxeQuake() {
-		infoMsg("Test HaxeQuake:");
-
-		changeDirectory(unitDir);
-		runCommand("git", ["clone", "https://github.com/nadako/HaxeQuake"]);
-		changeDirectory("HaxeQuake/Client");
-		runCommand("haxe", ["build.hxml"]);
-	}
-
-	static function testFlambe() {
-		infoMsg("Test Flambe:");
-
-		changeDirectory(unitDir);
-		runCommand("git", ["clone", "https://github.com/aduros/flambe"]);
-		runCommand("sh", ["flambe/bin/run-travis"]);
-	}
-
-	//static function testOpenflSamples() {
-		//infoMsg("Test OpenFL Samples:");
-//
-		//changeDirectory(unitDir);
-//
-		//haxelibInstallGit("jgranick", "actuate");
-		//haxelibInstallGit("jgranick", "box2d");
-		//haxelibInstallGit("jgranick", "layout");
-		//haxelibInstallGit("openfl", "swf");
-		//haxelibInstallGit("openfl", "openfl-samples");
-//
-		//var path = getHaxelibPath("openfl-samples");
-		//var old = Sys.getEnv("pwd");
-		//Sys.putEnv("pwd", path);
-		//parseTravisFile(haxe.io.Path.join([path, ".travis.yml"]), true);
-		//if (old != null) {
-			//Sys.putEnv("pwd", old);
-		//}
-	//}
-
-	static function testFlixelDemos() {
-		infoMsg("Test Flixel Demos:");
-
-		changeDirectory(unitDir);
-		getOpenFLDependencies();
-
-		haxelibInstall("systools");
-		haxelibInstall("spinehx");
-		haxelibInstall("nape");
-		haxelibInstall("task");
-
-		haxelibInstallGit("larsiusprime", "firetongue");
-		haxelibInstallGit("YellowAfterLife", "openfl-bitfive");
-
-		haxelibInstallGit("HaxeFlixel", "flixel");
-		haxelibInstallGit("HaxeFlixel", "flixel-addons");
-		haxelibInstallGit("HaxeFlixel", "flixel-ui");
-		haxelibInstallGit("HaxeFlixel", "flixel-demos");
-		haxelibInstallGit("HaxeFlixel", "flixel-tools");
-
-		haxelibRun(["flixel-tools", "testdemos", "-flash"]);
-		haxelibRun(["flixel-tools", "testdemos", "-neko"]);
-		haxelibRun(["flixel-tools", "testdemos", "-html5"]);
-	}
 }
-
diff --git a/tests/RunCi.hxml b/tests/RunCi.hxml
index 314a92d4952b0028cdb7ecef2262cc0d9b81c070..72864798d041a95994a1a2a869566c6b4a761526 100644
--- a/tests/RunCi.hxml
+++ b/tests/RunCi.hxml
@@ -1,2 +1,2 @@
--neko RunCi.n
--main RunCi
\ No newline at end of file
+--main RunCi
+--interp
\ No newline at end of file
diff --git a/tests/TestMakefile.hxml b/tests/TestMakefile.hxml
index dba22395527d44ec384ab0b6b9d810a08e8b2647..648e5d21e42dd19d381dc1f697b3f2923033b61c 100644
--- a/tests/TestMakefile.hxml
+++ b/tests/TestMakefile.hxml
@@ -1,2 +1,2 @@
--main TestMakefile
+--main TestMakefile
 -neko TestMakefile.n
\ No newline at end of file
diff --git a/tests/benchs/.vscode/settings.json b/tests/benchs/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..dff5fb49ef49fee272d510655fdf229e62be5d75
--- /dev/null
+++ b/tests/benchs/.vscode/settings.json
@@ -0,0 +1,21 @@
+{
+	"haxe.displayConfigurations": [
+		{"label": "Neko", "args": ["build.hxml", "-neko", "export/run.n", "-cmd", "neko export/run.n"]},
+		{"label": "JavaScript", "args": ["build.hxml", "-js","export/run.js", "-lib", "hxnodejs", "-cmd", "node export/run.js"]},
+		{"label": "Python", "args": ["build.hxml", "-python", "export/run.py", "-cmd", "python3 export/run.py"]},
+		{"label": "C++", "args": ["build.hxml", "-cpp", "export/cpp", "-cmd", "cmd /C export\\cpp\\Main.exe"]},
+		{"label": "CPPIA", "args": ["build.hxml", "-cppia","export/cppia.txt"]},
+		{"label": "HashLink/JIT", "args": ["build.hxml", "-hl", "export/run.hl", "-cmd", "hl export/run.hl"]},
+		{"label": "HashLink/Interp", "args": ["build.hxml", "-hl", "export/run.hl", "-D", "interp"]},
+		{"label": "Lua 5.1", "args": ["build.hxml", "-lua", "export/run.lua", "-cmd", "C:\\WINDOWS\\Sysnative\\bash.exe -c 'lua5.1 export/run.lua'"]},
+		{"label": "Lua 5.2", "args": ["build.hxml", "-lua", "export/run.lua", "-cmd", "C:\\WINDOWS\\Sysnative\\bash.exe -c 'lua5.2 export/run.lua'"]},
+		{"label": "LuaJIT", "args": ["build.hxml", "-lua", "export/run.lua", "-D", "luajit", "-cmd", "C:\\WINDOWS\\Sysnative\\bash.exe -c 'luajit export/run.lua'"]},
+		{"label": "PHP", "args": ["build.hxml", "-php", "export/php", "-cmd", "C:\\WINDOWS\\Sysnative\\bash.exe -c 'php export/php/index.php'"]},
+		{"label": "PHP 7", "args": ["build.hxml", "-php", "export/php", "-D", "php7", "-cmd", "C:\\WINDOWS\\Sysnative\\bash.exe -c 'php7.0 export/php/index.php'"]},
+		{"label": "Java", "args": ["build.hxml", "-java", "export/java", "-cmd", "java -jar export/java/Main.jar"]},
+		{"label": "Jvm", "args": ["build.hxml", "-D", "jvm", "-java", "export/java", "-cmd", "java -jar export/java/Main.jar"]},
+		{"label": "C#", "args": ["build.hxml", "-cs", "export/cs", "-cmd", "cmd /C export\\cs\\bin\\Main.exe"]},
+		{"label": "Interp", "args": ["build.hxml", "--interp"]},
+	],
+	"haxe.enableCompilationServer": false
+}
\ No newline at end of file
diff --git a/tests/benchs/.vscode/tasks.json b/tests/benchs/.vscode/tasks.json
new file mode 100644
index 0000000000000000000000000000000000000000..23c0b2b7fd4aebd71dd1f51d11249b9aa1621ca8
--- /dev/null
+++ b/tests/benchs/.vscode/tasks.json
@@ -0,0 +1,13 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "haxe",
+			"args": "active configuration",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/tests/benchs/build.hxml b/tests/benchs/build.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..6656584a5db8a29d3311f5ce8294cc9177a5c3ad
--- /dev/null
+++ b/tests/benchs/build.hxml
@@ -0,0 +1,6 @@
+-cp src
+-main Main
+-D test=Calls
+-D analyzer-optimize
+-D analyzer-no-purity-inference
+-D dump=pretty
\ No newline at end of file
diff --git a/tests/benchs/mandelbrot/compile-cpp.hxml b/tests/benchs/mandelbrot/compile-cpp.hxml
index 2ed606421ae5451d4eaf4c6219bc6bbd879e978f..4b8746946bfb83ffa8e8d0906251d9563a90337f 100644
--- a/tests/benchs/mandelbrot/compile-cpp.hxml
+++ b/tests/benchs/mandelbrot/compile-cpp.hxml
@@ -1,7 +1,7 @@
--main Mandelbrot
+--main Mandelbrot
 -cpp bin/cpp
 
 --next
--main Mandelbrot
+--main Mandelbrot
 -cpp bin/cpp-anon
 -D anon_objects
diff --git a/tests/benchs/mandelbrot/compile-cppia.hxml b/tests/benchs/mandelbrot/compile-cppia.hxml
index 31ce1fe5f2bb8c71c603f1bd9ce4da82ee991517..ea60ad10ef3f54363f6574b5bb18c345347be559 100644
--- a/tests/benchs/mandelbrot/compile-cppia.hxml
+++ b/tests/benchs/mandelbrot/compile-cppia.hxml
@@ -1,9 +1,9 @@
--main Mandelbrot
+--main Mandelbrot
 -cpp bin/Mandelbrot.cppia
 -D cppia
 
 --next
--main Mandelbrot
+--main Mandelbrot
 -cpp bin/Mandelbrot-anon.cppia
 -D cppia
 -D anon_objects
diff --git a/tests/benchs/mandelbrot/compile-hl.hxml b/tests/benchs/mandelbrot/compile-hl.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..e20fe13f60410c302d7913ae9cc735c3bfb5f70f
--- /dev/null
+++ b/tests/benchs/mandelbrot/compile-hl.hxml
@@ -0,0 +1,18 @@
+--main Mandelbrot
+-hl bin/mandelbrot.hl
+
+--next
+--main Mandelbrot
+-hl bin/mandelbrot-anon.hl
+-D anon_objects
+
+--next
+--main Mandelbrot
+-hl bin/hl/mandelbrot.c
+
+--next
+--main Mandelbrot
+-hl bin/hl_anon/mandelbrot.c
+-D anon_objects
+
+# cl.exe /Ox -I C:/GitHub/hl/src -I . mandelbrot.c C:/GitHub/hl/Release/libhl.lib
\ No newline at end of file
diff --git a/tests/benchs/mandelbrot/compile-java.hxml b/tests/benchs/mandelbrot/compile-java.hxml
index 95ae1ee755cbca73d2c50b231bc786d6b66949cb..8374cd8b574e2163ab2cb4b19643a8ced18b9715 100644
--- a/tests/benchs/mandelbrot/compile-java.hxml
+++ b/tests/benchs/mandelbrot/compile-java.hxml
@@ -1,7 +1,7 @@
--main Mandelbrot
+--main Mandelbrot
 -java bin/java
 
 --next
--main Mandelbrot
+--main Mandelbrot
 -java bin/java-anon
 -D anon_objects
diff --git a/tests/benchs/mandelbrot/compile-js.hxml b/tests/benchs/mandelbrot/compile-js.hxml
index 8b08f083d94158ed376cef791c77239710b49d81..c04b0203cdac363e1bb8c3caa46911288483e513 100644
--- a/tests/benchs/mandelbrot/compile-js.hxml
+++ b/tests/benchs/mandelbrot/compile-js.hxml
@@ -1,7 +1,7 @@
--main Mandelbrot
+--main Mandelbrot
 -js bin/Mandelbrot.js
 
 --next
--main Mandelbrot
+--main Mandelbrot
 -js bin/Mandelbrot-anon.js
 -D anon_objects
diff --git a/tests/benchs/mandelbrot/compile-jvm.hxml b/tests/benchs/mandelbrot/compile-jvm.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..6b190b2193a7b6040b1955aceb964add875cd185
--- /dev/null
+++ b/tests/benchs/mandelbrot/compile-jvm.hxml
@@ -0,0 +1,9 @@
+--main Mandelbrot
+-java bin/jvm
+-D jvm
+
+--next
+--main Mandelbrot
+-java bin/jvm-anon
+-D anon_objects
+-D jvm
diff --git a/tests/benchs/mandelbrot/compile-macro.hxml b/tests/benchs/mandelbrot/compile-macro.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..44dee9cd1e0f7239d17eb4b7d2ced4edca0c4ca3
--- /dev/null
+++ b/tests/benchs/mandelbrot/compile-macro.hxml
@@ -0,0 +1,7 @@
+--main Mandelbrot
+--interp
+
+--next
+--main Mandelbrot
+--interp
+-D anon_objects
\ No newline at end of file
diff --git a/tests/benchs/mandelbrot/compile-neko.hxml b/tests/benchs/mandelbrot/compile-neko.hxml
index 012677b7e18f6e380ed197cc7356964a1e8c1773..6a561b4102b022266be6e098086698a55e5473c5 100644
--- a/tests/benchs/mandelbrot/compile-neko.hxml
+++ b/tests/benchs/mandelbrot/compile-neko.hxml
@@ -1,7 +1,7 @@
--main Mandelbrot
+--main Mandelbrot
 -neko bin/Mandelbrot.n
 
 --next
--main Mandelbrot
+--main Mandelbrot
 -neko bin/Mandelbrot-anon.n
 -D anon_objects
diff --git a/tests/benchs/mandelbrot/compile-php.hxml b/tests/benchs/mandelbrot/compile-php.hxml
index a0b0294f22bff6662f0b165f4126c9bbcc6e0a10..41e3dd367d95bce73299a6e7518ee95e77c6630a 100644
--- a/tests/benchs/mandelbrot/compile-php.hxml
+++ b/tests/benchs/mandelbrot/compile-php.hxml
@@ -1,7 +1,7 @@
--main Mandelbrot
+--main Mandelbrot
 -php bin/php
 
 --next
--main Mandelbrot
+--main Mandelbrot
 -php bin/php-anon
 -D anon_objects
diff --git a/tests/benchs/mtnetwork/MTNetwork.hx b/tests/benchs/mtnetwork/MTNetwork.hx
deleted file mode 100644
index 28b43c630f5762c902596aeaa68158295e2f3e24..0000000000000000000000000000000000000000
--- a/tests/benchs/mtnetwork/MTNetwork.hx
+++ /dev/null
@@ -1,271 +0,0 @@
-class Const {
-
-	public static var HOST = new neko.net.Host("localhost");
-	public static var PORT = 1234;
-	public static var LOOPS = 3000;
-	public static var CLIENTS = 200;
-	public static var SOCKETS = 5;
-	public static var SERVERS = 16;
-	public static var USE_POLL = true;
-
-}
-
-class Task  {
-
-	var t : neko.vm.Thread;
-	public var done : Bool;
-
-	public function new() {
-		t = neko.vm.Thread.create(run);
-	}
-
-	function run() {
-		try {
-			loop();
-		} catch( e : Dynamic ) {
-			neko.Lib.print(e);
-			neko.Lib.print("\n");
-			neko.Lib.print(haxe.Stack.toString(haxe.Stack.exceptionStack()));
-			neko.Lib.print("\n");
-		}
-		done = true;
-	}
-
-	function loop() {
-		// TODO
-	}
-
-}
-
-class Client extends Task {
-
-	public var time : Float;
-
-	public function new() {
-		time = 0;
-		super();
-	}
-
-	function loop() {
-		var sockets = new Array();
-		for( i in 0...Const.SOCKETS ) {
-			var s = new neko.net.Socket();
-			while( true ) {
-				var ok = true;
-				try {
-					s.connect(Const.HOST,Const.PORT);
-				} catch( e : Dynamic ) {
-					ok = false;
-					neko.Lib.print("C");
-					neko.Sys.sleep(0.1);
-				}
-				if( ok )
-					break;
-			}
-			sockets.push(s);
-		}
-		var event = Math.round(Const.LOOPS / Const.SOCKETS);
-		var t = neko.Sys.time();
-		for( i in 0...Const.LOOPS ) {
-			var c = i % 256;
-			var k = Std.random(sockets.length);
-			var s = sockets[k];
-			s.output.writeChar(c);
-			if( s.input.readChar() != c ) throw "???";
-			if( k > 0 && k == sockets.length - 1 && Std.random(event) == 0 ) {
-				neko.Lib.print("x");
-				s.close();
-				sockets.remove(s);
-			}
-		}
-		time = neko.Sys.time() - t;
-		for( s in sockets ) {
-			neko.Lib.print("x");
-			s.close();
-		}
-	}
-
-}
-
-class ServerSelect extends Task {
-
-	var sockets : Array<neko.net.Socket>;
-
-	public function new(size) {
-		sockets = new Array();
-		super();
-	}
-
-	public function addClient(sock) {
-		t.sendMessage(sock);
-	}
-
-	function loop() {
-		var s : neko.net.Socket = neko.vm.Thread.readMessage(true);
-		sockets.push(s);
-		while( true ) {
-			for( s in neko.net.Socket.select(sockets,null,null,0.1).read ) {
-				try {
-					s.output.writeChar(s.input.readChar());
-				} catch( e : Dynamic ) {
-					neko.Lib.print("-");
-					sockets.remove(s);
-					s.close();
-				}
-			}
-			while( true ) {
-				var s : neko.net.Socket = neko.vm.Thread.readMessage(false);
-				if( s == null ) {
-					if( sockets.length != 0 )
-						break;
-					done = true;
-					s = neko.vm.Thread.readMessage(true);
-					done = false;
-				}
-				sockets.push(s);
-				neko.Lib.print("+");
-			}
-		}
-	}
-
-}
-
-
-class ServerEvents extends Task {
-
-	var sockets : Array<neko.net.Socket>;
-	var poll : neko.net.Poll;
-
-	public function new(size) {
-		sockets = new Array();
-		poll = new neko.net.Poll(size);
-		super();
-	}
-
-	public function addClient(sock) {
-		t.sendMessage(sock);
-	}
-
-	function loop() {
-		var toremove = new Array();
-		while( true ) {
-			poll.events(0.1);
-			var i = 0;
-			var idx = poll.readIndexes;
-			while( true ) {
-				var s = sockets[idx[i]];
-				if( s == null )
-					break;
-				i++;
-				try {
-					s.output.writeChar(s.input.readChar());
-				} catch( e : Dynamic ) {
-					neko.Lib.print("-");
-					toremove.push(s);
-				}
-			}
-			if( toremove.length > 0 ) {
-				for( s in toremove ) {
-					sockets.remove(s);
-					s.close();
-				}
-				poll.prepare(sockets,[]);
-				toremove = new Array();
-			}
-			var mod = false;
-			while( true ) {
-				var s : neko.net.Socket = neko.vm.Thread.readMessage(false);
-				if( s == null ) {
-					if( sockets.length != 0 )
-						break;
-					done = true;
-					s = neko.vm.Thread.readMessage(true);
-					done = false;
-				}
-				sockets.push(s);
-				mod = true;
-				neko.Lib.print("+");
-			}
-			if( mod )
-				poll.prepare(sockets,[]);
-		}
-	}
-
-}
-
-
-class MTNetwork {
-
-	static var cputime : Void -> Float = neko.Lib.load("std","sys_cpu_time",0);
-
-	static function main() {
-
-		var size = Math.round(Const.CLIENTS * Const.SOCKETS / Const.SERVERS);
-		trace("Starting on "+Const.HOST.toString()+":"+Const.PORT);
-		trace("Socket per server "+size);
-
-		var cpu = cputime();
-		var time = neko.Sys.time();
-
-		var sock = new neko.net.Socket();
-		sock.bind(Const.HOST,Const.PORT);
-		sock.listen(Const.CLIENTS * Const.SOCKETS);
-
-		var servers = new Array<{ done : Bool, addClient : neko.net.Socket -> Void }>();
-		for( i in 0...Const.SERVERS )
-			if( Const.USE_POLL )
-				servers.push(new ServerEvents(size));
-			else
-				servers.push(new ServerSelect(size));
-
-		var clients = new Array();
-		for( i in 0...Const.CLIENTS )
-			clients.push(new Client());
-
-		for( cid in 0...Const.CLIENTS * Const.SOCKETS ) {
-			var s = sock.accept();
-			s.setBlocking(false);
-			servers[cid%servers.length].addClient(s);
-		}
-
-		var done = false;
-		while( !done ) {
-			done = true;
-			for( c in clients )
-				if( !c.done ) {
-					done = false;
-					break;
-				}
-			if( !done ) {
-				neko.Sys.sleep(0.5);
-				continue;
-			}
-			for( s in servers )
-				if( !s.done ) {
-					done = false;
-					break;
-				}
-			neko.Sys.sleep(0.5);
-		}
-
-		var cpu2 = cputime();
-		var time2 = neko.Sys.time();
-
-		var st = 0.;
-		var min = 1000.;
-		var max = 0.;
-		for( c in clients ) {
-			st += c.time;
-			if( c.time < min ) min = c.time;
-			if( c.time > max ) max = c.time;
-		}
-		neko.Lib.print("\n");
-		trace("AVG = "+(st / (Const.CLIENTS * Const.LOOPS)));
-		trace("MIN = "+(min / Const.LOOPS));
-		trace("MAX = "+(max / Const.LOOPS));
-		trace("CPU = "+((cpu2 - cpu) / Const.LOOPS));
-		trace("TOTAL TIME = "+((time2 - time) / Const.LOOPS));
-		trace("DONE");
-	}
-
-}
diff --git a/tests/benchs/src/Macro.hx b/tests/benchs/src/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..26ce13e2add876dfebf8084c8029259906d70098
--- /dev/null
+++ b/tests/benchs/src/Macro.hx
@@ -0,0 +1,59 @@
+import haxe.macro.Context;
+import haxe.macro.Expr;
+import haxe.io.Path;
+
+using StringTools;
+using sys.FileSystem;
+
+class Macro {
+	static var singleCaseField = null;
+
+	macro static function buildCase():Array<Field> {
+		var measureFields = [];
+		var fields = Context.getBuildFields();
+		for (field in fields) {
+			if (field.name.startsWith("measure")) {
+				if (singleCaseField == null || field.name.startsWith(singleCaseField)) {
+					measureFields.push(macro $i{field.name});
+				}
+			}
+		}
+		fields.push((macro class C {
+			public function new() {
+				this.fieldFunctions = $a{measureFields};
+			}
+		}).fields[0]);
+		return fields;
+	}
+
+	macro static public function getCases(pack:String) {
+		var cases = [];
+		var singleCase = Context.definedValue("test");
+		if (singleCase != null) {
+			var split = singleCase.split(".");
+			singleCase = split[0];
+			singleCaseField = split[1];
+		}
+		function loop(pack:Array<String>) {
+			var path = Context.resolvePath(Path.join(pack));
+			for (file in sys.FileSystem.readDirectory(path)) {
+				if (singleCase != null && !file.endsWith(singleCase + ".hx")) {
+					continue;
+				}
+				var p = new haxe.io.Path(file);
+				if (p.ext == "hx") {
+					var tp = {pack: pack, name: p.file};
+					cases.push(macro { name:$v{tp.name}, exec:new $tp() });
+				} else if(Path.join([path, file]).isDirectory()) {
+					loop(pack.concat([file]));
+				}
+			}
+		}
+		loop(pack.split('.'));
+		if(cases.length == 0) {
+			Sys.stderr().writeString('${Context.definedValue("test")} not found.\n');
+			Sys.exit(1);
+		}
+		return macro $a{cases};
+	}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/Main.hx b/tests/benchs/src/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..91011d5cdc6e0e6561ceff9c41387520c5ea3d52
--- /dev/null
+++ b/tests/benchs/src/Main.hx
@@ -0,0 +1,17 @@
+import hxbenchmark.SuiteResult;
+import hxbenchmark.ResultPrinter;
+
+class Main {
+	static function main() {
+		var cases = Macro.getCases("cases");
+		var printer = new ResultPrinter();
+		function print(result:SuiteResult) {
+			Sys.println(printer.print(result));
+		}
+
+		for (benchCase in cases) {
+			Sys.println('Case: ${benchCase.name}');
+			benchCase.exec.run(print);
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/TestCase.hx b/tests/benchs/src/TestCase.hx
new file mode 100644
index 0000000000000000000000000000000000000000..95d5da09052fbfa2b6b677e263925e91029ce6d9
--- /dev/null
+++ b/tests/benchs/src/TestCase.hx
@@ -0,0 +1,11 @@
+import hxbenchmark.SuiteResult;
+@:autoBuild(Macro.buildCase())
+class TestCase {
+	var fieldFunctions:Array<() -> SuiteResult>;
+
+	public function run(cb:SuiteResult -> Void) {
+		for (f in fieldFunctions) {
+			cb(f());
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/cases/Access.hx b/tests/benchs/src/cases/Access.hx
new file mode 100644
index 0000000000000000000000000000000000000000..94421cd92309ffe6c6f2d0e57990ef7fef314897
--- /dev/null
+++ b/tests/benchs/src/cases/Access.hx
@@ -0,0 +1,102 @@
+package cases;
+
+import hxbenchmark.Suite;
+
+typedef Def = {
+	var i : Int;
+	var f : Float;
+	var ?oi : Int;
+	var ?of : Float;
+	var ai : Array<Int>;
+	var af : Array<Float>;
+	var str : String;
+}
+typedef Obj = {>Def,
+	var sub : Def;
+}
+
+@:analyzer(ignore)
+class Access extends TestCase {
+	function measureReal() {
+		var o = getObj();
+		var suite = new Suite("real");
+		suite.add(".Int", o.i);
+		suite.add(".Float", o.f);
+		suite.add("Int[]", o.ai[0]);
+		suite.add("Float[]", o.af[0]);
+		suite.add(".Int?", o.oi);
+		suite.add(".Float?", o.of);
+		suite.add(".String.length", o.str.length);
+		suite.add(".sub.Int", o.sub.i);
+		suite.add(".sub.Float", o.sub.f);
+		suite.add(".sub.Int[]", o.sub.ai[0]);
+		suite.add(".sub.Float[]", o.sub.af[0]);
+		suite.add(".sub.Int?", o.sub.oi);
+		suite.add(".sub.Float?", o.sub.of);
+		suite.add(".sub.String.length", o.sub.str.length);
+		return suite.run();
+	}
+
+	function measureJson() {
+		var o = getObj();
+		var o = haxe.Json.stringify(o);
+		var o:Obj = haxe.Json.parse(o);
+		var suite = new Suite("json");
+		suite.add(".Int", o.i);
+		suite.add(".Float", o.f);
+		suite.add("Int[]", o.ai[0]);
+		suite.add("Float[]", o.af[0]);
+		suite.add(".Int?", o.oi);
+		suite.add(".Float?", o.of);
+		suite.add(".String.length", o.str.length);
+		suite.add(".sub.Int", o.sub.i);
+		suite.add(".sub.Float", o.sub.f);
+		suite.add(".sub.Int[]", o.sub.ai[0]);
+		suite.add(".sub.Float[]", o.sub.af[0]);
+		suite.add(".sub.Int?", o.sub.oi);
+		suite.add(".sub.Float?", o.sub.of);
+		suite.add(".sub.String.length", o.sub.str.length);
+		return suite.run();
+	}
+
+	function measureDynamic() {
+		var o:Dynamic = getObj();
+		var suite = new Suite("dynamic");
+		suite.add(".Int", o.i);
+		suite.add(".Float", o.f);
+		suite.add("Int[]", o.ai[0]);
+		suite.add("Float[]", o.af[0]);
+		suite.add(".Int?", o.oi);
+		suite.add(".Float?", o.of);
+		suite.add(".String.length", o.str.length);
+		suite.add(".sub.Int", o.sub.i);
+		suite.add(".sub.Float", o.sub.f);
+		suite.add(".sub.Int[]", o.sub.ai[0]);
+		suite.add(".sub.Float[]", o.sub.af[0]);
+		suite.add(".sub.Int?", o.sub.oi);
+		suite.add(".sub.Float?", o.sub.of);
+		suite.add(".sub.String.length", o.sub.str.length);
+		return suite.run();
+	}
+
+	static function getObj():Obj {
+		return {
+			i : 1,
+			f : 1.0,
+			oi : 1,
+			of : 1.0,
+			ai : [1],
+			af : [1.0],
+			str : "1",
+			sub : {
+				i : 1,
+				f : 1.0,
+				oi : 1,
+				of : 1.0,
+				ai : [1],
+				af : [1.0],
+				str : "1",
+			}
+		};
+	}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/cases/Calls.hx b/tests/benchs/src/cases/Calls.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1e9249951c3f2259ad8395355dd3fd90d849f188
--- /dev/null
+++ b/tests/benchs/src/cases/Calls.hx
@@ -0,0 +1,146 @@
+package cases;
+
+import haxe.ds.Vector;
+import hxbenchmark.Suite;
+
+interface CallInterface {
+	function instanceCall0():String;
+	function instanceCall1(s1:String):String;
+	function instanceCall2(s1:String, s2:String):String;
+}
+
+class CallClass implements CallInterface {
+	static public function staticCall0() { return null; }
+	static public function staticCall1(s1:String) { return null; }
+	static public function staticCall2(s1:String, s2:String) { return null; }
+
+	public function instanceCall0() { return null; }
+	public function instanceCall1(s1:String) { return null; }
+	public function instanceCall2(s1:String, s1:String) { return null; }
+
+	public final function finalCall0() { return null; }
+	public final function finalCall1(s1:String) { return null; }
+	public final function finalCall2(s1:String, s2:String) { return null; }
+
+	public function overrideCall0() { return null; }
+	public function overrideCall1(s1:String) { return null; }
+	public function overrideCall2(s2:String, s2:String) { return null; }
+
+	public function new() { }
+}
+
+class CallClassChild extends CallClass {
+	override function overrideCall0() { return null; }
+	override function overrideCall1(s1:String) { return null; }
+	override function overrideCall2(s2:String, s2:String) { return null; }
+}
+
+class Calls extends TestCase {
+	@:analyzer(ignore)
+	function measureCall0() {
+		var c = new CallClass();
+		var cSub:CallClass = new CallClassChild();
+		var cInterface:CallInterface = c;
+		var cAnon:{ function instanceCall0():String; } = c;
+		var cActualAnon = {
+			instanceCall0: function ():String {
+				return null;
+			}
+		};
+		escape(cActualAnon);
+		var cDynamic:Dynamic = c;
+		var staticClosureCall0 = CallClass.staticCall0;
+		var memberClosureCall0 = c.instanceCall0;
+		function closureCall0() { return c; }
+		function localFunctionCall0() { return null; }
+
+		var suite = new Suite("call with 0 args");
+		suite.add("static", CallClass.staticCall0());
+		suite.add("instance", c.instanceCall0());
+		suite.add("override", cSub.overrideCall0());
+		suite.add("final", cSub.finalCall0());
+		suite.add("interface", cInterface.instanceCall0());
+		suite.add("class-to-anon", cAnon.instanceCall0());
+		suite.add("anon", cActualAnon.instanceCall0());
+		suite.add("dynamic", cDynamic.instanceCall0());
+		suite.add("local function", localFunctionCall0());
+		suite.add("local closure", closureCall0());
+		suite.add("static closure", staticClosureCall0());
+		suite.add("field closure", memberClosureCall0());
+		return suite.run();
+	}
+
+	@:analyzer(ignore)
+	function measureCall1() {
+		var c = new CallClass();
+		var cSub:CallClass = new CallClassChild();
+		var cInterface:CallInterface = c;
+		var cAnon:{
+			function instanceCall1(s1:String):String;
+		} = c;
+		var cActualAnon = {
+			instanceCall1: function (s1:String):String {
+				return null;
+			}
+		};
+		escape(cActualAnon);
+		var cDynamic:Dynamic = c;
+		var staticClosureCall1 = CallClass.staticCall1;
+		var memberClosureCall1 = c.instanceCall1;
+		function closureCall1(s1:String) { return c; }
+		function localFunctionCall1(s1:String) { return null; }
+
+		var suite = new Suite("call with 1 arg");
+		suite.add("static", CallClass.staticCall1("foo"));
+		suite.add("instance", c.instanceCall1("foo"));
+		suite.add("override", cSub.overrideCall1("foo"));
+		suite.add("final", cSub.finalCall1("foo"));
+		suite.add("interface", cInterface.instanceCall1("foo"));
+		suite.add("class-to-anon", cAnon.instanceCall1("foo"));
+		suite.add("anon", cActualAnon.instanceCall1("foo"));
+		suite.add("dynamic", cDynamic.instanceCall1("foo"));
+		suite.add("local function", localFunctionCall1("foo"));
+		suite.add("local closure", closureCall1("foo"));
+		suite.add("static closure", staticClosureCall1("foo"));
+		suite.add("field closure", memberClosureCall1("foo"));
+		return suite.run();
+	}
+
+	@:analyzer(ignore)
+	function measureCall2() {
+		var c = new CallClass();
+		var cSub:CallClass = new CallClassChild();
+		var cInterface:CallInterface = c;
+		var cAnon:{
+			function instanceCall2(s1:String, s2:String):String;
+		} = c;
+		var cActualAnon = {
+			instanceCall2: function (s1:String, s2:String):String {
+				return null;
+			}
+		};
+		escape(cActualAnon);
+		var cDynamic:Dynamic = c;
+		var staticClosureCall2 = CallClass.staticCall2;
+		var memberClosureCall2 = c.instanceCall2;
+		function closureCall2(s1:String, s2:String) { return c; }
+		function localFunctionCall2(s1:String, s2:String) { return null; }
+
+		var suite = new Suite("call with 2 args");
+		suite.add("static", CallClass.staticCall2("foo", "bar"));
+		suite.add("instance", c.instanceCall2("foo", "bar"));
+		suite.add("override", cSub.overrideCall2("foo", "bar"));
+		suite.add("final", cSub.finalCall2("foo", "bar"));
+		suite.add("interface", cInterface.instanceCall2("foo", "bar"));
+		suite.add("class-to-anon", cAnon.instanceCall2("foo", "bar"));
+		suite.add("anon", cActualAnon.instanceCall2("foo", "bar"));
+		suite.add("dynamic", cDynamic.instanceCall2("foo", "bar"));
+		suite.add("local function", localFunctionCall2("foo", "bar"));
+		suite.add("local closure", closureCall2("foo", "bar"));
+		suite.add("static closure", staticClosureCall2("foo", "bar"));
+		suite.add("field closure", memberClosureCall2("foo", "bar"));
+		return suite.run();
+	}
+
+	static function escape(d:Dynamic) { }
+}
\ No newline at end of file
diff --git a/tests/benchs/src/cases/CharacterAccess.hx b/tests/benchs/src/cases/CharacterAccess.hx
new file mode 100644
index 0000000000000000000000000000000000000000..078d818ac905211f5a784384c57e65b365f258c7
--- /dev/null
+++ b/tests/benchs/src/cases/CharacterAccess.hx
@@ -0,0 +1,106 @@
+package cases;
+
+import hxbenchmark.Suite;
+using StringTools;
+
+@:analyzer(no_local_dce)
+class CharacterAccess extends TestCase {
+	function measureL1() {
+		var s = "a";
+		var suite = new Suite("length 1");
+		suite.add("charAt(0)", s.charAt(0));
+		suite.add("charCodeAt(0)", s.charCodeAt(0));
+		suite.add("fastCodeAt(0)", s.fastCodeAt(0));
+		return suite.run();
+	}
+
+	function measureL100() {
+		var s = "".lpad("a", 100);
+		var suite = new Suite("length 100");
+		suite.add("charAt(0)", s.charAt(0));
+		suite.add("charAt(50)", s.charAt(50));
+		suite.add("charAt(99)", s.charAt(99));
+		suite.add("charCodeAt(0)", s.charCodeAt(0));
+		suite.add("charCodeAt(50)", s.charCodeAt(50));
+		suite.add("charCodeAt(99)", s.charCodeAt(99));
+		suite.add("fastCodeAt(0)", s.fastCodeAt(0));
+		suite.add("fastCodeAt(50)", s.fastCodeAt(50));
+		suite.add("fastCodeAt(99)", s.fastCodeAt(99));
+		suite.add("charAt(erratic)", {
+			s.charAt(index);
+			index += index;
+			index %= s.length;
+		}, var index = 0);
+		suite.add("charCodeAt(erratic)", {
+			s.charCodeAt(index);
+			index += index;
+			index %= s.length;
+		}, var index = 0);
+		suite.add("fastCodeAt(erratic)", {
+			s.fastCodeAt(index);
+			index += index;
+			index %= s.length;
+		}, var index = 0);
+		return suite.run();
+	}
+
+	function measureL10000() {
+		var s = "".lpad("a", 10000);
+		var suite = new Suite("length 10000");
+		suite.add("charAt(0)", s.charAt(0));
+		suite.add("charAt(5000)", s.charAt(5000));
+		suite.add("charAt(9999)", s.charAt(9999));
+		suite.add("charCodeAt(0)", s.charCodeAt(0));
+		suite.add("charCodeAt(5000)", s.charCodeAt(5000));
+		suite.add("charCodeAt(9999)", s.charCodeAt(9999));
+		suite.add("fastCodeAt(0)", s.fastCodeAt(0));
+		suite.add("fastCodeAt(5000)", s.fastCodeAt(5000));
+		suite.add("fastCodeAt(9999)", s.fastCodeAt(9999));
+		suite.add("charAt(erratic)", {
+			s.charAt(index);
+			index += index;
+			index %= s.length;
+		}, var index = 0);
+		suite.add("charCodeAt(erratic)", {
+			s.charCodeAt(index);
+			index += index;
+			index %= s.length;
+		}, var index = 0);
+		suite.add("fastCodeAt(erratic)", {
+			s.fastCodeAt(index);
+			index += index;
+			index %= s.length;
+		}, var index = 0);
+		return suite.run();
+	}
+
+	function measureL1000000() {
+		var s = "".lpad("a", 1000000);
+		var suite = new Suite("length 1000000");
+		suite.add("charAt(0)", s.charAt(0));
+		suite.add("charAt(500000)", s.charAt(500000));
+		suite.add("charAt(999999)", s.charAt(999999));
+		suite.add("charCodeAt(0)", s.charCodeAt(0));
+		suite.add("charCodeAt(500000)", s.charCodeAt(500000));
+		suite.add("charCodeAt(999999)", s.charCodeAt(999999));
+		suite.add("fastCodeAt(0)", s.fastCodeAt(0));
+		suite.add("fastCodeAt(500000)", s.fastCodeAt(500000));
+		suite.add("fastCodeAt(999999)", s.fastCodeAt(999999));
+		suite.add("charAt(erratic)", {
+			s.charAt(index);
+			index += index;
+			index %= s.length;
+		}, var index = 0);
+		suite.add("charCodeAt(erratic)", {
+			s.charCodeAt(index);
+			index += index;
+			index %= s.length;
+		}, var index = 0);
+		suite.add("fastCodeAt(erratic)", {
+			s.fastCodeAt(index);
+			index += index;
+			index %= s.length;
+		}, var index = 0);
+		return suite.run();
+	}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/cases/CustomIterator.hx b/tests/benchs/src/cases/CustomIterator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..31d377eaf85ebfb3740436abf572e1c4246f698c
--- /dev/null
+++ b/tests/benchs/src/cases/CustomIterator.hx
@@ -0,0 +1,102 @@
+package cases;
+
+import hxbenchmark.Suite;
+
+class CustomIterator<T> extends TestCase {
+
+	var MAX_TIME_PER_CASE:Float = .5;
+	var N = 1000;
+
+	function measureInt() {
+		var data = [for (i in 0...N) i];
+		var custom = new Custom(data);
+
+		var suite = new Suite('Custom(Array<Int>[$N])', MAX_TIME_PER_CASE);
+		suite.add("inlineIterator()", for (v in custom.inlineIterator()) {});
+		suite.add("iterator()", for (v in custom.iterator()) {});
+		suite.add("iteratorT()", for (v in custom.iteratorT()) {});
+		suite.add("iter(func)", custom.iter(function(v) {}));
+		return suite.run();
+	}
+
+	function measureString() {
+		var data = [for (i in 0...N) "" + i];
+		var custom = new Custom(data);
+
+		var suite = new Suite('Custom(Array<String>[$N])', MAX_TIME_PER_CASE);
+		suite.add("inlineIterator()", for (v in custom.inlineIterator()) {});
+		suite.add("iterator()", for (v in custom.iterator()) {});
+		suite.add("iteratorT()", for (v in custom.iteratorT()) {});
+		suite.add("iter(func)", custom.iter(function(v) {}));
+		return suite.run();
+	}
+
+	function measureDummy() {
+		var data = [for (i in 0...N) new Dummy()];
+		var custom = new Custom(data);
+
+		var suite = new Suite('Custom(Array<Dummy>[$N])', MAX_TIME_PER_CASE);
+		suite.add("inlineIterator()", for (v in custom.inlineIterator()) {});
+		suite.add("iterator()", for (v in custom.iterator()) {});
+		suite.add("iteratorT()", for (v in custom.iteratorT()) {});
+		suite.add("iter(func)", custom.iter(function(v) {}));
+		return suite.run();
+	}
+}
+
+class Custom<T> {
+	public var data:Array<T>;
+
+	public function new(data:Array<T>) {
+		this.data = data;
+	}
+
+	inline public function inlineIterator():Iterator<T> {
+		return data.iterator();
+	}
+
+	public function iterator():Iterator<T> {
+		return data.iterator();
+	}
+
+	public function iteratorT():Iterator<T> {
+		return new IteratorT(this);
+	}
+
+	public function iter(func:T->Void) {
+		var len = data.length;
+		var idx = 0;
+		while (idx < len) {
+			func(data[idx]);
+			idx++;
+		}
+	}
+}
+
+class IteratorT<T> {
+	var data:Array<T>;
+	var len:Int;
+	var idx:Int;
+
+	public function new(custom:Custom<T>) {
+		this.data = custom.data;
+		this.len = data.length;
+		this.idx = 0;
+	}
+
+	inline public function hasNext():Bool {
+		return idx < len;
+	}
+
+	inline public function next():T {
+		return data[idx++];
+	}
+}
+
+class Dummy {
+	var x:Int;
+	var s:String;
+	var o:{};
+
+	public function new() {}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/cases/Ds.hx b/tests/benchs/src/cases/Ds.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9acbc08b3f26283ee95faeb5661fc58c23084fcd
--- /dev/null
+++ b/tests/benchs/src/cases/Ds.hx
@@ -0,0 +1,131 @@
+package cases;
+
+import haxe.ds.Vector;
+import hxbenchmark.Suite;
+
+class Ds extends TestCase {
+	function measureCreate() {
+		var suite = new Suite("create");
+		suite.add("Vector", new Vector(0));
+		suite.add("Array", new Array());
+		suite.add("StringMap", new haxe.ds.StringMap());
+		suite.add("IntMap", new haxe.ds.IntMap());
+		suite.add("ObjectMap", new haxe.ds.ObjectMap());
+		return suite.run();
+	}
+
+	@:analyzer(ignore)
+	function measureRead() {
+		var suite = new Suite("read");
+		var a = [1];
+		var v = Vector.fromArrayCopy(a);
+		var sm = new Map();
+		var im = new Map();
+		var om = new Map();
+		var key = { foo: 1 };
+		suite.add("Vector", v[0]);
+		suite.add("Array", a[0]);
+		suite.add("StringMap", sm["foo"]);
+		suite.add("IntMap", im[1]);
+		suite.add("ObjectMap", om[key]);
+		return suite.run();
+	}
+
+	function measureWrite() {
+		var suite = new Suite("write");
+		var a = [1];
+		var v = Vector.fromArrayCopy(a);
+		var sm = new Map();
+		var im = new Map();
+		var om = new Map();
+		var key = { foo: 1 };
+		suite.add("Vector", v[0] = 1);
+		suite.add("Array", a[0] = 1);
+		suite.add("StringMap", sm["foo"] = 1);
+		suite.add("IntMap", im[1] = 1);
+		suite.add("ObjectMap", om[key] = 1);
+		return suite.run();
+	}
+
+	function measureReadWrite() {
+		var suite = new Suite("read + write");
+		var a = [1];
+		var v = Vector.fromArrayCopy(a);
+		var sm = ["foo" => 0];
+		var im = [1 => 0];
+		var key = { foo: 1 };
+		var om = [key => 0];
+		suite.add("Vector", v[0] += 1);
+		suite.add("Array", a[0] += 1);
+		suite.add("StringMap", sm["foo"] += 1);
+		suite.add("IntMap", im[1] += 1);
+		suite.add("ObjectMap", om[key] += 1);
+		return suite.run();
+	}
+
+	function measureIterate() {
+		var suite = new Suite("iterate + write");
+		var a = [];
+		var sm = new Map();
+		var im = new Map();
+		var om = new Map();
+		for (i in 0...10000) {
+			a[i] = i;
+			im[i] = i;
+			sm["" + i] = i;
+			om[{foo: i}] = i;
+		}
+		var v = Vector.fromArrayCopy(a);
+		var key = { foo: 1 };
+		suite.add("Vector", for (i in v) { v[i] = i; });
+		suite.add("Array", for (i in a) { a[i] = i; });
+		suite.add("StringMap", for (i in a) { sm["foo"] = i; });
+		suite.add("IntMap", for (i in a) { im[1] = i; });
+		suite.add("ObjectMap", for (i in a) { om[key] = i; });
+		return suite.run();
+	}
+
+	function measureMap() {
+		var suite = new Suite("map");
+		var a = [];
+		for (i in 0...10000) a[i] = i;
+		var v = Vector.fromArrayCopy(a);
+		function f(x) return x;
+		suite.add("Vector", v.map(f));
+		suite.add("Array", a.map(f));
+		return suite.run();
+	}
+
+	function measureJoin() {
+		var suite = new Suite("join");
+		var a = [];
+		for (i in 0...10000) a[i] = i;
+		var v = Vector.fromArrayCopy(a);
+		function f(x) return x;
+		suite.add("Vector", v.join(""));
+		suite.add("Array", a.join(""));
+		return suite.run();
+	}
+
+	function measureCopy() {
+		var suite = new Suite("copy");
+		var a = [];
+		var sm = new Map();
+		var im = new Map();
+		var om = new Map();
+		for (i in 0...10000) {
+			sm["" + i] = i;
+			im[i] = i;
+			om[{key: i}] = i;
+			a[i] = i;
+		}
+		var v = Vector.fromArrayCopy(a);
+		function f(x) return x;
+		suite.add("Vector", v.copy());
+		suite.add("Array", a.copy());
+		suite.add("StringMap", sm.copy());
+		suite.add("IntMap", im.copy());
+		suite.add("ObjectMap", om.copy());
+		return suite.run();
+	}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/cases/StringIterator.hx b/tests/benchs/src/cases/StringIterator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..36ea65d2faaf83e94d3d4aeb6d6e67bb1faeae0e
--- /dev/null
+++ b/tests/benchs/src/cases/StringIterator.hx
@@ -0,0 +1,71 @@
+package cases;
+
+import hxbenchmark.Suite;
+import haxe.iterators.StringKeyValueIteratorUnicode;
+using StringTools;
+
+class StringIterator extends TestCase {
+	function measureL100() {
+		var s = "".lpad("a", 100);
+		var suite = new Suite("length 100");
+		suite.add("0...length + fastCodeAt",
+			for (key in 0...s.length) {
+				var value = s.fastCodeAt(key);
+			}
+		);
+		suite.add("StringKeyValueIteratorUnicode",
+			for (key => value in new StringKeyValueIteratorUnicode(s)) {
+
+			}
+		);
+		return suite.run();
+	}
+
+	function measureL1000() {
+		var s = "".lpad("a", 1000);
+		var suite = new Suite("length 1000");
+		suite.add("0...length + fastCodeAt",
+			for (key in 0...s.length) {
+				var value = s.fastCodeAt(key);
+			}
+		);
+		suite.add("StringKeyValueIteratorUnicode",
+			for (key => value in new StringKeyValueIteratorUnicode(s)) {
+
+			}
+		);
+		return suite.run();
+	}
+
+	function measureL10000() {
+		var s = "".lpad("a", 10000);
+		var suite = new Suite("length 10000");
+		suite.add("0...length + fastCodeAt",
+			for (key in 0...s.length) {
+				var value = s.fastCodeAt(key);
+			}
+		);
+		suite.add("StringKeyValueIteratorUnicode",
+			for (key => value in new StringKeyValueIteratorUnicode(s)) {
+
+			}
+		);
+		return suite.run();
+	}
+
+	function measure4BytesL100() {
+		var s = "".lpad("𠜎", 100);
+		var suite = new Suite("length 100 of 4-bytes characters");
+		suite.add("0...length + fastCodeAt",
+			for (key in 0...s.length) {
+				var value = s.fastCodeAt(key);
+			}
+		);
+		suite.add("StringKeyValueIteratorUnicode",
+			for (key => value in new StringKeyValueIteratorUnicode(s)) {
+
+			}
+		);
+		return suite.run();
+	}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/cases/StringScan.hx b/tests/benchs/src/cases/StringScan.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6378c08f33ecc06f5eca987b33646827d80fbb99
--- /dev/null
+++ b/tests/benchs/src/cases/StringScan.hx
@@ -0,0 +1,21 @@
+package cases;
+
+import hxbenchmark.Suite;
+
+using StringTools;
+
+class StringScan extends TestCase {
+	function measure20003() {
+		var s = "".lpad("a", 10000) + "bcd" + "".lpad("e", 10000);
+		var suite = new Suite("length 20003");
+		suite.add("indexOf find", s.indexOf("bcd"));
+		suite.add("indexOf nofind", s.indexOf("bce"));
+		suite.add("indexOf hit", s.indexOf("bcd", 10000));
+		suite.add("lastIndexOf find", s.lastIndexOf("bcd"));
+		suite.add("lastIndexOf nofind", s.lastIndexOf("bce"));
+		suite.add("lastIndexOf hit", s.lastIndexOf("bcd", 10003));
+		suite.add("split find", s.split("bcd"));
+		suite.add("split nofind", s.split("bce"));
+		return suite.run();
+	}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/hxbenchmark/CaseResult.hx b/tests/benchs/src/hxbenchmark/CaseResult.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ab4ab5354b72d40c3620ed477317f87d41e14f3d
--- /dev/null
+++ b/tests/benchs/src/hxbenchmark/CaseResult.hx
@@ -0,0 +1,6 @@
+package hxbenchmark;
+
+typedef CaseResult = {
+	var name:String;
+	var numSamples:Int;
+}
\ No newline at end of file
diff --git a/tests/benchs/src/hxbenchmark/ResultPrinter.hx b/tests/benchs/src/hxbenchmark/ResultPrinter.hx
new file mode 100644
index 0000000000000000000000000000000000000000..07efa6378a9e01e0f8b5518be5393f4fc945f15d
--- /dev/null
+++ b/tests/benchs/src/hxbenchmark/ResultPrinter.hx
@@ -0,0 +1,66 @@
+package hxbenchmark;
+
+using StringTools;
+
+class ResultPrinter {
+	public function new() {
+
+	}
+
+	public function print(result:SuiteResult) {
+		// result.cases.sort((cr1, cr2) -> Reflect.compare(cr2.numSamples, cr1.numSamples));
+		result.cases.sort((cr1, cr2) -> Reflect.compare(cr1.name, cr2.name));
+		var maxNameLength = 0;
+		var maxSampleLength = 0;
+		for (caseResult in result.cases) {
+			if (caseResult.name.length > maxNameLength) {
+				maxNameLength = caseResult.name.length;
+			}
+			var sampleLength = printNumber(caseResult.numSamples).length;
+			if (sampleLength > maxSampleLength) {
+				maxSampleLength = sampleLength;
+			}
+		}
+		var best = result.cases[0].numSamples;
+		var buf = new StringBuf();
+		buf.add("  Suite: " + result.name + "\n");
+		for (caseResult in result.cases) {
+			buf.add("    ");
+			buf.add(caseResult.name.lpad(" ", maxNameLength));
+			buf.add(": ");
+			buf.add(printNumber(caseResult.numSamples).lpad(" ", maxSampleLength));
+			buf.add(" (");
+			var percentage = round(Std.string(caseResult.numSamples * 100. / best), 2);
+			buf.add(percentage.lpad(" ", 6));
+			buf.add("%)\n");
+		}
+		return buf.toString();
+	}
+
+	function printNumber(i:Int) {
+		var buf = new StringBuf();
+		var s = Std.string(i);
+		var k = s.length % 3;
+		var i = k;
+		buf.addSub(s, 0, k);
+		while (i < s.length) {
+			if (buf.length > 0) {
+				buf.add(",");
+			}
+			buf.addSub(s, i, 3);
+			i += 3;
+		}
+		return buf.toString();
+	}
+
+	function round(s:String, digits:Int) {
+		var i = s.indexOf(".");
+		if (i == -1) {
+			if (digits > 0)
+				return (s + ".").rpad("0", digits + s.length + 1);
+			else
+				return s;
+		}
+		return (s.substr(0, i) + s.substr(i, digits + 1)).rpad("0", i + digits + 1);
+	}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/hxbenchmark/Suite.hx b/tests/benchs/src/hxbenchmark/Suite.hx
new file mode 100644
index 0000000000000000000000000000000000000000..83621c992834a07e8be695fc99510fd3f38ee9d0
--- /dev/null
+++ b/tests/benchs/src/hxbenchmark/Suite.hx
@@ -0,0 +1,54 @@
+package hxbenchmark;
+
+import haxe.macro.Expr;
+
+class Suite {
+	public var maxTimePerCase:Float;
+	final name:String;
+	final cases:Array<() -> CaseResult>;
+
+	public function new(name:String, ?maxTimePerCase = .5) {
+		this.name = name;
+		this.maxTimePerCase = maxTimePerCase;
+		cases = [];
+	}
+
+	macro public function add(eThis:Expr, name:String, expr:Expr, ?exprInit:Expr) {
+		if (exprInit == null) {
+			exprInit = macro {};
+		}
+		return macro @:privateAccess {
+			var f = function() {
+				var currentTime = haxe.Timer.stamp();
+				var targetTime = currentTime + $eThis.maxTimePerCase;
+				var numSamples = 0;
+				$exprInit;
+				do {
+					++numSamples;
+					$expr;
+				} while((currentTime = haxe.Timer.stamp()) < targetTime);
+				var result = {
+					name: $v{name},
+					numSamples: numSamples
+				};
+				return result;
+			}
+			$eThis.addCaseFunction(f);
+		}
+	}
+
+	public function run() {
+		var results = [];
+		for (f in cases) {
+			results.push(f());
+		}
+		return {
+			name: name,
+			cases: results
+		}
+	}
+
+	function addCaseFunction(f:() -> CaseResult) {
+		cases.push(f);
+	}
+}
\ No newline at end of file
diff --git a/tests/benchs/src/hxbenchmark/SuiteResult.hx b/tests/benchs/src/hxbenchmark/SuiteResult.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1bcfec444f8f948bd790cf9a95e4f37cc6e0951d
--- /dev/null
+++ b/tests/benchs/src/hxbenchmark/SuiteResult.hx
@@ -0,0 +1,6 @@
+package hxbenchmark;
+
+typedef SuiteResult = {
+	var name:String;
+	var cases:Array<CaseResult>;
+}
\ No newline at end of file
diff --git a/tests/display/.vscode/launch.json b/tests/display/.vscode/launch.json
new file mode 100644
index 0000000000000000000000000000000000000000..0b74adc396e778700b6d911e84d64f97a383b129
--- /dev/null
+++ b/tests/display/.vscode/launch.json
@@ -0,0 +1,11 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Interpreter",
+			"type": "haxe-eval",
+			"request": "launch",
+			"args": ["build.hxml", "-lib", "test-adapter"]
+		}
+	]
+}
\ No newline at end of file
diff --git a/tests/display/.vscode/settings.json b/tests/display/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..12639dbced5155481c27443b74ea7d75ea6045b0
--- /dev/null
+++ b/tests/display/.vscode/settings.json
@@ -0,0 +1,11 @@
+{
+	"editor.formatOnSave": true,
+	"haxe.enableCompilationServer": false,
+	"haxeTestExplorer.testCommand": [
+		"${haxe}",
+		"build.hxml",
+		"-lib",
+		"test-adapter"
+	],
+	"haxeTestExplorer.launchConfiguration": "Interpreter"
+}
\ No newline at end of file
diff --git a/tests/display/.vscode/tasks.json b/tests/display/.vscode/tasks.json
new file mode 100644
index 0000000000000000000000000000000000000000..23c0b2b7fd4aebd71dd1f51d11249b9aa1621ca8
--- /dev/null
+++ b/tests/display/.vscode/tasks.json
@@ -0,0 +1,13 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "haxe",
+			"args": "active configuration",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/tests/display/build.hxml b/tests/display/build.hxml
index 75e729791bdcd94697a165cde3aae0f281d2b070..c6541398651aca78e721d7ff23e26e547bc2a041 100644
--- a/tests/display/build.hxml
+++ b/tests/display/build.hxml
@@ -1,4 +1,7 @@
--cp src
--main Main
+-p src
+-p src-shared
+--main Main
+-lib utest
+-lib haxeserver
 --interp
 -D use-rtti-doc
\ No newline at end of file
diff --git a/tests/display/src-shared/Marker.hx b/tests/display/src-shared/Marker.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1abe2b1a21b31e8e47e1e5ea15f8ad681272effb
--- /dev/null
+++ b/tests/display/src-shared/Marker.hx
@@ -0,0 +1,21 @@
+class Marker {
+	static var markerRe = ~/{-(\d+)-}/g;
+
+	static public function extractMarkers(doc:String) {
+		var markers = #if macro [] #else new Map() #end;
+		var posAcc = 0;
+		var src = markerRe.map(doc, function(r) {
+			var p = r.matchedPos();
+			var name = r.matched(1);
+			var pos = p.pos - posAcc;
+			posAcc += p.len;
+			#if macro
+			markers.push(macro $v{Std.parseInt(name)} => $v{pos});
+			#else
+			markers.set(Std.parseInt(name), pos);
+			#end
+			return "";
+		});
+		return {source: src, markers: markers};
+	}
+}
diff --git a/tests/display/src/Diagnostic.hx b/tests/display/src/Diagnostic.hx
new file mode 100644
index 0000000000000000000000000000000000000000..aff232ead2211eaf5f3282972921d4bea19c1e60
--- /dev/null
+++ b/tests/display/src/Diagnostic.hx
@@ -0,0 +1,29 @@
+// from vshaxe
+import haxe.display.Position.Range;
+
+enum abstract UnresolvedIdentifierSuggestion(Int) {
+	var UISImport;
+	var UISTypo;
+}
+
+enum abstract DiagnosticKind<T>(Int) from Int to Int {
+	var DKUnusedImport:DiagnosticKind<Void>;
+	var DKUnresolvedIdentifier:DiagnosticKind<Array<{kind:UnresolvedIdentifierSuggestion, name:String}>>;
+	var DKCompilerError:DiagnosticKind<String>;
+	var DKRemovableCode:DiagnosticKind<{description:String, range:Range}>;
+	var DKParserError:DiagnosticKind<String>;
+}
+
+enum abstract DiagnosticSeverity(Int) {
+	var Error = 1;
+	var Warning;
+	var Information;
+	var Hint;
+}
+
+typedef Diagnostic<T> = {
+	var kind:DiagnosticKind<T>;
+	var range:Range;
+	var severity:DiagnosticSeverity;
+	var args:T;
+}
diff --git a/tests/display/src/DisplayTestCase.hx b/tests/display/src/DisplayTestCase.hx
index 1c1756e481f4293d164a7c0dfd60145bffaf625b..640488666063d349e280fde78923b940960d720c 100644
--- a/tests/display/src/DisplayTestCase.hx
+++ b/tests/display/src/DisplayTestCase.hx
@@ -1,97 +1,111 @@
+import haxe.display.Position.Range;
+import utest.Assert;
 import Types;
 
 using Lambda;
 
 @:autoBuild(Macro.buildTestCase())
-class DisplayTestCase {
+class DisplayTestCase implements utest.ITest {
 	var ctx:DisplayTestContext;
-	var methods:Array<Void->Void>;
-	var numTests:Int;
-	var numFailures:Int;
-	var testName:String;
+
+	public function new() {}
 
 	// api
-	inline function pos(name) return ctx.pos(name);
-	inline function fields(pos) return ctx.fields(pos);
-	inline function signatures(pos) return ctx.signatures(pos);
-	inline function toplevel(pos) return ctx.toplevel(pos);
-	inline function type(pos) return ctx.type(pos);
-	inline function position(pos) return ctx.position(pos);
-	inline function usage(pos) return ctx.usage(pos);
-	inline function range(pos1, pos2) return ctx.range(pos1, pos2);
-	inline function signature(pos1) return ctx.signature(pos1);
-	inline function metadataDoc(pos1) return ctx.metadataDoc(pos1);
-
-	function assert(v:Bool) if (!v) throw "assertion failed";
+	inline function pos(name)
+		return ctx.pos(name);
+
+	inline function fields(pos)
+		return ctx.fields(pos);
+
+	inline function toplevel(pos)
+		return ctx.toplevel(pos);
+
+	inline function type(pos)
+		return ctx.type(pos);
+
+	inline function position(pos)
+		return ctx.position(pos);
+
+	inline function usage(pos)
+		return ctx.usage(pos);
+
+	inline function range(pos1, pos2)
+		return ctx.range(pos1, pos2);
+
+	inline function signature(pos1)
+		return ctx.signature(pos1);
+
+	inline function metadataDoc(pos1)
+		return ctx.metadataDoc(pos1);
+
+	inline function diagnostics()
+		return ctx.diagnostics();
+
+	inline function noCompletionPoint(f)
+		return ctx.hasErrorMessage(f, "No completion point");
+
+	inline function typeNotFound(f, typeName)
+		return ctx.hasErrorMessage(f, "Type not found : " + typeName);
+
+	function assert(v:Bool)
+		Assert.isTrue(v);
 
 	function eq<T>(expected:T, actual:T, ?pos:haxe.PosInfos) {
-		numTests++;
-		if (expected != actual) {
-			numFailures++;
-			report("Assertion failed", pos);
-			report("Expected: " + expected, pos);
-			report("Actual:   " + actual, pos);
-		}
+		Assert.equals(expected, actual, pos);
 	}
 
-	function arrayEq(expected:Array<String>, actual:Array<String>, ?pos:haxe.PosInfos) {
-		numTests++;
-		var leftover = expected.copy();
-		for (actual in actual) {
-			if (!leftover.remove(actual)) {
-				numFailures++;
-				report("Result not part of expected Array:", pos);
-				report(actual, pos);
-			}
-		}
-		for (leftover in leftover) {
-			numFailures++;
-			report("Expected result was not part of actual Array:", pos);
-			report(leftover, pos);
-			return;
-		}
+	function arrayEq<T>(expected:Array<T>, actual:Array<T>, ?pos:haxe.PosInfos) {
+		Assert.same(expected, actual, pos);
 	}
 
-	function arrayCheck<T>(expected:Array<T>, actual:Array<T>, f : T -> String, ?pos:haxe.PosInfos) {
+	function arrayCheck<T>(expected:Array<T>, actual:Array<T>, f:T->String, ?pos:haxe.PosInfos) {
 		var expected = [for (expected in expected) f(expected) => expected];
 		for (actual in actual) {
 			var key = f(actual);
-			if (!expected.exists(key)) {
-				numFailures++;
-				report("Result not part of expected Array:", pos);
-				report(Std.string(actual), pos);
-			}
+			Assert.isTrue(expected.exists(key), "Result not part of expected Array: " + Std.string(actual), pos);
 			expected.remove(key);
 		}
 
 		for (expected in expected) {
-			numFailures++;
-			report("Expected result was not part of actual Array:", pos);
-			report(Std.string(expected), pos);
+			Assert.fail("Expected result was not part of actual Array: " + Std.string(expected), pos);
 			return;
 		}
 	}
 
-	function hasField(a:Array<FieldElement>, name:String, type:String):Bool {
-		return a.exists(function(t) return t.type == type && t.name == name);
+	function hasField(a:Array<FieldElement>, name:String, type:String, ?kind:String):Bool {
+		return a.exists(function(t) return t.type == type && t.name == name && (kind == null || t.kind == kind));
+	}
+
+	function hasToplevel(a:Array<ToplevelElement>, kind:String, name:String, ?type:String = null):Bool {
+		return a.exists(function(t) return t.kind == kind && t.name == name && (type == null || t.type == type));
 	}
 
 	function hasPath(a:Array<FieldElement>, name:String):Bool {
 		return a.exists(function(t) return t.name == name);
 	}
 
-	function report(message, pos:haxe.PosInfos) {
-		haxe.Log.trace(message, pos);
+	function diagnosticsRange(start:Position, end:Position):Range {
+		var range = ctx.source.findRange(start, end);
+		// this is probably correct...?
+		range.start.character--;
+		range.end.character--;
+		return range;
 	}
 
-	public function run() {
-		for (method in methods) {
-			method();
-		}
-		return {
-			testName: testName,
-			numTests: numTests,
-			numFailures: numFailures
+	function sigEq(arg:Int, params:Array<Array<String>>, sig:SignatureHelp, ?pos:haxe.PosInfos) {
+		eq(arg, sig.activeParameter, pos);
+		eq(params.length, sig.signatures.length, pos);
+		for (i in 0...params.length) {
+			var sigInf = sig.signatures[i];
+			var args = params[i];
+			eq(sigInf.parameters.length, args.length, pos);
+			for (i in 0...args.length) {
+				eq(sigInf.parameters[i].label, args[i], pos);
+			}
 		}
 	}
-}
\ No newline at end of file
+
+	function report(message, pos:haxe.PosInfos) {
+		Assert.fail(message, pos);
+	}
+}
diff --git a/tests/display/src/DisplayTestContext.hx b/tests/display/src/DisplayTestContext.hx
index 78da5007fda7be2cf971d44b6364cfdb551447d4..b63764176afb413163c3627630f9769c5e734202 100644
--- a/tests/display/src/DisplayTestContext.hx
+++ b/tests/display/src/DisplayTestContext.hx
@@ -1,8 +1,11 @@
+import haxe.io.Bytes;
+import haxe.io.BytesBuffer;
+
 using StringTools;
+
 import Types;
 
 class HaxeInvocationException {
-
 	public var message:String;
 	public var fieldName:String;
 	public var arguments:Array<String>;
@@ -14,14 +17,21 @@ class HaxeInvocationException {
 		this.arguments = arguments;
 		this.source = source;
 	}
+
+	public function toString() {
+		return 'HaxeInvocationException($message, $fieldName, $arguments, $source])';
+	}
 }
 
 class DisplayTestContext {
-	var source:File;
-	var markers:Map<Int,Int>;
+	static var haxeServer = haxeserver.HaxeServerSync.launch("haxe", []);
+
+	var markers:Map<Int, Int>;
 	var fieldName:String;
 
-	public function new(path:String, fieldName:String, source:String, markers:Map<Int,Int>) {
+	public final source:File;
+
+	public function new(path:String, fieldName:String, source:String, markers:Map<Int, Int>) {
 		this.fieldName = fieldName;
 		this.source = new File(path, source);
 		this.markers = markers;
@@ -29,12 +39,13 @@ class DisplayTestContext {
 
 	public function pos(id:Int):Position {
 		var r = markers[id];
-		if (r == null) throw "No such marker: " + id;
+		if (r == null)
+			throw "No such marker: " + id;
 		return new Position(r);
 	}
 
 	public function range(pos1:Int, pos2:Int) {
-		return normalizePath(source.formatPosition(pos(pos1), pos(pos2)));
+		return normalizePath(source.formatRange(pos(pos1), pos(pos2)));
 	}
 
 	public function fields(pos:Position):Array<FieldElement> {
@@ -77,27 +88,31 @@ class DisplayTestContext {
 		return extractMetadata(callHaxe('$pos@type'));
 	}
 
-	function callHaxe(displayPart:String):String {
-		var args = [
-			"-cp", "src",
-			"-D", "display-stdin",
-			"--display",
-			source.path + "@" + displayPart,
-		];
-		var stdin = source.content;
-		var proc = new sys.io.Process("haxe", args);
-		proc.stdin.writeString(stdin);
-		proc.stdin.close();
-		var stderr = proc.stderr.readAll();
-		var stdout = proc.stdout.readAll();
-		var exit = proc.exitCode();
-		proc.close();
-		var success = exit == 0;
-		var s = stderr.toString();
-		if (!success || s == "") {
-			throw new HaxeInvocationException(s, fieldName, args, stdin);
+	public function diagnostics():Array<Diagnostic<Dynamic>> {
+		var result = haxe.Json.parse(callHaxe('0@diagnostics'))[0];
+		return if (result == null) [] else result.diagnostics;
+	}
+
+	public function hasErrorMessage(f:Void->Void, message:String) {
+		return try {
+			f();
+			false;
+		} catch (exc:HaxeInvocationException) {
+			return exc.message.indexOf(message) != -1;
 		}
-		return s;
+	}
+
+	function callHaxe(displayPart:String) {
+		var args = ["--display", source.path + "@" + displayPart];
+		var result = runHaxe(args, source.content);
+		if (result.hasError || result.stderr == "") {
+			throw new HaxeInvocationException(result.stderr, fieldName, args, source.content);
+		}
+		return result.stderr;
+	}
+
+	static public function runHaxe(args:Array<String>, ?stdin:String) {
+		return haxeServer.rawRequest(args, stdin == null ? null : Bytes.ofString(stdin));
 	}
 
 	static function extractType(result:String) {
@@ -140,7 +155,7 @@ class DisplayTestContext {
 		}
 		var ret = [];
 		for (xml in xml.elementsNamed("i")) {
-			ret.push({kind: xml.get("k"), name: xml.firstChild().nodeValue});
+			ret.push({kind: xml.get("k"), type: xml.get("t"), name: xml.firstChild().nodeValue});
 		}
 		return ret;
 	}
@@ -153,7 +168,7 @@ class DisplayTestContext {
 		}
 		var ret = [];
 		for (xml in xml.elementsNamed("i")) {
-			ret.push({name: xml.get("n"), type: xml.firstElement().firstChild().nodeValue});
+			ret.push({name: xml.get("n"), type: xml.firstElement().firstChild().nodeValue, kind: xml.get("k")});
 		}
 		return ret;
 	}
diff --git a/tests/display/src/File.hx b/tests/display/src/File.hx
index 676284d0ea2a83a45fa8c48d2c5279017c605151..bc9a4bc5adc92d2e525c0ffee16cef9f579395f0 100644
--- a/tests/display/src/File.hx
+++ b/tests/display/src/File.hx
@@ -1,6 +1,9 @@
+import haxe.display.Position;
+
 class File {
-	public var content(default,null):String;
-	public var path(default,null):String;
+	public var content(default, null):String;
+	public var path(default, null):String;
+
 	var lines:Array<Int>;
 
 	public function new(path:String, content:String) {
@@ -14,8 +17,12 @@ class File {
 		// составляем массив позиций начала строк
 		var s = 0, p = 0;
 		while (p < content.length) {
-			inline function nextChar() return StringTools.fastCodeAt(content, p++);
-			inline function line() { lines.push(s); s = p; };
+			inline function nextChar()
+				return StringTools.fastCodeAt(content, p++);
+			inline function line() {
+				lines.push(s);
+				s = p;
+			};
 			switch (nextChar()) {
 				case "\n".code:
 					line();
@@ -26,37 +33,43 @@ class File {
 		}
 	}
 
-	function findLine(pos:Int):{line:Int, pos:Int} {
+	function findPosition(pos:Int):Position {
 		function loop(min, max) {
 			var mid = (min + max) >> 1;
 			var start = lines[mid];
-			return
-				if (mid == min)
-					{line: mid, pos: pos - start};
-				else if (start > pos)
-					loop(min, mid);
-				else
-					loop(mid, max);
+			return if (mid == min)
+				{line: mid, character: pos - start + 1};
+			else if (start > pos)
+				loop(min, mid);
+			else
+				loop(mid, max);
 		}
 		return loop(0, lines.length);
 	}
 
-	public function formatPosition(min:Int, max:Int):String {
-		var start = findLine(min);
-		var end = findLine(max);
-		var pos =
-			if (start.line == end.line) {
-				if (start.pos == end.pos)
-					'character ${start.pos}';
-				else
-					'characters ${start.pos}-${end.pos}';
-			} else {
-				'lines ${start.line + 1}-${end.line + 1}';
-			}
+	public function findRange(min:Int, max:Int):Range {
+		return {
+			start: findPosition(min),
+			end: findPosition(max)
+		}
+	}
+
+	public function formatRange(min:Int, max:Int):String {
+		var range = findRange(min, max);
+		var start = range.start;
+		var end = range.end;
+		var pos = if (start.line == end.line) {
+			if (start.character == end.character)
+				'character ${start.character}';
+			else
+				'characters ${start.character}-${end.character}';
+		} else {
+			'lines ${start.line + 1}-${end.line + 1}';
+		}
 		return '$path:${start.line + 1}: $pos';
 	}
 
 	public static inline function read(path:String) {
 		return new File(path, sys.io.File.getContent(path));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/Macro.hx b/tests/display/src/Macro.hx
index 4f543068a7e1102e2be056c2a8161a888d90fff0..6c0c75f0c35d0acefdbcb5098e50bba35095239c 100644
--- a/tests/display/src/Macro.hx
+++ b/tests/display/src/Macro.hx
@@ -1,17 +1,17 @@
 import haxe.macro.Context;
 import haxe.macro.Expr;
+import haxe.io.Path;
 
+using sys.FileSystem;
 using Lambda;
+using StringTools;
 
 class Macro {
+	#if macro
 	static function buildTestCase():Array<Field> {
 		var fields = Context.getBuildFields();
-		var markerRe = ~/{-(\d+)-}/g;
-		var testCases = [];
 		var c = Context.getLocalClass().get();
 		for (field in fields) {
-			var markers = [];
-			var posAcc = 0;
 			if (field.doc == null) {
 				continue;
 			}
@@ -21,43 +21,56 @@ class Macro {
 			} else {
 				doc += field.doc;
 			}
-			var src = markerRe.map(doc, function(r) {
-				var p = r.matchedPos();
-				var name = r.matched(1);
-				var pos = p.pos - posAcc;
-				posAcc += p.len;
-				markers.push(macro $v{Std.parseInt(name)} => $v{pos});
-				return "";
-			});
-			var markers = markers.length > 0 ? macro $a{markers} : macro new Map();
-			testCases.push(macro function() {
-				ctx = new DisplayTestContext($v{Context.getPosInfos(c.pos).file}, $v{field.name}, $v{src}, $markers);
-				$i{field.name}();
-			});
-		}
+			var transform = Marker.extractMarkers(doc);
+			var markers = transform.markers.length > 0 ? macro $a{transform.markers} : macro new Map();
+			var filename = Context.getPosInfos(c.pos).file;
+			for (meta in field.meta) {
+				if (meta.name == ":filename") {
+					switch (meta.params[0].expr) {
+						case EConst(CString(s)):
+							filename = Path.directory(filename) + "/" + s;
+						case _:
+							throw "String expected";
+					}
+				}
+			}
 
-		fields.push((macro class {
-			public function new() {
-				testName = $v{c.name};
-				numTests = 0;
-				numFailures = 0;
-				this.methods = $a{testCases};
+			switch (field.kind) {
+				case FFun(f) if (f.expr != null):
+					f.expr = macro @:pos(f.expr.pos) {
+						ctx = new DisplayTestContext($v{filename}, $v{field.name}, $v{transform.source}, $markers);
+						${f.expr}
+					};
+				case _:
 			}
-		}).fields[0]);
+		}
 
 		return fields;
 	}
+	#end
 
 	macro static public function getCases(pack:String) {
-		var path = Context.resolvePath(pack);
 		var cases = [];
-		for (file in sys.FileSystem.readDirectory(path)) {
-			var p = new haxe.io.Path(file);
-			if (p.ext == "hx") {
-				var tp = {pack: [pack], name: p.file};
-				cases.push(macro new $tp());
+		var singleCase = haxe.macro.Context.definedValue("test");
+		function loop(pack:Array<String>) {
+			var path = Context.resolvePath(Path.join(pack));
+			for (file in sys.FileSystem.readDirectory(path)) {
+				if (singleCase != null && !file.endsWith(singleCase + ".hx")) {
+					continue;
+				}
+				if (file.endsWith("import.hx")) {
+					continue;
+				}
+				var p = new haxe.io.Path(file);
+				if (p.ext == "hx") {
+					var tp = {pack: pack, name: p.file};
+					cases.push(macro new $tp());
+				} else if (Path.join([path, file]).isDirectory()) {
+					loop(pack.concat([file]));
+				}
 			}
 		}
+		loop(pack.split('.'));
 		return macro $a{cases};
 	}
 }
diff --git a/tests/display/src/Main.hx b/tests/display/src/Main.hx
index c7ae3453dbf42df85bcb38fefa8a76854f8d2c5c..bb16daa11d8506b6b8cadd7042a56a679e048a6b 100644
--- a/tests/display/src/Main.hx
+++ b/tests/display/src/Main.hx
@@ -1,24 +1,20 @@
+import utest.Runner;
+import utest.ui.Report;
+
 class Main {
 	static function main() {
-		var tests = Macro.getCases("cases");
-		var numTests = 0;
-		var numFailures = 0;
-		for (test in tests) {
-			try {
-				var result = test.run();
-				numTests += result.numTests;
-				numFailures += result.numFailures;
-			   Sys.println('${result.testName}: ${result.numTests} tests, ${result.numFailures} failures');
-			} catch(e:DisplayTestContext.HaxeInvocationException) {
-				Sys.println("Error:      " + e.message);
-				Sys.println("Field name: " + e.fieldName);
-				Sys.println("Arguments:  " + e.arguments.join(" "));
-				Sys.println("Source: " + e.source);
-				numTests++;
-				numFailures++;
-			}
+		var runner = new Runner();
+		for (c in Macro.getCases("cases")) {
+			runner.addCase(c);
 		}
-		Sys.println('Finished with $numTests tests, $numFailures failures');
-		Sys.exit(numFailures == 0 ? 0 : 1);
+		var report = Report.create(runner);
+		report.displayHeader = AlwaysShowHeader;
+		report.displaySuccessResults = NeverShowSuccessResults;
+
+		var haxeServer = @:privateAccess DisplayTestContext.haxeServer;
+		haxeServer.setDefaultRequestArguments(["-cp", "src", "-cp", "src-shared", "--no-output", "-lib", "utest"]);
+		DisplayTestContext.runHaxe([]);
+		runner.run();
+		haxeServer.close();
 	}
 }
diff --git a/tests/display/src/ModuleSymbolEntry.hx b/tests/display/src/ModuleSymbolEntry.hx
index 25af5dbb64a4fdd811d57b78666aa82585cf4c9b..79d7bb930ac248cf7c83882a6cfebc2e9f452846 100644
--- a/tests/display/src/ModuleSymbolEntry.hx
+++ b/tests/display/src/ModuleSymbolEntry.hx
@@ -1,22 +1,21 @@
 // Taken from vshaxe... not ideal to copy it here
 
-@:enum
-private abstract ModuleSymbolKind(Int) {
-    var MClass = 1;
-    var MInterface = 2;
-    var MEnum = 3;
-    var MTypedef = 4;
-    var MAbstract = 5;
-    var MField = 6;
-    var MProperty = 7;
-    var MMethod = 8;
-    var MConstructor = 9;
-    var MFunction = 10;
-    var MVariable = 11;
+private enum abstract ModuleSymbolKind(Int) {
+	var MClass = 1;
+	var MInterface = 2;
+	var MEnum = 3;
+	var MTypedef = 4;
+	var MAbstract = 5;
+	var MField = 6;
+	var MProperty = 7;
+	var MMethod = 8;
+	var MConstructor = 9;
+	var MFunction = 10;
+	var MVariable = 11;
 }
 
 typedef ModuleSymbolEntry = {
-    var name:String;
-    var kind:ModuleSymbolKind;
-    @:optional var containerName:String;
-}
\ No newline at end of file
+	var name:String;
+	var kind:ModuleSymbolKind;
+	var ?containerName:String;
+}
diff --git a/tests/display/src/SignatureHelp.hx b/tests/display/src/SignatureHelp.hx
index 184cdc608b59f0fda6a6c4bf07fc193fcb31bfa2..6363ab4650200342682b178e169604f46b059a20 100644
--- a/tests/display/src/SignatureHelp.hx
+++ b/tests/display/src/SignatureHelp.hx
@@ -1,18 +1,18 @@
 // from vshaxe
 
 typedef SignatureHelp = {
-    var signatures:Array<SignatureInformation>;
-    @:optional var activeSignature:Int;
-    @:optional var activeParameter:Int;
+	var signatures:Array<SignatureInformation>;
+	var ?activeSignature:Int;
+	var ?activeParameter:Int;
 }
 
 typedef SignatureInformation = {
-    var label:String;
-    @:optional var documentation:String;
-    @:optional var parameters:Array<ParameterInformation>;
+	var label:String;
+	var ?documentation:String;
+	var ?parameters:Array<ParameterInformation>;
 }
 
 typedef ParameterInformation = {
-    var label:String;
-    @:optional var documentation:String;
-}
\ No newline at end of file
+	var label:String;
+	var ?documentation:String;
+}
diff --git a/tests/display/src/Types.hx b/tests/display/src/Types.hx
index 81c65a819db36d5d9ff63410fde1f29a3bd6db69..c9ad47822081a3a49ac7a14cf5d926661bda2183 100644
--- a/tests/display/src/Types.hx
+++ b/tests/display/src/Types.hx
@@ -1,15 +1,17 @@
 typedef ToplevelElement = {
-	kind: String,
-	name: String
+	kind:String,
+	name:String,
+	type:String
 }
 
 typedef FieldElement = {
-	name: String,
-	type: String
+	name:String,
+	type:String,
+	kind:String,
 }
 
 abstract Position(Int) to Int {
 	public inline function new(i:Int) {
 		this = i;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Abstract.hx b/tests/display/src/cases/Abstract.hx
index 7c58ac0f46a5bbf89d8097fd8e9c1a45d3a77f05..16bded068fa115a43097d31ec31c89eeb70917bf 100644
--- a/tests/display/src/cases/Abstract.hx
+++ b/tests/display/src/cases/Abstract.hx
@@ -2,15 +2,46 @@ package cases;
 
 class Abstract extends DisplayTestCase {
 	/**
-	abstract A(Int) {
-		public function new({-3-}i{-4-}) {
-			this = i{-1-};
-			trace("f{-2-}oo");
+		abstract A(Int) {
+			public function new({-3-}i{-4-}) {
+				this = {-1-}i;
+				trace("f{-2-}oo");
+			}
 		}
-	}
 	**/
 	function test() {
 		eq(range(3, 4), position(pos(1)));
 		eq("String", type(pos(2)));
 	}
-}
\ No newline at end of file
+
+	/**
+		abstract MyAbstract(String) {
+			public function new() this = "foo";
+
+			public function instanceField():Void {
+				{-1-}
+			}
+			static public function staticField():Void {
+				{-2-}
+			}
+		}
+		class MyClass {
+			static function main() {
+				MyAbstract.{-3-}
+			}
+		}
+	**/
+	function test2() {
+		var top1 = toplevel(pos(1));
+		eq(true, hasToplevel(top1, "member", "instanceField", "Void -> Void"));
+		eq(true, hasToplevel(top1, "static", "staticField", "Void -> Void"));
+
+		var top2 = toplevel(pos(2));
+		eq(false, hasToplevel(top2, "member", "instanceField", "Void -> Void"));
+		eq(true, hasToplevel(top2, "static", "staticField", "Void -> Void"));
+
+		var fields = fields(pos(3));
+		eq(false, hasField(fields, "instanceField", "Void -> Void"));
+		eq(true, hasField(fields, "staticField", "Void -> Void"));
+	}
+}
diff --git a/tests/display/src/cases/ArrayAccessSignature.hx b/tests/display/src/cases/ArrayAccessSignature.hx
new file mode 100644
index 0000000000000000000000000000000000000000..23291b79cc59f04f2b46a0e765a8210b966d7467
--- /dev/null
+++ b/tests/display/src/cases/ArrayAccessSignature.hx
@@ -0,0 +1,117 @@
+package cases;
+
+import SignatureHelp;
+
+class ArrayAccessSignature extends DisplayTestCase {
+	/**
+		class Some {
+			function main() {
+				[][{-1-}
+			}
+		}
+	**/
+	function testArray1() {
+		sigEq(0, [["index:Int"]], signature(pos(1)));
+	}
+
+	/**
+		class Some {
+			function main() {
+				[][{-1-}]
+			}
+		}
+	**/
+	function testArray2() {
+		sigEq(0, [["index:Int"]], signature(pos(1)));
+	}
+
+	/**
+		class Some {
+			function main() {
+				[][1{-1-}
+			}
+		}
+	**/
+	function testArray3() {
+		sigEq(0, [["index:Int"]], signature(pos(1)));
+	}
+
+	/**
+		class Some {
+			function main() {
+				[][1{-1-}]
+			}
+		}
+	**/
+	function testArray4() {
+		sigEq(0, [["index:Int"]], signature(pos(1)));
+	}
+
+	/**
+		class Some {
+			function main() {
+				[][1{-1-}2
+			}
+		}
+	**/
+	function testArray5() {
+		sigEq(0, [["index:Int"]], signature(pos(1)));
+	}
+
+	/**
+		class Some {
+			function main() {
+				[][1{-1-}2]
+			}
+		}
+	**/
+	function testArray6() {
+		sigEq(0, [["index:Int"]], signature(pos(1)));
+	}
+
+	/**
+		class Some {
+			function main() {
+				[1 => 2][{-1-}
+			}
+		}
+	**/
+	function testMap1() {
+		// because screw consistency
+		sigEq(0, [["key:Int"], ["k:Int", "v:Int"]], signature(pos(1)));
+	}
+
+	/**
+		class Some {
+			function main() {
+				call([1 => 2][{-1-}
+			}
+
+			static function call(i1:Int, i2:Int) { }
+		}
+	**/
+	function testInCall1() {
+		sigEq(0, [["key:Int"], ["k:Int", "v:Int"]], signature(pos(1)));
+	}
+
+	/**
+		abstract MyArray<T>(Array<T>) {
+			public function new() this = [];
+
+			@:op([])
+			function arrayRead(k:Int):T return cast this[k];
+
+			@:op([])
+			function arrayReadWrite(k:Int, v:T) this[k] = v;
+		}
+		class Some {
+			function main() {
+				var m = new MyArray();
+				var k = m[{-1-}
+			}
+		}
+	**/
+	function testVoidReturn() {
+		sigEq(0, [["k:Int"]], signature(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/ArrowFunctions.hx b/tests/display/src/cases/ArrowFunctions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ba8bb718b57c838611b50869f014a9e7fc26a55b
--- /dev/null
+++ b/tests/display/src/cases/ArrowFunctions.hx
@@ -0,0 +1,43 @@
+package cases;
+
+class ArrowFunctions extends DisplayTestCase {
+	/**
+		var obj = { foo : 1 };
+		var f = () -> obj.{-1-}
+		var f = () -> {
+			[1].{-2-}
+		}
+	**/
+	@:funcCode function testBodyCompletion1() {
+		eq(true, hasField(fields(pos(1)), "foo", "Int"));
+		eq(true, hasField(fields(pos(2)), "copy", "Void -> Array<Int>"));
+	}
+
+	/**
+		enum E { EA; EB; EC; }
+		class SomeClass {
+			static function sf(){
+				(e:E) -> e.{-1-}
+			}
+		}
+	**/
+	function testBodyCompletion2() {
+		eq(true, hasField(fields(pos(1)), "getName", "Void -> String"));
+	}
+
+	/**
+		var arr = [1,2,3,4,5];
+		arr.map( {-1-}a -> a{-2-} + 1 )
+	**/
+	@:funcCode function testHover() {
+		eq("Int", type(pos(1)));
+		eq("Int", type(pos(2)));
+	}
+
+	/**
+		x -> { {-1-}
+	**/
+	@:funcCode function testTopLevel() {
+		eq(true, hasToplevel(toplevel(pos(1)), "local", "x"));
+	}
+}
diff --git a/tests/display/src/cases/Basic.hx b/tests/display/src/cases/Basic.hx
index e261c7a896904431e550131cf2a26c8c41071bc2..d16465766f3cbf123968345e6644ba922fb2d0a3 100644
--- a/tests/display/src/cases/Basic.hx
+++ b/tests/display/src/cases/Basic.hx
@@ -2,56 +2,72 @@ package cases;
 
 class Basic extends DisplayTestCase {
 	/**
-	class Some {
-		function main() {
-			var a = 5;
-			a{-1-}
+		class Some {
+			function main() {
+				var a = 5;
+				a{-1-}
+			}
 		}
-	}
 	**/
 	function testType1() {
 		eq("Int", type(pos(1)));
 	}
 
 	/**
-	class Some {
-		function main() {
-			var {-1-}variable{-2-} = 5;
-			variable{-3-};
+		class Some {
+			function main() {
+				var {-1-}variable{-2-} = 5;
+				{-3-}variabl{-4-}e{-5-};
+			}
 		}
-	}
 	**/
 	function testPosition1() {
 		eq(range(1, 2), position(pos(3)));
+		eq(range(1, 2), position(pos(4)));
+		eq(range(1, 2), position(pos(5)));
 	}
 
 	/**
-	class Some {
-		function main() {
-			var variable{-1-} = 5;
-			{-2-}variable{-3-};
+		class Some {
+			function main() {
+				var variabl{-1-}e = 5;
+				{-2-}variable{-3-};
+			}
 		}
-	}
 	**/
 	function testUsage1() {
 		eq(range(2, 3), usage(pos(1))[0]);
 	}
 
 	/**
-	class Some {
-		function main() {
-			var variable{-1-} = 5;
-			{-2-}variable{-3-};
-			{-4-}variable{-5-};
+		class Some {
+			function main() {
+				var variabl{-1-}e = 5;
+				{-2-}variable{-3-};
+				{-4-}variable{-5-};
+			}
 		}
-	}
 	**/
 	function testUsage2() {
 		arrayEq([range(2, 3), range(4, 5)], usage(pos(1)));
 	}
 
 	/**
-	function test(na{-1-}me:St{-2-}ring) { }
+		class Some {
+			function main() {
+				{-1-}te{-2-}st{-3-}();
+			}
+
+			static function te{-4-}st() { }
+		}
+	**/
+	function testUsage3() {
+		arrayEq([range(1, 3)], usage(pos(2)));
+		arrayEq([range(1, 3)], usage(pos(4)));
+	}
+
+	/**
+		function test(na{-1-}me:St{-2-}ring) { }
 	**/
 	@:funcCode function testLocalFunction() {
 		eq("String", type(pos(1)));
@@ -59,16 +75,16 @@ class Basic extends DisplayTestCase {
 	}
 
 	/**
-	class Some {
-		var x1 = "fo{-1-}";
-		static var x2 = "fo{-2-}";
-		static inline var x3 = "fo{-3-}";
+		class Some {
+			var x1 = "fo{-1-}";
+			static var x2 = "fo{-2-}";
+			static inline var x3 = "fo{-3-}";
 
-		var x4(default, null) = "fo{-4-}";
-		static var x5(default, null) = "fo{-5-}";
+			var x4(default, null) = "fo{-4-}";
+			static var x5(default, null) = "fo{-5-}";
 
-		static var x{-6-}6:String;
-	}
+			static var x{-6-}6:String;
+		}
 	**/
 	function testFieldDisplay() {
 		eq("String", type(pos(1)));
@@ -80,21 +96,21 @@ class Basic extends DisplayTestCase {
 	}
 
 	/**
-	var a:Ar{-1-}ray;
+		var a:Ar{-1-}ray;
 	**/
 	@:funcCode function testMissingParams() {
 		eq("Array<Array.T>", type(pos(1)));
 	}
 
 	/**
-	class Some {
-		function new(someName:Int) {}
-		function main() {
-			Some.new{-1-}
+		class Some {
+			function new(someName:Int) {}
+			function main() {
+				Some.new{-1-}
+			}
 		}
-	}
 	**/
 	function testCtorClosureType() {
-		eq("someName : Int -> cases.Some", type(pos(1)));
+		eq("(someName : Int) -> cases.Some", type(pos(1)));
 	}
 }
diff --git a/tests/display/src/cases/BuildMacro.hx b/tests/display/src/cases/BuildMacro.hx
index 93fca56223b9eb996621966f29a1e5ea9a34d195..189fa4f411a87f076110da8461de004d2037cd3c 100644
--- a/tests/display/src/cases/BuildMacro.hx
+++ b/tests/display/src/cases/BuildMacro.hx
@@ -2,25 +2,25 @@ package cases;
 
 class BuildMacro extends DisplayTestCase {
 	/**
-	class MyMacro {
-		macro static public function build():Array<haxe.macro.Expr.Field> {
-			var fields = haxe.macro.Context.getBuildFields();
-			return fields;
+		class MyMacro {
+			macro static public function build():Array<haxe.macro.Expr.Field> {
+				var fields = haxe.macro.Context.getBuildFields();
+				return fields;
+			}
 		}
-	}
 
-	{-7-}typedef MyString = String{-8-};
+		typedef {-7-}MyString{-8-} = String;
 
-	#if !macro
-	@:build(cases.BuildMacro.MyMacro.build())
-	#end
-	class Main {
-		function te{-1-}st({-5-}na{-2-}me{-6-}:MySt{-3-}ring):MyStr{-4-}ing {
-			return {-9-}name{-10-};
-		}
+		#if !macro
+		@:build(cases.BuildMacro.MyMacro.build())
+		#end
+		class Main {
+			function te{-1-}st({-5-}na{-2-}me{-6-}:MySt{-3-}ring):MyStr{-4-}ing {
+				return {-9-}nam{-10-}e{-11-};
+			}
 
-		static function main() { }
-	}
+			static function main() { }
+		}
 	**/
 	function test1() {
 		eq("cases.MyString", type(pos(2)));
@@ -29,6 +29,6 @@ class BuildMacro extends DisplayTestCase {
 		eq(range(7, 8), position(pos(3)));
 		eq(range(7, 8), position(pos(4)));
 		eq(range(5, 6), position(pos(2)));
-		arrayEq([range(9, 10)], usage(pos(10)));
+		arrayEq([range(9, 11)], usage(pos(10)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Completion.hx b/tests/display/src/cases/Completion.hx
index 04b5a2569a0c36be6b498544f621a1208f9c0ef6..d098925f7c68df84eeef6ed6922c6a99fd5ca5e2 100644
--- a/tests/display/src/cases/Completion.hx
+++ b/tests/display/src/cases/Completion.hx
@@ -2,47 +2,77 @@ package cases;
 
 class Completion extends DisplayTestCase {
 	/**
-	var s = { foo: 1 };
-	s.{-1-}
+		var s = { foo: 1 };
+		s.{-1-}
 	**/
 	@:funcCode function testHaxeUnitPort1() {
 		eq(true, hasField(fields(pos(1)), "foo", "Int"));
 	}
 
 	/**
-	var s = { foo: 1 };
-	for (k in [s].iterator()) {
-		k.{-1-}
-	}
+		var s = { foo: 1 };
+		for (k in [s].iterator()) {
+			k.{-1-}
+		}
 	**/
 	@:funcCode function testHaxeUnitPort2() {
 		eq(true, hasField(fields(pos(1)), "foo", "Int"));
 	}
 
 	/**
-	var f = function():Iterator<{foo:Int}> {
-		return [s].iterator();
-	};
-	var s = { foo: 1 };
-	for (k in f()) {
-		k.{-1-}
-	}
+		var f = function():Iterator<{foo:Int}> {
+			return [s].iterator();
+		};
+		var s = { foo: 1 };
+		for (k in f()) {
+			k.{-1-}
+		}
 	**/
 	@:funcCode function testHaxeUnitPort3() {
 		eq(true, hasField(fields(pos(1)), "foo", "Int"));
 	}
 
 	/**
-	var x:haxe.macro.{-1-}
+		var x:haxe.macro.{-1-}
 	**/
 	@:funcCode function testHaxeUnitPort4() {
 		eq(true, hasPath(fields(pos(1)), "Expr"));
 	}
 
 	/**
-	var x:haxe.macro.Expr.{-1-}
+		var x:haxe.macro.Expr.{-1-}
 	**/
 	@:funcCode function testHaxeUnitPort5() {
 		eq(true, hasPath(fields(pos(1)), "ExprDef"));
 	}
-}
\ No newline at end of file
+
+	/**
+		var s = { foo: 1 };
+		s.{-1-}f{-2-}o{-3-}o{-4-}
+	**/
+	@:funcCode function testNonDotCompletion1() {
+		eq(true, hasField(fields(pos(1)), "foo", "Int"));
+		eq(true, hasField(fields(pos(2)), "foo", "Int"));
+		eq(true, hasField(fields(pos(3)), "foo", "Int"));
+		eq(true, hasField(fields(pos(4)), "foo", "Int"));
+	}
+
+	/**
+		var s = { foo: 1 };
+		"foo".
+		wtf
+		var lol
+		miauga(
+		notArray[
+		[
+		(
+		{
+		{
+			obj:
+				obj
+					s.{-1-}
+	**/
+	@:funcCode function testDrunkAst1() {
+		eq(true, hasField(fields(pos(1)), "foo", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/DocumentSymbols.hx b/tests/display/src/cases/DocumentSymbols.hx
index e07aea64185d29c0d29feac86d794dcd955b3cf9..0ecb61786f27cde1ece0d6392919cc51811bb560 100644
--- a/tests/display/src/cases/DocumentSymbols.hx
+++ b/tests/display/src/cases/DocumentSymbols.hx
@@ -2,101 +2,101 @@ package cases;
 
 class DocumentSymbols extends DisplayTestCase {
 	/**
-	class Some {
-		function main() { }
-		static var x:String;
-		var y:Int;
-		var z(default, null):Bool;
-		function new() { }
-	}
+		class Some {
+			function main() { }
+			static var x:String;
+			var y:Int;
+			var z(default, null):Bool;
+			function new() { }
+		}
 	**/
 	function testClassFields() {
 		checkDocumentSymbols([
-			{ name: "Some", kind: MClass, containerName: null },
-			{ name: "main", kind: MMethod, containerName: "Some" },
-			{ name: "x", kind: MField, containerName: "Some" },
-			{ name: "y", kind: MField, containerName: "Some" },
-			{ name: "z", kind: MProperty, containerName: "Some" },
-			{ name: "new", kind: MConstructor, containerName: "Some" }
+			{name: "Some", kind: MClass, containerName: null},
+			{name: "main", kind: MMethod, containerName: "Some"},
+			{name: "x", kind: MField, containerName: "Some"},
+			{name: "y", kind: MField, containerName: "Some"},
+			{name: "z", kind: MProperty, containerName: "Some"},
+			{name: "new", kind: MConstructor, containerName: "Some"}
 		], ctx.documentSymbols());
 	}
 
 	/**
-	interface Some {
-		function test():Void;
-	}
+		interface Some {
+			function test():Void;
+		}
 	**/
 	function testInterface() {
 		checkDocumentSymbols([
-			{ name: "Some", kind: MInterface, containerName: null },
-			{ name: "test", kind: MMethod, containerName: "Some" }
+			{name: "Some", kind: MInterface, containerName: null},
+			{name: "test", kind: MMethod, containerName: "Some"}
 		], ctx.documentSymbols());
 	}
 
 	/**
-	enum E {
-		A;
-		B(s:String);
-	}
+		enum E {
+			A;
+			B(s:String);
+		}
 	**/
 	function testEnum() {
 		checkDocumentSymbols([
-			{ name: "E", kind: MEnum, containerName: null },
-			{ name: "A", kind: MMethod, containerName: "E" },
-			{ name: "B", kind: MMethod, containerName: "E" }
+			{name: "E", kind: MEnum, containerName: null},
+			{name: "A", kind: MMethod, containerName: "E"},
+			{name: "B", kind: MMethod, containerName: "E"}
 		], ctx.documentSymbols());
 	}
 
 	/**
-	typedef T = {
-		x:Int,
-	}
+		typedef T = {
+			x:Int,
+		}
 	**/
 	function testTypedef() {
 		checkDocumentSymbols([
-			{ name: "T", kind: MTypedef, containerName: null },
-			{ name: "x", kind: MField, containerName: "T" }
+			{name: "T", kind: MTypedef, containerName: null},
+			{name: "x", kind: MField, containerName: "T"}
 		], ctx.documentSymbols());
 	}
 
 	/**
-	abstract A(Int) {
-		public function new() { }
-		function f() { }
-	}
+		abstract A(Int) {
+			public function new() { }
+			function f() { }
+		}
 	**/
 	function testAbstract() {
 		checkDocumentSymbols([
-			{ name: "A", kind: MAbstract, containerName: null },
-			{ name: "new", kind: MConstructor, containerName: "A" },
-			{ name: "f", kind: MMethod, containerName: "A" }
+			{name: "A", kind: MAbstract, containerName: null},
+			{name: "new", kind: MConstructor, containerName: "A"},
+			{name: "f", kind: MMethod, containerName: "A"}
 		], ctx.documentSymbols());
 	}
 
 	/**
-	class Main {
-		static function main() {
-			var a = 12;
-			var b, c = 13;
-			var d = 1, e;
-			function f() { }
+		class Main {
+			static function main() {
+				var a = 12;
+				var b, c = 13;
+				var d = 1, e;
+				function f() { }
+			}
 		}
-	}
 	**/
 	function testExpression() {
 		checkDocumentSymbols([
-			{ name: "Main", kind: MClass, containerName: null },
-			{ name: "main", kind: MMethod, containerName: "Main" },
-			{ name: "a", kind: MVariable, containerName: "Main.main" },
-			{ name: "b", kind: MVariable, containerName: "Main.main" },
-			{ name: "c", kind: MVariable, containerName: "Main.main" },
-			{ name: "d", kind: MVariable, containerName: "Main.main" },
-			{ name: "e", kind: MVariable, containerName: "Main.main" },
-			{ name: "f", kind: MFunction, containerName: "Main.main" }
+			{name: "Main", kind: MClass, containerName: null},
+			{name: "main", kind: MMethod, containerName: "Main"},
+			{name: "a", kind: MVariable, containerName: "Main.main"},
+			{name: "b", kind: MVariable, containerName: "Main.main"},
+			{name: "c", kind: MVariable, containerName: "Main.main"},
+			{name: "d", kind: MVariable, containerName: "Main.main"},
+			{name: "e", kind: MVariable, containerName: "Main.main"},
+			{name: "f", kind: MFunction, containerName: "Main.main"}
 		], ctx.documentSymbols());
 	}
 
 	function checkDocumentSymbols(expected:Array<ModuleSymbolEntry>, actual:Array<ModuleSymbolEntry>, ?pos:haxe.PosInfos) {
 		arrayCheck(expected, actual, function(entry) return entry.kind + ":" + entry.name + ":" + entry.containerName, pos);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/IImport.hx b/tests/display/src/cases/IImport.hx
index fbdd29aee0cc9e83b149b4f7a2c364456bf45b41..48b76ce1cc0966205847349bd31a275ca463e6c7 100644
--- a/tests/display/src/cases/IImport.hx
+++ b/tests/display/src/cases/IImport.hx
@@ -1,30 +1,35 @@
 package cases;
 
 import Types;
+
 using Lambda;
 
 class IImport extends DisplayTestCase {
 	/**
-	import ha{-1-}xe.ma{-2-}cro.Exp{-3-}rTools.Expr{-4-}ArrayTools.it{-5-}er;
+		import ha{-1-}xe.{-6-}ma{-2-}cro.{-7-}Exp{-3-}rTools.{-8-}Expr{-4-}ArrayTools.{-9-}it{-5-}er;
 	**/
 	function testImport1() {
-		eq(true, hasPath(fields(pos(1)), "Serializer"));
-		eq(true, hasPath(fields(pos(2)), "ExprTools"));
-		eq(true, hasPath(fields(pos(3)), "ExprArrayTools"));
-		eq(true, hasField(fields(pos(4)), "iter", "el : Array<haxe.macro.Expr> -> f : (haxe.macro.Expr -> Void) -> Void"));
-		eq("el : Array<haxe.macro.Expr> -> f : (haxe.macro.Expr -> Void) -> Void", type(pos(5)));
+		eq(true, hasPath(fields(pos(2)), "Serializer"));
+		eq(true, hasPath(fields(pos(6)), "Serializer"));
+		eq(true, hasPath(fields(pos(3)), "ExprTools"));
+		eq(true, hasPath(fields(pos(7)), "ExprTools"));
+		eq(true, hasPath(fields(pos(4)), "ExprArrayTools"));
+		eq(true, hasPath(fields(pos(8)), "ExprArrayTools"));
+		eq(true, hasField(fields(pos(5)), "iter", "(el : Array<haxe.macro.Expr>, f : (haxe.macro.Expr -> Void)) -> Void"));
+		eq(true, hasField(fields(pos(9)), "iter", "(el : Array<haxe.macro.Expr>, f : (haxe.macro.Expr -> Void)) -> Void"));
+		eq("(el : Array<haxe.macro.Expr>, f : (haxe.macro.Expr -> Void)) -> Void", type(pos(5)));
 		// TODO: test @position display. A bit annoying because it actually ends up in other files and we can't use markers.
 	}
 
 	/**
-	import haxe.{-1-}
+		import haxe.{-1-}
 	**/
 	function testImport2() {
 		eq(true, hasPath(fields(pos(1)), "Serializer"));
 	}
 
 	/**
-	import haxe.Serializer.{-1-}
+		import haxe.Serializer.{-1-}
 	**/
 	function testImport3() {
 		eq(true, hasPath(fields(pos(1)), "run"));
@@ -32,28 +37,39 @@ class IImport extends DisplayTestCase {
 	}
 
 	/**
-	using ha{-1-}xe.ma{-2-}cro.Exp{-3-}rTools.Expr{-4-}ArrayTools;
+		using ha{-1-}xe.{-5-}ma{-2-}cro.{-6-}Exp{-3-}rTools.{-7-}Expr{-4-}ArrayTools;
 	**/
 	function testUsing1() {
-		eq(true, hasPath(fields(pos(1)), "Serializer"));
-		eq(true, hasPath(fields(pos(2)), "ExprTools"));
-		eq(true, hasPath(fields(pos(3)), "ExprArrayTools"));
-		eq(true, hasField(fields(pos(4)), "iter", "el : Array<haxe.macro.Expr> -> f : (haxe.macro.Expr -> Void) -> Void"));
+		eq(true, hasPath(fields(pos(2)), "Serializer"));
+		eq(true, hasPath(fields(pos(5)), "Serializer"));
+		eq(true, hasPath(fields(pos(3)), "ExprTools"));
+		eq(true, hasPath(fields(pos(6)), "ExprTools"));
+		eq(true, hasPath(fields(pos(4)), "ExprArrayTools"));
+		eq(true, hasPath(fields(pos(7)), "ExprArrayTools"));
+		// eq(true, hasField(fields(pos(8)), "iter", "el : Array<haxe.macro.Expr> -> f : (haxe.macro.Expr -> Void) -> Void"));
 		// TODO: test @position display. A bit annoying because it actually ends up in other files and we can't use markers.
 	}
 
 	/**
-	using haxe.{-1-}
+		using haxe.{-1-}
 	**/
 	function testUsing2() {
 		eq(true, hasPath(fields(pos(1)), "Serializer"));
 	}
 
 	/**
-	using haxe.Serializer.{-1-}
+		using haxe.Serializer.{-1-}
 	**/
 	function testUsing3() {
 		eq(false, hasPath(fields(pos(1)), "run"));
 		eq(true, hasPath(fields(pos(1)), "Serializer"));
 	}
-}
\ No newline at end of file
+
+	/**
+		import haxe.macro.{-1-}
+	**/
+	function testIssue6408() {
+		eq(true, hasPath(fields(pos(1)), "Context"));
+		eq(false, hasPath(fields(pos(1)), "Context.hl"));
+	}
+}
diff --git a/tests/display/src/cases/InMacro.hx b/tests/display/src/cases/InMacro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..85dbe0b1076022c5d3103d5cf8cda2cf51d38087
--- /dev/null
+++ b/tests/display/src/cases/InMacro.hx
@@ -0,0 +1,36 @@
+package cases;
+
+class InMacro extends DisplayTestCase {
+	/**
+
+		import haxe.macro.Context;
+
+		class Main {
+
+			#if macro
+
+			static function buildTypeDef( {-4-}t{-5-} : haxe.macro.Type ) : Expr {
+				Context.error("Unsupp{-1-}orted type "+Std.string({-2-}t{-3-}),Context.currentPos());
+				return null;
+			}
+
+			#else
+
+			static function buildTypeDef( {-14-}t{-15-} : haxe.macro.Type) : Expr {
+				trace("not{-11-} a macro" + {-12-}t{-13-});
+				return null;
+			}
+
+			#end
+		}
+	**/
+	function testMacro1() {
+		eq("String", type(pos(1)));
+		arrayEq([range(2, 3)], usage(pos(4)));
+		eq(range(4, 5), position(pos(2)));
+
+		eq("String", type(pos(11)));
+		arrayEq([range(12, 13)], usage(pos(14)));
+		eq(range(14, 15), position(pos(12)));
+	}
+}
diff --git a/tests/display/src/cases/Issue4155.hx b/tests/display/src/cases/Issue4155.hx
new file mode 100644
index 0000000000000000000000000000000000000000..88a95ce3ffe69fbb8f63927bf170ae8b0abdbf22
--- /dev/null
+++ b/tests/display/src/cases/Issue4155.hx
@@ -0,0 +1,33 @@
+package cases;
+
+class Issue4155 extends DisplayTestCase {
+	/**
+		class Main {
+			macro static function m(e) {
+				trace(haxe.macro.ExprTools.toString(e));
+				return switch (e) {
+					case macro (null:{
+						function dummy():Void {
+							$expr;
+						}
+					}):
+						expr;
+					case _: throw "invalid input";
+				}
+			}
+
+			@:debug.display
+			static function main() {
+				var v = m((null:{
+					function dummy():Void {
+						"foo".{-1-}
+					}
+				}));
+				trace(v);
+			}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "length", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue4345.hx b/tests/display/src/cases/Issue4345.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ee5671814307c63dc1731680e26914172233d08e
--- /dev/null
+++ b/tests/display/src/cases/Issue4345.hx
@@ -0,0 +1,35 @@
+package cases;
+
+class Issue4345 extends DisplayTestCase {
+	/**
+		typedef DTag = Tag<DTag>;  // kind of a defeat, but OK..
+		typedef Tag1 = { tag: TagE<Tag1>, name: String, count: Int }
+		typedef Tag2 = { tag: TagE<Tag2>, name: String, brand: String, liters: Float};
+
+		enum abstract TagE<T>(Int) {
+			var fruit:   TagE<Tag1> = 1;
+			var beverage:TagE<Tag2> = 2;
+		}
+
+		typedef Tag<T> = { tag:TagE<T> };
+
+		class Test {
+
+			static var data : Array<Dynamic> =
+			[
+				{ tag: fruit,    name: "Apple",  count: 5 },
+				{ tag: fruit,    name: "Orange", count: 3 },
+				{ tag: beverage, name: "Sprite", brand: "Coca-Cola", liters: 2.5 }
+			];
+
+			static function untag<T:Tag<T>>(t:T) switch t.tag {
+				case fruit:
+					t.{-1-}
+			}
+	**/
+	function test() {
+		var fields = fields(pos(1));
+		eq(true, hasField(fields, "name", "String"));
+		eq(true, hasField(fields, "count", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue5141.hx b/tests/display/src/cases/Issue5141.hx
index 6d943e72e0b0fe7c15e1fa303b40d8d106f9588c..1be23caabac7c686dfd43acff459354cfe15b99e 100644
--- a/tests/display/src/cases/Issue5141.hx
+++ b/tests/display/src/cases/Issue5141.hx
@@ -2,35 +2,35 @@ package cases;
 
 class Issue5141 extends DisplayTestCase {
 	/**
-	typedef MyHandler = Int->String->Void
+		typedef MyHandler = Int->String->Void
 
-	class Some {
-		function main() {
-			var a:MyHandler;
-			a{-1-};
-			a({-2-}
+		class Some {
+			function main() {
+				var a:MyHandler;
+				a{-1-};
+				a({-2-}
+			}
 		}
-	}
 	**/
 	function testTypedef() {
 		eq("cases.MyHandler", type(pos(1)));
-		arrayEq(["Int -> String -> Void"], signatures(pos(2)));
+		sigEq(0, [[":Int", ":String"]], signature(pos(2)));
 	}
 
 	/**
-	@:callable
-	abstract MyCallable(Int->String->Void) {}
+		@:callable
+		abstract MyCallable(Int->String->Void) {}
 
-	class Some {
-		function main() {
-			var a:MyCallable;
-			a{-1-};
-			a({-2-}
+		class Some {
+			function main() {
+				var a:MyCallable;
+				a{-1-};
+				a({-2-}
+			}
 		}
-	}
 	**/
 	function testAbstract() {
 		eq("cases.MyCallable", type(pos(1)));
-		arrayEq(["Int -> String -> Void"], signatures(pos(2)));
+		sigEq(0, [[":Int", ":String"]], signature(pos(2)));
 	}
 }
diff --git a/tests/display/src/cases/Issue5166.hx b/tests/display/src/cases/Issue5166.hx
index d09eef4c6b6484b7c6647799b78b2e625eece1c1..7ce1ef0023873ad6af92fc31968c59f278e2ee87 100644
--- a/tests/display/src/cases/Issue5166.hx
+++ b/tests/display/src/cases/Issue5166.hx
@@ -2,13 +2,13 @@ package cases;
 
 class Issue5166 extends DisplayTestCase {
 	/**
-		@:enum abstract E(Int) {
-			{-2-}var A{-1-} = 5;{-3-}
+		enum abstract E(Int) {
+			var {-2-}A{-1-} = 5;
 		}
 
 	**/
 	function test() {
-		eq("cases.E", type(pos(1)));
-		eq(range(2, 3), position(pos(1)));
+		eq("cases.E", type(pos(2)));
+		eq(range(2, 1), position(pos(2)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Issue5171.hx b/tests/display/src/cases/Issue5171.hx
index d3bede8feffcb150639d4e686d063bb6d3a09d60..e6669172cdd529b9046b2e71e71bcba1b090f3ae 100644
--- a/tests/display/src/cases/Issue5171.hx
+++ b/tests/display/src/cases/Issue5171.hx
@@ -2,13 +2,13 @@ package cases;
 
 class Issue5171 extends DisplayTestCase {
 	/**
-	{-2-}class Main {
-		static function main() {
-			Ma{-1-}in;
+		class {-2-}Main{-3-} {
+			static function main() {
+				Ma{-1-}in;
+			}
 		}
-	}{-3-}
 	**/
 	function test() {
 		eq(range(2, 3), position(pos(1)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Issue5172.hx b/tests/display/src/cases/Issue5172.hx
index b8e554d3fc47311d721c8b362ca1eaeacc62192f..5726407e6069e95af09fe823e510736e0ee53774 100644
--- a/tests/display/src/cases/Issue5172.hx
+++ b/tests/display/src/cases/Issue5172.hx
@@ -2,20 +2,18 @@ package cases;
 
 class Issue5172 extends DisplayTestCase {
 	/**
-	class Main {
-		static function main() {
-			for ({-3-}i{-1-} in 0...10) {
-				{-4-}i{-2-};
+		class Main {
+			static function main() {
+				for ({-3-}i{-1-} in 0...10) {
+					{-4-}i{-2-};
+				}
 			}
 		}
-	}
 	**/
 	function test() {
 		eq("Int", type(pos(1)));
 		eq("Int", type(pos(2)));
 		eq(range(3, 1), position(pos(1)));
-		eq(range(3, 1), position(pos(2)));
 		arrayEq([range(4, 2)], usage(pos(1)));
-		arrayEq([range(4, 2)], usage(pos(2)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Issue5173.hx b/tests/display/src/cases/Issue5173.hx
index f29f5d2f5b72fcb91c66d9598e89f142221423d9..e12be7c37ecd6c9c3ab1905d0966662f953694b2 100644
--- a/tests/display/src/cases/Issue5173.hx
+++ b/tests/display/src/cases/Issue5173.hx
@@ -2,14 +2,14 @@ package cases;
 
 class Issue5173 extends DisplayTestCase {
 	/**
-	class Main {
-		static function main() {
-			var map = new haxe.DynamicAccess();
-			for ({-3-}ke{-1-}y{-4-} in map.keys()) {
-				{-5-}ke{-2-}y{-6-};
+		class Main {
+			static function main() {
+				var map = new haxe.DynamicAccess();
+				for ({-3-}ke{-1-}y{-4-} in map.keys()) {
+					{-5-}ke{-2-}y{-6-};
+				}
 			}
 		}
-	}
 	**/
 	function test() {
 		eq("String", type(pos(1)));
@@ -19,4 +19,4 @@ class Issue5173 extends DisplayTestCase {
 		arrayEq([range(5, 6)], usage(pos(1)));
 		arrayEq([range(5, 6)], usage(pos(2)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Issue5306.hx b/tests/display/src/cases/Issue5306.hx
new file mode 100644
index 0000000000000000000000000000000000000000..69d1284986c8eb8ce73e8c24b93a8f2b402a953f
--- /dev/null
+++ b/tests/display/src/cases/Issue5306.hx
@@ -0,0 +1,38 @@
+package cases;
+
+class Issue5306 extends DisplayTestCase {
+	/**
+		{-1-}import {-3-}InvalidType{-4-};{-2-}
+
+		class Main {
+			static function main() {
+				var ib:Array<Int>;
+				ib[0] = 0; ib[1] = 1; ib[2]
+				{-5-}trace{-6-}("test");
+			}
+		}
+	**/
+	function test() {
+		var expected:Array<Diagnostic<Dynamic>> = [
+			{
+				kind: DKUnusedImport,
+				range: diagnosticsRange(pos(1), pos(2)),
+				severity: Warning,
+				args: []
+			},
+			{
+				kind: DKCompilerError,
+				range: diagnosticsRange(pos(3), pos(4)),
+				severity: Error,
+				args: "Type not found : InvalidType"
+			},
+			{
+				kind: DKParserError,
+				range: diagnosticsRange(pos(5), pos(6)),
+				severity: Error,
+				args: "Missing ;"
+			}
+		];
+		arrayEq(expected, diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue5649.hx b/tests/display/src/cases/Issue5649.hx
new file mode 100644
index 0000000000000000000000000000000000000000..34691ed3d1d8779c459bd31aff1aafa6f459c30a
--- /dev/null
+++ b/tests/display/src/cases/Issue5649.hx
@@ -0,0 +1,13 @@
+package cases;
+
+class Issue5649 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main():{-1-} {-2-} {}
+		}
+	**/
+	function test() {
+		var typesCompletion = toplevel(pos(1));
+		eq(true, hasToplevel(typesCompletion, "type", "Array"));
+	}
+}
diff --git a/tests/display/src/cases/Issue5684.hx b/tests/display/src/cases/Issue5684.hx
index 1d394cb4bcd49934f952a3b8a793f36092bec0a8..e88bcce42de76897289092a0631b50558198ffeb 100644
--- a/tests/display/src/cases/Issue5684.hx
+++ b/tests/display/src/cases/Issue5684.hx
@@ -2,14 +2,14 @@ package cases;
 
 class Issue5684 extends DisplayTestCase {
 	/**
-	abstract Test(String) {
-		public function hi(){
-			this.{-1-}
+		abstract Test(String) {
+			public function hi(){
+				this.{-1-}
+			}
 		}
-	}
 	**/
 	function testType1() {
 		// eq("Int", type(pos(1)));
 		eq(true, hasField(fields(pos(1)), "length", "Int"));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Issue5712.hx b/tests/display/src/cases/Issue5712.hx
index 104286bf05dfd9a6256856646fdeae2ae3f2346f..1bdf70ad59f8eb0ff272c269a9f9a02fd854ac02 100644
--- a/tests/display/src/cases/Issue5712.hx
+++ b/tests/display/src/cases/Issue5712.hx
@@ -2,15 +2,15 @@ package cases;
 
 class Issue5712 extends DisplayTestCase {
 	/**
-	typedef Struct = {
-		{-1-}field:Float{-2-}
-	}
-	class Main {
-		public static function main() {
-			var s:Struct = { fi{-3-}eld: 0 };
-			s.fi{-4-}eld;
+		typedef Struct = {
+			{-1-}field{-2-}:Float
+		}
+		class Main {
+			public static function main() {
+				var s:Struct = { fi{-3-}eld: 0 };
+				s.fi{-4-}eld;
+			}
 		}
-	}
 	**/
 	function testType1() {
 		eq(range(1, 2), position(pos(3)));
@@ -18,4 +18,4 @@ class Issue5712 extends DisplayTestCase {
 		eq("Float", type(pos(3))); // not sure about this one, maybe it should be Int...
 		eq("Float", type(pos(4)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Issue5729.hx b/tests/display/src/cases/Issue5729.hx
index 6ca5b5230af592f0507a57df8bd0bef561770544..16a4a82d3cf182e6620399c4ec29e99bb00c25f1 100644
--- a/tests/display/src/cases/Issue5729.hx
+++ b/tests/display/src/cases/Issue5729.hx
@@ -2,19 +2,19 @@ package cases;
 
 class Issue5729 extends DisplayTestCase {
 	/**
-	enum TestEnum {
-		Constructor(i:Int);
-	}
-	class Main {
-		public static function main() {
-			var c = Constructor(1);
-			switch (c) {
-				case Constructor(int{-1-}eger): trace("test");
+		enum TestEnum {
+			Constructor(i:Int);
+		}
+		class Main {
+			public static function main() {
+				var c = Constructor(1);
+				switch (c) {
+					case Constructor(int{-1-}eger): trace("test");
+				}
 			}
 		}
-	}
 	**/
 	function testType1() {
 		eq("Int", type(pos(1)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Issue5767.hx b/tests/display/src/cases/Issue5767.hx
new file mode 100644
index 0000000000000000000000000000000000000000..07f64978f13a3be3e00f6062e39652d41ea60a9b
--- /dev/null
+++ b/tests/display/src/cases/Issue5767.hx
@@ -0,0 +1,109 @@
+package cases;
+
+import SignatureHelp;
+
+class Issue5767 extends DisplayTestCase {
+	/**
+		class Main {
+			static function doStuff(options:{a:Float, b:String}) {}
+
+			static function main () {
+				doStuff({ a: 0.5, {-1-}
+			}
+		}
+	**/
+	function testGama11() {
+		eq(true, hasField(fields(pos(1)), "b", "String"));
+	}
+
+	/**
+		class Main {
+			static function doStuff(options:{a:Float, b:String}) {}
+
+			static function main () {
+				doStuff({ a: 0.5, {-1-}});
+			}
+		}
+	**/
+	function testGama11Intact() {
+		eq(true, hasField(fields(pos(1)), "b", "String"));
+	}
+
+	/**
+		typedef T = {
+			a:String,
+			b:Int,
+			c:Bool
+		}
+
+		class Main {
+			static function main() {
+				var c:T = {a:"foo", {-1-}
+			}
+		}
+	**/
+	function testOrder() {
+		var fields = fields(pos(1));
+		eq(true, hasField(fields, "b", "Int"));
+		eq(true, hasField(fields, "c", "Bool"));
+	}
+
+	/**
+		typedef T1 = {
+			a:String,
+			b:T2
+		}
+
+		typedef T2 = {
+			a:Bool,
+			b:Int
+		}
+
+		class Main {
+			static function main() {
+				var c:T1 = {a:"foo", b: {b:1, {-1-}
+			}
+		}
+	**/
+	function testNested() {
+		eq(true, hasField(fields(pos(1)), "a", "Bool"));
+	}
+
+	/**
+		typedef T1<T> = {
+			a:String,
+			b:T2<T>
+		}
+
+		typedef T2<T> = {
+			a:T,
+			b:Int
+		}
+
+		class Main {
+			static function main() {
+				var c:T1<Bool> = { b: { b:1, {-1-}
+			}
+		}
+	**/
+	function testFirstArg() {
+		eq(true, hasField(fields(pos(1)), "a", "Bool"));
+	}
+
+	/**
+		typedef T1<T> = {
+			a:String,
+			b:String,
+			c:String
+		}
+
+		class Main {
+			static function main() {
+				var c:T1 = { a: "foo",{-1-} b: "bar" };
+			}
+		}
+	**/
+	function testIntact() {
+		eq(true, hasField(fields(pos(1)), "c", "String"));
+	}
+}
diff --git a/tests/display/src/cases/Issue5775.hx b/tests/display/src/cases/Issue5775.hx
index fdd8389b699276632e1cca2c37369174cc3e6dd1..ca9dd428589a9261dbca680143dc98e78a141368 100644
--- a/tests/display/src/cases/Issue5775.hx
+++ b/tests/display/src/cases/Issue5775.hx
@@ -2,14 +2,14 @@ package cases;
 
 class Issue5775 extends DisplayTestCase {
 	/**
-	class Main {
-		static function main () {
-			var a = [];
-			trace('${a.{-1-}}');
+		class Main {
+			static function main () {
+				var a = [];
+				trace('${a.{-1-}}');
+			}
 		}
-	}
 	**/
 	function testType1() {
 		eq(true, hasField(fields(pos(1)), "length", "Int"));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Issue5796.hx b/tests/display/src/cases/Issue5796.hx
index b8b464aca67ef577dd64d0c0914db3331c51b9af..a4fe00ba4c88ae9a50ff6b42cda588e16e1317f3 100644
--- a/tests/display/src/cases/Issue5796.hx
+++ b/tests/display/src/cases/Issue5796.hx
@@ -2,16 +2,16 @@ package cases;
 
 class Issue5796 extends DisplayTestCase {
 	/**
-	class Main {
-		static function main() {}
-	}
+		class Main {
+			static function main() {}
+		}
 
-	typedef Test = {
-		@:gen{-1-}eric var f{-2-}oo:Int;
-	}
+		typedef Test = {
+			@:gen{-1-}eric var f{-2-}oo:Int;
+		}
 	**/
 	function test() {
-		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field", metadataDoc(pos(1)));
+		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field.", metadataDoc(pos(1)));
 		eq("Int", type(pos(2)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Issue5967.hx b/tests/display/src/cases/Issue5967.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6ecaaa79248dfe18ffcbc93623ab5cbd35f49d4f
--- /dev/null
+++ b/tests/display/src/cases/Issue5967.hx
@@ -0,0 +1,15 @@
+package cases;
+
+class Issue5967 extends DisplayTestCase {
+	/**
+		function call():Void { };
+		call({-1-}a{-2-},{-3-},{-4-} {-5-}
+	**/
+	@:funcCode function test1() {
+		sigEq(0, [[]], signature(pos(1)));
+		sigEq(0, [[]], signature(pos(2)));
+		sigEq(1, [[]], signature(pos(3)));
+		sigEq(2, [[]], signature(pos(4)));
+		sigEq(2, [[]], signature(pos(5)));
+	}
+}
diff --git a/tests/display/src/cases/Issue5988.hx b/tests/display/src/cases/Issue5988.hx
index cdb184fac7391bcbbfd0495d0b810811a8dc842c..111e75089701064effc0c59c85e8d0e040eed4f2 100644
--- a/tests/display/src/cases/Issue5988.hx
+++ b/tests/display/src/cases/Issue5988.hx
@@ -2,15 +2,15 @@ package cases;
 
 class Issue5988 extends DisplayTestCase {
 	/**
-	class Main {
-		static function f():Int;
+		class Main {
+			static function f():Int;
 
-		static function main() {
-			{-1-}
+			static function main() {
+				{-1-}
+			}
 		}
-	}
 	**/
 	function test() {
-		eq(true, Toplevel.hasToplevel(toplevel(pos(1)), "type", "Array"));
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "Array"));
 	}
 }
diff --git a/tests/display/src/cases/Issue5999.hx b/tests/display/src/cases/Issue5999.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b17d185ad4167b8ba208afb983666ead6d166224
--- /dev/null
+++ b/tests/display/src/cases/Issue5999.hx
@@ -0,0 +1,16 @@
+package cases;
+
+class Issue5999 extends DisplayTestCase {
+	/**
+		class Main {
+			static inline var {-1-}value{-2-} = 1;
+
+			static public function main() {
+				trace(val{-3-}ue);
+			}
+		}
+	**/
+	function test() {
+		eq(range(1, 2), position(pos(3)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6004.hx b/tests/display/src/cases/Issue6004.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3b8939604abd272ebb82b340de1b770c40df3d83
--- /dev/null
+++ b/tests/display/src/cases/Issue6004.hx
@@ -0,0 +1,16 @@
+package cases;
+
+class Issue6004 extends DisplayTestCase {
+	/**
+		class Main {
+			static function f(a:Int) return a;
+
+			static function main() {
+				f.{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "bind", "((?a : Int) -> Int) -> ((?a : Int) -> Int)", "method"));
+	}
+}
diff --git a/tests/display/src/cases/Issue6020.hx b/tests/display/src/cases/Issue6020.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e846cd770da609c7e0f02e811bf0b1ad30478a60
--- /dev/null
+++ b/tests/display/src/cases/Issue6020.hx
@@ -0,0 +1,27 @@
+package cases;
+
+class Issue6020 extends DisplayTestCase {
+	/**
+		class C {
+			function g(s) {
+				(s : String);
+				s.{-1-}
+			}
+		}
+	**/
+	function test1() {
+		eq(true, hasField(fields(pos(1)), "length", "Int"));
+	}
+
+	/**
+		class C {
+			function g(s) {
+				s = "foo";
+				s.{-1-}
+			}
+		}
+	**/
+	function test2() {
+		eq(true, hasField(fields(pos(1)), "length", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue6029.hx b/tests/display/src/cases/Issue6029.hx
index eb4f57567e9f502ff9e735a28bad0a575a75b4f3..9b718f0db514470cb2b9f58af772e689e85a5d88 100644
--- a/tests/display/src/cases/Issue6029.hx
+++ b/tests/display/src/cases/Issue6029.hx
@@ -6,8 +6,8 @@ class Issue6029 extends DisplayTestCase {
 		typedef B = {}
 
 		typedef C = {
-			>A{-1-},
-			>B{-2-},
+			>{-1-}A,
+			>{-2-}B,
 		}
 	**/
 	function test() {
diff --git a/tests/display/src/cases/Issue6068.hx b/tests/display/src/cases/Issue6068.hx
index 267e51fdcb3ef614c3a47b62171bfd9e27833da3..a5c330fbc7a64b876bc726067a21aae49aceeb34 100644
--- a/tests/display/src/cases/Issue6068.hx
+++ b/tests/display/src/cases/Issue6068.hx
@@ -2,14 +2,14 @@ package cases;
 
 class Issue6068 extends DisplayTestCase {
 	/**
-	class Main {
-		static function main() {
-			var a:{i:Int};
-			a({-1-});
+		class Main {
+			static function main() {
+				var a:{i:Int};
+				a({-1-});
 
-			Main({-2-});
+				Main({-2-});
+			}
 		}
-	}
 	**/
 	function test() {
 		check(function() signature(pos(1)));
@@ -17,13 +17,12 @@ class Issue6068 extends DisplayTestCase {
 	}
 
 	function check(fn) {
-		numTests++;
 		var result = try {
-				fn();
-				false;
-			} catch (e:DisplayTestContext.HaxeInvocationException) {
-				e.message.indexOf("Not a callable type") != -1;
-			}
+			fn();
+			false;
+		} catch (e:DisplayTestContext.HaxeInvocationException) {
+			e.message.indexOf("Not a callable type") != -1;
+		}
 		assert(result);
 	}
 }
diff --git a/tests/display/src/cases/Issue6227.hx b/tests/display/src/cases/Issue6227.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f9371a889de874469916733835aca8a4617528bf
--- /dev/null
+++ b/tests/display/src/cases/Issue6227.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue6227 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {
+			new Foo(4) {-1-}> new Foo(3);
+			}
+		}
+
+		abstract Foo({i:Int}) {
+			public function new(i) this = {i: i};
+			@:op(a > b) function f(other:Foo):String return "true";
+		}
+	**/
+	function test() {
+		eq("String", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6265.hx b/tests/display/src/cases/Issue6265.hx
new file mode 100644
index 0000000000000000000000000000000000000000..defb9821af3c37d05cb77f76602e5f0e7bf8fb06
--- /dev/null
+++ b/tests/display/src/cases/Issue6265.hx
@@ -0,0 +1,26 @@
+package cases;
+
+class Issue6265 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main(x:Int):Void {
+				{-1-}trac{-2-}e{-3-}({-4-}'{-5-}${-6-}{{-7-}mai{-8-}n{-9-}({-10-}1{-11-}){-12-}}{-13-}') // lol
+			}
+		}
+	**/
+	function test() {
+		eq("(value : Dynamic) -> Void", type(pos(1)));
+		eq("(value : Dynamic) -> Void", type(pos(2)));
+		eq("Void", type(pos(3)));
+		eq("String", type(pos(4)));
+		eq("String", type(pos(5)));
+		eq("String", type(pos(6)));
+		eq("(x : Int) -> Void", type(pos(7)));
+		eq("(x : Int) -> Void", type(pos(8)));
+		eq("Void", type(pos(9)));
+		eq("Int", type(pos(10)));
+		eq("Void", type(pos(11)));
+		eq("String", type(pos(12)));
+		eq("String", type(pos(13)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6275.hx b/tests/display/src/cases/Issue6275.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7ef397ab7e462478cd7e3527ab1dad860377a6b4
--- /dev/null
+++ b/tests/display/src/cases/Issue6275.hx
@@ -0,0 +1,20 @@
+package cases;
+
+class Issue6275 extends DisplayTestCase {
+	/**
+		import haxe.ds.Option;
+
+		class Main {
+			static function main() {
+				{-1-}n{-2-}ew Main("foo"){-3-};
+			}
+
+			function {-4-}new{-5-}(s:String) {}
+		}
+	**/
+	function test() {
+		eq("(s : String) -> cases.Main", type(pos(2)));
+		eq(range(4, 5), position(pos(1)));
+		eq(range(1, 3), usage(pos(2))[0]);
+	}
+}
diff --git a/tests/display/src/cases/Issue6381.hx b/tests/display/src/cases/Issue6381.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c75c67a79640606e203f7f8761898d8fcb726f80
--- /dev/null
+++ b/tests/display/src/cases/Issue6381.hx
@@ -0,0 +1,22 @@
+package cases;
+
+class Issue6381 extends DisplayTestCase {
+	/**
+		import haxe.ds.Option;
+
+		class Main {
+			public static function main() {
+				switch (Some(Some("foo"))) {
+					case Some({-1-}in{-2-}ner{-3-} = Some(_)):
+						{-4-}inner{-5-};
+					case _:
+				}
+			}
+		}
+	**/
+	function test() {
+		eq("haxe.ds.Option<String>", type(pos(2)));
+		eq(range(1, 3), position(pos(2)));
+		eq(range(4, 5), usage(pos(2))[0]);
+	}
+}
diff --git a/tests/display/src/cases/Issue6396.hx b/tests/display/src/cases/Issue6396.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2c9cf941adeec681ce1d633616c0ea502d63f57d
--- /dev/null
+++ b/tests/display/src/cases/Issue6396.hx
@@ -0,0 +1,20 @@
+package cases;
+
+class Issue6396 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {}
+
+			macro function foo() {
+				var {-1-}name{-2-} = "name";
+				return macro {
+					$na{-3-}me;
+				}
+			}
+		}
+	**/
+	function test() {
+		eq(range(1, 2), position(pos(3)));
+		eq("String", type(pos(3)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6399.hx b/tests/display/src/cases/Issue6399.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a1652b5d88967601f3a411ac421543d8c8c59050
--- /dev/null
+++ b/tests/display/src/cases/Issue6399.hx
@@ -0,0 +1,29 @@
+package cases;
+
+class Issue6399 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {}
+
+			macro function foo({-1-}name{-2-}:String, {-3-}struct{-4-}:Expr, {-5-}defaults{-6-}:Expr) {
+				return macro {
+					if ($str{-7-}uct.$n{-8-}ame == null) $str{-9-}uct.$n{-10-}ame = $defa{-11-}ults.$n{-12-}ame;
+				}
+			}
+		}
+	**/
+	function test() {
+		for (i in [8, 10, 12]) {
+			eq(range(1, 2), position(pos(i)));
+			eq("String", type(pos(i)));
+		}
+
+		for (i in [7, 9]) {
+			eq(range(3, 4), position(pos(i)));
+			eq("Dynamic", type(pos(i)));
+		}
+
+		eq(range(5, 6), position(pos(11)));
+		eq("Dynamic", type(pos(11)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6405.hx b/tests/display/src/cases/Issue6405.hx
new file mode 100644
index 0000000000000000000000000000000000000000..af76177c32d4468e41e81b085ea363b90dd3ff05
--- /dev/null
+++ b/tests/display/src/cases/Issue6405.hx
@@ -0,0 +1,27 @@
+package cases;
+
+class Issue6405 extends DisplayTestCase {
+	/**
+		import haxe.macro.Expr;
+		import haxe.macro.Context;
+		using haxe.macro.ExprTools;
+
+		class Macros {
+
+			public static macro function makeTypeDef( {-2-}e{-3-} : Expr ) {
+				var t = Context.getType({-1-}e{-5-}.{-4-}toString());
+				return macro {};
+			}
+
+		}
+	**/
+	function test() {
+		eq(range(2, 3), position(pos(1)));
+		var usage = usage(pos(2));
+		arrayEq([range(1, 5)], usage);
+		eq("haxe.macro.Expr", type(pos(1)));
+		var fields = fields(pos(4));
+		eq(true, hasField(fields, "expr", "haxe.macro.ExprDef"));
+		eq(true, hasField(fields, "toString", "Void -> String"));
+	}
+}
diff --git a/tests/display/src/cases/Issue6416.hx b/tests/display/src/cases/Issue6416.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7c5d97b7e71d78345ef91e88bcc23ddc4e765b09
--- /dev/null
+++ b/tests/display/src/cases/Issue6416.hx
@@ -0,0 +1,21 @@
+package cases;
+
+class Issue6416 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {}
+
+			macro function foo(e:haxe.macro.Expr) {
+				switch (e) {
+					case macro $i{{-1-}f{-2-}oo{-3-}}:
+						f{-4-}oo;
+				}
+			}
+		}
+	**/
+	function test() {
+		eq(range(1, 3), position(pos(2)));
+		eq(range(1, 3), position(pos(4)));
+		eq("String", type(pos(2)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6417.hx b/tests/display/src/cases/Issue6417.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e14cd21b8d8b0668ec584f8ea496179a4446357c
--- /dev/null
+++ b/tests/display/src/cases/Issue6417.hx
@@ -0,0 +1,17 @@
+package cases;
+
+class Issue6417 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {}
+
+			macro function foo({-1-}body{-2-}:Expr) {
+				macro function() $bo{-3-}dy;
+			}
+		}
+	**/
+	function test() {
+		eq(range(1, 2), position(pos(3)));
+		eq("Dynamic", type(pos(3)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6421.hx b/tests/display/src/cases/Issue6421.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2dcbdd89e0aa61c1d5c85a29ee0e055be5f6f5ab
--- /dev/null
+++ b/tests/display/src/cases/Issue6421.hx
@@ -0,0 +1,21 @@
+package cases;
+
+class Issue6421 extends DisplayTestCase {
+	/**
+		using cases.Issue6421.Abstract;
+
+		abstract Abstract(Int) {
+			public function new(i) this = i;
+			public function foo():Void { }
+		}
+
+		class Main {
+			static function main() {
+				0.{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(false, hasField(fields(pos(1)), "foo", "Void -> Void"));
+	}
+}
diff --git a/tests/display/src/cases/Issue6422.hx b/tests/display/src/cases/Issue6422.hx
new file mode 100644
index 0000000000000000000000000000000000000000..23aa3bd0ecb36b8838bc5af68b750d3a6d8fe399
--- /dev/null
+++ b/tests/display/src/cases/Issue6422.hx
@@ -0,0 +1,18 @@
+package cases;
+
+class Issue6422 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				pro{-1-}perty;
+			}
+
+			static var {-2-}property{-3-}(get, set):Int;
+			static function get_property() return 0;
+			static function set_property(i) return 0;
+		}
+	**/
+	function test() {
+		eq(range(2, 3), position(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6423.hx b/tests/display/src/cases/Issue6423.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0b468f6878e6bec1e91a712471c04989cf06176b
--- /dev/null
+++ b/tests/display/src/cases/Issue6423.hx
@@ -0,0 +1,20 @@
+package cases;
+
+class Issue6423 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {}
+
+			macro function foo(expr:haxe.macro.Expr, field:String) {
+				switch (expr) {
+					case macro $expr.{-1-}$fie{-2-}ld{-3-}:
+						expr;
+				}
+			}
+		}
+	**/
+	function test() {
+		eq(range(1, 3), position(pos(2)));
+		eq("String", type(pos(2)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6434.hx b/tests/display/src/cases/Issue6434.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8d712ad93e8b770a77a2a3d29284ccb74c7819be
--- /dev/null
+++ b/tests/display/src/cases/Issue6434.hx
@@ -0,0 +1,20 @@
+package cases;
+
+class Issue6434 extends DisplayTestCase {
+	/**
+		import misc.ModuleWithPrivateType;
+
+		class Main {
+			static function main() {
+				{-1-}
+			}
+		}
+	**/
+	function test() {
+		var toplevel = toplevel(pos(1));
+		eq(true, hasToplevel(toplevel, "type", "PublicClass"));
+		// This doesn't really test what I want to test, but I don't know how
+		// to test what I want to test...
+		eq(false, hasToplevel(toplevel, "type", "PrivateClass"));
+	}
+}
diff --git a/tests/display/src/cases/Issue6442.hx b/tests/display/src/cases/Issue6442.hx
new file mode 100644
index 0000000000000000000000000000000000000000..796e6d851186e63d9d1176f26a948d6021a08c91
--- /dev/null
+++ b/tests/display/src/cases/Issue6442.hx
@@ -0,0 +1,13 @@
+package cases;
+
+class Issue6442 extends DisplayTestCase {
+	/**
+		extern class Foo {
+			function {-1-}b{-2-}ar{-3-}():Void;
+		}
+	**/
+	function test() {
+		eq(range(1, 3), position(pos(2)));
+		eq("Void -> Void", type(pos(2)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6740.hx b/tests/display/src/cases/Issue6740.hx
new file mode 100644
index 0000000000000000000000000000000000000000..44340e5b5b99633d9b42bfc82016b5b2551f753e
--- /dev/null
+++ b/tests/display/src/cases/Issue6740.hx
@@ -0,0 +1,26 @@
+package cases;
+
+class Issue6740 extends DisplayTestCase {
+	/**
+		class A {
+			function new(v:Array<String>) {
+			}
+		}
+
+		class Main extends A {
+
+			function new(v) {
+				super(v);
+				v.{-1-}
+			}
+
+			static function main() {
+				new Main();
+			}
+
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "concat", "(a : Array<String>) -> Array<String>"));
+	}
+}
diff --git a/tests/display/src/cases/Issue6756.hx b/tests/display/src/cases/Issue6756.hx
new file mode 100644
index 0000000000000000000000000000000000000000..267cf02e2bf1ee1d5bbfd22a040b3876cad8aab0
--- /dev/null
+++ b/tests/display/src/cases/Issue6756.hx
@@ -0,0 +1,12 @@
+package cases;
+
+class Issue6756 extends DisplayTestCase {
+	/**
+		abstract Result(String) {
+			function f{-1-}oo() {}
+		}
+	**/
+	function test() {
+		eq("Void -> Void", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6779.hx b/tests/display/src/cases/Issue6779.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6092aaec390b27afe45ca018a2d615ec5d735e6c
--- /dev/null
+++ b/tests/display/src/cases/Issue6779.hx
@@ -0,0 +1,18 @@
+package cases;
+
+class Issue6779 extends DisplayTestCase {
+	/**
+		class Some {
+			static function f():Void {}
+		}
+
+		class Main {
+			static function main() {
+				@:privateAccess Some.{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "f", "Void -> Void", "method"));
+	}
+}
diff --git a/tests/display/src/cases/Issue6923.hx b/tests/display/src/cases/Issue6923.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0e3b26e6f3310a3b18bf1cbc19ecf71550d97173
--- /dev/null
+++ b/tests/display/src/cases/Issue6923.hx
@@ -0,0 +1,34 @@
+package cases;
+
+class Issue6923 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				trace({-1-}"test{-2-}".{-3-}lengt{-4-}h{-5-});
+			}
+		}
+	**/
+	function test() {
+		eq("String", type(pos(1)));
+		eq("String", type(pos(2)));
+		eq("Int", type(pos(3)));
+		eq("Int", type(pos(4)));
+		eq("Void", type(pos(5)));
+	}
+
+	/**
+		class Main {
+			static function main() {
+				var a = 1;
+				{-1-}a{-2-}+{-3-}0{-4-}.{-5-}1;
+			}
+		}
+	**/
+	function test2() {
+		eq("Int", type(pos(1)));
+		eq("Float", type(pos(2)));
+		eq("Float", type(pos(3)));
+		eq("Float", type(pos(4)));
+		eq("Float", type(pos(5)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6943.hx b/tests/display/src/cases/Issue6943.hx
new file mode 100644
index 0000000000000000000000000000000000000000..79b49164f3eb64d927949bc9896cbff667edef24
--- /dev/null
+++ b/tests/display/src/cases/Issue6943.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class Issue6943 extends DisplayTestCase {
+	/**
+		class Main {
+		public static function main() {}
+
+		function foo(?{-1-}te{-2-}st{-3-}:Int) {}
+		}
+	**/
+	function test() {
+		eq(range(1, 3), position(pos(2)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6951.hx b/tests/display/src/cases/Issue6951.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a36bca62d32eadbe4c07675896e6d599fd2af475
--- /dev/null
+++ b/tests/display/src/cases/Issue6951.hx
@@ -0,0 +1,21 @@
+package cases;
+
+class Issue6951 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {
+				new Test<"{-1-}">().foo();
+			}
+		}
+
+		@:generic class Test<@:const T> {
+			public function new() {}
+			public function foo() {
+				trace(T);
+			}
+		}
+	**/
+	function test() {
+		eq("String", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue6997.hx b/tests/display/src/cases/Issue6997.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3decc369ab88344c6089aad7c54338b3b0ac94a5
--- /dev/null
+++ b/tests/display/src/cases/Issue6997.hx
@@ -0,0 +1,17 @@
+package cases;
+
+class Issue6997 extends DisplayTestCase {
+	/**
+		"".lastIndexOf.bind({-1-}
+	**/
+	@:funcCode function test1() {
+		sigEq(0, [["str:String", "?startIndex:Null<Int>"]], signature(pos(1)));
+	}
+
+	/**
+		"".lastIndexOf.bind("foo", {-1-}
+	**/
+	@:funcCode function test2() {
+		sigEq(1, [["str:String", "?startIndex:Null<Int>"]], signature(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7020.hx b/tests/display/src/cases/Issue7020.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4a5b7db3bb22c781b730c35ecf61d7a01ad4d99a
--- /dev/null
+++ b/tests/display/src/cases/Issue7020.hx
@@ -0,0 +1,18 @@
+package cases;
+
+class Issue7020 extends DisplayTestCase {
+	/**
+		import String as {-2-}ExprAc{-4-}cess{-3-};
+
+		class Main {
+			public static function main() {
+				var access:ExprA{-1-}ccess;
+			}
+		}
+	**/
+	function test() {
+		eq(range(2, 3), position(pos(1)));
+		eq(range(2, 3), position(pos(4)));
+		eq("_String.ExprAccess", type(pos(4)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7022.hx b/tests/display/src/cases/Issue7022.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cbce9729d0e5e0d4921edd24fb4b352c421db0fc
--- /dev/null
+++ b/tests/display/src/cases/Issue7022.hx
@@ -0,0 +1,16 @@
+package cases;
+
+class Issue7022 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {}
+
+			public function ne{-1-}w() {
+				new Main();
+			}
+		}
+	**/
+	function test() {
+		eq("Void -> cases.Main", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7023.hx b/tests/display/src/cases/Issue7023.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b164b5d8ebedbd34042e2b59799bd075cdd79510
--- /dev/null
+++ b/tests/display/src/cases/Issue7023.hx
@@ -0,0 +1,16 @@
+package cases;
+
+class Issue7023 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {
+				inl{-1-}ine funct{-2-}ion fo{-3-}o() return "foo";
+			}
+		}
+	**/
+	function test() {
+		// eq("Void -> String", type(pos(1)));
+		eq("Void -> String", type(pos(2)));
+		eq("Void -> String", type(pos(3)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7027.hx b/tests/display/src/cases/Issue7027.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b1e509dc22289f3c889d707d55e9903902490b3a
--- /dev/null
+++ b/tests/display/src/cases/Issue7027.hx
@@ -0,0 +1,11 @@
+package cases;
+
+class Issue7027 extends DisplayTestCase {
+	/**
+		import haxe.macro.Expr.ExprDef.{-1-}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "EBreak", "haxe.macro.ExprDef"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7029.hx b/tests/display/src/cases/Issue7029.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bd9958188d895d53b2bb6dee4f05f2cda6d1a9cc
--- /dev/null
+++ b/tests/display/src/cases/Issue7029.hx
@@ -0,0 +1,133 @@
+package cases;
+
+class Issue7029 extends DisplayTestCase {
+	/**
+		class C implements {-1-}
+
+		interface IFoo { }
+	**/
+	function test1() {
+		var typesCompletion = toplevel(pos(1));
+		eq(true, hasToplevel(typesCompletion, "type", "IFoo"));
+		eq(false, hasToplevel(typesCompletion, "type", "C"));
+	}
+
+	/**
+		class C1 extends {-1-}
+
+		class C2 { }
+		interface IFoo { }
+	**/
+	function test2() {
+		var typesCompletion = toplevel(pos(1));
+		eq(true, hasToplevel(typesCompletion, "type", "C2"));
+		eq(false, hasToplevel(typesCompletion, "type", "IFoo"));
+		eq(false, hasToplevel(typesCompletion, "type", "C1"));
+	}
+
+	/**
+		class C { }
+		interface IFoo { }
+		interface IFoo2 extends {-1-} { }
+	**/
+	function test3() {
+		var typesCompletion = toplevel(pos(1));
+		eq(true, hasToplevel(typesCompletion, "type", "IFoo"));
+		eq(false, hasToplevel(typesCompletion, "type", "C"));
+		eq(false, hasToplevel(typesCompletion, "type", "IFoo2"));
+	}
+
+	/**
+		typedef T1 = { };
+		class C1 { }
+
+		typedef T2 = {
+			> {-1-}
+		}
+	**/
+	function test4() {
+		var typesCompletion = toplevel(pos(1));
+		eq(true, hasToplevel(typesCompletion, "type", "T1"));
+		eq(false, hasToplevel(typesCompletion, "type", "C1"));
+	}
+
+	/**
+		typedef T1 = { };
+		class C1 { }
+
+		typedef T2 = {
+			> T{-1-}
+		}
+	**/
+	function test5() {
+		var typesCompletion = toplevel(pos(1));
+		eq(true, hasToplevel(typesCompletion, "type", "T1"));
+		eq(false, hasToplevel(typesCompletion, "type", "C1"));
+	}
+
+	/**
+		typedef T1 = { };
+		typedef T2 = { };
+		class C1 { }
+
+		typedef T3 = {
+			> T1,
+			> {-1-}
+		}
+	**/
+	function test6() {
+		var typesCompletion = toplevel(pos(1));
+		eq(true, hasToplevel(typesCompletion, "type", "T2"));
+		eq(false, hasToplevel(typesCompletion, "type", "C1"));
+	}
+
+	/**
+		interface I1 {}
+		typedef T1 = {};
+		enum E1 {}
+		class C1 {
+			public function new() { }
+		}
+
+		class C2 {
+			static function main() {
+				new{-1-}   {-2-}
+			}
+
+			public function new() { }
+		}
+	**/
+	function test7() {
+		// var typesCompletion = toplevel(pos(1));
+		// eq(true, hasToplevel(typesCompletion, "type", "C1"));
+		// eq(true, hasToplevel(typesCompletion, "type", "C2"));
+		// eq(false, hasToplevel(typesCompletion, "type", "I1"));
+		// eq(false, hasToplevel(typesCompletion, "type", "T1"));
+		// eq(false, hasToplevel(typesCompletion, "type", "E1"));
+
+		var typesCompletion = toplevel(pos(2));
+		eq(true, hasToplevel(typesCompletion, "type", "C1"));
+		eq(true, hasToplevel(typesCompletion, "type", "C2"));
+		eq(false, hasToplevel(typesCompletion, "type", "I1"));
+		eq(false, hasToplevel(typesCompletion, "type", "T1"));
+		eq(false, hasToplevel(typesCompletion, "type", "E1"));
+	}
+
+	/**
+		final class C1 { }
+		class C2 extends {-1-} { }
+	**/
+	function test8() {
+		var typesCompletion = toplevel(pos(1));
+		eq(false, hasToplevel(typesCompletion, "type", "C1"));
+	}
+
+	/**
+		final class C1 { }
+		@:hack class C2 extends {-1-} { }
+	**/
+	function test9() {
+		var typesCompletion = toplevel(pos(1));
+		eq(true, hasToplevel(typesCompletion, "type", "C1"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7046.hx b/tests/display/src/cases/Issue7046.hx
new file mode 100644
index 0000000000000000000000000000000000000000..880ed8824e998eadc5c9d65821d872d005f34562
--- /dev/null
+++ b/tests/display/src/cases/Issue7046.hx
@@ -0,0 +1,12 @@
+package cases;
+
+class Issue7046 extends DisplayTestCase {
+	/**
+		import Ar{-1-}ray;
+		using Ar{-2-}ray;
+	**/
+	function test() {
+		eq("Array<Array.T>", type(pos(1)));
+		eq("Array<Array.T>", type(pos(2)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7047.hx b/tests/display/src/cases/Issue7047.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e6c56657322e4338a884d58528c038aa3966ceda
--- /dev/null
+++ b/tests/display/src/cases/Issue7047.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class Issue7047 extends DisplayTestCase {
+	/**
+		class Main {
+			var f:Void->{-1-}
+
+			static function main() {}
+		}
+	**/
+	function test() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "Array"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7050.hx b/tests/display/src/cases/Issue7050.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4460f7b9e5ae0ab6573f0f7bc4e1a500e3afd3f5
--- /dev/null
+++ b/tests/display/src/cases/Issue7050.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class Issue7050 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				// {-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, noCompletionPoint(toplevel.bind(pos(1))));
+	}
+}
diff --git a/tests/display/src/cases/Issue7051.hx b/tests/display/src/cases/Issue7051.hx
new file mode 100644
index 0000000000000000000000000000000000000000..17edcf655a1964dc4c7a45aabd3fe8f3eb02e144
--- /dev/null
+++ b/tests/display/src/cases/Issue7051.hx
@@ -0,0 +1,43 @@
+package cases;
+
+class Issue7051 extends DisplayTestCase {
+	/**
+		class CWithCtor {
+			public function new() { }
+		}
+		class CInheritedCtor extends CWithCtor { }
+		class CInheritedCtor2 extends CInheritedCtor { }
+		class CNoCtor { }
+		class CNoCtor2 extends CNoCtor { }
+
+		abstract AWithCtor(String) {
+			public function new() this = "";
+		}
+		abstract AWithoutCtor(String) { }
+
+		class Main {
+			static function main() {
+				new {-1-}
+			}
+		}
+	**/
+	function test() {
+		var toplevel = toplevel(pos(1));
+		eq(true, hasToplevel(toplevel, "type", "CWithCtor"));
+		eq(true, hasToplevel(toplevel, "type", "CInheritedCtor"));
+		eq(true, hasToplevel(toplevel, "type", "CInheritedCtor2"));
+		eq(false, hasToplevel(toplevel, "type", "CNoCtor"));
+		eq(false, hasToplevel(toplevel, "type", "CNoCtor2"));
+
+		eq(true, hasToplevel(toplevel, "type", "AWithCtor"));
+		eq(false, hasToplevel(toplevel, "type", "AWithoutCtor"));
+	}
+
+	/**
+		new {-1-}
+		call();
+	**/
+	@:funcCode function testBroken() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "Array"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7053.hx b/tests/display/src/cases/Issue7053.hx
new file mode 100644
index 0000000000000000000000000000000000000000..95ae86104ca964855bbfc4ed084fd5c6aacb86a9
--- /dev/null
+++ b/tests/display/src/cases/Issue7053.hx
@@ -0,0 +1,188 @@
+package cases;
+
+class Issue7053 extends DisplayTestCase {
+	/**
+		{-1-}
+	**/
+	function testFull() {
+		var fields = toplevel(pos(1));
+		// technically, "package" should be here too. But I think the test system adds a
+		// package statement automatically, so it is omitted.
+		for (expected in [
+			"import", "using", "private", "extern", "class", "interface", "enum", "abstract", "typedef", "final"
+		]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+	}
+
+	/**
+		i{-1-}
+	**/
+	function testFullIdent() {
+		var fields = toplevel(pos(1));
+		// technically, "package" should be here too. But I think the test system adds a
+		// package statement automatically, so it is omitted.
+		for (expected in [
+			"import", "using", "private", "extern", "class", "interface", "enum", "abstract", "typedef", "final"
+		]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+	}
+
+	/**
+		import String;
+		{-1-}
+	**/
+	function testAfterImport() {
+		var fields = toplevel(pos(1));
+		for (expected in [
+			"import", "using", "private", "extern", "class", "interface", "enum", "abstract", "typedef", "final"
+		]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+		for (unexpected in ["package"]) {
+			eq(false, hasField(fields, unexpected, null, "keyword"));
+		}
+	}
+
+	/**
+		import String;
+		i{-1-}
+	**/
+	function testAfterImportIdent() {
+		var fields = toplevel(pos(1));
+		for (expected in [
+			"import", "using", "private", "extern", "class", "interface", "enum", "abstract", "typedef", "final"
+		]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+		for (unexpected in ["package"]) {
+			eq(false, hasField(fields, unexpected, null, "keyword"));
+		}
+	}
+
+	/**
+		class C { }
+		{-1-}
+	**/
+	function testAfterClass() {
+		var fields = toplevel(pos(1));
+		for (expected in [
+			"private",
+			"extern",
+			"class",
+			"interface",
+			"enum",
+			"abstract",
+			"typedef",
+			"final"
+		]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+		for (unexpected in ["import", "using", "package"]) {
+			eq(false, hasField(fields, unexpected, null, "keyword"));
+		}
+	}
+
+	/**
+		class C { }
+		i{-1-}
+	**/
+	function testAfterClassIdent() {
+		var fields = toplevel(pos(1));
+		for (expected in [
+			"private",
+			"extern",
+			"class",
+			"interface",
+			"enum",
+			"abstract",
+			"typedef",
+			"final"
+		]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+		for (unexpected in ["import", "using", "package"]) {
+			eq(false, hasField(fields, unexpected, null, "keyword"));
+		}
+	}
+
+	/**
+		{-1-}class
+	**/
+	function testOnClass() {
+		var fields = toplevel(pos(1));
+		// technically, "package" should be here too. But I think the test system adds a
+		// package statement automatically, so it is omitted.
+		for (expected in [
+			"import", "using", "private", "extern", "class", "interface", "enum", "abstract", "typedef", "final"
+		]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+	}
+
+	/**
+		private {-1-}
+	**/
+	function testAfterPrivate() {
+		var fields = toplevel(pos(1));
+		for (expected in ["extern", "class", "interface", "enum", "abstract", "typedef", "final"]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+		for (unexpected in ["private"]) {
+			eq(false, hasField(fields, unexpected, null, "keyword"));
+		}
+	}
+
+	/**
+		extern {-1-}
+	**/
+	function testAFterExtern() {
+		var fields = toplevel(pos(1));
+		for (expected in ["private", "class", "interface", "enum", "abstract", "typedef", "final"]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+		for (unexpected in ["extern"]) {
+			eq(false, hasField(fields, unexpected, null, "keyword"));
+		}
+	}
+
+	/**
+		final {-1-}
+	**/
+	function testAFterFinal() {
+		var fields = toplevel(pos(1));
+		for (expected in ["private", "class", "interface", "extern"]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+		for (unexpected in ["final", "enum", "typedef", "abstract"]) {
+			eq(false, hasField(fields, unexpected, null, "keyword"));
+		}
+	}
+
+	/**
+		final extern {-1-}
+	**/
+	function testAFterFinalExtern() {
+		var fields = toplevel(pos(1));
+		for (expected in ["private", "class", "interface"]) {
+			eq(true, hasField(fields, expected, null, "keyword"));
+		}
+		for (unexpected in ["final", "enum", "typedef", "abstract", "extern"]) {
+			eq(false, hasField(fields, unexpected, null, "keyword"));
+		}
+	}
+
+	/**
+		{-1-}
+	**/
+	@:filename("import.hx")
+	function testInImportHx() {
+		var keywords = toplevel(pos(1));
+		var expectedKeywords = ["import", "using"];
+		for (expected in expectedKeywords) {
+			eq(true, hasField(keywords, expected, null, "keyword"));
+		}
+		eq(expectedKeywords.length, keywords.length);
+	}
+}
diff --git a/tests/display/src/cases/Issue7055.hx b/tests/display/src/cases/Issue7055.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2ae4171be6783529e68a9d2652f73a3122eb68b4
--- /dev/null
+++ b/tests/display/src/cases/Issue7055.hx
@@ -0,0 +1,35 @@
+package cases;
+
+class Issue7055 extends DisplayTestCase {
+	/**
+		enum TestEnum {
+			Some;
+			Random;
+			Enum;
+			Constructors;
+			For;
+			Testing;
+		}
+
+		class Main {
+			static function main() {
+				switch ((null:TestEnum)) {
+					case {-1-}
+				}
+			}
+		}
+	**/
+	function test() {
+		var results = toplevel(pos(1));
+		var i = 0;
+		function nextIs(name, ?pos) {
+			eq(results[i++].name, name, pos);
+		}
+		nextIs("Some");
+		nextIs("Random");
+		nextIs("Enum");
+		nextIs("Constructors");
+		nextIs("For");
+		nextIs("Testing");
+	}
+}
diff --git a/tests/display/src/cases/Issue7057.hx b/tests/display/src/cases/Issue7057.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dc9446f2d6be3d3d33378535c38c3ae86eae4127
--- /dev/null
+++ b/tests/display/src/cases/Issue7057.hx
@@ -0,0 +1,17 @@
+package cases;
+
+class Issue7057 extends DisplayTestCase {
+	/**
+		import haxe.Constraints.Constructible;
+
+		class Main {
+			@:generic static function main<T, TConstructible:Constructible<Void->Void>>() {
+				new {-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(false, hasToplevel(toplevel(pos(1)), "type", "T"));
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "TConstructible"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7059.hx b/tests/display/src/cases/Issue7059.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d3de59cc7acd07b9df6a36506f16b58d03e6ea6f
--- /dev/null
+++ b/tests/display/src/cases/Issue7059.hx
@@ -0,0 +1,16 @@
+package cases;
+
+using Lambda;
+
+class Issue7059 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, toplevel(pos(1)).exists(el -> el.name == "trace"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7060.hx b/tests/display/src/cases/Issue7060.hx
new file mode 100644
index 0000000000000000000000000000000000000000..53eff3a2a72afe6766ff3800508dc13f3865404a
--- /dev/null
+++ b/tests/display/src/cases/Issue7060.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class Issue7060 extends DisplayTestCase {
+	/**
+		import Type.Valu{-1-}eType;
+
+		class Main {
+			static function main() {}
+		}
+	**/
+	function test() {
+		eq("ValueType", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7061.hx b/tests/display/src/cases/Issue7061.hx
new file mode 100644
index 0000000000000000000000000000000000000000..03ed3bf818dfe5bb07ca59f1cb85676ad2311ca3
--- /dev/null
+++ b/tests/display/src/cases/Issue7061.hx
@@ -0,0 +1,31 @@
+package cases;
+
+class Issue7061 extends DisplayTestCase {
+	/**
+		abstract Either<A, B>(EitherImpl<A, B>) {
+			function new(value) this = value;
+			@:from static function fromA<A,B>(value:A) return new Either(a(value));
+			@:from static function fromB<A,B>(value:B) return new Either(b(value));
+		}
+
+		enum EitherImpl<A, B> {
+			a(v:A);
+			b(v:B);
+		}
+
+		class Main {
+			static function main() {}
+			function new() f{-6-}oo(b{-1-}ar);
+			function notNew() foo(b{-7-}ar2);
+			function {-2-}foo{-3-}<T>(value:Either<Void->T,Void->Void>) {}
+			function {-4-}bar{-5-}() {}
+			function bar2() return 1;
+		}
+	**/
+	function test() {
+		eq(range(4, 5), position(pos(1)));
+		eq(range(2, 3), position(pos(6)));
+		eq("Void -> Void", type(pos(1)));
+		eq("Void -> Int", type(pos(7)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7063.hx b/tests/display/src/cases/Issue7063.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f9c3a79d42aa0acbe0b44012b3debf27ea7535d9
--- /dev/null
+++ b/tests/display/src/cases/Issue7063.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue7063 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {
+				call({
+					foo: 1,{-1-}
+				});
+			}
+
+			static function call(arg1:Dynamic, arg2:Int) { }
+		}
+	**/
+	function test() {
+		// assumes wasAutoTriggered = false, update test for new protocol
+		sigEq(0, [["arg1:Dynamic", "arg2:Int"]], signature(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7066.hx b/tests/display/src/cases/Issue7066.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b20eb6741963509310e61c2116827adf512698a9
--- /dev/null
+++ b/tests/display/src/cases/Issue7066.hx
@@ -0,0 +1,27 @@
+package cases;
+
+class Issue7066 extends DisplayTestCase {
+	/**
+		typedef Struct = {
+			?fieldA:Int,
+			?fieldB:String
+		}
+
+		class Main {
+			static function main() {}
+			function foo():Struct {
+				return {
+					fieldA: 5,
+					{-1-}
+				};
+			}
+		}
+	**/
+	function test() {
+		var results = fields(pos(1));
+		eq(1, results.length);
+		eq("fieldB", results[0].name);
+		eq("var", results[0].kind);
+		eq("Null<String>", results[0].type);
+	}
+}
diff --git a/tests/display/src/cases/Issue7068.hx b/tests/display/src/cases/Issue7068.hx
new file mode 100644
index 0000000000000000000000000000000000000000..921d175224fbe062814d17db2a26513647aa51e4
--- /dev/null
+++ b/tests/display/src/cases/Issue7068.hx
@@ -0,0 +1,33 @@
+package cases;
+
+class Issue7068 extends DisplayTestCase {
+	/**
+		enum Foo { Bar; }
+
+		class Main {
+			static function main() {
+				switch ((null:Foo)) {
+					case {-1-} if (false):
+				}
+			}
+		}
+	**/
+	function test() {
+		eq("Bar", toplevel(pos(1))[0].name);
+	}
+
+	/**
+		enum Foo { Bar; }
+
+		class Main {
+			static function main() {
+				switch ((null:Foo)) {
+					case Bar | {-1-} if (false):
+				}
+			}
+		}
+	**/
+	function test2() {
+		eq("Bar", toplevel(pos(1))[0].name);
+	}
+}
diff --git a/tests/display/src/cases/Issue7069.hx b/tests/display/src/cases/Issue7069.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9d287db8020613fcd99f8b3ecca9a9e50c3b86f1
--- /dev/null
+++ b/tests/display/src/cases/Issue7069.hx
@@ -0,0 +1,26 @@
+package cases;
+
+class Issue7069 extends DisplayTestCase {
+	/**
+		class Main {
+			static var field:Int;
+			static function main(argument:Int) {
+				var local:Int;
+				{
+					var blockLocal:Int;
+					for (i in 0...10) {
+						{-1-}
+					}
+				}
+			}
+		}
+	**/
+	function test() {
+		var results = toplevel(pos(1));
+		eq("i", results[0].name);
+		eq("blockLocal", results[1].name);
+		eq("local", results[2].name);
+		eq("argument", results[3].name);
+		eq("field", results[4].name);
+	}
+}
diff --git a/tests/display/src/cases/Issue7071.hx b/tests/display/src/cases/Issue7071.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bca9515d217bb6ef03e92d9e5d89090b24033445
--- /dev/null
+++ b/tests/display/src/cases/Issue7071.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue7071 extends DisplayTestCase {
+	/**
+		enum Foo { Bar; }
+
+		class Main {
+			public static function main() {
+				var bar = Bar;
+				bar == {-1-};
+				if (bar == {-2-})
+			}
+		}
+	**/
+	function test() {
+		eq("bar", toplevel(pos(1))[0].name);
+		eq("bar", toplevel(pos(2))[0].name);
+	}
+}
diff --git a/tests/display/src/cases/Issue7072.hx b/tests/display/src/cases/Issue7072.hx
new file mode 100644
index 0000000000000000000000000000000000000000..064349dda6d7d480196147fb41579919f3c5ad64
--- /dev/null
+++ b/tests/display/src/cases/Issue7072.hx
@@ -0,0 +1,27 @@
+package cases;
+
+class Issue7072 extends DisplayTestCase {
+	/**
+		typedef Struct = {
+			var foo:Int;
+			var bar:Int;
+			var foobar:Int;
+		}
+
+		class Main {
+			public static function main() {
+				var s:Struct = {
+					{-1-}
+				}
+			}
+		}
+	**/
+	function test() {
+		var results = fields(pos(1));
+		// Can't test this in the old protocol because other tests for it expect a different order
+		// eq("foo", results[0].name);
+		// eq("bar", results[1].name);
+		// eq("foobar", results[2].name);
+		eq(true, true); // TODO
+	}
+}
diff --git a/tests/display/src/cases/Issue7075.hx b/tests/display/src/cases/Issue7075.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5b00f3a78892b6aa783d9081d976bdec65625e43
--- /dev/null
+++ b/tests/display/src/cases/Issue7075.hx
@@ -0,0 +1,26 @@
+package cases;
+
+class Issue7075 extends DisplayTestCase {
+	/**
+		import hax{-1-}
+
+		class Main {
+			static function main() {}
+		}
+	**/
+	function test1() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "CallStack"));
+	}
+
+	/**
+		import haxe.d{-1-}
+
+		class Main {
+			static function main() {}
+		}
+	**/
+	function test2() {
+		var fields = fields(pos(1));
+		eq(true, hasField(fields, "CallStack", ""));
+	}
+}
diff --git a/tests/display/src/cases/Issue7082.hx b/tests/display/src/cases/Issue7082.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1861d94973a836a54b79b3a00e79d31b6a3ff387
--- /dev/null
+++ b/tests/display/src/cases/Issue7082.hx
@@ -0,0 +1,16 @@
+package cases;
+
+class Issue7082 extends DisplayTestCase {
+	/**
+		class Main extends haxe.ds.BalancedTree {
+			override {-1-}
+			var foo:Int;
+
+			static function main() {}
+		}
+	**/
+	function test() {
+		fields(pos(1));
+		eq(true, true); // TODO
+	}
+}
diff --git a/tests/display/src/cases/Issue7084.hx b/tests/display/src/cases/Issue7084.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1c15d95e9edb768977b7f554a15ffe108a464986
--- /dev/null
+++ b/tests/display/src/cases/Issue7084.hx
@@ -0,0 +1,34 @@
+package cases;
+
+class Issue7084 extends DisplayTestCase {
+	/**
+		enum abstract Foo(Int) {
+			var Value = 0;
+		}
+
+		class Main {
+			public static function main() {
+				var f:Foo;
+				f.{-1-}
+			}
+		}
+	**/
+	function test1() {
+		eq(0, fields(pos(1)).length);
+	}
+
+	/**
+		enum abstract Foo(Int) {
+			var Value = 0;
+		}
+
+		class Main {
+			public static function main() {
+				Foo.{-1-};
+			}
+		}
+	**/
+	function test2() {
+		eq("Value", fields(pos(1))[0].name);
+	}
+}
diff --git a/tests/display/src/cases/Issue7086.hx b/tests/display/src/cases/Issue7086.hx
new file mode 100644
index 0000000000000000000000000000000000000000..29467cb7e0b3849236bfb4576da028e4b8776bb5
--- /dev/null
+++ b/tests/display/src/cases/Issue7086.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class Issue7086 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {
+				~/{-1-}/;
+			}
+		}
+	**/
+	function test() {
+		assert(noCompletionPoint(toplevel.bind(pos(1))));
+	}
+}
diff --git a/tests/display/src/cases/Issue7089.hx b/tests/display/src/cases/Issue7089.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c547eca13161e346b7d25fbaea88692d415b181c
--- /dev/null
+++ b/tests/display/src/cases/Issue7089.hx
@@ -0,0 +1,18 @@
+package cases;
+
+class Issue7089 extends DisplayTestCase {
+	/**
+		enum abstract Foo(Int) {
+			var Value = 1;
+		}
+
+		class Main {
+			static function main() {
+				Fo{-1-}o;
+			}
+		}
+	**/
+	function test() {
+		eq("Abstract<cases.Foo>", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7092.hx b/tests/display/src/cases/Issue7092.hx
new file mode 100644
index 0000000000000000000000000000000000000000..41da2d2be4c29484f27ced22f550f4676e743baf
--- /dev/null
+++ b/tests/display/src/cases/Issue7092.hx
@@ -0,0 +1,18 @@
+package cases;
+
+class Issue7092 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {
+				new {-1-}
+			}
+		}
+
+		private class PrivateClass {
+			public function new() {}
+		}
+	**/
+	function test() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "PrivateClass"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7098.hx b/tests/display/src/cases/Issue7098.hx
new file mode 100644
index 0000000000000000000000000000000000000000..df6bf899ba6c7023a1d8eae1106f3761f20df805
--- /dev/null
+++ b/tests/display/src/cases/Issue7098.hx
@@ -0,0 +1,16 @@
+package cases;
+
+class Issue7098 extends DisplayTestCase {
+	/**
+		import misc.issue7098.Bar;
+		class Main {
+			public static function main() {
+				Bar.foo(Va{-1-}lue);
+			}
+		}
+	**/
+	function test() {
+		var pos = position(pos(1));
+		eq("Bar.hx:4: characters 6-11", pos.substr(-25));
+	}
+}
diff --git a/tests/display/src/cases/Issue7102.hx b/tests/display/src/cases/Issue7102.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0a33c620855327f6a80afc150c352efcfda76a1d
--- /dev/null
+++ b/tests/display/src/cases/Issue7102.hx
@@ -0,0 +1,15 @@
+package cases;
+
+class Issue7102 extends DisplayTestCase {
+	/**
+		import haxe.Constraints.Constructible;
+		class Main {
+			@:generic static function main<T, TConstructible:Constructible<Void->Void>>() {
+				new TConstructible({-1-});
+			}
+		}
+	**/
+	function test() {
+		eq(0, signature(pos(1)).signatures[0].parameters.length);
+	}
+}
diff --git a/tests/display/src/cases/Issue7111.hx b/tests/display/src/cases/Issue7111.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4519928ee9c68f1bcee7a24ebd9173e19d19b8c1
--- /dev/null
+++ b/tests/display/src/cases/Issue7111.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class Issue7111 extends DisplayTestCase {
+	/**
+		class {-1-}Main{-2-}<T> {
+			public static function main() {
+				var a:Ma{-3-}in<>
+			}
+		}
+	**/
+	function test() {
+		eq(range(1, 2), position(pos(3)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7114.hx b/tests/display/src/cases/Issue7114.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0d2cf4cd38d9d2009a25d998d5e1b11594da2d9d
--- /dev/null
+++ b/tests/display/src/cases/Issue7114.hx
@@ -0,0 +1,66 @@
+package cases;
+
+class Issue7114 extends DisplayTestCase {
+	/**
+		import haxe.macro.Expr;
+		import haxe.macro.Context;
+		import haxe.macro.ExprTools;
+
+		using haxe.macro.ExprTools;
+
+		class Macro {
+		  public static macro function example_macro(e:Expr):Expr
+		  {
+		trace('Block before macro:\n${ e.toString() }');
+
+		function injectCasts(ident:String, ct:ComplexType, expr:Expr):Expr
+		{
+		  if (expr == null) return null;
+		  switch (expr.expr) {
+			case EConst(CIdent(id)) if (id==ident):
+				var rtn = macro ((cast $i{ ident }):$ct);
+				rtn.pos = expr.pos;
+				return rtn;
+			default:
+		  }
+
+		  return ExprTools.map(expr, function(e:Expr) return injectCasts(ident, ct, e) );
+		}
+
+		var blk = injectCasts('macro_override_cast', (macro :String), e);
+
+		var rtn = macro {
+		  var macro_injected:String = "injected";
+		  var macro_override_var:String = cast macro_override_var;
+		  $blk;
+		};
+
+		trace('Block after macro:\n${ rtn.toString() }');
+		return rtn;
+		  }
+
+		class Test {
+		  static function main() {
+
+		var macro_override_var:SomeDynamic = "barbar";
+		var macro_override_cast:SomeDynamic = "foofoo";
+
+		Macro.example_macro({
+		  macro_injected.{-1-}
+		  macro_override_var.{-2-}
+		  macro_override_cast.{-3-}
+		});
+		  }
+		}
+
+		abstract SomeDynamic(Dynamic) from Dynamic {
+		  public function oh_no__wrong_completions() {}
+		}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "length", "Int"));
+		eq(true, hasField(fields(pos(2)), "length", "Int"));
+		eq(true, hasField(fields(pos(3)), "length", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7133.hx b/tests/display/src/cases/Issue7133.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7eb993c4ece86296f47f3ddfe3d68773698f5821
--- /dev/null
+++ b/tests/display/src/cases/Issue7133.hx
@@ -0,0 +1,16 @@
+package cases;
+
+class Issue7133 extends DisplayTestCase {
+	/**
+		import haxe.ds.Option;
+
+		class Main {
+			public static function main() {
+				var option:Option<Int> = if (true) No{-1-}ne else
+			}
+		}
+	**/
+	function test() {
+		eq(true, position(pos(1)) != null);
+	}
+}
diff --git a/tests/display/src/cases/Issue7136.hx b/tests/display/src/cases/Issue7136.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c6ac6201cc5b80be6d14710823802f37b075d472
--- /dev/null
+++ b/tests/display/src/cases/Issue7136.hx
@@ -0,0 +1,25 @@
+package cases;
+
+class Issue7136 extends DisplayTestCase {
+	/**
+		@:structInit class Point<T> {
+			var x:Int;
+			var y:T;
+		}
+
+		class Main {
+			static function main() {
+				var p:Point<String> = {
+					{-1-}
+				}
+			}
+		}
+	**/
+	function test() {
+		var fields = fields(pos(1));
+		eq(2, fields.length);
+		eq("x", fields[0].name);
+		eq("y", fields[1].name);
+		eq("String", fields[1].type);
+	}
+}
diff --git a/tests/display/src/cases/Issue7137.hx b/tests/display/src/cases/Issue7137.hx
new file mode 100644
index 0000000000000000000000000000000000000000..05a0ea87fc3393d11bc92a774e5be6f2fdce377b
--- /dev/null
+++ b/tests/display/src/cases/Issue7137.hx
@@ -0,0 +1,32 @@
+package cases;
+
+class Issue7137 extends DisplayTestCase {
+	/**
+		abstract Foo1(Int) from {-1-} {}
+		abstract Foo2(Int) to {-2-} {}
+
+		class Main {
+			static function main() {}
+		}
+	**/
+	function test1() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "Float"));
+		eq(true, hasToplevel(toplevel(pos(2)), "type", "Float"));
+	}
+
+	/**
+		abstract Foo1(Int) from {-1-}
+	**/
+	function test2() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "Float"));
+	}
+
+	/**
+		abstract Foo1(Int) from {-1-} {
+			public function new() { }
+		}
+	**/
+	function test3() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "Float"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7148.hx b/tests/display/src/cases/Issue7148.hx
new file mode 100644
index 0000000000000000000000000000000000000000..34edd2d153f959b70413559e3be6dc3d6d3dba4b
--- /dev/null
+++ b/tests/display/src/cases/Issue7148.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue7148 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				function {-1-}local{-2-}() {}
+				lo{-3-}cal;
+
+				inline function {-4-}local{-5-}() {}
+				lo{-6-}cal;
+			}
+		}
+	**/
+	function test() {
+		eq(range(1, 2), position(pos(3)));
+		eq(range(4, 5), position(pos(6)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7158.hx b/tests/display/src/cases/Issue7158.hx
new file mode 100644
index 0000000000000000000000000000000000000000..693bf6883bc49082567751a5b426c9ad396f32e6
--- /dev/null
+++ b/tests/display/src/cases/Issue7158.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class Issue7158 extends DisplayTestCase {
+	/**
+		class {-2-}Main{-3-} {
+			static function main() {
+				var s:Mai{-1-}n<T>;
+			}
+		}
+	**/
+	function test() {
+		eq(range(2, 3), position(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7171.hx b/tests/display/src/cases/Issue7171.hx
new file mode 100644
index 0000000000000000000000000000000000000000..309e6e6560ea570d50e1c59c8dfe4c1f4fc07bbd
--- /dev/null
+++ b/tests/display/src/cases/Issue7171.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class Issue7171 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				Std.string.bi{-1-}nd(_);
+			}
+		}
+	**/
+	function test() {
+		eq("(s : Dynamic) -> String", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7172.hx b/tests/display/src/cases/Issue7172.hx
new file mode 100644
index 0000000000000000000000000000000000000000..51eeda1832edf850c3bebd5b9845b3fa6455227e
--- /dev/null
+++ b/tests/display/src/cases/Issue7172.hx
@@ -0,0 +1,35 @@
+package cases;
+
+class Issue7172 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {}
+
+			function foo() {
+				this.{-1-}
+
+
+				var x:Int;
+			}
+		}
+	**/
+	function testNo() {
+		eq(false, hasField(fields(pos(1)), "x", "Int"));
+	}
+
+	/**
+		class Main {
+			static function main() {}
+
+			function foo() {
+				this.{-1-}
+
+			}
+
+				var x:Int;
+		}
+	**/
+	function testYes() {
+		eq(true, hasField(fields(pos(1)), "x", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7211.hx b/tests/display/src/cases/Issue7211.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4b45dd101ae175cf2848414e2b2d72f3da152f3a
--- /dev/null
+++ b/tests/display/src/cases/Issue7211.hx
@@ -0,0 +1,12 @@
+package cases;
+
+class Issue7211 extends DisplayTestCase {
+	/**
+		var s:{f:String} = null;
+		switch s.{-1-}
+	**/
+	@:funcCode
+	function test() {
+		eq(true, hasField(fields(pos(1)), "f", "String"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7219.hx b/tests/display/src/cases/Issue7219.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ee525668abc4283d1629bde41689cdcd10b9deb8
--- /dev/null
+++ b/tests/display/src/cases/Issue7219.hx
@@ -0,0 +1,60 @@
+package cases;
+
+class Issue7219 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				if ([].{-1-}
+			}
+		}
+	**/
+	function testIf() {
+		eq(true, fields(pos(1)).length > 0);
+	}
+
+	/**
+		class Main {
+			static function main() {
+				for ([].{-1-}
+			}
+		}
+	**/
+	function testFor() {
+		eq(true, fields(pos(1)).length > 0);
+	}
+
+	/**
+		class Main {
+			static function main() {
+				while ([].{-1-}
+			}
+		}
+	**/
+	function testWhile() {
+		eq(true, fields(pos(1)).length > 0);
+	}
+
+	/**
+		class Main {
+			static function main() {
+				do [].{-1-}
+			}
+		}
+	**/
+	function testDoWhile1() {
+		eq(true, fields(pos(1)).length > 0);
+	}
+
+	/**
+		class Main {
+			static function main() {
+				do {
+
+				} while ([].{-1-}
+			}
+		}
+	**/
+	function testDoWhile2() {
+		eq(true, fields(pos(1)).length > 0);
+	}
+}
diff --git a/tests/display/src/cases/Issue7224.hx b/tests/display/src/cases/Issue7224.hx
new file mode 100644
index 0000000000000000000000000000000000000000..90d9143cdbec7e61541dc898219821bed3a630ee
--- /dev/null
+++ b/tests/display/src/cases/Issue7224.hx
@@ -0,0 +1,24 @@
+package cases;
+
+class Issue7224 extends DisplayTestCase {
+	/**
+		typedef Nope = Int;
+
+		class Bar {
+			public function new() {}
+		}
+		typedef Foo = Bar;
+
+		class Main {
+			static function main() {
+				new {-1-}
+			}
+		}
+	**/
+	function test() {
+		var items = toplevel(pos(1));
+		eq(false, hasToplevel(items, "type", "Nope"));
+		eq(true, hasToplevel(items, "type", "Bar"));
+		eq(true, hasToplevel(items, "type", "Foo"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7248.hx b/tests/display/src/cases/Issue7248.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8988ae1094558f19eeaddf8a31ce64242e720b84
--- /dev/null
+++ b/tests/display/src/cases/Issue7248.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue7248 extends DisplayTestCase {
+	/**
+		abstract Foo(Int) {
+			static public function AStatic(){}
+			public function NonStatic(){}
+		}
+		class Main {
+			static function main() {
+				Foo.{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "AStatic", "Void -> Void"));
+		eq(false, hasField(fields(pos(1)), "NonStatic", "this : Int -> Void"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7252.hx b/tests/display/src/cases/Issue7252.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7c3fa177a4753f7840d44cf3e6ad11c4668a11b3
--- /dev/null
+++ b/tests/display/src/cases/Issue7252.hx
@@ -0,0 +1,17 @@
+package cases;
+
+class Issue7252 extends DisplayTestCase {
+	/**
+		class Main {
+			var a : Array<Int>;
+			function foo() {
+				a.map(function(_) {
+					a.concat({-1-})
+				});
+			}
+		}
+	**/
+	function test() {
+		sigEq(0, [["a:Array<Int>"]], signature(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7281.hx b/tests/display/src/cases/Issue7281.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8ea83e240b8744923cfc3fd8c3da2cb72a850ab1
--- /dev/null
+++ b/tests/display/src/cases/Issue7281.hx
@@ -0,0 +1,47 @@
+package cases;
+
+class Issue7281 extends DisplayTestCase {
+	/**
+		extern class PrivateExternConstructor {
+			function new() { }
+		}
+
+		class PrivateConstructor {
+			function new() { }
+
+			static function test() {
+				new {-1-}
+			}
+		}
+
+		class Ext1 extends PrivateConstructor {
+			static function test() {
+				new {-2-}
+			}
+		}
+
+		class Main {
+			static function main() {
+				new {-3-}
+				@:privateAccess new {-4-}
+			}
+		}
+	**/
+	function test() {
+		var items = toplevel(pos(1));
+		eq(true, hasToplevel(items, "type", "PrivateConstructor"));
+		eq(true, hasToplevel(items, "type", "PrivateExternConstructor"));
+
+		var items = toplevel(pos(2));
+		eq(true, hasToplevel(items, "type", "PrivateConstructor"));
+		eq(true, hasToplevel(items, "type", "PrivateExternConstructor"));
+
+		var items = toplevel(pos(3));
+		eq(false, hasToplevel(items, "type", "PrivateConstructor"));
+		eq(true, hasToplevel(items, "type", "PrivateExternConstructor"));
+
+		var items = toplevel(pos(4));
+		eq(true, hasToplevel(items, "type", "PrivateConstructor"));
+		eq(true, hasToplevel(items, "type", "PrivateExternConstructor"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7319.hx b/tests/display/src/cases/Issue7319.hx
new file mode 100644
index 0000000000000000000000000000000000000000..82dfdbcf9e465afece5a98bbe525b8b5e7279a6e
--- /dev/null
+++ b/tests/display/src/cases/Issue7319.hx
@@ -0,0 +1,21 @@
+package cases;
+
+class Issue7319 extends DisplayTestCase {
+	/**
+		import haxe.ds.Option;
+
+		class Main {
+			static function main() {
+				var option:Option<Int>;
+				switch option {
+					case None:
+					case So{-1-}
+				}
+			}
+		}
+	**/
+	function test() {
+		var fields = toplevel(pos(1));
+		eq(false, hasField(fields, "So", "haxe.ds.Option<Int>"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7320.hx b/tests/display/src/cases/Issue7320.hx
new file mode 100644
index 0000000000000000000000000000000000000000..52d108e4142c1fdb90d72e368e7eb7d79b911b8c
--- /dev/null
+++ b/tests/display/src/cases/Issue7320.hx
@@ -0,0 +1,63 @@
+package cases;
+
+class Issue7320 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				var f{-1-}
+			}
+		}
+	**/
+	@:func
+	function test1() {
+		eq(true, noCompletionPoint(toplevel.bind((pos(1)))));
+	}
+
+	/**
+		class Main {
+			static function main() {
+				var f = {-1-}
+			}
+		}
+	**/
+	@:func
+	function test2() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "Float"));
+	}
+
+	/**
+		class Main {
+			static function main() {
+				var f, l{-1-}
+			}
+		}
+	**/
+	@:func
+	function test3() {
+		eq(true, noCompletionPoint(toplevel.bind((pos(1)))));
+	}
+
+	/**
+		class Main {
+			static function main() {
+				var f = "foo", l{-1-}
+			}
+		}
+	**/
+	@:func
+	function test4() {
+		eq(true, noCompletionPoint(toplevel.bind((pos(1)))));
+	}
+
+	/**
+		class Main {
+			static function main() {
+				var f, l{-1-} = "foo"
+			}
+		}
+	**/
+	@:func
+	function test5() {
+		eq(true, noCompletionPoint(toplevel.bind((pos(1)))));
+	}
+}
diff --git a/tests/display/src/cases/Issue7326.hx b/tests/display/src/cases/Issue7326.hx
new file mode 100644
index 0000000000000000000000000000000000000000..358dd2be53d8f30fe14f54bfa454bf113150bfd5
--- /dev/null
+++ b/tests/display/src/cases/Issue7326.hx
@@ -0,0 +1,23 @@
+package cases;
+
+class Issue7326 extends DisplayTestCase {
+	/**
+		import haxe.ds.Option;
+
+		class Main {
+			public static function main() {
+				var o:Option<Int> = None;
+				switch (o) {
+					case Some({-1-}v):
+					case None:
+				}
+				Some({-2-});
+			}
+		}
+	**/
+	function test() {
+		// sigEq(0, [["v:Int"]], signature(pos(1)));
+		sigEq(0, [["v:Int"]], signature(pos(1)));
+		sigEq(0, [["v:Unknown<0>"]], signature(pos(2)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7327.hx b/tests/display/src/cases/Issue7327.hx
new file mode 100644
index 0000000000000000000000000000000000000000..55a597232c6ba4c74fd1800ecad9a2e4b50d7c63
--- /dev/null
+++ b/tests/display/src/cases/Issue7327.hx
@@ -0,0 +1,71 @@
+package cases;
+
+class Issue7327 extends DisplayTestCase {
+	/**
+		import haxe.ds.Option;
+
+		class Main {
+			public static function main() {
+				var o:Option<Int> = None;
+				switch (o) {
+					case Some(v):{-1-} {-2-}
+					case None:
+				}
+			}
+		}
+	**/
+	function test1() {
+		eq(true, hasToplevel(toplevel(pos(1)), "local", "v", "Int"));
+		eq(true, hasToplevel(toplevel(pos(2)), "local", "v", "Int"));
+	}
+
+	/**
+		import haxe.ds.Option;
+
+		class Main {
+			public static function main() {
+				var o:Option<Int> = None;
+				switch (o) {
+					case Some(v):{-1-} {-2-}
+				{-3-}}{-4-}
+			}
+		}
+	**/
+	function test2() {
+		eq(true, hasToplevel(toplevel(pos(1)), "local", "v", "Int"));
+		eq(true, hasToplevel(toplevel(pos(2)), "local", "v", "Int"));
+		eq(true, hasToplevel(toplevel(pos(3)), "local", "v", "Int"));
+		eq(false, hasToplevel(toplevel(pos(4)), "local", "v", "Int"));
+	}
+
+	/**
+		import haxe.ds.Option;
+
+		class Main {
+			public static function main() {
+				var o:Option<Int> = None;
+				switch (o) {
+					case Some(v):{-1-}
+					default: {-2-}
+				}
+			}
+		}
+	**/
+	function test3() {
+		eq(true, hasToplevel(toplevel(pos(1)), "local", "v", "Int"));
+		eq(false, hasToplevel(toplevel(pos(2)), "local", "v", "Int"));
+	}
+
+	/**
+		import haxe.ds.Option;
+
+		class Main {
+			public static function main() {
+				var o:Option<Int> = None;
+				switch (o) {
+					case Some(v):{-1-}
+	**/
+	function test4() {
+		eq(true, hasToplevel(toplevel(pos(1)), "local", "v", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7328.hx b/tests/display/src/cases/Issue7328.hx
new file mode 100644
index 0000000000000000000000000000000000000000..276ecc609ccf2aa1647c024b7bc92005956dfc80
--- /dev/null
+++ b/tests/display/src/cases/Issue7328.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue7328 extends DisplayTestCase {
+	/**
+		import haxe.macro.Expr.ExprDef;
+
+		class Main {
+			public static function main() {
+				switch (null:ExprDef) {
+					case EConst(CInt({-1-}v)):
+					case _:
+				}
+			}
+		}
+	**/
+	function test() {
+		sigEq(0, [["v:String"]], signature(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7471.hx b/tests/display/src/cases/Issue7471.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e01392401baf2db497f66e8bbb23542a41a6c78b
--- /dev/null
+++ b/tests/display/src/cases/Issue7471.hx
@@ -0,0 +1,11 @@
+package cases;
+
+class Issue7471 extends DisplayTestCase {
+	/**
+		return "foo" == null ? "foo".{-1-}
+	**/
+	@:funcCode
+	function test() {
+		eq(true, hasField(fields(pos(1)), "length", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7577.hx b/tests/display/src/cases/Issue7577.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7e32f29ae880f37ecb9bb8a22dc150fde9832edb
--- /dev/null
+++ b/tests/display/src/cases/Issue7577.hx
@@ -0,0 +1,17 @@
+package cases;
+
+class Issue7577 extends DisplayTestCase {
+	/**
+
+		@:forward abstract X(String) {}
+
+		class Main {
+			static function test(x:X) {
+				x.{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "charCodeAt", "(index : Int) -> Null<Int>"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7627.hx b/tests/display/src/cases/Issue7627.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7bb99324d1369e82514e673a85d8db3fb8c7a5db
--- /dev/null
+++ b/tests/display/src/cases/Issue7627.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue7627 extends DisplayTestCase {
+	/**
+
+		import haxe.ds.Option;
+
+		class Main {
+			public static function main() {
+				var option = Some(1);
+				option.match(None);
+				option.{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "match", "(this : EnumValue, pattern : Dynamic) -> Bool"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7650.hx b/tests/display/src/cases/Issue7650.hx
new file mode 100644
index 0000000000000000000000000000000000000000..16aa87f5cd7c20a1dfb9e33b7c2fa74f0fe5efd1
--- /dev/null
+++ b/tests/display/src/cases/Issue7650.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue7650 extends DisplayTestCase {
+	/**
+		new MyClasss("".{-1-}
+	**/
+	@:funcCode
+	function test1() {
+		eq(true, hasField(fields(pos(1)), "length", "Int"));
+	}
+
+	/**
+		new MyClasss<MyClassss>("".{-1-}
+	**/
+	@:funcCode
+	function test2() {
+		eq(true, hasField(fields(pos(1)), "length", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7751.hx b/tests/display/src/cases/Issue7751.hx
new file mode 100644
index 0000000000000000000000000000000000000000..652e4e79e4ec6efef408aa580e2fee5862d59dad
--- /dev/null
+++ b/tests/display/src/cases/Issue7751.hx
@@ -0,0 +1,12 @@
+package cases;
+
+class Issue7751 extends DisplayTestCase {
+	/**
+		extern class Foo {
+			function new():V{-1-}oid;
+		}
+	**/
+	function test() {
+		eq("Void", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7752.hx b/tests/display/src/cases/Issue7752.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6a87414fdb289f45a9484709353fc92e21c06a97
--- /dev/null
+++ b/tests/display/src/cases/Issue7752.hx
@@ -0,0 +1,21 @@
+package cases;
+
+class Issue7752 extends DisplayTestCase {
+	/**
+		class Foo {
+		extern function foo(te{-1-}st:Int):Void;
+		}
+	**/
+	function test() {
+		eq("Int", type(pos(1)));
+	}
+
+	/**
+		class Foo {
+		extern function foo(test:Int = 1{-1-}2):Void;
+		}
+	**/
+	function test2() {
+		eq("Int", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7761.hx b/tests/display/src/cases/Issue7761.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1fefaedc29676ff603f527d365c197806db99666
--- /dev/null
+++ b/tests/display/src/cases/Issue7761.hx
@@ -0,0 +1,21 @@
+package cases;
+
+class Issue7761 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {
+				Boolean.{-1-}
+			}
+		}
+
+		@:forwardStatics
+		abstract Boolean(BooleanClass) {}
+
+		extern class BooleanClass {
+			static function foo():Int;
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "foo", "Void -> Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7777.hx b/tests/display/src/cases/Issue7777.hx
new file mode 100644
index 0000000000000000000000000000000000000000..065cdd64ff91409b48f29c50ac157d1847032939
--- /dev/null
+++ b/tests/display/src/cases/Issue7777.hx
@@ -0,0 +1,26 @@
+package cases;
+
+class Issue7777 extends DisplayTestCase {
+	/**
+		{-1-}import misc.issue7777.Thing;{-2-}
+		import misc.issue7777.Foo;
+
+		class Main {
+			public static function main() {
+				var foo:Foo<String> = BOO;
+				trace(foo);
+			}
+		}
+
+	**/
+	function test() {
+		arrayEq([
+			{
+				kind: DKUnusedImport,
+				severity: Warning,
+				range: diagnosticsRange(pos(1), pos(2)),
+				args: []
+			}
+		], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7877.hx b/tests/display/src/cases/Issue7877.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3c54446f3cf27bd8c0e676e2dee14afef5c4c918
--- /dev/null
+++ b/tests/display/src/cases/Issue7877.hx
@@ -0,0 +1,15 @@
+package cases;
+
+class Issue7877 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {
+				new misc.issue7877.ProcessedClass(false);
+				new misc.issue7877.ProcessedClass(true);
+			}
+		}
+	**/
+	function test() {
+		arrayEq([], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7878.hx b/tests/display/src/cases/Issue7878.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5b5584bb3cf5a3c680e20c66cdc1c5fddc4c42e4
--- /dev/null
+++ b/tests/display/src/cases/Issue7878.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class Issue7878 extends DisplayTestCase {
+	/**
+		class Main {
+		public static function main() {
+			var f:Array<SomethingUnk{-1-}nown>;
+		}
+		}
+	**/
+	function test() {
+		assert(typeNotFound(type.bind(pos(1)), "SomethingUnknown"));
+	}
+}
diff --git a/tests/display/src/cases/Issue7906.hx b/tests/display/src/cases/Issue7906.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e9cb1bcd19006cdf2f777e8118852c64a92236e8
--- /dev/null
+++ b/tests/display/src/cases/Issue7906.hx
@@ -0,0 +1,24 @@
+package cases;
+
+class Issue7906 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				var method:Ha{-1-}xeRequestMethod;
+				n{-2-}ew Ha{-3-}xeRequestMethod();
+			}
+		}
+
+		typedef {-4-}HaxeRequestMethod{-5-} = RequestMethod;
+
+		abstract RequestMethod(String) to String {
+			public function {-6-}new{-7-}()
+				this = "";
+		}
+	**/
+	function test() {
+		eq(range(4, 5), position(pos(1)));
+		eq(range(6, 7), position(pos(2)));
+		eq(range(4, 5), position(pos(3)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7911.hx b/tests/display/src/cases/Issue7911.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7bd8f775063bc9e936ddbc4ae261f7b84fba1b22
--- /dev/null
+++ b/tests/display/src/cases/Issue7911.hx
@@ -0,0 +1,10 @@
+package cases;
+
+class Issue7911 extends DisplayTestCase {
+	/**
+		import misc.issue7911.{-1-}
+	**/
+	function test() {
+		arrayEq([{name: "Test", type: "", kind: "type"}], fields(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7932.hx b/tests/display/src/cases/Issue7932.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a98fbb509c2f192664a55b7ab295e4ca51d58e54
--- /dev/null
+++ b/tests/display/src/cases/Issue7932.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue7932 extends DisplayTestCase {
+	/**
+		class Main< {-1-}{{-2-}
+			public static function main() {}
+		}
+	**/
+	function test() {
+		arrayEq([
+			{
+				kind: DKParserError,
+				range: diagnosticsRange(pos(1), pos(2)),
+				severity: Error,
+				args: "Expected type parameter"
+			}
+		], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7935.hx b/tests/display/src/cases/Issue7935.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1b033b909fe77e67c2857b464d3751ff945b6506
--- /dev/null
+++ b/tests/display/src/cases/Issue7935.hx
@@ -0,0 +1,47 @@
+package cases;
+
+class Issue7935 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {
+				trace({-1-};{-2-}
+			}
+		}
+	**/
+	function test1() {
+		hasParserError("Expected expression or )");
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				trace(0
+			{-1-}}{-2-}
+		}
+	**/
+	function test2() {
+		hasParserError("Expected , or )");
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				trace(0,
+			{-1-}}{-2-}
+		}
+	**/
+	function test3() {
+		hasParserError("Expected expression");
+	}
+
+	function hasParserError(message:String) {
+		arrayEq([
+			{
+				kind: DKParserError,
+				range: diagnosticsRange(pos(1), pos(2)),
+				severity: Error,
+				args: message
+			}
+		], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7937.hx b/tests/display/src/cases/Issue7937.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f6e60c00e3ed5de0c80a3fa981596571b3975d75
--- /dev/null
+++ b/tests/display/src/cases/Issue7937.hx
@@ -0,0 +1,18 @@
+package cases;
+
+class Issue7937 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {}
+		}
+
+		typedef FoldingRangeServerCapabilities = {
+			var foldingRa{-1-}ngeProvider:FoldingRangeProviderOptions & {};
+		}
+
+		typedef FoldingRangeProviderOptions = {}
+	**/
+	function test() {
+		eq("{ }", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7938.hx b/tests/display/src/cases/Issue7938.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5cd6c3a2c4715da1e00304902130a1e4d5894987
--- /dev/null
+++ b/tests/display/src/cases/Issue7938.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue7938 extends DisplayTestCase {
+	/**
+		class Main {
+			public static {-1-}fuction{-2-} main() {}
+		}
+	**/
+	function test() {
+		arrayEq([
+			{
+				kind: DKParserError,
+				range: diagnosticsRange(pos(1), pos(2)),
+				severity: Error,
+				args: "Unexpected fuction"
+			}
+		], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7939.hx b/tests/display/src/cases/Issue7939.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9b75195a1cb4cabb260d06d837d5cea94304e3a7
--- /dev/null
+++ b/tests/display/src/cases/Issue7939.hx
@@ -0,0 +1,17 @@
+package cases;
+
+class Issue7939 extends DisplayTestCase {
+	/**
+		typedef Struct {-1-}{{-2-}}
+	**/
+	function test() {
+		arrayEq([
+			{
+				kind: DKParserError,
+				range: diagnosticsRange(pos(1), pos(2)),
+				severity: Error,
+				args: "Unexpected {"
+			}
+		], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7940.hx b/tests/display/src/cases/Issue7940.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b8a6ca4254879689df2eb6c22d0207d6890796ec
--- /dev/null
+++ b/tests/display/src/cases/Issue7940.hx
@@ -0,0 +1,21 @@
+package cases;
+
+class Issue7940 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				{-1-}"Hello World
+			}
+		}
+	**/
+	function test() {
+		arrayEq([
+			{
+				kind: DKParserError,
+				range: diagnosticsRange(pos(1), pos(1)),
+				severity: Error,
+				args: "Unterminated string"
+			}
+		], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7943.hx b/tests/display/src/cases/Issue7943.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6a7e7038ab4c55d35e555338e549d2ab0dbf3de1
--- /dev/null
+++ b/tests/display/src/cases/Issue7943.hx
@@ -0,0 +1,27 @@
+package cases;
+
+class Issue7943 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				{-1-}0{-2-}{-3-}1{-4-};
+			}
+		}
+	**/
+	function test() {
+		arrayEq([
+			{
+				kind: DKParserError,
+				severity: Error,
+				range: diagnosticsRange(pos(3), pos(4)),
+				args: "Missing ;"
+			},
+			{
+				kind: DKCompilerError,
+				severity: Warning,
+				range: diagnosticsRange(pos(1), pos(2)),
+				args: "This code has no effect"
+			}
+		], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7945.hx b/tests/display/src/cases/Issue7945.hx
new file mode 100644
index 0000000000000000000000000000000000000000..74d028aa8489ffab063330d25fdfede614afdca1
--- /dev/null
+++ b/tests/display/src/cases/Issue7945.hx
@@ -0,0 +1,31 @@
+package cases;
+
+class Issue7945 extends DisplayTestCase {
+	/**
+		abstract Test(Int) {-1-}too{-2-} Int {}
+	**/
+	function test1() {
+		arrayEq([
+			{
+				kind: DKParserError,
+				severity: Error,
+				range: diagnosticsRange(pos(1), pos(2)),
+				args: "Unexpected too"
+			}
+		], diagnostics());
+	}
+
+	/**
+		class Test {-1-}extend{-2-} OtherClass {}
+	**/
+	function test2() {
+		arrayEq([
+			{
+				kind: DKParserError,
+				severity: Error,
+				range: diagnosticsRange(pos(1), pos(2)),
+				args: "Expected extends or implements or {"
+			}
+		], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7946.hx b/tests/display/src/cases/Issue7946.hx
new file mode 100644
index 0000000000000000000000000000000000000000..95240e4d146555f211ac348f0166b5ea66ceab65
--- /dev/null
+++ b/tests/display/src/cases/Issue7946.hx
@@ -0,0 +1,31 @@
+package cases;
+
+class Issue7946 extends DisplayTestCase {
+	/**
+		{-1-}open{-2-} haxe.Json;
+	**/
+	function test1() {
+		arrayEq([
+			{
+				kind: DKParserError,
+				severity: Error,
+				range: diagnosticsRange(pos(1), pos(2)),
+				args: "Unexpected open"
+			}
+		], diagnostics());
+	}
+
+	/**
+		{-1-}clas{-2-} Test {}
+	**/
+	function test() {
+		arrayEq([
+			{
+				kind: DKParserError,
+				severity: Error,
+				range: diagnosticsRange(pos(1), pos(2)),
+				args: "Unexpected clas"
+			}
+		], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7947.hx b/tests/display/src/cases/Issue7947.hx
new file mode 100644
index 0000000000000000000000000000000000000000..93d1eaaa6c476243838380c1eab29f79933f3328
--- /dev/null
+++ b/tests/display/src/cases/Issue7947.hx
@@ -0,0 +1,55 @@
+package cases;
+
+class Issue7947 extends DisplayTestCase {
+	/**
+		class Main {
+			public static function main() {
+				var either = haxe.ds.Either.Left(123);
+				return switch either {
+					case Left(_):
+						trace('Some logic...');
+						trace('Some logic...');
+						trace('Some logic...');
+						true;
+					{-1-}case Right(_):{-2-}
+				}
+			}
+		}
+	**/
+	function test1() {
+		arrayEq([
+			{
+				kind: DKCompilerError,
+				severity: Error,
+				range: diagnosticsRange(pos(1), pos(2)),
+				args: "Void should be Bool"
+			}
+		], diagnostics());
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				var either = haxe.ds.Either.Left(123);
+				return switch either {
+					case Right(_):
+					case Left(_):
+						trace('Some logic...');
+						trace('Some logic...');
+						trace('Some logic...');
+						{-1-}true{-2-};
+				}
+			}
+		}
+	**/
+	function test2() {
+		arrayEq([
+			{
+				kind: DKCompilerError,
+				severity: Error,
+				range: diagnosticsRange(pos(1), pos(2)),
+				args: "Bool should be Void"
+			}
+		], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue7972.hx b/tests/display/src/cases/Issue7972.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9e3b25e377a2944fa4237a94dc75d4ef13f8d5fa
--- /dev/null
+++ b/tests/display/src/cases/Issue7972.hx
@@ -0,0 +1,20 @@
+package cases;
+
+class Issue7972 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				var foo = 0.0;
+
+				switch (S{-1-}td.i{-2-}nt(fo{-3-}o)) {
+					case _:
+				}
+			}
+		}
+	**/
+	function test() {
+		eq("Class<Std>", type(pos(1)));
+		eq("(x : Float) -> Int", type(pos(2)));
+		eq("Float", type(pos(3)));
+	}
+}
diff --git a/tests/display/src/cases/Issue7998.hx b/tests/display/src/cases/Issue7998.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2df2502f8c2c5aca534d1c7bce552dc0817df683
--- /dev/null
+++ b/tests/display/src/cases/Issue7998.hx
@@ -0,0 +1,16 @@
+package cases;
+
+class Issue7998 extends DisplayTestCase {
+	/**
+		var subject:{
+			var iterator:Int;
+			var keyValueIterator:Float;
+		};
+		subject.{-1-}
+	**/
+	@:funcCode function test() {
+		var fields = fields(pos(1));
+		eq(true, hasField(fields, "iterator", "Int", "var"));
+		eq(true, hasField(fields, "keyValueIterator", "Float", "var"));
+	}
+}
diff --git a/tests/display/src/cases/Issue8007.hx b/tests/display/src/cases/Issue8007.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f1c0ad9b5a3fa363946680c6a60ad1765c45cda7
--- /dev/null
+++ b/tests/display/src/cases/Issue8007.hx
@@ -0,0 +1,23 @@
+package cases;
+
+class Issue8007 extends DisplayTestCase {
+	/**
+		var i:Null<{-1-}>
+	**/
+	@:funcCode
+	function test1() {
+		var typesCompletion = toplevel(pos(1));
+		eq(true, hasToplevel(typesCompletion, "type", "Array"));
+		eq(true, hasToplevel(typesCompletion, "package", "haxe"));
+	}
+
+	/**
+		var i:Null<{-1-}
+	**/
+	@:funcCode
+	function test2() {
+		var typesCompletion = toplevel(pos(1));
+		eq(true, hasToplevel(typesCompletion, "type", "Array"));
+		eq(true, hasToplevel(typesCompletion, "package", "haxe"));
+	}
+}
diff --git a/tests/display/src/cases/Issue8014.hx b/tests/display/src/cases/Issue8014.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e4cb54d8c2f77eb46c53a95205d78844d1e84a40
--- /dev/null
+++ b/tests/display/src/cases/Issue8014.hx
@@ -0,0 +1,24 @@
+package cases;
+
+class Issue8014 extends DisplayTestCase {
+	/**
+		class Main extends MainLoo{-1-} {
+			static function main() {}
+		}
+	**/
+	function testExtends() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "type", "MainLoop"));
+	}
+
+	/**
+		interface Iiiinterface { }
+		class Main implements Iii{-1-} {
+			static function main() {}
+		}
+	**/
+	function testImplements() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "type", "Iiiinterface"));
+	}
+}
diff --git a/tests/display/src/cases/Issue8046.hx b/tests/display/src/cases/Issue8046.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f559c748776beb7c1b67eaf6102517eb972cf971
--- /dev/null
+++ b/tests/display/src/cases/Issue8046.hx
@@ -0,0 +1,18 @@
+package cases;
+
+class Issue8046 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				for(k => v in ['hello' => {field:true}]) {
+					k.{-1-}
+					v.{-2-}
+				}
+			}
+		}
+	**/
+	function testKeyValue() {
+		eq(true, hasField(fields(pos(1)), "length", "Int"));
+		eq(true, hasField(fields(pos(2)), "field", "Bool"));
+	}
+}
diff --git a/tests/display/src/cases/Issue8078.hx b/tests/display/src/cases/Issue8078.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b8cba084ebb365573fa1ae1b6592bfcd2eb82927
--- /dev/null
+++ b/tests/display/src/cases/Issue8078.hx
@@ -0,0 +1,21 @@
+package cases;
+
+class Issue8078 extends DisplayTestCase {
+	/**
+		extern class StringBuilder {
+			@:overload(function new(s:String) {})
+			public function new() { }
+
+			public function append():Void { }
+		}
+		class Main {
+			static function main() {
+				var b = new StringBuilder("hi");
+				b.{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "append", "Void -> Void"));
+	}
+}
diff --git a/tests/display/src/cases/Issue8180.hx b/tests/display/src/cases/Issue8180.hx
new file mode 100644
index 0000000000000000000000000000000000000000..01f5da892f571deeee24910269f779a92a4ce2f5
--- /dev/null
+++ b/tests/display/src/cases/Issue8180.hx
@@ -0,0 +1,25 @@
+package cases;
+
+class Issue8180 extends DisplayTestCase {
+	/**
+		class Main {
+			#if !macro
+			static function main() {
+				f({-1-}
+			}
+			#end
+
+			static macro function f(e) {
+				switch e {
+					case {expr: EDisplay(macro null, DKMarked), pos: p}:
+						return {pos: p, expr: EDisplay(macro {x:1}, DKDot)};
+					case _:
+						return macro null;
+				}
+			}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "x", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue8217.hx b/tests/display/src/cases/Issue8217.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d18be53322cb24178ffad111b5cb3b2b4340a6b6
--- /dev/null
+++ b/tests/display/src/cases/Issue8217.hx
@@ -0,0 +1,22 @@
+package cases;
+
+class Issue8217 extends DisplayTestCase {
+	/**
+		class Main {
+			static function foo( cmd : String ) {
+				switch( cmd ) {
+				case "user/login":
+					var o = {
+						x : 55,
+						str : "hello".{-1-}
+						z : 66,
+					};
+				}
+			}
+
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "length", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue8345.hx b/tests/display/src/cases/Issue8345.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5622d1b69bb74bfc2fcb3680aef686d5d421b48c
--- /dev/null
+++ b/tests/display/src/cases/Issue8345.hx
@@ -0,0 +1,21 @@
+package cases;
+
+class Issue8345 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				var i:Test2 = null;
+				i.{-1-};
+			}
+		}
+
+		interface Test {
+			var foo:Int;
+		}
+
+		interface Test2 extends Test {}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "foo", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue8359.hx b/tests/display/src/cases/Issue8359.hx
new file mode 100644
index 0000000000000000000000000000000000000000..077078621b1a3e386e5d8f5378fb3e6bce06cbac
--- /dev/null
+++ b/tests/display/src/cases/Issue8359.hx
@@ -0,0 +1,25 @@
+package cases;
+
+class Issue8359 extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				var active = false;
+				var callback: ()->Void;
+				callback = function original(){
+					if( active ){ return; }
+					active = true;
+					callback = function(){
+						active = false;
+						callback = original;
+					};
+				};
+				callback();
+				callback();
+			}
+		}
+	**/
+	function test() {
+		arrayEq([], diagnostics());
+	}
+}
diff --git a/tests/display/src/cases/Issue8383.hx b/tests/display/src/cases/Issue8383.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5054030bda1209d2064f45409b896602fee6c6c8
--- /dev/null
+++ b/tests/display/src/cases/Issue8383.hx
@@ -0,0 +1,15 @@
+package cases;
+
+class Issue8383 extends DisplayTestCase {
+	/**
+		class Main {
+			static var field(never,default):Int;
+			static function main() {
+				fi{-1-}eld = 10;
+			}
+		}
+	**/
+	function test() {
+		eq("Int", type(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue8396.hx b/tests/display/src/cases/Issue8396.hx
new file mode 100644
index 0000000000000000000000000000000000000000..876b8e19de2182050146753ea849a256bce52494
--- /dev/null
+++ b/tests/display/src/cases/Issue8396.hx
@@ -0,0 +1,19 @@
+package cases;
+
+class Issue8396 extends DisplayTestCase {
+	/**
+		enum abstract Test(String) {
+			var Foo;
+			var Bar;
+
+			function foobar() {
+				{-1-}
+			}
+		}
+	**/
+	function test() {
+		var r = toplevel(pos(1));
+		eq(true, hasToplevel(r, "member", "Bar"));
+		eq(false, hasToplevel(r, "enumabstract", "Bar"));
+	}
+}
diff --git a/tests/display/src/cases/Issue8420.hx b/tests/display/src/cases/Issue8420.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c452135807c9a002ed9bde70a3c6321bb5203c80
--- /dev/null
+++ b/tests/display/src/cases/Issue8420.hx
@@ -0,0 +1,16 @@
+package cases;
+
+class Issue8420 extends DisplayTestCase {
+	/**
+		class A {
+			final x:Int;
+
+			function f() {
+				this.{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "x", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/Issue8459.hx b/tests/display/src/cases/Issue8459.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d148b91f090e8a4cb3f5c0efcfe50e5543e97584
--- /dev/null
+++ b/tests/display/src/cases/Issue8459.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class Issue8459 extends DisplayTestCase {
+	/**
+		class Some {
+			function main() {
+				$type({-1-}
+			}
+		}
+	**/
+	function testDollarType() {
+		sigEq(0, [["expression:Unknown<0>"]], signature(pos(1)));
+	}
+}
diff --git a/tests/display/src/cases/Issue8558.hx b/tests/display/src/cases/Issue8558.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7712c012425731184da6154e9b292bdd93bcde90
--- /dev/null
+++ b/tests/display/src/cases/Issue8558.hx
@@ -0,0 +1,25 @@
+package cases;
+
+class Issue8558 extends DisplayTestCase {
+	/**
+		class Life {
+			public function new () {}
+			public var die:Int;
+		}
+
+		@:forward abstract Immortal(Life) from Life {
+			private var die(get,never):Int;
+			function get_die() return 0;
+		}
+
+		class Main {
+			static function main() {
+				var bar:Immortal = new Life();
+				bar.{-1-}
+			}
+		}
+	**/
+	function testAbstractShadowsForwardedField() {
+		eq(false, hasField(fields(pos(1)), "die", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/IssueTemplate.hx b/tests/display/src/cases/IssueTemplate.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f686c7c93fb458b0c624073c1cdc56b95b779fc1
--- /dev/null
+++ b/tests/display/src/cases/IssueTemplate.hx
@@ -0,0 +1,14 @@
+package cases;
+
+class IssueTemplate extends DisplayTestCase {
+	/**
+		class Main {
+			static function main() {
+				{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, true);
+	}
+}
diff --git a/tests/display/src/cases/Metadata.hx b/tests/display/src/cases/Metadata.hx
index 5122031de9e3e91cf1f239f8d1d07480f8415c10..46dae246cf34abbd769d130da44c726b2abfc38b 100644
--- a/tests/display/src/cases/Metadata.hx
+++ b/tests/display/src/cases/Metadata.hx
@@ -2,16 +2,16 @@ package cases;
 
 class Metadata extends DisplayTestCase {
 	/**
-	@{-1-}
-	class Some { }
+		@{-1-}
+		class Some { }
 	**/
 	function testCompletion() {
 		eq(true, hasPath(fields(pos(1)), "@:generic"));
 	}
 
 	/**
-	@{-1-}:{-2-}
-	class Some { }
+		@{-1-}:{-2-}
+		class Some { }
 	**/
 	function testCompletion2() {
 		eq(true, hasPath(fields(pos(1)), "@:generic"));
@@ -19,8 +19,8 @@ class Metadata extends DisplayTestCase {
 	}
 
 	/**
-	@{-1-}:{-2-}gen{-3-}oric
-	class Some { }
+		@{-1-}:{-2-}gen{-3-}oric
+		class Some { }
 	**/
 	function testCompletion3() {
 		eq(true, hasPath(fields(pos(1)), "@:generic"));
@@ -29,38 +29,37 @@ class Metadata extends DisplayTestCase {
 	}
 
 	/**
-	@:gen{-1-}eric
-	class Some { }
+		@:gen{-1-}eric
+		class Some { }
 	**/
 	function testHover() {
-		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field", metadataDoc(pos(1)));
+		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field.", metadataDoc(pos(1)));
 	}
 
 	/**
-	{-1-}class SomeOther { }{-2-}
+		class {-1-}SomeOther{-2-} { }
 
-	@:myMeta(Som{-3-}eOther)
-	class Some { }
+		@:myMeta(Som{-3-}eOther)
+		class Some { }
 	**/
 	function testArgs() {
 		eq(range(1, 2), position(pos(3)));
 		eq("Class<cases.SomeOther>", type(pos(3)));
 	}
 
-
 	/**
-	class Main {
-		public static function main() { @{-1-} }
-	}
+		class Main {
+			public static function main() { @{-1-} }
+		}
 	**/
 	function testExpression1() {
 		eq(true, hasPath(fields(pos(1)), "@:generic"));
 	}
 
 	/**
-	class Main {
-		public static function main() { @{-1-}:{-2-} }
-	}
+		class Main {
+			public static function main() { @{-1-}:{-2-} }
+		}
 	**/
 	function testExpression2() {
 		eq(true, hasPath(fields(pos(1)), "@:generic"));
@@ -68,9 +67,9 @@ class Metadata extends DisplayTestCase {
 	}
 
 	/**
-	class Main {
-		public static function main() { @{-1-}:{-2-}gene{-3-}ric }
-	}
+		class Main {
+			public static function main() { @{-1-}:{-2-}gene{-3-}ric }
+		}
 	**/
 	function testExpression3() {
 		eq(true, hasPath(fields(pos(1)), "@:generic"));
@@ -79,9 +78,9 @@ class Metadata extends DisplayTestCase {
 	}
 
 	/**
-	class Main {
-		public static function main() { @{-1-}:{-2-}gene{-3-}ric null; }
-	}
+		class Main {
+			public static function main() { @{-1-}:{-2-}gene{-3-}ric null; }
+		}
 	**/
 	function testExpression4() {
 		eq(true, hasPath(fields(pos(1)), "@:generic"));
@@ -90,24 +89,24 @@ class Metadata extends DisplayTestCase {
 	}
 
 	/**
-	class Main {
-		public static function main() { @{-1-}:{-2-}gene{-3-}ric }
-	}
+		class Main {
+			public static function main() { @{-1-}:{-2-}gene{-3-}ric }
+		}
 	**/
 	function testExpression5() {
-		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field", metadataDoc(pos(1)));
-		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field", metadataDoc(pos(2)));
-		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field", metadataDoc(pos(3)));
+		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field.", metadataDoc(pos(1)));
+		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field.", metadataDoc(pos(2)));
+		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field.", metadataDoc(pos(3)));
 	}
 
 	/**
-	class Main {
-		public static function main() { @{-1-}:{-2-}gene{-3-}ric null; }
-	}
+		class Main {
+			public static function main() { @{-1-}:{-2-}gene{-3-}ric null; }
+		}
 	**/
 	function testExpression6() {
-		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field", metadataDoc(pos(1)));
-		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field", metadataDoc(pos(2)));
-		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field", metadataDoc(pos(3)));
+		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field.", metadataDoc(pos(1)));
+		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field.", metadataDoc(pos(2)));
+		eq("Marks a class or class field as generic so each type parameter combination generates its own type/field.", metadataDoc(pos(3)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Override.hx b/tests/display/src/cases/Override.hx
new file mode 100644
index 0000000000000000000000000000000000000000..424bf6b4577adaf34007d012d67accc8a4bf19ac
--- /dev/null
+++ b/tests/display/src/cases/Override.hx
@@ -0,0 +1,56 @@
+package cases;
+
+class Override extends DisplayTestCase {
+	/**
+		class Super {
+			public function test1() return 12;
+			public function test2() return 12;
+		}
+
+		class Main extends Super {
+			override function test1() { return 12; }
+			override {-1-}function x() { }
+		}
+	**/
+	function test1() {
+		var fields = fields(pos(1));
+		eq(true, hasField(fields, "test2", "Void -> Int"));
+		eq(false, hasField(fields, "test1", "Void -> Int"));
+	}
+
+	/**
+		class Super {
+			public function test1() return 12;
+			public function test2() return 12;
+		}
+
+		class Main extends Super {
+			override {-1-}function x() { }
+			override function test1() { return 12; }
+		}
+	**/
+	function test2() {
+		var fields = fields(pos(1));
+		eq(true, hasField(fields, "test2", "Void -> Int"));
+		eq(false, hasField(fields, "test1", "Void -> Int"));
+	}
+
+	/**
+		class SuperSuper {
+			public function test1() return 12;
+			public function test2() return 12;
+		}
+
+		class Super extends SuperSuper { }
+
+		class Main extends Super {
+			override function test1() { return 12; }
+			override {-1-}function x() { }
+		}
+	**/
+	function test3() {
+		var fields = fields(pos(1));
+		eq(true, hasField(fields, "test2", "Void -> Int"));
+		eq(false, hasField(fields, "test1", "Void -> Int"));
+	}
+}
diff --git a/tests/display/src/cases/PropertyAccessors.hx b/tests/display/src/cases/PropertyAccessors.hx
index 07f3a0ad59c8a526b66c49045ab2a4ad4f6ab92f..ce1bde8485fc6bc03baf7e75d6e033387807ddcb 100644
--- a/tests/display/src/cases/PropertyAccessors.hx
+++ b/tests/display/src/cases/PropertyAccessors.hx
@@ -2,19 +2,19 @@ package cases;
 
 class PropertyAccessors extends DisplayTestCase {
 	/**
-	class Main {
-		static var test(ge{-1-}t, se{-2-}t):String;
+		class Main {
+			static var test(ge{-1-}t, se{-2-}t):String;
 
-		static public {-3-}function get_test() return "foo"{-4-};
-		static public {-5-}function set_test(s:String) return s{-6-};
+			static public function {-3-}get_test{-4-}() return "foo";
+			static public function {-5-}set_test{-6-}(s:String) return s;
 
-		static function main() { }
-	}
+			static function main() { }
+		}
 	**/
 	function test() {
 		eq(range(3, 4), position(pos(1)));
 		eq(range(5, 6), position(pos(2)));
 		eq("Void -> String", type(pos(1)));
-		eq("s : String -> String", type(pos(2)));
+		eq("(s : String) -> String", type(pos(2)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Resuming.hx b/tests/display/src/cases/Resuming.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f521017ea19eef1ba6281dd53c1e96712873d69a
--- /dev/null
+++ b/tests/display/src/cases/Resuming.hx
@@ -0,0 +1,22 @@
+package cases;
+
+class Resuming extends DisplayTestCase {
+	/**
+		class {-1-}C1{-2-} { }
+		typedef TUnfinished = syntax gone wrong }]){[{.,-+*%/^&&||
+		class {-3-}C2{-4-} { }
+	**/
+	function testTypeResume1() {
+		eq(range(1, 2), position(pos(1)));
+		eq(range(3, 4), position(pos(3)));
+	}
+
+	/**
+		typedef TUnfinished = Arr{-1-}ay<{signatures: Ar{-2-}ray<St{-3-}ring
+	**/
+	function testAutoClose1() {
+		eq("Array<Array.T>", type(pos(1)));
+		eq("Array<Array.T>", type(pos(2)));
+		eq("String", type(pos(3)));
+	}
+}
diff --git a/tests/display/src/cases/Signature.hx b/tests/display/src/cases/Signature.hx
index 35d8c0550584d824d58c400a2cf0f6fba4f930fb..a6d77ac23a0e5ed844571d961cd8da9522159a3f 100644
--- a/tests/display/src/cases/Signature.hx
+++ b/tests/display/src/cases/Signature.hx
@@ -4,13 +4,13 @@ import SignatureHelp;
 
 class Signature extends DisplayTestCase {
 	/**
-	class Some {
-		function main() {
-			test({-1-}"foo"{-2-},{-3-}12{-4-})
-		}
+		class Some {
+			function main() {
+				test({-1-}"foo"{-2-},{-3-}12{-4-})
+			}
 
-		static function test(a:String, b:Int) { }
-	}
+			static function test(a:String, b:Int) { }
+		}
 	**/
 	function testGoodAst() {
 		sigEq(0, [["a:String", "b:Int"]], signature(pos(1)));
@@ -20,13 +20,13 @@ class Signature extends DisplayTestCase {
 	}
 
 	/**
-	class Some {
-		function main() {
-			test({-1-}"foo"{-2-}
-		}
+		class Some {
+			function main() {
+				test({-1-}"foo"{-2-}
+			}
 
-		static function test(a:String, b:Int) { }
-	}
+			static function test(a:String, b:Int) { }
+		}
 	**/
 	function testBadAst() {
 		sigEq(0, [["a:String", "b:Int"]], signature(pos(1)));
@@ -49,56 +49,71 @@ class Signature extends DisplayTestCase {
 	}
 
 	/**
-	class Some {
-		function main() {
-			test({-1-}
-		}
+		class Some {
+			function main() {
+				test({-1-}
+			}
 
-		@:overload(function (a:String, b:Bool):Void { })
-		static function test(a:String, b:Int) { }
-	}
+			@:overload(function (a:String, b:Bool):Void { })
+			static function test(a:String, b:Int) { }
+		}
 	**/
 	function testOverloads1() {
 		sigEq(0, [["a:String", "b:Bool"], ["a:String", "b:Int"]], signature(pos(1)));
 	}
 
 	/**
-	class Some {
-		function main() {
-			test("foo",{-1-}
-		}
+		class Some {
+			function main() {
+				test("foo",{-1-}
+			}
 
-		@:overload(function (a:String, b:Bool):Void { })
-		static function test(a:String, b:Int) { }
-	}
+			@:overload(function (a:String, b:Bool):Void { })
+			static function test(a:String, b:Int) { }
+		}
 	**/
 	function testOverloads2() {
 		sigEq(1, [["a:String", "b:Bool"], ["a:String", "b:Int"]], signature(pos(1)));
 	}
 
 	/**
-	class Some {
-		function main() {
-			test("foo", 12{-1-}
-		}
+		class Some {
+			function main() {
+				test("foo", 12{-1-}
+			}
 
-		@:overload(function (a:String, b:Bool):Void { })
-		static function test(a:String, b:Int) { }
-	}
+			@:overload(function (a:String, b:Bool):Void { })
+			static function test(a:String, b:Int) { }
+		}
 	**/
 	function testOverloads3() {
 		sigEq(1, [["a:String", "b:Int"]], signature(pos(1)));
 	}
 
 	/**
-	class Some {
-		function main() {
-			test({-1-} {-2-}
-			var x = 12;
-		}
+		class Some {
+			function main() {
+				q({-1-})
+			}
 
-		static function test(a:String, b:Int) { }
+			@:overload(function():Void {})
+			@:overload(function(foo:Int, bar:Int):Void {})
+			static function q(foo:Int) {}
+		}
+	**/
+	function testOverloads4() {
+		sigEq(0, [[], ["foo:Int", "bar:Int"], ["foo:Int"]], signature(pos(1)));
 	}
+
+	/**
+		class Some {
+			function main() {
+				test({-1-} {-2-}
+				var x = 12;
+			}
+
+			static function test(a:String, b:Int) { }
+		}
 	**/
 	function testInsert1() {
 		sigEq(0, [["a:String", "b:Int"]], signature(pos(1)));
@@ -106,14 +121,14 @@ class Signature extends DisplayTestCase {
 	}
 
 	/**
-	class Some {
-		function main() {
-			test("foo",{-1-} {-2-}
-			var x = 12;
-		}
+		class Some {
+			function main() {
+				test("foo",{-1-} {-2-}
+				var x = 12;
+			}
 
-		static function test(a:String, b:Int) { }
-	}
+			static function test(a:String, b:Int) { }
+		}
 	**/
 	function testInsert2() {
 		sigEq(1, [["a:String", "b:Int"]], signature(pos(1)));
@@ -121,20 +136,20 @@ class Signature extends DisplayTestCase {
 	}
 
 	/**
-	class SomeBase {
-		function new(a:Bool, b:Float) { }
-	}
-
-	class Some extends SomeBase {
-		function new(a:String, b:Int) {
-			super({-1-});
-			super(true, 1{-2-});
+		class SomeBase {
+			function new(a:Bool, b:Float) { }
 		}
 
-		static function main() {
-			new Some({-3-}"fo{-4-}o"{-5-},{-6-} {-7-}12{-8-});
+		class Some extends SomeBase {
+			function new(a:String, b:Int) {
+				super({-1-});
+				super(true, 1{-2-});
+			}
+
+			static function main() {
+				new Some({-3-}"fo{-4-}o"{-5-},{-6-} {-7-}12{-8-});
+			}
 		}
-	}
 	**/
 	function testConstructorGood() {
 		sigEq(0, [["a:Bool", "b:Float"]], signature(pos(1)));
@@ -148,41 +163,73 @@ class Signature extends DisplayTestCase {
 	}
 
 	/**
-	class Some {
-		function new(a:String, b:Int) { }
+		class Some {
+			function new(a:String, b:Int) { }
 
-		static function main() {
-			new Some({-1-}
+			static function main() {
+				new Some({-1-}
+			}
 		}
-	}
 	**/
 	function testConstructorBad() {
 		sigEq(0, [["a:String", "b:Int"]], signature(pos(1)));
 	}
 
 	/**
-	class Some {
-		static function main() {
-			test(test({-1-}
-		}
+		class Some {
+			static function main() {
+				test(test({-1-}
+			}
 
-		static function test(a:String, b:Int) { }
-	}
+			static function test(a:String, b:Int) { }
+		}
 	**/
 	function testNested() {
 		sigEq(0, [["a:String", "b:Int"]], signature(pos(1)));
 	}
 
-	function sigEq(arg:Int, params:Array<Array<String>>, sig:SignatureHelp, ?pos:haxe.PosInfos) {
-		eq(arg, sig.activeParameter, pos);
-		eq(params.length, sig.signatures.length, pos);
-		for (i in 0...params.length) {
-			var sigInf = sig.signatures[i];
-			var args = params[i];
-			eq(sigInf.parameters.length, args.length, pos);
-			for (i in 0...args.length) {
-				eq(sigInf.parameters[i].label, args[i], pos);
+	/**
+		class Some {
+			static function main() {
+				test2(test({-1-}
 			}
+
+			static function test(a:String, b:Int) { }
+			static function test2(a:Int, b:String) { }
 		}
+	**/
+	function testNestedNotPointless() {
+		sigEq(0, [["a:String", "b:Int"]], signature(pos(1)));
 	}
-}
\ No newline at end of file
+
+	/**
+		class Main {
+
+			static function main() {
+				lotsOfArgs({-1-}  "f{-2-}oo" {-3-} {-4-},{-5-}  12{-6-},{-7-} {-8-}   {-9-},{-10-} {-11-} [{-12-}]{-13-},{-14-}
+
+		{-15-}
+			}
+
+			static function lotsOfArgs(a:String, b:Int, c:Bool, d:Array<Int>, e:Dynamic) { }
+		}
+	**/
+	function testBroken() {
+		var sig = [["a:String", "b:Int", "c:Bool", "d:Array<Int>", "e:Dynamic"]];
+		sigEq(0, sig, signature(pos(1)));
+		sigEq(0, sig, signature(pos(2)));
+		sigEq(0, sig, signature(pos(3)));
+		sigEq(0, sig, signature(pos(4)));
+		sigEq(1, sig, signature(pos(5)));
+		sigEq(1, sig, signature(pos(6)));
+		sigEq(2, sig, signature(pos(7)));
+		sigEq(2, sig, signature(pos(8)));
+		sigEq(2, sig, signature(pos(9)));
+		sigEq(3, sig, signature(pos(10)));
+		sigEq(3, sig, signature(pos(11)));
+		sigEq(3, sig, signature(pos(12)));
+		sigEq(3, sig, signature(pos(13)));
+		sigEq(4, sig, signature(pos(14)));
+		sigEq(4, sig, signature(pos(15)));
+	}
+}
diff --git a/tests/display/src/cases/StaticExtension.hx b/tests/display/src/cases/StaticExtension.hx
new file mode 100644
index 0000000000000000000000000000000000000000..974a295203bfa30560ace1f054c3724153219f51
--- /dev/null
+++ b/tests/display/src/cases/StaticExtension.hx
@@ -0,0 +1,70 @@
+package cases;
+
+class StaticExtension extends DisplayTestCase {
+	/**
+
+		using cases.StaticExtension.MyStaticExtension;
+		class Something {
+			static function test() {
+				var map = ["a" => 1];
+				map.{-1-}
+			}
+		}
+
+		class MyStaticExtension {
+			static public function doSomething(sm:haxe.ds.StringMap<Int>):Void { }
+			static public function doSomethingElse(sm:Map<String, Int>):Void { }
+		}
+
+	**/
+	function test1() {
+		var fields = fields(pos(1));
+		eq(true, hasField(fields, "doSomething", "Void -> Void"));
+		eq(true, hasField(fields, "doSomethingElse", "Void -> Void"));
+	}
+
+	/**
+
+		using cases.StaticExtension.MyStaticExtension;
+		class Something {
+			static function test() {
+				var map = new haxe.ds.StringMap();
+				map.{-1-}
+			}
+		}
+
+		class MyStaticExtension {
+			static public function doSomething(sm:haxe.ds.StringMap<Int>):Void { }
+			static public function doSomethingElse(sm:Map<String, Int>):Void { }
+		}
+
+	**/
+	function test2() {
+		var fields = fields(pos(1));
+		eq(true, hasField(fields, "doSomething", "Void -> Void"));
+		eq(true, hasField(fields, "doSomethingElse", "Void -> Void"));
+	}
+
+	/**
+		using cases.StaticExtension;
+
+		class Overload1 {
+			public static function test(o:String):Void { }
+		}
+
+		class Overload2 {
+			public static function test(o:String, i:Int):Void { }
+		}
+
+		class Main {
+			static public function main() {
+				"".{-1-}
+			}
+		}
+	**/
+	function testIssue8584() {
+		var fields = fields(pos(1));
+		eq(true, hasField(fields, "test", "(i : Int) -> Void"));
+		eq(false, hasField(fields, "test", "() -> Void"));
+	}
+}
diff --git a/tests/display/src/cases/StructureCompletion.hx b/tests/display/src/cases/StructureCompletion.hx
index 5345458e5576510768111b7d6717a3efe897b1b8..e06f48e575ed8c8649cf73a6443c85857603ddf3 100644
--- a/tests/display/src/cases/StructureCompletion.hx
+++ b/tests/display/src/cases/StructureCompletion.hx
@@ -2,7 +2,7 @@ package cases;
 
 class StructureCompletion extends DisplayTestCase {
 	/**
-	var o:{a:Float, b:String} = {{-1-}
+		var o:{a:Float, b:String} = {{-1-}
 	**/
 	@:funcCode function testStructureCompletion1() {
 		eq(true, hasField(fields(pos(1)), "a", "Float"));
@@ -10,7 +10,7 @@ class StructureCompletion extends DisplayTestCase {
 	}
 
 	/**
-	var x, o:{a:Float, b:String} = {{-1-}
+		var x, o:{a:Float, b:String} = {{-1-}
 	**/
 	@:funcCode function testStructureCompletion2() {
 		eq(true, hasField(fields(pos(1)), "a", "Float"));
@@ -18,8 +18,8 @@ class StructureCompletion extends DisplayTestCase {
 	}
 
 	/**
-	var o:{a:Float, b:String};
-	o = {{-1-}
+		var o:{a:Float, b:String};
+		o = {{-1-}
 	**/
 	@:funcCode function testStructureCompletion3() {
 		eq(true, hasField(fields(pos(1)), "a", "Float"));
@@ -27,13 +27,13 @@ class StructureCompletion extends DisplayTestCase {
 	}
 
 	/**
-	class Main {
-		static function main () {
-			test({{-1-}
-		}
+		class Main {
+			static function main () {
+				test({{-1-}
+			}
 
-		static function test(o:{a:Float, b:String}) { }
-	}
+			static function test(o:{a:Float, b:String}) { }
+		}
 	**/
 	function testStructureCompletion4() {
 		eq(true, hasField(fields(pos(1)), "a", "Float"));
@@ -41,16 +41,168 @@ class StructureCompletion extends DisplayTestCase {
 	}
 
 	/**
-	class Main {
-		static function main () {
-			test(0, {{-1-}
-		}
+		class Main {
+			static function main () {
+				test(0, {{-1-}
+			}
 
-		static function test(x, o:{a:Float, b:String}) { }
-	}
+			static function test(x, o:{a:Float, b:String}) { }
+		}
 	**/
 	function testStructureCompletion5() {
 		eq(true, hasField(fields(pos(1)), "a", "Float"));
 		eq(true, hasField(fields(pos(1)), "b", "String"));
 	}
-}
\ No newline at end of file
+
+	/**
+		typedef T = Dynamic;
+		class Main {
+			static function main () {{-1-}
+	**/
+	function testStructureVsToplevel1() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "T"));
+	}
+
+	/**
+		typedef T = Dynamic;
+		class Main {
+			static function main () { {-1-}
+	**/
+	function testStructureVsToplevel2() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "T"));
+	}
+
+	/**
+		typedef T = Dynamic;
+		class Main {
+			static function main () {{-1-}
+			}
+	**/
+	function testStructureVsToplevel3() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "T"));
+	}
+
+	/**
+		typedef T = Dynamic;
+		class Main {
+			static function main () { {-1-}
+			}
+	**/
+	function testStructureVsToplevel4() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "T"));
+	}
+
+	/**
+		typedef Foo = {
+			var a:Int;
+			var b:String;
+		}
+		class Main {
+			static function main () {
+				var foo:Foo = {{-1-}
+
+	**/
+	function testStructureVsToplevel5() {
+		var fields = fields(pos(1));
+		eq(false, hasField(fields, "type", "T"));
+		eq(true, hasField(fields, "a", "Int"));
+		eq(true, hasField(fields, "b", "String"));
+	}
+
+	/**
+		typedef Foo = {
+			var a:Int;
+			var b:String;
+		}
+		class Main {
+			static function main () {
+				var foo:Foo = { {-1-}
+
+	**/
+	function testStructureVsToplevel6() {
+		var fields = fields(pos(1));
+		eq(false, hasField(fields, "type", "T"));
+		eq(true, hasField(fields, "a", "Int"));
+		eq(true, hasField(fields, "b", "String"));
+	}
+
+	/**
+		typedef Foo = {
+			var a:Int;
+			var b:String;
+		}
+		class Main {
+			static function main () {
+				var foo:Foo = {{-1-}
+				}
+
+	**/
+	function testStructureVsToplevel7() {
+		var fields = fields(pos(1));
+		eq(false, hasField(fields, "type", "T"));
+		eq(true, hasField(fields, "a", "Int"));
+		eq(true, hasField(fields, "b", "String"));
+	}
+
+	/**
+		typedef Foo = {
+			var a:Int;
+			var b:String;
+		}
+		class Main {
+			static function main () {
+				var foo:Foo = { {-1-}
+				}
+
+	**/
+	function testStructureVsToplevel8() {
+		var fields = fields(pos(1));
+		eq(false, hasField(fields, "type", "T"));
+		eq(true, hasField(fields, "a", "Int"));
+		eq(true, hasField(fields, "b", "String"));
+	}
+
+	/**
+		typedef Foo = {
+			var field1:Int;
+			var field2:String;
+		}
+		class Main {
+			static function test1():Foo return { f{-1-}ie{-2-}
+			static function test2():Foo return { f{-3-}ie{-4-}:
+			static function test3():Foo return { f{-5-}ie{-6-} }
+			static function test4():Foo return { f{-7-}ie{-8-} : }
+			static function test5():Foo return { f{-9-}ie{-10-} : null }
+			static function test6():Foo return { f{-11-}ie{-12-} : null
+	**/
+	function testStructureVsToplevel9() {
+		for (i in 1...13) {
+			var fields = fields(pos(i));
+			eq(false, hasField(fields, "type", "T"));
+			eq(true, hasField(fields, "field1", "Int"));
+			eq(true, hasField(fields, "field2", "String"));
+		}
+	}
+
+	/**
+		typedef Foo = {
+			var field1:Int;
+			var field2:String;
+		}
+		class Main {
+			static function test1():Foo return { field1: 1, f{-1-}ie{-2-}
+			static function test2():Foo return { field1: 1, f{-3-}ie{-4-}:
+			static function test3():Foo return { field1: 1, f{-5-}ie{-6-} }
+			static function test4():Foo return { field1: 1, f{-7-}ie{-8-} : }
+			static function test5():Foo return { field1: 1, f{-9-}ie{-10-} : null }
+			static function test6():Foo return { field1: 1, f{-11-}ie{-12-} : null
+	**/
+	function testStructureVsToplevel10() {
+		for (i in 1...13) {
+			var fields = fields(pos(i));
+			eq(false, hasField(fields, "type", "T"));
+			eq(false, hasField(fields, "field1", "Int"));
+			eq(true, hasField(fields, "field2", "String"));
+		}
+	}
+}
diff --git a/tests/display/src/cases/Super.hx b/tests/display/src/cases/Super.hx
index 67cd85ec5fc14e8b48c08ef7c8cfc531f668be78..eb2d3f25caa46c8db0463e27cc7dacad3cfc3e09 100644
--- a/tests/display/src/cases/Super.hx
+++ b/tests/display/src/cases/Super.hx
@@ -2,14 +2,14 @@ package cases;
 
 class Super extends DisplayTestCase {
 	/**
-	class Base<T> {
-		public {-1-}function new() { }{-2-}
-	}
-	class Main extends Base<String> {
-		function new() {
-			{-4-}su{-3-}per(){-5-};
+		class Base<T> {
+			public function {-1-}new{-2-}() { }
+		}
+		class Main extends Base<String> {
+			function new() {
+				{-4-}su{-3-}per(){-5-};
+			}
 		}
-	}
 	**/
 	function testSuperCall() {
 		eq(range(1, 2), position(pos(3)));
@@ -18,14 +18,14 @@ class Super extends DisplayTestCase {
 	}
 
 	/**
-	{-1-}class Base<T> {
-		public {-4-}function test() { }{-5-}
-	}{-2-}
-	class Main extends Base<String> {
-		override function test() {
-			su{-3-}per.te{-6-}st();
+		class {-1-}Base{-2-}<T> {
+			public function {-4-}test{-5-}() { }
+		}
+		class Main extends Base<String> {
+			override function test() {
+				su{-3-}per.te{-6-}st();
+			}
 		}
-	}
 	**/
 	function testSuperField() {
 		eq(range(1, 2), position(pos(3)));
@@ -33,4 +33,4 @@ class Super extends DisplayTestCase {
 		eq(range(4, 5), position(pos(6)));
 		eq("Void -> Void", type(pos(6)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/Toplevel.hx b/tests/display/src/cases/Toplevel.hx
index 69d675fc025606d08630059c6690473249ffe9ce..86ef42ab40d77799b747f6eb77d440a93cb2ccc8 100644
--- a/tests/display/src/cases/Toplevel.hx
+++ b/tests/display/src/cases/Toplevel.hx
@@ -1,14 +1,15 @@
 package cases;
 
 import Types;
+
 using Lambda;
 
 class Toplevel extends DisplayTestCase {
 	/**
-	class Main {
-		static var myField;
-		static function main() {{-1-}
-			{-2-}
+		class Main {
+			static var myField:String;
+			static function main() {{-1-}
+				{-2-}
 	**/
 	function testToplevelResuming() {
 		eq(true, hasToplevel(toplevel(pos(1)), "static", "myField"));
@@ -16,12 +17,12 @@ class Toplevel extends DisplayTestCase {
 	}
 
 	/**
-	class Main {
-		static var myField;
-		static function main() {
-			{-1-}
-			var a = "foo";
-			{-2-}
+		class Main {
+			static var myField:String;
+			static function main() {
+				{-1-}
+				var a = "foo";
+				{-2-}
 	**/
 	function testToplevelScoping() {
 		var toplevel1 = toplevel(pos(1));
@@ -33,10 +34,10 @@ class Toplevel extends DisplayTestCase {
 	}
 
 	/**
-	class Main {
-		static var myField;
-		static function main() {
-			var a:{-1-}
+		class Main {
+			static var myField:String;
+			static function main() {
+				var a:{-1-}
 	**/
 	function testTypeCompletionLocal() {
 		var typesCompletion = toplevel(pos(1));
@@ -47,8 +48,8 @@ class Toplevel extends DisplayTestCase {
 	}
 
 	/**
-	class Main {
-		var a:{-1-}
+		class Main {
+			var a:{-1-}
 	**/
 	function testTypeCompletionField() {
 		var typesCompletion = toplevel(pos(1));
@@ -58,8 +59,8 @@ class Toplevel extends DisplayTestCase {
 	}
 
 	/**
-	class Main {
-		static function f(a:{-1-})
+		class Main {
+			static function f(a:{-1-})
 	**/
 	function testTypeCompletionArgument() {
 		// TODO: this currently doesn't work if there's no closing paren for function arguments
@@ -70,7 +71,7 @@ class Toplevel extends DisplayTestCase {
 	}
 
 	/**
-	var a = function(a:{-1-}
+		var a = function(a:{-1-}
 	**/
 	@:funcCode function testTypeCompletionArgumentLocal() {
 		var typesCompletion = toplevel(pos(1));
@@ -79,7 +80,7 @@ class Toplevel extends DisplayTestCase {
 	}
 
 	/**
-	import {-1-}
+		import {-1-}
 	**/
 	function testTypeCompletionImport() {
 		var typesCompletion = toplevel(pos(1));
@@ -88,7 +89,7 @@ class Toplevel extends DisplayTestCase {
 	}
 
 	/**
-	using {-1-}
+		using {-1-}
 	**/
 	function testTypeCompletionUsing() {
 		var typesCompletion = toplevel(pos(1));
@@ -97,27 +98,30 @@ class Toplevel extends DisplayTestCase {
 	}
 
 	/**
-	class C extends {-1-} {
+		class C0 { }
+		class C extends {-1-} {
 	**/
 	function testTypeCompletionExtends() {
 		// TODO: this currently doesn't work if there's no token after extends
 		var typesCompletion = toplevel(pos(1));
-		eq(true, hasToplevel(typesCompletion, "type", "Array"));
-		eq(true, hasToplevel(typesCompletion, "package", "haxe"));
+		eq(true, hasToplevel(typesCompletion, "type", "C0"));
+		// eq(true, hasToplevel(typesCompletion, "package", "haxe"));
 	}
 
 	/**
-	class C implements {-1-} {
+		class C implements {-1-} {
 	**/
 	function testTypeCompletionImplements() {
 		// TODO: this currently doesn't work if there's no token after implements
-		var typesCompletion = toplevel(pos(1));
-		eq(true, hasToplevel(typesCompletion, "type", "Array"));
-		eq(true, hasToplevel(typesCompletion, "package", "haxe"));
+		// NOTE: This test is invalid, we only show interfaces after `implements`
+		// var typesCompletion = toplevel(pos(1));
+		// eq(true, hasToplevel(typesCompletion, "type", "Array"));
+		// eq(true, hasToplevel(typesCompletion, "package", "haxe"));
+		eq(true, true); // TODO
 	}
 
 	/**
-	typedef T = {a:{-1-}}
+		typedef T = {a:{-1-}}
 	**/
 	function testTypeCompletionStructureField() {
 		// TODO: this currently doesn't work if there's no token after the completion position
@@ -127,7 +131,7 @@ class Toplevel extends DisplayTestCase {
 	}
 
 	/**
-	var a:{a:{-1-}
+		var a:{a:{-1-}
 	**/
 	@:funcCode function testTypeCompletionStructureFieldAsType() {
 		var typesCompletion = toplevel(pos(1));
@@ -136,7 +140,7 @@ class Toplevel extends DisplayTestCase {
 	}
 
 	/**
-	Xml.parse({-1-}
+		Xml.parse({-1-}
 	**/
 	@:funcCode function testIssue5969() {
 		var typesCompletion = toplevel(pos(1));
@@ -144,7 +148,217 @@ class Toplevel extends DisplayTestCase {
 		eq(true, hasToplevel(typesCompletion, "package", "haxe"));
 	}
 
-	public static function hasToplevel(a:Array<ToplevelElement>, kind:String, name:String):Bool {
-		return a.exists(function(t) return t.kind == kind && t.name == name);
+	/**
+		class Main<ClassT> {
+			static var myField:String;
+			static function main<FieldT>() {
+				{-1-}
+			}
+
+			function field<FieldT2>() {
+				{-2-}
+			}
+	**/
+	function testTypeParameters() {
+		eq(true, hasToplevel(toplevel(pos(1)), "type", "FieldT"));
+		eq(false, hasToplevel(toplevel(pos(1)), "type", "ClassT"));
+		eq(true, hasToplevel(toplevel(pos(2)), "type", "ClassT"));
+		eq(false, hasToplevel(toplevel(pos(2)), "type", "FieldT"));
+		eq(true, hasToplevel(toplevel(pos(2)), "type", "FieldT2"));
+	}
+
+	/**
+		import cases.Toplevel.E.a;
+
+		enum E {
+			a;
+		}
+
+		class Main {
+			static var a:Int;
+			function new(a) {
+				{-1-}
+			}
+
+			static function main() {
+			}
+		}
+	**/
+	function testDuplicates() {
+		var toplevels = toplevel(pos(1));
+		toplevels = toplevels.filter(function(t) return t.name == "a");
+		eq(1, toplevels.length);
+		eq("local", toplevels[0].kind);
+	}
+
+	/**
+		class Main {
+			static function main() {
+				{-1-}
+			}
+			@:noCompletion static function test() { }
+		}
+	**/
+	function testIssue6407() {
+		eq(false, hasToplevel(toplevel(pos(1)), "static", "test"));
+	}
+
+	/**
+		class Parent {
+			function parent() {
+				{-1-}
+			}
+		}
+		class Child extends Parent {
+			function child() {
+				{-2-}
+			}
+		}
+	**/
+	function testThisSuper() {
+		eq(true, hasToplevel(toplevel(pos(1)), "literal", "this"));
+		eq(false, hasToplevel(toplevel(pos(1)), "literal", "super"));
+
+		eq(true, hasToplevel(toplevel(pos(2)), "literal", "this"));
+		eq(true, hasToplevel(toplevel(pos(2)), "literal", "super"));
+	}
+
+	/**
+		class Main {
+			static function f(t:Type.ValueType) {}
+
+			public static function main() {
+				f({-1-}
+	**/
+	function testExpectedType1() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "enum", "TNull"));
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				var x:Type.ValueType = {-1-}
+	**/
+	function testExpectedType2() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "enum", "TNull"));
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				var x:Type.ValueType;
+				x = {-1-}
+	**/
+	function testExpectedType3() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "enum", "TNull"));
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				var x:{v:Type.ValueType} = {v: {-1-}};
+	**/
+	function testExpectedType4() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "enum", "TNull"));
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				var x:Array<Type.ValueType> = [{-1-}];
+	**/
+	function testExpectedType5() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "enum", "TNull"));
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				var x:Array<Type.ValueType> = [{-1-}
+	**/
+	function testExpectedType6() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "enum", "TNull"));
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				var x:Array<Type.ValueType> = [null, {-1-}
+	**/
+	function testExpectedType7() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "enum", "TNull"));
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				var x:Array<Type.ValueType> = [null, {-1-} ]
+	**/
+	function testExpectedType8() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "enum", "TNull"));
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				var x:Type.ValueType = {-1-}
+
+				trace("ok");
+	**/
+	function testExpectedType9() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "enum", "TNull"));
+	}
+
+	/**
+		class Main {
+			public static function main() {
+				var x:Type.ValueType;
+				x = {-1-}
+
+				trace("ok");
+	**/
+	function testExpectedType10() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "enum", "TNull"));
+	}
+
+	/**
+		class Main {
+			static function main() {
+				for (foo in 0...10){-1-}
+					{-2-}
+			}
+		}
+	**/
+	function testBokenAST1() {
+		var fields = toplevel(pos(1));
+		eq(true, hasToplevel(fields, "local", "foo"));
+	}
+
+	/**
+		class C1<T> {
+			public function f1(t:T) { }
+		}
+
+		class C2<T> extends C1<T> { }
+
+		class C3 extends C2<String> {
+			function f2() {
+				{-1-}
+			}
+		}
+	**/
+	function testTypeParameterApplication() {
+		var toplevel = toplevel(pos(1));
+		eq(true, hasToplevel(toplevel, "member", "f1", "(t : String) -> Void"));
 	}
 }
diff --git a/tests/display/src/cases/Type.hx b/tests/display/src/cases/Type.hx
index eff3922337c75a0157a313d2aa2e551346f465d4..6f029965cbc98cb9c719b1f34c718090aaee915e 100644
--- a/tests/display/src/cases/Type.hx
+++ b/tests/display/src/cases/Type.hx
@@ -2,9 +2,9 @@ package cases;
 
 class Type extends DisplayTestCase {
 	/**
-	abstract A{-1-}(Int) {}
+		abstract {-1-}A(Int) {}
 	**/
 	function testAbstractDecl() {
 		eq("cases.A", type(pos(1)));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/display/src/cases/TypeHints.hx b/tests/display/src/cases/TypeHints.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9e55b4c3af4831cd96d0608bed4500b79b74ec8c
--- /dev/null
+++ b/tests/display/src/cases/TypeHints.hx
@@ -0,0 +1,83 @@
+package cases;
+
+class TypeHints extends DisplayTestCase {
+	/**
+		typedef T1 = {-12-}T{-4-}2{-13-};
+		typedef T{-3-}2 = {-10-}C{-2-}1{-11-};
+		class C{-1-}1 { }
+	**/
+	function testTypedef1() {
+		arrayEq([range(12, 13)], usage(pos(3)));
+		arrayEq([range(12, 13)], usage(pos(4)));
+		arrayEq([range(10, 11)], usage(pos(1)));
+		arrayEq([range(10, 11)], usage(pos(2)));
+	}
+
+	/**
+		typedef T1 = {
+			var f1:{-10-}C{-1-}1{-11-};
+			var f2:{-12-}C1{-13-};
+		}
+
+		class C{-2-}1 { }
+	**/
+	function testStructure1() {
+		arrayEq([range(10, 11), range(12, 13)], usage(pos(1)));
+		arrayEq([range(10, 11), range(12, 13)], usage(pos(2)));
+	}
+
+	/**
+		enum E1 {
+			C1(c:{-10-}C{-1-}1{-11-});
+			C2(c:Int, d:{-12-}C{-2-}1{-13-});
+		}
+
+		class C{-3-}1 { }
+	**/
+	function testEnum1() {
+		arrayEq([range(10, 11), range(12, 13)], usage(pos(1)));
+		arrayEq([range(10, 11), range(12, 13)], usage(pos(2)));
+		arrayEq([range(10, 11), range(12, 13)], usage(pos(3)));
+	}
+
+	/**
+		abstract A1({-10-}C{-1-}1{-11-}) from {-12-}C{-2-}1{-13-} to {-14-}C{-3-}1{-15-} { }
+
+		class C{-4-}1 { }
+	**/
+	function testAbstract1() {
+		arrayEq([range(10, 11), range(12, 13), range(14, 15)], usage(pos(1)));
+		arrayEq([range(10, 11), range(12, 13), range(14, 15)], usage(pos(2)));
+		arrayEq([range(10, 11), range(12, 13), range(14, 15)], usage(pos(3)));
+		arrayEq([range(10, 11), range(12, 13), range(14, 15)], usage(pos(4)));
+	}
+
+	/**
+		class C{-1-}1 {
+			static function test(c:{-10-}C{-2-}1{-11-}):{-12-}C{-3-}1{-13-} { }
+		}
+	**/
+	function testFunction1() {
+		arrayEq([range(10, 11), range(12, 13)], usage(pos(1)));
+		arrayEq([range(10, 11), range(12, 13)], usage(pos(2)));
+		arrayEq([range(10, 11), range(12, 13)], usage(pos(3)));
+	}
+
+	/**
+		class C{-1-}1 { }
+		class C2 extends {-10-}C{-2-}1{-11-} { }
+	**/
+	function testClass1() {
+		arrayEq([range(10, 11)], usage(pos(1)));
+		arrayEq([range(10, 11)], usage(pos(2)));
+	}
+
+	/**
+		interface I{-1-}1 { }
+		class C2 implements {-10-}I{-2-}1{-11-} { }
+	**/
+	function testInterface1() {
+		arrayEq([range(10, 11)], usage(pos(1)));
+		arrayEq([range(10, 11)], usage(pos(2)));
+	}
+}
diff --git a/tests/display/src/cases/VsHaxeIssue198.hx b/tests/display/src/cases/VsHaxeIssue198.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6e743d6d7fd3c4ead5a93ad136793fa2368f58cb
--- /dev/null
+++ b/tests/display/src/cases/VsHaxeIssue198.hx
@@ -0,0 +1,13 @@
+package cases;
+
+class VsHaxeIssue198 extends DisplayTestCase {
+	/**
+		'foo.{-1-}${"foo.{-2-}".{-3-}}';
+	**/
+	@:funcCode function test() {
+		// TODO
+		// eq(true, noCompletionPoint(fields.bind(pos(1))));
+		// eq(true, noCompletionPoint(fields.bind(pos(2))));
+		eq(true, hasField(fields(pos(3)), "length", "Int"));
+	}
+}
diff --git a/tests/display/src/cases/_issue5417/Issue5417.hx b/tests/display/src/cases/_issue5417/Issue5417.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0ebcde059ac02193fd432a68d68595ffcd2d8c7d
--- /dev/null
+++ b/tests/display/src/cases/_issue5417/Issue5417.hx
@@ -0,0 +1,15 @@
+package cases._issue5417;
+
+class Issue5417 extends DisplayTestCase {
+	/**
+		class Main {
+			static var str:String;
+			public static function main() {
+				Main.{-1-}
+			}
+		}
+	**/
+	function test() {
+		eq(true, hasField(fields(pos(1)), "str", "String"));
+	}
+}
diff --git a/tests/display/src/cases/import.hx b/tests/display/src/cases/import.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c4ba125bd3437baed05e5b322c79500b5fafd498
--- /dev/null
+++ b/tests/display/src/cases/import.hx
@@ -0,0 +1,3 @@
+package cases;
+
+// this is stupid
diff --git a/tests/display/src/import.hx b/tests/display/src/import.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6702d1e03be0da90ed14df2a50a8b33bb43cd232
--- /dev/null
+++ b/tests/display/src/import.hx
@@ -0,0 +1 @@
+import Diagnostic;
diff --git a/tests/display/src/misc/ModuleWithPrivateType.hx b/tests/display/src/misc/ModuleWithPrivateType.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d9ff243ab727b4b75f2ef8124fdcd240d8318d9d
--- /dev/null
+++ b/tests/display/src/misc/ModuleWithPrivateType.hx
@@ -0,0 +1,4 @@
+package misc;
+
+class PublicClass {}
+private class PrivateClass {}
diff --git a/tests/display/src/misc/issue7098/Bar.hx b/tests/display/src/misc/issue7098/Bar.hx
new file mode 100644
index 0000000000000000000000000000000000000000..28116d082b0e283a6acd05aa6d999d6afc51fc56
--- /dev/null
+++ b/tests/display/src/misc/issue7098/Bar.hx
@@ -0,0 +1,9 @@
+package misc.issue7098;
+
+enum abstract Foo(Int) {
+	var Value = 0;
+}
+
+class Bar {
+	public static function foo(f:Foo) {}
+}
diff --git a/tests/display/src/misc/issue7777/Foo.hx b/tests/display/src/misc/issue7777/Foo.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8ef9ebd7167856cd2a9d2fea9541fc48a1d3d346
--- /dev/null
+++ b/tests/display/src/misc/issue7777/Foo.hx
@@ -0,0 +1,11 @@
+package misc.issue7777;
+
+#if (eval || macro)
+import haxe.macro.Expr;
+#end
+
+abstract Foo<T>(T) {
+	@:from public static macro function fromThing<T>(e:ExprOf<Thing>):ExprOf<Foo<T>> {
+		return macro null;
+	}
+}
diff --git a/tests/display/src/misc/issue7777/Thing.hx b/tests/display/src/misc/issue7777/Thing.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4c6af82fbdf0e5510387b0d44a199254db70998a
--- /dev/null
+++ b/tests/display/src/misc/issue7777/Thing.hx
@@ -0,0 +1,5 @@
+package misc.issue7777;
+
+enum Thing {
+	BOO;
+}
diff --git a/tests/display/src/misc/issue7877/ProcessMacro.hx b/tests/display/src/misc/issue7877/ProcessMacro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d957b44876dde47e01abe41efb8ce715701d1dc2
--- /dev/null
+++ b/tests/display/src/misc/issue7877/ProcessMacro.hx
@@ -0,0 +1,40 @@
+package misc.issue7877;
+
+import haxe.macro.Expr;
+import haxe.macro.Context;
+
+class ProcessMacro {
+	public static macro function build():Array<Field> {
+		var fields = Context.getBuildFields();
+		var toInit = [
+			for (field in fields) {
+				switch (field) {
+					case {name: name, kind: FVar(t, e), access: [AFinal]}:
+						{name: name, type: t, def: e};
+					case _:
+						continue;
+				}
+			}
+		];
+
+		var args:Array<FunctionArg> = [];
+		var exprs = [];
+		for (init in toInit) {
+			args.push({
+				name: init.name,
+				opt: init.def != null,
+				type: init.type,
+				value: init.def
+			});
+			var n = init.name;
+			exprs.push(macro this.$n = $i{n});
+		}
+		fields.push({
+			pos: Context.currentPos(),
+			name: 'new',
+			access: [APublic],
+			kind: FFun({ret: null, args: args, expr: {pos: Context.currentPos(), expr: EBlock(exprs)}})
+		});
+		return fields;
+	}
+}
diff --git a/tests/display/src/misc/issue7877/ProcessedClass.hx b/tests/display/src/misc/issue7877/ProcessedClass.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2f8e571ee8695660c6403ab53d7df8e3f0671151
--- /dev/null
+++ b/tests/display/src/misc/issue7877/ProcessedClass.hx
@@ -0,0 +1,9 @@
+package misc.issue7877;
+
+@:build(misc.issue7877.ProcessMacro.build()) class ProcessedClass {
+	final foo:Bool; // = false;
+
+	function bar() {
+		trace(foo);
+	}
+}
diff --git a/tests/display/src/misc/issue7911/Test.hx b/tests/display/src/misc/issue7911/Test.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4b4252851664bb8578140a2f0443c8d73a435866
--- /dev/null
+++ b/tests/display/src/misc/issue7911/Test.hx
@@ -0,0 +1,2 @@
+package misc.issue7911;
+
diff --git a/tests/display/src/misc/issue7911/import.hx b/tests/display/src/misc/issue7911/import.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4b4252851664bb8578140a2f0443c8d73a435866
--- /dev/null
+++ b/tests/display/src/misc/issue7911/import.hx
@@ -0,0 +1,2 @@
+package misc.issue7911;
+
diff --git a/tests/echoServer/EchoServer.hx b/tests/echoServer/EchoServer.hx
new file mode 100644
index 0000000000000000000000000000000000000000..45004f7628c03527cecefa66f057ae803d5543c9
--- /dev/null
+++ b/tests/echoServer/EchoServer.hx
@@ -0,0 +1,6 @@
+class EchoServer {
+	static function main() {
+		Sys.print(neko.Web.getPostData());
+		Sys.sleep(0.3);
+	}
+}
\ No newline at end of file
diff --git a/tests/echoServer/build.hxml b/tests/echoServer/build.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..58edf5255ec9620a64ff9b9bbddfa8aa23388ed5
--- /dev/null
+++ b/tests/echoServer/build.hxml
@@ -0,0 +1,2 @@
+-main EchoServer
+-neko www/echoServer.n
\ No newline at end of file
diff --git a/tests/echoServer/www/crossdomain.xml b/tests/echoServer/www/crossdomain.xml
new file mode 100644
index 0000000000000000000000000000000000000000..03ada61ec17f74c0d93398066650199056e7d8e4
--- /dev/null
+++ b/tests/echoServer/www/crossdomain.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">
+<cross-domain-policy>
+	<site-control permitted-cross-domain-policies="master-only" />
+	<allow-access-from domain="*" to-ports="*" secure="false"/>
+	<allow-http-request-headers-from domain="*" headers="*"/>
+</cross-domain-policy>
\ No newline at end of file
diff --git a/tests/misc/README.md b/tests/misc/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..53a3f126a970597ecc1f716981a958ad5d6715d7
--- /dev/null
+++ b/tests/misc/README.md
@@ -0,0 +1,31 @@
+# Miscellaneous Tests
+
+## Projects
+
+`tests/misc/projects` contains directories with haxe projects, which are executed on CI one by one separately during the execution of a macro test suite.
+
+Each project should contain `compile.hxml` and/or `compile-fail.hxml`. Test suite will look for those files and supply them to Haxe compiler.
+
+If `compile.hxml` was found and `haxe compile.hxml` finished with exit code `0` then a test is considered successful.
+
+If `compile-fail.hxml` was found then `haxe compile-fail.hxml` is executed and stderr of that command is compared to the contents of `compile-fail.hxml.stderr` file located alongside `compile-fail.hxml`. And if stderr content matches `compile-fail.hxml.stderr` then a test is considered successful.
+
+Multiple tests could be executed within a single project directory. Just postfix `hxml` files with a number like these:
+- `compile1.hxml`
+- `compile2.hxml`
+- `compile1-fail.hxml` and `compile1-fail.hxml.stderr`
+- `compile2-fail.hxml` and `compile2-fail.hxml.stderr`
+
+### Running `project` tests locally
+
+Chdir to `tests/misc` and run `haxe compile.hxml`.
+
+To run tests only for a single project use the following command: `haxe -D MISC_TEST_FILTER=1234 compile.hxml`, where `1234` are taken from the project directory name `Issue1234`.
+
+### Running target specific projects locally
+
+Tests specific to some targets (python, cs) reside in their own separate folder (respectively `tests/misc/python` and `tests/misc/cs`).
+
+Chdir to `tests/misc/{target}` and run `haxe run.hxml` to run these tests.
+
+To run tests only for a single project use the following command: `haxe -D MISC_TEST_FILTER=1234 run.hxml`, where `1234` are taken from the project directory name `Issue1234`.
diff --git a/tests/misc/compile.hxml b/tests/misc/compile.hxml
index 93ebe20e1baf5b96d30c93c6036233ebc78392ad..b0e2e03b51522d46f66f8b26378146d38f918ab8 100644
--- a/tests/misc/compile.hxml
+++ b/tests/misc/compile.hxml
@@ -1,3 +1,3 @@
--cp src
-#-D MISC_TEST_FILTER=3802
+-p src
+# -D MISC_TEST_FILTER=6790
 --run Main
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5189/Main.hx b/tests/misc/compiler_loops/projects/Issue5189/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..92bf361c637e091d397c995e7283c6c1bf0925ae
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5189/Main.hx
@@ -0,0 +1,20 @@
+typedef TT_A = {
+    a : Int,
+    b : String,
+    c : Array<TT_A>
+}
+
+typedef TT_B = {
+    a : Int,
+    b : String,
+    c : Array<TT_B>,
+    d : Float
+}
+class Main {
+
+    static var tt_a : TT_A = { a:1, b:"", c: []};
+
+    static function main(){
+        var ttb:TT_B = tt_a;
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5189/compile-fail.hxml b/tests/misc/compiler_loops/projects/Issue5189/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5189/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5189/compile-fail.hxml.stderr b/tests/misc/compiler_loops/projects/Issue5189/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..58ef9b91b7e7f5be22817cde3e619c72eb783c96
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5189/compile-fail.hxml.stderr
@@ -0,0 +1,3 @@
+Main.hx:18: characters 9-29 : error: { c : Array<TT_A>, b : String, a : Int } has no field d
+Main.hx:18: characters 9-29 :  have: { c: Array<{ c, b, a }> }
+Main.hx:18: characters 9-29 :  want: { c: Array<TT_B> }
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5345/Main.hx b/tests/misc/compiler_loops/projects/Issue5345/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..37f6f84af9204daaa8c6316902410b4dbb725154
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5345/Main.hx
@@ -0,0 +1,5 @@
+typedef Issue5345 = Issue5345;
+
+class Main {
+	public static function main() {}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5345/Main2.hx b/tests/misc/compiler_loops/projects/Issue5345/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..08c0f9b366727f5a736c38c2f31f09d1125cfd24
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5345/Main2.hx
@@ -0,0 +1,6 @@
+typedef Issue5345<T> = Issue5345b<T>;
+typedef Issue5345b<T> = Issue5345<T>;
+
+class Main2 {
+	public static function main() {}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5345/Main3.hx b/tests/misc/compiler_loops/projects/Issue5345/Main3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0baebb1f111066f857bada161262e3a7069d059a
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5345/Main3.hx
@@ -0,0 +1,6 @@
+typedef Issue5345 = Issue5345b;
+typedef Issue5345b = Issue5345;
+
+class Main3 {
+	public static function main() {}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5345/compile-fail.hxml b/tests/misc/compiler_loops/projects/Issue5345/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5345/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5345/compile-fail.hxml.stderr b/tests/misc/compiler_loops/projects/Issue5345/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..7783500d5ce18b35f4aa5de3d01d39cc69d3971e
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5345/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:1: characters 1-30 : Recursive typedef is not allowed
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5345/compile2-fail.hxml b/tests/misc/compiler_loops/projects/Issue5345/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5345/compile2-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5345/compile2-fail.hxml.stderr b/tests/misc/compiler_loops/projects/Issue5345/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..7783500d5ce18b35f4aa5de3d01d39cc69d3971e
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5345/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:1: characters 1-30 : Recursive typedef is not allowed
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5345/compile3-fail.hxml b/tests/misc/compiler_loops/projects/Issue5345/compile3-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5345/compile3-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5345/compile3-fail.hxml.stderr b/tests/misc/compiler_loops/projects/Issue5345/compile3-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..7783500d5ce18b35f4aa5de3d01d39cc69d3971e
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5345/compile3-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:1: characters 1-30 : Recursive typedef is not allowed
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5785/Main1.hx b/tests/misc/compiler_loops/projects/Issue5785/Main1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..82f465fbd6b66235a84670c8fa4a9573032276b5
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5785/Main1.hx
@@ -0,0 +1,16 @@
+typedef Observable<T> = {
+	function flatten<U>():Stream<U>;
+}
+
+typedef Stream<T> = {
+	function flatten<V>():Stream<V>;
+	function takeUntilBy<U>(otherObs:Observable<U>):Stream<U>;
+}
+
+class Main1 {
+
+	public static function main() {
+		var mouseMoves : Stream<Int> = null;
+		mouseMoves.takeUntilBy(mouseMoves);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5785/Main2.hx b/tests/misc/compiler_loops/projects/Issue5785/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..491cd08f9f7b710bda9a09b1d2eeba61fcee9040
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5785/Main2.hx
@@ -0,0 +1,10 @@
+typedef Stream<T> = {
+	function bufferWhileBy():Stream<Array<T>>;
+}
+
+class Main2 {
+	public static function main() {
+		var mouseMoves:Stream<Int> = null;
+		var i:Stream<Dynamic> = mouseMoves;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5785/Main3.hx b/tests/misc/compiler_loops/projects/Issue5785/Main3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..db18ca4069bc9a64c3eae3042c2d4b3c5d63cb9e
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5785/Main3.hx
@@ -0,0 +1,9 @@
+typedef Thenable<T> = {
+	function then<TOut>():Thenable<TOut>;
+}
+
+class Main3 {
+	static function main() {
+		({then: () -> null} : Thenable<String>);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5785/compile1.hxml b/tests/misc/compiler_loops/projects/Issue5785/compile1.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..834ce7f6e8d30e5199a2cb95df2371927f8a2d05
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5785/compile1.hxml
@@ -0,0 +1 @@
+-main Main1
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue5785/compile2.hxml b/tests/misc/compiler_loops/projects/Issue5785/compile2.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..27d6e39ab72cf90b00703d0d1323b0c0e760514b
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5785/compile2.hxml
@@ -0,0 +1 @@
+-main Main2
diff --git a/tests/misc/compiler_loops/projects/Issue5785/compile3.hxml b/tests/misc/compiler_loops/projects/Issue5785/compile3.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..3dab6fa2bb4a7c34403cec7d9a13ccda73121d48
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue5785/compile3.hxml
@@ -0,0 +1 @@
+-main Main3
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue6038/Main.hx b/tests/misc/compiler_loops/projects/Issue6038/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f7ab8f4fadd550afb12ecf2e3cb38fad088fe432
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue6038/Main.hx
@@ -0,0 +1,14 @@
+class Promise<T> {
+	public function then<TOut>():Promise<TOut> { return null; }
+}
+
+typedef Thenable<T> = {
+	function then():Thenable<T>;
+}
+
+class Main {
+	static function main() {
+		var p:Promise<Int> = null;
+		var t:Thenable<Int> = p;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue6038/compile.hxml b/tests/misc/compiler_loops/projects/Issue6038/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue6038/compile.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue7733/Main.hx b/tests/misc/compiler_loops/projects/Issue7733/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2636580d059d3fa8ba05cc4c7073cb9430072651
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue7733/Main.hx
@@ -0,0 +1,11 @@
+class Main{
+	public static function main(){}
+}
+
+typedef Recursive<T1> = {
+	public function rec<T2>(a:Recursive<T1>):Recursive<T2>;
+}
+
+class RecClass<T1> {
+	public function rec<T2>(a:Recursive<T1>):Recursive<T2> return a;
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue7733/compile.hxml b/tests/misc/compiler_loops/projects/Issue7733/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue7733/compile.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue8588/Main.hx b/tests/misc/compiler_loops/projects/Issue8588/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ae0a531a77c8ea6e70fa0c660add6d7bdf4622f8
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/Main.hx
@@ -0,0 +1,9 @@
+abstract Under<T>(T) {
+	@:from public static function from<T>(v:T) return v;
+}
+
+class Main {
+	static public function main() {
+		var a1:Under<{}> = { };
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue8588/Main2.hx b/tests/misc/compiler_loops/projects/Issue8588/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..48c052fbe6592d6889ab4560d1a46f0d5853c0fd
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/Main2.hx
@@ -0,0 +1,9 @@
+abstract Under<T>(T) {
+	@:from public static function from<T>(v) return (v:Under<T>);
+}
+
+class Main {
+	static function main() {
+		var a1:Under<{}> = {};
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue8588/Main3.hx b/tests/misc/compiler_loops/projects/Issue8588/Main3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c3cdaa594a50c24d8e120bce64e470bc09fd4825
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/Main3.hx
@@ -0,0 +1,9 @@
+abstract Under<T>(T) {
+	@:from public static function from<T>(v:Under<T>) { return v; }
+}
+
+class Main3 {
+	static public function main() {
+		var a1:Under<{}> = [];
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue8588/Main4.hx b/tests/misc/compiler_loops/projects/Issue8588/Main4.hx
new file mode 100644
index 0000000000000000000000000000000000000000..450cfa44b2da03fd7d2f812bc657441b14d712e6
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/Main4.hx
@@ -0,0 +1,9 @@
+abstract Under<T>(T) {
+	@:from public static function from<T>(v:Under<T>) { return v; }
+}
+
+class Main3 {
+	static public function main() {
+		var a1:Under<{}> = ident;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue8588/Main5.hx b/tests/misc/compiler_loops/projects/Issue8588/Main5.hx
new file mode 100644
index 0000000000000000000000000000000000000000..68af521e059de72ebbcc46ca6363f728c012fdd9
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/Main5.hx
@@ -0,0 +1,9 @@
+abstract Under<T>(T) {
+	@:from public static function from<T>(v:Under<T>) { return v; }
+}
+
+ class Main5 {
+	static public function main() {
+		var a1:Under<Dynamic> = {};
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue8588/compile-fail.hxml b/tests/misc/compiler_loops/projects/Issue8588/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/compiler_loops/projects/Issue8588/compile-fail.hxml.stderr b/tests/misc/compiler_loops/projects/Issue8588/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..58e8f711b5a67f0b4a91721a679c6e77c61c86bf
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:2: characters 9-53 : from.T should be Under<Unknown<0>>
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue8588/compile2-fail.hxml b/tests/misc/compiler_loops/projects/Issue8588/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..27d6e39ab72cf90b00703d0d1323b0c0e760514b
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/compile2-fail.hxml
@@ -0,0 +1 @@
+-main Main2
diff --git a/tests/misc/compiler_loops/projects/Issue8588/compile2-fail.hxml.stderr b/tests/misc/compiler_loops/projects/Issue8588/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..2275f96b59d33d642ad534f37b5dc777c7e7ba03
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:7: characters 3-25 : { } should be Under<{ }>
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue8588/compile3-fail.hxml b/tests/misc/compiler_loops/projects/Issue8588/compile3-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..83eea6fa92b5bafa62292b4f58ce79917b719b28
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/compile3-fail.hxml
@@ -0,0 +1 @@
+-main Main3
diff --git a/tests/misc/compiler_loops/projects/Issue8588/compile3-fail.hxml.stderr b/tests/misc/compiler_loops/projects/Issue8588/compile3-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..5d9cadafc0df1289bab3044cdc3b4e76f8ff0c1c
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/compile3-fail.hxml.stderr
@@ -0,0 +1 @@
+Main3.hx:7: characters 3-25 : Array<Unknown<0>> should be Under<{ }>
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue8588/compile4-fail.hxml b/tests/misc/compiler_loops/projects/Issue8588/compile4-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..d9958b690f9b0eb7d9dd0d8a36da743918e40ca1
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/compile4-fail.hxml
@@ -0,0 +1 @@
+-main Main4
diff --git a/tests/misc/compiler_loops/projects/Issue8588/compile4-fail.hxml.stderr b/tests/misc/compiler_loops/projects/Issue8588/compile4-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..5b9550e0080960b167b4551d4710ad60db74bbe1
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/compile4-fail.hxml.stderr
@@ -0,0 +1 @@
+Main4.hx:7: characters 22-27 : Unknown identifier : ident
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/projects/Issue8588/compile5-fail.hxml b/tests/misc/compiler_loops/projects/Issue8588/compile5-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..71c0155b78615ee7ee492f9c9a6c70554f5ccf70
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/compile5-fail.hxml
@@ -0,0 +1 @@
+-main Main5
diff --git a/tests/misc/compiler_loops/projects/Issue8588/compile5-fail.hxml.stderr b/tests/misc/compiler_loops/projects/Issue8588/compile5-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..50228491f9e5a46447f4ceb0a21eda972f2fac32
--- /dev/null
+++ b/tests/misc/compiler_loops/projects/Issue8588/compile5-fail.hxml.stderr
@@ -0,0 +1 @@
+Main5.hx:7: characters 3-30 : { } should be Under<Dynamic>
\ No newline at end of file
diff --git a/tests/misc/compiler_loops/run.hxml b/tests/misc/compiler_loops/run.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..8af5c6a22f1f078cc9671e999352a58565eb11b3
--- /dev/null
+++ b/tests/misc/compiler_loops/run.hxml
@@ -0,0 +1,3 @@
+-cp ../src
+-D timeout=3
+--run Main
\ No newline at end of file
diff --git a/tests/misc/cppObjc/build.hxml b/tests/misc/cppObjc/build.hxml
index b0946a22a42aab37c8c6b3f288d97dfd95505a42..442989a5929b41a103ae2d76b74152ac45c230c2 100644
--- a/tests/misc/cppObjc/build.hxml
+++ b/tests/misc/cppObjc/build.hxml
@@ -1,4 +1,5 @@
--main TestObjc
+-D source-header=''
+--main TestObjc
 -cpp bin
--debug
+--debug
 -D objc
diff --git a/tests/misc/csTwoLibs/Lib1.hx b/tests/misc/cs/csTwoLibs/Lib1.hx
similarity index 100%
rename from tests/misc/csTwoLibs/Lib1.hx
rename to tests/misc/cs/csTwoLibs/Lib1.hx
diff --git a/tests/misc/csTwoLibs/Main.hx b/tests/misc/cs/csTwoLibs/Main.hx
similarity index 100%
rename from tests/misc/csTwoLibs/Main.hx
rename to tests/misc/cs/csTwoLibs/Main.hx
diff --git a/tests/misc/cs/csTwoLibs/compile-1.hxml b/tests/misc/cs/csTwoLibs/compile-1.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..e16eb826653703a7690d31dd1c86a199f095e6c8
--- /dev/null
+++ b/tests/misc/cs/csTwoLibs/compile-1.hxml
@@ -0,0 +1,15 @@
+cs.Boot
+--dce no
+-cs bin/haxeboot
+--next
+--net-lib bin/haxeboot/bin/haxeboot.dll
+--dce no
+-D dll_import
+Lib1
+-cs bin/lib1
+--next
+--net-lib bin/haxeboot/bin/haxeboot.dll
+--dce no
+-D dll_import
+--main Main
+-cs bin/main
diff --git a/tests/misc/csTwoLibs/compile-2.hxml b/tests/misc/cs/csTwoLibs/compile-2.hxml
similarity index 52%
rename from tests/misc/csTwoLibs/compile-2.hxml
rename to tests/misc/cs/csTwoLibs/compile-2.hxml
index 4e7818cc5cce01933872984ecbb5aca40e1b5b08..8fa15b83804344883d8ff6d17d3777b1c88e380e 100644
--- a/tests/misc/csTwoLibs/compile-2.hxml
+++ b/tests/misc/cs/csTwoLibs/compile-2.hxml
@@ -1,18 +1,18 @@
 cs.Boot
--dce no
+--dce no
 -cs bin/haxeboot
 -D no_root
 --next
--net-lib bin/haxeboot/bin/haxeboot.dll
--dce no
+--net-lib bin/haxeboot/bin/haxeboot.dll
+--dce no
 -D dll_import
 -D no_root
 Lib1
 -cs bin/lib1
 --next
--net-lib bin/haxeboot/bin/haxeboot.dll
--dce no
+--net-lib bin/haxeboot/bin/haxeboot.dll
+--dce no
 -D dll_import
 -D no_root
--main Main
+--main Main
 -cs bin/main
diff --git a/tests/misc/csTwoLibs/compile-3.hxml b/tests/misc/cs/csTwoLibs/compile-3.hxml
similarity index 56%
rename from tests/misc/csTwoLibs/compile-3.hxml
rename to tests/misc/cs/csTwoLibs/compile-3.hxml
index 1f8d604e48d8ad5926c621a84aff95818b7ce9a6..5d7896d1b442e9e5d74952aabdb62bb7e08fbc7e 100644
--- a/tests/misc/csTwoLibs/compile-3.hxml
+++ b/tests/misc/cs/csTwoLibs/compile-3.hxml
@@ -1,18 +1,18 @@
 cs.Boot
--dce no
+--dce no
 -cs bin/haxeboot
 -D erase_generics
 --next
--net-lib bin/haxeboot/bin/haxeboot.dll
--dce no
+--net-lib bin/haxeboot/bin/haxeboot.dll
+--dce no
 -D dll_import
 -D erase_generics
 Lib1
 -cs bin/lib1
 --next
--net-lib bin/haxeboot/bin/haxeboot.dll
--dce no
+--net-lib bin/haxeboot/bin/haxeboot.dll
+--dce no
 -D dll_import
 -D erase_generics
--main Main
+--main Main
 -cs bin/main
diff --git a/tests/misc/csTwoLibs/compile-4.hxml b/tests/misc/cs/csTwoLibs/compile-4.hxml
similarity index 60%
rename from tests/misc/csTwoLibs/compile-4.hxml
rename to tests/misc/cs/csTwoLibs/compile-4.hxml
index 85bc648b2063132fd8a4e96758c5c2c556b6ee43..a256a141bfaa0422c19f9727918ee27f7fdca603 100644
--- a/tests/misc/csTwoLibs/compile-4.hxml
+++ b/tests/misc/cs/csTwoLibs/compile-4.hxml
@@ -1,21 +1,21 @@
 cs.Boot
--dce no
+--dce no
 -cs bin/haxeboot
 -D erase_generics
 -D no_root
 --next
--net-lib bin/haxeboot/bin/haxeboot.dll
--dce no
+--net-lib bin/haxeboot/bin/haxeboot.dll
+--dce no
 -D dll_import
 -D erase_generics
 -D no_root
 Lib1
 -cs bin/lib1
 --next
--net-lib bin/haxeboot/bin/haxeboot.dll
--dce no
+--net-lib bin/haxeboot/bin/haxeboot.dll
+--dce no
 -D dll_import
 -D erase_generics
 -D no_root
--main Main
+--main Main
 -cs bin/main
diff --git a/tests/misc/cs/projects/Issue3526/IncompatibleCombinations.hx b/tests/misc/cs/projects/Issue3526/IncompatibleCombinations.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8b517983c63ea30aa7049e0d222c532bb38e40d4
--- /dev/null
+++ b/tests/misc/cs/projects/Issue3526/IncompatibleCombinations.hx
@@ -0,0 +1,28 @@
+import cs.Constraints;
+import haxe.Constraints.Constructible;
+
+@:nativeGen
+class StructAndConstructible<T:CsStruct & Constructible<Void->Void>> {}
+
+@:nativeGen
+class ConstructibleAndStruct<T:Constructible<Void->Void> & CsStruct> {}
+
+@:nativeGen
+class StructAndClass<T:CsStruct & CsClass> {}
+
+@:nativeGen
+class ClassAndStruct<T:CsClass & CsStruct> {}
+
+#if (cs_ver >= "7.3")
+@:nativeGen
+class UnmanagedAndStruct<T:CsUnmanaged & CsStruct> {}
+
+@:nativeGen
+class StructAndUnmanaged<T:CsStruct & CsUnmanaged> {}
+
+@:nativeGen
+class UnmanagedAndConstructible<T:CsUnmanaged & Constructible<Void->Void>> {}
+
+@:nativeGen
+class ConstructibleAndUnmanaged<T:Constructible<Void->Void> & CsUnmanaged> {}
+#end
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue3526/Main.hx b/tests/misc/cs/projects/Issue3526/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5f1c6d549f20ed9cf101fe6edacce0dfae76c0e2
--- /dev/null
+++ b/tests/misc/cs/projects/Issue3526/Main.hx
@@ -0,0 +1,72 @@
+import cs.Constraints;
+import haxe.Constraints.Constructible;
+
+@:classCode("
+	public static void testClass<T>(T t) where T : class {}
+	public static void testStruct<T>(T t) where T : struct {}
+	public static void testConstructible<T>(T t) where T : new() {}
+	public static void testConstructibleClass<T>(T t) where T : class, new() {}
+")
+class TestCs {
+    extern public static function testClass<T:CsClass>(t:T):Void;
+    extern public static function testStruct<T:CsStruct>(t:T):Void;
+    extern public static function testConstructible<T:Constructible<Void->Void>>(t:T):Void;
+    extern public static function testConstructibleClass<T:Constructible<Void->Void> & CsClass>(t:T):Void;
+}
+
+@:nativeGen
+class Main {
+    public static function main() {
+        testClass(new Array<String>());
+        TestCs.testClass(new Class_(new Array<String>()).value);
+
+        testStruct(42);
+        TestCs.testStruct(new Struct(42).value);
+
+        testConstructible(new haxe.Serializer());
+        TestCs.testConstructible(new Constructible_(new haxe.Serializer()).value);
+
+        testConstructibleClass(new haxe.Serializer());
+        TestCs.testConstructibleClass(new ConstructibleClass(new haxe.Serializer()).value);
+    }
+
+    static function testClass<T:CsClass>(value:T) TestCs.testClass(value);
+    static function testStruct<T:CsStruct>(value:T) TestCs.testStruct(value);
+    static function testConstructible<T:Constructible<Void->Void>>(value:T) TestCs.testConstructible(value);
+    static function testConstructibleClass<T:Constructible<Void->Void> & CsClass>(value:T) TestCs.testConstructibleClass(value);
+}
+
+@:nativeGen
+class Class_<T:CsClass> {
+    public var value:T;
+    public function new(value:T) this.value = value;
+}
+
+@:nativeGen
+class Struct<T:CsStruct> {
+    public var value:T;
+    public function new(value:T) this.value = value;
+}
+
+@:nativeGen
+class Constructible_<T:Constructible<Void->Void>> {
+    public var value:T;
+    public function new(value:T) this.value = value;
+}
+
+@:nativeGen
+class ConstructibleClass<T:Constructible<Void->Void> & CsClass> {
+    public var value:T;
+    public function new(value:T) this.value = value;
+}
+
+@:nativeGen
+class StructT<T, T1:T & CsStruct> {}
+
+#if (cs_ver >= "7.3")
+@:nativeGen
+class Unmanaged<T:CsUnmanaged> {}
+
+@:nativeGen
+class UnmanagedClass<T:CsUnmanaged & CsClass> {}
+#end
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue3526/compile-7.3.hxml b/tests/misc/cs/projects/Issue3526/compile-7.3.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..3cee3c59b85d2cbb215753c176b46e9f5d69e1e9
--- /dev/null
+++ b/tests/misc/cs/projects/Issue3526/compile-7.3.hxml
@@ -0,0 +1,4 @@
+-cs cs
+-D no-compilation
+-D cs_ver=7.3
+Main
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue3526/compile.hxml b/tests/misc/cs/projects/Issue3526/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..182b38b6eb866ebad3fef70f71f74e126f4941f0
--- /dev/null
+++ b/tests/misc/cs/projects/Issue3526/compile.hxml
@@ -0,0 +1,2 @@
+-cs cs
+Main
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue3526/incompatible-combinations-fail.hxml b/tests/misc/cs/projects/Issue3526/incompatible-combinations-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..347dfd45b83fbed73468a8ffa42600c77839fe86
--- /dev/null
+++ b/tests/misc/cs/projects/Issue3526/incompatible-combinations-fail.hxml
@@ -0,0 +1,4 @@
+-cs cs
+-D no-compilation
+-D cs_ver=7.3
+IncompatibleCombinations
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue3526/incompatible-combinations-fail.hxml.stderr b/tests/misc/cs/projects/Issue3526/incompatible-combinations-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..ebbb3653c0823b29722ca63321f1e2b23d4835f9
--- /dev/null
+++ b/tests/misc/cs/projects/Issue3526/incompatible-combinations-fail.hxml.stderr
@@ -0,0 +1,8 @@
+IncompatibleCombinations.hx:5: characters 1-72 : The new() constraint cannot be combined with the struct constraint.
+IncompatibleCombinations.hx:8: characters 1-72 : The new() constraint cannot be combined with the struct constraint.
+IncompatibleCombinations.hx:11: characters 1-46 : The class constraint cannot be combined with the struct constraint.
+IncompatibleCombinations.hx:14: characters 1-46 : The class constraint cannot be combined with the struct constraint.
+IncompatibleCombinations.hx:18: characters 1-54 : The unmanaged constraint cannot be combined with the struct constraint.
+IncompatibleCombinations.hx:21: characters 1-54 : The unmanaged constraint cannot be combined with the struct constraint.
+IncompatibleCombinations.hx:24: characters 1-78 : The unmanaged constraint cannot be combined with the new() constraint.
+IncompatibleCombinations.hx:27: characters 1-78 : The unmanaged constraint cannot be combined with the new() constraint.
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue3703/Main.hx b/tests/misc/cs/projects/Issue3703/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..30006534b169af278ac501e98d603ca145d4b89d
--- /dev/null
+++ b/tests/misc/cs/projects/Issue3703/Main.hx
@@ -0,0 +1,15 @@
+class Main {
+	static function main() {
+		var a = ["hello"];
+		sortArray(a); // works properly
+		sortArrayInline(a); // generates wrong code
+	}
+
+	static function sortArray<T>(a:Array<T>):Void {
+		cs.system.Array.Sort(@:privateAccess a.__a, 0, a.length);
+	}
+
+	static inline function sortArrayInline<T>(a:Array<T>):Void {
+		cs.system.Array.Sort(@:privateAccess a.__a, 0, a.length);
+	}
+}
diff --git a/tests/misc/cs/projects/Issue3703/Test.hx b/tests/misc/cs/projects/Issue3703/Test.hx
new file mode 100644
index 0000000000000000000000000000000000000000..97e3328e1b73e5567ab45551aa998e0cc1520b61
--- /dev/null
+++ b/tests/misc/cs/projects/Issue3703/Test.hx
@@ -0,0 +1,15 @@
+class A<T> {}
+
+@:nativeGen
+class B<T> {}
+
+class C<T1,T2> {
+	var a:A<T1>;
+	var b:B<T2>;
+
+	function f():A<T1> return null;
+}
+
+class D extends C<String, String> {
+	override function f():A<String> return null;
+}
diff --git a/tests/misc/cs/projects/Issue3703/compile.hxml b/tests/misc/cs/projects/Issue3703/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..85efa756f17e5e6b50003258be5cbf3f54de33cf
--- /dev/null
+++ b/tests/misc/cs/projects/Issue3703/compile.hxml
@@ -0,0 +1,3 @@
+-main Main
+Test
+-cs bin
diff --git a/tests/misc/cs/projects/Issue4002/Main.hx b/tests/misc/cs/projects/Issue4002/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..91516303caf6df8ea771575410be21e68fb1cc2e
--- /dev/null
+++ b/tests/misc/cs/projects/Issue4002/Main.hx
@@ -0,0 +1,19 @@
+import cs.system.WeakReference_1;
+
+class Main {
+	public static function main() {
+		new Test<A>(new A());
+	}
+}
+
+@:nativeGen
+class Test<T:A> {
+	public function new(a:T) {
+		var ref:WeakReference_1<T> = new WeakReference_1(a);
+	}
+}
+
+class A {
+	public function new() {}
+}
+
diff --git a/tests/misc/cs/projects/Issue4002/compile.hxml b/tests/misc/cs/projects/Issue4002/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..9f9209b7ba8942c13dd72181b100f5ba7cad5e47
--- /dev/null
+++ b/tests/misc/cs/projects/Issue4002/compile.hxml
@@ -0,0 +1,3 @@
+--main Main
+-cs bin
+-D net-ver=45
diff --git a/tests/misc/projects/Issue4116/base/A.hx b/tests/misc/cs/projects/Issue4116/base/A.hx
similarity index 100%
rename from tests/misc/projects/Issue4116/base/A.hx
rename to tests/misc/cs/projects/Issue4116/base/A.hx
diff --git a/tests/misc/projects/Issue4116/compile.hxml b/tests/misc/cs/projects/Issue4116/compile.hxml
similarity index 100%
rename from tests/misc/projects/Issue4116/compile.hxml
rename to tests/misc/cs/projects/Issue4116/compile.hxml
diff --git a/tests/misc/cs/projects/Issue4151/DynamicAudioNormalizerNET.dll b/tests/misc/cs/projects/Issue4151/DynamicAudioNormalizerNET.dll
new file mode 100644
index 0000000000000000000000000000000000000000..8b95f6e270a7670385ca15d677c0f74c31fe66aa
Binary files /dev/null and b/tests/misc/cs/projects/Issue4151/DynamicAudioNormalizerNET.dll differ
diff --git a/tests/misc/pythonImport/native_python/__init__.py b/tests/misc/cs/projects/Issue4151/Main.hx
similarity index 100%
rename from tests/misc/pythonImport/native_python/__init__.py
rename to tests/misc/cs/projects/Issue4151/Main.hx
diff --git a/tests/misc/cs/projects/Issue4151/compile.hxml b/tests/misc/cs/projects/Issue4151/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..4dca1657e86b520cc5215caefc29bcc25d91529a
--- /dev/null
+++ b/tests/misc/cs/projects/Issue4151/compile.hxml
@@ -0,0 +1,3 @@
+-cs bin
+Main
+-net-lib DynamicAudioNormalizerNET.dll
diff --git a/tests/misc/cs/projects/Issue4598/Main.hx b/tests/misc/cs/projects/Issue4598/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f10358990a0c0fb15b6db2b52c7da90347ad9ced
--- /dev/null
+++ b/tests/misc/cs/projects/Issue4598/Main.hx
@@ -0,0 +1,16 @@
+class Main {
+	@:readOnly
+	public var a:Int = 10;
+
+	static function main() {
+		var m = new Main();
+
+		try Reflect.setProperty(m, 'a', 999)
+		catch(e:cs.system.MemberAccessException) {}
+		if(m.a != 10) {
+			throw "Main.a should not be writable via reflection";
+		}
+	}
+
+	public function new() {}
+}
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue4598/Run.hx b/tests/misc/cs/projects/Issue4598/Run.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bae758e08d9c54500dade7d1c2704faf55d3f428
--- /dev/null
+++ b/tests/misc/cs/projects/Issue4598/Run.hx
@@ -0,0 +1,11 @@
+class Run {
+	static public function run() {
+		var exitCode = switch (Sys.systemName()) {
+			case 'Windows':
+				Sys.command('bin\\bin\\Main.exe');
+			case _:
+				Sys.command('mono', ['bin/bin/Main.exe']);
+		}
+		Sys.exit(exitCode);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue4598/compile.hxml b/tests/misc/cs/projects/Issue4598/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..357e86022cfe02906fc188bc75aab2f864bcf6a6
--- /dev/null
+++ b/tests/misc/cs/projects/Issue4598/compile.hxml
@@ -0,0 +1,4 @@
+-cs bin
+-main Main
+--next
+--macro Run.run()
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue4623/Main.hx b/tests/misc/cs/projects/Issue4623/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0b763c40f1a4e448e67cf1057a456894a1583d4d
--- /dev/null
+++ b/tests/misc/cs/projects/Issue4623/Main.hx
@@ -0,0 +1,59 @@
+@:nativeGen
+class Main {
+	static var voidResult:String;
+
+	static function testVoid(a:Int, b:String = 'hello', ?c:String):Void {
+		voidResult = '$a $b $c';
+	}
+
+	static function test(a:Int, b:String = 'hello', ?c:String):String {
+		return '$a $b $c';
+	}
+
+	public static function main() {
+		untyped __cs__('global::Main.testVoid(1, "foo")');
+		var expected = '1 foo null';
+		if(voidResult != expected) {
+			throw 'Invalid result of testVoid(1, "foo"). Expected: $expected. Got: $voidResult';
+		}
+
+		untyped __cs__('global::Main.testVoid(2)');
+		var expected = '2 hello null';
+		if(voidResult != expected) {
+			throw 'Invalid result of testVoid(2). Expected: $expected. Got: $voidResult';
+		}
+
+		var expected = '3 bar null';
+		var result = untyped __cs__('global::Main.test(3, "bar")');
+		if(expected != result) {
+			throw 'Invalid result of test(3, "bar"). Expected: $expected. Got: $result';
+		}
+
+		var expected = '4 hello null';
+		var result = untyped __cs__('global::Main.test(4)');
+		if(expected != result) {
+			throw 'Invalid result of test(4). Expected: $expected. Got: $result';
+		}
+
+		var n:CtorTest = untyped __cs__('new global::CtorTest(20);') ;
+		if(n.a != 20 || n.b != 'hello') {
+			throw 'Invalid result of new CtorTest(20)';
+		}
+
+		var n:CtorTest = untyped __cs__('new global::CtorTest();') ;
+		if(n.a != 10 || n.b != 'hello') {
+			throw 'Invalid result of new CtorTest()';
+		}
+	}
+}
+
+@:nativeGen
+class CtorTest {
+	public var a:Int;
+	public var b:String;
+
+	public function new(a:Int = 10, b:String = 'hello') {
+		this.a = a;
+		this.b = b;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue4623/Run.hx b/tests/misc/cs/projects/Issue4623/Run.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bae758e08d9c54500dade7d1c2704faf55d3f428
--- /dev/null
+++ b/tests/misc/cs/projects/Issue4623/Run.hx
@@ -0,0 +1,11 @@
+class Run {
+	static public function run() {
+		var exitCode = switch (Sys.systemName()) {
+			case 'Windows':
+				Sys.command('bin\\bin\\Main.exe');
+			case _:
+				Sys.command('mono', ['bin/bin/Main.exe']);
+		}
+		Sys.exit(exitCode);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue4623/compile.hxml b/tests/misc/cs/projects/Issue4623/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..357e86022cfe02906fc188bc75aab2f864bcf6a6
--- /dev/null
+++ b/tests/misc/cs/projects/Issue4623/compile.hxml
@@ -0,0 +1,4 @@
+-cs bin
+-main Main
+--next
+--macro Run.run()
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue5434/Main.hx b/tests/misc/cs/projects/Issue5434/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bca478825cca4d3c768753fa865841481db4bca6
--- /dev/null
+++ b/tests/misc/cs/projects/Issue5434/Main.hx
@@ -0,0 +1,6 @@
+interface ITest<K, V> {
+	function keys():Array<K>;
+	function values():Array<V>;
+}
+
+interface ISubTest extends ITest<String, String> {}
diff --git a/tests/misc/cs/projects/Issue5434/compile.hxml b/tests/misc/cs/projects/Issue5434/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..62d1ab5ddc12ca1e8c2f15c316486b2d576c0f2d
--- /dev/null
+++ b/tests/misc/cs/projects/Issue5434/compile.hxml
@@ -0,0 +1,2 @@
+Main
+-cs bin
diff --git a/tests/misc/cs/projects/Issue5915/Test.hx b/tests/misc/cs/projects/Issue5915/Test.hx
new file mode 100644
index 0000000000000000000000000000000000000000..99ac197e1d59fb088ac6f706fe998ab9b7a6bedc
--- /dev/null
+++ b/tests/misc/cs/projects/Issue5915/Test.hx
@@ -0,0 +1,20 @@
+enum A {
+    A1(v:String);
+    A2(v:B);
+}
+enum B {
+    BB(v:Float);
+}
+class Test {
+    public static function main () {
+        var v1 = A2(BB(12));
+        v1 = switch (v1) {
+            case A2(v):
+                switch (v) {
+                    case BB(v): A2(BB(v++));
+                }
+            default: A1("");
+        }
+        trace(v1);
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue5915/compile.hxml b/tests/misc/cs/projects/Issue5915/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..4f946ed5ac0605586571ad5a3f4c8496ad34df3b
--- /dev/null
+++ b/tests/misc/cs/projects/Issue5915/compile.hxml
@@ -0,0 +1,2 @@
+-main Test
+-cs bin
diff --git a/tests/misc/cs/projects/Issue5953/Main.hx b/tests/misc/cs/projects/Issue5953/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..60d63f642b083feae97e1c2be8cf86b8f49b224e
--- /dev/null
+++ b/tests/misc/cs/projects/Issue5953/Main.hx
@@ -0,0 +1,17 @@
+class Main {
+	static function main() {
+		var map = foo(null);
+		trace(map);
+	}
+
+	static function foo(m:NativeStringMap<String>)
+		return m.toMap();
+}
+
+abstract NativeStringMap<V>(Impl<V>) {
+	@:to public function toMap():Map<String, V> {
+		return new Map();
+	}
+}
+
+typedef Impl<V> = cs.system.collections.generic.IDictionary_2<String, V>;
diff --git a/tests/misc/cs/projects/Issue5953/Reduced.hx b/tests/misc/cs/projects/Issue5953/Reduced.hx
new file mode 100644
index 0000000000000000000000000000000000000000..94888767e622ace8caa83d477f6be4e0158bace1
--- /dev/null
+++ b/tests/misc/cs/projects/Issue5953/Reduced.hx
@@ -0,0 +1,10 @@
+@:nativeGen
+class C<T> {}
+
+class C2<T> {}
+
+abstract A<T>(C<T>) {
+	function f():C2<T> return null;
+
+	static function foo(a:A<String>) return a.f();
+}
diff --git a/tests/misc/cs/projects/Issue5953/compile.hxml b/tests/misc/cs/projects/Issue5953/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..284745cdd01375c1e9219ad9a596640c933f15f0
--- /dev/null
+++ b/tests/misc/cs/projects/Issue5953/compile.hxml
@@ -0,0 +1,3 @@
+-main Main
+Reduced
+-cs bin
diff --git a/tests/misc/cs/projects/Issue6635/Main.hx b/tests/misc/cs/projects/Issue6635/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..27458b4b6f4130e951455c9f8ef37ae99cbaf446
--- /dev/null
+++ b/tests/misc/cs/projects/Issue6635/Main.hx
@@ -0,0 +1,13 @@
+abstract A<V>(String) {}
+
+typedef S = {a:A<Int>};
+
+class Main {
+	function new(s:S) {}
+
+	static function getS():S return null;
+
+	static function main() {
+		new Main(getS());
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue6635/compile.hxml b/tests/misc/cs/projects/Issue6635/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..57033c162aafceec23a6ed60dcd88fa438a01696
--- /dev/null
+++ b/tests/misc/cs/projects/Issue6635/compile.hxml
@@ -0,0 +1,3 @@
+-main Main
+-cs bin
+-D no-compilation
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue6635/compile.hxml.stderr b/tests/misc/cs/projects/Issue6635/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/misc/cs/projects/Issue7875/Main.hx b/tests/misc/cs/projects/Issue7875/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2dbb85527541d3b0abe712fc829515d33f3a2a12
--- /dev/null
+++ b/tests/misc/cs/projects/Issue7875/Main.hx
@@ -0,0 +1,23 @@
+import cs.system.WeakReference_1;
+
+class Main {
+	public static function main() {
+		new Test<A>(new A());
+	}
+}
+
+@:nativeGen
+class Test<T:A> {
+	public function new(a:T) {
+		test(function() return new WeakReference_1(a));
+	}
+
+	function test(cb:Void->WeakReference_1<T>):Void {}
+
+
+}
+
+class A {
+	public function new() {}
+}
+
diff --git a/tests/misc/cs/projects/Issue7875/compile.hxml b/tests/misc/cs/projects/Issue7875/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..9f9209b7ba8942c13dd72181b100f5ba7cad5e47
--- /dev/null
+++ b/tests/misc/cs/projects/Issue7875/compile.hxml
@@ -0,0 +1,3 @@
+--main Main
+-cs bin
+-D net-ver=45
diff --git a/tests/misc/cs/projects/Issue8361/Main.hx b/tests/misc/cs/projects/Issue8361/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..29174479e76072ac6621650946e9c9e7c5dccbcd
--- /dev/null
+++ b/tests/misc/cs/projects/Issue8361/Main.hx
@@ -0,0 +1,22 @@
+class SortedStringMapImpl<V> extends haxe.ds.BalancedTree<String, V> implements haxe.Constraints.IMap<String,V> {
+
+	var cmp:String -> String -> Int;
+
+	public function new(?comparator:String -> String -> Int) {
+		super();
+		this.cmp = comparator == null ? haxe.Utf8.compare : comparator;
+	}
+
+	override
+	function compare(s1:String, s2:String):Int {
+		return cmp(s1, s2);
+	}
+}
+
+class Main {
+	static function main() {
+		var m = new SortedStringMapImpl<String>();
+		m.set("foo", "bar");
+		trace(m);
+	}
+}
diff --git a/tests/misc/cs/projects/Issue8361/compile.hxml b/tests/misc/cs/projects/Issue8361/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..144577b504c7e9bb69a48186094424b83d2170d9
--- /dev/null
+++ b/tests/misc/cs/projects/Issue8361/compile.hxml
@@ -0,0 +1,2 @@
+-main Main
+-cs bin
diff --git a/tests/misc/cs/projects/Issue8366/Main.hx b/tests/misc/cs/projects/Issue8366/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ff7b07d78b4ea352397c0a9df116e22f7d32f9f6
--- /dev/null
+++ b/tests/misc/cs/projects/Issue8366/Main.hx
@@ -0,0 +1,22 @@
+class Main {
+	public static function main() {
+		var x:cs.NativeArray<Int> = new cs.NativeArray(1);
+
+		cs.Lib.unsafe({trace(42);});
+		cs.Lib.unsafe(trace(42));
+
+		cs.Lib.unsafe({
+			cs.Lib.fixed({
+				var addr = cs.Lib.pointerOfArray(x);
+				trace(cs.Lib.valueOf(addr)); //0
+				addr[0] = 42;
+				trace(cs.Lib.valueOf(addr)); //42
+			});
+		});
+	}
+
+	@:unsafe static function unsafeFunction() {}
+}
+
+@:unsafe
+class TestUnsafe {}
diff --git a/tests/misc/cs/projects/Issue8366/compile.hxml b/tests/misc/cs/projects/Issue8366/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..5e2d6e17215048fe97703ad0428042039b680e86
--- /dev/null
+++ b/tests/misc/cs/projects/Issue8366/compile.hxml
@@ -0,0 +1,3 @@
+-cs bin
+-D unsafe
+-main Main
diff --git a/tests/misc/cs/projects/Issue8589/Main.hx b/tests/misc/cs/projects/Issue8589/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..300211779c89cfbac67fd39a05151cb7b6e4e856
--- /dev/null
+++ b/tests/misc/cs/projects/Issue8589/Main.hx
@@ -0,0 +1,10 @@
+import cs.system.collections.generic.List_1;
+
+typedef T = {id:String};
+
+class Main {
+	public static function main() {
+		var list:List_1<T> = new List_1();
+		list.ConvertAll((t:T) -> t.id);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue8589/compile.hxml b/tests/misc/cs/projects/Issue8589/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..57033c162aafceec23a6ed60dcd88fa438a01696
--- /dev/null
+++ b/tests/misc/cs/projects/Issue8589/compile.hxml
@@ -0,0 +1,3 @@
+-main Main
+-cs bin
+-D no-compilation
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue8589/compile.hxml.stderr b/tests/misc/cs/projects/Issue8589/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/misc/cs/projects/Issue8664/Main.hx b/tests/misc/cs/projects/Issue8664/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8a862bbaa823d0f12f0a3fe23424e029607244a2
--- /dev/null
+++ b/tests/misc/cs/projects/Issue8664/Main.hx
@@ -0,0 +1,25 @@
+import cs.NativeArray;
+
+class Main {
+	public static function main() {
+		new Arr<String>().map(function(v) return Std.parseInt(v));
+	}
+}
+
+class Arr<T> {
+	var __a:NativeArray<T>;
+
+	public function new() {}
+
+	public inline function map<S>(f:T->S) {
+		new Arr<S>().__unsafe_set(f(__unsafe_get()));
+	}
+
+	inline function __unsafe_get():T {
+		return __a[0];
+	}
+
+	inline function __unsafe_set(val:T):T {
+		return __a[0] = val;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/cs/projects/Issue8664/compile.hxml b/tests/misc/cs/projects/Issue8664/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..144577b504c7e9bb69a48186094424b83d2170d9
--- /dev/null
+++ b/tests/misc/cs/projects/Issue8664/compile.hxml
@@ -0,0 +1,2 @@
+-main Main
+-cs bin
diff --git a/tests/misc/cs/run.hxml b/tests/misc/cs/run.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b72a6e8015f79b90f1a33b56ffd247f513c52a0d
--- /dev/null
+++ b/tests/misc/cs/run.hxml
@@ -0,0 +1,2 @@
+-cp ../src
+--run Main
\ No newline at end of file
diff --git a/tests/misc/csTwoLibs/compile-1.hxml b/tests/misc/csTwoLibs/compile-1.hxml
deleted file mode 100644
index 00854a23daa56777a4c8781d8e495b3a41b83c8b..0000000000000000000000000000000000000000
--- a/tests/misc/csTwoLibs/compile-1.hxml
+++ /dev/null
@@ -1,15 +0,0 @@
-cs.Boot
--dce no
--cs bin/haxeboot
---next
--net-lib bin/haxeboot/bin/haxeboot.dll
--dce no
--D dll_import
-Lib1
--cs bin/lib1
---next
--net-lib bin/haxeboot/bin/haxeboot.dll
--dce no
--D dll_import
--main Main
--cs bin/main
diff --git a/tests/misc/es6/Test.hx b/tests/misc/es6/Test.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3443596941c0ee209914a0c648e429f4cd7174a9
--- /dev/null
+++ b/tests/misc/es6/Test.hx
@@ -0,0 +1,156 @@
+class A {
+}
+
+class B extends A {
+	function new() {
+		init();
+		Test.calls.push("B");
+	}
+	function init() {}
+}
+
+class C extends B {}
+
+class D extends C {
+	var n = "D";
+	override function init() Test.calls.push(n);
+}
+
+class E extends D {
+	function new() {
+		Test.use(this);
+		Test.calls.push("E");
+		super();
+	}
+}
+
+class F extends E {
+	public function new() {
+		super();
+		Test.calls.push("F");
+	}
+}
+
+extern class ExtNoCtor {
+	static function __init__():Void haxe.macro.Compiler.includeFile("./extern.js", "top");
+}
+
+class Base extends ExtNoCtor {
+	function new() {
+		Test.calls.push("BASE");
+	}
+}
+
+class Child extends Base {
+	public function new() {
+		Test.use(this);
+		Test.calls.push("CHILD");
+		super();
+	}
+}
+
+class RootNoArgs {
+	public function new() {}
+}
+
+class ChildOneArg extends RootNoArgs {
+	public var x:Int;
+	public function new(x) {
+		super();
+		this.x = x;
+	}
+}
+
+class GrandChildNoArgs extends ChildOneArg {
+	public function new() {
+		Test.use(this);
+		super(42);
+	}
+}
+
+class Test {
+	public static var calls:Array<String>;
+	@:pure(false) public static function use(v:Any) {}
+
+	static inline final hxCtor = "_hx_constructor";
+	static inline final hxSkipCtor = "_hx_skip_constructor";
+
+	static function hasCtorMethod(c:Dynamic):Bool {
+		return c.prototype.hasOwnProperty(hxCtor);
+	}
+
+	static function hasSkip(c:Dynamic) {
+		return c.hasOwnProperty(hxSkipCtor);
+	}
+
+	static var failures = 0;
+
+	static function assert(bool:Bool, ?pos:haxe.PosInfos) {
+		if (!bool) {
+			(untyped process).stderr.write(haxe.Log.formatOutput("assertion failed\n", pos));
+			failures++;
+		}
+	}
+
+	static function main() {
+		// A has no constructor, so it's safe to just call `super` first
+		// even if we skip ctor in the subclasses
+		assert(!hasCtorMethod(A));
+		assert(!hasSkip(A));
+
+		// B has an extracted ctor and also the static skip flag,
+		// as it is the first in the hierarchy who's ctor needs to be skipped
+		assert(hasCtorMethod(B));
+		assert(hasSkip(B));
+
+		// C and others down the chain should NOT have the static skip flag,
+		// but it can have a hxctor (although in this case it could be optimized away)
+		assert(!hasSkip(C));
+
+		// D must have a hxctor because it accesses this before super (for field init)
+		// it also supports skipping because it has children who want to skip
+		assert(hasCtorMethod(D));
+		assert(!hasSkip(D));
+
+		// E also must have a hxctor because it accesses this before super
+		// but it doesn't support skipping, because noone down the inheritance requires it
+		assert(hasCtorMethod(E));
+		assert(!hasSkip(E));
+
+		// F should NOT have hxctor because it doesn't access this before super and
+		// it has no children that require skipping
+		assert(!hasCtorMethod(F));
+		assert(!hasSkip(F));
+
+		// now for the call order
+		calls = [];
+		new F();
+		// E is first, because it's called before `super` in the parent class, and we call `super` before anything else
+		// D is second, because we call `init` before pushing `B` in the first constructor. here it's important that the field `n` is set
+		// before we call super(), so it's initialized at the point we call `init`
+		// B is the last "super" ctor in the hierarchy
+		// and finally F is pushed after a super call as usual
+		assert(calls.join("") == "EDBF");
+
+
+		// we also support skipping when inheriting from extern without constructors
+		assert(!hasCtorMethod(ExtNoCtor));
+		assert(!hasSkip(ExtNoCtor));
+
+		assert(hasCtorMethod(Base));
+		assert(hasSkip(Base));
+
+		assert(hasCtorMethod(Child));
+		assert(!hasSkip(Child));
+
+		calls = [];
+		new Child();
+		assert(calls.join("|") == "CHILD|BASE");
+
+		assert(new ChildOneArg(42).x == 42); // #7988
+
+		// ---
+
+		(untyped process).exit(if (failures == 0) 0 else 1);
+	}
+}
diff --git a/tests/misc/es6/extern.js b/tests/misc/es6/extern.js
new file mode 100644
index 0000000000000000000000000000000000000000..e8509897ecd1ed13ccf73cc21ca45ff3c9f0e289
--- /dev/null
+++ b/tests/misc/es6/extern.js
@@ -0,0 +1 @@
+class ExtNoCtor {}
\ No newline at end of file
diff --git a/tests/misc/es6/run.hxml b/tests/misc/es6/run.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..732fdd3e69e7b6fffe6311b0a4af365dfc064c8d
--- /dev/null
+++ b/tests/misc/es6/run.hxml
@@ -0,0 +1,4 @@
+-main Test
+-js test.js
+-D js-es=6
+-cmd node test.js
diff --git a/tests/misc/eventLoop/all.hxml b/tests/misc/eventLoop/all.hxml
index 0184c54b0c3f9852c1efbbbe8fa687f0073a6dee..fce314c4c13387e13073218563363800c5bbe748 100644
--- a/tests/misc/eventLoop/all.hxml
+++ b/tests/misc/eventLoop/all.hxml
@@ -1,8 +1,8 @@
--main Main
--dce full
+--main Main
+--dce full
 --each
 -swf eventLoop.swf
--swf-version 14
+--swf-version 14
 --next
 -neko eventLoop.n
 --next
diff --git a/tests/misc/java/projects/Issue2689/Main.hx b/tests/misc/java/projects/Issue2689/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d5383d00636d276836bc2c89ae471b8f8a8930fb
--- /dev/null
+++ b/tests/misc/java/projects/Issue2689/Main.hx
@@ -0,0 +1,9 @@
+class Main {
+	static function main() {}
+
+	@:overload static function conflict(fn:(Int)->String) {}
+	@:overload static function conflict(fn:(Bool)->String) {}
+
+	@:overload static function same(fn:(Int)->String) {}
+	@:overload static function same(fn:(Int)->String) {}
+}
\ No newline at end of file
diff --git a/tests/misc/java/projects/Issue2689/compile-fail.hxml b/tests/misc/java/projects/Issue2689/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..81ccea9793fc4329ce0545a2a437df9efab59bf4
--- /dev/null
+++ b/tests/misc/java/projects/Issue2689/compile-fail.hxml
@@ -0,0 +1,3 @@
+-main Main
+-java bin
+--no-output
\ No newline at end of file
diff --git a/tests/misc/java/projects/Issue2689/compile-fail.hxml.stderr b/tests/misc/java/projects/Issue2689/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..3d8e58ad89a0052e873574ba8ad24a3336cb16df
--- /dev/null
+++ b/tests/misc/java/projects/Issue2689/compile-fail.hxml.stderr
@@ -0,0 +1,5 @@
+Main.hx:4: characters 13-58 : Another overloaded field of similar signature was already declared : conflict
+Main.hx:4: characters 13-58 : The signatures are different in Haxe, but not in the target language
+Main.hx:5: characters 13-59 : The second field is declared here
+Main.hx:7: characters 13-54 : Another overloaded field of same signature was already declared : same
+Main.hx:8: characters 13-54 : The second field is declared here
\ No newline at end of file
diff --git a/tests/misc/java/projects/Issue8322/Main.hx b/tests/misc/java/projects/Issue8322/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..479c0fcd5b79faaebd2ebc5d1c02da8378590d30
--- /dev/null
+++ b/tests/misc/java/projects/Issue8322/Main.hx
@@ -0,0 +1,7 @@
+import haxe.CallStack;
+
+class Main {
+	static function main() {
+		CallStack.exceptionStack();
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/java/projects/Issue8322/compile.hxml b/tests/misc/java/projects/Issue8322/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..603475c8b8b681623ea6fa1c26d8bcbcdf9667f0
--- /dev/null
+++ b/tests/misc/java/projects/Issue8322/compile.hxml
@@ -0,0 +1,3 @@
+-main Main
+-java bin
+-cmd java -jar bin/Main.jar
\ No newline at end of file
diff --git a/tests/misc/java/projects/Issue8444/Main.hx b/tests/misc/java/projects/Issue8444/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0d7851d04faf59efa69520f854ce4d03d06d232b
--- /dev/null
+++ b/tests/misc/java/projects/Issue8444/Main.hx
@@ -0,0 +1,15 @@
+import haxe.CallStack;
+
+class Main {
+	static function main() {
+		trace(new Child());
+	}
+}
+
+extern class Parent {}
+
+class Child extends Parent {
+	public function new() {
+		trace('hello');
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/java/projects/Issue8444/compile.hxml b/tests/misc/java/projects/Issue8444/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..a613a8c0693b4c2e66aefd08a771d5d5654befc2
--- /dev/null
+++ b/tests/misc/java/projects/Issue8444/compile.hxml
@@ -0,0 +1,3 @@
+-main Main
+-java bin
+-D no-compilation
\ No newline at end of file
diff --git a/tests/misc/java/run.hxml b/tests/misc/java/run.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b72a6e8015f79b90f1a33b56ffd247f513c52a0d
--- /dev/null
+++ b/tests/misc/java/run.hxml
@@ -0,0 +1,2 @@
+-cp ../src
+--run Main
\ No newline at end of file
diff --git a/tests/misc/luaDeadCode/stringReflection/Issue6276.hx b/tests/misc/luaDeadCode/stringReflection/Issue6276.hx
new file mode 100644
index 0000000000000000000000000000000000000000..83515370e177aa40fba0a2ec8e3b363926a81a6d
--- /dev/null
+++ b/tests/misc/luaDeadCode/stringReflection/Issue6276.hx
@@ -0,0 +1,21 @@
+class Issue6276 {
+	public static function main() {
+		var s = "foo";
+		var indexOf = Reflect.field(s, "indexOf");
+		var isfunc = lua.Lua.type(indexOf) == "function";
+		if (!isfunc){
+			trace("DCE should not remove string functions in lua");
+			Sys.exit(1);
+		}
+		var res = Reflect.callMethod(s, indexOf, ["o"]);
+		if (res != 1){
+			trace("Something went wrong with calling string methods via reflect");
+			Sys.exit(1);
+		}
+		var eq = Reflect.compareMethods(Reflect.field(s, 'indexOf'), Reflect.field(s, 'indexOf'));
+		if (!eq){
+			trace("Reflect.compareMethods should work for string methods");
+			Sys.exit(1);
+		}
+	}
+}
diff --git a/tests/misc/luaDeadCode/stringReflection/compile.hxml b/tests/misc/luaDeadCode/stringReflection/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..0177c34523f16493da18edc11cc67bc3a4c5c9ae
--- /dev/null
+++ b/tests/misc/luaDeadCode/stringReflection/compile.hxml
@@ -0,0 +1,5 @@
+--main Issue6276
+-lua issue6276.lua
+-cmd lua issue6276.lua
+-p tests/misc/luaDeadCode/issue6276
+
diff --git a/tests/misc/php/projects/Issue7725/compile.hxml b/tests/misc/php/projects/Issue7725/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..781a09172af8c44a3cdc2cf5bf7898e0125139fc
--- /dev/null
+++ b/tests/misc/php/projects/Issue7725/compile.hxml
@@ -0,0 +1,17 @@
+-cp src
+
+--each
+
+-D php-prefix=app1
+-main App1
+-php bin/app1
+
+--next
+
+-D php-prefix=app2
+-main App2
+-php bin/app2
+
+--next
+
+--cmd php run.php
\ No newline at end of file
diff --git a/tests/misc/php/projects/Issue7725/run.php b/tests/misc/php/projects/Issue7725/run.php
new file mode 100644
index 0000000000000000000000000000000000000000..ce2e1ae30c495ee2c548439f46cea175bf94d8ec
--- /dev/null
+++ b/tests/misc/php/projects/Issue7725/run.php
@@ -0,0 +1,6 @@
+<?php
+require 'bin/app1/index.php';
+require 'bin/app2/index.php';
+
+app1\App1Sub::test();
+app2\App2Sub::test();
\ No newline at end of file
diff --git a/tests/misc/php/projects/Issue7725/src/App1.hx b/tests/misc/php/projects/Issue7725/src/App1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d7a3ba1b14ee3e576e8992a1e723dd87ab46b1a6
--- /dev/null
+++ b/tests/misc/php/projects/Issue7725/src/App1.hx
@@ -0,0 +1,7 @@
+class App1 {
+	static function main() {}
+}
+
+@:keep class App1Sub {
+	static public function test() {}
+}
\ No newline at end of file
diff --git a/tests/misc/php/projects/Issue7725/src/App2.hx b/tests/misc/php/projects/Issue7725/src/App2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c51b3769e82ad9871199a84a0cf83681aeaa1733
--- /dev/null
+++ b/tests/misc/php/projects/Issue7725/src/App2.hx
@@ -0,0 +1,7 @@
+class App2 {
+	static function main() {}
+}
+
+@:keep class App2Sub {
+	static public function test() {}
+}
\ No newline at end of file
diff --git a/tests/misc/php/projects/Issue8249/compile.hxml b/tests/misc/php/projects/Issue8249/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..e3fd55b397b20e6e438fc6beafb908b73c08276e
--- /dev/null
+++ b/tests/misc/php/projects/Issue8249/compile.hxml
@@ -0,0 +1,4 @@
+-cp src
+-main Main
+-php bin
+--cmd php bin/index.php
\ No newline at end of file
diff --git a/tests/misc/php/projects/Issue8249/src/Main.hx b/tests/misc/php/projects/Issue8249/src/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d9966ca5b6de6e460e9c6e1a0ed607ad0deb6aa1
--- /dev/null
+++ b/tests/misc/php/projects/Issue8249/src/Main.hx
@@ -0,0 +1,10 @@
+interface Test {
+    @:keep final test : String;
+}
+
+class Main implements Test {
+    public final test : String = "ok";
+    public function new() {}
+
+    static function main() {}
+}
\ No newline at end of file
diff --git a/tests/misc/php/projects/Issue8851/compile.hxml b/tests/misc/php/projects/Issue8851/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..81482580dd046491f0ffb30652fb14628286d776
--- /dev/null
+++ b/tests/misc/php/projects/Issue8851/compile.hxml
@@ -0,0 +1,5 @@
+-cp src
+-main Main
+-dce full
+-php bin
+--cmd php bin/index.php
\ No newline at end of file
diff --git a/tests/misc/php/projects/Issue8851/src/Main.hx b/tests/misc/php/projects/Issue8851/src/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4b502872592aaa25d90b9d367065a7acd73ab5ad
--- /dev/null
+++ b/tests/misc/php/projects/Issue8851/src/Main.hx
@@ -0,0 +1,16 @@
+class Main {
+	static var tmp:Any;
+
+	static function main() {
+		iter([1 => 2]);
+		iter(['1' => 2]);
+		iter([{field:1} => 2]);
+		iter([1, 2]);
+	}
+
+	static function iter<T>(it:Iterable<T>) {
+		for(i in it) {
+			tmp = i;
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/php/run.hxml b/tests/misc/php/run.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b72a6e8015f79b90f1a33b56ffd247f513c52a0d
--- /dev/null
+++ b/tests/misc/php/run.hxml
@@ -0,0 +1,2 @@
+-cp ../src
+--run Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue1138/compile1.hxml b/tests/misc/projects/Issue1138/compile1.hxml
index 0e04fcc0b4acc1fad218f7e3a0af056b3a65ea2e..c8ff8821f54dbe9a79d4958856181ee53e7b4a83 100644
--- a/tests/misc/projects/Issue1138/compile1.hxml
+++ b/tests/misc/projects/Issue1138/compile1.hxml
@@ -1,4 +1,4 @@
--cp src1
--cp src2
--main C
+-p src1
+-p src2
+--main C
 --interp
diff --git a/tests/misc/projects/Issue1138/compile2.hxml b/tests/misc/projects/Issue1138/compile2.hxml
index 603d3b5da5463db13be18dbc7d2a05e262451ee5..1f1edd6e8260645027e488e6393ca141af51b5b8 100644
--- a/tests/misc/projects/Issue1138/compile2.hxml
+++ b/tests/misc/projects/Issue1138/compile2.hxml
@@ -1,4 +1,4 @@
--cp src1
--cp src2
--main p2.C2
+-p src1
+-p src2
+--main p2.C2
 --interp
diff --git a/tests/misc/projects/Issue1138/compile3-fail.hxml b/tests/misc/projects/Issue1138/compile3-fail.hxml
index 136153c671e1cbbd3dbe6bfd05c795b733399a21..9987373b9fedd79a66fa0b0d78d4a1a701ce3d4d 100644
--- a/tests/misc/projects/Issue1138/compile3-fail.hxml
+++ b/tests/misc/projects/Issue1138/compile3-fail.hxml
@@ -1,4 +1,4 @@
--cp src1
--cp src2
--main D
+-p src1
+-p src2
+--main D
 --interp
diff --git a/tests/misc/projects/Issue1138/compile3-fail.hxml.stderr b/tests/misc/projects/Issue1138/compile3-fail.hxml.stderr
index dae048be7613b48ffa08dfa1389b69091308a3b2..5fc81b2512616dafb916c1b9dda52a37cd1b9c86 100644
--- a/tests/misc/projects/Issue1138/compile3-fail.hxml.stderr
+++ b/tests/misc/projects/Issue1138/compile3-fail.hxml.stderr
@@ -1 +1 @@
-src1/D.hx:3: characters 8-16 : Int has no field triple
+src1/D.hx:3: characters 11-17 : Int has no field triple
diff --git a/tests/misc/projects/Issue1138/compile4-fail.hxml b/tests/misc/projects/Issue1138/compile4-fail.hxml
index 95b848b046eb93ae96077d5dd20dea801aca5219..da04a84d4cbb83f4cbf311de49990326dfbb8475 100644
--- a/tests/misc/projects/Issue1138/compile4-fail.hxml
+++ b/tests/misc/projects/Issue1138/compile4-fail.hxml
@@ -1,3 +1,3 @@
--cp src3
--main Main
+-p src3
+--main Main
 --interp
diff --git a/tests/misc/projects/Issue1138/compile4-fail.hxml.stderr b/tests/misc/projects/Issue1138/compile4-fail.hxml.stderr
index 87b99dd53fa7b51139d71c8b0c48ab25db12c82c..eba60d040a2f7302a95feed2c043adb3dcc5a5de 100644
--- a/tests/misc/projects/Issue1138/compile4-fail.hxml.stderr
+++ b/tests/misc/projects/Issue1138/compile4-fail.hxml.stderr
@@ -1 +1 @@
-$$normPath(::cwd::/src3/import.hx):1: characters 0-14 : Only import and using is allowed in import.hx files
\ No newline at end of file
+$$normPath(::cwd::/src3/import.hx):1: characters 1-15 : Only import and using is allowed in import.hx files
\ No newline at end of file
diff --git a/tests/misc/projects/Issue1310/compile1-fail.hxml b/tests/misc/projects/Issue1310/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue1310/compile1-fail.hxml
+++ b/tests/misc/projects/Issue1310/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue1310/compile1-fail.hxml.stderr b/tests/misc/projects/Issue1310/compile1-fail.hxml.stderr
index de420f0b9a83b52a1f82e36b7fff9379520c3689..76e7584a62fa41faea81f03adb963d43e4d6b6d2 100644
--- a/tests/misc/projects/Issue1310/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue1310/compile1-fail.hxml.stderr
@@ -1,2 +1,2 @@
-Main1.hx:17: characters 12-17 : Array<Int> should be ToString.S
-Main1.hx:17: characters 12-17 : For function argument ''
\ No newline at end of file
+Main1.hx:17: characters 13-18 : Array<Int> should be ToString.S
+Main1.hx:17: characters 13-18 : For function argument ''
\ No newline at end of file
diff --git a/tests/misc/projects/Issue1968/compile.hxml b/tests/misc/projects/Issue1968/compile.hxml
index 08e3c45af6f479cd34676ea66343ba1caec145f4..86c207e0001aa029d46ef5b89aea2ec6ac7194e8 100644
--- a/tests/misc/projects/Issue1968/compile.hxml
+++ b/tests/misc/projects/Issue1968/compile.hxml
@@ -1 +1 @@
---display Main.hx@146@position
\ No newline at end of file
+--display Main.hx@145@position
\ No newline at end of file
diff --git a/tests/misc/projects/Issue1968/compile.hxml.stderr b/tests/misc/projects/Issue1968/compile.hxml.stderr
index d9eadf243285c6845c455a015470444d33b4562c..b6615cde59031ccee4890755da00dd6bfd1c9655 100644
--- a/tests/misc/projects/Issue1968/compile.hxml.stderr
+++ b/tests/misc/projects/Issue1968/compile.hxml.stderr
@@ -1,3 +1,3 @@
 <list>
-<pos>$$normPath(::cwd::/Main.hx, true):4: characters 18-61</pos>
+<pos>$$normPath(::cwd::/Main.hx, true):4: characters 28-29</pos>
 </list>
diff --git a/tests/misc/projects/Issue2087/compile-fail.hxml b/tests/misc/projects/Issue2087/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue2087/compile-fail.hxml
+++ b/tests/misc/projects/Issue2087/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2087/compile-fail.hxml.stderr b/tests/misc/projects/Issue2087/compile-fail.hxml.stderr
index d3372a8265f6da12ebf3010b3279b1860510f2eb..46ece41697506705d6e87af4d19eec771886f6c9 100644
--- a/tests/misc/projects/Issue2087/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue2087/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:3: characters 2-6 : Type not found : haxe.Resauce
\ No newline at end of file
+Main.hx:3: characters 3-7 : Type not found : haxe.Resauce
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2148/compile1-fail.hxml b/tests/misc/projects/Issue2148/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue2148/compile1-fail.hxml
+++ b/tests/misc/projects/Issue2148/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2148/compile1-fail.hxml.stderr b/tests/misc/projects/Issue2148/compile1-fail.hxml.stderr
index 74ad22575d33fb8db6e3b88b2d28c009d348a827..d5295eab7b71baeca54dc32dd6ae555db9cca428 100644
--- a/tests/misc/projects/Issue2148/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue2148/compile1-fail.hxml.stderr
@@ -1,2 +1,2 @@
-Main1.hx:7: characters 21-24 : Unknown identifier : foo
-Main1.hx:7: characters 21-24 : For function argument 'i'
\ No newline at end of file
+Main1.hx:7: characters 22-25 : Unknown identifier : foo
+Main1.hx:7: characters 22-25 : For function argument 'i'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2232/compile1-fail.hxml b/tests/misc/projects/Issue2232/compile1-fail.hxml
index ccbedd4692061919bf6fc9e5da03e82293e78af2..3384bf614ca2e94b2dd504c97e7d9fbedf99cacd 100644
--- a/tests/misc/projects/Issue2232/compile1-fail.hxml
+++ b/tests/misc/projects/Issue2232/compile1-fail.hxml
@@ -1,3 +1,3 @@
--main Main1
+--main Main1
 -swf swf.swf
 --no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2232/compile1-fail.hxml.stderr b/tests/misc/projects/Issue2232/compile1-fail.hxml.stderr
index 5285260e1fe99d17d153fcc8a6b410a4a281583d..d2bb54ecdf8d2c5e46c0eadf885e7b2bf81e1b96 100644
--- a/tests/misc/projects/Issue2232/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue2232/compile1-fail.hxml.stderr
@@ -1,2 +1,2 @@
-Main1.hx:4: characters 6-7 : Float should be Int
-Main1.hx:4: characters 6-7 : For optional function argument 'x'
\ No newline at end of file
+Main1.hx:4: characters 7-8 : Float should be Int
+Main1.hx:4: characters 7-8 : For optional function argument 'x'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2232/compile2-fail.hxml b/tests/misc/projects/Issue2232/compile2-fail.hxml
index d12504ead1e7074eb3b62d1ab2ada0fb9488548c..87c86004f0a7f3cc6d5c829ad5cc1f43f4abb44c 100644
--- a/tests/misc/projects/Issue2232/compile2-fail.hxml
+++ b/tests/misc/projects/Issue2232/compile2-fail.hxml
@@ -1,3 +1,3 @@
--main Main2
+--main Main2
 -swf swf.swf
 --no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2232/compile2-fail.hxml.stderr b/tests/misc/projects/Issue2232/compile2-fail.hxml.stderr
index 3ac7007ee8eb19d2183b52f81c95d6bff296f583..3537af4f16ad1987c00035babc594d8364d72759 100644
--- a/tests/misc/projects/Issue2232/compile2-fail.hxml.stderr
+++ b/tests/misc/projects/Issue2232/compile2-fail.hxml.stderr
@@ -1 +1 @@
-Main2.hx:4: characters 2-8 : Cannot skip non-nullable argument x
\ No newline at end of file
+Main2.hx:4: characters 3-9 : Cannot skip non-nullable argument x
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2263/import-completion.hxml.stderr b/tests/misc/projects/Issue2263/import-completion.hxml.stderr
index 361367275024e9629f29c155d1227341cc029294..a9bc570c33aafacbbb1f0b7457dd3e764fbba483 100644
--- a/tests/misc/projects/Issue2263/import-completion.hxml.stderr
+++ b/tests/misc/projects/Issue2263/import-completion.hxml.stderr
@@ -1,6 +1,6 @@
 <list>
 <i n="pubV" k="var"><t>Int</t><d></d></i>
 <i n="pubM" k="method"><t>Void -&gt; Void</t><d></d></i>
-<i n="MyModule" k="type"><t></t><d></d></i>
-<i n="OtherType" k="type"><t></t><d></d></i>
+<i n="MyModule" k="type"><t>MyModule</t><d></d></i>
+<i n="OtherType" k="type"><t>OtherType</t><d></d></i>
 </list>
diff --git a/tests/misc/projects/Issue2263/type-completion.hxml.stderr b/tests/misc/projects/Issue2263/type-completion.hxml.stderr
index 5fd27778900e87b0e388ce8da3f328ad829c853f..dc110b989df6d112a5bba9d0cf8b2b16729e5b42 100644
--- a/tests/misc/projects/Issue2263/type-completion.hxml.stderr
+++ b/tests/misc/projects/Issue2263/type-completion.hxml.stderr
@@ -1,4 +1,4 @@
 <list>
-<i n="MyModule" k="type"><t></t><d></d></i>
-<i n="OtherType" k="type"><t></t><d></d></i>
+<i n="MyModule" k="type"><t>MyModule</t><d></d></i>
+<i n="OtherType" k="type"><t>OtherType</t><d></d></i>
 </list>
diff --git a/tests/misc/projects/Issue2472/compile-fail.hxml.stderr b/tests/misc/projects/Issue2472/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..96217370fadd91628c6e82802ab78fc93fa76aac
--- /dev/null
+++ b/tests/misc/projects/Issue2472/compile-fail.hxml.stderr
@@ -0,0 +1,3 @@
+Main.hx:12: characters 20-24 : Constraint check failure for A.O
+Main.hx:12: characters 20-24 : B.O should be { id : String }
+Main.hx:12: characters 20-24 : B.O has no field id
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2508/compile.hxml b/tests/misc/projects/Issue2508/compile.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue2508/compile.hxml
+++ b/tests/misc/projects/Issue2508/compile.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2508/compile.hxml.stderr b/tests/misc/projects/Issue2508/compile.hxml.stderr
index 3ed1959d0e219e5eb113f38f4838fd91cc6582f9..038fd82178edefe784fe90c8a18ffc1e0bc23fd1 100644
--- a/tests/misc/projects/Issue2508/compile.hxml.stderr
+++ b/tests/misc/projects/Issue2508/compile.hxml.stderr
@@ -1,10 +1,10 @@
-Main.hx:15: characters 3-13 : Warning : This case is unused
-Main.hx:20: characters 3-12 : Warning : This case is unused
-Main.hx:21: characters 3-13 : Warning : This case is unused
-Main.hx:26: characters 5-10 : Warning : This pattern is unused
-Main.hx:32: characters 6-17 : Warning : This pattern is unused
-Main.hx:44: characters 3-30 : Warning : This case is unused
-Main.hx:50: characters 3-17 : Warning : This case is unused
-Main.hx:55: characters 3-13 : Warning : This case is unused
-Main.hx:60: characters 3-14 : Warning : This case is unused
-Main.hx:66: characters 8-14 : Warning : This pattern is unused
\ No newline at end of file
+Main.hx:15: characters 4-15 : Warning : This case is unused
+Main.hx:20: characters 4-14 : Warning : This case is unused
+Main.hx:21: characters 4-15 : Warning : This case is unused
+Main.hx:26: characters 6-11 : Warning : This pattern is unused
+Main.hx:32: characters 7-18 : Warning : This pattern is unused
+Main.hx:44: characters 4-32 : Warning : This case is unused
+Main.hx:50: characters 4-19 : Warning : This case is unused
+Main.hx:55: characters 4-15 : Warning : This case is unused
+Main.hx:60: characters 4-16 : Warning : This case is unused
+Main.hx:66: characters 9-15 : Warning : This pattern is unused
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2538/compile-fail.hxml b/tests/misc/projects/Issue2538/compile-fail.hxml
index 454d47285fef442e7c172c29eff5cf7906136ce8..41d7330585023d40376ce6645dd81fda86beb5f9 100644
--- a/tests/misc/projects/Issue2538/compile-fail.hxml
+++ b/tests/misc/projects/Issue2538/compile-fail.hxml
@@ -1,3 +1,3 @@
--main Main
+--main Main
 -neko neko.n
 --no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2538/compile-fail.hxml.stderr b/tests/misc/projects/Issue2538/compile-fail.hxml.stderr
index 5eefe10a6e50a1fa7676a369adf5642fb96bb6bb..0fa48688bbd07a57d83a632ce2adb561ed3bc577 100644
--- a/tests/misc/projects/Issue2538/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue2538/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:7: characters 12-24 : Cannot use Void as value
\ No newline at end of file
+Main.hx:7: characters 13-25 : Cannot use Void as value
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2969/compile-fail.hxml.stderr b/tests/misc/projects/Issue2969/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..b974040d2d9f49a624b71a9f42013fdfbe96a488
--- /dev/null
+++ b/tests/misc/projects/Issue2969/compile-fail.hxml.stderr
@@ -0,0 +1,5 @@
+Main.hx:9: lines 9-11 : Field a has different type than in A
+Main.hx:2: characters 2-29 : Interface field is defined here
+Main.hx:9: lines 9-11 : error: Int should be String
+Main.hx:9: lines 9-11 :  have: (...) -> Int
+Main.hx:9: lines 9-11 :  want: (...) -> String
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2991/compile.hxml b/tests/misc/projects/Issue2991/compile.hxml
index 301eeac5f2a87a7062b57b0f92bda1a84dbe0968..7459c0e459a342b62b5be5d62cb3f4b7e6b221a4 100644
--- a/tests/misc/projects/Issue2991/compile.hxml
+++ b/tests/misc/projects/Issue2991/compile.hxml
@@ -1 +1 @@
---display Main.hx@114@position
\ No newline at end of file
+--display Main.hx@113@position
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2991/compile.hxml.stderr b/tests/misc/projects/Issue2991/compile.hxml.stderr
index 3189760b30636ccbb95b378e57c7b800ba0b776b..8889bb4714ebd299b0680c3e54a822492a500b46 100644
--- a/tests/misc/projects/Issue2991/compile.hxml.stderr
+++ b/tests/misc/projects/Issue2991/compile.hxml.stderr
@@ -1,3 +1,3 @@
 <list>
-<pos>$$normPath(::cwd::/Main.hx, true):6: characters 12-13</pos>
+<pos>$$normPath(::cwd::/Main.hx, true):6: characters 13-14</pos>
 </list>
diff --git a/tests/misc/projects/Issue2993/compile.hxml b/tests/misc/projects/Issue2993/compile.hxml
index c38bf787aa5f0199b040eee8dc143a84ad9f263f..dc6463911605b4a2b25022682af2c29013b44c98 100644
--- a/tests/misc/projects/Issue2993/compile.hxml
+++ b/tests/misc/projects/Issue2993/compile.hxml
@@ -1 +1 @@
---display Main.hx@75@position
\ No newline at end of file
+--display Main.hx@74@position
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2993/compile.hxml.stderr b/tests/misc/projects/Issue2993/compile.hxml.stderr
index e8a83b74806993718ebeae3042f7584d232b1dcd..e15e8f19cdad6e44db59171a933826dbe1254f48 100644
--- a/tests/misc/projects/Issue2993/compile.hxml.stderr
+++ b/tests/misc/projects/Issue2993/compile.hxml.stderr
@@ -1,3 +1,3 @@
 <list>
-<pos>$$normPath(::cwd::/Main.hx, true):2: characters 15-18</pos>
+<pos>$$normPath(::cwd::/Main.hx, true):2: characters 16-19</pos>
 </list>
diff --git a/tests/misc/projects/Issue2995/position.hxml b/tests/misc/projects/Issue2995/position.hxml
index 24a265388f7a8be35cbd1afdd0689938c37600a9..1123d6762973782f48313adafcc05f3b7524140e 100644
--- a/tests/misc/projects/Issue2995/position.hxml
+++ b/tests/misc/projects/Issue2995/position.hxml
@@ -1 +1 @@
---display Main.hx@91@position
\ No newline at end of file
+--display Main.hx@83@position
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2995/position.hxml.stderr b/tests/misc/projects/Issue2995/position.hxml.stderr
index 80b60c8514946b615133648a78d78996dbc0850f..97f4137305bf52a86e67affba5db589cefd37cb9 100644
--- a/tests/misc/projects/Issue2995/position.hxml.stderr
+++ b/tests/misc/projects/Issue2995/position.hxml.stderr
@@ -1,3 +1,3 @@
 <list>
-<pos>$$normPath(::cwd::/Main.hx, true):2: characters 4-21</pos>
+<pos>$$normPath(::cwd::/Main.hx, true):2: characters 14-17</pos>
 </list>
diff --git a/tests/misc/projects/Issue2995/usage.hxml b/tests/misc/projects/Issue2995/usage.hxml
index 272d80f0c6c24761a5f5e665a9e7236ed8783a56..ddc1675cd6d110d53819cbd2f31fcc9eed0039b2 100644
--- a/tests/misc/projects/Issue2995/usage.hxml
+++ b/tests/misc/projects/Issue2995/usage.hxml
@@ -1 +1 @@
---display Main.hx@91@usage
\ No newline at end of file
+--display Main.hx@83@usage
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2995/usage.hxml.stderr b/tests/misc/projects/Issue2995/usage.hxml.stderr
index 48f99fff5803a29722acb58ac313d70a1b50ff97..f7c2bfd6a9ef7190857a8a5835507989b7146f7c 100644
--- a/tests/misc/projects/Issue2995/usage.hxml.stderr
+++ b/tests/misc/projects/Issue2995/usage.hxml.stderr
@@ -1,4 +1,4 @@
 <list>
-<pos>$$normPath(::cwd::/Main.hx, true):5: characters 16-26</pos>
-<pos>$$normPath(::cwd::/Main.hx, true):9: characters 8-18</pos>
+<pos>$$normPath(::cwd::/Main.hx, true):5: characters 17-27</pos>
+<pos>$$normPath(::cwd::/Main.hx, true):9: characters 9-19</pos>
 </list>
diff --git a/tests/misc/projects/Issue2996/compile1.hxml.stderr b/tests/misc/projects/Issue2996/compile1.hxml.stderr
index e6d3abae227238f8f174384b633af3c3cdedc79d..f16feba32483dd17307b3ef12944c47e01f29e51 100644
--- a/tests/misc/projects/Issue2996/compile1.hxml.stderr
+++ b/tests/misc/projects/Issue2996/compile1.hxml.stderr
@@ -1,3 +1,3 @@
 <list>
-<pos>$$normPath(::cwd::/A.hx, true):1: characters 0-21</pos>
+<pos>$$normPath(::cwd::/A.hx, true):1: characters 1-22</pos>
 </list>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2996/compile2.hxml.stderr b/tests/misc/projects/Issue2996/compile2.hxml.stderr
index 7a9269e4272276aa54d0e56be3f468a1a5ffe17c..0bd4745792a5c8e3e52c828107ac8c49bd197994 100644
--- a/tests/misc/projects/Issue2996/compile2.hxml.stderr
+++ b/tests/misc/projects/Issue2996/compile2.hxml.stderr
@@ -1,3 +1,3 @@
 <list>
-<pos>$$normPath(::cwd::/pack/B.hx, true):3: characters 0-10</pos>
+<pos>$$normPath(::cwd::/pack/B.hx, true):3: characters 1-11</pos>
 </list>
diff --git a/tests/misc/projects/Issue2997/Main.hx b/tests/misc/projects/Issue2997/Main.hx
index 7f71b9dbc16684543bdd5da25e24db0bc7e2b04d..271b50bc73e54969d99aae7bfb8a408fc1118a7e 100644
--- a/tests/misc/projects/Issue2997/Main.hx
+++ b/tests/misc/projects/Issue2997/Main.hx
@@ -1,4 +1,4 @@
-@:enum abstract MyEnum(Int) {
+enum abstract MyEnum(Int) {
     var A = 1;
     var B = 2;
     var C = 3;
diff --git a/tests/misc/projects/Issue2997/compile1.hxml b/tests/misc/projects/Issue2997/compile1.hxml
index af6028cf8864734d97a2c4b66fc0efdfdd5bae38..9e2dadf8ee99d6f0b4a322a22561ac3126766383 100644
--- a/tests/misc/projects/Issue2997/compile1.hxml
+++ b/tests/misc/projects/Issue2997/compile1.hxml
@@ -1 +1 @@
---display Main.hx@136@position
\ No newline at end of file
+--display Main.hx@134@position
\ No newline at end of file
diff --git a/tests/misc/projects/Issue2997/compile1.hxml.stderr b/tests/misc/projects/Issue2997/compile1.hxml.stderr
index 5bebd1d23856d905158c8c6b7a832431a78bb8c6..c23703cafc877076120ccb0aa47722a80c255512 100644
--- a/tests/misc/projects/Issue2997/compile1.hxml.stderr
+++ b/tests/misc/projects/Issue2997/compile1.hxml.stderr
@@ -1,3 +1,3 @@
 <list>
-<pos>$$normPath(::cwd::/Main.hx, true):2: characters 4-14</pos>
+<pos>$$normPath(::cwd::/Main.hx, true):2: characters 9-10</pos>
 </list>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3102/compile-each.hxml b/tests/misc/projects/Issue3102/compile-each.hxml
index 8038d4490acbdaf280375151d57acb6634223fbf..f2db6eab1287be139117329af47319c68d12f90b 100644
--- a/tests/misc/projects/Issue3102/compile-each.hxml
+++ b/tests/misc/projects/Issue3102/compile-each.hxml
@@ -1,3 +1,4 @@
--dce full
--main Main
--x test
\ No newline at end of file
+--dce full
+-m Main
+-neko test.n
+--cmd "neko test.n"
diff --git a/tests/misc/projects/Issue3102/compile2-each.hxml b/tests/misc/projects/Issue3102/compile2-each.hxml
index 6ff63eba4691b12b50f6c60c0eeeec83a23396c9..082a7b33a1c39c1043c0e49d1521b22a54a9f510 100644
--- a/tests/misc/projects/Issue3102/compile2-each.hxml
+++ b/tests/misc/projects/Issue3102/compile2-each.hxml
@@ -1,3 +1,4 @@
--dce full
--main Main2
--x test
\ No newline at end of file
+--dce full
+-m Main2
+-neko test.n
+-cmd "neko test.n"
diff --git a/tests/misc/projects/Issue3129/compile.hxml b/tests/misc/projects/Issue3129/compile.hxml
index 915bf91ec111136bba37b4e8a6e1a47dd5f328d1..d3d251316675c685cb1c5b6211353f2b8ccaf7ed 100644
--- a/tests/misc/projects/Issue3129/compile.hxml
+++ b/tests/misc/projects/Issue3129/compile.hxml
@@ -1,3 +1,2 @@
 --macro addGlobalMetadata('Main', '@:build(Build.build())')
--main Main
--x test
\ No newline at end of file
+-x Main
diff --git a/tests/misc/projects/Issue3181/Main.hx b/tests/misc/projects/Issue3181/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bd83944c5bbe97b6b4630a90593cf7cf39319b6a
--- /dev/null
+++ b/tests/misc/projects/Issue3181/Main.hx
@@ -0,0 +1,8 @@
+private enum abstract A(Int) { }
+
+class Main {
+	static public function main() {
+		var a:Null<A> = cast 1;
+		var b = switch(a) { }
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3181/compile-fail.hxml b/tests/misc/projects/Issue3181/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..41d7330585023d40376ce6645dd81fda86beb5f9
--- /dev/null
+++ b/tests/misc/projects/Issue3181/compile-fail.hxml
@@ -0,0 +1,3 @@
+--main Main
+-neko neko.n
+--no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3181/compile-fail.hxml.stderr b/tests/misc/projects/Issue3181/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..5c766bf7fc889ecefcc985ab237b5dfc4bf6361f
--- /dev/null
+++ b/tests/misc/projects/Issue3181/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:6: characters 7-8 : Variables of type Void are not allowed
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3192/compile1-fail.hxml b/tests/misc/projects/Issue3192/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue3192/compile1-fail.hxml
+++ b/tests/misc/projects/Issue3192/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3192/compile1-fail.hxml.stderr b/tests/misc/projects/Issue3192/compile1-fail.hxml.stderr
index b5b1cdcea45f57de1e84b0cc381082395f60bd7b..d3fdad6432ce1ecb993bc70999b14c46300a6d67 100644
--- a/tests/misc/projects/Issue3192/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3192/compile1-fail.hxml.stderr
@@ -1,3 +1,3 @@
-Main1.hx:3: characters 18-32 : { b : Int, a : Int } has extra field b
-Main1.hx:3: characters 2-33 : { b : Int, a : Int } should be { a : Int }
-Main1.hx:3: characters 2-33 : { b : Int, a : Int } has extra field b
\ No newline at end of file
+Main1.hx:3: characters 19-33 : { b : Int, a : Int } has extra field b
+Main1.hx:3: characters 3-34 : { b : Int, a : Int } should be { a : Int }
+Main1.hx:3: characters 3-34 : { b : Int, a : Int } has extra field b
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3238/default-value-fail.hxml.stderr b/tests/misc/projects/Issue3238/default-value-fail.hxml.stderr
index 1634feb4cc13fa0e19379b2fa45890d59ff60a9b..5459d6cd38619e13f71d13e10fcb792c3cf9a9dd 100644
--- a/tests/misc/projects/Issue3238/default-value-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3238/default-value-fail.hxml.stderr
@@ -1 +1 @@
-DefaultValue.hx:2: characters 44-48 : Rest argument cannot have default value
+DefaultValue.hx:2: characters 45-49 : Rest argument cannot have default value
diff --git a/tests/misc/projects/Issue3238/non-extern-fail.hxml.stderr b/tests/misc/projects/Issue3238/non-extern-fail.hxml.stderr
index ee387e25c8e1e85651e54bd1ff3b0ddd7a2b37e4..45d79f3437fff6ba0c28778a01faa86bb77d71b0 100644
--- a/tests/misc/projects/Issue3238/non-extern-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3238/non-extern-fail.hxml.stderr
@@ -1 +1 @@
-NonExtern.hx:2: characters 22-23 : Rest argument are only supported for extern methods
+NonExtern.hx:2: characters 23-24 : Rest argument are only supported for extern methods
diff --git a/tests/misc/projects/Issue3238/not-last-fail.hxml.stderr b/tests/misc/projects/Issue3238/not-last-fail.hxml.stderr
index 8b8ec7dd4997dd2b5e55730e5191a0960753e9db..a0965258797a320907f4104d563a6de41a8beb41 100644
--- a/tests/misc/projects/Issue3238/not-last-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3238/not-last-fail.hxml.stderr
@@ -1 +1 @@
-NotLast.hx:2: characters 15-16 : Rest should only be used for the last function argument
+NotLast.hx:2: characters 16-17 : Rest should only be used for the last function argument
diff --git a/tests/misc/projects/Issue3238/optional-fail.hxml.stderr b/tests/misc/projects/Issue3238/optional-fail.hxml.stderr
index e293759b3877d0c77cc8a416aaf4521e657a93d3..35bb7297c6d54ffd2f419bb622ddc61f5b86fee8 100644
--- a/tests/misc/projects/Issue3238/optional-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3238/optional-fail.hxml.stderr
@@ -1 +1 @@
-Optional.hx:2: characters 16-17 : Rest argument cannot be optional
+Optional.hx:2: characters 17-18 : Rest argument cannot be optional
diff --git a/tests/misc/projects/Issue3256/Main.hx b/tests/misc/projects/Issue3256/Main.hx
deleted file mode 100644
index 2a2357ff9a309489b7969e952d64919f81efb21b..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3256/Main.hx
+++ /dev/null
@@ -1,10 +0,0 @@
-abstract A(Int) from Int {
-    public function addFloat(f:Float):Float return this + f;
-}
-
-class Main {
-    static function main() {
-        var a:A = 1;
-        a.addFloat(
-    }
-}
diff --git a/tests/misc/projects/Issue3256/compile.hxml b/tests/misc/projects/Issue3256/compile.hxml
deleted file mode 100644
index fb9549fe300a422b2f546e5034bb11c605049228..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3256/compile.hxml
+++ /dev/null
@@ -1 +0,0 @@
---display Main.hx@173
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3256/compile.hxml.stderr b/tests/misc/projects/Issue3256/compile.hxml.stderr
deleted file mode 100644
index e8c44461ceb583c74cd72944e933f728158107d6..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3256/compile.hxml.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-<type>
-f : Float -&gt; Float
-</type>
-
diff --git a/tests/misc/projects/Issue3261/Main.hx b/tests/misc/projects/Issue3261/Main.hx
deleted file mode 100644
index b066d036f438314c6f542cb6478b460283a3fae7..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3261/Main.hx
+++ /dev/null
@@ -1,11 +0,0 @@
-using Main.A;
-
-class A {
-    public static function f(v:String, b:Int):String return v;
-}
-
-class Main {
-    static function main() {
-        "a".f(
-    }
-}
diff --git a/tests/misc/projects/Issue3261/compile.hxml b/tests/misc/projects/Issue3261/compile.hxml
deleted file mode 100644
index 37aa8cecd901354b54d8dc25d6ab3d999c170f39..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3261/compile.hxml
+++ /dev/null
@@ -1 +0,0 @@
---display Main.hx@147
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3261/compile.hxml.stderr b/tests/misc/projects/Issue3261/compile.hxml.stderr
deleted file mode 100644
index e0563b62da0a5b84a8b66d30de5363f368b4ef8f..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3261/compile.hxml.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-<type>
-b : Int -&gt; String
-</type>
-
diff --git a/tests/misc/projects/Issue3300/test-cwd-fail.hxml.stderr b/tests/misc/projects/Issue3300/test-cwd-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..ff010fb6f4124472f3d8f8103e38f04148327148
--- /dev/null
+++ b/tests/misc/projects/Issue3300/test-cwd-fail.hxml.stderr
@@ -0,0 +1 @@
+Error: Invalid directory: unexistant
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3361/compile1-fail.hxml.stderr b/tests/misc/projects/Issue3361/compile1-fail.hxml.stderr
index 0d7e46bcb1940e6fcc1c5b4cffafffb6922d1c98..a7ad02ebaacb5627f4432f97a099d92f5cccad21 100644
--- a/tests/misc/projects/Issue3361/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3361/compile1-fail.hxml.stderr
@@ -1,4 +1,5 @@
 Main.hx:5: lines 5-8 : Field v has different type than in I
-Main.hx:2: characters 8-28 : Interface field is defined here
-Main.hx:5: lines 5-8 : String -> Void should be Dynamic -> Void
-Main.hx:5: lines 5-8 : String should be Dynamic
\ No newline at end of file
+Main.hx:2: characters 2-29 : Interface field is defined here
+Main.hx:5: lines 5-8 : error: String should be Dynamic
+Main.hx:5: lines 5-8 :  have: (Dynamic) -> ...
+Main.hx:5: lines 5-8 :  want: (String) -> ...
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3361/compile2-fail.hxml.stderr b/tests/misc/projects/Issue3361/compile2-fail.hxml.stderr
index 6f008abb2f413a4faafc1b520c0d77c50ffa7c96..16f8dd9950c14d749c138c6bf9e9ce663156501b 100644
--- a/tests/misc/projects/Issue3361/compile2-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3361/compile2-fail.hxml.stderr
@@ -1,4 +1,5 @@
-Main2.hx:6: characters 16-45 : Field f has different type than in I
-Main2.hx:2: characters 16-43 : Interface field is defined here
-Main2.hx:6: characters 16-45 : s : String -> Void should be d : Dynamic -> Void
-Main2.hx:6: characters 16-45 : String should be Dynamic
\ No newline at end of file
+Main2.hx:6: characters 2-46 : Field f has different type than in I
+Main2.hx:2: characters 2-44 : Interface field is defined here
+Main2.hx:6: characters 2-46 : error: String should be Dynamic
+Main2.hx:6: characters 2-46 :  have: (Dynamic) -> ...
+Main2.hx:6: characters 2-46 :  want: (String) -> ...
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3417/compile-fail.hxml.stderr b/tests/misc/projects/Issue3417/compile-fail.hxml.stderr
index 03227affb2fe30717dfc79dfbccf21c600e5bdaa..59246a36baaf05ee7cd382dd0321663997676c3d 100644
--- a/tests/misc/projects/Issue3417/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3417/compile-fail.hxml.stderr
@@ -1,3 +1,3 @@
-Main.hx:6: characters 11-26 : Field f has different type than in I
-Main.hx:2: characters 4-27 : Interface field is defined here
-Main.hx:6: characters 11-26 : Different number of function arguments
\ No newline at end of file
+Main.hx:6: characters 5-27 : Field f has different type than in I
+Main.hx:2: characters 5-28 : Interface field is defined here
+Main.hx:6: characters 5-27 : Different number of function arguments
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3457/compile-fail.hxml.stderr b/tests/misc/projects/Issue3457/compile-fail.hxml.stderr
index 7e9d4b2d6b85e38db56db8f1300dc4f38f1c83f0..4021d1441d8d47d5dae989d0d9e650139588552f 100644
--- a/tests/misc/projects/Issue3457/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3457/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:1: characters 0-14 : Type aliases must start with an uppercase letter
\ No newline at end of file
+Main.hx:1: characters 13-14 : Type aliases must start with an uppercase letter
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3542/compile.hxml b/tests/misc/projects/Issue3542/compile.hxml
index d90d7799a1059446892fe92c58c20619aa578b6a..a2ec128a45c707ea65bc8439a40eee011144f5b8 100644
--- a/tests/misc/projects/Issue3542/compile.hxml
+++ b/tests/misc/projects/Issue3542/compile.hxml
@@ -1,4 +1,4 @@
--main Main
+--main Main
 -js js.js
 --no-output
 --no-inline
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3607/Main.hx b/tests/misc/projects/Issue3607/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..49f192ee75ccadb9c6b576fdcf4f3f71c33e8493
--- /dev/null
+++ b/tests/misc/projects/Issue3607/Main.hx
@@ -0,0 +1,24 @@
+using Main.Tools;
+
+class Tools {
+	@:pure(false)
+    public static function f(b:Base) {}
+
+	public static var test:String;
+}
+
+class Base {
+	public function new() { }
+}
+
+class Child extends Base {
+    public function a() {
+        super.f();
+    }
+}
+
+class Main {
+	static public function main() {
+		new Child().a();
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3607/compile-fail.hxml b/tests/misc/projects/Issue3607/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c098216e78e08cde30049a62b9005ecdee8bccf8
--- /dev/null
+++ b/tests/misc/projects/Issue3607/compile-fail.hxml
@@ -0,0 +1 @@
+Main
diff --git a/tests/misc/projects/Issue3607/compile-fail.hxml.stderr b/tests/misc/projects/Issue3607/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..b6dd90d5f8d63b91fc5f728ff9378f38f93334ce
--- /dev/null
+++ b/tests/misc/projects/Issue3607/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:16: characters 15-16 : Base has no field f
diff --git a/tests/misc/projects/Issue3621/Main1.hx b/tests/misc/projects/Issue3621/Main1.hx
index 3eb7380dc54edace4ffa3a77388a0adbd8dab25c..14fe7890cc3c31a5b6565bb41ecce43874646405 100644
--- a/tests/misc/projects/Issue3621/Main1.hx
+++ b/tests/misc/projects/Issue3621/Main1.hx
@@ -1,5 +1,5 @@
 @:native("lol")
-@:enum extern abstract E(String) {
+extern enum abstract E(String) {
     var A;
     var B;
     var C;
diff --git a/tests/misc/projects/Issue3621/compile-fail.hxml b/tests/misc/projects/Issue3621/compile-fail.hxml
index f3f58b6c1c30810ebb46ccc2ee999d89e2cad06f..a8e28c677650c351d9ca6e971b2622b7a68014c7 100644
--- a/tests/misc/projects/Issue3621/compile-fail.hxml
+++ b/tests/misc/projects/Issue3621/compile-fail.hxml
@@ -1,3 +1,3 @@
--main Main1
+--main Main1
 --no-output
 -js js.js
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3621/compile-fail.hxml.stderr b/tests/misc/projects/Issue3621/compile-fail.hxml.stderr
index f736cdd0203b8162bcc8d595a16b423b2e46dde2..4482f6eb23531f871ccfcddbe9e672d987372fff 100644
--- a/tests/misc/projects/Issue3621/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3621/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main1.hx:11: characters 16-17 : Unmatched patterns: E.C
\ No newline at end of file
+Main1.hx:11: characters 17-18 : Unmatched patterns: E.C
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3678/compile-fail.hxml.stderr b/tests/misc/projects/Issue3678/compile-fail.hxml.stderr
index 3b264b06be4dd77366e32c45a2f685ad002ebb42..65101dece3f71f431bb86b1cf0919e3ffc6dfd84 100644
--- a/tests/misc/projects/Issue3678/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3678/compile-fail.hxml.stderr
@@ -1,3 +1 @@
-Main.hx:3: characters 17-18 : expression expected after =
-Main.hx:3: characters 19-69 : Unnamed lvalue functions are not supported
-Main.hx:4: characters 8-12 : Unknown identifier : func
\ No newline at end of file
+Main.hx:3: characters 20-70 : Call or function expected after inline keyword
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3699/compile-var-fail.hxml.stderr b/tests/misc/projects/Issue3699/compile-var-fail.hxml.stderr
index 8bf790eafe7b9e7772f77301584726110ba7b907..87a0deb10b85d7e573071e2ce37133326400d719 100644
--- a/tests/misc/projects/Issue3699/compile-var-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3699/compile-var-fail.hxml.stderr
@@ -1,2 +1 @@
-MainVar.hx:3: characters 10-11 : expression expected after =
-MainVar.hx:3: characters 12-13 : Unexpected ;
\ No newline at end of file
+MainVar.hx:3: characters 13-14 : Expected expression
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3710/compile-1-fail.hxml.stderr b/tests/misc/projects/Issue3710/compile-1-fail.hxml.stderr
index 780277f3b5e6faae9ee1a498a2daeda2c488cde2..9c31a952b075f58fb666282fa1b35f3e8a084af2 100644
--- a/tests/misc/projects/Issue3710/compile-1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3710/compile-1-fail.hxml.stderr
@@ -1 +1 @@
-Main1.hx:3: characters 8-22 : Invalid number of type parameters for A
\ No newline at end of file
+Main1.hx:3: characters 9-23 : Invalid number of type parameters for A
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3710/compile-2-fail.hxml.stderr b/tests/misc/projects/Issue3710/compile-2-fail.hxml.stderr
index dd81bd5fc08ea2d6ba7104e354be4fc824aadd7b..fc6779d42a95c70b45fa9472373e7b89ed062fcc 100644
--- a/tests/misc/projects/Issue3710/compile-2-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3710/compile-2-fail.hxml.stderr
@@ -1 +1 @@
-Main2.hx:3: characters 8-17 : Invalid number of type parameters for A
\ No newline at end of file
+Main2.hx:3: characters 9-18 : Invalid number of type parameters for A
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3714/compile-fail.hxml b/tests/misc/projects/Issue3714/compile-fail.hxml
index 42409e72918a42a82dd3b99f48443419487fab57..20afe58fbc62f38e4e86686469332167f41bbc93 100644
--- a/tests/misc/projects/Issue3714/compile-fail.hxml
+++ b/tests/misc/projects/Issue3714/compile-fail.hxml
@@ -1 +1 @@
--main Main
+--main Main
diff --git a/tests/misc/projects/Issue3714/compile-fail.hxml.stderr b/tests/misc/projects/Issue3714/compile-fail.hxml.stderr
index aace8ef00394be06614be7e65d632c0a912727c3..ba8a6278005c73baee01bcb3c5cccba1f61dfb47 100644
--- a/tests/misc/projects/Issue3714/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3714/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:7: characters 8-11 : Cannot access private field a
\ No newline at end of file
+Main.hx:7: characters 9-12 : Cannot access private field a
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3726/compile-1-fail.hxml.stderr b/tests/misc/projects/Issue3726/compile-1-fail.hxml.stderr
index 4bd2f356981139ecd83401d10f7016699e561688..2e46460f3a01d53e7328e305c9ea6a5c1fb3b2c0 100644
--- a/tests/misc/projects/Issue3726/compile-1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3726/compile-1-fail.hxml.stderr
@@ -1 +1 @@
-Main1.hx:3: characters 4-36 : Method get_test is no valid accessor for test because it is not static
\ No newline at end of file
+Main1.hx:3: characters 5-37 : Method get_test is no valid accessor for test because it is not static
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3726/compile-2-fail.hxml.stderr b/tests/misc/projects/Issue3726/compile-2-fail.hxml.stderr
index d74a84e72db849bc2e214940e63316f1f8b1313b..1a5fe8fb6781ba768e80fea72ae797b74bac8e46 100644
--- a/tests/misc/projects/Issue3726/compile-2-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3726/compile-2-fail.hxml.stderr
@@ -1 +1 @@
-Main2.hx:3: characters 11-43 : Method get_test is no valid accessor for test because it is static
\ No newline at end of file
+Main2.hx:3: characters 5-44 : Method get_test is no valid accessor for test because it is static
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3781/compile-fail.hxml.stderr b/tests/misc/projects/Issue3781/compile-fail.hxml.stderr
index 2fdc6d19cf2a828d76e515651230fc176290015f..2db2cf6d309e91d2b7bfb554df5be4abcd124f63 100644
--- a/tests/misc/projects/Issue3781/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3781/compile-fail.hxml.stderr
@@ -1,2 +1,2 @@
-Main.hx:12: characters 8-10 : Constraint check failure for E1.T
-Main.hx:12: characters 8-10 : Main.T should be String
\ No newline at end of file
+Main.hx:12: characters 9-11 : Constraint check failure for E1.T
+Main.hx:12: characters 9-11 : Main.T should be String
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3783/compile-fail.hxml b/tests/misc/projects/Issue3783/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue3783/compile-fail.hxml
+++ b/tests/misc/projects/Issue3783/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3783/compile-fail.hxml.stderr b/tests/misc/projects/Issue3783/compile-fail.hxml.stderr
index 9c417459cc9931f766f010225517f3e40efcd019..1f171e0a4d6d52a7fbb597ee746faa884b37a2bb 100644
--- a/tests/misc/projects/Issue3783/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3783/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:3: characters 2-8 : Cannot access this or other member field in variable initialization
\ No newline at end of file
+Main.hx:3: characters 3-9 : Cannot access this or other member field in variable initialization
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3802/compile-fail.hxml.stderr b/tests/misc/projects/Issue3802/compile-fail.hxml.stderr
index d6958e1af2165f3032a1db8deda8d6f1b45a5a71..de202ec9541790ad414aeff4e8ecf6287485ccfa 100644
--- a/tests/misc/projects/Issue3802/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3802/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:3: characters 2-8 : Not enough arguments, expected i:Int, s:String
\ No newline at end of file
+Main.hx:3: characters 3-9 : Not enough arguments, expected i:Int, s:String
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3830/Main.hx b/tests/misc/projects/Issue3830/Main.hx
deleted file mode 100644
index 32573e3b7489e82e4ddc5226d2b573ed6191a5d0..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3830/Main.hx
+++ /dev/null
@@ -1,12 +0,0 @@
-@:callable
-@:noFollow
-abstract FunctionPointer<T:haxe.Constraints.Function>(T) from T {}
-
-class Main {
-	static function main() {
-		var f:FunctionPointer<String->Void> = test;
-		f(|
-	}
-
-	static function test(s:String) { }
-}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3830/compile-fail.hxml b/tests/misc/projects/Issue3830/compile-fail.hxml
index f10f563c23c635304aab9afbc0a8d989c22971dd..0c67b3350b91b4d53b0e7507d68506efff1a289c 100644
--- a/tests/misc/projects/Issue3830/compile-fail.hxml
+++ b/tests/misc/projects/Issue3830/compile-fail.hxml
@@ -1,2 +1,2 @@
--main MainFail
+--main MainFail
 --no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3830/compile-fail.hxml.stderr b/tests/misc/projects/Issue3830/compile-fail.hxml.stderr
index 9bd0b95409eff525eeca42fe550a0ceacd8bae00..883c6e96554de04b0bed30aa3ad39c9cbf436741 100644
--- a/tests/misc/projects/Issue3830/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3830/compile-fail.hxml.stderr
@@ -1 +1 @@
-MainFail.hx:3: characters 0-63 : @:coreType abstracts cannot be @:callable
\ No newline at end of file
+MainFail.hx:3: characters 1-64 : @:coreType abstracts cannot be @:callable
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3830/compile.hxml b/tests/misc/projects/Issue3830/compile.hxml
deleted file mode 100644
index 52ac307a0f553578c2f938c61b9efe6466939c6c..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3830/compile.hxml
+++ /dev/null
@@ -1,2 +0,0 @@
--main Main
---display Main.hx@0
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3830/compile.hxml.stderr b/tests/misc/projects/Issue3830/compile.hxml.stderr
deleted file mode 100644
index 58a8dee24fc03f05193dde41742c1e887541fb6f..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3830/compile.hxml.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-<type>
-String -&gt; Void
-</type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3911/Main1.hx b/tests/misc/projects/Issue3911/Main1.hx
deleted file mode 100644
index 1805c07ea1033f7ab95324df31e67f454cf48a1f..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3911/Main1.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-class Main1 {
-    function new(a:Int) {}
-
-    static function main() {
-        var m = new Main1(
-    }
-}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3911/Main2.hx b/tests/misc/projects/Issue3911/Main2.hx
deleted file mode 100644
index 5de5696ec5b400aede2983acf895eee1d4b49540..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3911/Main2.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-class Main2 {
-    function new(a:Int) {}
-
-    static function main() {
-        var m = new Main2()
-    }
-}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3911/Main3.hx b/tests/misc/projects/Issue3911/Main3.hx
deleted file mode 100644
index 37f829b382646db06c851476b636f4a72c81637a..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3911/Main3.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-class Main3 {
-    function new(a:Int) {}
-
-    static function main() {
-        var m = new Main3();
-    }
-}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3911/compile1.hxml b/tests/misc/projects/Issue3911/compile1.hxml
deleted file mode 100644
index 39746c8febc89356b75f16ae9668ab89261ed904..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3911/compile1.hxml
+++ /dev/null
@@ -1 +0,0 @@
---display Main1.hx@97
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3911/compile1.hxml.stderr b/tests/misc/projects/Issue3911/compile1.hxml.stderr
deleted file mode 100644
index 7f49c22663e3274efd6b883f0cf3bdc2606e829e..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3911/compile1.hxml.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-<type>
-a : Int -&gt; Void
-</type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3911/compile2.hxml b/tests/misc/projects/Issue3911/compile2.hxml
deleted file mode 100644
index dbcc7454c11098d1e6aa04a2cc51b74e2ebf5137..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3911/compile2.hxml
+++ /dev/null
@@ -1 +0,0 @@
---display Main2.hx@97
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3911/compile2.hxml.stderr b/tests/misc/projects/Issue3911/compile2.hxml.stderr
deleted file mode 100644
index 7f49c22663e3274efd6b883f0cf3bdc2606e829e..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3911/compile2.hxml.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-<type>
-a : Int -&gt; Void
-</type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3911/compile3.hxml b/tests/misc/projects/Issue3911/compile3.hxml
deleted file mode 100644
index ba74a082153d79d03d4e587dbdcae5c7c55d5a11..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3911/compile3.hxml
+++ /dev/null
@@ -1 +0,0 @@
---display Main3.hx@97
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3911/compile3.hxml.stderr b/tests/misc/projects/Issue3911/compile3.hxml.stderr
deleted file mode 100644
index 7f49c22663e3274efd6b883f0cf3bdc2606e829e..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue3911/compile3.hxml.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-<type>
-a : Int -&gt; Void
-</type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3931/compile2.hxml.stderr b/tests/misc/projects/Issue3931/compile2.hxml.stderr
index 7a6b76605d72f58280996440ca14ae8a90a7a884..dd35fd6bb2242e53371e504cd758635061ce2d14 100644
--- a/tests/misc/projects/Issue3931/compile2.hxml.stderr
+++ b/tests/misc/projects/Issue3931/compile2.hxml.stderr
@@ -1,4 +1,4 @@
 <list>
-<i n="A" k="type"><t></t><d></d></i>
-<i n="C" k="type"><t></t><d></d></i>
+<i n="A" k="type"><t>pack.A</t><d></d></i>
+<i n="C" k="type"><t>pack.C</t><d></d></i>
 </list>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3956/compile.hxml b/tests/misc/projects/Issue3956/compile.hxml
index 31c8a033905c79d22f458b505874d430f7bbe2e8..a9c9c89422934ea711df8d473fe8734f0bd0da25 100644
--- a/tests/misc/projects/Issue3956/compile.hxml
+++ b/tests/misc/projects/Issue3956/compile.hxml
@@ -1,3 +1,2 @@
--main Main
 -D analyzer
--x neko.n
\ No newline at end of file
+-x Main
diff --git a/tests/misc/projects/Issue3975/compile-fail.hxml b/tests/misc/projects/Issue3975/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue3975/compile-fail.hxml
+++ b/tests/misc/projects/Issue3975/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue3975/compile-fail.hxml.stderr b/tests/misc/projects/Issue3975/compile-fail.hxml.stderr
index 1b788684ab70b787c38ac1ac5cacd27bc3635cae..eb5d659cb01ae0e4b1b502368c001c7587a68874 100644
--- a/tests/misc/projects/Issue3975/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue3975/compile-fail.hxml.stderr
@@ -1,2 +1,2 @@
-Main.hx:4: characters 2-54 : Array<String> should be { pop : Void -> Void }
-Main.hx:4: characters 2-54 : Field pop is method but should be (get,never)
\ No newline at end of file
+Main.hx:4: characters 3-55 : Array<String> should be { pop : Void -> Void }
+Main.hx:4: characters 3-55 : Field pop is method but should be (get,never)
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4114/compile1-fail.hxml b/tests/misc/projects/Issue4114/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue4114/compile1-fail.hxml
+++ b/tests/misc/projects/Issue4114/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4114/compile1-fail.hxml.stderr b/tests/misc/projects/Issue4114/compile1-fail.hxml.stderr
index 90443b2310311c77236e22cf46d7b8b7b15b2ac3..5aa4af48946da1160e075f716589d7a8c48f0ccb 100644
--- a/tests/misc/projects/Issue4114/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4114/compile1-fail.hxml.stderr
@@ -1 +1 @@
-Main1.hx:2: characters 31-34 : Missing return: String
\ No newline at end of file
+Main1.hx:2: characters 32-35 : Missing return: String
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4114/compile2-fail.hxml b/tests/misc/projects/Issue4114/compile2-fail.hxml
index e51d89523e9584910fb3fc3b978161dc7163b3f0..031fe8ecc3114e35f6729f2cb9b85c229dd71a6c 100644
--- a/tests/misc/projects/Issue4114/compile2-fail.hxml
+++ b/tests/misc/projects/Issue4114/compile2-fail.hxml
@@ -1,2 +1,2 @@
--main Main2
+--main Main2
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4160/compile.hxml b/tests/misc/projects/Issue4160/compile.hxml
index 9dd0b4bcfdcfb6373452cb8ef7568bfccbdc7911..aae7872d734049c148f246c08d90cdcf1f049083 100644
--- a/tests/misc/projects/Issue4160/compile.hxml
+++ b/tests/misc/projects/Issue4160/compile.hxml
@@ -1,2 +1,2 @@
--main test.Main
+--main test.Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4218/build.hxml b/tests/misc/projects/Issue4218/build.hxml
deleted file mode 100644
index 07699b8874a209c9cb32340a9234f7386d043252..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue4218/build.hxml
+++ /dev/null
@@ -1,3 +0,0 @@
--python Test.py
--main Main
--cmd python3 Test.py
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4247/compile-fail.hxml b/tests/misc/projects/Issue4247/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4247/compile-fail.hxml
+++ b/tests/misc/projects/Issue4247/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4247/compile-fail.hxml.stderr b/tests/misc/projects/Issue4247/compile-fail.hxml.stderr
index 9b7d02ce35f92343cc595b9c6fa1a5fa8bd3fb0e..0759fcbf4194da81a738b09132afd573db59612f 100644
--- a/tests/misc/projects/Issue4247/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4247/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:8: characters 3-21 : Incompatible pattern
\ No newline at end of file
+Main.hx:8: characters 4-22 : Incompatible pattern
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4250/compile-fail.hxml b/tests/misc/projects/Issue4250/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4250/compile-fail.hxml
+++ b/tests/misc/projects/Issue4250/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4250/compile-fail.hxml.stderr b/tests/misc/projects/Issue4250/compile-fail.hxml.stderr
index 150f69ecea94d2871eb069199c77cb0293962850..143653227694c1f8fef076455d8d7a111d5df739 100644
--- a/tests/misc/projects/Issue4250/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4250/compile-fail.hxml.stderr
@@ -1,5 +1,3 @@
-Main.hx:11: characters 8-30 : SomeNode should be Node
-Main.hx:11: characters 8-30 : SomeNode should be { parent : Node }
-Main.hx:11: characters 8-30 : Invalid type for field parent :
-Main.hx:11: characters 8-30 : SomeNode should be Node
-Main.hx:11: characters 8-30 : SomeNode should be { parent : Node }
\ No newline at end of file
+Main.hx:11: characters 9-31 : error: SomeNode should be Node
+Main.hx:11: characters 9-31 :  have: { parent: SomeNode }
+Main.hx:11: characters 9-31 :  want: { parent: Node }
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4265/compile.hxml b/tests/misc/projects/Issue4265/compile.hxml
index 31c8a033905c79d22f458b505874d430f7bbe2e8..a9c9c89422934ea711df8d473fe8734f0bd0da25 100644
--- a/tests/misc/projects/Issue4265/compile.hxml
+++ b/tests/misc/projects/Issue4265/compile.hxml
@@ -1,3 +1,2 @@
--main Main
 -D analyzer
--x neko.n
\ No newline at end of file
+-x Main
diff --git a/tests/misc/projects/Issue4293/compile-abstract-fail.hxml.stderr b/tests/misc/projects/Issue4293/compile-abstract-fail.hxml.stderr
index f8df10b83b9d7bed51dcdbd53c1ddefae6490ca4..9471f36a0ffc47aa2ffdaaa1d83d9345ed4f877f 100644
--- a/tests/misc/projects/Issue4293/compile-abstract-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4293/compile-abstract-fail.hxml.stderr
@@ -1 +1 @@
-OnAbstract.hx:1: characters 23-24 : Duplicate type parameter name: T
+OnAbstract.hx:1: characters 24-25 : Duplicate type parameter name: T
diff --git a/tests/misc/projects/Issue4293/compile-class-fail.hxml.stderr b/tests/misc/projects/Issue4293/compile-class-fail.hxml.stderr
index 77cb5f5286125f441a571950c43df7f6b85dc0b3..9441678af4a36122b5e952788055e0beba6d7002 100644
--- a/tests/misc/projects/Issue4293/compile-class-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4293/compile-class-fail.hxml.stderr
@@ -1 +1 @@
-OnClass.hx:1: characters 17-18 : Duplicate type parameter name: T
\ No newline at end of file
+OnClass.hx:1: characters 18-19 : Duplicate type parameter name: T
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4293/compile-enum-ctor-fail.hxml.stderr b/tests/misc/projects/Issue4293/compile-enum-ctor-fail.hxml.stderr
index be6c20e5b3984511e6d030941c2fdf642fb12c92..05abcd6dfa713c50cf97912252d9fc764634cc0f 100644
--- a/tests/misc/projects/Issue4293/compile-enum-ctor-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4293/compile-enum-ctor-fail.hxml.stderr
@@ -1 +1 @@
-OnEnumCtor.hx:2: characters 6-7 : Duplicate type parameter name: T
\ No newline at end of file
+OnEnumCtor.hx:2: characters 7-8 : Duplicate type parameter name: T
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4293/compile-enum-fail.hxml.stderr b/tests/misc/projects/Issue4293/compile-enum-fail.hxml.stderr
index 733358afb3b9fc608d325684122b64ef3fb0a3f7..f4548230864794ca3711c0e3f68037dc2da53787 100644
--- a/tests/misc/projects/Issue4293/compile-enum-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4293/compile-enum-fail.hxml.stderr
@@ -1 +1 @@
-OnEnum.hx:1: characters 15-16 : Duplicate type parameter name: T
\ No newline at end of file
+OnEnum.hx:1: characters 16-17 : Duplicate type parameter name: T
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4293/compile-field-fail.hxml.stderr b/tests/misc/projects/Issue4293/compile-field-fail.hxml.stderr
index 63595ad1fe82174f7805774048f6ac7046357866..7447a99604b8b669123fbfaf6e2f51979ba3988f 100644
--- a/tests/misc/projects/Issue4293/compile-field-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4293/compile-field-fail.hxml.stderr
@@ -1 +1 @@
-OnField.hx:2: characters 25-26 : Duplicate type parameter name: T
\ No newline at end of file
+OnField.hx:2: characters 26-27 : Duplicate type parameter name: T
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4293/compile-typedef-fail.hxml.stderr b/tests/misc/projects/Issue4293/compile-typedef-fail.hxml.stderr
index e1992f6628ddb3eb3f31e239c39bc606aab51cea..b82637557d71d7104b1588949f3e7504410e5b9a 100644
--- a/tests/misc/projects/Issue4293/compile-typedef-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4293/compile-typedef-fail.hxml.stderr
@@ -1 +1 @@
-OnTypedef.hx:1: characters 21-22 : Duplicate type parameter name: T
\ No newline at end of file
+OnTypedef.hx:1: characters 22-23 : Duplicate type parameter name: T
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4364/compile-fail.hxml b/tests/misc/projects/Issue4364/compile-fail.hxml
index 454d47285fef442e7c172c29eff5cf7906136ce8..41d7330585023d40376ce6645dd81fda86beb5f9 100644
--- a/tests/misc/projects/Issue4364/compile-fail.hxml
+++ b/tests/misc/projects/Issue4364/compile-fail.hxml
@@ -1,3 +1,3 @@
--main Main
+--main Main
 -neko neko.n
 --no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4364/compile-fail.hxml.stderr b/tests/misc/projects/Issue4364/compile-fail.hxml.stderr
index 3140f336a8667dfc0058a9bf99b7ceeca3f5a99b..4009dbd2de571801792b8b48598b5e2a3646dbf5 100644
--- a/tests/misc/projects/Issue4364/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4364/compile-fail.hxml.stderr
@@ -1,2 +1,2 @@
-Main.hx:22: characters 14-18 : Constraint check failure for G.T
-Main.hx:22: characters 14-18 : A should be haxe.Constructible<Void -> Void>
\ No newline at end of file
+Main.hx:22: characters 15-19 : Constraint check failure for G.T
+Main.hx:22: characters 15-19 : A should be haxe.Constructible<Void -> Void>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4370/compile-fail.hxml.stderr b/tests/misc/projects/Issue4370/compile-fail.hxml.stderr
index f14d3e285112c3a79dab7a163f0d2d89784f65e3..f38d68c14c536640a3b8eccfb6838c3dd95cf3c0 100644
--- a/tests/misc/projects/Issue4370/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4370/compile-fail.hxml.stderr
@@ -1 +1 @@
-Test.hx:9: characters 15-18 : Int should be Bool
\ No newline at end of file
+Test.hx:9: characters 16-19 : Int should be Bool
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4378/compile-fail.hxml b/tests/misc/projects/Issue4378/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4378/compile-fail.hxml
+++ b/tests/misc/projects/Issue4378/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4378/compile-fail.hxml.stderr b/tests/misc/projects/Issue4378/compile-fail.hxml.stderr
index 5d3cd2e7ed900447a3f0533a1f0337f8e0f4657f..ddf928aafdfa5536939fa59ced42ce00cfc822a8 100644
--- a/tests/misc/projects/Issue4378/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4378/compile-fail.hxml.stderr
@@ -1,4 +1,5 @@
 Main.hx:5: lines 5-7 : Field test has different type than in I
-Main.hx:16: characters 1-31 : Interface field is defined here
-Main.hx:5: lines 5-7 : s : String -> Void should be s : Dynamic -> Void
-Main.hx:5: lines 5-7 : String should be Dynamic
\ No newline at end of file
+Main.hx:16: characters 2-32 : Interface field is defined here
+Main.hx:5: lines 5-7 : error: String should be Dynamic
+Main.hx:5: lines 5-7 :  have: (Dynamic) -> ...
+Main.hx:5: lines 5-7 :  want: (String) -> ...
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4399/compile.hxml b/tests/misc/projects/Issue4399/compile.hxml
index 31c8a033905c79d22f458b505874d430f7bbe2e8..a9c9c89422934ea711df8d473fe8734f0bd0da25 100644
--- a/tests/misc/projects/Issue4399/compile.hxml
+++ b/tests/misc/projects/Issue4399/compile.hxml
@@ -1,3 +1,2 @@
--main Main
 -D analyzer
--x neko.n
\ No newline at end of file
+-x Main
diff --git a/tests/misc/projects/Issue4404/compile1.hxml b/tests/misc/projects/Issue4404/compile1.hxml
index 876b73ce0e8af49137abd532f5be31adc164546b..5156b73a06a6e466bc730bad7b1fa5b1fbf18910 100644
--- a/tests/misc/projects/Issue4404/compile1.hxml
+++ b/tests/misc/projects/Issue4404/compile1.hxml
@@ -1,4 +1,4 @@
--cp src
--main Main
+-p src
+--main Main
 -js js.js
 --no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4448/compile1-fail.hxml b/tests/misc/projects/Issue4448/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue4448/compile1-fail.hxml
+++ b/tests/misc/projects/Issue4448/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4448/compile1-fail.hxml.stderr b/tests/misc/projects/Issue4448/compile1-fail.hxml.stderr
index 7358f10f79ac0ceb8a8f98266cd4ef33fd2ab972..227a46db0c02595760460160f1326ae8738cdf8a 100644
--- a/tests/misc/projects/Issue4448/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4448/compile1-fail.hxml.stderr
@@ -1,3 +1,3 @@
-Main1.hx:11: characters 8-9 : Cannot access non-static field f from static method
-Main1.hx:12: characters 8-9 : Cannot access non-static field v from static method
-Main1.hx:13: characters 8-10 : Cannot access non-static field v2 from static method
\ No newline at end of file
+Main1.hx:11: characters 9-10 : Cannot access non-static field f from static method
+Main1.hx:12: characters 9-10 : Cannot access non-static field v from static method
+Main1.hx:13: characters 9-11 : Cannot access non-static field v2 from static method
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4454/compile.hxml b/tests/misc/projects/Issue4454/compile.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4454/compile.hxml
+++ b/tests/misc/projects/Issue4454/compile.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4456/compile.hxml b/tests/misc/projects/Issue4456/compile.hxml
index 31c8a033905c79d22f458b505874d430f7bbe2e8..a9c9c89422934ea711df8d473fe8734f0bd0da25 100644
--- a/tests/misc/projects/Issue4456/compile.hxml
+++ b/tests/misc/projects/Issue4456/compile.hxml
@@ -1,3 +1,2 @@
--main Main
 -D analyzer
--x neko.n
\ No newline at end of file
+-x Main
diff --git a/tests/misc/projects/Issue4458/Main.hx b/tests/misc/projects/Issue4458/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3c0ed23d8f727babb47294cd7592b9dd6a203168
--- /dev/null
+++ b/tests/misc/projects/Issue4458/Main.hx
@@ -0,0 +1,7 @@
+class Main {
+	static function main() {
+		#if (((a > 1)) || (b > 2 && c > 3))
+		#error "Expected failure"
+		#end        
+	}
+}
diff --git a/tests/misc/projects/Issue4458/compile-pass1.hxml b/tests/misc/projects/Issue4458/compile-pass1.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..9356dc7708210715a3e409f941aa474e9fe0de32
--- /dev/null
+++ b/tests/misc/projects/Issue4458/compile-pass1.hxml
@@ -0,0 +1,2 @@
+-x Main
+-D a=1
diff --git a/tests/misc/projects/Issue4458/compile-pass2.hxml b/tests/misc/projects/Issue4458/compile-pass2.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..e41f4a19b04248a4313bd433b6bfa0e0a206d9bd
--- /dev/null
+++ b/tests/misc/projects/Issue4458/compile-pass2.hxml
@@ -0,0 +1,2 @@
+-x Main
+-D b=3
diff --git a/tests/misc/projects/Issue4458/compile1-fail.hxml b/tests/misc/projects/Issue4458/compile1-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..8b13a6abad71b59827beb7c531cbf11da1a1770b
--- /dev/null
+++ b/tests/misc/projects/Issue4458/compile1-fail.hxml
@@ -0,0 +1,2 @@
+-x Main
+-D a=2
diff --git a/tests/misc/projects/Issue4458/compile1-fail.hxml.stderr b/tests/misc/projects/Issue4458/compile1-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..3dbc7eaa5d427d5ed5d42548983da6e154300e35
--- /dev/null
+++ b/tests/misc/projects/Issue4458/compile1-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:4: characters 10-28 : Expected failure
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4458/compile2-fail.hxml b/tests/misc/projects/Issue4458/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..2466a20e75a645959eda19fffdfa08f3d0f1056d
--- /dev/null
+++ b/tests/misc/projects/Issue4458/compile2-fail.hxml
@@ -0,0 +1,3 @@
+-x Main
+-D b=3
+-D c=4
diff --git a/tests/misc/projects/Issue4458/compile2-fail.hxml.stderr b/tests/misc/projects/Issue4458/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..3dbc7eaa5d427d5ed5d42548983da6e154300e35
--- /dev/null
+++ b/tests/misc/projects/Issue4458/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:4: characters 10-28 : Expected failure
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4466/compile-fail.hxml b/tests/misc/projects/Issue4466/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4466/compile-fail.hxml
+++ b/tests/misc/projects/Issue4466/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4466/compile-fail.hxml.stderr b/tests/misc/projects/Issue4466/compile-fail.hxml.stderr
index 8f16a624ee07ae21153f122d3b9d3843d50fd5da..9331aed16729ec796da1b4fb4ab14e551813b99d 100644
--- a/tests/misc/projects/Issue4466/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4466/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:4: characters 16-17 : Local variable a used without being initialized
\ No newline at end of file
+Main.hx:4: characters 17-18 : Local variable a used without being initialized
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4540/Main.hx b/tests/misc/projects/Issue4540/Main.hx
index 44d091308abe642fb97fb0f734c534de4dc3c1e5..c62b19b03fd0d67f1cf19c9f605df0384ee8e0fa 100644
--- a/tests/misc/projects/Issue4540/Main.hx
+++ b/tests/misc/projects/Issue4540/Main.hx
@@ -1,6 +1,6 @@
 class Main {
     static function main() {
-        js.Promise.resolve(0).then(function(c) test(c));
+        js.lib.Promise.resolve(0).then(function(c) test(c));
     }
 
     static function test(a:{test:String}) {}
diff --git a/tests/misc/projects/Issue4540/compile-fail.hxml b/tests/misc/projects/Issue4540/compile-fail.hxml
index f014a353141e2be93236ed258ba839c0d91df7c6..e4dc4f9e8869c7648d3d1e0e27b26bfedeeb933c 100644
--- a/tests/misc/projects/Issue4540/compile-fail.hxml
+++ b/tests/misc/projects/Issue4540/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 -js Main.js
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4540/compile-fail.hxml.stderr b/tests/misc/projects/Issue4540/compile-fail.hxml.stderr
index 86d2aec3f7d904be131e08fbd2cd2f5eef052011..cecee0a48702856492f0aaafcd3ae975e7600f1c 100644
--- a/tests/misc/projects/Issue4540/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4540/compile-fail.hxml.stderr
@@ -1,4 +1,2 @@
-Main.hx:3: characters 35-54 : c : { test : String } -> Void should be Null<js.PromiseCallback<Int, Void>>
-Main.hx:3: characters 35-54 : c : { test : String } -> Void should be js.PromiseCallback<Int, Void>
-Main.hx:3: characters 35-54 : c : { test : String } -> Void should be haxe.extern.EitherType<Int -> Void, Int -> js.Promise<Void>>
-Main.hx:3: characters 35-54 : For function argument 'fulfillCallback'
+Main.hx:3: characters 57-58 : Int should be { test : String }
+Main.hx:3: characters 57-58 : For function argument 'a'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4563/compile.hxml b/tests/misc/projects/Issue4563/compile.hxml
index 31c8a033905c79d22f458b505874d430f7bbe2e8..a9c9c89422934ea711df8d473fe8734f0bd0da25 100644
--- a/tests/misc/projects/Issue4563/compile.hxml
+++ b/tests/misc/projects/Issue4563/compile.hxml
@@ -1,3 +1,2 @@
--main Main
 -D analyzer
--x neko.n
\ No newline at end of file
+-x Main
diff --git a/tests/misc/projects/Issue4580/compile-fail.hxml b/tests/misc/projects/Issue4580/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4580/compile-fail.hxml
+++ b/tests/misc/projects/Issue4580/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4580/compile-fail.hxml.stderr b/tests/misc/projects/Issue4580/compile-fail.hxml.stderr
index c0483b938fb32a3c52b30ab4f894400da0a7406f..e24d7e3fdc09dfebe7f525f26eaa8ea969e0fdc9 100644
--- a/tests/misc/projects/Issue4580/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4580/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:1: lines 1-3 : Recursive class
\ No newline at end of file
+Main.hx:1: characters 23-27 : Recursive class
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4671/compile1-fail.hxml b/tests/misc/projects/Issue4671/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue4671/compile1-fail.hxml
+++ b/tests/misc/projects/Issue4671/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4671/compile1-fail.hxml.stderr b/tests/misc/projects/Issue4671/compile1-fail.hxml.stderr
index 5b6a0b6752ce2c9d3dd6b28f20d937d76b42897f..e10183cf638b0eb589559cd63a57177e5c2de123 100644
--- a/tests/misc/projects/Issue4671/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4671/compile1-fail.hxml.stderr
@@ -1 +1 @@
-Main1.hx:1: characters 0-29 : Recursive class
\ No newline at end of file
+Main1.hx:1: characters 24-28 : Recursive class
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4671/compile2-fail.hxml b/tests/misc/projects/Issue4671/compile2-fail.hxml
index e51d89523e9584910fb3fc3b978161dc7163b3f0..031fe8ecc3114e35f6729f2cb9b85c229dd71a6c 100644
--- a/tests/misc/projects/Issue4671/compile2-fail.hxml
+++ b/tests/misc/projects/Issue4671/compile2-fail.hxml
@@ -1,2 +1,2 @@
--main Main2
+--main Main2
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4671/compile2-fail.hxml.stderr b/tests/misc/projects/Issue4671/compile2-fail.hxml.stderr
index 4abddcbda65e14b96135f2c16ad5c15cf22fb615..91ebcda08ba26282333bf0d223a1aaafc75a53c1 100644
--- a/tests/misc/projects/Issue4671/compile2-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4671/compile2-fail.hxml.stderr
@@ -1 +1 @@
-Main2.hx:1: characters 0-21 : Recursive class
\ No newline at end of file
+Main2.hx:1: characters 17-18 : Recursive class
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4679/compile.hxml b/tests/misc/projects/Issue4679/compile.hxml
index fbbea3aa53aa1548f969efa291927e289ea576c8..ff92c9641cb961fe3add898d5a583117276bc2ae 100644
--- a/tests/misc/projects/Issue4679/compile.hxml
+++ b/tests/misc/projects/Issue4679/compile.hxml
@@ -1,2 +1,3 @@
--main Main
--x test
\ No newline at end of file
+-m Main
+-neko test.n
+--cmd "neko test.n"
diff --git a/tests/misc/projects/Issue4689/compile-fail.hxml b/tests/misc/projects/Issue4689/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4689/compile-fail.hxml
+++ b/tests/misc/projects/Issue4689/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4689/compile-fail.hxml.stderr b/tests/misc/projects/Issue4689/compile-fail.hxml.stderr
index 800c07cd3348bb6d5b7c5f19739020eb3dd8d1a1..65cd5061cec5a29583de79d418a97406d2ebaec2 100644
--- a/tests/misc/projects/Issue4689/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4689/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:10: characters 24-25 : Unmatched patterns: B
\ No newline at end of file
+Main.hx:10: characters 25-26 : Unmatched patterns: B
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4712/compile.hxml b/tests/misc/projects/Issue4712/compile.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4712/compile.hxml
+++ b/tests/misc/projects/Issue4712/compile.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4720/Main.hx b/tests/misc/projects/Issue4720/Main.hx
index 41d36097f90060102c76285f15dbddb42d22762e..3535f269098d0935111605289dd4ebc92fd7a50a 100644
--- a/tests/misc/projects/Issue4720/Main.hx
+++ b/tests/misc/projects/Issue4720/Main.hx
@@ -26,6 +26,15 @@ class Main {
         var x = deprecatedProperty; // this also
         deprecatedGetSet; // however this will
         var x = deprecatedGetSet; // this also
+
+		// the enum @:deprecated trumps the enum field one... should be fine
+		switch (None) {
+			case None:
+		}
+
+		switch (None2) {
+			case None2:
+		}
     }
 
     // deprecating fields work
@@ -35,11 +44,11 @@ class Main {
     // ... however deprecating getters and setters have some gotcha
     @:deprecated static var deprecatedProperty(get, set):String;
     static function get_deprecatedProperty():String return "0";
-    static function set_deprecatedProperty(value):String return "0";
+    static function set_deprecatedProperty(_):String return "0";
 
     static var deprecatedGetSet(get, set):String;
     @:deprecated static function get_deprecatedGetSet():String return "0";
-    @:deprecated static function set_deprecatedGetSet(value):String return "0";
+    @:deprecated static function set_deprecatedGetSet(_):String return "0";
 }
 
 @:deprecated
@@ -49,7 +58,9 @@ class MyClass { public function new() {} }
 interface MyInterface { }
 
 @:deprecated
-enum MyEnum { None; }
+enum MyEnum { @:deprecated None; }
+
+enum MyEnum2 { @:deprecated None2; }
 
 @:deprecated
 abstract MyAbstract(String) { public function new(value:String) this = value; }
diff --git a/tests/misc/projects/Issue4720/compile.hxml b/tests/misc/projects/Issue4720/compile.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4720/compile.hxml
+++ b/tests/misc/projects/Issue4720/compile.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4720/compile.hxml.stderr b/tests/misc/projects/Issue4720/compile.hxml.stderr
index ada21cd56a5c1c38f256a41288015110a3c5a746..42120f29ba67510aaf2e559bb992e09dc9ca2b88 100644
--- a/tests/misc/projects/Issue4720/compile.hxml.stderr
+++ b/tests/misc/projects/Issue4720/compile.hxml.stderr
@@ -1,18 +1,24 @@
-Main.hx:8: characters 8-14 : Warning : Usage of this typedef is deprecated
-Main.hx:9: characters 8-18 : Warning : Usage of this typedef is deprecated
-Main.hx:10: characters 8-13 : Warning : Usage of this typedef is deprecated
-Main.hx:19: characters 8-18 : Warning : Usage of this typedef is deprecated
-Main.hx:4: characters 8-15 : Warning : Usage of this class is deprecated
-Main.hx:5: characters 8-19 : Warning : Usage of this class is deprecated
-Main.hx:6: characters 8-14 : Warning : Usage of this enum is deprecated
-Main.hx:15: characters 8-21 : Warning : Usage of this class is deprecated
-Main.hx:16: characters 8-19 : Warning : Usage of this enum is deprecated
-Main.hx:17: characters 8-28 : Warning : Usage of this class is deprecated
-Main.hx:18: characters 8-20 : Warning : Usage of this class is deprecated
-Main.hx:20: characters 8-27 : Warning : Usage of this class is deprecated
-Main.hx:23: characters 8-23 : Warning : Usage of this field is deprecated
-Main.hx:24: characters 8-22 : Warning : Usage of this field is deprecated
-Main.hx:25: characters 8-26 : Warning : Usage of this field is deprecated
-Main.hx:26: characters 16-34 : Warning : Usage of this field is deprecated
-Main.hx:27: characters 8-24 : Warning : Usage of this field is deprecated
-Main.hx:28: characters 16-32 : Warning : Usage of this field is deprecated
\ No newline at end of file
+Main.hx:8: characters 9-15 : Warning : Usage of this typedef is deprecated
+Main.hx:9: characters 9-19 : Warning : Usage of this typedef is deprecated
+Main.hx:10: characters 9-14 : Warning : Usage of this typedef is deprecated
+Main.hx:18: characters 13-19 : Warning : This typedef is deprecated in favor of MyClass
+Main.hx:19: characters 9-19 : Warning : Usage of this typedef is deprecated
+Main.hx:20: characters 13-22 : Warning : This typedef is deprecated in favor of MyAbstract
+Main.hx:32: characters 9-13 : Warning : Usage of this enum is deprecated
+Main.hx:36: characters 9-14 : Warning : Usage of this enum field is deprecated
+Main.hx:4: characters 9-16 : Warning : Usage of this class is deprecated
+Main.hx:5: characters 9-20 : Warning : Usage of this class is deprecated
+Main.hx:6: characters 9-15 : Warning : Usage of this enum is deprecated
+Main.hx:15: characters 9-22 : Warning : Usage of this class is deprecated
+Main.hx:16: characters 9-20 : Warning : Usage of this enum is deprecated
+Main.hx:17: characters 9-29 : Warning : Usage of this class is deprecated
+Main.hx:18: characters 9-21 : Warning : Usage of this class is deprecated
+Main.hx:20: characters 9-28 : Warning : Usage of this class is deprecated
+Main.hx:23: characters 9-24 : Warning : Usage of this field is deprecated
+Main.hx:24: characters 9-23 : Warning : Usage of this field is deprecated
+Main.hx:25: characters 9-27 : Warning : Usage of this field is deprecated
+Main.hx:26: characters 17-35 : Warning : Usage of this field is deprecated
+Main.hx:27: characters 9-25 : Warning : Usage of this field is deprecated
+Main.hx:28: characters 17-33 : Warning : Usage of this field is deprecated
+Main.hx:31: characters 11-15 : Warning : Usage of this enum is deprecated
+Main.hx:35: characters 11-16 : Warning : Usage of this enum field is deprecated
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4720/compile2.hxml b/tests/misc/projects/Issue4720/compile2.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..d13d3aa1fb63ac2315ea9f5f5f6ca0fc2ef7f84d
--- /dev/null
+++ b/tests/misc/projects/Issue4720/compile2.hxml
@@ -0,0 +1,3 @@
+--main Main
+--interp
+-D no-deprecation-warnings
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4720/compile2.hxml.stderr b/tests/misc/projects/Issue4720/compile2.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/misc/projects/Issue4723/Test.hx b/tests/misc/projects/Issue4723/Test.hx
deleted file mode 100644
index 3312d35e38b4b7249fc98ad7c6f11f5da3172470..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue4723/Test.hx
+++ /dev/null
@@ -1,9 +0,0 @@
-class Test {
-	function new() {}
-
-	dynamic function test() {}
-
-	static function main() {
-		new Test().test();
-	}
-}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4723/compile.hxml b/tests/misc/projects/Issue4723/compile.hxml
deleted file mode 100644
index e5ddcfe1b8a187887b1a6b58e55aa154d9fc5376..0000000000000000000000000000000000000000
--- a/tests/misc/projects/Issue4723/compile.hxml
+++ /dev/null
@@ -1,3 +0,0 @@
--main Test
--php bin
--cmd php bin/index.php
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4742/Main.hx b/tests/misc/projects/Issue4742/Main.hx
index 121e488c40b13881f25538e1b272e291556f44fc..df9f63bb074b4e2efa3aef9d83b41cb28fa0e084 100644
--- a/tests/misc/projects/Issue4742/Main.hx
+++ b/tests/misc/projects/Issue4742/Main.hx
@@ -2,5 +2,5 @@ class Main {
     static function main() {
         f("Haxe is great!") + "abc"; // This must produce a error!
     }
-    static function f(s) : Void trace(s);
+    static function f(s:String) : Void trace(s);
 }
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4742/compile-fail.hxml b/tests/misc/projects/Issue4742/compile-fail.hxml
index 454d47285fef442e7c172c29eff5cf7906136ce8..41d7330585023d40376ce6645dd81fda86beb5f9 100644
--- a/tests/misc/projects/Issue4742/compile-fail.hxml
+++ b/tests/misc/projects/Issue4742/compile-fail.hxml
@@ -1,3 +1,3 @@
--main Main
+--main Main
 -neko neko.n
 --no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4742/compile-fail.hxml.stderr b/tests/misc/projects/Issue4742/compile-fail.hxml.stderr
index db1964c5bea69a9d9c38d1a09fa6d9ba79469698..cc816ccb3762417c0cfdaa80e154e1dad46ed80e 100644
--- a/tests/misc/projects/Issue4742/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4742/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:3: characters 8-27 : Cannot use Void as value
\ No newline at end of file
+Main.hx:3: characters 9-28 : Cannot use Void as value
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4754/compile1-fail.hxml b/tests/misc/projects/Issue4754/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue4754/compile1-fail.hxml
+++ b/tests/misc/projects/Issue4754/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4754/compile1-fail.hxml.stderr b/tests/misc/projects/Issue4754/compile1-fail.hxml.stderr
index a4dfe45e3c923e582411c02862af0ca8550b42b3..e4d17bbff8d491df09383ad76a5521cb5e81bf1a 100644
--- a/tests/misc/projects/Issue4754/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4754/compile1-fail.hxml.stderr
@@ -1 +1 @@
-Main1.hx:3: characters 7-10 : Cannot use this expression as value
\ No newline at end of file
+Main1.hx:3: characters 8-11 : Cannot use this expression as value
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4761/compile1-fail.hxml b/tests/misc/projects/Issue4761/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue4761/compile1-fail.hxml
+++ b/tests/misc/projects/Issue4761/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4761/compile1-fail.hxml.stderr b/tests/misc/projects/Issue4761/compile1-fail.hxml.stderr
index 4ab6e51122dc5e05a97b74ff16d8bc5411067e98..2b60ade80eb90e3a71aa2716003f1b74b794b6b8 100644
--- a/tests/misc/projects/Issue4761/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4761/compile1-fail.hxml.stderr
@@ -1 +1 @@
-Main1.hx:2: characters 0-17 : Abstract underlying type cannot be recursive
\ No newline at end of file
+Main1.hx:2: characters 1-18 : Abstract underlying type cannot be recursive
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4764/compile1-fail.hxml b/tests/misc/projects/Issue4764/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue4764/compile1-fail.hxml
+++ b/tests/misc/projects/Issue4764/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4764/compile1-fail.hxml.stderr b/tests/misc/projects/Issue4764/compile1-fail.hxml.stderr
index 9d5d90f004f63088c3dd447e6bec04a1f3cdc558..f9d789bfdb316d2faf445a0a66f6bb5b45e98ecb 100644
--- a/tests/misc/projects/Issue4764/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4764/compile1-fail.hxml.stderr
@@ -1 +1 @@
-Main1.hx:4: characters 15-22 : Cannot construct haxe.Constructible<Void -> Void>
\ No newline at end of file
+Main1.hx:4: characters 16-23 : Cannot construct haxe.Constructible<Void -> Void>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4766/Main1.hx b/tests/misc/projects/Issue4766/Main1.hx
index 373608c47c70b592805e855100f95b8249f89208..1080f21d97eb26d869b26631da8759def3275fa7 100644
--- a/tests/misc/projects/Issue4766/Main1.hx
+++ b/tests/misc/projects/Issue4766/Main1.hx
@@ -1,5 +1,5 @@
 class C {
-    public function new(f) {}
+    public function new(_) {}
     public function f() {}
 }
 
diff --git a/tests/misc/projects/Issue4766/compile1-fail.hxml b/tests/misc/projects/Issue4766/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue4766/compile1-fail.hxml
+++ b/tests/misc/projects/Issue4766/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4766/compile1-fail.hxml.stderr b/tests/misc/projects/Issue4766/compile1-fail.hxml.stderr
index 2b300d69d5f9b41987e910aa074d0cd7d3e4d204..69dedeedb24561330c95c53575c4e60015e5f0d9 100644
--- a/tests/misc/projects/Issue4766/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4766/compile1-fail.hxml.stderr
@@ -1 +1 @@
-Main1.hx:8: characters 21-25 : Missing this = value
\ No newline at end of file
+Main1.hx:8: characters 22-26 : Missing this = value
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4775/compile1-fail.hxml b/tests/misc/projects/Issue4775/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue4775/compile1-fail.hxml
+++ b/tests/misc/projects/Issue4775/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4775/compile1-fail.hxml.stderr b/tests/misc/projects/Issue4775/compile1-fail.hxml.stderr
index d81bcc17100175262281fa6c53805b7cd8a63b2b..b798d7e7dece40669b797c4dba4da3424a2e1583 100644
--- a/tests/misc/projects/Issue4775/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4775/compile1-fail.hxml.stderr
@@ -1,2 +1,2 @@
-Main1.hx:7: characters 2-26 : Constraint check failure for Contain.T
-Main1.hx:7: characters 2-26 : Main1 should be String
\ No newline at end of file
+Main1.hx:7: characters 3-27 : Constraint check failure for Contain.T
+Main1.hx:7: characters 3-27 : Main1 should be String
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4803/Main.hx b/tests/misc/projects/Issue4803/Main.hx
index f1062202676164001ee970a599db953dc4c544e6..713f044ec0dd855dccc4b1b9b5c5e438f8a4ce15 100644
--- a/tests/misc/projects/Issue4803/Main.hx
+++ b/tests/misc/projects/Issue4803/Main.hx
@@ -1,6 +1,18 @@
+@:native("$.Event") extern class Event extends js.html.Event {
+	public var data : Dynamic;	
+} 
+
+@:native("$") extern class JQuery implements ArrayAccess<js.html.Element> {
+	public function new():Void;
+	
+	@:overload(function(handler:Event -> Void):JQuery { })	
+	@:overload(function(?eventData:Dynamic, handler:Event -> Void):JQuery { })	
+	public function click():JQuery;
+}
+
 class Main  {
 	static function main() {
-		var j = new js.jquery.JQuery();
+		var j = new JQuery();
 		j.click(function(e) {
 			var p = { y : 3 };
 			p = { x : 5 };
diff --git a/tests/misc/projects/Issue4803/compile-fail.hxml b/tests/misc/projects/Issue4803/compile-fail.hxml
index 600ff2496d0373b6ba58e3eceeb08c17e8150230..6c85364c13ed8bb97ae63a12f299dce2a2c38aa9 100644
--- a/tests/misc/projects/Issue4803/compile-fail.hxml
+++ b/tests/misc/projects/Issue4803/compile-fail.hxml
@@ -1,3 +1,3 @@
--main Main
+--main Main
 -js js.js
 --no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4803/compile-fail.hxml.stderr b/tests/misc/projects/Issue4803/compile-fail.hxml.stderr
index 647dcb39588f0063f2b17c2e8f555e9ebc398f57..80534c0305bed82ed600e08d7eee53a06f323783 100644
--- a/tests/misc/projects/Issue4803/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4803/compile-fail.hxml.stderr
@@ -1,7 +1,10 @@
-Main.hx:4: lines 4-7 : Could not find a suitable overload, reasons follow
-Main.hx:4: lines 4-7 : Overload resolution failed for Void -> js.jquery.JQuery
-Main.hx:4: lines 4-7 : Too many arguments
-Main.hx:4: lines 4-7 : Overload resolution failed for handler : (js.jquery.Event -> Void) -> js.jquery.JQuery
-Main.hx:6: characters 7-16 : Object requires field y
-Main.hx:6: characters 7-16 : For function argument 'handler'
-Main.hx:4: lines 4-7 : End of overload failure reasons
\ No newline at end of file
+Main.hx:16: lines 16-19 : Could not find a suitable overload, reasons follow
+Main.hx:16: lines 16-19 : Overload resolution failed for Void -> JQuery
+Main.hx:16: lines 16-19 : Too many arguments
+Main.hx:16: lines 16-19 : Overload resolution failed for (handler : (Event -> Void)) -> JQuery
+Main.hx:18: characters 8-17 : Object requires field y
+Main.hx:18: characters 8-17 : For function argument 'handler'
+Main.hx:16: lines 16-19 : Overload resolution failed for (?eventData : Dynamic, handler : (Event -> Void)) -> JQuery
+Main.hx:18: characters 8-17 : Object requires field y
+Main.hx:18: characters 8-17 : For optional function argument 'eventData'
+Main.hx:16: lines 16-19 : End of overload failure reasons
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4816/compile1-fail.hxml b/tests/misc/projects/Issue4816/compile1-fail.hxml
index d7a4672bb8b25917bd7d613af362454db43c6aad..000ea7da235b0b82b00963dd8a451480b045c3a4 100644
--- a/tests/misc/projects/Issue4816/compile1-fail.hxml
+++ b/tests/misc/projects/Issue4816/compile1-fail.hxml
@@ -1,2 +1,2 @@
--main Main1
+--main Main1
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4816/compile1-fail.hxml.stderr b/tests/misc/projects/Issue4816/compile1-fail.hxml.stderr
index 21bd6df2bcd3be600114e38e22cdf38791e8cb38..a59a37381b72f2eaebd984b3967e4225e17a7185 100644
--- a/tests/misc/projects/Issue4816/compile1-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4816/compile1-fail.hxml.stderr
@@ -1 +1 @@
-Main1.hx:4: characters 24-30 : { f : { name : String } } has no field name
\ No newline at end of file
+Main1.hx:4: characters 27-31 : { f : { name : String } } has no field name
diff --git a/tests/misc/projects/Issue4825/compile.hxml b/tests/misc/projects/Issue4825/compile.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4825/compile.hxml
+++ b/tests/misc/projects/Issue4825/compile.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4891/Main.hx b/tests/misc/projects/Issue4891/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..96acd68c94dfdb8e445a8e7c21bcf12f59757136
--- /dev/null
+++ b/tests/misc/projects/Issue4891/Main.hx
@@ -0,0 +1,8 @@
+abstract Ab1(Ab2) from Ab2 {}
+abstract Ab2(Ab1) from Ab1 {}
+
+class Main {
+    static function main() {
+        var a:Ab1 = {};
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4891/compile-fail.hxml b/tests/misc/projects/Issue4891/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue4891/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4891/compile-fail.hxml.stderr b/tests/misc/projects/Issue4891/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..93ed8cabfe8ee6359428e7c6be2b0f4829c17e1c
--- /dev/null
+++ b/tests/misc/projects/Issue4891/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:6: characters 9-24 : { } should be Ab1
+Main.hx:1: characters 1-30 : Abstract underlying type cannot be recursive
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4904/Main.hx b/tests/misc/projects/Issue4904/Main.hx
index 34700622fc2759972e331baba3b4623e296d6073..70d47ae6a375ba5ce965956b767fe3ca2c425367 100644
--- a/tests/misc/projects/Issue4904/Main.hx
+++ b/tests/misc/projects/Issue4904/Main.hx
@@ -4,7 +4,6 @@ class Main {
 	}
 }
 
-@:enum
-abstract TestAbstract(Int) {
+enum abstract TestAbstract(Int) {
 	private var f = 0;
 }
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4904/compile-fail.hxml b/tests/misc/projects/Issue4904/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4904/compile-fail.hxml
+++ b/tests/misc/projects/Issue4904/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4904/compile-fail.hxml.stderr b/tests/misc/projects/Issue4904/compile-fail.hxml.stderr
index 505065a403c8ac128720dd1a048a6f483d67e6e2..74f1e31c437faf0caaa83d53422f818a0b647496 100644
--- a/tests/misc/projects/Issue4904/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4904/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:3: characters 2-16 : Cannot access private field f
\ No newline at end of file
+Main.hx:3: characters 16-17 : Cannot access private field f
diff --git a/tests/misc/projects/Issue4907/Main.hx b/tests/misc/projects/Issue4907/Main.hx
index 0ba9813128adba4fd19712b55baea06415431c3f..3e0be1b712786d21de5ec0fdf88602f12ec66192 100644
--- a/tests/misc/projects/Issue4907/Main.hx
+++ b/tests/misc/projects/Issue4907/Main.hx
@@ -9,7 +9,6 @@ class Main {
     }
 }
 
-@:enum
-abstract EnumAbstract(Int) {
+enum abstract EnumAbstract(Int) {
     public static var VALUE = 0;
 }
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4907/compile-fail.hxml b/tests/misc/projects/Issue4907/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4907/compile-fail.hxml
+++ b/tests/misc/projects/Issue4907/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4907/compile-fail.hxml.stderr b/tests/misc/projects/Issue4907/compile-fail.hxml.stderr
index 958af15ddad8361ee91766e6f4a1411ad0797538..c82ffafbdbed27c7f4274afccd8673735c643aeb 100644
--- a/tests/misc/projects/Issue4907/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4907/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:7: characters 17-22 : Capture variables must be lower-case
\ No newline at end of file
+Main.hx:7: characters 18-23 : Pattern variables must be lower-case
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4954/compile-fail.hxml b/tests/misc/projects/Issue4954/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4954/compile-fail.hxml
+++ b/tests/misc/projects/Issue4954/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4954/compile-fail.hxml.stderr b/tests/misc/projects/Issue4954/compile-fail.hxml.stderr
index 584396cc91cfbb0d8ca44c888659802ec9f4a24b..287b1de47422db28d80c16fd27eff6fb5ae359e8 100644
--- a/tests/misc/projects/Issue4954/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4954/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:6: characters 17-27 : Only inline or read-only (default, never) fields can be used as a pattern
\ No newline at end of file
+Main.hx:6: characters 18-28 : Only inline or read-only (default, never) fields can be used as a pattern
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4957/compile-fail.hxml b/tests/misc/projects/Issue4957/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4957/compile-fail.hxml
+++ b/tests/misc/projects/Issue4957/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4957/compile-fail.hxml.stderr b/tests/misc/projects/Issue4957/compile-fail.hxml.stderr
index 390045552e6b8604408469c1de75cd82c7599a36..3135522a09f2ce03c3d09dbaf4f8a13f6790f79b 100644
--- a/tests/misc/projects/Issue4957/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4957/compile-fail.hxml.stderr
@@ -1,2 +1,2 @@
-Main.hx:10: characters 16-17 : Unmatched patterns: B
-Main.hx:14: characters 24-25 : Unmatched patterns: B
+Main.hx:10: characters 17-18 : Unmatched patterns: B
+Main.hx:14: characters 25-26 : Unmatched patterns: B
diff --git a/tests/misc/projects/Issue4982/Main.hx b/tests/misc/projects/Issue4982/Main.hx
index 8904b6f5ab0d62cf074adae1e1362fc164d54062..3f061dc479cb9289756b3d03fb3f4b1a2d8252d8 100644
--- a/tests/misc/projects/Issue4982/Main.hx
+++ b/tests/misc/projects/Issue4982/Main.hx
@@ -3,7 +3,7 @@ class Main {
         throw invalidChar(65);
     }
 
-    static public function invalidChar(c) {
+    static public function invalidChar(_) {
         throw "error";
     }
 }
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4982/compile-fail.hxml b/tests/misc/projects/Issue4982/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue4982/compile-fail.hxml
+++ b/tests/misc/projects/Issue4982/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4982/compile-fail.hxml.stderr b/tests/misc/projects/Issue4982/compile-fail.hxml.stderr
index cf9577db1a584d6b5c1e27937573a1ed6f248a87..dd7b4bf7dac8fa8e517a5b525f88c0b011d323e2 100644
--- a/tests/misc/projects/Issue4982/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue4982/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:3: characters 14-29 : Cannot use Void as value
\ No newline at end of file
+Main.hx:3: characters 15-30 : Cannot use Void as value
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5005/compile.hxml b/tests/misc/projects/Issue5005/compile.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue5005/compile.hxml
+++ b/tests/misc/projects/Issue5005/compile.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5008/Main.hx b/tests/misc/projects/Issue5008/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1c398d5d0e1ef87d913573ac037f0c96bfc5d70a
--- /dev/null
+++ b/tests/misc/projects/Issue5008/Main.hx
@@ -0,0 +1,17 @@
+class Main {
+    static function main() {
+        f(null);
+    }
+
+    static function f(t:Token) {
+        $type(t);
+        $type(t.type);
+        if (t.type || t.type == 42)
+            throw "WAT";
+    }
+}
+
+abstract Token(Array<Dynamic>) {
+    public var type(get,never):String;
+    inline function get_type() return this[0];
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5008/compile-fail.hxml b/tests/misc/projects/Issue5008/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue5008/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5008/compile-fail.hxml.stderr b/tests/misc/projects/Issue5008/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..290845831538a541d48c9af09ff5a9956dcd0c40
--- /dev/null
+++ b/tests/misc/projects/Issue5008/compile-fail.hxml.stderr
@@ -0,0 +1,4 @@
+Main.hx:7: characters 15-16 : Warning : Token
+Main.hx:8: characters 15-21 : Warning : String
+Main.hx:9: characters 23-35 : Int should be String
+Main.hx:9: characters 13-35 : String should be Bool
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5010/compile-fail.hxml b/tests/misc/projects/Issue5010/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue5010/compile-fail.hxml
+++ b/tests/misc/projects/Issue5010/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5039/Main.hx b/tests/misc/projects/Issue5039/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9cd5faad01259f85964dcecac3ef48b35797e4b4
--- /dev/null
+++ b/tests/misc/projects/Issue5039/Main.hx
@@ -0,0 +1,5 @@
+class Main {
+	static function main() {
+		@:bypassAccessor "hi";
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5039/Main2.hx b/tests/misc/projects/Issue5039/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..877e3b700ddafacdb8f195342c2c36ce961d62bd
--- /dev/null
+++ b/tests/misc/projects/Issue5039/Main2.hx
@@ -0,0 +1,6 @@
+class Main {
+	static var a = {b: 3};
+	static function main() {
+		@:bypassAccessor @:bypassAccessor @:bypassAccessor a.b;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5039/compile-fail.hxml b/tests/misc/projects/Issue5039/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue5039/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5039/compile-fail.hxml.stderr b/tests/misc/projects/Issue5039/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..9f02867702e456ad59638711c8aa43f536f34f81
--- /dev/null
+++ b/tests/misc/projects/Issue5039/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: characters 3-19 : Field access expression expected after @:bypassAccessor metadata
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5039/compile2-fail.hxml b/tests/misc/projects/Issue5039/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..031fe8ecc3114e35f6729f2cb9b85c229dd71a6c
--- /dev/null
+++ b/tests/misc/projects/Issue5039/compile2-fail.hxml
@@ -0,0 +1,2 @@
+--main Main2
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5039/compile2-fail.hxml.stderr b/tests/misc/projects/Issue5039/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..2572b4b4397330d99941fe78b212bcaa60ec7316
--- /dev/null
+++ b/tests/misc/projects/Issue5039/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:4: characters 3-19 : Field access expression expected after @:bypassAccessor metadata
diff --git a/tests/misc/projects/Issue5118/compile1.hxml.stderr b/tests/misc/projects/Issue5118/compile1.hxml.stderr
index 65fd706d7a2b12db4d33146e9e71197698de09e1..fceb54f848469644723af17a050887043bb2b5b3 100644
--- a/tests/misc/projects/Issue5118/compile1.hxml.stderr
+++ b/tests/misc/projects/Issue5118/compile1.hxml.stderr
@@ -1,3 +1,3 @@
-<type p="$$normPath(::cwd::/Main.hx):8: characters 17-21">
-v : Int -&gt; haxe.ds.Option&lt;Int&gt;
+<type p="$$normPath(::cwd::/Main.hx):8: characters 18-22">
+(v : Int) -&gt; haxe.ds.Option&lt;Int&gt;
 </type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5118/compile2.hxml.stderr b/tests/misc/projects/Issue5118/compile2.hxml.stderr
index 90cb3769017b1b50c08f840102b25d50e65afc21..21569ff3b59d41cdef058be3a7647949a118704c 100644
--- a/tests/misc/projects/Issue5118/compile2.hxml.stderr
+++ b/tests/misc/projects/Issue5118/compile2.hxml.stderr
@@ -1,3 +1,3 @@
-<type p="$$normPath(::cwd::/Main.hx):7: characters 17-21">
+<type p="$$normPath(::cwd::/Main.hx):7: characters 18-22">
 haxe.ds.Option&lt;Int&gt;
 </type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5122/compile.hxml b/tests/misc/projects/Issue5122/compile.hxml
index b745b3c36ab833b10b3a837138e06a406185d7bc..d4ee67a177a14dac15af724d824717ddd0a9c4b5 100644
--- a/tests/misc/projects/Issue5122/compile.hxml
+++ b/tests/misc/projects/Issue5122/compile.hxml
@@ -1 +1 @@
---display Main.hx@126@type
\ No newline at end of file
+--display Main.hx@125@type
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5122/compile.hxml.stderr b/tests/misc/projects/Issue5122/compile.hxml.stderr
index d8857c0890e906feaba0ecd7a8638f9bef9bcfd3..94798445ca0e9a3ae43dd4d9940e4b5553c17077 100644
--- a/tests/misc/projects/Issue5122/compile.hxml.stderr
+++ b/tests/misc/projects/Issue5122/compile.hxml.stderr
@@ -1,3 +1,3 @@
-<type p="$$normPath(::cwd::/Main.hx):7: characters 8-13">
+<type p="$$normPath(::cwd::/Main.hx):7: characters 9-14">
 Void -&gt; String
 </type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5123/compile.hxml.stderr b/tests/misc/projects/Issue5123/compile.hxml.stderr
index 85c4556ec278f83bb69cc6dc34250642fbedd855..226ae94bb1d20994cb4d8ea17b721d33cc303312 100644
--- a/tests/misc/projects/Issue5123/compile.hxml.stderr
+++ b/tests/misc/projects/Issue5123/compile.hxml.stderr
@@ -1,3 +1,3 @@
 <list>
-<pos>$$normPath(::cwd::/Main.hx, true):5: lines 5-7</pos>
+<pos>$$normPath(::cwd::/Main.hx, true):5: characters 18-35</pos>
 </list>
diff --git a/tests/misc/projects/Issue5125/compile.hxml.stderr b/tests/misc/projects/Issue5125/compile.hxml.stderr
index d90986d9d8214c1bd6a5e07ae9204bb6d803256e..472c5f3d69120a42fa416174a34ff99476ad47a8 100644
--- a/tests/misc/projects/Issue5125/compile.hxml.stderr
+++ b/tests/misc/projects/Issue5125/compile.hxml.stderr
@@ -1,3 +1,3 @@
-<type p="$$normPath(::cwd::/Main.hx):6: characters 26-34">
+<type p="$$normPath(::cwd::/Main.hx):6: characters 27-35">
 TextDocumentSyncKind
 </type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5126/compile-fail.hxml b/tests/misc/projects/Issue5126/compile-fail.hxml
index 454d47285fef442e7c172c29eff5cf7906136ce8..41d7330585023d40376ce6645dd81fda86beb5f9 100644
--- a/tests/misc/projects/Issue5126/compile-fail.hxml
+++ b/tests/misc/projects/Issue5126/compile-fail.hxml
@@ -1,3 +1,3 @@
--main Main
+--main Main
 -neko neko.n
 --no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5126/compile-fail.hxml.stderr b/tests/misc/projects/Issue5126/compile-fail.hxml.stderr
index 29d1eb830f337b82876438f9233b4dd3913f0be6..19e619d89aea050699a26ca8f6be503116437145 100644
--- a/tests/misc/projects/Issue5126/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue5126/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:2: character 53 : Invalid escape sequence \s
\ No newline at end of file
+Main.hx:2: character 54 : Invalid escape sequence \s
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5128/compile.hxml.stderr b/tests/misc/projects/Issue5128/compile.hxml.stderr
index 09b11470b1be39be96a8ea08da7f15085eeb9120..22e5530dada9f9a896473daad6913decc28c375d 100644
--- a/tests/misc/projects/Issue5128/compile.hxml.stderr
+++ b/tests/misc/projects/Issue5128/compile.hxml.stderr
@@ -1,3 +1,3 @@
-<type p="$$normPath(::cwd::/Main.hx):2: characters 17-21">
+<type p="$$normPath(::cwd::/Main.hx):2: characters 18-22">
 Void -&gt; Void
 </type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5134/compile-fail.hxml.stderr b/tests/misc/projects/Issue5134/compile-fail.hxml.stderr
index 06410203359ee2b05c42ada9b1654b89ee8be1da..b2466156c52e821cadb06beab3613302afd53279 100644
--- a/tests/misc/projects/Issue5134/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue5134/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:21: characters 8-9 : Cannot access a in static function
\ No newline at end of file
+Main.hx:21: characters 9-10 : Cannot access a in static function
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5145/compile.hxml b/tests/misc/projects/Issue5145/compile.hxml
index df3c17599f0ddfdd52aa366ad4cd4231022859b8..89d1a2fa840631189bae5ffcf10eee3de8e1c06c 100644
--- a/tests/misc/projects/Issue5145/compile.hxml
+++ b/tests/misc/projects/Issue5145/compile.hxml
@@ -1,2 +1,2 @@
 
--main Main
\ No newline at end of file
+--main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5152/compile.hxml.stderr b/tests/misc/projects/Issue5152/compile.hxml.stderr
index 6e11be47ff0549b74570c1116cf3a980967e211b..9fde99af7680d50091460b69adfe84838a4cf230 100644
--- a/tests/misc/projects/Issue5152/compile.hxml.stderr
+++ b/tests/misc/projects/Issue5152/compile.hxml.stderr
@@ -1,3 +1,3 @@
-<type p="$$normPath(::cwd::/Main.hx):4: characters 17-20">
+<type p="$$normPath(::cwd::/Main.hx):4: characters 18-21">
 String
 </type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5205/Main.hx b/tests/misc/projects/Issue5205/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f342098cf5bdc2d31c875150eee913c5416be830
--- /dev/null
+++ b/tests/misc/projects/Issue5205/Main.hx
@@ -0,0 +1,9 @@
+class Main {
+	static public function main() {}
+}
+
+abstract Val<T>(T) from Int {
+	public inline function new(v:T)
+		this = v;
+	public inline function value():T return this;
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5205/compile-fail.hxml b/tests/misc/projects/Issue5205/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue5205/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5205/compile-fail.hxml.stderr b/tests/misc/projects/Issue5205/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e1a37d3c243e7cb21f083bf87118aef4485eac4e
--- /dev/null
+++ b/tests/misc/projects/Issue5205/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:5: characters 25-28 : You can only declare from/to with compatible types
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5206/Main.hx b/tests/misc/projects/Issue5206/Main.hx
index 8ad78ef63ed51e18ec67c73394c3f0034e6d71bf..27b8de47176489bfaba825e5096035668c824091 100644
--- a/tests/misc/projects/Issue5206/Main.hx
+++ b/tests/misc/projects/Issue5206/Main.hx
@@ -1,9 +1,9 @@
 typedef A     =  { var pos: Int;           var len: Int; };
 typedef NOT_A =  { var pos: Array<String>; var len: Array<Float>; };
 
-typedef X = { @:optional var x:Int; @:optional var y:Int; };
+typedef X = { var ?x:Int; var ?y:Int; };
 typedef Y = { var x:Int; var y:Int; };
-typedef Z = { @:optional var pos:Array<String>; @:optional var len:Array<Float>; };
+typedef Z = { var ?pos:Array<String>; var ?len:Array<Float>; };
 
 class Main {
 
diff --git a/tests/misc/projects/Issue5206/compile-fail.hxml b/tests/misc/projects/Issue5206/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue5206/compile-fail.hxml
+++ b/tests/misc/projects/Issue5206/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5206/compile-fail.hxml.stderr b/tests/misc/projects/Issue5206/compile-fail.hxml.stderr
index 32017e21ea87ac6071fe141b8ea5c01796da5426..b32857883d6b19541e3c65090d37432aa782b9eb 100644
--- a/tests/misc/projects/Issue5206/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue5206/compile-fail.hxml.stderr
@@ -1,8 +1,4 @@
-Main.hx:14: characters 28-33 : A should be X
-Main.hx:14: characters 28-33 : { pos : Int, len : Int } should be X
-Main.hx:14: characters 28-33 : { pos : Int, len : Int } should be { ?y : Null<Int>, ?x : Null<Int> }
-Main.hx:14: characters 28-33 : { pos : Int, len : Int } has no field x
-Main.hx:14: characters 26-39 : Y should be Z
-Main.hx:14: characters 26-39 : { y : Int, x : Int } should be Z
-Main.hx:14: characters 26-39 : { y : Int, x : Int } should be { ?pos : Null<Array<String>>, ?len : Null<Array<Float>> }
-Main.hx:14: characters 26-39 : { y : Int, x : Int } has no field len
\ No newline at end of file
+Main.hx:14: characters 29-34 : A should be X
+Main.hx:14: characters 29-34 : { pos : Int, len : Int } has no field x
+Main.hx:14: characters 27-40 : Y should be Z
+Main.hx:14: characters 27-40 : { y : Int, x : Int } has no field len
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5268/Main.hx b/tests/misc/projects/Issue5268/Main.hx
index 66446e6b994f36fc49a38c78696e99d2aadbd34b..a605e2c524f979b30017fb8a05b33b19c66fb27c 100644
--- a/tests/misc/projects/Issue5268/Main.hx
+++ b/tests/misc/projects/Issue5268/Main.hx
@@ -6,7 +6,7 @@ class Main {
             case Some(v):
                 var value = switch v {
                     case 1: 1;
-                    case m: return None;
+                    case var m: return None;
                 }
                 value;
             case None:
diff --git a/tests/misc/projects/Issue5268/compile-fail.hxml b/tests/misc/projects/Issue5268/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue5268/compile-fail.hxml
+++ b/tests/misc/projects/Issue5268/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5321/compile.hxml b/tests/misc/projects/Issue5321/compile.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue5321/compile.hxml
+++ b/tests/misc/projects/Issue5321/compile.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5375/compile-fail.hxml b/tests/misc/projects/Issue5375/compile-fail.hxml
index c717a2877a53df954ea3d984474ca0fededfaab7..b30a755894b16507d23e6fc657a6e8f791950b34 100644
--- a/tests/misc/projects/Issue5375/compile-fail.hxml
+++ b/tests/misc/projects/Issue5375/compile-fail.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5375/compile-fail.hxml.stderr b/tests/misc/projects/Issue5375/compile-fail.hxml.stderr
index 0b9db02c40f182c8ce7d2ee07f845a1b76801cbb..a16c77de40c362b38d46d9161c1580cc0ad3c06a 100644
--- a/tests/misc/projects/Issue5375/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue5375/compile-fail.hxml.stderr
@@ -1,2 +1,2 @@
-Main.hx:12: characters 8-9 : x : Int -> E should be E
-Main.hx:10: characters 10-11 : Invalid match: Not enough patterns
\ No newline at end of file
+Main.hx:12: characters 9-10 : (x : Int) -> E should be E
+Main.hx:10: characters 11-12 : Invalid match: Not enough patterns
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5525/Main.hx b/tests/misc/projects/Issue5525/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9aee913f60c81e58a9082aeba01868799a1a7f1e
--- /dev/null
+++ b/tests/misc/projects/Issue5525/Main.hx
@@ -0,0 +1,26 @@
+class Main {
+  static function main() {
+    var a = new A();
+    a[0] = "bar";
+    var b = new B();
+    b[0] = "bar";
+  }
+}
+
+
+@:coreType
+@:arrayAccess
+abstract A {
+  inline public function new() {
+    this = untyped __js__("{}");
+  }
+}
+
+typedef TB = B;
+
+@:arrayAccess
+abstract B(TB) {
+  inline public function new() {
+    this = untyped __js__("{}");
+  }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5525/compile-fail.hxml b/tests/misc/projects/Issue5525/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fab0aeecc3dd8ce41c99d29d48c23ec66b19d3c1
--- /dev/null
+++ b/tests/misc/projects/Issue5525/compile-fail.hxml
@@ -0,0 +1 @@
+--main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5525/compile-fail.hxml.stderr b/tests/misc/projects/Issue5525/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..cd77ed6f0916f7bc55886a75c7758ada51431ef5
--- /dev/null
+++ b/tests/misc/projects/Issue5525/compile-fail.hxml.stderr
@@ -0,0 +1,3 @@
+Main.hx:4: characters 5-6 : Array access is not allowed on A
+Main.hx:6: characters 5-6 : Array access is not allowed on B
+Main.hx:22: lines 22-26 : Abstract underlying type cannot be recursive
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5559/build.hxml b/tests/misc/projects/Issue5559/build.hxml
index b412521962b93291570254ec0d37f93dd51e9d87..7ba1df4427c2bcf49fadf31b2791e4d42a334715 100644
--- a/tests/misc/projects/Issue5559/build.hxml
+++ b/tests/misc/projects/Issue5559/build.hxml
@@ -1,4 +1,4 @@
--main Main
--cp source
+--main Main
+-p source
 --macro addMetadata('@:build(Build.build())', 'Main')
 -neko run.n
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5644/compile-fail.hxml b/tests/misc/projects/Issue5644/compile-fail.hxml
index 74d6c3731d8dcfdb8353bba6db76f61ea7db84bb..f9368bd2c4438ca84f05d6492143bb3308e45eec 100644
--- a/tests/misc/projects/Issue5644/compile-fail.hxml
+++ b/tests/misc/projects/Issue5644/compile-fail.hxml
@@ -1,3 +1,3 @@
--main Main
+--main Main
 --no-output
 -js js.js
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5644/compile-fail.hxml.stderr b/tests/misc/projects/Issue5644/compile-fail.hxml.stderr
index 8541e37174930a2c619a7377189cdae8361b313d..d5df3e03406d9218ace0fb8bb0fcc90f642207d8 100644
--- a/tests/misc/projects/Issue5644/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue5644/compile-fail.hxml.stderr
@@ -1,2 +1,2 @@
-User.hx:1: characters 19-46 : Type not found : ThisObviouslyDoesntExist
+User.hx:1: characters 20-47 : Type not found : ThisObviouslyDoesntExist
 Main.hx:1: lines 1-5 : Defined in this class
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5833/Main.hx b/tests/misc/projects/Issue5833/Main.hx
index f488bcbfa0c4ae1d60d7c6216fe8bd65c5a0a9de..31731b2d03e632ebb2f9ac27f3fa29a0252b81d3 100644
--- a/tests/misc/projects/Issue5833/Main.hx
+++ b/tests/misc/projects/Issue5833/Main.hx
@@ -1,4 +1,4 @@
-@:enum abstract A(Int) {
+enum abstract A(Int) {
 	var Typo = 0;
 }
 
diff --git a/tests/misc/projects/Issue5833/compile-fail.hxml b/tests/misc/projects/Issue5833/compile-fail.hxml
index 74d6c3731d8dcfdb8353bba6db76f61ea7db84bb..f9368bd2c4438ca84f05d6492143bb3308e45eec 100644
--- a/tests/misc/projects/Issue5833/compile-fail.hxml
+++ b/tests/misc/projects/Issue5833/compile-fail.hxml
@@ -1,3 +1,3 @@
--main Main
+--main Main
 --no-output
 -js js.js
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5833/compile-fail.hxml.stderr b/tests/misc/projects/Issue5833/compile-fail.hxml.stderr
index 2c349f5484620017fff8ec872d523e28b61d2433..4816fd3a53fd3c97b59acbdf132c2a75303cc271 100644
--- a/tests/misc/projects/Issue5833/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue5833/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:7: characters 12-16 : Identifier 'Typi' is not part of A (Suggestion: Typo)
\ No newline at end of file
+Main.hx:7: characters 13-17 : Identifier 'Typi' is not part of A (Suggestion: Typo)
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5843/Data.hx b/tests/misc/projects/Issue5843/Data.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5ae168cb1312662c9a1e77f5c17ab13bc852d16e
--- /dev/null
+++ b/tests/misc/projects/Issue5843/Data.hx
@@ -0,0 +1,8 @@
+package;
+
+typedef Data = {
+	var some:String;
+	var data:Int;
+}
+
+typedef Transformed = Transform<Data>;
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5843/Macro.hx b/tests/misc/projects/Issue5843/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..69d01b04f655607d1122e070a094b9214562de5a
--- /dev/null
+++ b/tests/misc/projects/Issue5843/Macro.hx
@@ -0,0 +1,45 @@
+package;
+
+import haxe.ds.Option;
+import haxe.macro.Context;
+import haxe.macro.Expr;
+import haxe.macro.Type;
+
+class Macro {
+	public static function build() {
+		switch Context.getLocalType() {
+			case TInst(_, [Context.follow(_) => TAnonymous(_.get() => a)]):
+				return buildAnon(a);
+			case _: throw 'assert';
+		}
+	}
+	
+	
+	static function buildAnon(a:AnonType):Type {
+		var sig = Context.signature(a);
+		var name = "Type" + sig;
+		try return Context.getType(name) catch(e:Dynamic) {}
+		var pos = Context.currentPos();
+		var fields = [];
+		for(field in a.fields) {
+			var meta = field.meta.get();
+			
+			fields.push({
+				kind: FieldType.FVar(Context.toComplexType(field.type)),
+				name: field.name,
+				pos: field.pos,
+				meta: meta,
+			});
+		}
+		
+		Context.defineType({
+			fields: fields,
+			kind: TDStructure,
+			name: name,
+			pack: [],
+			pos: pos,
+		});
+		
+		return Context.getType(name);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5843/Main.hx b/tests/misc/projects/Issue5843/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0267fcc06bf4272068ea768a15646509caeafbaa
--- /dev/null
+++ b/tests/misc/projects/Issue5843/Main.hx
@@ -0,0 +1,15 @@
+package;
+
+import Data;
+
+class Main {
+	static function main() {
+		trace('main');
+		var item:Item = null;
+		trace(item);
+	}
+}
+
+typedef Item = {
+	?data:Transformed, // remove the `?` to make it compile
+}
diff --git a/tests/misc/projects/Issue5843/Transform.hx b/tests/misc/projects/Issue5843/Transform.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bafb4a9134cca2207a7bf526d7d44767e31c6ca8
--- /dev/null
+++ b/tests/misc/projects/Issue5843/Transform.hx
@@ -0,0 +1,4 @@
+package;
+
+@:genericBuild(Macro.build())
+class Transform<T> {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5843/compile.hxml b/tests/misc/projects/Issue5843/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..6b33826582ff4a140a957c741b87dc6571f28560
--- /dev/null
+++ b/tests/misc/projects/Issue5843/compile.hxml
@@ -0,0 +1,2 @@
+-main Main
+-js bin/test.js
diff --git a/tests/misc/projects/Issue5856/compile.hxml b/tests/misc/projects/Issue5856/compile.hxml
index 74d6c3731d8dcfdb8353bba6db76f61ea7db84bb..f9368bd2c4438ca84f05d6492143bb3308e45eec 100644
--- a/tests/misc/projects/Issue5856/compile.hxml
+++ b/tests/misc/projects/Issue5856/compile.hxml
@@ -1,3 +1,3 @@
--main Main
+--main Main
 --no-output
 -js js.js
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5871/Main.hx b/tests/misc/projects/Issue5871/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9dfee64ad822ccfce42490e600eecaccb5af1761
--- /dev/null
+++ b/tests/misc/projects/Issue5871/Main.hx
@@ -0,0 +1,14 @@
+class Base {
+	var v = 0;
+}
+
+class Child extends Base {
+	private function new() {}
+}
+
+class Main extends Base {
+	static function main() {
+		// shouldn't be possible; Child's constructor is private
+		new Child();
+	}
+}
diff --git a/tests/misc/projects/Issue5871/Main2.hx b/tests/misc/projects/Issue5871/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..caf40111af2ac769803f1e5668310e390204dfb2
--- /dev/null
+++ b/tests/misc/projects/Issue5871/Main2.hx
@@ -0,0 +1,15 @@
+class Base {
+	private function new() {}
+	var v = 0;
+}
+
+class Child extends Base {
+	private function new() super();
+}
+
+class Main2 extends Base {
+	static function main() {
+		// shouldn't be possible; Child's constructor is private
+		new Child();
+	}
+}
diff --git a/tests/misc/projects/Issue5871/parent-constructor-fail.hxml b/tests/misc/projects/Issue5871/parent-constructor-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..e0934b3797b724d5fecb6c09ec2ccb40a6a45776
--- /dev/null
+++ b/tests/misc/projects/Issue5871/parent-constructor-fail.hxml
@@ -0,0 +1,2 @@
+-main Main2
+--interp
diff --git a/tests/misc/projects/Issue5871/parent-constructor-fail.hxml.stderr b/tests/misc/projects/Issue5871/parent-constructor-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..eca82152be27dd11cb868414a5a98b060b3991ad
--- /dev/null
+++ b/tests/misc/projects/Issue5871/parent-constructor-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:13: characters 3-14 : Cannot access private constructor of Child
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5871/parent-no-constructor-fail.hxml b/tests/misc/projects/Issue5871/parent-no-constructor-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..7d61297e2cbc6549782ec6cf71fef7a4516c6703
--- /dev/null
+++ b/tests/misc/projects/Issue5871/parent-no-constructor-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
diff --git a/tests/misc/projects/Issue5871/parent-no-constructor-fail.hxml.stderr b/tests/misc/projects/Issue5871/parent-no-constructor-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..741f69fe5b4b19c6f4d31128670f7762e780cba2
--- /dev/null
+++ b/tests/misc/projects/Issue5871/parent-no-constructor-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:12: characters 3-14 : Cannot access private constructor of Child
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/Main.hx b/tests/misc/projects/Issue5880/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6c3372dd014e72a898558337ada6d9f33abfde4d
--- /dev/null
+++ b/tests/misc/projects/Issue5880/Main.hx
@@ -0,0 +1,18 @@
+abstract Ref<T>({ v : T }) {
+
+	@:from macro static function from(v) {
+		return macro { somethingNotV : $v };
+	}
+
+}
+
+class Main {
+
+	static function main() {
+		#if !macro
+		var r : Ref<Int> = 10;
+		trace(r);
+		#end
+	}
+
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/Main2.hx b/tests/misc/projects/Issue5880/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0c9ab4428937df4568b9c128b71fa73c5955f841
--- /dev/null
+++ b/tests/misc/projects/Issue5880/Main2.hx
@@ -0,0 +1,18 @@
+abstract Ref2<T>(T) {
+
+	@:from macro static function from(v) {
+		return v;
+	}
+
+}
+
+class Main2 {
+
+	static function main() {
+		#if !macro
+		var r : Ref2<String> = 10;
+		trace(r);
+		#end
+	}
+
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/Main3.hx b/tests/misc/projects/Issue5880/Main3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..44dfbde9f3b80605f19e4faaca9ed762ab57f9df
--- /dev/null
+++ b/tests/misc/projects/Issue5880/Main3.hx
@@ -0,0 +1,17 @@
+abstract Ref3(Bool) {
+
+	@:from macro static function from(v) {
+		return v;
+	}
+
+}
+
+class Main3 {
+
+	static function main() {
+		#if !macro
+		var r : Ref3 = 10;
+		#end
+	}
+
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/Main4.hx b/tests/misc/projects/Issue5880/Main4.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7ad17bda8c5c597ad622429d7b231a905daf59f4
--- /dev/null
+++ b/tests/misc/projects/Issue5880/Main4.hx
@@ -0,0 +1,18 @@
+abstract Ref(Array<Dynamic>) {
+
+	@:from macro static function from(v) {
+		return v;
+	}
+
+}
+
+class Main4 {
+
+	static function main() {
+		#if !macro
+		var r : Ref = ["foo", 12];
+		trace(r);
+		#end
+	}
+
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/Main5.hx b/tests/misc/projects/Issue5880/Main5.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d56ade12e20899b8dc1fcc027dc4e291189143b6
--- /dev/null
+++ b/tests/misc/projects/Issue5880/Main5.hx
@@ -0,0 +1,21 @@
+abstract Ref<T>({ v : T }) {
+#if !macro
+	@:from static public function fromV<T>(v:{v:T}):Ref<T> {
+		return [v];
+	}
+#end
+
+	@:from macro static function from(v) {
+		return macro { v : $v };
+	}
+}
+
+class Main5 {
+
+	static function main() {
+		#if !macro
+		var r : Ref<Int> = 10;
+		#end
+	}
+
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/MainSuccess.hx b/tests/misc/projects/Issue5880/MainSuccess.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2f03249cea0a0b2aca7349b24bb750c7b5c4d3b7
--- /dev/null
+++ b/tests/misc/projects/Issue5880/MainSuccess.hx
@@ -0,0 +1,21 @@
+abstract Ref<T>({ v : T }) {
+
+	@:from macro static function from(v) {
+		return macro new Ref($v);
+	}
+
+	public function new(v:T) {
+		this = { v : v }
+	}
+}
+
+class MainSuccess {
+
+	static function main() {
+		#if !macro
+		var r : Ref<Int> = 10;
+		trace(r);
+		#end
+	}
+
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile-fail.hxml b/tests/misc/projects/Issue5880/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fab0aeecc3dd8ce41c99d29d48c23ec66b19d3c1
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile-fail.hxml
@@ -0,0 +1 @@
+--main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile-fail.hxml.stderr b/tests/misc/projects/Issue5880/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1d636a05bb19a11c8a1c5d13e421c9ba0831e499
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:13: characters 3-25 : Int should be Ref<Int>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile.hxml b/tests/misc/projects/Issue5880/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..388c931988fc91f675507d9ea39d7d096615fb60
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile.hxml
@@ -0,0 +1 @@
+--main MainSuccess
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile2-fail.hxml b/tests/misc/projects/Issue5880/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..9ef4475ecea88e1b7783d1656e61b4b895c4393a
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile2-fail.hxml
@@ -0,0 +1 @@
+--main Main2
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile2-fail.hxml.stderr b/tests/misc/projects/Issue5880/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..f01b5cb975436b87233bcdc1d6845d83f2b0fbf3
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:13: characters 3-29 : Int should be Ref2<String>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile3-fail.hxml b/tests/misc/projects/Issue5880/compile3-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..25e95386d704c5ebea07990c5dcbaf99826119ec
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile3-fail.hxml
@@ -0,0 +1 @@
+--main Main3
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile3-fail.hxml.stderr b/tests/misc/projects/Issue5880/compile3-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..4bd9f22a6770eda5d09f851bb98fc907ff07398c
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile3-fail.hxml.stderr
@@ -0,0 +1 @@
+Main3.hx:13: characters 3-21 : Int should be Ref3
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile4-fail.hxml b/tests/misc/projects/Issue5880/compile4-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..8e4a7681eac65573d34071630e2c82698cad7663
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile4-fail.hxml
@@ -0,0 +1 @@
+--main Main4
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile4-fail.hxml.stderr b/tests/misc/projects/Issue5880/compile4-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..2d2d989fbf8643f838dfba058397d07818065f68
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile4-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main4.hx:13: characters 25-27 : Arrays of mixed types are only allowed if the type is forced to Array<Dynamic>
+Main4.hx:13: characters 25-27 : Int should be String
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile5-fail.hxml b/tests/misc/projects/Issue5880/compile5-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..4e914d018b9a820bdf90289f00e31d712f981479
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile5-fail.hxml
@@ -0,0 +1 @@
+--main Main5
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5880/compile5-fail.hxml.stderr b/tests/misc/projects/Issue5880/compile5-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..3404bef0fe7e26b542dc5c91cf0b4c5d104fb23f
--- /dev/null
+++ b/tests/misc/projects/Issue5880/compile5-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main5.hx:4: characters 10-13 : Array<{ v : fromV.T }> should be fromV.T
+Main5.hx:4: characters 3-13 : Recursive implicit cast
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5888/compile-fail.hxml b/tests/misc/projects/Issue5888/compile-fail.hxml
index 74d6c3731d8dcfdb8353bba6db76f61ea7db84bb..f9368bd2c4438ca84f05d6492143bb3308e45eec 100644
--- a/tests/misc/projects/Issue5888/compile-fail.hxml
+++ b/tests/misc/projects/Issue5888/compile-fail.hxml
@@ -1,3 +1,3 @@
--main Main
+--main Main
 --no-output
 -js js.js
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5888/compile-fail.hxml.stderr b/tests/misc/projects/Issue5888/compile-fail.hxml.stderr
index 106becd9f887d547f20d093705a39ce0ef8c9de9..96fff2bdd79e0fa7c720e57c7d4b70dd3e554843 100644
--- a/tests/misc/projects/Issue5888/compile-fail.hxml.stderr
+++ b/tests/misc/projects/Issue5888/compile-fail.hxml.stderr
@@ -1 +1 @@
-Main.hx:5: characters 2-7 : Int has no field bar
\ No newline at end of file
+Main.hx:5: characters 5-8 : Int has no field bar
diff --git a/tests/misc/projects/Issue5924/Main.hx b/tests/misc/projects/Issue5924/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..76b7e89de70440f464eab7e6cceea8a26be3caf2
--- /dev/null
+++ b/tests/misc/projects/Issue5924/Main.hx
@@ -0,0 +1,21 @@
+using Main;
+
+class Main {
+    static function main() {
+        0.bar();
+    }
+
+    static function bar(f:Foo)
+    	f.bar();
+}
+
+abstract Foo(String) {
+
+    inline function new(v) this = v;
+
+    @:from static function ofInt(i:Int)
+      return new Foo('$i');
+
+    public function bar() {};
+    public function baz() {};
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5924/compile-fail.hxml b/tests/misc/projects/Issue5924/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue5924/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5924/compile-fail.hxml.stderr b/tests/misc/projects/Issue5924/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c059d8ea70f15134844eedf6dedd8e14d1bb1a0f
--- /dev/null
+++ b/tests/misc/projects/Issue5924/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:5: characters 11-14 : Int has no field bar
diff --git a/tests/misc/projects/Issue5940/Main.hx b/tests/misc/projects/Issue5940/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..be1832e8159091d85c6475b103e33f8a1fb05bda
--- /dev/null
+++ b/tests/misc/projects/Issue5940/Main.hx
@@ -0,0 +1,10 @@
+class Main {
+    static function main() {
+        trace(Color.foo);
+    }
+}
+
+abstract Color(Int) {
+    public var foo(get, never):Int;
+    public function get_foo() return 0;
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5940/compile-fail.hxml b/tests/misc/projects/Issue5940/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fab0aeecc3dd8ce41c99d29d48c23ec66b19d3c1
--- /dev/null
+++ b/tests/misc/projects/Issue5940/compile-fail.hxml
@@ -0,0 +1 @@
+--main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5940/compile-fail.hxml.stderr b/tests/misc/projects/Issue5940/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e487861d0cea3eca5cb7d9ca6aa35bc0b9131cef
--- /dev/null
+++ b/tests/misc/projects/Issue5940/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: characters 21-24 : Cannot access non-static abstract field statically
diff --git a/tests/misc/projects/Issue5946/Main.hx b/tests/misc/projects/Issue5946/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f1308326eafe72357e8400bf8a88bff95d4a6dd6
--- /dev/null
+++ b/tests/misc/projects/Issue5946/Main.hx
@@ -0,0 +1,13 @@
+class Main {
+	@:analyzer(ignore)
+	static function main() {
+		Std.downcast((null:One), Two);
+		Std.downcast((null:IOne), ITwo);
+	}
+}
+
+class One {}
+class Two {}
+
+interface IOne {}
+interface ITwo {}
diff --git a/tests/misc/projects/Issue5946/compile-fail.hxml b/tests/misc/projects/Issue5946/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue5946/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5946/compile-fail.hxml.stderr b/tests/misc/projects/Issue5946/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..ee259b86eedb3389765bb487393c69f1e628d8ca
--- /dev/null
+++ b/tests/misc/projects/Issue5946/compile-fail.hxml.stderr
@@ -0,0 +1,4 @@
+Main.hx:5: characters 3-15 : Constraint check failure for downcast.S
+Main.hx:5: characters 3-15 : ITwo should be IOne
+Main.hx:4: characters 3-15 : Constraint check failure for downcast.S
+Main.hx:4: characters 3-15 : Two should be One
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5949/Main.hx b/tests/misc/projects/Issue5949/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..48934180c83815b71f9ac7e669671ca57c97c4a2
--- /dev/null
+++ b/tests/misc/projects/Issue5949/Main.hx
@@ -0,0 +1,12 @@
+class Main {
+	static function main() {}
+}
+
+class C1 {
+	public function a() {}
+}
+
+@:keep
+class C2 extends C1 {
+	@:native("z") override public function a() {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5949/compile-fail.hxml b/tests/misc/projects/Issue5949/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue5949/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue5949/compile-fail.hxml.stderr b/tests/misc/projects/Issue5949/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..22411af2b65f5ffdcb046d655040cfd8a2f4b2f5
--- /dev/null
+++ b/tests/misc/projects/Issue5949/compile-fail.hxml.stderr
@@ -0,0 +1,3 @@
+Main.hx:11: characters 16-47 : Field a has different @:native value than in superclass
+Main.hx:6: characters 2-24 : Base field is defined here
+Main.hx:10: lines 10-12 : Defined in this class
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5952/Main.hx b/tests/misc/projects/Issue5952/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bd982a5a8e634ead75e2034f38db0252ddfbee96
--- /dev/null
+++ b/tests/misc/projects/Issue5952/Main.hx
@@ -0,0 +1,14 @@
+class Main {
+    public static function foo<T>(v:T):T return v;
+
+    public static function main():Void {
+        var a = foo;
+        doSwitch(a);
+    }
+
+    public static function doSwitch<A, T:A->A>(a:T):Void {
+        switch (a){
+            case _.bind("asdf", "foo") => b: trace(b());
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5952/compile1-fail.hxml b/tests/misc/projects/Issue5952/compile1-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue5952/compile1-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue5952/compile1-fail.hxml.stderr b/tests/misc/projects/Issue5952/compile1-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..3b1c6aadd9ff5eb866094115e4d3e234bfeecc88
--- /dev/null
+++ b/tests/misc/projects/Issue5952/compile1-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:11: characters 20-24 : doSwitch.T has no field bind
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6005/Main.hx b/tests/misc/projects/Issue6005/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d693467f3231bd07f699d7beaa40362d66e05220
--- /dev/null
+++ b/tests/misc/projects/Issue6005/Main.hx
@@ -0,0 +1,11 @@
+class Main {
+	public static function main() {
+		var foo:Struct = {
+
+		}
+	}
+}
+
+typedef Struct = {
+	integer:Int
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6005/compile1.hxml b/tests/misc/projects/Issue6005/compile1.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..bfbf43f4b5f6af280834e9c9cf3554681b497879
--- /dev/null
+++ b/tests/misc/projects/Issue6005/compile1.hxml
@@ -0,0 +1 @@
+--display Main.hx@66
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6005/compile1.hxml.stderr b/tests/misc/projects/Issue6005/compile1.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..78f048db3a6f048a862739ba942db8f6503913de
--- /dev/null
+++ b/tests/misc/projects/Issue6005/compile1.hxml.stderr
@@ -0,0 +1,3 @@
+<list>
+<i n="integer" k="var"><t>Int</t><d></d></i>
+</list>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6006/Macro.hx b/tests/misc/projects/Issue6006/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4429e6f839fc9c532a0473e9dbdfd963fd2459e1
--- /dev/null
+++ b/tests/misc/projects/Issue6006/Macro.hx
@@ -0,0 +1,27 @@
+import haxe.macro.Context;
+import haxe.macro.Expr;
+
+class Macro {
+    static function build() {
+        var pos = Context.currentPos();
+        Context.defineModule(Context.getLocalModule(), [{
+            pos: pos,
+            pack: [],
+            name: "A",
+            kind: TDAbstract(macro : Int),
+            fields: [
+                {
+                    pos: pos,
+                    name: "new",
+                    access: [APublic],
+                    kind: FFun({
+                        args: [],
+                        ret: null,
+                        expr: macro this = 1,
+                    })
+                }
+            ]
+        }]);
+        return macro : A;
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6006/Main.hx b/tests/misc/projects/Issue6006/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2221bd90536eaa9c7666cd1d07fa1ffe3eacb345
--- /dev/null
+++ b/tests/misc/projects/Issue6006/Main.hx
@@ -0,0 +1,8 @@
+@:genericBuild(Macro.build())
+class C<T> {}
+
+class Main {
+    static function main() {
+        var c = new C<Int>();
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6006/compile.hxml b/tests/misc/projects/Issue6006/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue6006/compile.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue6030/Main1.hx b/tests/misc/projects/Issue6030/Main1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..541c1eb2c3c2251a95f7716936455a1c20f7ce74
--- /dev/null
+++ b/tests/misc/projects/Issue6030/Main1.hx
@@ -0,0 +1,13 @@
+class Main1 {
+    public var ok(default,null):Void->Void;
+    public var stillOk(default,never) = (function(){return function(){trace("This works.");};})();
+    public var notOk(default,never) = (function(){return function(){trace("This does not work. "+this);};})();
+
+    public function new(){
+        ok = (function(){return function(){trace("This works. "+this);};})();
+    }
+
+    static function main() {
+        new Main1();
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6030/compile-fail.hxml b/tests/misc/projects/Issue6030/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..a8e28c677650c351d9ca6e971b2622b7a68014c7
--- /dev/null
+++ b/tests/misc/projects/Issue6030/compile-fail.hxml
@@ -0,0 +1,3 @@
+--main Main1
+--no-output
+-js js.js
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6030/compile-fail.hxml.stderr b/tests/misc/projects/Issue6030/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..45205aadc165d1e1e4e4278ce3475367f96073ea
--- /dev/null
+++ b/tests/misc/projects/Issue6030/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main1.hx:4: characters 98-102 : Cannot access this or other member field in variable initialization
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6201/Main1.hx b/tests/misc/projects/Issue6201/Main1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..69192dac3407dfd1bc5421a7ee88fa1e7d051b26
--- /dev/null
+++ b/tests/misc/projects/Issue6201/Main1.hx
@@ -0,0 +1,5 @@
+class Main1 {
+	static function method(param:Void = null) {}
+
+	public static function main() {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6201/Main2.hx b/tests/misc/projects/Issue6201/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..984b74f41875f4fe859a4c2f5fcc1ca2334449ad
--- /dev/null
+++ b/tests/misc/projects/Issue6201/Main2.hx
@@ -0,0 +1,5 @@
+class Main2 {
+	public static function main() {
+		var v:Void;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6201/compile1-fail.hxml.disabled b/tests/misc/projects/Issue6201/compile1-fail.hxml.disabled
new file mode 100644
index 0000000000000000000000000000000000000000..86e1e589d76f034d77ebf5bcdc063c811df9e005
--- /dev/null
+++ b/tests/misc/projects/Issue6201/compile1-fail.hxml.disabled
@@ -0,0 +1 @@
+-main Main1
diff --git a/tests/misc/projects/Issue6201/compile1-fail.hxml.stderr b/tests/misc/projects/Issue6201/compile1-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..95845292674e95d702156ef40c0205b6c50ab625
--- /dev/null
+++ b/tests/misc/projects/Issue6201/compile1-fail.hxml.stderr
@@ -0,0 +1 @@
+Main1.hx:2: characters 25-30 : Arguments of type Void are not allowed
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6201/compile2-fail.hxml b/tests/misc/projects/Issue6201/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..27d6e39ab72cf90b00703d0d1323b0c0e760514b
--- /dev/null
+++ b/tests/misc/projects/Issue6201/compile2-fail.hxml
@@ -0,0 +1 @@
+-main Main2
diff --git a/tests/misc/projects/Issue6201/compile2-fail.hxml.stderr b/tests/misc/projects/Issue6201/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..6c7a8df4361cc8518420ed1798b250b798d3a57f
--- /dev/null
+++ b/tests/misc/projects/Issue6201/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:3: characters 7-8 : Variables of type Void are not allowed
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6226/Main.hx b/tests/misc/projects/Issue6226/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3af958e219b15be3b6094d2a8e2ec3c8e9573c3e
--- /dev/null
+++ b/tests/misc/projects/Issue6226/Main.hx
@@ -0,0 +1,9 @@
+class Main {
+	@:deprecated
+	static var b(get, never):Int;
+	static inline function get_b() return 1;
+
+	public static function main() {
+		b;
+	}
+}
diff --git a/tests/misc/projects/Issue6226/compile.hxml b/tests/misc/projects/Issue6226/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue6226/compile.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue6226/compile.hxml.stderr b/tests/misc/projects/Issue6226/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..534c940473cc7f3a51605fddebdbfa53fe339035
--- /dev/null
+++ b/tests/misc/projects/Issue6226/compile.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:7: characters 3-4 : Warning : Usage of this field is deprecated
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6340/Main.hx b/tests/misc/projects/Issue6340/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5e67bbe1b4adf42ec8d4214eb46407cca2e2f026
--- /dev/null
+++ b/tests/misc/projects/Issue6340/Main.hx
@@ -0,0 +1,13 @@
+class Main {
+	static function main() {}
+}
+
+abstract Color(Int) from Int to Int  {
+	var argb(never,set):Int;
+
+	inline function set_argb(v) return this = v;
+
+	public function copyFrom(c:Color) {
+		argb = c;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6340/compile-fail.hxml b/tests/misc/projects/Issue6340/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue6340/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue6340/compile-fail.hxml.stderr b/tests/misc/projects/Issue6340/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..ded3a6fefb21d32f74985e50cfd12a048724bd79
--- /dev/null
+++ b/tests/misc/projects/Issue6340/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:11: characters 3-11 : Abstract 'this' value can only be modified inside an inline function. 'set_argb' modifies 'this'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6402/Main.hx b/tests/misc/projects/Issue6402/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3d471c3018354fd8c43499fe9495f469f656e85b
--- /dev/null
+++ b/tests/misc/projects/Issue6402/Main.hx
@@ -0,0 +1,39 @@
+import haxe.macro.Expr;
+import haxe.macro.*;
+
+class Base {}
+class Extended extends Base {}
+
+class Builder {
+    #if macro
+    static public function checkUnify():Void {
+        var baseType = ComplexTypeTools.toType(macro:Base);
+        var extendedType = ComplexTypeTools.toType(macro:Extended);
+        var unify = Context.unify(extendedType, baseType);
+        Sys.stderr().writeString("Extended unifies Base? " + unify + "\n");
+    }
+    #end
+    macro static public function build():Array<Field> {
+        Sys.stderr().writeString("in @:build\n");
+        checkUnify();
+        var fields = Context.getBuildFields();
+        return fields;
+    }
+}
+
+#if !macro
+@:build(Builder.build())
+#end
+class Main {
+    var extended:Extended;
+
+    macro static function checkUnify() {
+        Sys.stderr().writeString("in macro function\n");
+        Builder.checkUnify();
+        return macro {};
+    }
+
+    static function main() {
+        checkUnify();
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6402/compile.hxml b/tests/misc/projects/Issue6402/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fab0aeecc3dd8ce41c99d29d48c23ec66b19d3c1
--- /dev/null
+++ b/tests/misc/projects/Issue6402/compile.hxml
@@ -0,0 +1 @@
+--main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6402/compile.hxml.stderr b/tests/misc/projects/Issue6402/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..ddaedf03520a29bd93f4dcc79715374760a2e800
--- /dev/null
+++ b/tests/misc/projects/Issue6402/compile.hxml.stderr
@@ -0,0 +1,4 @@
+in @:build
+Extended unifies Base? true
+in macro function
+Extended unifies Base? true
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6427/E.hx b/tests/misc/projects/Issue6427/E.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0741edda6289f595489a9693b76d7a8dcf82dd48
--- /dev/null
+++ b/tests/misc/projects/Issue6427/E.hx
@@ -0,0 +1,3 @@
+enum abstract E(String) {
+	var A = 'a';
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6427/Main.hx b/tests/misc/projects/Issue6427/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b2a624f397a4656db53df3f1138994f84989537f
--- /dev/null
+++ b/tests/misc/projects/Issue6427/Main.hx
@@ -0,0 +1,6 @@
+import T;
+class Main {
+    static function main() {
+        Sys.stderr().writeString(Std.string(A));
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6427/T.hx b/tests/misc/projects/Issue6427/T.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4a9d5eb00e770892848faa5ca7831f64ad18496c
--- /dev/null
+++ b/tests/misc/projects/Issue6427/T.hx
@@ -0,0 +1,2 @@
+typedef Alias = E;
+class T {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6427/compile.hxml b/tests/misc/projects/Issue6427/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue6427/compile.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6427/compile.hxml.stderr b/tests/misc/projects/Issue6427/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..2e65efe2a145dda7ee51d1741299f848e5bf752e
--- /dev/null
+++ b/tests/misc/projects/Issue6427/compile.hxml.stderr
@@ -0,0 +1 @@
+a
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6443/Main.hx b/tests/misc/projects/Issue6443/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..de9b42cbd09d19fd7da92d3acbf31e5381dc8685
--- /dev/null
+++ b/tests/misc/projects/Issue6443/Main.hx
@@ -0,0 +1,13 @@
+class Main {
+	static function main() {
+		var first = true;
+		do {
+			if (first) {
+				first = false;
+				continue;
+			}
+			break;
+		} while (true);
+		Sys.stderr().writeString("ok");
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6443/compile.hxml b/tests/misc/projects/Issue6443/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..3af023a521ff2c329caddbc42062e46c2d077f5b
--- /dev/null
+++ b/tests/misc/projects/Issue6443/compile.hxml
@@ -0,0 +1 @@
+--macro Main.main()
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6443/compile.hxml.stderr b/tests/misc/projects/Issue6443/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..b5754e20373fdaa5331ef6e4623dbae636225e3b
--- /dev/null
+++ b/tests/misc/projects/Issue6443/compile.hxml.stderr
@@ -0,0 +1 @@
+ok
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6445/Main.hx b/tests/misc/projects/Issue6445/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5d5a0c418bee24e2c20f3c6390450368fa00ef03
--- /dev/null
+++ b/tests/misc/projects/Issue6445/Main.hx
@@ -0,0 +1,9 @@
+class Main {
+	static function main() {
+		var e:Int = f();
+	}
+
+	static function f() {
+		return 1 + false; // type error is here
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6445/compile-fail.hxml b/tests/misc/projects/Issue6445/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue6445/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6445/compile-fail.hxml.stderr b/tests/misc/projects/Issue6445/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..95986eb45849a1db7bc092939e2df1c82c0e05be
--- /dev/null
+++ b/tests/misc/projects/Issue6445/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:7: characters 10-19 : Cannot add Int and Bool
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6525/Main.hx b/tests/misc/projects/Issue6525/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c66ddf88884b010e37fb32a888dcddf5db795968
--- /dev/null
+++ b/tests/misc/projects/Issue6525/Main.hx
@@ -0,0 +1,23 @@
+import pack.BasePack;
+import pack.IPack;
+import pack.Pvt;
+import pack.sub.AccessSubPvt;
+
+class Main {
+	static function main() {
+		//should pass, because pack.sub.SubPvt has @:allow(pack)
+		AccessSubPvt.constructExtSubPvt();
+	}
+}
+
+class Sub extends BasePack implements IPack {
+	override public function test() {
+		// should fail, because it allows access to specific package - pack
+		Pvt1.testPack();
+		Pvt2.testPack();
+		// should pass, because it allows access to all instances of pack.BasePack (including descendant classes)
+		Pvt2.testClass();
+		// should pass, because it allows access to all implementers of pack.IPack
+		Pvt2.testInterface();
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6525/compile-fail.hxml b/tests/misc/projects/Issue6525/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue6525/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6525/compile-fail.hxml.stderr b/tests/misc/projects/Issue6525/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..ffdb8a78aa61d02dc6ab912c0d7fcbbf616fd251
--- /dev/null
+++ b/tests/misc/projects/Issue6525/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:16: characters 8-16 : Cannot access private field testPack
+Main.hx:17: characters 8-16 : Cannot access private field testPack
diff --git a/tests/misc/projects/Issue6525/pack/BasePack.hx b/tests/misc/projects/Issue6525/pack/BasePack.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4f725dc20dd8bca5dce594e64b6b16c9e78af102
--- /dev/null
+++ b/tests/misc/projects/Issue6525/pack/BasePack.hx
@@ -0,0 +1,12 @@
+package pack;
+
+import pack.Pvt;
+
+class BasePack {
+	public function new() {}
+
+	public function test() {
+		Pvt1.testPack();
+		Pvt2.testPack();
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6525/pack/IPack.hx b/tests/misc/projects/Issue6525/pack/IPack.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a9874ff90f93a9085b12d2bf65589c0ff2feb6c5
--- /dev/null
+++ b/tests/misc/projects/Issue6525/pack/IPack.hx
@@ -0,0 +1,3 @@
+package pack;
+
+interface IPack {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6525/pack/Pvt.hx b/tests/misc/projects/Issue6525/pack/Pvt.hx
new file mode 100644
index 0000000000000000000000000000000000000000..83ab2ab2c59c0dcdd7f78534ba5f7252fa850c16
--- /dev/null
+++ b/tests/misc/projects/Issue6525/pack/Pvt.hx
@@ -0,0 +1,17 @@
+package pack;
+
+@:allow(pack)
+class Pvt1 {
+	static function testPack() {}
+}
+
+class Pvt2 {
+	@:allow(pack)
+	static function testPack() {}
+
+	@:allow(pack.BasePack)
+	static function testClass() {}
+
+	@:allow(pack.IPack)
+	static function testInterface() {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6525/pack/sub/AccessSubPvt.hx b/tests/misc/projects/Issue6525/pack/sub/AccessSubPvt.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c8b002532ebe994292b9c6a516116f7d32879021
--- /dev/null
+++ b/tests/misc/projects/Issue6525/pack/sub/AccessSubPvt.hx
@@ -0,0 +1,7 @@
+package pack.sub;
+
+class AccessSubPvt {
+	static public function constructExtSubPvt():ExtSubPvt {
+		return new ExtSubPvt();
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6525/pack/sub/ExtSubPvt.hx b/tests/misc/projects/Issue6525/pack/sub/ExtSubPvt.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9053d52250a6152d98fc2fa9ac0ac41103518b35
--- /dev/null
+++ b/tests/misc/projects/Issue6525/pack/sub/ExtSubPvt.hx
@@ -0,0 +1,5 @@
+package pack.sub;
+
+class ExtSubPvt extends SubPvt {
+
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6525/pack/sub/SubPvt.hx b/tests/misc/projects/Issue6525/pack/sub/SubPvt.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dca27e8954f2d4a30d57d665001e18ad15719bed
--- /dev/null
+++ b/tests/misc/projects/Issue6525/pack/sub/SubPvt.hx
@@ -0,0 +1,6 @@
+package pack.sub;
+
+@:allow(pack)
+class SubPvt {
+	function new():Void {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6542/Main.hx b/tests/misc/projects/Issue6542/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d878b37c34af24bded7d6c40493c6c114343aad5
--- /dev/null
+++ b/tests/misc/projects/Issue6542/Main.hx
@@ -0,0 +1,12 @@
+class Main {
+	static function main() {
+		function isEven(value:Float) return value % 2 == 0;
+		for (value in -10 ... 10) {
+			switch value {
+				case value = isEven(_) => true if (_ > 0):  // runtime error
+					trace(value);
+				case _:
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6542/compile-fail.hxml b/tests/misc/projects/Issue6542/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue6542/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6542/compile-fail.hxml.stderr b/tests/misc/projects/Issue6542/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..75a32ac6f13fdaa37e4e11e6cf34d4f308c5b5ea
--- /dev/null
+++ b/tests/misc/projects/Issue6542/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:6: characters 40-41 : Unknown identifier : _
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6550/Main.hx b/tests/misc/projects/Issue6550/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e0e9f228596cccab0c0affffbc11f8409e940c63
--- /dev/null
+++ b/tests/misc/projects/Issue6550/Main.hx
@@ -0,0 +1,8 @@
+class Main {
+    static function main() {
+		switch [1, 2] {
+			case [var1, var1 == _ => true]:
+			case _:
+		}
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6550/compile-fail.hxml b/tests/misc/projects/Issue6550/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue6550/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6550/compile-fail.hxml.stderr b/tests/misc/projects/Issue6550/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..4d11779de5ae39dfc16202372635703cbd695958
--- /dev/null
+++ b/tests/misc/projects/Issue6550/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:4: characters 16-20 : Unknown identifier : var1
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6583/Macro1.hx b/tests/misc/projects/Issue6583/Macro1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3175c99138d12543be7eef2240c806a784f0e633
--- /dev/null
+++ b/tests/misc/projects/Issue6583/Macro1.hx
@@ -0,0 +1,16 @@
+class BaseClass {
+	public function new() { }
+	public function f() {
+		Sys.stderr().writeString("BaseClass.f");
+	}
+}
+
+class Macro1 {
+	static public macro function macro1() {
+		return macro null;
+	}
+
+	static public function call(ref:BaseClass) {
+		ref.f();
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6583/Macro2.hx b/tests/misc/projects/Issue6583/Macro2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3c59f638ee9b18d32c16185bfe8859ae1db950ab
--- /dev/null
+++ b/tests/misc/projects/Issue6583/Macro2.hx
@@ -0,0 +1,12 @@
+class ChildClass extends Macro1.BaseClass {
+	override public function f() {
+		Sys.stderr().writeString("ChildClass.f");
+	}
+}
+
+class Macro2 {
+	static public macro function macro2() {
+		Macro1.call(new ChildClass());
+		return macro null;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6583/Main.hx b/tests/misc/projects/Issue6583/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..878f7c40f4eb640fff16bc5d8ec471ede139891c
--- /dev/null
+++ b/tests/misc/projects/Issue6583/Main.hx
@@ -0,0 +1,6 @@
+class Main {
+    static function main() {
+        Macro1.macro1();
+        Macro2.macro2();
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6583/compile.hxml b/tests/misc/projects/Issue6583/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fab0aeecc3dd8ce41c99d29d48c23ec66b19d3c1
--- /dev/null
+++ b/tests/misc/projects/Issue6583/compile.hxml
@@ -0,0 +1 @@
+--main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6583/compile.hxml.stderr b/tests/misc/projects/Issue6583/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..29e233eb79e4585e562096029004ea7feb5e6951
--- /dev/null
+++ b/tests/misc/projects/Issue6583/compile.hxml.stderr
@@ -0,0 +1 @@
+ChildClass.f
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/Main1.hx b/tests/misc/projects/Issue6584/Main1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7f31549642cf949b5d4eae63581057cfa8e4a3ff
--- /dev/null
+++ b/tests/misc/projects/Issue6584/Main1.hx
@@ -0,0 +1,3 @@
+class Main {
+	static final v;
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/Main2.hx b/tests/misc/projects/Issue6584/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..428f0f22eb4216f1aeee4393f85e5c9f44c53dda
--- /dev/null
+++ b/tests/misc/projects/Issue6584/Main2.hx
@@ -0,0 +1,7 @@
+class Main {
+	static final v = 1;
+
+	static function f() {
+		v = 2;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/Main3.hx b/tests/misc/projects/Issue6584/Main3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1ca860cffd682d7841c801eb45c11d0b378a3752
--- /dev/null
+++ b/tests/misc/projects/Issue6584/Main3.hx
@@ -0,0 +1,11 @@
+class Main {
+	final v:Int;
+
+	function new() {
+		v = 1;
+	}
+
+	function f() {
+		v = 2;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/Main4.hx b/tests/misc/projects/Issue6584/Main4.hx
new file mode 100644
index 0000000000000000000000000000000000000000..78a2ac413eb7c8e5f0155775281fa4ae00156ead
--- /dev/null
+++ b/tests/misc/projects/Issue6584/Main4.hx
@@ -0,0 +1,10 @@
+class Main {
+	final y:Int;
+	static public function main() {
+		new Main();
+	}
+
+	function new() {
+
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/Main5.hx b/tests/misc/projects/Issue6584/Main5.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8c5e3224ef39ebc4bac0ae459a91044ad16b5e91
--- /dev/null
+++ b/tests/misc/projects/Issue6584/Main5.hx
@@ -0,0 +1,6 @@
+class Main {
+	final v:Int;
+	static public function main() {
+
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/compile1-fail.hxml b/tests/misc/projects/Issue6584/compile1-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b81257ced723b023ee41baae1580b183bca7cea8
--- /dev/null
+++ b/tests/misc/projects/Issue6584/compile1-fail.hxml
@@ -0,0 +1,2 @@
+Main1
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/compile1-fail.hxml.stderr b/tests/misc/projects/Issue6584/compile1-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e515bda16651cd630ca7bbff6b27c7b51b1968c7
--- /dev/null
+++ b/tests/misc/projects/Issue6584/compile1-fail.hxml.stderr
@@ -0,0 +1 @@
+Main1.hx:2: characters 2-17 : v: Static final variable must be initialized
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/compile2-fail.hxml b/tests/misc/projects/Issue6584/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..cc8acb29535377619e61175f13cd9db3fd97f9db
--- /dev/null
+++ b/tests/misc/projects/Issue6584/compile2-fail.hxml
@@ -0,0 +1,2 @@
+Main2
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/compile2-fail.hxml.stderr b/tests/misc/projects/Issue6584/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..72019de511e96d569adde024119887536463f2bf
--- /dev/null
+++ b/tests/misc/projects/Issue6584/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:5: characters 3-8 : Cannot access field or identifier v for writing
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/compile3-fail.hxml b/tests/misc/projects/Issue6584/compile3-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c716b0fd1e94a24eeb3658d8a798d9bf365884f4
--- /dev/null
+++ b/tests/misc/projects/Issue6584/compile3-fail.hxml
@@ -0,0 +1,2 @@
+Main3
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/compile3-fail.hxml.stderr b/tests/misc/projects/Issue6584/compile3-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..68360d33b1be78112c62f76f5a1fb152c294e373
--- /dev/null
+++ b/tests/misc/projects/Issue6584/compile3-fail.hxml.stderr
@@ -0,0 +1 @@
+Main3.hx:9: characters 3-8 : Cannot access field or identifier v for writing
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/compile4-fail.hxml b/tests/misc/projects/Issue6584/compile4-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..31a00cc52f708c6833e9b32d04ab278fc1ba6dea
--- /dev/null
+++ b/tests/misc/projects/Issue6584/compile4-fail.hxml
@@ -0,0 +1,2 @@
+Main4
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/compile4-fail.hxml.stderr b/tests/misc/projects/Issue6584/compile4-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..6ecdd03b22209260b3740f881a5b53e403d686ba
--- /dev/null
+++ b/tests/misc/projects/Issue6584/compile4-fail.hxml.stderr
@@ -0,0 +1 @@
+Main4.hx:2: characters 2-14 : final field y must be initialized immediately or in the constructor
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/compile5-fail.hxml b/tests/misc/projects/Issue6584/compile5-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..d2ca68833ebb917692f06726a17463c6496e0089
--- /dev/null
+++ b/tests/misc/projects/Issue6584/compile5-fail.hxml
@@ -0,0 +1,2 @@
+Main5
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6584/compile5-fail.hxml.stderr b/tests/misc/projects/Issue6584/compile5-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..29e86ea8905444847b814376f2109d4ac69ea7a6
--- /dev/null
+++ b/tests/misc/projects/Issue6584/compile5-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main5.hx:1: lines 1-6 : This class has uninitialized final vars, which requires a constructor
+Main5.hx:2: characters 2-14 : Example of an uninitialized final var
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6622/Main1.hx b/tests/misc/projects/Issue6622/Main1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..81b84e749c552ddd5f21ff6b58cf5e77fd729f99
--- /dev/null
+++ b/tests/misc/projects/Issue6622/Main1.hx
@@ -0,0 +1,22 @@
+enum FmtOption<A> {
+	FixedPrecision:FmtOption<A>;
+}
+
+enum Fmt<A,B> {
+	Opt<C>(opt:FmtOption<C>):Fmt<A,C>;
+}
+
+class Main {
+	static public function main() {
+	}
+
+	static function eval<A, B>(fmt:Fmt<A, B>, f:String -> A):B {
+		return switch (fmt) {
+			case Opt(FixedPrecision):
+				$type(fmt);
+				var r =f("");
+				$type(f);
+				r;
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6622/compile1-fail.hxml b/tests/misc/projects/Issue6622/compile1-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..000ea7da235b0b82b00963dd8a451480b045c3a4
--- /dev/null
+++ b/tests/misc/projects/Issue6622/compile1-fail.hxml
@@ -0,0 +1,2 @@
+--main Main1
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6622/compile1-fail.hxml.stderr b/tests/misc/projects/Issue6622/compile1-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..a30cc8dcaaf886aeea078ca2ef6416fca1bdd844
--- /dev/null
+++ b/tests/misc/projects/Issue6622/compile1-fail.hxml.stderr
@@ -0,0 +1,3 @@
+Main1.hx:16: characters 11-14 : Warning : Fmt<eval.A, eval.B>
+Main1.hx:18: characters 11-12 : Warning : String -> eval.A
+Main1.hx:15: lines 15-19 : eval.A should be eval.B
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6699/Main.hx b/tests/misc/projects/Issue6699/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9a40a1e300a7b37c63c6d7422f659462d999f46c
--- /dev/null
+++ b/tests/misc/projects/Issue6699/Main.hx
@@ -0,0 +1,16 @@
+class A {
+	function foo() {
+	}
+}
+
+class B extends A {
+	function foo() {
+	}
+}
+
+class Main {
+
+	static function main() {
+	}
+
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6699/compile-fail.hxml b/tests/misc/projects/Issue6699/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue6699/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6699/compile-fail.hxml.stderr b/tests/misc/projects/Issue6699/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..4455f4cff4ebf7f5dad2abc654363d4cfaae5974
--- /dev/null
+++ b/tests/misc/projects/Issue6699/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:7: lines 7-8 : Field foo should be declared with 'override' since it is inherited from superclass A
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6707/Main.hx b/tests/misc/projects/Issue6707/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1e48eb6b17c3e0b58a735c554eedfb891003f4e4
--- /dev/null
+++ b/tests/misc/projects/Issue6707/Main.hx
@@ -0,0 +1,7 @@
+typedef MyTypedef = {
+	var ? x:String;
+}
+
+class Main {
+	static public function main() { }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6707/compile-fail.hxml b/tests/misc/projects/Issue6707/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue6707/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6707/compile-fail.hxml.stderr b/tests/misc/projects/Issue6707/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..314702f9d5d905a21e6f6d23bb92327a5ca5c9ea
--- /dev/null
+++ b/tests/misc/projects/Issue6707/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:2: characters 6-7 : Invalid usage of ?, use ?x instead
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6714/Main.hx b/tests/misc/projects/Issue6714/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fa7ec8f466205fc0200fa64b34ed274a701b5e40
--- /dev/null
+++ b/tests/misc/projects/Issue6714/Main.hx
@@ -0,0 +1,19 @@
+import haxe.Constraints;
+
+class Main {
+	static public function main() {
+		create(C);
+	}
+
+	@:generic
+	public static function create<T:Constructible<(a:Bool)->Void>>(type:Class<T>):Void {
+		var string = new T("test");
+		var bool = new T(true);
+	}
+}
+
+class C {
+	public function new(a:Bool) {
+
+	}
+}
diff --git a/tests/misc/projects/Issue6714/compile-fail.hxml b/tests/misc/projects/Issue6714/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue6714/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6714/compile-fail.hxml.stderr b/tests/misc/projects/Issue6714/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..a848f378691435faaf951e9c0a1f1b94d314e81f
--- /dev/null
+++ b/tests/misc/projects/Issue6714/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:10: characters 22-28 : String should be Bool
+Main.hx:10: characters 22-28 : For function argument 'a'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6757/Test.hx b/tests/misc/projects/Issue6757/Test.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0ed3438b458010d3958f3a8cfd01a3b3e789d2c7
--- /dev/null
+++ b/tests/misc/projects/Issue6757/Test.hx
@@ -0,0 +1,12 @@
+import haxe.ds.Option;
+
+class Test {
+  static function which(v:Int) return
+    v > 1 ? Some("abc") : Some(true);
+
+  static function main() {
+    var r = which(1);
+    $type(r); // Option<Dynamic>
+    trace(r);
+  }
+}
diff --git a/tests/misc/projects/Issue6757/compile-fail.hxml b/tests/misc/projects/Issue6757/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..d48e81c5ae249d88f71c3dac8c703ee1b1e8b383
--- /dev/null
+++ b/tests/misc/projects/Issue6757/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Test
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6757/compile-fail.hxml.stderr b/tests/misc/projects/Issue6757/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..a9b138650b2559a73a3447cfc062fef99d8316c5
--- /dev/null
+++ b/tests/misc/projects/Issue6757/compile-fail.hxml.stderr
@@ -0,0 +1,4 @@
+Test.hx:5: characters 27-37 : error: Bool should be String
+Test.hx:5: characters 27-37 :  have: haxe.ds.Option<Bool>
+Test.hx:5: characters 27-37 :  want: haxe.ds.Option<String>
+Test.hx:9: characters 11-12 : Warning : haxe.ds.Option<String>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6765/Main.hx b/tests/misc/projects/Issue6765/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fcfd8372cac7b9bdf8a1e05f3303c45b8526ba31
--- /dev/null
+++ b/tests/misc/projects/Issue6765/Main.hx
@@ -0,0 +1,10 @@
+extern class J {
+	@:overload(function(s:String):Void {})
+	public function new():Void;
+}
+
+class Main {
+	static function main() {
+		new J(my_typo);
+	}
+}
diff --git a/tests/misc/projects/Issue6765/compile-fail.hxml b/tests/misc/projects/Issue6765/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue6765/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6765/compile-fail.hxml.stderr b/tests/misc/projects/Issue6765/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..0abdd0345bb312ca51d9b3c47383532ffff11633
--- /dev/null
+++ b/tests/misc/projects/Issue6765/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:8: characters 9-16 : Unknown identifier : my_typo
diff --git a/tests/misc/projects/Issue6772/Main.hx b/tests/misc/projects/Issue6772/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f582eac0b57dc0d38f47f73c28989bf14cade036
--- /dev/null
+++ b/tests/misc/projects/Issue6772/Main.hx
@@ -0,0 +1,9 @@
+class Main {
+    public static function main() {
+        new Main();
+    }
+
+    final i:Int = 0;
+
+    function new() {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6772/compile.hxml b/tests/misc/projects/Issue6772/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue6772/compile.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6780/Main.hx b/tests/misc/projects/Issue6780/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a7f4ae9a875a37ececa8526e3df6c6233259a9f5
--- /dev/null
+++ b/tests/misc/projects/Issue6780/Main.hx
@@ -0,0 +1,6 @@
+class Main {
+	public static function main() {
+		trace(Single);
+		trace(Double);
+	}
+}
diff --git a/tests/misc/projects/Issue6780/compile.hxml b/tests/misc/projects/Issue6780/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..17cf56a9ef39442dfb6fd373fbfd42135cf9ed40
--- /dev/null
+++ b/tests/misc/projects/Issue6780/compile.hxml
@@ -0,0 +1,3 @@
+-cp 'single quotes'
+-cp "double quotes"
+-main Main
diff --git a/tests/misc/projects/Issue6780/double quotes/Double.hx b/tests/misc/projects/Issue6780/double quotes/Double.hx
new file mode 100644
index 0000000000000000000000000000000000000000..066f552177dcd01a380117a15d10ab04877effcb
--- /dev/null
+++ b/tests/misc/projects/Issue6780/double quotes/Double.hx	
@@ -0,0 +1 @@
+class Double {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6780/single quotes/Single.hx b/tests/misc/projects/Issue6780/single quotes/Single.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0f1163cd4f3dee7d73dea2da0215f71575fb29d6
--- /dev/null
+++ b/tests/misc/projects/Issue6780/single quotes/Single.hx	
@@ -0,0 +1 @@
+class Single {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6790/Main.hx b/tests/misc/projects/Issue6790/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..53b7212e43951f2a78804ac1d3fc5076976a7a9a
--- /dev/null
+++ b/tests/misc/projects/Issue6790/Main.hx
@@ -0,0 +1,24 @@
+import js.lib.Promise;
+
+class Main {
+	static function main() {
+		var p = new Promise<String>(null);
+
+		$type(p.then(function(x) $type(x)));
+		$type(p.then(function(x) $type(x), function(e) $type(e)));
+
+		$type(p.then(function(x) {$type(x); return 1;}));
+		$type(p.then(function(x) {$type(x); return Promise.resolve(1);}));
+
+		$type(p.then(null,function(x) {$type(x); return 1;}));
+		$type(p.then(null,function(x) {$type(x); return Promise.resolve(1);}));
+
+		$type(p.then(function(x) {$type(x); return 1;}, function(e) {$type(e); return 1;}));
+		$type(p.then(function(x) {$type(x); return Promise.resolve(1);}, function(e) {$type(e); return 1;}));
+		$type(p.then(function(x) {$type(x); return 1;}, function(e) {$type(e); return Promise.resolve(1);}));
+		$type(p.then(function(x) {$type(x); return Promise.resolve(1);}, function(e) {$type(e); return Promise.resolve(1);}));
+
+		$type(p.catchError(function(x) {$type(x);}));
+		$type(p.catchError(function(x) {$type(x); return Promise.resolve(1);}));
+	}
+}
diff --git a/tests/misc/projects/Issue6790/Mismatch.hx b/tests/misc/projects/Issue6790/Mismatch.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d24c815b0582a530dfc013c5c13b142202d63d99
--- /dev/null
+++ b/tests/misc/projects/Issue6790/Mismatch.hx
@@ -0,0 +1,8 @@
+import js.lib.Promise;
+
+class Mismatch {
+	static function main() {
+		var p = new Promise<String>(null);
+		p.then(x -> 10, e -> "");
+	}
+}
diff --git a/tests/misc/projects/Issue6790/compile-fail.hxml b/tests/misc/projects/Issue6790/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..302a11c9a52185712cf0de535ed32d889021f69d
--- /dev/null
+++ b/tests/misc/projects/Issue6790/compile-fail.hxml
@@ -0,0 +1,3 @@
+-main Mismatch
+-js whatever.js
+--no-output
diff --git a/tests/misc/projects/Issue6790/compile-fail.hxml.stderr b/tests/misc/projects/Issue6790/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..8e5783eb3709a1a82195f4ad11d4b95b24456515
--- /dev/null
+++ b/tests/misc/projects/Issue6790/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Mismatch.hx:6: characters 19-26 : (e : Unknown<0>) -> String should be Null<js.lib.PromiseHandler<Dynamic, Int>>
+Mismatch.hx:6: characters 19-26 : For optional function argument 'onRejected'
diff --git a/tests/misc/projects/Issue6790/compile.hxml b/tests/misc/projects/Issue6790/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..0b0f5fae2012c9ce2da015ea34de763c14b9e087
--- /dev/null
+++ b/tests/misc/projects/Issue6790/compile.hxml
@@ -0,0 +1,3 @@
+-main Main
+-js whatever.js
+--no-output
diff --git a/tests/misc/projects/Issue6790/compile.hxml.stderr b/tests/misc/projects/Issue6790/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..040e5fd10ac56b2f776c13c63a23ba5734750856
--- /dev/null
+++ b/tests/misc/projects/Issue6790/compile.hxml.stderr
@@ -0,0 +1,29 @@
+Main.hx:7: characters 34-35 : Warning : String
+Main.hx:7: characters 9-37 : Warning : js.lib.Promise<Void>
+Main.hx:8: characters 34-35 : Warning : String
+Main.hx:8: characters 56-57 : Warning : Unknown<0>
+Main.hx:8: characters 9-59 : Warning : js.lib.Promise<Void>
+Main.hx:10: characters 35-36 : Warning : String
+Main.hx:10: characters 9-50 : Warning : js.lib.Promise<Int>
+Main.hx:11: characters 35-36 : Warning : String
+Main.hx:11: characters 9-67 : Warning : js.lib.Promise<Int>
+Main.hx:13: characters 40-41 : Warning : Unknown<0>
+Main.hx:13: characters 9-55 : Warning : js.lib.Promise<Int>
+Main.hx:14: characters 40-41 : Warning : Unknown<0>
+Main.hx:14: characters 9-72 : Warning : js.lib.Promise<Int>
+Main.hx:16: characters 35-36 : Warning : String
+Main.hx:16: characters 70-71 : Warning : Unknown<0>
+Main.hx:16: characters 9-85 : Warning : js.lib.Promise<Int>
+Main.hx:17: characters 35-36 : Warning : String
+Main.hx:17: characters 87-88 : Warning : Unknown<0>
+Main.hx:17: characters 9-102 : Warning : js.lib.Promise<Int>
+Main.hx:18: characters 35-36 : Warning : String
+Main.hx:18: characters 70-71 : Warning : Unknown<0>
+Main.hx:18: characters 9-102 : Warning : js.lib.Promise<Int>
+Main.hx:19: characters 35-36 : Warning : String
+Main.hx:19: characters 87-88 : Warning : Unknown<0>
+Main.hx:19: characters 9-119 : Warning : js.lib.Promise<Int>
+Main.hx:21: characters 41-42 : Warning : Unknown<0>
+Main.hx:21: characters 9-46 : Warning : js.lib.Promise<Void>
+Main.hx:22: characters 41-42 : Warning : Unknown<0>
+Main.hx:22: characters 9-73 : Warning : js.lib.Promise<Int>
diff --git a/tests/misc/projects/Issue6826/Main.hx b/tests/misc/projects/Issue6826/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6e22f677114835e51be1e56ee2791cbb9492911d
--- /dev/null
+++ b/tests/misc/projects/Issue6826/Main.hx
@@ -0,0 +1,7 @@
+class Main
+{
+  public static function main()
+  {
+    trace('Hello ${ } world!');
+  }
+}
diff --git a/tests/misc/projects/Issue6826/compile-fail.hxml b/tests/misc/projects/Issue6826/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue6826/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6826/compile-fail.hxml.stderr b/tests/misc/projects/Issue6826/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e0f4ead48e5ed0cd8044d3251b020c9dca47db19
--- /dev/null
+++ b/tests/misc/projects/Issue6826/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:5: characters 20-21 : Invalid interpolated expression
+Main.hx:5: characters 20-21 : For function argument 'v'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6841/Main.hx b/tests/misc/projects/Issue6841/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d5d83d91e48b4303a5d42a04c0122808a2c92cd8
--- /dev/null
+++ b/tests/misc/projects/Issue6841/Main.hx
@@ -0,0 +1,13 @@
+class A {
+	public function new() {}
+
+	function toString()
+		return 'a';
+}
+
+class Main {
+	static function main() {
+		var foos: Array<A> = [new A(), new A(), new A()];
+		Sys.print(foos.join(''));
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6841/Test.hx b/tests/misc/projects/Issue6841/Test.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cfcc35c193b9cb6a9f5c28723786ff2c0e4b163a
--- /dev/null
+++ b/tests/misc/projects/Issue6841/Test.hx
@@ -0,0 +1,19 @@
+class Test {
+	static function error(msg, code) {
+		Sys.stderr().writeString(msg);
+		Sys.exit(code);
+	}
+
+	static function main() {
+		var proc = new sys.io.Process("haxe", ["-dce", "full", "-x", "Main.hx"]);
+		var stderr = proc.stderr.readAll().toString();
+		var exit = proc.exitCode();
+		if (exit != 0) {
+			error(stderr, exit);
+		} else {
+			var stdout = proc.stdout.readAll().toString();
+			if (stdout.indexOf("aaa") == -1)
+				error("toString NOT kept\n", 1);
+		}
+	}
+}
diff --git a/tests/misc/projects/Issue6841/compile.hxml b/tests/misc/projects/Issue6841/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..34c9a3273dfecb06f1e22049f4219394adf006fa
--- /dev/null
+++ b/tests/misc/projects/Issue6841/compile.hxml
@@ -0,0 +1 @@
+--run Test
diff --git a/tests/misc/projects/Issue6846/Main.hx b/tests/misc/projects/Issue6846/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2e91941421888868070d340215c6bd919c213155
--- /dev/null
+++ b/tests/misc/projects/Issue6846/Main.hx
@@ -0,0 +1,12 @@
+typedef S = { f:Int };
+
+class Main {
+	static function main() {
+		var v = f2(f());
+		(v : S);
+		$type(v);
+	}
+
+	static function f():Dynamic return null;
+	static function f2<T>(v:T):Null<T> return v;
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6846/compile.hxml b/tests/misc/projects/Issue6846/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue6846/compile.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6846/compile.hxml.stderr b/tests/misc/projects/Issue6846/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..fda305def27c191a6730fc4ad0ead9cf9c369a67
--- /dev/null
+++ b/tests/misc/projects/Issue6846/compile.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:7: characters 9-10 : Warning : Null<S>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6878/Main.hx b/tests/misc/projects/Issue6878/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2a5b3fc300e51c7c5eedb874effa2a6515ed0c54
--- /dev/null
+++ b/tests/misc/projects/Issue6878/Main.hx
@@ -0,0 +1,13 @@
+@:generic
+class Foo<@:const T:Int> {
+   public function new() {
+       trace(T);
+   }
+}
+
+class Main {
+    public static function main() {
+    	new Foo<10>();
+		new Foo<"10">();
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6878/Main1.hx b/tests/misc/projects/Issue6878/Main1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1667dd87e5b0f56cd8b2e4a9f1903dfac6cec69e
--- /dev/null
+++ b/tests/misc/projects/Issue6878/Main1.hx
@@ -0,0 +1,8 @@
+class Main {
+    public static function main() {
+		test("10");
+		test(10);
+    }
+
+	@:generic static function test<T:String>(t:T) { }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6878/compile-fail.hxml b/tests/misc/projects/Issue6878/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue6878/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6878/compile-fail.hxml.stderr b/tests/misc/projects/Issue6878/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..040908bd1bf0ddc33bdcf279036e4e0a39394b50
--- /dev/null
+++ b/tests/misc/projects/Issue6878/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:11: characters 7-16 : Constraint check failure for Foo.T
+Main.hx:11: characters 7-16 : "10" should be Int
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6878/compile1-fail.hxml b/tests/misc/projects/Issue6878/compile1-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..d7a4672bb8b25917bd7d613af362454db43c6aad
--- /dev/null
+++ b/tests/misc/projects/Issue6878/compile1-fail.hxml
@@ -0,0 +1,2 @@
+-main Main1
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6878/compile1-fail.hxml.stderr b/tests/misc/projects/Issue6878/compile1-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..a37d1742540fb6a8da846e2e3a9c5009db21b44b
--- /dev/null
+++ b/tests/misc/projects/Issue6878/compile1-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main1.hx:4: characters 3-11 : Constraint check failure for test.T
+Main1.hx:4: characters 3-11 : Int should be String
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6903/Main.hx b/tests/misc/projects/Issue6903/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..08146046e01fab65161605ee02707b8994966bbe
--- /dev/null
+++ b/tests/misc/projects/Issue6903/Main.hx
@@ -0,0 +1,9 @@
+class Main {
+	static function main() {}
+}
+
+abstract Test(Int) {
+	@:op(A = B) static function opAssign(a:Test, b:Test):Test {
+		return a;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6903/compile-fail.hxml b/tests/misc/projects/Issue6903/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue6903/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6903/compile-fail.hxml.stderr b/tests/misc/projects/Issue6903/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..8a7b92fdadc98f37f9c7a726beb1b5d7885ab74d
--- /dev/null
+++ b/tests/misc/projects/Issue6903/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:6: lines 6-8 : opAssign: Assignment overloading is not supported
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6922/Test.hx b/tests/misc/projects/Issue6922/Test.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d2452f7c7460cce83719014d640deb4faef82fa5
--- /dev/null
+++ b/tests/misc/projects/Issue6922/Test.hx
@@ -0,0 +1,5 @@
+class Test {
+	static function main() {
+		haxe.Log.trace("test message", null);
+	}
+}
diff --git a/tests/misc/projects/Issue6922/compile.hxml b/tests/misc/projects/Issue6922/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..63ff523ead8ae2865d737e6ea7b65f3be54da5bb
--- /dev/null
+++ b/tests/misc/projects/Issue6922/compile.hxml
@@ -0,0 +1,2 @@
+-main Test
+--interp
diff --git a/tests/misc/projects/Issue6950/Main.hx b/tests/misc/projects/Issue6950/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..892278502f0556366a91ee7b25113ff7e9135e77
--- /dev/null
+++ b/tests/misc/projects/Issue6950/Main.hx
@@ -0,0 +1,11 @@
+typedef MyTypedef = {
+	b : Bool,
+}
+
+class Main {
+	static public function main() {
+		var t:MyTypedef = {
+			b: 1,
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6950/compile-fail.hxml b/tests/misc/projects/Issue6950/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue6950/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6950/compile-fail.hxml.stderr b/tests/misc/projects/Issue6950/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..525c0631724351d600f05556ef6f3e2a69b28522
--- /dev/null
+++ b/tests/misc/projects/Issue6950/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:8: characters 7-8 : Int should be Bool
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6965/Main.hx b/tests/misc/projects/Issue6965/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4d8b73d4bcc875707eadf759d7604962a2d91bd5
--- /dev/null
+++ b/tests/misc/projects/Issue6965/Main.hx
@@ -0,0 +1,8 @@
+class Main {
+    static function main() {
+        switch ["a", "b"] {
+            case [a = "something", "something"]:
+            case fallback:
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6965/compile-fail.hxml b/tests/misc/projects/Issue6965/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue6965/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6965/compile-fail.hxml.stderr b/tests/misc/projects/Issue6965/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..2b4ef01ea4aec45731d0a31ef87716bcc05d8e74
--- /dev/null
+++ b/tests/misc/projects/Issue6965/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:5: characters 18-26 : Cannot bind matched tuple to variable, use _ instead
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6992/Main.hx b/tests/misc/projects/Issue6992/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..00897680ee9bcab382bf5586ff8ad1af67d332f1
--- /dev/null
+++ b/tests/misc/projects/Issue6992/Main.hx
@@ -0,0 +1,7 @@
+class Main {
+	static public function main() {
+		foo(12);
+	}
+
+	inline static function foo( b ) { foo(b); }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue6992/compile.hxml b/tests/misc/projects/Issue6992/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..60e8febe4488dce40b4912fe8a5fc5ddc1089811
--- /dev/null
+++ b/tests/misc/projects/Issue6992/compile.hxml
@@ -0,0 +1,3 @@
+-main Main
+-js whatever.js
+--no-output
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7017/Main.hx b/tests/misc/projects/Issue7017/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..11eb33eb203c7f071ae629f42b731d595a65cd90
--- /dev/null
+++ b/tests/misc/projects/Issue7017/Main.hx
@@ -0,0 +1,5 @@
+class Main {
+	static public function main() { }
+
+	#if macro static function init() "foo"; #end
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7017/compile.hxml b/tests/misc/projects/Issue7017/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..34fff30cbbf33b55a0f37f13bf445b9a2fa8dd0f
--- /dev/null
+++ b/tests/misc/projects/Issue7017/compile.hxml
@@ -0,0 +1,2 @@
+--display Main.hx@86@type
+ --macro Main.init()
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7017/compile.hxml.stderr b/tests/misc/projects/Issue7017/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e0db01489765f467625ceb39dc867c6f27bc7a7a
--- /dev/null
+++ b/tests/misc/projects/Issue7017/compile.hxml.stderr
@@ -0,0 +1,3 @@
+<type p="$$normPath(::cwd::/Main.hx):4: characters 35-40">
+String
+</type>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7039/Main.hx b/tests/misc/projects/Issue7039/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0226790c12e391bce2c8e4111a4d71532c59ba1c
--- /dev/null
+++ b/tests/misc/projects/Issue7039/Main.hx
@@ -0,0 +1,6 @@
+class Main {
+	static public function main() {
+		var o = { foo: 4 }
+		var o2:{ final foo:Int; } = o;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7039/compile-fail.hxml b/tests/misc/projects/Issue7039/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue7039/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7039/compile-fail.hxml.stderr b/tests/misc/projects/Issue7039/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e0819d93169992658d1ec3d05f29578d7be82384
--- /dev/null
+++ b/tests/misc/projects/Issue7039/compile-fail.hxml.stderr
@@ -0,0 +1,3 @@
+Main.hx:4: characters 3-33 : error: Cannot unify final and non-final fields
+Main.hx:4: characters 3-33 :  have: { foo: Dynamic }
+Main.hx:4: characters 3-33 :  want: { foo: Dynamic }
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7076/Main.hx b/tests/misc/projects/Issue7076/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fcd9a37622ce958c6376689f2ed6b36cbef3d045
--- /dev/null
+++ b/tests/misc/projects/Issue7076/Main.hx
@@ -0,0 +1,9 @@
+class Main {
+	public static function main() {
+		new Foo(0);
+	}
+}
+
+abstract Foo(Int) {
+	function new(value:Int) this = value;
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7076/compile-fail.hxml b/tests/misc/projects/Issue7076/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue7076/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7076/compile-fail.hxml.stderr b/tests/misc/projects/Issue7076/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..da39edda5ed9136dcb09ab3501741de3cf8023cf
--- /dev/null
+++ b/tests/misc/projects/Issue7076/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: characters 3-13 : Cannot access private constructor of Foo
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7096/Main.hx b/tests/misc/projects/Issue7096/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..37a1b3b23510726169ec1e1579f4c2c4203cc282
--- /dev/null
+++ b/tests/misc/projects/Issue7096/Main.hx
@@ -0,0 +1,7 @@
+class Main {
+	@:deprecated inline static var i:Int = 0;
+
+	public static function main() {
+		trace(i);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7096/compile.hxml b/tests/misc/projects/Issue7096/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue7096/compile.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7096/compile.hxml.stderr b/tests/misc/projects/Issue7096/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..4e435f31ac2cfe6cab2ff56a04aa753aa87cc706
--- /dev/null
+++ b/tests/misc/projects/Issue7096/compile.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:5: characters 9-10 : Warning : Usage of this field is deprecated
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7108/Main.hx b/tests/misc/projects/Issue7108/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cc0c43669b499dcb5133486272bbb32bdd788e6a
--- /dev/null
+++ b/tests/misc/projects/Issue7108/Main.hx
@@ -0,0 +1,12 @@
+class Main {
+  static function main() {
+    trace("Haxe is great!");
+    #if js
+      trace('x');
+    #elsif js
+      trace('elif');
+    #else
+      trace('end');
+    #end
+  }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7108/compile-fail.hxml b/tests/misc/projects/Issue7108/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue7108/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7108/compile-fail.hxml.stderr b/tests/misc/projects/Issue7108/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..0df6848a46712bb07c876b6e8475662940e4a845
--- /dev/null
+++ b/tests/misc/projects/Issue7108/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:6: characters 5-11 : Unknown token (Suggestion: #elseif)
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7210/compile.hxml b/tests/misc/projects/Issue7210/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fda6e3979a71cc1b83651f37bbf00d8ee4d343b3
--- /dev/null
+++ b/tests/misc/projects/Issue7210/compile.hxml
@@ -0,0 +1 @@
+--macro "macro.Utils.hello()"
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7210/compile.hxml.stderr b/tests/misc/projects/Issue7210/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..db814b93129125a931c5cd588b59269a7afe9e41
--- /dev/null
+++ b/tests/misc/projects/Issue7210/compile.hxml.stderr
@@ -0,0 +1 @@
+Ok!
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7210/macro/Utils.hx b/tests/misc/projects/Issue7210/macro/Utils.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f1d01889e8e95885723b28a8ac4fde79f2e56796
--- /dev/null
+++ b/tests/misc/projects/Issue7210/macro/Utils.hx
@@ -0,0 +1,8 @@
+package macro;
+
+class Utils {
+	macro static function hello() {
+		Sys.stderr().writeString('Ok!');
+		return macro {}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7227/Main.hx b/tests/misc/projects/Issue7227/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..aded8069ce672954d4b68e8594651bdb0c6b5ef2
--- /dev/null
+++ b/tests/misc/projects/Issue7227/Main.hx
@@ -0,0 +1,16 @@
+class Test {
+    static function main() {
+        var struct:Struct = {url: 'www.example.com', method: 'GET'};
+        var promise:Generic<Struct> = new Generic({url: struct, method: 'GET'});
+
+    }
+}
+
+class Generic<T> {
+  public function new(v:T) {}
+}
+
+typedef Struct = {
+    url:String,
+    method:String,
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7227/compile-fail.hxml b/tests/misc/projects/Issue7227/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue7227/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7227/compile-fail.hxml.stderr b/tests/misc/projects/Issue7227/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..9ebd457f79311c3518fd1a35e43aea9137ff4cda
--- /dev/null
+++ b/tests/misc/projects/Issue7227/compile-fail.hxml.stderr
@@ -0,0 +1,3 @@
+Main.hx:4: characters 9-81 : error: { url : String, method : String } should be String
+Main.hx:4: characters 9-81 :  have: Generic<{ url: { url, method } }>
+Main.hx:4: characters 9-81 :  want: Generic<{ url: String }>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7333/Main.hx b/tests/misc/projects/Issue7333/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f031e2f77505cef5a95a75174eb70d5f18d4a949
--- /dev/null
+++ b/tests/misc/projects/Issue7333/Main.hx
@@ -0,0 +1,13 @@
+enum MyEnum {
+    A(a:Int);
+}
+
+class Test
+{
+    public static function main()
+    {
+        switch(A(123)) {
+            case A(0): 0;
+        };
+    }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7333/compile-fail.hxml b/tests/misc/projects/Issue7333/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue7333/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7333/compile-fail.hxml.stderr b/tests/misc/projects/Issue7333/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1c1d8c05d195eca275c80ebfe3f271248a575a79
--- /dev/null
+++ b/tests/misc/projects/Issue7333/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:10: characters 20-21 : Unmatched patterns: A(_)
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7363/Main.hx b/tests/misc/projects/Issue7363/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..529bbe7051d55de9630a59fbeae52e2dd309fcf3
--- /dev/null
+++ b/tests/misc/projects/Issue7363/Main.hx
@@ -0,0 +1,25 @@
+class Main {
+	static function main() {
+		var a:Object = { foo: 12, bar: "13" };
+		for (field in a) {
+			trace (field);
+		}
+		var a:ForwardedObject = { foo: 12, bar: "13" };
+		for (field in a) {
+			trace (field);
+		}
+	}
+}
+
+abstract Object(Dynamic) from Dynamic to Dynamic {
+	public inline function new () {
+		this = { };
+	}
+}
+
+@:forward
+abstract ForwardedObject(Dynamic) from Dynamic to Dynamic {
+	public inline function new () {
+		this = { };
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7363/compile-fail.hxml b/tests/misc/projects/Issue7363/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue7363/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7363/compile-fail.hxml.stderr b/tests/misc/projects/Issue7363/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..ec10c86fa4629e8f38b97dc85352846481807a56
--- /dev/null
+++ b/tests/misc/projects/Issue7363/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:4: characters 17-18 : You can't iterate on a Dynamic value, please specify Iterator or Iterable
+Main.hx:8: characters 17-18 : You can't iterate on a Dynamic value, please specify Iterator or Iterable
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7453/Main.hx b/tests/misc/projects/Issue7453/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5c62a230b87ab2fdb78fd12f61a9862090d577e6
--- /dev/null
+++ b/tests/misc/projects/Issue7453/Main.hx
@@ -0,0 +1,7 @@
+class Main {
+	static function main() {
+		js.Browser.console.log("Version " + getVersion());
+	}
+
+	static macro function getVersion();
+}
diff --git a/tests/misc/projects/Issue7453/Main.macro.hx b/tests/misc/projects/Issue7453/Main.macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1fd13ef3b55758bbe84df6b81309d7de97e4d733
--- /dev/null
+++ b/tests/misc/projects/Issue7453/Main.macro.hx
@@ -0,0 +1,3 @@
+class Main {
+	static function getVersion() return macro 1;
+}
diff --git a/tests/misc/projects/Issue7453/compile.hxml b/tests/misc/projects/Issue7453/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fbd57cc0a3b221809e9f0e106cd1e4b722749c54
--- /dev/null
+++ b/tests/misc/projects/Issue7453/compile.hxml
@@ -0,0 +1,4 @@
+-main Main
+-js main.js
+--no-output
+# should just compile
diff --git a/tests/misc/projects/Issue7526/Main.hx b/tests/misc/projects/Issue7526/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c77361ce308f8070c83e0e71cdf942cd4f238edf
--- /dev/null
+++ b/tests/misc/projects/Issue7526/Main.hx
@@ -0,0 +1,20 @@
+class C {
+
+    static private var member: Int = 42;
+
+}
+
+abstract A(Any) {
+
+	static private var member: Int = 42;
+
+}
+
+class Main {
+
+    static function main() {
+        (C: { member: Int }).member;
+        (A: { member: Int }).member;
+    }
+
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7526/compile-fail.hxml b/tests/misc/projects/Issue7526/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c717a2877a53df954ea3d984474ca0fededfaab7
--- /dev/null
+++ b/tests/misc/projects/Issue7526/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7526/compile-fail.hxml.stderr b/tests/misc/projects/Issue7526/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..5ac7df5e9c2fe35814156eecf8e28de3a3fc8cdd
--- /dev/null
+++ b/tests/misc/projects/Issue7526/compile-fail.hxml.stderr
@@ -0,0 +1,4 @@
+Main.hx:16: characters 9-29 : Class<C> should be { member : Int }
+Main.hx:16: characters 9-29 : The field member is not public
+Main.hx:17: characters 9-29 : Class<_Main.A_Impl_> should be { member : Int }
+Main.hx:17: characters 9-29 : The field member is not public
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7614/Main.hx b/tests/misc/projects/Issue7614/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1feeba090cb2f70ff5eaa5f79491b014c1d912eb
--- /dev/null
+++ b/tests/misc/projects/Issue7614/Main.hx
@@ -0,0 +1,13 @@
+class Main {
+	static function main() { }
+}
+
+@:forward
+abstract Test(Test2) {
+	public inline function new() {
+		this.prop;
+	}
+}
+
+@:forward
+abstract Test2(Test) {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7614/compile-fail.hxml b/tests/misc/projects/Issue7614/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue7614/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7614/compile-fail.hxml.stderr b/tests/misc/projects/Issue7614/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..52ead7eb95eaa4823b80e803527004d70784020e
--- /dev/null
+++ b/tests/misc/projects/Issue7614/compile-fail.hxml.stderr
@@ -0,0 +1,3 @@
+Main.hx:13: characters 1-24 : Abstract chain detected: Test2 -> Test -> Test2
+Main.hx:6: lines 6-10 : Defined in this class
+Main.hx:6: lines 6-10 : Abstract underlying type cannot be recursive
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7638/Main.hx b/tests/misc/projects/Issue7638/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1a780c089a47996fae5a1609fac510cd7628789e
--- /dev/null
+++ b/tests/misc/projects/Issue7638/Main.hx
@@ -0,0 +1,15 @@
+class Main {
+	static function main() {}
+}
+
+class Parent {
+	dynamic function dynMethod() {}
+}
+
+class Child extends Parent {}
+
+class GrandChild extends Child {
+	override function dynMethod() {
+		super.dynMethod();
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7638/compile-fail.hxml b/tests/misc/projects/Issue7638/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue7638/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7638/compile-fail.hxml.stderr b/tests/misc/projects/Issue7638/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..6d437cf59bafc1edd4b229f45b951541f25878ba
--- /dev/null
+++ b/tests/misc/projects/Issue7638/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:13: characters 3-18 : Cannot call super.dynMethod since it's a dynamic method
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7655/Main.hx b/tests/misc/projects/Issue7655/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e3dcdfedd76eeb6bc653923c708663f0935325f0
--- /dev/null
+++ b/tests/misc/projects/Issue7655/Main.hx
@@ -0,0 +1,28 @@
+import js.lib.Promise;
+
+class Main {
+	static function main() {
+		var p:Thenable<String> = new Promise<String>(null);
+
+		$type(p.then(function(x) $type(x)));
+		$type(p.then(function(x) $type(x), function(e) $type(e)));
+
+		$type(p.then(function(x) {$type(x); return 1;}));
+		$type(p.then(function(x) {$type(x); return Promise.resolve(1);}));
+
+		$type(p.then(null,function(x) {$type(x); return 1;}));
+		$type(p.then(null,function(x) {$type(x); return Promise.resolve(1);}));
+
+		$type(p.then(function(x) {$type(x); return 1;}, function(e) {$type(e); return 1;}));
+		$type(p.then(function(x) {$type(x); return Promise.resolve(1);}, function(e) {$type(e); return 1;}));
+		$type(p.then(function(x) {$type(x); return 1;}, function(e) {$type(e); return Promise.resolve(1);}));
+		$type(p.then(function(x) {$type(x); return Promise.resolve(1);}, function(e) {$type(e); return Promise.resolve(1);}));
+
+		$type(Promise.resolve(p));
+		$type(Promise.resolve(new Promise<String>(null)));
+		$type(Promise.resolve("hi"));
+
+		// should not hang, see https://github.com/HaxeFoundation/haxe/issues/5785
+		$type(p.then(_ -> p));
+	}
+}
diff --git a/tests/misc/projects/Issue7655/Mismatch.hx b/tests/misc/projects/Issue7655/Mismatch.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1cdf5fc8a1de0a68e4845384ceb8f0597e8ddc5a
--- /dev/null
+++ b/tests/misc/projects/Issue7655/Mismatch.hx
@@ -0,0 +1,8 @@
+import js.lib.Promise;
+
+class Mismatch {
+	static function main() {
+		var p:Thenable<String> = new Promise<String>(null);
+		p.then(x -> 10, e -> "");
+	}
+}
diff --git a/tests/misc/projects/Issue7655/compile-fail.hxml b/tests/misc/projects/Issue7655/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..302a11c9a52185712cf0de535ed32d889021f69d
--- /dev/null
+++ b/tests/misc/projects/Issue7655/compile-fail.hxml
@@ -0,0 +1,3 @@
+-main Mismatch
+-js whatever.js
+--no-output
diff --git a/tests/misc/projects/Issue7655/compile-fail.hxml.stderr b/tests/misc/projects/Issue7655/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c9589dc0ad615f004dc1512c35b5126ed60b0884
--- /dev/null
+++ b/tests/misc/projects/Issue7655/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Mismatch.hx:6: characters 19-26 : (e : Unknown<0>) -> String should be js.lib.PromiseHandler<Dynamic, Int>
+Mismatch.hx:6: characters 19-26 : For optional function argument 'onRejected'
diff --git a/tests/misc/projects/Issue7655/compile.hxml b/tests/misc/projects/Issue7655/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..0b0f5fae2012c9ce2da015ea34de763c14b9e087
--- /dev/null
+++ b/tests/misc/projects/Issue7655/compile.hxml
@@ -0,0 +1,3 @@
+-main Main
+-js whatever.js
+--no-output
diff --git a/tests/misc/projects/Issue7655/compile.hxml.stderr b/tests/misc/projects/Issue7655/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..122d0f380b60654bc010133df2b45652d9fd8832
--- /dev/null
+++ b/tests/misc/projects/Issue7655/compile.hxml.stderr
@@ -0,0 +1,29 @@
+Main.hx:7: characters 34-35 : Warning : String
+Main.hx:7: characters 9-37 : Warning : js.lib.Thenable<Void>
+Main.hx:8: characters 34-35 : Warning : String
+Main.hx:8: characters 56-57 : Warning : Unknown<0>
+Main.hx:8: characters 9-59 : Warning : js.lib.Thenable<Void>
+Main.hx:10: characters 35-36 : Warning : String
+Main.hx:10: characters 9-50 : Warning : js.lib.Thenable<Int>
+Main.hx:11: characters 35-36 : Warning : String
+Main.hx:11: characters 9-67 : Warning : js.lib.Thenable<Int>
+Main.hx:13: characters 40-41 : Warning : Unknown<0>
+Main.hx:13: characters 9-55 : Warning : js.lib.Thenable<Int>
+Main.hx:14: characters 40-41 : Warning : Unknown<0>
+Main.hx:14: characters 9-72 : Warning : js.lib.Thenable<Int>
+Main.hx:16: characters 35-36 : Warning : String
+Main.hx:16: characters 70-71 : Warning : Unknown<0>
+Main.hx:16: characters 9-85 : Warning : js.lib.Thenable<Int>
+Main.hx:17: characters 35-36 : Warning : String
+Main.hx:17: characters 87-88 : Warning : Unknown<0>
+Main.hx:17: characters 9-102 : Warning : js.lib.Thenable<Int>
+Main.hx:18: characters 35-36 : Warning : String
+Main.hx:18: characters 70-71 : Warning : Unknown<0>
+Main.hx:18: characters 9-102 : Warning : js.lib.Thenable<Int>
+Main.hx:19: characters 35-36 : Warning : String
+Main.hx:19: characters 87-88 : Warning : Unknown<0>
+Main.hx:19: characters 9-119 : Warning : js.lib.Thenable<Int>
+Main.hx:21: characters 9-27 : Warning : js.lib.Promise<String>
+Main.hx:22: characters 9-51 : Warning : js.lib.Promise<String>
+Main.hx:23: characters 9-30 : Warning : js.lib.Promise<String>
+Main.hx:26: characters 9-23 : Warning : js.lib.Thenable<String>
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7734/Main.hx b/tests/misc/projects/Issue7734/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ff3d28359bb198216e6122ec20c90deb1fee78a0
--- /dev/null
+++ b/tests/misc/projects/Issue7734/Main.hx
@@ -0,0 +1,7 @@
+class Main {
+	static public function main() {
+		for (i in 0...10) {
+			i++;
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7734/compile-fail.hxml b/tests/misc/projects/Issue7734/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue7734/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7734/compile-fail.hxml.stderr b/tests/misc/projects/Issue7734/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1693127d622bdf22a75167d8a5a6b1ce0ede3674
--- /dev/null
+++ b/tests/misc/projects/Issue7734/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:4: characters 4-7 : Loop variable cannot be modified
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7747/Main.hx b/tests/misc/projects/Issue7747/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..83c043d97d4ec96e15902c058c9b75f33fe2ac13
--- /dev/null
+++ b/tests/misc/projects/Issue7747/Main.hx
@@ -0,0 +1,13 @@
+class Main {
+	static public function main() {
+		test();
+	}
+
+	macro static function test() {
+		switch 0 {
+			case ')'.code:
+			case 'a':
+		}
+		return macro null;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7747/compile-fail.hxml b/tests/misc/projects/Issue7747/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue7747/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7747/compile-fail.hxml.stderr b/tests/misc/projects/Issue7747/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e79a1c25459e70f629582c8450f5af1fb71cda40
--- /dev/null
+++ b/tests/misc/projects/Issue7747/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:9: characters 9-12 : String should be Int
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7752/Main.hx b/tests/misc/projects/Issue7752/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..87bb60696782d7a270774aa367eb237efda5d7ed
--- /dev/null
+++ b/tests/misc/projects/Issue7752/Main.hx
@@ -0,0 +1,9 @@
+class Foo {
+	extern function foo(test:Int = "foo"):Void;
+}
+
+class Main {
+	static public function main() {
+
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7752/Main2.hx b/tests/misc/projects/Issue7752/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..336c7580ff014428005c2d48a80b59713d622881
--- /dev/null
+++ b/tests/misc/projects/Issue7752/Main2.hx
@@ -0,0 +1,9 @@
+class Foo {
+	extern function foo($test:Int):Void;
+}
+
+class Main2 {
+	static public function main() {
+
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7752/compile-fail.hxml b/tests/misc/projects/Issue7752/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue7752/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7752/compile-fail.hxml.stderr b/tests/misc/projects/Issue7752/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..9e132ef30027b9ec265562ab9572df3cfc136efe
--- /dev/null
+++ b/tests/misc/projects/Issue7752/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:2: characters 33-38 : String should be Int
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7752/compile2-fail.hxml b/tests/misc/projects/Issue7752/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..031fe8ecc3114e35f6729f2cb9b85c229dd71a6c
--- /dev/null
+++ b/tests/misc/projects/Issue7752/compile2-fail.hxml
@@ -0,0 +1,2 @@
+--main Main2
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7752/compile2-fail.hxml.stderr b/tests/misc/projects/Issue7752/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c231dac00299405872ea848fdea58f9f5bfa07cd
--- /dev/null
+++ b/tests/misc/projects/Issue7752/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:2: characters 22-27 : Function argument names starting with a dollar are not allowed
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7796/Main.hx b/tests/misc/projects/Issue7796/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..17c7d3e7b5d2e0caddabd10a822f1c0a23af8f56
--- /dev/null
+++ b/tests/misc/projects/Issue7796/Main.hx
@@ -0,0 +1,4 @@
+class Main {
+	static function main() {
+	}
+}
diff --git a/tests/misc/projects/Issue7796/compile.hxml b/tests/misc/projects/Issue7796/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..5c9c7f7d346e14b3ef004c55131c2b2b920ecf2c
--- /dev/null
+++ b/tests/misc/projects/Issue7796/compile.hxml
@@ -0,0 +1,4 @@
+-main Main
+-swf-lib glsl2agal.swc
+-swf main.swf
+--no-output
diff --git a/tests/misc/projects/Issue7796/glsl2agal.swc b/tests/misc/projects/Issue7796/glsl2agal.swc
new file mode 100644
index 0000000000000000000000000000000000000000..d61af22f24d2c0e90ad71bd3217d7ca097dea6f4
Binary files /dev/null and b/tests/misc/projects/Issue7796/glsl2agal.swc differ
diff --git a/tests/misc/projects/Issue7824/Main.hx b/tests/misc/projects/Issue7824/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ccc5e78220a46ff53fbcd2a1d5402bd155dbef10
--- /dev/null
+++ b/tests/misc/projects/Issue7824/Main.hx
@@ -0,0 +1,16 @@
+class Base {
+	public function new() { }
+
+	public function test() { }
+}
+
+class Child extends Base {
+	override function test() { }
+}
+
+class Main {
+	static function main() {
+		var m = new Base();
+		inline m.test();
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7824/compile-fail.hxml b/tests/misc/projects/Issue7824/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue7824/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7824/compile-fail.hxml.stderr b/tests/misc/projects/Issue7824/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..61f3f9a5223fffce39fdd1d24d00dcdc7118189a
--- /dev/null
+++ b/tests/misc/projects/Issue7824/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:14: characters 3-18 : Cannot force inline-call to test because it is overridden
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7905/Main.hx b/tests/misc/projects/Issue7905/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..daee8971f7641d22d6c621759f54654a40e6570a
--- /dev/null
+++ b/tests/misc/projects/Issue7905/Main.hx
@@ -0,0 +1,25 @@
+#if !macro
+typedef Huh = GenericBuild<Int>;
+@:genericBuild(Main.GenericBuild.build())
+#end
+class GenericBuild<T> {
+  #if macro
+  static var counter = 0;
+  static function build() {
+    var name = 'Cls${counter++}';
+    var ret = macro class $name {
+      public function new() {}
+    }
+    haxe.macro.Context.defineType(ret);
+    return haxe.macro.Context.getType(name);
+  }
+  #end
+}
+
+class Main {
+  static function main() {
+    #if !macro
+    $type(Huh.new);
+    #end
+  }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7905/compile.hxml b/tests/misc/projects/Issue7905/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue7905/compile.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue7905/compile.hxml.stderr b/tests/misc/projects/Issue7905/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e3316350e9f9e22d3db24dd982ad39c4211bccc5
--- /dev/null
+++ b/tests/misc/projects/Issue7905/compile.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:22: characters 11-18 : Warning : Void -> Cls0
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7920/Main.hx b/tests/misc/projects/Issue7920/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7eed50c2d90f90563eafa9297f0cce18f10abedb
--- /dev/null
+++ b/tests/misc/projects/Issue7920/Main.hx
@@ -0,0 +1,6 @@
+class Main {
+	public static function main() {
+		function local() {}
+		local = () -> trace('');
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7920/compile-fail.hxml b/tests/misc/projects/Issue7920/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue7920/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7920/compile-fail.hxml.stderr b/tests/misc/projects/Issue7920/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..2325ef88ad218e6cf76bec7bf8b19f59b81cf403
--- /dev/null
+++ b/tests/misc/projects/Issue7920/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:4: characters 3-26 : Cannot access function local for writing
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7921/Main.hx b/tests/misc/projects/Issue7921/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6a7baa2b7bd151be8f3a647019e9110578bba025
--- /dev/null
+++ b/tests/misc/projects/Issue7921/Main.hx
@@ -0,0 +1,16 @@
+enum E<T> {
+	None;
+	Some(v:T);
+}
+
+class Main {
+	static function foo(v:E<Int>) {
+		var a = None;
+		return v.match(a);
+	}
+
+	static function main() {
+		trace(foo(None));
+		trace(foo(Some(55)));
+	}
+}
diff --git a/tests/misc/projects/Issue7921/compile-fail.hxml b/tests/misc/projects/Issue7921/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue7921/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7921/compile-fail.hxml.stderr b/tests/misc/projects/Issue7921/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..b8ff48c1645adf85688b4cda502a807b2b196abe
--- /dev/null
+++ b/tests/misc/projects/Issue7921/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:9: characters 18-19 : Pattern variables are not allowed in .match patterns
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7935/Main.hx b/tests/misc/projects/Issue7935/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..72899743fbfe378c37e638152b76c993b55cd593
--- /dev/null
+++ b/tests/misc/projects/Issue7935/Main.hx
@@ -0,0 +1,5 @@
+class Main {
+	public static function main() {
+		trace(;
+	}
+}
diff --git a/tests/misc/projects/Issue7935/Main2.hx b/tests/misc/projects/Issue7935/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c04fa09d2f997a1fa035ac15f9b94efd2c13ad87
--- /dev/null
+++ b/tests/misc/projects/Issue7935/Main2.hx
@@ -0,0 +1,5 @@
+class Main {
+	public static function main() {
+		trace(0
+	}
+}
diff --git a/tests/misc/projects/Issue7935/Main3.hx b/tests/misc/projects/Issue7935/Main3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b26becd9b777552a0aa269ab4877783568557668
--- /dev/null
+++ b/tests/misc/projects/Issue7935/Main3.hx
@@ -0,0 +1,5 @@
+class Main {
+	public static function main() {
+		trace(0,
+	}
+}
diff --git a/tests/misc/projects/Issue7935/compile-fail.hxml b/tests/misc/projects/Issue7935/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue7935/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7935/compile-fail.hxml.stderr b/tests/misc/projects/Issue7935/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..3a7c01cfd0ef8a328119c8c72d9fb5eadc388f27
--- /dev/null
+++ b/tests/misc/projects/Issue7935/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: characters 9-10 : Expected expression or )
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7935/compile2-fail.hxml b/tests/misc/projects/Issue7935/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..031fe8ecc3114e35f6729f2cb9b85c229dd71a6c
--- /dev/null
+++ b/tests/misc/projects/Issue7935/compile2-fail.hxml
@@ -0,0 +1,2 @@
+--main Main2
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7935/compile2-fail.hxml.stderr b/tests/misc/projects/Issue7935/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..5bc1b9ab7e8f46de407950b17f60e35232e37e6a
--- /dev/null
+++ b/tests/misc/projects/Issue7935/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:4: characters 2-3 : Expected , or )
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7935/compile3-fail.hxml b/tests/misc/projects/Issue7935/compile3-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..406b4e1c639965d829d5f4288ff302ae9fd8e496
--- /dev/null
+++ b/tests/misc/projects/Issue7935/compile3-fail.hxml
@@ -0,0 +1,2 @@
+--main Main3
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7935/compile3-fail.hxml.stderr b/tests/misc/projects/Issue7935/compile3-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..6694b1fb1449887f636c6ee9fded482ee19d92df
--- /dev/null
+++ b/tests/misc/projects/Issue7935/compile3-fail.hxml.stderr
@@ -0,0 +1 @@
+Main3.hx:4: characters 2-3 : Unexpected }
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7936/compile.hxml b/tests/misc/projects/Issue7936/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..61c9b1f52689dce79179ac54918561d4993288d4
--- /dev/null
+++ b/tests/misc/projects/Issue7936/compile.hxml
@@ -0,0 +1,44 @@
+-cp src
+--each
+
+# Closures
+
+-main Closures1
+-js bin/closures1.js
+
+--next
+-main Closures2
+-js bin/closures2.js
+
+--next
+-D js-classic
+-main Closures1
+-js bin/closures1-classic.js
+
+--next
+-D js-classic
+-main Closures2
+-js bin/closures2-classic.js
+
+#ObjectMap
+--next
+-main ObjectMap1
+-js bin/objectMap1.js
+
+--next
+-main ObjectMap2
+-js bin/objectMap2.js
+
+--next
+-D js-classic
+-main ObjectMap1
+-js bin/objectMap1-classic.js
+
+--next
+-D js-classic
+-main ObjectMap2
+-js bin/objectMap2-classic.js
+
+# Run tests
+--next
+-cmd node run.js
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7936/run.js b/tests/misc/projects/Issue7936/run.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e797b6c3126291f90a7b014e124e1e87a7dd888
--- /dev/null
+++ b/tests/misc/projects/Issue7936/run.js
@@ -0,0 +1,11 @@
+require('./bin/closures1.js');
+require('./bin/closures2.js');
+
+require('./bin/objectMap1.js');
+require('./bin/objectMap2.js');
+
+require('./bin/closures1-classic.js');
+require('./bin/closures2-classic.js');
+
+require('./bin/objectMap1-classic.js');
+require('./bin/objectMap2-classic.js');
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7936/src/Closures1.hx b/tests/misc/projects/Issue7936/src/Closures1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..86ce4d19f9900b78a2837792d6bb62a20b4a17a1
--- /dev/null
+++ b/tests/misc/projects/Issue7936/src/Closures1.hx
@@ -0,0 +1,21 @@
+class Closures1 {
+	static var tmp:Any;
+
+	static public function main() {
+		var inst = new Test();
+		js.Syntax.code('global.inst = {0}', inst);
+		tmp = inst.test1;
+	}
+}
+
+@:keep
+class Test {
+	public function new() {}
+
+	public function test1() {
+		return 1;
+	}
+	public function test2() {
+		return 2;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7936/src/Closures2.hx b/tests/misc/projects/Issue7936/src/Closures2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e44131d3c74bb1fa4b778977d2c99b999f275b66
--- /dev/null
+++ b/tests/misc/projects/Issue7936/src/Closures2.hx
@@ -0,0 +1,16 @@
+class Closures2 {
+	static var test2:()->Int;
+
+	static public function main() {
+		var inst:Test2 = js.Syntax.code('global.inst');
+		test2 = inst.test2;
+		if(test2() != 2) {
+			throw 'Cross-module closure binding failed.';
+		}
+	}
+}
+
+extern class Test2 {
+	public function test1():Int;
+	public function test2():Int;
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7936/src/ObjectMap1.hx b/tests/misc/projects/Issue7936/src/ObjectMap1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4456ba2d864e3ff727872f7c6082a68da8bd886e
--- /dev/null
+++ b/tests/misc/projects/Issue7936/src/ObjectMap1.hx
@@ -0,0 +1,9 @@
+class ObjectMap1 {
+	static var tmp:Any;
+
+	static public function main() {
+		var inst = {};
+		js.Syntax.code('global.inst = {0}', inst);
+		tmp = [inst => 'first'];
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7936/src/ObjectMap2.hx b/tests/misc/projects/Issue7936/src/ObjectMap2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bebf8863395534b0896b5b5005eb002f956635b8
--- /dev/null
+++ b/tests/misc/projects/Issue7936/src/ObjectMap2.hx
@@ -0,0 +1,10 @@
+class ObjectMap2 {
+	static public function main() {
+		var inst:{} = js.Syntax.code('global.inst');
+
+		var map:Map<{},String> = [{field:1} => 'second'];
+		if(map.exists(inst)) {
+			throw 'Cross-module ObjectMap failed.';
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7997/Main.hx b/tests/misc/projects/Issue7997/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..06124ca17b146470433d786c4146eed7c9553b66
--- /dev/null
+++ b/tests/misc/projects/Issue7997/Main.hx
@@ -0,0 +1,8 @@
+class Main {
+	static function main() {
+		function loop(type) {
+			type.args.field;
+			loop(type.args);
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue7997/compile-fail.hxml b/tests/misc/projects/Issue7997/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue7997/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue7997/compile-fail.hxml.stderr b/tests/misc/projects/Issue7997/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..38d5b6f2392c8c1ddaa1af8dc8238d45a5e62a28
--- /dev/null
+++ b/tests/misc/projects/Issue7997/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:5: characters 9-18 : {+ field : Unknown<0> } should be {+ args : {+ field : Unknown<0> } }
+Main.hx:5: characters 9-18 : For function argument 'type'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8019/Macro.hx b/tests/misc/projects/Issue8019/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bd4be76901cf90493e8df06777bf92990d4cafc9
--- /dev/null
+++ b/tests/misc/projects/Issue8019/Macro.hx
@@ -0,0 +1,34 @@
+import haxe.macro.Expr;
+import haxe.macro.Context;
+
+class Macro {
+	static function init() {
+		function defineType(pack, kind) {
+			Context.defineType({
+				pos: (macro 0).pos,
+				pack: pack,
+				name: 'Test',
+				kind: kind,
+				fields: []
+			});
+		}
+
+		function defineClass(pack) {
+			defineType(pack, TDClass());
+		}
+
+		defineClass(["Module"]);
+		defineClass(["pack", "Module"]);
+
+		defineClass([""]);
+		defineClass(["\n"]);
+		defineClass(["pack\n"]);
+		defineClass(["pack~"]);
+		defineClass(["Foo", "Bar"]);
+		
+		defineClass(["0_class"]);
+		defineType(["0_enum"], TDEnum);
+		defineType(["0_structure"], TDStructure);
+		defineType(["0_abstract"], TDAbstract(TPath({pack: [], name: "Int"})));
+	}
+}
diff --git a/tests/misc/projects/Issue8019/Macro2.hx b/tests/misc/projects/Issue8019/Macro2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f9b1c84a80f73911ce62d306b6d72f04601b4eb5
--- /dev/null
+++ b/tests/misc/projects/Issue8019/Macro2.hx
@@ -0,0 +1,21 @@
+import haxe.macro.Context;
+
+class Macro2 {
+	static function init() {
+		function defineModule(name:String) {
+			Context.defineModule(name, [{
+				pos: (macro 0).pos,
+				pack: [],
+				name: name,
+				kind: TDClass(),
+				fields: []
+			}]);
+		}
+
+		defineModule("Valid");
+
+		defineModule("");
+		defineModule("0");
+		defineModule("Type+");
+	}
+}
diff --git a/tests/misc/projects/Issue8019/Main.hx b/tests/misc/projects/Issue8019/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..85ee85849e20fd5f9f25d8b75342b6c9d651ba69
--- /dev/null
+++ b/tests/misc/projects/Issue8019/Main.hx
@@ -0,0 +1,15 @@
+import haxe.macro.Expr;
+import haxe.macro.Context;
+
+class Main {
+	static function main() {
+		invalidPackage();
+	}
+
+	static macro function invalidPackage() {
+		return {
+			expr: ENew({name: "Foo", pack: ["0"]}, []),
+			pos: Context.currentPos()
+		};
+	}
+}
diff --git a/tests/misc/projects/Issue8019/compile-fail.hxml b/tests/misc/projects/Issue8019/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..24cee1e062397e5a8e64b476cef0201b7059f907
--- /dev/null
+++ b/tests/misc/projects/Issue8019/compile-fail.hxml
@@ -0,0 +1 @@
+--macro Macro.init()
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8019/compile-fail.hxml.stderr b/tests/misc/projects/Issue8019/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..b6f3cedc99fea6cc975b0d32e7f5e021e64251bc
--- /dev/null
+++ b/tests/misc/projects/Issue8019/compile-fail.hxml.stderr
@@ -0,0 +1,18 @@
+Macro.hx:8: characters 17-18 : "" is not a valid package name:
+Macro.hx:8: characters 17-18 : Package name must not be empty
+Macro.hx:8: characters 17-18 : "\n" is not a valid package name:
+Macro.hx:8: characters 17-18 : Package name must start with a lowercase letter
+Macro.hx:8: characters 17-18 : "pack\n" is not a valid package name:
+Macro.hx:8: characters 17-18 : Invalid character: \n
+Macro.hx:8: characters 17-18 : "pack~" is not a valid package name:
+Macro.hx:8: characters 17-18 : Invalid character: ~
+Macro.hx:8: characters 17-18 : "Foo" is not a valid package name:
+Macro.hx:8: characters 17-18 : Package name must start with a lowercase letter
+Macro.hx:8: characters 17-18 : "0_class" is not a valid package name:
+Macro.hx:8: characters 17-18 : Package name must start with a lowercase letter
+Macro.hx:8: characters 17-18 : "0_enum" is not a valid package name:
+Macro.hx:8: characters 17-18 : Package name must start with a lowercase letter
+Macro.hx:8: characters 17-18 : "0_structure" is not a valid package name:
+Macro.hx:8: characters 17-18 : Package name must start with a lowercase letter
+Macro.hx:8: characters 17-18 : "0_abstract" is not a valid package name:
+Macro.hx:8: characters 17-18 : Package name must start with a lowercase letter
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8019/compile2-fail.hxml b/tests/misc/projects/Issue8019/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8019/compile2-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8019/compile2-fail.hxml.stderr b/tests/misc/projects/Issue8019/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..f486f47020147ea528b4ceae696a268a02daaed7
--- /dev/null
+++ b/tests/misc/projects/Issue8019/compile2-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Type not found : 0.Foo
+Main.hx:4: lines 4-15 : Defined in this class
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8019/compile3-fail.hxml b/tests/misc/projects/Issue8019/compile3-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..f227f11fde4d6810d31eeb59406286c088baa9d0
--- /dev/null
+++ b/tests/misc/projects/Issue8019/compile3-fail.hxml
@@ -0,0 +1 @@
+--macro Macro2.init()
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8019/compile3-fail.hxml.stderr b/tests/misc/projects/Issue8019/compile3-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..df0eec0a118566b9dc440fcd4960e9837c23f991
--- /dev/null
+++ b/tests/misc/projects/Issue8019/compile3-fail.hxml.stderr
@@ -0,0 +1,3 @@
+Macro2.hx:7: characters 17-18 : Module name must not be empty
+Macro2.hx:7: characters 17-18 : "0" is not a valid module name
+Macro2.hx:7: characters 17-18 : "Type+" is not a valid module name
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8088/Fail.hx b/tests/misc/projects/Issue8088/Fail.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7e716ffa1d1ba72dd79c785d6693fc23b3f6bbed
--- /dev/null
+++ b/tests/misc/projects/Issue8088/Fail.hx
@@ -0,0 +1,14 @@
+class Fail {
+	static function main() {}
+
+	static function check<T:String>(a:T, b:Float) {
+		a < b;
+		a - b;
+		a / b;
+		b < a;
+		b - a;
+		b / a;
+	}
+}
+
+abstract AStr(String) to String {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8088/Success.hx b/tests/misc/projects/Issue8088/Success.hx
new file mode 100644
index 0000000000000000000000000000000000000000..37a21640fcbdaa6526cdcab09e1e8567d3de856f
--- /dev/null
+++ b/tests/misc/projects/Issue8088/Success.hx
@@ -0,0 +1,27 @@
+class Success {
+	static var fail = false;
+
+	static function main() {
+		test('a', 'b', 's', [1, 2]);
+		if(fail) Sys.exit(1);
+	}
+
+	static function test<T:String>(a:T, b:T, s:String, arr:Array<Int>) {
+		check(true, a < b);
+		check(true, a < s);
+		check(true, s > a);
+		check('sa', s + a);
+		check('ab', a + b);
+		check('as', a + s);
+		check('sa', s + a);
+		check('a[1,2]', a + arr);
+		check('[1,2]a', arr + a);
+	}
+
+	static function check<T>(expected:T, actual:T, ?p:haxe.PosInfos) {
+		if( expected != actual) {
+			fail = true;
+			Sys.stderr().writeString('${p.fileName}:${p.lineNumber}: $expected expected, but got $actual\n');
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8088/compile-fail.hxml b/tests/misc/projects/Issue8088/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..5a037b2bdffaf240850b4285c7dd3b5fb8facb96
--- /dev/null
+++ b/tests/misc/projects/Issue8088/compile-fail.hxml
@@ -0,0 +1 @@
+-main Fail
diff --git a/tests/misc/projects/Issue8088/compile-fail.hxml.stderr b/tests/misc/projects/Issue8088/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..08bbd25d4a7f6012dbe235ddb176d5d5a46d472a
--- /dev/null
+++ b/tests/misc/projects/Issue8088/compile-fail.hxml.stderr
@@ -0,0 +1,6 @@
+Fail.hx:5: characters 3-8 : Cannot compare check.T and Float
+Fail.hx:6: characters 3-4 : check.T should be Int
+Fail.hx:7: characters 3-4 : check.T should be Int
+Fail.hx:8: characters 3-8 : Cannot compare Float and check.T
+Fail.hx:9: characters 7-8 : check.T should be Int
+Fail.hx:10: characters 7-8 : check.T should be Int
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8088/compile.hxml b/tests/misc/projects/Issue8088/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..2baa2e5b8dd9515e926acd23063106da0f61869f
--- /dev/null
+++ b/tests/misc/projects/Issue8088/compile.hxml
@@ -0,0 +1,2 @@
+-main Success
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8119/Main.hx b/tests/misc/projects/Issue8119/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9507a9f3e2555b19495831d3cabc38a8118f7274
--- /dev/null
+++ b/tests/misc/projects/Issue8119/Main.hx
@@ -0,0 +1,5 @@
+class Main {
+	static public function main() {
+		"\x80";
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8119/Main2.hx b/tests/misc/projects/Issue8119/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f616e848c3c4b81409c24ba68d8324e2a4d864e3
--- /dev/null
+++ b/tests/misc/projects/Issue8119/Main2.hx
@@ -0,0 +1,5 @@
+class Main2 {
+	static public function main() {
+		"\200";
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8119/compile-fail.hxml b/tests/misc/projects/Issue8119/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8119/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8119/compile-fail.hxml.stderr b/tests/misc/projects/Issue8119/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..3014c6bdbe88c9498603f28f84d7dfe137c8c82a
--- /dev/null
+++ b/tests/misc/projects/Issue8119/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: character 4 : Invalid escape sequence \x. Values greater than \x7f are not allowed. Use \u0080 instead.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8119/compile2-fail.hxml b/tests/misc/projects/Issue8119/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..04ed12079a9d3bd950f6bd6d602520bae4e4ce4f
--- /dev/null
+++ b/tests/misc/projects/Issue8119/compile2-fail.hxml
@@ -0,0 +1 @@
+-main Main2
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8119/compile2-fail.hxml.stderr b/tests/misc/projects/Issue8119/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..b92788b63f20aa699397b23b9642c03d3cfca49b
--- /dev/null
+++ b/tests/misc/projects/Issue8119/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:3: character 4 : Invalid escape sequence \2. Values greater than \177 are not allowed. Use \u0080 instead.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8159/Macro.macro.hx b/tests/misc/projects/Issue8159/Macro.macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3e1d85be160f67fe828eade7deae3b511261f11f
--- /dev/null
+++ b/tests/misc/projects/Issue8159/Macro.macro.hx
@@ -0,0 +1,5 @@
+class Macro {
+	static public function build() {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8159/Main.hx b/tests/misc/projects/Issue8159/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f9f1bec985778c5176023ba8c727263204c46a91
--- /dev/null
+++ b/tests/misc/projects/Issue8159/Main.hx
@@ -0,0 +1,4 @@
+@:build(Macro.build())
+class Main {
+	static function main() {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8159/compile.hxml b/tests/misc/projects/Issue8159/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8159/compile.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8173/Main.hx b/tests/misc/projects/Issue8173/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cb2152e67562cbed8b78e5ae63b20ef57a99877b
--- /dev/null
+++ b/tests/misc/projects/Issue8173/Main.hx
@@ -0,0 +1,12 @@
+class Main {
+	final static function main():Void {
+	}
+
+	final function new() {}
+}
+
+class Child extends Main {
+	function new() {
+		super();
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8173/compile-fail.hxml b/tests/misc/projects/Issue8173/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8173/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8173/compile-fail.hxml.stderr b/tests/misc/projects/Issue8173/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1fc6a39faf0eeba31ad938c0fa5bffdcffa4d196
--- /dev/null
+++ b/tests/misc/projects/Issue8173/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:2: characters 2-7 : Static method cannot be final
+Main.hx:9: lines 9-11 : Cannot override final constructor
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/U1.hx b/tests/misc/projects/Issue8191/U1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..69e9ea31cc741328b98c883c7cb326966989b4a7
--- /dev/null
+++ b/tests/misc/projects/Issue8191/U1.hx
@@ -0,0 +1,3 @@
+class U1 {
+	var u = "\u";
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/U2.hx b/tests/misc/projects/Issue8191/U2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..87b959f19153f910dcb80aa97b385e6991f30d24
--- /dev/null
+++ b/tests/misc/projects/Issue8191/U2.hx
@@ -0,0 +1,3 @@
+class U2 {
+	var u = "\u{007f";
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/U3.hx b/tests/misc/projects/Issue8191/U3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c6e9010792d39e37636ee543317537010f167e79
--- /dev/null
+++ b/tests/misc/projects/Issue8191/U3.hx
@@ -0,0 +1,3 @@
+class U3 {
+	var u = "\u{}";
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/U4.hx b/tests/misc/projects/Issue8191/U4.hx
new file mode 100644
index 0000000000000000000000000000000000000000..86b5c9d9b733da6dbe7b56312007819a9c0a8e30
--- /dev/null
+++ b/tests/misc/projects/Issue8191/U4.hx
@@ -0,0 +1,3 @@
+class U4 {
+	var u = "\u{007g}";
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/U5.hx b/tests/misc/projects/Issue8191/U5.hx
new file mode 100644
index 0000000000000000000000000000000000000000..735435c69cd9fef18cdc264eccf6252fcdce577a
--- /dev/null
+++ b/tests/misc/projects/Issue8191/U5.hx
@@ -0,0 +1,3 @@
+class U4 {
+	var u = "\u{110000}";
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/X1.hx b/tests/misc/projects/Issue8191/X1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2cc600797b93b5813f0c7903252a83bf6ace5900
--- /dev/null
+++ b/tests/misc/projects/Issue8191/X1.hx
@@ -0,0 +1,3 @@
+class X1 {
+	var x = "\x";
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/X2.hx b/tests/misc/projects/Issue8191/X2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c5f9792aaea844732de9b9043238a9bbe86b3be0
--- /dev/null
+++ b/tests/misc/projects/Issue8191/X2.hx
@@ -0,0 +1,3 @@
+class X2 {
+	var x = "\xfg";
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile-fail.hxml b/tests/misc/projects/Issue8191/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..5572f8dd0a17ba569afb69f0bd94d6b87e110f65
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile-fail.hxml
@@ -0,0 +1 @@
+X1
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile-fail.hxml.stderr b/tests/misc/projects/Issue8191/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..2eb298a959b5e5b70585ad622456756930e67c22
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+X1.hx:2: character 11 : Invalid escape sequence \x. Must be followed by a hexadecimal sequence.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile2-fail.hxml b/tests/misc/projects/Issue8191/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..d74cfc7b3fd97f8c08bad53736ddae828ebe09d1
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile2-fail.hxml
@@ -0,0 +1 @@
+X2
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile2-fail.hxml.stderr b/tests/misc/projects/Issue8191/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..0f1709efe7de92965f36795601603d07e114b448
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+X2.hx:2: character 11 : Invalid escape sequence \x. Must be followed by a hexadecimal sequence.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile3-fail.hxml b/tests/misc/projects/Issue8191/compile3-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..5258a2283eb9c64fdc727814d6d8bb26da5555b8
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile3-fail.hxml
@@ -0,0 +1 @@
+U1
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile3-fail.hxml.stderr b/tests/misc/projects/Issue8191/compile3-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..698bd1abfd19f79feedad419c6dd7cb77d04e857
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile3-fail.hxml.stderr
@@ -0,0 +1 @@
+U1.hx:2: character 11 : Invalid escape sequence \u. Must be followed by a hexadecimal sequence enclosed in curly brackets.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile4-fail.hxml b/tests/misc/projects/Issue8191/compile4-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..21b49ffcf8cf96f7efc23266366609ce539dc8a2
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile4-fail.hxml
@@ -0,0 +1 @@
+U2
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile4-fail.hxml.stderr b/tests/misc/projects/Issue8191/compile4-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..70f72edba3972d23022ec15133ff7ae37d503760
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile4-fail.hxml.stderr
@@ -0,0 +1 @@
+U2.hx:2: character 11 : Invalid escape sequence \u. Must be followed by a hexadecimal sequence enclosed in curly brackets.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile5-fail.hxml b/tests/misc/projects/Issue8191/compile5-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..427adcc878d038af819fab1645c99d44a1230404
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile5-fail.hxml
@@ -0,0 +1 @@
+U3
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile5-fail.hxml.stderr b/tests/misc/projects/Issue8191/compile5-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e25ba4eef18464b92e6a27bf577837897c9e020c
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile5-fail.hxml.stderr
@@ -0,0 +1 @@
+U3.hx:2: character 11 : Invalid escape sequence \u. Must be followed by a hexadecimal sequence enclosed in curly brackets.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile6-fail.hxml b/tests/misc/projects/Issue8191/compile6-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..9dc86511671a058d0a203e457fd94b484bfa7cfb
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile6-fail.hxml
@@ -0,0 +1 @@
+U4
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile6-fail.hxml.stderr b/tests/misc/projects/Issue8191/compile6-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..29f139fecb132e2ded5dd7789da6cf50d5986def
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile6-fail.hxml.stderr
@@ -0,0 +1 @@
+U4.hx:2: character 11 : Invalid escape sequence \u. Must be followed by a hexadecimal sequence enclosed in curly brackets.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile7-fail.hxml b/tests/misc/projects/Issue8191/compile7-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..4f748ab1e92b280dc2953d11de712008b4e6bcec
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile7-fail.hxml
@@ -0,0 +1 @@
+U5
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8191/compile7-fail.hxml.stderr b/tests/misc/projects/Issue8191/compile7-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..2fad4f3ffb3acc345c86534b888863e9fcb36fac
--- /dev/null
+++ b/tests/misc/projects/Issue8191/compile7-fail.hxml.stderr
@@ -0,0 +1 @@
+U5.hx:2: character 11 : Invalid escape sequence \u. Maximum allowed value for unicode escape sequence is \u{10FFFF}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8202/Builder.macro.hx b/tests/misc/projects/Issue8202/Builder.macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c3ae726f443b63580ad8abb5ce24ae98e4af8fbc
--- /dev/null
+++ b/tests/misc/projects/Issue8202/Builder.macro.hx
@@ -0,0 +1,12 @@
+import haxe.macro.Context;
+import haxe.macro.Expr;
+
+class Builder {
+	macro static public function build():Array<Field> {
+		var fields = Context.getBuildFields();
+		fields.push((macro class Dummy {
+			static function generated() {}
+		}).fields[0]);
+		return fields;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8202/Main.hx b/tests/misc/projects/Issue8202/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a5b23b8e8fafc48b956fdb326db277506da599b7
--- /dev/null
+++ b/tests/misc/projects/Issue8202/Main.hx
@@ -0,0 +1,6 @@
+@:build(Builder.build())
+class Main {
+	public static function main() {
+		generated();
+	}
+}
diff --git a/tests/misc/projects/Issue8202/compile.hxml b/tests/misc/projects/Issue8202/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8202/compile.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8205/Main.hx b/tests/misc/projects/Issue8205/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..24d4453cc2ea943ba36f71990a8c733da79c8966
--- /dev/null
+++ b/tests/misc/projects/Issue8205/Main.hx
@@ -0,0 +1,6 @@
+class Main {
+	static function main() {
+		trace("\u{1F404}");
+		trace("\uD83D\uDC04");
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8205/compile-fail.hxml b/tests/misc/projects/Issue8205/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b30a755894b16507d23e6fc657a6e8f791950b34
--- /dev/null
+++ b/tests/misc/projects/Issue8205/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8205/compile-fail.hxml.stderr b/tests/misc/projects/Issue8205/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..8ecd76a1d6a628ed86453ff5858c1a3ace21772c
--- /dev/null
+++ b/tests/misc/projects/Issue8205/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:4: character 10 : Invalid escape sequence \u. UTF-16 surrogates are not allowed in strings.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8219/Main.hx b/tests/misc/projects/Issue8219/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a9d4f7071da2ce653751e82c8feea16ad9f94a60
--- /dev/null
+++ b/tests/misc/projects/Issue8219/Main.hx
@@ -0,0 +1,8 @@
+class Main {
+	@:analyzer(ignore)
+	static function main() {
+		mAin();
+	}
+
+	static function mAin() {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8219/compile-fail.hxml b/tests/misc/projects/Issue8219/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..806e6a10bfbc8b077da7dfb46440cb3722198809
--- /dev/null
+++ b/tests/misc/projects/Issue8219/compile-fail.hxml
@@ -0,0 +1,2 @@
+--main Main
+-php bin
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8219/compile-fail.hxml.stderr b/tests/misc/projects/Issue8219/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..4c7999090113829f4e84dd693d0eafdef664e16c
--- /dev/null
+++ b/tests/misc/projects/Issue8219/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: characters 18-22 : Methods names are case-insensitive in PHP runtime. Cannot redeclare "main".
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8231/Main.hx b/tests/misc/projects/Issue8231/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9b1aefaf35f666d75f0a9a70c54f87ccbc9c1ed9
--- /dev/null
+++ b/tests/misc/projects/Issue8231/Main.hx
@@ -0,0 +1,15 @@
+class Main {
+	static var tmp:Int;
+
+	@:analyzer(ignore)
+	static function main() {
+		var finally = 999;
+		tmp = finally;
+	}
+
+	#if macro
+	static function setupGenerator() {
+		haxe.macro.Compiler.setCustomJSGenerator(api -> new haxe.macro.ExampleJSGenerator(api).generate());
+	}
+	#end
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8231/compile.hxml b/tests/misc/projects/Issue8231/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..e4e293618061dcbc681dec2ac782800e8a0b8b2c
--- /dev/null
+++ b/tests/misc/projects/Issue8231/compile.hxml
@@ -0,0 +1,5 @@
+-main Main
+--macro Main.setupGenerator()
+-js bin/test.js
+
+--cmd node bin/test.js
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8241/Main.hx b/tests/misc/projects/Issue8241/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2751b2705a23946074a511f886f734b02e1dd65d
--- /dev/null
+++ b/tests/misc/projects/Issue8241/Main.hx
@@ -0,0 +1,8 @@
+interface I {
+	@:flash.property var x(get,never):Int;
+}
+
+class Main implements I {
+	public var x(get,never):Int;
+	function get_x():Int return 15;
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8241/compile-fail.hxml b/tests/misc/projects/Issue8241/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..dc02a652324ee408fb6a3bd9c3e5541419b03683
--- /dev/null
+++ b/tests/misc/projects/Issue8241/compile-fail.hxml
@@ -0,0 +1,2 @@
+--swf main.swf
+Main
diff --git a/tests/misc/projects/Issue8241/compile-fail.hxml.stderr b/tests/misc/projects/Issue8241/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..5a7c4f2350184906254ba08147a378055a81f637
--- /dev/null
+++ b/tests/misc/projects/Issue8241/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:6: characters 2-30 : Interface I requires property x to be marked with @:flash.property
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8258/Main.hx b/tests/misc/projects/Issue8258/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f7a3d5015952033530364d1a6e525be1f0fef748
--- /dev/null
+++ b/tests/misc/projects/Issue8258/Main.hx
@@ -0,0 +1,5 @@
+enum abstract Foobar(String) {
+	var A = "x";
+	var B = "y";
+	var A = "z";
+}
diff --git a/tests/misc/projects/Issue8258/compile-fail.hxml b/tests/misc/projects/Issue8258/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8258/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8258/compile-fail.hxml.stderr b/tests/misc/projects/Issue8258/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c5ebcba6d776b217928af1c781f60dd4afe4ba6e
--- /dev/null
+++ b/tests/misc/projects/Issue8258/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:4: characters 2-14 : Duplicate abstract field declaration : Foobar.A
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8277/Main1.hx b/tests/misc/projects/Issue8277/Main1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bd65debf6beb82e1ea5bd35e20f1c6dba3e1506b
--- /dev/null
+++ b/tests/misc/projects/Issue8277/Main1.hx
@@ -0,0 +1,22 @@
+class Main {
+	static final Up = new Point(0, -1);
+	static final Down = new Point(0, 1);
+
+	static function main() {}
+
+	function opposite(direction:Point):Point {
+		return switch (direction) {
+			case Up: Down;
+		}
+	}
+}
+
+class Point {
+	public final x:Int;
+	public final y:Int;
+
+	public function new(x, y) {
+		this.x = x;
+		this.y = y;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8277/Main2.hx b/tests/misc/projects/Issue8277/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a6add18806a745b262d5d13d82da3ab97b042a12
--- /dev/null
+++ b/tests/misc/projects/Issue8277/Main2.hx
@@ -0,0 +1,17 @@
+typedef C = { foo: Int }
+
+enum E {
+	A(v:C);
+}
+
+class Main {
+	static final ident:C = null;
+
+	static function f(e:E):Int {
+		return switch e {
+			case A(ident): 0;
+		}
+	}
+
+	static function main() {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8277/compile1-fail.hxml b/tests/misc/projects/Issue8277/compile1-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..834ce7f6e8d30e5199a2cb95df2371927f8a2d05
--- /dev/null
+++ b/tests/misc/projects/Issue8277/compile1-fail.hxml
@@ -0,0 +1 @@
+-main Main1
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8277/compile1-fail.hxml.stderr b/tests/misc/projects/Issue8277/compile1-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e2b4de5d6ef7cf0b8df2a38773c0282e2df568eb
--- /dev/null
+++ b/tests/misc/projects/Issue8277/compile1-fail.hxml.stderr
@@ -0,0 +1 @@
+Main1.hx:8: characters 18-27 : Unmatched patterns: _
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8277/compile2-fail.hxml b/tests/misc/projects/Issue8277/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..04ed12079a9d3bd950f6bd6d602520bae4e4ce4f
--- /dev/null
+++ b/tests/misc/projects/Issue8277/compile2-fail.hxml
@@ -0,0 +1 @@
+-main Main2
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8277/compile2-fail.hxml.stderr b/tests/misc/projects/Issue8277/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..133d20401f523d99406a68958335ff5ca377d86c
--- /dev/null
+++ b/tests/misc/projects/Issue8277/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:12: characters 11-16 : Unmatched patterns: A(_)
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8283/Main.hx b/tests/misc/projects/Issue8283/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2c33a841997ce2b8c12e278943f53e02ca15d25f
--- /dev/null
+++ b/tests/misc/projects/Issue8283/Main.hx
@@ -0,0 +1,16 @@
+abstract Future<T>(Dynamic) {
+  @:from static inline function ofAny<T>(v:T):Future<T>
+    return null;
+}
+
+typedef FutureAlias<T> = Future<T>;
+
+class Main {
+  static function main() req([1, '{"baz":"baz"}']);
+  static public function req(?arr, ?body:Source) {}
+}
+
+abstract Source(Int) from Int to Int {
+  @:from static function ofFuture(f:FutureAlias<Source>):Source
+    return null;
+}
diff --git a/tests/misc/projects/Issue8283/compile-fail.hxml b/tests/misc/projects/Issue8283/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8283/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8283/compile-fail.hxml.stderr b/tests/misc/projects/Issue8283/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..46dbe376fb16ddf860d816f5d9984f00356675b0
--- /dev/null
+++ b/tests/misc/projects/Issue8283/compile-fail.hxml.stderr
@@ -0,0 +1,4 @@
+Main.hx:9: characters 35-48 : Arrays of mixed types are only allowed if the type is forced to Array<Dynamic>
+Main.hx:9: characters 35-48 : Arrays of mixed types are only allowed if the type is forced to Array<Dynamic>
+Main.hx:9: characters 35-48 : String should be Int
+Main.hx:9: characters 35-48 : For optional function argument 'arr'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8303/Main.hx b/tests/misc/projects/Issue8303/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9a685db097ce835a2c866428ac8ff1556a4925db
--- /dev/null
+++ b/tests/misc/projects/Issue8303/Main.hx
@@ -0,0 +1,13 @@
+class Main {
+	public static function main():Void {
+		test();
+	}
+
+	static function test() {
+		function log() {
+			log();
+		}
+		log();
+		return macro {};
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8303/MainCatch.hx b/tests/misc/projects/Issue8303/MainCatch.hx
new file mode 100644
index 0000000000000000000000000000000000000000..89d7c6f8576d39ce7a82b3b6a3d1160185852870
--- /dev/null
+++ b/tests/misc/projects/Issue8303/MainCatch.hx
@@ -0,0 +1,19 @@
+class MainCatch {
+	public static function main():Void {
+		test();
+	}
+
+	static function test() {
+		function log() {
+			log();
+		}
+		try {
+			log();
+		} catch(s:String) {
+			if(s != 'Stack overflow') {
+				Sys.exit(1);
+			}
+		}
+		return macro {};
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8303/compile-fail.hxml b/tests/misc/projects/Issue8303/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..234e999d46203b4765ed34dca21aa8e33c1a48e9
--- /dev/null
+++ b/tests/misc/projects/Issue8303/compile-fail.hxml
@@ -0,0 +1,3 @@
+-main Main
+-D eval-call-stack-depth=5
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8303/compile-fail.hxml.stderr b/tests/misc/projects/Issue8303/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..596e6de327371337b0a63daa38d747680134bae6
--- /dev/null
+++ b/tests/misc/projects/Issue8303/compile-fail.hxml.stderr
@@ -0,0 +1,6 @@
+Uncaught exception Stack overflow
+Main.hx:1: character 1 : Called from here
+Main.hx:8: characters 4-9 : Called from here
+Main.hx:8: characters 4-9 : Called from here
+Main.hx:10: characters 3-8 : Called from here
+Main.hx:3: characters 3-9 : Called from here
diff --git a/tests/misc/projects/Issue8303/compile.hxml b/tests/misc/projects/Issue8303/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..cef811ef94be8ae512bf4d30efa50b9a80363f7a
--- /dev/null
+++ b/tests/misc/projects/Issue8303/compile.hxml
@@ -0,0 +1,3 @@
+-main MainCatch
+-D eval-call-stack-depth=5
+--interp
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8336/Main.hx b/tests/misc/projects/Issue8336/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2381a730a842a91991831143f8f67fdd70cd1f4a
--- /dev/null
+++ b/tests/misc/projects/Issue8336/Main.hx
@@ -0,0 +1,16 @@
+class Main {
+	public static function main() {
+		#if !macro
+		connect();
+		#end
+	}
+
+	macro static function connect() {
+		try {
+			new sys.net.Socket().connect(new sys.net.Host("127.0.0.1"), 9999);
+		} catch(e:String) {
+			haxe.macro.Context.error('connection error', (macro {}).pos);
+		}
+		return macro {}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8336/compile-fail.hxml b/tests/misc/projects/Issue8336/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8336/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8336/compile-fail.hxml.stderr b/tests/misc/projects/Issue8336/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..f627f0d503905fed339289dde1b7e0cb1d69476d
--- /dev/null
+++ b/tests/misc/projects/Issue8336/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:12: characters 56-58 : connection error
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8354/FailFrom.hx b/tests/misc/projects/Issue8354/FailFrom.hx
new file mode 100644
index 0000000000000000000000000000000000000000..75920f8b788b27b737e673610fc57a9a4f7204a2
--- /dev/null
+++ b/tests/misc/projects/Issue8354/FailFrom.hx
@@ -0,0 +1,10 @@
+class FailFrom {
+	static function main() {}
+}
+
+class MyMap<K, V> {
+	var values: Array<V>;
+	public function iterator(): Iterator<V> return values.iterator();
+}
+
+abstract AbstractMap<K,V>(MyMap<K,V>) from MyMap<V,K> {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8354/FailTo.hx b/tests/misc/projects/Issue8354/FailTo.hx
new file mode 100644
index 0000000000000000000000000000000000000000..81066859f621c1cf4c678ffa6aa02735426906f7
--- /dev/null
+++ b/tests/misc/projects/Issue8354/FailTo.hx
@@ -0,0 +1,10 @@
+class FailTo {
+	static function main() {}
+}
+
+class MyMap<K, V> {
+	var values: Array<V>;
+	public function iterator(): Iterator<V> return values.iterator();
+}
+
+abstract AbstractMap<K,V>(MyMap<K,V>) to Iterable<K> {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8354/Success.hx b/tests/misc/projects/Issue8354/Success.hx
new file mode 100644
index 0000000000000000000000000000000000000000..10474e493d6801655d01b26bddbad927ef0eb767
--- /dev/null
+++ b/tests/misc/projects/Issue8354/Success.hx
@@ -0,0 +1,10 @@
+class Success {
+	static function main() {}
+}
+
+class MyMap<K, V> {
+	var values: Array<V>;
+	public function iterator(): Iterator<V> return values.iterator();
+}
+
+abstract AbstractMap<K,V>(MyMap<K,V>) from MyMap<K,V> to Iterable<V> {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8354/compile.hxml b/tests/misc/projects/Issue8354/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..52991cf0850b5fd75475fb105f579dac295faa6d
--- /dev/null
+++ b/tests/misc/projects/Issue8354/compile.hxml
@@ -0,0 +1 @@
+-main Success
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8354/compile1-fail.hxml b/tests/misc/projects/Issue8354/compile1-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..abc2baa15c9fed95c1faaea2c01086612dd26ddb
--- /dev/null
+++ b/tests/misc/projects/Issue8354/compile1-fail.hxml
@@ -0,0 +1 @@
+-main FailTo
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8354/compile1-fail.hxml.stderr b/tests/misc/projects/Issue8354/compile1-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1a4de48b1f7de663528dde84ace8b882fd845dfb
--- /dev/null
+++ b/tests/misc/projects/Issue8354/compile1-fail.hxml.stderr
@@ -0,0 +1 @@
+FailTo.hx:10: characters 42-53 : You can only declare from/to with compatible types
diff --git a/tests/misc/projects/Issue8354/compile2-fail.hxml b/tests/misc/projects/Issue8354/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c9c487da067473a681e0ebe40c456fa2083dbf11
--- /dev/null
+++ b/tests/misc/projects/Issue8354/compile2-fail.hxml
@@ -0,0 +1 @@
+-main FailFrom
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8354/compile2-fail.hxml.stderr b/tests/misc/projects/Issue8354/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..12f6763c400f0144a7632c3618f368791d28a096
--- /dev/null
+++ b/tests/misc/projects/Issue8354/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+FailFrom.hx:10: characters 44-54 : You can only declare from/to with compatible types
diff --git a/tests/misc/projects/Issue8364/Main.hx b/tests/misc/projects/Issue8364/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..79291de78d90835c2bacf4740aa0720acb8e9a83
--- /dev/null
+++ b/tests/misc/projects/Issue8364/Main.hx
@@ -0,0 +1,15 @@
+class Main {
+	static function main() {
+		#if FOO.BAR
+		// pass
+		#else
+		throw 'FOO.BAR condition failed';
+		#end
+
+		#if foo.bar
+		// pass
+		#else
+		throw 'foo.bar condition failed';
+		#end
+	}
+}
diff --git a/tests/misc/projects/Issue8364/compile.hxml b/tests/misc/projects/Issue8364/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..bb8a0119242e1671e6c9025efda9f5e3c157bad1
--- /dev/null
+++ b/tests/misc/projects/Issue8364/compile.hxml
@@ -0,0 +1,4 @@
+-main Main
+--interp
+-D FOO.BAR
+-D foo.bar
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8393/Main.hx b/tests/misc/projects/Issue8393/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c8028a7a96a5137bfe407024b66ebfc6ffc7bbfa
--- /dev/null
+++ b/tests/misc/projects/Issue8393/Main.hx
@@ -0,0 +1,9 @@
+@:generic
+class Generic<T> {}
+
+class Generic_Int {}
+
+class Main {
+	static var tmp:Generic<Int>;
+	static function main():Void {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8393/Main2.hx b/tests/misc/projects/Issue8393/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..412ca6603bf9cc5b1bda077fd409ccfffcb924bb
--- /dev/null
+++ b/tests/misc/projects/Issue8393/Main2.hx
@@ -0,0 +1,11 @@
+class Main2 {
+
+	@:generic
+	static function test<T>(i:T) {}
+
+	static function test_Int(i:Int) {}
+
+	static function main():Void {
+		test(10);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8393/compile-fail.hxml b/tests/misc/projects/Issue8393/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8393/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8393/compile-fail.hxml.stderr b/tests/misc/projects/Issue8393/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..38c709ba2a89dce37ce4a2bf1937fc243e79d116
--- /dev/null
+++ b/tests/misc/projects/Issue8393/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:7: characters 17-29 : Cannot specialize @:generic because the generated type name is already used: Generic_Int
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8393/compile2-fail.hxml.disabled b/tests/misc/projects/Issue8393/compile2-fail.hxml.disabled
new file mode 100644
index 0000000000000000000000000000000000000000..01445668ffedbef743da705c7df2e4134720545d
--- /dev/null
+++ b/tests/misc/projects/Issue8393/compile2-fail.hxml.disabled
@@ -0,0 +1,2 @@
+# Disabled because of https://github.com/HaxeFoundation/haxe/issues/8393#issuecomment-508685760
+-main Main2
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8393/compile2-fail.hxml.stderr b/tests/misc/projects/Issue8393/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..daf5cd8737047232fbec9c368f2135a104427549
--- /dev/null
+++ b/tests/misc/projects/Issue8393/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:9: characters 3-11 : Cannot specialize @:generic because the generated function name is already used: test_Int
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8404/Main.hx b/tests/misc/projects/Issue8404/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4f33bec57419ae85573e0a64dc04d9e9555bcb0e
--- /dev/null
+++ b/tests/misc/projects/Issue8404/Main.hx
@@ -0,0 +1,13 @@
+class Main {
+	public static function main() {
+		trace(markup(<something onClick={e -> e.preventDefault()} />));
+		trace(markup(<something isSelected={42 > 0} />));
+	}
+
+	static macro function markup(e) {
+		return switch e {
+			case macro @:markup $v: macro "ok";
+			case _: throw 'Not markup';
+		};
+	}
+}
diff --git a/tests/misc/projects/Issue8404/compile.hxml b/tests/misc/projects/Issue8404/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8404/compile.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8466/Main.hx b/tests/misc/projects/Issue8466/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..815f30ddd723ed77e04f3ef12ad286e7ab120a98
--- /dev/null
+++ b/tests/misc/projects/Issue8466/Main.hx
@@ -0,0 +1,7 @@
+class Main {
+	static public function init() {
+		if(Sys.programPath() != null) {
+			throw 'Unexpected value';
+		}
+	}
+}
diff --git a/tests/misc/projects/Issue8466/compile.hxml b/tests/misc/projects/Issue8466/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..a487ef22f17c749b031b2da44cd33939ec668c03
--- /dev/null
+++ b/tests/misc/projects/Issue8466/compile.hxml
@@ -0,0 +1 @@
+--macro Main.init()
diff --git a/tests/misc/projects/Issue8471/Macro.hx b/tests/misc/projects/Issue8471/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0253ca3c155782f4185142b02c99755974e3ca70
--- /dev/null
+++ b/tests/misc/projects/Issue8471/Macro.hx
@@ -0,0 +1,27 @@
+import haxe.macro.Context;
+
+class Macro {
+	public static function init() {
+		Context.warning("This warning will disappear", Context.currentPos());
+
+		Context.onAfterTyping(afterTyping);
+		Context.onAfterGenerate(afterGenerate);
+	}
+
+	static function afterTyping(_) {
+		var nbMessages = Context.getMessages().length;
+		Context.filterMessages(_ -> false);
+		Context.warning('There were $nbMessages messages on after typing', Context.currentPos());
+		Context.warning("This warning will not disappear", Context.currentPos());
+		Context.warning("This warning will disappear too", Context.currentPos());
+	}
+
+	static function afterGenerate() {
+		var nbMessages = Context.getMessages().length;
+		Context.warning('There were $nbMessages messages on after generate', Context.currentPos());
+		Context.filterMessages(msg -> switch msg {
+			case Warning(w, _): w != "This warning will disappear too";
+			case Info(_, _): true;
+		});
+	}
+}
diff --git a/tests/misc/projects/Issue8471/Macro2.hx b/tests/misc/projects/Issue8471/Macro2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..437fd064f0f945c014f2242a52278678219a2bc4
--- /dev/null
+++ b/tests/misc/projects/Issue8471/Macro2.hx
@@ -0,0 +1,35 @@
+import haxe.macro.Context;
+
+@:deprecated
+typedef DeprecatedType = String;
+
+class Macro2 {
+	public static function init() {
+		Context.onAfterTyping(afterTyping);
+	}
+
+	static function afterTyping(_) {
+		Context.warning(("1" :DeprecatedType), Context.currentPos());
+		Context.warning("2", Context.currentPos());
+		Context.warning("3", Context.currentPos());
+
+		var messages = Context.getMessages();
+		var order = Lambda.fold(messages, (msg, acc) -> switch msg {
+			case Warning(w, _) if (w.length == 1): acc + w;
+			case Info(_, _): acc + 'i';
+			case _: acc;
+		}, "") + "|";
+
+		Context.filterMessages(function(msg) {
+			switch msg {
+				case Warning(w, _) if (w.length == 1): order += w;
+				case Info(_, _): order += 'i';
+				case _:
+			}
+
+			return true;
+		});
+
+		Context.warning(order, Context.currentPos());
+	}
+}
diff --git a/tests/misc/projects/Issue8471/compile.hxml b/tests/misc/projects/Issue8471/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..d294417d47beab8c76292bf918dcbd9bc34dcb6c
--- /dev/null
+++ b/tests/misc/projects/Issue8471/compile.hxml
@@ -0,0 +1,2 @@
+--version
+--macro Macro.init()
diff --git a/tests/misc/projects/Issue8471/compile.hxml.stderr b/tests/misc/projects/Issue8471/compile.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c5ead1c620a8af1bc808125da830138ee7216bbb
--- /dev/null
+++ b/tests/misc/projects/Issue8471/compile.hxml.stderr
@@ -0,0 +1,3 @@
+Warning : There were 2 messages on after typing
+Warning : This warning will not disappear
+Warning : There were 3 messages on after generate
diff --git a/tests/misc/projects/Issue8471/compile2.hxml b/tests/misc/projects/Issue8471/compile2.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..840524bc3929028cd23f899dcd3de8fa4c840bb7
--- /dev/null
+++ b/tests/misc/projects/Issue8471/compile2.hxml
@@ -0,0 +1,2 @@
+--version
+--macro Macro2.init()
diff --git a/tests/misc/projects/Issue8471/compile2.hxml.stderr b/tests/misc/projects/Issue8471/compile2.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..f0f79d26ec7bc640eecd76f6900129f19156782b
--- /dev/null
+++ b/tests/misc/projects/Issue8471/compile2.hxml.stderr
@@ -0,0 +1,5 @@
+Macro2.hx:12: characters 25-39 : Warning : This typedef is deprecated in favor of String
+Warning : 1
+Warning : 2
+Warning : 3
+Warning : i123|i123
diff --git a/tests/misc/projects/Issue8488/Main.hx b/tests/misc/projects/Issue8488/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6ed537fbb5004e8ce2aac3d6bca118362d7e3705
--- /dev/null
+++ b/tests/misc/projects/Issue8488/Main.hx
@@ -0,0 +1,9 @@
+class Main {
+  public static function main():Void {
+    function foo(?a:haxe.ds.Option<Int>->Bool, b:Int):Void {}
+    foo(
+      o -> o.match(haxe.ds.Option.Some(_ => "3")),
+      1
+    );
+  }
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8488/compile-fail.hxml b/tests/misc/projects/Issue8488/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8488/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8488/compile-fail.hxml.stderr b/tests/misc/projects/Issue8488/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1a8523029bce3a62224903951b76fb0564021e3b
--- /dev/null
+++ b/tests/misc/projects/Issue8488/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:5: characters 45-48 : String should be Int
+Main.hx:5: characters 45-48 : For optional function argument 'a'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8517/Fail.hx b/tests/misc/projects/Issue8517/Fail.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1b8f1ecee8c1fd3bee71f7115e628a3f5dfe71dd
--- /dev/null
+++ b/tests/misc/projects/Issue8517/Fail.hx
@@ -0,0 +1,7 @@
+class Main {
+	public static function main():Void {
+		Macro.notAssignable() = 2;
+		Foo.bar() = 2;
+		Foo.bar() += 2;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8517/Foo.hx b/tests/misc/projects/Issue8517/Foo.hx
new file mode 100644
index 0000000000000000000000000000000000000000..11201bbc57dc2d915c645ed8adb42fefda302c1d
--- /dev/null
+++ b/tests/misc/projects/Issue8517/Foo.hx
@@ -0,0 +1,4 @@
+class Foo {
+	static public var a:Int;
+	static public inline function bar():Int return a;
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8517/Macro.hx b/tests/misc/projects/Issue8517/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a47278ae8bc8fe559ffb4c12b758728fdb59fb3f
--- /dev/null
+++ b/tests/misc/projects/Issue8517/Macro.hx
@@ -0,0 +1,4 @@
+class Macro {
+	macro static public function assignable() return macro Foo.a;
+	macro static public function notAssignable() return macro Foo.bar();
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8517/Main.hx b/tests/misc/projects/Issue8517/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c749fd79da0c50e07cdf82f3cc49a69890f210fc
--- /dev/null
+++ b/tests/misc/projects/Issue8517/Main.hx
@@ -0,0 +1,5 @@
+class Main {
+	public static function main():Void {
+		Macro.assignable() = 2;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8517/compile-fail.hxml b/tests/misc/projects/Issue8517/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..65babe133810e760a0ae7feefc56ca8808e0771b
--- /dev/null
+++ b/tests/misc/projects/Issue8517/compile-fail.hxml
@@ -0,0 +1 @@
+-main Fail
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8517/compile-fail.hxml.stderr b/tests/misc/projects/Issue8517/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..05d3ace2f4e6ed9a52224ce48f49bd8e2c804ea8
--- /dev/null
+++ b/tests/misc/projects/Issue8517/compile-fail.hxml.stderr
@@ -0,0 +1,4 @@
+Macro.hx:3: characters 60-69 : Invalid assign
+Fail.hx:1: lines 1-7 : Defined in this class
+Fail.hx:4: characters 3-12 : Invalid assign
+Fail.hx:5: characters 3-12 : Invalid assign
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8517/compile.hxml b/tests/misc/projects/Issue8517/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8517/compile.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8527/Main.hx b/tests/misc/projects/Issue8527/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..46a826a43293f584036b292785c53c8449a3076d
--- /dev/null
+++ b/tests/misc/projects/Issue8527/Main.hx
@@ -0,0 +1,3 @@
+class Main {
+	static function main() {
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8527/compile-fail.hxml b/tests/misc/projects/Issue8527/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8527/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8527/compile-fail.hxml.stderr b/tests/misc/projects/Issue8527/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..6733387c9d966b0a3c3595d2e7f4bf1572f8a673
--- /dev/null
+++ b/tests/misc/projects/Issue8527/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: character 2 : Expected }
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8530/Main.hx b/tests/misc/projects/Issue8530/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bd1d26c04a334c9f9c191a39a04d9fe7ca5cf0a0
--- /dev/null
+++ b/tests/misc/projects/Issue8530/Main.hx
@@ -0,0 +1,13 @@
+class Main {
+	public static function main():Void {}
+}
+
+abstract Abstr(Int) {
+	inline function new(v) {
+		this = v;
+	}
+
+	public function test() {
+		new Abstr(this);
+	}
+}
diff --git a/tests/misc/projects/Issue8530/compile.hxml b/tests/misc/projects/Issue8530/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8530/compile.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8533/Main.hx b/tests/misc/projects/Issue8533/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..85ac0ef103890ee278c1ac5830bcdf21204068a6
--- /dev/null
+++ b/tests/misc/projects/Issue8533/Main.hx
@@ -0,0 +1,36 @@
+import haxe.display.Position;
+import haxe.macro.Context;
+import haxe.macro.PositionTools;
+
+class Main {
+	static function main() {
+		var s = "待到来年九月八";
+		posChecking("我花开后百花杀");
+	}
+
+	macro static function posChecking(expr) {
+		var info = PositionTools.getInfos(expr.pos);
+		var txtPos = PositionTools.make({
+			min: info.min,
+			max: info.max,
+			file: info.file + '.txt'
+		});
+
+		var hxLoc = PositionTools.toLocation(expr.pos);
+		var txtLoc = PositionTools.toLocation(txtPos);
+		if(!equalRanges(hxLoc.range, txtLoc.range)) {
+			var msg = 'position numbers should be the same';
+			Context.warning(msg, expr.pos);
+			Context.error(msg, txtPos);
+		}
+		return expr;
+	}
+
+	static function equalRanges(r1:Range, r2:Range):Bool {
+		return equalPositions(r1.start, r2.start) && equalPositions(r1.end, r2.end);
+	}
+
+	static function equalPositions(p1:Position, p2:Position) {
+		return p1.line == p2.line && p1.character == p2.character;
+	}
+}
diff --git a/tests/misc/projects/Issue8533/Main.hx.txt b/tests/misc/projects/Issue8533/Main.hx.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9212b77d71223794dc3480b88489eb6923c489f5
--- /dev/null
+++ b/tests/misc/projects/Issue8533/Main.hx.txt
@@ -0,0 +1,36 @@
+import haxe.display.Position;
+import haxe.macro.Context;
+import haxe.macro.PositionTools;
+
+class Main {
+	static function main() {
+		var s = "待到来年九月八";
+		posChecking("我花开后百花杀");
+	}
+
+	macro static function posChecking(expr) {
+		var info = PositionTools.getInfos(expr.pos);
+		var txtPos = PositionTools.make({
+			min: info.min,
+			max: info.max,
+			file: info.file + '.txt'
+		});
+
+		var hxLoc = PositionTools.toLocation(expr.pos);
+		var txtLoc = PositionTools.toLocation(txtPos);
+		if(!equalRanges(hxLoc.range, txtLoc.range)) {
+			var msg = 'position numbers should be equal';
+			Context.warning(msg, expr.pos);
+			Context.error(msg, txtPos);
+		}
+		return expr;
+	}
+
+	static function equalRanges(r1:Range, r2:Range):Bool {
+		return equalPositions(r1.start, r2.start) && equalPositions(r1.end, r2.end);
+	}
+
+	static function equalPositions(p1:Position, p2:Position) {
+		return p1.line == p2.line && p1.character == p2.character;
+	}
+}
diff --git a/tests/misc/projects/Issue8533/compile.hxml b/tests/misc/projects/Issue8533/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8533/compile.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8534/Main.hx b/tests/misc/projects/Issue8534/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..462f33344bbb89fa99bc957654080b0ccce7fe51
--- /dev/null
+++ b/tests/misc/projects/Issue8534/Main.hx
@@ -0,0 +1,5 @@
+class Main {
+	static function main() {
+		["1", "2", "3"].map(Std.parseInt).joint("\n");
+	}
+}
diff --git a/tests/misc/projects/Issue8534/compile-fail.hxml b/tests/misc/projects/Issue8534/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..20bd8ba23876ff9ac5796972dd89c01b6812705b
--- /dev/null
+++ b/tests/misc/projects/Issue8534/compile-fail.hxml
@@ -0,0 +1 @@
+Main.hx
diff --git a/tests/misc/projects/Issue8534/compile-fail.hxml.stderr b/tests/misc/projects/Issue8534/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..8008af3cbd90e7f938c09b74c6dec988c6f79c35
--- /dev/null
+++ b/tests/misc/projects/Issue8534/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: characters 37-42 : Array<Null<Int>> has no field joint (Suggestion: join)
diff --git a/tests/misc/projects/Issue8550/Fail.hx b/tests/misc/projects/Issue8550/Fail.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9fb45235f7bb9b56f1c5bbad4795dd006111a69d
--- /dev/null
+++ b/tests/misc/projects/Issue8550/Fail.hx
@@ -0,0 +1,7 @@
+class Fail {
+	static function main() {
+		trace(Dummy);
+	}
+}
+
+abstract Dummy(Int) {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8550/Success.hx b/tests/misc/projects/Issue8550/Success.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c91473c84d50cb89b66776f9a17e6032eec7171a
--- /dev/null
+++ b/tests/misc/projects/Issue8550/Success.hx
@@ -0,0 +1,5 @@
+class Success {
+	static function main() {
+		trace(Int);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8550/compile-fail.hxml b/tests/misc/projects/Issue8550/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..5a037b2bdffaf240850b4285c7dd3b5fb8facb96
--- /dev/null
+++ b/tests/misc/projects/Issue8550/compile-fail.hxml
@@ -0,0 +1 @@
+-main Fail
diff --git a/tests/misc/projects/Issue8550/compile-fail.hxml.stderr b/tests/misc/projects/Issue8550/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..d780d5b9e7bca3bd890598732f307d302bf7f172
--- /dev/null
+++ b/tests/misc/projects/Issue8550/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Fail.hx:3: characters 9-14 : Cannot use abstract as value
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8550/compile.hxml b/tests/misc/projects/Issue8550/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..34ff08bab4fc04a986723ff4daaab353a6ed7da4
--- /dev/null
+++ b/tests/misc/projects/Issue8550/compile.hxml
@@ -0,0 +1 @@
+-main Success
diff --git a/tests/misc/projects/Issue8551/Main.hx b/tests/misc/projects/Issue8551/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5f700907fc873b245a5de3d469a900c794338455
--- /dev/null
+++ b/tests/misc/projects/Issue8551/Main.hx
@@ -0,0 +1,9 @@
+class Main {
+	static function main() {}
+}
+
+abstract Dummy(Int) {
+	macro public function new(v:Int) {
+		this = v;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8551/compile-fail.hxml b/tests/misc/projects/Issue8551/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8551/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8551/compile-fail.hxml.stderr b/tests/misc/projects/Issue8551/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c8c8e93210eaef017f885e0ee09272c603e9131e
--- /dev/null
+++ b/tests/misc/projects/Issue8551/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:6: characters 2-7 : Macro abstract constructors are not supported
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8565/Main.hx b/tests/misc/projects/Issue8565/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f469d15fe41ee047080144d629abf9db30cf0f0d
--- /dev/null
+++ b/tests/misc/projects/Issue8565/Main.hx
@@ -0,0 +1,6 @@
+class Main {
+	static function main() {
+		if (true) {}
+		<someMarkup />;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8565/compile-fail.hxml b/tests/misc/projects/Issue8565/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8565/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8565/compile-fail.hxml.stderr b/tests/misc/projects/Issue8565/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..17c92467622a4d8684100628610c8f2d3af89b77
--- /dev/null
+++ b/tests/misc/projects/Issue8565/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:4: characters 3-17 : Markup literals must be processed by a macro
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8567/compile.hxml b/tests/misc/projects/Issue8567/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..eb9ce29209992c262d9bd50980a89c1c5f85cdec
--- /dev/null
+++ b/tests/misc/projects/Issue8567/compile.hxml
@@ -0,0 +1,3 @@
+-cp src
+-main Main
+--macro patchTypes("src/test.txt")
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8567/src/Main.hx b/tests/misc/projects/Issue8567/src/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..17c7d3e7b5d2e0caddabd10a822f1c0a23af8f56
--- /dev/null
+++ b/tests/misc/projects/Issue8567/src/Main.hx
@@ -0,0 +1,4 @@
+class Main {
+	static function main() {
+	}
+}
diff --git a/tests/misc/projects/Issue8567/src/test.txt b/tests/misc/projects/Issue8567/src/test.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/misc/projects/Issue8579/Main.hx b/tests/misc/projects/Issue8579/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1aaaad956dd8b1825450a1b82c8e0cab865fba72
--- /dev/null
+++ b/tests/misc/projects/Issue8579/Main.hx
@@ -0,0 +1,14 @@
+abstract A(Int) {
+	public static final instance:A = cast 42;
+}
+
+class Main {
+	static function main() {
+		switch 42 {
+			case A.instance:
+				trace("YES");
+			case _:
+				trace("NO");
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8579/compile-fail.hxml b/tests/misc/projects/Issue8579/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8579/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8579/compile-fail.hxml.stderr b/tests/misc/projects/Issue8579/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..a3b17860812a975bc6a74089ac7650a8d6e7b5c6
--- /dev/null
+++ b/tests/misc/projects/Issue8579/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:8: characters 9-19 : A should be Int
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8608/Main.hx b/tests/misc/projects/Issue8608/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bdd510e4d0c8a36bf1c3aa2cf6f02a41ae219631
--- /dev/null
+++ b/tests/misc/projects/Issue8608/Main.hx
@@ -0,0 +1,11 @@
+class Main {
+	static function main() {}
+}
+
+abstract Test(Test2) {
+	public inline function new() {
+		this = null;
+	}
+}
+
+abstract Test2(Test) {}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8608/compile-fail.hxml b/tests/misc/projects/Issue8608/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8608/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8608/compile-fail.hxml.stderr b/tests/misc/projects/Issue8608/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..9df8aad3ecde7e622fd2d2556f44d011aebc839a
--- /dev/null
+++ b/tests/misc/projects/Issue8608/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:5: lines 5-9 : Abstract underlying type cannot be recursive
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8618/Main.hx b/tests/misc/projects/Issue8618/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a19a7a35020d37bd75659342574a5d4daa625846
--- /dev/null
+++ b/tests/misc/projects/Issue8618/Main.hx
@@ -0,0 +1,6 @@
+class Main {
+	static function main() {
+		trace(NoClosureClass.notMethod);
+		trace(NoClosureClass.staticMethod);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8618/Main2.hx b/tests/misc/projects/Issue8618/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8f4f2e594dc39d67808b70a89b07ef7f832bc165
--- /dev/null
+++ b/tests/misc/projects/Issue8618/Main2.hx
@@ -0,0 +1,5 @@
+class Main2 {
+	static function main() {
+		trace((null:NoClosureClass).instanceMethod);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8618/Main3.hx b/tests/misc/projects/Issue8618/Main3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..22305e8e3df6588a4b0225adf12ae036c1238480
--- /dev/null
+++ b/tests/misc/projects/Issue8618/Main3.hx
@@ -0,0 +1,5 @@
+class Main3 {
+	static function main() {
+		trace(NormalClass.noClosureStaticMethod);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8618/Main4.hx b/tests/misc/projects/Issue8618/Main4.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a835948a113aa06ac2185805bf4cf9d6e7b6d360
--- /dev/null
+++ b/tests/misc/projects/Issue8618/Main4.hx
@@ -0,0 +1,5 @@
+class Main4 {
+	static function main() {
+		trace((null:NormalClass).noClosureInstanceMethod);
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8618/NoClosureClass.hx b/tests/misc/projects/Issue8618/NoClosureClass.hx
new file mode 100644
index 0000000000000000000000000000000000000000..52462f609529b383bbc9a32a04c47d6ab01ccca9
--- /dev/null
+++ b/tests/misc/projects/Issue8618/NoClosureClass.hx
@@ -0,0 +1,6 @@
+@:noClosure
+class NoClosureClass {
+	static public var notMethod:Void->Void;
+	static public function staticMethod() {}
+	public function instanceMethod() {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8618/NormalClass.hx b/tests/misc/projects/Issue8618/NormalClass.hx
new file mode 100644
index 0000000000000000000000000000000000000000..438127ebeab4291e8dd4d34b04d2244b47ba3879
--- /dev/null
+++ b/tests/misc/projects/Issue8618/NormalClass.hx
@@ -0,0 +1,6 @@
+class NormalClass {
+	@:noClosure
+	static public function noClosureStaticMethod() {}
+	@:noClosure
+	public function noClosureInstanceMethod() {}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8618/compile-fail.hxml b/tests/misc/projects/Issue8618/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8618/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8618/compile-fail.hxml.stderr b/tests/misc/projects/Issue8618/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..49bb40a0b30e259e388b7e3ce3e5487f7fff66d7
--- /dev/null
+++ b/tests/misc/projects/Issue8618/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:4: characters 9-36 : Method staticMethod cannot be used as a value
+Main.hx:4: characters 9-36 : For function argument 'v'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8618/compile2-fail.hxml b/tests/misc/projects/Issue8618/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..27d6e39ab72cf90b00703d0d1323b0c0e760514b
--- /dev/null
+++ b/tests/misc/projects/Issue8618/compile2-fail.hxml
@@ -0,0 +1 @@
+-main Main2
diff --git a/tests/misc/projects/Issue8618/compile2-fail.hxml.stderr b/tests/misc/projects/Issue8618/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..6d9a52611f42ff93af82c112aac6b8f3a1667b3a
--- /dev/null
+++ b/tests/misc/projects/Issue8618/compile2-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main2.hx:3: characters 9-45 : Method instanceMethod cannot be used as a value
+Main2.hx:3: characters 9-45 : For function argument 'v'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8618/compile3-fail.hxml b/tests/misc/projects/Issue8618/compile3-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..83eea6fa92b5bafa62292b4f58ce79917b719b28
--- /dev/null
+++ b/tests/misc/projects/Issue8618/compile3-fail.hxml
@@ -0,0 +1 @@
+-main Main3
diff --git a/tests/misc/projects/Issue8618/compile3-fail.hxml.stderr b/tests/misc/projects/Issue8618/compile3-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..3932cd9d8935b3026a46dee12834065bc792fc46
--- /dev/null
+++ b/tests/misc/projects/Issue8618/compile3-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main3.hx:3: characters 9-42 : Method noClosureStaticMethod cannot be used as a value
+Main3.hx:3: characters 9-42 : For function argument 'v'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8618/compile4-fail.hxml b/tests/misc/projects/Issue8618/compile4-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..d9958b690f9b0eb7d9dd0d8a36da743918e40ca1
--- /dev/null
+++ b/tests/misc/projects/Issue8618/compile4-fail.hxml
@@ -0,0 +1 @@
+-main Main4
diff --git a/tests/misc/projects/Issue8618/compile4-fail.hxml.stderr b/tests/misc/projects/Issue8618/compile4-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..52774140c70e2da0a01297f9b06b857f6c8db49b
--- /dev/null
+++ b/tests/misc/projects/Issue8618/compile4-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main4.hx:3: characters 9-51 : Method noClosureInstanceMethod cannot be used as a value
+Main4.hx:3: characters 9-51 : For function argument 'v'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8650/Main.hx b/tests/misc/projects/Issue8650/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f02a0cefbd6b9d484240712fe31d67997bc75946
--- /dev/null
+++ b/tests/misc/projects/Issue8650/Main.hx
@@ -0,0 +1,6 @@
+class Main {
+	static function main() {
+		#if (my_ver >= version("1.0.0"))
+		#end
+	}
+}
diff --git a/tests/misc/projects/Issue8650/compile-fail.hxml b/tests/misc/projects/Issue8650/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..8cd1fbe298f830f5cf12ee60187a4a9e2b7e0c8c
--- /dev/null
+++ b/tests/misc/projects/Issue8650/compile-fail.hxml
@@ -0,0 +1,2 @@
+-main Main
+-D my_ver=2.0
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8650/compile-fail.hxml.stderr b/tests/misc/projects/Issue8650/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..05d70bce0461692b24cf140f36b135235e1d6212
--- /dev/null
+++ b/tests/misc/projects/Issue8650/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: characters 8-14 : Invalid version string "2.0". Should follow SemVer.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8654/Arr.hx b/tests/misc/projects/Issue8654/Arr.hx
new file mode 100644
index 0000000000000000000000000000000000000000..342b0e9c2a18d8ddc9cba251b6a47507ab37ab13
--- /dev/null
+++ b/tests/misc/projects/Issue8654/Arr.hx
@@ -0,0 +1,9 @@
+class Arr<T> {
+	var get:T;
+
+	inline function set(val:T):Void {}
+
+	@:keep
+	public function map<S>(f:T->S)
+		(null:Arr<S>).set(f(get));
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8654/Check.hx b/tests/misc/projects/Issue8654/Check.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f675aa12fe12ea559a48ed0421b03dcdd07bb6b9
--- /dev/null
+++ b/tests/misc/projects/Issue8654/Check.hx
@@ -0,0 +1,50 @@
+import haxe.macro.Compiler;
+import haxe.macro.Context;
+import haxe.macro.Expr;
+import haxe.macro.Type;
+
+class Check {
+	static public function run() {
+
+		Context.onAfterTyping(function(types) {
+			for(type in types) {
+				switch type {
+					case TClassDecl(_.get() => cls) if (cls.name == 'Arr'):
+						for(field in cls.fields.get()) {
+							if(field.name == 'map') {
+								var expr = field.expr();
+								switch expr.expr {
+									/*
+										{
+											var val = f(this.get);
+											null;
+										}
+									*/
+									case TFunction({expr: {expr: TBlock(exprs)}}):
+										switch exprs[0].expr {
+											// var val = f(this.get);
+											case TVar(_, {expr: TCall({expr: TLocal(_), t: t}, _)}):
+												// type of `f` from expr above
+												switch t {
+													//Should be `Arr.T->map.S`. Before the fix it was `map.S->map.S`
+													case TFun([{t: TInst(_.toString() => 'Arr.T',[])}], _):
+														//success;
+														return;
+													case _:
+														Context.error('Invalid type of "f(get())" in Arr.map: $t', exprs[0].pos);
+												}
+											case _:
+												Context.error('Invalid expression of Arr.map block', exprs[0].pos);
+										}
+									case _:
+										Context.error('Invalid expression of Arr.map', expr.pos);
+								}
+							}
+						}
+					case _:
+				}
+			}
+			Context.error('Class "Arr" was not found', Context.currentPos());
+		});
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8654/compile.hxml b/tests/misc/projects/Issue8654/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..f4688841f2dfdb4834fd2e0913866a5900f71a19
--- /dev/null
+++ b/tests/misc/projects/Issue8654/compile.hxml
@@ -0,0 +1,2 @@
+Arr
+--macro Check.run()
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8677/Main.hx b/tests/misc/projects/Issue8677/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8fe351595bb7e651a13330a02733b142cee37a47
--- /dev/null
+++ b/tests/misc/projects/Issue8677/Main.hx
@@ -0,0 +1,6 @@
+class Main {
+	static function main() {
+		#if (dce > 0)
+		#end
+	}
+}
diff --git a/tests/misc/projects/Issue8677/compile-fail.hxml b/tests/misc/projects/Issue8677/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8677/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8677/compile-fail.hxml.stderr b/tests/misc/projects/Issue8677/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..a215709b8b3c868184f73a14e6cea234235db222
--- /dev/null
+++ b/tests/misc/projects/Issue8677/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: characters 8-15 : Cannot compare string "std" and float 0.
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8697/Main.hx b/tests/misc/projects/Issue8697/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..94222013edec251327c28d91da1b4635e167208a
--- /dev/null
+++ b/tests/misc/projects/Issue8697/Main.hx
@@ -0,0 +1 @@
+typedef Foo = String & {}
diff --git a/tests/misc/projects/Issue8697/Main2.hx b/tests/misc/projects/Issue8697/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..29277f4f9036aa7a71ac4009e67262e478c3e305
--- /dev/null
+++ b/tests/misc/projects/Issue8697/Main2.hx
@@ -0,0 +1,3 @@
+typedef Foo = {
+	> String,
+}
diff --git a/tests/misc/projects/Issue8697/compile-fail.hxml b/tests/misc/projects/Issue8697/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8697/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8697/compile-fail.hxml.stderr b/tests/misc/projects/Issue8697/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..8d2a4dd4f8beb102cf42fbf44d7f0d59f62a180b
--- /dev/null
+++ b/tests/misc/projects/Issue8697/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:1: characters 15-21 : Can only extend structures
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8697/compile2-fail.hxml b/tests/misc/projects/Issue8697/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..04ed12079a9d3bd950f6bd6d602520bae4e4ce4f
--- /dev/null
+++ b/tests/misc/projects/Issue8697/compile2-fail.hxml
@@ -0,0 +1 @@
+-main Main2
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8697/compile2-fail.hxml.stderr b/tests/misc/projects/Issue8697/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1115eb70e42757005e8596be5341ec5fe77bcca0
--- /dev/null
+++ b/tests/misc/projects/Issue8697/compile2-fail.hxml.stderr
@@ -0,0 +1 @@
+Main2.hx:2: characters 4-10 : Can only extend structures
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8704/Main.hx b/tests/misc/projects/Issue8704/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..503ba95132c010f66c546af06942dc41faed506d
--- /dev/null
+++ b/tests/misc/projects/Issue8704/Main.hx
@@ -0,0 +1,10 @@
+class Main {
+	public static function main() {
+		Under.from({});
+	}
+}
+
+abstract Under<T>(T) {
+	@:from public static function from<T>(v):Under<T>
+		return v;
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8704/compile-fail.hxml b/tests/misc/projects/Issue8704/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8704/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8704/compile-fail.hxml.stderr b/tests/misc/projects/Issue8704/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..3fc2b71889a55919755ed868f999ed0ce0113a30
--- /dev/null
+++ b/tests/misc/projects/Issue8704/compile-fail.hxml.stderr
@@ -0,0 +1,2 @@
+Main.hx:3: characters 14-16 : { } should be Under<Unknown<0>>
+Main.hx:3: characters 14-16 : For function argument 'v'
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8705/Main.hx b/tests/misc/projects/Issue8705/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fbb2e6097156a41136372dc96ff7ec0cf1f9892f
--- /dev/null
+++ b/tests/misc/projects/Issue8705/Main.hx
@@ -0,0 +1,12 @@
+class Main {
+	public static function main():Void {
+		testMacro()();
+	}
+
+	static macro function testMacro() {
+		return {
+			expr: EFunction(null, {args: [], expr: macro {}, ret: null}),
+			pos: haxe.macro.Context.currentPos()
+		};
+	}
+}
diff --git a/tests/misc/projects/Issue8705/compile.hxml b/tests/misc/projects/Issue8705/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c098216e78e08cde30049a62b9005ecdee8bccf8
--- /dev/null
+++ b/tests/misc/projects/Issue8705/compile.hxml
@@ -0,0 +1 @@
+Main
diff --git a/tests/misc/projects/Issue8750/Main.hx b/tests/misc/projects/Issue8750/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c23e92e46ac922c0ecba11d6099539c4ac6d0a18
--- /dev/null
+++ b/tests/misc/projects/Issue8750/Main.hx
@@ -0,0 +1,18 @@
+class Main {
+	static function main () {
+		#if !macro
+		define();
+		#end
+	}
+
+	macro static public function define() {
+		haxe.macro.Context.defineType({
+			pack:["hxd","_res"],
+			name:"_Ui_skills",
+			pos:haxe.macro.Context.currentPos(),
+			kind:TDStructure,
+			fields:[]
+		});
+		return macro {};
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8750/compile.hxml b/tests/misc/projects/Issue8750/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..42409e72918a42a82dd3b99f48443419487fab57
--- /dev/null
+++ b/tests/misc/projects/Issue8750/compile.hxml
@@ -0,0 +1 @@
+-main Main
diff --git a/tests/misc/projects/Issue8752/Main.hx b/tests/misc/projects/Issue8752/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1f6de7dd9035484fb8272cef590f3603ea370858
--- /dev/null
+++ b/tests/misc/projects/Issue8752/Main.hx
@@ -0,0 +1,11 @@
+class Main {
+	static function main () {
+		#if !macro
+		define();
+		#end
+	}
+
+	macro static public function define() {
+		return macro $i{""};
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8752/compile-fail.hxml b/tests/misc/projects/Issue8752/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8752/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8752/compile-fail.hxml.stderr b/tests/misc/projects/Issue8752/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..a48953398051cb9202d8e0833cf69283ff445138
--- /dev/null
+++ b/tests/misc/projects/Issue8752/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:9: characters 18-22 : Identifier name must not be empty
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8765/Main.hx b/tests/misc/projects/Issue8765/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e7d3d95fbfb2f1a87805cc5546674efa32efc6bc
--- /dev/null
+++ b/tests/misc/projects/Issue8765/Main.hx
@@ -0,0 +1,7 @@
+class Main {
+	static function main() {}
+}
+
+enum abstract EA(String) {
+	var A = (null : EA);
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8765/compile-fail.hxml b/tests/misc/projects/Issue8765/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8765/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8765/compile-fail.hxml.stderr b/tests/misc/projects/Issue8765/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e661112762a4504d1d01d3013d81f3625fbd32ea
--- /dev/null
+++ b/tests/misc/projects/Issue8765/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:6: characters 10-21 : EA should be String
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8790/Main.hx b/tests/misc/projects/Issue8790/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c6f28cd9fedf0296d29d1d5ec7808b2c41c9a192
--- /dev/null
+++ b/tests/misc/projects/Issue8790/Main.hx
@@ -0,0 +1,18 @@
+class Main {
+	public static function main() {
+		1 + new Int8(1);
+	}
+}
+
+abstract Int8(Int) {
+
+	public inline function new(value:Int) {
+		this = value;
+	}
+
+	@:op(A + B) function addition(b:Int8):Int8;
+
+	@:op(A + B) static function intAddition(a:Int8, b:Int):Int {
+		return b + cast a;
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8790/compile-fail.hxml b/tests/misc/projects/Issue8790/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/Issue8790/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/Issue8790/compile-fail.hxml.stderr b/tests/misc/projects/Issue8790/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c8225475942c372cf33935466d4ea30059756593
--- /dev/null
+++ b/tests/misc/projects/Issue8790/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+Main.hx:3: characters 7-18 : Int8 should be Int
\ No newline at end of file
diff --git a/tests/misc/projects/_semver/InvalidVersion.hx b/tests/misc/projects/_semver/InvalidVersion.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d800d1346c68389abd1fabff94f6ee22036fe494
--- /dev/null
+++ b/tests/misc/projects/_semver/InvalidVersion.hx
@@ -0,0 +1,5 @@
+class InvalidVersion {
+	static function main() {
+		#if (version("wat")) #end
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/_semver/Main.hx b/tests/misc/projects/_semver/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ecc327528d9328022072716f6764ada3fff193b5
--- /dev/null
+++ b/tests/misc/projects/_semver/Main.hx
@@ -0,0 +1,38 @@
+class Main {
+	public static function main():Void {
+		// 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
+
+		#if (version("1.0.0-alpha") < version("1.0.0-alpha.1"))
+		#else #error "Failed semver comparison" #end
+
+		#if (version("1.0.0-alpha.1") < version("1.0.0-alpha.beta"))
+		#else #error "Failed semver comparison" #end
+
+		#if (version("1.0.0-alpha.beta") < version("1.0.0-beta"))
+		#else #error "Failed semver comparison" #end
+
+		#if (version("1.0.0-beta") < version("1.0.0-beta.2"))
+		#else #error "Failed semver comparison" #end
+
+		#if (version("1.0.0-beta.2") < version("1.0.0-beta.11"))
+		#else #error "Failed semver comparison" #end
+
+		#if (version("1.0.0-beta.11") < version("1.0.0-rc.1"))
+		#else #error "Failed semver comparison" #end
+
+		#if (version("1.0.0-rc.1") < version("1.0.0"))
+		#else #error "Failed semver comparison" #end
+
+		#if (version("1.0.0-rc.1") < version("1.0.1"))
+		#else #error "Failed semver comparison" #end
+
+		#if (version("1.0.0-rc.1") < version("1.1.0"))
+		#else #error "Failed semver comparison" #end
+
+		#if (version("1.0.0-rc.1") < version("2.0.0"))
+		#else #error "Failed semver comparison" #end
+
+		#if (version("1.0.0-rc.1") == version("1.0.0-rc.1"))
+		#else #error "Failed semver comparison" #end
+	}
+}
\ No newline at end of file
diff --git a/tests/misc/projects/_semver/compile-fail.hxml b/tests/misc/projects/_semver/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..ab2ee9acaf3224ed3e6fae5e34118b4f429080a3
--- /dev/null
+++ b/tests/misc/projects/_semver/compile-fail.hxml
@@ -0,0 +1 @@
+-main InvalidVersion
\ No newline at end of file
diff --git a/tests/misc/projects/_semver/compile-fail.hxml.stderr b/tests/misc/projects/_semver/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c9f69b3f070afa4099d69476e1ea5abd3bd5196a
--- /dev/null
+++ b/tests/misc/projects/_semver/compile-fail.hxml.stderr
@@ -0,0 +1 @@
+InvalidVersion.hx:3: characters 16-21 : Invalid version string "wat". Should follow SemVer.
\ No newline at end of file
diff --git a/tests/misc/projects/_semver/compile.hxml b/tests/misc/projects/_semver/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/_semver/compile.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/display-package/compile1.hxml b/tests/misc/projects/display-package/compile1.hxml
index ef11ada198e35bd673ea96c9801675a687da6816..182767f97274e873d34ee52e8df5d0368c25afd7 100644
--- a/tests/misc/projects/display-package/compile1.hxml
+++ b/tests/misc/projects/display-package/compile1.hxml
@@ -1,2 +1,2 @@
--cp src
+-p src
 --display src/C1.hx@0@package
diff --git a/tests/misc/projects/display-package/compile2.hxml b/tests/misc/projects/display-package/compile2.hxml
index 8ed15bf57b4d84c79e58dee3b55b5fbed4cb7245..1b26a3950202a4074961cc551d7bcc964dceef58 100644
--- a/tests/misc/projects/display-package/compile2.hxml
+++ b/tests/misc/projects/display-package/compile2.hxml
@@ -1,2 +1,2 @@
--cp src
+-p src
 --display src/pack/C2.hx@0@package
diff --git a/tests/misc/projects/display-type/compile.hxml b/tests/misc/projects/display-type/compile.hxml
index 1fa3d74bdd413f7d7058a83ce3ffbee9fe50755a..6f3b0cbf887e7622d24c02cf6b0c2eb77bae58de 100644
--- a/tests/misc/projects/display-type/compile.hxml
+++ b/tests/misc/projects/display-type/compile.hxml
@@ -1,2 +1,2 @@
--main Main
+--main Main
 --display Main.hx@52@type
diff --git a/tests/misc/projects/display-type/compile.hxml.stderr b/tests/misc/projects/display-type/compile.hxml.stderr
index 062727479eb797edd97c63865d4f99888520c078..dc2afd5e424787c519892aea6c18fb8fe039e30a 100644
--- a/tests/misc/projects/display-type/compile.hxml.stderr
+++ b/tests/misc/projects/display-type/compile.hxml.stderr
@@ -1,3 +1,3 @@
-<type p="$$normPath(::cwd::/Main.hx):1: characters 36-54">
+<type p="$$normPath(::cwd::/Main.hx):1: characters 37-55">
 String
 </type>
\ No newline at end of file
diff --git a/tests/misc/projects/es6/A.hx b/tests/misc/projects/es6/A.hx
new file mode 100644
index 0000000000000000000000000000000000000000..02d840b6b3802113d416c5e71fcfac3c0db66173
--- /dev/null
+++ b/tests/misc/projects/es6/A.hx
@@ -0,0 +1,9 @@
+extern class A {
+	function new(v:Any);
+}
+
+class B extends A {
+	function new() {
+		super(this);
+	}
+}
diff --git a/tests/misc/projects/es6/B.hx b/tests/misc/projects/es6/B.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4ac337d2c507ea7b5bea8a1fa6bca4511dafd493
--- /dev/null
+++ b/tests/misc/projects/es6/B.hx
@@ -0,0 +1,10 @@
+extern class A {
+	function new();
+}
+
+class B extends A {
+	function new() {
+		trace(this);
+		super();
+	}
+}
diff --git a/tests/misc/projects/es6/C.hx b/tests/misc/projects/es6/C.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4b5e554d9c2c09a516a5653401c49478fccdadae
--- /dev/null
+++ b/tests/misc/projects/es6/C.hx
@@ -0,0 +1,7 @@
+extern class A {
+	function new();
+}
+
+class B extends A {
+	var i = 5;
+}
diff --git a/tests/misc/projects/es6/D.hx b/tests/misc/projects/es6/D.hx
new file mode 100644
index 0000000000000000000000000000000000000000..53b7ec6cee2bc4e9a9b0acde93627ffabec58886
--- /dev/null
+++ b/tests/misc/projects/es6/D.hx
@@ -0,0 +1,9 @@
+extern class A {
+	function new();
+}
+
+class B extends A {}
+
+class C extends B {
+	var i = 5;
+}
diff --git a/tests/misc/projects/es6/compile-a-fail.hxml b/tests/misc/projects/es6/compile-a-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..096a06610c6a58c9438f37051657ee881a6bacaf
--- /dev/null
+++ b/tests/misc/projects/es6/compile-a-fail.hxml
@@ -0,0 +1,3 @@
+A
+-js a.js
+-D js-es=6
diff --git a/tests/misc/projects/es6/compile-a-fail.hxml.stderr b/tests/misc/projects/es6/compile-a-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..d00628c429ce8a681d16abe66c6f0551fc16d316
--- /dev/null
+++ b/tests/misc/projects/es6/compile-a-fail.hxml.stderr
@@ -0,0 +1 @@
+A.hx:7: characters 9-13 : Must call `super()` constructor before accessing `this` in classes derived from an extern class with constructor
\ No newline at end of file
diff --git a/tests/misc/projects/es6/compile-b-fail.hxml b/tests/misc/projects/es6/compile-b-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..3af0a93f2a56955e91d8d7a17be098c8e45d8500
--- /dev/null
+++ b/tests/misc/projects/es6/compile-b-fail.hxml
@@ -0,0 +1,3 @@
+B
+-js b.js
+-D js-es=6
diff --git a/tests/misc/projects/es6/compile-b-fail.hxml.stderr b/tests/misc/projects/es6/compile-b-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..79fd23bd34a2ffe4b1fd8156b5200ba57eae41fa
--- /dev/null
+++ b/tests/misc/projects/es6/compile-b-fail.hxml.stderr
@@ -0,0 +1 @@
+B.hx:7: characters 9-13 : Must call `super()` constructor before accessing `this` in classes derived from an extern class with constructor
\ No newline at end of file
diff --git a/tests/misc/projects/es6/compile-c-fail.hxml b/tests/misc/projects/es6/compile-c-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..5feb96ea23eba78c60d1d193936cfdf76f1d13f4
--- /dev/null
+++ b/tests/misc/projects/es6/compile-c-fail.hxml
@@ -0,0 +1,3 @@
+C
+-js c.js
+-D js-es=6
diff --git a/tests/misc/projects/es6/compile-c-fail.hxml.stderr b/tests/misc/projects/es6/compile-c-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..75ba521e89d4025a02761319ad01c0eb1e8c7c7f
--- /dev/null
+++ b/tests/misc/projects/es6/compile-c-fail.hxml.stderr
@@ -0,0 +1 @@
+C.hx:6: characters 2-12 : Must call `super()` constructor before accessing `this` in classes derived from an extern class with constructor
\ No newline at end of file
diff --git a/tests/misc/projects/es6/compile-d-fail.hxml b/tests/misc/projects/es6/compile-d-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..dc957addc8ba9ffa066f707972014e26662d0e9a
--- /dev/null
+++ b/tests/misc/projects/es6/compile-d-fail.hxml
@@ -0,0 +1,3 @@
+D
+-js d.js
+-D js-es=6
diff --git a/tests/misc/projects/es6/compile-d-fail.hxml.stderr b/tests/misc/projects/es6/compile-d-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..f90b6b95fde0f3e7b7917711a59ae9010defc046
--- /dev/null
+++ b/tests/misc/projects/es6/compile-d-fail.hxml.stderr
@@ -0,0 +1 @@
+D.hx:8: characters 2-12 : Must call `super()` constructor before accessing `this` in classes derived from an extern class with constructor
\ No newline at end of file
diff --git a/tests/misc/projects/issue5002/Macro.hx b/tests/misc/projects/issue5002/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..922c5525669eff70a68f692bbf7532ebc9d5b96a
--- /dev/null
+++ b/tests/misc/projects/issue5002/Macro.hx
@@ -0,0 +1,18 @@
+import haxe.macro.Context;
+import haxe.macro.Expr;
+
+class Macro {
+	public static function invalidField():Array<Field> {
+		var fields = Context.getBuildFields();
+		function addField(name:String) {
+			fields.push({
+				name: name,
+				kind: FVar(macro:String, null),
+				pos: Context.currentPos()
+			});
+		}
+		addField("0");
+		addField("this");
+		return fields;
+	}
+}
diff --git a/tests/misc/projects/issue5002/Main.hx b/tests/misc/projects/issue5002/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..95aec96033fd17a2ba69d44fc3a5ca1e3697fb0b
--- /dev/null
+++ b/tests/misc/projects/issue5002/Main.hx
@@ -0,0 +1,4 @@
+@:build(Macro.invalidField())
+class Main {
+	static function main() {}
+}
diff --git a/tests/misc/projects/issue5002/Main2.hx b/tests/misc/projects/issue5002/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..79b3ccadbc27b8e3dae370537df81f2de1b13058
--- /dev/null
+++ b/tests/misc/projects/issue5002/Main2.hx
@@ -0,0 +1,107 @@
+import haxe.macro.Context;
+import haxe.macro.Expr;
+
+class Main2 {
+	static function main() {
+		invalidVariable("0_variable");
+		invalidVariable("var");
+		invalidVariable("new");
+		invalidVariable("foo \"\t\n");
+		invalidCatchVariable();
+		invalidFunctionName();
+		invalidFunctionArgumentName();
+		invalidPatternVariable();
+		invalidForVariable();
+		invalidForVariableKeyValue();
+	}
+
+	static macro function invalidVariable(name:String) {
+		return {
+			expr: EVars([{name: name, type: null, expr: null}]),
+			pos: Context.currentPos()
+		};
+	}
+
+	static macro function invalidCatchVariable() {
+		return {
+			expr: ETry(macro {}, [{name: "0_catchVariable", type: macro:Dynamic, expr: macro {}}]),
+			pos: Context.currentPos()
+		};
+	}
+
+	static macro function invalidFunctionName() {
+		return {
+			expr: EFunction(FNamed("0_function"), {
+				args: [],
+				ret: macro:Void,
+				expr: macro {}
+			}),
+			pos: Context.currentPos()
+		};
+	}
+
+	static macro function invalidFunctionArgumentName() {
+		return {
+			expr: EFunction(FNamed("foo"), {
+				args: [
+					{
+						name: "0_argument",
+						type: macro:Int
+					}
+				],
+				ret: macro:Void,
+				expr: macro {}
+			}),
+			pos: Context.currentPos()
+		};
+	}
+
+	static macro function invalidPatternVariable() {
+		return {
+			expr: ESwitch(macro "", [
+				{
+					values: [
+						{
+							expr: EConst(CIdent("0_patternVariable")),
+							pos: Context.currentPos()
+						}
+					],
+					expr: macro {}
+				}
+			], null),
+			pos: Context.currentPos()
+		};
+	}
+
+	static macro function invalidForVariable() {
+		return {
+			expr: EFor({
+				expr: EBinop(OpIn, {
+					expr: EConst(CIdent("0_forVariable")),
+					pos: Context.currentPos()
+				}, macro []),
+				pos: Context.currentPos()
+			}, macro {}),
+			pos: Context.currentPos()
+		};
+	}
+
+	static macro function invalidForVariableKeyValue() {
+		return {
+			expr: EFor({
+				expr: EBinop(OpIn, {
+					expr: EBinop(OpArrow, {
+						expr: EConst(CIdent("0_forVariableKey")),
+						pos: Context.currentPos()
+					}, {
+						expr: EConst(CIdent("0_forVariableValue")),
+						pos: Context.currentPos()
+					}),
+					pos: Context.currentPos()
+				}, macro new Map()),
+				pos: Context.currentPos()
+			}, macro {}),
+			pos: Context.currentPos()
+		};
+	}
+}
diff --git a/tests/misc/projects/issue5002/Main3.hx b/tests/misc/projects/issue5002/Main3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2b425ceb838e17ae5322a045ecc2cfb869d24fa2
--- /dev/null
+++ b/tests/misc/projects/issue5002/Main3.hx
@@ -0,0 +1,22 @@
+import haxe.macro.Context;
+
+class Main3 {
+	static function init() {
+		function defineType(name, kind) {
+			Context.defineType({
+				pack: [],
+				name: name,
+				pos: (macro 0).pos,
+				kind: kind,
+				fields: []
+			});
+		}
+
+		defineType("lowercase", TDClass());
+
+		defineType("0_class", TDClass());
+		defineType("0_enum", TDEnum);
+		defineType("0_struct", TDStructure);
+		defineType("0_abstract", TDAbstract(TPath({pack: [], name: "Int"})));
+	}
+}
diff --git a/tests/misc/projects/issue5002/Main4.hx b/tests/misc/projects/issue5002/Main4.hx
new file mode 100644
index 0000000000000000000000000000000000000000..431c3c88a60671178fec9935ced941d53f4ddc1d
--- /dev/null
+++ b/tests/misc/projects/issue5002/Main4.hx
@@ -0,0 +1,13 @@
+class Main4 {
+	static function main() {
+		var $i:Int;
+
+		try {} catch ($i:Int) {}
+
+		for ($i in 0...10) {}
+
+		switch "" {
+			case $i:
+		}
+	}
+}
diff --git a/tests/misc/projects/issue5002/compile-fail.hxml b/tests/misc/projects/issue5002/compile-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdb2c3f8e660623abdf6e845a4ee42927aa7163
--- /dev/null
+++ b/tests/misc/projects/issue5002/compile-fail.hxml
@@ -0,0 +1 @@
+-main Main
\ No newline at end of file
diff --git a/tests/misc/projects/issue5002/compile-fail.hxml.stderr b/tests/misc/projects/issue5002/compile-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1de0af27a49ad7a692634b4a5b717b0be2e3f9e9
--- /dev/null
+++ b/tests/misc/projects/issue5002/compile-fail.hxml.stderr
@@ -0,0 +1,4 @@
+Main.hx:1: characters 1-8 : "0" is not a valid field name
+Main.hx:2: lines 2-4 : Defined in this class
+Main.hx:1: characters 1-8 : "this" is not a valid field name
+Main.hx:2: lines 2-4 : Defined in this class
\ No newline at end of file
diff --git a/tests/misc/projects/issue5002/compile2-fail.hxml b/tests/misc/projects/issue5002/compile2-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..04ed12079a9d3bd950f6bd6d602520bae4e4ce4f
--- /dev/null
+++ b/tests/misc/projects/issue5002/compile2-fail.hxml
@@ -0,0 +1 @@
+-main Main2
\ No newline at end of file
diff --git a/tests/misc/projects/issue5002/compile2-fail.hxml.stderr b/tests/misc/projects/issue5002/compile2-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c66dc08ca2e487327dd0d1ce0d396015b1fe1b1d
--- /dev/null
+++ b/tests/misc/projects/issue5002/compile2-fail.hxml.stderr
@@ -0,0 +1,18 @@
+"0_variable" is not a valid variable name
+Main2.hx:6: characters 3-32 : Called from macro here
+"var" is not a valid variable name
+Main2.hx:7: characters 3-25 : Called from macro here
+"new" is not a valid variable name
+Main2.hx:8: characters 3-25 : Called from macro here
+"foo \"\t\n" is not a valid variable name
+Main2.hx:9: characters 3-32 : Called from macro here
+"0_catchVariable" is not a valid catch variable name
+Main2.hx:10: characters 3-25 : Called from macro here
+"0_function" is not a valid function name
+Main2.hx:11: characters 3-24 : Called from macro here
+"0_argument" is not a valid function argument name
+Main2.hx:12: characters 3-32 : Called from macro here
+Main2.hx:13: characters 3-27 : Pattern variables must be lower-case
+Main2.hx:14: characters 3-23 : "0_forVariable" is not a valid for variable name
+Main2.hx:15: characters 3-31 : "0_forVariableKey" is not a valid for variable name
+Main2.hx:15: characters 3-31 : "0_forVariableValue" is not a valid for variable name
\ No newline at end of file
diff --git a/tests/misc/projects/issue5002/compile3-fail.hxml b/tests/misc/projects/issue5002/compile3-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..67a72a209b1f279687373e228f65941682d34e2f
--- /dev/null
+++ b/tests/misc/projects/issue5002/compile3-fail.hxml
@@ -0,0 +1 @@
+--macro Main3.init()
\ No newline at end of file
diff --git a/tests/misc/projects/issue5002/compile3-fail.hxml.stderr b/tests/misc/projects/issue5002/compile3-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..f48bd84f0d6cac898b1fbd5c36e3665ee3242e2b
--- /dev/null
+++ b/tests/misc/projects/issue5002/compile3-fail.hxml.stderr
@@ -0,0 +1,6 @@
+Main3.hx:9: characters 17-18 : Module name should start with an uppercase letter: "lowercase"
+Main3.hx:9: characters 17-18 : "0_class" is not a valid module name
+Main3.hx:9: characters 17-18 : "0_enum" is not a valid module name
+Main3.hx:9: characters 17-18 : "0_struct" is not a valid module name
+Main3.hx:9: characters 17-18 : "0_abstract_Impl_" is not a valid type name
+Main3.hx:9: characters 17-18 : "0_abstract" is not a valid module name
\ No newline at end of file
diff --git a/tests/misc/projects/issue5002/compile4-fail.hxml b/tests/misc/projects/issue5002/compile4-fail.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..fe54655f9c1b7ae8bd5e224b4dcbb774dd8c3c4b
--- /dev/null
+++ b/tests/misc/projects/issue5002/compile4-fail.hxml
@@ -0,0 +1 @@
+-main Main4
\ No newline at end of file
diff --git a/tests/misc/projects/issue5002/compile4-fail.hxml.stderr b/tests/misc/projects/issue5002/compile4-fail.hxml.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e63d04adf4eb84f2611c62d387e7448ebed9ab9b
--- /dev/null
+++ b/tests/misc/projects/issue5002/compile4-fail.hxml.stderr
@@ -0,0 +1,4 @@
+Main4.hx:3: characters 7-9 : Variable names starting with a dollar are not allowed: "$i"
+Main4.hx:5: characters 17-19 : Catch variable names starting with a dollar are not allowed: "$i"
+Main4.hx:7: characters 8-10 : For variable names starting with a dollar are not allowed: "$i"
+Main4.hx:10: characters 9-11 : Pattern variables must be lower-case
\ No newline at end of file
diff --git a/tests/misc/projects/Issue4218/Main.hx b/tests/misc/python/projects/Issue4218/Main.hx
similarity index 100%
rename from tests/misc/projects/Issue4218/Main.hx
rename to tests/misc/python/projects/Issue4218/Main.hx
diff --git a/tests/misc/python/projects/Issue4218/build.hxml b/tests/misc/python/projects/Issue4218/build.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..3a593a6c7ad7243318cebfe9bfc62710f6dbc8ab
--- /dev/null
+++ b/tests/misc/python/projects/Issue4218/build.hxml
@@ -0,0 +1,3 @@
+-python Test.py
+--main Main
+-cmd python3 Test.py
\ No newline at end of file
diff --git a/tests/misc/python/projects/Issue8542/Main.hx b/tests/misc/python/projects/Issue8542/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..738f9d71a23105164cfc178770f4cc58a25cfd53
--- /dev/null
+++ b/tests/misc/python/projects/Issue8542/Main.hx
@@ -0,0 +1,9 @@
+class Main {
+	public function new(e:E = E.Ea) {}
+
+	public static function main(){}
+}
+
+enum E {
+	Ea;
+}
\ No newline at end of file
diff --git a/tests/misc/python/projects/Issue8542/build.hxml b/tests/misc/python/projects/Issue8542/build.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..c6ddcc3b78ed777e6f8dd0ff656933265d538724
--- /dev/null
+++ b/tests/misc/python/projects/Issue8542/build.hxml
@@ -0,0 +1,3 @@
+-python bin/test.py
+--main Main
+-cmd python3 bin/test.py
\ No newline at end of file
diff --git a/tests/misc/pythonImport/Main.hx b/tests/misc/python/pythonImport/Main.hx
similarity index 67%
rename from tests/misc/pythonImport/Main.hx
rename to tests/misc/python/pythonImport/Main.hx
index 6d72af2edc16b4f3ed9f8277c543cf31ed6edb52..a7bcf39af02cbfa8a75438dcb5f35d1667ed1db2 100644
--- a/tests/misc/pythonImport/Main.hx
+++ b/tests/misc/python/pythonImport/Main.hx
@@ -1,3 +1,5 @@
+import utest.Assert;
+
 @:pythonImport("native_python.sample", "A")
 extern class ExternClass {
     function new();
@@ -24,18 +26,18 @@ extern class InexistantExtern2 {}
 @:pythonImport("inexistant", ignoreError=true)
 extern class InexistantExtern3 {}
 
-class Main extends haxe.unit.TestCase {
+class Main extends utest.Test {
 
     function testExtern() {
-        assertEquals(new ExternClass().f(1), 2);
-        assertEquals(new ExternNestedClass().f(1), 3);
-        assertEquals(ExternModule.f(1), 4);
+        Assert.equals(new ExternClass().f(1), 2);
+        Assert.equals(new ExternNestedClass().f(1), 3);
+        Assert.equals(ExternModule.f(1), 4);
     }
 
     static function main() {
-        var runner = new haxe.unit.TestRunner();
-        runner.add(new Main());
-        var code = runner.run() ? 0 : 1;
-        Sys.exit(code);
+        var runner = new utest.Runner();
+        runner.addCase(new Main());
+		utest.ui.Report.create(runner);
+		runner.run();
     }
 }
diff --git a/tests/misc/python/pythonImport/compile.hxml b/tests/misc/python/pythonImport/compile.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..bb4f92f3ba384e97cc32bd562090261812fa9d36
--- /dev/null
+++ b/tests/misc/python/pythonImport/compile.hxml
@@ -0,0 +1,3 @@
+--main Main
+-python test.py
+-lib utest
\ No newline at end of file
diff --git a/tests/misc/python/pythonImport/native_python/__init__.py b/tests/misc/python/pythonImport/native_python/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/misc/python/pythonImport/native_python/__pycache__/__init__.cpython-36.pyc b/tests/misc/python/pythonImport/native_python/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f2fd5f7775c8f4db3cb82d35b02591dec2c7db3b
Binary files /dev/null and b/tests/misc/python/pythonImport/native_python/__pycache__/__init__.cpython-36.pyc differ
diff --git a/tests/misc/python/pythonImport/native_python/__pycache__/__init__.pypy3-24.pyc b/tests/misc/python/pythonImport/native_python/__pycache__/__init__.pypy3-24.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2cb4929736ef11e212eac2d272c556f5b6b24bb3
Binary files /dev/null and b/tests/misc/python/pythonImport/native_python/__pycache__/__init__.pypy3-24.pyc differ
diff --git a/tests/misc/python/pythonImport/native_python/__pycache__/sample.cpython-36.pyc b/tests/misc/python/pythonImport/native_python/__pycache__/sample.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4bda2e449791bcd27c351cb2241787660d2ed892
Binary files /dev/null and b/tests/misc/python/pythonImport/native_python/__pycache__/sample.cpython-36.pyc differ
diff --git a/tests/misc/python/pythonImport/native_python/__pycache__/sample.pypy3-24.pyc b/tests/misc/python/pythonImport/native_python/__pycache__/sample.pypy3-24.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..21cf2e262102fb5130f6e2d49030058862686f5f
Binary files /dev/null and b/tests/misc/python/pythonImport/native_python/__pycache__/sample.pypy3-24.pyc differ
diff --git a/tests/misc/pythonImport/native_python/sample.py b/tests/misc/python/pythonImport/native_python/sample.py
similarity index 100%
rename from tests/misc/pythonImport/native_python/sample.py
rename to tests/misc/python/pythonImport/native_python/sample.py
diff --git a/tests/misc/python/run.hxml b/tests/misc/python/run.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b72a6e8015f79b90f1a33b56ffd247f513c52a0d
--- /dev/null
+++ b/tests/misc/python/run.hxml
@@ -0,0 +1,2 @@
+-cp ../src
+--run Main
\ No newline at end of file
diff --git a/tests/misc/pythonImport/compile.hxml b/tests/misc/pythonImport/compile.hxml
deleted file mode 100644
index 37cfa71cdeb474562145b0f81900577e3061f3c4..0000000000000000000000000000000000000000
--- a/tests/misc/pythonImport/compile.hxml
+++ /dev/null
@@ -1,2 +0,0 @@
--main Main
--python test.py
diff --git a/tests/misc/src/Main.hx b/tests/misc/src/Main.hx
index bcd169249dd31461ae66c244f6b318fa4165bee8..38621a80de66de19815ed2b979a1e011411c639f 100644
--- a/tests/misc/src/Main.hx
+++ b/tests/misc/src/Main.hx
@@ -1,13 +1,13 @@
+import haxe.macro.Compiler;
 import sys.FileSystem;
 import sys.io.File;
 import haxe.io.Path;
-import haxe.macro.Expr;
 
 using StringTools;
 
 typedef Result = {
-	count: Int,
-	failures: Int
+	count:Int,
+	failures:Int
 }
 
 class Main {
@@ -17,17 +17,22 @@ class Main {
 		Sys.exit(result.failures);
 	}
 
-	macro static public function compileProjects():ExprOf<Result> {
+	static public function compileProjects():Result {
 		var count = 0;
 		var failures = 0;
-		var filter = haxe.macro.Context.definedValue("MISC_TEST_FILTER");
+		var filter = Compiler.getDefine("MISC_TEST_FILTER");
 		var filterRegex = filter == null ? ~/.*/ : new EReg(filter, "");
 		function browse(dirPath) {
 			var dir = FileSystem.readDirectory(dirPath);
+			dir.sort(Reflect.compare);
 			for (file in dir) {
 				var path = Path.join([dirPath, file]);
 				if (FileSystem.isDirectory(path)) {
-					browse(path);
+					if (path.endsWith('.disabled')) {
+						Sys.println('Skipping $path');
+					} else {
+						browse(path);
+					}
 				} else if (file.endsWith(".hxml") && !file.endsWith("-each.hxml") && filterRegex.match(path)) {
 					var old = Sys.getCwd();
 					Sys.setCwd(dirPath);
@@ -44,12 +49,10 @@ class Main {
 			}
 		}
 		browse("projects");
-		return macro $v{
-			{
-				count: $v{count},
-				failures: $v{failures}
-			}
-		};
+		return {
+			count: count,
+			failures: failures
+		}
 	}
 
 	static function prepareExpectedOutput(s:String):String {
@@ -63,9 +66,8 @@ class Main {
 		return new haxe.Template(s).execute(context, macros);
 	}
 
-	static function normPath(resolve, p:String, properCase = false):String {
-		if (Sys.systemName() == "Windows")
-		{
+	static function normPath(_, p:String, properCase = false):String {
+		if (Sys.systemName() == "Windows") {
 			// on windows, haxe returns lowercase paths with backslashes, drive letter uppercased
 			p = p.substr(0, 1).toUpperCase() + p.substr(1);
 			p = p.replace("/", "\\");
@@ -76,10 +78,24 @@ class Main {
 	}
 
 	static function runCommand(command:String, args:Array<String>, expectFailure:Bool, expectStderr:String) {
+		#if timeout
+		switch Sys.systemName() {
+			case 'Linux':
+				args.unshift(command);
+				args.unshift(Compiler.getDefine('timeout'));
+				command = 'timeout';
+			case _:
+				throw 'Running tests with timeout is not implemented for this OS';
+		}
+		#end
 		var proc = new sys.io.Process(command, args);
 		var stdout = proc.stdout.readAll();
 		var exit = proc.exitCode();
 		var success = exit == 0;
+		// 124 - exit code of linux `timeout` command in case it actually timed out
+		if (exit == 124) {
+			Sys.println('Timeout. No response in ${Compiler.getDefine('timeout')} seconds.');
+		}
 		var result = switch [success, expectFailure] {
 			case [true, false]:
 				true;
@@ -98,11 +114,9 @@ class Main {
 			Sys.println(stdout);
 		}
 
-		if (result && expectStderr != null)
-		{
+		if (result && expectStderr != null) {
 			var stderr = proc.stderr.readAll().toString().replace("\r\n", "\n").trim();
-			if (stderr != expectStderr.trim())
-			{
+			if (stderr != expectStderr.trim()) {
 				Sys.println("Actual stderr output doesn't match the expected one");
 				Sys.println('Expected:\n"$expectStderr"');
 				Sys.println('Actual:\n"$stderr"');
@@ -111,6 +125,5 @@ class Main {
 		}
 		proc.close();
 		return result;
-
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/misc/weakmap/compile-cs.hxml b/tests/misc/weakmap/compile-cs.hxml
index a61eda9060334efde648c14581609a4a5071ba7b..5bb7d71bae9b8f29128cbd987bd9f36d319f8303 100644
--- a/tests/misc/weakmap/compile-cs.hxml
+++ b/tests/misc/weakmap/compile-cs.hxml
@@ -1,3 +1,3 @@
--main TestWeakMap
+--main TestWeakMap
 -cs cs
--debug
+--debug
diff --git a/tests/misc/weakmap/compile-java.hxml b/tests/misc/weakmap/compile-java.hxml
index 331a80a5bdce787fe0995229104f0f6c56f70987..f1f3a6cfdb9300982212c7d193da226cf1b53dde 100644
--- a/tests/misc/weakmap/compile-java.hxml
+++ b/tests/misc/weakmap/compile-java.hxml
@@ -1,2 +1,2 @@
--main TestWeakMap
+--main TestWeakMap
 -java java
diff --git a/tests/nullsafety/src/Validator.hx b/tests/nullsafety/src/Validator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..23d835b44dc82365690b1f08cf90d11aba23d595
--- /dev/null
+++ b/tests/nullsafety/src/Validator.hx
@@ -0,0 +1,89 @@
+#if macro
+import haxe.macro.Context;
+import haxe.macro.Expr;
+
+typedef SafetyMessage = {msg:String, pos:Position}
+typedef ExpectedMessage = {symbol:String, pos:Position}
+#end
+
+class Validator {
+#if macro
+	static var expectedErrors:Array<ExpectedMessage> = [];
+
+	static dynamic function onNullSafetyReport(callback:(errors:Array<SafetyMessage>)->Void):Void {
+	}
+
+	static public function register() {
+		expectedErrors = [];
+		onNullSafetyReport = @:privateAccess Context.load("on_null_safety_report", 1);
+		onNullSafetyReport(validate);
+	}
+
+	static public function checkFields():Array<Field> {
+		for(field in Context.getBuildFields()) {
+			for(meta in field.meta) {
+				if(meta.name == ':shouldFail') {
+					expectedErrors.push({symbol: field.name, pos:field.pos});
+					break;
+				}
+			}
+		}
+		return null;
+	}
+
+	static function validate(errors:Array<SafetyMessage>) {
+		var errors = check(expectedErrors.copy(), errors.copy());
+		if(errors.ok) {
+			Sys.println('${errors.passed} expected errors spotted');
+			Sys.println('Compile-time tests passed.');
+		} else {
+			Context.error('Tests failed with ${errors.failed} failures. See warnings.', Context.currentPos());
+		}
+	}
+
+	static function check(expected:Array<ExpectedMessage>, actual:Array<SafetyMessage>):{ok:Bool, passed:Int, failed:Int} {
+		var passed = 0;
+		var i = 0;
+		while(i < actual.length) {
+			var actualEvent = actual[i];
+			var wasExpected = false;
+			for(expectedEvent in expected) {
+				if(posContains(expectedEvent.pos, actualEvent.pos)) {
+					expected.remove(expectedEvent);
+					wasExpected = true;
+					break;
+				}
+			}
+			if(wasExpected) {
+				actual.remove(actualEvent);
+				++passed;
+			} else {
+				++i;
+			}
+		}
+		actual.reverse();
+		for(event in actual) {
+			Context.warning(event.msg, event.pos);
+		}
+		for(event in expected) {
+			Context.warning('${event.symbol} was expected to fail, but it did not fail.', event.pos);
+		}
+		return {
+			ok: actual.length == 0 && expected.length == 0,
+			passed: passed,
+			failed: actual.length + expected.length
+		}
+	}
+
+	static function posContains(pos:Position, subPos:Position):Bool {
+		var infos = Context.getPosInfos(pos);
+		var subInfos = Context.getPosInfos(subPos);
+		return infos.file == subInfos.file && infos.min <= subInfos.min && infos.max >= subInfos.max;
+	}
+#end
+
+	macro static public function shouldFail(expr:Expr):Expr {
+		expectedErrors.push({symbol:Context.getLocalMethod(), pos:expr.pos});
+		return expr;
+	}
+}
\ No newline at end of file
diff --git a/tests/nullsafety/src/cases/TestAbstract.hx b/tests/nullsafety/src/cases/TestAbstract.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9692b511a718e0ca2591aa8eac970998b110e7a5
--- /dev/null
+++ b/tests/nullsafety/src/cases/TestAbstract.hx
@@ -0,0 +1,8 @@
+package cases;
+
+@:nullSafety
+abstract TestAbstract(Null<Float>) from Null<Float> to Null<Float> {
+	public inline function testThis() {
+		Validator.shouldFail(var f:Float = this);
+	}
+}
\ No newline at end of file
diff --git a/tests/nullsafety/src/cases/TestLoose.hx b/tests/nullsafety/src/cases/TestLoose.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2be8f7cbaa34295988d9476159f07f8e08545551
--- /dev/null
+++ b/tests/nullsafety/src/cases/TestLoose.hx
@@ -0,0 +1,102 @@
+package cases;
+
+import Validator.shouldFail;
+
+class TestLoose {
+	static var staticVar:Null<String>;
+	var instanceVar:Null<String>;
+
+	function mutate(o:{field:Null<String>}) {
+		o.field = null;
+	}
+
+	function possibleMutation_shouldPass(o:{field:Null<String>}) {
+		if(o.field != null) {
+			mutate(o);
+			var notNullable:String = o.field;
+		}
+	}
+
+	static function staticNullableField_checkedForNull() {
+		if (staticVar != null) {
+			var s:String = staticVar;
+		}
+		shouldFail(var s:String = staticVar);
+	}
+
+	function instanceNullableField_checkedForNull() {
+		if (instanceVar != null) {
+			var s:String = instanceVar;
+		}
+		shouldFail(var s:String = instanceVar);
+	}
+
+	function explicitMutation_shouldFail(o:{field:Null<String>}) {
+		if(o.field != null) {
+			o = {field:null};
+			shouldFail(var notNullable:String = o.field);
+		}
+	}
+
+	function nullable_assignNotNull_shouldPass(o:{field:Null<String>}) {
+		o.field = 'hello';
+		var notNullable:String = o.field;
+	}
+
+	function safeExpr_assignNull_shouldFail(o:{field:Null<String>}) {
+		if(o.field != null) {
+			o.field = null;
+			shouldFail(var notNullable:String = o.field);
+		}
+	}
+
+	function nestedField_checkedNotNull_shouldPass(o:{o2:{field:Null<String>}}) {
+		if(o.o2.field != null) {
+			var notNullable:String = o.o2.field;
+		}
+	}
+
+	function checkedAgainstNullInLocalFunction_shouldPass(?callback:()->Void) {
+		function bar() {
+			if (callback != null) {
+				callback();
+			}
+		}
+		bar();
+	}
+
+	static var struct:Null<{foo:String}>;
+
+	static function checkAgainstNull_checkAndFieldAccess() {
+		struct == null
+			|| struct.foo != ""
+			|| struct.foo != "";
+		struct != null
+			&& struct.foo != ""
+			&& struct.foo != "";
+	}
+
+	static function safeNullable_capturedInLocalFunction_shouldPass(?a:String) {
+		if(a == null) {
+			return;
+		}
+		var fn = function():String {
+			return a;
+		}
+	}
+
+	static function testIssue8442() {
+		function from(array: Array<Float>) {
+			return array.length;
+		}
+
+		function create(?array: Array<Float>) {
+			return from(shouldFail(array));
+			// haxe seems to think this unused null check means array is non-nullable
+			if (array != null) {
+			} else {
+				return -1;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/nullsafety/src/cases/TestSafeFieldInUnsafeClass.hx b/tests/nullsafety/src/cases/TestSafeFieldInUnsafeClass.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e6640bec0dbfacbec33d5d473c8c95edffe70d94
--- /dev/null
+++ b/tests/nullsafety/src/cases/TestSafeFieldInUnsafeClass.hx
@@ -0,0 +1,9 @@
+package cases;
+
+@:build(Validator.checkFields())
+class TestSafeFieldInUnsafeClass {
+	@:nullSafety
+	static public function shouldFail(?a:String) {
+		Validator.shouldFail(var s:String = a);
+	}
+}
\ No newline at end of file
diff --git a/tests/nullsafety/src/cases/TestStrict.hx b/tests/nullsafety/src/cases/TestStrict.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5357c13df3202d028afd47e33e14582279ef518e
--- /dev/null
+++ b/tests/nullsafety/src/cases/TestStrict.hx
@@ -0,0 +1,942 @@
+package cases;
+
+import Validator.shouldFail;
+
+private enum DummyEnum {
+	DummyOne;
+	DummyTwo(a:Int, ?b:String);
+}
+
+typedef TWrap<T> = T;
+
+abstract AWrap<T>(T) from T to T {
+	function abstracts_shouldBeChecked(?a:String) {
+		shouldFail(var s:String = a);
+	}
+}
+
+class Generic<T> {
+	public var value:T;
+	public function new(value:T) {
+		this.value = value;
+	}
+}
+
+typedef AnonAsClass = {
+	var ?optional:String;
+}
+
+typedef AnonAsStruct = {
+	?optional:String
+}
+
+/** Test `@:nullSafety(Off)` is respected on fields */
+class UnsafeFields {
+	@:nullSafety(Off) var unsafeVar:String = null;
+	@:nullSafety(Off) var notInitializedField:String;
+
+	@:nullSafety(Off)
+	static function unsafeMethod() {
+		var s:String = null;
+	}
+
+	static function unsafeExpr() {
+		var s:String;
+		@:nullSafety(Off) cast(null, String);
+	}
+
+	var str(get,set):String;
+	@:nullSafety(Off) function get_str() return (null:Null<String>);
+	@:nullSafety(Off) function set_str(v) return (v:Null<String>);
+}
+
+/** Test `@:nullSafety(Off)` is respected on a class */
+@:nullSafety(Off)
+class UnsafeClass {
+	var uninitializedVar:String;
+
+	public function new() {
+		doStuff(this); //pass this somewhere before all fields are initialized
+	}
+
+	function doStuff(t:UnsafeClass) {}
+}
+
+/** Test `@:nullSafety(Off)` on a constructor. And that it does not disable safety checks for instance vars */
+@:build(Validator.checkFields())
+class UnsafeConstructor {
+	@:shouldFail var uninitializedVar:String;
+
+	@:nullSafety(Off)
+	public function new() {
+		var s:String = null;
+	}
+}
+
+@:build(Validator.checkFields())
+private class TestWithoutConstructor {
+	@:shouldFail var notInitializedField:String;
+}
+
+class AllVarsInitializedInConstructor_weHaveClosure_thisShouldBeUsable {
+	var v:Int;
+
+	/**
+	 * This is generated like:
+	 * ```haxe
+	 * var _gthis = this; //problems come from here
+	 * this.v = 42;
+	 * var f = function() {
+	 * 		return _gthis.v;
+	 * }
+	 * ```
+	 */
+	public function new() {
+		v = 42;
+		var f = function() return this.v;
+	}
+}
+
+@:build(Validator.checkFields())
+class TestStrict {
+	public var field:Null<String>;
+	// @:shouldWarn public var publiclyModifiableField:String = 'hello';
+	@:shouldFail var notInitializedField:Int;
+	@:shouldFail var notInitializedProperty(default,null):Float;
+	@:shouldFail @:isVar var notInitializedIsVar(get,set):String;
+	@:shouldFail var initializedWithNullable:String = null;
+	function get_notInitializedIsVar() return notInitializedIsVar;
+	function set_notInitializedIsVar(v) return notInitializedIsVar = v;
+	var notReal(get,never):Int;
+	function get_notReal() return 42;
+
+	var initialized:Bool = false;
+	var initializedInConstructor:String;
+	var initializedInAllBranchesOfConstructor:String;
+	@:shouldFail var initializedInSomeBranchesOfConstructor:String;
+
+	var str(get,set):String;
+	function get_str() {
+		shouldFail(return (null:Null<String>));
+	}
+	function set_str(v) {
+		shouldFail(return (v:Null<String>));
+	}
+
+	/**
+	 *  Null safety should work in __init__ functions
+	 */
+	static function __init__() {
+		var s:Null<String> = null;
+		shouldFail(s.length);
+	}
+
+	static public function main() {
+	}
+
+	/**
+	 *  Null safety should work in constructors
+	 */
+	public function new(a:String) {
+		if(Std.random(2) == 0) {
+			initializedInSomeBranchesOfConstructor = 'hello';
+			initializedInAllBranchesOfConstructor = 'hello';
+		} else {
+			initializedInAllBranchesOfConstructor = 'hello';
+		}
+		shouldFail(acceptThis(this));
+		@:nullSafety(Off) acceptThis(this);
+		var self = this;
+		shouldFail(acceptThis(self));
+		shouldFail(instanceMethod());
+		var closure = shouldFail(instanceMethod);
+		var notInitializedYet = shouldFail(initializedInConstructor);
+		initializedInConstructor = 'hello';
+		var s:Null<String> = null;
+		shouldFail(s.length);
+	}
+
+	static function acceptThis(t:TestStrict) {}
+
+	function instanceMethod() {}
+
+	static function fieldAccess_onNullableValue_shouldFail():Void {
+		var a:Null<String> = null;
+		shouldFail(a.length);
+	}
+
+	static function fieldAccess_onNullableValueInIfCondition_shouldFail():Void {
+		var a:Null<String> = null;
+		shouldFail(if(a.length == 0) {});
+	}
+
+	static function fieldAccess_onNotNullableValue_shouldPass():Void {
+		var a:String = "hello";
+		a.length;
+	}
+
+	static function fieldAccess_onOptionalNullableValue_shouldFail(a:String = null, ?b:String):Void {
+		shouldFail(a.length);
+		shouldFail(b.length);
+	}
+
+	static function fieldAccess_onOptionalNotNullableValue_shouldPass(a:String = 'hello'):Void {
+		a.length;
+	}
+
+	static function call_onNullableValue_shouldFail() {
+		var fn:Null<Void->Void> = null;
+		shouldFail(fn());
+	}
+
+	static function call_onNotNullableValue_shouldPass() {
+		var fn:Void->Void = function() {}
+		fn();
+	}
+
+	static function call_nullableValueToNotNullableArgument_shouldFail() {
+		var fn = function(a:String) {}
+		var v:Null<String> = null;
+		shouldFail(fn(v));
+	}
+
+	static function call_nullableValueToOptionalArgument_shouldPass() {
+		var fn = function(?a:Int) {}
+		var v:Null<Int> = null;
+		fn(v);
+	}
+
+	static public function new_nullableValueToNotNullableArgument_shouldFail(?v:String) {
+		shouldFail(new TestStrict(v));
+	}
+
+	static public function new_nullableValueToNotNullableGenericArg_shouldFail(?n:String) {
+		shouldFail(new Generic<String>(n));
+	}
+
+	static public function new_nullableValueToNullableGenericArg_shouldPass(?n:String) {
+		new Generic(n);
+	}
+
+	static function varDecl_assignNullableValueToNotNullableVar_shouldFail() {
+		var v:Null<String> = null;
+		shouldFail(var s:String = v);
+		shouldFail(var s:String = null);
+	}
+
+	static function assign_nullableValueToNotNullable_shouldFail() {
+		var a:Null<Int> = null;
+		var b = 10;
+		shouldFail(b = a);
+	}
+
+	static function assign_notNullableValueToNullable_shouldPass() {
+		var a:Null<Int> = null;
+		var b = 10;
+		a = b;
+	}
+
+	static function assign_safeValueToAnotherNullable_shouldInferSafety() {
+		var s:Null<String> = null;
+		var n;
+		n = (s == null ? "hello" : s);
+		var t:String = n;
+	}
+
+	static function binop_withNullableValue_shouldFail() {
+		var a:Null<Int> = null;
+		var b = 10;
+		shouldFail(a + b);
+	}
+
+	static function binop_comparisonWithNullableValue_shouldPass() {
+		var a:Null<Int> = null;
+		var b = 10;
+		a == b;
+		a != b;
+	}
+
+	static function unop_nullableValue_shouldFail() {
+		var a:Null<Int> = null;
+		shouldFail(a++);
+	}
+
+	static function ternary_nullableElse_assignToNotNullableValue_shouldFail() {
+		var v:Null<String> = null;
+		var a:String;
+		shouldFail((true ? 'hello' : v).length);
+	}
+
+	static function ternary_returnedFromInlinedFunction_shouldPass() {
+		var str:String = inlinedNullableSafeString([null]);
+	}
+
+	static inline function inlinedNullableSafeString(nullables:Array<Null<String>>):String {
+		var s = nullables[0];
+		return (s != null ? s : 'hello' );
+	}
+
+	static function arrayAccess_nullableArray_shouldFail() {
+		var a:Null<Array<Int>> = null;
+		shouldFail(a[0]);
+	}
+
+	static function arrayAccess_usingNullableIndex_shouldFail() {
+		var a:Array<Int> = [0];
+		var idx:Null<Int> = null;
+		shouldFail(a[idx]);
+	}
+
+	static function if_nullableCondition_shouldFail() {
+		var s:Null<Bool> = null;
+		shouldFail(if(s) {});
+	}
+
+	static function typeInference_arrayAccess_fieldOnNullableItem_shouldFail() {
+		var a:Array<Null<String>> = [];
+		shouldFail(a[0].length);
+	}
+
+	static function typeInference_assignNullableValueToVariableWithoutExplicitTyping_shouldPass(nullable:String = null) {
+		var s = nullable;
+	}
+
+	static function typeInference_fieldAccessOnInferredNullableType_shouldFail(nullable:Null<String>) {
+		var s = nullable;
+		shouldFail(s.length);
+	}
+
+	static var notNullableSetter(default,set):String = 'hello';
+	static function set_notNullableSetter(v) return notNullableSetter = v;
+	static function setter_passNullableValueToNotNullableSetter_shouldFail(?v:String) {
+		shouldFail(notNullableSetter = v);
+	}
+
+	static function checkAgainstNull_transferSafeNullableLocalToNotNullable_shouldPass(?a:String) {
+		var s:String;
+		if(a == null) {} else s = a;
+		if(null == a) {} else s = a;
+		if(a != null) s = a;
+		if(!(a == null)) s = a;
+		if(!(a == null || a == a)) a.charAt(0);
+		if(null != a) s = a;
+		s = (a == null ? 'hello' : a);
+		s = (null == a ? 'hello' : a);
+		s = (a != null ? a : 'hello');
+		s = (null != a ? a : 'hello');
+		s = if(a == null) {
+			'hello';
+		} else {
+			'other expressions';
+			a;
+		}
+	}
+
+	static function checkAgainstNull_safeNullableLocalToNotNullableAfterModification(?a:String) {
+		var s:String;
+		if(a != null) {
+			a = 'hello'; //not nullable expr
+			s = a;
+			if(Std.random(2) > 0) {
+				var arr = [null, 'hello'];
+				a = arr[0]; //nullable expr
+			}
+			shouldFail(s = a);
+		}
+	}
+
+	static function checkAgainstNull_checkAndFieldAccess(?a:String, ?s:String) {
+		if(s != null && s.length == 0) {}
+		if(s == null || s.length == 0) {}
+		s != null
+			&& s.length == 0
+			&& s.length == 0;
+		s == null
+			|| s.length == 0
+			|| s.length == 0;
+		!(s == null || a == null) && s.length == a.length;
+
+		shouldFail(if(s != null || s.length == 0) {});
+		shouldFail(if(s == null && s.length == 0) {});
+		shouldFail(s != null || s.length == 0);
+		shouldFail(s == null && s.length == 0);
+	}
+
+	static function checkedAgainstNotNullableValue(?a:String) {
+		var s = 'world';
+		if(a == s) {
+			a.charAt(0);
+		} else {
+			shouldFail(a.charAt(0));
+		}
+		// if(a != s) {
+		// 	shouldFail(a.charAt(0));
+		// } else {
+		// 	a.charAt(0);
+		// }
+	}
+
+	static function checkedAgainstNull_nullifiedAfterCheck_shouldFail(?a:String) {
+		if(a != null) {
+			a = null;
+			shouldFail(var s:String = a);
+		}
+	}
+
+	static function checkAgainstNull_checkOutsideLoop_shouldStaySafeInLoop(?a:String) {
+		if(a != null) {
+			for(i in 0...Std.random(10)) {
+				var s:String = a;
+			}
+		}
+	}
+
+	static function checkAgainstNull_checkInLoop(?a:String) {
+		var s:String;
+		for(i in 0...Std.random(10)) {
+			shouldFail(s = a);
+			if(a != null) {
+				s = a;
+			}
+			shouldFail(s = a);
+		}
+	}
+
+	static function checkAgainstNull_checkOutsideLoopAndChangedToNullableInside_shouldBeUnsafeFromBeginningOfLoop(?a:String) {
+		if(a != null) {
+			for(i in 0...Std.random(10)) {
+				shouldFail(var s:String = a);
+				a = null;
+			}
+		}
+	}
+
+	static function checkedAgainstNull_checkedInClosure_shouldFail(?a:String) {
+		function local() {
+			if(a != null) {
+				shouldFail(var s:String = a);
+			}
+		}
+	}
+
+	static function checkedAgainstNullAfterClosure_usedButNotModifiedInClosure_shouldPass(?a:String) {
+		function local() {
+			var c = a;
+		}
+		if(a != null) {
+			var s:String = a;
+		}
+	}
+
+	static function checkedAgainstNullAfterClosure_modifiedToNullableInClosure_shouldFail(?a:String) {
+		function local() {
+			a = null;
+		}
+		if(a != null) {
+			shouldFail(var s:String = a);
+		}
+	}
+
+	static function checkedAgainstNull_modifiedInClosureInLoop_shouldBecomeNeverSafe(?a:String) {
+		for(i in 0...Std.random(10)) {
+			trace(_ -> a = null);
+		}
+		if(a != null) {
+			shouldFail(var s:String = a);
+		}
+	}
+
+	static function checkedAgainstNull_modifiedInNestedClosure_shouldBecomeNeverSafe(?a:String) {
+		trace(() -> () -> a = null);
+		if(a != null) {
+			shouldFail(var s:String = a);
+		}
+	}
+
+	static function checkAgainstNull_complexConditions() {
+		var nullable:Null<String> = null;
+		var s:String;
+		if(nullable != null && true) {
+			s = nullable;
+		} else {
+			shouldFail(s = nullable);
+		}
+		if(Std.random(2) == 1 && null == nullable) {
+			shouldFail(s = nullable);
+		} else {
+			shouldFail(s = nullable);
+		}
+		if(Std.random(2) == 1 || null == nullable) {
+			shouldFail(s = nullable);
+		} else {
+			s = nullable;
+		}
+		if(true || nullable != null) {
+			shouldFail(s = nullable);
+		} else {
+			shouldFail(s = nullable);
+		}
+	}
+
+	static function checkAgainstNull_deadEndIfNull_shouldPassAfterCheckedBlock(?a:String, ?b:String) {
+		if(a == null) {
+			return;
+		}
+		//function execution will continue only if `a` is not null
+		var s:String = a;
+
+		if(b != null) {
+		} else {
+			throw "Dead end";
+		}
+		//function execution will continue only if `b` is not null
+		var s:String = b;
+	}
+
+	static function checkAgainstNull_deadEndOfLoop_shouldPassAfterCheckedBlock(?a:String, ?b:String) {
+		var s:String;
+		while(Std.random(2) == 1) {
+			shouldFail(s = a);
+			if(a == null) continue;
+			s = a;
+
+			shouldFail(s = b);
+			if(b == null) break;
+			s = b;
+		}
+	}
+
+	static public function checkAgainstNul_deadEndIfAnyIsNull_shouldPass(?a:String, ?b:String) {
+		if (a == null || b == null) {
+			return;
+		}
+
+		a.length + b.length;
+	}
+
+	public function checkAgainstNul_deadEndIfNullOrAnotherCondition_shouldPass() : Void {
+		var s : Null<String> = ((Math.random() > 0.5) ? "A" : null);
+
+		if (s == null || s.length == 42) {
+			return;
+		}
+
+		s.length;
+	}
+
+	static function checkAgainstNull_valueBecomesSafeInIf_shouldStaySafe(?a:String) {
+		if(a == null) {
+			a = 'hello';
+		}
+		var s:String = a;
+	}
+
+	static function return_nullableValueFromNotNullableResult_shouldFail(?a:String):String {
+		function local():String {
+			shouldFail(return a);
+		}
+		shouldFail(return a);
+	}
+
+	static function objectDecl_fieldsExpressions_shouldBeChecked(?a:String) {
+		var s:String;
+		var o = {
+			field: shouldFail(s = a)
+		}
+	}
+
+	static function for_iterateOverNullableValue_shouldFail(?a:Iterable<Int>) {
+		for(i in shouldFail(a)) {}
+	}
+
+	static function while_nullableCondition_shouldFail(?a:Bool) {
+		shouldFail(while(a) {});
+	}
+
+	static function while_checkAgainstNullInConditionAndUseInBody(?a:Bool) {
+		var b:Bool;
+		while(a != null) b = a;
+		do shouldFail(b = a) while(a != null);
+		while(a == null) shouldFail(b = a);
+	}
+
+	static function while_checkAgainstNullInConditionAndReassignInBody(?a:{value:String, ?parent:Dynamic}) {
+		while (a != null) {
+			var s:String = a.value;
+			a = a.parent;
+			shouldFail(a.value);
+		}
+
+		do {
+			a = shouldFail(a.parent);
+		} while (a != null);
+
+		a = {value:'hello', parent:null};
+		do {
+			var s:String = a.value;
+			a = a.parent;
+			shouldFail(a.value);
+		} while (a != null);
+
+		shouldFail(a.value);
+	}
+
+	static function throw_nullableValue_shouldFail() {
+		var s:Null<String> = null;
+		shouldFail(throw s);
+	}
+
+	static function arrayDeclaration_shouldCheck(?a:String) {
+		var s:String;
+		shouldFail(([s = a]:Array<Null<String>>));
+	}
+
+	static function arrayDeclaration_nullableItemInNotNullableArray_shouldFail(?s:String, ?i:Int) {
+		var arr:Array<String>;
+		shouldFail(arr = ['', s, '']);
+		function local(a:Array<Int>)
+		([1, shouldFail(i)]:Array<Int>);
+	}
+
+	static function tryCatch_shouldCheck(?a:String) {
+		var s:String;
+		try {
+			shouldFail(s = a);
+		} catch(e:Dynamic) {
+			shouldFail(s = a);
+		}
+	}
+
+	static function cast_nullableExprToNotNullableType_shouldFail() {
+		var s:Null<String> = null;
+		shouldFail((s:String));
+		shouldFail(cast(s, String));
+	}
+
+	static function untypedCast_shouldPass() {
+		var n:Null<String> = null;
+		var s:String = cast n;
+	}
+
+	static function enum_switchOnNullableEnum_shouldFail(e:Null<DummyEnum>) {
+		switch shouldFail(e) {
+			case DummyOne:
+			case DummyTwo(a, b):
+		}
+	}
+
+	static function unification_typeOfNullableToTypeOfNotNullable_shouldFail(?a:Int) {
+		var withNullables = [1, a, 2];
+		shouldFail(var notNullables:Array<Int> = withNullables);
+		var withNullables = [a => 1, 2 => 3];
+		shouldFail(var notNullables:Map<Int,Int> = withNullables);
+	}
+
+	static function objectDecl_passObjWithNullabelFieldToObjWithNotNullableField_shouldFail(?a:String) {
+		shouldFail(var o:{field:String} = {field:a});
+		shouldFail(o = new TestStrict('')); //Test has `field:Null<String>`
+		var arr = (['', a]:Array<Null<String>>);
+		shouldFail(var q:{field:Array<String>} = {field:arr});
+		shouldFail(var v:{value:Array<String>} = new Generic(arr));
+	}
+
+	static function closure_whichReturnsWithoutExplicitType_shouldPass(s:String) {
+		return
+			function() {
+				return s;
+			};
+	}
+
+	static function switch_onNullableValue() {
+		var nullable:Null<String> = null;
+		var s:String;
+
+		switch(nullable) {
+			case null:
+				shouldFail(s = nullable);
+			case _:
+				s = nullable;
+		};
+
+		switch(nullable) {
+			case v if(Std.random(2) == 1):
+				shouldFail(s = v);
+				shouldFail(s = nullable);
+			case null:
+				shouldFail(s = nullable);
+			case v if(Std.random(2) == 1):
+				s = v;
+				s = nullable;
+			case v:
+				s = v;
+				s = nullable;
+		}
+	}
+
+	static function anonymousObjects() {
+		var o:AnonAsClass = {};
+		shouldFail(var s:String = o.optional);
+		var o:AnonAsStruct = {};
+		shouldFail(var s:String = o.optional);
+	}
+
+	static function safetyInference_safeValueAssignedToNullable_shouldBecomeSafe(?a:String, ?b:String) {
+		a = 'hello';
+		var s:String = a;
+		var n:Null<String> = 'world';
+		s = n;
+	}
+
+	static function safetyInference_safeValueAssignedToNullableInAllBranches_shouldStaySafe(?a:String, ?b:String) {
+		if(Std.random(2) == 1) {
+			a = 'hello';
+		} else {
+			a = 'world';
+		}
+		var s:String = a;
+	}
+
+	static function closure_returnsSomethingAndMethodReturnsNullable_shouldPass():Null<String> {
+		function local() return 10;
+		return null;
+	}
+
+	static function functionWithNotNullableArg_toFunctionWithNullableArg_shouldFail() {
+		var fn = function(s:String):Void {}
+		var nullable = function(s:Null<String>):Void {}
+		shouldFail(nullable = fn);
+
+		var fn = function(a:Array<String>):Void {}
+		var nullable = function(a:Array<Null<String>>):Void {}
+		shouldFail(nullable = fn);
+
+		var fn = function(o:{field:String}):Void {}
+		var nullable = function(o:{field:Null<String>}):Void {}
+		shouldFail(nullable = fn);
+	}
+
+	static function functionWithNullableArg_toFunctionWithNotNullableArg_shouldPass() {
+		var fn = function(s:String):Void {}
+		var nullable = function(s:Null<String>):Void {}
+		fn = nullable;
+	}
+
+	static function functionWithNullableResult_toFunctionWithNotNullableResult_shouldFail() {
+		var fn = function():String return '';
+		var nullable = function():Null<String> return null;
+		shouldFail(fn = nullable);
+	}
+
+	static function functionWithNotNullableResult_toFunctionWithNullableResult_shouldPass() {
+		var fn = function():String return '';
+		var nullable = function():Null<String> return null;
+		nullable = fn;
+	}
+
+	static function functionWithNullableReturnType_toVoidFunction_shouldPass() {
+		var n:Void->Null<String> = () -> null;
+		var f:Void->Void = n;
+	}
+
+	static public function tryBlock_couldNotBeDeadEndForOuterBlock() {
+		var c:Null<String> = null;
+		try {
+			if (c == null) {
+				throw "null";
+			}
+			c.charAt(0);
+		} catch (e:Dynamic) {
+			shouldFail(c.charAt(0));
+		}
+	}
+
+	var foo:Null<String>;
+	public function localNamedFunction_shouldPass() {
+		function cb() {
+			if(foo != null) {
+				cb();
+			}
+		}
+	}
+
+	static public function closure_immediatelyExecuted_shouldInheritSafety(?s:String) {
+		if(s != null) {
+			[1, 2, 3].map(i -> i * s.length);
+			pureMeta(() -> s.length);
+			notPureButImmediatelyExecutes(() -> s.length);
+			immediatelyExecutesTwoLevelsDeep(() -> s.length);
+			pureMeta(function() {
+				shouldFail(s.charAt(0));
+				s = null;
+				return shouldFail(s.length);
+			});
+			pureMeta(() -> shouldFail(s.length));
+			shouldFail(s.charAt(0));
+		}
+	}
+	@:pure
+	static function pureMeta(cb:()->Int) return cb();
+	static var tmp1:Int = Std.random(10);
+	static function notPureButImmediatelyExecutes(cb:()->Int) {
+		if(tmp1 < 5) tmp1 = cb();
+		for(i in 0...cb()) tmp1 += cb();
+	}
+	static function immediatelyExecutesTwoLevelsDeep(cb:()->Int) {
+		notPureButImmediatelyExecutes(cb);
+	}
+
+	static public function closure_storedSomewhere_shouldFail(?s:String) {
+		if(s != null) {
+			passesSomewhereElse(() -> shouldFail(s.length));
+			storesSomewhere(() -> shouldFail(s.length));
+		}
+	}
+	static function passesSomewhereElse(cb:()->Int) {
+		haxe.Timer.delay(cb, 1);
+	}
+	static var tmp2:Null<()->Int> = null;
+	static function storesSomewhere(cb:()->Int) {
+		tmp2 = cb;
+	}
+
+	static function closure_passedToRecursiveFunction_shouldNotCrashTheCompiler(?a:String) {
+		if(a != null) {
+			recursive(() -> a.length);
+		}
+	}
+	static function recursive(cb:Void->Int) {
+		if(Std.random(10) == 0) {
+			recursive(cb);
+		} else {
+			cb();
+		}
+	}
+
+	static function closure_passedToOverriddenMethod(?a:String) {
+		var o:Parent = new Child();
+		if(a != null) {
+			cast(o, Child).childExecute(() -> a.length);
+			o.execute(() -> shouldFail(a.length));
+		}
+	}
+
+	static function recursiveTypedef_shouldNotCrashTheCompiler(a:Recursive<Void>, b:Recursive<Void>) {
+		a = b;
+	}
+
+	function nonFinalField_shouldFail(o:{field:Null<String>}) {
+		if(o.field != null) {
+			shouldFail(var notNullable:String = o.field);
+		}
+	}
+
+	static function anonFinalNullableField_checkedForNull() {
+		var o:{ final ?f:String; } = {};
+		if (o.f != null) {
+			var s:String = o.f;
+			o = {};
+			shouldFail(var s:String = o.f);
+		}
+	}
+
+	static function staticFinalNullableField_checkedForNull() {
+		if (FinalNullableFields.staticVar != null) {
+			var s:String = FinalNullableFields.staticVar;
+		}
+		shouldFail(var s:String = FinalNullableFields.staticVar);
+	}
+
+	static function return_assignNonNullable_shouldPass(?n:String):String {
+		return n = 'hello';
+	}
+
+	static function stringConcat_shouldPass(?a:String) {
+		'hello, ' + a;
+		a += 'hello';
+	}
+
+	static function stringConcat_twoNullables_shouldFail(?a:String, ?b:String) {
+		shouldFail(a + b);
+		shouldFail(a += b);
+	}
+
+	static function anonFields_checkedForNull() {
+		var i:Null<Int> = null;
+		shouldFail(({a: i} : {a:Int}));
+		if (i != null) {
+			({a: i} : {a:Int});
+			({a: i} : {a:Null<Int>});
+			({a: 0, b: i} : {a:Int, b: Int});
+		}
+	}
+
+	static function immediateFunction_keepsSafety(?s:String) {
+		if (s != null) {
+			(function() s.length)();
+		}
+	}
+
+	static function issue8122_abstractOnTopOfNullable() {
+		var x:NullFloat = null;
+		var y:Float = x.val();
+		x += x;
+	}
+
+	static function issue8443_nullPassedToInline_shouldPass() {
+		inline function method(?map: (Int)->Int) {
+			return map != null ? map(0) : -1;
+		}
+
+		var x:Int = method();
+	}
+
+	static function issue7900_trace() {
+		var x:Null<()->String> = null;
+		trace(x);
+		trace("hi", x);
+		trace("hi", shouldFail(x()));
+	}
+}
+
+private class FinalNullableFields {
+	static public final staticVar:Null<String> = "hello";
+	public final instanceVar:Null<String> = "world";
+
+	function instanceFinalNullableField_checkedForNull() {
+		if (instanceVar != null) {
+			var s:String = instanceVar;
+		}
+		shouldFail(var s:String = instanceVar);
+	}
+}
+
+typedef Recursive<T1> = {
+	public function rec<T2>(a:Recursive<T1>):Recursive<T2>;
+}
+
+// @see https://github.com/HaxeFoundation/haxe/issues/7733
+// class RecClass<T1> {
+// 	public function rec<T2>(a:Recursive<T1>):Recursive<T2> return a;
+// }
+
+private class Parent {
+	public function new() {}
+
+	public function execute(cb:()->Void) cb();
+}
+
+private class Child extends Parent {
+	static var tmp:Any = '';
+	override public function execute(cb:()->Void) tmp = cb;
+	public function childExecute(cb:()->Void) cb();
+}
+
+abstract NullFloat(Null<Float>) from Null<Float> to Null<Float> {
+	public inline function val(): Float {
+		return this != null ? this : 0.0;
+	}
+
+	@:op(A + B) static inline function addOp1(lhs: NullFloat, rhs: Float): Float {
+		return lhs != null ? lhs.val() + rhs : rhs;
+	}
+}
\ No newline at end of file
diff --git a/tests/nullsafety/test-js-es6.hxml b/tests/nullsafety/test-js-es6.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..af9b270bdcc8c648fd3646277ffded83b02cf05a
--- /dev/null
+++ b/tests/nullsafety/test-js-es6.hxml
@@ -0,0 +1,3 @@
+test.hxml
+-js bin/test-es6.js
+-D js-es=6
\ No newline at end of file
diff --git a/tests/nullsafety/test.hxml b/tests/nullsafety/test.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..5131c11c4fe8271d641adba8ee2b0cb4ca2e6329
--- /dev/null
+++ b/tests/nullsafety/test.hxml
@@ -0,0 +1,10 @@
+-cp src
+-D analyzer-optimize
+cases.TestStrict
+cases.TestLoose
+cases.TestSafeFieldInUnsafeClass
+cases.TestAbstract
+
+--macro nullSafety('cases.TestStrict', Strict)
+--macro nullSafety('cases.TestLoose', Loose)
+--macro Validator.register()
\ No newline at end of file
diff --git a/tests/optimization/run.hxml b/tests/optimization/run.hxml
index 5792d910fcfbeb443abf9b9346ce348d999d673e..2195f94f3398bb2ae60631d4350b0fd8741e791c 100644
--- a/tests/optimization/run.hxml
+++ b/tests/optimization/run.hxml
@@ -1,13 +1,13 @@
--cp src
+-p src
 -D analyzer-optimize
 -D analyzer-user-var-fusion
 --each
 
--main TestAnalyzer
+--main TestAnalyzer
 --interp
 
 --next
--main TestNullChecker
+--main TestNullChecker
 -D analyzer-check-null
 --interp
 
@@ -17,4 +17,4 @@
 --macro Macro.register('TestJs')
 --macro Macro.register('TestLocalDce')
 --macro Macro.register('issues')
--dce std
\ No newline at end of file
+--dce std
\ No newline at end of file
diff --git a/tests/optimization/src/Macro.hx b/tests/optimization/src/Macro.hx
index 408ad22c8455f130d6907dab6a08824f7af01068..ca8b99d0e02a289e0a333ae5ff23eaa22084bd2c 100644
--- a/tests/optimization/src/Macro.hx
+++ b/tests/optimization/src/Macro.hx
@@ -6,8 +6,8 @@ using StringTools;
 
 class Macro {
 	static var classes = [];
-	static var output;
-	static var lines;
+	static var output:String;
+	static var lines:Array<String>;
 	static var tests = 0;
 	static var failures = 0;
 
diff --git a/tests/optimization/src/Test.hx b/tests/optimization/src/Test.hx
index 153e91d097331d197055bb3bfe5aeedd155acaa2..f1f52bc7da7f70a1e83fdaf296a6ea501b0a9f83 100644
--- a/tests/optimization/src/Test.hx
+++ b/tests/optimization/src/Test.hx
@@ -8,7 +8,7 @@ class InlineCtor {
 	}
 }
 
-@:enum abstract MyEnum(String) to String {
+enum abstract MyEnum(String) to String {
 	var A = "a";
 }
 
@@ -33,9 +33,8 @@ class Test {
 	}
 
 	@:js('
-		var c_y;
 		var c_x = 12;
-		c_y = "foo";
+		var c_y = "foo";
 		var x = 12;
 		c_x = 13;
 		x = 13;
@@ -51,12 +50,10 @@ class Test {
 
 	@:js('
 		var a = 0;
-		var c_y;
-		var c_x;
 		a = 1;
 		a = 2;
-		c_x = 12;
-		c_y = "foo";
+		var c_x = 12;
+		var c_y = "foo";
 		a = 12;
 	')
 	static function testInlineCtor2() {
@@ -71,14 +68,11 @@ class Test {
 
 	@:js('
 		var a = 0;
-		var b_y;
-		var b_x;
-		var c_y;
 		var c_x = 1;
-		c_y = "c";
+		var c_y = "c";
 		a = 1;
-		b_x = 2;
-		b_y = "b";
+		var b_x = 2;
+		var b_y = "b";
 		b_x = 1;
 	')
 	static function testInlineCtor3() {
@@ -92,10 +86,8 @@ class Test {
 	}
 
 	@:js('
-		var x_foo;
-		var x_bar;
-		x_foo = 1;
-		x_bar = 2;
+		var x_foo = 1;
+		var x_bar = 2;
 		var y = 1;
 		var z = 2;
 	')
diff --git a/tests/optimization/src/TestAnalyzer.hx b/tests/optimization/src/TestAnalyzer.hx
index 80749638310bcb3ac99867cd1d77de7bb2bdcd4d..2e6bfb6943972f64214402f5cd6f17dd6a553206 100644
--- a/tests/optimization/src/TestAnalyzer.hx
+++ b/tests/optimization/src/TestAnalyzer.hx
@@ -738,7 +738,7 @@ class TestAnalyzer extends TestBase {
 		assertEqualsConst("A", fromCharCode);
 
 		var enumIndex = Type.enumIndex(eBreak);
-		assertEqualsConst(20, enumIndex);
+		assertEqualsConst(19, enumIndex);
 	}
 
 	function testWhilePrune1() {
diff --git a/tests/optimization/src/TestJs.hx b/tests/optimization/src/TestJs.hx
index e49b1df741c86091f6dd660d7d67587eb4b25ae4..52cc8449e5ab6545817bbb59c69607916537ec43 100644
--- a/tests/optimization/src/TestJs.hx
+++ b/tests/optimization/src/TestJs.hx
@@ -1,3 +1,5 @@
+import haxe.ds.List;
+
 private enum Tree<T> {
 	Node(l:Tree<T>, r:Tree<T>);
 	Leaf(v:T);
@@ -38,13 +40,13 @@ class TestJs {
 	//Std.string(x);
 	//}
 
-	@:js("var a = new List();var _g_head = a.h;while(_g_head != null) _g_head = _g_head.next;")
+	@:js("var a = new haxe_ds_List();var _g_head = a.h;while(_g_head != null) _g_head = _g_head.next;")
 	static function testListIteratorInline() {
 		var a = new List();
 		for (v in a) { }
 	}
 
-	@:js('var a = 1;var v2 = a;if(a + v2 > 0) {TestJs["use"](a);}')
+	@:js('var a = 1;var v2 = a;if(a + v2 > 0) {TestJs.use(a);}')
 	@:analyzer(no_const_propagation)
 	@:analyzer(no_copy_propagation)
 	@:analyzer(no_local_dce)
@@ -60,7 +62,7 @@ class TestJs {
 		return v + v2;
 	}
 
-	@:js("var a = [];var tmp;try {tmp = a[0];} catch( e ) {tmp = null;}tmp;")
+	@:js("var a = [];var tmp;try {tmp = a[0];} catch( e ) {((e) instanceof js__$Boot_HaxeError);tmp = null;}tmp;")
 	@:analyzer(no_local_dce)
 	static function testInlineWithComplexExpr() {
 		var a = [];
@@ -71,7 +73,7 @@ class TestJs {
 		return try a[i] catch (e:Dynamic) null;
 	}
 
-	@:js("var a = { v : [{ b : 1}]};a;a.v.length == 1 && a.v[0].b == 1;")
+	@:js("var a_v_0_b = 1;a_v_0_b;")
 	@:analyzer(no_const_propagation, no_local_dce)
 	static function testDeepMatchingWithoutClosures() {
 		var a = {v: [{b: 1}]};
@@ -82,29 +84,29 @@ class TestJs {
 		}) {}
 	}
 
-	@:js("var a = [1,2,3];var _g = 0;while(_g < a.length) {var v = a[_g];++_g;console.log(v + 2);}")
+	@:js('var a = [1,2,3];var _g = 0;while(_g < a.length) {var v = a[_g];++_g;TestJs.use(v + 2);}')
 	static function testInlineFunctionWithAnonymousCallback() {
 		var a = [1,2,3];
 		inline function forEach(f) for (v in a) f(v);
-		forEach(function(x) trace(x + 2));
+		forEach(function(x) use(x + 2));
 	}
 
-	@:js('var a = "";var e;var _hx_tmp = a.toLowerCase();if(_hx_tmp == "e") {e = 0;} else {throw new Error();}')
+	@:js('var a = "";var e;if(a.toLowerCase() == "e") {e = 0;} else {throw new Error();}')
 	@:analyzer(no_const_propagation, no_local_dce, no_copy_propagation)
 	static function testRValueSwitchWithExtractors() {
 		var a = "";
 		var e = switch (a) {
 			case _.toLowerCase() => "e": 0;
-			default: throw new js.Error();
+			default: throw new js.lib.Error();
 		}
 	}
 
-	@:js('console.log("1" + "2" + "3" + "4");')
+	@:js('TestJs.use("1" + "2" + "3" + "4");')
 	static function testEnumValuePropagation1() {
 		var n = Node(Node(Leaf("1"), Node(Leaf("2"), Leaf("3"))), Leaf("4"));
 		switch (n) {
 			case Node(Node(Leaf(s1), Node(Leaf(s2), Leaf(s3))), Leaf(s4)):
-				trace(s1 + s2 + s3 + s4);
+				use(s1 + s2 + s3 + s4);
 			case _:
 		}
 	}
@@ -123,7 +125,7 @@ class TestJs {
 
 	@:js('
 		var object = { "hello" : "world"};
-		TestJs["use"](object);
+		TestJs.use(object);
 	')
 	static function testQuotedStructureFields1() {
 		var object = {
@@ -134,7 +136,7 @@ class TestJs {
 
 	@:js('
 		var object = { "hello" : "world", world : "hello", "another" : "quote"};
-		TestJs["use"](object);
+		TestJs.use(object);
 	')
 	static function testQuotedStructureFields2() {
 		var object = {
@@ -147,7 +149,7 @@ class TestJs {
 
 	@:js('
 		var object = { "\'" : "world"};
-		TestJs["use"](object);
+		TestJs.use(object);
 	')
 	static function testQuotedStructureFields3() {
 		var object = {
@@ -170,18 +172,27 @@ class TestJs {
 		try throw false catch (e:Dynamic) {}
 	}
 
-	@:js("try {throw new js__$Boot_HaxeError(false);} catch( e ) {if (e instanceof js__$Boot_HaxeError) e = e.val;console.log(e);}")
+	@:js('try {throw new js__$Boot_HaxeError(false);} catch( e ) {TestJs.use(((e) instanceof js__$Boot_HaxeError) ? e.val : e);}')
 	static function testHaxeErrorUnwrappingWhenUsed() {
-		try throw false catch (e:Dynamic) trace(e);
+		try throw false catch (e:Dynamic) use(e);
 	}
 
-	@:js("try {throw new js__$Boot_HaxeError(false);} catch( e ) {if (e instanceof js__$Boot_HaxeError) e = e.val;if( js_Boot.__instanceof(e,Bool) ) {} else throw(e);}")
+	@:js('try {throw new js__$Boot_HaxeError(false);} catch( e ) {if(typeof(((e) instanceof js__$Boot_HaxeError) ? e.val : e) != "boolean") {throw e;}}')
 	static function testHaxeErrorUnwrappingWhenTypeChecked() {
 		try throw false catch (e:Bool) {};
 	}
 
+	@:js('try {throw new js__$Boot_HaxeError(false);} catch( e ) {if(typeof(((e) instanceof js__$Boot_HaxeError) ? e.val : e) == "boolean") {TestJs.use(e);} else {throw e;}}')
+	static function testGetOriginalException() {
+		try throw false catch (e:Bool) use(js.Lib.getOriginalException());
+	}
 
-	@:js('TestJs["use"](2);')
+	@:js('try {throw new js__$Boot_HaxeError(false);} catch( e ) {if(typeof(((e) instanceof js__$Boot_HaxeError) ? e.val : e) == "boolean") {throw e;} else {throw e;}}')
+	static function testRethrow() {
+		try throw false catch (e:Bool) js.Lib.rethrow();
+	}
+
+	@:js('TestJs.use(2);')
 	static function testIssue3938() {
 		var a = 1;
 		if (a == 1) {
@@ -193,7 +204,7 @@ class TestJs {
 	}
 
 	@:js('
-		TestJs["use"](3);
+		TestJs.use(3);
 	')
 	static function testBinop() {
 		var a = 1;
@@ -202,17 +213,17 @@ class TestJs {
 	}
 
 	@:js('
-		TestJs["use"](false);
-		TestJs["use"](true);
-		TestJs["use"](true);
-		TestJs["use"](true);
-		TestJs["use"](false);
-		TestJs["use"](true);
-		TestJs["use"](true);
-		TestJs["use"](false);
-		TestJs["use"](false);
-		TestJs["use"](true);
-		TestJs["use"](false);
+		TestJs.use(false);
+		TestJs.use(true);
+		TestJs.use(true);
+		TestJs.use(true);
+		TestJs.use(false);
+		TestJs.use(true);
+		TestJs.use(true);
+		TestJs.use(false);
+		TestJs.use(false);
+		TestJs.use(true);
+		TestJs.use(false);
 	')
 	static function testEnumValueFlags() {
 		var flags = new haxe.EnumFlags();
@@ -240,7 +251,7 @@ class TestJs {
 	@:js('
 		var map = new haxe_ds_StringMap();
 		if(__map_reserved["some"] != null) {map.setReserved("some",2);} else {map.h["some"] = 2;}
-		TestJs["use"](2);
+		TestJs.use(2);
 	')
 	static function testIssue4731() {
 		var map = new Map();
@@ -277,9 +288,7 @@ class TestJs {
 
 	@:js('
 		var x = TestJs.getInt();
-		var x1 = x;
-		++x;
-		TestJs.call(x1,TestJs.getInt());
+		TestJs.call(x++,TestJs.getInt());
 	')
 	static function testMightBeAffected3() {
 		var x = getInt();
@@ -298,8 +307,8 @@ class TestJs {
 		if(Math.random() < 0.5) {
 			b = "hello";
 		}
-		TestJs["use"](a);
-		TestJs["use"](b);
+		TestJs.use(a);
+		TestJs.use(b);
 	')
 	static function testIssue4739() {
 		var a = 0;
@@ -316,7 +325,7 @@ class TestJs {
 
 	@:js('
 		var a = TestJs.getInt();
-		TestJs["use"](a);
+		TestJs.use(a);
 	')
 	static function testCopyPropagation1() {
 		var a = getInt();
@@ -328,7 +337,7 @@ class TestJs {
 		var a = TestJs.getInt();
 		var b = a;
 		a = TestJs.getInt();
-		TestJs["use"](b);
+		TestJs.use(b);
 	')
 	static function testCopyPropagation2() {
 		var a = getInt();
@@ -339,7 +348,7 @@ class TestJs {
 
 	//@:js('
 		//var b = TestJs.getInt();
-		//TestJs["use"](b);
+		//TestJs.use(b);
 	//')
 	//static function testCopyPropagation3() {
 		//var a;
@@ -368,14 +377,14 @@ class TestJs {
 
 	@:js('
 		var d1 = TestJs.intField;
-		TestJs.call(TestJs["use"](null),d1);
+		TestJs.call(TestJs.use(null),d1);
 	')
 	static function testInlineRebuilding1() {
 		inlineCall(intField, use(null));
 	}
 
 	@:js('
-		TestJs.call(TestJs["use"](null),TestJs.stringField);
+		TestJs.call(TestJs.use(null),TestJs.stringField);
 	')
 	static function testInlineRebuilding2() {
 		inlineCall(stringField, use(null));
@@ -461,7 +470,7 @@ class TestJs {
 
 	@:js('
 		var i = 5;
-		while(--i >= 0) TestJs["use"](i);
+		while(--i >= 0) TestJs.use(i);
 	')
 	static function testPrefixRebuilding() {
 		var i:Int = 5;
@@ -478,16 +487,24 @@ class TestJs {
 	@:pure(false)
 	static function call(d1:Dynamic, d2:Dynamic) { return d1; }
 	@:pure(false)
-	static function use<T>(t:T) { return t; }
+	static public function use<T>(t:T) { return t; }
 
 	static var intField = 12;
 	static var stringField(default, never) = "foo";
 
+	#if js_enums_as_arrays
 	@:js('
-		var _g = Type["typeof"]("");
+		var _g = Type.typeof("");
 		var v = _g[1] == 6 && _g[2] == String;
-		TestJs["use"](v);
+		TestJs.use(v);
 	')
+	#else
+	@:js('
+		var _g = Type.typeof("");
+		var v = _g._hx_index == 6 && _g.c == String;
+		TestJs.use(v);
+	')
+	#end
 	static function testIssue4745() {
 		var o = "";
 		var v = Type.typeof(o).match(TClass(String));
@@ -497,13 +514,13 @@ class TestJs {
 	@:js('
 		var e = { };
 		e["a"] = 30;
-		console.log(e);
+		TestJs.use(e);
 	')
 	@:analyzer(user_var_fusion)
 	static function testIssue4948() {
 		var e = new haxe.DynamicAccess();
 		e["a"] = 30;
-		trace(e);
+		use(e);
 	}
 
 
@@ -523,8 +540,30 @@ class TestJs {
 		var closure = Extern.test;
 		closure("baz");
 	}
+
+	static var v = false;
+
+	@:js('')
+	static function testIssue7874() {
+		if (v && v) {}
+	}
+
+	@:js('')
+	static function testIssue8751() {
+		(2:Issue8751Int) * 3;
+	}
 }
 
 extern class Extern {
 	static public function test(e:haxe.extern.AsVar<String>):Void;
+}
+
+abstract Issue8751Int(Int) from Int {
+	@:op(A * B) static public inline function add(a:Issue8751Int, b:Issue8751Int):Issue8751Int {
+		return a.toInt() * b.toInt();
+	}
+
+	inline public function toInt():Int {
+		return this;
+	}
 }
\ No newline at end of file
diff --git a/tests/optimization/src/TestLocalDce.hx b/tests/optimization/src/TestLocalDce.hx
index a3baad93ed338feaf20e40f25af441bd3a941297..d4afd9df478191b3c1c46bac36b6655e569f8991 100644
--- a/tests/optimization/src/TestLocalDce.hx
+++ b/tests/optimization/src/TestLocalDce.hx
@@ -1,3 +1,5 @@
+import TestJs.use;
+
 private class InlineCtor {
 	public var x:Int;
 	public var y:String;
@@ -8,32 +10,31 @@ private class InlineCtor {
 	}
 }
 
-@:enum
-private abstract MyEnum(String) to String {
+private enum abstract MyEnum(String) to String {
 	var A = "a";
 }
 
 @:analyzer(no_user_var_fusion)
 class TestLocalDce {
-	@:js('console.log(3);')
+	@:js('TestJs.use(3);')
 	static function testNoOpRemoval() {
 		1;
 		2;
 		{}
-		trace(3);
+		use(3);
 	}
 
 	@:js('
-		console.log(27);
+		TestJs.use(27);
 	')
 	static function testConstMath() {
 		var a = 1 + 2;
 		var b = 9 * 3;
-		trace(b);
+		use(b);
 	}
 
 	@:js('
-		console.log("foo");
+		TestJs.use("foo");
 	')
 	static function testInlineCtor1() {
 		var c = new InlineCtor(12, "foo");
@@ -41,11 +42,11 @@ class TestLocalDce {
 		c.x = 13;
 		x = c.x;
 		var y = c.y;
-		trace(y);
+		use(y);
 	}
 
 	@:js('
-		console.log(12);
+		TestJs.use(12);
 	')
 	static function testInlineCtor2() {
 		var a = 0;
@@ -54,11 +55,11 @@ class TestLocalDce {
 			a = 2;
 			new InlineCtor(12, "foo");
 		}
-		trace(a = c.x);
+		use(a = c.x);
 	}
 
 	@:js('
-		console.log(1);
+		TestJs.use(1);
 	')
 	static function testInlineCtor3() {
 		var a = 0;
@@ -67,11 +68,11 @@ class TestLocalDce {
 			a = 1;
 			new InlineCtor(2, "b");
 		}
-		trace(b.x = a);
+		use(b.x = a);
 	}
 
 	@:js('
-		console.log(2);
+		TestJs.use(2);
 	')
 	static function testStructureInline1() {
 		var x = {
@@ -80,7 +81,7 @@ class TestLocalDce {
 		}
 		var y = x.foo;
 		var z = x.bar;
-		trace(z);
+		use(z);
 	}
 
 	@:js('
@@ -93,105 +94,103 @@ class TestLocalDce {
 	}
 
 	@:js('
-		console.log(2);
+		TestJs.use(2);
 	')
 	static function testArrayInline() {
 		var a = [1, 2];
 		var b = a.length;
-		trace(b);
+		use(b);
 	}
 
 	@:js('
 		var a = [1,2];
-		console.log(a[-1]);
+		TestJs.use(a[-1]);
 	')
 	static function testArrayInlineCancelNegative() {
 		var a = [1, 2];
-		trace(a[-1]);
+		use(a[-1]);
 	}
 
 	@:js('
 		var a = [1,2];
-		console.log(a[2]);
+		TestJs.use(a[2]);
 	')
 	static function testArrayInlineCancelExceeds() {
 		var a = [1, 2];
-		trace(a[2]);
+		use(a[2]);
 	}
 
 	@:js('
-		console.log("a");
+		TestJs.use("a");
 	')
 	static function testAbstractOverStringBinop() {
 		var s = "" + A;
-		trace(s);
+		use(s);
 	}
 
-	//@:js('
-		//var s = TestLocalDce.keep(1);
-		//s += 0;
-		//s += 6;
-		//s += 8;
-		//console.log(s);
-	//')
+	@:js('
+		var s = TestLocalDce.keep(1);
+		s += 0;
+		s += 6;
+		s += 8;
+		TestJs.use(s);
+	')
 	static function testLoopUnroll() {
 		var s = keep(1);
 		for (i in [0, 3, 4]) {
 			s += i * 2;
 		}
-		trace(s);
+		use(s);
 	}
 
-	//@:js('console.log(5.);')
+	@:js('TestJs.use(5.);')
 	static function testLoopUnrollDavid() {
 		var s = 0.0;
 		inline function foo(r)
 			return 2.0 + r;
 		for ( r in [0.0,1.0] )
 			s+=foo(r);
-		trace(s);
-	}
-
-	//@:js('
-		//var s = TestLocalDce.keep(1);
-		//var _g = 0;
-		//var _g1 = [0,3,4];
-		//while(_g < _g1.length) {
-			//var i = _g1[_g];
-			//++_g;
-			//s += i * 2;
-			//continue;
-		//}
-		//console.log(s);
-	//')
+		use(s);
+	}
+
+	@:js('
+		var s = TestLocalDce.keep(1);
+		var _g = 0;
+		var _g1 = [0,3,4];
+		while(_g < _g1.length) {
+			var i = _g1[_g];
+			++_g;
+			s += i * 2;
+			continue;
+		}
+		TestJs.use(s);
+	')
 	static function testLoopUnrollContinue() {
 		var s = keep(1);
 		for (i in [0, 3, 4]) {
 			s += i * 2;
 			continue;
 		}
-		trace(s);
-	}
-
-	//@:js('
-		//var s = TestLocalDce.keep(1);
-		//var _g = 0;
-		//var _g1 = [0,3,4];
-		//while(0 < _g1.length) {
-			//var i = _g1[0];
-			//++_g;
-			//s += i * 2;
-			//break;
-		//}
-		//console.log(s);
-	//')
+		use(s);
+	}
+
+	@:js('
+		var s = TestLocalDce.keep(1);
+		var _g1 = [0,3,4];
+		while(0 < _g1.length) {
+			var i = _g1[0];
+			s += i * 2;
+			break;
+		}
+		TestJs.use(s);
+	')
 	static function testLoopUnrollBreak() {
 		var s = keep(1);
 		for (i in [0, 3, 4]) {
 			s += i * 2;
 			break;
 		}
-		trace(s);
+		use(s);
 	}
 
 	@:pure(false)
diff --git a/tests/optimization/src/issues/Issue2236.hx b/tests/optimization/src/issues/Issue2236.hx
index 88ce1e4fb527dad84de05c13e97f5727e23045ec..b48ba91fcda139a718a751565a099399a1bd0e29 100644
--- a/tests/optimization/src/issues/Issue2236.hx
+++ b/tests/optimization/src/issues/Issue2236.hx
@@ -33,9 +33,8 @@ private abstract ArrayRead<T>(Array<T>) {
 
 class Issue2236 {
 	@:js('
-		var _g_pos;
 		var _g_a = [0];
-		_g_pos = 0;
+		var _g_pos = 0;
 		while(_g_pos < _g_a.length) ++_g_pos;
 	')
 	static function test() {
diff --git a/tests/optimization/src/issues/Issue3524.hx b/tests/optimization/src/issues/Issue3524.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c312463c009f884b1d492ceef9c2f7e91561079b
--- /dev/null
+++ b/tests/optimization/src/issues/Issue3524.hx
@@ -0,0 +1,25 @@
+package issues;
+
+typedef List = { v : Int, next : List };
+
+class Issue3524 {
+	@:js('
+		var l1 = { v : 0, next : null};
+		var l2 = { v : 1, next : null};
+		l1.v - l2.v;
+	')
+	@:analyzer(ignore)
+    static function main() {
+		var l1 = { v: 0, next: null };
+		var l2 = { v: 1, next: null };
+		apply(cmp, l1, l2);
+    }
+
+	static inline function cmp(a:List, b:List) {
+        return a.v - b.v;
+    }
+
+	static inline function apply(f:List -> List -> Int, l1:List, l2:List) {
+		f(l1, l2);
+	}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue3878.hx b/tests/optimization/src/issues/Issue3878.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b2354e3ec459a9b8b05562991ddd66a366b652b2
--- /dev/null
+++ b/tests/optimization/src/issues/Issue3878.hx
@@ -0,0 +1,11 @@
+package issues;
+
+class Issue3878 {
+	@:js('
+		var v = "hello";
+	')
+	@:analyzer(no_const_propagation, no_local_dce)
+	static function test() {
+        var v = (function(id) return id : String->String)("hello");
+	}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue3881.hx b/tests/optimization/src/issues/Issue3881.hx
new file mode 100644
index 0000000000000000000000000000000000000000..42e78ac2f2e2fbc3da5992808796f92715376f93
--- /dev/null
+++ b/tests/optimization/src/issues/Issue3881.hx
@@ -0,0 +1,28 @@
+package issues;
+
+private class A implements B {
+
+    public function new () {}
+
+    public inline function plus (a:Int,b:Int):Int {
+        return a + b;
+    }
+}
+
+private interface B {
+    public function plus (a:Int,b:Int):Int;
+}
+
+class Issue3881 {
+    public inline static function plusFoo (x:B) {
+        return x.plus(1,1);
+    }
+
+	@:js('issues_Issue3881.call(2);')
+    public static function test() {
+        var a = new A();
+        call(plusFoo(a));
+	}
+
+	@:pure(false) static function call(d) { }
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue4690.hx b/tests/optimization/src/issues/Issue4690.hx
index 12806b3f917bfd6206f6d0a41b89ceca377264df..34889830b490ec6565003235d6673dda043e0b5c 100644
--- a/tests/optimization/src/issues/Issue4690.hx
+++ b/tests/optimization/src/issues/Issue4690.hx
@@ -1,14 +1,16 @@
 package issues;
 
+import TestJs.use;
+
 class Parent {
 	public var x:Int;
 	public var y:String;
 
 	public inline function new(x:Int, y:String) {
-		trace("Parent.new: Before assign");
+		use("Parent.new: Before assign");
 		this.x = x;
 		this.y = y;
-		trace("Parent.new: After assign");
+		use("Parent.new: After assign");
 	}
 }
 
@@ -17,11 +19,11 @@ class Child extends Parent {
 	public var z:Int;
 
 	public inline function new(x:Int, y:Int, z:Int) {
-		trace("Child.new: Before super");
+		use("Child.new: Before super");
 		super(x, Std.string(y));
-		trace("Child.new: After super");
+		use("Child.new: After super");
 		this.z = z;
-		trace("Child new: After assign");
+		use("Child new: After assign");
 	}
 }
 
@@ -30,23 +32,23 @@ class Issue4690 {
 		var c_z;
 		var c_y;
 		var c_x;
-		console.log("Child.new: Before super");
-		console.log("Parent.new: Before assign");
+		TestJs.use("Child.new: Before super");
+		TestJs.use("Parent.new: Before assign");
 		c_x = 1;
 		c_y = "" + 2;
-		console.log("Parent.new: After assign");
-		console.log("Child.new: After super");
+		TestJs.use("Parent.new: After assign");
+		TestJs.use("Child.new: After super");
 		c_z = 3;
-		console.log("Child new: After assign");
-		console.log(c_x);
-		console.log(c_y);
-		console.log(c_z);
+		TestJs.use("Child new: After assign");
+		TestJs.use(c_x);
+		TestJs.use(c_y);
+		TestJs.use(c_z);
 	')
 	@:analyzer(no_const_propagation, no_fusion)
 	static function test() {
 		var c = new Child(1, 2, 3);
-		trace(c.x);
-		trace(c.y);
-		trace(c.z);
+		use(c.x);
+		use(c.y);
+		use(c.z);
 	}
 }
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue5436.hx b/tests/optimization/src/issues/Issue5436.hx
new file mode 100644
index 0000000000000000000000000000000000000000..90595647670ec5510b63df58ba4c749bd9c098ca
--- /dev/null
+++ b/tests/optimization/src/issues/Issue5436.hx
@@ -0,0 +1,20 @@
+package issues;
+
+class Issue5436 {
+	@:js('
+		var f = function() {};
+		issues_Issue5436.call(f);
+		issues_Issue5436.call(f);
+	')
+	@:analyzer(no_local_dce)
+    static function test() {
+        inlineMe(function() { });
+    }
+
+    static inline function inlineMe(f:Void -> Void) {
+        call(f);
+        call(f);
+    }
+
+	static function call(f:Void -> Void) { }
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue5477.hx b/tests/optimization/src/issues/Issue5477.hx
index c3bbdc853c08e05f8b80da3e392d8add30d36638..a781666d3a9af0ffb833dafb504aaeabf9ea2174 100644
--- a/tests/optimization/src/issues/Issue5477.hx
+++ b/tests/optimization/src/issues/Issue5477.hx
@@ -2,7 +2,7 @@ package issues;
 
 class Issue5477 {
 	@:js('
-		issues_Issue5477["use"](issues_Issue5477.pureUse(12) > 0.5 ? 1 : issues_Issue5477.pureUse(12));
+		issues_Issue5477.use(issues_Issue5477.pureUse(12) > 0.5 ? 1 : issues_Issue5477.pureUse(12));
 	')
 	static function testIssue5477() {
 		var v = pureUse(12);
diff --git a/tests/optimization/src/issues/Issue5509.hx b/tests/optimization/src/issues/Issue5509.hx
index f5217be6f8bd8e92d03e6e1f582206cdd38c67bd..6e9691e6e4466ae7aeefe697112bfcd5e17a6a89 100644
--- a/tests/optimization/src/issues/Issue5509.hx
+++ b/tests/optimization/src/issues/Issue5509.hx
@@ -2,7 +2,7 @@ package issues;
 
 class Issue5509 {
 	@:js('
-		issues_Issue5509["use"]();
+		issues_Issue5509.use();
 	')
 	static function test() {
         var v = "some";
diff --git a/tests/optimization/src/issues/Issue5582.hx b/tests/optimization/src/issues/Issue5582.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9dff77afee14866a8147ac2831cb91f60bec98bc
--- /dev/null
+++ b/tests/optimization/src/issues/Issue5582.hx
@@ -0,0 +1,16 @@
+package issues;
+
+class Issue5582 {
+	@:js('
+		issues_Issue5582.set_i(issues_Issue5582.i + 1);
+	')
+	static function test() {
+        i += 1;
+	}
+
+    static var i(default, set):Int = 0;
+
+    static function set_i(i:Int):Int {
+        return Issue5582.i = i;
+    }
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue5646.hx b/tests/optimization/src/issues/Issue5646.hx
new file mode 100644
index 0000000000000000000000000000000000000000..410766e55e8996e1a5ddb1434514a34055715051
--- /dev/null
+++ b/tests/optimization/src/issues/Issue5646.hx
@@ -0,0 +1,35 @@
+package issues;
+
+class Issue5646 {
+	static var mode = true;
+
+	@:js('
+		if(issues_Issue5646.mode) {
+			issues_Issue5646.use("a");
+		} else {
+			issues_Issue5646.use("b");
+		}
+	')
+	static function test1() {
+        switch (mode) {
+            case true: use("a");
+            case false: use("b");
+        }
+	}
+
+	@:js('
+		if(issues_Issue5646.mode) {
+			issues_Issue5646.use("a");
+		} else {
+			issues_Issue5646.use("b");
+		}
+	')
+	static function test2() {
+        switch (mode) {
+			case false: use("b");
+            case true: use("a");
+        }
+	}
+
+	@:pure(false) static function use(a) { }
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue5745.hx b/tests/optimization/src/issues/Issue5745.hx
index 600349c007fd8b1aeb28a5b5b6aedbe392d246e6..92ffb6928b2f960ac5218d228a5c8c1d0e809ff2 100644
--- a/tests/optimization/src/issues/Issue5745.hx
+++ b/tests/optimization/src/issues/Issue5745.hx
@@ -1,17 +1,19 @@
 package issues;
 
+import TestJs.use;
+
 class Issue5745 {
 	@:js('
 		var fn = "filename";
 		var v = cat(fn);
 		runProgram.apply(undefined, ["rm",fn]);
-		console.log(v);
+		TestJs.use(v);
 	')
     static function test() {
         var fn = 'filename';
         var v = Shell.cat(fn);
         Shell.runProgram(['rm', fn]);
-        trace(v);
+        use(v);
     }
 }
 
diff --git a/tests/optimization/src/issues/Issue5855.hx b/tests/optimization/src/issues/Issue5855.hx
index 15929511195da8b3a65ff003e55beb084f2c1f69..2d39ead5d0a56e4d016b921ed36337b23da93616 100644
--- a/tests/optimization/src/issues/Issue5855.hx
+++ b/tests/optimization/src/issues/Issue5855.hx
@@ -1,5 +1,7 @@
 package issues;
 
+import TestJs.use;
+
 class C {
 	public var field:String;
 	public inline function new() {
@@ -15,11 +17,11 @@ class Issue5855 {
 		if(Math.random() > 0.5) {
 			c_field = "foo";
 		}
-		console.log(c_field);
+		TestJs.use(c_field);
 	')
 	@:analyzer(ignore)
 	static function main() {
 		var c = new C();
-		trace(c.field);
+		use(c.field);
 	}
 }
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue6015.hx b/tests/optimization/src/issues/Issue6015.hx
index 1f817cda6632d956c24b0ea68af0ddc9e170d507..30f027d6ae2c070cf9a278fc80675bf8cbb06ec3 100644
--- a/tests/optimization/src/issues/Issue6015.hx
+++ b/tests/optimization/src/issues/Issue6015.hx
@@ -4,7 +4,7 @@ class Issue6015 {
 	@:js('
 		var a = null;
 		var tmp = a.a();
-		String.fromCharCode.apply(null,tmp);
+		_$String_String_$Impl_$.fromCharCode.apply(null,tmp);
 	')
 	static public function main() {
 		var a:Dynamic = null;
diff --git a/tests/optimization/src/issues/Issue6047.hx b/tests/optimization/src/issues/Issue6047.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1c43bc0e571fe74cf64f5cccf2f5e26792985440
--- /dev/null
+++ b/tests/optimization/src/issues/Issue6047.hx
@@ -0,0 +1,23 @@
+package issues;
+
+class Issue6047 {
+	static inline function foo (x:Int, f:Int->Int) {
+		return f(x);
+	};
+
+	static inline function plus2 (x:Int) return x + 2;
+
+	@:js('
+		issues_Issue6047.call(3);
+		issues_Issue6047.call(3);
+	')
+	static function test() {
+		var r1 = foo(1, plus2); // plus2 is not inlined
+		var r2 = foo(1, function (i) return plus2(i)); // plus2 gets inlined when wrapped in anon function
+
+		call(r1);
+		call(r2);
+	}
+
+	@:pure(false) static function call(d) { }
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue6198.hx b/tests/optimization/src/issues/Issue6198.hx
new file mode 100644
index 0000000000000000000000000000000000000000..76791d058458b3d6fb4b585910b93168be42f736
--- /dev/null
+++ b/tests/optimization/src/issues/Issue6198.hx
@@ -0,0 +1,24 @@
+package issues;
+
+private enum E {
+    A;
+}
+class Issue6198 {
+	@:js('
+		if(issues_Issue6198.getNull()._hx_index == 0) {
+			issues_Issue6198.use("e = E.A");
+		}
+	')
+	static function test1() {
+        var e:Null<E> = getNull();
+        switch(e)
+        {
+            case E.A:
+                use("e = E.A");
+        }
+	}
+
+	static function getNull() { return null; }
+
+	@:pure(false) static function use(a) { }
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue6229.hx b/tests/optimization/src/issues/Issue6229.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0d58813a56e3885de4a4eb3d81552895ba9f1750
--- /dev/null
+++ b/tests/optimization/src/issues/Issue6229.hx
@@ -0,0 +1,27 @@
+package issues;
+
+class Vec {
+    public var x:Float;
+	public var y:Float;
+    public inline function new(x) {
+        this.x = x;
+		this.y = x;
+    }
+}
+
+class Issue6229 {
+    static inline function mkVec(x) {
+		{
+			{
+				return new Vec(x);
+			}
+		}
+	}
+
+	@:js('var a = 1 + 1;')
+	@:analyzer(no_local_dce)
+    static function test() {
+        var v = mkVec(1);
+		var a = v.x + v.y;
+    }
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue6283.hx b/tests/optimization/src/issues/Issue6283.hx
new file mode 100644
index 0000000000000000000000000000000000000000..84c866b363bcca940f11ec48e992ab466b231578
--- /dev/null
+++ b/tests/optimization/src/issues/Issue6283.hx
@@ -0,0 +1,26 @@
+package issues;
+
+#if !macro
+import TestJs.use;
+#end
+
+@:callable
+abstract From<T>(T) from T to T {
+	@:from macro public static function fromExpr (e:haxe.macro.Expr) {
+		return macro function (a, b) return a+b;
+	}
+}
+
+class Issue6283 {
+	@:js('TestJs.use(3);')
+	@:analyzer(no_local_dce)
+	static function f(a, b) {
+		#if !macro
+		use(foo({}));
+		#end
+	}
+
+	static inline function foo(f:From<Int->Int->Int>) {
+		return f(1,2);
+	}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue6296.hx b/tests/optimization/src/issues/Issue6296.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7aa5d41d4cd9ec387c36f00e0cc77edb54ea33f7
--- /dev/null
+++ b/tests/optimization/src/issues/Issue6296.hx
@@ -0,0 +1,17 @@
+package issues;
+
+class Issue6296 {
+	@:js('
+		var a1 = [];
+		if(a1.push != null) {
+			a1.push(1);
+		}'
+	)
+	@:analyzer(no_local_dce)
+	static function f(a, b) {
+		var a = [];
+		if (a.push != null) {
+			a.push(1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue6302.hx b/tests/optimization/src/issues/Issue6302.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0c683f0f8305e1a726f8e25cd8343fb82ca205bb
--- /dev/null
+++ b/tests/optimization/src/issues/Issue6302.hx
@@ -0,0 +1,9 @@
+package issues;
+
+class Issue6302 {
+	@:js('a = b && a;')
+	@:analyzer(no_local_dce)
+	static function f(a, b) {
+		a = b && a;
+	}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue6338.hx b/tests/optimization/src/issues/Issue6338.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1ed5656d43ae34d6bc3e7cf918a26479e1a5adf8
--- /dev/null
+++ b/tests/optimization/src/issues/Issue6338.hx
@@ -0,0 +1,27 @@
+package issues;
+
+import TestJs.use;
+
+extern class Home {
+	static var ids: Ids;
+}
+
+extern class Ids {
+	var hd(get, never): String;
+	inline function get_hd(): String return "hd";
+
+	var ft(get, never): String;
+	inline function get_ft(): String return "ft";
+}
+
+class Issue6338 {
+	@:js('
+		TestJs.use("hd");
+		TestJs.use("ft");
+	')
+	@:analyzer(ignore)
+	static function test() {
+		use(Home.ids.hd);
+		use(Home.ids.ft);
+	}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue6409.hx b/tests/optimization/src/issues/Issue6409.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2c3c4074d9b75774d89ead8a0f3d9a646a46c72f
--- /dev/null
+++ b/tests/optimization/src/issues/Issue6409.hx
@@ -0,0 +1,21 @@
+package issues;
+
+import TestJs.use;
+
+enum E {
+    Flags( v : String );
+}
+
+class Issue6409 {
+	@:js('
+		var issues_E1 = null;
+		var f = issues_E.Flags("");
+		TestJs.use(f);
+	')
+	@:analyzer(ignore)
+    static function test() {
+        var issues_E = null;
+        var f : E = Flags("");
+        use(f);
+    }
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue6715.hx b/tests/optimization/src/issues/Issue6715.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7cb0fc0ab7453b2f11ecb15a2dc011d17d59c51d
--- /dev/null
+++ b/tests/optimization/src/issues/Issue6715.hx
@@ -0,0 +1,91 @@
+package issues;
+
+class Issue6715 {
+	@:js('
+		var f = function() {
+			var x = 1;
+			x = 2;
+		};
+		issues_Issue6715.x = f;
+		issues_Issue6715.x = f;
+		issues_Issue6715.x = f;
+		var x1 = 1;
+		x1 = 2;
+		var x2 = 1;
+		x2 = 2;
+		var x3 = 1;
+		x3 = 2;
+	')
+	@:analyzer(no_local_dce)
+	static public function test1() {
+		insanity(function() { var x = 1; x = 2; });
+	}
+
+	@:js('
+		var x = 1;
+		x = 2;
+		var x1 = 1;
+		x1 = 2;
+		var x2 = 1;
+		x2 = 2;
+	')
+	@:analyzer(no_local_dce)
+	static public function test2() {
+		insanity2(function() { var x = 1; x = 2; });
+	}
+
+	@:js('
+		issues_Issue6715.x = function() {var x = 1;};
+	')
+	@:analyzer(no_local_dce)
+	static public function test3() {
+		insanity3(function() var x = 1);
+	}
+
+	@:js('
+		var f = function() {var x = 1;};
+		issues_Issue6715.x = f;
+		issues_Issue6715.x = f;
+		issues_Issue6715.x = f;
+	')
+	@:analyzer(no_local_dce)
+	static public function test4() {
+		insanity4(function() var x = 1);
+	}
+
+	static var x:Void->Void;
+
+	// Mixed: inline calls, reference reads
+	static inline function insanity(f:Void -> Void)
+	{
+		x = f;
+		x = f;
+		x = f;
+
+		f();
+		f();
+		f();
+	}
+
+	// Only calls: inline all
+	static inline function insanity2(f:Void -> Void)
+	{
+		f();
+		f();
+		f();
+	}
+
+	// Referenced once: inline
+	static inline function insanity3(f:Void -> Void)
+	{
+		x = f;
+	}
+
+	// Referenced multiple times: temp var
+	static inline function insanity4(f:Void -> Void)
+	{
+		x = f;
+		x = f;
+		x = f;
+	}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue7113.hx b/tests/optimization/src/issues/Issue7113.hx
new file mode 100644
index 0000000000000000000000000000000000000000..083830371e29eff7a30df239d9fb7549c9681eae
--- /dev/null
+++ b/tests/optimization/src/issues/Issue7113.hx
@@ -0,0 +1,19 @@
+package issues;
+
+@:generic
+private class MyType<@:const T> {
+    public function new() { }
+
+	public inline function constGenericInlineWtf() {
+        untyped __js__('console.log({0})', T);
+    }
+}
+
+class Issue7113 {
+	@:js('
+		console.log("myfile");
+	')
+	static function test() {
+		new MyType<"myfile">().constGenericInlineWtf();
+	}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue7704.hx b/tests/optimization/src/issues/Issue7704.hx
new file mode 100644
index 0000000000000000000000000000000000000000..030ddafa38b6f02730dad58b2cf6d9ce74c2707d
--- /dev/null
+++ b/tests/optimization/src/issues/Issue7704.hx
@@ -0,0 +1,25 @@
+package issues;
+
+class Issue7704 {
+	@:js('
+		var i = 0;
+		var a = [];
+		a[i] = i;
+		++i;
+		a[i] = i;
+		issues_Issue7704.use(a);
+	')
+	@:analyzer(no_optimize)
+	static function test() {
+		var i = 0;
+		var a = [];
+
+		a[i] = i;
+		i++;
+		a[i] = i;
+
+		use(a);
+	}
+
+	@:pure(false) static function use(a) { }
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue8072.hx b/tests/optimization/src/issues/Issue8072.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3e4c22131442bd36a4a3e80db4c20851f3ef246b
--- /dev/null
+++ b/tests/optimization/src/issues/Issue8072.hx
@@ -0,0 +1,18 @@
+package issues;
+
+class Issue8072 {
+	@:js('
+		var _g = 0;
+		var _g1 = [1,2];
+		while(_g < _g1.length) issues_Issue8072.use(_g1[_g++]);
+	')
+	static function test() {
+		var one:One = [1, 2];
+		for (v in one) use(v);
+	}
+
+	@:pure(false) static function use(v:Int) {}
+}
+
+@:forward
+abstract One(Array<Int>) from Array<Int> {}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue8128.hx b/tests/optimization/src/issues/Issue8128.hx
new file mode 100644
index 0000000000000000000000000000000000000000..184d54b631e205d9208cfb6ebfce4b44d8a6a823
--- /dev/null
+++ b/tests/optimization/src/issues/Issue8128.hx
@@ -0,0 +1,15 @@
+package issues;
+
+class Issue8128 {
+	static var tmp:Any;
+	@:js('
+		issues_Issue8128.tmp = function() {
+			return;
+		};
+	')
+	static function test() {
+		tmp = () -> {};
+	}
+
+	public function new() {}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue8226.hx b/tests/optimization/src/issues/Issue8226.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4cc4c535423c930cc7766437ce21faead4cc1213
--- /dev/null
+++ b/tests/optimization/src/issues/Issue8226.hx
@@ -0,0 +1,24 @@
+package issues;
+
+class Issue8226 {
+	@:pure(false) static var testStatic:String;
+	static var pureStatic:String;
+
+	@:pure(false) var testInstance:String;
+	var pureInstance:String;
+
+	@:js('
+		issues_Issue8226.testStatic;
+		new issues_Issue8226().testInstance;
+	')
+	static function test() {
+		testStatic;
+		pureStatic;
+
+		var m = new Issue8226();
+		m.testInstance;
+		m.pureInstance;
+	}
+
+	public function new() {}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/Issue8770.hx b/tests/optimization/src/issues/Issue8770.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e85f45c5dbe81af2b7af91302884446d66e9ac8f
--- /dev/null
+++ b/tests/optimization/src/issues/Issue8770.hx
@@ -0,0 +1,20 @@
+package issues;
+
+class Issue8770 {
+	@:pure(false) static var testStatic:String;
+	static var pureStatic:String;
+
+	@:pure(false) var testInstance:String;
+	var pureInstance:String;
+
+	@:js('
+		var m_h;
+		m_h = { };
+	')
+	@:analyzer(ignore)
+	static function test() {
+		var m = new Map<Int,Bool>();
+	}
+
+	public function new() {}
+}
\ No newline at end of file
diff --git a/tests/optimization/src/issues/IssueInline.hx b/tests/optimization/src/issues/IssueInline.hx
new file mode 100644
index 0000000000000000000000000000000000000000..08d1b7647c384ad8aece1cc3ff1c6a56cd68fd26
--- /dev/null
+++ b/tests/optimization/src/issues/IssueInline.hx
@@ -0,0 +1,122 @@
+package issues;
+
+import TestJs.use;
+
+private class Point {
+	public var x:Int;
+	public var y:Int;
+
+	public function new(x:Int, y:Int) {
+		this.x = x;
+		this.y = y;
+	}
+}
+
+private class InlinePoint {
+	public var x:Int;
+	public var y:Int;
+
+	inline public function new(x:Int, y:Int) {
+		this.x = x;
+		this.y = y;
+	}
+}
+
+private abstract InlineAbstract(Int) {
+	public function new(x:Int) {
+		this = x;
+	}
+
+	public function twice() {
+		return this * 2;
+	}
+}
+
+private class ParamClass<T> {
+	public var x:T;
+
+	public function new(x:T) {
+		this.x = x;
+	}
+
+	public function test(a:T) {
+		use(a);
+		use(x);
+	}
+}
+
+private abstract ParamAbstract<T>(T) {
+	public function new(x:T) {
+		this = x;
+	}
+
+	public function test(a:T) {
+		use(a);
+		use(this);
+	}
+}
+
+class IssueInline {
+	@:js('
+		TestJs.use(4);
+		TestJs.use(issues_IssueInline.testInline(3));
+		issues_IssueInline.testInline(3);
+	')
+	static function test() {
+		use(inline testInline(3));
+		inline testInline(3);
+		use(testInline(3));
+		testInline(3);
+	}
+
+	@:js('
+		TestJs.use(1);
+		TestJs.use(2);
+	')
+	static function testCtor1() {
+		var x = inline new Point(1, 2);
+		use(x.x);
+		use(x.y);
+	}
+
+	@:js('
+		TestJs.use(1);
+		TestJs.use(2);
+	')
+	static function testCtor2() {
+		var x = inline new InlinePoint(1, 2);
+		use(x.x);
+		use(x.y);
+	}
+
+	@:js('
+		TestJs.use(10);
+		TestJs.use(1);
+	')
+	static function testParamClass() {
+		var p = inline new ParamClass<Int>(1);
+		inline p.test(10);
+	}
+
+	@:js('
+		TestJs.use(10);
+		TestJs.use(1);
+	')
+	static function testParamAbstract() {
+		var p = inline new ParamAbstract<Int>(1);
+		inline p.test(10);
+	}
+
+	@:js('
+		TestJs.use(24);
+	')
+	static function testAbstract() {
+		var a = inline new InlineAbstract(12);
+		use(inline a.twice());
+	}
+
+	@:pure(false)
+	static function testInline(i:Int) {
+		return i + 1;
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/Config.hx b/tests/runci/Config.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f0a32067747428f719de46039c41bf3bdccbcc3b
--- /dev/null
+++ b/tests/runci/Config.hx
@@ -0,0 +1,46 @@
+package runci;
+
+import sys.FileSystem;
+
+enum Ci {
+	TravisCI;
+	AppVeyor;
+	AzurePipelines;
+}
+
+class Config {
+	static public final systemName = Sys.systemName();
+	static public final cwd = Sys.getCwd();
+	static public final repoDir = FileSystem.fullPath("..") + "/";
+	static public final unitDir = cwd + "unit/";
+	static public final sysDir = cwd + "sys/";
+	static public final optDir = cwd + "optimization/";
+	static public final miscDir = cwd + "misc/";
+	static public final displayDir = cwd + "display/";
+	static public final serverDir = cwd + "server/";
+	static public final sourcemapsDir = cwd + "sourcemaps/";
+	static public final nullSafetyDir = cwd + "nullsafety/";
+	static public final threadsDir = cwd + "threads/";
+
+	static public final ci:Null<Ci> =
+		if (Sys.getEnv("TRAVIS") == "true")
+			TravisCI;
+		else if (Sys.getEnv("APPVEYOR") == "True")
+			AppVeyor;
+		else if (Sys.getEnv("TF_BUILD") == "True")
+			AzurePipelines;
+		else
+			null;
+
+	static public function isCi():Bool {
+		return ci != null;
+	}
+
+	static public final colorSupported = switch [ci, systemName] {
+		case [AzurePipelines, _]: true; // not sure
+		case [TravisCI | AppVeyor, _]: true;
+		case [_, "Linux" | "Mac"]: true;
+		case [_, "Windows"]: false;
+		case _: false;
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/Deployment.hx b/tests/runci/Deployment.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3d469c6fcdf7487b5d754ef3fad1686b10060ea0
--- /dev/null
+++ b/tests/runci/Deployment.hx
@@ -0,0 +1,305 @@
+package runci;
+
+import runci.Config.*;
+import runci.System.*;
+import sys.io.File;
+import sys.FileSystem;
+import haxe.*;
+using StringTools;
+
+class Deployment {
+	static var S3_HXBUILDS_ADDR(default, null) = 's3://hxbuilds/builds/haxe';
+
+	static var gitInfo(get, null):{repo:String, branch:String, commit:String, timestamp:Float, date:String};
+
+	static function get_gitInfo() return if (gitInfo != null) gitInfo else gitInfo = {
+		repo: switch (ci) {
+			case TravisCI:
+				Sys.getEnv("TRAVIS_REPO_SLUG");
+			case AppVeyor:
+				Sys.getEnv("APPVEYOR_PROJECT_SLUG");
+			case AzurePipelines:
+				Sys.getEnv("AZURE_PIPELINES_REPO_URL");
+			case _:
+				commandResult("git", ["config", "--get", "remote.origin.url"]).stdout.trim();
+		},
+		branch: switch (ci) {
+			case TravisCI:
+				Sys.getEnv("TRAVIS_BRANCH");
+			case AppVeyor:
+				Sys.getEnv("APPVEYOR_REPO_BRANCH");
+			case AzurePipelines:
+				Sys.getEnv("AZURE_PIPELINES_BRANCH");
+			case _:
+				commandResult("git", ["rev-parse", "--abbrev-ref", "HEAD"]).stdout.trim();
+		},
+		commit: commandResult("git", ["rev-parse", "HEAD"]).stdout.trim(),
+		timestamp: Std.parseFloat(commandResult("git", ["show", "-s", "--format=%ct", "HEAD"]).stdout),
+		date: {
+			var gitTime = commandResult("git", ["show", "-s", "--format=%ct", "HEAD"]).stdout;
+			var tzd = {
+				var z = Date.fromTime(0);
+				z.getHours() * 60 * 60 * 1000 + z.getMinutes() * 60 * 1000;
+			}
+			// make time in the UTC time zone
+			var time = Date.fromTime(Std.parseFloat(gitTime) * 1000 - tzd);
+			DateTools.format(time, "%Y-%m-%dT%H:%M:%SZ");
+		}
+	}
+
+	static function isDeployNightlies() {
+		return
+			Sys.getEnv("DEPLOY_NIGHTLIES") != null &&
+			(gitInfo.branch == "development" || gitInfo.branch == "master" || gitInfo.branch == "deploy-test");
+	}
+
+	static function deployBintray():Void {
+		if (
+			Sys.getEnv("BINTRAY") != null &&
+			Sys.getEnv("BINTRAY_USERNAME") != null &&
+			Sys.getEnv("BINTRAY_API_KEY") != null
+		) {
+			// generate bintray config
+			var tpl = new Template(File.getContent("extra/bintray.tpl.json"));
+			var compatDate = ~/[^0-9]/g.replace(gitInfo.date, "");
+			var json = tpl.execute({
+				packageSubject: {
+					var sub = Sys.getEnv("BINTRAY_SUBJECT");
+					sub != null ? sub : Sys.getEnv("BINTRAY_USERNAME");
+				},
+				os: systemName.toLowerCase(),
+				versionName: '${haxeVer}+${compatDate}.${gitInfo.commit.substr(0,7)}',
+				versionDesc: "Automated CI build.",
+				gitRepo: gitInfo.repo,
+				gitBranch: gitInfo.branch,
+				gitCommit: gitInfo.commit,
+				gitDate: gitInfo.date,
+			});
+			var path = "extra/bintray.json";
+			File.saveContent("extra/bintray.json", json);
+			infoMsg("saved " + FileSystem.absolutePath(path) + " with content:");
+			Sys.println(json);
+		}
+	}
+
+	static function isDeployApiDocsRequired() {
+		return
+			Sys.getEnv("DEPLOY_API_DOCS") != null &&
+			(
+				gitInfo.branch == "development" ||
+				switch(Sys.getEnv("TRAVIS_TAG")) {
+					case null, _.trim() => "":
+						false;
+					case tag:
+						true;
+				}
+			);
+	}
+
+	/**
+		Deploy doc to api.haxe.org.
+	*/
+
+	static function deployApiDoc():Void {
+		changeDirectory(repoDir);
+		runCommand("make", ["xmldoc"]);
+		File.saveContent("extra/doc/info.json", Json.stringify({
+			"commit": gitInfo.commit,
+			"branch": gitInfo.branch,
+		}));
+		switch (Sys.getEnv("GHP_REMOTE")) { // should be in the form of https://token@github.com/account/repo.git
+			case null:
+				infoMsg('Missing GHP_REMOTE, skip api doc deploy.');
+			case remoteRepo:
+				var localRepo = "extra/api.haxe.org";
+				runCommand("git", ["clone", remoteRepo, localRepo]);
+				runCommand("haxe", ["--cwd", localRepo, "--run", "ImportXml", FileSystem.absolutePath("extra/doc")]);
+		}
+	}
+
+	static function cleanup32BitDlls()
+	{
+		infoMsg('Cleaning up the 32-bit DLLS');
+		cleanup32BitDll('zlib1.dll');
+	}
+
+	static function cleanup32BitDll(name:String)
+	{
+		var cygRoot = Sys.getEnv("CYG_ROOT");
+		if (cygRoot != null) {
+			while (true)
+			{
+				var proc = new sys.io.Process('$cygRoot/bin/bash', ['-lc', '/usr/bin/cygpath -w "`which $name`"']);
+				var out = proc.stdout.readAll().toString().trim();
+				var err = proc.stderr.readAll().toString().trim();
+				if (proc.exitCode() == 0)
+				{
+					if (!is64BitDll(out))
+					{
+						infoMsg('Deleting the file $out because it is a 32-bit DLL');
+						sys.FileSystem.deleteFile(out);
+					} else {
+						break;
+					}
+				} else {
+					infoMsg('Error while getting the cygpath for $name: $out\n$err');
+					break; // no more dlls
+				}
+			}
+		} else {
+			var path = Sys.getEnv('PATH').split(';');
+			for (base in path)
+			{
+				var fullPath = '$base/$name';
+				if (sys.FileSystem.exists(fullPath) && !is64BitDll(fullPath))
+				{
+					infoMsg('Deleting the file $fullPath because it is a 32-bit DLL');
+					sys.FileSystem.deleteFile(fullPath);
+				}
+			}
+		}
+	}
+
+	static function is64BitDll(path:String)
+	{
+		if (!sys.FileSystem.exists(path))
+		{
+			throw 'The DLL at path $path was not found';
+		}
+
+		var file = sys.io.File.read(path);
+		if (file.readByte() != 'M'.code || file.readByte() != 'Z'.code)
+		{
+			throw 'The DLL at path $path is invalid: Invalid MZ magic header';
+		}
+		file.seek(0x3c, SeekBegin);
+		var peSigOffset = file.readInt32();
+		file.seek(peSigOffset, SeekBegin);
+		if (file.readByte() != 'P'.code || file.readByte() != 'E'.code || file.readByte() != 0 || file.readByte() != 0)
+		{
+			throw 'Invalid PE header signature: PE expected';
+		}
+		// coff header
+		file.readString(20);
+		// pe header
+		var peKind = file.readUInt16();
+		file.close();
+		switch(peKind)
+		{
+			case 0x20b: // 64 bit
+				return true;
+			case 0x10b: // 32 bit
+				return false;
+			case 0x107: // rom
+				return false;
+			case _:
+				throw 'Unknown PE header kind $peKind';
+		}
+	}
+
+	static function fileExtension(file:String) {
+		file = haxe.io.Path.withoutDirectory(file);
+		var idx = file.indexOf('.');
+		if (idx < 0) {
+			return '';
+		} else {
+			return file.substr(idx);
+		}
+	}
+
+	/**
+		Deploy source package to ppa:haxe/snapshots.
+	*/
+	static function deployPPA():Void {
+		if (
+			gitInfo.branch == "development" &&
+			Sys.getEnv("DEPLOY") != null &&
+			Sys.getEnv("haxeci_decrypt") != null
+		) {
+			// setup deb info
+			runCommand("git config --global user.name \"${DEBFULLNAME}\"");
+			runCommand("git config --global user.email \"${DEBEMAIL}\"");
+			// setup haxeci_ssh
+			runCommand("openssl aes-256-cbc -k \"$haxeci_decrypt\" -in extra/haxeci_ssh.enc -out extra/haxeci_ssh -d");
+			runCommand("chmod 600 extra/haxeci_ssh");
+			runCommand("ssh-add extra/haxeci_ssh");
+			// setup haxeci_sec.gpg
+			runCommand("openssl aes-256-cbc -k \"$haxeci_decrypt\" -in extra/haxeci_sec.gpg.enc -out extra/haxeci_sec.gpg -d");
+			runCommand("gpg --allow-secret-key-import --import extra/haxeci_sec.gpg");
+			runCommand("sudo apt-get install devscripts git-buildpackage ubuntu-dev-tools dh-make -y");
+			var compatDate = ~/[^0-9]/g.replace(gitInfo.date, "");
+			var SNAPSHOT_VERSION = '${haxeVerFull}+1SNAPSHOT${compatDate}+${gitInfo.commit.substr(0,7)}';
+			runCommand('cp out/haxe*_src.tar.gz "../haxe_${SNAPSHOT_VERSION}.orig.tar.gz"');
+			changeDirectory("..");
+			runCommand("git clone https://github.com/HaxeFoundation/haxe-debian.git");
+			changeDirectory("haxe-debian");
+			runCommand("git checkout upstream");
+			runCommand("git checkout next");
+			runCommand('gbp import-orig "../haxe_${SNAPSHOT_VERSION}.orig.tar.gz" -u "${SNAPSHOT_VERSION}" --debian-branch=next');
+			runCommand('dch -v "1:${SNAPSHOT_VERSION}-1" --urgency low "snapshot build"');
+			runCommand("debuild -S -sa");
+			runCommand("backportpackage -d yakkety --upload ${PPA} --yes ../haxe_*.dsc");
+			runCommand("backportpackage -d xenial  --upload ${PPA} --yes ../haxe_*.dsc");
+			runCommand("backportpackage -d vivid   --upload ${PPA} --yes ../haxe_*.dsc");
+			runCommand("backportpackage -d trusty  --upload ${PPA} --yes ../haxe_*.dsc");
+			runCommand("git checkout debian/changelog");
+			runCommand("git merge -X ours --no-edit origin/next-precise");
+			runCommand('dch -v "1:${SNAPSHOT_VERSION}-1" --urgency low "snapshot build"');
+			runCommand("debuild -S -sa");
+			runCommand("backportpackage -d precise --upload ${PPA} --yes ../haxe_*.dsc");
+		}
+	}
+
+	static var haxeVer(default, never) = {
+		var haxe_ver = haxe.macro.Compiler.getDefine("haxe_ver");
+		switch (haxe_ver.split(".")) {
+			case [major]:
+				major;
+			case [major, minor] if (minor.length == 1):
+				'${major}.${minor}';
+			case [major, minor] if (minor.length > 1):
+				var patch = Std.parseInt(minor.substr(1));
+				var minor = minor.charAt(0);
+				'${major}.${minor}.${patch}';
+			case _:
+				throw haxe_ver;
+		}
+	}
+
+	static var haxeVerFull(default, never) = {
+		var ver = haxeVer.split(".");
+		while (ver.length < 3) {
+			ver.push("0");
+		}
+		ver.join(".");
+	}
+
+	static public function deploy():Void {
+		switch (ci) {
+			case TravisCI:
+				switch (Sys.getEnv("TRAVIS_PULL_REQUEST")) {
+					case "false", null:
+						// not a PR
+					case _:
+						infoMsg("Not deploying in PR builds.");
+						return;
+				}
+			case AppVeyor:
+				switch (Sys.getEnv("APPVEYOR_PULL_REQUEST_NUMBER")) {
+					case null:
+						// not a PR
+					case _:
+						infoMsg("Not deploying in PR builds.");
+						return;
+				}
+			case _:
+				// pass
+		}
+
+		if (isDeployApiDocsRequired()) {
+			deployApiDoc();
+		} else {
+			infoMsg("Not deploying API doc");
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/Indexer.hx b/tests/runci/Indexer.hx
similarity index 94%
rename from tests/Indexer.hx
rename to tests/runci/Indexer.hx
index f1a2e778b2afe7dda5e95de102cdb600ebe1f298..aee6a018d440ef1e4a03b530aafadaac7f4caad9 100644
--- a/tests/Indexer.hx
+++ b/tests/runci/Indexer.hx
@@ -1,8 +1,19 @@
+package runci;
+
 import sys.io.*;
 using StringTools;
 
 class Indexer
 {
+	static function main():Void {
+		switch (Sys.args()) {
+			case []:
+				throw "missing s3 path argument";
+			case [s3path]:
+				index(s3path);
+		}
+	}
+
 	public static function index(s3path:String)
 	{
 		var spaceRegex = ~/[ \t]+/g,
diff --git a/tests/runci/Linux.hx b/tests/runci/Linux.hx
new file mode 100644
index 0000000000000000000000000000000000000000..87200a8cceddb95f72f0c9aa9122d19bc1fd8764
--- /dev/null
+++ b/tests/runci/Linux.hx
@@ -0,0 +1,22 @@
+package runci;
+
+import runci.System.*;
+
+class Linux {
+	static public function isAptPackageInstalled(aptPackage:String):Bool {
+		return commandSucceed("dpkg-query", ["-W", "-f='${Status}'", aptPackage]);
+	}
+
+	static public function requireAptPackages(packages:Array<String>):Void {
+		var notYetInstalled = [for (p in packages) if (!isAptPackageInstalled(p)) p];
+		if (notYetInstalled.length > 0) {
+			var aptCacheDir = Sys.getEnv("APT_CACHE_DIR");
+			var baseCommand = if (aptCacheDir != null) {
+				["apt-get", "-o", 'dir::cache::archives=${aptCacheDir}', "install", "-qqy"];
+			} else {
+				["apt-get", "install", "-qqy"];
+			};
+			runCommand("sudo", baseCommand.concat(notYetInstalled), true);
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/System.hx b/tests/runci/System.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4f1accd74b7cfbf2576011330c2631d222eac7d5
--- /dev/null
+++ b/tests/runci/System.hx
@@ -0,0 +1,166 @@
+package runci;
+
+import haxe.Timer;
+import sys.io.Process;
+import runci.Config.*;
+
+using StringTools;
+
+enum Failure {
+	Fail;
+}
+
+class System {
+	static public var success(default, null) = true;
+
+
+	static public function successMsg(msg:String):Void {
+		Sys.println(colorSupported ? '\x1b[32m' + msg + '\x1b[0m' : msg);
+	}
+	static public function failMsg(msg:String):Void {
+		Sys.println(colorSupported ? '\x1b[31m' + msg + '\x1b[0m' : msg);
+	}
+	static public function infoMsg(msg:String):Void {
+		Sys.println(colorSupported ? '\x1b[36m' + msg + '\x1b[0m' : msg);
+	}
+
+	static public function commandSucceed(cmd:String, args:Array<String>):Bool {
+		return try {
+			var p = new Process(cmd, args);
+			var succeed = p.exitCode() == 0;
+			p.close();
+			succeed;
+		} catch(e:Dynamic) false;
+	}
+
+	static public function commandResult(cmd:String, args:Array<String>):{
+		stdout:String,
+		stderr:String,
+		exitCode:Int
+	} {
+		var p = new Process(cmd, args);
+		var out = {
+			stdout: p.stdout.readAll().toString(),
+			stderr: p.stderr.readAll().toString(),
+			exitCode: p.exitCode()
+		}
+		p.close();
+		return out;
+	}
+
+	/**
+		Run a command using `Sys.command()`.
+		If the command exits with non-zero code, exit the whole script with the same code.
+
+		If `useRetry` is `true`, the command will be re-run if it exits with non-zero code (3 trials).
+		It is useful for running network-dependent commands.
+	*/
+	static public function runCommand(cmd:String, ?args:Array<String>, useRetry:Bool = false, allowFailure:Bool = false):Void {
+		var trials = useRetry ? 3 : 1;
+		var exitCode:Int = 1;
+		var cmdStr = cmd + (args == null ? '' : ' $args');
+
+		while (trials-->0) {
+			infoMsg('Command: $cmdStr');
+
+			var t = Timer.stamp();
+			exitCode = Sys.command(cmd, args);
+			var dt = Math.round(Timer.stamp() - t);
+
+			if (exitCode == 0) {
+				successMsg('Command exited with $exitCode in ${dt}s: $cmdStr');
+				return;
+			}
+			else
+				failMsg('Command exited with $exitCode in ${dt}s: $cmdStr');
+
+			if (trials > 0) {
+				infoMsg('Command will be re-run...');
+			}
+		}
+
+		if (!allowFailure)
+			fail();
+	}
+
+	/**
+	 * Recursively delete a directory.
+	 * @return Int Exit code of a system command executed to perform deletion.
+	 */
+	static public function deleteDirectoryRecursively(dir:String):Int {
+		return switch (Sys.systemName()) {
+			case "Windows":
+				Sys.command("rmdir", ["/S", "/Q", StringTools.replace(sys.FileSystem.fullPath(dir), "/", "\\")]);
+			case _:
+				Sys.command("rm", ["-rf", dir]);
+		}
+	}
+
+	static public function fail():Void {
+		success = false;
+		throw Fail;
+	}
+
+	static public function addToPATH(path:String):Void {
+		infoMsg('Prepending $path to PATH.');
+		switch (systemName) {
+			case "Windows":
+				Sys.putEnv("PATH", path + ";" + Sys.getEnv("PATH"));
+			case "Mac", "Linux":
+				Sys.putEnv("PATH", path + ":" + Sys.getEnv("PATH"));
+		}
+	}
+
+	static public function haxelibInstallGit(account:String, repository:String, ?branch:String, ?srcPath:String, useRetry:Bool = false, ?altName:String):Void {
+		var name:String = (altName == null) ? repository : altName;
+		try {
+			getHaxelibPath(name);
+			infoMsg('$name has already been installed.');
+		} catch (e:Dynamic) {
+			var args:Array<String> = ["git", name, 'https://github.com/$account/$repository'];
+			if (branch != null) {
+				args.push(branch);
+			}
+			if (srcPath != null) {
+				args.push(srcPath);
+			}
+
+			runCommand("haxelib", args, useRetry);
+		}
+	}
+
+	static public function haxelibInstall(library:String):Void {
+		try {
+			getHaxelibPath(library);
+			infoMsg('$library has already been installed.');
+		} catch (e:Dynamic) {
+			runCommand("haxelib", ["install", library]);
+		}
+	}
+
+	static public function haxelibRun(args:Array<String>, useRetry:Bool = false):Void {
+		runCommand("haxelib", ["run"].concat(args), useRetry);
+	}
+
+	static public function getHaxelibPath(libName:String) {
+		var proc = new Process("haxelib", ["path", libName]);
+		var result;
+		var code = proc.exitCode();
+		do {
+			result = proc.stdout.readLine();
+			if (!result.startsWith("-L")) {
+				break;
+			}
+		} while(true);
+		proc.close();
+		if (code != 0) {
+			throw 'Failed to get haxelib path ($result)';
+		}
+		return result;
+	}
+
+	static public function changeDirectory(path:String) {
+		Sys.println('Changing directory to $path');
+		Sys.setCwd(path);
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/TestTarget.hx b/tests/runci/TestTarget.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b2d90f4810ee876da04360e4173a3f3bb6676a0b
--- /dev/null
+++ b/tests/runci/TestTarget.hx
@@ -0,0 +1,19 @@
+package runci;
+
+enum abstract TestTarget(String) from String {
+	var Macro = "macro";
+	var Neko = "neko";
+	var Js = "js";
+	var Lua = "lua";
+	var Php = "php";
+	var Php7 = "php7";
+	var Cpp = "cpp";
+	var Cppia = "cppia";
+	var Flash9 = "flash9";
+	var As3 = "as3";
+	var Java = "java";
+	var Jvm = "jvm";
+	var Cs = "cs";
+	var Python = "python";
+	var Hl = "hl";
+}
diff --git a/tests/runci/targets/As3.hx b/tests/runci/targets/As3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c16bc7744dbe15542e7a40d42f1e360057c9ccec
--- /dev/null
+++ b/tests/runci/targets/As3.hx
@@ -0,0 +1,15 @@
+package runci.targets;
+
+import runci.System.*;
+
+class As3 {
+	static public function run(args:Array<String>) {
+		runci.targets.Flash.setupFlashPlayerDebugger();
+		runci.targets.Flash.setupFlexSdk();
+
+		runCommand("haxe", ["compile-as3.hxml", "-D", "fdb"].concat(args));
+		var success = runci.targets.Flash.runFlash("bin/unit9_as3.swf");
+		if (!success)
+			fail();
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/targets/Cpp.hx b/tests/runci/targets/Cpp.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7087eaa1d2c7fcfb818294117a0233e62963b57e
--- /dev/null
+++ b/tests/runci/targets/Cpp.hx
@@ -0,0 +1,84 @@
+package runci.targets;
+
+import sys.FileSystem;
+import runci.System.*;
+import runci.Config.*;
+
+class Cpp {
+	static public var gotCppDependencies = false;
+
+	static public function getCppDependencies() {
+		if (gotCppDependencies) return;
+
+		//hxcpp dependencies
+		switch (systemName) {
+			case "Linux":
+				Linux.requireAptPackages(["gcc-multilib", "g++-multilib"]);
+			case "Mac":
+				//pass
+		}
+
+
+		//install and build hxcpp
+		try {
+			var path = getHaxelibPath("hxcpp");
+			infoMsg('hxcpp has already been installed in $path.');
+		} catch(e:Dynamic) {
+			haxelibInstallGit("HaxeFoundation", "hxcpp", true);
+			var oldDir = Sys.getCwd();
+			changeDirectory(getHaxelibPath("hxcpp") + "tools/hxcpp/");
+			runCommand("haxe", ["-D", "source-header=''", "compile.hxml"]);
+			changeDirectory(oldDir);
+		}
+
+		gotCppDependencies = true;
+	}
+
+	static public function runCpp(bin:String, ?args:Array<String>):Void {
+		if (args == null) args = [];
+		bin = FileSystem.fullPath(bin);
+		runCommand(bin, args);
+	}
+
+	static public function run(args:Array<String>, testCompiled:Bool, testCppia:Bool) {
+		getCppDependencies();
+
+		switch (systemName) {
+			case "Windows":
+				if (testCompiled) {
+					runCommand("haxe", ["compile-cpp.hxml", "-D", "HXCPP_M32"].concat(args));
+					runCpp("bin/cpp/TestMain-debug", []);
+				}
+			case _:
+				if (testCompiled) {
+					runCommand("rm", ["-rf", "cpp"]);
+					runCommand("haxe", ["compile-cpp.hxml", "-D", "HXCPP_M64"].concat(args));
+					runCpp("bin/cpp/TestMain-debug", []);
+				}
+
+				if (testCppia) {
+					runCommand("haxe", ["compile-cppia-host.hxml"].concat(args));
+					runCommand("haxe", ["compile-cppia.hxml"].concat(args));
+					runCpp("bin/cppia/Host-debug", ["bin/unit.cppia"]);
+					runCpp("bin/cppia/Host-debug", ["bin/unit.cppia", "-jit"]);
+				}
+		}
+
+		changeDirectory(sysDir);
+		runCommand("haxe", ["compile-cpp.hxml"].concat(args));
+		runCpp("bin/cpp/Main-debug", []);
+
+		if (systemName != "Windows") { // TODO: find out why we keep getting "missed async calls" error
+			changeDirectory(threadsDir);
+			runCommand("haxe", ["build.hxml", "-cpp", "export/cpp"]);
+			runCpp("export/cpp/Main");
+		}
+
+		// if (Sys.systemName() == "Mac")
+		// {
+		// 	changeDirectory(miscDir + "cppObjc");
+		// 	runCommand("haxe", ["build.hxml"]);
+		// 	runCpp("bin/TestObjc-debug");
+		// }
+	}
+}
diff --git a/tests/runci/targets/Cs.hx b/tests/runci/targets/Cs.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b051a8a34bb87cd88cacea92f3ed3ccb71a0a0a6
--- /dev/null
+++ b/tests/runci/targets/Cs.hx
@@ -0,0 +1,92 @@
+package runci.targets;
+
+import sys.FileSystem;
+import runci.System.*;
+import runci.Config.*;
+
+class Cs {
+	static var miscCsDir(get,never):String;
+	static inline function get_miscCsDir() return miscDir + 'cs/';
+
+	static public function getCsDependencies() {
+		switch (systemName) {
+			case "Linux":
+				if (!isCi() && commandSucceed("mono", ["--version"]))
+					infoMsg('mono has already been installed.');
+				else
+					Linux.requireAptPackages(["mono-devel", "mono-mcs"]);
+				runCommand("mono", ["--version"]);
+			case "Mac":
+				if (commandSucceed("mono", ["--version"]))
+					infoMsg('mono has already been installed.');
+				else
+					runCommand("brew", ["install", "mono"], true);
+				runCommand("mono", ["--version"]);
+			case "Windows":
+				switch (ci) {
+					case AppVeyor:
+						addToPATH("C:\\Program Files (x86)\\Mono\\bin");
+						runCommand("mono", ["--version"]);
+					case _:
+						//pass
+				}
+		}
+
+		haxelibInstallGit("HaxeFoundation", "hxcs", true);
+	}
+
+	static public function runCs(exe:String, ?args:Array<String>):Void {
+		if (args == null) args = [];
+		exe = FileSystem.fullPath(exe);
+		switch (systemName) {
+			case "Linux", "Mac":
+				runCommand("mono", [exe].concat(args));
+			case "Windows":
+				runCommand(exe, args);
+		}
+	}
+
+	static public function run(args:Array<String>) {
+		getCsDependencies();
+
+		var compl = switch [ci, systemName] {
+			case [TravisCI, "Linux"]:
+				"-travis";
+			case _:
+				"";
+		};
+
+		for (fastcast in      [[], ["-D", "fast_cast"]])
+		for (noroot in        [[], ["-D", "no_root"]])
+		for (erasegenerics in [[], ["-D", "erase_generics"]])
+		{
+			var extras = fastcast.concat(erasegenerics).concat(noroot);
+			runCommand("haxe", ['compile-cs$compl.hxml'].concat(extras).concat(args));
+			runCs("bin/cs/bin/TestMain-Debug.exe");
+
+			runCommand("haxe", ['compile-cs-unsafe$compl.hxml'].concat(extras).concat(args));
+			runCs("bin/cs_unsafe/bin/TestMain-Debug.exe");
+		}
+
+		runCommand("haxe", ['compile-cs$compl.hxml','-dce','no'].concat(args));
+		runCs("bin/cs/bin/TestMain-Debug.exe");
+
+		changeDirectory(sysDir);
+		runCommand("haxe", ["compile-cs.hxml",'-D','fast_cast'].concat(args));
+		runCs("bin/cs/bin/Main-Debug.exe", []);
+
+		// changeDirectory(threadsDir);
+		// runCommand("haxe", ["build.hxml", "-cs", "export/cs"]);
+		// runCs("export/cs/bin/Main.exe");
+
+		changeDirectory(miscCsDir);
+		runCommand("haxe", ["run.hxml"]);
+
+		changeDirectory(miscCsDir + "csTwoLibs");
+		for (i in 1...5)
+		{
+			runCommand("haxe", ['compile-$i.hxml','-D','fast_cast']);
+			runCs("bin/main/bin/Main.exe");
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/targets/Flash.hx b/tests/runci/targets/Flash.hx
new file mode 100644
index 0000000000000000000000000000000000000000..752e5587c3e34cb467e03db16b7780de262271b3
--- /dev/null
+++ b/tests/runci/targets/Flash.hx
@@ -0,0 +1,167 @@
+package runci.targets;
+
+import sys.io.File;
+import sys.FileSystem;
+import haxe.io.Path;
+import haxe.Json;
+import sys.io.Process;
+import haxe.Http;
+
+import runci.System.*;
+import runci.Config.*;
+
+class Flash {
+	static public function getLatestFPVersion():Array<Int> {
+		var appcast = Xml.parse(haxe.Http.requestUrl("http://fpdownload2.macromedia.com/get/flashplayer/update/current/xml/version_en_mac_pep.xml"));
+		var versionStr = new haxe.xml.Access(appcast).node.XML.node.update.att.version;
+		return versionStr.split(",").map(Std.parseInt);
+	}
+
+	static public function setupFlexSdk():Void {
+		if (commandSucceed("mxmlc", ["--version"])) {
+			infoMsg('mxmlc has already been installed.');
+		} else {
+			var apacheMirror = Json.parse(Http.requestUrl("http://www.apache.org/dyn/closer.lua?as_json=1")).preferred;
+			var flexVersion = "4.16.0";
+			runCommand("wget", ["-nv", '${apacheMirror}/flex/${flexVersion}/binaries/apache-flex-sdk-${flexVersion}-bin.tar.gz'], true);
+			runCommand("tar", ["-xf", 'apache-flex-sdk-${flexVersion}-bin.tar.gz', "-C", Sys.getEnv("HOME")]);
+			var flexsdkPath = Sys.getEnv("HOME") + '/apache-flex-sdk-${flexVersion}-bin';
+			addToPATH(flexsdkPath + "/bin");
+			var playerglobalswcFolder = flexsdkPath + "/player";
+			FileSystem.createDirectory(playerglobalswcFolder + "/11.1");
+			var flashVersion = runci.targets.Flash.getLatestFPVersion();
+			runCommand("wget", ["-nv", 'http://download.macromedia.com/get/flashplayer/updaters/${flashVersion[0]}/playerglobal${flashVersion[0]}_${flashVersion[1]}.swc', "-O", playerglobalswcFolder + "/11.1/playerglobal.swc"], true);
+			File.saveContent(flexsdkPath + "/env.properties", 'env.PLAYERGLOBAL_HOME=$playerglobalswcFolder');
+			runCommand("mxmlc", ["--version"]);
+		}
+	}
+
+	static public var playerCmd:String;
+
+	static public function setupFlashPlayerDebugger():Void {
+		var mmcfgPath = switch (systemName) {
+			case "Linux":
+				Sys.getEnv("HOME") + "/mm.cfg";
+			case "Mac":
+				"/Library/Application Support/Macromedia/mm.cfg";
+			case _:
+				throw "unsupported system";
+		}
+
+		switch (systemName) {
+			case "Linux":
+				playerCmd = "flashplayerdebugger";
+				if(Sys.command("type", [playerCmd]) != 0) {
+					Linux.requireAptPackages([
+						"libglib2.0", "libfreetype6"
+					]);
+					var majorVersion = getLatestFPVersion()[0];
+					runCommand("wget", ["-nv", 'http://fpdownload.macromedia.com/pub/flashplayer/updaters/${majorVersion}/flash_player_sa_linux_debug.x86_64.tar.gz'], true);
+					runCommand("tar", ["-xf", "flash_player_sa_linux_debug.x86_64.tar.gz", "-C", Sys.getEnv("HOME")]);
+					playerCmd = Path.join([Sys.getEnv("HOME"), "flashplayerdebugger"]);
+				}
+				if (!FileSystem.exists(mmcfgPath)) {
+					File.saveContent(mmcfgPath, "ErrorReportingEnable=1\nTraceOutputFileEnable=1");
+				}
+				switch (ci) {
+					case AzurePipelines:
+						runCommand("xvfb-run", ["-a", playerCmd, "-v"]);
+					case _:
+						runCommand(playerCmd, ["-v"]);
+				}
+			case "Mac":
+				if (commandResult("brew", ["cask", "list", "flash-player-debugger"]).exitCode == 0) {
+					return;
+				}
+				runCommand("brew", ["update"]);
+				runCommand("brew", ["cask", "install", "flash-player-debugger"]);
+
+				// Disable the "application downloaded from Internet" warning
+				runCommand("xattr", ["-d", "-r", "com.apple.quarantine", "/Applications/Flash Player Debugger.app"]);
+
+				var dir = Path.directory(mmcfgPath);
+				if (!FileSystem.exists(dir)) {
+					runCommand("sudo", ["mkdir", "-p", dir]);
+					runCommand("sudo", ["chmod", "a+w", dir]);
+				}
+				if (!FileSystem.exists(mmcfgPath)) {
+					File.saveContent(mmcfgPath, "ErrorReportingEnable=1\nTraceOutputFileEnable=1");
+				}
+		}
+	}
+
+	/**
+		Run a Flash swf file.
+		Return whether the test is successful or not.
+		It detemines the test result by reading the flashlog.txt, looking for "SUCCESS: true".
+	*/
+	static public function runFlash(swf:String):Bool {
+		swf = FileSystem.fullPath(swf);
+		Sys.println('going to run $swf');
+		switch (systemName) {
+			case "Linux":
+				switch (ci) {
+					case AzurePipelines:
+						new Process("xvfb-run", ["-a", playerCmd, swf]);
+					case _:
+						new Process(playerCmd, [swf]);
+				}
+			case "Mac":
+				Sys.command("open", ["-a", "/Applications/Flash Player Debugger.app", swf]);
+		}
+
+		//wait a little until flashlog.txt is created
+		var flashlogPath = switch (systemName) {
+			case "Linux":
+				Sys.getEnv("HOME") + "/.macromedia/Flash_Player/Logs/flashlog.txt";
+			case "Mac":
+				Sys.getEnv("HOME") + "/Library/Preferences/Macromedia/Flash Player/Logs/flashlog.txt";
+			case _:
+				throw "unsupported system";
+		}
+
+		for (t in 0...5) {
+			runCommand("sleep", ["2"]);
+			if (FileSystem.exists(flashlogPath))
+				break;
+		}
+		if (!FileSystem.exists(flashlogPath)) {
+			failMsg('$flashlogPath not found.');
+			return false;
+		}
+
+		//read flashlog.txt continously
+		var traceProcess = new Process("tail", ["-f", flashlogPath]);
+		var success = false;
+		while (true) {
+			try {
+				var line = traceProcess.stdout.readLine();
+				if (line.indexOf("success: ") >= 0) {
+					success = line.indexOf("success: true") >= 0;
+					break;
+				}
+			} catch (e:haxe.io.Eof) {
+				break;
+			}
+		}
+		Sys.command("cat", [flashlogPath]);
+		return success;
+	}
+
+	static public function run(args:Array<String>) {
+		setupFlashPlayerDebugger();
+		setupFlexSdk();
+		var success = true;
+		for (argsVariant in [[], ["--swf-version", "32"]]) {
+			runCommand("haxe", ["compile-flash9.hxml", "-D", "fdb", "-D", "dump", "-D", "dump_ignore_var_ids"].concat(args).concat(argsVariant));
+			var runSuccess = runFlash("bin/unit9.swf");
+			if (!runSuccess) {
+				success = false;
+			}
+		}
+		if (!success)
+			fail();
+	}
+
+
+}
\ No newline at end of file
diff --git a/tests/runci/targets/Hl.hx b/tests/runci/targets/Hl.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3436d31c5145ac96e4bb1df6c0338f4d2897515c
--- /dev/null
+++ b/tests/runci/targets/Hl.hx
@@ -0,0 +1,80 @@
+package runci.targets;
+
+import haxe.io.Path;
+import sys.FileSystem;
+import runci.System.*;
+import runci.Config.*;
+
+class Hl {
+    static var hlSrc = switch [ci, systemName] {
+      case [AppVeyor | AzurePipelines, "Windows"]: "C:\\hashlink";
+      case _: Path.join([Sys.getEnv("HOME"), "hashlink"]);
+    };
+    static var hlBuild = switch [ci, systemName] {
+      case [AppVeyor | AzurePipelines, "Windows"]: "C:\\hashlink_build";
+      case _: Path.join([Sys.getEnv("HOME"), "hashlink_build"]);
+    };
+    static var hlBinDir = switch [ci, systemName] {
+      case [AppVeyor | AzurePipelines, "Windows"]: "C:\\hashlink_build\\bin";
+      case _: Path.join([Sys.getEnv("HOME"), "hashlink_build", "bin"]);
+    };
+    static var hlBinary = switch [ci, systemName] {
+      case [AppVeyor | AzurePipelines, "Windows"]: "C:\\hashlink_build\\bin\\hl.exe";
+      case _: Path.join([Sys.getEnv("HOME"), "hashlink_build", "bin", "hl"]);
+    };
+
+    static public function getHlDependencies() {
+        if (commandSucceed("hl", ["--version"])) {
+            infoMsg('hl has already been installed.');
+            return;
+        }
+        runCommand("git", ["clone", "https://github.com/HaxeFoundation/hashlink.git", hlSrc]);
+
+        switch (systemName) {
+            case "Linux":
+                Linux.requireAptPackages(["libpng-dev", "libjpeg-turbo8-dev", "libturbojpeg", "zlib1g-dev", "libvorbis-dev"]);
+            case "Mac":
+                runCommand("brew", ["bundle", '--file=${hlSrc}/Brewfile'], true);
+            case "Windows":
+                //pass
+        }
+
+        FileSystem.createDirectory(hlBuild);
+        var generator = systemName == "Windows" ? [] : ["-GNinja"];
+        runCommand("cmake", generator.concat([
+            "-DBUILD_TESTING=OFF",
+            "-DWITH_BULLET=OFF",
+            "-DWITH_DIRECTX=OFF",
+            "-DWITH_FMT=ON",
+            "-DWITH_OPENAL=OFF",
+            "-DWITH_SDL=OFF",
+            "-DWITH_SQLITE=OFF",
+            "-DWITH_SSL=OFF",
+            "-DWITH_UI=OFF",
+            "-DWITH_UV=OFF",
+            "-DWITH_VIDEO=OFF",
+            "-B" + hlBuild,
+            "-H" + hlSrc
+        ]));
+        runCommand("cmake", [
+            "--build", hlBuild
+        ]);
+
+        runCommand(hlBinary, ["--version"]);
+        addToPATH(hlBinDir);
+    }
+
+    static public function run(args:Array<String>) {
+        getHlDependencies();
+        runCommand("haxe", ["compile-hl.hxml"].concat(args));
+        runCommand(hlBinary, ["bin/unit.hl"]);
+
+		// changeDirectory(threadsDir);
+		// runCommand("haxe", ["build.hxml", "-hl", "export/threads.hl"]);
+		// runCommand("hl", ["export/threads.hl"]);
+
+        changeDirectory(sysDir);
+        runCommand("haxe", ["compile-hl.hxml"].concat(args));
+        runCommand(hlBinary, ["bin/hl/sys.hl"]);
+    }
+}
\ No newline at end of file
diff --git a/tests/runci/targets/Java.hx b/tests/runci/targets/Java.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b63418e0b16e9bb99a3acce4489ea1323eb38691
--- /dev/null
+++ b/tests/runci/targets/Java.hx
@@ -0,0 +1,57 @@
+package runci.targets;
+
+import sys.FileSystem;
+import runci.System.*;
+import runci.Config.*;
+using StringTools;
+
+class Java {
+	static var miscJavaDir(get,never):String;
+	static inline function get_miscJavaDir() return miscDir + 'java/';
+
+	static public function getJavaDependencies() {
+		haxelibInstallGit("HaxeFoundation", "hxjava", true);
+		runCommand("javac", ["-version"]);
+	}
+
+	static public function run(args:Array<String>) {
+		deleteDirectoryRecursively("bin/java");
+		getJavaDependencies();
+
+		runCommand("haxe", ["compile-java.hxml"].concat(args));
+		runCommand("java", ["-jar", "bin/java/TestMain-Debug.jar"]);
+
+		runCommand("haxe", ["compile-java.hxml","-dce","no"].concat(args));
+		runCommand("java", ["-jar", "bin/java/TestMain-Debug.jar"]);
+
+		changeDirectory(miscJavaDir);
+		runCommand("haxe", ["run.hxml"]);
+
+		changeDirectory(sysDir);
+		runCommand("haxe", ["compile-java.hxml"].concat(args));
+		runCommand("java", ["-jar", "bin/java/Main-Debug.jar"]);
+
+		changeDirectory(threadsDir);
+		runCommand("haxe", ["build.hxml", "-java", "export/java"].concat(args));
+		if (systemName != "Windows") { // #8154
+			runCommand("java", ["-jar", "export/java/Main.jar"]);
+		}
+
+		infoMsg("Testing java-lib extras");
+		changeDirectory('$unitDir/bin');
+		if (!FileSystem.exists('java-lib-tests')) {
+			runCommand("git", ["clone", "https://github.com/waneck/java-lib-tests.git", "--depth", "1"], true);
+		}
+		for (dir in FileSystem.readDirectory('java-lib-tests'))
+		{
+			var path = 'java-lib-tests/$dir';
+			if (FileSystem.isDirectory(path)) for (file in FileSystem.readDirectory(path))
+			{
+				if (file.endsWith('.hxml'))
+				{
+					runCommand("haxe", ["--cwd",'java-lib-tests/$dir',file]);
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/targets/Js.hx b/tests/runci/targets/Js.hx
new file mode 100644
index 0000000000000000000000000000000000000000..994323b6d2c1a85aba4f75578f37cc7cfd40a64c
--- /dev/null
+++ b/tests/runci/targets/Js.hx
@@ -0,0 +1,113 @@
+package runci.targets;
+
+import sys.FileSystem;
+import runci.System.*;
+import runci.Config.*;
+import haxe.io.Path;
+import sys.io.Process;
+
+using StringTools;
+
+class Js {
+	static public function getJSDependencies() {
+		switch [ci, systemName] {
+			case [_, "Linux"]:
+				if (commandSucceed("node", ["-v"])) {
+					infoMsg('node has already been installed.');
+				} else {
+					Linux.requireAptPackages(["nodejs"]);
+				}
+			case [AzurePipelines, "Mac"]:
+				runCommand("brew", ["install", "node@10"], true);
+				runCommand("brew", ["link", "--overwrite", "--force", "node@10"]);
+			case _:
+				//pass
+		}
+
+		runCommand("node", ["-v"]);
+	}
+
+	static public function run(args:Array<String>) {
+		getJSDependencies();
+
+		var jsOutputs = [
+			for (es_ver in    [[], ["-D", "js-es=3"], ["-D", "js-es=6"]])
+			for (unflatten in [[], ["-D", "js-unflatten"]])
+			for (classic in   [[], ["-D", "js-classic"]])
+			for (enums_as_objects in [[], ["-D", "js-enums-as-arrays"]])
+			{
+				var extras = args.concat(es_ver).concat(unflatten).concat(classic).concat(enums_as_objects);
+
+				runCommand("haxe", ["compile-js.hxml"].concat(extras));
+
+				var output = if (extras.length > 0) {
+					"bin/js/" + extras.join("") + "/unit.js";
+				} else {
+					"bin/js/default/unit.js";
+				}
+				var outputDir = Path.directory(output);
+				if (!FileSystem.exists(outputDir)) {
+					FileSystem.createDirectory(outputDir);
+				}
+				FileSystem.rename("bin/unit.js", output);
+				FileSystem.rename("bin/unit.js.map", output + ".map");
+				runCommand("node", ["-e", "require('./" + output + "').unit.TestMain.main();"]);
+				output;
+			}
+		];
+
+		infoMsg("Test ES6:");
+		changeDirectory(miscDir + "es6");
+		runCommand("haxe", ["run.hxml"]);
+
+		haxelibInstallGit("HaxeFoundation", "hxnodejs");
+		var env = Sys.environment();
+		if (
+			env.exists("SAUCE") &&
+			env.exists("SAUCE_USERNAME") &&
+			env.exists("SAUCE_ACCESS_KEY")
+		) {
+			var sc = switch (ci) {
+				case AzurePipelines:
+					var scVersion = "sc-4.5.3-linux";
+					runCommand("wget", ["-q", 'https://saucelabs.com/downloads/${scVersion}.tar.gz'], true);
+					runCommand("tar", ["-xf", '${scVersion}.tar.gz']);
+
+					//start sauce-connect
+					var scReadyFile = "sauce-connect-ready-" + Std.random(100);
+					var p = new Process('${scVersion}/bin/sc', [
+						"-i", Sys.getEnv("SAUCE_TUNNEL_ID"),
+						"-f", scReadyFile
+					]);
+					while(!FileSystem.exists(scReadyFile)) {
+						Sys.sleep(0.5);
+					}
+					p;
+				case _:
+					// sauce-connect should have been started
+					null;
+			}
+
+			changeDirectory(unitDir);
+			runCommand("npm", ["install", "wd", "q"], true);
+			runCommand("haxe", ["compile-saucelabs-runner.hxml"]);
+			var server = new Process("nekotools", ["server"]);
+			runCommand("node", ["bin/RunSauceLabs.js"].concat([for (js in jsOutputs) "unit-js.html?js=" + js.urlEncode()]));
+
+			server.close();
+
+			if (sc != null)
+				sc.close();
+		}
+
+		infoMsg("Test optimization:");
+		changeDirectory(optDir);
+		runCommand("haxe", ["run.hxml"]);
+
+		runci.targets.Java.getJavaDependencies(); // this is awkward
+		haxelibInstallGit("Simn", "haxeserver");
+		changeDirectory(serverDir);
+		runCommand("haxe", ["build.hxml"]);
+		runCommand("node", ["test.js"]);
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/targets/Jvm.hx b/tests/runci/targets/Jvm.hx
new file mode 100644
index 0000000000000000000000000000000000000000..869a5178dc3b0c997a196f524a8ea696a472bc00
--- /dev/null
+++ b/tests/runci/targets/Jvm.hx
@@ -0,0 +1,24 @@
+package runci.targets;
+
+import runci.System.*;
+import runci.Config.*;
+
+class Jvm {
+	static public function run(args:Array<String>) {
+		runCommand("haxe", ["compile-jvm.hxml"].concat(args));
+		runCommand("java", ["-jar", "bin/jvm/TestMain-Debug.jar"]);
+
+		runCommand("haxe", ["compile-jvm.hxml","-dce","no"].concat(args));
+		runCommand("java", ["-jar", "bin/jvm/TestMain-Debug.jar"]);
+
+		changeDirectory(sysDir);
+		runCommand("haxe", ["compile-jvm.hxml"].concat(args));
+		runCommand("java", ["-jar", "bin/jvm/Main-Debug.jar"]);
+
+		changeDirectory(threadsDir);
+		runCommand("haxe", ["build.hxml", "-java", "export/jvm", "-D", "jvm"].concat(args));
+		if (systemName != "Windows") { // #8154
+			runCommand("java", ["-jar", "export/jvm/Main.jar"]);
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/targets/Lua.hx b/tests/runci/targets/Lua.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2202bc65d81b636880bc3e82a29a44aac95540d2
--- /dev/null
+++ b/tests/runci/targets/Lua.hx
@@ -0,0 +1,79 @@
+package runci.targets;
+
+import sys.FileSystem;
+import runci.System.*;
+import runci.Config.*;
+import haxe.io.*;
+using StringTools;
+
+class Lua {
+	static public function getLuaDependencies(){
+		switch (systemName){
+			case "Linux":
+				Linux.requireAptPackages(["libpcre3-dev", "libssl-dev", "libreadline-dev"]);
+				runCommand("pip", ["install", "--user", "hererocks"]);
+				var pyUserBase = commandResult("python", ["-m", "site", "--user-base"]).stdout.trim();
+				addToPATH(Path.join([pyUserBase, "bin"]));
+			case "Mac": {
+				if (commandSucceed("python3", ["-V"]))
+					infoMsg('python3 has already been installed.');
+				else
+					runCommand("brew", ["install", "python3"], true);
+
+				runCommand("brew", ["install", "pcre"], false, true);
+				runCommand("pip3", ["install", "hererocks"]);
+			}
+		}
+	}
+
+	static function installLib(lib : String, version : String, server = "https://luarocks.org/dev"){
+		var server_arg = '--server=$server';
+		if (!commandSucceed("luarocks", ["show", lib, version])) {
+			runCommand("luarocks", ["install",lib, version, server_arg]);
+		} else {
+			infoMsg('Lua dependency $lib is already installed at version $version');
+		}
+	}
+
+	static public function run(args:Array<String>) {
+
+		getLuaDependencies();
+
+		for (lv in ["-l5.1", "-l5.2", "-l5.3", "-j2.0", "-j2.1" ]){
+
+			var envpath = Sys.getEnv("HOME") + '/lua_env$lv';
+			addToPATH(envpath + '/bin');
+
+			if (systemName == "Mac" && lv.startsWith("-j")) continue;
+			Sys.println('--------------------');
+			Sys.println('Lua Version: $lv');
+			runCommand("hererocks", [envpath, lv, "-rlatest", "-i"]);
+			trace('path: ' + Sys.getEnv("PATH"));
+
+
+			runCommand("lua",["-v"]);
+
+			runCommand("luarocks", ["config", "--lua-incdir"]);
+			runCommand("luarocks", ["config", "--lua-libdir"]);
+			runCommand("luarocks", ["config", "--lua-ver"]);
+			runCommand("luarocks", ["config", "--system-config"]);
+			runCommand("luarocks", ["config", "--rock-trees"]);
+
+			// Note: don't use a user config
+			// runCommand("luarocks", ["config", "--user-config"], false, true);
+
+			installLib("haxe-deps", "0.0.1-1");
+
+			changeDirectory(unitDir);
+			runCommand("haxe", ["compile-lua.hxml"].concat(args));
+			runCommand("lua", ["bin/unit.lua"]);
+
+			changeDirectory(sysDir);
+			runCommand("haxe", ["compile-lua.hxml"].concat(args));
+			runCommand("lua", ["bin/lua/sys.lua"]);
+
+			changeDirectory(miscDir + "luaDeadCode/stringReflection");
+			runCommand("haxe", ["compile.hxml"]);
+		}
+	}
+}
diff --git a/tests/runci/targets/Macro.hx b/tests/runci/targets/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c9984630af8cf82737e284b0ec74eb22441ff886
--- /dev/null
+++ b/tests/runci/targets/Macro.hx
@@ -0,0 +1,40 @@
+package runci.targets;
+
+import sys.FileSystem;
+import runci.System.*;
+import runci.Config.*;
+
+class Macro {
+	static public function run(args:Array<String>) {
+		runCommand("haxe", ["compile-macro.hxml"].concat(args));
+
+		changeDirectory(displayDir);
+		haxelibInstallGit("Simn", "haxeserver");
+		runCommand("haxe", ["build.hxml"]);
+
+		changeDirectory(sourcemapsDir);
+		runCommand("haxe", ["run.hxml"]);
+
+		changeDirectory(nullSafetyDir);
+		infoMsg("No-target null safety:");
+		runCommand("haxe", ["test.hxml"]);
+		infoMsg("Js-es6 null safety:");
+		runCommand("haxe", ["test-js-es6.hxml"]);
+
+		changeDirectory(miscDir);
+		runCommand("haxe", ["compile.hxml"]);
+
+		changeDirectory(sysDir);
+		runCommand("haxe", ["compile-macro.hxml"].concat(args));
+
+		switch Sys.systemName() {
+			case 'Linux':
+				changeDirectory(miscDir + 'compiler_loops');
+				runCommand("haxe", ["run.hxml"]);
+			case _: // TODO
+		}
+
+		// changeDirectory(threadsDir);
+		// runCommand("haxe", ["build.hxml", "--interp"]);
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/targets/Neko.hx b/tests/runci/targets/Neko.hx
new file mode 100644
index 0000000000000000000000000000000000000000..433fac54258ce798d85efcc33ee6c251d379448c
--- /dev/null
+++ b/tests/runci/targets/Neko.hx
@@ -0,0 +1,20 @@
+package runci.targets;
+
+import sys.FileSystem;
+import runci.System.*;
+import runci.Config.*;
+
+class Neko {
+	static public function run(args:Array<String>) {
+		runCommand("haxe", ["compile-neko.hxml", "-D", "dump", "-D", "dump_ignore_var_ids"].concat(args));
+		runCommand("neko", ["bin/unit.n"]);
+
+		changeDirectory(sysDir);
+		runCommand("haxe", ["compile-neko.hxml"].concat(args));
+		runCommand("neko", ["bin/neko/sys.n"]);
+
+		// changeDirectory(threadsDir);
+		// runCommand("haxe", ["build.hxml", "-neko", "export/threads.n"]);
+		// runCommand("neko", ["export/threads.n"]);
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/targets/Php.hx b/tests/runci/targets/Php.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3d622464b451eea10196625aec104508ba84b4ab
--- /dev/null
+++ b/tests/runci/targets/Php.hx
@@ -0,0 +1,80 @@
+package runci.targets;
+
+import sys.FileSystem;
+import runci.System.*;
+import runci.Config.*;
+
+class Php {
+	static var miscPhpDir(get,never):String;
+	static inline function get_miscPhpDir() return miscDir + 'php/';
+
+	static public function getPhpDependencies() {
+		var phpCmd = commandResult("php", ["-v"]);
+		var phpVerReg = ~/PHP ([0-9]+\.[0-9]+)/i;
+		var phpVer = if (phpVerReg.match(phpCmd.stdout))
+			Std.parseFloat(phpVerReg.matched(1));
+		else
+			null;
+
+		if (phpCmd.exitCode == 0 && phpVer != null && phpVer >= 7.0) {
+			infoMsg('php ${phpVer} has already been installed.');
+			return;
+		}
+		switch [ci, systemName] {
+			case [TravisCI, "Linux"]:
+				runCommand("phpenv", ["global", "7.0"], false, true);
+			case [_, "Linux"]:
+				Linux.requireAptPackages(["php-cli", "php-mbstring"]);
+			case [_, "Mac"]:
+				runCommand("brew", ["install", "php"], true);
+			case [_, "Windows"]:
+				runCommand("cinst", ["php", "-version", "7.1.8", "-y"], true);
+			case _:
+				throw 'unknown combination: $ci, $systemName';
+		}
+		runCommand("php", ["-v"]);
+	}
+
+	static public function run(args:Array<String>) {
+		getPhpDependencies();
+
+		changeDirectory(miscPhpDir);
+		runThroughPhpVersions(runCommand.bind("haxe", ["run.hxml"]));
+
+		var binDir = "bin/php";
+
+		var prefixes = [[]];
+		if(isCi()) {
+			prefixes.push(['-D', 'php-prefix=haxe']);
+			prefixes.push(['-D', 'php-prefix=my.pack']);
+		}
+
+		for(prefix in prefixes) {
+			changeDirectory(unitDir);
+			if(isCi()) {
+				deleteDirectoryRecursively(binDir);
+			}
+
+			runCommand("haxe", ["compile-php.hxml"].concat(prefix).concat(args));
+			runThroughPhpVersions(runCommand.bind("php", [binDir + "/index.php"]));
+
+			changeDirectory(sysDir);
+			if(isCi()) {
+				deleteDirectoryRecursively(binDir);
+			}
+			runCommand("haxe", ["compile-php.hxml"].concat(prefix).concat(args));
+			runThroughPhpVersions(runCommand.bind("php", ["bin/php/Main/index.php"]));
+		}
+	}
+
+	static function runThroughPhpVersions(fn:()->Void) {
+		if(ci == TravisCI && systemName == "Linux") {
+			for(version in ['7.0', '7.1'/*, '7.2', '7.3'*/]) { //7.2 and 7.3 are not available on travis Ubuntu trusty
+				runCommand("phpenv", ["global", version]);
+				fn();
+			}
+		} else {
+			fn();
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/runci/targets/Python.hx b/tests/runci/targets/Python.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a4465eddf8d84dd20da76357a0bd52eafe1ba983
--- /dev/null
+++ b/tests/runci/targets/Python.hx
@@ -0,0 +1,83 @@
+package runci.targets;
+
+import sys.FileSystem;
+import runci.System.*;
+import runci.Config.*;
+
+class Python {
+	static var miscPythonDir(get,never):String;
+	static inline function get_miscPythonDir() return miscDir + 'python/';
+
+	static public function getPythonDependencies():Array<String> {
+		switch (systemName) {
+			case "Linux":
+				if (commandSucceed("python3", ["-V"]))
+					infoMsg('python3 has already been installed.');
+				else
+					Linux.requireAptPackages(["python3"]);
+				runCommand("python3", ["-V"]);
+
+				var pypy = "pypy3";
+				if (commandSucceed(pypy, ["-V"])) {
+					infoMsg('pypy3 has already been installed.');
+				} else {
+					var pypyVersion = "pypy3-2.4.0-linux64";
+					var file = '${pypyVersion}.tar.bz2';
+					if(!FileSystem.exists(file)) {
+						runCommand("wget", ["-nv", 'https://bitbucket.org/pypy/pypy/downloads/$file'], true);
+					}
+					runCommand("tar", ["-xf", file]);
+					pypy = FileSystem.fullPath('${pypyVersion}/bin/pypy3');
+				}
+				runCommand(pypy, ["-V"]);
+
+				return ["python3", pypy];
+			case "Mac":
+				if (commandSucceed("python3", ["-V"]))
+					infoMsg('python3 has already been installed.');
+				else
+					runCommand("brew", ["install", "python3"], true);
+				runCommand("python3", ["-V"]);
+
+				if (commandSucceed("pypy3", ["-V"]))
+					infoMsg('pypy3 has already been installed.');
+				else
+					runCommand("brew", ["install", "pypy3"], true);
+				runCommand("pypy3", ["-V"]);
+
+				return ["python3", "pypy3"];
+			case "Windows":
+				if (commandSucceed("python3", ["-V"]))
+					infoMsg('python3 has already been installed.');
+				else
+					throw "please install python 3.x and make it available as python3 in PATH";
+				runCommand("python3", ["-V"]);
+				return ["python3"];
+		}
+
+		return [];
+	}
+
+	static public function run(args:Array<String>) {
+		var pys = getPythonDependencies();
+		runCommand("haxe", ["compile-python.hxml"].concat(args));
+		for (py in pys) {
+			runCommand(py, ["bin/unit.py"]);
+		}
+
+		changeDirectory(sysDir);
+		runCommand("haxe", ["compile-python.hxml"].concat(args));
+		for (py in pys) {
+			runCommand(py, ["bin/python/sys.py"]);
+		}
+
+		changeDirectory(miscPythonDir);
+		runCommand("haxe", ["run.hxml"]);
+
+		changeDirectory(miscPythonDir + "pythonImport");
+		runCommand("haxe", ["compile.hxml"]);
+		for (py in pys) {
+			runCommand(py, ["test.py"]);
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/server/.vscode/launch.json b/tests/server/.vscode/launch.json
new file mode 100644
index 0000000000000000000000000000000000000000..3b54bf91c10166d4d22ad759a0e0bfaa1650ea19
--- /dev/null
+++ b/tests/server/.vscode/launch.json
@@ -0,0 +1,16 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Launch Program",
+			"program": "${workspaceFolder}/test.js"
+		},
+		{
+			"name": "Macro",
+			"type": "haxe-eval",
+			"request": "launch"
+		}
+	]
+}
\ No newline at end of file
diff --git a/tests/server/.vscode/settings.json b/tests/server/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..9f0eb0d8dc19bf43f9d1f24d832e2502f76fdaeb
--- /dev/null
+++ b/tests/server/.vscode/settings.json
@@ -0,0 +1,12 @@
+{
+	"haxe.diagnosticsPathFilter": "${workspaceRoot}/src",
+	"editor.formatOnSave": true,
+	"haxeTestExplorer.testCommand": [
+		"${haxe}",
+		"build.hxml",
+		"-lib",
+		"test-adapter",
+		"-cmd",
+		"node test.js"
+	]
+}
\ No newline at end of file
diff --git a/tests/server/.vscode/tasks.json b/tests/server/.vscode/tasks.json
new file mode 100644
index 0000000000000000000000000000000000000000..534edcce71f49b8c7e2abf2586d18e80a9792f91
--- /dev/null
+++ b/tests/server/.vscode/tasks.json
@@ -0,0 +1,13 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "hxml",
+			"file": "build.hxml",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/tests/server/build.hxml b/tests/server/build.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..8529f804cb1d4a66999af32fda37f9e56dbb392f
--- /dev/null
+++ b/tests/server/build.hxml
@@ -0,0 +1,7 @@
+-p src
+-cp ../display/src-shared
+--main Main
+-js test.js
+-lib hxnodejs
+-lib utest
+-lib haxeserver
\ No newline at end of file
diff --git a/tests/server/src/AsyncMacro.hx b/tests/server/src/AsyncMacro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..94ba91b13903aa07c3569042b5befe249ea37af9
--- /dev/null
+++ b/tests/server/src/AsyncMacro.hx
@@ -0,0 +1,53 @@
+import haxe.macro.Expr;
+import haxe.macro.Context;
+
+using StringTools;
+
+class AsyncMacro {
+	static public macro function build():Array<Field> {
+		var fields = Context.getBuildFields();
+		for (field in fields) {
+			if (!field.name.startsWith("test")) {
+				continue;
+			}
+			switch (field.kind) {
+				case FFun(f):
+					f.args.push({
+						name: "async",
+						type: macro:utest.Async
+					});
+					switch (f.expr.expr) {
+						case EBlock(el):
+							el.push(macro @:pos(f.expr.pos) async.done());
+							f.expr = transformHaxeCalls(el);
+						case _:
+							Context.error("Block expression expected", f.expr.pos);
+					}
+				case _:
+			}
+		}
+		return fields;
+	}
+
+	static function transformHaxeCalls(el:Array<Expr>) {
+		var e0 = el.shift();
+		return if (el.length == 0) {
+			e0;
+		} else switch (e0) {
+			case macro runHaxe($a{args}):
+				var e = transformHaxeCalls(el);
+				args.push(macro() -> $e);
+				macro runHaxe($a{args});
+			case macro runHaxeJson($a{args}):
+				var e = transformHaxeCalls(el);
+				args.push(macro() -> $e);
+				macro runHaxeJson($a{args});
+			case macro complete($a{args}):
+				var e = transformHaxeCalls(el);
+				args.push(macro function(response, markers) $e);
+				macro complete($a{args});
+			case _:
+				macro {$e0; ${transformHaxeCalls(el)}};
+		}
+	}
+}
diff --git a/tests/server/src/DisplayTests.hx b/tests/server/src/DisplayTests.hx
new file mode 100644
index 0000000000000000000000000000000000000000..879d1d28a500f5bd176f95cbd4e0994f089c7edb
--- /dev/null
+++ b/tests/server/src/DisplayTests.hx
@@ -0,0 +1,248 @@
+import haxe.display.Protocol;
+import haxe.PosInfos;
+import haxe.display.Server;
+import utest.Assert;
+import utest.Assert.*;
+import haxe.display.Display;
+import haxe.display.FsPath;
+
+@:timeout(5000)
+// TODO: somebody has to clean this up
+class DisplayTests extends HaxeServerTestCase {
+	function testIssue7305() {
+		var content = 'class Main {
+	static public function main() {
+		new Map{-1-}
+	}
+}';
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.Completion, {
+			file: new FsPath("Main.hx"),
+			offset: transform.markers[1],
+			wasAutoTriggered: true
+		});
+		var result = parseCompletion();
+		assertHasCompletion(result, item -> switch (item.kind) {
+			case Type: item.args.path.pack.length == 0 && item.args.path.typeName == "Map";
+			case _: false;
+		});
+	}
+
+	function testIssue7317() {
+		var content = 'class Main {
+	public static function main() {
+		var obj = {};
+		obj.{-1-}
+	}
+}';
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.Completion, {
+			file: new FsPath("Main.hx"),
+			offset: transform.markers[1],
+			wasAutoTriggered: true
+		});
+		var result = parseCompletion();
+		Assert.equals("obj", result.result.mode.args.item.args.name);
+	}
+
+	function testIssue8061() {
+		var content = 'class Main {
+	static function main() {
+		new sys.io.Process({-1-})
+	}
+}';
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.SignatureHelp, {
+			file: new FsPath("Main.hx"),
+			offset: transform.markers[1],
+			wasAutoTriggered: true
+		});
+		var result = parseSignatureHelp();
+		Assert.isTrue(result.result.signatures[0].documentation != null);
+	}
+
+	function testIssue8194() {
+		var content = 'class Main {
+	static function main() {
+		switch ("p") {
+			case "p"{-1-}
+				"foo";
+		}
+	}
+}';
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.Completion, {
+			file: new FsPath("Main.hx"),
+			offset: transform.markers[1],
+			wasAutoTriggered: true
+		});
+		var result = parseCompletion();
+		Assert.equals(null, result.result);
+	}
+
+	function testIssue8381() {
+		var content = 'class Main {
+	static function main() {
+		var f:Foo;
+		f.f{-1-}oo();
+		f.bar;
+	}
+}
+
+typedef Foo = {
+	/** Test **/
+	function foo():Void;
+
+	/** Test **/
+	var bar:Int;
+}';
+
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.Hover, {
+			file: new FsPath("Main.hx"),
+			offset: transform.markers[1]
+		});
+		var result = parseHover();
+		Assert.equals(DisplayItemKind.ClassField, result.result.item.kind);
+	}
+
+	function testIssue8438() {
+		var content = 'class Main {
+	static function main() {
+		" ".char{-1-}
+	}
+}';
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.Completion, {
+			file: new FsPath("Main.hx"),
+			offset: transform.markers[1],
+			wasAutoTriggered: true
+		});
+		var result = parseCompletion();
+		Assert.equals(6, result.result.replaceRange.start.character);
+		Assert.equals(10, result.result.replaceRange.end.character);
+	}
+
+	function testIssue8602() {
+		var content = "class Main {
+	static function main() {
+		haxe.ds.{-1-}
+	}
+}";
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.Completion, {file: new FsPath("Main.hx"), offset: transform.markers[1], wasAutoTriggered: true});
+		var result = parseCompletion();
+		Assert.equals(Toplevel, result.result.mode.kind);
+	}
+
+	function testIssue8644() {
+		vfs.putContent("HelloJvm.hx", getTemplate("HelloJvm.hx"));
+		var args = ["-cp", ".", "--interp"];
+		runHaxeJson(args, ServerMethods.ReadClassPaths, null);
+		runHaxeJson(args, DisplayMethods.Completion, {file: new FsPath("HelloJvm.hx"), offset: 55, wasAutoTriggered: false});
+		var completion = parseCompletion();
+		assertHasNoCompletion(completion, module -> switch (module.kind) {
+			case Type: module.args.path.typeName == "Jvm";
+			case _: false;
+		});
+	}
+
+	function testIssue8651() {
+		var content = "class Main { static function main() { {-1-}buffer{-2-} } }";
+		vfs.putContent("Main.hx", content);
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.Completion, {file: new FsPath("Main.hx"), offset: transform.markers[2], wasAutoTriggered: true});
+		var result = parseCompletion();
+		var r = result.result;
+		Assert.equals("buffer", r.filterString);
+		Assert.equals(transform.markers[1], r.replaceRange.start.character);
+		Assert.equals(transform.markers[2], r.replaceRange.end.character);
+	}
+
+	function testIssue8657() {
+		var content = "class Main { static function main() { var x:{-1-}stream{-2-} } }";
+		vfs.putContent("Main.hx", content);
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.Completion, {file: new FsPath("Main.hx"), offset: transform.markers[2], wasAutoTriggered: true});
+		var result = parseCompletion();
+		var r = result.result;
+		Assert.equals("stream", r.filterString);
+		Assert.equals(transform.markers[1], r.replaceRange.start.character);
+		Assert.equals(transform.markers[2], r.replaceRange.end.character);
+	}
+
+	function testIssue8659() {
+		var content = "class Main extends {-1-}StreamTokenizer{-2-} { }";
+		vfs.putContent("Main.hx", content);
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.Completion, {file: new FsPath("Main.hx"), offset: transform.markers[2], wasAutoTriggered: true});
+		var result = parseCompletion();
+		var r = result.result;
+		Assert.equals("StreamTokenizer", r.filterString);
+		Assert.equals(transform.markers[1], r.replaceRange.start.character);
+		Assert.equals(transform.markers[2], r.replaceRange.end.character);
+	}
+
+	function testIssue8666() {
+		vfs.putContent("cp1/HelloWorld.hx", getTemplate("HelloWorld.hx"));
+		vfs.putContent("cp2/MyClass.hx", "class MyClass { }");
+		var args = ["-cp", "cp1", "--interp"];
+		runHaxeJson(args, DisplayMethods.Completion, {file: new FsPath("cp1/HelloWorld.hx"), offset: 75, wasAutoTriggered: false});
+		var completion = parseCompletion();
+		assertHasNoCompletion(completion, module -> switch (module.kind) {
+			case Type: module.args.path.typeName == "MyClass";
+			case _: false;
+		});
+		runHaxeJson(args.concat(["-cp", "cp2"]), DisplayMethods.Completion, {file: new FsPath("cp1/HelloWorld.hx"), offset: 75, wasAutoTriggered: false});
+		var completion = parseCompletion();
+		assertHasCompletion(completion, module -> switch (module.kind) {
+			case Type: module.args.path.typeName == "MyClass";
+			case _: false;
+		});
+	}
+
+	function testIssue8666_lib() {
+		vfs.putContent("cp1/HelloWorld.hx", getTemplate("HelloWorld.hx"));
+		vfs.putContent("cp2/MyClass.hx", "class MyClass { }");
+		var args = ["-cp", "cp1", "--interp"];
+		runHaxeJson(args, DisplayMethods.Completion, {file: new FsPath("cp1/HelloWorld.hx"), offset: 75, wasAutoTriggered: false});
+		var completion = parseCompletion();
+		assertHasNoCompletion(completion, module -> switch (module.kind) {
+			case Type: module.args.path.typeName == "MyClass";
+			case _: false;
+		});
+		runHaxeJson(args.concat(["-cp", "cp2", "-D", "imalibrary"]), DisplayMethods.Completion,
+			{file: new FsPath("cp1/HelloWorld.hx"), offset: 75, wasAutoTriggered: false});
+		var completion = parseCompletion();
+		assertHasCompletion(completion, module -> switch (module.kind) {
+			case Type: module.args.path.typeName == "MyClass";
+			case _: false;
+		});
+	}
+
+	function testIssue8732() {
+		var content = "class Main { static function main() { var ident = \"foo\"; {-1-}i{-2-}dent.{-3-} } }";
+		vfs.putContent("Main.hx", content);
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], Methods.Initialize, {maxCompletionItems: 50});
+		runHaxeJson([], DisplayMethods.Completion, {file: new FsPath("Main.hx"), offset: transform.markers[2], wasAutoTriggered: true});
+		runHaxeJson([], DisplayMethods.Completion, {file: new FsPath("Main.hx"), offset: transform.markers[3], wasAutoTriggered: true});
+		runHaxeJson([], DisplayMethods.Completion, {file: new FsPath("Main.hx"), offset: transform.markers[1], wasAutoTriggered: true});
+		var result = parseCompletion();
+		assertHasNoCompletion(result, item -> switch (item.kind) {
+			case ClassField: item.args.field.name == "charAt";
+			case _: false;
+		});
+	}
+}
diff --git a/tests/server/src/HaxeServerTestCase.hx b/tests/server/src/HaxeServerTestCase.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9172c91272e716b9ad547d9f316c8ab65c260073
--- /dev/null
+++ b/tests/server/src/HaxeServerTestCase.hx
@@ -0,0 +1,189 @@
+import haxeserver.HaxeServerRequestResult;
+import haxe.display.JsonModuleTypes;
+import haxe.display.Display;
+import haxe.display.Protocol;
+import haxe.Json;
+import haxeserver.process.HaxeServerProcessNode;
+import haxeserver.HaxeServerAsync;
+import utest.Assert;
+import utest.ITest;
+
+using StringTools;
+using Lambda;
+
+@:autoBuild(AsyncMacro.build())
+class HaxeServerTestCase implements ITest {
+	var server:HaxeServerAsync;
+	var vfs:Vfs;
+	var testDir:String;
+	var lastResult:HaxeServerRequestResult;
+	var messages:Array<String> = [];
+	var errorMessages = [];
+
+	static var i:Int = 0;
+
+	public function new() {}
+
+	public function setup() {
+		testDir = "test/cases/" + i++;
+		vfs = new Vfs(testDir);
+		server = new HaxeServerAsync(() -> new HaxeServerProcessNode("haxe", ["-v", "--cwd", testDir]));
+	}
+
+	public function teardown() {
+		server.stop();
+	}
+
+	function runHaxe(args:Array<String>, done:Void->Void) {
+		messages = [];
+		errorMessages = [];
+		server.rawRequest(args, null, function(result) {
+			lastResult = result;
+			sendLogMessage(result.stdout);
+			for (print in result.prints) {
+				var line = print.trim();
+				messages.push('Haxe print: $line');
+			}
+			if (result.hasError) {
+				sendErrorMessage(result.stderr);
+			}
+			done();
+		}, sendErrorMessage);
+	}
+
+	function runHaxeJson<TParams, TResponse>(args:Array<String>, method:HaxeRequestMethod<TParams, TResponse>, methodArgs:TParams, done:Void->Void) {
+		var methodArgs = {method: method, id: 1, params: methodArgs};
+		args = args.concat(['--display', Json.stringify(methodArgs)]);
+		runHaxe(args, done);
+	}
+
+	function sendErrorMessage(msg:String) {
+		var split = msg.split("\n");
+		for (message in split) {
+			errorMessages.push(message.trim());
+		}
+	}
+
+	function sendLogMessage(msg:String) {
+		var split = msg.split("\n");
+		for (message in split) {
+			messages.push(message.trim());
+		}
+	}
+
+	function getTemplate(templateName:String) {
+		return sys.io.File.getContent("test/templates/" + templateName);
+	}
+
+	function hasMessage<T>(msg:String) {
+		for (message in messages) {
+			if (message.endsWith(msg)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	function hasErrorMessage<T>(msg:String) {
+		for (message in errorMessages) {
+			if (message.endsWith(msg)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	function getStoredType<T>(typePackage:String, typeName:String) {
+		var storedTypes:Array<JsonModuleType<T>> = try {
+			Json.parse(lastResult.stderr).result.result;
+		} catch (e:Dynamic) {
+			trace(e);
+			[];
+		}
+		for (type in storedTypes) {
+			if (type.pack.join(".") == typePackage && type.name == typeName) {
+				return type;
+			}
+		}
+		return null;
+	}
+
+	function parseCompletion():CompletionResult {
+		return Json.parse(lastResult.stderr).result;
+	}
+
+	function parseHover():HoverResult {
+		return Json.parse(lastResult.stderr).result;
+	}
+
+	function parseSignatureHelp():SignatureHelpResult {
+		return Json.parse(lastResult.stderr).result;
+	}
+
+	function assertSuccess(?p:haxe.PosInfos) {
+		Assert.isTrue(0 == errorMessages.length, p);
+	}
+
+	function assertErrorMessage(message:String, ?p:haxe.PosInfos) {
+		Assert.isTrue(hasErrorMessage(message), p);
+	}
+
+	function assertHasPrint(line:String, ?p:haxe.PosInfos) {
+		Assert.isTrue(hasMessage("Haxe print: " + line), null, p);
+	}
+
+	function assertReuse(module:String, ?p:haxe.PosInfos) {
+		Assert.isTrue(hasMessage('reusing $module'), null, p);
+	}
+
+	function assertSkipping(module:String, ?dependency:String, ?p:haxe.PosInfos) {
+		var msg = 'skipping $module';
+		if (dependency != null) {
+			msg += '($dependency)';
+		}
+		Assert.isTrue(hasMessage(msg), null, p);
+	}
+
+	function assertNotCacheModified(module:String, ?p:haxe.PosInfos) {
+		Assert.isTrue(hasMessage('$module not cached (modified)'), null, p);
+	}
+
+	function assertHasType(typePackage:String, typeName:String, ?p:haxe.PosInfos) {
+		Assert.isTrue(getStoredType(typePackage, typeName) != null, null, p);
+	}
+
+	function assertHasField(typePackage:String, typeName:String, fieldName:String, isStatic:Bool, ?p:haxe.PosInfos) {
+		var type = getStoredType(typePackage, typeName);
+		Assert.isTrue(type != null, p);
+		function check<T>(type:JsonModuleType<T>) {
+			return switch [type.kind, type.args] {
+				case [Class, c]:
+					(isStatic ? c.statics : c.fields).exists(cf -> cf.name == fieldName);
+				case _: false;
+			}
+		}
+		if (type != null) {
+			Assert.isTrue(check(type), null, p);
+		}
+	}
+
+	function assertHasCompletion<T>(completion:CompletionResult, f:DisplayItem<T>->Bool, ?p:haxe.PosInfos) {
+		for (type in completion.result.items) {
+			if (f(type)) {
+				Assert.pass();
+				return;
+			}
+		}
+		Assert.fail("No such completion", p);
+	}
+
+	function assertHasNoCompletion<T>(completion:CompletionResult, f:DisplayItem<T>->Bool, ?p:haxe.PosInfos) {
+		for (type in completion.result.items) {
+			if (f(type)) {
+				Assert.fail("Unexpected completion", p);
+				return;
+			}
+		}
+		Assert.pass();
+	}
+}
diff --git a/tests/server/src/Main.hx b/tests/server/src/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2cb6c52347a133c076ec824903c2c7e8fcf61476
--- /dev/null
+++ b/tests/server/src/Main.hx
@@ -0,0 +1,273 @@
+import haxe.display.Display;
+import haxe.display.FsPath;
+import haxe.display.Server;
+import utest.Assert;
+
+using StringTools;
+using Lambda;
+
+@:timeout(10000)
+class ServerTests extends HaxeServerTestCase {
+	function testNoModification() {
+		vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
+		var args = ["-main", "HelloWorld.hx", "--no-output", "-js", "no.js"];
+		runHaxe(args);
+		runHaxe(args);
+		assertReuse("HelloWorld");
+		runHaxe(args);
+		assertReuse("HelloWorld");
+	}
+
+	function testModification() {
+		vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
+		var args = ["-main", "HelloWorld.hx", "--no-output", "-js", "no.js"];
+		runHaxe(args);
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("HelloWorld.hx")});
+		runHaxe(args);
+		assertSkipping("HelloWorld");
+		// assertNotCacheModified("HelloWorld");
+	}
+
+	function testDependency() {
+		vfs.putContent("WithDependency.hx", getTemplate("WithDependency.hx"));
+		vfs.putContent("Dependency.hx", getTemplate("Dependency.hx"));
+		var args = ["-main", "WithDependency.hx", "--no-output", "-js", "no.js"];
+		runHaxe(args);
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("Dependency.hx")});
+		runHaxe(args);
+		assertSkipping("WithDependency", "Dependency");
+		// assertNotCacheModified("Dependency");
+		runHaxe(args);
+		assertReuse("Dependency");
+		assertReuse("WithDependency");
+	}
+
+	function testMacro() {
+		vfs.putContent("MacroMain.hx", getTemplate("MacroMain.hx"));
+		vfs.putContent("Macro.hx", getTemplate("Macro.hx"));
+		var args = ["-main", "MacroMain.hx", "--no-output", "-js", "no.js"];
+		runHaxe(args);
+		assertHasPrint("1");
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("MacroMain.hx")});
+		runHaxe(args);
+		assertHasPrint("1");
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("Macro.hx")});
+		runHaxe(args);
+		assertHasPrint("1");
+		vfs.putContent("Macro.hx", getTemplate("Macro.hx").replace("1", "2"));
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("Macro.hx")});
+		runHaxe(args);
+		assertHasPrint("2");
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("MacroMain.hx")});
+		runHaxe(args);
+		assertHasPrint("2");
+	}
+
+	function testDceEmpty() {
+		vfs.putContent("Empty.hx", getTemplate("Empty.hx"));
+		var args = ["-main", "Empty", "--no-output", "-java", "java"];
+		runHaxe(args);
+		runHaxeJson(args, cast "typer/compiledTypes" /* TODO */, {});
+		assertHasField("", "Type", "enumIndex", true);
+	}
+
+	function testBuildMacro() {
+		vfs.putContent("BuildMacro.hx", getTemplate("BuildMacro.hx"));
+		vfs.putContent("BuiltClass.hx", getTemplate("BuiltClass.hx"));
+		var args = ["-main", "BuiltClass.hx", "--interp"];
+		runHaxe(args);
+		runHaxe(args);
+		assertReuse("BuiltClass");
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("BuildMacro.hx")});
+		runHaxe(args);
+		// assertNotCacheModified("BuildMacro");
+		assertSkipping("BuiltClass", "BuildMacro");
+		assertSkipping("BuildMacro");
+	}
+
+	function testBrokenSyntaxDiagnostics() {
+		vfs.putContent("BrokenSyntax.hx", getTemplate("BrokenSyntax.hx"));
+		vfs.putContent("Empty.hx", getTemplate("Empty.hx"));
+		var args = ["-main", "BrokenSyntax.hx", "--interp", "--no-output"];
+		runHaxe(args);
+		assertErrorMessage("Expected }");
+		runHaxe(args.concat(["--display", "Empty.hx@0@diagnostics"]));
+		runHaxe(args);
+		assertErrorMessage("Expected }");
+	}
+
+	function testGlobalBuildMacro_subsequentCompilations() {
+		vfs.putContent("GlobalBuildMacro.hx", getTemplate("GlobalBuildMacro.hx"));
+		var args = ["--macro", "GlobalBuildMacro.use()", "--run", "GlobalBuildMacro"];
+		runHaxe(args);
+		runHaxe(args);
+		assertSuccess();
+	}
+
+
+	#if false // @see https://github.com/HaxeFoundation/haxe/issues/8596#issuecomment-518815594
+	function testDisplayModuleRecache() {
+		vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
+		var args = ["--main", "HelloWorld", "--interp"];
+		runHaxe(args);
+		runHaxe(args);
+		assertReuse("HelloWorld");
+
+		var args2 = ["--main", "HelloWorld", "--interp", "--display", "HelloWorld.hx@64@type"];
+		runHaxe(args2);
+
+		runHaxe(args);
+		assertReuse("HelloWorld");
+
+		// make sure we still invalidate if the file does change
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("HelloWorld.hx")});
+		runHaxe(args2);
+
+		runHaxe(args);
+		assertSkipping("HelloWorld");
+	}
+	#end
+
+	#if false // @see https://github.com/HaxeFoundation/haxe/issues/8596#issuecomment-518815594
+	function testMutuallyDependent() {
+		vfs.putContent("MutuallyDependent1.hx", getTemplate("MutuallyDependent1.hx"));
+		vfs.putContent("MutuallyDependent2.hx", getTemplate("MutuallyDependent2.hx"));
+
+		var args = ["MutuallyDependent1", "MutuallyDependent2"];
+		runHaxe(args);
+
+		args = args.concat(["--display", "MutuallyDependent1.hx@44@type"]);
+		runHaxe(args);
+		assertSuccess();
+	}
+	#end
+
+	function testSyntaxCache() {
+		vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
+		runHaxeJson(["-cp", "."], ServerMethods.ReadClassPaths, null);
+		vfs.putContent("Empty.hx", "");
+		runHaxeJson([], ServerMethods.ModuleCreated, {file: new FsPath("Empty.hx")});
+		vfs.putContent("Empty.hx", getTemplate("Empty.hx"));
+		runHaxeJson([], DisplayMethods.Completion, {file: new FsPath("HelloWorld.hx"), offset: 75, wasAutoTriggered: false});
+		var completion = parseCompletion();
+		assertHasCompletion(completion, module -> switch (module.kind) {
+			case Type: module.args.path.typeName == "HelloWorld";
+			case _: false;
+		});
+		assertHasCompletion(completion, module -> switch (module.kind) {
+			case Type: module.args.path.typeName == "Empty";
+			case _: false;
+		});
+		// check removal
+		vfs.putContent("Empty.hx", "");
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("Empty.hx")});
+		runHaxeJson([], DisplayMethods.Completion, {file: new FsPath("HelloWorld.hx"), offset: 75, wasAutoTriggered: false});
+		var completion = parseCompletion();
+		assertHasCompletion(completion, module -> switch (module.kind) {
+			case Type: module.args.path.typeName == "HelloWorld";
+			case _: false;
+		});
+		assertHasNoCompletion(completion, module -> switch (module.kind) {
+			case Type: module.args.path.typeName == "Empty";
+			case _: false;
+		});
+	}
+
+	function testSyntaxCache2() {
+		vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
+		var args = ["-cp", ".", "--interp"];
+		runHaxeJson(args, ServerMethods.ReadClassPaths, null);
+		vfs.putContent("Empty.hx", getTemplate("Empty.hx"));
+		runHaxeJson([] /* No args here because file watchers don't generally know */, ServerMethods.ModuleCreated, {file: new FsPath("Empty.hx")});
+		runHaxeJson(args, DisplayMethods.Completion, {file: new FsPath("HelloWorld.hx"), offset: 75, wasAutoTriggered: false});
+		var completion = parseCompletion();
+		assertHasCompletion(completion, module -> switch (module.kind) {
+			case Type: module.args.path.typeName == "Empty";
+			case _: false;
+		});
+	}
+
+	function testVectorInliner() {
+		vfs.putContent("Vector.hx", getTemplate("Vector.hx"));
+		vfs.putContent("VectorInliner.hx", getTemplate("VectorInliner.hx"));
+		var args = ["-main", "VectorInliner", "--interp"];
+		runHaxe(args);
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("VectorInliner.hx")});
+		runHaxeJson(args, cast "typer/compiledTypes" /* TODO */, {});
+		var type = getStoredType("", "VectorInliner");
+		function moreHack(s:String) {
+			return ~/[\r\n\t]/g.replace(s, "");
+		}
+		utest.Assert.equals("function() {_Vector.Vector_Impl_.toIntVector(null);}", moreHack(type.args.statics[0].expr.testHack)); // lmao
+	}
+
+	// See https://github.com/HaxeFoundation/haxe/issues/8368#issuecomment-525379060
+	#if false
+	function testXRedefinedFromX() {
+		vfs.putContent("Main.hx", getTemplate("issues/Issue8368/Main.hx"));
+		vfs.putContent("MyMacro.hx", getTemplate("issues/Issue8368/MyMacro.hx"));
+		vfs.putContent("Type1.hx", getTemplate("issues/Issue8368/Type1.hx"));
+		vfs.putContent("Type2.hx", getTemplate("issues/Issue8368/Type2.hx"));
+		var args = ["-main", "Main", "--macro", "define('whatever')"];
+		runHaxe(args);
+		runHaxe(args);
+		assertSuccess();
+	}
+	#end
+
+	function testMacroStaticsReset() {
+		vfs.putContent("Main.hx", getTemplate("issues/Issue8631/Main.hx"));
+		vfs.putContent("Init.hx", getTemplate("issues/Issue8631/Init.hx"));
+		vfs.putContent("Macro.hx", getTemplate("issues/Issue8631/Macro.hx"));
+		var hxml = ["-main", "Main", "--macro", "Init.callMacro()", "--interp"];
+		runHaxe(hxml);
+		runHaxe(hxml);
+		var counter = vfs.getContent("counter.txt");
+		utest.Assert.equals('2', counter);
+	}
+
+	function testIssue8738() {
+		vfs.putContent("Base.hx", getTemplate("issues/Issue8738/Base.hx"));
+		vfs.putContent("Main.hx", getTemplate("issues/Issue8738/Main1.hx"));
+		var args = ["-main", "Main", "--interp"];
+		runHaxe(args);
+		assertSuccess();
+		vfs.putContent("Main.hx", getTemplate("issues/Issue8738/Main2.hx"));
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("Main.hx")});
+		runHaxe(args);
+		assertErrorMessage("Cannot force inline-call to test because it is overridden");
+		vfs.putContent("Main.hx", getTemplate("issues/Issue8738/Main3.hx"));
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("Main.hx")});
+		runHaxe(args);
+		assertSuccess();
+	}
+
+	function testIssue8748() {
+		vfs.putContent("Dependency.hx", getTemplate("Dependency.hx"));
+		vfs.putContent("WithDependency.hx", getTemplate("WithDependency.hx"));
+		vfs.putContent("res/dep.dep", "");
+		var args = [
+			"-main",
+			"WithDependency",
+			"--interp",
+			"--macro",
+			"haxe.macro.Context.registerModuleDependency(\"Dependency\", \"res/dep.dep\")"
+		];
+		runHaxeJson(args, ServerMethods.Configure, {noModuleChecks: true});
+		runHaxe(args);
+		runHaxeJson(args, DisplayMethods.Hover, {file: new FsPath("WithDependency.hx"), offset: 65});
+		assertReuse("Dependency");
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("res/dep.dep")});
+		runHaxeJson(args, DisplayMethods.Hover, {file: new FsPath("WithDependency.hx"), offset: 65});
+		// check messages manually because module file contains awkward absolute path
+		var r = ~/skipping Dependency\(.*dep.dep\)/;
+		Assert.isTrue(messages.exists(message -> r.match(message)));
+	}
+}
+
+class Main {
+	static public function main() {
+		Vfs.removeDir("test/cases");
+		utest.UTest.run([new ServerTests(), new DisplayTests(), new ReplaceRanges()]);
+	}
+}
diff --git a/tests/server/src/ReplaceRanges.hx b/tests/server/src/ReplaceRanges.hx
new file mode 100644
index 0000000000000000000000000000000000000000..62b2d877ca4b08c5fb45604353a26cc25e7e51be
--- /dev/null
+++ b/tests/server/src/ReplaceRanges.hx
@@ -0,0 +1,204 @@
+import haxe.PosInfos;
+import haxe.display.FsPath;
+import haxe.display.Display;
+import utest.Assert.*;
+
+@:timeout(5000)
+// TODO: somebody has to clean this up
+class ReplaceRanges extends HaxeServerTestCase {
+	function complete<S, T>(content:String, markerIndex:Int, cb:(response:CompletionResponse<S, T>, markers:Map<Int, Int>) -> Void) {
+		var transform = Marker.extractMarkers(content);
+		vfs.putContent("Main.hx", transform.source);
+		runHaxeJson([], DisplayMethods.Completion, {file: new FsPath("Main.hx"), offset: transform.markers[markerIndex], wasAutoTriggered: true}, function() {
+			var result = parseCompletion();
+			cb(result.result, transform.markers);
+		});
+	}
+
+	function checkReplaceRange<S, T>(markers:Map<Int, Int>, startIndex:Int, endIndex:Int, response:CompletionResponse<S, T>, ?p:PosInfos) {
+		equals(markers[startIndex], response.replaceRange.start.character, p);
+		equals(markers[endIndex], response.replaceRange.end.character, p);
+	}
+
+	function testType() {
+		complete("{-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("{-1-}cl{-2-}", 2);
+		equals("cl", response.filterString);
+		checkReplaceRange(markers, 1, 2, response);
+	}
+
+	function testModifier() {
+		complete("extern {-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("extern {-1-}cl{-2-}", 2);
+		equals("cl", response.filterString);
+		checkReplaceRange(markers, 1, 2, response);
+	}
+
+	function testExtends() {
+		complete("class C extends {-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("class C extends {-1-}Cl{-2-}", 2);
+		equals("Cl", response.filterString);
+		checkReplaceRange(markers, 1, 2, response);
+
+		complete("class C {-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("class C {-1-}ex{-2-}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("ex", response.filterString);
+
+		complete("class C {-1-}ext{-2-} {}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("ext", response.filterString);
+	}
+
+	function testImplements() {
+		complete("class C implements {-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("class C implements {-1-}Cl{-2-}", 2);
+		equals("Cl", response.filterString);
+		checkReplaceRange(markers, 1, 2, response);
+
+		complete("class C {-1-} {}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("class C {-1-}impl{-2-} {}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("impl", response.filterString);
+	}
+
+	function testImport() {
+		complete("import {-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("import {-1-}Cl{-2-}", 2);
+		// equals("Cl", response.filterString);
+		checkReplaceRange(markers, 1, 2, response);
+	}
+
+	function testUsing() {
+		complete("using {-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("using {-1-}Cl{-2-}", 2);
+		// equals("Cl", response.filterString);
+		checkReplaceRange(markers, 1, 2, response);
+	}
+
+	function testTo() {
+		complete("abstract A(String) to {-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("abstract A(String) to {-1-} { }", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("abstract A(String) to {-1-}Cl{-2-}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("Cl", response.filterString);
+
+		complete("abstract A(String) to {-1-}Cl{-2-} { }", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("Cl", response.filterString);
+	}
+
+	function testFrom() {
+		complete("abstract A(String) from {-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("abstract A(String) from {-1-} { }", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("abstract A(String) from {-1-}Cl{-2-}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("Cl", response.filterString);
+
+		complete("abstract A(String) from {-1-}Cl{-2-} { }", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("Cl", response.filterString);
+	}
+
+	function testStructuralExtension() {
+		complete("typedef Main = { } & {-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("typedef Main = { } & {-1-}Cl{-2-}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("Cl", response.filterString);
+
+		complete("typedef Main = { > {-1-}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete("typedef Main = { > {-1-}Cl{-2-}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("Cl", response.filterString);
+	}
+
+	function testFields() {
+		complete('class Main { static function main() "".{-1-}', 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete('class Main { static function main() "".{-1-}char', 1);
+		checkReplaceRange(markers, 1, 1, response);
+
+		complete('class Main { static function main() "".{-1-}char{-2-}', 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("char", response.filterString);
+	}
+
+	function testOverride() {
+		complete("import haxe.io.Bytes; class Main extends Bytes { static function main() { } override {-1-}}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+		equals("", response.filterString);
+
+		complete("import haxe.io.Bytes; class Main extends Bytes { static function main() { } override {-1-}get{-2-}}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("get", response.filterString);
+	}
+
+	function testTypedef() {
+		complete("typedef Foo = {-1-}
+		", 1);
+		checkReplaceRange(markers, 1, 1, response);
+		equals("", response.filterString);
+
+		complete("typedef Foo = {-1-}Cl{-2-}
+		", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("Cl", response.filterString);
+	}
+
+	function testTypehint() {
+		complete("class Main { static function main() { var t:{-1-} }}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+		equals("", response.filterString);
+
+		complete("class Main { static function main() { var t:{-1-}Cl{-2-} }}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("Cl", response.filterString);
+
+		complete("class Main { static function main() { var t:{-1-}String{-2-} }}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("String", response.filterString);
+
+		complete("class Main { static function main() { var t:{-1-}Str{-2-}ing }}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("Str", response.filterString);
+	}
+
+	function testTypeParameter() {
+		complete("class Main { static function main() { var t:{-1-} }}", 1);
+		checkReplaceRange(markers, 1, 1, response);
+		equals("", response.filterString);
+
+		complete("class Main { static function main() { var t:{-1-}Cl{-2-} }}", 2);
+		checkReplaceRange(markers, 1, 2, response);
+		equals("Cl", response.filterString);
+	}
+}
diff --git a/tests/server/src/Vfs.hx b/tests/server/src/Vfs.hx
new file mode 100644
index 0000000000000000000000000000000000000000..439090185d2ac31fc5a050f32640b563f5ff5f6e
--- /dev/null
+++ b/tests/server/src/Vfs.hx
@@ -0,0 +1,69 @@
+import js.node.Fs;
+import sys.FileSystem;
+import haxe.io.Path;
+
+using DateTools;
+
+class Vfs {
+	var physicalPath:String;
+
+	public function new(physicalPath:String) {
+		this.physicalPath = physicalPath;
+		if (FileSystem.exists(physicalPath)) {
+			throw 'Cannot create virtual file-system for $physicalPath: directory exists';
+		}
+		FileSystem.createDirectory(physicalPath);
+	}
+
+	public function touchFile(path:String) {
+		var path = getPhysicalPath(path);
+		FileSystem.createDirectory(path.dir);
+		var file = Fs.openSync(path.dir + "/" + path.file + "." + path.ext, 'a');
+		var last = Fs.fstatSync(file).mtime;
+		var notNow = last.delta(1000);
+		Fs.futimesSync(file, notNow, notNow);
+		Fs.closeSync(file);
+	}
+
+	public function overwriteContent(path:String, content:String) {
+		var path = getPhysicalPath(path).toString();
+		if (!FileSystem.exists(path)) {
+			throw 'Cannot overwrite content for $path: file does not exist';
+		}
+		Fs.writeFileSync(path, content);
+	}
+
+	public function putContent(path:String, content:String) {
+		var path = getPhysicalPath(path);
+		FileSystem.createDirectory(path.dir);
+		Fs.writeFileSync(path.toString(), content);
+	}
+
+	public function getContent(path:String) {
+		var path = getPhysicalPath(path);
+		FileSystem.createDirectory(path.dir);
+		return Fs.readFileSync(path.toString());
+	}
+
+	public function close() {
+		removeDir(physicalPath);
+	}
+
+	function getPhysicalPath(path:String) {
+		return new Path(Path.join([physicalPath, path]));
+	}
+
+	static public function removeDir(dir:String):Void {
+		if (FileSystem.exists(dir)) {
+			for (item in FileSystem.readDirectory(dir)) {
+				item = haxe.io.Path.join([dir, item]);
+				if (FileSystem.isDirectory(item)) {
+					removeDir(item);
+				} else {
+					FileSystem.deleteFile(item);
+				}
+			}
+			FileSystem.deleteDirectory(dir);
+		}
+	}
+}
diff --git a/tests/server/test/templates/BrokenSyntax.hx b/tests/server/test/templates/BrokenSyntax.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b4775efcff65454ffc9c5015d94b0efe51afa781
--- /dev/null
+++ b/tests/server/test/templates/BrokenSyntax.hx
@@ -0,0 +1,6 @@
+class BrokenSyntax {
+	static public function main() {
+		{}.foo();
+		trace("ok");
+	}
+}
diff --git a/tests/server/test/templates/BuildMacro.hx b/tests/server/test/templates/BuildMacro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..18d4e6679e4d50f9dd2261cbd333463e899fd358
--- /dev/null
+++ b/tests/server/test/templates/BuildMacro.hx
@@ -0,0 +1,5 @@
+class BuildMacro {
+	public static function build() {
+		return null;
+	}
+}
diff --git a/tests/server/test/templates/BuiltClass.hx b/tests/server/test/templates/BuiltClass.hx
new file mode 100644
index 0000000000000000000000000000000000000000..50724b4edd9a78e90c4720b77c21fcf0a0bd1bbb
--- /dev/null
+++ b/tests/server/test/templates/BuiltClass.hx
@@ -0,0 +1,4 @@
+@:build(BuildMacro.build())
+class BuiltClass {
+	static function main() {}
+}
diff --git a/tests/server/test/templates/Dependency.hx b/tests/server/test/templates/Dependency.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9429955ff1f2449f76f8a90fc64720a73461243c
--- /dev/null
+++ b/tests/server/test/templates/Dependency.hx
@@ -0,0 +1,5 @@
+class Dependency {
+	static public function get() {
+		return "Hello World";
+	}
+}
diff --git a/tests/server/test/templates/Empty.hx b/tests/server/test/templates/Empty.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bfa488a72a4376821bebb33578a8167a036a45d7
--- /dev/null
+++ b/tests/server/test/templates/Empty.hx
@@ -0,0 +1,3 @@
+class Empty {
+	public static function main() {}
+}
diff --git a/tests/server/test/templates/GlobalBuildMacro.hx b/tests/server/test/templates/GlobalBuildMacro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2d25602f18f26c8f1c4694f22a01aced8cf2f8aa
--- /dev/null
+++ b/tests/server/test/templates/GlobalBuildMacro.hx
@@ -0,0 +1,11 @@
+class GlobalBuildMacro {
+	static function main() {}
+
+	#if macro
+	static function use()
+		haxe.macro.Compiler.addGlobalMetadata('', '@:build(GlobalBuildMacro.build())', true, true, false);
+
+	static function build():Array<haxe.macro.Expr.Field>
+		return null;
+	#end
+}
\ No newline at end of file
diff --git a/tests/server/test/templates/HelloJvm.hx b/tests/server/test/templates/HelloJvm.hx
new file mode 100644
index 0000000000000000000000000000000000000000..acd02b433e9ff234ee8f467ebcf88f4e498cf199
--- /dev/null
+++ b/tests/server/test/templates/HelloJvm.hx
@@ -0,0 +1,5 @@
+class HelloJvm {
+	public static function main() {
+		Jvm
+	}
+}
diff --git a/tests/server/test/templates/HelloWorld.hx b/tests/server/test/templates/HelloWorld.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ea72177e9bb8a0407449bcbd3810d706ff3af2a4
--- /dev/null
+++ b/tests/server/test/templates/HelloWorld.hx
@@ -0,0 +1,5 @@
+class HelloWorld {
+	public static function main() {
+		trace("Hello World");
+	}
+}
diff --git a/tests/server/test/templates/Macro.hx b/tests/server/test/templates/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fb79262b32233b8595d814bc6e8090b094699c53
--- /dev/null
+++ b/tests/server/test/templates/Macro.hx
@@ -0,0 +1,8 @@
+class Macro {
+	static var x = 1;
+
+	macro static public function test() {
+		Sys.println(x++);
+		return macro null;
+	}
+}
diff --git a/tests/server/test/templates/MacroMain.hx b/tests/server/test/templates/MacroMain.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dc2776c72893850429aa9f97f7393b3d30402301
--- /dev/null
+++ b/tests/server/test/templates/MacroMain.hx
@@ -0,0 +1,5 @@
+class MacroMain {
+	static public function main() {
+		Macro.test();
+	}
+}
diff --git a/tests/server/test/templates/MutuallyDependent1.hx b/tests/server/test/templates/MutuallyDependent1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..92602da80749b83679246454e3fd73b5a4e494c4
--- /dev/null
+++ b/tests/server/test/templates/MutuallyDependent1.hx
@@ -0,0 +1,3 @@
+import MutuallyDependent2;
+
+class MutuallyDependent1 {}
diff --git a/tests/server/test/templates/MutuallyDependent2.hx b/tests/server/test/templates/MutuallyDependent2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1d2009638cb213f137f79d2a71b23672a588308a
--- /dev/null
+++ b/tests/server/test/templates/MutuallyDependent2.hx
@@ -0,0 +1,3 @@
+import MutuallyDependent1;
+
+class MutuallyDependent2 {}
diff --git a/tests/server/test/templates/Vector.hx b/tests/server/test/templates/Vector.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0df5ec14b1db75aa7beed5929af20885e2a4f993
--- /dev/null
+++ b/tests/server/test/templates/Vector.hx
@@ -0,0 +1,14 @@
+@:multiType(T)
+abstract Vector<T>(Array<T>) {
+	function new();
+
+	public inline static function ofArray<T>(a:Array<T>):Vector<T> {
+		return new Vector<T>();
+	}
+
+	@:to static function toIntVector(t:Array<Int>)
+		return null;
+
+	@:to static function toObjectVector<T>(t:Array<T>)
+		return null;
+}
diff --git a/tests/server/test/templates/VectorInliner.hx b/tests/server/test/templates/VectorInliner.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e566cfaca29b27f4663cd368cff2d5c8cf79a9c2
--- /dev/null
+++ b/tests/server/test/templates/VectorInliner.hx
@@ -0,0 +1,5 @@
+class VectorInliner {
+	@:testHack static function main() {
+		Vector.ofArray([1]);
+	}
+}
diff --git a/tests/server/test/templates/WithDependency.hx b/tests/server/test/templates/WithDependency.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5e1860ab483ab372a4a61320519be331468c1474
--- /dev/null
+++ b/tests/server/test/templates/WithDependency.hx
@@ -0,0 +1,5 @@
+class WithDependency {
+	public static function main() {
+		trace(Dependency.get());
+	}
+}
diff --git a/tests/server/test/templates/issues/Issue8368/Main.hx b/tests/server/test/templates/issues/Issue8368/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5d735a31c3dbc4a8eb6a870932833de20f059c9f
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8368/Main.hx
@@ -0,0 +1,5 @@
+class Main {
+	public static function main():Void {
+		MyMacro.foo();
+	}
+}
\ No newline at end of file
diff --git a/tests/server/test/templates/issues/Issue8368/MyMacro.hx b/tests/server/test/templates/issues/Issue8368/MyMacro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..db5d19c80735668a09acd58e430d58d0b0db02e6
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8368/MyMacro.hx
@@ -0,0 +1,8 @@
+class MyMacro {
+	#if macro
+	static var issue = haxe.macro.ComplexTypeTools.toType(macro :Type1);
+	// ^ this causes the issue
+	#end
+
+	public static macro function foo() return macro { };
+}
\ No newline at end of file
diff --git a/tests/server/test/templates/issues/Issue8368/Type1.hx b/tests/server/test/templates/issues/Issue8368/Type1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bf8d4d113ea7c5feff0cca309e141ee56e227435
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8368/Type1.hx
@@ -0,0 +1,5 @@
+class Type1 {
+	public function new() {
+		trace(Type2);
+	}
+}
\ No newline at end of file
diff --git a/tests/server/test/templates/issues/Issue8368/Type2.hx b/tests/server/test/templates/issues/Issue8368/Type2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f750be2893737c0cf9ca7e646f621bc004f54471
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8368/Type2.hx
@@ -0,0 +1,5 @@
+class Type2 {
+	public function new() {
+		trace(Type1);
+	}
+}
\ No newline at end of file
diff --git a/tests/server/test/templates/issues/Issue8631/Init.hx b/tests/server/test/templates/issues/Issue8631/Init.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e904bb94aa3c81e4d23fe835a64c3a879994b19c
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8631/Init.hx
@@ -0,0 +1,5 @@
+class Init {
+	static public function callMacro() {
+		Macro.call();
+	}
+}
\ No newline at end of file
diff --git a/tests/server/test/templates/issues/Issue8631/Macro.hx b/tests/server/test/templates/issues/Issue8631/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..20e42b58780793da8b3e10691bcd7f9736d4a376
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8631/Macro.hx
@@ -0,0 +1,15 @@
+using sys.FileSystem;
+using sys.io.File;
+
+
+ class Macro {
+	static var called:Bool = false;
+	static inline var FILE = 'counter.txt';
+
+ 	static public function call() {
+		if(called) return;
+		called = true;
+		var cnt = FILE.exists() ? Std.parseInt(FILE.getContent()) + 1 : 1;
+		FILE.saveContent('$cnt');
+	}
+}
\ No newline at end of file
diff --git a/tests/server/test/templates/issues/Issue8631/Main.hx b/tests/server/test/templates/issues/Issue8631/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dd89a0dc652d814c64b982312c93736bab5b6377
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8631/Main.hx
@@ -0,0 +1,3 @@
+class Main {
+	static function main() {}
+}
\ No newline at end of file
diff --git a/tests/server/test/templates/issues/Issue8738/Base.hx b/tests/server/test/templates/issues/Issue8738/Base.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fa2854485568e4996b034d4058250b0299e5f284
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8738/Base.hx
@@ -0,0 +1,5 @@
+class Base {
+	public function new() {}
+
+	public function test() {}
+}
diff --git a/tests/server/test/templates/issues/Issue8738/Main1.hx b/tests/server/test/templates/issues/Issue8738/Main1.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1308578be7154ad1d33cd76a85cf2a465bfca779
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8738/Main1.hx
@@ -0,0 +1,9 @@
+class Child extends Base {
+	public override function test() {}
+}
+
+class Main {
+	static public function main() {
+		var base = new Base();
+	}
+}
diff --git a/tests/server/test/templates/issues/Issue8738/Main2.hx b/tests/server/test/templates/issues/Issue8738/Main2.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dcee8698bcf8f9856cee43727fd82040bb471807
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8738/Main2.hx
@@ -0,0 +1,10 @@
+class Child extends Base {
+	public override function test() {}
+}
+
+class Main {
+	static public function main() {
+		var base = new Base();
+		inline base.test();
+	}
+}
diff --git a/tests/server/test/templates/issues/Issue8738/Main3.hx b/tests/server/test/templates/issues/Issue8738/Main3.hx
new file mode 100644
index 0000000000000000000000000000000000000000..64a63d05efb348062d1e6d6e8497f3cb30be5d5a
--- /dev/null
+++ b/tests/server/test/templates/issues/Issue8738/Main3.hx
@@ -0,0 +1,6 @@
+class Main {
+	static public function main() {
+		var base = new Base();
+		inline base.test();
+	}
+}
diff --git a/tests/sourcemaps/run.hxml b/tests/sourcemaps/run.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..571135b5b43fbfd0be9c3c8c6ad293f179f1b064
--- /dev/null
+++ b/tests/sourcemaps/run.hxml
@@ -0,0 +1,4 @@
+-cp src
+-D eval-stack
+-main Test
+--interp
\ No newline at end of file
diff --git a/tests/sourcemaps/src/Test.hx b/tests/sourcemaps/src/Test.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8ce553648c98d14199fba0c1649da48949273277
--- /dev/null
+++ b/tests/sourcemaps/src/Test.hx
@@ -0,0 +1,87 @@
+import haxe.Json;
+import validation.ValidationReport;
+import haxe.io.Path;
+import sys.io.Process;
+import validation.Target;
+
+using sys.FileSystem;
+using StringTools;
+using Test;
+using Lambda;
+
+class Test {
+	static public function main() {
+		installDependencies();
+
+		var success = true;
+		for(target in [Js, Php]) {
+			Sys.println('[Testing ${target.getName()}]');
+			collectCases().iter(module -> success = runCase(module, target) && success);
+		}
+
+		Sys.exit(success ? 0 : 1);
+	}
+
+	static function runCase(module:String, target:Target):Bool {
+		var proc = new Process(
+			'haxe',
+			targetCompilerFlags(target).concat([
+				'-cp', 'src',
+				'-lib', 'sourcemap',
+				'-D', 'source-map',
+				'-D', 'analyzer-optimize',
+				'-dce', 'full',
+				'-main', module
+			])
+		);
+		var stdErr = proc.stderr.readAll().toString();
+		var stdOut = proc.stdout.readAll().toString();
+		if(stdErr.trim().length > 0) {
+			Sys.println(stdErr.trim());
+		}
+
+		var report:ValidationReport = try {
+			Json.parse(stdOut);
+		} catch(e:Dynamic) {
+			Sys.println('$module: Failed to parse compilation result:\n$stdOut');
+			return false;
+		}
+
+		Sys.println('$module: ${report.summary.assertions} tests, ${report.summary.failures} failures');
+
+		if(!report.success) {
+			for(error in report.errors) {
+				Sys.println('${error.pos.file}:${error.pos.line}:${error.pos.column}: Failed to find expected code: ${error.expected}');
+			}
+		}
+
+		return report.success;
+	}
+
+	static function targetCompilerFlags(target:Target):Array<String> {
+		return switch(target) {
+			case Js: ['-js', 'bin/test.js'];
+			case Php: ['-php', 'bin/php'];
+		}
+	}
+
+	static function collectCases():Array<String> {
+		var result = [];
+		for(fileName in 'src/cases'.readDirectory()) {
+			var path = new Path(fileName);
+			if(path.isTestCase()) {
+				result.push('cases.${path.file}');
+			}
+		}
+		return result;
+	}
+
+	static function isTestCase(path:Path):Bool {
+		var firstChar = path.file.charAt(0);
+		return path.ext == 'hx' && firstChar == firstChar.toUpperCase();
+	}
+
+	static function installDependencies() {
+		Sys.command('haxelib', ['install', 'sourcemap']);
+	}
+}
\ No newline at end of file
diff --git a/tests/sourcemaps/src/Validator.hx b/tests/sourcemaps/src/Validator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bda4083f9d5802378c9c0302fccdaa925cae8efc
--- /dev/null
+++ b/tests/sourcemaps/src/Validator.hx
@@ -0,0 +1,163 @@
+#if macro
+import validation.Target;
+import validation.Lines;
+import validation.ValidationReport;
+import validation.ValidationError;
+import validation.Exception;
+import haxe.display.Position.Location;
+import haxe.macro.Context;
+import haxe.macro.Expr;
+import haxe.macro.Compiler;
+import haxe.io.Path;
+
+using sys.io.File;
+using haxe.macro.Tools;
+using StringTools;
+#end
+
+class Validator {
+	macro static public function expect(hxExpr:Expr, output:Expr):Expr {
+		var outMap = try {
+			parseExpectedOutput(output);
+		} catch(e:ExpectedOutputException) {
+			Context.error(e.msg, e.pos);
+			return macro {};
+		}
+
+		expected.push({pos:hxExpr.pos, out:outMap});
+
+		if(!onAfterGenerateAdded) {
+			onAfterGenerateAdded = true;
+			Context.onAfterGenerate(verifyExpectations);
+		}
+
+		return hxExpr;
+	}
+
+#if macro
+	static var onAfterGenerateAdded = false;
+	static var expected = new Array<{pos:Position, out:Map<Target,String>}>();
+	static var sourceMapsCache = new Map<String,SourceMap>();
+
+	static function verifyExpectations() {
+		var target = try {
+			getCurrentTarget();
+		} catch(e:InvalidTargetException) {
+			Context.error(e.msg, e.pos);
+			return;
+		}
+
+		var errors = [];
+
+		for(expectation in expected) {
+			var expectedCode = expectation.out.get(target);
+			var location = expectation.pos.toLocation();
+			var hxPos = location.range.start;
+			var generated = getGeneratedContent(target, location);
+			var found = false;
+			//look for the mappings generated from the `hxPos`
+			generated.map.eachMapping(genPos -> {
+				if(found) return;
+				if(genPos.originalLine == hxPos.line && genPos.originalColumn + 1 == hxPos.character) {
+					var code = generated.code[genPos.generatedLine].substr(genPos.generatedColumn);
+					//compare with expected output ignoring leading whitespaces
+					if(code.trim().startsWith(expectedCode)) {
+						found = true;
+					}
+				}
+			});
+			if(!found) {
+				errors.push({
+					expected: expectedCode,
+					pos: {
+						file: location.file,
+						line: hxPos.line,
+						column: hxPos.character
+					}
+				});
+			}
+		}
+
+		Sys.println(haxe.Json.stringify(buildValidationReport(errors), '    '));
+	}
+
+	static function buildValidationReport(errors:Array<ValidationError>):ValidationReport {
+		return {
+			success: errors.length == 0,
+			summary: {
+				assertions: expected.length,
+				failures: errors.length
+			},
+			errors: errors
+		}
+	}
+
+	static function getCurrentTarget():Target {
+		return if(Context.defined('js')) {
+			Js;
+		} else if(Context.defined('php')) {
+			Php;
+		} else {
+			throw new InvalidTargetException('Current target is not supported', haxe.macro.PositionTools.here());
+		}
+	}
+
+	static function getGeneratedContent(target:Target, location:Location):{code:Lines, map:SourceMap} {
+		var sourceFile;
+		var mapFile;
+		switch(target) {
+			case Js:
+				sourceFile = Compiler.getOutput();
+				mapFile = '${Compiler.getOutput()}.map';
+			case Php:
+				var phpFilePath = new Path(location.file.toString().substr(location.file.toString().indexOf('cases')));
+				phpFilePath.ext = 'php';
+				sourceFile = Path.join([Compiler.getOutput(), 'lib', phpFilePath.toString()]);
+				mapFile = '$sourceFile.map';
+		}
+
+		return {
+			code: sourceFile.getContent().split('\n'),
+			map: getSourceMap(mapFile)
+		}
+	}
+
+	static function getSourceMap(mapFile:String):SourceMap {
+		var sourceMap = sourceMapsCache.get(mapFile);
+		if(sourceMap == null) {
+			sourceMap = new SourceMap(mapFile.getContent());
+			sourceMapsCache.set(mapFile, sourceMap);
+		}
+		return sourceMap;
+	}
+
+	static function parseExpectedOutput(output:Expr):Null<Map<Target,String>> {
+		var result = new Map();
+		switch(output) {
+			case macro $a{exprs}:
+				var expectedTargets = Target.getConstructors();
+				for(expr in exprs) {
+					switch(expr) {
+						case macro $target => ${{expr:EConst(CString(outStr))}}:
+							var target = switch(target) {
+								case macro Js: Js;
+								case macro Php: Php;
+								case _: throw new ExpectedOutputException('Invalid target in expected output: ${target.toString()}', target.pos);
+							}
+							expectedTargets.remove(target.getName());
+							result.set(target, outStr);
+						case _:
+							throw new ExpectedOutputException('Invalid item in map declaration for expected output. Should be `Target => "generated_code"`', expr.pos);
+					}
+				}
+				if(expectedTargets.length > 0) {
+					throw new ExpectedOutputException('Missing expected code for targets: ${expectedTargets.join(', ')}.', output.pos);
+				}
+			case _:
+				throw new ExpectedOutputException('The second argument for "expect" should be a map declaration.', output.pos);
+		}
+		return result;
+
+	}
+#end
+}
\ No newline at end of file
diff --git a/tests/sourcemaps/src/cases/Trace.hx b/tests/sourcemaps/src/cases/Trace.hx
new file mode 100644
index 0000000000000000000000000000000000000000..51dee860e7f458fdfdc57e65d441cafd82030d31
--- /dev/null
+++ b/tests/sourcemaps/src/cases/Trace.hx
@@ -0,0 +1,7 @@
+package cases;
+
+class Trace {
+	static public function main() {
+		expect(trace(''), [Js => "console.log", Php => "(Log::$trace)"]);
+	}
+}
\ No newline at end of file
diff --git a/tests/sourcemaps/src/cases/import.hx b/tests/sourcemaps/src/cases/import.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4ca82fe1e0b2682af468750e32a989dc638c123a
--- /dev/null
+++ b/tests/sourcemaps/src/cases/import.hx
@@ -0,0 +1 @@
+import Validator.expect;
\ No newline at end of file
diff --git a/tests/sourcemaps/src/validation/Exception.hx b/tests/sourcemaps/src/validation/Exception.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e407c458c9970e997f2c49942d8fc17ed7465215
--- /dev/null
+++ b/tests/sourcemaps/src/validation/Exception.hx
@@ -0,0 +1,17 @@
+package validation;
+
+import haxe.macro.Expr;
+
+class Exception {
+	public var msg(default,null):String;
+	public var pos(default,null):Null<Position>;
+
+	public function new(msg:String, ?pos:Position) {
+		this.msg = msg;
+		this.pos = pos;
+	}
+}
+
+class ExpectedOutputException extends Exception {}
+
+class InvalidTargetException extends Exception {}
\ No newline at end of file
diff --git a/tests/sourcemaps/src/validation/Lines.hx b/tests/sourcemaps/src/validation/Lines.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e7105eccb9db0c9837e7ce8c21324c8d59b6dfe1
--- /dev/null
+++ b/tests/sourcemaps/src/validation/Lines.hx
@@ -0,0 +1,13 @@
+package validation;
+
+/**
+ *  Represents some text content split in lines
+ */
+abstract Lines(Array<String>) from Array<String> {
+	/**
+	 *  Get content on the specified 1-based line number
+	 */
+	@:arrayAccess inline function get(lineNumber:Int):String {
+		return this[lineNumber - 1];
+	}
+}
\ No newline at end of file
diff --git a/tests/sourcemaps/src/validation/Target.hx b/tests/sourcemaps/src/validation/Target.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8f39c1bbeb5767c7559e52be6fdcfd5727ac8972
--- /dev/null
+++ b/tests/sourcemaps/src/validation/Target.hx
@@ -0,0 +1,6 @@
+package validation;
+
+enum Target {
+	Js;
+	Php;
+}
\ No newline at end of file
diff --git a/tests/sourcemaps/src/validation/ValidationError.hx b/tests/sourcemaps/src/validation/ValidationError.hx
new file mode 100644
index 0000000000000000000000000000000000000000..14a881219cf41673e5029a2f93f21d3c1a8a1718
--- /dev/null
+++ b/tests/sourcemaps/src/validation/ValidationError.hx
@@ -0,0 +1,17 @@
+package validation;
+
+import haxe.display.FsPath;
+
+typedef ValidationError = {
+	/** Code expected to be generated from the haxe code */
+	var expected:String;
+	/** Position of the haxe code, which is expected to be generated as `expected` code */
+	var pos:{
+		/** .hx File */
+		var file:FsPath;
+		/** 1-base line number in .hx file */
+		var line:Int;
+		/** 1-base column number in .hx file */
+		var column:Int;
+	}
+}
\ No newline at end of file
diff --git a/tests/sourcemaps/src/validation/ValidationReport.hx b/tests/sourcemaps/src/validation/ValidationReport.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1598124bf455a4091a9cb130bc8c047299ba7aa3
--- /dev/null
+++ b/tests/sourcemaps/src/validation/ValidationReport.hx
@@ -0,0 +1,10 @@
+package validation;
+
+typedef ValidationReport = {
+	var success:Bool;
+	var summary:{
+		var assertions:Int;
+		var failures:Int;
+	};
+	var errors:Array<ValidationError>;
+}
\ No newline at end of file
diff --git a/tests/sys/compile-cpp.hxml b/tests/sys/compile-cpp.hxml
index ce4b037a68c657f9e8cd66ffc66ef19b1c3e60b0..f0d1031ac66c43f5e987132b42d31d632167dbf2 100644
--- a/tests/sys/compile-cpp.hxml
+++ b/tests/sys/compile-cpp.hxml
@@ -1,13 +1,18 @@
 compile-each.hxml
--main Main
+--main Main
 -cpp bin/cpp
 
 --next
 compile-each.hxml
--main TestArguments
+--main TestArguments
 -cpp bin/cpp
 
 --next
 compile-each.hxml
--main ExitCode
+--main ExitCode
+-cpp bin/cpp
+
+--next
+compile-each.hxml
+--main UtilityProcess
 -cpp bin/cpp
\ No newline at end of file
diff --git a/tests/sys/compile-cs.hxml b/tests/sys/compile-cs.hxml
index bfad66e6b568c171a71d70b4bff84dc19a9a96db..07463c11c78138b6b1228719962c0591dd4c9739 100644
--- a/tests/sys/compile-cs.hxml
+++ b/tests/sys/compile-cs.hxml
@@ -1,13 +1,18 @@
 compile-each.hxml
--main Main
+--main Main
 -cs bin/cs
 
 --next
 compile-each.hxml
--main TestArguments
+--main TestArguments
 -cs bin/cs
 
 --next
 compile-each.hxml
--main ExitCode
+--main ExitCode
+-cs bin/cs
+
+--next
+compile-each.hxml
+--main UtilityProcess
 -cs bin/cs
\ No newline at end of file
diff --git a/tests/sys/compile-each.hxml b/tests/sys/compile-each.hxml
index cb69b2be0b3ccb421bb1a880ff7f2b70964b6680..c0c25df4b063129d621de3244421860266b8c970 100644
--- a/tests/sys/compile-each.hxml
+++ b/tests/sys/compile-each.hxml
@@ -1,9 +1,11 @@
--cp src
--main ExitCode
+-p src
+--main ExitCode
 -neko bin/neko/ExitCode.n
+-lib utest
 -cmd nekotools boot bin/neko/ExitCode.n
 
 --next
-
--debug
--cp src
\ No newline at end of file
+-D source-header=''
+--debug
+-lib utest
+-p src
\ No newline at end of file
diff --git a/tests/sys/compile-hl.hxml b/tests/sys/compile-hl.hxml
index fa1557d035783862ffe1091d63b19262fcb3ad27..1e8aec62c0baaf38948684f390cb2bacdf0b7716 100644
--- a/tests/sys/compile-hl.hxml
+++ b/tests/sys/compile-hl.hxml
@@ -1,13 +1,18 @@
 compile-each.hxml
--main Main
+--main Main
 -hl bin/hl/sys.hl
 
 --next
 compile-each.hxml
--main TestArguments
+--main TestArguments
 -hl bin/hl/TestArguments.hl
 
 --next
 compile-each.hxml
--main ExitCode
--hl bin/hl/ExitCode.hl
\ No newline at end of file
+--main ExitCode
+-hl bin/hl/ExitCode.hl
+
+--next
+compile-each.hxml
+--main UtilityProcess
+-hl bin/hl/UtilityProcess.hl
\ No newline at end of file
diff --git a/tests/sys/compile-java.hxml b/tests/sys/compile-java.hxml
index ae5a244db8a0e464896eb6e6b3f6375f262dbe52..c0039cb9798f0faaa09ff20efd4a01ebe8d5415e 100644
--- a/tests/sys/compile-java.hxml
+++ b/tests/sys/compile-java.hxml
@@ -1,13 +1,18 @@
 compile-each.hxml
--main Main
+--main Main
 -java bin/java
 
 --next
 compile-each.hxml
--main TestArguments
+--main TestArguments
 -java bin/java
 
 --next
 compile-each.hxml
--main ExitCode
+--main ExitCode
+-java bin/java
+
+--next
+compile-each.hxml
+--main UtilityProcess
 -java bin/java
\ No newline at end of file
diff --git a/tests/sys/compile-jvm.hxml b/tests/sys/compile-jvm.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b3b4f35123a67d619284ec28e1153e9b20bfabad
--- /dev/null
+++ b/tests/sys/compile-jvm.hxml
@@ -0,0 +1,22 @@
+compile-each.hxml
+--main Main
+-java bin/jvm
+-D jvm
+
+--next
+compile-each.hxml
+--main TestArguments
+-java bin/jvm
+-D jvm
+
+--next
+compile-each.hxml
+--main ExitCode
+-java bin/jvm
+-D jvm
+
+--next
+compile-each.hxml
+--main UtilityProcess
+-java bin/jvm
+-D jvm
\ No newline at end of file
diff --git a/tests/sys/compile-lua.hxml b/tests/sys/compile-lua.hxml
index b49002b294993206e1ed78e0c16d4ce97affb08c..04c84edac5340962e16dfa8c73d5f25555a0479f 100644
--- a/tests/sys/compile-lua.hxml
+++ b/tests/sys/compile-lua.hxml
@@ -1,14 +1,19 @@
 
 compile-each.hxml
--main Main
+--main Main
 -lua bin/lua/sys.lua
 
 --next
 compile-each.hxml
--main TestArguments
+--main TestArguments
 -lua bin/lua/TestArguments.lua
 
 --next
 compile-each.hxml
--main ExitCode
+--main ExitCode
 -lua bin/lua/ExitCode.lua
+
+--next
+compile-each.hxml
+--main UtilityProcess
+-lua bin/lua/UtilityProcess.lua
\ No newline at end of file
diff --git a/tests/sys/compile-macro.hxml b/tests/sys/compile-macro.hxml
index df74836607f1c0c85ebced71f6852c1ad8188343..ff55dcd4f7bc766f66015f1f07f13c20ef354487 100644
--- a/tests/sys/compile-macro.hxml
+++ b/tests/sys/compile-macro.hxml
@@ -1,3 +1,3 @@
 compile-each.hxml
--main Main
+--main Main
 --interp
\ No newline at end of file
diff --git a/tests/sys/compile-neko.hxml b/tests/sys/compile-neko.hxml
index b8a2fa7fdd70238d1eee5f3589c225dcb3940f7c..c46b0009182e2408b765b07412e806d4d982f87b 100644
--- a/tests/sys/compile-neko.hxml
+++ b/tests/sys/compile-neko.hxml
@@ -1,13 +1,18 @@
 compile-each.hxml
--main Main
+--main Main
 -neko bin/neko/sys.n
 
 --next
 compile-each.hxml
--main TestArguments
+--main TestArguments
 -neko bin/neko/TestArguments.n
 
 # --next
 # compile-each.hxml
 # -main ExitCode
 # -neko bin/neko/ExitCode.n
+
+--next
+compile-each.hxml
+--main UtilityProcess
+-neko bin/neko/UtilityProcess.n
diff --git a/tests/sys/compile-php.hxml b/tests/sys/compile-php.hxml
index 471789e7fdef4695017acff184690c5ae998d8f6..e92a87cd64f745c4c825f9199a5331609b40cf9f 100644
--- a/tests/sys/compile-php.hxml
+++ b/tests/sys/compile-php.hxml
@@ -1,13 +1,18 @@
 compile-each.hxml
--main Main
+--main Main
 -php bin/php/Main
 
 --next
 compile-each.hxml
--main TestArguments
+--main TestArguments
 -php bin/php/TestArguments
 
 --next
 compile-each.hxml
--main ExitCode
--php bin/php/ExitCode
\ No newline at end of file
+--main ExitCode
+-php bin/php/ExitCode
+
+--next
+compile-each.hxml
+--main UtilityProcess
+-php bin/php/UtilityProcess
\ No newline at end of file
diff --git a/tests/sys/compile-php7.hxml b/tests/sys/compile-php7.hxml
deleted file mode 100644
index 54533cd0987d0d33e2e8e92e50f93267e7f89bdf..0000000000000000000000000000000000000000
--- a/tests/sys/compile-php7.hxml
+++ /dev/null
@@ -1,16 +0,0 @@
-compile-each.hxml
--main Main
--php bin/php7/Main
--D php7
-
---next
-compile-each.hxml
--main TestArguments
--php bin/php7/TestArguments
--D php7
-
---next
-compile-each.hxml
--main ExitCode
--php bin/php7/ExitCode
--D php7
\ No newline at end of file
diff --git a/tests/sys/compile-python.hxml b/tests/sys/compile-python.hxml
index 01a8706aff24208cac0fbbbac21e2772af339d78..6ff8f0607fcea22591674cd93dbdd872eed69745 100644
--- a/tests/sys/compile-python.hxml
+++ b/tests/sys/compile-python.hxml
@@ -1,13 +1,18 @@
 compile-each.hxml
--main Main
+--main Main
 -python bin/python/sys.py
 
 --next
 compile-each.hxml
--main TestArguments
+--main TestArguments
 -python bin/python/TestArguments.py
 
 --next
 compile-each.hxml
--main ExitCode
--python bin/python/ExitCode.py
\ No newline at end of file
+--main ExitCode
+-python bin/python/ExitCode.py
+
+--next
+compile-each.hxml
+--main UtilityProcess
+-python bin/python/UtilityProcess.py
\ No newline at end of file
diff --git a/tests/sys/compile.hxml b/tests/sys/compile.hxml
index 6460bebf273dfb89e5a2e3517e14b0646a4da356..b47f9564ac0680478a6d1090b45d630bc99c53f2 100644
--- a/tests/sys/compile.hxml
+++ b/tests/sys/compile.hxml
@@ -7,5 +7,4 @@
 --next compile-cs.hxml
 --next compile-java.hxml
 --next compile-php.hxml
---next compile-php7.hxml
 --next compile-hl.hxml
diff --git a/tests/sys/genTestRes.py b/tests/sys/genTestRes.py
new file mode 100755
index 0000000000000000000000000000000000000000..3c590dcaea54f80798b34cb52e0e872af4383293
--- /dev/null
+++ b/tests/sys/genTestRes.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+
+# Generates files and directories in test-res used for Unicode sys tests.
+# The test vector printf'ed into data.bin, as well as the names in filenames()
+# should correspond exactly to the sequences in UnicodeSequences.valid.
+
+import os
+import shutil
+
+TESTDIR = "test-res"
+
+# delete previous, if any
+if os.path.isdir(TESTDIR):
+  shutil.rmtree(TESTDIR)
+
+os.mkdir(TESTDIR)
+
+# Unicode test vectors
+allUnicode = [
+    [0x01],
+    [0x7F],
+    [0xC2, 0x80],
+    [0xDF, 0xBF],
+    [0xE0, 0xA0, 0x80],
+    [0xED, 0x9F, 0xBF],
+    [0xEE, 0x80, 0x80],
+    [0xEF, 0xBF, 0xBD],
+    [0xF0, 0x90, 0x80, 0x80],
+    [0xF0, 0x9F, 0xBF, 0xBF],
+    [0xF3, 0xBF, 0xBF, 0xBF],
+    [0xF4, 0x80, 0x80, 0x80],
+    [0xF4, 0x8F, 0xBF, 0xBF],
+    [0xF0, 0x9F, 0x98, 0x82, 0xF0, 0x9F, 0x98, 0x84, 0xF0, 0x9F, 0x98, 0x99],
+    [0xC8, 0xA7],
+    [0xE4, 0xB8, 0xAD, 0xE6, 0x96, 0x87, 0xEF, 0xBC, 0x8C, 0xE3, 0x81, 0xAB, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x93, 0xE3, 0x81, 0x94]
+  ]
+
+allStrings = [ bytes(data).decode("utf-8") for data in allUnicode ]
+
+allFilenames = allStrings[:]
+# Windows does not allow codepoints in the U+0000 - U+001F range
+# see https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-a-file
+if os.name == "nt":
+  allFilenames.remove(bytes([0x01]).decode("utf-8"))
+
+allBinary = b""
+for data in allUnicode:
+  allBinary += bytes(data) + b"\n"
+
+# generate a file with Unicode data
+with open(os.path.join(TESTDIR, "data.bin"), "wb") as f:
+  f.write(allBinary)
+
+# generate sub-directories with symlinks
+os.mkdir(os.path.join(TESTDIR, "a"))
+for data in allFilenames:
+  os.mkdir(os.path.join(TESTDIR, data))
+  os.mkdir(os.path.join(TESTDIR, "a", data))
+  if os.name != "nt":
+    for target, name in [
+      ("../../bin/cpp/UtilityProcess-debug", "bin-cpp-debug"),
+      ("../../bin/cpp/UtilityProcess", "bin-cpp"),
+      ("../../bin/cs/bin/UtilityProcess-Debug.exe", "bin-cs-debug"),
+      ("../../bin/cs/bin/UtilityProcess.exe", "bin-cs"),
+      ("../../bin/hl/UtilityProcess.hl", "bin-hl"),
+      ("../../bin/lua/UtilityProcess.lua", "bin-lua"),
+      ("../../bin/java/UtilityProcess-Debug.jar", "bin-java-debug"),
+      ("../../bin/java/UtilityProcess.jar", "bin-java"),
+      ("../../bin/jvm/UtilityProcess-Debug.jar", "bin-jvm-debug"),
+      ("../../bin/jvm/UtilityProcess.jar", "bin-jvm"),
+      ("../../bin/neko/UtilityProcess.n", "bin-neko"),
+      ("../../bin/php/UtilityProcess/index.php", "bin-php"),
+      ("../../bin/python/UtilityProcess.py", "bin-py"),
+      ("../../src/UtilityProcess.hx", "bin-eval")
+    ]:
+      os.symlink(target, os.path.join(TESTDIR, data, name), target_is_directory = False)
+
+# files
+os.mkdir(os.path.join(TESTDIR, "b"))
+for data in allFilenames:
+  with open(os.path.join(TESTDIR, "b", data), "wb") as f:
+    f.write(allBinary)
diff --git a/tests/sys/run.hxml b/tests/sys/run.hxml
index 32a55afadcc65967949f0fbab010758b5fdba878..eea810f15fe756f0647559764ff8bb8aa69103e8 100644
--- a/tests/sys/run.hxml
+++ b/tests/sys/run.hxml
@@ -7,17 +7,16 @@ compile.hxml
 --next
 -cmd echo Neko   && neko bin/neko/sys.n
 -cmd echo Python && python3 bin/python/sys.py
--cmd echo Cpp    && bin/cpp/Main-Debug
+-cmd echo Cpp    && bin/cpp/Main-debug
 -cmd echo CS     && mono bin/cs/bin/Main-Debug.exe
 -cmd echo Java   && java -jar bin/java/Main-Debug.jar
 -cmd echo Php    && php bin/php/Main/index.php
--cmd echo Php7    && php bin/php7/Main/index.php
 
 # Windows
 # --next
 # -cmd echo Neko   && neko bin\neko\sys.n
 # -cmd echo Python && python3 bin\python\sys.py
-# -cmd echo Cpp    && bin\cpp\Main-Debug.exe
+# -cmd echo Cpp    && bin\cpp\Main-debug.exe
 # -cmd echo CS     && bin\cs\bin\Main-Debug.exe
 # -cmd echo Java   && java -jar bin\java\Main-Debug.jar
 # -cmd echo Php    && php bin\php\Main\index.php
diff --git a/tests/sys/src/ExitCode.hx b/tests/sys/src/ExitCode.hx
index e1d690229c713861b6c76d47ad50c6e18598c04b..8ba07b4f5c7f73a67337f40ba8f9d57817b11a42 100644
--- a/tests/sys/src/ExitCode.hx
+++ b/tests/sys/src/ExitCode.hx
@@ -3,11 +3,13 @@ import sys.io.*;
 import haxe.io.*;
 
 /**
-	This is intented to be used by TestSys and io.TestProcess.
+	This is intended to be used by TestSys and io.TestProcess.
 */
 class ExitCode {
 	static public var bin:String =
-	#if neko
+	#if interp
+		"bin/interp/ExitCode";
+	#elseif neko
 		"bin/neko/ExitCode.n";
 	#elseif hl
 		"bin/hl/ExitCode.hl";
@@ -23,6 +25,12 @@ class ExitCode {
 		#else
 			"bin/cs/bin/ExitCode.exe";
 		#end
+	#elseif (java && jvm)
+		#if debug
+			"bin/jvm/ExitCode-Debug.jar";
+		#else
+			"bin/jvm/ExitCode.jar";
+		#end
 	#elseif java
 		#if debug
 			"bin/java/ExitCode-Debug.jar";
@@ -31,8 +39,6 @@ class ExitCode {
 		#end
 	#elseif python
 		"bin/python/ExitCode.py";
-	#elseif php7
-		"bin/php7/ExitCode/index.php";
 	#elseif php
 		"bin/php/ExitCode/index.php";
 	#elseif lua
diff --git a/tests/sys/src/FileNames.hx b/tests/sys/src/FileNames.hx
index a4c4a12a7336377e90a21a5417801bb2053757ec..6c3eb2f0e7ef2c0ec2c1dff6b1fc2b5da3d558a6 100644
--- a/tests/sys/src/FileNames.hx
+++ b/tests/sys/src/FileNames.hx
@@ -17,11 +17,6 @@ class FileNames {
 		"(two words)",
 		"[two words]",
 
-		// Chinese, Japanese
-		#if !(cs || python || php || neko || cpp || java || lua)
-		"中文，にほんご",
-		#end
-
 		// "aaa...a"
 		[for (i in 0...100) "a"].join(""),
 	]
@@ -33,7 +28,7 @@ class FileNames {
 		case _:
 		[
 			// 255 bytes is the max filename length according to http://en.wikipedia.org/wiki/Comparison_of_file_systems
-			#if !(python || neko || cpp || java)
+			#if !(python || neko || cpp || java || cs)
 			[for (i in 0...255) "a"].join(""),
 			#end
 		];
diff --git a/tests/sys/src/Main.hx b/tests/sys/src/Main.hx
index b4aa92243df248f67be8dbb3b9dc7f427ea38649..dffb4b5609b4b3738e3b76436d5776ef36315243 100644
--- a/tests/sys/src/Main.hx
+++ b/tests/sys/src/Main.hx
@@ -1,11 +1,29 @@
+import utest.Runner;
+import utest.ui.Report;
+import utest.ui.common.HeaderDisplayMode;
+
 class Main {
 	static public function main() {
-		var runner = new haxe.unit.TestRunner();
-		runner.add(new TestSys());
-		runner.add(new TestFileSystem());
-		runner.add(new io.TestFileInput());
-		runner.add(new io.TestProcess());
-		var code = runner.run() ? 0 : 1;
-		Sys.exit(code);
+		var runner = new Runner();
+		runner.addCase(new TestUnicode());
+		runner.addCase(new TestSys());
+		runner.addCase(new TestFileSystem());
+		runner.addCase(new io.TestFile());
+		runner.addCase(new io.TestFileInput());
+		runner.addCase(new io.TestProcess());
+		#if php
+		switch (Sys.systemName()) {
+			case "Windows":
+				// pass
+			case _:
+				runner.addCase(new net.TestSocket());
+		}
+		#else
+			runner.addCase(new net.TestSocket());
+		#end
+		var report = Report.create(runner);
+		report.displayHeader = AlwaysShowHeader;
+		report.displaySuccessResults = NeverShowSuccessResults;
+		runner.run();
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/sys/src/TestArguments.hx b/tests/sys/src/TestArguments.hx
index 066e63bcc71d30188ef4330175f366079f05773d..599b3e6bd30fb77601a2030fb5320e9c1e2eb8ae 100644
--- a/tests/sys/src/TestArguments.hx
+++ b/tests/sys/src/TestArguments.hx
@@ -1,8 +1,11 @@
+import utest.Assert;
+import utest.Runner;
+import utest.ui.Report;
+
 /**
 	This test is intented to be used by TestSys and io.TestProcess.
-	It will write the result to "temp/TestArguments.txt" (for debugging).
 */
-class TestArguments extends haxe.unit.TestCase {
+class TestArguments extends utest.Test {
 	// We may compare and update the test cases of other popular langs/libs: https://gist.github.com/andyli/d55ae9ea1327bbbf749d
 	static public var expectedArgs(default, never):Array<String> = [
 		"foo",
@@ -64,7 +67,9 @@ class TestArguments extends haxe.unit.TestCase {
 	});
 
 	static public var bin:String =
-	#if neko
+	#if interp
+		"TestArguments.hx";
+	#elseif neko
 		"bin/neko/TestArguments.n";
 	#elseif hl
 		"bin/hl/TestArguments.hl";
@@ -80,6 +85,12 @@ class TestArguments extends haxe.unit.TestCase {
 		#else
 			"bin/cs/bin/TestArguments.exe";
 		#end
+	#elseif (java && jvm)
+		#if debug
+			"bin/jvm/TestArguments-Debug.jar";
+		#else
+			"bin/jvm/TestArguments.jar";
+		#end
 	#elseif java
 		#if debug
 			"bin/java/TestArguments-Debug.jar";
@@ -88,8 +99,6 @@ class TestArguments extends haxe.unit.TestCase {
 		#end
 	#elseif python
 		"bin/python/TestArguments.py";
-	#elseif php7
-		"bin/php7/TestArguments/index.php";
 	#elseif php
 		"bin/php/TestArguments/index.php";
 	#elseif lua
@@ -98,27 +107,20 @@ class TestArguments extends haxe.unit.TestCase {
 		null;
 	#end
 
-	static public var log = "temp/TestArguments.txt";
-
 	function testArgs() {
 		var args = Sys.args();
 		for (i in 0...expectedArgs.length) {
-			assertEquals(expectedArgs[i], args[i]);
+			Assert.equals(expectedArgs[i], args[i]);
 		}
-		assertEquals(expectedArgs.length, args.length);
+		Assert.equals(expectedArgs.length, args.length);
 	}
 
 	static function main():Void {
-		var log = sys.io.File.write(log);
-		log.writeString(haxe.Json.stringify(Sys.args()) + "\n");
-		haxe.unit.TestRunner.print = function(v){
-			log.writeString(v);
-		};
-		var runner = new haxe.unit.TestRunner();
-		runner.add(new TestArguments());
-		var code = runner.run() ? 0 : 1;
-		log.flush();
-		log.close();
-		Sys.exit(code);
+		var runner = new Runner();
+		var report = Report.create(runner);
+		report.displayHeader = AlwaysShowHeader;
+		report.displaySuccessResults = NeverShowSuccessResults;
+		runner.addCase(new TestArguments());
+		runner.run();
 	}
 }
diff --git a/tests/sys/src/TestCommandBase.hx b/tests/sys/src/TestCommandBase.hx
index 5232e9310e120d93aeb301946bdab87b5b0fbfc8..c903c85d44360da4ab735c7ac757f2a9a34d043f 100644
--- a/tests/sys/src/TestCommandBase.hx
+++ b/tests/sys/src/TestCommandBase.hx
@@ -1,8 +1,10 @@
 import sys.*;
 import haxe.io.*;
+import utest.Assert;
 
-class TestCommandBase extends haxe.unit.TestCase {
+class TestCommandBase extends utest.Test {
 	var runInfo:{out:String, err:String} = null;
+
 	function run(cmd:String, ?args:Array<String>):Int {
 		throw "should be overridden";
 	}
@@ -13,9 +15,7 @@ class TestCommandBase extends haxe.unit.TestCase {
 
 		#if !cs
 		var exitCode = run("haxe", ["compile-each.hxml", "--run", "TestArguments"].concat(args));
-		if (exitCode != 0)
-			trace(sys.io.File.getContent(TestArguments.log));
-		assertEquals(0, exitCode);
+		Assert.equals(0, exitCode);
 		#end
 
 		var exitCode =
@@ -39,19 +39,13 @@ class TestCommandBase extends haxe.unit.TestCase {
 			#elseif hl
 				run("hl", [bin].concat(args));
 			#elseif php
-				run(untyped __php__("defined('PHP_BINARY') ? PHP_BINARY : 'php'"), [bin].concat(args));
+				run(php.Global.defined('PHP_BINARY') ? php.Const.PHP_BINARY : 'php', [bin].concat(args));
 			#elseif lua
-				if (untyped lua.jit != null){
-					run("luajit", [bin].concat(args));
-				} else {
-					run("lua", [bin].concat(args));
-				}
+				run("lua", [bin].concat(args));
 			#else
 				-1;
 			#end
-		if (exitCode != 0)
-			trace(sys.io.File.getContent(TestArguments.log));
-		assertEquals(0, exitCode);
+		Assert.equals(0, exitCode);
 	}
 
 	function testCommandName() {
@@ -70,7 +64,7 @@ class TestCommandBase extends haxe.unit.TestCase {
 						sys.io.File.copy(ExitCode.getNative(), path);
 					case "Mac", "Linux", _:
 						var exitCode = run("cp", [ExitCode.getNative(), path]);
-						assertEquals(0, exitCode);
+						Assert.equals(0, exitCode);
 				}
 
 				Sys.sleep(0.1);
@@ -85,10 +79,19 @@ class TestCommandBase extends haxe.unit.TestCase {
 				}
 				if (exitCode != random)
 					trace(name);
-				assertEquals(random, exitCode);
-				FileSystem.deleteFile(path);
+				Assert.equals(random, exitCode);
 			}
 		}
+
+		// Try to avoid unlink(): Resource temporarily unavailable error
+		Sys.sleep(0.1);
+		#if php
+		php.Global.gc_collect_cycles();
+		#end
+		for (file in FileSystem.readDirectory("temp")) {
+			if (file == ".gitignore") continue;
+			FileSystem.deleteFile(Path.join(["temp", file]));
+		}
 	}
 
 	function testExitCode() {
@@ -101,7 +104,7 @@ class TestCommandBase extends haxe.unit.TestCase {
 		for (code in codes) {
 			var args = [Std.string(code)];
 			var exitCode = run(ExitCode.getNative(), args);
-			assertEquals(code, exitCode);
+			Assert.equals(code, exitCode);
 		}
 
 		for (code in codes) {
@@ -127,20 +130,16 @@ class TestCommandBase extends haxe.unit.TestCase {
 				#elseif hl
 					run("hl", [bin].concat(args));
 				#elseif php
-					run(untyped __php__("defined('PHP_BINARY') ? PHP_BINARY : 'php'"), [bin].concat(args));
+					run(php.Global.defined('PHP_BINARY') ? php.Const.PHP_BINARY : 'php', [bin].concat(args));
 				#elseif lua
-					if (untyped lua.jit != null){
-						run("luajit", [bin].concat(args));
-					} else {
-						run("lua", [bin].concat(args));
-					}
+					run("lua", [bin].concat(args));
 				#else
 					-1;
 				#end
 			if ((code != exitCode) && (runInfo != null)) {
 				trace(runInfo);
 			}
-			assertEquals(code, exitCode);
+			Assert.equals(code, exitCode);
 		}
 	}
 
@@ -148,6 +147,6 @@ class TestCommandBase extends haxe.unit.TestCase {
 		var bin = sys.FileSystem.absolutePath(ExitCode.bin);
 		var native = sys.FileSystem.absolutePath(ExitCode.getNative());
 		var exitCode = run('$native 1 || $native 0');
-		assertEquals(0, exitCode);
+		Assert.equals(0, exitCode);
 	}
 }
diff --git a/tests/sys/src/TestFileSystem.hx b/tests/sys/src/TestFileSystem.hx
index d8fa2f7bb411f2aeb7ad94baae481a091640bc7f..1332d8bd4d12e985c3f96305c1d22ba8e0e912ca 100644
--- a/tests/sys/src/TestFileSystem.hx
+++ b/tests/sys/src/TestFileSystem.hx
@@ -1,6 +1,8 @@
 import sys.FileSystem;
+import utest.Assert;
+using StringTools;
 
-class TestFileSystem extends haxe.unit.TestCase {
+class TestFileSystem extends utest.Test {
 	/**
 		Recursively remove a given directory.
 	*/
@@ -24,53 +26,53 @@ class TestFileSystem extends haxe.unit.TestCase {
 		case _: ["", "/"];
 	}
 
-	override public function setup() {
+	public function setup() {
 		removeDir(dir);
 		FileSystem.createDirectory(dir);
 	}
 
-	override public function tearDown() {
+	public function teardown() {
 		removeDir(dir);
 	}
 
 	function testReadDirectory():Void {
 		for (tailingSlash in tailingSlashes) {
-			assertEquals(0, FileSystem.readDirectory(dir).length);
+			Assert.equals(0, FileSystem.readDirectory(dir).length);
 			for (name in FileNames.names) {
 				var path = dir + name + tailingSlash;
 				FileSystem.createDirectory(path);
 				var files = FileSystem.readDirectory(path);
-				assertEquals(0, files.length);
+				Assert.equals(0, files.length);
 			}
 			var files = FileSystem.readDirectory(dir);
 			for (name in FileNames.names) {
-				assertTrue(files.indexOf(name) > -1);
+				Assert.isTrue(files.indexOf(name) > -1);
 			}
-			assertEquals(FileNames.names.length, files.length);
+			Assert.equals(FileNames.names.length, files.length);
 			for (name in FileNames.names) {
 				FileSystem.deleteDirectory(dir + name);
 			}
 
 			//read current directory
-			assertTrue(FileSystem.readDirectory("." + tailingSlash).indexOf("compile.hxml") > -1);
+			Assert.isTrue(FileSystem.readDirectory("." + tailingSlash).indexOf("compile.hxml") > -1);
 			//read parent directory
-			assertTrue(FileSystem.readDirectory(".." + tailingSlash).indexOf("sys") > -1);
+			Assert.isTrue(FileSystem.readDirectory(".." + tailingSlash).indexOf("sys") > -1);
 			//read directory with complex path
-			assertTrue(FileSystem.readDirectory("../sys/./.." + tailingSlash).indexOf("sys") > -1);
+			Assert.isTrue(FileSystem.readDirectory("../sys/./.." + tailingSlash).indexOf("sys") > -1);
 		}
 	}
 
 	function testCreateDirectory():Void {
 		for (tailingSlash in tailingSlashes) {
-			assertEquals(0, FileSystem.readDirectory(dir).length);
+			Assert.equals(0, FileSystem.readDirectory(dir).length);
 			for (name in FileNames.names) {
 				FileSystem.createDirectory(dir + name + tailingSlash);
 			}
 			var files = FileSystem.readDirectory(dir);
 			for (name in FileNames.names) {
-				assertTrue(files.indexOf(name) > -1);
+				Assert.isTrue(files.indexOf(name) > -1);
 			}
-			assertEquals(FileNames.names.length, files.length);
+			Assert.equals(FileNames.names.length, files.length);
 			for (name in FileNames.names) {
 				FileSystem.deleteDirectory(dir + name);
 			}
@@ -78,12 +80,12 @@ class TestFileSystem extends haxe.unit.TestCase {
 			//create deep directory
 			var path = dir + "1/2/3" + tailingSlash;
 			FileSystem.createDirectory(path);
-			assertTrue(FileSystem.isDirectory(path));
+			Assert.isTrue(FileSystem.isDirectory(path));
 
 			//create directory in complex path
 			var path = dir + "1/../1/./../complex" + tailingSlash;
 			FileSystem.createDirectory(path);
-			assertTrue(FileSystem.readDirectory(dir).indexOf("complex") > -1);
+			Assert.isTrue(FileSystem.readDirectory(dir).indexOf("complex") > -1);
 
 			FileSystem.deleteDirectory(dir + "1/2/3");
 			FileSystem.deleteDirectory(dir + "1/2");
@@ -92,9 +94,14 @@ class TestFileSystem extends haxe.unit.TestCase {
 		}
 	}
 
+	function testRootExists() {
+		Assert.isTrue(FileSystem.exists("/"));
+		Assert.isTrue(FileSystem.stat("/") != null);
+	}
+
 	function testWindowsSpecialCases() {
 		if (Sys.systemName() != "Windows" #if python || true #end) {
-			assertTrue(true);
+			Assert.isTrue(true);
 			return;
 		}
 		var withSlash = "C:/";
@@ -102,15 +109,46 @@ class TestFileSystem extends haxe.unit.TestCase {
 		var without = "C:";
 
 		for (path in [withSlash, withBackslash, without]) {
-			assertTrue(FileSystem.exists(path));
-			assertTrue(FileSystem.isDirectory(path));
-			assertTrue(FileSystem.stat(path) != null);
-			assertTrue(FileSystem.readDirectory(path) != null);
+			Assert.isTrue(FileSystem.exists(path));
+			Assert.isTrue(FileSystem.isDirectory(path));
+			Assert.isTrue(FileSystem.stat(path) != null);
+			Assert.isTrue(FileSystem.readDirectory(path) != null);
 		}
 	}
 
 	function testStatDirectory() {
 		var stat = FileSystem.stat(dir);
-		assertTrue(stat != null);
+		Assert.isTrue(stat != null);
+	}
+
+	function testCreateExistingDirectory() {
+		var testDir = dir + "exists";
+		FileSystem.createDirectory(testDir);
+		FileSystem.createDirectory(testDir); // shouldn't throw
+		Assert.isTrue(FileSystem.isDirectory(testDir));
+	}
+
+	function testAbsolutePath() {
+		var paths = [
+			{ input: "c:\\nadako",   expected: "c:\\nadako" },
+			{ input: "nadako.js",    expected: haxe.io.Path.join([Sys.getCwd(), "nadako.js"]) },
+			{ input: "./nadako.js",  expected: haxe.io.Path.join([Sys.getCwd(), "/./nadako.js"]) },
+			{ input: "/nadako",      expected: "/nadako" }
+		];
+		for (path in paths) {
+			Assert.equals(normPath(path.expected), normPath(FileSystem.absolutePath(path.input)));
+		}
+	}
+
+	static function normPath(p:String, properCase = false):String {
+		if (Sys.systemName() == "Windows")
+		{
+			// on windows, haxe returns lowercase paths with backslashes, drive letter uppercased
+			p = p.substr(0, 1).toUpperCase() + p.substr(1);
+			p = p.replace("/", "\\");
+			if (!properCase)
+				p = p.toLowerCase();
+		}
+		return p;
 	}
 }
\ No newline at end of file
diff --git a/tests/sys/src/TestSys.hx b/tests/sys/src/TestSys.hx
index afb16f1e9127347877efdd40250c92b4ea774b2d..88bf64a03ccd33272020d150b69236d7642935b9 100644
--- a/tests/sys/src/TestSys.hx
+++ b/tests/sys/src/TestSys.hx
@@ -1,48 +1,50 @@
+import utest.Assert;
+
 class TestSys extends TestCommandBase {
 	override function run(cmd:String, ?args:Array<String>):Int {
 		return Sys.command(cmd, args);
 	}
 
 	function testEnv() {
-		#if !(java || php || lua)
+		#if !(java)
 		Sys.putEnv("foo", "value");
-		assertEquals("value", Sys.getEnv("foo"));
+		Assert.equals("value", Sys.getEnv("foo"));
 		#end
-		assertEquals(null, Sys.getEnv("doesn't exist"));
+		Assert.equals(null, Sys.getEnv("doesn't exist"));
 
-		#if !(java || php || lua)
+		#if !(java)
 		var env = Sys.environment();
-		assertEquals("value", env.get("foo"));
+		Assert.equals("value", env.get("foo"));
 		#end
 	}
 
 	function testProgramPath() {
 		var p = Sys.programPath();
 
-		assertTrue(haxe.io.Path.isAbsolute(p));
-		assertTrue(sys.FileSystem.exists(p));
+		Assert.isTrue(haxe.io.Path.isAbsolute(p));
+		Assert.isTrue(sys.FileSystem.exists(p));
 
 		#if interp
-			assertTrue(StringTools.endsWith(p, "Main.hx"));
+			Assert.isTrue(StringTools.endsWith(p, "Main.hx"));
 		#elseif neko
-			assertTrue(StringTools.endsWith(p, "sys.n"));
+			Assert.isTrue(StringTools.endsWith(p, "sys.n"));
 		#elseif cpp
 			switch (Sys.systemName()) {
 				case "Windows":
-					assertTrue(StringTools.endsWith(p, "Main-debug.exe"));
+					Assert.isTrue(StringTools.endsWith(p, "Main-debug.exe"));
 				case _:
-					assertTrue(StringTools.endsWith(p, "Main-debug"));
+					Assert.isTrue(StringTools.endsWith(p, "Main-debug"));
 			}
 		#elseif cs
-			assertTrue(StringTools.endsWith(p, "Main-Debug.exe"));
+			Assert.isTrue(StringTools.endsWith(p, "Main-Debug.exe"));
 		#elseif java
-			assertTrue(StringTools.endsWith(p, "Main-Debug.jar"));
+			Assert.isTrue(StringTools.endsWith(p, "Main-Debug.jar"));
 		#elseif python
-			assertTrue(StringTools.endsWith(p, "sys.py"));
+			Assert.isTrue(StringTools.endsWith(p, "sys.py"));
 		#elseif php
-			assertTrue(StringTools.endsWith(p, "index.php"));
+			Assert.isTrue(StringTools.endsWith(p, "index.php"));
 		#elseif lua
-			assertTrue(StringTools.endsWith(p, "sys.lua"));
+			Assert.isTrue(StringTools.endsWith(p, "sys.lua"));
 		#end
 	}
 
@@ -54,7 +56,7 @@ class TestSys extends TestCommandBase {
 		function normalize(path) {
 			return haxe.io.Path.addTrailingSlash(haxe.io.Path.normalize(path));
 		}
-		assertEquals(normalize(newCwd), normalize(Sys.getCwd()));
+		Assert.equals(normalize(newCwd), normalize(Sys.getCwd()));
 		Sys.setCwd(cur);
 	}
 	#end
diff --git a/tests/sys/src/TestUnicode.hx b/tests/sys/src/TestUnicode.hx
new file mode 100644
index 0000000000000000000000000000000000000000..561c49fd92d2b48b6c9e76589c8b6bea4796b6e5
--- /dev/null
+++ b/tests/sys/src/TestUnicode.hx
@@ -0,0 +1,425 @@
+import utest.Assert;
+import haxe.io.Bytes;
+import haxe.io.Path;
+import sys.FileSystem;
+import sys.io.File;
+import UnicodeSequences.UnicodeString;
+import UnicodeSequences.codepointsToString;
+import UnicodeSequences.showUnicodeString;
+import UtilityProcess.runUtility;
+
+class TestUnicode extends utest.Test {
+	static var BIN_SYMLINK =
+#if cpp
+		#if debug
+			"bin-cpp-debug";
+		#else
+			"bin-cpp";
+		#end
+#elseif cs
+		#if debug
+			"bin-cs-debug";
+		#else
+			"bin-cs";
+		#end
+#elseif hl
+		"bin-hl";
+#elseif lua
+		"bin-lua";
+#elseif (java && jvm)
+		#if debug
+			"bin-jvm-debug";
+		#else
+			"bin-jvm";
+		#end
+#elseif java
+		#if debug
+			"bin-java-debug";
+		#else
+			"bin-java";
+		#end
+#elseif neko
+		"bin-neko";
+#elseif php
+		"bin-php";
+#elseif python
+		"bin-py";
+#elseif eval
+		"bin-eval";
+#else
+		null;
+#end
+
+	// list of filenames expected to NOT exist in sub-directories
+	static var nonExistentNames:Array<UnicodeString> = [
+		// Java escapes
+		Only([0x0025, 0x0030 , 0x0001]), // %01
+		Only([0x0025, 0x0037 , 0x0046]) // %7F
+	];
+
+	// list of expected filenames in sub-directories
+	static var names:Array<UnicodeString> = (Sys.systemName() == "Windows" ? UnicodeSequences.valid.slice(1) : UnicodeSequences.valid);
+
+	// extra files only present in the root test-res directory
+	static var namesRoot = names.concat([
+		Only([0x0061]), // a
+		Only([0x0062]), // b
+		Only([0x64, 0x61, 0x74, 0x61, 0x2E, 0x62, 0x69, 0x6E]) // data.bin
+	]);
+
+	static var endLine = (Sys.systemName() == "Windows" ? "\r\n" : "\n");
+
+	// same names and length, but possibly different order
+	// assumes no duplicates in expected
+	function sameFiles(actual:Array<String>, expected:Array<UnicodeString>):Void {
+		Assert.equals(actual.length, expected.length);
+		var remaining = expected.copy();
+		for (file in actual) {
+			var codepoints = UnicodeSequences.unicodeCodepoints(file);
+			var removed = remaining.filter(ref -> !UnicodeSequences.codepointsSame(codepoints, ref));
+			if (removed.length == remaining.length) {
+				Assert.fail('unexpected filename ${showUnicodeString(file)} found');
+			} else {
+				remaining = removed;
+			}
+		}
+	}
+
+	function assertUEnds(actual:String, expected:String, ?alt:String, ?pos:haxe.PosInfos):Void {
+		Assert.isTrue(
+			StringTools.endsWith(actual, expected) || (alt != null ? StringTools.endsWith(actual, alt) : false),
+			'expected ${showUnicodeString(actual)} to end with ${showUnicodeString(expected)}'
+			+ (alt != null ? ' or ${showUnicodeString(alt)}' : ""),
+			pos
+		);
+	}
+
+	function assertUEquals(actual:String, expected:String, ?msg:String, ?pos:haxe.PosInfos):Void {
+		Assert.equals(
+			expected, actual,
+			msg != null ? msg : 'expected ${showUnicodeString(actual)} to be ${showUnicodeString(expected)}',
+			pos
+		);
+	}
+
+	function assertBytesEqual(actual:Bytes, expected:Bytes, ?msg:String, ?pos:haxe.PosInfos):Void {
+		Assert.equals(
+			actual.compare(expected), 0,
+			msg != null ? msg : 'expected ${actual.toHex()} to be ${expected.toHex()}',
+			pos
+		);
+	}
+
+	function pathBoth(f:String->Void, ?path:String, ?skipNonExistent:Bool = true):Void {
+		for (filename in names) switch (filename) {
+			case Only(codepointsToString(_) => ref):
+			f(path != null ? Path.join([path, ref]) : ref);
+			case Normal(codepointsToString(_) => nfc, codepointsToString(_) => nfd):
+			var joinedNfc = path != null ? Path.join([path, nfc]) : nfc;
+			var joinedNfd = path != null ? Path.join([path, nfd]) : nfd;
+			if (!skipNonExistent || FileSystem.exists(joinedNfc)) f(joinedNfc);
+			if (!skipNonExistent || FileSystem.exists(joinedNfd)) f(joinedNfd);
+		}
+	}
+
+	function assertNormalEither(f:String->Bool, path:String, ?msg:String, ?pos:haxe.PosInfos):Void {
+		for (filename in names) Assert.isTrue(switch (filename) {
+			case Only(codepointsToString(_) => ref): f(Path.join([path, ref]));
+			case Normal(codepointsToString(_) => nfc, codepointsToString(_) => nfd):
+			f(Path.join([path, nfc])) || f(Path.join([path, nfd]));
+		}, '$msg ($filename in $path)', pos);
+	}
+
+	function setupClass() {
+		FileSystem.createDirectory("temp-unicode");
+		Sys.command("python3", ["genTestRes.py"]);
+	}
+
+	function teardownClass() {
+		if (FileSystem.exists("temp-unicode")) {
+			for (file in FileSystem.readDirectory("temp-unicode")) {
+				FileSystem.deleteFile(Path.join(["temp-unicode", file]));
+			}
+			FileSystem.deleteDirectory("temp-unicode");
+		}
+	}
+
+#if target.unicode
+	function testFilesystem() {
+#if !java
+#if !(cpp || cs) // C++ disabled temporarily (#8400), C# disabled temporarily (#8247)
+		// setCwd + getCwd
+		Sys.setCwd("test-res");
+		function enterLeave(dir:String, ?alt:String):Void {
+			Sys.setCwd(dir);
+			assertUEnds(Path.removeTrailingSlashes(Path.normalize(Sys.getCwd())), '/test-res/${dir}', alt != null ? '/test-res/${alt}' : null);
+			Sys.setCwd("..");
+		}
+		for (filename in names) switch (filename) {
+			case Only(codepointsToString(_) => ref): enterLeave(ref);
+			case Normal(codepointsToString(_) => nfc, codepointsToString(_) => nfd):
+			if (FileSystem.exists(nfc)) enterLeave(nfc, nfd);
+			if (FileSystem.exists(nfd)) enterLeave(nfd, nfc);
+		}
+		Sys.setCwd("..");
+#end
+#end
+
+		// absolutePath
+		pathBoth(path -> {
+				for (relative in [
+						{path: '../$path', end: '${path}'},
+						{path: 'foo', end: '${path}/foo'},
+						{path: "..", end: "test-res"},
+						{path: "./././././", end: path},
+						{path: "./..", end: "test-res"},
+						{path: "./čýžé", end: '${path}/čýžé'},
+						{path: "./čýžé/", end: '${path}/čýžé'},
+						{path: "./../čýžé", end: 'test-res/čýžé'},
+						{path: "./../čýžé/", end: 'test-res/čýžé'},
+					]) assertUEnds(
+						Path.normalize(FileSystem.absolutePath('$path/${relative.path}')),
+						relative.end
+					);
+			}, "test-res");
+
+#if !java
+#if !(cpp || cs) // C++ disabled temporarily (#8400), C# disabled temporarily (#8247)
+		assertNormalEither(path -> {
+				if (!FileSystem.exists(path)) return false; // NFC/NFD differences
+				Sys.setCwd(path);
+				var ret = true;
+				for (relative in [
+						{path: '../$path', end: '${path}'},
+						{path: 'foo', end: '${path}/foo'},
+						{path: "..", end: "test-res"},
+						{path: "./././././", end: path},
+						{path: "./..", end: "test-res"},
+						{path: "./čýžé", end: '${path}/čýžé'},
+						{path: "./čýžé/", end: '${path}/čýžé'},
+						{path: "./../čýžé", end: 'test-res/čýžé'},
+						{path: "./../čýžé/", end: 'test-res/čýžé'},
+					]) if (!StringTools.endsWith(Path.normalize(FileSystem.absolutePath('${relative.path}')), relative.end)) ret = false;
+				Sys.setCwd("../..");
+				return ret;
+			}, "test-res", "setCwd + absolutePath + endsWith failed");
+#end
+#end
+
+		// exists
+#if !cpp // C++ disabled temporarily (#8400)
+		assertNormalEither(FileSystem.exists, 'test-res/a', 'expected exists == true');
+		assertNormalEither(FileSystem.exists, 'test-res/b', 'expected exists == false');
+#end
+
+		// fullPath
+#if !lua // Lua disabled temporarily (#8215)
+		#if !cs // C# behaves like Windows here
+		if (Sys.systemName() != "Windows") {
+			// symlinks behave strangely on Windows
+			pathBoth(path -> {
+					assertUEnds(
+							Path.normalize(FileSystem.fullPath('$path/${BIN_SYMLINK}')),
+							'/${UtilityProcess.BIN_PATH}/${UtilityProcess.BIN_NAME}'
+						);
+				}, "test-res");
+		}
+		#end
+#end
+
+		// isDirectory
+		assertNormalEither(FileSystem.isDirectory, 'test-res/a', 'expected isDirectory == true');
+		assertNormalEither(path -> !FileSystem.isDirectory(path), 'test-res/b', 'expected isDirectory == false');
+
+		// readDirectory
+#if !cs // C# disabled temporarily (#8247)
+		sameFiles(FileSystem.readDirectory("test-res"), namesRoot);
+		sameFiles(FileSystem.readDirectory("test-res/a"), names);
+		sameFiles(FileSystem.readDirectory("test-res/b"), names);
+#end
+
+		// stat
+		assertNormalEither(path -> FileSystem.stat(path) != null, 'test-res/a', 'expected stat != null');
+		assertNormalEither(path -> FileSystem.stat(path) != null, 'test-res/b', 'expected stat != null');
+
+		// path
+		pathBoth(str -> {
+				Assert.equals(new Path('$str/a.b').dir, str);
+				Assert.equals(Path.directory('$str/a.b'), str);
+				Assert.equals(new Path('a/$str.b').file, str);
+				Assert.equals(new Path('a/b.$str').ext, str);
+				Assert.equals(Path.extension('a/b.$str'), str);
+				Assert.equals(Path.join([str, "a"]), '$str/a');
+				Assert.equals(Path.join(["a", str]), 'a/$str');
+				Assert.equals(Path.addTrailingSlash(str), '$str/');
+				Assert.equals(Path.normalize('a/../$str'), str);
+				Assert.equals(Path.normalize('$str/a/..'), str);
+			});
+
+		// rename
+#if !cpp // C++ disabled temporarily (#8400)
+		File.copy("test-res/data.bin", "temp-unicode/rename-me");
+		pathBoth(str -> {
+				FileSystem.rename('temp-unicode/rename-me', 'temp-unicode/$str');
+				Assert.isFalse(FileSystem.exists('temp-unicode/rename-me'));
+				Assert.isTrue(FileSystem.exists('temp-unicode/$str'));
+				FileSystem.rename('temp-unicode/$str', 'temp-unicode/rename-me');
+			});
+#end
+
+#if !cpp // C++ disabled temporarily (#8400)
+		pathBoth(str -> {
+				// copy
+				File.copy("test-res/data.bin", 'temp-unicode/$str');
+				Assert.isTrue(FileSystem.exists('temp-unicode/$str'));
+				assertBytesEqual(File.getBytes('temp-unicode/$str'), UnicodeSequences.validBytes);
+
+				// deleteFile
+				FileSystem.deleteFile('temp-unicode/$str');
+				Assert.isFalse(FileSystem.exists('temp-unicode/$str'));
+
+				// createDirectory
+				FileSystem.createDirectory('temp-unicode/$str');
+				Assert.isTrue(FileSystem.exists('temp-unicode/$str'));
+				Assert.equals(FileSystem.readDirectory('temp-unicode/$str').length, 0);
+
+				// deleteDirectory
+				FileSystem.deleteDirectory('temp-unicode/$str');
+				Assert.isFalse(FileSystem.exists('temp-unicode/$str'));
+			});
+#end
+	}
+
+	// Temporary disabled for local run because of https://github.com/HaxeFoundation/haxe/issues/8380
+	#if (travis || appveyor || azure)
+	function testIPC() {
+		// stdin.readLine
+		UnicodeSequences.normalBoth(str -> {
+				assertUEquals(runUtility(["stdin.readLine"], {stdin: str + endLine}).stdout, str + endLine);
+			});
+
+		// stdin.readString
+		UnicodeSequences.normalBoth(str -> {
+				var byteLength = Bytes.ofString(str).length;
+				assertUEquals(runUtility(["stdin.readString", '${byteLength}'], {stdin: '$str'}).stdout, str + endLine);
+			});
+
+		// stdin.readUntil
+		UnicodeSequences.normalBoth(str -> {
+				// make sure the 0x70 byte is not part of the test string
+				assertUEquals(runUtility(["stdin.readUntil", "0x70"], {stdin: str + "\x70" + str + "\x70"}).stdout, str + endLine);
+			});
+
+		UnicodeSequences.normalBothIndexed((str, i, nfc) -> {
+				var mode = nfc ? "nfc" : "nfd";
+				// stdout
+				assertUEquals(runUtility(["stdout.writeString", '$i', mode]).stdout, str);
+				// stderr
+				assertUEquals(runUtility(["stderr.writeString", '$i', mode]).stderr, str);
+				// print
+				assertUEquals(runUtility(["print", '$i', mode]).stdout, str);
+				// println
+				assertUEquals(runUtility(["println", '$i', mode]).stdout, str + endLine);
+				// trace
+				assertUEnds(runUtility(["trace", '$i', mode]).stdout, str + endLine);
+				#if !java
+#if (hl || cpp) if (Sys.systemName() != "Windows") { #end // HL and C++ temporarily disabled (#8379)
+				// putEnv + getEnv
+				assertUEquals(runUtility(["putEnv", "HAXE_TEST", '$i', mode, "getEnv", "HAXE_TEST"]).stdout, str + endLine);
+#if !lua // Lua disabled temporarily (#8216)
+				// putEnv + environment
+				assertUEquals(runUtility(["putEnv", "HAXE_TEST", '$i', mode, "environment", "HAXE_TEST"]).stdout, str + endLine);
+#end
+#if (hl || cpp) } #end // HL and C++ temporarily disabled (#8379)
+				#end
+			});
+
+		// args
+		#if !cs // C# behaves like Windows here
+		if (#if (java || eval || hl || cpp) Sys.systemName() != "Windows" #else true #end) {
+			// https://stackoverflow.com/questions/7660651/passing-command-line-unicode-argument-to-java-code
+			UnicodeSequences.normalBoth(str -> {
+					assertUEquals(runUtility(["args", str]).stdout, str + endLine);
+				});
+		}
+		#end
+	}
+	#end
+
+	function testIO() {
+		// getBytes
+		assertBytesEqual(File.getBytes("test-res/data.bin"), UnicodeSequences.validBytes);
+		pathBoth(path -> {
+				assertBytesEqual(File.getBytes(path), UnicodeSequences.validBytes);
+			}, "test-res/b");
+
+		// getContent
+		assertUEquals(File.getContent("test-res/data.bin"), UnicodeSequences.validString);
+		pathBoth(path -> {
+				assertUEquals(File.getContent(path), UnicodeSequences.validString);
+			}, "test-res/b");
+
+		// saveContent
+		File.saveContent("temp-unicode/data.bin", UnicodeSequences.validString);
+		assertBytesEqual(File.getBytes("temp-unicode/data.bin"), UnicodeSequences.validBytes);
+#if !cs // C# disabled temporarily (#8247)
+		pathBoth(str -> {
+				File.saveContent('temp-unicode/saveContent-$str.bin', UnicodeSequences.validString);
+				assertBytesEqual(File.getBytes('temp-unicode/saveContent-$str.bin'), UnicodeSequences.validBytes);
+			});
+#end
+
+		// write
+		var out = File.write("temp-unicode/out.bin");
+		out.writeString(UnicodeSequences.validString);
+		out.close();
+		assertBytesEqual(File.getBytes("temp-unicode/out.bin"), UnicodeSequences.validBytes);
+#if !cs // C# disabled temporarily (#8247)
+		pathBoth(str -> {
+				var out = File.write('temp-unicode/write-$str.bin');
+				out.writeString(UnicodeSequences.validString);
+				out.close();
+				assertBytesEqual(File.getBytes('temp-unicode/write-$str.bin'), UnicodeSequences.validBytes);
+			});
+#end
+
+		// update
+		var out = File.update("temp-unicode/out.bin");
+		out.seek(0, SeekBegin);
+		out.writeString(UnicodeSequences.validString);
+		out.close();
+		assertBytesEqual(File.getBytes("temp-unicode/out.bin"), UnicodeSequences.validBytes);
+
+		// append
+		var out = File.append("temp-unicode/out.bin");
+		out.writeString(UnicodeSequences.validString);
+		out.close();
+		var repeated = Bytes.alloc(UnicodeSequences.validBytes.length * 2);
+		repeated.blit(0, UnicodeSequences.validBytes, 0, UnicodeSequences.validBytes.length);
+		repeated.blit(UnicodeSequences.validBytes.length, UnicodeSequences.validBytes, 0, UnicodeSequences.validBytes.length);
+		assertBytesEqual(File.getBytes("temp-unicode/out.bin"), repeated);
+
+		// readLine
+		var data = File.read("test-res/data.bin");
+		UnicodeSequences.normalNFC(str -> {
+				var line = data.readLine();
+				assertUEquals(line, str);
+			});
+
+		// readString
+		data.seek(0, SeekBegin);
+		UnicodeSequences.normalNFC(str -> {
+				var byteLength = Bytes.ofString(str).length;
+				var line = data.readString(byteLength + 1); // + newline character
+				assertUEquals(line, '$str\n');
+			});
+
+		// readUntil
+		data.seek(0, SeekBegin);
+		UnicodeSequences.normalNFC(str -> {
+				var line = data.readUntil(0x0A);
+				assertUEquals(line, str);
+			});
+	}
+#end
+}
diff --git a/tests/sys/src/UnicodeSequences.hx b/tests/sys/src/UnicodeSequences.hx
new file mode 100644
index 0000000000000000000000000000000000000000..17db479f5710b48fe56284c747a3d11793c59cb3
--- /dev/null
+++ b/tests/sys/src/UnicodeSequences.hx
@@ -0,0 +1,139 @@
+using haxe.iterators.StringIteratorUnicode;
+
+enum UnicodeString {
+	Only(ref:Array<Int>);
+	Normal(nfc:Array<Int>, nfd:Array<Int>);
+}
+
+class UnicodeSequences {
+	// boundary conditions
+	public static var boundary:Array<UnicodeString> = [
+		// 1 byte
+		Only([0x0001]), // this must be first, see TestUnicode.names
+		Only([0x007F]),
+		// 2 byte
+		Only([0x0080]),
+		Only([0x07FF]),
+		// 3 byte
+		Only([0x0800]),
+		Only([0xD7FF]), // just before surrogates
+		Only([0xE000]), // just after surrogates
+		Only([0xFFFD]),
+		// non-BMP (4 byte)
+		Only([0x10000]),
+		Only([0x1FFFF]),
+		Only([0xFFFFF]),
+		Only([0x100000]),
+		Only([0x10FFFF])
+	];
+
+	// NFC / NFD
+	public static var normal:Array<UnicodeString> = [
+		Normal([0x0227], [0x0061, 0x0307]),
+		Normal([0x4E2D, 0x6587, 0xFF0C, 0x306B, 0x307B, 0x3093, 0x3054], [0x4E2D, 0x6587, 0xFF0C, 0x306B, 0x307B, 0x3093, 0x3053, 0x3099])
+	];
+
+	// valid sequences
+	public static var valid:Array<UnicodeString> =
+		boundary
+		.concat([Only([0x1F602, 0x1F604, 0x1F619])]) // important (non-BMP) emoji
+		.concat(normal);
+
+	public static var validBytes = haxe.io.Bytes.ofHex(
+			"010A" +
+			"7F0A" +
+			"C2800A" +
+			"DFBF0A" +
+			"E0A0800A" +
+			"ED9FBF0A" +
+			"EE80800A" +
+			"EFBFBD0A" +
+			"F09080800A" +
+			"F09FBFBF0A" +
+			"F3BFBFBF0A" +
+			"F48080800A" +
+			"F48FBFBF0A" +
+			"F09F9882F09F9884F09F98990A" +
+			"C8A70A" +
+			"E4B8ADE69687EFBC8CE381ABE381BBE38293E381940A"
+		);
+
+	public static var validString =
+		"\u0001\n" +
+		"\u007F\n" +
+		"\u0080\n" +
+		"\u07FF\n" +
+		"\u0800\n" +
+		"\uD7FF\n" +
+		"\uE000\n" +
+		"\uFFFD\n" +
+		"\u{10000}\n" +
+		"\u{1FFFF}\n" +
+		"\u{FFFFF}\n" +
+		"\u{100000}\n" +
+		"\u{10FFFF}\n" +
+		"\u{1F602}\u{1F604}\u{1F619}\n" +
+		"\u0227\n" +
+		"\u4E2D\u6587\uFF0C\u306B\u307B\u3093\u3054\n";
+
+	// invalid sequences
+	public static var invalid:Array<UnicodeString> = [
+		Only([0xFFFE]),
+		Only([0xFFFF])
+	];
+
+	// utility methods
+
+	public static function unicodeCodepoints(str:String):Array<Int> {
+		return [ for (codepoint in str.unicodeIterator()) codepoint ];
+	}
+
+	public static function codepointsToString(ref:Array<Int>):String {
+		return [ for (codepoint in ref) String.fromCharCode(codepoint) ].join("");
+	}
+
+	public static function showUnicodeString(str:String):String {
+		return '$str (${unicodeCodepoints(str)})';
+	}
+
+	public static function codepointsSame(actual:Array<Int>, expected:UnicodeString):Bool {
+		function sameOption(ref:Array<Int>):Bool {
+			if (actual.length != ref.length) return false;
+			for (i in 0...actual.length) if (actual[i] != ref[i]) return false;
+			return true;
+		}
+		return (switch (expected) {
+				case Only(ref): sameOption(ref);
+				case Normal(nfc, nfd):
+				// it might eventually be best to expect a particular form
+				// on specific targets + platforms + filesystems
+				// for now, allowing either
+				sameOption(nfc) || sameOption(nfd);
+			});
+	}
+
+	public static function normalNFC(f:String->Void):Void {
+		for (seq in valid) switch (seq) {
+			case Only(codepointsToString(_) => ref): f(ref);
+			case Normal(codepointsToString(_) => nfc, _): f(nfc);
+		}
+	}
+
+	public static function normalBoth(f:String->Void):Void {
+		for (seq in valid) switch (seq) {
+			case Only(codepointsToString(_) => ref): f(ref);
+			case Normal(codepointsToString(_) => nfc, codepointsToString(_) => nfd):
+			f(nfc);
+			f(nfd);
+		}
+	}
+
+	public static function normalBothIndexed(f:String->Int->Bool->Void):Void {
+		for (i in 0...valid.length) switch (valid[i]) {
+			case Only(codepointsToString(_) => ref): f(ref, i, false);
+			case Normal(codepointsToString(_) => nfc, codepointsToString(_) => nfd):
+			f(nfc, i, true);
+			f(nfd, i, false);
+		}
+	}
+}
diff --git a/tests/sys/src/UtilityProcess.hx b/tests/sys/src/UtilityProcess.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bd7b35a005b46057fdc90817d56149e9b6021ea0
--- /dev/null
+++ b/tests/sys/src/UtilityProcess.hx
@@ -0,0 +1,152 @@
+/**
+	Used by TestUnicode.
+	Runs a given simple program based on the first argument.
+ */
+
+import haxe.io.Path;
+import sys.io.Process;
+
+class UtilityProcess {
+	public static var BIN_PATH =
+#if cpp
+		Path.join(["bin", "cpp"]);
+#elseif cs
+		Path.join(["bin", "cs", "bin"]);
+#elseif hl
+		Path.join(["bin", "hl"]);
+#elseif lua
+		Path.join(["bin", "lua"]);
+#elseif (java && jvm)
+		Path.join(["bin", "jvm"]);
+#elseif java
+		Path.join(["bin", "java"]);
+#elseif neko
+		Path.join(["bin", "neko"]);
+#elseif php
+		Path.join(["bin", "php"]);
+#elseif python
+		Path.join(["bin", "python"]);
+#elseif eval
+		Path.join(["src"]);
+#else
+		null;
+#end
+	public static var BIN_NAME =
+#if cpp
+		#if debug
+			"UtilityProcess-debug";
+		#else
+			"UtilityProcess";
+		#end
+#elseif cs
+		#if debug
+			"UtilityProcess-Debug.exe";
+		#else
+			"UtilityProcess.exe";
+		#end
+#elseif hl
+		"UtilityProcess.hl";
+#elseif lua
+		"UtilityProcess.lua";
+#elseif java
+		#if debug
+			"UtilityProcess-Debug.jar";
+		#else
+			"UtilityProcess.jar";
+		#end
+#elseif neko
+		"UtilityProcess.n";
+#elseif php
+		Path.join(["UtilityProcess", "index.php"]);
+#elseif python
+		"UtilityProcess.py";
+#elseif eval
+		"UtilityProcess.hx";
+#else
+		null;
+#end
+
+	public static function runUtility(args:Array<String>, ?options:{?stdin:String, ?execPath:String, ?execName:String}):{
+		exitCode:Int,
+		stdout:String,
+		stderr:String
+	} {
+		if (options == null) options = {};
+		if (options.execPath == null) options.execPath = BIN_PATH;
+		if (options.execName == null) options.execName = BIN_NAME;
+		var execFull = Path.join([options.execPath, options.execName]);
+		var proc =
+		#if (macro || interp)
+		new Process("haxe", ["compile-each.hxml", "-p", options.execPath, "--run", options.execName].concat(args));
+		#elseif cpp
+		new Process(execFull, args);
+		#elseif cs
+		(switch (Sys.systemName()) {
+			case "Windows":
+				new Process(execFull, args);
+			case _:
+				new Process("mono", [execFull].concat(args));
+		});
+		#elseif java
+		new Process(Path.join([java.lang.System.getProperty("java.home"), "bin", "java"]), ["-jar", execFull].concat(args));
+		#elseif python
+		new Process(python.lib.Sys.executable, [execFull].concat(args));
+		#elseif neko
+		new Process("neko", [execFull].concat(args));
+		#elseif hl
+		new Process("hl", [execFull].concat(args));
+		#elseif php
+		new Process(php.Global.defined('PHP_BINARY') ? php.Const.PHP_BINARY : 'php', [execFull].concat(args));
+		#elseif lua
+		new Process("lua", [execFull].concat(args));
+		#else
+		null;
+		#end
+		if (options.stdin != null) {
+			proc.stdin.writeString(options.stdin);
+			proc.stdin.flush();
+		}
+		var exitCode = proc.exitCode();
+		var stdout = proc.stdout.readAll().toString();
+		var stderr = proc.stderr.readAll().toString();
+		proc.close();
+		return {
+			exitCode: exitCode,
+			stdout: stdout,
+			stderr: stderr
+		};
+	}
+	
+	public static function main():Void {
+		var args = Sys.args();
+		function sequenceIndex(d:String, mode:String):String return (switch (UnicodeSequences.valid[Std.parseInt(d)]) {
+				case Only(ref): UnicodeSequences.codepointsToString(ref);
+				case Normal(nfc, nfd): UnicodeSequences.codepointsToString(mode == "nfc" ? nfc : nfd);
+			});
+		switch (args) {
+			case _.slice(0, 1) => ["putEnv"]:
+			// ["putEnv", var name, index, nfc mode, next args...]
+			Sys.putEnv(args[1], sequenceIndex(args[2], args[3]));
+			var out = runUtility(args.slice(4));
+			Sys.print(out.stdout);
+			Sys.exit(out.exitCode);
+			case ["getCwd"]: Sys.println(Sys.getCwd());
+			case ["getEnv", name]: Sys.println(Sys.getEnv(name));
+			case ["environment", name]: Sys.println(Sys.environment().get(name));
+			case ["exitCode", Std.parseInt(_) => code]: Sys.exit(code);
+			case ["args", data]: Sys.println(data);
+			case ["println", d, mode]: Sys.println(sequenceIndex(d, mode));
+			case ["print", d, mode]: Sys.print(sequenceIndex(d, mode));
+			case ["trace", d, mode]: trace(sequenceIndex(d, mode));
+			case ["stdin.readLine"]: Sys.println(Sys.stdin().readLine());
+			case ["stdin.readString", Std.parseInt(_) => len]: Sys.println(Sys.stdin().readString(len, UTF8));
+			case ["stdin.readUntil", Std.parseInt(_) => end]: Sys.println(Sys.stdin().readUntil(end));
+			case ["stderr.writeString", d, mode]:
+			var stream = Sys.stderr(); stream.writeString(sequenceIndex(d, mode)); stream.flush();
+			case ["stdout.writeString", d, mode]:
+			var stream = Sys.stdout(); stream.writeString(sequenceIndex(d, mode)); stream.flush();
+			case ["programPath"]: Sys.println(Sys.programPath());
+			case _: // no-op
+		}
+	}
+}
diff --git a/tests/sys/src/io/TestFile.hx b/tests/sys/src/io/TestFile.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cc2739660a618446a4f7c60cb0693a44f3e25979
--- /dev/null
+++ b/tests/sys/src/io/TestFile.hx
@@ -0,0 +1,34 @@
+package io;
+
+import utest.Assert;
+import sys.io.File;
+import sys.FileSystem;
+
+class TestFile extends utest.Test {
+
+	public function testCopyOverwrite() {
+		var fileA = "temp/a.txt";
+		var fileB = "temp/b.txt";
+		File.saveContent(fileA, "a");
+		File.saveContent(fileB, "b");
+
+		Assert.equals("b", File.getContent(fileB));
+		File.copy(fileA, fileB);
+		Assert.equals("a", File.getContent(fileB));
+
+		// cleanup
+		FileSystem.deleteFile(fileA);
+		FileSystem.deleteFile(fileB);
+	}
+
+	public function testCopyNonExistentSource() {
+		try {
+			File.copy('non-existent-src', 'non-existent-dst');
+		} catch(e:Dynamic) {
+			//see https://github.com/HaxeFoundation/haxe/issues/8098
+			Assert.pass();
+			return;
+		}
+		Assert.fail();
+	}
+}
diff --git a/tests/sys/src/io/TestFileInput.hx b/tests/sys/src/io/TestFileInput.hx
index 7370328cfe2ddf33514aedd9ab36de096d870baa..0e3287a6daf2fa582b2c6ef885ab1b9f3600f5f2 100644
--- a/tests/sys/src/io/TestFileInput.hx
+++ b/tests/sys/src/io/TestFileInput.hx
@@ -1,5 +1,6 @@
 package io;
 
+import utest.Assert;
 import haxe.io.Bytes;
 import sys.io.FileInput;
 import sys.FileSystem;
@@ -11,211 +12,226 @@ import sys.io.FileSeek;
  *
  * @author        Maximilian Ruta <mr@xtain.net>
  */
-class TestFileInput extends haxe.unit.TestCase {
+class TestFileInput extends utest.Test {
+	static var contentString = "test\n1234сюрприз!"; //that's total of 24 bytes
+	static var contentBytes = [116, 101, 115, 116, 10, 49, 50, 51, 52, 209, 129, 209, 142, 209, 128, 208, 191, 209, 128, 208, 184, 208, 183, 33];
 
 	private var path = 'temp/testcase-test-file.txt';
 
-	override public function setup() {
-		File.saveContent(path, "test\n1234");
+	public function setup() {
+		File.saveContent(path, contentString);
 	}
 
-	override public function tearDown() {
+	public function teardown() {
 		FileSystem.deleteFile(path);
 	}
 
 	public function testRead() {
 		var file : FileInput = File.read(path);
-		assertEquals(0, file.tell());
-		assertEquals(116, file.readByte());
-		assertEquals(1, file.tell());
-		assertEquals(101, file.readByte());
-		assertEquals(2, file.tell());
-		assertEquals(115, file.readByte());
-		assertEquals(3, file.tell());
-		assertEquals(116, file.readByte());
-		assertEquals(4, file.tell());
+		for(i in 0...contentBytes.length) {
+			Assert.equals(i, file.tell());
+			Assert.equals(contentBytes[i], file.readByte());
+		}
 		file.close();
 	}
 
 	public function testReadBytes() {
 		var file : FileInput = File.read(path);
-		var bytes : Bytes = Bytes.alloc (9);
-		var count = file.readBytes(bytes, 0, 9);
-		assertEquals(9, count);
-		assertEquals(116, bytes.get(0));
+		var bytes : Bytes = Bytes.alloc (contentBytes.length);
+		var count = file.readBytes(bytes, 0, contentBytes.length);
+		Assert.equals(contentBytes.length, count);
+		for(i in 0...contentBytes.length) {
+			Assert.equals(contentBytes[i], bytes.get(i));
+		}
 		file.close();
 	}
 
 	public function testSeekBeginCur() {
 		var file : FileInput = File.read(path);
-		assertEquals(116, file.readByte());
-		assertEquals(101, file.readByte());
-		assertEquals(115, file.readByte());
-		assertEquals(116, file.readByte());
+		for(i in 0...Std.int(contentBytes.length / 2)) {
+			Assert.equals(contentBytes[i], file.readByte());
+		}
 
 		file.seek(-4, FileSeek.SeekCur);
-		assertEquals(0, file.tell());
-		assertEquals(116, file.readByte());
-		assertEquals(1, file.tell());
+		var pos = Std.int(contentBytes.length / 2) - 4;
+		Assert.equals(pos, file.tell());
+		Assert.equals(contentBytes[pos], file.readByte());
+		Assert.equals(pos + 1, file.tell());
 		file.close();
 	}
 
 	public function testSeekBeginEnd() {
 		var file : FileInput = File.read(path);
-		assertEquals(116, file.readByte());
-		assertEquals(101, file.readByte());
-		assertEquals(115, file.readByte());
-		assertEquals(116, file.readByte());
-
-		file.seek(-9, FileSeek.SeekEnd);
-		assertEquals(0, file.tell());
-		assertEquals(116, file.readByte());
-		assertEquals(1, file.tell());
+		for(i in 0...Std.int(contentBytes.length / 2)) {
+			Assert.equals(contentBytes[i], file.readByte());
+		}
+
+		file.seek(-contentBytes.length, FileSeek.SeekEnd);
+		Assert.equals(0, file.tell());
+		Assert.equals(contentBytes[0], file.readByte());
+		Assert.equals(1, file.tell());
 		file.close();
 	}
 
 	public function testSeekBegin() {
 		var file : FileInput = File.read(path);
-		assertEquals(116, file.readByte());
-		assertEquals(101, file.readByte());
-		assertEquals(115, file.readByte());
-		assertEquals(116, file.readByte());
+		for(i in 0...Std.int(contentBytes.length / 2)) {
+			Assert.equals(contentBytes[i], file.readByte());
+		}
 
 		file.seek(0, FileSeek.SeekBegin);
-		assertEquals(0, file.tell());
-		assertEquals(116, file.readByte());
-		assertEquals(1, file.tell());
+		Assert.equals(0, file.tell());
+		Assert.equals(contentBytes[0], file.readByte());
+		Assert.equals(1, file.tell());
 		file.close();
 	}
 
 	public function testSeekPosBegin() {
 		var file : FileInput = File.read(path);
-		assertEquals(116, file.readByte());
-		assertEquals(101, file.readByte());
-		assertEquals(115, file.readByte());
-		assertEquals(116, file.readByte());
+		for(i in 0...Std.int(contentBytes.length / 2)) {
+			Assert.equals(contentBytes[i], file.readByte());
+		}
 
 		file.seek(1, FileSeek.SeekBegin);
-		assertEquals(1, file.tell());
-		assertEquals(101, file.readByte());
-		assertEquals(2, file.tell());
+		Assert.equals(1, file.tell());
+		Assert.equals(contentBytes[1], file.readByte());
+		Assert.equals(2, file.tell());
 		file.close();
 	}
 
 	public function testSeekPosBeginMulti() {
 		var file : FileInput = File.read(path);
-		assertEquals(116, file.readByte());
-		assertEquals(101, file.readByte());
-		assertEquals(115, file.readByte());
-		assertEquals(116, file.readByte());
+		for(i in 0...Std.int(contentBytes.length / 2)) {
+			Assert.equals(contentBytes[i], file.readByte());
+		}
 
 		file.seek(1, FileSeek.SeekBegin);
-		assertEquals(1, file.tell());
-		assertEquals(101, file.readByte());
-		assertEquals(2, file.tell());
+		Assert.equals(1, file.tell());
+		Assert.equals(contentBytes[1], file.readByte());
+		Assert.equals(2, file.tell());
 		file.seek(3, FileSeek.SeekBegin);
-		assertEquals(3, file.tell());
-		assertEquals(116, file.readByte());
-		assertEquals(4, file.tell());
+		Assert.equals(3, file.tell());
+		Assert.equals(contentBytes[3], file.readByte());
+		Assert.equals(4, file.tell());
 		file.close();
 	}
 
 	public function testSeekEnd() {
 		var file : FileInput = File.read(path);
-		assertEquals(116, file.readByte());
-		assertEquals(101, file.readByte());
-		assertEquals(115, file.readByte());
-		assertEquals(116, file.readByte());
+		for(i in 0...Std.int(contentBytes.length / 2)) {
+			Assert.equals(contentBytes[i], file.readByte());
+		}
 
 		file.seek(-1, FileSeek.SeekEnd);
-		assertEquals(8, file.tell());
-		assertEquals(52, file.readByte());
-		assertEquals(9, file.tell());
+		var pos = contentBytes.length - 1;
+		Assert.equals(pos, file.tell());
+		Assert.equals(contentBytes[pos], file.readByte());
+		Assert.equals(pos + 1, file.tell());
 		file.close();
 	}
 
 	public function testSeekEofLast() {
 		var file : FileInput = File.read(path);
-		assertEquals(116, file.readByte());
-		assertEquals(101, file.readByte());
-		assertEquals(115, file.readByte());
-		assertEquals(116, file.readByte());
+		for(i in 0...Std.int(contentBytes.length / 2)) {
+			Assert.equals(contentBytes[i], file.readByte());
+		}
 
 		file.seek(0, FileSeek.SeekEnd);
-		assertEquals(9, file.tell());
-		assertFalse(file.eof());
+		Assert.equals(contentBytes.length, file.tell());
+		Assert.isFalse(file.eof());
 		try {
 			file.readByte();
-			assertTrue(false);
+			Assert.isTrue(false);
 		} catch(e : haxe.io.Eof) {
-			assertTrue(true);
+			Assert.isTrue(true);
 		}
-		assertTrue(file.eof());
+		Assert.isTrue(file.eof());
 		file.close();
 	}
 
 	public function testSeekEof() {
 		var file : FileInput = File.read(path);
-		assertEquals(116, file.readByte());
-		assertEquals(101, file.readByte());
-		assertEquals(115, file.readByte());
-		assertEquals(116, file.readByte());
+		for(i in 0...Std.int(contentBytes.length / 2)) {
+			Assert.equals(contentBytes[i], file.readByte());
+		}
 
 		file.seek(0, FileSeek.SeekEnd);
-		assertEquals(9, file.tell());
-		assertFalse(file.eof());
+		Assert.equals(contentBytes.length, file.tell());
+		Assert.isFalse(file.eof());
 		try {
 			file.readByte();
-			assertTrue(false);
+			Assert.isTrue(false);
 		} catch(e : haxe.io.Eof) {
-			assertTrue(true);
+			Assert.isTrue(true);
 		}
-		assertTrue(file.eof());
-		assertEquals(9, file.tell());
+		Assert.isTrue(file.eof());
+		Assert.equals(contentBytes.length, file.tell());
 		file.seek(-1, FileSeek.SeekCur);
-		assertEquals(8, file.tell());
-		assertEquals(52, file.readByte());
-		assertEquals(9, file.tell());
-		assertFalse(file.eof());
+		var pos = contentBytes.length - 1;
+		Assert.equals(pos, file.tell());
+		Assert.equals(contentBytes[pos], file.readByte());
+		Assert.equals(pos + 1, file.tell());
+		Assert.isFalse(file.eof());
 		try {
 			file.readByte();
-			assertTrue(false);
+			Assert.isTrue(false);
 		} catch(e : haxe.io.Eof) {
-			assertTrue(true);
+			Assert.isTrue(true);
 		}
-		assertTrue(file.eof());
-		assertEquals(9, file.tell());
+		Assert.isTrue(file.eof());
+		Assert.equals(pos + 1, file.tell());
 		try {
 			file.readByte();
-			assertTrue(false);
+			Assert.isTrue(false);
 		} catch(e : haxe.io.Eof) {
-			assertTrue(true);
+			Assert.isTrue(true);
 		}
 
 		file.seek(5, FileSeek.SeekEnd);
-		assertFalse(file.eof());
+		Assert.isFalse(file.eof());
 		try {
 			file.readByte();
-			assertTrue(false);
+			Assert.isTrue(false);
 		} catch(e : haxe.io.Eof) {
-			assertTrue(true);
+			Assert.isTrue(true);
 		}
-		assertTrue(file.eof());
+		Assert.isTrue(file.eof());
 		file.seek(1, FileSeek.SeekEnd);
-		assertFalse(file.eof());
+		Assert.isFalse(file.eof());
 		try {
 			file.readByte();
-			assertTrue(false);
+			Assert.isTrue(false);
 		} catch(e : haxe.io.Eof) {
-			assertTrue(true);
+			Assert.isTrue(true);
 		}
-		assertTrue(file.eof());
+		Assert.isTrue(file.eof());
 		try {
 			file.readByte();
-			assertTrue(false);
+			Assert.isTrue(false);
 		} catch(e : haxe.io.Eof) {
-			assertTrue(true);
+			Assert.isTrue(true);
+		}
+		file.close();
+	}
+
+	function testIssue7544() {
+		var file = sys.io.File.read(path, true);
+		var buf = haxe.io.Bytes.alloc(contentBytes.length);
+
+		function next() {
+			try {
+				var read = file.readBytes(buf, 0, contentBytes.length);
+				return Std.string(read);
+			} catch(e:haxe.io.Eof) {
+				return Std.string('eof');
+			} catch(e:Dynamic) {
+				return Std.string(e);
+			}
 		}
+
+		Assert.equals('24', next());
+		next(); // TODO: at this line, some target produce '0', some produce 'eof', do we need to unify?
+		Assert.equals('eof', next());
 		file.close();
 	}
 }
diff --git a/tests/sys/src/net/TestSocket.hx b/tests/sys/src/net/TestSocket.hx
new file mode 100644
index 0000000000000000000000000000000000000000..edeba6cc9e842eee2bc1048f7a3f36bc58c02332
--- /dev/null
+++ b/tests/sys/src/net/TestSocket.hx
@@ -0,0 +1,27 @@
+package net;
+
+import sys.net.*;
+import utest.Assert;
+
+class TestSocket extends utest.Test {
+	var registeredSockets:Array<Socket> = [];
+
+	public function register<T:Socket>(socket:T):T {
+		registeredSockets.push(socket);
+		return socket;
+	}
+
+	public function teardown() {
+		for(socket in registeredSockets) {
+			if(socket == null) continue;
+			socket.close();
+		}
+		registeredSockets = [];
+	}
+
+	public function testBind() {
+		var socket = register(new Socket());
+		socket.bind(new Host('localhost'), 34567);
+		Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/threads/build.hxml b/tests/threads/build.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..b5b07169a10e3f567674ea9fb7cca8d24d43dc52
--- /dev/null
+++ b/tests/threads/build.hxml
@@ -0,0 +1,4 @@
+-cp src
+-D analyzer-optimize
+-main Main
+-lib utest
\ No newline at end of file
diff --git a/tests/threads/res/tree1.txt b/tests/threads/res/tree1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..84d0f3c2c7a068fe889947115425e2832c6d3b77
--- /dev/null
+++ b/tests/threads/res/tree1.txt
@@ -0,0 +1,29 @@
+  (2)
+  (3)
+    (4)
+    (5)
+      (6)
+    (7)
+      (8)
+    (9)
+    (10)
+      (11)
+  (12)
+    (13)
+  (14)
+    (15)
+  (16)
+    (17)
+      (18)
+      (19)
+  (20)
+    (21)
+      (22)
+        (23)
+          (24)
+          (25)
+    (26)
+    (27)
+      (28)
+        (29)
+  (30)
\ No newline at end of file
diff --git a/tests/threads/src/Main.hx b/tests/threads/src/Main.hx
new file mode 100644
index 0000000000000000000000000000000000000000..30b43ad5961192c27bc2ce61052ebbf5dd583984
--- /dev/null
+++ b/tests/threads/src/Main.hx
@@ -0,0 +1,13 @@
+import utest.Runner;
+import utest.ui.Report;
+
+class Main {
+	static function main() {
+		var runner = new Runner();
+		runner.addCases("cases");
+		var report = Report.create(runner);
+		report.displayHeader = AlwaysShowHeader;
+		report.displaySuccessResults = NeverShowSuccessResults;
+		runner.run();
+	}
+}
diff --git a/tests/threads/src/cases/DequeBrackets.hx b/tests/threads/src/cases/DequeBrackets.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3ad2f3d1c5bf7f0b485bcbd2fb34224a4b34f376
--- /dev/null
+++ b/tests/threads/src/cases/DequeBrackets.hx
@@ -0,0 +1,85 @@
+package cases;
+
+import utest.Assert;
+import haxe.ds.GenericStack;
+import utest.ITest;
+
+class DequeBrackets implements ITest {
+	public function new() {}
+
+	/**
+		Spawns a thread to insert bracket pairs into a Deque. The opening
+		one is placed in front, the closing one in the back. This is going
+		to result in something like `([{<>}])` which we check for at the end.
+	**/
+	@:timeout(2000)
+	public function test(async:utest.Async) {
+		Thread.create(() -> {
+			Sys.println("Running DequeBrackets");
+			var deque = new Deque();
+			var dequeMutex = new Mutex();
+			function add(open:String, close:String) {
+				dequeMutex.acquire();
+				deque.push(open);
+				deque.add(close);
+				dequeMutex.release();
+			}
+
+			var pairs = [
+				{open: "(", close: ")"},
+				{open: "[", close: "]"},
+				{open: "{", close: "}"},
+				{open: "<", close: ">"}
+			];
+			var iterationsPerThread = 100;
+
+			var lock = new Lock();
+			var self = Thread.current();
+			Thread.create(() -> {
+				for (_ in 0...pairs.length) {
+					Assert.isTrue(lock.wait());
+				}
+				self.sendMessage("done");
+			});
+			var threads = [];
+			for (pair in pairs) {
+				threads.push(Thread.create(() -> {
+					Thread.readMessage(true);
+					for (_ in 0...iterationsPerThread) {
+						add(pair.open, pair.close);
+						Sys.sleep(0.0001); // sleep a bit to increase chaos
+					}
+					lock.release();
+				}));
+			}
+			for (thread in threads) {
+				thread.sendMessage("go");
+			}
+			switch (Thread.readMessage(true)) {
+				case "done":
+				case s:
+					Assert.fail("Unexpected message: " + s);
+			}
+			var stack = new GenericStack<String>();
+			function pop() {
+				return deque.pop(false);
+			}
+			for (_ in 0...pairs.length * iterationsPerThread) {
+				stack.add(pop());
+			}
+			for (elt in stack) {
+				var expected = switch (elt) {
+					case "(": ")";
+					case "<": ">";
+					case "{": "}";
+					case "[": "]";
+					case s:
+						Assert.fail("Unexpected " + s);
+						s;
+				}
+				Assert.equals(expected, pop());
+			}
+			async.done();
+		});
+	}
+}
diff --git a/tests/threads/src/cases/Issue3767.hx b/tests/threads/src/cases/Issue3767.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2dd5d7d08f76f8f8a0b57f5b4d9e2854c99d5d75
--- /dev/null
+++ b/tests/threads/src/cases/Issue3767.hx
@@ -0,0 +1,51 @@
+package cases;
+
+import utest.Assert;
+import utest.ITest;
+
+class Issue3767 implements ITest {
+	public function new() { }
+
+	#if java
+
+	@:timeout(5000)
+	function testBasicLock(async:utest.Async) {
+		Thread.create(() -> {
+			var lock = new Lock();
+			//it starts locked
+			Assert.isFalse(lock.wait(0.001));
+			lock.release();
+			Assert.isTrue(lock.wait(.001));
+			Assert.isFalse(lock.wait(.001));
+			Assert.isFalse(lock.wait(.001));
+
+			lock.release();
+			Assert.isTrue(lock.wait());
+			lock.release();
+			lock.release();
+			lock.release();
+			Assert.isTrue(lock.wait());
+			Assert.isTrue(lock.wait(.001));
+			Assert.isTrue(lock.wait());
+			Assert.isFalse(lock.wait(.001));
+
+			var cur = Sys.time();
+			Thread.create(function()
+			{
+				Sys.sleep(.01);
+				lock.release();
+			});
+			Assert.isTrue(lock.wait(2.0));
+			Assert.isTrue( (Sys.time() - cur) < 2 );
+			Thread.create(function()
+			{
+				Sys.sleep(.01);
+				lock.release();
+			});
+			Assert.isTrue(lock.wait());
+			async.done();
+		});
+	}
+
+	#end
+}
\ No newline at end of file
diff --git a/tests/threads/src/cases/Issue4878.hx b/tests/threads/src/cases/Issue4878.hx
new file mode 100644
index 0000000000000000000000000000000000000000..678d2cacce22e00a17a9f6bbdd80c86d02faaff0
--- /dev/null
+++ b/tests/threads/src/cases/Issue4878.hx
@@ -0,0 +1,32 @@
+package cases;
+
+import utest.Async;
+import utest.Assert;
+import utest.ITest;
+
+class Issue4878 implements ITest {
+	public function new() { }
+
+	#if java
+
+	@:timeout(5000)
+	function test(async:Async) {
+		Thread.create(() -> {
+			var mutex = new Mutex();
+			Thread.create(function() {
+				mutex.acquire();
+				mutex.acquire();
+				mutex.release();
+				Sys.sleep(.2);
+				mutex.release();
+			});
+			Sys.sleep(0.05);
+			Assert.isFalse(mutex.tryAcquire());
+			Sys.sleep(.3);
+			Assert.isTrue(mutex.tryAcquire());
+			async.done();
+		});
+	}
+
+	#end
+}
\ No newline at end of file
diff --git a/tests/threads/src/cases/Issue8063.hx b/tests/threads/src/cases/Issue8063.hx
new file mode 100644
index 0000000000000000000000000000000000000000..974d951d0191ea8ab4be6ddbd950f237a0c86b5f
--- /dev/null
+++ b/tests/threads/src/cases/Issue8063.hx
@@ -0,0 +1,19 @@
+package cases;
+
+import utest.Async;
+import utest.Assert;
+import utest.ITest;
+
+class Issue8063 implements ITest {
+	public function new() { }
+
+	@:timeout(5000)
+	function test(async:Async) {
+		Sys.println("Running Issue8063");
+		Assert.isTrue(Thread.current() == Thread.current());
+		Thread.create(() -> {
+			Assert.isTrue(Thread.current() == Thread.current());
+			async.done();
+		});
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestThreads.hx b/tests/threads/src/cases/TestThreads.hx
similarity index 89%
rename from tests/unit/src/unit/TestThreads.hx
rename to tests/threads/src/cases/TestThreads.hx
index 1376a2dd3a94682ddddaa87d674bd55ea4b62eb9..66e3741e052940f7c08f1af2fdf04dbb7dceecfb 100644
--- a/tests/unit/src/unit/TestThreads.hx
+++ b/tests/threads/src/cases/TestThreads.hx
@@ -1,29 +1,23 @@
-package unit;
-#if neko
-import neko.vm.Thread;
-import neko.vm.Deque;
-import neko.vm.Lock;
-import neko.vm.Tls;
-import neko.vm.Mutex;
-#elseif cpp
-import cpp.vm.Thread;
-import cpp.vm.Deque;
-import cpp.vm.Lock;
-import cpp.vm.Tls;
-import cpp.vm.Mutex;
-#elseif java
-import java.vm.Thread;
-import java.vm.Deque;
-import java.vm.Lock;
-import java.vm.Tls;
-import java.vm.Mutex;
-#end
+package cases;
+
+import utest.Async;
+import utest.Assert;
 
-class TestThreads extends Test
+class TestThreads implements utest.ITest
 {
+	public function new() { }
+
+	@:timeout(40000)
+	function testSort(async:Async) {
+		Thread.create(() -> {
+			doTestSort();
+			async.done();
+		});
+	}
 
-	private function testSort()
+	private function doTestSort()
 	{
+		Sys.println("Running TestThreads");
 		var ts = new ThreadSort();
 #if java
 		ts.maxVal *= 10;
@@ -46,11 +40,11 @@ class TestThreads extends Test
 									try
 									{
 										ts.run();
-										t(true);
+										Assert.pass("ok");
 									}
 									catch(e:Dynamic)
 									{
-										Test.report('Error $e for parameters: $creatorWait, $creatorLoad, $consumerWait, $useTls, $q, $lock1, $lock2');
+										Assert.fail('Error $e for para\\meters: $creatorWait, $creatorLoad, $consumerWait, $useTls, $q, $lock1, $lock2');
 									}
 								}
 	}
@@ -129,6 +123,9 @@ class ThreadSort
 						finishedMutex.release();
 						break;
 					}
+					#if eval
+					Thread.yield(); // no system threads, we need this or the scheduler has issues
+					#end
 					if (++i % Std.int(maxVal / 10) == 0 && consumerLoad)
 						Sys.sleep(.01);
 				}
@@ -233,9 +230,9 @@ private class LockSemaphore implements SemaphoreStrategy
 
 	public function block()
 	{
-		for(i in 0...c)
+		for(_ in 0...c)
 		{
-			l.wait();
+			Assert.isTrue(l.wait(1.));
 		}
 		this.c = 0;
 	}
diff --git a/tests/threads/src/cases/WeirdTreeSum.hx b/tests/threads/src/cases/WeirdTreeSum.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e437a06cfc704016387ba854c8e3ac0554e9fd3d
--- /dev/null
+++ b/tests/threads/src/cases/WeirdTreeSum.hx
@@ -0,0 +1,180 @@
+package cases;
+
+import sys.io.File;
+import utest.Assert;
+
+using StringTools;
+class Ref<T> {
+	public var value:T;
+
+	public function new(value:T) {
+		this.value = value;
+	}
+
+	public function toString() {
+		return Std.string(value);
+	}
+}
+
+@:using(cases.WeirdTreeSum.TreeTools)
+
+enum Tree<T> {
+	Node(value:Ref<T>, children:Array<Tree<T>>);
+	Leaf(value:Ref<T>);
+}
+
+class TreeTools {
+	static public function toString<T>(tree:Tree<T>) {
+		var buf = new StringBuf();
+		function loop(tabs:String, tree:Tree<T>) {
+			switch (tree) {
+				case Leaf(value):
+					buf.add('$tabs($value)\n');
+				case Node(value, children):
+					buf.add('$tabs($value)\n');
+					for (child in children) {
+						loop(tabs + "  ", child);
+					}
+			}
+		}
+		loop("", tree);
+		return buf.toString();
+	}
+
+	static public function copy<T>(tree:Tree<T>) {
+		return switch (tree) {
+			case Leaf(ref): Leaf(new Ref(ref.value));
+			case Node(ref, children): Node(new Ref(ref.value), children.map(copy));
+		}
+	}
+}
+
+typedef TreeNode<T> = {
+	var indent:Int;
+	var children:Array<Tree<T>>;
+}
+
+class WeirdTreeSum implements utest.ITest {
+	public function new() {}
+
+	@:timeout(2000)
+	public function test(async:utest.Async) {
+		Thread.create(() -> {
+			Sys.println("Running WeirdTreeSum");
+			var fileContent = File.getContent("res/tree1.txt");
+			var buf = new StringBuf();
+			buf.add("(1)\n");
+			for (i in 0...10) {
+				buf.add(fileContent + "\n");
+			}
+			var tree = parseTree(buf.toString().trim())[0];
+			compare(tree);
+			async.done();
+		});
+	}
+
+	static function compare(tree:Tree<Int>) {
+		var treeSingle = tree.copy();
+		var treeMulti = tree.copy();
+		traverseSingleThreaded(treeSingle);
+		traverseMultiThreaded(treeMulti);
+		Assert.equals(treeSingle.toString(), treeMulti.toString());
+	}
+
+	static function parseTree(s:String) {
+		var split = s.split("\n");
+		var children = [];
+		var nullNode:Dynamic = null;
+		var node = {elt: {children: children, indent: -1}, next: nullNode};
+		for (offset in 0...split.length) {
+			var line = split[offset];
+			var lineIndent = line.indexOf("(");
+			var value = line.substr(lineIndent + 1, line.indexOf(")") - lineIndent - 1);
+			var ref = new Ref(Std.parseInt(value));
+			while (lineIndent <= node.elt.indent) {
+				node = node.next;
+			}
+			if (offset == split.length - 1) {
+				node.elt.children.push(Leaf(ref));
+			} else if (lineIndent >= split[offset + 1].indexOf("(")) {
+				node.elt.children.push(Leaf(ref));
+			} else {
+				var children = [];
+				node.elt.children.push(Node(ref, children));
+				node = {elt: {children: children, indent: lineIndent}, next: node};
+			}
+		}
+		return children;
+	}
+
+	static function traverseSingleThreaded(tree:Tree<Int>) {
+		return switch (tree) {
+			case Leaf(value): value.value;
+			case Node(value, children):
+				for (child in children) {
+					value.value += traverseSingleThreaded(child);
+				}
+				value.value;
+		}
+	}
+
+	/**
+		For each node, we spawn N threads where N is the number of children
+		that node has. Each thread waits for a "go" message from its parent
+		thread, and then calculates the node value recursively.
+
+		Once done, it sends a "done" message to the waiter thread, which
+		counts how many results we're still expecting. Once that number reaches
+		0, it sends "done!" to the parent thread which may then return.
+
+		This isn't meant to be fast or elegant, but tests message passing between
+		a couple thousand threads.
+	**/
+	static function traverseMultiThreaded(tree:Tree<Int>) {
+		return switch (tree) {
+			case Leaf(value): value.value;
+			case Node(value, children):
+				var self = Thread.current();
+				var todo = children.length;
+				var valueMutex = new Mutex();
+				var todoMutex = new Mutex();
+				var waiterThread = Thread.create(() -> {
+					while (true) {
+						switch (Thread.readMessage(true)) {
+							case "done":
+								todoMutex.acquire();
+								todo--;
+								todoMutex.release();
+								if (todo == 0) {
+									break;
+								}
+							case _:
+								throw "Something went wrong";
+						}
+					}
+					self.sendMessage("done!");
+				});
+				var childrenThreads = [];
+				for (child in children) {
+					var childThread = Thread.create(() -> {
+						switch (Thread.readMessage(true)) {
+							case "go":
+							case _: throw "Something went wrong";
+						}
+						valueMutex.acquire();
+						value.value += traverseMultiThreaded(child);
+						valueMutex.release();
+						waiterThread.sendMessage("done");
+					});
+					childrenThreads.push(childThread);
+				}
+				for (childThread in childrenThreads) {
+					childThread.sendMessage("go");
+				}
+				switch (Thread.readMessage(true)) {
+					case "done!": value.value;
+					case _: throw "Something went wrong";
+				}
+		}
+	}
+}
diff --git a/tests/threads/src/import.hx b/tests/threads/src/import.hx
new file mode 100644
index 0000000000000000000000000000000000000000..63c837ec71f04a6cef3722ede7a12d291e9019b3
--- /dev/null
+++ b/tests/threads/src/import.hx
@@ -0,0 +1,5 @@
+import sys.thread.Thread;
+import sys.thread.Deque;
+import sys.thread.Lock;
+import sys.thread.Tls;
+import sys.thread.Mutex;
\ No newline at end of file
diff --git a/tests/unit/.vscode/tasks.json b/tests/unit/.vscode/tasks.json
new file mode 100644
index 0000000000000000000000000000000000000000..ca88fa8fb0b47780ef1cd0c836f7e6aefd9e480d
--- /dev/null
+++ b/tests/unit/.vscode/tasks.json
@@ -0,0 +1,13 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "haxe",
+			"args": "active configuration",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}
diff --git a/tests/unit/compile-as3.hxml b/tests/unit/compile-as3.hxml
index a74f0c6b65ca666e8a8974f5fab2f0d595b588db..0c2337a23ce336bf1daba7c4eb05cfc58100fc42 100644
--- a/tests/unit/compile-as3.hxml
+++ b/tests/unit/compile-as3.hxml
@@ -1,4 +1,9 @@
+-cmd compc -output native_swf/lib.swc -include-sources native_swf/
+
+--next
+
 compile-each.hxml
--main unit.TestMain
+--main unit.TestMain
 -as3 bin/as3
--cmd mxmlc -static-link-runtime-shared-libraries=true -debug bin/as3/__main__.as --output bin/unit9_as3.swf
\ No newline at end of file
+-swf-lib native_swf/lib.swc
+-cmd mxmlc -include-libraries=native_swf/lib.swc -static-link-runtime-shared-libraries=true -debug bin/as3/__main__.as --output bin/unit9_as3.swf
diff --git a/tests/unit/compile-cpp.hxml b/tests/unit/compile-cpp.hxml
index fe9a4a1bb1b3786290c48c0df3265c394da442f4..da094ddce6fbe74bf02d8fd83a3bf8f8b85a45d1 100644
--- a/tests/unit/compile-cpp.hxml
+++ b/tests/unit/compile-cpp.hxml
@@ -1,5 +1,4 @@
 compile-each.hxml
--main unit.TestMain
+--main unit.TestMain
 -cpp bin/cpp
 -D HXCPP_NO_DEBUG_LINK
--lib record-macros
diff --git a/tests/unit/compile-cppia-host.hxml b/tests/unit/compile-cppia-host.hxml
index 82e7494c0acd56ae4e5291914c756f08886da421..0958016693a66c8a5fa2e1ee96b70cd80c2003df 100644
--- a/tests/unit/compile-cppia-host.hxml
+++ b/tests/unit/compile-cppia-host.hxml
@@ -1,8 +1,9 @@
--main cpp.cppia.Host
+--main cpp.cppia.Host
+-D source-header=''
 -D scriptable
 -D dll_export=bin/cppia.classes
--debug
--dce no
+--debug
+--dce no
 -cpp bin/cppia
--cp src
+-p src
 --macro include("scripthost")
diff --git a/tests/unit/compile-cppia.hxml b/tests/unit/compile-cppia.hxml
index 21108aaa398e8fd077501332f92de1344c20d7a7..2d5c327a80b95bb1b32b8f301f4507d20ce71c6b 100644
--- a/tests/unit/compile-cppia.hxml
+++ b/tests/unit/compile-cppia.hxml
@@ -1,4 +1,3 @@
 compile-each.hxml
--main unit.TestMain
+--main unit.TestMain
 -cppia bin/unit.cppia
--lib record-macros
diff --git a/tests/unit/compile-cs-travis.hxml b/tests/unit/compile-cs-travis.hxml
index 02646f14bb9570f7160124a8b817cd9aa1b92ae6..39668c1801aa934251e65da363783e9da5739e65 100644
--- a/tests/unit/compile-cs-travis.hxml
+++ b/tests/unit/compile-cs-travis.hxml
@@ -1,8 +1,7 @@
 compile-cs.hxml
 
--net-lib cs_drivers/System.Data.dll
--net-lib cs_drivers/System.Xml.dll@std
--net-lib cs_drivers/Mono.Data.Sqlite.dll
+--net-lib cs_drivers/System.Data.dll
+--net-lib cs_drivers/System.Xml.dll@std
+--net-lib cs_drivers/Mono.Data.Sqlite.dll
 
--D travis
--lib record-macros
+-D travis
\ No newline at end of file
diff --git a/tests/unit/compile-cs-unsafe-travis.hxml b/tests/unit/compile-cs-unsafe-travis.hxml
index 8667cd18b46c0ec5652836092f442a7411bc0ccc..1a60e244344b1dd260605e8ee416e9eae6f3722b 100644
--- a/tests/unit/compile-cs-unsafe-travis.hxml
+++ b/tests/unit/compile-cs-unsafe-travis.hxml
@@ -1,7 +1,7 @@
 compile-cs-unsafe.hxml
 
--net-lib cs_drivers/System.Data.dll
--net-lib cs_drivers/System.Xml.dll@std
--net-lib cs_drivers/Mono.Data.Sqlite.dll
+--net-lib cs_drivers/System.Data.dll
+--net-lib cs_drivers/System.Xml.dll@std
+--net-lib cs_drivers/Mono.Data.Sqlite.dll
 
 -D travis
diff --git a/tests/unit/compile-cs-unsafe.hxml b/tests/unit/compile-cs-unsafe.hxml
index 5f800332a24520bf53d2c159ffbf3f35139ba7f2..22c378fb1af7055a0a1d32682f2aad45d5a246e2 100644
--- a/tests/unit/compile-cs-unsafe.hxml
+++ b/tests/unit/compile-cs-unsafe.hxml
@@ -4,7 +4,7 @@
 --next
 
 compile-each.hxml
--main unit.TestMain
+--main unit.TestMain
 -D unsafe
 -cs bin/cs_unsafe
--net-lib native_cs/bin/native_cs.dll
+--net-lib native_cs/bin/native_cs.dll
diff --git a/tests/unit/compile-cs.hxml b/tests/unit/compile-cs.hxml
index a015b5ef141d23d5d9af834fd82778b34c86900c..041caa389d0896e8bb1ae6c0a11c58a9719b0565 100644
--- a/tests/unit/compile-cs.hxml
+++ b/tests/unit/compile-cs.hxml
@@ -4,6 +4,6 @@
 --next
 
 compile-each.hxml
--main unit.TestMain
+--main unit.TestMain
 -cs bin/cs
--net-lib native_cs/bin/native_cs.dll
+--net-lib native_cs/bin/native_cs.dll
diff --git a/tests/unit/compile-each.hxml b/tests/unit/compile-each.hxml
index bb5c10af57d6386ec2b16db8cf404a472b7db823..451385a6af29b921741e506b4661f21bf79f7f71 100644
--- a/tests/unit/compile-each.hxml
+++ b/tests/unit/compile-each.hxml
@@ -1,9 +1,12 @@
--D macro-times
--debug
--cp src
--cp "C:\Program Files\The Haxe Effect\src/dev/null"
--resource res1.txt@re/s?!%[]))("'1.txt
--resource res2.bin@re/s?!%[]))("'1.bin
--dce full
+-D source-header=''
+--debug
+-p src
+# -cp "C:\Program Files\The Haxe Effect\src/dev/null"
+--resource res1.txt@re/s?!%[]))("'1.txt
+--resource res2.bin@re/s?!%[]))("'1.bin
+--resource serializedValues.txt
+--macro Macro.init()
+--dce full
+-lib utest
 -D analyzer-optimize
--D analyzer-user-var-fusion
\ No newline at end of file
+-D analyzer-user-var-fusion
diff --git a/tests/unit/compile-exe-runner.hxml b/tests/unit/compile-exe-runner.hxml
index 4859b8f787e6aed7d1ee18fc5d4956c56d81dbfa..e5407faec723fa6828c7a0698f8c56913b2408d0 100644
--- a/tests/unit/compile-exe-runner.hxml
+++ b/tests/unit/compile-exe-runner.hxml
@@ -1,3 +1,3 @@
--cp src
--main RunExe
+-p src
+--main RunExe
 -neko bin/runexe.n
\ No newline at end of file
diff --git a/tests/unit/compile-flash9.hxml b/tests/unit/compile-flash9.hxml
index 611299ad0e3b8b2618b22e4f133a5f55ff6fc7a7..5176f0420ba246add31ecf82117ac191fc96d932 100644
--- a/tests/unit/compile-flash9.hxml
+++ b/tests/unit/compile-flash9.hxml
@@ -1,4 +1,10 @@
+-cmd compc -output native_swf/lib.swc -include-sources native_swf/
+
+--next
+
 compile-each.hxml
--main unit.TestMain
--swf-version 11
--swf bin/unit9.swf
\ No newline at end of file
+--main unit.TestMain
+--swf-version 11
+-swf bin/unit9.swf
+-swf-lib native_swf/lib.swc
+-D network-sandbox
\ No newline at end of file
diff --git a/tests/unit/compile-hl.hxml b/tests/unit/compile-hl.hxml
index 89cbcf8da3acc6d48bc8158e03cfc542074efb5c..a1fff608b5e62ddda0b56195ae701a6ce8426689 100644
--- a/tests/unit/compile-hl.hxml
+++ b/tests/unit/compile-hl.hxml
@@ -1,5 +1,6 @@
 compile-each.hxml
--main unit.TestMain
+--main unit.TestMain
 -hl bin/unit.hl
--D interp
+#-D interp
 -D hl-check
+-D hl-ver=1.11.0
\ No newline at end of file
diff --git a/tests/unit/compile-java-runner.hxml b/tests/unit/compile-java-runner.hxml
index a5eb582a1b17dad36dbf0fd54c5919bfa7eae047..737054da258800131e307df81a4459e2f5603c62 100644
--- a/tests/unit/compile-java-runner.hxml
+++ b/tests/unit/compile-java-runner.hxml
@@ -1,3 +1,3 @@
--cp src
--main RunJava
+-p src
+--main RunJava
 -neko bin/runjava.n
\ No newline at end of file
diff --git a/tests/unit/compile-java.hxml b/tests/unit/compile-java.hxml
index 82e75733f11ea5ec15519f86d65b6f4cf309c6a9..96b73c4a015014472c0ea7b65935a6e908cb7ad6 100644
--- a/tests/unit/compile-java.hxml
+++ b/tests/unit/compile-java.hxml
@@ -4,9 +4,8 @@
 --next
 
 compile-each.hxml
--main unit.TestMain
+--main unit.TestMain
 -java bin/java
--java-lib native_java/native.jar
--java-lib java_drivers/mysql-connector-java-5.1.32-bin.jar
--java-lib java_drivers/sqlite-jdbc-3.7.2.jar
--lib record-macros
+--java-lib native_java/native.jar
+--java-lib java_drivers/mysql-connector-java-5.1.32-bin.jar
+--java-lib java_drivers/sqlite-jdbc-3.7.2.jar
diff --git a/tests/unit/compile-js.hxml b/tests/unit/compile-js.hxml
index 0e298e04dbdf820aca7b4a13c03fdcdc5dddf4f7..52928631da40264e52466aaf83296bbd8df824a5 100644
--- a/tests/unit/compile-js.hxml
+++ b/tests/unit/compile-js.hxml
@@ -1,10 +1,3 @@
--cp src
--main unit.issues.Issue4138
--js bin/Issue4138_Worker.js
--D worker
-
---next
-
 compile-each.hxml
 unit.TestMain
 -js bin/unit.js
\ No newline at end of file
diff --git a/tests/unit/compile-jvm.hxml b/tests/unit/compile-jvm.hxml
new file mode 100644
index 0000000000000000000000000000000000000000..32e31dfbe1fcf39d997e8c0e91b9c4905e11a9b1
--- /dev/null
+++ b/tests/unit/compile-jvm.hxml
@@ -0,0 +1,10 @@
+#java native build
+-cmd "haxelib run hxjava native_java/hxjava_build.txt --out native_java/native"
+
+--next
+
+compile-each.hxml
+--main unit.TestMain
+--java-lib native_java/native.jar
+-java bin/jvm
+-D jvm
\ No newline at end of file
diff --git a/tests/unit/compile-lua.hxml b/tests/unit/compile-lua.hxml
index 9c1ab5c564ad1c730252203f09be0c752dc58cf7..47f764f8d653314651c7c4bed5691311d2d7f145 100644
--- a/tests/unit/compile-lua.hxml
+++ b/tests/unit/compile-lua.hxml
@@ -1,3 +1,3 @@
 compile-each.hxml
--main unit.TestMain
+--main unit.TestMain
 -lua bin/unit.lua
diff --git a/tests/unit/compile-macro.hxml b/tests/unit/compile-macro.hxml
index 7a4374568e0a75c67ecce00a688719fcd0648abf..72213d7e25c8b1b8c376aff5003095c9ca1883fd 100644
--- a/tests/unit/compile-macro.hxml
+++ b/tests/unit/compile-macro.hxml
@@ -1,3 +1,3 @@
 compile-each.hxml
--main unit.TestMain
+--main unit.TestMain
 --interp
\ No newline at end of file
diff --git a/tests/unit/compile-neko.hxml b/tests/unit/compile-neko.hxml
index f569988dc755d361998ce6cccfb2e9a55e8111fa..efda56e76192f8690ba9c4a2226c5890b953954b 100644
--- a/tests/unit/compile-neko.hxml
+++ b/tests/unit/compile-neko.hxml
@@ -1,5 +1,4 @@
 compile-each.hxml
 -D neko_v2
--main unit.TestMain
+--main unit.TestMain
 -neko bin/unit.n
--lib record-macros
diff --git a/tests/unit/compile-php.hxml b/tests/unit/compile-php.hxml
index 0a295c6825a032bb26d9a6db765e81ca6572dac9..84ab6768a246ccdfa0a92fb9917eb0aeeedbcc20 100644
--- a/tests/unit/compile-php.hxml
+++ b/tests/unit/compile-php.hxml
@@ -1,4 +1,3 @@
 compile-each.hxml
--main unit.TestMain
--php bin/php
--lib record-macros
+--main unit.TestMain
+-php bin/php
\ No newline at end of file
diff --git a/tests/unit/compile-php7.hxml b/tests/unit/compile-php7.hxml
deleted file mode 100644
index 72e0be116edfb133436adb318c9d293a4295600a..0000000000000000000000000000000000000000
--- a/tests/unit/compile-php7.hxml
+++ /dev/null
@@ -1,5 +0,0 @@
-compile-each.hxml
--main unit.TestMain
--lib record-macros
--php bin/php7
--D php7
\ No newline at end of file
diff --git a/tests/unit/compile-python.hxml b/tests/unit/compile-python.hxml
index 60e66237b2f2d0774b31516b50f741579c4912b2..3064476d5abaec7e4b173e1b4461669314dbd51e 100644
--- a/tests/unit/compile-python.hxml
+++ b/tests/unit/compile-python.hxml
@@ -1,3 +1,3 @@
 compile-each.hxml
--main unit.TestMain
+--main unit.TestMain
 -python bin/unit.py
\ No newline at end of file
diff --git a/tests/unit/compile-remoting.hxml b/tests/unit/compile-remoting.hxml
index f4093011eaf0ebaa3a4334fc1f08833855f9761a..842ae427d746705b1885953219b3740ca5b0a4dc 100644
--- a/tests/unit/compile-remoting.hxml
+++ b/tests/unit/compile-remoting.hxml
@@ -1,3 +1,3 @@
--cp src
--main unit.RemotingServer
+-p src
+--main unit.RemotingServer
 -neko remoting.n
\ No newline at end of file
diff --git a/tests/unit/compile-saucelabs-runner.hxml b/tests/unit/compile-saucelabs-runner.hxml
index 2fd3fc97a2505df7bf4ccd757377b6e6c0c0cdcb..4b812de626fd5ac5eec44c5e4bbbbd06778b6547 100644
--- a/tests/unit/compile-saucelabs-runner.hxml
+++ b/tests/unit/compile-saucelabs-runner.hxml
@@ -1,5 +1,5 @@
--cp src
+-p src
 -js bin/RunSauceLabs.js
--main RunSauceLabs
+--main RunSauceLabs
 -lib hxnodejs
--debug
\ No newline at end of file
+--debug
\ No newline at end of file
diff --git a/tests/unit/compile.hxml b/tests/unit/compile.hxml
index 4a90d8599ad1f5af1f255d1385d7ddd9438f5f0e..c9645219cd241189711f43bbcd07b3d619098f62 100644
--- a/tests/unit/compile.hxml
+++ b/tests/unit/compile.hxml
@@ -16,10 +16,10 @@ compile-java-runner.hxml
 
 --next compile-flash9.hxml
 --next compile-js.hxml
+--next compile-hl.hxml
 --next compile-lua.hxml
 --next compile-neko.hxml
 --next compile-php.hxml
---next compile-php7.hxml
 --next compile-as3.hxml
 --next compile-cpp.hxml
 --next compile-java.hxml
diff --git a/tests/unit/native_swf/Lib.as b/tests/unit/native_swf/Lib.as
new file mode 100644
index 0000000000000000000000000000000000000000..3381357354fc4966b1ea12f139b9921706d2efc4
--- /dev/null
+++ b/tests/unit/native_swf/Lib.as
@@ -0,0 +1,17 @@
+package {
+	public class Lib {
+		protected var x:int = 42;
+		protected function f():String { return "hello" }
+
+		private var _i:int = 5;
+		protected function get i():int { return _i }
+		protected function set i(v:int):void { _i = v }
+
+		static protected var sx:int = 42;
+		static protected function sf():String { return "hello" }
+
+		static private var _si:int = 5;
+		static protected function get si():int { return _si }
+		static protected function set si(v:int):void { _si = v }
+	}
+}
diff --git a/tests/unit/native_swf/Lib2.as b/tests/unit/native_swf/Lib2.as
new file mode 100644
index 0000000000000000000000000000000000000000..01af7cefa0e3d210434d2ccf382b91de45e760a9
--- /dev/null
+++ b/tests/unit/native_swf/Lib2.as
@@ -0,0 +1,4 @@
+package {
+	public class Lib2 extends Lib {
+	}
+}
diff --git a/tests/unit/native_swf/NsCls.as b/tests/unit/native_swf/NsCls.as
new file mode 100644
index 0000000000000000000000000000000000000000..fe2daf0a5d5cfcd67778c0bc79abbbca848f65cd
--- /dev/null
+++ b/tests/unit/native_swf/NsCls.as
@@ -0,0 +1,15 @@
+package {
+    public class NsCls {
+        ns1 var ns1v:int = 1;
+        ns2 var ns2v:int = 2;
+
+        ns1 function ns1f():int { return 1; }
+        ns2 function ns2f():int { return 2; }
+
+        ns1 static var ns1sv:int = 1;
+        ns2 static var ns2sv:int = 2;
+
+        ns1 static function ns1sf():int { return 1; }
+        ns2 static function ns2sf():int { return 2; }
+    }
+}
diff --git a/tests/unit/native_swf/PropClass.as b/tests/unit/native_swf/PropClass.as
new file mode 100644
index 0000000000000000000000000000000000000000..a3cdb2ac48049a70a0f721226f0309a448641521
--- /dev/null
+++ b/tests/unit/native_swf/PropClass.as
@@ -0,0 +1,13 @@
+package {
+	public class PropClass {
+		private var _x:int = 42;
+
+		public function get x():int {
+			return _x;
+		}
+
+		public function set x(value:int):void {
+			_x = value;
+		}
+	}
+}
diff --git a/tests/unit/native_swf/PropIface.as b/tests/unit/native_swf/PropIface.as
new file mode 100644
index 0000000000000000000000000000000000000000..45936ce380659021fa22412a1943fa14ea4ca1a3
--- /dev/null
+++ b/tests/unit/native_swf/PropIface.as
@@ -0,0 +1,6 @@
+package {
+	public interface PropIface {
+		function get x():int;
+		function set x(value:int):void;
+	}
+}
diff --git a/tests/unit/native_swf/ns1.as b/tests/unit/native_swf/ns1.as
new file mode 100644
index 0000000000000000000000000000000000000000..568837fc913720b8f70193826b27dbeae4f9ddbc
--- /dev/null
+++ b/tests/unit/native_swf/ns1.as
@@ -0,0 +1,3 @@
+package {
+    public namespace ns1;
+}
diff --git a/tests/unit/native_swf/ns2.as b/tests/unit/native_swf/ns2.as
new file mode 100644
index 0000000000000000000000000000000000000000..493408ef8cae375fa3bc97440f19e5524fbf841f
--- /dev/null
+++ b/tests/unit/native_swf/ns2.as
@@ -0,0 +1,3 @@
+package {
+    public namespace ns2 = "ns2";
+}
diff --git a/tests/unit/serializedValues.txt b/tests/unit/serializedValues.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0266859f05da397d03b8715690d7260bcc8abde1
--- /dev/null
+++ b/tests/unit/serializedValues.txt
@@ -0,0 +1 @@
+{"int0":"z","int1":"i1","intMap01":"q:0y1:1h","intMapEmpty":"qh","boolFalse":"f","intMap0112":"q:0y1:1:1y1:2h","floatNaN":"k","objectMapEmpty":"Mh","stringMapFooBar":"by3:fooy3:barh","arrayEmpty":"ah","stringMapEmpty":"bh","intMinus1":"i-1","nul":"n","stringMapFooNull":"by3:foonh","floatNegInf":"m","arrayNull":"anh","floatPosInf":"p","boolTrue":"t","array0":"azh","array01":"azi1h"}
\ No newline at end of file
diff --git a/tests/unit/src/Macro.hx b/tests/unit/src/Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..18b06fcd3422b79a74c68a1577b3bedf9e067288
--- /dev/null
+++ b/tests/unit/src/Macro.hx
@@ -0,0 +1,12 @@
+import haxe.macro.Context;
+
+class Macro {
+	public static function init() {
+		Context.onGenerate(function(_) {
+			Context.filterMessages(msg -> switch msg {
+				case Warning("haxe.Utf8 is deprecated. Use UnicodeString instead.", _): false;
+				case _: true;
+			});
+		});
+	}
+}
diff --git a/tests/unit/src/RootEnum.hx b/tests/unit/src/RootEnum.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cebf9d7c18f9d2bc103ec7f015eee17dc1d7cd5f
--- /dev/null
+++ b/tests/unit/src/RootEnum.hx
@@ -0,0 +1,3 @@
+enum RootEnum {
+	A(RootEnum:Int);
+}
\ No newline at end of file
diff --git a/tests/unit/src/RunSauceLabs.hx b/tests/unit/src/RunSauceLabs.hx
index 7cb825784a229c6c3cc78cea4af116e84aa69d6c..5e2d4973a7bf7e65085b23629b7ba84272ae8901 100644
--- a/tests/unit/src/RunSauceLabs.hx
+++ b/tests/unit/src/RunSauceLabs.hx
@@ -44,6 +44,13 @@ class RunSauceLabs {
 			!(b.browserName == "internet explorer" && Std.parseInt(b.version) <= 8);
 	}
 
+	static function isEs6(b:Dynamic):Bool {
+		return switch b.browserName {
+			case "internet explorer" | "safari": false;
+			case _: true;
+		}
+	}
+
 	static function main():Void {
 		var serveDomain = "localhost";
 		var servePort = "2000";
@@ -58,18 +65,18 @@ class RunSauceLabs {
 
 		//https://saucelabs.com/platforms
 		var browsers:Array<Dynamic> = [
-			{
-				"browserName": "internet explorer",
-				"platform": "Windows 7",
-				"version": "8.0",
-				"prerun": hideLongRunningScriptWarning
-			},
-			{
-				"browserName": "internet explorer",
-				"platform": "Windows 7",
-				"version": "9.0",
-				"prerun": hideLongRunningScriptWarning
-			},
+			// {
+			// 	"browserName": "internet explorer",
+			// 	"platform": "Windows 7",
+			// 	"version": "8.0",
+			// 	"prerun": hideLongRunningScriptWarning
+			// },
+			// {
+			// 	"browserName": "internet explorer",
+			// 	"platform": "Windows 7",
+			// 	"version": "9.0",
+			// 	"prerun": hideLongRunningScriptWarning
+			// },
 			{
 				"browserName": "internet explorer",
 				"platform": "Windows 7",
@@ -88,11 +95,6 @@ class RunSauceLabs {
 				"browserName": "firefox",
 				"platform": "Windows 7"
 			},
-			{
-				"browserName": "safari",
-				"platform": "OS X 10.9",
-				"version": "7.0"
-			},
 			{
 				"browserName": "safari",
 				"platform": "OS X 10.10",
@@ -136,6 +138,8 @@ class RunSauceLabs {
 		var tags = [];
 		if (Sys.getEnv("TRAVIS") != null)
 			tags.push("TravisCI");
+		if (Sys.getEnv("TF_BUILD") != null)
+			tags.push("AzurePipelines");
 
 		var maxDuration = 60 * 5; //5 min
 		var commandTimeout = 60;  //60s
@@ -154,6 +158,18 @@ class RunSauceLabs {
 				caps.setField("tunnel-identifier", Sys.getEnv("TRAVIS_JOB_NUMBER"));
 				caps.setField("build", Sys.getEnv("TRAVIS_BUILD_NUMBER"));
 			}
+			switch (Sys.getEnv("SAUCE_TUNNEL_ID")) {
+				case null:
+					//pass
+				case id:
+					caps.setField("tunnel-identifier", id);
+			}
+			switch (Sys.getEnv("SAUCE_BUILD")) {
+				case null:
+					//pass
+				case build:
+					caps.setField("build", build);
+			}
 
 			trials--;
 
@@ -185,10 +201,12 @@ class RunSauceLabs {
 			}
 
 			var browserSuccess = true;
-			var urls = if (!isEs5(caps)) {
-				urls.filter(function(url:String) return url.indexOf("js-es=3") != -1);
-			} else {
-				urls;
+			var urls = urls; // localize captured var
+			if (!isEs5(caps)) {
+				urls = urls.filter(url -> url.indexOf(StringTools.urlEncode("js-es=3")) != -1);
+			}
+			if (!isEs6(caps)) {
+				urls = urls.filter(url -> url.indexOf(StringTools.urlEncode("js-es=6")) == -1);
 			}
 
 			return browser
diff --git a/tests/unit/src/RunSerializerOutput.hx b/tests/unit/src/RunSerializerOutput.hx
new file mode 100644
index 0000000000000000000000000000000000000000..164c93ed80daf20fc6b1d87fa925e4adf61e88bb
--- /dev/null
+++ b/tests/unit/src/RunSerializerOutput.hx
@@ -0,0 +1,51 @@
+import haxe.Serializer.run;
+
+class RunSerializerOutput {
+	static function main() {
+		new RunSerializerOutput();
+	}
+
+	var object:{};
+
+	function new() {
+		object = {};
+		add("nul", null);
+		add("int0", 0);
+		add("intMinus1", -1);
+		add("int1", 1);
+		add("floatNaN", Math.NaN);
+		add("floatPosInf", Math.POSITIVE_INFINITY);
+		add("floatNegInf", Math.NEGATIVE_INFINITY);
+		add("boolTrue", true);
+		add("boolFalse", false);
+		add("arrayEmpty", []);
+		add("array0", [0]);
+		add("arrayNull", [null]);
+		add("array01", [0, 1]);
+
+		var smap = new Map<String, String>();
+		add("stringMapEmpty", smap);
+		smap["foo"] = null;
+		add("stringMapFooNull", smap);
+		smap["foo"] = "bar";
+		add("stringMapFooBar", smap);
+
+		var imap = new Map<Int, String>();
+		add("intMapEmpty", imap);
+		imap[0] = "1";
+		add("intMap01", imap);
+		imap[1] = "2";
+		add("intMap0112", imap);
+
+		var omap = new Map<{}, String>();
+		add("objectMapEmpty", omap);
+		// TODO
+
+		var s = haxe.Json.stringify(object);
+		sys.io.File.saveContent("../serializedValues.txt", s);
+	}
+
+	function add<T>(key:String, value:T) {
+		Reflect.setField(object, key, run(value));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/scripthost/Issue8502.hx b/tests/unit/src/scripthost/Issue8502.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1b0e532fdf72fd936bf8c962981654a9abecdd27
--- /dev/null
+++ b/tests/unit/src/scripthost/Issue8502.hx
@@ -0,0 +1,42 @@
+package scripthost;
+#if cpp
+
+@:keep class Issue8502 {
+	public function new() {
+		//initialize variables
+	}
+
+	public function doTest1(f:cpp.Float32):String {
+		return '$f';
+	}
+
+	public function doTest2(f:cpp.Float64):String {
+		return '$f';
+	}
+
+	public function doTest3(f:cpp.Int8):String {
+		return '$f';
+	}
+
+	public function doTest4(f:cpp.Int16):String {
+		return '$f';
+	}
+
+	public function doTest5(f:cpp.Int32):String {
+		return '$f';
+	}
+
+	public function doTest3u(f:cpp.UInt8):String {
+		return '$f';
+	}
+
+	public function doTest4u(f:cpp.UInt16):String {
+		return '$f';
+	}
+
+	public function doTest5u(f:cpp.UInt32):String {
+		return '$f';
+	}
+}
+
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unit/HelperMacros.hx b/tests/unit/src/unit/HelperMacros.hx
index 200c1028dda199a58a6cfdcd52ff9c716cad11bc..e0caed2c68f156da1639e42c205943498387697b 100644
--- a/tests/unit/src/unit/HelperMacros.hx
+++ b/tests/unit/src/unit/HelperMacros.hx
@@ -1,33 +1,60 @@
 package unit;
 
 import haxe.macro.Expr;
+import haxe.macro.Context.*;
+import haxe.macro.TypeTools.*;
+import haxe.macro.MacroStringTools.*;
 
 class HelperMacros {
 	static public macro function getCompilationDate() {
 		return macro $v { Std.string(Date.now()) };
 	}
 
+	static public macro function typeString(e) {
+		var typed = typeExpr(e);
+		var s = haxe.macro.TypeTools.toString(typed.t);
+		return macro $v{s};
+	}
+
 	static public macro function typedAs(actual:haxe.macro.Expr, expected:haxe.macro.Expr) {
-		var tExpected = haxe.macro.Context.typeof(expected);
-		var tActual = haxe.macro.Context.typeof(actual);
-		return haxe.macro.Context.parse("eq('" +Std.string(tActual) + "', '" +Std.string(tExpected) + "')", haxe.macro.Context.currentPos());
+		var tExpected = typeof(expected);
+		var tActual = typeof(actual);
+		return parse("eq('" +Std.string(tActual) + "', '" +Std.string(tExpected) + "')", currentPos());
+	}
+
+	static public macro function isNullable(expr:haxe.macro.Expr) {
+		var t = typeof(expr);
+		function isNullable(t:haxe.macro.Type) {
+			return switch (t) {
+				case TMono(null): false;
+				case TMono(t): isNullable(t.get());
+				case TAbstract(_.get() => {pack: [], name: "Null"}, _): true;
+				case TLazy(f): isNullable(f());
+				case TType(_.get() => td, tl): isNullable(applyTypeParameters(td.type, td.params, tl));
+				case TFun(_): false;
+				case TAbstract(_.get() => a, _) if (a.meta.has(":coreType")): !a.meta.has(":notNull");
+				case TAbstract(_.get() => a, tl): !a.meta.has(":notNull") && isNullable(applyTypeParameters(a.type, a.params, tl));
+				case _: true;
+			}
+		}
+		return macro $v{isNullable(t)};
 	}
 
 	static public macro function typeError(e:haxe.macro.Expr) {
 		var result = try {
-			haxe.macro.Context.typeof(e);
+			typeof(e);
 			"false";
 		} catch (e:Dynamic) "true";
-		return { pos: haxe.macro.Context.currentPos(), expr: haxe.macro.Expr.ExprDef.EConst(haxe.macro.Expr.Constant.CIdent(result)) };
+		return { pos: currentPos(), expr: haxe.macro.Expr.ExprDef.EConst(haxe.macro.Expr.Constant.CIdent(result)) };
 	}
 
 	static public macro function typeErrorText(e:haxe.macro.Expr) {
 		var result = try {
-			haxe.macro.Context.typeof(e);
+			typeof(e);
 			null;
 		} catch (e:haxe.macro.Expr.Error) e.message;
 		return {
-			pos: haxe.macro.Context.currentPos(),
+			pos: currentPos(),
 			expr: if (result == null)
 					haxe.macro.Expr.ExprDef.EConst(haxe.macro.Expr.Constant.CIdent("null"))
 				else
@@ -46,9 +73,39 @@ class HelperMacros {
 
 	static public macro function getErrorMessage(e:Expr) {
 		var result = try {
-			haxe.macro.Context.typeof(e);
+			typeof(e);
 			"no error";
 		} catch (e:Dynamic) Std.string(e.message);
 		return macro $v{result};
 	}
+
+	static public macro function parseAndPrint(s:String) {
+		var e = parse(s, currentPos());
+		var s2 = new haxe.macro.Printer().printExpr(e);
+		return macro eq($v{s}, $v{s2});
+	}
+
+	static public macro function pipeMarkupLiteral(e:Expr) {
+		function loop(e:Expr) {
+			return switch (e) {
+				case macro @:markup $v{(s:String)}:
+					formatString(s, e.pos);
+				case macro $b{el}:
+					el = el.map(loop);
+					macro $a{el}.join("");
+				case _:
+					error("Markup literal expected", e.pos);
+			}
+		}
+		return loop(e);
+	}
+
+	static public macro function pipeMarkupLiteralUnprocessed(e:Expr) {
+		return switch (e) {
+			case macro @:markup $v{(s:String)}:
+				macro $v{s};
+			case _:
+				error("Markup literal expected", e.pos);
+		}
+	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/MyAbstract.hx b/tests/unit/src/unit/MyAbstract.hx
index 2bebbea74ae2191a4c26efa701814b5511ce64d1..4ffc5d85446e8447f695016b71f32d0e3ac98852 100644
--- a/tests/unit/src/unit/MyAbstract.hx
+++ b/tests/unit/src/unit/MyAbstract.hx
@@ -306,8 +306,7 @@ abstract MyDebugString(String) to String {
 }
 
 #if !macro
-@:enum
-abstract FakeEnumAbstract(Int) {
+enum abstract FakeEnumAbstract(Int) {
 	var NotFound = 404;
 	var MethodNotAllowed = 405;
 }
@@ -320,7 +319,7 @@ abstract ExposingAbstract<S>(Array<S>) {
 }
 #end
 
-@:enum abstract GADTEnumAbstract<T:haxe.Constraints.Function>(Int) {
+enum abstract GADTEnumAbstract<T:haxe.Constraints.Function>(Int) {
 	var A:GADTEnumAbstract<Void->Void> = 1;
 	var B:GADTEnumAbstract<Int->Void> = 2;
 }
diff --git a/tests/unit/src/unit/MyClass.hx b/tests/unit/src/unit/MyClass.hx
index 307b86b0c1d9cdbd0ceb99b43477501d4b200c6e..cfd71626dd4b9ed7079606094ec7b36c3c0c8af3 100644
--- a/tests/unit/src/unit/MyClass.hx
+++ b/tests/unit/src/unit/MyClass.hx
@@ -1,9 +1,14 @@
 package unit;
 
+import haxe.ds.List;
 using MyClass.UsingBase;
 using MyClass.UsingChild1;
 using MyClass.UsingChild2;
 
+
+interface IMyParent {}
+interface IMyChild extends IMyParent {}
+
 class MyClass {
 
 	#if as3 public #end var val : Int;
@@ -36,19 +41,7 @@ class MyParent {
 	function b() return 20;
 }
 
-class MyDynamicChildWithToString extends MyParent implements Dynamic
-{
-	public function toString()
-	{
-		return "Custom toString";
-	}
-}
-
-class MyDynamicChildWithoutToString extends MyParent implements Dynamic
-{
-}
-
-class MyChild1 extends MyParent {
+class MyChild1 extends MyParent implements IMyChild {
 	public override function a() { return 12; }
 	override function b() return 21;
 	function c() return 19;
@@ -142,12 +135,12 @@ class InitWithoutCtor {
 class InitProperties {
 	public var accNull(default, null):Int = 3;
 	public var accDefault(default, default):Int = 3;
-	public var accFunc(default, set_accFunc):Int = 3;
+	public var accFunc(default, set):Int = 3;
 	public var accNever(default, never):Int = 3;
 	public var accDynamic(default, dynamic):Int = 3;
 
-	function set_accFunc(v) return throw "setter was called";
-	function set_accDynamic(v) return throw "setter was called";
+	function set_accFunc(_) return throw "setter was called";
+	function set_accDynamic(_) return throw "setter was called";
 	public function new() { }
 }
 
@@ -155,11 +148,11 @@ class ParamConstraintsClass {
 	public function new() { }
 	static public function staticSingle< A:Base > (a:A):A { return a; }
 	public function memberSingle< A:Base > (a:A):A { return a; }
-	public function memberMultiple < A:(Base, I1) > (a:A):A { return a; }
+	public function memberMultiple < A:Base & I1 > (a:A):A { return a; }
 	public function memberComplex < A:I1, B:List<A> > (a:A, b:B) { return b; }
 	public function memberBasic < A:String, B:Array<A> > (a:A, b:B) { return b[0]; }
 
-	public function memberAnon < A:( { x : Int }, { y : Float } ) > (v:A) { return v.x + v.y; }
+	public function memberAnon < A:{ x : Int } & { y : Float }> (v:A) { return v.x + v.y; }
 
 #if !(java || cs)  //this is a known bug caused by issue #915
 	@:overload(function< A, B:Array<A> > (a:A, b:B):Void { } )
@@ -211,7 +204,7 @@ class UsingUnrelated {
 		return 1;
 	}
 
-	static function set_SX(v) {
+	static function set_SX(v:Int) {
 		return v;
 	}
 
@@ -239,7 +232,7 @@ class UsingUnrelated {
 		return 1;
 	}
 
-	function set_x(v) {
+	function set_x(v:Int) {
 		return v;
 	}
 
@@ -268,7 +261,7 @@ class BaseSuperProp {
 	}
 
 	function get_prop() return 1;
-	function set_prop(v) return v;
+	function set_prop(v:Int) return v;
 
 	function get_fProp() return function(i:Int) return "test" +i;
 }
@@ -307,4 +300,4 @@ class InlineCastB extends InlineCastA {
 	public function quote() {
 		return "I am the greatest.";
 	}
-}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/MySpodClass.hx b/tests/unit/src/unit/MySpodClass.hx
deleted file mode 100644
index 02b89a02b8ded6fd3ace48f4551cca83e2a36f70..0000000000000000000000000000000000000000
--- a/tests/unit/src/unit/MySpodClass.hx
+++ /dev/null
@@ -1,110 +0,0 @@
-package unit;
-import sys.db.Object;
-import sys.db.Types;
-
-@:keep class MySpodClass extends Object
-{
-	public var theId:SId;
-	public var int:SInt;
-	public var double:SFloat;
-	public var boolean:SBool;
-	public var string:SString<255>;
-	public var date:SDateTime;
-	public var binary:SBinary;
-	public var abstractType:AbstractSpodTest<String>;
-
-	public var nullInt:SNull<Int>;
-	public var enumFlags:SFlags<SpodEnum>;
-
-	@:relation(rid) public var relation:OtherSpodClass;
-	@:relation(rnid) public var relationNullable:Null<OtherSpodClass>;
-	@:relation(spid) public var next:Null<MySpodClass>;
-
-	public var data:SData<Array<ComplexClass>>;
-	public var anEnum:SEnum<SpodEnum>;
-	public var bytes:SBytes<2>;
-}
-
-@:keep class NullableSpodClass extends Object
-{
-	public var theId:SId;
-	@:relation(rnid) public var relationNullable:Null<OtherSpodClass>;
-	public var data:Null<SData<Array<ComplexClass>>>;
-	public var anEnum:Null<SEnum<SpodEnum>>;
-
-	public var int:SNull<SInt>;
-	public var double:SNull<SFloat>;
-	public var boolean:SNull<SBool>;
-	public var string:SNull<SString<255>>;
-	public var date:SNull<SDateTime>;
-	public var binary:SNull<SBinary>;
-	public var abstractType:SNull<AbstractSpodTest<String>>;
-
-	public var nullInt:SNull<Int>;
-	public var enumFlags:SNull<SFlags<SpodEnum>>;
-}
-
-@:keep class ComplexClass
-{
-	public var val : { name:String, array:Array<String> };
-
-	public function new(val)
-	{
-		this.val = val;
-	}
-}
-
-@:id(theid) @:keep class OtherSpodClass extends Object
-{
-	public var theid:SInt;
-	public var name:SString<255>;
-
-	public function new(name:String)
-	{
-		super();
-		this.name =name;
-	}
-}
-
-@:keep enum SpodEnum
-{
-	FirstValue;
-	SecondValue;
-	ThirdValue;
-}
-
-abstract AbstractSpodTest<A>(A) from A
-{
-	public function get():A
-	{
-		return this;
-	}
-}
-
-@:id(name)
-	@:keep class ClassWithStringId extends Object
-{
-	public var name:SString<255>;
-	public var field:SInt;
-}
-
-@:keep class ClassWithStringIdRef extends Object
-{
-	public var id:SId;
-	@:relation(ref_id) public var ref:ClassWithStringId;
-}
-
-
-//issue #3828
-@:keep @:skip class BaseIssueC3828 extends sys.db.Object {
-	public var id : SInt;
-	@:relation(ruid)
-		public var refUser : SNull<IssueC3828>;
-}
-
-@:keep class IssueC3828 extends BaseIssueC3828 {
-}
-
-@:keep class Issue6041Table extends Object {
-	public var id:SInt = 0;
-}
\ No newline at end of file
diff --git a/tests/unit/src/unit/Test.hx b/tests/unit/src/unit/Test.hx
index 2556cf10954b6b2ec5ff73ee5b492db03fb3e58d..fbe6bcfd9a7c9194880ca28ec1f7c3cc19969c81 100644
--- a/tests/unit/src/unit/Test.hx
+++ b/tests/unit/src/unit/Test.hx
@@ -1,5 +1,7 @@
 package unit;
 
+import utest.Assert;
+
 #if (!macro && emscripten)
 import cpp.link.StaticStd;
 import cpp.link.StaticRegexp;
@@ -11,269 +13,68 @@ import cpp.link.StaticZlib;
 #if as3
 @:publicFields
 #end
-class Test {
+class Test implements utest.ITest {
 
 	public function new() {
 	}
 
-	//static var out = sys.io.File.write("debug.txt", false);
-
-	static inline function incrCount(?pos:haxe.PosInfos) {
-		++count;
-		//out.writeString(pos.methodName +":" +pos.lineNumber + "\n");
+	function eq<T>( v : T, v2 : T, ?pos:haxe.PosInfos ) {
+		Assert.equals(v, v2, pos);
 	}
 
-	function eq<T>( v : T, v2 : T, ?pos ) {
-		incrCount(pos);
-		if( v != v2 ) {
-			report(Std.string(v)+" should be "+Std.string(v2),pos);
-			success = false;
-		}
-	}
-
-	function feq( v : Float, v2 : Float, ?pos ) {
-		incrCount(pos);
-		if (!Math.isFinite(v) || !Math.isFinite(v2))
-			eq(v, v2, pos);
-		else if ( Math.abs(v - v2) > 1e-10 ) {
-			report(v+" should be "+v2,pos);
-			success = false;
-		}
+	function feq( v : Float, v2 : Float, ?pos:haxe.PosInfos ) {
+		Assert.floatEquals(v, v2, pos);
 	}
 
 	function aeq<T>(expected:Array<T>, actual:Array<T>, ?pos:haxe.PosInfos) {
-		if (expected.length != actual.length) {
-			report('Array length differs (${actual.length} should be ${expected.length})', pos);
-			success = false;
-		} else {
-			for (i in 0...expected.length) {
-				if (expected[i] != actual[i]) {
-					report('[${i}] ${actual[i]} should be ${expected[i]}', pos);
-					success = false;
-				}
-			}
-		}
+		Assert.same(expected, actual, pos);
 	}
 
-	function t( v, ?pos ) {
-		eq(v,true,pos);
+	function t( v, ?pos:haxe.PosInfos ) {
+		Assert.isTrue(v, pos);
 	}
 
-	function f( v, ?pos ) {
-		eq(v,false,pos);
+	function f( v, ?pos:haxe.PosInfos ) {
+		Assert.isFalse(v, pos);
 	}
 
-	function assert( ?pos ) {
-		report("Assert",pos);
+	function assert(?message:String, ?pos:haxe.PosInfos ) {
+		Assert.fail(message, pos);
 	}
 
-	function exc( f : Void -> Void, ?pos ) {
-		incrCount(pos);
-		try {
-			f();
-			report("No exception occurred",pos);
-			success = false;
-		} catch( e : Dynamic ) {
-		}
+	function exc( f : Void -> Void, ?pos:haxe.PosInfos ) {
+		Assert.raises(f, pos);
 	}
 
 	function unspec( f : Void -> Void, ?pos ) {
-		incrCount(pos);
 		try {
 			f();
 		} catch( e : Dynamic ) {
 		}
+		noAssert();
 	}
 
 	function allow<T>( v : T, values : Array<T>, ?pos ) {
-		incrCount(pos);
-		for( v2 in values )
-			if( v == v2 )
-				return;
-		report(v+" not in "+Std.string(values),pos);
-		success = false;
+		Assert.contains(v, values, pos);
+	}
+
+	function noAssert(?pos:haxe.PosInfos) {
+		t(true, pos);
 	}
 
 	function hf(c:Class<Dynamic>, n:String, ?pos:haxe.PosInfos) {
-		Test.incrCount(pos);
-		if (!Lambda.has(Type.getInstanceFields(c), n)) {
-			Test.report(Type.getClassName(c) + " should have member field " +n, pos);
-			success = false;
-		}
+		t(Lambda.has(Type.getInstanceFields(c), n));
 	}
 
 	function nhf(c:Class<Dynamic>, n:String, ?pos:haxe.PosInfos) {
-		Test.incrCount(pos);
-		if (Lambda.has(Type.getInstanceFields(c), n)) {
-			Test.report(Type.getClassName(c) + " should not have member field " +n, pos);
-			success = false;
-		}
+		f(Lambda.has(Type.getInstanceFields(c), n));
 	}
 
 	function hsf(c:Class<Dynamic> , n:String, ?pos:haxe.PosInfos) {
-		Test.incrCount(pos);
-		if (!Lambda.has(Type.getClassFields(c), n)) {
-			Test.report(Type.getClassName(c) + " should have static field " +n, pos);
-			success = false;
-		}
+		t(Lambda.has(Type.getClassFields(c), n));
 	}
 
 	function nhsf(c:Class<Dynamic> , n:String, ?pos:haxe.PosInfos) {
-		Test.incrCount(pos);
-		if (Lambda.has(Type.getClassFields(c), n)) {
-			Test.report(Type.getClassName(c) + " should not have static field " +n, pos);
-			success = false;
-		}
-	}
-
-	function infos( m : String ) {
-		reportInfos = m;
-	}
-
-	function async<Args,T>( f : Args -> (T -> Void) -> Void, args : Args, v : T, ?pos : haxe.PosInfos ) : Void {
-		if( asyncWaits.length >= AMAX ) {
-			asyncCache.push(async.bind(f,args,v,pos));
-			return;
-		}
-		asyncWaits.push(pos);
-		f(args,function(v2) {
-			incrCount(pos);
-			if( !asyncWaits.remove(pos) ) {
-				report("Double async result",pos);
-				success = false;
-				return;
-			}
-			if( v != v2 ) {
-				report(v2+" should be "+v,pos);
-				success = false;
-			}
-			checkDone();
-		});
-	}
-
-	function asyncExc<Args>( seterror : (Dynamic -> Void) -> Void, f : Args -> (Dynamic -> Void) -> Void, args : Args, ?pos : haxe.PosInfos ) : Void {
-		if( asyncWaits.length >= AMAX ) {
-		asyncCache.push(asyncExc.bind(seterror,f,args,pos));
-			return;
-		}
-		asyncWaits.push(pos);
-		seterror(function(e) {
-			incrCount(pos);
-			if( asyncWaits.remove(pos) )
-				checkDone();
-			else {
-				report("Multiple async events",pos);
-				success = false;
-			}
-		});
-		f(args,function(v) {
-			incrCount(pos);
-			if( asyncWaits.remove(pos) ) {
-				report("No exception occurred",pos);
-				success = false;
-				checkDone();
-			} else {
-				report("Multiple async events",pos);
-				success = false;
-			}
-		});
-	}
-
-	function log( msg, ?pos : haxe.PosInfos ) {
-		haxe.Log.trace(msg,pos);
-	}
-
-   static function logVerbose(msg:String) {
-	  #if (cpp || neko || php)
-	  Sys.println(msg);
-	  #end
-   }
-
-	static var count = 0;
-	static var reportInfos = null;
-	static var reportCount = 0;
-	static var checkCount = 0;
-	static var asyncWaits = new Array<haxe.PosInfos>();
-	static var asyncCache = new Array<Void -> Void>();
-	static var AMAX = 3;
-	static var timer : haxe.Timer;
-	static var success = true;
-
-	dynamic static function report( msg : String, ?pos : haxe.PosInfos ) {
-		if( reportInfos != null ) {
-			msg += " ("+reportInfos+")";
-			reportInfos = null;
-		}
-		haxe.Log.trace(msg,pos);
-		reportCount++;
-#if !(java || cs)
-		if( reportCount == 50 ) {
-			trace("Too many errors");
-			report = function(msg,?pos) {};
-		}
-#end
-	}
-
-	static function checkDone() {
-		if( asyncWaits.length != 0 ) return;
-		if( asyncCache.length == 0 ) {
-			report("DONE ["+count+" tests]");
-			report("SUCCESS: " + success);
-
-			//out.close();
-
-			#if js
-			if (js.Browser.supported) {
-				untyped js.Browser.window.success = success;
-			}
-			#end
-
-			#if sys
-			Sys.exit(success ? 0 : 1);
-			#end
-
-			return;
-		}
-		resetTimer();
-		while( asyncCache.length > 0 && asyncWaits.length < AMAX )
-			asyncCache.shift()();
-	}
-
-	static function asyncTimeout() {
-		if( asyncWaits.length == 0 )
-			return;
-		for( pos in asyncWaits ) {
-			report("TIMEOUT",pos);
-			success = false;
-		}
-		asyncWaits = new Array();
-		checkDone();
-	}
-
-	static function resetTimer() {
-		#if (neko || php || cpp || java || cs || python || hl || lua)
-		#else
-		if( timer != null ) timer.stop();
-		timer = new haxe.Timer(30000);
-		timer.run = asyncTimeout;
-		#end
-	}
-
-	static function onError( e : Dynamic, msg : String, context : String ) {
-		var msg = "???";
-		var stack :String = #if js
-			e.stack;
-		#else
-			haxe.CallStack.toString(haxe.CallStack.exceptionStack());
-		#end
-		try msg = Std.string(e) catch( e : Dynamic ) {};
-		reportCount = 0;
-		report("ABORTED : "+msg+" in "+context);
-		success = false;
-		reportInfos = null;
-		trace("STACK :\n"+stack);
-#if lua
-		Sys.exit(1);
-#end
+		f(Lambda.has(Type.getClassFields(c), n));
 	}
 }
diff --git a/tests/unit/src/unit/TestArrowFunctions.hx b/tests/unit/src/unit/TestArrowFunctions.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e6151213232f6fc95ed395281c16fc8b31173b8c
--- /dev/null
+++ b/tests/unit/src/unit/TestArrowFunctions.hx
@@ -0,0 +1,149 @@
+package unit;
+
+abstract W(Int) from Int {
+	@:to inline public function toString():String return '$this';
+}
+
+class TestArrowFunctions extends Test {
+
+	var f0_0: Void -> Int;
+	var f0_1: Void -> W;
+
+	var f1_0: Int->Int;
+	var f1_1: ?Int->Int;
+
+	var f2_0: Int->Int;
+
+	var f3_0: Int->Int->Int;
+	var f3_1: ?Int->String->Int;
+	var f3_2: Int->?Int->Int;
+
+	var f4:   Int->(Int->Int);
+	var f5:   Int->Int->(Int->Int);
+	var f6_a: Int->(Int->(Int->Int));
+	var f6_b: Int->(Int->(Int->Int));
+	var f7:   (Int->Int)->(Int->Int);
+	var f8:   Int -> String;
+	var f9:   Float->Bool->String;
+	var arr: Array<Int->Int> = [];
+	var map: Map<Int,Int->Int> = new Map();
+	var obj: { f : Int->Int };
+
+	var v0:   Int;
+	var v1:   String;
+
+	var maybe : Void -> Bool;
+
+	#if !as3
+
+	function testSyntax(){
+		maybe = () -> Math.random() > 0.5;
+
+		v0 = (123);
+		v0 = (123:Int);
+
+		f0_0 = function () return 1;
+		f0_0 = () -> 1;
+
+		f0_0 = (() -> 1);
+		f0_0 = (() -> 1:Void->Int);
+		f0_0 = cast (() -> 1:Void->Int);
+
+		v0 = f0_0();
+
+		f0_1 = function () : W return 1;
+		v1 = f0_1();
+
+		f0_1 = () -> (1:W);
+		v1 = f0_1();
+
+		f1_0 = function (a:Int) return a;
+		f1_1 = function (?a:Int) return a;
+
+		f1_0 = a -> a;
+		v0 = f1_0(1);
+
+		f1_1 = (?a) -> a;
+		v0 = f1_1(1);
+
+		f1_1 = (?a:Int) -> a;
+		v0 = f1_1(1);
+
+		f1_1 = (a:Int=1) -> a;
+		v0 = f1_1();
+
+		f1_1 = (?a:Int=1) -> a;
+		v0 = f1_1();
+
+		f1_1 = function (a=2) return a;
+		eq(f1_1(),2);
+
+		f1_1 = (a=2) -> a;
+		eq(f1_1(),2);
+
+		f3_0 = function (a:Int, b:Int) return a + b;
+		f3_1 = function (?a:Int, b:String) return a + b.length;
+		f3_2 = function (a:Int, ?b:Int) return a + b;
+
+		f3_0 = (a:Int, b:Int)  -> a + b;
+		f3_1 = (?a:Int, b:String) -> a + b.length;
+		f3_2 = (a:Int, ?b:Int) -> a + b;
+
+		#if !(flash || hl) // Cannot skip not nullable argument
+		f3_1 = function (a=1, b:String) return a + b.length;
+		eq(f3_1("--"),3);
+
+		f3_1 = function (?a:Int=1, b:String) return a + b.length;
+		eq(f3_1("--"),3);
+
+		f3_2 = function (a:Int, b=2) return a + b;
+		eq(f3_2(1),3);
+
+		f3_1 = (a=1, b:String) -> a + b.length;
+		eq(f3_1("--"),3);
+
+		f3_1 = (a:Int=1, b:String) -> a + b.length;
+		eq(f3_1("--"),3);
+
+		f3_1 = (?a:Int=1, b:String) -> a + b.length;
+		eq(f3_1("--"),3);
+
+		f3_2 = (a:Int, b=2) -> a + b;
+		eq(f3_2(1),3);
+		#end
+
+		f4 = function (a) return function (b) return a + b;
+		f4 = a -> b -> a + b;
+
+		f5 = function (a,b) return function (c) return a + b + c;
+		f5 = (a, b) -> c -> a + b + c;
+
+		f6_a = function (a) return function (b) return function (c) return a + b + c;
+		f6_b = a -> b -> c -> a + b + c;
+		eq(f6_a(1)(2)(3),f6_b(1)(2)(3));
+
+		f7 = function (f:Int->Int) return f;
+		f7 = f -> f;
+		f7 = (f:Int->Int) -> f;
+		f7 = maybe() ? f -> f : f -> g -> f(g);
+		f7 = switch maybe() {
+			case true:  f -> f;
+			case false: f -> g -> f(g);
+		};
+
+		f8 = (a:Int) -> ('$a':String);
+		var _f9 = (a:Float,b:Bool) -> '$a $b';
+		f9 = _f9;
+
+		arr = [for (i in 0...5) a -> a * i];
+		arr = [a -> a + a, b -> b + b, c -> c + c];
+		arr.map( f -> f(2) );
+
+		var arr2:Array<Int->W> = [for (f in arr) x -> f(x)];
+
+		map = [1 => a -> a + a, 2 => a -> a + a, 3 => a -> a + a];
+
+		obj = { f : a -> a + a };
+	}
+	#end
+}
diff --git a/tests/unit/src/unit/TestBasetypes.hx b/tests/unit/src/unit/TestBasetypes.hx
index 97a9857c3a0172ea82f907ba3d66182b4a49943d..b1f7abfa69eb51af828cb2c441e8330abc3a6122 100644
--- a/tests/unit/src/unit/TestBasetypes.hx
+++ b/tests/unit/src/unit/TestBasetypes.hx
@@ -31,13 +31,9 @@ class TestBasetypes extends Test {
 		unspec(function() String.fromCharCode(0));
 		unspec(function() String.fromCharCode(-1));
 		unspec(function() String.fromCharCode(256));
-#if php
-		eq( Std.string(null) + "x", "nullx" );
-		eq( "x" + Std.string(null), "xnull" );
-#else
+
 		eq( null + "x", "nullx" );
 		eq( "x" + null, "xnull" );
-#end
 
 		var abc = "abc".split("");
 		eq( abc.length, 3 );
@@ -122,7 +118,7 @@ class TestBasetypes extends Test {
 		try {
 			"" + x.iterator();
 		} catch (e:Dynamic)	{
-			Test.report("Could not convert Iterator to String");
+			assert("Could not convert Iterator to String");
 		}
 
 		var str = "he\nlo\"'";
diff --git a/tests/unit/src/unit/TestBytes.hx b/tests/unit/src/unit/TestBytes.hx
index a91c64b74b14519ec98f1cb1c766e3581520bcdf..fc6282ceaa57260a923a9bb1452c7e6cec4cda9b 100644
--- a/tests/unit/src/unit/TestBytes.hx
+++ b/tests/unit/src/unit/TestBytes.hx
@@ -85,12 +85,10 @@ class TestBytes extends Test {
 		for( s1 in strings )
 			for( s2 in strings ) {
 				var c = haxe.io.Bytes.ofString(s1).compare(haxe.io.Bytes.ofString(s2));
-				infos("compare "+s1+" and "+s2);
 				eq( c < 0, s1 < s2 );
 				eq( c > 0, s1 > s2 );
 				eq( c == 0, s1 == s2 );
 			}
-		infos(null);
 		// sub
 		var bs = haxe.io.Bytes.ofString("ABCDEFGH");
 		eq( bs.sub(1,3).compare(haxe.io.Bytes.ofString("BCD")), 0 );
@@ -137,4 +135,13 @@ class TestBytes extends Test {
 		eq(b1.getString(0,2), b2.getString(0,2));
 
 	}
+
+	function testHex() {
+		var strings = ["Increasing","impression","interested","expression","companions","instrument","Her"];
+		for(s in strings) {
+			var b = haxe.io.Bytes.ofString(s);
+			var bhx = haxe.io.Bytes.ofHex(b.toHex());
+			eq(b.toHex(),bhx.toHex());
+		}
+	}
 }
diff --git a/tests/unit/src/unit/TestCSharp.hx b/tests/unit/src/unit/TestCSharp.hx
index 033263398adc20605ab402c573131f2413fca082..6281fa5a4d93cbe44a034da979787e8a588834f6 100644
--- a/tests/unit/src/unit/TestCSharp.hx
+++ b/tests/unit/src/unit/TestCSharp.hx
@@ -36,7 +36,7 @@ class TestCSharp extends Test
 	function testHaxeKeywords()
 	{
 		eq(Base._inline, 42);
-		eq(Base._callback, 43);
+		eq(Base.callback, 43);
 		eq(Base._cast, 44);
 		eq(Base._untyped, 45);
 		Base._untyped = 40;
diff --git a/tests/unit/src/unit/TestCasts.hx b/tests/unit/src/unit/TestCasts.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cf5f37df0f1a4e4dd2ad604fcd51beae588e5cdc
--- /dev/null
+++ b/tests/unit/src/unit/TestCasts.hx
@@ -0,0 +1,41 @@
+package unit;
+
+class TestCasts extends Test  {
+
+	static function foo( f : Float ) {
+		return f;
+	}
+
+	static function make( f : Dynamic ) return f;
+
+	function testCasts() {
+		var f : Int -> Float = make(foo);
+		eq( f(123), 123);
+	}
+
+	function testInterfaces() {
+
+		var v = new MyClass.CI1();
+		eq( cast(v,MyClass.I1), v );
+		exc( function() cast(v,MyClass.I2) );
+
+		var v = new MyClass.ClassI2();
+		eq( cast(v,MyClass.I1), v );
+		eq( cast(v,MyClass.I2), v );
+
+		var v = cast(v,MyClass.I2);
+		eq( cast(v,MyClass.I1), v );
+		exc( function() cast(v,MyClass.CovI) );
+
+		var v : MyClass.CovI = new MyClass.Cov2();
+		eq( cast(v,MyClass.CovI), v );
+
+		var v = new MyClass.Cov3();
+		eq( cast(v,MyClass.CovI), v );
+		eq( cast(v,MyClass.CovI2), v );
+
+		exc(function() { cast(new MyClass.Cov1(), MyClass.CovI); });
+
+	}
+
+}
diff --git a/tests/unit/src/unit/TestDCE.hx b/tests/unit/src/unit/TestDCE.hx
index 75a0f670345b5cc63e9189ad0069b39e6a485c85..9c89c630adcb6cbd3b80ffe4bd5a48af1d41eed7 100644
--- a/tests/unit/src/unit/TestDCE.hx
+++ b/tests/unit/src/unit/TestDCE.hx
@@ -1,5 +1,26 @@
 package unit;
 
+private typedef Foo = {
+	var bar(get, null): Bar;
+}
+
+private typedef Bar = {
+	var data: Int;
+}
+
+private class AdrianV {
+	public var bar(get, null): Bar = {data: 100};
+	function get_bar() {
+		return bar;
+	}
+
+	public function new() {}
+
+	static public function testFoo(foo: Foo) {
+		return foo.bar.data;
+	}
+}
+
 @:analyzer(no_local_dce)
 class DCEClass {
 	// used statics
@@ -162,6 +183,13 @@ class TestDCE extends Test {
 		#end
 		hf(ThrownWithToString, "toString");
 	}
+
+	public function testIssue7259() {
+		var me = new AdrianV();
+		AdrianV.testFoo(me);
+		var c = Type.getClass(me);
+		hf(c, "get_bar");
+	}
 }
 
 class UsedConstructed {
@@ -208,7 +236,7 @@ class UnusedImplements implements UsedInterface {
 }
 
 interface PropertyInterface {
-	public var x(get_x, set_x):String;
+	public var x(get, set):String;
 }
 
 class PropertyAccessorsFromBaseClass {
@@ -217,7 +245,7 @@ class PropertyAccessorsFromBaseClass {
 }
 
 class PropertyAccessorsFromBaseClassChild extends PropertyAccessorsFromBaseClass implements PropertyInterface {
-	public var x(get_x, set_x):String;
+	public var x(get, set):String;
 	public function new() { }
 }
 
diff --git a/tests/unit/src/unit/TestFieldVariance.hx b/tests/unit/src/unit/TestFieldVariance.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e89a03389072b28ee0c4fb1e353066c7f2f43aad
--- /dev/null
+++ b/tests/unit/src/unit/TestFieldVariance.hx
@@ -0,0 +1,124 @@
+package unit;
+
+import unit.HelperMacros.typeError;
+
+private typedef PublicField = {
+	var aField:Int;
+}
+
+private typedef FinalField = {
+	final aField:Int;
+}
+
+private typedef NeverField = {
+	var aField(default, never):Int;
+}
+
+private typedef NullField = {
+	var aField(default, null):Int;
+}
+
+private interface PublicFieldInterface {
+	public var aField:Int;
+}
+
+private interface FinalFieldInterface {
+	public final aField:Int;
+}
+
+private interface NeverFieldInterface {
+	public var aField(default, never):Int;
+}
+
+private interface NullFieldInterface {
+	public var aField(default, null):Int;
+}
+
+private class PublicFieldClass
+	implements PublicFieldInterface // ok, same
+	implements NullFieldInterface // ok, narrowing access
+	implements NeverFieldInterface // ok, narrowing access
+	/* implements FinalFieldInterface */ // not ok, final invariance
+	{
+	public var aField:Int;
+}
+
+private class FinalFieldClass
+	implements FinalFieldInterface // ok,same
+	implements NeverFieldInterface // ok, no write-access
+	implements NullFieldInterface // ok, no write-access
+	/* implements PublicFieldInterface */ // not ok, final invariance
+	{
+	public final aField:Int = 0;
+}
+
+private class NeverFieldClass
+	implements NeverFieldInterface // ok, same
+	implements NullFieldInterface // ok, no write-access
+	/* implements PublicFieldInterface */ // not ok, widening access
+	/* implements FinalFieldInterface */ // not ok, final invariance
+	{
+	public var aField(default, never):Int;
+}
+
+private class NullFieldClass
+	implements NullFieldInterface // ok, same
+	implements NeverFieldInterface // ok, no write-access
+	/* implements PublicFieldInterface */ // not ok, widening access
+	/* implements FinalFieldInterface */ // not ok, final invariance
+	{
+	public var aField(default, null):Int;
+}
+
+class TestFieldVariance extends Test {
+	public function test() {
+		var publicField:PublicField = null;
+		var finalField:FinalField = null;
+		var neverField:NeverField = null;
+		var nullField:NullField = null;
+
+		var publicFieldClass:PublicFieldClass = null;
+		var finalFieldClass:FinalFieldClass = null;
+		var neverFieldClass:NeverFieldClass = null;
+		var nullFieldClass:NullFieldClass = null;
+
+		// anon to final anon
+
+		t(typeError(finalField = publicField));
+		finalField = neverField;
+		t(typeError(finalField = nullField));
+
+		// anon to never anon
+
+		neverField = publicField;
+		neverField = finalField;
+		neverField = nullField;
+
+		// anon to null anon
+
+		nullField = publicField;
+		t(typeError(nullField = finalField));
+		nullField = neverField;
+
+		// class to final anon
+
+		t(typeError(finalField = publicFieldClass));
+		finalField = finalFieldClass;
+		t(typeError(finalField = neverFieldClass));
+		t(typeError(finalField = nullFieldClass));
+
+		// class to never anon
+
+		neverField = publicFieldClass;
+		t(typeError(neverField = finalFieldClass));
+		neverField = neverFieldClass;
+		neverField = nullFieldClass;
+
+		// class to null anon
+
+		nullField = publicFieldClass;
+		t(typeError(nullField = finalFieldClass));
+		nullField = neverFieldClass;
+		nullField = nullFieldClass;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestGeneric.hx b/tests/unit/src/unit/TestGeneric.hx
index a00d76c56260b257f922e133ef504cce31f42d97..5c1f6bde1b6f8c7e7f05c7787effbcc5165b8010 100644
--- a/tests/unit/src/unit/TestGeneric.hx
+++ b/tests/unit/src/unit/TestGeneric.hx
@@ -1,5 +1,10 @@
 package unit;
 
+private typedef MyAnon = {
+	a:Int,
+	?b:MyRandomClass,
+}
+
 @:generic
 class MyGeneric<T> {
 	public var t:T;
@@ -8,11 +13,6 @@ class MyGeneric<T> {
 	}
 }
 
-@:generic
-class MyGeneric2<T> extends T {
-	//public function new() { } // not allowed
-}
-
 class MyRandomClass {
 	public var s:String;
 	public function new(s:String) {
@@ -50,27 +50,22 @@ class TestGeneric extends Test {
 		t((mg.t is String));
 	}
 
-	function testExtends() {
-		// basic class
-		//t(unit.HelperMacros.typeError(new MyGeneric2<String>()));
-
-		// not a class
-		//t(unit.HelperMacros.typeError(new MyGeneric2<Int>()));
-
-		// no constructor
-		//t(unit.HelperMacros.typeError(new MyGeneric2<MyRandomEmptyClass>()));
-
-		var mg = new MyGeneric2<MyRandomClass>("foo");
-		eq("foo", mg.s);
-
-		var mg = new MyGeneric2<MyGeneric<MyRandomClass>>(new MyRandomClass("foo"));
-		eq("foo", mg.t.s);
-	}
-
 	function testConstraints() {
 		var n = new RBTree<MyData>();
 		n.root = new MyData(1);
 		n.root.rbLeft = new MyData(2);
 		n.root.rbRight = new MyData(3);
+		noAssert();
+	}
+
+	function testGenericAnon() {
+		var a = new MyGeneric<MyAnon>({a: 1});
+		eq(a.t.a, 1);
+		eq(a.t.b, null);
+	}
+
+	function testGenericFn() {
+		var a = new MyGeneric<Int->Int>(function(i:Int):Int return i * i);
+		eq(4, a.t(2));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/src/unit/TestHttp.hx b/tests/unit/src/unit/TestHttp.hx
new file mode 100644
index 0000000000000000000000000000000000000000..21c03499ebf9d78059fedd09eedaffa874ee4d2c
--- /dev/null
+++ b/tests/unit/src/unit/TestHttp.hx
@@ -0,0 +1,87 @@
+package unit;
+
+import utest.Async;
+
+class TestHttp extends Test {
+	public function setupClass() {
+		#if flash
+		flash.system.Security.allowDomain("*");
+		flash.system.Security.allowInsecureDomain("*");
+		flash.system.Security.loadPolicyFile("http://localhost:20200/crossdomain.xml");
+		#end
+	}
+
+	function run(async:Async, test:()->Void) {
+		// { comment this out to run http tests locally
+		#if !azure
+		noAssert();
+		async.done();
+		return;
+		#end
+		// }
+
+		#if (js && !nodejs)
+		if(js.Syntax.code('typeof XMLHttpRequest == "undefined"')) {
+			noAssert();
+			async.done();
+			return;
+		}
+		#elseif (azure && (hl || java || (flash && (Linux || Mac)) || (cs && Windows)))
+		noAssert();
+		async.done();
+		return;
+		#else
+		test();
+		#end
+	}
+#if !(azure && hl)
+	@:timeout(1000)
+	public function testPostData(async:Async) run(async, () -> {
+		var srcStr = 'hello, world';
+		var d = new haxe.Http('http://localhost:20200/echoServer.n');
+		d.onData = echoStr -> {
+			if(echoStr != srcStr) {
+				assert('String data from Http request is corrupted: $echoStr');
+			}
+			noAssert();
+			async.done();
+		}
+		d.onError = e -> {
+			assert('Failed Http request with string data: $e');
+			async.done();
+		}
+		d.setPostData(srcStr);
+		d.request();
+	});
+
+	@:timeout(1000)
+	public function testPostBytes(async:Async) run(async, () -> {
+		var srcData = haxe.io.Bytes.alloc(256);
+		for(i in 0...srcData.length) {
+			srcData.set(i, i);
+		}
+		var d = new haxe.Http('http://localhost:20200/echoServer.n');
+		d.onBytes = echoData -> {
+			if(srcData.length != echoData.length) {
+				assert('Binary data from Http request is corrupted. Wrong amount of bytes.');
+			}
+			for(i in 0...echoData.length) {
+				switch [srcData.get(i), echoData.get(i)] {
+					case [a, b] if(a != b):
+						assert('Binary data from Http request is corrupted. Invalid byte value at index #$i: (src) $a != $b (echo)');
+						break;
+					case _:
+				}
+			}
+			noAssert();
+			async.done();
+		}
+		d.onError = e -> {
+			assert('Failed Http request with binary data: $e');
+			async.done();
+		}
+		d.setPostBytes(srcData);
+		d.request();
+	});
+#end
+}
diff --git a/tests/unit/src/unit/TestIO.hx b/tests/unit/src/unit/TestIO.hx
index 14c19789264bf05513863b59a35f8b17e9cc2f2d..9e2b3e558f3a430a9614cb73a49880cf4995fba9 100644
--- a/tests/unit/src/unit/TestIO.hx
+++ b/tests/unit/src/unit/TestIO.hx
@@ -8,7 +8,7 @@ class TestIO extends Test {
 		check(true);
 	}
 
-	function excv<T>( f, e : T, ?pos ) {
+	function excv<T>( f:Void -> Void, e : T, ?pos ) {
 		try {
 			f();
 			eq(null,e,pos);
@@ -18,8 +18,6 @@ class TestIO extends Test {
 	}
 
 	function check(endian:Bool) {
-		infos("endian = "+endian);
-
 		var b = haxe.io.Bytes.ofString("ABCééé\r\n\t");
 		eq( b.length, 12 );
 		b.set(1,0);
diff --git a/tests/unit/src/unit/TestInt64.hx b/tests/unit/src/unit/TestInt64.hx
index b4d96ee62fe2e1ec4bb5af26c9534a15e424e691..8912739e690231cbbaba70f244089abe716df56e 100644
--- a/tests/unit/src/unit/TestInt64.hx
+++ b/tests/unit/src/unit/TestInt64.hx
@@ -38,6 +38,29 @@ class TestInt64 extends Test {
 		exc( tryOverflow.bind(a) );	// Throws Overflow
 	}
 
+	public function testNegateOverflow_Issue7485()
+	{
+		// Guarantee two's complement overflow (-min == min)
+		//  - discussion: https://github.com/HaxeFoundation/haxe/pull/7491
+		var min = haxe.Int64.parseString('-9223372036854775808');
+		eq( min==(-min), true);
+
+		// 0x7fffffff - 0x7fffffffffffffff = -7fffffff80000000
+		var a = haxe.Int64.parseString('2147483647');
+		var b = haxe.Int64.parseString('9223372036854775807');
+		var z = haxe.Int64.sub(a, b);
+		eq(haxe.Int64.toStr(z), "-9223372034707292160");
+
+		// This fails because the first division fails:
+		var ten = haxe.Int64.make(0, 10);
+		var modulus = haxe.Int64.divMod( z, ten ).modulus.low;
+		eq( modulus, 0 );
+
+		// The first division failed because of negate:
+		eq( (-z).low, -2147483648 );
+		eq( (-z).high, 2147483647 );
+	}
+
 	// Some tests of how it generates Int64 when used as Null<Int64> or as type parameters
 	function testGen()
 	{
@@ -445,11 +468,7 @@ class TestInt64 extends Test {
 	}
 
 	function int64eq( v : Int64, v2 : Int64, ?pos ) {
-		Test.count++;
-		if( v != v2 ) {
-			Test.report(Std.string(v)+" should be "+Std.string(v2),pos);
-			Test.success = false;
-		}
+		t(v == v2);
 	}
 
 	public function testParseString()
diff --git a/tests/unit/src/unit/TestInterface.hx b/tests/unit/src/unit/TestInterface.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5a905836cc519faebcbd06f5864b444f7730ea16
--- /dev/null
+++ b/tests/unit/src/unit/TestInterface.hx
@@ -0,0 +1,98 @@
+package unit;
+
+private interface IEmpty {
+}
+
+private interface Foo {
+	public function foo() : String;
+}
+
+private interface IX {
+	public function getX() : Float;
+}
+
+private interface IX2 {
+	public function getX() : Float;
+}
+
+private interface IY extends Foo {
+	public function getY() : Float;
+}
+
+private class Point implements IX implements IY {
+
+	var x : Float;
+	var y : Int;
+
+	public function new(x,y) {
+		this.x = x;
+		this.y = y;
+	}
+
+	public function getX() {
+		return x;
+	}
+
+	public function getY() : #if java /* see https://github.com/HaxeFoundation/haxe/issues/6486 */ Float #else Int #end {
+		return y;
+	}
+
+	public function foo() {
+		return "bar";
+	}
+
+}
+
+private interface I1 {
+	function foo() : Void;
+}
+
+private interface I2 extends I1 {
+	function bar() : Void;
+}
+
+private class C implements I2 {
+	public function new() {};
+	public function foo() {};
+	public function bar() {};
+}
+
+class TestInterface extends Test {
+
+	public function test() {
+		var p = new Point(1.3,5);
+		var px : IX = p;
+		var py : IY = p;
+		t( Std.is(p, Point) );
+		t( Std.is(p, IX) );
+		t( Std.is(p, IY) );
+		f( Std.is(p, IEmpty) );
+		f( Std.is(p, IX2) );
+
+		t( px == p );
+		t( py == p );
+
+		eq( px, p );
+		eq( py, p );
+		t( (px:Dynamic) == (py:Dynamic) );
+
+		eq( px.getX(), 1.3 );
+		eq( py.getY(), 5 );
+		eq( py.foo(), "bar" );
+
+		eq( (px:Dynamic).getX(), 1.3 );
+		eq( (py:Dynamic).getY(), 5 );
+		eq( (py:Dynamic).foo(), "bar" );
+
+		var p2 = Std.downcast(px,Point);
+		eq( p, p2 );
+		eq( cast(py,IX), px );
+
+		var c = new C();
+		var i2 : I2 = c;
+		var i1 : I1 = c;
+		eq(i1, c);
+		eq(i2, c);
+		eq(i1,i2);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestJQuery.hx b/tests/unit/src/unit/TestJQuery.hx
deleted file mode 100644
index aa84d50aa7e14506b3850cc143343b3e19d9d7b2..0000000000000000000000000000000000000000
--- a/tests/unit/src/unit/TestJQuery.hx
+++ /dev/null
@@ -1,39 +0,0 @@
-package unit;
-
-import js.jquery.*;
-import js.jquery.Helper.*;
-
-class TestJQuery extends Test {
-
-	function testBasic() {
-		var j = new JQuery("<div></div>");
-		eq(j.length, 1);
-	}
-
-	function testRenamedStaticFields() {
-		JQuery.each([123], function(i, e) {
-			eq(i, 0);
-			eq(e, 123);
-		});
-	}
-
-	function testIterator() {
-		var div = Lambda.find(new JQuery("<div></div>"), function(ele) return ele.tagName.toLowerCase() == "div");
-		eq(div.tagName.toLowerCase(), "div");
-	}
-
-	function testHelper() {
-		var j = J("<div id='test'></div>");
-		j.each(function(i,e){
-			eq(JTHIS.attr("id"), "test");
-		});
-	}
-
-	function testVersion() {
-		var versionStr:String = JQuery.fn.jquery;
-		var v = versionStr.split(".");
-		eq(v.length, 3);
-		eq(haxe.macro.Compiler.getDefine("jquery_ver"), v[0] + StringTools.lpad(v[1], "0", 2) + StringTools.lpad(v[2], "0", 2));
-	}
-
-}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestJava.hx b/tests/unit/src/unit/TestJava.hx
index 9c8a3d1662635c91c07ef5a1c3dce18b11eb4f7c..207043b0818563a24699eb75944152765fe0acca 100644
--- a/tests/unit/src/unit/TestJava.hx
+++ b/tests/unit/src/unit/TestJava.hx
@@ -115,16 +115,16 @@ class TestJava extends Test
 		f(es1.contains(TA));
 		es1.add(TA);
 		t(es1.contains(TA));
-		var es2 = EnumSet.of(HA,HB);
-		t(es2.contains(HA));
-		t(es2.contains(HB));
-		f(es2.contains(HC));
+		// var es2 = EnumSet.of(HA,HB);
+		// t(es2.contains(HA));
+		// t(es2.contains(HB));
+		// f(es2.contains(HC));
 	}
 
 	function testHaxeKeywords()
 	{
 		eq(Base._inline, 42);
-		eq(Base._callback, 43);
+		eq(Base.callback, 43);
 		eq(Base._cast, 44);
 		eq(Base._untyped, 45);
 		eq(Base._in, 46);
diff --git a/tests/unit/src/unit/TestJson.hx b/tests/unit/src/unit/TestJson.hx
index 7c82b857dd1316d8db3c0d961c1f1402326d40d1..1509dfeab89f41402f6c96de6c8ebc4420aabc08 100644
--- a/tests/unit/src/unit/TestJson.hx
+++ b/tests/unit/src/unit/TestJson.hx
@@ -48,11 +48,6 @@ class TestJson extends Test {
 
 	// TODO: test pretty-printing (also with objects with skipped function fields!)
 	function testHaxeJson() {
-		#if php
-		// php's haxe.Utf8 uses mbstring
-		if (untyped __call__("extension_loaded", "mbstring")) {
-		#end
-
 		var str = haxe.format.JsonPrinter.print( { x : -4500, y : 1.456, a : ["hello", "wor'\"\n\t\rd"], b : function() {} } );
 		str = str.substr(1, str.length - 2); // remove {}
 		var parts = str.split(",");
@@ -88,16 +83,14 @@ class TestJson extends Test {
 		deepId( {array: mix} );
 
 		eq( haxe.format.JsonParser.parse('"\\u00E9"'), "é" );
+		//exc(() -> haxe.format.JsonParser.parse('{"""a": 1}'));
+		exc( function() haxe.format.JsonParser.parse('{"""a": 1}'));
 
 		eq(haxe.format.JsonPrinter.print(Math.POSITIVE_INFINITY), "null");
 		eq(haxe.format.JsonPrinter.print(Math.NEGATIVE_INFINITY), "null");
 		eq(haxe.format.JsonPrinter.print(Math.NaN), "null");
 		eq(haxe.format.JsonPrinter.print(function() {}), "\"<fun>\"");
 		eq(haxe.format.JsonPrinter.print({a: function() {}, b: 1}), "{\"b\":1}");
-
-		#if php
-		}
-		#end
 	}
 
 	function test3690() {
@@ -106,4 +99,22 @@ class TestJson extends Test {
 		eq( parsed.x, -4500 );
 		eq( parsed.y, 1.456 );
 	}
+
+	function test8593_stringifyNestedObjects() {
+		var src = {
+			one: {
+				two: "three"
+			}
+		};
+		eq('{"one":{"two":"three"}}', haxe.Json.stringify(src));
+	}
+
+	#if (!neko && (cpp && !cppia && !hxcpp_smart_strings))
+	function test8228() {
+		var strJson = haxe.Json.stringify("👽");
+		t(strJson == '"👽"' || strJson == '"\\ud83d\\udc7d"');
+		eq( haxe.Json.parse('"👽"'), "👽" );
+		eq( haxe.Json.parse('"\\ud83d\\udc7d"'), "👽" );
+	}
+	#end
 }
diff --git a/tests/unit/src/unit/TestKeyValueIterator.hx b/tests/unit/src/unit/TestKeyValueIterator.hx
new file mode 100644
index 0000000000000000000000000000000000000000..94ced7dffd7e522468e3dc34d8052667de0b849d
--- /dev/null
+++ b/tests/unit/src/unit/TestKeyValueIterator.hx
@@ -0,0 +1,110 @@
+package unit;
+
+using unit.TestKeyValueIterator.BoolExtension;
+
+import haxe.ds.StringMap;
+
+private class MyStringMap<T> {
+	var map:StringMap<T>;
+	public function new() {
+		map = new StringMap();
+	}
+
+	public function set(key:String, value:T) {
+		map.set(key, value);
+	}
+
+	public function keyValueIterator():KeyValueIterator<String, T> {
+		var a = [];
+		for (key in map.keys()) {
+			a.push({key: key, value: map.get(key)});
+		}
+		a.sort((a, b) -> Reflect.compare(a.key, b.key));
+		return a.iterator();
+	}
+}
+
+private class MyWeirdIterator {
+	var theresMore:Bool;
+	public function new() {
+		theresMore = true;
+	}
+
+	public function hasNext() return theresMore;
+	public function next() {
+		theresMore = false;
+		return {key: 1, value: "foo"};
+	}
+}
+
+private class MyNotIterable {
+	public function new() { }
+
+	public function keyValueIterator() return 1;
+}
+
+private class MyNotIterator {
+	public function new() { }
+
+	public function hasNext() return 1;
+	public function next() {
+		return {key: 1, value: "foo"};
+	}
+}
+
+class BoolExtension {
+	static public function keyValueIterator(b:Bool) {
+		return [{key: b, value: b}].iterator();
+	}
+}
+
+class TestKeyValueIterator extends Test {
+	function testIterable() {
+		var map = new MyStringMap();
+		map.set("1", "foo");
+		map.set("2", "bar");
+		var buf = new StringBuf();
+		for (key => value in map) {
+			buf.add(key);
+			buf.add(value);
+			buf.add(";");
+		}
+		eq("1foo;2bar;", buf.toString());
+	}
+
+	function testIterator() {
+		var it = new MyWeirdIterator();
+		var buf = new StringBuf();
+		for (key => value in it) {
+			buf.add(key);
+			buf.add(value);
+			buf.add(";");
+		}
+		eq("1foo;", buf.toString());
+	}
+
+	function testStaticExtension() {
+		var buf = new StringBuf();
+		for (key => value in true) {
+			buf.add(key);
+			buf.add(value);
+			buf.add(";");
+		}
+		eq("truetrue;", buf.toString());
+	}
+
+	function testError1() {
+		var s = HelperMacros.typeErrorText(
+			for (key => value in 1) { }
+		);
+		eq("Int has no field keyValueIterator", s);
+	}
+
+	function testError2() {
+		t(HelperMacros.typeError(for (key => value in new MyNotIterator()) { }));
+	}
+
+	function testError3() {
+		t(HelperMacros.typeError(for (key => value in new MyNotIterable()) { }));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestMacro.hx b/tests/unit/src/unit/TestMacro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b9cb915c28ca5a38ca7242b3a06df2df70951279
--- /dev/null
+++ b/tests/unit/src/unit/TestMacro.hx
@@ -0,0 +1,70 @@
+package unit;
+
+import unit.HelperMacros.parseAndPrint;
+
+class TestMacro extends Test {
+	function testPrinter() {
+		parseAndPrint("1");
+		parseAndPrint("a[b]");
+		parseAndPrint("a + b");
+		parseAndPrint("a.b");
+		parseAndPrint("(a)");
+		parseAndPrint("{ a : b }");
+		parseAndPrint("{ \"a\" : b }");
+		parseAndPrint("[]");
+		parseAndPrint("[a]");
+		parseAndPrint("[a, b]");
+		parseAndPrint("a()");
+		parseAndPrint("a(b)");
+		parseAndPrint("a(b, c)");
+		parseAndPrint("new A()");
+		parseAndPrint("new A(a)");
+		parseAndPrint("new A(a, b)");
+		parseAndPrint("new A<A>()");
+		parseAndPrint("new A<A>(a)");
+		parseAndPrint("new A<A>(a, b)");
+		parseAndPrint("new A<A, B>()");
+		parseAndPrint("new A<A, B>(a)");
+		parseAndPrint("new A<A, B>(a, b)");
+		parseAndPrint("--a");
+		parseAndPrint("++a");
+		parseAndPrint("-a");
+		parseAndPrint("!a");
+		parseAndPrint("~a");
+		parseAndPrint("a--");
+		parseAndPrint("a++");
+		parseAndPrint("a!");
+		parseAndPrint("var a");
+		parseAndPrint("var a:A");
+		parseAndPrint("var a = b");
+		parseAndPrint("var a:A = b");
+		parseAndPrint("function() { }");
+		parseAndPrint("for (a in b) { }");
+		parseAndPrint("if (a) b");
+		parseAndPrint("if (a) b else c");
+		parseAndPrint("while (a) b");
+		parseAndPrint("do a while (b)");
+		parseAndPrint("return");
+		parseAndPrint("return a");
+		parseAndPrint("break");
+		parseAndPrint("continue");
+		parseAndPrint("untyped a");
+		parseAndPrint("throw a");
+		parseAndPrint("cast a");
+		parseAndPrint("cast(a, B)");
+		parseAndPrint("a ? b : c");
+		// parseAndPrint("(a : B)"); // TODO
+		parseAndPrint("@:meta a");
+		parseAndPrint("@:meta(a) b");
+		parseAndPrint("@:meta(a, b) b");
+		// new function syntax
+		parseAndPrint("var a:(x:X, y:Y) -> Z");
+		parseAndPrint("var a:(X, Y) -> Z");
+		parseAndPrint("var a:() -> A");
+		parseAndPrint("var a:() -> (() -> A)");
+		parseAndPrint("var a:(x:(y:Y) -> Z) -> A");
+		// special case with 1 argument
+		parseAndPrint("var a:X -> Y");
+		parseAndPrint("var a:(X) -> Y");
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestMain.hx b/tests/unit/src/unit/TestMain.hx
index cdf40f6ec95e85694fae89ccc3b190bc3dcd39fe..8e72030ff82169a912dfcb43afdcd10281e70243 100644
--- a/tests/unit/src/unit/TestMain.hx
+++ b/tests/unit/src/unit/TestMain.hx
@@ -1,6 +1,9 @@
 package unit;
 
+import utest.ui.Report;
+import utest.Runner;
 import unit.Test.*;
+import haxe.ds.List;
 
 @:access(unit.Test)
 @:expose("unit.TestMain")
@@ -10,15 +13,19 @@ class TestMain {
 	static var asyncWaits = new Array<haxe.PosInfos>();
 	static var asyncCache = new Array<Void -> Void>();
 
-	#if js
-	static function nodejsMain() {
-		main();
-		(untyped process).exit(Test.success ? 0 : 1);
-	}
-	#end
-
 	static function main() {
-	  var verbose = #if ( cpp || neko || php ) Sys.args().indexOf("-v") >= 0 #else false #end;
+		#if js
+		if (js.Browser.supported) {
+			var oTrace = haxe.Log.trace;
+			var traceElement = js.Browser.document.getElementById("haxe:trace");
+			haxe.Log.trace = function(v, ?infos) {
+				oTrace(v, infos);
+				traceElement.innerHTML += infos.fileName + ":" + infos.lineNumber + ": " + StringTools.htmlEscape(v) + "<br/>";
+			}
+		}
+		#end
+
+		var verbose = #if ( cpp || neko || php ) Sys.args().indexOf("-v") >= 0 #else false #end;
 
 		#if cs //"Turkey Test" - Issue #996
 		cs.system.threading.Thread.CurrentThread.CurrentCulture = new cs.system.globalization.CultureInfo('tr-TR');
@@ -31,7 +38,6 @@ class TestMain {
 		if( php.Web.isModNeko )
 			php.Web.setHeader("Content-Type","text/plain");
 		#end
-		resetTimer();
 		#if !macro
 		trace("Generated at: " + HelperMacros.getCompilationDate());
 		#end
@@ -55,15 +61,22 @@ class TestMain {
 			new TestInt64(),
 			new TestReflect(),
 			new TestSerialize(),
+			new TestSerializerCrossTarget(),
 			new TestMeta(),
 			new TestType(),
 			new TestOrder(),
 			new TestGADT(),
 			new TestGeneric(),
+			new TestArrowFunctions(),
+			new TestCasts(),
+			new TestSyntaxModule(),
+			new TestNull(),
+			#if (!no_http && (!azure || !(php && Windows)))
+			new TestHttp(),
+			#end
 			#if !no_pattern_matching
 			new TestMatch(),
 			#end
-			new TestSpecification(),
 			#if cs
 			new TestCSharp(),
 			#end
@@ -85,62 +98,45 @@ class TestMain {
 			#if (java || cs)
 			new TestOverloads(),
 			#end
-			// #if ((dce == "full") && !interp && !as3)
-			// new TestDCE(),
-			// #end
-			// #if ( (java || neko) && !macro && !interp)
-			// new TestThreads(),
-			// #end
+			new TestInterface(),
+			new TestNaN(),
+			#if ((dce == "full") && !interp && !as3)
+			new TestDCE(),
+			#end
+			new TestMapComprehension(),
+			new TestMacro(),
+			new TestKeyValueIterator(),
+			new TestFieldVariance()
 			//new TestUnspecified(),
 			//new TestRemoting(),
 		];
 
-
-		#if js
-		if (js.Browser.supported) {
-			classes.push(new TestJQuery());
+		for (specClass in unit.UnitBuilder.generateSpec("src/unitstd")) {
+			classes.push(specClass);
 		}
-		#end
-
 		TestIssues.addIssueClasses("src/unit/issues", "unit.issues");
 		TestIssues.addIssueClasses("src/unit/hxcpp_issues", "unit.hxcpp_issues");
-		var current = null;
-		#if (!fail_eager)
-		try
-		#end
-		{
-			asyncWaits.push(null);
-			for( inst in classes ) {
-				current = Type.getClass(inst);
-			if (verbose)
-			   logVerbose("Class " + Std.string(current) );
-				for( f in Type.getInstanceFields(current) )
-					if( f.substr(0,4) == "test" ) {
-				  if (verbose)
-					 logVerbose("   " + f);
-						#if fail_eager
-						Reflect.callMethod(inst,Reflect.field(inst,f),[]);
-						#else
-						try {
-							Reflect.callMethod(inst,Reflect.field(inst,f),[]);
-						}
-						#if !as3
-						catch( e : Dynamic ) {
-							onError(e,"EXCEPTION",Type.getClassName(current)+"."+f);
-						}
-						#end
-						#end
-						reportInfos = null;
-					}
-			}
-			asyncWaits.remove(null);
-			checkDone();
-		}
-		#if (!as3 && !(fail_eager))
-		catch( e : Dynamic ) {
-			asyncWaits.remove(null);
-			onError(e,"ABORTED",Type.getClassName(current));
+
+		var runner = new Runner();
+		for (c in classes) {
+			runner.addCase(c);
 		}
+		var report = Report.create(runner);
+		report.displayHeader = AlwaysShowHeader;
+		report.displaySuccessResults = NeverShowSuccessResults;
+		#if js
+		if (js.Browser.supported) {
+			runner.onComplete.add(function(_) {
+				untyped js.Browser.window.success = true; // TODO: need utest success state for this
+			});
+		};
+		#end
+		#if sys
+		if (verbose)
+			runner.onTestStart.add(function(test) {
+				Sys.println(' $test...'); // TODO: need utest success state for this
+			});
 		#end
+		runner.run();
 	}
 }
diff --git a/tests/unit/src/unit/TestMapComprehension.hx b/tests/unit/src/unit/TestMapComprehension.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6911eef036dbd5bf1827642b0be6dd805eadc232
--- /dev/null
+++ b/tests/unit/src/unit/TestMapComprehension.hx
@@ -0,0 +1,36 @@
+package unit;
+
+class TestMapComprehension extends unit.Test {
+	public function testBasic() {
+		mapEq([for (i in 0...2) i => i], [0 => 0, 1 => 1]);
+		mapEq([for (i in 0...2) (i => i)], [0 => 0, 1 => 1]);
+		// mapEq([for (i in 0...2) cast i => i], [0 => 0, 1 => 1]);
+		// mapEq([for (i in 0...2) untyped i => i], [0 => 0, 1 => 1]);
+		mapEq([for (i in 0...2) if (i == 1) i => i], [1 => 1]);
+		// mapEq([for (i in 0...2) if (i == 0) i => i else i => i * 2], [0 => 0, 1 => 2]);
+		// mapEq([for (i in 0...2) (i == 0) ? i => i : i => i * 2], [0 => 0, 1 => 2]);
+		// mapEq([for (i in 0...2) switch i { case 0: i => i; case _: i => i * 2; }], [0 => 0, 1 => 2]);
+		// mapEq([for (i in 0...2) try i => i catch(e:Dynamic) i => i * 2], [0 => 0, 1 => 1]);
+		// mapEq([for (i in 0...2) try { throw null; i => i; } catch(e:Dynamic) i => i * 2], [0 => 0, 1 => 2]);
+		// mapEq([for (i in 0...2) try { throw null; } catch(e:Dynamic) i => i * 2], [0 => 0, 1 => 2]);
+
+		// mapEq([for (i in 0...2) { continue; i => i; }], new Map<Int, Int>());
+	}
+
+	// public function testMark() {
+	// 	var specialValue = null;
+	// 	function doSomething(i:Int) specialValue = ("special" + i);
+	// 	var m = [for(i in 0...3) if (i != 1) i => 'number $i' else { doSomething(i); continue; }];
+	// 	mapEq(m, [0 => "number 0", 2 => "number 2"]);
+	// 	eq(specialValue, "special1");
+	// }
+
+	function mapEq<K, V>(m1:Map<K, V>, m2:Map<K, V>, ?p:haxe.PosInfos) {
+		for (k1 in m1.keys()) {
+			eq(m1[k1], m2[k1], p);
+		}
+		for (k2 in m2.keys()) {
+			eq(m1[k2], m2[k2], p);
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestMatch.hx b/tests/unit/src/unit/TestMatch.hx
index 0699f97f88cf6f8303e1750aa2923b9cc8029b2f..9700d32422a383c0c315b7d7a1d9a3ca71c57035 100644
--- a/tests/unit/src/unit/TestMatch.hx
+++ b/tests/unit/src/unit/TestMatch.hx
@@ -46,7 +46,7 @@ class TestMatch extends Test {
 				s;
 			case EArray(_, { expr : EConst(CInt(i) | CFloat(i)) } ):
 				Std.string(i);
-			case EIn(_, { expr : e, pos : _ }) :
+			case EBinop(OpIn, _, { expr : e, pos : _ }) :
 				Std.string(e);
 			case _:
 				"not_found";
@@ -82,7 +82,7 @@ class TestMatch extends Test {
 			case ["b"]: "2";
 			case [a]: "3:" + a;
 			case [a, b]: "4:" + a + "," +b;
-			case a if (a.length == 3): "5:" + a.length;
+			case var a if (a.length == 3): "5:" + a.length;
 			case []: "6";
 			case _: "7";
 		}
@@ -125,7 +125,7 @@ class TestMatch extends Test {
 		return switch(cl) {
 			case String: "String";
 			case MyClass: "unit.MyClass";
-			case a: "other: " +Type.getClassName(a);
+			case var a: "other: " +Type.getClassName(a);
 		}
 	}
 
@@ -147,7 +147,7 @@ class TestMatch extends Test {
 		eq("[]", switchArray(macro []));
 		eq("_", switchArray(macro 2));
 		eq("[EConst(CInt(22))]", switchArray(macro [22]));
-		eq("[EConst(CInt(22)),EConst(CString(foo))]", switchArray(macro [22,"foo"]));
+		eq("[EConst(CInt(22)),EConst(CString(foo,DoubleQuotes))]", switchArray(macro [22,"foo"]));
 		eq("_", switchArray(macro [22, "foo", "bar"]));
 
 		eq("0", switchArray2(["a", "b"]));
@@ -160,7 +160,7 @@ class TestMatch extends Test {
 		eq("6", switchArray2([]));
 		eq("7", switchArray2(["a", "a", "a", "b"]));
 
-		eq("EConst(CString(foobar)):12", switchCrazy(macro untyped ("foobar"[12])));
+		eq("EConst(CString(foobar,DoubleQuotes)):12", switchCrazy(macro untyped ("foobar"[12])));
 
 		eq("1", switchGuard(macro "foobar"));
 		eq("2", switchGuard(macro "barfoo"));
@@ -231,7 +231,7 @@ class TestMatch extends Test {
 			case val = (4 | 5 | 6) if (val == 5): "1";
 			case 4, 5, 6: "2";
 			case 8, 9: "3";
-			case x: '_:$x';
+			case var x: '_:$x';
 		}
 		var results = ["_:0", "0", "0", "0", "2", "1", "2", "_:7", "3", "3", "_:10"];
 		for (i in 0...results.length) {
@@ -496,7 +496,7 @@ class TestMatch extends Test {
 			return switch(i) {
 				case [x]: 1;
 				case isPair(_) => Some(p) : p.a+p.b;
-				case arr: 3;
+				case var arr: 3;
 			}
 		}
 
@@ -552,7 +552,7 @@ class TestMatch extends Test {
 				case isPair(_) => Some({ a : is(even)(_) => Some(a), b : b }) : a+b;
 				case isPair(_) => Some({ a : isNot(even)(_) => Some(a), b : b }) : a*b;
 				case testArgs(1, "foo", _) => "[99,98,97]": 99;
-				case arr: 3;
+				case var arr: 3;
 			}
 		}
 
diff --git a/tests/unit/src/unit/TestMisc.hx b/tests/unit/src/unit/TestMisc.hx
index 6f81a3d8c1779285af9ac3a078d11a05f3668744..26585931da1638d8e592688176ecf7c5362052ad 100644
--- a/tests/unit/src/unit/TestMisc.hx
+++ b/tests/unit/src/unit/TestMisc.hx
@@ -227,7 +227,7 @@ class TestMisc extends Test {
 		eq( bar(), 50);
 	}
 
-	function id(x) {
+	function id<T>(x:T) {
 		return x;
 	}
 
@@ -253,14 +253,14 @@ class TestMisc extends Test {
 		eq( inst.add.bind(1)(2), 103 );
 		eq( add(1,2), 103 );
 
-		// check overriden dynamic method
+		// check overridden dynamic method
 		var inst = new MyDynamicSubClass(100);
 		var add = inst.add;
 		eq( inst.add(1,2), 206 );
 		eq( inst.add.bind(1)(2), 206 );
 		eq( add(1,2), 206 );
 
-		// check overriden dynamic method
+		// check overridden dynamic method
 		var inst = new MyDynamicSubClass2(100);
 		var add = inst.add;
 		eq( inst.add(1,2), 206 );
@@ -289,6 +289,16 @@ class TestMisc extends Test {
 		eq( MyDynamicClass.staticDynamic(1,2), 103 );
 	}
 
+	function testMakeVarArgs () {
+		var f = function (a:Array<Dynamic>) {
+			eq(a.length, 2);
+			return a[0] + a[1];
+		}
+		var g = Reflect.makeVarArgs(f);
+		var res = g(1,2);
+		eq(3, res);
+	}
+
 	function testMD5() {
 		eq( haxe.crypto.Md5.encode(""), "d41d8cd98f00b204e9800998ecf8427e" );
 		eq( haxe.crypto.Md5.encode("hello"), "5d41402abc4b2a76b9719d911017c592" );
@@ -309,6 +319,16 @@ class TestMisc extends Test {
 	}
 
 	function testBaseCode() {
+		// base64
+		eq("SMOpbGxvdw==", haxe.crypto.Base64.encode(haxe.io.Bytes.ofString("Héllow")));
+		eq("SMOpbGxvdw", haxe.crypto.Base64.encode(haxe.io.Bytes.ofString("Héllow"), false));
+		eq("SMOpbGxv", haxe.crypto.Base64.encode(haxe.io.Bytes.ofString("Héllo")));
+		eq("SMOpbGw=", haxe.crypto.Base64.encode(haxe.io.Bytes.ofString("Héll")));
+		eq("Héllow", haxe.crypto.Base64.decode("SMOpbGxvdw==").toString());
+		eq("Héllow", haxe.crypto.Base64.decode("SMOpbGxvdw", false).toString());
+		eq("Héllo", haxe.crypto.Base64.decode("SMOpbGxv").toString());
+		eq("Héll", haxe.crypto.Base64.decode("SMOpbGw=").toString());
+
 		// alternative base64
 		var b = new haxe.crypto.BaseCode(haxe.io.Bytes.ofString("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-"));
 		eq( b.encodeString("Héllow"), "iceFr6NLtM" );
@@ -380,14 +400,14 @@ class TestMisc extends Test {
 		eq( opt3(7.4).y, 7.4 );
 
 		eq( opt4(), 11 );
-		#if !(flash || cpp || cs || java || hl)
+		#if !static
 		eq( opt4(null), 11 );
 		#end
 
 		var opt4b : ?Int -> Null<Int> = opt4;
 		eq( opt4b(), 11 );
 		eq( opt4b(3), 4 );
-		#if !(flash || cpp || cs || java || hl)
+		#if !static
 		eq( opt4b(null), 11 );
 		#end
 
diff --git a/tests/unit/src/unit/TestNaN.hx b/tests/unit/src/unit/TestNaN.hx
new file mode 100644
index 0000000000000000000000000000000000000000..189eb5340e01afdc02259f019215e6ff8410ab50
--- /dev/null
+++ b/tests/unit/src/unit/TestNaN.hx
@@ -0,0 +1,49 @@
+package unit;
+
+class TestNaN extends Test {
+
+	static function foo() {
+		return Math.NaN;
+	}
+
+	static function id( b : Bool ) {
+		return b;
+	}
+
+	function testNanIfs() {
+		var a = foo();
+
+		if( a > 0 ) assert();
+		if( a >= 0 ) assert();
+		if( a < 0 ) assert();
+		if( a <= 0 ) assert();
+		if( a == 0 ) assert();
+		if( a == a ) assert();
+
+		if( a > 1 ) assert();
+		if( a < 1 ) assert();
+		if( a == 1 ) assert();
+
+		if( a > -1 ) assert();
+		if( a < -1 ) assert();
+		if( a == -1 ) assert();
+
+		if( !(a > 0) ) {} else assert();
+		if( !(a >= 0) ) {} else assert();
+		if( !(a < 0) ) {} else assert();
+		if( !(a <= 0) ) {} else assert();
+		if( !(a == 0) ) {} else assert();
+		if( !(a == a) ) {} else assert();
+
+		if( id(a > 0) ) assert();
+		if( id(a >= 0) ) assert();
+		if( id(a < 0) ) assert();
+		if( id(a <= 0) ) assert();
+		if( id(a == 0) ) assert();
+		if( id(a == a) ) assert();
+
+		if( a < 0 || a > 0 ) assert();
+		if( a < 0 && a > 0 ) assert();
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestNull.hx b/tests/unit/src/unit/TestNull.hx
new file mode 100644
index 0000000000000000000000000000000000000000..475ecd7af99b2bce6768500a147470efe88e8cfc
--- /dev/null
+++ b/tests/unit/src/unit/TestNull.hx
@@ -0,0 +1,10 @@
+package unit;
+
+class TestNull extends Test {
+	var ni:Null<Int> = null; // a field to prevent local optimizations
+
+	function test() {
+		f(ni == 0);
+		f(0 == ni);
+	}
+}
diff --git a/tests/unit/src/unit/TestOps.hx b/tests/unit/src/unit/TestOps.hx
index 4fc559793103b1adda056f5df5a684286e0ac21d..5893cb068b77fcfa4bf1a08ca31d4def6389cba2 100644
--- a/tests/unit/src/unit/TestOps.hx
+++ b/tests/unit/src/unit/TestOps.hx
@@ -39,6 +39,7 @@ class TestOps extends Test {
 		eq( 2 << 3 >> 1, 8 );
 		eq( (2 << 3) >> 1, 8 );
 		eq( 2 << (3 >> 1), 4 );
+		eq( (getA().a + 1) >> 1, 1 );
 
 		f( (1 & 0x8000) != 0 );
 		f( 1 & 0x8000 != 0 );
@@ -98,4 +99,6 @@ class TestOps extends Test {
 		eq(5 * @foo @bar 3 + @baz 4, 19);
 	}
 
+	static function getA() return { a:1 };
+
 }
diff --git a/tests/unit/src/unit/TestPhp.hx b/tests/unit/src/unit/TestPhp.hx
index 5f6bdab0f84299777f22c810ff03f58c66f1ca2d..3eafa9a512a41c0eb6697509e671dd01f8ffccb6 100644
--- a/tests/unit/src/unit/TestPhp.hx
+++ b/tests/unit/src/unit/TestPhp.hx
@@ -35,6 +35,16 @@ class TestPhp extends Test
 		t(true);
 	}
 
+	var switchVal = "1";
+	function testIssue7257_looseSwitchComparison() {
+		var result = switch (switchVal) {
+			case "01": false;
+			case "1": true;
+			default: false;
+		}
+		t(result);
+	}
+
 	function testIssue1828() {
 		var x = try {
 			throw "foo";
@@ -54,19 +64,6 @@ class TestPhp extends Test
 		f(Class2146.test());
 	}
 
-	function testStupidShit9000() {
-		var f = make();
-		f.handle( function() {
-			eq("ok", "ok");
-		});
-	}
-
-	inline static function make():FunctionCallerWrapper {
-		return new FunctionCaller(function(f) f());
-	}
-
-#if php7
-
 	function testIssue6698() {
 		var arr = new NativeAssocArray<Dynamic>();
 		var innerArr = new NativeAssocArray<Int>();
@@ -81,6 +78,17 @@ class TestPhp extends Test
 		eq(2, innerObj.two);
 	}
 
+	function testStupidShit9000() {
+		var f = make();
+		f.handle( function() {
+			eq("ok", "ok");
+		});
+	}
+
+	inline static function make():FunctionCallerWrapper {
+		return new FunctionCaller(function(f) f());
+	}
+
 	/**
 		Check compiler will generate proper function signature with `Ref<T>` arguments
 	**/
@@ -129,7 +137,184 @@ class TestPhp extends Test
 		eq(result, 'nullb');
 	}
 	function add(a:Dynamic, b:Dynamic):Dynamic return a + b;
-#end
+
+	function testStringClosureType() {
+		var fn:Dynamic = 'foo'.toUpperCase;
+		var className = Type.getClassName(Type.getClass(fn)).split('.').pop();
+		eq('HxDynamicStr', className);
+		eq('FOO', fn());
+	}
+
+	function testStringAsAnon() {
+		var str = 'bar';
+		var anon:{
+			function toUpperCase() : String;
+			function toLowerCase() : String;
+			function charAt( index : Int) : String;
+			function indexOf( str : String, ?startIndex : Int ) : Int;
+			function lastIndexOf( str : String, ?startIndex : Int ) : Int;
+			function split( delimiter : String ) : Array<String>;
+			function toString() : String;
+			function substring( startIndex : Int, ?endIndex : Int ) : String;
+			function charCodeAt( index : Int) : Null<Int> ;
+			function substr( pos : Int, ?len : Int ) : String ;
+		} = str;
+
+		eq(str.charAt(0), anon.charAt(0));
+		eq(str.charCodeAt(0), anon.charCodeAt(0));
+		eq(str.indexOf("a"), anon.indexOf("a"));
+		eq(str.lastIndexOf("r"), anon.lastIndexOf("r"));
+		eq(str.split("a")[1], anon.split("a")[1]);
+		eq(str.substr(1),anon.substr(1, 2));
+		eq(str.substring(0, 2), anon.substring(0, 2));
+		eq(str, anon.toLowerCase());
+		eq(str.toUpperCase(), anon.toUpperCase());
+		eq(str.toString(), anon.toString());
+	}
+
+	function testClosureComparison() {
+		var fn1:Void->Void;
+		var fn2:Void->Void;
+		eq(ClosureDummy.testStatic, ClosureDummy.testStatic);
+		//Waiting for a fix: https://github.com/HaxeFoundation/haxe/issues/6719
+		// t(ClosureDummy.testStatic == ClosureDummy.testStatic);
+		t((ClosureDummy:Dynamic).testStatic == (ClosureDummy:Dynamic).testStatic);
+		fn1 = (ClosureDummy:Dynamic).testStatic;
+		fn2 = (ClosureDummy:Dynamic).testStatic;
+		t(fn1 == fn2);
+
+		var inst = new ClosureDummy();
+		eq(inst.test, inst.test);
+		//Waiting for a fix: https://github.com/HaxeFoundation/haxe/issues/6719
+		// t(inst.test == inst.test);
+		t((inst:Dynamic).test == (inst:Dynamic).test);
+		fn1 = (inst:Dynamic).test;
+		fn2 = (inst:Dynamic).test;
+		t(fn1 == fn2);
+		var a = [fn1];
+		t(a.indexOf(fn2) == 0);
+		t(a.remove(fn2));
+
+		var inst2 = new ClosureDummy();
+		//Waiting for a fix: https://github.com/HaxeFoundation/haxe/issues/6719
+		// f(inst.test == inst2.test);
+		a = [fn1];
+		fn2 = (inst2:Dynamic).test;
+		t(a.indexOf(fn2) < 0);
+		f(a.remove(fn2));
+	}
+
+	function testSyntaxInstanceof() {
+		var o = new ClosureDummy();
+		var phpClassName = Boot.castClass(ClosureDummy).phpClassName;
+		t(Syntax.instanceof(o, ClosureDummy));
+		t(Syntax.instanceof(o, phpClassName));
+	}
+
+	var a = 2;
+	function testSyntaxCodeParens() {
+		eq(8, Syntax.code("{0} * {1}", a, a + a));
+	}
+
+	@:analyzer(no_user_var_fusion)
+	function testSyntaxNativeClassName() {
+		var phpPrefix = #if php_prefix Boot.getPrefix() + "\\" #else "" #end;
+		eq(phpPrefix + "Array_hx", Syntax.nativeClassName(Array));
+		eq(phpPrefix + "unit\\Annotation", Syntax.nativeClassName(Annotation));
+		var cls = php.Web;
+		eq(phpPrefix + "php\\Web", Syntax.nativeClassName(cls));
+		var enm = Annotation;
+		eq(phpPrefix + "unit\\Annotation", Syntax.nativeClassName(enm));
+	}
+
+	function testNativeString() {
+		var expected:php.NativeString = '123456';
+
+		var actual = '';
+		for(c in expected) {
+			actual += c;
+		}
+		eq(expected, actual);
+
+		var actual = '';
+		var keys = [];
+		for(i => c in expected) {
+			keys.push(i);
+			actual += c;
+		}
+		eq(expected, actual);
+		aeq([0, 1, 2, 3, 4, 5], keys);
+	}
+
+	function testNativeArray() {
+		var keys:Array<Dynamic> = ['hello', 12];
+		var values:Array<Dynamic> = [10, 'world'];
+		var a = new php.NativeArray();
+		for(i in 0...keys.length) {
+			a[keys[i]] = values[i];
+		}
+
+		var actualValues = [for(v in a) v];
+		aeq(values, actualValues);
+
+		var actualKeys:Array<Dynamic> = [];
+		var actualValues:Array<Dynamic> = [];
+		for(k => v in a) {
+			actualKeys.push(k);
+			actualValues.push(v);
+		}
+		aeq(keys, actualKeys);
+		aeq(values, actualValues);
+	}
+
+	function testNativeIndexedArray() {
+		var expected = [10, 20, 30];
+		var a = new NativeIndexedArray<Int>();
+		for(v in expected) {
+			a.push(v);
+		}
+
+		var actual = [for(v in a) v];
+		aeq(expected, actual);
+
+		var indexes = [];
+		var values = [];
+		for(i => v in a) {
+			indexes.push(i);
+			values.push(v);
+		}
+		aeq([for(i in 0...expected.length) i], indexes);
+		aeq(expected, values);
+
+		eq('[10,20,30]', Std.string(a));
+	}
+
+	function testNativeAssocArray() {
+		var keys = ['one', 'two'];
+		var values = [1, 2];
+		var a = new NativeAssocArray<Int>();
+		for(i in 0...keys.length) {
+			a[keys[i]] = values[i];
+		}
+
+		var actualValues = [for(v in a) v];
+		aeq(values, actualValues);
+
+		var actualKeys = [];
+		var actualValues = [];
+		for(k => v in a) {
+			actualKeys.push(k);
+			actualValues.push(v);
+		}
+		aeq(keys, actualKeys);
+		aeq(values, actualValues);
+	}
+}
+
+private class ClosureDummy {
+	static public function testStatic() {}
+	public function new() {}
+	public function test() {}
 }
 
 private class DummyForRef {
diff --git a/tests/unit/src/unit/TestPython.hx b/tests/unit/src/unit/TestPython.hx
index 1e1f2db23b5f7d26b17968aef91cae12b59ab189..b6f7d0af7b2395f88665e6064470217a2a07bceb 100644
--- a/tests/unit/src/unit/TestPython.hx
+++ b/tests/unit/src/unit/TestPython.hx
@@ -51,8 +51,8 @@ import python.lib.io.RawIOBase;
 import python.lib.io.StringIO;
 import python.lib.io.TextIOBase;
 
-import python.lib.net.Address;
-import python.lib.net.Socket;
+import python.lib.socket.Address;
+import python.lib.socket.Socket;
 
 import python.lib.subprocess.Popen;
 
@@ -67,7 +67,7 @@ import python.lib.json.JSONEncoder;
 
 private typedef T = {
 	var value:Int;
-	@:optional var maybeValue:Int;
+	var ?maybeValue:Int;
 }
 
 private enum MyEnum {
@@ -99,6 +99,7 @@ class TestPython extends Test {
 
 	public function testKeywords () {
 		var list = new Array();
+		noAssert();
 	}
 
 	public function testStringMethod() {
@@ -205,16 +206,6 @@ class TestPython extends Test {
 		eq(5, Reflect.field(x, "__iter__"));
 	}
 
-
-	function testMakeVarArgs () {
-		var f = function (a:Array<Dynamic>) {
-			return a[0] + a[1];
-		}
-		var g = Reflect.makeVarArgs(f);
-		var res = g(1,2);
-		eq(3, res);
-	}
-
 	function testKwArgsAfterVarArgs () {
 		function test (va:VarArgs<Dynamic>, kw:KwArgs<Dynamic>) {
 			var a = va.toArray();
@@ -319,12 +310,13 @@ class TestPython extends Test {
 		catch (e:Dynamic) {
 			e = 1;
 		}
+		noAssert();
 	}
 
 	var _s:String;
 
 	var s(get, null):String;
-	var s2(null, set_s2):String;
+	var s2(null, set):String;
 	var s3(get, set):String;
 
 	function get_s() return s;
@@ -350,18 +342,18 @@ class TestPython extends Test {
 
 	function testPythonCodeStringInterpolation () {
 		var z = 1;
-		var a = (Syntax.pythonCode('[{0}, {1}]', z, 2):Array<Int>);
+		var a = (Syntax.code('[{0}, {1}]', z, 2):Array<Int>);
 
 		eq(a[0], z);
 		eq(a[1], 2);
 
 		function test2 (x:Int) {
 			x += 1;
-			return (Syntax.pythonCode("{0}", x):Int);
+			return (Syntax.code("{0}", x):Int);
 		}
 
 		function test3 (x:Int) {
-			return (Syntax.pythonCode('[{0}]', x):Array<Int>);
+			return (Syntax.code('[{0}]', x):Array<Int>);
 		}
 
 		var x = 1;
@@ -370,15 +362,15 @@ class TestPython extends Test {
 		eq(1, x);
 		eq(1, test3(1)[0]);
 
-		eq("foo1bar", Syntax.pythonCode("'foo' + str({0}) + 'bar'", x));
+		eq("foo1bar", Syntax.code("'foo' + str({0}) + 'bar'", x));
 
 
 		function test4a (x:Int) {
-			return (Syntax.pythonCode("[{0}][0]", x+x):Int);
+			return (Syntax.code("[{0}][0]", x+x):Int);
 		}
 
 		function test4b (x:Int):String {
-			return Syntax.pythonCode('[{0}][0]', (function () return Std.string(x+x))() );
+			return Syntax.code('[{0}][0]', (function () return Std.string(x+x))() );
 		}
 
 		eq(2, test4a(1));
diff --git a/tests/unit/src/unit/TestReflect.hx b/tests/unit/src/unit/TestReflect.hx
index 8c29e0aefab236bc85cb8741c52339023125e822..60778d190477f0b472062b2f518e7bd6a9d696f9 100644
--- a/tests/unit/src/unit/TestReflect.hx
+++ b/tests/unit/src/unit/TestReflect.hx
@@ -1,12 +1,14 @@
 package unit;
+
+import haxe.ds.List;
 import Type;
 
 interface InterfWithProp {
-	public var x(get_x, set_x) : Int;
+	public var x(get, set) : Int;
 }
 
 class ClassWithProp implements InterfWithProp {
-	public var x(get_x, set_x) : Int;
+	public var x(get, set) : Int;
 	var _x : Int;
 
 	public function new() {
@@ -21,7 +23,7 @@ class ClassWithProp implements InterfWithProp {
 		return v;
 	}
 
-	public static var STAT_X(default, set_STAT_X) : Int;
+	public static var STAT_X(default, set) : Int;
 
 	static function set_STAT_X(v) {
 		STAT_X = v * 2;
@@ -85,7 +87,7 @@ class TestReflect extends Test {
 
 	static var TNAMES = [
 		"null","Int","String","Bool","Float",
-		"Array",u("haxe.ds.StringMap"),u("List"),"Date","Xml","Math",
+		"Array",u("haxe.ds.StringMap"),u("haxe.ds.List"),"Date","Xml","Math",
 		u2("unit","MyEnum"),u2("unit","MyClass"),u2("unit","MySubClass"),
 		#if !flash u #end("Class"), u("Enum"), u("Dynamic"),
 		u2("unit","MyInterface")
@@ -95,11 +97,10 @@ class TestReflect extends Test {
 		for( i in 1...TYPES.length ) {
 			var t : Dynamic = TYPES[i];
 			var name = TNAMES[i];
-			infos("type "+name);
 			f( t == null );
-			if( name == u("Enum") ) {
+			if( name == u("Enum") || name == u("Bool") || name == u("Int") || name == u("Float") || name == u("Class") || name == u("Dynamic") ) {
 				// neither an enum or a class
-			} else if( t == MyEnum || t == Bool ) {
+			} else if( t == MyEnum ) {
 				eq( Type.getEnumName(t), name );
 				eq( Type.resolveEnum(name), t );
 			} else {
@@ -107,11 +108,9 @@ class TestReflect extends Test {
 				eq( Type.resolveClass(name), t );
 			}
 		}
-		infos(null);
 	}
 
 	public function testIs() {
-		is(null,null);
 		is(0,Int,Float);
 		is(1,Int,Float);
 		is(-1,Int,Float);
@@ -144,16 +143,13 @@ class TestReflect extends Test {
 		is(function() { },null);
 		is(MyClass,Class);
 		is(MyEnum,Enum);
-		is(Class,Class);
 	}
 
 	function is( v : Dynamic, t1 : Dynamic, ?t2 : Dynamic, ?pos : haxe.PosInfos ){
 		for( i in 0...TYPES.length ) {
 			var c : Dynamic = TYPES[i];
-			infos(Std.string(v)+" is "+TNAMES[i]);
 			eq( Std.is(v,c), c != null && (c == t1 || c == t2) || (c == Dynamic), pos );
 		}
-		infos(null);
 		t( (v is Dynamic), pos );
 	}
 
@@ -204,7 +200,6 @@ class TestReflect extends Test {
 
 	function typeof( v : Dynamic, rt : ValueType, ?pos : haxe.PosInfos ) {
 		var vt = Type.typeof(v);
-		infos("typeof("+Std.string(v)+") = "+vt);
 		t( Type.enumEq(vt,rt), pos );
 	}
 
@@ -249,6 +244,8 @@ class TestReflect extends Test {
 		exc( function() Type.createEnum(MyEnum,"Z",[]) );
 	}
 
+	static function compareMethodsDummy() {}
+
 	function testCompareMethods() {
 		var a = new MyClass(0);
 		var b = new MyClass(1);
@@ -257,6 +254,8 @@ class TestReflect extends Test {
 		f( Reflect.compareMethods(a.add,a.get) );
 		f( Reflect.compareMethods(a.add,null) );
 		f( Reflect.compareMethods(null, a.add) );
+		t( Reflect.compareMethods(compareMethodsDummy, compareMethodsDummy) );
+		t( Reflect.compareMethods(String.fromCharCode, String.fromCharCode) );
 		/*
 			Comparison between a method and a closure :
 			Not widely supported atm to justify officiel support
diff --git a/tests/unit/src/unit/TestRemoting.hx b/tests/unit/src/unit/TestRemoting.hx
index 2dc4bfeb6ec0d9a982953174f63827efeb390899..31e1024b3c64767f3d41555b8769d450397bf10e 100644
--- a/tests/unit/src/unit/TestRemoting.hx
+++ b/tests/unit/src/unit/TestRemoting.hx
@@ -44,9 +44,7 @@ class TestRemoting extends Test {
 		#if (flash || js)
 		doTestConnection(ecnx);
 		#end
-		#if !php // accessing the properties of a null object generates a fatal error in php
 		exc(function() ecnx3.api.add.call([1,3]));
-		#end
 		#if js
 		doTestConnection(ecnx2);
 		#end
diff --git a/tests/unit/src/unit/TestResource.hx b/tests/unit/src/unit/TestResource.hx
index 338745d3c2af8a35b3b6b8ddf09a7a84dedb674b..4b0a259031e0539060b9953c748d15862938065e 100644
--- a/tests/unit/src/unit/TestResource.hx
+++ b/tests/unit/src/unit/TestResource.hx
@@ -5,7 +5,7 @@ class TestResource extends Test {
 	static var STR = "Héllo World !";
 
 	function testResources() {
-		var names = haxe.Resource.listNames();
+		var names = haxe.Resource.listNames().filter(function(name) return name != "serializedValues.txt");
 		eq( names.length, 2 );
 		if( names[0] == "re/s?!%[]))(\"'1.txt" ) {
 			 // redundant, but let's avoid different test numbers
@@ -16,9 +16,9 @@ class TestResource extends Test {
 			eq( names[1], "re/s?!%[]))(\"'1.txt" );
 		}
 		eq( haxe.Resource.getString("re/s?!%[]))(\"'1.txt"), STR );
-		#if (neko || php)
+		#if (neko || php ||  eval)
 		// allow binary strings
-		eq( haxe.Resource.getBytes("re/s?!%[]))(\"'1.bin").sub(0,9).toString(), "MZ\x90\x00\x03\x00\x00\x00\x04" );
+		eq( haxe.Resource.getBytes("re/s?!%[]))(\"'1.bin").sub(0,9).toHex(), "4d5a90000300000004" );
 		#else
 		// cut until first \0
 		eq( haxe.Resource.getString("re/s?!%[]))(\"'1.bin").substr(0,2), "MZ" );
diff --git a/tests/unit/src/unit/TestSerialize.hx b/tests/unit/src/unit/TestSerialize.hx
index b5f7bb2c64914d38f9b92da3df336c7892cb4788..ccd3fd14d42f44de1483da1598a5086c7408d3ec 100644
--- a/tests/unit/src/unit/TestSerialize.hx
+++ b/tests/unit/src/unit/TestSerialize.hx
@@ -1,5 +1,7 @@
 package unit;
 
+import haxe.ds.List;
+
 class TestSerialize extends Test {
 
 	function id<T>( v : T ) : T {
@@ -171,7 +173,6 @@ class TestSerialize extends Test {
 		eq( b2.length, b.length );
 		for( i in 0...b.length )
 			eq( b2.get(i), b.get(i) );
-		infos(null);
 	}
 
 }
diff --git a/tests/unit/src/unit/TestSerializerCrossTarget.hx b/tests/unit/src/unit/TestSerializerCrossTarget.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4c8ee7312978bebc5744020e964282a38aa234b7
--- /dev/null
+++ b/tests/unit/src/unit/TestSerializerCrossTarget.hx
@@ -0,0 +1,108 @@
+package unit;
+import haxe.Unserializer;
+import haxe.Resource;
+import haxe.Json;
+
+class TestSerializerCrossTarget extends Test {
+	function testCrossTarget() {
+		var values = Resource.getString("serializedValues.txt");
+		var json = Json.parse(values);
+		for (fieldName in Reflect.fields(json)) {
+			var valueString = Reflect.field(json, fieldName);
+			var func = Reflect.field(this, fieldName);
+			if (func == null) {
+				assert("Missing field: " + fieldName);
+			} else {
+				Reflect.callMethod(this, func, [Unserializer.run(valueString)]);
+			}
+		}
+	}
+
+	function nul<T>(value:T) {
+		eq(null, value);
+	}
+
+	function int0(value:Int) {
+		eq(0, value);
+	}
+
+	function int1(value:Int) {
+		eq(1, value);
+	}
+
+	function intMinus1(value:Int) {
+		eq(-1, value);
+	}
+
+	function floatNaN(value:Float) {
+		t(Math.isNaN(value));
+	}
+
+	function floatNegInf(value:Float) {
+		f(Math.isFinite(value));
+		t(value < 0);
+	}
+
+	function floatPosInf(value:Float) {
+		f(Math.isFinite(value));
+		t(value > 0);
+	}
+
+	function boolFalse(value:Bool) {
+		f(value);
+	}
+
+	function boolTrue(value:Bool) {
+		t(value);
+	}
+
+	function arrayEmpty<T>(value:Array<T>) {
+		eq(0, value.length);
+	}
+
+	function arrayNull<T>(value:Array<T>) {
+		eq(1, value.length);
+		eq(null, value[0]);
+	}
+
+	function array0(value:Array<Int>) {
+		eq(1, value.length);
+		eq(0, value[0]);
+	}
+
+	function array01(value:Array<Int>) {
+		eq(2, value.length);
+		eq(0, value[0]);
+		eq(1, value[1]);
+	}
+
+	function stringMapEmpty(value:Map<String, String>) {
+		f(value.keys().hasNext());
+	}
+
+	function stringMapFooNull(value:Map<String, String>) {
+		eq(null, value["foo"]);
+	}
+
+	function stringMapFooBar(value:Map<String, String>) {
+		eq("bar", value["foo"]);
+	}
+
+	function intMapEmpty(value:Map<Int, String>) {
+		f(value.keys().hasNext());
+	}
+
+	function intMap01(value:Map<Int, String>) {
+		eq("1", value[0]);
+	}
+
+	function intMap0112(value:Map<Int, String>) {
+		eq("1", value[0]);
+		eq("2", value[1]);
+	}
+
+	function objectMapEmpty(value:Map<{}, String>) {
+		var keys = value.keys();
+		f(keys.hasNext());
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestSyntaxModule.hx b/tests/unit/src/unit/TestSyntaxModule.hx
new file mode 100644
index 0000000000000000000000000000000000000000..734830a3b5f83914f9c5b496928e804873a37772
--- /dev/null
+++ b/tests/unit/src/unit/TestSyntaxModule.hx
@@ -0,0 +1,56 @@
+package unit;
+
+#if js
+import js.Syntax;
+#elseif php
+import php.Syntax;
+#elseif python
+import python.Syntax;
+#end
+
+class TestSyntaxModule extends Test {
+#if (php || js || python)
+	function testCode() {
+		var i1 = 1;
+		var i2 = 2;
+		var result = Syntax.code('{0} + {1}', i1, i2);
+		eq(i1 + i2, result);
+	}
+
+	function testField() {
+		var o = {field:'hello'};
+		var value = Syntax.field(o, 'field');
+		eq(o.field, value);
+	}
+
+	#if analyzer_optimize
+	function testConstruct() {
+		var className:String =
+			#if php
+				#if php_prefix
+					'\\${php.Boot.getPrefix()}\\unit\\_TestSyntaxModule\\Construct';
+				#else
+					'\\unit\\_TestSyntaxModule\\Construct';
+				#end
+			#elseif js
+				#if js_unflatten "unit._TestSyntaxModule.Construct";
+				#else "unit__$TestSyntaxModule_Construct";
+				#end
+			#elseif python "unit__TestSyntaxModule_Construct";
+			#end
+		var a:Construct = Syntax.construct(className, 10);
+		t(Std.is(a, Construct));
+		eq(10, a.value);
+
+		var b = Syntax.construct(Construct, 10);
+		t(Std.is(b, Construct));
+		eq(10, b.value);
+	}
+	#end
+#end
+}
+
+private class Construct {
+	public var value:Int;
+	public function new(arg:Int) value = arg;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestType.hx b/tests/unit/src/unit/TestType.hx
index c5b7982ba7426e971f53a2a8c484067c6516a007..69de09f038178d45b5b3b38bb972750a06424413 100644
--- a/tests/unit/src/unit/TestType.hx
+++ b/tests/unit/src/unit/TestType.hx
@@ -1,4 +1,6 @@
 package unit;
+
+import haxe.ds.List;
 import unit.MyEnum;
 import unit.MyClass;
 import unit.HelperMacros.*;
@@ -177,7 +179,7 @@ class TestType extends Test {
 		typedAs([ { x : new Child1() }, { x : new Child2() } ], [{ x: new Base() }]);
 
 		#if flash
-		typedAs(function() { return 0; var v:UInt = 0; return v; } (), 1);
+		typedAs((function() { return 0; var v:UInt = 0; return v; }) (), 1);
 		#end
 	}
 
@@ -258,9 +260,8 @@ class TestType extends Test {
 		var f : Void -> String = foo.bind(0);
  		eq("foo0", f());
 
-		// TODO: this fails on flash 9
 		var foo = function(bar = 2) { return bar; };
-		#if (flash || hl)
+		#if flash // Cannot skip not-nullable argument
 		t(typeError(foo.bind(_)));
 		#else
 		var l = foo.bind(_);
@@ -473,8 +474,8 @@ class TestType extends Test {
 
 	function testInline()
 	{
-		typedAs(inlineTest1([1]), var void:Void);
-		typedAs(inlineTest2([1]), var void:Void);
+		typedAs(inlineTest1([1]), (function():Void{})());
+		typedAs(inlineTest2([1]), (function():Void{})());
 	}
 
 	inline function inlineTest1<T>(map:Array<T>) {
@@ -489,7 +490,7 @@ class TestType extends Test {
 	{
 		#if !macro
 		eq(MyMacro.MyMacroHelper.followWithAbstracts(new Map<String,String>()), "TInst(haxe.ds.StringMap,[TInst(String,[])])");
-		eq(MyMacro.MyMacroHelper.followWithAbstractsOnce({ var x:TypedefToStringMap<String>; x; }), "TAbstract(Map,[TInst(String,[]),TInst(String,[])])");
+		eq(MyMacro.MyMacroHelper.followWithAbstractsOnce({ var x:TypedefToStringMap<String>; x; }), "TType(Map,[TInst(String,[]),TInst(String,[])])");
 		eq(MyMacro.MyMacroHelper.followWithAbstracts(new TypedefToStringMap<String>()), "TInst(haxe.ds.StringMap,[TInst(String,[])])");
 		#end
 	}
@@ -536,6 +537,8 @@ class TestType extends Test {
 		gf1(2);
 		gf1("foo");
 		gf1(true);
+		gf1({foo: 1});
+		gf1(function(i:Int):String return '$i');
 
 		gf1(new haxe.Template("foo"));
 
@@ -547,8 +550,9 @@ class TestType extends Test {
 		hsf(TestType, "gf1_haxe_Template");
 
 		hsf(TestType, "gf1_haxe_ds_GenericStack_Int");
+		hsf(TestType, "gf1_anon_foo_Int");
+		hsf(TestType, "gf1_func_Int_String");
 		t(typeError(gf1(null))); // monos don't work
-		t(typeError(gf1( { foo:1 } ))); // structures don't work
 
 		eq("foo[1,2]", gf2("foo", [1, 2]));
 		eq("foo[[1,2]]", gf2("foo", [[1, 2]]));
@@ -792,6 +796,7 @@ class TestType extends Test {
 	function testAbstractTypeParameterVariance() {
 		var a:Array<unit.MyAbstract.MyInt> = [1, 2, 3];
 		var b:Array<unit.MyAbstract.MyInt2> = a;
+		t(true);
 	}
 
 	function testExposingAbstract() {
diff --git a/tests/unit/src/unit/TestXML.hx b/tests/unit/src/unit/TestXML.hx
index 0af8b8e8a61a9143110575dad0b73cdbab15f090..df353dd465021f87b81ce2ef8bd5e5e2a5b0c7af 100644
--- a/tests/unit/src/unit/TestXML.hx
+++ b/tests/unit/src/unit/TestXML.hx
@@ -1,5 +1,7 @@
 package unit;
 
+import haxe.xml.Parser.XmlParserException;
+
 class TestXML extends Test {
 
 	function checkExc( x : Xml, ?pos ) {
@@ -162,8 +164,7 @@ class TestXML extends Test {
 		var values = ['<', '>', '"', '&', "'", '&euro;', '@', "ô", String.fromCharCode(0x3F), "ÿ"];
 
 		for( i in 0...entities.length) {
-			infos(entities[i]);
-			eq( haxe.xml.Parser.parse(entities[i], false).firstChild().nodeValue, values[i] );
+			eq( values[i], haxe.xml.Parser.parse(entities[i], false).firstChild().nodeValue );
 		}
 
 		var s = "<a>&gt;<b>&lt;</b>&lt;&gt;<b>&gt;&lt;</b>\"</a>";
@@ -230,4 +231,32 @@ class TestXML extends Test {
 		var plainData = '<data><thing blah="abc&def"/></data>';
 		eq("blah = abc&def", doXml(plainData));
 	}
+
+	function testIssue7454() {
+		var string:String = "<Text><![CDATA[Some text ]]></Text>";
+		eq(string, Xml.parse(string).toString());
+	}
+
+	function testNicolas() {
+		try {
+			haxe.xml.Parser.parse("<flow>x");
+			t(false);
+		} catch(exc:XmlParserException) {
+			t(exc.message.indexOf("Unclosed node <flow>") != -1);
+		}
+
+		try {
+			var xml="<f><f/></f></f>";
+			haxe.xml.Parser.parse(xml);
+		} catch(exc:XmlParserException) {
+			t(exc.message.indexOf("Unexpected </f>, tag is not open") != -1);
+		}
+
+		try {
+			haxe.xml.Parser.parse("<f><f></f>");
+			t(false);
+		} catch(exc:XmlParserException) {
+			t(exc.message.indexOf("Unclosed node <f>") != -1);
+		}
+	}
 }
diff --git a/tests/unit/src/unit/UnitBuilder.hx b/tests/unit/src/unit/UnitBuilder.hx
index 5d1474b3d7389a2905a0d6a5a1cd28b1e5e96df5..931dd7591a25f79eb22a1ac8fd883013d3aa7e41 100644
--- a/tests/unit/src/unit/UnitBuilder.hx
+++ b/tests/unit/src/unit/UnitBuilder.hx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2005-2017 Haxe Foundation
+ * Copyright (C)2005-2018 Haxe Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,11 +29,11 @@ using StringTools;
 
 class UnitBuilder {
 
-	static public macro function build(basePath:String, filter:String = ".unit.hx"):Array<Field> {
-		var ret = Context.getBuildFields();
+	static public macro function generateSpec(basePath:String, filter:String = ".unit.hx") {
+		var ret = [];
 		var numFiles = 0;
 
-		function readDir(path) {
+		function readDir(path, pack:Array<String>) {
 			var dir = sys.FileSystem.readDirectory(path);
 			path = path.endsWith("\\") || path.endsWith("/") ? path : path + "/";
 			for (file in dir) {
@@ -46,22 +46,47 @@ class UnitBuilder {
 						params: [],
 						expr: read(filePath)
 					}
-					ret.push( {
-						name: "test" + ~/\./g.map(file, function(_) return "_"),
+					var p = Context.makePosition( { min:0, max:0, file:filePath + file } );
+					var field = {
+						name: "test",
 						kind: FFun(func),
-						pos: Context.makePosition( { min:0, max:0, file:filePath + file } ),
+						pos: p,
 						access: [APublic],
 						doc: null,
 						meta: []
-					});
+					};
+					var pack = ["unit", "spec"].concat(pack);
+					var typeName = "Test" + file.substr(0, file.indexOf("."));
+					Context.defineModule(pack.join(".") + "." + typeName, [{
+						pack: pack,
+						name: typeName,
+						pos: p,
+						kind: TDClass({
+							pack: ["unit"],
+							name: "Test"
+						}),
+						fields: [field]
+					}], [{
+						path: [{pos: p, name: "unit"}, {pos: p, name: "spec"}, {pos: p, name: "TestSpecification"}],
+						mode: INormal
+					}, {
+						// TODO: import.hx doesn't work for this?
+						path: [{pos: p, name: "haxe"}, {pos: p, name: "macro"}, {pos: p, name: "Expr"}],
+						mode: INormal
+					}]);
+					var tp:TypePath = {
+						pack: pack,
+						name: typeName
+					}
+					ret.push(macro new $tp());
 				} else if (sys.FileSystem.isDirectory(filePath)) {
-					readDir(filePath);
+					readDir(filePath, pack.concat([file]));
 				}
 			}
 		}
-		readDir(basePath);
-		//trace("Added " +numFiles + " .unit.hx files");
-		return ret;
+		readDir(basePath, []);
+		// trace("Added " +numFiles + " .unit.hx files");
+		return macro $a{ret};
 	}
 
 	#if macro
@@ -75,7 +100,7 @@ class UnitBuilder {
 		}
 	}
 
-	static function mkEq(e1, e2, p) {
+	static function mkEq(e1, e2, p:Position) {
 		function isFloat(e) {
 			try return switch(Context.follow(Context.typeof(e))) {
 				case TAbstract(tr, _):
@@ -102,7 +127,7 @@ class UnitBuilder {
 	static public function read(path:String) {
 		var p = Context.makePosition( { min:0, max:0, file:path } );
 		var file = sys.io.File.getContent(path);
-		var code = Context.parseInlineString("{" + file + "}", p);
+		var code = Context.parseInlineString("{" + file + "\n}", p);
 		function mkBlock(e:Expr) {
 			return switch(e.expr) {
 				case EBlock(b): b;
@@ -147,7 +172,7 @@ class UnitBuilder {
 						}
 					case EThrow(e):
 						macro exc(function() $e);
-					case EIn(e1, {expr:EArrayDecl(el) }):
+					case EBinop(OpIn, e1, {expr:EArrayDecl(el) }):
 						var el2 = [];
 						for (e in el)
 							el2.push(macro $e1 == $e);
diff --git a/tests/unit/src/unit/hxcpp_issues/Issue192.hx b/tests/unit/src/unit/hxcpp_issues/Issue192.hx
index c2679e370ad21208f7c8fe7bcdd0fcdc9c49abe9..be363e53cfc98eaa54ac28bdbf07f5a567e39a0c 100644
--- a/tests/unit/src/unit/hxcpp_issues/Issue192.hx
+++ b/tests/unit/src/unit/hxcpp_issues/Issue192.hx
@@ -5,6 +5,8 @@ class ConstuctorWithArgCalledResult {
 }
 
 class Issue192 extends Test {
-	function test() new ConstuctorWithArgCalledResult(1);
+	function test() {
+		t(new ConstuctorWithArgCalledResult(1) != null);
+	}
 }
 
diff --git a/tests/unit/src/unit/issues/Issue1810.hx b/tests/unit/src/unit/issues/Issue1810.hx
index 95cdee479184d884046f0566a85f119f1c453557..f2087689597b5a5446ddde01d35732708125a266 100644
--- a/tests/unit/src/unit/issues/Issue1810.hx
+++ b/tests/unit/src/unit/issues/Issue1810.hx
@@ -21,6 +21,6 @@ private class X {
 class Issue1810 extends Test {
 	function test() {
 		var a = new A([12]);
-		//eq(12, a.get().get().i);
+		eq(12, a.get().get().i);
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue1827.hx b/tests/unit/src/unit/issues/Issue1827.hx
index c018ef3b015cfebcf97405780b4e3dcf963da23e..6aa4c5daf4a6c2c509bcbb05298dc6db39759a4b 100644
--- a/tests/unit/src/unit/issues/Issue1827.hx
+++ b/tests/unit/src/unit/issues/Issue1827.hx
@@ -33,7 +33,7 @@ private class E {
 		b = 2;
 	}
 
-	@:extern public inline function set(inA:Int, inB:Int) {
+	extern public inline function set(inA:Int, inB:Int) {
 		setA(inA);
 		setB(inB);
 	}
@@ -109,7 +109,7 @@ class Issue1827 extends Test {
 		return 0;
 	}
 
-	@:extern static inline function callInline(i1, i2) {
+	extern static inline function callInline(i1:Int, _) {
 		return i1;
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2085.hx b/tests/unit/src/unit/issues/Issue2085.hx
index a5975b9aeaa9da7d8a6f8743eb39a7319b683aed..3179e2a51ad057aa4330451b9e267890bda042b1 100644
--- a/tests/unit/src/unit/issues/Issue2085.hx
+++ b/tests/unit/src/unit/issues/Issue2085.hx
@@ -17,6 +17,6 @@ private class Ar<T> {
 
 class Issue2085 extends Test {
 	function test() {
-
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2086.hx b/tests/unit/src/unit/issues/Issue2086.hx
index 34ac37cb6d0a1b3e1bc3e925d0491b75293f1351..69044345324c7a7db92b462e06757f6670d24d94 100644
--- a/tests/unit/src/unit/issues/Issue2086.hx
+++ b/tests/unit/src/unit/issues/Issue2086.hx
@@ -1,6 +1,7 @@
 package unit.issues;
 
 @:generic
+@:keep
 private class Node<T:Node<T>> extends Foo<T> {
 	public var node:T;
 	public function new(node:T) {
@@ -16,6 +17,7 @@ private class Node<T:Node<T>> extends Foo<T> {
 }
 
 @:generic
+@:keep
 private class Foo<T> {
 	public var s:String = "";
 	public function new() { }
@@ -24,6 +26,7 @@ private class Foo<T> {
 	}
 }
 
+@:keep
 private class StringNode extends Node<StringNode> {
 	public function new(s:String) {
 		super(this);
diff --git a/tests/unit/src/unit/issues/Issue2152.hx b/tests/unit/src/unit/issues/Issue2152.hx
deleted file mode 100644
index f3d16ee52d806e7a48934df4f7f78fc83c739ecb..0000000000000000000000000000000000000000
--- a/tests/unit/src/unit/issues/Issue2152.hx
+++ /dev/null
@@ -1,15 +0,0 @@
-package unit.issues;
-
-using unit.issues.misc.Issue2152Class;
-
-private abstract MyInt(Int) {
-	public inline function new (x:Int) this = x;
-	@:to inline function toString ():String return "asString: " + this;
-}
-
-class Issue2152 extends Test {
-	function test() {
-		var z = new MyInt(1);
-		eq("asString: 1", z.passString());
-	}
-}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2224.hx b/tests/unit/src/unit/issues/Issue2224.hx
index fa4b70b14fbdd95ea94053b1777e9308580dc734..84b1e7c22a085f3ed48107328e85fd50f53c82bd 100644
--- a/tests/unit/src/unit/issues/Issue2224.hx
+++ b/tests/unit/src/unit/issues/Issue2224.hx
@@ -8,6 +8,8 @@ class Issue2224 extends unit.Test {
 		eq("opt=null", getEF2());
 		eq("opt=null", getInt());
 		eq("opt=null", getClass());
+		#else
+		noAssert();
 		#end
 	}
 
diff --git a/tests/unit/src/unit/issues/Issue2236.hx b/tests/unit/src/unit/issues/Issue2236.hx
index 837088ee94854eb6fc9b56ea9e630d6bf78bd48b..494722c17153bc2dcf29a74788588755e9312200 100644
--- a/tests/unit/src/unit/issues/Issue2236.hx
+++ b/tests/unit/src/unit/issues/Issue2236.hx
@@ -37,5 +37,6 @@ class Issue2236 extends Test {
 		for( x in a ) {
 
 		}
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2380.hx b/tests/unit/src/unit/issues/Issue2380.hx
index d9cbc3a5994cd0973d5cb277b6c55e78d4374214..385255a001e679b5b77b5230e5ee1d8ad5827d50 100644
--- a/tests/unit/src/unit/issues/Issue2380.hx
+++ b/tests/unit/src/unit/issues/Issue2380.hx
@@ -12,5 +12,5 @@ class Issue2380 extends unit.Test
 #if !cpp @:nativeGen #end private class SomeCls
 {
 	public function new():Void {}
-	@:keep public function test(v) return v == null;
+	@:keep public function test(v:Dynamic) return v == null;
 }
diff --git a/tests/unit/src/unit/issues/Issue2508.hx.disabled b/tests/unit/src/unit/issues/Issue2508.hx.disabled
deleted file mode 100644
index 864d99227aa09ebf85c5ae02adef3f952239e89b..0000000000000000000000000000000000000000
--- a/tests/unit/src/unit/issues/Issue2508.hx.disabled
+++ /dev/null
@@ -1,20 +0,0 @@
-package unit.issues;
-
-enum Tree<T> {
-	Leaf(v:T);
-	Node(l:Tree<T>, r:Tree<T>);
-}
-
-class Issue2508 extends unit.Test {
-
-	public function test() {
-		t(unit.TestType.typeError(
-			switch(Leaf("foo")) {
-				case Leaf(_)
-				   | Leaf("foo"): // This pattern is unused
-				case Node(l,r):
-			}
-		));
-	}
-
-}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2581.hx b/tests/unit/src/unit/issues/Issue2581.hx
index 2dd27ff44bee30d25a42a7fca40f3a6f3f068139..6dc5be764524fe2b58764c7751671a17dae6cb81 100644
--- a/tests/unit/src/unit/issues/Issue2581.hx
+++ b/tests/unit/src/unit/issues/Issue2581.hx
@@ -34,5 +34,6 @@ private class MMap<K, V> implements Arrayable<KVPair<K, V>>
 class Issue2581 extends Test {
 	function test() {
 		var MMap:MMap<String, String> = new MMap<String, String>();
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2633.hx b/tests/unit/src/unit/issues/Issue2633.hx
index 37cf05a618faabd5dcea01f39b630d6959b512f5..c6087ddae4fc0b3bf4f8bf5a9192fefad8af68b3 100644
--- a/tests/unit/src/unit/issues/Issue2633.hx
+++ b/tests/unit/src/unit/issues/Issue2633.hx
@@ -1,7 +1,7 @@
 package unit.issues;
 import unit.Test;
 
-@:enum abstract WorldRegion(Int) {
+enum abstract WorldRegion(Int) {
 	static public inline var MiddleCenter = 1;
 }
 
diff --git a/tests/unit/src/unit/issues/Issue2648.hx b/tests/unit/src/unit/issues/Issue2648.hx
index 66a3157052c4528626d423f0b25659d2f1e9cc66..18b21d49b3a50210bd4a564b08756a5d75b7d95c 100644
--- a/tests/unit/src/unit/issues/Issue2648.hx
+++ b/tests/unit/src/unit/issues/Issue2648.hx
@@ -13,6 +13,7 @@ class Issue2648 extends Test {
 	function test() {
 		TestParam.forName(1);
 		TestParam.forName("s");
+		noAssert();
 	}
 	#end
 }
diff --git a/tests/unit/src/unit/issues/Issue2688.hx b/tests/unit/src/unit/issues/Issue2688.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bfbd90408e239248fdd20972c03007100938c79e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue2688.hx
@@ -0,0 +1,36 @@
+package unit.issues;
+
+class Issue2688 extends Test {
+#if (java || cs)
+  public function test() {
+    var x = 0;
+    var b = new B(function() {
+      x++;
+    });
+    b.tasks(10);
+    eq(x, 10);
+  }
+#end
+}
+
+#if (java || cs)
+@:nativeGen
+private class A {
+  public function new() {
+  }
+}
+
+@:nativeGen
+private class B extends A {
+  public var tasks:Int->Void;
+
+  public function new(task:Void->Void) {
+    super();
+    tasks = function(i) {
+      for (j in 0...i) {
+        task();
+      }
+    }
+  }
+}
+#end
diff --git a/tests/unit/src/unit/issues/Issue2750.hx b/tests/unit/src/unit/issues/Issue2750.hx
index c675271d9525f3de44341c27566576915dfb4b11..7c6a200f17dfa626e5d2bbcd3eca87e584c98297 100644
--- a/tests/unit/src/unit/issues/Issue2750.hx
+++ b/tests/unit/src/unit/issues/Issue2750.hx
@@ -19,11 +19,14 @@ private class Parent extends Test {
 
 class Issue2750 extends Parent {
 	function test() {
-		new Issue2750();
+		new Issue2750().run();
 	}
 
 	public function new() {
 		super();
+	}
+
+	function run() {
 		eq(3, foo());
 		eq(3, bind());
 		eq(3, match());
diff --git a/tests/unit/src/unit/issues/Issue2754.hx b/tests/unit/src/unit/issues/Issue2754.hx
index 627edc47cb16927e475dfb67f786bf3919d8acc5..1c7d5afe1bc4ed034e2c5eea3aa2ef6f072586ac 100644
--- a/tests/unit/src/unit/issues/Issue2754.hx
+++ b/tests/unit/src/unit/issues/Issue2754.hx
@@ -147,12 +147,9 @@ class Issue2754 extends unit.Test
 	// which kind of defeats the purpose of the checks
 	private function nulleq<T>(v1:Null<T>, v2:Null<T>,?pos:haxe.PosInfos)
 	{
-		this.infos("v1 == null");
 		this.t(v1 == null,pos);
-		this.infos("v2 == null");
 		this.t(v2 == null,pos);
 		this.eq(v1,v2);
-		this.infos(null);
 	}
 }
 
diff --git a/tests/unit/src/unit/issues/Issue2785.hx b/tests/unit/src/unit/issues/Issue2785.hx
index 4c165849fe8ea4a11c1da7060422aad72ba32f19..c0b702c0ddaa791893be8ee0003baae0bebab492 100644
--- a/tests/unit/src/unit/issues/Issue2785.hx
+++ b/tests/unit/src/unit/issues/Issue2785.hx
@@ -4,7 +4,7 @@ import unit.Test;
 private class Base {
 	public function new() {}
 
-	@:extern
+	extern
 	public var foo(default, never):Int;
 
 	@:getter(foo)
diff --git a/tests/unit/src/unit/issues/Issue2786.hx b/tests/unit/src/unit/issues/Issue2786.hx
index 4c52059420876abf3abd345776a4c4fa8e915e42..bed10e33ecd71f346014f073a2c180f4f1a9453d 100644
--- a/tests/unit/src/unit/issues/Issue2786.hx
+++ b/tests/unit/src/unit/issues/Issue2786.hx
@@ -1,22 +1,19 @@
 package unit.issues;
 
-@:enum
-private abstract E(Int) to Int {
+private enum abstract E(Int) to Int {
 	var A = 1;
 	var B = 2;
 	@:op(a | b) static function or(a:E, b:E):E;
 }
 
-@:enum
-private abstract E2(Int) to Int {
+private enum abstract E2(Int) to Int {
 	var A = 1;
 	var B = 2;
 	@:op(a | b) static function or(a:E2, b:E2):E2;
 	@:op(a | b) static function or2(a:E2, b:E2):E2;
 }
 
-@:enum
-private abstract E3(Int) to Int {
+private enum abstract E3(Int) to Int {
 	var A = 1;
 	var B = 2;
 	@:op(a | b) static function or(a:E3, b:E3):E3;
diff --git a/tests/unit/src/unit/issues/Issue2813.hx b/tests/unit/src/unit/issues/Issue2813.hx
index 36d42d491b70c6a56e8c8ebf3cc5b30af3090988..135d5b79635e09f231209d9f137fd4e7483e960e 100644
--- a/tests/unit/src/unit/issues/Issue2813.hx
+++ b/tests/unit/src/unit/issues/Issue2813.hx
@@ -4,7 +4,7 @@ import unit.Test;
 private extern class Ext {
 	static inline var v = "foo";
 
-	public function new() { }
+	public function new();
 
 	public inline function test():Void { }
 
diff --git a/tests/unit/src/unit/issues/Issue2861.hx b/tests/unit/src/unit/issues/Issue2861.hx
index 024ad84599b17aab135f67c72a30f869fda4d2d7..6ab652815df5cdfbe556c1e828fb1c563ee5792c 100644
--- a/tests/unit/src/unit/issues/Issue2861.hx
+++ b/tests/unit/src/unit/issues/Issue2861.hx
@@ -2,7 +2,7 @@ package unit.issues;
 
 class Issue2861 extends Test
 {
-#if (flash || neko || cpp || java || php)
+#if (flash || neko || cpp || java || php || hl)
 	public function test()
 	{
 		var b = haxe.io.Bytes.alloc(2048);
diff --git a/tests/unit/src/unit/issues/Issue2874.hx b/tests/unit/src/unit/issues/Issue2874.hx
index 6e302e28f8f7fc358a76d209a4ae5e03a5b989c0..c1728c6f90b1999ebe886783794cd6417630a136 100644
--- a/tests/unit/src/unit/issues/Issue2874.hx
+++ b/tests/unit/src/unit/issues/Issue2874.hx
@@ -27,12 +27,12 @@ class Issue2874 extends unit.Test
 
 @:arrayAccess abstract Arr<T>(Array<T>)
 {
-	@:extern inline public function new(a)
+	extern inline public function new(a)
 	{
 		this = a;
 	}
 
-	@:extern inline public function map<X>(fn:T->X):Arr<X>
+	extern inline public function map<X>(fn:T->X):Arr<X>
 	{
 		var arr2 = [];
 		for (v in this)
diff --git a/tests/unit/src/unit/issues/Issue2881.hx b/tests/unit/src/unit/issues/Issue2881.hx
index 8253ec1bf18b2694659408f5d413f0f153284598..86a62c056d09cb71a1653ae1e0c611a151ed3434 100644
--- a/tests/unit/src/unit/issues/Issue2881.hx
+++ b/tests/unit/src/unit/issues/Issue2881.hx
@@ -5,5 +5,6 @@ private abstract Callback<T>(T->Void) from (T->Void) {}
 class Issue2881 extends Test {
 	function test() {
 		var cb:Callback<Int> = null;
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2914.hx b/tests/unit/src/unit/issues/Issue2914.hx
index 33cdf92f28734b16058ed7810c4b9805802c2e99..3a5af877ae4bcad8c0045d08e08a61ed8de05ce5 100644
--- a/tests/unit/src/unit/issues/Issue2914.hx
+++ b/tests/unit/src/unit/issues/Issue2914.hx
@@ -6,18 +6,18 @@ class Issue2914 extends Test {
 
 		t(unit.HelperMacros.typeError({
 			var x = switch o {
-				case x if (x > 1): x;
+				case var x if (x > 1): x;
 			}
 		}));
 
 		var x = switch o {
-			case x if (x > 1): x;
-			case x: 1;
+			case var x if (x > 1): x;
+			case var x: 1;
 		}
 		eq(1, x);
 
 		switch (o) {
-			case y if (y < 1):
+			case var y if (y < 1):
 				x = 5;
 		}
 		eq(5, x);
diff --git a/tests/unit/src/unit/issues/Issue2939.hx b/tests/unit/src/unit/issues/Issue2939.hx
index 87ed64a8ab4e599f58b901447709704109767a56..69fcb40e13331176ad3e75dbc9a072f005c340ba 100644
--- a/tests/unit/src/unit/issues/Issue2939.hx
+++ b/tests/unit/src/unit/issues/Issue2939.hx
@@ -1,7 +1,6 @@
 package unit.issues;
 
-@:enum
-private abstract A(Int) to Int {
+private enum abstract A(Int) to Int {
 	var a = 1;
 	var b = 2;
 
diff --git a/tests/unit/src/unit/issues/Issue2951.hx b/tests/unit/src/unit/issues/Issue2951.hx
index 74fc807c51ec238cadbf850189e956f972825039..8dd8bc1f719af292346240e32c652b2e5f3e7fda 100644
--- a/tests/unit/src/unit/issues/Issue2951.hx
+++ b/tests/unit/src/unit/issues/Issue2951.hx
@@ -5,7 +5,7 @@ import unit.Test;
 
 class Issue2951 extends Test{
 
-  public static inline function foo (x) {
+  public static inline function foo (_) {
 
   }
 
@@ -41,5 +41,6 @@ class Issue2951 extends Test{
 		  if ((args.length == 0)) true else false;
 		  setCwd(last);
 	  };
+	  noAssert();
   }
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2957.hx b/tests/unit/src/unit/issues/Issue2957.hx
index ce351a57cdcba8cc96e6b2df16669de57a83c372..d586d94edefbaff2a96acd00b1ed10792704660b 100644
--- a/tests/unit/src/unit/issues/Issue2957.hx
+++ b/tests/unit/src/unit/issues/Issue2957.hx
@@ -15,5 +15,6 @@ private abstract Integer(Int) from Int to Int {
 class Issue2957 extends Test {
 	function test() {
 		var n:Integer = "5";
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2958.hx b/tests/unit/src/unit/issues/Issue2958.hx
index 964509841814e940eb4e3b8b174abe3df5cb4067..7afc365c18b45e724b029203295e77b17e00fcbb 100644
--- a/tests/unit/src/unit/issues/Issue2958.hx
+++ b/tests/unit/src/unit/issues/Issue2958.hx
@@ -1,5 +1,7 @@
 package unit.issues;
 
+import unit.HelperMacros.typeString;
+
 private typedef Asset<@:const T> = String;
 
 class Issue2958 extends Test {
@@ -9,11 +11,4 @@ class Issue2958 extends Test {
 		   "unit.issues._Issue2958.Asset<[\"test\", 1]>"
 		);
 	}
-
-	static macro function typeString(e)
-	{
-		var typed = haxe.macro.Context.typeExpr(e);
-		var s = haxe.macro.TypeTools.toString(typed.t);
-		return macro $v{s};
-	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2960.hx b/tests/unit/src/unit/issues/Issue2960.hx
index 50cd3a3819714a6d17c9c5abd6bfb8372e121803..1974524c77a6b61da4288f69e3584e0d39802e5b 100644
--- a/tests/unit/src/unit/issues/Issue2960.hx
+++ b/tests/unit/src/unit/issues/Issue2960.hx
@@ -9,5 +9,6 @@ class Issue2960 extends Test {
 
 	function test() {
 		call(["a" => function() {}]);
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2980.hx b/tests/unit/src/unit/issues/Issue2980.hx
index 812865e1937daccf87fa66d03011e6ced3e19a46..b8cb0d6408b3981a913cc18c5facb3f2103b0fb8 100644
--- a/tests/unit/src/unit/issues/Issue2980.hx
+++ b/tests/unit/src/unit/issues/Issue2980.hx
@@ -9,6 +9,7 @@ class Issue2980 extends Test {
 	function test() {
 		a();
 		b();
+		noAssert();
 	}
 	#end
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue2989.hx b/tests/unit/src/unit/issues/Issue2989.hx
index 0ba88b5c0e0eeed4419716f2bea6cbd55547a3ab..3f69818d2fd6d6e50bf66df6a1d27630ded4d67c 100644
--- a/tests/unit/src/unit/issues/Issue2989.hx
+++ b/tests/unit/src/unit/issues/Issue2989.hx
@@ -7,5 +7,6 @@ class Issue2989 extends Test
 		var n = null;
 		(n is Array);
 		new haxe.ds.Vector<Int>(10);
+		noAssert();
 	}
 }
diff --git a/tests/unit/src/unit/issues/Issue3005.hx b/tests/unit/src/unit/issues/Issue3005.hx
index 83486711ddc9c699bda96361cec0738e85cfe097..aff91d58c5e3e732d5626e0aa53a09a90052afd2 100644
--- a/tests/unit/src/unit/issues/Issue3005.hx
+++ b/tests/unit/src/unit/issues/Issue3005.hx
@@ -21,5 +21,6 @@ class Issue3005 extends Test {
 	function test() {
 		var a = new A<String>();
 		a.foo();
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3008.hx b/tests/unit/src/unit/issues/Issue3008.hx
index 86863ee2e3ae442aece136d3cf33e33f1e5ec95b..1d40f3594520ac5ec9ff34dcef4c75881fb3b600 100644
--- a/tests/unit/src/unit/issues/Issue3008.hx
+++ b/tests/unit/src/unit/issues/Issue3008.hx
@@ -4,5 +4,6 @@ class Issue3008 extends Test {
 	function test() {
 		var t = new unit.issues.misc.Issue3008Class("foo");
 		t.call();
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3024.hx b/tests/unit/src/unit/issues/Issue3024.hx
index e6789d44d47579fbcbf087d7ca3f81f21c591be5..e432f56499251f9a2761ba1b2cf8738226bf068c 100644
--- a/tests/unit/src/unit/issues/Issue3024.hx
+++ b/tests/unit/src/unit/issues/Issue3024.hx
@@ -23,6 +23,7 @@ class Issue3024 extends Test {
 
 	function test() {
 		create(new Vector(1), new StringMap());
+		noAssert();
 	}
 
 	function create(myVector:MyVector, myMap:MyMap) {
diff --git a/tests/unit/src/unit/issues/Issue3031.hx b/tests/unit/src/unit/issues/Issue3031.hx
index e94184605c0ba213fbb31c26c3b96e447acc6bba..4d7ea99b08790bb2fc1ee99cd16d46dedf3d0156 100644
--- a/tests/unit/src/unit/issues/Issue3031.hx
+++ b/tests/unit/src/unit/issues/Issue3031.hx
@@ -12,7 +12,7 @@ class Issue3031 extends Test {
 		var a = "";
 		switch (new StringBuf()) {
 			case null: a = "null";
-			case notNull: a = "not null";
+			case var notNull: a = "not null";
 		}
 		eq("not null", a);
 	}
diff --git a/tests/unit/src/unit/issues/Issue3063.hx b/tests/unit/src/unit/issues/Issue3063.hx
index f67710202dd9839ffacef64dbf6a2b976acdb6ab..e0cc16949ecf6eceb71a08ddcd56af1eefccd2d6 100644
--- a/tests/unit/src/unit/issues/Issue3063.hx
+++ b/tests/unit/src/unit/issues/Issue3063.hx
@@ -1,12 +1,10 @@
 package unit.issues;
 
-@:enum
-private abstract AString(String) to String {
+private enum abstract AString(String) to String {
 	var CTOR1 = "foo";
 }
 
-@:enum
-private abstract AInt(Int) to Int {
+private enum abstract AInt(Int) to Int {
 	var CTOR2 = 12;
 }
 
diff --git a/tests/unit/src/unit/issues/Issue3084.hx b/tests/unit/src/unit/issues/Issue3084.hx
index 871661a7a4bcc39002b9b20209a2bbad33ff4a25..26b05c1a15e8a0e7f7a1c35a01f6fc5730daea4b 100644
--- a/tests/unit/src/unit/issues/Issue3084.hx
+++ b/tests/unit/src/unit/issues/Issue3084.hx
@@ -8,13 +8,13 @@ class Issue3084 extends Test
 	{
 		for (i in 0...40)
 		{
-			var m = new java.vm.Mutex();
-			java.vm.Thread.create(function():Void {
+			var m = new sys.thread.Mutex();
+			sys.thread.Thread.create(function():Void {
 				m.acquire();
 				Sys.sleep(0.01);
 				m.release();
 			});
-			java.vm.Thread.create(function():Void {
+			sys.thread.Thread.create(function():Void {
 				m.acquire();
 				Sys.sleep(0.01);
 				m.release();
@@ -25,6 +25,7 @@ class Issue3084 extends Test
 			Sys.sleep(0.01);
 			m.release();
 		}
+		noAssert();
 	}
 #end
 }
diff --git a/tests/unit/src/unit/issues/Issue3090.hx b/tests/unit/src/unit/issues/Issue3090.hx
index 71b40c74ae8e8721f5fa1c7849d423520dc5864f..53e9b469c8c0a3ac1d53fc5058e73fbed24867d1 100644
--- a/tests/unit/src/unit/issues/Issue3090.hx
+++ b/tests/unit/src/unit/issues/Issue3090.hx
@@ -8,5 +8,6 @@ private class A<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>{
 class Issue3090 extends Test {
 	function test() {
 		var a = new A<Printer,Printer,Printer,Printer,Printer,Printer,Printer,Printer,Printer,Printer,Printer,Printer,Printer,Printer,Printer>();
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3110.hx b/tests/unit/src/unit/issues/Issue3110.hx
index 339026d81299fd638e2ea6641cadb48da0542944..e90755b7a00b194b2fb935efed1ed0665cb49a2c 100644
--- a/tests/unit/src/unit/issues/Issue3110.hx
+++ b/tests/unit/src/unit/issues/Issue3110.hx
@@ -1,5 +1,7 @@
 package unit.issues;
 
+import haxe.ds.List;
+
 private abstract MyOpaciteInt(Int) {}
 
 class Issue3110 extends Test {
diff --git a/tests/unit/src/unit/issues/Issue3118.hx b/tests/unit/src/unit/issues/Issue3118.hx
index 2482b1e0188cf94c87763dc81c369fcaaed5a97e..e1a2dc2f622b495a8bbbd8c568e5de0cc2dd3069 100644
--- a/tests/unit/src/unit/issues/Issue3118.hx
+++ b/tests/unit/src/unit/issues/Issue3118.hx
@@ -20,7 +20,6 @@ class Base<A>
 
 }
 
-@:final
-class Final extends Base<Array<Int>>
+final class Final extends Base<Array<Int>>
 {
 }
diff --git a/tests/unit/src/unit/issues/Issue3132.hx b/tests/unit/src/unit/issues/Issue3132.hx
index 780de313d4f04a3c142bec858da6ab2c576d92ce..f732b649d8d6e71efe4e3a7067419d7e8d33e488 100644
--- a/tests/unit/src/unit/issues/Issue3132.hx
+++ b/tests/unit/src/unit/issues/Issue3132.hx
@@ -6,5 +6,6 @@ class Issue3132 extends unit.Test {
 		var a:Array<{a:Int, ?b:Int}> = [{a:1, b:2}, {a:1}];
 		//t(unit.HelperMacros.typeError([{a:1}, {a:1, b:2}]));
 		//t(unit.HelperMacros.typeError([{a:1, b:2}, {a:1}]));
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3133.hx b/tests/unit/src/unit/issues/Issue3133.hx
index 4689b2dd0215c564fe35cd64c05d49e85088bbad..c15409f736ec2769496e5b61a54840b34c55b9ef 100644
--- a/tests/unit/src/unit/issues/Issue3133.hx
+++ b/tests/unit/src/unit/issues/Issue3133.hx
@@ -10,5 +10,6 @@ class Issue3133 extends Test {
 	function test() {
 		var t = new Child();
 		t.test("foo");
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3138.hx b/tests/unit/src/unit/issues/Issue3138.hx
index a16c14f28333f08e3bd8bcdcc0671bd8d7a9995d..b0bd8af74bac11bee859cc0c3a4d1f9fe7fb30da 100644
--- a/tests/unit/src/unit/issues/Issue3138.hx
+++ b/tests/unit/src/unit/issues/Issue3138.hx
@@ -8,11 +8,12 @@ class Issue3138 extends Test
 #if (java || cs)
 		var b = new D();
 #end
+		noAssert();
 	}
 }
 
 private class A {
-	public function new(a) {}
+	public function new(_) {}
 }
 
 private class B extends A {
diff --git a/tests/unit/src/unit/issues/Issue3150.hx b/tests/unit/src/unit/issues/Issue3150.hx
index f02b081f4264acbb51aacc217c29f77b2ecbbb85..0c8ffd8aced9257dea7170280d079e44a4d31f9e 100644
--- a/tests/unit/src/unit/issues/Issue3150.hx
+++ b/tests/unit/src/unit/issues/Issue3150.hx
@@ -5,7 +5,7 @@ class Issue3150 extends Test {
 		t(unit.HelperMacros.typeError(
 			var d = switch (2) {
 				case 3: 90;
-				case f if (f == 0 | 2): -135;
+				case var f if (f == 0 | 2): -135;
 			}
 		));
 	}
diff --git a/tests/unit/src/unit/issues/Issue3181.hx b/tests/unit/src/unit/issues/Issue3181.hx
index f9b5a9a86b94866e79148493dbff27d8c3818552..906949209e3d581d7c0ac404ce5b9b41f33c704e 100644
--- a/tests/unit/src/unit/issues/Issue3181.hx
+++ b/tests/unit/src/unit/issues/Issue3181.hx
@@ -1,12 +1,17 @@
 package unit.issues;
 
-@:enum private abstract A(Int) { }
+private enum abstract A(Int) { }
 
 class Issue3181 extends Test {
-	function test() {
-		var a:Null<A> = cast 1;
-		t(unit.HelperMacros.typeError(
-			switch(a) { }
-		));
-	}
+
+	/* Note: This no longer fails at block-level because it shouldn't. It does fail at
+	   in value places because we type the switch as Void in that case. However, we cannot
+	   test that here because this check is made at a later stage. */
+
+	// function test() {
+	// 	var a:Null<A> = cast 1;
+	// 	t(unit.HelperMacros.typeError(
+	// 		var b = switch(a) { }
+	// 	));
+	// }
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3198.hx b/tests/unit/src/unit/issues/Issue3198.hx
index 18a1245e38581eeeaf962d828bbfffd907bfc309..d1f93d317de374e8a718b79c8a8104a446e37053 100644
--- a/tests/unit/src/unit/issues/Issue3198.hx
+++ b/tests/unit/src/unit/issues/Issue3198.hx
@@ -9,10 +9,15 @@ private typedef B = {b:Int}
 private typedef C = {>A,}
 private typedef D = {>A, >B,}
 
+private typedef C2 = {} & A;
+private typedef D2 = A & B;
+
 class Issue3198 extends Test {
 	function test() {
 		eq(getExtends((null : C)), "A");
 		eq(getExtends((null : D)), "A,B");
+		eq(getExtends((null : C2)), "A");
+		eq(getExtends((null : D2)), "A,B");
 	}
 
 	static macro function getExtends(e) {
@@ -22,6 +27,8 @@ class Issue3198 extends Test {
 				for (t in tl) switch (t) {
 					case TType(_.get() => dt, []):
 						p.push(dt.name);
+					case TAnonymous(_):
+						// ignore
 					default:
 						throw false;
 				}
diff --git a/tests/unit/src/unit/issues/Issue3280.hx b/tests/unit/src/unit/issues/Issue3280.hx
index 94e54876eb9156fb95dd92455f67d228009bcfe7..be763c7fcc7a1b884a758d2681e51c40faa90225 100644
--- a/tests/unit/src/unit/issues/Issue3280.hx
+++ b/tests/unit/src/unit/issues/Issue3280.hx
@@ -9,7 +9,7 @@ class Issue3280 extends Test {
 		return param;
 	}
 
-	static function iter( v : Int, f) {
+	static function iter( v : Int, f : Int -> String) {
 		return f(v-1);
 	}
 
diff --git a/tests/unit/src/unit/issues/Issue3345.hx b/tests/unit/src/unit/issues/Issue3345.hx
index b1ae7dfef425166f8aff66d94487410d87b66c2e..deb4281543a1be24a2a431c14b1d394184beef30 100644
--- a/tests/unit/src/unit/issues/Issue3345.hx
+++ b/tests/unit/src/unit/issues/Issue3345.hx
@@ -4,19 +4,19 @@ private abstract Meters(Float) from Float {
 	inline public static var One:Meters = 1;
 	inline public static var Zero:Meters = 0;
 
-	@:extern inline public function new(f:Float) {
+	extern inline public function new(f:Float) {
 		this = f;
 	}
 
-	@:extern @:op(-A) public static function neg(s:Meters):Meters;
-	@:extern @:op(A+B) public static function add(lhs:Meters, rhs:Meters):Meters;
-	@:extern @:op(A-B) public static function sub(lhs:Meters, rhs:Meters):Meters;
-	@:extern @:op(A>B) public static function gt(lhs:Meters, rhs:Meters):Bool;
-	@:extern @:op(A>=B) public static function gte(lhs:Meters, rhs:Meters):Bool;
-	@:extern @:op(A<B) public static function lt(lhs:Meters, rhs:Meters):Bool;
-	@:extern @:op(A<=B) public static function lte(lhs:Meters, rhs:Meters):Bool;
-	@:extern @:op(A==B) public static function eq(lhs:Meters, rhs:Meters):Bool;
-	@:extern inline public function float() return this;
+	@:op(-A) extern public static function neg(s:Meters):Meters;
+	@:op(A+B) extern public static function add(lhs:Meters, rhs:Meters):Meters;
+	@:op(A-B) extern public static function sub(lhs:Meters, rhs:Meters):Meters;
+	@:op(A>B) extern public static function gt(lhs:Meters, rhs:Meters):Bool;
+	@:op(A>=B) extern public static function gte(lhs:Meters, rhs:Meters):Bool;
+	@:op(A<B) extern public static function lt(lhs:Meters, rhs:Meters):Bool;
+	@:op(A<=B) extern public static function lte(lhs:Meters, rhs:Meters):Bool;
+	@:op(A==B) extern public static function eq(lhs:Meters, rhs:Meters):Bool;
+	extern inline public function float() return this;
 
 	@:to inline public function toString() {
 		return '$this(m)';
@@ -24,19 +24,17 @@ private abstract Meters(Float) from Float {
 }
 
 class Issue3345 extends Test {
+	#if !lua
 	function test() {
 		var acc:Meters = .0;
 		for (i in 0...10)
 			acc += 10;
-#if !lua
 		eq("100(m)", acc);
-#end
 
 		var acc:Meters = .0;
 		for (i in 0...10)
 			acc -= 10;
-#if !lua
 		eq("-100(m)", acc);
-#end
 	}
+	#end
 }
diff --git a/tests/unit/src/unit/issues/Issue3348.hx b/tests/unit/src/unit/issues/Issue3348.hx
index e0290d79f103c44af554cd5fadf1917d26a0dd21..726e6b44b03184e1b1b3b134693b915c45fd9497 100644
--- a/tests/unit/src/unit/issues/Issue3348.hx
+++ b/tests/unit/src/unit/issues/Issue3348.hx
@@ -3,10 +3,10 @@ package unit.issues;
 class Issue3348 extends Test {
 
 	function test() {
-		eq("unit.issues.Issue3348,Issue3348.hx,6,test", getPos1());
-		eq("unit.issues.Issue3348,Issue3348.hx,7,test", getPos2());
-		eq("unit.issues.Issue3348,Issue3348.hx,8,test", getPos3("ok"));
-		eq("unit.issues.Issue3348,Issue3348.hx,9,test", getPos4(1));
+		eq("unit.issues.Issue3348,src/unit/issues/Issue3348.hx,6,test", getPos1());
+		eq("unit.issues.Issue3348,src/unit/issues/Issue3348.hx,7,test", getPos2());
+		eq("unit.issues.Issue3348,src/unit/issues/Issue3348.hx,8,test", getPos3("ok"));
+		eq("unit.issues.Issue3348,src/unit/issues/Issue3348.hx,9,test", getPos4(1));
 	}
 
 	static function getPosString(p:haxe.PosInfos) {
diff --git a/tests/unit/src/unit/issues/Issue3383.hx b/tests/unit/src/unit/issues/Issue3383.hx
index 64691e05a9af04286c389a8421617ef96512f5ce..e73984b8a0245be0ea7e0e3f690dea7ab2d62aa0 100644
--- a/tests/unit/src/unit/issues/Issue3383.hx
+++ b/tests/unit/src/unit/issues/Issue3383.hx
@@ -21,6 +21,7 @@ class Issue3383 extends Test {
 			eq(n, null);
 			#else
 			Sys.stderr().writeString("https://github.com/HaxeFoundation/haxe/issues/5503 pending\n");
+			noAssert();
 			#end
 	}
 #end
diff --git a/tests/unit/src/unit/issues/Issue3388.hx b/tests/unit/src/unit/issues/Issue3388.hx
index a343dc88732374e5a87b0327de512dde3872ade8..7135a337d1765a9f365542f932bb4fe23996e92b 100644
--- a/tests/unit/src/unit/issues/Issue3388.hx
+++ b/tests/unit/src/unit/issues/Issue3388.hx
@@ -7,24 +7,24 @@ private abstract A<T>(Array<T>) {
 
 	#if java
 	@:impl
-	@:overload @:extern
+	@:overload extern
 	static inline public function sum(a:Array<Int>) {
 		return "sum of ints";
 	}
 
-	@:overload @:extern
+	@:overload
 	@:impl
-	static inline public function sum(a:Array<String>) {
+	extern static inline public function sum(a:Array<String>) {
 		return "sum of strings";
 	}
 	#end
 }
 
 class Issue3388 extends Test {
+	#if java
 	function test() {
-		#if java
 		eq("sum of ints", new A([1]).sum());
 		eq("sum of strings", new A(["1"]).sum());
-		#end
 	}
+	#end
 }
diff --git a/tests/unit/src/unit/issues/Issue3390.hx b/tests/unit/src/unit/issues/Issue3390.hx
index 9155a192c586d07cf321455b6ef18733aa60af79..528b4da09de8cf295be8636061feec5f53df09b2 100644
--- a/tests/unit/src/unit/issues/Issue3390.hx
+++ b/tests/unit/src/unit/issues/Issue3390.hx
@@ -15,5 +15,6 @@ class Issue3390 extends Test {
 	function test() {
 		A.a();
 		B.b();
+		noAssert();
 	}
 }
diff --git a/tests/unit/src/unit/issues/Issue3400.hx b/tests/unit/src/unit/issues/Issue3400.hx
index 08248834a4c9938f6414374137f3b849f1e5ca5a..7efa1a13704453b0150184002530f0e2ba9dd428 100644
--- a/tests/unit/src/unit/issues/Issue3400.hx
+++ b/tests/unit/src/unit/issues/Issue3400.hx
@@ -6,6 +6,7 @@ class Issue3400 extends Test
 	public function test()
 	{
 		var a:AbstractList<haxe.Int64> = AbstractList.empty();
+		noAssert();
 	}
 #end
 }
diff --git a/tests/unit/src/unit/issues/Issue3403.hx b/tests/unit/src/unit/issues/Issue3403.hx
index 1bd91aacad9aada8b787bbc68c85b839c80b0f4b..32c2f1ab41d50f9743232dc43e8416a56e1be966 100644
--- a/tests/unit/src/unit/issues/Issue3403.hx
+++ b/tests/unit/src/unit/issues/Issue3403.hx
@@ -3,29 +3,29 @@ package unit.issues;
 class Issue3403 extends Test  {
 	function test() {
 		var val = [1,2,3,4];
-		var x = Std.instance(val, Array);
+		var x = Std.downcast(val, Array);
 		eq(val,x);
 
 		var val:Dynamic = val;
-		x = Std.instance(val,Array);
+		x = Std.downcast(val,Array);
 		eq(val,x);
 		t(val != null);
 		t(x != null);
 
 		var g = new G([1,2,3,4]);
 		var g2:Dynamic = g;
-		var g3:G<Array<Int>> = Std.instance(g2,G);
+		var g3:G<Array<Int>> = Std.downcast(g2,G);
 		eq(g,g2);
 		eq(g,g3);
 		t(g3 != null);
 		t(g != null);
 
 		g2 = "Incorrect type";
-		g3 = Std.instance(g2,G);
+		g3 = Std.downcast(g2,G);
 		eq(g3,null);
 
 		g2 = 10;
-		g3 = Std.instance(g2,G);
+		g3 = Std.downcast(g2,G);
 		eq(g3,null);
 	}
 }
diff --git a/tests/unit/src/unit/issues/Issue3451.hx b/tests/unit/src/unit/issues/Issue3451.hx
index 8169af084a11eb815d1d487ca1453159274867f0..96262626b5d3d8b221301de19475a68dab33eb76 100644
--- a/tests/unit/src/unit/issues/Issue3451.hx
+++ b/tests/unit/src/unit/issues/Issue3451.hx
@@ -5,8 +5,8 @@ class MatrixExt extends flash.geom.Matrix { }
 #end
 
 class Issue3451 extends Test {
+	#if flash
 	public function test() {
-		#if flash
 		var m = new MatrixExt();
 		feq(1, m.a);
 		feq(0, m.b);
@@ -14,6 +14,6 @@ class Issue3451 extends Test {
 		feq(1, m.d);
 		feq(0, m.tx);
 		feq(0, m.ty);
-		#end
 	}
+	#end
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3460.hx b/tests/unit/src/unit/issues/Issue3460.hx
index 89e26efcf79f33ea7bc7848b7f05fc7e2335726f..fbe0143cf2e9325eb75db9a97e870e4a22f5b27e 100644
--- a/tests/unit/src/unit/issues/Issue3460.hx
+++ b/tests/unit/src/unit/issues/Issue3460.hx
@@ -8,6 +8,6 @@ private class MyClass {
 
 class Issue3460 extends Test {
 	function test() {
-		eq("x : Int -> String, x : String -> y : Bool -> Int", unit.issues.misc.Issue3460Macro.getOverloadString((null : MyClass)));
+		eq("(x : Int) -> String, (x : String, y : Bool) -> Int", unit.issues.misc.Issue3460Macro.getOverloadString((null : MyClass)));
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3480.hx b/tests/unit/src/unit/issues/Issue3480.hx
index 32d675abbdc2da40f0a589a2d069cb442fd4ebc0..575d4b2bca45be56ce0e263c629007bf52c77bc8 100644
--- a/tests/unit/src/unit/issues/Issue3480.hx
+++ b/tests/unit/src/unit/issues/Issue3480.hx
@@ -6,5 +6,6 @@ class Issue3480 extends Test {
 		if (!js.Browser.supported || js.Browser.navigator.userAgent.indexOf('MSIE 8') == -1) // IE8 doesn't like toString fields at all
 			eq("{\n\ttoString : 1\n}", Std.string({toString: 1}));
 		#end
+		noAssert();
 	}
 }
diff --git a/tests/unit/src/unit/issues/Issue3486.hx b/tests/unit/src/unit/issues/Issue3486.hx
index 7a9ebe54ad2ecf8f140ca4dbf8601beaff4962d5..9536e7b8ae8796a946f516d234a7cbcbf3ab6ade 100644
--- a/tests/unit/src/unit/issues/Issue3486.hx
+++ b/tests/unit/src/unit/issues/Issue3486.hx
@@ -1,9 +1,12 @@
 package unit.issues;
 
+import haxe.ds.List;
+
 class Issue3486 extends Test {
 	function test() {
 		var l = new List();
 		flatMap(l);
+		noAssert();
 	}
 
 	static public function flatMap<B>(a:List<B>) {
diff --git a/tests/unit/src/unit/issues/Issue3499.hx b/tests/unit/src/unit/issues/Issue3499.hx
index 90e7e9a13f8e016da1c1333ed710c6512bbfcba3..9e2078205e9d7abcc98b73e3994b61e844c50b4d 100644
--- a/tests/unit/src/unit/issues/Issue3499.hx
+++ b/tests/unit/src/unit/issues/Issue3499.hx
@@ -2,7 +2,7 @@ package unit.issues;
 
 #if js
 
-private typedef PathSimple = haxe.extern.EitherType<String,js.RegExp>;
+private typedef PathSimple = haxe.extern.EitherType<String,js.lib.RegExp>;
 private typedef Path = haxe.extern.EitherType<PathSimple,Array<PathSimple>>;
 
 #end
@@ -10,7 +10,7 @@ private typedef Path = haxe.extern.EitherType<PathSimple,Array<PathSimple>>;
 class Issue3499 extends Test {
 	#if js
 	function test() {
-		var a:Path = ["", new js.RegExp("")];
+		var a:Path = ["", new js.lib.RegExp("")];
 		eq("", a[0]);
 	}
 	#end
diff --git a/tests/unit/src/unit/issues/Issue3528.hx b/tests/unit/src/unit/issues/Issue3528.hx
index 014273c006b5413b064e607229fbc72fa3aafdcb..2624757621e52e7d9dadf5be21f0df33877b9a24 100644
--- a/tests/unit/src/unit/issues/Issue3528.hx
+++ b/tests/unit/src/unit/issues/Issue3528.hx
@@ -11,6 +11,7 @@ class Issue3528 extends Test {
 			case Some(v):
 			case None:
 		}
+		noAssert();
     }
 
 	static function test1(v:haxe.ds.Option<Int>) {
diff --git a/tests/unit/src/unit/issues/Issue3539.hx b/tests/unit/src/unit/issues/Issue3539.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6b5617733d63ec061f30b3dc643db186ed059e9d
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue3539.hx
@@ -0,0 +1,21 @@
+package unit.issues;
+
+class Issue3539 extends unit.Test {
+	function test() {
+		var s = "";
+		for (i in (10 : To100)) {
+            s += i;
+        }
+		eq("10111213141516171819", s);
+	}
+}
+
+private abstract To100(Int) from Int {
+    public inline function new(start:Int) this = start;
+    public inline function hasNext() : Bool return this < 20;
+    public inline function next() : Int {
+        var next = this;
+        this = this + 1;
+        return next;
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3545.hx b/tests/unit/src/unit/issues/Issue3545.hx
index 148bdc7e2327be4e11b6c83b75e9b111d2c45b24..41f4e6b924d44f6972e3bbfb573b78f6aca7bac4 100644
--- a/tests/unit/src/unit/issues/Issue3545.hx
+++ b/tests/unit/src/unit/issues/Issue3545.hx
@@ -10,5 +10,7 @@ typedef T2<T:Constraint> = {
 
 class Issue3545 extends Test {
 	// if it compiles it works
-	function test() { }
+	function test() {
+		noAssert();
+	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3547.hx b/tests/unit/src/unit/issues/Issue3547.hx
index 35d5e29f335fe9c2306b5f479e17fa5d2f88f8f8..06d27391bb77674cdf256918c7702cbb48a1ddd3 100644
--- a/tests/unit/src/unit/issues/Issue3547.hx
+++ b/tests/unit/src/unit/issues/Issue3547.hx
@@ -10,6 +10,7 @@ class Issue3547 extends Test {
 		var o = {foo:12, "x-bar":13};
 		assign(o);
 		assign({foo:12, "x-bar":13});
+		noAssert();
 	}
 
 	static function assign(o:Option) { }
diff --git a/tests/unit/src/unit/issues/Issue3557.hx b/tests/unit/src/unit/issues/Issue3557.hx
deleted file mode 100644
index 0933dfbcec2fb9522f247c970d086249bc91ceae..0000000000000000000000000000000000000000
--- a/tests/unit/src/unit/issues/Issue3557.hx
+++ /dev/null
@@ -1,26 +0,0 @@
-package unit.issues;
-
-private class MyBaseClass {
-	public function new():Void {}
-}
-
-private class MyClass extends Generic<MyBaseClass> {
-	public function new():Void {
-		super();
-	}
-}
-
-private interface Interface {}
-
-@:generic
-private class Generic<Default:haxe.Constraints.Constructible<Void->Void>>
-	extends Default
-	implements Interface {}
-
-class Issue3557 extends Test {
-	function test() {
-		new MyBaseClass();
-		new Generic<MyBaseClass>();
-		new MyClass();
-	}
-}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3585.hx b/tests/unit/src/unit/issues/Issue3585.hx
index a4304d5ff15353c373de72a437ffe5299168de02..111f0accacb64dd5d32fb750e2fa34af58d695c0 100644
--- a/tests/unit/src/unit/issues/Issue3585.hx
+++ b/tests/unit/src/unit/issues/Issue3585.hx
@@ -2,7 +2,7 @@ package unit.issues;
 import unit.Test;
 
 class Issue3585 extends Test {
-	#if (flash || java || cs || cpp) // this is only relevant on static platforms
+	#if static // this is only relevant on static platforms
 	function test() {
 		var v = inlineUnwrap();
 		eq(getType(v), "Int");
diff --git a/tests/unit/src/unit/issues/Issue3592.hx b/tests/unit/src/unit/issues/Issue3592.hx
index 343711adbec0013982b16cb120b2447ff92620c6..c43352eae42bcadf97c75bf415dab756d7d5ccca 100644
--- a/tests/unit/src/unit/issues/Issue3592.hx
+++ b/tests/unit/src/unit/issues/Issue3592.hx
@@ -8,7 +8,7 @@ private class A {
 	}
 
 	@:generic
-	@:extern // easy way of testing if things inline
+	extern // easy way of testing if things inline
 	public inline function inlineFoo<T>(x : T) {
 		return 'inline A ${x}';
 	}
diff --git a/tests/unit/src/unit/issues/Issue3615.hx b/tests/unit/src/unit/issues/Issue3615.hx
index 439ef16ae49be8b1f547eb0c65ddc6bedaedf51f..93c9f73e2fe933424e17890f59caa5193d4374f6 100644
--- a/tests/unit/src/unit/issues/Issue3615.hx
+++ b/tests/unit/src/unit/issues/Issue3615.hx
@@ -21,6 +21,6 @@ private class SubClassTwo extends BaseClass<String>
 
 class Issue3615 extends Test {
 	function test() {
-
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3616.hx b/tests/unit/src/unit/issues/Issue3616.hx
index 5dbb46bc2ab3dd925890533a0c7172fbbae36c58..e83f58edb63581ef8c7ed445d1063b5f13efed16 100644
--- a/tests/unit/src/unit/issues/Issue3616.hx
+++ b/tests/unit/src/unit/issues/Issue3616.hx
@@ -12,7 +12,7 @@ private abstract B<T>(T) {
 private abstract C(Null<Int>) {
 	public static var f(get,set):Int;
 	static function get_f() return 1;
-	static function set_f(value) return 1;
+	static function set_f(_) return 1;
 }
 
 class Issue3616 extends Test {
diff --git a/tests/unit/src/unit/issues/Issue3639.hx b/tests/unit/src/unit/issues/Issue3639.hx
index 0b1fe56b8f7c68ec86b8b7690b59016c72a3306d..dd1320add17a59ea6a4546269c4010400ff398ae 100644
--- a/tests/unit/src/unit/issues/Issue3639.hx
+++ b/tests/unit/src/unit/issues/Issue3639.hx
@@ -46,5 +46,6 @@ class Issue3639 extends Test {
 		hf(MyClass, "testMember_String");
 		hf(MyClass, "eachMember_IntIterator");
 		#end
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3649.hx b/tests/unit/src/unit/issues/Issue3649.hx
index b113c920ccc56ce7fd53293214c9f1584110740e..7a01fbcd1e7aaaea94f183878a4428e8621008c2 100644
--- a/tests/unit/src/unit/issues/Issue3649.hx
+++ b/tests/unit/src/unit/issues/Issue3649.hx
@@ -1,7 +1,6 @@
 package unit.issues;
 
-@:enum
-abstract HttpStatus(Int) {
+enum abstract HttpStatus(Int) {
 	var NotFound = 404;
 	var MethodNotAllowed = 405;
 }
diff --git a/tests/unit/src/unit/issues/Issue3665.hx b/tests/unit/src/unit/issues/Issue3665.hx
index 4f95e742e1df6081aff699e88dd4b248dff14bc5..140b9c18a20b8fcfc834bbaa9eee972948038b93 100644
--- a/tests/unit/src/unit/issues/Issue3665.hx
+++ b/tests/unit/src/unit/issues/Issue3665.hx
@@ -1,7 +1,6 @@
 package unit.issues;
 
-@:enum
-private abstract E(Int) {
+private enum abstract E(Int) {
 	var A = 1;
 	var B = 2;
 }
diff --git a/tests/unit/src/unit/issues/Issue3713.hx b/tests/unit/src/unit/issues/Issue3713.hx
index d67b7caeb9e75b298672bf5348b20ebad24cffdd..2e80087dbad3f8eee20ad8d3c47de54f5555f84d 100644
--- a/tests/unit/src/unit/issues/Issue3713.hx
+++ b/tests/unit/src/unit/issues/Issue3713.hx
@@ -17,5 +17,6 @@ class Issue3713 extends Test {
 	function test() {
 		var b = new B<Int>();
 		var c = b.f();
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3717.hx b/tests/unit/src/unit/issues/Issue3717.hx
index bdcda530234edaa1c3a69006f326c09a914b369f..5c15e46824f60c10a273708d2c47561925b3428f 100644
--- a/tests/unit/src/unit/issues/Issue3717.hx
+++ b/tests/unit/src/unit/issues/Issue3717.hx
@@ -28,8 +28,9 @@ private abstract Metric (MetricCore) from MetricCore to MetricCore {
 	@:from static function fromFloat(v:Float) {
 		var m = new MetricCore();
 		m.dip = v;
-		return m;
+		return cast m;
 	}
+
 	@:to function toFloat() return this.dip;
 
 
diff --git a/tests/unit/src/unit/issues/Issue3767.hx b/tests/unit/src/unit/issues/Issue3767.hx
deleted file mode 100644
index 5f9d55478f6791c9e06951ccf1cb08749242e20e..0000000000000000000000000000000000000000
--- a/tests/unit/src/unit/issues/Issue3767.hx
+++ /dev/null
@@ -1,50 +0,0 @@
-package unit.issues;
-import unit.Test;
-#if java
-import java.vm.*;
-#elseif neko
-import neko.vm.*;
-#elseif cpp
-import cpp.vm.*;
-#end
-
-class Issue3767 extends Test
-{
-#if (java || (neko && !interp && !macro) || (cpp && !emscripten))
-	function testBasicLock()
-	{
-		var lock = new Lock();
-		//it starts locked
-		f(lock.wait(0.001));
-		lock.release();
-		t(lock.wait(.001));
-		f(lock.wait(.001));
-		f(lock.wait(.001));
-
-		lock.release();
-		t(lock.wait());
-		lock.release();
-		lock.release();
-		lock.release();
-		t(lock.wait());
-		t(lock.wait(.001));
-		t(lock.wait());
-		f(lock.wait(.001));
-
-		var cur = Sys.time();
-		Thread.create(function()
-		{
-			Sys.sleep(.01);
-			lock.release();
-		});
-		t(lock.wait(2.0));
-		t( (Sys.time() - cur) < 2 );
-		Thread.create(function()
-		{
-			Sys.sleep(.01);
-			lock.release();
-		});
-		t(lock.wait());
-	}
-#end
-}
diff --git a/tests/unit/src/unit/issues/Issue3771.hx b/tests/unit/src/unit/issues/Issue3771.hx
index 31dc0855e04771e07c6da296e5e3cf4cd54207b5..ac5fc3b53987be0e631b6cfec9ec400c009abbf9 100644
--- a/tests/unit/src/unit/issues/Issue3771.hx
+++ b/tests/unit/src/unit/issues/Issue3771.hx
@@ -2,11 +2,11 @@ package unit.issues;
 
 class Issue3771 extends Test
 {
+	#if cs
 	public function test()
 	{
-#if cs
 		var arr = [test];
 		eq(arr.indexOf(test),0);
-#end
 	}
+	#end
 }
diff --git a/tests/unit/src/unit/issues/Issue3777.hx b/tests/unit/src/unit/issues/Issue3777.hx
index 98cd47d449d553174e3c1ec49d13dfc67aadad84..26d9ba95f778d5760496e514f7eb16675d098846 100644
--- a/tests/unit/src/unit/issues/Issue3777.hx
+++ b/tests/unit/src/unit/issues/Issue3777.hx
@@ -2,7 +2,7 @@ package unit.issues;
 
 private class A<T:String> {
 	public function new() f();
-	function f():Map<T,Int> throw "not implemented";
+	function f():haxe.ds.Map<T,Int> throw "not implemented";
 }
 
 private class B extends A<String> {
@@ -13,5 +13,6 @@ class Issue3777 extends unit.Test {
 	function test() {
 		// if it compiles, it works
 		new B();
+		noAssert();
 	}
 }
diff --git a/tests/unit/src/unit/issues/Issue3781.hx b/tests/unit/src/unit/issues/Issue3781.hx
index 909f1d46e72dad2b66b929a57a89c841a1f523f4..58d311b6d9f158cbdc820f7f365a240325fef74c 100644
--- a/tests/unit/src/unit/issues/Issue3781.hx
+++ b/tests/unit/src/unit/issues/Issue3781.hx
@@ -14,6 +14,7 @@ class Issue3781 extends Test {
 
 	function test() {
 		call(new Ab());
+		noAssert();
 	}
 
 	static function call<T:Ab>(v:T) {
diff --git a/tests/unit/src/unit/issues/Issue3792.hx b/tests/unit/src/unit/issues/Issue3792.hx
new file mode 100644
index 0000000000000000000000000000000000000000..98a58f902dfde48fa8899e922ff084fac88e1c76
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue3792.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue3792 extends unit.Test {
+	function test() {
+		var arr = [];
+		for(x in [1, 2, 3]) {
+			arr.push(function() return x);
+		}
+
+		var result = [for(fn in arr) fn()];
+		aeq([1, 2, 3], result);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3804.hx b/tests/unit/src/unit/issues/Issue3804.hx
index e0457dec2c5c0f19c1ff760123d59e938ceea5a4..a340b055887ae0a666669c99525b2fc2a2a0a157 100644
--- a/tests/unit/src/unit/issues/Issue3804.hx
+++ b/tests/unit/src/unit/issues/Issue3804.hx
@@ -8,5 +8,6 @@ private class C<T> {
 class Issue3804 extends Test {
 	function test() {
 		var v:C<Int> = new C();
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3826.hx b/tests/unit/src/unit/issues/Issue3826.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8ff0b33bbefbf5084b15885743e0dfead7c12de7
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue3826.hx
@@ -0,0 +1,67 @@
+package unit.issues;
+
+class Issue3826 extends Test {
+
+	var inull : Null<Int> = null;
+	var fnull : Null<Float> = null;
+	var dnull : Dynamic = null;
+	var ival : Null<Int> = 5;
+	var fval : Null<Float> = 8.5;
+	var dval : Dynamic = 6;
+
+	function get( a = 2, b = 4.25 ) {
+		return ""+a+"/"+b;
+	}
+
+	public function test() {
+		eq( get(), "2/4.25" );
+		eq( get(5), "5/4.25" );
+		eq( get(5,8.5), "5/8.5" );
+
+		#if !flash
+		// flash does have two problems wrt these tests
+		// - not skippable nullable arg
+		// - explicit null args are cast to 0
+		eq( get(8.5), "2/8.5" );
+
+		eq( get(inull), "2/4.25" );
+		eq( get(inull,fnull), "2/4.25" );
+		eq( get(inull,inull), "2/4.25" );
+		eq( get(fnull), "2/4.25" );
+		eq( get(dnull,dnull), "2/4.25" );
+		eq( get(ival,fval), "5/8.5" );
+		eq( get(dval,dval), "6/6" );
+
+		#end
+	}
+
+	#if !((java && !jvm) || cs || flash)
+	public function testReflect() {
+		eq( Reflect.callMethod(this, get, []), "2/4.25" );
+		eq( Reflect.callMethod(this, get, [5]), "5/4.25" );
+		eq( Reflect.callMethod(this, get, [5,8.5]), "5/8.5" );
+		eq( Reflect.callMethod(this, get, [null,8.5]), "2/8.5" );
+
+		eq( Reflect.callMethod(this, get, [null]), "2/4.25" );
+		eq( Reflect.callMethod(this, get, [null,null]), "2/4.25" );
+		eq( Reflect.callMethod(this, get, [ival,fval]), "5/8.5" );
+		eq( Reflect.callMethod(this, get, [dval,dval]), "6/6" );
+	}
+	#end
+
+	function getOpt( ?a = 2, ?b = 4.25 ) {
+		return ""+a+"/"+b;
+	}
+
+	public function testOpt() {
+		eq( getOpt(), "2/4.25" );
+		eq( getOpt(5), "5/4.25" );
+		eq( getOpt(5,8.5), "5/8.5" );
+		eq( getOpt(8.5), "2/8.5" );
+
+		eq( getOpt(inull), "2/4.25");
+		eq( getOpt(inull,fnull), "2/4.25");
+		eq( getOpt(fnull), "2/4.25");
+	}
+
+}
diff --git a/tests/unit/src/unit/issues/Issue3844.hx b/tests/unit/src/unit/issues/Issue3844.hx
index dc54be341e238cb30e6d8aa84647f38807dd31d0..2f11e57fa0c49d37a28c98beffdf9580ea7ad9af 100644
--- a/tests/unit/src/unit/issues/Issue3844.hx
+++ b/tests/unit/src/unit/issues/Issue3844.hx
@@ -6,5 +6,6 @@ class Issue3844 extends Test {
 	function test() {
 		var n:A = {f: null};
 		do n = n.f while (n!=null && (n!=null || n!=null));
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3846.hx b/tests/unit/src/unit/issues/Issue3846.hx
index 2110e95bda6a96fc7e380498d35ad49cea998a49..9b81c5394d8e3ad37594deef154d9eb2845adac3 100644
--- a/tests/unit/src/unit/issues/Issue3846.hx
+++ b/tests/unit/src/unit/issues/Issue3846.hx
@@ -11,7 +11,7 @@ private class Extern {
 	}
 
 	@:overload( function (a:Int):Dynamic {})
-	@:extern
+	extern
 	inline public static function test(a:String):Dynamic {
 		return mytest(a);
 	}
@@ -20,10 +20,10 @@ private class Extern {
 #end
 
 class Issue3846 extends Test {
+	#if (!java && !cs)
 	function test() {
-		#if (!java && !cs)
 		eq("coucou", Extern.test("coucou"));
 		eq(1, Extern.test(1));
-		#end
 	}
+	#end
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3894.hx b/tests/unit/src/unit/issues/Issue3894.hx
index b36af79655fa2aee86c659148f6334587de88f4e..e9a8ba40ca424030a02450c181bba068c8eda67f 100644
--- a/tests/unit/src/unit/issues/Issue3894.hx
+++ b/tests/unit/src/unit/issues/Issue3894.hx
@@ -6,5 +6,6 @@ class Issue3894 extends Test {
 		// this doesn't actually error until post-processing so we cannot test it like this
 		//t(unit.HelperMacros.typeError((null : haxe.Int64)));
 		#end
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3935.hx b/tests/unit/src/unit/issues/Issue3935.hx
index 75915b5fca2b574dc55f869d77a519ce44b3e8bc..2144eee4c8a3a5a4afb32b8650dba14dcb463161 100644
--- a/tests/unit/src/unit/issues/Issue3935.hx
+++ b/tests/unit/src/unit/issues/Issue3935.hx
@@ -12,6 +12,7 @@ class Issue3935 extends Test {
 		var m2 = new MyClass();
 		var c:haxe.ds.ObjectMap<MyClass, Dynamic> = [m => 1, m2 => "1"];
 		var c:haxe.ds.EnumValueMap<haxe.macro.Expr.ExprDef, Dynamic> = [EBreak => 1, EContinue => "2"];
+		noAssert();
 	}
 
 	function testMap() {
@@ -21,6 +22,7 @@ class Issue3935 extends Test {
 		var m2 = new MyClass();
 		var c:Map<MyClass, Dynamic> = [m => 1, m2 => "1"];
 		var c:Map<haxe.macro.Expr.ExprDef, Dynamic> = [EBreak => 1, EContinue => "2"];
+		noAssert();
 	}
 
 	function testFail() {
diff --git a/tests/unit/src/unit/issues/Issue3949.hx b/tests/unit/src/unit/issues/Issue3949.hx
new file mode 100644
index 0000000000000000000000000000000000000000..08800ef3adebf0251c8ebee72558ae5e38333c16
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue3949.hx
@@ -0,0 +1,40 @@
+package unit.issues;
+
+class Issue3949 extends unit.Test {
+#if cs
+	function test() {
+		var a = new Arr<Issue3949>();
+		a.arr[0] = this;
+		checkCastClass(a.arr[0]);
+
+		var a = new Arr<Int>();
+		a.arr[0] = 10;
+		checkCastInt(10, a.arr[0]);
+
+		var a = new Arr<String>();
+		a.arr[0] = 'hello';
+		checkCastString('hello', a.arr[0]);
+	}
+
+	@:pure(false)
+	function checkCastClass(v:Issue3949) {
+		eq(this, v);
+	}
+
+	@:pure(false)
+	function checkCastInt(v1:Int, v2:Int) {
+		eq(v1, v2);
+	}
+
+	@:pure(false)
+	function checkCastString(v1:String, v2:String) {
+		eq(v1, v2);
+	}
+#end
+}
+#if cs
+private class Arr<T> {
+	public var arr = new cs.NativeArray<T>(1);
+	public function new() {}
+}
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue3979.hx b/tests/unit/src/unit/issues/Issue3979.hx
index b6ff3c6233d33a8820cc48e882ac857c9e62cf54..0c7fc1ef26438602326c80280af8bfeea310c809 100644
--- a/tests/unit/src/unit/issues/Issue3979.hx
+++ b/tests/unit/src/unit/issues/Issue3979.hx
@@ -7,9 +7,9 @@ import cs.NativeArray;
 
 class Issue3979 extends Test
 {
+	#if (java || cs)
 	public function test()
 	{
-#if (java || cs)
 		var v = 0;
 		var nv = NativeArray.make(1,2,3,4,5,6);
 		eq(nv.length,6);
@@ -18,6 +18,6 @@ class Issue3979 extends Test
 			eq(val,++v);
 		}
 		eq(v,6);
-#end
 	}
+	#end
 }
diff --git a/tests/unit/src/unit/issues/Issue4051.hx b/tests/unit/src/unit/issues/Issue4051.hx
index 9cdeffccc8f753baca06fd692dd464bcee0160b7..cacc52574e9fbe899390013b063da928d37df415 100644
--- a/tests/unit/src/unit/issues/Issue4051.hx
+++ b/tests/unit/src/unit/issues/Issue4051.hx
@@ -2,10 +2,10 @@ package unit.issues;
 
 class Issue4051 extends Test
 {
+	#if !flash
 	public function test()
 	{
-#if !flash
 		eq(Std.parseFloat("1154874.2868745863"), 1154874.2868745863);
-#end
 	}
+	#end
 }
diff --git a/tests/unit/src/unit/issues/Issue4076.hx b/tests/unit/src/unit/issues/Issue4076.hx
index e7e511e1b0d901407933f5cb6fb7d2f271e39a96..8a3f17fe6786d3e8b5f15966a25168683b6f422d 100644
--- a/tests/unit/src/unit/issues/Issue4076.hx
+++ b/tests/unit/src/unit/issues/Issue4076.hx
@@ -7,5 +7,6 @@ class Issue4076 extends Test {
 		while (b && ((i = 18) < 18)) {
 		  ++i;
 		}
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4086.hx b/tests/unit/src/unit/issues/Issue4086.hx
index 89c4f42b905b2922fd8799b4e0d8b1ca3a1bd65b..a4a160a5680c0f223aef0d10cb2869049604d28e 100644
--- a/tests/unit/src/unit/issues/Issue4086.hx
+++ b/tests/unit/src/unit/issues/Issue4086.hx
@@ -6,6 +6,7 @@ private typedef FruitItem = { name: String, count: Int };
 class Issue4086 extends Test {
 	function test() {
 		check(apply3("apple", 5));
+		noAssert();
 	}
 
 	static function check(item:GroceryItem) { }
diff --git a/tests/unit/src/unit/issues/Issue4103.hx b/tests/unit/src/unit/issues/Issue4103.hx
index a1d840389ed3511e299fbd5277146822dc9f5a1d..73ec0e458c1c5bddf40ededaa82f89bb4604c48f 100644
--- a/tests/unit/src/unit/issues/Issue4103.hx
+++ b/tests/unit/src/unit/issues/Issue4103.hx
@@ -1,7 +1,6 @@
 package unit.issues;
 
-@:enum
-private abstract IntAbstract(Int) from Int to Int {
+private enum abstract IntAbstract(Int) from Int to Int {
 	public static var value = 5;
 
 	var var1 = 1;
diff --git a/tests/unit/src/unit/issues/Issue4122.hx b/tests/unit/src/unit/issues/Issue4122.hx
index d4ac928c498c9bfbace114caf88e1c971132504e..229223314eda053f5963da072820753a3e911a56 100644
--- a/tests/unit/src/unit/issues/Issue4122.hx
+++ b/tests/unit/src/unit/issues/Issue4122.hx
@@ -1,7 +1,6 @@
 package unit.issues;
 
-@:enum
-private abstract Test2(Int) to Int {
+private enum abstract Test2(Int) to Int {
 	var PROP = 123;
 }
 
diff --git a/tests/unit/src/unit/issues/Issue4138.hx b/tests/unit/src/unit/issues/Issue4138.hx
deleted file mode 100644
index a83fb6df92202a5657337e0dbc5fbaaab4be11a8..0000000000000000000000000000000000000000
--- a/tests/unit/src/unit/issues/Issue4138.hx
+++ /dev/null
@@ -1,37 +0,0 @@
-package unit.issues;
-
-#if worker
-import js.html.compat.ArrayBuffer;
-
-@:keep class Issue4138 {
-	static function main():Void {
-		var b = new js.html.ArrayBuffer(1);
-		// `Type.getClassName` uses `js.Boot.__resolveNativeClass`, thus will test for #4183 too.
-		(untyped postMessage)(Type.getClassName(Type.getClass(b)));
-	}
-}
-#else
-class Issue4138 extends unit.Test
-{
-	#if js
-	public function test()
-	{
-		var NativeArrayBuffer = untyped Function("return typeof ArrayBuffer != 'undefined' ? ArrayBuffer : null")();
-		if (js.Browser.supported && untyped js.Browser.window.Worker && NativeArrayBuffer != null){
-			async(function(_, cb){
-				var myWorker = new js.html.Worker("bin/Issue4138_Worker.js");
-				myWorker.onmessage = function(e:Dynamic){
-					var className:String = e.data;
-					f(className == Type.getClassName(js.html.compat.ArrayBuffer));
-					cb(true);
-				}
-				myWorker.onerror = function(e){
-					log('${e.message} (${e.filename}:${e.lineno})');
-					t(false);
-				}
-			}, null, true);
-		}
-	}
-	#end
-}
-#end
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4149.hx b/tests/unit/src/unit/issues/Issue4149.hx
index 983508577ded56874fa80fcf4a62bcf497e0522e..c22a18288047abd4b248b3a6e66a2db0fc7906f5 100644
--- a/tests/unit/src/unit/issues/Issue4149.hx
+++ b/tests/unit/src/unit/issues/Issue4149.hx
@@ -4,5 +4,6 @@ class Issue4149 extends Test {
 	function test() {
 		var a = "a";
 		{};
+		noAssert();
 	}
 }
diff --git a/tests/unit/src/unit/issues/Issue4196.hx b/tests/unit/src/unit/issues/Issue4196.hx
index 551eb91274dcfd3e64a663672fd841b7ef89fe6f..bf70a84c09531232bbfb906ac1d0f6eda6a6932d 100644
--- a/tests/unit/src/unit/issues/Issue4196.hx
+++ b/tests/unit/src/unit/issues/Issue4196.hx
@@ -6,7 +6,7 @@ class Issue4196 extends Test {
 			'a' => {"id": { "deep" : 5 }},
 			'b' => {"id": {}}
 		];
-		var a:Map<String, {id:{}}>;
+		var a:haxe.ds.Map<String, {id:{}}>;
 		unit.HelperMacros.typedAs(f, a);
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4203.hx.disabled b/tests/unit/src/unit/issues/Issue4203.hx.disabled
deleted file mode 100644
index 3fcee8da04203bb53726720b954cbf4adbb2e95f..0000000000000000000000000000000000000000
--- a/tests/unit/src/unit/issues/Issue4203.hx.disabled
+++ /dev/null
@@ -1,29 +0,0 @@
-package unit.issues;
-
-class Issue4203 extends Test {
-	public function test() {
-#if !cpp
-		var val = new Thing1(true);
-		eq(val.getIt(), true);
-		t(val.getIt());
-#end
-	}
-}
-
-#if !cpp
-@:nativeGen
-private interface NativeItem<T> {
-    public function getIt() : T;
-}
-
-private class Thing1 implements NativeItem<Bool> {
-    var value: Bool;
-    public function new(value) {
-        this.value = value;
-    }
-
-    public function getIt() : Bool {
-        return value;
-    }
-}
-#end
diff --git a/tests/unit/src/unit/issues/Issue4222.hx b/tests/unit/src/unit/issues/Issue4222.hx
index bf4ff92b49ada72c6cee40524fe077b054f2e603..2d0081e9c4afb7344eec322df548fa3f8c0ffed7 100644
--- a/tests/unit/src/unit/issues/Issue4222.hx
+++ b/tests/unit/src/unit/issues/Issue4222.hx
@@ -18,5 +18,6 @@ class Issue4222 extends Test {
 	function test() {
 		var c = new Child();
 		var v = c.covariant();
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4232.hx b/tests/unit/src/unit/issues/Issue4232.hx
index 3fc0133060095234a5fe28c656ec14d653112673..949a422d1653603f725e4214d336f112009251d1 100644
--- a/tests/unit/src/unit/issues/Issue4232.hx
+++ b/tests/unit/src/unit/issues/Issue4232.hx
@@ -9,10 +9,10 @@ class Issue4232CreateMe {
 }
 
 class Issue4232 extends Test {
+	#if !hl // too many arguments in HL
 	function test() {
-		#if !hl
 		var c:Issue4232CreateMe = Type.createInstance(Issue4232CreateMe, [for (i in 1...15) "" + i]);
 		eq("1234567891011121314", c.value);
-		#end
 	}
+	#end
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4246.hx b/tests/unit/src/unit/issues/Issue4246.hx
index bd484faae08a993a4d9bed467028b7080b8923a8..a4db11bc3f1f0735ae1ac02ed01985a5079dac81 100644
--- a/tests/unit/src/unit/issues/Issue4246.hx
+++ b/tests/unit/src/unit/issues/Issue4246.hx
@@ -6,5 +6,6 @@ class Issue4246 extends Test {
 	function test() {
 		and();
 		_and();
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4277.hx b/tests/unit/src/unit/issues/Issue4277.hx
index 9e37516519594d7cd8da52630747fba99c810f79..835ba13faa16071396198ca9a814a01d8c535c9e 100644
--- a/tests/unit/src/unit/issues/Issue4277.hx
+++ b/tests/unit/src/unit/issues/Issue4277.hx
@@ -5,7 +5,7 @@ class Issue4277 extends Test {
 		t(unit.HelperMacros.typeError(fancyInlineMethod));
 	}
 
-	@:extern private inline static function fancyInlineMethod(y:Int = 3):Int {
+	extern private inline static function fancyInlineMethod(y:Int = 3):Int {
 		var x = 5;
 		return x + (x += x) - y;
 	}
diff --git a/tests/unit/src/unit/issues/Issue4287.hx b/tests/unit/src/unit/issues/Issue4287.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5d58cb60f9f043fa897b52bf445d0632ca2a9e1b
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue4287.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+import haxe.ds.Option;
+
+class Issue4287 extends unit.Test {
+	@:analyzer(no_user_var_fusion)
+	function test() {
+		eq(None, getNone());
+		var local = function(t = None) return t;
+		eq(None, local());
+	}
+
+	static function getNone(t = None) {
+		return t;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4310.hx b/tests/unit/src/unit/issues/Issue4310.hx
index 64681fcea6120b0793351c0107b9ffafdefbf388..4c5cf6a64d42de03f1b99c72c7e1baec814e7511 100644
--- a/tests/unit/src/unit/issues/Issue4310.hx
+++ b/tests/unit/src/unit/issues/Issue4310.hx
@@ -10,5 +10,6 @@ class Issue4310 extends Test {
 	function test() {
 		var child1:BaseClass = new Child1();
 		cast(child1, BaseClass);
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4312.hx b/tests/unit/src/unit/issues/Issue4312.hx
index 3e0f1c515aebffe5b3eecb4167df4b920a8fc7c7..523b7f1240e10013f48542e6f907da308e85d409 100644
--- a/tests/unit/src/unit/issues/Issue4312.hx
+++ b/tests/unit/src/unit/issues/Issue4312.hx
@@ -3,7 +3,7 @@ package unit.issues;
 class Issue4312 extends Test {
    function test():Void {
 		var a = getValue();
-		if (!a) return null;
+		t(HelperMacros.typeError(if (!a) return null));
     }
 
 	static function getValue() {
diff --git a/tests/unit/src/unit/issues/Issue4322.hx b/tests/unit/src/unit/issues/Issue4322.hx
index de36ce112574c31ce4d271739eded109b6e268c8..6e6a6c27d50bb02f484dab3d168b6c0a4dd78547 100644
--- a/tests/unit/src/unit/issues/Issue4322.hx
+++ b/tests/unit/src/unit/issues/Issue4322.hx
@@ -4,7 +4,7 @@ private class InlineTest {
 	public var a: Int;
 	public var b: Int;
 
-	@:extern
+	extern
 	public inline function new(a: Int, b: Int) {
 		this.a = a;
 		this.b = b;
diff --git a/tests/unit/src/unit/issues/Issue4327.hx.disabled b/tests/unit/src/unit/issues/Issue4327.hx
similarity index 100%
rename from tests/unit/src/unit/issues/Issue4327.hx.disabled
rename to tests/unit/src/unit/issues/Issue4327.hx
diff --git a/tests/unit/src/unit/issues/Issue4329.hx b/tests/unit/src/unit/issues/Issue4329.hx
index 2ed9994900b1f58b81b71a5e2912bec4a354d249..0ad1bea7ec5fe4f3d378d97ee2c1fd0355b9e00d 100644
--- a/tests/unit/src/unit/issues/Issue4329.hx
+++ b/tests/unit/src/unit/issues/Issue4329.hx
@@ -14,5 +14,6 @@ class Issue4329 extends Test {
 
 	function test() {
 		foo(12);
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4343.hx b/tests/unit/src/unit/issues/Issue4343.hx
index c036272997a0fbd9d93212458f581301c94a37f4..d3ab1938570c899024a783b187a5c47546251fa0 100644
--- a/tests/unit/src/unit/issues/Issue4343.hx
+++ b/tests/unit/src/unit/issues/Issue4343.hx
@@ -3,6 +3,7 @@ package unit.issues;
 class Issue4343 extends Test {
 	function test() {
 		(new SomeObject() : ISomeObject).call();
+		noAssert();
 	}
 }
 
diff --git a/tests/unit/src/unit/issues/Issue4397.hx b/tests/unit/src/unit/issues/Issue4397.hx
index b8878977ecf9988ef4e834a10ede2193330667ec..bce3d264a26c3f8fddc4770636137f898dabcab8 100644
--- a/tests/unit/src/unit/issues/Issue4397.hx
+++ b/tests/unit/src/unit/issues/Issue4397.hx
@@ -6,6 +6,7 @@ class Issue4397 extends Test {
 	#if js
 	function test() {
 		0.toFixed();
+		noAssert();
 	}
 
     static inline function toFixed(f:Float):String {
diff --git a/tests/unit/src/unit/issues/Issue4457.hx b/tests/unit/src/unit/issues/Issue4457.hx
index 0a951e940f53799cfccd7cc5c9058d7fdc1023cb..5f86200630485a10c7710cab0a8d07958ac298c9 100644
--- a/tests/unit/src/unit/issues/Issue4457.hx
+++ b/tests/unit/src/unit/issues/Issue4457.hx
@@ -14,6 +14,7 @@ class Issue4457 extends Test
 	public function test()
 	{
 		new B<A>();
+		noAssert();
 	}
 
 }
diff --git a/tests/unit/src/unit/issues/Issue4481.hx b/tests/unit/src/unit/issues/Issue4481.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6323a7c84f8490738c9c8fb6c75d9cefbba6c6bb
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue4481.hx
@@ -0,0 +1,21 @@
+package unit.issues;
+
+class Issue4481 extends unit.Test {
+	static var s:String = null;
+
+	function test() {
+		switch s {
+			case 'a': assert();
+			case _: eq(null, s);
+		}
+
+		eq(1, switch s {
+			case 'a': 0;
+			case _: 1;
+		});
+
+		switch s {
+			case '': assert();
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4501.hx b/tests/unit/src/unit/issues/Issue4501.hx
index 8e002cccf81d7e438591c8370cfac8a77a132910..c47b909d44be21439b1569dba9dd336f15ab827c 100644
--- a/tests/unit/src/unit/issues/Issue4501.hx
+++ b/tests/unit/src/unit/issues/Issue4501.hx
@@ -7,5 +7,6 @@ private class Dummy<T> {
 class Issue4501 extends Test {
 	function test() {
 		new Dummy(null);
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4581.hx b/tests/unit/src/unit/issues/Issue4581.hx.wtf
similarity index 100%
rename from tests/unit/src/unit/issues/Issue4581.hx
rename to tests/unit/src/unit/issues/Issue4581.hx.wtf
diff --git a/tests/unit/src/unit/issues/Issue4591.hx b/tests/unit/src/unit/issues/Issue4591.hx
index 904a56e6b7bcf472c6d9883659a05cf8f3590a25..6ecfd8655bf93ccce0a44d613c02334d818e707c 100644
--- a/tests/unit/src/unit/issues/Issue4591.hx
+++ b/tests/unit/src/unit/issues/Issue4591.hx
@@ -3,6 +3,7 @@ package unit.issues;
 class Issue4591 extends Test {
 	public function test() {
 		var x:C<C<String>> = null;
+		noAssert();
 	}
 }
 
diff --git a/tests/unit/src/unit/issues/Issue4639.hx b/tests/unit/src/unit/issues/Issue4639.hx
new file mode 100644
index 0000000000000000000000000000000000000000..724db35f3978ef3375e94152d6643084c26f06da
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue4639.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue4639 extends unit.Test {
+	static var Issue4639:Int = 10;
+	function test() {
+		eq(10, Issue4639);
+		eq(A, A);
+	}
+}
+
+private enum A { A; }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4644.hx b/tests/unit/src/unit/issues/Issue4644.hx
index e212702a8ee4cf7e64df8044cb1d320788a2b276..7f707640e75b52d45e016d3e955333862be5e6bb 100644
--- a/tests/unit/src/unit/issues/Issue4644.hx
+++ b/tests/unit/src/unit/issues/Issue4644.hx
@@ -10,7 +10,7 @@ class Issue4644 extends Test {
 			}} catch (e) {{
 				{1} = (e instanceof {2});
 			}}",
-			throw (new js.Error() : Dynamic),
+			throw (new js.lib.Error() : Dynamic),
 			isHaxeError,
 			#if js_unflatten
 			__js__("js._Boot.HaxeError")
@@ -20,5 +20,6 @@ class Issue4644 extends Test {
 		);
 		f(isHaxeError);
 		#end
+		noAssert();
 	}
 }
diff --git a/tests/unit/src/unit/issues/Issue4649.hx b/tests/unit/src/unit/issues/Issue4649.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6aeabd23e427a960a9709f41d7a4e30fe94c6d46
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue4649.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue4649 extends unit.Test {
+	static var v:Val<Float> = 10.5;
+	function test() {
+		v.incr();
+		eq(11.5, v);
+	}
+}
+
+private abstract Val<T:Float>(T) from T to T {
+	public inline function incr():Void
+		this++;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4672.hx b/tests/unit/src/unit/issues/Issue4672.hx
index 46d0882172f2eae148225f7f804364f44574265f..dd9cd7dd4cf0ce8277e37405cd216599b5c29608 100644
--- a/tests/unit/src/unit/issues/Issue4672.hx
+++ b/tests/unit/src/unit/issues/Issue4672.hx
@@ -20,5 +20,6 @@ class Issue4672 extends Test {
 
 		var x = new C2<String>();
 		x.test("foo");
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4677.hx b/tests/unit/src/unit/issues/Issue4677.hx
index 95152c3bb5d889f2138d7d60832ade0af36a1673..99308b9061b54fc1bace3dd55959485bb65c9678 100644
--- a/tests/unit/src/unit/issues/Issue4677.hx
+++ b/tests/unit/src/unit/issues/Issue4677.hx
@@ -3,7 +3,7 @@ package unit.issues;
 class Issue4677 extends Test {
 	function test() {
 		var x = switch ("foo") {
-			case _1: _1;
+			case var _1: _1;
 		}
 		eq("foo", x);
 	}
diff --git a/tests/unit/src/unit/issues/Issue4695.hx b/tests/unit/src/unit/issues/Issue4695.hx
index ddee85b8a7302b80c13371f1040f854e26e0cc0f..41838a9a2a939519c647dc252fb6522c31be5e14 100644
--- a/tests/unit/src/unit/issues/Issue4695.hx
+++ b/tests/unit/src/unit/issues/Issue4695.hx
@@ -9,7 +9,7 @@ class Issue4695 extends unit.Test {
 	public function testNull() {
 		f("" == null);
 		f(eqCheck("", null));
-		#if !(cpp || flash9 || as3 || java || cs || hl)
+		#if !static
 		f(false == null);
 		f(eqCheck(false, null));
 		#end
@@ -17,8 +17,8 @@ class Issue4695 extends unit.Test {
 
 	#if php
 	public function testNativeArray() {
-		var a1 = (untyped __php__)('array("f1" => 1, "f2" => 2, "f3" => 3)');
-		var a2 = (untyped __php__)('array("f1" => true, "f2" => "2", "f3" => 3)');
+		var a1 = php.Syntax.assocDecl({"f1" : 1, "f2" : 2, "f3" : 3});
+		var a2 = php.Syntax.assocDecl({"f1" : true, "f2" : "2", "f3" : 3});
 		f(a1 == a2);
 		f(eqCheck(a1, a2));
 	}
diff --git a/tests/unit/src/unit/issues/Issue4703.hx b/tests/unit/src/unit/issues/Issue4703.hx
index 7a984d3179ec284789bd4210c23cc0ba50e5531f..841bcd03c238296c0182c0ac1eb151aa9d4ec7d4 100644
--- a/tests/unit/src/unit/issues/Issue4703.hx
+++ b/tests/unit/src/unit/issues/Issue4703.hx
@@ -19,6 +19,7 @@ class Issue4703 extends Test {
 			m.y = 2;
 		}
 		useeeee(m.y);
+		noAssert();
 	}
 
 	static function useeeee(d:Dynamic) { }
diff --git a/tests/unit/src/unit/issues/Issue4705.hx b/tests/unit/src/unit/issues/Issue4705.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e12ee7f46202103a9b14d3ae0e8f24e4325acdf4
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue4705.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+class Issue4705 extends unit.Test {
+	function test() {
+		var a:Object = { foo: 12, bar: '13' };
+		var actual = [for(f in a) f];
+		actual.sort(Reflect.compare);
+		aeq(['bar', 'foo'], actual);
+	}
+}
+
+@:forward
+abstract Object(Dynamic) from Dynamic to Dynamic {
+	public function iterator ():Iterator<String> {
+		var fields = Reflect.fields (this);
+		if (fields == null) fields = [];
+		return fields.iterator();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4751.hx b/tests/unit/src/unit/issues/Issue4751.hx
index d5f230e47a90bb96fa1403142b2cf79b49f2baae..c692595614e567ae51d767d90050e884be5171bd 100644
--- a/tests/unit/src/unit/issues/Issue4751.hx
+++ b/tests/unit/src/unit/issues/Issue4751.hx
@@ -12,6 +12,7 @@ class Issue4751 extends Test{
 	function testNadako() {
 		var o:{?v:O} = {};
 		func(if (cond()) o.v.get() else throw "oh");
+		noAssert();
 	}
 
 	function testGama() {
@@ -23,6 +24,7 @@ class Issue4751 extends Test{
 			dy = t;
 		};
 		func(dy * 1.1);
+		noAssert();
 	}
 
 	static function cond() return true;
diff --git a/tests/unit/src/unit/issues/Issue4799.hx b/tests/unit/src/unit/issues/Issue4799.hx
new file mode 100644
index 0000000000000000000000000000000000000000..17dac1e00178b86a09d69cabdbf0eb4cb494c708
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue4799.hx
@@ -0,0 +1,29 @@
+package unit.issues;
+
+import unit.HelperMacros.typeString;
+
+class Issue4799 extends Test {
+	function test() {
+		eq(typeString((null : Int)), "Int");
+		eq(typeString((null : (Int))), "Int");
+		eq(typeString((null : (Int,Int)->Int)), "(Int, Int) -> Int");
+		eq(typeString((null : (a:Int,Int)->Int)), "(a : Int, Int) -> Int");
+		eq(typeString((null : (a:Int, b:Int)->Int)), "(a : Int, b : Int) -> Int");
+		eq(typeString((null : (a:Int, Int, ?String->Void, ?b:(Int->Int)->Int, c:(a:Int)->Void)->Int)),
+		                      "(a : Int, Int, (?String -> Void), ?b : ((Int -> Int) -> Int), c : ((a : Int) -> Void)) -> Int");
+		t(parseError("(Int,Int)->Int->Int"));
+		t(parseError("(a:Int)->Int->Int"));
+		eq(typeString((null : (Int,Int)->(Int->Int))), "(Int, Int) -> (Int -> Int)");
+		eq(typeString((null : (a:Int)->(Int->Int))), "(a : Int) -> (Int -> Int)");
+	}
+
+	static macro function parseError(s:String) {
+		var s = "(null : " + s + ")";
+		try {
+			haxe.macro.Context.parseInlineString(s, haxe.macro.Context.currentPos());
+			return macro false;
+		} catch (e:Any) {
+			return macro true;
+		}
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue4819.hx b/tests/unit/src/unit/issues/Issue4819.hx
index 52bc99d305ece2b5c31e558c09f2509e86e38206..2a895cb1c4c46bf71b9e442bfde3fdacf8ff784d 100644
--- a/tests/unit/src/unit/issues/Issue4819.hx
+++ b/tests/unit/src/unit/issues/Issue4819.hx
@@ -1,12 +1,10 @@
 package unit.issues;
 
-@:enum
-private abstract Enum1(Int) from Int to Int {
+private enum abstract Enum1(Int) from Int to Int {
 	var AA = 16;
 }
 
-@:enum
-private abstract Enum2(Int) from Int to Int {
+private enum abstract Enum2(Int) from Int to Int {
 	var BShl = Enum1.AA << 1;
 	var BShr = Enum1.AA >> 1;
 	var BUShr = Enum1.AA >>> 1;
diff --git a/tests/unit/src/unit/issues/Issue4843.hx b/tests/unit/src/unit/issues/Issue4843.hx
index 728ec385eab466123da1d94ab5c7643905074f0f..ac8323953bc7ca27652e0a15b42c2eec8012db16 100644
--- a/tests/unit/src/unit/issues/Issue4843.hx
+++ b/tests/unit/src/unit/issues/Issue4843.hx
@@ -9,5 +9,6 @@ private abstract A({}) from {} {
 class Issue4843 extends Test {
 	function test() {
 		var a:A = {};
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4862.hx b/tests/unit/src/unit/issues/Issue4862.hx
index 3a51d043f7bfc5441af0ef32addd92965b52a8f3..58db957f4328338f3283b303841a5497eab8bccb 100644
--- a/tests/unit/src/unit/issues/Issue4862.hx
+++ b/tests/unit/src/unit/issues/Issue4862.hx
@@ -2,7 +2,7 @@ package unit.issues;
 
 #if js
 @:native("__issue4862__http_status")
-@:enum private extern abstract HttpStatus(Int) to Int {
+private extern enum abstract HttpStatus(Int) to Int {
     var Ok;
     var NotFound;
 
diff --git a/tests/unit/src/unit/issues/Issue4867.hx b/tests/unit/src/unit/issues/Issue4867.hx
index 182b5e3c218c34936e74c0be68774ca77d5078df..d8a67629504825cf026606871b41972ea6159499 100644
--- a/tests/unit/src/unit/issues/Issue4867.hx
+++ b/tests/unit/src/unit/issues/Issue4867.hx
@@ -1,7 +1,6 @@
 package unit.issues;
 
-@:enum
-private abstract EnumAbstract(Int) to Int {
+private enum abstract EnumAbstract(Int) to Int {
     var a = 0;
     var b = 1;
 
diff --git a/tests/unit/src/unit/issues/Issue4878.hx b/tests/unit/src/unit/issues/Issue4878.hx
deleted file mode 100644
index 6f0d282911c7e2bdb889c23ace8e15f45de3b390..0000000000000000000000000000000000000000
--- a/tests/unit/src/unit/issues/Issue4878.hx
+++ /dev/null
@@ -1,24 +0,0 @@
-package unit.issues;
-#if java
-import java.vm.Thread;
-import java.vm.Mutex;
-#end
-
-class Issue4878 extends Test {
-  function test() {
-#if java
-    var mutex = new Mutex();
-    var thread = Thread.create(function() {
-      mutex.acquire();
-      mutex.acquire();
-      mutex.release();
-      Sys.sleep(.2);
-      mutex.release();
-    });
-    Sys.sleep(0.05);
-    f(mutex.tryAcquire());
-    Sys.sleep(.3);
-    t(mutex.tryAcquire());
-#end
-  }
-}
diff --git a/tests/unit/src/unit/issues/Issue4886.hx b/tests/unit/src/unit/issues/Issue4886.hx
index 8817bb144e0cfb14432d85114951be8e69e1ece7..873f57bc94baa53bf76eb87efc92ffee75ec9e5c 100644
--- a/tests/unit/src/unit/issues/Issue4886.hx
+++ b/tests/unit/src/unit/issues/Issue4886.hx
@@ -1,7 +1,7 @@
 package unit.issues;
 
 private class C {
-	@:extern inline function get() {
+	extern inline function get() {
 		var intStruct = { i: 0 };
 		return intStruct;
 	}
diff --git a/tests/unit/src/unit/issues/Issue4904.hx b/tests/unit/src/unit/issues/Issue4904.hx
index 5a24ad1ff158950b08b3ea724f7c09474dcd0ea2..fbe3d761601c45363652e9e2a0f06d59cf97412d 100644
--- a/tests/unit/src/unit/issues/Issue4904.hx
+++ b/tests/unit/src/unit/issues/Issue4904.hx
@@ -8,8 +8,7 @@ class Issue4904 extends Test {
 	}
 }
 
-@:enum
-abstract TestAbstract(Int) to Int {
+enum abstract TestAbstract(Int) to Int {
 	var A = 0;
 	var B = 1;
 	private var Invalid = -1;
diff --git a/tests/unit/src/unit/issues/Issue4918.hx b/tests/unit/src/unit/issues/Issue4918.hx
index 7c4bfe27b76fcc5fb6bffe303f7d4d991125dd04..ea3e3586df87382c54f5619413c78ea1ba8dd929 100644
--- a/tests/unit/src/unit/issues/Issue4918.hx
+++ b/tests/unit/src/unit/issues/Issue4918.hx
@@ -11,5 +11,6 @@ class Issue4918 extends Test {
 		var f = function() {
 			trace(minParams);
 		};
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4940.hx b/tests/unit/src/unit/issues/Issue4940.hx
index 15168e1ded16889dd48289e430add0252305f483..cf61d550b650a83cbefe4f7738341c5c1a2baae3 100644
--- a/tests/unit/src/unit/issues/Issue4940.hx
+++ b/tests/unit/src/unit/issues/Issue4940.hx
@@ -12,8 +12,7 @@ private class Base {
 private class A extends Base {}
 private class B extends Base {}
 
-@:enum
-private abstract K(Int) {
+private enum abstract K(Int) {
 	var grav = 19;
 	var other = 2;
 }
diff --git a/tests/unit/src/unit/issues/Issue4949.hx b/tests/unit/src/unit/issues/Issue4949.hx
index d85a04a141f31890a87bc07deea17b42b00efd8e..065ded9b50a2a46ef3069f3ed05ad4cfe894a639 100644
--- a/tests/unit/src/unit/issues/Issue4949.hx
+++ b/tests/unit/src/unit/issues/Issue4949.hx
@@ -12,9 +12,10 @@ class Issue4949 extends Test {
 		}
 	}
 
-	function next(d) { }
+	function next(_) { }
 
 	function test() {
 		foo();
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue4968.hx b/tests/unit/src/unit/issues/Issue4968.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4dceb09b5d31a5a89217925fd651449d8ec6bebe
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue4968.hx
@@ -0,0 +1,17 @@
+package unit.issues;
+
+private class C {
+	public final v:Int;
+	function new(v:Int) this.v = v;
+	static function f(v:Int) return v;
+
+	public static inline function g(?v = 0) return new C(v);
+	public static inline function g2(?v = 0) return f(v);
+}
+
+class Issue4968 extends Test {
+	function test() {
+		eq(C.g().v, 0);
+		eq(C.g2(), 0);
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue4973.hx b/tests/unit/src/unit/issues/Issue4973.hx
index 1672296fab1ac0e39d5eebd098182ca025a50e8f..b5a91de7534cfafbc57c2a8c768093a677230d74 100644
--- a/tests/unit/src/unit/issues/Issue4973.hx
+++ b/tests/unit/src/unit/issues/Issue4973.hx
@@ -1,11 +1,15 @@
 package unit.issues;
 
+#if php
+import php.Exception;
+#end
+
 class Issue4973 extends Test {
 	#if php
 	function test() {
 		try sys.io.File.getContent("not-existant")
-		catch(exc:php.Exception) t(untyped __php__("{0} instanceof \\Exception", exc))
-		catch(exc:Dynamic) t(untyped __php__("{0} instanceof Exception", exc));
+		catch(exc:Exception) t(Std.is(exc, Exception))
+		catch(exc:Dynamic) t(Std.is(exc, Exception));
 	}
 	#end
 }
diff --git a/tests/unit/src/unit/issues/Issue4986.hx b/tests/unit/src/unit/issues/Issue4986.hx
index 70f216214ab815f7e9dc637a8419a887b98a7ec2..da899559ddaae2f6552c7a94d29020d927f41c9f 100644
--- a/tests/unit/src/unit/issues/Issue4986.hx
+++ b/tests/unit/src/unit/issues/Issue4986.hx
@@ -6,6 +6,7 @@ class Issue4986 extends Test {
 			var v = new haxe.ds.Vector<Array<Float>>(1);
 			foo(v[0].length);
 		} catch (e:Dynamic) {}
+		noAssert();
 	}
 
 	function foo(_) {}
diff --git a/tests/unit/src/unit/issues/Issue4987.hx b/tests/unit/src/unit/issues/Issue4987.hx
index 386b78d4023278bdf2169b3fde357a56a9ac9c0e..f6944669cbc62b45663795112a5f9f2d40d8fa78 100644
--- a/tests/unit/src/unit/issues/Issue4987.hx
+++ b/tests/unit/src/unit/issues/Issue4987.hx
@@ -2,10 +2,11 @@ package unit.issues;
 
 class Issue4987 extends Test implements ISetter implements ISetter2 {
 	public var property(default, set):Int;
-	function set_property(i) return 0;
+	function set_property(_) return 0;
 
 	function test() {
 		property = 0;
+		noAssert();
 	}
 }
 
diff --git a/tests/unit/src/unit/issues/Issue4997.hx b/tests/unit/src/unit/issues/Issue4997.hx
index c12b38941e623d2c2b473ed402bd7f08b3ac96af..db9755db6a8a741cd0d6d1b0f22b1bce70680415 100644
--- a/tests/unit/src/unit/issues/Issue4997.hx
+++ b/tests/unit/src/unit/issues/Issue4997.hx
@@ -2,6 +2,7 @@ package unit.issues;
 
 class Issue4997 extends Test {
 	function test() {
+		noAssert();
 		var b = true;
 		if (b) {
 			return;
diff --git a/tests/unit/src/unit/issues/Issue5009.hx b/tests/unit/src/unit/issues/Issue5009.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4629ac84f0c9069180cdee0b0e310ce44e784960
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5009.hx
@@ -0,0 +1,10 @@
+package unit.issues;
+
+import unit.issues.misc.Issue5009Assert.ASSert;
+
+class Issue5009 extends unit.Test {
+	function test() {
+		ASSert(true);
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5016.hx b/tests/unit/src/unit/issues/Issue5016.hx
index f11376bdbe3cfa1e9b360ac52d327b1066a80312..0478494f868db70dd394b76b584997ac372d401a 100644
--- a/tests/unit/src/unit/issues/Issue5016.hx
+++ b/tests/unit/src/unit/issues/Issue5016.hx
@@ -1,11 +1,11 @@
 package unit.issues;
 
 class Issue5016 extends Test {
+	#if !cpp
 	function test() {
-		#if !cpp
 		var obj = {abc:null, def:1}
 		Reflect.deleteField(obj, 'def');
 		f(Reflect.hasField(obj, 'def'));
-		#end
 	}
+	#end
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5025.hx b/tests/unit/src/unit/issues/Issue5025.hx
index ce169156040aa0cc831532ae609861eb9d8f28d0..77514699ef3e192d22e0eca8f4cf2ae641390593 100644
--- a/tests/unit/src/unit/issues/Issue5025.hx
+++ b/tests/unit/src/unit/issues/Issue5025.hx
@@ -2,7 +2,7 @@ package unit.issues;
 
 class Issue5025 extends Test {
 	function test() {
-		// nothing to do here, we just want to see if the switch (null) compiles
+		noAssert();
 	}
 
 	function shouldCompile() {
diff --git a/tests/unit/src/unit/issues/Issue5027.hx b/tests/unit/src/unit/issues/Issue5027.hx
index 0378b8a4caeff0d9e918223d59cb3e65e80ec2f8..9be35ebba7701e9bfdcbee63296eec63b7e0af9a 100644
--- a/tests/unit/src/unit/issues/Issue5027.hx
+++ b/tests/unit/src/unit/issues/Issue5027.hx
@@ -4,5 +4,6 @@ class Issue5027 extends Test {
 	function test() {
 		var f:Void->Void = function() return null;
 		f();
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5031.hx b/tests/unit/src/unit/issues/Issue5031.hx
index 3763e90f528f3f881be5dc880b64d45876b5bb0b..4252e4f70b92db1393921b3a1053bb4ec6db3e14 100644
--- a/tests/unit/src/unit/issues/Issue5031.hx
+++ b/tests/unit/src/unit/issues/Issue5031.hx
@@ -26,6 +26,7 @@ class Issue5031 extends Test {
 				case B:
 			}
 		}
+		noAssert();
 	}
 
 	function isInvalidFrameHeader(hdr:MP3Header) {
diff --git a/tests/unit/src/unit/issues/Issue5039.hx b/tests/unit/src/unit/issues/Issue5039.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8fc3f340b16f5cb6cb9df57df2a8c6a2a1e2772a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5039.hx
@@ -0,0 +1,51 @@
+package unit.issues;
+
+private class C {
+	@:isVar public var prop(get,never):Int = 42;
+	function get_prop():Int throw "FAIL prop";
+
+	public function new() {}
+}
+
+class Issue5039 extends Test {
+	var getterCalled = false;
+	var setterCalled = false;
+
+	@:isVar var x(get,set):Int = 4;
+	function get_x():Int {
+		getterCalled = true;
+		return x;
+	}
+
+	function set_x(value:Int):Int {
+		setterCalled = true;
+		return x = value;
+	}
+
+	@:isVar public var c(get,never):C = new C();
+	function get_c():C throw "FAIL c";
+
+	function test() {
+		@:bypassAccessor x = x + 1;
+		t(getterCalled);
+		f(setterCalled);
+
+		getterCalled = false;
+
+		x = @:bypassAccessor x + 1;
+		f(getterCalled);
+		t(setterCalled);
+
+		setterCalled = false;
+
+		@:bypassAccessor x = @:bypassAccessor x + 1;
+		f(getterCalled);
+		f(setterCalled);
+
+		t(Std.is(@:bypassAccessor c, C));
+		#if !as3 // because as3 generates underlying field as protected, we cannot access it from outside :-/
+		eq(42, @:bypassAccessor (@:bypassAccessor c).prop);
+		eq(42, @:bypassAccessor @:bypassAccessor c.prop);
+		#end
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue5073.hx b/tests/unit/src/unit/issues/Issue5073.hx
index 6662458e34f366068ee6bc81fab3b1ad7618d308..bd70305290aee75366d89bc42750fbaafc1cd961 100644
--- a/tests/unit/src/unit/issues/Issue5073.hx
+++ b/tests/unit/src/unit/issues/Issue5073.hx
@@ -9,7 +9,8 @@ class Issue5073 extends Test {
 			}
 		}
 		pretendToRun(dontRunMe);
+		noAssert();
 	}
 
-	static function pretendToRun(f) { }
+	static function pretendToRun(_) { }
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5078.hx b/tests/unit/src/unit/issues/Issue5078.hx
index b3a1c007e915cf28baf60f88095fb8733bddb870..88c719b031f2e56734b3b55571a92eb75f0bc0c5 100644
--- a/tests/unit/src/unit/issues/Issue5078.hx
+++ b/tests/unit/src/unit/issues/Issue5078.hx
@@ -8,6 +8,8 @@ class Issue5078 extends Test {
 	function test() {
 		#if !(js || php || lua)
 		eq(getToLower()(), "abc");
+		#else
+		noAssert();
 		#end
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5108.hx b/tests/unit/src/unit/issues/Issue5108.hx
index b19e2c5662dd735b907569aade3a1f3d962b5224..55fc9233a3f7624da4704c16902f2f6c64532960 100644
--- a/tests/unit/src/unit/issues/Issue5108.hx
+++ b/tests/unit/src/unit/issues/Issue5108.hx
@@ -3,10 +3,11 @@ package unit.issues;
 class Issue5108 extends Test {
 	function test() {
 		// nothing to do here
+		noAssert();
 	}
 }
 
-class Signal implements ISignal {   
+class Signal implements ISignal {
 	public function add(listener:Void->Void):Void {}
 	public function destroy():Void {}
 }
diff --git a/tests/unit/src/unit/issues/Issue5155.hx b/tests/unit/src/unit/issues/Issue5155.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e3d255143f1ed721647f439c7aa4915594b05dbc
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5155.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue5155 extends unit.Test {
+    public function toString () {
+        var full = Type.getClassName(Type.getClass(this));
+        var short = full.split (".").pop ();
+        return "[object " + short + "]";
+    }
+
+    function test() {
+        unspec(() -> Type.getClass(this));
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5160.hx b/tests/unit/src/unit/issues/Issue5160.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9e8618f1c6301a3e4e78d8f9aa391f5a8e4dfa81
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5160.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue5160 extends unit.Test {
+	function test() {
+        var bytes = haxe.io.Bytes.alloc(256);
+        bytes.setInt32(0, -1241956892);
+		eq(-1241956892, bytes.getInt32(0));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5168.hx b/tests/unit/src/unit/issues/Issue5168.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e95570770fc769807c03ffaff111d0688a81a110
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5168.hx
@@ -0,0 +1,8 @@
+package unit.issues;
+
+class Issue5168 extends unit.Test {
+	function test() {
+		f(Std.is("hello", Issue5168));
+		f(Std.is(1, String));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5179.hx b/tests/unit/src/unit/issues/Issue5179.hx
index 7a3e3a3736cd7bf9d799677927b4e0fcb8daa690..87f1bf0dae76efec4f67587bbba7874139c54a8f 100644
--- a/tests/unit/src/unit/issues/Issue5179.hx
+++ b/tests/unit/src/unit/issues/Issue5179.hx
@@ -1,7 +1,6 @@
 package unit.issues;
 
-@:enum
-private abstract TP_KIND<T>(Int) {
+private enum abstract TP_KIND<T>(Int) {
 
     public function new () this = 0;
 
@@ -16,6 +15,6 @@ private abstract TP_KIND<T>(Int) {
 
 class Issue5179 extends unit.Test {
 	function test() {
-
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5255.hx b/tests/unit/src/unit/issues/Issue5255.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ecb8203d8f34440060de0a48bf3c84d8035f1d43
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5255.hx
@@ -0,0 +1,7 @@
+package unit.issues;
+
+class Issue5255 extends Test {
+	function test() {
+		eq(1, unit.issues.misc.Issue5255Class.test(1));
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue5270.hx b/tests/unit/src/unit/issues/Issue5270.hx
index c7596573a72c1ef3e79159c2f36459a0307930e3..4c38c98499ed815411a0f174effb55942a3a7ef2 100644
--- a/tests/unit/src/unit/issues/Issue5270.hx
+++ b/tests/unit/src/unit/issues/Issue5270.hx
@@ -5,11 +5,9 @@ import php.*;
 class Issue5270 extends unit.Test {
 #if php
 	function test() {
-		untyped __php__("
-			$_SERVER['CONTENT_TYPE'] = 'type';
-			$_SERVER['HTTP_USER_AGENT'] = 'browser';
-			$_SERVER['REDIRECT_HTTP_AUTHORIZATION'] = 'auth1';
-		");
+		SuperGlobal._SERVER['CONTENT_TYPE'] = 'type';
+		SuperGlobal._SERVER['HTTP_USER_AGENT'] = 'browser';
+		SuperGlobal._SERVER['REDIRECT_HTTP_AUTHORIZATION'] = 'auth1';
 
 		eq(Web.getClientHeader('Content-Type'), 'type');
 		eq(Web.getClientHeader('User-Agent'), 'browser');
diff --git a/tests/unit/src/unit/issues/Issue5289.hx b/tests/unit/src/unit/issues/Issue5289.hx
new file mode 100644
index 0000000000000000000000000000000000000000..39e2377b351a2ba823267c1a68e8f59962a2ce64
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5289.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue5289 extends Test {
+	static var minInt32:Int = -2147483648;
+
+	function test() {
+		eq(-2147483648, minInt32);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5303.hx b/tests/unit/src/unit/issues/Issue5303.hx
index 8c677f2402f6b86ee1b4c4fdc92673b0534424ec..59e5e54007df650dc2629db12e57f45a00a7b380 100644
--- a/tests/unit/src/unit/issues/Issue5303.hx
+++ b/tests/unit/src/unit/issues/Issue5303.hx
@@ -5,5 +5,6 @@ class Issue5303 extends unit.Test {
 		var a:Int = 0;
 		a = -2147483648 - a;
 		// we only care if this type-checks
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5323.hx b/tests/unit/src/unit/issues/Issue5323.hx
index b9ae1672970af02b5f9c39b05b8511a367b56330..649f2e3f6e1cc40d65bac90c21a0e8a237142629 100644
--- a/tests/unit/src/unit/issues/Issue5323.hx
+++ b/tests/unit/src/unit/issues/Issue5323.hx
@@ -1,13 +1,13 @@
 package unit.issues;
 class Issue5323 extends Test{
-	function new() super();
+	public function new() super();
     function test() {
     	var expected = 1;
         var actual = new Issue5323().doStuff(function() return 0);
         eq(actual, expected);
     }
 
-    function doStuff(self) {
+    function doStuff(_) {
         return doOtherStuff();
     }
 
diff --git a/tests/unit/src/unit/issues/Issue5362.hx b/tests/unit/src/unit/issues/Issue5362.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9b0a013118c39800a3eedf55c9004c077aaf5d9e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5362.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue5362 extends unit.Test {
+	@:analyzer(ignore)
+	function test() {
+		var a:UInt = Std.random(256);
+		var b = messType(a);
+		eq(a, b);
+	}
+
+	static inline function messType(r:Int):Int {
+		return 0xFF & r;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5384.hx b/tests/unit/src/unit/issues/Issue5384.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5363be760d213b0b110645ceb234190d1e4de72e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5384.hx
@@ -0,0 +1,21 @@
+package unit.issues;
+
+class Issue5384 extends unit.Test {
+	function test() {
+        var a:Dynamic = true;
+        a = "string";
+
+        var b:Dynamic = if (myFunc()) true else "string";
+
+        var c:Dynamic = myFunc() ? true : "string";
+
+        var d:Dynamic = myFunc() ? myFunc() : "string";
+
+        var e:Dynamic = try myFunc() catch(e:Dynamic) "string";
+		noAssert();
+	}
+
+    static function myFunc():Bool {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5392.hx b/tests/unit/src/unit/issues/Issue5392.hx
index 12344700b5e3bac76d28e9ca219abf31229ed6eb..151222988a50d8c34ef3e6a6f06dba5c2446690c 100644
--- a/tests/unit/src/unit/issues/Issue5392.hx
+++ b/tests/unit/src/unit/issues/Issue5392.hx
@@ -3,7 +3,7 @@ package unit.issues;
 private abstract A(Int) from Int {
     public function size() {
         return switch (this) {
-            case size: size;
+            case var size: size;
         }
     }
 }
diff --git a/tests/unit/src/unit/issues/Issue5399.hx b/tests/unit/src/unit/issues/Issue5399.hx
new file mode 100644
index 0000000000000000000000000000000000000000..94652fc093858683ef881f75de42ff3f14438652
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5399.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+class Issue5399 extends Test {
+#if cs
+  public function test() {
+    var s:Something = null;
+    s.width = 10;
+    eq(s.width, 10);
+  }
+#end
+}
+
+#if cs
+@:keep @:struct private class Something {
+  public var width:Float;
+  public function new() {
+  }
+}
+#end
diff --git a/tests/unit/src/unit/issues/Issue5432.hx b/tests/unit/src/unit/issues/Issue5432.hx
index c2a1453c98b1f75e8918ca511d6a7edb2b562440..ca4f1076485d07e88a8a930959bbea6fbaccb5f0 100644
--- a/tests/unit/src/unit/issues/Issue5432.hx
+++ b/tests/unit/src/unit/issues/Issue5432.hx
@@ -21,5 +21,5 @@ private class Point
 	public var x:Float = 1;
 	public var y:Float = 2;
 
-	@:extern inline public function new() {}
+	extern inline public function new() {}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5449.hx b/tests/unit/src/unit/issues/Issue5449.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0a781d1e83880a03dad606e144c191a27a5239ad
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5449.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+class Issue5449 extends unit.Test {
+	function test() {
+		var s:Struct = {y:20};
+		eq(20, s.y);
+		eq(100, s.x);
+
+		var s:Struct = {x:50, y:10};
+		eq(10, s.y);
+		eq(50, s.x);
+	}
+}
+
+@:structInit
+private class Struct {
+	public var x:Int = 100;
+	public var y:Int;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5486.hx b/tests/unit/src/unit/issues/Issue5486.hx
new file mode 100644
index 0000000000000000000000000000000000000000..05ea00555e51beaeb7b062dff5f096ca7486303e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5486.hx
@@ -0,0 +1,32 @@
+package unit.issues;
+
+import haxe.ds.Option;
+
+class Issue5486 extends unit.Test {
+	function test() {
+		function check(v) {
+			switch v {
+				case Some(10): noAssert();
+				case _: assert();
+			}
+		}
+
+		var inputDynamic:Dynamic = 10;
+		var inputNullDynamic:Null<Dynamic> = 10;
+		var x:Option<Int>;
+		x = Some(inputDynamic);
+		check(x);
+		x = Some(inputNullDynamic);
+		check(x);
+
+		check(broken(10));
+	}
+
+	static function broken(?input:Dynamic):Option<Int>{
+		if(Std.is(input, Int)){
+			return Some(input);
+		} else {
+			return None;
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5493.hx b/tests/unit/src/unit/issues/Issue5493.hx
new file mode 100644
index 0000000000000000000000000000000000000000..87ada09b48fa134da61bc73ffeacf0168c88ce7a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5493.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+using haxe.Int64Helper;
+
+class Issue5493 extends Test {
+	function test() {
+		t(Int64Helper.parseString('1') == 1);
+		t(Int64Helper.parseString('10') == 10);
+		t(Int64Helper.parseString('-1') == -1);
+		t(Int64Helper.parseString('-10') == -10);
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue5505.hx b/tests/unit/src/unit/issues/Issue5505.hx
index d44b86918ce2a54dfff05d914f87ce1ead87e5fd..bcab45239faf4877073b69c20c06a2faf313460c 100644
--- a/tests/unit/src/unit/issues/Issue5505.hx
+++ b/tests/unit/src/unit/issues/Issue5505.hx
@@ -1,13 +1,13 @@
 package unit.issues;
 
 class Issue5505 extends Test {
+	#if (java || cs)
   function test() {
-#if (java || cs)
     eq(StringTools.urlEncode('~'), '~');
     eq(StringTools.urlDecode(StringTools.urlEncode('~')), '~');
     eq(StringTools.urlDecode(StringTools.urlEncode('-')), '-');
     eq(StringTools.urlDecode('%7E'), '~');
     eq(StringTools.urlDecode('%7e'), '~');
-#end
   }
+  #end
 }
diff --git a/tests/unit/src/unit/issues/Issue5543.hx b/tests/unit/src/unit/issues/Issue5543.hx
index 03934f7bcb6bd43a7d2aad545b7d3770db355831..6e8b09bb5fb3db7b8e03971402457eea02acca55 100644
--- a/tests/unit/src/unit/issues/Issue5543.hx
+++ b/tests/unit/src/unit/issues/Issue5543.hx
@@ -3,6 +3,7 @@ package unit.issues;
 class Issue5543 extends Test {
 	function test() {
 		f1({ i: 5 });
+		noAssert();
 	}
 
 	static function f1(n:NullableInt) {
diff --git a/tests/unit/src/unit/issues/Issue5544.hx b/tests/unit/src/unit/issues/Issue5544.hx
index e49947fe0d2179ecc2a183a1e7eacfb598bab6ce..19e85d4ec9f2975c7e898c86e7b810d27637a12c 100644
--- a/tests/unit/src/unit/issues/Issue5544.hx
+++ b/tests/unit/src/unit/issues/Issue5544.hx
@@ -15,7 +15,7 @@ private abstract A(T) {
 
 	public function new();
 
-	@:to @:extern inline function toC():C {
+	@:to extern inline function toC():C {
 		return null;
 	}
 
diff --git a/tests/unit/src/unit/issues/Issue5556.hx b/tests/unit/src/unit/issues/Issue5556.hx
index ac829e5750ff552b62229bebe64088378632cbfe..b48f1358d212109781dc10b5c44b57e897997220 100644
--- a/tests/unit/src/unit/issues/Issue5556.hx
+++ b/tests/unit/src/unit/issues/Issue5556.hx
@@ -5,6 +5,8 @@ class Issue5556 extends unit.Test {
 		var x = dynamicFunc(randomCall());
 		#if (!flash && !js)
 		eq(1, x);
+		#else
+		noAssert();
 		#end
 	}
 
@@ -13,5 +15,5 @@ class Issue5556 extends unit.Test {
 		return 1;
 	}
 
-	static dynamic function dynamicFunc(x) return x;
+	static dynamic function dynamicFunc(x:Dynamic) return x;
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5565.hx b/tests/unit/src/unit/issues/Issue5565.hx
index eafa04a11c2ef0a7b852d6cc8958915911ccf589..925649848ef4a4170832ffb760b2ae6b373a7c1e 100644
--- a/tests/unit/src/unit/issues/Issue5565.hx
+++ b/tests/unit/src/unit/issues/Issue5565.hx
@@ -1,9 +1,9 @@
 package unit.issues;
 
 class Issue5565 extends Test {
+	#if php
 	function test() {
-		#if php
-        t(Std.is(untyped __php__('[]'), php.NativeArray));
-        #end
+		t(Std.is(php.Syntax.arrayDecl(), php.NativeArray));
 	}
+	#end
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5572.hx b/tests/unit/src/unit/issues/Issue5572.hx
index 207f94d2139efc81416b811bef784171cf190064..51f05b17595eb387080834d3e6240c1c5d579515 100644
--- a/tests/unit/src/unit/issues/Issue5572.hx
+++ b/tests/unit/src/unit/issues/Issue5572.hx
@@ -5,10 +5,10 @@ class Issue5572 extends unit.Test {
 	static var field1 = "baseReward";
 	static var field2 = "user_3235_65290";
 
+	#if !neko
 	function test() {
-		#if !(neko || hl)
 		var o = {};
-		Reflect.setField(o, field1, 1); // first, goes into hashes array 
+		Reflect.setField(o, field1, 1); // first, goes into hashes array
 		Reflect.setField(o, field2, 2); // second, added to object's "conflicts"
 		Reflect.setField(o, field2, 3); // should find one from "conflicts" and change the value
 		eq(Reflect.field(o, field1), 1); // retrieved from the hashes array
@@ -24,6 +24,6 @@ class Issue5572 extends unit.Test {
 		eq(Reflect.field(o, field1), null);
 		eq(Reflect.field(o, field2), null);
 		eq(Reflect.fields(o).length, 0);
-		#end
 	}
+	#end
 }
diff --git a/tests/unit/src/unit/issues/Issue5584.hx b/tests/unit/src/unit/issues/Issue5584.hx
index 30f2ceae468acbaef67e988262db40d25c837591..37e12987db1825e4faea55443d15030e88a6fe91 100644
--- a/tests/unit/src/unit/issues/Issue5584.hx
+++ b/tests/unit/src/unit/issues/Issue5584.hx
@@ -5,6 +5,7 @@ import cpp.Object;
 import haxe.io.Bytes;
 
 class Issue5584 extends Test {
+	#if false
 	function test() {
 		var callable = new Callable<Object->Object>(cffi_decompress);
 		var bytes = Bytes.alloc (100);
@@ -14,4 +15,5 @@ class Issue5584 extends Test {
 	function cffi_decompress(a:Dynamic):Dynamic {
 		return null;
 	}
+	#end
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5599.hx b/tests/unit/src/unit/issues/Issue5599.hx
new file mode 100644
index 0000000000000000000000000000000000000000..562ddf0f6267eadbb03e23484c7100e5f137c3fd
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5599.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+private abstract I(Int) from Int to Int {
+    @:op(A==B)
+    @:commutative
+    public function eqString(s:String):Bool
+        return Std.string(this) == s;
+}
+
+class Issue5599 extends unit.Test {
+	function test() {
+        var i:I = 1;
+        t(i == '1');
+        t('1' == i);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5608.hx b/tests/unit/src/unit/issues/Issue5608.hx
index a8d41f5d6e68c5e7c5ee7a0fa9d139524b39d9b9..da15a7dcfd59469ff3a1474291341ad9b6cffd83 100644
--- a/tests/unit/src/unit/issues/Issue5608.hx
+++ b/tests/unit/src/unit/issues/Issue5608.hx
@@ -1,6 +1,6 @@
 package unit.issues;
 
-class Issue5608 extends unit.Test implements Dynamic<Bool> {
+class Issue5608 extends unit.Test {
 	var fields:Array<String>;
 
 	function test() {
@@ -9,5 +9,5 @@ class Issue5608 extends unit.Test implements Dynamic<Bool> {
 		t(true);
 	}
 
-	public function resolve( name ) return true;
+	public function resolve(_) return true;
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5691.hx b/tests/unit/src/unit/issues/Issue5691.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a0b01464f0a3a138fa0424134af5e27e9a147f54
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5691.hx
@@ -0,0 +1,31 @@
+package unit.issues;
+
+import haxe.format.JsonParser;
+
+class Issue5691 extends unit.Test {
+	function test() {
+		var jsons =  ['trueeee', 'falseah', 'nullol', '123asd', '{"a" : 1} trail'];
+		for (j in jsons) {
+			try {
+				JsonParser.parse(j);
+				t(false);
+			} catch(e:Dynamic) {
+				t(true);
+			}
+		}
+		try {
+			JsonParser.parse("1e2");
+			t(true);
+		}
+		catch (e:Dynamic) {
+			t(false);
+		}
+		try {
+			JsonParser.parse("1e2.5");
+			t(false);
+		}
+		catch(e:Dynamic) {
+			t(true);
+		}
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue5693.hx b/tests/unit/src/unit/issues/Issue5693.hx
index 8e5713e7d35b70d73528729c11f32f3e0161b1e6..75349746d00c9ea576405abd058cbe319623f0ad 100644
--- a/tests/unit/src/unit/issues/Issue5693.hx
+++ b/tests/unit/src/unit/issues/Issue5693.hx
@@ -1,6 +1,7 @@
 package unit.issues;
 import haxe.io.*;
 class Issue5693 extends Test{
+	#if !lua
 	function test(){
 		var original:Float = 0.012755102040816;
 		var btOutput:BytesOutput = new BytesOutput();
@@ -11,9 +12,7 @@ class Issue5693 extends Test{
 		var btInput:BytesInput = new BytesInput(byteArray);
 		var copyVal:Float = btInput.readDouble();
 
-#if !lua
-//TODO
 		eq(original, copyVal);
-#end
 	}
+	#end
 }
diff --git a/tests/unit/src/unit/issues/Issue5751.hx b/tests/unit/src/unit/issues/Issue5751.hx
new file mode 100644
index 0000000000000000000000000000000000000000..da7a5bacd835494ee413e48428ed6c810354e617
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5751.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+class Issue5751 extends Test {
+#if cs
+  public function test() {
+    var arr = @:privateAccess (new Array(new cs.NativeArray(10)) : Array<Null<Int>>);
+    eq(arr[0], null);
+    arr[0] = 100;
+    eq(arr[0], 100);
+  }
+#end
+}
diff --git a/tests/unit/src/unit/issues/Issue5757.hx b/tests/unit/src/unit/issues/Issue5757.hx
index be991ea8a5d11779e2cec7d9613170bb01366c5e..a62624f2b1fe57db3686af9284955efe4d8658de 100644
--- a/tests/unit/src/unit/issues/Issue5757.hx
+++ b/tests/unit/src/unit/issues/Issue5757.hx
@@ -1,19 +1,11 @@
 package unit.issues;
 
-#if sys
-import sys.db.Types;
-import sys.db.Object;
-
-class SpodRtti extends Object {
-	public var id : SId;
-}
-#end
+@rtti("hello")
+private class SpodRtti {}
 
 class Issue5757 extends unit.Test {
-#if sys
 	function test() {
 		var rtti = haxe.rtti.Meta.getType( SpodRtti ).rtti;
 		t(rtti != null);
 	}
-#end
-}
\ No newline at end of file
+}
diff --git a/tests/unit/src/unit/issues/Issue5783.hx b/tests/unit/src/unit/issues/Issue5783.hx
index db52c4232a3af26228dc6a7557663c56b728c5d4..c4204eabe4cd225239d18e0fe4278d815543e2a0 100644
--- a/tests/unit/src/unit/issues/Issue5783.hx
+++ b/tests/unit/src/unit/issues/Issue5783.hx
@@ -9,5 +9,6 @@ class Issue5783 extends unit.Test {
 	function test() {
 		function add(i:I) return i + 1;
 		var f = add.bind('1');
+		noAssert();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5793.hx b/tests/unit/src/unit/issues/Issue5793.hx
new file mode 100644
index 0000000000000000000000000000000000000000..79f8887d323f58980abca897974514b3fa2a294c
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5793.hx
@@ -0,0 +1,24 @@
+package unit.issues;
+
+class Issue5793 extends Test {
+  public function test() {
+    function run1() {
+      function foo <T> (expected:Array<T>, a:T) {
+        eq(expected[0], a);
+      }
+      foo([2], 2);
+    }
+    run1();
+
+    function run2() {
+      function bar<A>(expected:Array<A>, a:A) {
+        function baz<B>(expected:Array<B>, b:B) {
+          eq(expected[0], b);
+        }
+        baz(expected,a);
+      }
+      bar([42],42);
+    }
+    run2();
+  }
+}
diff --git a/tests/unit/src/unit/issues/Issue5816.hx b/tests/unit/src/unit/issues/Issue5816.hx
new file mode 100644
index 0000000000000000000000000000000000000000..80807a0872b619d9bab0d5582cd3933fde5eb073
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5816.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+import haxe.Int64;
+
+class Issue5816 extends unit.Test {
+	static var value:Int64 = 0;
+
+	function test() {
+		t(value == 0);
+		value++;
+		t(value == 1);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5848.hx b/tests/unit/src/unit/issues/Issue5848.hx
index 514842a539a141ce7307fd3a961d15955a19ae2c..6b5b096e8040c60f627fc8d1aad0a994aab0856f 100644
--- a/tests/unit/src/unit/issues/Issue5848.hx
+++ b/tests/unit/src/unit/issues/Issue5848.hx
@@ -32,6 +32,7 @@ private class Vec2s {
 class Issue5848 extends unit.Test {
 	function test():Void {
 		ff(new Degree(90));
+		noAssert();
 	}
 
 	static public function ff(r:Radian) {
diff --git a/tests/unit/src/unit/issues/Issue5851.hx b/tests/unit/src/unit/issues/Issue5851.hx
index ae5258e3ff64b0a871a334793831fc5672684bc5..25ce7550979a8ef374d2f25107374b94c4740173 100644
--- a/tests/unit/src/unit/issues/Issue5851.hx
+++ b/tests/unit/src/unit/issues/Issue5851.hx
@@ -2,6 +2,7 @@ package unit.issues;
 
 class Issue5851 extends unit.Test {
 	function test() {
+		noAssert();
 		try {
 			return "";
 		} catch ( s : Dynamic ) {
diff --git a/tests/unit/src/unit/issues/Issue5859.hx b/tests/unit/src/unit/issues/Issue5859.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7433c84361bbeac30baf7449e5901982149d36e0
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5859.hx
@@ -0,0 +1,10 @@
+package unit.issues;
+
+class Issue5859 extends unit.Test {
+	@:analyzer(no_const_propagation)
+	@:analyzer(no_fusion)
+	function test() {
+		var await = 1;
+		eq(1, await);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue5862.hx b/tests/unit/src/unit/issues/Issue5862.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d8d07df97f9a7752c488058146fa08478e378f9b
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue5862.hx
@@ -0,0 +1,107 @@
+package unit.issues;
+import haxe.ds.*;
+#if java
+import java.NativeArray;
+#elseif cs
+import cs.NativeArray;
+#end
+
+class Issue5862 extends Test {
+#if (java || cs)
+  public function test() {
+    var imap = new IntMap();
+    imap.set(0, "val1");
+    imap.set(1, "val2");
+    imap.set(2, "val3");
+    imap.set(2, "changed_val3");
+
+    var v:Vector<Dynamic> = cast @:privateAccess imap.vals;
+    for (i in 0...v.length) {
+      t(v[i] != "val3");
+    }
+
+    var smap = new StringMap();
+    smap.set("v1", "val1");
+    smap.set("v2", "val2");
+    smap.set("v3", "val3");
+    smap.set("v3", "changed_val3");
+
+    var v:Vector<Dynamic> = cast @:privateAccess smap.vals;
+    for (i in 0...v.length) {
+      t(v[i] != "val3");
+    }
+
+    var omap = new ObjectMap<{}, String>();
+    omap.set(imap, "val1");
+    omap.set(smap, "val2");
+    omap.set(omap, "val3");
+    omap.set(omap, "changed_val3");
+
+    var v:Vector<Dynamic> = cast @:privateAccess omap.vals;
+    for (i in 0...v.length) {
+      t(v[i] != "val3");
+    }
+#if java
+    var wmap = new WeakMap<{}, String>();
+    wmap.set(imap, "val1");
+    wmap.set(smap, "val2");
+    wmap.set(omap, "val3");
+    wmap.set(omap, "changed_val3");
+
+    var v = @:privateAccess wmap.entries;
+    for (i in 0...v.length) {
+      t(v[i] == null || v[i].value != "val3");
+    }
+#end
+
+    var imap = new IntMap();
+    imap.set(0, "val1");
+    imap.set(1, "val2");
+    imap.set(2, "val3");
+    imap.set(2, "changed_val3");
+    imap.set(1, "changed_val2");
+
+    var v:Vector<Dynamic> = cast @:privateAccess imap.vals;
+    for (i in 0...v.length) {
+      t(v[i] != "val2");
+    }
+
+    var smap = new StringMap();
+    smap.set("v1", "val1");
+    smap.set("v2", "val2");
+    smap.set("v3", "val3");
+    smap.set("v3", "changed_val3");
+    smap.set("v2", "changed_val2");
+
+    var v:Vector<Dynamic> = cast @:privateAccess smap.vals;
+    for (i in 0...v.length) {
+      t(v[i] != "val2");
+    }
+
+    var omap = new ObjectMap<{}, String>();
+    omap.set(imap, "val1");
+    omap.set(smap, "val2");
+    omap.set(omap, "val3");
+    omap.set(omap, "changed_val3");
+    omap.set(smap, "changed_val2");
+
+    var v:Vector<Dynamic> = cast @:privateAccess omap.vals;
+    for (i in 0...v.length) {
+      t(v[i] != "val2");
+    }
+#if java
+    var wmap = new WeakMap<{}, String>();
+    wmap.set(imap, "val1");
+    wmap.set(smap, "val2");
+    wmap.set(omap, "val3");
+    wmap.set(omap, "changed_val3");
+    wmap.set(smap, "changed_val2");
+
+    var v = @:privateAccess wmap.entries;
+    for (i in 0...v.length) {
+      t(v[i] == null || v[i].value != "val2");
+    }
+#end
+  }
+#end
+}
diff --git a/tests/unit/src/unit/issues/Issue5923.hx b/tests/unit/src/unit/issues/Issue5923.hx
index 1b37517725364b67f3a070fd9e176dd0ef70d146..52603c7c6f2e21062966270d8073a4dcc2b45b66 100644
--- a/tests/unit/src/unit/issues/Issue5923.hx
+++ b/tests/unit/src/unit/issues/Issue5923.hx
@@ -1,14 +1,14 @@
 package unit.issues;
 
-#if php7
+#if php
 import php.Syntax.*;
 #end
 
 class Issue5923 extends unit.Test {
-#if php7
+#if php
 	function test() {
 		//These expressions should not fail at runtime
-		binop({}, '??', null).value = 1;
+		coalesce(({}:Dynamic), null).value = 1;
 		object(arrayDecl()).value = 1;
 		array({})['value'] = 1;
 
diff --git a/tests/unit/src/unit/issues/Issue6016.hx b/tests/unit/src/unit/issues/Issue6016.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e584fa75832f9de05bccf88e88728148b32c8251
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6016.hx
@@ -0,0 +1,25 @@
+package unit.issues;
+
+// order of definition matters here, see https://github.com/HaxeFoundation/haxe/issues/6016
+
+private interface I<T> {
+	function f(v:T):Int;
+}
+
+private class C implements I<E> {
+	public function new() {}
+	public function f(v:E) return 42;
+}
+
+private enum E {
+	A;
+}
+
+class Issue6016 extends Test {
+	var c:I<E>;
+
+	function test(){
+		c = new C();
+		eq(c.f(A), 42);
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6036.hx b/tests/unit/src/unit/issues/Issue6036.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ccf325fd13fbb895f38798f78ad1fddda39399a6
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6036.hx
@@ -0,0 +1,33 @@
+package unit.issues;
+
+using Lambda;
+
+private class TYPE {
+    public function new() {}
+    public function iterator():Iterator<Int> return new IntIterator(0, 1);
+}
+
+private abstract ABSTRACT(TYPE) {
+    public var array(get, never):Bool;
+    function get_array() return true;
+
+    public function new() {
+        this = new TYPE();
+	}
+
+	public function getArray() {
+        return array;
+	}
+
+	public function getThisArray() {
+        return this.array;
+    }
+}
+
+class Issue6036 extends unit.Test {
+	function test() {
+		var a = new ABSTRACT();
+		HelperMacros.typedAs(a.getArray(), true);
+		HelperMacros.typedAs(a.getThisArray(), (null : Void -> Array<Int>));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6039.hx b/tests/unit/src/unit/issues/Issue6039.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cc9c02cb87ae0347dff4a9b60e9c2cfead4c1fe7
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6039.hx
@@ -0,0 +1,31 @@
+package unit.issues;
+#if cs
+import cs.system.Action_1;
+#end
+
+class Issue6039 extends Test
+{
+	#if cs
+  public function test()
+  {
+    var myStr = null;
+    var c:Callback = function(str) myStr = str;
+    c.invokeIt('test');
+    this.eq(myStr, 'test');
+  }
+  #end
+}
+
+#if cs
+@:keep
+private abstract Callback(cs.system.Action_1<String>) from Action_1<String> to Action_1<String>{
+	function new(f)
+		this = f;
+
+	public function invokeIt(data:String):Void
+		this.Invoke(data);
+
+	@:from static function fromHaxeFunc(foo:String->Void):Callback
+		return new Callback(new Action_1<String>(foo));
+}
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6059.hx b/tests/unit/src/unit/issues/Issue6059.hx
new file mode 100644
index 0000000000000000000000000000000000000000..431cdea694205847d73a5ff08a098ea8c7632e24
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6059.hx
@@ -0,0 +1,36 @@
+package unit.issues;
+
+class Issue6059 extends Test {
+#if !as3 // See #6891
+	public static inline function foo (name : B, ?id : B, data : Array<String>) : Void { }
+
+	public static function test () : Void {
+		Issue6059.foo ("", []); // -> stackoverflow
+		Issue6059.foo ("", null, []); // ok
+	}
+#end
+}
+
+private abstract A (String) {
+	public inline function new (value : String) {
+		this = value;
+	}
+	@:from
+		public static function fromB (value : B) : A {
+			return new A (Std.string (value));
+		}
+}
+
+private abstract B (String) {
+	public inline function new (value : String) {
+		this = value;
+	}
+	@:from
+		public static function fromString (value : String) : B {
+			return new B (value);
+		}
+	@:from
+		public static function fromA (value : A) : B  {
+			return new B (Std.string (value));
+		}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6106.hx b/tests/unit/src/unit/issues/Issue6106.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1b5ea77b565105474702f4146e3b013f7f382ca6
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6106.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue6106 extends unit.Test {
+	function test() {
+		var code = 0;
+		function assertEquals<T>(expected:T, actual:T) {
+			if(expected != actual) code++;
+		}
+
+		var f = function() assertEquals(1, 1);
+		f();
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6133.hx b/tests/unit/src/unit/issues/Issue6133.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0ca7c2ae5b3bbffd42ecdc070c4d26456734098f
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6133.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+private class Foo {
+	private var __a:Int;
+	public var b:Int;
+	public function new() {}
+}
+
+class Issue6133 extends unit.Test {
+	function test() {
+		var foo = new Foo();
+		switch foo {
+			case { b: 5 }:
+			case { b: _ }:
+		}
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6135.hx b/tests/unit/src/unit/issues/Issue6135.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3ee0ffeffca26452f281d771092aaef963accc06
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6135.hx
@@ -0,0 +1,10 @@
+package unit.issues;
+
+class Issue6135 extends unit.Test {
+	@:analyzer(ignore)
+	function test() {
+		var x:Array<Dynamic> = [1];
+		x[0] = "hi";
+		t(x[0] == "hi");
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6145.hx b/tests/unit/src/unit/issues/Issue6145.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ca3c7e7bb0becd456ead4fa7947500f7446e5456
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6145.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue6145 extends unit.Test {
+	#if (!cs && !php)
+	function test() {
+		var r = ~/(a)/;
+		r.match("a");
+		exc(() -> r.matched(2));
+	}
+	#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6147.hx b/tests/unit/src/unit/issues/Issue6147.hx
new file mode 100644
index 0000000000000000000000000000000000000000..74548a7de7085ca40d745456c3c36792a9867ec2
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6147.hx
@@ -0,0 +1,22 @@
+package unit.issues;
+
+@:keep
+private class A {
+	public var a:Int;
+}
+
+@:keep
+private class B extends A {
+	public var b:Int;
+}
+
+class Issue6147 extends unit.Test {
+	function test() {
+		aeq(['a'], Type.getInstanceFields(A));
+		var v = Type.getInstanceFields(B);
+		eq(2, v.length);
+		t(v.indexOf("a") != -1);
+		t(v.indexOf("b") != -1);
+		aeq(['a'], Type.getInstanceFields(A));
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6169.hx b/tests/unit/src/unit/issues/Issue6169.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e327ee0ae7bad5089d904ed547422fd012f661be
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6169.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+class Rec {
+	var x : Int = 0;
+	public inline function new(rec:Bool) {
+		if ( rec ) {
+			var r = new Rec(false);
+			x = r.x;
+		}
+	}
+}
+
+class Issue6169 extends unit.Test {
+	function test() {
+		var r = new Rec(false);
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6175.hx b/tests/unit/src/unit/issues/Issue6175.hx
index ea678945eeb477b2153b0221f51f6fa536bb9430..10e7f5e68ad3444e273a585d58e9272b862eb38a 100644
--- a/tests/unit/src/unit/issues/Issue6175.hx
+++ b/tests/unit/src/unit/issues/Issue6175.hx
@@ -6,7 +6,7 @@ class Issue6175 extends unit.Test {
     }
 }
 
-@:enum abstract Method(String) {
+enum abstract Method(String) {
     var GET = 'GET';
 	public static function test() return Method.GET;
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6177.hx b/tests/unit/src/unit/issues/Issue6177.hx
index 70b03e929a9849a31a190ae21d9a0199463b6889..59ee34801d43120eaae722b3f9eeb05b2e0149a4 100644
--- a/tests/unit/src/unit/issues/Issue6177.hx
+++ b/tests/unit/src/unit/issues/Issue6177.hx
@@ -1,5 +1,7 @@
 package unit.issues;
 
+import haxe.ds.List;
+
 class Issue6177 extends unit.Test {
     function test() {
         var list = new List();
diff --git a/tests/unit/src/unit/issues/Issue6211.hx b/tests/unit/src/unit/issues/Issue6211.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d21163feaeaef33445f67129b1ab32634147a276
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6211.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue6211 extends unit.Test {
+
+    function test() {
+        var d:Dynamic = this;
+        t(Reflect.isFunction(d.test));
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6215.hx b/tests/unit/src/unit/issues/Issue6215.hx
new file mode 100644
index 0000000000000000000000000000000000000000..31856c0ec69f08ceeeebc9c0955a2e2910e95cfb
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6215.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+class Issue6215 extends unit.Test {
+	function test() {
+		var a:Action<Issue6215> = null;
+		var signal:Abstr<Child> = null;
+		signal += a;
+		noAssert();
+	}
+}
+
+private class Child extends Issue6215 {}
+
+private typedef Action<T> = T->Void;
+
+private abstract Abstr<T>(Dynamic) {
+	@:op(x += y) function opAdd(fn:Action<T>) return this;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6224.hx b/tests/unit/src/unit/issues/Issue6224.hx
new file mode 100644
index 0000000000000000000000000000000000000000..671a505c17ec60e3b8fa827cb898a67266dd99a1
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6224.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+private abstract S(String) from String {
+	inline function asString() return this;
+	@:op(a in b) inline static function contains(a:S, b:S) return b.asString().indexOf(a.asString()) != -1;
+}
+
+class Issue6224 extends unit.Test {
+	function test() {
+		var s:S = "hello";
+		t("hell" in s);
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6259.hx b/tests/unit/src/unit/issues/Issue6259.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2a4e21b0b65918a7a46a0e9cd56f20b941d03ea2
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6259.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+class Issue6259 extends Test{
+	function test(){
+		function f(a) return a.b;
+		var res = f({b: (s) -> s.length})("6259");
+		eq(res,4);
+
+		var res = f({b: (s) -> s.length})({ length : 10});
+		eq(res,10);
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6266.hx b/tests/unit/src/unit/issues/Issue6266.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4b8659c0fcd4719fcd672a798db0ea6da98c62a0
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6266.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue6266 extends unit.Test {
+
+	function test() {
+		var foo = "foo";
+		eq(Reflect.field(foo, "length"), 3);
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6267.hx b/tests/unit/src/unit/issues/Issue6267.hx
new file mode 100644
index 0000000000000000000000000000000000000000..71649654f192fa866d4a14e20f6d36e44aa865fd
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6267.hx
@@ -0,0 +1,23 @@
+package unit.issues;
+
+class Issue6267 extends unit.Test {
+
+	function test() {
+		eq(doTest(0), 1);
+	}
+
+	static function doTest(v:Int) {
+		while (true) {
+			switch (v) {
+				case 0: return call({f: impure()});
+				case 1: break;
+				case _: break;
+			}
+		}
+		return 42;
+	}
+
+	static function call(o:{f:Int}) return o.f;
+
+	@:pure(false) static function impure() return 1;
+}
diff --git a/tests/unit/src/unit/issues/Issue6276.hx b/tests/unit/src/unit/issues/Issue6276.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b0a5d975512e92dc3e14af6bca365f693e433ed5
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6276.hx
@@ -0,0 +1,44 @@
+package unit.issues;
+
+using Reflect;
+
+class Issue6276 extends unit.Test {
+	#if (!java && !cs)
+	function test(){
+		var s = "bar";
+
+		var length = s.field("length");
+		eq(3, length);
+
+		var charAt = s.field("charAt");
+		eq(s.charAt(0), Reflect.callMethod(s, charAt, [0]));
+
+		var charCodeAt = s.field("charCodeAt");
+		eq(s.charCodeAt(0), Reflect.callMethod(s, charCodeAt, [0]));
+
+		var indexOf = s.field("indexOf");
+		eq(s.indexOf("a"), Reflect.callMethod(s, indexOf, ["a"]));
+
+		var lastIndexOf = s.field("lastIndexOf");
+		eq(s.lastIndexOf("r"), Reflect.callMethod(s, lastIndexOf, ["r"]));
+
+		var split = s.field("split");
+		eq(s.split("a")[1], Reflect.callMethod(s, split, ["a"])[1]);
+
+		var substr = s.field("substr");
+		eq(s.substr(1),Reflect.callMethod(s, substr, [1, 2]));
+
+		var substring = s.field("substring");
+		eq(s.substring(0, 2), Reflect.callMethod(s, substring, [0, 2]));
+
+		var toLowerCase = s.toUpperCase().field("toLowerCase");
+		eq(s, Reflect.callMethod(s, toLowerCase, []));
+
+		var toUpperCase = s.field("toUpperCase");
+		eq(s.toUpperCase(), Reflect.callMethod(s, toUpperCase, []));
+
+		var toString = s.field("toString");
+		eq(s.toString(), Reflect.callMethod(s, toString, []));
+	}
+	#end
+}
diff --git a/tests/unit/src/unit/issues/Issue6281.hx b/tests/unit/src/unit/issues/Issue6281.hx
index b030d3b879b959c872a25706e2094bcde491f0a9..4843a36f3b4f3e311d567616452c29f3db995cd5 100644
--- a/tests/unit/src/unit/issues/Issue6281.hx
+++ b/tests/unit/src/unit/issues/Issue6281.hx
@@ -10,4 +10,4 @@ class Issue6281 extends unit.Test {
     public function test() {
         eq('foo', check);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/src/unit/issues/Issue6285.hx b/tests/unit/src/unit/issues/Issue6285.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cfe53d992ec9e706c06613fedb17e7506b6feaf6
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6285.hx
@@ -0,0 +1,27 @@
+package unit.issues;
+
+private enum E1 {
+	A1;
+	B1;
+	C1;
+}
+
+private enum E2 {
+	A2;
+	B2;
+	C2;
+}
+
+class Issue6285 extends unit.Test {
+	function test() {
+		f(getA1() == getA2());
+	}
+
+	static function getA1():Dynamic {
+		return A1;
+	}
+
+	static function getA2():Dynamic {
+		return A2;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6290.hx b/tests/unit/src/unit/issues/Issue6290.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2877926f1466c1abe83a0a299ce94de439ca9340
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6290.hx
@@ -0,0 +1,34 @@
+package unit.issues;
+
+private class Parent {
+	public function new() {}
+}
+
+private class Child extends Parent {}
+
+private class TakeParent {
+	public function new(parent:Parent) {}
+}
+
+private class TakeChild extends TakeParent {
+	public function new(child:Child) {
+		super(child);
+		if (!Std.is(child, Child)) throw 'wtf?';
+	}
+}
+
+class Issue6290 extends unit.Test {
+	@:generic static function get<Arg, Cls:haxe.Constraints.Constructible<Arg->Void>>(a:Arg, c:Class<Cls>) {
+		return new Cls(a);
+	}
+
+	function test() {
+		var parent = new Parent(),
+		    child = new Child();
+
+		get(parent, TakeParent);
+		get(child, TakeChild);
+		t(unit.HelperMacros.typeError(get(parent, TakeChild)));
+		get(child, TakeParent);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6291.hx b/tests/unit/src/unit/issues/Issue6291.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dc748a2bc2dda82a732c88365e9018e6e4119f15
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6291.hx
@@ -0,0 +1,35 @@
+package unit.issues;
+
+class Issue6291 extends Test
+{
+  public function test()
+  {
+    var b = new BadCode();
+    eq(b.d1.get('a'), 1);
+  }
+}
+
+#if (cs || java)
+@:nativeGen @:keep
+#end
+private class BadCode {
+  public var d1:Dictionary= new Dictionary();
+  public var d2:Dictionary= new Dictionary();
+  public var d3:Dictionary= new Dictionary();
+  public var d4:Dictionary= new Dictionary();
+  public var d5:Dictionary;
+
+  public function new() {
+    d5 = new Dictionary();
+  }
+}
+
+@:forward
+private abstract Dictionary(Map<String, Dynamic>)
+{
+  inline public function new()
+  {
+    this = new Map();
+    this.set('a', 1);
+  }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6298.hx b/tests/unit/src/unit/issues/Issue6298.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d969c1cbd47d9ed2daff777507f850735e068e72
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6298.hx
@@ -0,0 +1,27 @@
+package unit.issues;
+class Issue6298 extends unit.Test {
+	public function test(){
+		var tst = new Some ();
+		var ddd = "SOME";
+		eq (tst.testCall (ddd), ddd);
+	}
+}
+
+class Test {
+	public static function good (s : String) : String {
+		return s;
+	}
+}
+
+class Some {
+	var call : String -> String;
+
+	public function new () {
+		call = Test.good;
+	}
+
+	public function testCall (s : String) : String {
+		return call (s);
+	}
+}
+
diff --git a/tests/unit/src/unit/issues/Issue6299.hx b/tests/unit/src/unit/issues/Issue6299.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6bba1444be5f86fc6ce04a332c200dd7f38aaedf
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6299.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+class Issue6299 extends unit.Test {
+    public function test() {
+        t(true);
+    }
+}
+
+@:keep
+enum Expr {
+	EArray( e : Expr, index : Expr );
+}
diff --git a/tests/unit/src/unit/issues/Issue6315.hx b/tests/unit/src/unit/issues/Issue6315.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7f14d5a44c0576440920ebdfde6b5e025e7a5b8a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6315.hx
@@ -0,0 +1,25 @@
+package unit.issues;
+
+class Issue6315 extends unit.Test {
+	function test() {
+		noAssert();
+		try if(throw "ok") { } catch(e:Dynamic) { }
+		try if(throw "ok") { } else { } catch(e:Dynamic) { }
+		try switch throw "ok" { case _: } catch(e:Dynamic) { }
+
+		try if(return "ok") { } catch(e:Dynamic) { }
+		try if(return "ok") { } else { } catch(e:Dynamic) { }
+		try switch return "ok" { case _: } catch(e:Dynamic) { }
+
+		while (true) {
+			try if(break) { } catch(e:Dynamic) { }
+			try if(break) { } else { } catch(e:Dynamic) { }
+			try switch break { case _: } catch(e:Dynamic) { }
+
+			try if(continue) { } catch(e:Dynamic) { }
+			try if(continue) { } else { } catch(e:Dynamic) { }
+			try switch continue { case _: } catch(e:Dynamic) { }
+		}
+		return "";
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6325.hx b/tests/unit/src/unit/issues/Issue6325.hx
new file mode 100644
index 0000000000000000000000000000000000000000..763983cc86002ad126e13b7b740fe68fa0b468e6
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6325.hx
@@ -0,0 +1,51 @@
+package unit.issues;
+
+class Issue6325 extends Test {
+#if (!hl && !flash && !cpp && !as3)
+  public function test() {
+    var base = new Base();
+    base.someInt = 42;
+    var child = new Child();
+    child.otherInt = 142;
+    child.someInt = 242;
+
+    var ubase = new UsesBase();
+    var uchild = new UsesChild();
+
+    eq(ubase.doSomething(child), 142);
+    eq(uchild.doSomething(child), 242);
+    eq(uchild.doSomethingBase(child), 243);
+    eq(uchild.doSomething(( child : Base )), 242);
+    eq(uchild.doSomethingBase(( child : Base )), 243);
+    eq(uchild.doSomething(base), 42);
+    eq(uchild.doSomethingBase(base), 43);
+  }
+}
+
+private class Base {
+  public var someInt:Int = 0;
+  public function new() {}
+}
+private class Child extends Base {
+  public var otherInt:Int = 0;
+}
+
+private class UsesBase {
+  public function new() {
+  }
+
+  public function doSomething(child:Child) {
+    return child.otherInt;
+  }
+}
+
+private class UsesChild extends UsesBase {
+  override public function doSomething(base:Base) {
+    return base.someInt;
+  }
+
+  public function doSomethingBase(base:Base) {
+    return doSomething(base) + 1;
+  }
+#end
+}
diff --git a/tests/unit/src/unit/issues/Issue6342.hx b/tests/unit/src/unit/issues/Issue6342.hx
new file mode 100644
index 0000000000000000000000000000000000000000..92402abcfe73a367738556a85de9972b4e17839a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6342.hx
@@ -0,0 +1,32 @@
+package unit.issues;
+
+class Issue6342 extends unit.Test {
+	@:analyzer(no_optimize)
+	function test() {
+		var t = new A(1);
+		var tmp1 = t.foo().x;
+		eq(1, tmp1);
+		
+		var tmp2 = ({
+			new A(2);
+		}).x;
+		eq(2, tmp2);
+	}
+}
+
+@:keep
+private class A
+{
+	public var x:Int;
+	
+	@:analyzer(no_optimize)
+	public inline function new(x) {
+		this.x = x;
+	}
+	
+	@:analyzer(no_optimize)
+	public inline function foo() {
+		var tmp = x;
+		return new A(x);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6349.hx b/tests/unit/src/unit/issues/Issue6349.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c1c1fd416ec977f226e4fa25e0f21bec78f355d5
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6349.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+class Issue6349 extends Test{
+	function test() {
+		var a = [];
+		for (i in 1...5) {
+			try {
+				if (i== 1) {
+					throw null;
+				}
+				a.push(i);
+			}
+			catch (_:Dynamic) {
+				continue;
+			}
+		}
+		eq(a + '', '[2,3,4]');
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6369.hx b/tests/unit/src/unit/issues/Issue6369.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a74bd9c4ee3860b257ddf59a58f363b83a36eb53
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6369.hx
@@ -0,0 +1,7 @@
+package unit.issues;
+
+class Issue6369 extends unit.Test {
+	function test() {
+		eq('${({}) + 'whoops'}', '${({}) + 'whoops'}'); // we only care about this parsing
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6375.hx b/tests/unit/src/unit/issues/Issue6375.hx
index 0513c7cfb10892632a372fb459f634c4a5f116cd..2f2d58618fb8f6ca02d9bba1fbb1726da445fdc6 100644
--- a/tests/unit/src/unit/issues/Issue6375.hx
+++ b/tests/unit/src/unit/issues/Issue6375.hx
@@ -8,13 +8,13 @@ class Issue6375 extends Test {
 
 	function set_memberField(_) {
 		memberField = 1;
-		rollback = function() memberField = 3;
+		rollback = () -> memberField = 3;
 		return memberField;
 	}
 
 	static function set_staticField(_) {
 		staticField = 2;
-		rollback = function() staticField = 4;
+		rollback = () -> staticField = 4;
 		return staticField;
 	}
 
diff --git a/tests/unit/src/unit/issues/Issue6376.hx b/tests/unit/src/unit/issues/Issue6376.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b499ec031f9aa0e9cfbc0a937771a53fa119f2a3
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6376.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue6376 extends Test {
+	public function test() {
+		var s:Dynamic = "foo";
+		var indexOf = Reflect.field(s, "indexOf");
+		eq(Reflect.callMethod(s, indexOf, ["o", 0]), 1);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6379.hx b/tests/unit/src/unit/issues/Issue6379.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c349a3ee0d0a662982a7748b24e1f24eb22203d0
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6379.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue6379 extends unit.Test {
+	function test() {
+        eq(g("x_x").length, 2);
+    }
+
+	function g(s) {
+		var r = s.split("_");
+		g.bind("");
+        return r;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6406.hx b/tests/unit/src/unit/issues/Issue6406.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ea35b98c187aee1562992b0f662b3637b29b1b21
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6406.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+class Issue6406 extends unit.Test {
+	function test() {
+		eq(42, fIf(1));
+		eq(42, fSwitch(1));
+		// eq(42, fTry(1));
+	}
+
+	inline static function fIf(i:Int):Dynamic return if (i == 0) true else 42;
+
+	inline static function fSwitch(i:Int):Dynamic return switch (i) { case 0: true; case _: 42; }
+
+	// not sure if this is supposed to work
+	// inline static function fTry(i:Int):Dynamic return try 42 catch(e:Dynamic) true;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6413.hx b/tests/unit/src/unit/issues/Issue6413.hx
new file mode 100644
index 0000000000000000000000000000000000000000..98e5fa35912acc06181b4a081d3d1f0e6f273c63
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6413.hx
@@ -0,0 +1,30 @@
+package unit.issues;
+
+private enum N {
+	N1;
+}
+
+private class PR {}
+private class VR {}
+
+private enum C<X> {
+	P:C<PR>;
+	V:C<VR>;
+}
+
+class Issue6413 extends Test {
+
+	function test () {
+		add(N1, P);
+	}
+
+	public function add <X>(n:N, c:C<X>) {
+		switch [n, c] {
+			case [N1, P]:
+				t(true);
+			case [N1, _]:
+				t(false);
+
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6430.hx b/tests/unit/src/unit/issues/Issue6430.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dfc899470c6fd0698a80391f8a5270fccab86bdc
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6430.hx
@@ -0,0 +1,220 @@
+package unit.issues;
+
+import utest.Assert;
+@:generic
+private class C<T> {
+	public function new() {}
+
+	public function func() {}
+
+	public function paramFunc<S>() {
+		new C<S>().func();
+	}
+}
+
+private class StackIterator<T> {
+	var b : Array<T>;
+	var len : Int;
+	var pos : Int;
+	public inline function new( b : Array<T>,len:Int )  {
+		this.b = b;
+		this.len = len;
+		this.pos = 0;
+	}
+	public inline function hasNext() {
+		return pos < len;
+	}
+	public inline function next() {
+		return b[pos++];
+	}
+}
+
+private class BackwardStackIterator<T> {
+	var b : Array<T>;
+	var len : Int;
+	var pos : Int;
+	public inline function new( b : Array<T>,len:Int )  {
+		this.b = b;
+		this.len = len;
+		this.pos = 0;
+	}
+	public inline function hasNext() {
+		return pos < len;
+	}
+	public inline function next() {
+		return b[len - pos++ - 1];
+	}
+}
+
+//could be an abstract but they are not reliable enough at the time I write this
+@:generic
+private class Stack<T>  {
+	var arr : Array<T>=[];
+	var pos = 0;
+
+	public var length(get, never):Int; inline function get_length() return pos;
+	public var quota(get, never):Int; inline function get_quota() return arr.length;
+
+	public inline function new() {}
+
+	/**
+	 * slow, breaks order but no realloc nor mass move
+	 */
+	public inline function remove(v:T):Bool{
+		var i = arr.indexOf(v);
+		return removeAt(i);
+	}
+
+	public inline function random():T{
+		return arr[Std.random( get_length() )];
+	}
+
+	public inline function removeOrdered(v:T):Bool {
+		if ( pos == 0 ) return false;
+		var i = arr.indexOf(v);
+		return removeOrderedAt(i);
+	}
+
+	public inline function removeOrderedAt(idx:Int):Bool {
+		if ( idx < 0 ) return false;
+		if ( pos == 0 ) return false;
+		for ( i in idx...pos)
+			arr[i] = arr[i + 1];
+		pos--;
+		return true;
+	}
+
+	public inline function removeAt(i:Int):Bool {
+		if ( i < 0 ) return false;
+		if( pos > 1 ){
+			arr[i] = arr[pos-1];
+			arr[pos-1] = null;
+			pos--;
+		}
+		else {
+			arr[0] = null;
+			pos = 0;
+		}
+		return true;
+	}
+
+	@:noDebug
+	public inline function reserve(n) {
+		if (arr.length < n )
+			arr[n] = null;
+	}
+
+	public inline function push(v:T) {
+		arr[pos++] = v;
+	}
+
+	public inline function pop() : T {
+		if ( pos == 0 ) return null;
+
+		var v = arr[pos-1];
+		arr[--pos] = null;
+		return v;
+	}
+
+	public inline function first() : T {
+		if ( pos == 0 ) return null;
+		return arr[0];
+	}
+
+	public function pushFront(v:T){
+		for ( i in 0...pos )
+			arr[pos - i] = arr[pos - i - 1];
+		arr[0] = v;
+		pos++;
+	}
+
+	public function swap(i0,i1) {
+		if ( i0 == i1) return;
+		var t = arr[i0];
+		arr[i0] = arr[i1];
+		arr[i1] = t;
+	}
+
+	public inline function last() : T {
+		if ( pos == 0 ) return null;
+		return arr[pos - 1];
+	}
+
+	public inline function unsafeGet(idx:Int) {
+		return arr[idx];
+	}
+
+	public inline function hardReset() {
+		for ( i in 0...arr.length) arr[i] = null;
+		pos = 0;
+	}
+
+	public inline function reset() {
+		pos = 0;
+	}
+
+	public inline function iterator() return new StackIterator(arr,get_length());
+	public inline function backWardIterator() return new BackwardStackIterator(arr,get_length());
+	public inline function toString() {
+		var s = "";
+		for ( i in 0...pos) {
+			s += Std.string(arr[i]);
+		}
+		return s;
+	}
+
+	public inline function toData() {
+		return arr;
+	}
+
+	public inline function fill(arr:Array<T>) {
+		for ( a in arr )
+			push( a );
+		return this;
+	}
+
+	public inline function get(pos:Int) {
+	  return arr[pos];
+	}
+
+
+
+	public inline function set(pos:Int, v:T):T {
+		arr[pos] = v;
+		return v;
+	}
+
+	public function scramble() {
+		var rd = Std.random;
+		for(x in 0...(length + rd( length )) ){
+			var b = rd(length);
+			var a = rd(length);
+			var temp = arr[a];
+			arr[ a ] = arr[ b ];
+			arr[ b ] = temp;
+		}
+	}
+
+	public inline function map<S>( func:T->S) {
+		var n = new Stack<S>();
+		n.reserve( length );
+		for ( e in iterator())
+			n.push( func(e) );
+		return n;
+	}
+}
+
+
+class Issue6430 extends unit.Test {
+	function testNadako() {
+		var c = new C<String>();
+		c.paramFunc();
+		Assert.pass();
+	}
+
+	function testDavid() {
+		var stack = new Stack<String>();
+		stack.map(function(r) return r);
+		Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6446.hx b/tests/unit/src/unit/issues/Issue6446.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fb5d7257d28b79d28caeb51d829e954dde2cd91e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6446.hx
@@ -0,0 +1,23 @@
+package unit.issues;
+
+@:keep
+private class CustomStringBuf extends StringBuf {
+	public function new() {
+		super();
+	}
+
+	#if eval
+	override function add<T>(x:T) {
+		super.add("add");
+		super.add(x);
+	}
+	#end
+}
+
+class Issue6446 extends unit.Test {
+	function test() {
+		var buf = new CustomStringBuf();
+		buf.add(" custom");
+		eq(#if eval "add" #else "" #end + " custom", buf.toString());
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6448.hx b/tests/unit/src/unit/issues/Issue6448.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4781a882eeba9b12e9f2c9e8ed0f1cc6cf1cab88
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6448.hx
@@ -0,0 +1,32 @@
+package unit.issues;
+
+#if js
+@:native("some6448")
+private class C {
+	public var v = true;
+	public function new() {}
+}
+
+@:native("")
+private extern class Lib {
+	@:native("___hx_returnTrue")
+	static function returnTrue():Bool;
+
+	static function __init__():Void {
+		untyped __js__("function ___hx_returnTrue() { return true; }");
+	}
+}
+#end
+
+class Issue6448 extends unit.Test {
+	#if js
+	@:analyzer(no_local_dce)
+	function test() {
+		var some6448 = null;
+		t(new C().v);
+
+		function ___hx_returnTrue() return false;
+		t(Lib.returnTrue());
+	}
+	#end
+}
diff --git a/tests/unit/src/unit/issues/Issue6449.hx b/tests/unit/src/unit/issues/Issue6449.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3a543949180ebf91273f28b6a7a4c8e7f081b86b
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6449.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue6449 extends unit.Test {
+	#if js
+	function test() {
+		t(doTest(Math.NaN));
+		f(doTest(1.5));
+	}
+
+	static function doTest(isNaN:Float):Bool {
+		return untyped __js__("isNaN")(isNaN);
+	}
+	#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6457.hx b/tests/unit/src/unit/issues/Issue6457.hx
new file mode 100644
index 0000000000000000000000000000000000000000..77384ad1de9357aa465dc55f83a7b45c0d8998f3
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6457.hx
@@ -0,0 +1,34 @@
+package unit.issues;
+
+class Issue6457 extends Test {
+  public function test() {
+    var m = new Map();
+    m.set(24, 124);
+    m.set(0, 11);
+    m.remove(24);
+    m.set(0, 10);
+    var keys = [ for (k in m.keys()) k];
+    eq(keys.length, 1);
+    var vals = [ for (k in m) k];
+    eq(vals.length, 1);
+    eq(vals[0], 10);
+#if !cpp
+    eq(m.toString(), '{0 => 10}');
+#end
+
+    var m = new Map();
+    m.set("c", 1);
+    m.set("z", 1);
+    var keys = [ for (k in m.keys()) k];
+    m.remove("c");
+    m.set("z", 10);
+    var keys = [ for (k in m.keys()) k];
+    eq(keys.length, 1);
+    var vals = [ for (k in m) k];
+    eq(vals.length, 1);
+    eq(vals[0], 10);
+#if !cpp
+    eq(m.toString(), '{z => 10}');
+#end
+  }
+}
diff --git a/tests/unit/src/unit/issues/Issue6480.hx b/tests/unit/src/unit/issues/Issue6480.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f13aaff918f25bd3338c7515c74e58018505b012
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6480.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+class Issue6480 extends unit.Test {
+	function test() {
+		var o_blub = (function(f,o) {
+			return function(increment) {
+				return f(o,increment);
+			};
+		})(blub,{ counter : 0});
+        eq(1, o_blub(true));
+        eq(2, o_blub(true));
+	}
+
+    static function blub(o:{ counter: Int}, increment:Bool) {
+        if (increment) o.counter++;
+        else o.counter--;
+        return o.counter;
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6482.hx b/tests/unit/src/unit/issues/Issue6482.hx
new file mode 100644
index 0000000000000000000000000000000000000000..eba5b4f34f46a340bbb76e183fd8ce18f0bad5e3
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6482.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+class Issue6482 extends unit.Test {
+	#if (!cpp && !cs && !java && !lua)
+	function test() {
+		exc(function() {
+			cast("foo", Int);
+			trace("fail");
+		});
+	}
+	#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6486.hx b/tests/unit/src/unit/issues/Issue6486.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8f8a57f83de288ace7de6d159640dc40a99d0310
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6486.hx
@@ -0,0 +1,23 @@
+package unit.issues;
+
+class Issue6486 extends Test
+{
+  function test() {
+    var p = new Point();
+    eq(p.getY(), 10);
+    var iy:IY = p;
+    eq(p.getY(), 10);
+  }
+}
+
+@:keep private interface IY {
+	function getY():Float;
+}
+
+@:keep private class Point implements IY {
+	public function new() {}
+
+	public function getY():Int {
+		return 10;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6499.hx b/tests/unit/src/unit/issues/Issue6499.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5a971d37de724056a2afe4c63e3d82940e09b481
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6499.hx
@@ -0,0 +1,21 @@
+package unit.issues;
+
+class Issue6499 extends unit.Test {
+	function test() {
+		#if !macro
+		t(Macro.test());
+		#end
+	}
+}
+
+private class Macro {
+	macro static public function test() {
+		var b = try {
+			haxe.macro.Context.getType('any.string.which.ends.with.dot.');
+			false;
+		} catch(e:Dynamic) {
+			true;
+		}
+		return macro $v{b};
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6503.hx b/tests/unit/src/unit/issues/Issue6503.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d6ea2bc8b88d29dab081206525b5e0cc3292ff2a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6503.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue6503 extends unit.Test {
+	function test() {
+		var x = () -> ('hi':Dynamic);
+		voidJob(x);
+		noAssert();
+	}
+
+	@:pure(false) static function voidJob(cb:()->Void) {}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6520.hx b/tests/unit/src/unit/issues/Issue6520.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6af4aca3d0361675e2bc4eb7b1ab749b2dc3988b
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6520.hx
@@ -0,0 +1,60 @@
+package unit.issues;
+
+class Issue6520 extends Test
+{
+  function test()
+  {
+    eq(new C().foo(10), 10);
+    eq(new D().foo("test"), "test");
+    eq(new CC().foo(10), 10);
+    eq(new DD().foo("test"), "test");
+  }
+}
+
+@:keep private interface A<T> {
+	public function foo (a:T):T;
+}
+
+@:keep private interface B<T> extends A<T> {
+	public function bar (a:T):T;
+}
+
+@:keep private class C implements A<Int> implements B<Int> {
+  public function new()
+  {
+  }
+	public function bar (a:Int):Int { return a;};
+	public function foo (a:Int):Int { return a;};
+}
+
+@:keep private class D implements A<String> implements B<String> {
+  public function new()
+  {
+  }
+	public function bar (a:String):String { return a;};
+	public function foo (a:String):String { return a;};
+}
+
+@:keep private interface AA<T> {
+	public function foo (a:T):T;
+}
+
+@:keep private interface BB<T> extends AA<T> {
+	public function bar (a:T):T;
+}
+
+@:keep private class CC implements AA<Int> implements BB<Int> implements A<Int> implements B<Int> {
+  public function new()
+  {
+  }
+	public function bar (a:Int):Int { return a;};
+	public function foo (a:Int):Int { return a;};
+}
+
+@:keep private class DD implements AA<String> implements BB<String> implements A<String> implements B<String> {
+  public function new()
+  {
+  }
+	public function bar (a:String):String { return a;};
+	public function foo (a:String):String { return a;};
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6531.hx b/tests/unit/src/unit/issues/Issue6531.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f820265a8a53edde31aa861ea2bfa5037a0f8d02
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6531.hx
@@ -0,0 +1,45 @@
+package unit.issues;
+
+import haxe.macro.Expr;
+import haxe.macro.ExprTools;
+import haxe.macro.Printer;
+
+class Issue6531 extends unit.Test {
+	function test() {
+		peq(macro a in b in c, "(a in (b in c))");
+		peq(macro a % b in c, "(a % (b in c))");
+		peq(macro a * b in c, "(a * (b in c))");
+		peq(macro a / b in c, "(a / (b in c))");
+		peq(macro a + b in c, "(a + (b in c))");
+		peq(macro a - b in c, "(a - (b in c))");
+		peq(macro a << b in c, "(a << (b in c))");
+		peq(macro a >> b in c, "(a >> (b in c))");
+		peq(macro a >>> b in c, "(a >>> (b in c))");
+		peq(macro a | b in c, "(a | (b in c))");
+		peq(macro a & b in c, "(a & (b in c))");
+		peq(macro a ^ b in c, "(a ^ (b in c))");
+		peq(macro a == b in c, "(a == (b in c))");
+		peq(macro a != b in c, "(a != (b in c))");
+		peq(macro a > b in c, "(a > (b in c))");
+		peq(macro a >= b in c, "(a >= (b in c))");
+		peq(macro a < b in c, "(a < (b in c))");
+		peq(macro a <= b in c, "(a <= (b in c))");
+		peq(macro a...b in c, "(a ... (b in c))");
+		peq(macro a || b in c, "(a || (b in c))");
+		peq(macro a && b in c, "(a && (b in c))");
+		peq(macro a => b in c, "(a => (b in c))");
+		peq(macro a = b in c, "(a = (b in c))");
+		peq(macro a += b in c, "(a += (b in c))");
+	}
+
+	function peq(e, s) eq(new Printer().printExpr(parentize(e)), s);
+
+	static function parentize(e:Expr):Expr {
+		return switch e.expr {
+			case EConst(_): e;
+			case _:
+				e = ExprTools.map(e, parentize);
+				{expr: EParenthesis(e), pos: e.pos};
+		}
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6532.hx b/tests/unit/src/unit/issues/Issue6532.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bc2c9ddfe1fa07e2871d67f5ed2d4dfef99fbb98
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6532.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+@:forward
+private abstract A({i:String}) {
+	public function new(i) this = i;
+}
+
+class Issue6532 extends unit.Test {
+	function test() {
+		var a = new A({ i: "foo" });
+        var x = switch a {
+            case {i: extracted}: extracted;
+        }
+		eq("foo", x);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6533.hx b/tests/unit/src/unit/issues/Issue6533.hx
new file mode 100644
index 0000000000000000000000000000000000000000..096e200f4451a597928c934eee52f2fc7c13da8f
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6533.hx
@@ -0,0 +1,36 @@
+package unit.issues;
+
+@:keep private interface InterfaceA<T> { }
+
+@:keep private abstract AbstractC<T>(ClassC<T>) {
+    public function new() this = new ClassC();
+}
+
+@:keep private class ClassC<T> implements InterfaceA<T> {
+
+    public var foo(get, never):Null<T>;
+    function get_foo():Null<T> return null;
+
+    public var bar:Null<T>;
+
+    public function new() { }
+}
+
+@:keep private interface EmptyGenericInterface<T> {
+}
+
+@:keep private class ClassWithNullableField<T> implements EmptyGenericInterface<T> {
+	public var nullableField:Null<T>;
+
+	public function new() {
+	}
+}
+
+class Issue6533 extends Test {
+    public function test():Void {
+        var example:ClassWithNullableField<Int> = new ClassWithNullableField<Int>();
+        example.nullableField = 42;
+        var c = new AbstractC();
+		noAssert();
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6548.hx b/tests/unit/src/unit/issues/Issue6548.hx
new file mode 100644
index 0000000000000000000000000000000000000000..03e8b4532c062439b66b5dbac9344a931cf07f42
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6548.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+class Issue6548 extends unit.Test {
+
+	static function obj(_) return { pos: 12 };
+
+	function test() {
+		switch 1 {
+			case _ * 2 => 2:
+			case _ * 2 => 3:
+			case obj(_) => { pos: pos }:
+			case _:
+		}
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6549.hx b/tests/unit/src/unit/issues/Issue6549.hx
new file mode 100644
index 0000000000000000000000000000000000000000..236742d752cae5b6ec9e8c542fb02f4d1e32a143
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6549.hx
@@ -0,0 +1,32 @@
+package unit.issues;
+
+class Issue6549 extends unit.Test {
+
+	function test () {
+		var int = 1;
+		var x = try {
+			throw true;
+		} catch (err:Int) {
+			"int";
+		}
+		catch (err:Dynamic) {
+			"dynamic";
+		}
+
+		eq(x, "dynamic");
+
+		var x = try {
+			throw true;
+		} catch (err:Int) {
+			"int";
+		}
+		catch (err:Bool) {
+			"bool";
+		}
+		catch (err:Dynamic) {
+			"dynamic";
+		}
+
+		eq(x, "bool");
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6551.hx b/tests/unit/src/unit/issues/Issue6551.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bd100be41d443f80e9d6b3941f193f39ab711084
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6551.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue6551 extends unit.Test {
+    function test () {
+        var v:Dynamic = "foo";
+        v += v;
+		eq(v, "foofoo");
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6555.hx b/tests/unit/src/unit/issues/Issue6555.hx
new file mode 100644
index 0000000000000000000000000000000000000000..062985712a07a56511d86dc367c62a56b4a752d1
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6555.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue6555 extends unit.Test {
+	function test() {
+		var v:Dynamic = inlineFunction(false);
+		eq(0, v);
+	}
+
+	static inline function inlineFunction(z:Bool):Dynamic {
+		if (z) {
+			return [];
+		} else return 0;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6560.hx b/tests/unit/src/unit/issues/Issue6560.hx
new file mode 100644
index 0000000000000000000000000000000000000000..45218a8c7f37a22a80bd356bb9b73f7591e50bc4
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6560.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue6560 extends unit.Test {
+
+    function test() {
+        function foo<F>(a:F):Array<F> {
+            if (false) foo(1);
+            return if (a == null) [] else foo(null);
+        }
+        var bar:Array<Int> = foo(1);
+        eq(0, bar.length);
+    }
+
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6561.hx b/tests/unit/src/unit/issues/Issue6561.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d630be9b1b07d91e53d17870557894027278277a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6561.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+private enum Log<A> {
+	NotLog(msg:String):Log<String>;
+}
+
+
+class Issue6561 extends unit.Test {
+	function test() {
+		eq("hello", apply(NotLog("hello")));
+	}
+
+  	static function apply<A>(f:Log<A>):A {
+		return switch f {
+			case NotLog(msg):
+      			msg;
+		}
+  	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6562.hx b/tests/unit/src/unit/issues/Issue6562.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f2f1db960004d8b9b2381becfe9213bcc7656b74
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6562.hx
@@ -0,0 +1,20 @@
+package unit.issues;
+
+class Issue6562 extends unit.Test {
+
+	static inline function inlineTry(i:Int) {
+		return {
+			try {
+				"x";
+			} catch (e:Dynamic) {
+				trace(e);
+			}
+			"hey";
+		}
+	}
+
+	function test() {
+		inlineTry(1);
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6587.hx b/tests/unit/src/unit/issues/Issue6587.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a6318542bea24c090699e0d2bc9f5ad11f8dd2ad
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6587.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue6587 extends Test {
+  static var consts = {
+		friction: 0.5
+	}
+
+	function test() {
+    f(0 == -consts.friction);
+    var value = -consts.friction;
+    eq(value, -0.5);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6606.hx b/tests/unit/src/unit/issues/Issue6606.hx
new file mode 100644
index 0000000000000000000000000000000000000000..388e0c0e22ec8dde7ceb7a9111dba9593732dfd7
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6606.hx
@@ -0,0 +1,22 @@
+package unit.issues;
+
+import haxe.ds.Option;
+
+private interface ITest {
+	function foo():Int;
+}
+
+private class CTest implements ITest {
+    public function new() {}
+	public function foo() { return 1; }
+}
+
+class Issue6606 extends unit.Test {
+	function test() {
+		function callMe(o:Option<ITest>) { }
+ 		var o:Option<ITest> = Some(new CTest());
+		callMe(Some(new CTest()));
+		var c = Some(new CTest());
+		t(unit.HelperMacros.typeError(callMe(c)));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6609.hx b/tests/unit/src/unit/issues/Issue6609.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e1c1afdc3c22c208bc4ea0c6fd69a8eb392c9ac7
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6609.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+private enum MyEnum {
+	MyEnumConstructor(t:String -> MyEnum);
+}
+
+private abstract A(String -> MyEnum) to String -> MyEnum {
+	public function new(f) {
+		this = f;
+	}
+}
+
+class Issue6609 extends unit.Test {
+	function test() {
+		MyEnumConstructor(new A(null));
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6656.hx b/tests/unit/src/unit/issues/Issue6656.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4bdcd8fde5d5a4ca7f9dc91936fa165a9ef0d5af
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6656.hx
@@ -0,0 +1,17 @@
+package unit.issues;
+
+private enum abstract TextFormatAlign(String) {
+	var Center = "center";
+	@:from static function fromString(value:String):TextFormatAlign {
+		return cast value;
+	}
+}
+
+class Issue6656 extends unit.Test {
+	function test() {
+		function getAlign() return "center";
+		var a = (getAlign() : TextFormatAlign); // String should be TextFormatAlign
+		eq(a, Center);
+	}
+}
+
diff --git a/tests/unit/src/unit/issues/Issue6660.hx b/tests/unit/src/unit/issues/Issue6660.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8ab52af777891d219b490a4e8df3685d45ae9ebe
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6660.hx
@@ -0,0 +1,31 @@
+package unit.issues;
+
+private class BaseClass {
+	public function new() { }
+
+	dynamic public function test() {
+		return "test";
+	}
+}
+
+private class ChildClass extends BaseClass {
+	public function new() {
+		super();
+	}
+}
+
+private class GrandChildClass extends ChildClass {
+	public function new() {
+		super();
+	}
+}
+
+class Issue6660 extends unit.Test {
+	function test() {
+		var child = new ChildClass();
+		eq("test", child.test());
+
+		var child = new GrandChildClass();
+		eq("test", child.test());
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6675.hx b/tests/unit/src/unit/issues/Issue6675.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fdc6421563cbd43113b1009867b28144cd38c24a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6675.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+private enum E {
+	Int( v : Int );
+	Add( a : E, b : E );
+}
+
+class Issue6675 extends unit.Test {
+
+	static function op( op : E ) { }
+
+	function test() {
+		inline function foo(bop,a,b) {
+			return op(bop(a,b));
+		}
+		foo(Add,Int(0),Int(1));
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6703.hx b/tests/unit/src/unit/issues/Issue6703.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a580243e535d8611888272d26a5001c2f5e62e57
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6703.hx
@@ -0,0 +1,25 @@
+package unit.issues;
+import unit.Test;
+
+private interface A {
+	function foo() : Float;
+}
+
+class Issue6703 extends Test implements A {
+
+	var v : Float;
+
+	public function foo() : Float {
+		return v;
+	}
+
+	static function getClosure( inst : A ) {
+		return inst.foo;
+	}
+	
+	function test() {
+		v = 123.45;
+		eq( getClosure(this)(), 123.45 );
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6706.hx b/tests/unit/src/unit/issues/Issue6706.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7da2266a3b5123c8ecfb787e5d8c6ac34caa3336
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6706.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue6706 extends unit.Test {
+
+	static inline function foo( d : Dynamic ):Dynamic {
+		return d;
+	}
+
+	function test() {
+		var v:Float = 12;
+		HelperMacros.typedAs((null : Dynamic), foo(v));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6707.hx b/tests/unit/src/unit/issues/Issue6707.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3b7e9ad2acd205e684d433eb2a31c7e4578d504c
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6707.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+private typedef T1 = {
+	var ?x:Int;
+	var y:String;
+}
+
+private typedef T2 = {
+	final ?x:Int;
+	var y:String;
+}
+
+class Issue6707 extends unit.Test {
+	function test() {
+		var t1:T1 = { y: "foo" };
+		var t2:T2 = { y: "foo" };
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6710.hx b/tests/unit/src/unit/issues/Issue6710.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b11187f7c89337c677d050f196cfbdc2d17b61cf
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6710.hx
@@ -0,0 +1,28 @@
+package unit.issues;
+
+private enum E {
+	A(a:Array<String>);
+}
+
+class Issue6710 extends unit.Test {
+	function test() {
+
+		var a = [];
+		var b = [];
+		t(Type.enumEq(A(a), A(a)));
+		f(Type.enumEq(A(a), A(b)));
+
+		var a = [];
+		var b = [];
+
+		eq(checkEq(a, b), false);
+
+		eq(checkEq(2000000, 2000000), true);
+		eq(checkEq("basicstring", "basicstring"), true);
+
+	}
+
+	static function checkEq<T>(t1:T, t2:T) {
+		return t1 == t2;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6711.hx b/tests/unit/src/unit/issues/Issue6711.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9a1cc1149fd2c0af3b284e1d43ee30e435bccf94
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6711.hx
@@ -0,0 +1,35 @@
+package unit.issues;
+
+private class V2 {
+	public var x:Float;
+	public var y:Float;
+	inline public function new(x, y) {
+		this.x = x;
+		this.y = y;
+	}
+}
+
+class Issue6711 extends unit.Test {
+	function test() {
+		eq("(0,1)(0,1)(0,1)", run());
+	}
+
+	inline static function getPos() : V2 {
+		return new V2(0, 1);
+	}
+
+	inline static public function iteration(func) {
+		func();
+		func();
+		func();
+	}
+
+	public static function run() {
+		var r = "";
+		iteration(function() {
+			var wpos = getPos();
+			r += '(${wpos.x},${wpos.y})';
+		});
+		return r;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6717.hx b/tests/unit/src/unit/issues/Issue6717.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e53f8476417b85689ad264850318c276773afbb1
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6717.hx
@@ -0,0 +1,23 @@
+package unit.issues;
+
+class Issue6717 extends unit.Test {
+	function test() {
+		var space = " ";  // ASCII 0x20
+		var hyphen = "-"; // ASCII 0x2D
+
+		t(space.charAt(0) < hyphen.charAt(0));
+
+		// example strings from https://docs.microsoft.com/en-us/dotnet/api/system.globalization.compareoptions
+		var unsorted = ["cant", "bill's", "coop", "cannot", "billet", "can't", "con", "bills", "co-op"];
+		var expected = ["bill's", "billet", "bills", "can't", "cannot", "cant", "co-op", "con", "coop"];
+
+		var actual = unsorted.copy();
+		actual.sort(strcmp);
+
+		aeq(expected, actual);
+	}
+
+	static function strcmp(a:String, b:String):Int {
+		return a < b ? -1 : a > b ? 1 : 0;
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6722.hx b/tests/unit/src/unit/issues/Issue6722.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5b16533aea81f6381a6ef9a972c406351fe885d2
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6722.hx
@@ -0,0 +1,23 @@
+package unit.issues;
+import haxe.ds.ArraySort;
+
+typedef IComparer<T> = T->T->Int;
+class Issue6722 extends Test {
+	var comparer:IComparer<Int> = Issue6722.compare;
+	public function new(){
+		super();
+	}
+	static public function compare(a:Int, b:Int):Int {
+		var i:Int = a-b;
+		if (i > 0) return 1;
+		else if (i < 0) return -1;
+		else return 0;
+	}
+	function test(){
+		var arr = [0,3,1];
+		ArraySort.sort(arr, this.comparer);
+		eq(arr + '', "[0,1,3]");
+	}
+
+}
+
diff --git a/tests/unit/src/unit/issues/Issue6724.hx b/tests/unit/src/unit/issues/Issue6724.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e65c0197cdd1f956092cab413ac21d58117886a7
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6724.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue6724 extends unit.Test {
+	function test() {
+		var v = switch (null) {
+			case v = null: v;
+			case _: throw false;
+		}
+		eq(null, v);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6751.hx b/tests/unit/src/unit/issues/Issue6751.hx
new file mode 100644
index 0000000000000000000000000000000000000000..be5bc4ab7d29704b71f7949bdf9972bbb9bc4746
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6751.hx
@@ -0,0 +1,21 @@
+package unit.issues;
+
+import unit.HelperMacros.typedAs;
+
+private abstract O(String) {
+	public function new(s) this = s;
+	@:to function toInt() return 42;
+}
+
+private abstract A<T>(T) from T {}
+
+class Issue6751 extends Test {
+	function test() {
+		function make<T>(o:A<T>) return o;
+
+		var o = new O("hello");
+		var a = make(o);
+		typedAs(a, (null : A<O>));
+		eq(Std.string(a), "hello");
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6752.hx b/tests/unit/src/unit/issues/Issue6752.hx
new file mode 100644
index 0000000000000000000000000000000000000000..deda5abb7c33cf4290f18b04939aea0849208dce
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6752.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+private abstract CsStack<T>(Int) {
+	public function new(i) this = i;
+	public function get() return this;
+}
+
+class Issue6752 extends unit.Test {
+	function test() {
+		var f = CsStack.new;
+		eq(1, f(1).get());
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6754.hx b/tests/unit/src/unit/issues/Issue6754.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0b4c5399a05e90d4a54f84bb684c2341225f3888
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6754.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue6754 extends Test {
+	#if js
+	function test() {
+		try throw "hello" catch (e:Any) eq(js.Lib.getOriginalException().message, "hello");
+	}
+	#end
+}
diff --git a/tests/unit/src/unit/issues/Issue6772.hx b/tests/unit/src/unit/issues/Issue6772.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5c28d565a67f7b01f336ce1c29b717d677dc565d
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6772.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+private class Issue6772Class {
+    final i:Int = 0;
+
+    function new() {}
+}
+
+class Issue6772 extends unit.Test { }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6776.hx b/tests/unit/src/unit/issues/Issue6776.hx
new file mode 100644
index 0000000000000000000000000000000000000000..beacedcd45ec75d142b3e3e5ecf16a9d1aa2726a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6776.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+class Issue6776 extends unit.Test {
+	function test1() {
+        var a = [1];
+        var i = 0;
+        var v = a[i];
+        a[i]++;
+        eq(1, v);
+	}
+
+	function test2() {
+        var a = [1];
+        var i = 0;
+        var v = a[i];
+        a[i] += 1;
+        eq(1, v);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6784.hx b/tests/unit/src/unit/issues/Issue6784.hx
new file mode 100644
index 0000000000000000000000000000000000000000..84326f64e47ec78a208027197b78f042e744eec5
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6784.hx
@@ -0,0 +1,10 @@
+package unit.issues;
+
+class Issue6784 extends Test {
+	function test() {
+		#if cs
+		cs.system.Console.BufferHeight;
+		#end
+		noAssert();
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6801.hx b/tests/unit/src/unit/issues/Issue6801.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bf1fd6fac7c19330a21bf05e8d6d100a5c61e235
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6801.hx
@@ -0,0 +1,44 @@
+package unit.issues;
+
+import haxe.Json;
+import haxe.format.JsonPrinter;
+
+class Issue6801 extends unit.Test {
+#if !as3
+	function test() {
+		var o = new Child();
+        var json = haxe.format.JsonPrinter.print(o);
+
+        var expected = {c:'hello', c2:true, p:1, p2:0};
+        var actual = Json.parse(json);
+        eq(Reflect.fields(expected).length, Reflect.fields(actual).length);
+        eq(expected.c, actual.c);
+        eq(expected.c2, actual.c2);
+        eq(expected.p, actual.p);
+        eq(expected.p2, actual.p2);
+	}
+#end
+}
+
+@:keep
+private class Parent {
+    public var p:Int = 1;    
+    public function new() {}
+}
+
+@:keep
+private class Child extends Parent{
+    var c:String = 'hello';
+    
+    public var prop(get,set):Int;
+    function get_prop() return 0;
+    function set_prop(v) return v;
+
+    public var c2(default,set):Bool = true;
+    function set_c2(v) return c2 = v;
+
+    @:isVar var p2(get,set):Int = 0;
+    function get_p2() return p2;
+    function set_p2(v) return p2 = v;
+
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6807.hx b/tests/unit/src/unit/issues/Issue6807.hx
index cbd1eca7269b95a00b5fbc3666d3553c1f5cca79..56679552931ee9b1565e8ec111dac69b6e9f78ac 100644
--- a/tests/unit/src/unit/issues/Issue6807.hx
+++ b/tests/unit/src/unit/issues/Issue6807.hx
@@ -2,8 +2,10 @@ package unit.issues;
 
 class Issue6807 extends unit.Test {
 	function test() {
-		#if ((dce != 'no') && !interp)
+		#if ((dce != 'no') && !eval)
 		t(null == Type.resolveClass('unit.issues._Issue6807.ShouldBeRemovedByDce'));
+		#else
+		noAssert();
 		#end
 	}
 }
diff --git a/tests/unit/src/unit/issues/Issue6830.hx b/tests/unit/src/unit/issues/Issue6830.hx
new file mode 100644
index 0000000000000000000000000000000000000000..00e7a42fed98357865d054f6d2fa771962f573c7
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6830.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+private typedef VarChar<@:const L> = String;
+
+class Issue6830 extends unit.Test {
+	function test() {
+		testMacro();
+	}
+
+	static macro function testMacro() {
+		var ct = haxe.macro.TypeTools.toComplexType(haxe.macro.Context.typeof(macro (null: VarChar<123>)));
+		return macro t($v{ct.match(TPath({params: [TPExpr({expr: EConst(CInt("123"))})]}))});
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6833.hx b/tests/unit/src/unit/issues/Issue6833.hx
new file mode 100644
index 0000000000000000000000000000000000000000..679cc964830369831e22b48901701f248b7baec9
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6833.hx
@@ -0,0 +1,37 @@
+package unit.issues;
+
+class Issue6833 extends unit.Test {
+	function test() {
+		for(p in new KeyValueIterator([1 => 'hello'])) {}
+		noAssert();
+	}
+}
+
+private class KeyValueIterator<K,V> {
+	var map:Map<K,V>;
+	var keys:Iterator<K>;
+
+	public inline function new(map:Map<K,V>) {
+		this.map = map;
+		this.keys = map.keys();
+	}
+
+	public inline function hasNext():Bool {
+		return keys.hasNext();
+	}
+
+	public inline function next():KeyValuePair<K,V> {
+		var key = keys.next();
+		return new KeyValuePair<K,V>(key, map.get(key));
+	}
+}
+
+private class KeyValuePair<K,V> {
+	public var key (default,null):K;
+	public var value (default,null):Null<V>;
+
+	public inline function new(key:K, value:Null<V>) {
+		this.key = key;
+		this.value = value;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6836.hx b/tests/unit/src/unit/issues/Issue6836.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b8aff3ae621f023353f0b7b39874b524dcabe7c6
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6836.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+import unit.HelperMacros.typeString;
+
+class Issue6836 extends Test {
+	function test() {
+		var v:Null<Int> = 1;
+		var e1 = Std.random(2) == 1 ? 2 : v;
+		eq(typeString(e1), "Null<Int>");
+		var e2 = Std.random(2) == 1 ? v : 2;
+		eq(typeString(e1), "Null<Int>");
+
+		var v:Null<String> = "abc";
+		var e1 = Std.random(2) == 1 ? "def" : v;
+		eq(typeString(e1), "Null<String>");
+		var e2 = Std.random(2) == 1 ? v : "def";
+		eq(typeString(e1), "Null<String>");
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6845.hx b/tests/unit/src/unit/issues/Issue6845.hx
new file mode 100644
index 0000000000000000000000000000000000000000..11e0145606e58db49907b678aa1c08333f57d2cc
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6845.hx
@@ -0,0 +1,17 @@
+package unit.issues;
+
+class Issue6845 extends unit.Test {
+	static var tmp:Any;
+	function test() {
+		tmp = new Sample<Float>();
+		tmp = new Sample<Bool>();
+		eq(2, Sample.n);
+	}
+}
+
+private class Sample<T> {
+	public static var n:Int =0;
+	public function new() {
+		n++;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6848.hx b/tests/unit/src/unit/issues/Issue6848.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f10d4ae50b695ab98ea0504144a99964a00799ae
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6848.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue6848 extends unit.Test {
+#if php
+	function test() {
+		var e = Type.createInstance(php.Exception, ['hello']);
+		t(Std.is(e, php.Exception));
+		eq('hello', e.getMessage());
+	}
+#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6859.hx b/tests/unit/src/unit/issues/Issue6859.hx
deleted file mode 100644
index 566bb4a7ab360d6581ad7738d96bf454bb3d19af..0000000000000000000000000000000000000000
--- a/tests/unit/src/unit/issues/Issue6859.hx
+++ /dev/null
@@ -1,14 +0,0 @@
-package unit.issues;
-
-class Issue6859 extends unit.Test {
-	function test() {
-		var l = new List();
-        l.add(42);
-        l.add(42);
-        l.pop();
-        l.add(42);
-        l.pop();
-        l.pop();
-        eq(0, l.length);
-	}
-}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6871.hx b/tests/unit/src/unit/issues/Issue6871.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0e1885e2fc2644dfdb6b7506148afbf22d035bd6
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6871.hx
@@ -0,0 +1,30 @@
+package unit.issues;
+
+class Issue6871 extends unit.Test {
+	static inline var GETTER_ERROR = 'getter exception';
+	static inline var SETTER_ERROR = 'setter exception';
+
+	@:keep static public var field(get,set):Int;
+	static function get_field():Int throw GETTER_ERROR;
+	static function set_field(v:Int):Int throw SETTER_ERROR;
+
+	function test() {
+		inline function exception(e:Dynamic) {
+			return #if cs e.InnerException.Message #else e #end;
+		}
+
+		try {
+			Reflect.getProperty(Issue6871, 'field');
+			t(false);
+		} catch(e:Dynamic) {
+			eq(GETTER_ERROR, exception(e));
+		}
+
+		try {
+			Reflect.setProperty(Issue6871, 'field', 123);
+			t(false);
+		} catch(e:Dynamic) {
+			eq(SETTER_ERROR, exception(e));
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6873.hx b/tests/unit/src/unit/issues/Issue6873.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a3f5ae54aa3457882b3896eac5a442c9dd15556e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6873.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+@:build(unit.issues.misc.Issue6873Macro.build())
+private class C { }
+
+
+class Issue6873 extends unit.Test {
+	function test() {
+		var expected = "TType(Map,[TInst(String,[]),TAbstract(Int,[])])TInst(haxe.ds.StringMap,[TAbstract(Int,[])])";
+		eq(expected, C.result);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6896.hx b/tests/unit/src/unit/issues/Issue6896.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6999fc04dacbec215d2948a9b77ddd73c9cf93d6
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6896.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+import unit.HelperMacros.typeString;
+
+private typedef A = {
+    var ?value:Null<String>;
+}
+
+class Issue6896 extends Test {
+	function test() {
+		var a:A = {};
+		eq(typeString(a.value), "Null<String>");
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6942.hx b/tests/unit/src/unit/issues/Issue6942.hx
new file mode 100644
index 0000000000000000000000000000000000000000..306d23fd7479608d8279357b6848b264019e71bd
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6942.hx
@@ -0,0 +1,42 @@
+package unit.issues;
+
+class Issue6942 extends unit.Test {
+	static inline var FLOAT_INLINE = -1.0;
+	static inline var INT_INLINE = -1;
+
+	function test() {
+		eq(1, -IntEnum);
+		eq(2, 1 - IntEnum);
+
+		//these targets have actual UInt type at runtime
+		#if (flash || cs || as3)
+		eq(-4294967295, -UIntEnum);
+		eq(2, 1 - UIntEnum);
+		#else
+		eq(1, -UIntEnum);
+		eq(2, 1 - UIntEnum);
+		#end
+
+		eq(1, -INT_INLINE);
+		eq(2, 1 - INT_INLINE);
+
+		// TODO: fix https://github.com/HaxeFoundation/haxe/issues/8321
+		// eq(1.0, -FloatEnum);
+		// eq(2.0, 1 - FloatEnum);
+
+		eq(1.0, -FLOAT_INLINE);
+		eq(2.0, 1 - FLOAT_INLINE);
+	}
+}
+
+enum abstract FloatTest(Float) from Float to Float {
+	var FloatEnum = -1.0;
+}
+
+enum abstract IntTest(Int) from Int to Int {
+	var IntEnum = -1;
+}
+
+enum abstract UIntTest(UInt) from UInt to UInt {
+	var UIntEnum = -1;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6948.hx b/tests/unit/src/unit/issues/Issue6948.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f00db4b1ce953979e66d6321742155e406f83b4f
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6948.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue6948 extends Test {
+	function test() {
+		var gen:Gen<true> = null;
+		noAssert();
+	}
+}
+
+@:generic
+class Gen<@:const T>{}
diff --git a/tests/unit/src/unit/issues/Issue6952.hx b/tests/unit/src/unit/issues/Issue6952.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8496ba8c77f1937d5dd03b39e257293874845131
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6952.hx
@@ -0,0 +1,24 @@
+package unit.issues;
+
+@:generic class Issue6952TestClass<@:const T> {
+	public function new() {}
+	public function foo() {
+		return T;
+	}
+}
+
+class Issue6952 extends Test {
+
+	function test() {
+		var x = new Issue6952TestClass<"hello world">();
+		eq("hello world", x.foo());
+
+		var r1:EReg = new Issue6952TestClass<~/a/>().foo();
+		var r2:EReg = new Issue6952TestClass<~/b/>().foo();
+
+		eq(true, r1.match("a"));
+		eq(false, r1.match("b"));
+		eq(false, r2.match("a"));
+		eq(true, r2.match("b"));
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue6972.hx b/tests/unit/src/unit/issues/Issue6972.hx
new file mode 100644
index 0000000000000000000000000000000000000000..861983aa859bb7e60eb822706ce7c972e1f53890
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6972.hx
@@ -0,0 +1,43 @@
+package unit.issues;
+
+import unit.HelperMacros.isNullable as n;
+
+class Issue6972 extends unit.Test {
+	function test() {
+		f1(1);
+		f2(1);
+		f3();
+		f4();
+		f5();
+		f6();
+		f7();
+		f8();
+
+		f11();
+		f12();
+		f13();
+		f14();
+		f15();
+		f16();
+		f17();
+		f18();
+	}
+
+	function f1(x:Int) f(n(x));
+	function f2(x:Null<Int>) t(n(x));
+	function f3(x = null) t(n(x));
+	function f4(x = 1) f(n(x));
+	function f5(x:Int = null) t(n(x));
+	function f6(x:Int = 1) f(n(x));
+	function f7(x:Null<Int> = 1) t(n(x));
+	function f8(x:Null<Int> = null) t(n(x));
+
+	function f11(?x:Int) t(n(x));
+	function f12(?x:Null<Int>) t(n(x));
+	function f13(?x = null) t(n(x));
+	function f14(?x = 1) t(n(x));
+	function f15(?x:Int = null) t(n(x));
+	function f16(?x:Int = 1) t(n(x));
+	function f17(?x:Null<Int> = 1) t(n(x));
+	function f18(?x:Null<Int> = null) t(n(x));
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue6979.hx b/tests/unit/src/unit/issues/Issue6979.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c4d929219efd8c2a333b8e577d9ec75e1c3ffa17
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue6979.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+@:generic class MyGeneric<@:const T> {
+    public function new() {}
+
+    public function foo() {
+        return T;
+    }
+}
+
+
+class Issue6979 extends unit.Test {
+	function test() {
+        var a:MyGeneric<1> = new MyGeneric();
+        unit.HelperMacros.typedAs(a.foo(), 1);
+        eq(3, a.foo() + 2);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7007.hx b/tests/unit/src/unit/issues/Issue7007.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3cb735e21b27d3b56cd69412da58fed656a96780
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7007.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+class Issue7007 extends unit.Test {
+	function test() {
+		#if !macro
+		eq("Exception caught: Invalid expression", catchMe());
+		#end
+	}
+
+	macro static function catchMe() {
+		try {
+			trace(haxe.macro.Context.getTypedExpr(null));
+		} catch (e:Dynamic) {
+			return macro $v{'Exception caught: $e'};
+		}
+		return macro null;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7032.hx b/tests/unit/src/unit/issues/Issue7032.hx
new file mode 100644
index 0000000000000000000000000000000000000000..79e3bec216d05e42b18089b5dd7714797eb69dd5
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7032.hx
@@ -0,0 +1,15 @@
+package unit.issues;
+
+class Issue7032 extends unit.Test {
+	function test() {
+		eq(10, def(null));
+	}
+
+	static function def(p) {
+		return def2(p);
+	}
+
+	static inline function def2(?p = 10) {
+		return p;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7106.hx b/tests/unit/src/unit/issues/Issue7106.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1f0b94528d93d138871c2930e4b9a6a6276c4fd5
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7106.hx
@@ -0,0 +1,40 @@
+package unit.issues;
+
+private class C {
+	var i:Int;
+
+	public function new(i:Int) {
+		this.i = i;
+	}
+
+	public function getI() {
+		return i;
+	}
+}
+
+class Issue7106 extends unit.Test {
+	function testClosure() {
+		var c1 = new C(1);
+		var c2 = new C(2);
+		var c2Dyn:Dynamic = c2;
+		eq(2, Reflect.callMethod(c1, c2.getI, []));
+		eq(2, Reflect.callMethod(c2, Reflect.field(c2, "getI"), []));
+		eq(2, Reflect.callMethod(c2, c2Dyn.getI, []));
+
+		// On targets that don't have native closures, the first argument
+		// replaces the context. On other targets it is ignored.
+		var cCheck = #if (js || neko || lua) c2 #else c1 #end;
+		eq(2, Reflect.callMethod(cCheck, Reflect.field(c2, "getI"), []));
+		eq(2, Reflect.callMethod(cCheck, c2Dyn.getI, []));
+	}
+
+	function testStatic() {
+        eq(49, Reflect.callMethod(null,foo,[]));
+        eq(49, Reflect.callMethod(Issue7106,foo,[]));
+        eq(49, Reflect.callMethod(Type,foo,[]));
+	}
+
+	static function foo() {
+		return 49;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7115.hx b/tests/unit/src/unit/issues/Issue7115.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8c9c5b90a6d5444a34ac28436a820d095abb30cb
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7115.hx
@@ -0,0 +1,100 @@
+package unit.issues;
+
+private interface Interface { }
+
+class Issue7115 extends unit.Test {
+	function testIs() {
+		f(Std.is(getNull(), Int));
+		f(Std.is(getNull(), Float));
+		f(Std.is(getNull(), Bool));
+		f(Std.is(getNull(), String));
+		f(Std.is(getNull(), Issue7115));
+		f(Std.is(getNull(), haxe.ds.Option));
+		f(Std.is(getNull(), Dynamic));
+		f(Std.is(getNull(), null));
+		f(Std.is(getNull(), Interface));
+	}
+
+	function testCast() {
+		#if !flash // ???
+		eq(#if static 0 #else null #end, cast(getNull(), Int));
+		eq(#if static 0. #else null #end, cast(getNull(), Float));
+		eq(#if static false #else null #end, cast(getNull(), Bool));
+		eq(null, cast(getNull(), String));
+		#end
+		eq(null, cast(getNull(), Issue7115));
+		eq(null, cast(getNull(), haxe.ds.Option<Dynamic>));
+		eq(null, cast(getNull(), Interface));
+	}
+
+	function testCatch() {
+		var expected = #if static 1 #else 2 #end;
+
+		var i = try {
+			throw (getNull() : Int);
+		} catch(s:Int) {
+			1;
+		} catch(e:Dynamic) {
+			2;
+		}
+		eq(expected, i);
+
+		var i = try {
+			throw (getNull() : Float);
+		} catch(s:Float) {
+			1;
+		} catch(e:Dynamic) {
+			2;
+		}
+		eq(expected, i);
+
+		var i = try {
+			throw (getNull() : Bool);
+		} catch(s:Bool) {
+			1;
+		} catch(e:Dynamic) {
+			2;
+		}
+		eq(expected, i);
+
+		var i = try {
+			throw (getNull() : String);
+		} catch(s:String) {
+			1;
+		} catch(e:Dynamic) {
+			2;
+		}
+		eq(2, i);
+
+		var i = try {
+			throw (getNull() : Issue7115);
+		} catch(s:Issue7115) {
+			1;
+		} catch(e:Dynamic) {
+			2;
+		}
+		eq(2, i);
+
+		var i = try {
+			throw (getNull() : haxe.ds.Option<Dynamic>);
+		} catch(s:haxe.ds.Option<Dynamic>) {
+			1;
+		} catch(e:Dynamic) {
+			2;
+		}
+		eq(2, i);
+
+		var i = try {
+			throw (getNull() : Interface);
+		} catch(s:Interface) {
+			1;
+		} catch(e:Dynamic) {
+			2;
+		}
+		eq(2, i);
+	}
+
+	static function getNull<T>():T {
+		return null;
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue7120.hx b/tests/unit/src/unit/issues/Issue7120.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ac10c310955ca97fbd4b8ce87fb663fb5f559008
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7120.hx
@@ -0,0 +1,22 @@
+package unit.issues;
+
+private class Base {
+	public function new() { }
+	public function test() return 12;
+}
+
+private class Child1 extends Base { }
+private class Child2 extends Base { }
+private class Child3 extends Base { }
+
+class Issue7120 extends unit.Test {
+	function test1() {
+		var t = try 1. catch(e:Dynamic) 1;
+		feq(1., t);
+	}
+
+	function test2() {
+		var t = try new Child1() catch(e:String) new Child2() catch(e:Dynamic) new Child3();
+		eq(12, t.test());
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7132.hx b/tests/unit/src/unit/issues/Issue7132.hx
new file mode 100644
index 0000000000000000000000000000000000000000..017dbd6289629faef5adeadfcd9a654689caaae0
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7132.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue7132 extends unit.Test {
+	static inline var x:Float = 20;
+
+	function test() {
+		HelperMacros.typedAs(x, 0.);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7139.hx b/tests/unit/src/unit/issues/Issue7139.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7e251b72c56403c7a5f1b88cf044ae5678df9a48
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7139.hx
@@ -0,0 +1,37 @@
+package unit.issues;
+
+private enum abstract A1(Int) to Int {
+    var First;
+    var Second;
+    var Fifth = 5;
+    var Sixth;
+}
+
+private enum abstract A2(String) to String {
+    var FirstString;
+    var SecondString;
+}
+
+abstract MyInt(Int) from Int to Int { }
+
+private enum abstract A3(MyInt) to Int {
+	var Zero;
+    var Ninth = 9;
+	var Tenth;
+}
+
+class Issue7139 extends unit.Test {
+	function test() {
+		eq(0, First);
+		eq(1, Second);
+		eq(5, Fifth);
+		eq(6, Sixth);
+
+		eq("FirstString", FirstString);
+		eq("SecondString", SecondString);
+
+		eq(0, Zero);
+		eq(9, Ninth);
+		eq(10, Tenth);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7142.hx b/tests/unit/src/unit/issues/Issue7142.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cda6a3a5d11f5c36179511ceaa8f70c71f134cec
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7142.hx
@@ -0,0 +1,24 @@
+package unit.issues;
+
+using unit.issues.Issue7142;
+
+class Issue7142 extends unit.Test {
+	function test() {
+		var map = ["test" => 1];
+		var smap = new haxe.ds.StringMap();
+		smap.set("test", 1);
+
+		eq(1, map.doSomething());
+		eq(1, smap.doSomething());
+		eq(1, map.doSomethingElse());
+		eq(1, smap.doSomethingElse());
+	}
+
+	static function doSomething(sm:haxe.ds.StringMap<Int>) {
+		return sm.get("test");
+	}
+
+	static function doSomethingElse(sm:Map<String, Int>) {
+		return sm.get("test");
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7179.hx b/tests/unit/src/unit/issues/Issue7179.hx
new file mode 100644
index 0000000000000000000000000000000000000000..25e83695371c48c49d3d490574e72c6c04a9ae95
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7179.hx
@@ -0,0 +1,10 @@
+package unit.issues;
+
+class Issue7179 extends unit.Test {
+	function test() {
+		var f:(?f:Float) -> Void = function(?_) { }
+		f();
+		f(1.);
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7182.hx b/tests/unit/src/unit/issues/Issue7182.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9ef5d751dc91604157c55f268c79ded8e3ec9d62
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7182.hx
@@ -0,0 +1,17 @@
+package unit.issues;
+
+@:structInit
+private class Person {
+    public final name:String;
+	public final hobbies = "compiler errors";
+}
+
+class Issue7182 extends unit.Test {
+	function test() {
+		var person:Person = {
+			name: "nadako"
+		}
+		eq("nadako", person.name);
+		eq("compiler errors", person.hobbies);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7187.hx b/tests/unit/src/unit/issues/Issue7187.hx
new file mode 100644
index 0000000000000000000000000000000000000000..328bffac8a1d6f539c283d76486c47c01fc15bcb
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7187.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue7187 extends unit.Test {
+	function test() {
+		eq(5, func(function(x:Int) return x));
+	}
+
+	public static inline function func(f:Int->Int) {
+		whatever(f != null);
+		return f(5);
+	}
+
+	@:pure(false) static function whatever(x) { }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7207.hx b/tests/unit/src/unit/issues/Issue7207.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8db0bae1d29434746d21b51da0324c1d27468e73
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7207.hx
@@ -0,0 +1,7 @@
+package unit.issues;
+
+class Issue7207 extends unit.Test {
+	function test() {
+		eq("Haxe is great! 1", 'Haxe is great! ${/*13*/1}');
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7209.hx b/tests/unit/src/unit/issues/Issue7209.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b762aaf7511c9a7afd2bf4cf5d00b49cf589650b
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7209.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+private enum E {
+	A;
+	B;
+	C(v:Int);
+}
+
+class Issue7209 extends unit.Test {
+	function test() {
+		var allEnums = Type.allEnums(E);
+		aeq(allEnums, [A,B]);
+
+		allEnums.remove(B);
+		aeq(allEnums, [A]);
+
+		aeq(Type.allEnums(E), [A,B]);
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue7220.hx b/tests/unit/src/unit/issues/Issue7220.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6d8f14ed2f63f6a794562f0c09ec32e2090a4046
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7220.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+private enum Expr {
+	Const(const:Int);
+}
+
+class Issue7220 extends unit.Test {
+	function test() {
+		eq(extract(Const(15)), 15);
+	}
+
+	static function extract(e:Expr):Int {
+		switch e {
+			case Const(const):
+				return const;
+		}
+	}
+}
+
diff --git a/tests/unit/src/unit/issues/Issue7230.hx b/tests/unit/src/unit/issues/Issue7230.hx
new file mode 100644
index 0000000000000000000000000000000000000000..575269c869d89a5013b919afa6b6feffc659909c
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7230.hx
@@ -0,0 +1,8 @@
+package unit.issues;
+
+class Issue7230 extends unit.Test {
+	function test() {
+		var data = {"$id": 123};
+		eq(123, Reflect.field(data, "$id"));
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue7233.hx b/tests/unit/src/unit/issues/Issue7233.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7c95a1c8a48539a6cd5dc3ba3d00212d07e4934c
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7233.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+class Issue7233 extends unit.Test {
+	function test() {
+		var data = {name: "Test"};
+		var obj = Type.createInstance(TestClass, [data]);
+
+		eq("Test", obj.name);
+	}
+}
+
+private class TestClass {
+    public var name : String;
+
+    public function new(data) {
+        this.name = data.name;
+    }
+}
diff --git a/tests/unit/src/unit/issues/Issue7247.hx b/tests/unit/src/unit/issues/Issue7247.hx
new file mode 100644
index 0000000000000000000000000000000000000000..433a1e01b1e559214d49d31e3768ed809120c9cf
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7247.hx
@@ -0,0 +1,24 @@
+package unit.issues;
+import unit.Test;
+
+class Issue7247 extends Test {
+
+	#if !neko
+
+	var str = "将一";
+	var str2 = "将一\\";
+
+	function test() {
+		eq(str.indexOf("\\"),-1);
+		eq(str.lastIndexOf("\\"),-1);
+		eq(str.split("\\").length,1);
+		f( ~/\\/.match(str) );
+
+		eq(str2.indexOf("\\"), 2);
+		eq(str2.lastIndexOf("\\"), 2);
+		eq(str2.split("\\").length, 2);
+		t( ~/\\/.match(str2) );
+	}
+
+	#end
+}
diff --git a/tests/unit/src/unit/issues/Issue7286.hx b/tests/unit/src/unit/issues/Issue7286.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9b18b5bfc102992caea0660831171c9badfbdc11
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7286.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+class Issue7286 extends unit.Test {
+	function test() {
+		new TestMap();
+		noAssert();
+	}
+}
+
+private abstract TestMap(Dynamic) {
+	public function new() {
+		fromObj();
+	}
+
+	inline function fromObj() {
+		this = { };
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7298.hx b/tests/unit/src/unit/issues/Issue7298.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8099242b9ce08c14ff49a3eb47582b5802567b21
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7298.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+class Issue7298 extends unit.Test {
+	static var _pageIndex = 0;
+	function test() {
+		var currentPageIndex = _pageIndex;
+    	var r = _updatePageIndexSelection(++currentPageIndex);
+		eq(0, r);
+	}
+
+	static function _updatePageIndexSelection(v:Int) return _pageIndex;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7332.hx b/tests/unit/src/unit/issues/Issue7332.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7c5c6c19fa393842d85222fb64a977da56c41b45
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7332.hx
@@ -0,0 +1,15 @@
+package unit.issues;
+
+class Issue7332 extends Test {
+	public static function main() {
+		forEach([new FlxSprite()], sprite -> trace(sprite));
+	}
+
+	static function forEach<T:FlxBasic>(l:Array<T>, f:T->Void) {}
+}
+
+class FlxBasic {}
+
+class FlxSprite extends FlxBasic {
+	public function new() {}
+}
diff --git a/tests/unit/src/unit/issues/Issue7334.hx b/tests/unit/src/unit/issues/Issue7334.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8fb060002bd2b5eb9c795ce002f434add6b8da60
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7334.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+class Issue7334 extends Test {
+	function test() {
+		var foo = 0;
+		new Signal1<Int>(i -> foo = i).dispatch(1);
+		eq(1, foo);
+	}
+}
+
+class Signal1<T> extends BaseSignal<T->Void> {
+	public function new(handler:T->Void) {
+		this.dispatch = value -> handler(value);
+	}
+}
+
+class BaseSignal<T> {
+	public var dispatch:T;
+}
diff --git a/tests/unit/src/unit/issues/Issue7335.hx b/tests/unit/src/unit/issues/Issue7335.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fe9a71aa42be23ee33c78d0d917fc7338dc20c49
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7335.hx
@@ -0,0 +1,32 @@
+package unit.issues;
+
+class Issue7335 extends Test {
+	function test() {
+
+		var data:Dynamic = {};
+		data.foo = 1;
+		var x:Float = data.foo++;
+
+		eq(1.0, x);
+		eq(2, data.foo);
+
+		var data:Dynamic = {};
+		data.foo = 1;
+		var x:Float = data.foo--;
+		eq(1.0, x);
+		eq(0, data.foo);
+
+		var data:Dynamic = {};
+		data.foo = 1;
+		var x:Float = ++data.foo;
+		eq(2.0, x);
+		eq(2, data.foo);
+
+		var data:Dynamic = {};
+		data.foo = 1;
+		var x:Float = --data.foo;
+		eq(0.0, x);
+		eq(0, data.foo);
+
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue7359.hx b/tests/unit/src/unit/issues/Issue7359.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4ccb3ebdcbaac58fffab644bc4b6b357df1f89ad
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7359.hx
@@ -0,0 +1,24 @@
+package unit.issues;
+
+import haxe.macro.Context;
+import haxe.macro.Expr;
+
+class Issue7359 extends unit.Test {
+	function test() {
+		#if !macro
+		eq("no", m(11));
+		eq("yes", m(1));
+		#end
+	}
+
+	static macro function m(e) {
+		var stored = haxe.macro.Context.storeTypedExpr(haxe.macro.Context.typeExpr(e));
+		var got = haxe.macro.Context.getTypedExpr(haxe.macro.Context.typeExpr(e));
+
+		// When using storedTypedExpr switch is invalid
+		var c = {expr:macro "yes", guard:null, values:[stored]};
+
+		var s = {expr:ESwitch(macro 1, [c], macro "no"), pos:Context.currentPos()};
+		return s;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7367.hx b/tests/unit/src/unit/issues/Issue7367.hx
new file mode 100644
index 0000000000000000000000000000000000000000..66741e19677880290284c5aac34f7d1753ec6da2
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7367.hx
@@ -0,0 +1,21 @@
+package unit.issues;
+
+private abstract Foo (String) {
+    public function new (s) {this = s;}
+    public function getFoo ():String return this;
+}
+
+private abstract Bar ({a:Foo, b:Foo}) {
+    public  function new (s) {this = s;}
+    public function getBar ():{a:Foo, b:Foo} return this;
+}
+
+class Issue7367 extends unit.Test {
+	function test() {
+		var x = new Bar({a:new Foo("hello"), b: new Foo("hello2")});
+        var s = switch x {
+            case _.getBar() => {a:_.getFoo() => s1, b:_.getFoo() => s2}: s1+s2;
+        }
+        eq("hellohello2", s);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7376.hx b/tests/unit/src/unit/issues/Issue7376.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bc65a462a8745989680c37a5357ba4a38319af8d
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7376.hx
@@ -0,0 +1,72 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue7376 extends unit.Test {
+	function testTryCatch() {
+		foo(bool -> {
+			try {
+				intJob();
+			} catch(e:Dynamic) {
+				voidJob();
+			}
+		});
+
+		var fn = bool -> {
+			try {
+				intJob();
+			} catch(e:Dynamic) {
+				voidJob();
+			}
+		}
+		foo(fn);
+
+		var fn = bool -> {
+			try {
+				intJob();
+			} catch(e:Dynamic) {
+				return;
+			}
+		}
+		foo(fn);
+
+		noAssert();
+	}
+
+	function testSwitch() {
+		foo(bool -> switch bool {
+			case true: intJob();
+			case false:
+		});
+
+		var fn = bool -> switch bool {
+			case true: intJob();
+			case false:
+		}
+		foo(fn);
+
+		var fn = bool -> switch bool {
+			case true: intJob();
+			case false: return;
+		}
+		foo(fn);
+
+		noAssert();
+	}
+
+	function testIfElse() {
+		foo(bool -> bool ? intJob() : voidJob());
+
+		var fn = bool -> if(bool) intJob() else {};
+		foo(fn);
+
+		var fn = bool -> if (bool) intJob() else return;
+		foo(fn);
+
+		noAssert();
+	}
+
+	@:pure(false) static function foo(f:(Bool)->Void) f(true);
+	@:pure(false) static function intJob():Int return 0;
+	@:pure(false) static function voidJob():Void {}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7388.hx b/tests/unit/src/unit/issues/Issue7388.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6aac20b2050da2441f0b1636d2a1f1c7ad5c92ce
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7388.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+private class A {
+    private var x = 1;
+}
+
+class Issue7388 extends unit.Test {
+	function test() {
+		eq("unit.issues._Issue7388.A does not have a constructor", HelperMacros.getErrorMessage(A.new));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7389.hx b/tests/unit/src/unit/issues/Issue7389.hx
new file mode 100644
index 0000000000000000000000000000000000000000..45ece35916356df9b718a9ece2bd2bfb927e3dfe
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7389.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+private typedef Throwable = Dynamic;
+
+class Issue7389 extends unit.Test {
+	static function main () {
+		var x = try {
+			1;
+		} catch (e:Throwable) {
+			2;
+		};
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7391.hx b/tests/unit/src/unit/issues/Issue7391.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a5e4ca649c682c7a2c8396345cdf8752504f4ac0
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7391.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+private typedef Foo = {
+	final i:Int;
+}
+
+private abstract Bar(Foo) from Foo {}
+
+class Issue7391 extends unit.Test {
+	function test() {
+		var b:Bar = {i: 0};
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7394.hx b/tests/unit/src/unit/issues/Issue7394.hx
new file mode 100644
index 0000000000000000000000000000000000000000..fc49705e4e4f4daffcca474147189e50b5a35fbf
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7394.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+private typedef Foo = {
+	final i:Int;
+}
+
+@:forward
+private abstract Bar(Foo) from Foo {
+	@:op(A > B) function compare(other:Bar)
+		return this.i > other.i;
+}
+
+class Issue7394 extends unit.Test {
+	function test() {
+		var b:Bar = {i: 0};
+		f(b > {i: 1});
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7443.hx b/tests/unit/src/unit/issues/Issue7443.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b96a6796f5c191340e03e1b9bb898754a6024656
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7443.hx
@@ -0,0 +1,7 @@
+package unit.issues;
+
+class Issue7443 extends unit.Test {
+	function test () {
+		eq('true,false', [true, false].join(','));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7449.hx b/tests/unit/src/unit/issues/Issue7449.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e40c7416fd469eb340f16a1682870b18aba4e51e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7449.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+class Issue7449 extends unit.Test {
+	/**
+	 * Not happens since https://github.com/HaxeFoundation/haxe/pull/8141
+	 */
+	// #if target.unicode
+	// function test() {
+	// 	eq(220, "\xDC".charCodeAt(0));
+	// }
+	// #end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7466.hx b/tests/unit/src/unit/issues/Issue7466.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0a80a6e97d4c0df28c5ba152b7dba04e1f842fc8
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7466.hx
@@ -0,0 +1,8 @@
+package unit.issues;
+import unit.issues.misc.Issue7466Macro as Macro;
+
+class Issue7466 extends unit.Test {
+	function test() {
+		f(Macro.canType( Macro.getCheckType() ));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7476.hx b/tests/unit/src/unit/issues/Issue7476.hx
new file mode 100644
index 0000000000000000000000000000000000000000..056c5b8e6aa9cf400f2a10ac2f090a43f7236c7a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7476.hx
@@ -0,0 +1,15 @@
+package unit.issues;
+
+class Issue7476 extends unit.Test {
+	function test() {
+		noAssert();
+	}
+}
+
+private typedef FooBar = {
+	var foo:Array<Foo & Bar>;
+}
+
+private typedef Foo = {}
+
+private typedef Bar = {}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7492.hx b/tests/unit/src/unit/issues/Issue7492.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0fccb106a766fcbb8213ee18ed9caf269f55048b
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7492.hx
@@ -0,0 +1,10 @@
+package unit.issues;
+
+class Issue7492 extends unit.Test {
+	function test() {
+		var a = [1];
+		a[1] = 1;
+		var v = haxe.ds.Vector.fromArrayCopy(a);
+		eq(2, v.length);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7499.hx b/tests/unit/src/unit/issues/Issue7499.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9bf03c0179439e188f56f9a9e38bc7a4dc08cfac
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7499.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue7499 extends unit.Test {
+	@:analyzer(ignore)
+	function test() {
+		var a;
+		noAssert();
+	}
+
+	@:analyzer(ignore)
+	static function __init__() {
+		var s:String;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7531.hx b/tests/unit/src/unit/issues/Issue7531.hx
new file mode 100644
index 0000000000000000000000000000000000000000..aca0e6d1684bc3acc5e2dcf28d0a681dd9408dd9
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7531.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+class Issue7531 extends unit.Test {
+	function test() {
+		var kv = get();
+		eq(0, kv.key);
+		eq(1, kv.value);
+	}
+
+	static var arr = [1, 2, 3];
+	static var idx = 0;
+
+	static function get() {
+		return {value:arr[idx], key:idx++};
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7533.hx b/tests/unit/src/unit/issues/Issue7533.hx
new file mode 100644
index 0000000000000000000000000000000000000000..461f01ace2aca9fd505c9b76afd62c41005b0811
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7533.hx
@@ -0,0 +1,23 @@
+package unit.issues;
+
+#if php
+import php.*;
+#end
+
+class Issue7533 extends unit.Test {
+	#if php
+	function test() {
+		var signBit = Const.PHP_INT_SIZE * 8 - 1; //31 or 63
+
+		var bint:Int = Syntax.code('bindec(decbin({0}))', 1 << signBit);
+		/**
+		 * `bindec(decbin())` is to convert `1 << signBit` to a positive float instead of a negative int.
+		 * This is the only way for it to fall into `else if(left >= 0)` branch of `php.Boot.shiftRightUnsigned()`.
+		 * And then on a bitwise operation it will be converted back to a negative integer by PHP interpreter.
+		 * And that causes this bug.
+		 */
+
+		eq( 1 << (signBit - 2), bint >>> 2 );
+	}
+	#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7536.hx b/tests/unit/src/unit/issues/Issue7536.hx
new file mode 100644
index 0000000000000000000000000000000000000000..60deb3979ff7c37c6670c0604ebd040676e3a27d
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7536.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue7536 extends unit.Test {
+	function test() {
+      var s:String = null;
+      var url:Dynamic = { query: s }
+      t(url.query == null);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7540.hx b/tests/unit/src/unit/issues/Issue7540.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f816e9cd2e2c4127124b69dcc3dcdcae067cc08f
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7540.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+class Issue7540 extends unit.Test {
+	function test() {
+		eq(1, get());
+	}
+
+	function get() {
+		return try throw new Error() catch (e:Error) 1;
+	}
+}
+
+private typedef Error = TypedError<Dynamic>;
+private class TypedError<T> {
+	public function new() { }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7546.hx b/tests/unit/src/unit/issues/Issue7546.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a73e66f168e3b8540679f7caa8ea54c5235dfc2d
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7546.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue7546 extends unit.Test {
+	function test() {
+		var instance:Dynamic = {};
+		eq(null, instance.field);
+
+		eq(null, ({}:Dynamic).timeout);
+
+		var instance = ({}:Dynamic);
+		eq(null, instance.field);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7579.hx b/tests/unit/src/unit/issues/Issue7579.hx
new file mode 100644
index 0000000000000000000000000000000000000000..149afc43e7fdbed38d06c40c65092be1d7870f6e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7579.hx
@@ -0,0 +1,39 @@
+package unit.issues;
+
+private class A<T>
+{
+    private var value:T;
+
+    public function new()
+    {
+    }
+
+    public function toB():B<T>
+    {
+        var b:B<T> = new B<T>();
+        b.set(value);
+        return b;
+    }
+}
+
+private class B<T>
+{
+    private var hash:Map<Int, T>;
+
+    public function new()
+    {
+        this.hash = new Map<Int, T>();
+    }
+
+    public inline function set(item:T):Void
+    {
+        hash.set(0, item);
+    }
+}
+
+class Issue7579 extends unit.Test {
+	function test() {
+		var b = new B<Int>();
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7590.hx b/tests/unit/src/unit/issues/Issue7590.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dd26bf75e8d0f0d4498530608028961bc539597b
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7590.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+class Issue7590 extends unit.Test {
+	function test() {
+		var array = [0, 1, 2, 3, 4, 5];
+		for (k in array.copy().iterator()) {
+			array.remove(k);
+		}
+
+		aeq([], array);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7600.hx b/tests/unit/src/unit/issues/Issue7600.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ea6871fc51855306db1950e96e0daa2c7959bd81
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7600.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue7600 extends unit.Test {
+	function test() {
+		var def = macro class {
+			public static function foo<E:EnumValue>(e:E):E
+				return e;
+		}
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7603.hx b/tests/unit/src/unit/issues/Issue7603.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9eeaecb987eb20c55e787fdca4e4d7987ee0bca1
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7603.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+private abstract Foo(String) {
+	@:from static public function from(bar: Bar):Foo {
+		return cast bar.getName();
+	}
+}
+
+private enum Bar {
+	A(v: Int);
+	B;
+}
+
+class Issue7603 extends unit.Test {
+	function test() {
+		var bar:Foo = A(200);
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7630.hx b/tests/unit/src/unit/issues/Issue7630.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8c13ae7e04025bfa3e76a59f9031adfe4093d4b1
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7630.hx
@@ -0,0 +1,20 @@
+package unit.issues;
+
+class Issue7630 extends unit.Test {
+	#if js
+	function test() {
+		var r = Math.random();
+
+    	func(inlineMe(if (r > 0.5) 42 else 21));
+		noAssert();
+	}
+
+	@:pure(false)
+	static function func(x:Float) { }
+
+	static inline function inlineMe(code: Int) {
+		var code2 = code;
+		return js.Syntax.code("{0} + 1", code2);
+	}
+	#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7642.hx b/tests/unit/src/unit/issues/Issue7642.hx
new file mode 100644
index 0000000000000000000000000000000000000000..21e966aab76064a5595336a8744478b11c5794ba
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7642.hx
@@ -0,0 +1,20 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue7642 extends unit.Test {
+	@:analyzer(ignore)
+	function test() {
+		apply();
+		noAssert();
+	}
+
+	@:analyzer(ignore)
+	static public inline function apply(n = 0):Void {
+		new Map<Int, Int>();
+		//avoid infinite recursion
+		if(n < 3) {
+			apply(++n);
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7653.hx b/tests/unit/src/unit/issues/Issue7653.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0cf82863cc85535f6bdd52189dc087b9f9c19ea1
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7653.hx
@@ -0,0 +1,30 @@
+package unit.issues;
+
+private class Exception {
+	public function new() {}
+}
+
+private class Exception2 {
+	public function new() {}
+}
+
+class Issue7653 extends unit.Test {
+	function test() {
+		var i;
+		try {
+			doSomething();
+			i = 10;
+		}
+		catch (e:Exception) {
+			i = 20;
+		}
+		eq(i, 20);
+	}
+
+	static function doSomething() {
+		try {
+			throw new Exception();
+		}
+		catch (e:Exception2) {}
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7659.hx b/tests/unit/src/unit/issues/Issue7659.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e748a8389f20c1ae6a3ebae3081b62336bfa02a3
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7659.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+class Issue7659 extends unit.Test {
+	function test() {
+		var a:DummyAbstract = ['hello'];
+		var actual = [for(i in a) i];
+		aeq([1, 2, 3], actual);
+	}
+}
+
+private abstract DummyAbstract(Array<String>) from Array<String> {
+	public var length(get,never):Int;
+	function get_length() return this.length;
+	@:arrayAccess function get(i:Int) return this[i];
+
+	public function iterator() return [1, 2, 3].iterator();
+}
+
diff --git a/tests/unit/src/unit/issues/Issue7661.hx b/tests/unit/src/unit/issues/Issue7661.hx
new file mode 100644
index 0000000000000000000000000000000000000000..2305134baf8ae919dfcfab79d0478c2a903fd039
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7661.hx
@@ -0,0 +1,26 @@
+package unit.issues;
+
+class Issue7661 extends unit.Test {
+	function test() {
+		var result = [for(i in new AbstractIterator(0, 3)) i];
+		aeq([0, 1, 2], result);
+	}
+}
+
+abstract AbstractIterator({current:Int, last:Int}) {
+	public var length(get,never):Int;
+	inline function get_length() return this.last - this.current;
+
+	@:arrayAccess
+	public function get(i:Int) return this.current - i;
+
+	public inline function new(start:Int, end:Int) {
+		this = {current:start, last:end};
+	}
+
+	public inline function hasNext()
+		return this.current < this.last;
+
+	public inline function next()
+		return this.current++;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7671.hx b/tests/unit/src/unit/issues/Issue7671.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1561c1e04cccb9ce4e6001cb7f8f30d360af4223
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7671.hx
@@ -0,0 +1,49 @@
+package unit.issues;
+
+class Issue7671 extends unit.Test {
+	function test() {
+		var d = new Dummy();
+
+		eq("getter", d.getterInstance);
+		eq("getter", Reflect.getProperty(d, "getterInstance"));
+
+		eq("getter", Dummy.getterStatic);
+		eq("getter", Reflect.getProperty(Dummy, "getterStatic"));
+
+		d.setterInstance = "hello";
+		eq("hello", d.instanceValue);
+		Reflect.setProperty(d, "setterInstance", "world");
+		eq("world", d.instanceValue);
+
+		Dummy.setterStatic = "hello";
+		eq("hello", Dummy.staticValue);
+		Reflect.setProperty(Dummy, "setterStatic", "world");
+		eq("world", Dummy.staticValue);
+	}
+}
+
+private class Dummy {
+	static public var getterStatic (get,null):String;
+	static function get_getterStatic() {
+		return "getter";
+	}
+
+	public var getterInstance (get,null):String;
+	function get_getterInstance() {
+		return "getter";
+	}
+
+	static public var setterStatic (null,set):String;
+	static public var staticValue:String;
+	static function set_setterStatic(v:String):String {
+		return staticValue = v;
+	}
+
+	public var setterInstance (null,set):String;
+	public var instanceValue:String;
+	function set_setterInstance(v:String) {
+		return instanceValue = v;
+	}
+
+	public function new(){}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7672.hx b/tests/unit/src/unit/issues/Issue7672.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3c70911ad378d463f7a61a5c4bf193317b626adc
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7672.hx
@@ -0,0 +1,32 @@
+package unit.issues;
+
+private enum EListingField<T:Obj> {
+	ELCounter;
+	ELID;
+}
+
+private typedef TListingConf<T:Obj> = {
+	fields:Array<EListingField<T>>
+}
+
+private class Obj {
+	public var id : Int;
+}
+
+class Issue7672 extends unit.Test {
+	function test() {
+		doesnt({ fields: [ELID] }, [null]);
+	}
+
+	function doesnt<T:Obj>( conf : TListingConf<T>, iterable : Iterable<T> )
+		for (o in iterable)
+			for (field in conf.fields) {
+				switch field {
+					case ELCounter:
+						'<td>&nbsp;</td>';
+					case ELID:
+						HelperMacros.typedAs((null : T), o);
+						'<td>${o.id}</td>';
+				}
+			}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7674.hx b/tests/unit/src/unit/issues/Issue7674.hx
new file mode 100644
index 0000000000000000000000000000000000000000..97bad516a471f2c6f7ae5148506a805e5ff14a0a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7674.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+private abstract MyAbstract({}) {
+    public var abstractProperty (get, set):Array<Float>;
+    public function new () { this = {}; }
+    private inline function get_abstractProperty () { return []; }
+    private inline function set_abstractProperty (value:Array<Float>) { return []; }
+}
+
+class Issue7674 extends unit.Test {
+	function test() {
+        var enumInstance = new MyAbstract ();
+        enumInstance.abstractProperty = [1];
+		utest.Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7688.hx b/tests/unit/src/unit/issues/Issue7688.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d685459e017d934e26debc46f720b90ab340fe45
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7688.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+class Issue7688 extends unit.Test {
+	#if !macro
+	function test() {
+		var bar = 'bar';
+		nullify(@blargh { foo: 'bar$bar' });//compiles just fine
+		nullify(@blargh { foo: 'bar$whatever' });//also compiles just fine, because the whole expression is actually discarded
+		nullify({ foo: 'bar$bar' });//unknown identifier bar
+		utest.Assert.pass();
+	}
+	#end
+	static macro function nullify(e) {
+		return macro null;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7716.hx b/tests/unit/src/unit/issues/Issue7716.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3743c6e7eb6c4bec4cf147c6b8e721a4d9a3e0b8
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7716.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue7716 extends unit.Test {
+	static public var value = 999;
+
+	function test() {
+		eq(unit.issues.misc.ISSUE7716.value(), value);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7727.hx b/tests/unit/src/unit/issues/Issue7727.hx
new file mode 100644
index 0000000000000000000000000000000000000000..043f30ad91b3a0aaaf4c3cb6746dc1ce19119bbe
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7727.hx
@@ -0,0 +1,26 @@
+package unit.issues;
+
+private enum E {
+	A;
+	B;
+}
+
+private interface I {
+	var e:E;
+}
+
+class Issue7727 extends unit.Test implements I {
+	public var e:E;
+
+	function test() {
+		e = A;
+		eq(1, run(this));
+	}
+
+	static function run(i:I) {
+		switch(i.e) {
+			case A: return 1;
+			case B: return 2;
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7728.hx b/tests/unit/src/unit/issues/Issue7728.hx
new file mode 100644
index 0000000000000000000000000000000000000000..73a15b443d4d4d0b7d2c4aa7d81c8369e60785d9
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7728.hx
@@ -0,0 +1,22 @@
+package unit.issues;
+
+private enum E {
+	A(s:S);
+}
+
+private abstract S(String) {
+	public var value(get, never):String;
+	function get_value():String return this;
+}
+
+class Issue7728 extends unit.Test {
+	function test() {
+		noAssert();
+	}
+
+	static function doTest(e:E):Void {
+		switch(e) {
+			case A(value):
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7743.hx b/tests/unit/src/unit/issues/Issue7743.hx
new file mode 100644
index 0000000000000000000000000000000000000000..657c540ab452edf16dacd27df74adbc8794a5e69
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7743.hx
@@ -0,0 +1,8 @@
+package unit.issues;
+
+class Issue7743 extends unit.Test {
+	function test() {
+		for (i in 0...0) {}
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7827.hx b/tests/unit/src/unit/issues/Issue7827.hx
new file mode 100644
index 0000000000000000000000000000000000000000..16bf1b98234370f45eec2b08345d748b061f8b1f
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7827.hx
@@ -0,0 +1,22 @@
+package unit.issues;
+
+import utest.Assert;
+private class Base {}
+
+private class Child extends Base {
+    public function new() {}
+}
+
+private interface I {
+    final x:Base;
+}
+
+private class C implements I {
+	public final x:Child = new Child();
+}
+
+class Issue7827 extends unit.Test {
+	function test() {
+		Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7844.hx b/tests/unit/src/unit/issues/Issue7844.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cefacd56ca90de8189d4a7237abe728f5ef1093e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7844.hx
@@ -0,0 +1,28 @@
+package unit.issues;
+
+private class A {
+	@:keep
+	@:native("other")
+	function some() {
+		return "A";
+	}
+}
+
+private class B extends A {}
+
+private class C extends B {
+	public function new() {}
+
+	override public function some() {
+		return super.some() + "C";
+	}
+}
+
+class Issue7844 extends unit.Test {
+	function test() {
+		var c = new C();
+		var f = Reflect.field(c, "other");
+		var r = Reflect.callMethod(c, f, []);
+		eq(r, "AC");
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7867.hx b/tests/unit/src/unit/issues/Issue7867.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4e6fc14fd0270d80df6cfc9e71748e9d9f4600af
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7867.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+#if js
+private class A {
+	@:native("##") public static function f() return 10;
+}
+#end
+
+class Issue7867 extends unit.Test {
+	#if js
+	function test() {
+		eq(Reflect.callMethod(A, Reflect.field(A, "##"), []), 10);
+		eq(A.f(), 10);
+	}
+	#end
+}
diff --git a/tests/unit/src/unit/issues/Issue7869.hx b/tests/unit/src/unit/issues/Issue7869.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5280bf968132b5ce01ed6fd42c0c2f5c41a7916c
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7869.hx
@@ -0,0 +1,23 @@
+package unit.issues;
+
+private class A {
+	function new() {}
+}
+
+private class B extends A {
+	public var f:Int;
+	public var x:()->Void;
+
+	public function new() {
+		super();
+		x = () -> f = 2;
+	}
+}
+
+class Issue7869 extends unit.Test {
+	function test() {
+		var b = new B();
+		b.x();
+		eq(b.f, 2);
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue7883.hx b/tests/unit/src/unit/issues/Issue7883.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d3d0ceb656a7ae69bab0d73586bfa873468098b9
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7883.hx
@@ -0,0 +1,17 @@
+package unit.issues;
+
+class Issue7883 extends unit.Test {
+	function test() {
+		(0:A).x.f();
+		noAssert();
+	}
+}
+
+private abstract A(Int) from Int {
+	public var x(get,never):A;
+	function get_x() return 1;
+
+	public function f() {}
+
+	public function getX():A return 1;
+}
diff --git a/tests/unit/src/unit/issues/Issue7890.hx b/tests/unit/src/unit/issues/Issue7890.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5949cec3a1d8f4e025c32a462252cdbab9f53375
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7890.hx
@@ -0,0 +1,8 @@
+package unit.issues;
+
+class Issue7890 extends unit.Test {
+	function test() {
+		var x: () -> Void = () -> { return; }
+		noAssert();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7903.hx b/tests/unit/src/unit/issues/Issue7903.hx
new file mode 100644
index 0000000000000000000000000000000000000000..527aa0c35015a04ff90a7ba75e69669e6c0ecac2
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7903.hx
@@ -0,0 +1,43 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue7903 extends unit.Test {
+	static var tmp:String;
+	function test() {
+		//Test recursive objects
+		var o = {rec:(null:Dynamic)};
+		o.rec = o;
+		try {
+			tmp = Std.string(o);
+			Assert.pass();
+		} catch(e:Dynamic) {
+			Assert.fail('Failed to stringify an object with recursive reference: $e');
+		}
+
+		//Test recursive enums
+		var o = {rec:(null:RecursiveEnum)};
+		var e = Ctor(o);
+		o.rec = e;
+		try {
+			tmp = Std.string(e);
+			Assert.pass();
+		} catch(e:Dynamic) {
+			Assert.fail('Failed to stringify an enum instance with recursive reference: $e');
+		}
+
+		//Test recursive arrays
+		var a:Array<Dynamic> = [];
+		a.push(a);
+		try {
+			tmp = Std.string(a);
+			Assert.pass();
+		} catch(e:Dynamic) {
+			Assert.fail('Failed to stringify a recursive array: $e');
+		}
+	}
+}
+
+private enum RecursiveEnum {
+	Ctor(o:{rec:Null<RecursiveEnum>});
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7922.hx b/tests/unit/src/unit/issues/Issue7922.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c43eb999280b1aaf9b56def6b842559e9ee152a7
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7922.hx
@@ -0,0 +1,29 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue7922 extends unit.Test {
+	function test() {
+		var a:A = LAME;
+		var b:B = HOT;
+
+		switch (a) {
+			case LAME | COOL:
+		}
+
+		switch (b) {
+			case NOT | HOT:
+		}
+		Assert.pass();
+	}
+}
+
+private enum abstract A(Int) to Int {
+	var LAME =  0;
+	var COOL =  1;
+}
+
+private enum abstract B(Int) {
+	var NOT = LAME;
+	var HOT = COOL;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue7981.hx b/tests/unit/src/unit/issues/Issue7981.hx
new file mode 100644
index 0000000000000000000000000000000000000000..64897c16917f21dc2b11e2adecad43dac4b06504
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue7981.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+class Issue7981 extends unit.Test {
+	function test() {
+		var d:Dummy = 10;
+		eq(12, d + 'ab');
+		eq(13, d['abc']);
+		eq(14, d.abcd);
+	}
+}
+
+private abstract Dummy(Int) from Int {
+	@:op(A + B) @:arrayAccess @:resolve
+	public inline function resolve(key:String):Int
+		return this + key.length;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8032.hx b/tests/unit/src/unit/issues/Issue8032.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a2fe27e84fc8625a917129979735751c87df9db5
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8032.hx
@@ -0,0 +1,22 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue8032 extends unit.Test {
+	function test() {
+		// crude but effective way to test this
+		#if sys
+			#if target.sys
+			Assert.pass();
+			#else
+			Assert.fail();
+			#end
+		#else
+			#if target.sys
+			Assert.fail();
+			#else
+			Assert.pass();
+			#end
+		#end
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8050.hx b/tests/unit/src/unit/issues/Issue8050.hx
new file mode 100644
index 0000000000000000000000000000000000000000..63b1da0e038bce5573ab983197edd3f59fe32207
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8050.hx
@@ -0,0 +1,21 @@
+package unit.issues;
+
+class Issue8050 extends unit.Test {
+	var field(get,never):Null<Int>;
+
+	static var sideEffectCounter = 0;
+
+	function get_field() {
+		sideEffectCounter++;
+		return 42;
+	}
+
+	function test() {
+		var s = switch this {
+			case {field: 42}: "yes";
+			case _: "no";
+		}
+		eq("yes", s);
+		eq(1, sideEffectCounter);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8053.hx b/tests/unit/src/unit/issues/Issue8053.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a5cfc3e77eea7544a04d333c42d1642a2cd26bfb
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8053.hx
@@ -0,0 +1,29 @@
+package unit.issues;
+
+#if php
+import php.Syntax.*;
+import php.Const.*;
+#end
+
+class Issue8053 extends unit.Test {
+	function test() {
+		var b = "";
+
+		#if !php
+		var a:Dynamic = { };
+		Reflect.setField(a, b, 1);
+		#else
+		var a:Dynamic = if(PHP_VERSION_ID < 70100) {
+			//Prior to PHP 7.1.0 there was no way to add a property with an empty name to an existing object.
+			//So, we create an object with an empty property name by transforming an associative array with an empty string index.
+			object(assocDecl({"" : 1}));
+		} else {
+			var a = {};
+			Reflect.setField(a, b, 1);
+			a;
+		}
+		#end
+
+		eq(1, Reflect.field(a, b));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8075.hx b/tests/unit/src/unit/issues/Issue8075.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e8a3ddc0e863e759286ec13e9cfdeed589f41ffe
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8075.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue8075 extends unit.Test {
+#if !as3
+	function test() {
+		var expect = #if static 0 #else null #end;
+		var a = [];
+		a.push(1);
+		a.pop();
+		a[2] = 2;
+		eq(expect, a[0]);
+	}
+#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8079.hx b/tests/unit/src/unit/issues/Issue8079.hx
new file mode 100644
index 0000000000000000000000000000000000000000..653b28ac3d6b1dd6de6b2f3bbdd0adb72b8f5cc6
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8079.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue8079 extends unit.Test {
+	function test() {
+		var instance = ({}:Dynamic);
+		if(instance.timeout != null) {
+			instance.timeout = null;
+		}
+		utest.Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8101.hx b/tests/unit/src/unit/issues/Issue8101.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1aebc23fe62b0014244e090ea30292b7e1c53d71
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8101.hx
@@ -0,0 +1,15 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue8101 extends unit.Test {
+	function test() {
+		var a;
+		f1 = () -> a = "";
+		f2 = () -> a = "";
+		Assert.pass();
+	}
+
+	static dynamic function f1():Void {}
+	static dynamic function f2() {}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8118.hx b/tests/unit/src/unit/issues/Issue8118.hx
new file mode 100644
index 0000000000000000000000000000000000000000..cfd0fb410456b39eacec7eec2f8cfb1a74fbdafb
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8118.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue8118 extends unit.Test {
+#if !(neko || flash)
+	static var v:RootEnum;
+	function test() {
+		v = A(10);
+		eq(10, switch v { case A(i): i; });
+	}
+#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8185.hx b/tests/unit/src/unit/issues/Issue8185.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9c4ae04ee3edc70f07de4806f852c835b89c1aa7
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8185.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+class Issue8185 extends Test {
+	function test() {
+		eq(1, length());
+		eq(2, name());
+		eq(1, TestVar.length);
+		eq(2, TestVar.name);
+	}
+
+	static function length() return 1;
+	static function name() return 2;
+}
+
+private class TestVar {
+	static public var length = 1;
+	static public var name = 2;
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8187.hx b/tests/unit/src/unit/issues/Issue8187.hx
new file mode 100644
index 0000000000000000000000000000000000000000..dda6e3d8660a1244844a5bab48f7b246be7d6fe6
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8187.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue8187 extends unit.Test {
+	static inline var enumValue = Leaf;
+	function test() {
+		eq(enumValue, Leaf);
+	}
+}
+
+private enum Tree {
+	Leaf;
+	Node(a:Tree, b:Tree);
+}
diff --git a/tests/unit/src/unit/issues/Issue8188.hx b/tests/unit/src/unit/issues/Issue8188.hx
new file mode 100644
index 0000000000000000000000000000000000000000..f32542cfa5e7a3b369797e7b911b7f23cfc43c3f
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8188.hx
@@ -0,0 +1,51 @@
+package unit.issues;
+
+class Issue8188 extends unit.Test {
+	function test() {
+		t(new Dummy().checkClass());
+		t(new DummyChild().checkClass());
+
+		t(new IDummyInst().checkInterface());
+		t(new IDummyChildInst().checkInterface());
+
+		t(new ADummy().checkAbstract());
+	}
+
+	static function checkClass(d:Dummy):Bool {
+		return true;
+	}
+
+	static function checkInterface(d:IDummy):Bool {
+		return true;
+	}
+
+	static function checkAbstract(d:ADummy):Bool {
+		return true;
+	}
+}
+
+@:using(unit.issues.Issue8188)
+private class Dummy {
+	public function new() {}
+}
+
+private class DummyChild extends Dummy {}
+
+@:using(unit.issues.Issue8188)
+private interface IDummy {}
+private interface IDummyChild extends IDummy {}
+
+private class IDummyInst implements IDummy {
+	public function new() {}
+}
+
+private class IDummyChildInst implements IDummyChild {
+	public function new() {}
+}
+
+@:using(unit.issues.Issue8188)
+private abstract ADummy(String) {
+	public inline function new() {
+		this = '';
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8200.hx b/tests/unit/src/unit/issues/Issue8200.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a6582f44c9c37c05029d85bac5eaad5aa11ad43b
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8200.hx
@@ -0,0 +1,20 @@
+package unit.issues;
+
+class Issue8200 extends unit.Test {
+	function test() {
+		var a:Abstract = new Impl();
+		t(a.foo.bind()());
+	}
+}
+
+class Impl implements Interface {
+	public function new() {}
+	public function foo():Bool return true;
+}
+
+@:forward
+abstract Abstract(Interface) from Interface to Interface {}
+
+interface Interface {
+	function foo():Bool;
+}
diff --git a/tests/unit/src/unit/issues/Issue8203.hx b/tests/unit/src/unit/issues/Issue8203.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3d5c68288634430fb65bc9e6e3bb00d551108e50
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8203.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue8203 extends unit.Test {
+	function test() {
+		var x:Dummy = [1,true,"hi"];
+		noAssert();
+	}
+}
+
+private abstract Dummy(Dynamic)
+	from Dynamic
+	from Array<Dynamic>
+	from Array<Int>
+{}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8211.hx b/tests/unit/src/unit/issues/Issue8211.hx
new file mode 100644
index 0000000000000000000000000000000000000000..9905bef333545a25da7db91efff9ebdaba14078e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8211.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue8211 extends unit.Test {
+	function test() {
+		t(StringTools.endsWith("abc", "bc"));
+		t(StringTools.endsWith("aňa", "ňa"));
+		t(StringTools.endsWith("\u{1F604}\u{1F619}", "\u{1F604}\u{1F619}"));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8212.hx b/tests/unit/src/unit/issues/Issue8212.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b8621552de732afd46e0676c0ec69706fdf5e8ac
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8212.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+import haxe.io.Bytes;
+
+class Issue8212 extends unit.Test {
+	function test() {
+		var hex = "010a7f0ac2800adfbf0ae0a0800aed9fbf0aee80800aefbfbd0af09f9882f09f9884f09f98990ac8a70a";
+		var bytes = Bytes.ofHex(hex);
+		eq(hex.length, bytes.length * 2);
+		eq(hex, bytes.toHex());
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8213.hx b/tests/unit/src/unit/issues/Issue8213.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6f175d01423ea47d740353d07187e94b5d6059d5
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8213.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue8213 extends unit.Test {
+	function test() {
+		var s = "hi";
+		switch s {
+			case null:
+			case "hi":
+			case "no":
+		}
+		utest.Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8218.hx b/tests/unit/src/unit/issues/Issue8218.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b3dd6f660f09636e1de329ab62f9a5be1c293b01
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8218.hx
@@ -0,0 +1,56 @@
+package unit.issues;
+
+class Issue8218 extends unit.Test {
+	#if flash
+	function test() {
+		new Child(this);
+	}
+	#end
+}
+
+#if flash
+@:access(unit.Test)
+private class Child extends Lib2 {
+	public function new(test:unit.Test) {
+		super();
+
+		// this. protected access
+		test.eq(x, 42);
+		x = 50;
+		test.eq(x, 50);
+
+		test.eq(i, 5);
+		i = 10;
+		test.eq(i, 10);
+
+		test.eq(f(), "hello");
+		test.eq(call(f), "hello");
+
+		// super. protected access
+		test.eq(super.x, 50);
+		super.x = 55;
+		test.eq(super.x, 55);
+
+		test.eq(super.i, 10);
+		super.i = 15;
+		test.eq(super.i, 15);
+
+		test.eq(super.f(), "hello");
+
+		// static protected access
+		test.eq(Lib.sx, 42);
+		Lib.sx = 50;
+		test.eq(Lib.sx, 50);
+
+		test.eq(Lib.si, 5);
+		Lib.si = 10;
+		test.eq(Lib.si, 10);
+
+		test.eq(Lib.sf(), "hello");
+	}
+
+	static function call(f:()->String):String {
+		return f();
+	}
+}
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8220.hx b/tests/unit/src/unit/issues/Issue8220.hx
new file mode 100644
index 0000000000000000000000000000000000000000..232bdb676cb3abf09e800547dca9bd1a57439ff8
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8220.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue8220 extends unit.Test {
+	@:analyzer(ignore)
+	function test() {
+		var height = 10;
+		breaker(height);
+	}
+
+	@:analyzer(ignore)
+	inline function breaker(height:Float):Void {
+		eq(-0.1, 1 / -height);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8221.hx b/tests/unit/src/unit/issues/Issue8221.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c163995351f6a6507be6ca53abad2e9c026f31bd
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8221.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+private abstract A(Dynamic) {
+	public function iterator():Iterator<String> {
+		var done = false;
+		return {
+			hasNext: () -> !done,
+			next: () -> {done = true; "works";}
+		};
+	}
+	@:op(a.b) function resolve(name:String):A throw "nope";
+}
+
+class Issue8221 extends unit.Test {
+	function test() {
+		var a:A = null;
+		aeq(["works"], [for (v in a) v]);
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue8227.hx b/tests/unit/src/unit/issues/Issue8227.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a30e96bb0eb6ffb87ba4f0e148f8ddc518f690b3
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8227.hx
@@ -0,0 +1,59 @@
+package unit.issues;
+
+class Issue8227 extends unit.Test {
+	#if (flash && !as3)
+	function test() {
+		var ns = new NsCls();
+		eq(ns.ns1v, 1);
+		ns.ns1v = 50;
+		eq(ns.ns1v, 50);
+
+		eq(ns.ns2v, 2);
+		ns.ns2v = 10;
+		eq(ns.ns2v, 10);
+
+		new Child(this);
+	}
+	#end
+}
+
+#if (flash && !as3)
+@:access(unit.Test)
+private class Child extends NsCls {
+	public function new(test:unit.Test) {
+		super();
+
+		test.eq(ns1v, 1);
+		ns1v = 50;
+		test.eq(ns1v, 50);
+
+		test.eq(ns2v, 2);
+		ns2v = 10;
+		test.eq(ns2v, 10);
+
+		test.eq(ns1f(), 1);
+		test.eq(call(ns1f), 1);
+
+		test.eq(ns2f(), 2);
+		test.eq(call(ns2f), 2);
+
+		test.eq(NsCls.ns1sv, 1);
+		NsCls.ns1sv = 50;
+		test.eq(NsCls.ns1sv, 50);
+
+		test.eq(NsCls.ns2sv, 2);
+		NsCls.ns2sv = 10;
+		test.eq(NsCls.ns2sv, 10);
+
+		test.eq(NsCls.ns1sf(), 1);
+		test.eq(call(NsCls.ns1sf), 1);
+
+		test.eq(NsCls.ns2sf(), 2);
+		test.eq(call(NsCls.ns2sf), 2);
+	}
+
+	static function call(f:()->Int):Int {
+		return f();
+	}
+}
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8240.hx b/tests/unit/src/unit/issues/Issue8240.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a11fc8f18d165debb8ef2c77ce89b2a068c6616e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8240.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+private class Suite {
+	public function new() {}
+}
+
+class Issue8240 extends unit.Test {
+	function test() {
+		var suite = new Suite();
+		var f = function() (for (c in inline new haxe.iterators.StringIteratorUnicode("")) {});
+		utest.Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8241.hx b/tests/unit/src/unit/issues/Issue8241.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4fa01298150119ffd260d4e4981d9a0f801fa730
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8241.hx
@@ -0,0 +1,70 @@
+package unit.issues;
+
+#if (flash && !as3)
+private class PropClassChild extends PropClass {
+	override function get_x():Int {
+		return super.get_x() + 1;
+	}
+
+	override function set_x(value:Int) {
+		return super.set_x(value + 1);
+	}
+}
+
+private class PropIfaceImpl implements PropIface {
+	var _x = 42;
+	@:flash.property
+	public var x(get,set):Int;
+	function get_x():Int return _x;
+	function set_x(v:Int):Int return _x = v;
+	public function new() {}
+}
+
+private interface HaxePropIface {
+	var x(get,set):Int;
+}
+
+private class HaxePropIfaceImpl extends PropClass implements HaxePropIface {}
+#end
+
+class Issue8241 extends unit.Test {
+	#if (flash && !as3)
+	function test() {
+		var p = new PropClass();
+		eq(42, p.x);
+		eq(15, p.x = 15);
+		eq(15, p.x);
+
+		var p = new PropClassChild();
+		eq(43, p.x);
+		eq(17, p.x = 16);
+		eq(18, p.x);
+
+		var p:PropClass = new PropClassChild();
+		eq(43, p.x);
+		eq(16, p.x = 16); // this should actually return 17 like in the example above, but that's not how flash properties work,
+		                  // so technically we should do something about it, but this only covers a really insane when the setter returns a different value
+		eq(18, p.x);
+
+		var p = new PropIfaceImpl();
+		eq(42, p.x);
+		eq(15, p.x = 15);
+		eq(15, p.x);
+
+		var p:PropIface = new PropIfaceImpl();
+		eq(42, p.x);
+		eq(15, p.x = 15);
+		eq(15, p.x);
+
+		var p = new HaxePropIfaceImpl();
+		eq(42, p.x);
+		eq(15, p.x = 15);
+		eq(15, p.x);
+
+		var p:HaxePropIface = new HaxePropIfaceImpl();
+		eq(42, p.x);
+		eq(15, p.x = 15);
+		eq(15, p.x);
+	}
+	#end
+}
diff --git a/tests/unit/src/unit/issues/Issue8242.hx b/tests/unit/src/unit/issues/Issue8242.hx
new file mode 100644
index 0000000000000000000000000000000000000000..5aeaad40e8daf40770f911287303d9b1f3b07acd
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8242.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue8242 extends unit.Test {
+	@:analyzer(ignore)
+	public function test() {
+		var num:Null<Int> = 22;
+		var i = (num - 1) * 2;
+		eq(42, i);
+
+		var num:Null<Float> = 22;
+		var i = (num - 1) * 2;
+		eq(42.0, i);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8243.hx b/tests/unit/src/unit/issues/Issue8243.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6cfd24fcdf77f15c746dd1a214ba7e39becfb794
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8243.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue8243 extends unit.Test {
+	var involveRecursiveAbstractTyping:Null<Rec> = null;
+
+	function test() {
+		t(involveRecursiveAbstractTyping == null);
+	}
+}
+
+private abstract Rec(Array<Rec>) from Array<Rec> {}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8248.hx b/tests/unit/src/unit/issues/Issue8248.hx
new file mode 100644
index 0000000000000000000000000000000000000000..467dea80ad9baac1b60e58a9190225eb8133b784
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8248.hx
@@ -0,0 +1,39 @@
+package unit.issues;
+
+#if (flash && !as3)
+private class NoProtected {}
+
+private class Base extends NoProtected {
+	public var x:Int;
+
+	public function new() {
+		x = f();
+	}
+
+	@:protected function f() return 1;
+}
+
+private class Child extends Base {
+}
+
+private class GrandChild extends Child {
+	override function f() return 2;
+}
+
+private class ExternChild extends Lib {}
+private class ExternGrandChild extends ExternChild {
+	@:protected // TODO: should we generate `protected` automatically here?
+	override function f() return "bye";
+
+	public function getF() return f();
+}
+#end
+
+class Issue8248 extends unit.Test {
+	#if (flash && !as3)
+	function test() {
+		eq(new GrandChild().x, 2);
+		eq(new ExternGrandChild().getF(), "bye");
+	}
+	#end
+}
diff --git a/tests/unit/src/unit/issues/Issue8257.hx b/tests/unit/src/unit/issues/Issue8257.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3fff977030232837ba9b019999a667f1561bbb31
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8257.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+import utest.Assert;
+private abstract Dyn(Dynamic) from Dynamic {
+	@:to function toDynamic():Dynamic return this;
+}
+
+class Issue8257 extends unit.Test {
+	function test() {
+		var value:Dyn = "s";
+		(try value catch (pokemon:Dynamic) null : String);
+		Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8261.hx b/tests/unit/src/unit/issues/Issue8261.hx
new file mode 100644
index 0000000000000000000000000000000000000000..84e4006d2d7bb02263402e133c0d54002042b12e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8261.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+class Issue8261 extends unit.Test {
+	function test() {
+		#if !macro
+		var ct = getComplexType();
+		var name = switch (ct) {
+			case TPath(path): path.sub;
+			case _: null;
+		}
+		eq("Int", name);
+		#end
+	}
+
+    macro static function getComplexType() {
+        var ct = haxe.macro.Context.toComplexType(haxe.macro.Context.getType("Int"));
+        return macro $v{ct};
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8286.hx b/tests/unit/src/unit/issues/Issue8286.hx
new file mode 100644
index 0000000000000000000000000000000000000000..ec847b39995d06af9ac8d1cb5960c19e3ab3889a
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8286.hx
@@ -0,0 +1,7 @@
+package unit.issues;
+
+class Issue8286 extends unit.Test {
+	function test() {
+		eq(null, Type.getClass({a: 1}));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8296.hx b/tests/unit/src/unit/issues/Issue8296.hx
new file mode 100644
index 0000000000000000000000000000000000000000..35bb84c1b8b1c62ec2b8833a907564af7b4172b9
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8296.hx
@@ -0,0 +1,20 @@
+package unit.issues;
+
+import haxe.ds.Option;
+
+class Issue8296 extends unit.Test {
+	function test() {
+		var a = option();
+		var b = option();
+		var s = switch [a, b] {
+			case [Some(parse(_) => Some(_)), _] | [_, Some(_)]:
+				'foo';
+			case _:
+				'bar';
+		}
+		eq("foo", s);
+	}
+
+	static function option() return Some('1');
+	static function parse(v:String):Option<Int> return Some(1);
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8299.hx b/tests/unit/src/unit/issues/Issue8299.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b6ec1f11877b3b57b3034ec8cf580c81673200f0
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8299.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue8299 extends unit.Test {
+	function test() {
+		eq(-1, foo(1, 2));
+	}
+
+	static function foo<T:Int>(a:T, b:T):Int {
+		return a - b;
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue8337.hx b/tests/unit/src/unit/issues/Issue8337.hx
new file mode 100644
index 0000000000000000000000000000000000000000..a8863ab3b106aaaf7f739907488162b9c2fa78dd
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8337.hx
@@ -0,0 +1,17 @@
+package unit.issues;
+
+class Issue8337 extends unit.Test {
+	function test() {
+		var n:NullProperty = 0;
+		if (n.foo == null) {}
+		noAssert();
+	}
+}
+
+abstract NullProperty(Int) from Int {
+	public var foo(get, never):Null<Int>;
+
+	function get_foo():Null<Int> {
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8341.hx b/tests/unit/src/unit/issues/Issue8341.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3063c4e70baa1671214c1de75dd620248ac6f0be
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8341.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+class Issue8341 extends unit.Test {
+	static var list(default, never):CustomArray = [];
+
+	function test() {
+		list += 10;
+		aeq([10], list);
+	}
+}
+
+abstract CustomArray(Array<Int>) from Array<Int> to Array<Int> {
+	@:op(A+=B) inline function add(value:Int) this.push(value);
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8343.hx b/tests/unit/src/unit/issues/Issue8343.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bf025233b97b9be00575d6e5a81ccf752db69d52
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8343.hx
@@ -0,0 +1,40 @@
+package unit.issues;
+
+using unit.issues.Issue8343.DummyClassTools;
+using unit.issues.Issue8343.DummyAbstractTools;
+
+class Issue8343 extends unit.Test {
+	function test() {
+		for(i in (null:DummyClass)) {
+			eq(i, 1);
+		}
+
+		for(i in ("hello":DummyAbstract)) {
+			eq(i, 1);
+		}
+	}
+}
+
+class DummyClassTools {
+	static public function iterator(m:DummyClass):Iterator<Int> {
+		return [1].iterator();
+	}
+}
+
+class DummyAbstractTools {
+	static public function iterator(m:DummyAbstract):Iterator<Int> {
+		return [1].iterator();
+	}
+}
+
+private class DummyClass implements ArrayAccess<String> {
+	public var length:Int;
+}
+
+private abstract DummyAbstract(String) from String {
+	public var length(get,never):Int;
+	function get_length() return this.length;
+
+	@:arrayAccess function get(i:Int) return this.charAt(i);
+}
+
diff --git a/tests/unit/src/unit/issues/Issue8376.hx b/tests/unit/src/unit/issues/Issue8376.hx
new file mode 100644
index 0000000000000000000000000000000000000000..13c9e43e1d7e73928e96a8c0b6f6dd05917ce5de
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8376.hx
@@ -0,0 +1,17 @@
+package unit.issues;
+
+class Issue8376 extends unit.Test {
+	function test() {
+		eq(5, ("hello":Foo).foo(5));
+	}
+}
+
+private abstract Foo(String) from String {
+	public function foo(i:Int) {
+		return (function() {
+			return (function() return baz(i))();
+		})();
+	}
+
+	function baz(i:Int) return i;
+}
diff --git a/tests/unit/src/unit/issues/Issue8425.hx b/tests/unit/src/unit/issues/Issue8425.hx
new file mode 100644
index 0000000000000000000000000000000000000000..52b7c5cde0e2634b2cca0a02b58e0f5a321e71b5
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8425.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+import utest.Assert;
+
+private abstract A(Dynamic) from Dynamic {}
+private abstract B(String) {}
+
+
+class Issue8425 extends unit.Test {
+	function test() {
+		var a:A = (null : B);
+		Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8435.hx b/tests/unit/src/unit/issues/Issue8435.hx
new file mode 100644
index 0000000000000000000000000000000000000000..432dbdf1061ceb91b589f33050813761e4ef5be0
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8435.hx
@@ -0,0 +1,8 @@
+package unit.issues;
+
+class Issue8435 extends unit.Test {
+	function test() {
+		var data: Dynamic<Void->String> = {test: () -> "test"};
+		eq("test", data.test());
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8489.hx b/tests/unit/src/unit/issues/Issue8489.hx
new file mode 100644
index 0000000000000000000000000000000000000000..18cb3d42d75622ca53cbddb5ec32ed0ab9bc7907
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8489.hx
@@ -0,0 +1,15 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue8489 extends unit.Test {
+	function test() {
+		Assert.pass();
+	}
+
+	inline static function fun() {
+		call(fun);
+	}
+
+	static function call(f:()->Void) f();
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8493.hx b/tests/unit/src/unit/issues/Issue8493.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d8e0dad7f63bd492961f40c7dc64efda820b17fa
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8493.hx
@@ -0,0 +1,22 @@
+package unit.issues;
+
+#if flash
+import flash.Vector;
+#end
+
+class Issue8493 extends unit.Test {
+	#if flash
+	static var v = new Vector<Vector<Array<Int>>>();
+	static var typeRef = (Vector.typeReference() : Class<Vector<Vector<Array<Int>>>>);
+
+	function test() {
+		t(Std.is(v, (Vector.typeReference() : Class<Vector<Vector<Array<Int>>>>)));
+		t(Std.downcast(v, (Vector.typeReference() : Class<Vector<Vector<Array<Int>>>>)) == v);
+		t(flash.Lib.as(v, (Vector.typeReference() : Class<Vector<Vector<Array<Int>>>>)) == v);
+
+		t(Std.is(v, typeRef));
+		t(Std.downcast(v, typeRef) == v);
+		t(flash.Lib.as(v, typeRef) == v);
+	}
+	#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8502.hx b/tests/unit/src/unit/issues/Issue8502.hx
new file mode 100644
index 0000000000000000000000000000000000000000..495cde258dbca2a4c5b5fc3ac35fb7011b8b1f21
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8502.hx
@@ -0,0 +1,54 @@
+package unit.issues;
+
+class Issue8502 extends Test {
+#if cpp
+  public function test() {
+		var t:scripthost.Issue8502 = Type.createInstance(Type.resolveClass('unit.issues.Issue8502_2'), []);
+    eq(t.doTest1(25), 'cppia 25');
+    eq(t.doTest2(25), 'cppia 25');
+    eq(t.doTest3(25), 'cppia 25');
+    eq(t.doTest4(25), 'cppia 25');
+    eq(t.doTest5(25), 'cppia 25');
+    eq(t.doTest3u(25), 'cppia 25');
+    eq(t.doTest4u(25), 'cppia 25');
+    eq(t.doTest5u(25), 'cppia 25');
+  }
+#end
+}
+
+#if cpp
+class Issue8502_2 extends scripthost.Issue8502 {
+	override public function doTest1(f:cpp.Float32):String {
+		return 'cppia ' + super.doTest1(f);
+	}
+
+	override public function doTest2(f:cpp.Float64):String {
+		return 'cppia ' + super.doTest2(f);
+	}
+
+	override public function doTest3(f:cpp.Int8):String {
+		return 'cppia ' + super.doTest3(f);
+	}
+
+	override public function doTest4(f:cpp.Int16):String {
+		return 'cppia ' + super.doTest4(f);
+	}
+
+	override public function doTest5(f:cpp.Int32):String {
+		return 'cppia ' + super.doTest5(f);
+	}
+
+	override public function doTest3u(f:cpp.UInt8):String {
+		return 'cppia ' + super.doTest3u(f);
+	}
+
+	override public function doTest4u(f:cpp.UInt16):String {
+		return 'cppia ' + super.doTest4u(f);
+	}
+
+	override public function doTest5u(f:cpp.UInt32):String {
+		return 'cppia ' + super.doTest5u(f);
+	}
+}
+
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8506.hx b/tests/unit/src/unit/issues/Issue8506.hx
new file mode 100644
index 0000000000000000000000000000000000000000..26454a2a55f075da0148b9a9bc21784f410b1f59
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8506.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue8506 extends unit.Test {
+	static var s = "hi";
+	function test() {
+		switch s {}
+		Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8513.hx b/tests/unit/src/unit/issues/Issue8513.hx
new file mode 100644
index 0000000000000000000000000000000000000000..23e9481f2adc5a74f3b2679688cb93488bcecbae
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8513.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+import utest.Assert;
+
+class Issue8513 extends unit.Test {
+	function test() {
+		var s = '';
+		s = s + 1;
+		s += 1;
+		eq('11', s);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8528.hx b/tests/unit/src/unit/issues/Issue8528.hx
new file mode 100644
index 0000000000000000000000000000000000000000..51d82949d9f6816991449a3a7c177d293df3b5c2
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8528.hx
@@ -0,0 +1,30 @@
+package unit.issues;
+
+private interface I {
+	public function foo():I;
+	public function bar(a:A):Void;
+}
+
+private class A implements I {
+	public function new() {
+	}
+
+	public function foo():A {
+		return this;
+	}
+
+	public function bar(a:I):Void {
+
+	}
+}
+
+class Issue8528 extends unit.Test {
+	function test() {
+		var a:A = new A();
+
+		var i:I = a;
+		eq(i, i.foo());
+
+		i.bar(a);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8537.hx b/tests/unit/src/unit/issues/Issue8537.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8682f3cff6add55169013ff0a9cf45617f13aaf7
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8537.hx
@@ -0,0 +1,27 @@
+package unit.issues;
+
+private typedef A = {
+	function bar():String;
+}
+
+private class C {
+	public function new() { }
+
+	public function bar() {
+		return "bar";
+	}
+}
+
+class Issue8537 extends unit.Test {
+	function test() {
+		eq("bar", extract(new C()));
+	}
+
+	static function extract(a:A) {
+		return invoke(a.bar);
+	}
+
+	static function invoke(f:() -> String) {
+		return f();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8538.hx b/tests/unit/src/unit/issues/Issue8538.hx
new file mode 100644
index 0000000000000000000000000000000000000000..559f8c6abfe46788fddd1ccf958a4073d4f87fbe
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8538.hx
@@ -0,0 +1,9 @@
+package unit.issues;
+
+class Issue8538 extends unit.Test {
+	function test() {
+		var a:Null<Float> = 0;
+		t(a == 0);
+		t(0 == a);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8549.hx b/tests/unit/src/unit/issues/Issue8549.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8ea32c0d27f26668ef14e88475d9de9b77365de2
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8549.hx
@@ -0,0 +1,17 @@
+package unit.issues;
+
+class Issue8549 extends unit.Test {
+	#if flash
+	function test() {
+		// can be used as a Vector type param, for type checking :-/
+		var v = new flash.Vector<String>();
+		t(Std.is(v, (flash.Vector.typeReference() : Class<flash.Vector<flash.AnyType>>)));
+
+		// also assignable from/to stuff, similar to Any, just in case...
+		var v:flash.AnyType = 10;
+		eq(10, v);
+		var i:Int = v;
+		eq(10, i);
+	}
+	#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8560.hx b/tests/unit/src/unit/issues/Issue8560.hx
new file mode 100644
index 0000000000000000000000000000000000000000..03f27b58b56b03af75f1771a315c8dd9d95f64dc
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8560.hx
@@ -0,0 +1,15 @@
+package unit.issues;
+
+class Issue8560 extends unit.Test {
+	function test() {
+		var ctx	= {
+			name : "Foo",
+			isMale : false,
+			len : 5
+		}
+		//Spaces are important in this string. Do not remove.
+		var s = '::if  (  (  name  ==  "Foo"  )  &&  (  isMale  )  )  ::Ok::elseif isMale ::Maybe::else::No::end::';
+		var t = new haxe.Template(s);
+		eq('No', t.execute(ctx));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8700.hx b/tests/unit/src/unit/issues/Issue8700.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6595f2c0e460f600bd3f5f492cee535dc9f3df38
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8700.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+private enum abstract JsonTypeKind<T>(String) {
+	var TMono;
+}
+
+class Issue8700 extends unit.Test {
+	function test() {
+		eq("unit.issues._Issue8700.JsonTypeKind<Unknown<0>>", HelperMacros.typeString(TMono));
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8702.hx b/tests/unit/src/unit/issues/Issue8702.hx
new file mode 100644
index 0000000000000000000000000000000000000000..d3cc288b7adf0b5152e71f224bacf4dab047a1fe
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8702.hx
@@ -0,0 +1,17 @@
+package unit.issues;
+
+class Issue8702 extends unit.Test {
+	public function test() {
+		var foo = new Foo<String>();
+		var bar = new Bar<String>();
+		noAssert();
+	}
+}
+
+private class Foo<T> {
+	inline public function new (someBool = true) {}
+}
+
+private class Bar<T> {
+	inline public function new (?someBool:Bool) {}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8710.hx b/tests/unit/src/unit/issues/Issue8710.hx
new file mode 100644
index 0000000000000000000000000000000000000000..942b5a0147a15154cc8816d64d1184c24077a3d8
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8710.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+class Issue8710 extends unit.Test {
+#if (js || lua)
+	@:expose('exposed')
+	static var field = 10 + Std.random(1);
+
+	function test() {
+		var actual =
+			#if js
+				js.Syntax.code("$hx_exports[\"exposed\"]");
+			#elseif lua
+				untyped __lua__("_hx_exports[\"exposed\"]");
+			#end
+		eq(10, actual);
+	}
+#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8716.hx b/tests/unit/src/unit/issues/Issue8716.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6ca723947d09e8adef17eb091ae21476ee934daa
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8716.hx
@@ -0,0 +1,14 @@
+package unit.issues;
+
+private enum abstract JsonTypeKind<T>(String) {
+	var TMono;
+}
+
+class Issue8716 extends unit.Test {
+#if !static
+	function test() {
+		var u:UInt = null;
+		eq('null', '$u');
+	}
+#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8740.hx b/tests/unit/src/unit/issues/Issue8740.hx
new file mode 100644
index 0000000000000000000000000000000000000000..74963536f8dcb0fd0c420e41ecbf78c6ceaa8ce1
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8740.hx
@@ -0,0 +1,19 @@
+package unit.issues;
+
+class Issue8740 extends unit.Test {
+	function test() {
+		eq(42.0, ("":DateTime));
+	}
+}
+
+private abstract DateTime(Float) from Float to Float {
+	@:from
+	static public inline function fromString(str:String):DateTime {
+		var day:Null<Int> = 22;
+		return make(day);
+	}
+
+	static public inline function make(day:Int = 1):DateTime {
+		return (day - 1) * 2;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8764.hx b/tests/unit/src/unit/issues/Issue8764.hx
new file mode 100644
index 0000000000000000000000000000000000000000..893f3096e88a8ae01d27b708791444f3bfea1e4e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8764.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue8764 extends unit.Test {
+#if static
+	function test() {
+		eq(0.0, foo());
+	}
+
+	static function foo(?e:Int):Null<Float> {
+		return (e:Int);
+	}
+#end
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8779.hx b/tests/unit/src/unit/issues/Issue8779.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b7eb8956884f9c5459f32ebb04e9bfe7217be15f
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8779.hx
@@ -0,0 +1,25 @@
+package unit.issues;
+
+import utest.Assert;
+
+@:forward
+private abstract Suite(SuiteObject) from SuiteObject to SuiteObject {
+	@:from
+	public static macro function ofAny(expr:haxe.macro.Expr) {
+		return expr;
+	}
+}
+
+
+private interface SuiteObject {}
+
+private class BasicSuite implements SuiteObject {
+	public function new() {}
+}
+
+class Issue8779 extends unit.Test {
+	function test() {
+		var suite:Suite = new BasicSuite();
+		Assert.pass();
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8781.hx b/tests/unit/src/unit/issues/Issue8781.hx
new file mode 100644
index 0000000000000000000000000000000000000000..8af5e001c63a83fe656694c5b6363ca43b6cbf0f
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8781.hx
@@ -0,0 +1,39 @@
+package unit.issues;
+
+private class ComplexEnum
+{
+
+	public static final FIRST:ComplexEnum = new ComplexEnum("first", 0);
+	public static final SECOND:ComplexEnum = new ComplexEnum( "second", 1);
+	public static final THIRD:ComplexEnum = new ComplexEnum( "third", 2);
+
+	var name(null, default):String;
+	var value(null, default):Int;
+
+	public function new (name:String, value:Int )
+	{
+		this.name = name;
+		this.value = value;
+	}
+
+	public function getPrefix():String
+	{
+		switch (this)
+		{
+			case FIRST:
+				return "first_";
+			case SECOND:
+				return "second_";
+			case THIRD:
+				return "third_";
+			default: throw "Unknown";
+		}
+	}
+
+}
+
+class Issue8781 extends unit.Test {
+	function test() {
+		eq("value: second_", "value: "+ComplexEnum.SECOND.getPrefix());
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8791.hx b/tests/unit/src/unit/issues/Issue8791.hx
new file mode 100644
index 0000000000000000000000000000000000000000..0530664e54d84d147e43d4916f92757116d84432
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8791.hx
@@ -0,0 +1,12 @@
+package unit.issues;
+
+class Issue8791 extends unit.Test {
+	function test() {
+		var a = write(true);
+		eq('', a);
+	}
+
+	static inline function write(binary = true) {
+		return '';
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8845.hx b/tests/unit/src/unit/issues/Issue8845.hx
new file mode 100644
index 0000000000000000000000000000000000000000..da730af0707e02def3ae725b1b64b9095da3c0ee
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8845.hx
@@ -0,0 +1,18 @@
+package unit.issues;
+
+class Issue8845 extends unit.Test {
+	static var a:Int;
+	static var b:Int;
+
+	// This is actually unspecified: https://haxe.org/manual/expression-operators-binops.html
+	// but happens to work on all targets
+	function test() {
+		a = 255;
+		b = -8;
+		eq(7, a % b);
+
+		a = -100;
+		b = -9;
+		eq(-1, a % b);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8859.hx b/tests/unit/src/unit/issues/Issue8859.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1434eca2d76c520b933711d33ad150b5ab4a81e1
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8859.hx
@@ -0,0 +1,16 @@
+package unit.issues;
+
+class Issue8859 extends Test {
+	function test() {
+		var td = macro class X {
+			final x: Int = 0;
+			var y: Int = 0;
+			private final z: Int = 0;
+			private var w: Int = 0;
+		}
+		var printer = new haxe.macro.Printer();
+		var s = printer.printTypeDefinition(td);
+		s = ~/[\t\n\r]/g.replace(s, "");
+		eq("class X {final x : Int = 0;var y : Int = 0;private final z : Int = 0;private var w : Int = 0;}", s);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8861.hx b/tests/unit/src/unit/issues/Issue8861.hx
new file mode 100644
index 0000000000000000000000000000000000000000..16cd56c9356d5af036c68737ed6b692e11270aa9
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8861.hx
@@ -0,0 +1,11 @@
+package unit.issues;
+
+class Issue8861 extends Test {
+	function test() {
+		var str = ~/[äöü]/gu.map('väter, söhne, mütter', rgx -> switch rgx.matched(0) {
+			case 'ä' : 'ae'; case 'ö' : 'oe';
+			case 'ü' : 'ue'; case _ : '';
+		});
+		eq('vaeter, soehne, muetter', str);
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/Issue8869.hx b/tests/unit/src/unit/issues/Issue8869.hx
new file mode 100644
index 0000000000000000000000000000000000000000..011df27d750659434661750c4f4750af0cec059e
--- /dev/null
+++ b/tests/unit/src/unit/issues/Issue8869.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue8869 extends Test {
+	function test() {
+		noAssert();
+	}
+
+	function checkIntersectionConstraintInParentheses<T:(haxe.Constraints.Constructible<Void->Void> & Dummy)>(cl:Class<T>) {}
+}
+
+private class Dummy {
+	public function new() {}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/misc/ISSUE7716.hx b/tests/unit/src/unit/issues/misc/ISSUE7716.hx
new file mode 100644
index 0000000000000000000000000000000000000000..781fa9b98d7ebe7c8512bc2a69183c9180b8e8c9
--- /dev/null
+++ b/tests/unit/src/unit/issues/misc/ISSUE7716.hx
@@ -0,0 +1,10 @@
+package unit.issues.misc;
+
+/**
+ * Do not rename. Uppercase is intended.
+ */
+class ISSUE7716 extends unit.Test {
+	static public function value():Int {
+		return unit.issues.Issue7716.value;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/misc/Issue4306Macro.hx b/tests/unit/src/unit/issues/misc/Issue4306Macro.hx
index b23acac5ad309bc1857f0830ea7b53a6980e478f..41732666015cd29709194da53a85c30f72fb8857 100644
--- a/tests/unit/src/unit/issues/misc/Issue4306Macro.hx
+++ b/tests/unit/src/unit/issues/misc/Issue4306Macro.hx
@@ -7,21 +7,33 @@ import haxe.macro.Type;
 using haxe.macro.Tools;
 
 abstract TypeName(String) to String {
+	public inline function new(s:String) {
+		this = s;
+	}
+
 	@:from static macro function fromE(e:Expr) {
-		return macro $v{Context.typeof(e).toString()};
+		return macro new TypeName($v{Context.typeof(e).toString()});
 	}
 }
 
 abstract Arity(Int) to Int {
+	public inline function new(i:Int) {
+		this = i;
+	}
+
 	@:from static macro function fromE(e:Expr) {
 		return switch (Context.typeof(e).follow()) {
-			case TFun(tl, _): macro $v{tl.length};
+			case TFun(tl, _): macro new Arity($v{tl.length});
 			case _: Context.error("Expected function type", e.pos);
 		}
 	}
 }
 
 abstract EnumListener<T>(String) to String {
+	public inline function new(s:String) {
+		this = s;
+	}
+
 	@:from static macro function fromE(e:Expr) {
 		var e = Context.typeExpr(e);
 		var ef = switch (e.expr) {
@@ -39,6 +51,6 @@ abstract EnumListener<T>(String) to String {
 			case _: Context.error("Something went wrong, again", e.pos);
 		}
 		Context.unify(t, t2);
-		return macro $v{ef.name};
+		return macro new EnumListener($v{ef.name});
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/misc/Issue5009Assert.hx b/tests/unit/src/unit/issues/misc/Issue5009Assert.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3969ef7be4302247cc6adcf29641b899ce7d7be6
--- /dev/null
+++ b/tests/unit/src/unit/issues/misc/Issue5009Assert.hx
@@ -0,0 +1,7 @@
+package unit.issues.misc;
+
+@:callable
+abstract Issue5009Assert(Bool->Void) {
+    public static var ASSert = new Issue5009Assert();
+    function new() this = function(b) if (!b) throw "assert";
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/misc/Issue5255Class.hx b/tests/unit/src/unit/issues/misc/Issue5255Class.hx
new file mode 100644
index 0000000000000000000000000000000000000000..3cea31985d9b2814eb6a5a8bb998e229997134f6
--- /dev/null
+++ b/tests/unit/src/unit/issues/misc/Issue5255Class.hx
@@ -0,0 +1,9 @@
+package unit.issues.misc;
+
+typedef Issue5255Class<T> = Issue5255Class_<T>;
+
+class Issue5255Class_<T> {
+	@:generic public static function test<T>(arg:T){
+		return arg;
+	}
+}
diff --git a/tests/unit/src/unit/issues/misc/Issue6873Macro.hx b/tests/unit/src/unit/issues/misc/Issue6873Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..4ff8221becc7965c25b1027f6f6f1d5880701b2d
--- /dev/null
+++ b/tests/unit/src/unit/issues/misc/Issue6873Macro.hx
@@ -0,0 +1,26 @@
+package unit.issues.misc;
+
+import haxe.macro.Context;
+import haxe.macro.Expr;
+import haxe.macro.ComplexTypeTools;
+import haxe.macro.TypeTools;
+
+class Issue6873Macro {
+    macro public static function build():Array<Field> {
+        var fields = Context.getBuildFields();
+
+        var m = ComplexTypeTools.toType(macro : Map<String, Int>);
+        var last = "";
+		var s = "";
+        do {
+            s += m;
+            last = Std.string(m);
+            m = TypeTools.followWithAbstracts(m, false);
+        } while (last != Std.string(m));
+
+		fields.push((macro class X {
+			static public var result = $v{s};
+		}).fields[0]);
+        return fields;
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/issues/misc/Issue7466Macro.hx b/tests/unit/src/unit/issues/misc/Issue7466Macro.hx
new file mode 100644
index 0000000000000000000000000000000000000000..e3183f3052e87283aaa5d68f5e5ce582a1c213cb
--- /dev/null
+++ b/tests/unit/src/unit/issues/misc/Issue7466Macro.hx
@@ -0,0 +1,20 @@
+package unit.issues.misc;
+
+import haxe.macro.Expr;
+import haxe.macro.Context as C;
+
+class Issue7466Macro {
+  macro public static function canType (e:Expr) {
+    return try {
+    	C.typeof(e);
+    	macro true;
+    }
+    catch (e:Dynamic) {
+      macro false;
+    }
+  }
+
+  macro public static function getCheckType () {
+    return macro ({ name : "foo" } : { var name : Int; });
+  }
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/TestSpecification.hx b/tests/unit/src/unit/spec/TestSpecification.hx
similarity index 77%
rename from tests/unit/src/unit/TestSpecification.hx
rename to tests/unit/src/unit/spec/TestSpecification.hx
index d78d9c411ec77fda5f49934a9a86c2c3c56a71aa..31bab9e468ec782c76eb1f826189edd4b8bba41f 100644
--- a/tests/unit/src/unit/TestSpecification.hx
+++ b/tests/unit/src/unit/spec/TestSpecification.hx
@@ -1,6 +1,4 @@
-package unit;
-
-import haxe.macro.Expr;
+package unit.spec;
 
 typedef T = {
 	function func():Void;
@@ -47,28 +45,26 @@ typedef T = {
 
 class CChild extends C { }
 
-class CDyn extends C implements Dynamic { }
-
-private class EmptyClass {
+class EmptyClass {
 	public function new() { }
 }
 
-@:keep private class ReallyEmptyClass { }
+@:keep class ReallyEmptyClass { }
 
-private class ClassWithToString {
+class ClassWithToString {
 	public function new() { }
 	public function toString() return "ClassWithToString.toString()";
 }
 
-private class ClassWithToStringChild extends ClassWithToString {
+class ClassWithToStringChild extends ClassWithToString {
 
 }
 
-private class ClassWithToStringChild2 extends ClassWithToString {
+class ClassWithToStringChild2 extends ClassWithToString {
 	public override function toString() return "ClassWithToStringChild2.toString()";
 }
 
-@:keep private class ClassWithCtorDefaultValues {
+@:keep class ClassWithCtorDefaultValues {
 	public var a : Null<Int>;
 	public var b : String;
 	public function new(a = 1, b = "foo") {
@@ -77,16 +73,25 @@ private class ClassWithToStringChild2 extends ClassWithToString {
 	}
 }
 
-private class ClassWithCtorDefaultValuesChild extends ClassWithCtorDefaultValues {
+class ClassWithCtorDefaultValuesChild extends ClassWithCtorDefaultValues {
+
+}
 
+@:keep class ClassWithCtorDefaultValues2 {
+	public var a : Null<Float>;
+	public var b : String;
+	public function new(a = 1.1, b = "foo") {
+		this.a = a;
+		this.b = b;
+	}
 }
 
-private enum SomeEnum<T> {
+enum SomeEnum<T> {
 	NoArguments;
 	OneArgument(t:T);
 }
 
-private class IntWrap {
+class IntWrap {
 	public var i(default, null):Int;
 
 	public function new(i:Int) {
@@ -100,7 +105,7 @@ private class IntWrap {
 	}
 }
 
-private enum E {
+enum E {
 	NoArgs;
 	OneArg(i:Int);
 	RecArg(e:E);
@@ -146,11 +151,4 @@ class RttiClass3 extends RttiClass1 {
 	override function f():Int {
 		return 33;
 	}
-}
-
-#if !macro
-@:build(unit.UnitBuilder.build("src/unitstd"))
-#end
-class TestSpecification extends Test {
-
-}
+}
\ No newline at end of file
diff --git a/tests/unit/src/unit/spec/import.hx b/tests/unit/src/unit/spec/import.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c73c4562712ed2a0c54549a7c23ff4218e0f62eb
--- /dev/null
+++ b/tests/unit/src/unit/spec/import.hx
@@ -0,0 +1 @@
+import haxe.macro.Expr;
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/Array.unit.hx b/tests/unit/src/unitstd/Array.unit.hx
index 91add125c16e5e25e35f54d74c3090d1def4994b..81d45a5e15dee74f3b3ac9a0a418936acad9bdde 100644
--- a/tests/unit/src/unitstd/Array.unit.hx
+++ b/tests/unit/src/unitstd/Array.unit.hx
@@ -4,6 +4,8 @@
 var a = [];
 a[4] = 1;
 a.length == 5;
+a[a.length] = 1;
+a.length == 6;
 
 // concat
 [].concat([]) == [];
@@ -263,8 +265,8 @@ var func = function(s) return s.toUpperCase();
 [1, 2, 3, 4].filter(function(i) return i < 3) == [1, 2];
 [1, 2, 3, 4].filter(function(i) return true) == [1, 2, 3, 4];
 [1, 2, 3, 4].filter(function(i) return false) == [];
-[].filter(function(i) return true) == [];
-[].filter(function(i) return false) == [];
+[].filter(function(_) return true) == [];
+[].filter(function(_) return false) == [];
 var arr = [{id: 1}, {id: 2}, {id: 3}, {id: 4}, {id: 5}];
 arr = arr.filter(function(i) return i.id % 2 != 0);
 var values = [];
@@ -278,4 +280,21 @@ var b : Dynamic = a.filter(function(x) return x & 1 == 0).map(function(x) return
 b.length == 2;
 b[0] == 0;
 b[1] == 20;
-#end
\ No newline at end of file
+#end
+
+// resize
+var a : Array<Int> = [1,2,3];
+a.resize(10);
+a.length == 10;
+a == [1,2,3];
+a.resize(2);
+a.length == 2;
+a == [1, 2];
+a.resize(3);
+a.length == 3;
+a[0] == 1;
+a[1] == 2;
+a[2] != 3;
+a.resize(0);
+a.length == 0;
+a == [];
diff --git a/tests/unit/src/unitstd/Date.unit.hx b/tests/unit/src/unitstd/Date.unit.hx
index 2bd98bd480043b19df25f6e88bdfc37fd088c031..8ba3a2787917fc949a0f9dec87ac0ea428796ad3 100644
--- a/tests/unit/src/unitstd/Date.unit.hx
+++ b/tests/unit/src/unitstd/Date.unit.hx
@@ -7,7 +7,6 @@ date.getFullYear() == 1982;
 date.getMonth() == 10;
 date.getDate() == 10;
 date.getDay() == 3;
-//date.getTime() == 405781340000.;
 date.toString() == "1982-11-10 14:02:20";
 
 var date = Date.fromTime(date.getTime());
@@ -18,8 +17,173 @@ date.getFullYear() == 1982;
 date.getMonth() == 10;
 date.getDate() == 10;
 date.getDay() == 3;
-//date.getTime() == 405781340000.;
 date.toString() == "1982-11-10 14:02:20";
 
 var date = Date.fromTime(405781340000);
 date.getTime() == 405781340000;
+date.getUTCHours() == 13;
+date.getUTCMinutes() == 2;
+date.getUTCSeconds() == 20;
+date.getUTCFullYear() == 1982;
+date.getUTCMonth() == 10;
+date.getUTCDate() == 10;
+date.getUTCDay() == 3;
+
+// timezone issues
+var date1 = Date.fromTime(1455555555 * 1000.); // 15 Feb 2016 16:59:15 GMT
+var date2 = new Date(2016, 1, 15, 16, 59, 15);
+#if azure
+date1.getTime() == date2.getTime(); // depends on Azure timezone setting!
+#end
+
+var referenceDate = new Date(1970, 0, 12, 2, 0, 0);
+referenceDate.toString() == "1970-01-12 02:00:00";
+#if azure
+referenceDate.getTime() == 957600000.; // depends on Azure timezone setting!
+#end
+
+var date = new Date(1970, 0, 12, 1, 59, 59);
+date.getTime() < referenceDate.getTime();
+
+// < 1970 (negative timestamp)
+// neko, cpp, and python only fail on Windows
+// disabled - see #8600
+#if false // !(hl || eval || neko || cpp || python)
+var date = new Date(1904, 11, 12, 1, 4, 1);
+date.getHours() == 1;
+date.getMinutes() == 4;
+date.getSeconds() == 1;
+date.getFullYear() == 1904;
+date.getMonth() == 11;
+date.getDate() == 12;
+date.getDay() == 1;
+date.getTime() < referenceDate.getTime();
+#end
+
+// < 1902 (negative timestamp, outside of signed 32-bit integer range)
+// lua only fails on Mac
+// python only fails on Windows
+// disabled - see #8600
+#if false // !(hl || neko || eval || cpp || lua || python)
+var date = new Date(1888, 0, 1, 15, 4, 2);
+date.getHours() == 15;
+date.getMinutes() == 4;
+date.getSeconds() == 2;
+date.getFullYear() == 1888;
+date.getMonth() == 0;
+date.getDate() == 1;
+date.getDay() == 0;
+date.getTime() < referenceDate.getTime();
+#end
+
+
+// Y2038 (outside of signed 32-bit integer range)
+// disabled - see #8600
+#if false // !neko
+var date = new Date(2039, 0, 1, 1, 59, 59);
+date.getHours() == 1;
+date.getMinutes() == 59;
+date.getSeconds() == 59;
+date.getFullYear() == 2039;
+date.getMonth() == 0;
+date.getDate() == 1;
+date.getDay() == 6;
+date.getTime() > referenceDate.getTime();
+#end
+
+// Y2112 (outside of unsigned 32-bit integer range)
+// disabled - see #8600
+#if false // !(hl || neko)
+var date = new Date(2112, 0, 1, 1, 59, 59);
+date.getHours() == 1;
+date.getMinutes() == 59;
+date.getSeconds() == 59;
+date.getFullYear() == 2112;
+date.getMonth() == 0;
+date.getDate() == 1;
+date.getDay() == 5;
+date.getTime() > referenceDate.getTime();
+#end
+
+/*
+// fromTime outside the 1970...2038 range (not supported)
+var date = Date.fromTime(-2052910800.0);
+date.getFullYear() == 1904;
+date.getMonth() == 11;
+date.getDate() == 12; // could fail on very large UTC offsets
+var date = Date.fromTime(-2587294800.0);
+date.getFullYear() == 1888;
+date.getMonth() == 0;
+date.getDate() == 5; // could fail on very large UTC offsets
+var date = Date.fromTime(2177838000.0);
+date.getFullYear() == 2039;
+date.getMonth() == 0;
+date.getDate() == 5; // could fail on very large UTC offsets
+var date = Date.fromTime(4481434800.0);
+date.getFullYear() == 2039;
+date.getMonth() == 0;
+date.getDate() == 5; // could fail on very large UTC offsets
+*/
+
+// weekdays
+(new Date(2019, 6, 1, 12, 0, 0)).getDay() == 1;
+(new Date(2019, 6, 2, 12, 0, 0)).getDay() == 2;
+(new Date(2019, 6, 3, 12, 0, 0)).getDay() == 3;
+(new Date(2019, 6, 4, 12, 0, 0)).getDay() == 4;
+(new Date(2019, 6, 5, 12, 0, 0)).getDay() == 5;
+(new Date(2019, 6, 6, 12, 0, 0)).getDay() == 6;
+(new Date(2019, 6, 7, 12, 0, 0)).getDay() == 0;
+
+// fromString
+var date = Date.fromString("2019-07-08 12:22:00");
+date.getHours() == 12;
+date.getMinutes() == 22;
+date.getSeconds() == 0;
+date.getFullYear() == 2019;
+date.getMonth() == 6;
+date.getDate() == 8;
+date.getDay() == 1;
+
+var date = Date.fromString("2019-03-02");
+date.getHours() == 0;
+date.getMinutes() == 0;
+date.getSeconds() == 0;
+date.getFullYear() == 2019;
+date.getMonth() == 2;
+date.getDate() == 2;
+date.getDay() == 6;
+
+// fromString HH:MM:SS should interpret the time as UTC
+#if python
+// disabled on Windows due to https://bugs.python.org/issue37527
+if (Sys.systemName() != "Windows") {
+#end
+var date = Date.fromString("04:05:06");
+t(date.getUTCHours() == 4);
+t(date.getUTCMinutes() == 5);
+t(date.getUTCSeconds() == 6);
+t(date.getUTCFullYear() == 1970);
+t(date.getUTCMonth() == 0);
+t(date.getUTCDate() == 1);
+t(date.getUTCDay() == 4);
+t(date.getTime() == 14706000.);
+#if python
+}
+#end
+
+// timezone offset
+// see https://en.wikipedia.org/wiki/UTC_offset
+Date.fromString("2015-01-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-02-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-03-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-04-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-05-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-06-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-07-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-08-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-09-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-10-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-11-08 12:22:00").getTimezoneOffset() % 15 == 0;
+Date.fromString("2015-12-08 12:22:00").getTimezoneOffset() % 15 == 0;
+
+Date.fromString("2015-06-15 10:00:00").getTimezoneOffset() == Date.fromString("2016-06-15 10:00:00").getTimezoneOffset();
diff --git a/tests/unit/src/unitstd/EReg.unit.hx b/tests/unit/src/unitstd/EReg.unit.hx
index a685a3b8f7b7082ca9945600bed4f24e50f4b3a6..01881d54dfadd3be51832e1f0082da813a61baee 100644
--- a/tests/unit/src/unitstd/EReg.unit.hx
+++ b/tests/unit/src/unitstd/EReg.unit.hx
@@ -87,7 +87,7 @@ pos.len == 2;
 ~/a/g.replace("bab", "z") == "bzb";
 ~/a/g.replace("baba", "z") == "bzbz";
 
-#if !(hl && interp) // not allowed in local interpreter, still allowed in hl runtime 
+#if !(hl && interp) // not allowed in local interpreter, still allowed in hl runtime
 // replace + $
 ~/href="(.*?)"/.replace('lead href="foo" trail',"$1") == "lead foo trail";
 //~/href="(.*?)"/.replace('lead href="foo" trail',"$2") == "lead $2 trail";
@@ -107,3 +107,14 @@ pos.len == 2;
 ~/(Hello)/.map("Hello", function(e) return "Hallo") == "Hallo";
 ~/(World)/.map("Hello World", function(e) return "Hallo") == "Hello Hallo";
 ~/(Hola)/.map("Hello World", function(e) return throw "not called") == "Hello World";
+
+// escape
+new EReg("^" + EReg.escape("\\ ^ $ * + ? . ( ) | { } [ ]") + "$", "").match("\\ ^ $ * + ? . ( ) | { } [ ]") == true;
+
+// #6641
+~/(b)/.split("abc") == ["a","c"];
+
+// #3430
+~/(\d+)/g.replace("a1234b12","$1") == "a1234b12";
+~/(\d+)/g.replace("a1234b12","\\$1") == "a\\1234b\\12";
+~/(\d+)/g.replace("a1234b12","$$1") == "a$1b$1";
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/Https.unit.hx b/tests/unit/src/unitstd/Https.unit.hx.no
similarity index 75%
rename from tests/unit/src/unitstd/Https.unit.hx
rename to tests/unit/src/unitstd/Https.unit.hx.no
index 00b7550c64af9c19e2a4033e2922591e4a655969..94104513f21b44ea06a58091bf631d82a1d626b7 100644
--- a/tests/unit/src/unitstd/Https.unit.hx
+++ b/tests/unit/src/unitstd/Https.unit.hx.no
@@ -1,4 +1,4 @@
-#if (cpp || (neko && !macro && !interp))
+#if (cpp || hl || (neko && !macro && !interp))
 var r = haxe.Http.requestUrl("https://raw.githubusercontent.com/HaxeFoundation/haxe/development/tests/unit/res1.txt");
 r == "Héllo World !";
 #end
diff --git a/tests/unit/src/unitstd/InlineXml.unit.hx b/tests/unit/src/unitstd/InlineXml.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..05c4af274dfa71aeec03adc7e73f6bf52d3861aa
--- /dev/null
+++ b/tests/unit/src/unitstd/InlineXml.unit.hx
@@ -0,0 +1,49 @@
+unit.HelperMacros.pipeMarkupLiteral(<xml></xml>) == "<xml></xml>";
+unit.HelperMacros.pipeMarkupLiteral(<xml ></xml>) == "<xml ></xml>";
+unit.HelperMacros.pipeMarkupLiteral(<xml > </xml>) == "<xml > </xml>";
+
+// nested
+unit.HelperMacros.pipeMarkupLiteral(<xml><xml></xml></xml>) == "<xml><xml></xml></xml>";
+unit.HelperMacros.pipeMarkupLiteral(<xml><yml></xml>) == "<xml><yml></xml>";
+
+// self-closing
+unit.HelperMacros.pipeMarkupLiteral(<xml/>) == "<xml/>";
+unit.HelperMacros.pipeMarkupLiteral(<xml abc />) == "<xml abc />";
+
+// self-closing nested
+unit.HelperMacros.pipeMarkupLiteral(<xml><xml /></xml>) == "<xml><xml /></xml>";
+
+// special chars
+unit.HelperMacros.pipeMarkupLiteral(<xml-xml></xml-xml>) == "<xml-xml></xml-xml>";
+unit.HelperMacros.pipeMarkupLiteral(<:xml></:xml>) == "<:xml></:xml>";
+unit.HelperMacros.pipeMarkupLiteral(<xml:xml></xml:xml>) == "<xml:xml></xml:xml>";
+unit.HelperMacros.pipeMarkupLiteral(<foo.Bar_barf3-gnieh:blargh></foo.Bar_barf3-gnieh:blargh>) == "<foo.Bar_barf3-gnieh:blargh></foo.Bar_barf3-gnieh:blargh>";
+
+// fragments
+unit.HelperMacros.pipeMarkupLiteral(<></>) == "<></>";
+unit.HelperMacros.pipeMarkupLiteral(<>abc</>) == "<>abc</>";
+
+// No check for string literal balancing
+unit.HelperMacros.pipeMarkupLiteral(<xml a=" </xml>) == "<xml a=\" </xml>";
+unit.HelperMacros.pipeMarkupLiteral(<xml a=' </xml>) == "<xml a=' </xml>";
+
+// comments are fine
+unit.HelperMacros.pipeMarkupLiteral(<xml a=// </xml>) == "<xml a=// </xml>";
+unit.HelperMacros.pipeMarkupLiteral(<xml a=/* </xml>) == "<xml a=/* </xml>";
+
+// regex too
+unit.HelperMacros.pipeMarkupLiteral(<xml a=~/ </xml>) == "<xml a=~/ </xml>";
+
+// format
+var count = 33;
+unit.HelperMacros.pipeMarkupLiteral(<xml>$count + $count = ${count*2}</xml>) == unit.HelperMacros.pipeMarkupLiteral(<xml>33 + 33 = 66</xml>);
+unit.HelperMacros.pipeMarkupLiteral(<xml>$count + <xml>$count</xml> = ${count*2}</xml>) == unit.HelperMacros.pipeMarkupLiteral(<xml>33 + <xml>33</xml> = 66</xml>);
+
+// dollar
+unit.HelperMacros.pipeMarkupLiteralUnprocessed(<$xml></$xml>) == "<$xml></$xml>";
+
+// uppercase
+unit.HelperMacros.pipeMarkupLiteral(<Xml></Xml>) == "<Xml></Xml>";
+
+// no semicolon at block-level
+unit.HelperMacros.pipeMarkupLiteral({ <Xml></Xml><yml /> }) == "<Xml></Xml><yml />";
diff --git a/tests/unit/src/unitstd/Lambda.unit.hx b/tests/unit/src/unitstd/Lambda.unit.hx
index c07322e3dd6e476e304509d346ec0cafffabb05f..ac8fe3745f93388e9b58bd4614d7589930216be2 100644
--- a/tests/unit/src/unitstd/Lambda.unit.hx
+++ b/tests/unit/src/unitstd/Lambda.unit.hx
@@ -16,11 +16,11 @@ e2.length == 0;
 var a = [1];
 var l = Lambda.list(a);
 name(a) == "Array";
-name(l) == "List";
+name(l) == "haxe.ds.List";
 l.length == 1;
 l.first() == 1;
 var l2 = Lambda.list(l);
-name(l2) == "List";
+name(l2) == "haxe.ds.List";
 l != l2;
 var e = new List();
 var e2 = Lambda.list(e);
@@ -31,9 +31,9 @@ e2.length == 0;
 var a = [1, 2, 3];
 var b = Lambda.map(a,function(i) return i * 2);
 b.length == 3;
-b.pop() == 2;
-b.pop() == 4;
 b.pop() == 6;
+b.pop() == 4;
+b.pop() == 2;
 
 // mapi
 var a = [1, 2, 3];
@@ -45,9 +45,9 @@ function myMap(index, i) {
 var b = Lambda.mapi(a, myMap);
 total == 3;
 b.length == 3;
-b.pop() == 2;
-b.pop() == 4;
 b.pop() == 6;
+b.pop() == 4;
+b.pop() == 2;
 
 // has
 Lambda.has([1,2,3],1) == true;
@@ -81,8 +81,8 @@ Lambda.iter([],function(i) return throw "no call");
 Lambda.array(Lambda.filter([1,2,3,4],function(i) return i < 3)) == [1,2];
 Lambda.array(Lambda.filter([1,2,3,4],function(i) return true)) == [1,2,3,4];
 Lambda.array(Lambda.filter([1,2,3,4],function(i) return false)) == [];
-Lambda.array(Lambda.filter([],function(i) return false)) == [];
-Lambda.array(Lambda.filter([],function(i) return true)) == [];
+Lambda.array(Lambda.filter([],function(_) return false)) == [];
+Lambda.array(Lambda.filter([],function(_) return true)) == [];
 Lambda.array(Lambda.filter([],null)) == [];
 
 
diff --git a/tests/unit/src/unitstd/List.unit.hx b/tests/unit/src/unitstd/List.unit.hx
index 7a95e8df87a1b99b05b48f7d03df7ee7580967a4..842371256ff97b0a539106893ffbd7b0cf973d04 100644
--- a/tests/unit/src/unitstd/List.unit.hx
+++ b/tests/unit/src/unitstd/List.unit.hx
@@ -37,4 +37,15 @@ l2.pop() == "22";
 l2.pop() == "33";
 var l3 = l.filter(function(i:String) return i != "2");
 l3.pop() == "1";
-l3.pop() == "3";
\ No newline at end of file
+l3.pop() == "3";
+
+// keyValueIterator
+var l4 = new List();
+l4.add(1);
+l4.add(2);
+l4.add(3);
+l4.add(5);
+l4.add(8);
+[for (k=>v in l4) k] == [0,1,2,3,4];
+[for (k=>v in l4) v] == [1,2,3,5,8];
+[for (k=>v in l4) k*v] == [0,2,6,15,32];
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/Map.unit.hx b/tests/unit/src/unitstd/Map.unit.hx
index dde4bda57db6f4c7d5678915034d3ea49f6761ce..a9b4365821b7878d81a0c7caccfb28590a28d577 100644
--- a/tests/unit/src/unitstd/Map.unit.hx
+++ b/tests/unit/src/unitstd/Map.unit.hx
@@ -22,6 +22,20 @@ map3.exists("foo") == true;
 map3.get("foo") == 1;
 map4.exists("foo") == true;
 map4.get("foo") == 1;
+
+var copied = map.copy();
+copied != map;
+copied.exists("foo") == map.exists("foo");
+copied.exists("bar") == map.exists("bar");
+copied.exists("baz") == map.exists("baz");
+copied.get("foo") == map.get("foo");
+copied.get("bar") == map.get("bar");
+copied.get("baz") == map.get("baz");
+
+copied.set("foo", 4);
+copied.get("foo") == 4;
+map.get("foo") == 1;
+
 var values = [];
 for (val in map) {
 	values.push(val);
@@ -42,6 +56,15 @@ map.exists("bar") == false;
 map.exists("baz") == true;
 map.get("bar") == null;
 
+var map3 = [1=>"2",2=>"4",3=>"6"];
+var keys = [for (k=>v in map3) k];
+keys.sort(Reflect.compare);
+keys == [1,2,3];
+var values = [for (k=>v in map3) v];
+values.sort(Reflect.compare);
+values == ["2","4","6"];
+
+
 // Int
 var map = new Map();
 map.exists(1) == false;
@@ -56,6 +79,20 @@ map.exists(3) == true;
 map.get(1) == 1;
 map.get(2) == 2;
 map.get(3) == 3;
+
+var copied = map.copy();
+copied != map;
+copied.exists(1) == map.exists(1);
+copied.exists(2) == map.exists(2);
+copied.exists(3) == map.exists(3);
+copied.get(1) == map.get(1);
+copied.get(2) == map.get(2);
+copied.get(3) == map.get(3);
+
+copied.set(1, 4);
+copied.get(1) == 4;
+map.get(1) == 1;
+
 var values = [];
 for (val in map) {
 	values.push(val);
@@ -76,6 +113,14 @@ map.exists(2) == false;
 map.exists(3) == true;
 map.get(2) == null;
 
+var map3 = [1=>2,2=>4,3=>6];
+var keys = [for (k=>v in map3) k];
+keys.sort(Reflect.compare);
+keys == [1,2,3];
+var values = [for (k=>v in map3) v];
+values.sort(Reflect.compare);
+values == [2,4,6];
+
 // Hashable
 var map = new Map();
 var a = new unit.MyAbstract.ClassWithHashCode(1);
@@ -92,6 +137,29 @@ map.exists(c) == true;
 map.get(a) == 1;
 map.get(b) == 2;
 map.get(c) == 3;
+
+var keys = [for (k=>v in map) k];
+keys[0] in [a,b,c];
+keys[1] in [a,b,c];
+keys[2] in [a,b,c];
+var values = [for (k=>v in map) v];
+values[0] in [1,2,3];
+values[1] in [1,2,3];
+values[2] in [1,2,3];
+
+var copied = map.copy();
+copied != map;
+copied.exists(a) == map.exists(a);
+copied.exists(b) == map.exists(b);
+copied.exists(c) == map.exists(c);
+copied.get(a) == map.get(a);
+copied.get(b) == map.get(b);
+copied.get(c) == map.get(c);
+
+copied.set(a, 4);
+copied.get(a) == 4;
+map.get(a) == 1;
+
 var values = [];
 for (val in map) {
 	values.push(val);
@@ -128,6 +196,29 @@ map.exists(c) == true;
 map.get(a) == 1;
 map.get(b) == 2;
 map.get(c) == 3;
+
+var keys = [for (k=>v in map) k];
+keys[0] in [a,b,c];
+keys[1] in [a,b,c];
+keys[2] in [a,b,c];
+var values = [for (k=>v in map) v];
+values[0] in [1,2,3];
+values[1] in [1,2,3];
+values[2] in [1,2,3];
+
+var copied = map.copy();
+copied != map;
+copied.exists(a) == map.exists(a);
+copied.exists(b) == map.exists(b);
+copied.exists(c) == map.exists(c);
+copied.get(a) == map.get(a);
+copied.get(b) == map.get(b);
+copied.get(c) == map.get(c);
+
+copied.set(a, 4);
+copied.get(a) == 4;
+map.get(a) == 1;
+
 var values = [];
 for (val in map) {
 	values.push(val);
@@ -172,4 +263,71 @@ map["foo"] == 9;
 [2 => 3].iterator().next() == 3;
 //[a => b].keys().next() == a;
 //[a => b].iterator().next() == b;
-#end
\ No newline at end of file
+#end
+
+var map:Map<String, Int>;
+HelperMacros.typedAs((null : Map<String, Int>), map = []);
+HelperMacros.typeError(map[1] = 1) == true;
+
+#if !(java || cs)
+['' => ''].keyValueIterator().next().key == '';
+['' => ''].keyValueIterator().next().value == '';
+[2 => 3].keyValueIterator().next().key == 2;
+[2 => 3].keyValueIterator().next().value == 3;
+#end
+
+// Test unification
+
+var map = [1=>"2",2=>"4"];
+var iterable:KeyValueIterable<Int, String> = map;
+var values = [for(kv in iterable.keyValueIterator()) kv.value];
+values[0] in ["2","4"];
+values[1] in ["2","4"];
+
+var iterator:KeyValueIterator<Int,String> = iterable.keyValueIterator();
+var keys = [for(kv in iterator) kv.key];
+keys[0] in [1,2];
+keys[1] in [1,2];
+
+
+// Test through Dynamic
+
+var map = [1=>"2",2=>"4"];
+var dyn:Dynamic = map;
+var it = dyn.iterator();
+var it:Iterator<String> = cast it;
+var values = [for(v in it) v];
+values[0] in ["2","4"];
+values[1] in ["2","4"];
+
+var it = dyn.keyValueIterator();
+var it:KeyValueIterator<Int,String> = cast it;
+var values = [for(kv in it) kv.value];
+values[0] in ["2","4"];
+values[1] in ["2","4"];
+var it = dyn.keyValueIterator();
+var it:KeyValueIterator<Int,String> = cast it;
+var keys = [for(kv in it) kv.key];
+keys[0] in [1,2];
+keys[1] in [1,2];
+
+
+var map = ["1a"=>"2","1b"=> "4"];
+var dyn:Dynamic = map;
+var it = dyn.iterator();
+var it:Iterator<String> = cast it;
+var values = [for(v in it) v];
+values[0] in ["2","4"];
+values[1] in ["2","4"];
+
+var it = dyn.keyValueIterator();
+var it:KeyValueIterator<String,String> = cast it;
+var values = [for(kv in it) kv.value];
+values[0] in ["2","4"];
+values[1] in ["2","4"];
+
+var it = dyn.keyValueIterator();
+var it:KeyValueIterator<String,String> = cast it;
+var keys = [for(kv in it) kv.key];
+keys[0] in ["1a","1b"];
+keys[1] in ["1a","1b"];
diff --git a/tests/unit/src/unitstd/Math.unit.hx b/tests/unit/src/unitstd/Math.unit.hx
index 848285b4f68e4c900ec1075368b96a534c6a4026..2e61a0da2d3aa66bb74a6e89cfe799a17b0126b0 100644
--- a/tests/unit/src/unitstd/Math.unit.hx
+++ b/tests/unit/src/unitstd/Math.unit.hx
@@ -8,6 +8,9 @@ Math.isNaN(Math.NaN) == true;
 Math.isNaN(Math.sqrt( -1)) == true;
 Math.NEGATIVE_INFINITY == Math.NEGATIVE_INFINITY;
 Math.POSITIVE_INFINITY == Math.POSITIVE_INFINITY;
+#if !python
+Math.isNaN(0/0) == true;
+#end
 // +
 Math.POSITIVE_INFINITY + Math.POSITIVE_INFINITY == Math.POSITIVE_INFINITY;
 Math.NEGATIVE_INFINITY + Math.NEGATIVE_INFINITY == Math.NEGATIVE_INFINITY;
@@ -55,6 +58,9 @@ Math.isNaN(Math.POSITIVE_INFINITY / Math.NaN) == true;
 Math.isNaN(Math.NaN / Math.POSITIVE_INFINITY) == true;
 Math.isNaN(Math.NEGATIVE_INFINITY / Math.NaN) == true;
 
+// %
+// var izero = 0;
+// Math.isNaN(1%izero) == true;
 // abs
 Math.abs(-1.223) == 1.223;
 Math.abs(1.223) == 1.223;
@@ -364,9 +370,7 @@ math.log(math.POSITIVE_INFINITY) == math.POSITIVE_INFINITY;
 // exp + log
 var floats = [1.33, 12.0, -112.999992, 0.0, math.NEGATIVE_INFINITY, math.POSITIVE_INFINITY];
 for (f in floats) {
-	#if !php
 	feq(math.log(math.exp(f)), f);
-	#end
 }
 
 // sqrt
@@ -432,3 +436,10 @@ math.isNaN(math.POSITIVE_INFINITY) == false;
 math.isNaN(math.NEGATIVE_INFINITY) == false;
 math.isNaN(math.NaN) == true;
 math.isNaN(0.0) == false;
+
+// atan2
+math.atan2(0,1) == 0;
+math.atan2(0,1000) == 0;
+math.atan2(1,0) == Math.PI/2;
+math.atan2(-1,0) == -Math.PI/2;
+math.atan2(0,0) == 0;
diff --git a/tests/unit/src/unitstd/Reflect.unit.hx b/tests/unit/src/unitstd/Reflect.unit.hx
index 55b2fe0974042f1d50109bcac766c5e6becab3c5..de1e1f833b8a7e7029698d207d8de96a5d650121 100644
--- a/tests/unit/src/unitstd/Reflect.unit.hx
+++ b/tests/unit/src/unitstd/Reflect.unit.hx
@@ -37,8 +37,8 @@ Reflect.getProperty(c, "v") == "var";
 Reflect.getProperty(c, "prop") == "prop";
 Reflect.getProperty(c, "func")() == "foo";
 Reflect.getProperty(c, "propAcc") == "1";
-//Reflect.getProperty(null, "a") == null;
-//Reflect.getProperty(null, null) == null;
+Reflect.getProperty(null, "a") == null;
+Reflect.getProperty(null, null) == null;
 
 // setProperty
 Reflect.setProperty(x, "a", 2);
@@ -80,6 +80,7 @@ var y = Reflect.copy(x);
 Reflect.field(y, "a") == 2;
 Reflect.field(y, "b") == null;
 Reflect.field(y, "c") == null;
+Reflect.copy(null) == null;
 
 //compare
 Reflect.compare(1,2) < 0;
@@ -102,9 +103,19 @@ Reflect.compareMethods(y,z) == false;
 Reflect.compareMethods(x,x) == true;
 Reflect.compareMethods(y,y) == true;
 Reflect.compareMethods(z,z) == true;
-//Reflect.compareMethods(x,null) == false;
-//Reflect.compareMethods(null,x) == false;
-//Reflect.compareMethods(null,null) == false; // varies
+
+Reflect.compareMethods(x,null) == false;
+Reflect.compareMethods(null,x) == false;
+
+// compareMethods with closures
+var a = [1];
+var b = [2];
+var v : Dynamic = a.push;
+Reflect.compareMethods(a.push, a.push) == true;
+Reflect.compareMethods(a.push, a.pop) == false;
+Reflect.compareMethods(a.push, b.push) == false;
+Reflect.compareMethods(a.push, v) == true;
+Reflect.compareMethods(b.push, v) == false;
 
 // isObject
 Reflect.isObject({}) == true;
@@ -112,7 +123,6 @@ Reflect.isObject({v:"f"}) == true;
 Reflect.isObject(new C()) == true;
 Reflect.isObject(new C2()) == true;
 Reflect.isObject(new CChild()) == true;
-Reflect.isObject(new CDyn()) == true;
 Reflect.isObject(new EmptyClass()) == true;
 Reflect.isObject(Type.createEmptyInstance(ReallyEmptyClass)) == true;
 Reflect.isObject("foo") == true;
@@ -137,7 +147,6 @@ Reflect.isEnumValue({v:"f"}) == false;
 Reflect.isEnumValue(new C()) == false;
 Reflect.isEnumValue(new C2()) == false;
 Reflect.isEnumValue(new CChild()) == false;
-Reflect.isEnumValue(new CDyn()) == false;
 Reflect.isEnumValue(new EmptyClass()) == false;
 Reflect.isEnumValue(Type.createEmptyInstance(ReallyEmptyClass)) == false;
 Reflect.isEnumValue("foo") == false;
diff --git a/tests/unit/src/unitstd/Ssl.unit.hx b/tests/unit/src/unitstd/Ssl.unit.hx
index e97ae0ce97ddfe24987dbab7fac0d888290943c2..7f3d929790c89ac5d4ff03f8827b068a7a400c9a 100644
--- a/tests/unit/src/unitstd/Ssl.unit.hx
+++ b/tests/unit/src/unitstd/Ssl.unit.hx
@@ -102,4 +102,6 @@ cert.issuer("O") == "Test Dev CA";
 var cert2 = cert.next();
 cert2.commonName == "localhost";
 
-#end
+#else
+1 == 1;
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/Std.unit.hx b/tests/unit/src/unitstd/Std.unit.hx
index 14b59305d46eb2c4d006161f2ba1ab6830272654..431f2efd4359d069d3df7862f02e223356a7093e 100644
--- a/tests/unit/src/unitstd/Std.unit.hx
+++ b/tests/unit/src/unitstd/Std.unit.hx
@@ -17,14 +17,17 @@ var unknown = null;
 
 // instance
 #if !js
-Std.instance("", String) == "";
+Std.downcast("", String) == "";
 #end
 var a = [];
-Std.instance(a, Array) == a;
+Std.downcast(a, Array) == a;
 var parent:unit.MyClass.MyParent = new MyClass.MyChild1();
-Std.instance(parent, unit.MyClass.MyChild1) != null;
-Std.instance(null, Array) == null;
-Std.instance(null, String) == null;
+Std.downcast(parent, unit.MyClass.MyChild1) != null;
+Std.downcast(null, Array) == null;
+Std.downcast(null, String) == null;
+
+var parent:unit.MyClass.IMyParent = new MyClass.MyChild1();
+Std.downcast(parent, unit.MyClass.IMyChild) != null;
 
 // string
 var cwts = new ClassWithToString();
diff --git a/tests/unit/src/unitstd/String.unit.hx b/tests/unit/src/unitstd/String.unit.hx
index f2f95b5bdf2336635a15d87fbbb701793f28d433..4adaac39bd8134c3e2daa3c703722362c0495683 100644
--- a/tests/unit/src/unitstd/String.unit.hx
+++ b/tests/unit/src/unitstd/String.unit.hx
@@ -72,6 +72,11 @@ s.indexOf("oo") == 1;
 s.indexOf("o", 1) == 1;
 s.indexOf("o", 2) == 2;
 s.indexOf("o", 3) == -1;
+//s.indexOf("", -10) == 0;
+//s.indexOf("", 7) == 7; // see #8117
+//s.indexOf("", 8) == -1; // see #8117
+s.indexOf("r", 7) == -1;
+s.indexOf("r", 8) == -1;
 
 // lastIndexOf
 var s = "foofoofoobarbar";
@@ -83,6 +88,8 @@ s.lastIndexOf("foo") == 6;
 s.lastIndexOf("foofoo") == 3;
 s.lastIndexOf("f") == 6;
 s.lastIndexOf("barb") == 9;
+s.lastIndexOf("barb", 12) == 9;
+s.lastIndexOf("barb", 13) == 9;
 s.lastIndexOf("z") == -1;
 //s.lastIndexOf(null) == -1;
 //s.lastIndexOf(null, 1) == -1;
@@ -96,6 +103,8 @@ s.lastIndexOf("bar", 12) == 12;
 s.lastIndexOf("bar", 11) == 9;
 s.lastIndexOf("bar", 9) == 9;
 s.lastIndexOf("bar", 8) == -1;
+s.lastIndexOf("a", s.length) == 13;
+s.lastIndexOf("a", s.length + 9000) == 13;
 
 // split
 var s = "xfooxfooxxbarxbarxx";
@@ -143,9 +152,6 @@ s.substring(2, -1) == "xf";
 s.substring(0) == "xfooxfooxxbarxbarxx";
 s.substring(1) == "fooxfooxxbarxbarxx";
 s.substring(2) == "ooxfooxxbarxbarxx";
-s.substring(0, -1) == "";
-s.substring(1, -1) == "x";
-s.substring(2, -1) == "xf";
 s.substring(20, 0) == "xfooxfooxxbarxbarxx";
 s.substring(0, 100) == "xfooxfooxxbarxbarxx";
 s.substring(100, 120) == "";
@@ -160,3 +166,24 @@ String.fromCharCode(65) == "A";
 // ensure int strings compared as strings, not parsed ints (issue #3734)
 ("3" > "11") == true;
 (" 3" < "3") == true;
+
+// string comparison (see #8332)
+("a" < "b") == true;
+("a" <= "b") == true;
+("a" > "b") == false;
+("a" >= "b") == false;
+
+#if target.unicode
+("𠜎zя" > "abя") == true;
+("𠜎zя" >= "abя") == true;
+("𠜎zя" < "abя") == false;
+("𠜎zя" <= "abя") == false;
+
+#if target.utf16
+// since U+10002 in UTF16 is D800 DC02
+("\u{FF61}" < "\u{10002}") == false;
+#else
+("\u{FF61}" < "\u{10002}") == true;
+#end
+
+#end
diff --git a/tests/unit/src/unitstd/StringBuf.unit.hx b/tests/unit/src/unitstd/StringBuf.unit.hx
index b6f2be856f658c9167fc30f99c285045fbfd3413..2b1829f1117ca7733578a9a4c5d3132987023bf3 100644
--- a/tests/unit/src/unitstd/StringBuf.unit.hx
+++ b/tests/unit/src/unitstd/StringBuf.unit.hx
@@ -20,6 +20,23 @@ var x = new StringBuf();
 x.addSub("abcdefg", 1, 3);
 x.toString() == "bcd";
 
+// surrogate characters
+#if !(neko)
+var x = new StringBuf();
+x.add("👽");
+x.toString() == "👽";
+var x = new StringBuf();
+x.addChar(0x1F47D);
+x.toString() == "👽";
+var x = new StringBuf();
+#if utf16
+x.addSub("a👽b", 1, 2);
+#else
+x.addSub("a👽b", 1, 1);
+#end
+x.toString() == "👽";
+#end
+
 // identity
 function identityTest(s:StringBuf) {
 	return s;
diff --git a/tests/unit/src/unitstd/StringTools.unit.hx b/tests/unit/src/unitstd/StringTools.unit.hx
index 4ed46d4b3fccc8f6340a1a36351828cc4c4060b3..84ffefdb9d52d602c1a6bad351ab2df5eb4c676b 100644
--- a/tests/unit/src/unitstd/StringTools.unit.hx
+++ b/tests/unit/src/unitstd/StringTools.unit.hx
@@ -109,6 +109,12 @@ StringTools.hex(0xABCDEF, 7) == "0ABCDEF";
 StringTools.hex( -1, 8) == "FFFFFFFF";
 StringTools.hex( -481400000, 8) == "E34E6B40";
 
+// contains
+var s = "foo1bar";
+StringTools.contains(s, '') == true;
+StringTools.contains(s, 'bar') == true;
+StringTools.contains(s, 'test') == false;
+
 // fastCodeAt
 var s = "foo1bar";
 StringTools.fastCodeAt(s, 0) == 102;
@@ -122,18 +128,18 @@ var str = "abc";
 StringTools.fastCodeAt(str, 0) == "a".code;
 StringTools.fastCodeAt(str, 1) == "b".code;
 StringTools.fastCodeAt(str, 2) == "c".code;
+StringTools.fastCodeAt(String.fromCharCode(128), 0) == 128;
+StringTools.fastCodeAt(String.fromCharCode(255), 0) == 255;
 StringTools.isEof(StringTools.fastCodeAt(str, 0)) == false;
 StringTools.isEof(StringTools.fastCodeAt(str, 1)) == false;
 StringTools.isEof(StringTools.fastCodeAt(str, 2)) == false;
 StringTools.isEof(StringTools.fastCodeAt(str, 3)) == true;
-StringTools.fastCodeAt(String.fromCharCode(128), 0) == 128;
-StringTools.fastCodeAt(String.fromCharCode(255), 0) == 255;
 StringTools.isEof(StringTools.fastCodeAt(str, 2)) == false;
 StringTools.isEof(StringTools.fastCodeAt(str, 3)) == true;
 StringTools.isEof(StringTools.fastCodeAt("", 0)) == true;
 
 // isEOF
-#if (neko || lua)
+#if (neko || lua || eval)
 StringTools.isEof(null) == true;
 #elseif (cs || java || python)
 StringTools.isEof( -1) == true;
@@ -142,3 +148,20 @@ StringTools.isEof( -1) == true;
 #else
 StringTools.isEof(0) == true;
 #end
+
+// iterators via @:using
+var s = 'zя𠜎';
+#if !(target.unicode)
+var expectedCodes = [122, 209, 143, 240, 160, 156, 142];
+#elseif utf16
+var expectedCodes = [122, 1103, 55361, 57102];
+#else
+var expectedCodes = [122, 1103, 132878];
+#end
+var expectedKeys = [for(i in 0...expectedCodes.length) i];
+// iterator()
+aeq(expectedCodes, [for(c in StringTools.iterator(s)) c]);
+// keyValueIterator()
+var keyCodes = [for(i => c in StringTools.keyValueIterator(s)) [i, c]];
+aeq(expectedKeys, keyCodes.map(a -> a[0]));
+aeq(expectedCodes, keyCodes.map(a -> a[1]));
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/Sys.unit.hx b/tests/unit/src/unitstd/Sys.unit.hx
deleted file mode 100644
index d455d7741512a34547fc73b45a44567b2bd80803..0000000000000000000000000000000000000000
--- a/tests/unit/src/unitstd/Sys.unit.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-#if sys
-(Sys.time() > 1395990000.00) == true;
-#end
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/Type.unit.hx b/tests/unit/src/unitstd/Type.unit.hx
index 960b9c10f61479a7ccf828a002fdc455f34c7a28..b41507aaac41973bebfa7a3d05ceb2c63f8ae42a 100644
--- a/tests/unit/src/unitstd/Type.unit.hx
+++ b/tests/unit/src/unitstd/Type.unit.hx
@@ -25,7 +25,7 @@ Type.getSuperClass(ClassWithToStringChild) == ClassWithToString;
 
 // getClassName
 Type.getClassName(String) == "String";
-Type.getClassName(C) == "unit.C";
+Type.getClassName(C) == "unit.spec.C";
 //Type.getClassName(null) == null;
 Type.getClassName(Type.getClass([])) == "Array";
 
@@ -35,7 +35,7 @@ Type.getEnumName(haxe.macro.Expr.ExprDef) == "haxe.macro.ExprDef";
 
 // resolveClass
 Type.resolveClass("String") == String;
-Type.resolveClass("unit.C") == C;
+Type.resolveClass("unit.spec.C") == C;
 //Type.resolveClass("Float") == null;
 //Type.resolveClass(null) == null;
 Type.resolveClass("MyNonExistingClass") == null;
@@ -58,6 +58,9 @@ Type.createInstance(C, []).v == "var";
 var c = Type.createInstance(ClassWithCtorDefaultValues, [2, "bar"]);
 c.a == 2;
 c.b == "bar";
+var c2 = Type.createInstance(ClassWithCtorDefaultValues2, [2, "bar"]);
+c2.a == 2;
+c2.b == "bar";
 //var t = Type.createInstance(ClassWithCtorDefaultValuesChild, [2, "bar"]);
 //t.a == 2;
 //t.b == "bar";
@@ -104,16 +107,6 @@ var requiredFields = ["func", "v", "prop"];
 for (f in fields)
 	t(requiredFields.remove(f));
 requiredFields == [];
-#if !hl // no support for implements Dynamic yet
-var cdyn = new CDyn();
-cdyn.foo = "1";
-Reflect.setField(cdyn, "bar", 1);
-var fields = Type.getInstanceFields(Type.getClass(cdyn));
-var requiredFields = ["func", "v", "prop"];
-for (f in fields)
-	t(requiredFields.remove(f));
-#end
-requiredFields == [];
 var fields = Type.getClassFields(C);
 var requiredFields = #if as3 ["staticVar"] #else ["staticFunc", "staticVar", "staticProp"] #end;
 for (f in fields)
diff --git a/tests/unit/src/unitstd/Unicode.unit.hx b/tests/unit/src/unitstd/Unicode.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7c7ae2c0b0b72bab12abe547c44dca5118389e64
--- /dev/null
+++ b/tests/unit/src/unitstd/Unicode.unit.hx
@@ -0,0 +1,310 @@
+#if target.unicode // neko and cpp with -D disable_unicode_strings will not be made Unicode compatible
+
+
+var s = String.fromCharCode(0xE9);
+s == "é";
+s.length == 1;
+s.charCodeAt(0) == 0xE9;
+
+var s = String.fromCharCode("あ".code);
+s == "あ";
+s.length == 1;
+s.charCodeAt(0) == "あ".code;
+
+//outside of BMP
+var s = String.fromCharCode("𠜎".code);
+s == "𠜎";
+
+var s = "aa😂éé";
+s.indexOf(String.fromCharCode(0x80))<0;
+s.indexOf("é")==s.length-2;
+s.indexOf("aa")==0;
+s.indexOf("a")==0;
+s.lastIndexOf("a")==1;
+s.indexOf("😂")>0;
+s.lastIndexOf("😂")>0;
+s.lastIndexOf("é")==s.length-1;
+var s = "abc";
+s.indexOf("éé")<0;
+s.lastIndexOf("éé")<0;
+
+"012::345€".indexOf("::", 1) == 3;
+
+var s = String.fromCharCode(0x1f602);
+s == "😂";
+
+
+#if !utf16
+// native UTF-16 or 32
+s.length == 1;
+s.charCodeAt(0) == "😂".code;
+#else
+// UTF-16 surrogate pairs encoding
+s.length == 2;
+s.charCodeAt(0) == 0xD83D;
+s.charCodeAt(1) == 0xDE02;
+#end
+
+"\u00E9\u3042" == "éあ";
+// "\uD83D\uDE02" == "😂" // gives Invalid Unicode char, that's correct
+// maybe later we can add support for \U******** for out of BMP escape sequence
+
+var s = "é" + "あ";
+s == "éあ";
+s.length == 2;
+s.charCodeAt(1) == "あ".code;
+
+var s = "é" + "😂" + "あ";
+s == "é😂あ";
+var a = s.split('😂');
+a.length == 2;
+a[0] == "é";
+a[1] == "あ";
+a.join('😂') == s;
+
+var a = s.split('');
+#if !utf16
+// native UTF-16 or 32
+a.length == 3;
+a[0] == "é";
+a[1] == "😂";
+a[2] == "あ";
+#else
+a.length == 4;
+a[0] == "é";
+a[3] == "あ";
+#end
+
+var buf = new StringBuf();
+buf.addChar(0xE9);
+buf.addChar("あ".code);
+buf.add("é");
+buf.add("あ");
+var str = buf.toString();
+str.length == 4;
+str == "éあéあ";
+str.charCodeAt(3) == "あ".code;
+
+var str = StringTools.urlEncode("éあ😂");
+str == "%C3%A9%E3%81%82%F0%9F%98%82";
+str = StringTools.urlDecode(str);
+str == "éあ😂";
+
+var str = haxe.Serializer.run("éあ");
+str == "y15:%C3%A9%E3%81%82";
+str = haxe.Unserializer.run(str);
+str == "éあ";
+
+var str = haxe.Serializer.run("😂");
+str == "y12:%F0%9F%98%82";
+str = haxe.Unserializer.run(str);
+str == "😂";
+
+var str = haxe.io.Bytes.ofString("éあ😂");
+str.toHex() == "c3a9e38182f09f9882";
+
+["é", "e"].join("é") == "éée";
+["é", "e"].join("e") == "éee";
+
+var rawBytes = haxe.io.Bytes.ofString("éあ😂",RawNative);
+
+#if (!utf16 || cpp)
+rawBytes.toHex() == "c3a9e38182f09f9882"; // UTF-8 native
+#else
+rawBytes.toHex() == "e90042303dd802de"; // UTF-16 native
+#end
+
+rawBytes.getString(0,rawBytes.length,RawNative) == "éあ😂";
+
+haxe.crypto.Md5.encode("éあ😂") == "d30b209e81e40d03dd474b26b77a8a18";
+haxe.crypto.Sha1.encode("éあ😂") == "ec79856a75c98572210430aeb7fe6300b6c4e20c";
+//haxe.crypto.Sha224.encode("éあ😂") == "d7967c5f27bd6868e276647583c55ab09d5f45b40610a3d9c6d91b90";
+//haxe.crypto.Sha256.encode("éあ😂") == "d0230b8d8ac2d6d0dbcee11ad0e0eaa68a6565347261871dc241571cab591676";
+haxe.crypto.BaseCode.encode("éあ😂","0123456789abcdef") == "c3a9e38182f09f9882";
+
+var buf = new haxe.io.BytesBuffer();
+buf.addString("éあ😂");
+buf.addString("éあ😂",RawNative);
+var bytes = buf.getBytes();
+bytes.getString(0,9) == "éあ😂";
+bytes.getString(2,3) == "あ";
+bytes.getString(5,4) == "😂";
+bytes.getString(2,7) == "あ😂";
+bytes.getString(9,bytes.length - 9,RawNative) == "éあ😂";
+bytes.sub(9,bytes.length - 9).compare(rawBytes) == 0;
+
+var o = new haxe.io.BytesOutput();
+o.writeString("éあ😂");
+o.writeString("éあ😂",RawNative);
+var bytes2 = o.getBytes();
+bytes2.toHex() == bytes.toHex();
+
+var input = new haxe.io.BytesInput(bytes2);
+input.readString(2) == "é";
+input.readString(7) == "あ😂";
+input.readString(bytes.length - 9,RawNative) == "éあ😂";
+
+var s = "ée";
+var s1 = s.charAt(1);
+s1 == "e";
+
+var s1 = s.substr(1, 1);
+var s2 = s.substr(1);
+var s3 = s.substr(-1);
+var s4 = s.substr(-1, 1);
+s1 == "e";
+s2 == "e";
+s3 == "e";
+s4 == "e";
+
+var s1 = s.substring(1, 2);
+var s2 = s.substring(1);
+var s3 = s.substring(2, 1);
+var s4 = s.substring(1, 20);
+s1 == "e";
+s2 == "e";
+s3 == "e";
+s4 == "e";
+
+Reflect.compare("ed", "éee".substr(1)) < 0;
+Reflect.compare("éed".substr(1), "éee".substr(1)) < 0;
+Reflect.compare("éed".substr(1), "ee") < 0;
+Reflect.compare("ee", "éed".substr(1)) > 0;
+Reflect.compare("éee".substr(1), "éed".substr(1)) > 0;
+Reflect.compare("éee".substr(1), "ed") > 0;
+
+var s = "ä😂";
+s.toUpperCase() == "Ä😂";
+s.toLowerCase() == s;
+
+var s = "Ä😂";
+s.toUpperCase() == s;
+s.toLowerCase() == "ä😂";
+
+var s = "a😂";
+s.toUpperCase() == "A😂";
+s.toLowerCase() == s;
+
+var s = "A😂";
+s.toUpperCase() == s;
+s.toLowerCase() == "a😂";
+
+"σ".toUpperCase() == "Σ";
+"Σ".toLowerCase() == "σ";
+
+var map = new haxe.ds.StringMap();
+map.set("path", 1);
+map.get("äpath".substr(1)) == 1;
+
+var data =  "<haxe><s>Hello World!</s><s2>π</s2></haxe>";
+var buf = new StringBuf();
+buf.addSub(data, 9, 12);
+var s = buf.toString();
+s == "Hello World!";
+s.length == 12;
+
+"äabc:def".substr(1).split(":") == ["abc","def"];
+
+var s1 = "abc";
+var b1 = haxe.io.Bytes.ofString(s1, RawNative);
+var s2 = b1.getString(0, b1.length, RawNative);
+s1 == s2;
+
+var obj:Dynamic = { abc: "ok" };
+var field = "äabc".substr(1);
+Reflect.field(obj, field) == "ok";
+Reflect.hasField(obj, field) == true;
+Reflect.deleteField(obj, field) == true;
+Reflect.deleteField(obj, field) == false;
+Reflect.hasField(obj, field) == false;
+Reflect.field(obj, field) == null;
+
+var obj:Dynamic = { };
+Reflect.setField(obj, field, "still ok");
+Reflect.field(obj, field) == "still ok";
+Reflect.hasField(obj, field) == true;
+Reflect.deleteField(obj, field) == true;
+Reflect.deleteField(obj, field) == false;
+Reflect.hasField(obj, field) == false;
+Reflect.field(obj, field) == null;
+
+// EReg -_-
+
+function test(left:String, middle:String, right:String, ?rex:EReg) {
+	var s = '$left:$middle:$right';
+	if (rex == null) {
+		rex = new EReg(':($middle):', "");
+	}
+	function check(rex:EReg) {
+		eq(rex.matchedLeft(), left);
+		eq(rex.matchedRight(), right);
+		eq(rex.matched(1), middle);
+		var pos = rex.matchedPos();
+		eq(pos.pos, left.length);
+		eq(pos.len, middle.length + 2);
+	}
+
+	t(rex.match(s));
+	check(rex);
+
+	var split = rex.split(s);
+	eq(2, split.length);
+	eq(left, split[0]);
+	eq(right, split[1]);
+
+	eq(rex.replace(s, "a"), '${left}a$right');
+	eq(rex.replace(s, "ä"), '${left}ä$right');
+
+	eq(rex.map(s, r -> {
+		check(r);
+		"a";
+	}), '${left}a$right');
+
+	eq(rex.map(s, r -> {
+		check(r);
+		"ä";
+	}), '${left}ä$right');
+}
+
+test("äb", "ä", "bc");
+test("äb", "a", "bc");
+test("ab", "a", "bc");
+test("ab", "ä", "bc");
+
+test("äb", "äbc", "bc");
+test("äb", "abc", "bc");
+test("ab", "abc", "bc");
+test("ab", "äbc", "bc");
+
+test("あb", "あbc", "bc");
+test("あb", "abc", "bc");
+test("ab", "abc", "bc");
+test("ab", "あbc", "bc");
+
+#if !flash
+// wontfix (cantfix?)
+test("😂b", "😂bc", "bc");
+test("😂b", "abc", "bc");
+test("ab", "abc", "bc");
+test("ab", "😂bc", "bc");
+#end
+
+#if (eval || lua || python)
+// unspecced?
+test("()", "ä", "[]", ~/:(\w):/);
+~/\bx/.match("äx") == false;
+~/x\b/.match("xä") == false;
+#end
+
+test("a", "É", "b", ~/:(é):/i);
+test("a", "é", "b", ~/:(É):/i);
+
+#else
+1 == 1;
+#end
+
+//Border values for surrogate pairs
+"𐀀".code == 65536; //D800,DC00 - U+10000
+"𐏿".code == 66559; //D800,DFFF - U+103FF
+"􏰀".code == 1113088; //DBFF,DC00 - U+10FC00
+"􏿿".code == 1114111; //DBFF,DFFF - U+10FFFF
diff --git a/tests/unit/src/unitstd/UnicodeString.unit.hx b/tests/unit/src/unitstd/UnicodeString.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..928987c7a634841c2f21624689abf461f58e1d4f
--- /dev/null
+++ b/tests/unit/src/unitstd/UnicodeString.unit.hx
@@ -0,0 +1,164 @@
+#if target.unicode
+var s = new UnicodeString("𠜎zя");
+var codes = [132878, 122, 1103];
+
+// length
+s.length == codes.length;
+
+// // toUpperCase, toLowerCase
+// var turkishLower = "ğüşıiöç";
+// var turkishUpper = "ĞÜŞIİÖÇ";
+// turkishUpper == turkishLower.toUpperCase();
+// turkishLower == turkishUpper.toLowerCase();
+
+// charAt
+s.charAt(0) == "𠜎";
+s.charAt(1) == "z";
+s.charAt(2) == "я";
+s.charAt(3) == "";
+s.charAt( -1) == "";
+("":UnicodeString).charAt(0) == "";
+("":UnicodeString).charAt(1) == "";
+("":UnicodeString).charAt( -1) == "";
+
+// charCodeAt
+s.charCodeAt(0) == codes[0];
+s.charCodeAt(1) == codes[1];
+s.charCodeAt(2) == codes[2];
+s.charCodeAt(3) == null;
+s.charCodeAt(-1) == null;
+
+// indexOf
+var s:UnicodeString = "𠜎zяяw";
+s.indexOf("𠜎") == 0;
+s.indexOf("z") == 1;
+s.indexOf("я") == 2;
+s.indexOf("zя") == 1;
+s.indexOf("w") == 4;
+s.indexOf("яw") == 3;
+s.indexOf("f") == -1;
+s.indexOf("я", 0) == 2;
+s.indexOf("я", 1) == 2;
+s.indexOf("я", 2) == 2;
+s.indexOf("я", 3) == 3;
+s.indexOf("я", 4) == -1;
+s.indexOf("я", 40) == -1;
+#if !lua // TODO https://github.com/HaxeFoundation/haxe/pull/8370
+s.indexOf("я", -1) == -1;
+s.indexOf("я", -2) == 3;
+s.indexOf("я", -3) == 2;
+s.indexOf("я", -4) == 2;
+s.indexOf("я", -5) == 2;
+s.indexOf("я", -50) == 2;
+#end
+
+// lastIndexOf
+var s:UnicodeString = "𠜎zяяw";
+s.lastIndexOf("𠜎") == 0;
+s.lastIndexOf("z") == 1;
+s.lastIndexOf("я") == 3;
+s.lastIndexOf("zя") == 1;
+s.lastIndexOf("яw") == 3;
+s.lastIndexOf("f") == -1;
+s.lastIndexOf("я", 0) == -1;
+s.lastIndexOf("я", 1) == -1;
+s.lastIndexOf("я", 2) == 2;
+s.lastIndexOf("я", 3) == 3;
+s.lastIndexOf("я", 4) == 3;
+s.lastIndexOf("я", 40) == 3;
+
+// substr
+var s:UnicodeString = "𠜎zяяw";
+s.substr(0) == "𠜎zяяw";
+s.substr(1) == "zяяw";
+s.substr(5) == "";
+s.substr(4) == "w";
+s.substr(3) == "яw";
+s.substr(-1) == "w";
+s.substr(-2) == "яw";
+s.substr(-4) == "zяяw";
+s.substr(-5) == "𠜎zяяw";
+s.substr(-100) == "𠜎zяяw";
+s.substr(0, 0) == "";
+s.substr(0, 1) == "𠜎";
+s.substr(0, 2) == "𠜎z";
+s.substr(0, 100) == "𠜎zяяw";
+s.substr(0, -1) == "𠜎zяя";
+s.substr(0, -2) == "𠜎zя";
+s.substr(0, -100) == "";
+
+// substring
+var s:UnicodeString = "𠜎zяяw";
+s.substring(0, 0) == "";
+s.substring(0, 1) == "𠜎";
+s.substring(1, 0) == "𠜎";
+s.substring(0, 2) == "𠜎z";
+s.substring(2, 0) == "𠜎z";
+s.substring(-1, 0) == "";
+s.substring(0, -1) == "";
+s.substring(-1, -1) == "";
+s.substring(-1, 1) == "𠜎";
+s.substring(1, -1) == "𠜎";
+s.substring(-1, 2) == "𠜎z";
+s.substring(2, -1) == "𠜎z";
+s.substring(0) == "𠜎zяяw";
+s.substring(1) == "zяяw";
+s.substring(2) == "яяw";
+s.substring(0, -1) == "";
+s.substring(5, 0) == "𠜎zяяw";
+s.substring(0, 100) == "𠜎zяяw";
+s.substring(100, 120) == "";
+s.substring(100, 0) == "𠜎zяяw";
+s.substring(120, 100) == "";
+s.substring(1, 4) == "zяя";
+s.substring(4, 1) == "zяя";
+
+var s = new UnicodeString("𠜎zя");
+
+// @:op(UnicodeString)
+var s2 = new UnicodeString("𠜎z");
+s != s2;
+!(s == s2);
+s > s2;
+s >= s2;
+s2 < s;
+s2 <= s;
+(s + s2).length == s.length + s2.length;
+var s3 = s;
+(s3 += s2).length == s.length + s2.length;
+
+// @:op(String)
+var s2 = "abя";
+s != s2;
+!(s == s2);
+s > s2;
+s >= s2;
+s2 < s;
+s2 <= s;
+(s + s2).length == s.length + (s2:UnicodeString).length;
+var s3 = s;
+(s3 += s2).length == s.length + (s2:UnicodeString).length;
+
+// iterator
+aeq(codes, [for(c in s) c]);
+
+// keyValueIterator
+var keys = [for(i in 0...codes.length) i];
+var actualKeyCodes = [for(i => c in s) [i, c]];
+aeq(keys, actualKeyCodes.map(a -> a[0]));
+aeq(codes, actualKeyCodes.map(a -> a[1]));
+
+// validate
+UnicodeString.validate(haxe.io.Bytes.ofHex("f0a9b8bde38182c3ab61"), UTF8) == true;
+UnicodeString.validate(haxe.io.Bytes.ofHex("ed9fbf"), UTF8) == true;
+UnicodeString.validate(haxe.io.Bytes.ofHex("ee8080"), UTF8) == true;
+UnicodeString.validate(haxe.io.Bytes.ofHex("f48fbfbf"), UTF8) == true;
+UnicodeString.validate(haxe.io.Bytes.ofHex("f0a9b8bde381c3ab61"), UTF8) == false;
+UnicodeString.validate(haxe.io.Bytes.ofHex("c0af"), UTF8) == false; // overlong sequence
+UnicodeString.validate(haxe.io.Bytes.ofHex("eda080"), UTF8) == false; // surrogate byte sequence
+UnicodeString.validate(haxe.io.Bytes.ofHex("edbfbf"), UTF8) == false; // surrogate byte sequence
+UnicodeString.validate(haxe.io.Bytes.ofHex("f4908080"), UTF8) == false; // U+110000
+
+#else
+1 == 1;
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/haxe/DynamicAccess.unit.hx b/tests/unit/src/unitstd/haxe/DynamicAccess.unit.hx
index 20809ca2f9acae210a860d92a3d5f771bb3f0cb9..ce93aeb17d45aabf06c6e54dfdb32b417d7cdb06 100644
--- a/tests/unit/src/unitstd/haxe/DynamicAccess.unit.hx
+++ b/tests/unit/src/unitstd/haxe/DynamicAccess.unit.hx
@@ -36,3 +36,32 @@ map["test"] == 2;
 
 var d:Dynamic<Int> = map;
 d.test == 2;
+
+var map = new haxe.DynamicAccess();
+map["a"] = 1;
+map["b"] = 2;
+map["c"] = 3;
+
+var values = [];
+for (value in map) {
+	values.push(value);
+}
+values.length == 3;
+values[0] in [1, 2, 3];
+values[1] in [1, 2, 3];
+values[2] in [1, 2, 3];
+
+var keys = [];
+var values = [];
+for (key => value in map) {
+	keys.push(key);
+	values.push(value);
+}
+keys.length == 3;
+keys[0] in ["a", "b", "c"];
+keys[1] in ["a", "b", "c"];
+keys[2] in ["a", "b", "c"];
+values.length == 3;
+values[0] in [1, 2, 3];
+values[1] in [1, 2, 3];
+values[2] in [1, 2, 3];
diff --git a/tests/unit/src/unitstd/haxe/Int32.unit.hx b/tests/unit/src/unitstd/haxe/Int32.unit.hx
index 4877c41b385eb22967232bd144bf864b6c6cf6f4..e6362860ae2dbc7f51aab3fee110b945eb3b461a 100644
--- a/tests/unit/src/unitstd/haxe/Int32.unit.hx
+++ b/tests/unit/src/unitstd/haxe/Int32.unit.hx
@@ -23,3 +23,29 @@ max*2 == -2;
 min << 1 == 0;
 min >> 1 == 0xc0000000;
 min >>> 1 == 0x40000000;
+
+#if !cpp
+var a = [1];
+var next = 0;
+
+var i32:haxe.Int32 = max - 1;
+i32 |= ((a[next] << 32) | 1 );
+i32 == max;
+
+var i32:haxe.Int32 = ((a[next] << 33) | 3);
+i32 >>= 1;
+i32 == 1;
+
+var i32:haxe.Int32 = 2;
+i32 ^= ( (a[next] << 32) | 1);
+i32 == 3;
+
+var i32:haxe.Int32 = 2;
+var c = ~(((a[next] << 32) | 1):haxe.Int32);
+c == 0xfffffffe;
+#end
+
+// - see: https://github.com/HaxeFoundation/haxe/pull/7491
+-min == min;              // two's complement overflow,
+-2147483643 == 5 + -min;  // order of ops and negate
+2147483643 == -(5 + min); // static analyzer issue
diff --git a/tests/unit/src/unitstd/haxe/Log.unit.hx b/tests/unit/src/unitstd/haxe/Log.unit.hx
index fa29b1cb199dce926971c14463361ebf8ed14972..59b38e8a56e584e0fa50d4dce95f1e4306a68d9f 100644
--- a/tests/unit/src/unitstd/haxe/Log.unit.hx
+++ b/tests/unit/src/unitstd/haxe/Log.unit.hx
@@ -6,9 +6,10 @@ haxe.Log.trace = function(v, ?i) {
 	p = i;
 }
 trace("test trace");
+haxe.Log.trace = old;
 s == "test trace";
-p.fileName == "Log.unit.hx";
+p.fileName == "src/unitstd/haxe/Log.unit.hx";
 p.lineNumber == 8;
 haxe.Log.trace = null;
 exc(function() trace("exc test"));
-haxe.Log.trace = old;
\ No newline at end of file
+haxe.Log.trace = old;
diff --git a/tests/unit/src/unitstd/haxe/Utf8.unit.hx b/tests/unit/src/unitstd/haxe/Utf8.unit.hx
index bc2876a412930d99db0b1ff4ccf1ef424c75fca6..16fbb3f153ed1f095340141297e76517f75e80e8 100644
--- a/tests/unit/src/unitstd/haxe/Utf8.unit.hx
+++ b/tests/unit/src/unitstd/haxe/Utf8.unit.hx
@@ -1,8 +1,3 @@
-#if php
-// php's haxe.Utf8 uses mbstring
-if (untyped __call__("extension_loaded", "mbstring")) {
-#end
-
 #if false
 // disabled tests with outside BMP chars (will be reenabled when we support them)
 var str = "あ𠀀い";
@@ -48,18 +43,14 @@ haxe.Utf8.compare(haxe.Utf8.sub(str, 1, 0), "") == 0;
 
 // #if (neko || php || cpp || lua || macro)
 // TODO neko, cpp, macro
-#if (php || lua)
-haxe.Utf8.validate("\xf0\xa9\xb8\xbd\xe3\x81\x82\xc3\xab\x61") == true;
-haxe.Utf8.validate("\xed\x9f\xbf") == true;
-haxe.Utf8.validate("\xee\x80\x80") == true;
-haxe.Utf8.validate("\xf4\x8f\xbf\xbf") == true;
-haxe.Utf8.validate("\xf0\xa9\xb8\xbd\xe3\x81\xc3\xab\x61") == false;
-haxe.Utf8.validate("\xc0\xaf") == false; // redundant sequence
-haxe.Utf8.validate("\xed\xa0\x80") == false; // surrogate byte sequence
-haxe.Utf8.validate("\xed\xbf\xbf") == false; // surrogate byte sequence
-haxe.Utf8.validate("\xf4\x90\x80\x80") == false; // U+110000
-#end
-
 #if php
-}
-#end
+haxe.Utf8.validate(haxe.io.Bytes.ofHex("f0a9b8bde38182c3ab61").toString()) == true;
+haxe.Utf8.validate(haxe.io.Bytes.ofHex("ed9fbf").toString()) == true;
+haxe.Utf8.validate(haxe.io.Bytes.ofHex("ee8080").toString()) == true;
+haxe.Utf8.validate(haxe.io.Bytes.ofHex("f48fbfbf").toString()) == true;
+haxe.Utf8.validate(haxe.io.Bytes.ofHex("f0a9b8bde381c3ab61").toString()) == false;
+haxe.Utf8.validate(haxe.io.Bytes.ofHex("c0af").toString()) == false; // redundant sequence
+haxe.Utf8.validate(haxe.io.Bytes.ofHex("eda080").toString()) == false; // surrogate byte sequence
+haxe.Utf8.validate(haxe.io.Bytes.ofHex("edbfbf").toString()) == false; // surrogate byte sequence
+haxe.Utf8.validate(haxe.io.Bytes.ofHex("f4908080").toString()) == false; // U+110000
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/haxe/crypto/Crc32.hx b/tests/unit/src/unitstd/haxe/crypto/Crc32.hx
deleted file mode 100644
index 4b405d7fce2e4b9b4feb5bcd1d6c3d08c64abe1c..0000000000000000000000000000000000000000
--- a/tests/unit/src/unitstd/haxe/crypto/Crc32.hx
+++ /dev/null
@@ -1,2 +0,0 @@
-haxe.crypto.Crc32.make(haxe.io.Bytes.fromString("")) == 0;
-haxe.crypto.Crc32.make(haxe.io.Bytes.fromString("The quick brown fox jumps over the lazy dog")) == 0x414FA339;
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/haxe/crypto/Crc32.unit.hx b/tests/unit/src/unitstd/haxe/crypto/Crc32.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..b8edd8d64007391e8c40ed3c72ad94cba9a12cf4
--- /dev/null
+++ b/tests/unit/src/unitstd/haxe/crypto/Crc32.unit.hx
@@ -0,0 +1,2 @@
+haxe.crypto.Crc32.make(haxe.io.Bytes.ofString("")) == 0;
+haxe.crypto.Crc32.make(haxe.io.Bytes.ofString("The quick brown fox jumps over the lazy dog")) == 0x414FA339;
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/haxe/crypto/Hmac.unit.hx b/tests/unit/src/unitstd/haxe/crypto/Hmac.unit.hx
index 52a908a3be85f977ef50e4e44fff87c7f6fac248..5b22ea84c7c21866aace4e64f4afd62bf82afe88 100644
--- a/tests/unit/src/unitstd/haxe/crypto/Hmac.unit.hx
+++ b/tests/unit/src/unitstd/haxe/crypto/Hmac.unit.hx
@@ -8,4 +8,4 @@ hmacSha256.make(haxe.io.Bytes.ofString(""), haxe.io.Bytes.ofString("")).toHex()
 
 hmacMd5.make(haxe.io.Bytes.ofString("key"), haxe.io.Bytes.ofString("The quick brown fox jumps over the lazy dog")).toHex() == "80070713463e7749b90c2dc24911e275";
 hmacSha1.make(haxe.io.Bytes.ofString("key"), haxe.io.Bytes.ofString("The quick brown fox jumps over the lazy dog")).toHex() == "de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9";
-hmacSha256.make(haxe.io.Bytes.ofString("key"), haxe.io.Bytes.ofString("The quick brown fox jumps over the lazy dog")).toHex() == "f7bc83f430538424b13298e6aa6fb143ef4d59a14946175997479dbc2d1a3cd8";
\ No newline at end of file
+hmacSha256.make(haxe.io.Bytes.ofString("key"), haxe.io.Bytes.ofString("The quick brown fox jumps over the lazy dog")).toHex() == "f7bc83f430538424b13298e6aa6fb143ef4d59a14946175997479dbc2d1a3cd8";
diff --git a/tests/unit/src/unitstd/haxe/ds/BalancedTree.unit.hx b/tests/unit/src/unitstd/haxe/ds/BalancedTree.unit.hx
index 777d8f69309a4fc34a2969641b75cd9f9c7690ec..74e5c653db909e6bf2ddb9e2a3e0906915ebdcd6 100644
--- a/tests/unit/src/unitstd/haxe/ds/BalancedTree.unit.hx
+++ b/tests/unit/src/unitstd/haxe/ds/BalancedTree.unit.hx
@@ -31,6 +31,16 @@ for (k in test.keys()) {
 for (k in otherKeys) {
 	eq(false, m.exists(k));
 }
+
+var copied = m.copy();
+copied != m;
+for(k in m.keys()) {
+	eq(test[k], copied.get(k));
+	copied.set(k, copied.get(k) + 1);
+	eq(test[k] + 1, copied.get(k));
+	eq(test[k], m.get(k));
+}
+
 var r = [for (key in m.keys()) key];
 arrEq(r, [1,6,8,11,13,15,17,22,25,27]);
 var r = [for (val in m) val];
@@ -62,3 +72,33 @@ for (k in test.keys()) {
 	eq(ms.remove(Std.string(k)), true);
 	eq(ms.exists(Std.string(k)), false);
 }
+
+// keyValueIterator
+var test2 = new haxe.ds.BalancedTree<Int, Int>();
+var keys1 = [1,2,3];
+var values1 = [2,4,6];
+for(i in 0 ... keys1.length) test2.set(keys1[i], values1[i]);
+
+[for(k=>v in test2) k] == [1,2,3];
+[for(k=>v in test2) v] == [2,4,6];
+[for(k=>v in test2) k*v] == [2,8,18];
+
+// clear
+var test3 = new haxe.ds.BalancedTree<Int, Int>();
+test3.set(0, 1);
+test3.set(2, 3);
+test3.set(4, 6);
+
+[for(k=>v in test3) k] == [0,2,4];
+
+test3.clear();
+
+[for(k=>v in test3) k] == [];
+test3.exists(0) == false;
+test3.exists(2) == false;
+test3.exists(4) == false;
+
+test3.set(0, 1);
+test3.exists(0) == true;
+test3.exists(2) == false;
+test3.exists(4) == false;
diff --git a/tests/unit/src/unitstd/haxe/ds/EnumValueMap.unit.hx b/tests/unit/src/unitstd/haxe/ds/EnumValueMap.unit.hx
index 487a5829a9a7693a082fa239cfa1feb9c79a26ae..aebd4f753b3c57f041aab14ad26e7a5a45a5bde9 100644
--- a/tests/unit/src/unitstd/haxe/ds/EnumValueMap.unit.hx
+++ b/tests/unit/src/unitstd/haxe/ds/EnumValueMap.unit.hx
@@ -95,4 +95,10 @@ evm.set(EVMF([EVMA, EVMB()]), 12);
 evm.exists(EVMF([EVMA, EVMB()])) == true;
 evm.exists(EVMF([EVMA, EVMB(null)])) == true;
 evm.get(EVMF([EVMA, EVMB()])) == 12;
-evm.get(EVMF([EVMA, EVMB(null)])) == 12;
\ No newline at end of file
+evm.get(EVMF([EVMA, EVMB(null)])) == 12;
+
+evm.clear();
+evm.exists(EVMF([EVMA, EVMB()])) == false;
+evm.exists(EVMF([EVMA, EVMB(null)])) == false;
+
+[for (k=>v in evm) k] == [];
diff --git a/tests/unit/src/unitstd/haxe/ds/IntMap.unit.hx b/tests/unit/src/unitstd/haxe/ds/IntMap.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..bbb4aa8d14a20984e7983dca4030d7159f0c090d
--- /dev/null
+++ b/tests/unit/src/unitstd/haxe/ds/IntMap.unit.hx
@@ -0,0 +1,81 @@
+var map1 = new haxe.ds.IntMap();
+(map1 is haxe.ds.IntMap) == true;
+map1.set(1, 2);
+map1.set(2, 4);
+map1.set(3, 6);
+map1.get(1) == 2;
+map1.get(2) == 4; 
+map1.get(3) != 8;
+
+// iterator
+var keys1a = [for (k in map1.keys()) k];
+keys1a.sort(Reflect.compare); // Order is undefined
+keys1a == [1,2,3];
+
+var values1a = [for (v in map1) v];
+values1a.sort(Reflect.compare); 
+values1a == [2,4,6];
+
+// key value iterator
+var keys1b = [for (k=>v in map1) k];
+keys1b.sort(Reflect.compare); 
+keys1b == [1,2,3];
+
+var values1b = [for (k=>v in map1) v];
+values1b.sort(Reflect.compare); 
+values1b == [2,4,6];
+
+var values1c = [for (k=>v in map1) k*v];
+values1c.sort(Reflect.compare); 
+values1c == [2,8,18];
+
+
+var map2 = new haxe.ds.IntMap();
+(map2 is haxe.ds.IntMap) == true;
+map2.set(1, "2");
+map2.set(2, "4");
+map2.set(3, "6");
+map2.get(1) == "2";
+map2.get(2) == "4"; 
+map2.get(3) != "8";
+
+// iterator
+var keys2a = [for (k in map2.keys()) k];
+keys2a.sort(Reflect.compare); 
+keys2a == [1,2,3];
+
+var values2a = [for (v in map2) v];
+values2a.sort(Reflect.compare); 
+values2a == ["2","4","6"];
+// key value iterator
+var keys2b = [for (k=>v in map2) k];
+keys2b.sort(Reflect.compare); 
+keys2b == [1,2,3];
+
+var values2b = [for (k=>v in map2) v];
+values2b.sort(Reflect.compare); 
+values2b == ["2","4","6"];
+
+// clear
+map2.clear();
+map2.get(1) == null;
+map2.exists(1) == false;
+map2.exists(2) == false;
+map2.exists(3) == false;
+
+var keys3 = [for (k in map2.keys()) k];
+keys3 == [];
+
+
+// Test unification
+
+var map:haxe.ds.IntMap<String> = [1=>"2",2=>"4"];
+var iterable:KeyValueIterable<Int, String> = map; 
+var iterator:KeyValueIterator<Int,String> = iterable.keyValueIterator();
+var values = [for(kv in iterator) kv.value];
+values[0] in ["2","4"];
+values[1] in ["2","4"];
+var iterator:KeyValueIterator<Int,String> = iterable.keyValueIterator();
+var keys = [for(kv in iterator) kv.key];
+keys[0] in [1,2];
+keys[1] in [1,2];
diff --git a/tests/unit/src/unitstd/haxe/ds/ObjectMap.unit.hx b/tests/unit/src/unitstd/haxe/ds/ObjectMap.unit.hx
index b28e6ec2b18c279c92cf8c25031b361d62c3a92f..1f9cd9828d9c408f5035c7c9071b9d8e22cb7f51 100644
--- a/tests/unit/src/unitstd/haxe/ds/ObjectMap.unit.hx
+++ b/tests/unit/src/unitstd/haxe/ds/ObjectMap.unit.hx
@@ -82,4 +82,13 @@ for (k in o.iterator()) {
 a.length == 2;
 a[0] in ["9", "7"];
 a[1] in ["9", "7"];
-o.remove(k2) == false;
\ No newline at end of file
+o.remove(k2) == false;
+
+// clear
+o.clear();
+o.get(k1) == null;
+o.exists(k1) == false;
+o.exists(k2) == false;
+o.exists(k3) == false;
+var a = [for (k in o.keys()) k];
+a == [];
diff --git a/tests/unit/src/unitstd/haxe/ds/StringMap.unit.hx b/tests/unit/src/unitstd/haxe/ds/StringMap.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..1bfc47219fb2f98ddda7e1209467fa07a29a15fc
--- /dev/null
+++ b/tests/unit/src/unitstd/haxe/ds/StringMap.unit.hx
@@ -0,0 +1,76 @@
+var map1 = new haxe.ds.StringMap();
+(map1 is haxe.ds.StringMap) == true;
+map1.set("1a", 2);
+map1.set("2a", 4);
+map1.set("3a", 6);
+map1.get("1a") == 2;
+map1.get("2a") == 4; 
+map1.get("3a") != 8;
+
+// iterator
+var keys1a = [for (k in map1.keys()) k];
+keys1a.sort(Reflect.compare); // Order is undefined
+keys1a == ["1a","2a","3a"];
+
+var values1a = [for (v in map1) v];
+values1a.sort(Reflect.compare); 
+values1a == [2,4,6];
+
+// key value iterator
+var keys1b = [for (k=>v in map1) k];
+keys1b.sort(Reflect.compare); 
+keys1b == ["1a","2a","3a"];
+
+var values1b = [for (k=>v in map1) v];
+values1b.sort(Reflect.compare); 
+values1b == [2,4,6];
+
+
+var map2 = new haxe.ds.StringMap();
+(map2 is haxe.ds.StringMap) == true;
+map2.set("1a", "2");
+map2.set("2a", "4");
+map2.set("3a", "6");
+map2.get("1a") == "2";
+map2.get("2a") == "4"; 
+map2.get("3a") != "8";
+
+// iterator
+var keys2a = [for (k in map2.keys()) k];
+keys2a.sort(Reflect.compare); 
+keys2a == ["1a","2a","3a"];
+
+var values2a = [for (v in map2) v];
+values2a.sort(Reflect.compare); 
+values2a == ["2","4","6"];
+// key value iterator
+var keys2b = [for (k=>v in map2) k];
+keys2b.sort(Reflect.compare); 
+keys2b == ["1a","2a","3a"];
+
+var values2b = [for (k=>v in map2) v];
+values2b.sort(Reflect.compare); 
+values2b == ["2","4","6"];
+
+// clear
+map2.clear();
+map2.get("1a") == null;
+map2.exists("1a") == false;
+map2.exists("2a") == false;
+map2.exists("3a") == false;
+
+var keys3 = [for (k in map2.keys()) k];
+keys3 == [];
+
+// Test unification
+
+var map:haxe.ds.StringMap<String> = ["1a"=>"2","1b"=>"4"];
+var iterable:KeyValueIterable<String, String> = map; 
+var iterator:KeyValueIterator<String,String> = iterable.keyValueIterator();
+var values = [for(kv in iterator) kv.value];
+values[0] in ["2","4"];
+values[1] in ["2","4"];
+var iterator:KeyValueIterator<String,String> = iterable.keyValueIterator();
+var keys = [for(kv in iterator) kv.key];
+keys[0] in ["1a", "1b"];
+keys[1] in ["1a", "1b"];
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/haxe/ds/Vector.unit.hx b/tests/unit/src/unitstd/haxe/ds/Vector.unit.hx
index 8eed5327d81a03494244421904f47771aef96d0f..38264a218098c23e35dfe9b9bb6afc2fffb8c059 100644
--- a/tests/unit/src/unitstd/haxe/ds/Vector.unit.hx
+++ b/tests/unit/src/unitstd/haxe/ds/Vector.unit.hx
@@ -1,8 +1,7 @@
 var vec = new haxe.ds.Vector(3);
-var vNullInt = #if (flash || cpp || java || cs || hl) 0 #else null #end;
-var vNullBool = #if (flash || cpp || java || cs || hl) false #else null #end;
-var vNullFloat = #if (flash || cpp || java || cs || hl) 0.0 #else null #end;
-
+var vNullInt = #if static 0 #else null #end;
+var vNullBool = #if static false #else null #end;
+var vNullFloat = #if static 0.0 #else null #end;
 vec.length == 3;
 vec.get(0) == vNullInt;
 vec.get(1) == vNullInt;
@@ -31,7 +30,7 @@ vec.get(2) == vNullBool;
 // fromArray
 var arr = ["1", "2", "3"];
 var vec:haxe.ds.Vector<String> = haxe.ds.Vector.fromArrayCopy(arr);
-#if (!flash && !neko && !cs && !java && !lua)
+#if (!flash && !neko && !cs && !java && !lua && !eval && !php)
 arr != vec.toData();
 #end
 vec.length == 3;
@@ -39,6 +38,16 @@ vec.get(0) == "1";
 vec.get(1) == "2";
 vec.get(2) == "3";
 
+// toArray
+var vec = new haxe.ds.Vector(3);
+vec.set(1, 2);
+var arr = vec.toArray();
+arr[0] == vNullInt;
+arr[1] == 2;
+#if !as3
+arr[3] == vNullInt;
+#end
+
 // objects
 var tpl = new C();
 var vec:haxe.ds.Vector<C> = haxe.ds.Vector.fromArrayCopy([tpl]);
@@ -174,7 +183,7 @@ vec2[1] == "value: 13";
 
 // sort
 
-#if !(neko || cs || java)
+#if !(neko || cs || java || eval)
 var vec = new haxe.ds.Vector(4);
 vec[0] = 99;
 vec[1] = 101;
diff --git a/tests/unit/src/unitstd/haxe/ds/WeakMap.unit.hx b/tests/unit/src/unitstd/haxe/ds/WeakMap.unit.hx
index d9ea829bc3241c57952c5575200c9ecbed56f2ae..a99c482e6e35a7e7c2fc9667f227d1991f58d47e 100644
--- a/tests/unit/src/unitstd/haxe/ds/WeakMap.unit.hx
+++ b/tests/unit/src/unitstd/haxe/ds/WeakMap.unit.hx
@@ -84,4 +84,17 @@ a.length == 2;
 a[0] in ["9", "7"];
 a[1] in ["9", "7"];
 o.remove(k2) == false;
-#end
+
+// clear
+o.clear();
+o.get(k1) == null;
+o.exists(k1) == false;
+o.exists(k2) == false;
+o.exists(k3) == false;
+
+var a = [for (k in o.keys()) k];
+a == [];
+
+#else
+1 == 1;
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/haxe/io/Float32Array.unit.hx b/tests/unit/src/unitstd/haxe/io/Float32Array.unit.hx
index 34b7bc82d477156cada46e5442fba0a44d122362..4e980bfddd57aa394b5fa01b795a45d10a3b831a 100644
--- a/tests/unit/src/unitstd/haxe/io/Float32Array.unit.hx
+++ b/tests/unit/src/unitstd/haxe/io/Float32Array.unit.hx
@@ -1,6 +1,3 @@
-
-var emulated = haxe.io.ArrayBufferView.EMULATED;
-
 var b = new haxe.io.Float32Array(5);
 b[0] == 0;
 b[4] == 0;
@@ -11,10 +8,12 @@ b[1] = 1.25;
 b[1] == 1.25;
 
 // check loss of precision due to 32 bits
-if( !emulated ) {
-	b[1] = 8589934591.;
-	b[1] == 8589934592.;
-}
+b[1] = 8589934591.;
+
+#if typedarray_precision_check // see issue #7407
+b[1] == 8589934592.;
+#end
+
 
 // set
 for( i in 0...5 )
@@ -36,11 +35,10 @@ b2[2] == 4;
 b2.length == 3;
 
 // check memory sharing
-if( !emulated ) {
-	b2[0] = 0xCC;
-	b2[0] == 0xCC;
-	b[1] == 0xCC;
-}
+b2[0] = 0xCC;
+b2[0] == 0xCC;
+b[1] == 0xCC;
+
 
 // should we allow writing past bounds ?
 try b2[-1] = 0xBB catch( e : Dynamic ) {};
@@ -52,7 +50,7 @@ b[4] == 5;
 
 b.view == b.view; // no alloc
 
-if( !emulated ) b.view.buffer == b2.view.buffer;
+b.view.buffer == b2.view.buffer;
 b.view.byteLength == 20;
 b.view.byteOffset == 0;
 b2.view.byteLength == 12;
@@ -61,15 +59,15 @@ b2.view.byteOffset == 4;
 // check sub
 var sub = b.sub(1);
 sub.length == b.length - 1;
-sub[0] == (emulated ? 2 : 0xCC);
+sub[0] == 0xCC;
 sub[0] = 0xDD;
-if( !emulated ) b[1] == 0xDD;
+b[1] == 0xDD;
 
 var sub = b.subarray(2,3);
 sub.length == 1;
 sub[0] == 3;
 sub[0] = 0xEE;
-if( !emulated ) b[2] == 0xEE;
+b[2] == 0xEE;
 
 // from bytes
 var b3 = haxe.io.Float32Array.fromBytes(b.view.buffer, 2*4, 3);
@@ -77,4 +75,4 @@ b3.length == 3;
 for( i in 0...3 )
 	b3[i] == b[i+2];
 b3[0] = b[3] + 1;
-if( !emulated ) b3[0] == b[2];
+b3[0] == b[2];
diff --git a/tests/unit/src/unitstd/haxe/io/Float64Array.unit.hx b/tests/unit/src/unitstd/haxe/io/Float64Array.unit.hx
index be618d2c5b79ba410cce5300e7910c6992515df7..b564365ced8e41684e8201b75551daeeacc5656c 100644
--- a/tests/unit/src/unitstd/haxe/io/Float64Array.unit.hx
+++ b/tests/unit/src/unitstd/haxe/io/Float64Array.unit.hx
@@ -1,8 +1,5 @@
-
-var emulated = haxe.io.ArrayBufferView.EMULATED;
-
 #if js
-if( untyped js.html.Float64Array == "notsupported" ) return;
+if( untyped js.lib.Float64Array == "notsupported" ) return;
 #end
 
 var b = new haxe.io.Float64Array(5);
@@ -34,11 +31,9 @@ b2[2] == 4;
 b2.length == 3;
 
 // check memory sharing
-if( !emulated ) {
-	b2[0] = 0xCC;
-	b2[0] == 0xCC;
-	b[1] == 0xCC;
-}
+b2[0] = 0xCC;
+b2[0] == 0xCC;
+b[1] == 0xCC;
 
 // should we allow writing past bounds ?
 try b2[-1] = 0xBB catch( e : Dynamic ) {};
@@ -50,7 +45,7 @@ b[4] == 5;
 
 b.view == b.view; // no alloc
 
-if( !emulated ) b.view.buffer == b2.view.buffer;
+b.view.buffer == b2.view.buffer;
 b.view.byteLength == 40;
 b.view.byteOffset == 0;
 b2.view.byteLength == 24;
@@ -59,15 +54,15 @@ b2.view.byteOffset == 8;
 // check sub
 var sub = b.sub(1);
 sub.length == b.length - 1;
-sub[0] == (emulated ? 2 : 0xCC);
+sub[0] == 0xCC;
 sub[0] = 0xDD;
-if( !emulated ) b[1] == 0xDD;
+b[1] == 0xDD;
 
 var sub = b.subarray(2,3);
 sub.length == 1;
 sub[0] == 3;
 sub[0] = 0xEE;
-if( !emulated ) b[2] == 0xEE;
+b[2] == 0xEE;
 
 // from bytes
 var b3 = haxe.io.Float64Array.fromBytes(b.view.buffer, 2*8, 3);
@@ -75,4 +70,4 @@ b3.length == 3;
 for( i in 0...3 )
 	b3[i] == b[i+2];
 b3[0] = b[3] + 1;
-if( !emulated ) b3[0] == b[2];
+b3[0] == b[2];
diff --git a/tests/unit/src/unitstd/haxe/io/Int32Array.unit.hx b/tests/unit/src/unitstd/haxe/io/Int32Array.unit.hx
index 345988792d42b1514bdf7437fb2fd5d92837d288..7150ac9af6328c78db398e6364abcc1e9990bc20 100644
--- a/tests/unit/src/unitstd/haxe/io/Int32Array.unit.hx
+++ b/tests/unit/src/unitstd/haxe/io/Int32Array.unit.hx
@@ -1,8 +1,3 @@
-
-var emulated = haxe.io.ArrayBufferView.EMULATED;
-
-if( emulated ) return;
-
 var b = new haxe.io.Int32Array(5);
 b[0] == 0;
 b[4] == 0;
@@ -36,11 +31,9 @@ b2[2] == 4;
 b2.length == 3;
 
 // check memory sharing
-if( !emulated ) {
-	b2[0] = 0xCC;
-	b2[0] == 0xCC;
-	b[1] == 0xCC;
-}
+b2[0] = 0xCC;
+b2[0] == 0xCC;
+b[1] == 0xCC;
 
 // should we allow writing past bounds ?
 try b2[-1] = 0xBB catch( e : Dynamic ) {};
@@ -51,7 +44,7 @@ b[4] == 5;
 
 b.view == b.view; // no alloc
 
-if( !emulated ) b.view.buffer == b2.view.buffer;
+b.view.buffer == b2.view.buffer;
 b.view.byteLength == 20;
 b.view.byteOffset == 0;
 b2.view.byteLength == 12;
@@ -61,15 +54,15 @@ b2.view.byteOffset == 4;
 // check sub
 var sub = b.sub(1);
 sub.length == b.length - 1;
-sub[0] == (emulated ? 2 : 0xCC);
+sub[0] == 0xCC;
 sub[0] = 0xDD;
-if( !emulated ) b[1] == 0xDD;
+b[1] == 0xDD;
 
 var sub = b.subarray(2,3);
 sub.length == 1;
 sub[0] == 3;
 sub[0] = 0xEE;
-if( !emulated ) b[2] == 0xEE;
+b[2] == 0xEE;
 
 // from bytes
 var b3 = haxe.io.Int32Array.fromBytes(b.view.buffer, 2*4, 3);
@@ -77,5 +70,5 @@ b3.length == 3;
 for( i in 0...3 )
 	b3[i] == b[i+2];
 b3[0] = b3[0] + 1;
-if( !emulated ) b3[0] == b[2];
+b3[0] == b[2];
 
diff --git a/tests/unit/src/unitstd/haxe/io/Path.unit.hx b/tests/unit/src/unitstd/haxe/io/Path.unit.hx
index 2fbd8b5e3b38042479b30c049f0837229616b01e..ea5bfb7d544595d752fb5544f2d8fd4033a8316e 100644
--- a/tests/unit/src/unitstd/haxe/io/Path.unit.hx
+++ b/tests/unit/src/unitstd/haxe/io/Path.unit.hx
@@ -81,6 +81,11 @@ haxe.io.Path.normalize("http://haxe.org/downloads") == "http://haxe.org/download
 haxe.io.Path.normalize("../mydir") == "../mydir";
 haxe.io.Path.normalize("../../mydir") == "../../mydir";
 haxe.io.Path.normalize("dir1/.././../mydir/..") == "..";
+haxe.io.Path.normalize(".//dir1") == "dir1";
+haxe.io.Path.normalize(".//.//dir1") == "dir1";
+haxe.io.Path.normalize("././/dir1") == "dir1";
+haxe.io.Path.normalize("././dir1") == "dir1";
+haxe.io.Path.normalize("dir1/.//dir2") == "dir1/dir2";
 
 // join
 haxe.io.Path.join(["dir1/dir2", "dir3/dir4"]) == "dir1/dir2/dir3/dir4";
diff --git a/tests/unit/src/unitstd/haxe/io/UInt16Array.unit.hx b/tests/unit/src/unitstd/haxe/io/UInt16Array.unit.hx
index af39d13c57a5451b31ac30dad18a870f57167ade..ca2ddf87548fa7051601da0f6b194dc77abaa8cb 100644
--- a/tests/unit/src/unitstd/haxe/io/UInt16Array.unit.hx
+++ b/tests/unit/src/unitstd/haxe/io/UInt16Array.unit.hx
@@ -1,8 +1,3 @@
-
-var emulated = haxe.io.ArrayBufferView.EMULATED;
-
-if( emulated ) return;
-
 var b = new haxe.io.UInt16Array(5);
 b[0] == 0;
 b[4] == 0;
@@ -38,11 +33,9 @@ b2[2] == 4;
 b2.length == 3;
 
 // check memory sharing
-if( !emulated ) {
-	b2[0] = 0xCC;
-	b2[0] == 0xCC;
-	b[1] == 0xCC;
-}
+b2[0] = 0xCC;
+b2[0] == 0xCC;
+b[1] == 0xCC;
 
 // should we allow writing past bounds ?
 try b2[-1] = 0xBB catch( e : Dynamic ) {};
@@ -53,7 +46,7 @@ b[4] == 5;
 
 b.view == b.view; // no alloc
 
-if( !emulated ) b.view.buffer == b2.view.buffer;
+b.view.buffer == b2.view.buffer;
 b.view.byteLength == 10;
 b.view.byteOffset == 0;
 b2.view.byteLength == 6;
@@ -63,15 +56,15 @@ b2.view.byteOffset == 2;
 // check sub
 var sub = b.sub(1);
 sub.length == b.length - 1;
-sub[0] == (emulated ? 2 : 0xCC);
+sub[0] == 0xCC;
 sub[0] = 0xDD;
-if( !emulated ) b[1] == 0xDD;
+b[1] == 0xDD;
 
 var sub = b.subarray(2,3);
 sub.length == 1;
 sub[0] == 3;
 sub[0] = 0xEE;
-if( !emulated ) b[2] == 0xEE;
+b[2] == 0xEE;
 
 // from bytes
 var b3 = haxe.io.UInt16Array.fromBytes(b.view.buffer, 2*2, 3);
@@ -79,5 +72,5 @@ b3.length == 3;
 for( i in 0...3 )
 	b3[i] == b[i+2];
 b3[0] = b3[0] + 1;
-if( !emulated ) b3[0] == b[2];
+b3[0] == b[2];
 
diff --git a/tests/unit/src/unitstd/haxe/io/UInt32Array.unit.hx b/tests/unit/src/unitstd/haxe/io/UInt32Array.unit.hx
index 75ab88fbb551f0fd5bc49c77aeb59c8a58e4fd9a..aa1d8a79b497ad1a33a3045fa69a549ac425a05c 100644
--- a/tests/unit/src/unitstd/haxe/io/UInt32Array.unit.hx
+++ b/tests/unit/src/unitstd/haxe/io/UInt32Array.unit.hx
@@ -1,8 +1,3 @@
-
-var emulated = haxe.io.ArrayBufferView.EMULATED;
-
-if( emulated ) return;
-
 var b = new haxe.io.UInt32Array(5);
 b[0] == 0;
 b[4] == 0;
@@ -36,11 +31,9 @@ b2[2] == 4;
 b2.length == 3;
 
 // check memory sharing
-if( !emulated ) {
-	b2[0] = 0xCC;
-	b2[0] == 0xCC;
-	b[1] == 0xCC;
-}
+b2[0] = 0xCC;
+b2[0] == 0xCC;
+b[1] == 0xCC;
 
 // should we allow writing past bounds ?
 try b2[-1] = 0xBB catch( e : Dynamic ) {};
@@ -51,7 +44,7 @@ b[4] == 5;
 
 b.view == b.view; // no alloc
 
-if( !emulated ) b.view.buffer == b2.view.buffer;
+b.view.buffer == b2.view.buffer;
 b.view.byteLength == 20;
 b.view.byteOffset == 0;
 b2.view.byteLength == 12;
@@ -61,15 +54,15 @@ b2.view.byteOffset == 4;
 // check sub
 var sub = b.sub(1);
 sub.length == b.length - 1;
-sub[0] == (emulated ? 2 : 0xCC);
+sub[0] == 0xCC;
 sub[0] = 0xDD;
-if( !emulated ) b[1] == 0xDD;
+b[1] == 0xDD;
 
 var sub = b.subarray(2,3);
 sub.length == 1;
 sub[0] == 3;
 sub[0] = 0xEE;
-if( !emulated ) b[2] == 0xEE;
+b[2] == 0xEE;
 
 // from bytes
 var b3 = haxe.io.UInt32Array.fromBytes(b.view.buffer, 2*4, 3);
@@ -77,5 +70,5 @@ b3.length == 3;
 for( i in 0...3 )
 	b3[i] == b[i+2];
 b3[0] = b3[0] + 1;
-if( !emulated ) b3[0] == b[2];
+b3[0] == b[2];
 
diff --git a/tests/unit/src/unitstd/haxe/io/UInt8Array.unit.hx b/tests/unit/src/unitstd/haxe/io/UInt8Array.unit.hx
index 2a5cf560db71d89572153496e05f2fb22d4334a6..4b09aa95d3e59f9ab3188580c76de1deb795baeb 100644
--- a/tests/unit/src/unitstd/haxe/io/UInt8Array.unit.hx
+++ b/tests/unit/src/unitstd/haxe/io/UInt8Array.unit.hx
@@ -1,6 +1,3 @@
-
-var emulated = haxe.io.ArrayBufferView.EMULATED;
-
 var b = new haxe.io.UInt8Array(5);
 b[0] == 0;
 b[4] == 0;
@@ -36,11 +33,9 @@ b2[2] == 4;
 b2.length == 3;
 
 // check memory sharing
-if( !emulated ) {
-	b2[0] = 0xCC;
-	b2[0] == 0xCC;
-	b[1] == 0xCC;
-}
+b2[0] = 0xCC;
+b2[0] == 0xCC;
+b[1] == 0xCC;
 
 // should we allow writing past bounds ?
 try b2[-1] = 0xBB catch( e : Dynamic ) {};
@@ -51,7 +46,7 @@ b[4] == 5;
 
 b.view == b.view; // no alloc
 
-if( !emulated ) b.view.buffer == b2.view.buffer;
+b.view.buffer == b2.view.buffer;
 b.view.byteLength == 5;
 b.view.byteOffset == 0;
 b2.view.byteLength == 3;
@@ -61,15 +56,15 @@ b2.view.byteOffset == 1;
 // check sub
 var sub = b.sub(1);
 sub.length == b.length - 1;
-sub[0] == (emulated ? 2 : 0xCC);
+sub[0] == 0xCC;
 sub[0] = 0xDD;
-if( !emulated ) b[1] == 0xDD;
+b[1] == 0xDD;
 
 var sub = b.subarray(2,3);
 sub.length == 1;
 sub[0] == 3;
 sub[0] = 0xEE;
-if( !emulated ) b[2] == 0xEE;
+b[2] == 0xEE;
 
 // from bytes
 var b3 = haxe.io.UInt8Array.fromBytes(b.view.buffer, 2, 3);
@@ -77,11 +72,11 @@ b3.length == 3;
 for( i in 0...3 )
 	b3[i] == b[i+2];
 b3[0] = b3[0] + 1;
-if( !emulated ) b3[0] == b[2];
+b3[0] == b[2];
 
 var bytes = haxe.io.Bytes.alloc(50);
 var b4 = haxe.io.UInt8Array.fromBytes(bytes);
 b4.length == 50;
 b4.set(0,55);
 b4.get(0) == 55;
-if( !emulated ) bytes.get(0) == 55;
+bytes.get(0) == 55;
diff --git a/tests/unit/src/unitstd/haxe/iterators/StringIteratorUnicode.unit.hx b/tests/unit/src/unitstd/haxe/iterators/StringIteratorUnicode.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..6c3e02a1c952bbe47833e1c327699a9111def70e
--- /dev/null
+++ b/tests/unit/src/unitstd/haxe/iterators/StringIteratorUnicode.unit.hx
@@ -0,0 +1,30 @@
+function traverse(s:String) {
+	var a = [];
+	for (code in new haxe.iterators.StringIteratorUnicode(s)) {
+		a.push(code);
+	}
+	return a;
+}
+
+#if target.unicode
+
+traverse("abcde") == ["a".code, "b".code, "c".code, "d".code, "e".code];
+traverse("aa😂éé") == ["a".code, "a".code, "😂".code, "é".code, "é".code];
+
+var surrogateBorders = [
+	"𐀀", //D800,DC00 - U+10000
+	"𐏿", //D800,DFFF - U+103FF
+	"􏰀", //DBFF,DC00 - U+10FC00
+	"􏿿", //DBFF,DFFF - U+10FFFF
+];
+var rStr = traverse(surrogateBorders.join(''));
+rStr == [
+	65536,	//D800,DC00 - U+10000
+	66559,	//D800,DFFF - U+103FF
+	1113088,//DBFF,DC00 - U+10FC00
+	1114111	//DBFF,DFFF - U+10FFFF
+];
+
+#else
+1 == 1;
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/haxe/iterators/StringKeyValueIteratorUnicode.unit.hx b/tests/unit/src/unitstd/haxe/iterators/StringKeyValueIteratorUnicode.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..15eac0c6d69f442ae01dd8ef82d43913135f92d5
--- /dev/null
+++ b/tests/unit/src/unitstd/haxe/iterators/StringKeyValueIteratorUnicode.unit.hx
@@ -0,0 +1,39 @@
+function traverse(s:String) {
+	var ak = [];
+	var av = [];
+	for (offset => code in new haxe.iterators.StringKeyValueIteratorUnicode(s)) {
+		ak.push(offset);
+		av.push(code);
+	}
+	return { k: ak, v: av };
+}
+
+#if target.unicode
+
+var r = traverse("abcde");
+r.k == [0, 1, 2, 3, 4];
+r.v == ["a".code, "b".code, "c".code, "d".code, "e".code];
+
+var r = traverse("aa😂éé");
+r.k == [0, 1, 2, 3, 4];
+r.v == ["a".code, "a".code, "😂".code, "é".code, "é".code];
+
+var surrogateBorders = [
+	"𐀀", //D800,DC00 - U+10000
+	"𐏿", //D800,DFFF - U+103FF
+	"􏰀", //DBFF,DC00 - U+10FC00
+	"􏿿", //DBFF,DFFF - U+10FFFF
+];
+var rStr = traverse(surrogateBorders.join(''));
+rStr.k == [0, 1, 2, 3];
+rStr.v == [
+	65536,	//D800,DC00 - U+10000
+	66559,	//D800,DFFF - U+103FF
+	1113088,//DBFF,DC00 - U+10FC00
+	1114111	//DBFF,DFFF - U+10FFFF
+];
+
+#else
+1 == 1;
+
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/haxe/macro/ComplexTypeTools.macro.unit.hx b/tests/unit/src/unitstd/haxe/macro/ComplexTypeTools.macro.unit.hx
index 9e05945666b0d763e08cc7f46fac39a6ea6ca78e..793691142f3baa2cfb5fb801592d283f9c0b118c 100644
--- a/tests/unit/src/unitstd/haxe/macro/ComplexTypeTools.macro.unit.hx
+++ b/tests/unit/src/unitstd/haxe/macro/ComplexTypeTools.macro.unit.hx
@@ -2,4 +2,6 @@
 var tt = function(c) return Std.string(haxe.macro.ComplexTypeTools.toType(c));
 tt(macro : String) == "String";
 tt(macro : Int) == "String";
+#else
+1 == 1;
 #end
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/haxe/macro/ExprTools.unit.hx b/tests/unit/src/unitstd/haxe/macro/ExprTools.unit.hx
index 314097f5f07ba3b5ad4909f785e0e8f0b5268c1c..af33a7a8ad3882cee5baa47ec0a33762bb5cdd10 100644
--- a/tests/unit/src/unitstd/haxe/macro/ExprTools.unit.hx
+++ b/tests/unit/src/unitstd/haxe/macro/ExprTools.unit.hx
@@ -71,7 +71,7 @@ function check(e, exp, ?pos) {
 iter(econst, fail);
 iter(econtinue, fail);
 iter(ebreak, fail);
-iter(efield, seq.bind("EConst(CString(foo))"));
+iter(efield, seq.bind("EConst(CString(foo,DoubleQuotes))"));
 iter(eparenthesis, seq.bind("EConst(CInt(1))"));
 iter(euntyped, seq.bind("EConst(CInt(1))"));
 iter(ethrow, seq.bind("EConst(CInt(1))"));
@@ -79,13 +79,13 @@ iter(eunop, seq.bind("EConst(CInt(1))"));
 iter(ecast, seq.bind("EConst(CInt(1))"));
 iter(emeta, seq.bind("EConst(CInt(1))"));
 check(earray, ["EConst(CInt(1))", "EConst(CInt(0))"]);
-check(ewhile1, ["EConst(CInt(1))", "EConst(CString(foo))"]);
-check(ewhile2, ["EConst(CInt(1))", "EConst(CString(foo))"]);
+check(ewhile1, ["EConst(CInt(1))", "EConst(CString(foo,DoubleQuotes))"]);
+check(ewhile2, ["EConst(CInt(1))", "EConst(CString(foo,DoubleQuotes))"]);
 check(ebinop, ["EConst(CInt(1))", "EConst(CInt(1))"]);
-check(efor, ["EConst(CInt(1))", "EConst(CString(foo))"]);
+check(efor, ["EConst(CInt(1))", "EConst(CString(foo,DoubleQuotes))"]);
 check(ein, ["EConst(CIdent(i))", "EConst(CInt(1))"]);
 check(evars, ["EConst(CInt(1))", "EConst(CInt(2))"]);
-check(etry, ["EConst(CInt(1))", "EConst(CString(foo))", "EConst(CString(bar))"]);
+check(etry, ["EConst(CInt(1))", "EConst(CString(foo,DoubleQuotes))", "EConst(CString(bar,DoubleQuotes))"]);
 check(eternary, ["EConst(CInt(1))", "EConst(CInt(2))", "EConst(CInt(3))"]);
 check(earraydecl, ["EConst(CInt(1))", "EConst(CInt(2))"]);
 check(enew, ["EConst(CInt(1))", "EConst(CInt(2))"]);
@@ -106,7 +106,7 @@ var map = haxe.macro.ExprTools.map;
 function check(e, ?pos) {
 	var e2 = map(e, wrap);
 	var e3 = map(e, unwrap);
-	eq(Std.string(e.expr), Std.string(e3.expr), pos);
+	eq(haxe.macro.ExprTools.toString(e), haxe.macro.ExprTools.toString(e3), pos);
 }
 map(econst, wrap).expr == econst.expr;
 map(econtinue, wrap).expr == econtinue.expr;
diff --git a/tests/unit/src/unitstd/haxe/rtti/Rtti.unit.hx b/tests/unit/src/unitstd/haxe/rtti/Rtti.unit.hx
index 0721dc5d3f2616bce287f504ba6146d6df674791..7a31a2d0349d6a145c6e8a77816d19449cb1e32d 100644
--- a/tests/unit/src/unitstd/haxe/rtti/Rtti.unit.hx
+++ b/tests/unit/src/unitstd/haxe/rtti/Rtti.unit.hx
@@ -13,7 +13,7 @@ cl.fields.length == 1;
 cl.statics.length == 1;
 cl.tdynamic == null;
 
-var cf = cl.statics.first();
+var cf = cl.statics.shift();
 cf.name == "v";
 haxe.rtti.CType.CTypeTools.toString(cf.type) == "String";
 cf.isPublic == false;
@@ -27,7 +27,7 @@ cf.meta.length == 0;
 cf.line == null;
 cf.overloads == null;
 
-var cf = cl.fields.first();
+var cf = cl.fields.shift();
 cf.name == "f";
 haxe.rtti.CType.CTypeTools.toString(cf.type) == "Void -> Float";
 cf.isPublic == true;
@@ -46,7 +46,7 @@ cl.isExtern == false;
 cl.isInterface == false;
 cl.params == [];
 cl.fields.length == 0;
-cl.superClass.path == "unit.RttiClass1";
+cl.superClass.path == "unit.spec.RttiClass1";
 cl.superClass.params.length == 0;
 cl.interfaces.length == 0;
 cl.fields.length == 0;
@@ -58,14 +58,14 @@ cl.isExtern == false;
 cl.isInterface == false;
 cl.params == [];
 cl.fields.length == 1;
-cl.superClass.path == "unit.RttiClass1";
+cl.superClass.path == "unit.spec.RttiClass1";
 cl.superClass.params.length == 0;
 cl.interfaces.length == 0;
 cl.fields.length == 1;
 cl.statics.length == 0;
 cl.tdynamic == null;
 
-var cf = cl.fields.first();
+var cf = cl.fields.shift();
 cf.name == "f";
 haxe.rtti.CType.CTypeTools.toString(cf.type) == "Void -> Int";
 cf.isPublic == true;
diff --git a/tests/unit/src/unitstd/haxe/zip/Compress.unit.hx b/tests/unit/src/unitstd/haxe/zip/Compress.unit.hx
index a5f6fbcf4f8ad9918c2b0887052309287b396f7d..3a96914df6710ee2411ba500b75823549ebe5afd 100644
--- a/tests/unit/src/unitstd/haxe/zip/Compress.unit.hx
+++ b/tests/unit/src/unitstd/haxe/zip/Compress.unit.hx
@@ -1,5 +1,5 @@
 // not supported in js/python/cs yet
-#if (cpp || php || java || neko || flash)
+#if (cpp || php || java || neko || flash || hl)
 var b = haxe.io.Bytes.ofString("test");
 var c = haxe.zip.Compress.run(b, 9);
 
@@ -29,5 +29,26 @@ c.get(4) == 0;
 c.get(5) == 0;
 c.get(6) == 0;
 c.get(7) == 1;
+#end
+
+#if php
+var b = haxe.io.Bytes.alloc(0);
+var c = haxe.io.Bytes.alloc(8);
+var d = new haxe.zip.Compress(9);
+var r = d.execute(b, 0, c, 0);
 
+r.done == true;
+r.read == 0;
+r.write == 8;
+c.length == 8;
+c.get(0) == 120;
+c.get(1) == 218;
+c.get(2) == 3;
+c.get(3) == 0;
+c.get(4) == 0;
+c.get(5) == 0;
+c.get(6) == 0;
+c.get(7) == 1;
+#else
+1 == 1;
 #end
diff --git a/tests/unit/src/unitstd/haxe/zip/Uncompress.unit.hx b/tests/unit/src/unitstd/haxe/zip/Uncompress.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..c42136721c3d712bf665f18bd5ba3c4c6920c761
--- /dev/null
+++ b/tests/unit/src/unitstd/haxe/zip/Uncompress.unit.hx
@@ -0,0 +1,32 @@
+// not supported in js/python/cs yet
+#if (cpp || php || java || neko || flash)
+var d = [120, 218, 43, 73, 45, 46, 1, 0, 4, 93, 1, 193];
+var b = haxe.io.Bytes.alloc(d.length);
+for (i in 0...d.length) b.set(i, d[i]);
+var c = haxe.zip.Uncompress.run(b);
+
+c.toString() == "test";
+
+var d = [120, 218, 3, 0, 0, 0, 0, 1];
+var b = haxe.io.Bytes.alloc(d.length);
+for (i in 0...d.length) b.set(i, d[i]);
+var c = haxe.zip.Uncompress.run(b);
+
+c.length == 0;
+#end
+
+#if php
+var d = [120, 218, 43, 73, 45, 46, 1, 0, 4, 93, 1, 193];
+var b = haxe.io.Bytes.alloc(d.length);
+for (i in 0...d.length) b.set(i, d[i]);
+var c = haxe.io.Bytes.alloc(4);
+var d = new haxe.zip.Uncompress();
+var r = d.execute(b, 0, c, 0);
+
+r.done == true;
+r.read == 12;
+r.write == 4;
+c.toString() == "test";
+#else
+1 == 1;
+#end
\ No newline at end of file
diff --git a/tests/unit/src/unitstd/sys/io/File.unit.hx b/tests/unit/src/unitstd/sys/io/File.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..933d52a6db994db08a61e548bff0646ac9a31207
--- /dev/null
+++ b/tests/unit/src/unitstd/sys/io/File.unit.hx
@@ -0,0 +1,45 @@
+#if sys
+var filename = '.sys.io.file.testfile';
+if (sys.FileSystem.exists(filename)) sys.FileSystem.deleteFile(filename);
+sys.FileSystem.exists(filename) == false;
+
+// test file write
+var fw = sys.io.File.write(filename);
+sys.FileSystem.exists(filename) == true;
+fw.writeString("apple\n");
+fw.close();
+sys.io.File.getContent(filename) == "apple\n";
+
+// overwrite
+var fw = sys.io.File.write(filename);
+fw.writeString("banana\n");
+fw.close();
+sys.io.File.getContent(filename) == "banana\n";
+
+// test file append
+var fa = sys.io.File.append(filename);
+fa.writeString("apple\n");
+fa.close();
+sys.io.File.getContent(filename) == "banana\napple\n";
+
+// test file update
+var fu = sys.io.File.update(filename);
+fu.writeString("cherry\n");
+fu.close();
+sys.io.File.getContent(filename) == "cherry\napple\n";
+var fu = sys.io.File.update(filename);
+fu.seek(7, sys.io.FileSeek.SeekBegin);
+fu.writeString("banana\n");
+fu.close();
+sys.io.File.getContent(filename) == "cherry\nbanana\n";
+
+// File.update should create the file if it doesn't exist
+sys.FileSystem.deleteFile(filename);
+var fu = sys.io.File.update(filename);
+fu.close();
+sys.FileSystem.exists(filename) == true;
+
+sys.FileSystem.deleteFile(filename);
+#else
+1 == 1;
+#end
diff --git a/tests/unit/src/unitstd/sys/net/Socket.unit.hx b/tests/unit/src/unitstd/sys/net/Socket.unit.hx
new file mode 100644
index 0000000000000000000000000000000000000000..7ab146fdd7ff6b23572a16e5763b8e2c52870628
--- /dev/null
+++ b/tests/unit/src/unitstd/sys/net/Socket.unit.hx
@@ -0,0 +1,70 @@
+#if sys
+
+#if !(php && Windows)
+
+// bind & listen
+var s = new sys.net.Socket();
+var host = new sys.net.Host("127.0.0.1");
+s.bind(host, 0);
+s.listen(1);
+var port = s.host().port;
+port > 0;
+
+// connect
+var c = new sys.net.Socket();
+c.connect(host, port);
+c.input != null;
+c.output != null;
+
+#if !java
+// select when accept() would succeed
+var select = sys.net.Socket.select([s], [s], [s], 0.01);
+select.read.length == 1;
+select.write.length == 0;
+select.others.length == 0;
+
+// multiple selects without reading
+var select = sys.net.Socket.select([s], [s], [s], 0.01);
+select.read.length == 1;
+select.write.length == 0;
+select.others.length == 0;
+
+// accept
+var w = s.accept();
+w != null;
+w.input != null;
+w.output != null;
+w.setFastSend(true);
+s.setBlocking(false);
+
+// select after accept
+var select = sys.net.Socket.select([s], [s], [s], 0.01);
+select.read.length == 0;
+select.write.length == 0;
+select.others.length == 0;
+
+// write
+w.output.writeByte(97);
+w.output.writeByte(98);
+w.output.writeByte(99);
+w.close();
+
+// read
+c.waitForRead();
+var select = sys.net.Socket.select([c], [c], [c]);
+select.read.length == 1;
+select.write.length == 1;
+select.others.length == 0;
+c.read() == "abc";
+#end
+
+c.close();
+s.close();
+
+#else //!(php && Windows)
+1 == 1;
+#end
+
+#else
+1 == 1;
+#end
\ No newline at end of file
diff --git a/tests/unit/unit-js.html b/tests/unit/unit-js.html
index 7b3a7d33caff7a3df7f9fda4efe95f6a8993ec64..c34e8de259ac0da32c628e624fc2e1fea97b27c3 100644
--- a/tests/unit/unit-js.html
+++ b/tests/unit/unit-js.html
@@ -7,7 +7,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
     </head>
     <body id="haxe:trace">
-        <script type="text/javascript" src="//code.jquery.com/jquery-1.12.4.min.js"></script>
+		<script type="text/javascript" src="//code.jquery.com/jquery-3.3.1.min.js"></script>
         <script type="text/javascript">
             // http://stackoverflow.com/questions/11582512/how-to-get-url-parameters-with-javascript
             function getURLParameter(name) {
diff --git a/tests/unit/unit.hxproj b/tests/unit/unit.hxproj
index d975ccb9c932ac8392b2a862210a39b2e976b454..37dedc78413713a21211d6069970835052f1e471 100644
--- a/tests/unit/unit.hxproj
+++ b/tests/unit/unit.hxproj
@@ -60,6 +60,7 @@
     <hidden path="runjava.n" />
     <hidden path="server.bat" />
     <hidden path="obj" />
+    <hidden path="serializedValues.txt" />
   </hiddenPaths>
   <!-- Executed before build -->
   <preBuildCommand>"$(CompilerPath)/haxe.exe" compile$(TargetBuild).hxml</preBuildCommand>
diff --git a/tests/unit/unit_hl.hxproj b/tests/unit/unit_hl.hxproj
index 3bde5bddc5d508dd6ff91c707d3798120a11f249..02d27ce92ee4640be4eeab76c89715faeabde5d1 100644
--- a/tests/unit/unit_hl.hxproj
+++ b/tests/unit/unit_hl.hxproj
@@ -43,7 +43,7 @@
     <hidden path="obj" />
   </hiddenPaths>
   <!-- Executed before build -->
-  <preBuildCommand>haxe compile-hl.hxml -D fail_eager -D dump</preBuildCommand>
+  <preBuildCommand>haxe compile-hl.hxml -D dump</preBuildCommand>
   <!-- Executed after build -->
   <postBuildCommand alwaysRun="False" />
   <!-- Other project options -->